From 672c82f69dc0fd8002ebb33bb928cfe6fdf6b772 Mon Sep 17 00:00:00 2001 From: Tommy Walton Date: Tue, 2 Nov 2021 16:40:56 -0700 Subject: [PATCH 001/345] Add a default fallback image when a StreamingImageAsset fails to load Signed-off-by: Tommy Walton --- .../Image/StreamingImageAssetHandler.h | 2 ++ .../Image/StreamingImageAssetHandler.cpp | 30 +++++++++++++++++++ 2 files changed, 32 insertions(+) diff --git a/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Image/StreamingImageAssetHandler.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Image/StreamingImageAssetHandler.h index 3f4e15744a..f69463ae60 100644 --- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Image/StreamingImageAssetHandler.h +++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Image/StreamingImageAssetHandler.h @@ -25,6 +25,8 @@ namespace AZ const Data::Asset& asset, AZStd::shared_ptr stream, const Data::AssetFilterCB& assetLoadFilterCB) override; + + Data::AssetId AssetMissingInCatalog(const Data::Asset& /*asset*/) override; }; } } diff --git a/Gems/Atom/RPI/Code/Source/RPI.Reflect/Image/StreamingImageAssetHandler.cpp b/Gems/Atom/RPI/Code/Source/RPI.Reflect/Image/StreamingImageAssetHandler.cpp index fa39820329..e73d8e1c03 100644 --- a/Gems/Atom/RPI/Code/Source/RPI.Reflect/Image/StreamingImageAssetHandler.cpp +++ b/Gems/Atom/RPI/Code/Source/RPI.Reflect/Image/StreamingImageAssetHandler.cpp @@ -7,6 +7,7 @@ */ #include +#include namespace AZ { @@ -40,5 +41,34 @@ namespace AZ return loadResult; } + + Data::AssetId StreamingImageAssetHandler::AssetMissingInCatalog(const Data::Asset& asset) + { + // Escalate the asset to the top of the list + AzFramework::AssetSystemRequestBus::Broadcast( + &AzFramework::AssetSystem::AssetSystemRequests::EscalateAssetByUuid, asset.GetId().m_guid); + + // Make sure the default fallback image has been processed so that it is part of the asset catalog + AzFramework::AssetSystem::AssetStatus status = AzFramework::AssetSystem::AssetStatus_Unknown; + AzFramework::AssetSystemRequestBus::BroadcastResult( + status, &AzFramework::AssetSystemRequestBus::Events::CompileAssetSync, "textures/defaults/defaultnouvs.tif.streamingimage"); + + // Get the id of the fallback image + Data::AssetInfo assetInfo; + assetInfo.m_relativePath = "textures/defaults/defaultnouvs.tif.streamingimage"; + Data::AssetId assetId; + Data::AssetCatalogRequestBus::BroadcastResult( + assetId, &Data::AssetCatalogRequestBus::Events::GenerateAssetIdTEMP, + assetInfo.m_relativePath.c_str()); + + assetInfo.m_assetId = Data::AssetId(assetId.m_guid, StreamingImageAsset::GetImageAssetSubId()); + + // Register the fallback image with the asset catalog + Data::AssetCatalogRequestBus::Broadcast( + &Data::AssetCatalogRequestBus::Events::RegisterAsset, assetInfo.m_assetId, assetInfo); + + // Use a default Image as a fallback + return assetInfo.m_assetId; + } } } From ae1c0f6f83b13a7b2e589eae71f9810dd4a59920 Mon Sep 17 00:00:00 2001 From: Tommy Walton Date: Wed, 3 Nov 2021 15:05:37 -0700 Subject: [PATCH 002/345] Don't release a missing/invalid texture reference in the skybox component. Hold on to the reference so that it can hot-reload Signed-off-by: Tommy Walton --- .../Code/Source/SkyBox/HDRiSkyboxComponentController.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/SkyBox/HDRiSkyboxComponentController.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/SkyBox/HDRiSkyboxComponentController.cpp index 171c5e417f..7bf6237c1a 100644 --- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/SkyBox/HDRiSkyboxComponentController.cpp +++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/SkyBox/HDRiSkyboxComponentController.cpp @@ -196,8 +196,6 @@ namespace AZ } else { - // If this asset didn't load or isn't a cubemap, release it. - m_configuration.m_cubemapAsset.Release(); m_featureProcessorInterface->SetCubemap(nullptr); } } From c93d678cf462a3399e8e82895f4c26e59800077f Mon Sep 17 00:00:00 2001 From: Tommy Walton Date: Wed, 3 Nov 2021 16:32:03 -0700 Subject: [PATCH 003/345] Don't release a missing/invalid texture reference in the ibl component. Hold on to the reference so that it can hot-reload Signed-off-by: Tommy Walton --- .../ImageBasedLights/ImageBasedLightComponentController.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/ImageBasedLights/ImageBasedLightComponentController.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/ImageBasedLights/ImageBasedLightComponentController.cpp index 6ea7580fc6..73cfd53c21 100644 --- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/ImageBasedLights/ImageBasedLightComponentController.cpp +++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/ImageBasedLights/ImageBasedLightComponentController.cpp @@ -163,8 +163,6 @@ namespace AZ return true; } } - // If this asset didn't load or isn't a cubemap, release it. - configAsset.Release(); return false; } From 5d5087e0d34b327521c346395996ceb778bb5633 Mon Sep 17 00:00:00 2001 From: Gene Walters Date: Tue, 9 Nov 2021 11:11:15 -0800 Subject: [PATCH 004/345] Moving CommunicatorTracePrinter to a place that AP and Multiplayer gem can use it. MultiplayerEditorSystemComponent now watching the server process and pumping the trace printer. Wip; for some reason not all the server logs are reaching the editor Signed-off-by: Gene Walters --- .../ProcessCommunicatorTracePrinter.cpp} | 12 ++++----- .../ProcessCommunicatorTracePrinter.h} | 13 +++++----- .../AzFramework/azframework_files.cmake | 2 ++ .../assetprocessor_static_files.cmake | 2 -- .../native/resourcecompiler/RCBuilder.cpp | 2 -- .../utilities/ApplicationManagerBase.cpp | 2 +- .../native/utilities/BuilderManager.cpp | 2 +- .../native/utilities/BuilderManager.h | 4 +-- .../MultiplayerEditorSystemComponent.cpp | 26 ++++++++++++++++--- .../Editor/MultiplayerEditorSystemComponent.h | 13 +++++++--- .../Source/MultiplayerSystemComponent.cpp | 1 + 11 files changed, 51 insertions(+), 28 deletions(-) rename Code/{Tools/AssetProcessor/native/utilities/CommunicatorTracePrinter.cpp => Framework/AzFramework/AzFramework/Process/ProcessCommunicatorTracePrinter.cpp} (82%) rename Code/{Tools/AssetProcessor/native/utilities/CommunicatorTracePrinter.h => Framework/AzFramework/AzFramework/Process/ProcessCommunicatorTracePrinter.h} (54%) diff --git a/Code/Tools/AssetProcessor/native/utilities/CommunicatorTracePrinter.cpp b/Code/Framework/AzFramework/AzFramework/Process/ProcessCommunicatorTracePrinter.cpp similarity index 82% rename from Code/Tools/AssetProcessor/native/utilities/CommunicatorTracePrinter.cpp rename to Code/Framework/AzFramework/AzFramework/Process/ProcessCommunicatorTracePrinter.cpp index c6008deb34..8f3e45bec5 100644 --- a/Code/Tools/AssetProcessor/native/utilities/CommunicatorTracePrinter.cpp +++ b/Code/Framework/AzFramework/AzFramework/Process/ProcessCommunicatorTracePrinter.cpp @@ -6,16 +6,16 @@ * */ -#include "CommunicatorTracePrinter.h" +#include "ProcessCommunicatorTracePrinter.h" -CommunicatorTracePrinter::CommunicatorTracePrinter(AzFramework::ProcessCommunicator* communicator, const char* window) : +ProcessCommunicatorTracePrinter::ProcessCommunicatorTracePrinter(AzFramework::ProcessCommunicator* communicator, const char* window) : m_communicator(communicator), m_window(window) { m_stringBeingConcatenated.reserve(1024); } -CommunicatorTracePrinter::~CommunicatorTracePrinter() +ProcessCommunicatorTracePrinter::~ProcessCommunicatorTracePrinter() { // flush stdout WriteCurrentString(false); @@ -24,7 +24,7 @@ CommunicatorTracePrinter::~CommunicatorTracePrinter() WriteCurrentString(true); } -void CommunicatorTracePrinter::Pump() +void ProcessCommunicatorTracePrinter::Pump() { if (m_communicator->IsValid()) { @@ -42,7 +42,7 @@ void CommunicatorTracePrinter::Pump() } } -void CommunicatorTracePrinter::ParseDataBuffer(AZ::u32 readSize, bool isFromStdErr) +void ProcessCommunicatorTracePrinter::ParseDataBuffer(AZ::u32 readSize, bool isFromStdErr) { if (readSize > AZ_ARRAY_SIZE(m_streamBuffer)) { @@ -67,7 +67,7 @@ void CommunicatorTracePrinter::ParseDataBuffer(AZ::u32 readSize, bool isFromStdE } } -void CommunicatorTracePrinter::WriteCurrentString(bool isFromStdErr) +void ProcessCommunicatorTracePrinter::WriteCurrentString(bool isFromStdErr) { AZStd::string& bufferToUse = isFromStdErr ? m_errorStringBeingConcatenated : m_stringBeingConcatenated; diff --git a/Code/Tools/AssetProcessor/native/utilities/CommunicatorTracePrinter.h b/Code/Framework/AzFramework/AzFramework/Process/ProcessCommunicatorTracePrinter.h similarity index 54% rename from Code/Tools/AssetProcessor/native/utilities/CommunicatorTracePrinter.h rename to Code/Framework/AzFramework/AzFramework/Process/ProcessCommunicatorTracePrinter.h index c2e4da32af..8b84c4c28d 100644 --- a/Code/Tools/AssetProcessor/native/utilities/CommunicatorTracePrinter.h +++ b/Code/Framework/AzFramework/AzFramework/Process/ProcessCommunicatorTracePrinter.h @@ -10,20 +10,21 @@ #include -//! CommunicatorTracePrinter listens to stderr and stdout of a running process and writes its output to the AZ_Trace system +//! ProcessCommunicatorTracePrinter listens to stderr and stdout of a running process and writes its output to the AZ_Trace system //! Importantly, it does not do any blocking operations. -class CommunicatorTracePrinter +class ProcessCommunicatorTracePrinter { public: - CommunicatorTracePrinter(AzFramework::ProcessCommunicator* communicator, const char* window); - ~CommunicatorTracePrinter(); + ProcessCommunicatorTracePrinter(AzFramework::ProcessCommunicator* communicator, const char* window); + ~ProcessCommunicatorTracePrinter(); - // call this periodically to drain the buffers and write them. + // Call this periodically to drain the buffers and write them. void Pump(); - // drains the buffer into the string thats being built, then traces the string when it hits a newline. + // Drains the buffer into the string that's being built, then traces the string when it hits a newline. void ParseDataBuffer(AZ::u32 readSize, bool isFromStdErr); + // Prints the current buffer to AZ_Error or AZ_TracePrintf so that it can be picked up by AZ::Debug::Trace void WriteCurrentString(bool isFromStdError); private: diff --git a/Code/Framework/AzFramework/AzFramework/azframework_files.cmake b/Code/Framework/AzFramework/AzFramework/azframework_files.cmake index e03d166cfc..232975d7c8 100644 --- a/Code/Framework/AzFramework/AzFramework/azframework_files.cmake +++ b/Code/Framework/AzFramework/AzFramework/azframework_files.cmake @@ -274,6 +274,8 @@ set(FILES Process/ProcessWatcher.cpp Process/ProcessWatcher.h Process/ProcessCommon_fwd.h + Process/ProcessCommunicatorTracePrinter.cpp + Process/ProcessCommunicatorTracePrinter.h ProjectManager/ProjectManager.h ProjectManager/ProjectManager.cpp Render/GameIntersectorComponent.h diff --git a/Code/Tools/AssetProcessor/assetprocessor_static_files.cmake b/Code/Tools/AssetProcessor/assetprocessor_static_files.cmake index 0c1347517f..056b88beb2 100644 --- a/Code/Tools/AssetProcessor/assetprocessor_static_files.cmake +++ b/Code/Tools/AssetProcessor/assetprocessor_static_files.cmake @@ -89,8 +89,6 @@ set(FILES native/utilities/BuilderManager.inl native/utilities/ByteArrayStream.cpp native/utilities/ByteArrayStream.h - native/utilities/CommunicatorTracePrinter.cpp - native/utilities/CommunicatorTracePrinter.h native/utilities/IniConfiguration.cpp native/utilities/IniConfiguration.h native/utilities/JobDiagnosticTracker.cpp diff --git a/Code/Tools/AssetProcessor/native/resourcecompiler/RCBuilder.cpp b/Code/Tools/AssetProcessor/native/resourcecompiler/RCBuilder.cpp index 27210685fc..c463f2320e 100644 --- a/Code/Tools/AssetProcessor/native/resourcecompiler/RCBuilder.cpp +++ b/Code/Tools/AssetProcessor/native/resourcecompiler/RCBuilder.cpp @@ -20,7 +20,6 @@ #include #include -#include #include #include @@ -31,7 +30,6 @@ #include "native/utilities/assetUtils.h" #include "native/utilities/AssetBuilderInfo.h" -#include "native/utilities/CommunicatorTracePrinter.h" #include diff --git a/Code/Tools/AssetProcessor/native/utilities/ApplicationManagerBase.cpp b/Code/Tools/AssetProcessor/native/utilities/ApplicationManagerBase.cpp index 4e0bc7e434..2c322da2f7 100644 --- a/Code/Tools/AssetProcessor/native/utilities/ApplicationManagerBase.cpp +++ b/Code/Tools/AssetProcessor/native/utilities/ApplicationManagerBase.cpp @@ -1479,7 +1479,7 @@ bool ApplicationManagerBase::WaitForBuilderExit(AzFramework::ProcessWatcher* pro AZ::u32 exitCode = 0; bool finishedOK = false; QElapsedTimer ticker; - CommunicatorTracePrinter tracer(processWatcher->GetCommunicator(), "AssetBuilder"); + ProcessCommunicatorTracePrinter tracer(processWatcher->GetCommunicator(), "AssetBuilder"); ticker.start(); diff --git a/Code/Tools/AssetProcessor/native/utilities/BuilderManager.cpp b/Code/Tools/AssetProcessor/native/utilities/BuilderManager.cpp index 751afc1a5d..aa462f7590 100644 --- a/Code/Tools/AssetProcessor/native/utilities/BuilderManager.cpp +++ b/Code/Tools/AssetProcessor/native/utilities/BuilderManager.cpp @@ -164,7 +164,7 @@ namespace AssetProcessor return false; } - m_tracePrinter = AZStd::make_unique(m_processWatcher->GetCommunicator(), "AssetBuilder"); + m_tracePrinter = AZStd::make_unique(m_processWatcher->GetCommunicator(), "AssetBuilder"); return WaitForConnection(); } diff --git a/Code/Tools/AssetProcessor/native/utilities/BuilderManager.h b/Code/Tools/AssetProcessor/native/utilities/BuilderManager.h index 657e4c7788..440f0b3709 100644 --- a/Code/Tools/AssetProcessor/native/utilities/BuilderManager.h +++ b/Code/Tools/AssetProcessor/native/utilities/BuilderManager.h @@ -10,11 +10,11 @@ #include #include #include +#include #include #include #include #include -#include #include #include // used in the inl file. @@ -127,7 +127,7 @@ namespace AssetProcessor AZStd::unique_ptr m_processWatcher = nullptr; //! Optional communicator, only available if we have a process watcher - AZStd::unique_ptr m_tracePrinter = nullptr; + AZStd::unique_ptr m_tracePrinter = nullptr; const AssetUtilities::QuitListener& m_quitListener; }; diff --git a/Gems/Multiplayer/Code/Source/Editor/MultiplayerEditorSystemComponent.cpp b/Gems/Multiplayer/Code/Source/Editor/MultiplayerEditorSystemComponent.cpp index 11aca101b3..7d6a684b6b 100644 --- a/Gems/Multiplayer/Code/Source/Editor/MultiplayerEditorSystemComponent.cpp +++ b/Gems/Multiplayer/Code/Source/Editor/MultiplayerEditorSystemComponent.cpp @@ -6,6 +6,8 @@ * */ +#include "AzFramework/Process/ProcessCommunicator.h" + #include #include #include @@ -133,6 +135,7 @@ namespace Multiplayer AzToolsFramework::EditorEvents::Bus::Handler::BusDisconnect(); AzFramework::GameEntityContextEventBus::Handler::BusDisconnect(); MultiplayerEditorServerRequestBus::Handler::BusDisconnect(); + AZ::TickBus::Handler::BusDisconnect(); } void MultiplayerEditorSystemComponent::NotifyRegisterViews() @@ -157,12 +160,21 @@ namespace Multiplayer [[fallthrough]]; case eNotify_OnEndGameMode: // Kill the configured server if it's active - if (m_serverProcess) + if (m_serverProcessWatcher) { - m_serverProcess->TerminateProcess(0); - m_serverProcess = nullptr; + m_serverProcessWatcher->TerminateProcess(0); + if (m_serverProcessTracePrinter) + { + m_serverProcessTracePrinter->Pump(); + m_serverProcessTracePrinter->WriteCurrentString(true); + m_serverProcessTracePrinter->WriteCurrentString(false); + } + m_serverProcessWatcher = nullptr; + m_serverProcessTracePrinter = nullptr; } + AZ::TickBus::Handler::BusDisconnect(); + if (INetworkInterface* editorNetworkInterface = AZ::Interface::Get()->RetrieveNetworkInterface(AZ::Name(MpEditorInterfaceName))) { editorNetworkInterface->Disconnect(m_editorConnId, AzNetworking::DisconnectReason::TerminatedByClient); @@ -220,7 +232,7 @@ namespace Multiplayer // Launch the Server AzFramework::ProcessWatcher* outProcess = AzFramework::ProcessWatcher::LaunchProcess( - processLaunchInfo, AzFramework::ProcessCommunicationType::COMMUNICATOR_TYPE_NONE); + processLaunchInfo, AzFramework::ProcessCommunicationType::COMMUNICATOR_TYPE_STDINOUT); AZ_Error( "MultiplayerEditor", processLaunchInfo.m_launchResult != AzFramework::ProcessLauncher::ProcessLaunchResult::PLR_MissingFile, @@ -389,4 +401,10 @@ namespace Multiplayer { return PyIsInGameMode(); } + + void MultiplayerEditorSystemComponent::OnTick(float, AZ::ScriptTimePoint) + { + m_serverProcessTracePrinter->Pump(); + } + } diff --git a/Gems/Multiplayer/Code/Source/Editor/MultiplayerEditorSystemComponent.h b/Gems/Multiplayer/Code/Source/Editor/MultiplayerEditorSystemComponent.h index 77b41a5dc4..330a2c9d81 100644 --- a/Gems/Multiplayer/Code/Source/Editor/MultiplayerEditorSystemComponent.h +++ b/Gems/Multiplayer/Code/Source/Editor/MultiplayerEditorSystemComponent.h @@ -13,14 +13,12 @@ #include #include -#include - #include #include #include -#include #include #include +#include #include namespace AzNetworking @@ -52,6 +50,7 @@ namespace Multiplayer , private AzToolsFramework::EditorEvents::Bus::Handler , private IEditorNotifyListener , private MultiplayerEditorServerRequestBus::Handler + , private AZ::TickBus::Handler { public: AZ_COMPONENT(MultiplayerEditorSystemComponent, "{9F335CC0-5574-4AD3-A2D8-2FAEF356946C}"); @@ -101,8 +100,14 @@ namespace Multiplayer void SendEditorServerLevelDataPacket(AzNetworking::IConnection* connection) override; //! @} + //! AZ::TickBus::Handler + //! @{ + void OnTick(float, AZ::ScriptTimePoint) override; + //! @} + IEditor* m_editor = nullptr; - AzFramework::ProcessWatcher* m_serverProcess = nullptr; + AzFramework::ProcessWatcher* m_serverProcessWatcher = nullptr; + AZStd::unique_ptr m_serverProcessTracePrinter = nullptr; AzNetworking::ConnectionId m_editorConnId; ServerAcceptanceReceivedEvent::Handler m_serverAcceptanceReceivedHandler; diff --git a/Gems/Multiplayer/Code/Source/MultiplayerSystemComponent.cpp b/Gems/Multiplayer/Code/Source/MultiplayerSystemComponent.cpp index 6df5e4611f..54f5534864 100644 --- a/Gems/Multiplayer/Code/Source/MultiplayerSystemComponent.cpp +++ b/Gems/Multiplayer/Code/Source/MultiplayerSystemComponent.cpp @@ -1134,6 +1134,7 @@ namespace Multiplayer AZStd::to_lower(sv_defaultPlayerSpawnAssetLowerCase.begin(), sv_defaultPlayerSpawnAssetLowerCase.end()); PrefabEntityId playerPrefabEntityId(AZ::Name(static_cast(sv_defaultPlayerSpawnAssetLowerCase).c_str())); INetworkEntityManager::EntityList entityList = m_networkEntityManager.CreateEntitiesImmediate(playerPrefabEntityId, NetEntityRole::Authority, AZ::Transform::CreateIdentity(), Multiplayer::AutoActivate::DoNotActivate); + AZ_TracePrintf("MultiplayerSystemComponent", "Server spawned the default player: %s", sv_defaultPlayerSpawnAssetLowerCase.c_str()) for (NetworkEntityHandle subEntity : entityList) { From 09b9d371e05a8dc085d40f5f8fac4ae01165f0be Mon Sep 17 00:00:00 2001 From: Tommy Walton Date: Wed, 10 Nov 2021 13:20:25 -0800 Subject: [PATCH 005/345] Use a different fallback image depending on the status of the asset. Including a setting to use a friendly image that is less obnoxious for anything that might have been missed in a release build Signed-off-by: Tommy Walton --- .../Image/StreamingImageAssetHandler.cpp | 59 ++++++++++++++----- .../Atom/RPI/Registry/atom_rpi.release.setreg | 9 +++ Gems/Atom/RPI/Registry/atom_rpi.setreg | 3 +- 3 files changed, 55 insertions(+), 16 deletions(-) create mode 100644 Gems/Atom/RPI/Registry/atom_rpi.release.setreg diff --git a/Gems/Atom/RPI/Code/Source/RPI.Reflect/Image/StreamingImageAssetHandler.cpp b/Gems/Atom/RPI/Code/Source/RPI.Reflect/Image/StreamingImageAssetHandler.cpp index e73d8e1c03..f241ba6602 100644 --- a/Gems/Atom/RPI/Code/Source/RPI.Reflect/Image/StreamingImageAssetHandler.cpp +++ b/Gems/Atom/RPI/Code/Source/RPI.Reflect/Image/StreamingImageAssetHandler.cpp @@ -7,6 +7,7 @@ */ #include +#include #include namespace AZ @@ -44,30 +45,58 @@ namespace AZ Data::AssetId StreamingImageAssetHandler::AssetMissingInCatalog(const Data::Asset& asset) { - // Escalate the asset to the top of the list - AzFramework::AssetSystemRequestBus::Broadcast( - &AzFramework::AssetSystem::AssetSystemRequests::EscalateAssetByUuid, asset.GetId().m_guid); + // Find out if the asset is missing completely, or just still processing + // and escalate the asset to the top of the list + AzFramework::AssetSystem::AssetStatus missingAssetStatus; + AzFramework::AssetSystemRequestBus::BroadcastResult( + missingAssetStatus, &AzFramework::AssetSystem::AssetSystemRequests::GetAssetStatusById, asset.GetId().m_guid); - // Make sure the default fallback image has been processed so that it is part of the asset catalog + // Generate asset info to use to register the fallback asset with the asset catalog + Data::AssetInfo assetInfo; + assetInfo.m_relativePath = "textures/defaults/defaultfallback.png.streamingimage"; + assetInfo.m_assetType = azrtti_typeid(); + + bool useDebugFallbackImages = true; + if (auto settingsRegistry = AZ::SettingsRegistry::Get(); settingsRegistry != nullptr) + { + settingsRegistry->GetObject(useDebugFallbackImages, "/O3DE/Atom/RPI/UseDebugFallbackImages"); + } + + if (useDebugFallbackImages) + { + switch (missingAssetStatus) + { + case AzFramework::AssetSystem::AssetStatus::AssetStatus_Queued: + case AzFramework::AssetSystem::AssetStatus::AssetStatus_Compiling: + assetInfo.m_relativePath = "textures/defaults/processing.png.streamingimage"; + break; + case AzFramework::AssetSystem::AssetStatus::AssetStatus_Failed: + assetInfo.m_relativePath = "textures/defaults/processingfailed.png.streamingimage"; + break; + case AzFramework::AssetSystem::AssetStatus::AssetStatus_Missing: + case AzFramework::AssetSystem::AssetStatus::AssetStatus_Unknown: + case AzFramework::AssetSystem::AssetStatus::AssetStatus_Compiled: + assetInfo.m_relativePath = "textures/defaults/missing.png.streamingimage"; + break; + } + } + + // Make sure the fallback image has been processed AzFramework::AssetSystem::AssetStatus status = AzFramework::AssetSystem::AssetStatus_Unknown; AzFramework::AssetSystemRequestBus::BroadcastResult( - status, &AzFramework::AssetSystemRequestBus::Events::CompileAssetSync, "textures/defaults/defaultnouvs.tif.streamingimage"); - - // Get the id of the fallback image - Data::AssetInfo assetInfo; - assetInfo.m_relativePath = "textures/defaults/defaultnouvs.tif.streamingimage"; - Data::AssetId assetId; + status, &AzFramework::AssetSystemRequestBus::Events::CompileAssetSync, assetInfo.m_relativePath); + + // Generate the id of the fallback image Data::AssetCatalogRequestBus::BroadcastResult( - assetId, &Data::AssetCatalogRequestBus::Events::GenerateAssetIdTEMP, + assetInfo.m_assetId, &Data::AssetCatalogRequestBus::Events::GenerateAssetIdTEMP, assetInfo.m_relativePath.c_str()); - assetInfo.m_assetId = Data::AssetId(assetId.m_guid, StreamingImageAsset::GetImageAssetSubId()); + assetInfo.m_assetId.m_subId = StreamingImageAsset::GetImageAssetSubId(); // Register the fallback image with the asset catalog - Data::AssetCatalogRequestBus::Broadcast( - &Data::AssetCatalogRequestBus::Events::RegisterAsset, assetInfo.m_assetId, assetInfo); + Data::AssetCatalogRequestBus::Broadcast(&Data::AssetCatalogRequestBus::Events::RegisterAsset, assetInfo.m_assetId, assetInfo); - // Use a default Image as a fallback + // Return the asset id of the fallback image return assetInfo.m_assetId; } } diff --git a/Gems/Atom/RPI/Registry/atom_rpi.release.setreg b/Gems/Atom/RPI/Registry/atom_rpi.release.setreg new file mode 100644 index 0000000000..d1be96431d --- /dev/null +++ b/Gems/Atom/RPI/Registry/atom_rpi.release.setreg @@ -0,0 +1,9 @@ +{ + "O3DE": { + "Atom": { + "RPI": { + "UseDebugFallbackImages": false + } + } + } +} diff --git a/Gems/Atom/RPI/Registry/atom_rpi.setreg b/Gems/Atom/RPI/Registry/atom_rpi.setreg index bcbade5d38..bf6d95602e 100644 --- a/Gems/Atom/RPI/Registry/atom_rpi.setreg +++ b/Gems/Atom/RPI/Registry/atom_rpi.setreg @@ -17,7 +17,8 @@ "DynamicDrawSystemDescriptor": { "DynamicBufferPoolSize": 50331648 // 3 * 16 * 1024 * 1024 (for 3 frames) } - } + }, + "UseDebugFallbackImages": true } } } From 98ca3aab6b2d9c2158eef94819182ae02a1d8d4d Mon Sep 17 00:00:00 2001 From: Tommy Walton Date: Wed, 10 Nov 2021 13:55:22 -0800 Subject: [PATCH 006/345] Adding the stubbed in fallback textures Signed-off-by: Tommy Walton --- Gems/Atom/RPI/Assets/Textures/Defaults/DefaultFallback.png | 3 +++ Gems/Atom/RPI/Assets/Textures/Defaults/Missing.png | 3 +++ Gems/Atom/RPI/Assets/Textures/Defaults/Processing.png | 3 +++ Gems/Atom/RPI/Assets/Textures/Defaults/ProcessingFailed.png | 3 +++ 4 files changed, 12 insertions(+) create mode 100644 Gems/Atom/RPI/Assets/Textures/Defaults/DefaultFallback.png create mode 100644 Gems/Atom/RPI/Assets/Textures/Defaults/Missing.png create mode 100644 Gems/Atom/RPI/Assets/Textures/Defaults/Processing.png create mode 100644 Gems/Atom/RPI/Assets/Textures/Defaults/ProcessingFailed.png diff --git a/Gems/Atom/RPI/Assets/Textures/Defaults/DefaultFallback.png b/Gems/Atom/RPI/Assets/Textures/Defaults/DefaultFallback.png new file mode 100644 index 0000000000..1352d14edf --- /dev/null +++ b/Gems/Atom/RPI/Assets/Textures/Defaults/DefaultFallback.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fb91c050a829ff03b972202cf8c90034e4f252d972332224791d135c07d9d528 +size 796 diff --git a/Gems/Atom/RPI/Assets/Textures/Defaults/Missing.png b/Gems/Atom/RPI/Assets/Textures/Defaults/Missing.png new file mode 100644 index 0000000000..3e9bc68ea5 --- /dev/null +++ b/Gems/Atom/RPI/Assets/Textures/Defaults/Missing.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:28c3cfd8958813b4b539738bfff589731da0aeec5b3376558f377da2ebe973ff +size 5455 diff --git a/Gems/Atom/RPI/Assets/Textures/Defaults/Processing.png b/Gems/Atom/RPI/Assets/Textures/Defaults/Processing.png new file mode 100644 index 0000000000..914499d6e7 --- /dev/null +++ b/Gems/Atom/RPI/Assets/Textures/Defaults/Processing.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8a0935be7347d695ed1716d030b5bae68153a88239b0ff15f67f900ac90be442 +size 5038 diff --git a/Gems/Atom/RPI/Assets/Textures/Defaults/ProcessingFailed.png b/Gems/Atom/RPI/Assets/Textures/Defaults/ProcessingFailed.png new file mode 100644 index 0000000000..558b16b96e --- /dev/null +++ b/Gems/Atom/RPI/Assets/Textures/Defaults/ProcessingFailed.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bb243cd6d6414b4e95eab919fa94193b57825902b8d09f40ce3f334d829e74e2 +size 6286 From cd28d210abef5e0dc20c331b99be2909fdd7688b Mon Sep 17 00:00:00 2001 From: santorac <55155825+santorac@users.noreply.github.com> Date: Wed, 10 Nov 2021 14:02:17 -0800 Subject: [PATCH 007/345] Working on making Material Editor able to open materials that have missing textures. Made it a warning instead of an error when MaterialAssetCreator can't find a texture. Updated the Material Editor's MaterialDocument class to not elevate warnings to errors. Material Editor uses new features in TraceRecorder to show a message dialog when warnings are detected so the user is notified of the missing texture. Next I will work on making MaterialAssetCreator put a "missing" texture in place of the requested one. Signed-off-by: santorac <55155825+santorac@users.noreply.github.com> --- .../RPI.Edit/Material/MaterialSourceData.cpp | 2 +- .../AtomToolsFramework/Debug/TraceRecorder.h | 21 ++++++++ .../Code/Source/Debug/TraceRecorder.cpp | 51 +++++++++++++++++++ .../AtomToolsDocumentSystemComponent.cpp | 8 ++- .../Code/Source/Document/MaterialDocument.cpp | 8 +-- 5 files changed, 84 insertions(+), 6 deletions(-) diff --git a/Gems/Atom/RPI/Code/Source/RPI.Edit/Material/MaterialSourceData.cpp b/Gems/Atom/RPI/Code/Source/RPI.Edit/Material/MaterialSourceData.cpp index d6308ec655..40fc9e096f 100644 --- a/Gems/Atom/RPI/Code/Source/RPI.Edit/Material/MaterialSourceData.cpp +++ b/Gems/Atom/RPI/Code/Source/RPI.Edit/Material/MaterialSourceData.cpp @@ -329,7 +329,7 @@ namespace AZ } else { - materialAssetCreator.ReportError( + materialAssetCreator.ReportWarning( "Material property '%s': Could not find the image '%s'", propertyId.GetFullName().GetCStr(), property.second.m_value.GetValue().data()); } diff --git a/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Debug/TraceRecorder.h b/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Debug/TraceRecorder.h index 96a8728a43..fc19aea2d3 100644 --- a/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Debug/TraceRecorder.h +++ b/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Debug/TraceRecorder.h @@ -26,6 +26,21 @@ namespace AtomToolsFramework //! Get the combined output of all messages AZStd::string GetDump() const; + //! Return the number of OnAssert calls + size_t GetAssertCount() const; + + //! Return the number of OnException calls + size_t GetExceptionCount() const; + + //! Return the number of OnError calls, and includes OnAssert and OnException if @includeHigher is true + size_t GetErrorCount(bool includeHigher = false) const; + + //! Return the number of OnWarning calls, and includes higher categories if @includeHigher is true + size_t GetWarningCount(bool includeHigher = false) const; + + //! Return the number of OnPrintf calls, and includes higher categories if @includeHigher is true + size_t GetPrintfCount(bool includeHigher = false) const; + private: ////////////////////////////////////////////////////////////////////////// // AZ::Debug::TraceMessageBus::Handler overrides... @@ -38,5 +53,11 @@ namespace AtomToolsFramework size_t m_maxMessageCount = std::numeric_limits::max(); AZStd::list m_messages; + + size_t m_assertCount = 0; + size_t m_exceptionCount = 0; + size_t m_errorCount = 0; + size_t m_warningCount = 0; + size_t m_printfCount = 0; }; } // namespace AtomToolsFramework diff --git a/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Debug/TraceRecorder.cpp b/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Debug/TraceRecorder.cpp index 3fd069ff0b..5f8c8b9004 100644 --- a/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Debug/TraceRecorder.cpp +++ b/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Debug/TraceRecorder.cpp @@ -31,6 +31,7 @@ namespace AtomToolsFramework bool TraceRecorder::OnAssert(const char* message) { + ++m_assertCount; if (m_messages.size() < m_maxMessageCount) { m_messages.push_back(AZStd::string::format("Assert: %s", message)); @@ -40,6 +41,7 @@ namespace AtomToolsFramework bool TraceRecorder::OnException(const char* message) { + ++m_exceptionCount; if (m_messages.size() < m_maxMessageCount) { m_messages.push_back(AZStd::string::format("Exception: %s", message)); @@ -49,6 +51,7 @@ namespace AtomToolsFramework bool TraceRecorder::OnError(const char* /*window*/, const char* message) { + ++m_errorCount; if (m_messages.size() < m_maxMessageCount) { m_messages.push_back(AZStd::string::format("Error: %s", message)); @@ -58,6 +61,7 @@ namespace AtomToolsFramework bool TraceRecorder::OnWarning(const char* /*window*/, const char* message) { + ++m_warningCount; if (m_messages.size() < m_maxMessageCount) { m_messages.push_back(AZStd::string::format("Warning: %s", message)); @@ -67,11 +71,58 @@ namespace AtomToolsFramework bool TraceRecorder::OnPrintf(const char* /*window*/, const char* message) { + ++m_printfCount; if (m_messages.size() < m_maxMessageCount) { m_messages.push_back(AZStd::string::format("%s", message)); } return false; +} + + size_t TraceRecorder::GetAssertCount() const + { + return m_assertCount; + } + + size_t TraceRecorder::GetExceptionCount() const + { + return m_exceptionCount; + } + + size_t TraceRecorder::GetErrorCount(bool includeHigher) const + { + if (includeHigher) + { + return m_errorCount + GetAssertCount() + GetExceptionCount(); + } + else + { + return m_errorCount; + } + } + + size_t TraceRecorder::GetWarningCount(bool includeHigher) const + { + if (includeHigher) + { + return m_warningCount + GetErrorCount(true); + } + else + { + return m_warningCount; + } + } + + size_t TraceRecorder::GetPrintfCount(bool includeHigher) const + { + if (includeHigher) + { + return m_printfCount + GetWarningCount(true); + } + else + { + return m_printfCount; + } } } // namespace AtomToolsFramework diff --git a/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Document/AtomToolsDocumentSystemComponent.cpp b/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Document/AtomToolsDocumentSystemComponent.cpp index 00de2a7c4c..3a392c1413 100644 --- a/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Document/AtomToolsDocumentSystemComponent.cpp +++ b/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Document/AtomToolsDocumentSystemComponent.cpp @@ -495,8 +495,6 @@ namespace AtomToolsFramework return AZ::Uuid::CreateNull(); } - traceRecorder.GetDump().clear(); - bool openResult = false; AtomToolsDocumentRequestBus::EventResult(openResult, documentId, &AtomToolsDocumentRequestBus::Events::Open, requestedPath); if (!openResult) @@ -507,6 +505,12 @@ namespace AtomToolsFramework AtomToolsDocumentSystemRequestBus::Broadcast(&AtomToolsDocumentSystemRequestBus::Events::DestroyDocument, documentId); return AZ::Uuid::CreateNull(); } + else if (traceRecorder.GetWarningCount(true) > 0) + { + QMessageBox::warning( + QApplication::activeWindow(), QString("Document opened with warnings"), + QString("Warnings encountered: \n%1\n\n%2").arg(requestedPath.c_str()).arg(traceRecorder.GetDump().c_str())); + } return documentId; } diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Source/Document/MaterialDocument.cpp b/Gems/Atom/Tools/MaterialEditor/Code/Source/Document/MaterialDocument.cpp index ee58cbea3e..6969e9f923 100644 --- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Document/MaterialDocument.cpp +++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Document/MaterialDocument.cpp @@ -714,6 +714,8 @@ namespace MaterialEditor AZ_Error("MaterialDocument", false, "Material document extension not supported: '%s'.", m_absolutePath.c_str()); return false; } + + const bool elevateWarnings = false; // In order to support automation, general usability, and 'save as' functionality, the user must not have to wait // for their JSON file to be cooked by the asset processor before opening or editing it. @@ -722,7 +724,7 @@ namespace MaterialEditor // Long term, the material document should not be concerned with assets at all. The viewport window should be the // only thing concerned with assets or instances. auto materialAssetResult = - m_materialSourceData.CreateMaterialAssetFromSourceData(Uuid::CreateRandom(), m_absolutePath, true, true, &m_sourceDependencies); + m_materialSourceData.CreateMaterialAssetFromSourceData(Uuid::CreateRandom(), m_absolutePath, elevateWarnings, true, &m_sourceDependencies); if (!materialAssetResult) { AZ_Error("MaterialDocument", false, "Material asset could not be created from source data: '%s'.", m_absolutePath.c_str()); @@ -761,9 +763,9 @@ namespace MaterialEditor AZ_Error("MaterialDocument", false, "Material parent asset ID could not be created: '%s'.", parentMaterialFilePath.c_str()); return false; } - + auto parentMaterialAssetResult = parentMaterialSourceData.CreateMaterialAssetFromSourceData( - parentMaterialAssetIdResult.GetValue(), parentMaterialFilePath, true, true); + parentMaterialAssetIdResult.GetValue(), parentMaterialFilePath, elevateWarnings, true); if (!parentMaterialAssetResult) { AZ_Error("MaterialDocument", false, "Material parent asset could not be created from source data: '%s'.", parentMaterialFilePath.c_str()); From e40b226374b8e21f4a7614e05ece103057097565 Mon Sep 17 00:00:00 2001 From: santorac <55155825+santorac@users.noreply.github.com> Date: Wed, 10 Nov 2021 19:22:44 -0800 Subject: [PATCH 008/345] Updated the default fallback textures to have a smaller version of the message they they can be read at different UV scales. Added assetinfo files to make these be processed as "Reference Image" to avoid texture compression that makes the text difficult to read. Signed-off-by: santorac <55155825+santorac@users.noreply.github.com> --- .../RPI/Assets/Textures/Defaults/Missing.png | 4 +- .../Textures/Defaults/Missing.png.assetinfo | 91 +++++++++++ .../Assets/Textures/Defaults/Processing.png | 4 +- .../Defaults/Processing.png.assetinfo | 148 ++++++++++++++++++ .../Textures/Defaults/ProcessingFailed.png | 4 +- .../Defaults/ProcessingFailed.png.assetinfo | 148 ++++++++++++++++++ .../Assets/Textures/Defaults/wip/Missing.pdn | Bin 0 -> 18928 bytes .../Textures/Defaults/wip/Processing.pdn | Bin 0 -> 18995 bytes .../Defaults/wip/ProcessingFailed.pdn | Bin 0 -> 21667 bytes 9 files changed, 393 insertions(+), 6 deletions(-) create mode 100644 Gems/Atom/RPI/Assets/Textures/Defaults/Missing.png.assetinfo create mode 100644 Gems/Atom/RPI/Assets/Textures/Defaults/Processing.png.assetinfo create mode 100644 Gems/Atom/RPI/Assets/Textures/Defaults/ProcessingFailed.png.assetinfo create mode 100644 Gems/Atom/RPI/Assets/Textures/Defaults/wip/Missing.pdn create mode 100644 Gems/Atom/RPI/Assets/Textures/Defaults/wip/Processing.pdn create mode 100644 Gems/Atom/RPI/Assets/Textures/Defaults/wip/ProcessingFailed.pdn diff --git a/Gems/Atom/RPI/Assets/Textures/Defaults/Missing.png b/Gems/Atom/RPI/Assets/Textures/Defaults/Missing.png index 3e9bc68ea5..198d034892 100644 --- a/Gems/Atom/RPI/Assets/Textures/Defaults/Missing.png +++ b/Gems/Atom/RPI/Assets/Textures/Defaults/Missing.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:28c3cfd8958813b4b539738bfff589731da0aeec5b3376558f377da2ebe973ff -size 5455 +oid sha256:7028c8db4f935f23aa4396668278a67691d92fe345cc9d417a9f47bd9a4af32b +size 8130 diff --git a/Gems/Atom/RPI/Assets/Textures/Defaults/Missing.png.assetinfo b/Gems/Atom/RPI/Assets/Textures/Defaults/Missing.png.assetinfo new file mode 100644 index 0000000000..264a7f2a25 --- /dev/null +++ b/Gems/Atom/RPI/Assets/Textures/Defaults/Missing.png.assetinfo @@ -0,0 +1,91 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Gems/Atom/RPI/Assets/Textures/Defaults/Processing.png b/Gems/Atom/RPI/Assets/Textures/Defaults/Processing.png index 914499d6e7..14c3ec76b0 100644 --- a/Gems/Atom/RPI/Assets/Textures/Defaults/Processing.png +++ b/Gems/Atom/RPI/Assets/Textures/Defaults/Processing.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8a0935be7347d695ed1716d030b5bae68153a88239b0ff15f67f900ac90be442 -size 5038 +oid sha256:a7d94b9c0a77741736b93d8ed4d2b22bc9ae4cf649f3d8b3f10cbaf595a3ed31 +size 8336 diff --git a/Gems/Atom/RPI/Assets/Textures/Defaults/Processing.png.assetinfo b/Gems/Atom/RPI/Assets/Textures/Defaults/Processing.png.assetinfo new file mode 100644 index 0000000000..4a234ef9f3 --- /dev/null +++ b/Gems/Atom/RPI/Assets/Textures/Defaults/Processing.png.assetinfo @@ -0,0 +1,148 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Gems/Atom/RPI/Assets/Textures/Defaults/ProcessingFailed.png b/Gems/Atom/RPI/Assets/Textures/Defaults/ProcessingFailed.png index 558b16b96e..aafdcc2681 100644 --- a/Gems/Atom/RPI/Assets/Textures/Defaults/ProcessingFailed.png +++ b/Gems/Atom/RPI/Assets/Textures/Defaults/ProcessingFailed.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bb243cd6d6414b4e95eab919fa94193b57825902b8d09f40ce3f334d829e74e2 -size 6286 +oid sha256:3bbd45e3ef81850da81d1cc01775930a53c424e64e287b00990af3e7e6a682ba +size 9701 diff --git a/Gems/Atom/RPI/Assets/Textures/Defaults/ProcessingFailed.png.assetinfo b/Gems/Atom/RPI/Assets/Textures/Defaults/ProcessingFailed.png.assetinfo new file mode 100644 index 0000000000..747ce3e0e2 --- /dev/null +++ b/Gems/Atom/RPI/Assets/Textures/Defaults/ProcessingFailed.png.assetinfo @@ -0,0 +1,148 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Gems/Atom/RPI/Assets/Textures/Defaults/wip/Missing.pdn b/Gems/Atom/RPI/Assets/Textures/Defaults/wip/Missing.pdn new file mode 100644 index 0000000000000000000000000000000000000000..2ede3d837b276aca67709f35c243bc30cbcd7c35 GIT binary patch literal 18928 zcmeIZdDPp~xh|eCg)o#da|#6-3N1%~EnBjrLXv8-E!(mr&oabKu_}~M z2&37Q(IvqrUo4w!*#J-6Buaz7$pgjLL`9pVkhOfV5ameML$ri6NhoxrGE9N8LpvPc zvQ(ZVW;E8UYavN89uJ}zLu!pdKLuW(;_YI&KvmMFj@6^NCRM5snl=_9K4*|tw(K}P zi!`lhvOpy{2`{lUYw%{eT=e>tq@;`OE={&vLdH{BBcRfj#G278h4+ne)8a@Lk0wYX zl}VCOE}6ABdRV5Aj2P%p9jfzjf7A%Dpx$b!xRD-58e`qWVA@)rxGEuIsjxN;(4G3@W8@ zA`??GYa=Xxh%4DfQYUN5& z>le6Kuaea55nmO(D%J=_8k!1XovNG9$|-M0H;dBVy5pIWUWVb0;wFWS_wNtwntLNv+PP+t0jlUZZDdkh7p&d zhE=x`6Eb40?iFK5ATUkQX$Y2|F62-gi&Y%nOwP9DLjG8awDQYK*Ro>a`b?Rq1ODS5i8`Z3SNhL$S$ znQR6rDY0oQ}Qdlq0pf7p$m6$NV1}OmQGd;S=VZ; zX4JTG7Y!ZMZqbM%mT1W|7?o+ExJXfUyzY<&&IF>8H~alQ?5nhpO;=%#N~K4cc)~6j zu^5zR>ahgllKFJCmn+E?D#r8-LtwMrbY)nO%3LJTtLT-64plmF%twa^F|O5gO&9Z4 z$w3AUgKwDWG1tnM_>wSo6dQ3v3(2^QQ)Y}(vVaC!CeZ7w(-!W%I74%xWm0{wDocC*#!`m67otDK^CF6R{V$QmX>$9xB43wEle_<5sNBZ`h~_rg)Br}`|_fWwqfQ+=aA)=UWMx++A+ zEHl%K10kX$-*S_x*5Ht)J3ImmaEUP$yY0-OXLvlis(f)>xULNX}f zUNk;1v}S>d2{BN8PLC_yW<5fnF-(CqNm6+u(iv-Tj}I%W6GxSTD4~D#EdF$i(`iDqF}W1DekBEYauFifKe$F^*^!QG~>j z(yF=~Nwg8-8 zNN|qn@Mh2(`C@HQb;e`D)3h+%N)+&cD4J%&k&4M2Ch;Oz^M;{CIvpmLO!8C?0|!*! zZ@3hncM;JZ_PS)wv#loRDH1aMAXD~vQXL_vhsTjlL36Q0Hqx>ptxlm_@!Up`$X81! zJSx>k-CR3JIm2-ebG?Q&Y^XW6#pWY%jBuU7z;t1%9MMK~u~;Z*^%UY-deCa4;99iH zu~c2pv9VlxEMW=GtVLO}j(HemHJNeE%M6r!J~6q!n(Q!9r7+BJ zjJoZrTF#n`DkpFuo}>a*bb4jTw}yDSSR@BpfoT zNE>xV1+;@}O>Edigt|FwTT*6hgm_XZR&%nSE4pOX$O+{*nCH$oY1^r2LkpYaV89wQ zV|6;cvTG4aFjRS7A$ionTXeS6Y!1@tVkQr@ikcGZv?RRJVt6}3A>h)EAzfoACHeL^ zO7KJ$Z89-|)KiKfhM`zWRbp70YG`t~r#J05$tn?3@&`^S%~WBln`TU-k>*IWL7HmZ zLHRMAEVaNmUC1F5m z7&358BatRH7?e6OCfBA5-K1B*QcR^@$QN2<5g}nJ%#vwSwaErsDyRn8qVi=rPNrg9 z$ff!tlF~?}o9UAcL^8tU^f^W*NxP*e=C~d*TnlELaVwoqH%N9UmdPdnqA>k8+{1J< ztKRjJ?No_U4Wm>8g5YN40viPfA{PxyvF@nK74j8_q=_sCNl54y3r0Lkn?@{PhX`LK z5i>Qe;ZVkI#K~mA?vU-UY$XD=I!>}xK`MA~M6_g)mlO^PNl{Q8LECCXp%TyN@#~nGI8B7=??ivb#e!34C(16lE8 zOUdzMQjySj7d#dk6Zt{Gz($N?h1GJM2Ui-E*GQu8wasZ+GVFpiF!Fp(YRUPCX@p&^ zVDLJVGz9LGHH$Ywsw|^nMoV&mYbL#6A!)Z*HQyW~4l`y`mgtepcp8tfsaz_HLQ;YZ zl2(Bs#8JA;hF+DMtW_ekWVz2NX4>gErM`slI>k3wjnOh=&4YVdI-$2xzQB&^gQh`r z<$g9n4!aE0sMJtp!+?;JC0DAN9J`zT8XKHFH$(6tpfSqFTFNP2~|9 zS29UEYL(J#l#t_bOx2k32#qJiav=xyKv*!%t{?H)0Y~DR#p1(S*Q+Agj8>MzJY`g5 zp;IJPn#nc?-AqojhE}HQg=D2?bbP6WREmv3h$wlZhvk!HD^5{PKlrnFd%WJ5l1N+klMk6jx0B|1%yV4QaFebLRif)dQV8FNRe%7G~6LZy;dUE9O{lJj*t|UPUrKrjK$fdVFgyL z2HwtFe4LV^iGUlDL19oDo5^9COOE)20AyTFkXc2Aq=H3`uyzZLVv%t#W)vgMASVT| zYQ)>6=3v~3dNFXl2U)?2*QJ5R%W|9>j4VDGH7F6%Qk0nQg%t!~7_?MxX>o(Ml2ENx ztW+w4x)+CI^;VxjnhHx4T16+7j6~w`sK8@TFp!FV;3s4^8*h=xypHQSnU*@ExZlqV2FVu2Ca7{=-67_M+E)9|}-pxeOZmbmQ zf#49eIM!$^!~<+M6#BG9 zx`hEe!hDT|8hxizv%QAYFGS;|K~Oe|xP@SPybIwZIu^w&LzPXh36Cr~O zpkaED%-L1BJXB$asS?Ryy;|w1rdH_LO&99cI-EI(#LL8^D1c78KB@~NBpzEnn)l-oir1YM`0XPjLSMJM00>F za4evkb);^MA#?{G$4ZO2D@_?<&}iURhV0b*E}JgbIIk%V6Qyv7WtgE#R3}{)rka{Xo&WZ&o79YuVDDZLC;Y!^eWos3jg2<3F5GPxL zF{LG@?QtYAh*#}sgE!a=F^WcG z-Bvt=%JIC{t759z>!z~=fg53tbTD z%>YNAZuto|+ZNMsyE%+vXu=9Y+04)`$%)BSt&$x?f_TIA^R<4I8x3+00HtLI&~CjX z#AZj$*;Pw(otmR~E zrclLI%QT86R^iC7M$=J_#^9QlHik4iz=&QQ!&+=d%LDzoMsqv~js~LLiSZrB9wN?gh)RI!mulCx5NM0Bs-av6YR2;z35~m4mGRh7IdOaV-)l9NnF&!=ocQ8Gr zj&!bAPWvP@sw2=al$miqgCr<9TQtWg($wH=Ash3|B<#}7rZ0t&W~)#{vW;r9IaEZE zHqi8tqLU7#dO+ZhTyWzh!}|!#C#BINqSZ(&<^XMMT@VYXoe3HiI^Jq zSRCi241shjJ)88(l3EkOXkITC6Hq2~Hk!%T#Jv?^9Al9P&+g~+H2P$!B;uyhBLVKrqdfTl$o#!%xKJ3ep| z3E1qR{Sh6BHj!R*JZy^La6p?}8xD&?3|6c}A1K3pCCG(%42s3WM8NpnTo}tGQ%c&R zg)XVf64mz^Bh?}s*{I|J9=a(Qc?d8#s?w7K%^}T-z|lr8tq_dnxnN+XTLbYUD(i9cyHT&TB=r%NP_Xi9iz=(qT00Bs}RseR3YFflA@}KPHDuC z@_C1*;#i3KI7&on?O2?#hn6%BTej75hLmA+ICHAN=ZzrQ=-91svWGc%US`-tFA^aIwU%NXA_`& zsft}3b85MEEgJ9la%sS&*(3nytW>VY0aFv?lBVKUr7}{__278i@5JEtKn3Om%R+ie zKh^V^9aO8-Yrd;$UNliJfQ^+YHS$GI2AoL+FycfmG&QPJcC!7jlZjzr+K;);$aBaP zRw5FWG@J12kwACjS*IjI7zU7-P^&N|p(o=`ER^Hpbek@<1SUI@I&m&$Fa<4@WO$*1 z+7Vu{=<1jqV;W8X{#Qu`a0H9PV?%6|Twub;q`S-zuPZ`YXH&4Mnx$&ot7ggoK(~QH zNvF7MwLJvzi^D2jzYrn_)kS$r4&$YQSySVRJBTFU0ifov1cpVGj-`-8Ba^6*fP?sq zFXc3Faf?aLneY;Ni`G%9R8Vq#zD3tE&O?8ZhSCl$DD10Pad8zV^^4P=xwDWIDN&6Z%~Ot~dR zO1KGAd@gBC_yob@oK)6Ibqi<@Z6(0oNgJhfAx*|FhG|vER_aS0a7$GT|Wt@Br4Z3#{tE|)#Av?7=9?#T_f#(j(d?aSUK}I`DdGa zLr(QFVa^7&Lmsk0r_-(^OH8338SukEZ82TSwM!gb(mE-Cbps*A@lj=fjrke?pJhg) z;x;#`m08X!a+MO`goZ3onZ?9}NB_JY9a2&WE`rklkCzQeiZI>DS!qaLkRh}i>dibR zQG5voBP|JH0T6ciQj$#LtR{b+A2Y{bU|V@(GMSJvSSy)Nc7raki~_k*5Nceh=dzqb z1MVYbr<_OlH!8`Xt= zvQp{Nus!sxxawBgbwq5mdND$2$ezac2LlZ8vx$La+XK%YBMKDBn!d4W3ag3+>zSyVbzXpQ&?5s5U~1e|P2 zeUzzaj9BAS8k9`}HXT9Yel1jEE(XPF9f~QJ5b< zd_2dBq#R|k?MfEc5lxlzDP-)|TT*LOSBi*lMdF0Pm-8B>b>vu0tVlT;BI>}5+pR^L zazhK^!$wod6WKoLB$~01q2O)=@@zSv=wY&;(kYTmrtL&3J1X}3cAW1g`q2zr3#%qD z7)KL=is5j+Q|b#I8EXi(Ga4nBA%emo$;i2UvS#r@#5L+_Ey+^MC=%(nD`*AAP@qu+ zkP0UP1;TQDqLPggf!a3#}1Fy?ohab{KiWC^_m=yI;&068*S4 zE)Rk29nq?OmhSYUfS9rqjZ9IaRGd&CSWC%4;F)kjsi1CU0PN}`$gKo9GLAQxda_+W zFyL6xv@#9_Q7OP9XG_4=ogVMVk!rcy=b+SBE+>a2qc<3-@u&@qZEcI@4Zb;GOL)f`=G5tZOv)o|F!l(sRK}`F zJ6#$e;vfZ}2p=2EL$~gCRa@}~RUu`TgP@rU0tiEKf@R_rdel%nydI(f+^LenC`nbL zBN)&LY9^XsOWI%nu(?gDVclTk#2^CMrLaopvusce02|mC$VT2XIKbacaBQas_;#+C zW1CT&YiI?UYK)7~dde-1uqe3PAe%F^7Ai!5!rslBBds60l~zH(dibbNY7a@Hq>)wH zZxFF|fB-~BvmHQuBQhsqb*;!ngI+(;wt$^82^kVwZ?vfdLE9`)Rtsz$83P_8OBorv z>y5#g1n!rLIf`MF$x|rVD*5rYKasHpD#A``G{l<)U`J;tCMK3CH6qxG0;e$E7Ai1| zGU>X~%A|oKMz(`PS<&?|0&I1*)PVZsWYXZ{Xsm(NA{N~!nJrcUBxiuKF5uWoHe8o$ zOx#FP#SCXUhLaw&QHBg{mEpmT#?$CE9(OnrmU-~MFX+%+=v@xM+38% zk*ZNYVh*Oc@`_u4#EJ>#f%V~`o(U`6a*yxO4wt4RF$K;t15ju&he>{FSNOa89&EQR zsklJ8JdxmFmw_?4CG;~=V0fY$*jmcaif!O05dw=rkaSB?#)yvlZMu#3m~6gWtubc1 zjS*!oFF+=Sr)WT952JOmBxZHBgDXsu6eKMZ(FtgT%4#*+bgW*ZnM=0uK;lMv4aK8= z9MdvJOq7!G-gp8MeZ0t&4I`uF+A!00wN?hz@&GHSEFi=t4@80j@O@O*sL$0xTVkLNK1Lp&~ z4(yMHr~=_jq=>O5MN>|^UMTk)K$ z^ha(omecKM292;vv8Zu|0j^5LOQVAl93kS8Qg1SBiLAnQw^YXC`3{L3c3VnSIrC=6Z2xgLOTGgm(GkK z6(e8<)LJUHh9Wn1#3<}d+pbW6lQTfIVx5fDY)6`aChn6>CtL6)et=}LToDRcl$JSe z?wo@o^Nxvp>Vz2i)W31wjG5qX#*8WOnfy*ZyKDmjQBsIc2h%~@4_tk2M-O~gX&-U02<}Hq%j%;Npl~{KJ3+g>{iOQ6zEEpd3mm=U?*KA( zvOLD}dRY!OEGR#OZFkt!qAT+4PP|=^fp*w4*?$D@r>62p5lU~`7-Ic%4jl?&;n~R*}Hu%!L!Et z9-oU3wtByA2de*v>%4U>CgJRfEXyX)?-fVVo6A1big zjoAwd`oNla+JcwB^6t3fr07wg(wz^QF=OMu%$PB2GQ?@Yo;+;(+W&|J-);lg#Q!sf zIuV;~Tl#4G!DOq>oVmknkg)65^`X@~%2$l&vC-pq*a;+EJL{N9+QC+1?wmN1z|c7d zx50TdCxHRCZGY6$fiw47$)f&%E9H-SP3T*wEv}93owbC^x;3Q0k zz$cq310+CNay38JSh!SZPy1qnH~y24s8&gmoh|^-rzgkY@qbeKzmt^*ZkS^kxOtPs zNpTAB<;C#mq<@*oAv4>tMN(xr*VBczg&ku z$)C<9%UZiolqOl`^mvUr{KdHZcln^bkvb`APnU1iQ*bcdetWvYNxU^3?@YJXQmaFF zdOYA2@Bwb^z=b_k2`ZJzYLKl-kS3`#$+pOnL`lFuo|Fv=CV_E51*APmM@dDZf=Rj- zQbm&0NXdb{Ms@oA$?GIJ-IZZmZC6T@Xll|GDkRI~q#kZkPmfITlSO996i%uVWlq-* z%2ktXW!f`;^5PfQb6mIi(IgpsD2APss_BtPWSjx*Q7C9%j7cDlb(ZoZ}RG3@{a%l@Sp;r^o925ViP2aCJ215FfEVZarz_oKvg+C4I)5qrcBM*DrY1) zJ#M=0$l%Rv2ju6gpg$}zd99~@wmy^S^b*iE(1poL8U*Y(54JRGu%nU5j@}g{F`wJe(NDKCocMG%gKhoE zZU(${Pwhy7>Qtf}BL(~j0V_0j8VJpN|I=1>`$8+|q?Ip&q{!b|i4mak=|khQBP0G< zBcwrYt?->sE8OD?6(%MX?g^5x&sB(nil!?B|5CE`3VHyR5~65Ad5AG8O3u5IzNW+(T_o}YiCxV0OT`Ix!mj$iwH*4D0RUQNY(IJN|6ivkAZnHh7Q7+!wma{iL7&XxJ0E_yYdk!2|HOp>OYLN+$|3w*#2# z3oFX&PS+h#?XK3E%-Q67$|v7Rd$Yd=BHK?U;=i8Ci9~GI0Y--ZFVvqkL49DvyI3Bj zXf4C-2A#&NZcouHe>8h~D)??gpE<#{+x<^L`7>v3^Oesp{2I?(`w$SHIdf|J7r+7YpS(XUWYdS!f(0{noYXe?%$!K^w5T6CiA}_LB1@-y@||At z!$4%_M6@T%zQZ>_Fl)MN2gkOyJ>%Ommw~n??Ss4-+aC;q|E3gA%1^qo{Y0$(BRQN1 z!H!@P7`~Z6W}Au!e2#%ivtvVV>aMFdK=$mJGbfS?`Z*oWm^o`QE1$;xr|1ncCu?}{ zWZaV_n@s6vQ!sPqt(U}f+OD$>I&;VArx`oFb@8)T9>DH(@7moqtUgDWx8dbecl-Xq zKl<`^yYD`Gk2!nn#q3^U#K-sR?{@k(JALkjXmZc>=;?c`M_*m?!p*y{KlI*1`%ABT z@#rUBTCm&e`QXLXZ(s4o;y2EJ!F%~94`2ND`HMF$`Brent!s|nd7oTz=O=I2^QQ$Kq9mdpNW>Y+6!Fa7w#=l6g7n&aOx*F0U>H2&*@;}1T3zBqf~ ztEV?Ny|ntNAOH4=(<7*Iba>+mZJ(pAD!=se6|1gY^4uA}X@2wFN3bW}TXWxmt>n_F zm+~8oOM>MmeE96s$IWP7g|0QuB3}8I`r+^0iQID3hM((GTb@7t>1&+QON&>$z2}}U z4!>K!`sve`pRnfYTi!W8Id$S+|E+T9hBLV%q=V*dNi^jpP5zL3_g`?s6>tAwYT;Dy zD`Eb{XRZB#Fz@`c7TlJ*cb9c(55$5Ol^AN^tC@&I`uYwU*pZS zk6lN+yW;G(p4ASWdgzZ+=V|uiCx86N=8J+g7xdr6e*E5>FL<|IR1mtSHm_UO`Pr2I z%EFCrpvI#|-u}BITgMDuS@=|W-Ksm*|7MRZPZmEq>HOPIU4y;#P-Lz4=M%$yx7_{c z+!LOgJ@x9Dn{K@Q-9L_zxo@rf@k0;nJGJr3Jx}=QMdSgUzr4e*=$3DK@0&;WZ=d^w z^X?@lzklJB{t>ziS$X%2Eh|r$=Zznj{cbk0>zS`~mz@9gJ6Aq(!OlNa@4x6f?lvd> z>4(2NZuPPS=k$m7eQ64R_{8PcAKRII;bX_26#Q)AaSNY1sr|x5A1$#WOZI#EwEeE- zKVJLT2k@QfVdo7VC6vvV-0;mO?uW1FJk~#8&)jY6p8nmun;YDb{dq)k>4wu*zI(>P zk2aik&E zd9N>A_MQFr`IEd1{V{rPG5^55{r6t2-=0^Vt1ftBqp(z);dH*TW?QJzSWmm_ezNY8 zpPc;gx286(d&Iotq@UgQ{skXhaq)GlHg*@@Y^>9s4wsLNe||1p{@U+vf9b{}Puz?> zbkOk5ldkQ$f7tV}-D~?EmVf5vGk==e>!Z!9&v|^-K{vm%?t#q*z3M!@`JnfIH0P~V zx9=j3Aw9k2esO^KrEkvqYzO{tir)EM{FKVf3$zdCt-a!;(zUJgzOtQp+q$*Hg^5Gg z?|xnPh2RC}CNx=?KLmNtY`AXfce~8J6xsCnPJ7Ug-MD)B{MF0QBR1)e9gglmwfN%( zvhYyy`py&Yrl5VU{^#reoeom7-nevp{Ga}~{K;Q__n_hZ#xI~BZ{FmcP&xOXcU`#d z@w*S&e9MB9tyybE2fArt`Nqdn7hdLAa_3D?wLJ8r=y80p=41b@!XE9S1eTYl@l`l*+%+vY>__PwtD=!xC7n2$by zp8jHwKIEorc1>RR&;{J?n|8y$>+Umu;}flGZ+P|A9gItkKO4QGd+X)9FMNIR+>39% z|r(k6)d2^I;aW@he|>_~Un$pY+a#6|Kkj z?|$%pA9;DhS=Zkh)nAU>p!|08A?p_Z!Nt{6S8el`eP4SgcJc?OE|r&k|Mod+ZasV6 zx6Z$0F9O?Z;hSr&z3kFczvM35@?yCDtbgl2{^48CpD<_fxeMN2x#O)5tJaF+pWU$H zgRjOf^DdsX?4I0<&&=7dw*GMS?3)*P^m~^b|Gpi4aJ=7JYgQlqm-W}Jtna(vg=4Fu zw{Lm+&+n$R$|B<8HOD-#=aS8d)4km{oqoFd->~0b=B@bAA@&cJ{q^H}E;;#<%0Vk1_{MGT{Peb8?Jpm;Wzpq> zi;tdn&XDe`zJjmad&}20y#CjH6I*_^?DRb^eC;dOy+2y{6Sa93y33}2TCXn}Z(jG> z2}?IWoqzbB9=v%xaOoqgPQ z&)aYzx=roqpDyn`aOm9pt#6<6uRmCN%VO`HJ02OnbuV)7hO4$5Fn;@Y?-@(xz^4$0 zqlBIxzxLA`ZrfZi)__BF>pLF0MOM{cX^X!HTA3d(F?snJ>{zG{9 z%!U=m7~j2S@86xAUJ$=8vijBo2G2AO-4GXkdco4yDvQ?bQGDX*8+SN;>7wjaXFqtr z?N@nM-nsmkFTE*$eCcM>dwTr1e9#BirR5DPo?LX#%a^})(x$1KSJ?md^4XW3u)O=? zUDt!s3s#%`-R=n&$J(17`1Rdiujr2~JoDwp!v6fPuNe#TZrNx3-iuC%=ocNk{gxLN z?0v{(S8Q{_L7V#5Po1>po_+2D$JT8tzIMxdzu~XOzp+jA>3yw3-WDEO7fZTJFIxoa zo_Y{EVe=W7Y?ZDMnZ{O=4483#I_ZQaZ&Ut>-pY+9`-s^w);x7_lj3&VHlldgaM+l$Y=_eX0+_x)-22ll>Szh(V*)^){qmhK9$$RpQW ze$EpMH@s3hZq|9XpLJ68(aeA6|=ZCz>6dq?oM zmF`%!!^#8m4@~{xUE#{L-)-%GrvBsmj@tD2z0}mh{`G%Y8$INmpWJc(Z|414{pwls ze}B%c2ma>LkIq~6^HtwI{obEFvj4f~MEr(ay z*Ij#^dF=T& zXE&~1vZTQYd+v0|eXI7J`tt$bc`tI%)SuBC=4^QWy-S|+zP9}8_m*zjARPY}<(`En zY&pAW|8!ILp?w|!DCnlwr_4L|dSHrL`AYWO!?amzx#bs(R{i|>wevr?;*1YZ`)K7u z=dS-?DZS=vzu32V;gieP1(&~d$h}{=RKD-=zn;18vR8whp7`x`#|6ipb>*2K-nidC zf=2|J8a{I3Q;*92=9~80a?QyPZ#)Y9`J2x@|0ytf0$F=GdG`U|3zS#?<;S<3xB931 zo;|aWeeRxZpSyT?VK8;tF~7Qh{cUe=|55GPVAbo_O`i66y>4HZO{eAX;1KxjKIQ-ZDTFA_PJ@V0Jp!072{qm(JoxE)6SFI@5A1@oVJWaEkOX>H-fZBLv3)Q{cY9e3^Pzd7KyTfRU4sXN|UdOm&q z;uya9^0y0_!|&PrrC%?(>+N^Wdi3%w|9sOGcdQhG>*g(Z_-oG>*WdYy5L|k|5zE%x za`>z(mcA?m-H*E~zkKy&yW|&MaU1AEe<^)=_je!PcByy8(g&}$ul=a_;#H6B>)rq1 zlXH6;iZ6b1)_SIszikZ@G|Q)*OE76PK($3iSVlcf{5Ezq#e@RTr(k*1ht% z)|L{sX6-!({9$ge+X3MD!Mof$7GLQ8V&l$WR5wmFzx4R{!IwX{?AGkzzus&8(f_(} khufAO{jJOX-%$VGs{Y>+;LPE_-tOJq-Z-`P>|`tdF9H9pXaE2J literal 0 HcmV?d00001 diff --git a/Gems/Atom/RPI/Assets/Textures/Defaults/wip/Processing.pdn b/Gems/Atom/RPI/Assets/Textures/Defaults/wip/Processing.pdn new file mode 100644 index 0000000000000000000000000000000000000000..994513301fa9993020455f12824abbf543cafd93 GIT binary patch literal 18995 zcmeIZdHmc|xj){@Qp)avU_n~A_lg>9l36kdLTfThX3I=6OENPob+S(;%S@6QMw zf}pH=y&@>e74H>M7Apv{w4w;8EQJeLfkIKB1)lf8Af^ zHD_{8PR{l`=Q+>wex6}7mH6(@%sGA_+XbtuDT~6M?CU2SjmGe!7wJk*)BSfdW_O~v z-U&y?j$Y(-14R~kzRrV^o@1YIbYgKFi7ieMiPYkF0!hSh?Ho}A;DFtH}z~&19ydKHVr=08;WVMU1?fEwkq`+QXpL~Az|FKpk{MT zlmd0fMi}62t~o6%N?E-lg(R8r7?4e6NJ$QcG(P~L-Uy@>JD%QdXhEub3 z-qx4|YBG76%V0^{;Z<=^5K|#*VvtRus8S5rCf3!w;UEchET$7NO722F{N=cO(OcLThTNkKtL<#-v= z8LYsM@od^cG^%IPiLs!?=~BPg9ry*ZJ*bTs-l-VF7#y|&GcMAwU5Dk7HfXCuA#%q! z+tN$?*lknQbWpdNj;kjnU+lRl(v^ep1TasbW^1`vqY;b8;%TSUmPfHf)G3R8g3Yi+ zStyR9-mqZDDM~JktAKkG(j=`B#a4zRJ9SR&L^VNBhZboWrF2wCXA9|cs$X+bY!%Jr zCZk+?Y;&q6k;pjR$BlTVlOWXG2&ti1Hb>#4ZFCeR)z)R2ucY#I3Cj#CWl7XJH5x)% zEjh3xj82BK8`F(^qASP3nhVG9BvUI={ah&=ml3T#tTd`}6LA9~agZhAtTG5#t)a1Fm{N=yDb}`=9fT;f$5^Q%YAnxM zxkf*eOgH74O*;i*L;{Ajc}Y$qgr@Ly+)$%|hm1y(HqmDlh>(X?9IuZ9DA`iRft<4N zL@QN?#XhHDTE6G7uItrJq0^@NL&~c5q=c97GPycR1bRoDsnXd3!1?5I*fIip(P_725ak;anoXkFduYOfo^2VMT4ycBbjny zAx_gHL{LkKSS5twl7_H+QYq2I(6OtLL?@{> zCYD&d(^WMk^4z>7idZqzMe}xlIN^;rN+8CyNhzQ)UnC)JELIwc5g|`c&rLX{vM3!^(sn`O{9M!dOQcB5|SI<{6g+c;_Njos$g5t*@GL_@HTp_BL zn_V~L^<16tn{+?TAU%{G;<?m=uR>=XivI~>y#R)x}fqcC{x4H%1HP7Il^g9sg|yHRd0whe5+U%X(29QE<0$o z$L$j8m0Nh;a8r0WVYgU|u+r_iArc%_EeXD=M=Cf@@gm>M4f|5wjhBT$M4^h6Z@F|n z*FP5LG=hyQ2ijVNLieZ+DdcpoM}z2BR4y?-8GG(GwFG0(nyniFPZH!kuhl0l8C{@ z<*etb83xI8vCf34CsC}}Z;0$TfT12u6ehY(8dScYZM6zSDuyLmkwDOJZh|#37eJ^D%uK*HictsiAS(9(5Xvfs|1abb)^)`ru*6; zuf=0rx0T7(+p$3{n@6N>qi!;g($SlUgI9ebr;-MVxt(4|>+6CF1`G`vY@uBWdjq;T z%+x6wt91=jNPC50%`9n%RvYyNhu}3gUFvu0PNhJ0JHrVzEF{EwJ3k~lOuEFHASPYnM%=Jhu?kM6 z+s@agga2z;j>`<4<#n#v=CYqIpvuP<~6-r7y+Zhh4L*`u` zqfpvv&+^JdbaFK{LDqSz)#f4$qeQLSDG+dzX$N!`iIGZ&>MIgj)JwVPOecd1q=Zpw zs=u?fR#*tD!&uvD7Yjg8W(auLj3)HopE}1LxU-Cx+ORy(Hz8b zF+3b_W@#)os~p=e)=*mNYDO$U**&p?L{K)Y`SgFyyEuf86XB#efGH_*JbGY}Mx9rk zjOm&gobQ=X8ZU`C0u$wOw+ffy4RjblW-QRFZ6pE|&>E(Eo@8{?cdHx+tTwijYffkp61)7R@NZ?_6I9n*c7@$zA|>qP3E;~7L66DvWS;;r!|H}B3JK+ZrSBwIypc`Wz=`|ag8e!(oiaBXhkPQrY4$}t`9Vz zT_+~(WYQU#3=;1(q!=z#Cr}GcS8%Zn_xW-Fh220UN*%UZB6U+J6rg4{R%1mQN!bo! z^Vv?P4H0xE84hHfu$4NH(teVv>m{@o8)@+%mofr94)sb+f+Qoq*6N@!no)X&kf0hJ z9dAJ#)9>)_m1R_KG#+Znez8;Wbx891K?pUgnNq4_cp}!KyOt~~ZC*yJ#aP)*3vs+m z+q4SFlSxWX)<<4UwQ#2(pvDM-ggoiFuod#1q+RCqdL?Q%V=z{au?o{ttLbj9Wx7fi z&7ryp$zr-Aca;|3sdUAf1!TKnt9h^0^pk{a*9MX-D#S>vX>v9NB?>BD94An}Ghz|j zL;JQMjfO63qv$9h^L?b)!J)C6fi>GH;BpQ_V7nHFCq_9M5+X10^r+v6SNuGd#l@J% zhA8R`Q#Dx%BT^2Ouqxx8l``8y#ni@#)a%q)Pf7*VE;1Q599?Kt zk`ToTxGk3`2-0%Oa2(oI59zht?5JZH5gV%~!aUN)G|OR;R0vp+?j{Fvsyx74Y*d=? zK}<;&6o|)@M$2i6D&7lS&o+y;qN7$uWkx2^s-}9`$ZZNO#`4OQyc`zVtXB-{dDCUw zTvQ_pH3x1d)F`J8s$e}EDcWNzdD|Q2h;nH}=I|J=UwYnm)QOrUx- ztN20AKq}72&!K^wXVLLwAmZtM&krh6SfUe!VhSY%h#m7{OjUYi6|ERzXlF{4XAOM? zAUx4X7&TQCu62TfAdtQw1;Ao<6%;k#7RD9h)s8wIjy+Fd@=g%60v#Y6<5XC%Y8KBM zQ8{QCYLc!@ayU~rd0gv33B3}udc~Nk>qAv-7m--LfYPxbE$e-~niz;eHZEEHA>MWb zxUUQ=csiXe*$rTZ!TC}G?t2m5BZe5C@tZAA98VB+h)ZSIB4X)YBGTQFJb@WD#n-z? zoTy=(jMY(+6tlHf&|~ZMR9Fe3HdF3Um|Buhv+BtPTpFOnP|nGr9cxQ%zhx(ybR0tp zIdgyj{hf|NEP&D!GZKts6OOz|0>-kGhlNZqv=lxt)9H9W6x=u!dgWj+M!mW}taH`g zu${-N6QfoPU;#GLxDeNRz=|z2T*xqlLD+)Ei6#(Qaynj2wR+hw6EE8C1S2PDv))tX zl!WK}NaV|HRvLY&GAdZrOfwmEQMMQ< zsgN3LLD)_-ORkvgcDj6b5{F5V!$dW&x^0%!;ZD9k9NQvc6l!kU9S^&;xLVGnMkrZ{ zLt?FDjEbQ=(8rSHC(O=R>17&RBkM4cLSg_Uz^GDcl<78O2HP4t#Y}rd=R@1(UC%Pd z2@5Z^g(2UCElo0Ft*lGcB>^UYUQ#tVQL+eN)aX^H#1?peRDn2T=*a`N90cWzW#=+U zOJ-t8L|}r%C>tr&c#+JfL$z#)<`}7JN#B7Tu?;0cLX72+0K-t;fYV{5L~7Zj((QKL zRi&bwj5p#W=F5WOCE{RYHQq#VH_;na)p*-%>Ttall6jVd%#1QAR8j?@R!ahirUvyJ zaKrbq9h*zW65U1)n1MpZNc%eJlF3P)>m}5*_9# zsuCnCTu|u+bt0Gdvc8%rx4V7amV-tS*v{3IlB8vHKwB;elLXF+a;{~JMvQ1j<4%fA zqycBDD#DIa)k@T71#|+9IL>R0i}n7*bR(>Q(WRJB4!Ag0uH=fY%>=e7^Khxi#Y4jt zigHiS)1d=IkX|klIWZ161;rC}7{+k384s~RvBF|mLzy&9cMP>`01}n;9I$YmPEtW2 zDyLaBZAegZnhP;iZn+(s7W8* zX;uQN)MdK^F~?OkYNDAPmC=YU=eJEWg7SPSmdij0V>B>^75c?wh>bILGtML2kS~k< z1WUIt9$4wHc4xmg=RmWL8Q{`045o7g~ipPXfSQN2j9k)8@ zu;e;jR&oFYP_HLk330(OKU8~h+Z+#FWmwgH;M%zqy4?!{2Y6wKJllCa6LP zrZUp05!Wj8nVcUItPw+8Xi#8L2pbDM zv*qa=r#JO7&lGcdoa0nCImIALFrU`-(lA}hI7mN`0nA+>foB7FcG_l#*7!H<(_RoKifJZ^L3yu8=#*4ua<~uz z_dzMGWs0c`qUnXG#seINDltr*DCCDKnv97dSMnz^gK%U&IgS@62||kx3`dFCy;MPU z*m@>`az=q6I|LwLs3Nr(qITOXIJ6W$`_mKdOrwU9^VN>SF?^!Hd#=Az!<}0#@aml5KlbL{v$%w!TLOELjW|R|UqfD{ahse>epQC9Gz{2@DGicJ; zQU&P|xgi5!VZncgsfbcm|UCF@G+k)19T(S57{O;Y1isGs%Cv(?`6QPRDkgRA@(riZ@Ujd8U&4NWH^FyBrM{(d($+|+hZcHdJh>d?W^I4tT=cUnq;^{V%VVhQbB_Zz221uwjJ-Y7CqfRMN7_U=&X;A)v_2X1$Hw_ zx5rcds|?6YuH=tgTu(zLnF5j=Hqy8pGwlcr zl56lZC+L}Mz)_gn_=`OaAUF*$k?SyRg39|L#rC0SkjKkfrpr<+m}#|I>H}<|S74n) z)3QsQB$3P{_5Rd`>DaY)rNK~rEJ{#SBVJCT)Ze9Fa|j%j$opuXFSJO$Mn`m$@|jGL zs?bfo$7KO@m9qh$V=3}bU;r=y94u+3kgi9-i5OL@CYx_idam8f(b-%kO_g;cM|5SP zjzcgJkXQleAnepv%#}*<1Y3%91x_JJD92a;U*IM#nN_<~iEi=Lq8Ll%`>2hk^Gu|x zN@pA=+;S^H&X&g~fmMJow5Z^G*0CDAn;1=sJVK#m-S^sfWdet>6x^$fA}2mc#*~^6 z_4{VS$j&!74xzR3%B8Kp|-f zX(ZKf^RmLgX-@R>P+lh@As37aRl933S{-T?)Nw+p8b&?MBegy}>}BJ#7%xE+mVv$N zdlt&AOap*`VZQ9f8!$}u6^L>uvP%d9}fQN>~E zBMNEd8_B#OjD-Y;%dyNjWb|gy^D37{WD4Wu-l8cJx88U=2S z^VA3}HZ$=+m&>(OH^FxDBY2b_rAA3k5bcKT$9=Zng!pWsl$SG9G?|!F{|e^tOrM*c zK|GdcYt$^}p5!r2j%spTj1yjVAldD>%`$B$(%jGSh*$U zM}d}iG#wcEYS#mP`>A~pN>+^=L;afH6*5>vSupT7)`GydjG~7}c`ZUI zwmNXea|@GlrB#S z2yecFQ%-v5JxCQ2HO?utjQ-KUvrgWIYvTlFON@Q8^5tM6=stEuZ!0F@w z&Pk)X&rdP$Hl+*4_g&3QyHIn3{X13bz#w>uKkH`Xn4zx_l zj4+VOlr$3hG7b9X1g%M-Nr4AJ8H!qrQQ2WzBWnP9!{LrU8nYd5OcfhghN@(M>`U~c z0%o{g;8CJb%hGkjZ*tY4TFD!A3mN8_crOBQR!8lm41|Jsx>_D&n$*l z(`Xf^dLW_z4duRw2Q6emc;0a6J8{e$mEledcE)4A(vkv5#1%meT&g&fqa5nFsay@0 za6UnRWv{55zz}tdoJd-^gg5|j0>+bWRHTy98+KzETxljsXuUk)>}&~Q%Zh78ZV7H? zqqHWE(hWS2vh^-IX^#bx@&#HpDyjkp|evOyTt zC-6c;k&#?K$P(==284>!6voUnwt%a_J=JO`P&d{Yd1A|x%>-qjBH`#3<%?+)rZAxh zD+DE371i`1GLD)659iR?b38rlL=ptlT}+N*-DqfJOcVi|v@lWa&Pd?Akrc0t`fUyA`uL^C?5<)U~$hXhf8mz@;W zPr{Z51J84qg=vU{VLpx$mTol7yg2Sg5zx4X17(;Is>Zks*>5 zrW|XN$iNm;f!M@J;K#{x9Ki57JcUC!nM~#Vnx98nx{(@VY~BcKSv-xZBTy^{*q)^RxNVJ%)jCE!P41-{*JVJ9(+dfi+C zMA9WvLvc*YZekdtl6~6`Ar(Yl#S|69X$=Rq(6UQfP^4=Nt{|%BS9(r-kP(_V*I+P~ zbfQLOs$+{&9eXI0JvgM~tW+pBs)|1ie*^)L#ac57q+n6gv=dG^dJ(+jc=)}*O!&Q+ z&n0u_g3p{eGvJ#3POtqx1QM3*_G~}n_!Y%poay@AV;8*_@%h&QpT{mrk4%5$Dks>= z$alNuv5VM|X!d{znKYcfVxM4-OmnYk^B?;_tBy3X6x-h$JlMDAWqRJg@f3OQccM-A znvF)?`<*z{`F{>O{qV?BTt@M`G8j|AS1fPNo^$5xvB%s)-rsb28n9aKdH!@N`|NXI zed2+ti{G8W#<}n2(~fB>k`KaIy~VU*D{fC(3T1D%DL&Nem_82?fE4laKws+4#vPo;;oWocViz&|*K0Pdv-hCu0@55zx^8zeT}WtIZ@SnAy|2LQMaoCsmk-{F2;LJk|6kJi z9a>D&`BPq)KMy3++_b+vr^#QDX?7gTn6BZtdoN>p_VkAu^-OvGvYHa~rqRdXB|zSN z_L){)3>w{U;hZ^dpEYOByy+BY8GCxO$20#c2)^f=U=#oEnCg^m_UJ2@=8M6q1N!7V}(>Y74xhQBadihal3IYLZos?6rkTBxTV? z&776D;Elg?v7$hd+1U!n1ohf6H2OQW|0jK$SFNPhSEdwFH{d9#DQ`+W8>*_6y$otr+=XXmSR z&=2O@fAt*nHxZ{*joJGB4vmgx`!{DBoaXzpd3(0Mz9@{*+4+E1zy(76L0CV{k9dIM zfU7@E@+6ffvwh$Vp*ZlL0kW-8C`tE0$OVOvX@u-@)M#2Rg;br)N+9$J^<-i8{psr@ zIXjfGDVls^nx&^hp+d4rPTMI=+Zm8FGbM7Cq;cR~r1aVLK|LX7c4z;sFn#fZ^o%+N zGnp2Hi^^oDwOR@c!%-3RMWf>l%s-lwiRHTkQq{(u6b|vz3Hm}aVNR%rZLWW@j638|5@n$_G_-fQq9A7~Jp zHuzCclzLx-IB00LLGU-5cVrNl$GfABCz&i+)iPkg-)Z>8_ZmLr0}ZF94S)Qv8wLaW zpEi8(^z@w`oAVEyCWnFKfDi5e3Gnj)%`fe^%KKHF5B}BXzt?$YHNR;OhrVAuqk6v8 z9n30ev&!GVbq0#-_Y`lQH*(dkq#Qi^5c-Q&xZgVkvr6Iq@7%wm8opceFHOv<5_^8` zZ}bPfuW$Cx-A>PwkG}tn`a8pzuE*Sc_BrbPkKXBgHvM1&vzpBU@W%YZK{Ds`cfa$G z05@}|3p~5hp9DAaj|9nIDgdQr&R)|O|KAOIszl8b0m0?!V9!sze~3+>BUA4@@SqAn z=(^^++36T($GHgH>@^+de>LqXUwlCS-rED}udM9lNnINO5BCH**9R!dC>HR!QKlpH zr)xI-p8oE4+TZ-6KxVJ$Lj3njIpv5w0mQ2OKUMvCQ>_ooc>kV9b)~-MIwM=2=M1`1 z&!5bnT?)pLmAO;hcF+GUTK?R*A6oE!;?HvCEV-v^@gBkVJ{qjazJFP@`Tqd&bLYEeJ?F@|>pDaocw`sXE>yWcy9 z#BACAnT6-=GkZ5@-fj z)ay5Y$T>N9n`&RXGWofSezRlS8P299S9^Orz3QIBE}wD7opay(c6;&H;L~>Aamnbd zUG~+nnWvY2yL8^n@sfB2^hmTua5T5;!jpITRg zFLReZe(ODc+woVg zym-m((}=app8v!>Z-!4q=MOhM{^&uEt^3$BuZC;C`HgBVe#x243#|=f#{0tZgBq}nJmr!-$Di9i{{3tGN1qDUZv4*7%;JOIdj0M*e>eALRA!vy+}(fZ zPgcBn@ri49yl&)3fwehgq?tesF!%62KKC^zoDX%VEvU~HP=`60E+#qdz^(T+*tlYG5U+c`}m2bK)I;XUMzI(?vmVa*3&RhR^ z!BhWw&%zDspImY8&mPYmQd#l%mAfuqh2FmATIa=scK-a)?>nBc{jyz`Up74Tt`+zH zgFUm-dLXc_Kjo3#ul$5qgk3mM&inD&#rr+B^^KVeH@-3xy!BCg?NRDeUrByw$FH9G z3i7i0@P|v^SSpkn>B0Nb$9!w^(Q9LCmpt^Gde#x@ zmScYT^~{O)-?3`hxm%>$FS`FW)p~3G$^&nM*8HGZ{QTxUe!gm__lM0}3^cf;`ux%* z^PW6ne475zQx4zu;|(8Qyzcwj<{j8dw|LTtSG_v(%*MCg_;T)$%bq@Bzj=#R{L#DQ zy2nr6eB_oTuYB)>FI@ebe|q@vRpTqF()wezJaBvc)`zx#V%@=8zrS0)cK4}AoV?$) z=j{Gu65W>k>CYGMf9lRR^d~NserSF9p1T)ZbHT&GidWCMW3Qd=5yNM%Kk(MW#PjDS z_??p*fAq`s%eP!JJYXf^bKW_}UAFwnjVHbMX8hylec}51U;f&#aFV$G!Sg>Vo_==CG?Az`L%J@0IKH_s%e0J@P&t$gTdBP`zL!SQX@ef{k z@+FU53-7+{+dCINWX~sdJaFnS$8fOli?`psJMpLL66}-t8;-dBvf=smegpH3{Icz@ zKDvtj$nu3NKI86j+u5%#*mUP_Hm_J$KJ9adAD9^bB%QKfI&r}%;zs-Yi}e?NapRk>9Qg7R;nN4dc(p~ z`wn4W{?wUYZ|rP%;KF$;(NEs922k&yWv`sObo;@RuX?8^w;p)dzu)+$B>vCv&)z(7 zF|FaR?>>atedTG_ulwP)RZDjFSDyCU2XEVV*YfL=d+%6s%D*U0UHW0-0`$mhPrT}kOCEZTn>k_YBI)$E|KZ})&h3Y8KltV|*DhLi*Vgl{ zD-4&Px8`fln_u7TJ$Aq+R*DzC6ejO0er4(IGfzI$Td?bly%#_IjrC{W`C9J5+pk#h z;A``uE04HmcltNp{YPH0;^XUoefVlkc-Yy!{Sy}*w-&wR?sos{%ZP(oH)xk#_0rk* z&!DTdjdNeeTPwFe?;d;inFLy)@7&t^p-Q1 zzx~?B)}6lfKc3&iUxy$^ynM*n$DMHV0&DBD8|J;Z^6ecB^rl^B43nokbI(l&{jmL$ zyHC7f<)iz3Z|^VKAKf(bpLh3lZT+^}&N%LzT?hF$Ocwuc+tRIT9!ac9UU;hV+AlAN zk1jAbg#Y%k{Dl8ZdDpQoo_*m7{>^WH;jn}EK5K6G|Ju(PrH}407;W03{BrsH)GH@n zzkMxsWO))TJWTt}+W%Pp?BFEp4?^Rz`p(PF+T*n|R%h=l7)PAFrT>WyKYnZ50Sg~G zVfnc)to&;F%rh^;R;>T|*73sI`*+W5yW?cz)NruhTT9k$+4~b4TKbj`KX}(BY~kIP z+gs0Yf|H-R=ANgH{>Y)f9lUjWYJBBmZ{B{Ybn1;msPg&UD*9yOtv~&G>G|!2;XiF# zYM=TN5Ju-*4m6iJ7p>`i_^j8dv+k&_`N=^~E&0bM@%3vy^D6wUlS-@Sq)s~g=m+Z0 zzu^6R{e4&O-hA%T$3C{@`n&NrZa#9uQ_xplz4)F@Z_GVn>8!r8uyRT3z5^DjS7V#M zb&>SyIp17(N@0U^>Sf=nhl5>fzI4*XTW@%?Ub!j`X|bMYNty8l~G8XwyEa@jiS z&Cjkl^QQ8vYd5E7)s{5@f9|)jFJF4yXZ~|jcg1Acr*3-YmN_f8y!6@KlUGw0EV!PX zxoR!YPR>l@+gls=++g2#^&kIm-d5|e1x@I|J30$q-gep3%(ovpe}T0A%}u}Ga_-EQ zSC{?b%dZ}^ZRO&dZrD1r<*lU;-*lO}`=E6*YYyCiZ(q3J?61Fmx3O)oYwg?4zq}1= zpS)20fphgS>F?Z+(O&ALnYTL7)*F`m{Gn@ZrXGLlyAS=x5$AoXrR&DV*H%Bj?lQ;Zf;d2iy{XW0;(V5?V;%@zjr9WNyy^r7dn7aB$ zyEb&UooF7hZQtW^-`vZ3>+lnvSift-V*1MCKd6Q**zxu59Oku49^JNZtF?XSmCw#) ze|X+EHm}mi&s==#vZI_=&iupm|Ms!ZBM+?EFFODDg?V)2K5MG~K0ffg-VOhB=}i6V z{KLP!cX-1~57bkieDZ;@{mVG?P~)2iZJ77m9p77V&TjhN`%@cc{^jFe-E!rt$IPnk z-^wpMbx-bsJMMhPuGsS(8v-EsKY5=)amjQ zar=TNp7?BU<7D=wFMfLI%9%CWmr5JNB};|3H-GEF-OoL|1u{d`5YL+;r*XKXxv9ZkMp`g1a7g^l9z)>%P5p>2cfN0;Z|@ zkzFV6`oyhA&3wOp`ONhzUzrJ4pIf=+a_qaeL{En2HrM_`H1o*l`>6l=o0o3i{)3$t zRaWetH|O+ASz+zY%BuHwy7s0=e*E0SZ}(PgfBVW;esPPPIQ#x1mtMc-$$z=-fvdIy z{7>C>adgOcI!o8x{K)Sg|MB&wWUu`FpU3&g_Rk*ov(q}uR_}g($92~pe!=&yzkBV~ z*QK6a>A$dT>6|(Do^?yKF+6u<|7`o~FI+7=c-8iY?t10r(#D;u$D`TN{$99l<=eY| zyg4U5_u{MZ&6_{>*1n*pxpTgVIaf`qd*3HebGG=7n1xJnXpTJMVovs_&++Tr#uAoZHJk{IPc0m90(uiOzNR&yL*M`SKe1 d{tf2|>;C_V{;#6woH=K2*)I@^yQZ7>{{S4sbK(F1 literal 0 HcmV?d00001 diff --git a/Gems/Atom/RPI/Assets/Textures/Defaults/wip/ProcessingFailed.pdn b/Gems/Atom/RPI/Assets/Textures/Defaults/wip/ProcessingFailed.pdn new file mode 100644 index 0000000000000000000000000000000000000000..d6388621371a5f6fff90a7a3972ce9588cd1f6b6 GIT binary patch literal 21667 zcmd?RdHmy4xj)Xx4gx9)$~HJ&#jg>XG-=XY7{(-R(=|!kG--+mNt&ih_M}N02FB&8 zC?Fszh`8aRiFNSa!wHN9ofra_ys!iiT5LJJfT`l`BRP&9@S` z#+oh#9;=I!A zEE21FaoE!niYkN+5G4wf-j972e84m-?M{o9%0q+b!Q}xhT4daJB0FD8J7&!EkS2w- zn~p^nX@1t7RWOtBt42$MN8J)Tjg@#*>JB5fW>%O|zg29SL!nn_+LGycT7Ma*-|+>%3XiatMq< zv6#o`n#7t9XIOdCy^ z4-L7mSJ3XPC(r3(!qs{c7^7_~5fUzEMgIi^-@zW znszZWnv8R{P4qZFTdu+;5qiEV@phr=cMZ2Zof5NJx7>nExI8YGTZ+i`=6ysBN|sS! z=7SnCgmf{&dxEY|gKRd=_V73uMDwIic^NV2^7FhDh2w6-Pnn$POH*W0fEz{4fs3$j zY8&w(dDhGI10L;`s}p7}1AY^YrAC*klnV{3Q|nuiJ5hq+#F)>LlnQ0YfwT_Y zb~}Aa3p$EcC@KAVmc`pjeN;vBu_D4O#Jiy^O){P>wh#-FnIfd4H0Vns8qNDQGEJJ9 zqBtyfxam+Tp-tX!>udmbF;AhB+N^2&)O5)91J#=a)GX4n;%Jg>g&d3IWy^KD@LY==XA)RBb}9*5O)z3 ziDwd`=_R{RpK)qduIq?cj<`5&$9lCs)OAgzSQ?4zsWA1Osm)HZsDWkhIiL1PEe`yF z+F@pBw$SOpbEYdHbZ$5(BV$Bj4J9aZY*Xq=SW?6a1~b8(rbw8Tia#rNolwr!+p?>) zGOa2#D|Mx?n1)z;T9@ojF-^zy2p@RWkui;Am~3HwqiV%A(V3!@Jt^i{j(|DKEcBeN z6Hkk|ZUhBw4Hk#wjG45Fd`V0u$*5Q4N@_T8`F=XEaE_hyTuhu4)PNq0M<_!{mWx1u z{`KrMosEWSAC^T0feTV%&-v5 zI%+FRl}i! zB(1qTV;6@NDii|`r8L#26%;A8#&lSN!!BEQh9qrEQ%qFno%{qa-C=-9Zf-1fI!#fQ z9ERaSTAf;bPHFX6aXOp80Yf%gO3vpqR&&&;YmKB>go2o#JA;lraneau`xnecCI5gG>|0wURq* zRG2PJF?GJhvL4bCMV`US{o>TXsZxim6Dpp|*fKmxAV9ehfvQ>D8<#?{%&>DU$7Z}n zig88SrZ^-~2*A#`hEK_eJkEq=tJ~0P5?*X35jR0aG&3~OsWQ&8EFbzp4oCUfNMRC( zl6`cj)l%EbgmpfJr4iSyX<_PS2W_v@Z8rE?l5OX6&5}g0s4;1mI5z^> zU`{6@>tn>%Qb*7Uq#(grWSLf|6(bBL=Q{^p>)aIx;9=PKwp^s}~Z>&qcgVHqR3OwF$ zIG-Qs98no7<8G_mp$bMT6qvAvC_TY$q3v43PY2~$v0K)(AgbliLS11(+D@&k)+;$= zBdatrCB00_Vv~yeN{HhFv{scfMKHImreF$XLLn>Fd~Kw4CTJK$vpS@+Xr?MdL>?O} zm_U0SD6$JW#XxBoxNIsl*?tdlyQGn^g-WL%Vj_dUmNBHKMZSXyid`C7fP=R5i9F{M zA1V%mV#$+(LQd`rs5mOKm{{U5MH`7#$*Ves6hk7c$YYeJgj}NK@_J;{#_>q&@(QM# zTqPNUKHH(sXW?M(=Kw^uCS-w0k|}HDVU5WHNawVuP@jloDm zS1xg0P3MFlTc3{gshbJvTv-`%^)^M?O2<=~dY_X;*oXCDPWNHN#9}XsgEvY?lIMR|DrcxmoGg8^0;%uXr zuy*L0Bi}cgMOA4ddM&HZMt;q$dNt9bS(%EvbNdZtbb3rT=&DJ2m1f@Z_`oQ-!(xpA zw87MwCY!b3-nh%L6_2ekDMh!-RMW;MaL+*T&J{KUvG%?27!Fi(-bJRY|N7lmA=5bE)0 zoZ3dl7?R1bIe{p%5OTbyi54X_3&uQzVPxoLtCG}fmO2!mDvsk6l^aQt+@U3kBWkJG zELQwxgJKI6OdV0v@rZ{Fm^b_)r;kIrnb!TT&~Nez+bE5PQ4JZBwX#k?G^|qYc#d#b zNmF5^pAK_Aoitg)!*GY>y9yR1NU4|Y_bZv1q;+dOxjEIvFi{~Ui888h2hDcP#=6yd zKR5Q$c~DBhIb8LzY8C22Gu~xz5^UgnJCBPq3>6J~YztVYISlEEEovRAEe_p#lD2)n{@%@dz=Xqq>*m>Lr44Gj3nZ)Qc63>Xi|Iw>+=k8ak#zjukQ!u$ZKf zWLxpEI0E1D#mjVCl_;1wb)6*^c2Z$J<>>lSF1oI(IgXoAV8jMndra-`qORy-g{OSZ*28kW&qyp4i)CMOy5pW-8K$LCzBW(nX3PZxy9}9=_KYb7QmrS*-6)FnvKy<_ zj=<9co_Bh2G|0q)S|0Vvbzw-MT`{K)W^sykJ1%Ia8yV#?A6ofzHqPl1EzP=8r8}3s zS($U4H1;Qhd`Gb9Qe|Z0V>V;!o`r;2o)G6EqPC|4p*_N#!E`zcS%O292m&H)YR*)F z8x@9nGiTZa(vOuAT`4)jq>Z^nEEO_-A%g9QOG7Q}iT1RJ8A-b@k+~Y(Md$M@r_|C2 zhhY?TMq%BvQo)7#I2u7S7q2v=s5}IcrxUB)7`8guZniKF+bro1ONa!N4Q@KC*ks+9 zSEE#nrs+6K5Y?!bN2|4{oW*G!f+S&>9pgznH<+5)&8LDO)LxQ)E(0*_Hs!?r)a-3bDA?$ zFr_{*p5es?&ID%cM7=D|W{8B>@=$xd;rD~&BlBDi*Xglqwk|t9=>f4ei z*G5)6_w87dQYP;9a5R)g89OD?-gr2h@m*ow&S0~amxC>>HLZd5?$;(_;!mV%H=_Cj zyAHK0MHwy&v0U^^sunwG7YZYNUY#PHMs6CRO*voAI{C7So0?whJF%3V@sr9t>=Sk; zm2tgCphGO-Il=Dd^#W}pOp|Z3Y1_A*YCTceF*iwJ9JbS%g(Oy6Vwq_)hVqo<@N(V4 zXH3~j@@4^o=aJru##KeM%u;{m_5h=tM3@HYb42ZqrFbYH422A_kRBObMp0Q`72-yi z6=qW(ALx0%n2ExHAIy3RQp~VG=Tna=m|W~bRH6*fusiIBc+s@ndej>FFdHXc4ew*^ z)GQ{2>_`t&Ivnz4T2(4;Z$v6Xw`7u7u~p#%*mC7G??#Z4Vy8MC>BK5WW%hPmSL|>crMb1%XA^O zy#dgCO_exsC?I6TN z8?+mlZb`-i2(s%*x9a%`L6n9)24}r|u>z!YtJ4Y@oJR*WVm=y~Xv>X^IL~&wg<7%P zZB+=SSu7^}te{F#fgHvfN0?oS%~BOV7s5rP^x3vX0$D*%GFqnVG&%!i3_ylz4;0w| zP)n>i`N)JDiscVIR?^VaV`HaJc!WU8PN6IJ`K(aSL@bn_aQSWyD48mLfN>)d9n9@K zI4fmu?ug#Vu+V9@SR=V{d5BC5fhxz1K$R#&44qc1Zp21R_E=%yQk8Zlwn~U-2(`At zPZ%(Y7)=Si*5#WFxBc87SU=sILD)`SLy(F#~QltTuR(B+Kzw472*b=WM?P^;_f z?F6!zDbyX#5pR}*#7JOm92!78nTJDwQdMLMPk2mMvKlr+a;+-B+y!}59?VI)A%`jo z%}ZI7o#~WMRFioe>8MHM#wP0rwlGK4k=>uGc%rszWwTeeG|ujjOjJl(xKM{x3y+=Z z+(|U7LsXmdLAUMz9hBN-5?Ad~1vjP<3vXw~v|{Ap0&W6Y!iIVqbS=;5dJUhqIby#84U9IA$|j)=GJcoTxUxu-f}XQ|vStJ_DNw)vV#zL86j5L_}t$ z%C&+t1!_#D3Pp8x)+m$CP>EHehqr5apdIaE;<&|ki;+W5bw2CHldvMz%zlv`<(Wx^ zgOYJn9Tjk5;OTylP#)|d1X^-wp2~YeGFzC543b;Imk?!tZN6Y(!>h`kuBMQ z$TYnE#EKvXBPwOoGMaXrL~}Z}igrB~VTHHX}t%N-MHHxD+RYX z<+=l@MF&m2#SYqa1L8_Ey^_iG1{0qtQ2EFbH8W!qUL&@A-%HBTEP%+o6U1<))=@G@ z1FJBVIbb}H9nCd0$|6lJoApL;MvN*XQXWSW2+Ro>XkqMiML)$=Dlj~qk|Uyp$Kxqx z$~sWTDN?PGZ}oUmfDs^b78H3@>7-h$LRmF8$8}LCoBeDS(LF56D$%eHI8T4bIq6Kv zru~wnLbN7jd0atT5Iabd8jR33oenqV6cCi}I`vNWWsdCoF$t0J{a^@i?4^NLj9PXnqFw>e-Q9o&lMmhGDb5X95YU^;grs=?SyOf_GR3erw9!A_&v8d(?;IQx5h3sTln9CD9!rG%^ z)2-{pVkN8somjVJb2_YyCW>2cP^F4aGny~9?0yG!@p_b>>Z491jCn0qAjd9NhO&}oQfmOA(EOCl?;3e8Ezv- z>Q-iEfO$z%$9f}+d5fngeP?Z1(2F*xD zro%FXJNG*>k9o5YBLbq)5eIbCvmzx|%4Hm20qJqQ9#)I!AYV)TE^SB!G4aY-bExjF2i7c>{sWgHN(Kalla8D@ngSg}4lq(LX zCY5C!1(Oy!k`CQx8blUpjkDFE(rZc*)oqS>GU_PgNRio2NotnhN*ZgW3P6h{uo^1- zn4Z>0e6dDwP`k>9qQy{YDJaLiCInMpO3i7lG|8w!2Qy|Fg=)HUizAA}2ep#fFXJc{7mF|fc; z6HyeAQHTinjz5kmlqfc^LQ4k9Pf4n%nW)?PGZ>HVjplqcZ&qk)$mwQ8MPV)R%#=98Uk%JU!p*5-6u{g`tOZ=GN>0xMT zm043xDvVAgjBHMYnuFzNBRg<<=B!jnO(HQnv`}y<8?25%jGGeMK`6gGkA`!)5HNWm zKhI+H#Fa9n!xa-Vs0-634Jp+woy9w?R!$b8I-lo~xv!ZaT2ajwqqll-88>ZC;>93B zklcJ87ScRZ;-!GIGnF#d64GA19jo#PEsu$i)|xI*nc@9fk)zCPAuRUdE;5EpbM-0awiBGi+Ej>#Sv}Xbfx%;(s6j=TW*aRr* z(U5$ctwk6X3#0L|eDRJ_I&m!4Dh*;^sjo@yXXxfzAZ-_AmjLYpBP0JA0tW)tUM~ZgkrbpA9u&;gh7C%!yJ-Z+L@IED~6y?!dFL570=1OyN=z zlmZ_D*jxgN_iVNtc(t5A^&_TVZ%M{z92*@nN#Jo+i@8vqYErqxYxKy{`Z`ehXet5D ze-`t@GC7!w1O-5SqnV>JE?1qqbJKs#?xlFOx@tA%KrNfiKq4L>AsR(pauyq-GOc$< z17OCk>S|cdN_39TNhCc-VS%og)6^NYgFvrwW1yPNL4BcHSLO_#GvHy)mC_j~l#r+Z zj9iN1)5AHNO~?*B5JtveSingZo%@0_QUzt~K7}J%HiXA; zu13fX2bCtc+$n42k=NII`Doa#Oj`LN-_E)TL2F$$4!WJl;4~6W=D`$Af$gqlDXwD) z*)|fvg4Q?fQfAT=0p&#)Du2 z3=a(o!0l3#bMp)@66JcDZxx7~HcPWywTI3#F5(h6gqJ&o&}?vp6cKE_;IKWZUP6Z* za^Mb0xG}@@g^gFP_VS7pX_=mbQasZSYcPLx5c_E%t%)Lq<+} zOb@DpvDpO1rqBo|c=@tyk@7GoN0qX{kPJ#$;uu3lB`O)0XL_NMPwE+m$&_oVX5?Im ztT|HrHwwN4Z#QLZ~cJB36L{n~h@;suNX2Oo^djTVr93N4&M^kS#zaaPZmw}qk+ zS6obH3LRR_&Kkg9VaRr}!wGF+xDPN-6&MKfLQ(dndDgKq`6fiSi73pJq}hv*DzLDVsus7pQS85I> zVsWBHm4P$LN_fSWV>_UI+V2yM?AU>-SO+qpSTA7JacMA;2bqBhNhO;T+apFDc?j^y zsGtBLMSL^m%rQ#~RiNZ2YnXwsD5C!?-$nuk&qlP74dtgDS7 z(NQ2(8O^$7IdfoQ!AH%)kmFNI-!2 zTJR7Na^wLx zYBK;sVlSSIQLNn><-LZs{>YvTfg4m`W1?>5 z4P}CarAi6xQ(4%e=XQui3ld07;1)(z!dy{N9m(Pvz@qZsVRcGOaH={bBN4*jQp@6+ zKqLdsFa<=+45JCjkLZZx#0szL4KZ(KARc%_VKr!~24xEJu~4oN?5sAn7+p(xwrq2q z(BaD3kO0mVUbb%zW;Db#-;g%w=Y`hXXf;S^)XkX?jR4J{jWaRu^(ZyXi9&!jL&Okz zotiTW1fj$9jU0>@q)aQ*MGVrz>5)_u^Yd$JvcQP^zVQGr=o!!>`L0l-9L= zuhggl>pIl|XJ|QBKs|K~vu=}Sxq7z`j?SK|d2S0CrvtWSglM@!&Fet5;96llhZo5t zj$#H#tZ`i+;%3GiOajB`jxuW3pZ8-^8+tKTK=X9RlC56f%Fi&jYYl<{1>sJPkpr(= z9m#;pR{OpIQBofm7^=~TDD$?_=>$lnT{VWl2F&MJIAcoLGO)2xHKkW(`Mly0afZnh zXvRn;^&#+mvwA?J00uaH%yU4b;6^=J?ywpajx~cCH6SgXV3?7g^-Prg&I;a>hlTi&T&6Lfz&@xD|4b$;u#9~hP3ry+70_b zoHt~k&&=a!ry|swVcdWa1!|a#y_l1%p#U=}MChd8cs}IE2s~xo6rM_WMuN-pSvObC zsqrv~QO&7!r&S^)-5iw2wBZQ+%t@u34Q1RRQtl|zM%o1m>v}e@h!KirDnf?mrxQ7ir5(UqfAY&<~n7p&?pqL1e@>B zgN8b8k9;1Zh{3cQ`Gp)_@=_R6RHol3<{(9%G#k@y!cF-}4*Ab*`ERiI$Hi>9X*8@s zzSx3#78_L?f~C%=0okTz$%vW&_lK$m>|DT#(m{RL?H0@?q|1_TOuPu#*R5(Dn0s1` z870l;=)d=C6@l!=x9cMAFe6_Fs+lf00fwbO_Tod&& z0~#N~MP?Q@BSd3~Ar~lBv(D(W8W^Q8;8h1oLPBWC6`%o|rhF&gZzX__@k-S}GQCEV zim@Ejiko^?po*PpGX#2U&Ns6mM$XE;LPz79zzby%HB!w2q}e2N%V9h!)dA9pfh0B5 znkegG%?xG^SYS|^0(Tw6qlUS9Kep-+)GX^R(rHb4LC{Tr-Z4JyjKGLOQmEE{24k*#KUl$8|PDH(3FL2ka2+j64!#T zHUpJra=~e_VlLB@f%xK(tq~cddKvH57=qC-FXzX+OkvIN$;(i{=X^IJ#8ZF<&(P5g&1wP%%*v-gRr(tcT0sXj#lJbCQ^-vqKoq1mk2n+Ql zP6Y>~Mmhr+ay6f;Lb<`LJM9U*TxF6W2z!POhJFT~1K>eU84}SI2Y5A*coN1AV45tQU0?`lAcodz?6%@GSYT1@I;X{?0rN-P*MnToY^V|rQgK@>L zK_$ins%=e;+a&=hlR%J)2rf@$TY!gGCAL`a@p5*=WyqN|#nY((v~;L2WPs37Ad=9C z=Ci>h$C4sGnRSc6Wj3W^M=n58CdsKaC~hRW(kKg1tyk$sYKZ1qT_zXT`webT&CL0> z+O>f9Yh`Sff%iO@#|0TU#pHTGe*kPm1S+(tW^z zfZ}-ENNj&PW7Gj_wp7)e*@`H26^|1N%}PWyM;?Xe=1_C&70YdDj&;mTne+=996)}a zAA-9A;GRLX)yWluN!2vXl`B^qnmPKY%d1)-Zp0bU5d}3;KYZxxw;}%HWrzx4ql*5EMP)wGlkL?6o-KT9%U9=Bf!7^c@{K+ zP;+_?M@SSi;5>QkhyPzze(W*FE(X8D?mL3uRK$q-50d5`>r5Z#1_Au z7LERgWm@XTao{L+gI$hmjGVa*{(+|(heQ)B^ly1x|o#UeVk$z~!$Mhb~pJas}X-jLXi( zTDMVLT(r{U9IRW_a&ts0vgDdH)B%@@fMY1#q4*{RY&Be}7ZI^#E#2J$U;H-@aL1&m z;!**4j)Y1UN&lPD|40_sW2IDCu=@6*I87-iJ?}4GK}+Dt_E7-x7H_@99W<(=WQW7v z;!RyTA41(4_T)uY|F!(rb@*gT~*>ETlSpqyN?)TNtzix1ztp1`H7F<&Hu2V56hl@_UIgFU&uB=oNxyqT&hI?R{#qX@JIl<@1^e+pT>)egS@b~_QyBh)E?6wfJETN zNKsMPTB1kry7VZ(m`&A1$wB968Ks6%NXq=Zl`IJ=Ut&jpV@6;+uQMa_wQfKDdWG+LQ-$QB!u>$fo8|*lv{d0g zFduJQ9KVZmbNBrh!Mj1Q*IVBD9`NT)(2sEgWXSwUU3YVhKy^bohVK z9`uH`g}*hsI8gR|;}`8$yRn#$WxMV6-Zy5w+W1oV<_Z>-?0&!^I1mIoeEhZF?gxRF zWs3=3n(2eV%kGDO;O_+hYT04u#fSfQonD}*T{W=aecs#Y18?kN2Y_Vy)r=70+`v|? z*P@F)F7@+J@Uruwpa0pg7j*F^0KQ8I@NeJPIn-4L2AMkn(DkMjZ5Xy2%xTNjCyO~- z{67BLZ_(cF?*);a7ZdS6PvwFlc5+nP`2S=5T^FzqjQFi1aMwzon1MTW`n$RwFa|{P z-Iu1K;r5MX3vj#B{}!0PY}s25c;n(PQRdQeFXrO)1>a=_n3FyJK5M(b55$)(+rIPt zfWiDX-!Bo_5>q{Guy6FUab@qQeCd>;^W084Yo4_n{gJ zOES%FePdt*fzb!qyDwX|pj6P$rErI3yDnzs_1OOw!C~2A4G&$6d$DATDgE0NEZg(d zLt-gy?{&*h*=^}4E{t`9ez ze=QoOM{l|7XD7b+z$2GGa^9cr`f2aBJ?=l@?yrV-Z9D13-%U1MaqsWW{^)NHJochX z?XMps?ES%AzqI2oKXJ;rJMz~Hr=O7={qA2(wDJS?^*;BN?_OHG{l0tdym9p*Ph7cte(8QE&NVoF`pVC|wEFHF zU%u$-KO8vxP42*BZoKo@<|&`~?494c>b74$^r?r>S-v6v@|J7PncjZPE6pq3Q(Sw< z0oYpk#(PfYE;wZTo0Yqs`|#CgUxokkvXhPDk6(Y#vyUAEeRKVe$85aekH?%VUi$N2 zUv${ySoiKdZ#iUr%YEzDHvD1r)z1>g{AKOe{_yywJ+`gTYU16iwjD7Tz3kmD-*n*h zFaG+5k8YN?Xh&Xg<7n%r_jxgQr@8hQ=UjO1A9lIyhF`l+l`h{hf9hMOzj*6a`>na~ zTiM4CKI_cu*Z%0%Q~zn@)?5B~t$xe)+RwK?(*Dq|um1j%TaUb5``GbY?9r`jUcOlA z+_GxN?b~Me@AvlYnZ348Ha)-Pe)rU;e)i=bJ-z<3+fS^$e9^&AZ?{i;;m?oXaOwvC z(L03SU%AifuiUk&vufM=yM6<*UisiRGT*rRsC)L`>!iIdIkR{DEeEcBF!RE5x8nbF z?~0>8^}+jZKK;s1Z+hn=8}XliVV_$b*kxt#;S=t->)&=gPyFug8!tWSBOm+#jWA%ow z>t}4g+BxgxH5YFF$+O#0^Vx?Ud3O5?yWa8hHR$yZ#PHhl zvWIPW_fwB-dFZ9J==STLJo^0YpMG%F^ka`4^yII<_3Ur|^xNAf2S0MxNB0~2JX!bH zkFR=8{LDq)d9u3h>1Qr^*A<+4`zP+6zGD7J-vMO(;Aro@2cNq(f5Xdv6t+FT_MVd- z|L#NL)a-e+W^4raazw`aOFM908Z~T1a_m*FA!zpWCxO3H2%Wr?gKJw*H z-M8j9&wXyXEjjT-WS?{1_k$x&J>T>9zv=W3KC|`G>wo?I2SCO%+a8H--Lib^$t#}t z%L)5`iKXv@#It_?(-)8U;OPf_X!L*~S)aY@)=j%Uv)fgln60?wijQ)aZMYwPXw4xv z?e{ibeE9jy`S%>S^4c2?Iq{@>{3qFed2zq%u6X&T=MUJPlkUIK3f`Y4cYoxbzr1+h z3HQ$4efFC9DcaXxVAqL%{&?^a@^5=_**_fpeDLvuUf%Er{OO0_`)7`J#8S%hcEV3qe&DOueZ<=J@;`6f!$0WxOP^f* zPvpAK9rU9oezMC&m!-W&jyK<9u084UC+}2Otoh_oyI=5$1Bmmsd}mGc1^FIU{peZx zCB~;uXYRl9*xzLD_Wx~{jkm79?~F~iedoeW@CDBtv~hCgF~##%t-I#MTQ|R)uKuun zXYM^GoPPd6*&I>)+?`K;VB3c6wJoT#{&y$8u-rN~ylvUP9{%_NA9!)yHstP`Hf=3E z@!lV-xavJ?^e^wqKl+=>-p*f*J;{)x1G4_VUND;%JcVKg`T*L;tzk{=!AD3@yWN}cj(!_{a$jiaJ6v5 zH(ogWqg(&lI6uDW1^d}U&i?eOx48EoRoz9yU$J2XP>c^dVI3j=h zQ-Au<6QB9$_K)0t1028asK@lX@7edUuRgN!h&|Ule)6X4j=TT5Izn)g2f zUwzk)O%ks?jy(I-z4k&sbNlLD*4&<~nSbH-pRKyYe(J&pdIukP)s^E*e!6nYdT7&k z4>A$kW@u_|%3YTi?0=TVG_(`ONz_>&Z@Qwyyja|FFjn*|`3wk6!-#3HM$3 z=z+Jt^wg$LufK1PMJHd}f^B{Jvp@LMM|b@G;m00J9CY*55B`MQ{{2RN>n&fo;_i=c zN*+FK$2--BzIA)D`K7Y-%AO~z-u;sKUmsod$cyjUd+^G^8+_xz%(H!Kulz4wKJuZT z9em2Iw?49bvh|j;e}CQ?-?-zN2VbT(pOd}VeBe`?&z`@CR$5<$uDObM?3(P;>$a(x zuWs6M@8KU>FHIgmM{YiFeQoWD zmrq)a3!YehSbyza)``CW&F=H?Zj&eW-(%Zfp4jK=d(Cs$$N#Va%RTki%Z@*F^P{J= zcieaDP0ydjG}@cayQ=@nP2UTDcECkj4LAo zy&*XGnh$QuKYNIL)ho$k$mj3A>Bs-)*~`BBh62*Ja5?zAAf(m`%%hS zUz$E~#zVindF|z2%t;sQ|9$_6>XDz@a1;8yclHe{f*+fzD2Q|77xM=lmOf zb-?#7edxx$y4!zr-zBR*^w^F+enfil=?@+Av~tFmpWZ@m*!0~`KXt*UE^kb>MawVy z;g?T3{q$4U{`}=#w+x@U;A=0gS%2cA;e)^V!F~@saYEWdc>f)@-Ap{X`M4vtZ4NdnXKbn; za>2%Do;m5B)7Jdr^EcIgw(6hEgWkXYm(Tgglb=nV-&pt||DBD`T(Vt0WZTWZ|0Ma+ z#*Ihqn>4mT^y=%bKkVV*Q~TWZo~vJ6x6=u$-}U6_4}I?TkDvAVHP^nf_PW{rJASF_ z-TZ|E_r7HnW}dg@&_i~7+@1a4cbD&)@o)S58h`ut3*Yry|9dwVuHACyXC7RBF3NrQ zD>pxU@hwkY^2*(}u47Cnub)Nt9k!J;$U3{m!{l@y%Z{B#ga%}C6!;bjmn&Dk}{DX%tKmWSbS8o6FpH4sD z{Mf@=_FDd(4{p1Vd}#gJAD#H*OCNhWv(K7mmS6tLlUt5@dHEyzFUEAxPcr0pHeUX_ zb?-PUbM3lEx1ar~RnPDAc35*yxVQIVjo@Qu6A`q~}$ zul?PApI4L{A1^y_Pq@cfB)O(pK|q8 zpFZ!XFWmOK1Nnd7u*=QZnZ&I}FJJwEyUxFUXX^p<9apT_a@sZYTlZMEIr!I-zK?b0 zmQT7P`qZoLU6Hx_ko7CJSXb<$pZlv-zdh@s12>;?^5M;u+c*E@oNxZ0Yft;*X}>(_ zd&=f3*rzXerSVYajD2r=9rA9x?Bm3TPWbEKPyF)3j(GbTO8dr%^ab?quKexoox;`| zv8}h=WUP^1+;qmO&pmPVr#DwN-0;mypRhl2-nUQQyk@ldtnlGyul?;lx3Bxu0^_cl zUa?;OrL^IskADBb#85_A4yx93H{7_3nw4T|MMYh z&b%)9(aCoox(D&JZdZPJrf6TeEI#j?_)FJ)>Y^v;y}t&%_k;_x-`aoe4)4G9=#4Lb z@$~o8_urr${F(QL>C?Ll!9mPjXJ3C)@df3C&zqP0WWygn`DOKlQ_kGi-SgUgKfmVP z+wOP~REgGGw@!{(&%m3m1wi(U6AljSdoQwXS|@D%`MRBs`31TMx&8B_C*J)>{nY)o z3(En?E#LmD+?6Xf|Kx>Lky`MVE*oKy+J+Yh_6tA$;vB5pb)6G#{>oQx z|Cx2oH3e;M(6_$u*C5fB);{*KPaS#jOqZ zyz9~LBkb|VzWc~OJ$Qt6pDrGJ?1925>ks=oX0+V{LGK}?i*N-2v4p2>#hEE)~y{u?dL`BMSnQw_3H7eY4_Qt`>vbu zE9lDXPn_8{J*V?@YY=&*f%!js#?@cI{wt`j&jRVj0vQcRecBn0MK=t1m_IM6(O;jh ze^xcv%bU+K?XGRXts_%=4k;+Sdj0wF-~^Yi^@|5aXM`}y-*y})yw`CHbX`2PQP)vD_+By0OEvTKBFLx0)t*8gZw z`0cZ2<=rX&AH6wW@6Go@^5K$=ll>>iywWH<_t9&U`s|yJ?wn1ZqNvimsPyvv_&MLE z+I^k#e{y8PrR7H~XR}U|S-}W&$GwG(xA*>9_S?Sj+x`D{)6T#0@j92XeeY4rtu literal 0 HcmV?d00001 From f27203a5fa1c7e7701ce330648ea3cefec3f9689 Mon Sep 17 00:00:00 2001 From: santorac <55155825+santorac@users.noreply.github.com> Date: Wed, 10 Nov 2021 19:28:42 -0800 Subject: [PATCH 009/345] Updated Material Editor to use the available default fallback images to visually indicate a missing texture. Material Editor also warns the user when saving a material that is populated with fallback image references. Factored out the path strings for the default images to ImateSystemInterface.h. Signed-off-by: santorac <55155825+santorac@users.noreply.github.com> --- .../Atom/RPI.Edit/Material/MaterialUtils.h | 14 +++++++- .../RPI.Public/Image/ImageSystemInterface.h | 8 +++++ .../RPI.Edit/Material/MaterialSourceData.cpp | 18 +++++------ .../Material/MaterialTypeSourceData.cpp | 9 +++--- .../RPI.Edit/Material/MaterialUtils.cpp | 28 +++++++++++----- .../Image/StreamingImageAssetHandler.cpp | 9 +++--- .../Document/AtomToolsDocumentRequestBus.h | 3 ++ .../AtomToolsDocumentSystemComponent.cpp | 18 +++++++++++ .../Code/Source/Document/MaterialDocument.cpp | 32 +++++++++++++++++++ .../Code/Source/Document/MaterialDocument.h | 1 + 10 files changed, 113 insertions(+), 27 deletions(-) diff --git a/Gems/Atom/RPI/Code/Include/Atom/RPI.Edit/Material/MaterialUtils.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Edit/Material/MaterialUtils.h index d12e848a02..f39b8e7aaa 100644 --- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Edit/Material/MaterialUtils.h +++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Edit/Material/MaterialUtils.h @@ -28,7 +28,19 @@ namespace AZ namespace MaterialUtils { - Outcome> GetImageAssetReference(AZStd::string_view materialSourceFilePath, const AZStd::string imageFilePath); + enum class GetImageAssetResult + { + Empty, //! No image was actually requested, the path was empty + Found, //! The requested asset was found + Missing, //! The requested asset was not found, and a placeholder asset was used instead + MissingNoFallback //! The requested asset was not found, and a placeholder asset was not found either + }; + + //! Finds an ImageAsset referenced by a material file (or a placeholder) + //! @param imageAsset the resulting ImageAsset + //! @param materialSourceFilePath the full path to a material source file that is referenfing an image file + //! @param imageFilePath the path to an image source file, which could be relative to the asset root or relative to the material file + GetImageAssetResult GetImageAssetReference(Data::Asset& imageAsset, AZStd::string_view materialSourceFilePath, const AZStd::string imageFilePath); //! Resolve an enum to a uint32_t given its name and definition array (in MaterialPropertyDescriptor). //! @param propertyDescriptor it contains the definition of all enum names in an array. diff --git a/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Image/ImageSystemInterface.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Image/ImageSystemInterface.h index f567881c50..920b763bc3 100644 --- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Image/ImageSystemInterface.h +++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Image/ImageSystemInterface.h @@ -29,6 +29,14 @@ namespace AZ Count }; + namespace DefaultImageAssetPaths + { + static constexpr char DefaultFallback[] = "textures/defaults/defaultfallback.png.streamingimage"; + static constexpr char Processing[] = "textures/defaults/processing.png.streamingimage"; + static constexpr char ProcessingFailed[] = "textures/defaults/processingfailed.png.streamingimage"; + static constexpr char Missing[] = "textures/defaults/missing.png.streamingimage"; + } + class ImageSystemInterface { public: diff --git a/Gems/Atom/RPI/Code/Source/RPI.Edit/Material/MaterialSourceData.cpp b/Gems/Atom/RPI/Code/Source/RPI.Edit/Material/MaterialSourceData.cpp index 40fc9e096f..a8d61465a5 100644 --- a/Gems/Atom/RPI/Code/Source/RPI.Edit/Material/MaterialSourceData.cpp +++ b/Gems/Atom/RPI/Code/Source/RPI.Edit/Material/MaterialSourceData.cpp @@ -317,22 +317,20 @@ namespace AZ { case MaterialPropertyDataType::Image: { - Outcome> imageAssetResult = MaterialUtils::GetImageAssetReference( - materialSourceFilePath, property.second.m_value.GetValue()); + Data::Asset imageAsset; - if (imageAssetResult.IsSuccess()) - { - auto& imageAsset = imageAssetResult.GetValue(); - // Load referenced images when load material - imageAsset.SetAutoLoadBehavior(Data::AssetLoadBehavior::PreLoad); - materialAssetCreator.SetPropertyValue(propertyId.GetFullName(), imageAsset); - } - else + MaterialUtils::GetImageAssetResult result = MaterialUtils::GetImageAssetReference( + imageAsset, materialSourceFilePath, property.second.m_value.GetValue()); + + if (result == MaterialUtils::GetImageAssetResult::Missing || result == MaterialUtils::GetImageAssetResult::MissingNoFallback) { materialAssetCreator.ReportWarning( "Material property '%s': Could not find the image '%s'", propertyId.GetFullName().GetCStr(), property.second.m_value.GetValue().data()); } + + imageAsset.SetAutoLoadBehavior(Data::AssetLoadBehavior::PreLoad); + materialAssetCreator.SetPropertyValue(propertyId.GetFullName(), imageAsset); } break; case MaterialPropertyDataType::Enum: diff --git a/Gems/Atom/RPI/Code/Source/RPI.Edit/Material/MaterialTypeSourceData.cpp b/Gems/Atom/RPI/Code/Source/RPI.Edit/Material/MaterialTypeSourceData.cpp index 396ba71e14..61f3d5282a 100644 --- a/Gems/Atom/RPI/Code/Source/RPI.Edit/Material/MaterialTypeSourceData.cpp +++ b/Gems/Atom/RPI/Code/Source/RPI.Edit/Material/MaterialTypeSourceData.cpp @@ -493,12 +493,13 @@ namespace AZ { case MaterialPropertyDataType::Image: { - auto imageAssetResult = MaterialUtils::GetImageAssetReference( - materialTypeSourceFilePath, property.m_value.GetValue()); + Data::Asset imageAsset; - if (imageAssetResult) + MaterialUtils::GetImageAssetResult result = MaterialUtils::GetImageAssetReference( + imageAsset, materialTypeSourceFilePath, property.m_value.GetValue()); + + if (result == MaterialUtils::GetImageAssetResult::Empty || result == MaterialUtils::GetImageAssetResult::Found) { - auto imageAsset = imageAssetResult.GetValue(); materialTypeAssetCreator.SetPropertyValue(propertyId.GetFullName(), imageAsset); } else diff --git a/Gems/Atom/RPI/Code/Source/RPI.Edit/Material/MaterialUtils.cpp b/Gems/Atom/RPI/Code/Source/RPI.Edit/Material/MaterialUtils.cpp index 90ce9e66ce..4bb4d75d40 100644 --- a/Gems/Atom/RPI/Code/Source/RPI.Edit/Material/MaterialUtils.cpp +++ b/Gems/Atom/RPI/Code/Source/RPI.Edit/Material/MaterialUtils.cpp @@ -28,25 +28,37 @@ namespace AZ { namespace MaterialUtils { - Outcome> GetImageAssetReference(AZStd::string_view materialSourceFilePath, const AZStd::string imageFilePath) + GetImageAssetResult GetImageAssetReference(Data::Asset& imageAsset, AZStd::string_view materialSourceFilePath, const AZStd::string imageFilePath) { + imageAsset = {}; + if (imageFilePath.empty()) { // The image value was present but specified an empty string, meaning the texture asset should be explicitly cleared. - return AZ::Success(Data::Asset()); + return GetImageAssetResult::Empty; } else { Outcome imageAssetId = AssetUtils::MakeAssetId(materialSourceFilePath, imageFilePath, StreamingImageAsset::GetImageAssetSubId()); + if (!imageAssetId.IsSuccess()) { - return AZ::Failure(); - } - else - { - Data::Asset unloadedImageAssetReference(imageAssetId.GetValue(), azrtti_typeid(), imageFilePath); - return AZ::Success(unloadedImageAssetReference); + constexpr static char ErrorMissingTexture[] = "textures/defaults/missing.png"; + imageAssetId = AssetUtils::MakeAssetId(ErrorMissingTexture, StreamingImageAsset::GetImageAssetSubId()); + + if (imageAssetId.IsSuccess()) + { + imageAsset = Data::Asset{imageAssetId.GetValue(), azrtti_typeid(), imageFilePath}; + return GetImageAssetResult::Missing; + } + else + { + return GetImageAssetResult::MissingNoFallback; + } } + + imageAsset = Data::Asset{imageAssetId.GetValue(), azrtti_typeid(), imageFilePath}; + return GetImageAssetResult::Found; } } diff --git a/Gems/Atom/RPI/Code/Source/RPI.Reflect/Image/StreamingImageAssetHandler.cpp b/Gems/Atom/RPI/Code/Source/RPI.Reflect/Image/StreamingImageAssetHandler.cpp index f241ba6602..0b51962e86 100644 --- a/Gems/Atom/RPI/Code/Source/RPI.Reflect/Image/StreamingImageAssetHandler.cpp +++ b/Gems/Atom/RPI/Code/Source/RPI.Reflect/Image/StreamingImageAssetHandler.cpp @@ -7,6 +7,7 @@ */ #include +#include #include #include @@ -53,7 +54,7 @@ namespace AZ // Generate asset info to use to register the fallback asset with the asset catalog Data::AssetInfo assetInfo; - assetInfo.m_relativePath = "textures/defaults/defaultfallback.png.streamingimage"; + assetInfo.m_relativePath = DefaultImageAssetPaths::DefaultFallback; assetInfo.m_assetType = azrtti_typeid(); bool useDebugFallbackImages = true; @@ -68,15 +69,15 @@ namespace AZ { case AzFramework::AssetSystem::AssetStatus::AssetStatus_Queued: case AzFramework::AssetSystem::AssetStatus::AssetStatus_Compiling: - assetInfo.m_relativePath = "textures/defaults/processing.png.streamingimage"; + assetInfo.m_relativePath = DefaultImageAssetPaths::Processing; break; case AzFramework::AssetSystem::AssetStatus::AssetStatus_Failed: - assetInfo.m_relativePath = "textures/defaults/processingfailed.png.streamingimage"; + assetInfo.m_relativePath = DefaultImageAssetPaths::ProcessingFailed; break; case AzFramework::AssetSystem::AssetStatus::AssetStatus_Missing: case AzFramework::AssetSystem::AssetStatus::AssetStatus_Unknown: case AzFramework::AssetSystem::AssetStatus::AssetStatus_Compiled: - assetInfo.m_relativePath = "textures/defaults/missing.png.streamingimage"; + assetInfo.m_relativePath = DefaultImageAssetPaths::Missing; break; } } diff --git a/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Document/AtomToolsDocumentRequestBus.h b/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Document/AtomToolsDocumentRequestBus.h index 6a21a8a2df..b385f21a5e 100644 --- a/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Document/AtomToolsDocumentRequestBus.h +++ b/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Document/AtomToolsDocumentRequestBus.h @@ -73,6 +73,9 @@ namespace AtomToolsFramework //! Can the document be saved virtual bool IsSavable() const = 0; + //! Get a list of warnings about the data that would be good to know before saving + virtual AZStd::vector GetDataWarnings() const { return {}; } + //! Returns true if there are reversible modifications to the document virtual bool CanUndo() const = 0; diff --git a/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Document/AtomToolsDocumentSystemComponent.cpp b/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Document/AtomToolsDocumentSystemComponent.cpp index 3a392c1413..416babcbde 100644 --- a/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Document/AtomToolsDocumentSystemComponent.cpp +++ b/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Document/AtomToolsDocumentSystemComponent.cpp @@ -365,6 +365,24 @@ namespace AtomToolsFramework return false; } + AZStd::vector dataWarnings; + AtomToolsDocumentRequestBus::EventResult(dataWarnings, documentId, &AtomToolsDocumentRequestBus::Events::GetDataWarnings); + if (!dataWarnings.empty()) + { + AZStd::string allWarnings; + AzFramework::StringFunc::Join(allWarnings, dataWarnings.begin(), dataWarnings.end(), "\n"); + + auto result = QMessageBox::warning( + QApplication::activeWindow(), QString("Data Warnings"), + QString("Are you sure you want to save with the following data warnings? \n\n%1").arg(allWarnings.c_str()), + QMessageBox::StandardButton::Yes, QMessageBox::StandardButton::No); + + if (result == QMessageBox::StandardButton::No) + { + return false; + } + } + AtomToolsFramework::TraceRecorder traceRecorder(m_maxMessageBoxLineCount); bool result = false; diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Source/Document/MaterialDocument.cpp b/Gems/Atom/Tools/MaterialEditor/Code/Source/Document/MaterialDocument.cpp index 6969e9f923..ea3d1fa319 100644 --- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Document/MaterialDocument.cpp +++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Document/MaterialDocument.cpp @@ -12,6 +12,7 @@ #include #include #include +#include #include #include #include @@ -467,6 +468,37 @@ namespace MaterialEditor { return AzFramework::StringFunc::Path::IsExtension(m_absolutePath.c_str(), AZ::RPI::MaterialSourceData::Extension); } + + AZStd::vector MaterialDocument::GetDataWarnings() const + { + AZStd::vector warnings; + + for (auto& [propertyName, dynamicProperty] : m_properties) + { + AZ::RPI::MaterialPropertyValue propertyValue = AtomToolsFramework::ConvertToRuntimeType(dynamicProperty.GetValue()); + if (propertyValue.Is>()) + { + auto isSameAsset = [&propertyValue](const char* path) + { + AZ::Data::AssetId assetId = propertyValue.GetValue>().GetId(); + AZ::Data::AssetId otherAssetId; + AZ::Data::AssetCatalogRequestBus::BroadcastResult(otherAssetId, &AZ::Data::AssetCatalogRequestBus::Events::GetAssetIdByPath, path, AZ::Data::AssetType{}, false); + return assetId == otherAssetId; + }; + + if (isSameAsset(AZ::RPI::DefaultImageAssetPaths::DefaultFallback) || + isSameAsset(AZ::RPI::DefaultImageAssetPaths::Missing) || + isSameAsset(AZ::RPI::DefaultImageAssetPaths::Processing) || + isSameAsset(AZ::RPI::DefaultImageAssetPaths::ProcessingFailed) + ) + { + warnings.push_back(AZStd::string::format("%s is using a placeholder image asset.", propertyName.GetCStr())); + } + } + } + + return warnings; + } bool MaterialDocument::CanUndo() const { diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Source/Document/MaterialDocument.h b/Gems/Atom/Tools/MaterialEditor/Code/Source/Document/MaterialDocument.h index 452111f99a..d9f9dded0a 100644 --- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Document/MaterialDocument.h +++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Document/MaterialDocument.h @@ -55,6 +55,7 @@ namespace MaterialEditor bool IsOpen() const override; bool IsModified() const override; bool IsSavable() const override; + AZStd::vector GetDataWarnings() const override; bool CanUndo() const override; bool CanRedo() const override; bool Undo() override; From d6803d800b1521456cfbdbcaacf0c9883dbd4083 Mon Sep 17 00:00:00 2001 From: Gene Walters Date: Wed, 10 Nov 2021 19:37:11 -0800 Subject: [PATCH 010/345] Externed cvars dont get registered with setreg (not sure why). Updating sv_defaultPlayer to grab the variable via console string lookup instead so the proper value is gathered Signed-off-by: Gene Walters --- .../Editor/MultiplayerEditorSystemComponent.cpp | 16 ++++++++++++++-- .../Code/Source/MultiplayerSystemComponent.h | 2 -- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/Gems/Multiplayer/Code/Source/Editor/MultiplayerEditorSystemComponent.cpp b/Gems/Multiplayer/Code/Source/Editor/MultiplayerEditorSystemComponent.cpp index 7d6a684b6b..c5f3d0e226 100644 --- a/Gems/Multiplayer/Code/Source/Editor/MultiplayerEditorSystemComponent.cpp +++ b/Gems/Multiplayer/Code/Source/Editor/MultiplayerEditorSystemComponent.cpp @@ -219,12 +219,22 @@ namespace Multiplayer { server_rhi = static_cast(editorsv_rhi_override); } + + const auto console = AZ::Interface::Get(); + AZ::CVarFixedString sv_defaultPlayerSpawnAsset; + + if (console->GetCvarValue("sv_defaultPlayerSpawnAsset", sv_defaultPlayerSpawnAsset) != AZ::GetValueResult::Success) + { + AZ_Assert( false, + "MultiplayerEditorSystemComponent::LaunchEditorServer failed! Could not find the sv_defaultPlayerSpawnAsset cvar; the editor-server " + "will fall back to using some other default player! Please update this code to use a valid cvar!") + } processLaunchInfo.m_commandlineParameters = AZStd::string::format( R"("%s" --project-path "%s" --editorsv_isDedicated true --sv_defaultPlayerSpawnAsset "%s" --rhi "%s")", serverPath.c_str(), AZ::Utils::GetProjectPath().c_str(), - static_cast(sv_defaultPlayerSpawnAsset).c_str(), + sv_defaultPlayerSpawnAsset.c_str(), server_rhi.GetCStr() ); processLaunchInfo.m_showWindow = true; @@ -292,7 +302,9 @@ namespace Multiplayer editorNetworkInterface->Listen(editorsv_port); // Launch the editor-server - m_serverProcess = LaunchEditorServer(); + m_serverProcessWatcher = LaunchEditorServer(); + m_serverProcessTracePrinter = AZStd::make_unique(m_serverProcessWatcher->GetCommunicator(), "EditorServer"); + AZ::TickBus::Handler::BusConnect(); } else { diff --git a/Gems/Multiplayer/Code/Source/MultiplayerSystemComponent.h b/Gems/Multiplayer/Code/Source/MultiplayerSystemComponent.h index 87d084d5bc..0281916de2 100644 --- a/Gems/Multiplayer/Code/Source/MultiplayerSystemComponent.h +++ b/Gems/Multiplayer/Code/Source/MultiplayerSystemComponent.h @@ -37,8 +37,6 @@ namespace AzNetworking namespace Multiplayer { - AZ_CVAR_EXTERNED(AZ::CVarFixedString, sv_defaultPlayerSpawnAsset); - //! Multiplayer system component wraps the bridging logic between the game and transport layer. class MultiplayerSystemComponent final : public AZ::Component From 57989c35db45b57f2f73a3dcf7d26d2a865659da Mon Sep 17 00:00:00 2001 From: santorac <55155825+santorac@users.noreply.github.com> Date: Thu, 11 Nov 2021 12:50:17 -0800 Subject: [PATCH 011/345] Changed material builder to not fail on warnings. The main reason for this is to give consistent results between the AP and Material Editor, where a placholder texture can be used if a texture is missing. Otherwise, you could get a placeholder texture in Material Editor and stale data in the runtime; this inconsistency would be confusing. As a consequence, it is possible for example that the user could mess up the name of a property in a .material file and not notice the problem because it is now a warning instead of an error. If warnings-as-errors is desirable, you can enable the new "/O3DE/Atom/RPI/MaterialBuilder/WarningsAsErrors" registry setting. Signed-off-by: santorac <55155825+santorac@users.noreply.github.com> --- .../RPI.Builders/Material/MaterialBuilder.cpp | 18 ++++++++++++++---- .../RPI.Builders/Material/MaterialBuilder.h | 5 +++++ .../RPI.Edit/Material/MaterialSourceData.cpp | 2 +- 3 files changed, 20 insertions(+), 5 deletions(-) diff --git a/Gems/Atom/RPI/Code/Source/RPI.Builders/Material/MaterialBuilder.cpp b/Gems/Atom/RPI/Code/Source/RPI.Builders/Material/MaterialBuilder.cpp index e9cebf29c7..f11b2f94ac 100644 --- a/Gems/Atom/RPI/Code/Source/RPI.Builders/Material/MaterialBuilder.cpp +++ b/Gems/Atom/RPI/Code/Source/RPI.Builders/Material/MaterialBuilder.cpp @@ -63,11 +63,21 @@ namespace AZ { BusDisconnect(); } + + bool MaterialBuilder::ReportMaterialAssetWarningsAsErrors() const + { + bool warningsAsErrors = false; + if (auto settingsRegistry = AZ::SettingsRegistry::Get(); settingsRegistry != nullptr) + { + settingsRegistry->Get(warningsAsErrors, "/O3DE/Atom/RPI/MaterialBuilder/WarningsAsErrors"); + } + return warningsAsErrors; + } //! Adds all relevant dependencies for a referenced source file, considering that the path might be relative to the original file location or a full asset path. //! This will usually include multiple source dependencies and a single job dependency, but will include only source dependencies if the file is not found. //! Note the AssetBuilderSDK::JobDependency::m_platformIdentifier will not be set by this function. The calling code must set this value before passing back - //! to the AssetBuilderSDK::CreateJobsResponse. If isOrderedOnceForMaterialTypes is true and the dependency is a materialtype file, the job dependency type + //! to the AssetBuilderSDK::CreateJobsResponse. If isOrderedOnceForMaterialTypes is true and the dependency is a .materialtype file, the job dependency type //! will be set to JobDependencyType::OrderOnce. void AddPossibleDependencies(AZStd::string_view currentFilePath, AZStd::string_view referencedParentPath, @@ -277,8 +287,8 @@ namespace AZ return materialTypeAssetOutcome.GetValue(); } - - AZ::Data::Asset CreateMaterialAsset(AZStd::string_view materialSourceFilePath, const rapidjson::Value& json) + + AZ::Data::Asset MaterialBuilder::CreateMaterialAsset(AZStd::string_view materialSourceFilePath, const rapidjson::Value& json) const { auto material = LoadSourceData(json, materialSourceFilePath); @@ -292,7 +302,7 @@ namespace AZ return {}; } - auto materialAssetOutcome = material.GetValue().CreateMaterialAsset(Uuid::CreateRandom(), materialSourceFilePath, true); + auto materialAssetOutcome = material.GetValue().CreateMaterialAsset(Uuid::CreateRandom(), materialSourceFilePath, ReportMaterialAssetWarningsAsErrors()); if (!materialAssetOutcome.IsSuccess()) { return {}; diff --git a/Gems/Atom/RPI/Code/Source/RPI.Builders/Material/MaterialBuilder.h b/Gems/Atom/RPI/Code/Source/RPI.Builders/Material/MaterialBuilder.h index afb0789dcf..4fa5f3cf10 100644 --- a/Gems/Atom/RPI/Code/Source/RPI.Builders/Material/MaterialBuilder.h +++ b/Gems/Atom/RPI/Code/Source/RPI.Builders/Material/MaterialBuilder.h @@ -9,6 +9,8 @@ #pragma once #include +#include +#include namespace AZ { @@ -37,6 +39,9 @@ namespace AZ private: + AZ::Data::Asset CreateMaterialAsset(AZStd::string_view materialSourceFilePath, const rapidjson::Value& json) const; + bool ReportMaterialAssetWarningsAsErrors() const; + bool m_isShuttingDown = false; }; diff --git a/Gems/Atom/RPI/Code/Source/RPI.Edit/Material/MaterialSourceData.cpp b/Gems/Atom/RPI/Code/Source/RPI.Edit/Material/MaterialSourceData.cpp index a8d61465a5..b2c449a05d 100644 --- a/Gems/Atom/RPI/Code/Source/RPI.Edit/Material/MaterialSourceData.cpp +++ b/Gems/Atom/RPI/Code/Source/RPI.Edit/Material/MaterialSourceData.cpp @@ -303,7 +303,7 @@ namespace AZ MaterialPropertyId propertyId{ group.first, property.first }; if (!property.second.m_value.IsValid()) { - AZ_Warning("Material source data", false, "Source data for material property value is invalid."); + materialAssetCreator.ReportWarning("Source data for material property value is invalid."); } else { From e1ac57b4a5d4855120956c0794a779a58edc4154 Mon Sep 17 00:00:00 2001 From: santorac <55155825+santorac@users.noreply.github.com> Date: Thu, 11 Nov 2021 13:21:30 -0800 Subject: [PATCH 012/345] Fixed tabs Signed-off-by: santorac <55155825+santorac@users.noreply.github.com> --- Gems/Atom/RPI/Registry/atom_rpi.release.setreg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gems/Atom/RPI/Registry/atom_rpi.release.setreg b/Gems/Atom/RPI/Registry/atom_rpi.release.setreg index d1be96431d..72fb4f01e8 100644 --- a/Gems/Atom/RPI/Registry/atom_rpi.release.setreg +++ b/Gems/Atom/RPI/Registry/atom_rpi.release.setreg @@ -2,7 +2,7 @@ "O3DE": { "Atom": { "RPI": { - "UseDebugFallbackImages": false + "UseDebugFallbackImages": false } } } From bc20208f139568751c34bef92e8a8b80bf838ea7 Mon Sep 17 00:00:00 2001 From: AMZN-Phil Date: Thu, 11 Nov 2021 14:39:10 -0800 Subject: [PATCH 013/345] Create file in project directory on successful build for Project Manager Signed-off-by: AMZN-Phil --- .../Source/ProjectBuilderController.cpp | 15 ++++++++++++ .../ProjectManager/Source/ProjectsScreen.cpp | 23 ++++++++++++++++--- 2 files changed, 35 insertions(+), 3 deletions(-) diff --git a/Code/Tools/ProjectManager/Source/ProjectBuilderController.cpp b/Code/Tools/ProjectManager/Source/ProjectBuilderController.cpp index 7981e9d758..e892336a6f 100644 --- a/Code/Tools/ProjectManager/Source/ProjectBuilderController.cpp +++ b/Code/Tools/ProjectManager/Source/ProjectBuilderController.cpp @@ -10,6 +10,8 @@ #include #include +#include + #include #include #include @@ -80,6 +82,10 @@ namespace O3DE::ProjectManager void ProjectBuilderController::HandleResults(const QString& result) { + AZ::IO::LocalFileIO fileIO; + AZStd::string successBuildFilePath = AZStd::string::format("%s/%s", + m_projectInfo.m_path.toStdString().c_str(), "ProjectManagerBuildSuccess"); + if (!result.isEmpty()) { if (result.contains(tr("log"))) @@ -109,12 +115,21 @@ namespace O3DE::ProjectManager emit NotifyBuildProject(m_projectInfo); } + fileIO.Remove(successBuildFilePath.c_str()); + emit Done(false); return; } else { m_projectInfo.m_buildFailed = false; + + AZ::IO::HandleType fileHandle; + if (fileIO.Open(successBuildFilePath.c_str(), AZ::IO::OpenMode::ModeWrite | AZ::IO::OpenMode::ModeText, fileHandle)) + { + // We just need the file to exist + fileIO.Close(fileHandle); + } } emit Done(true); diff --git a/Code/Tools/ProjectManager/Source/ProjectsScreen.cpp b/Code/Tools/ProjectManager/Source/ProjectsScreen.cpp index f86a689e59..11ff7e0a10 100644 --- a/Code/Tools/ProjectManager/Source/ProjectsScreen.cpp +++ b/Code/Tools/ProjectManager/Source/ProjectsScreen.cpp @@ -22,6 +22,7 @@ #include #include #include +#include #include #include @@ -269,17 +270,33 @@ namespace O3DE::ProjectManager // Add any missing project buttons and restore buttons to default state for (const ProjectInfo& project : projectsVector) { + ProjectButton* currentButton = nullptr; if (!m_projectButtons.contains(QDir::toNativeSeparators(project.m_path))) { - m_projectButtons.insert(QDir::toNativeSeparators(project.m_path), CreateProjectButton(project)); + currentButton = CreateProjectButton(project); + m_projectButtons.insert(QDir::toNativeSeparators(project.m_path), currentButton); } else { auto projectButtonIter = m_projectButtons.find(QDir::toNativeSeparators(project.m_path)); if (projectButtonIter != m_projectButtons.end()) { - projectButtonIter.value()->RestoreDefaultState(); - m_projectsFlowLayout->addWidget(projectButtonIter.value()); + currentButton = projectButtonIter.value(); + currentButton->RestoreDefaultState(); + m_projectsFlowLayout->addWidget(currentButton); + } + } + + // Check whether project manager has successfully built the project + if (currentButton) + { + AZStd::string successfulBuildFilePath = AZStd::string::format("%s/%s", + project.m_path.toStdString().c_str(), "ProjectManagerBuildSuccess"); + + AZ::IO::LocalFileIO fileIO; + if (!fileIO.Exists(successfulBuildFilePath.c_str())) + { + currentButton->ShowBuildRequired(); } } } From 282c93c20c1d93c8eeb4867974087126a883fd7c Mon Sep 17 00:00:00 2001 From: santorac <55155825+santorac@users.noreply.github.com> Date: Fri, 12 Nov 2021 10:33:47 -0800 Subject: [PATCH 014/345] Removed source art files for default textures. Signed-off-by: santorac <55155825+santorac@users.noreply.github.com> --- .../Assets/Textures/Defaults/wip/Missing.pdn | Bin 18928 -> 0 bytes .../Assets/Textures/Defaults/wip/Processing.pdn | Bin 18995 -> 0 bytes .../Textures/Defaults/wip/ProcessingFailed.pdn | Bin 21667 -> 0 bytes 3 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 Gems/Atom/RPI/Assets/Textures/Defaults/wip/Missing.pdn delete mode 100644 Gems/Atom/RPI/Assets/Textures/Defaults/wip/Processing.pdn delete mode 100644 Gems/Atom/RPI/Assets/Textures/Defaults/wip/ProcessingFailed.pdn diff --git a/Gems/Atom/RPI/Assets/Textures/Defaults/wip/Missing.pdn b/Gems/Atom/RPI/Assets/Textures/Defaults/wip/Missing.pdn deleted file mode 100644 index 2ede3d837b276aca67709f35c243bc30cbcd7c35..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 18928 zcmeIZdDPp~xh|eCg)o#da|#6-3N1%~EnBjrLXv8-E!(mr&oabKu_}~M z2&37Q(IvqrUo4w!*#J-6Buaz7$pgjLL`9pVkhOfV5ameML$ri6NhoxrGE9N8LpvPc zvQ(ZVW;E8UYavN89uJ}zLu!pdKLuW(;_YI&KvmMFj@6^NCRM5snl=_9K4*|tw(K}P zi!`lhvOpy{2`{lUYw%{eT=e>tq@;`OE={&vLdH{BBcRfj#G278h4+ne)8a@Lk0wYX zl}VCOE}6ABdRV5Aj2P%p9jfzjf7A%Dpx$b!xRD-58e`qWVA@)rxGEuIsjxN;(4G3@W8@ zA`??GYa=Xxh%4DfQYUN5& z>le6Kuaea55nmO(D%J=_8k!1XovNG9$|-M0H;dBVy5pIWUWVb0;wFWS_wNtwntLNv+PP+t0jlUZZDdkh7p&d zhE=x`6Eb40?iFK5ATUkQX$Y2|F62-gi&Y%nOwP9DLjG8awDQYK*Ro>a`b?Rq1ODS5i8`Z3SNhL$S$ znQR6rDY0oQ}Qdlq0pf7p$m6$NV1}OmQGd;S=VZ; zX4JTG7Y!ZMZqbM%mT1W|7?o+ExJXfUyzY<&&IF>8H~alQ?5nhpO;=%#N~K4cc)~6j zu^5zR>ahgllKFJCmn+E?D#r8-LtwMrbY)nO%3LJTtLT-64plmF%twa^F|O5gO&9Z4 z$w3AUgKwDWG1tnM_>wSo6dQ3v3(2^QQ)Y}(vVaC!CeZ7w(-!W%I74%xWm0{wDocC*#!`m67otDK^CF6R{V$QmX>$9xB43wEle_<5sNBZ`h~_rg)Br}`|_fWwqfQ+=aA)=UWMx++A+ zEHl%K10kX$-*S_x*5Ht)J3ImmaEUP$yY0-OXLvlis(f)>xULNX}f zUNk;1v}S>d2{BN8PLC_yW<5fnF-(CqNm6+u(iv-Tj}I%W6GxSTD4~D#EdF$i(`iDqF}W1DekBEYauFifKe$F^*^!QG~>j z(yF=~Nwg8-8 zNN|qn@Mh2(`C@HQb;e`D)3h+%N)+&cD4J%&k&4M2Ch;Oz^M;{CIvpmLO!8C?0|!*! zZ@3hncM;JZ_PS)wv#loRDH1aMAXD~vQXL_vhsTjlL36Q0Hqx>ptxlm_@!Up`$X81! zJSx>k-CR3JIm2-ebG?Q&Y^XW6#pWY%jBuU7z;t1%9MMK~u~;Z*^%UY-deCa4;99iH zu~c2pv9VlxEMW=GtVLO}j(HemHJNeE%M6r!J~6q!n(Q!9r7+BJ zjJoZrTF#n`DkpFuo}>a*bb4jTw}yDSSR@BpfoT zNE>xV1+;@}O>Edigt|FwTT*6hgm_XZR&%nSE4pOX$O+{*nCH$oY1^r2LkpYaV89wQ zV|6;cvTG4aFjRS7A$ionTXeS6Y!1@tVkQr@ikcGZv?RRJVt6}3A>h)EAzfoACHeL^ zO7KJ$Z89-|)KiKfhM`zWRbp70YG`t~r#J05$tn?3@&`^S%~WBln`TU-k>*IWL7HmZ zLHRMAEVaNmUC1F5m z7&358BatRH7?e6OCfBA5-K1B*QcR^@$QN2<5g}nJ%#vwSwaErsDyRn8qVi=rPNrg9 z$ff!tlF~?}o9UAcL^8tU^f^W*NxP*e=C~d*TnlELaVwoqH%N9UmdPdnqA>k8+{1J< ztKRjJ?No_U4Wm>8g5YN40viPfA{PxyvF@nK74j8_q=_sCNl54y3r0Lkn?@{PhX`LK z5i>Qe;ZVkI#K~mA?vU-UY$XD=I!>}xK`MA~M6_g)mlO^PNl{Q8LECCXp%TyN@#~nGI8B7=??ivb#e!34C(16lE8 zOUdzMQjySj7d#dk6Zt{Gz($N?h1GJM2Ui-E*GQu8wasZ+GVFpiF!Fp(YRUPCX@p&^ zVDLJVGz9LGHH$Ywsw|^nMoV&mYbL#6A!)Z*HQyW~4l`y`mgtepcp8tfsaz_HLQ;YZ zl2(Bs#8JA;hF+DMtW_ekWVz2NX4>gErM`slI>k3wjnOh=&4YVdI-$2xzQB&^gQh`r z<$g9n4!aE0sMJtp!+?;JC0DAN9J`zT8XKHFH$(6tpfSqFTFNP2~|9 zS29UEYL(J#l#t_bOx2k32#qJiav=xyKv*!%t{?H)0Y~DR#p1(S*Q+Agj8>MzJY`g5 zp;IJPn#nc?-AqojhE}HQg=D2?bbP6WREmv3h$wlZhvk!HD^5{PKlrnFd%WJ5l1N+klMk6jx0B|1%yV4QaFebLRif)dQV8FNRe%7G~6LZy;dUE9O{lJj*t|UPUrKrjK$fdVFgyL z2HwtFe4LV^iGUlDL19oDo5^9COOE)20AyTFkXc2Aq=H3`uyzZLVv%t#W)vgMASVT| zYQ)>6=3v~3dNFXl2U)?2*QJ5R%W|9>j4VDGH7F6%Qk0nQg%t!~7_?MxX>o(Ml2ENx ztW+w4x)+CI^;VxjnhHx4T16+7j6~w`sK8@TFp!FV;3s4^8*h=xypHQSnU*@ExZlqV2FVu2Ca7{=-67_M+E)9|}-pxeOZmbmQ zf#49eIM!$^!~<+M6#BG9 zx`hEe!hDT|8hxizv%QAYFGS;|K~Oe|xP@SPybIwZIu^w&LzPXh36Cr~O zpkaED%-L1BJXB$asS?Ryy;|w1rdH_LO&99cI-EI(#LL8^D1c78KB@~NBpzEnn)l-oir1YM`0XPjLSMJM00>F za4evkb);^MA#?{G$4ZO2D@_?<&}iURhV0b*E}JgbIIk%V6Qyv7WtgE#R3}{)rka{Xo&WZ&o79YuVDDZLC;Y!^eWos3jg2<3F5GPxL zF{LG@?QtYAh*#}sgE!a=F^WcG z-Bvt=%JIC{t759z>!z~=fg53tbTD z%>YNAZuto|+ZNMsyE%+vXu=9Y+04)`$%)BSt&$x?f_TIA^R<4I8x3+00HtLI&~CjX z#AZj$*;Pw(otmR~E zrclLI%QT86R^iC7M$=J_#^9QlHik4iz=&QQ!&+=d%LDzoMsqv~js~LLiSZrB9wN?gh)RI!mulCx5NM0Bs-av6YR2;z35~m4mGRh7IdOaV-)l9NnF&!=ocQ8Gr zj&!bAPWvP@sw2=al$miqgCr<9TQtWg($wH=Ash3|B<#}7rZ0t&W~)#{vW;r9IaEZE zHqi8tqLU7#dO+ZhTyWzh!}|!#C#BINqSZ(&<^XMMT@VYXoe3HiI^Jq zSRCi241shjJ)88(l3EkOXkITC6Hq2~Hk!%T#Jv?^9Al9P&+g~+H2P$!B;uyhBLVKrqdfTl$o#!%xKJ3ep| z3E1qR{Sh6BHj!R*JZy^La6p?}8xD&?3|6c}A1K3pCCG(%42s3WM8NpnTo}tGQ%c&R zg)XVf64mz^Bh?}s*{I|J9=a(Qc?d8#s?w7K%^}T-z|lr8tq_dnxnN+XTLbYUD(i9cyHT&TB=r%NP_Xi9iz=(qT00Bs}RseR3YFflA@}KPHDuC z@_C1*;#i3KI7&on?O2?#hn6%BTej75hLmA+ICHAN=ZzrQ=-91svWGc%US`-tFA^aIwU%NXA_`& zsft}3b85MEEgJ9la%sS&*(3nytW>VY0aFv?lBVKUr7}{__278i@5JEtKn3Om%R+ie zKh^V^9aO8-Yrd;$UNliJfQ^+YHS$GI2AoL+FycfmG&QPJcC!7jlZjzr+K;);$aBaP zRw5FWG@J12kwACjS*IjI7zU7-P^&N|p(o=`ER^Hpbek@<1SUI@I&m&$Fa<4@WO$*1 z+7Vu{=<1jqV;W8X{#Qu`a0H9PV?%6|Twub;q`S-zuPZ`YXH&4Mnx$&ot7ggoK(~QH zNvF7MwLJvzi^D2jzYrn_)kS$r4&$YQSySVRJBTFU0ifov1cpVGj-`-8Ba^6*fP?sq zFXc3Faf?aLneY;Ni`G%9R8Vq#zD3tE&O?8ZhSCl$DD10Pad8zV^^4P=xwDWIDN&6Z%~Ot~dR zO1KGAd@gBC_yob@oK)6Ibqi<@Z6(0oNgJhfAx*|FhG|vER_aS0a7$GT|Wt@Br4Z3#{tE|)#Av?7=9?#T_f#(j(d?aSUK}I`DdGa zLr(QFVa^7&Lmsk0r_-(^OH8338SukEZ82TSwM!gb(mE-Cbps*A@lj=fjrke?pJhg) z;x;#`m08X!a+MO`goZ3onZ?9}NB_JY9a2&WE`rklkCzQeiZI>DS!qaLkRh}i>dibR zQG5voBP|JH0T6ciQj$#LtR{b+A2Y{bU|V@(GMSJvSSy)Nc7raki~_k*5Nceh=dzqb z1MVYbr<_OlH!8`Xt= zvQp{Nus!sxxawBgbwq5mdND$2$ezac2LlZ8vx$La+XK%YBMKDBn!d4W3ag3+>zSyVbzXpQ&?5s5U~1e|P2 zeUzzaj9BAS8k9`}HXT9Yel1jEE(XPF9f~QJ5b< zd_2dBq#R|k?MfEc5lxlzDP-)|TT*LOSBi*lMdF0Pm-8B>b>vu0tVlT;BI>}5+pR^L zazhK^!$wod6WKoLB$~01q2O)=@@zSv=wY&;(kYTmrtL&3J1X}3cAW1g`q2zr3#%qD z7)KL=is5j+Q|b#I8EXi(Ga4nBA%emo$;i2UvS#r@#5L+_Ey+^MC=%(nD`*AAP@qu+ zkP0UP1;TQDqLPggf!a3#}1Fy?ohab{KiWC^_m=yI;&068*S4 zE)Rk29nq?OmhSYUfS9rqjZ9IaRGd&CSWC%4;F)kjsi1CU0PN}`$gKo9GLAQxda_+W zFyL6xv@#9_Q7OP9XG_4=ogVMVk!rcy=b+SBE+>a2qc<3-@u&@qZEcI@4Zb;GOL)f`=G5tZOv)o|F!l(sRK}`F zJ6#$e;vfZ}2p=2EL$~gCRa@}~RUu`TgP@rU0tiEKf@R_rdel%nydI(f+^LenC`nbL zBN)&LY9^XsOWI%nu(?gDVclTk#2^CMrLaopvusce02|mC$VT2XIKbacaBQas_;#+C zW1CT&YiI?UYK)7~dde-1uqe3PAe%F^7Ai!5!rslBBds60l~zH(dibbNY7a@Hq>)wH zZxFF|fB-~BvmHQuBQhsqb*;!ngI+(;wt$^82^kVwZ?vfdLE9`)Rtsz$83P_8OBorv z>y5#g1n!rLIf`MF$x|rVD*5rYKasHpD#A``G{l<)U`J;tCMK3CH6qxG0;e$E7Ai1| zGU>X~%A|oKMz(`PS<&?|0&I1*)PVZsWYXZ{Xsm(NA{N~!nJrcUBxiuKF5uWoHe8o$ zOx#FP#SCXUhLaw&QHBg{mEpmT#?$CE9(OnrmU-~MFX+%+=v@xM+38% zk*ZNYVh*Oc@`_u4#EJ>#f%V~`o(U`6a*yxO4wt4RF$K;t15ju&he>{FSNOa89&EQR zsklJ8JdxmFmw_?4CG;~=V0fY$*jmcaif!O05dw=rkaSB?#)yvlZMu#3m~6gWtubc1 zjS*!oFF+=Sr)WT952JOmBxZHBgDXsu6eKMZ(FtgT%4#*+bgW*ZnM=0uK;lMv4aK8= z9MdvJOq7!G-gp8MeZ0t&4I`uF+A!00wN?hz@&GHSEFi=t4@80j@O@O*sL$0xTVkLNK1Lp&~ z4(yMHr~=_jq=>O5MN>|^UMTk)K$ z^ha(omecKM292;vv8Zu|0j^5LOQVAl93kS8Qg1SBiLAnQw^YXC`3{L3c3VnSIrC=6Z2xgLOTGgm(GkK z6(e8<)LJUHh9Wn1#3<}d+pbW6lQTfIVx5fDY)6`aChn6>CtL6)et=}LToDRcl$JSe z?wo@o^Nxvp>Vz2i)W31wjG5qX#*8WOnfy*ZyKDmjQBsIc2h%~@4_tk2M-O~gX&-U02<}Hq%j%;Npl~{KJ3+g>{iOQ6zEEpd3mm=U?*KA( zvOLD}dRY!OEGR#OZFkt!qAT+4PP|=^fp*w4*?$D@r>62p5lU~`7-Ic%4jl?&;n~R*}Hu%!L!Et z9-oU3wtByA2de*v>%4U>CgJRfEXyX)?-fVVo6A1big zjoAwd`oNla+JcwB^6t3fr07wg(wz^QF=OMu%$PB2GQ?@Yo;+;(+W&|J-);lg#Q!sf zIuV;~Tl#4G!DOq>oVmknkg)65^`X@~%2$l&vC-pq*a;+EJL{N9+QC+1?wmN1z|c7d zx50TdCxHRCZGY6$fiw47$)f&%E9H-SP3T*wEv}93owbC^x;3Q0k zz$cq310+CNay38JSh!SZPy1qnH~y24s8&gmoh|^-rzgkY@qbeKzmt^*ZkS^kxOtPs zNpTAB<;C#mq<@*oAv4>tMN(xr*VBczg&ku z$)C<9%UZiolqOl`^mvUr{KdHZcln^bkvb`APnU1iQ*bcdetWvYNxU^3?@YJXQmaFF zdOYA2@Bwb^z=b_k2`ZJzYLKl-kS3`#$+pOnL`lFuo|Fv=CV_E51*APmM@dDZf=Rj- zQbm&0NXdb{Ms@oA$?GIJ-IZZmZC6T@Xll|GDkRI~q#kZkPmfITlSO996i%uVWlq-* z%2ktXW!f`;^5PfQb6mIi(IgpsD2APss_BtPWSjx*Q7C9%j7cDlb(ZoZ}RG3@{a%l@Sp;r^o925ViP2aCJ215FfEVZarz_oKvg+C4I)5qrcBM*DrY1) zJ#M=0$l%Rv2ju6gpg$}zd99~@wmy^S^b*iE(1poL8U*Y(54JRGu%nU5j@}g{F`wJe(NDKCocMG%gKhoE zZU(${Pwhy7>Qtf}BL(~j0V_0j8VJpN|I=1>`$8+|q?Ip&q{!b|i4mak=|khQBP0G< zBcwrYt?->sE8OD?6(%MX?g^5x&sB(nil!?B|5CE`3VHyR5~65Ad5AG8O3u5IzNW+(T_o}YiCxV0OT`Ix!mj$iwH*4D0RUQNY(IJN|6ivkAZnHh7Q7+!wma{iL7&XxJ0E_yYdk!2|HOp>OYLN+$|3w*#2# z3oFX&PS+h#?XK3E%-Q67$|v7Rd$Yd=BHK?U;=i8Ci9~GI0Y--ZFVvqkL49DvyI3Bj zXf4C-2A#&NZcouHe>8h~D)??gpE<#{+x<^L`7>v3^Oesp{2I?(`w$SHIdf|J7r+7YpS(XUWYdS!f(0{noYXe?%$!K^w5T6CiA}_LB1@-y@||At z!$4%_M6@T%zQZ>_Fl)MN2gkOyJ>%Ommw~n??Ss4-+aC;q|E3gA%1^qo{Y0$(BRQN1 z!H!@P7`~Z6W}Au!e2#%ivtvVV>aMFdK=$mJGbfS?`Z*oWm^o`QE1$;xr|1ncCu?}{ zWZaV_n@s6vQ!sPqt(U}f+OD$>I&;VArx`oFb@8)T9>DH(@7moqtUgDWx8dbecl-Xq zKl<`^yYD`Gk2!nn#q3^U#K-sR?{@k(JALkjXmZc>=;?c`M_*m?!p*y{KlI*1`%ABT z@#rUBTCm&e`QXLXZ(s4o;y2EJ!F%~94`2ND`HMF$`Brent!s|nd7oTz=O=I2^QQ$Kq9mdpNW>Y+6!Fa7w#=l6g7n&aOx*F0U>H2&*@;}1T3zBqf~ ztEV?Ny|ntNAOH4=(<7*Iba>+mZJ(pAD!=se6|1gY^4uA}X@2wFN3bW}TXWxmt>n_F zm+~8oOM>MmeE96s$IWP7g|0QuB3}8I`r+^0iQID3hM((GTb@7t>1&+QON&>$z2}}U z4!>K!`sve`pRnfYTi!W8Id$S+|E+T9hBLV%q=V*dNi^jpP5zL3_g`?s6>tAwYT;Dy zD`Eb{XRZB#Fz@`c7TlJ*cb9c(55$5Ol^AN^tC@&I`uYwU*pZS zk6lN+yW;G(p4ASWdgzZ+=V|uiCx86N=8J+g7xdr6e*E5>FL<|IR1mtSHm_UO`Pr2I z%EFCrpvI#|-u}BITgMDuS@=|W-Ksm*|7MRZPZmEq>HOPIU4y;#P-Lz4=M%$yx7_{c z+!LOgJ@x9Dn{K@Q-9L_zxo@rf@k0;nJGJr3Jx}=QMdSgUzr4e*=$3DK@0&;WZ=d^w z^X?@lzklJB{t>ziS$X%2Eh|r$=Zznj{cbk0>zS`~mz@9gJ6Aq(!OlNa@4x6f?lvd> z>4(2NZuPPS=k$m7eQ64R_{8PcAKRII;bX_26#Q)AaSNY1sr|x5A1$#WOZI#EwEeE- zKVJLT2k@QfVdo7VC6vvV-0;mO?uW1FJk~#8&)jY6p8nmun;YDb{dq)k>4wu*zI(>P zk2aik&E zd9N>A_MQFr`IEd1{V{rPG5^55{r6t2-=0^Vt1ftBqp(z);dH*TW?QJzSWmm_ezNY8 zpPc;gx286(d&Iotq@UgQ{skXhaq)GlHg*@@Y^>9s4wsLNe||1p{@U+vf9b{}Puz?> zbkOk5ldkQ$f7tV}-D~?EmVf5vGk==e>!Z!9&v|^-K{vm%?t#q*z3M!@`JnfIH0P~V zx9=j3Aw9k2esO^KrEkvqYzO{tir)EM{FKVf3$zdCt-a!;(zUJgzOtQp+q$*Hg^5Gg z?|xnPh2RC}CNx=?KLmNtY`AXfce~8J6xsCnPJ7Ug-MD)B{MF0QBR1)e9gglmwfN%( zvhYyy`py&Yrl5VU{^#reoeom7-nevp{Ga}~{K;Q__n_hZ#xI~BZ{FmcP&xOXcU`#d z@w*S&e9MB9tyybE2fArt`Nqdn7hdLAa_3D?wLJ8r=y80p=41b@!XE9S1eTYl@l`l*+%+vY>__PwtD=!xC7n2$by zp8jHwKIEorc1>RR&;{J?n|8y$>+Umu;}flGZ+P|A9gItkKO4QGd+X)9FMNIR+>39% z|r(k6)d2^I;aW@he|>_~Un$pY+a#6|Kkj z?|$%pA9;DhS=Zkh)nAU>p!|08A?p_Z!Nt{6S8el`eP4SgcJc?OE|r&k|Mod+ZasV6 zx6Z$0F9O?Z;hSr&z3kFczvM35@?yCDtbgl2{^48CpD<_fxeMN2x#O)5tJaF+pWU$H zgRjOf^DdsX?4I0<&&=7dw*GMS?3)*P^m~^b|Gpi4aJ=7JYgQlqm-W}Jtna(vg=4Fu zw{Lm+&+n$R$|B<8HOD-#=aS8d)4km{oqoFd->~0b=B@bAA@&cJ{q^H}E;;#<%0Vk1_{MGT{Peb8?Jpm;Wzpq> zi;tdn&XDe`zJjmad&}20y#CjH6I*_^?DRb^eC;dOy+2y{6Sa93y33}2TCXn}Z(jG> z2}?IWoqzbB9=v%xaOoqgPQ z&)aYzx=roqpDyn`aOm9pt#6<6uRmCN%VO`HJ02OnbuV)7hO4$5Fn;@Y?-@(xz^4$0 zqlBIxzxLA`ZrfZi)__BF>pLF0MOM{cX^X!HTA3d(F?snJ>{zG{9 z%!U=m7~j2S@86xAUJ$=8vijBo2G2AO-4GXkdco4yDvQ?bQGDX*8+SN;>7wjaXFqtr z?N@nM-nsmkFTE*$eCcM>dwTr1e9#BirR5DPo?LX#%a^})(x$1KSJ?md^4XW3u)O=? zUDt!s3s#%`-R=n&$J(17`1Rdiujr2~JoDwp!v6fPuNe#TZrNx3-iuC%=ocNk{gxLN z?0v{(S8Q{_L7V#5Po1>po_+2D$JT8tzIMxdzu~XOzp+jA>3yw3-WDEO7fZTJFIxoa zo_Y{EVe=W7Y?ZDMnZ{O=4483#I_ZQaZ&Ut>-pY+9`-s^w);x7_lj3&VHlldgaM+l$Y=_eX0+_x)-22ll>Szh(V*)^){qmhK9$$RpQW ze$EpMH@s3hZq|9XpLJ68(aeA6|=ZCz>6dq?oM zmF`%!!^#8m4@~{xUE#{L-)-%GrvBsmj@tD2z0}mh{`G%Y8$INmpWJc(Z|414{pwls ze}B%c2ma>LkIq~6^HtwI{obEFvj4f~MEr(ay z*Ij#^dF=T& zXE&~1vZTQYd+v0|eXI7J`tt$bc`tI%)SuBC=4^QWy-S|+zP9}8_m*zjARPY}<(`En zY&pAW|8!ILp?w|!DCnlwr_4L|dSHrL`AYWO!?amzx#bs(R{i|>wevr?;*1YZ`)K7u z=dS-?DZS=vzu32V;gieP1(&~d$h}{=RKD-=zn;18vR8whp7`x`#|6ipb>*2K-nidC zf=2|J8a{I3Q;*92=9~80a?QyPZ#)Y9`J2x@|0ytf0$F=GdG`U|3zS#?<;S<3xB931 zo;|aWeeRxZpSyT?VK8;tF~7Qh{cUe=|55GPVAbo_O`i66y>4HZO{eAX;1KxjKIQ-ZDTFA_PJ@V0Jp!072{qm(JoxE)6SFI@5A1@oVJWaEkOX>H-fZBLv3)Q{cY9e3^Pzd7KyTfRU4sXN|UdOm&q z;uya9^0y0_!|&PrrC%?(>+N^Wdi3%w|9sOGcdQhG>*g(Z_-oG>*WdYy5L|k|5zE%x za`>z(mcA?m-H*E~zkKy&yW|&MaU1AEe<^)=_je!PcByy8(g&}$ul=a_;#H6B>)rq1 zlXH6;iZ6b1)_SIszikZ@G|Q)*OE76PK($3iSVlcf{5Ezq#e@RTr(k*1ht% z)|L{sX6-!({9$ge+X3MD!Mof$7GLQ8V&l$WR5wmFzx4R{!IwX{?AGkzzus&8(f_(} khufAO{jJOX-%$VGs{Y>+;LPE_-tOJq-Z-`P>|`tdF9H9pXaE2J diff --git a/Gems/Atom/RPI/Assets/Textures/Defaults/wip/Processing.pdn b/Gems/Atom/RPI/Assets/Textures/Defaults/wip/Processing.pdn deleted file mode 100644 index 994513301fa9993020455f12824abbf543cafd93..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 18995 zcmeIZdHmc|xj){@Qp)avU_n~A_lg>9l36kdLTfThX3I=6OENPob+S(;%S@6QMw zf}pH=y&@>e74H>M7Apv{w4w;8EQJeLfkIKB1)lf8Af^ zHD_{8PR{l`=Q+>wex6}7mH6(@%sGA_+XbtuDT~6M?CU2SjmGe!7wJk*)BSfdW_O~v z-U&y?j$Y(-14R~kzRrV^o@1YIbYgKFi7ieMiPYkF0!hSh?Ho}A;DFtH}z~&19ydKHVr=08;WVMU1?fEwkq`+QXpL~Az|FKpk{MT zlmd0fMi}62t~o6%N?E-lg(R8r7?4e6NJ$QcG(P~L-Uy@>JD%QdXhEub3 z-qx4|YBG76%V0^{;Z<=^5K|#*VvtRus8S5rCf3!w;UEchET$7NO722F{N=cO(OcLThTNkKtL<#-v= z8LYsM@od^cG^%IPiLs!?=~BPg9ry*ZJ*bTs-l-VF7#y|&GcMAwU5Dk7HfXCuA#%q! z+tN$?*lknQbWpdNj;kjnU+lRl(v^ep1TasbW^1`vqY;b8;%TSUmPfHf)G3R8g3Yi+ zStyR9-mqZDDM~JktAKkG(j=`B#a4zRJ9SR&L^VNBhZboWrF2wCXA9|cs$X+bY!%Jr zCZk+?Y;&q6k;pjR$BlTVlOWXG2&ti1Hb>#4ZFCeR)z)R2ucY#I3Cj#CWl7XJH5x)% zEjh3xj82BK8`F(^qASP3nhVG9BvUI={ah&=ml3T#tTd`}6LA9~agZhAtTG5#t)a1Fm{N=yDb}`=9fT;f$5^Q%YAnxM zxkf*eOgH74O*;i*L;{Ajc}Y$qgr@Ly+)$%|hm1y(HqmDlh>(X?9IuZ9DA`iRft<4N zL@QN?#XhHDTE6G7uItrJq0^@NL&~c5q=c97GPycR1bRoDsnXd3!1?5I*fIip(P_725ak;anoXkFduYOfo^2VMT4ycBbjny zAx_gHL{LkKSS5twl7_H+QYq2I(6OtLL?@{> zCYD&d(^WMk^4z>7idZqzMe}xlIN^;rN+8CyNhzQ)UnC)JELIwc5g|`c&rLX{vM3!^(sn`O{9M!dOQcB5|SI<{6g+c;_Njos$g5t*@GL_@HTp_BL zn_V~L^<16tn{+?TAU%{G;<?m=uR>=XivI~>y#R)x}fqcC{x4H%1HP7Il^g9sg|yHRd0whe5+U%X(29QE<0$o z$L$j8m0Nh;a8r0WVYgU|u+r_iArc%_EeXD=M=Cf@@gm>M4f|5wjhBT$M4^h6Z@F|n z*FP5LG=hyQ2ijVNLieZ+DdcpoM}z2BR4y?-8GG(GwFG0(nyniFPZH!kuhl0l8C{@ z<*etb83xI8vCf34CsC}}Z;0$TfT12u6ehY(8dScYZM6zSDuyLmkwDOJZh|#37eJ^D%uK*HictsiAS(9(5Xvfs|1abb)^)`ru*6; zuf=0rx0T7(+p$3{n@6N>qi!;g($SlUgI9ebr;-MVxt(4|>+6CF1`G`vY@uBWdjq;T z%+x6wt91=jNPC50%`9n%RvYyNhu}3gUFvu0PNhJ0JHrVzEF{EwJ3k~lOuEFHASPYnM%=Jhu?kM6 z+s@agga2z;j>`<4<#n#v=CYqIpvuP<~6-r7y+Zhh4L*`u` zqfpvv&+^JdbaFK{LDqSz)#f4$qeQLSDG+dzX$N!`iIGZ&>MIgj)JwVPOecd1q=Zpw zs=u?fR#*tD!&uvD7Yjg8W(auLj3)HopE}1LxU-Cx+ORy(Hz8b zF+3b_W@#)os~p=e)=*mNYDO$U**&p?L{K)Y`SgFyyEuf86XB#efGH_*JbGY}Mx9rk zjOm&gobQ=X8ZU`C0u$wOw+ffy4RjblW-QRFZ6pE|&>E(Eo@8{?cdHx+tTwijYffkp61)7R@NZ?_6I9n*c7@$zA|>qP3E;~7L66DvWS;;r!|H}B3JK+ZrSBwIypc`Wz=`|ag8e!(oiaBXhkPQrY4$}t`9Vz zT_+~(WYQU#3=;1(q!=z#Cr}GcS8%Zn_xW-Fh220UN*%UZB6U+J6rg4{R%1mQN!bo! z^Vv?P4H0xE84hHfu$4NH(teVv>m{@o8)@+%mofr94)sb+f+Qoq*6N@!no)X&kf0hJ z9dAJ#)9>)_m1R_KG#+Znez8;Wbx891K?pUgnNq4_cp}!KyOt~~ZC*yJ#aP)*3vs+m z+q4SFlSxWX)<<4UwQ#2(pvDM-ggoiFuod#1q+RCqdL?Q%V=z{au?o{ttLbj9Wx7fi z&7ryp$zr-Aca;|3sdUAf1!TKnt9h^0^pk{a*9MX-D#S>vX>v9NB?>BD94An}Ghz|j zL;JQMjfO63qv$9h^L?b)!J)C6fi>GH;BpQ_V7nHFCq_9M5+X10^r+v6SNuGd#l@J% zhA8R`Q#Dx%BT^2Ouqxx8l``8y#ni@#)a%q)Pf7*VE;1Q599?Kt zk`ToTxGk3`2-0%Oa2(oI59zht?5JZH5gV%~!aUN)G|OR;R0vp+?j{Fvsyx74Y*d=? zK}<;&6o|)@M$2i6D&7lS&o+y;qN7$uWkx2^s-}9`$ZZNO#`4OQyc`zVtXB-{dDCUw zTvQ_pH3x1d)F`J8s$e}EDcWNzdD|Q2h;nH}=I|J=UwYnm)QOrUx- ztN20AKq}72&!K^wXVLLwAmZtM&krh6SfUe!VhSY%h#m7{OjUYi6|ERzXlF{4XAOM? zAUx4X7&TQCu62TfAdtQw1;Ao<6%;k#7RD9h)s8wIjy+Fd@=g%60v#Y6<5XC%Y8KBM zQ8{QCYLc!@ayU~rd0gv33B3}udc~Nk>qAv-7m--LfYPxbE$e-~niz;eHZEEHA>MWb zxUUQ=csiXe*$rTZ!TC}G?t2m5BZe5C@tZAA98VB+h)ZSIB4X)YBGTQFJb@WD#n-z? zoTy=(jMY(+6tlHf&|~ZMR9Fe3HdF3Um|Buhv+BtPTpFOnP|nGr9cxQ%zhx(ybR0tp zIdgyj{hf|NEP&D!GZKts6OOz|0>-kGhlNZqv=lxt)9H9W6x=u!dgWj+M!mW}taH`g zu${-N6QfoPU;#GLxDeNRz=|z2T*xqlLD+)Ei6#(Qaynj2wR+hw6EE8C1S2PDv))tX zl!WK}NaV|HRvLY&GAdZrOfwmEQMMQ< zsgN3LLD)_-ORkvgcDj6b5{F5V!$dW&x^0%!;ZD9k9NQvc6l!kU9S^&;xLVGnMkrZ{ zLt?FDjEbQ=(8rSHC(O=R>17&RBkM4cLSg_Uz^GDcl<78O2HP4t#Y}rd=R@1(UC%Pd z2@5Z^g(2UCElo0Ft*lGcB>^UYUQ#tVQL+eN)aX^H#1?peRDn2T=*a`N90cWzW#=+U zOJ-t8L|}r%C>tr&c#+JfL$z#)<`}7JN#B7Tu?;0cLX72+0K-t;fYV{5L~7Zj((QKL zRi&bwj5p#W=F5WOCE{RYHQq#VH_;na)p*-%>Ttall6jVd%#1QAR8j?@R!ahirUvyJ zaKrbq9h*zW65U1)n1MpZNc%eJlF3P)>m}5*_9# zsuCnCTu|u+bt0Gdvc8%rx4V7amV-tS*v{3IlB8vHKwB;elLXF+a;{~JMvQ1j<4%fA zqycBDD#DIa)k@T71#|+9IL>R0i}n7*bR(>Q(WRJB4!Ag0uH=fY%>=e7^Khxi#Y4jt zigHiS)1d=IkX|klIWZ161;rC}7{+k384s~RvBF|mLzy&9cMP>`01}n;9I$YmPEtW2 zDyLaBZAegZnhP;iZn+(s7W8* zX;uQN)MdK^F~?OkYNDAPmC=YU=eJEWg7SPSmdij0V>B>^75c?wh>bILGtML2kS~k< z1WUIt9$4wHc4xmg=RmWL8Q{`045o7g~ipPXfSQN2j9k)8@ zu;e;jR&oFYP_HLk330(OKU8~h+Z+#FWmwgH;M%zqy4?!{2Y6wKJllCa6LP zrZUp05!Wj8nVcUItPw+8Xi#8L2pbDM zv*qa=r#JO7&lGcdoa0nCImIALFrU`-(lA}hI7mN`0nA+>foB7FcG_l#*7!H<(_RoKifJZ^L3yu8=#*4ua<~uz z_dzMGWs0c`qUnXG#seINDltr*DCCDKnv97dSMnz^gK%U&IgS@62||kx3`dFCy;MPU z*m@>`az=q6I|LwLs3Nr(qITOXIJ6W$`_mKdOrwU9^VN>SF?^!Hd#=Az!<}0#@aml5KlbL{v$%w!TLOELjW|R|UqfD{ahse>epQC9Gz{2@DGicJ; zQU&P|xgi5!VZncgsfbcm|UCF@G+k)19T(S57{O;Y1isGs%Cv(?`6QPRDkgRA@(riZ@Ujd8U&4NWH^FyBrM{(d($+|+hZcHdJh>d?W^I4tT=cUnq;^{V%VVhQbB_Zz221uwjJ-Y7CqfRMN7_U=&X;A)v_2X1$Hw_ zx5rcds|?6YuH=tgTu(zLnF5j=Hqy8pGwlcr zl56lZC+L}Mz)_gn_=`OaAUF*$k?SyRg39|L#rC0SkjKkfrpr<+m}#|I>H}<|S74n) z)3QsQB$3P{_5Rd`>DaY)rNK~rEJ{#SBVJCT)Ze9Fa|j%j$opuXFSJO$Mn`m$@|jGL zs?bfo$7KO@m9qh$V=3}bU;r=y94u+3kgi9-i5OL@CYx_idam8f(b-%kO_g;cM|5SP zjzcgJkXQleAnepv%#}*<1Y3%91x_JJD92a;U*IM#nN_<~iEi=Lq8Ll%`>2hk^Gu|x zN@pA=+;S^H&X&g~fmMJow5Z^G*0CDAn;1=sJVK#m-S^sfWdet>6x^$fA}2mc#*~^6 z_4{VS$j&!74xzR3%B8Kp|-f zX(ZKf^RmLgX-@R>P+lh@As37aRl933S{-T?)Nw+p8b&?MBegy}>}BJ#7%xE+mVv$N zdlt&AOap*`VZQ9f8!$}u6^L>uvP%d9}fQN>~E zBMNEd8_B#OjD-Y;%dyNjWb|gy^D37{WD4Wu-l8cJx88U=2S z^VA3}HZ$=+m&>(OH^FxDBY2b_rAA3k5bcKT$9=Zng!pWsl$SG9G?|!F{|e^tOrM*c zK|GdcYt$^}p5!r2j%spTj1yjVAldD>%`$B$(%jGSh*$U zM}d}iG#wcEYS#mP`>A~pN>+^=L;afH6*5>vSupT7)`GydjG~7}c`ZUI zwmNXea|@GlrB#S z2yecFQ%-v5JxCQ2HO?utjQ-KUvrgWIYvTlFON@Q8^5tM6=stEuZ!0F@w z&Pk)X&rdP$Hl+*4_g&3QyHIn3{X13bz#w>uKkH`Xn4zx_l zj4+VOlr$3hG7b9X1g%M-Nr4AJ8H!qrQQ2WzBWnP9!{LrU8nYd5OcfhghN@(M>`U~c z0%o{g;8CJb%hGkjZ*tY4TFD!A3mN8_crOBQR!8lm41|Jsx>_D&n$*l z(`Xf^dLW_z4duRw2Q6emc;0a6J8{e$mEledcE)4A(vkv5#1%meT&g&fqa5nFsay@0 za6UnRWv{55zz}tdoJd-^gg5|j0>+bWRHTy98+KzETxljsXuUk)>}&~Q%Zh78ZV7H? zqqHWE(hWS2vh^-IX^#bx@&#HpDyjkp|evOyTt zC-6c;k&#?K$P(==284>!6voUnwt%a_J=JO`P&d{Yd1A|x%>-qjBH`#3<%?+)rZAxh zD+DE371i`1GLD)659iR?b38rlL=ptlT}+N*-DqfJOcVi|v@lWa&Pd?Akrc0t`fUyA`uL^C?5<)U~$hXhf8mz@;W zPr{Z51J84qg=vU{VLpx$mTol7yg2Sg5zx4X17(;Is>Zks*>5 zrW|XN$iNm;f!M@J;K#{x9Ki57JcUC!nM~#Vnx98nx{(@VY~BcKSv-xZBTy^{*q)^RxNVJ%)jCE!P41-{*JVJ9(+dfi+C zMA9WvLvc*YZekdtl6~6`Ar(Yl#S|69X$=Rq(6UQfP^4=Nt{|%BS9(r-kP(_V*I+P~ zbfQLOs$+{&9eXI0JvgM~tW+pBs)|1ie*^)L#ac57q+n6gv=dG^dJ(+jc=)}*O!&Q+ z&n0u_g3p{eGvJ#3POtqx1QM3*_G~}n_!Y%poay@AV;8*_@%h&QpT{mrk4%5$Dks>= z$alNuv5VM|X!d{znKYcfVxM4-OmnYk^B?;_tBy3X6x-h$JlMDAWqRJg@f3OQccM-A znvF)?`<*z{`F{>O{qV?BTt@M`G8j|AS1fPNo^$5xvB%s)-rsb28n9aKdH!@N`|NXI zed2+ti{G8W#<}n2(~fB>k`KaIy~VU*D{fC(3T1D%DL&Nem_82?fE4laKws+4#vPo;;oWocViz&|*K0Pdv-hCu0@55zx^8zeT}WtIZ@SnAy|2LQMaoCsmk-{F2;LJk|6kJi z9a>D&`BPq)KMy3++_b+vr^#QDX?7gTn6BZtdoN>p_VkAu^-OvGvYHa~rqRdXB|zSN z_L){)3>w{U;hZ^dpEYOByy+BY8GCxO$20#c2)^f=U=#oEnCg^m_UJ2@=8M6q1N!7V}(>Y74xhQBadihal3IYLZos?6rkTBxTV? z&776D;Elg?v7$hd+1U!n1ohf6H2OQW|0jK$SFNPhSEdwFH{d9#DQ`+W8>*_6y$otr+=XXmSR z&=2O@fAt*nHxZ{*joJGB4vmgx`!{DBoaXzpd3(0Mz9@{*+4+E1zy(76L0CV{k9dIM zfU7@E@+6ffvwh$Vp*ZlL0kW-8C`tE0$OVOvX@u-@)M#2Rg;br)N+9$J^<-i8{psr@ zIXjfGDVls^nx&^hp+d4rPTMI=+Zm8FGbM7Cq;cR~r1aVLK|LX7c4z;sFn#fZ^o%+N zGnp2Hi^^oDwOR@c!%-3RMWf>l%s-lwiRHTkQq{(u6b|vz3Hm}aVNR%rZLWW@j638|5@n$_G_-fQq9A7~Jp zHuzCclzLx-IB00LLGU-5cVrNl$GfABCz&i+)iPkg-)Z>8_ZmLr0}ZF94S)Qv8wLaW zpEi8(^z@w`oAVEyCWnFKfDi5e3Gnj)%`fe^%KKHF5B}BXzt?$YHNR;OhrVAuqk6v8 z9n30ev&!GVbq0#-_Y`lQH*(dkq#Qi^5c-Q&xZgVkvr6Iq@7%wm8opceFHOv<5_^8` zZ}bPfuW$Cx-A>PwkG}tn`a8pzuE*Sc_BrbPkKXBgHvM1&vzpBU@W%YZK{Ds`cfa$G z05@}|3p~5hp9DAaj|9nIDgdQr&R)|O|KAOIszl8b0m0?!V9!sze~3+>BUA4@@SqAn z=(^^++36T($GHgH>@^+de>LqXUwlCS-rED}udM9lNnINO5BCH**9R!dC>HR!QKlpH zr)xI-p8oE4+TZ-6KxVJ$Lj3njIpv5w0mQ2OKUMvCQ>_ooc>kV9b)~-MIwM=2=M1`1 z&!5bnT?)pLmAO;hcF+GUTK?R*A6oE!;?HvCEV-v^@gBkVJ{qjazJFP@`Tqd&bLYEeJ?F@|>pDaocw`sXE>yWcy9 z#BACAnT6-=GkZ5@-fj z)ay5Y$T>N9n`&RXGWofSezRlS8P299S9^Orz3QIBE}wD7opay(c6;&H;L~>Aamnbd zUG~+nnWvY2yL8^n@sfB2^hmTua5T5;!jpITRg zFLReZe(ODc+woVg zym-m((}=app8v!>Z-!4q=MOhM{^&uEt^3$BuZC;C`HgBVe#x243#|=f#{0tZgBq}nJmr!-$Di9i{{3tGN1qDUZv4*7%;JOIdj0M*e>eALRA!vy+}(fZ zPgcBn@ri49yl&)3fwehgq?tesF!%62KKC^zoDX%VEvU~HP=`60E+#qdz^(T+*tlYG5U+c`}m2bK)I;XUMzI(?vmVa*3&RhR^ z!BhWw&%zDspImY8&mPYmQd#l%mAfuqh2FmATIa=scK-a)?>nBc{jyz`Up74Tt`+zH zgFUm-dLXc_Kjo3#ul$5qgk3mM&inD&#rr+B^^KVeH@-3xy!BCg?NRDeUrByw$FH9G z3i7i0@P|v^SSpkn>B0Nb$9!w^(Q9LCmpt^Gde#x@ zmScYT^~{O)-?3`hxm%>$FS`FW)p~3G$^&nM*8HGZ{QTxUe!gm__lM0}3^cf;`ux%* z^PW6ne475zQx4zu;|(8Qyzcwj<{j8dw|LTtSG_v(%*MCg_;T)$%bq@Bzj=#R{L#DQ zy2nr6eB_oTuYB)>FI@ebe|q@vRpTqF()wezJaBvc)`zx#V%@=8zrS0)cK4}AoV?$) z=j{Gu65W>k>CYGMf9lRR^d~NserSF9p1T)ZbHT&GidWCMW3Qd=5yNM%Kk(MW#PjDS z_??p*fAq`s%eP!JJYXf^bKW_}UAFwnjVHbMX8hylec}51U;f&#aFV$G!Sg>Vo_==CG?Az`L%J@0IKH_s%e0J@P&t$gTdBP`zL!SQX@ef{k z@+FU53-7+{+dCINWX~sdJaFnS$8fOli?`psJMpLL66}-t8;-dBvf=smegpH3{Icz@ zKDvtj$nu3NKI86j+u5%#*mUP_Hm_J$KJ9adAD9^bB%QKfI&r}%;zs-Yi}e?NapRk>9Qg7R;nN4dc(p~ z`wn4W{?wUYZ|rP%;KF$;(NEs922k&yWv`sObo;@RuX?8^w;p)dzu)+$B>vCv&)z(7 zF|FaR?>>atedTG_ulwP)RZDjFSDyCU2XEVV*YfL=d+%6s%D*U0UHW0-0`$mhPrT}kOCEZTn>k_YBI)$E|KZ})&h3Y8KltV|*DhLi*Vgl{ zD-4&Px8`fln_u7TJ$Aq+R*DzC6ejO0er4(IGfzI$Td?bly%#_IjrC{W`C9J5+pk#h z;A``uE04HmcltNp{YPH0;^XUoefVlkc-Yy!{Sy}*w-&wR?sos{%ZP(oH)xk#_0rk* z&!DTdjdNeeTPwFe?;d;inFLy)@7&t^p-Q1 zzx~?B)}6lfKc3&iUxy$^ynM*n$DMHV0&DBD8|J;Z^6ecB^rl^B43nokbI(l&{jmL$ zyHC7f<)iz3Z|^VKAKf(bpLh3lZT+^}&N%LzT?hF$Ocwuc+tRIT9!ac9UU;hV+AlAN zk1jAbg#Y%k{Dl8ZdDpQoo_*m7{>^WH;jn}EK5K6G|Ju(PrH}407;W03{BrsH)GH@n zzkMxsWO))TJWTt}+W%Pp?BFEp4?^Rz`p(PF+T*n|R%h=l7)PAFrT>WyKYnZ50Sg~G zVfnc)to&;F%rh^;R;>T|*73sI`*+W5yW?cz)NruhTT9k$+4~b4TKbj`KX}(BY~kIP z+gs0Yf|H-R=ANgH{>Y)f9lUjWYJBBmZ{B{Ybn1;msPg&UD*9yOtv~&G>G|!2;XiF# zYM=TN5Ju-*4m6iJ7p>`i_^j8dv+k&_`N=^~E&0bM@%3vy^D6wUlS-@Sq)s~g=m+Z0 zzu^6R{e4&O-hA%T$3C{@`n&NrZa#9uQ_xplz4)F@Z_GVn>8!r8uyRT3z5^DjS7V#M zb&>SyIp17(N@0U^>Sf=nhl5>fzI4*XTW@%?Ub!j`X|bMYNty8l~G8XwyEa@jiS z&Cjkl^QQ8vYd5E7)s{5@f9|)jFJF4yXZ~|jcg1Acr*3-YmN_f8y!6@KlUGw0EV!PX zxoR!YPR>l@+gls=++g2#^&kIm-d5|e1x@I|J30$q-gep3%(ovpe}T0A%}u}Ga_-EQ zSC{?b%dZ}^ZRO&dZrD1r<*lU;-*lO}`=E6*YYyCiZ(q3J?61Fmx3O)oYwg?4zq}1= zpS)20fphgS>F?Z+(O&ALnYTL7)*F`m{Gn@ZrXGLlyAS=x5$AoXrR&DV*H%Bj?lQ;Zf;d2iy{XW0;(V5?V;%@zjr9WNyy^r7dn7aB$ zyEb&UooF7hZQtW^-`vZ3>+lnvSift-V*1MCKd6Q**zxu59Oku49^JNZtF?XSmCw#) ze|X+EHm}mi&s==#vZI_=&iupm|Ms!ZBM+?EFFODDg?V)2K5MG~K0ffg-VOhB=}i6V z{KLP!cX-1~57bkieDZ;@{mVG?P~)2iZJ77m9p77V&TjhN`%@cc{^jFe-E!rt$IPnk z-^wpMbx-bsJMMhPuGsS(8v-EsKY5=)amjQ zar=TNp7?BU<7D=wFMfLI%9%CWmr5JNB};|3H-GEF-OoL|1u{d`5YL+;r*XKXxv9ZkMp`g1a7g^l9z)>%P5p>2cfN0;Z|@ zkzFV6`oyhA&3wOp`ONhzUzrJ4pIf=+a_qaeL{En2HrM_`H1o*l`>6l=o0o3i{)3$t zRaWetH|O+ASz+zY%BuHwy7s0=e*E0SZ}(PgfBVW;esPPPIQ#x1mtMc-$$z=-fvdIy z{7>C>adgOcI!o8x{K)Sg|MB&wWUu`FpU3&g_Rk*ov(q}uR_}g($92~pe!=&yzkBV~ z*QK6a>A$dT>6|(Do^?yKF+6u<|7`o~FI+7=c-8iY?t10r(#D;u$D`TN{$99l<=eY| zyg4U5_u{MZ&6_{>*1n*pxpTgVIaf`qd*3HebGG=7n1xJnXpTJMVovs_&++Tr#uAoZHJk{IPc0m90(uiOzNR&yL*M`SKe1 d{tf2|>;C_V{;#6woH=K2*)I@^yQZ7>{{S4sbK(F1 diff --git a/Gems/Atom/RPI/Assets/Textures/Defaults/wip/ProcessingFailed.pdn b/Gems/Atom/RPI/Assets/Textures/Defaults/wip/ProcessingFailed.pdn deleted file mode 100644 index d6388621371a5f6fff90a7a3972ce9588cd1f6b6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 21667 zcmd?RdHmy4xj)Xx4gx9)$~HJ&#jg>XG-=XY7{(-R(=|!kG--+mNt&ih_M}N02FB&8 zC?Fszh`8aRiFNSa!wHN9ofra_ys!iiT5LJJfT`l`BRP&9@S` z#+oh#9;=I!A zEE21FaoE!niYkN+5G4wf-j972e84m-?M{o9%0q+b!Q}xhT4daJB0FD8J7&!EkS2w- zn~p^nX@1t7RWOtBt42$MN8J)Tjg@#*>JB5fW>%O|zg29SL!nn_+LGycT7Ma*-|+>%3XiatMq< zv6#o`n#7t9XIOdCy^ z4-L7mSJ3XPC(r3(!qs{c7^7_~5fUzEMgIi^-@zW znszZWnv8R{P4qZFTdu+;5qiEV@phr=cMZ2Zof5NJx7>nExI8YGTZ+i`=6ysBN|sS! z=7SnCgmf{&dxEY|gKRd=_V73uMDwIic^NV2^7FhDh2w6-Pnn$POH*W0fEz{4fs3$j zY8&w(dDhGI10L;`s}p7}1AY^YrAC*klnV{3Q|nuiJ5hq+#F)>LlnQ0YfwT_Y zb~}Aa3p$EcC@KAVmc`pjeN;vBu_D4O#Jiy^O){P>wh#-FnIfd4H0Vns8qNDQGEJJ9 zqBtyfxam+Tp-tX!>udmbF;AhB+N^2&)O5)91J#=a)GX4n;%Jg>g&d3IWy^KD@LY==XA)RBb}9*5O)z3 ziDwd`=_R{RpK)qduIq?cj<`5&$9lCs)OAgzSQ?4zsWA1Osm)HZsDWkhIiL1PEe`yF z+F@pBw$SOpbEYdHbZ$5(BV$Bj4J9aZY*Xq=SW?6a1~b8(rbw8Tia#rNolwr!+p?>) zGOa2#D|Mx?n1)z;T9@ojF-^zy2p@RWkui;Am~3HwqiV%A(V3!@Jt^i{j(|DKEcBeN z6Hkk|ZUhBw4Hk#wjG45Fd`V0u$*5Q4N@_T8`F=XEaE_hyTuhu4)PNq0M<_!{mWx1u z{`KrMosEWSAC^T0feTV%&-v5 zI%+FRl}i! zB(1qTV;6@NDii|`r8L#26%;A8#&lSN!!BEQh9qrEQ%qFno%{qa-C=-9Zf-1fI!#fQ z9ERaSTAf;bPHFX6aXOp80Yf%gO3vpqR&&&;YmKB>go2o#JA;lraneau`xnecCI5gG>|0wURq* zRG2PJF?GJhvL4bCMV`US{o>TXsZxim6Dpp|*fKmxAV9ehfvQ>D8<#?{%&>DU$7Z}n zig88SrZ^-~2*A#`hEK_eJkEq=tJ~0P5?*X35jR0aG&3~OsWQ&8EFbzp4oCUfNMRC( zl6`cj)l%EbgmpfJr4iSyX<_PS2W_v@Z8rE?l5OX6&5}g0s4;1mI5z^> zU`{6@>tn>%Qb*7Uq#(grWSLf|6(bBL=Q{^p>)aIx;9=PKwp^s}~Z>&qcgVHqR3OwF$ zIG-Qs98no7<8G_mp$bMT6qvAvC_TY$q3v43PY2~$v0K)(AgbliLS11(+D@&k)+;$= zBdatrCB00_Vv~yeN{HhFv{scfMKHImreF$XLLn>Fd~Kw4CTJK$vpS@+Xr?MdL>?O} zm_U0SD6$JW#XxBoxNIsl*?tdlyQGn^g-WL%Vj_dUmNBHKMZSXyid`C7fP=R5i9F{M zA1V%mV#$+(LQd`rs5mOKm{{U5MH`7#$*Ves6hk7c$YYeJgj}NK@_J;{#_>q&@(QM# zTqPNUKHH(sXW?M(=Kw^uCS-w0k|}HDVU5WHNawVuP@jloDm zS1xg0P3MFlTc3{gshbJvTv-`%^)^M?O2<=~dY_X;*oXCDPWNHN#9}XsgEvY?lIMR|DrcxmoGg8^0;%uXr zuy*L0Bi}cgMOA4ddM&HZMt;q$dNt9bS(%EvbNdZtbb3rT=&DJ2m1f@Z_`oQ-!(xpA zw87MwCY!b3-nh%L6_2ekDMh!-RMW;MaL+*T&J{KUvG%?27!Fi(-bJRY|N7lmA=5bE)0 zoZ3dl7?R1bIe{p%5OTbyi54X_3&uQzVPxoLtCG}fmO2!mDvsk6l^aQt+@U3kBWkJG zELQwxgJKI6OdV0v@rZ{Fm^b_)r;kIrnb!TT&~Nez+bE5PQ4JZBwX#k?G^|qYc#d#b zNmF5^pAK_Aoitg)!*GY>y9yR1NU4|Y_bZv1q;+dOxjEIvFi{~Ui888h2hDcP#=6yd zKR5Q$c~DBhIb8LzY8C22Gu~xz5^UgnJCBPq3>6J~YztVYISlEEEovRAEe_p#lD2)n{@%@dz=Xqq>*m>Lr44Gj3nZ)Qc63>Xi|Iw>+=k8ak#zjukQ!u$ZKf zWLxpEI0E1D#mjVCl_;1wb)6*^c2Z$J<>>lSF1oI(IgXoAV8jMndra-`qORy-g{OSZ*28kW&qyp4i)CMOy5pW-8K$LCzBW(nX3PZxy9}9=_KYb7QmrS*-6)FnvKy<_ zj=<9co_Bh2G|0q)S|0Vvbzw-MT`{K)W^sykJ1%Ia8yV#?A6ofzHqPl1EzP=8r8}3s zS($U4H1;Qhd`Gb9Qe|Z0V>V;!o`r;2o)G6EqPC|4p*_N#!E`zcS%O292m&H)YR*)F z8x@9nGiTZa(vOuAT`4)jq>Z^nEEO_-A%g9QOG7Q}iT1RJ8A-b@k+~Y(Md$M@r_|C2 zhhY?TMq%BvQo)7#I2u7S7q2v=s5}IcrxUB)7`8guZniKF+bro1ONa!N4Q@KC*ks+9 zSEE#nrs+6K5Y?!bN2|4{oW*G!f+S&>9pgznH<+5)&8LDO)LxQ)E(0*_Hs!?r)a-3bDA?$ zFr_{*p5es?&ID%cM7=D|W{8B>@=$xd;rD~&BlBDi*Xglqwk|t9=>f4ei z*G5)6_w87dQYP;9a5R)g89OD?-gr2h@m*ow&S0~amxC>>HLZd5?$;(_;!mV%H=_Cj zyAHK0MHwy&v0U^^sunwG7YZYNUY#PHMs6CRO*voAI{C7So0?whJF%3V@sr9t>=Sk; zm2tgCphGO-Il=Dd^#W}pOp|Z3Y1_A*YCTceF*iwJ9JbS%g(Oy6Vwq_)hVqo<@N(V4 zXH3~j@@4^o=aJru##KeM%u;{m_5h=tM3@HYb42ZqrFbYH422A_kRBObMp0Q`72-yi z6=qW(ALx0%n2ExHAIy3RQp~VG=Tna=m|W~bRH6*fusiIBc+s@ndej>FFdHXc4ew*^ z)GQ{2>_`t&Ivnz4T2(4;Z$v6Xw`7u7u~p#%*mC7G??#Z4Vy8MC>BK5WW%hPmSL|>crMb1%XA^O zy#dgCO_exsC?I6TN z8?+mlZb`-i2(s%*x9a%`L6n9)24}r|u>z!YtJ4Y@oJR*WVm=y~Xv>X^IL~&wg<7%P zZB+=SSu7^}te{F#fgHvfN0?oS%~BOV7s5rP^x3vX0$D*%GFqnVG&%!i3_ylz4;0w| zP)n>i`N)JDiscVIR?^VaV`HaJc!WU8PN6IJ`K(aSL@bn_aQSWyD48mLfN>)d9n9@K zI4fmu?ug#Vu+V9@SR=V{d5BC5fhxz1K$R#&44qc1Zp21R_E=%yQk8Zlwn~U-2(`At zPZ%(Y7)=Si*5#WFxBc87SU=sILD)`SLy(F#~QltTuR(B+Kzw472*b=WM?P^;_f z?F6!zDbyX#5pR}*#7JOm92!78nTJDwQdMLMPk2mMvKlr+a;+-B+y!}59?VI)A%`jo z%}ZI7o#~WMRFioe>8MHM#wP0rwlGK4k=>uGc%rszWwTeeG|ujjOjJl(xKM{x3y+=Z z+(|U7LsXmdLAUMz9hBN-5?Ad~1vjP<3vXw~v|{Ap0&W6Y!iIVqbS=;5dJUhqIby#84U9IA$|j)=GJcoTxUxu-f}XQ|vStJ_DNw)vV#zL86j5L_}t$ z%C&+t1!_#D3Pp8x)+m$CP>EHehqr5apdIaE;<&|ki;+W5bw2CHldvMz%zlv`<(Wx^ zgOYJn9Tjk5;OTylP#)|d1X^-wp2~YeGFzC543b;Imk?!tZN6Y(!>h`kuBMQ z$TYnE#EKvXBPwOoGMaXrL~}Z}igrB~VTHHX}t%N-MHHxD+RYX z<+=l@MF&m2#SYqa1L8_Ey^_iG1{0qtQ2EFbH8W!qUL&@A-%HBTEP%+o6U1<))=@G@ z1FJBVIbb}H9nCd0$|6lJoApL;MvN*XQXWSW2+Ro>XkqMiML)$=Dlj~qk|Uyp$Kxqx z$~sWTDN?PGZ}oUmfDs^b78H3@>7-h$LRmF8$8}LCoBeDS(LF56D$%eHI8T4bIq6Kv zru~wnLbN7jd0atT5Iabd8jR33oenqV6cCi}I`vNWWsdCoF$t0J{a^@i?4^NLj9PXnqFw>e-Q9o&lMmhGDb5X95YU^;grs=?SyOf_GR3erw9!A_&v8d(?;IQx5h3sTln9CD9!rG%^ z)2-{pVkN8somjVJb2_YyCW>2cP^F4aGny~9?0yG!@p_b>>Z491jCn0qAjd9NhO&}oQfmOA(EOCl?;3e8Ezv- z>Q-iEfO$z%$9f}+d5fngeP?Z1(2F*xD zro%FXJNG*>k9o5YBLbq)5eIbCvmzx|%4Hm20qJqQ9#)I!AYV)TE^SB!G4aY-bExjF2i7c>{sWgHN(Kalla8D@ngSg}4lq(LX zCY5C!1(Oy!k`CQx8blUpjkDFE(rZc*)oqS>GU_PgNRio2NotnhN*ZgW3P6h{uo^1- zn4Z>0e6dDwP`k>9qQy{YDJaLiCInMpO3i7lG|8w!2Qy|Fg=)HUizAA}2ep#fFXJc{7mF|fc; z6HyeAQHTinjz5kmlqfc^LQ4k9Pf4n%nW)?PGZ>HVjplqcZ&qk)$mwQ8MPV)R%#=98Uk%JU!p*5-6u{g`tOZ=GN>0xMT zm043xDvVAgjBHMYnuFzNBRg<<=B!jnO(HQnv`}y<8?25%jGGeMK`6gGkA`!)5HNWm zKhI+H#Fa9n!xa-Vs0-634Jp+woy9w?R!$b8I-lo~xv!ZaT2ajwqqll-88>ZC;>93B zklcJ87ScRZ;-!GIGnF#d64GA19jo#PEsu$i)|xI*nc@9fk)zCPAuRUdE;5EpbM-0awiBGi+Ej>#Sv}Xbfx%;(s6j=TW*aRr* z(U5$ctwk6X3#0L|eDRJ_I&m!4Dh*;^sjo@yXXxfzAZ-_AmjLYpBP0JA0tW)tUM~ZgkrbpA9u&;gh7C%!yJ-Z+L@IED~6y?!dFL570=1OyN=z zlmZ_D*jxgN_iVNtc(t5A^&_TVZ%M{z92*@nN#Jo+i@8vqYErqxYxKy{`Z`ehXet5D ze-`t@GC7!w1O-5SqnV>JE?1qqbJKs#?xlFOx@tA%KrNfiKq4L>AsR(pauyq-GOc$< z17OCk>S|cdN_39TNhCc-VS%og)6^NYgFvrwW1yPNL4BcHSLO_#GvHy)mC_j~l#r+Z zj9iN1)5AHNO~?*B5JtveSingZo%@0_QUzt~K7}J%HiXA; zu13fX2bCtc+$n42k=NII`Doa#Oj`LN-_E)TL2F$$4!WJl;4~6W=D`$Af$gqlDXwD) z*)|fvg4Q?fQfAT=0p&#)Du2 z3=a(o!0l3#bMp)@66JcDZxx7~HcPWywTI3#F5(h6gqJ&o&}?vp6cKE_;IKWZUP6Z* za^Mb0xG}@@g^gFP_VS7pX_=mbQasZSYcPLx5c_E%t%)Lq<+} zOb@DpvDpO1rqBo|c=@tyk@7GoN0qX{kPJ#$;uu3lB`O)0XL_NMPwE+m$&_oVX5?Im ztT|HrHwwN4Z#QLZ~cJB36L{n~h@;suNX2Oo^djTVr93N4&M^kS#zaaPZmw}qk+ zS6obH3LRR_&Kkg9VaRr}!wGF+xDPN-6&MKfLQ(dndDgKq`6fiSi73pJq}hv*DzLDVsus7pQS85I> zVsWBHm4P$LN_fSWV>_UI+V2yM?AU>-SO+qpSTA7JacMA;2bqBhNhO;T+apFDc?j^y zsGtBLMSL^m%rQ#~RiNZ2YnXwsD5C!?-$nuk&qlP74dtgDS7 z(NQ2(8O^$7IdfoQ!AH%)kmFNI-!2 zTJR7Na^wLx zYBK;sVlSSIQLNn><-LZs{>YvTfg4m`W1?>5 z4P}CarAi6xQ(4%e=XQui3ld07;1)(z!dy{N9m(Pvz@qZsVRcGOaH={bBN4*jQp@6+ zKqLdsFa<=+45JCjkLZZx#0szL4KZ(KARc%_VKr!~24xEJu~4oN?5sAn7+p(xwrq2q z(BaD3kO0mVUbb%zW;Db#-;g%w=Y`hXXf;S^)XkX?jR4J{jWaRu^(ZyXi9&!jL&Okz zotiTW1fj$9jU0>@q)aQ*MGVrz>5)_u^Yd$JvcQP^zVQGr=o!!>`L0l-9L= zuhggl>pIl|XJ|QBKs|K~vu=}Sxq7z`j?SK|d2S0CrvtWSglM@!&Fet5;96llhZo5t zj$#H#tZ`i+;%3GiOajB`jxuW3pZ8-^8+tKTK=X9RlC56f%Fi&jYYl<{1>sJPkpr(= z9m#;pR{OpIQBofm7^=~TDD$?_=>$lnT{VWl2F&MJIAcoLGO)2xHKkW(`Mly0afZnh zXvRn;^&#+mvwA?J00uaH%yU4b;6^=J?ywpajx~cCH6SgXV3?7g^-Prg&I;a>hlTi&T&6Lfz&@xD|4b$;u#9~hP3ry+70_b zoHt~k&&=a!ry|swVcdWa1!|a#y_l1%p#U=}MChd8cs}IE2s~xo6rM_WMuN-pSvObC zsqrv~QO&7!r&S^)-5iw2wBZQ+%t@u34Q1RRQtl|zM%o1m>v}e@h!KirDnf?mrxQ7ir5(UqfAY&<~n7p&?pqL1e@>B zgN8b8k9;1Zh{3cQ`Gp)_@=_R6RHol3<{(9%G#k@y!cF-}4*Ab*`ERiI$Hi>9X*8@s zzSx3#78_L?f~C%=0okTz$%vW&_lK$m>|DT#(m{RL?H0@?q|1_TOuPu#*R5(Dn0s1` z870l;=)d=C6@l!=x9cMAFe6_Fs+lf00fwbO_Tod&& z0~#N~MP?Q@BSd3~Ar~lBv(D(W8W^Q8;8h1oLPBWC6`%o|rhF&gZzX__@k-S}GQCEV zim@Ejiko^?po*PpGX#2U&Ns6mM$XE;LPz79zzby%HB!w2q}e2N%V9h!)dA9pfh0B5 znkegG%?xG^SYS|^0(Tw6qlUS9Kep-+)GX^R(rHb4LC{Tr-Z4JyjKGLOQmEE{24k*#KUl$8|PDH(3FL2ka2+j64!#T zHUpJra=~e_VlLB@f%xK(tq~cddKvH57=qC-FXzX+OkvIN$;(i{=X^IJ#8ZF<&(P5g&1wP%%*v-gRr(tcT0sXj#lJbCQ^-vqKoq1mk2n+Ql zP6Y>~Mmhr+ay6f;Lb<`LJM9U*TxF6W2z!POhJFT~1K>eU84}SI2Y5A*coN1AV45tQU0?`lAcodz?6%@GSYT1@I;X{?0rN-P*MnToY^V|rQgK@>L zK_$ins%=e;+a&=hlR%J)2rf@$TY!gGCAL`a@p5*=WyqN|#nY((v~;L2WPs37Ad=9C z=Ci>h$C4sGnRSc6Wj3W^M=n58CdsKaC~hRW(kKg1tyk$sYKZ1qT_zXT`webT&CL0> z+O>f9Yh`Sff%iO@#|0TU#pHTGe*kPm1S+(tW^z zfZ}-ENNj&PW7Gj_wp7)e*@`H26^|1N%}PWyM;?Xe=1_C&70YdDj&;mTne+=996)}a zAA-9A;GRLX)yWluN!2vXl`B^qnmPKY%d1)-Zp0bU5d}3;KYZxxw;}%HWrzx4ql*5EMP)wGlkL?6o-KT9%U9=Bf!7^c@{K+ zP;+_?M@SSi;5>QkhyPzze(W*FE(X8D?mL3uRK$q-50d5`>r5Z#1_Au z7LERgWm@XTao{L+gI$hmjGVa*{(+|(heQ)B^ly1x|o#UeVk$z~!$Mhb~pJas}X-jLXi( zTDMVLT(r{U9IRW_a&ts0vgDdH)B%@@fMY1#q4*{RY&Be}7ZI^#E#2J$U;H-@aL1&m z;!**4j)Y1UN&lPD|40_sW2IDCu=@6*I87-iJ?}4GK}+Dt_E7-x7H_@99W<(=WQW7v z;!RyTA41(4_T)uY|F!(rb@*gT~*>ETlSpqyN?)TNtzix1ztp1`H7F<&Hu2V56hl@_UIgFU&uB=oNxyqT&hI?R{#qX@JIl<@1^e+pT>)egS@b~_QyBh)E?6wfJETN zNKsMPTB1kry7VZ(m`&A1$wB968Ks6%NXq=Zl`IJ=Ut&jpV@6;+uQMa_wQfKDdWG+LQ-$QB!u>$fo8|*lv{d0g zFduJQ9KVZmbNBrh!Mj1Q*IVBD9`NT)(2sEgWXSwUU3YVhKy^bohVK z9`uH`g}*hsI8gR|;}`8$yRn#$WxMV6-Zy5w+W1oV<_Z>-?0&!^I1mIoeEhZF?gxRF zWs3=3n(2eV%kGDO;O_+hYT04u#fSfQonD}*T{W=aecs#Y18?kN2Y_Vy)r=70+`v|? z*P@F)F7@+J@Uruwpa0pg7j*F^0KQ8I@NeJPIn-4L2AMkn(DkMjZ5Xy2%xTNjCyO~- z{67BLZ_(cF?*);a7ZdS6PvwFlc5+nP`2S=5T^FzqjQFi1aMwzon1MTW`n$RwFa|{P z-Iu1K;r5MX3vj#B{}!0PY}s25c;n(PQRdQeFXrO)1>a=_n3FyJK5M(b55$)(+rIPt zfWiDX-!Bo_5>q{Guy6FUab@qQeCd>;^W084Yo4_n{gJ zOES%FePdt*fzb!qyDwX|pj6P$rErI3yDnzs_1OOw!C~2A4G&$6d$DATDgE0NEZg(d zLt-gy?{&*h*=^}4E{t`9ez ze=QoOM{l|7XD7b+z$2GGa^9cr`f2aBJ?=l@?yrV-Z9D13-%U1MaqsWW{^)NHJochX z?XMps?ES%AzqI2oKXJ;rJMz~Hr=O7={qA2(wDJS?^*;BN?_OHG{l0tdym9p*Ph7cte(8QE&NVoF`pVC|wEFHF zU%u$-KO8vxP42*BZoKo@<|&`~?494c>b74$^r?r>S-v6v@|J7PncjZPE6pq3Q(Sw< z0oYpk#(PfYE;wZTo0Yqs`|#CgUxokkvXhPDk6(Y#vyUAEeRKVe$85aekH?%VUi$N2 zUv${ySoiKdZ#iUr%YEzDHvD1r)z1>g{AKOe{_yywJ+`gTYU16iwjD7Tz3kmD-*n*h zFaG+5k8YN?Xh&Xg<7n%r_jxgQr@8hQ=UjO1A9lIyhF`l+l`h{hf9hMOzj*6a`>na~ zTiM4CKI_cu*Z%0%Q~zn@)?5B~t$xe)+RwK?(*Dq|um1j%TaUb5``GbY?9r`jUcOlA z+_GxN?b~Me@AvlYnZ348Ha)-Pe)rU;e)i=bJ-z<3+fS^$e9^&AZ?{i;;m?oXaOwvC z(L03SU%AifuiUk&vufM=yM6<*UisiRGT*rRsC)L`>!iIdIkR{DEeEcBF!RE5x8nbF z?~0>8^}+jZKK;s1Z+hn=8}XliVV_$b*kxt#;S=t->)&=gPyFug8!tWSBOm+#jWA%ow z>t}4g+BxgxH5YFF$+O#0^Vx?Ud3O5?yWa8hHR$yZ#PHhl zvWIPW_fwB-dFZ9J==STLJo^0YpMG%F^ka`4^yII<_3Ur|^xNAf2S0MxNB0~2JX!bH zkFR=8{LDq)d9u3h>1Qr^*A<+4`zP+6zGD7J-vMO(;Aro@2cNq(f5Xdv6t+FT_MVd- z|L#NL)a-e+W^4raazw`aOFM908Z~T1a_m*FA!zpWCxO3H2%Wr?gKJw*H z-M8j9&wXyXEjjT-WS?{1_k$x&J>T>9zv=W3KC|`G>wo?I2SCO%+a8H--Lib^$t#}t z%L)5`iKXv@#It_?(-)8U;OPf_X!L*~S)aY@)=j%Uv)fgln60?wijQ)aZMYwPXw4xv z?e{ibeE9jy`S%>S^4c2?Iq{@>{3qFed2zq%u6X&T=MUJPlkUIK3f`Y4cYoxbzr1+h z3HQ$4efFC9DcaXxVAqL%{&?^a@^5=_**_fpeDLvuUf%Er{OO0_`)7`J#8S%hcEV3qe&DOueZ<=J@;`6f!$0WxOP^f* zPvpAK9rU9oezMC&m!-W&jyK<9u084UC+}2Otoh_oyI=5$1Bmmsd}mGc1^FIU{peZx zCB~;uXYRl9*xzLD_Wx~{jkm79?~F~iedoeW@CDBtv~hCgF~##%t-I#MTQ|R)uKuun zXYM^GoPPd6*&I>)+?`K;VB3c6wJoT#{&y$8u-rN~ylvUP9{%_NA9!)yHstP`Hf=3E z@!lV-xavJ?^e^wqKl+=>-p*f*J;{)x1G4_VUND;%JcVKg`T*L;tzk{=!AD3@yWN}cj(!_{a$jiaJ6v5 zH(ogWqg(&lI6uDW1^d}U&i?eOx48EoRoz9yU$J2XP>c^dVI3j=h zQ-Au<6QB9$_K)0t1028asK@lX@7edUuRgN!h&|Ule)6X4j=TT5Izn)g2f zUwzk)O%ks?jy(I-z4k&sbNlLD*4&<~nSbH-pRKyYe(J&pdIukP)s^E*e!6nYdT7&k z4>A$kW@u_|%3YTi?0=TVG_(`ONz_>&Z@Qwyyja|FFjn*|`3wk6!-#3HM$3 z=z+Jt^wg$LufK1PMJHd}f^B{Jvp@LMM|b@G;m00J9CY*55B`MQ{{2RN>n&fo;_i=c zN*+FK$2--BzIA)D`K7Y-%AO~z-u;sKUmsod$cyjUd+^G^8+_xz%(H!Kulz4wKJuZT z9em2Iw?49bvh|j;e}CQ?-?-zN2VbT(pOd}VeBe`?&z`@CR$5<$uDObM?3(P;>$a(x zuWs6M@8KU>FHIgmM{YiFeQoWD zmrq)a3!YehSbyza)``CW&F=H?Zj&eW-(%Zfp4jK=d(Cs$$N#Va%RTki%Z@*F^P{J= zcieaDP0ydjG}@cayQ=@nP2UTDcECkj4LAo zy&*XGnh$QuKYNIL)ho$k$mj3A>Bs-)*~`BBh62*Ja5?zAAf(m`%%hS zUz$E~#zVindF|z2%t;sQ|9$_6>XDz@a1;8yclHe{f*+fzD2Q|77xM=lmOf zb-?#7edxx$y4!zr-zBR*^w^F+enfil=?@+Av~tFmpWZ@m*!0~`KXt*UE^kb>MawVy z;g?T3{q$4U{`}=#w+x@U;A=0gS%2cA;e)^V!F~@saYEWdc>f)@-Ap{X`M4vtZ4NdnXKbn; za>2%Do;m5B)7Jdr^EcIgw(6hEgWkXYm(Tgglb=nV-&pt||DBD`T(Vt0WZTWZ|0Ma+ z#*Ihqn>4mT^y=%bKkVV*Q~TWZo~vJ6x6=u$-}U6_4}I?TkDvAVHP^nf_PW{rJASF_ z-TZ|E_r7HnW}dg@&_i~7+@1a4cbD&)@o)S58h`ut3*Yry|9dwVuHACyXC7RBF3NrQ zD>pxU@hwkY^2*(}u47Cnub)Nt9k!J;$U3{m!{l@y%Z{B#ga%}C6!;bjmn&Dk}{DX%tKmWSbS8o6FpH4sD z{Mf@=_FDd(4{p1Vd}#gJAD#H*OCNhWv(K7mmS6tLlUt5@dHEyzFUEAxPcr0pHeUX_ zb?-PUbM3lEx1ar~RnPDAc35*yxVQIVjo@Qu6A`q~}$ zul?PApI4L{A1^y_Pq@cfB)O(pK|q8 zpFZ!XFWmOK1Nnd7u*=QZnZ&I}FJJwEyUxFUXX^p<9apT_a@sZYTlZMEIr!I-zK?b0 zmQT7P`qZoLU6Hx_ko7CJSXb<$pZlv-zdh@s12>;?^5M;u+c*E@oNxZ0Yft;*X}>(_ zd&=f3*rzXerSVYajD2r=9rA9x?Bm3TPWbEKPyF)3j(GbTO8dr%^ab?quKexoox;`| zv8}h=WUP^1+;qmO&pmPVr#DwN-0;mypRhl2-nUQQyk@ldtnlGyul?;lx3Bxu0^_cl zUa?;OrL^IskADBb#85_A4yx93H{7_3nw4T|MMYh z&b%)9(aCoox(D&JZdZPJrf6TeEI#j?_)FJ)>Y^v;y}t&%_k;_x-`aoe4)4G9=#4Lb z@$~o8_urr${F(QL>C?Ll!9mPjXJ3C)@df3C&zqP0WWygn`DOKlQ_kGi-SgUgKfmVP z+wOP~REgGGw@!{(&%m3m1wi(U6AljSdoQwXS|@D%`MRBs`31TMx&8B_C*J)>{nY)o z3(En?E#LmD+?6Xf|Kx>Lky`MVE*oKy+J+Yh_6tA$;vB5pb)6G#{>oQx z|Cx2oH3e;M(6_$u*C5fB);{*KPaS#jOqZ zyz9~LBkb|VzWc~OJ$Qt6pDrGJ?1925>ks=oX0+V{LGK}?i*N-2v4p2>#hEE)~y{u?dL`BMSnQw_3H7eY4_Qt`>vbu zE9lDXPn_8{J*V?@YY=&*f%!js#?@cI{wt`j&jRVj0vQcRecBn0MK=t1m_IM6(O;jh ze^xcv%bU+K?XGRXts_%=4k;+Sdj0wF-~^Yi^@|5aXM`}y-*y})yw`CHbX`2PQP)vD_+By0OEvTKBFLx0)t*8gZw z`0cZ2<=rX&AH6wW@6Go@^5K$=ll>>iywWH<_t9&U`s|yJ?wn1ZqNvimsPyvv_&MLE z+I^k#e{y8PrR7H~XR}U|S-}W&$GwG(xA*>9_S?Sj+x`D{)6T#0@j92XeeY4rtu From 07c142b97598a46c6c5cbb34d2b30116091da9f3 Mon Sep 17 00:00:00 2001 From: AMZN-Phil Date: Mon, 15 Nov 2021 08:51:00 -0800 Subject: [PATCH 015/345] Remove temporary changes and remove key before building Signed-off-by: AMZN-Phil --- .../Source/ProjectBuilderController.cpp | 32 ++++++++---- .../Source/ProjectManagerSettings.cpp | 49 +++++++++++++++++++ .../Source/ProjectManagerSettings.h | 16 ++++++ .../ProjectManager/Source/ProjectsScreen.cpp | 17 ++++--- .../Source/UpdateProjectCtrl.cpp | 20 ++++++++ .../project_manager_files.cmake | 2 + 6 files changed, 121 insertions(+), 15 deletions(-) create mode 100644 Code/Tools/ProjectManager/Source/ProjectManagerSettings.cpp create mode 100644 Code/Tools/ProjectManager/Source/ProjectManagerSettings.h diff --git a/Code/Tools/ProjectManager/Source/ProjectBuilderController.cpp b/Code/Tools/ProjectManager/Source/ProjectBuilderController.cpp index e892336a6f..3cc131e0c0 100644 --- a/Code/Tools/ProjectManager/Source/ProjectBuilderController.cpp +++ b/Code/Tools/ProjectManager/Source/ProjectBuilderController.cpp @@ -9,14 +9,16 @@ #include #include #include +#include -#include +#include #include #include #include + namespace O3DE::ProjectManager { ProjectBuilderController::ProjectBuilderController(const ProjectInfo& projectInfo, ProjectButton* projectButton, QWidget* parent) @@ -29,6 +31,15 @@ namespace O3DE::ProjectManager m_worker = new ProjectBuilderWorker(m_projectInfo); m_worker->moveToThread(&m_workerThread); + auto settingsRegistry = AZ::SettingsRegistry::Get(); + if (settingsRegistry) + { + // Remove key here in case Project Manager crashing while building that causes HandleResults to not be called + QString settingsKey = QString("%1/Projects/%2/BuiltSuccesfully").arg(ProjectManagerKeyPrefix).arg(m_projectInfo.m_projectName); + settingsRegistry->Remove(settingsKey.toStdString().c_str()); + SaveProjectManagerSettings(); + } + connect(&m_workerThread, &QThread::finished, m_worker, &ProjectBuilderWorker::deleteLater); connect(&m_workerThread, &QThread::started, m_worker, &ProjectBuilderWorker::BuildProject); connect(m_worker, &ProjectBuilderWorker::Done, this, &ProjectBuilderController::HandleResults); @@ -82,9 +93,7 @@ namespace O3DE::ProjectManager void ProjectBuilderController::HandleResults(const QString& result) { - AZ::IO::LocalFileIO fileIO; - AZStd::string successBuildFilePath = AZStd::string::format("%s/%s", - m_projectInfo.m_path.toStdString().c_str(), "ProjectManagerBuildSuccess"); + QString settingsKey = QString("%1/Projects/%2/BuiltSuccesfully").arg(ProjectManagerKeyPrefix).arg(m_projectInfo.m_projectName); if (!result.isEmpty()) { @@ -115,7 +124,12 @@ namespace O3DE::ProjectManager emit NotifyBuildProject(m_projectInfo); } - fileIO.Remove(successBuildFilePath.c_str()); + auto settingsRegistry = AZ::SettingsRegistry::Get(); + if (settingsRegistry) + { + settingsRegistry->Remove(settingsKey.toStdString().c_str()); + SaveProjectManagerSettings(); + } emit Done(false); return; @@ -124,11 +138,11 @@ namespace O3DE::ProjectManager { m_projectInfo.m_buildFailed = false; - AZ::IO::HandleType fileHandle; - if (fileIO.Open(successBuildFilePath.c_str(), AZ::IO::OpenMode::ModeWrite | AZ::IO::OpenMode::ModeText, fileHandle)) + auto settingsRegistry = AZ::SettingsRegistry::Get(); + if (settingsRegistry) { - // We just need the file to exist - fileIO.Close(fileHandle); + settingsRegistry->Set(settingsKey.toStdString().c_str(), true); + SaveProjectManagerSettings(); } } diff --git a/Code/Tools/ProjectManager/Source/ProjectManagerSettings.cpp b/Code/Tools/ProjectManager/Source/ProjectManagerSettings.cpp new file mode 100644 index 0000000000..e775affaf6 --- /dev/null +++ b/Code/Tools/ProjectManager/Source/ProjectManagerSettings.cpp @@ -0,0 +1,49 @@ +/* + * 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 "ProjectManagerSettings.h" + +#include +#include +#include + +namespace O3DE::ProjectManager +{ + void SaveProjectManagerSettings() + { + auto settingsRegistry = AZ::SettingsRegistry::Get(); + AZ::SettingsRegistryMergeUtils::DumperSettings dumperSettings; + dumperSettings.m_prettifyOutput = true; + dumperSettings.m_jsonPointerPrefix = ProjectManagerKeyPrefix; + + AZStd::string stringBuffer; + AZ::IO::ByteContainerStream stringStream(&stringBuffer); + if (!AZ::SettingsRegistryMergeUtils::DumpSettingsRegistryToStream( + *settingsRegistry, ProjectManagerKeyPrefix, stringStream, dumperSettings)) + { + AZ_Warning("ProjectManager", false, "Could not save Project Manager settings to stream"); + return; + } + + AZ::IO::FixedMaxPath o3deUserPath = AZ::Utils::GetO3deManifestDirectory(); + o3deUserPath /= AZ::SettingsRegistryInterface::RegistryFolder; + o3deUserPath /= "ProjectManager.setreg"; + + bool saved = false; + constexpr auto configurationMode = + AZ::IO::SystemFile::SF_OPEN_CREATE | AZ::IO::SystemFile::SF_OPEN_CREATE_PATH | AZ::IO::SystemFile::SF_OPEN_WRITE_ONLY; + + AZ::IO::SystemFile outputFile; + if (outputFile.Open(o3deUserPath.c_str(), configurationMode)) + { + saved = outputFile.Write(stringBuffer.data(), stringBuffer.size()) == stringBuffer.size(); + } + + AZ_Warning("ProjectManager", saved, "Unable to save Project Manager registry file to path: %s", o3deUserPath.c_str()); + } +} diff --git a/Code/Tools/ProjectManager/Source/ProjectManagerSettings.h b/Code/Tools/ProjectManager/Source/ProjectManagerSettings.h new file mode 100644 index 0000000000..8488e4c5db --- /dev/null +++ b/Code/Tools/ProjectManager/Source/ProjectManagerSettings.h @@ -0,0 +1,16 @@ +/* + * 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 O3DE::ProjectManager +{ + static constexpr char ProjectManagerKeyPrefix[] = "/O3DE/ProjectManager"; + + void SaveProjectManagerSettings(); +} diff --git a/Code/Tools/ProjectManager/Source/ProjectsScreen.cpp b/Code/Tools/ProjectManager/Source/ProjectsScreen.cpp index 11ff7e0a10..1e305a3586 100644 --- a/Code/Tools/ProjectManager/Source/ProjectsScreen.cpp +++ b/Code/Tools/ProjectManager/Source/ProjectsScreen.cpp @@ -14,6 +14,7 @@ #include #include #include +#include #include #include @@ -22,7 +23,7 @@ #include #include #include -#include +#include #include #include @@ -290,11 +291,15 @@ namespace O3DE::ProjectManager // Check whether project manager has successfully built the project if (currentButton) { - AZStd::string successfulBuildFilePath = AZStd::string::format("%s/%s", - project.m_path.toStdString().c_str(), "ProjectManagerBuildSuccess"); - - AZ::IO::LocalFileIO fileIO; - if (!fileIO.Exists(successfulBuildFilePath.c_str())) + auto settingsRegistry = AZ::SettingsRegistry::Get(); + bool projectBuiltSuccessfully = false; + if (settingsRegistry) + { + QString settingsKey = + QString("%1/Projects/%2/BuiltSuccesfully").arg(ProjectManagerKeyPrefix).arg(project.m_projectName); + settingsRegistry->Get(projectBuiltSuccessfully, settingsKey.toStdString().c_str()); + } + if (!projectBuiltSuccessfully) { currentButton->ShowBuildRequired(); } diff --git a/Code/Tools/ProjectManager/Source/UpdateProjectCtrl.cpp b/Code/Tools/ProjectManager/Source/UpdateProjectCtrl.cpp index fb16484961..85e8e2af0d 100644 --- a/Code/Tools/ProjectManager/Source/UpdateProjectCtrl.cpp +++ b/Code/Tools/ProjectManager/Source/UpdateProjectCtrl.cpp @@ -15,6 +15,9 @@ #include #include #include +#include + +#include #include #include @@ -280,6 +283,23 @@ namespace O3DE::ProjectManager } } + if (newProjectSettings.m_projectName != m_projectInfo.m_projectName) + { + // update reg key + QString oldSettingsKey = + QString("%1/Projects/%2/BuiltSuccesfully").arg(ProjectManagerKeyPrefix).arg(m_projectInfo.m_projectName); + QString newSettingsKey = + QString("%1/Projects/%2/BuiltSuccesfully").arg(ProjectManagerKeyPrefix).arg(newProjectSettings.m_projectName); + + auto settingsRegistry = AZ::SettingsRegistry::Get(); + bool projectBuiltSuccessfully = false; + if (settingsRegistry && settingsRegistry->Get(projectBuiltSuccessfully, oldSettingsKey.toStdString().c_str())) + { + settingsRegistry->Set(newSettingsKey.toStdString().c_str(), projectBuiltSuccessfully); + SaveProjectManagerSettings(); + } + } + if (!newProjectSettings.m_newPreviewImagePath.isEmpty()) { if (!ProjectUtils::ReplaceProjectFile( diff --git a/Code/Tools/ProjectManager/project_manager_files.cmake b/Code/Tools/ProjectManager/project_manager_files.cmake index e2e35717f6..1a6be36eb3 100644 --- a/Code/Tools/ProjectManager/project_manager_files.cmake +++ b/Code/Tools/ProjectManager/project_manager_files.cmake @@ -58,6 +58,8 @@ set(FILES Source/CreateProjectCtrl.cpp Source/UpdateProjectCtrl.h Source/UpdateProjectCtrl.cpp + Source/ProjectManagerSettings.h + Source/ProjectManagerSettings.cpp Source/ProjectsScreen.h Source/ProjectsScreen.cpp Source/ProjectSettingsScreen.h From e62af4260b035184d48144f08e1379a8ceb6ca5f Mon Sep 17 00:00:00 2001 From: nggieber Date: Mon, 15 Nov 2021 10:20:04 -0800 Subject: [PATCH 016/345] Moves Cart to Right Panel with Gem Inspector Signed-off-by: nggieber --- .../GemCatalog/GemCatalogHeaderWidget.cpp | 5 +++ .../GemCatalog/GemCatalogHeaderWidget.h | 4 +++ .../Source/GemCatalog/GemCatalogScreen.cpp | 32 +++++++++++++++++-- .../Source/GemCatalog/GemCatalogScreen.h | 11 ++++++- 4 files changed, 49 insertions(+), 3 deletions(-) diff --git a/Code/Tools/ProjectManager/Source/GemCatalog/GemCatalogHeaderWidget.cpp b/Code/Tools/ProjectManager/Source/GemCatalog/GemCatalogHeaderWidget.cpp index e676ba73d3..e91b46cc65 100644 --- a/Code/Tools/ProjectManager/Source/GemCatalog/GemCatalogHeaderWidget.cpp +++ b/Code/Tools/ProjectManager/Source/GemCatalog/GemCatalogHeaderWidget.cpp @@ -423,6 +423,8 @@ namespace O3DE::ProjectManager }); m_cartOverlay->show(); + emit OverlayUpdate(m_cartOverlay); + /* const QPoint parentPos = m_dropDownButton->mapToParent(m_dropDownButton->pos()); const QPoint globalPos = m_dropDownButton->mapToGlobal(m_dropDownButton->pos()); const QPoint offset(-4, 10); @@ -430,6 +432,7 @@ namespace O3DE::ProjectManager globalPos.y() + offset.y(), m_cartOverlay->width(), m_cartOverlay->height()); + */ } CartButton::~CartButton() @@ -514,6 +517,8 @@ namespace O3DE::ProjectManager connect(m_downloadController, &DownloadController::GemDownloadAdded, this, &GemCatalogHeaderWidget::GemDownloadAdded); connect(m_downloadController, &DownloadController::GemDownloadRemoved, this, &GemCatalogHeaderWidget::GemDownloadRemoved); + + connect(m_cartButton, &CartButton::OverlayUpdate, this, [this](QWidget* cartOverlay) { emit OverlayUpdate(cartOverlay); }); } void GemCatalogHeaderWidget::GemDownloadAdded(const QString& /*gemName*/) diff --git a/Code/Tools/ProjectManager/Source/GemCatalog/GemCatalogHeaderWidget.h b/Code/Tools/ProjectManager/Source/GemCatalog/GemCatalogHeaderWidget.h index 5174fde57d..072bf27b73 100644 --- a/Code/Tools/ProjectManager/Source/GemCatalog/GemCatalogHeaderWidget.h +++ b/Code/Tools/ProjectManager/Source/GemCatalog/GemCatalogHeaderWidget.h @@ -70,6 +70,9 @@ namespace O3DE::ProjectManager ~CartButton(); void ShowOverlay(); + signals: + void OverlayUpdate(QWidget* cartOverlay); + private: void mousePressEvent(QMouseEvent* event) override; void hideEvent(QHideEvent*) override; @@ -104,6 +107,7 @@ namespace O3DE::ProjectManager void AddGem(); void OpenGemsRepo(); void RefreshGems(); + void OverlayUpdate(QWidget* cartOverlay); private: AzQtComponents::SearchLineEdit* m_filterLineEdit = nullptr; diff --git a/Code/Tools/ProjectManager/Source/GemCatalog/GemCatalogScreen.cpp b/Code/Tools/ProjectManager/Source/GemCatalog/GemCatalogScreen.cpp index 6abbfe16ba..e303e1148e 100644 --- a/Code/Tools/ProjectManager/Source/GemCatalog/GemCatalogScreen.cpp +++ b/Code/Tools/ProjectManager/Source/GemCatalog/GemCatalogScreen.cpp @@ -60,14 +60,26 @@ namespace O3DE::ProjectManager hLayout->setMargin(0); vLayout->addLayout(hLayout); + m_rightPanelStack = new QStackedWidget(this); + m_rightPanelStack->setFixedWidth(240); + + connect(m_headerWidget, &GemCatalogHeaderWidget::OverlayUpdate, this, &GemCatalogScreen::UpdateAndShowGemCart); + m_gemListView = new GemListView(m_proxyModel, m_proxyModel->GetSelectionModel(), this); m_gemInspector = new GemInspector(m_gemModel, this); - m_gemInspector->setFixedWidth(240); connect(m_gemInspector, &GemInspector::TagClicked, [=](const Tag& tag) { SelectGem(tag.id); }); connect(m_gemInspector, &GemInspector::UpdateGem, this, &GemCatalogScreen::UpdateGem); connect(m_gemInspector, &GemInspector::UninstallGem, this, &GemCatalogScreen::UninstallGem); + // Show the inspector if gem selection changes + connect( + m_gemModel->GetSelectionModel(), &QItemSelectionModel::selectionChanged, this, + [this] + { + m_rightPanelStack->setCurrentIndex(RightPanelWidgetOrder::Inspector); + }); + QWidget* filterWidget = new QWidget(this); filterWidget->setFixedWidth(240); m_filterWidgetLayout = new QVBoxLayout(); @@ -85,7 +97,9 @@ namespace O3DE::ProjectManager hLayout->addWidget(filterWidget); hLayout->addLayout(middleVLayout); - hLayout->addWidget(m_gemInspector); + + hLayout->addWidget(m_rightPanelStack); + m_rightPanelStack->addWidget(m_gemInspector); m_notificationsView = AZStd::make_unique(this, AZ_CRC("GemCatalogNotificationsView")); m_notificationsView->SetOffset(QPoint(10, 70)); @@ -302,6 +316,8 @@ namespace O3DE::ProjectManager QModelIndex proxyIndex = m_proxyModel->mapFromSource(modelIndex); m_proxyModel->GetSelectionModel()->select(proxyIndex, QItemSelectionModel::ClearAndSelect); m_gemListView->scrollTo(proxyIndex); + + m_rightPanelStack->setCurrentIndex(RightPanelWidgetOrder::Inspector); } void GemCatalogScreen::UpdateGem(const QModelIndex& modelIndex) @@ -559,6 +575,18 @@ namespace O3DE::ProjectManager emit ChangeScreenRequest(ProjectManagerScreen::GemRepos); } + void GemCatalogScreen::UpdateAndShowGemCart(QWidget* cartWidget) + { + QWidget* previousCart = m_rightPanelStack->widget(RightPanelWidgetOrder::Cart); + if (previousCart) + { + m_rightPanelStack->removeWidget(previousCart); + } + + m_rightPanelStack->insertWidget(RightPanelWidgetOrder::Cart, cartWidget); + m_rightPanelStack->setCurrentIndex(RightPanelWidgetOrder::Cart); + } + void GemCatalogScreen::OnGemDownloadResult(const QString& gemName, bool succeeded) { if (succeeded) diff --git a/Code/Tools/ProjectManager/Source/GemCatalog/GemCatalogScreen.h b/Code/Tools/ProjectManager/Source/GemCatalog/GemCatalogScreen.h index c5fbb057ef..0b48ee45bd 100644 --- a/Code/Tools/ProjectManager/Source/GemCatalog/GemCatalogScreen.h +++ b/Code/Tools/ProjectManager/Source/GemCatalog/GemCatalogScreen.h @@ -18,8 +18,10 @@ #include #include #include + #include #include +#include #endif namespace O3DE::ProjectManager @@ -62,14 +64,21 @@ namespace O3DE::ProjectManager private slots: void HandleOpenGemRepo(); - + void UpdateAndShowGemCart(QWidget* cartWidget); private: + enum RightPanelWidgetOrder + { + Inspector = 0, + Cart + }; + void FillModel(const QString& projectPath); AZStd::unique_ptr m_notificationsView; GemListView* m_gemListView = nullptr; + QStackedWidget* m_rightPanelStack = nullptr; GemInspector* m_gemInspector = nullptr; GemModel* m_gemModel = nullptr; GemCatalogHeaderWidget* m_headerWidget = nullptr; From 18cf128854dab40e2af78b6848b132908f6bc3f2 Mon Sep 17 00:00:00 2001 From: AMZN-Phil Date: Mon, 15 Nov 2021 11:50:28 -0800 Subject: [PATCH 017/345] Remove some code duplication Signed-off-by: AMZN-Phil --- .../ProjectManager/Source/ProjectBuilderController.cpp | 6 ++---- Code/Tools/ProjectManager/Source/ProjectManagerSettings.cpp | 5 +++++ Code/Tools/ProjectManager/Source/ProjectManagerSettings.h | 5 +++++ Code/Tools/ProjectManager/Source/ProjectsScreen.cpp | 3 +-- Code/Tools/ProjectManager/Source/UpdateProjectCtrl.cpp | 6 ++---- 5 files changed, 15 insertions(+), 10 deletions(-) diff --git a/Code/Tools/ProjectManager/Source/ProjectBuilderController.cpp b/Code/Tools/ProjectManager/Source/ProjectBuilderController.cpp index 3cc131e0c0..ecb125ae4e 100644 --- a/Code/Tools/ProjectManager/Source/ProjectBuilderController.cpp +++ b/Code/Tools/ProjectManager/Source/ProjectBuilderController.cpp @@ -17,8 +17,6 @@ #include #include - - namespace O3DE::ProjectManager { ProjectBuilderController::ProjectBuilderController(const ProjectInfo& projectInfo, ProjectButton* projectButton, QWidget* parent) @@ -35,7 +33,7 @@ namespace O3DE::ProjectManager if (settingsRegistry) { // Remove key here in case Project Manager crashing while building that causes HandleResults to not be called - QString settingsKey = QString("%1/Projects/%2/BuiltSuccesfully").arg(ProjectManagerKeyPrefix).arg(m_projectInfo.m_projectName); + QString settingsKey = GetProjectBuiltSuccessfullyKey(m_projectInfo.m_projectName); settingsRegistry->Remove(settingsKey.toStdString().c_str()); SaveProjectManagerSettings(); } @@ -93,7 +91,7 @@ namespace O3DE::ProjectManager void ProjectBuilderController::HandleResults(const QString& result) { - QString settingsKey = QString("%1/Projects/%2/BuiltSuccesfully").arg(ProjectManagerKeyPrefix).arg(m_projectInfo.m_projectName); + QString settingsKey = GetProjectBuiltSuccessfullyKey(m_projectInfo.m_projectName); if (!result.isEmpty()) { diff --git a/Code/Tools/ProjectManager/Source/ProjectManagerSettings.cpp b/Code/Tools/ProjectManager/Source/ProjectManagerSettings.cpp index e775affaf6..3049a6d70c 100644 --- a/Code/Tools/ProjectManager/Source/ProjectManagerSettings.cpp +++ b/Code/Tools/ProjectManager/Source/ProjectManagerSettings.cpp @@ -46,4 +46,9 @@ namespace O3DE::ProjectManager AZ_Warning("ProjectManager", saved, "Unable to save Project Manager registry file to path: %s", o3deUserPath.c_str()); } + + QString GetProjectBuiltSuccessfullyKey(const QString& projectName) + { + return QString("%1/Projects/%2/BuiltSuccessfully").arg(ProjectManagerKeyPrefix).arg(projectName); + } } diff --git a/Code/Tools/ProjectManager/Source/ProjectManagerSettings.h b/Code/Tools/ProjectManager/Source/ProjectManagerSettings.h index 8488e4c5db..3454909062 100644 --- a/Code/Tools/ProjectManager/Source/ProjectManagerSettings.h +++ b/Code/Tools/ProjectManager/Source/ProjectManagerSettings.h @@ -8,9 +8,14 @@ #pragma once +#if !defined(Q_MOC_RUN) +#include +#endif + namespace O3DE::ProjectManager { static constexpr char ProjectManagerKeyPrefix[] = "/O3DE/ProjectManager"; void SaveProjectManagerSettings(); + QString GetProjectBuiltSuccessfullyKey(const QString& projectName); } diff --git a/Code/Tools/ProjectManager/Source/ProjectsScreen.cpp b/Code/Tools/ProjectManager/Source/ProjectsScreen.cpp index 1e305a3586..7f962bee88 100644 --- a/Code/Tools/ProjectManager/Source/ProjectsScreen.cpp +++ b/Code/Tools/ProjectManager/Source/ProjectsScreen.cpp @@ -295,8 +295,7 @@ namespace O3DE::ProjectManager bool projectBuiltSuccessfully = false; if (settingsRegistry) { - QString settingsKey = - QString("%1/Projects/%2/BuiltSuccesfully").arg(ProjectManagerKeyPrefix).arg(project.m_projectName); + QString settingsKey = GetProjectBuiltSuccessfullyKey(project.m_projectName); settingsRegistry->Get(projectBuiltSuccessfully, settingsKey.toStdString().c_str()); } if (!projectBuiltSuccessfully) diff --git a/Code/Tools/ProjectManager/Source/UpdateProjectCtrl.cpp b/Code/Tools/ProjectManager/Source/UpdateProjectCtrl.cpp index 85e8e2af0d..6cb934560a 100644 --- a/Code/Tools/ProjectManager/Source/UpdateProjectCtrl.cpp +++ b/Code/Tools/ProjectManager/Source/UpdateProjectCtrl.cpp @@ -286,10 +286,8 @@ namespace O3DE::ProjectManager if (newProjectSettings.m_projectName != m_projectInfo.m_projectName) { // update reg key - QString oldSettingsKey = - QString("%1/Projects/%2/BuiltSuccesfully").arg(ProjectManagerKeyPrefix).arg(m_projectInfo.m_projectName); - QString newSettingsKey = - QString("%1/Projects/%2/BuiltSuccesfully").arg(ProjectManagerKeyPrefix).arg(newProjectSettings.m_projectName); + QString oldSettingsKey = GetProjectBuiltSuccessfullyKey(m_projectInfo.m_projectName); + QString newSettingsKey = GetProjectBuiltSuccessfullyKey(newProjectSettings.m_projectName); auto settingsRegistry = AZ::SettingsRegistry::Get(); bool projectBuiltSuccessfully = false; From 4d161f42dfe65d483c50ee16a3713186dd8c8cf8 Mon Sep 17 00:00:00 2001 From: Gene Walters Date: Mon, 15 Nov 2021 12:37:21 -0800 Subject: [PATCH 018/345] WiP. fwrites are being stopped by AZCoreLogSink; need a long term solution to work around this... Signed-off-by: Gene Walters --- Code/Framework/AzCore/AzCore/Debug/Trace.cpp | 7 +++++-- .../AzFramework/Process/ProcessCommunicator_Win.cpp | 2 ++ .../Source/Editor/MultiplayerEditorSystemComponent.cpp | 2 ++ 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/Code/Framework/AzCore/AzCore/Debug/Trace.cpp b/Code/Framework/AzCore/AzCore/Debug/Trace.cpp index b9e4003500..d393018a92 100644 --- a/Code/Framework/AzCore/AzCore/Debug/Trace.cpp +++ b/Code/Framework/AzCore/AzCore/Debug/Trace.cpp @@ -26,6 +26,7 @@ #include #include #include +#pragma optimize("", off) //< remember to place this after the #includes so that you only optimize the code you want namespace AZ::Debug { @@ -523,10 +524,10 @@ namespace AZ::Debug EBUS_EVENT(TraceMessageDrillerBus, OnOutput, window, message); TraceMessageResult result; EBUS_EVENT_RESULT(result, TraceMessageBus, OnOutput, window, message); - if (result.m_value) + /* if (result.m_value) { return; - } + }*/ } // printf on Windows platforms seem to have a buffer length limit of 4096 characters @@ -537,6 +538,7 @@ namespace AZ::Debug fwrite(windowView.data(), 1, windowView.size(), stdout); fwrite(windowMessageSeparator.data(), 1, windowMessageSeparator.size(), stdout); fwrite(messageView.data(), 1, messageView.size(), stdout); + fwrite("\n\r", 1, 2, stdout); } //========================================================================= @@ -612,3 +614,4 @@ namespace AZ::Debug } } } // namspace AZ::Debug +#pragma optimize("", on) diff --git a/Code/Framework/AzFramework/Platform/Windows/AzFramework/Process/ProcessCommunicator_Win.cpp b/Code/Framework/AzFramework/Platform/Windows/AzFramework/Process/ProcessCommunicator_Win.cpp index c4629ccf2c..9c7bbfac15 100644 --- a/Code/Framework/AzFramework/Platform/Windows/AzFramework/Process/ProcessCommunicator_Win.cpp +++ b/Code/Framework/AzFramework/Platform/Windows/AzFramework/Process/ProcessCommunicator_Win.cpp @@ -8,6 +8,7 @@ #include +#pragma optimize("", off) //< remember to place this after the #includes so that you only optimize the code you want namespace AzFramework { @@ -274,3 +275,4 @@ namespace AzFramework } } // namespace AzToolsFramework +#pragma optimize("", on) diff --git a/Gems/Multiplayer/Code/Source/Editor/MultiplayerEditorSystemComponent.cpp b/Gems/Multiplayer/Code/Source/Editor/MultiplayerEditorSystemComponent.cpp index 669393e31e..d75fbcbc70 100644 --- a/Gems/Multiplayer/Code/Source/Editor/MultiplayerEditorSystemComponent.cpp +++ b/Gems/Multiplayer/Code/Source/Editor/MultiplayerEditorSystemComponent.cpp @@ -420,6 +420,8 @@ namespace Multiplayer void MultiplayerEditorSystemComponent::OnTick(float, AZ::ScriptTimePoint) { + AZ_TracePrintf("MultiplayerEditorSystemComponent", "OnTick Pump"); + m_serverProcessTracePrinter->Pump(); } From e1ace4a8f63244f16a03b82a9ffd56586ec6e859 Mon Sep 17 00:00:00 2001 From: Gene Walters Date: Mon, 15 Nov 2021 12:37:52 -0800 Subject: [PATCH 019/345] WiP. fwrites are being stopped by AZCoreLogSink; need a long term solution to work around this... Signed-off-by: Gene Walters --- .../AzFramework/Process/ProcessCommunicatorTracePrinter.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Code/Framework/AzFramework/AzFramework/Process/ProcessCommunicatorTracePrinter.cpp b/Code/Framework/AzFramework/AzFramework/Process/ProcessCommunicatorTracePrinter.cpp index 8f3e45bec5..ab9f7c8103 100644 --- a/Code/Framework/AzFramework/AzFramework/Process/ProcessCommunicatorTracePrinter.cpp +++ b/Code/Framework/AzFramework/AzFramework/Process/ProcessCommunicatorTracePrinter.cpp @@ -8,6 +8,8 @@ #include "ProcessCommunicatorTracePrinter.h" +#pragma optimize("", off) //< remember to place this after the #includes so that you only optimize the code you want + ProcessCommunicatorTracePrinter::ProcessCommunicatorTracePrinter(AzFramework::ProcessCommunicator* communicator, const char* window) : m_communicator(communicator), m_window(window) @@ -84,3 +86,4 @@ void ProcessCommunicatorTracePrinter::WriteCurrentString(bool isFromStdErr) bufferToUse.clear(); } } +#pragma optimize("", on) From 7d849cc0d259ba33325fa041651910d4c68c0c74 Mon Sep 17 00:00:00 2001 From: santorac <55155825+santorac@users.noreply.github.com> Date: Mon, 15 Nov 2021 16:51:22 -0800 Subject: [PATCH 020/345] Changed the overall strategy for how to handle missing image references. Instead of replacing it with one of the placeholder assets, we replace it with an random UUID which will be interpreted as a missing asset (unless some discovers discovers a UUID collision). This eventually gets replaced by one of the placeholder textures at runtime. This approach gives more consistent results in how missing texture are handled between Material Editor and Material Component. I actually tried this approach before and it didn't seem to work the way we needed, but I realized that's because PropertyAssetCtrl wasn't handling missing assets properly. I fixed a few issues there including showing the error button when the asset can't be found, and fixing a broken reference to the error icon file. Signed-off-by: santorac <55155825+santorac@users.noreply.github.com> --- .../UI/PropertyEditor/PropertyAssetCtrl.cpp | 33 ++++++++++++++++--- .../UI/PropertyEditor/PropertyAssetCtrl.hxx | 4 ++- .../Material/MaterialTypeSourceData.h | 2 +- .../Material/MaterialTypeSourceData.cpp | 6 ++-- .../RPI.Edit/Material/MaterialUtils.cpp | 15 ++------- .../Code/Source/Document/MaterialDocument.cpp | 2 +- .../Material/EditorMaterialComponentUtil.cpp | 2 +- 7 files changed, 40 insertions(+), 24 deletions(-) diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyAssetCtrl.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyAssetCtrl.cpp index 24b2c7466e..384b384a23 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyAssetCtrl.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyAssetCtrl.cpp @@ -527,8 +527,8 @@ namespace AzToolsFramework m_errorButton = nullptr; } } - - void PropertyAssetCtrl::UpdateErrorButton(const AZStd::string& errorLog) + + void PropertyAssetCtrl::UpdateErrorButton() { if (m_errorButton) { @@ -543,12 +543,17 @@ namespace AzToolsFramework m_errorButton->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); m_errorButton->setFixedSize(QSize(16, 16)); m_errorButton->setMouseTracking(true); - m_errorButton->setIcon(QIcon("Icons/PropertyEditor/error_icon.png")); + m_errorButton->setIcon(QIcon(":/PropertyEditor/Resources/error_icon.png")); m_errorButton->setToolTip("Show Errors"); // Insert the error button after the asset label qobject_cast(layout())->insertWidget(1, m_errorButton); } + } + + void PropertyAssetCtrl::UpdateErrorButtonWithLog(const AZStd::string& errorLog) + { + UpdateErrorButton(); // Connect pressed to opening the error dialog // Must capture this for call to QObject::connect @@ -587,6 +592,21 @@ namespace AzToolsFramework logDialog->show(); }); } + + void PropertyAssetCtrl::UpdateErrorButtonWithMessage(const AZStd::string& message) + { + UpdateErrorButton(); + + connect(m_errorButton, &QPushButton::clicked, this, [this, message]() { + QMessageBox::critical(nullptr, "Error", message.c_str()); + + // Without this, the error button would maintain focus after clicking, which left the red error icon in a blue-highlighted state + if (parentWidget()) + { + parentWidget()->setFocus(); + } + }); + } void PropertyAssetCtrl::ClearAssetInternal() { @@ -960,7 +980,6 @@ namespace AzToolsFramework else { const AZ::Data::AssetId assetID = GetCurrentAssetID(); - m_currentAssetHint = ""; AZ::Outcome jobOutcome = AZ::Failure(); AssetSystemJobRequestBus::BroadcastResult(jobOutcome, &AssetSystemJobRequestBus::Events::GetAssetJobsInfoByAssetID, assetID, false, false); @@ -1018,7 +1037,7 @@ namespace AzToolsFramework // In case of failure, render failure icon case AssetSystem::JobStatus::Failed: { - UpdateErrorButton(errorLog); + UpdateErrorButtonWithLog(errorLog); } break; @@ -1043,6 +1062,10 @@ namespace AzToolsFramework m_currentAssetHint = assetPath; } } + else + { + UpdateErrorButtonWithMessage(AZStd::string::format("Asset is missing.\n\nID: %s\nHint:%s", assetID.ToString().c_str(), GetCurrentAssetHint().c_str())); + } } // Get the asset file name diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyAssetCtrl.hxx b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyAssetCtrl.hxx index 0b98278bc5..58ddbb967e 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyAssetCtrl.hxx +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyAssetCtrl.hxx @@ -168,7 +168,9 @@ namespace AzToolsFramework bool IsCorrectMimeData(const QMimeData* pData, AZ::Data::AssetId* pAssetId = nullptr, AZ::Data::AssetType* pAssetType = nullptr) const; void ClearErrorButton(); - void UpdateErrorButton(const AZStd::string& errorLog); + void UpdateErrorButton(); + void UpdateErrorButtonWithLog(const AZStd::string& errorLog); + void UpdateErrorButtonWithMessage(const AZStd::string& message); virtual const AZStd::string GetFolderSelection() const { return AZStd::string(); } virtual void SetFolderSelection(const AZStd::string& /* folderPath */) {} virtual void ClearAssetInternal(); diff --git a/Gems/Atom/RPI/Code/Include/Atom/RPI.Edit/Material/MaterialTypeSourceData.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Edit/Material/MaterialTypeSourceData.h index 1234b15f95..3dbedb7a4b 100644 --- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Edit/Material/MaterialTypeSourceData.h +++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Edit/Material/MaterialTypeSourceData.h @@ -211,7 +211,7 @@ namespace AZ //! Convert the property value into the format that will be stored in the source data //! This is primarily needed to support conversions of special types like enums and images - bool ConvertPropertyValueToSourceDataFormat(const PropertyDefinition& propertyDefinition, MaterialPropertyValue& propertyValue) const; + bool ConvertPropertyValueToSourceDataFormat(const AZ::Name& propertyId, const PropertyDefinition& propertyDefinition, MaterialPropertyValue& propertyValue) const; Outcome> CreateMaterialTypeAsset(Data::AssetId assetId, AZStd::string_view materialTypeSourceFilePath = "", bool elevateWarnings = true) const; diff --git a/Gems/Atom/RPI/Code/Source/RPI.Edit/Material/MaterialTypeSourceData.cpp b/Gems/Atom/RPI/Code/Source/RPI.Edit/Material/MaterialTypeSourceData.cpp index 61f3d5282a..8d439c99ab 100644 --- a/Gems/Atom/RPI/Code/Source/RPI.Edit/Material/MaterialTypeSourceData.cpp +++ b/Gems/Atom/RPI/Code/Source/RPI.Edit/Material/MaterialTypeSourceData.cpp @@ -300,14 +300,14 @@ namespace AZ } } - bool MaterialTypeSourceData::ConvertPropertyValueToSourceDataFormat(const PropertyDefinition& propertyDefinition, MaterialPropertyValue& propertyValue) const + bool MaterialTypeSourceData::ConvertPropertyValueToSourceDataFormat([[maybe_unused]] const AZ::Name& propertyId, const PropertyDefinition& propertyDefinition, MaterialPropertyValue& propertyValue) const { if (propertyDefinition.m_dataType == AZ::RPI::MaterialPropertyDataType::Enum && propertyValue.Is()) { const uint32_t index = propertyValue.GetValue(); if (index >= propertyDefinition.m_enumValues.size()) { - AZ_Error("Material source data", false, "Invalid value for material enum property: '%s'.", propertyDefinition.m_name.c_str()); + AZ_Error("Material source data", false, "Invalid value for material enum property: '%s'.", propertyId.GetCStr()); return false; } @@ -330,7 +330,7 @@ namespace AZ imageAsset.GetId(), imageAsset.GetType(), platformName, imageAssetInfo, rootFilePath); if (!result) { - AZ_Error("Material source data", false, "Image asset could not be found for property: '%s'.", propertyDefinition.m_name.c_str()); + AZ_Error("Material source data", false, "Image asset could not be found for property: '%s'.", propertyId.GetCStr()); return false; } } diff --git a/Gems/Atom/RPI/Code/Source/RPI.Edit/Material/MaterialUtils.cpp b/Gems/Atom/RPI/Code/Source/RPI.Edit/Material/MaterialUtils.cpp index 4bb4d75d40..fbc06e7294 100644 --- a/Gems/Atom/RPI/Code/Source/RPI.Edit/Material/MaterialUtils.cpp +++ b/Gems/Atom/RPI/Code/Source/RPI.Edit/Material/MaterialUtils.cpp @@ -43,18 +43,9 @@ namespace AZ if (!imageAssetId.IsSuccess()) { - constexpr static char ErrorMissingTexture[] = "textures/defaults/missing.png"; - imageAssetId = AssetUtils::MakeAssetId(ErrorMissingTexture, StreamingImageAsset::GetImageAssetSubId()); - - if (imageAssetId.IsSuccess()) - { - imageAsset = Data::Asset{imageAssetId.GetValue(), azrtti_typeid(), imageFilePath}; - return GetImageAssetResult::Missing; - } - else - { - return GetImageAssetResult::MissingNoFallback; - } + static const Uuid InvalidAssetPlaceholderId = "{BADA55E7-1A1D-4940-B655-9D08679BD62F}"; + imageAsset = Data::Asset{InvalidAssetPlaceholderId, azrtti_typeid(), imageFilePath}; + return GetImageAssetResult::Missing; } imageAsset = Data::Asset{imageAssetId.GetValue(), azrtti_typeid(), imageFilePath}; diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Source/Document/MaterialDocument.cpp b/Gems/Atom/Tools/MaterialEditor/Code/Source/Document/MaterialDocument.cpp index ea3d1fa319..5e1fbac282 100644 --- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Document/MaterialDocument.cpp +++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Document/MaterialDocument.cpp @@ -640,7 +640,7 @@ namespace MaterialEditor MaterialPropertyValue propertyValue = AtomToolsFramework::ConvertToRuntimeType(it->second.GetValue()); if (propertyValue.IsValid()) { - if (!m_materialTypeSourceData.ConvertPropertyValueToSourceDataFormat(propertyDefinition, propertyValue)) + if (!m_materialTypeSourceData.ConvertPropertyValueToSourceDataFormat(propertyId.GetFullName(), propertyDefinition, propertyValue)) { AZ_Error("MaterialDocument", false, "Material document property could not be converted: '%s' in '%s'.", propertyId.GetFullName().GetCStr(), m_absolutePath.c_str()); result = false; diff --git a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/EditorMaterialComponentUtil.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/EditorMaterialComponentUtil.cpp index d15db886d6..8620ec34f4 100644 --- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/EditorMaterialComponentUtil.cpp +++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/EditorMaterialComponentUtil.cpp @@ -156,7 +156,7 @@ namespace AZ propertyValue = AZ::RPI::MaterialPropertyValue::FromAny(propertyOverrideItr->second); } - if (!editData.m_materialTypeSourceData.ConvertPropertyValueToSourceDataFormat(propertyDefinition, propertyValue)) + if (!editData.m_materialTypeSourceData.ConvertPropertyValueToSourceDataFormat(propertyId.GetFullName(), propertyDefinition, propertyValue)) { AZ_Error("AZ::Render::EditorMaterialComponentUtil", false, "Failed to export: %s", path.c_str()); result = false; From 7f575480239b4b21409c10ecf023b072a68365f2 Mon Sep 17 00:00:00 2001 From: nggieber Date: Mon, 15 Nov 2021 20:00:20 -0800 Subject: [PATCH 021/345] Adds triangle under cart button when cart is shown Signed-off-by: nggieber --- .../GemCatalog/GemCatalogHeaderWidget.cpp | 135 ++++++++++++------ .../GemCatalog/GemCatalogHeaderWidget.h | 25 ++-- .../Source/GemCatalog/GemCatalogScreen.cpp | 23 ++- .../Source/GemCatalog/GemCatalogScreen.h | 1 + 4 files changed, 117 insertions(+), 67 deletions(-) diff --git a/Code/Tools/ProjectManager/Source/GemCatalog/GemCatalogHeaderWidget.cpp b/Code/Tools/ProjectManager/Source/GemCatalog/GemCatalogHeaderWidget.cpp index e91b46cc65..d6f4da0051 100644 --- a/Code/Tools/ProjectManager/Source/GemCatalog/GemCatalogHeaderWidget.cpp +++ b/Code/Tools/ProjectManager/Source/GemCatalog/GemCatalogHeaderWidget.cpp @@ -7,25 +7,32 @@ */ #include +#include + #include + #include #include #include #include #include -#include #include #include #include +#include +#include namespace O3DE::ProjectManager { - CartOverlayWidget::CartOverlayWidget(GemModel* gemModel, DownloadController* downloadController, QWidget* parent) - : QWidget(parent) + GemCartWidget::GemCartWidget(GemModel* gemModel, DownloadController* downloadController, QWidget* parent) + : QScrollArea(parent) , m_gemModel(gemModel) , m_downloadController(downloadController) { setObjectName("GemCatalogCart"); + setWidgetResizable(true); + setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff); + setVerticalScrollBarPolicy(Qt::ScrollBarAsNeeded); m_layout = new QVBoxLayout(); m_layout->setSpacing(0); @@ -118,17 +125,15 @@ namespace O3DE::ProjectManager } return dependencies; }); - - setWindowFlags(Qt::FramelessWindowHint | Qt::Dialog); } - CartOverlayWidget::~CartOverlayWidget() + GemCartWidget::~GemCartWidget() { // disconnect from all download controller signals disconnect(m_downloadController, nullptr, this, nullptr); } - void CartOverlayWidget::CreateGemSection(const QString& singularTitle, const QString& pluralTitle, GetTagIndicesCallback getTagIndices) + void GemCartWidget::CreateGemSection(const QString& singularTitle, const QString& pluralTitle, GetTagIndicesCallback getTagIndices) { QWidget* widget = new QWidget(); widget->setFixedWidth(s_width); @@ -164,12 +169,12 @@ namespace O3DE::ProjectManager update(); } - void CartOverlayWidget::OnCancelDownloadActivated(const QString& gemName) + void GemCartWidget::OnCancelDownloadActivated(const QString& gemName) { m_downloadController->CancelGemDownload(gemName); } - void CartOverlayWidget::CreateDownloadSection() + void GemCartWidget::CreateDownloadSection() { m_downloadSectionWidget = new QWidget(); m_downloadSectionWidget->setFixedWidth(s_width); @@ -223,12 +228,12 @@ namespace O3DE::ProjectManager } // connect to download controller data changed - connect(m_downloadController, &DownloadController::GemDownloadAdded, this, &CartOverlayWidget::GemDownloadAdded); - connect(m_downloadController, &DownloadController::GemDownloadRemoved, this, &CartOverlayWidget::GemDownloadRemoved); - connect(m_downloadController, &DownloadController::GemDownloadProgress, this, &CartOverlayWidget::GemDownloadProgress); + connect(m_downloadController, &DownloadController::GemDownloadAdded, this, &GemCartWidget::GemDownloadAdded); + connect(m_downloadController, &DownloadController::GemDownloadRemoved, this, &GemCartWidget::GemDownloadRemoved); + connect(m_downloadController, &DownloadController::GemDownloadProgress, this, &GemCartWidget::GemDownloadProgress); } - void CartOverlayWidget::GemDownloadAdded(const QString& gemName) + void GemCartWidget::GemDownloadAdded(const QString& gemName) { // Containing widget for the current download item QWidget* newGemDownloadWidget = new QWidget(); @@ -246,7 +251,7 @@ namespace O3DE::ProjectManager nameProgressLayout->addStretch(); QLabel* cancelText = new QLabel(tr("Cancel").arg(gemName), newGemDownloadWidget); cancelText->setTextInteractionFlags(Qt::LinksAccessibleByMouse); - connect(cancelText, &QLabel::linkActivated, this, &CartOverlayWidget::OnCancelDownloadActivated); + connect(cancelText, &QLabel::linkActivated, this, &GemCartWidget::OnCancelDownloadActivated); nameProgressLayout->addWidget(cancelText); downloadingGemLayout->addLayout(nameProgressLayout); @@ -267,7 +272,7 @@ namespace O3DE::ProjectManager m_downloadingListWidget->show(); } - void CartOverlayWidget::GemDownloadRemoved(const QString& gemName) + void GemCartWidget::GemDownloadRemoved(const QString& gemName) { QWidget* gemToRemove = m_downloadingListWidget->findChild(gemName); if (gemToRemove) @@ -289,7 +294,7 @@ namespace O3DE::ProjectManager } } - void CartOverlayWidget::GemDownloadProgress(const QString& gemName, int bytesDownloaded, int totalBytes) + void GemCartWidget::GemDownloadProgress(const QString& gemName, int bytesDownloaded, int totalBytes) { QWidget* gemToUpdate = m_downloadingListWidget->findChild(gemName); if (gemToUpdate) @@ -324,7 +329,7 @@ namespace O3DE::ProjectManager } } - QVector CartOverlayWidget::GetTagsFromModelIndices(const QVector& gems) const + QVector GemCartWidget::GetTagsFromModelIndices(const QVector& gems) const { QVector tags; tags.reserve(gems.size()); @@ -349,7 +354,7 @@ namespace O3DE::ProjectManager iconButton->setFocusPolicy(Qt::NoFocus); iconButton->setIcon(QIcon(":/Summary.svg")); iconButton->setFixedSize(s_iconSize, s_iconSize); - connect(iconButton, &QPushButton::clicked, this, &CartButton::ShowOverlay); + connect(iconButton, &QPushButton::clicked, this, &CartButton::ShowGemCart); m_layout->addWidget(iconButton); m_countLabel = new QLabel(); @@ -362,7 +367,7 @@ namespace O3DE::ProjectManager m_dropDownButton->setFocusPolicy(Qt::NoFocus); m_dropDownButton->setIcon(QIcon(":/CarrotArrowDown.svg")); m_dropDownButton->setFixedSize(s_arrowDownIconSize, s_arrowDownIconSize); - connect(m_dropDownButton, &QPushButton::clicked, this, &CartButton::ShowOverlay); + connect(m_dropDownButton, &QPushButton::clicked, this, &CartButton::ShowGemCart); m_layout->addWidget(m_dropDownButton); // Adjust the label text whenever the model gets updated. @@ -377,28 +382,28 @@ namespace O3DE::ProjectManager m_dropDownButton->setVisible(!toBeAdded.isEmpty() || !toBeRemoved.isEmpty()); // Automatically close the overlay window in case there are no gems to be activated or deactivated anymore. - if (m_cartOverlay && toBeAdded.isEmpty() && toBeRemoved.isEmpty()) + if (m_gemCart && toBeAdded.isEmpty() && toBeRemoved.isEmpty()) { - m_cartOverlay->deleteLater(); - m_cartOverlay = nullptr; + m_gemCart->deleteLater(); + m_gemCart = nullptr; } }); } void CartButton::mousePressEvent([[maybe_unused]] QMouseEvent* event) { - ShowOverlay(); + ShowGemCart(); } void CartButton::hideEvent(QHideEvent*) { - if (m_cartOverlay) + if (m_gemCart) { - m_cartOverlay->hide(); + m_gemCart->hide(); } } - void CartButton::ShowOverlay() + void CartButton::ShowGemCart() { const QVector toBeAdded = m_gemModel->GatherGemsToBeAdded(/*includeDependencies=*/true); const QVector toBeRemoved = m_gemModel->GatherGemsToBeRemoved(/*includeDependencies=*/true); @@ -407,40 +412,33 @@ namespace O3DE::ProjectManager return; } - if (m_cartOverlay) + if (m_gemCart) { // Directly delete the former overlay before creating the new one. // Don't use deleteLater() here. This might overwrite the new overlay pointer // depending on the event queue. - delete m_cartOverlay; + delete m_gemCart; } - m_cartOverlay = new CartOverlayWidget(m_gemModel, m_downloadController, this); - connect(m_cartOverlay, &QWidget::destroyed, this, [=] + m_gemCart = new GemCartWidget(m_gemModel, m_downloadController, this); + connect(m_gemCart, &QWidget::destroyed, this, [=] { // Reset the overlay pointer on destruction to prevent dangling pointers. - m_cartOverlay = nullptr; + m_gemCart = nullptr; + // Tell header gem cart is no longer open + UpdateGemCart(nullptr); }); - m_cartOverlay->show(); + m_gemCart->show(); - emit OverlayUpdate(m_cartOverlay); - /* - const QPoint parentPos = m_dropDownButton->mapToParent(m_dropDownButton->pos()); - const QPoint globalPos = m_dropDownButton->mapToGlobal(m_dropDownButton->pos()); - const QPoint offset(-4, 10); - m_cartOverlay->setGeometry(globalPos.x() - parentPos.x() - m_cartOverlay->width() + width() + offset.x(), - globalPos.y() + offset.y(), - m_cartOverlay->width(), - m_cartOverlay->height()); - */ + emit UpdateGemCart(m_gemCart); } CartButton::~CartButton() { // Make sure the overlay window is automatically closed in case the gem catalog is destroyed. - if (m_cartOverlay) + if (m_gemCart) { - m_cartOverlay->deleteLater(); + m_gemCart->deleteLater(); } } @@ -518,7 +516,16 @@ namespace O3DE::ProjectManager connect(m_downloadController, &DownloadController::GemDownloadAdded, this, &GemCatalogHeaderWidget::GemDownloadAdded); connect(m_downloadController, &DownloadController::GemDownloadRemoved, this, &GemCatalogHeaderWidget::GemDownloadRemoved); - connect(m_cartButton, &CartButton::OverlayUpdate, this, [this](QWidget* cartOverlay) { emit OverlayUpdate(cartOverlay); }); + connect( + m_cartButton, &CartButton::UpdateGemCart, this, + [this](QWidget* gemCart) + { + GemCartShown(gemCart); + if (gemCart) + { + emit UpdateGemCart(gemCart); + } + }); } void GemCatalogHeaderWidget::GemDownloadAdded(const QString& /*gemName*/) @@ -526,7 +533,7 @@ namespace O3DE::ProjectManager m_downloadSpinner->show(); m_downloadLabel->show(); m_downloadSpinnerMovie->start(); - m_cartButton->ShowOverlay(); + m_cartButton->ShowGemCart(); } void GemCatalogHeaderWidget::GemDownloadRemoved(const QString& /*gemName*/) @@ -539,8 +546,44 @@ namespace O3DE::ProjectManager } } + void GemCatalogHeaderWidget::GemCartShown(bool state) + { + m_showGemCart = state; + repaint(); + } + void GemCatalogHeaderWidget::ReinitForProject() { m_filterLineEdit->setText({}); } + + void GemCatalogHeaderWidget::paintEvent([[maybe_unused]] QPaintEvent* event) + { + // Only show triangle when cart is shown + if (!m_showGemCart) + { + return; + } + + const QPoint buttonPos = m_cartButton->pos(); + const QSize buttonSize = m_cartButton->size(); + + // Draw isosceles triangle with top point touching bottom of cartButton + // Bottom aligned with header bottom and top of right panel + const QPoint topPoint(buttonPos.x() + buttonSize.width() / 2, buttonPos.y() + buttonSize.height()); + const QPoint bottomLeftPoint(topPoint.x() - 20, height()); + const QPoint bottomRightPoint(topPoint.x() + 20, height()); + + QPainterPath trianglePath; + trianglePath.moveTo(topPoint); + trianglePath.lineTo(bottomLeftPoint); + trianglePath.lineTo(bottomRightPoint); + trianglePath.lineTo(topPoint); + + QPainter painter(this); + painter.setRenderHint(QPainter::Antialiasing, true); + painter.setPen(Qt::NoPen); + painter.fillPath(trianglePath, QBrush(QColor("#555555"))); + } + } // namespace O3DE::ProjectManager diff --git a/Code/Tools/ProjectManager/Source/GemCatalog/GemCatalogHeaderWidget.h b/Code/Tools/ProjectManager/Source/GemCatalog/GemCatalogHeaderWidget.h index 072bf27b73..b749e9831d 100644 --- a/Code/Tools/ProjectManager/Source/GemCatalog/GemCatalogHeaderWidget.h +++ b/Code/Tools/ProjectManager/Source/GemCatalog/GemCatalogHeaderWidget.h @@ -14,8 +14,10 @@ #include #include #include -#include #include + +#include +#include #endif QT_FORWARD_DECLARE_CLASS(QPushButton) @@ -28,14 +30,14 @@ QT_FORWARD_DECLARE_CLASS(QMovie) namespace O3DE::ProjectManager { - class CartOverlayWidget - : public QWidget + class GemCartWidget + : public QScrollArea { Q_OBJECT // AUTOMOC public: - CartOverlayWidget(GemModel* gemModel, DownloadController* downloadController, QWidget* parent = nullptr); - ~CartOverlayWidget(); + GemCartWidget(GemModel* gemModel, DownloadController* downloadController, QWidget* parent = nullptr); + ~GemCartWidget(); public slots: void GemDownloadAdded(const QString& gemName); @@ -68,10 +70,10 @@ namespace O3DE::ProjectManager public: CartButton(GemModel* gemModel, DownloadController* downloadController, QWidget* parent = nullptr); ~CartButton(); - void ShowOverlay(); + void ShowGemCart(); signals: - void OverlayUpdate(QWidget* cartOverlay); + void UpdateGemCart(QWidget* gemCart); private: void mousePressEvent(QMouseEvent* event) override; @@ -81,7 +83,7 @@ namespace O3DE::ProjectManager QHBoxLayout* m_layout = nullptr; QLabel* m_countLabel = nullptr; QPushButton* m_dropDownButton = nullptr; - CartOverlayWidget* m_cartOverlay = nullptr; + GemCartWidget* m_gemCart = nullptr; DownloadController* m_downloadController = nullptr; inline constexpr static int s_iconSize = 24; @@ -102,12 +104,16 @@ namespace O3DE::ProjectManager public slots: void GemDownloadAdded(const QString& gemName); void GemDownloadRemoved(const QString& gemName); + void GemCartShown(bool state = false); signals: void AddGem(); void OpenGemsRepo(); void RefreshGems(); - void OverlayUpdate(QWidget* cartOverlay); + void UpdateGemCart(QWidget* gemCart); + + protected slots: + void paintEvent(QPaintEvent* event) override; private: AzQtComponents::SearchLineEdit* m_filterLineEdit = nullptr; @@ -117,5 +123,6 @@ namespace O3DE::ProjectManager QLabel* m_downloadLabel = nullptr; QMovie* m_downloadSpinnerMovie = nullptr; CartButton* m_cartButton = nullptr; + bool m_showGemCart = false; }; } // namespace O3DE::ProjectManager diff --git a/Code/Tools/ProjectManager/Source/GemCatalog/GemCatalogScreen.cpp b/Code/Tools/ProjectManager/Source/GemCatalog/GemCatalogScreen.cpp index 14b428a726..d610154c24 100644 --- a/Code/Tools/ProjectManager/Source/GemCatalog/GemCatalogScreen.cpp +++ b/Code/Tools/ProjectManager/Source/GemCatalog/GemCatalogScreen.cpp @@ -51,35 +51,28 @@ namespace O3DE::ProjectManager vLayout->addWidget(m_headerWidget); connect(m_gemModel, &GemModel::gemStatusChanged, this, &GemCatalogScreen::OnGemStatusChanged); + connect(m_gemModel->GetSelectionModel(), &QItemSelectionModel::selectionChanged, this, [this]{ ShowInspector(); }); connect(m_headerWidget, &GemCatalogHeaderWidget::RefreshGems, this, &GemCatalogScreen::Refresh); connect(m_headerWidget, &GemCatalogHeaderWidget::OpenGemsRepo, this, &GemCatalogScreen::HandleOpenGemRepo); connect(m_headerWidget, &GemCatalogHeaderWidget::AddGem, this, &GemCatalogScreen::OnAddGemClicked); + connect(m_headerWidget, &GemCatalogHeaderWidget::UpdateGemCart, this, &GemCatalogScreen::UpdateAndShowGemCart); connect(m_downloadController, &DownloadController::Done, this, &GemCatalogScreen::OnGemDownloadResult); QHBoxLayout* hLayout = new QHBoxLayout(); hLayout->setMargin(0); vLayout->addLayout(hLayout); + m_gemListView = new GemListView(m_proxyModel, m_proxyModel->GetSelectionModel(), this); + m_rightPanelStack = new QStackedWidget(this); m_rightPanelStack->setFixedWidth(240); - connect(m_headerWidget, &GemCatalogHeaderWidget::OverlayUpdate, this, &GemCatalogScreen::UpdateAndShowGemCart); - - m_gemListView = new GemListView(m_proxyModel, m_proxyModel->GetSelectionModel(), this); m_gemInspector = new GemInspector(m_gemModel, this); connect(m_gemInspector, &GemInspector::TagClicked, [=](const Tag& tag) { SelectGem(tag.id); }); connect(m_gemInspector, &GemInspector::UpdateGem, this, &GemCatalogScreen::UpdateGem); connect(m_gemInspector, &GemInspector::UninstallGem, this, &GemCatalogScreen::UninstallGem); - // Show the inspector if gem selection changes - connect( - m_gemModel->GetSelectionModel(), &QItemSelectionModel::selectionChanged, this, - [this] - { - m_rightPanelStack->setCurrentIndex(RightPanelWidgetOrder::Inspector); - }); - QWidget* filterWidget = new QWidget(this); filterWidget->setFixedWidth(240); m_filterWidgetLayout = new QVBoxLayout(); @@ -318,7 +311,7 @@ namespace O3DE::ProjectManager m_proxyModel->GetSelectionModel()->setCurrentIndex(proxyIndex, QItemSelectionModel::ClearAndSelect); m_gemListView->scrollTo(proxyIndex); - m_rightPanelStack->setCurrentIndex(RightPanelWidgetOrder::Inspector); + ShowInspector(); } void GemCatalogScreen::UpdateGem(const QModelIndex& modelIndex) @@ -507,6 +500,12 @@ namespace O3DE::ProjectManager } } + void GemCatalogScreen::ShowInspector() + { + m_rightPanelStack->setCurrentIndex(RightPanelWidgetOrder::Inspector); + m_headerWidget->GemCartShown(); + } + GemCatalogScreen::EnableDisableGemsResult GemCatalogScreen::EnableDisableGemsForProject(const QString& projectPath) { IPythonBindings* pythonBindings = PythonBindingsInterface::Get(); diff --git a/Code/Tools/ProjectManager/Source/GemCatalog/GemCatalogScreen.h b/Code/Tools/ProjectManager/Source/GemCatalog/GemCatalogScreen.h index 0b48ee45bd..92cf0bd5f2 100644 --- a/Code/Tools/ProjectManager/Source/GemCatalog/GemCatalogScreen.h +++ b/Code/Tools/ProjectManager/Source/GemCatalog/GemCatalogScreen.h @@ -65,6 +65,7 @@ namespace O3DE::ProjectManager private slots: void HandleOpenGemRepo(); void UpdateAndShowGemCart(QWidget* cartWidget); + void ShowInspector(); private: enum RightPanelWidgetOrder From aa85963a2b3284930cbe79380d16182f27ebaa2d Mon Sep 17 00:00:00 2001 From: santorac <55155825+santorac@users.noreply.github.com> Date: Mon, 15 Nov 2021 23:21:21 -0800 Subject: [PATCH 022/345] Fixed MaterialPropertyValue::FromAny to preserve the Hint string when converting Asset objects. This fixed an issue where the hint didn't show up in the Material Component's instance inspector. Signed-off-by: santorac <55155825+santorac@users.noreply.github.com> --- .../Source/RPI.Reflect/Material/MaterialPropertyValue.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Gems/Atom/RPI/Code/Source/RPI.Reflect/Material/MaterialPropertyValue.cpp b/Gems/Atom/RPI/Code/Source/RPI.Reflect/Material/MaterialPropertyValue.cpp index d1017139fc..b74305613e 100644 --- a/Gems/Atom/RPI/Code/Source/RPI.Reflect/Material/MaterialPropertyValue.cpp +++ b/Gems/Atom/RPI/Code/Source/RPI.Reflect/Material/MaterialPropertyValue.cpp @@ -118,12 +118,16 @@ namespace AZ else if (value.is>()) { result.m_value = Data::Asset( - AZStd::any_cast>(value).GetId(), azrtti_typeid()); + AZStd::any_cast>(value).GetId(), + azrtti_typeid(), + AZStd::any_cast>(value).GetHint()); } else if (value.is>()) { result.m_value = Data::Asset( - AZStd::any_cast>(value).GetId(), azrtti_typeid()); + AZStd::any_cast>(value).GetId(), + azrtti_typeid(), + AZStd::any_cast>(value).GetHint()); } else if (value.is>()) { From 26576208463fd3b0bebb9d36d57740042a6a98ae Mon Sep 17 00:00:00 2001 From: santorac <55155825+santorac@users.noreply.github.com> Date: Mon, 15 Nov 2021 23:56:10 -0800 Subject: [PATCH 023/345] Minor code cleanup. Signed-off-by: santorac <55155825+santorac@users.noreply.github.com> --- .../RPI/Code/Include/Atom/RPI.Edit/Material/MaterialUtils.h | 3 +-- .../Atom/RPI/Code/Source/RPI.Edit/Material/MaterialUtils.cpp | 5 +++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Gems/Atom/RPI/Code/Include/Atom/RPI.Edit/Material/MaterialUtils.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Edit/Material/MaterialUtils.h index f39b8e7aaa..c1183c7aa1 100644 --- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Edit/Material/MaterialUtils.h +++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Edit/Material/MaterialUtils.h @@ -32,8 +32,7 @@ namespace AZ { Empty, //! No image was actually requested, the path was empty Found, //! The requested asset was found - Missing, //! The requested asset was not found, and a placeholder asset was used instead - MissingNoFallback //! The requested asset was not found, and a placeholder asset was not found either + Missing //! The requested asset was not found, and a placeholder asset was used instead }; //! Finds an ImageAsset referenced by a material file (or a placeholder) diff --git a/Gems/Atom/RPI/Code/Source/RPI.Edit/Material/MaterialUtils.cpp b/Gems/Atom/RPI/Code/Source/RPI.Edit/Material/MaterialUtils.cpp index fbc06e7294..2b51be736e 100644 --- a/Gems/Atom/RPI/Code/Source/RPI.Edit/Material/MaterialUtils.cpp +++ b/Gems/Atom/RPI/Code/Source/RPI.Edit/Material/MaterialUtils.cpp @@ -43,6 +43,11 @@ namespace AZ if (!imageAssetId.IsSuccess()) { + // When the AssetId cannot be found, we don't want to outright fail, because the runtime has mechanisms for displaying fallback textures which gives the + // user a better recovery workflow. On the other hand we can't just provide an empty/invalid Asset because that would be interpreted as simply + // no value was present and result in using no texture, and this would amount to a silent failure. + // So we use a randomly generated (well except for the "BADA55E7" bit ;) UUID which the runtime and tools will interpret as a missing asset and represent + // it as such. static const Uuid InvalidAssetPlaceholderId = "{BADA55E7-1A1D-4940-B655-9D08679BD62F}"; imageAsset = Data::Asset{InvalidAssetPlaceholderId, azrtti_typeid(), imageFilePath}; return GetImageAssetResult::Missing; From a789d7b762665d4528907e2fdf8edbb3987631a4 Mon Sep 17 00:00:00 2001 From: santorac <55155825+santorac@users.noreply.github.com> Date: Tue, 16 Nov 2021 00:00:10 -0800 Subject: [PATCH 024/345] Minor code cleanup. Signed-off-by: santorac <55155825+santorac@users.noreply.github.com> --- .../RPI/Code/Source/RPI.Edit/Material/MaterialSourceData.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gems/Atom/RPI/Code/Source/RPI.Edit/Material/MaterialSourceData.cpp b/Gems/Atom/RPI/Code/Source/RPI.Edit/Material/MaterialSourceData.cpp index b2c449a05d..d886a523cb 100644 --- a/Gems/Atom/RPI/Code/Source/RPI.Edit/Material/MaterialSourceData.cpp +++ b/Gems/Atom/RPI/Code/Source/RPI.Edit/Material/MaterialSourceData.cpp @@ -322,7 +322,7 @@ namespace AZ MaterialUtils::GetImageAssetResult result = MaterialUtils::GetImageAssetReference( imageAsset, materialSourceFilePath, property.second.m_value.GetValue()); - if (result == MaterialUtils::GetImageAssetResult::Missing || result == MaterialUtils::GetImageAssetResult::MissingNoFallback) + if (result == MaterialUtils::GetImageAssetResult::Missing) { materialAssetCreator.ReportWarning( "Material property '%s': Could not find the image '%s'", propertyId.GetFullName().GetCStr(), From 224e0bd20f8bf328e4ff3deac026eb7a7c4b88b6 Mon Sep 17 00:00:00 2001 From: santorac <55155825+santorac@users.noreply.github.com> Date: Tue, 16 Nov 2021 00:02:20 -0800 Subject: [PATCH 025/345] Removed the 'data-warnings' concept for checking before saving a material document. It's no longer necessary since we no longer replace the original data with placeholders. Signed-off-by: santorac <55155825+santorac@users.noreply.github.com> --- .../Document/AtomToolsDocumentRequestBus.h | 3 -- .../AtomToolsDocumentSystemComponent.cpp | 18 ----------- .../Code/Source/Document/MaterialDocument.cpp | 31 ------------------- .../Code/Source/Document/MaterialDocument.h | 1 - 4 files changed, 53 deletions(-) diff --git a/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Document/AtomToolsDocumentRequestBus.h b/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Document/AtomToolsDocumentRequestBus.h index b385f21a5e..6a21a8a2df 100644 --- a/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Document/AtomToolsDocumentRequestBus.h +++ b/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Document/AtomToolsDocumentRequestBus.h @@ -73,9 +73,6 @@ namespace AtomToolsFramework //! Can the document be saved virtual bool IsSavable() const = 0; - //! Get a list of warnings about the data that would be good to know before saving - virtual AZStd::vector GetDataWarnings() const { return {}; } - //! Returns true if there are reversible modifications to the document virtual bool CanUndo() const = 0; diff --git a/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Document/AtomToolsDocumentSystemComponent.cpp b/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Document/AtomToolsDocumentSystemComponent.cpp index 416babcbde..3a392c1413 100644 --- a/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Document/AtomToolsDocumentSystemComponent.cpp +++ b/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Document/AtomToolsDocumentSystemComponent.cpp @@ -365,24 +365,6 @@ namespace AtomToolsFramework return false; } - AZStd::vector dataWarnings; - AtomToolsDocumentRequestBus::EventResult(dataWarnings, documentId, &AtomToolsDocumentRequestBus::Events::GetDataWarnings); - if (!dataWarnings.empty()) - { - AZStd::string allWarnings; - AzFramework::StringFunc::Join(allWarnings, dataWarnings.begin(), dataWarnings.end(), "\n"); - - auto result = QMessageBox::warning( - QApplication::activeWindow(), QString("Data Warnings"), - QString("Are you sure you want to save with the following data warnings? \n\n%1").arg(allWarnings.c_str()), - QMessageBox::StandardButton::Yes, QMessageBox::StandardButton::No); - - if (result == QMessageBox::StandardButton::No) - { - return false; - } - } - AtomToolsFramework::TraceRecorder traceRecorder(m_maxMessageBoxLineCount); bool result = false; diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Source/Document/MaterialDocument.cpp b/Gems/Atom/Tools/MaterialEditor/Code/Source/Document/MaterialDocument.cpp index 5e1fbac282..0174871502 100644 --- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Document/MaterialDocument.cpp +++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Document/MaterialDocument.cpp @@ -468,37 +468,6 @@ namespace MaterialEditor { return AzFramework::StringFunc::Path::IsExtension(m_absolutePath.c_str(), AZ::RPI::MaterialSourceData::Extension); } - - AZStd::vector MaterialDocument::GetDataWarnings() const - { - AZStd::vector warnings; - - for (auto& [propertyName, dynamicProperty] : m_properties) - { - AZ::RPI::MaterialPropertyValue propertyValue = AtomToolsFramework::ConvertToRuntimeType(dynamicProperty.GetValue()); - if (propertyValue.Is>()) - { - auto isSameAsset = [&propertyValue](const char* path) - { - AZ::Data::AssetId assetId = propertyValue.GetValue>().GetId(); - AZ::Data::AssetId otherAssetId; - AZ::Data::AssetCatalogRequestBus::BroadcastResult(otherAssetId, &AZ::Data::AssetCatalogRequestBus::Events::GetAssetIdByPath, path, AZ::Data::AssetType{}, false); - return assetId == otherAssetId; - }; - - if (isSameAsset(AZ::RPI::DefaultImageAssetPaths::DefaultFallback) || - isSameAsset(AZ::RPI::DefaultImageAssetPaths::Missing) || - isSameAsset(AZ::RPI::DefaultImageAssetPaths::Processing) || - isSameAsset(AZ::RPI::DefaultImageAssetPaths::ProcessingFailed) - ) - { - warnings.push_back(AZStd::string::format("%s is using a placeholder image asset.", propertyName.GetCStr())); - } - } - } - - return warnings; - } bool MaterialDocument::CanUndo() const { diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Source/Document/MaterialDocument.h b/Gems/Atom/Tools/MaterialEditor/Code/Source/Document/MaterialDocument.h index d9f9dded0a..452111f99a 100644 --- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Document/MaterialDocument.h +++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Document/MaterialDocument.h @@ -55,7 +55,6 @@ namespace MaterialEditor bool IsOpen() const override; bool IsModified() const override; bool IsSavable() const override; - AZStd::vector GetDataWarnings() const override; bool CanUndo() const override; bool CanRedo() const override; bool Undo() override; From 23d752e07d1ead3168261d4b21b1c10058cf1178 Mon Sep 17 00:00:00 2001 From: greerdv Date: Tue, 16 Nov 2021 12:50:11 +0000 Subject: [PATCH 026/345] add option to clamp ragdoll joint masses to avoid bad mass ratios Signed-off-by: greerdv --- .../PhysXCharacters/API/CharacterUtils.cpp | 49 +++++++ .../PhysXCharacters/API/CharacterUtils.h | 12 ++ .../Components/RagdollComponent.cpp | 125 +++++++++++++----- .../Components/RagdollComponent.h | 5 + Gems/PhysX/Code/Tests/RagdollTests.cpp | 15 +++ 5 files changed, 174 insertions(+), 32 deletions(-) diff --git a/Gems/PhysX/Code/Source/PhysXCharacters/API/CharacterUtils.cpp b/Gems/PhysX/Code/Source/PhysXCharacters/API/CharacterUtils.cpp index 4ed2825cc2..05de1055b2 100644 --- a/Gems/PhysX/Code/Source/PhysXCharacters/API/CharacterUtils.cpp +++ b/Gems/PhysX/Code/Source/PhysXCharacters/API/CharacterUtils.cpp @@ -344,6 +344,55 @@ namespace PhysX bool isAcceleration = true; return physx::PxD6JointDrive(stiffness, damping, forceLimit, isAcceleration); } + + AZStd::vector ComputeHierarchyDepths(const AZStd::vector& parentIndices) + { + const size_t numNodes = parentIndices.size(); + AZStd::vector nodeDepths(numNodes); + for (size_t nodeIndex = 0; nodeIndex < numNodes; nodeIndex++) + { + nodeDepths[nodeIndex] = { -1, nodeIndex }; + } + + for (size_t nodeIndex = 0; nodeIndex < numNodes; nodeIndex++) + { + if (nodeDepths[nodeIndex].m_depth != -1) + { + continue; + } + int depth = -1; // initial depth value for this node + int ancestorDepth = 0; // the depth of the first ancestor we find when iteratively visiting parents + bool ancestorFound = false; // whether we have found either an ancestor which already has a depth value, or the root + size_t currentIndex = nodeIndex; + while (!ancestorFound) + { + depth++; + if (depth > numNodes) + { + AZ_Assert(false, "Loop detected in ragdoll configuration."); + return nodeDepths; + } + size_t parentIndex = parentIndices[currentIndex]; + + if (parentIndex >= numNodes || nodeDepths[currentIndex].m_depth != -1) + { + ancestorFound = true; + ancestorDepth = (nodeDepths[currentIndex].m_depth != -1) ? nodeDepths[currentIndex].m_depth : 0; + } + + currentIndex = parentIndex; + } + + currentIndex = nodeIndex; + for (int i = depth; i >= 0 && currentIndex < numNodes; i--) + { + nodeDepths[currentIndex] = { ancestorDepth + i, currentIndex }; + currentIndex = parentIndices[currentIndex]; + } + } + + return nodeDepths; + } } // namespace Characters } // namespace Utils } // namespace PhysX diff --git a/Gems/PhysX/Code/Source/PhysXCharacters/API/CharacterUtils.h b/Gems/PhysX/Code/Source/PhysXCharacters/API/CharacterUtils.h index 0f51a5d9b9..245dc01abd 100644 --- a/Gems/PhysX/Code/Source/PhysXCharacters/API/CharacterUtils.h +++ b/Gems/PhysX/Code/Source/PhysXCharacters/API/CharacterUtils.h @@ -49,6 +49,18 @@ namespace PhysX //! @param forceLimit The upper limit on the force the joint can apply to reach its target. //! @return The created joint drive. physx::PxD6JointDrive CreateD6JointDrive(float strength, float dampingRatio, float forceLimit); + + //! Contains information about a node in a hierarchy and how deep it is in the hierarchy relative to the root. + struct DepthData + { + int m_depth = -1; //!< Depth of the joint in the hierarchy. The root has depth 0, its children depth 1, and so on. + size_t m_index = 0; // ComputeHierarchyDepths(const AZStd::vector& parentIndices); } // namespace Characters } // namespace Utils } // namespace PhysX diff --git a/Gems/PhysX/Code/Source/PhysXCharacters/Components/RagdollComponent.cpp b/Gems/PhysX/Code/Source/PhysXCharacters/Components/RagdollComponent.cpp index 57972fea3e..f1b3db69e6 100644 --- a/Gems/PhysX/Code/Source/PhysXCharacters/Components/RagdollComponent.cpp +++ b/Gems/PhysX/Code/Source/PhysXCharacters/Components/RagdollComponent.cpp @@ -7,20 +7,20 @@ */ #include -#include #include -#include #include +#include +#include #include +#include #include #include -#include +#include #include namespace PhysX { - bool RagdollComponent::VersionConverter(AZ::SerializeContext& context, - AZ::SerializeContext::DataElementNode& classElement) + bool RagdollComponent::VersionConverter(AZ::SerializeContext& context, AZ::SerializeContext::DataElementNode& classElement) { // The element "PhysXRagdoll" was changed from a shared pointer to a unique pointer, but a version converter was // not added at the time. This means there may be serialized data with either the shared or unique pointer, but @@ -76,13 +76,13 @@ namespace PhysX ->Field("EnableJointProjection", &RagdollComponent::m_enableJointProjection) ->Field("ProjectionLinearTol", &RagdollComponent::m_jointProjectionLinearTolerance) ->Field("ProjectionAngularTol", &RagdollComponent::m_jointProjectionAngularToleranceDegrees) - ; + ->Field("EnableMassRatioClamping", &RagdollComponent::m_enableMassRatioClamping) + ->Field("MaxMassRatio", &RagdollComponent::m_maxMassRatio); AZ::EditContext* editContext = serializeContext->GetEditContext(); if (editContext) { - editContext->Class( - "PhysX Ragdoll", "Creates a PhysX ragdoll simulation for an animation actor.") + editContext->Class("PhysX Ragdoll", "Creates a PhysX ragdoll simulation for an animation actor.") ->ClassElement(AZ::Edit::ClassElements::EditorData, "") ->Attribute(AZ::Edit::Attributes::Category, "PhysX") ->Attribute(AZ::Edit::Attributes::Icon, "Icons/Components/PhysXRagdoll.svg") @@ -90,34 +90,49 @@ namespace PhysX ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Game", 0x232b318c)) ->Attribute(AZ::Edit::Attributes::HelpPageURL, "https://o3de.org/docs/user-guide/components/reference/physx/ragdoll/") ->Attribute(AZ::Edit::Attributes::AutoExpand, true) - ->DataElement(AZ::Edit::UIHandlers::Default, &RagdollComponent::m_positionIterations, "Position Iteration Count", + ->DataElement( + AZ::Edit::UIHandlers::Default, &RagdollComponent::m_positionIterations, "Position Iteration Count", "The frequency at which ragdoll collider positions are resolved. Higher values can increase fidelity but decrease " "performance. Very high values might introduce instability.") ->Attribute(AZ::Edit::Attributes::Min, 1) ->Attribute(AZ::Edit::Attributes::Max, 255) - ->DataElement(AZ::Edit::UIHandlers::Default, &RagdollComponent::m_velocityIterations, "Velocity Iteration Count", + ->DataElement( + AZ::Edit::UIHandlers::Default, &RagdollComponent::m_velocityIterations, "Velocity Iteration Count", "The frequency at which ragdoll collider velocities are resolved. Higher values can increase fidelity but decrease " "performance. Very high values might introduce instability.") ->Attribute(AZ::Edit::Attributes::Min, 1) ->Attribute(AZ::Edit::Attributes::Max, 255) - ->DataElement(AZ::Edit::UIHandlers::Default, &RagdollComponent::m_enableJointProjection, - "Enable Joint Projection", "When active, preserves joint constraints in volatile simulations. " + ->DataElement( + AZ::Edit::UIHandlers::Default, &RagdollComponent::m_enableJointProjection, "Enable Joint Projection", + "When active, preserves joint constraints in volatile simulations. " "Might not be physically correct in all simulations.") ->Attribute(AZ::Edit::Attributes::ChangeNotify, AZ::Edit::PropertyRefreshLevels::EntireTree) - ->DataElement(AZ::Edit::UIHandlers::Default, &RagdollComponent::m_jointProjectionLinearTolerance, + ->DataElement( + AZ::Edit::UIHandlers::Default, &RagdollComponent::m_jointProjectionLinearTolerance, "Joint Projection Linear Tolerance", "Maximum linear joint error. Projection is applied to linear joint errors above this value.") ->Attribute(AZ::Edit::Attributes::Min, 0.0f) ->Attribute(AZ::Edit::Attributes::Step, 1e-3f) ->Attribute(AZ::Edit::Attributes::Visibility, &RagdollComponent::IsJointProjectionVisible) - ->DataElement(AZ::Edit::UIHandlers::Default, &RagdollComponent::m_jointProjectionAngularToleranceDegrees, + ->DataElement( + AZ::Edit::UIHandlers::Default, &RagdollComponent::m_jointProjectionAngularToleranceDegrees, "Joint Projection Angular Tolerance", "Maximum angular joint error. Projection is applied to angular joint errors above this value.") ->Attribute(AZ::Edit::Attributes::Min, 0.0f) ->Attribute(AZ::Edit::Attributes::Step, 0.1f) ->Attribute(AZ::Edit::Attributes::Suffix, " degrees") ->Attribute(AZ::Edit::Attributes::Visibility, &RagdollComponent::IsJointProjectionVisible) - ; + ->DataElement( + AZ::Edit::UIHandlers::Default, &RagdollComponent::m_enableMassRatioClamping, "Enable Mass Ratio Clamping", + "When active, ragdoll node mass values may be overridden to avoid unstable mass ratios.") + ->Attribute(AZ::Edit::Attributes::ChangeNotify, AZ::Edit::PropertyRefreshLevels::EntireTree) + ->DataElement( + AZ::Edit::UIHandlers::Default, &RagdollComponent::m_maxMassRatio, "Maximum Mass Ratio", + "The mass of the child body of a joint may be clamped to avoid its ratio with the parent " + "body mass exceeding this threshold.") + ->Attribute(AZ::Edit::Attributes::Min, 1.0f) + ->Attribute(AZ::Edit::Attributes::Step, 0.1f) + ->Attribute(AZ::Edit::Attributes::Visibility, &RagdollComponent::IsMaxMassRatioVisible); } } @@ -131,6 +146,11 @@ namespace PhysX return m_enableJointProjection; } + bool RagdollComponent::IsMaxMassRatioVisible() + { + return m_enableMassRatioClamping; + } + // AZ::Component void RagdollComponent::Init() { @@ -272,7 +292,6 @@ namespace PhysX return ragdoll->IsSimulated(); } return false; - } AZ::Aabb RagdollComponent::GetAabb() const @@ -318,20 +337,19 @@ namespace PhysX if (numNodes == 0) { - AZ_Error("PhysX Ragdoll Component", false, - "Ragdoll configuration has 0 nodes, ragdoll will not be created for entity \"%s\".", + AZ_Error( + "PhysX Ragdoll Component", false, "Ragdoll configuration has 0 nodes, ragdoll will not be created for entity \"%s\".", GetEntity()->GetName().c_str()); return; } - ragdollConfiguration.m_parentIndices.resize(numNodes); for (size_t nodeIndex = 0; nodeIndex < numNodes; nodeIndex++) { AZStd::string parentName; AZStd::string nodeName = ragdollConfiguration.m_nodes[nodeIndex].m_debugName; - AzFramework::CharacterPhysicsDataRequestBus::EventResult(parentName, GetEntityId(), - &AzFramework::CharacterPhysicsDataRequests::GetParentNodeName, nodeName); + AzFramework::CharacterPhysicsDataRequestBus::EventResult( + parentName, GetEntityId(), &AzFramework::CharacterPhysicsDataRequests::GetParentNodeName, nodeName); AZ::Outcome parentIndex = Utils::Characters::GetNodeIndex(ragdollConfiguration, parentName); ragdollConfiguration.m_parentIndices[nodeIndex] = parentIndex ? parentIndex.GetValue() : SIZE_MAX; @@ -339,8 +357,8 @@ namespace PhysX } Physics::RagdollState bindPose; - AzFramework::CharacterPhysicsDataRequestBus::EventResult(bindPose, GetEntityId(), - &AzFramework::CharacterPhysicsDataRequests::GetBindPose, ragdollConfiguration); + AzFramework::CharacterPhysicsDataRequestBus::EventResult( + bindPose, GetEntityId(), &AzFramework::CharacterPhysicsDataRequests::GetBindPose, ragdollConfiguration); AZ::Transform entityTransform = AZ::Transform::CreateIdentity(); AZ::TransformBus::EventResult(entityTransform, GetEntityId(), &AZ::TransformBus::Events::GetWorldTM); @@ -354,13 +372,12 @@ namespace PhysX m_ragdollHandle = sceneInterface->AddSimulatedBody(m_attachedSceneHandle, &ragdollConfiguration); } auto* ragdoll = GetPhysXRagdoll(); - if (ragdoll == nullptr || - m_ragdollHandle == AzPhysics::InvalidSimulatedBodyHandle) + if (ragdoll == nullptr || m_ragdollHandle == AzPhysics::InvalidSimulatedBodyHandle) { AZ_Error("PhysX Ragdoll Component", false, "Failed to create ragdoll."); return; } - + for (size_t nodeIndex = 0; nodeIndex < numNodes; nodeIndex++) { if (physx::PxRigidDynamic* pxRigidBody = ragdoll->GetPxRigidDynamic(nodeIndex)) @@ -389,17 +406,62 @@ namespace PhysX } } + // If mass ratio clamping is enabled, iterate out from the root and clamp mass values + if (m_enableMassRatioClamping) + { + const float maxMassRatio = AZStd::GetMax(1.0f + AZ::Constants::FloatEpsilon, m_maxMassRatio); + + // figure out the depth of each node in the tree, so that nodes can be visited from the root outwards + AZStd::vector nodeDepths = + Utils::Characters::ComputeHierarchyDepths(ragdollConfiguration.m_parentIndices); + + AZStd::sort( + nodeDepths.begin(), nodeDepths.end(), + [](const Utils::Characters::DepthData& d1, const Utils::Characters::DepthData& d2) + { + return d1.m_depth < d2.m_depth; + }); + + bool massesClamped = false; + for (const auto [depth, nodeIndex] : nodeDepths) + { + size_t parentIndex = ragdollConfiguration.m_parentIndices[nodeIndex]; + if (parentIndex < numNodes) + { + AzPhysics::RigidBody& nodeRigidBody = ragdoll->GetNode(nodeIndex)->GetRigidBody(); + const float originalMass = nodeRigidBody.GetMass(); + const float parentMass = ragdoll->GetNode(parentIndex)->GetRigidBody().GetMass(); + const float minMass = parentMass / maxMassRatio; + const float maxMass = parentMass; + if (originalMass < minMass || originalMass > maxMass) + { + const float clampedMass = AZStd::clamp(originalMass, minMass, maxMass); + nodeRigidBody.SetMass(clampedMass); + massesClamped = true; + if (!AZ::IsCloseMag(originalMass, 0.0f)) + { + // scale the inertia proportionally to how the mass was modified + auto pxRigidBody = static_cast(nodeRigidBody.GetNativePointer()); + pxRigidBody->setMassSpaceInertiaTensor(clampedMass / originalMass * pxRigidBody->getMassSpaceInertiaTensor()); + } + } + } + } + + AZ_WarningOnce("PhysX Ragdoll", !massesClamped, + "Mass values for ragdoll on entity \"%s\" were modified based on max mass ratio setting to avoid instability.", + GetEntity()->GetName().c_str()); + } + AzFramework::RagdollPhysicsRequestBus::Handler::BusConnect(GetEntityId()); AzPhysics::SimulatedBodyComponentRequestsBus::Handler::BusConnect(GetEntityId()); - AzFramework::RagdollPhysicsNotificationBus::Event(GetEntityId(), - &AzFramework::RagdollPhysicsNotifications::OnRagdollActivated); + AzFramework::RagdollPhysicsNotificationBus::Event(GetEntityId(), &AzFramework::RagdollPhysicsNotifications::OnRagdollActivated); } void RagdollComponent::DestroyRagdoll() { - if (m_ragdollHandle != AzPhysics::InvalidSimulatedBodyHandle && - m_attachedSceneHandle != AzPhysics::InvalidSceneHandle) + if (m_ragdollHandle != AzPhysics::InvalidSimulatedBodyHandle && m_attachedSceneHandle != AzPhysics::InvalidSceneHandle) { AzFramework::RagdollPhysicsRequestBus::Handler::BusDisconnect(); AzFramework::RagdollPhysicsNotificationBus::Event( @@ -421,8 +483,7 @@ namespace PhysX const Ragdoll* RagdollComponent::GetPhysXRagdollConst() const { - if (m_ragdollHandle == AzPhysics::InvalidSimulatedBodyHandle || - m_attachedSceneHandle == AzPhysics::InvalidSceneHandle) + if (m_ragdollHandle == AzPhysics::InvalidSimulatedBodyHandle || m_attachedSceneHandle == AzPhysics::InvalidSceneHandle) { return nullptr; } diff --git a/Gems/PhysX/Code/Source/PhysXCharacters/Components/RagdollComponent.h b/Gems/PhysX/Code/Source/PhysXCharacters/Components/RagdollComponent.h index 63dd1354dd..1eb46d183d 100644 --- a/Gems/PhysX/Code/Source/PhysXCharacters/Components/RagdollComponent.h +++ b/Gems/PhysX/Code/Source/PhysXCharacters/Components/RagdollComponent.h @@ -104,6 +104,7 @@ namespace PhysX const Ragdoll* GetPhysXRagdollConst() const; bool IsJointProjectionVisible(); + bool IsMaxMassRatioVisible(); AzPhysics::SimulatedBodyHandle m_ragdollHandle = AzPhysics::InvalidSimulatedBodyHandle; AzPhysics::SceneHandle m_attachedSceneHandle = AzPhysics::InvalidSceneHandle; @@ -119,5 +120,9 @@ namespace PhysX float m_jointProjectionLinearTolerance = 1e-3f; /// Angular joint error (in degrees) above which projection will be applied. float m_jointProjectionAngularToleranceDegrees = 1.0f; + /// Allows ragdoll node mass values to be overridden to avoid unstable mass ratios. + bool m_enableMassRatioClamping = false; + /// If mass ratio clamping is enabled, masses will be clamped to within this ratio. + float m_maxMassRatio = 2.0f; }; } // namespace PhysX diff --git a/Gems/PhysX/Code/Tests/RagdollTests.cpp b/Gems/PhysX/Code/Tests/RagdollTests.cpp index 30e9400790..ff4637fd6e 100644 --- a/Gems/PhysX/Code/Tests/RagdollTests.cpp +++ b/Gems/PhysX/Code/Tests/RagdollTests.cpp @@ -367,4 +367,19 @@ namespace PhysX float minZ = ragdoll->GetAabb().GetMin().GetZ(); EXPECT_NEAR(minZ, 0.0f, 0.05f); } + + TEST(ComputeHierarchyDepthsTest, DepthValuesCorrect) + { + AZStd::vector parentIndices = + { 3, 5, AZStd::numeric_limits::max(), 1, 2, 9, 7, 4, 0, 6, 11, 12, 5, 14, 15, 16, 5, 18, 19, 4, 21, 22, 4 }; + + const AZStd::vector nodeDepths = Utils::Characters::ComputeHierarchyDepths(parentIndices); + + std::vector expectedDepths = { 8, 6, 0, 7, 1, 5, 3, 2, 9, 4, 8, 7, 6, 9, 8, 7, 6, 4, 3, 2, 4, 3, 2 }; + + for (size_t i = 0; i < parentIndices.size(); i++) + { + EXPECT_EQ(nodeDepths[i].m_depth, expectedDepths[i]); + } + } } // namespace PhysX From 6b201bf97c5150b8d54747782c522f678a86866f Mon Sep 17 00:00:00 2001 From: John Date: Tue, 16 Nov 2021 15:55:22 +0000 Subject: [PATCH 027/345] Add back button to editor mode UI. Signed-off-by: John --- .../ComponentMode/ComponentModeCollection.cpp | 6 ++- .../ComponentMode/EditorBaseComponentMode.cpp | 7 +++- .../EditorTransformComponentSelection.cpp | 18 ++++++++- .../ViewportUi/ViewportUiDisplay.cpp | 38 ++++++++++++++++++- .../ViewportUi/ViewportUiDisplay.h | 8 +++- .../ViewportUi/ViewportUiManager.cpp | 5 ++- .../ViewportUi/ViewportUiManager.h | 3 +- .../ViewportUi/ViewportUiRequestBus.h | 9 +++-- 8 files changed, 79 insertions(+), 15 deletions(-) diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ComponentMode/ComponentModeCollection.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/ComponentMode/ComponentModeCollection.cpp index 07e025fc60..5a969d0b13 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/ComponentMode/ComponentModeCollection.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ComponentMode/ComponentModeCollection.cpp @@ -448,7 +448,11 @@ namespace AzToolsFramework ViewportUi::ViewportUiRequestBus::Event( ViewportUi::DefaultViewportId, &ViewportUi::ViewportUiRequestBus::Events::CreateViewportBorder, - componentMode.m_componentMode->GetComponentModeName().c_str()); + componentMode.m_componentMode->GetComponentModeName().c_str(), + []() + { + ComponentModeSystemRequestBus::Broadcast(&ComponentModeSystemRequests::EndComponentMode); + }); } RefreshActions(); diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ComponentMode/EditorBaseComponentMode.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/ComponentMode/EditorBaseComponentMode.cpp index f449478306..0da57a2ce1 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/ComponentMode/EditorBaseComponentMode.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ComponentMode/EditorBaseComponentMode.cpp @@ -55,8 +55,11 @@ namespace AzToolsFramework GetEntityComponentIdPair(), elementIdsToDisplay); // create the component mode border with the specific name for this component mode ViewportUi::ViewportUiRequestBus::Event( - ViewportUi::DefaultViewportId, &ViewportUi::ViewportUiRequestBus::Events::CreateViewportBorder, - GetComponentModeName()); + ViewportUi::DefaultViewportId, &ViewportUi::ViewportUiRequestBus::Events::CreateViewportBorder, GetComponentModeName(), + []() + { + ComponentModeSystemRequestBus::Broadcast(&ComponentModeSystemRequests::EndComponentMode); + }); // set the EntityComponentId for this ComponentMode to active in the ComponentModeViewportUi system ComponentModeViewportUiRequestBus::Event( GetComponentType(), &ComponentModeViewportUiRequestBus::Events::SetViewportUiActiveEntityComponentId, diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorTransformComponentSelection.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorTransformComponentSelection.cpp index 39c882b766..0df4cc5d5b 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorTransformComponentSelection.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorTransformComponentSelection.cpp @@ -27,6 +27,7 @@ #include #include #include +#include #include #include #include @@ -1013,6 +1014,16 @@ namespace AzToolsFramework ToolsApplicationNotificationBus::Broadcast(&ToolsApplicationNotificationBus::Events::InvalidatePropertyDisplay, Refresh_Values); } + // leaves focus mode by focusing on the parent of the current perfab in the entity outliner + static void LeaveFocusMode() + { + if (auto prefabFocusPublicInterface = AZ::Interface::Get(); prefabFocusPublicInterface) + { + // Close this prefab and focus on the parent + prefabFocusPublicInterface->FocusOnParentOfFocusedPrefab(GetEntityContextId()); + } + } + EditorTransformComponentSelection::EditorTransformComponentSelection(const EditorVisibleEntityDataCache* entityDataCache) : m_entityDataCache(entityDataCache) { @@ -3694,7 +3705,8 @@ namespace AzToolsFramework case ViewportEditorMode::Focus: { ViewportUi::ViewportUiRequestBus::Event( - ViewportUi::DefaultViewportId, &ViewportUi::ViewportUiRequestBus::Events::CreateViewportBorder, "Focus Mode"); + ViewportUi::DefaultViewportId, &ViewportUi::ViewportUiRequestBus::Events::CreateViewportBorder, "Focus Mode", + LeaveFocusMode); } break; case ViewportEditorMode::Default: @@ -3723,12 +3735,14 @@ namespace AzToolsFramework if (editorModeState.IsModeActive(ViewportEditorMode::Focus)) { ViewportUi::ViewportUiRequestBus::Event( - ViewportUi::DefaultViewportId, &ViewportUi::ViewportUiRequestBus::Events::CreateViewportBorder, "Focus Mode"); + ViewportUi::DefaultViewportId, &ViewportUi::ViewportUiRequestBus::Events::CreateViewportBorder, "Focus Mode", + LeaveFocusMode); } } break; case ViewportEditorMode::Focus: { + ViewportUi::ViewportUiRequestBus::Event( ViewportUi::DefaultViewportId, &ViewportUi::ViewportUiRequestBus::Events::RemoveViewportBorder); } diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiDisplay.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiDisplay.cpp index c53aa66d81..f0f7a9f81d 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiDisplay.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiDisplay.cpp @@ -21,6 +21,8 @@ namespace AzToolsFramework::ViewportUi::Internal { const static int HighlightBorderSize = 5; const static char* HighlightBorderColor = "#4A90E2"; + const static int HighlightBorderBackButtonMargin = 5; + const static char* HighlightBorderBackButtonText = "X"; static void UnparentWidgets(ViewportUiElementIdInfoLookup& viewportUiElementIdInfoLookup) { @@ -62,6 +64,7 @@ namespace AzToolsFramework::ViewportUi::Internal , m_fullScreenLayout(&m_uiOverlay) , m_uiOverlayLayout() , m_viewportBorderText(&m_uiOverlay) + , m_viewportBorderBackButton(&m_uiOverlay) { } @@ -291,7 +294,8 @@ namespace AzToolsFramework::ViewportUi::Internal return false; } - void ViewportUiDisplay::CreateViewportBorder(const AZStd::string& borderTitle) + void ViewportUiDisplay::CreateViewportBorder( + const AZStd::string& borderTitle, AZStd::optional backButtonCallback) { const AZStd::string styleSheet = AZStd::string::format( "border: %dpx solid %s; border-top: %dpx solid %s;", HighlightBorderSize, HighlightBorderColor, ViewportUiTopBorderSize, @@ -302,6 +306,10 @@ namespace AzToolsFramework::ViewportUi::Internal HighlightBorderSize + ViewportUiOverlayMargin, HighlightBorderSize + ViewportUiOverlayMargin); m_viewportBorderText.setVisible(true); m_viewportBorderText.setText(borderTitle.c_str()); + + // only display the back button if a callback was provided + m_viewportBorderBackButtonCallback = backButtonCallback; + m_viewportBorderBackButton.setVisible(m_viewportBorderBackButtonCallback.has_value()); } void ViewportUiDisplay::RemoveViewportBorder() @@ -311,6 +319,9 @@ namespace AzToolsFramework::ViewportUi::Internal m_uiOverlayLayout.setContentsMargins( ViewportUiOverlayMargin, ViewportUiOverlayMargin + ViewportUiOverlayTopMarginPadding, ViewportUiOverlayMargin, ViewportUiOverlayMargin); + + m_viewportBorderBackButtonCallback.reset(); + m_viewportBorderBackButton.setVisible(false); } void ViewportUiDisplay::PositionViewportUiElementFromWorldSpace(ViewportUiElementId elementId, const AZ::Vector3& pos) @@ -347,6 +358,8 @@ namespace AzToolsFramework::ViewportUi::Internal void ViewportUiDisplay::InitializeUiOverlay() { + AZStd::string styleSheet; + m_uiMainWindow.setObjectName(QString("ViewportUiWindow")); ConfigureWindowForViewportUi(&m_uiMainWindow); m_uiMainWindow.setVisible(false); @@ -361,11 +374,32 @@ namespace AzToolsFramework::ViewportUi::Internal m_fullScreenLayout.addLayout(&m_uiOverlayLayout, 0, 0, 1, 1); // format the label which will appear on top of the highlight border - AZStd::string styleSheet = AZStd::string::format("background-color: %s; border: none;", HighlightBorderColor); + styleSheet = AZStd::string::format("background-color: %s; border: none;", HighlightBorderColor); m_viewportBorderText.setStyleSheet(styleSheet.c_str()); m_viewportBorderText.setFixedHeight(ViewportUiTopBorderSize); m_viewportBorderText.setVisible(false); m_fullScreenLayout.addWidget(&m_viewportBorderText, 0, 0, Qt::AlignTop | Qt::AlignHCenter); + + // format the back button which will appear in the top right of the highlight border + styleSheet = AZStd::string::format( + "border: 0px; padding-left: %dpx; padding-right: %dpx", HighlightBorderBackButtonMargin, HighlightBorderBackButtonMargin); + m_viewportBorderBackButton.setStyleSheet(styleSheet.c_str()); + m_viewportBorderBackButton.setVisible(false); + m_viewportBorderBackButton.setText(HighlightBorderBackButtonText); + QObject::connect( + &m_viewportBorderBackButton, &QPushButton::clicked, + [this]() + { + if (m_viewportBorderBackButtonCallback.has_value()) + { + // we need to swap out the existing back button callback because it will be reset in RemoveViewportBorder() + AZStd::optional backButtonCallback; + m_viewportBorderBackButtonCallback.swap(backButtonCallback); + RemoveViewportBorder(); + (*backButtonCallback)(); + } + }); + m_fullScreenLayout.addWidget(&m_viewportBorderBackButton, 0, 0, Qt::AlignTop | Qt::AlignRight); } void ViewportUiDisplay::PrepareWidgetForViewportUi(QPointer widget) diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiDisplay.h b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiDisplay.h index 32b746a1ac..48da8d55a4 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiDisplay.h +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiDisplay.h @@ -17,6 +17,7 @@ #include #include #include +#include AZ_PUSH_DISABLE_WARNING(4251, "-Wunknown-warning-option") #include @@ -89,7 +90,7 @@ namespace AzToolsFramework::ViewportUi::Internal AZStd::shared_ptr GetViewportUiElement(ViewportUiElementId elementId); bool IsViewportUiElementVisible(ViewportUiElementId elementId); - void CreateViewportBorder(const AZStd::string& borderTitle); + void CreateViewportBorder(const AZStd::string& borderTitle, AZStd::optional backButtonCallback); void RemoveViewportBorder(); private: @@ -113,7 +114,10 @@ namespace AzToolsFramework::ViewportUi::Internal QWidget m_uiOverlay; //!< The UI Overlay which displays Viewport UI Elements. QGridLayout m_fullScreenLayout; //!< The layout which extends across the full screen. ViewportUiDisplayLayout m_uiOverlayLayout; //!< The layout used for optionally anchoring Viewport UI Elements. - QLabel m_viewportBorderText; //!< The text used for the viewport border. + QLabel m_viewportBorderText; //!< The text used for the viewport highlight border. + QPushButton m_viewportBorderBackButton; //!< The button to return from the viewport highlight border. + AZStd::optional + m_viewportBorderBackButtonCallback; //!< The optional callback for when the viewport highlight border back button is pressed. QWidget* m_renderOverlay; QPointer m_fullScreenWidget; //!< Reference to the widget attached to m_fullScreenLayout if any. diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiManager.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiManager.cpp index 1f14b12b7d..6da1967ab6 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiManager.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiManager.cpp @@ -240,9 +240,10 @@ namespace AzToolsFramework::ViewportUi } } - void ViewportUiManager::CreateViewportBorder(const AZStd::string& borderTitle) + void ViewportUiManager::CreateViewportBorder( + const AZStd::string& borderTitle, AZStd::optional backButtonCallback) { - m_viewportUi->CreateViewportBorder(borderTitle); + m_viewportUi->CreateViewportBorder(borderTitle, backButtonCallback); } void ViewportUiManager::RemoveViewportBorder() diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiManager.h b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiManager.h index ce7e5aafe9..6ed2a2892f 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiManager.h +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiManager.h @@ -50,7 +50,8 @@ namespace AzToolsFramework::ViewportUi void RegisterTextFieldCallback(TextFieldId textFieldId, AZ::Event::Handler& handler) override; void RemoveTextField(TextFieldId textFieldId) override; void SetTextFieldVisible(TextFieldId textFieldId, bool visible) override; - void CreateViewportBorder(const AZStd::string& borderTitle) override; + void CreateViewportBorder( + const AZStd::string& borderTitle, AZStd::optional backButtonCallback) override; void RemoveViewportBorder() override; void PressButton(ClusterId clusterId, ButtonId buttonId) override; void PressButton(SwitcherId switcherId, ButtonId buttonId) override; diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiRequestBus.h b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiRequestBus.h index 3c6f7094cb..6334f566ce 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiRequestBus.h +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiRequestBus.h @@ -22,6 +22,9 @@ namespace AzToolsFramework::ViewportUi using SwitcherId = IdType; using TextFieldId = IdType; + //! Callback function for viewport UI back button. + using ViewportUIBackButtonCallback = AZStd::function; + inline const ViewportUiElementId InvalidViewportUiElementId = ViewportUiElementId(0); inline const ButtonId InvalidButtonId = ButtonId(0); inline const ClusterId InvalidClusterId = ClusterId(0); @@ -95,9 +98,9 @@ namespace AzToolsFramework::ViewportUi virtual void RemoveTextField(TextFieldId textFieldId) = 0; //! Sets the visibility of the text field. virtual void SetTextFieldVisible(TextFieldId textFieldId, bool visible) = 0; - //! Create the highlight border for Component Mode. - virtual void CreateViewportBorder(const AZStd::string& borderTitle) = 0; - //! Remove the highlight border for Component Mode. + //! Create the highlight border for editor modes with optional back button to exit the given editor mode. + virtual void CreateViewportBorder(const AZStd::string& borderTitle, AZStd::optional backButtonCallback) = 0; + //! Remove the highlight border for editor modes. virtual void RemoveViewportBorder() = 0; //! Invoke a button press on a cluster. virtual void PressButton(ClusterId clusterId, ButtonId buttonId) = 0; From 5594a61ece5f502b9f49e425529c1b79f5f0b5d0 Mon Sep 17 00:00:00 2001 From: greerdv Date: Tue, 16 Nov 2021 15:56:56 +0000 Subject: [PATCH 028/345] apply feedback from PR Signed-off-by: greerdv --- .../Source/PhysXCharacters/API/CharacterUtils.cpp | 6 +++--- .../PhysXCharacters/Components/RagdollComponent.cpp | 11 ++++++----- .../PhysXCharacters/Components/RagdollComponent.h | 4 ++-- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/Gems/PhysX/Code/Source/PhysXCharacters/API/CharacterUtils.cpp b/Gems/PhysX/Code/Source/PhysXCharacters/API/CharacterUtils.cpp index 05de1055b2..46f4c04880 100644 --- a/Gems/PhysX/Code/Source/PhysXCharacters/API/CharacterUtils.cpp +++ b/Gems/PhysX/Code/Source/PhysXCharacters/API/CharacterUtils.cpp @@ -369,10 +369,10 @@ namespace PhysX depth++; if (depth > numNodes) { - AZ_Assert(false, "Loop detected in ragdoll configuration."); + AZ_Error("PhysX Ragdoll", false, "Loop detected in hierarchy depth computation."); return nodeDepths; } - size_t parentIndex = parentIndices[currentIndex]; + const size_t parentIndex = parentIndices[currentIndex]; if (parentIndex >= numNodes || nodeDepths[currentIndex].m_depth != -1) { @@ -384,7 +384,7 @@ namespace PhysX } currentIndex = nodeIndex; - for (int i = depth; i >= 0 && currentIndex < numNodes; i--) + for (int i = depth; i >= 0; i--) { nodeDepths[currentIndex] = { ancestorDepth + i, currentIndex }; currentIndex = parentIndices[currentIndex]; diff --git a/Gems/PhysX/Code/Source/PhysXCharacters/Components/RagdollComponent.cpp b/Gems/PhysX/Code/Source/PhysXCharacters/Components/RagdollComponent.cpp index f1b3db69e6..7615a175d1 100644 --- a/Gems/PhysX/Code/Source/PhysXCharacters/Components/RagdollComponent.cpp +++ b/Gems/PhysX/Code/Source/PhysXCharacters/Components/RagdollComponent.cpp @@ -141,12 +141,12 @@ namespace PhysX } } - bool RagdollComponent::IsJointProjectionVisible() + bool RagdollComponent::IsJointProjectionVisible() const { return m_enableJointProjection; } - bool RagdollComponent::IsMaxMassRatioVisible() + bool RagdollComponent::IsMaxMassRatioVisible() const { return m_enableMassRatioClamping; } @@ -423,9 +423,10 @@ namespace PhysX }); bool massesClamped = false; - for (const auto [depth, nodeIndex] : nodeDepths) + for (const auto& nodeDepth : nodeDepths) { - size_t parentIndex = ragdollConfiguration.m_parentIndices[nodeIndex]; + const size_t nodeIndex = nodeDepth.m_index; + const size_t parentIndex = ragdollConfiguration.m_parentIndices[nodeIndex]; if (parentIndex < numNodes) { AzPhysics::RigidBody& nodeRigidBody = ragdoll->GetNode(nodeIndex)->GetRigidBody(); @@ -438,7 +439,7 @@ namespace PhysX const float clampedMass = AZStd::clamp(originalMass, minMass, maxMass); nodeRigidBody.SetMass(clampedMass); massesClamped = true; - if (!AZ::IsCloseMag(originalMass, 0.0f)) + if (!AZ::IsClose(originalMass, 0.0f)) { // scale the inertia proportionally to how the mass was modified auto pxRigidBody = static_cast(nodeRigidBody.GetNativePointer()); diff --git a/Gems/PhysX/Code/Source/PhysXCharacters/Components/RagdollComponent.h b/Gems/PhysX/Code/Source/PhysXCharacters/Components/RagdollComponent.h index 1eb46d183d..3ef59bf623 100644 --- a/Gems/PhysX/Code/Source/PhysXCharacters/Components/RagdollComponent.h +++ b/Gems/PhysX/Code/Source/PhysXCharacters/Components/RagdollComponent.h @@ -103,8 +103,8 @@ namespace PhysX Ragdoll* GetPhysXRagdoll(); const Ragdoll* GetPhysXRagdollConst() const; - bool IsJointProjectionVisible(); - bool IsMaxMassRatioVisible(); + bool IsJointProjectionVisible() const; + bool IsMaxMassRatioVisible() const; AzPhysics::SimulatedBodyHandle m_ragdollHandle = AzPhysics::InvalidSimulatedBodyHandle; AzPhysics::SceneHandle m_attachedSceneHandle = AzPhysics::InvalidSceneHandle; From 15462479229119c58f3581800b997f3466834d8e Mon Sep 17 00:00:00 2001 From: John Date: Tue, 16 Nov 2021 16:02:22 +0000 Subject: [PATCH 029/345] Trivial refactor of comments. Signed-off-by: John --- .../ViewportSelection/EditorTransformComponentSelection.cpp | 1 - .../AzToolsFramework/ViewportUi/ViewportUiDisplay.cpp | 3 ++- .../AzToolsFramework/ViewportUi/ViewportUiDisplay.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorTransformComponentSelection.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorTransformComponentSelection.cpp index b35132e620..1a5c84944c 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorTransformComponentSelection.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorTransformComponentSelection.cpp @@ -1020,7 +1020,6 @@ namespace AzToolsFramework { if (auto prefabFocusPublicInterface = AZ::Interface::Get(); prefabFocusPublicInterface) { - // Close this prefab and focus on the parent prefabFocusPublicInterface->FocusOnParentOfFocusedPrefab(GetEntityContextId()); } } diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiDisplay.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiDisplay.cpp index f0f7a9f81d..adca0eb3f6 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiDisplay.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiDisplay.cpp @@ -319,7 +319,6 @@ namespace AzToolsFramework::ViewportUi::Internal m_uiOverlayLayout.setContentsMargins( ViewportUiOverlayMargin, ViewportUiOverlayMargin + ViewportUiOverlayTopMarginPadding, ViewportUiOverlayMargin, ViewportUiOverlayMargin); - m_viewportBorderBackButtonCallback.reset(); m_viewportBorderBackButton.setVisible(false); } @@ -386,6 +385,8 @@ namespace AzToolsFramework::ViewportUi::Internal m_viewportBorderBackButton.setStyleSheet(styleSheet.c_str()); m_viewportBorderBackButton.setVisible(false); m_viewportBorderBackButton.setText(HighlightBorderBackButtonText); + + // setup the handler for the back button to call the user provided callback (if any) QObject::connect( &m_viewportBorderBackButton, &QPushButton::clicked, [this]() diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiDisplay.h b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiDisplay.h index 48da8d55a4..26dffb33fe 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiDisplay.h +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiDisplay.h @@ -115,7 +115,7 @@ namespace AzToolsFramework::ViewportUi::Internal QGridLayout m_fullScreenLayout; //!< The layout which extends across the full screen. ViewportUiDisplayLayout m_uiOverlayLayout; //!< The layout used for optionally anchoring Viewport UI Elements. QLabel m_viewportBorderText; //!< The text used for the viewport highlight border. - QPushButton m_viewportBorderBackButton; //!< The button to return from the viewport highlight border. + QPushButton m_viewportBorderBackButton; //!< The button to return from the viewport highlight border (only displayed if callback provided). AZStd::optional m_viewportBorderBackButtonCallback; //!< The optional callback for when the viewport highlight border back button is pressed. From 6cc98f1802dabf24236b3a0b5e0de0919c35c316 Mon Sep 17 00:00:00 2001 From: Jonny Gallowy Date: Tue, 16 Nov 2021 10:04:03 -0600 Subject: [PATCH 030/345] upgraded capture_displaymapper util and some cleanup Signed-off-by: Jonny Gallowy --- .../Editor/Scripts/ColorGrading/__init__.py | 1 + ...assthrough.py => capture_displaymapper.py} | 30 +++++++----- .../Editor/Scripts/ColorGrading/initialize.py | 19 +++----- .../cmdline/CMD_ColorGradingTools.bat | 6 +-- .../Tools/ColorGrading/cmdline/Env_Python.bat | 46 ++++--------------- .../cmdline/User_Env.bat.template | 5 -- 6 files changed, 40 insertions(+), 67 deletions(-) rename Gems/Atom/Feature/Common/Editor/Scripts/ColorGrading/{capture_displaymapperpassthrough.py => capture_displaymapper.py} (65%) diff --git a/Gems/Atom/Feature/Common/Editor/Scripts/ColorGrading/__init__.py b/Gems/Atom/Feature/Common/Editor/Scripts/ColorGrading/__init__.py index d500d6e09c..7e244dcfb2 100644 --- a/Gems/Atom/Feature/Common/Editor/Scripts/ColorGrading/__init__.py +++ b/Gems/Atom/Feature/Common/Editor/Scripts/ColorGrading/__init__.py @@ -163,6 +163,7 @@ _LOGGER.debug('Invoking __init__.py for {0}.'.format({_PACKAGENAME})) # ------------------------------------------------------------------------- +# ------------------------------------------------------------------------- def get_datadir() -> pathlib.Path: """ persistent application data. diff --git a/Gems/Atom/Feature/Common/Editor/Scripts/ColorGrading/capture_displaymapperpassthrough.py b/Gems/Atom/Feature/Common/Editor/Scripts/ColorGrading/capture_displaymapper.py similarity index 65% rename from Gems/Atom/Feature/Common/Editor/Scripts/ColorGrading/capture_displaymapperpassthrough.py rename to Gems/Atom/Feature/Common/Editor/Scripts/ColorGrading/capture_displaymapper.py index 76cdd8450a..bfcdf4c79e 100644 --- a/Gems/Atom/Feature/Common/Editor/Scripts/ColorGrading/capture_displaymapperpassthrough.py +++ b/Gems/Atom/Feature/Common/Editor/Scripts/ColorGrading/capture_displaymapper.py @@ -10,9 +10,7 @@ """Frame capture of the Displaymapper Passthrough (outputs .dds image)""" # ------------------------------------------------------------------------ import logging as _logging -from env_bool import env_bool -# ------------------------------------------------------------------------ _MODULENAME = 'ColorGrading.capture_displaymapperpassthrough' import ColorGrading.initialize @@ -27,25 +25,35 @@ _LOGGER.debug('Initializing: {0}.'.format({_MODULENAME})) import azlmbr.bus import azlmbr.atom -default_passtree = ["Root", +# This requires the level to have the DisplayMapper component added +# and configured to 'Passthrough' +# but now we can capture the parent input +# so this is here for reference for how it previously worked +passtree_displaymapperpassthrough = ["Root", + "MainPipeline_0", + "MainPipeline", + "PostProcessPass", + "LightAdaptation", + "DisplayMapperPass", + "DisplayMapperPassthrough"] + +# we can grad the parent pass input to the displaymapper directly +passtree_default = ["Root", "MainPipeline_0", "MainPipeline", "PostProcessPass", "LightAdaptation", - "DisplayMapperPass", - "DisplayMapperPassthrough"] + "DisplayMapperPass"] -default_path = "FrameCapture\DisplayMapperPassthrough.dds" - -# To Do: we should try to set display mapper to passthrough, -# then back after capture? +default_path = "FrameCapture\DisplayMappeInput.dds" # To Do: we can wrap this, to call from a PySide2 GUI def capture(command="CapturePassAttachment", - passtree=default_passtree, - pass_type="Output", + passtree=passtree_default, + pass_type="Input", output_path=default_path): + """Writes frame capture into project cache""" azlmbr.atom.FrameCaptureRequestBus(azlmbr.bus.Broadcast, command, passtree, diff --git a/Gems/Atom/Feature/Common/Editor/Scripts/ColorGrading/initialize.py b/Gems/Atom/Feature/Common/Editor/Scripts/ColorGrading/initialize.py index ac64ade322..24fcd08f02 100644 --- a/Gems/Atom/Feature/Common/Editor/Scripts/ColorGrading/initialize.py +++ b/Gems/Atom/Feature/Common/Editor/Scripts/ColorGrading/initialize.py @@ -32,10 +32,7 @@ if DCCSI_GDEBUG: DCCSI_LOGLEVEL = int(10) # set up logger with both console and file _logging -if DCCSI_GDEBUG: - _LOGGER = initialize_logger(_PACKAGENAME, log_to_file=True, default_log_level=DCCSI_LOGLEVEL) -else: - _LOGGER = initialize_logger(_PACKAGENAME, log_to_file=False, default_log_level=DCCSI_LOGLEVEL) +_LOGGER = initialize_logger(_PACKAGENAME, log_to_file=DCCSI_GDEBUG, default_log_level=DCCSI_LOGLEVEL) _LOGGER.debug('Initializing: {0}.'.format({_MODULENAME})) @@ -46,7 +43,7 @@ if DCCSI_DEV_MODE: APPDATA = get_datadir() # os APPDATA APPDATA_WING = Path(APPDATA, f"Wing Pro {DCCSI_WING_VERSION_MAJOR}").resolve() if APPDATA_WING.exists(): - site.addsitedir(pathlib.PureWindowsPath(APPDATA_WING).as_posix()) + site.addsitedir(APPDATA_WING.resolve()) import wingdbstub as debugger try: debugger.Ensure() @@ -75,8 +72,7 @@ def start(): try: _O3DE_DEV = Path(os.getenv('O3DE_DEV')) - _O3DE_DEV = _O3DE_DEV.resolve() - os.environ['O3DE_DEV'] = pathlib.PureWindowsPath(_O3DE_DEV).as_posix() + os.environ['O3DE_DEV'] = _O3DE_DEV.as_posix() _LOGGER.debug(f'O3DE_DEV is: {_O3DE_DEV}') except EnvironmentError as e: _LOGGER.error('O3DE engineroot not set or found') @@ -86,23 +82,22 @@ def start(): _TAG_LY_BUILD_PATH = os.getenv('TAG_LY_BUILD_PATH', 'build') _DEFAULT_BIN_PATH = Path(str(_O3DE_DEV), _TAG_LY_BUILD_PATH, 'bin', 'profile') _O3DE_BIN_PATH = Path(os.getenv('O3DE_BIN_PATH', _DEFAULT_BIN_PATH)) - _O3DE_BIN_PATH = _O3DE_BIN_PATH.resolve() - os.environ['O3DE_BIN_PATH'] = pathlib.PureWindowsPath(_O3DE_BIN_PATH).as_posix() + os.environ['O3DE_BIN_PATH'] = _O3DE_BIN_PATH.as_posix() _LOGGER.debug(f'O3DE_BIN_PATH is: {_O3DE_BIN_PATH}') - site.addsitedir(pathlib.PureWindowsPath(_O3DE_BIN_PATH).as_posix()) + site.addsitedir(_O3DE_BIN_PATH.resolve()) except EnvironmentError as e: _LOGGER.error('O3DE bin folder not set or found') raise e if running_editor: _O3DE_DEV = Path(os.getenv('O3DE_DEV', Path(azlmbr.paths.engroot))) - os.environ['O3DE_DEV'] = pathlib.PureWindowsPath(_O3DE_DEV).as_posix() + os.environ['O3DE_DEV'] = _O3DE_DEV.as_posix() _LOGGER.debug(_O3DE_DEV) _O3DE_BIN_PATH = Path(str(_O3DE_DEV),Path(azlmbr.paths.executableFolder)) _O3DE_BIN = Path(os.getenv('O3DE_BIN', _O3DE_BIN_PATH.resolve())) - os.environ['O3DE_BIN'] = pathlib.PureWindowsPath(_O3DE_BIN).as_posix() + os.environ['O3DE_BIN'] = _O3DE_BIN_PATH.as_posix() _LOGGER.debug(_O3DE_BIN) diff --git a/Gems/Atom/Feature/Common/Tools/ColorGrading/cmdline/CMD_ColorGradingTools.bat b/Gems/Atom/Feature/Common/Tools/ColorGrading/cmdline/CMD_ColorGradingTools.bat index 56021c0801..89dd86be80 100644 --- a/Gems/Atom/Feature/Common/Tools/ColorGrading/cmdline/CMD_ColorGradingTools.bat +++ b/Gems/Atom/Feature/Common/Tools/ColorGrading/cmdline/CMD_ColorGradingTools.bat @@ -34,15 +34,15 @@ SETLOCAL ENABLEDELAYEDEXPANSION IF EXIST "%~dp0User_Env.bat" CALL %~dp0User_Env.bat :: Initialize env -echo +echo. echo ... calling Env_Core.bat CALL %~dp0\Env_Core.bat -echo +echo. echo ... calling Env_Python.bat CALL %~dp0\Env_Python.bat -echo +echo. echo ... calling Env_Tools.bat CALL %~dp0\Env_Tools.bat diff --git a/Gems/Atom/Feature/Common/Tools/ColorGrading/cmdline/Env_Python.bat b/Gems/Atom/Feature/Common/Tools/ColorGrading/cmdline/Env_Python.bat index fc4afc964e..ffb34b06e5 100644 --- a/Gems/Atom/Feature/Common/Tools/ColorGrading/cmdline/Env_Python.bat +++ b/Gems/Atom/Feature/Common/Tools/ColorGrading/cmdline/Env_Python.bat @@ -27,37 +27,19 @@ echo ~ O3DE Color Grading Python Env ... echo _____________________________________________________________________ echo. -:: Python Version -:: Ideally these are set to match the O3DE python distribution -:: \python\runtime -IF "%DCCSI_PY_VERSION_MAJOR%"=="" (set DCCSI_PY_VERSION_MAJOR=3) -echo DCCSI_PY_VERSION_MAJOR = %DCCSI_PY_VERSION_MAJOR% - -:: PY version Major -IF "%DCCSI_PY_VERSION_MINOR%"=="" (set DCCSI_PY_VERSION_MINOR=7) -echo DCCSI_PY_VERSION_MINOR = %DCCSI_PY_VERSION_MINOR% - -IF "%DCCSI_PY_VERSION_RELEASE%"=="" (set DCCSI_PY_VERSION_RELEASE=10) -echo DCCSI_PY_VERSION_RELEASE = %DCCSI_PY_VERSION_RELEASE% - -:: shared location for 64bit python 3.7 DEV location -:: this defines a DCCsi sandbox for lib site-packages by version -:: \Gems\AtomLyIntegration\TechnicalArt\DccScriptingInterface\3rdParty\Python\Lib -set DCCSI_PYTHON_PATH=%DCCSIG_PATH%\3rdParty\Python -echo DCCSI_PYTHON_PATH = %DCCSI_PYTHON_PATH% - -:: add access to a Lib location that matches the py version (example: 3.7.x) -:: switch this for other python versions like maya (2.7.x) -IF "%DCCSI_PYTHON_LIB_PATH%"=="" (set DCCSI_PYTHON_LIB_PATH=%DCCSI_PYTHON_PATH%\Lib\%DCCSI_PY_VERSION_MAJOR%.x\%DCCSI_PY_VERSION_MAJOR%.%DCCSI_PY_VERSION_MINOR%.x\site-packages) -echo DCCSI_PYTHON_LIB_PATH = %DCCSI_PYTHON_LIB_PATH% - -:: add to the PATH -SET PATH=%DCCSI_PYTHON_LIB_PATH%;%PATH% - :: shared location for default O3DE python location set DCCSI_PYTHON_INSTALL=%O3DE_DEV%\Python echo DCCSI_PYTHON_INSTALL = %DCCSI_PYTHON_INSTALL% +:: Warning, many DCC tools (like Maya) include thier own versioned python interpretter. +:: Some apps may not operate correctly if PYTHONHOME is set/propogated. +:: This is definitely the case with Maya, doing so causes Maya to not boot. +FOR /F "tokens=* USEBACKQ" %%F IN (`%DCCSI_PYTHON_INSTALL%\python.cmd %DCCSI_PYTHON_INSTALL%\get_python_path.py`) DO (SET PYTHONHOME=%%F) +echo PYTHONHOME - is now the folder containing O3DE python executable +echo PYTHONHOME = %PYTHONHOME% + +SET PYTHON=%PYTHONHOME%\python.exe + :: location for O3DE python 3.7 location set DCCSI_PY_BASE=%DCCSI_PYTHON_INSTALL%\python.cmd echo DCCSI_PY_BASE = %DCCSI_PY_BASE% @@ -65,10 +47,7 @@ echo DCCSI_PY_BASE = %DCCSI_PY_BASE% :: ide and debugger plug set DCCSI_PY_DEFAULT=%DCCSI_PY_BASE% -IF "%DCCSI_PY_REV%"=="" (set DCCSI_PY_REV=rev2) -IF "%DCCSI_PY_PLATFORM%"=="" (set DCCSI_PY_PLATFORM=windows) - -set DCCSI_PY_IDE=%DCCSI_PYTHON_INSTALL%\runtime\python-%DCCSI_PY_VERSION_MAJOR%.%DCCSI_PY_VERSION_MINOR%.%DCCSI_PY_VERSION_RELEASE%-%DCCSI_PY_REV%-%DCCSI_PY_PLATFORM%\python +set DCCSI_PY_IDE=%PYTHONHOME% echo DCCSI_PY_IDE = %DCCSI_PY_IDE% :: Wing and other IDEs probably prefer access directly to the python.exe @@ -91,11 +70,6 @@ SET PATH=%DCCSI_PYTHON_INSTALL%;%DCCSI_PY_IDE%;%DCCSI_PY_IDE_PACKAGES%;%DCCSI_PY set PYTHONPATH=%DCCSIG_PATH%;%DCCSI_PYTHON_LIB_PATH%;%O3DE_BIN_PATH%;%DCCSI_COLORGRADING_SCRIPTS%;%DCCSI_FEATURECOMMON_SCRIPTS%;%PYTHONPATH% echo PYTHONPATH = %PYTHONPATH% -:: used for debugging in WingIDE (but needs to be here) -IF "%TAG_USERNAME%"=="" (set TAG_USERNAME=NOT_SET) -echo TAG_USERNAME = %TAG_USERNAME% -IF "%TAG_USERNAME%"=="NOT_SET" (echo Add TAG_USERNAME to User_Env.bat) - :: Set flag so we don't initialize dccsi environment twice SET O3DE_ENV_PY_INIT=1 GOTO END_OF_FILE diff --git a/Gems/Atom/Feature/Common/Tools/ColorGrading/cmdline/User_Env.bat.template b/Gems/Atom/Feature/Common/Tools/ColorGrading/cmdline/User_Env.bat.template index 973d6d5afd..7ab970c98e 100644 --- a/Gems/Atom/Feature/Common/Tools/ColorGrading/cmdline/User_Env.bat.template +++ b/Gems/Atom/Feature/Common/Tools/ColorGrading/cmdline/User_Env.bat.template @@ -25,11 +25,6 @@ SET TAG_LY_BUILD_PATH=build SET DCCSI_GDEBUG=True SET DCCSI_DEV_MODE=True -:: set the your user name here for windows path -SET TAG_USERNAME=NOT_SET -SET DCCSI_PY_REV=rev1 -SET DCCSI_PY_PLATFORM=windows - :: Set flag so we don't initialize dccsi environment twice SET O3DE_USER_ENV_INIT=1 GOTO END_OF_FILE From 921612594a6c3e57d8ca91b17fcfc3631feb39b3 Mon Sep 17 00:00:00 2001 From: John Date: Tue, 16 Nov 2021 17:54:19 +0000 Subject: [PATCH 031/345] Add placeholder icon for back button. Signed-off-by: John --- .../AzToolsFramework/ViewportUi/ViewportUiDisplay.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiDisplay.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiDisplay.cpp index adca0eb3f6..6c0e41fd13 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiDisplay.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiDisplay.cpp @@ -22,7 +22,6 @@ namespace AzToolsFramework::ViewportUi::Internal const static int HighlightBorderSize = 5; const static char* HighlightBorderColor = "#4A90E2"; const static int HighlightBorderBackButtonMargin = 5; - const static char* HighlightBorderBackButtonText = "X"; static void UnparentWidgets(ViewportUiElementIdInfoLookup& viewportUiElementIdInfoLookup) { @@ -384,7 +383,10 @@ namespace AzToolsFramework::ViewportUi::Internal "border: 0px; padding-left: %dpx; padding-right: %dpx", HighlightBorderBackButtonMargin, HighlightBorderBackButtonMargin); m_viewportBorderBackButton.setStyleSheet(styleSheet.c_str()); m_viewportBorderBackButton.setVisible(false); - m_viewportBorderBackButton.setText(HighlightBorderBackButtonText); + QPixmap backButtonPixmap(QString(":/stylesheet/img/UI20/toolbar/X_axis.svg")); + QIcon backButtonIcon(backButtonPixmap); + m_viewportBorderBackButton.setIcon(backButtonIcon); + m_viewportBorderBackButton.setIconSize(backButtonPixmap.size()); // setup the handler for the back button to call the user provided callback (if any) QObject::connect( From 4d6e7f7ef93ce6aa191c51f53e5229947dd0b1d0 Mon Sep 17 00:00:00 2001 From: John Date: Tue, 16 Nov 2021 17:59:18 +0000 Subject: [PATCH 032/345] Address PR comments. Signed-off-by: John --- .../ComponentMode/ComponentModeCollection.cpp | 2 +- .../ComponentMode/EditorBaseComponentMode.cpp | 2 +- .../EditorTransformComponentSelection.cpp | 2 +- .../AzToolsFramework/ViewportUi/ViewportUiDisplay.cpp | 5 +++-- .../AzToolsFramework/ViewportUi/ViewportUiDisplay.h | 4 ++-- .../AzToolsFramework/ViewportUi/ViewportUiManager.cpp | 2 +- .../AzToolsFramework/ViewportUi/ViewportUiManager.h | 2 +- .../AzToolsFramework/ViewportUi/ViewportUiRequestBus.h | 8 ++++---- 8 files changed, 14 insertions(+), 13 deletions(-) diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ComponentMode/ComponentModeCollection.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/ComponentMode/ComponentModeCollection.cpp index 5a969d0b13..f07e87fad2 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/ComponentMode/ComponentModeCollection.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ComponentMode/ComponentModeCollection.cpp @@ -449,7 +449,7 @@ namespace AzToolsFramework ViewportUi::ViewportUiRequestBus::Event( ViewportUi::DefaultViewportId, &ViewportUi::ViewportUiRequestBus::Events::CreateViewportBorder, componentMode.m_componentMode->GetComponentModeName().c_str(), - []() + [] { ComponentModeSystemRequestBus::Broadcast(&ComponentModeSystemRequests::EndComponentMode); }); diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ComponentMode/EditorBaseComponentMode.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/ComponentMode/EditorBaseComponentMode.cpp index 0da57a2ce1..e780c38822 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/ComponentMode/EditorBaseComponentMode.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ComponentMode/EditorBaseComponentMode.cpp @@ -56,7 +56,7 @@ namespace AzToolsFramework // create the component mode border with the specific name for this component mode ViewportUi::ViewportUiRequestBus::Event( ViewportUi::DefaultViewportId, &ViewportUi::ViewportUiRequestBus::Events::CreateViewportBorder, GetComponentModeName(), - []() + [] { ComponentModeSystemRequestBus::Broadcast(&ComponentModeSystemRequests::EndComponentMode); }); diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorTransformComponentSelection.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorTransformComponentSelection.cpp index 1a5c84944c..686f5e8f8b 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorTransformComponentSelection.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorTransformComponentSelection.cpp @@ -1018,7 +1018,7 @@ namespace AzToolsFramework // leaves focus mode by focusing on the parent of the current perfab in the entity outliner static void LeaveFocusMode() { - if (auto prefabFocusPublicInterface = AZ::Interface::Get(); prefabFocusPublicInterface) + if (auto prefabFocusPublicInterface = AZ::Interface::Get()) { prefabFocusPublicInterface->FocusOnParentOfFocusedPrefab(GetEntityContextId()); } diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiDisplay.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiDisplay.cpp index 6c0e41fd13..315a4d0aec 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiDisplay.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiDisplay.cpp @@ -294,7 +294,7 @@ namespace AzToolsFramework::ViewportUi::Internal } void ViewportUiDisplay::CreateViewportBorder( - const AZStd::string& borderTitle, AZStd::optional backButtonCallback) + const AZStd::string& borderTitle, AZStd::optional backButtonCallback) { const AZStd::string styleSheet = AZStd::string::format( "border: %dpx solid %s; border-top: %dpx solid %s;", HighlightBorderSize, HighlightBorderColor, ViewportUiTopBorderSize, @@ -396,7 +396,8 @@ namespace AzToolsFramework::ViewportUi::Internal if (m_viewportBorderBackButtonCallback.has_value()) { // we need to swap out the existing back button callback because it will be reset in RemoveViewportBorder() - AZStd::optional backButtonCallback; + // so preserve the lifetime with this temporary callback until after the call to RemoveViewportBorder() + AZStd::optional backButtonCallback; m_viewportBorderBackButtonCallback.swap(backButtonCallback); RemoveViewportBorder(); (*backButtonCallback)(); diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiDisplay.h b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiDisplay.h index 26dffb33fe..c75310a10f 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiDisplay.h +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiDisplay.h @@ -90,7 +90,7 @@ namespace AzToolsFramework::ViewportUi::Internal AZStd::shared_ptr GetViewportUiElement(ViewportUiElementId elementId); bool IsViewportUiElementVisible(ViewportUiElementId elementId); - void CreateViewportBorder(const AZStd::string& borderTitle, AZStd::optional backButtonCallback); + void CreateViewportBorder(const AZStd::string& borderTitle, AZStd::optional backButtonCallback); void RemoveViewportBorder(); private: @@ -116,7 +116,7 @@ namespace AzToolsFramework::ViewportUi::Internal ViewportUiDisplayLayout m_uiOverlayLayout; //!< The layout used for optionally anchoring Viewport UI Elements. QLabel m_viewportBorderText; //!< The text used for the viewport highlight border. QPushButton m_viewportBorderBackButton; //!< The button to return from the viewport highlight border (only displayed if callback provided). - AZStd::optional + AZStd::optional m_viewportBorderBackButtonCallback; //!< The optional callback for when the viewport highlight border back button is pressed. QWidget* m_renderOverlay; diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiManager.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiManager.cpp index 6da1967ab6..143da34074 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiManager.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiManager.cpp @@ -241,7 +241,7 @@ namespace AzToolsFramework::ViewportUi } void ViewportUiManager::CreateViewportBorder( - const AZStd::string& borderTitle, AZStd::optional backButtonCallback) + const AZStd::string& borderTitle, AZStd::optional backButtonCallback) { m_viewportUi->CreateViewportBorder(borderTitle, backButtonCallback); } diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiManager.h b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiManager.h index 6ed2a2892f..54f1eb5a57 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiManager.h +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiManager.h @@ -51,7 +51,7 @@ namespace AzToolsFramework::ViewportUi void RemoveTextField(TextFieldId textFieldId) override; void SetTextFieldVisible(TextFieldId textFieldId, bool visible) override; void CreateViewportBorder( - const AZStd::string& borderTitle, AZStd::optional backButtonCallback) override; + const AZStd::string& borderTitle, AZStd::optional backButtonCallback) override; void RemoveViewportBorder() override; void PressButton(ClusterId clusterId, ButtonId buttonId) override; void PressButton(SwitcherId switcherId, ButtonId buttonId) override; diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiRequestBus.h b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiRequestBus.h index 6334f566ce..9ac6feb8c8 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiRequestBus.h +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiRequestBus.h @@ -23,7 +23,7 @@ namespace AzToolsFramework::ViewportUi using TextFieldId = IdType; //! Callback function for viewport UI back button. - using ViewportUIBackButtonCallback = AZStd::function; + using ViewportUiBackButtonCallback = AZStd::function; inline const ViewportUiElementId InvalidViewportUiElementId = ViewportUiElementId(0); inline const ButtonId InvalidButtonId = ButtonId(0); @@ -98,9 +98,9 @@ namespace AzToolsFramework::ViewportUi virtual void RemoveTextField(TextFieldId textFieldId) = 0; //! Sets the visibility of the text field. virtual void SetTextFieldVisible(TextFieldId textFieldId, bool visible) = 0; - //! Create the highlight border for editor modes with optional back button to exit the given editor mode. - virtual void CreateViewportBorder(const AZStd::string& borderTitle, AZStd::optional backButtonCallback) = 0; - //! Remove the highlight border for editor modes. + //! Create the highlight border with optional back button to exit the given editor mode. + virtual void CreateViewportBorder(const AZStd::string& borderTitle, AZStd::optional backButtonCallback) = 0; + //! Remove the highlight border. virtual void RemoveViewportBorder() = 0; //! Invoke a button press on a cluster. virtual void PressButton(ClusterId clusterId, ButtonId buttonId) = 0; From cb5c4256c791756a64973bb3972b92126634974b Mon Sep 17 00:00:00 2001 From: nggieber Date: Tue, 16 Nov 2021 10:18:37 -0800 Subject: [PATCH 033/345] Fix license text eliding Signed-off-by: nggieber --- .../Source/GemCatalog/GemInspector.cpp | 14 +++++++++----- .../Source/GemCatalog/GemInspector.h | 1 + 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/Code/Tools/ProjectManager/Source/GemCatalog/GemInspector.cpp b/Code/Tools/ProjectManager/Source/GemCatalog/GemInspector.cpp index 26844b43e6..8bdd1f0f0f 100644 --- a/Code/Tools/ProjectManager/Source/GemCatalog/GemInspector.cpp +++ b/Code/Tools/ProjectManager/Source/GemCatalog/GemInspector.cpp @@ -53,10 +53,13 @@ namespace O3DE::ProjectManager Update(selectedIndices[0]); } - void SetLabelElidedText(QLabel* label, QString text) + void SetLabelElidedText(QLabel* label, QString text, int labelWidth = 0) { QFontMetrics nameFontMetrics(label->font()); - int labelWidth = label->width(); + if (!labelWidth) + { + labelWidth = label->width(); + } // Don't elide if the widgets are sized too small (sometimes occurs when loading gem catalog) if (labelWidth > 100) @@ -84,7 +87,8 @@ namespace O3DE::ProjectManager m_summaryLabel->setText(m_model->GetSummary(modelIndex)); m_summaryLabel->adjustSize(); - m_licenseLinkLabel->setText(m_model->GetLicenseText(modelIndex)); + // Manually define remaining space to elide text because spacer would like to take all of the space + SetLabelElidedText(m_licenseLinkLabel, m_model->GetLicenseText(modelIndex), width() - m_licenseLabel->width() - 35); m_licenseLinkLabel->SetUrl(m_model->GetLicenseLink(modelIndex)); m_directoryLinkLabel->SetUrl(m_model->GetDirectoryLink(modelIndex)); @@ -175,8 +179,8 @@ namespace O3DE::ProjectManager licenseHLayout->setAlignment(Qt::AlignLeft); m_mainLayout->addLayout(licenseHLayout); - QLabel* licenseLabel = CreateStyledLabel(licenseHLayout, s_baseFontSize, s_headerColor); - licenseLabel->setText(tr("License: ")); + m_licenseLabel = CreateStyledLabel(licenseHLayout, s_baseFontSize, s_headerColor); + m_licenseLabel->setText(tr("License: ")); m_licenseLinkLabel = new LinkLabel("", QUrl(), s_baseFontSize); licenseHLayout->addWidget(m_licenseLinkLabel); diff --git a/Code/Tools/ProjectManager/Source/GemCatalog/GemInspector.h b/Code/Tools/ProjectManager/Source/GemCatalog/GemInspector.h index 6a5de17fcd..1713191623 100644 --- a/Code/Tools/ProjectManager/Source/GemCatalog/GemInspector.h +++ b/Code/Tools/ProjectManager/Source/GemCatalog/GemInspector.h @@ -64,6 +64,7 @@ namespace O3DE::ProjectManager QLabel* m_nameLabel = nullptr; QLabel* m_creatorLabel = nullptr; QLabel* m_summaryLabel = nullptr; + QLabel* m_licenseLabel = nullptr; LinkLabel* m_licenseLinkLabel = nullptr; LinkLabel* m_directoryLinkLabel = nullptr; LinkLabel* m_documentationLinkLabel = nullptr; From c73417a9c135e7788d10c1ca57a1a916a2d8c17b Mon Sep 17 00:00:00 2001 From: Allen Jackson <23512001+jackalbe@users.noreply.github.com> Date: Tue, 16 Nov 2021 12:21:33 -0600 Subject: [PATCH 034/345] {lyn7352} adding more logging to mock asset builder test (#5591) * {lyn7352} adding more logging to mock asset builder test Signed-off-by: Allen Jackson <23512001+jackalbe@users.noreply.github.com> * put the guts of the test case into an event callback Signed-off-by: Allen Jackson <23512001+jackalbe@users.noreply.github.com> --- .../AssetBuilder_test_case.py | 84 +++++++++++-------- 1 file changed, 48 insertions(+), 36 deletions(-) diff --git a/AutomatedTesting/Gem/PythonTests/PythonAssetBuilder/AssetBuilder_test_case.py b/AutomatedTesting/Gem/PythonTests/PythonAssetBuilder/AssetBuilder_test_case.py index 8d418222ce..112fd013bf 100644 --- a/AutomatedTesting/Gem/PythonTests/PythonAssetBuilder/AssetBuilder_test_case.py +++ b/AutomatedTesting/Gem/PythonTests/PythonAssetBuilder/AssetBuilder_test_case.py @@ -8,42 +8,54 @@ import azlmbr.bus import azlmbr.asset import azlmbr.editor import azlmbr.math -import azlmbr.legacy.general -def raise_and_stop(msg): - print (msg) +print('Starting mock asset tests') +handler = azlmbr.editor.EditorEventBusHandler() + +def on_notify_editor_initialized(args): + # These tests are meant to check that the test_asset.mock source asset turned into + # a test_asset.mock_asset product asset via the Python asset builder system + mockAssetType = azlmbr.math.Uuid_CreateString('{9274AD17-3212-4651-9F3B-7DCCB080E467}', 0) + mockAssetPath = 'gem/pythontests/pythonassetbuilder/test_asset.mock_asset' + assetId = azlmbr.asset.AssetCatalogRequestBus(azlmbr.bus.Broadcast, 'GetAssetIdByPath', mockAssetPath, mockAssetType, False) + if (assetId.is_valid() is False): + print(f'Mock AssetId is not valid! Got {assetId.to_string()} instead') + else: + print(f'Mock AssetId is valid!') + + assetIdString = assetId.to_string() + if (assetIdString.endswith(':528cca58') is False): + print(f'Mock AssetId {assetIdString} has unexpected sub-id for {mockAssetPath}!') + else: + print(f'Mock AssetId has expected sub-id for {mockAssetPath}!') + + print ('Mock asset exists') + + # These tests detect if the geom_group.fbx file turns into a number of azmodel product assets + def test_azmodel_product(generatedModelAssetPath): + azModelAssetType = azlmbr.math.Uuid_CreateString('{2C7477B6-69C5-45BE-8163-BCD6A275B6D8}', 0) + assetId = azlmbr.asset.AssetCatalogRequestBus(azlmbr.bus.Broadcast, 'GetAssetIdByPath', generatedModelAssetPath, azModelAssetType, False) + assetIdString = assetId.to_string() + if (assetId.is_valid()): + print(f'AssetId found for asset ({generatedModelAssetPath}) found') + else: + print(f'Asset at path {generatedModelAssetPath} has unexpected asset ID ({assetIdString})!') + + test_azmodel_product('gem/pythontests/pythonassetbuilder/geom_group_fbx_cube_100cm_z_positive_1.azmodel') + test_azmodel_product('gem/pythontests/pythonassetbuilder/geom_group_fbx_cube_100cm_z_negative_1.azmodel') + test_azmodel_product('gem/pythontests/pythonassetbuilder/geom_group_fbx_cube_100cm_y_positive_1.azmodel') + test_azmodel_product('gem/pythontests/pythonassetbuilder/geom_group_fbx_cube_100cm_y_negative_1.azmodel') + test_azmodel_product('gem/pythontests/pythonassetbuilder/geom_group_fbx_cube_100cm_x_positive_1.azmodel') + test_azmodel_product('gem/pythontests/pythonassetbuilder/geom_group_fbx_cube_100cm_x_negative_1.azmodel') + test_azmodel_product('gem/pythontests/pythonassetbuilder/geom_group_fbx_cube_100cm_center_1.azmodel') + + # clear up notification handler + global handler + handler.disconnect() + handler = None + + print('Finished mock asset tests') azlmbr.editor.EditorToolsApplicationRequestBus(azlmbr.bus.Broadcast, 'ExitNoPrompt') -# These tests are meant to check that the test_asset.mock source asset turned into -# a test_asset.mock_asset product asset via the Python asset builder system -mockAssetType = azlmbr.math.Uuid_CreateString('{9274AD17-3212-4651-9F3B-7DCCB080E467}', 0) -mockAssetPath = 'gem/pythontests/pythonassetbuilder/test_asset.mock_asset' -assetId = azlmbr.asset.AssetCatalogRequestBus(azlmbr.bus.Broadcast, 'GetAssetIdByPath', mockAssetPath, mockAssetType, False) -if (assetId.is_valid() is False): - raise_and_stop(f'Mock AssetId is not valid! Got {assetId.to_string()} instead') - -assetIdString = assetId.to_string() -if (assetIdString.endswith(':528cca58') is False): - raise_and_stop(f'Mock AssetId {assetIdString} has unexpected sub-id for {mockAssetPath}!') - -print ('Mock asset exists') - -# These tests detect if the geom_group.fbx file turns into a number of azmodel product assets -def test_azmodel_product(generatedModelAssetPath): - azModelAssetType = azlmbr.math.Uuid_CreateString('{2C7477B6-69C5-45BE-8163-BCD6A275B6D8}', 0) - assetId = azlmbr.asset.AssetCatalogRequestBus(azlmbr.bus.Broadcast, 'GetAssetIdByPath', generatedModelAssetPath, azModelAssetType, False) - assetIdString = assetId.to_string() - if (assetId.is_valid()): - print(f'AssetId found for asset ({generatedModelAssetPath}) found') - else: - raise_and_stop(f'Asset at path {generatedModelAssetPath} has unexpected asset ID ({assetIdString})!') - -test_azmodel_product('gem/pythontests/pythonassetbuilder/geom_group_fbx_cube_100cm_z_positive_1.azmodel') -test_azmodel_product('gem/pythontests/pythonassetbuilder/geom_group_fbx_cube_100cm_z_negative_1.azmodel') -test_azmodel_product('gem/pythontests/pythonassetbuilder/geom_group_fbx_cube_100cm_y_positive_1.azmodel') -test_azmodel_product('gem/pythontests/pythonassetbuilder/geom_group_fbx_cube_100cm_y_negative_1.azmodel') -test_azmodel_product('gem/pythontests/pythonassetbuilder/geom_group_fbx_cube_100cm_x_positive_1.azmodel') -test_azmodel_product('gem/pythontests/pythonassetbuilder/geom_group_fbx_cube_100cm_x_negative_1.azmodel') -test_azmodel_product('gem/pythontests/pythonassetbuilder/geom_group_fbx_cube_100cm_center_1.azmodel') - -azlmbr.editor.EditorToolsApplicationRequestBus(azlmbr.bus.Broadcast, 'ExitNoPrompt') +handler.connect() +handler.add_callback('NotifyEditorInitialized', on_notify_editor_initialized) From d468cbad85b864d2ca0a97621ea83c4e458c106f Mon Sep 17 00:00:00 2001 From: Junbo Liang <68558268+junbo75@users.noreply.github.com> Date: Tue, 16 Nov 2021 10:33:57 -0800 Subject: [PATCH 035/345] AWS Core CDK: Add option to cleanup resources that are retained by default (#5470) (#5618) * Add option to cleanup resources that are retained by default Signed-off-by: Pip Potter <61438964+lmbr-pip@users.noreply.github.com> --- Gems/AWSCore/cdk/README.md | 16 ++++++++++++++++ Gems/AWSCore/cdk/core/core_stack.py | 10 +++++++++- .../cdk/example/example_resources_stack.py | 11 +++++++++++ .../Platform/Windows/deploy_cdk_applications.cmd | 4 ++-- 4 files changed, 38 insertions(+), 3 deletions(-) diff --git a/Gems/AWSCore/cdk/README.md b/Gems/AWSCore/cdk/README.md index d50ca40279..644c22d36b 100644 --- a/Gems/AWSCore/cdk/README.md +++ b/Gems/AWSCore/cdk/README.md @@ -65,6 +65,22 @@ them to your `setup.py` file and rerun the `pip install -r requirements.txt` command. ## Optional Features + +Optional features are activated by passing [runtime context variables](https://docs.aws.amazon.com/cdk/latest/guide/context.html). To use multiple optional features together provide one key-value pair at a time: +``` +cdk synth --context key1=value1 --context key2=value2 MyStack +``` + +### Automatic S3 and DynamoDB Cleanup +The S3 bucket and Dynamodb created by the sample will be left behind as the CDK defaults to retaining such storage (both have default policies to retain resources on destroy). To delete +the storage resources created when using CDK destroy, use the following commands to synthesize and destroy the CDK application. +``` +cdk synth -c remove_all_storage_on_destroy=true --all +cdk deploy -c remove_all_storage_on_destroy=true --all +cdk destroy --all +``` + +### Server Access Logging Server access logging is enabled by default. To disable the feature, use the following commands to synthesize and deploy this CDK application. ``` diff --git a/Gems/AWSCore/cdk/core/core_stack.py b/Gems/AWSCore/cdk/core/core_stack.py index c124cb72ab..4124b7b566 100755 --- a/Gems/AWSCore/cdk/core/core_stack.py +++ b/Gems/AWSCore/cdk/core/core_stack.py @@ -86,13 +86,21 @@ class CoreStack(core.Stack): # Create an S3 bucket for Amazon S3 server access logging # See https://docs.aws.amazon.com/AmazonS3/latest/dev/security-best-practices.html if self.node.try_get_context('disable_access_log') != 'true': + + # Auto cleanup bucket and data if requested + _remove_storage = self.node.try_get_context('remove_all_storage_on_destroy') == 'true' + _removal_policy = core.RemovalPolicy.DESTROY if _remove_storage else core.RemovalPolicy.RETAIN + self._server_access_logs_bucket = s3.Bucket( self, f'{self._project_name}-{self._feature_name}-Access-Log-Bucket', + access_control=s3.BucketAccessControl.LOG_DELIVERY_WRITE, + auto_delete_objects = _remove_storage, block_public_access=s3.BlockPublicAccess.BLOCK_ALL, encryption=s3.BucketEncryption.S3_MANAGED, - access_control=s3.BucketAccessControl.LOG_DELIVERY_WRITE + removal_policy=_removal_policy ) + self._server_access_logs_bucket.grant_read(self._admin_group) # Export access log bucket name diff --git a/Gems/AWSCore/cdk/example/example_resources_stack.py b/Gems/AWSCore/cdk/example/example_resources_stack.py index ac229cb313..6a67ed9406 100755 --- a/Gems/AWSCore/cdk/example/example_resources_stack.py +++ b/Gems/AWSCore/cdk/example/example_resources_stack.py @@ -126,11 +126,17 @@ class ExampleResources(core.Stack): core.Fn.import_value(f"{self._project_name}:ServerAccessLogsBucket") ) + # Auto cleanup bucket and data if requested + _remove_storage = self.node.try_get_context('remove_all_storage_on_destroy') == 'true' + _removal_policy = core.RemovalPolicy.DESTROY if _remove_storage else core.RemovalPolicy.RETAIN + example_bucket = s3.Bucket( self, f'{self._project_name}-{self._feature_name}-Example-S3bucket', + auto_delete_objects=_remove_storage, block_public_access=s3.BlockPublicAccess.BLOCK_ALL, encryption=s3.BucketEncryption.S3_MANAGED, + removal_policy=_removal_policy, server_access_logs_bucket= server_access_logs_bucket if server_access_logs_bucket else None, server_access_logs_prefix= @@ -170,6 +176,11 @@ class ExampleResources(core.Stack): type=dynamo.AttributeType.STRING ) ) + + # Auto-delete the table when requested + if self.node.try_get_context('remove_all_storage_on_destroy') == 'true': + demo_table.apply_removal_policy(core.RemovalPolicy.DESTROY) + return demo_table def __create_outputs(self) -> None: diff --git a/scripts/build/Platform/Windows/deploy_cdk_applications.cmd b/scripts/build/Platform/Windows/deploy_cdk_applications.cmd index 006e0158c0..f3d68d2fe8 100644 --- a/scripts/build/Platform/Windows/deploy_cdk_applications.cmd +++ b/scripts/build/Platform/Windows/deploy_cdk_applications.cmd @@ -7,7 +7,7 @@ REM SPDX-License-Identifier: Apache-2.0 OR MIT REM REM -REM Deploy the CDK applcations for AWS gems (Windows only) +REM Deploy the CDK applications for AWS gems (Windows only) REM Prerequisites: REM 1) Node.js is installed REM 2) Node.js version >= 10.13.0, except for versions 13.0.0 - 13.6.0. A version in active long-term support is recommended. @@ -57,7 +57,7 @@ IF ERRORLEVEL 1 ( exit /b 1 ) -CALL :DeployCDKApplication AWSCore "-c disable_access_log=true --all" +CALL :DeployCDKApplication AWSCore "-c disable_access_log=true -c remove_all_storage_on_destroy=true --all" IF ERRORLEVEL 1 ( exit /b 1 ) From 9f7815fa0405a42b78cdd2709aae0f10eb2c8531 Mon Sep 17 00:00:00 2001 From: santorac <55155825+santorac@users.noreply.github.com> Date: Tue, 16 Nov 2021 10:35:49 -0800 Subject: [PATCH 036/345] Fixed up a couple incorrectly or incompletely resolved merge conflicts. Signed-off-by: santorac <55155825+santorac@users.noreply.github.com> --- .../Include/AtomToolsFramework/Util/MaterialPropertyUtil.h | 1 + .../Code/Source/Util/MaterialPropertyUtil.cpp | 3 ++- .../MaterialEditor/Code/Source/Document/MaterialDocument.cpp | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Util/MaterialPropertyUtil.h b/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Util/MaterialPropertyUtil.h index 08f59f9e0b..d27f2403a1 100644 --- a/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Util/MaterialPropertyUtil.h +++ b/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Util/MaterialPropertyUtil.h @@ -49,6 +49,7 @@ namespace AtomToolsFramework //! @param propertyValue the value being converted before saving bool ConvertToExportFormat( const AZStd::string& exportPath, + [[maybe_unused]] const AZ::Name& propertyId, const AZ::RPI::MaterialTypeSourceData::PropertyDefinition& propertyDefinition, AZ::RPI::MaterialPropertyValue& propertyValue); diff --git a/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Util/MaterialPropertyUtil.cpp b/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Util/MaterialPropertyUtil.cpp index c49cd3fafb..8fe7115488 100644 --- a/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Util/MaterialPropertyUtil.cpp +++ b/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Util/MaterialPropertyUtil.cpp @@ -167,6 +167,7 @@ namespace AtomToolsFramework bool ConvertToExportFormat( const AZStd::string& exportPath, + [[maybe_unused]] const AZ::Name& propertyId, const AZ::RPI::MaterialTypeSourceData::PropertyDefinition& propertyDefinition, AZ::RPI::MaterialPropertyValue& propertyValue) { @@ -175,7 +176,7 @@ namespace AtomToolsFramework const uint32_t index = propertyValue.GetValue(); if (index >= propertyDefinition.m_enumValues.size()) { - AZ_Error("AtomToolsFramework", false, "Invalid value for material enum property: '%s'.", propertyDefinition.m_name.c_str()); + AZ_Error("AtomToolsFramework", false, "Invalid value for material enum property: '%s'.", propertyId.GetCStr()); return false; } diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Source/Document/MaterialDocument.cpp b/Gems/Atom/Tools/MaterialEditor/Code/Source/Document/MaterialDocument.cpp index 4ac0b745fd..2d7768feec 100644 --- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Document/MaterialDocument.cpp +++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Document/MaterialDocument.cpp @@ -759,7 +759,7 @@ namespace MaterialEditor } auto parentMaterialAssetResult = parentMaterialSourceData.CreateMaterialAssetFromSourceData( - parentMaterialAssetIdResult.GetValue(), parentMaterialFilePath, true, true); + parentMaterialAssetIdResult.GetValue(), m_materialSourceData.m_parentMaterial, true, true); if (!parentMaterialAssetResult) { AZ_Error("MaterialDocument", false, "Material parent asset could not be created from source data: '%s'.", m_materialSourceData.m_parentMaterial.c_str()); From ebc92c5b088c28263a5aab091ced3c0f4aa4f7e5 Mon Sep 17 00:00:00 2001 From: santorac <55155825+santorac@users.noreply.github.com> Date: Tue, 16 Nov 2021 10:52:03 -0800 Subject: [PATCH 037/345] Restored a bit of error checking that appears to have been removed by mistake, in MaterialPropertyUtil ConvertToExportFormat(). This is important for the missing texture use cases, because this error checking is what will prevent the Material Editor from silently replacing a broken texture reference with no texture reference. Signed-off-by: santorac <55155825+santorac@users.noreply.github.com> --- .../Code/Source/Util/MaterialPropertyUtil.cpp | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Util/MaterialPropertyUtil.cpp b/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Util/MaterialPropertyUtil.cpp index 8fe7115488..91e3d5c2f0 100644 --- a/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Util/MaterialPropertyUtil.cpp +++ b/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Util/MaterialPropertyUtil.cpp @@ -187,18 +187,27 @@ namespace AtomToolsFramework // Image asset references must be converted from asset IDs to a relative source file path if (propertyDefinition.m_dataType == AZ::RPI::MaterialPropertyDataType::Image) { + AZStd::string imagePath; + if (propertyValue.Is>()) { const auto& imageAsset = propertyValue.GetValue>(); - const auto& imagePath = AZ::RPI::AssetUtils::GetSourcePathByAssetId(imageAsset.GetId()); - propertyValue = GetExteralReferencePath(exportPath, imagePath); - return true; + imagePath = AZ::RPI::AssetUtils::GetSourcePathByAssetId(imageAsset.GetId()); } if (propertyValue.Is>()) { const auto& image = propertyValue.GetValue>(); - const auto& imagePath = image ? AZ::RPI::AssetUtils::GetSourcePathByAssetId(image->GetAssetId()) : ""; + imagePath = image ? AZ::RPI::AssetUtils::GetSourcePathByAssetId(image->GetAssetId()) : ""; + } + + if (imagePath.empty()) + { + AZ_Error("AtomToolsFramework", false, "Image asset could not be found for property: '%s'.", propertyId.GetCStr()); + return false; + } + else + { propertyValue = GetExteralReferencePath(exportPath, imagePath); return true; } From dd1d515e37d4692e587c21df43a674c7134ad43b Mon Sep 17 00:00:00 2001 From: mrieggeramzn <61609885+mrieggeramzn@users.noreply.github.com> Date: Tue, 16 Nov 2021 11:08:25 -0800 Subject: [PATCH 038/345] Atom/mriegger/normaloffsetbiasarealight (#4917) * Adding directional light shadow bias * Adding normal offset bias for projected shadows Signed-off-by: mrieggeramzn --- .../Atom/Features/Shadow/ProjectedShadow.azsli | 9 ++++++++- .../DiskLightFeatureProcessorInterface.h | 2 ++ .../PointLightFeatureProcessorInterface.h | 2 ++ .../CoreLights/DiskLightFeatureProcessor.cpp | 5 +++++ .../CoreLights/DiskLightFeatureProcessor.h | 1 + .../CoreLights/PointLightFeatureProcessor.cpp | 5 +++++ .../CoreLights/PointLightFeatureProcessor.h | 1 + .../ProjectedShadowFeatureProcessor.cpp | 5 +++-- .../Shadows/ProjectedShadowFeatureProcessor.h | 3 +-- .../CommonFeatures/CoreLights/AreaLightBus.h | 7 +++++++ .../CoreLights/AreaLightComponentConfig.h | 1 + .../CoreLights/AreaLightComponentConfig.cpp | 1 + .../AreaLightComponentController.cpp | 18 ++++++++++++++++++ .../CoreLights/AreaLightComponentController.h | 2 ++ .../Source/CoreLights/DiskLightDelegate.cpp | 8 ++++++++ .../Code/Source/CoreLights/DiskLightDelegate.h | 1 + .../CoreLights/EditorAreaLightComponent.cpp | 13 +++++++++++-- .../Code/Source/CoreLights/LightDelegateBase.h | 3 ++- .../Source/CoreLights/LightDelegateInterface.h | 2 ++ .../Source/CoreLights/SphereLightDelegate.cpp | 9 +++++++++ .../Source/CoreLights/SphereLightDelegate.h | 1 + 21 files changed, 91 insertions(+), 8 deletions(-) diff --git a/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/Shadow/ProjectedShadow.azsli b/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/Shadow/ProjectedShadow.azsli index daed3a2921..3b8379e7fa 100644 --- a/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/Shadow/ProjectedShadow.azsli +++ b/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/Shadow/ProjectedShadow.azsli @@ -14,6 +14,7 @@ #include #include "BicubicPcfFilters.azsli" #include "Shadow.azsli" +#include "NormalOffsetShadows.azsli" // ProjectedShadow calculates shadowed area projected from a light. class ProjectedShadow @@ -123,6 +124,7 @@ float ProjectedShadow::GetThickness(uint shadowIndex, float3 worldPosition) ProjectedShadow shadow; shadow.m_worldPosition = worldPosition; + shadow.m_normalVector = 0; // The normal vector is used to reduce acne, this is not an issue when using the shadowmap to determine thickness. shadow.m_shadowIndex = shadowIndex; shadow.SetShadowPosition(); return shadow.GetThickness(); @@ -317,8 +319,13 @@ bool ProjectedShadow::IsShadowed(float3 shadowPosition) void ProjectedShadow::SetShadowPosition() { + const float normalBias = ViewSrg::m_projectedShadows[m_shadowIndex].m_normalShadowBias; + const float shadowmapSize = ViewSrg::m_projectedFilterParams[m_shadowIndex].m_shadowmapSize; + const float3 shadowOffset = ComputeNormalShadowOffset(normalBias, m_normalVector, shadowmapSize); const float4x4 depthBiasMatrix = ViewSrg::m_projectedShadows[m_shadowIndex].m_depthBiasMatrix; - float4 shadowPositionHomogeneous = mul(depthBiasMatrix, float4(m_worldPosition, 1)); + + float4 shadowPositionHomogeneous = mul(depthBiasMatrix, float4(m_worldPosition + shadowOffset, 1)); + m_shadowPosition = shadowPositionHomogeneous.xyz / shadowPositionHomogeneous.w; m_bias = ViewSrg::m_projectedShadows[m_shadowIndex].m_bias / shadowPositionHomogeneous.w; diff --git a/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/CoreLights/DiskLightFeatureProcessorInterface.h b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/CoreLights/DiskLightFeatureProcessorInterface.h index 5aa2dfb800..98220fae15 100644 --- a/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/CoreLights/DiskLightFeatureProcessorInterface.h +++ b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/CoreLights/DiskLightFeatureProcessorInterface.h @@ -86,6 +86,8 @@ namespace AZ virtual void SetShadowsEnabled(LightHandle handle, bool enabled) = 0; //! Sets the shadow bias virtual void SetShadowBias(LightHandle handle, float bias) = 0; + //! Sets the normal shadow bias + virtual void SetNormalShadowBias(LightHandle handle, float bias) = 0; //! Sets the shadowmap size (width and height) of the light. virtual void SetShadowmapMaxResolution(LightHandle handle, ShadowmapSize shadowmapSize) = 0; //! Specifies filter method of shadows. diff --git a/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/CoreLights/PointLightFeatureProcessorInterface.h b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/CoreLights/PointLightFeatureProcessorInterface.h index 1a5a776cdf..52b1402b24 100644 --- a/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/CoreLights/PointLightFeatureProcessorInterface.h +++ b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/CoreLights/PointLightFeatureProcessorInterface.h @@ -74,6 +74,8 @@ namespace AZ virtual void SetFilteringSampleCount(LightHandle handle, uint16_t count) = 0; //! Sets the Esm exponent to use. Higher values produce a steeper falloff in the border areas between light and shadow. virtual void SetEsmExponent(LightHandle handle, float exponent) = 0; + //! Sets the normal shadow bias. Reduces acne by biasing the shadowmap lookup along the geometric normal. + virtual void SetNormalShadowBias(LightHandle handle, float bias) = 0; //! Sets all of the the point data for the provided LightHandle. virtual void SetPointData(LightHandle handle, const PointLightData& data) = 0; }; diff --git a/Gems/Atom/Feature/Common/Code/Source/CoreLights/DiskLightFeatureProcessor.cpp b/Gems/Atom/Feature/Common/Code/Source/CoreLights/DiskLightFeatureProcessor.cpp index acf81ede32..e362ee3afc 100644 --- a/Gems/Atom/Feature/Common/Code/Source/CoreLights/DiskLightFeatureProcessor.cpp +++ b/Gems/Atom/Feature/Common/Code/Source/CoreLights/DiskLightFeatureProcessor.cpp @@ -313,6 +313,11 @@ namespace AZ SetShadowSetting(handle, &ProjectedShadowFeatureProcessor::SetShadowBias, bias); } + void DiskLightFeatureProcessor::SetNormalShadowBias(LightHandle handle, float bias) + { + SetShadowSetting(handle, &ProjectedShadowFeatureProcessor::SetNormalShadowBias, bias); + } + void DiskLightFeatureProcessor::SetShadowmapMaxResolution(LightHandle handle, ShadowmapSize shadowmapSize) { SetShadowSetting(handle, &ProjectedShadowFeatureProcessor::SetShadowmapMaxResolution, shadowmapSize); diff --git a/Gems/Atom/Feature/Common/Code/Source/CoreLights/DiskLightFeatureProcessor.h b/Gems/Atom/Feature/Common/Code/Source/CoreLights/DiskLightFeatureProcessor.h index 275712f84f..bafddacc65 100644 --- a/Gems/Atom/Feature/Common/Code/Source/CoreLights/DiskLightFeatureProcessor.h +++ b/Gems/Atom/Feature/Common/Code/Source/CoreLights/DiskLightFeatureProcessor.h @@ -51,6 +51,7 @@ namespace AZ void SetConeAngles(LightHandle handle, float innerDegrees, float outerDegrees) override; void SetShadowsEnabled(LightHandle handle, bool enabled) override; void SetShadowBias(LightHandle handle, float bias) override; + void SetNormalShadowBias(LightHandle handle, float bias) override; void SetShadowmapMaxResolution(LightHandle handle, ShadowmapSize shadowmapSize) override; void SetShadowFilterMethod(LightHandle handle, ShadowFilterMethod method) override; void SetFilteringSampleCount(LightHandle handle, uint16_t count) override; diff --git a/Gems/Atom/Feature/Common/Code/Source/CoreLights/PointLightFeatureProcessor.cpp b/Gems/Atom/Feature/Common/Code/Source/CoreLights/PointLightFeatureProcessor.cpp index dcf412c35d..c5d6c3bf78 100644 --- a/Gems/Atom/Feature/Common/Code/Source/CoreLights/PointLightFeatureProcessor.cpp +++ b/Gems/Atom/Feature/Common/Code/Source/CoreLights/PointLightFeatureProcessor.cpp @@ -302,5 +302,10 @@ namespace AZ SetShadowSetting(handle, &ProjectedShadowFeatureProcessor::SetEsmExponent, esmExponent); } + void PointLightFeatureProcessor::SetNormalShadowBias(LightHandle handle, float bias) + { + SetShadowSetting(handle, &ProjectedShadowFeatureProcessor::SetNormalShadowBias, bias); + } + } // namespace Render } // namespace AZ diff --git a/Gems/Atom/Feature/Common/Code/Source/CoreLights/PointLightFeatureProcessor.h b/Gems/Atom/Feature/Common/Code/Source/CoreLights/PointLightFeatureProcessor.h index 54cb0303cc..df97fa0a52 100644 --- a/Gems/Atom/Feature/Common/Code/Source/CoreLights/PointLightFeatureProcessor.h +++ b/Gems/Atom/Feature/Common/Code/Source/CoreLights/PointLightFeatureProcessor.h @@ -52,6 +52,7 @@ namespace AZ void SetShadowFilterMethod(LightHandle handle, ShadowFilterMethod method) override; void SetFilteringSampleCount(LightHandle handle, uint16_t count) override; void SetEsmExponent(LightHandle handle, float esmExponent) override; + void SetNormalShadowBias(LightHandle handle, float bias) override; void SetPointData(LightHandle handle, const PointLightData& data) override; const Data::Instance GetLightBuffer() const; diff --git a/Gems/Atom/Feature/Common/Code/Source/Shadows/ProjectedShadowFeatureProcessor.cpp b/Gems/Atom/Feature/Common/Code/Source/Shadows/ProjectedShadowFeatureProcessor.cpp index 70ccaa5702..c0cc93d7e0 100644 --- a/Gems/Atom/Feature/Common/Code/Source/Shadows/ProjectedShadowFeatureProcessor.cpp +++ b/Gems/Atom/Feature/Common/Code/Source/Shadows/ProjectedShadowFeatureProcessor.cpp @@ -155,8 +155,9 @@ namespace AZ::Render { AZ_Assert(id.IsValid(), "Invalid ShadowId passed to ProjectedShadowFeatureProcessor::SetNormalShadowBias()."); - ShadowProperty& shadowProperty = GetShadowPropertyFromShadowId(id); - shadowProperty.m_normalShadowBias = normalShadowBias; + ShadowData& shadowData = m_shadowData.GetElement(id.GetIndex()); + shadowData.m_normalShadowBias = normalShadowBias; + m_deviceBufferNeedsUpdate = true; } void ProjectedShadowFeatureProcessor::SetShadowmapMaxResolution(ShadowId id, ShadowmapSize size) diff --git a/Gems/Atom/Feature/Common/Code/Source/Shadows/ProjectedShadowFeatureProcessor.h b/Gems/Atom/Feature/Common/Code/Source/Shadows/ProjectedShadowFeatureProcessor.h index 8939f1845d..a892e77b7f 100644 --- a/Gems/Atom/Feature/Common/Code/Source/Shadows/ProjectedShadowFeatureProcessor.h +++ b/Gems/Atom/Feature/Common/Code/Source/Shadows/ProjectedShadowFeatureProcessor.h @@ -68,7 +68,7 @@ namespace AZ::Render uint32_t m_filteringSampleCount = 0; AZStd::array m_unprojectConstants = { {0, 0} }; float m_bias; - float m_normalShadowBias; + float m_normalShadowBias = 0; float m_esmExponent = 87.0f; float m_padding[3]; }; @@ -79,7 +79,6 @@ namespace AZ::Render ProjectedShadowDescriptor m_desc; RPI::ViewPtr m_shadowmapView; float m_bias = 0.1f; - float m_normalShadowBias = 0.0f; ShadowId m_shadowId; }; diff --git a/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/CoreLights/AreaLightBus.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/CoreLights/AreaLightBus.h index 72c4ef97a8..b9c62e6fe2 100644 --- a/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/CoreLights/AreaLightBus.h +++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/CoreLights/AreaLightBus.h @@ -132,6 +132,13 @@ namespace AZ //! Sets the Esm exponent. Higher values produce a steeper falloff between light and shadow. virtual void SetEsmExponent(float exponent) = 0; + //! Reduces acne by biasing the shadowmap lookup along the geometric normal. + //! @return Returns the amount of bias to apply. + virtual float GetNormalShadowBias() const = 0; + + //! Reduces acne by biasing the shadowmap lookup along the geometric normal. + //! @param normalShadowBias Sets the amount of normal shadow bias to apply. + virtual void SetNormalShadowBias(float normalShadowBias) = 0; }; //! The EBus for requests to for setting and getting light component properties. diff --git a/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/CoreLights/AreaLightComponentConfig.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/CoreLights/AreaLightComponentConfig.h index c76c922385..130e066e1a 100644 --- a/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/CoreLights/AreaLightComponentConfig.h +++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/CoreLights/AreaLightComponentConfig.h @@ -57,6 +57,7 @@ namespace AZ // Shadows (only used for supported shapes) bool m_enableShadow = false; float m_bias = 0.1f; + float m_normalShadowBias = 0.0f; ShadowmapSize m_shadowmapMaxSize = ShadowmapSize::Size256; ShadowFilterMethod m_shadowFilterMethod = ShadowFilterMethod::None; uint16_t m_filteringSampleCount = 12; diff --git a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/AreaLightComponentConfig.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/AreaLightComponentConfig.cpp index f0418a5024..91f8f1aa36 100644 --- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/AreaLightComponentConfig.cpp +++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/AreaLightComponentConfig.cpp @@ -34,6 +34,7 @@ namespace AZ // Shadows ->Field("Enable Shadow", &AreaLightComponentConfig::m_enableShadow) ->Field("Shadow Bias", &AreaLightComponentConfig::m_bias) + ->Field("Normal Shadow Bias", &AreaLightComponentConfig::m_normalShadowBias) ->Field("Shadowmap Max Size", &AreaLightComponentConfig::m_shadowmapMaxSize) ->Field("Shadow Filter Method", &AreaLightComponentConfig::m_shadowFilterMethod) ->Field("Filtering Sample Count", &AreaLightComponentConfig::m_filteringSampleCount) diff --git a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/AreaLightComponentController.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/AreaLightComponentController.cpp index 36cb2a7f5a..7668477690 100644 --- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/AreaLightComponentController.cpp +++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/AreaLightComponentController.cpp @@ -70,6 +70,8 @@ namespace AZ::Render ->Event("SetEnableShadow", &AreaLightRequestBus::Events::SetEnableShadow) ->Event("GetShadowBias", &AreaLightRequestBus::Events::GetShadowBias) ->Event("SetShadowBias", &AreaLightRequestBus::Events::SetShadowBias) + ->Event("GetNormalShadowBias", &AreaLightRequestBus::Events::GetNormalShadowBias) + ->Event("SetNormalShadowBias", &AreaLightRequestBus::Events::SetNormalShadowBias) ->Event("GetShadowmapMaxSize", &AreaLightRequestBus::Events::GetShadowmapMaxSize) ->Event("SetShadowmapMaxSize", &AreaLightRequestBus::Events::SetShadowmapMaxSize) ->Event("GetShadowFilterMethod", &AreaLightRequestBus::Events::GetShadowFilterMethod) @@ -91,6 +93,7 @@ namespace AZ::Render ->VirtualProperty("ShadowsEnabled", "GetEnableShadow", "SetEnableShadow") ->VirtualProperty("ShadowBias", "GetShadowBias", "SetShadowBias") + ->VirtualProperty("NormalShadowBias", "GetNormalShadowBias", "SetNormalShadowBias") ->VirtualProperty("ShadowmapMaxSize", "GetShadowmapMaxSize", "SetShadowmapMaxSize") ->VirtualProperty("ShadowFilterMethod", "GetShadowFilterMethod", "SetShadowFilterMethod") ->VirtualProperty("FilteringSampleCount", "GetFilteringSampleCount", "SetFilteringSampleCount") @@ -302,6 +305,7 @@ namespace AZ::Render if (m_configuration.m_enableShadow) { m_lightShapeDelegate->SetShadowBias(m_configuration.m_bias); + m_lightShapeDelegate->SetNormalShadowBias(m_configuration.m_normalShadowBias); m_lightShapeDelegate->SetShadowmapMaxSize(m_configuration.m_shadowmapMaxSize); m_lightShapeDelegate->SetShadowFilterMethod(m_configuration.m_shadowFilterMethod); m_lightShapeDelegate->SetFilteringSampleCount(m_configuration.m_filteringSampleCount); @@ -474,6 +478,20 @@ namespace AZ::Render } } + void AreaLightComponentController::SetNormalShadowBias(float bias) + { + m_configuration.m_normalShadowBias = bias; + if (m_lightShapeDelegate) + { + m_lightShapeDelegate->SetNormalShadowBias(bias); + } + } + + float AreaLightComponentController::GetNormalShadowBias() const + { + return m_configuration.m_normalShadowBias; + } + ShadowmapSize AreaLightComponentController::GetShadowmapMaxSize() const { return m_configuration.m_shadowmapMaxSize; diff --git a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/AreaLightComponentController.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/AreaLightComponentController.h index cc6223e7e5..81299a0372 100644 --- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/AreaLightComponentController.h +++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/AreaLightComponentController.h @@ -86,6 +86,8 @@ namespace AZ void SetFilteringSampleCount(uint32_t count) override; float GetEsmExponent() const override; void SetEsmExponent(float exponent) override; + float GetNormalShadowBias() const override; + void SetNormalShadowBias(float bias) override; void HandleDisplayEntityViewport( const AzFramework::ViewportInfo& viewportInfo, diff --git a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/DiskLightDelegate.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/DiskLightDelegate.cpp index dfb6cf6946..f060018099 100644 --- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/DiskLightDelegate.cpp +++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/DiskLightDelegate.cpp @@ -138,6 +138,14 @@ namespace AZ::Render } } + void DiskLightDelegate::SetNormalShadowBias(float bias) + { + if (GetShadowsEnabled() && GetLightHandle().IsValid()) + { + GetFeatureProcessor()->SetNormalShadowBias(GetLightHandle(), bias); + } + } + void DiskLightDelegate::SetShadowmapMaxSize(ShadowmapSize size) { if (GetShadowsEnabled() && GetLightHandle().IsValid()) diff --git a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/DiskLightDelegate.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/DiskLightDelegate.h index 2be782c69c..c19a8d37ae 100644 --- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/DiskLightDelegate.h +++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/DiskLightDelegate.h @@ -46,6 +46,7 @@ namespace AZ void SetShadowFilterMethod(ShadowFilterMethod method) override; void SetFilteringSampleCount(uint32_t count) override; void SetEsmExponent(float exponent) override; + void SetNormalShadowBias(float bias) override; private: diff --git a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/EditorAreaLightComponent.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/EditorAreaLightComponent.cpp index db46434d9a..02c9f77436 100644 --- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/EditorAreaLightComponent.cpp +++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/EditorAreaLightComponent.cpp @@ -136,7 +136,7 @@ namespace AZ ->Attribute(Edit::Attributes::Min, 0.0f) ->Attribute(Edit::Attributes::Max, 100.0f) ->Attribute(Edit::Attributes::SoftMin, 0.0f) - ->Attribute(Edit::Attributes::SoftMax, 2.0f) + ->Attribute(Edit::Attributes::SoftMax, 10.0f) ->Attribute(Edit::Attributes::ChangeNotify, Edit::PropertyRefreshLevels::ValuesOnly) ->Attribute(Edit::Attributes::Visibility, &AreaLightComponentConfig::SupportsShadows) ->Attribute(Edit::Attributes::ReadOnly, &AreaLightComponentConfig::ShadowsDisabled) @@ -171,7 +171,16 @@ namespace AZ ->Attribute(Edit::Attributes::ChangeNotify, Edit::PropertyRefreshLevels::ValuesOnly) ->Attribute(Edit::Attributes::Visibility, &AreaLightComponentConfig::SupportsShadows) ->Attribute(Edit::Attributes::ReadOnly, &AreaLightComponentConfig::IsEsmDisabled) - ; + ->DataElement( + Edit::UIHandlers::Slider, &AreaLightComponentConfig::m_normalShadowBias, "Normal Shadow Bias\n", + "Reduces acne by biasing the shadowmap lookup along the geometric normal.\n" + "If this is 0, no biasing is applied.") + ->Attribute(Edit::Attributes::Min, 0.f) + ->Attribute(Edit::Attributes::Max, 10.0f) + ->Attribute(Edit::Attributes::ChangeNotify, Edit::PropertyRefreshLevels::ValuesOnly) + ->Attribute(Edit::Attributes::Visibility, &AreaLightComponentConfig::SupportsShadows) + ->Attribute(Edit::Attributes::ReadOnly, &AreaLightComponentConfig::ShadowsDisabled) + ; } } diff --git a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/LightDelegateBase.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/LightDelegateBase.h index 336c67f55d..8b096b0367 100644 --- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/LightDelegateBase.h +++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/LightDelegateBase.h @@ -58,7 +58,8 @@ namespace AZ void SetShadowFilterMethod([[maybe_unused]] ShadowFilterMethod method) override {}; void SetFilteringSampleCount([[maybe_unused]] uint32_t count) override {}; void SetEsmExponent([[maybe_unused]] float esmExponent) override{}; - + void SetNormalShadowBias([[maybe_unused]] float bias) override{}; + protected: void InitBase(EntityId entityId); diff --git a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/LightDelegateInterface.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/LightDelegateInterface.h index 9bb8188898..40ffaf392d 100644 --- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/LightDelegateInterface.h +++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/LightDelegateInterface.h @@ -79,6 +79,8 @@ namespace AZ virtual void SetFilteringSampleCount(uint32_t count) = 0; //! Sets the Esm exponent to use. Higher values produce a steeper falloff between light and shadow. virtual void SetEsmExponent(float exponent) = 0; + //! Sets the normal bias. Reduces acne by biasing the shadowmap lookup along the geometric normal. + virtual void SetNormalShadowBias(float bias) = 0; }; } // namespace Render } // namespace AZ diff --git a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/SphereLightDelegate.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/SphereLightDelegate.cpp index 661b0c6b25..f2e1f41008 100644 --- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/SphereLightDelegate.cpp +++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/SphereLightDelegate.cpp @@ -107,4 +107,13 @@ namespace AZ::Render GetFeatureProcessor()->SetEsmExponent(GetLightHandle(), esmExponent); } } + + void SphereLightDelegate::SetNormalShadowBias(float bias) + { + if (GetShadowsEnabled() && GetLightHandle().IsValid()) + { + GetFeatureProcessor()->SetNormalShadowBias(GetLightHandle(), bias); + } + } + } // namespace AZ::Render diff --git a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/SphereLightDelegate.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/SphereLightDelegate.h index 8bdee2442a..bad00e597c 100644 --- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/SphereLightDelegate.h +++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/SphereLightDelegate.h @@ -36,6 +36,7 @@ namespace AZ void SetShadowFilterMethod(ShadowFilterMethod method) override; void SetFilteringSampleCount(uint32_t count) override; void SetEsmExponent(float esmExponent) override; + void SetNormalShadowBias(float bias) override; private: From 265f624612fa41c4166c20bb6e7718a07914c368 Mon Sep 17 00:00:00 2001 From: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> Date: Tue, 16 Nov 2021 11:31:41 -0800 Subject: [PATCH 039/345] Detects runtime dependency cycles (#5634) * Detects runtime dependency cycles Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> * PR comments/suggestions Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> --- cmake/SettingsRegistry.cmake | 44 +++++++++++++++++++++++++++++++++++- 1 file changed, 43 insertions(+), 1 deletion(-) diff --git a/cmake/SettingsRegistry.cmake b/cmake/SettingsRegistry.cmake index c677aba7cf..e8c14ac8a0 100644 --- a/cmake/SettingsRegistry.cmake +++ b/cmake/SettingsRegistry.cmake @@ -33,6 +33,34 @@ set(gems_json_template [[ [=[ }]=] ) +#!ly_detect_cycle_through_visitation: Detects if there is a cycle based on a list of visited +# items. If the passed item is in the list, then there is a cycle. +# \arg:item - item being checked for the cycle +# \arg:visited_items - list of visited items +# \arg:visited_items_var - list of visited items variable, "item" will be added to the list +# \arg:cycle(variable) - empty string if there is no cycle (an empty string in cmake evaluates +# to false). If there is a cycle a cycle dependency string detailing the sequence of items +# that produce a cycle, e.g. A --> B --> C --> A +# +function(ly_detect_cycle_through_visitation item visited_items visited_items_var cycle) + if(item IN_LIST visited_items) + unset(dependency_cycle_loop) + foreach(visited_item IN LISTS visited_items) + string(APPEND dependency_cycle_loop ${visited_item}) + if(visited_item STREQUAL item) + string(APPEND dependency_cycle_loop " (cycle starts)") + endif() + string(APPEND dependency_cycle_loop " --> ") + endforeach() + string(APPEND dependency_cycle_loop "${item} (cycle ends)") + set(${cycle} "${dependency_cycle_loop}" PARENT_SCOPE) + else() + set(cycle "" PARENT_SCOPE) # no cycles + endif() + list(APPEND visited_items ${item}) + set(${visited_items_var} "${visited_items}" PARENT_SCOPE) +endfunction() + #!ly_get_gem_load_dependencies: Retrieves the list of "load" dependencies for a target # Visits through only MANUALLY_ADDED_DEPENDENCIES of targets with a GEM_MODULE property # to determine which gems a target needs to load @@ -44,6 +72,13 @@ function(ly_get_gem_load_dependencies ly_GEM_LOAD_DEPENDENCIES ly_TARGET) if(NOT TARGET ${ly_TARGET}) return() # Nothing to do endif() + # Internally we use a third parameter to pass the list of targets that we have traversed. This is + # used to detect runtime cycles + if(ARGC EQUAL 3) + set(ly_CYCLE_DETECTION_TARGETS ${ARGV2}) + else() + set(ly_CYCLE_DETECTION_TARGETS "") + endif() # Optimize the search by caching gem load dependencies get_property(are_dependencies_cached GLOBAL PROPERTY LY_GEM_LOAD_DEPENDENCIES_${ly_TARGET} SET) @@ -54,6 +89,13 @@ function(ly_get_gem_load_dependencies ly_GEM_LOAD_DEPENDENCIES ly_TARGET) return() endif() + # detect cycles + unset(cycle_detected) + ly_detect_cycle_through_visitation(${ly_TARGET} "${ly_CYCLE_DETECTION_TARGETS}" ly_CYCLE_DETECTION_TARGETS cycle_detected) + if(cycle_detected) + message(FATAL_ERROR "Runtime dependency detected: ${cycle_detected}") + endif() + unset(all_gem_load_dependencies) # For load dependencies, we want to copy over the dependency and traverse them @@ -69,7 +111,7 @@ function(ly_get_gem_load_dependencies ly_GEM_LOAD_DEPENDENCIES ly_TARGET) # and recurse into its manually added dependencies if (is_gem_target) unset(dependencies) - ly_get_gem_load_dependencies(dependencies ${dealias_load_dependency}) + ly_get_gem_load_dependencies(dependencies ${dealias_load_dependency} "${ly_CYCLE_DETECTION_TARGETS}") list(APPEND all_gem_load_dependencies ${dependencies}) list(APPEND all_gem_load_dependencies ${dealias_load_dependency}) endif() From 284a44d74c8b064967af8c07cd47a5edb4a63ef9 Mon Sep 17 00:00:00 2001 From: santorac <55155825+santorac@users.noreply.github.com> Date: Tue, 16 Nov 2021 11:45:26 -0800 Subject: [PATCH 040/345] Updated AssetUtils::ResolvePathReference to avoid "The second join parameter is an absolute path" warnings from StringFunc::Path::Join. Signed-off-by: santorac <55155825+santorac@users.noreply.github.com> --- Gems/Atom/RPI/Code/Source/RPI.Edit/Common/AssetUtils.cpp | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Gems/Atom/RPI/Code/Source/RPI.Edit/Common/AssetUtils.cpp b/Gems/Atom/RPI/Code/Source/RPI.Edit/Common/AssetUtils.cpp index c940ef808b..c779453c25 100644 --- a/Gems/Atom/RPI/Code/Source/RPI.Edit/Common/AssetUtils.cpp +++ b/Gems/Atom/RPI/Code/Source/RPI.Edit/Common/AssetUtils.cpp @@ -10,6 +10,7 @@ #include #include #include +#include namespace AZ { @@ -46,6 +47,12 @@ namespace AZ AZStd::string ResolvePathReference(const AZStd::string& originatingSourceFilePath, const AZStd::string& referencedSourceFilePath) { + // Prevents "second join parameter is an absolute path" warnings in StringFunc::Path::Join below + if (AZ::IO::PathView{referencedSourceFilePath}.IsAbsolute()) + { + return referencedSourceFilePath; + } + AZStd::string normalizedReferencedPath = referencedSourceFilePath; AzFramework::StringFunc::Path::Normalize(normalizedReferencedPath); From 5cf65012b1ca9d01defa769439e6a6cf1cf81f9d Mon Sep 17 00:00:00 2001 From: santorac <55155825+santorac@users.noreply.github.com> Date: Tue, 16 Nov 2021 12:31:33 -0800 Subject: [PATCH 041/345] Updated RPI.Edit's AssetUtils to use the same TraceLevel enum as RPI.Reflect's AssetUtils. This is now used in GetImageAssetReference to remove a redundant error message since the error is also reported in MaterialSourceData and MaterialTypeSourceData. Signed-off-by: santorac <55155825+santorac@users.noreply.github.com> --- .../Include/Atom/RPI.Edit/Common/AssetUtils.h | 36 ++++++++++--------- .../Source/RPI.Edit/Common/AssetUtils.cpp | 8 ++--- .../Material/MaterialTypeSourceData.cpp | 10 +++--- .../RPI.Edit/Material/MaterialUtils.cpp | 5 ++- 4 files changed, 33 insertions(+), 26 deletions(-) diff --git a/Gems/Atom/RPI/Code/Include/Atom/RPI.Edit/Common/AssetUtils.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Edit/Common/AssetUtils.h index bd11965ffa..f758019cfb 100644 --- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Edit/Common/AssetUtils.h +++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Edit/Common/AssetUtils.h @@ -12,6 +12,7 @@ #include #include +#include namespace AZ { @@ -21,21 +22,24 @@ namespace AZ { // Declarations... - Outcome MakeAssetId(const AZStd::string& sourcePath, uint32_t productSubId); + // Note that these functions default to TraceLevel::Error to preserve legacy behavior of these APIs. It would be nice to make the default match + // RPI.Reflect/Asset/AssetUtils.h which is TraceLevel::Warning, but we are close to a release so it isn't worth the risk at this time. - Outcome MakeAssetId(const AZStd::string& originatingSourcePath, const AZStd::string& referencedSourceFilePath, uint32_t productSubId); + Outcome MakeAssetId(const AZStd::string& sourcePath, uint32_t productSubId, TraceLevel reporting = TraceLevel::Error); + + Outcome MakeAssetId(const AZStd::string& originatingSourcePath, const AZStd::string& referencedSourceFilePath, uint32_t productSubId, TraceLevel reporting = TraceLevel::Error); template - Outcome> LoadAsset(const AZStd::string& sourcePath, uint32_t productSubId = 0); + Outcome> LoadAsset(const AZStd::string& sourcePath, uint32_t productSubId = 0, TraceLevel reporting = TraceLevel::Error); template - Outcome> LoadAsset(const AZStd::string& originatingSourcePath, const AZStd::string& referencedSourceFilePath, uint32_t productSubId = 0); + Outcome> LoadAsset(const AZStd::string& originatingSourcePath, const AZStd::string& referencedSourceFilePath, uint32_t productSubId = 0, TraceLevel reporting = TraceLevel::Error); template - Outcome> LoadAsset(const AZ::Data::AssetId& assetId, const char* sourcePathForDebug); + Outcome> LoadAsset(const AZ::Data::AssetId& assetId, const char* sourcePathForDebug, TraceLevel reporting = TraceLevel::Error); template - Outcome> LoadAsset(const AZ::Data::AssetId& assetId); + Outcome> LoadAsset(const AZ::Data::AssetId& assetId, TraceLevel reporting = TraceLevel::Error); //! Attempts to resolve the full path to a product asset given its ID AZStd::string GetProductPathByAssetId(const AZ::Data::AssetId& assetId); @@ -65,12 +69,12 @@ namespace AZ // Definitions... template - Outcome> LoadAsset(const AZStd::string& sourcePath, uint32_t productSubId) + Outcome> LoadAsset(const AZStd::string& sourcePath, uint32_t productSubId, TraceLevel reporting) { - auto assetId = MakeAssetId(sourcePath, productSubId); + auto assetId = MakeAssetId(sourcePath, productSubId, reporting); if (assetId.IsSuccess()) { - return LoadAsset(assetId.GetValue(), sourcePath.c_str()); + return LoadAsset(assetId.GetValue(), sourcePath.c_str(), reporting); } else { @@ -79,20 +83,20 @@ namespace AZ } template - Outcome> LoadAsset(const AZStd::string& originatingSourcePath, const AZStd::string& referencedSourceFilePath, uint32_t productSubId) + Outcome> LoadAsset(const AZStd::string& originatingSourcePath, const AZStd::string& referencedSourceFilePath, uint32_t productSubId, TraceLevel reporting) { AZStd::string resolvedPath = ResolvePathReference(originatingSourcePath, referencedSourceFilePath); - return LoadAsset(resolvedPath, productSubId); + return LoadAsset(resolvedPath, productSubId, reporting); } template - Outcome> LoadAsset(const AZ::Data::AssetId& assetId) + Outcome> LoadAsset(const AZ::Data::AssetId& assetId, TraceLevel reporting) { - return LoadAsset(assetId, nullptr); + return LoadAsset(assetId, nullptr, reporting); } template - Outcome> LoadAsset(const AZ::Data::AssetId& assetId, [[maybe_unused]] const char* sourcePathForDebug) + Outcome> LoadAsset(const AZ::Data::AssetId& assetId, [[maybe_unused]] const char* sourcePathForDebug, TraceLevel reporting) { if (nullptr == AZ::IO::FileIOBase::GetInstance()->GetAlias("@products@")) { @@ -111,11 +115,11 @@ namespace AZ } else { - AZ_Error("AssetUtils", false, "Could not load %s [Source='%s' Cache='%s' AssetID=%s] ", + AssetUtilsInternal::ReportIssue(reporting, AZStd::string::format("Could not load %s [Source='%s' Cache='%s' AssetID=%s] ", AzTypeInfo::Name(), sourcePathForDebug ? sourcePathForDebug : "", asset.GetHint().empty() ? "" : asset.GetHint().c_str(), - assetId.ToString().c_str()); + assetId.ToString().c_str()).c_str()); return AZ::Failure(); } diff --git a/Gems/Atom/RPI/Code/Source/RPI.Edit/Common/AssetUtils.cpp b/Gems/Atom/RPI/Code/Source/RPI.Edit/Common/AssetUtils.cpp index c779453c25..73c64b8015 100644 --- a/Gems/Atom/RPI/Code/Source/RPI.Edit/Common/AssetUtils.cpp +++ b/Gems/Atom/RPI/Code/Source/RPI.Edit/Common/AssetUtils.cpp @@ -120,7 +120,7 @@ namespace AZ return results; } - Outcome MakeAssetId(const AZStd::string& sourcePath, uint32_t productSubId) + Outcome MakeAssetId(const AZStd::string& sourcePath, uint32_t productSubId, TraceLevel reporting) { bool assetFound = false; AZ::Data::AssetInfo sourceInfo; @@ -129,7 +129,7 @@ namespace AZ if (!assetFound) { - AZ_Error("AssetUtils", false, "Could not find asset [%s]", sourcePath.c_str()); + AssetUtilsInternal::ReportIssue(reporting, AZStd::string::format("Could not find asset [%s]", sourcePath.c_str()).c_str()); return AZ::Failure(); } else @@ -138,10 +138,10 @@ namespace AZ } } - Outcome MakeAssetId(const AZStd::string& originatingSourcePath, const AZStd::string& referencedSourceFilePath, uint32_t productSubId) + Outcome MakeAssetId(const AZStd::string& originatingSourcePath, const AZStd::string& referencedSourceFilePath, uint32_t productSubId, TraceLevel reporting) { AZStd::string resolvedPath = ResolvePathReference(originatingSourcePath, referencedSourceFilePath); - return MakeAssetId(resolvedPath, productSubId); + return MakeAssetId(resolvedPath, productSubId, reporting); } } // namespace AssetUtils } // namespace RPI diff --git a/Gems/Atom/RPI/Code/Source/RPI.Edit/Material/MaterialTypeSourceData.cpp b/Gems/Atom/RPI/Code/Source/RPI.Edit/Material/MaterialTypeSourceData.cpp index c6fa4653c3..d8e6c156be 100644 --- a/Gems/Atom/RPI/Code/Source/RPI.Edit/Material/MaterialTypeSourceData.cpp +++ b/Gems/Atom/RPI/Code/Source/RPI.Edit/Material/MaterialTypeSourceData.cpp @@ -456,16 +456,16 @@ namespace AZ MaterialUtils::GetImageAssetResult result = MaterialUtils::GetImageAssetReference( imageAsset, materialTypeSourceFilePath, property.m_value.GetValue()); - if (result == MaterialUtils::GetImageAssetResult::Empty || result == MaterialUtils::GetImageAssetResult::Found) - { - materialTypeAssetCreator.SetPropertyValue(propertyId.GetFullName(), imageAsset); - } - else + if (result == MaterialUtils::GetImageAssetResult::Missing) { materialTypeAssetCreator.ReportError( "Material property '%s': Could not find the image '%s'", propertyId.GetFullName().GetCStr(), property.m_value.GetValue().data()); } + else + { + materialTypeAssetCreator.SetPropertyValue(propertyId.GetFullName(), imageAsset); + } } break; case MaterialPropertyDataType::Enum: diff --git a/Gems/Atom/RPI/Code/Source/RPI.Edit/Material/MaterialUtils.cpp b/Gems/Atom/RPI/Code/Source/RPI.Edit/Material/MaterialUtils.cpp index 2b51be736e..7fff8d81bc 100644 --- a/Gems/Atom/RPI/Code/Source/RPI.Edit/Material/MaterialUtils.cpp +++ b/Gems/Atom/RPI/Code/Source/RPI.Edit/Material/MaterialUtils.cpp @@ -39,7 +39,10 @@ namespace AZ } else { - Outcome imageAssetId = AssetUtils::MakeAssetId(materialSourceFilePath, imageFilePath, StreamingImageAsset::GetImageAssetSubId()); + // We use TraceLevel::None because fallback textures are available and we'll return GetImageAssetResult::Missing below in that case. + // Callers of GetImageAssetReference will be responsible for logging warnings or errors as needed. + + Outcome imageAssetId = AssetUtils::MakeAssetId(materialSourceFilePath, imageFilePath, StreamingImageAsset::GetImageAssetSubId(), AssetUtils::TraceLevel::None); if (!imageAssetId.IsSuccess()) { From 1aae84537dc6b908117916fd9a403a517ea28c3f Mon Sep 17 00:00:00 2001 From: nggieber Date: Tue, 16 Nov 2021 12:37:20 -0800 Subject: [PATCH 042/345] Makes project settings screen scrollable Signed-off-by: nggieber --- .../Source/ProjectSettingsScreen.cpp | 19 ++++++++++++++++--- .../Source/UpdateProjectSettingsScreen.cpp | 2 +- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/Code/Tools/ProjectManager/Source/ProjectSettingsScreen.cpp b/Code/Tools/ProjectManager/Source/ProjectSettingsScreen.cpp index 88ae3d6319..d4ac43d655 100644 --- a/Code/Tools/ProjectManager/Source/ProjectSettingsScreen.cpp +++ b/Code/Tools/ProjectManager/Source/ProjectSettingsScreen.cpp @@ -19,6 +19,7 @@ #include #include #include +#include namespace O3DE::ProjectManager { @@ -33,11 +34,23 @@ namespace O3DE::ProjectManager // if we don't set this in a frame (just use a sub-layout) all the content will align incorrectly horizontally QFrame* projectSettingsFrame = new QFrame(this); projectSettingsFrame->setObjectName("projectSettings"); - m_verticalLayout = new QVBoxLayout(); - // you cannot remove content margins in qss - m_verticalLayout->setContentsMargins(0, 0, 0, 0); + QVBoxLayout* vLayout = new QVBoxLayout(); + vLayout->setMargin(0); + vLayout->setAlignment(Qt::AlignTop); + projectSettingsFrame->setLayout(vLayout); + + QScrollArea* scrollArea = new QScrollArea(this); + scrollArea->setWidgetResizable(true); + vLayout->addWidget(scrollArea); + + QWidget* scrollWidget = new QWidget(this); + scrollArea->setWidget(scrollWidget); + + m_verticalLayout = new QVBoxLayout(); + m_verticalLayout->setMargin(0); m_verticalLayout->setAlignment(Qt::AlignTop); + scrollWidget->setLayout(m_verticalLayout); m_projectName = new FormLineEditWidget(tr("Project name"), "", this); connect(m_projectName->lineEdit(), &QLineEdit::textChanged, this, &ProjectSettingsScreen::OnProjectNameUpdated); diff --git a/Code/Tools/ProjectManager/Source/UpdateProjectSettingsScreen.cpp b/Code/Tools/ProjectManager/Source/UpdateProjectSettingsScreen.cpp index 3bfc07c5b0..a430102c27 100644 --- a/Code/Tools/ProjectManager/Source/UpdateProjectSettingsScreen.cpp +++ b/Code/Tools/ProjectManager/Source/UpdateProjectSettingsScreen.cpp @@ -35,7 +35,7 @@ namespace O3DE::ProjectManager previewExtrasLayout->setContentsMargins(50, 0, 0, 0); QLabel* projectPreviewLabel = new QLabel(tr("Select an image (PNG). Minimum %1 x %2 pixels.") - .arg(QString::number(ProjectPreviewImageWidth), QString::number(ProjectPreviewImageHeight))); + .arg(QString::number(ProjectPreviewImageWidth), QString::number(ProjectPreviewImageHeight))); projectPreviewLabel->setObjectName("projectPreviewLabel"); previewExtrasLayout->addWidget(projectPreviewLabel); From df36067ef3b291927fffbab7aeee79fbf95cab9d Mon Sep 17 00:00:00 2001 From: nggieber Date: Tue, 16 Nov 2021 13:22:52 -0800 Subject: [PATCH 043/345] Configure gems option added to projects button to go directly to gem catalog Signed-off-by: nggieber --- .../Source/EngineScreenCtrl.cpp | 7 +------ .../Source/ProjectButtonWidget.cpp | 1 + .../Source/ProjectButtonWidget.h | 1 + .../ProjectManager/Source/ProjectsScreen.cpp | 9 +++++++++ .../ProjectManager/Source/ProjectsScreen.h | 1 + .../ProjectManager/Source/ScreenWidget.h | 5 ++--- .../Source/UpdateProjectCtrl.cpp | 20 +++++++++++++++++++ .../ProjectManager/Source/UpdateProjectCtrl.h | 6 ++++-- 8 files changed, 39 insertions(+), 11 deletions(-) diff --git a/Code/Tools/ProjectManager/Source/EngineScreenCtrl.cpp b/Code/Tools/ProjectManager/Source/EngineScreenCtrl.cpp index 9d9110922f..1f41acd3d1 100644 --- a/Code/Tools/ProjectManager/Source/EngineScreenCtrl.cpp +++ b/Code/Tools/ProjectManager/Source/EngineScreenCtrl.cpp @@ -72,12 +72,7 @@ namespace O3DE::ProjectManager bool EngineScreenCtrl::ContainsScreen(ProjectManagerScreen screen) { - if (screen == m_engineSettingsScreen->GetScreenEnum() || screen == m_gemRepoScreen->GetScreenEnum()) - { - return true; - } - - return false; + return screen == m_engineSettingsScreen->GetScreenEnum() || screen == m_gemRepoScreen->GetScreenEnum(); } void EngineScreenCtrl::NotifyCurrentScreen() diff --git a/Code/Tools/ProjectManager/Source/ProjectButtonWidget.cpp b/Code/Tools/ProjectManager/Source/ProjectButtonWidget.cpp index 98916cccf6..2f4fe901bb 100644 --- a/Code/Tools/ProjectManager/Source/ProjectButtonWidget.cpp +++ b/Code/Tools/ProjectManager/Source/ProjectButtonWidget.cpp @@ -203,6 +203,7 @@ namespace O3DE::ProjectManager QMenu* menu = new QMenu(this); menu->addAction(tr("Edit Project Settings..."), this, [this]() { emit EditProject(m_projectInfo.m_path); }); + menu->addAction(tr("Configure Gems..."), this, [this]() { emit EditProjectGems(m_projectInfo.m_path); }); menu->addAction(tr("Build"), this, [this]() { emit BuildProject(m_projectInfo); }); menu->addAction(tr("Open CMake GUI..."), this, [this]() { emit OpenCMakeGUI(m_projectInfo); }); menu->addSeparator(); diff --git a/Code/Tools/ProjectManager/Source/ProjectButtonWidget.h b/Code/Tools/ProjectManager/Source/ProjectButtonWidget.h index 5e81dfc2d9..ccb644c458 100644 --- a/Code/Tools/ProjectManager/Source/ProjectButtonWidget.h +++ b/Code/Tools/ProjectManager/Source/ProjectButtonWidget.h @@ -95,6 +95,7 @@ namespace O3DE::ProjectManager signals: void OpenProject(const QString& projectName); void EditProject(const QString& projectName); + void EditProjectGems(const QString& projectName); void CopyProject(const ProjectInfo& projectInfo); void RemoveProject(const QString& projectName); void DeleteProject(const QString& projectName); diff --git a/Code/Tools/ProjectManager/Source/ProjectsScreen.cpp b/Code/Tools/ProjectManager/Source/ProjectsScreen.cpp index f86a689e59..72bae4da54 100644 --- a/Code/Tools/ProjectManager/Source/ProjectsScreen.cpp +++ b/Code/Tools/ProjectManager/Source/ProjectsScreen.cpp @@ -181,6 +181,7 @@ namespace O3DE::ProjectManager connect(projectButton, &ProjectButton::OpenProject, this, &ProjectsScreen::HandleOpenProject); connect(projectButton, &ProjectButton::EditProject, this, &ProjectsScreen::HandleEditProject); + connect(projectButton, &ProjectButton::EditProjectGems, this, &ProjectsScreen::HandleEditProjectGems); connect(projectButton, &ProjectButton::CopyProject, this, &ProjectsScreen::HandleCopyProject); connect(projectButton, &ProjectButton::RemoveProject, this, &ProjectsScreen::HandleRemoveProject); connect(projectButton, &ProjectButton::DeleteProject, this, &ProjectsScreen::HandleDeleteProject); @@ -448,6 +449,14 @@ namespace O3DE::ProjectManager emit ChangeScreenRequest(ProjectManagerScreen::UpdateProject); } } + void ProjectsScreen::HandleEditProjectGems(const QString& projectPath) + { + if (!WarnIfInBuildQueue(projectPath)) + { + emit NotifyCurrentProject(projectPath); + emit ChangeScreenRequest(ProjectManagerScreen::GemCatalog); + } + } void ProjectsScreen::HandleCopyProject(const ProjectInfo& projectInfo) { if (!WarnIfInBuildQueue(projectInfo.m_path)) diff --git a/Code/Tools/ProjectManager/Source/ProjectsScreen.h b/Code/Tools/ProjectManager/Source/ProjectsScreen.h index 859f8d0eae..c690621fb6 100644 --- a/Code/Tools/ProjectManager/Source/ProjectsScreen.h +++ b/Code/Tools/ProjectManager/Source/ProjectsScreen.h @@ -46,6 +46,7 @@ namespace O3DE::ProjectManager void HandleAddProjectButton(); void HandleOpenProject(const QString& projectPath); void HandleEditProject(const QString& projectPath); + void HandleEditProjectGems(const QString& projectPath); void HandleCopyProject(const ProjectInfo& projectInfo); void HandleRemoveProject(const QString& projectPath); void HandleDeleteProject(const QString& projectPath); diff --git a/Code/Tools/ProjectManager/Source/ScreenWidget.h b/Code/Tools/ProjectManager/Source/ScreenWidget.h index 148dcdb8c8..a84fb0be80 100644 --- a/Code/Tools/ProjectManager/Source/ScreenWidget.h +++ b/Code/Tools/ProjectManager/Source/ScreenWidget.h @@ -47,9 +47,9 @@ namespace O3DE::ProjectManager return tr("Missing"); } - virtual bool ContainsScreen([[maybe_unused]] ProjectManagerScreen screen) + virtual bool ContainsScreen(ProjectManagerScreen screen) { - return false; + return GetScreenEnum() == screen; } virtual void GoToScreen([[maybe_unused]] ProjectManagerScreen screen) { @@ -58,7 +58,6 @@ namespace O3DE::ProjectManager //! Notify this screen it is the current screen virtual void NotifyCurrentScreen() { - } signals: diff --git a/Code/Tools/ProjectManager/Source/UpdateProjectCtrl.cpp b/Code/Tools/ProjectManager/Source/UpdateProjectCtrl.cpp index fb16484961..bed1e7dfc7 100644 --- a/Code/Tools/ProjectManager/Source/UpdateProjectCtrl.cpp +++ b/Code/Tools/ProjectManager/Source/UpdateProjectCtrl.cpp @@ -94,6 +94,16 @@ namespace O3DE::ProjectManager return ProjectManagerScreen::UpdateProject; } + bool UpdateProjectCtrl::ContainsScreen(ProjectManagerScreen screen) + { + return screen == GetScreenEnum() || screen == ProjectManagerScreen::GemCatalog; + } + + void UpdateProjectCtrl::GoToScreen(ProjectManagerScreen screen) + { + OnChangeScreenRequest(screen); + } + // Called when pressing "Edit Project Settings..." void UpdateProjectCtrl::NotifyCurrentScreen() { @@ -114,6 +124,16 @@ namespace O3DE::ProjectManager m_stack->setCurrentWidget(m_gemRepoScreen); Update(); } + else if (screen == ProjectManagerScreen::GemCatalog) + { + m_stack->setCurrentWidget(m_gemCatalogScreen); + Update(); + } + else if (screen == ProjectManagerScreen::UpdateProjectSettings) + { + m_stack->setCurrentWidget(m_updateSettingsScreen); + Update(); + } else { emit ChangeScreenRequest(screen); diff --git a/Code/Tools/ProjectManager/Source/UpdateProjectCtrl.h b/Code/Tools/ProjectManager/Source/UpdateProjectCtrl.h index ee6fc792f2..070e2c58bf 100644 --- a/Code/Tools/ProjectManager/Source/UpdateProjectCtrl.h +++ b/Code/Tools/ProjectManager/Source/UpdateProjectCtrl.h @@ -24,7 +24,8 @@ namespace O3DE::ProjectManager QT_FORWARD_DECLARE_CLASS(GemCatalogScreen) QT_FORWARD_DECLARE_CLASS(GemRepoScreen) - class UpdateProjectCtrl : public ScreenWidget + class UpdateProjectCtrl + : public ScreenWidget { Q_OBJECT public: @@ -32,7 +33,8 @@ namespace O3DE::ProjectManager ~UpdateProjectCtrl() = default; ProjectManagerScreen GetScreenEnum() override; - protected: + bool ContainsScreen(ProjectManagerScreen screen) override; + void GoToScreen(ProjectManagerScreen screen) override; void NotifyCurrentScreen() override; protected slots: From 6651ae3d784d9e2eb7a7f30f36f9729c3cba9852 Mon Sep 17 00:00:00 2001 From: amzn-phist <52085794+amzn-phist@users.noreply.github.com> Date: Tue, 16 Nov 2021 15:32:24 -0600 Subject: [PATCH 044/345] Fix for python load errors on Linux (#5627) * Explicitly load libpython on Linux Downstream loads of python modules that weren't linked to libpython would fail to load because libraries were loaded using the RTLD_LOCAL flag. This adds a function that will explicitly load libpython on Linux using the RTLD_GLOBAL flag. Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com> * Fix misspelled function name Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com> * Addressing PR feedback - Updates naming and location of things. - Adds load code to a Gem template. - Updates error checking. Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com> * Address further feedback Removes the api function in favor of just having modules inherit off a PythonLoader class, that way we get RAAI behavior and lifetime management for free. Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com> --- .../AzToolsFramework/API/PythonLoader.h | 25 ++++++++++++++ .../aztoolsframework_files.cmake | 1 + .../API/PythonLoader_Default.cpp | 20 +++++++++++ .../API/PythonLoader_Linux.cpp | 34 +++++++++++++++++++ .../Platform/Linux/platform_linux_files.cmake | 1 + .../Platform/Mac/platform_mac_files.cmake | 1 + .../Windows/platform_windows_files.cmake | 1 + .../Code/Source/AtomToolsFrameworkModule.h | 2 ++ .../Source/EditorPythonBindingsModule.cpp | 3 ++ .../Code/Source/PythonAssetBuilderModule.cpp | 3 ++ .../Code/Source/${Name}EditorModule.cpp | 2 ++ 11 files changed, 93 insertions(+) create mode 100644 Code/Framework/AzToolsFramework/AzToolsFramework/API/PythonLoader.h create mode 100644 Code/Framework/AzToolsFramework/Platform/Common/Default/AzToolsFramework/API/PythonLoader_Default.cpp create mode 100644 Code/Framework/AzToolsFramework/Platform/Linux/AzToolsFramework/API/PythonLoader_Linux.cpp diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/API/PythonLoader.h b/Code/Framework/AzToolsFramework/AzToolsFramework/API/PythonLoader.h new file mode 100644 index 0000000000..29125667d6 --- /dev/null +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/API/PythonLoader.h @@ -0,0 +1,25 @@ +/* + * 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 AzToolsFramework::EmbeddedPython +{ + // When using embedded Python, some platforms need to explicitly load the python library. + // For any modules that depend on 3rdParty::Python package, the AZ::Module should inherit this class. + class PythonLoader + { + public: + PythonLoader(); + ~PythonLoader(); + + private: + void* m_embeddedLibPythonHandle{ nullptr }; + }; + +} // namespace AzToolsFramework::EmbeddedPython diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/aztoolsframework_files.cmake b/Code/Framework/AzToolsFramework/AzToolsFramework/aztoolsframework_files.cmake index b57eedcd81..d61d6486a9 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/aztoolsframework_files.cmake +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/aztoolsframework_files.cmake @@ -47,6 +47,7 @@ set(FILES API/EntityCompositionRequestBus.h API/EntityCompositionNotificationBus.h API/EditorViewportIconDisplayInterface.h + API/PythonLoader.h API/ViewPaneOptions.h API/ViewportEditorModeTrackerInterface.h Application/Ticker.h diff --git a/Code/Framework/AzToolsFramework/Platform/Common/Default/AzToolsFramework/API/PythonLoader_Default.cpp b/Code/Framework/AzToolsFramework/Platform/Common/Default/AzToolsFramework/API/PythonLoader_Default.cpp new file mode 100644 index 0000000000..42fef21db6 --- /dev/null +++ b/Code/Framework/AzToolsFramework/Platform/Common/Default/AzToolsFramework/API/PythonLoader_Default.cpp @@ -0,0 +1,20 @@ +/* +* 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 + +namespace AzToolsFramework::EmbeddedPython +{ + PythonLoader::PythonLoader() + { + } + + PythonLoader::~PythonLoader() + { + } +} diff --git a/Code/Framework/AzToolsFramework/Platform/Linux/AzToolsFramework/API/PythonLoader_Linux.cpp b/Code/Framework/AzToolsFramework/Platform/Linux/AzToolsFramework/API/PythonLoader_Linux.cpp new file mode 100644 index 0000000000..76fa36a048 --- /dev/null +++ b/Code/Framework/AzToolsFramework/Platform/Linux/AzToolsFramework/API/PythonLoader_Linux.cpp @@ -0,0 +1,34 @@ +/* + * 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 +#include +#include + +namespace AzToolsFramework::EmbeddedPython +{ + PythonLoader::PythonLoader() + { + constexpr char libPythonName[] = "libpython3.7m.so.1.0"; + if (m_embeddedLibPythonHandle = dlopen(libPythonName, RTLD_NOW | RTLD_GLOBAL); + m_embeddedLibPythonHandle == nullptr) + { + char* err = dlerror(); + AZ_Error("PythonLoader", false, "Failed to load %s with error: %s\n", libPythonName, err ? err : "Unknown Error"); + } + } + + PythonLoader::~PythonLoader() + { + if (m_embeddedLibPythonHandle) + { + dlclose(m_embeddedLibPythonHandle); + } + } + +} // namespace AzToolsFramework::EmbeddedPython diff --git a/Code/Framework/AzToolsFramework/Platform/Linux/platform_linux_files.cmake b/Code/Framework/AzToolsFramework/Platform/Linux/platform_linux_files.cmake index c2c5a11c4c..3b04a903a4 100644 --- a/Code/Framework/AzToolsFramework/Platform/Linux/platform_linux_files.cmake +++ b/Code/Framework/AzToolsFramework/Platform/Linux/platform_linux_files.cmake @@ -7,4 +7,5 @@ # set(FILES + AzToolsFramework/API/PythonLoader_Linux.cpp ) diff --git a/Code/Framework/AzToolsFramework/Platform/Mac/platform_mac_files.cmake b/Code/Framework/AzToolsFramework/Platform/Mac/platform_mac_files.cmake index c2c5a11c4c..6342747a38 100644 --- a/Code/Framework/AzToolsFramework/Platform/Mac/platform_mac_files.cmake +++ b/Code/Framework/AzToolsFramework/Platform/Mac/platform_mac_files.cmake @@ -7,4 +7,5 @@ # set(FILES + ../Common/Default/AzToolsFramework/API/PythonLoader_Default.cpp ) diff --git a/Code/Framework/AzToolsFramework/Platform/Windows/platform_windows_files.cmake b/Code/Framework/AzToolsFramework/Platform/Windows/platform_windows_files.cmake index c2c5a11c4c..6342747a38 100644 --- a/Code/Framework/AzToolsFramework/Platform/Windows/platform_windows_files.cmake +++ b/Code/Framework/AzToolsFramework/Platform/Windows/platform_windows_files.cmake @@ -7,4 +7,5 @@ # set(FILES + ../Common/Default/AzToolsFramework/API/PythonLoader_Default.cpp ) diff --git a/Gems/Atom/Tools/AtomToolsFramework/Code/Source/AtomToolsFrameworkModule.h b/Gems/Atom/Tools/AtomToolsFramework/Code/Source/AtomToolsFrameworkModule.h index 759b2558bf..ae60220314 100644 --- a/Gems/Atom/Tools/AtomToolsFramework/Code/Source/AtomToolsFrameworkModule.h +++ b/Gems/Atom/Tools/AtomToolsFramework/Code/Source/AtomToolsFrameworkModule.h @@ -9,11 +9,13 @@ #pragma once #include +#include namespace AtomToolsFramework { class AtomToolsFrameworkModule : public AZ::Module + , public AzToolsFramework::EmbeddedPython::PythonLoader { public: AZ_RTTI(AtomToolsFrameworkModule, "{B58B7CA8-98C9-4DC8-8607-E094989BBBE2}", AZ::Module); diff --git a/Gems/EditorPythonBindings/Code/Source/EditorPythonBindingsModule.cpp b/Gems/EditorPythonBindings/Code/Source/EditorPythonBindingsModule.cpp index cef8931722..f168cc5ab2 100644 --- a/Gems/EditorPythonBindings/Code/Source/EditorPythonBindingsModule.cpp +++ b/Gems/EditorPythonBindings/Code/Source/EditorPythonBindingsModule.cpp @@ -9,6 +9,8 @@ #include #include +#include + #include #include #include @@ -18,6 +20,7 @@ namespace EditorPythonBindings { class EditorPythonBindingsModule : public AZ::Module + , public AzToolsFramework::EmbeddedPython::PythonLoader { public: AZ_RTTI(EditorPythonBindingsModule, "{851B9E35-4FD5-49B1-8207-E40D4BBA36CC}", AZ::Module); diff --git a/Gems/PythonAssetBuilder/Code/Source/PythonAssetBuilderModule.cpp b/Gems/PythonAssetBuilder/Code/Source/PythonAssetBuilderModule.cpp index d7143a159a..1d330c90df 100644 --- a/Gems/PythonAssetBuilder/Code/Source/PythonAssetBuilderModule.cpp +++ b/Gems/PythonAssetBuilder/Code/Source/PythonAssetBuilderModule.cpp @@ -9,12 +9,15 @@ #include #include +#include + #include namespace PythonAssetBuilder { class PythonAssetBuilderModule : public AZ::Module + , public AzToolsFramework::EmbeddedPython::PythonLoader { public: AZ_RTTI(PythonAssetBuilderModule, "{35C9457E-54C2-474C-AEBE-5A70CC1D435D}", AZ::Module); diff --git a/Templates/PythonToolGem/Template/Code/Source/${Name}EditorModule.cpp b/Templates/PythonToolGem/Template/Code/Source/${Name}EditorModule.cpp index 0027af011a..fdd971440e 100644 --- a/Templates/PythonToolGem/Template/Code/Source/${Name}EditorModule.cpp +++ b/Templates/PythonToolGem/Template/Code/Source/${Name}EditorModule.cpp @@ -10,6 +10,7 @@ #include <${Name}ModuleInterface.h> #include <${Name}EditorSystemComponent.h> +#include void Init${SanitizedCppName}Resources() { @@ -21,6 +22,7 @@ namespace ${SanitizedCppName} { class ${SanitizedCppName}EditorModule : public ${SanitizedCppName}ModuleInterface + , public AzToolsFramework::EmbeddedPython::PythonLoader { public: AZ_RTTI(${SanitizedCppName}EditorModule, "${ModuleClassId}", ${SanitizedCppName}ModuleInterface); From 808c78310965503d83be6303bdcd2edb0800567a Mon Sep 17 00:00:00 2001 From: AMZN-Phil Date: Tue, 16 Nov 2021 14:24:02 -0800 Subject: [PATCH 045/345] Show python errors in Project Manager for adding repos and downloading gems Signed-off-by: AMZN-Phil --- .../ProjectManager/Source/DownloadWorker.cpp | 2 +- .../Source/GemRepo/GemRepoScreen.cpp | 8 ++-- .../ProjectManager/Source/PythonBindings.cpp | 24 ++++++++++-- .../ProjectManager/Source/PythonBindings.h | 2 +- .../Source/PythonBindingsInterface.h | 4 +- scripts/o3de/o3de/register.py | 2 +- scripts/o3de/o3de/repo.py | 4 +- scripts/o3de/o3de/utils.py | 38 +++++++++++-------- 8 files changed, 55 insertions(+), 29 deletions(-) diff --git a/Code/Tools/ProjectManager/Source/DownloadWorker.cpp b/Code/Tools/ProjectManager/Source/DownloadWorker.cpp index 560bfe05de..163e2c5869 100644 --- a/Code/Tools/ProjectManager/Source/DownloadWorker.cpp +++ b/Code/Tools/ProjectManager/Source/DownloadWorker.cpp @@ -33,7 +33,7 @@ namespace O3DE::ProjectManager } else { - emit Done(tr("Gem download failed")); + emit Done(gemInfoResult.GetError().c_str()); } } diff --git a/Code/Tools/ProjectManager/Source/GemRepo/GemRepoScreen.cpp b/Code/Tools/ProjectManager/Source/GemRepo/GemRepoScreen.cpp index 91432c2346..057976921e 100644 --- a/Code/Tools/ProjectManager/Source/GemRepo/GemRepoScreen.cpp +++ b/Code/Tools/ProjectManager/Source/GemRepo/GemRepoScreen.cpp @@ -92,8 +92,8 @@ namespace O3DE::ProjectManager return; } - bool addGemRepoResult = PythonBindingsInterface::Get()->AddGemRepo(repoUri); - if (addGemRepoResult) + AZ::Outcome addGemRepoResult = PythonBindingsInterface::Get()->AddGemRepo(repoUri); + if (addGemRepoResult.IsSuccess()) { Reinit(); emit OnRefresh(); @@ -101,8 +101,8 @@ namespace O3DE::ProjectManager else { QString failureMessage = tr("Failed to add gem repo: %1.").arg(repoUri); - QMessageBox::critical(this, tr("Operation failed"), failureMessage); - AZ_Error("Project Manger", false, failureMessage.toUtf8()); + QMessageBox::critical(this, failureMessage, addGemRepoResult.GetError().c_str()); + AZ_Error("Project Manager", false, failureMessage.toUtf8()); } } } diff --git a/Code/Tools/ProjectManager/Source/PythonBindings.cpp b/Code/Tools/ProjectManager/Source/PythonBindings.cpp index d1dedaaec4..c30e9ebd28 100644 --- a/Code/Tools/ProjectManager/Source/PythonBindings.cpp +++ b/Code/Tools/ProjectManager/Source/PythonBindings.cpp @@ -61,6 +61,7 @@ namespace Platform namespace RedirectOutput { using RedirectOutputFunc = AZStd::function; + AZStd::string lastPythonError; struct RedirectOutput { @@ -210,6 +211,16 @@ namespace RedirectOutput }); SetRedirection("stderr", g_redirect_stderr_saved, g_redirect_stderr, []([[maybe_unused]] const char* msg) { + if (lastPythonError.empty()) + { + lastPythonError = msg; + const int lengthOfErrorPrefix = 11; + auto errorPrefix = lastPythonError.find("ERROR:root:"); + if (errorPrefix != AZStd::string::npos) + { + lastPythonError.erase(errorPrefix, lengthOfErrorPrefix); + } + } AZ_TracePrintf("Python", msg); }); @@ -1051,12 +1062,13 @@ namespace O3DE::ProjectManager return result && refreshResult; } - bool PythonBindings::AddGemRepo(const QString& repoUri) + AZ::Outcome PythonBindings::AddGemRepo(const QString& repoUri) { bool registrationResult = false; bool result = ExecuteWithLock( [&] { + RedirectOutput::lastPythonError.clear(); auto pyUri = QString_To_Py_String(repoUri); auto pythonRegistrationResult = m_register.attr("register")( pybind11::none(), pybind11::none(), pybind11::none(), pybind11::none(), pybind11::none(), pybind11::none(), pyUri); @@ -1065,7 +1077,12 @@ namespace O3DE::ProjectManager registrationResult = !pythonRegistrationResult.cast(); }); - return result && registrationResult; + if (!result || !registrationResult) + { + return AZ::Failure(AZStd::move(RedirectOutput::lastPythonError)); + } + + return AZ::Success(); } bool PythonBindings::RemoveGemRepo(const QString& repoUri) @@ -1225,6 +1242,7 @@ namespace O3DE::ProjectManager auto result = ExecuteWithLockErrorHandling( [&] { + RedirectOutput::lastPythonError.clear(); auto downloadResult = m_download.attr("download_gem")( QString_To_Py_String(gemName), // gem name pybind11::none(), // destination path @@ -1248,7 +1266,7 @@ namespace O3DE::ProjectManager } else if (!downloadSucceeded) { - return AZ::Failure("Failed to download gem."); + return AZ::Failure(AZStd::move(RedirectOutput::lastPythonError)); } return AZ::Success(); diff --git a/Code/Tools/ProjectManager/Source/PythonBindings.h b/Code/Tools/ProjectManager/Source/PythonBindings.h index ecc6f65dc3..9f5f06110e 100644 --- a/Code/Tools/ProjectManager/Source/PythonBindings.h +++ b/Code/Tools/ProjectManager/Source/PythonBindings.h @@ -62,7 +62,7 @@ namespace O3DE::ProjectManager // Gem Repos AZ::Outcome RefreshGemRepo(const QString& repoUri) override; bool RefreshAllGemRepos() override; - bool AddGemRepo(const QString& repoUri) override; + AZ::Outcome AddGemRepo(const QString& repoUri) override; bool RemoveGemRepo(const QString& repoUri) override; AZ::Outcome, AZStd::string> GetAllGemRepoInfos() override; AZ::Outcome, AZStd::string> GetAllGemRepoGemsInfos() override; diff --git a/Code/Tools/ProjectManager/Source/PythonBindingsInterface.h b/Code/Tools/ProjectManager/Source/PythonBindingsInterface.h index 65337869fd..26a487f307 100644 --- a/Code/Tools/ProjectManager/Source/PythonBindingsInterface.h +++ b/Code/Tools/ProjectManager/Source/PythonBindingsInterface.h @@ -200,9 +200,9 @@ namespace O3DE::ProjectManager /** * Registers this gem repo with the current engine. * @param repoUri the absolute filesystem path or url to the gem repo. - * @return true on success, false on failure. + * @return an outcome with a string error message on failure. */ - virtual bool AddGemRepo(const QString& repoUri) = 0; + virtual AZ::Outcome AddGemRepo(const QString& repoUri) = 0; /** * Unregisters this gem repo with the current engine. diff --git a/scripts/o3de/o3de/register.py b/scripts/o3de/o3de/register.py index 8a2bb788aa..8420e202dc 100644 --- a/scripts/o3de/o3de/register.py +++ b/scripts/o3de/o3de/register.py @@ -490,7 +490,7 @@ def register_repo(json_data: dict, repo_sha256 = hashlib.sha256(url.encode()) cache_file = manifest.get_o3de_cache_folder() / str(repo_sha256.hexdigest() + '.json') - result = utils.download_file(parsed_uri, cache_file) + result = utils.download_file(parsed_uri, cache_file, True) if result == 0: json_data.setdefault('repos', []).insert(0, repo_uri) diff --git a/scripts/o3de/o3de/repo.py b/scripts/o3de/o3de/repo.py index c8fac38605..3ebb79fb27 100644 --- a/scripts/o3de/o3de/repo.py +++ b/scripts/o3de/o3de/repo.py @@ -24,6 +24,7 @@ def process_add_o3de_repo(file_name: str or pathlib.Path, repo_set: set) -> int: file_name = pathlib.Path(file_name).resolve() if not validation.valid_o3de_repo_json(file_name): + logger.error(f'Repository JSON {file_name} could not be loaded or is missing required values') return 1 cache_folder = manifest.get_o3de_cache_folder() @@ -114,7 +115,7 @@ def get_gem_json_paths_from_cached_repo(repo_uri: str) -> set: file_name = pathlib.Path(cache_filename).resolve() if not file_name.is_file(): - logger.error(f'Could not find cached repo json file for {repo_uri}') + logger.error(f'Could not find cached repository json file for {repo_uri}. Try refreshing the repository.') return gem_set with file_name.open('r') as f: @@ -167,6 +168,7 @@ def refresh_repo(repo_uri: str, download_file_result = utils.download_file(parsed_uri, cache_file, True) if download_file_result != 0: + logger.error(f'Repo json {repo_uri} could not download.') return download_file_result if not validation.valid_o3de_repo_json(cache_file): diff --git a/scripts/o3de/o3de/utils.py b/scripts/o3de/o3de/utils.py index 88f84ae75e..7b7d0e3e27 100644 --- a/scripts/o3de/o3de/utils.py +++ b/scripts/o3de/o3de/utils.py @@ -125,7 +125,8 @@ def download_file(parsed_uri, download_path: pathlib.Path, force_overwrite: bool """ if download_path.is_file(): if not force_overwrite: - logger.warn(f'File already downloaded to {download_path}.') + logger.error(f'File already downloaded to {download_path} and force_overwrite is not set.') + return 1 else: try: os.unlink(download_path) @@ -134,20 +135,25 @@ def download_file(parsed_uri, download_path: pathlib.Path, force_overwrite: bool return 1 if parsed_uri.scheme in ['http', 'https', 'ftp', 'ftps']: - with urllib.request.urlopen(parsed_uri.geturl()) as s: - download_file_size = 0 - try: - download_file_size = s.headers['content-length'] - except KeyError: - pass - def download_progress(downloaded_bytes): - if download_progress_callback: - return download_progress_callback(int(downloaded_bytes), int(download_file_size)) - return False - with download_path.open('wb') as f: - download_cancelled = copyfileobj(s, f, download_progress) - if download_cancelled: - return 1 + try: + with urllib.request.urlopen(parsed_uri.geturl()) as s: + download_file_size = 0 + try: + download_file_size = s.headers['content-length'] + except KeyError: + pass + def download_progress(downloaded_bytes): + if download_progress_callback: + return download_progress_callback(int(downloaded_bytes), int(download_file_size)) + return False + with download_path.open('wb') as f: + download_cancelled = copyfileobj(s, f, download_progress) + if download_cancelled: + logger.warn(f'Download of file to {download_path} cancelled.') + return 1 + except urllib.error.HTTPError as e: + logger.error(f'HTTP Error {e.code} opening {parsed_uri.geturl()}') + return 1 else: origin_file = pathlib.Path(parsed_uri.geturl()).resolve() if not origin_file.is_file(): @@ -167,7 +173,7 @@ def download_zip_file(parsed_uri, download_zip_path: pathlib.Path, force_overwri return download_file_result if not zipfile.is_zipfile(download_zip_path): - logger.error(f"File zip {download_zip_path} is invalid.") + logger.error(f"File zip {download_zip_path} is invalid. Try re-downloading the file.") download_zip_path.unlink() return 1 From 3ad07a229524b410b5eb2dab0cb0a6197bcdc1a8 Mon Sep 17 00:00:00 2001 From: allisaurus <34254888+allisaurus@users.noreply.github.com> Date: Tue, 16 Nov 2021 14:50:37 -0800 Subject: [PATCH 046/345] AWSClientAuth updated to use custom CognitoCachingCredentialsProvider (#5525) Signed-off-by: Stanko --- .../aws_client_auth_automation_test.py | 36 ++++++ ...oCachingAuthenticatedCredentialsProvider.h | 44 +++++++ .../AWSCognitoAuthorizationController.h | 5 +- ...achingAuthenticatedCredentialsProvider.cpp | 122 ++++++++++++++++++ .../AWSCognitoAuthorizationController.cpp | 15 ++- .../AWSCognitoAuthorizationControllerTest.cpp | 20 +-- .../Code/awsclientauth_files.cmake | 2 + 7 files changed, 228 insertions(+), 16 deletions(-) create mode 100644 Gems/AWSClientAuth/Code/Include/Private/Authorization/AWSClientAuthCognitoCachingAuthenticatedCredentialsProvider.h create mode 100644 Gems/AWSClientAuth/Code/Source/Authorization/AWSClientAuthCognitoCachingAuthenticatedCredentialsProvider.cpp diff --git a/AutomatedTesting/Gem/PythonTests/AWS/Windows/client_auth/aws_client_auth_automation_test.py b/AutomatedTesting/Gem/PythonTests/AWS/Windows/client_auth/aws_client_auth_automation_test.py index 198fb934d9..077a068a18 100644 --- a/AutomatedTesting/Gem/PythonTests/AWS/Windows/client_auth/aws_client_auth_automation_test.py +++ b/AutomatedTesting/Gem/PythonTests/AWS/Windows/client_auth/aws_client_auth_automation_test.py @@ -12,6 +12,7 @@ import pytest import ly_test_tools.log.log_monitor from AWS.common import constants +from AWS.common.resource_mappings import AWS_RESOURCE_MAPPINGS_ACCOUNT_ID_KEY # fixture imports from assetpipeline.ap_fixtures.asset_processor_fixture import asset_processor @@ -70,6 +71,41 @@ class TestAWSClientAuthWindows(object): halt_on_unexpected=True, ) assert result, 'Anonymous credentials fetched successfully.' + + @pytest.mark.parametrize('level', ['AWS/ClientAuth']) + def test_anonymous_credentials_no_global_accountid(self, + level: str, + launcher: pytest.fixture, + resource_mappings: pytest.fixture, + workspace: pytest.fixture, + asset_processor: pytest.fixture + ): + """ + Test to verify AWS Cognito Identity pool anonymous authorization. + + Setup: Updates resource mapping file using existing CloudFormation stacks. + Tests: Getting credentials when no credentials are configured + Verification: Log monitor looks for success credentials log. + """ + # Remove top-level account ID from resource mappings + resource_mappings.clear_select_keys([AWS_RESOURCE_MAPPINGS_ACCOUNT_ID_KEY]) + + asset_processor.start() + asset_processor.wait_for_idle() + + file_to_monitor = os.path.join(launcher.workspace.paths.project_log(), constants.GAME_LOG_NAME) + log_monitor = ly_test_tools.log.log_monitor.LogMonitor(launcher=launcher, log_file_path=file_to_monitor) + + launcher.args = ['+LoadLevel', level] + launcher.args.extend(['-rhi=null']) + + with launcher.start(launch_ap=False): + result = log_monitor.monitor_log_for_lines( + expected_lines=['(Script) - Success anonymous credentials'], + unexpected_lines=['(Script) - Fail anonymous credentials'], + halt_on_unexpected=True, + ) + assert result, 'Anonymous credentials fetched successfully.' def test_password_signin_credentials(self, launcher: pytest.fixture, diff --git a/Gems/AWSClientAuth/Code/Include/Private/Authorization/AWSClientAuthCognitoCachingAuthenticatedCredentialsProvider.h b/Gems/AWSClientAuth/Code/Include/Private/Authorization/AWSClientAuthCognitoCachingAuthenticatedCredentialsProvider.h new file mode 100644 index 0000000000..ad7faf4671 --- /dev/null +++ b/Gems/AWSClientAuth/Code/Include/Private/Authorization/AWSClientAuthCognitoCachingAuthenticatedCredentialsProvider.h @@ -0,0 +1,44 @@ +/* + * 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 +#include +#include + +namespace AWSClientAuth +{ + //! Cognito Caching Credentials Provider implementation that is derived from AWS Native SDK. + //! For use with authenticated credentials. + class AWSClientAuthCognitoCachingAuthenticatedCredentialsProvider + : public Aws::Auth::CognitoCachingCredentialsProvider + { + public: + AWSClientAuthCognitoCachingAuthenticatedCredentialsProvider( + const std::shared_ptr& identityRepository, + const std::shared_ptr& cognitoIdentityClient = nullptr); + + protected: + Aws::CognitoIdentity::Model::GetCredentialsForIdentityOutcome GetCredentialsFromCognito() const override; + }; + + //! Cognito Caching Credentials Provider implementation that is eventually derived from AWS Native SDK. + //! For use with anonymous credentials. + class AWSClientAuthCachingAnonymousCredsProvider : public AWSClientAuthCognitoCachingAuthenticatedCredentialsProvider + { + public: + AWSClientAuthCachingAnonymousCredsProvider( + const std::shared_ptr& identityRepository, + const std::shared_ptr& cognitoIdentityClient = nullptr); + + protected: + Aws::CognitoIdentity::Model::GetCredentialsForIdentityOutcome GetCredentialsFromCognito() const override; + }; + +} // namespace AWSClientAuth diff --git a/Gems/AWSClientAuth/Code/Include/Private/Authorization/AWSCognitoAuthorizationController.h b/Gems/AWSClientAuth/Code/Include/Private/Authorization/AWSCognitoAuthorizationController.h index 042be8fe89..1378feff19 100644 --- a/Gems/AWSClientAuth/Code/Include/Private/Authorization/AWSCognitoAuthorizationController.h +++ b/Gems/AWSClientAuth/Code/Include/Private/Authorization/AWSCognitoAuthorizationController.h @@ -9,6 +9,7 @@ #pragma once #include +#include #include #include #include @@ -51,8 +52,8 @@ namespace AWSClientAuth std::shared_ptr m_persistentCognitoIdentityProvider; std::shared_ptr m_persistentAnonymousCognitoIdentityProvider; - std::shared_ptr m_cognitoCachingCredentialsProvider; - std::shared_ptr m_cognitoCachingAnonymousCredentialsProvider; + std::shared_ptr m_cognitoCachingCredentialsProvider; + std::shared_ptr m_cognitoCachingAnonymousCredentialsProvider; AZStd::string m_cognitoIdentityPoolId; AZStd::string m_formattedCognitoUserPoolId; diff --git a/Gems/AWSClientAuth/Code/Source/Authorization/AWSClientAuthCognitoCachingAuthenticatedCredentialsProvider.cpp b/Gems/AWSClientAuth/Code/Source/Authorization/AWSClientAuthCognitoCachingAuthenticatedCredentialsProvider.cpp new file mode 100644 index 0000000000..2492afa441 --- /dev/null +++ b/Gems/AWSClientAuth/Code/Source/Authorization/AWSClientAuthCognitoCachingAuthenticatedCredentialsProvider.cpp @@ -0,0 +1,122 @@ +/* + * 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 + +#include + +#include +#include +#include +#include +#include +#include +#include + + +namespace AWSClientAuth +{ + static const char* AUTH_LOG_TAG = "AWSClientAuthCognitoCachingAuthenticatedCredentialsProvider"; + static const char* ANON_LOG_TAG = "AWSClientAuthCachingAnonymousCredsProvider"; + + // Modification of https://github.com/aws/aws-sdk-cpp/blob/main/aws-cpp-sdk-identity-management/source/auth/CognitoCachingCredentialsProvider.cpp#L92 + // to work around account ID requirement. Account id is not required for call to succeed and is not set unless provided. + // see: https://github.com/aws/aws-sdk-cpp/issues/1448 + Aws::CognitoIdentity::Model::GetCredentialsForIdentityOutcome FetchCredsFromCognito( + const Aws::CognitoIdentity::CognitoIdentityClient& cognitoIdentityClient, + Aws::Auth::PersistentCognitoIdentityProvider& identityRepository, + const char* logTag, + bool includeLogins) + { + auto logins = identityRepository.GetLogins(); + Aws::Map cognitoLogins; + for (auto& login : logins) + { + cognitoLogins[login.first] = login.second.accessToken; + } + + if (!identityRepository.HasIdentityId()) + { + auto accountId = identityRepository.GetAccountId(); + auto identityPoolId = identityRepository.GetIdentityPoolId(); + + Aws::CognitoIdentity::Model::GetIdRequest getIdRequest; + getIdRequest.SetIdentityPoolId(identityPoolId); + + if (!accountId.empty()) // new check + { + getIdRequest.SetAccountId(accountId); + AWS_LOGSTREAM_INFO(logTag, "Identity not found, requesting an id for accountId " + << accountId << " identity pool id " + << identityPoolId << " with logins."); + } + else + { + AWS_LOGSTREAM_INFO( + logTag, "Identity not found, requesting an id for identity pool id %s" << identityPoolId << " with logins."); + } + if (includeLogins) + { + getIdRequest.SetLogins(cognitoLogins); + } + + auto getIdOutcome = cognitoIdentityClient.GetId(getIdRequest); + if (getIdOutcome.IsSuccess()) + { + auto identityId = getIdOutcome.GetResult().GetIdentityId(); + AWS_LOGSTREAM_INFO(logTag, "Successfully retrieved identity: " << identityId); + identityRepository.PersistIdentityId(identityId); + } + else + { + AWS_LOGSTREAM_ERROR( + logTag, + "Failed to retrieve identity. Error: " << getIdOutcome.GetError().GetExceptionName() << " " + << getIdOutcome.GetError().GetMessage()); + return Aws::CognitoIdentity::Model::GetCredentialsForIdentityOutcome(getIdOutcome.GetError()); + } + } + + Aws::CognitoIdentity::Model::GetCredentialsForIdentityRequest getCredentialsForIdentityRequest; + getCredentialsForIdentityRequest.SetIdentityId(identityRepository.GetIdentityId()); + if (includeLogins) + { + getCredentialsForIdentityRequest.SetLogins(cognitoLogins); + } + + return cognitoIdentityClient.GetCredentialsForIdentity(getCredentialsForIdentityRequest); + } + + AWSClientAuthCognitoCachingAuthenticatedCredentialsProvider::AWSClientAuthCognitoCachingAuthenticatedCredentialsProvider( + const std::shared_ptr& identityRepository, + const std::shared_ptr& cognitoIdentityClient) + : CognitoCachingCredentialsProvider(identityRepository, cognitoIdentityClient) + { + } + + Aws::CognitoIdentity::Model::GetCredentialsForIdentityOutcome + AWSClientAuthCognitoCachingAuthenticatedCredentialsProvider::GetCredentialsFromCognito() const + { + return FetchCredsFromCognito(*m_cognitoIdentityClient, *m_identityRepository, AUTH_LOG_TAG, true); + } + + AWSClientAuthCachingAnonymousCredsProvider::AWSClientAuthCachingAnonymousCredsProvider( + const std::shared_ptr& identityRepository, + const std::shared_ptr& cognitoIdentityClient) + : AWSClientAuthCognitoCachingAuthenticatedCredentialsProvider(identityRepository, cognitoIdentityClient) + { + } + + Aws::CognitoIdentity::Model::GetCredentialsForIdentityOutcome AWSClientAuthCachingAnonymousCredsProvider:: + GetCredentialsFromCognito() const + { + return FetchCredsFromCognito(*m_cognitoIdentityClient, *m_identityRepository, ANON_LOG_TAG, false); + } + + +} // namespace AWSClientAuth diff --git a/Gems/AWSClientAuth/Code/Source/Authorization/AWSCognitoAuthorizationController.cpp b/Gems/AWSClientAuth/Code/Source/Authorization/AWSCognitoAuthorizationController.cpp index 3af28582d6..f53149c90f 100644 --- a/Gems/AWSClientAuth/Code/Source/Authorization/AWSCognitoAuthorizationController.cpp +++ b/Gems/AWSClientAuth/Code/Source/Authorization/AWSCognitoAuthorizationController.cpp @@ -8,6 +8,7 @@ #include #include +#include #include #include #include @@ -38,10 +39,12 @@ namespace AWSClientAuth auto identityClient = AZ::Interface::Get()->GetCognitoIdentityClient(); m_cognitoCachingCredentialsProvider = - std::make_shared(m_persistentCognitoIdentityProvider, identityClient); + std::make_shared( + m_persistentCognitoIdentityProvider, identityClient); m_cognitoCachingAnonymousCredentialsProvider = - std::make_shared(m_persistentAnonymousCognitoIdentityProvider, identityClient); + std::make_shared( + m_persistentAnonymousCognitoIdentityProvider, identityClient); } AWSCognitoAuthorizationController::~AWSCognitoAuthorizationController() @@ -65,9 +68,13 @@ namespace AWSClientAuth AWSCore::AWSResourceMappingRequestBus::BroadcastResult( m_cognitoIdentityPoolId, &AWSCore::AWSResourceMappingRequests::GetResourceNameId, CognitoIdentityPoolIdResourceMappingKey); - if (m_awsAccountId.empty() || m_cognitoIdentityPoolId.empty()) + if (m_awsAccountId.empty()) + { + AZ_TracePrintf("AWSCognitoAuthorizationController", "AWS account id not not configured. Proceeding without it."); + } + + if (m_cognitoIdentityPoolId.empty()) { - AZ_Warning("AWSCognitoAuthorizationController", !m_awsAccountId.empty(), "Missing AWS account id not configured."); AZ_Warning("AWSCognitoAuthorizationController", !m_cognitoIdentityPoolId.empty(), "Missing Cognito Identity pool id in resource mappings."); return false; } diff --git a/Gems/AWSClientAuth/Code/Tests/Authorization/AWSCognitoAuthorizationControllerTest.cpp b/Gems/AWSClientAuth/Code/Tests/Authorization/AWSCognitoAuthorizationControllerTest.cpp index 9f31891512..ca1d58aea4 100644 --- a/Gems/AWSClientAuth/Code/Tests/Authorization/AWSCognitoAuthorizationControllerTest.cpp +++ b/Gems/AWSClientAuth/Code/Tests/Authorization/AWSCognitoAuthorizationControllerTest.cpp @@ -62,6 +62,14 @@ TEST_F(AWSCognitoAuthorizationControllerTest, Initialize_Success) ASSERT_TRUE(m_mockController->m_cognitoIdentityPoolId == AWSClientAuthUnitTest::TEST_RESOURCE_NAME_ID); } +TEST_F(AWSCognitoAuthorizationControllerTest, Initialize_Success_GetAWSAccountEmpty) +{ + EXPECT_CALL(m_awsResourceMappingRequestBusMock, GetResourceNameId(testing::_)).Times(2); + EXPECT_CALL(m_awsResourceMappingRequestBusMock, GetDefaultAccountId()).Times(1).WillOnce(testing::Return("")); + EXPECT_CALL(m_awsResourceMappingRequestBusMock, GetDefaultRegion()).Times(1); + ASSERT_TRUE(m_mockController->Initialize()); +} + TEST_F(AWSCognitoAuthorizationControllerTest, RequestAWSCredentials_WithLogins_Success) { AWSClientAuth::AuthenticationTokens tokens( @@ -121,7 +129,7 @@ TEST_F(AWSCognitoAuthorizationControllerTest, MultipleCalls_UsesCacheCredentials m_mockController->RequestAWSCredentialsAsync(); } -TEST_F(AWSCognitoAuthorizationControllerTest, RequestAWSCredentials_Fail_GetIdError) +TEST_F(AWSCognitoAuthorizationControllerTest, RequestAWSCredentials_Fail_GetIdError) // fail { AWSClientAuth::AuthenticationTokens cognitoTokens( AWSClientAuthUnitTest::TEST_TOKEN, AWSClientAuthUnitTest::TEST_TOKEN, AWSClientAuthUnitTest::TEST_TOKEN, @@ -321,7 +329,7 @@ TEST_F(AWSCognitoAuthorizationControllerTest, GetCredentialsProvider_NoPersisted EXPECT_TRUE(actualCredentialsProvider == m_mockController->m_cognitoCachingAnonymousCredentialsProvider); } -TEST_F(AWSCognitoAuthorizationControllerTest, GetCredentialsProvider_NoPersistedLogins_NoAnonymousCredentials_ResultNullPtr) +TEST_F(AWSCognitoAuthorizationControllerTest, GetCredentialsProvider_NoPersistedLogins_NoAnonymousCredentials_ResultNullPtr) // fails { Aws::Client::AWSError error; error.SetExceptionName(AWSClientAuthUnitTest::TEST_EXCEPTION); @@ -431,11 +439,3 @@ TEST_F(AWSCognitoAuthorizationControllerTest, Initialize_Fail_GetResourceNameEmp EXPECT_CALL(m_awsResourceMappingRequestBusMock, GetDefaultAccountId()).Times(1); ASSERT_FALSE(m_mockController->Initialize()); } - -TEST_F(AWSCognitoAuthorizationControllerTest, Initialize_Fail_GetAWSAccountEmpty) -{ - EXPECT_CALL(m_awsResourceMappingRequestBusMock, GetResourceNameId(testing::_)).Times(1); - EXPECT_CALL(m_awsResourceMappingRequestBusMock, GetDefaultAccountId()).Times(1).WillOnce(testing::Return("")); - EXPECT_CALL(m_awsResourceMappingRequestBusMock, GetDefaultRegion()).Times(0); - ASSERT_FALSE(m_mockController->Initialize()); -} diff --git a/Gems/AWSClientAuth/Code/awsclientauth_files.cmake b/Gems/AWSClientAuth/Code/awsclientauth_files.cmake index bd4c971377..3b07b710e7 100644 --- a/Gems/AWSClientAuth/Code/awsclientauth_files.cmake +++ b/Gems/AWSClientAuth/Code/awsclientauth_files.cmake @@ -24,6 +24,7 @@ set(FILES Include/Private/Authorization/AWSCognitoAuthorizationController.h Include/Private/Authorization/AWSClientAuthPersistentCognitoIdentityProvider.h Include/Private/Authorization/AWSCognitoAuthorizationNotificationBusBehaviorHandler.h + Include/Private/Authorization/AWSClientAuthCognitoCachingAuthenticatedCredentialsProvider.h Include/Private/UserManagement/AWSCognitoUserManagementController.h Include/Private/UserManagement/UserManagementNotificationBusBehaviorHandler.h @@ -45,6 +46,7 @@ set(FILES Source/Authorization/ClientAuthAWSCredentials.cpp Source/Authorization/AWSCognitoAuthorizationController.cpp Source/Authorization/AWSClientAuthPersistentCognitoIdentityProvider.cpp + Source/Authorization/AWSClientAuthCognitoCachingAuthenticatedCredentialsProvider.cpp Source/UserManagement/AWSCognitoUserManagementController.cpp ) From fc805594d02967474c2e31cd228e925d73310fee Mon Sep 17 00:00:00 2001 From: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com> Date: Tue, 16 Nov 2021 14:51:28 -0800 Subject: [PATCH 047/345] Fixes for misc gem download issues (#5665) Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com> --- .../Source/GemCatalog/GemCatalogScreen.cpp | 11 +++++-- scripts/o3de/o3de/disable_gem.py | 2 +- scripts/o3de/o3de/download.py | 33 +++++++++---------- scripts/o3de/o3de/repo.py | 5 ++- 4 files changed, 28 insertions(+), 23 deletions(-) diff --git a/Code/Tools/ProjectManager/Source/GemCatalog/GemCatalogScreen.cpp b/Code/Tools/ProjectManager/Source/GemCatalog/GemCatalogScreen.cpp index 0dacbbb906..b26dddac71 100644 --- a/Code/Tools/ProjectManager/Source/GemCatalog/GemCatalogScreen.cpp +++ b/Code/Tools/ProjectManager/Source/GemCatalog/GemCatalogScreen.cpp @@ -363,7 +363,10 @@ namespace O3DE::ProjectManager { const QString selectedGemPath = m_gemModel->GetPath(modelIndex); - // Remove gem from gems to be added + const bool wasAdded = GemModel::WasPreviouslyAdded(modelIndex); + const bool wasAddedDependency = GemModel::WasPreviouslyAddedDependency(modelIndex); + + // Remove gem from gems to be added to update any dependencies GemModel::SetIsAdded(*m_gemModel, modelIndex, false); // Unregister the gem @@ -391,6 +394,8 @@ namespace O3DE::ProjectManager // Select remote gem QModelIndex remoteGemIndex = m_gemModel->FindIndexByNameString(selectedGemName); + GemModel::SetWasPreviouslyAdded(*m_gemModel, remoteGemIndex, wasAdded); + GemModel::SetWasPreviouslyAddedDependency(*m_gemModel, remoteGemIndex, wasAddedDependency); QModelIndex proxyIndex = m_proxyModel->mapFromSource(remoteGemIndex); m_proxyModel->GetSelectionModel()->setCurrentIndex(proxyIndex, QItemSelectionModel::ClearAndSelect); } @@ -523,7 +528,9 @@ namespace O3DE::ProjectManager const QString& gemPath = GemModel::GetPath(modelIndex); // make sure any remote gems we added were downloaded successfully - if (GemModel::GetGemOrigin(modelIndex) == GemInfo::Remote && GemModel::GetDownloadStatus(modelIndex) != GemInfo::Downloaded) + const GemInfo::DownloadStatus status = GemModel::GetDownloadStatus(modelIndex); + if (GemModel::GetGemOrigin(modelIndex) == GemInfo::Remote && + !(status == GemInfo::Downloaded || status == GemInfo::DownloadSuccessful)) { QMessageBox::critical( nullptr, "Cannot add gem that isn't downloaded", diff --git a/scripts/o3de/o3de/disable_gem.py b/scripts/o3de/o3de/disable_gem.py index 01324d8500..158507fca1 100644 --- a/scripts/o3de/o3de/disable_gem.py +++ b/scripts/o3de/o3de/disable_gem.py @@ -69,7 +69,7 @@ def disable_gem_in_project(gem_name: str = None, return 1 gem_path = pathlib.Path(gem_path).resolve() # make sure this gem already exists if we're adding. We can always remove a gem. - if not gem_path.is_dir(): + if not gem_path.exists(): logger.error(f'Gem Path {gem_path} does not exist.') return 1 diff --git a/scripts/o3de/o3de/download.py b/scripts/o3de/o3de/download.py index 9b7c8cc782..dfec6b1aaa 100644 --- a/scripts/o3de/o3de/download.py +++ b/scripts/o3de/o3de/download.py @@ -48,26 +48,25 @@ def validate_downloaded_zip_sha256(download_uri_json_data: dict, download_zip_pa ' We cannot verify this is the actually the advertised object!!!') return 1 else: - sha256B = hashlib.sha256(download_zip_path.open('rb').read()).hexdigest() - if sha256A != sha256B: - logger.error(f'SECURITY VIOLATION: Downloaded zip sha256 {sha256B} does not match' - f' the advertised "sha256":{sha256A} in the f{manifest_json_name}.') - return 0 + with download_zip_path.open('rb') as f: + sha256B = hashlib.sha256(f.read()).hexdigest() + if sha256A != sha256B: + logger.error(f'SECURITY VIOLATION: Downloaded zip sha256 {sha256B} does not match' + f' the advertised "sha256":{sha256A} in the f{manifest_json_name}.') + return 0 unzipped_manifest_json_data = unzip_manifest_json_data(download_zip_path, manifest_json_name) - # remove the sha256 if present in the advertised downloadable manifest json - # then compare it to the json in the zip, they should now be identical - try: - del download_uri_json_data['sha256'] - except KeyError as e: - pass + # do not include the data we know will not match/exist + for key in ['sha256','repo_name']: + if key in download_uri_json_data: + del download_uri_json_data[key] + if key in unzipped_manifest_json_data: + del unzipped_manifest_json_data[key] - sha256A = hashlib.sha256(json.dumps(download_uri_json_data, indent=4).encode('utf8')).hexdigest() - sha256B = hashlib.sha256(json.dumps(unzipped_manifest_json_data, indent=4).encode('utf8')).hexdigest() - if sha256A != sha256B: - logger.error('SECURITY VIOLATION: Downloaded manifest json does not match' - ' the advertised manifest json.') + if download_uri_json_data != unzipped_manifest_json_data: + logger.error(f'SECURITY VIOLATION: Downloaded {manifest_json_name} contents do not match' + ' the advertised manifest json contents.') return 0 return 1 @@ -102,7 +101,7 @@ def download_o3de_object(object_name: str, default_folder_name: str, dest_path: logger.error(f'Downloadable o3de object {object_name} not found.') return 1 - origin_uri = downloadable_object_data['originuri'] + origin_uri = downloadable_object_data['origin_uri'] parsed_uri = urllib.parse.urlparse(origin_uri) download_zip_result = utils.download_zip_file(parsed_uri, download_zip_path, force_overwrite, download_progress_callback) diff --git a/scripts/o3de/o3de/repo.py b/scripts/o3de/o3de/repo.py index c8fac38605..3ff2a7d982 100644 --- a/scripts/o3de/o3de/repo.py +++ b/scripts/o3de/o3de/repo.py @@ -9,7 +9,6 @@ import json import logging import pathlib -import shutil import urllib.parse import urllib.request import hashlib @@ -217,10 +216,10 @@ def search_repo(manifest_json_data: dict, json_key = 'gem_name' search_func = lambda manifest_json_data: manifest_json_data if manifest_json_data.get(json_key, '') == gem_name else None elif isinstance(template_name, str) or isinstance(template_name, pathlib.PurePath): - o3de_object_uris = manifest_json_data['template'] + o3de_object_uris = manifest_json_data['templates'] manifest_json = 'template.json' json_key = 'template_name' - search_func = lambda manifest_json_data: manifest_json_data if manifest_json_data.get(json_key, '') == template_name_name else None + search_func = lambda manifest_json_data: manifest_json_data if manifest_json_data.get(json_key, '') == template_name else None elif isinstance(restricted_name, str) or isinstance(restricted_name, pathlib.PurePath): o3de_object_uris = manifest_json_data['restricted'] manifest_json = 'restricted.json' From a74fa5c5b840006e45f01becd80d02f1edf7eb28 Mon Sep 17 00:00:00 2001 From: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com> Date: Tue, 16 Nov 2021 17:06:27 -0600 Subject: [PATCH 048/345] Workaround for NVidia flicker bug. (#5669) Somehow, accessing IN.m_uv before the later calculations use it seems to make the values become stable and stop flickering. Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com> --- .../Terrain/TerrainPBR_ForwardPass.azsl | 44 ++++++++++++------- 1 file changed, 28 insertions(+), 16 deletions(-) diff --git a/Gems/Terrain/Assets/Shaders/Terrain/TerrainPBR_ForwardPass.azsl b/Gems/Terrain/Assets/Shaders/Terrain/TerrainPBR_ForwardPass.azsl index 9cfa568b9a..024cccf337 100644 --- a/Gems/Terrain/Assets/Shaders/Terrain/TerrainPBR_ForwardPass.azsl +++ b/Gems/Terrain/Assets/Shaders/Terrain/TerrainPBR_ForwardPass.azsl @@ -80,26 +80,38 @@ ForwardPassOutput TerrainPBR_MainPassPS(VSOutput IN) // ------- Macro Color / Normal ------- float3 macroColor = TerrainMaterialSrg::m_baseColor.rgb; - [unroll] for (uint i = 0; i < 4 && (i < ObjectSrg::m_macroMaterialCount); ++i) + + // There's a bug that shows up with an NVidia GTX 1660 Super card happening on driver versions as recent as 496.49 (10/26/21) in which + // the IN.m_uv values will intermittently "flicker" to 0.0 after entering and exiting game mode. + // (See https://github.com/o3de/o3de/issues/5014) + // This bug has only shown up on PCs when using the DX12 RHI. It doesn't show up with Vulkan or when capturing frames with PIX or + // RenderDoc. Our best guess is that it is a driver bug. The workaround is to use the IN.m_uv values in a calculation prior to the + // point that we actually use them for macroUv below. The "if(any(!isnan(IN.m_uv)))" seems to be sufficient for the workaround. The + // if statement will always be true, but just the act of reading these values in the if statement makes the values stable. Removing + // the if statement causes the flickering to occur using the steps documented in the bug. + if (any(!isnan(IN.m_uv))) { - float2 macroUvMin = ObjectSrg::m_macroMaterialData[i].m_uvMin; - float2 macroUvMax = ObjectSrg::m_macroMaterialData[i].m_uvMax; - float2 macroUv = lerp(macroUvMin, macroUvMax, IN.m_uv); - if (macroUv.x >= 0.0 && macroUv.x <= 1.0 && macroUv.y >= 0.0 && macroUv.y <= 1.0) + [unroll] for (uint i = 0; i < 4 && (i < ObjectSrg::m_macroMaterialCount); ++i) { - if ((ObjectSrg::m_macroMaterialData[i].m_mapsInUse & 1) > 0) + float2 macroUvMin = ObjectSrg::m_macroMaterialData[i].m_uvMin; + float2 macroUvMax = ObjectSrg::m_macroMaterialData[i].m_uvMax; + float2 macroUv = lerp(macroUvMin, macroUvMax, IN.m_uv); + if (macroUv.x >= 0.0 && macroUv.x <= 1.0 && macroUv.y >= 0.0 && macroUv.y <= 1.0) { - macroColor = GetBaseColorInput(ObjectSrg::m_macroColorMap[i], TerrainMaterialSrg::m_sampler, macroUv, macroColor, true); + if ((ObjectSrg::m_macroMaterialData[i].m_mapsInUse & 1) > 0) + { + macroColor = GetBaseColorInput(ObjectSrg::m_macroColorMap[i], TerrainMaterialSrg::m_sampler, macroUv, macroColor, true); + } + if ((ObjectSrg::m_macroMaterialData[i].m_mapsInUse & 2) > 0) + { + bool flipX = ObjectSrg::m_macroMaterialData[i].m_flipNormalX; + bool flipY = ObjectSrg::m_macroMaterialData[i].m_flipNormalY; + bool factor = ObjectSrg::m_macroMaterialData[i].m_normalFactor; + macroNormal = GetNormalInputTS(ObjectSrg::m_macroNormalMap[i], TerrainMaterialSrg::m_sampler, + macroUv, flipX, flipY, CreateIdentity3x3(), true, factor); + } + break; } - if ((ObjectSrg::m_macroMaterialData[i].m_mapsInUse & 2) > 0) - { - bool flipX = ObjectSrg::m_macroMaterialData[i].m_flipNormalX; - bool flipY = ObjectSrg::m_macroMaterialData[i].m_flipNormalY; - bool factor = ObjectSrg::m_macroMaterialData[i].m_normalFactor; - macroNormal = GetNormalInputTS(ObjectSrg::m_macroNormalMap[i], TerrainMaterialSrg::m_sampler, - macroUv, flipX, flipY, CreateIdentity3x3(), true, factor); - } - break; } } From 6c1eefe6055675dccc991b7e709e4e5e7b12530a Mon Sep 17 00:00:00 2001 From: mrieggeramzn <61609885+mrieggeramzn@users.noreply.github.com> Date: Tue, 16 Nov 2021 15:08:28 -0800 Subject: [PATCH 049/345] Fix for two viewports not computing the right camera matrices (#5672) Signed-off-by: mrieggeramzn --- .../DirectionalLightFeatureProcessor.cpp | 37 ++++--------------- .../DirectionalLightFeatureProcessor.h | 8 ---- 2 files changed, 8 insertions(+), 37 deletions(-) diff --git a/Gems/Atom/Feature/Common/Code/Source/CoreLights/DirectionalLightFeatureProcessor.cpp b/Gems/Atom/Feature/Common/Code/Source/CoreLights/DirectionalLightFeatureProcessor.cpp index ce5d3cc363..8a1ff95f29 100644 --- a/Gems/Atom/Feature/Common/Code/Source/CoreLights/DirectionalLightFeatureProcessor.cpp +++ b/Gems/Atom/Feature/Common/Code/Source/CoreLights/DirectionalLightFeatureProcessor.cpp @@ -343,7 +343,6 @@ namespace AZ m_shadowBufferNeedsUpdate = true; m_shadowProperties.GetData(index).m_cameraConfigurations[nullptr] = {}; - m_shadowProperties.GetData(index).m_cameraTransforms[nullptr] = Transform::CreateIdentity(); const LightHandle handle(index); m_shadowingLightHandle = handle; // only the recent light has shadows. @@ -495,20 +494,10 @@ namespace AZ void DirectionalLightFeatureProcessor::SetCameraTransform( LightHandle handle, - const Transform& cameraTransform, - const RPI::RenderPipelineId& renderPipelineId) + const Transform&, + const RPI::RenderPipelineId&) { ShadowProperty& property = m_shadowProperties.GetData(handle.GetIndex()); - - if (RPI::RenderPipeline* renderPipeline = GetParentScene()->GetRenderPipeline(renderPipelineId).get()) - { - const RPI::View* cameraView = renderPipeline->GetDefaultView().get(); - property.m_cameraTransforms[cameraView] = cameraTransform; - } - else - { - property.m_cameraTransforms[nullptr] = cameraTransform; - } property.m_shadowmapViewNeedsUpdate = true; } @@ -934,17 +923,6 @@ namespace AZ return property.m_cameraConfigurations.at(nullptr); } - const Transform& DirectionalLightFeatureProcessor::GetCameraTransform(LightHandle handle, const RPI::View* cameraView) const - { - const ShadowProperty& property = m_shadowProperties.GetData(handle.GetIndex()); - const auto findIt = property.m_cameraTransforms.find(cameraView); - if (findIt != property.m_cameraTransforms.end()) - { - return findIt->second; - } - return property.m_cameraTransforms.at(nullptr); - } - void DirectionalLightFeatureProcessor::UpdateFrustums( LightHandle handle) { @@ -1365,10 +1343,11 @@ namespace AZ // If we used an AABB whose Y-direction range is from a segment, // the depth value on the shadowmap saturated to 0 or 1, // and we could not draw shadow correctly. + const Transform cameraTransform = cameraView->GetCameraTransform(); const Vector3 entireFrustumCenterLight = - lightTransform.GetInverseFast() * (GetCameraTransform(handle, cameraView).TransformPoint(property.m_entireFrustumCenterLocal)); + lightTransform.GetInverseFast() * (cameraTransform.TransformPoint(property.m_entireFrustumCenterLocal)); const float entireCenterY = entireFrustumCenterLight.GetElement(1); - const Vector3 cameraLocationWorld = GetCameraTransform(handle, cameraView).GetTranslation(); + const Vector3 cameraLocationWorld = cameraTransform.GetTranslation(); const Vector3 cameraLocationLight = lightTransformInverse * cameraLocationWorld; // Extend light view frustum by camera depth far in order to avoid shadow lacking behind camera. const float cameraBehindMinY = cameraLocationLight.GetElement(1) - GetCameraConfiguration(handle, cameraView).GetDepthFar(); @@ -1428,8 +1407,8 @@ namespace AZ GetCameraConfiguration(handle, cameraView).GetDepthCenter(depthNear, depthFar), depthFar); - const Vector3 localCenter{ 0.f, depthCenter, 0.f }; - return GetCameraTransform(handle, cameraView).TransformPoint(localCenter); + const Vector3 localCenter{ 0.f, depthCenter, 0.f }; + return cameraView->GetCameraTransform().TransformPoint(localCenter); } float DirectionalLightFeatureProcessor::GetRadius( @@ -1483,7 +1462,7 @@ namespace AZ const ShadowProperty& property = m_shadowProperties.GetData(handle.GetIndex()); const Vector3& boundaryCenter = GetWorldCenterPosition(handle, cameraView, depthNear, depthFar); const CascadeShadowCameraConfiguration& cameraConfiguration = GetCameraConfiguration(handle, cameraView); - const Transform& cameraTransform = GetCameraTransform(handle, cameraView); + const Transform cameraTransform = cameraView->GetCameraTransform(); const Vector3& cameraFwd = cameraTransform.GetBasis(1); const Vector3& cameraUp = cameraTransform.GetBasis(2); const Vector3 cameraToBoundaryCenter = boundaryCenter - cameraTransform.GetTranslation(); diff --git a/Gems/Atom/Feature/Common/Code/Source/CoreLights/DirectionalLightFeatureProcessor.h b/Gems/Atom/Feature/Common/Code/Source/CoreLights/DirectionalLightFeatureProcessor.h index 77f2db38d6..c206a5097f 100644 --- a/Gems/Atom/Feature/Common/Code/Source/CoreLights/DirectionalLightFeatureProcessor.h +++ b/Gems/Atom/Feature/Common/Code/Source/CoreLights/DirectionalLightFeatureProcessor.h @@ -134,9 +134,6 @@ namespace AZ // Default far depth of each cascade. AZStd::array m_defaultFarDepths; - // Transforms of camera who offers view frustum for each camera view. - AZStd::unordered_map m_cameraTransforms; - // Configuration offers shape of the camera view frustum for each camera view. AZStd::unordered_map m_cameraConfigurations; @@ -259,11 +256,6 @@ namespace AZ //! it returns one of the fallback render pipeline ID. const CascadeShadowCameraConfiguration& GetCameraConfiguration(LightHandle handle, const RPI::View* cameraView) const; - //! This returns the camera transform. - //! If it has not been registered for the given camera view. - //! it returns one of the fallback render pipeline ID. - const Transform& GetCameraTransform(LightHandle handle, const RPI::View* cameraView) const; - //! This update view frustum of camera. void UpdateFrustums(LightHandle handle); From 2ae8477683394a4cb550c58d6e024fdb7c684db3 Mon Sep 17 00:00:00 2001 From: Qing Tao <55564570+VickyAtAZ@users.noreply.github.com> Date: Tue, 16 Nov 2021 15:25:13 -0800 Subject: [PATCH 050/345] ATOM-13512 Altering IBL ImageProcessor .preset Does Not Force Assets to Rebuild (#5639) Changes include: - Move config files from ImageProcessingAtom/Config/ folder to ImageProcessingAtom/Assets/Config/ folder so it can be watched as source depencies. - Change GetSuggestedPreset function so it can return certain preset for certain file name. - Move file mask mappings from preset to ImageBuilder.settings. But the file masks in preset can still be used. - Changed from using project config folder's imageBuilder.Settings for override to using it as json merge patch. - Expose GetFileHash function in AssetBuilderSDK api. Signed-off-by: Qing Tao <55564570+VickyAtAZ@users.noreply.github.com> --- .../AssetBuilderSDK/AssetBuilderSDK.cpp | 68 +++ .../AssetBuilderSDK/AssetBuilderSDK.h | 13 + .../AssetBuilderSDK/CMakeLists.txt | 1 + .../native/utilities/assetUtils.cpp | 64 +-- .../{ => Assets}/Config/Albedo.preset | 50 --- .../Config/AlbedoWithCoverage.preset | 45 -- .../Config/AlbedoWithGenericAlpha.preset | 52 +-- .../Config/AmbientOcclusion.preset | 30 -- .../Config/ConvolvedCubemap.preset | 20 - .../Config/Decal_AlbedoWithOpacity.preset | 15 - .../{ => Assets}/Config/Displacement.preset | 60 --- .../{ => Assets}/Config/Emissive.preset | 35 -- .../{ => Assets}/Config/Gradient.preset | 0 .../{ => Assets}/Config/Greyscale.preset | 25 +- .../{ => Assets}/Config/IBLDiffuse.preset | 15 - .../{ => Assets}/Config/IBLGlobal.preset | 5 - .../{ => Assets}/Config/IBLSkybox.preset | 15 - .../{ => Assets}/Config/IBLSpecular.preset | 20 - .../Config/IBLSpecularHigh.preset | 15 - .../{ => Assets}/Config/IBLSpecularLow.preset | 15 - .../Config/IBLSpecularVeryHigh.preset | 15 - .../Config/IBLSpecularVeryLow.preset | 15 - .../Assets/Config/ImageBuilder.settings | 150 +++++++ .../{ => Assets}/Config/LUT_R32F.preset | 1 - .../{ => Assets}/Config/LUT_RG16.preset | 0 .../{ => Assets}/Config/LUT_RG32F.preset | 1 - .../{ => Assets}/Config/LUT_RG8.preset | 15 - .../{ => Assets}/Config/LUT_RGBA16.preset | 15 - .../{ => Assets}/Config/LUT_RGBA16F.preset | 15 - .../{ => Assets}/Config/LUT_RGBA32F.preset | 1 - .../{ => Assets}/Config/LUT_RGBA8.preset | 0 .../{ => Assets}/Config/LayerMask.preset | 20 - .../{ => Assets}/Config/Normals.preset | 55 --- .../Config/NormalsWithSmoothness.preset | 35 -- .../{ => Assets}/Config/Opacity.preset | 65 +-- .../{ => Assets}/Config/ReferenceImage.preset | 0 .../Config/ReferenceImage_HDRLinear.preset | 0 ...eferenceImage_HDRLinearUncompressed.preset | 0 .../Config/ReferenceImage_Linear.preset | 0 .../Assets/Config/Reflectance.preset | 66 +++ .../{ => Assets}/Config/Skybox.preset | 15 - .../Config/UserInterface_Compressed.preset | 3 +- .../Config/UserInterface_Lossless.preset | 3 +- .../BuilderSettings/BuilderSettingManager.cpp | 397 ++++++++++++------ .../BuilderSettings/BuilderSettingManager.h | 64 ++- .../Code/Source/Editor/EditorCommon.cpp | 2 +- .../Code/Source/ImageBuilderComponent.cpp | 67 ++- .../Code/Source/Processing/ImageConvert.cpp | 58 ++- .../Code/Source/Processing/ImageConvert.h | 2 +- .../Source/Processing/ImageObjectImpl.cpp | 3 +- .../Code/Source/Processing/Utils.cpp | 7 + .../Code/Source/Processing/Utils.h | 2 + .../Code/Tests/ImageProcessing_Test.cpp | 2 +- .../Config/ImageBuilder.settings | 67 --- .../Config/Reflectance.preset | 157 ------- 55 files changed, 763 insertions(+), 1118 deletions(-) rename Gems/Atom/Asset/ImageProcessingAtom/{ => Assets}/Config/Albedo.preset (60%) rename Gems/Atom/Asset/ImageProcessingAtom/{ => Assets}/Config/AlbedoWithCoverage.preset (60%) rename Gems/Atom/Asset/ImageProcessingAtom/{ => Assets}/Config/AlbedoWithGenericAlpha.preset (55%) rename Gems/Atom/Asset/ImageProcessingAtom/{ => Assets}/Config/AmbientOcclusion.preset (64%) rename Gems/Atom/Asset/ImageProcessingAtom/{ => Assets}/Config/ConvolvedCubemap.preset (88%) rename Gems/Atom/Asset/ImageProcessingAtom/{ => Assets}/Config/Decal_AlbedoWithOpacity.preset (86%) rename Gems/Atom/Asset/ImageProcessingAtom/{ => Assets}/Config/Displacement.preset (59%) rename Gems/Atom/Asset/ImageProcessingAtom/{ => Assets}/Config/Emissive.preset (61%) rename Gems/Atom/Asset/ImageProcessingAtom/{ => Assets}/Config/Gradient.preset (100%) rename Gems/Atom/Asset/ImageProcessingAtom/{ => Assets}/Config/Greyscale.preset (77%) rename Gems/Atom/Asset/ImageProcessingAtom/{ => Assets}/Config/IBLDiffuse.preset (90%) rename Gems/Atom/Asset/ImageProcessingAtom/{ => Assets}/Config/IBLGlobal.preset (83%) rename Gems/Atom/Asset/ImageProcessingAtom/{ => Assets}/Config/IBLSkybox.preset (90%) rename Gems/Atom/Asset/ImageProcessingAtom/{ => Assets}/Config/IBLSpecular.preset (87%) rename Gems/Atom/Asset/ImageProcessingAtom/{ => Assets}/Config/IBLSpecularHigh.preset (90%) rename Gems/Atom/Asset/ImageProcessingAtom/{ => Assets}/Config/IBLSpecularLow.preset (90%) rename Gems/Atom/Asset/ImageProcessingAtom/{ => Assets}/Config/IBLSpecularVeryHigh.preset (90%) rename Gems/Atom/Asset/ImageProcessingAtom/{ => Assets}/Config/IBLSpecularVeryLow.preset (90%) create mode 100644 Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/ImageBuilder.settings rename Gems/Atom/Asset/ImageProcessingAtom/{ => Assets}/Config/LUT_R32F.preset (97%) rename Gems/Atom/Asset/ImageProcessingAtom/{ => Assets}/Config/LUT_RG16.preset (100%) rename Gems/Atom/Asset/ImageProcessingAtom/{ => Assets}/Config/LUT_RG32F.preset (97%) rename Gems/Atom/Asset/ImageProcessingAtom/{ => Assets}/Config/LUT_RG8.preset (79%) rename Gems/Atom/Asset/ImageProcessingAtom/{ => Assets}/Config/LUT_RGBA16.preset (78%) rename Gems/Atom/Asset/ImageProcessingAtom/{ => Assets}/Config/LUT_RGBA16F.preset (78%) rename Gems/Atom/Asset/ImageProcessingAtom/{ => Assets}/Config/LUT_RGBA32F.preset (97%) rename Gems/Atom/Asset/ImageProcessingAtom/{ => Assets}/Config/LUT_RGBA8.preset (100%) rename Gems/Atom/Asset/ImageProcessingAtom/{ => Assets}/Config/LayerMask.preset (72%) rename Gems/Atom/Asset/ImageProcessingAtom/{ => Assets}/Config/Normals.preset (62%) rename Gems/Atom/Asset/ImageProcessingAtom/{ => Assets}/Config/NormalsWithSmoothness.preset (74%) rename Gems/Atom/Asset/ImageProcessingAtom/{ => Assets}/Config/Opacity.preset (56%) rename Gems/Atom/Asset/ImageProcessingAtom/{ => Assets}/Config/ReferenceImage.preset (100%) rename Gems/Atom/Asset/ImageProcessingAtom/{ => Assets}/Config/ReferenceImage_HDRLinear.preset (100%) rename Gems/Atom/Asset/ImageProcessingAtom/{ => Assets}/Config/ReferenceImage_HDRLinearUncompressed.preset (100%) rename Gems/Atom/Asset/ImageProcessingAtom/{ => Assets}/Config/ReferenceImage_Linear.preset (100%) create mode 100644 Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/Reflectance.preset rename Gems/Atom/Asset/ImageProcessingAtom/{ => Assets}/Config/Skybox.preset (86%) rename Gems/Atom/Asset/ImageProcessingAtom/{ => Assets}/Config/UserInterface_Compressed.preset (95%) rename Gems/Atom/Asset/ImageProcessingAtom/{ => Assets}/Config/UserInterface_Lossless.preset (95%) delete mode 100644 Gems/Atom/Asset/ImageProcessingAtom/Config/ImageBuilder.settings delete mode 100644 Gems/Atom/Asset/ImageProcessingAtom/Config/Reflectance.preset diff --git a/Code/Tools/AssetProcessor/AssetBuilderSDK/AssetBuilderSDK/AssetBuilderSDK.cpp b/Code/Tools/AssetProcessor/AssetBuilderSDK/AssetBuilderSDK/AssetBuilderSDK.cpp index f9b5d6aef7..b5323dd419 100644 --- a/Code/Tools/AssetProcessor/AssetBuilderSDK/AssetBuilderSDK/AssetBuilderSDK.cpp +++ b/Code/Tools/AssetProcessor/AssetBuilderSDK/AssetBuilderSDK/AssetBuilderSDK.cpp @@ -23,6 +23,8 @@ #include ////////////////////////////////////////////////////////////////////////// +#include + namespace AssetBuilderSDK { const char* const ErrorWindow = "Error"; //Use this window name to log error messages. @@ -1599,4 +1601,70 @@ namespace AssetBuilderSDK { return m_errorsOccurred; } + + AZ::u64 GetHashFromIOStream(AZ::IO::GenericStream& readStream, AZ::IO::SizeType* bytesReadOut, int hashMsDelay) + { + constexpr AZ::u64 HashBufferSize = 1024 * 64; + char buffer[HashBufferSize]; + + if(readStream.IsOpen() && readStream.CanRead()) + { + AZ::IO::SizeType bytesRead; + + auto* state = XXH64_createState(); + + if(state == nullptr) + { + AZ_Assert(false, "Failed to create hash state"); + return 0; + } + + if (XXH64_reset(state, 0) == XXH_ERROR) + { + AZ_Assert(false, "Failed to reset hash state"); + return 0; + } + + do + { + // In edge cases where another process is writing to this file while this hashing is occuring and that file wasn't locked, + // the following read check can fail because it performs an end of file check, and asserts and shuts down if the read size + // was smaller than the buffer and the read is not at the end of the file. The logic used to check end of file internal to read + // will be out of date in the edge cases where another process is actively writing to this file while this hash is running. + // The stream's length ends up more accurate in this case, preventing this assert and shut down. + // One area this occurs is the navigation mesh file (mnmnavmission0.bai) that's temporarily created when exporting a level, + // the navigation system can still be writing to this file when hashing begins, causing the EoF marker to change. + AZ::IO::SizeType remainingToRead = AZStd::min(readStream.GetLength() - readStream.GetCurPos(), aznumeric_cast(AZ_ARRAY_SIZE(buffer))); + bytesRead = readStream.Read(remainingToRead, buffer); + + if(bytesReadOut) + { + *bytesReadOut += bytesRead; + } + + XXH64_update(state, buffer, bytesRead); + + // Used by unit tests to force the race condition mentioned above, to verify the crash fix. + if(hashMsDelay > 0) + { + AZStd::this_thread::sleep_for(AZStd::chrono::milliseconds(hashMsDelay)); + } + + } while (bytesRead > 0); + + auto hash = XXH64_digest(state); + + XXH64_freeState(state); + + return hash; + } + return 0; + } + + AZ::u64 GetFileHash(const char* filePath, AZ::IO::SizeType* bytesReadOut, int hashMsDelay) + { + constexpr bool ErrorOnReadFailure = true; + AZ::IO::FileIOStream readStream(filePath, AZ::IO::OpenMode::ModeRead | AZ::IO::OpenMode::ModeBinary, ErrorOnReadFailure); + return GetHashFromIOStream(readStream, bytesReadOut, hashMsDelay); + } } diff --git a/Code/Tools/AssetProcessor/AssetBuilderSDK/AssetBuilderSDK/AssetBuilderSDK.h b/Code/Tools/AssetProcessor/AssetBuilderSDK/AssetBuilderSDK/AssetBuilderSDK.h index c85c45dd3e..6fb099e6d3 100644 --- a/Code/Tools/AssetProcessor/AssetBuilderSDK/AssetBuilderSDK/AssetBuilderSDK.h +++ b/Code/Tools/AssetProcessor/AssetBuilderSDK/AssetBuilderSDK/AssetBuilderSDK.h @@ -910,6 +910,19 @@ namespace AssetBuilderSDK //! There can be multiple builders running at once, so we need to filter out ones coming from other builders AZStd::thread_id m_jobThreadId; }; + + //! Get hash for a whole file + //! @filePath the path for the file + //! @bytesReadOut output the read file size in bytes + //! @hashMsDelay [Do not use except for unit test] add a delay in ms for between each block reading. + AZ::u64 GetFileHash(const char* filePath, AZ::IO::SizeType* bytesReadOut = nullptr, int hashMsDelay = 0); + + //! Get hash for a generic IO stream + //! @readStream the input readable stream + //! @bytesReadOut output the read size in bytes + //! @hashMsDelay [Do not use except for unit test] add a delay in ms for between each block reading. + AZ::u64 GetHashFromIOStream(AZ::IO::GenericStream& readStream, AZ::IO::SizeType* bytesReadOut = nullptr, int hashMsDelay = 0); + } // namespace AssetBuilderSDK namespace AZ diff --git a/Code/Tools/AssetProcessor/AssetBuilderSDK/CMakeLists.txt b/Code/Tools/AssetProcessor/AssetBuilderSDK/CMakeLists.txt index 635cd55f6c..bfbcc35663 100644 --- a/Code/Tools/AssetProcessor/AssetBuilderSDK/CMakeLists.txt +++ b/Code/Tools/AssetProcessor/AssetBuilderSDK/CMakeLists.txt @@ -32,6 +32,7 @@ ly_add_target( PUBLIC AZ::AzFramework AZ::AzToolsFramework + 3rdParty::xxhash ) ly_add_source_properties( SOURCES AssetBuilderSDK/AssetBuilderSDK.cpp diff --git a/Code/Tools/AssetProcessor/native/utilities/assetUtils.cpp b/Code/Tools/AssetProcessor/native/utilities/assetUtils.cpp index cacd6c4cc9..340f5343bd 100644 --- a/Code/Tools/AssetProcessor/native/utilities/assetUtils.cpp +++ b/Code/Tools/AssetProcessor/native/utilities/assetUtils.cpp @@ -1161,7 +1161,7 @@ namespace AssetUtilities { #ifndef AZ_TESTS_ENABLED // Only used for unit tests, speed is critical for GetFileHash. - AZ_UNUSED(hashMsDelay); + hashMsDelay = 0; #endif bool useFileHashing = ShouldUseFileHashing(); @@ -1170,10 +1170,10 @@ namespace AssetUtilities return 0; } + AZ::u64 hash = 0; if(!force) { auto* fileStateInterface = AZ::Interface::Get(); - AZ::u64 hash = 0; if (fileStateInterface && fileStateInterface->GetHash(filePath, &hash)) { @@ -1181,64 +1181,8 @@ namespace AssetUtilities } } - char buffer[FileHashBufferSize]; - - constexpr bool ErrorOnReadFailure = true; - AZ::IO::FileIOStream readStream(filePath, AZ::IO::OpenMode::ModeRead | AZ::IO::OpenMode::ModeBinary, ErrorOnReadFailure); - - if(readStream.IsOpen() && readStream.CanRead()) - { - AZ::IO::SizeType bytesRead; - - auto* state = XXH64_createState(); - - if(state == nullptr) - { - AZ_Assert(false, "Failed to create hash state"); - return 0; - } - - if (XXH64_reset(state, 0) == XXH_ERROR) - { - AZ_Assert(false, "Failed to reset hash state"); - return 0; - } - - do - { - // In edge cases where another process is writing to this file while this hashing is occuring and that file wasn't locked, - // the following read check can fail because it performs an end of file check, and asserts and shuts down if the read size - // was smaller than the buffer and the read is not at the end of the file. The logic used to check end of file internal to read - // will be out of date in the edge cases where another process is actively writing to this file while this hash is running. - // The stream's length ends up more accurate in this case, preventing this assert and shut down. - // One area this occurs is the navigation mesh file (mnmnavmission0.bai) that's temporarily created when exporting a level, - // the navigation system can still be writing to this file when hashing begins, causing the EoF marker to change. - AZ::IO::SizeType remainingToRead = AZStd::min(readStream.GetLength() - readStream.GetCurPos(), aznumeric_cast(AZ_ARRAY_SIZE(buffer))); - bytesRead = readStream.Read(remainingToRead, buffer); - - if(bytesReadOut) - { - *bytesReadOut += bytesRead; - } - - XXH64_update(state, buffer, bytesRead); -#ifdef AZ_TESTS_ENABLED - // Used by unit tests to force the race condition mentioned above, to verify the crash fix. - if(hashMsDelay > 0) - { - AZStd::this_thread::sleep_for(AZStd::chrono::milliseconds(hashMsDelay)); - } -#endif - - } while (bytesRead > 0); - - auto hash = XXH64_digest(state); - - XXH64_freeState(state); - - return hash; - } - return 0; + hash = AssetBuilderSDK::GetFileHash(filePath, bytesReadOut, hashMsDelay); + return hash; } AZ::u64 AdjustTimestamp(QDateTime timestamp) diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Config/Albedo.preset b/Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/Albedo.preset similarity index 60% rename from Gems/Atom/Asset/ImageProcessingAtom/Config/Albedo.preset rename to Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/Albedo.preset index fe2e7e0cb4..dc1f38d2da 100644 --- a/Gems/Atom/Asset/ImageProcessingAtom/Config/Albedo.preset +++ b/Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/Albedo.preset @@ -7,16 +7,6 @@ "UUID": "{08A95286-ADB2-41E4-96EB-DB48F4726D6A}", "Name": "Albedo", "RGB_Weight": "CIEXYZ", - "FileMasks": [ - "_basecolor", - "_diff", - "_color", - "_col", - "_albedo", - "_alb", - "_bc", - "_diffuse" - ], "PixelFormat": "BC1", "DiscardAlpha": true, "IsPowerOf2": true, @@ -29,16 +19,6 @@ "UUID": "{08A95286-ADB2-41E4-96EB-DB48F4726D6A}", "Name": "Albedo", "RGB_Weight": "CIEXYZ", - "FileMasks": [ - "_diff", - "_color", - "_col", - "_albedo", - "_alb", - "_basecolor", - "_bc", - "_diffuse" - ], "PixelFormat": "ASTC_6x6", "MaxTextureSize": 2048, "DiscardAlpha": true, @@ -51,16 +31,6 @@ "UUID": "{08A95286-ADB2-41E4-96EB-DB48F4726D6A}", "Name": "Albedo", "RGB_Weight": "CIEXYZ", - "FileMasks": [ - "_diff", - "_color", - "_col", - "_albedo", - "_alb", - "_basecolor", - "_bc", - "_diffuse" - ], "PixelFormat": "ASTC_6x6", "MaxTextureSize": 2048, "DiscardAlpha": true, @@ -73,16 +43,6 @@ "UUID": "{08A95286-ADB2-41E4-96EB-DB48F4726D6A}", "Name": "Albedo", "RGB_Weight": "CIEXYZ", - "FileMasks": [ - "_diff", - "_color", - "_col", - "_albedo", - "_alb", - "_basecolor", - "_bc", - "_diffuse" - ], "PixelFormat": "BC1", "DiscardAlpha": true, "IsPowerOf2": true, @@ -94,16 +54,6 @@ "UUID": "{08A95286-ADB2-41E4-96EB-DB48F4726D6A}", "Name": "Albedo", "RGB_Weight": "CIEXYZ", - "FileMasks": [ - "_diff", - "_color", - "_col", - "_albedo", - "_alb", - "_basecolor", - "_bc", - "_diffuse" - ], "PixelFormat": "BC1", "DiscardAlpha": true, "IsPowerOf2": true, diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Config/AlbedoWithCoverage.preset b/Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/AlbedoWithCoverage.preset similarity index 60% rename from Gems/Atom/Asset/ImageProcessingAtom/Config/AlbedoWithCoverage.preset rename to Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/AlbedoWithCoverage.preset index fda5a9cc52..439a057410 100644 --- a/Gems/Atom/Asset/ImageProcessingAtom/Config/AlbedoWithCoverage.preset +++ b/Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/AlbedoWithCoverage.preset @@ -7,15 +7,6 @@ "UUID": "{57ED16B1-407B-4E29-BCFC-D3BAE60F2C85}", "Name": "AlbedoWithCoverage", "RGB_Weight": "CIEXYZ", - "FileMasks": [ - "_diff", - "_color", - "_albedo", - "_alb", - "_basecolor", - "_bc", - "_diffuse" - ], "PixelFormat": "BC1a", "IsPowerOf2": true, "MipMapSetting": { @@ -27,15 +18,6 @@ "UUID": "{57ED16B1-407B-4E29-BCFC-D3BAE60F2C85}", "Name": "AlbedoWithCoverage", "RGB_Weight": "CIEXYZ", - "FileMasks": [ - "_diff", - "_color", - "_albedo", - "_alb", - "_basecolor", - "_bc", - "_diffuse" - ], "PixelFormat": "ASTC_6x6", "IsPowerOf2": true, "MipMapSetting": { @@ -46,15 +28,6 @@ "UUID": "{57ED16B1-407B-4E29-BCFC-D3BAE60F2C85}", "Name": "AlbedoWithCoverage", "RGB_Weight": "CIEXYZ", - "FileMasks": [ - "_diff", - "_color", - "_albedo", - "_alb", - "_basecolor", - "_bc", - "_diffuse" - ], "PixelFormat": "ASTC_6x6", "IsPowerOf2": true, "MipMapSetting": { @@ -65,15 +38,6 @@ "UUID": "{57ED16B1-407B-4E29-BCFC-D3BAE60F2C85}", "Name": "AlbedoWithCoverage", "RGB_Weight": "CIEXYZ", - "FileMasks": [ - "_diff", - "_color", - "_albedo", - "_alb", - "_basecolor", - "_bc", - "_diffuse" - ], "PixelFormat": "BC1a", "IsPowerOf2": true, "MipMapSetting": { @@ -84,15 +48,6 @@ "UUID": "{57ED16B1-407B-4E29-BCFC-D3BAE60F2C85}", "Name": "AlbedoWithCoverage", "RGB_Weight": "CIEXYZ", - "FileMasks": [ - "_diff", - "_color", - "_albedo", - "_alb", - "_basecolor", - "_bc", - "_diffuse" - ], "PixelFormat": "BC1a", "IsPowerOf2": true, "MipMapSetting": { diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Config/AlbedoWithGenericAlpha.preset b/Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/AlbedoWithGenericAlpha.preset similarity index 55% rename from Gems/Atom/Asset/ImageProcessingAtom/Config/AlbedoWithGenericAlpha.preset rename to Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/AlbedoWithGenericAlpha.preset index 19d2b2bbe6..c315ede21c 100644 --- a/Gems/Atom/Asset/ImageProcessingAtom/Config/AlbedoWithGenericAlpha.preset +++ b/Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/AlbedoWithGenericAlpha.preset @@ -7,17 +7,7 @@ "UUID": "{5D9ECB52-4CD9-4CB8-80E3-10CAE5EFB8A2}", "Name": "AlbedoWithGenericAlpha", "RGB_Weight": "CIEXYZ", - "FileMasks": [ - "_diff", - "_color", - "_albedo", - "_alb", - "_basecolor", - "_bc", - "_diffuse" - ], - "PixelFormat": "BC3", - "IsPowerOf2": true, + "PixelFormat": "ASTC_4x4", "MipMapSetting": { "MipGenType": "Box" } @@ -27,18 +17,8 @@ "UUID": "{5D9ECB52-4CD9-4CB8-80E3-10CAE5EFB8A2}", "Name": "AlbedoWithGenericAlpha", "RGB_Weight": "CIEXYZ", - "FileMasks": [ - "_diff", - "_color", - "_albedo", - "_alb", - "_basecolor", - "_bc", - "_diffuse" - ], "PixelFormat": "ASTC_6x6", "MaxTextureSize": 2048, - "IsPowerOf2": true, "MipMapSetting": { "MipGenType": "Box" } @@ -47,18 +27,8 @@ "UUID": "{5D9ECB52-4CD9-4CB8-80E3-10CAE5EFB8A2}", "Name": "AlbedoWithGenericAlpha", "RGB_Weight": "CIEXYZ", - "FileMasks": [ - "_diff", - "_color", - "_albedo", - "_alb", - "_basecolor", - "_bc", - "_diffuse" - ], "PixelFormat": "ASTC_6x6", "MaxTextureSize": 2048, - "IsPowerOf2": true, "MipMapSetting": { "MipGenType": "Box" } @@ -67,17 +37,7 @@ "UUID": "{5D9ECB52-4CD9-4CB8-80E3-10CAE5EFB8A2}", "Name": "AlbedoWithGenericAlpha", "RGB_Weight": "CIEXYZ", - "FileMasks": [ - "_diff", - "_color", - "_albedo", - "_alb", - "_basecolor", - "_bc", - "_diffuse" - ], "PixelFormat": "BC3", - "IsPowerOf2": true, "MipMapSetting": { "MipGenType": "Box" } @@ -86,17 +46,7 @@ "UUID": "{5D9ECB52-4CD9-4CB8-80E3-10CAE5EFB8A2}", "Name": "AlbedoWithGenericAlpha", "RGB_Weight": "CIEXYZ", - "FileMasks": [ - "_diff", - "_color", - "_albedo", - "_alb", - "_basecolor", - "_bc", - "_diffuse" - ], "PixelFormat": "BC3", - "IsPowerOf2": true, "MipMapSetting": { "MipGenType": "Box" } diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Config/AmbientOcclusion.preset b/Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/AmbientOcclusion.preset similarity index 64% rename from Gems/Atom/Asset/ImageProcessingAtom/Config/AmbientOcclusion.preset rename to Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/AmbientOcclusion.preset index d5acef34d6..573de18b88 100644 --- a/Gems/Atom/Asset/ImageProcessingAtom/Config/AmbientOcclusion.preset +++ b/Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/AmbientOcclusion.preset @@ -8,12 +8,6 @@ "Name": "AmbientOcclusion", "SourceColor": "Linear", "DestColor": "Linear", - "FileMasks": [ - "_ao", - "_ambocc", - "_amb", - "_ambientocclusion" - ], "PixelFormat": "BC4" }, "PlatformsPresets": { @@ -22,12 +16,6 @@ "Name": "AmbientOcclusion", "SourceColor": "Linear", "DestColor": "Linear", - "FileMasks": [ - "_ao", - "_ambocc", - "_amb", - "_ambientocclusion" - ], "MaxTextureSize": 2048, "PixelFormat": "ASTC_4x4" }, @@ -36,12 +24,6 @@ "Name": "AmbientOcclusion", "SourceColor": "Linear", "DestColor": "Linear", - "FileMasks": [ - "_ao", - "_ambocc", - "_amb", - "_ambientocclusion" - ], "MaxTextureSize": 2048, "PixelFormat": "ASTC_4x4" }, @@ -50,12 +32,6 @@ "Name": "AmbientOcclusion", "SourceColor": "Linear", "DestColor": "Linear", - "FileMasks": [ - "_ao", - "_ambocc", - "_amb", - "_ambientocclusion" - ], "PixelFormat": "BC4" }, "provo": { @@ -63,12 +39,6 @@ "Name": "AmbientOcclusion", "SourceColor": "Linear", "DestColor": "Linear", - "FileMasks": [ - "_ao", - "_ambocc", - "_amb", - "_ambientocclusion" - ], "PixelFormat": "BC4" } } diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Config/ConvolvedCubemap.preset b/Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/ConvolvedCubemap.preset similarity index 88% rename from Gems/Atom/Asset/ImageProcessingAtom/Config/ConvolvedCubemap.preset rename to Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/ConvolvedCubemap.preset index abdf6501be..1ef15ada45 100644 --- a/Gems/Atom/Asset/ImageProcessingAtom/Config/ConvolvedCubemap.preset +++ b/Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/ConvolvedCubemap.preset @@ -8,10 +8,6 @@ "Name": "ConvolvedCubemap", "SourceColor": "Linear", "DestColor": "Linear", - "FileMasks": [ - "_ccm", - "_convolvedcubemap" - ], "SuppressEngineReduce": true, "PixelFormat": "R9G9B9E5", "DiscardAlpha": true, @@ -35,10 +31,6 @@ "Name": "ConvolvedCubemap", "SourceColor": "Linear", "DestColor": "Linear", - "FileMasks": [ - "_ccm", - "_convolvedcubemap" - ], "SuppressEngineReduce": true, "PixelFormat": "R9G9B9E5", "DiscardAlpha": true, @@ -61,10 +53,6 @@ "Name": "ConvolvedCubemap", "SourceColor": "Linear", "DestColor": "Linear", - "FileMasks": [ - "_ccm", - "_convolvedcubemap" - ], "SuppressEngineReduce": true, "PixelFormat": "R9G9B9E5", "DiscardAlpha": true, @@ -87,10 +75,6 @@ "Name": "ConvolvedCubemap", "SourceColor": "Linear", "DestColor": "Linear", - "FileMasks": [ - "_ccm", - "_convolvedcubemap" - ], "SuppressEngineReduce": true, "PixelFormat": "R9G9B9E5", "DiscardAlpha": true, @@ -113,10 +97,6 @@ "Name": "ConvolvedCubemap", "SourceColor": "Linear", "DestColor": "Linear", - "FileMasks": [ - "_ccm", - "_convolvedcubemap" - ], "SuppressEngineReduce": true, "PixelFormat": "R9G9B9E5", "DiscardAlpha": true, diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Config/Decal_AlbedoWithOpacity.preset b/Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/Decal_AlbedoWithOpacity.preset similarity index 86% rename from Gems/Atom/Asset/ImageProcessingAtom/Config/Decal_AlbedoWithOpacity.preset rename to Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/Decal_AlbedoWithOpacity.preset index e2e009afc5..873d434380 100644 --- a/Gems/Atom/Asset/ImageProcessingAtom/Config/Decal_AlbedoWithOpacity.preset +++ b/Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/Decal_AlbedoWithOpacity.preset @@ -6,9 +6,6 @@ "DefaultPreset": { "UUID": "{E06B5087-2640-49B6-B9BA-D40048162B90}", "Name": "Decal_AlbedoWithOpacity", - "FileMasks": [ - "_decal" - ], "PixelFormat": "BC7t", "IsPowerOf2": true, "MipMapSetting": { @@ -21,9 +18,6 @@ "android": { "UUID": "{E06B5087-2640-49B6-B9BA-D40048162B90}", "Name": "Decal_AlbedoWithOpacity", - "FileMasks": [ - "_decal" - ], "PixelFormat": "ASTC_4x4", "MaxTextureSize": 2048, "IsPowerOf2": true, @@ -36,9 +30,6 @@ "ios": { "UUID": "{E06B5087-2640-49B6-B9BA-D40048162B90}", "Name": "Decal_AlbedoWithOpacity", - "FileMasks": [ - "_decal" - ], "PixelFormat": "ASTC_4x4", "MaxTextureSize": 2048, "IsPowerOf2": true, @@ -51,9 +42,6 @@ "mac": { "UUID": "{E06B5087-2640-49B6-B9BA-D40048162B90}", "Name": "Decal_AlbedoWithOpacity", - "FileMasks": [ - "_decal" - ], "PixelFormat": "BC3", "IsPowerOf2": true, "MipMapSetting": { @@ -65,9 +53,6 @@ "provo": { "UUID": "{E06B5087-2640-49B6-B9BA-D40048162B90}", "Name": "Decal_AlbedoWithOpacity", - "FileMasks": [ - "_decal" - ], "PixelFormat": "BC7t", "IsPowerOf2": true, "MipMapSetting": { diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Config/Displacement.preset b/Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/Displacement.preset similarity index 59% rename from Gems/Atom/Asset/ImageProcessingAtom/Config/Displacement.preset rename to Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/Displacement.preset index 28ac84d646..04f35dbd6f 100644 --- a/Gems/Atom/Asset/ImageProcessingAtom/Config/Displacement.preset +++ b/Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/Displacement.preset @@ -8,18 +8,6 @@ "Name": "Displacement", "SourceColor": "Linear", "DestColor": "Linear", - "FileMasks": [ - "_displ", - "_disp", - "_dsp", - "_d", - "_dm", - "_displacement", - "_height", - "_hm", - "_ht", - "_h" - ], "PixelFormat": "BC4", "DiscardAlpha": true, "IsPowerOf2": true, @@ -33,18 +21,6 @@ "Name": "Displacement", "SourceColor": "Linear", "DestColor": "Linear", - "FileMasks": [ - "_displ", - "_disp", - "_dsp", - "_d", - "_dm", - "_displacement", - "_height", - "_hm", - "_ht", - "_h" - ], "PixelFormat": "ASTC_4x4", "MaxTextureSize": 2048, "DiscardAlpha": true, @@ -59,18 +35,6 @@ "Name": "Displacement", "SourceColor": "Linear", "DestColor": "Linear", - "FileMasks": [ - "_displ", - "_disp", - "_dsp", - "_d", - "_dm", - "_displacement", - "_height", - "_hm", - "_ht", - "_h" - ], "PixelFormat": "ASTC_4x4", "MaxTextureSize": 2048, "DiscardAlpha": true, @@ -84,18 +48,6 @@ "Name": "Displacement", "SourceColor": "Linear", "DestColor": "Linear", - "FileMasks": [ - "_displ", - "_disp", - "_dsp", - "_d", - "_dm", - "_displacement", - "_height", - "_hm", - "_ht", - "_h" - ], "PixelFormat": "BC4", "DiscardAlpha": true, "IsPowerOf2": true, @@ -108,18 +60,6 @@ "Name": "Displacement", "SourceColor": "Linear", "DestColor": "Linear", - "FileMasks": [ - "_displ", - "_disp", - "_dsp", - "_d", - "_dm", - "_displacement", - "_height", - "_hm", - "_ht", - "_h" - ], "PixelFormat": "BC4", "DiscardAlpha": true, "IsPowerOf2": true, diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Config/Emissive.preset b/Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/Emissive.preset similarity index 61% rename from Gems/Atom/Asset/ImageProcessingAtom/Config/Emissive.preset rename to Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/Emissive.preset index f5e3a79357..798b8d1657 100644 --- a/Gems/Atom/Asset/ImageProcessingAtom/Config/Emissive.preset +++ b/Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/Emissive.preset @@ -7,13 +7,6 @@ "UUID": "{07041D83-E0C3-4726-8735-CA0FE550C9A0}", "Name": "Emissive", "RGB_Weight": "CIEXYZ", - "FileMasks": [ - "_emissive", - "_e", - "_glow", - "_em", - "_emit" - ], "PixelFormat": "BC7", "DiscardAlpha": true }, @@ -22,13 +15,6 @@ "UUID": "{07041D83-E0C3-4726-8735-CA0FE550C9A0}", "Name": "Emissive", "RGB_Weight": "CIEXYZ", - "FileMasks": [ - "_emissive", - "_e", - "_glow", - "_em", - "_emit" - ], "PixelFormat": "ASTC_6x6", "MaxTextureSize": 2048, "DiscardAlpha": true @@ -37,13 +23,6 @@ "UUID": "{07041D83-E0C3-4726-8735-CA0FE550C9A0}", "Name": "Emissive", "RGB_Weight": "CIEXYZ", - "FileMasks": [ - "_emissive", - "_e", - "_glow", - "_em", - "_emit" - ], "PixelFormat": "ASTC_6x6", "MaxTextureSize": 2048, "DiscardAlpha": true @@ -52,13 +31,6 @@ "UUID": "{07041D83-E0C3-4726-8735-CA0FE550C9A0}", "Name": "Emissive", "RGB_Weight": "CIEXYZ", - "FileMasks": [ - "_emissive", - "_e", - "_glow", - "_em", - "_emit" - ], "PixelFormat": "BC7", "DiscardAlpha": true }, @@ -66,13 +38,6 @@ "UUID": "{07041D83-E0C3-4726-8735-CA0FE550C9A0}", "Name": "Emissive", "RGB_Weight": "CIEXYZ", - "FileMasks": [ - "_emissive", - "_e", - "_glow", - "_em", - "_emit" - ], "PixelFormat": "BC7", "DiscardAlpha": true } diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Config/Gradient.preset b/Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/Gradient.preset similarity index 100% rename from Gems/Atom/Asset/ImageProcessingAtom/Config/Gradient.preset rename to Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/Gradient.preset diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Config/Greyscale.preset b/Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/Greyscale.preset similarity index 77% rename from Gems/Atom/Asset/ImageProcessingAtom/Config/Greyscale.preset rename to Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/Greyscale.preset index c71ada1269..19439bad2d 100644 --- a/Gems/Atom/Asset/ImageProcessingAtom/Config/Greyscale.preset +++ b/Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/Greyscale.preset @@ -8,11 +8,8 @@ "Name": "Greyscale", "SourceColor": "Linear", "DestColor": "Linear", - "FileMasks": [ - "_mask" - ], "PixelFormat": "BC4", - "IsPowerOf2": true, + "Swizzle": "rrr1", "MipMapSetting": { "MipGenType": "Box" } @@ -23,11 +20,8 @@ "Name": "Greyscale", "SourceColor": "Linear", "DestColor": "Linear", - "FileMasks": [ - "_mask" - ], "PixelFormat": "ASTC_4x4", - "IsPowerOf2": true, + "Swizzle": "rrr1", "MipMapSetting": { "MipGenType": "Box" } @@ -37,11 +31,8 @@ "Name": "Greyscale", "SourceColor": "Linear", "DestColor": "Linear", - "FileMasks": [ - "_mask" - ], "PixelFormat": "ASTC_4x4", - "IsPowerOf2": true, + "Swizzle": "rrr1", "MipMapSetting": { "MipGenType": "Box" } @@ -51,11 +42,8 @@ "Name": "Greyscale", "SourceColor": "Linear", "DestColor": "Linear", - "FileMasks": [ - "_mask" - ], "PixelFormat": "BC4", - "IsPowerOf2": true, + "Swizzle": "rrr1", "MipMapSetting": { "MipGenType": "Box" } @@ -65,11 +53,8 @@ "Name": "Greyscale", "SourceColor": "Linear", "DestColor": "Linear", - "FileMasks": [ - "_mask" - ], "PixelFormat": "BC4", - "IsPowerOf2": true, + "Swizzle": "rrr1", "MipMapSetting": { "MipGenType": "Box" } diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Config/IBLDiffuse.preset b/Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/IBLDiffuse.preset similarity index 90% rename from Gems/Atom/Asset/ImageProcessingAtom/Config/IBLDiffuse.preset rename to Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/IBLDiffuse.preset index 8bd6b348d1..845f8e13e4 100644 --- a/Gems/Atom/Asset/ImageProcessingAtom/Config/IBLDiffuse.preset +++ b/Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/IBLDiffuse.preset @@ -7,9 +7,6 @@ "UUID": "{E3706342-BF21-4D9C-AE28-9670EB3EF3C5}", "Name": "IBLDiffuse", "Description": "The input cubemap generates an IBL diffuse output cubemap.", - "FileMasks": [ - "_ibldiffusecm" - ], "SourceColor": "Linear", "DestColor": "Linear", "SuppressEngineReduce": true, @@ -31,9 +28,6 @@ "android": { "UUID": "{E3706342-BF21-4D9C-AE28-9670EB3EF3C5}", "Name": "IBLDiffuse", - "FileMasks": [ - "_ibldiffusecm" - ], "SourceColor": "Linear", "DestColor": "Linear", "SuppressEngineReduce": true, @@ -54,9 +48,6 @@ "ios": { "UUID": "{E3706342-BF21-4D9C-AE28-9670EB3EF3C5}", "Name": "IBLDiffuse", - "FileMasks": [ - "_ibldiffusecm" - ], "SourceColor": "Linear", "DestColor": "Linear", "SuppressEngineReduce": true, @@ -77,9 +68,6 @@ "mac": { "UUID": "{E3706342-BF21-4D9C-AE28-9670EB3EF3C5}", "Name": "IBLDiffuse", - "FileMasks": [ - "_ibldiffusecm" - ], "SourceColor": "Linear", "DestColor": "Linear", "SuppressEngineReduce": true, @@ -100,9 +88,6 @@ "provo": { "UUID": "{E3706342-BF21-4D9C-AE28-9670EB3EF3C5}", "Name": "IBLDiffuse", - "FileMasks": [ - "_ibldiffusecm" - ], "SourceColor": "Linear", "DestColor": "Linear", "SuppressEngineReduce": true, diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Config/IBLGlobal.preset b/Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/IBLGlobal.preset similarity index 83% rename from Gems/Atom/Asset/ImageProcessingAtom/Config/IBLGlobal.preset rename to Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/IBLGlobal.preset index 717157f2aa..51daf44d6e 100644 --- a/Gems/Atom/Asset/ImageProcessingAtom/Config/IBLGlobal.preset +++ b/Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/IBLGlobal.preset @@ -8,11 +8,6 @@ "Name": "IBLGlobal", "Description": "The input cubemap generates IBL specular and diffuse cubemaps.", "GenerateIBLOnly": true, - "FileMasks": [ - "_iblglobalcm", - "_cubemap", - "_cm" - ], "CubemapSettings": { "GenerateIBLSpecular": true, "IBLSpecularPreset": "IBLSpecular", diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Config/IBLSkybox.preset b/Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/IBLSkybox.preset similarity index 90% rename from Gems/Atom/Asset/ImageProcessingAtom/Config/IBLSkybox.preset rename to Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/IBLSkybox.preset index eee9af4cea..1a596468bd 100644 --- a/Gems/Atom/Asset/ImageProcessingAtom/Config/IBLSkybox.preset +++ b/Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/IBLSkybox.preset @@ -7,9 +7,6 @@ "UUID": "{E6441EAC-9843-484B-8EFC-C03B2935B48D}", "Name": "IBLSkybox", "Description": "The input cubemap generates a skybox, IBL specular, and IBL diffuse output cubemaps.", - "FileMasks": [ - "_iblskyboxcm" - ], "SourceColor": "Linear", "DestColor": "Linear", "SuppressEngineReduce": true, @@ -29,9 +26,6 @@ "android": { "UUID": "{E6441EAC-9843-484B-8EFC-C03B2935B48D}", "Name": "IBLSkybox", - "FileMasks": [ - "_iblskyboxcm" - ], "SourceColor": "Linear", "DestColor": "Linear", "SuppressEngineReduce": true, @@ -50,9 +44,6 @@ "ios": { "UUID": "{E6441EAC-9843-484B-8EFC-C03B2935B48D}", "Name": "IBLSkybox", - "FileMasks": [ - "_iblskyboxcm" - ], "SourceColor": "Linear", "DestColor": "Linear", "SuppressEngineReduce": true, @@ -71,9 +62,6 @@ "mac": { "UUID": "{E6441EAC-9843-484B-8EFC-C03B2935B48D}", "Name": "IBLSkybox", - "FileMasks": [ - "_iblskyboxcm" - ], "SourceColor": "Linear", "DestColor": "Linear", "SuppressEngineReduce": true, @@ -92,9 +80,6 @@ "provo": { "UUID": "{E6441EAC-9843-484B-8EFC-C03B2935B48D}", "Name": "IBLSkybox", - "FileMasks": [ - "_iblskyboxcm" - ], "SourceColor": "Linear", "DestColor": "Linear", "SuppressEngineReduce": true, diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Config/IBLSpecular.preset b/Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/IBLSpecular.preset similarity index 87% rename from Gems/Atom/Asset/ImageProcessingAtom/Config/IBLSpecular.preset rename to Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/IBLSpecular.preset index 4f935c73ff..691f554540 100644 --- a/Gems/Atom/Asset/ImageProcessingAtom/Config/IBLSpecular.preset +++ b/Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/IBLSpecular.preset @@ -7,10 +7,6 @@ "UUID": "{908DA68C-97FB-4C4A-97BC-5A55F30F14FA}", "Name": "IBLSpecular", "Description": "The input cubemap generates an IBL specular output cubemap.", - "FileMasks": [ - "_iblspecularcm", - "_iblspecularcm256" - ], "SourceColor": "Linear", "DestColor": "Linear", "SuppressEngineReduce": true, @@ -34,10 +30,6 @@ "android": { "UUID": "{908DA68C-97FB-4C4A-97BC-5A55F30F14FA}", "Name": "IBLSpecular", - "FileMasks": [ - "_iblspecularcm", - "_iblspecularcm256" - ], "SourceColor": "Linear", "DestColor": "Linear", "SuppressEngineReduce": true, @@ -60,10 +52,6 @@ "ios": { "UUID": "{908DA68C-97FB-4C4A-97BC-5A55F30F14FA}", "Name": "IBLSpecular", - "FileMasks": [ - "_iblspecularcm", - "_iblspecularcm256" - ], "SourceColor": "Linear", "DestColor": "Linear", "SuppressEngineReduce": true, @@ -86,10 +74,6 @@ "mac": { "UUID": "{908DA68C-97FB-4C4A-97BC-5A55F30F14FA}", "Name": "IBLSpecular", - "FileMasks": [ - "_iblspecularcm", - "_iblspecularcm256" - ], "SourceColor": "Linear", "DestColor": "Linear", "SuppressEngineReduce": true, @@ -112,10 +96,6 @@ "provo": { "UUID": "{908DA68C-97FB-4C4A-97BC-5A55F30F14FA}", "Name": "IBLSpecular", - "FileMasks": [ - "_iblspecularcm", - "_iblspecularcm256" - ], "SourceColor": "Linear", "DestColor": "Linear", "SuppressEngineReduce": true, diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Config/IBLSpecularHigh.preset b/Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/IBLSpecularHigh.preset similarity index 90% rename from Gems/Atom/Asset/ImageProcessingAtom/Config/IBLSpecularHigh.preset rename to Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/IBLSpecularHigh.preset index ff4e143326..b436386864 100644 --- a/Gems/Atom/Asset/ImageProcessingAtom/Config/IBLSpecularHigh.preset +++ b/Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/IBLSpecularHigh.preset @@ -7,9 +7,6 @@ "UUID": "{B66395E1-8D0E-4159-989B-FC2B9F091B75}", "Name": "IBLSpecularHigh", "Description": "The input cubemap generates an IBL specular output cubemap.", - "FileMasks": [ - "_iblspecularcm512" - ], "SourceColor": "Linear", "DestColor": "Linear", "SuppressEngineReduce": true, @@ -33,9 +30,6 @@ "android": { "UUID": "{B66395E1-8D0E-4159-989B-FC2B9F091B75}", "Name": "IBLSpecularHigh", - "FileMasks": [ - "_iblspecularcm512" - ], "SourceColor": "Linear", "DestColor": "Linear", "SuppressEngineReduce": true, @@ -58,9 +52,6 @@ "ios": { "UUID": "{B66395E1-8D0E-4159-989B-FC2B9F091B75}", "Name": "IBLSpecularHigh", - "FileMasks": [ - "_iblspecularcm512" - ], "SourceColor": "Linear", "DestColor": "Linear", "SuppressEngineReduce": true, @@ -83,9 +74,6 @@ "mac": { "UUID": "{B66395E1-8D0E-4159-989B-FC2B9F091B75}", "Name": "IBLSpecularHigh", - "FileMasks": [ - "_iblspecularcm512" - ], "SourceColor": "Linear", "DestColor": "Linear", "SuppressEngineReduce": true, @@ -108,9 +96,6 @@ "provo": { "UUID": "{B66395E1-8D0E-4159-989B-FC2B9F091B75}", "Name": "IBLSpecularHigh", - "FileMasks": [ - "_iblspecularcm512" - ], "SourceColor": "Linear", "DestColor": "Linear", "SuppressEngineReduce": true, diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Config/IBLSpecularLow.preset b/Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/IBLSpecularLow.preset similarity index 90% rename from Gems/Atom/Asset/ImageProcessingAtom/Config/IBLSpecularLow.preset rename to Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/IBLSpecularLow.preset index ee9ddd6ac7..7810028efa 100644 --- a/Gems/Atom/Asset/ImageProcessingAtom/Config/IBLSpecularLow.preset +++ b/Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/IBLSpecularLow.preset @@ -7,9 +7,6 @@ "UUID": "{7273ACAE-6E34-487C-AF71-99423A6E1CB0}", "Name": "IBLSpecularLow", "Description": "The input cubemap generates an IBL specular output cubemap.", - "FileMasks": [ - "_iblspecularcm128" - ], "SourceColor": "Linear", "DestColor": "Linear", "SuppressEngineReduce": true, @@ -33,9 +30,6 @@ "android": { "UUID": "{7273ACAE-6E34-487C-AF71-99423A6E1CB0}", "Name": "IBLSpecularLow", - "FileMasks": [ - "_iblspecularcm128" - ], "SourceColor": "Linear", "DestColor": "Linear", "SuppressEngineReduce": true, @@ -58,9 +52,6 @@ "ios": { "UUID": "{7273ACAE-6E34-487C-AF71-99423A6E1CB0}", "Name": "IBLSpecularLow", - "FileMasks": [ - "_iblspecularcm128" - ], "SourceColor": "Linear", "DestColor": "Linear", "SuppressEngineReduce": true, @@ -83,9 +74,6 @@ "mac": { "UUID": "{7273ACAE-6E34-487C-AF71-99423A6E1CB0}", "Name": "IBLSpecularLow", - "FileMasks": [ - "_iblspecularcm128" - ], "SourceColor": "Linear", "DestColor": "Linear", "SuppressEngineReduce": true, @@ -108,9 +96,6 @@ "provo": { "UUID": "{7273ACAE-6E34-487C-AF71-99423A6E1CB0}", "Name": "IBLSpecularLow", - "FileMasks": [ - "_iblspecularcm128" - ], "SourceColor": "Linear", "DestColor": "Linear", "SuppressEngineReduce": true, diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Config/IBLSpecularVeryHigh.preset b/Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/IBLSpecularVeryHigh.preset similarity index 90% rename from Gems/Atom/Asset/ImageProcessingAtom/Config/IBLSpecularVeryHigh.preset rename to Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/IBLSpecularVeryHigh.preset index 08d9416935..a18885dad9 100644 --- a/Gems/Atom/Asset/ImageProcessingAtom/Config/IBLSpecularVeryHigh.preset +++ b/Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/IBLSpecularVeryHigh.preset @@ -7,9 +7,6 @@ "UUID": "{5CD1AFA6-915B-4716-893C-A5B1F4074C22}", "Name": "IBLSpecularVeryHigh", "Description": "The input cubemap generates an IBL specular output cubemap.", - "FileMasks": [ - "_iblspecularcm1024" - ], "SourceColor": "Linear", "DestColor": "Linear", "SuppressEngineReduce": true, @@ -33,9 +30,6 @@ "android": { "UUID": "{5CD1AFA6-915B-4716-893C-A5B1F4074C22}", "Name": "IBLSpecularVeryHigh", - "FileMasks": [ - "_iblspecularcm1024" - ], "SourceColor": "Linear", "DestColor": "Linear", "SuppressEngineReduce": true, @@ -58,9 +52,6 @@ "ios": { "UUID": "{5CD1AFA6-915B-4716-893C-A5B1F4074C22}", "Name": "IBLSpecularVeryHigh", - "FileMasks": [ - "_iblspecularcm1024" - ], "SourceColor": "Linear", "DestColor": "Linear", "SuppressEngineReduce": true, @@ -83,9 +74,6 @@ "mac": { "UUID": "{5CD1AFA6-915B-4716-893C-A5B1F4074C22}", "Name": "IBLSpecularVeryHigh", - "FileMasks": [ - "_iblspecularcm1024" - ], "SourceColor": "Linear", "DestColor": "Linear", "SuppressEngineReduce": true, @@ -108,9 +96,6 @@ "provo": { "UUID": "{5CD1AFA6-915B-4716-893C-A5B1F4074C22}", "Name": "IBLSpecularVeryHigh", - "FileMasks": [ - "_iblspecularcm1024" - ], "SourceColor": "Linear", "DestColor": "Linear", "SuppressEngineReduce": true, diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Config/IBLSpecularVeryLow.preset b/Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/IBLSpecularVeryLow.preset similarity index 90% rename from Gems/Atom/Asset/ImageProcessingAtom/Config/IBLSpecularVeryLow.preset rename to Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/IBLSpecularVeryLow.preset index c5c0788848..fb910b563a 100644 --- a/Gems/Atom/Asset/ImageProcessingAtom/Config/IBLSpecularVeryLow.preset +++ b/Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/IBLSpecularVeryLow.preset @@ -7,9 +7,6 @@ "UUID": "{8293C236-D3E8-4352-8B18-C2E82EEE6547}", "Name": "IBLSpecularVeryLow", "Description": "The input cubemap generates an IBL specular output cubemap.", - "FileMasks": [ - "_iblspecularcm64" - ], "SourceColor": "Linear", "DestColor": "Linear", "SuppressEngineReduce": true, @@ -33,9 +30,6 @@ "android": { "UUID": "{8293C236-D3E8-4352-8B18-C2E82EEE6547}", "Name": "IBLSpecularVeryLow", - "FileMasks": [ - "_iblspecularcm64" - ], "SourceColor": "Linear", "DestColor": "Linear", "SuppressEngineReduce": true, @@ -58,9 +52,6 @@ "ios": { "UUID": "{8293C236-D3E8-4352-8B18-C2E82EEE6547}", "Name": "IBLSpecularVeryLow", - "FileMasks": [ - "_iblspecularcm64" - ], "SourceColor": "Linear", "DestColor": "Linear", "SuppressEngineReduce": true, @@ -83,9 +74,6 @@ "mac": { "UUID": "{8293C236-D3E8-4352-8B18-C2E82EEE6547}", "Name": "IBLSpecularVeryLow", - "FileMasks": [ - "_iblspecularcm64" - ], "SourceColor": "Linear", "DestColor": "Linear", "SuppressEngineReduce": true, @@ -108,9 +96,6 @@ "provo": { "UUID": "{8293C236-D3E8-4352-8B18-C2E82EEE6547}", "Name": "IBLSpecularVeryLow", - "FileMasks": [ - "_iblspecularcm64" - ], "SourceColor": "Linear", "DestColor": "Linear", "SuppressEngineReduce": true, diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/ImageBuilder.settings b/Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/ImageBuilder.settings new file mode 100644 index 0000000000..b26ae03260 --- /dev/null +++ b/Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/ImageBuilder.settings @@ -0,0 +1,150 @@ +{ + "Type": "JsonSerialization", + "Version": 1, + "ClassName": "BuilderSettingManager", + "ClassData": { + "BuildSettings": { + "android": { + "GlossScale": 16.0, + "GlossBias": 0.0, + "Streaming": false, + "Enable": true + }, + "ios": { + "GlossScale": 16.0, + "GlossBias": 0.0, + "Streaming": false, + "Enable": true + }, + "mac": { + "GlossScale": 16.0, + "GlossBias": 0.0, + "Streaming": false, + "Enable": true + }, + "pc": { + "GlossScale": 16.0, + "GlossBias": 0.0, + "Streaming": false, + "Enable": true + }, + "linux": { + "GlossScale": 16.0, + "GlossBias": 0.0, + "Streaming": false, + "Enable": true + }, + "provo": { + "GlossScale": 16.0, + "GlossBias": 0.0, + "Streaming": false, + "Enable": false + } + }, + "PresetsByFileMask": { + // albedo + "_basecolor": [ "Albedo", "AlbedoWithGenericAlpha", "AlbedoWithCoverage" ], + "_diff": [ "Albedo", "AlbedoWithGenericAlpha", "AlbedoWithCoverage" ], + "_diffuse": [ "Albedo", "AlbedoWithGenericAlpha", "AlbedoWithCoverage" ], + "_color": [ "Albedo", "AlbedoWithGenericAlpha", "AlbedoWithCoverage" ], + "_col": [ "Albedo", "AlbedoWithGenericAlpha", "AlbedoWithCoverage" ], + "_albedo": [ "Albedo", "AlbedoWithGenericAlpha", "AlbedoWithCoverage" ], + "_alb": [ "Albedo", "AlbedoWithGenericAlpha", "AlbedoWithCoverage" ], + "_bc": [ "Albedo", "AlbedoWithGenericAlpha", "AlbedoWithCoverage" ], + // normals + "_ddn": [ "Normals" ], + "_normal": [ "Normals" ], + "_normalmap": [ "Normals" ], + "_normals": [ "Normals" ], + "_norm": [ "Normals" ], + "_nor": [ "Normals" ], + "_nrm": [ "Normals" ], + "_nm": [ "Normals" ], + "_n": [ "Normals" ], + "_ddna": [ "NormalsWithSmoothness" ], + "_normala": [ "NormalsWithSmoothness" ], + "_nrma": [ "NormalsWithSmoothness" ], + "_nma": [ "NormalsWithSmoothness" ], + "_na": [ "NormalsWithSmoothness" ], + // refelctance + "_spec": [ "Reflectance" ], + "_specular": [ "Reflectance" ], + "_metallic": [ "Reflectance" ], + "_refl": [ "Reflectance" ], + "_ref": [ "Reflectance" ], + "_rf": [ "Reflectance" ], + "_gloss": [ "Reflectance" ], + "_g": [ "Reflectance" ], + "_f0": [ "Reflectance" ], + "_specf0": [ "Reflectance" ], + "_metal": [ "Reflectance" ], + "_mtl": [ "Reflectance" ], + "_m": [ "Reflectance" ], + "_mt": [ "Reflectance" ], + "_metalness": [ "Reflectance" ], + "_rough": [ "Reflectance" ], + "_roughness": [ "Reflectance" ], + // opacity + "_sss": [ "Opacity" ], + "_trans": [ "Opacity" ], + "_opac": [ "Opacity" ], + "_opacity": [ "Opacity" ], + "_o": [ "Opacity" ], + "_op": [ "Opacity" ], + "_mask": [ "Opacity", "Greyscale" ], + "_msk": [ "Opacity" ], + "_blend": [ "Opacity" ], + // AO + "_ao": [ "AmbientOcclusion" ], + "_ambocc": [ "AmbientOcclusion" ], + "_amb": [ "AmbientOcclusion" ], + "_ambientocclusion": [ "AmbientOcclusion" ], + // emissive + "_emissive": [ "Emissive" ], + "_e": [ "Emissive" ], + "_glow": [ "Emissive" ], + "_em": [ "Emissive" ], + "_emit": [ "Emissive" ], + // displacement + "_displ": [ "Emissive" ], + "_disp": [ "Emissive" ], + "_dsp": [ "Emissive" ], + "_d": [ "Emissive" ], + "_dm": [ "Emissive" ], + "_displacement": [ "Emissive" ], + "_height": [ "Emissive" ], + "_hm": [ "Emissive" ], + "_ht": [ "Emissive" ], + "_h": [ "Emissive" ], + // cubemap + "_ibldiffusecm": [ "IBLDiffuse" ], + "_iblskyboxcm": [ "IBLSkybox" ], + "_iblspecularcm": [ "IBLSpecular" ], + "_iblspecularcm128": [ "IBLSpecularLow" ], + "_iblspecularcm256": [ "IBLSpecular" ], + "_iblspecularcm512": [ "IBLSpecularHigh" ], + "_iblspecularcm1024": [ "IBLSpecularVeryHigh" ], + "_skyboxcm": [ "Skybox" ], + "_ccm": [ "ConvolvedCubemap" ], + "_convolvedcubemap": [ "ConvolvedCubemap" ], + "_iblglobalcm": [ "IBLGlobal" ], + "_cubemap": [ "IBLGlobal" ], + "_cm": [ "IBLGlobal" ], + // lut + "_lut": [ "LUT_RG8" ], + "_lutr32f": [ "LUT_R32F" ], + "_lutrgba16": [ "LUT_RGBA16" ], + "_lutrg32f": [ "LUT_RG32F" ], + "_lutrgba32f": [ "LUT_RGBA32F" ], + // layer mask + "_layers": [ "LayerMask" ], + "_rgbmask": [ "LayerMask" ], + // decal + "_decal": [ "Decal_AlbedoWithOpacity" ], + // ui + "_ui": [ "UserInterface_Lossless" ] + }, + "DefaultPreset": "Albedo", + "DefaultPresetAlpha": "AlbedoWithGenericAlpha" + } +} diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Config/LUT_R32F.preset b/Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/LUT_R32F.preset similarity index 97% rename from Gems/Atom/Asset/ImageProcessingAtom/Config/LUT_R32F.preset rename to Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/LUT_R32F.preset index 1bb23c6e96..693f268304 100644 --- a/Gems/Atom/Asset/ImageProcessingAtom/Config/LUT_R32F.preset +++ b/Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/LUT_R32F.preset @@ -6,7 +6,6 @@ "DefaultPreset": { "UUID": "{10D4D7D8-23E2-4FC5-BE6A-DA9949D2C603}", "Name": "LUT_R32F", - "FileMasks": ["_lutr32f"], "SourceColor": "Linear", "DestColor": "Linear", "PixelFormat": "R32F" diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Config/LUT_RG16.preset b/Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/LUT_RG16.preset similarity index 100% rename from Gems/Atom/Asset/ImageProcessingAtom/Config/LUT_RG16.preset rename to Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/LUT_RG16.preset diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Config/LUT_RG32F.preset b/Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/LUT_RG32F.preset similarity index 97% rename from Gems/Atom/Asset/ImageProcessingAtom/Config/LUT_RG32F.preset rename to Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/LUT_RG32F.preset index 2cf0c6ca0a..7277a4b111 100644 --- a/Gems/Atom/Asset/ImageProcessingAtom/Config/LUT_RG32F.preset +++ b/Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/LUT_RG32F.preset @@ -6,7 +6,6 @@ "DefaultPreset": { "UUID": "{52470B8B-0798-4E03-B0D3-039D5141CFEC}", "Name": "LUT_RG32F", - "FileMasks": ["_lutrg32f"], "SourceColor": "Linear", "DestColor": "Linear", "PixelFormat": "R32G32F" diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Config/LUT_RG8.preset b/Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/LUT_RG8.preset similarity index 79% rename from Gems/Atom/Asset/ImageProcessingAtom/Config/LUT_RG8.preset rename to Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/LUT_RG8.preset index 9838d532b2..051cc2bedc 100644 --- a/Gems/Atom/Asset/ImageProcessingAtom/Config/LUT_RG8.preset +++ b/Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/LUT_RG8.preset @@ -8,9 +8,6 @@ "Name": "LUT_RG8", "SourceColor": "Linear", "DestColor": "Linear", - "FileMasks": [ - "_lut" - ], "PixelFormat": "R8G8" }, "PlatformsPresets": { @@ -19,9 +16,6 @@ "Name": "LUT_RG8", "SourceColor": "Linear", "DestColor": "Linear", - "FileMasks": [ - "_lut" - ], "PixelFormat": "R8G8" }, "ios": { @@ -29,9 +23,6 @@ "Name": "LUT_RG8", "SourceColor": "Linear", "DestColor": "Linear", - "FileMasks": [ - "_lut" - ], "PixelFormat": "R8G8" }, "mac": { @@ -39,9 +30,6 @@ "Name": "LUT_RG8", "SourceColor": "Linear", "DestColor": "Linear", - "FileMasks": [ - "_lut" - ], "PixelFormat": "R8G8" }, "provo": { @@ -49,9 +37,6 @@ "Name": "LUT_RG8", "SourceColor": "Linear", "DestColor": "Linear", - "FileMasks": [ - "_lut" - ], "PixelFormat": "R8G8" } } diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Config/LUT_RGBA16.preset b/Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/LUT_RGBA16.preset similarity index 78% rename from Gems/Atom/Asset/ImageProcessingAtom/Config/LUT_RGBA16.preset rename to Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/LUT_RGBA16.preset index f36d566d7e..ed940e5f25 100644 --- a/Gems/Atom/Asset/ImageProcessingAtom/Config/LUT_RGBA16.preset +++ b/Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/LUT_RGBA16.preset @@ -8,9 +8,6 @@ "Name": "LUT_RGBA16", "SourceColor": "Linear", "DestColor": "Linear", - "FileMasks": [ - "_lutrgba16" - ], "PixelFormat": "R16G16B16A16" }, "PlatformsPresets": { @@ -19,9 +16,6 @@ "Name": "LUT_RGBA16", "SourceColor": "Linear", "DestColor": "Linear", - "FileMasks": [ - "_lutrgba16" - ], "PixelFormat": "R16G16B16A16" }, "ios": { @@ -29,9 +23,6 @@ "Name": "LUT_RGBA16", "SourceColor": "Linear", "DestColor": "Linear", - "FileMasks": [ - "_lutrgba16" - ], "PixelFormat": "R16G16B16A16" }, "osx_gl": { @@ -39,9 +30,6 @@ "Name": "LUT_RGBA16", "SourceColor": "Linear", "DestColor": "Linear", - "FileMasks": [ - "_lutrgba16" - ], "PixelFormat": "R16G16B16A16" }, "provo": { @@ -49,9 +37,6 @@ "Name": "LUT_RGBA16", "SourceColor": "Linear", "DestColor": "Linear", - "FileMasks": [ - "_lutrgba16" - ], "PixelFormat": "R16G16B16A16" } } diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Config/LUT_RGBA16F.preset b/Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/LUT_RGBA16F.preset similarity index 78% rename from Gems/Atom/Asset/ImageProcessingAtom/Config/LUT_RGBA16F.preset rename to Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/LUT_RGBA16F.preset index 367c5101b3..f5d109b4a1 100644 --- a/Gems/Atom/Asset/ImageProcessingAtom/Config/LUT_RGBA16F.preset +++ b/Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/LUT_RGBA16F.preset @@ -8,9 +8,6 @@ "Name": "LUT_RGBA16F", "SourceColor": "Linear", "DestColor": "Linear", - "FileMasks": [ - "_lutrgba16f" - ], "PixelFormat": "R16G16B16A16F" }, "PlatformsPresets": { @@ -19,9 +16,6 @@ "Name": "LUT_RGBA16F", "SourceColor": "Linear", "DestColor": "Linear", - "FileMasks": [ - "_lutrgba16f" - ], "PixelFormat": "R16G16B16A16F" }, "ios": { @@ -29,9 +23,6 @@ "Name": "LUT_RGBA16F", "SourceColor": "Linear", "DestColor": "Linear", - "FileMasks": [ - "_lutrgba16f" - ], "PixelFormat": "R16G16B16A16F" }, "osx_gl": { @@ -39,9 +30,6 @@ "Name": "LUT_RGBA16F", "SourceColor": "Linear", "DestColor": "Linear", - "FileMasks": [ - "_lutrgba16f" - ], "PixelFormat": "R16G16B16A16F" }, "provo": { @@ -49,9 +37,6 @@ "Name": "LUT_RGBA16F", "SourceColor": "Linear", "DestColor": "Linear", - "FileMasks": [ - "_lutrgba16f" - ], "PixelFormat": "R16G16B16A16F" } } diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Config/LUT_RGBA32F.preset b/Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/LUT_RGBA32F.preset similarity index 97% rename from Gems/Atom/Asset/ImageProcessingAtom/Config/LUT_RGBA32F.preset rename to Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/LUT_RGBA32F.preset index 3a456825bf..b85cb66c9d 100644 --- a/Gems/Atom/Asset/ImageProcessingAtom/Config/LUT_RGBA32F.preset +++ b/Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/LUT_RGBA32F.preset @@ -6,7 +6,6 @@ "DefaultPreset": { "UUID": "{AC4C49D4-2C70-425A-8DBF-E7FB2C61CF8D}", "Name": "LUT_RGBA32F", - "FileMasks": ["_lutrgba32f"], "SourceColor": "Linear", "DestColor": "Linear", "PixelFormat": "R32G32B32A32F" diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Config/LUT_RGBA8.preset b/Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/LUT_RGBA8.preset similarity index 100% rename from Gems/Atom/Asset/ImageProcessingAtom/Config/LUT_RGBA8.preset rename to Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/LUT_RGBA8.preset diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Config/LayerMask.preset b/Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/LayerMask.preset similarity index 72% rename from Gems/Atom/Asset/ImageProcessingAtom/Config/LayerMask.preset rename to Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/LayerMask.preset index 5ce06aaea2..d33db40547 100644 --- a/Gems/Atom/Asset/ImageProcessingAtom/Config/LayerMask.preset +++ b/Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/LayerMask.preset @@ -8,10 +8,6 @@ "Name": "LayerMask", "SourceColor": "Linear", "DestColor": "Linear", - "FileMasks": [ - "_layers", - "_rgbmask" - ], "PixelFormat": "R8G8B8X8" }, "PlatformsPresets": { @@ -20,10 +16,6 @@ "Name": "LayerMask", "SourceColor": "Linear", "DestColor": "Linear", - "FileMasks": [ - "_layers", - "_rgbmask" - ], "PixelFormat": "R8G8B8X8" }, "ios": { @@ -31,10 +23,6 @@ "Name": "LayerMask", "SourceColor": "Linear", "DestColor": "Linear", - "FileMasks": [ - "_layers", - "_rgbmask" - ], "PixelFormat": "R8G8B8X8" }, "mac": { @@ -42,10 +30,6 @@ "Name": "LayerMask", "SourceColor": "Linear", "DestColor": "Linear", - "FileMasks": [ - "_layers", - "_rgbmask" - ], "PixelFormat": "R8G8B8X8" }, "provo": { @@ -53,10 +37,6 @@ "Name": "LayerMask", "SourceColor": "Linear", "DestColor": "Linear", - "FileMasks": [ - "_layers", - "_rgbmask" - ], "PixelFormat": "R8G8B8X8" } } diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Config/Normals.preset b/Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/Normals.preset similarity index 62% rename from Gems/Atom/Asset/ImageProcessingAtom/Config/Normals.preset rename to Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/Normals.preset index eee0b88686..3f7a9ff111 100644 --- a/Gems/Atom/Asset/ImageProcessingAtom/Config/Normals.preset +++ b/Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/Normals.preset @@ -8,17 +8,6 @@ "Name": "Normals", "SourceColor": "Linear", "DestColor": "Linear", - "FileMasks": [ - "_ddn", - "_normal", - "_normalmap", - "_normals", - "_norm", - "_nor", - "_nrm", - "_nm", - "_n" - ], "PixelFormat": "BC5s", "DiscardAlpha": true, "IsPowerOf2": true, @@ -33,17 +22,6 @@ "Name": "Normals", "SourceColor": "Linear", "DestColor": "Linear", - "FileMasks": [ - "_ddn", - "_normal", - "_normalmap", - "_normals", - "_norm", - "_nor", - "_nrm", - "_nm", - "_n" - ], "PixelFormat": "ASTC_4x4", "DiscardAlpha": true, "MaxTextureSize": 1024, @@ -58,17 +36,6 @@ "Name": "Normals", "SourceColor": "Linear", "DestColor": "Linear", - "FileMasks": [ - "_ddn", - "_normal", - "_normalmap", - "_normals", - "_norm", - "_nor", - "_nrm", - "_nm", - "_n" - ], "PixelFormat": "ASTC_4x4", "DiscardAlpha": true, "MaxTextureSize": 1024, @@ -83,17 +50,6 @@ "Name": "Normals", "SourceColor": "Linear", "DestColor": "Linear", - "FileMasks": [ - "_ddn", - "_normal", - "_normalmap", - "_normals", - "_norm", - "_nor", - "_nrm", - "_nm", - "_n" - ], "PixelFormat": "BC5s", "DiscardAlpha": true, "IsPowerOf2": true, @@ -107,17 +63,6 @@ "Name": "Normals", "SourceColor": "Linear", "DestColor": "Linear", - "FileMasks": [ - "_ddn", - "_normal", - "_normalmap", - "_normals", - "_norm", - "_nor", - "_nrm", - "_nm", - "_n" - ], "PixelFormat": "BC5s", "DiscardAlpha": true, "IsPowerOf2": true, diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Config/NormalsWithSmoothness.preset b/Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/NormalsWithSmoothness.preset similarity index 74% rename from Gems/Atom/Asset/ImageProcessingAtom/Config/NormalsWithSmoothness.preset rename to Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/NormalsWithSmoothness.preset index 2c66cf9190..fd0abf3467 100644 --- a/Gems/Atom/Asset/ImageProcessingAtom/Config/NormalsWithSmoothness.preset +++ b/Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/NormalsWithSmoothness.preset @@ -8,13 +8,6 @@ "Name": "NormalsWithSmoothness", "SourceColor": "Linear", "DestColor": "Linear", - "FileMasks": [ - "_ddna", - "_normala", - "_nrma", - "_nma", - "_na" - ], "PixelFormat": "BC5s", "PixelFormatAlpha": "BC4", "IsPowerOf2": true, @@ -30,13 +23,6 @@ "Name": "NormalsWithSmoothness", "SourceColor": "Linear", "DestColor": "Linear", - "FileMasks": [ - "_ddna", - "_normala", - "_nrma", - "_nma", - "_na" - ], "PixelFormat": "ASTC_4x4", "PixelFormatAlpha": "ASTC_4x4", "MaxTextureSize": 2048, @@ -52,13 +38,6 @@ "Name": "NormalsWithSmoothness", "SourceColor": "Linear", "DestColor": "Linear", - "FileMasks": [ - "_ddna", - "_normala", - "_nrma", - "_nma", - "_na" - ], "PixelFormat": "ASTC_4x4", "PixelFormatAlpha": "ASTC_4x4", "MaxTextureSize": 2048, @@ -74,13 +53,6 @@ "Name": "NormalsWithSmoothness", "SourceColor": "Linear", "DestColor": "Linear", - "FileMasks": [ - "_ddna", - "_normala", - "_nrma", - "_nma", - "_na" - ], "PixelFormat": "BC5s", "PixelFormatAlpha": "BC4", "IsPowerOf2": true, @@ -95,13 +67,6 @@ "Name": "NormalsWithSmoothness", "SourceColor": "Linear", "DestColor": "Linear", - "FileMasks": [ - "_ddna", - "_normala", - "_nrma", - "_nma", - "_na" - ], "PixelFormat": "BC5s", "PixelFormatAlpha": "BC4", "IsPowerOf2": true, diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Config/Opacity.preset b/Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/Opacity.preset similarity index 56% rename from Gems/Atom/Asset/ImageProcessingAtom/Config/Opacity.preset rename to Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/Opacity.preset index 53998583cc..e896b74522 100644 --- a/Gems/Atom/Asset/ImageProcessingAtom/Config/Opacity.preset +++ b/Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/Opacity.preset @@ -8,19 +8,8 @@ "Name": "Opacity", "SourceColor": "Linear", "DestColor": "Linear", - "FileMasks": [ - "_sss", - "_trans", - "_opac", - "_opacity", - "_o", - "_opac", - "_op", - "_mask", - "_msk", - "_blend" - ], "PixelFormat": "BC4", + "Swizzle": "rrr1", "IsPowerOf2": true, "MipMapSetting": { "MipGenType": "Box" @@ -32,19 +21,8 @@ "Name": "Opacity", "SourceColor": "Linear", "DestColor": "Linear", - "FileMasks": [ - "_sss", - "_trans", - "_opac", - "_opacity", - "_o", - "_opac", - "_op", - "_mask", - "_msk", - "_blend" - ], "PixelFormat": "ASTC_4x4", + "Swizzle": "rrr1", "MaxTextureSize": 2048, "IsPowerOf2": true, "MipMapSetting": { @@ -56,19 +34,8 @@ "Name": "Opacity", "SourceColor": "Linear", "DestColor": "Linear", - "FileMasks": [ - "_sss", - "_trans", - "_opac", - "_opacity", - "_o", - "_opac", - "_op", - "_mask", - "_msk", - "_blend" - ], "PixelFormat": "ASTC_4x4", + "Swizzle": "rrr1", "MaxTextureSize": 2048, "IsPowerOf2": true, "MipMapSetting": { @@ -80,19 +47,8 @@ "Name": "Opacity", "SourceColor": "Linear", "DestColor": "Linear", - "FileMasks": [ - "_sss", - "_trans", - "_opac", - "_opacity", - "_o", - "_opac", - "_op", - "_mask", - "_msk", - "_blend" - ], "PixelFormat": "BC4", + "Swizzle": "rrr1", "IsPowerOf2": true, "MipMapSetting": { "MipGenType": "Box" @@ -103,19 +59,8 @@ "Name": "Opacity", "SourceColor": "Linear", "DestColor": "Linear", - "FileMasks": [ - "_sss", - "_trans", - "_opac", - "_opacity", - "_o", - "_opac", - "_op", - "_mask", - "_msk", - "_blend" - ], "PixelFormat": "BC4", + "Swizzle": "rrr1", "IsPowerOf2": true, "MipMapSetting": { "MipGenType": "Box" diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Config/ReferenceImage.preset b/Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/ReferenceImage.preset similarity index 100% rename from Gems/Atom/Asset/ImageProcessingAtom/Config/ReferenceImage.preset rename to Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/ReferenceImage.preset diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Config/ReferenceImage_HDRLinear.preset b/Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/ReferenceImage_HDRLinear.preset similarity index 100% rename from Gems/Atom/Asset/ImageProcessingAtom/Config/ReferenceImage_HDRLinear.preset rename to Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/ReferenceImage_HDRLinear.preset diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Config/ReferenceImage_HDRLinearUncompressed.preset b/Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/ReferenceImage_HDRLinearUncompressed.preset similarity index 100% rename from Gems/Atom/Asset/ImageProcessingAtom/Config/ReferenceImage_HDRLinearUncompressed.preset rename to Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/ReferenceImage_HDRLinearUncompressed.preset diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Config/ReferenceImage_Linear.preset b/Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/ReferenceImage_Linear.preset similarity index 100% rename from Gems/Atom/Asset/ImageProcessingAtom/Config/ReferenceImage_Linear.preset rename to Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/ReferenceImage_Linear.preset diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/Reflectance.preset b/Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/Reflectance.preset new file mode 100644 index 0000000000..e6fd73b1be --- /dev/null +++ b/Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/Reflectance.preset @@ -0,0 +1,66 @@ +{ + "Type": "JsonSerialization", + "Version": 1, + "ClassName": "MultiplatformPresetSettings", + "ClassData": { + "DefaultPreset": { + "UUID": "{7A3CC95E-0A0C-4CA1-8357-5712B028B77D}", + "Name": "Reflectance", + "SourceColor": "Linear", + "DestColor": "Linear", + "PixelFormat": "BC1", + "IsPowerOf2": true, + "MipMapSetting": { + "MipGenType": "Box" + } + }, + "PlatformsPresets": { + "android": { + "UUID": "{7A3CC95E-0A0C-4CA1-8357-5712B028B77D}", + "Name": "Reflectance", + "SourceColor": "Linear", + "DestColor": "Linear", + "PixelFormat": "ASTC_6x6", + "MaxTextureSize": 2048, + "IsPowerOf2": true, + "MipMapSetting": { + "MipGenType": "Box" + } + }, + "ios": { + "UUID": "{7A3CC95E-0A0C-4CA1-8357-5712B028B77D}", + "Name": "Reflectance", + "SourceColor": "Linear", + "DestColor": "Linear", + "PixelFormat": "ASTC_6x6", + "MaxTextureSize": 2048, + "IsPowerOf2": true, + "MipMapSetting": { + "MipGenType": "Box" + } + }, + "mac": { + "UUID": "{7A3CC95E-0A0C-4CA1-8357-5712B028B77D}", + "Name": "Reflectance", + "SourceColor": "Linear", + "DestColor": "Linear", + "PixelFormat": "BC1", + "IsPowerOf2": true, + "MipMapSetting": { + "MipGenType": "Box" + } + }, + "provo": { + "UUID": "{7A3CC95E-0A0C-4CA1-8357-5712B028B77D}", + "Name": "Reflectance", + "SourceColor": "Linear", + "DestColor": "Linear", + "PixelFormat": "BC1", + "IsPowerOf2": true, + "MipMapSetting": { + "MipGenType": "Box" + } + } + } + } +} diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Config/Skybox.preset b/Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/Skybox.preset similarity index 86% rename from Gems/Atom/Asset/ImageProcessingAtom/Config/Skybox.preset rename to Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/Skybox.preset index 4f71855ecf..b502872f92 100644 --- a/Gems/Atom/Asset/ImageProcessingAtom/Config/Skybox.preset +++ b/Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/Skybox.preset @@ -6,9 +6,6 @@ "DefaultPreset": { "UUID": "{F359CD3B-37E6-4627-B4F6-2DFC2C0E3C1C}", "Name": "Skybox", - "FileMasks": [ - "_skyboxcm" - ], "SourceColor": "Linear", "DestColor": "Linear", "SuppressEngineReduce": true, @@ -24,9 +21,6 @@ "android": { "UUID": "{F359CD3B-37E6-4627-B4F6-2DFC2C0E3C1C}", "Name": "Skybox", - "FileMasks": [ - "_skyboxcm" - ], "SourceColor": "Linear", "DestColor": "Linear", "SuppressEngineReduce": true, @@ -41,9 +35,6 @@ "ios": { "UUID": "{F359CD3B-37E6-4627-B4F6-2DFC2C0E3C1C}", "Name": "Skybox", - "FileMasks": [ - "_skyboxcm" - ], "SourceColor": "Linear", "DestColor": "Linear", "SuppressEngineReduce": true, @@ -58,9 +49,6 @@ "mac": { "UUID": "{F359CD3B-37E6-4627-B4F6-2DFC2C0E3C1C}", "Name": "Skybox", - "FileMasks": [ - "_skyboxcm" - ], "SourceColor": "Linear", "DestColor": "Linear", "SuppressEngineReduce": true, @@ -75,9 +63,6 @@ "provo": { "UUID": "{F359CD3B-37E6-4627-B4F6-2DFC2C0E3C1C}", "Name": "Skybox", - "FileMasks": [ - "_skyboxcm" - ], "SourceColor": "Linear", "DestColor": "Linear", "SuppressEngineReduce": true, diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Config/UserInterface_Compressed.preset b/Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/UserInterface_Compressed.preset similarity index 95% rename from Gems/Atom/Asset/ImageProcessingAtom/Config/UserInterface_Compressed.preset rename to Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/UserInterface_Compressed.preset index 13334de700..7e2c42fa6b 100644 --- a/Gems/Atom/Asset/ImageProcessingAtom/Config/UserInterface_Compressed.preset +++ b/Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/UserInterface_Compressed.preset @@ -9,8 +9,7 @@ "SuppressEngineReduce": true, "PixelFormat": "R8G8B8A8", "SourceColor": "Linear", - "DestColor": "Linear", - "FileMasks": [ "_ui" ] + "DestColor": "Linear" }, "PlatformsPresets": { "android": { diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Config/UserInterface_Lossless.preset b/Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/UserInterface_Lossless.preset similarity index 95% rename from Gems/Atom/Asset/ImageProcessingAtom/Config/UserInterface_Lossless.preset rename to Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/UserInterface_Lossless.preset index 39066b242b..bec6a604ef 100644 --- a/Gems/Atom/Asset/ImageProcessingAtom/Config/UserInterface_Lossless.preset +++ b/Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/UserInterface_Lossless.preset @@ -9,8 +9,7 @@ "SuppressEngineReduce": true, "PixelFormat": "R8G8B8A8", "SourceColor": "Linear", - "DestColor": "Linear", - "FileMasks": [ "_ui" ] + "DestColor": "Linear" }, "PlatformsPresets": { "android": { diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/BuilderSettings/BuilderSettingManager.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/BuilderSettings/BuilderSettingManager.cpp index a4ba846f1b..2b24fc1bc4 100644 --- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/BuilderSettings/BuilderSettingManager.cpp +++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/BuilderSettings/BuilderSettingManager.cpp @@ -8,6 +8,7 @@ #include "BuilderSettingManager.h" +#include #include #include #include @@ -17,8 +18,9 @@ #include #include #include -#include #include +#include +#include #include #include @@ -41,13 +43,18 @@ namespace ImageProcessingAtom { - const char* BuilderSettingManager::s_defaultConfigRelativeFolder = "Gems/Atom/Asset/ImageProcessingAtom/Config/"; + const char* BuilderSettingManager::s_defaultConfigRelativeFolder = "Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/"; const char* BuilderSettingManager::s_projectConfigRelativeFolder = "Config/AtomImageBuilder/"; const char* BuilderSettingManager::s_builderSettingFileName = "ImageBuilder.settings"; - const char* BuilderSettingManager::s_presetFileExtension = ".preset"; + const char* BuilderSettingManager::s_presetFileExtension = "preset"; const char FileMaskDelimiter = '_'; + namespace + { + static constexpr const char* const LogWindow = "Image Processing"; + } + #if defined(AZ_TOOLS_EXPAND_FOR_RESTRICTED_PLATFORMS) #define AZ_RESTRICTED_PLATFORM_EXPANSION(CodeName, CODENAME, codename, PrivateName, PRIVATENAME, privatename, PublicName, PUBLICNAME, publicname, PublicAuxName1, PublicAuxName2, PublicAuxName3) \ namespace ImageProcess##PrivateName \ @@ -69,13 +76,15 @@ namespace ImageProcessingAtom if (serialize) { serialize->Class() - ->Version(1) - ->Field("AnalysisFingerprint", &BuilderSettingManager::m_analysisFingerprint) + ->Version(2) ->Field("BuildSettings", &BuilderSettingManager::m_builderSettings) - ->Field("DefaultPresetsByFileMask", &BuilderSettingManager::m_defaultPresetByFileMask) + ->Field("PresetsByFileMask", &BuilderSettingManager::m_presetFilterMap) ->Field("DefaultPreset", &BuilderSettingManager::m_defaultPreset) ->Field("DefaultPresetAlpha", &BuilderSettingManager::m_defaultPresetAlpha) - ->Field("DefaultPresetNonePOT", &BuilderSettingManager::m_defaultPresetNonePOT); + ->Field("DefaultPresetNonePOT", &BuilderSettingManager::m_defaultPresetNonePOT) + // deprecated properties + ->Field("DefaultPresetsByFileMask", &BuilderSettingManager::m_defaultPresetByFileMask) + ->Field("AnalysisFingerprint", &BuilderSettingManager::m_analysisFingerprint); } } @@ -122,7 +131,7 @@ namespace ImageProcessingAtom s_globalInstance.Reset(); } - const PresetSettings* BuilderSettingManager::GetPreset(const PresetName& presetName, const PlatformName& platform, AZStd::string_view* settingsFilePathOut) + const PresetSettings* BuilderSettingManager::GetPreset(const PresetName& presetName, const PlatformName& platform, AZStd::string_view* settingsFilePathOut) const { AZStd::lock_guard lock(m_presetMapLock); auto itr = m_presets.find(presetName); @@ -137,16 +146,17 @@ namespace ImageProcessingAtom return nullptr; } - const BuilderSettings* BuilderSettingManager::GetBuilderSetting(const PlatformName& platform) + const BuilderSettings* BuilderSettingManager::GetBuilderSetting(const PlatformName& platform) const { - if (m_builderSettings.find(platform) != m_builderSettings.end()) + auto itr = m_builderSettings.find(platform); + if (itr != m_builderSettings.end()) { - return &m_builderSettings[platform]; + return &itr->second; } return nullptr; } - const PlatformNameList BuilderSettingManager::GetPlatformList() + const PlatformNameList BuilderSettingManager::GetPlatformList() const { PlatformNameList platforms; @@ -161,7 +171,7 @@ namespace ImageProcessingAtom return platforms; } - const AZStd::map >& BuilderSettingManager::GetPresetFilterMap() + const AZStd::map >& BuilderSettingManager::GetPresetFilterMap() const { AZStd::lock_guard lock(m_presetMapLock); return m_presetFilterMap; @@ -188,7 +198,6 @@ namespace ImageProcessingAtom m_presetFilterMap.clear(); m_builderSettings.clear(); m_presets.clear(); - m_defaultPresetByFileMask.clear(); } StringOutcome BuilderSettingManager::LoadConfig() @@ -198,44 +207,53 @@ namespace ImageProcessingAtom auto fileIoBase = AZ::IO::FileIOBase::GetInstance(); if (fileIoBase == nullptr) { - return AZ::Failure(AZStd::string("File IO instance needs to be initialized to resolve ImageProcessing builder file aliases")); + return AZ::Failure( + AZStd::string("File IO instance needs to be initialized to resolve ImageProcessing builder file aliases")); } - // Construct the default setting path - - AZ::IO::FixedMaxPath defaultConfigFolder; if (auto engineRoot = fileIoBase->ResolvePath("@engroot@"); engineRoot.has_value()) { - defaultConfigFolder = *engineRoot; - defaultConfigFolder /= s_defaultConfigRelativeFolder; + m_defaultConfigFolder = *engineRoot; + m_defaultConfigFolder /= s_defaultConfigRelativeFolder; } - AZ::IO::FixedMaxPath projectConfigFolder; if (auto sourceGameRoot = fileIoBase->ResolvePath("@projectroot@"); sourceGameRoot.has_value()) { - projectConfigFolder = *sourceGameRoot; - projectConfigFolder /= s_projectConfigRelativeFolder; + m_projectConfigFolder = *sourceGameRoot; + m_projectConfigFolder /= s_projectConfigRelativeFolder; } AZStd::lock_guard lock(m_presetMapLock); ClearSettings(); - outcome = LoadSettings((projectConfigFolder / s_builderSettingFileName).Native()); - - if (!outcome.IsSuccess()) - { - outcome = LoadSettings((defaultConfigFolder / s_builderSettingFileName).Native()); - } + outcome = LoadSettings(); if (outcome.IsSuccess()) { // Load presets in default folder first, then load from project folder. // The same presets which loaded last will overwrite previous loaded one. - LoadPresets(defaultConfigFolder.Native()); - LoadPresets(projectConfigFolder.Native()); + LoadPresets(m_defaultConfigFolder.Native()); + LoadPresets(m_projectConfigFolder.Native()); + } - // Regenerate file mask mapping after all presets loaded - RegenerateMappings(); + // Collect extra file masks from preset files + CollectFileMasksFromPresets(); + + + if (QCoreApplication::instance()) + { + m_fileWatcher.reset(new QFileSystemWatcher); + // track preset files + // Note, the QT signal would only works for AP but not AssetBuilder + // We use file time stamp to track preset file change in builder's CreateJob + for (auto& preset : m_presets) + { + m_fileWatcher.data()->addPath(QString(preset.second.m_presetFilePath.c_str())); + } + m_fileWatcher.data()->addPath(QString(m_defaultConfigFolder.c_str())); + m_fileWatcher.data()->addPath(QString(m_projectConfigFolder.c_str())); + QObject::connect(m_fileWatcher.data(), &QFileSystemWatcher::fileChanged, this, &BuilderSettingManager::OnFileChanged); + QObject::connect(m_fileWatcher.data(), &QFileSystemWatcher::directoryChanged, this, &BuilderSettingManager::OnFolderChanged); } return outcome; @@ -243,36 +261,84 @@ namespace ImageProcessingAtom void BuilderSettingManager::LoadPresets(AZStd::string_view presetFolder) { - AZStd::lock_guard lock(m_presetMapLock); - QDirIterator it(presetFolder.data(), QStringList() << "*.preset", QDir::Files, QDirIterator::NoIteratorFlags); while (it.hasNext()) { QString filePath = it.next(); - QFileInfo fileInfo = it.fileInfo(); + LoadPreset(filePath.toUtf8().data()); + } + } - MultiplatformPresetSettings preset; - auto result = AZ::JsonSerializationUtils::LoadObjectFromFile(preset, filePath.toUtf8().data()); - if (!result.IsSuccess()) + bool BuilderSettingManager::LoadPreset(const AZStd::string& filePath) + { + QFileInfo fileInfo (filePath.c_str()); + + if (!fileInfo.exists()) + { + return false; + } + + MultiplatformPresetSettings preset; + auto result = AZ::JsonSerializationUtils::LoadObjectFromFile(preset, filePath); + if (!result.IsSuccess()) + { + AZ_Warning(LogWindow, false, "Failed to load preset file %s. Error: %s", + filePath.c_str(), result.GetError().c_str()); + return false; + } + + PresetName presetName(fileInfo.baseName().toUtf8().data()); + + AZ_Warning(LogWindow, presetName == preset.GetPresetName(), "Preset file name '%s' is not" + " same as preset name '%s'. Using preset file name as preset name", + filePath.c_str(), preset.GetPresetName().GetCStr()); + + preset.SetPresetName(presetName); + + m_presets[presetName] = PresetEntry{preset, filePath.c_str(), fileInfo.lastModified()}; + return true; + } + + void BuilderSettingManager::ReloadPreset(const PresetName& presetName) + { + // Find the preset file from project or default config folder + AZStd::string presetFileName = AZStd::string::format("%s.%s", presetName.GetCStr(), s_presetFileExtension); + AZ::IO::FixedMaxPath filePath = m_projectConfigFolder/presetFileName; + QFileInfo fileInfo (filePath.c_str()); + if (!fileInfo.exists()) + { + filePath = (m_defaultConfigFolder/presetFileName).c_str(); + fileInfo = QFileInfo(filePath.c_str()); + } + + AZStd::lock_guard lock(m_presetMapLock); + + //Skip the loading if the file wasn't chagned + if (fileInfo.exists()) + { + if (m_presets.find(presetName) != m_presets.end()) { - AZ_Warning("Image Processing", false, "Failed to load preset file %s. Error: %s", - filePath.toUtf8().data(), result.GetError().c_str()); + if (m_presets[presetName].m_lastModifiedTime == fileInfo.lastModified() + && m_presets[presetName].m_presetFilePath == filePath.c_str()) + { + return; + } } + } - PresetName presetName(fileInfo.baseName().toUtf8().data()); + // remove preset + m_presets.erase(presetName); - AZ_Warning("Image Processing", presetName == preset.GetPresetName(), "Preset file name '%s' is not" - " same as preset name '%s'. Using preset file name as preset name", - filePath.toUtf8().data(), preset.GetPresetName().GetCStr()); - - preset.SetPresetName(presetName); - - m_presets[presetName] = PresetEntry{preset, filePath.toUtf8().data()}; + if (fileInfo.exists()) + { + LoadPreset(filePath.c_str()); } } StringOutcome BuilderSettingManager::LoadConfigFromFolder(AZStd::string_view configFolder) { + AZStd::lock_guard lock(m_presetMapLock); + // Load builder settings AZStd::string settingFilePath = AZStd::string::format("%.*s%s", aznumeric_cast(configFolder.size()), configFolder.data(), s_builderSettingFileName); @@ -282,12 +348,108 @@ namespace ImageProcessingAtom if (result.IsSuccess()) { LoadPresets(configFolder); - RegenerateMappings(); } return result; } + void BuilderSettingManager::ReportDeprecatedSettings() + { + // reported deprecated attributes in image builder settings + if (!m_analysisFingerprint.empty()) + { + AZ_Warning(LogWindow, false, "'AnalysisFingerprint' is deprecated and it should be removed from file [%s]", s_builderSettingFileName); + } + if (!m_defaultPresetByFileMask.empty()) + { + AZ_Warning(LogWindow, false, "'DefaultPresetsByFileMask' is deprecated and it should be removed from file [%s]. Use PresetsByFileMask instead", s_builderSettingFileName); + } + } + + StringOutcome BuilderSettingManager::LoadSettings() + { + // If the project image build setting file exist, it will merge image builder settings from project folder to the settings from default config folder. + bool needMerge = false; + AZStd::string projectSettingFile{ (m_projectConfigFolder / s_builderSettingFileName).Native() }; + + if (AZ::IO::SystemFile::Exists(projectSettingFile.c_str())) + { + needMerge = true; + } + + AZ::Outcome outcome; + AZStd::string defaultSettingFile{ (m_defaultConfigFolder / s_builderSettingFileName).Native() }; + if (needMerge) + { + auto outcome1 = AZ::JsonSerializationUtils::ReadJsonFile(defaultSettingFile); + auto outcome2 = AZ::JsonSerializationUtils::ReadJsonFile(projectSettingFile); + + // return error if it failed to load default settings + if (!outcome1.IsSuccess()) + { + return STRING_OUTCOME_ERROR(outcome1.GetError()); + } + + // if project config was loaded successfully, apply merge patch + rapidjson::Document& originDoc = outcome1.GetValue(); + if (outcome2.IsSuccess()) + { + const rapidjson::Document& patchDoc = outcome2.GetValue(); + AZ::JsonSerializationResult::ResultCode result = + AZ::JsonSerialization::ApplyPatch(originDoc, originDoc.GetAllocator(), patchDoc, AZ::JsonMergeApproach::JsonMergePatch); + + if (result.GetProcessing() == AZ::JsonSerializationResult::Processing::Completed) + { + AZStd::vector outBuffer; + AZ::IO::ByteContainerStream> outStream{ &outBuffer }; + AZ::JsonSerializationUtils::WriteJsonStream(originDoc, outStream); + + outStream.Seek(0, AZ::IO::GenericStream::ST_SEEK_BEGIN); + + outcome = AZ::JsonSerializationUtils::LoadObjectFromStream(*this, outStream); + if (!outcome.IsSuccess()) + { + return STRING_OUTCOME_ERROR(outcome.GetError()); + } + + ReportDeprecatedSettings(); + + + // Generate config file fingerprint + outStream.Seek(0, AZ::IO::GenericStream::ST_SEEK_BEGIN); + AZ::u64 hash = AssetBuilderSDK::GetHashFromIOStream(outStream); + m_analysisFingerprint = AZStd::string::format("%llX", hash); + } + else + { + needMerge = false; + AZ_Warning(LogWindow, false, "Failed to fully merge data into image builder settings. Skipping project build setting file [%s]", projectSettingFile.c_str()); + } + } + else + { + AZ_Warning(LogWindow, false, "Failed to load project setting file [%s]. Skipping", projectSettingFile.c_str()); + } + } + + if (!needMerge) + { + outcome = AZ::JsonSerializationUtils::LoadObjectFromFile(*this, defaultSettingFile); + if (!outcome.IsSuccess()) + { + return STRING_OUTCOME_ERROR(outcome.GetError()); + } + + ReportDeprecatedSettings(); + + // Generate config file fingerprint + AZ::u64 hash = AssetBuilderSDK::GetFileHash(defaultSettingFile.c_str()); + m_analysisFingerprint = AZStd::string::format("%llX", hash); + } + + return STRING_OUTCOME_SUCCESS; + } + StringOutcome BuilderSettingManager::LoadSettings(AZStd::string_view filepath) { AZStd::lock_guard lock(m_presetMapLock); @@ -336,13 +498,13 @@ namespace ImageProcessingAtom return m_analysisFingerprint; } - void BuilderSettingManager::RegenerateMappings() + void BuilderSettingManager::CollectFileMasksFromPresets() { AZStd::lock_guard lock(m_presetMapLock); AZStd::string noFilter = AZStd::string(); - - m_presetFilterMap.clear(); + + AZStd::string extraString; for (const auto& presetIter : m_presets) { @@ -357,22 +519,31 @@ namespace ImageProcessingAtom { if (filemask.empty() || filemask[0] != FileMaskDelimiter) { - AZ_Warning("Image Processing", false, "File mask '%s' is invalid. It must start with '%c'.", filemask.c_str(), FileMaskDelimiter); + AZ_Warning(LogWindow, false, "File mask '%s' is invalid. It must start with '%c'.", filemask.c_str(), FileMaskDelimiter); continue; } else if (filemask.size() < 2) { - AZ_Warning("Image Processing", false, "File mask '%s' is invalid. The '%c' must be followed by at least one other character.", filemask.c_str()); + AZ_Warning(LogWindow, false, "File mask '%s' is invalid. The '%c' must be followed by at least one other character.", filemask.c_str()); continue; } else if (filemask.find(FileMaskDelimiter, 1) != AZStd::string::npos) { - AZ_Warning("Image Processing", false, "File mask '%s' is invalid. It must contain only a single '%c' character.", filemask.c_str(), FileMaskDelimiter); + AZ_Warning(LogWindow, false, "File mask '%s' is invalid. It must contain only a single '%c' character.", filemask.c_str(), FileMaskDelimiter); continue; } + + extraString += (filemask + preset.m_name.GetCStr()); + m_presetFilterMap[filemask].insert(preset.m_name); } } + + if (!extraString.empty()) + { + AZ::u64 hash = AZStd::hash{}(extraString); + m_analysisFingerprint += AZStd::string::format("%llX", hash); + } } void BuilderSettingManager::MetafilePathFromImagePath(AZStd::string_view imagePath, AZStd::string& metafilePath) @@ -419,38 +590,15 @@ namespace ImageProcessingAtom return m_presets.find(presetName) != m_presets.end(); } - PresetName BuilderSettingManager::GetSuggestedPreset(AZStd::string_view imageFilePath, IImageObjectPtr imageFromFile) + PresetName BuilderSettingManager::GetSuggestedPreset(AZStd::string_view imageFilePath) const { PresetName emptyPreset; - //load the image to get its size for later use - IImageObjectPtr image = imageFromFile; - //if the input image is empty we will try to load it from the path - if (imageFromFile == nullptr) - { - image = IImageObjectPtr(LoadImageFromFile(imageFilePath)); - } - - if (image == nullptr) - { - return emptyPreset; - } - //get file mask of this image file AZStd::string fileMask = GetFileMask(imageFilePath); PresetName outPreset = emptyPreset; - //check default presets for some file masks - if (m_defaultPresetByFileMask.find(fileMask) != m_defaultPresetByFileMask.end()) - { - outPreset = m_defaultPresetByFileMask[fileMask]; - if (!IsValidPreset(outPreset)) - { - outPreset = emptyPreset; - } - } - //use the preset filter map to find if (outPreset.IsEmpty() && !fileMask.empty()) { @@ -461,54 +609,21 @@ namespace ImageProcessingAtom } } - const PresetSettings* presetInfo = nullptr; - - if (!outPreset.IsEmpty()) - { - presetInfo = GetPreset(outPreset); - - //special case for cubemap - if (presetInfo && presetInfo->m_cubemapSetting) - { - // If it's not a latitude-longitude map or it doesn't match any cubemap layouts then reset its preset - if (!IsValidLatLongMap(image) && CubemapLayout::GetCubemapLayoutInfo(image) == nullptr) - { - outPreset = emptyPreset; - } - } - } - if (outPreset == emptyPreset) { - if (image->GetAlphaContent() == EAlphaContent::eAlphaContent_Absent) - { - outPreset = m_defaultPreset; - } - else - { - outPreset = m_defaultPresetAlpha; - } + outPreset = m_defaultPreset; } - //get the pixel format for selected preset - presetInfo = GetPreset(outPreset); + return outPreset; + } - if (presetInfo) - { - //valid whether image size work with pixel format - if (CPixelFormats::GetInstance().IsImageSizeValid(presetInfo->m_pixelFormat, - image->GetWidth(0), image->GetHeight(0), false)) - { - return outPreset; - } - else - { - AZ_Warning("Image Processing", false, "Image dimensions are not compatible with preset '%s'. The default preset will be used.", presetInfo->m_name.GetCStr()); - } - } - - //uncompressed one which could be used for almost everything - return m_defaultPresetNonePOT; + AZStd::vector BuilderSettingManager::GetPossiblePresetPaths(const PresetName& presetName) const + { + AZStd::vector paths; + AZStd::string presetFile = AZStd::string::format("%s.preset", presetName.GetCStr()); + paths.push_back((m_defaultConfigFolder / presetFile).c_str()); + paths.push_back((m_projectConfigFolder / presetFile).c_str()); + return paths; } bool BuilderSettingManager::DoesSupportPlatform(AZStd::string_view platformId) @@ -526,18 +641,50 @@ namespace ImageProcessingAtom AZStd::string filePath; if (!AzFramework::StringFunc::Path::Join(outputFolder.data(), fileName.c_str(), filePath)) { - AZ_Warning("Image Processing", false, "Failed to construct path with folder '%.*s' and file: '%s' to save preset", + AZ_Warning(LogWindow, false, "Failed to construct path with folder '%.*s' and file: '%s' to save preset", aznumeric_cast(outputFolder.size()), outputFolder.data(), filePath.c_str()); continue; } auto result = AZ::JsonSerializationUtils::SaveObjectToFile(&presetEntry.m_multiPreset, filePath); if (!result.IsSuccess()) { - AZ_Warning("Image Processing", false, "Failed to save preset '%s' to file '%s'. Error: %s", + AZ_Warning(LogWindow, false, "Failed to save preset '%s' to file '%s'. Error: %s", presetEntry.m_multiPreset.GetDefaultPreset().m_name.GetCStr(), filePath.c_str(), result.GetError().c_str()); } } } + void BuilderSettingManager::OnFileChanged(const QString &path) + { + // handles preset file change + // Note: this signal only works with AP but not AssetBuilder + AZ_TracePrintf(LogWindow, "File changed %s\n", path.toUtf8().data()); + QFileInfo info(path); + // skip if the file is not a preset file + // Note: for .settings file change it's handled when restart AP. + if (info.suffix() != s_presetFileExtension) + { + return; + } + + ReloadPreset(PresetName(info.baseName().toUtf8().data())); + } + + void BuilderSettingManager::OnFolderChanged([[maybe_unused]] const QString &path) + { + // handles new file added or removed + // Note: this signal only works with AP but not AssetBuilder + AZ_TracePrintf(LogWindow, "folder changed %s\n", path.toUtf8().data()); + + AZStd::lock_guard lock(m_presetMapLock); + m_presets.clear(); + LoadPresets(m_defaultConfigFolder.Native()); + LoadPresets(m_projectConfigFolder.Native()); + + for (auto& preset : m_presets) + { + m_fileWatcher.data()->addPath(QString(preset.second.m_presetFilePath.c_str())); + } + } } // namespace ImageProcessingAtom diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/BuilderSettings/BuilderSettingManager.h b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/BuilderSettings/BuilderSettingManager.h index 3bbb71ea43..e4d45f4186 100644 --- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/BuilderSettings/BuilderSettingManager.h +++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/BuilderSettings/BuilderSettingManager.h @@ -10,10 +10,15 @@ #include #include -#include #include +#include +#include #include +#include +#include +#include + class QSettings; class QString; @@ -36,6 +41,7 @@ namespace ImageProcessingAtom * Each preset setting may have different values on different platform, but they are using same uuid. */ class BuilderSettingManager + : public QObject // required for using QFileSystemWatcher { friend class ImageProcessingTest; @@ -49,17 +55,17 @@ namespace ImageProcessingAtom static void DestroyInstance(); static void Reflect(AZ::ReflectContext* context); - const PresetSettings* GetPreset(const PresetName& presetName, const PlatformName& platform = "", AZStd::string_view* settingsFilePathOut = nullptr); + const PresetSettings* GetPreset(const PresetName& presetName, const PlatformName& platform = "", AZStd::string_view* settingsFilePathOut = nullptr) const; - const BuilderSettings* GetBuilderSetting(const PlatformName& platform); + const BuilderSettings* GetBuilderSetting(const PlatformName& platform) const; //! Return A list of platform supported - const PlatformNameList GetPlatformList(); + const PlatformNameList GetPlatformList() const; //! Return A map of preset settings based on their filemasks. //! @key filemask string, empty string means no filemask //! @value set of preset setting names supporting the specified filemask - const AZStd::map>& GetPresetFilterMap(); + const AZStd::map>& GetPresetFilterMap() const; //! Find preset name based on the preset id. const PresetName GetPresetNameFromId(const AZ::Uuid& presetId); @@ -68,7 +74,11 @@ namespace ImageProcessingAtom StringOutcome LoadConfig(); //! Load configurations files from a folder which includes builder settings and presets - StringOutcome LoadConfigFromFolder(AZStd::string_view configFolder); + //! Note: this is only used for unit test. Use LoadConfig() for editor or game launcher + StringOutcome LoadConfigFromFolder(AZStd::string_view configFolder); + + //! Reload preset from config folders + void ReloadPreset(const PresetName& presetName); const AZStd::string& GetAnalysisFingerprint() const; @@ -81,7 +91,12 @@ namespace ImageProcessingAtom //! @param imageFilePath: Filepath string of the image file. The function may load the image from the path for better detection //! @param image: an optional image object which can be used for preset selection if there is no match based file mask. //! @return suggested preset name. - PresetName GetSuggestedPreset(AZStd::string_view imageFilePath, IImageObjectPtr image = nullptr); + PresetName GetSuggestedPreset(AZStd::string_view imageFilePath) const; + + //! Get the possible preset config's full file paths + //! This function is only used for setting up image's source dependency if a preset file is missing + //! Otherwise, the preset's file path can be retrieved in GetPreset() function + AZStd::vector GetPossiblePresetPaths(const PresetName& presetName) const; bool IsValidPreset(PresetName presetName) const; @@ -105,25 +120,41 @@ namespace ImageProcessingAtom private: // functions AZ_DISABLE_COPY_MOVE(BuilderSettingManager); + // Write image builder setting to the file specified by filepath StringOutcome WriteSettings(AZStd::string_view filepath); + // Load image builder settings from the file specified by filepath StringOutcome LoadSettings(AZStd::string_view filepath); + // Load merge image builder settings (project and default) + StringOutcome LoadSettings(); + + // report warnings for the deprecated properties in image builder setting data + void ReportDeprecatedSettings(); + // Clear Builder Settings and any cached maps/lists void ClearSettings(); - // Regenerate Builder Settings and any cached maps/lists - void RegenerateMappings(); + // collect file masks + void CollectFileMasksFromPresets(); // Functions to save/load preset from a folder void SavePresets(AZStd::string_view outputFolder); void LoadPresets(AZStd::string_view presetFolder); + // Load a preset to m_presets and return true if success + bool LoadPreset(const AZStd::string& filePath); + + // handle preset files changes + void OnFileChanged(const QString &path); + void OnFolderChanged(const QString &path); + private: // variables struct PresetEntry { MultiplatformPresetSettings m_multiPreset; AZStd::string m_presetFilePath; // Can be used for debug output + QDateTime m_lastModifiedTime; }; // Builder settings for each platform @@ -131,13 +162,13 @@ namespace ImageProcessingAtom AZStd::unordered_map m_presets; - // Cached list of presets mapped by their file masks. + // a list of presets mapped by their file masks. // @Key file mask, use empty string to indicate all presets without filtering // @Value set of preset names that matches the file mask AZStd::map > m_presetFilterMap; - // A mutex to protect when modifying any map in this manager - AZStd::recursive_mutex m_presetMapLock; + // A mutex to protect when modifying any map in this manager + mutable AZStd::recursive_mutex m_presetMapLock; // Default presets for certain file masks AZStd::map m_defaultPresetByFileMask; @@ -153,5 +184,14 @@ namespace ImageProcessingAtom // Image builder's version AZStd::string m_analysisFingerprint; + + // default config folder + AZ::IO::FixedMaxPath m_defaultConfigFolder; + + // project config folder + AZ::IO::FixedMaxPath m_projectConfigFolder; + + // File system watcher to detect preset file changes + QScopedPointer m_fileWatcher; }; } // namespace ImageProcessingAtom diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Editor/EditorCommon.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Editor/EditorCommon.cpp index 067faf3dab..ca999fcd10 100644 --- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Editor/EditorCommon.cpp +++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Editor/EditorCommon.cpp @@ -171,7 +171,7 @@ namespace ImageProcessingAtomEditor if (!preset) { AZ_Warning("Texture Editor", false, "Cannot find preset %s! Will assign a suggested one for the texture.", presetName.GetCStr()); - presetName = BuilderSettingManager::Instance()->GetSuggestedPreset(m_fullPath, m_img); + presetName = BuilderSettingManager::Instance()->GetSuggestedPreset(m_fullPath); for (auto& settingIter : m_settingsMap) { diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/ImageBuilderComponent.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/ImageBuilderComponent.cpp index 90d45ae65a..57596f4a71 100644 --- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/ImageBuilderComponent.cpp +++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/ImageBuilderComponent.cpp @@ -221,6 +221,58 @@ namespace ImageProcessingAtom m_isShuttingDown = true; } + PresetName GetImagePreset(const AZStd::string& filepath) + { + // first let preset from asset info + TextureSettings textureSettings; + StringOutcome output = TextureSettings::LoadTextureSetting(filepath, textureSettings); + + if (!textureSettings.m_preset.IsEmpty()) + { + return textureSettings.m_preset; + } + + return BuilderSettingManager::Instance()->GetSuggestedPreset(filepath); + } + + void HandlePresetDependency(PresetName presetName, AZStd::vector& sourceDependencyList) + { + // Reload preset if it was changed + ImageProcessingAtom::BuilderSettingManager::Instance()->ReloadPreset(presetName); + + AZStd::string_view filePath; + auto presetSettings = BuilderSettingManager::Instance()->GetPreset(presetName, /*default platform*/"", &filePath); + + AssetBuilderSDK::SourceFileDependency sourceFileDependency; + sourceFileDependency.m_sourceDependencyType = AssetBuilderSDK::SourceFileDependency::SourceFileDependencyType::Absolute; + + // Need to watch any possibe preset paths + AZStd::vector possiblePresetPaths = BuilderSettingManager::Instance()->GetPossiblePresetPaths(presetName); + for (const auto& path:possiblePresetPaths) + { + sourceFileDependency.m_sourceFileDependencyPath = path; + sourceDependencyList.push_back(sourceFileDependency); + } + + if (presetSettings) + { + // handle special case here + // Cubemap setting may reference some other presets + if (presetSettings->m_cubemapSetting) + { + if (presetSettings->m_cubemapSetting->m_generateIBLDiffuse && !presetSettings->m_cubemapSetting->m_iblDiffusePreset.IsEmpty()) + { + HandlePresetDependency(presetSettings->m_cubemapSetting->m_iblDiffusePreset, sourceDependencyList); + } + + if (presetSettings->m_cubemapSetting->m_generateIBLSpecular && !presetSettings->m_cubemapSetting->m_iblSpecularPreset.IsEmpty()) + { + HandlePresetDependency(presetSettings->m_cubemapSetting->m_iblSpecularPreset, sourceDependencyList); + } + } + } + } + // this happens early on in the file scanning pass // this function should consistently always create the same jobs, and should do no checking whether the job is up to date or not - just be consistent. void ImageBuilderWorker::CreateJobs(const AssetBuilderSDK::CreateJobsRequest& request, AssetBuilderSDK::CreateJobsResponse& response) @@ -242,13 +294,26 @@ namespace ImageProcessingAtom if (ImageProcessingAtom::BuilderSettingManager::Instance()->DoesSupportPlatform(platformInfo.m_identifier)) { AssetBuilderSDK::JobDescriptor descriptor; - descriptor.m_jobKey = ext + " Atom Compile"; + descriptor.m_jobKey = "Image Compile: " + ext; descriptor.SetPlatformIdentifier(platformInfo.m_identifier.c_str()); descriptor.m_critical = false; + descriptor.m_additionalFingerprintInfo = ""; response.m_createJobOutputs.push_back(descriptor); } } + // add source dependency for .assetinfo file + AssetBuilderSDK::SourceFileDependency sourceFileDependency; + sourceFileDependency.m_sourceDependencyType = AssetBuilderSDK::SourceFileDependency::SourceFileDependencyType::Absolute; + sourceFileDependency.m_sourceFileDependencyPath = request.m_sourceFile; + AZ::StringFunc::Path::ReplaceExtension(sourceFileDependency.m_sourceFileDependencyPath, TextureSettings::ExtensionName); + response.m_sourceFileDependencyList.push_back(sourceFileDependency); + + // add source dependencies for .preset files + // Get the preset for this file + auto presetName = GetImagePreset(request.m_sourceFile); + HandlePresetDependency(presetName, response.m_sourceFileDependencyList); + response.m_result = AssetBuilderSDK::CreateJobsResultCode::Success; return; } diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/ImageConvert.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/ImageConvert.cpp index 5b23009cff..471472486d 100644 --- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/ImageConvert.cpp +++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/ImageConvert.cpp @@ -11,6 +11,7 @@ #include #include #include +#include #include #include #include @@ -229,12 +230,24 @@ namespace ImageProcessingAtom AZStd::unique_ptr& cubemapSettings = m_input->m_presetSetting.m_cubemapSetting; if (cubemapSettings->m_generateIBLSpecular && !cubemapSettings->m_iblSpecularPreset.IsEmpty()) { - CreateIBLCubemap(cubemapSettings->m_iblSpecularPreset, SpecularCubemapSuffix, m_iblSpecularCubemapImage); + bool success = CreateIBLCubemap(cubemapSettings->m_iblSpecularPreset, SpecularCubemapSuffix, m_iblSpecularCubemapImage); + if (!success) + { + m_isSucceed = false; + m_isFinished = true; + break; + } } if (cubemapSettings->m_generateIBLDiffuse && !cubemapSettings->m_iblDiffusePreset.IsEmpty()) { - CreateIBLCubemap(cubemapSettings->m_iblDiffusePreset, DiffuseCubemapSuffix, m_iblDiffuseCubemapImage); + bool success = CreateIBLCubemap(cubemapSettings->m_iblDiffusePreset, DiffuseCubemapSuffix, m_iblDiffuseCubemapImage); + if (!success) + { + m_isSucceed = false; + m_isFinished = true; + break; + } } } @@ -251,7 +264,12 @@ namespace ImageProcessingAtom { if (m_input->m_presetSetting.m_cubemapSetting->m_requiresConvolve) { - FillCubemapMipmaps(); + bool success = FillCubemapMipmaps(); + if (!success) + { + m_isSucceed = false; + m_isFinished = true; + } } } else @@ -268,9 +286,7 @@ namespace ImageProcessingAtom // get gloss from normal for all mipmaps and save to alpha channel if (m_input->m_presetSetting.m_glossFromNormals) { - bool hasAlpha = (m_alphaContent == EAlphaContent::eAlphaContent_OnlyBlack - || m_alphaContent == EAlphaContent::eAlphaContent_OnlyBlackAndWhite - || m_alphaContent == EAlphaContent::eAlphaContent_Greyscale); + bool hasAlpha = Utils::NeedAlphaChannel(m_alphaContent); m_image->Get()->GlossFromNormals(hasAlpha); // set alpha content so it won't be ignored later. @@ -347,7 +363,11 @@ namespace ImageProcessingAtom } else { - AZ_TracePrintf("Image Processing", "Image converted with preset [%s] [%s] and saved to [%s] (%d bytes) taking %f seconds\n", + + [[maybe_unused]] const PixelFormatInfo* formatInfo = CPixelFormats::GetInstance().GetPixelFormatInfo(m_image->Get()->GetPixelFormat()); + AZ_TracePrintf("Image Processing", "Image [%dx%d] [%s] converted with preset [%s] [%s] and saved to [%s] (%d bytes) taking %f seconds\n", + m_image->Get()->GetWidth(0), m_image->Get()->GetHeight(0), + formatInfo->szName, m_input->m_presetSetting.m_name.GetCStr(), m_input->m_filePath.c_str(), m_input->m_outputFolder.c_str(), sizeTotal, m_processTime); @@ -421,6 +441,17 @@ namespace ImageProcessingAtom outHeight >>= 1; outReduce++; } + + // resize to min texture size if it's smaller + if (outWidth < presetSettings->m_minTextureSize) + { + outWidth = presetSettings->m_minTextureSize; + } + + if (outHeight < presetSettings->m_minTextureSize) + { + outHeight = presetSettings->m_minTextureSize; + } } bool ImageConvertProcess::ConvertToLinear() @@ -647,7 +678,7 @@ namespace ImageProcessingAtom } else if (!CPixelFormats::GetInstance().IsImageSizeValid(dstFmt, dwWidth, dwHeight, false)) { - AZ_Warning("Image Processing", false, "Image size will be scaled for pixel format %s", CPixelFormats::GetInstance().GetPixelFormatInfo(dstFmt)->szName); + AZ_TracePrintf("Image processing", "Image size will be scaled for pixel format %s\n", CPixelFormats::GetInstance().GetPixelFormatInfo(dstFmt)->szName); } #if defined(AZ_TOOLS_EXPAND_FOR_RESTRICTED_PLATFORMS) @@ -758,7 +789,7 @@ namespace ImageProcessingAtom // in very rare user case, an old texture setting file may not have a preset. We fix it over here too. if (textureSettings.m_preset.IsEmpty()) { - textureSettings.m_preset = BuilderSettingManager::Instance()->GetSuggestedPreset(imageFilePath, srcImage); + textureSettings.m_preset = BuilderSettingManager::Instance()->GetSuggestedPreset(imageFilePath); } // Get preset @@ -795,7 +826,7 @@ namespace ImageProcessingAtom return process; } - void ImageConvertProcess::CreateIBLCubemap(PresetName preset, const char* fileNameSuffix, IImageObjectPtr& cubemapImage) + bool ImageConvertProcess::CreateIBLCubemap(PresetName preset, const char* fileNameSuffix, IImageObjectPtr& cubemapImage) { const AZStd::string& platformId = m_input->m_platform; AZStd::string_view filePath; @@ -803,7 +834,7 @@ namespace ImageProcessingAtom if (presetSettings == nullptr) { AZ_Error("Image Processing", false, "Couldn't find preset for IBL cubemap generation"); - return; + return false; } // generate export file name @@ -838,14 +869,14 @@ namespace ImageProcessingAtom if (!imageConvertProcess) { AZ_Error("Image Processing", false, "Failed to create image convert process for the IBL cubemap"); - return; + return false; } imageConvertProcess->ProcessAll(); if (!imageConvertProcess->IsSucceed()) { AZ_Error("Image Processing", false, "Image convert process for the IBL cubemap failed"); - return; + return false; } // append the output products to the job's product list @@ -853,6 +884,7 @@ namespace ImageProcessingAtom // store the output cubemap so it can be accessed by unit tests cubemapImage = imageConvertProcess->m_image->Get(); + return true; } bool ConvertImageFile(const AZStd::string& imageFilePath, const AZStd::string& exportDir, diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/ImageConvert.h b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/ImageConvert.h index fe57b1a89f..0d06b15c39 100644 --- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/ImageConvert.h +++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/ImageConvert.h @@ -160,7 +160,7 @@ namespace ImageProcessingAtom bool FillCubemapMipmaps(); //IBL cubemap generation, this creates a separate ImageConvertProcess - void CreateIBLCubemap(PresetName preset, const char* fileNameSuffix, IImageObjectPtr& cubemapImage); + bool CreateIBLCubemap(PresetName preset, const char* fileNameSuffix, IImageObjectPtr& cubemapImage); //convert color space to linear with pixel format rgba32f bool ConvertToLinear(); diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/ImageObjectImpl.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/ImageObjectImpl.cpp index 465d992ef6..758df462ec 100644 --- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/ImageObjectImpl.cpp +++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/ImageObjectImpl.cpp @@ -183,10 +183,9 @@ namespace ImageProcessingAtom return EAlphaContent::eAlphaContent_Absent; } - //if it's compressed format, return indeterminate. if user really want to know the content, they may convert the format to ARGB8 first if (!CPixelFormats::GetInstance().IsPixelFormatUncompressed(m_pixelFormat)) { - AZ_Assert(false, "the function only works right with uncompressed formats. convert to uncompressed format if you get accurate result"); + AZ_TracePrintf("Image processing", "GetAlphaContent() was called for compressed format\n"); return EAlphaContent::eAlphaContent_Indeterminate; } diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/Utils.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/Utils.cpp index 29ba8c3351..20e1b18e77 100644 --- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/Utils.cpp +++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/Utils.cpp @@ -385,6 +385,13 @@ namespace ImageProcessingAtom } return true; } + + bool NeedAlphaChannel(EAlphaContent alphaContent) + { + return (alphaContent == EAlphaContent::eAlphaContent_OnlyBlack + || alphaContent == EAlphaContent::eAlphaContent_OnlyBlackAndWhite + || alphaContent == EAlphaContent::eAlphaContent_Greyscale); + } } } // namespace ImageProcessingAtom diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/Utils.h b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/Utils.h index d5905eddbc..59503a2366 100644 --- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/Utils.h +++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/Utils.h @@ -26,5 +26,7 @@ namespace ImageProcessingAtom IImageObjectPtr LoadImageFromImageAsset(const AZ::Data::Asset& asset); bool SaveImageToDdsFile(IImageObjectPtr image, AZStd::string_view filePath); + + bool NeedAlphaChannel(EAlphaContent alphaContent); } } diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Code/Tests/ImageProcessing_Test.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Tests/ImageProcessing_Test.cpp index d0029ffc86..91b0952a06 100644 --- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Tests/ImageProcessing_Test.cpp +++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Tests/ImageProcessing_Test.cpp @@ -203,7 +203,7 @@ namespace UnitTest m_gemFolder = AZ::Test::GetEngineRootPath() + "/Gems/Atom/Asset/ImageProcessingAtom/"; m_outputFolder = m_gemFolder + AZStd::string("Code/Tests/TestAssets/temp/"); - m_defaultSettingFolder = m_gemFolder + AZStd::string("Config/"); + m_defaultSettingFolder = m_gemFolder + AZStd::string("Assets/Config/"); m_testFileFolder = m_gemFolder + AZStd::string("Code/Tests/TestAssets/"); InitialImageFilenames(); diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Config/ImageBuilder.settings b/Gems/Atom/Asset/ImageProcessingAtom/Config/ImageBuilder.settings deleted file mode 100644 index 466ac4b71d..0000000000 --- a/Gems/Atom/Asset/ImageProcessingAtom/Config/ImageBuilder.settings +++ /dev/null @@ -1,67 +0,0 @@ -{ - "Type": "JsonSerialization", - "Version": 1, - "ClassName": "BuilderSettingManager", - "ClassData": { - "AnalysisFingerprint": "2", - "BuildSettings": { - "android": { - "GlossScale": 16.0, - "GlossBias": 0.0, - "Streaming": false, - "Enable": true - }, - "ios": { - "GlossScale": 16.0, - "GlossBias": 0.0, - "Streaming": false, - "Enable": true - }, - "mac": { - "GlossScale": 16.0, - "GlossBias": 0.0, - "Streaming": false, - "Enable": true - }, - "pc": { - "GlossScale": 16.0, - "GlossBias": 0.0, - "Streaming": false, - "Enable": true - }, - "linux": { - "GlossScale": 16.0, - "GlossBias": 0.0, - "Streaming": false, - "Enable": true - }, - "provo": { - "GlossScale": 16.0, - "GlossBias": 0.0, - "Streaming": false, - "Enable": false - } - }, - "DefaultPresetsByFileMask": { - "_basecolor": "Albedo", - "_diff": "Albedo", - "_diffuse": "Albedo", - "_ddn": "Normals", - "_normal": "Normals", - "_ddna": "NormalsWithSmoothness", - "_glossness": "Reflectance", - "_spec": "Reflectance", - "_specular": "Reflectance", - "_metallic": "Reflectance", - "_refl": "Reflectance", - "_roughness": "Reflectance", - "_ibldiffusecm": "IBLDiffuse", - "_iblskyboxcm": "IBLSkybox", - "_iblspecularcm": "IBLSpecular", - "_skyboxcm": "Skybox" - }, - "DefaultPreset": "Albedo", - "DefaultPresetAlpha": "AlbedoWithGenericAlpha", - "DefaultPresetNonePOT": "ReferenceImage" - } -} diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Config/Reflectance.preset b/Gems/Atom/Asset/ImageProcessingAtom/Config/Reflectance.preset deleted file mode 100644 index 2ac88dca85..0000000000 --- a/Gems/Atom/Asset/ImageProcessingAtom/Config/Reflectance.preset +++ /dev/null @@ -1,157 +0,0 @@ -{ - "Type": "JsonSerialization", - "Version": 1, - "ClassName": "MultiplatformPresetSettings", - "ClassData": { - "DefaultPreset": { - "UUID": "{7A3CC95E-0A0C-4CA1-8357-5712B028B77D}", - "Name": "Reflectance", - "SourceColor": "Linear", - "DestColor": "Linear", - "FileMasks": [ - "_spec", - "_refl", - "_ref", - "_rf", - "_gloss", - "_g", - "_f0", - "_specf0", - "_specular", - "_metal", - "_mtl", - "_m", - "_mt", - "_metalness", - "_metallic", - "_roughness", - "_rough" - ], - "PixelFormat": "BC1", - "IsPowerOf2": true, - "MipMapSetting": { - "MipGenType": "Box" - } - }, - "PlatformsPresets": { - "android": { - "UUID": "{7A3CC95E-0A0C-4CA1-8357-5712B028B77D}", - "Name": "Reflectance", - "SourceColor": "Linear", - "DestColor": "Linear", - "FileMasks": [ - "_spec", - "_refl", - "_ref", - "_rf", - "_gloss", - "_g", - "_f0", - "_specf0", - "_metal", - "_mtl", - "_m", - "_mt", - "_metalness", - "_metallic", - "_roughness", - "_rough" - ], - "PixelFormat": "ASTC_6x6", - "MaxTextureSize": 2048, - "IsPowerOf2": true, - "MipMapSetting": { - "MipGenType": "Box" - } - }, - "ios": { - "UUID": "{7A3CC95E-0A0C-4CA1-8357-5712B028B77D}", - "Name": "Reflectance", - "SourceColor": "Linear", - "DestColor": "Linear", - "FileMasks": [ - "_spec", - "_refl", - "_ref", - "_rf", - "_gloss", - "_g", - "_f0", - "_specf0", - "_metal", - "_mtl", - "_m", - "_mt", - "_metalness", - "_metallic", - "_roughness", - "_rough" - ], - "PixelFormat": "ASTC_6x6", - "MaxTextureSize": 2048, - "IsPowerOf2": true, - "MipMapSetting": { - "MipGenType": "Box" - } - }, - "mac": { - "UUID": "{7A3CC95E-0A0C-4CA1-8357-5712B028B77D}", - "Name": "Reflectance", - "SourceColor": "Linear", - "DestColor": "Linear", - "FileMasks": [ - "_spec", - "_refl", - "_ref", - "_rf", - "_gloss", - "_g", - "_f0", - "_specf0", - "_metal", - "_mtl", - "_m", - "_mt", - "_metalness", - "_metallic", - "_roughness", - "_rough" - ], - "PixelFormat": "BC1", - "IsPowerOf2": true, - "MipMapSetting": { - "MipGenType": "Box" - } - }, - "provo": { - "UUID": "{7A3CC95E-0A0C-4CA1-8357-5712B028B77D}", - "Name": "Reflectance", - "SourceColor": "Linear", - "DestColor": "Linear", - "FileMasks": [ - "_spec", - "_refl", - "_ref", - "_rf", - "_gloss", - "_g", - "_f0", - "_specf0", - "_metal", - "_mtl", - "_m", - "_mt", - "_metalness", - "_metallic", - "_roughness", - "_rough" - ], - "PixelFormat": "BC1", - "IsPowerOf2": true, - "MipMapSetting": { - "MipGenType": "Box" - } - } - } - } -} From 5d2be299d85e9f21e06241b6677fef04b27a4518 Mon Sep 17 00:00:00 2001 From: nggieber Date: Tue, 16 Nov 2021 15:36:32 -0800 Subject: [PATCH 051/345] Moved includes to forward declarations on GemCatalogScreen Signed-off-by: nggieber --- .../ProjectManager/Source/CreateProjectCtrl.cpp | 1 + .../Source/GemCatalog/GemCatalogScreen.cpp | 6 ++++++ .../Source/GemCatalog/GemCatalogScreen.h | 17 ++++++++++------- 3 files changed, 17 insertions(+), 7 deletions(-) diff --git a/Code/Tools/ProjectManager/Source/CreateProjectCtrl.cpp b/Code/Tools/ProjectManager/Source/CreateProjectCtrl.cpp index 6b19e839d7..205395c935 100644 --- a/Code/Tools/ProjectManager/Source/CreateProjectCtrl.cpp +++ b/Code/Tools/ProjectManager/Source/CreateProjectCtrl.cpp @@ -15,6 +15,7 @@ #include #include #include +#include #include #include diff --git a/Code/Tools/ProjectManager/Source/GemCatalog/GemCatalogScreen.cpp b/Code/Tools/ProjectManager/Source/GemCatalog/GemCatalogScreen.cpp index d610154c24..2240ae68d2 100644 --- a/Code/Tools/ProjectManager/Source/GemCatalog/GemCatalogScreen.cpp +++ b/Code/Tools/ProjectManager/Source/GemCatalog/GemCatalogScreen.cpp @@ -8,6 +8,11 @@ #include #include +#include +#include +#include +#include +#include #include #include #include @@ -28,6 +33,7 @@ #include #include #include +#include namespace O3DE::ProjectManager { diff --git a/Code/Tools/ProjectManager/Source/GemCatalog/GemCatalogScreen.h b/Code/Tools/ProjectManager/Source/GemCatalog/GemCatalogScreen.h index 92cf0bd5f2..dcdf6373ac 100644 --- a/Code/Tools/ProjectManager/Source/GemCatalog/GemCatalogScreen.h +++ b/Code/Tools/ProjectManager/Source/GemCatalog/GemCatalogScreen.h @@ -12,20 +12,23 @@ #include #include #include -#include -#include -#include -#include -#include -#include #include #include -#include #endif +QT_FORWARD_DECLARE_CLASS(QStackedWidget) + namespace O3DE::ProjectManager { + QT_FORWARD_DECLARE_CLASS(GemCatalogHeaderWidget) + QT_FORWARD_DECLARE_CLASS(GemFilterWidget) + QT_FORWARD_DECLARE_CLASS(GemListView) + QT_FORWARD_DECLARE_CLASS(GemInspector) + QT_FORWARD_DECLARE_CLASS(GemModel) + QT_FORWARD_DECLARE_CLASS(GemSortFilterProxyModel) + QT_FORWARD_DECLARE_CLASS(DownloadController) + class GemCatalogScreen : public ScreenWidget { From 0d17e575a73f0c16774134d313232ed56eb7e604 Mon Sep 17 00:00:00 2001 From: AMZN-nggieber <52797929+AMZN-nggieber@users.noreply.github.com> Date: Tue, 16 Nov 2021 15:53:51 -0800 Subject: [PATCH 052/345] Fix: Display Repo Gems on Repo Screen Correctly (#5638) Signed-off-by: nggieber --- .../Source/GemCatalog/GemCatalogScreen.cpp | 4 +-- .../Source/GemRepo/GemRepoInfo.h | 2 +- .../Source/GemRepo/GemRepoInspector.cpp | 7 ++-- .../Source/GemRepo/GemRepoModel.cpp | 26 ++++++-------- .../Source/GemRepo/GemRepoModel.h | 2 +- .../ProjectManager/Source/PythonBindings.cpp | 36 ++++++++++++++++--- .../ProjectManager/Source/PythonBindings.h | 3 +- .../Source/PythonBindingsInterface.h | 9 ++++- 8 files changed, 62 insertions(+), 27 deletions(-) diff --git a/Code/Tools/ProjectManager/Source/GemCatalog/GemCatalogScreen.cpp b/Code/Tools/ProjectManager/Source/GemCatalog/GemCatalogScreen.cpp index b26dddac71..be317f1ecd 100644 --- a/Code/Tools/ProjectManager/Source/GemCatalog/GemCatalogScreen.cpp +++ b/Code/Tools/ProjectManager/Source/GemCatalog/GemCatalogScreen.cpp @@ -188,7 +188,7 @@ namespace O3DE::ProjectManager } // add all the gem repos into the hash - const AZ::Outcome, AZStd::string>& allRepoGemInfosResult = PythonBindingsInterface::Get()->GetAllGemRepoGemsInfos(); + const AZ::Outcome, AZStd::string>& allRepoGemInfosResult = PythonBindingsInterface::Get()->GetAllGemReposGemInfos(); if (allRepoGemInfosResult.IsSuccess()) { const QVector& allRepoGemInfos = allRepoGemInfosResult.GetValue(); @@ -440,7 +440,7 @@ namespace O3DE::ProjectManager m_gemModel->AddGem(gemInfo); } - const AZ::Outcome, AZStd::string>& allRepoGemInfosResult = PythonBindingsInterface::Get()->GetAllGemRepoGemsInfos(); + const AZ::Outcome, AZStd::string>& allRepoGemInfosResult = PythonBindingsInterface::Get()->GetAllGemReposGemInfos(); if (allRepoGemInfosResult.IsSuccess()) { const QVector& allRepoGemInfos = allRepoGemInfosResult.GetValue(); diff --git a/Code/Tools/ProjectManager/Source/GemRepo/GemRepoInfo.h b/Code/Tools/ProjectManager/Source/GemRepo/GemRepoInfo.h index f1d1c2a8a2..c22511faad 100644 --- a/Code/Tools/ProjectManager/Source/GemRepo/GemRepoInfo.h +++ b/Code/Tools/ProjectManager/Source/GemRepo/GemRepoInfo.h @@ -37,7 +37,7 @@ namespace O3DE::ProjectManager QString m_additionalInfo = ""; QString m_directoryLink = ""; QString m_repoUri = ""; - QStringList m_includedGemPaths = {}; + QStringList m_includedGemUris = {}; QDateTime m_lastUpdated; }; } // namespace O3DE::ProjectManager diff --git a/Code/Tools/ProjectManager/Source/GemRepo/GemRepoInspector.cpp b/Code/Tools/ProjectManager/Source/GemRepo/GemRepoInspector.cpp index f816e86733..24a3e58ea2 100644 --- a/Code/Tools/ProjectManager/Source/GemRepo/GemRepoInspector.cpp +++ b/Code/Tools/ProjectManager/Source/GemRepo/GemRepoInspector.cpp @@ -8,6 +8,7 @@ #include #include +#include #include #include @@ -60,8 +61,10 @@ namespace O3DE::ProjectManager // Repo name and url link m_nameLabel->setText(m_model->GetName(modelIndex)); - m_repoLinkLabel->setText(m_model->GetRepoUri(modelIndex)); - m_repoLinkLabel->SetUrl(m_model->GetRepoUri(modelIndex)); + + const QString repoUri = m_model->GetRepoUri(modelIndex); + m_repoLinkLabel->setText(repoUri); + m_repoLinkLabel->SetUrl(repoUri); // Repo summary m_summaryLabel->setText(m_model->GetSummary(modelIndex)); diff --git a/Code/Tools/ProjectManager/Source/GemRepo/GemRepoModel.cpp b/Code/Tools/ProjectManager/Source/GemRepo/GemRepoModel.cpp index 6189b6d8bf..18fb0cc235 100644 --- a/Code/Tools/ProjectManager/Source/GemRepo/GemRepoModel.cpp +++ b/Code/Tools/ProjectManager/Source/GemRepo/GemRepoModel.cpp @@ -41,7 +41,7 @@ namespace O3DE::ProjectManager item->setData(gemRepoInfo.m_lastUpdated, RoleLastUpdated); item->setData(gemRepoInfo.m_path, RolePath); item->setData(gemRepoInfo.m_additionalInfo, RoleAdditionalInfo); - item->setData(gemRepoInfo.m_includedGemPaths, RoleIncludedGems); + item->setData(gemRepoInfo.m_includedGemUris, RoleIncludedGems); appendRow(item); @@ -98,7 +98,7 @@ namespace O3DE::ProjectManager return modelIndex.data(RolePath).toString(); } - QStringList GemRepoModel::GetIncludedGemPaths(const QModelIndex& modelIndex) + QStringList GemRepoModel::GetIncludedGemUris(const QModelIndex& modelIndex) { return modelIndex.data(RoleIncludedGems).toStringList(); } @@ -118,23 +118,19 @@ namespace O3DE::ProjectManager QVector GemRepoModel::GetIncludedGemInfos(const QModelIndex& modelIndex) { - QVector allGemInfos; - QStringList repoGemPaths = GetIncludedGemPaths(modelIndex); + QString repoUri = GetRepoUri(modelIndex); - for (const QString& gemPath : repoGemPaths) + const AZ::Outcome, AZStd::string>& gemInfosResult = PythonBindingsInterface::Get()->GetGemRepoGemInfos(repoUri); + if (gemInfosResult.IsSuccess()) { - AZ::Outcome gemInfoResult = PythonBindingsInterface::Get()->GetGemInfo(gemPath); - if (gemInfoResult.IsSuccess()) - { - allGemInfos.append(gemInfoResult.GetValue()); - } - else - { - QMessageBox::critical(nullptr, tr("Gem Not Found"), tr("Cannot find info for gem %1.").arg(gemPath)); - } + return gemInfosResult.GetValue(); + } + else + { + QMessageBox::critical(nullptr, tr("Gems not found"), tr("Cannot find info for gems from repo %1").arg(GetName(modelIndex))); } - return allGemInfos; + return QVector(); } bool GemRepoModel::IsEnabled(const QModelIndex& modelIndex) diff --git a/Code/Tools/ProjectManager/Source/GemRepo/GemRepoModel.h b/Code/Tools/ProjectManager/Source/GemRepo/GemRepoModel.h index 66fe972a95..68991a0509 100644 --- a/Code/Tools/ProjectManager/Source/GemRepo/GemRepoModel.h +++ b/Code/Tools/ProjectManager/Source/GemRepo/GemRepoModel.h @@ -39,7 +39,7 @@ namespace O3DE::ProjectManager static QDateTime GetLastUpdated(const QModelIndex& modelIndex); static QString GetPath(const QModelIndex& modelIndex); - static QStringList GetIncludedGemPaths(const QModelIndex& modelIndex); + static QStringList GetIncludedGemUris(const QModelIndex& modelIndex); static QVector GetIncludedGemTags(const QModelIndex& modelIndex); static QVector GetIncludedGemInfos(const QModelIndex& modelIndex); diff --git a/Code/Tools/ProjectManager/Source/PythonBindings.cpp b/Code/Tools/ProjectManager/Source/PythonBindings.cpp index d1dedaaec4..70473c86d4 100644 --- a/Code/Tools/ProjectManager/Source/PythonBindings.cpp +++ b/Code/Tools/ProjectManager/Source/PythonBindings.cpp @@ -1135,11 +1135,11 @@ namespace O3DE::ProjectManager gemRepoInfo.m_isEnabled = false; } - if (data.contains("gem_paths")) + if (data.contains("gems")) { - for (auto gemPath : data["gem_paths"]) + for (auto gemPath : data["gems"]) { - gemRepoInfo.m_includedGemPaths.push_back(Py_To_String(gemPath)); + gemRepoInfo.m_includedGemUris.push_back(Py_To_String(gemPath)); } } } @@ -1188,7 +1188,35 @@ namespace O3DE::ProjectManager return AZ::Success(AZStd::move(gemRepos)); } - AZ::Outcome, AZStd::string> PythonBindings::GetAllGemRepoGemsInfos() + AZ::Outcome, AZStd::string> PythonBindings::GetGemRepoGemInfos(const QString& repoUri) + { + QVector gemInfos; + AZ::Outcome result = ExecuteWithLockErrorHandling( + [&] + { + auto pyUri = QString_To_Py_String(repoUri); + auto gemPaths = m_repo.attr("get_gem_json_paths_from_cached_repo")(pyUri); + + if (pybind11::isinstance(gemPaths)) + { + for (auto path : gemPaths) + { + GemInfo gemInfo = GemInfoFromPath(path, pybind11::none()); + gemInfo.m_downloadStatus = GemInfo::DownloadStatus::NotDownloaded; + gemInfos.push_back(gemInfo); + } + } + }); + + if (!result.IsSuccess()) + { + return AZ::Failure(result.GetError()); + } + + return AZ::Success(AZStd::move(gemInfos)); + } + + AZ::Outcome, AZStd::string> PythonBindings::GetAllGemReposGemInfos() { QVector gemInfos; AZ::Outcome result = ExecuteWithLockErrorHandling( diff --git a/Code/Tools/ProjectManager/Source/PythonBindings.h b/Code/Tools/ProjectManager/Source/PythonBindings.h index ecc6f65dc3..a021cfdacc 100644 --- a/Code/Tools/ProjectManager/Source/PythonBindings.h +++ b/Code/Tools/ProjectManager/Source/PythonBindings.h @@ -65,7 +65,8 @@ namespace O3DE::ProjectManager bool AddGemRepo(const QString& repoUri) override; bool RemoveGemRepo(const QString& repoUri) override; AZ::Outcome, AZStd::string> GetAllGemRepoInfos() override; - AZ::Outcome, AZStd::string> GetAllGemRepoGemsInfos() override; + AZ::Outcome, AZStd::string> GetGemRepoGemInfos(const QString& repoUri) override; + AZ::Outcome, AZStd::string> GetAllGemReposGemInfos() override; AZ::Outcome DownloadGem(const QString& gemName, std::function gemProgressCallback, bool force = false) override; void CancelDownload() override; bool IsGemUpdateAvaliable(const QString& gemName, const QString& lastUpdated) override; diff --git a/Code/Tools/ProjectManager/Source/PythonBindingsInterface.h b/Code/Tools/ProjectManager/Source/PythonBindingsInterface.h index 65337869fd..2024f61ea0 100644 --- a/Code/Tools/ProjectManager/Source/PythonBindingsInterface.h +++ b/Code/Tools/ProjectManager/Source/PythonBindingsInterface.h @@ -217,11 +217,18 @@ namespace O3DE::ProjectManager */ virtual AZ::Outcome, AZStd::string> GetAllGemRepoInfos() = 0; + /** + * Gathers all gem infos for repos + * @param repoUri the absolute filesystem path or url to the gem repo. + * @return A list of gem infos. + */ + virtual AZ::Outcome, AZStd::string> GetGemRepoGemInfos(const QString& repoUri) = 0; + /** * Gathers all gem infos for all gems registered from repos. * @return A list of gem infos. */ - virtual AZ::Outcome, AZStd::string> GetAllGemRepoGemsInfos() = 0; + virtual AZ::Outcome, AZStd::string> GetAllGemReposGemInfos() = 0; /** * Downloads and registers a Gem. From c83d0432dd7c9596309ea2d37aaf67edaa819db9 Mon Sep 17 00:00:00 2001 From: jromnoa <80134229+jromnoa@users.noreply.github.com> Date: Thu, 4 Nov 2021 11:40:01 -0700 Subject: [PATCH 053/345] saving initial round of edits for the using the Asset class Signed-off-by: jromnoa <80134229+jromnoa@users.noreply.github.com> --- .../Atom/TestSuite_Main_GPU_Optimized.py | 2 +- .../tests/hydra_AtomGPU_BasicLevelSetup.py | 119 ++++++++++++------ 2 files changed, 81 insertions(+), 40 deletions(-) diff --git a/AutomatedTesting/Gem/PythonTests/Atom/TestSuite_Main_GPU_Optimized.py b/AutomatedTesting/Gem/PythonTests/Atom/TestSuite_Main_GPU_Optimized.py index 568768e12e..39fca5c7e4 100644 --- a/AutomatedTesting/Gem/PythonTests/Atom/TestSuite_Main_GPU_Optimized.py +++ b/AutomatedTesting/Gem/PythonTests/Atom/TestSuite_Main_GPU_Optimized.py @@ -16,7 +16,7 @@ from .atom_utils.atom_component_helper import create_screenshots_archive, golden DEFAULT_SUBFOLDER_PATH = 'user/PythonTests/Automated/Screenshots' -@pytest.mark.xfail(reason="Optimized tests are experimental, we will enable xfail and monitor them temporarily.") +# @pytest.mark.xfail(reason="Optimized tests are experimental, we will enable xfail and monitor them temporarily.") @pytest.mark.parametrize("project", ["AutomatedTesting"]) @pytest.mark.parametrize("launcher_platform", ['windows_editor']) class TestAutomation(EditorTestSuite): diff --git a/AutomatedTesting/Gem/PythonTests/Atom/tests/hydra_AtomGPU_BasicLevelSetup.py b/AutomatedTesting/Gem/PythonTests/Atom/tests/hydra_AtomGPU_BasicLevelSetup.py index 92c555127a..ad9758d57c 100644 --- a/AutomatedTesting/Gem/PythonTests/Atom/tests/hydra_AtomGPU_BasicLevelSetup.py +++ b/AutomatedTesting/Gem/PythonTests/Atom/tests/hydra_AtomGPU_BasicLevelSetup.py @@ -7,28 +7,70 @@ SPDX-License-Identifier: Apache-2.0 OR MIT # fmt: off -class Tests : - camera_component_added = ("Camera component was added", "Camera component wasn't added") - camera_fov_set = ("Camera component FOV property set", "Camera component FOV property wasn't set") - directional_light_component_added = ("Directional Light component added", "Directional Light component wasn't added") - enter_game_mode = ("Entered game mode", "Failed to enter game mode") - exit_game_mode = ("Exited game mode", "Couldn't exit game mode") - global_skylight_component_added = ("Global Skylight (IBL) component added", "Global Skylight (IBL) component wasn't added") - global_skylight_diffuse_image_set = ("Global Skylight Diffuse Image property set", "Global Skylight Diffuse Image property wasn't set") - global_skylight_specular_image_set = ("Global Skylight Specular Image property set", "Global Skylight Specular Image property wasn't set") - ground_plane_material_asset_set = ("Ground Plane Material Asset was set", "Ground Plane Material Asset wasn't set") - ground_plane_material_component_added = ("Ground Plane Material component added", "Ground Plane Material component wasn't added") - ground_plane_mesh_asset_set = ("Ground Plane Mesh Asset property was set", "Ground Plane Mesh Asset property wasn't set") - hdri_skybox_component_added = ("HDRi Skybox component added", "HDRi Skybox component wasn't added") - hdri_skybox_cubemap_texture_set = ("HDRi Skybox Cubemap Texture property set", "HDRi Skybox Cubemap Texture property wasn't set") - mesh_component_added = ("Mesh component added", "Mesh component wasn't added") - no_assert_occurred = ("No asserts detected", "Asserts were detected") - no_error_occurred = ("No errors detected", "Errors were detected") - secondary_grid_spacing = ("Secondary Grid Spacing set", "Secondary Grid Spacing not set") - sphere_material_component_added = ("Sphere Material component added", "Sphere Material component wasn't added") - sphere_material_set = ("Sphere Material Asset was set", "Sphere Material Asset wasn't set") - sphere_mesh_asset_set = ("Sphere Mesh Asset was set", "Sphere Mesh Asset wasn't set") - viewport_set = ("Viewport set to correct size", "Viewport not set to correct size") +class Tests: + camera_component_added = ( + "Camera component was added", + "Camera component wasn't added") + camera_fov_set = ( + "Camera component FOV property set", + "Camera component FOV property wasn't set") + directional_light_component_added = ( + "Directional Light component added", + "Directional Light component wasn't added") + enter_game_mode = ( + "Entered game mode", + "Failed to enter game mode") + exit_game_mode = ( + "Exited game mode", + "Couldn't exit game mode") + global_skylight_component_added = ( + "Global Skylight (IBL) component added", + "Global Skylight (IBL) component wasn't added") + global_skylight_diffuse_image_set = ( + "Global Skylight Diffuse Image property set", + "Global Skylight Diffuse Image property wasn't set") + global_skylight_specular_image_set = ( + "Global Skylight Specular Image property set", + "Global Skylight Specular Image property wasn't set") + ground_plane_material_asset_set = ( + "Ground Plane Material Asset was set", + "Ground Plane Material Asset wasn't set") + ground_plane_material_component_added = ( + "Ground Plane Material component added", + "Ground Plane Material component wasn't added") + ground_plane_mesh_asset_set = ( + "Ground Plane Mesh Asset property was set", + "Ground Plane Mesh Asset property wasn't set") + hdri_skybox_component_added = ( + "HDRi Skybox component added", + "HDRi Skybox component wasn't added") + hdri_skybox_cubemap_texture_set = ( + "HDRi Skybox Cubemap Texture property set", + "HDRi Skybox Cubemap Texture property wasn't set") + mesh_component_added = ( + "Mesh component added", + "Mesh component wasn't added") + no_assert_occurred = ( + "No asserts detected", + "Asserts were detected") + no_error_occurred = ( + "No errors detected", + "Errors were detected") + secondary_grid_spacing = ( + "Secondary Grid Spacing set", + "Secondary Grid Spacing not set") + sphere_material_component_added = ( + "Sphere Material component added", + "Sphere Material component wasn't added") + sphere_material_set = ( + "Sphere Material Asset was set", + "Sphere Material Asset wasn't set") + sphere_mesh_asset_set = ( + "Sphere Mesh Asset was set", + "Sphere Mesh Asset wasn't set") + viewport_set = ( + "Viewport set to correct size", + "Viewport not set to correct size") # fmt: on @@ -77,12 +119,11 @@ def AtomGPU_BasicLevelSetup_SetsUpLevel(): import os from math import isclose - import azlmbr.asset as asset - import azlmbr.bus as bus import azlmbr.legacy.general as general import azlmbr.math as math import azlmbr.paths + from editor_python_test_tools.asset_utils import Asset from editor_python_test_tools.editor_entity_utils import EditorEntity from editor_python_test_tools.utils import Report, Tracer, TestHelper as helper @@ -98,6 +139,11 @@ def AtomGPU_BasicLevelSetup_SetsUpLevel(): def initial_viewport_setup(screen_width, screen_height): general.set_viewport_size(screen_width, screen_height) general.update_viewport() + helper.wait_for_condition( + function=lambda: isclose(a=general.get_viewport_size().x, b=SCREEN_WIDTH, rel_tol=0.1) + and isclose(a=general.get_viewport_size().y, b=SCREEN_HEIGHT, rel_tol=0.1), + timeout_in_seconds=4.0 + ) result = isclose( a=general.get_viewport_size().x, b=SCREEN_WIDTH, rel_tol=0.1) and isclose( a=general.get_viewport_size().y, b=SCREEN_HEIGHT, rel_tol=0.1) @@ -151,11 +197,10 @@ def AtomGPU_BasicLevelSetup_SetsUpLevel(): # 8. Set the Cubemap Texture property of the HDRi Skybox component. global_skylight_image_asset_path = os.path.join( "LightingPresets", "greenwich_park_02_4k_iblskyboxcm_iblspecular.exr.streamingimage") - global_skylight_image_asset = asset.AssetCatalogRequestBus( - bus.Broadcast, "GetAssetIdByPath", global_skylight_image_asset_path, math.Uuid(), False) + global_skylight_image_asset = Asset.find_asset_by_path(global_skylight_image_asset_path, False) hdri_skybox_cubemap_texture_property = "Controller|Configuration|Cubemap Texture" hdri_skybox_component.set_component_property_value( - hdri_skybox_cubemap_texture_property, global_skylight_image_asset) + hdri_skybox_cubemap_texture_property, global_skylight_image_asset.id) Report.result( Tests.hdri_skybox_cubemap_texture_set, hdri_skybox_component.get_component_property_value( @@ -191,11 +236,10 @@ def AtomGPU_BasicLevelSetup_SetsUpLevel(): # 12. Set the Material Asset property of the Material component for the Ground Plane Entity. ground_plane_entity.set_local_uniform_scale(32.0) ground_plane_material_asset_path = os.path.join("Materials", "Presets", "PBR", "metal_chrome.azmaterial") - ground_plane_material_asset = asset.AssetCatalogRequestBus( - bus.Broadcast, "GetAssetIdByPath", ground_plane_material_asset_path, math.Uuid(), False) + ground_plane_material_asset = Asset.find_asset_by_path(ground_plane_material_asset_path, False) ground_plane_material_asset_property = "Default Material|Material Asset" ground_plane_material_component.set_component_property_value( - ground_plane_material_asset_property, ground_plane_material_asset) + ground_plane_material_asset_property, ground_plane_material_asset.id) Report.result( Tests.ground_plane_material_asset_set, ground_plane_material_component.get_component_property_value( @@ -205,11 +249,10 @@ def AtomGPU_BasicLevelSetup_SetsUpLevel(): ground_plane_mesh_component = ground_plane_entity.add_component(MESH_COMPONENT_NAME) Report.result(Tests.mesh_component_added, ground_plane_entity.has_component(MESH_COMPONENT_NAME)) ground_plane_mesh_asset_path = os.path.join("Objects", "plane.azmodel") - ground_plane_mesh_asset = asset.AssetCatalogRequestBus( - bus.Broadcast, "GetAssetIdByPath", ground_plane_mesh_asset_path, math.Uuid(), False) + ground_plane_mesh_asset = Asset.find_asset_by_path(ground_plane_mesh_asset_path, False) ground_plane_mesh_asset_property = "Controller|Configuration|Mesh Asset" ground_plane_mesh_component.set_component_property_value( - ground_plane_mesh_asset_property, ground_plane_mesh_asset) + ground_plane_mesh_asset_property, ground_plane_mesh_asset.id) Report.result( Tests.ground_plane_mesh_asset_set, ground_plane_mesh_component.get_component_property_value( @@ -235,20 +278,18 @@ def AtomGPU_BasicLevelSetup_SetsUpLevel(): # 17. Set the Material Asset property of the Material component for the Sphere Entity. sphere_material_asset_path = os.path.join("Materials", "Presets", "PBR", "metal_brass_polished.azmaterial") - sphere_material_asset = asset.AssetCatalogRequestBus( - bus.Broadcast, "GetAssetIdByPath", sphere_material_asset_path, math.Uuid(), False) + sphere_material_asset = Asset.find_asset_by_path(sphere_material_asset_path, False) sphere_material_asset_property = "Default Material|Material Asset" - sphere_material_component.set_component_property_value(sphere_material_asset_property, sphere_material_asset) + sphere_material_component.set_component_property_value(sphere_material_asset_property, sphere_material_asset.id) Report.result(Tests.sphere_material_set, sphere_material_component.get_component_property_value( sphere_material_asset_property) == sphere_material_asset) # 18. Add Mesh component to Sphere Entity and set the Mesh Asset property for the Mesh component. sphere_mesh_component = sphere_entity.add_component(MESH_COMPONENT_NAME) sphere_mesh_asset_path = os.path.join("Models", "sphere.azmodel") - sphere_mesh_asset = asset.AssetCatalogRequestBus( - bus.Broadcast, "GetAssetIdByPath", sphere_mesh_asset_path, math.Uuid(), False) + sphere_mesh_asset = Asset.find_asset_by_path(sphere_mesh_asset_path, False) sphere_mesh_asset_property = "Controller|Configuration|Mesh Asset" - sphere_mesh_component.set_component_property_value(sphere_mesh_asset_property, sphere_mesh_asset) + sphere_mesh_component.set_component_property_value(sphere_mesh_asset_property, sphere_mesh_asset.id) Report.result(Tests.sphere_mesh_asset_set, sphere_mesh_component.get_component_property_value( sphere_mesh_asset_property) == sphere_mesh_asset) From 9c2a50d686f0768130b84a203370be62719cdb31 Mon Sep 17 00:00:00 2001 From: jromnoa <80134229+jromnoa@users.noreply.github.com> Date: Thu, 4 Nov 2021 13:53:27 -0700 Subject: [PATCH 054/345] use smaller asset files, fix asset to use asset.id for tests Signed-off-by: jromnoa <80134229+jromnoa@users.noreply.github.com> --- .../tests/hydra_AtomGPU_BasicLevelSetup.py | 122 +++++++++--------- .../tests/hydra_GPUTest_BasicLevelSetup.py | 3 +- 2 files changed, 60 insertions(+), 65 deletions(-) diff --git a/AutomatedTesting/Gem/PythonTests/Atom/tests/hydra_AtomGPU_BasicLevelSetup.py b/AutomatedTesting/Gem/PythonTests/Atom/tests/hydra_AtomGPU_BasicLevelSetup.py index ad9758d57c..80244c44af 100644 --- a/AutomatedTesting/Gem/PythonTests/Atom/tests/hydra_AtomGPU_BasicLevelSetup.py +++ b/AutomatedTesting/Gem/PythonTests/Atom/tests/hydra_AtomGPU_BasicLevelSetup.py @@ -127,10 +127,9 @@ def AtomGPU_BasicLevelSetup_SetsUpLevel(): from editor_python_test_tools.editor_entity_utils import EditorEntity from editor_python_test_tools.utils import Report, Tracer, TestHelper as helper + from Atom.atom_utils.atom_constants import AtomComponentProperties from Atom.atom_utils.screenshot_utils import ScreenshotHelper - MATERIAL_COMPONENT_NAME = "Material" - MESH_COMPONENT_NAME = "Mesh" SCREENSHOT_NAME = "AtomBasicLevelSetup" SCREEN_WIDTH = 1280 SCREEN_HEIGHT = 720 @@ -141,14 +140,9 @@ def AtomGPU_BasicLevelSetup_SetsUpLevel(): general.update_viewport() helper.wait_for_condition( function=lambda: isclose(a=general.get_viewport_size().x, b=SCREEN_WIDTH, rel_tol=0.1) - and isclose(a=general.get_viewport_size().y, b=SCREEN_HEIGHT, rel_tol=0.1), + and isclose(a=general.get_viewport_size().y, b=SCREEN_HEIGHT, rel_tol=0.1), timeout_in_seconds=4.0 ) - result = isclose( - a=general.get_viewport_size().x, b=SCREEN_WIDTH, rel_tol=0.1) and isclose( - a=general.get_viewport_size().y, b=SCREEN_HEIGHT, rel_tol=0.1) - - return result with Tracer() as error_tracer: # Test setup begins. @@ -160,8 +154,8 @@ def AtomGPU_BasicLevelSetup_SetsUpLevel(): # 1. Close error windows and display helpers then update the viewport size. helper.close_error_windows() helper.close_display_helpers() + initial_viewport_setup(SCREEN_WIDTH, SCREEN_HEIGHT) general.update_viewport() - Report.critical_result(Tests.viewport_set, initial_viewport_setup(SCREEN_WIDTH, SCREEN_HEIGHT)) # 2. Create Default Level Entity. default_level_entity_name = "Default Level" @@ -169,12 +163,11 @@ def AtomGPU_BasicLevelSetup_SetsUpLevel(): math.Vector3(0.0, 0.0, 0.0), default_level_entity_name) # 3. Create Grid Entity as a child entity of the Default Level Entity. - grid_name = "Grid" - grid_entity = EditorEntity.create_editor_entity(grid_name, default_level_entity.id) + grid_entity = EditorEntity.create_editor_entity(AtomComponentProperties.grid(), default_level_entity.id) # 4. Add Grid component to Grid Entity and set Secondary Grid Spacing. - grid_component = grid_entity.add_component(grid_name) - secondary_grid_spacing_property = "Controller|Configuration|Secondary Grid Spacing" + grid_component = grid_entity.add_component(AtomComponentProperties.grid()) + secondary_grid_spacing_property = AtomComponentProperties.grid('Secondary Grid Spacing') secondary_grid_spacing_value = 1.0 grid_component.set_component_property_value(secondary_grid_spacing_property, secondary_grid_spacing_value) secondary_grid_spacing_set = grid_component.get_component_property_value( @@ -182,134 +175,137 @@ def AtomGPU_BasicLevelSetup_SetsUpLevel(): Report.result(Tests.secondary_grid_spacing, secondary_grid_spacing_set) # 5. Create Global Skylight (IBL) Entity as a child entity of the Default Level Entity. - global_skylight_name = "Global Skylight (IBL)" - global_skylight_entity = EditorEntity.create_editor_entity(global_skylight_name, default_level_entity.id) + global_skylight_entity = EditorEntity.create_editor_entity( + AtomComponentProperties.global_skylight(), default_level_entity.id) # 6. Add HDRi Skybox component to the Global Skylight (IBL) Entity. - hdri_skybox_name = "HDRi Skybox" - hdri_skybox_component = global_skylight_entity.add_component(hdri_skybox_name) - Report.result(Tests.hdri_skybox_component_added, global_skylight_entity.has_component(hdri_skybox_name)) + hdri_skybox_component = global_skylight_entity.add_component(AtomComponentProperties.hdri_skybox()) + Report.result(Tests.hdri_skybox_component_added, global_skylight_entity.has_component( + AtomComponentProperties.hdri_skybox())) # 7. Add Global Skylight (IBL) component to the Global Skylight (IBL) Entity. - global_skylight_component = global_skylight_entity.add_component(global_skylight_name) - Report.result(Tests.global_skylight_component_added, global_skylight_entity.has_component(global_skylight_name)) + global_skylight_component = global_skylight_entity.add_component(AtomComponentProperties.global_skylight()) + Report.result(Tests.global_skylight_component_added, global_skylight_entity.has_component( + AtomComponentProperties.global_skylight())) # 8. Set the Cubemap Texture property of the HDRi Skybox component. - global_skylight_image_asset_path = os.path.join( - "LightingPresets", "greenwich_park_02_4k_iblskyboxcm_iblspecular.exr.streamingimage") + global_skylight_image_asset_path = os.path.join("LightingPresets", "default_iblskyboxcm.exr.streamingimage") global_skylight_image_asset = Asset.find_asset_by_path(global_skylight_image_asset_path, False) - hdri_skybox_cubemap_texture_property = "Controller|Configuration|Cubemap Texture" hdri_skybox_component.set_component_property_value( - hdri_skybox_cubemap_texture_property, global_skylight_image_asset.id) + AtomComponentProperties.hdri_skybox('Cubemap Texture'), global_skylight_image_asset.id) Report.result( Tests.hdri_skybox_cubemap_texture_set, hdri_skybox_component.get_component_property_value( - hdri_skybox_cubemap_texture_property) == global_skylight_image_asset) + AtomComponentProperties.hdri_skybox('Cubemap Texture')) == global_skylight_image_asset.id) # 9. Set the Diffuse Image property of the Global Skylight (IBL) component. # Re-use the same image that was used in the previous test step. - global_skylight_diffuse_image_property = "Controller|Configuration|Diffuse Image" + global_skylight_diffuse_image_asset_path = os.path.join( + "LightingPresets", "default_iblskyboxcm_ibldiffuse.exr.streamingimage") + global_skylight_diffuse_image_asset = Asset.find_asset_by_path(global_skylight_diffuse_image_asset_path, False) global_skylight_component.set_component_property_value( - global_skylight_diffuse_image_property, global_skylight_image_asset) + AtomComponentProperties.global_skylight('Diffuse Image'), global_skylight_diffuse_image_asset.id) Report.result( Tests.global_skylight_diffuse_image_set, global_skylight_component.get_component_property_value( - global_skylight_diffuse_image_property) == global_skylight_image_asset) + AtomComponentProperties.global_skylight('Diffuse Image')) == global_skylight_diffuse_image_asset.id) # 10. Set the Specular Image property of the Global Skylight (IBL) component. # Re-use the same image that was used in the previous test step. - global_skylight_specular_image_property = "Controller|Configuration|Specular Image" + global_skylight_specular_image_asset_path = os.path.join( + "LightingPresets", "default_iblskyboxcm_iblspecular.exr.streamingimage") + global_skylight_specular_image_asset = Asset.find_asset_by_path( + global_skylight_specular_image_asset_path, False) global_skylight_component.set_component_property_value( - global_skylight_specular_image_property, global_skylight_image_asset) + AtomComponentProperties.global_skylight('Specular Image'), global_skylight_specular_image_asset.id) global_skylight_specular_image_set = global_skylight_component.get_component_property_value( - global_skylight_specular_image_property) + AtomComponentProperties.global_skylight('Specular Image')) Report.result( - Tests.global_skylight_specular_image_set, global_skylight_specular_image_set == global_skylight_image_asset) + Tests.global_skylight_specular_image_set, + global_skylight_specular_image_set == global_skylight_specular_image_asset.id) # 11. Create a Ground Plane Entity with a Material component that is a child entity of the Default Level Entity. ground_plane_name = "Ground Plane" ground_plane_entity = EditorEntity.create_editor_entity(ground_plane_name, default_level_entity.id) - ground_plane_material_component = ground_plane_entity.add_component(MATERIAL_COMPONENT_NAME) + ground_plane_material_component = ground_plane_entity.add_component(AtomComponentProperties.material()) Report.result( - Tests.ground_plane_material_component_added, ground_plane_entity.has_component(MATERIAL_COMPONENT_NAME)) + Tests.ground_plane_material_component_added, + ground_plane_entity.has_component(AtomComponentProperties.material())) # 12. Set the Material Asset property of the Material component for the Ground Plane Entity. ground_plane_entity.set_local_uniform_scale(32.0) ground_plane_material_asset_path = os.path.join("Materials", "Presets", "PBR", "metal_chrome.azmaterial") ground_plane_material_asset = Asset.find_asset_by_path(ground_plane_material_asset_path, False) - ground_plane_material_asset_property = "Default Material|Material Asset" ground_plane_material_component.set_component_property_value( - ground_plane_material_asset_property, ground_plane_material_asset.id) + AtomComponentProperties.material('Material Asset'), ground_plane_material_asset.id) Report.result( Tests.ground_plane_material_asset_set, ground_plane_material_component.get_component_property_value( - ground_plane_material_asset_property) == ground_plane_material_asset) + AtomComponentProperties.material('Material Asset')) == ground_plane_material_asset.id) # 13. Add the Mesh component to the Ground Plane Entity and set the Mesh component Mesh Asset property. - ground_plane_mesh_component = ground_plane_entity.add_component(MESH_COMPONENT_NAME) - Report.result(Tests.mesh_component_added, ground_plane_entity.has_component(MESH_COMPONENT_NAME)) - ground_plane_mesh_asset_path = os.path.join("Objects", "plane.azmodel") + ground_plane_mesh_component = ground_plane_entity.add_component(AtomComponentProperties.mesh()) + Report.result(Tests.mesh_component_added, ground_plane_entity.has_component(AtomComponentProperties.mesh())) + ground_plane_mesh_asset_path = os.path.join("TestData", "Objects", "plane.azmodel") ground_plane_mesh_asset = Asset.find_asset_by_path(ground_plane_mesh_asset_path, False) - ground_plane_mesh_asset_property = "Controller|Configuration|Mesh Asset" ground_plane_mesh_component.set_component_property_value( - ground_plane_mesh_asset_property, ground_plane_mesh_asset.id) + AtomComponentProperties.mesh('Mesh Asset'), ground_plane_mesh_asset.id) Report.result( Tests.ground_plane_mesh_asset_set, ground_plane_mesh_component.get_component_property_value( - ground_plane_mesh_asset_property) == ground_plane_mesh_asset) + AtomComponentProperties.mesh('Mesh Asset')) == ground_plane_mesh_asset.id) # 14. Create a Directional Light Entity as a child entity of the Default Level Entity. - directional_light_name = "Directional Light" directional_light_entity = EditorEntity.create_editor_entity_at( - math.Vector3(0.0, 0.0, 10.0), directional_light_name, default_level_entity.id) + math.Vector3(0.0, 0.0, 10.0), AtomComponentProperties.directional_light(), default_level_entity.id) # 15. Add Directional Light component to Directional Light Entity and set entity rotation. - directional_light_entity.add_component(directional_light_name) + directional_light_entity.add_component(AtomComponentProperties.directional_light()) directional_light_entity_rotation = math.Vector3(DEGREE_RADIAN_FACTOR * -90.0, 0.0, 0.0) directional_light_entity.set_local_rotation(directional_light_entity_rotation) Report.result( - Tests.directional_light_component_added, directional_light_entity.has_component(directional_light_name)) + Tests.directional_light_component_added, directional_light_entity.has_component( + AtomComponentProperties.directional_light())) # 16. Create a Sphere Entity as a child entity of the Default Level Entity then add a Material component. sphere_entity = EditorEntity.create_editor_entity_at( math.Vector3(0.0, 0.0, 1.0), "Sphere", default_level_entity.id) - sphere_material_component = sphere_entity.add_component(MATERIAL_COMPONENT_NAME) - Report.result(Tests.sphere_material_component_added, sphere_entity.has_component(MATERIAL_COMPONENT_NAME)) + sphere_material_component = sphere_entity.add_component(AtomComponentProperties.material()) + Report.result(Tests.sphere_material_component_added, sphere_entity.has_component( + AtomComponentProperties.material())) # 17. Set the Material Asset property of the Material component for the Sphere Entity. sphere_material_asset_path = os.path.join("Materials", "Presets", "PBR", "metal_brass_polished.azmaterial") sphere_material_asset = Asset.find_asset_by_path(sphere_material_asset_path, False) - sphere_material_asset_property = "Default Material|Material Asset" - sphere_material_component.set_component_property_value(sphere_material_asset_property, sphere_material_asset.id) + sphere_material_component.set_component_property_value( + AtomComponentProperties.material('Material Asset'), sphere_material_asset.id) Report.result(Tests.sphere_material_set, sphere_material_component.get_component_property_value( - sphere_material_asset_property) == sphere_material_asset) + AtomComponentProperties.material('Material Asset')) == sphere_material_asset.id) # 18. Add Mesh component to Sphere Entity and set the Mesh Asset property for the Mesh component. - sphere_mesh_component = sphere_entity.add_component(MESH_COMPONENT_NAME) + sphere_mesh_component = sphere_entity.add_component(AtomComponentProperties.mesh()) sphere_mesh_asset_path = os.path.join("Models", "sphere.azmodel") sphere_mesh_asset = Asset.find_asset_by_path(sphere_mesh_asset_path, False) - sphere_mesh_asset_property = "Controller|Configuration|Mesh Asset" - sphere_mesh_component.set_component_property_value(sphere_mesh_asset_property, sphere_mesh_asset.id) + sphere_mesh_component.set_component_property_value( + AtomComponentProperties.mesh('Mesh Asset'), sphere_mesh_asset.id) Report.result(Tests.sphere_mesh_asset_set, sphere_mesh_component.get_component_property_value( - sphere_mesh_asset_property) == sphere_mesh_asset) + AtomComponentProperties.mesh('Mesh Asset')) == sphere_mesh_asset.id) # 19. Create a Camera Entity as a child entity of the Default Level Entity then add a Camera component. - camera_name = "Camera" camera_entity = EditorEntity.create_editor_entity_at( - math.Vector3(5.5, -12.0, 9.0), camera_name, default_level_entity.id) - camera_component = camera_entity.add_component(camera_name) - Report.result(Tests.camera_component_added, camera_entity.has_component(camera_name)) + math.Vector3(5.5, -12.0, 9.0), AtomComponentProperties.camera(), default_level_entity.id) + camera_component = camera_entity.add_component(AtomComponentProperties.camera()) + Report.result(Tests.camera_component_added, camera_entity.has_component(AtomComponentProperties.camera())) # 20. Set the Camera Entity rotation value and set the Camera component Field of View value. camera_entity_rotation = math.Vector3( DEGREE_RADIAN_FACTOR * -27.0, DEGREE_RADIAN_FACTOR * -12.0, DEGREE_RADIAN_FACTOR * 25.0) camera_entity.set_local_rotation(camera_entity_rotation) - camera_fov_property = "Controller|Configuration|Field of view" camera_fov_value = 60.0 - camera_component.set_component_property_value(camera_fov_property, camera_fov_value) + camera_component.set_component_property_value(AtomComponentProperties.camera('Field of view'), camera_fov_value) azlmbr.camera.EditorCameraViewRequestBus(azlmbr.bus.Event, "ToggleCameraAsActiveView", camera_entity.id) Report.result(Tests.camera_fov_set, camera_component.get_component_property_value( - camera_fov_property) == camera_fov_value) + AtomComponentProperties.camera('Field of view')) == camera_fov_value) # 21. Enter game mode. helper.enter_game_mode(Tests.enter_game_mode) diff --git a/AutomatedTesting/Gem/PythonTests/Atom/tests/hydra_GPUTest_BasicLevelSetup.py b/AutomatedTesting/Gem/PythonTests/Atom/tests/hydra_GPUTest_BasicLevelSetup.py index 9515712583..3bf4c46a57 100644 --- a/AutomatedTesting/Gem/PythonTests/Atom/tests/hydra_GPUTest_BasicLevelSetup.py +++ b/AutomatedTesting/Gem/PythonTests/Atom/tests/hydra_GPUTest_BasicLevelSetup.py @@ -131,8 +131,7 @@ def run(): components=["HDRi Skybox", "Global Skylight (IBL)"], parent_id=default_level.id ) - global_skylight_image_asset_path = os.path.join( - "LightingPresets", "greenwich_park_02_4k_iblskyboxcm_iblspecular.exr.streamingimage") + global_skylight_image_asset_path = os.path.join("LightingPresets", "default_iblskyboxcm.exr.streamingimage") global_skylight_image_asset = asset.AssetCatalogRequestBus( bus.Broadcast, "GetAssetIdByPath", global_skylight_image_asset_path, math.Uuid(), False) global_skylight.get_set_test(0, "Controller|Configuration|Cubemap Texture", global_skylight_image_asset) From 0efb8847aabfc1a74041e6dfe55fef5b19739e47 Mon Sep 17 00:00:00 2001 From: jromnoa <80134229+jromnoa@users.noreply.github.com> Date: Fri, 5 Nov 2021 16:36:45 -0700 Subject: [PATCH 055/345] drop the 'as helper' for TestHelper and re-factor the helper. calls to TestHelper. Signed-off-by: jromnoa <80134229+jromnoa@users.noreply.github.com> --- .../tests/hydra_AtomGPU_BasicLevelSetup.py | 29 ++++++++++--------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/AutomatedTesting/Gem/PythonTests/Atom/tests/hydra_AtomGPU_BasicLevelSetup.py b/AutomatedTesting/Gem/PythonTests/Atom/tests/hydra_AtomGPU_BasicLevelSetup.py index 80244c44af..69fa9456f8 100644 --- a/AutomatedTesting/Gem/PythonTests/Atom/tests/hydra_AtomGPU_BasicLevelSetup.py +++ b/AutomatedTesting/Gem/PythonTests/Atom/tests/hydra_AtomGPU_BasicLevelSetup.py @@ -6,7 +6,6 @@ SPDX-License-Identifier: Apache-2.0 OR MIT """ -# fmt: off class Tests: camera_component_added = ( "Camera component was added", @@ -125,7 +124,7 @@ def AtomGPU_BasicLevelSetup_SetsUpLevel(): from editor_python_test_tools.asset_utils import Asset from editor_python_test_tools.editor_entity_utils import EditorEntity - from editor_python_test_tools.utils import Report, Tracer, TestHelper as helper + from editor_python_test_tools.utils import Report, Tracer, TestHelper from Atom.atom_utils.atom_constants import AtomComponentProperties from Atom.atom_utils.screenshot_utils import ScreenshotHelper @@ -138,7 +137,7 @@ def AtomGPU_BasicLevelSetup_SetsUpLevel(): def initial_viewport_setup(screen_width, screen_height): general.set_viewport_size(screen_width, screen_height) general.update_viewport() - helper.wait_for_condition( + TestHelper.wait_for_condition( function=lambda: isclose(a=general.get_viewport_size().x, b=SCREEN_WIDTH, rel_tol=0.1) and isclose(a=general.get_viewport_size().y, b=SCREEN_HEIGHT, rel_tol=0.1), timeout_in_seconds=4.0 @@ -147,13 +146,13 @@ def AtomGPU_BasicLevelSetup_SetsUpLevel(): with Tracer() as error_tracer: # Test setup begins. # Setup: Wait for Editor idle loop before executing Python hydra scripts then open "Base" level. - helper.init_idle() - helper.open_level("", "Base") + TestHelper.init_idle() + TestHelper.open_level("", "Base") # Test steps begin. # 1. Close error windows and display helpers then update the viewport size. - helper.close_error_windows() - helper.close_display_helpers() + TestHelper.close_error_windows() + TestHelper.close_display_helpers() initial_viewport_setup(SCREEN_WIDTH, SCREEN_HEIGHT) general.update_viewport() @@ -308,20 +307,22 @@ def AtomGPU_BasicLevelSetup_SetsUpLevel(): AtomComponentProperties.camera('Field of view')) == camera_fov_value) # 21. Enter game mode. - helper.enter_game_mode(Tests.enter_game_mode) - helper.wait_for_condition(function=lambda: general.is_in_game_mode(), timeout_in_seconds=4.0) + TestHelper.enter_game_mode(Tests.enter_game_mode) + TestHelper.wait_for_condition(function=lambda: general.is_in_game_mode(), timeout_in_seconds=4.0) # 22. Take screenshot. ScreenshotHelper(general.idle_wait_frames).capture_screenshot_blocking(f"{SCREENSHOT_NAME}.ppm") # 23. Exit game mode. - helper.exit_game_mode(Tests.exit_game_mode) - helper.wait_for_condition(function=lambda: not general.is_in_game_mode(), timeout_in_seconds=4.0) + TestHelper.exit_game_mode(Tests.exit_game_mode) + TestHelper.wait_for_condition(function=lambda: not general.is_in_game_mode(), timeout_in_seconds=4.0) # 24. Look for errors. - helper.wait_for_condition(lambda: error_tracer.has_errors or error_tracer.has_asserts, 1.0) - Report.result(Tests.no_assert_occurred, not error_tracer.has_asserts) - Report.result(Tests.no_error_occurred, not error_tracer.has_errors) + TestHelper.wait_for_condition(lambda: error_tracer.has_errors or error_tracer.has_asserts, 1.0) + for error_info in error_tracer.errors: + Report.info(f"Error: {error_info.filename} {error_info.function} | {error_info.message}") + for assert_info in error_tracer.asserts: + Report.info(f"Assert: {assert_info.filename} {assert_info.function} | {assert_info.message}") if __name__ == "__main__": From 33493b5c8e850055def2e6feb1cfe19aa016619f Mon Sep 17 00:00:00 2001 From: jromnoa <80134229+jromnoa@users.noreply.github.com> Date: Fri, 5 Nov 2021 17:05:22 -0700 Subject: [PATCH 056/345] add new component property paths to mesh, material, camera, hdri_skybox, and global_skylight components Signed-off-by: jromnoa <80134229+jromnoa@users.noreply.github.com> --- .../Gem/PythonTests/Atom/atom_utils/atom_constants.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/AutomatedTesting/Gem/PythonTests/Atom/atom_utils/atom_constants.py b/AutomatedTesting/Gem/PythonTests/Atom/atom_utils/atom_constants.py index 344a0dbd29..0620f3e63d 100644 --- a/AutomatedTesting/Gem/PythonTests/Atom/atom_utils/atom_constants.py +++ b/AutomatedTesting/Gem/PythonTests/Atom/atom_utils/atom_constants.py @@ -60,6 +60,7 @@ class AtomComponentProperties: """ properties = { 'name': 'Camera', + 'Field of view': 'Controller|Configuration|Field of view' } return properties[property] @@ -203,6 +204,7 @@ class AtomComponentProperties: """ properties = { 'name': 'Grid', + 'Secondary Grid Spacing': 'Controller|Configuration|Secondary Grid Spacing', } return properties[property] @@ -230,6 +232,7 @@ class AtomComponentProperties: """ properties = { 'name': 'HDRi Skybox', + 'Cubemap Texture': 'Controller|Configuration|Cubemap Texture', } return properties[property] @@ -274,6 +277,7 @@ class AtomComponentProperties: properties = { 'name': 'Material', 'requires': [AtomComponentProperties.actor(), AtomComponentProperties.mesh()], + 'Material Asset': 'Default Material|Material Asset', } return properties[property] From de67bb70c9653379fb2b4efb1daafb74b6929cbc Mon Sep 17 00:00:00 2001 From: nggieber Date: Tue, 16 Nov 2021 16:01:25 -0800 Subject: [PATCH 057/345] Added comment why GemRepos isn't included in ContainsScreen Signed-off-by: nggieber --- Code/Tools/ProjectManager/Source/UpdateProjectCtrl.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/Code/Tools/ProjectManager/Source/UpdateProjectCtrl.cpp b/Code/Tools/ProjectManager/Source/UpdateProjectCtrl.cpp index 4c2e9764dc..5f0d0c3f72 100644 --- a/Code/Tools/ProjectManager/Source/UpdateProjectCtrl.cpp +++ b/Code/Tools/ProjectManager/Source/UpdateProjectCtrl.cpp @@ -99,6 +99,7 @@ namespace O3DE::ProjectManager bool UpdateProjectCtrl::ContainsScreen(ProjectManagerScreen screen) { + // Do not include GemRepos because we don't want to advertise jumping to it from all other screens here return screen == GetScreenEnum() || screen == ProjectManagerScreen::GemCatalog; } From 53275fcb703211aa736ea96e76645aa6a8bbe2e8 Mon Sep 17 00:00:00 2001 From: jromnoa <80134229+jromnoa@users.noreply.github.com> Date: Mon, 8 Nov 2021 17:52:25 -0800 Subject: [PATCH 058/345] add new golden image that uses smaller asset file Signed-off-by: jromnoa <80134229+jromnoa@users.noreply.github.com> --- .../Gem/PythonTests/Atom/golden_images/AtomBasicLevelSetup.ppm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AutomatedTesting/Gem/PythonTests/Atom/golden_images/AtomBasicLevelSetup.ppm b/AutomatedTesting/Gem/PythonTests/Atom/golden_images/AtomBasicLevelSetup.ppm index ef41b6cf77..acfbe57900 100644 --- a/AutomatedTesting/Gem/PythonTests/Atom/golden_images/AtomBasicLevelSetup.ppm +++ b/AutomatedTesting/Gem/PythonTests/Atom/golden_images/AtomBasicLevelSetup.ppm @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:07e09d3eb5bf0cee3d9b3752aaad40f3ead1dcc5ddd837a6226fadde55d57274 +oid sha256:5d4ee5641e19eef08dd6b93d2f4054a1aae2165325416ed2cbf0b8243f2c0b06 size 6220817 From bbbcc94634969fe70dc684f1757ca6364c094104 Mon Sep 17 00:00:00 2001 From: jromnoa <80134229+jromnoa@users.noreply.github.com> Date: Tue, 9 Nov 2021 14:59:43 -0800 Subject: [PATCH 059/345] saving progress on test fixes to swap branches Signed-off-by: jromnoa <80134229+jromnoa@users.noreply.github.com> --- .../Gem/PythonTests/Atom/TestSuite_Main_GPU_Optimized.py | 2 +- .../PythonTests/Atom/atom_utils/atom_component_helper.py | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/AutomatedTesting/Gem/PythonTests/Atom/TestSuite_Main_GPU_Optimized.py b/AutomatedTesting/Gem/PythonTests/Atom/TestSuite_Main_GPU_Optimized.py index 39fca5c7e4..568768e12e 100644 --- a/AutomatedTesting/Gem/PythonTests/Atom/TestSuite_Main_GPU_Optimized.py +++ b/AutomatedTesting/Gem/PythonTests/Atom/TestSuite_Main_GPU_Optimized.py @@ -16,7 +16,7 @@ from .atom_utils.atom_component_helper import create_screenshots_archive, golden DEFAULT_SUBFOLDER_PATH = 'user/PythonTests/Automated/Screenshots' -# @pytest.mark.xfail(reason="Optimized tests are experimental, we will enable xfail and monitor them temporarily.") +@pytest.mark.xfail(reason="Optimized tests are experimental, we will enable xfail and monitor them temporarily.") @pytest.mark.parametrize("project", ["AutomatedTesting"]) @pytest.mark.parametrize("launcher_platform", ['windows_editor']) class TestAutomation(EditorTestSuite): diff --git a/AutomatedTesting/Gem/PythonTests/Atom/atom_utils/atom_component_helper.py b/AutomatedTesting/Gem/PythonTests/Atom/atom_utils/atom_component_helper.py index 11832f8846..7dadeaf8a2 100644 --- a/AutomatedTesting/Gem/PythonTests/Atom/atom_utils/atom_component_helper.py +++ b/AutomatedTesting/Gem/PythonTests/Atom/atom_utils/atom_component_helper.py @@ -150,10 +150,9 @@ def create_basic_atom_level(level_name): entity_position=default_position, components=["HDRi Skybox", "Global Skylight (IBL)"], parent_id=default_level.id) - global_skylight_asset_path = os.path.join( - "LightingPresets", "greenwich_park_02_4k_iblskyboxcm_iblspecular.exr.streamingimage") - global_skylight_asset_value = asset.AssetCatalogRequestBus( - bus.Broadcast, "GetAssetIdByPath", global_skylight_asset_path, math.Uuid(), False) + global_skylight_cubemap_asset_path = os.path.join("LightingPresets", "default_iblskyboxcm.exr.streamingimage") + global_skylight_cubemap_asset_value = asset.AssetCatalogRequestBus( + bus.Broadcast, "GetAssetIdByPath", global_skylight_cubemap_asset_path, math.Uuid(), False) global_skylight.get_set_test(0, "Controller|Configuration|Cubemap Texture", global_skylight_asset_value) global_skylight.get_set_test(1, "Controller|Configuration|Diffuse Image", global_skylight_asset_value) global_skylight.get_set_test(1, "Controller|Configuration|Specular Image", global_skylight_asset_value) From 3b0e3a5d52f8b8dc18f50282b65249de3aa48baa Mon Sep 17 00:00:00 2001 From: jromnoa <80134229+jromnoa@users.noreply.github.com> Date: Thu, 11 Nov 2021 11:36:42 -0800 Subject: [PATCH 060/345] update golden images for spot light and area light tests, update asset used Signed-off-by: jromnoa <80134229+jromnoa@users.noreply.github.com> --- .../PythonTests/Atom/atom_utils/atom_component_helper.py | 6 +++--- .../Gem/PythonTests/Atom/golden_images/AreaLight_1.ppm | 2 +- .../Gem/PythonTests/Atom/golden_images/AreaLight_2.ppm | 2 +- .../Gem/PythonTests/Atom/golden_images/AreaLight_3.ppm | 2 +- .../Gem/PythonTests/Atom/golden_images/AreaLight_4.ppm | 2 +- .../Gem/PythonTests/Atom/golden_images/AreaLight_5.ppm | 2 +- .../Gem/PythonTests/Atom/golden_images/SpotLight_1.ppm | 2 +- .../Gem/PythonTests/Atom/golden_images/SpotLight_2.ppm | 2 +- .../Gem/PythonTests/Atom/golden_images/SpotLight_3.ppm | 2 +- .../Gem/PythonTests/Atom/golden_images/SpotLight_4.ppm | 2 +- .../Gem/PythonTests/Atom/golden_images/SpotLight_5.ppm | 2 +- .../Gem/PythonTests/Atom/golden_images/SpotLight_6.ppm | 2 +- 12 files changed, 14 insertions(+), 14 deletions(-) diff --git a/AutomatedTesting/Gem/PythonTests/Atom/atom_utils/atom_component_helper.py b/AutomatedTesting/Gem/PythonTests/Atom/atom_utils/atom_component_helper.py index 7dadeaf8a2..a0db95c203 100644 --- a/AutomatedTesting/Gem/PythonTests/Atom/atom_utils/atom_component_helper.py +++ b/AutomatedTesting/Gem/PythonTests/Atom/atom_utils/atom_component_helper.py @@ -150,9 +150,9 @@ def create_basic_atom_level(level_name): entity_position=default_position, components=["HDRi Skybox", "Global Skylight (IBL)"], parent_id=default_level.id) - global_skylight_cubemap_asset_path = os.path.join("LightingPresets", "default_iblskyboxcm.exr.streamingimage") - global_skylight_cubemap_asset_value = asset.AssetCatalogRequestBus( - bus.Broadcast, "GetAssetIdByPath", global_skylight_cubemap_asset_path, math.Uuid(), False) + global_skylight_asset_path = os.path.join("LightingPresets", "default_iblskyboxcm.exr.streamingimage") + global_skylight_asset_value = asset.AssetCatalogRequestBus( + bus.Broadcast, "GetAssetIdByPath", global_skylight_asset_path, math.Uuid(), False) global_skylight.get_set_test(0, "Controller|Configuration|Cubemap Texture", global_skylight_asset_value) global_skylight.get_set_test(1, "Controller|Configuration|Diffuse Image", global_skylight_asset_value) global_skylight.get_set_test(1, "Controller|Configuration|Specular Image", global_skylight_asset_value) diff --git a/AutomatedTesting/Gem/PythonTests/Atom/golden_images/AreaLight_1.ppm b/AutomatedTesting/Gem/PythonTests/Atom/golden_images/AreaLight_1.ppm index 0725999dcf..8695f6bb93 100644 --- a/AutomatedTesting/Gem/PythonTests/Atom/golden_images/AreaLight_1.ppm +++ b/AutomatedTesting/Gem/PythonTests/Atom/golden_images/AreaLight_1.ppm @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:954d7d0df47c840a24e313893800eb3126d0c0d47c3380926776b51833778db7 +oid sha256:aee1fd4d5264e5ef1676b507409ce70af6358cf1ff368d9aeb17f7b2597dfbca size 6220817 diff --git a/AutomatedTesting/Gem/PythonTests/Atom/golden_images/AreaLight_2.ppm b/AutomatedTesting/Gem/PythonTests/Atom/golden_images/AreaLight_2.ppm index 3a45bd31e3..d45d3f1581 100644 --- a/AutomatedTesting/Gem/PythonTests/Atom/golden_images/AreaLight_2.ppm +++ b/AutomatedTesting/Gem/PythonTests/Atom/golden_images/AreaLight_2.ppm @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e81c19128f42ba362a2d5f3ccf159dfbc942d67ceeb1ac8c21f295a6fd9d2ce5 +oid sha256:d4787cdafbcc2fe71c1cb3f1da53a249db839a9df539a9e88be43ccd6d8e4d6a size 6220817 diff --git a/AutomatedTesting/Gem/PythonTests/Atom/golden_images/AreaLight_3.ppm b/AutomatedTesting/Gem/PythonTests/Atom/golden_images/AreaLight_3.ppm index 15d679b784..0661ead69f 100644 --- a/AutomatedTesting/Gem/PythonTests/Atom/golden_images/AreaLight_3.ppm +++ b/AutomatedTesting/Gem/PythonTests/Atom/golden_images/AreaLight_3.ppm @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5e20801213e065b6ea8c95ede81c23faa9b6dc70a2002dc5bced293e1bed989f +oid sha256:5fac5bf41c9b16b6fbd762868e5cf514376af92d6ef7ebb9e819f024f1a3e1a7 size 6220817 diff --git a/AutomatedTesting/Gem/PythonTests/Atom/golden_images/AreaLight_4.ppm b/AutomatedTesting/Gem/PythonTests/Atom/golden_images/AreaLight_4.ppm index 85c083a386..a7fc77f0ec 100644 --- a/AutomatedTesting/Gem/PythonTests/Atom/golden_images/AreaLight_4.ppm +++ b/AutomatedTesting/Gem/PythonTests/Atom/golden_images/AreaLight_4.ppm @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e250f812e594e5152bf2d6f23caa8b53b78276bfdf344d7a8d355dd96cb995c0 +oid sha256:7a23969670499524725535e8be7428b55b6f3e887cc24e2e903f7ea821a6d1a5 size 6220817 diff --git a/AutomatedTesting/Gem/PythonTests/Atom/golden_images/AreaLight_5.ppm b/AutomatedTesting/Gem/PythonTests/Atom/golden_images/AreaLight_5.ppm index d575de761e..7404ab3ccc 100644 --- a/AutomatedTesting/Gem/PythonTests/Atom/golden_images/AreaLight_5.ppm +++ b/AutomatedTesting/Gem/PythonTests/Atom/golden_images/AreaLight_5.ppm @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:95be359041f8291c74b335297a4dfe9902a180510f24a181b15e1a5ba4d3b024 +oid sha256:2f1f4d8865c56ed7f96f339c39e5feb4e0dbc6c6a8b4a7843b4166381b06b00d size 6220817 diff --git a/AutomatedTesting/Gem/PythonTests/Atom/golden_images/SpotLight_1.ppm b/AutomatedTesting/Gem/PythonTests/Atom/golden_images/SpotLight_1.ppm index bbbd127929..3104088689 100644 --- a/AutomatedTesting/Gem/PythonTests/Atom/golden_images/SpotLight_1.ppm +++ b/AutomatedTesting/Gem/PythonTests/Atom/golden_images/SpotLight_1.ppm @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:118e43e4b915e262726183467cc4b82f244565213fea5b6bfe02be07f0851ab1 +oid sha256:55c8f0d1790bb12660b7557630efca297b2a1b59e6c93167a2563da79e0a8255 size 6220817 diff --git a/AutomatedTesting/Gem/PythonTests/Atom/golden_images/SpotLight_2.ppm b/AutomatedTesting/Gem/PythonTests/Atom/golden_images/SpotLight_2.ppm index 8e716fabcc..287ec406e1 100644 --- a/AutomatedTesting/Gem/PythonTests/Atom/golden_images/SpotLight_2.ppm +++ b/AutomatedTesting/Gem/PythonTests/Atom/golden_images/SpotLight_2.ppm @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:dc2ce3256a6552975962c9e113c52c1a22bf3817d417151f6f60640dd568e0fa +oid sha256:082ff368b621e12b083d96562a0889b11a1d683767a74296cbe6d8732830e9e8 size 6220817 diff --git a/AutomatedTesting/Gem/PythonTests/Atom/golden_images/SpotLight_3.ppm b/AutomatedTesting/Gem/PythonTests/Atom/golden_images/SpotLight_3.ppm index 6b6a5a5d6e..9de8785f65 100644 --- a/AutomatedTesting/Gem/PythonTests/Atom/golden_images/SpotLight_3.ppm +++ b/AutomatedTesting/Gem/PythonTests/Atom/golden_images/SpotLight_3.ppm @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:287d98890b35427688999760f9d066bcbff1a3bc9001534241dc212b32edabd8 +oid sha256:78cc62d89782899747875b41abee57c2efdfacf4c8af6511c88f82d76eaae4ca size 6220817 diff --git a/AutomatedTesting/Gem/PythonTests/Atom/golden_images/SpotLight_4.ppm b/AutomatedTesting/Gem/PythonTests/Atom/golden_images/SpotLight_4.ppm index eb05228cc2..93acc14dbc 100644 --- a/AutomatedTesting/Gem/PythonTests/Atom/golden_images/SpotLight_4.ppm +++ b/AutomatedTesting/Gem/PythonTests/Atom/golden_images/SpotLight_4.ppm @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:66e91c92c868167c850078cd91714db47e10a96e23cc30191994486bd79c353f +oid sha256:3d6719326f4dacae278d1723090ce1182193b793f250963af8be4b2c298e8841 size 6220817 diff --git a/AutomatedTesting/Gem/PythonTests/Atom/golden_images/SpotLight_5.ppm b/AutomatedTesting/Gem/PythonTests/Atom/golden_images/SpotLight_5.ppm index 5e12edc46d..9cd58caae5 100644 --- a/AutomatedTesting/Gem/PythonTests/Atom/golden_images/SpotLight_5.ppm +++ b/AutomatedTesting/Gem/PythonTests/Atom/golden_images/SpotLight_5.ppm @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d950d173f5101820c5e18205401ca08ce5feeff2302ac2920b292750d86a8fa4 +oid sha256:9e492bb394fb18fb117f8a5b61cd2789922f9d6e88fc83189b5b6d59ffb1c3ef size 6220817 diff --git a/AutomatedTesting/Gem/PythonTests/Atom/golden_images/SpotLight_6.ppm b/AutomatedTesting/Gem/PythonTests/Atom/golden_images/SpotLight_6.ppm index d442d90287..136eecbaaf 100644 --- a/AutomatedTesting/Gem/PythonTests/Atom/golden_images/SpotLight_6.ppm +++ b/AutomatedTesting/Gem/PythonTests/Atom/golden_images/SpotLight_6.ppm @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:72eddb7126eae0c839b933886e0fb69d78229f72d49ef13199de28df2b7879db +oid sha256:caca85f7728f660daae36afc81d681ba2de2377c516eb3c637599de5c94012aa size 6220817 From e27e6cc5ef602ec7bb42ff825373049e1f5f3b4e Mon Sep 17 00:00:00 2001 From: jromnoa <80134229+jromnoa@users.noreply.github.com> Date: Thu, 11 Nov 2021 11:55:04 -0800 Subject: [PATCH 061/345] update asset called in global skylight test as well Signed-off-by: jromnoa <80134229+jromnoa@users.noreply.github.com> --- .../hydra_AtomEditorComponents_GlobalSkylightIBLAdded.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/AutomatedTesting/Gem/PythonTests/Atom/tests/hydra_AtomEditorComponents_GlobalSkylightIBLAdded.py b/AutomatedTesting/Gem/PythonTests/Atom/tests/hydra_AtomEditorComponents_GlobalSkylightIBLAdded.py index cc891f5929..64bbfb1c4d 100644 --- a/AutomatedTesting/Gem/PythonTests/Atom/tests/hydra_AtomEditorComponents_GlobalSkylightIBLAdded.py +++ b/AutomatedTesting/Gem/PythonTests/Atom/tests/hydra_AtomEditorComponents_GlobalSkylightIBLAdded.py @@ -123,8 +123,7 @@ def AtomEditorComponents_GlobalSkylightIBL_AddedToEntity(): Report.result(Tests.is_visible, global_skylight_entity.is_visible() is True) # 8. Set the Diffuse Image asset on the Global Skylight (IBL) entity. - global_skylight_diffuse_image_property = "Controller|Configuration|Diffuse Image" - diffuse_image_path = os.path.join("LightingPresets", "greenwich_park_02_4k_iblskyboxcm.exr.streamingimage") + diffuse_image_path = os.path.join("LightingPresets", "default_iblskyboxcm.exr.streamingimage") diffuse_image_asset = Asset.find_asset_by_path(diffuse_image_path, False) global_skylight_component.set_component_property_value( global_skylight_diffuse_image_property, diffuse_image_asset.id) @@ -133,8 +132,7 @@ def AtomEditorComponents_GlobalSkylightIBL_AddedToEntity(): Report.result(Tests.diffuse_image_set, diffuse_image_set == diffuse_image_asset.id) # 9. Set the Specular Image asset on the Global Light (IBL) entity. - global_skylight_specular_image_property = "Controller|Configuration|Specular Image" - specular_image_path = os.path.join("LightingPresets", "greenwich_park_02_4k_iblskyboxcm.exr.streamingimage") + specular_image_path = os.path.join("LightingPresets", "default_iblskyboxcm.exr.streamingimage") specular_image_asset = Asset.find_asset_by_path(specular_image_path, False) global_skylight_component.set_component_property_value( global_skylight_specular_image_property, specular_image_asset.id) From 222581318dc10262ed2ae0fb43c18830ec6f1e6f Mon Sep 17 00:00:00 2001 From: jromnoa <80134229+jromnoa@users.noreply.github.com> Date: Thu, 11 Nov 2021 13:23:38 -0800 Subject: [PATCH 062/345] add some docstring descriptions for Cubemap Texture, Material Asset, Secondary Grid Spacing, & Field of View component properties Signed-off-by: jromnoa <80134229+jromnoa@users.noreply.github.com> --- .../Gem/PythonTests/Atom/atom_utils/atom_constants.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/AutomatedTesting/Gem/PythonTests/Atom/atom_utils/atom_constants.py b/AutomatedTesting/Gem/PythonTests/Atom/atom_utils/atom_constants.py index 0620f3e63d..1cc5b28b26 100644 --- a/AutomatedTesting/Gem/PythonTests/Atom/atom_utils/atom_constants.py +++ b/AutomatedTesting/Gem/PythonTests/Atom/atom_utils/atom_constants.py @@ -56,6 +56,7 @@ class AtomComponentProperties: """ Camera component properties. :param property: From the last element of the property tree path. Default 'name' for component name string. + - 'Field of view': Sets the value for the camera's FOV (Field of View), i.e. 60.0 :return: Full property path OR component name if no property specified. """ properties = { @@ -200,6 +201,7 @@ class AtomComponentProperties: """ Grid component properties. :param property: From the last element of the property tree path. Default 'name' for component name string. + - 'Secondary Grid Spacing': The spacing value for the secondary grid, i.e. 1.0 :return: Full property path OR component name if no property specified. """ properties = { @@ -228,6 +230,7 @@ class AtomComponentProperties: """ HDRi Skybox component properties. :param property: From the last element of the property tree path. Default 'name' for component name string. + - 'Cubemap Texture': Path to the asset file to use for the cubemap texture asset. :return: Full property path OR component name if no property specified. """ properties = { @@ -271,6 +274,7 @@ class AtomComponentProperties: Material component properties. Requires one of Actor OR Mesh component. - 'requires' a list of component names as strings required by this component. Only one of these is required at a time for this component.\n + - 'Material Asset': Path to the material asset file to use as the material asset. :param property: From the last element of the property tree path. Default 'name' for component name string. :return: Full property path OR component name if no property specified. """ From d07cbb7af656a5b5a0d012d7b1e0800615817cc9 Mon Sep 17 00:00:00 2001 From: jromnoa <80134229+jromnoa@users.noreply.github.com> Date: Thu, 11 Nov 2021 13:57:11 -0800 Subject: [PATCH 063/345] add AtomComponentProperties.grid('Secondary Grid Spacing') direct call, remove fmt:on comment Signed-off-by: jromnoa <80134229+jromnoa@users.noreply.github.com> --- .../Atom/tests/hydra_AtomGPU_BasicLevelSetup.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/AutomatedTesting/Gem/PythonTests/Atom/tests/hydra_AtomGPU_BasicLevelSetup.py b/AutomatedTesting/Gem/PythonTests/Atom/tests/hydra_AtomGPU_BasicLevelSetup.py index 69fa9456f8..127b3e5b5f 100644 --- a/AutomatedTesting/Gem/PythonTests/Atom/tests/hydra_AtomGPU_BasicLevelSetup.py +++ b/AutomatedTesting/Gem/PythonTests/Atom/tests/hydra_AtomGPU_BasicLevelSetup.py @@ -70,7 +70,6 @@ class Tests: viewport_set = ( "Viewport set to correct size", "Viewport not set to correct size") -# fmt: on def AtomGPU_BasicLevelSetup_SetsUpLevel(): @@ -166,11 +165,11 @@ def AtomGPU_BasicLevelSetup_SetsUpLevel(): # 4. Add Grid component to Grid Entity and set Secondary Grid Spacing. grid_component = grid_entity.add_component(AtomComponentProperties.grid()) - secondary_grid_spacing_property = AtomComponentProperties.grid('Secondary Grid Spacing') secondary_grid_spacing_value = 1.0 - grid_component.set_component_property_value(secondary_grid_spacing_property, secondary_grid_spacing_value) + grid_component.set_component_property_value( + AtomComponentProperties.grid('Secondary Grid Spacing'), secondary_grid_spacing_value) secondary_grid_spacing_set = grid_component.get_component_property_value( - secondary_grid_spacing_property) == secondary_grid_spacing_value + AtomComponentProperties.grid('Secondary Grid Spacing')) == secondary_grid_spacing_value Report.result(Tests.secondary_grid_spacing, secondary_grid_spacing_set) # 5. Create Global Skylight (IBL) Entity as a child entity of the Default Level Entity. From b36ad7aaff624560de46bb6bf974e6f5e46a0747 Mon Sep 17 00:00:00 2001 From: jromnoa <80134229+jromnoa@users.noreply.github.com> Date: Thu, 11 Nov 2021 14:06:59 -0800 Subject: [PATCH 064/345] move component descriptions above the property param in the docstrings Signed-off-by: jromnoa <80134229+jromnoa@users.noreply.github.com> --- .../Gem/PythonTests/Atom/atom_utils/atom_constants.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/AutomatedTesting/Gem/PythonTests/Atom/atom_utils/atom_constants.py b/AutomatedTesting/Gem/PythonTests/Atom/atom_utils/atom_constants.py index 1cc5b28b26..5ee85b9fd3 100644 --- a/AutomatedTesting/Gem/PythonTests/Atom/atom_utils/atom_constants.py +++ b/AutomatedTesting/Gem/PythonTests/Atom/atom_utils/atom_constants.py @@ -55,8 +55,8 @@ class AtomComponentProperties: def camera(property: str = 'name') -> str: """ Camera component properties. - :param property: From the last element of the property tree path. Default 'name' for component name string. - 'Field of view': Sets the value for the camera's FOV (Field of View), i.e. 60.0 + :param property: From the last element of the property tree path. Default 'name' for component name string. :return: Full property path OR component name if no property specified. """ properties = { @@ -200,8 +200,8 @@ class AtomComponentProperties: def grid(property: str = 'name') -> str: """ Grid component properties. - :param property: From the last element of the property tree path. Default 'name' for component name string. - 'Secondary Grid Spacing': The spacing value for the secondary grid, i.e. 1.0 + :param property: From the last element of the property tree path. Default 'name' for component name string. :return: Full property path OR component name if no property specified. """ properties = { @@ -229,8 +229,8 @@ class AtomComponentProperties: def hdri_skybox(property: str = 'name') -> str: """ HDRi Skybox component properties. - :param property: From the last element of the property tree path. Default 'name' for component name string. - 'Cubemap Texture': Path to the asset file to use for the cubemap texture asset. + :param property: From the last element of the property tree path. Default 'name' for component name string. :return: Full property path OR component name if no property specified. """ properties = { From a38c59372c2fb53f07fe4c10be807d214824bd2d Mon Sep 17 00:00:00 2001 From: jromnoa <80134229+jromnoa@users.noreply.github.com> Date: Thu, 11 Nov 2021 14:13:08 -0800 Subject: [PATCH 065/345] improve docstring descriptions for FOV degrees and Asset.id not asset paths for diff asset properties Signed-off-by: jromnoa <80134229+jromnoa@users.noreply.github.com> --- .../Gem/PythonTests/Atom/atom_utils/atom_constants.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/AutomatedTesting/Gem/PythonTests/Atom/atom_utils/atom_constants.py b/AutomatedTesting/Gem/PythonTests/Atom/atom_utils/atom_constants.py index 5ee85b9fd3..4884dbff56 100644 --- a/AutomatedTesting/Gem/PythonTests/Atom/atom_utils/atom_constants.py +++ b/AutomatedTesting/Gem/PythonTests/Atom/atom_utils/atom_constants.py @@ -55,7 +55,7 @@ class AtomComponentProperties: def camera(property: str = 'name') -> str: """ Camera component properties. - - 'Field of view': Sets the value for the camera's FOV (Field of View), i.e. 60.0 + - 'Field of view': Sets the value for the camera's FOV (Field of View) in degrees, i.e. 60.0 :param property: From the last element of the property tree path. Default 'name' for component name string. :return: Full property path OR component name if no property specified. """ @@ -229,7 +229,7 @@ class AtomComponentProperties: def hdri_skybox(property: str = 'name') -> str: """ HDRi Skybox component properties. - - 'Cubemap Texture': Path to the asset file to use for the cubemap texture asset. + - 'Cubemap Texture': Asset.id for the cubemap texture to set. :param property: From the last element of the property tree path. Default 'name' for component name string. :return: Full property path OR component name if no property specified. """ @@ -274,7 +274,7 @@ class AtomComponentProperties: Material component properties. Requires one of Actor OR Mesh component. - 'requires' a list of component names as strings required by this component. Only one of these is required at a time for this component.\n - - 'Material Asset': Path to the material asset file to use as the material asset. + - 'Material Asset': the material Asset.id of the material. :param property: From the last element of the property tree path. Default 'name' for component name string. :return: Full property path OR component name if no property specified. """ From c2308de8ee5f72c1b1601668ca08e5791bb4bc87 Mon Sep 17 00:00:00 2001 From: nggieber Date: Tue, 16 Nov 2021 16:29:12 -0800 Subject: [PATCH 066/345] Added in missed suggestions from previous PR Signed-off-by: nggieber --- .../ProjectManager/Source/GemCatalog/GemCatalogScreen.cpp | 4 ++-- Code/Tools/ProjectManager/Source/GemRepo/GemRepoModel.cpp | 2 +- Code/Tools/ProjectManager/Source/PythonBindings.cpp | 4 ++-- Code/Tools/ProjectManager/Source/PythonBindings.h | 4 ++-- Code/Tools/ProjectManager/Source/PythonBindingsInterface.h | 6 +++--- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Code/Tools/ProjectManager/Source/GemCatalog/GemCatalogScreen.cpp b/Code/Tools/ProjectManager/Source/GemCatalog/GemCatalogScreen.cpp index be317f1ecd..bc0e6c240d 100644 --- a/Code/Tools/ProjectManager/Source/GemCatalog/GemCatalogScreen.cpp +++ b/Code/Tools/ProjectManager/Source/GemCatalog/GemCatalogScreen.cpp @@ -188,7 +188,7 @@ namespace O3DE::ProjectManager } // add all the gem repos into the hash - const AZ::Outcome, AZStd::string>& allRepoGemInfosResult = PythonBindingsInterface::Get()->GetAllGemReposGemInfos(); + const AZ::Outcome, AZStd::string>& allRepoGemInfosResult = PythonBindingsInterface::Get()->GetGemInfosForAllRepos(); if (allRepoGemInfosResult.IsSuccess()) { const QVector& allRepoGemInfos = allRepoGemInfosResult.GetValue(); @@ -440,7 +440,7 @@ namespace O3DE::ProjectManager m_gemModel->AddGem(gemInfo); } - const AZ::Outcome, AZStd::string>& allRepoGemInfosResult = PythonBindingsInterface::Get()->GetAllGemReposGemInfos(); + const AZ::Outcome, AZStd::string>& allRepoGemInfosResult = PythonBindingsInterface::Get()->GetGemInfosForAllRepos(); if (allRepoGemInfosResult.IsSuccess()) { const QVector& allRepoGemInfos = allRepoGemInfosResult.GetValue(); diff --git a/Code/Tools/ProjectManager/Source/GemRepo/GemRepoModel.cpp b/Code/Tools/ProjectManager/Source/GemRepo/GemRepoModel.cpp index 18fb0cc235..436f84019a 100644 --- a/Code/Tools/ProjectManager/Source/GemRepo/GemRepoModel.cpp +++ b/Code/Tools/ProjectManager/Source/GemRepo/GemRepoModel.cpp @@ -120,7 +120,7 @@ namespace O3DE::ProjectManager { QString repoUri = GetRepoUri(modelIndex); - const AZ::Outcome, AZStd::string>& gemInfosResult = PythonBindingsInterface::Get()->GetGemRepoGemInfos(repoUri); + const AZ::Outcome, AZStd::string>& gemInfosResult = PythonBindingsInterface::Get()->GetGemInfosForRepo(repoUri); if (gemInfosResult.IsSuccess()) { return gemInfosResult.GetValue(); diff --git a/Code/Tools/ProjectManager/Source/PythonBindings.cpp b/Code/Tools/ProjectManager/Source/PythonBindings.cpp index 70473c86d4..f12182691c 100644 --- a/Code/Tools/ProjectManager/Source/PythonBindings.cpp +++ b/Code/Tools/ProjectManager/Source/PythonBindings.cpp @@ -1188,7 +1188,7 @@ namespace O3DE::ProjectManager return AZ::Success(AZStd::move(gemRepos)); } - AZ::Outcome, AZStd::string> PythonBindings::GetGemRepoGemInfos(const QString& repoUri) + AZ::Outcome, AZStd::string> PythonBindings::GetGemInfosForRepo(const QString& repoUri) { QVector gemInfos; AZ::Outcome result = ExecuteWithLockErrorHandling( @@ -1216,7 +1216,7 @@ namespace O3DE::ProjectManager return AZ::Success(AZStd::move(gemInfos)); } - AZ::Outcome, AZStd::string> PythonBindings::GetAllGemReposGemInfos() + AZ::Outcome, AZStd::string> PythonBindings::GetGemInfosForAllRepos() { QVector gemInfos; AZ::Outcome result = ExecuteWithLockErrorHandling( diff --git a/Code/Tools/ProjectManager/Source/PythonBindings.h b/Code/Tools/ProjectManager/Source/PythonBindings.h index a021cfdacc..02ce670085 100644 --- a/Code/Tools/ProjectManager/Source/PythonBindings.h +++ b/Code/Tools/ProjectManager/Source/PythonBindings.h @@ -65,8 +65,8 @@ namespace O3DE::ProjectManager bool AddGemRepo(const QString& repoUri) override; bool RemoveGemRepo(const QString& repoUri) override; AZ::Outcome, AZStd::string> GetAllGemRepoInfos() override; - AZ::Outcome, AZStd::string> GetGemRepoGemInfos(const QString& repoUri) override; - AZ::Outcome, AZStd::string> GetAllGemReposGemInfos() override; + AZ::Outcome, AZStd::string> GetGemInfosForRepo(const QString& repoUri) override; + AZ::Outcome, AZStd::string> GetGemInfosForAllRepos() override; AZ::Outcome DownloadGem(const QString& gemName, std::function gemProgressCallback, bool force = false) override; void CancelDownload() override; bool IsGemUpdateAvaliable(const QString& gemName, const QString& lastUpdated) override; diff --git a/Code/Tools/ProjectManager/Source/PythonBindingsInterface.h b/Code/Tools/ProjectManager/Source/PythonBindingsInterface.h index 2024f61ea0..82ca92577c 100644 --- a/Code/Tools/ProjectManager/Source/PythonBindingsInterface.h +++ b/Code/Tools/ProjectManager/Source/PythonBindingsInterface.h @@ -218,17 +218,17 @@ namespace O3DE::ProjectManager virtual AZ::Outcome, AZStd::string> GetAllGemRepoInfos() = 0; /** - * Gathers all gem infos for repos + * Gathers all gem infos from the provided repo * @param repoUri the absolute filesystem path or url to the gem repo. * @return A list of gem infos. */ - virtual AZ::Outcome, AZStd::string> GetGemRepoGemInfos(const QString& repoUri) = 0; + virtual AZ::Outcome, AZStd::string> GetGemInfosForRepo(const QString& repoUri) = 0; /** * Gathers all gem infos for all gems registered from repos. * @return A list of gem infos. */ - virtual AZ::Outcome, AZStd::string> GetAllGemReposGemInfos() = 0; + virtual AZ::Outcome, AZStd::string> GetGemInfosForAllRepos() = 0; /** * Downloads and registers a Gem. From 92510df37386a952a490f72d304dc8d0087a94e4 Mon Sep 17 00:00:00 2001 From: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com> Date: Tue, 16 Nov 2021 16:34:43 -0800 Subject: [PATCH 067/345] Fix missing clip to world matrix data (#5677) Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com> --- Gems/Atom/RPI/Code/Include/Atom/RPI.Public/View.h | 2 ++ Gems/Atom/RPI/Code/Source/RPI.Public/View.cpp | 8 ++++++++ 2 files changed, 10 insertions(+) diff --git a/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/View.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/View.h index cdaf59ff75..e5614161b2 100644 --- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/View.h +++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/View.h @@ -92,6 +92,8 @@ namespace AZ const AZ::Matrix4x4& GetViewToWorldMatrix() const; const AZ::Matrix4x4& GetViewToClipMatrix() const; const AZ::Matrix4x4& GetWorldToClipMatrix() const; + const AZ::Matrix4x4& GetClipToWorldMatrix() const; + //! Get the camera's world transform, converted from the viewToWorld matrix's native y-up to z-up AZ::Transform GetCameraTransform() const; diff --git a/Gems/Atom/RPI/Code/Source/RPI.Public/View.cpp b/Gems/Atom/RPI/Code/Source/RPI.Public/View.cpp index 8c1e38ba58..4538cf83e4 100644 --- a/Gems/Atom/RPI/Code/Source/RPI.Public/View.cpp +++ b/Gems/Atom/RPI/Code/Source/RPI.Public/View.cpp @@ -125,6 +125,7 @@ namespace AZ m_worldToViewMatrix = worldToView; m_worldToClipMatrix = m_viewToClipMatrix * m_worldToViewMatrix; + m_clipToWorldMatrix = m_worldToClipMatrix.GetInverseFull(); m_onWorldToViewMatrixChange.Signal(m_worldToViewMatrix); m_onWorldToClipMatrixChange.Signal(m_worldToClipMatrix); @@ -162,6 +163,7 @@ namespace AZ m_worldToViewMatrix = m_viewToWorldMatrix.GetInverseFast(); m_worldToClipMatrix = m_viewToClipMatrix * m_worldToViewMatrix; + m_clipToWorldMatrix = m_worldToClipMatrix.GetInverseFull(); // Only signal an update when there is a change, otherwise this might block // user input from changing the value. @@ -177,6 +179,7 @@ namespace AZ m_viewToClipMatrix = viewToClip; m_worldToClipMatrix = m_viewToClipMatrix * m_worldToViewMatrix; + m_clipToWorldMatrix = m_worldToClipMatrix.GetInverseFull(); // Update z depth constant simultaneously // zNear -> n, zFar -> f @@ -227,6 +230,11 @@ namespace AZ return m_worldToClipMatrix; } + const AZ::Matrix4x4& View::GetClipToWorldMatrix() const + { + return m_clipToWorldMatrix; + } + bool View::HasDrawListTag(RHI::DrawListTag drawListTag) { return drawListTag.IsValid() && m_drawListMask[drawListTag.GetIndex()]; From dcd50d90c9a1af014f2f662965c6abf0844cea42 Mon Sep 17 00:00:00 2001 From: nggieber Date: Tue, 16 Nov 2021 17:08:36 -0800 Subject: [PATCH 068/345] Forward declared QVBoxLayout Signed-off-by: nggieber --- Code/Tools/ProjectManager/Source/GemCatalog/GemCatalogScreen.h | 1 + 1 file changed, 1 insertion(+) diff --git a/Code/Tools/ProjectManager/Source/GemCatalog/GemCatalogScreen.h b/Code/Tools/ProjectManager/Source/GemCatalog/GemCatalogScreen.h index dcdf6373ac..2deaa41b9e 100644 --- a/Code/Tools/ProjectManager/Source/GemCatalog/GemCatalogScreen.h +++ b/Code/Tools/ProjectManager/Source/GemCatalog/GemCatalogScreen.h @@ -17,6 +17,7 @@ #include #endif +QT_FORWARD_DECLARE_CLASS(QVBoxLayout) QT_FORWARD_DECLARE_CLASS(QStackedWidget) namespace O3DE::ProjectManager From cdb38251d86d089871fe6d290d6052e7bfb687fa Mon Sep 17 00:00:00 2001 From: santorac <55155825+santorac@users.noreply.github.com> Date: Tue, 16 Nov 2021 17:19:44 -0800 Subject: [PATCH 069/345] Fixed an issue that prevented saving child materials with explicitly empty texture properties. Signed-off-by: santorac <55155825+santorac@users.noreply.github.com> --- .../Code/Source/Util/MaterialPropertyUtil.cpp | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Util/MaterialPropertyUtil.cpp b/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Util/MaterialPropertyUtil.cpp index 91e3d5c2f0..3ffd8efa6e 100644 --- a/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Util/MaterialPropertyUtil.cpp +++ b/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Util/MaterialPropertyUtil.cpp @@ -188,20 +188,26 @@ namespace AtomToolsFramework if (propertyDefinition.m_dataType == AZ::RPI::MaterialPropertyDataType::Image) { AZStd::string imagePath; + AZ::Data::AssetId imageAssetId; if (propertyValue.Is>()) { const auto& imageAsset = propertyValue.GetValue>(); - imagePath = AZ::RPI::AssetUtils::GetSourcePathByAssetId(imageAsset.GetId()); + imageAssetId = imageAsset.GetId(); } if (propertyValue.Is>()) { const auto& image = propertyValue.GetValue>(); - imagePath = image ? AZ::RPI::AssetUtils::GetSourcePathByAssetId(image->GetAssetId()) : ""; + if (image) + { + imageAssetId = image->GetAssetId(); + } } + + imagePath = AZ::RPI::AssetUtils::GetSourcePathByAssetId(imageAssetId); - if (imagePath.empty()) + if (imageAssetId.IsValid() && imagePath.empty()) { AZ_Error("AtomToolsFramework", false, "Image asset could not be found for property: '%s'.", propertyId.GetCStr()); return false; From 551e6010ddf1f04b3d3d289ef73bacbe4477fa2a Mon Sep 17 00:00:00 2001 From: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com> Date: Tue, 16 Nov 2021 19:23:53 -0600 Subject: [PATCH 070/345] Add support for getting the level entity when prefabs are enabled. (#5680) * Add support for getting the level entity when prefabs are enabled. Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com> * Made a little prettier. Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com> * Addressed PR feedback plus fixed the crash when the level component failed to add. Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com> --- .../hydra_editor_utils.py | 4 +++ .../Application/ToolsApplication.cpp | 25 +++++++++++++------ 2 files changed, 22 insertions(+), 7 deletions(-) diff --git a/AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/editor_python_test_tools/hydra_editor_utils.py b/AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/editor_python_test_tools/hydra_editor_utils.py index 985e32ede5..19aa6e9d3c 100644 --- a/AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/editor_python_test_tools/hydra_editor_utils.py +++ b/AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/editor_python_test_tools/hydra_editor_utils.py @@ -57,6 +57,10 @@ def add_level_component(component_name): level_component_list, entity.EntityType().Level) level_component_outcome = editor.EditorLevelComponentAPIBus(bus.Broadcast, 'AddComponentsOfType', [level_component_type_ids_list[0]]) + if not level_component_outcome.IsSuccess(): + print('Failed to add {} level component'.format(component_name)) + return None + level_component = level_component_outcome.GetValue()[0] return level_component diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Application/ToolsApplication.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Application/ToolsApplication.cpp index 056872edab..d3b3b09583 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/Application/ToolsApplication.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Application/ToolsApplication.cpp @@ -1196,14 +1196,25 @@ namespace AzToolsFramework AZ::EntityId ToolsApplication::GetCurrentLevelEntityId() { - AzFramework::EntityContextId editorEntityContextId = AzFramework::EntityContextId::CreateNull(); - AzToolsFramework::EditorEntityContextRequestBus::BroadcastResult(editorEntityContextId, &AzToolsFramework::EditorEntityContextRequestBus::Events::GetEditorEntityContextId); - AZ::SliceComponent* rootSliceComponent = nullptr; - AzFramework::SliceEntityOwnershipServiceRequestBus::EventResult(rootSliceComponent, editorEntityContextId, - &AzFramework::SliceEntityOwnershipServiceRequestBus::Events::GetRootSlice); - if (rootSliceComponent && rootSliceComponent->GetMetadataEntity()) + if (IsPrefabSystemEnabled()) { - return rootSliceComponent->GetMetadataEntity()->GetId(); + if (auto prefabPublicInterface = AZ::Interface::Get()) + { + return prefabPublicInterface->GetLevelInstanceContainerEntityId(); + } + } + else + { + AzFramework::EntityContextId editorEntityContextId = AzFramework::EntityContextId::CreateNull(); + AzToolsFramework::EditorEntityContextRequestBus::BroadcastResult( + editorEntityContextId, &AzToolsFramework::EditorEntityContextRequestBus::Events::GetEditorEntityContextId); + AZ::SliceComponent* rootSliceComponent = nullptr; + AzFramework::SliceEntityOwnershipServiceRequestBus::EventResult( + rootSliceComponent, editorEntityContextId, &AzFramework::SliceEntityOwnershipServiceRequestBus::Events::GetRootSlice); + if (rootSliceComponent && rootSliceComponent->GetMetadataEntity()) + { + return rootSliceComponent->GetMetadataEntity()->GetId(); + } } return AZ::EntityId(); From 7d48e8209c94749d027d17daea91c795cad9c3c6 Mon Sep 17 00:00:00 2001 From: santorac <55155825+santorac@users.noreply.github.com> Date: Tue, 16 Nov 2021 17:28:57 -0800 Subject: [PATCH 071/345] Updated a failing unit test. Signed-off-by: santorac <55155825+santorac@users.noreply.github.com> --- Gems/Atom/RPI/Code/Tests/Material/MaterialSourceDataTests.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gems/Atom/RPI/Code/Tests/Material/MaterialSourceDataTests.cpp b/Gems/Atom/RPI/Code/Tests/Material/MaterialSourceDataTests.cpp index fa8eed35de..0ce819efa2 100644 --- a/Gems/Atom/RPI/Code/Tests/Material/MaterialSourceDataTests.cpp +++ b/Gems/Atom/RPI/Code/Tests/Material/MaterialSourceDataTests.cpp @@ -692,10 +692,10 @@ namespace UnitTest }); // Missing image reference - expectError([](MaterialSourceData& materialSourceData) + expectWarning([](MaterialSourceData& materialSourceData) { AddProperty(materialSourceData, "general", "MyImage", AZStd::string("doesNotExist.streamingimage")); - }, 3); // Expect a 3rd error because AssetUtils reports its own assertion failure + }); } From 8b82452a1bcb1781a8866ec4979f3600efb5686c Mon Sep 17 00:00:00 2001 From: santorac <55155825+santorac@users.noreply.github.com> Date: Tue, 16 Nov 2021 17:30:33 -0800 Subject: [PATCH 072/345] Updated ResolvePathReference to also early-return when the path is empty. @gadams3 said this would be helpful to him. Signed-off-by: santorac <55155825+santorac@users.noreply.github.com> --- Gems/Atom/RPI/Code/Source/RPI.Edit/Common/AssetUtils.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gems/Atom/RPI/Code/Source/RPI.Edit/Common/AssetUtils.cpp b/Gems/Atom/RPI/Code/Source/RPI.Edit/Common/AssetUtils.cpp index 73c64b8015..e2877aa163 100644 --- a/Gems/Atom/RPI/Code/Source/RPI.Edit/Common/AssetUtils.cpp +++ b/Gems/Atom/RPI/Code/Source/RPI.Edit/Common/AssetUtils.cpp @@ -47,8 +47,8 @@ namespace AZ AZStd::string ResolvePathReference(const AZStd::string& originatingSourceFilePath, const AZStd::string& referencedSourceFilePath) { - // Prevents "second join parameter is an absolute path" warnings in StringFunc::Path::Join below - if (AZ::IO::PathView{referencedSourceFilePath}.IsAbsolute()) + // The IsAbsolute part prevents "second join parameter is an absolute path" warnings in StringFunc::Path::Join below + if (referencedSourceFilePath.empty() || AZ::IO::PathView{referencedSourceFilePath}.IsAbsolute()) { return referencedSourceFilePath; } From 89f4ebb298192087a2c51813165dd54e8a9793f9 Mon Sep 17 00:00:00 2001 From: Olex Lozitskiy <5432499+AMZN-Olex@users.noreply.github.com> Date: Tue, 16 Nov 2021 20:29:15 -0500 Subject: [PATCH 073/345] Refactored away circular dependencies in Multiplayer gem. Signed-off-by: Olex Lozitskiy <5432499+AMZN-Olex@users.noreply.github.com> --- Gems/Multiplayer/Code/CMakeLists.txt | 50 +++---------------- .../Code/Source/MultiplayerGem.cpp | 28 +++++++---- ...pp => MultiplayerToolsSystemComponent.cpp} | 20 +------- ...le.h => MultiplayerToolsSystemComponent.h} | 14 ------ .../Code/multiplayer_tools_files.cmake | 4 +- 5 files changed, 27 insertions(+), 89 deletions(-) rename Gems/Multiplayer/Code/Source/{MultiplayerToolsModule.cpp => MultiplayerToolsSystemComponent.cpp} (66%) rename Gems/Multiplayer/Code/Source/{MultiplayerToolsModule.h => MultiplayerToolsSystemComponent.h} (72%) diff --git a/Gems/Multiplayer/Code/CMakeLists.txt b/Gems/Multiplayer/Code/CMakeLists.txt index 559fa23553..95eafa73cc 100644 --- a/Gems/Multiplayer/Code/CMakeLists.txt +++ b/Gems/Multiplayer/Code/CMakeLists.txt @@ -85,52 +85,12 @@ ly_create_alias(NAME Multiplayer.Clients NAMESPACE Gem TARGETS Gem::Multiplayer ly_create_alias(NAME Multiplayer.Servers NAMESPACE Gem TARGETS Gem::Multiplayer Gem::Multiplayer.Debug) if (PAL_TRAIT_BUILD_HOST_TOOLS) - ly_add_target( - NAME Multiplayer.Builders.Static STATIC - NAMESPACE Gem - FILES_CMAKE - multiplayer_tools_files.cmake - COMPILE_DEFINITIONS - PUBLIC - MULTIPLAYER_TOOLS - INCLUDE_DIRECTORIES - PRIVATE - . - Source - ${pal_source_dir} - PUBLIC - Include - BUILD_DEPENDENCIES - PUBLIC - AZ::AzToolsFramework - Gem::Multiplayer.Static - ) - - # by naming this target Multiplayer.Builders it ensures that it is loaded - # in any pipeline tools (Like Asset Processor, AssetBuilder, etc) - ly_add_target( - NAME Multiplayer.Builders GEM_MODULE - NAMESPACE Gem - FILES_CMAKE - multiplayer_tools_files.cmake - INCLUDE_DIRECTORIES - PRIVATE - Source - . - PUBLIC - Include - BUILD_DEPENDENCIES - PRIVATE - Gem::Multiplayer.Builders.Static - RUNTIME_DEPENDENCIES - Gem::Multiplayer.Editor - ) - ly_add_target( NAME Multiplayer.Editor GEM_MODULE NAMESPACE Gem FILES_CMAKE multiplayer_editor_shared_files.cmake + multiplayer_tools_files.cmake COMPILE_DEFINITIONS PUBLIC MULTIPLAYER_EDITOR @@ -154,7 +114,8 @@ if (PAL_TRAIT_BUILD_HOST_TOOLS) Gem::Multiplayer.Static Gem::Multiplayer.Builders ) - + + ly_create_alias(NAME Multiplayer.Builders NAMESPACE Gem TARGETS Gem::Multiplayer.Editor) # use the Multiplayer.Editor module in tools like the Editor: Such tools also get the visual debug view: ly_create_alias(NAME Multiplayer.Tools NAMESPACE Gem TARGETS Gem::Multiplayer.Editor Gem::Multiplayer.Debug Gem::Multiplayer.Builders) endif() @@ -197,6 +158,7 @@ if (PAL_TRAIT_BUILD_TESTS_SUPPORTED) NAMESPACE Gem FILES_CMAKE multiplayer_tools_tests_files.cmake + multiplayer_tools_files.cmake INCLUDE_DIRECTORIES PRIVATE Tests @@ -206,8 +168,10 @@ if (PAL_TRAIT_BUILD_TESTS_SUPPORTED) PRIVATE AZ::AzTest AZ::AzTestShared + AZ::AzToolsFramework AZ::AzToolsFrameworkTestCommon - Gem::Multiplayer.Builders.Static + AZ::AzNetworking + Gem::Multiplayer.Static ) ly_add_googletest( NAME Gem::Multiplayer.Builders.Tests diff --git a/Gems/Multiplayer/Code/Source/MultiplayerGem.cpp b/Gems/Multiplayer/Code/Source/MultiplayerGem.cpp index 030964d81c..830f0e2ef4 100644 --- a/Gems/Multiplayer/Code/Source/MultiplayerGem.cpp +++ b/Gems/Multiplayer/Code/Source/MultiplayerGem.cpp @@ -6,10 +6,9 @@ * */ +#include #include #include -#include -#include #include #include #include @@ -20,25 +19,32 @@ namespace Multiplayer MultiplayerModule::MultiplayerModule() : AZ::Module() { - m_descriptors.insert(m_descriptors.end(), { - AzNetworking::NetworkingSystemComponent::CreateDescriptor(), - MultiplayerSystemComponent::CreateDescriptor(), - NetBindComponent::CreateDescriptor(), - NetworkSpawnableHolderComponent::CreateDescriptor(), - }); + m_descriptors.insert( + m_descriptors.end(), + { + AzNetworking::NetworkingSystemComponent::CreateDescriptor(), + MultiplayerSystemComponent::CreateDescriptor(), + NetBindComponent::CreateDescriptor(), + NetworkSpawnableHolderComponent::CreateDescriptor(), +#ifdef MULTIPLAYER_EDITOR + MultiplayerToolsSystemComponent::CreateDescriptor(), +#endif + }); CreateComponentDescriptors(m_descriptors); } AZ::ComponentTypeList MultiplayerModule::GetRequiredSystemComponents() const { - return AZ::ComponentTypeList - { + return AZ::ComponentTypeList{ azrtti_typeid(), azrtti_typeid(), +#ifdef MULTIPLAYER_EDITOR + azrtti_typeid(), +#endif }; } -} +} // namespace Multiplayer #if !defined(MULTIPLAYER_EDITOR) AZ_DECLARE_MODULE_CLASS(Gem_Multiplayer, Multiplayer::MultiplayerModule); diff --git a/Gems/Multiplayer/Code/Source/MultiplayerToolsModule.cpp b/Gems/Multiplayer/Code/Source/MultiplayerToolsSystemComponent.cpp similarity index 66% rename from Gems/Multiplayer/Code/Source/MultiplayerToolsModule.cpp rename to Gems/Multiplayer/Code/Source/MultiplayerToolsSystemComponent.cpp index ecda82a31b..058517d5dc 100644 --- a/Gems/Multiplayer/Code/Source/MultiplayerToolsModule.cpp +++ b/Gems/Multiplayer/Code/Source/MultiplayerToolsSystemComponent.cpp @@ -6,7 +6,7 @@ * */ -#include +#include #include #include @@ -39,22 +39,4 @@ namespace Multiplayer { m_didProcessNetPrefabs = didProcessNetPrefabs; } - - MultiplayerToolsModule::MultiplayerToolsModule() - : AZ::Module() - { - m_descriptors.insert(m_descriptors.end(), { - MultiplayerToolsSystemComponent::CreateDescriptor(), - }); - } - - AZ::ComponentTypeList MultiplayerToolsModule::GetRequiredSystemComponents() const - { - return AZ::ComponentTypeList - { - azrtti_typeid(), - }; - } } // namespace Multiplayer - -AZ_DECLARE_MODULE_CLASS(Gem_Multiplayer_Tools, Multiplayer::MultiplayerToolsModule); diff --git a/Gems/Multiplayer/Code/Source/MultiplayerToolsModule.h b/Gems/Multiplayer/Code/Source/MultiplayerToolsSystemComponent.h similarity index 72% rename from Gems/Multiplayer/Code/Source/MultiplayerToolsModule.h rename to Gems/Multiplayer/Code/Source/MultiplayerToolsSystemComponent.h index d0a6a81afb..3c4f8ea7a3 100644 --- a/Gems/Multiplayer/Code/Source/MultiplayerToolsModule.h +++ b/Gems/Multiplayer/Code/Source/MultiplayerToolsSystemComponent.h @@ -37,19 +37,5 @@ namespace Multiplayer bool m_didProcessNetPrefabs = false; }; - - class MultiplayerToolsModule - : public AZ::Module - { - public: - - AZ_RTTI(MultiplayerToolsModule, "{3F726172-21FC-48FA-8CFA-7D87EBA07E55}", AZ::Module); - AZ_CLASS_ALLOCATOR(MultiplayerToolsModule, AZ::SystemAllocator, 0); - - MultiplayerToolsModule(); - ~MultiplayerToolsModule() override = default; - - AZ::ComponentTypeList GetRequiredSystemComponents() const override; - }; } // namespace Multiplayer diff --git a/Gems/Multiplayer/Code/multiplayer_tools_files.cmake b/Gems/Multiplayer/Code/multiplayer_tools_files.cmake index aa948f4e75..b180e239a2 100644 --- a/Gems/Multiplayer/Code/multiplayer_tools_files.cmake +++ b/Gems/Multiplayer/Code/multiplayer_tools_files.cmake @@ -10,6 +10,6 @@ set(FILES Include/Multiplayer/IMultiplayerTools.h Source/Pipeline/NetworkPrefabProcessor.cpp Source/Pipeline/NetworkPrefabProcessor.h - Source/MultiplayerToolsModule.h - Source/MultiplayerToolsModule.cpp + Source/MultiplayerToolsSystemComponent.cpp + Source/MultiplayerToolsSystemComponent.h ) From ba5102b37d7835e531a4b9198a7d2447ef244718 Mon Sep 17 00:00:00 2001 From: AMZN-Phil Date: Tue, 16 Nov 2021 17:40:12 -0800 Subject: [PATCH 074/345] Change to optionally show all python error strings Signed-off-by: AMZN-Phil --- .../Source/DownloadController.cpp | 16 ++++++- .../Source/DownloadController.h | 2 +- .../ProjectManager/Source/DownloadWorker.cpp | 6 +-- .../ProjectManager/Source/DownloadWorker.h | 2 +- .../Source/GemRepo/GemRepoScreen.cpp | 18 +++++++- .../ProjectManager/Source/PythonBindings.cpp | 42 ++++++++++++------- .../ProjectManager/Source/PythonBindings.h | 6 ++- .../Source/PythonBindingsInterface.h | 8 ++-- 8 files changed, 69 insertions(+), 31 deletions(-) diff --git a/Code/Tools/ProjectManager/Source/DownloadController.cpp b/Code/Tools/ProjectManager/Source/DownloadController.cpp index 06e51b5116..9b64c5e276 100644 --- a/Code/Tools/ProjectManager/Source/DownloadController.cpp +++ b/Code/Tools/ProjectManager/Source/DownloadController.cpp @@ -73,13 +73,25 @@ namespace O3DE::ProjectManager emit GemDownloadProgress(m_gemNames.front(), bytesDownloaded, totalBytes); } - void DownloadController::HandleResults(const QString& result) + void DownloadController::HandleResults(const QString& result, const QString& detailedError) { bool succeeded = true; if (!result.isEmpty()) { - QMessageBox::critical(nullptr, tr("Gem download"), result); + if (!detailedError.isEmpty()) + { + QMessageBox gemDownloadError; + gemDownloadError.setIcon(QMessageBox::Critical); + gemDownloadError.setWindowTitle(tr("Gem download")); + gemDownloadError.setText(result); + gemDownloadError.setDetailedText(detailedError); + gemDownloadError.exec(); + } + else + { + QMessageBox::critical(nullptr, tr("Gem download"), result); + } succeeded = false; } diff --git a/Code/Tools/ProjectManager/Source/DownloadController.h b/Code/Tools/ProjectManager/Source/DownloadController.h index 211d9b48bc..5e637971e9 100644 --- a/Code/Tools/ProjectManager/Source/DownloadController.h +++ b/Code/Tools/ProjectManager/Source/DownloadController.h @@ -54,7 +54,7 @@ namespace O3DE::ProjectManager } public slots: void UpdateUIProgress(int bytesDownloaded, int totalBytes); - void HandleResults(const QString& result); + void HandleResults(const QString& result, const QString& detailedError); signals: void StartGemDownload(const QString& gemName); diff --git a/Code/Tools/ProjectManager/Source/DownloadWorker.cpp b/Code/Tools/ProjectManager/Source/DownloadWorker.cpp index 163e2c5869..e58c41c89e 100644 --- a/Code/Tools/ProjectManager/Source/DownloadWorker.cpp +++ b/Code/Tools/ProjectManager/Source/DownloadWorker.cpp @@ -24,16 +24,16 @@ namespace O3DE::ProjectManager { emit UpdateProgress(bytesDownloaded, totalBytes); }; - AZ::Outcome gemInfoResult = + AZ::Outcome> gemInfoResult = PythonBindingsInterface::Get()->DownloadGem(m_gemName, gemDownloadProgress, /*force*/true); if (gemInfoResult.IsSuccess()) { - emit Done(""); + emit Done("", ""); } else { - emit Done(gemInfoResult.GetError().c_str()); + emit Done(gemInfoResult.GetError().first.c_str(), gemInfoResult.GetError().second.c_str()); } } diff --git a/Code/Tools/ProjectManager/Source/DownloadWorker.h b/Code/Tools/ProjectManager/Source/DownloadWorker.h index 4084080ff7..d33de7bacc 100644 --- a/Code/Tools/ProjectManager/Source/DownloadWorker.h +++ b/Code/Tools/ProjectManager/Source/DownloadWorker.h @@ -32,7 +32,7 @@ namespace O3DE::ProjectManager signals: void UpdateProgress(int bytesDownloaded, int totalBytes); - void Done(QString result = ""); + void Done(QString result = "", QString detailedResult = ""); private: diff --git a/Code/Tools/ProjectManager/Source/GemRepo/GemRepoScreen.cpp b/Code/Tools/ProjectManager/Source/GemRepo/GemRepoScreen.cpp index 057976921e..67fdfaa790 100644 --- a/Code/Tools/ProjectManager/Source/GemRepo/GemRepoScreen.cpp +++ b/Code/Tools/ProjectManager/Source/GemRepo/GemRepoScreen.cpp @@ -92,7 +92,8 @@ namespace O3DE::ProjectManager return; } - AZ::Outcome addGemRepoResult = PythonBindingsInterface::Get()->AddGemRepo(repoUri); + AZ::Outcome < void, + AZStd::pair> addGemRepoResult = PythonBindingsInterface::Get()->AddGemRepo(repoUri); if (addGemRepoResult.IsSuccess()) { Reinit(); @@ -101,7 +102,20 @@ namespace O3DE::ProjectManager else { QString failureMessage = tr("Failed to add gem repo: %1.").arg(repoUri); - QMessageBox::critical(this, failureMessage, addGemRepoResult.GetError().c_str()); + if (!addGemRepoResult.GetError().second.empty()) + { + QMessageBox gemDownloadError; + gemDownloadError.setIcon(QMessageBox::Critical); + gemDownloadError.setWindowTitle(failureMessage); + gemDownloadError.setText(addGemRepoResult.GetError().first.c_str()); + gemDownloadError.setDetailedText(addGemRepoResult.GetError().second.c_str()); + gemDownloadError.exec(); + } + else + { + QMessageBox::critical(this, failureMessage, addGemRepoResult.GetError().first.c_str()); + } + AZ_Error("Project Manager", false, failureMessage.toUtf8()); } } diff --git a/Code/Tools/ProjectManager/Source/PythonBindings.cpp b/Code/Tools/ProjectManager/Source/PythonBindings.cpp index c30e9ebd28..5f80705e97 100644 --- a/Code/Tools/ProjectManager/Source/PythonBindings.cpp +++ b/Code/Tools/ProjectManager/Source/PythonBindings.cpp @@ -23,6 +23,7 @@ #include #include #include +#include #include #include @@ -61,7 +62,7 @@ namespace Platform namespace RedirectOutput { using RedirectOutputFunc = AZStd::function; - AZStd::string lastPythonError; + AZStd::vector pythonErrorStrings; struct RedirectOutput { @@ -211,16 +212,16 @@ namespace RedirectOutput }); SetRedirection("stderr", g_redirect_stderr_saved, g_redirect_stderr, []([[maybe_unused]] const char* msg) { - if (lastPythonError.empty()) + AZStd::string lastPythonError = msg; + constexpr const char* pythonErrorPrefix = "ERROR:root:"; + constexpr size_t lengthOfErrorPrefix = AZStd::char_traits::length(pythonErrorPrefix); + auto errorPrefix = lastPythonError.find(pythonErrorPrefix); + if (errorPrefix != AZStd::string::npos) { - lastPythonError = msg; - const int lengthOfErrorPrefix = 11; - auto errorPrefix = lastPythonError.find("ERROR:root:"); - if (errorPrefix != AZStd::string::npos) - { - lastPythonError.erase(errorPrefix, lengthOfErrorPrefix); - } + lastPythonError.erase(errorPrefix, lengthOfErrorPrefix); } + pythonErrorStrings.push_back(lastPythonError); + AZ_TracePrintf("Python", msg); }); @@ -387,6 +388,8 @@ namespace O3DE::ProjectManager pybind11::gil_scoped_release release; pybind11::gil_scoped_acquire acquire; + RedirectOutput::pythonErrorStrings.clear(); + try { executionCallback(); @@ -1062,13 +1065,12 @@ namespace O3DE::ProjectManager return result && refreshResult; } - AZ::Outcome PythonBindings::AddGemRepo(const QString& repoUri) + AZ::Outcome> PythonBindings::AddGemRepo(const QString& repoUri) { bool registrationResult = false; bool result = ExecuteWithLock( [&] { - RedirectOutput::lastPythonError.clear(); auto pyUri = QString_To_Py_String(repoUri); auto pythonRegistrationResult = m_register.attr("register")( pybind11::none(), pybind11::none(), pybind11::none(), pybind11::none(), pybind11::none(), pybind11::none(), pyUri); @@ -1079,7 +1081,7 @@ namespace O3DE::ProjectManager if (!result || !registrationResult) { - return AZ::Failure(AZStd::move(RedirectOutput::lastPythonError)); + return AZ::Failure>(GetSimpleDetailedErrorPair()); } return AZ::Success(); @@ -1232,7 +1234,7 @@ namespace O3DE::ProjectManager return AZ::Success(AZStd::move(gemInfos)); } - AZ::Outcome PythonBindings::DownloadGem( + AZ::Outcome> PythonBindings::DownloadGem( const QString& gemName, std::function gemProgressCallback, bool force) { // This process is currently limited to download a single gem at a time. @@ -1242,7 +1244,6 @@ namespace O3DE::ProjectManager auto result = ExecuteWithLockErrorHandling( [&] { - RedirectOutput::lastPythonError.clear(); auto downloadResult = m_download.attr("download_gem")( QString_To_Py_String(gemName), // gem name pybind11::none(), // destination path @@ -1262,11 +1263,12 @@ namespace O3DE::ProjectManager if (!result.IsSuccess()) { - return result; + AZStd::pair pythonRunError(result.GetError(), result.GetError()); + return AZ::Failure>(AZStd::move(pythonRunError)); } else if (!downloadSucceeded) { - return AZ::Failure(AZStd::move(RedirectOutput::lastPythonError)); + return AZ::Failure>(GetSimpleDetailedErrorPair()); } return AZ::Success(); @@ -1292,4 +1294,12 @@ namespace O3DE::ProjectManager return result && updateAvaliableResult; } + + AZStd::pair PythonBindings::GetSimpleDetailedErrorPair() + { + AZStd::string detailedString = RedirectOutput::pythonErrorStrings.size() == 1 ? "" : AZStd::accumulate( + RedirectOutput::pythonErrorStrings.begin(), RedirectOutput::pythonErrorStrings.end(), AZStd::string("")); + + return AZStd::pair(RedirectOutput::pythonErrorStrings.front(), detailedString); + } } diff --git a/Code/Tools/ProjectManager/Source/PythonBindings.h b/Code/Tools/ProjectManager/Source/PythonBindings.h index 9f5f06110e..fd36d6d13e 100644 --- a/Code/Tools/ProjectManager/Source/PythonBindings.h +++ b/Code/Tools/ProjectManager/Source/PythonBindings.h @@ -62,11 +62,12 @@ namespace O3DE::ProjectManager // Gem Repos AZ::Outcome RefreshGemRepo(const QString& repoUri) override; bool RefreshAllGemRepos() override; - AZ::Outcome AddGemRepo(const QString& repoUri) override; + AZ::Outcome> AddGemRepo(const QString& repoUri) override; bool RemoveGemRepo(const QString& repoUri) override; AZ::Outcome, AZStd::string> GetAllGemRepoInfos() override; AZ::Outcome, AZStd::string> GetAllGemRepoGemsInfos() override; - AZ::Outcome DownloadGem(const QString& gemName, std::function gemProgressCallback, bool force = false) override; + AZ::Outcome> DownloadGem( + const QString& gemName, std::function gemProgressCallback, bool force = false) override; void CancelDownload() override; bool IsGemUpdateAvaliable(const QString& gemName, const QString& lastUpdated) override; @@ -82,6 +83,7 @@ namespace O3DE::ProjectManager AZ::Outcome GemRegistration(const QString& gemPath, const QString& projectPath, bool remove = false); bool RegisterThisEngine(); bool StopPython(); + AZStd::pair GetSimpleDetailedErrorPair(); bool m_pythonStarted = false; diff --git a/Code/Tools/ProjectManager/Source/PythonBindingsInterface.h b/Code/Tools/ProjectManager/Source/PythonBindingsInterface.h index 26a487f307..45fb8928f9 100644 --- a/Code/Tools/ProjectManager/Source/PythonBindingsInterface.h +++ b/Code/Tools/ProjectManager/Source/PythonBindingsInterface.h @@ -200,9 +200,9 @@ namespace O3DE::ProjectManager /** * Registers this gem repo with the current engine. * @param repoUri the absolute filesystem path or url to the gem repo. - * @return an outcome with a string error message on failure. + * @return an outcome with a pair of string error and detailed messages on failure. */ - virtual AZ::Outcome AddGemRepo(const QString& repoUri) = 0; + virtual AZ::Outcome> AddGemRepo(const QString& repoUri) = 0; /** * Unregisters this gem repo with the current engine. @@ -228,9 +228,9 @@ namespace O3DE::ProjectManager * @param gemName the name of the Gem to download. * @param gemProgressCallback a callback function that is called with an int percentage download value. * @param force should we forcibly overwrite the old version of the gem. - * @return an outcome with a string error message on failure. + * @return an outcome with a pair of string error and detailed messages on failure. */ - virtual AZ::Outcome DownloadGem( + virtual AZ::Outcome> DownloadGem( const QString& gemName, std::function gemProgressCallback, bool force = false) = 0; /** From 68a2561dc18ab7943909b49b0523bd3bdc18b4e1 Mon Sep 17 00:00:00 2001 From: AMZN-Igarri <82394219+AMZN-Igarri@users.noreply.github.com> Date: Wed, 17 Nov 2021 10:58:31 +0100 Subject: [PATCH 075/345] Fixed - Current Camera Reset - When making a new Entity, or add a new Component, you are immediately taken out of current Camera View. (#5650) * Fixed Camera getting out of view when adding new entity Signed-off-by: AMZN-Igarri <82394219+AMZN-Igarri@users.noreply.github.com> * Reformatted File Signed-off-by: AMZN-Igarri <82394219+AMZN-Igarri@users.noreply.github.com> * fixed case formatting Signed-off-by: AMZN-Igarri <82394219+AMZN-Igarri@users.noreply.github.com> * Namespace comments Signed-off-by: AMZN-Igarri <82394219+AMZN-Igarri@users.noreply.github.com> * Addressed review comments Signed-off-by: AMZN-Igarri <82394219+AMZN-Igarri@users.noreply.github.com> * More feedback Signed-off-by: AMZN-Igarri <82394219+AMZN-Igarri@users.noreply.github.com> --- .../Source/ViewportCameraSelectorWindow.cpp | 67 ++++++++++++++----- .../ViewportCameraSelectorWindow_Internals.h | 5 ++ 2 files changed, 55 insertions(+), 17 deletions(-) diff --git a/Gems/Camera/Code/Source/ViewportCameraSelectorWindow.cpp b/Gems/Camera/Code/Source/ViewportCameraSelectorWindow.cpp index dc091db9e5..eb1fd9890c 100644 --- a/Gems/Camera/Code/Source/ViewportCameraSelectorWindow.cpp +++ b/Gems/Camera/Code/Source/ViewportCameraSelectorWindow.cpp @@ -7,14 +7,14 @@ */ #include "ViewportCameraSelectorWindow.h" #include "ViewportCameraSelectorWindow_Internals.h" -#include -#include -#include -#include -#include -#include #include #include +#include +#include +#include +#include +#include +#include namespace Qt { @@ -64,12 +64,14 @@ namespace Camera CameraListModel::CameraListModel(QWidget* myParent) : QAbstractListModel(myParent) { + m_lastActiveCamera = AZ::EntityId(); m_cameraItems.push_back(AZ::EntityId()); CameraNotificationBus::Handler::BusConnect(); } CameraListModel::~CameraListModel() { + m_firstEntry = true; // set the view entity id back to Invalid, thus enabling the editor camera EditorCameraRequests::Bus::Broadcast(&EditorCameraRequests::SetViewFromEntityPerspective, AZ::EntityId()); @@ -98,11 +100,13 @@ namespace Camera { // If the camera entity is not an editor camera entity, don't add it to the list. // This occurs when we're in simulation mode. + + //We reset the m_firstEntry value so we can update m_lastActiveCamera when we remove from the cameras list + m_firstEntry = true; + bool isEditorEntity = false; AzToolsFramework::EditorEntityContextRequestBus::BroadcastResult( - isEditorEntity, - &AzToolsFramework::EditorEntityContextRequests::IsEditorEntity, - cameraId); + isEditorEntity, &AzToolsFramework::EditorEntityContextRequests::IsEditorEntity, cameraId); if (!isEditorEntity) { return; @@ -111,11 +115,25 @@ namespace Camera beginInsertRows(QModelIndex(), rowCount(), rowCount()); m_cameraItems.push_back(cameraId); endInsertRows(); + + if (m_lastActiveCamera.IsValid() && m_lastActiveCamera == cameraId) + { + Camera::CameraRequestBus::Event(cameraId, &Camera::CameraRequestBus::Events::MakeActiveView); + } } void CameraListModel::OnCameraRemoved(const AZ::EntityId& cameraId) { - auto cameraIt = AZStd::find_if(m_cameraItems.begin(), m_cameraItems.end(), + //Check it is the first time we remove a camera from the list before any other addition + //So we don't end up with the wrong camera ID. + if (m_firstEntry) + { + CameraSystemRequestBus::BroadcastResult(m_lastActiveCamera, &CameraSystemRequestBus::Events::GetActiveCamera); + m_firstEntry = false; + } + + auto cameraIt = AZStd::find_if( + m_cameraItems.begin(), m_cameraItems.end(), [&cameraId](const CameraListItem& entry) { return entry.m_cameraId == cameraId; @@ -162,7 +180,12 @@ namespace Camera // use the stylesheet for elements in a set where one item must be selected at all times setProperty("class", "SingleRequiredSelection"); - connect(m_cameraList, &CameraListModel::rowsInserted, this, [sortedProxyModel](const QModelIndex&, int, int) { sortedProxyModel->sortColumn(); }); + connect( + m_cameraList, &CameraListModel::rowsInserted, this, + [sortedProxyModel](const QModelIndex&, int, int) + { + sortedProxyModel->sortColumn(); + }); // highlight the current selected camera entity AZ::EntityId currentSelection; @@ -188,7 +211,8 @@ namespace Camera QScopedValueRollback rb(m_ignoreViewportViewEntityChanged, true); AZ::EntityId entityId = selectionModel()->currentIndex().data(Qt::CameraIdRole).value(); - EditorCameraRequests::Bus::Broadcast(&EditorCameraRequests::SetViewAndMovementLockFromEntityPerspective, entityId, lockCameraMovement); + EditorCameraRequests::Bus::Broadcast( + &EditorCameraRequests::SetViewAndMovementLockFromEntityPerspective, entityId, lockCameraMovement); } } @@ -220,7 +244,9 @@ namespace Camera } // swallow mouse move events so we can disable sloppy selection - void ViewportCameraSelectorWindow::mouseMoveEvent(QMouseEvent*) {} + void ViewportCameraSelectorWindow::mouseMoveEvent(QMouseEvent*) + { + } // double click selects the entity void ViewportCameraSelectorWindow::mouseDoubleClickEvent([[maybe_unused]] QMouseEvent* event) @@ -228,11 +254,13 @@ namespace Camera AZ::EntityId entityId = selectionModel()->currentIndex().data(Qt::CameraIdRole).value(); if (entityId.IsValid()) { - AzToolsFramework::ToolsApplicationRequestBus::Broadcast(&AzToolsFramework::ToolsApplicationRequestBus::Events::SetSelectedEntities, AzToolsFramework::EntityIdList { entityId }); + AzToolsFramework::ToolsApplicationRequestBus::Broadcast( + &AzToolsFramework::ToolsApplicationRequestBus::Events::SetSelectedEntities, AzToolsFramework::EntityIdList{ entityId }); } else { - AzToolsFramework::ToolsApplicationRequestBus::Broadcast(&AzToolsFramework::ToolsApplicationRequestBus::Events::SetSelectedEntities, AzToolsFramework::EntityIdList {}); + AzToolsFramework::ToolsApplicationRequestBus::Broadcast( + &AzToolsFramework::ToolsApplicationRequestBus::Events::SetSelectedEntities, AzToolsFramework::EntityIdList{}); } } @@ -290,7 +318,10 @@ namespace Camera : QWidget(parent) { setLayout(new QVBoxLayout(this)); - auto label = new QLabel("Select the camera you wish to view and navigate through. Closing this window will return you to the default editor camera.", this); + auto label = new QLabel( + "Select the camera you wish to view and navigate through. Closing this window will return you to the default editor " + "camera.", + this); label->setWordWrap(true); layout()->addWidget(label); layout()->addWidget(new ViewportCameraSelectorWindow(this)); @@ -309,6 +340,8 @@ namespace Camera viewOptions.isPreview = true; viewOptions.showInMenu = true; viewOptions.preferedDockingArea = Qt::DockWidgetArea::LeftDockWidgetArea; - AzToolsFramework::EditorRequestBus::Broadcast(&AzToolsFramework::EditorRequestBus::Events::RegisterViewPane, s_viewportCameraSelectorName, "Viewport", viewOptions, &Internal::CreateNewSelectionWindow); + AzToolsFramework::EditorRequestBus::Broadcast( + &AzToolsFramework::EditorRequestBus::Events::RegisterViewPane, s_viewportCameraSelectorName, "Viewport", viewOptions, + &Internal::CreateNewSelectionWindow); } } // namespace Camera diff --git a/Gems/Camera/Code/Source/ViewportCameraSelectorWindow_Internals.h b/Gems/Camera/Code/Source/ViewportCameraSelectorWindow_Internals.h index b07ae7789f..21f316b83d 100644 --- a/Gems/Camera/Code/Source/ViewportCameraSelectorWindow_Internals.h +++ b/Gems/Camera/Code/Source/ViewportCameraSelectorWindow_Internals.h @@ -58,6 +58,11 @@ namespace Camera private: AZStd::vector m_cameraItems; AZ::EntityId m_sequenceCameraEntityId; + AZ::EntityId m_lastActiveCamera; + + //Value to check that is the first time that we remove a camera before adding a new one. + //So we can update m_lastActiveCamera properly + bool m_firstEntry = true; }; struct ViewportCameraSelectorWindow From 8ee6f1a7f41922eb7a0d6da09bf239b4881ef902 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 17 Nov 2021 11:08:22 +0000 Subject: [PATCH 076/345] Fix back icon scaling. Signed-off-by: John --- .../AzToolsFramework/ViewportUi/ViewportUiDisplay.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiDisplay.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiDisplay.cpp index 315a4d0aec..a728ce9ac8 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiDisplay.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiDisplay.cpp @@ -22,6 +22,8 @@ namespace AzToolsFramework::ViewportUi::Internal const static int HighlightBorderSize = 5; const static char* HighlightBorderColor = "#4A90E2"; const static int HighlightBorderBackButtonMargin = 5; + const static int HighlightBorderBackButtonIconSize = 20; + const static char* HighlightBorderBackButtonIconFile = "X_axis.svg"; static void UnparentWidgets(ViewportUiElementIdInfoLookup& viewportUiElementIdInfoLookup) { @@ -383,10 +385,9 @@ namespace AzToolsFramework::ViewportUi::Internal "border: 0px; padding-left: %dpx; padding-right: %dpx", HighlightBorderBackButtonMargin, HighlightBorderBackButtonMargin); m_viewportBorderBackButton.setStyleSheet(styleSheet.c_str()); m_viewportBorderBackButton.setVisible(false); - QPixmap backButtonPixmap(QString(":/stylesheet/img/UI20/toolbar/X_axis.svg")); - QIcon backButtonIcon(backButtonPixmap); + QIcon backButtonIcon(QString(AZStd::string::format(":/stylesheet/img/UI20/toolbar/%s", HighlightBorderBackButtonIconFile).c_str())); m_viewportBorderBackButton.setIcon(backButtonIcon); - m_viewportBorderBackButton.setIconSize(backButtonPixmap.size()); + m_viewportBorderBackButton.setIconSize(QSize(HighlightBorderBackButtonIconSize, HighlightBorderBackButtonIconSize)); // setup the handler for the back button to call the user provided callback (if any) QObject::connect( From 155fe77f5d0de7288d8b57fff83bff0f17b08a94 Mon Sep 17 00:00:00 2001 From: galibzon <66021303+galibzon@users.noreply.github.com> Date: Wed, 17 Nov 2021 05:47:25 -0600 Subject: [PATCH 077/345] ShaderMetricsSystem spawns a lot of warnings (#5661) * ShaderMetricsSystem spawns a lot of warnings when run Atom_RPI.Tests Added @user@ path alias definition. * When running unit tests, using AZ::Utils::GetProjectPath() will resolve to something like: "/data/workspace/o3de/build/linux/External/Atom-9a4d112b/RPI/Code/Cache" The ShaderMetricSystem.cpp writes to the @user@ folder and the following runtime error occurs: "You may not alter data inside the asset cache. Please check the call stack and consider writing into the source asset folder instead." "Attempted write location: /data/workspace/o3de/build/linux/External/Atom-9a4d112b/RPI/Code/Cache/user/shadermetrics.json" To avoid the error We use AZ::Test::GetEngineRootPath(); Signed-off-by: galibzon <66021303+galibzon@users.noreply.github.com> --- Gems/Atom/RPI/Code/Tests/Common/RPITestFixture.cpp | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/Gems/Atom/RPI/Code/Tests/Common/RPITestFixture.cpp b/Gems/Atom/RPI/Code/Tests/Common/RPITestFixture.cpp index 5343c295d8..8c685656ba 100644 --- a/Gems/Atom/RPI/Code/Tests/Common/RPITestFixture.cpp +++ b/Gems/Atom/RPI/Code/Tests/Common/RPITestFixture.cpp @@ -69,6 +69,19 @@ namespace UnitTest assetPath /= "Cache"; AZ::IO::FileIOBase::GetInstance()->SetAlias("@products@", assetPath.c_str()); + // Remark, AZ::Utils::GetProjectPath() is not used when defining "user" folder, + // instead We use AZ::Test::GetEngineRootPath();. + // Reason: + // When running unit tests, using AZ::Utils::GetProjectPath() will resolve to something like: + // "/data/workspace/o3de/build/linux/External/Atom-9a4d112b/RPI/Code/Cache" + // The ShaderMetricSystem.cpp writes to the @user@ folder and the following runtime error occurs: + // "You may not alter data inside the asset cache. Please check the call stack and consider writing into the source asset folder instead." + // "Attempted write location: /data/workspace/o3de/build/linux/External/Atom-9a4d112b/RPI/Code/Cache/user/shadermetrics.json" + // To avoid the error We use AZ::Test::GetEngineRootPath(); + AZ::IO::Path userPath = AZ::Test::GetEngineRootPath(); + userPath /= "user"; + AZ::IO::FileIOBase::GetInstance()->SetAlias("@user@", userPath.c_str()); + m_jsonRegistrationContext = AZStd::make_unique(); m_jsonSystemComponent = AZStd::make_unique(); m_jsonSystemComponent->Reflect(m_jsonRegistrationContext.get()); From a6164ca2cd3f573fd7735c3825568b1e25b12c2b Mon Sep 17 00:00:00 2001 From: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com> Date: Wed, 17 Nov 2021 12:27:23 +0000 Subject: [PATCH 078/345] Fix for camera roll behavior when in 'Be this camera' mode (#5658) * fix for camera roll behavior when in 'Be this camera' mode Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com> * updates for camera tests Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com> * fix for failing unit test - require default function Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com> --- .../EditorModularViewportCameraComposer.cpp | 4 +- .../Lib/Tests/Camera/test_EditorCamera.cpp | 67 ++++++------------- .../test_ModularViewportCameraController.cpp | 11 +++ .../AzFramework/Viewport/CameraInput.cpp | 62 +++++++++++------ .../AzFramework/Viewport/CameraInput.h | 13 ++++ .../ModularViewportCameraController.h | 22 +++--- ...odularViewportCameraControllerRequestBus.h | 15 +++-- .../ModularViewportCameraController.cpp | 55 +++++++-------- 8 files changed, 131 insertions(+), 118 deletions(-) diff --git a/Code/Editor/EditorModularViewportCameraComposer.cpp b/Code/Editor/EditorModularViewportCameraComposer.cpp index 72fd37605a..5cfb4d2665 100644 --- a/Code/Editor/EditorModularViewportCameraComposer.cpp +++ b/Code/Editor/EditorModularViewportCameraComposer.cpp @@ -337,12 +337,12 @@ namespace SandboxEditor AZ::TransformBus::EventResult(worldFromLocal, viewEntityId, &AZ::TransformBus::Events::GetWorldTM); AtomToolsFramework::ModularViewportCameraControllerRequestBus::Event( - m_viewportId, &AtomToolsFramework::ModularViewportCameraControllerRequestBus::Events::SetReferenceFrame, worldFromLocal); + m_viewportId, &AtomToolsFramework::ModularViewportCameraControllerRequestBus::Events::StartTrackingTransform, worldFromLocal); } else { AtomToolsFramework::ModularViewportCameraControllerRequestBus::Event( - m_viewportId, &AtomToolsFramework::ModularViewportCameraControllerRequestBus::Events::ClearReferenceFrame); + m_viewportId, &AtomToolsFramework::ModularViewportCameraControllerRequestBus::Events::StopTrackingTransform); } } diff --git a/Code/Editor/Lib/Tests/Camera/test_EditorCamera.cpp b/Code/Editor/Lib/Tests/Camera/test_EditorCamera.cpp index 1a44d43370..7eb73b64bf 100644 --- a/Code/Editor/Lib/Tests/Camera/test_EditorCamera.cpp +++ b/Code/Editor/Lib/Tests/Camera/test_EditorCamera.cpp @@ -92,8 +92,8 @@ namespace UnitTest &Camera::EditorCameraNotificationBus::Events::OnViewportViewEntityChanged, m_entity->GetId()); // ensure the viewport updates after the viewport view entity change - const float deltaTime = 1.0f / 60.0f; - m_controllerList->UpdateViewport({ TestViewportId, AzFramework::FloatSeconds(deltaTime), AZ::ScriptTimePoint() }); + // note: do a large step to ensure smoothing finishes (e.g. not 1.0f/60.0f) + m_controllerList->UpdateViewport({ TestViewportId, AzFramework::FloatSeconds(2.0f), AZ::ScriptTimePoint() }); // retrieve updated camera transform const AZ::Transform cameraTransform = m_cameraViewportContextView->GetCameraTransform(); @@ -103,61 +103,40 @@ namespace UnitTest EXPECT_THAT(cameraTransform, IsClose(entityTransform)); } - TEST_F(EditorCameraFixture, ReferenceFrameRemainsIdentityAfterExternalCameraTransformChangeWhenNotSet) + TEST_F(EditorCameraFixture, TrackingTransformIsTrueAfterTransformIsTracked) { - // Given - m_cameraViewportContextView->SetCameraTransform(AZ::Transform::CreateTranslation(AZ::Vector3(10.0f, 20.0f, 30.0f))); + // Given/When + const AZ::Transform referenceFrame = AZ::Transform::CreateFromQuaternionAndTranslation( + AZ::Quaternion::CreateRotationX(AZ::DegToRad(90.0f)), AZ::Vector3(1.0f, 2.0f, 3.0f)); + AtomToolsFramework::ModularViewportCameraControllerRequestBus::Event( + TestViewportId, &AtomToolsFramework::ModularViewportCameraControllerRequestBus::Events::StartTrackingTransform, referenceFrame); - // When - AZ::Transform referenceFrame = AZ::Transform::CreateTranslation(AZ::Vector3(1.0f, 2.0f, 3.0f)); + bool trackingTransform = false; AtomToolsFramework::ModularViewportCameraControllerRequestBus::EventResult( - referenceFrame, TestViewportId, &AtomToolsFramework::ModularViewportCameraControllerRequestBus::Events::GetReferenceFrame); + trackingTransform, TestViewportId, &AtomToolsFramework::ModularViewportCameraControllerRequestBus::Events::IsTrackingTransform); // Then - // reference frame is still the identity - EXPECT_THAT(referenceFrame, IsClose(AZ::Transform::CreateIdentity())); + EXPECT_THAT(trackingTransform, ::testing::IsTrue()); } - TEST_F(EditorCameraFixture, ExternalCameraTransformChangeWhenReferenceFrameIsSetUpdatesReferenceFrame) + TEST_F(EditorCameraFixture, TrackingTransformIsFalseAfterTransformIsStoppedBeingTracked) { // Given const AZ::Transform referenceFrame = AZ::Transform::CreateFromQuaternionAndTranslation( AZ::Quaternion::CreateRotationX(AZ::DegToRad(90.0f)), AZ::Vector3(1.0f, 2.0f, 3.0f)); AtomToolsFramework::ModularViewportCameraControllerRequestBus::Event( - TestViewportId, &AtomToolsFramework::ModularViewportCameraControllerRequestBus::Events::SetReferenceFrame, referenceFrame); - - const AZ::Transform nextTransform = AZ::Transform::CreateTranslation(AZ::Vector3(10.0f, 20.0f, 30.0f)); - m_cameraViewportContextView->SetCameraTransform(nextTransform); - - // When - AZ::Transform currentReferenceFrame = AZ::Transform::CreateTranslation(AZ::Vector3(1.0f, 2.0f, 3.0f)); - AtomToolsFramework::ModularViewportCameraControllerRequestBus::EventResult( - currentReferenceFrame, TestViewportId, - &AtomToolsFramework::ModularViewportCameraControllerRequestBus::Events::GetReferenceFrame); - - // Then - EXPECT_THAT(currentReferenceFrame, IsClose(nextTransform)); - } - - TEST_F(EditorCameraFixture, ReferenceFrameReturnedToIdentityAfterClear) - { - // Given - const AZ::Transform referenceFrame = AZ::Transform::CreateFromQuaternionAndTranslation( - AZ::Quaternion::CreateRotationX(AZ::DegToRad(90.0f)), AZ::Vector3(1.0f, 2.0f, 3.0f)); - AtomToolsFramework::ModularViewportCameraControllerRequestBus::Event( - TestViewportId, &AtomToolsFramework::ModularViewportCameraControllerRequestBus::Events::SetReferenceFrame, referenceFrame); + TestViewportId, &AtomToolsFramework::ModularViewportCameraControllerRequestBus::Events::StartTrackingTransform, referenceFrame); // When AtomToolsFramework::ModularViewportCameraControllerRequestBus::Event( - TestViewportId, &AtomToolsFramework::ModularViewportCameraControllerRequestBus::Events::ClearReferenceFrame); - - AZ::Transform currentReferenceFrame = AZ::Transform::CreateTranslation(AZ::Vector3(1.0f, 2.0f, 3.0f)); - AtomToolsFramework::ModularViewportCameraControllerRequestBus::EventResult( - currentReferenceFrame, TestViewportId, - &AtomToolsFramework::ModularViewportCameraControllerRequestBus::Events::GetReferenceFrame); + TestViewportId, &AtomToolsFramework::ModularViewportCameraControllerRequestBus::Events::StopTrackingTransform); // Then - EXPECT_THAT(currentReferenceFrame, IsClose(AZ::Transform::CreateIdentity())); + bool trackingTransform = false; + AtomToolsFramework::ModularViewportCameraControllerRequestBus::EventResult( + trackingTransform, TestViewportId, &AtomToolsFramework::ModularViewportCameraControllerRequestBus::Events::IsTrackingTransform); + + EXPECT_THAT(trackingTransform, ::testing::IsFalse()); } TEST_F(EditorCameraFixture, InterpolateToTransform) @@ -185,7 +164,7 @@ namespace UnitTest const AZ::Transform referenceFrame = AZ::Transform::CreateFromQuaternionAndTranslation( AZ::Quaternion::CreateRotationX(AZ::DegToRad(90.0f)), AZ::Vector3(1.0f, 2.0f, 3.0f)); AtomToolsFramework::ModularViewportCameraControllerRequestBus::Event( - TestViewportId, &AtomToolsFramework::ModularViewportCameraControllerRequestBus::Events::SetReferenceFrame, referenceFrame); + TestViewportId, &AtomToolsFramework::ModularViewportCameraControllerRequestBus::Events::StartTrackingTransform, referenceFrame); AZ::Transform transformToInterpolateTo = AZ::Transform::CreateFromQuaternionAndTranslation( AZ::Quaternion::CreateRotationZ(AZ::DegToRad(90.0f)), AZ::Vector3(20.0f, 40.0f, 60.0f)); @@ -199,16 +178,10 @@ namespace UnitTest m_controllerList->UpdateViewport({ TestViewportId, AzFramework::FloatSeconds(0.5f), AZ::ScriptTimePoint() }); m_controllerList->UpdateViewport({ TestViewportId, AzFramework::FloatSeconds(0.5f), AZ::ScriptTimePoint() }); - AZ::Transform currentReferenceFrame = AZ::Transform::CreateTranslation(AZ::Vector3(1.0f, 2.0f, 3.0f)); - AtomToolsFramework::ModularViewportCameraControllerRequestBus::EventResult( - currentReferenceFrame, TestViewportId, - &AtomToolsFramework::ModularViewportCameraControllerRequestBus::Events::GetReferenceFrame); - const auto finalTransform = m_cameraViewportContextView->GetCameraTransform(); // Then EXPECT_THAT(finalTransform, IsClose(transformToInterpolateTo)); - EXPECT_THAT(currentReferenceFrame, IsClose(AZ::Transform::CreateIdentity())); } } // namespace UnitTest diff --git a/Code/Editor/Lib/Tests/test_ModularViewportCameraController.cpp b/Code/Editor/Lib/Tests/test_ModularViewportCameraController.cpp index 275df11784..c776a57c13 100644 --- a/Code/Editor/Lib/Tests/test_ModularViewportCameraController.cpp +++ b/Code/Editor/Lib/Tests/test_ModularViewportCameraController.cpp @@ -146,6 +146,17 @@ namespace UnitTest controller->SetCameraPropsBuilderCallback( [](AzFramework::CameraProps& cameraProps) { + // note: rotateSmoothness is also used for roll (not related to camera input directly) + cameraProps.m_rotateSmoothnessFn = [] + { + return 5.0f; + }; + + cameraProps.m_translateSmoothnessFn = [] + { + return 5.0f; + }; + cameraProps.m_rotateSmoothingEnabledFn = [] { return false; diff --git a/Code/Framework/AzFramework/AzFramework/Viewport/CameraInput.cpp b/Code/Framework/AzFramework/AzFramework/Viewport/CameraInput.cpp index 26c9db64aa..2f637db7cd 100644 --- a/Code/Framework/AzFramework/AzFramework/Viewport/CameraInput.cpp +++ b/Code/Framework/AzFramework/AzFramework/Viewport/CameraInput.cpp @@ -94,27 +94,27 @@ namespace AzFramework float y; float z; - // 2.4 Factor as RzRyRx - if (orientation.GetElement(2, 0) < 1.0f) + // 2.5 Factor as RzRxRy + if (orientation.GetElement(2, 1) < 1.0f) { - if (orientation.GetElement(2, 0) > -1.0f) + if (orientation.GetElement(2, 1) > -1.0f) { - x = AZStd::atan2(orientation.GetElement(2, 1), orientation.GetElement(2, 2)); - y = AZStd::asin(-orientation.GetElement(2, 0)); - z = AZStd::atan2(orientation.GetElement(1, 0), orientation.GetElement(0, 0)); + x = AZStd::asin(orientation.GetElement(2, 1)); + y = AZStd::atan2(-orientation.GetElement(2, 0), orientation.GetElement(2, 2)); + z = AZStd::atan2(-orientation.GetElement(0, 1), orientation.GetElement(1, 1)); } else { - x = 0.0f; - y = AZ::Constants::Pi * 0.5f; - z = -AZStd::atan2(-orientation.GetElement(2, 1), orientation.GetElement(1, 1)); + x = -AZ::Constants::Pi * 0.5f; + y = 0.0f; + z = -AZStd::atan2(orientation.GetElement(0, 2), orientation.GetElement(0, 0)); } } else { - x = 0.0f; - y = -AZ::Constants::Pi * 0.5f; - z = AZStd::atan2(-orientation.GetElement(1, 2), orientation.GetElement(1, 1)); + x = AZ::Constants::Pi * 0.5f; + y = 0.0f; + z = AZStd::atan2(orientation.GetElement(0, 2), orientation.GetElement(0, 0)); } return { x, y, z }; @@ -122,14 +122,36 @@ namespace AzFramework void UpdateCameraFromTransform(Camera& camera, const AZ::Transform& transform) { - const auto eulerAngles = AzFramework::EulerAngles(AZ::Matrix3x3::CreateFromTransform(transform)); + UpdateCameraFromTranslationAndRotation( + camera, transform.GetTranslation(), AzFramework::EulerAngles(AZ::Matrix3x3::CreateFromTransform(transform))); + } + void UpdateCameraFromTranslationAndRotation(Camera& camera, const AZ::Vector3& translation, const AZ::Vector3& eulerAngles) + { camera.m_pitch = eulerAngles.GetX(); camera.m_yaw = eulerAngles.GetZ(); - camera.m_pivot = transform.GetTranslation(); + camera.m_pivot = translation; camera.m_offset = AZ::Vector3::CreateZero(); } + float SmoothValueTime(const float smoothness, float deltaTime) + { + // note: the math for the lerp smoothing implementation for camera rotation and translation was inspired by this excellent + // article by Scott Lembcke: https://www.gamasutra.com/blogs/ScottLembcke/20180404/316046/Improved_Lerp_Smoothing.php + const float rate = AZStd::exp2(smoothness); + return AZStd::exp2(-rate * deltaTime); + } + + float SmoothValue(const float target, const float current, const float time) + { + return AZ::Lerp(target, current, time); + } + + float SmoothValue(const float target, const float current, const float smoothness, const float deltaTime) + { + return SmoothValue(target, current, SmoothValueTime(smoothness, deltaTime)); + } + bool CameraSystem::HandleEvents(const InputEvent& event) { if (const auto& cursor = AZStd::get_if(&event)) @@ -749,14 +771,11 @@ namespace AzFramework } Camera camera; - // note: the math for the lerp smoothing implementation for camera rotation and translation was inspired by this excellent - // article by Scott Lembcke: https://www.gamasutra.com/blogs/ScottLembcke/20180404/316046/Improved_Lerp_Smoothing.php if (cameraProps.m_rotateSmoothingEnabledFn()) { - const float lookRate = AZStd::exp2(cameraProps.m_rotateSmoothnessFn()); - const float lookTime = AZStd::exp2(-lookRate * deltaTime); - camera.m_pitch = AZ::Lerp(targetCamera.m_pitch, currentCamera.m_pitch, lookTime); - camera.m_yaw = AZ::Lerp(targetYaw, currentYaw, lookTime); + const float lookTime = SmoothValueTime(cameraProps.m_rotateSmoothnessFn(), deltaTime); + camera.m_pitch = SmoothValue(targetCamera.m_pitch, currentCamera.m_pitch, lookTime); + camera.m_yaw = SmoothValue(targetYaw, currentYaw, lookTime); } else { @@ -766,8 +785,7 @@ namespace AzFramework if (cameraProps.m_translateSmoothingEnabledFn()) { - const float moveRate = AZStd::exp2(cameraProps.m_translateSmoothnessFn()); - const float moveTime = AZStd::exp2(-moveRate * deltaTime); + const float moveTime = SmoothValueTime(cameraProps.m_rotateSmoothnessFn(), deltaTime); camera.m_pivot = targetCamera.m_pivot.Lerp(currentCamera.m_pivot, moveTime); camera.m_offset = targetCamera.m_offset.Lerp(currentCamera.m_offset, moveTime); } diff --git a/Code/Framework/AzFramework/AzFramework/Viewport/CameraInput.h b/Code/Framework/AzFramework/AzFramework/Viewport/CameraInput.h index 2d02bb0b6d..ad9fed0f5d 100644 --- a/Code/Framework/AzFramework/AzFramework/Viewport/CameraInput.h +++ b/Code/Framework/AzFramework/AzFramework/Viewport/CameraInput.h @@ -85,6 +85,19 @@ namespace AzFramework //! Extracts Euler angles (orientation) and translation from the transform and writes the values to the camera. void UpdateCameraFromTransform(Camera& camera, const AZ::Transform& transform); + //! Writes the translation value and Euler angles to the camera. + void UpdateCameraFromTranslationAndRotation(Camera& camera, const AZ::Vector3& translation, const AZ::Vector3& eulerAngles); + + //! Returns the time ('t') input value to use with SmoothValue. + //! Useful if it is to be reused for multiple calls to SmoothValue. + float SmoothValueTime(float smoothness, float deltaTime); + + // Smoothly interpolate a value from current to target according to a smoothing parameter. + float SmoothValue(float target, float current, float smoothness, float deltaTime); + + // Overload of SmoothValue that takes time ('t') value directly. + float SmoothValue(float target, float current, float time); + //! Generic motion type. template struct MotionEvent diff --git a/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Viewport/ModularViewportCameraController.h b/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Viewport/ModularViewportCameraController.h index 1200cb3d79..65eff30874 100644 --- a/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Viewport/ModularViewportCameraController.h +++ b/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Viewport/ModularViewportCameraController.h @@ -113,14 +113,14 @@ namespace AtomToolsFramework // ModularViewportCameraControllerRequestBus overrides ... void InterpolateToTransform(const AZ::Transform& worldFromLocal) override; - AZ::Transform GetReferenceFrame() const override; - void SetReferenceFrame(const AZ::Transform& worldFromLocal) override; - void ClearReferenceFrame() override; + void StartTrackingTransform(const AZ::Transform& worldFromLocal) override; + void StopTrackingTransform() override; + bool IsTrackingTransform() const override; private: - //! Update the reference frame after a change has been made to the camera - //! view without updating the internal camera via user input. - void RefreshReferenceFrame(); + //! Combine the current camera transform with any potential roll from the tracked + //! transform (this is usually zero). + AZ::Transform CombinedCameraTransform() const; //! The current mode the camera controller is in. enum class CameraMode @@ -141,21 +141,21 @@ namespace AtomToolsFramework AzFramework::Camera m_camera; //!< The current camera state (pitch/yaw/position/look-distance). AzFramework::Camera m_targetCamera; //!< The target (next) camera state that m_camera is catching up to. AzFramework::Camera m_previousCamera; //!< The state of the camera from the previous frame. - AZStd::optional m_storedCamera; //!< A potentially stored camera for when a custom reference frame is set. + AZStd::optional m_storedCamera; //!< A potentially stored camera for when a transform is being tracked. AzFramework::CameraSystem m_cameraSystem; //!< The camera system responsible for managing all CameraInputs. AzFramework::CameraProps m_cameraProps; //!< Camera properties to control rotate and translate smoothness. CameraControllerPriorityFn m_priorityFn; //!< Controls at what priority the camera controller should respond to events. CameraAnimation m_cameraAnimation; //!< Camera animation state (used during CameraMode::Animation). CameraMode m_cameraMode = CameraMode::Control; //!< The current mode the camera is operating in. - //! An additional reference frame the camera can operate in (identity has no effect). - AZ::Transform m_referenceFrameOverride = AZ::Transform::CreateIdentity(); - //! Flag to prevent circular updates of the camera transform (while the viewport transform is being updated internally). - bool m_updatingTransformInternally = false; + float m_roll = 0.0f; //!< The current amount of roll to be applied to the camera. + float m_targetRoll = 0.0f; //!< The target amount of roll to be applied to the camera (current will move towards this). //! Listen for camera view changes outside of the camera controller. AZ::RPI::ViewportContext::MatrixChangedEvent::Handler m_cameraViewMatrixChangeHandler; //! The current instance of the modular camera viewport context. AZStd::unique_ptr m_modularCameraViewportContext; + //! Flag to prevent circular updates of the camera transform (while the viewport transform is being updated internally). + bool m_updatingTransformInternally = false; }; //! Placeholder implementation for ModularCameraViewportContext (useful for verifying the interface). diff --git a/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Viewport/ModularViewportCameraControllerRequestBus.h b/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Viewport/ModularViewportCameraControllerRequestBus.h index ab397692e4..59c13bb4b8 100644 --- a/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Viewport/ModularViewportCameraControllerRequestBus.h +++ b/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Viewport/ModularViewportCameraControllerRequestBus.h @@ -31,15 +31,16 @@ namespace AtomToolsFramework //! @param worldFromLocal The transform of where the camera should end up. virtual void InterpolateToTransform(const AZ::Transform& worldFromLocal) = 0; - //! Return the current reference frame. - //! @note If a reference frame has not been set or a frame has been cleared, this is just the identity. - virtual AZ::Transform GetReferenceFrame() const = 0; + //! Start tracking a transform. + //! Store the current camera transform and move to the next camera transform. + virtual void StartTrackingTransform(const AZ::Transform& worldFromLocal) = 0; - //! Set a new reference frame other than the identity for the camera controller. - virtual void SetReferenceFrame(const AZ::Transform& worldFromLocal) = 0; + //! Stop tracking the set transform. + //! The previously stored camera transform is restored. + virtual void StopTrackingTransform() = 0; - //! Clear the current reference frame to restore the identity. - virtual void ClearReferenceFrame() = 0; + //! Return if the tracking transform is set. + virtual bool IsTrackingTransform() const = 0; protected: ~ModularViewportCameraControllerRequests() = default; diff --git a/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Viewport/ModularViewportCameraController.cpp b/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Viewport/ModularViewportCameraController.cpp index a92bfdbcdb..e8aca16826 100644 --- a/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Viewport/ModularViewportCameraController.cpp +++ b/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Viewport/ModularViewportCameraController.cpp @@ -12,6 +12,7 @@ #include #include #include +#include #include #include #include @@ -175,16 +176,12 @@ namespace AtomToolsFramework // ignore these updates if the camera is being updated internally if (!m_updatingTransformInternally) { - if (m_storedCamera.has_value()) - { - // if an external change occurs ensure we update the stored reference frame if one is set - RefreshReferenceFrame(); - return; - } - m_previousCamera = m_targetCamera; - UpdateCameraFromTransform(m_targetCamera, m_modularCameraViewportContext->GetCameraTransform()); - m_camera = m_targetCamera; + + const AZ::Transform transform = m_modularCameraViewportContext->GetCameraTransform(); + const AZ::Vector3 eulerAngles = AzFramework::EulerAngles(AZ::Matrix3x3::CreateFromTransform(transform)); + UpdateCameraFromTranslationAndRotation(m_targetCamera, transform.GetTranslation(), eulerAngles); + m_targetRoll = eulerAngles.GetY(); } }; @@ -227,7 +224,9 @@ namespace AtomToolsFramework { m_targetCamera = m_cameraSystem.StepCamera(m_targetCamera, event.m_deltaTime.count()); m_camera = AzFramework::SmoothCamera(m_camera, m_targetCamera, m_cameraProps, event.m_deltaTime.count()); - m_modularCameraViewportContext->SetCameraTransform(m_referenceFrameOverride * m_camera.Transform()); + m_roll = AzFramework::SmoothValue(m_targetRoll, m_roll, m_cameraProps.m_rotateSmoothnessFn(), event.m_deltaTime.count()); + + m_modularCameraViewportContext->SetCameraTransform(CombinedCameraTransform()); } else if (m_cameraMode == CameraMode::Animation) { @@ -250,6 +249,7 @@ namespace AtomToolsFramework m_camera.m_yaw = eulerAngles.GetZ(); m_camera.m_pivot = current.GetTranslation(); m_camera.m_offset = AZ::Vector3::CreateZero(); + m_targetRoll = eulerAngles.GetY(); m_targetCamera = m_camera; m_modularCameraViewportContext->SetCameraTransform(current); @@ -257,7 +257,6 @@ namespace AtomToolsFramework if (animationTime >= 1.0f) { m_cameraMode = CameraMode::Control; - RefreshReferenceFrame(); } } @@ -267,45 +266,38 @@ namespace AtomToolsFramework void ModularViewportCameraControllerInstance::InterpolateToTransform(const AZ::Transform& worldFromLocal) { m_cameraMode = CameraMode::Animation; - m_cameraAnimation = CameraAnimation{ m_referenceFrameOverride * m_camera.Transform(), worldFromLocal, 0.0f }; + m_cameraAnimation = CameraAnimation{ CombinedCameraTransform(), worldFromLocal, 0.0f }; } - AZ::Transform ModularViewportCameraControllerInstance::GetReferenceFrame() const - { - return m_referenceFrameOverride; - } - - void ModularViewportCameraControllerInstance::SetReferenceFrame(const AZ::Transform& worldFromLocal) + void ModularViewportCameraControllerInstance::StartTrackingTransform(const AZ::Transform& worldFromLocal) { if (!m_storedCamera.has_value()) { m_storedCamera = m_previousCamera; } - m_referenceFrameOverride = worldFromLocal; - m_targetCamera.m_pitch = 0.0f; - m_targetCamera.m_yaw = 0.0f; + const auto angles = AzFramework::EulerAngles(AZ::Matrix3x3::CreateFromQuaternion(worldFromLocal.GetRotation())); + m_targetCamera.m_pitch = angles.GetX(); + m_targetCamera.m_yaw = angles.GetZ(); m_targetCamera.m_offset = AZ::Vector3::CreateZero(); - m_targetCamera.m_pivot = AZ::Vector3::CreateZero(); - m_camera = m_targetCamera; + m_targetCamera.m_pivot = worldFromLocal.GetTranslation(); + m_targetRoll = angles.GetY(); } - void ModularViewportCameraControllerInstance::ClearReferenceFrame() + void ModularViewportCameraControllerInstance::StopTrackingTransform() { - m_referenceFrameOverride = AZ::Transform::CreateIdentity(); - if (m_storedCamera.has_value()) { m_targetCamera = m_storedCamera.value(); - m_camera = m_targetCamera; + m_targetRoll = 0.0f; } m_storedCamera.reset(); } - void ModularViewportCameraControllerInstance::RefreshReferenceFrame() + bool ModularViewportCameraControllerInstance::IsTrackingTransform() const { - m_referenceFrameOverride = m_modularCameraViewportContext->GetCameraTransform() * m_camera.Transform().GetInverse(); + return m_storedCamera.has_value(); } AZ::Transform PlaceholderModularCameraViewportContextImpl::GetCameraTransform() const @@ -324,4 +316,9 @@ namespace AtomToolsFramework { handler.Connect(m_viewMatrixChangedEvent); } + + AZ::Transform ModularViewportCameraControllerInstance::CombinedCameraTransform() const + { + return m_camera.Transform() * AZ::Transform::CreateFromMatrix3x3(AZ::Matrix3x3::CreateRotationY(m_targetRoll)); + } } // namespace AtomToolsFramework From 9f9aa8f2a69d2adacee58a575be24ae5bb58c69c Mon Sep 17 00:00:00 2001 From: Chris Burel Date: Wed, 17 Nov 2021 07:34:56 -0800 Subject: [PATCH 079/345] [Linux] Avoid duplicating inotify watches in forked AssetBuilder processes (#5683) The AssetProcessor on Linux uses `inotify` to monitor for file updates. The AssetProcessor also uses a `ProcessWatcher` to launch child AssetBuilder processes. `ProcessWatcher` accomplishes this by calling `fork()`, which duplicates the current process, then calling `exec()`. The `fork()` call also appears to duplicate any inotify fds. This results in the subprocess consuming duplicate inotify watches, which is a limited system resource (Ubunut 20 defaults `/proc/sys/fs/inotify/max_user_watches` to 65536). The AssetProcessor still has issues with this max, but this should free up at least half of the uses. Signed-off-by: Chris Burel --- .../Platform/Linux/native/FileWatcher/FileWatcher_linux.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Code/Tools/AssetProcessor/Platform/Linux/native/FileWatcher/FileWatcher_linux.cpp b/Code/Tools/AssetProcessor/Platform/Linux/native/FileWatcher/FileWatcher_linux.cpp index 2d3e671999..b7f7affd6d 100644 --- a/Code/Tools/AssetProcessor/Platform/Linux/native/FileWatcher/FileWatcher_linux.cpp +++ b/Code/Tools/AssetProcessor/Platform/Linux/native/FileWatcher/FileWatcher_linux.cpp @@ -32,7 +32,8 @@ struct FolderRootWatch::PlatformImplementation { if (m_iNotifyHandle < 0) { - m_iNotifyHandle = inotify_init(); + // The CLOEXEC flag prevents the inotify watchers from copying on fork/exec + m_iNotifyHandle = inotify_init1(IN_CLOEXEC); } return (m_iNotifyHandle >= 0); } From ce86aa59d78ac1cf0682f3515f1f0bffdffab255 Mon Sep 17 00:00:00 2001 From: lsemp3d <58790905+lsemp3d@users.noreply.github.com> Date: Wed, 17 Nov 2021 07:45:40 -0800 Subject: [PATCH 080/345] Updated animation node names Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com> --- .../AttachmentComponentNotificationBus.names | 14 +- .../SequenceComponentNotificationBus.names | 33 +- .../AnimGraphComponentNetworkRequestBus.names | 39 ++- .../AnimGraphComponentRequestBus.names | 326 +++++++++--------- .../AttachmentComponentRequestBus.names | 28 +- .../Senders/SequenceComponentRequestBus.names | 59 ++-- .../SimpleMotionComponentRequestBus.names | 84 ++--- 7 files changed, 297 insertions(+), 286 deletions(-) diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/AttachmentComponentNotificationBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/AttachmentComponentNotificationBus.names index 4ce39f83cb..64f2f4c204 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/AttachmentComponentNotificationBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/AttachmentComponentNotificationBus.names @@ -12,15 +12,14 @@ { "key": "OnAttached", "details": { - "name": "On Attached", - "tooltip": "Notifies when the entity is attached" + "name": "On Attached" }, "params": [ { "typeid": "{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}", "details": { - "name": "Target", - "tooltip": "ID of the target being attached to" + "name": "Entity Id", + "tooltip": "Entity Unique Id" } } ] @@ -28,15 +27,14 @@ { "key": "OnDetached", "details": { - "name": "On Detached", - "tooltip": "Notifies when the entity is detached" + "name": "On Detached" }, "params": [ { "typeid": "{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}", "details": { - "name": "Target", - "tooltip": "ID of the target being detached from" + "name": "Entity Id", + "tooltip": "Entity Unique Id" } } ] diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/SequenceComponentNotificationBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/SequenceComponentNotificationBus.names index 2de5b0e2f1..cadb4ef7f1 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/SequenceComponentNotificationBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/SequenceComponentNotificationBus.names @@ -12,13 +12,14 @@ { "key": "OnStart", "details": { - "name": "On Start" + "name": "On Start", + "tooltip": "Called when Sequence starts" }, "params": [ { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", "details": { - "name": "float" + "name": "Start Time" } } ] @@ -26,13 +27,14 @@ { "key": "OnStop", "details": { - "name": "On Stop" + "name": "On Stop", + "tooltip": "Called when Sequence stops" }, "params": [ { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", "details": { - "name": "float" + "name": "Stop Time" } } ] @@ -40,25 +42,28 @@ { "key": "OnPause", "details": { - "name": "On Pause" + "name": "On Pause", + "tooltip": "Called when Sequence pauses" } }, { "key": "OnResume", "details": { - "name": "On Resume" + "name": "On Resume", + "tooltip": "Called when Sequence resumes" } }, { "key": "OnAbort", "details": { - "name": "On Abort" + "name": "On Abort", + "tooltip": "Called when Sequence is aborted" }, "params": [ { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", "details": { - "name": "float" + "name": "Abort Time" } } ] @@ -66,13 +71,14 @@ { "key": "OnUpdate", "details": { - "name": "On Update" + "name": "On Update", + "tooltip": "Called when Sequence is updated. That is, when the current play time changes, or the playback speed changes" }, "params": [ { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", "details": { - "name": "float" + "name": "Update Time" } } ] @@ -80,19 +86,20 @@ { "key": "OnTrackEventTriggered", "details": { - "name": "On Track Event Triggered" + "name": "On Track Event Triggered", + "tooltip": "Called when Sequence Event is triggered" }, "params": [ { "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", "details": { - "name": "char" + "name": "Event Name" } }, { "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", "details": { - "name": "char" + "name": "Event Value" } } ] diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AnimGraphComponentNetworkRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AnimGraphComponentNetworkRequestBus.names index 59c14412b9..177eded8e5 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AnimGraphComponentNetworkRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AnimGraphComponentNetworkRequestBus.names @@ -5,27 +5,28 @@ "context": "EBusSender", "variant": "", "details": { - "name": "AnimGraphComponentNetworkRequestBus" + "name": "Anim Graph", + "category": "Animation" }, "methods": [ { "key": "GetActiveStates", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetActiveStates" + "tooltip": "When signaled, this will invoke Get Active States" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetActiveStates is invoked" + "tooltip": "Signaled after Get Active States is invoked" }, "details": { - "name": "GetActiveStates" + "name": "Get Active States" }, "results": [ { "typeid": "{3349AACD-BE04-50BC-9478-528BF2ACFD55}", "details": { - "name": "AZStd::vector" + "name": "Active States" } } ] @@ -34,20 +35,20 @@ "key": "CreateSnapshot", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke CreateSnapshot" + "tooltip": "When signaled, this will invoke Create Snapshot" }, "exit": { "name": "Out", - "tooltip": "Signaled after CreateSnapshot is invoked" + "tooltip": "Signaled after Create Snapshot is invoked" }, "details": { - "name": "CreateSnapshot" + "name": "Create Snapshot" }, "params": [ { "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", "details": { - "name": "bool" + "name": "Is Authoritative" } } ] @@ -63,13 +64,13 @@ "tooltip": "Signaled after SetActiveStates is invoked" }, "details": { - "name": "SetActiveStates" + "name": "Set Active States" }, "params": [ { "typeid": "{3349AACD-BE04-50BC-9478-528BF2ACFD55}", "details": { - "name": "AZStd::vector" + "name": "Active States" } } ] @@ -78,20 +79,20 @@ "key": "IsAssetReady", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke IsAssetReady" + "tooltip": "When signaled, this will invoke Is Asset Ready" }, "exit": { "name": "Out", - "tooltip": "Signaled after IsAssetReady is invoked" + "tooltip": "Signaled after Is Asset Ready is invoked" }, "details": { - "name": "IsAssetReady" + "name": "Is Asset Ready" }, "results": [ { "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", "details": { - "name": "bool" + "name": "Is Asset Ready" } } ] @@ -100,20 +101,20 @@ "key": "HasSnapshot", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke HasSnapshot" + "tooltip": "When signaled, this will invoke Has Snapshot" }, "exit": { "name": "Out", - "tooltip": "Signaled after HasSnapshot is invoked" + "tooltip": "Signaled after Has Snapshot is invoked" }, "details": { - "name": "HasSnapshot" + "name": "Has Snapshot" }, "results": [ { "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", "details": { - "name": "bool" + "name": "Has Snapshot" } } ] diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AnimGraphComponentRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AnimGraphComponentRequestBus.names index d6b9adb914..7e0ea4f5fa 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AnimGraphComponentRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AnimGraphComponentRequestBus.names @@ -5,7 +5,7 @@ "context": "EBusSender", "variant": "", "details": { - "name": "AnimGraphComponentRequestBus", + "name": "Anim Graph", "category": "Animation" }, "methods": [ @@ -13,20 +13,20 @@ "key": "GetVisualizeEnabled", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetVisualizeEnabled" + "tooltip": "When signaled, this will invoke Get Visualize Enabled" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetVisualizeEnabled is invoked" + "tooltip": "Signaled after Get Visualize Enabled is invoked" }, "details": { - "name": "GetVisualizeEnabled" + "name": "Get Visualize Enabled" }, "results": [ { "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", "details": { - "name": "bool" + "name": "Enabled" } } ] @@ -35,20 +35,20 @@ "key": "SetNamedParameterRotation", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetNamedParameterRotation" + "tooltip": "When signaled, this will invoke Set Named Parameter Rotation" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetNamedParameterRotation is invoked" + "tooltip": "Signaled after Set Named Parameter Rotation is invoked" }, "details": { - "name": "SetNamedParameterRotation" + "name": "Set Named Parameter Rotation" }, "params": [ { "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", "details": { - "name": "char" + "name": "Name" } }, { @@ -63,26 +63,26 @@ "key": "SetParameterString", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetParameterString" + "tooltip": "When signaled, this will invoke Set Parameter String" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetParameterString is invoked" + "tooltip": "Signaled after Set Parameter String is invoked" }, "details": { - "name": "SetParameterString" + "name": "Set Parameter String" }, "params": [ { "typeid": "{D6597933-47CD-4FC8-B911-63F3E2B0993A}", "details": { - "name": "AZ::u64" + "name": "Index" } }, { "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", "details": { - "name": "char" + "name": "Value" } } ] @@ -91,20 +91,20 @@ "key": "GetNamedParameterString", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetNamedParameterString" + "tooltip": "When signaled, this will invoke Get Named Parameter String" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetNamedParameterString is invoked" + "tooltip": "Signaled after Get Named Parameter String is invoked" }, "details": { - "name": "GetNamedParameterString" + "name": "Get Named Parameter String" }, "params": [ { "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", "details": { - "name": "char" + "name": "Parameter Name" } } ], @@ -112,7 +112,7 @@ { "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", "details": { - "name": "AZStd::string" + "name": "Value" } } ] @@ -121,20 +121,20 @@ "key": "GetNamedParameterVector2", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetNamedParameterVector2" + "tooltip": "When signaled, this will invoke Get Named Parameter Vector2" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetNamedParameterVector2 is invoked" + "tooltip": "Signaled after Get Named Parameter Vector2 is invoked" }, "details": { - "name": "GetNamedParameterVector2" + "name": "Get Named Parameter Vector2" }, "params": [ { "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", "details": { - "name": "char" + "name": "Parameter Name" } } ], @@ -142,7 +142,7 @@ { "typeid": "{3D80F623-C85C-4741-90D0-E4E66164E6BF}", "details": { - "name": "Vector2" + "name": "Value" } } ] @@ -151,20 +151,20 @@ "key": "GetParameterFloat", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetParameterFloat" + "tooltip": "When signaled, this will invoke Get Parameter Float" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetParameterFloat is invoked" + "tooltip": "Signaled after Get Parameter Float is invoked" }, "details": { - "name": "GetParameterFloat" + "name": "Get Parameter Float" }, "params": [ { "typeid": "{D6597933-47CD-4FC8-B911-63F3E2B0993A}", "details": { - "name": "AZ::u64" + "name": "Parameter Index" } } ], @@ -172,7 +172,7 @@ { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", "details": { - "name": "float" + "name": "Value" } } ] @@ -181,20 +181,20 @@ "key": "SetParameterRotation", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetParameterRotation" + "tooltip": "When signaled, this will invoke Set Parameter Rotation" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetParameterRotation is invoked" + "tooltip": "Signaled after Set Parameter Rotation is invoked" }, "details": { - "name": "SetParameterRotation" + "name": "Set Parameter Rotation" }, "params": [ { "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", "details": { - "name": "char" + "name": "Parameter Name" } }, { @@ -209,20 +209,20 @@ "key": "GetNamedParameterFloat", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetNamedParameterFloat" + "tooltip": "When signaled, this will invoke Get Named Parameter Float" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetNamedParameterFloat is invoked" + "tooltip": "Signaled after Get Named Parameter Float is invoked" }, "details": { - "name": "GetNamedParameterFloat" + "name": "Get Named Parameter Float" }, "params": [ { "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", "details": { - "name": "char" + "name": "Parameter Name" } } ], @@ -230,7 +230,7 @@ { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", "details": { - "name": "float" + "name": "Value" } } ] @@ -239,26 +239,26 @@ "key": "SetParameterBool", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetParameterBool" + "tooltip": "When signaled, this will invoke Set Parameter Bool" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetParameterBool is invoked" + "tooltip": "Signaled after Set Parameter Bool is invoked" }, "details": { - "name": "SetParameterBool" + "name": "Set Parameter Bool" }, "params": [ { "typeid": "{D6597933-47CD-4FC8-B911-63F3E2B0993A}", "details": { - "name": "AZ::u64" + "name": "Parameter Index" } }, { "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", "details": { - "name": "bool" + "name": "Value" } } ] @@ -267,20 +267,20 @@ "key": "FindParameterName", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke FindParameterName" + "tooltip": "When signaled, this will invoke Find Parameter Name" }, "exit": { "name": "Out", - "tooltip": "Signaled after FindParameterName is invoked" + "tooltip": "Signaled after Find Parameter Name is invoked" }, "details": { - "name": "FindParameterName" + "name": "Find Parameter Name" }, "params": [ { "typeid": "{D6597933-47CD-4FC8-B911-63F3E2B0993A}", "details": { - "name": "AZ::u64" + "name": "Parameter Index" } } ], @@ -288,7 +288,7 @@ { "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", "details": { - "name": "char" + "name": "Name" } } ] @@ -297,20 +297,20 @@ "key": "GetNamedParameterBool", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetNamedParameterBool" + "tooltip": "When signaled, this will invoke Get Named Parameter Bool" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetNamedParameterBool is invoked" + "tooltip": "Signaled after Get Named Parameter Bool is invoked" }, "details": { - "name": "GetNamedParameterBool" + "name": "Get Named Parameter Bool" }, "params": [ { "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", "details": { - "name": "char" + "name": "Name" } } ], @@ -318,7 +318,7 @@ { "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", "details": { - "name": "bool" + "name": "Value" } } ] @@ -327,26 +327,26 @@ "key": "SetParameterFloat", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetParameterFloat" + "tooltip": "When signaled, this will invoke Set Parameter Float" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetParameterFloat is invoked" + "tooltip": "Signaled after Set Parameter Float is invoked" }, "details": { - "name": "SetParameterFloat" + "name": "Set Parameter Float" }, "params": [ { "typeid": "{D6597933-47CD-4FC8-B911-63F3E2B0993A}", "details": { - "name": "AZ::u64" + "name": "Parameter Index" } }, { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", "details": { - "name": "float" + "name": "Value" } } ] @@ -355,20 +355,20 @@ "key": "GetParameterVector2", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetParameterVector2" + "tooltip": "When signaled, this will invoke Get Parameter Vector2" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetParameterVector2 is invoked" + "tooltip": "Signaled after Get Parameter Vector2 is invoked" }, "details": { - "name": "GetParameterVector2" + "name": "Get Parameter Vector2" }, "params": [ { "typeid": "{D6597933-47CD-4FC8-B911-63F3E2B0993A}", "details": { - "name": "AZ::u64" + "name": "Parameter Index" } } ], @@ -376,7 +376,7 @@ { "typeid": "{3D80F623-C85C-4741-90D0-E4E66164E6BF}", "details": { - "name": "Vector2" + "name": "Value" } } ] @@ -385,20 +385,20 @@ "key": "GetParameterBool", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetParameterBool" + "tooltip": "When signaled, this will invoke Get Parameter Bool" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetParameterBool is invoked" + "tooltip": "Signaled after Get Parameter Bool is invoked" }, "details": { - "name": "GetParameterBool" + "name": "Get Parameter Bool" }, "params": [ { "typeid": "{D6597933-47CD-4FC8-B911-63F3E2B0993A}", "details": { - "name": "AZ::u64" + "name": "Parameter Index" } } ], @@ -406,7 +406,7 @@ { "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", "details": { - "name": "bool" + "name": "Value" } } ] @@ -415,26 +415,26 @@ "key": "SetNamedParameterVector3", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetNamedParameterVector3" + "tooltip": "When signaled, this will invoke Set Named Parameter Vector3" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetNamedParameterVector3 is invoked" + "tooltip": "Signaled after Set Named Parameter Vector3 is invoked" }, "details": { - "name": "SetNamedParameterVector3" + "name": "Set Named Parameter Vector3" }, "params": [ { "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", "details": { - "name": "char" + "name": "Name" } }, { "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}", "details": { - "name": "Vector3" + "name": "Value" } } ] @@ -443,20 +443,20 @@ "key": "FindParameterIndex", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke FindParameterIndex" + "tooltip": "When signaled, this will invoke Find Parameter Index" }, "exit": { "name": "Out", - "tooltip": "Signaled after FindParameterIndex is invoked" + "tooltip": "Signaled after Find Parameter Index is invoked" }, "details": { - "name": "FindParameterIndex" + "name": "Find Parameter Index" }, "params": [ { "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", "details": { - "name": "char" + "name": "Name" } } ], @@ -464,7 +464,7 @@ { "typeid": "{D6597933-47CD-4FC8-B911-63F3E2B0993A}", "details": { - "name": "AZ::u64" + "name": "Parameter Index" } } ] @@ -473,26 +473,26 @@ "key": "SetNamedParameterString", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetNamedParameterString" + "tooltip": "When signaled, this will invoke Set Named Parameter String" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetNamedParameterString is invoked" + "tooltip": "Signaled after Set Named Parameter String is invoked" }, "details": { - "name": "SetNamedParameterString" + "name": "Set Named Parameter String" }, "params": [ { "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", "details": { - "name": "char" + "name": "Name" } }, { "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", "details": { - "name": "char" + "name": "Value" } } ] @@ -501,26 +501,26 @@ "key": "SetParameterVector3", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetParameterVector3" + "tooltip": "When signaled, this will invoke Set Parameter Vector3" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetParameterVector3 is invoked" + "tooltip": "Signaled after Set Parameter Vector3 is invoked" }, "details": { - "name": "SetParameterVector3" + "name": "Set Parameter Vector3" }, "params": [ { "typeid": "{D6597933-47CD-4FC8-B911-63F3E2B0993A}", "details": { - "name": "AZ::u64" + "name": "Parameter Index" } }, { "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}", "details": { - "name": "Vector3" + "name": "Value" } } ] @@ -529,20 +529,20 @@ "key": "GetParameterVector3", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetParameterVector3" + "tooltip": "When signaled, this will invoke Get Parameter Vector3" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetParameterVector3 is invoked" + "tooltip": "Signaled after Get Parameter Vector3 is invoked" }, "details": { - "name": "GetParameterVector3" + "name": "Get Parameter Vector3" }, "params": [ { "typeid": "{D6597933-47CD-4FC8-B911-63F3E2B0993A}", "details": { - "name": "AZ::u64" + "name": "Parameter Index" } } ], @@ -550,7 +550,7 @@ { "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}", "details": { - "name": "Vector3" + "name": "Value" } } ] @@ -559,20 +559,20 @@ "key": "SyncAnimGraph", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SyncAnimGraph" + "tooltip": "When signaled, this will invoke Sync Anim Graph" }, "exit": { "name": "Out", - "tooltip": "Signaled after SyncAnimGraph is invoked" + "tooltip": "Signaled after Sync Anim Graph is invoked" }, "details": { - "name": "SyncAnimGraph" + "name": "Sync Anim Graph" }, "params": [ { "typeid": "{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}", "details": { - "name": "EntityId", + "name": "Entity Id", "tooltip": "Entity Unique Id" } } @@ -582,26 +582,26 @@ "key": "SetParameterRotationEuler", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetParameterRotationEuler" + "tooltip": "When signaled, this will invoke Set Parameter Rotation Euler" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetParameterRotationEuler is invoked" + "tooltip": "Signaled after Set Parameter Rotation Euler is invoked" }, "details": { - "name": "SetParameterRotationEuler" + "name": "Set Parameter Rotation Euler" }, "params": [ { "typeid": "{D6597933-47CD-4FC8-B911-63F3E2B0993A}", "details": { - "name": "AZ::u64" + "name": "Parameter Index" } }, { "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}", "details": { - "name": "Vector3" + "name": "Angles (Radians)" } } ] @@ -610,20 +610,20 @@ "key": "GetParameterRotationEuler", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetParameterRotationEuler" + "tooltip": "When signaled, this will invoke Get Parameter Rotation Euler" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetParameterRotationEuler is invoked" + "tooltip": "Signaled after Get Parameter Rotation Euler is invoked" }, "details": { - "name": "GetParameterRotationEuler" + "name": "Get Parameter Rotation Euler" }, "params": [ { "typeid": "{D6597933-47CD-4FC8-B911-63F3E2B0993A}", "details": { - "name": "AZ::u64" + "name": "Parameter Index" } } ], @@ -631,7 +631,7 @@ { "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}", "details": { - "name": "Vector3" + "name": "Angles (Radians)" } } ] @@ -640,20 +640,20 @@ "key": "GetParameterRotation", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetParameterRotation" + "tooltip": "When signaled, this will invoke Get Parameter Rotation" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetParameterRotation is invoked" + "tooltip": "Signaled after Get Parameter Rotation is invoked" }, "details": { - "name": "GetParameterRotation" + "name": "Get Parameter Rotation" }, "params": [ { "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", "details": { - "name": "char" + "name": "Parameter Name" } } ], @@ -670,20 +670,20 @@ "key": "GetNamedParameterRotationEuler", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetNamedParameterRotationEuler" + "tooltip": "When signaled, this will invoke Get Named Parameter Rotation Euler" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetNamedParameterRotationEuler is invoked" + "tooltip": "Signaled after Get Named Parameter Rotation Euler is invoked" }, "details": { - "name": "GetNamedParameterRotationEuler" + "name": "Get Named Parameter Rotation Euler" }, "params": [ { "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", "details": { - "name": "char" + "name": "Name" } } ], @@ -691,7 +691,7 @@ { "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}", "details": { - "name": "Vector3" + "name": "Angles (Radians)" } } ] @@ -700,20 +700,20 @@ "key": "DesyncAnimGraph", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke DesyncAnimGraph" + "tooltip": "When signaled, this will invoke Desync Anim Graph" }, "exit": { "name": "Out", - "tooltip": "Signaled after DesyncAnimGraph is invoked" + "tooltip": "Signaled after Desync Anim Graph is invoked" }, "details": { - "name": "DesyncAnimGraph" + "name": "Desync Anim Graph" }, "params": [ { "typeid": "{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}", "details": { - "name": "EntityId", + "name": "Entity Id", "tooltip": "Entity Unique Id" } } @@ -723,26 +723,26 @@ "key": "SetNamedParameterRotationEuler", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetNamedParameterRotationEuler" + "tooltip": "When signaled, this will invoke Set Named Parameter Rotation Euler" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetNamedParameterRotationEuler is invoked" + "tooltip": "Signaled after Set Named Parameter Rotation Euler is invoked" }, "details": { - "name": "SetNamedParameterRotationEuler" + "name": "Set Named Parameter Rotation Euler" }, "params": [ { "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", "details": { - "name": "char" + "name": "Parameter Name" } }, { "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}", "details": { - "name": "Vector3" + "name": "Angles (Radians)" } } ] @@ -751,26 +751,26 @@ "key": "SetParameterVector2", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetParameterVector2" + "tooltip": "When signaled, this will invoke Set Parameter Vector2" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetParameterVector2 is invoked" + "tooltip": "Signaled after Set Parameter Vector2 is invoked" }, "details": { - "name": "SetParameterVector2" + "name": "Set Parameter Vector2" }, "params": [ { "typeid": "{D6597933-47CD-4FC8-B911-63F3E2B0993A}", "details": { - "name": "AZ::u64" + "name": "Parameter Index" } }, { "typeid": "{3D80F623-C85C-4741-90D0-E4E66164E6BF}", "details": { - "name": "Vector2" + "name": "Value" } } ] @@ -779,20 +779,20 @@ "key": "GetNamedParameterRotation", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetNamedParameterRotation" + "tooltip": "When signaled, this will invoke Get Named Parameter Rotation" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetNamedParameterRotation is invoked" + "tooltip": "Signaled after Get Named Parameter Rotation is invoked" }, "details": { - "name": "GetNamedParameterRotation" + "name": "Get Named Parameter Rotation" }, "params": [ { "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", "details": { - "name": "char" + "name": "Name" } } ], @@ -809,26 +809,26 @@ "key": "SetNamedParameterBool", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetNamedParameterBool" + "tooltip": "When signaled, this will invoke Set Named Parameter Bool" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetNamedParameterBool is invoked" + "tooltip": "Signaled after Set Named Parameter Bool is invoked" }, "details": { - "name": "SetNamedParameterBool" + "name": "Set Named Parameter Bool" }, "params": [ { "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", "details": { - "name": "char" + "name": "Name" } }, { "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", "details": { - "name": "bool" + "name": "Value" } } ] @@ -837,20 +837,20 @@ "key": "SetVisualizeEnabled", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetVisualizeEnabled" + "tooltip": "When signaled, this will invoke Set Visualize Enabled" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetVisualizeEnabled is invoked" + "tooltip": "Signaled after Set Visualize Enabled is invoked" }, "details": { - "name": "SetVisualizeEnabled" + "name": "Set Visualize Enabled" }, "params": [ { "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", "details": { - "name": "bool" + "name": "Value" } } ] @@ -859,26 +859,26 @@ "key": "SetNamedParameterFloat", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetNamedParameterFloat" + "tooltip": "When signaled, this will invoke Set Named Parameter Float" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetNamedParameterFloat is invoked" + "tooltip": "Signaled after Set Named Parameter Float is invoked" }, "details": { - "name": "SetNamedParameterFloat" + "name": "Set Named Parameter Float" }, "params": [ { "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", "details": { - "name": "char" + "name": "Name" } }, { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", "details": { - "name": "float" + "name": "Value" } } ] @@ -887,26 +887,26 @@ "key": "SetNamedParameterVector2", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetNamedParameterVector2" + "tooltip": "When signaled, this will invoke Set Named Parameter Vector2" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetNamedParameterVector2 is invoked" + "tooltip": "Signaled after Set Named Parameter Vector2 is invoked" }, "details": { - "name": "SetNamedParameterVector2" + "name": "Set Named Parameter Vector2" }, "params": [ { "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", "details": { - "name": "char" + "name": "Name" } }, { "typeid": "{3D80F623-C85C-4741-90D0-E4E66164E6BF}", "details": { - "name": "Vector2" + "name": "Value" } } ] @@ -915,20 +915,20 @@ "key": "GetNamedParameterVector3", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetNamedParameterVector3" + "tooltip": "When signaled, this will invoke Get Named Parameter Vector3" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetNamedParameterVector3 is invoked" + "tooltip": "Signaled after Get Named Parameter Vector3 is invoked" }, "details": { - "name": "GetNamedParameterVector3" + "name": "Get Named Parameter Vector3" }, "params": [ { "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", "details": { - "name": "char" + "name": "Name" } } ], @@ -936,7 +936,7 @@ { "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}", "details": { - "name": "Vector3" + "name": "Value" } } ] @@ -945,20 +945,20 @@ "key": "GetParameterString", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetParameterString" + "tooltip": "When signaled, this will invoke Get Parameter String" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetParameterString is invoked" + "tooltip": "Signaled after Get Parameter String is invoked" }, "details": { - "name": "GetParameterString" + "name": "Get Parameter String" }, "params": [ { "typeid": "{D6597933-47CD-4FC8-B911-63F3E2B0993A}", "details": { - "name": "AZ::u64" + "name": "Parameter Index" } } ], @@ -966,7 +966,7 @@ { "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", "details": { - "name": "AZStd::string" + "name": "Value" } } ] diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AttachmentComponentRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AttachmentComponentRequestBus.names index a6e09acaa9..416c0dfae3 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AttachmentComponentRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AttachmentComponentRequestBus.names @@ -5,7 +5,7 @@ "context": "EBusSender", "variant": "", "details": { - "name": "AttachmentComponentRequestBus", + "name": "Attachment", "category": "Animation" }, "methods": [ @@ -20,29 +20,26 @@ "tooltip": "Signaled after Attach is invoked" }, "details": { - "name": "Attach", - "tooltip": "Attaches the entity" + "name": "Attach" }, "params": [ { "typeid": "{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}", "details": { - "name": "Target", - "tooltip": "ID of entity to attach to" + "name": "Target Entity Id", + "tooltip": "The Entity to attach" } }, { "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", "details": { - "name": "Bone", - "tooltip": "Name of bone on entity to attach to. If bone is not found, then attach to target entity's transform origin" + "name": "Target Bone Name" } }, { "typeid": "{5D9958E9-9F1E-4985-B532-FFFDE75FEDFD}", "details": { - "name": "Offset", - "tooltip": "Attachment's offset from target" + "name": "Offset Transform" } } ] @@ -58,30 +55,27 @@ "tooltip": "Signaled after Detach is invoked" }, "details": { - "name": "Detach", - "tooltip": "Detaches the entity" + "name": "Detach" } }, { "key": "SetAttachmentOffset", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke Set Offset" + "tooltip": "When signaled, this will invoke SetAttachmentOffset" }, "exit": { "name": "Out", - "tooltip": "Signaled after Set Offset is invoked" + "tooltip": "Signaled after SetAttachmentOffset is invoked" }, "details": { - "name": "Set Offset", - "tooltip": "Sets the offset of the attachment" + "name": "Set Attachment Offset" }, "params": [ { "typeid": "{5D9958E9-9F1E-4985-B532-FFFDE75FEDFD}", "details": { - "name": "Offset", - "tooltip": "Attachment's offset from target" + "name": "Offset Transform" } } ] diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/SequenceComponentRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/SequenceComponentRequestBus.names index 975a3e146b..f51021f9b4 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/SequenceComponentRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/SequenceComponentRequestBus.names @@ -5,7 +5,7 @@ "context": "EBusSender", "variant": "", "details": { - "name": "SequenceComponentRequestBus", + "name": "Sequence", "category": "Animation" }, "methods": [ @@ -13,20 +13,21 @@ "key": "GetPlaySpeed", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke Get Play Speed" + "tooltip": "When signaled, this will invoke GetPlaySpeed" }, "exit": { "name": "Out", - "tooltip": "Signaled after Get Play Speed is invoked" + "tooltip": "Signaled after GetPlaySpeed is invoked" }, "details": { - "name": "Get Play Speed" + "name": "Get Play Speed", + "tooltip": "Returns the current play back speed as a multiplier (1.0 is normal speed, less is slower, more is faster)" }, "results": [ { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", "details": { - "name": "float" + "name": "Play Speed" } } ] @@ -42,13 +43,14 @@ "tooltip": "Signaled after Jump To Time is invoked" }, "details": { - "name": "Jump To Time" + "name": "Jump To Time", + "tooltip": "Move the Playhead to the given time" }, "params": [ { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", "details": { - "name": "float" + "name": "Time" } } ] @@ -64,7 +66,8 @@ "tooltip": "Signaled after Resume is invoked" }, "details": { - "name": "Resume" + "name": "Resume", + "tooltip": "Resume the sequence. Resume essentially 'unpauses' a sequence. It must have been playing before the pause for playback to start again" } }, { @@ -78,7 +81,8 @@ "tooltip": "Signaled after Jump To End is invoked" }, "details": { - "name": "Jump To End" + "name": "Jump To End", + "tooltip": "Move the Playhead to the end of the sequence" } }, { @@ -92,13 +96,14 @@ "tooltip": "Signaled after Get Current Play Time is invoked" }, "details": { - "name": "Get Current Play Time" + "name": "Get Current Play Time", + "tooltip": " Returns the current play time in seconds" }, "results": [ { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", "details": { - "name": "float" + "name": "Play Time" } } ] @@ -114,33 +119,35 @@ "tooltip": "Signaled after Pause is invoked" }, "details": { - "name": "Pause" + "name": "Pause", + "tooltip": "Pause the sequence. Sequence must be playing for pause to have an effect. Pausing leaves the play time at its current position" } }, { "key": "PlayBetweenTimes", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke Play Between Times" + "tooltip": "When signaled, this will invoke PlayBetweenTimes" }, "exit": { "name": "Out", - "tooltip": "Signaled after Play Between Times is invoked" + "tooltip": "Signaled after PlayBetweenTimes is invoked" }, "details": { - "name": "Play Between Times" + "name": "PlayBetweenTimes", + "tooltip": "Play sequence between the start to end times, outside of which the sequence behaves according to its 'Out of Range' time setting" }, "params": [ { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", "details": { - "name": "float" + "name": "Start Time" } }, { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", "details": { - "name": "float" + "name": "End Time" } } ] @@ -156,7 +163,8 @@ "tooltip": "Signaled after Stop is invoked" }, "details": { - "name": "Stop" + "name": "Stop", + "tooltip": "Pause the sequence. Sequence must be playing for pause to have an effect. Pausing leaves the play time at its current position" } }, { @@ -170,7 +178,8 @@ "tooltip": "Signaled after Jump To Beginning is invoked" }, "details": { - "name": "Jump To Beginning" + "name": "Jump To Beginning", + "tooltip": "Move the Playhead to the beginning of the sequence" } }, { @@ -184,27 +193,29 @@ "tooltip": "Signaled after Play is invoked" }, "details": { - "name": "Play" + "name": "Play", + "tooltip": "Play sequence from the start to end times set the sequence" } }, { "key": "SetPlaySpeed", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke Set Play Speed" + "tooltip": "When signaled, this will invoke SetPlaySpeed" }, "exit": { "name": "Out", - "tooltip": "Signaled after Set Play Speed is invoked" + "tooltip": "Signaled after SetPlaySpeed is invoked" }, "details": { - "name": "Set Play Speed" + "name": "SetPlaySpeed", + "tooltip": "Set the play speed" }, "params": [ { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", "details": { - "name": "float" + "name": "Play Speed" } } ] diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/SimpleMotionComponentRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/SimpleMotionComponentRequestBus.names index a92d790054..182ded9e83 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/SimpleMotionComponentRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/SimpleMotionComponentRequestBus.names @@ -5,7 +5,7 @@ "context": "EBusSender", "variant": "", "details": { - "name": "SimpleMotionComponentRequestBus", + "name": "Simple Motion", "category": "Animation" }, "methods": [ @@ -13,20 +13,20 @@ "key": "BlendOutTime", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke BlendOutTime" + "tooltip": "When signaled, this will invoke Blend Out Time" }, "exit": { "name": "Out", - "tooltip": "Signaled after BlendOutTime is invoked" + "tooltip": "Signaled after Blend Out Time is invoked" }, "details": { - "name": "BlendOutTime" + "name": "Blend Out Time" }, "params": [ { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", "details": { - "name": "float" + "name": "Time" } } ] @@ -35,20 +35,20 @@ "key": "GetBlendInTime", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetBlendInTime" + "tooltip": "When signaled, this will invoke Get Blend In Time" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetBlendInTime is invoked" + "tooltip": "Signaled after Get Blend In Time is invoked" }, "details": { - "name": "GetBlendInTime" + "name": "Get Blend In Time" }, "results": [ { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", "details": { - "name": "float" + "name": "Time" } } ] @@ -64,7 +64,7 @@ "tooltip": "Signaled after PlayMotion is invoked" }, "details": { - "name": "PlayMotion" + "name": "Play Motion" } }, { @@ -78,13 +78,13 @@ "tooltip": "Signaled after GetMotion is invoked" }, "details": { - "name": "GetMotion" + "name": "Get Motion" }, "results": [ { "typeid": "{652ED536-3402-439B-AEBE-4A5DBC554085}", "details": { - "name": "AssetId" + "name": "Asset Id" } } ] @@ -93,20 +93,20 @@ "key": "GetBlendOutTime", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetBlendOutTime" + "tooltip": "When signaled, this will invoke Get Blend Out Time" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetBlendOutTime is invoked" + "tooltip": "Signaled after Get Blend Out Time is invoked" }, "details": { - "name": "GetBlendOutTime" + "name": "Get Blend Out Time" }, "results": [ { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", "details": { - "name": "float" + "name": "Time" } } ] @@ -128,7 +128,7 @@ { "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", "details": { - "name": "bool" + "name": "Enable" } } ] @@ -137,20 +137,20 @@ "key": "GetPlaySpeed", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetPlaySpeed" + "tooltip": "When signaled, this will invoke Get Play Speed" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetPlaySpeed is invoked" + "tooltip": "Signaled after Get Play Speed is invoked" }, "details": { - "name": "GetPlaySpeed" + "name": "Get Play Speed" }, "results": [ { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", "details": { - "name": "float" + "name": "Speed" } } ] @@ -159,20 +159,20 @@ "key": "GetPlayTime", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetPlayTime" + "tooltip": "When signaled, this will invoke Get Play Time" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetPlayTime is invoked" + "tooltip": "Signaled after Get Play Time is invoked" }, "details": { - "name": "GetPlayTime" + "name": "Get Play Time" }, "results": [ { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", "details": { - "name": "float" + "name": "Time" } } ] @@ -194,7 +194,7 @@ { "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", "details": { - "name": "bool" + "name": "Enable" } } ] @@ -216,7 +216,7 @@ { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", "details": { - "name": "float" + "name": "Speed" } } ] @@ -238,7 +238,7 @@ { "typeid": "{652ED536-3402-439B-AEBE-4A5DBC554085}", "details": { - "name": "AssetId" + "name": "Asset Id" } } ] @@ -247,20 +247,20 @@ "key": "BlendInTime", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke BlendInTime" + "tooltip": "When signaled, this will invoke Blend In Time" }, "exit": { "name": "Out", - "tooltip": "Signaled after BlendInTime is invoked" + "tooltip": "Signaled after Blend In Time is invoked" }, "details": { - "name": "BlendInTime" + "name": "Blend In Time" }, "params": [ { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", "details": { - "name": "float" + "name": "Time" } } ] @@ -269,20 +269,20 @@ "key": "GetLoopMotion", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetLoopMotion" + "tooltip": "When signaled, this will invoke Get Loop Motion" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetLoopMotion is invoked" + "tooltip": "Signaled after Get Loop Motion is invoked" }, "details": { - "name": "GetLoopMotion" + "name": "Get Loop Motion" }, "results": [ { "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", "details": { - "name": "bool" + "name": "Loop Motion" } } ] @@ -291,20 +291,20 @@ "key": "PlayTime", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke PlayTime" + "tooltip": "When signaled, this will invoke Play Time" }, "exit": { "name": "Out", - "tooltip": "Signaled after PlayTime is invoked" + "tooltip": "Signaled after Play Time is invoked" }, "details": { - "name": "PlayTime" + "name": "Play Time" }, "params": [ { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", "details": { - "name": "float" + "name": "Time" } } ] @@ -326,7 +326,7 @@ { "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", "details": { - "name": "bool" + "name": "Enable" } } ] @@ -348,7 +348,7 @@ { "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", "details": { - "name": "bool" + "name": "Enable" } } ] From 5311878e8704845d34d09a74e7f87403d364b4cb Mon Sep 17 00:00:00 2001 From: Guthrie Adams Date: Sun, 7 Nov 2021 15:17:11 -0600 Subject: [PATCH 081/345] Replacing preset preview images with thumbnail widget to improve load times Signed-off-by: Guthrie Adams --- .../Viewport/MaterialViewportRequestBus.h | 18 -------- .../Viewport/MaterialViewportComponent.cpp | 46 ------------------- .../Viewport/MaterialViewportComponent.h | 10 ---- .../LightingPresetBrowserDialog.cpp | 9 ++-- .../ModelPresetBrowserDialog.cpp | 5 +- .../PresetBrowserDialog.cpp | 35 ++++++++------ .../PresetBrowserDialog.h | 6 +-- 7 files changed, 29 insertions(+), 100 deletions(-) diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Include/Atom/Viewport/MaterialViewportRequestBus.h b/Gems/Atom/Tools/MaterialEditor/Code/Include/Atom/Viewport/MaterialViewportRequestBus.h index e859d6a433..e37512127c 100644 --- a/Gems/Atom/Tools/MaterialEditor/Code/Include/Atom/Viewport/MaterialViewportRequestBus.h +++ b/Gems/Atom/Tools/MaterialEditor/Code/Include/Atom/Viewport/MaterialViewportRequestBus.h @@ -62,15 +62,6 @@ namespace MaterialEditor //! Get set of lighting preset names virtual MaterialViewportPresetNameSet GetLightingPresetNames() const = 0; - //! Set lighting preset preview image - //! @param preset used to set preview image - //! @param preview image - virtual void SetLightingPresetPreview(AZ::Render::LightingPresetPtr preset, const QImage& image) = 0; - - //! Get lighting preset preview image - //! @param preset used to find preview image - virtual QImage GetLightingPresetPreview(AZ::Render::LightingPresetPtr preset) const = 0; - //! Get model preset last save path //! @param preset to lookup last save path virtual AZStd::string GetLightingPresetLastSavePath(AZ::Render::LightingPresetPtr preset) const = 0; @@ -108,15 +99,6 @@ namespace MaterialEditor //! Get set of model preset names virtual MaterialViewportPresetNameSet GetModelPresetNames() const = 0; - //! Set model preset preview image - //! @param preset used to set preview image - //! @param preview image - virtual void SetModelPresetPreview(AZ::Render::ModelPresetPtr preset, const QImage& image) = 0; - - //! Get model preset preview image - //! @param preset used to find preview image - virtual QImage GetModelPresetPreview(AZ::Render::ModelPresetPtr preset) const = 0; - //! Get model preset last save path //! @param preset to lookup last save path virtual AZStd::string GetModelPresetLastSavePath(AZ::Render::ModelPresetPtr preset) const = 0; diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/MaterialViewportComponent.cpp b/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/MaterialViewportComponent.cpp index a8f41917f9..fb8639977d 100644 --- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/MaterialViewportComponent.cpp +++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/MaterialViewportComponent.cpp @@ -162,12 +162,6 @@ namespace MaterialEditor m_viewportSettings = AZ::UserSettings::CreateFind(AZ::Crc32("MaterialViewportSettings"), AZ::UserSettings::CT_GLOBAL); - m_lightingPresetPreviewImageDefault = QImage(180, 90, QImage::Format::Format_RGBA8888); - m_lightingPresetPreviewImageDefault.fill(Qt::GlobalColor::black); - - m_modelPresetPreviewImageDefault = QImage(90, 90, QImage::Format::Format_RGBA8888); - m_modelPresetPreviewImageDefault.fill(Qt::GlobalColor::black); - MaterialViewportRequestBus::Handler::BusConnect(); AzFramework::AssetCatalogEventBus::Handler::BusConnect(); } @@ -177,12 +171,10 @@ namespace MaterialEditor AzFramework::AssetCatalogEventBus::Handler::BusDisconnect(); MaterialViewportRequestBus::Handler::BusDisconnect(); - m_lightingPresetPreviewImages.clear(); m_lightingPresetVector.clear(); m_lightingPresetLastSavePathMap.clear(); m_lightingPresetSelection.reset(); - m_modelPresetPreviewImages.clear(); m_modelPresetVector.clear(); m_modelPresetLastSavePathMap.clear(); m_modelPresetSelection.reset(); @@ -286,14 +278,6 @@ namespace MaterialEditor SelectLightingPreset(presetPtr); } - const auto& imagePath = AZ::RPI::AssetUtils::GetSourcePathByAssetId(presetPtr->m_skyboxImageAsset.GetId()); - LoadImageAsync(imagePath, [presetPtr](const QImage& image) { - QImage imageScaled = image.scaled(180, 90, Qt::AspectRatioMode::KeepAspectRatio); - AZ::TickBus::QueueFunction([presetPtr, imageScaled]() { - MaterialViewportRequestBus::Broadcast(&MaterialViewportRequestBus::Events::SetLightingPresetPreview, presetPtr, imageScaled); - }); - }); - return presetPtr; } @@ -353,17 +337,6 @@ namespace MaterialEditor return names; } - void MaterialViewportComponent::SetLightingPresetPreview(AZ::Render::LightingPresetPtr preset, const QImage& image) - { - m_lightingPresetPreviewImages[preset] = image; - } - - QImage MaterialViewportComponent::GetLightingPresetPreview(AZ::Render::LightingPresetPtr preset) const - { - auto imageItr = m_lightingPresetPreviewImages.find(preset); - return imageItr != m_lightingPresetPreviewImages.end() ? imageItr->second : m_lightingPresetPreviewImageDefault; - } - AZStd::string MaterialViewportComponent::GetLightingPresetLastSavePath(AZ::Render::LightingPresetPtr preset) const { auto pathItr = m_lightingPresetLastSavePathMap.find(preset); @@ -382,14 +355,6 @@ namespace MaterialEditor SelectModelPreset(presetPtr); } - const auto& imagePath = AZ::RPI::AssetUtils::GetSourcePathByAssetId(presetPtr->m_previewImageAsset.GetId()); - LoadImageAsync(imagePath, [presetPtr](const QImage& image) { - QImage imageScaled = image.scaled(90, 90, Qt::AspectRatioMode::KeepAspectRatio); - AZ::TickBus::QueueFunction([presetPtr, imageScaled]() { - MaterialViewportRequestBus::Broadcast(&MaterialViewportRequestBus::Events::SetModelPresetPreview, presetPtr, imageScaled); - }); - }); - return presetPtr; } @@ -449,17 +414,6 @@ namespace MaterialEditor return names; } - void MaterialViewportComponent::SetModelPresetPreview(AZ::Render::ModelPresetPtr preset, const QImage& image) - { - m_modelPresetPreviewImages[preset] = image; - } - - QImage MaterialViewportComponent::GetModelPresetPreview(AZ::Render::ModelPresetPtr preset) const - { - auto imageItr = m_modelPresetPreviewImages.find(preset); - return imageItr != m_modelPresetPreviewImages.end() ? imageItr->second : m_modelPresetPreviewImageDefault; - } - AZStd::string MaterialViewportComponent::GetModelPresetLastSavePath(AZ::Render::ModelPresetPtr preset) const { auto pathItr = m_modelPresetLastSavePathMap.find(preset); diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/MaterialViewportComponent.h b/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/MaterialViewportComponent.h index 12475bb113..a4f94c3546 100644 --- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/MaterialViewportComponent.h +++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/MaterialViewportComponent.h @@ -58,8 +58,6 @@ namespace MaterialEditor void SelectLightingPreset(AZ::Render::LightingPresetPtr preset) override; void SelectLightingPresetByName(const AZStd::string& name) override; MaterialViewportPresetNameSet GetLightingPresetNames() const override; - void SetLightingPresetPreview(AZ::Render::LightingPresetPtr preset, const QImage& image) override; - QImage GetLightingPresetPreview(AZ::Render::LightingPresetPtr preset) const override; AZStd::string GetLightingPresetLastSavePath(AZ::Render::LightingPresetPtr preset) const override; AZ::Render::ModelPresetPtr AddModelPreset(const AZ::Render::ModelPreset& preset) override; @@ -70,8 +68,6 @@ namespace MaterialEditor void SelectModelPreset(AZ::Render::ModelPresetPtr preset) override; void SelectModelPresetByName(const AZStd::string& name) override; MaterialViewportPresetNameSet GetModelPresetNames() const override; - void SetModelPresetPreview(AZ::Render::ModelPresetPtr preset, const QImage& image) override; - QImage GetModelPresetPreview(AZ::Render::ModelPresetPtr preset) const override; AZStd::string GetModelPresetLastSavePath(AZ::Render::ModelPresetPtr preset) const override; void SetShadowCatcherEnabled(bool enable) override; @@ -97,12 +93,6 @@ namespace MaterialEditor AZ::Render::ModelPresetPtrVector m_modelPresetVector; AZ::Render::ModelPresetPtr m_modelPresetSelection; - AZStd::map m_lightingPresetPreviewImages; - AZStd::map m_modelPresetPreviewImages; - - QImage m_lightingPresetPreviewImageDefault; - QImage m_modelPresetPreviewImageDefault; - mutable AZStd::map m_lightingPresetLastSavePathMap; mutable AZStd::map m_modelPresetLastSavePathMap; diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/PresetBrowserDialogs/LightingPresetBrowserDialog.cpp b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/PresetBrowserDialogs/LightingPresetBrowserDialog.cpp index 72bf7fe003..5cf867618d 100644 --- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/PresetBrowserDialogs/LightingPresetBrowserDialog.cpp +++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/PresetBrowserDialogs/LightingPresetBrowserDialog.cpp @@ -7,6 +7,7 @@ */ #include +#include #include #include #include @@ -30,10 +31,10 @@ namespace MaterialEditor QListWidgetItem* selectedItem = nullptr; for (const auto& preset : presets) { - QImage image; - MaterialViewportRequestBus::BroadcastResult(image, &MaterialViewportRequestBus::Events::GetLightingPresetPreview, preset); - - QListWidgetItem* item = CreateListItem(preset->m_displayName.c_str(), image); + AZStd::string path; + MaterialViewportRequestBus::BroadcastResult(path, &MaterialViewportRequestBus::Events::GetLightingPresetLastSavePath, preset); + QListWidgetItem* item = + CreateListItem(preset->m_displayName.c_str(), AZ::RPI::AssetUtils::MakeAssetId(path, 0).GetValue(), QSize(180, 180)); m_listItemToPresetMap[item] = preset; diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/PresetBrowserDialogs/ModelPresetBrowserDialog.cpp b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/PresetBrowserDialogs/ModelPresetBrowserDialog.cpp index c1936cde35..4e9c42575b 100644 --- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/PresetBrowserDialogs/ModelPresetBrowserDialog.cpp +++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/PresetBrowserDialogs/ModelPresetBrowserDialog.cpp @@ -30,10 +30,7 @@ namespace MaterialEditor QListWidgetItem* selectedItem = nullptr; for (const auto& preset : presets) { - QImage image; - MaterialViewportRequestBus::BroadcastResult(image, &MaterialViewportRequestBus::Events::GetModelPresetPreview, preset); - - QListWidgetItem* item = CreateListItem(preset->m_displayName.c_str(), image); + QListWidgetItem* item = CreateListItem(preset->m_displayName.c_str(), preset->m_modelAsset.GetId(), QSize(90, 90)); m_listItemToPresetMap[item] = preset; diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/PresetBrowserDialogs/PresetBrowserDialog.cpp b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/PresetBrowserDialogs/PresetBrowserDialog.cpp index d3aa6350f0..084a719454 100644 --- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/PresetBrowserDialogs/PresetBrowserDialog.cpp +++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/PresetBrowserDialogs/PresetBrowserDialog.cpp @@ -12,6 +12,10 @@ #include #include #include +#include +#include +#include +#include #include #include @@ -41,35 +45,36 @@ namespace MaterialEditor m_ui->m_presetList->setGridSize(QSize(0, 0)); m_ui->m_presetList->setWrapping(true); - QObject::connect(m_ui->m_presetList, &QListWidget::currentItemChanged, [this]() { SelectCurrentPreset(); }); + QObject::connect(m_ui->m_presetList, &QListWidget::currentItemChanged, [this](){ SelectCurrentPreset(); }); } - QListWidgetItem* PresetBrowserDialog::CreateListItem(const QString& title, const QImage& image) + QListWidgetItem* PresetBrowserDialog::CreateListItem(const QString& title, const AZ::Data::AssetId& assetId, const QSize& size) { const QSize gridSize = m_ui->m_presetList->gridSize(); m_ui->m_presetList->setGridSize( - QSize(AZStd::max(gridSize.width(), image.width() + 10), AZStd::max(gridSize.height(), image.height() + 10))); + QSize(AZStd::max(gridSize.width(), size.width() + 10), AZStd::max(gridSize.height(), size.height() + 10))); QListWidgetItem* item = new QListWidgetItem(m_ui->m_presetList); item->setData(Qt::UserRole, title); - item->setSizeHint(image.size() + QSize(4, 4)); + item->setSizeHint(size + QSize(4, 4)); m_ui->m_presetList->addItem(item); - QLabel* previewImage = new QLabel(m_ui->m_presetList); - previewImage->setFixedSize(image.size()); - previewImage->setMargin(0); - previewImage->setPixmap(QPixmap::fromImage(image)); - previewImage->updateGeometry(); + AzToolsFramework::Thumbnailer::ThumbnailWidget* thumbnail = new AzToolsFramework::Thumbnailer::ThumbnailWidget(m_ui->m_presetList); + thumbnail->setFixedSize(size); + thumbnail->SetThumbnailKey( + MAKE_TKEY(AzToolsFramework::AssetBrowser::ProductThumbnailKey, assetId), + AzToolsFramework::Thumbnailer::ThumbnailContext::DefaultContext); + thumbnail->updateGeometry(); - AzQtComponents::ElidingLabel* previewLabel = new AzQtComponents::ElidingLabel(previewImage); + AzQtComponents::ElidingLabel* previewLabel = new AzQtComponents::ElidingLabel(thumbnail); previewLabel->setText(title); - previewLabel->setFixedSize(QSize(image.width(), 15)); + previewLabel->setFixedSize(QSize(size.width(), 15)); previewLabel->setMargin(0); previewLabel->setStyleSheet("background-color: rgb(35, 35, 35)"); AzQtComponents::Text::addPrimaryStyle(previewLabel); AzQtComponents::Text::addLabelStyle(previewLabel); - m_ui->m_presetList->setItemWidget(item, previewImage); + m_ui->m_presetList->setItemWidget(item, thumbnail); return item; } @@ -79,15 +84,15 @@ namespace MaterialEditor m_ui->m_searchWidget->setReadOnly(false); m_ui->m_searchWidget->setContextMenuPolicy(Qt::CustomContextMenu); AzQtComponents::LineEdit::applySearchStyle(m_ui->m_searchWidget); - connect(m_ui->m_searchWidget, &QLineEdit::textChanged, this, [this]() { ApplySearchFilter(); }); - connect(m_ui->m_searchWidget, &QWidget::customContextMenuRequested, this, [this](const QPoint& pos) { ShowSearchMenu(pos); }); + connect(m_ui->m_searchWidget, &QLineEdit::textChanged, this, [this](){ ApplySearchFilter(); }); + connect(m_ui->m_searchWidget, &QWidget::customContextMenuRequested, this, [this](const QPoint& pos){ ShowSearchMenu(pos); }); } void PresetBrowserDialog::SetupDialogButtons() { connect(m_ui->m_buttonBox, &QDialogButtonBox::accepted, this, &QDialog::accept); connect(m_ui->m_buttonBox, &QDialogButtonBox::rejected, this, &QDialog::reject); - connect(this, &QDialog::rejected, this, [this]() { SelectInitialPreset(); }); + connect(this, &QDialog::rejected, this, [this](){ SelectInitialPreset(); }); } void PresetBrowserDialog::ApplySearchFilter() diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/PresetBrowserDialogs/PresetBrowserDialog.h b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/PresetBrowserDialogs/PresetBrowserDialog.h index ee01737352..20e049f6f8 100644 --- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/PresetBrowserDialogs/PresetBrowserDialog.h +++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/PresetBrowserDialogs/PresetBrowserDialog.h @@ -9,12 +9,12 @@ #pragma once #if !defined(Q_MOC_RUN) +#include #include - #include #endif -#include +#include class QImage; class QListWidgetItem; @@ -32,7 +32,7 @@ namespace MaterialEditor protected: void SetupPresetList(); - QListWidgetItem* CreateListItem(const QString& title, const QImage& image); + QListWidgetItem* CreateListItem(const QString& title, const AZ::Data::AssetId& assetId, const QSize& size); void SetupSearchWidget(); void SetupDialogButtons(); From 88569948e35c3861aeac4da804cc7528843421f6 Mon Sep 17 00:00:00 2001 From: Guthrie Adams Date: Mon, 15 Nov 2021 10:42:22 -0600 Subject: [PATCH 082/345] Changed preset selection dialog widget headings to not overlap preview images Signed-off-by: Guthrie Adams --- .../PresetBrowserDialog.cpp | 32 ++++++++++++------- 1 file changed, 20 insertions(+), 12 deletions(-) diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/PresetBrowserDialogs/PresetBrowserDialog.cpp b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/PresetBrowserDialogs/PresetBrowserDialog.cpp index 084a719454..3bda426b07 100644 --- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/PresetBrowserDialogs/PresetBrowserDialog.cpp +++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/PresetBrowserDialogs/PresetBrowserDialog.cpp @@ -21,6 +21,7 @@ #include #include #include +#include namespace MaterialEditor { @@ -52,29 +53,36 @@ namespace MaterialEditor { const QSize gridSize = m_ui->m_presetList->gridSize(); m_ui->m_presetList->setGridSize( - QSize(AZStd::max(gridSize.width(), size.width() + 10), AZStd::max(gridSize.height(), size.height() + 10))); + QSize(AZStd::max(gridSize.width(), size.width() + 10), AZStd::max(gridSize.height(), size.height() + 10 + 15))); QListWidgetItem* item = new QListWidgetItem(m_ui->m_presetList); item->setData(Qt::UserRole, title); - item->setSizeHint(size + QSize(4, 4)); + item->setSizeHint(size + QSize(4, 19)); m_ui->m_presetList->addItem(item); - AzToolsFramework::Thumbnailer::ThumbnailWidget* thumbnail = new AzToolsFramework::Thumbnailer::ThumbnailWidget(m_ui->m_presetList); + QWidget* itemWidget = new QWidget(m_ui->m_presetList); + itemWidget->setLayout(new QVBoxLayout(itemWidget)); + itemWidget->layout()->setSpacing(0); + itemWidget->layout()->setMargin(0); + + AzQtComponents::ElidingLabel* header = new AzQtComponents::ElidingLabel(itemWidget); + header->setText(title); + header->setFixedSize(QSize(size.width(), 15)); + header->setMargin(0); + header->setStyleSheet("background-color: rgb(35, 35, 35)"); + AzQtComponents::Text::addPrimaryStyle(header); + AzQtComponents::Text::addLabelStyle(header); + itemWidget->layout()->addWidget(header); + + AzToolsFramework::Thumbnailer::ThumbnailWidget* thumbnail = new AzToolsFramework::Thumbnailer::ThumbnailWidget(itemWidget); thumbnail->setFixedSize(size); thumbnail->SetThumbnailKey( MAKE_TKEY(AzToolsFramework::AssetBrowser::ProductThumbnailKey, assetId), AzToolsFramework::Thumbnailer::ThumbnailContext::DefaultContext); thumbnail->updateGeometry(); + itemWidget->layout()->addWidget(thumbnail); - AzQtComponents::ElidingLabel* previewLabel = new AzQtComponents::ElidingLabel(thumbnail); - previewLabel->setText(title); - previewLabel->setFixedSize(QSize(size.width(), 15)); - previewLabel->setMargin(0); - previewLabel->setStyleSheet("background-color: rgb(35, 35, 35)"); - AzQtComponents::Text::addPrimaryStyle(previewLabel); - AzQtComponents::Text::addLabelStyle(previewLabel); - - m_ui->m_presetList->setItemWidget(item, thumbnail); + m_ui->m_presetList->setItemWidget(item, itemWidget); return item; } From 123b422709cf2d43f16b23fbc0ddae41aa591ba8 Mon Sep 17 00:00:00 2001 From: Guthrie Adams Date: Mon, 15 Nov 2021 10:44:13 -0600 Subject: [PATCH 083/345] Updated shared preview fit to camera logic and viewing angle Signed-off-by: Guthrie Adams --- .../Code/Source/SharedPreview/SharedPreviewContent.cpp | 6 +++--- .../Code/Source/SharedPreview/SharedPreviewContent.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/SharedPreview/SharedPreviewContent.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/SharedPreview/SharedPreviewContent.cpp index 91b6d2b02a..8bc9c5ac7d 100644 --- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/SharedPreview/SharedPreviewContent.cpp +++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/SharedPreview/SharedPreviewContent.cpp @@ -163,9 +163,9 @@ namespace AZ m_modelAsset->GetAabb().GetAsSphere(center, radius); } - const auto distance = radius + NearDist; - const auto cameraRotation = Quaternion::CreateFromAxisAngle(Vector3::CreateAxisZ(), CameraRotationAngle); - const auto cameraPosition = center + cameraRotation.TransformVector(Vector3(0.0f, distance, 0.0f)); + const auto distance = fabsf(radius / sinf(FieldOfView)) + NearDist; + const auto cameraRotation = Quaternion::CreateFromAxisAngle(Vector3::CreateAxisX(), -CameraRotationAngle); + const auto cameraPosition = center + cameraRotation.TransformVector(-Vector3::CreateAxisY() * distance); const auto cameraTransform = Transform::CreateLookAt(cameraPosition, center); m_view->SetCameraTransform(Matrix3x4::CreateFromTransform(cameraTransform)); } diff --git a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/SharedPreview/SharedPreviewContent.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/SharedPreview/SharedPreviewContent.h index 7308aa19bc..140ef88ebd 100644 --- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/SharedPreview/SharedPreviewContent.h +++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/SharedPreview/SharedPreviewContent.h @@ -51,7 +51,7 @@ namespace AZ static constexpr float NearDist = 0.001f; static constexpr float FarDist = 100.0f; static constexpr float FieldOfView = Constants::HalfPi; - static constexpr float CameraRotationAngle = Constants::QuarterPi / 2.0f; + static constexpr float CameraRotationAngle = Constants::HalfPi / 6.0f; RPI::ScenePtr m_scene; RPI::ViewPtr m_view; From 6dcbc64cd6133b3bf59dfb7ca13f503d22aab3af Mon Sep 17 00:00:00 2001 From: Guthrie Adams Date: Tue, 16 Nov 2021 23:10:42 -0600 Subject: [PATCH 084/345] =?UTF-8?q?Removed=20preview=20image=20setting=20f?= =?UTF-8?q?rom=20model=20presets=20It=E2=80=99s=20no=20longer=20needed=20b?= =?UTF-8?q?ecause=20we=20use=20the=20thumbnail=20renderer?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Guthrie Adams --- .../Common/Code/Include/Atom/Feature/Utils/ModelPreset.h | 1 - .../Feature/Common/Code/Source/Utils/EditorModelPreset.cpp | 1 - Gems/Atom/Feature/Common/Code/Source/Utils/ModelPreset.cpp | 4 +--- 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/Utils/ModelPreset.h b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/Utils/ModelPreset.h index 8bd494dfde..2dd4bed264 100644 --- a/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/Utils/ModelPreset.h +++ b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/Utils/ModelPreset.h @@ -30,7 +30,6 @@ namespace AZ AZStd::string m_displayName; AZ::Data::Asset m_modelAsset; - AZ::Data::Asset m_previewImageAsset; }; using ModelPresetPtr = AZStd::shared_ptr; diff --git a/Gems/Atom/Feature/Common/Code/Source/Utils/EditorModelPreset.cpp b/Gems/Atom/Feature/Common/Code/Source/Utils/EditorModelPreset.cpp index 63c2fc7150..d636fde2fe 100644 --- a/Gems/Atom/Feature/Common/Code/Source/Utils/EditorModelPreset.cpp +++ b/Gems/Atom/Feature/Common/Code/Source/Utils/EditorModelPreset.cpp @@ -29,7 +29,6 @@ namespace AZ ->Attribute(AZ::Edit::Attributes::AutoExpand, true) ->DataElement(AZ::Edit::UIHandlers::Default, &ModelPreset::m_displayName, "Display Name", "Identifier used for display and selection") ->DataElement(AZ::Edit::UIHandlers::Default, &ModelPreset::m_modelAsset, "Model Asset", "Model asset reference") - ->DataElement(AZ::Edit::UIHandlers::Default, &ModelPreset::m_previewImageAsset, "Preview Image Asset", "Preview image asset reference") ; } } diff --git a/Gems/Atom/Feature/Common/Code/Source/Utils/ModelPreset.cpp b/Gems/Atom/Feature/Common/Code/Source/Utils/ModelPreset.cpp index c684b3cc89..ce8a1680a9 100644 --- a/Gems/Atom/Feature/Common/Code/Source/Utils/ModelPreset.cpp +++ b/Gems/Atom/Feature/Common/Code/Source/Utils/ModelPreset.cpp @@ -24,10 +24,9 @@ namespace AZ if (auto serializeContext = azrtti_cast(context)) { serializeContext->Class() - ->Version(3) + ->Version(4) ->Field("displayName", &ModelPreset::m_displayName) ->Field("modelAsset", &ModelPreset::m_modelAsset) - ->Field("previewImageAsset", &ModelPreset::m_previewImageAsset) ; } @@ -41,7 +40,6 @@ namespace AZ ->Constructor() ->Property("displayName", BehaviorValueProperty(&ModelPreset::m_displayName)) ->Property("modelAsset", BehaviorValueProperty(&ModelPreset::m_modelAsset)) - ->Property("previewImageAsset", BehaviorValueProperty(&ModelPreset::m_previewImageAsset)) ; } } From a7e90fd6c85a5a3423dbb7b7b194209a519ab3e2 Mon Sep 17 00:00:00 2001 From: AMZN-Phil Date: Wed, 17 Nov 2021 08:15:41 -0800 Subject: [PATCH 085/345] Fix copy paste variable name Signed-off-by: AMZN-Phil --- .../ProjectManager/Source/GemRepo/GemRepoScreen.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Code/Tools/ProjectManager/Source/GemRepo/GemRepoScreen.cpp b/Code/Tools/ProjectManager/Source/GemRepo/GemRepoScreen.cpp index 67fdfaa790..f62c30c280 100644 --- a/Code/Tools/ProjectManager/Source/GemRepo/GemRepoScreen.cpp +++ b/Code/Tools/ProjectManager/Source/GemRepo/GemRepoScreen.cpp @@ -104,12 +104,12 @@ namespace O3DE::ProjectManager QString failureMessage = tr("Failed to add gem repo: %1.").arg(repoUri); if (!addGemRepoResult.GetError().second.empty()) { - QMessageBox gemDownloadError; - gemDownloadError.setIcon(QMessageBox::Critical); - gemDownloadError.setWindowTitle(failureMessage); - gemDownloadError.setText(addGemRepoResult.GetError().first.c_str()); - gemDownloadError.setDetailedText(addGemRepoResult.GetError().second.c_str()); - gemDownloadError.exec(); + QMessageBox addRepoError; + addRepoError.setIcon(QMessageBox::Critical); + addRepoError.setWindowTitle(failureMessage); + addRepoError.setText(addGemRepoResult.GetError().first.c_str()); + addRepoError.setDetailedText(addGemRepoResult.GetError().second.c_str()); + addRepoError.exec(); } else { From 593f03efb4996ae8bb8e1f53a55e2ba00e022449 Mon Sep 17 00:00:00 2001 From: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com> Date: Wed, 17 Nov 2021 16:23:01 +0000 Subject: [PATCH 086/345] Camera fixes follow-up (#5703) * allow unconstrained camera when tracking transform and fix some camera interpolation issues Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com> * tests for interpolation fixes Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com> * add test for camera constraints change Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com> * updates following review feeedback Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com> --- .../EditorModularViewportCameraComposer.cpp | 19 ++++ .../Lib/Tests/Camera/test_EditorCamera.cpp | 89 +++++++++++++++++-- .../test_ModularViewportCameraController.cpp | 4 +- .../SandboxIntegration.cpp | 6 ++ .../AzFramework/Viewport/CameraInput.cpp | 19 ++-- .../AzFramework/Viewport/CameraInput.h | 1 + .../AzFramework/Tests/CameraInputTests.cpp | 53 +++++++++-- .../ModularViewportCameraController.h | 3 +- ...odularViewportCameraControllerRequestBus.h | 9 +- .../ModularViewportCameraController.cpp | 23 ++++- 10 files changed, 197 insertions(+), 29 deletions(-) diff --git a/Code/Editor/EditorModularViewportCameraComposer.cpp b/Code/Editor/EditorModularViewportCameraComposer.cpp index 5cfb4d2665..f145adf72f 100644 --- a/Code/Editor/EditorModularViewportCameraComposer.cpp +++ b/Code/Editor/EditorModularViewportCameraComposer.cpp @@ -145,6 +145,15 @@ namespace SandboxEditor } }; + const auto trackingTransform = [viewportId = m_viewportId] + { + bool tracking = false; + AtomToolsFramework::ModularViewportCameraControllerRequestBus::EventResult( + tracking, viewportId, &AtomToolsFramework::ModularViewportCameraControllerRequestBus::Events::IsTrackingTransform); + + return tracking; + }; + m_firstPersonRotateCamera = AZStd::make_shared(SandboxEditor::CameraFreeLookChannelId()); m_firstPersonRotateCamera->m_rotateSpeedFn = [] @@ -152,6 +161,11 @@ namespace SandboxEditor return SandboxEditor::CameraRotateSpeed(); }; + m_firstPersonRotateCamera->m_constrainPitch = [trackingTransform] + { + return !trackingTransform(); + }; + // default behavior is to hide the cursor but this can be disabled (useful for remote desktop) // note: See CaptureCursorLook in the Settings Registry m_firstPersonRotateCamera->SetActivationBeganFn(hideCursor); @@ -255,6 +269,11 @@ namespace SandboxEditor return SandboxEditor::CameraOrbitYawRotationInverted(); }; + m_orbitRotateCamera->m_constrainPitch = [trackingTransform] + { + return !trackingTransform(); + }; + m_orbitTranslateCamera = AZStd::make_shared( translateCameraInputChannelIds, AzFramework::LookTranslation, AzFramework::TranslateOffsetOrbit); diff --git a/Code/Editor/Lib/Tests/Camera/test_EditorCamera.cpp b/Code/Editor/Lib/Tests/Camera/test_EditorCamera.cpp index 7eb73b64bf..76e23466f7 100644 --- a/Code/Editor/Lib/Tests/Camera/test_EditorCamera.cpp +++ b/Code/Editor/Lib/Tests/Camera/test_EditorCamera.cpp @@ -38,7 +38,9 @@ namespace UnitTest AzFramework::ViewportControllerListPtr m_controllerList; AZStd::unique_ptr m_entity; - static const AzFramework::ViewportId TestViewportId; + static inline constexpr AzFramework::ViewportId TestViewportId = 2345; + static inline constexpr float HalfInterpolateToTransformDuration = + AtomToolsFramework::ModularViewportCameraControllerRequests::InterpolateToTransformDuration * 0.5f; void SetUp() override { @@ -77,8 +79,6 @@ namespace UnitTest } }; - const AzFramework::ViewportId EditorCameraFixture::TestViewportId = AzFramework::ViewportId(1337); - TEST_F(EditorCameraFixture, ModularViewportCameraControllerReferenceFrameUpdatedWhenViewportEntityisChanged) { // Given @@ -149,8 +149,10 @@ namespace UnitTest transformToInterpolateTo); // simulate interpolation - m_controllerList->UpdateViewport({ TestViewportId, AzFramework::FloatSeconds(0.5f), AZ::ScriptTimePoint() }); - m_controllerList->UpdateViewport({ TestViewportId, AzFramework::FloatSeconds(0.5f), AZ::ScriptTimePoint() }); + m_controllerList->UpdateViewport( + { TestViewportId, AzFramework::FloatSeconds(HalfInterpolateToTransformDuration), AZ::ScriptTimePoint() }); + m_controllerList->UpdateViewport( + { TestViewportId, AzFramework::FloatSeconds(HalfInterpolateToTransformDuration), AZ::ScriptTimePoint() }); const auto finalTransform = m_cameraViewportContextView->GetCameraTransform(); @@ -175,14 +177,87 @@ namespace UnitTest transformToInterpolateTo); // simulate interpolation - m_controllerList->UpdateViewport({ TestViewportId, AzFramework::FloatSeconds(0.5f), AZ::ScriptTimePoint() }); - m_controllerList->UpdateViewport({ TestViewportId, AzFramework::FloatSeconds(0.5f), AZ::ScriptTimePoint() }); + m_controllerList->UpdateViewport( + { TestViewportId, AzFramework::FloatSeconds(HalfInterpolateToTransformDuration), AZ::ScriptTimePoint() }); + m_controllerList->UpdateViewport( + { TestViewportId, AzFramework::FloatSeconds(HalfInterpolateToTransformDuration), AZ::ScriptTimePoint() }); const auto finalTransform = m_cameraViewportContextView->GetCameraTransform(); // Then EXPECT_THAT(finalTransform, IsClose(transformToInterpolateTo)); } + + TEST_F(EditorCameraFixture, BeginningCameraInterpolationReturnsTrue) + { + // Given/When + bool interpolationBegan = false; + AtomToolsFramework::ModularViewportCameraControllerRequestBus::EventResult( + interpolationBegan, TestViewportId, + &AtomToolsFramework::ModularViewportCameraControllerRequestBus::Events::InterpolateToTransform, + AZ::Transform::CreateTranslation(AZ::Vector3(10.0f, 10.0f, 10.0f))); + + // Then + EXPECT_THAT(interpolationBegan, ::testing::IsTrue()); + } + + TEST_F(EditorCameraFixture, CameraInterpolationDoesNotBeginDuringAnExistingInterpolation) + { + // Given/When + bool initialInterpolationBegan = false; + AtomToolsFramework::ModularViewportCameraControllerRequestBus::EventResult( + initialInterpolationBegan, TestViewportId, + &AtomToolsFramework::ModularViewportCameraControllerRequestBus::Events::InterpolateToTransform, + AZ::Transform::CreateTranslation(AZ::Vector3(10.0f, 10.0f, 10.0f))); + + m_controllerList->UpdateViewport( + { TestViewportId, AzFramework::FloatSeconds(HalfInterpolateToTransformDuration), AZ::ScriptTimePoint() }); + + bool nextInterpolationBegan = true; + AtomToolsFramework::ModularViewportCameraControllerRequestBus::EventResult( + nextInterpolationBegan, TestViewportId, + &AtomToolsFramework::ModularViewportCameraControllerRequestBus::Events::InterpolateToTransform, + AZ::Transform::CreateTranslation(AZ::Vector3(10.0f, 10.0f, 10.0f))); + + bool interpolating = false; + AtomToolsFramework::ModularViewportCameraControllerRequestBus::EventResult( + interpolating, TestViewportId, &AtomToolsFramework::ModularViewportCameraControllerRequestBus::Events::IsInterpolating); + + // Then + EXPECT_THAT(initialInterpolationBegan, ::testing::IsTrue()); + EXPECT_THAT(nextInterpolationBegan, ::testing::IsFalse()); + EXPECT_THAT(interpolating, ::testing::IsTrue()); + } + + TEST_F(EditorCameraFixture, CameraInterpolationCanBeginAfterAnInterpolationCompletes) + { + // Given/When + bool initialInterpolationBegan = false; + AtomToolsFramework::ModularViewportCameraControllerRequestBus::EventResult( + initialInterpolationBegan, TestViewportId, + &AtomToolsFramework::ModularViewportCameraControllerRequestBus::Events::InterpolateToTransform, + AZ::Transform::CreateTranslation(AZ::Vector3(10.0f, 10.0f, 10.0f))); + + m_controllerList->UpdateViewport( + { TestViewportId, + AzFramework::FloatSeconds(AtomToolsFramework::ModularViewportCameraControllerRequests::InterpolateToTransformDuration + 0.5f), + AZ::ScriptTimePoint() }); + + bool interpolating = true; + AtomToolsFramework::ModularViewportCameraControllerRequestBus::EventResult( + interpolating, TestViewportId, &AtomToolsFramework::ModularViewportCameraControllerRequestBus::Events::IsInterpolating); + + bool nextInterpolationBegan = false; + AtomToolsFramework::ModularViewportCameraControllerRequestBus::EventResult( + nextInterpolationBegan, TestViewportId, + &AtomToolsFramework::ModularViewportCameraControllerRequestBus::Events::InterpolateToTransform, + AZ::Transform::CreateTranslation(AZ::Vector3(10.0f, 10.0f, 10.0f))); + + // Then + EXPECT_THAT(initialInterpolationBegan, ::testing::IsTrue()); + EXPECT_THAT(interpolating, ::testing::IsFalse()); + EXPECT_THAT(nextInterpolationBegan, ::testing::IsTrue()); + } } // namespace UnitTest // required to support running integration tests with the Camera Gem diff --git a/Code/Editor/Lib/Tests/test_ModularViewportCameraController.cpp b/Code/Editor/Lib/Tests/test_ModularViewportCameraController.cpp index c776a57c13..b796d6506c 100644 --- a/Code/Editor/Lib/Tests/test_ModularViewportCameraController.cpp +++ b/Code/Editor/Lib/Tests/test_ModularViewportCameraController.cpp @@ -74,7 +74,7 @@ namespace UnitTest class ModularViewportCameraControllerFixture : public AllocatorsTestFixture { public: - static const AzFramework::ViewportId TestViewportId; + static inline constexpr AzFramework::ViewportId TestViewportId = 1234; void SetUp() override { @@ -220,8 +220,6 @@ namespace UnitTest AZStd::unique_ptr m_editorModularViewportCameraComposer; }; - const AzFramework::ViewportId ModularViewportCameraControllerFixture::TestViewportId = AzFramework::ViewportId(0); - TEST_F(ModularViewportCameraControllerFixture, MouseMovementDoesNotAccumulateExcessiveDriftInModularViewportCameraWithVaryingDeltaTime) { SandboxEditor::SetCameraCaptureCursorForLook(false); diff --git a/Code/Editor/Plugins/ComponentEntityEditorPlugin/SandboxIntegration.cpp b/Code/Editor/Plugins/ComponentEntityEditorPlugin/SandboxIntegration.cpp index 82d9f9ede2..4aae4191a0 100644 --- a/Code/Editor/Plugins/ComponentEntityEditorPlugin/SandboxIntegration.cpp +++ b/Code/Editor/Plugins/ComponentEntityEditorPlugin/SandboxIntegration.cpp @@ -1675,6 +1675,12 @@ void SandboxIntegrationManager::GoToEntitiesInViewports(const AzToolsFramework:: if (auto viewportContext = viewportContextManager->GetViewportContextById(viewIndex)) { const AZ::Transform cameraTransform = viewportContext->GetCameraTransform(); + // do not attempt to interpolate to where we currently are + if (cameraTransform.GetTranslation().IsClose(center)) + { + continue; + } + const AZ::Vector3 forward = (center - cameraTransform.GetTranslation()).GetNormalized(); // move camera 25% further back than required diff --git a/Code/Framework/AzFramework/AzFramework/Viewport/CameraInput.cpp b/Code/Framework/AzFramework/AzFramework/Viewport/CameraInput.cpp index 2f637db7cd..771884ac6a 100644 --- a/Code/Framework/AzFramework/AzFramework/Viewport/CameraInput.cpp +++ b/Code/Framework/AzFramework/AzFramework/Viewport/CameraInput.cpp @@ -313,6 +313,11 @@ namespace AzFramework { return false; }; + + m_constrainPitch = []() constexpr + { + return true; + }; } bool RotateCameraInput::HandleEvents(const InputEvent& event, const ScreenVector& cursorDelta, [[maybe_unused]] const float scrollDelta) @@ -334,7 +339,10 @@ namespace AzFramework nextCamera.m_yaw -= float(cursorDelta.m_x) * rotateSpeed * Invert(m_invertYawFn()); nextCamera.m_yaw = WrapYawRotation(nextCamera.m_yaw); - nextCamera.m_pitch = ClampPitchRotation(nextCamera.m_pitch); + if (m_constrainPitch()) + { + nextCamera.m_pitch = ClampPitchRotation(nextCamera.m_pitch); + } return nextCamera; } @@ -748,14 +756,14 @@ namespace AzFramework Camera SmoothCamera(const Camera& currentCamera, const Camera& targetCamera, const CameraProps& cameraProps, const float deltaTime) { - const auto clamp_rotation = [](const float angle) + const auto clampRotation = [](const float angle) { return AZStd::fmod(angle + AZ::Constants::TwoPi, AZ::Constants::TwoPi); }; // keep yaw in 0 - 360 range - float targetYaw = clamp_rotation(targetCamera.m_yaw); - const float currentYaw = clamp_rotation(currentCamera.m_yaw); + float targetYaw = clampRotation(targetCamera.m_yaw); + const float currentYaw = clampRotation(currentCamera.m_yaw); // return the sign of the float input (-1, 0, 1) const auto sign = [](const float value) @@ -764,8 +772,7 @@ namespace AzFramework }; // ensure smooth transition when moving across 0 - 360 boundary - const float yawDelta = targetYaw - currentYaw; - if (AZStd::abs(yawDelta) >= AZ::Constants::Pi) + if (const float yawDelta = targetYaw - currentYaw; AZStd::abs(yawDelta) >= AZ::Constants::Pi) { targetYaw -= AZ::Constants::TwoPi * sign(yawDelta); } diff --git a/Code/Framework/AzFramework/AzFramework/Viewport/CameraInput.h b/Code/Framework/AzFramework/AzFramework/Viewport/CameraInput.h index ad9fed0f5d..4eea94cbe7 100644 --- a/Code/Framework/AzFramework/AzFramework/Viewport/CameraInput.h +++ b/Code/Framework/AzFramework/AzFramework/Viewport/CameraInput.h @@ -347,6 +347,7 @@ namespace AzFramework AZStd::function m_rotateSpeedFn; AZStd::function m_invertPitchFn; AZStd::function m_invertYawFn; + AZStd::function m_constrainPitch; private: InputChannelId m_rotateChannelId; //!< Input channel to begin the rotate camera input. diff --git a/Code/Framework/AzFramework/Tests/CameraInputTests.cpp b/Code/Framework/AzFramework/Tests/CameraInputTests.cpp index a89fb0bd84..005623677c 100644 --- a/Code/Framework/AzFramework/Tests/CameraInputTests.cpp +++ b/Code/Framework/AzFramework/Tests/CameraInputTests.cpp @@ -104,9 +104,10 @@ namespace UnitTest AZStd::shared_ptr m_orbitCamera; AZ::Vector3 m_pivot = AZ::Vector3::CreateZero(); - //! This is approximately Pi/2 * 1000 - this can be used to rotate the camera 90 degrees (pitch or yaw based - //! on vertical or horizontal motion) as the rotate speed function is set to be 1/1000. - inline static const int PixelMotionDelta = 1570; + // this is approximately Pi/2 * 1000 - this can be used to rotate the camera 90 degrees (pitch or yaw based + // on vertical or horizontal motion) as the rotate speed function is set to be 1/1000. + inline static const int PixelMotionDelta90Degrees = 1570; + inline static const int PixelMotionDelta135Degrees = 2356; }; TEST_F(CameraInputFixture, BeginAndEndOrbitCameraInputConsumesCorrectEvents) @@ -292,7 +293,7 @@ namespace UnitTest HandleEventAndUpdate( AzFramework::DiscreteInputEvent{ AzFramework::InputDeviceMouse::Button::Right, AzFramework::InputChannel::State::Began }); - HandleEventAndUpdate(AzFramework::HorizontalMotionEvent{ PixelMotionDelta }); + HandleEventAndUpdate(AzFramework::HorizontalMotionEvent{ PixelMotionDelta90Degrees }); const float expectedYaw = AzFramework::WrapYawRotation(-AZ::Constants::HalfPi); @@ -310,7 +311,7 @@ namespace UnitTest HandleEventAndUpdate( AzFramework::DiscreteInputEvent{ AzFramework::InputDeviceMouse::Button::Right, AzFramework::InputChannel::State::Began }); - HandleEventAndUpdate(AzFramework::VerticalMotionEvent{ PixelMotionDelta }); + HandleEventAndUpdate(AzFramework::VerticalMotionEvent{ PixelMotionDelta90Degrees }); const float expectedPitch = AzFramework::ClampPitchRotation(-AZ::Constants::HalfPi); @@ -331,7 +332,7 @@ namespace UnitTest HandleEventAndUpdate(AzFramework::DiscreteInputEvent{ m_orbitChannelId, AzFramework::InputChannel::State::Began }); HandleEventAndUpdate( AzFramework::DiscreteInputEvent{ AzFramework::InputDeviceMouse::Button::Left, AzFramework::InputChannel::State::Began }); - HandleEventAndUpdate(AzFramework::VerticalMotionEvent{ PixelMotionDelta }); + HandleEventAndUpdate(AzFramework::VerticalMotionEvent{ PixelMotionDelta90Degrees }); const auto expectedCameraEndingPosition = AZ::Vector3(0.0f, -10.0f, 10.0f); const float expectedPitch = AzFramework::ClampPitchRotation(-AZ::Constants::HalfPi); @@ -354,7 +355,7 @@ namespace UnitTest HandleEventAndUpdate(AzFramework::DiscreteInputEvent{ m_orbitChannelId, AzFramework::InputChannel::State::Began }); HandleEventAndUpdate( AzFramework::DiscreteInputEvent{ AzFramework::InputDeviceMouse::Button::Left, AzFramework::InputChannel::State::Began }); - HandleEventAndUpdate(AzFramework::HorizontalMotionEvent{ -PixelMotionDelta }); + HandleEventAndUpdate(AzFramework::HorizontalMotionEvent{ -PixelMotionDelta90Degrees }); const auto expectedCameraEndingPosition = AZ::Vector3(20.0f, -5.0f, 0.0f); const float expectedYaw = AzFramework::WrapYawRotation(AZ::Constants::HalfPi); @@ -366,4 +367,42 @@ namespace UnitTest EXPECT_THAT(m_camera.m_offset, IsClose(AZ::Vector3(5.0f, -10.0f, 0.0f))); EXPECT_THAT(m_camera.Translation(), IsCloseTolerance(expectedCameraEndingPosition, 0.01f)); } + + TEST_F(CameraInputFixture, CameraPitchCanNotBeMovedPastNinetyDegreesWhenConstrained) + { + const auto cameraStartingPosition = AZ::Vector3(15.0f, -20.0f, 0.0f); + m_targetCamera.m_pivot = cameraStartingPosition; + + HandleEventAndUpdate( + AzFramework::DiscreteInputEvent{ AzFramework::InputDeviceMouse::Button::Right, AzFramework::InputChannel::State::Began }); + // pitch by 135.0 degrees + HandleEventAndUpdate(AzFramework::VerticalMotionEvent{ -PixelMotionDelta135Degrees }); + + // clamped to 90.0 degrees + const float expectedPitch = AZ::DegToRad(90.0f); + + using ::testing::FloatNear; + EXPECT_THAT(m_camera.m_pitch, FloatNear(expectedPitch, 0.001f)); + } + + TEST_F(CameraInputFixture, CameraPitchCanBeMovedPastNinetyDegreesWhenUnconstrained) + { + m_firstPersonRotateCamera->m_constrainPitch = [] + { + return false; + }; + + const auto cameraStartingPosition = AZ::Vector3(15.0f, -20.0f, 0.0f); + m_targetCamera.m_pivot = cameraStartingPosition; + + HandleEventAndUpdate( + AzFramework::DiscreteInputEvent{ AzFramework::InputDeviceMouse::Button::Right, AzFramework::InputChannel::State::Began }); + // pitch by 135.0 degrees + HandleEventAndUpdate(AzFramework::VerticalMotionEvent{ -PixelMotionDelta135Degrees }); + + const float expectedPitch = AZ::DegToRad(135.0f); + + using ::testing::FloatNear; + EXPECT_THAT(m_camera.m_pitch, FloatNear(expectedPitch, 0.001f)); + } } // namespace UnitTest diff --git a/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Viewport/ModularViewportCameraController.h b/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Viewport/ModularViewportCameraController.h index 65eff30874..45c5394fd8 100644 --- a/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Viewport/ModularViewportCameraController.h +++ b/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Viewport/ModularViewportCameraController.h @@ -112,7 +112,8 @@ namespace AtomToolsFramework void UpdateViewport(const AzFramework::ViewportControllerUpdateEvent& event) override; // ModularViewportCameraControllerRequestBus overrides ... - void InterpolateToTransform(const AZ::Transform& worldFromLocal) override; + bool InterpolateToTransform(const AZ::Transform& worldFromLocal) override; + bool IsInterpolating() const override; void StartTrackingTransform(const AZ::Transform& worldFromLocal) override; void StopTrackingTransform() override; bool IsTrackingTransform() const override; diff --git a/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Viewport/ModularViewportCameraControllerRequestBus.h b/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Viewport/ModularViewportCameraControllerRequestBus.h index 59c13bb4b8..4422751d6b 100644 --- a/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Viewport/ModularViewportCameraControllerRequestBus.h +++ b/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Viewport/ModularViewportCameraControllerRequestBus.h @@ -23,13 +23,20 @@ namespace AtomToolsFramework class ModularViewportCameraControllerRequests : public AZ::EBusTraits { public: + static inline constexpr float InterpolateToTransformDuration = 1.0f; + using BusIdType = AzFramework::ViewportId; static const AZ::EBusAddressPolicy AddressPolicy = AZ::EBusAddressPolicy::ById; static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Single; //! Begin a smooth transition of the camera to the requested transform. //! @param worldFromLocal The transform of where the camera should end up. - virtual void InterpolateToTransform(const AZ::Transform& worldFromLocal) = 0; + //! @return Returns true if the call began an interpolation and false otherwise. Calls to InterpolateToTransform + //! will have no effect if an interpolation is currently in progress. + virtual bool InterpolateToTransform(const AZ::Transform& worldFromLocal) = 0; + + //! Returns if the camera is currently interpolating to a new transform. + virtual bool IsInterpolating() const = 0; //! Start tracking a transform. //! Store the current camera transform and move to the next camera transform. diff --git a/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Viewport/ModularViewportCameraController.cpp b/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Viewport/ModularViewportCameraController.cpp index e8aca16826..179ccd9fd8 100644 --- a/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Viewport/ModularViewportCameraController.cpp +++ b/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Viewport/ModularViewportCameraController.cpp @@ -235,7 +235,10 @@ namespace AtomToolsFramework return t * t * t * (t * (t * 6.0f - 15.0f) + 10.0f); }; - m_cameraAnimation.m_time = AZ::GetClamp(m_cameraAnimation.m_time + event.m_deltaTime.count(), 0.0f, 1.0f); + m_cameraAnimation.m_time = AZ::GetClamp( + m_cameraAnimation.m_time + + (event.m_deltaTime.count() / ModularViewportCameraControllerRequests::InterpolateToTransformDuration), + 0.0f, 1.0f); const auto& [transformStart, transformEnd, animationTime] = m_cameraAnimation; @@ -263,10 +266,22 @@ namespace AtomToolsFramework m_updatingTransformInternally = false; } - void ModularViewportCameraControllerInstance::InterpolateToTransform(const AZ::Transform& worldFromLocal) + bool ModularViewportCameraControllerInstance::InterpolateToTransform(const AZ::Transform& worldFromLocal) { - m_cameraMode = CameraMode::Animation; - m_cameraAnimation = CameraAnimation{ CombinedCameraTransform(), worldFromLocal, 0.0f }; + if (!IsInterpolating()) + { + m_cameraMode = CameraMode::Animation; + m_cameraAnimation = CameraAnimation{ CombinedCameraTransform(), worldFromLocal, 0.0f }; + + return true; + } + + return false; + } + + bool ModularViewportCameraControllerInstance::IsInterpolating() const + { + return m_cameraMode == CameraMode::Animation; } void ModularViewportCameraControllerInstance::StartTrackingTransform(const AZ::Transform& worldFromLocal) From a051bdeeb0687d07851c0034fe9dc7e14dbf541f Mon Sep 17 00:00:00 2001 From: Steve Pham <82231385+spham-amzn@users.noreply.github.com> Date: Wed, 17 Nov 2021 08:28:33 -0800 Subject: [PATCH 087/345] Enably QtForPython for Linux (#5667) - Fix PALification and include Linux for the QtForPython gem - Add Linux-only module loader for Pyside2 related modules - Remove (unnecessary) #if !defined(Q_OS_WIN) Signed-off-by: Steve Pham <82231385+spham-amzn@users.noreply.github.com> --- Gems/QtForPython/Code/CMakeLists.txt | 6 +- .../Linux/InitializeEmbeddedPyside2.h | 60 +++++++++++++++++++ .../Source/Platform/Linux/PAL_linux.cmake | 2 +- .../qtforpython_editor_linux_files.cmake | 11 ++++ .../Platform/Mac/InitializeEmbeddedPyside2.h | 18 ++++++ .../Mac/qtforpython_editor_macos_files.cmake | 11 ++++ .../Windows/InitializeEmbeddedPyside2.h | 18 ++++++ .../qtforpython_editor_windows_files.cmake | 11 ++++ .../Code/Source/QtForPythonModule.cpp | 6 ++ .../Source/QtForPythonSystemComponent.cpp | 4 -- .../qtforpython_editor_files.cmake} | 0 ...s.cmake => qtforpython_editor_files.cmake} | 0 .../Linux/BuiltInPackages_linux.cmake | 1 + 13 files changed, 142 insertions(+), 6 deletions(-) create mode 100644 Gems/QtForPython/Code/Source/Platform/Linux/InitializeEmbeddedPyside2.h create mode 100644 Gems/QtForPython/Code/Source/Platform/Linux/qtforpython_editor_linux_files.cmake create mode 100644 Gems/QtForPython/Code/Source/Platform/Mac/InitializeEmbeddedPyside2.h create mode 100644 Gems/QtForPython/Code/Source/Platform/Mac/qtforpython_editor_macos_files.cmake create mode 100644 Gems/QtForPython/Code/Source/Platform/Windows/InitializeEmbeddedPyside2.h create mode 100644 Gems/QtForPython/Code/Source/Platform/Windows/qtforpython_editor_windows_files.cmake rename Gems/QtForPython/Code/{qtforpython_editor_macos_files.cmake => Source/qtforpython_editor_files.cmake} (100%) rename Gems/QtForPython/Code/{qtforpython_editor_windows_files.cmake => qtforpython_editor_files.cmake} (100%) diff --git a/Gems/QtForPython/Code/CMakeLists.txt b/Gems/QtForPython/Code/CMakeLists.txt index 48ce5c02d3..da763978a6 100644 --- a/Gems/QtForPython/Code/CMakeLists.txt +++ b/Gems/QtForPython/Code/CMakeLists.txt @@ -21,7 +21,8 @@ ly_add_target( NAME QtForPython.Editor.Static STATIC NAMESPACE Gem FILES_CMAKE - qtforpython_editor_${PAL_PLATFORM_NAME_LOWERCASE}_files.cmake + qtforpython_editor_files.cmake + ${CMAKE_CURRENT_SOURCE_DIR}/Source/Platform/${PAL_PLATFORM_NAME}/qtforpython_editor_${PAL_PLATFORM_NAME_LOWERCASE}_files.cmake PLATFORM_INCLUDE_FILES ${common_source_dir}/${PAL_TRAIT_COMPILER_ID}/qtforpython_${PAL_TRAIT_COMPILER_ID_LOWERCASE}.cmake INCLUDE_DIRECTORIES @@ -45,6 +46,9 @@ ly_add_target( NAMESPACE Gem FILES_CMAKE qtforpython_shared_files.cmake + INCLUDE_DIRECTORIES + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR}/Source/Platform/${PAL_PLATFORM_NAME} BUILD_DEPENDENCIES PRIVATE Gem::QtForPython.Editor.Static diff --git a/Gems/QtForPython/Code/Source/Platform/Linux/InitializeEmbeddedPyside2.h b/Gems/QtForPython/Code/Source/Platform/Linux/InitializeEmbeddedPyside2.h new file mode 100644 index 0000000000..f27b54810f --- /dev/null +++ b/Gems/QtForPython/Code/Source/Platform/Linux/InitializeEmbeddedPyside2.h @@ -0,0 +1,60 @@ +/* + * 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 +#include + +namespace QtForPython +{ + const char* s_libPythonLibraryFile = "libpython3.7m.so.1.0"; + const char* s_libPyside2LibraryFile = "libpyside2.abi3.so.5.14"; + const char* s_libShibokenLibraryFile = "libshiboken2.abi3.so.5.14"; + + class InitializeEmbeddedPyside2 + { + public: + InitializeEmbeddedPyside2() + { + m_libPythonLibraryFile = InitializeEmbeddedPyside2::LoadModule(s_libPythonLibraryFile); + m_libPyside2LibraryFile = InitializeEmbeddedPyside2::LoadModule(s_libPyside2LibraryFile); + m_libShibokenLibraryFile = InitializeEmbeddedPyside2::LoadModule(s_libShibokenLibraryFile); + } + virtual ~InitializeEmbeddedPyside2() + { + InitializeEmbeddedPyside2::UnloadModule(m_libShibokenLibraryFile); + InitializeEmbeddedPyside2::UnloadModule(m_libPyside2LibraryFile); + InitializeEmbeddedPyside2::UnloadModule(m_libPythonLibraryFile); + } + + private: + static void* LoadModule(const char* moduleToLoad) + { + void* moduleHandle = dlopen(moduleToLoad, RTLD_NOW | RTLD_GLOBAL); + if (!moduleHandle) + { + const char* loadError = dlerror(); + AZ_Error("QtForPython", false, "Unable to load python library %s for Pyside2: %s", moduleToLoad, + loadError ? loadError : "Unknown Error"); + } + return moduleHandle; + } + + static void UnloadModule(void* moduleHandle) + { + if (moduleHandle) + { + dlclose(moduleHandle); + } + } + + void* m_libPythonLibraryFile; + void* m_libPyside2LibraryFile; + void* m_libShibokenLibraryFile; + }; +} // namespace QtForPython diff --git a/Gems/QtForPython/Code/Source/Platform/Linux/PAL_linux.cmake b/Gems/QtForPython/Code/Source/Platform/Linux/PAL_linux.cmake index 236043e893..789d2afae2 100644 --- a/Gems/QtForPython/Code/Source/Platform/Linux/PAL_linux.cmake +++ b/Gems/QtForPython/Code/Source/Platform/Linux/PAL_linux.cmake @@ -6,4 +6,4 @@ # # -set(PAL_TRAIT_BUILD_QTFORPYTHON_SUPPORTED FALSE) +set(PAL_TRAIT_BUILD_QTFORPYTHON_SUPPORTED TRUE) diff --git a/Gems/QtForPython/Code/Source/Platform/Linux/qtforpython_editor_linux_files.cmake b/Gems/QtForPython/Code/Source/Platform/Linux/qtforpython_editor_linux_files.cmake new file mode 100644 index 0000000000..54c588a247 --- /dev/null +++ b/Gems/QtForPython/Code/Source/Platform/Linux/qtforpython_editor_linux_files.cmake @@ -0,0 +1,11 @@ +# +# 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 +# +# + +set(FILES + InitializeEmbeddedPyside2.h +) diff --git a/Gems/QtForPython/Code/Source/Platform/Mac/InitializeEmbeddedPyside2.h b/Gems/QtForPython/Code/Source/Platform/Mac/InitializeEmbeddedPyside2.h new file mode 100644 index 0000000000..819764620b --- /dev/null +++ b/Gems/QtForPython/Code/Source/Platform/Mac/InitializeEmbeddedPyside2.h @@ -0,0 +1,18 @@ +/* + * 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 QtForPython +{ + class InitializeEmbeddedPyside2 + { + public: + InitializeEmbeddedPyside2() = default; + virtual ~InitializeEmbeddedPyside2() = default; + }; +} // namespace QtForPython diff --git a/Gems/QtForPython/Code/Source/Platform/Mac/qtforpython_editor_macos_files.cmake b/Gems/QtForPython/Code/Source/Platform/Mac/qtforpython_editor_macos_files.cmake new file mode 100644 index 0000000000..54c588a247 --- /dev/null +++ b/Gems/QtForPython/Code/Source/Platform/Mac/qtforpython_editor_macos_files.cmake @@ -0,0 +1,11 @@ +# +# 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 +# +# + +set(FILES + InitializeEmbeddedPyside2.h +) diff --git a/Gems/QtForPython/Code/Source/Platform/Windows/InitializeEmbeddedPyside2.h b/Gems/QtForPython/Code/Source/Platform/Windows/InitializeEmbeddedPyside2.h new file mode 100644 index 0000000000..819764620b --- /dev/null +++ b/Gems/QtForPython/Code/Source/Platform/Windows/InitializeEmbeddedPyside2.h @@ -0,0 +1,18 @@ +/* + * 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 QtForPython +{ + class InitializeEmbeddedPyside2 + { + public: + InitializeEmbeddedPyside2() = default; + virtual ~InitializeEmbeddedPyside2() = default; + }; +} // namespace QtForPython diff --git a/Gems/QtForPython/Code/Source/Platform/Windows/qtforpython_editor_windows_files.cmake b/Gems/QtForPython/Code/Source/Platform/Windows/qtforpython_editor_windows_files.cmake new file mode 100644 index 0000000000..54c588a247 --- /dev/null +++ b/Gems/QtForPython/Code/Source/Platform/Windows/qtforpython_editor_windows_files.cmake @@ -0,0 +1,11 @@ +# +# 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 +# +# + +set(FILES + InitializeEmbeddedPyside2.h +) diff --git a/Gems/QtForPython/Code/Source/QtForPythonModule.cpp b/Gems/QtForPython/Code/Source/QtForPythonModule.cpp index 1ed79310b4..ad39d0b82c 100644 --- a/Gems/QtForPython/Code/Source/QtForPythonModule.cpp +++ b/Gems/QtForPython/Code/Source/QtForPythonModule.cpp @@ -8,13 +8,17 @@ #include #include +#include #include +#include "InitializeEmbeddedPyside2.h" + namespace QtForPython { class QtForPythonModule : public AZ::Module + , private InitializeEmbeddedPyside2 { public: AZ_RTTI(QtForPythonModule, "{81545CD5-79FA-47CE-96F2-1A9C5D59B4B9}", AZ::Module); @@ -22,11 +26,13 @@ namespace QtForPython QtForPythonModule() : AZ::Module() + , InitializeEmbeddedPyside2() { m_descriptors.insert(m_descriptors.end(), { QtForPythonSystemComponent::CreateDescriptor(), }); } + ~QtForPythonModule() override = default; /** * Add required SystemComponents to the SystemEntity. diff --git a/Gems/QtForPython/Code/Source/QtForPythonSystemComponent.cpp b/Gems/QtForPython/Code/Source/QtForPythonSystemComponent.cpp index 83a158dd18..240beff78e 100644 --- a/Gems/QtForPython/Code/Source/QtForPythonSystemComponent.cpp +++ b/Gems/QtForPython/Code/Source/QtForPythonSystemComponent.cpp @@ -203,10 +203,6 @@ namespace QtForPython { QtBootstrapParameters params; -#if !defined(Q_OS_WIN) -#error Unsupported OS platform for this QtForPython gem -#endif - params.m_mainWindowId = 0; using namespace AzToolsFramework; QWidget* activeWindow = nullptr; diff --git a/Gems/QtForPython/Code/qtforpython_editor_macos_files.cmake b/Gems/QtForPython/Code/Source/qtforpython_editor_files.cmake similarity index 100% rename from Gems/QtForPython/Code/qtforpython_editor_macos_files.cmake rename to Gems/QtForPython/Code/Source/qtforpython_editor_files.cmake diff --git a/Gems/QtForPython/Code/qtforpython_editor_windows_files.cmake b/Gems/QtForPython/Code/qtforpython_editor_files.cmake similarity index 100% rename from Gems/QtForPython/Code/qtforpython_editor_windows_files.cmake rename to Gems/QtForPython/Code/qtforpython_editor_files.cmake diff --git a/cmake/3rdParty/Platform/Linux/BuiltInPackages_linux.cmake b/cmake/3rdParty/Platform/Linux/BuiltInPackages_linux.cmake index af7afff5dc..903364d8f5 100644 --- a/cmake/3rdParty/Platform/Linux/BuiltInPackages_linux.cmake +++ b/cmake/3rdParty/Platform/Linux/BuiltInPackages_linux.cmake @@ -45,3 +45,4 @@ ly_associate_package(PACKAGE_NAME squish-ccr-deb557d-rev1-linux ly_associate_package(PACKAGE_NAME astc-encoder-3.2-rev1-linux TARGETS astc-encoder PACKAGE_HASH 2ba97a06474d609945f0ab4419af1f6bbffdd294ca6b869f5fcebec75c573c0f) ly_associate_package(PACKAGE_NAME ISPCTexComp-36b80aa-rev1-linux TARGETS ISPCTexComp PACKAGE_HASH 065fd12abe4247dde247330313763cf816c3375c221da030bdec35024947f259) ly_associate_package(PACKAGE_NAME lz4-1.9.3-vcpkg-rev4-linux TARGETS lz4 PACKAGE_HASH 5de3dbd3e2a3537c6555d759b3c5bb98e5456cf85c74ff6d046f809b7087290d) +ly_associate_package(PACKAGE_NAME pyside2-5.15.2-rev1-linux TARGETS pyside2 PACKAGE_HASH ec04291f3940e76ac817bc0c825f7a47f18d8760f0bdb8da4530732f2a69405e) From cb552256f8746d825f72bfdfd8ffceaf0d4f8007 Mon Sep 17 00:00:00 2001 From: Guthrie Adams Date: Tue, 16 Nov 2021 23:23:25 -0600 Subject: [PATCH 088/345] Moved asynchronous image loading function to atom tools framework Moved settings registry wrapper function to atom tools framework Created registry settings with default values for preview configurations based on asset type Changed lighting preset previews and thumbnails to use reflective material Created registry settings for preset selection dialog borders, padding, sizes Updated shared preview utility functions to compare against registered asset types instead of passing them in individually Signed-off-by: Guthrie Adams --- .../AtomToolsFramework/Code/CMakeLists.txt | 3 + .../Include/AtomToolsFramework/Util/Util.h | 18 +++- .../Code/Source/Util/Util.cpp | 35 ++++++- .../Tools/MaterialEditor/Code/CMakeLists.txt | 2 - .../Viewport/MaterialViewportComponent.cpp | 65 +++---------- .../LightingPresetBrowserDialog.cpp | 7 +- .../ModelPresetBrowserDialog.cpp | 5 +- .../PresetBrowserDialog.cpp | 16 +++- .../SharedPreview/SharedPreviewContent.h | 2 +- .../SharedPreview/SharedPreviewUtils.cpp | 93 +++++++++---------- .../Source/SharedPreview/SharedPreviewUtils.h | 28 +++--- .../Source/SharedPreview/SharedThumbnail.cpp | 21 ++--- .../Source/SharedPreview/SharedThumbnail.h | 3 +- .../SharedPreview/SharedThumbnailRenderer.cpp | 62 +++++++++++-- .../SharedPreview/SharedThumbnailRenderer.h | 12 ++- 15 files changed, 225 insertions(+), 147 deletions(-) diff --git a/Gems/Atom/Tools/AtomToolsFramework/Code/CMakeLists.txt b/Gems/Atom/Tools/AtomToolsFramework/Code/CMakeLists.txt index 40c8d7956e..49eb94e1e7 100644 --- a/Gems/Atom/Tools/AtomToolsFramework/Code/CMakeLists.txt +++ b/Gems/Atom/Tools/AtomToolsFramework/Code/CMakeLists.txt @@ -42,6 +42,7 @@ ly_add_target( Gem::Atom_RHI.Reflect Gem::Atom_Feature_Common.Static Gem::Atom_Bootstrap.Headers + Gem::ImageProcessingAtom.Headers ) ly_add_target( @@ -60,6 +61,8 @@ ly_add_target( BUILD_DEPENDENCIES PRIVATE Gem::AtomToolsFramework.Static + RUNTIME_DEPENDENCIES + Gem::ImageProcessingAtom.Editor ) ################################################################################ diff --git a/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Util/Util.h b/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Util/Util.h index 1ad6f69961..ab2b8b46c0 100644 --- a/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Util/Util.h +++ b/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Util/Util.h @@ -8,8 +8,9 @@ #pragma once -#include #include +#include +#include #include AZ_PUSH_DISABLE_WARNING(4251 4800, "-Wunknown-warning-option") // disable warnings spawned by QT @@ -18,11 +19,24 @@ AZ_PUSH_DISABLE_WARNING(4251 4800, "-Wunknown-warning-option") // disable warnin #include AZ_POP_DISABLE_WARNING +class QImage; + namespace AtomToolsFramework { + template + T GetSettingOrDefault(AZStd::string_view path, const T& defaultValue) + { + T result; + auto settingsRegistry = AZ::SettingsRegistry::Get(); + return (settingsRegistry && settingsRegistry->Get(result, path)) ? result : defaultValue; + } + + using LoadImageAsyncCallback = AZStd::function; + void LoadImageAsync(const AZStd::string& path, LoadImageAsyncCallback callback); + QFileInfo GetSaveFileInfo(const QString& initialPath); QFileInfo GetOpenFileInfo(const AZStd::vector& assetTypes); QFileInfo GetUniqueFileInfo(const QString& initialPath); QFileInfo GetDuplicationFileInfo(const QString& initialPath); bool LaunchTool(const QString& baseName, const QString& extension, const QStringList& arguments); -} +} // namespace AtomToolsFramework diff --git a/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Util/Util.cpp b/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Util/Util.cpp index d3bce34af3..cd50c10e23 100644 --- a/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Util/Util.cpp +++ b/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Util/Util.cpp @@ -6,15 +6,18 @@ * */ +#include +#include #include #include +#include #include #include #include #include +#include #include #include -#include AZ_PUSH_DISABLE_WARNING(4251 4800, "-Wunknown-warning-option") // disable warnings spawned by QT #include @@ -24,6 +27,36 @@ AZ_POP_DISABLE_WARNING namespace AtomToolsFramework { + void LoadImageAsync(const AZStd::string& path, LoadImageAsyncCallback callback) + { + AZ::Job* job = AZ::CreateJobFunction( + [path, callback]() + { + ImageProcessingAtom::IImageObjectPtr imageObject; + ImageProcessingAtom::ImageProcessingRequestBus::BroadcastResult( + imageObject, &ImageProcessingAtom::ImageProcessingRequests::LoadImagePreview, path); + + if (imageObject) + { + AZ::u8* imageBuf = nullptr; + AZ::u32 pitch = 0; + AZ::u32 mip = 0; + imageObject->GetImagePointer(mip, imageBuf, pitch); + const AZ::u32 width = imageObject->GetWidth(mip); + const AZ::u32 height = imageObject->GetHeight(mip); + + QImage image(imageBuf, width, height, pitch, QImage::Format_RGBA8888); + + if (callback) + { + callback(image); + } + } + }, + true); + job->Start(); + } + QFileInfo GetSaveFileInfo(const QString& initialPath) { const QFileInfo initialFileInfo(initialPath); diff --git a/Gems/Atom/Tools/MaterialEditor/Code/CMakeLists.txt b/Gems/Atom/Tools/MaterialEditor/Code/CMakeLists.txt index d585e81162..99beb721d6 100644 --- a/Gems/Atom/Tools/MaterialEditor/Code/CMakeLists.txt +++ b/Gems/Atom/Tools/MaterialEditor/Code/CMakeLists.txt @@ -60,7 +60,6 @@ ly_add_target( Gem::AtomToolsFramework.Editor Gem::Atom_RPI.Public Gem::Atom_Feature_Common.Public - Gem::ImageProcessingAtom.Headers ) ly_add_target( @@ -113,7 +112,6 @@ ly_add_target( RUNTIME_DEPENDENCIES Gem::AtomToolsFramework.Editor Gem::EditorPythonBindings.Editor - Gem::ImageProcessingAtom.Editor ) ly_set_gem_variant_to_load(TARGETS MaterialEditor VARIANTS Tools) diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/MaterialViewportComponent.cpp b/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/MaterialViewportComponent.cpp index fb8639977d..c8df123d0d 100644 --- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/MaterialViewportComponent.cpp +++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/MaterialViewportComponent.cpp @@ -6,61 +6,26 @@ * */ -#include -#include -#include -#include -#include - -#include -#include -#include -#include -#include - -#include -#include -#include - -#include -#include - -#include - -#include -#include #include #include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include namespace MaterialEditor { - using LoadImageAsyncCallback = AZStd::function; - void LoadImageAsync(const AZStd::string& path, LoadImageAsyncCallback callback) - { - AZ::Job* job = AZ::CreateJobFunction([path, callback]() { - ImageProcessingAtom::IImageObjectPtr imageObject; - ImageProcessingAtom::ImageProcessingRequestBus::BroadcastResult(imageObject, &ImageProcessingAtom::ImageProcessingRequests::LoadImagePreview, path); - - if (imageObject) - { - AZ::u8* imageBuf = nullptr; - AZ::u32 pitch = 0; - AZ::u32 mip = 0; - imageObject->GetImagePointer(mip, imageBuf, pitch); - const AZ::u32 width = imageObject->GetWidth(mip); - const AZ::u32 height = imageObject->GetHeight(mip); - - QImage image(imageBuf, width, height, pitch, QImage::Format_RGBA8888); - - if (callback) - { - callback(image); - } - } - }, true); - job->Start(); - } - MaterialViewportComponent::MaterialViewportComponent() { } diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/PresetBrowserDialogs/LightingPresetBrowserDialog.cpp b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/PresetBrowserDialogs/LightingPresetBrowserDialog.cpp index 5cf867618d..f8ad038a85 100644 --- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/PresetBrowserDialogs/LightingPresetBrowserDialog.cpp +++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/PresetBrowserDialogs/LightingPresetBrowserDialog.cpp @@ -28,13 +28,16 @@ namespace MaterialEditor MaterialViewportRequestBus::BroadcastResult(presets, &MaterialViewportRequestBus::Events::GetLightingPresets); AZStd::sort(presets.begin(), presets.end(), [](const auto& a, const auto& b) { return a->m_displayName < b->m_displayName; }); + const int itemSize = aznumeric_cast( + AtomToolsFramework::GetSettingOrDefault("/O3DE/Atom/MaterialEditor/PresetBrowserDialog/LightingItemSize", 180)); + QListWidgetItem* selectedItem = nullptr; for (const auto& preset : presets) { AZStd::string path; MaterialViewportRequestBus::BroadcastResult(path, &MaterialViewportRequestBus::Events::GetLightingPresetLastSavePath, preset); - QListWidgetItem* item = - CreateListItem(preset->m_displayName.c_str(), AZ::RPI::AssetUtils::MakeAssetId(path, 0).GetValue(), QSize(180, 180)); + QListWidgetItem* item = CreateListItem( + preset->m_displayName.c_str(), AZ::RPI::AssetUtils::MakeAssetId(path, 0).GetValue(), QSize(itemSize, itemSize)); m_listItemToPresetMap[item] = preset; diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/PresetBrowserDialogs/ModelPresetBrowserDialog.cpp b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/PresetBrowserDialogs/ModelPresetBrowserDialog.cpp index 4e9c42575b..f5a1677462 100644 --- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/PresetBrowserDialogs/ModelPresetBrowserDialog.cpp +++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/PresetBrowserDialogs/ModelPresetBrowserDialog.cpp @@ -27,10 +27,13 @@ namespace MaterialEditor MaterialViewportRequestBus::BroadcastResult(presets, &MaterialViewportRequestBus::Events::GetModelPresets); AZStd::sort(presets.begin(), presets.end(), [](const auto& a, const auto& b) { return a->m_displayName < b->m_displayName; }); + const int itemSize = aznumeric_cast( + AtomToolsFramework::GetSettingOrDefault("/O3DE/Atom/MaterialEditor/PresetBrowserDialog/ModelItemSize", 90)); + QListWidgetItem* selectedItem = nullptr; for (const auto& preset : presets) { - QListWidgetItem* item = CreateListItem(preset->m_displayName.c_str(), preset->m_modelAsset.GetId(), QSize(90, 90)); + QListWidgetItem* item = CreateListItem(preset->m_displayName.c_str(), preset->m_modelAsset.GetId(), QSize(itemSize, itemSize)); m_listItemToPresetMap[item] = preset; diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/PresetBrowserDialogs/PresetBrowserDialog.cpp b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/PresetBrowserDialogs/PresetBrowserDialog.cpp index 3bda426b07..f2bb84dff6 100644 --- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/PresetBrowserDialogs/PresetBrowserDialog.cpp +++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/PresetBrowserDialogs/PresetBrowserDialog.cpp @@ -51,13 +51,21 @@ namespace MaterialEditor QListWidgetItem* PresetBrowserDialog::CreateListItem(const QString& title, const AZ::Data::AssetId& assetId, const QSize& size) { + const int itemBorder = aznumeric_cast( + AtomToolsFramework::GetSettingOrDefault("/O3DE/Atom/MaterialEditor/PresetBrowserDialog/ItemBorder", 4)); + const int itemSpacing = aznumeric_cast( + AtomToolsFramework::GetSettingOrDefault("/O3DE/Atom/MaterialEditor/PresetBrowserDialog/ItemSpacing", 10)); + const int headerHeight = aznumeric_cast( + AtomToolsFramework::GetSettingOrDefault("/O3DE/Atom/MaterialEditor/PresetBrowserDialog/HeaderHeight", 15)); + const QSize gridSize = m_ui->m_presetList->gridSize(); - m_ui->m_presetList->setGridSize( - QSize(AZStd::max(gridSize.width(), size.width() + 10), AZStd::max(gridSize.height(), size.height() + 10 + 15))); + m_ui->m_presetList->setGridSize(QSize( + AZStd::max(gridSize.width(), size.width() + itemSpacing), + AZStd::max(gridSize.height(), size.height() + itemSpacing + headerHeight))); QListWidgetItem* item = new QListWidgetItem(m_ui->m_presetList); item->setData(Qt::UserRole, title); - item->setSizeHint(size + QSize(4, 19)); + item->setSizeHint(size + QSize(itemBorder, itemBorder + headerHeight)); m_ui->m_presetList->addItem(item); QWidget* itemWidget = new QWidget(m_ui->m_presetList); @@ -67,7 +75,7 @@ namespace MaterialEditor AzQtComponents::ElidingLabel* header = new AzQtComponents::ElidingLabel(itemWidget); header->setText(title); - header->setFixedSize(QSize(size.width(), 15)); + header->setFixedSize(QSize(size.width(), headerHeight)); header->setMargin(0); header->setStyleSheet("background-color: rgb(35, 35, 35)"); AzQtComponents::Text::addPrimaryStyle(header); diff --git a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/SharedPreview/SharedPreviewContent.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/SharedPreview/SharedPreviewContent.h index 140ef88ebd..dfab7a8630 100644 --- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/SharedPreview/SharedPreviewContent.h +++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/SharedPreview/SharedPreviewContent.h @@ -51,7 +51,7 @@ namespace AZ static constexpr float NearDist = 0.001f; static constexpr float FarDist = 100.0f; static constexpr float FieldOfView = Constants::HalfPi; - static constexpr float CameraRotationAngle = Constants::HalfPi / 6.0f; + static constexpr float CameraRotationAngle = Constants::QuarterPi / 3.0f; RPI::ScenePtr m_scene; RPI::ViewPtr m_view; diff --git a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/SharedPreview/SharedPreviewUtils.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/SharedPreview/SharedPreviewUtils.cpp index c2988cf53d..d0e288d239 100644 --- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/SharedPreview/SharedPreviewUtils.cpp +++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/SharedPreview/SharedPreviewUtils.cpp @@ -9,9 +9,11 @@ #include #include #include +#include #include #include #include +#include #include namespace AZ @@ -20,45 +22,64 @@ namespace AZ { namespace SharedPreviewUtils { - Data::AssetId GetAssetId( - AzToolsFramework::Thumbnailer::SharedThumbnailKey key, - const Data::AssetType& assetType, - const Data::AssetId& defaultAssetId) + AZStd::unordered_set GetSupportedAssetTypes() { + return { RPI::AnyAsset::RTTI_Type(), RPI::MaterialAsset::RTTI_Type(), RPI::ModelAsset::RTTI_Type() }; + } + + bool IsSupportedAssetType(AzToolsFramework::Thumbnailer::SharedThumbnailKey key) + { + return GetSupportedAssetInfo(key).m_assetId.IsValid(); + } + + AZ::Data::AssetInfo GetSupportedAssetInfo(AzToolsFramework::Thumbnailer::SharedThumbnailKey key) + { + const auto& supportedTypeIds = GetSupportedAssetTypes(); + // if it's a source thumbnail key, find first product with a matching asset type auto sourceKey = azrtti_cast(key.data()); if (sourceKey) { bool foundIt = false; - AZStd::vector productsAssetInfo; + AZStd::vector productsAssetInfo; AzToolsFramework::AssetSystemRequestBus::BroadcastResult( foundIt, &AzToolsFramework::AssetSystemRequestBus::Events::GetAssetsProducedBySourceUUID, sourceKey->GetSourceUuid(), productsAssetInfo); - if (!foundIt) - { - return defaultAssetId; - } - auto assetInfoIt = AZStd::find_if( - productsAssetInfo.begin(), productsAssetInfo.end(), - [&assetType](const Data::AssetInfo& assetInfo) - { - return assetInfo.m_assetType == assetType; - }); - if (assetInfoIt == productsAssetInfo.end()) - { - return defaultAssetId; - } - return assetInfoIt->m_assetId; + for (const auto& assetInfo : productsAssetInfo) + { + if (supportedTypeIds.find(assetInfo.m_assetType) != supportedTypeIds.end()) + { + return assetInfo; + } + } + return AZ::Data::AssetInfo(); } // if it's a product thumbnail key just return its assetId + AZ::Data::AssetInfo assetInfo; auto productKey = azrtti_cast(key.data()); - if (productKey && productKey->GetAssetType() == assetType) + if (productKey && supportedTypeIds.find(productKey->GetAssetType()) != supportedTypeIds.end()) { - return productKey->GetAssetId(); + AZ::Data::AssetCatalogRequestBus::BroadcastResult( + assetInfo, &AZ::Data::AssetCatalogRequestBus::Events::GetAssetInfoById, productKey->GetAssetId()); } - return defaultAssetId; + return assetInfo; + } + + AZ::Data::AssetId GetSupportedAssetId(AzToolsFramework::Thumbnailer::SharedThumbnailKey key, const AZ::Data::AssetId& defaultAssetId) + { + const AZ::Data::AssetInfo assetInfo = GetSupportedAssetInfo(key); + return assetInfo.m_assetId.IsValid() ? assetInfo.m_assetId : defaultAssetId; + } + + AZ::Data::AssetId GetAssetIdForProductPath(const AZStd::string_view productPath) + { + if (!productPath.empty()) + { + return AZ::RPI::AssetUtils::GetAssetIdForProductPath(productPath.data()); + } + return AZ::Data::AssetId(); } QString WordWrap(const QString& string, int maxLength) @@ -85,32 +106,6 @@ namespace AZ } return result; } - - AZStd::unordered_set GetSupportedAssetTypes() - { - return { RPI::AnyAsset::RTTI_Type(), RPI::MaterialAsset::RTTI_Type(), RPI::ModelAsset::RTTI_Type() }; - } - - bool IsSupportedAssetType(AzToolsFramework::Thumbnailer::SharedThumbnailKey key) - { - for (const AZ::Uuid& typeId : SharedPreviewUtils::GetSupportedAssetTypes()) - { - const AZ::Data::AssetId& assetId = SharedPreviewUtils::GetAssetId(key, typeId); - if (assetId.IsValid()) - { - if (typeId == RPI::AnyAsset::RTTI_Type()) - { - AZ::Data::AssetInfo assetInfo; - AZ::Data::AssetCatalogRequestBus::BroadcastResult( - assetInfo, &AZ::Data::AssetCatalogRequestBus::Events::GetAssetInfoById, assetId); - return AzFramework::StringFunc::EndsWith(assetInfo.m_relativePath.c_str(), "lightingpreset.azasset"); - } - return true; - } - } - - return false; - } } // namespace SharedPreviewUtils } // namespace LyIntegration } // namespace AZ diff --git a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/SharedPreview/SharedPreviewUtils.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/SharedPreview/SharedPreviewUtils.h index 6c5d83d22a..28c9809d6d 100644 --- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/SharedPreview/SharedPreviewUtils.h +++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/SharedPreview/SharedPreviewUtils.h @@ -8,9 +8,9 @@ #pragma once -#include - #if !defined(Q_MOC_RUN) +#include +#include #include #endif @@ -20,21 +20,25 @@ namespace AZ { namespace SharedPreviewUtils { - //! Get assetId by assetType that belongs to either source or product thumbnail key - Data::AssetId GetAssetId( - AzToolsFramework::Thumbnailer::SharedThumbnailKey key, - const Data::AssetType& assetType, - const Data::AssetId& defaultAssetId = {}); - - //! Word wrap function for previewer QLabel, since by default it does not break long words such as filenames, so manual word - //! wrap needed - QString WordWrap(const QString& string, int maxLength); - //! Get the set of all asset types supported by the shared preview AZStd::unordered_set GetSupportedAssetTypes(); //! Determine if a thumbnail key has an asset supported by the shared preview bool IsSupportedAssetType(AzToolsFramework::Thumbnailer::SharedThumbnailKey key); + + //! Get assetInfo of source or product thumbnail key if asset type is supported by the shared preview + AZ::Data::AssetInfo GetSupportedAssetInfo(AzToolsFramework::Thumbnailer::SharedThumbnailKey key); + + //! Get assetId of source or product thumbnail key if asset type is supported by the shared preview + AZ::Data::AssetId GetSupportedAssetId( + AzToolsFramework::Thumbnailer::SharedThumbnailKey key, const AZ::Data::AssetId& defaultAssetId = {}); + + //! Wraps AZ::RPI::AssetUtils::GetAssetIdForProductPath to handle empty productPath + AZ::Data::AssetId GetAssetIdForProductPath(const AZStd::string_view productPath); + + //! Inserts new line characters into a string whenever the maximum number of characters per line is exceeded + QString WordWrap(const QString& string, int maxLength); + } // namespace SharedPreviewUtils } // namespace LyIntegration } // namespace AZ diff --git a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/SharedPreview/SharedThumbnail.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/SharedPreview/SharedThumbnail.cpp index 5d82bac139..d07c4577e8 100644 --- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/SharedPreview/SharedThumbnail.cpp +++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/SharedPreview/SharedThumbnail.cpp @@ -22,18 +22,13 @@ namespace AZ ////////////////////////////////////////////////////////////////////////// SharedThumbnail::SharedThumbnail(AzToolsFramework::Thumbnailer::SharedThumbnailKey key) : Thumbnail(key) + , m_assetInfo(SharedPreviewUtils::GetSupportedAssetInfo(key)) { - for (const AZ::Uuid& typeId : SharedPreviewUtils::GetSupportedAssetTypes()) + if (m_assetInfo.m_assetId.IsValid()) { - const AZ::Data::AssetId& assetId = SharedPreviewUtils::GetAssetId(key, typeId); - if (assetId.IsValid()) - { - m_assetId = assetId; - m_typeId = typeId; - AzToolsFramework::Thumbnailer::ThumbnailerRendererNotificationBus::Handler::BusConnect(key); - AzFramework::AssetCatalogEventBus::Handler::BusConnect(); - return; - } + AzToolsFramework::Thumbnailer::ThumbnailerRendererNotificationBus::Handler::BusConnect(key); + AzFramework::AssetCatalogEventBus::Handler::BusConnect(); + return; } AZ_Error("SharedThumbnail", false, "Failed to find matching assetId for the thumbnailKey."); @@ -43,7 +38,9 @@ namespace AZ void SharedThumbnail::LoadThread() { AzToolsFramework::Thumbnailer::ThumbnailerRendererRequestBus::QueueEvent( - m_typeId, &AzToolsFramework::Thumbnailer::ThumbnailerRendererRequests::RenderThumbnail, m_key, SharedThumbnailSize); + m_assetInfo.m_assetType, &AzToolsFramework::Thumbnailer::ThumbnailerRendererRequests::RenderThumbnail, m_key, + SharedThumbnailSize); + // wait for response from thumbnail renderer m_renderWait.acquire(); } @@ -68,7 +65,7 @@ namespace AZ void SharedThumbnail::OnCatalogAssetChanged([[maybe_unused]] const AZ::Data::AssetId& assetId) { - if (m_assetId == assetId && m_state == State::Ready) + if (m_assetInfo.m_assetId == assetId && m_state == State::Ready) { m_state = State::Unloaded; Load(); diff --git a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/SharedPreview/SharedThumbnail.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/SharedPreview/SharedThumbnail.h index dee433e0bb..2d4b17a09e 100644 --- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/SharedPreview/SharedThumbnail.h +++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/SharedPreview/SharedThumbnail.h @@ -43,8 +43,7 @@ namespace AZ void OnCatalogAssetChanged(const AZ::Data::AssetId& assetId) override; AZStd::binary_semaphore m_renderWait; - Data::AssetId m_assetId; - AZ::Uuid m_typeId; + Data::AssetInfo m_assetInfo; }; //! Cache configuration for shared thumbnails diff --git a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/SharedPreview/SharedThumbnailRenderer.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/SharedPreview/SharedThumbnailRenderer.cpp index c43ba5f1cf..4ee75e3436 100644 --- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/SharedPreview/SharedThumbnailRenderer.cpp +++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/SharedPreview/SharedThumbnailRenderer.cpp @@ -8,6 +8,7 @@ #include #include +#include #include #include #include @@ -20,9 +21,9 @@ namespace AZ { SharedThumbnailRenderer::SharedThumbnailRenderer() { - m_defaultModelAsset.Create(DefaultModelAssetId, true); - m_defaultMaterialAsset.Create(DefaultMaterialAssetId, true); - m_defaultLightingPresetAsset.Create(DefaultLightingPresetAssetId, true); + m_defaultModelAsset.Create(SharedPreviewUtils::GetAssetIdForProductPath(DefaultModelPath), true); + m_defaultMaterialAsset.Create(SharedPreviewUtils::GetAssetIdForProductPath(DefaultMaterialPath), true); + m_defaultLightingPresetAsset.Create(SharedPreviewUtils::GetAssetIdForProductPath(DefaultLightingPresetPath), true); for (const AZ::Uuid& typeId : SharedPreviewUtils::GetSupportedAssetTypes()) { @@ -37,17 +38,66 @@ namespace AZ SystemTickBus::Handler::BusDisconnect(); } + SharedThumbnailRenderer::ThumbnailConfig SharedThumbnailRenderer::GetThumbnailConfig( + AzToolsFramework::Thumbnailer::SharedThumbnailKey thumbnailKey) + { + ThumbnailConfig thumbnailConfig; + + const auto assetInfo = SharedPreviewUtils::GetSupportedAssetInfo(thumbnailKey); + if (assetInfo.m_assetType == RPI::ModelAsset::RTTI_Type()) + { + static constexpr const char* MaterialAssetPathSetting = + "/O3DE/Atom/CommonFeature/SharedPreview/ModelAssetType/MaterialAssetPath"; + static constexpr const char* LightingAssetPathSetting = + "/O3DE/Atom/CommonFeature/SharedPreview/ModelAssetType/LightingAssetPath"; + + thumbnailConfig.m_modelId = assetInfo.m_assetId; + thumbnailConfig.m_materialId = SharedPreviewUtils::GetAssetIdForProductPath( + AtomToolsFramework::GetSettingOrDefault(MaterialAssetPathSetting, DefaultMaterialPath)); + thumbnailConfig.m_lightingId = SharedPreviewUtils::GetAssetIdForProductPath( + AtomToolsFramework::GetSettingOrDefault(LightingAssetPathSetting, DefaultLightingPresetPath)); + } + else if (assetInfo.m_assetType == RPI::MaterialAsset::RTTI_Type()) + { + static constexpr const char* ModelAssetPathSetting = + "/O3DE/Atom/CommonFeature/SharedPreview/MaterialAssetType/ModelAssetPath"; + static constexpr const char* LightingAssetPathSetting = + "/O3DE/Atom/CommonFeature/SharedPreview/MaterialAssetType/LightingAssetPath"; + + thumbnailConfig.m_modelId = SharedPreviewUtils::GetAssetIdForProductPath( + AtomToolsFramework::GetSettingOrDefault(ModelAssetPathSetting, DefaultModelPath)); + thumbnailConfig.m_materialId = assetInfo.m_assetId; + thumbnailConfig.m_lightingId = SharedPreviewUtils::GetAssetIdForProductPath( + AtomToolsFramework::GetSettingOrDefault(LightingAssetPathSetting, DefaultLightingPresetPath)); + } + else if (assetInfo.m_assetType == RPI::AnyAsset::RTTI_Type()) + { + static constexpr const char* ModelAssetPathSetting = + "/O3DE/Atom/CommonFeature/SharedPreview/LightingAssetType/ModelAssetPath"; + static constexpr const char* MaterialAssetPathSetting = + "/O3DE/Atom/CommonFeature/SharedPreview/LightingAssetType/MaterialAssetPath"; + + thumbnailConfig.m_modelId = SharedPreviewUtils::GetAssetIdForProductPath( + AtomToolsFramework::GetSettingOrDefault(ModelAssetPathSetting, DefaultModelPath)); + thumbnailConfig.m_materialId = SharedPreviewUtils::GetAssetIdForProductPath( + AtomToolsFramework::GetSettingOrDefault(MaterialAssetPathSetting, "materials/reflectionprobe/reflectionprobevisualization.azmaterial")); + thumbnailConfig.m_lightingId = assetInfo.m_assetId; + } + + return thumbnailConfig; + } + void SharedThumbnailRenderer::RenderThumbnail(AzToolsFramework::Thumbnailer::SharedThumbnailKey thumbnailKey, int thumbnailSize) { if (auto previewRenderer = AZ::Interface::Get()) { + const auto& thumbnailConfig = GetThumbnailConfig(thumbnailKey); + previewRenderer->AddCaptureRequest( { thumbnailSize, AZStd::make_shared( previewRenderer->GetScene(), previewRenderer->GetView(), previewRenderer->GetEntityContextId(), - SharedPreviewUtils::GetAssetId(thumbnailKey, RPI::ModelAsset::RTTI_Type(), DefaultModelAssetId), - SharedPreviewUtils::GetAssetId(thumbnailKey, RPI::MaterialAsset::RTTI_Type(), DefaultMaterialAssetId), - SharedPreviewUtils::GetAssetId(thumbnailKey, RPI::AnyAsset::RTTI_Type(), DefaultLightingPresetAssetId), + thumbnailConfig.m_modelId, thumbnailConfig.m_materialId, thumbnailConfig.m_lightingId, Render::MaterialPropertyOverrideMap()), [thumbnailKey]() { diff --git a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/SharedPreview/SharedThumbnailRenderer.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/SharedPreview/SharedThumbnailRenderer.h index 4db7728109..2166ac49e7 100644 --- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/SharedPreview/SharedThumbnailRenderer.h +++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/SharedPreview/SharedThumbnailRenderer.h @@ -33,6 +33,15 @@ namespace AZ ~SharedThumbnailRenderer(); private: + struct ThumbnailConfig + { + Data::AssetId m_modelId; + Data::AssetId m_materialId; + Data::AssetId m_lightingId; + }; + + ThumbnailConfig GetThumbnailConfig(AzToolsFramework::Thumbnailer::SharedThumbnailKey thumbnailKey); + //! ThumbnailerRendererRequestsBus::Handler interface overrides... void RenderThumbnail(AzToolsFramework::Thumbnailer::SharedThumbnailKey thumbnailKey, int thumbnailSize) override; bool Installed() const override; @@ -42,15 +51,12 @@ namespace AZ // Default assets to be kept loaded and used for rendering if not overridden static constexpr const char* DefaultLightingPresetPath = "lightingpresets/thumbnail.lightingpreset.azasset"; - const Data::AssetId DefaultLightingPresetAssetId = AZ::RPI::AssetUtils::GetAssetIdForProductPath(DefaultLightingPresetPath); Data::Asset m_defaultLightingPresetAsset; static constexpr const char* DefaultModelPath = "models/sphere.azmodel"; - const Data::AssetId DefaultModelAssetId = AZ::RPI::AssetUtils::GetAssetIdForProductPath(DefaultModelPath); Data::Asset m_defaultModelAsset; static constexpr const char* DefaultMaterialPath = ""; - const Data::AssetId DefaultMaterialAssetId; Data::Asset m_defaultMaterialAsset; }; } // namespace LyIntegration From 72de78bb83176566ac8ad7646d373030e2d05f90 Mon Sep 17 00:00:00 2001 From: Guthrie Adams Date: Wed, 17 Nov 2021 01:25:57 -0600 Subject: [PATCH 089/345] =?UTF-8?q?Reduce=20material=20editor=20update=20i?= =?UTF-8?q?nterval=20when=20inactive=20Reduce=20the=20application=20update?= =?UTF-8?q?=20interval=20when=20it=E2=80=99s=20not=20in=20focus=20to=20red?= =?UTF-8?q?uce=20power=20consumption=20and=20interference=20with=20other?= =?UTF-8?q?=20applications?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Guthrie Adams --- .../Code/Source/Application/AtomToolsApplication.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Application/AtomToolsApplication.cpp b/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Application/AtomToolsApplication.cpp index ba3bfe4718..5c5eb834c6 100644 --- a/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Application/AtomToolsApplication.cpp +++ b/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Application/AtomToolsApplication.cpp @@ -79,12 +79,18 @@ namespace AtomToolsFramework m_styleManager.reset(new AzQtComponents::StyleManager(this)); m_styleManager->initialize(this, engineRootPath); - connect(&m_timer, &QTimer::timeout, this, [&]() + m_timer.setInterval(1); + connect(&m_timer, &QTimer::timeout, this, [this]() { this->PumpSystemEventLoopUntilEmpty(); this->Tick(); }); + connect(this, &QGuiApplication::applicationStateChanged, this, [this]() + { + // Limit the update interval when not in focus to reduce power consumption and interference with other applications + this->m_timer.setInterval((applicationState() & Qt::ApplicationActive) ? 1 : 32); + }); } AtomToolsApplication ::~AtomToolsApplication() From e34ea3bcaa0306699804072c6bce6eb01f65fc52 Mon Sep 17 00:00:00 2001 From: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com> Date: Wed, 17 Nov 2021 17:12:21 +0000 Subject: [PATCH 090/345] Fixes for viewport selection issues (#5494) * improvements to editor selection in the viewport Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com> * fix issue with being able to select icons that are not showing for entities inside entity containers Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com> * update comment after review feedback Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com> * updates to viewport picking code to simplify the api Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com> * add test to replicate near clip intersection issue Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com> * small tidy-up changes Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com> * updates to how we perform world to screen and screen to world calculations, added test coverage and some tidy-up Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com> * add some more tests for ViewportInteractionImpl Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com> * minor tweaks before PR feedback Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com> * fix typo in fix Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com> * fix for manipulator test framework tests Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com> * updates to RPI::View and RenderPipeline after review feedback from VickyAtAZ Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com> * add constexpr to ScreenPoint, ScreenVector and ScreenSize initializing constructors Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com> * add PrintTo functions for Screen* types Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com> * downgrade error to warning temporarily Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com> * check incoming view is null Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com> * remove pragma optimize off Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com> --- Code/Editor/2DViewport.cpp | 7 - Code/Editor/2DViewport.h | 2 - Code/Editor/EditorViewportWidget.cpp | 104 +++-------- Code/Editor/EditorViewportWidget.h | 6 +- Code/Editor/Include/IDisplayViewport.h | 1 - Code/Editor/ViewportManipulatorController.cpp | 37 ++-- .../AzFramework/Viewport/CameraState.cpp | 50 +++-- .../AzFramework/Viewport/CameraState.h | 8 +- .../AzFramework/Viewport/ScreenGeometry.cpp | 4 + .../AzFramework/Viewport/ScreenGeometry.h | 68 ++++++- .../AzFramework/Viewport/ViewportScreen.cpp | 8 +- .../AzFramework/Tests/CameraState.cpp | 20 +- .../AzFramework/Tests/CursorStateTests.cpp | 3 +- .../AzFramework/Tests/Utils/Printers.cpp | 32 ++++ .../AzFramework/Tests/Utils/Printers.h | 20 ++ .../Tests/framework_shared_tests_files.cmake | 2 + .../ViewportInteraction.h | 4 +- .../AzManipulatorTestFrameworkUtils.cpp | 2 +- .../Source/ImmediateModeActionDispatcher.cpp | 2 - ...IndirectManipulatorViewportInteraction.cpp | 3 +- .../Source/ViewportInteraction.cpp | 7 +- .../Tests/WorldSpaceBuilderTest.cpp | 2 +- .../UnitTest/AzToolsFrameworkTestHelpers.h | 5 +- .../Viewport/ViewportMessages.h | 10 +- .../ViewportSelection/EditorHelpers.cpp | 8 +- .../EditorTransformComponentSelection.cpp | 4 +- .../EditorVisibleEntityDataCache.cpp | 8 +- .../EditorVisibleEntityDataCache.h | 5 +- .../Tests/BoundsTestComponent.cpp | 6 +- .../Tests/BoundsTestComponent.h | 2 + ...EditorTransformComponentSelectionTests.cpp | 54 ++++-- .../Tests/EditorVertexSelectionTests.cpp | 1 + .../Tests/Viewport/ViewportScreenTests.cpp | 10 +- .../RPI/Code/Include/Atom/RPI.Public/View.h | 7 +- .../Code/Source/RPI.Public/RenderPipeline.cpp | 5 + Gems/Atom/RPI/Code/Source/RPI.Public/View.cpp | 82 ++++++--- .../AtomToolsFramework/Code/CMakeLists.txt | 1 + .../Viewport/RenderViewportWidget.h | 11 +- .../Viewport/ViewportInteractionImpl.h | 42 +++++ .../Source/Viewport/RenderViewportWidget.cpp | 74 ++------ .../Viewport/ViewportInteractionImpl.cpp | 61 +++++++ .../Code/Tests/AtomToolsFrameworkTest.cpp | 26 +-- .../Tests/ViewportInteractionImplTests.cpp | 172 ++++++++++++++++++ .../Code/atomtoolsframework_files.cmake | 2 + .../Code/atomtoolsframework_tests_files.cmake | 1 + 45 files changed, 680 insertions(+), 309 deletions(-) create mode 100644 Code/Framework/AzFramework/Tests/Utils/Printers.cpp create mode 100644 Code/Framework/AzFramework/Tests/Utils/Printers.h create mode 100644 Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Viewport/ViewportInteractionImpl.h create mode 100644 Gems/Atom/Tools/AtomToolsFramework/Code/Source/Viewport/ViewportInteractionImpl.cpp create mode 100644 Gems/Atom/Tools/AtomToolsFramework/Code/Tests/ViewportInteractionImplTests.cpp diff --git a/Code/Editor/2DViewport.cpp b/Code/Editor/2DViewport.cpp index ed810aea29..ba433c869f 100644 --- a/Code/Editor/2DViewport.cpp +++ b/Code/Editor/2DViewport.cpp @@ -547,13 +547,6 @@ QPoint Q2DViewport::WorldToView(const Vec3& wp) const QPoint p = QPoint(static_cast(sp.x), static_cast(sp.y)); return p; } -////////////////////////////////////////////////////////////////////////// -QPoint Q2DViewport::WorldToViewParticleEditor(const Vec3& wp, [[maybe_unused]] int width, [[maybe_unused]] int height) const //Eric@conffx implement for the children class of IDisplayViewport -{ - Vec3 sp = m_screenTM.TransformPoint(wp); - QPoint p = QPoint(static_cast(sp.x), static_cast(sp.y)); - return p; -} ////////////////////////////////////////////////////////////////////////// Vec3 Q2DViewport::ViewToWorld(const QPoint& vp, [[maybe_unused]] bool* collideWithTerrain, [[maybe_unused]] bool onlyTerrain, [[maybe_unused]] bool bSkipVegetation, [[maybe_unused]] bool bTestRenderMesh, [[maybe_unused]] bool* collideWithObject) const diff --git a/Code/Editor/2DViewport.h b/Code/Editor/2DViewport.h index 007c1a47d3..68823acdb7 100644 --- a/Code/Editor/2DViewport.h +++ b/Code/Editor/2DViewport.h @@ -50,8 +50,6 @@ public: //! Map world space position to viewport position. QPoint WorldToView(const Vec3& wp) const override; - QPoint WorldToViewParticleEditor(const Vec3& wp, int width, int height) const override; //Eric@conffx - //! Map viewport position to world space position. Vec3 ViewToWorld(const QPoint& vp, bool* collideWithTerrain = nullptr, bool onlyTerrain = false, bool bSkipVegetation = false, bool bTestRenderMesh = false, bool* collideWithObject = nullptr) const override; //! Map viewport position to world space ray from camera. diff --git a/Code/Editor/EditorViewportWidget.cpp b/Code/Editor/EditorViewportWidget.cpp index 290f0fd17f..86a91a25bb 100644 --- a/Code/Editor/EditorViewportWidget.cpp +++ b/Code/Editor/EditorViewportWidget.cpp @@ -299,13 +299,9 @@ AzToolsFramework::ViewportInteraction::MousePick EditorViewportWidget::BuildMous { AzToolsFramework::ViewportInteraction::MousePick mousePick; mousePick.m_screenCoordinates = AzToolsFramework::ViewportInteraction::ScreenPointFromQPoint(point); - if (const auto& ray = m_renderViewport->ViewportScreenToWorldRay(mousePick.m_screenCoordinates); - ray.has_value()) - { - mousePick.m_rayOrigin = ray.value().origin; - mousePick.m_rayDirection = ray.value().direction; - } - + const auto[origin, direction] = m_renderViewport->ViewportScreenToWorldRay(mousePick.m_screenCoordinates); + mousePick.m_rayOrigin = origin; + mousePick.m_rayDirection = direction; return mousePick; } @@ -912,23 +908,6 @@ AZ::Vector3 EditorViewportWidget::PickTerrain(const AzFramework::ScreenPoint& po return LYVec3ToAZVec3(ViewToWorld(AzToolsFramework::ViewportInteraction::QPointFromScreenPoint(point), nullptr, true)); } -AZ::EntityId EditorViewportWidget::PickEntity(const AzFramework::ScreenPoint& point) -{ - AZ::EntityId entityId; - HitContext hitInfo; - hitInfo.view = this; - if (HitTest(AzToolsFramework::ViewportInteraction::QPointFromScreenPoint(point), hitInfo)) - { - if (hitInfo.object && (hitInfo.object->GetType() == OBJTYPE_AZENTITY)) - { - auto entityObject = static_cast(hitInfo.object); - entityId = entityObject->GetAssociatedEntityId(); - } - } - - return entityId; -} - float EditorViewportWidget::TerrainHeight(const AZ::Vector2& position) { return GetIEditor()->GetTerrainElevation(position.GetX(), position.GetY()); @@ -1653,16 +1632,15 @@ void EditorViewportWidget::RenderSelectedRegion() Vec3 EditorViewportWidget::WorldToView3D(const Vec3& wp, [[maybe_unused]] int nFlags) const { Vec3 out(0, 0, 0); - float x, y, z; + float x, y; - ProjectToScreen(wp.x, wp.y, wp.z, &x, &y, &z); - if (_finite(x) && _finite(y) && _finite(z)) + ProjectToScreen(wp.x, wp.y, wp.z, &x, &y); + if (_finite(x) && _finite(y)) { out.x = (x / 100) * m_rcClient.width(); out.y = (y / 100) * m_rcClient.height(); out.x /= static_cast(QHighDpiScaling::factor(windowHandle()->screen())); out.y /= static_cast(QHighDpiScaling::factor(windowHandle()->screen())); - out.z = z; } return out; } @@ -1672,24 +1650,6 @@ QPoint EditorViewportWidget::WorldToView(const Vec3& wp) const { return AzToolsFramework::ViewportInteraction::QPointFromScreenPoint(m_renderViewport->ViewportWorldToScreen(LYVec3ToAZVec3(wp))); } -////////////////////////////////////////////////////////////////////////// -QPoint EditorViewportWidget::WorldToViewParticleEditor(const Vec3& wp, int width, int height) const -{ - QPoint p; - float x, y, z; - - ProjectToScreen(wp.x, wp.y, wp.z, &x, &y, &z); - if (_finite(x) || _finite(y)) - { - p.rx() = static_cast((x / 100) * width); - p.ry() = static_cast((y / 100) * height); - } - else - { - QPoint(0, 0); - } - return p; -} ////////////////////////////////////////////////////////////////////////// Vec3 EditorViewportWidget::ViewToWorld( @@ -1705,20 +1665,16 @@ Vec3 EditorViewportWidget::ViewToWorld( AZ_UNUSED(collideWithObject); auto ray = m_renderViewport->ViewportScreenToWorldRay(AzToolsFramework::ViewportInteraction::ScreenPointFromQPoint(vp)); - if (!ray.has_value()) - { - return Vec3(0, 0, 0); - } const float maxDistance = 10000.f; - Vec3 v = AZVec3ToLYVec3(ray.value().direction) * maxDistance; + Vec3 v = AZVec3ToLYVec3(ray.direction) * maxDistance; if (!_finite(v.x) || !_finite(v.y) || !_finite(v.z)) { return Vec3(0, 0, 0); } - Vec3 colp = AZVec3ToLYVec3(ray.value().origin) + 0.002f * v; + Vec3 colp = AZVec3ToLYVec3(ray.origin) + 0.002f * v; return colp; } @@ -1757,21 +1713,19 @@ bool EditorViewportWidget::RayRenderMeshIntersection(IRenderMesh* pRenderMesh, c return bRes;*/ } -void EditorViewportWidget::UnProjectFromScreen(float sx, float sy, float sz, float* px, float* py, float* pz) const +void EditorViewportWidget::UnProjectFromScreen(float sx, float sy, float* px, float* py, float* pz) const { - AZ::Vector3 wp; - wp = m_renderViewport->ViewportScreenToWorld(AzFramework::ScreenPoint{(int)sx, m_rcClient.bottom() - ((int)sy)}, sz).value_or(wp); + const AZ::Vector3 wp = m_renderViewport->ViewportScreenToWorld(AzFramework::ScreenPoint{(int)sx, m_rcClient.bottom() - ((int)sy)}); *px = wp.GetX(); *py = wp.GetY(); *pz = wp.GetZ(); } -void EditorViewportWidget::ProjectToScreen(float ptx, float pty, float ptz, float* sx, float* sy, float* sz) const +void EditorViewportWidget::ProjectToScreen(float ptx, float pty, float ptz, float* sx, float* sy) const { AzFramework::ScreenPoint screenPosition = m_renderViewport->ViewportWorldToScreen(AZ::Vector3{ptx, pty, ptz}); *sx = static_cast(screenPosition.m_x); *sy = static_cast(screenPosition.m_y); - *sz = 0.f; } ////////////////////////////////////////////////////////////////////////// @@ -1781,32 +1735,22 @@ void EditorViewportWidget::ViewToWorldRay(const QPoint& vp, Vec3& raySrc, Vec3& Vec3 pos0, pos1; float wx, wy, wz; - UnProjectFromScreen(static_cast(vp.x()), static_cast(rc.bottom() - vp.y()), 0.0f, &wx, &wy, &wz); - if (!_finite(wx) || !_finite(wy) || !_finite(wz)) - { - return; - } - if (fabs(wx) > 1000000 || fabs(wy) > 1000000 || fabs(wz) > 1000000) - { - return; - } - pos0(wx, wy, wz); - UnProjectFromScreen(static_cast(vp.x()), static_cast(rc.bottom() - vp.y()), 1.0f, &wx, &wy, &wz); - if (!_finite(wx) || !_finite(wy) || !_finite(wz)) - { - return; - } - if (fabs(wx) > 1000000 || fabs(wy) > 1000000 || fabs(wz) > 1000000) - { - return; - } - pos1(wx, wy, wz); + UnProjectFromScreen(static_cast(vp.x()), static_cast(rc.bottom() - vp.y()), &wx, &wy, &wz); - Vec3 v = (pos1 - pos0); - v = v.GetNormalized(); + if (!_finite(wx) || !_finite(wy) || !_finite(wz)) + { + return; + } + + if (fabs(wx) > 1000000 || fabs(wy) > 1000000 || fabs(wz) > 1000000) + { + return; + } + + pos0(wx, wy, wz); raySrc = pos0; - rayDir = v; + rayDir = (pos0 - AZVec3ToLYVec3(m_renderViewport->GetCameraState().m_position)).GetNormalized(); } ////////////////////////////////////////////////////////////////////////// diff --git a/Code/Editor/EditorViewportWidget.h b/Code/Editor/EditorViewportWidget.h index 01f6068d56..d20f3fe939 100644 --- a/Code/Editor/EditorViewportWidget.h +++ b/Code/Editor/EditorViewportWidget.h @@ -166,7 +166,6 @@ private: Qt::MouseButtons buttons, Qt::KeyboardModifiers modifiers, const QPoint& point) override; void SetViewportId(int id) override; QPoint WorldToView(const Vec3& wp) const override; - QPoint WorldToViewParticleEditor(const Vec3& wp, int width, int height) const override; Vec3 WorldToView3D(const Vec3& wp, int nFlags = 0) const override; Vec3 ViewToWorld(const QPoint& vp, bool* collideWithTerrain = nullptr, bool onlyTerrain = false, bool bSkipVegetation = false, bool bTestRenderMesh = false, bool* collideWithObject = nullptr) const override; void ViewToWorldRay(const QPoint& vp, Vec3& raySrc, Vec3& rayDir) const override; @@ -208,7 +207,6 @@ private: void* GetSystemCursorConstraintWindow() const override; // AzToolsFramework::MainEditorViewportInteractionRequestBus overrides ... - AZ::EntityId PickEntity(const AzFramework::ScreenPoint& point) override; AZ::Vector3 PickTerrain(const AzFramework::ScreenPoint& point) override; float TerrainHeight(const AZ::Vector2& position) override; bool ShowingWorldSpace() override; @@ -306,8 +304,8 @@ private: const DisplayContext& GetDisplayContext() const { return m_displayContext; } CBaseObject* GetCameraObject() const; - void UnProjectFromScreen(float sx, float sy, float sz, float* px, float* py, float* pz) const; - void ProjectToScreen(float ptx, float pty, float ptz, float* sx, float* sy, float* sz) const; + void UnProjectFromScreen(float sx, float sy, float* px, float* py, float* pz) const; + void ProjectToScreen(float ptx, float pty, float ptz, float* sx, float* sy) const; AZ::RPI::ViewPtr GetCurrentAtomView() const; diff --git a/Code/Editor/Include/IDisplayViewport.h b/Code/Editor/Include/IDisplayViewport.h index c7dff33e50..637d19e39b 100644 --- a/Code/Editor/Include/IDisplayViewport.h +++ b/Code/Editor/Include/IDisplayViewport.h @@ -47,7 +47,6 @@ struct IDisplayViewport virtual const Matrix34& GetViewTM() const = 0; virtual const Matrix34& GetScreenTM() const = 0; virtual QPoint WorldToView(const Vec3& worldPoint) const = 0; - virtual QPoint WorldToViewParticleEditor(const Vec3& worldPoint, int width, int height) const = 0; virtual Vec3 WorldToView3D(const Vec3& worldPoint, int flags = 0) const = 0; virtual Vec3 ViewToWorld(const QPoint& vp, bool* collideWithTerrain = nullptr, bool onlyTerrain = false, bool bSkipVegetation = false, bool bTestRenderMesh = false, bool* collideWithObject = nullptr) const = 0; virtual void ViewToWorldRay(const QPoint& vp, Vec3& raySrc, Vec3& rayDir) const = 0; diff --git a/Code/Editor/ViewportManipulatorController.cpp b/Code/Editor/ViewportManipulatorController.cpp index 1766945541..285b338ee9 100644 --- a/Code/Editor/ViewportManipulatorController.cpp +++ b/Code/Editor/ViewportManipulatorController.cpp @@ -8,13 +8,15 @@ #include "ViewportManipulatorController.h" +#include +#include +#include +#include +#include +#include #include #include -#include -#include -#include -#include -#include +#include #include @@ -87,8 +89,14 @@ namespace SandboxEditor } using InteractionBus = AzToolsFramework::EditorInteractionSystemViewportSelectionRequestBus; - using namespace AzToolsFramework::ViewportInteraction; using AzFramework::InputChannel; + using AzToolsFramework::ViewportInteraction::KeyboardModifier; + using AzToolsFramework::ViewportInteraction::MouseButton; + using AzToolsFramework::ViewportInteraction::MouseEvent; + using AzToolsFramework::ViewportInteraction::MouseInteraction; + using AzToolsFramework::ViewportInteraction::MouseInteractionEvent; + using AzToolsFramework::ViewportInteraction::ProjectedViewportRay; + using AzToolsFramework::ViewportInteraction::ViewportInteractionRequestBus; bool interactionHandled = false; float wheelDelta = 0.0f; @@ -117,16 +125,13 @@ namespace SandboxEditor aznumeric_cast(position->m_normalizedPosition.GetX() * windowSize.m_width), aznumeric_cast(position->m_normalizedPosition.GetY() * windowSize.m_height)); - m_mouseInteraction.m_mousePick.m_screenCoordinates = screenPoint; - AZStd::optional ray; + ProjectedViewportRay ray{}; ViewportInteractionRequestBus::EventResult( ray, GetViewportId(), &ViewportInteractionRequestBus::Events::ViewportScreenToWorldRay, screenPoint); - if (ray.has_value()) - { - m_mouseInteraction.m_mousePick.m_rayOrigin = ray.value().origin; - m_mouseInteraction.m_mousePick.m_rayDirection = ray.value().direction; - } + m_mouseInteraction.m_mousePick.m_rayOrigin = ray.origin; + m_mouseInteraction.m_mousePick.m_rayDirection = ray.direction; + m_mouseInteraction.m_mousePick.m_screenCoordinates = screenPoint; } eventType = MouseEvent::Move; @@ -160,8 +165,8 @@ namespace SandboxEditor else if (state == InputChannel::State::Ended) { // If we've actually logged a mouse down event, forward a mouse up event. - // This prevents corner cases like the context menu thinking it should be opened even though no one clicked in this viewport, - // due to RenderViewportWidget ensuring all controllers get InputChannel::State::Ended events. + // This prevents corner cases like the context menu thinking it should be opened even though no one clicked in this + // viewport, due to RenderViewportWidget ensuring all controllers get InputChannel::State::Ended events. if (m_mouseInteraction.m_mouseButtons.m_mouseButtons & mouseButtonValue) { // Erase the button from our state if we're done processing events. @@ -259,4 +264,4 @@ namespace SandboxEditor const double doubleClickThresholdMilliseconds = qApp->doubleClickInterval(); return (m_curTime.GetMilliseconds() - clickIt->second.GetMilliseconds()) < doubleClickThresholdMilliseconds; } -} //namespace SandboxEditor +} // namespace SandboxEditor diff --git a/Code/Framework/AzFramework/AzFramework/Viewport/CameraState.cpp b/Code/Framework/AzFramework/AzFramework/Viewport/CameraState.cpp index 00cbda7b34..40fb82ca97 100644 --- a/Code/Framework/AzFramework/AzFramework/Viewport/CameraState.cpp +++ b/Code/Framework/AzFramework/AzFramework/Viewport/CameraState.cpp @@ -8,18 +8,18 @@ #include "CameraState.h" -#include #include #include +#include namespace AzFramework { void SetCameraClippingVolume( - AzFramework::CameraState& cameraState, const float nearPlane, const float farPlane, const float fovRad) + AzFramework::CameraState& cameraState, const float nearPlane, const float farPlane, const float verticalFovRad) { cameraState.m_nearClip = nearPlane; cameraState.m_farClip = farPlane; - cameraState.m_fovOrZoom = fovRad; + cameraState.m_fovOrZoom = verticalFovRad; } void SetCameraTransform(CameraState& cameraState, const AZ::Transform& transform) @@ -35,20 +35,34 @@ namespace AzFramework SetCameraClippingVolume(cameraState, 0.1f, 1000.0f, AZ::DegToRad(60.0f)); } - AzFramework::CameraState CreateDefaultCamera( - const AZ::Transform& transform, const AZ::Vector2& viewportSize) + CameraState CreateCamera( + const AZ::Transform& transform, + const float nearPlane, + const float farPlane, + const float verticalFovRad, + const AZ::Vector2& viewportSize) { AzFramework::CameraState cameraState; - SetDefaultCameraClippingVolume(cameraState); SetCameraTransform(cameraState, transform); + SetCameraClippingVolume(cameraState, nearPlane, farPlane, verticalFovRad); cameraState.m_viewportSize = viewportSize; return cameraState; } - AzFramework::CameraState CreateIdentityDefaultCamera( - const AZ::Vector3& position, const AZ::Vector2& viewportSize) + AzFramework::CameraState CreateDefaultCamera(const AZ::Transform& transform, const AZ::Vector2& viewportSize) + { + AzFramework::CameraState cameraState; + + SetCameraTransform(cameraState, transform); + SetDefaultCameraClippingVolume(cameraState); + cameraState.m_viewportSize = viewportSize; + + return cameraState; + } + + AzFramework::CameraState CreateIdentityDefaultCamera(const AZ::Vector3& position, const AZ::Vector2& viewportSize) { return CreateDefaultCamera(AZ::Transform::CreateTranslation(position), viewportSize); } @@ -89,15 +103,15 @@ namespace AzFramework void CameraState::Reflect(AZ::SerializeContext& serializeContext) { - serializeContext.Class()-> - Field("Position", &CameraState::m_position)-> - Field("Forward", &CameraState::m_forward)-> - Field("Side", &CameraState::m_side)-> - Field("Up", &CameraState::m_up)-> - Field("ViewportSize", &CameraState::m_viewportSize)-> - Field("NearClip", &CameraState::m_nearClip)-> - Field("FarClip", &CameraState::m_farClip)-> - Field("FovZoom", &CameraState::m_fovOrZoom)-> - Field("Ortho", &CameraState::m_orthographic); + serializeContext.Class() + ->Field("Position", &CameraState::m_position) + ->Field("Forward", &CameraState::m_forward) + ->Field("Side", &CameraState::m_side) + ->Field("Up", &CameraState::m_up) + ->Field("ViewportSize", &CameraState::m_viewportSize) + ->Field("NearClip", &CameraState::m_nearClip) + ->Field("FarClip", &CameraState::m_farClip) + ->Field("FovZoom", &CameraState::m_fovOrZoom) + ->Field("Ortho", &CameraState::m_orthographic); } } // namespace AzFramework diff --git a/Code/Framework/AzFramework/AzFramework/Viewport/CameraState.h b/Code/Framework/AzFramework/AzFramework/Viewport/CameraState.h index e174771c3b..cefb144ec1 100644 --- a/Code/Framework/AzFramework/AzFramework/Viewport/CameraState.h +++ b/Code/Framework/AzFramework/AzFramework/Viewport/CameraState.h @@ -40,10 +40,14 @@ namespace AzFramework AZ::Vector2 m_viewportSize = AZ::Vector2::CreateZero(); //!< Dimensions of the viewport. float m_nearClip = 0.01f; //!< Near clip plane of the camera. float m_farClip = 100.0f; //!< Far clip plane of the camera. - float m_fovOrZoom = 0.0f; //!< Fov or zoom of camera depending on if it is using orthographic projection or not. + float m_fovOrZoom = 0.0f; //!< Vertical fov or zoom of camera depending on if it is using orthographic projection or not. bool m_orthographic = false; //!< Is the camera using orthographic projection or not. }; + //! Create a camera at the given transform, specifying the near and far clip planes as well as the fov with a specific viewport size. + CameraState CreateCamera( + const AZ::Transform& transform, float nearPlane, float farPlane, float verticalFovRad, const AZ::Vector2& viewportSize); + //! Create a camera at the given transform with a specific viewport size. //! @note The near/far clip planes and fov are sensible default values - please //! use SetCameraClippingVolume to override them. @@ -60,7 +64,7 @@ namespace AzFramework CameraState CreateCameraFromWorldFromViewMatrix(const AZ::Matrix4x4& worldFromView, const AZ::Vector2& viewportSize); //! Override the default near/far clipping planes and fov of the camera. - void SetCameraClippingVolume(CameraState& cameraState, float nearPlane, float farPlane, float fovRad); + void SetCameraClippingVolume(CameraState& cameraState, float nearPlane, float farPlane, float verticalFovRad); //! Override the default near/far clipping planes and fov of the camera by inferring them the specified right handed transform into clip space. void SetCameraClippingVolumeFromPerspectiveFovMatrixRH(CameraState& cameraState, const AZ::Matrix4x4& clipFromView); diff --git a/Code/Framework/AzFramework/AzFramework/Viewport/ScreenGeometry.cpp b/Code/Framework/AzFramework/AzFramework/Viewport/ScreenGeometry.cpp index e26d7cfa9b..f1c21230c7 100644 --- a/Code/Framework/AzFramework/AzFramework/Viewport/ScreenGeometry.cpp +++ b/Code/Framework/AzFramework/AzFramework/Viewport/ScreenGeometry.cpp @@ -24,6 +24,10 @@ namespace AzFramework serializeContext->Class()-> Field("X", &ScreenVector::m_x)-> Field("Y", &ScreenVector::m_y); + + serializeContext->Class()-> + Field("Width", &ScreenSize::m_width)-> + Field("Height", &ScreenSize::m_height); } } } // namespace AzFramework diff --git a/Code/Framework/AzFramework/AzFramework/Viewport/ScreenGeometry.h b/Code/Framework/AzFramework/AzFramework/Viewport/ScreenGeometry.h index 1529d760e5..7a5d7fdc62 100644 --- a/Code/Framework/AzFramework/AzFramework/Viewport/ScreenGeometry.h +++ b/Code/Framework/AzFramework/AzFramework/Viewport/ScreenGeometry.h @@ -26,7 +26,7 @@ namespace AzFramework AZ_TYPE_INFO(ScreenPoint, "{8472B6C2-527F-44FC-87F8-C226B1A57A97}"); ScreenPoint() = default; - ScreenPoint(int x, int y) + constexpr ScreenPoint(int x, int y) : m_x(x) , m_y(y) { @@ -45,7 +45,7 @@ namespace AzFramework AZ_TYPE_INFO(ScreenVector, "{1EAA2C62-8FDB-4A28-9FE3-1FA4F1418894}"); ScreenVector() = default; - ScreenVector(int x, int y) + constexpr ScreenVector(int x, int y) : m_x(x) , m_y(y) { @@ -55,6 +55,22 @@ namespace AzFramework int m_y; //!< Y screen delta. }; + //! A wrapper around a screen width and height. + struct ScreenSize + { + AZ_TYPE_INFO(ScreenSize, "{26D28916-6E8E-44B8-83F9-C44BCDA370E2}"); + ScreenSize() = default; + + constexpr ScreenSize(int width, int height) + : m_width(width) + , m_height(height) + { + } + + int m_width; //!< Screen size width. + int m_height; //!< Screen size height. + }; + void ScreenGeometryReflect(AZ::ReflectContext* context); inline const ScreenVector operator-(const ScreenPoint& lhs, const ScreenPoint& rhs) @@ -138,6 +154,16 @@ namespace AzFramework return !operator==(lhs, rhs); } + inline const bool operator==(const ScreenSize& lhs, const ScreenSize& rhs) + { + return lhs.m_width == rhs.m_width && lhs.m_height == rhs.m_height; + } + + inline const bool operator!=(const ScreenSize& lhs, const ScreenSize& rhs) + { + return !operator==(lhs, rhs); + } + inline ScreenVector& operator*=(ScreenVector& lhs, const float rhs) { lhs.m_x = aznumeric_cast(AZStd::lround(aznumeric_cast(lhs.m_x) * rhs)); @@ -152,6 +178,20 @@ namespace AzFramework return result; } + inline ScreenSize& operator*=(ScreenSize& lhs, const float rhs) + { + lhs.m_width = aznumeric_cast(AZStd::lround(aznumeric_cast(lhs.m_width) * rhs)); + lhs.m_height = aznumeric_cast(AZStd::lround(aznumeric_cast(lhs.m_height) * rhs)); + return lhs; + } + + inline const ScreenSize operator*(const ScreenSize& lhs, const float rhs) + { + ScreenSize result{ lhs }; + result *= rhs; + return result; + } + inline float ScreenVectorLength(const ScreenVector& screenVector) { return aznumeric_cast(AZStd::sqrt(screenVector.m_x * screenVector.m_x + screenVector.m_y * screenVector.m_y)); @@ -168,4 +208,28 @@ namespace AzFramework { return AZ::Vector2(aznumeric_cast(screenVector.m_x), aznumeric_cast(screenVector.m_y)); } + + //! Return an AZ::Vector2 from a ScreenSize. + inline AZ::Vector2 Vector2FromScreenSize(const ScreenSize& screenSize) + { + return AZ::Vector2(aznumeric_cast(screenSize.m_width), aznumeric_cast(screenSize.m_height)); + } + + //! Return a ScreenPoint from an AZ::Vector2. + inline ScreenPoint ScreenPointFromVector2(const AZ::Vector2& vector2) + { + return ScreenPoint(aznumeric_cast(AZStd::lround(vector2.GetX())), aznumeric_cast(AZStd::lround(vector2.GetY()))); + } + + //! Return a ScreenVector from an AZ::Vector2. + inline ScreenVector ScreenVectorFromVector2(const AZ::Vector2& vector2) + { + return ScreenVector(aznumeric_cast(AZStd::lround(vector2.GetX())), aznumeric_cast(AZStd::lround(vector2.GetY()))); + } + + //! Return a ScreenSize from an AZ::Vector2. + inline ScreenSize ScreenSizeFromVector2(const AZ::Vector2& vector2) + { + return ScreenSize(aznumeric_cast(AZStd::lround(vector2.GetX())), aznumeric_cast(AZStd::lround(vector2.GetY()))); + } } // namespace AzFramework diff --git a/Code/Framework/AzFramework/AzFramework/Viewport/ViewportScreen.cpp b/Code/Framework/AzFramework/AzFramework/Viewport/ViewportScreen.cpp index afd16a6c23..87eee53fbd 100644 --- a/Code/Framework/AzFramework/AzFramework/Viewport/ViewportScreen.cpp +++ b/Code/Framework/AzFramework/AzFramework/Viewport/ViewportScreen.cpp @@ -10,6 +10,7 @@ #include #include +#include #include #include #include @@ -112,9 +113,8 @@ namespace AzFramework const AZ::Matrix4x4& cameraProjection, const AZ::Vector2& viewportSize) { - const auto ndcNormalizedPosition = WorldToScreenNdc(worldPosition, cameraView, cameraProjection); // scale ndc position by screen dimensions to return screen position - return ScreenPointFromNdc(AZ::Vector3ToVector2(ndcNormalizedPosition), viewportSize); + return ScreenPointFromNdc(AZ::Vector3ToVector2(WorldToScreenNdc(worldPosition, cameraView, cameraProjection)), viewportSize); } ScreenPoint WorldToScreen(const AZ::Vector3& worldPosition, const CameraState& cameraState) @@ -144,9 +144,7 @@ namespace AzFramework const AZ::Matrix4x4& inverseCameraProjection, const AZ::Vector2& viewportSize) { - const auto normalizedScreenPosition = NdcFromScreenPoint(screenPosition, viewportSize); - - return ScreenNdcToWorld(normalizedScreenPosition, inverseCameraView, inverseCameraProjection); + return ScreenNdcToWorld(NdcFromScreenPoint(screenPosition, viewportSize), inverseCameraView, inverseCameraProjection); } AZ::Vector3 ScreenToWorld(const ScreenPoint& screenPosition, const CameraState& cameraState) diff --git a/Code/Framework/AzFramework/Tests/CameraState.cpp b/Code/Framework/AzFramework/Tests/CameraState.cpp index 70fa8be89a..1f35d5a06c 100644 --- a/Code/Framework/AzFramework/Tests/CameraState.cpp +++ b/Code/Framework/AzFramework/Tests/CameraState.cpp @@ -11,6 +11,7 @@ #include #include #include +#include #include namespace UnitTest @@ -51,22 +52,6 @@ namespace UnitTest { }; - // Taken from Atom::MatrixUtils for testing purposes, this can be removed if MakePerspectiveFovMatrixRH makes it into AZ - static AZ::Matrix4x4 MakePerspectiveMatrixRH(float fovY, float aspectRatio, float nearClip, float farClip) - { - float sinFov, cosFov; - AZ::SinCos(0.5f * fovY, sinFov, cosFov); - float yScale = cosFov / sinFov; //cot(fovY/2) - float xScale = yScale / aspectRatio; - - AZ::Matrix4x4 out; - out.SetRow(0, xScale, 0.f, 0.f, 0.f ); - out.SetRow(1, 0.f, yScale, 0.f, 0.f ); - out.SetRow(2, 0.f, 0.f, farClip / (nearClip - farClip), nearClip*farClip / (nearClip - farClip) ); - out.SetRow(3, 0.f, 0.f, -1.f, 0.f ); - return out; - } - TEST_P(Translation, Permutation) { // Given a position @@ -176,7 +161,8 @@ namespace UnitTest { auto [fovY, aspectRatio, nearClip, farClip] = GetParam(); - AZ::Matrix4x4 clipFromView = MakePerspectiveMatrixRH(fovY, aspectRatio, nearClip, farClip); + AZ::Matrix4x4 clipFromView; + MakePerspectiveFovMatrixRH(clipFromView, fovY, aspectRatio, nearClip, farClip); AzFramework::SetCameraClippingVolumeFromPerspectiveFovMatrixRH(m_cameraState, clipFromView); diff --git a/Code/Framework/AzFramework/Tests/CursorStateTests.cpp b/Code/Framework/AzFramework/Tests/CursorStateTests.cpp index 923cd02a10..fe15580dad 100644 --- a/Code/Framework/AzFramework/Tests/CursorStateTests.cpp +++ b/Code/Framework/AzFramework/Tests/CursorStateTests.cpp @@ -8,12 +8,13 @@ #include #include +#include namespace UnitTest { using AzFramework::CursorState; - using AzFramework::ScreenVector; using AzFramework::ScreenPoint; + using AzFramework::ScreenVector; class CursorStateFixture : public ::testing::Test { diff --git a/Code/Framework/AzFramework/Tests/Utils/Printers.cpp b/Code/Framework/AzFramework/Tests/Utils/Printers.cpp new file mode 100644 index 0000000000..91c9558be7 --- /dev/null +++ b/Code/Framework/AzFramework/Tests/Utils/Printers.cpp @@ -0,0 +1,32 @@ +/* + * 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 "Printers.h" + +#include + +#include +#include + +namespace AzFramework +{ + void PrintTo(const ScreenPoint& screenPoint, std::ostream* os) + { + *os << "(x: " << screenPoint.m_x << ", y: " << screenPoint.m_y << ")"; + } + + void PrintTo(const ScreenVector& screenVector, std::ostream* os) + { + *os << "(x: " << screenVector.m_x << ", y: " << screenVector.m_y << ")"; + } + + void PrintTo(const ScreenSize& screenSize, std::ostream* os) + { + *os << "(width: " << screenSize.m_width << ", height: " << screenSize.m_height << ")"; + } +} // namespace AzFramework diff --git a/Code/Framework/AzFramework/Tests/Utils/Printers.h b/Code/Framework/AzFramework/Tests/Utils/Printers.h new file mode 100644 index 0000000000..fc967eabe9 --- /dev/null +++ b/Code/Framework/AzFramework/Tests/Utils/Printers.h @@ -0,0 +1,20 @@ +/* + * 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 + +namespace AzFramework +{ + struct ScreenPoint; + struct ScreenVector; + struct ScreenSize; + + void PrintTo(const ScreenPoint& screenPoint, std::ostream* os); + void PrintTo(const ScreenVector& screenVector, std::ostream* os); + void PrintTo(const ScreenSize& screenSize, std::ostream* os); +} // namespace AzFramework diff --git a/Code/Framework/AzFramework/Tests/framework_shared_tests_files.cmake b/Code/Framework/AzFramework/Tests/framework_shared_tests_files.cmake index 85c00a2e8a..9427738e67 100644 --- a/Code/Framework/AzFramework/Tests/framework_shared_tests_files.cmake +++ b/Code/Framework/AzFramework/Tests/framework_shared_tests_files.cmake @@ -11,5 +11,7 @@ set(FILES Mocks/MockWindowRequests.h Utils/Utils.h Utils/Utils.cpp + Utils/Printers.h + Utils/Printers.cpp FrameworkApplicationFixture.h ) diff --git a/Code/Framework/AzManipulatorTestFramework/Include/AzManipulatorTestFramework/ViewportInteraction.h b/Code/Framework/AzManipulatorTestFramework/Include/AzManipulatorTestFramework/ViewportInteraction.h index a8ba63500c..3c41b28851 100644 --- a/Code/Framework/AzManipulatorTestFramework/Include/AzManipulatorTestFramework/ViewportInteraction.h +++ b/Code/Framework/AzManipulatorTestFramework/Include/AzManipulatorTestFramework/ViewportInteraction.h @@ -41,8 +41,8 @@ namespace AzManipulatorTestFramework // ViewportInteractionRequestBus overrides ... AzFramework::CameraState GetCameraState() override; AzFramework::ScreenPoint ViewportWorldToScreen(const AZ::Vector3& worldPosition) override; - AZStd::optional ViewportScreenToWorld(const AzFramework::ScreenPoint& screenPosition, float depth) override; - AZStd::optional ViewportScreenToWorldRay( + AZ::Vector3 ViewportScreenToWorld(const AzFramework::ScreenPoint& screenPosition) override; + AzToolsFramework::ViewportInteraction::ProjectedViewportRay ViewportScreenToWorldRay( const AzFramework::ScreenPoint& screenPosition) override; float DeviceScalingFactor() override; diff --git a/Code/Framework/AzManipulatorTestFramework/Source/AzManipulatorTestFrameworkUtils.cpp b/Code/Framework/AzManipulatorTestFramework/Source/AzManipulatorTestFrameworkUtils.cpp index 4f1e108a14..6fbf2cb219 100644 --- a/Code/Framework/AzManipulatorTestFramework/Source/AzManipulatorTestFrameworkUtils.cpp +++ b/Code/Framework/AzManipulatorTestFramework/Source/AzManipulatorTestFrameworkUtils.cpp @@ -95,7 +95,7 @@ namespace AzManipulatorTestFramework AzToolsFramework::ViewportInteraction::MousePick mousePick; mousePick.m_screenCoordinates = screenPoint; - mousePick.m_rayOrigin = cameraState.m_position; + mousePick.m_rayOrigin = nearPlaneWorldPosition; mousePick.m_rayDirection = (nearPlaneWorldPosition - cameraState.m_position).GetNormalized(); return mousePick; diff --git a/Code/Framework/AzManipulatorTestFramework/Source/ImmediateModeActionDispatcher.cpp b/Code/Framework/AzManipulatorTestFramework/Source/ImmediateModeActionDispatcher.cpp index c122a941c4..5bfe63bd99 100644 --- a/Code/Framework/AzManipulatorTestFramework/Source/ImmediateModeActionDispatcher.cpp +++ b/Code/Framework/AzManipulatorTestFramework/Source/ImmediateModeActionDispatcher.cpp @@ -69,8 +69,6 @@ namespace AzManipulatorTestFramework void ImmediateModeActionDispatcher::CameraStateImpl(const AzFramework::CameraState& cameraState) { m_viewportManipulatorInteraction.GetViewportInteraction().SetCameraState(cameraState); - GetMouseInteractionEvent()->m_mouseInteraction.m_mousePick.m_rayOrigin = cameraState.m_position; - GetMouseInteractionEvent()->m_mouseInteraction.m_mousePick.m_rayDirection = cameraState.m_forward; } void ImmediateModeActionDispatcher::MouseLButtonDownImpl() diff --git a/Code/Framework/AzManipulatorTestFramework/Source/IndirectManipulatorViewportInteraction.cpp b/Code/Framework/AzManipulatorTestFramework/Source/IndirectManipulatorViewportInteraction.cpp index 730c106301..9bcb8986d5 100644 --- a/Code/Framework/AzManipulatorTestFramework/Source/IndirectManipulatorViewportInteraction.cpp +++ b/Code/Framework/AzManipulatorTestFramework/Source/IndirectManipulatorViewportInteraction.cpp @@ -20,7 +20,8 @@ namespace AzManipulatorTestFramework { public: IndirectCallManipulatorManager(ViewportInteractionInterface& viewportInteraction); - // ManipulatorManagerInterface ... + + // ManipulatorManagerInterface overrides ... void ConsumeMouseInteractionEvent(const MouseInteractionEvent& event) override; AzToolsFramework::ManipulatorManagerId GetId() const override; bool ManipulatorBeingInteracted() const override; diff --git a/Code/Framework/AzManipulatorTestFramework/Source/ViewportInteraction.cpp b/Code/Framework/AzManipulatorTestFramework/Source/ViewportInteraction.cpp index 269baa703d..08cae0c738 100644 --- a/Code/Framework/AzManipulatorTestFramework/Source/ViewportInteraction.cpp +++ b/Code/Framework/AzManipulatorTestFramework/Source/ViewportInteraction.cpp @@ -140,13 +140,12 @@ namespace AzManipulatorTestFramework return m_viewportId; } - AZStd::optional ViewportInteraction::ViewportScreenToWorld( - [[maybe_unused]] const AzFramework::ScreenPoint& screenPosition, [[maybe_unused]] float depth) + AZ::Vector3 ViewportInteraction::ViewportScreenToWorld([[maybe_unused]] const AzFramework::ScreenPoint& screenPosition) { - return {}; + return AZ::Vector3::CreateZero(); } - AZStd::optional ViewportInteraction::ViewportScreenToWorldRay( + AzToolsFramework::ViewportInteraction::ProjectedViewportRay ViewportInteraction::ViewportScreenToWorldRay( [[maybe_unused]] const AzFramework::ScreenPoint& screenPosition) { return {}; diff --git a/Code/Framework/AzManipulatorTestFramework/Tests/WorldSpaceBuilderTest.cpp b/Code/Framework/AzManipulatorTestFramework/Tests/WorldSpaceBuilderTest.cpp index 211c8d64ef..376c18072e 100644 --- a/Code/Framework/AzManipulatorTestFramework/Tests/WorldSpaceBuilderTest.cpp +++ b/Code/Framework/AzManipulatorTestFramework/Tests/WorldSpaceBuilderTest.cpp @@ -140,8 +140,8 @@ namespace UnitTest // given a left mouse down ray in world space // consume the mouse move event state.m_actionDispatcher->CameraState(m_cameraState) - ->MouseLButtonDown() ->MousePosition(AzManipulatorTestFramework::GetCameraStateViewportCenter(m_cameraState)) + ->MouseLButtonDown() ->ExpectTrue(state.m_linearManipulator->PerformingAction()) ->ExpectManipulatorBeingInteracted() ->MouseLButtonUp() diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/UnitTest/AzToolsFrameworkTestHelpers.h b/Code/Framework/AzToolsFramework/AzToolsFramework/UnitTest/AzToolsFrameworkTestHelpers.h index 4a7039423c..1e29f1dbce 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/UnitTest/AzToolsFrameworkTestHelpers.h +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UnitTest/AzToolsFrameworkTestHelpers.h @@ -158,7 +158,10 @@ namespace UnitTest { // Create & Start a new ToolsApplication if there's no existing one m_app = CreateTestApplication(); - m_app->Start(AzFramework::Application::Descriptor()); + AZ::ComponentApplication::StartupParameters startupParameters; + startupParameters.m_loadAssetCatalog = false; + + m_app->Start(AzFramework::Application::Descriptor(), startupParameters); } // without this, the user settings component would attempt to save on finalize/shutdown. Since the file is diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Viewport/ViewportMessages.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Viewport/ViewportMessages.h index 8ec772f0da..84a8daa83e 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/Viewport/ViewportMessages.h +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Viewport/ViewportMessages.h @@ -162,12 +162,11 @@ namespace AzToolsFramework //! Multiply by DeviceScalingFactor to get the position in viewport pixel space. virtual AzFramework::ScreenPoint ViewportWorldToScreen(const AZ::Vector3& worldPosition) = 0; //! Transforms a point from Qt widget screen space to world space based on the given clip space depth. - //! Depth specifies a relative camera depth to project in the range of [0.f, 1.f]. //! Returns the world space position if successful. - virtual AZStd::optional ViewportScreenToWorld(const AzFramework::ScreenPoint& screenPosition, float depth) = 0; + virtual AZ::Vector3 ViewportScreenToWorld(const AzFramework::ScreenPoint& screenPosition) = 0; //! Casts a point in screen space to a ray in world space originating from the viewport camera frustum's near plane. //! Returns a ray containing the ray's origin and a direction normal, if successful. - virtual AZStd::optional ViewportScreenToWorldRay(const AzFramework::ScreenPoint& screenPosition) = 0; + virtual ProjectedViewportRay ViewportScreenToWorldRay(const AzFramework::ScreenPoint& screenPosition) = 0; //! Gets the DPI scaling factor that translates Qt widget space into viewport pixel space. virtual float DeviceScalingFactor() = 0; @@ -229,9 +228,6 @@ namespace AzToolsFramework class MainEditorViewportInteractionRequests { public: - //! Given a point in screen space, return the picked entity (if any). - //! Picked EntityId will be returned, InvalidEntityId will be returned on failure. - virtual AZ::EntityId PickEntity(const AzFramework::ScreenPoint& point) = 0; //! Given a point in screen space, return the terrain position in world space. virtual AZ::Vector3 PickTerrain(const AzFramework::ScreenPoint& point) = 0; //! Return the terrain height given a world position in 2d (xy plane). @@ -266,7 +262,6 @@ namespace AzToolsFramework { public: static const AZ::EBusAddressPolicy AddressPolicy = AZ::EBusAddressPolicy::Single; - static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Single; //! Returns the current state of the keyboard modifier keys. virtual KeyboardModifiers QueryKeyboardModifiers() = 0; @@ -290,7 +285,6 @@ namespace AzToolsFramework { public: static const AZ::EBusAddressPolicy AddressPolicy = AZ::EBusAddressPolicy::Single; - static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Single; //! Returns the current time in seconds. //! This interface can be overridden for the purposes of testing to simplify viewport input requests. diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorHelpers.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorHelpers.cpp index 0f94b95e5f..ee30b9e29d 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorHelpers.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorHelpers.cpp @@ -148,7 +148,6 @@ namespace AzToolsFramework return false; } - EditorHelpers::EditorHelpers(const EditorVisibleEntityDataCache* entityDataCache) : m_entityDataCache(entityDataCache) { @@ -190,7 +189,10 @@ namespace AzToolsFramework if (helpersVisible) { // some components choose to hide their icons (e.g. meshes) - if (!m_entityDataCache->IsVisibleEntityIconHidden(entityCacheIndex)) + // we also do not want to test against icons that may not be showing as they're inside a 'closed' entity container + // (these icons only become visible when it is opened for editing) + if (!m_entityDataCache->IsVisibleEntityIconHidden(entityCacheIndex) && + m_entityDataCache->IsVisibleEntityIndividuallySelectableInViewport(entityCacheIndex)) { const AZ::Vector3& entityPosition = m_entityDataCache->GetVisibleEntityPosition(entityCacheIndex); @@ -235,7 +237,7 @@ namespace AzToolsFramework viewportId, &ViewportInteraction::ViewportMouseCursorRequestBus::Events::SetOverrideCursor, ViewportInteraction::CursorStyleOverride::Forbidden); } - + if (mouseInteraction.m_mouseInteraction.m_mouseButtons.Left() && mouseInteraction.m_mouseEvent == ViewportInteraction::MouseEvent::Down || mouseInteraction.m_mouseEvent == ViewportInteraction::MouseEvent::DoubleClick) diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorTransformComponentSelection.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorTransformComponentSelection.cpp index c16a458be7..5d2b11ca5e 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorTransformComponentSelection.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorTransformComponentSelection.cpp @@ -409,7 +409,7 @@ namespace AzToolsFramework const AzFramework::CameraState cameraState = GetCameraState(viewportId); for (size_t entityCacheIndex = 0; entityCacheIndex < entityDataCache.VisibleEntityDataCount(); ++entityCacheIndex) { - if (!entityDataCache.IsVisibleEntitySelectableInViewport(entityCacheIndex)) + if (!entityDataCache.IsVisibleEntityIndividuallySelectableInViewport(entityCacheIndex)) { continue; } @@ -983,7 +983,7 @@ namespace AzToolsFramework { if (auto entityIndex = entityDataCache.GetVisibleEntityIndexFromId(entityId)) { - if (entityDataCache.IsVisibleEntitySelectableInViewport(*entityIndex)) + if (entityDataCache.IsVisibleEntityIndividuallySelectableInViewport(*entityIndex)) { return *entityIndex; } diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorVisibleEntityDataCache.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorVisibleEntityDataCache.cpp index 328cfc3ae5..58c25b944c 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorVisibleEntityDataCache.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorVisibleEntityDataCache.cpp @@ -293,12 +293,10 @@ namespace AzToolsFramework return m_impl->m_visibleEntityDatas[index].m_iconHidden; } - bool EditorVisibleEntityDataCache::IsVisibleEntitySelectableInViewport(size_t index) const + bool EditorVisibleEntityDataCache::IsVisibleEntityIndividuallySelectableInViewport(const size_t index) const { - return m_impl->m_visibleEntityDatas[index].m_visible - && !m_impl->m_visibleEntityDatas[index].m_locked - && m_impl->m_visibleEntityDatas[index].m_inFocus - && !m_impl->m_visibleEntityDatas[index].m_descendantOfClosedContainer; + return m_impl->m_visibleEntityDatas[index].m_visible && !m_impl->m_visibleEntityDatas[index].m_locked && + m_impl->m_visibleEntityDatas[index].m_inFocus && !m_impl->m_visibleEntityDatas[index].m_descendantOfClosedContainer; } AZStd::optional EditorVisibleEntityDataCache::GetVisibleEntityIndexFromId(const AZ::EntityId entityId) const diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorVisibleEntityDataCache.h b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorVisibleEntityDataCache.h index 16fa1b6d14..4262d334df 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorVisibleEntityDataCache.h +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorVisibleEntityDataCache.h @@ -55,7 +55,10 @@ namespace AzToolsFramework bool IsVisibleEntityVisible(size_t index) const; bool IsVisibleEntitySelected(size_t index) const; bool IsVisibleEntityIconHidden(size_t index) const; - bool IsVisibleEntitySelectableInViewport(size_t index) const; + //! Returns true if the entity is individually selectable (none of its ancestors are a closed container entity). + //! @note It may still be desirable to be able to 'click' an entity that is a descendant of a closed container + //! to select the container itself, not the individual entity. + bool IsVisibleEntityIndividuallySelectableInViewport(size_t index) const; AZStd::optional GetVisibleEntityIndexFromId(AZ::EntityId entityId) const; diff --git a/Code/Framework/AzToolsFramework/Tests/BoundsTestComponent.cpp b/Code/Framework/AzToolsFramework/Tests/BoundsTestComponent.cpp index 1aa7b39593..fa5a6b344a 100644 --- a/Code/Framework/AzToolsFramework/Tests/BoundsTestComponent.cpp +++ b/Code/Framework/AzToolsFramework/Tests/BoundsTestComponent.cpp @@ -40,6 +40,9 @@ namespace UnitTest { AzFramework::BoundsRequestBus::Handler::BusConnect(GetEntityId()); AzToolsFramework::EditorComponentSelectionRequestsBus::Handler::BusConnect(GetEntityId()); + + // default local bounds to unit cube + m_localBounds = AZ::Aabb::CreateFromMinMax(AZ::Vector3(-0.5f), AZ::Vector3(0.5f)); } void BoundsTestComponent::Deactivate() @@ -57,7 +60,6 @@ namespace UnitTest AZ::Aabb BoundsTestComponent::GetLocalBounds() { - return AZ::Aabb::CreateFromMinMax(AZ::Vector3(-0.5f), AZ::Vector3(0.5f)); + return m_localBounds; } - } // namespace UnitTest diff --git a/Code/Framework/AzToolsFramework/Tests/BoundsTestComponent.h b/Code/Framework/AzToolsFramework/Tests/BoundsTestComponent.h index 036f9c8798..358a9f810a 100644 --- a/Code/Framework/AzToolsFramework/Tests/BoundsTestComponent.h +++ b/Code/Framework/AzToolsFramework/Tests/BoundsTestComponent.h @@ -41,5 +41,7 @@ namespace UnitTest // BoundsRequestBus overrides ... AZ::Aabb GetWorldBounds() override; AZ::Aabb GetLocalBounds() override; + + AZ::Aabb m_localBounds; //!< Local bounds that can be modified for certain tests (defaults to unit cube). }; } // namespace UnitTest diff --git a/Code/Framework/AzToolsFramework/Tests/EditorTransformComponentSelectionTests.cpp b/Code/Framework/AzToolsFramework/Tests/EditorTransformComponentSelectionTests.cpp index 81909ac511..4f4c3eb456 100644 --- a/Code/Framework/AzToolsFramework/Tests/EditorTransformComponentSelectionTests.cpp +++ b/Code/Framework/AzToolsFramework/Tests/EditorTransformComponentSelectionTests.cpp @@ -38,7 +38,7 @@ #include #include -#include +#include namespace AZ { @@ -493,12 +493,8 @@ namespace UnitTest /////////////////////////////////////////////////////////////////////////////////////////////////////////////// // Then - AzToolsFramework::EntityIdList selectedEntities; - AzToolsFramework::ToolsApplicationRequestBus::BroadcastResult( - selectedEntities, &AzToolsFramework::ToolsApplicationRequestBus::Events::GetSelectedEntities); - - AzToolsFramework::EntityIdList expectedSelectedEntities = { entity4, entity5, entity6 }; - + const AzToolsFramework::EntityIdList selectedEntities = SelectedEntities(); + const AzToolsFramework::EntityIdList expectedSelectedEntities = { entity4, entity5, entity6 }; EXPECT_THAT(selectedEntities, UnorderedElementsAreArray(expectedSelectedEntities)); /////////////////////////////////////////////////////////////////////////////////////////////////////////////// } @@ -527,12 +523,8 @@ namespace UnitTest /////////////////////////////////////////////////////////////////////////////////////////////////////////////// // Then - AzToolsFramework::EntityIdList selectedEntities; - AzToolsFramework::ToolsApplicationRequestBus::BroadcastResult( - selectedEntities, &AzToolsFramework::ToolsApplicationRequestBus::Events::GetSelectedEntities); - - AzToolsFramework::EntityIdList expectedSelectedEntities = { m_entityId1, entity2, entity3, entity4 }; - + const AzToolsFramework::EntityIdList selectedEntities = SelectedEntities(); + const AzToolsFramework::EntityIdList expectedSelectedEntities = { m_entityId1, entity2, entity3, entity4 }; EXPECT_THAT(selectedEntities, UnorderedElementsAreArray(expectedSelectedEntities)); /////////////////////////////////////////////////////////////////////////////////////////////////////////////// } @@ -946,6 +938,42 @@ namespace UnitTest EXPECT_THAT(selectedEntitiesAfter, UnorderedElementsAre(m_entityId1)); } + TEST_F( + EditorTransformComponentSelectionViewportPickingManipulatorTestFixture, BoundsBetweenCameraAndNearClipPlaneDoesNotIntersectMouseRay) + { + // move camera to 10 units along the y-axis + AzFramework::SetCameraTransform(m_cameraState, AZ::Transform::CreateTranslation(AZ::Vector3::CreateAxisY(10.0f))); + + // send a very narrow bounds for entity1 + AZ::Entity* entity1 = AzToolsFramework::GetEntityById(m_entityId1); + auto* boundTestComponent = entity1->FindComponent(); + boundTestComponent->m_localBounds = + AZ::Aabb::CreateFromMinMax(AZ::Vector3(-0.5f, -0.0025f, -0.5f), AZ::Vector3(0.5f, 0.0025f, 0.5f)); + + // move entity1 in front of the camera between it and the near clip plane + AZ::TransformBus::Event( + m_entityId1, &AZ::TransformBus::Events::SetWorldTM, AZ::Transform::CreateTranslation(AZ::Vector3::CreateAxisY(10.05f))); + // move entity2 behind entity1 + AZ::TransformBus::Event( + m_entityId2, &AZ::TransformBus::Events::SetWorldTM, AZ::Transform::CreateTranslation(AZ::Vector3::CreateAxisY(15.0f))); + + const auto entity2ScreenPosition = AzFramework::WorldToScreen(AzToolsFramework::GetWorldTranslation(m_entityId2), m_cameraState); + + // click the entity in the viewport + m_actionDispatcher->SetStickySelect(true) + ->CameraState(m_cameraState) + ->MousePosition(entity2ScreenPosition) + ->CameraState(m_cameraState) + ->MouseLButtonDown() + ->MouseLButtonUp(); + + // ensure entity1 is not selected as it is before the near clip plane + using ::testing::UnorderedElementsAreArray; + const AzToolsFramework::EntityIdList selectedEntities = SelectedEntities(); + const AzToolsFramework::EntityIdList expectedSelectedEntities = { m_entityId2 }; + EXPECT_THAT(selectedEntities, UnorderedElementsAreArray(expectedSelectedEntities)); + } + class EditorTransformComponentSelectionViewportPickingManipulatorTestFixtureParam : public EditorTransformComponentSelectionViewportPickingManipulatorTestFixture , public ::testing::WithParamInterface diff --git a/Code/Framework/AzToolsFramework/Tests/EditorVertexSelectionTests.cpp b/Code/Framework/AzToolsFramework/Tests/EditorVertexSelectionTests.cpp index d08c9646a2..93010aa63d 100644 --- a/Code/Framework/AzToolsFramework/Tests/EditorVertexSelectionTests.cpp +++ b/Code/Framework/AzToolsFramework/Tests/EditorVertexSelectionTests.cpp @@ -23,6 +23,7 @@ #include #include #include +#include using namespace AzToolsFramework; diff --git a/Code/Framework/AzToolsFramework/Tests/Viewport/ViewportScreenTests.cpp b/Code/Framework/AzToolsFramework/Tests/Viewport/ViewportScreenTests.cpp index e8fce6653f..58c28f8568 100644 --- a/Code/Framework/AzToolsFramework/Tests/Viewport/ViewportScreenTests.cpp +++ b/Code/Framework/AzToolsFramework/Tests/Viewport/ViewportScreenTests.cpp @@ -17,6 +17,7 @@ #include #include #include +#include namespace UnitTest { @@ -35,6 +36,7 @@ namespace UnitTest const auto worldResult = AzFramework::ScreenToWorld(screenPoint, cameraState); return AzFramework::WorldToScreen(worldResult, cameraState); } + //////////////////////////////////////////////////////////////////////////////////////////////////////// // ScreenPoint tests TEST(ViewportScreen, WorldToScreenAndScreenToWorldReturnsTheSameValueIdentityCameraOffsetFromOrigin) @@ -102,8 +104,8 @@ namespace UnitTest } //////////////////////////////////////////////////////////////////////////////////////////////////////// - // NDC tests - TEST(ViewportScreen, WorldToScreenNDCAndScreenNDCToWorldReturnsTheSameValueIdentityCameraOffsetFromOrigin) + // Ndc tests + TEST(ViewportScreen, WorldToScreenNdcAndScreenNdcToWorldReturnsTheSameValueIdentityCameraOffsetFromOrigin) { using NdcPoint = AZ::Vector2; @@ -136,7 +138,7 @@ namespace UnitTest } } - TEST(ViewportScreen, WorldToScreenNDCAndScreenNDCToWorldReturnsTheSameValueOrientatedCamera) + TEST(ViewportScreen, WorldToScreenNdcAndScreenNdcToWorldReturnsTheSameValueOrientatedCamera) { using NdcPoint = AZ::Vector2; @@ -153,7 +155,7 @@ namespace UnitTest // note: nearClip is 0.1 - the world space value returned will be aligned to the near clip // plane of the camera so use that to confirm the mapping to/from is correct - TEST(ViewportScreen, ScreenNDCToWorldReturnsPositionOnNearClipPlaneInWorldSpace) + TEST(ViewportScreen, ScreenNdcToWorldReturnsPositionOnNearClipPlaneInWorldSpace) { using NdcPoint = AZ::Vector2; diff --git a/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/View.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/View.h index e5614161b2..eb3592944d 100644 --- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/View.h +++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/View.h @@ -132,17 +132,22 @@ namespace AZ //! Returns the masked occlusion culling interface MaskedOcclusionCulling* GetMaskedOcclusionCulling(); + //! This is called by RenderPipeline when this view is added to the pipeline. + void OnAddToRenderPipeline(); + private: View() = delete; View(const AZ::Name& name, UsageFlags usage); - //! Sorts the finalized draw lists in this view void SortFinalizedDrawLists(); //! Sorts a drawList using the sort function from a pass with the corresponding drawListTag void SortDrawList(RHI::DrawList& drawList, RHI::DrawListTag tag); + //! Attempt to create a shader resource group. + void TryCreateShaderResourceGroup(); + AZ::Name m_name; UsageFlags m_usageFlags; diff --git a/Gems/Atom/RPI/Code/Source/RPI.Public/RenderPipeline.cpp b/Gems/Atom/RPI/Code/Source/RPI.Public/RenderPipeline.cpp index 8d4303f187..062eaf02bd 100644 --- a/Gems/Atom/RPI/Code/Source/RPI.Public/RenderPipeline.cpp +++ b/Gems/Atom/RPI/Code/Source/RPI.Public/RenderPipeline.cpp @@ -178,6 +178,10 @@ namespace AZ pipelineViews.m_views.resize(1); } ViewPtr previousView = pipelineViews.m_views[0]; + if (view) + { + view->OnAddToRenderPipeline(); + } pipelineViews.m_views[0] = view; if (previousView) @@ -238,6 +242,7 @@ namespace AZ pipelineViews.m_type = PipelineViewType::Transient; } view->SetPassesByDrawList(&pipelineViews.m_passesByDrawList); + view->OnAddToRenderPipeline(); pipelineViews.m_views.push_back(view); } } diff --git a/Gems/Atom/RPI/Code/Source/RPI.Public/View.cpp b/Gems/Atom/RPI/Code/Source/RPI.Public/View.cpp index 4538cf83e4..4ad8dae41c 100644 --- a/Gems/Atom/RPI/Code/Source/RPI.Public/View.cpp +++ b/Gems/Atom/RPI/Code/Source/RPI.Public/View.cpp @@ -47,18 +47,14 @@ namespace AZ { AZ_Assert(!name.IsEmpty(), "invalid name"); - // Set default matrixes. + // Set default matrices SetWorldToViewMatrix(AZ::Matrix4x4::CreateIdentity()); AZ::Matrix4x4 viewToClipMatrix; AZ::MakePerspectiveFovMatrixRH(viewToClipMatrix, AZ::Constants::HalfPi, 1, 0.1f, 1000.f, true); SetViewToClipMatrix(viewToClipMatrix); - Data::Asset viewSrgShaderAsset = RPISystemInterface::Get()->GetCommonShaderAssetForSrgs(); + TryCreateShaderResourceGroup(); - if (viewSrgShaderAsset.IsReady()) - { - m_shaderResourceGroup = ShaderResourceGroup::Create(viewSrgShaderAsset, RPISystemInterface::Get()->GetViewSrgLayout()->GetName()); - } #if AZ_TRAIT_MASKED_OCCLUSION_CULLING_SUPPORTED m_maskedOcclusionCulling = MaskedOcclusionCulling::Create(); m_maskedOcclusionCulling->SetResolution(MaskedSoftwareOcclusionCullingWidth, MaskedSoftwareOcclusionCullingHeight); @@ -369,16 +365,19 @@ namespace AZ { if (m_clipSpaceOffset.IsZero()) { - Matrix4x4 worldToClipPrevMatrix = m_viewToClipPrevMatrix * m_worldToViewPrevMatrix; - m_shaderResourceGroup->SetConstant(m_worldToClipPrevMatrixConstantIndex, worldToClipPrevMatrix); - m_shaderResourceGroup->SetConstant(m_viewProjectionMatrixConstantIndex, m_worldToClipMatrix); - m_shaderResourceGroup->SetConstant(m_projectionMatrixConstantIndex, m_viewToClipMatrix); - m_shaderResourceGroup->SetConstant(m_clipToWorldMatrixConstantIndex, m_clipToWorldMatrix); - m_shaderResourceGroup->SetConstant(m_projectionMatrixInverseConstantIndex, m_viewToClipMatrix.GetInverseFull()); + if (m_shaderResourceGroup) + { + Matrix4x4 worldToClipPrevMatrix = m_viewToClipPrevMatrix * m_worldToViewPrevMatrix; + m_shaderResourceGroup->SetConstant(m_worldToClipPrevMatrixConstantIndex, worldToClipPrevMatrix); + m_shaderResourceGroup->SetConstant(m_viewProjectionMatrixConstantIndex, m_worldToClipMatrix); + m_shaderResourceGroup->SetConstant(m_projectionMatrixConstantIndex, m_viewToClipMatrix); + m_shaderResourceGroup->SetConstant(m_clipToWorldMatrixConstantIndex, m_clipToWorldMatrix); + m_shaderResourceGroup->SetConstant(m_projectionMatrixInverseConstantIndex, m_viewToClipMatrix.GetInverseFull()); + } } else { - // Offset the current and previous frame clip matricies + // Offset the current and previous frame clip matrices Matrix4x4 offsetViewToClipMatrix = m_viewToClipMatrix; offsetViewToClipMatrix.SetElement(0, 2, m_clipSpaceOffset.GetX()); offsetViewToClipMatrix.SetElement(1, 2, m_clipSpaceOffset.GetY()); @@ -387,27 +386,33 @@ namespace AZ offsetViewToClipPrevMatrix.SetElement(0, 2, m_clipSpaceOffset.GetX()); offsetViewToClipPrevMatrix.SetElement(1, 2, m_clipSpaceOffset.GetY()); - // Build other matricies dependent on the view to clip matricies + // Build other matrices dependent on the view to clip matrices Matrix4x4 offsetWorldToClipMatrix = offsetViewToClipMatrix * m_worldToViewMatrix; Matrix4x4 offsetWorldToClipPrevMatrix = offsetViewToClipPrevMatrix * m_worldToViewPrevMatrix; Matrix4x4 offsetClipToViewMatrix = offsetViewToClipMatrix.GetInverseFull(); Matrix4x4 offsetClipToWorldMatrix = m_viewToWorldMatrix * offsetClipToViewMatrix; - - m_shaderResourceGroup->SetConstant(m_worldToClipPrevMatrixConstantIndex, offsetWorldToClipPrevMatrix); - m_shaderResourceGroup->SetConstant(m_viewProjectionMatrixConstantIndex, offsetWorldToClipMatrix); - m_shaderResourceGroup->SetConstant(m_projectionMatrixConstantIndex, offsetViewToClipMatrix); - m_shaderResourceGroup->SetConstant(m_clipToWorldMatrixConstantIndex, offsetClipToWorldMatrix); - m_shaderResourceGroup->SetConstant(m_projectionMatrixInverseConstantIndex, offsetViewToClipMatrix.GetInverseFull()); + + if (m_shaderResourceGroup) + { + m_shaderResourceGroup->SetConstant(m_worldToClipPrevMatrixConstantIndex, offsetWorldToClipPrevMatrix); + m_shaderResourceGroup->SetConstant(m_viewProjectionMatrixConstantIndex, offsetWorldToClipMatrix); + m_shaderResourceGroup->SetConstant(m_projectionMatrixConstantIndex, offsetViewToClipMatrix); + m_shaderResourceGroup->SetConstant(m_clipToWorldMatrixConstantIndex, offsetClipToWorldMatrix); + m_shaderResourceGroup->SetConstant(m_projectionMatrixInverseConstantIndex, offsetViewToClipMatrix.GetInverseFull()); + } } - m_shaderResourceGroup->SetConstant(m_worldPositionConstantIndex, m_position); - m_shaderResourceGroup->SetConstant(m_viewMatrixConstantIndex, m_worldToViewMatrix); - m_shaderResourceGroup->SetConstant(m_viewMatrixInverseConstantIndex, m_worldToViewMatrix.GetInverseFull()); - m_shaderResourceGroup->SetConstant(m_zConstantsConstantIndex, m_nearZ_farZ_farZTimesNearZ_farZMinusNearZ); - m_shaderResourceGroup->SetConstant(m_unprojectionConstantsIndex, m_unprojectionConstants); + if (m_shaderResourceGroup) + { + m_shaderResourceGroup->SetConstant(m_worldPositionConstantIndex, m_position); + m_shaderResourceGroup->SetConstant(m_viewMatrixConstantIndex, m_worldToViewMatrix); + m_shaderResourceGroup->SetConstant(m_viewMatrixInverseConstantIndex, m_worldToViewMatrix.GetInverseFull()); + m_shaderResourceGroup->SetConstant(m_zConstantsConstantIndex, m_nearZ_farZ_farZTimesNearZ_farZMinusNearZ); + m_shaderResourceGroup->SetConstant(m_unprojectionConstantsIndex, m_unprojectionConstants); - m_shaderResourceGroup->Compile(); + m_shaderResourceGroup->Compile(); + } m_viewToClipPrevMatrix = m_viewToClipMatrix; m_worldToViewPrevMatrix = m_worldToViewMatrix; @@ -426,5 +431,30 @@ namespace AZ { return m_maskedOcclusionCulling; } + + void View::TryCreateShaderResourceGroup() + { + if (!m_shaderResourceGroup) + { + if (auto rpiSystemInterface = RPISystemInterface::Get()) + { + if (Data::Asset viewSrgShaderAsset = rpiSystemInterface->GetCommonShaderAssetForSrgs(); + viewSrgShaderAsset.IsReady()) + { + m_shaderResourceGroup = + ShaderResourceGroup::Create(viewSrgShaderAsset, rpiSystemInterface->GetViewSrgLayout()->GetName()); + } + } + } + } + + void View::OnAddToRenderPipeline() + { + TryCreateShaderResourceGroup(); + if (!m_shaderResourceGroup) + { + AZ_Warning("RPI::View", false, "Shader Resource Group failed to initialize"); + } + } } // namespace RPI } // namespace AZ diff --git a/Gems/Atom/Tools/AtomToolsFramework/Code/CMakeLists.txt b/Gems/Atom/Tools/AtomToolsFramework/Code/CMakeLists.txt index 40c8d7956e..460341532d 100644 --- a/Gems/Atom/Tools/AtomToolsFramework/Code/CMakeLists.txt +++ b/Gems/Atom/Tools/AtomToolsFramework/Code/CMakeLists.txt @@ -80,6 +80,7 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED) PRIVATE AZ::AzTest AZ::AzTestShared + AZ::AzFrameworkTestShared Gem::AtomToolsFramework.Static Gem::Atom_Utils.TestUtils.Static ) diff --git a/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Viewport/RenderViewportWidget.h b/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Viewport/RenderViewportWidget.h index 8233658ded..5216f511cb 100644 --- a/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Viewport/RenderViewportWidget.h +++ b/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Viewport/RenderViewportWidget.h @@ -21,6 +21,7 @@ #include #include #include +#include namespace AtomToolsFramework { @@ -30,8 +31,8 @@ namespace AtomToolsFramework //! @see AZ::RPI::ViewportContext for Atom's API for setting up class RenderViewportWidget : public QWidget - , public AzToolsFramework::ViewportInteraction::ViewportInteractionRequestBus::Handler , public AzToolsFramework::ViewportInteraction::ViewportMouseCursorRequestBus::Handler + , public AzToolsFramework::ViewportInteraction::ViewportInteractionRequests , public AzFramework::WindowRequestBus::Handler , protected AzFramework::InputChannelEventListener , protected AZ::TickBus::Handler @@ -90,11 +91,11 @@ namespace AtomToolsFramework //! Input processing is enabled by default. void SetInputProcessingEnabled(bool enabled); - // AzToolsFramework::ViewportInteraction::ViewportInteractionRequestBus::Handler overrides ... + // ViewportInteractionRequests overrides ... AzFramework::CameraState GetCameraState() override; AzFramework::ScreenPoint ViewportWorldToScreen(const AZ::Vector3& worldPosition) override; - AZStd::optional ViewportScreenToWorld(const AzFramework::ScreenPoint& screenPosition, float depth) override; - AZStd::optional ViewportScreenToWorldRay( + AZ::Vector3 ViewportScreenToWorld(const AzFramework::ScreenPoint& screenPosition) override; + AzToolsFramework::ViewportInteraction::ProjectedViewportRay ViewportScreenToWorldRay( const AzFramework::ScreenPoint& screenPosition) override; float DeviceScalingFactor() override; @@ -149,5 +150,7 @@ namespace AtomToolsFramework AZ::ScriptTimePoint m_time; // Maps our internal Qt events into AzFramework InputChannels for our ViewportControllerList. AzToolsFramework::QtEventToAzInputMapper* m_inputChannelMapper = nullptr; + // Implementation of ViewportInteractionRequests (handles viewport picking operations). + AZStd::unique_ptr m_viewportInteractionImpl; }; } //namespace AtomToolsFramework diff --git a/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Viewport/ViewportInteractionImpl.h b/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Viewport/ViewportInteractionImpl.h new file mode 100644 index 0000000000..9de74752ff --- /dev/null +++ b/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Viewport/ViewportInteractionImpl.h @@ -0,0 +1,42 @@ +/* + * 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 +#include +#include +#include + +namespace AtomToolsFramework +{ + //! A concrete implementation of the ViewportInteractionRequestBus. + //! Primarily concerned with picking (screen to world and world to screen transformations). + class ViewportInteractionImpl : public AzToolsFramework::ViewportInteraction::ViewportInteractionRequestBus::Handler + { + public: + explicit ViewportInteractionImpl(AZ::RPI::ViewPtr viewPtr); + + void Connect(AzFramework::ViewportId viewportId); + void Disconnect(); + + // ViewportInteractionRequestBus overrides ... + AzFramework::CameraState GetCameraState() override; + AzFramework::ScreenPoint ViewportWorldToScreen(const AZ::Vector3& worldPosition) override; + AZ::Vector3 ViewportScreenToWorld(const AzFramework::ScreenPoint& screenPosition) override; + AzToolsFramework::ViewportInteraction::ProjectedViewportRay ViewportScreenToWorldRay( + const AzFramework::ScreenPoint& screenPosition) override; + float DeviceScalingFactor() override; + + AZStd::function m_screenSizeFn; //! Callback to determine the screen size. + AZStd::function m_deviceScalingFactorFn; //! Callback to determine the device scaling factor. + + private: + AZ::RPI::ViewPtr m_viewPtr; + }; +} // namespace AtomToolsFramework diff --git a/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Viewport/RenderViewportWidget.cpp b/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Viewport/RenderViewportWidget.cpp index 9672abfd99..aac76afd84 100644 --- a/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Viewport/RenderViewportWidget.cpp +++ b/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Viewport/RenderViewportWidget.cpp @@ -75,7 +75,11 @@ namespace AtomToolsFramework m_defaultCamera = AZ::RPI::View::CreateView(cameraName, AZ::RPI::View::UsageFlags::UsageCamera); AZ::Interface::Get()->PushView(m_viewportContext->GetName(), m_defaultCamera); - AzToolsFramework::ViewportInteraction::ViewportInteractionRequestBus::Handler::BusConnect(GetId()); + m_viewportInteractionImpl = AZStd::make_unique(m_defaultCamera); + m_viewportInteractionImpl->m_deviceScalingFactorFn = [this] { return aznumeric_cast(devicePixelRatioF()); }; + m_viewportInteractionImpl->m_screenSizeFn = [this] { return AzFramework::ScreenSize(width(), height()); }; + m_viewportInteractionImpl->Connect(id); + AzToolsFramework::ViewportInteraction::ViewportMouseCursorRequestBus::Handler::BusConnect(GetId()); AzFramework::InputChannelEventListener::Connect(); AZ::TickBus::Handler::BusConnect(); @@ -107,7 +111,7 @@ namespace AtomToolsFramework AZ::TickBus::Handler::BusDisconnect(); AzFramework::InputChannelEventListener::Disconnect(); AzToolsFramework::ViewportInteraction::ViewportMouseCursorRequestBus::Handler::BusDisconnect(); - AzToolsFramework::ViewportInteraction::ViewportInteractionRequestBus::Handler::BusDisconnect(); + m_viewportInteractionImpl->Disconnect(); } void RenderViewportWidget::LockRenderTargetSize(uint32_t width, uint32_t height) @@ -278,77 +282,23 @@ namespace AtomToolsFramework AzFramework::CameraState RenderViewportWidget::GetCameraState() { - AZ::RPI::ViewPtr currentView = m_viewportContext->GetDefaultView(); - if (currentView == nullptr) - { - return {}; - } - - // Build camera state from Atom camera transforms - AzFramework::CameraState cameraState = AzFramework::CreateCameraFromWorldFromViewMatrix( - currentView->GetViewToWorldMatrix(), - AZ::Vector2{aznumeric_cast(width()), aznumeric_cast(height())} - ); - AzFramework::SetCameraClippingVolumeFromPerspectiveFovMatrixRH(cameraState, currentView->GetViewToClipMatrix()); - - // Convert from Z-up - AZStd::swap(cameraState.m_forward, cameraState.m_up); - cameraState.m_forward = -cameraState.m_forward; - - return cameraState; + return m_viewportInteractionImpl->GetCameraState(); } AzFramework::ScreenPoint RenderViewportWidget::ViewportWorldToScreen(const AZ::Vector3& worldPosition) { - if (AZ::RPI::ViewPtr currentView = m_viewportContext->GetDefaultView(); - currentView == nullptr) - { - return AzFramework::ScreenPoint(0, 0); - } - - return AzFramework::WorldToScreen(worldPosition, GetCameraState()); + return m_viewportInteractionImpl->ViewportWorldToScreen(worldPosition); } - AZStd::optional RenderViewportWidget::ViewportScreenToWorld(const AzFramework::ScreenPoint& screenPosition, float depth) + AZ::Vector3 RenderViewportWidget::ViewportScreenToWorld(const AzFramework::ScreenPoint& screenPosition) { - const auto& cameraProjection = m_viewportContext->GetCameraProjectionMatrix(); - const auto& cameraView = m_viewportContext->GetCameraViewMatrix(); - - const AZ::Vector4 normalizedScreenPosition { - screenPosition.m_x * 2.f / width() - 1.0f, - (height() - screenPosition.m_y) * 2.f / height() - 1.0f, - 1.f - depth, // [GFX TODO] [ATOM-1501] Currently we always assume reverse depth - 1.f - }; - - AZ::Matrix4x4 worldFromScreen = cameraProjection * cameraView; - worldFromScreen.InvertFull(); - - const AZ::Vector4 projectedPosition = worldFromScreen * normalizedScreenPosition; - if (projectedPosition.GetW() == 0.0f) - { - return {}; - } - - return projectedPosition.GetAsVector3() / projectedPosition.GetW(); + return m_viewportInteractionImpl->ViewportScreenToWorld(screenPosition); } - AZStd::optional RenderViewportWidget::ViewportScreenToWorldRay( + AzToolsFramework::ViewportInteraction::ProjectedViewportRay RenderViewportWidget::ViewportScreenToWorldRay( const AzFramework::ScreenPoint& screenPosition) { - auto pos0 = ViewportScreenToWorld(screenPosition, 0.f); - auto pos1 = ViewportScreenToWorld(screenPosition, 1.f); - if (!pos0.has_value() || !pos1.has_value()) - { - return {}; - } - - pos0 = m_viewportContext->GetDefaultView()->GetViewToWorldMatrix().GetTranslation(); - AZ::Vector3 rayOrigin = pos0.value(); - AZ::Vector3 rayDirection = pos1.value() - pos0.value(); - rayDirection.Normalize(); - - return AzToolsFramework::ViewportInteraction::ProjectedViewportRay{rayOrigin, rayDirection}; + return m_viewportInteractionImpl->ViewportScreenToWorldRay(screenPosition); } float RenderViewportWidget::DeviceScalingFactor() diff --git a/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Viewport/ViewportInteractionImpl.cpp b/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Viewport/ViewportInteractionImpl.cpp new file mode 100644 index 0000000000..475566ccee --- /dev/null +++ b/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Viewport/ViewportInteractionImpl.cpp @@ -0,0 +1,61 @@ +/* + * 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 +#include + +namespace AtomToolsFramework +{ + ViewportInteractionImpl::ViewportInteractionImpl(AZ::RPI::ViewPtr viewPtr) + : m_viewPtr(AZStd::move(viewPtr)) + { + } + + void ViewportInteractionImpl::Connect(const AzFramework::ViewportId viewportId) + { + AzToolsFramework::ViewportInteraction::ViewportInteractionRequestBus::Handler::BusConnect(viewportId); + } + + void ViewportInteractionImpl::Disconnect() + { + AzToolsFramework::ViewportInteraction::ViewportInteractionRequestBus::Handler::BusDisconnect(); + } + + AzFramework::CameraState ViewportInteractionImpl::GetCameraState() + { + // build camera state from atom camera transforms + AzFramework::CameraState cameraState = + AzFramework::CreateDefaultCamera(m_viewPtr->GetCameraTransform(), AzFramework::Vector2FromScreenSize(m_screenSizeFn())); + AzFramework::SetCameraClippingVolumeFromPerspectiveFovMatrixRH(cameraState, m_viewPtr->GetViewToClipMatrix()); + return cameraState; + } + + AzFramework::ScreenPoint ViewportInteractionImpl::ViewportWorldToScreen(const AZ::Vector3& worldPosition) + { + return AzFramework::WorldToScreen(worldPosition, GetCameraState()); + } + + AZ::Vector3 ViewportInteractionImpl::ViewportScreenToWorld(const AzFramework::ScreenPoint& screenPosition) + { + return AzFramework::ScreenToWorld(screenPosition, GetCameraState()); + } + + AzToolsFramework::ViewportInteraction::ProjectedViewportRay ViewportInteractionImpl::ViewportScreenToWorldRay( + const AzFramework::ScreenPoint& screenPosition) + { + const AzFramework::CameraState cameraState = GetCameraState(); + const AZ::Vector3 rayOrigin = AzFramework::ScreenToWorld(screenPosition, cameraState); + const AZ::Vector3 rayDirection = (rayOrigin - cameraState.m_position).GetNormalized(); + return AzToolsFramework::ViewportInteraction::ProjectedViewportRay{ rayOrigin, rayDirection }; + } + + float ViewportInteractionImpl::DeviceScalingFactor() + { + return m_deviceScalingFactorFn(); + } +} // namespace AtomToolsFramework diff --git a/Gems/Atom/Tools/AtomToolsFramework/Code/Tests/AtomToolsFrameworkTest.cpp b/Gems/Atom/Tools/AtomToolsFramework/Code/Tests/AtomToolsFrameworkTest.cpp index df16cfbc43..3124372bd2 100644 --- a/Gems/Atom/Tools/AtomToolsFramework/Code/Tests/AtomToolsFrameworkTest.cpp +++ b/Gems/Atom/Tools/AtomToolsFramework/Code/Tests/AtomToolsFrameworkTest.cpp @@ -12,16 +12,25 @@ namespace UnitTest { + class AtomToolsFrameworkTestEnvironment : public AZ::Test::ITestEnvironment + { + protected: + void SetupEnvironment() override + { + AZ::AllocatorInstance::Create(); + } + + void TeardownEnvironment() override + { + AZ::AllocatorInstance::Destroy(); + } + }; + class AtomToolsFrameworkTest : public ::testing::Test { protected: void SetUp() override { - if (!AZ::AllocatorInstance::IsReady()) - { - AZ::AllocatorInstance::Create(AZ::SystemAllocator::Descriptor()); - } - m_assetSystemStub.Activate(); RegisterSourceAsset("objects/upgrades/materials/supercondor.material"); @@ -38,11 +47,6 @@ namespace UnitTest void TearDown() override { m_assetSystemStub.Deactivate(); - - if (AZ::AllocatorInstance::IsReady()) - { - AZ::AllocatorInstance::Destroy(); - } } void RegisterSourceAsset(const AZStd::string& path) @@ -73,5 +77,5 @@ namespace UnitTest ASSERT_EQ(AtomToolsFramework::GetExteralReferencePath("d:/project/assets/objects/upgrades/materials/supercondor.material", "d:/project/assets/materials/condor.material", 0), "materials/condor.material"); } - AZ_UNIT_TEST_HOOK(DEFAULT_UNIT_TEST_ENV); + AZ_UNIT_TEST_HOOK(new AtomToolsFrameworkTestEnvironment); } // namespace UnitTest diff --git a/Gems/Atom/Tools/AtomToolsFramework/Code/Tests/ViewportInteractionImplTests.cpp b/Gems/Atom/Tools/AtomToolsFramework/Code/Tests/ViewportInteractionImplTests.cpp new file mode 100644 index 0000000000..fa5bc5b6e5 --- /dev/null +++ b/Gems/Atom/Tools/AtomToolsFramework/Code/Tests/ViewportInteractionImplTests.cpp @@ -0,0 +1,172 @@ +/* + * 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 +#include +#include +#include +#include +#include +#include +#include +#include +#include + +namespace UnitTest +{ + class ViewportInteractionImplFixture : public ::testing::Test + { + public: + static inline constexpr AzFramework::ViewportId TestViewportId = 1234; + static inline constexpr AzFramework::ScreenSize ScreenDimensions = AzFramework::ScreenSize(1280, 720); + + static AzFramework::ScreenPoint ScreenCenter() + { + const auto halfScreenDimensions = ScreenDimensions * 0.5f; + return AzFramework::ScreenPoint(halfScreenDimensions.m_width, halfScreenDimensions.m_height); + } + + void SetUp() override + { + AZ::NameDictionary::Create(); + + m_view = AZ::RPI::View::CreateView(AZ::Name("TestView"), AZ::RPI::View::UsageCamera); + + const auto aspectRatio = aznumeric_cast(ScreenDimensions.m_width) / aznumeric_cast(ScreenDimensions.m_height); + + AZ::Matrix4x4 viewToClipMatrix; + AZ::MakePerspectiveFovMatrixRH(viewToClipMatrix, AZ::DegToRad(60.0f), aspectRatio, 0.1f, 1000.f, true); + m_view->SetViewToClipMatrix(viewToClipMatrix); + + m_viewportInteractionImpl = AZStd::make_unique(m_view); + + m_viewportInteractionImpl->m_deviceScalingFactorFn = [] + { + return 1.0f; + }; + m_viewportInteractionImpl->m_screenSizeFn = [] + { + return ScreenDimensions; + }; + + m_viewportInteractionImpl->Connect(TestViewportId); + } + + void TearDown() override + { + m_viewportInteractionImpl->Disconnect(); + m_viewportInteractionImpl.reset(); + + m_view.reset(); + + AZ::NameDictionary::Destroy(); + } + + AZ::RPI::ViewPtr m_view; + AZStd::unique_ptr m_viewportInteractionImpl; + }; + + // transform a point from screen space to world space, and then from world space back to screen space + AzFramework::ScreenPoint ScreenToWorldToScreen( + const AzFramework::ScreenPoint& screenPoint, + AzToolsFramework::ViewportInteraction::ViewportInteractionRequests& viewportInteractionRequests) + { + const auto worldResult = viewportInteractionRequests.ViewportScreenToWorld(screenPoint); + return viewportInteractionRequests.ViewportWorldToScreen(worldResult); + } + + TEST_F(ViewportInteractionImplFixture, ViewportInteractionRequestsMapsFromScreenToWorldAndBack) + { + using AzFramework::ScreenPoint; + + m_view->SetCameraTransform(AZ::Matrix3x4::CreateFromMatrix3x3AndTranslation( + AZ::Matrix3x3::CreateRotationZ(AZ::DegToRad(90.0f)), AZ::Vector3(10.0f, 0.0f, 5.0f))); + + { + const auto expectedScreenPoint = ScreenPoint{ 600, 450 }; + const auto resultScreenPoint = ScreenToWorldToScreen(expectedScreenPoint, *m_viewportInteractionImpl); + EXPECT_EQ(resultScreenPoint, expectedScreenPoint); + } + + { + auto expectedScreenPoint = ScreenCenter(); + const auto resultScreenPoint = ScreenToWorldToScreen(expectedScreenPoint, *m_viewportInteractionImpl); + EXPECT_EQ(resultScreenPoint, expectedScreenPoint); + } + + { + const auto expectedScreenPoint = ScreenPoint{ 0, 0 }; + const auto resultScreenPoint = ScreenToWorldToScreen(expectedScreenPoint, *m_viewportInteractionImpl); + EXPECT_EQ(resultScreenPoint, expectedScreenPoint); + } + + { + const auto expectedScreenPoint = ScreenPoint{ ScreenDimensions.m_width, ScreenDimensions.m_height }; + const auto resultScreenPoint = ScreenToWorldToScreen(expectedScreenPoint, *m_viewportInteractionImpl); + EXPECT_EQ(resultScreenPoint, expectedScreenPoint); + } + } + + TEST_F(ViewportInteractionImplFixture, ScreenToWorldReturnsPositionOnNearClipPlaneInWorldSpace) + { + m_view->SetCameraTransform(AZ::Matrix3x4::CreateFromMatrix3x3AndTranslation( + AZ::Matrix3x3::CreateRotationZ(AZ::DegToRad(-90.0f)), AZ::Vector3(20.0f, 0.0f, 0.0f))); + + const auto worldResult = m_viewportInteractionImpl->ViewportScreenToWorld(ScreenCenter()); + EXPECT_THAT(worldResult, IsClose(AZ::Vector3(20.1f, 0.0f, 0.0f))); + } + + // note: values produced by reproducing in the editor viewport + TEST_F(ViewportInteractionImplFixture, WorldToScreenGivesExpectedScreenCoordinates) + { + using AzFramework::ScreenPoint; + + { + m_view->SetCameraTransform(AZ::Matrix3x4::CreateFromMatrix3x3AndTranslation( + AZ::Matrix3x3::CreateRotationZ(AZ::DegToRad(160.0f)) * AZ::Matrix3x3::CreateRotationX(AZ::DegToRad(-18.0f)), + AZ::Vector3(-21.0f, 2.5f, 6.0f))); + + const auto screenResult = m_viewportInteractionImpl->ViewportWorldToScreen(AZ::Vector3(-21.0f, -1.5f, 5.0f)); + EXPECT_EQ(screenResult, ScreenPoint(420, 326)); + } + + { + m_view->SetCameraTransform(AZ::Matrix3x4::CreateFromMatrix3x3AndTranslation( + AZ::Matrix3x3::CreateRotationZ(AZ::DegToRad(175.0f)) * AZ::Matrix3x3::CreateRotationX(AZ::DegToRad(-90.0f)), + AZ::Vector3(-10.0f, -11.0f, 2.5f))); + + const auto screenResult = m_viewportInteractionImpl->ViewportWorldToScreen(AZ::Vector3(-10.0f, -10.5f, 0.5f)); + EXPECT_EQ(screenResult, ScreenPoint(654, 515)); + } + + { + m_view->SetCameraTransform(AZ::Matrix3x4::CreateFromMatrix3x3AndTranslation( + AZ::Matrix3x3::CreateRotationZ(AZ::DegToRad(70.0f)) * AZ::Matrix3x3::CreateRotationX(AZ::DegToRad(65.0f)), + AZ::Vector3(-22.5f, -10.0f, 1.5f))); + + const auto screenResult = m_viewportInteractionImpl->ViewportWorldToScreen(AZ::Vector3(-23.0f, -9.5f, 3.0f)); + EXPECT_EQ(screenResult, ScreenPoint(754, 340)); + } + } + + TEST_F(ViewportInteractionImplFixture, ScreenToWorldRayGivesGivesExpectedOriginAndDirection) + { + using AzFramework::ScreenPoint; + + m_view->SetCameraTransform(AZ::Matrix3x4::CreateFromMatrix3x3AndTranslation( + AZ::Matrix3x3::CreateRotationZ(AZ::DegToRad(34.0f)) * AZ::Matrix3x3::CreateRotationX(AZ::DegToRad(-24.0f)), + AZ::Vector3(-9.3f, -9.8f, 4.0f))); + + const auto ray = m_viewportInteractionImpl->ViewportScreenToWorldRay(ScreenPoint(832, 226)); + + float unused; + auto intersection = AZ::Intersect::IntersectRaySphere(ray.origin, ray.direction, AZ::Vector3(-14.0f, 5.7f, 0.75f), 0.5f, unused); + + EXPECT_EQ(intersection, AZ::Intersect::SphereIsectTypes::ISECT_RAY_SPHERE_ISECT); + } +} // namespace UnitTest diff --git a/Gems/Atom/Tools/AtomToolsFramework/Code/atomtoolsframework_files.cmake b/Gems/Atom/Tools/AtomToolsFramework/Code/atomtoolsframework_files.cmake index a2446cebcc..3ddcc05245 100644 --- a/Gems/Atom/Tools/AtomToolsFramework/Code/atomtoolsframework_files.cmake +++ b/Gems/Atom/Tools/AtomToolsFramework/Code/atomtoolsframework_files.cmake @@ -28,6 +28,7 @@ set(FILES Include/AtomToolsFramework/Util/MaterialPropertyUtil.h Include/AtomToolsFramework/Util/Util.h Include/AtomToolsFramework/Viewport/RenderViewportWidget.h + Include/AtomToolsFramework/Viewport/ViewportInteractionImpl.h Include/AtomToolsFramework/Viewport/ModularViewportCameraController.h Include/AtomToolsFramework/Viewport/ModularViewportCameraControllerRequestBus.h Include/AtomToolsFramework/Window/AtomToolsMainWindow.h @@ -55,6 +56,7 @@ set(FILES Source/Util/Util.cpp Source/Viewport/RenderViewportWidget.cpp Source/Viewport/ModularViewportCameraController.cpp + Source/Viewport/ViewportInteractionImpl.cpp Source/Window/AtomToolsMainWindow.cpp Source/Window/AtomToolsMainWindowSystemComponent.cpp Source/Window/AtomToolsMainWindowSystemComponent.h diff --git a/Gems/Atom/Tools/AtomToolsFramework/Code/atomtoolsframework_tests_files.cmake b/Gems/Atom/Tools/AtomToolsFramework/Code/atomtoolsframework_tests_files.cmake index bd9ad9b3d8..a071d29f47 100644 --- a/Gems/Atom/Tools/AtomToolsFramework/Code/atomtoolsframework_tests_files.cmake +++ b/Gems/Atom/Tools/AtomToolsFramework/Code/atomtoolsframework_tests_files.cmake @@ -8,4 +8,5 @@ set(FILES Tests/AtomToolsFrameworkTest.cpp + Tests/ViewportInteractionImplTests.cpp ) \ No newline at end of file From 21c3aba7daad7dc56da1bba9aa743855eca84e03 Mon Sep 17 00:00:00 2001 From: Chris Galvan Date: Wed, 17 Nov 2021 11:13:38 -0600 Subject: [PATCH 091/345] Fixed slow Script Canvas loading by moving error icon construction in NodePaletteTreeItem. Signed-off-by: Chris Galvan --- .../Widgets/NodePalette/TreeItems/NodePaletteTreeItem.cpp | 7 +++++-- .../Widgets/NodePalette/TreeItems/NodePaletteTreeItem.h | 5 ----- .../Editor/View/Widgets/NodePalette/NodePaletteModel.cpp | 1 + Gems/ScriptCanvas/Code/Editor/View/Windows/MainWindow.cpp | 2 ++ 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/NodePalette/TreeItems/NodePaletteTreeItem.cpp b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/NodePalette/TreeItems/NodePaletteTreeItem.cpp index cbdfbfcf0c..bce17c6348 100644 --- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/NodePalette/TreeItems/NodePaletteTreeItem.cpp +++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/NodePalette/TreeItems/NodePaletteTreeItem.cpp @@ -9,6 +9,10 @@ #include +AZ_PUSH_DISABLE_WARNING(4244 4251 4800, "-Wunknown-warning-option") +#include +AZ_POP_DISABLE_WARNING + namespace GraphCanvas { //////////////////////// @@ -19,7 +23,6 @@ namespace GraphCanvas NodePaletteTreeItem::NodePaletteTreeItem(AZStd::string_view name, EditorId editorId) : GraphCanvas::GraphCanvasTreeItem() - , m_errorIcon(":/GraphCanvasEditorResources/toast_error_icon.png") , m_editorId(editorId) , m_name(QString::fromUtf8(name.data(), static_cast(name.size()))) , m_selected(false) @@ -88,7 +91,7 @@ namespace GraphCanvas case Qt::DecorationRole: if (HasError()) { - return m_errorIcon; + return QIcon(":/GraphCanvasEditorResources/toast_error_icon.png"); } break; default: diff --git a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/NodePalette/TreeItems/NodePaletteTreeItem.h b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/NodePalette/TreeItems/NodePaletteTreeItem.h index fcb4d79077..93bd702422 100644 --- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/NodePalette/TreeItems/NodePaletteTreeItem.h +++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/NodePalette/TreeItems/NodePaletteTreeItem.h @@ -9,10 +9,6 @@ #include -AZ_PUSH_DISABLE_WARNING(4244 4251 4800, "-Wunknown-warning-option") -#include -AZ_POP_DISABLE_WARNING - #include #include #include @@ -113,7 +109,6 @@ namespace GraphCanvas private: // Error Display - QIcon m_errorIcon; QString m_errorString; AZStd::string m_styleOverride; diff --git a/Gems/ScriptCanvas/Code/Editor/View/Widgets/NodePalette/NodePaletteModel.cpp b/Gems/ScriptCanvas/Code/Editor/View/Widgets/NodePalette/NodePaletteModel.cpp index 047a07cd0b..2593104a03 100644 --- a/Gems/ScriptCanvas/Code/Editor/View/Widgets/NodePalette/NodePaletteModel.cpp +++ b/Gems/ScriptCanvas/Code/Editor/View/Widgets/NodePalette/NodePaletteModel.cpp @@ -881,6 +881,7 @@ namespace ScriptCanvasEditor void NodePaletteModel::RepopulateModel() { + AZ_PROFILE_FUNCTION(ScriptCanvas); ClearRegistry(); PopulateNodePaletteModel((*this)); diff --git a/Gems/ScriptCanvas/Code/Editor/View/Windows/MainWindow.cpp b/Gems/ScriptCanvas/Code/Editor/View/Windows/MainWindow.cpp index 1ad8b58317..e61b015aae 100644 --- a/Gems/ScriptCanvas/Code/Editor/View/Windows/MainWindow.cpp +++ b/Gems/ScriptCanvas/Code/Editor/View/Windows/MainWindow.cpp @@ -428,6 +428,8 @@ namespace ScriptCanvasEditor , m_closeCurrentGraphAfterSave(false) , m_styleManager(ScriptCanvasEditor::AssetEditorId, "ScriptCanvas/StyleSheet/graphcanvas_style.json") { + AZ_PROFILE_FUNCTION(ScriptCanvas); + VariablePaletteRequestBus::Handler::BusConnect(); GraphCanvas::AssetEditorAutomationRequestBus::Handler::BusConnect(ScriptCanvasEditor::AssetEditorId); From d0ebe4ee10741eac2d0a623610b89a44f0f3cb49 Mon Sep 17 00:00:00 2001 From: Qing Tao <55564570+VickyAtAZ@users.noreply.github.com> Date: Wed, 17 Nov 2021 10:00:31 -0800 Subject: [PATCH 092/345] Follow up fix for ATOM-13512 (#5689) * Follow up fix for ATOM-13512 Update the file mask mapping in ImageBuilder.settings. Change Reflectance.preset to use BC4 format since it only needs once channel. Signed-off-by: Qing Tao <55564570+VickyAtAZ@users.noreply.github.com> --- .../native/utilities/assetUtils.h | 1 - .../Assets/Config/ImageBuilder.settings | 26 +++++++++++-------- .../Assets/Config/Reflectance.preset | 8 +++--- 3 files changed, 20 insertions(+), 15 deletions(-) diff --git a/Code/Tools/AssetProcessor/native/utilities/assetUtils.h b/Code/Tools/AssetProcessor/native/utilities/assetUtils.h index 2145c3e0e6..46ec5d6145 100644 --- a/Code/Tools/AssetProcessor/native/utilities/assetUtils.h +++ b/Code/Tools/AssetProcessor/native/utilities/assetUtils.h @@ -238,7 +238,6 @@ namespace AssetUtilities // hashMsDelay is only for automated tests to test that writing to a file while it's hashing does not cause a crash. // hashMsDelay is not used in non-unit test builds. AZ::u64 GetFileHash(const char* filePath, bool force = false, AZ::IO::SizeType* bytesReadOut = nullptr, int hashMsDelay = 0); - inline constexpr AZ::u64 FileHashBufferSize = 1024 * 64; //! Adjusts a timestamp to fix timezone settings and account for any precision adjustment needed AZ::u64 AdjustTimestamp(QDateTime timestamp); diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/ImageBuilder.settings b/Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/ImageBuilder.settings index b26ae03260..bba2855650 100644 --- a/Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/ImageBuilder.settings +++ b/Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/ImageBuilder.settings @@ -106,20 +106,21 @@ "_em": [ "Emissive" ], "_emit": [ "Emissive" ], // displacement - "_displ": [ "Emissive" ], - "_disp": [ "Emissive" ], - "_dsp": [ "Emissive" ], - "_d": [ "Emissive" ], - "_dm": [ "Emissive" ], - "_displacement": [ "Emissive" ], - "_height": [ "Emissive" ], - "_hm": [ "Emissive" ], - "_ht": [ "Emissive" ], - "_h": [ "Emissive" ], + "_displ": [ "Displacement" ], + "_disp": [ "Displacement" ], + "_dsp": [ "Displacement" ], + "_d": [ "Displacement" ], + "_dm": [ "Displacement" ], + "_displacement": [ "Displacement" ], + "_height": [ "Displacement" ], + "_hm": [ "Displacement" ], + "_ht": [ "Displacement" ], + "_h": [ "Displacement" ], // cubemap "_ibldiffusecm": [ "IBLDiffuse" ], "_iblskyboxcm": [ "IBLSkybox" ], "_iblspecularcm": [ "IBLSpecular" ], + "_iblspecularcm64": [ "IBLSpecularVeryLow" ], "_iblspecularcm128": [ "IBLSpecularLow" ], "_iblspecularcm256": [ "IBLSpecular" ], "_iblspecularcm512": [ "IBLSpecularHigh" ], @@ -133,7 +134,10 @@ // lut "_lut": [ "LUT_RG8" ], "_lutr32f": [ "LUT_R32F" ], + "_lutrgba8": [ "LUT_RGBA8" ], "_lutrgba16": [ "LUT_RGBA16" ], + "_lutrgba16f": [ "LUT_RGBA16F" ], + "_lutrg16": [ "LUT_RG16" ], "_lutrg32f": [ "LUT_RG32F" ], "_lutrgba32f": [ "LUT_RGBA32F" ], // layer mask @@ -142,7 +146,7 @@ // decal "_decal": [ "Decal_AlbedoWithOpacity" ], // ui - "_ui": [ "UserInterface_Lossless" ] + "_ui": [ "UserInterface_Compressed","UserInterface_Lossless" ] }, "DefaultPreset": "Albedo", "DefaultPresetAlpha": "AlbedoWithGenericAlpha" diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/Reflectance.preset b/Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/Reflectance.preset index e6fd73b1be..9e3c718978 100644 --- a/Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/Reflectance.preset +++ b/Gems/Atom/Asset/ImageProcessingAtom/Assets/Config/Reflectance.preset @@ -8,7 +8,7 @@ "Name": "Reflectance", "SourceColor": "Linear", "DestColor": "Linear", - "PixelFormat": "BC1", + "PixelFormat": "BC4", "IsPowerOf2": true, "MipMapSetting": { "MipGenType": "Box" @@ -21,6 +21,7 @@ "SourceColor": "Linear", "DestColor": "Linear", "PixelFormat": "ASTC_6x6", + "Swizzle": "rrr1", "MaxTextureSize": 2048, "IsPowerOf2": true, "MipMapSetting": { @@ -33,6 +34,7 @@ "SourceColor": "Linear", "DestColor": "Linear", "PixelFormat": "ASTC_6x6", + "Swizzle": "rrr1", "MaxTextureSize": 2048, "IsPowerOf2": true, "MipMapSetting": { @@ -44,7 +46,7 @@ "Name": "Reflectance", "SourceColor": "Linear", "DestColor": "Linear", - "PixelFormat": "BC1", + "PixelFormat": "BC4", "IsPowerOf2": true, "MipMapSetting": { "MipGenType": "Box" @@ -55,7 +57,7 @@ "Name": "Reflectance", "SourceColor": "Linear", "DestColor": "Linear", - "PixelFormat": "BC1", + "PixelFormat": "BC4", "IsPowerOf2": true, "MipMapSetting": { "MipGenType": "Box" From 8d26251c93b69e48f290e9d2d228d125c65676d1 Mon Sep 17 00:00:00 2001 From: nggieber Date: Wed, 17 Nov 2021 10:16:41 -0800 Subject: [PATCH 093/345] Include DownloadController Signed-off-by: nggieber --- Code/Tools/ProjectManager/Source/UpdateProjectCtrl.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/Code/Tools/ProjectManager/Source/UpdateProjectCtrl.cpp b/Code/Tools/ProjectManager/Source/UpdateProjectCtrl.cpp index fb16484961..cf596516a1 100644 --- a/Code/Tools/ProjectManager/Source/UpdateProjectCtrl.cpp +++ b/Code/Tools/ProjectManager/Source/UpdateProjectCtrl.cpp @@ -15,6 +15,7 @@ #include #include #include +#include #include #include From 1aae3d561989d04d0c6e22d755edea2405a1b1b2 Mon Sep 17 00:00:00 2001 From: greerdv Date: Wed, 17 Nov 2021 19:10:48 +0000 Subject: [PATCH 094/345] reorder cluster UI for collider component mode to match order in entity UI Signed-off-by: greerdv --- Gems/PhysX/Code/Editor/ColliderComponentMode.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gems/PhysX/Code/Editor/ColliderComponentMode.cpp b/Gems/PhysX/Code/Editor/ColliderComponentMode.cpp index 5de625f679..d6bafb8143 100644 --- a/Gems/PhysX/Code/Editor/ColliderComponentMode.cpp +++ b/Gems/PhysX/Code/Editor/ColliderComponentMode.cpp @@ -237,9 +237,9 @@ namespace PhysX &AzToolsFramework::ViewportUi::ViewportUiRequestBus::Events::CreateCluster, AzToolsFramework::ViewportUi::Alignment::TopLeft); // create and register the buttons - m_dimensionsModeButtonId = RegisterClusterButton(m_modeSelectionClusterId, "Scale"); m_offsetModeButtonId = RegisterClusterButton(m_modeSelectionClusterId, "Move"); m_rotationModeButtonId = RegisterClusterButton(m_modeSelectionClusterId, "Rotate"); + m_dimensionsModeButtonId = RegisterClusterButton(m_modeSelectionClusterId, "Scale"); const auto onButtonClicked = [this](AzToolsFramework::ViewportUi::ButtonId buttonId) { if (buttonId == m_dimensionsModeButtonId) From 6b1fb04a1c3a8515a60fa06fc8cac242e441cba9 Mon Sep 17 00:00:00 2001 From: John Jones-Steele <82226755+jjjoness@users.noreply.github.com> Date: Wed, 17 Nov 2021 19:16:30 +0000 Subject: [PATCH 095/345] Terrain Supports Physics test (#5706) * Terrain Supports Physics test Signed-off-by: John Jones-Steele <82226755+jjjoness@users.noreply.github.com> * Changes from PR Signed-off-by: John Jones-Steele <82226755+jjjoness@users.noreply.github.com> --- ...angesSizeWithAxisAlignedBoxShapeChanges.py | 3 +- .../EditorScripts/Terrain_SupportsPhysics.py | 164 ++++++++++++++++++ .../Gem/PythonTests/Terrain/TestSuite_Main.py | 4 +- AutomatedTesting/Levels/Base/Base.prefab | 11 +- 4 files changed, 178 insertions(+), 4 deletions(-) create mode 100644 AutomatedTesting/Gem/PythonTests/Terrain/EditorScripts/Terrain_SupportsPhysics.py diff --git a/AutomatedTesting/Gem/PythonTests/Terrain/EditorScripts/TerrainPhysicsCollider_ChangesSizeWithAxisAlignedBoxShapeChanges.py b/AutomatedTesting/Gem/PythonTests/Terrain/EditorScripts/TerrainPhysicsCollider_ChangesSizeWithAxisAlignedBoxShapeChanges.py index aba506ea20..f4c2a19884 100644 --- a/AutomatedTesting/Gem/PythonTests/Terrain/EditorScripts/TerrainPhysicsCollider_ChangesSizeWithAxisAlignedBoxShapeChanges.py +++ b/AutomatedTesting/Gem/PythonTests/Terrain/EditorScripts/TerrainPhysicsCollider_ChangesSizeWithAxisAlignedBoxShapeChanges.py @@ -12,13 +12,12 @@ class Tests(): add_terrain_collider = ("Terrain Physics Heightfield Collider component added", "Failed to add a Terrain Physics Heightfield Collider component") box_dimensions_changed = ("Aabb dimensions changed successfully", "Failed change Aabb dimensions") configuration_changed = ("Terrain size changed successfully", "Failed terrain size change") - no_errors_and_warnings_found = ("No errors and warnings found", "Found errors and warnings") #fmt: on def TerrainPhysicsCollider_ChangesSizeWithAxisAlignedBoxShapeChanges(): """ Summary: - Test aspects of the TerrainHeightGradientList through the BehaviorContext and the Property Tree. + Test aspects of the Terrain Physics Heightfield Collider through the BehaviorContext and the Property Tree. Test Steps: Expected Behavior: diff --git a/AutomatedTesting/Gem/PythonTests/Terrain/EditorScripts/Terrain_SupportsPhysics.py b/AutomatedTesting/Gem/PythonTests/Terrain/EditorScripts/Terrain_SupportsPhysics.py new file mode 100644 index 0000000000..8ecafb8600 --- /dev/null +++ b/AutomatedTesting/Gem/PythonTests/Terrain/EditorScripts/Terrain_SupportsPhysics.py @@ -0,0 +1,164 @@ +""" +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 +""" + +#fmt: off +class Tests(): + create_terrain_spawner_entity = ("Terrain_spawner_entity created successfully", "Failed to create terrain_spawner_entity") + create_height_provider_entity = ("Height_provider_entity created successfully", "Failed to create height_provider_entity") + create_test_ball = ("Ball created successfully", "Failed to create Ball") + box_dimensions_changed = ("Aabb dimensions changed successfully", "Failed change Aabb dimensions") + shape_changed = ("Shape changed successfully", "Failed Shape change") + entity_added = ("Entity added successfully", "Failed Entity add") + frequency_changed = ("Frequency changed successfully", "Failed Frequency change") + shape_set = ("Shape set to Sphere successfully", "Failed to set Sphere shape") + test_collision = ("Ball collided with terrain", "Ball failed to collide with terrain") + no_errors_and_warnings_found = ("No errors and warnings found", "Found errors and warnings") +#fmt: on + +def Terrain_SupportsPhysics(): + """ + Summary: + Test aspects of the TerrainHeightGradientList through the BehaviorContext and the Property Tree. + + Test Steps: + Expected Behavior: + The Editor is stable there are no warnings or errors. + + Test Steps: + 1) Load the base level + 2) Create 2 test entities, one parent at 512.0, 512.0, 50.0 and one child at the default position and add the required components + 2a) Create a ball at 600.0, 600.0, 46.0 - This position is bot too high over the heighfield so will collide in a reasonable time + 3) Start the Tracer to catch any errors and warnings + 4) Change the Axis Aligned Box Shape dimensions + 5) Set the Vegetation Shape reference to TestEntity1 + 6) Set the FastNoise gradient frequency to 0.01 + 7) Set the Gradient List to TestEntity2 + 8) Set the PhysX Collider to Sphere mode + 9) Disable and Enable the Terrain Gradient List so that it is recognised + 10) Enter game mode and test if the ball hits the heightfield within 3 seconds + 11) Verify there are no errors and warnings in the logs + + + :return: None + """ + + from editor_python_test_tools.editor_entity_utils import EditorEntity + from editor_python_test_tools.utils import TestHelper as helper, Report + from editor_python_test_tools.utils import Report, Tracer + import editor_python_test_tools.hydra_editor_utils as hydra + import azlmbr.math as azmath + import azlmbr.legacy.general as general + import azlmbr.bus as bus + import azlmbr.editor as editor + import math + + SET_BOX_X_SIZE = 1024.0 + SET_BOX_Y_SIZE = 1024.0 + SET_BOX_Z_SIZE = 100.0 + + helper.init_idle() + + # 1) Load the level + helper.open_level("", "Base") + helper.wait_for_condition(lambda: general.get_current_level_name() == "Base", 2.0) + + #1a) Load the level components + hydra.add_level_component("Terrain World") + hydra.add_level_component("Terrain World Renderer") + + # 2) Create 2 test entities, one parent at 512.0, 512.0, 50.0 and one child at the default position and add the required components + entity1_components_to_add = ["Axis Aligned Box Shape", "Terrain Layer Spawner", "Terrain Height Gradient List", "Terrain Physics Heightfield Collider", "PhysX Heightfield Collider"] + entity2_components_to_add = ["Vegetation Reference Shape", "Gradient Transform Modifier", "FastNoise Gradient"] + ball_components_to_add = ["Sphere Shape", "PhysX Collider", "PhysX Rigid Body"] + terrain_spawner_entity = hydra.Entity("TestEntity1") + terrain_spawner_entity.create_entity(azmath.Vector3(512.0, 512.0, 50.0), entity1_components_to_add) + Report.result(Tests.create_terrain_spawner_entity, terrain_spawner_entity.id.IsValid()) + height_provider_entity = hydra.Entity("TestEntity2") + height_provider_entity.create_entity(azmath.Vector3(0.0, 0.0, 0.0), entity2_components_to_add,terrain_spawner_entity.id) + Report.result(Tests.create_height_provider_entity, height_provider_entity.id.IsValid()) + # 2a) Create a ball at 600.0, 600.0, 46.0 - This position is bot too high over the heighfield so will collide in a reasonable time + ball = hydra.Entity("Ball") + ball.create_entity(azmath.Vector3(600.0, 600.0, 46.0), ball_components_to_add) + Report.result(Tests.create_test_ball, ball.id.IsValid()) + # Give everything a chance to finish initializing. + general.idle_wait_frames(1) + + # 3) Start the Tracer to catch any errors and warnings + with Tracer() as section_tracer: + # 4) Change the Axis Aligned Box Shape dimensions + box_dimensions = azmath.Vector3(SET_BOX_X_SIZE, SET_BOX_Y_SIZE, SET_BOX_Z_SIZE) + terrain_spawner_entity.get_set_test(0, "Axis Aligned Box Shape|Box Configuration|Dimensions", box_dimensions) + box_shape_dimensions = hydra.get_component_property_value(terrain_spawner_entity.components[0], "Axis Aligned Box Shape|Box Configuration|Dimensions") + Report.result(Tests.box_dimensions_changed, box_dimensions == box_shape_dimensions) + + # 5) Set the Vegetaion Shape reference to TestEntity1 + height_provider_entity.get_set_test(0, "Configuration|Shape Entity Id", terrain_spawner_entity.id) + entityId = hydra.get_component_property_value(height_provider_entity.components[0], "Configuration|Shape Entity Id") + Report.result(Tests.shape_changed, entityId == terrain_spawner_entity.id) + + # 6) Set the FastNoise Gradient frequency to 0.01 + Frequency = 0.01 + height_provider_entity.get_set_test(2, "Configuration|Frequency", Frequency) + FrequencyVal = hydra.get_component_property_value(height_provider_entity.components[2], "Configuration|Frequency") + Report.result(Tests.frequency_changed, math.isclose(Frequency, FrequencyVal, abs_tol = 0.00001)) + + # 7) Set the Gradient List to TestEntity2 + pte = hydra.get_property_tree(terrain_spawner_entity.components[2]) + pte.add_container_item("Configuration|Gradient Entities", 0, height_provider_entity.id) + checkID = pte.get_container_item("Configuration|Gradient Entities", 0) + Report.result(Tests.entity_added, checkID.GetValue() == height_provider_entity.id) + + # 8) Set the PhysX Collider to Sphere mode + shape = 0 + hydra.get_set_test(ball, 1, "Shape Configuration|Shape", shape) + setShape = hydra.get_component_property_value(ball.components[1], "Shape Configuration|Shape") + Report.result(Tests.shape_set, shape == setShape) + + # 9) Disable and Enable the Terrain Gradient List so that it is recognised + editor.EditorComponentAPIBus(bus.Broadcast, 'EnableComponents', [terrain_spawner_entity.components[2]]) + + general.enter_game_mode() + + general.idle_wait_frames(1) + + # 10) Enter game mode and test if the ball hits the heightfield within 3 seconds + TIMEOUT = 3.0 + + class Collider: + id = general.find_game_entity("Ball") + touched_ground = False + + terrain_id = general.find_game_entity("TestEntity1") + + def on_collision_begin(args): + other_id = args[0] + if other_id.Equal(terrain_id): + Report.info("Touched ground") + Collider.touched_ground = True + + handler = azlmbr.physics.CollisionNotificationBusHandler() + handler.connect(Collider.id) + handler.add_callback("OnCollisionBegin", on_collision_begin) + + helper.wait_for_condition(lambda: Collider.touched_ground, TIMEOUT) + Report.result(Tests.test_collision, Collider.touched_ground) + + general.exit_game_mode() + + # 11) Verify there are no errors and warnings in the logs + helper.wait_for_condition(lambda: section_tracer.has_errors or section_tracer.has_asserts, 1.0) + for error_info in section_tracer.errors: + Report.info(f"Error: {error_info.filename} {error_info.function} | {error_info.message}") + for assert_info in section_tracer.asserts: + Report.info(f"Assert: {assert_info.filename} {assert_info.function} | {assert_info.message}") + + +if __name__ == "__main__": + + from editor_python_test_tools.utils import Report + Report.start_test(Terrain_SupportsPhysics) + diff --git a/AutomatedTesting/Gem/PythonTests/Terrain/TestSuite_Main.py b/AutomatedTesting/Gem/PythonTests/Terrain/TestSuite_Main.py index 620d84d7db..8942065472 100644 --- a/AutomatedTesting/Gem/PythonTests/Terrain/TestSuite_Main.py +++ b/AutomatedTesting/Gem/PythonTests/Terrain/TestSuite_Main.py @@ -19,7 +19,9 @@ from ly_test_tools.o3de.editor_test import EditorTestSuite, EditorSingleTest @pytest.mark.parametrize("launcher_platform", ['windows_editor']) @pytest.mark.parametrize("project", ["AutomatedTesting"]) class TestAutomation(EditorTestSuite): - #global_extra_cmdline_args=["--regset=/Amazon/Preferences/EnablePrefabSystem=true"] class test_AxisAlignedBoxShape_ConfigurationWorks(EditorSingleTest): from .EditorScripts import TerrainPhysicsCollider_ChangesSizeWithAxisAlignedBoxShapeChanges as test_module + + class test_Terrain_SupportsPhysics(EditorSingleTest): + from .EditorScripts import Terrain_SupportsPhysics as test_module diff --git a/AutomatedTesting/Levels/Base/Base.prefab b/AutomatedTesting/Levels/Base/Base.prefab index f7e42e7731..7765fe488e 100644 --- a/AutomatedTesting/Levels/Base/Base.prefab +++ b/AutomatedTesting/Levels/Base/Base.prefab @@ -17,7 +17,16 @@ }, "Component_[14126657869720434043]": { "$type": "EditorEntitySortComponent", - "Id": 14126657869720434043 + "Id": 14126657869720434043, + "ChildEntityOrderEntryArray": [ + { + "EntityId": "" + }, + { + "EntityId": "", + "SortIndex": 1 + } + ] }, "Component_[15230859088967841193]": { "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent", From 2ae7a5ef9f6cc9c0ffd4b41f148dbf58866d8f3b Mon Sep 17 00:00:00 2001 From: santorac <55155825+santorac@users.noreply.github.com> Date: Wed, 17 Nov 2021 12:04:46 -0800 Subject: [PATCH 096/345] Added a unit test for the MaterialPropertyValue bug fix. Signed-off-by: santorac <55155825+santorac@users.noreply.github.com> --- .../RPI/Code/Tests/Material/MaterialTests.cpp | 50 +++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/Gems/Atom/RPI/Code/Tests/Material/MaterialTests.cpp b/Gems/Atom/RPI/Code/Tests/Material/MaterialTests.cpp index 9c3e08ee08..95aa343ed5 100644 --- a/Gems/Atom/RPI/Code/Tests/Material/MaterialTests.cpp +++ b/Gems/Atom/RPI/Code/Tests/Material/MaterialTests.cpp @@ -888,4 +888,54 @@ namespace UnitTest EXPECT_EQ(indexFromOldName, indexFromNewName); } + template + void CheckPropertyValueRoundTrip(const T& value) + { + AZ::RPI::MaterialPropertyValue materialPropertyValue{value}; + AZStd::any anyValue{value}; + AZ::RPI::MaterialPropertyValue materialPropertyValueFromAny = MaterialPropertyValue::FromAny(anyValue); + AZ::RPI::MaterialPropertyValue materialPropertyValueFromRoundTrip = MaterialPropertyValue::FromAny(MaterialPropertyValue::ToAny(materialPropertyValue)); + + EXPECT_EQ(materialPropertyValue, materialPropertyValueFromAny); + EXPECT_EQ(materialPropertyValue, materialPropertyValueFromRoundTrip); + + if (materialPropertyValue.Is>()) + { + EXPECT_EQ(materialPropertyValue.GetValue>().GetHint(), materialPropertyValueFromAny.GetValue>().GetHint()); + EXPECT_EQ(materialPropertyValue.GetValue>().GetHint(), materialPropertyValueFromRoundTrip.GetValue>().GetHint()); + } + } + + TEST_F(MaterialTests, TestMaterialPropertyValueAsAny) + { + auto checkRoundTrip = [](const AZ::RPI::MaterialPropertyValue &original) + { + AZ::RPI::MaterialPropertyValue convertedValue = MaterialPropertyValue::FromAny(MaterialPropertyValue::ToAny(original)); + EXPECT_EQ(original, convertedValue); + + if (original.Is>()) + { + EXPECT_EQ(original.GetValue>().GetHint(), convertedValue.GetValue>().GetHint()); + } + }; + + CheckPropertyValueRoundTrip(true); + CheckPropertyValueRoundTrip(false); + CheckPropertyValueRoundTrip(7); + CheckPropertyValueRoundTrip(8u); + CheckPropertyValueRoundTrip(9.0f); + CheckPropertyValueRoundTrip(AZ::Vector2(1.0f, 2.0f)); + CheckPropertyValueRoundTrip(AZ::Vector3(1.0f, 2.0f, 3.0f)); + CheckPropertyValueRoundTrip(AZ::Vector4(1.0f, 2.0f, 3.0f, 4.0f)); + CheckPropertyValueRoundTrip(AZ::Color(1.0f, 2.0f, 3.0f, 4.0f)); + CheckPropertyValueRoundTrip(Data::Asset{}); + CheckPropertyValueRoundTrip(Data::Asset{}); + CheckPropertyValueRoundTrip(Data::Asset{}); + CheckPropertyValueRoundTrip(Data::Asset{Uuid::CreateRandom(), azrtti_typeid(), "TestAssetPath.png"}); + CheckPropertyValueRoundTrip(Data::Asset{Uuid::CreateRandom(), azrtti_typeid(), "TestAssetPath.png"}); + CheckPropertyValueRoundTrip(Data::Asset{Uuid::CreateRandom(), azrtti_typeid(), "TestAssetPath.png"}); + CheckPropertyValueRoundTrip(m_testImageAsset); + CheckPropertyValueRoundTrip(Data::Instance{m_testImage}); + CheckPropertyValueRoundTrip(AZStd::string{"hello"}); + } } From a8dcfbbb1390bca0a2ed3629b0c47c1af6358e77 Mon Sep 17 00:00:00 2001 From: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com> Date: Wed, 17 Nov 2021 13:27:57 -0800 Subject: [PATCH 097/345] Prevent settings from being saved to setreg files on editor close. Limiting this to avoid a bigger blast radius. (#5717) Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com> --- Code/Editor/MainWindow.cpp | 2 +- Code/Editor/Settings.cpp | 10 ++++++---- Code/Editor/Settings.h | 2 +- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/Code/Editor/MainWindow.cpp b/Code/Editor/MainWindow.cpp index 1c5b6c567a..e13a160bd6 100644 --- a/Code/Editor/MainWindow.cpp +++ b/Code/Editor/MainWindow.cpp @@ -519,7 +519,7 @@ MainWindow* MainWindow::instance() void MainWindow::closeEvent(QCloseEvent* event) { - gSettings.Save(); + gSettings.Save(true); AzFramework::SystemCursorState currentCursorState; bool isInGameMode = false; diff --git a/Code/Editor/Settings.cpp b/Code/Editor/Settings.cpp index d548cffb52..908e1c40f8 100644 --- a/Code/Editor/Settings.cpp +++ b/Code/Editor/Settings.cpp @@ -473,7 +473,7 @@ void SEditorSettings::LoadValue(const char* sSection, const char* sKey, ESystemC } ////////////////////////////////////////////////////////////////////////// -void SEditorSettings::Save() +void SEditorSettings::Save(bool isEditorClosing) { QString strStringPlaceholder; @@ -640,14 +640,16 @@ void SEditorSettings::Save() // --- Settings Registry values // Prefab System UI - AzFramework::ApplicationRequests::Bus::Broadcast( - &AzFramework::ApplicationRequests::SetPrefabSystemEnabled, prefabSystem); + AzFramework::ApplicationRequests::Bus::Broadcast(&AzFramework::ApplicationRequests::SetPrefabSystemEnabled, prefabSystem); AzToolsFramework::Prefab::PrefabLoaderInterface* prefabLoaderInterface = AZ::Interface::Get(); prefabLoaderInterface->SetSaveAllPrefabsPreference(levelSaveSettings.saveAllPrefabsPreference); - SaveSettingsRegistryFile(); + if (!isEditorClosing) + { + SaveSettingsRegistryFile(); + } } ////////////////////////////////////////////////////////////////////////// diff --git a/Code/Editor/Settings.h b/Code/Editor/Settings.h index 426d2300d3..f7617dd8c9 100644 --- a/Code/Editor/Settings.h +++ b/Code/Editor/Settings.h @@ -267,7 +267,7 @@ struct SANDBOX_API SEditorSettings AZ_POP_DISABLE_DLL_EXPORT_BASECLASS_WARNING SEditorSettings(); ~SEditorSettings() = default; - void Save(); + void Save(bool isEditorClosing = false); void Load(); void LoadCloudSettings(); From d3de1689adc092e2804852510a4be4950cf1a3e2 Mon Sep 17 00:00:00 2001 From: santorac <55155825+santorac@users.noreply.github.com> Date: Wed, 17 Nov 2021 13:53:11 -0800 Subject: [PATCH 098/345] Removed unused lambda function. Signed-off-by: santorac <55155825+santorac@users.noreply.github.com> --- .../Tests/Material/MaterialSourceDataTests.cpp | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/Gems/Atom/RPI/Code/Tests/Material/MaterialSourceDataTests.cpp b/Gems/Atom/RPI/Code/Tests/Material/MaterialSourceDataTests.cpp index 0ce819efa2..d4bf3e5eaa 100644 --- a/Gems/Atom/RPI/Code/Tests/Material/MaterialSourceDataTests.cpp +++ b/Gems/Atom/RPI/Code/Tests/Material/MaterialSourceDataTests.cpp @@ -625,23 +625,6 @@ namespace UnitTest // We use local functions to easily start a new MaterialAssetCreator for each test case because // the AssetCreator would just skip subsequent operations after the first failure is detected. - auto expectError = [](AZStd::function setOneBadInput, [[maybe_unused]] uint32_t expectedAsserts = 2) - { - MaterialSourceData sourceData; - - sourceData.m_materialType = "@exefolder@/Temp/test.materialtype"; - - AddPropertyGroup(sourceData, "general"); - - setOneBadInput(sourceData); - - AZ_TEST_START_ASSERTTEST; - auto materialAssetOutcome = sourceData.CreateMaterialAsset(Uuid::CreateRandom(), "", false); - AZ_TEST_STOP_ASSERTTEST(expectedAsserts); // Usually one for the initial error, and one for when End() is called - - EXPECT_FALSE(materialAssetOutcome.IsSuccess()); - }; - auto expectWarning = [](AZStd::function setOneBadInput, [[maybe_unused]] uint32_t expectedAsserts = 1) { MaterialSourceData sourceData; From e9ec37f20bd43c2fdc6c6b654e99d77fa9c7b3d9 Mon Sep 17 00:00:00 2001 From: AMZN-Phil Date: Wed, 17 Nov 2021 14:03:24 -0800 Subject: [PATCH 099/345] Moved global vector inside PythonBindings Signed-off-by: AMZN-Phil --- .../ProjectManager/Source/PythonBindings.cpp | 22 ++++++++++++++----- .../ProjectManager/Source/PythonBindings.h | 4 ++++ .../Source/PythonBindingsInterface.h | 11 ++++++++++ 3 files changed, 31 insertions(+), 6 deletions(-) diff --git a/Code/Tools/ProjectManager/Source/PythonBindings.cpp b/Code/Tools/ProjectManager/Source/PythonBindings.cpp index 9023d04331..0477cb726c 100644 --- a/Code/Tools/ProjectManager/Source/PythonBindings.cpp +++ b/Code/Tools/ProjectManager/Source/PythonBindings.cpp @@ -62,7 +62,6 @@ namespace Platform namespace RedirectOutput { using RedirectOutputFunc = AZStd::function; - AZStd::vector pythonErrorStrings; struct RedirectOutput { @@ -220,7 +219,7 @@ namespace RedirectOutput { lastPythonError.erase(errorPrefix, lengthOfErrorPrefix); } - pythonErrorStrings.push_back(lastPythonError); + O3DE::ProjectManager::PythonBindingsInterface::Get()->AddErrorString(lastPythonError); AZ_TracePrintf("Python", msg); }); @@ -388,7 +387,7 @@ namespace O3DE::ProjectManager pybind11::gil_scoped_release release; pybind11::gil_scoped_acquire acquire; - RedirectOutput::pythonErrorStrings.clear(); + ClearErrorStrings(); try { @@ -1325,9 +1324,20 @@ namespace O3DE::ProjectManager AZStd::pair PythonBindings::GetSimpleDetailedErrorPair() { - AZStd::string detailedString = RedirectOutput::pythonErrorStrings.size() == 1 ? "" : AZStd::accumulate( - RedirectOutput::pythonErrorStrings.begin(), RedirectOutput::pythonErrorStrings.end(), AZStd::string("")); + AZStd::string detailedString = m_pythonErrorStrings.size() == 1 + ? "" + : AZStd::accumulate(m_pythonErrorStrings.begin(), m_pythonErrorStrings.end(), AZStd::string("")); - return AZStd::pair(RedirectOutput::pythonErrorStrings.front(), detailedString); + return AZStd::pair(m_pythonErrorStrings.front(), detailedString); + } + + void PythonBindings::AddErrorString(AZStd::string errorString) + { + m_pythonErrorStrings.push_back(errorString); + } + + void PythonBindings::ClearErrorStrings() + { + m_pythonErrorStrings.clear(); } } diff --git a/Code/Tools/ProjectManager/Source/PythonBindings.h b/Code/Tools/ProjectManager/Source/PythonBindings.h index 9ac040a428..6bef459acf 100644 --- a/Code/Tools/ProjectManager/Source/PythonBindings.h +++ b/Code/Tools/ProjectManager/Source/PythonBindings.h @@ -72,6 +72,9 @@ namespace O3DE::ProjectManager void CancelDownload() override; bool IsGemUpdateAvaliable(const QString& gemName, const QString& lastUpdated) override; + void AddErrorString(AZStd::string errorString) override; + void ClearErrorStrings() override; + private: AZ_DISABLE_COPY_MOVE(PythonBindings); @@ -104,5 +107,6 @@ namespace O3DE::ProjectManager pybind11::handle m_pathlib; bool m_requestCancelDownload = false; + AZStd::vector m_pythonErrorStrings; }; } diff --git a/Code/Tools/ProjectManager/Source/PythonBindingsInterface.h b/Code/Tools/ProjectManager/Source/PythonBindingsInterface.h index 9dc1078d6c..25eadd3f69 100644 --- a/Code/Tools/ProjectManager/Source/PythonBindingsInterface.h +++ b/Code/Tools/ProjectManager/Source/PythonBindingsInterface.h @@ -252,6 +252,17 @@ namespace O3DE::ProjectManager * @return true if update is avaliable, false if not. */ virtual bool IsGemUpdateAvaliable(const QString& gemName, const QString& lastUpdated) = 0; + + /** + * Add an error string to be returned when the current python call is complete. + * @param The error string to be displayed. + */ + virtual void AddErrorString(AZStd::string errorString) = 0; + + /** + * Clears the current list of error strings. + */ + virtual void ClearErrorStrings() = 0; }; using PythonBindingsInterface = AZ::Interface; From 555776fd7f24f7a89aa637c68d746b7d647fdea5 Mon Sep 17 00:00:00 2001 From: amzn-mike <80125227+amzn-mike@users.noreply.github.com> Date: Wed, 17 Nov 2021 16:40:45 -0600 Subject: [PATCH 100/345] Fix AssetBus connection policy to re-lock the mutex afterward since some destructors in the calling methods are still altering the context (#5575) (#5664) Also made the unlock conditional. Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com> (cherry picked from commit 63713ca284cb8ed9bd0720359805c92bf2badb13) --- .../AzCore/AzCore/Asset/AssetCommon.h | 24 ++++++++++++------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/Code/Framework/AzCore/AzCore/Asset/AssetCommon.h b/Code/Framework/AzCore/AzCore/Asset/AssetCommon.h index 0c8e5209ca..c45bb21c6d 100644 --- a/Code/Framework/AzCore/AzCore/Asset/AssetCommon.h +++ b/Code/Framework/AzCore/AzCore/Asset/AssetCommon.h @@ -556,16 +556,24 @@ namespace AZ Asset assetData(AssetInternal::GetAssetData(actualId, AZ::Data::AssetLoadBehavior::Default)); if (assetData) { - auto curStatus = assetData->GetStatus(); + auto isReady = assetData->GetStatus() == AssetData::AssetStatus::Ready; bool isError = assetData->IsError(); - connectLock.unlock(); - if (curStatus == AssetData::AssetStatus::Ready) + + if (isReady || isError) { - handler->OnAssetReady(assetData); - } - else if (isError) - { - handler->OnAssetError(assetData); + connectLock.unlock(); + + if (isReady) + { + handler->OnAssetReady(assetData); + } + else if (isError) + { + handler->OnAssetError(assetData); + } + + // Lock the mutex again since some destructors will be modifying the context afterwards + connectLock.lock(); } } } From 9a887bd6907739ff6a278b601430f83cb2ed29f3 Mon Sep 17 00:00:00 2001 From: santorac <55155825+santorac@users.noreply.github.com> Date: Wed, 17 Nov 2021 15:11:05 -0800 Subject: [PATCH 101/345] Removed unused lambda function. Signed-off-by: santorac <55155825+santorac@users.noreply.github.com> --- Gems/Atom/RPI/Code/Tests/Material/MaterialTests.cpp | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/Gems/Atom/RPI/Code/Tests/Material/MaterialTests.cpp b/Gems/Atom/RPI/Code/Tests/Material/MaterialTests.cpp index 95aa343ed5..61999d808e 100644 --- a/Gems/Atom/RPI/Code/Tests/Material/MaterialTests.cpp +++ b/Gems/Atom/RPI/Code/Tests/Material/MaterialTests.cpp @@ -908,17 +908,6 @@ namespace UnitTest TEST_F(MaterialTests, TestMaterialPropertyValueAsAny) { - auto checkRoundTrip = [](const AZ::RPI::MaterialPropertyValue &original) - { - AZ::RPI::MaterialPropertyValue convertedValue = MaterialPropertyValue::FromAny(MaterialPropertyValue::ToAny(original)); - EXPECT_EQ(original, convertedValue); - - if (original.Is>()) - { - EXPECT_EQ(original.GetValue>().GetHint(), convertedValue.GetValue>().GetHint()); - } - }; - CheckPropertyValueRoundTrip(true); CheckPropertyValueRoundTrip(false); CheckPropertyValueRoundTrip(7); From a76268287ea0cb769bbc30cbdc14ef8831c291cf Mon Sep 17 00:00:00 2001 From: AMZN-Phil Date: Wed, 17 Nov 2021 15:51:25 -0800 Subject: [PATCH 102/345] Change developer preview tag Signed-off-by: AMZN-Phil --- cmake/Platform/Windows/Packaging/Bootstrapper.wxs | 2 +- cmake/Platform/Windows/Packaging/Shortcuts.wxs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake/Platform/Windows/Packaging/Bootstrapper.wxs b/cmake/Platform/Windows/Packaging/Bootstrapper.wxs index f3af199bc2..2edbc65c41 100644 --- a/cmake/Platform/Windows/Packaging/Bootstrapper.wxs +++ b/cmake/Platform/Windows/Packaging/Bootstrapper.wxs @@ -5,7 +5,7 @@ - - + From dc28c5019ca53b72e1b6b2b15d28a52dd46407bd Mon Sep 17 00:00:00 2001 From: Gene Walters Date: Wed, 17 Nov 2021 18:01:41 -0800 Subject: [PATCH 103/345] Adding all 4 network RPC variants with and without parameters to AutomatedTesting to ensure each variant compiles Signed-off-by: Gene Walters --- ...tworkTestPlayerComponent.AutoComponent.xml | 25 +++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/AutomatedTesting/Gem/Code/Source/AutoGen/NetworkTestPlayerComponent.AutoComponent.xml b/AutomatedTesting/Gem/Code/Source/AutoGen/NetworkTestPlayerComponent.AutoComponent.xml index 12c222add6..484f33d020 100644 --- a/AutomatedTesting/Gem/Code/Source/AutoGen/NetworkTestPlayerComponent.AutoComponent.xml +++ b/AutomatedTesting/Gem/Code/Source/AutoGen/NetworkTestPlayerComponent.AutoComponent.xml @@ -13,4 +13,29 @@ + + + + + + + + + + + + + + + + + + + + + + + + + From 8587c8e033e2cfffab786332ef192bd965264ff3 Mon Sep 17 00:00:00 2001 From: antonmic <56370189+antonmic@users.noreply.github.com> Date: Wed, 17 Nov 2021 22:55:29 -0800 Subject: [PATCH 104/345] Fixed capsule auxgeom draw for lights and other aux geom issues Signed-off-by: antonmic <56370189+antonmic@users.noreply.github.com> --- .../Common/Code/Source/AuxGeom/AuxGeomBase.h | 2 + .../Code/Source/AuxGeom/AuxGeomDrawQueue.cpp | 89 +++++---- .../Code/Source/AuxGeom/AuxGeomDrawQueue.h | 5 + .../Source/AuxGeom/FixedShapeProcessor.cpp | 178 +++++++++++------- .../Code/Source/AuxGeom/FixedShapeProcessor.h | 8 +- .../Atom/RPI.Public/AuxGeom/AuxGeomDraw.h | 26 ++- .../AtomDebugDisplayViewportInterface.cpp | 100 ++++------ 7 files changed, 242 insertions(+), 166 deletions(-) diff --git a/Gems/Atom/Feature/Common/Code/Source/AuxGeom/AuxGeomBase.h b/Gems/Atom/Feature/Common/Code/Source/AuxGeom/AuxGeomBase.h index fe731f4ad6..b329a35977 100644 --- a/Gems/Atom/Feature/Common/Code/Source/AuxGeom/AuxGeomBase.h +++ b/Gems/Atom/Feature/Common/Code/Source/AuxGeom/AuxGeomBase.h @@ -155,8 +155,10 @@ namespace AZ enum AuxGeomShapeType { ShapeType_Sphere, + ShapeType_Hemisphere, ShapeType_Cone, ShapeType_Cylinder, + ShapeType_CylinderNoEnds, // Cylinder without disks on either end ShapeType_Disk, ShapeType_Quad, diff --git a/Gems/Atom/Feature/Common/Code/Source/AuxGeom/AuxGeomDrawQueue.cpp b/Gems/Atom/Feature/Common/Code/Source/AuxGeom/AuxGeomDrawQueue.cpp index 29db7d6673..7c713af96a 100644 --- a/Gems/Atom/Feature/Common/Code/Source/AuxGeom/AuxGeomDrawQueue.cpp +++ b/Gems/Atom/Feature/Common/Code/Source/AuxGeom/AuxGeomDrawQueue.cpp @@ -314,15 +314,35 @@ namespace AZ AddShape(style, shape); } - void AuxGeomDrawQueue::DrawSphere( - const AZ::Vector3& center, + Matrix3x3 CreateMatrix3x3FromDirection(const AZ::Vector3& direction) + { + Vector3 unitDirection(direction.GetNormalized()); + Vector3 unitOrthogonal(direction.GetOrthogonalVector().GetNormalized()); + Vector3 unitCross(unitOrthogonal.Cross(unitDirection)); + return Matrix3x3::CreateFromColumns(unitOrthogonal, unitDirection, unitCross); + } + + void AuxGeomDrawQueue::DrawSphere(const AZ::Vector3& center, float radius, const AZ::Color& color, DrawStyle style, DepthTest depthTest, DepthWrite depthWrite, FaceCullMode faceCull, int32_t viewProjOverrideIndex) + { + DrawSphereCommon(center, AZ::Vector3::CreateAxisY(), radius, color, style, depthTest, depthWrite, faceCull, viewProjOverrideIndex, false); + } + + void AuxGeomDrawQueue::DrawHemisphere(const AZ::Vector3& center, const AZ::Vector3& direction, float radius, const AZ::Color& color, DrawStyle style, DepthTest depthTest, DepthWrite depthWrite, FaceCullMode faceCull, int32_t viewProjOverrideIndex) + { + DrawSphereCommon(center, direction, radius, color, style, depthTest, depthWrite, faceCull, viewProjOverrideIndex, true); + } + + void AuxGeomDrawQueue::DrawSphereCommon( + const AZ::Vector3& center, + const AZ::Vector3& direction, float radius, const AZ::Color& color, DrawStyle style, DepthTest depthTest, DepthWrite depthWrite, FaceCullMode faceCull, - int32_t viewProjOverrideIndex) + int32_t viewProjOverrideIndex, + bool isHemisphere) { if (radius <= 0.0f) { @@ -330,12 +350,12 @@ namespace AZ } ShapeBufferEntry shape; - shape.m_shapeType = ShapeType_Sphere; + shape.m_shapeType = isHemisphere ? ShapeType_Hemisphere : ShapeType_Sphere; shape.m_depthRead = ConvertRPIDepthTestFlag(depthTest); shape.m_depthWrite = ConvertRPIDepthWriteFlag(depthWrite); shape.m_faceCullMode = ConvertRPIFaceCullFlag(faceCull); shape.m_color = color; - shape.m_rotationMatrix = Matrix3x3::CreateIdentity(); + shape.m_rotationMatrix = CreateMatrix3x3FromDirection(direction); shape.m_position = center; shape.m_scale = AZ::Vector3(radius, radius, radius); shape.m_pointSize = m_pointSize; @@ -362,13 +382,9 @@ namespace AZ shape.m_faceCullMode = ConvertRPIFaceCullFlag(faceCull); shape.m_color = color; - Vector3 unitDirection(direction.GetNormalized()); - Vector3 unitOrthogonal(direction.GetOrthogonalVector().GetNormalized()); - Vector3 unitCross(unitOrthogonal.Cross(unitDirection)); - // The disk mesh is created with the top of the disk pointing along the positive Y axis. This creates a // rotation so that the top of the disk will point along the given direction vector. - shape.m_rotationMatrix = Matrix3x3::CreateFromColumns(unitOrthogonal, unitDirection, unitCross); + shape.m_rotationMatrix = CreateMatrix3x3FromDirection(direction); shape.m_position = center; shape.m_scale = AZ::Vector3(radius, 1.0f, radius); shape.m_pointSize = m_pointSize; @@ -401,13 +417,7 @@ namespace AZ shape.m_faceCullMode = ConvertRPIFaceCullFlag(faceCull); shape.m_color = color; - Vector3 unitDirection(direction.GetNormalized()); - Vector3 unitOrthogonal(direction.GetOrthogonalVector().GetNormalized()); - Vector3 unitCross(unitOrthogonal.Cross(unitDirection)); - - // The cone mesh is created with the tip of the cone pointing along the positive Y axis. This creates a - // rotation so that the tip of the cone will point along the given direction vector. - shape.m_rotationMatrix = Matrix3x3::CreateFromColumns(unitOrthogonal, unitDirection, unitCross); + shape.m_rotationMatrix = CreateMatrix3x3FromDirection(direction); shape.m_position = center; shape.m_scale = AZ::Vector3(radius, height, radius); shape.m_pointSize = m_pointSize; @@ -416,17 +426,30 @@ namespace AZ AddShape(style, shape); } - void AuxGeomDrawQueue::DrawCylinder( - const AZ::Vector3& center, - const AZ::Vector3& direction, - float radius, - float height, - const AZ::Color& color, - DrawStyle style, - DepthTest depthTest, - DepthWrite depthWrite, - FaceCullMode faceCull, - int32_t viewProjOverrideIndex) + void AuxGeomDrawQueue::DrawCylinder(const AZ::Vector3& center, const AZ::Vector3& direction, float radius, float height, const AZ::Color& color, + DrawStyle style, DepthTest depthTest, DepthWrite depthWrite, FaceCullMode faceCull, int32_t viewProjOverrideIndex) + { + DrawCylinderCommon(center, direction, radius, height, color, style, depthTest, depthWrite, faceCull, viewProjOverrideIndex, true); + } + + void AuxGeomDrawQueue::DrawCylinderNoEnds(const AZ::Vector3& center, const AZ::Vector3& direction, float radius, float height, const AZ::Color& color, + DrawStyle style, DepthTest depthTest, DepthWrite depthWrite, FaceCullMode faceCull, int32_t viewProjOverrideIndex) + { + DrawCylinderCommon(center, direction, radius, height, color, style, depthTest, depthWrite, faceCull, viewProjOverrideIndex, false); + } + + void AuxGeomDrawQueue::DrawCylinderCommon( + const AZ::Vector3& center, + const AZ::Vector3& direction, + float radius, + float height, + const AZ::Color& color, + DrawStyle style, + DepthTest depthTest, + DepthWrite depthWrite, + FaceCullMode faceCull, + int32_t viewProjOverrideIndex, + bool drawEnds) { if (radius <= 0.0f || height <= 0.0f) { @@ -434,19 +457,15 @@ namespace AZ } ShapeBufferEntry shape; - shape.m_shapeType = ShapeType_Cylinder; - shape.m_depthRead = ConvertRPIDepthTestFlag(depthTest); + shape.m_shapeType = drawEnds ? ShapeType_Cylinder : ShapeType_CylinderNoEnds; + shape.m_depthRead = ConvertRPIDepthTestFlag(depthTest); shape.m_depthWrite = ConvertRPIDepthWriteFlag(depthWrite); shape.m_faceCullMode = ConvertRPIFaceCullFlag(faceCull); shape.m_color = color; - Vector3 unitDirection(direction.GetNormalized()); - Vector3 unitOrthogonal(direction.GetOrthogonalVector().GetNormalized()); - Vector3 unitCross(unitOrthogonal.Cross(unitDirection)); - // The cylinder mesh is created with the top end cap of the cylinder facing along the positive Y axis. This creates a // rotation so that the top face of the cylinder will face along the given direction vector. - shape.m_rotationMatrix = Matrix3x3::CreateFromColumns(unitOrthogonal, unitDirection, unitCross); + shape.m_rotationMatrix = CreateMatrix3x3FromDirection(direction); shape.m_position = center; shape.m_scale = AZ::Vector3(radius, height, radius); shape.m_pointSize = m_pointSize; diff --git a/Gems/Atom/Feature/Common/Code/Source/AuxGeom/AuxGeomDrawQueue.h b/Gems/Atom/Feature/Common/Code/Source/AuxGeom/AuxGeomDrawQueue.h index 535a992fe0..2356abdf52 100644 --- a/Gems/Atom/Feature/Common/Code/Source/AuxGeom/AuxGeomDrawQueue.h +++ b/Gems/Atom/Feature/Common/Code/Source/AuxGeom/AuxGeomDrawQueue.h @@ -60,9 +60,11 @@ namespace AZ // Fixed shape draws void DrawQuad(float width, float height, const AZ::Matrix3x4& transform, const AZ::Color& color, DrawStyle style, DepthTest depthTest, DepthWrite depthWrite, FaceCullMode faceCull, int32_t viewProjOverrideIndex) override; void DrawSphere(const AZ::Vector3& center, float radius, const AZ::Color& color, DrawStyle style, DepthTest depthTest, DepthWrite depthWrite, FaceCullMode faceCull, int32_t viewProjOverrideIndex) override; + void DrawHemisphere(const AZ::Vector3& center, const AZ::Vector3& direction, float radius, const AZ::Color& color, DrawStyle style, DepthTest depthTest, DepthWrite depthWrite, FaceCullMode faceCull, int32_t viewProjOverrideIndex) override; void DrawDisk(const AZ::Vector3& center, const AZ::Vector3& direction, float radius, const AZ::Color& color, DrawStyle style, DepthTest depthTest, DepthWrite depthWrite, FaceCullMode faceCull, int32_t viewProjOverrideIndex) override; void DrawCone(const AZ::Vector3& center, const AZ::Vector3& direction, float radius, float height, const AZ::Color& color, DrawStyle style, DepthTest depthTest, DepthWrite depthWrite, FaceCullMode faceCull, int32_t viewProjOverrideIndex) override; void DrawCylinder(const AZ::Vector3& center, const AZ::Vector3& direction, float radius, float height, const AZ::Color& color, DrawStyle style, DepthTest depthTest, DepthWrite depthWrite, FaceCullMode faceCull, int32_t viewProjOverrideIndex) override; + void DrawCylinderNoEnds(const AZ::Vector3& center, const AZ::Vector3& direction, float radius, float height, const AZ::Color& color, DrawStyle style, DepthTest depthTest, DepthWrite depthWrite, FaceCullMode faceCull, int32_t viewProjOverrideIndex) override; void DrawAabb(const AZ::Aabb& aabb, const AZ::Color& color, DrawStyle style, DepthTest depthTest, DepthWrite depthWrite, FaceCullMode faceCull, int32_t viewProjOverrideIndex) override; void DrawAabb(const AZ::Aabb& aabb, const AZ::Matrix3x4& transform, const AZ::Color& color, DrawStyle style, DepthTest depthTest, DepthWrite depthWrite, FaceCullMode faceCull, int32_t viewProjOverrideIndex) override; void DrawObb(const AZ::Obb& obb, const AZ::Vector3& position, const AZ::Color& color, DrawStyle style, DepthTest depthTest, DepthWrite depthWrite, FaceCullMode faceCull, int32_t viewProjOverrideIndex) override; @@ -73,6 +75,9 @@ namespace AZ private: // functions + void DrawCylinderCommon(const AZ::Vector3& center, const AZ::Vector3& direction, float radius, float height, const AZ::Color& color, DrawStyle style, DepthTest depthTest, DepthWrite depthWrite, FaceCullMode faceCull, int32_t viewProjOverrideIndex, bool drawEnds); + void DrawSphereCommon(const AZ::Vector3& center, const AZ::Vector3& direction, float radius, const AZ::Color& color, DrawStyle style, DepthTest depthTest, DepthWrite depthWrite, FaceCullMode faceCull, int32_t viewProjOverrideIndex, bool isHemisphere); + //! Clear the current buffers void ClearCurrentBufferData(); diff --git a/Gems/Atom/Feature/Common/Code/Source/AuxGeom/FixedShapeProcessor.cpp b/Gems/Atom/Feature/Common/Code/Source/AuxGeom/FixedShapeProcessor.cpp index c2ee397b4c..2e7c0759db 100644 --- a/Gems/Atom/Feature/Common/Code/Source/AuxGeom/FixedShapeProcessor.cpp +++ b/Gems/Atom/Feature/Common/Code/Source/AuxGeom/FixedShapeProcessor.cpp @@ -10,6 +10,7 @@ #include "AuxGeomDrawProcessorShared.h" #include +#include #include #include @@ -69,11 +70,13 @@ namespace AZ SetupInputStreamLayout(m_objectStreamLayout[DrawStyle_Solid], RHI::PrimitiveTopology::TriangleList, false); SetupInputStreamLayout(m_objectStreamLayout[DrawStyle_Shaded], RHI::PrimitiveTopology::TriangleList, true); - CreateSphereBuffersAndViews(); + CreateSphereBuffersAndViews(AuxGeomShapeType::ShapeType_Sphere); + CreateSphereBuffersAndViews(AuxGeomShapeType::ShapeType_Hemisphere); CreateQuadBuffersAndViews(); CreateDiskBuffersAndViews(); CreateConeBuffersAndViews(); - CreateCylinderBuffersAndViews(); + CreateCylinderBuffersAndViews(AuxGeomShapeType::ShapeType_Cylinder); + CreateCylinderBuffersAndViews(AuxGeomShapeType::ShapeType_CylinderNoEnds); CreateBoxBuffersAndViews(); // cache scene pointer for RHI::PipelineState creation. @@ -293,8 +296,11 @@ namespace AZ } } - bool FixedShapeProcessor::CreateSphereBuffersAndViews() + bool FixedShapeProcessor::CreateSphereBuffersAndViews(AuxGeomShapeType sphereShapeType) { + AZ_Assert(sphereShapeType == ShapeType_Sphere || sphereShapeType == ShapeType_Hemisphere, + "Trying to create sphere buffers and views with a non-sphere shape type!"); + const uint32_t numSphereLods = 5; struct LodInfo { @@ -311,13 +317,13 @@ namespace AZ { 9, 9, 0.0000f} }}; - auto& m_shape = m_shapes[ShapeType_Sphere]; + auto& m_shape = m_shapes[sphereShapeType]; m_shape.m_numLods = numSphereLods; for (uint32_t lodIndex = 0; lodIndex < numSphereLods; ++lodIndex) { MeshData meshData; - CreateSphereMeshData(meshData, lodInfo[lodIndex].numRings, lodInfo[lodIndex].numSections); + CreateSphereMeshData(meshData, lodInfo[lodIndex].numRings, lodInfo[lodIndex].numSections, sphereShapeType); ObjectBuffers objectBuffers; @@ -334,12 +340,25 @@ namespace AZ return true; } - void FixedShapeProcessor::CreateSphereMeshData(MeshData& meshData, uint32_t numRings, uint32_t numSections) + void FixedShapeProcessor::CreateSphereMeshData(MeshData& meshData, uint32_t numRings, uint32_t numSections, AuxGeomShapeType sphereShapeType) { const float radius = 1.0f; + // calculate "inner" vertices + float sectionAngle(DegToRad(360.0f / static_cast(numSections))); + float ringSlice(DegToRad(180.0f / static_cast(numRings))); + + uint32_t numberOfPoles = 2; + + if (sphereShapeType == ShapeType_Hemisphere) + { + numberOfPoles = 1; + numRings = (numRings + 1) / 2; + ringSlice = DegToRad(90.0f / static_cast(numRings)); + } + // calc required number of vertices/indices/triangles to build a sphere for the given parameters - uint32_t numVertices = (numRings - 1) * numSections + 2; + uint32_t numVertices = (numRings - 1) * numSections + numberOfPoles; // setup buffers auto& positions = meshData.m_positions; @@ -354,30 +373,29 @@ namespace AZ using NormalType = AuxGeomNormal; // 1st pole vertex - positions.push_back(PosType(0.0f, 0.0f, radius)); - normals.push_back(NormalType(0.0f, 0.0f, 1.0f)); + positions.push_back(PosType(0.0f, radius, 0.0f)); + normals.push_back(NormalType(0.0f, 1.0f, 0.0f)); - // calculate "inner" vertices - float sectionAngle(DegToRad(360.0f / static_cast(numSections))); - float ringSlice(DegToRad(180.0f / static_cast(numRings))); - - for (uint32_t ring = 1; ring < numRings; ++ring) + for (uint32_t ring = 1; ring < numRings - numberOfPoles + 2; ++ring) { float w(sinf(ring * ringSlice)); for (uint32_t section = 0; section < numSections; ++section) { float x = radius * cosf(section * sectionAngle) * w; - float y = radius * sinf(section * sectionAngle) * w; - float z = radius * cosf(ring * ringSlice); + float y = radius * cosf(ring * ringSlice); + float z = radius * sinf(section * sectionAngle) * w; Vector3 radialVector(x, y, z); positions.push_back(radialVector); normals.push_back(radialVector.GetNormalized()); } } - // 2nd vertex of pole (for end cap) - positions.push_back(PosType(0.0f, 0.0f, -radius)); - normals.push_back(NormalType(0.0f, 0.0f, -1.0f)); + if (sphereShapeType == ShapeType_Sphere) + { + // 2nd vertex of pole (for end cap) + positions.push_back(PosType(0.0f, -radius, 0.0f)); + normals.push_back(NormalType(0.0f, -1.0f, 0.0f)); + } // point indices { @@ -393,7 +411,8 @@ namespace AZ // line indices { - const uint32_t numEdges = (numRings - 2) * numSections * 2 + 2 * numSections * 2; + // NumEdges = NumRingEdges + NumSectionEdges = (numRings * numSections) + (numRings * numSections) + const uint32_t numEdges = numRings * numSections * 2; const uint32_t numLineIndices = numEdges * 2; // build "inner" faces @@ -401,10 +420,9 @@ namespace AZ indices.clear(); indices.reserve(numLineIndices); - for (uint16_t ring = 0; ring < numRings - 2; ++ring) + for (uint16_t ring = 0; ring < numRings - numberOfPoles + 1; ++ring) { uint16_t firstVertOfThisRing = static_cast(1 + ring * numSections); - uint16_t firstVertOfNextRing = static_cast(1 + (ring + 1) * numSections); for (uint16_t section = 0; section < numSections; ++section) { uint32_t nextSection = (section + 1) % numSections; @@ -414,32 +432,33 @@ namespace AZ indices.push_back(static_cast(firstVertOfThisRing + nextSection)); // line around section - indices.push_back(firstVertOfThisRing + section); - indices.push_back(firstVertOfNextRing + section); + int currentVertexIndex = firstVertOfThisRing + section; + // max 0 will implicitly handle the top pole + int previousVertexIndex = AZStd::max(currentVertexIndex - (int)numSections, 0); + indices.push_back(static_cast(currentVertexIndex)); + indices.push_back(static_cast(previousVertexIndex)); } } - // build faces for end caps (to connect "inner" vertices with poles) - uint16_t firstPoleVert = 0; - uint16_t firstVertOfFirstRing = static_cast(1 + (0) * numSections); - for (uint16_t section = 0; section < numSections; ++section) + if (sphereShapeType == ShapeType_Sphere) { - indices.push_back(firstPoleVert); - indices.push_back(firstVertOfFirstRing + section); - } - - uint16_t lastPoleVert = static_cast((numRings - 1) * numSections + 1); - uint16_t firstVertOfLastRing = static_cast(1 + (numRings - 2) * numSections); - for (uint16_t section = 0; section < numSections; ++section) - { - indices.push_back(firstVertOfLastRing + section); - indices.push_back(lastPoleVert); + // build faces for bottom pole (to connect "inner" vertices with poles) + uint16_t lastPoleVert = static_cast((numRings - 1) * numSections + 1); + uint16_t firstVertOfLastRing = static_cast(1 + (numRings - 2) * numSections); + for (uint16_t section = 0; section < numSections; ++section) + { + indices.push_back(firstVertOfLastRing + section); + indices.push_back(lastPoleVert); + } } } // triangle indices { - const uint32_t numTriangles = (numRings - 2) * numSections * 2 + 2 * numSections; + // NumTriangles = NumTrianglesAtPoles + NumQuads * 2 + // = (numSections * 2) + ((numRings - 2) * numSections * 2) + // = (numSections * 2) * (numRings - 2 + 1) + const uint32_t numTriangles = (numRings - 1) * numSections * 2; const uint32_t numTriangleIndices = numTriangles * 3; // build "inner" faces @@ -447,10 +466,10 @@ namespace AZ indices.clear(); indices.reserve(numTriangleIndices); - for (uint32_t ring = 0; ring < numRings - 2; ++ring) + for (uint32_t ring = 0; ring < numRings - numberOfPoles; ++ring) { uint32_t firstVertOfThisRing = 1 + ring * numSections; - uint32_t firstVertOfNextRing = 1 + (ring + 1) * numSections; + uint32_t firstVertOfNextRing = firstVertOfThisRing + numSections; for (uint32_t section = 0; section < numSections; ++section) { @@ -476,14 +495,17 @@ namespace AZ indices.push_back(static_cast(firstPoleVert)); } - uint32_t lastPoleVert = (numRings - 1) * numSections + 1; - uint32_t firstVertOfLastRing = 1 + (numRings - 2) * numSections; - for (uint32_t section = 0; section < numSections; ++section) + if (sphereShapeType == ShapeType_Sphere) { - uint32_t nextSection = (section + 1) % numSections; - indices.push_back(static_cast(firstVertOfLastRing + nextSection)); - indices.push_back(static_cast(firstVertOfLastRing + section)); - indices.push_back(static_cast(lastPoleVert)); + uint32_t lastPoleVert = (numRings - 1) * numSections + 1; + uint32_t firstVertOfLastRing = 1 + (numRings - 2) * numSections; + for (uint32_t section = 0; section < numSections; ++section) + { + uint32_t nextSection = (section + 1) % numSections; + indices.push_back(static_cast(firstVertOfLastRing + nextSection)); + indices.push_back(static_cast(firstVertOfLastRing + section)); + indices.push_back(static_cast(lastPoleVert)); + } } } } @@ -827,8 +849,11 @@ namespace AZ } } - bool FixedShapeProcessor::CreateCylinderBuffersAndViews() + bool FixedShapeProcessor::CreateCylinderBuffersAndViews(AuxGeomShapeType cylinderShapeType) { + AZ_Assert(cylinderShapeType == ShapeType_Cylinder || cylinderShapeType == ShapeType_CylinderNoEnds, + "Trying to create cylinder buffers and views with a non-cylinder shape type!"); + const uint32_t numCylinderLods = 5; struct LodInfo { @@ -836,21 +861,21 @@ namespace AZ float screenPercentage; }; const AZStd::array lodInfo = - {{ + { { { 38, 0.1000f}, { 22, 0.0100f}, { 14, 0.0010f}, { 10, 0.0001f}, { 8, 0.0000f} - }}; + } }; - auto& m_shape = m_shapes[ShapeType_Cylinder]; + auto& m_shape = m_shapes[cylinderShapeType]; m_shape.m_numLods = numCylinderLods; for (uint32_t lodIndex = 0; lodIndex < numCylinderLods; ++lodIndex) { MeshData meshData; - CreateCylinderMeshData(meshData, lodInfo[lodIndex].numSections); + CreateCylinderMeshData(meshData, lodInfo[lodIndex].numSections, cylinderShapeType); ObjectBuffers objectBuffers; @@ -867,13 +892,25 @@ namespace AZ return true; } - void FixedShapeProcessor::CreateCylinderMeshData(MeshData& meshData, uint32_t numSections) + void FixedShapeProcessor::CreateCylinderMeshData(MeshData& meshData, uint32_t numSections, AuxGeomShapeType cylinderShapeType) { const float radius = 1.0f; const float height = 1.0f; + //uint16_t indexOfBottomCenter = 0; + //uint16_t indexOfBottomStart = 1; + //uint16_t indexOfTopCenter = numSections + 1; + //uint16_t indexOfTopStart = numSections + 2; + uint16_t indexOfSidesStart = static_cast(2 * numSections + 2); + + if (cylinderShapeType == ShapeType_CylinderNoEnds) + { + // We won't draw disks at the ends of the cylinder, so no need to offset side indices + indexOfSidesStart = 0; + } + // calc required number of vertices to build a cylinder for the given parameters - uint32_t numVertices = 4 * numSections + 2; + uint32_t numVertices = indexOfSidesStart + 2 * numSections; // setup buffers auto& positions = meshData.m_positions; @@ -888,8 +925,11 @@ namespace AZ float topHeight = height * 0.5f; // Create caps - CreateDiskMeshData(meshData, numSections, Facing::Down, bottomHeight); - CreateDiskMeshData(meshData, numSections, Facing::Up, topHeight); + if (cylinderShapeType == ShapeType_Cylinder) + { + CreateDiskMeshData(meshData, numSections, Facing::Down, bottomHeight); + CreateDiskMeshData(meshData, numSections, Facing::Up, topHeight); + } // create vertices for side (so normal points out correctly) float sectionAngle(DegToRad(360.0f / (float)numSections)); @@ -906,12 +946,6 @@ namespace AZ normals.push_back(normal); } - //uint16_t indexOfBottomCenter = 0; - //uint16_t indexOfBottomStart = 1; - //uint16_t indexOfTopCenter = numSections + 1; - //uint16_t indexOfTopStart = numSections + 2; - uint16_t indexOfSidesStart = static_cast(2 * numSections + 2); - // build point indices { auto& indices = meshData.m_pointIndices; @@ -930,6 +964,24 @@ namespace AZ indices.push_back(indexOfSidesStart + 2 * section); indices.push_back(indexOfSidesStart + 2 * section + 1); } + + // If we're not drawing the disks at the ends of the cylinder, we still want to + // draw a ring around the end to join the tips of lines we created just above + if (cylinderShapeType == ShapeType_CylinderNoEnds) + { + for (uint16_t section = 0; section < numSections; ++section) + { + uint16_t nextSection = (section + 1) % numSections; + + // line around the bottom cap + indices.push_back(section * 2); + indices.push_back(nextSection * 2); + + // line around the top cap + indices.push_back(section * 2 + 1); + indices.push_back(nextSection * 2 + 1); + } + } } // indices for triangles diff --git a/Gems/Atom/Feature/Common/Code/Source/AuxGeom/FixedShapeProcessor.h b/Gems/Atom/Feature/Common/Code/Source/AuxGeom/FixedShapeProcessor.h index 4007d62f66..958cee3143 100644 --- a/Gems/Atom/Feature/Common/Code/Source/AuxGeom/FixedShapeProcessor.h +++ b/Gems/Atom/Feature/Common/Code/Source/AuxGeom/FixedShapeProcessor.h @@ -138,8 +138,8 @@ namespace AZ Both, }; - bool CreateSphereBuffersAndViews(); - void CreateSphereMeshData(MeshData& meshData, uint32_t numRings, uint32_t numSections); + bool CreateSphereBuffersAndViews(AuxGeomShapeType sphereShapeType); + void CreateSphereMeshData(MeshData& meshData, uint32_t numRings, uint32_t numSections, AuxGeomShapeType sphereShapeType); bool CreateQuadBuffersAndViews(); void CreateQuadMeshDataSide(MeshData& meshData, bool isUp, bool drawLines); @@ -152,8 +152,8 @@ namespace AZ bool CreateConeBuffersAndViews(); void CreateConeMeshData(MeshData& meshData, uint32_t numRings, uint32_t numSections); - bool CreateCylinderBuffersAndViews(); - void CreateCylinderMeshData(MeshData& meshData, uint32_t numSections); + bool CreateCylinderBuffersAndViews(AuxGeomShapeType cylinderShapeType); + void CreateCylinderMeshData(MeshData& meshData, uint32_t numSections, AuxGeomShapeType cylinderShapeType); bool CreateBoxBuffersAndViews(); void CreateBoxMeshData(MeshData& meshData); diff --git a/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/AuxGeom/AuxGeomDraw.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/AuxGeom/AuxGeomDraw.h index 474d0d5b9e..d6d2352097 100644 --- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/AuxGeom/AuxGeomDraw.h +++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/AuxGeom/AuxGeomDraw.h @@ -147,6 +147,17 @@ namespace AZ //! @param viewProjOverrideIndex Which view projection override entry to use, -1 if unused virtual void DrawSphere( const AZ::Vector3& center, float radius, const AZ::Color& color, DrawStyle style = DrawStyle::Shaded, DepthTest depthTest = DepthTest::On, DepthWrite depthWrite = DepthWrite::On, FaceCullMode faceCull = FaceCullMode::Back, int32_t viewProjOverrideIndex = -1) = 0; + //! Draw a hemisphere. + //! @param center The center of the sphere. + //! @param radius The radius. + //! @param color The color to draw the sphere. + //! @param style The draw style (point, wireframe, solid, shaded etc). + //! @param depthTest If depth testing should be enabled + //! @param depthWrite If depth writing should be enabled + //! @param faceCull Which (if any) facing triangles should be culled + //! @param viewProjOverrideIndex Which view projection override entry to use, -1 if unused + virtual void DrawHemisphere( const AZ::Vector3& center, const AZ::Vector3& direction, float radius, const AZ::Color& color, DrawStyle style = DrawStyle::Shaded, DepthTest depthTest = DepthTest::On, DepthWrite depthWrite = DepthWrite::On, FaceCullMode faceCull = FaceCullMode::Back, int32_t viewProjOverrideIndex = -1) = 0; + //! Draw a disk. //! @param center The center of the disk. //! @param direction The direction vector. The disk will be orthogonal this vector. @@ -172,7 +183,7 @@ namespace AZ //! @param viewProjOverrideIndex Which view projection override entry to use, -1 if unused virtual void DrawCone(const AZ::Vector3& center, const AZ::Vector3& direction, float radius, float height, const AZ::Color& color, DrawStyle style = DrawStyle::Shaded, DepthTest depthTest = DepthTest::On, DepthWrite depthWrite = DepthWrite::On, FaceCullMode faceCull = FaceCullMode::Back, int32_t viewProjOverrideIndex = -1) = 0; - //! Draw a cylinder. + //! Draw a cylinder (with flat disks on the end). //! @param center The center of the base circle. //! @param direction The direction vector. The top end cap of the cylinder will face along this vector. //! @param radius The radius. @@ -185,6 +196,19 @@ namespace AZ //! @param viewProjOverrideIndex Which view projection override entry to use, -1 if unused virtual void DrawCylinder(const AZ::Vector3& center, const AZ::Vector3& direction, float radius, float height, const AZ::Color& color, DrawStyle style = DrawStyle::Shaded, DepthTest depthTest = DepthTest::On, DepthWrite depthWrite = DepthWrite::On, FaceCullMode faceCull = FaceCullMode::Back, int32_t viewProjOverrideIndex = -1) = 0; + //! Draw a cylinder without flat disk on the end. + //! @param center The center of the base circle. + //! @param direction The direction vector. The top end cap of the cylinder will face along this vector. + //! @param radius The radius. + //! @param height The height of the cylinder. + //! @param color The color to draw the cylinder. + //! @param style The draw style (point, wireframe, solid, shaded etc). + //! @param depthTest If depth testing should be enabled + //! @param depthWrite If depth writing should be enabled + //! @param faceCull Which (if any) facing triangles should be culled + //! @param viewProjOverrideIndex Which view projection override entry to use, -1 if unused + virtual void DrawCylinderNoEnds(const AZ::Vector3& center, const AZ::Vector3& direction, float radius, float height, const AZ::Color& color, DrawStyle style = DrawStyle::Shaded, DepthTest depthTest = DepthTest::On, DepthWrite depthWrite = DepthWrite::On, FaceCullMode faceCull = FaceCullMode::Back, int32_t viewProjOverrideIndex = -1) = 0; + //! Draw an axis-aligned bounding box with no transform. //! @param aabb The AABB (typically the bounding box of a set of world space points). //! @param color The color to draw the box. diff --git a/Gems/AtomLyIntegration/AtomBridge/Code/Source/AtomDebugDisplayViewportInterface.cpp b/Gems/AtomLyIntegration/AtomBridge/Code/Source/AtomDebugDisplayViewportInterface.cpp index 12e4ccd8ad..a16d20766d 100644 --- a/Gems/AtomLyIntegration/AtomBridge/Code/Source/AtomDebugDisplayViewportInterface.cpp +++ b/Gems/AtomLyIntegration/AtomBridge/Code/Source/AtomDebugDisplayViewportInterface.cpp @@ -1025,33 +1025,27 @@ namespace AZ::AtomBridge if (m_auxGeomPtr && radius > FLT_EPSILON && axis.GetLengthSq() > FLT_EPSILON) { AZ::Vector3 axisNormalized = axis.GetNormalizedEstimate(); - SingleColorStaticSizeLineHelper<(16+1) * 5> lines; // 360/22.5 = 16, 5 possible calls to CreateArbitraryAxisArc - AZ::Vector3 radiusV3 = AZ::Vector3(radius); - float stepAngle = DegToRad(22.5f); - float Deg0 = DegToRad(0.0f); + const float scale = GetCurrentTransform().RetrieveScale().GetMaxElement(); + const AZ::Vector3 worldCenter = ToWorldSpacePosition(center); + const AZ::Vector3 worldAxis = ToWorldSpaceVector(axis); // Draw cylinder part (or just a circle around the middle) if (heightStraightSection > FLT_EPSILON) { - DrawWireCylinder(center, axis, radius, heightStraightSection); + m_auxGeomPtr->DrawCylinderNoEnds( + worldCenter, + worldAxis, + scale * radius, + scale * heightStraightSection, + m_rendState.m_color, + AZ::RPI::AuxGeomDraw::DrawStyle::Line, + m_rendState.m_depthTest, + m_rendState.m_depthWrite, + m_rendState.m_faceCullMode, + m_rendState.m_viewProjOverrideIndex + ); } - else - { - float Deg360 = DegToRad(360.0f); - CreateArbitraryAxisArc( - lines, - stepAngle, - Deg0, - Deg360, - center, - radiusV3, - axisNormalized - ); - } - - float Deg90 = DegToRad(90.0f); - float Deg180 = DegToRad(180.0f); AZ::Vector3 ortho1Normalized, ortho2Normalized; CalcBasisVectors(axisNormalized, ortho1Normalized, ortho2Normalized); @@ -1059,49 +1053,29 @@ namespace AZ::AtomBridge AZ::Vector3 topCenter = center + centerToTopCircleCenter; AZ::Vector3 bottomCenter = center - centerToTopCircleCenter; - // Draw top cap as two criss-crossing 180deg arcs - CreateArbitraryAxisArc( - lines, - stepAngle, - Deg90, - Deg90 + Deg180, - topCenter, - radiusV3, - ortho1Normalized - ); + m_auxGeomPtr->DrawHemisphere( + topCenter, + worldAxis, + scale * radius, + m_rendState.m_color, + AZ::RPI::AuxGeomDraw::DrawStyle::Line, + m_rendState.m_depthTest, + m_rendState.m_depthWrite, + m_rendState.m_faceCullMode, + m_rendState.m_viewProjOverrideIndex + ); - CreateArbitraryAxisArc( - lines, - stepAngle, - Deg180, - Deg180 + Deg180, - topCenter, - radiusV3, - ortho2Normalized - ); - - // Draw bottom cap - CreateArbitraryAxisArc( - lines, - stepAngle, - -Deg90, - -Deg90 + Deg180, - bottomCenter, - radiusV3, - ortho1Normalized - ); - - CreateArbitraryAxisArc( - lines, - stepAngle, - Deg0, - Deg0 + Deg180, - bottomCenter, - radiusV3, - ortho2Normalized - ); - - lines.Draw(m_auxGeomPtr, m_rendState); + m_auxGeomPtr->DrawHemisphere( + bottomCenter, + -worldAxis, + scale * radius, + m_rendState.m_color, + AZ::RPI::AuxGeomDraw::DrawStyle::Line, + m_rendState.m_depthTest, + m_rendState.m_depthWrite, + m_rendState.m_faceCullMode, + m_rendState.m_viewProjOverrideIndex + ); } } From b533a9566a0a221dd4f70486ab2a3d397bcae5c7 Mon Sep 17 00:00:00 2001 From: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com> Date: Thu, 18 Nov 2021 09:11:46 +0000 Subject: [PATCH 105/345] Fix for viewport not updating correctly when switching camera views (#5719) Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com> --- .../AtomToolsFramework/Viewport/ViewportInteractionImpl.h | 8 +++++++- .../Code/Source/Viewport/ViewportInteractionImpl.cpp | 7 +++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Viewport/ViewportInteractionImpl.h b/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Viewport/ViewportInteractionImpl.h index 9de74752ff..b6ad6e17d1 100644 --- a/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Viewport/ViewportInteractionImpl.h +++ b/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Viewport/ViewportInteractionImpl.h @@ -10,6 +10,7 @@ #include #include +#include #include #include @@ -17,7 +18,9 @@ namespace AtomToolsFramework { //! A concrete implementation of the ViewportInteractionRequestBus. //! Primarily concerned with picking (screen to world and world to screen transformations). - class ViewportInteractionImpl : public AzToolsFramework::ViewportInteraction::ViewportInteractionRequestBus::Handler + class ViewportInteractionImpl + : public AzToolsFramework::ViewportInteraction::ViewportInteractionRequestBus::Handler + , private AZ::RPI::ViewportContextIdNotificationBus::Handler { public: explicit ViewportInteractionImpl(AZ::RPI::ViewPtr viewPtr); @@ -37,6 +40,9 @@ namespace AtomToolsFramework AZStd::function m_deviceScalingFactorFn; //! Callback to determine the device scaling factor. private: + // ViewportContextIdNotificationBus overrides ... + void OnViewportDefaultViewChanged(AZ::RPI::ViewPtr view) override; + AZ::RPI::ViewPtr m_viewPtr; }; } // namespace AtomToolsFramework diff --git a/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Viewport/ViewportInteractionImpl.cpp b/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Viewport/ViewportInteractionImpl.cpp index 475566ccee..1a015c167c 100644 --- a/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Viewport/ViewportInteractionImpl.cpp +++ b/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Viewport/ViewportInteractionImpl.cpp @@ -19,10 +19,12 @@ namespace AtomToolsFramework void ViewportInteractionImpl::Connect(const AzFramework::ViewportId viewportId) { AzToolsFramework::ViewportInteraction::ViewportInteractionRequestBus::Handler::BusConnect(viewportId); + AZ::RPI::ViewportContextIdNotificationBus::Handler::BusConnect(viewportId); } void ViewportInteractionImpl::Disconnect() { + AZ::RPI::ViewportContextIdNotificationBus::Handler::BusDisconnect(); AzToolsFramework::ViewportInteraction::ViewportInteractionRequestBus::Handler::BusDisconnect(); } @@ -58,4 +60,9 @@ namespace AtomToolsFramework { return m_deviceScalingFactorFn(); } + + void ViewportInteractionImpl::OnViewportDefaultViewChanged(AZ::RPI::ViewPtr view) + { + m_viewPtr = AZStd::move(view); + } } // namespace AtomToolsFramework From cf540b6f44c7e439505a29d8d2ce4989c4ae8232 Mon Sep 17 00:00:00 2001 From: amzn-sean <75276488+amzn-sean@users.noreply.github.com> Date: Thu, 18 Nov 2021 09:57:29 +0000 Subject: [PATCH 106/345] Defaulting the joint setup display to ON instead of OFF (#5696) Signed-off-by: amzn-sean <75276488+amzn-sean@users.noreply.github.com> --- .../Code/Editor/EditorJointConfiguration.cpp | 58 ++++++++++++++++++- .../Code/Editor/EditorJointConfiguration.h | 16 ++++- .../Code/Source/EditorBallJointComponent.cpp | 2 +- .../Code/Source/EditorHingeJointComponent.cpp | 2 +- 4 files changed, 72 insertions(+), 6 deletions(-) diff --git a/Gems/PhysX/Code/Editor/EditorJointConfiguration.cpp b/Gems/PhysX/Code/Editor/EditorJointConfiguration.cpp index 02e684de63..166c44de22 100644 --- a/Gems/PhysX/Code/Editor/EditorJointConfiguration.cpp +++ b/Gems/PhysX/Code/Editor/EditorJointConfiguration.cpp @@ -11,6 +11,7 @@ #include #include #include +#include namespace { @@ -213,7 +214,7 @@ namespace PhysX if (auto* serializeContext = azrtti_cast(context)) { serializeContext->Class() - ->Version(4, &EditorJointConfig::VersionConverter) + ->Version(5, &EditorJointConfig::VersionConverter) ->Field("Local Position", &EditorJointConfig::m_localPosition) ->Field("Local Rotation", &EditorJointConfig::m_localRotation) ->Field("Parent Entity", &EditorJointConfig::m_leadEntity) @@ -228,6 +229,12 @@ namespace PhysX if (auto* editContext = serializeContext->GetEditContext()) { + editContext->Enum("Joint Display Setup State", "Options for displaying joint setup.") + ->Value("Never", EditorJointConfig::DisplaySetupState::Never) + ->Value("Selected", EditorJointConfig::DisplaySetupState::Selected) + ->Value("Always", EditorJointConfig::DisplaySetupState::Always) + ; + editContext->Class( "PhysX Joint Configuration", "") ->ClassElement(AZ::Edit::ClassElements::EditorData, "") @@ -244,8 +251,11 @@ namespace PhysX ->Attribute(AZ::Edit::Attributes::ChangeNotify, &EditorJointConfig::ValidateLeadEntityId) ->DataElement(0, &PhysX::EditorJointConfig::m_selfCollide, "Lead-Follower Collide" , "When active, the lead and follower pair will collide with each other.") - ->DataElement(0, &PhysX::EditorJointConfig::m_displayJointSetup, "Display Setup in Viewport" - , "Display joint setup in the viewport.") + ->DataElement( + AZ::Edit::UIHandlers::ComboBox, &PhysX::EditorJointConfig::m_displayJointSetup, "Display Setup in Viewport" + , "Never = Not shown." + "Select = Show setup display when entity is selected." + "Always = Always show setup display.") ->Attribute(AZ::Edit::Attributes::ReadOnly, &EditorJointConfig::IsInComponentMode) ->DataElement(0, &PhysX::EditorJointConfig::m_selectLeadOnSnap, "Select Lead on Snap" , "Select lead entity on snap to position in component mode.") @@ -306,6 +316,23 @@ namespace PhysX m_followerEntity); } + bool EditorJointConfig::ShowSetupDisplay() const + { + switch(m_displayJointSetup) + { + case DisplaySetupState::Always: + return true; + case DisplaySetupState::Selected: + { + bool showSetup = false; + AzToolsFramework::EditorEntityInfoRequestBus::EventResult( + showSetup, m_followerEntity, &AzToolsFramework::EditorEntityInfoRequests::IsSelected); + return showSetup; + } + } + return false; + } + bool EditorJointConfig::IsInComponentMode() const { return m_inComponentMode; @@ -343,6 +370,31 @@ namespace PhysX } } + // convert m_displayJointSetup from a bool to the enum with the option Never,Selected,Always show joint setup helpers. + if (classElement.GetVersion() <= 4) + { + // get the current bool setting and remove it. + bool oldSetting = false; + const int displayJointSetupIndex = classElement.FindElement(AZ_CRC_CE("Display Debug")); + if (displayJointSetupIndex >= 0) + { + AZ::SerializeContext::DataElementNode& elementNode = classElement.GetSubElement(displayJointSetupIndex); + elementNode.GetData(oldSetting); + classElement.RemoveElement(displayJointSetupIndex); + } + + //if the old setting was on set it to 'Selected'. otherwise 'Never' + if (oldSetting) + { + classElement.AddElementWithData(context, "Display Debug", EditorJointConfig::DisplaySetupState::Selected); + } + else + { + classElement.AddElementWithData(context, "Display Debug", EditorJointConfig::DisplaySetupState::Never); + } + } + + return result; } diff --git a/Gems/PhysX/Code/Editor/EditorJointConfiguration.h b/Gems/PhysX/Code/Editor/EditorJointConfiguration.h index 89ab31e4a7..f3dcd4afed 100644 --- a/Gems/PhysX/Code/Editor/EditorJointConfiguration.h +++ b/Gems/PhysX/Code/Editor/EditorJointConfiguration.h @@ -100,12 +100,21 @@ namespace PhysX AZ_TYPE_INFO(EditorJointConfig, "{8A966D65-CA97-4786-A13C-ACAA519D97EA}"); static void Reflect(AZ::ReflectContext* context); + enum class DisplaySetupState : AZ::u8 + { + Never = 0, + Selected, + Always + }; + void SetLeadEntityId(AZ::EntityId leadEntityId); JointGenericProperties ToGenericProperties() const; JointComponentConfiguration ToGameTimeConfig() const; + bool ShowSetupDisplay() const; + bool m_breakable = false; - bool m_displayJointSetup = false; + DisplaySetupState m_displayJointSetup = DisplaySetupState::Selected; bool m_inComponentMode = false; bool m_selectLeadOnSnap = true; bool m_selfCollide = false; @@ -129,3 +138,8 @@ namespace PhysX }; } // namespace PhysX + +namespace AZ +{ + AZ_TYPE_INFO_SPECIALIZE(PhysX::EditorJointConfig::DisplaySetupState, "{17EBE6BD-289A-4326-8A24-DCE3B7FEC51E}"); +} // namespace AZ diff --git a/Gems/PhysX/Code/Source/EditorBallJointComponent.cpp b/Gems/PhysX/Code/Source/EditorBallJointComponent.cpp index fa71fa0061..d7065a869d 100644 --- a/Gems/PhysX/Code/Source/EditorBallJointComponent.cpp +++ b/Gems/PhysX/Code/Source/EditorBallJointComponent.cpp @@ -215,7 +215,7 @@ namespace PhysX { EditorJointComponent::DisplayEntityViewport(viewportInfo, debugDisplay); - if (!m_config.m_displayJointSetup && + if (!m_config.ShowSetupDisplay() && !m_config.m_inComponentMode) { return; diff --git a/Gems/PhysX/Code/Source/EditorHingeJointComponent.cpp b/Gems/PhysX/Code/Source/EditorHingeJointComponent.cpp index 1b575074e2..f009c990b4 100644 --- a/Gems/PhysX/Code/Source/EditorHingeJointComponent.cpp +++ b/Gems/PhysX/Code/Source/EditorHingeJointComponent.cpp @@ -211,7 +211,7 @@ namespace PhysX { EditorJointComponent::DisplayEntityViewport(viewportInfo, debugDisplay); - if (!m_config.m_displayJointSetup && + if (!m_config.ShowSetupDisplay() && !m_config.m_inComponentMode) { return; From bf4f52e146b09a3171c98926e29d0101be868dc8 Mon Sep 17 00:00:00 2001 From: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com> Date: Thu, 18 Nov 2021 10:58:18 +0000 Subject: [PATCH 107/345] Updates and fixes to viewport placement (#5712) * updates to use more modern viewport intersection logic Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com> * updates to editor viewport ray intersection for object placement Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com> * make ed_defaultEntityPlacementDistance visible to Viewport.cpp Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com> * fix link error for AZ_CVAR variable Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com> * updates following review feedback Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com> --- Code/Editor/2DViewport.cpp | 24 +- Code/Editor/EditorViewportWidget.cpp | 6 +- Code/Editor/EditorViewportWidget.h | 3 +- .../SandboxIntegration.cpp | 10 +- Code/Editor/Viewport.cpp | 236 ++---------------- Code/Editor/Viewport.h | 43 ++-- .../Viewport/ViewportMessages.cpp | 30 +++ .../Viewport/ViewportMessages.h | 6 + .../ViewportSelection/EditorSelectionUtil.cpp | 3 - .../ViewportSelection/EditorSelectionUtil.h | 3 + 10 files changed, 98 insertions(+), 266 deletions(-) diff --git a/Code/Editor/2DViewport.cpp b/Code/Editor/2DViewport.cpp index ba433c869f..4d0609907f 100644 --- a/Code/Editor/2DViewport.cpp +++ b/Code/Editor/2DViewport.cpp @@ -234,7 +234,7 @@ void Q2DViewport::UpdateContent(int flags) } ////////////////////////////////////////////////////////////////////////// -void Q2DViewport::OnRButtonDown(Qt::KeyboardModifiers modifiers, const QPoint& point) +void Q2DViewport::OnRButtonDown([[maybe_unused]] Qt::KeyboardModifiers modifiers, const QPoint& point) { if (GetIEditor()->IsInGameMode()) { @@ -246,9 +246,6 @@ void Q2DViewport::OnRButtonDown(Qt::KeyboardModifiers modifiers, const QPoint& p setFocus(); } - // Check Edit Tool. - MouseCallback(eMouseRDown, point, modifiers); - SetCurrentCursor(STD_CURSOR_MOVE, QString()); // Save the mouse down position @@ -273,17 +270,8 @@ void Q2DViewport::OnRButtonUp([[maybe_unused]] Qt::KeyboardModifiers modifiers, } ////////////////////////////////////////////////////////////////////////// -void Q2DViewport::OnMButtonDown(Qt::KeyboardModifiers modifiers, const QPoint& point) +void Q2DViewport::OnMButtonDown([[maybe_unused]] Qt::KeyboardModifiers modifiers, const QPoint& point) { - //////////////////////////////////////////////////////////////////////// - // User pressed the middle mouse button - //////////////////////////////////////////////////////////////////////// - // Check Edit Tool. - if (MouseCallback(eMouseMDown, point, modifiers)) - { - return; - } - // Save the mouse down position m_RMouseDownPos = point; @@ -300,14 +288,8 @@ void Q2DViewport::OnMButtonDown(Qt::KeyboardModifiers modifiers, const QPoint& p } ////////////////////////////////////////////////////////////////////////// -void Q2DViewport::OnMButtonUp(Qt::KeyboardModifiers modifiers, const QPoint& point) +void Q2DViewport::OnMButtonUp([[maybe_unused]] Qt::KeyboardModifiers modifiers, [[maybe_unused]] const QPoint& point) { - // Check Edit Tool. - if (MouseCallback(eMouseMUp, point, modifiers)) - { - return; - } - SetViewMode(NothingMode); ReleaseMouse(); diff --git a/Code/Editor/EditorViewportWidget.cpp b/Code/Editor/EditorViewportWidget.cpp index 86a91a25bb..8f94afd514 100644 --- a/Code/Editor/EditorViewportWidget.cpp +++ b/Code/Editor/EditorViewportWidget.cpp @@ -2307,10 +2307,10 @@ void* EditorViewportWidget::GetSystemCursorConstraintWindow() const return systemCursorConstrained ? renderOverlayHWND() : nullptr; } -void EditorViewportWidget::BuildDragDropContext(AzQtComponents::ViewportDragContext& context, const QPoint& pt) +void EditorViewportWidget::BuildDragDropContext( + AzQtComponents::ViewportDragContext& context, const AzFramework::ViewportId viewportId, const QPoint& point) { - const auto scaledPoint = WidgetToViewport(pt); - QtViewport::BuildDragDropContext(context, scaledPoint); + QtViewport::BuildDragDropContext(context, viewportId, point); } void EditorViewportWidget::RestoreViewportAfterGameMode() diff --git a/Code/Editor/EditorViewportWidget.h b/Code/Editor/EditorViewportWidget.h index d20f3fe939..7d8daba8c5 100644 --- a/Code/Editor/EditorViewportWidget.h +++ b/Code/Editor/EditorViewportWidget.h @@ -273,7 +273,8 @@ private: bool CheckRespondToInput() const; - void BuildDragDropContext(AzQtComponents::ViewportDragContext& context, const QPoint& pt) override; + void BuildDragDropContext( + AzQtComponents::ViewportDragContext& context, AzFramework::ViewportId viewportId, const QPoint& point) override; void SetAsActiveViewport(); void PushDisableRendering(); diff --git a/Code/Editor/Plugins/ComponentEntityEditorPlugin/SandboxIntegration.cpp b/Code/Editor/Plugins/ComponentEntityEditorPlugin/SandboxIntegration.cpp index 4aae4191a0..64bd943d63 100644 --- a/Code/Editor/Plugins/ComponentEntityEditorPlugin/SandboxIntegration.cpp +++ b/Code/Editor/Plugins/ComponentEntityEditorPlugin/SandboxIntegration.cpp @@ -10,7 +10,6 @@ #include #include #include -#include #include #include #include @@ -57,6 +56,7 @@ #include #include #include +#include #include #include @@ -1394,13 +1394,13 @@ void SandboxIntegrationManager::ContextMenu_NewEntity() { AZ::Vector3 worldPosition = AZ::Vector3::CreateZero(); - CViewport* view = GetIEditor()->GetViewManager()->GetGameViewport(); // If we don't have a viewport active to aid in placement, the object // will be created at the origin. - if (view) + if (CViewport* view = GetIEditor()->GetViewManager()->GetGameViewport()) { - const QPoint viewPoint(static_cast(m_contextMenuViewPoint.GetX()), static_cast(m_contextMenuViewPoint.GetY())); - worldPosition = view->GetHitLocation(viewPoint); + worldPosition = AzToolsFramework::FindClosestPickIntersection( + view->GetViewportId(), AzFramework::ScreenPointFromVector2(m_contextMenuViewPoint), AzToolsFramework::EditorPickRayLength, + GetDefaultEntityPlacementDistance()); } CreateNewEntityAtPosition(worldPosition); diff --git a/Code/Editor/Viewport.cpp b/Code/Editor/Viewport.cpp index c8f2e268d9..77be6e260e 100644 --- a/Code/Editor/Viewport.cpp +++ b/Code/Editor/Viewport.cpp @@ -14,14 +14,19 @@ // Qt #include +// AzCore +#include + // AzQtComponents #include #include #include #include +#include // Editor +#include "Editor/Plugins/ComponentEntityEditorPlugin/SandboxIntegration.h" #include "ViewManager.h" #include "Include/ITransformManipulator.h" #include "Include/HitContext.h" @@ -32,22 +37,35 @@ #include "GameEngine.h" #include "Settings.h" - #ifdef LoadCursor #undef LoadCursor #endif +AZ_CVAR( + float, + ed_defaultEntityPlacementDistance, + 10.0f, + nullptr, + AZ::ConsoleFunctorFlags::Null, + "The default distance to place an entity from the camera if no intersection is found"); + +float GetDefaultEntityPlacementDistance() +{ + return ed_defaultEntityPlacementDistance; +} + ////////////////////////////////////////////////////////////////////// // Viewport drag and drop support ////////////////////////////////////////////////////////////////////// -void QtViewport::BuildDragDropContext(AzQtComponents::ViewportDragContext& context, const QPoint& pt) +void QtViewport::BuildDragDropContext( + AzQtComponents::ViewportDragContext& context, const AzFramework::ViewportId viewportId, const QPoint& point) { - context.m_hitLocation = AZ::Vector3::CreateZero(); - context.m_hitLocation = GetHitLocation(pt); + context.m_hitLocation = AzToolsFramework::FindClosestPickIntersection( + viewportId, AzToolsFramework::ViewportInteraction::ScreenPointFromQPoint(point), AzToolsFramework::EditorPickRayLength, + GetDefaultEntityPlacementDistance()); } - void QtViewport::dragEnterEvent(QDragEnterEvent* event) { if (!GetIEditor()->GetGameEngine()->IsLevelLoaded()) @@ -66,7 +84,7 @@ void QtViewport::dragEnterEvent(QDragEnterEvent* event) // new bus-based way of doing it (install a listener!) using namespace AzQtComponents; ViewportDragContext context; - BuildDragDropContext(context, event->pos()); + BuildDragDropContext(context, GetViewportId(), event->pos()); DragAndDropEventsBus::Event(DragAndDropContexts::EditorViewport, &DragAndDropEvents::DragEnter, event, context); } } @@ -89,7 +107,7 @@ void QtViewport::dragMoveEvent(QDragMoveEvent* event) // new bus-based way of doing it (install a listener!) using namespace AzQtComponents; ViewportDragContext context; - BuildDragDropContext(context, event->pos()); + BuildDragDropContext(context, GetViewportId(), event->pos()); DragAndDropEventsBus::Event(DragAndDropContexts::EditorViewport, &DragAndDropEvents::DragMove, event, context); } } @@ -112,7 +130,7 @@ void QtViewport::dropEvent(QDropEvent* event) { // new bus-based way of doing it (install a listener!) ViewportDragContext context; - BuildDragDropContext(context, event->pos()); + BuildDragDropContext(context, GetViewportId(), event->pos()); DragAndDropEventsBus::Event(DragAndDropContexts::EditorViewport, &DragAndDropEvents::Drop, event, context); } } @@ -340,13 +358,6 @@ void QtViewport::resizeEvent(QResizeEvent* event) Update(); } -////////////////////////////////////////////////////////////////////////// -void QtViewport::leaveEvent(QEvent* event) -{ - QWidget::leaveEvent(event); - MouseCallback(eMouseLeave, QPoint(), Qt::KeyboardModifiers(), Qt::MouseButtons()); -} - ////////////////////////////////////////////////////////////////////////// void QtViewport::paintEvent([[maybe_unused]] QPaintEvent* event) { @@ -581,63 +592,7 @@ void QtViewport::keyReleaseEvent(QKeyEvent* event) OnKeyUp(nativeKey, 1, event->nativeModifiers()); } -////////////////////////////////////////////////////////////////////////// -void QtViewport::OnLButtonDown(Qt::KeyboardModifiers modifiers, const QPoint& point) -{ - // Save the mouse down position - m_cMouseDownPos = point; - if (MouseCallback(eMouseLDown, point, modifiers)) - { - return; - } -} - -////////////////////////////////////////////////////////////////////////// -void QtViewport::OnLButtonUp(Qt::KeyboardModifiers modifiers, const QPoint& point) -{ - // Check Edit Tool. - MouseCallback(eMouseLUp, point, modifiers); -} -////////////////////////////////////////////////////////////////////////// -void QtViewport::OnRButtonDown(Qt::KeyboardModifiers modifiers, const QPoint& point) -{ - MouseCallback(eMouseRDown, point, modifiers); -} - -////////////////////////////////////////////////////////////////////////// -void QtViewport::OnRButtonUp(Qt::KeyboardModifiers modifiers, const QPoint& point) -{ - MouseCallback(eMouseRUp, point, modifiers); -} - -////////////////////////////////////////////////////////////////////////// -void QtViewport::OnMButtonDown(Qt::KeyboardModifiers modifiers, const QPoint& point) -{ - // Check Edit Tool. - MouseCallback(eMouseMDown, point, modifiers); -} - -////////////////////////////////////////////////////////////////////////// -void QtViewport::OnMButtonUp(Qt::KeyboardModifiers modifiers, const QPoint& point) -{ - // Move the viewer to the mouse location. - // Check Edit Tool. - MouseCallback(eMouseMUp, point, modifiers); -} - -////////////////////////////////////////////////////////////////////////// -void QtViewport::OnMButtonDblClk(Qt::KeyboardModifiers modifiers, const QPoint& point) -{ - MouseCallback(eMouseMDblClick, point, modifiers); -} - - -////////////////////////////////////////////////////////////////////////// -void QtViewport::OnMouseMove(Qt::KeyboardModifiers modifiers, Qt::MouseButtons buttons, const QPoint& point) -{ - MouseCallback(eMouseMove, point, modifiers, buttons); -} ////////////////////////////////////////////////////////////////////////// void QtViewport::OnSetCursor() @@ -696,44 +651,6 @@ void QtViewport::OnDragSelectRectangle(const QRect& rect, bool bNormalizeRect) GetIEditor()->SetStatusText(szNewStatusText); } -////////////////////////////////////////////////////////////////////////// -void QtViewport::OnLButtonDblClk(Qt::KeyboardModifiers modifiers, const QPoint& point) -{ - if (GetIEditor()->IsInGameMode()) - { - // Ignore double clicks while in game. - return; - } - - MouseCallback(eMouseLDblClick, point, modifiers); -} - -////////////////////////////////////////////////////////////////////////// -void QtViewport::OnRButtonDblClk(Qt::KeyboardModifiers modifiers, const QPoint& point) -{ - MouseCallback(eMouseRDblClick, point, modifiers); -} - -////////////////////////////////////////////////////////////////////////// -void QtViewport::OnKeyDown([[maybe_unused]] UINT nChar, [[maybe_unused]] UINT nRepCnt, [[maybe_unused]] UINT nFlags) -{ - if (GetIEditor()->IsInGameMode()) - { - // Ignore key downs while in game. - return; - } -} - -////////////////////////////////////////////////////////////////////////// -void QtViewport::OnKeyUp([[maybe_unused]] UINT nChar, [[maybe_unused]] UINT nRepCnt, [[maybe_unused]] UINT nFlags) -{ - if (GetIEditor()->IsInGameMode()) - { - // Ignore key downs while in game. - return; - } -} - ////////////////////////////////////////////////////////////////////////// void QtViewport::SetCurrentCursor(const QCursor& hCursor, const QString& cursorString) { @@ -1119,29 +1036,6 @@ bool QtViewport::HitTest(const QPoint& point, HitContext& hitInfo) return false; } -AZ::Vector3 QtViewport::GetHitLocation(const QPoint& point) -{ - Vec3 pos = Vec3(ZERO); - HitContext hit; - if (HitTest(point, hit)) - { - pos = hit.raySrc + hit.rayDir * hit.dist; - pos = SnapToGrid(pos); - } - else - { - bool hitTerrain; - pos = ViewToWorld(point, &hitTerrain); - if (hitTerrain) - { - pos.z = GetIEditor()->GetTerrainElevation(pos.x, pos.y); - } - pos = SnapToGrid(pos); - } - - return AZ::Vector3(pos.x, pos.y, pos.z); -} - ////////////////////////////////////////////////////////////////////////// void QtViewport::SetZoomFactor(float fZoomFactor) { @@ -1315,84 +1209,6 @@ bool QtViewport::GetAdvancedSelectModeFlag() return m_bAdvancedSelectMode; } -////////////////////////////////////////////////////////////////////////// -bool QtViewport::MouseCallback(EMouseEvent event, const QPoint& point, Qt::KeyboardModifiers modifiers, Qt::MouseButtons buttons) -{ - AZ_PROFILE_FUNCTION(Editor); - - // Ignore any mouse events in game mode. - if (GetIEditor()->IsInGameMode()) - { - return true; - } - - // We must ignore mouse events when we are in the middle of an assert. - // Reason: If we have an assert called from an engine module under the editor, if we call this function, - // it may call the engine again and cause a deadlock. - // Concrete example: CryPhysics called from Trackview causing an assert, and moving the cursor over the viewport - // would cause the editor to freeze as it calls CryPhysics again for a raycast while it didn't release the lock. - if (gEnv->pSystem->IsAssertDialogVisible()) - { - return true; - } - - ////////////////////////////////////////////////////////////////////////// - // Hit test gizmo objects. - ////////////////////////////////////////////////////////////////////////// - bool bAltClick = (modifiers & Qt::AltModifier); - bool bCtrlClick = (modifiers & Qt::ControlModifier); - bool bShiftClick = (modifiers & Qt::ShiftModifier); - - int flags = (bCtrlClick ? MK_CONTROL : 0) | - (bShiftClick ? MK_SHIFT : 0) | - ((buttons& Qt::LeftButton) ? MK_LBUTTON : 0) | - ((buttons& Qt::MiddleButton) ? MK_MBUTTON : 0) | - ((buttons& Qt::RightButton) ? MK_RBUTTON : 0); - - switch (event) - { - case eMouseMove: - - if (m_nLastUpdateFrame == m_nLastMouseMoveFrame) - { - // If mouse move event generated in the same frame, ignore it. - return false; - } - m_nLastMouseMoveFrame = m_nLastUpdateFrame; - - // Skip the marker position update if anything is selected, since it is only used - // by the info bar which doesn't show the marker when there is an active selection. - // This helps a performance issue when calling ViewToWorld (which calls RayWorldIntersection) - // on every mouse movement becomes very expensive in scenes with large amounts of entities. - CSelectionGroup* selection = GetIEditor()->GetSelection(); - if (!(buttons & Qt::RightButton) /* && m_nLastUpdateFrame != m_nLastMouseMoveFrame*/ && (selection && selection->IsEmpty())) - { - //m_nLastMouseMoveFrame = m_nLastUpdateFrame; - Vec3 pos = ViewToWorld(point); - GetIEditor()->SetMarkerPosition(pos); - } - break; - } - - QPoint tempPoint(point.x(), point.y()); - - ////////////////////////////////////////////////////////////////////////// - // Handle viewport manipulators. - ////////////////////////////////////////////////////////////////////////// - if (!bAltClick) - { - ITransformManipulator* pManipulator = GetIEditor()->GetTransformManipulator(); - if (pManipulator) - { - if (pManipulator->MouseCallback(this, event, tempPoint, flags)) - { - return true; - } - } - } - - return false; -} ////////////////////////////////////////////////////////////////////////// void QtViewport::ProcessRenderLisneters(DisplayContext& rstDisplayContext) { diff --git a/Code/Editor/Viewport.h b/Code/Editor/Viewport.h index 7f8ccc4c4f..bf44b914aa 100644 --- a/Code/Editor/Viewport.h +++ b/Code/Editor/Viewport.h @@ -6,13 +6,12 @@ * */ - // Description : interface for the CViewport class. - #pragma once #if !defined(Q_MOC_RUN) +#include #include #include #include @@ -88,6 +87,9 @@ enum EStdCursor STD_CURSOR_LAST, }; +//! The default distance an entity is placed from the camera if there is no intersection +SANDBOX_API float GetDefaultEntityPlacementDistance(); + AZ_PUSH_DISABLE_DLL_EXPORT_BASECLASS_WARNING class SANDBOX_API CViewport : public IDisplayViewport @@ -201,7 +203,6 @@ public: //! Performs hit testing of 2d point in view to find which object hit. virtual bool HitTest(const QPoint& point, HitContext& hitInfo) = 0; - virtual AZ::Vector3 GetHitLocation(const QPoint& point) = 0; virtual void MakeConstructionPlane(int axis) = 0; @@ -432,7 +433,6 @@ public: //! Performs hit testing of 2d point in view to find which object hit. bool HitTest(const QPoint& point, HitContext& hitInfo) override; - AZ::Vector3 GetHitLocation(const QPoint& point) override; //! Do 2D hit testing of line in world space. // pToCameraDistance is an optional output parameter in which distance from the camera to the line is returned. @@ -522,9 +522,6 @@ protected: void setRenderOverlayVisible(bool); bool isRenderOverlayVisible() const; - // called to process mouse callback inside the viewport. - virtual bool MouseCallback(EMouseEvent event, const QPoint& point, Qt::KeyboardModifiers modifiers, Qt::MouseButtons buttons = Qt::NoButton); - void ProcessRenderLisneters(DisplayContext& rstDisplayContext); void mousePressEvent(QMouseEvent* event) override; @@ -535,29 +532,29 @@ protected: void keyPressEvent(QKeyEvent* event) override; void keyReleaseEvent(QKeyEvent* event) override; void resizeEvent(QResizeEvent* event) override; - void leaveEvent(QEvent* event) override; - void paintEvent(QPaintEvent* event) override; - virtual void OnMouseMove(Qt::KeyboardModifiers modifiers, Qt::MouseButtons buttons, const QPoint& point); - virtual void OnMouseWheel(Qt::KeyboardModifiers modifiers, short zDelta, const QPoint& pt); - virtual void OnLButtonDown(Qt::KeyboardModifiers modifiers, const QPoint& point); - virtual void OnLButtonUp(Qt::KeyboardModifiers modifiers, const QPoint& point); - virtual void OnRButtonDown(Qt::KeyboardModifiers modifiers, const QPoint& point); - virtual void OnRButtonUp(Qt::KeyboardModifiers modifiers, const QPoint& point); - virtual void OnMButtonDblClk(Qt::KeyboardModifiers modifiers, const QPoint& point); - virtual void OnMButtonDown(Qt::KeyboardModifiers modifiers, const QPoint& point); - virtual void OnMButtonUp(Qt::KeyboardModifiers modifiers, const QPoint& point); - virtual void OnLButtonDblClk(Qt::KeyboardModifiers modifiers, const QPoint& point); - virtual void OnRButtonDblClk(Qt::KeyboardModifiers modifiers, const QPoint& point); - virtual void OnKeyDown(UINT nChar, UINT nRepCnt, UINT nFlags); - virtual void OnKeyUp(UINT nChar, UINT nRepCnt, UINT nFlags); + virtual void OnMouseMove(Qt::KeyboardModifiers, Qt::MouseButtons, const QPoint&) {} + virtual void OnMouseWheel(Qt::KeyboardModifiers, short zDelta, const QPoint&); + virtual void OnLButtonDown(Qt::KeyboardModifiers, const QPoint&) {} + virtual void OnLButtonUp(Qt::KeyboardModifiers, const QPoint&) {} + virtual void OnRButtonDown(Qt::KeyboardModifiers, const QPoint&) {} + virtual void OnRButtonUp(Qt::KeyboardModifiers, const QPoint&) {} + virtual void OnMButtonDblClk(Qt::KeyboardModifiers, const QPoint&) {} + virtual void OnMButtonDown(Qt::KeyboardModifiers, const QPoint&) {} + virtual void OnMButtonUp(Qt::KeyboardModifiers, const QPoint&) {} + virtual void OnLButtonDblClk(Qt::KeyboardModifiers, const QPoint&) {} + virtual void OnRButtonDblClk(Qt::KeyboardModifiers, const QPoint&) {} + virtual void OnKeyDown([[maybe_unused]] UINT nChar, [[maybe_unused]] UINT nRepCnt, [[maybe_unused]] UINT nFlags) {} + virtual void OnKeyUp([[maybe_unused]] UINT nChar, [[maybe_unused]] UINT nRepCnt, [[maybe_unused]] UINT nFlags) {} #if defined(AZ_PLATFORM_WINDOWS) void OnRawInput(UINT wParam, HRAWINPUT lParam); #endif void OnSetCursor(); - virtual void BuildDragDropContext(AzQtComponents::ViewportDragContext& context, const QPoint& pt); + virtual void BuildDragDropContext( + AzQtComponents::ViewportDragContext& context, AzFramework::ViewportId viewportId, const QPoint& point); + void dragEnterEvent(QDragEnterEvent* event) override; void dragMoveEvent(QDragMoveEvent* event) override; void dragLeaveEvent(QDragLeaveEvent* event) override; diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Viewport/ViewportMessages.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Viewport/ViewportMessages.cpp index e3b45aca2b..8f8bd3e3f9 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/Viewport/ViewportMessages.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Viewport/ViewportMessages.cpp @@ -6,6 +6,7 @@ * */ +#include #include namespace AzToolsFramework @@ -62,4 +63,33 @@ namespace AzToolsFramework return circleBoundWidth; } + + AZ::Vector3 FindClosestPickIntersection( + AzFramework::ViewportId viewportId, const AzFramework::ScreenPoint& screenPoint, const float rayLength, const float defaultDistance) + { + using AzToolsFramework::ViewportInteraction::ViewportInteractionRequestBus; + AzToolsFramework::ViewportInteraction::ProjectedViewportRay viewportRay{}; + ViewportInteractionRequestBus::EventResult( + viewportRay, viewportId, &ViewportInteractionRequestBus::Events::ViewportScreenToWorldRay, screenPoint); + + AzFramework::RenderGeometry::RayRequest ray; + ray.m_startWorldPosition = viewportRay.origin; + ray.m_endWorldPosition = viewportRay.origin + viewportRay.direction * rayLength; + ray.m_onlyVisible = true; + + AzFramework::RenderGeometry::RayResult renderGeometryIntersectionResult; + AzFramework::RenderGeometry::IntersectorBus::EventResult( + renderGeometryIntersectionResult, AzToolsFramework::GetEntityContextId(), + &AzFramework::RenderGeometry::IntersectorBus::Events::RayIntersect, ray); + + // attempt a ray intersection with any visible mesh and return the intersection position if successful + if (renderGeometryIntersectionResult) + { + return renderGeometryIntersectionResult.m_worldPosition; + } + else + { + return viewportRay.origin + viewportRay.direction * defaultDistance; + } + } } // namespace AzToolsFramework diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Viewport/ViewportMessages.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Viewport/ViewportMessages.h index 84a8daa83e..aa97eb361e 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/Viewport/ViewportMessages.h +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Viewport/ViewportMessages.h @@ -334,6 +334,12 @@ namespace AzToolsFramework return entityContextId; } + //! Performs an intersection test against meshes in the scene, if there is a hit (the ray intersects + //! a mesh), that position is returned, otherwise a point projected defaultDistance from the + //! origin of the ray will be returned. + AZ::Vector3 FindClosestPickIntersection( + AzFramework::ViewportId viewportId, const AzFramework::ScreenPoint& screenPoint, float rayLength, float defaultDistance); + //! Maps a mouse interaction event to a ClickDetector event. //! @note Function only cares about up or down events, all other events are mapped to Nil (ignored). AzFramework::ClickDetector::ClickEvent ClickDetectorEventFromViewportInteraction( diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorSelectionUtil.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorSelectionUtil.cpp index a5ef66e7a3..0a7bed6b18 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorSelectionUtil.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorSelectionUtil.cpp @@ -18,9 +18,6 @@ namespace AzToolsFramework { - // default ray length for picking in the viewport - static const float EditorPickRayLength = 1000.0f; - AZ::Vector3 CalculateCenterOffset(const AZ::EntityId entityId, const EditorTransformComponentSelectionRequests::Pivot pivot) { if (Centered(pivot)) diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorSelectionUtil.h b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorSelectionUtil.h index d58549b329..5c9f47fdd3 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorSelectionUtil.h +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorSelectionUtil.h @@ -26,6 +26,9 @@ namespace AzFramework namespace AzToolsFramework { + //! Default ray length for picking in the viewport. + inline constexpr float EditorPickRayLength = 1000.0f; + //! Is the pivot at the center of the object (middle of extents) or at the //! exported authored object root position. inline bool Centered(const EditorTransformComponentSelectionRequests::Pivot pivot) From ca6b7d1d1f6659f5711677482f688ac35c95bf8e Mon Sep 17 00:00:00 2001 From: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com> Date: Thu, 18 Nov 2021 13:09:06 +0000 Subject: [PATCH 108/345] Add test for ViewportInteractionImpl use of ViewportInteractionRequestBus (#5741) Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com> --- .../Tests/ViewportInteractionImplTests.cpp | 37 +++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/Gems/Atom/Tools/AtomToolsFramework/Code/Tests/ViewportInteractionImplTests.cpp b/Gems/Atom/Tools/AtomToolsFramework/Code/Tests/ViewportInteractionImplTests.cpp index fa5bc5b6e5..2dfe4f7c29 100644 --- a/Gems/Atom/Tools/AtomToolsFramework/Code/Tests/ViewportInteractionImplTests.cpp +++ b/Gems/Atom/Tools/AtomToolsFramework/Code/Tests/ViewportInteractionImplTests.cpp @@ -7,12 +7,14 @@ */ #include +#include #include #include #include #include #include #include +#include #include #include #include @@ -169,4 +171,39 @@ namespace UnitTest EXPECT_EQ(intersection, AZ::Intersect::SphereIsectTypes::ISECT_RAY_SPHERE_ISECT); } + + TEST_F(ViewportInteractionImplFixture, ViewportInteractionRequestsReturnsNewViewWhenItIsChanged) + { + // Given + const auto primaryViewTransform = AZ::Matrix3x4::CreateFromMatrix3x3AndTranslation( + AZ::Matrix3x3::CreateRotationZ(AZ::DegToRad(90.0f)) * AZ::Matrix3x3::CreateRotationX(AZ::DegToRad(-45.0f)), + AZ::Vector3(-10.0f, -15.0f, 20.0f)); + + m_view->SetCameraTransform(primaryViewTransform); + + AZ::RPI::ViewPtr secondaryView = AZ::RPI::View::CreateView(AZ::Name("SecondaryView"), AZ::RPI::View::UsageCamera); + + const auto secondaryViewTransform = AZ::Matrix3x4::CreateFromMatrix3x3AndTranslation( + AZ::Matrix3x3::CreateRotationZ(AZ::DegToRad(-90.0f)) * AZ::Matrix3x3::CreateRotationX(AZ::DegToRad(30.0f)), + AZ::Vector3(-50.0f, -25.0f, 10.0f)); + + secondaryView->SetCameraTransform(secondaryViewTransform); + + // When + AZ::RPI::ViewportContextIdNotificationBus::Event( + TestViewportId, &AZ::RPI::ViewportContextIdNotificationBus::Events::OnViewportDefaultViewChanged, secondaryView); + + // retrieve updated camera transform + AzFramework::CameraState cameraState; + AzToolsFramework::ViewportInteraction::ViewportInteractionRequestBus::EventResult( + cameraState, TestViewportId, &AzToolsFramework::ViewportInteraction::ViewportInteractionRequestBus::Events::GetCameraState); + + const auto cameraMatrix = AzFramework::CameraTransform(cameraState); + const auto cameraTransform = AZ::Matrix3x4::CreateFromMatrix3x3AndTranslation( + AZ::Matrix3x3::CreateFromMatrix4x4(cameraMatrix), cameraMatrix.GetTranslation()); + + // Then + // camera transform matches that of the secondary view + EXPECT_THAT(cameraTransform, IsClose(secondaryViewTransform)); + } } // namespace UnitTest From d05d304fe8a88a5b13ee36c1f8d79aa63c5f95f1 Mon Sep 17 00:00:00 2001 From: greerdv Date: Thu, 18 Nov 2021 13:49:18 +0000 Subject: [PATCH 109/345] highlight the button corresponding to the currently selected collider component mode Signed-off-by: greerdv --- .../Code/Editor/ColliderComponentMode.cpp | 73 +++++++++++++------ .../PhysX/Code/Editor/ColliderComponentMode.h | 11 ++- .../Code/Editor/ColliderComponentModeBus.h | 2 +- 3 files changed, 57 insertions(+), 29 deletions(-) diff --git a/Gems/PhysX/Code/Editor/ColliderComponentMode.cpp b/Gems/PhysX/Code/Editor/ColliderComponentMode.cpp index d6bafb8143..fbb8838bb8 100644 --- a/Gems/PhysX/Code/Editor/ColliderComponentMode.cpp +++ b/Gems/PhysX/Code/Editor/ColliderComponentMode.cpp @@ -39,19 +39,17 @@ namespace PhysX : AzToolsFramework::ComponentModeFramework::EditorBaseComponentMode(entityComponentIdPair, componentType) { CreateSubModes(); + CreateSubModeSelectionCluster(); ColliderComponentModeRequestBus::Handler::BusConnect(entityComponentIdPair); ColliderComponentModeUiRequestBus::Handler::BusConnect(entityComponentIdPair); - - CreateSubModeSelectionCluster(); } ColliderComponentMode::~ColliderComponentMode() { - RemoveSubModeSelectionCluster(); - ColliderComponentModeUiRequestBus::Handler::BusDisconnect(); ColliderComponentModeRequestBus::Handler::BusDisconnect(); + RemoveSubModeSelectionCluster(); m_subModes[m_subMode]->Teardown(GetEntityComponentIdPair()); } @@ -141,7 +139,7 @@ namespace PhysX if (mouseInteraction.m_mouseEvent == AzToolsFramework::ViewportInteraction::MouseEvent::Wheel && mouseInteraction.m_mouseInteraction.m_keyboardModifiers.Ctrl()) { - int direction = MouseWheelDelta(mouseInteraction) > 0.0f ? 1 : -1; + int direction = MouseWheelDelta(mouseInteraction) > 0.0f ? -1 : 1; AZ::u32 currentModeIndex = static_cast(m_subMode); AZ::u32 numSubModes = static_cast(SubMode::NumModes); AZ::u32 nextModeIndex = (currentModeIndex + numSubModes + direction) % m_subModes.size(); @@ -159,10 +157,30 @@ namespace PhysX void ColliderComponentMode::SetCurrentMode(SubMode newMode) { - AZ_Assert(m_subModes.count(newMode) > 0, "Submode not found:%d", newMode); - m_subModes[m_subMode]->Teardown(GetEntityComponentIdPair()); - m_subMode = newMode; - m_subModes[m_subMode]->Setup(GetEntityComponentIdPair()); + if (auto subMode = m_subModes.find(newMode); + subMode != m_subModes.end()) + { + m_subModes[m_subMode]->Teardown(GetEntityComponentIdPair()); + m_subMode = newMode; + m_subModes[m_subMode]->Setup(GetEntityComponentIdPair()); + + const auto modeIndex = static_cast(newMode); + if (modeIndex < m_buttonIds.size()) + { + AzToolsFramework::ViewportUi::ViewportUiRequestBus::Event( + AzToolsFramework::ViewportUi::DefaultViewportId, + &AzToolsFramework::ViewportUi::ViewportUiRequestBus::Events::SetClusterActiveButton, m_modeSelectionClusterId, + m_buttonIds[modeIndex]); + } + else + { + AZ_Error("PhysX Collider Component Mode", false, "Invalid mode index %i.", modeIndex); + } + } + else + { + AZ_Assert(false, "Submode not found:%d", newMode); + } } AzToolsFramework::ViewportUi::ClusterId ColliderComponentMode::GetClusterId() const @@ -172,17 +190,22 @@ namespace PhysX AzToolsFramework::ViewportUi::ButtonId ColliderComponentMode::GetOffsetButtonId() const { - return m_offsetModeButtonId; + return m_buttonIds[static_cast(SubMode::Offset)]; } AzToolsFramework::ViewportUi::ButtonId ColliderComponentMode::GetRotationButtonId() const { - return m_rotationModeButtonId; + return m_buttonIds[static_cast(SubMode::Rotation)]; } AzToolsFramework::ViewportUi::ButtonId ColliderComponentMode::GetDimensionsButtonId() const { - return m_dimensionsModeButtonId; + return m_buttonIds[static_cast(SubMode::Dimensions)]; + } + + AZStd::string ColliderComponentMode::GetComponentModeName() const + { + return "Collider Edit Mode"; } void RefreshUI() @@ -237,25 +260,31 @@ namespace PhysX &AzToolsFramework::ViewportUi::ViewportUiRequestBus::Events::CreateCluster, AzToolsFramework::ViewportUi::Alignment::TopLeft); // create and register the buttons - m_offsetModeButtonId = RegisterClusterButton(m_modeSelectionClusterId, "Move"); - m_rotationModeButtonId = RegisterClusterButton(m_modeSelectionClusterId, "Rotate"); - m_dimensionsModeButtonId = RegisterClusterButton(m_modeSelectionClusterId, "Scale"); + m_buttonIds.resize(static_cast(SubMode::NumModes)); + m_buttonIds[static_cast(SubMode::Offset)] = RegisterClusterButton(m_modeSelectionClusterId, "Move"); + m_buttonIds[static_cast(SubMode::Rotation)] = RegisterClusterButton(m_modeSelectionClusterId, "Rotate"); + m_buttonIds[static_cast(SubMode::Dimensions)] = RegisterClusterButton(m_modeSelectionClusterId, "Scale"); + + AzToolsFramework::ViewportUi::ViewportUiRequestBus::Event( + AzToolsFramework::ViewportUi::DefaultViewportId, + &AzToolsFramework::ViewportUi::ViewportUiRequestBus::Events::SetClusterActiveButton, m_modeSelectionClusterId, + m_buttonIds[static_cast(SubMode::Dimensions)]); const auto onButtonClicked = [this](AzToolsFramework::ViewportUi::ButtonId buttonId) { - if (buttonId == m_dimensionsModeButtonId) - { - SetCurrentMode(SubMode::Dimensions); - } - else if (buttonId == m_offsetModeButtonId) + if (buttonId == m_buttonIds[static_cast(SubMode::Offset)]) { SetCurrentMode(SubMode::Offset); } - else if (buttonId == m_rotationModeButtonId) + else if (buttonId == m_buttonIds[static_cast(SubMode::Rotation)]) { SetCurrentMode(SubMode::Rotation); } + else if (buttonId == m_buttonIds[static_cast(SubMode::Dimensions)]) + { + SetCurrentMode(SubMode::Dimensions); + } }; - + m_modeSelectionHandler = AZ::Event::Handler(onButtonClicked); AzToolsFramework::ViewportUi::ViewportUiRequestBus::Event( AzToolsFramework::ViewportUi::DefaultViewportId, diff --git a/Gems/PhysX/Code/Editor/ColliderComponentMode.h b/Gems/PhysX/Code/Editor/ColliderComponentMode.h index b4ca060065..bc8e7d9a0b 100644 --- a/Gems/PhysX/Code/Editor/ColliderComponentMode.h +++ b/Gems/PhysX/Code/Editor/ColliderComponentMode.h @@ -46,6 +46,8 @@ namespace PhysX AzToolsFramework::ViewportUi::ClusterId GetClusterId() const override; AzToolsFramework::ViewportUi::ButtonId GetDimensionsButtonId() const override; + // ComponentMode ... + AZStd::string GetComponentModeName() const override; private: // AzToolsFramework::ViewportInteraction::ViewportSelectionRequests ... @@ -63,12 +65,9 @@ namespace PhysX AzToolsFramework::ViewportUi::ClusterId m_modeSelectionClusterId; //!< Viewport UI cluster for changing sub mode. - AzToolsFramework::ViewportUi::ButtonId - m_dimensionsModeButtonId; //!< Id of the Viewport UI button for resize/dimensions mode. - AzToolsFramework::ViewportUi::ButtonId - m_offsetModeButtonId; //!< Id of the Viewport UI button for offset mode. - AzToolsFramework::ViewportUi::ButtonId - m_rotationModeButtonId; //!< Id of the Viewport UI button for rotation mode. + + AZStd::vector m_buttonIds; //!< Ids for the Viewport UI buttons for each mode. + AZ::Event::Handler m_modeSelectionHandler; //!< Event handler for sub mode changes. }; diff --git a/Gems/PhysX/Code/Editor/ColliderComponentModeBus.h b/Gems/PhysX/Code/Editor/ColliderComponentModeBus.h index 289215067a..05072f699a 100644 --- a/Gems/PhysX/Code/Editor/ColliderComponentModeBus.h +++ b/Gems/PhysX/Code/Editor/ColliderComponentModeBus.h @@ -19,9 +19,9 @@ namespace PhysX public: enum class SubMode : AZ::u32 { - Dimensions, Offset, Rotation, + Dimensions, NumModes }; From 69efe7cf2663033accf5c4b928b84409301d743e Mon Sep 17 00:00:00 2001 From: Olex Lozitskiy <5432499+AMZN-Olex@users.noreply.github.com> Date: Thu, 18 Nov 2021 09:26:42 -0500 Subject: [PATCH 110/345] Addressing PR Signed-off-by: Olex Lozitskiy <5432499+AMZN-Olex@users.noreply.github.com> --- Gems/Multiplayer/Code/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gems/Multiplayer/Code/CMakeLists.txt b/Gems/Multiplayer/Code/CMakeLists.txt index 95eafa73cc..316734f777 100644 --- a/Gems/Multiplayer/Code/CMakeLists.txt +++ b/Gems/Multiplayer/Code/CMakeLists.txt @@ -117,7 +117,7 @@ if (PAL_TRAIT_BUILD_HOST_TOOLS) ly_create_alias(NAME Multiplayer.Builders NAMESPACE Gem TARGETS Gem::Multiplayer.Editor) # use the Multiplayer.Editor module in tools like the Editor: Such tools also get the visual debug view: - ly_create_alias(NAME Multiplayer.Tools NAMESPACE Gem TARGETS Gem::Multiplayer.Editor Gem::Multiplayer.Debug Gem::Multiplayer.Builders) + ly_create_alias(NAME Multiplayer.Tools NAMESPACE Gem TARGETS Gem::Multiplayer.Debug Gem::Multiplayer.Builders) endif() if (PAL_TRAIT_BUILD_TESTS_SUPPORTED) From f18f5318c0559c1a899fcf04f219bea387f454f4 Mon Sep 17 00:00:00 2001 From: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com> Date: Thu, 18 Nov 2021 15:34:30 +0000 Subject: [PATCH 111/345] Fix for gizmo axis text not displaying correctly on high dpi screens (#5745) Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com> --- .../Code/Source/AtomDebugDisplayViewportInterface.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Gems/AtomLyIntegration/AtomBridge/Code/Source/AtomDebugDisplayViewportInterface.cpp b/Gems/AtomLyIntegration/AtomBridge/Code/Source/AtomDebugDisplayViewportInterface.cpp index 12e4ccd8ad..e2d99dbbef 100644 --- a/Gems/AtomLyIntegration/AtomBridge/Code/Source/AtomDebugDisplayViewportInterface.cpp +++ b/Gems/AtomLyIntegration/AtomBridge/Code/Source/AtomDebugDisplayViewportInterface.cpp @@ -1353,9 +1353,8 @@ namespace AZ::AtomBridge // if 2d draw need to project pos to screen first AzFramework::TextDrawParameters params; AZ::RPI::ViewportContextPtr viewportContext = GetViewportContext(); - const auto dpiScaleFactor = viewportContext->GetDpiScalingFactor(); params.m_drawViewportId = viewportContext->GetId(); // get the viewport ID so default viewport works - params.m_position = AZ::Vector3(x * dpiScaleFactor, y * dpiScaleFactor, 1.0f); + params.m_position = AZ::Vector3(x, y, 1.0f); params.m_color = m_rendState.m_color; params.m_scale = AZ::Vector2(size); params.m_hAlign = center ? AzFramework::TextHorizontalAlignment::Center : AzFramework::TextHorizontalAlignment::Left; //! Horizontal text alignment From a54a149877ee2054b315e9b9276dfec255713f62 Mon Sep 17 00:00:00 2001 From: John Jones-Steele <82226755+jjjoness@users.noreply.github.com> Date: Thu, 18 Nov 2021 16:06:54 +0000 Subject: [PATCH 112/345] Changes from comments made after merge (#5738) Signed-off-by: John Jones-Steele <82226755+jjjoness@users.noreply.github.com> --- .../Terrain/EditorScripts/Terrain_SupportsPhysics.py | 10 +++++----- .../Gem/PythonTests/Terrain/TestSuite_Main.py | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/AutomatedTesting/Gem/PythonTests/Terrain/EditorScripts/Terrain_SupportsPhysics.py b/AutomatedTesting/Gem/PythonTests/Terrain/EditorScripts/Terrain_SupportsPhysics.py index 8ecafb8600..e68b0932c2 100644 --- a/AutomatedTesting/Gem/PythonTests/Terrain/EditorScripts/Terrain_SupportsPhysics.py +++ b/AutomatedTesting/Gem/PythonTests/Terrain/EditorScripts/Terrain_SupportsPhysics.py @@ -31,7 +31,7 @@ def Terrain_SupportsPhysics(): Test Steps: 1) Load the base level 2) Create 2 test entities, one parent at 512.0, 512.0, 50.0 and one child at the default position and add the required components - 2a) Create a ball at 600.0, 600.0, 46.0 - This position is bot too high over the heighfield so will collide in a reasonable time + 2a) Create a ball at 600.0, 600.0, 46.0 - This position is not too high over the heightfield so will collide in a reasonable time 3) Start the Tracer to catch any errors and warnings 4) Change the Axis Aligned Box Shape dimensions 5) Set the Vegetation Shape reference to TestEntity1 @@ -80,7 +80,7 @@ def Terrain_SupportsPhysics(): height_provider_entity = hydra.Entity("TestEntity2") height_provider_entity.create_entity(azmath.Vector3(0.0, 0.0, 0.0), entity2_components_to_add,terrain_spawner_entity.id) Report.result(Tests.create_height_provider_entity, height_provider_entity.id.IsValid()) - # 2a) Create a ball at 600.0, 600.0, 46.0 - This position is bot too high over the heighfield so will collide in a reasonable time + # 2a) Create a ball at 600.0, 600.0, 46.0 - This position is not too high over the heightfield so will collide in a reasonable time ball = hydra.Entity("Ball") ball.create_entity(azmath.Vector3(600.0, 600.0, 46.0), ball_components_to_add) Report.result(Tests.create_test_ball, ball.id.IsValid()) @@ -107,9 +107,9 @@ def Terrain_SupportsPhysics(): Report.result(Tests.frequency_changed, math.isclose(Frequency, FrequencyVal, abs_tol = 0.00001)) # 7) Set the Gradient List to TestEntity2 - pte = hydra.get_property_tree(terrain_spawner_entity.components[2]) - pte.add_container_item("Configuration|Gradient Entities", 0, height_provider_entity.id) - checkID = pte.get_container_item("Configuration|Gradient Entities", 0) + propertyTree = hydra.get_property_tree(terrain_spawner_entity.components[2]) + propertyTree.add_container_item("Configuration|Gradient Entities", 0, height_provider_entity.id) + checkID = propertyTree.get_container_item("Configuration|Gradient Entities", 0) Report.result(Tests.entity_added, checkID.GetValue() == height_provider_entity.id) # 8) Set the PhysX Collider to Sphere mode diff --git a/AutomatedTesting/Gem/PythonTests/Terrain/TestSuite_Main.py b/AutomatedTesting/Gem/PythonTests/Terrain/TestSuite_Main.py index 8942065472..c5eec74c08 100644 --- a/AutomatedTesting/Gem/PythonTests/Terrain/TestSuite_Main.py +++ b/AutomatedTesting/Gem/PythonTests/Terrain/TestSuite_Main.py @@ -13,15 +13,15 @@ import os import sys from ly_test_tools import LAUNCHERS -from ly_test_tools.o3de.editor_test import EditorTestSuite, EditorSingleTest +from ly_test_tools.o3de.editor_test import EditorTestSuite, EditorSharedTest @pytest.mark.SUITE_main @pytest.mark.parametrize("launcher_platform", ['windows_editor']) @pytest.mark.parametrize("project", ["AutomatedTesting"]) class TestAutomation(EditorTestSuite): - class test_AxisAlignedBoxShape_ConfigurationWorks(EditorSingleTest): + class test_AxisAlignedBoxShape_ConfigurationWorks(EditorSharedTest): from .EditorScripts import TerrainPhysicsCollider_ChangesSizeWithAxisAlignedBoxShapeChanges as test_module - class test_Terrain_SupportsPhysics(EditorSingleTest): + class test_Terrain_SupportsPhysics(EditorSharedTest): from .EditorScripts import Terrain_SupportsPhysics as test_module From 686fc7c54f2e1a7db6d957c766d5a10a00bf7b46 Mon Sep 17 00:00:00 2001 From: lsemp3d <58790905+lsemp3d@users.noreply.github.com> Date: Thu, 18 Nov 2021 08:37:41 -0800 Subject: [PATCH 113/345] Renamed RequestTaggedEntities to 'Get Entity by Tag' Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com> --- Gems/LmbrCentral/Code/Source/Scripting/TagComponent.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gems/LmbrCentral/Code/Source/Scripting/TagComponent.cpp b/Gems/LmbrCentral/Code/Source/Scripting/TagComponent.cpp index f2701473f3..7eb3c62b5d 100644 --- a/Gems/LmbrCentral/Code/Source/Scripting/TagComponent.cpp +++ b/Gems/LmbrCentral/Code/Source/Scripting/TagComponent.cpp @@ -92,7 +92,7 @@ namespace LmbrCentral ; behaviorContext->EBus("TagGlobalRequestBus") - ->Event("RequestTaggedEntities", &TagGlobalRequestBus::Events::RequestTaggedEntities) + ->Event("Get Entity By Tag", &TagGlobalRequestBus::Events::RequestTaggedEntities, "RequestTaggedEntities") ; behaviorContext->EBus("TagComponentNotificationsBus") From 44d693a4448422548d7c15e54a3827242f0bd20f Mon Sep 17 00:00:00 2001 From: moudgils <47460854+moudgils@users.noreply.github.com> Date: Thu, 18 Nov 2021 09:11:58 -0800 Subject: [PATCH 114/345] Fix DOF flickering on Vk due to missing LDS sync (#5723) (#5732) * Fix DOF flickering on Vk due to missing LDS sync Signed-off-by: moudgils * Added another sync Signed-off-by: moudgils --- .../Shaders/PostProcessing/NewDepthOfFieldTileReduce.azsl | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Gems/Atom/Feature/Common/Assets/Shaders/PostProcessing/NewDepthOfFieldTileReduce.azsl b/Gems/Atom/Feature/Common/Assets/Shaders/PostProcessing/NewDepthOfFieldTileReduce.azsl index 6d55648f22..db91c369ef 100644 --- a/Gems/Atom/Feature/Common/Assets/Shaders/PostProcessing/NewDepthOfFieldTileReduce.azsl +++ b/Gems/Atom/Feature/Common/Assets/Shaders/PostProcessing/NewDepthOfFieldTileReduce.azsl @@ -48,6 +48,9 @@ void MainCS(uint3 group_thread_id : SV_GroupThreadID, uint3 group_id : SV_GroupI LDS_MAX_COC[group_thread_id.x] = 0; } + // Sync LDS + GroupMemoryBarrierWithGroupSync(); + // We use gather to get 2x2 values at once, so thread samples are spaced 2 pixels apart (+1 so the sample position is in between the four pixels) float2 samplePos = float2(dispatch_id.xy) * 2 + float2(1, 1); float2 sampleUV = samplePos * PassSrg::m_inputDimensions.zw; @@ -74,6 +77,9 @@ void MainCS(uint3 group_thread_id : SV_GroupThreadID, uint3 group_id : SV_GroupI InterlockedMin( LDS_MIN_COC[0], LDS_MIN_COC[group_thread_id.x] ); InterlockedMax( LDS_MAX_COC[0], LDS_MAX_COC[group_thread_id.x] ); + // Sync LDS + GroupMemoryBarrierWithGroupSync(); + // Each group write to just one pixel. If we're the last thread in the group, write out if(group_thread_id.x == 0) { From 1b63ca3bc0924a143b2952cdf88cca0e8a57dc57 Mon Sep 17 00:00:00 2001 From: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com> Date: Thu, 18 Nov 2021 11:30:03 -0600 Subject: [PATCH 115/345] Terrain component icon updates. (#5722) * Terrain component icon updates. Refreshed using latest icons from UX. Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com> * Revised icons from UX. Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com> --- .../Icons/Components/AxisAlignedBoxShape.svg | 3 ++ .../Viewport/AxisAlignedBoxShape.svg | 16 +++++++ .../EditorAxisAlignedBoxShapeComponent.cpp | 4 +- .../Components/PhysXHeightfieldCollider.svg | 3 ++ .../Viewport/PhysXHeightfieldCollider.svg | 16 +++++++ .../EditorHeightfieldColliderComponent.cpp | 4 +- .../Editor/Icons/Components/TerrainHeight.svg | 12 ++--- .../Icons/Components/TerrainLayerSpawner.svg | 12 ++--- .../Icons/Components/TerrainMacroMaterial.svg | 3 ++ .../Components/TerrainPhysicsCollider.svg | 3 ++ .../Components/TerrainSurfaceGradientList.svg | 3 ++ .../Components/TerrainSurfaceMaterials.svg | 3 ++ .../Editor/Icons/Components/TerrainWorld.svg | 13 ++--- .../Icons/Components/TerrainWorldDebugger.svg | 13 ++--- .../Icons/Components/TerrainWorldRenderer.svg | 13 ++--- .../Components/Viewport/TerrainHeight.svg | 47 +++++++++---------- .../Viewport/TerrainLayerSpawner.svg | 47 +++++++++---------- .../Viewport/TerrainMacroMaterial.svg | 16 +++++++ .../Viewport/TerrainPhysicsCollider.svg | 16 +++++++ .../Viewport/TerrainSurfaceGradientList.svg | 16 +++++++ .../Viewport/TerrainSurfaceMaterials.svg | 21 +++++++++ .../Components/Viewport/TerrainWorld.svg | 47 +++++++++---------- .../Viewport/TerrainWorldDebugger.svg | 47 +++++++++---------- .../Viewport/TerrainWorldRenderer.svg | 47 +++++++++---------- .../EditorTerrainPhysicsColliderComponent.h | 4 +- ...ditorTerrainSurfaceGradientListComponent.h | 4 +- .../EditorTerrainMacroMaterialComponent.h | 4 +- ...itorTerrainSurfaceMaterialsListComponent.h | 4 +- 28 files changed, 266 insertions(+), 175 deletions(-) create mode 100644 Gems/LmbrCentral/Assets/Editor/Icons/Components/AxisAlignedBoxShape.svg create mode 100644 Gems/LmbrCentral/Assets/Editor/Icons/Components/Viewport/AxisAlignedBoxShape.svg create mode 100644 Gems/PhysX/Assets/Editor/Icons/Components/PhysXHeightfieldCollider.svg create mode 100644 Gems/PhysX/Assets/Editor/Icons/Components/Viewport/PhysXHeightfieldCollider.svg create mode 100644 Gems/Terrain/Assets/Editor/Icons/Components/TerrainMacroMaterial.svg create mode 100644 Gems/Terrain/Assets/Editor/Icons/Components/TerrainPhysicsCollider.svg create mode 100644 Gems/Terrain/Assets/Editor/Icons/Components/TerrainSurfaceGradientList.svg create mode 100644 Gems/Terrain/Assets/Editor/Icons/Components/TerrainSurfaceMaterials.svg create mode 100644 Gems/Terrain/Assets/Editor/Icons/Components/Viewport/TerrainMacroMaterial.svg create mode 100644 Gems/Terrain/Assets/Editor/Icons/Components/Viewport/TerrainPhysicsCollider.svg create mode 100644 Gems/Terrain/Assets/Editor/Icons/Components/Viewport/TerrainSurfaceGradientList.svg create mode 100644 Gems/Terrain/Assets/Editor/Icons/Components/Viewport/TerrainSurfaceMaterials.svg diff --git a/Gems/LmbrCentral/Assets/Editor/Icons/Components/AxisAlignedBoxShape.svg b/Gems/LmbrCentral/Assets/Editor/Icons/Components/AxisAlignedBoxShape.svg new file mode 100644 index 0000000000..0f3982d713 --- /dev/null +++ b/Gems/LmbrCentral/Assets/Editor/Icons/Components/AxisAlignedBoxShape.svg @@ -0,0 +1,3 @@ + + + diff --git a/Gems/LmbrCentral/Assets/Editor/Icons/Components/Viewport/AxisAlignedBoxShape.svg b/Gems/LmbrCentral/Assets/Editor/Icons/Components/Viewport/AxisAlignedBoxShape.svg new file mode 100644 index 0000000000..51f0be0572 --- /dev/null +++ b/Gems/LmbrCentral/Assets/Editor/Icons/Components/Viewport/AxisAlignedBoxShape.svg @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + diff --git a/Gems/LmbrCentral/Code/Source/Shape/EditorAxisAlignedBoxShapeComponent.cpp b/Gems/LmbrCentral/Code/Source/Shape/EditorAxisAlignedBoxShapeComponent.cpp index c833677b1d..f78f2f048d 100644 --- a/Gems/LmbrCentral/Code/Source/Shape/EditorAxisAlignedBoxShapeComponent.cpp +++ b/Gems/LmbrCentral/Code/Source/Shape/EditorAxisAlignedBoxShapeComponent.cpp @@ -36,8 +36,8 @@ namespace LmbrCentral "Axis Aligned Box Shape", "The Axis Aligned Box Shape component creates a box around the associated entity") ->ClassElement(AZ::Edit::ClassElements::EditorData, "") ->Attribute(AZ::Edit::Attributes::Category, "Shape") - ->Attribute(AZ::Edit::Attributes::Icon, "Icons/Components/Box_Shape.svg") - ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/Box_Shape.svg") + ->Attribute(AZ::Edit::Attributes::Icon, "Editor/Icons/Components/AxisAlignedBoxShape.svg") + ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Editor/Icons/Components/Viewport/AxisAlignedBoxShape.svg") ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC_CE("Game")) ->Attribute(AZ::Edit::Attributes::AutoExpand, true) ->Attribute(AZ::Edit::Attributes::HelpPageURL, "https://o3de.org/docs/user-guide/components/reference/shape/axis-aligned-box-shape/") diff --git a/Gems/PhysX/Assets/Editor/Icons/Components/PhysXHeightfieldCollider.svg b/Gems/PhysX/Assets/Editor/Icons/Components/PhysXHeightfieldCollider.svg new file mode 100644 index 0000000000..f616a26381 --- /dev/null +++ b/Gems/PhysX/Assets/Editor/Icons/Components/PhysXHeightfieldCollider.svg @@ -0,0 +1,3 @@ + + + diff --git a/Gems/PhysX/Assets/Editor/Icons/Components/Viewport/PhysXHeightfieldCollider.svg b/Gems/PhysX/Assets/Editor/Icons/Components/Viewport/PhysXHeightfieldCollider.svg new file mode 100644 index 0000000000..fbfed18e46 --- /dev/null +++ b/Gems/PhysX/Assets/Editor/Icons/Components/Viewport/PhysXHeightfieldCollider.svg @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + diff --git a/Gems/PhysX/Code/Source/EditorHeightfieldColliderComponent.cpp b/Gems/PhysX/Code/Source/EditorHeightfieldColliderComponent.cpp index 0f09258524..fb0a38fa18 100644 --- a/Gems/PhysX/Code/Source/EditorHeightfieldColliderComponent.cpp +++ b/Gems/PhysX/Code/Source/EditorHeightfieldColliderComponent.cpp @@ -34,8 +34,8 @@ namespace PhysX "PhysX Heightfield Collider", "Creates geometry in the PhysX simulation based on an attached heightfield component") ->ClassElement(AZ::Edit::ClassElements::EditorData, "") ->Attribute(AZ::Edit::Attributes::Category, "PhysX") - ->Attribute(AZ::Edit::Attributes::Icon, "Icons/Components/PhysXCollider.svg") - ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/PhysXCollider.svg") + ->Attribute(AZ::Edit::Attributes::Icon, "Editor/Icons/Components/PhysXHeightfieldCollider.svg") + ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Editor/Icons/Components/Viewport/PhysXHeightfieldCollider.svg") ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC_CE("Game")) ->Attribute( AZ::Edit::Attributes::HelpPageURL, "https://o3de.org/docs/user-guide/components/reference/physx/heightfield-collider/") diff --git a/Gems/Terrain/Assets/Editor/Icons/Components/TerrainHeight.svg b/Gems/Terrain/Assets/Editor/Icons/Components/TerrainHeight.svg index 57835e9c20..78af20cc2d 100644 --- a/Gems/Terrain/Assets/Editor/Icons/Components/TerrainHeight.svg +++ b/Gems/Terrain/Assets/Editor/Icons/Components/TerrainHeight.svg @@ -1,7 +1,5 @@ - - - icon / Environmental / Terrain Height - - - - \ No newline at end of file + + + + + diff --git a/Gems/Terrain/Assets/Editor/Icons/Components/TerrainLayerSpawner.svg b/Gems/Terrain/Assets/Editor/Icons/Components/TerrainLayerSpawner.svg index df73d78276..ad7403d976 100644 --- a/Gems/Terrain/Assets/Editor/Icons/Components/TerrainLayerSpawner.svg +++ b/Gems/Terrain/Assets/Editor/Icons/Components/TerrainLayerSpawner.svg @@ -1,7 +1,5 @@ - - - icon / Environmental / Generate Terrian - - - - \ No newline at end of file + + + + + diff --git a/Gems/Terrain/Assets/Editor/Icons/Components/TerrainMacroMaterial.svg b/Gems/Terrain/Assets/Editor/Icons/Components/TerrainMacroMaterial.svg new file mode 100644 index 0000000000..9a694bfbf7 --- /dev/null +++ b/Gems/Terrain/Assets/Editor/Icons/Components/TerrainMacroMaterial.svg @@ -0,0 +1,3 @@ + + + diff --git a/Gems/Terrain/Assets/Editor/Icons/Components/TerrainPhysicsCollider.svg b/Gems/Terrain/Assets/Editor/Icons/Components/TerrainPhysicsCollider.svg new file mode 100644 index 0000000000..56ffb05464 --- /dev/null +++ b/Gems/Terrain/Assets/Editor/Icons/Components/TerrainPhysicsCollider.svg @@ -0,0 +1,3 @@ + + + diff --git a/Gems/Terrain/Assets/Editor/Icons/Components/TerrainSurfaceGradientList.svg b/Gems/Terrain/Assets/Editor/Icons/Components/TerrainSurfaceGradientList.svg new file mode 100644 index 0000000000..c4e8ce79d2 --- /dev/null +++ b/Gems/Terrain/Assets/Editor/Icons/Components/TerrainSurfaceGradientList.svg @@ -0,0 +1,3 @@ + + + diff --git a/Gems/Terrain/Assets/Editor/Icons/Components/TerrainSurfaceMaterials.svg b/Gems/Terrain/Assets/Editor/Icons/Components/TerrainSurfaceMaterials.svg new file mode 100644 index 0000000000..5a25cb3be9 --- /dev/null +++ b/Gems/Terrain/Assets/Editor/Icons/Components/TerrainSurfaceMaterials.svg @@ -0,0 +1,3 @@ + + + diff --git a/Gems/Terrain/Assets/Editor/Icons/Components/TerrainWorld.svg b/Gems/Terrain/Assets/Editor/Icons/Components/TerrainWorld.svg index c6388d6215..f3c17f66e4 100644 --- a/Gems/Terrain/Assets/Editor/Icons/Components/TerrainWorld.svg +++ b/Gems/Terrain/Assets/Editor/Icons/Components/TerrainWorld.svg @@ -1,8 +1,5 @@ - - - icon / Environmental / Terrain Refactor - - - - - \ No newline at end of file + + + + + diff --git a/Gems/Terrain/Assets/Editor/Icons/Components/TerrainWorldDebugger.svg b/Gems/Terrain/Assets/Editor/Icons/Components/TerrainWorldDebugger.svg index bd1512afda..b128d0f316 100644 --- a/Gems/Terrain/Assets/Editor/Icons/Components/TerrainWorldDebugger.svg +++ b/Gems/Terrain/Assets/Editor/Icons/Components/TerrainWorldDebugger.svg @@ -1,8 +1,5 @@ - - - icon / Environmental / Terrain World Debugger - - - - - \ No newline at end of file + + + + + diff --git a/Gems/Terrain/Assets/Editor/Icons/Components/TerrainWorldRenderer.svg b/Gems/Terrain/Assets/Editor/Icons/Components/TerrainWorldRenderer.svg index ab3716ad5d..de97c005fc 100644 --- a/Gems/Terrain/Assets/Editor/Icons/Components/TerrainWorldRenderer.svg +++ b/Gems/Terrain/Assets/Editor/Icons/Components/TerrainWorldRenderer.svg @@ -1,8 +1,5 @@ - - - icon / Environmental / Terrain World Renderer - - - - - \ No newline at end of file + + + + + diff --git a/Gems/Terrain/Assets/Editor/Icons/Components/Viewport/TerrainHeight.svg b/Gems/Terrain/Assets/Editor/Icons/Components/Viewport/TerrainHeight.svg index b87a0b4d7e..87a2d199bd 100644 --- a/Gems/Terrain/Assets/Editor/Icons/Components/Viewport/TerrainHeight.svg +++ b/Gems/Terrain/Assets/Editor/Icons/Components/Viewport/TerrainHeight.svg @@ -1,25 +1,22 @@ - - - icon / Environmental / Terrain Height - box - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + diff --git a/Gems/Terrain/Assets/Editor/Icons/Components/Viewport/TerrainLayerSpawner.svg b/Gems/Terrain/Assets/Editor/Icons/Components/Viewport/TerrainLayerSpawner.svg index c078d32fe5..a89186819f 100644 --- a/Gems/Terrain/Assets/Editor/Icons/Components/Viewport/TerrainLayerSpawner.svg +++ b/Gems/Terrain/Assets/Editor/Icons/Components/Viewport/TerrainLayerSpawner.svg @@ -1,25 +1,22 @@ - - - icon / Environmental / Generate Terrian - box - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + diff --git a/Gems/Terrain/Assets/Editor/Icons/Components/Viewport/TerrainMacroMaterial.svg b/Gems/Terrain/Assets/Editor/Icons/Components/Viewport/TerrainMacroMaterial.svg new file mode 100644 index 0000000000..177469e46e --- /dev/null +++ b/Gems/Terrain/Assets/Editor/Icons/Components/Viewport/TerrainMacroMaterial.svg @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + diff --git a/Gems/Terrain/Assets/Editor/Icons/Components/Viewport/TerrainPhysicsCollider.svg b/Gems/Terrain/Assets/Editor/Icons/Components/Viewport/TerrainPhysicsCollider.svg new file mode 100644 index 0000000000..302e585f6e --- /dev/null +++ b/Gems/Terrain/Assets/Editor/Icons/Components/Viewport/TerrainPhysicsCollider.svg @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + diff --git a/Gems/Terrain/Assets/Editor/Icons/Components/Viewport/TerrainSurfaceGradientList.svg b/Gems/Terrain/Assets/Editor/Icons/Components/Viewport/TerrainSurfaceGradientList.svg new file mode 100644 index 0000000000..19cb144936 --- /dev/null +++ b/Gems/Terrain/Assets/Editor/Icons/Components/Viewport/TerrainSurfaceGradientList.svg @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + diff --git a/Gems/Terrain/Assets/Editor/Icons/Components/Viewport/TerrainSurfaceMaterials.svg b/Gems/Terrain/Assets/Editor/Icons/Components/Viewport/TerrainSurfaceMaterials.svg new file mode 100644 index 0000000000..5179f61867 --- /dev/null +++ b/Gems/Terrain/Assets/Editor/Icons/Components/Viewport/TerrainSurfaceMaterials.svg @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/Gems/Terrain/Assets/Editor/Icons/Components/Viewport/TerrainWorld.svg b/Gems/Terrain/Assets/Editor/Icons/Components/Viewport/TerrainWorld.svg index 2aee65f2a8..5466395141 100644 --- a/Gems/Terrain/Assets/Editor/Icons/Components/Viewport/TerrainWorld.svg +++ b/Gems/Terrain/Assets/Editor/Icons/Components/Viewport/TerrainWorld.svg @@ -1,25 +1,22 @@ - - - icon / Environmental / Terrain Refactor - box - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + diff --git a/Gems/Terrain/Assets/Editor/Icons/Components/Viewport/TerrainWorldDebugger.svg b/Gems/Terrain/Assets/Editor/Icons/Components/Viewport/TerrainWorldDebugger.svg index 1b729ab73f..ea9935fefb 100644 --- a/Gems/Terrain/Assets/Editor/Icons/Components/Viewport/TerrainWorldDebugger.svg +++ b/Gems/Terrain/Assets/Editor/Icons/Components/Viewport/TerrainWorldDebugger.svg @@ -1,25 +1,22 @@ - - - icon / Environmental / Terrain World Debugger - box - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + diff --git a/Gems/Terrain/Assets/Editor/Icons/Components/Viewport/TerrainWorldRenderer.svg b/Gems/Terrain/Assets/Editor/Icons/Components/Viewport/TerrainWorldRenderer.svg index 4287508f10..af235047db 100644 --- a/Gems/Terrain/Assets/Editor/Icons/Components/Viewport/TerrainWorldRenderer.svg +++ b/Gems/Terrain/Assets/Editor/Icons/Components/Viewport/TerrainWorldRenderer.svg @@ -1,25 +1,22 @@ - - - icon / Environmental / Terrain World Renderer - box - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + diff --git a/Gems/Terrain/Code/Source/EditorComponents/EditorTerrainPhysicsColliderComponent.h b/Gems/Terrain/Code/Source/EditorComponents/EditorTerrainPhysicsColliderComponent.h index d2254161a0..924426c262 100644 --- a/Gems/Terrain/Code/Source/EditorComponents/EditorTerrainPhysicsColliderComponent.h +++ b/Gems/Terrain/Code/Source/EditorComponents/EditorTerrainPhysicsColliderComponent.h @@ -25,8 +25,8 @@ namespace Terrain static constexpr auto s_categoryName = "Terrain"; static constexpr auto s_componentName = "Terrain Physics Heightfield Collider"; static constexpr auto s_componentDescription = "Provides terrain data to a physics collider in the form of a heightfield and surface->material mapping."; - static constexpr auto s_icon = "Editor/Icons/Components/TerrainLayerSpawner.svg"; - static constexpr auto s_viewportIcon = "Editor/Icons/Components/Viewport/TerrainLayerSpawner.svg"; + static constexpr auto s_icon = "Editor/Icons/Components/TerrainPhysicsCollider.svg"; + static constexpr auto s_viewportIcon = "Editor/Icons/Components/Viewport/TerrainPhysicsCollider.svg"; static constexpr auto s_helpUrl = ""; }; } diff --git a/Gems/Terrain/Code/Source/EditorComponents/EditorTerrainSurfaceGradientListComponent.h b/Gems/Terrain/Code/Source/EditorComponents/EditorTerrainSurfaceGradientListComponent.h index e2c5f1b280..3cf9e7fc47 100644 --- a/Gems/Terrain/Code/Source/EditorComponents/EditorTerrainSurfaceGradientListComponent.h +++ b/Gems/Terrain/Code/Source/EditorComponents/EditorTerrainSurfaceGradientListComponent.h @@ -25,8 +25,8 @@ namespace Terrain static constexpr const char* const s_categoryName = "Terrain"; static constexpr const char* const s_componentName = "Terrain Surface Gradient List"; static constexpr const char* const s_componentDescription = "Provides a mapping between gradients and surface tags for use by the terrain system."; - static constexpr const char* const s_icon = "Editor/Icons/Components/TerrainLayerSpawner.svg"; - static constexpr const char* const s_viewportIcon = "Editor/Icons/Components/Viewport/TerrainLayerSpawner.svg"; + static constexpr const char* const s_icon = "Editor/Icons/Components/TerrainSurfaceGradientList.svg"; + static constexpr const char* const s_viewportIcon = "Editor/Icons/Components/Viewport/TerrainSurfaceGradientList.svg"; static constexpr const char* const s_helpUrl = ""; }; } diff --git a/Gems/Terrain/Code/Source/TerrainRenderer/EditorComponents/EditorTerrainMacroMaterialComponent.h b/Gems/Terrain/Code/Source/TerrainRenderer/EditorComponents/EditorTerrainMacroMaterialComponent.h index a2fddf5768..67897b7dec 100644 --- a/Gems/Terrain/Code/Source/TerrainRenderer/EditorComponents/EditorTerrainMacroMaterialComponent.h +++ b/Gems/Terrain/Code/Source/TerrainRenderer/EditorComponents/EditorTerrainMacroMaterialComponent.h @@ -25,8 +25,8 @@ namespace Terrain static constexpr const char* const s_categoryName = "Terrain"; static constexpr const char* const s_componentName = "Terrain Macro Material"; static constexpr const char* const s_componentDescription = "Provides a macro material for a region to the terrain renderer"; - static constexpr const char* const s_icon = "Editor/Icons/Components/TerrainLayerRenderer.svg"; - static constexpr const char* const s_viewportIcon = "Editor/Icons/Components/Viewport/TerrainLayerRenderer.svg"; + static constexpr const char* const s_icon = "Editor/Icons/Components/TerrainMacroMaterial.svg"; + static constexpr const char* const s_viewportIcon = "Editor/Icons/Components/Viewport/TerrainMacroMaterial.svg"; static constexpr const char* const s_helpUrl = ""; }; } diff --git a/Gems/Terrain/Code/Source/TerrainRenderer/EditorComponents/EditorTerrainSurfaceMaterialsListComponent.h b/Gems/Terrain/Code/Source/TerrainRenderer/EditorComponents/EditorTerrainSurfaceMaterialsListComponent.h index f0d03a6082..7fe8c82522 100644 --- a/Gems/Terrain/Code/Source/TerrainRenderer/EditorComponents/EditorTerrainSurfaceMaterialsListComponent.h +++ b/Gems/Terrain/Code/Source/TerrainRenderer/EditorComponents/EditorTerrainSurfaceMaterialsListComponent.h @@ -25,8 +25,8 @@ namespace Terrain static constexpr const char* const s_categoryName = "Terrain"; static constexpr const char* const s_componentName = "Terrain Surface Materials List"; static constexpr const char* const s_componentDescription = "Provides a mapping between surface tags and render materials."; - static constexpr const char* const s_icon = "Editor/Icons/Components/TerrainHeight.svg"; - static constexpr const char* const s_viewportIcon = "Editor/Icons/Components/Viewport/TerrainHeight.svg"; + static constexpr const char* const s_icon = "Editor/Icons/Components/TerrainSurfaceMaterials.svg"; + static constexpr const char* const s_viewportIcon = "Editor/Icons/Components/Viewport/TerrainSurfaceMaterials.svg"; static constexpr const char* const s_helpUrl = ""; }; } From 83f42fed5f7b4ca774c8d629801037bba7347189 Mon Sep 17 00:00:00 2001 From: AMZN-Phil Date: Thu, 18 Nov 2021 09:49:05 -0800 Subject: [PATCH 116/345] Change warn to warning to remove deprecation messages from Python Signed-off-by: AMZN-Phil --- scripts/o3de/o3de/download.py | 6 +++--- scripts/o3de/o3de/manifest.py | 14 +++++++------- scripts/o3de/o3de/print_registration.py | 2 +- scripts/o3de/o3de/register.py | 24 ++++++++++++------------ scripts/o3de/o3de/repo.py | 4 ++-- scripts/o3de/o3de/utils.py | 2 +- 6 files changed, 26 insertions(+), 26 deletions(-) diff --git a/scripts/o3de/o3de/download.py b/scripts/o3de/o3de/download.py index dfec6b1aaa..a3dca1a97e 100644 --- a/scripts/o3de/o3de/download.py +++ b/scripts/o3de/o3de/download.py @@ -44,7 +44,7 @@ def validate_downloaded_zip_sha256(download_uri_json_data: dict, download_zip_pa try: sha256A = download_uri_json_data['sha256'] except KeyError as e: - logger.warn('SECURITY WARNING: The advertised o3de object you downloaded has no "sha256"!!! Be VERY careful!!!' + logger.warning('SECURITY WARNING: The advertised o3de object you downloaded has no "sha256"!!! Be VERY careful!!!' ' We cannot verify this is the actually the advertised object!!!') return 1 else: @@ -236,13 +236,13 @@ def is_o3de_object_update_available(object_name: str, downloadable_kwarg_key, lo try: repo_copy_updated_string = downloadable_object_data['last_updated'] except KeyError: - logger.warn(f'last_updated field not found for {object_name}.') + logger.warning(f'last_updated field not found for {object_name}.') return False try: local_last_updated_time = datetime.fromisoformat(local_last_updated) except ValueError: - logger.warn(f'last_updated field has incorrect format for local copy of {downloadable_kwarg_key} {object_name}.') + logger.warning(f'last_updated field has incorrect format for local copy of {downloadable_kwarg_key} {object_name}.') # Possible that an earlier version did not have this field so still want to check against cached downloadable version local_last_updated_time = datetime.min diff --git a/scripts/o3de/o3de/manifest.py b/scripts/o3de/o3de/manifest.py index 297d8e39d2..ceaec55474 100644 --- a/scripts/o3de/o3de/manifest.py +++ b/scripts/o3de/o3de/manifest.py @@ -455,7 +455,7 @@ def get_json_data_file(object_json: pathlib.Path, try: object_json_data = json.load(f) except json.JSONDecodeError as e: - logger.warn(f'{object_json} failed to load: {e}') + logger.warning(f'{object_json} failed to load: {e}') else: return object_json_data @@ -596,7 +596,7 @@ def get_registered(engine_name: str = None, try: engine_json_data = json.load(f) except json.JSONDecodeError as e: - logger.warn(f'{engine_json} failed to load: {str(e)}') + logger.warning(f'{engine_json} failed to load: {str(e)}') else: this_engines_name = engine_json_data['engine_name'] if this_engines_name == engine_name: @@ -611,7 +611,7 @@ def get_registered(engine_name: str = None, try: project_json_data = json.load(f) except json.JSONDecodeError as e: - logger.warn(f'{project_json} failed to load: {str(e)}') + logger.warning(f'{project_json} failed to load: {str(e)}') else: this_projects_name = project_json_data['project_name'] if this_projects_name == project_name: @@ -626,7 +626,7 @@ def get_registered(engine_name: str = None, try: gem_json_data = json.load(f) except json.JSONDecodeError as e: - logger.warn(f'{gem_json} failed to load: {str(e)}') + logger.warning(f'{gem_json} failed to load: {str(e)}') else: this_gems_name = gem_json_data['gem_name'] if this_gems_name == gem_name: @@ -641,7 +641,7 @@ def get_registered(engine_name: str = None, try: template_json_data = json.load(f) except json.JSONDecodeError as e: - logger.warn(f'{template_path} failed to load: {str(e)}') + logger.warning(f'{template_path} failed to load: {str(e)}') else: this_templates_name = template_json_data['template_name'] if this_templates_name == template_name: @@ -656,7 +656,7 @@ def get_registered(engine_name: str = None, try: restricted_json_data = json.load(f) except json.JSONDecodeError as e: - logger.warn(f'{restricted_json} failed to load: {str(e)}') + logger.warning(f'{restricted_json} failed to load: {str(e)}') else: this_restricted_name = restricted_json_data['restricted_name'] if this_restricted_name == restricted_name: @@ -689,7 +689,7 @@ def get_registered(engine_name: str = None, try: repo_json_data = json.load(f) except json.JSONDecodeError as e: - logger.warn(f'{cache_file} failed to load: {str(e)}') + logger.warning(f'{cache_file} failed to load: {str(e)}') else: this_repos_name = repo_json_data['repo_name'] if this_repos_name == repo_name: diff --git a/scripts/o3de/o3de/print_registration.py b/scripts/o3de/o3de/print_registration.py index b164243b7c..4b4c9d6515 100644 --- a/scripts/o3de/o3de/print_registration.py +++ b/scripts/o3de/o3de/print_registration.py @@ -326,7 +326,7 @@ def print_repos_data(repos_data: dict) -> int: try: repo_json_data = json.load(s) except json.JSONDecodeError as e: - logger.warn(f'{cache_file} failed to load: {str(e)}') + logger.warning(f'{cache_file} failed to load: {str(e)}') else: print(f'{repo_uri}/repo.json cached as:') print(cache_file) diff --git a/scripts/o3de/o3de/register.py b/scripts/o3de/o3de/register.py index 8420e202dc..de0934f2e5 100644 --- a/scripts/o3de/o3de/register.py +++ b/scripts/o3de/o3de/register.py @@ -485,7 +485,7 @@ def register_repo(json_data: dict, json_data['repos'].remove(repo_uri) if remove: - logger.warn(f'Removing repo uri {repo_uri}.') + logger.warning(f'Removing repo uri {repo_uri}.') return 0 repo_sha256 = hashlib.sha256(url.encode()) cache_file = manifest.get_o3de_cache_folder() / str(repo_sha256.hexdigest() + '.json') @@ -689,7 +689,7 @@ def remove_invalid_o3de_projects(manifest_path: pathlib.Path = None) -> int: for project in json_data.get('projects', []): if not validation.valid_o3de_project_json(pathlib.Path(project).resolve() / 'project.json'): - logger.warn(f"Project path {project} is invalid.") + logger.warning(f"Project path {project} is invalid.") # Attempt to unregister all invalid projects even if previous projects failed to unregister # but combine the result codes of each command. result = register(project_path=pathlib.Path(project), remove=True) or result @@ -699,7 +699,7 @@ def remove_invalid_o3de_projects(manifest_path: pathlib.Path = None) -> int: def remove_invalid_o3de_objects() -> None: for engine_path in manifest.get_engines(): if not validation.valid_o3de_engine_json(pathlib.Path(engine_path).resolve() / 'engine.json'): - logger.warn(f"Engine path {engine_path} is invalid.") + logger.warning(f"Engine path {engine_path} is invalid.") register(engine_path=engine_path, remove=True) remove_invalid_o3de_projects() @@ -707,17 +707,17 @@ def remove_invalid_o3de_objects() -> None: for external in manifest.get_external_subdirectories(): external = pathlib.Path(external).resolve() if not external.is_dir(): - logger.warn(f"External subdirectory {external} is invalid.") + logger.warning(f"External subdirectory {external} is invalid.") register(engine_path=engine_path, external_subdir_path=external, remove=True) for template in manifest.get_templates(): if not validation.valid_o3de_template_json(pathlib.Path(template).resolve() / 'template.json'): - logger.warn(f"Template path {template} is invalid.") + logger.warning(f"Template path {template} is invalid.") register(template_path=template, remove=True) for restricted in manifest.get_restricted(): if not validation.valid_o3de_restricted_json(pathlib.Path(restricted).resolve() / 'restricted.json'): - logger.warn(f"Restricted path {restricted} is invalid.") + logger.warning(f"Restricted path {restricted} is invalid.") register(restricted_path=restricted, remove=True) json_data = manifest.load_o3de_manifest() @@ -725,7 +725,7 @@ def remove_invalid_o3de_objects() -> None: if not default_engines_folder.is_dir(): new_default_engines_folder = manifest.get_o3de_folder() / 'Engines' new_default_engines_folder.mkdir(parents=True, exist_ok=True) - logger.warn( + logger.warning( f"Default engines folder {default_engines_folder} is invalid. Set default {new_default_engines_folder}") register(default_engines_folder=new_default_engines_folder.as_posix()) @@ -733,7 +733,7 @@ def remove_invalid_o3de_objects() -> None: if not default_projects_folder.is_dir(): new_default_projects_folder = manifest.get_o3de_folder() / 'Projects' new_default_projects_folder.mkdir(parents=True, exist_ok=True) - logger.warn( + logger.warning( f"Default projects folder {default_projects_folder} is invalid. Set default {new_default_projects_folder}") register(default_projects_folder=new_default_projects_folder.as_posix()) @@ -741,7 +741,7 @@ def remove_invalid_o3de_objects() -> None: if not default_gems_folder.is_dir(): new_default_gems_folder = manifest.get_o3de_folder() / 'Gems' new_default_gems_folder.mkdir(parents=True, exist_ok=True) - logger.warn(f"Default gems folder {default_gems_folder} is invalid." + logger.warning(f"Default gems folder {default_gems_folder} is invalid." f" Set default {new_default_gems_folder}") register(default_gems_folder=new_default_gems_folder.as_posix()) @@ -749,7 +749,7 @@ def remove_invalid_o3de_objects() -> None: if not default_templates_folder.is_dir(): new_default_templates_folder = manifest.get_o3de_folder() / 'Templates' new_default_templates_folder.mkdir(parents=True, exist_ok=True) - logger.warn( + logger.warning( f"Default templates folder {default_templates_folder} is invalid." f" Set default {new_default_templates_folder}") register(default_templates_folder=new_default_templates_folder.as_posix()) @@ -758,7 +758,7 @@ def remove_invalid_o3de_objects() -> None: if not default_restricted_folder.is_dir(): default_restricted_folder = manifest.get_o3de_folder() / 'Restricted' default_restricted_folder.mkdir(parents=True, exist_ok=True) - logger.warn( + logger.warning( f"Default restricted folder {default_restricted_folder} is invalid." f" Set default {default_restricted_folder}") register(default_restricted_folder=default_restricted_folder.as_posix()) @@ -767,7 +767,7 @@ def remove_invalid_o3de_objects() -> None: if not default_third_party_folder.is_dir(): default_third_party_folder = manifest.get_o3de_folder() / '3rdParty' default_third_party_folder.mkdir(parents=True, exist_ok=True) - logger.warn( + logger.warning( f"Default 3rd Party folder {default_third_party_folder} is invalid." f" Set default {default_third_party_folder}") register(default_third_party_folder=default_third_party_folder.as_posix()) diff --git a/scripts/o3de/o3de/repo.py b/scripts/o3de/o3de/repo.py index 5e64d856eb..22c7c54c8f 100644 --- a/scripts/o3de/o3de/repo.py +++ b/scripts/o3de/o3de/repo.py @@ -139,7 +139,7 @@ def get_gem_json_paths_from_cached_repo(repo_uri: str) -> set: if cache_gem_json_filepath.is_file(): gem_set.add(cache_gem_json_filepath) else: - logger.warn(f'Could not find cached gem json file {cache_gem_json_filepath} for {o3de_object_uri} in repo {repo_uri}') + logger.warning(f'Could not find cached gem json file {cache_gem_json_filepath} for {o3de_object_uri} in repo {repo_uri}') return gem_set @@ -258,7 +258,7 @@ def search_o3de_object(manifest_json, o3de_object_uris, search_func): try: manifest_json_data = json.load(f) except json.JSONDecodeError as e: - logger.warn(f'{cache_file} failed to load: {str(e)}') + logger.warning(f'{cache_file} failed to load: {str(e)}') else: result_json_data = search_func(manifest_json_data) if result_json_data: diff --git a/scripts/o3de/o3de/utils.py b/scripts/o3de/o3de/utils.py index 7b7d0e3e27..6f1dd8b2c5 100644 --- a/scripts/o3de/o3de/utils.py +++ b/scripts/o3de/o3de/utils.py @@ -149,7 +149,7 @@ def download_file(parsed_uri, download_path: pathlib.Path, force_overwrite: bool with download_path.open('wb') as f: download_cancelled = copyfileobj(s, f, download_progress) if download_cancelled: - logger.warn(f'Download of file to {download_path} cancelled.') + logger.info(f'Download of file to {download_path} cancelled.') return 1 except urllib.error.HTTPError as e: logger.error(f'HTTP Error {e.code} opening {parsed_uri.geturl()}') From 06e5c394e2faa746b4a2bb70dd908e36e0a9bb77 Mon Sep 17 00:00:00 2001 From: jckand-amzn <82226555+jckand-amzn@users.noreply.github.com> Date: Thu, 18 Nov 2021 12:07:19 -0600 Subject: [PATCH 117/345] Updating AssetBrowser tests around new TableView model and removed several xfails from tests that now pass (#5727) Signed-off-by: jckand-amzn --- .../AssetBrowser_SearchFiltering.py | 19 ++++++++++++------- .../AssetBrowser_TreeNavigation.py | 4 ++-- .../editor/TestSuite_Main_Optimized.py | 3 --- .../PythonTests/editor/TestSuite_Periodic.py | 2 -- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/AutomatedTesting/Gem/PythonTests/editor/EditorScripts/AssetBrowser_SearchFiltering.py b/AutomatedTesting/Gem/PythonTests/editor/EditorScripts/AssetBrowser_SearchFiltering.py index 33c48c7a77..7366faafdc 100644 --- a/AutomatedTesting/Gem/PythonTests/editor/EditorScripts/AssetBrowser_SearchFiltering.py +++ b/AutomatedTesting/Gem/PythonTests/editor/EditorScripts/AssetBrowser_SearchFiltering.py @@ -62,7 +62,7 @@ def AssetBrowser_SearchFiltering(): from editor_python_test_tools.utils import Report from editor_python_test_tools.utils import TestHelper as helper - def verify_files_appeared(model, allowed_asset_extentions, parent_index=QtCore.QModelIndex()): + def verify_files_appeared(model, allowed_asset_extensions, parent_index=QtCore.QModelIndex()): indexes = [parent_index] while len(indexes) > 0: parent_index = indexes.pop(0) @@ -71,7 +71,7 @@ def AssetBrowser_SearchFiltering(): cur_data = cur_index.data(Qt.DisplayRole) if ( "." in cur_data - and (cur_data.lower().split(".")[-1] not in allowed_asset_extentions) + and (cur_data.lower().split(".")[-1] not in allowed_asset_extensions) and not cur_data[-1] == ")" ): Report.info(f"Incorrect file found: {cur_data}") @@ -94,16 +94,21 @@ def AssetBrowser_SearchFiltering(): Report.info("Asset Browser is already open") editor_window = pyside_utils.get_editor_main_window() app = QtWidgets.QApplication.instance() - - # 3) Type the name of an asset in the search bar and make sure only one asset is filtered in Asset browser + + # 3) Type the name of an asset in the search bar and make sure it is filtered to and selectable asset_browser = editor_window.findChild(QtWidgets.QDockWidget, "Asset Browser") search_bar = asset_browser.findChild(QtWidgets.QLineEdit, "textSearch") search_bar.setText("cedar.fbx") asset_browser_tree = asset_browser.findChild(QtWidgets.QTreeView, "m_assetBrowserTreeViewWidget") - model_index = pyside_utils.find_child_by_pattern(asset_browser_tree, "cedar.fbx") - pyside_utils.item_view_index_mouse_click(asset_browser_tree, model_index) + asset_browser_table = asset_browser.findChild(QtWidgets.QTreeView, "m_assetBrowserTableViewWidget") + found = await pyside_utils.wait_for_condition(lambda: pyside_utils.find_child_by_pattern(asset_browser_table, "cedar.fbx"), 5.0) + if found: + model_index = pyside_utils.find_child_by_pattern(asset_browser_table, "cedar.fbx") + else: + Report.result(Tests.asset_filtered, found) + pyside_utils.item_view_index_mouse_click(asset_browser_table, model_index) is_filtered = await pyside_utils.wait_for_condition( - lambda: asset_browser_tree.indexBelow(asset_browser_tree.currentIndex()) == QtCore.QModelIndex(), 5.0) + lambda: asset_browser_table.currentIndex() == model_index, 5.0) Report.result(Tests.asset_filtered, is_filtered) # 4) Click the "X" in the search bar. diff --git a/AutomatedTesting/Gem/PythonTests/editor/EditorScripts/AssetBrowser_TreeNavigation.py b/AutomatedTesting/Gem/PythonTests/editor/EditorScripts/AssetBrowser_TreeNavigation.py index b4f0dc7f6c..ecc77778cc 100644 --- a/AutomatedTesting/Gem/PythonTests/editor/EditorScripts/AssetBrowser_TreeNavigation.py +++ b/AutomatedTesting/Gem/PythonTests/editor/EditorScripts/AssetBrowser_TreeNavigation.py @@ -84,8 +84,8 @@ def AssetBrowser_TreeNavigation(): # 3) Collapse all files initially main_window = editor_window.findChild(QtWidgets.QMainWindow) - asset_browser = pyside_utils.find_child_by_hierarchy(main_window, ..., "Asset Browser") - tree = pyside_utils.find_child_by_hierarchy(asset_browser, ..., "m_assetBrowserTreeViewWidget") + asset_browser = pyside_utils.find_child_by_pattern(main_window, text="Asset Browser", type=QtWidgets.QDockWidget) + tree = pyside_utils.find_child_by_pattern(asset_browser, "m_assetBrowserTreeViewWidget") scroll_area = tree.findChild(QtWidgets.QWidget, "qt_scrollarea_vcontainer") scroll_bar = scroll_area.findChild(QtWidgets.QScrollBar) tree.collapseAll() diff --git a/AutomatedTesting/Gem/PythonTests/editor/TestSuite_Main_Optimized.py b/AutomatedTesting/Gem/PythonTests/editor/TestSuite_Main_Optimized.py index afc52f962d..820e4bd2aa 100644 --- a/AutomatedTesting/Gem/PythonTests/editor/TestSuite_Main_Optimized.py +++ b/AutomatedTesting/Gem/PythonTests/editor/TestSuite_Main_Optimized.py @@ -43,7 +43,6 @@ class TestAutomationNoAutoTestMode(EditorTestSuite): class test_InputBindings_Add_Remove_Input_Events(EditorSharedTest): from .EditorScripts import InputBindings_Add_Remove_Input_Events as test_module - @pytest.mark.skip(reason="Crashes Editor: ATOM-15493") class test_AssetPicker_UI_UX(EditorSharedTest): from .EditorScripts import AssetPicker_UI_UX as test_module @@ -60,7 +59,6 @@ class TestAutomationAutoTestMode(EditorTestSuite): class test_AssetBrowser_TreeNavigation(EditorSharedTest): from .EditorScripts import AssetBrowser_TreeNavigation as test_module - @pytest.mark.skip(reason="Crashes Editor: ATOM-15493") class test_AssetBrowser_SearchFiltering(EditorSharedTest): from .EditorScripts import AssetBrowser_SearchFiltering as test_module @@ -74,6 +72,5 @@ class TestAutomationAutoTestMode(EditorTestSuite): class test_Menus_FileMenuOptions_Work(EditorSharedTest): from .EditorScripts import Menus_FileMenuOptions as test_module - class test_BasicEditorWorkflows_ExistingLevel_EntityComponentCRUD(EditorSharedTest): from .EditorScripts import BasicEditorWorkflows_ExistingLevel_EntityComponentCRUD as test_module diff --git a/AutomatedTesting/Gem/PythonTests/editor/TestSuite_Periodic.py b/AutomatedTesting/Gem/PythonTests/editor/TestSuite_Periodic.py index 398b64bc87..f131a1c8bc 100644 --- a/AutomatedTesting/Gem/PythonTests/editor/TestSuite_Periodic.py +++ b/AutomatedTesting/Gem/PythonTests/editor/TestSuite_Periodic.py @@ -34,12 +34,10 @@ class TestAutomation(TestAutomationBase): from .EditorScripts import AssetBrowser_TreeNavigation as test_module self._run_test(request, workspace, editor, test_module, batch_mode=False) - @pytest.mark.skip(reason="Crashes Editor: ATOM-15493") def test_AssetBrowser_SearchFiltering(self, request, workspace, editor, launcher_platform): from .EditorScripts import AssetBrowser_SearchFiltering as test_module self._run_test(request, workspace, editor, test_module, batch_mode=False) - @pytest.mark.skip(reason="Crashes Editor: ATOM-15493") def test_AssetPicker_UI_UX(self, request, workspace, editor, launcher_platform): from .EditorScripts import AssetPicker_UI_UX as test_module self._run_test(request, workspace, editor, test_module, autotest_mode=False, batch_mode=False) From b7fca29fe18e7959ca289b007408f83df54e51f9 Mon Sep 17 00:00:00 2001 From: puvvadar Date: Thu, 18 Nov 2021 10:54:08 -0800 Subject: [PATCH 118/345] Fix tabs Signed-off-by: puvvadar --- .../AzToolsFramework/ViewportUi/ViewportUiDisplay.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiDisplay.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiDisplay.cpp index c67096f4f0..e6adb6193b 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiDisplay.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiDisplay.cpp @@ -308,7 +308,7 @@ namespace AzToolsFramework::ViewportUi::Internal m_viewportBorderText.setVisible(true); m_viewportBorderText.setText(borderTitle.c_str()); UpdateUiOverlayGeometry(); - + // only display the back button if a callback was provided m_viewportBorderBackButtonCallback = backButtonCallback; m_viewportBorderBackButton.setVisible(m_viewportBorderBackButtonCallback.has_value()); From cd4eca7f75683e8b15be94249e7b9200862bfc2b Mon Sep 17 00:00:00 2001 From: puvvadar Date: Thu, 18 Nov 2021 11:55:38 -0800 Subject: [PATCH 119/345] Fix missing comma in prefab Signed-off-by: puvvadar --- AutomatedTesting/Levels/Base/Base.prefab | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AutomatedTesting/Levels/Base/Base.prefab b/AutomatedTesting/Levels/Base/Base.prefab index dd65343b69..8782591f9d 100644 --- a/AutomatedTesting/Levels/Base/Base.prefab +++ b/AutomatedTesting/Levels/Base/Base.prefab @@ -17,7 +17,7 @@ }, "Component_[3837204912784440039]": { "$type": "EditorDisabledCompositionComponent", - "Id": 3837204912784440039 + "Id": 3837204912784440039, "ChildEntityOrderEntryArray": [ { "EntityId": "" From 7f4ab7a1c248fa50db133c00f8f1a5567e8862ff Mon Sep 17 00:00:00 2001 From: dmcdiar Date: Thu, 18 Nov 2021 13:10:07 -0700 Subject: [PATCH 120/345] Added a frame delay before activating SSR, several visual quality improvements Signed-off-by: dmcdiar --- .../Assets/Passes/ReflectionScreenSpace.pass | 66 +++++++---- .../Passes/ReflectionScreenSpaceBlur.pass | 35 ++---- .../ReflectionScreenSpaceBlurVertical.pass | 19 +++ .../ReflectionScreenSpaceComposite.pass | 9 +- .../Passes/ReflectionScreenSpaceTrace.pass | 106 ++++++++++++++--- .../ReflectionScreenSpaceBlurCommon.azsli | 30 ++++- .../ReflectionScreenSpaceBlurVertical.azsl | 33 +++++- .../ReflectionScreenSpaceBlurVertical.shader | 3 +- .../ReflectionScreenSpaceComposite.azsl | 108 +++++++++++------- .../ReflectionScreenSpaceTrace.azsl | 91 ++++++++++++++- .../ReflectionScreenSpaceTrace.shader | 3 +- .../Code/Source/CommonSystemComponent.cpp | 2 + .../ReflectionCopyFrameBufferPass.cpp | 10 +- .../ReflectionScreenSpaceBlurPass.cpp | 49 ++++---- .../ReflectionScreenSpaceBlurPass.h | 11 +- .../ReflectionScreenSpaceCompositePass.cpp | 31 +++-- .../ReflectionScreenSpaceCompositePass.h | 3 + .../ReflectionScreenSpaceTracePass.cpp | 58 ++++++++++ .../ReflectionScreenSpaceTracePass.h | 43 +++++++ .../Code/atom_feature_common_files.cmake | 2 + 20 files changed, 538 insertions(+), 174 deletions(-) create mode 100644 Gems/Atom/Feature/Common/Code/Source/ReflectionScreenSpace/ReflectionScreenSpaceTracePass.cpp create mode 100644 Gems/Atom/Feature/Common/Code/Source/ReflectionScreenSpace/ReflectionScreenSpaceTracePass.h diff --git a/Gems/Atom/Feature/Common/Assets/Passes/ReflectionScreenSpace.pass b/Gems/Atom/Feature/Common/Assets/Passes/ReflectionScreenSpace.pass index 4972f0f494..d1825be820 100644 --- a/Gems/Atom/Feature/Common/Assets/Passes/ReflectionScreenSpace.pass +++ b/Gems/Atom/Feature/Common/Assets/Passes/ReflectionScreenSpace.pass @@ -34,10 +34,6 @@ } ], "PassRequests": [ - { - "Name": "ReflectionScreenSpaceBlurPass", - "TemplateName": "ReflectionScreenSpaceBlurPassTemplate" - }, { "Name": "ReflectionScreenSpaceTracePass", "TemplateName": "ReflectionScreenSpaceTracePassTemplate", @@ -56,42 +52,65 @@ "Attachment": "NormalInput" } }, - { - "LocalSlot": "DepthStencilInput", - "AttachmentRef": { - "Pass": "Parent", - "Attachment": "DepthStencilInput" - - } - }, { "LocalSlot": "SpecularF0Input", "AttachmentRef": { "Pass": "Parent", "Attachment": "SpecularF0Input" } + }, + { + "LocalSlot": "ReflectionInputOutput", + "AttachmentRef": { + "Pass": "Parent", + "Attachment": "ReflectionInputOutput" + } + } + ] + }, + { + "Name": "ReflectionScreenSpaceBlurPass", + "TemplateName": "ReflectionScreenSpaceBlurPassTemplate", + "Connections": [ + { + "LocalSlot": "DepthInput", + "AttachmentRef": { + "Pass": "Parent", + "Attachment": "DepthStencilInput" + } + }, + { + "LocalSlot": "ScreenSpaceReflectionInputOutput", + "AttachmentRef": { + "Pass": "ReflectionScreenSpaceTracePass", + "Attachment": "ScreenSpaceReflectionOutput" + } + }, + { + "LocalSlot": "DownsampledDepthInputOutput", + "AttachmentRef": { + "Pass": "ReflectionScreenSpaceTracePass", + "Attachment": "DownsampledDepthOutput" + } } ] }, { "Name": "ReflectionScreenSpaceCompositePass", "TemplateName": "ReflectionScreenSpaceCompositePassTemplate", - "ExecuteAfter": [ - "ReflectionScreenSpaceBlurPass" - ], "Connections": [ { - "LocalSlot": "TraceInput", + "LocalSlot": "ReflectionInput", "AttachmentRef": { - "Pass": "ReflectionScreenSpaceTracePass", - "Attachment": "Output" + "Pass": "ReflectionScreenSpaceBlurPass", + "Attachment": "ScreenSpaceReflectionInputOutput" } }, { - "LocalSlot": "PreviousFrameBufferInput", + "LocalSlot": "DownsampledDepthInput", "AttachmentRef": { "Pass": "ReflectionScreenSpaceBlurPass", - "Attachment": "PreviousFrameInputOutput" + "Attachment": "DownsampledDepthInputOutput" } }, { @@ -115,6 +134,13 @@ "Attachment": "DepthStencilInput" } }, + { + "LocalSlot": "PreviousFrameInputOutput", + "AttachmentRef": { + "Pass": "ReflectionScreenSpaceTracePass", + "Attachment": "PreviousFrameInputOutput" + } + }, { "LocalSlot": "DepthStencilInput", "AttachmentRef": { diff --git a/Gems/Atom/Feature/Common/Assets/Passes/ReflectionScreenSpaceBlur.pass b/Gems/Atom/Feature/Common/Assets/Passes/ReflectionScreenSpaceBlur.pass index e2fde2d4ef..a5fd2fdfb1 100644 --- a/Gems/Atom/Feature/Common/Assets/Passes/ReflectionScreenSpaceBlur.pass +++ b/Gems/Atom/Feature/Common/Assets/Passes/ReflectionScreenSpaceBlur.pass @@ -8,34 +8,19 @@ "PassClass": "ReflectionScreenSpaceBlurPass", "Slots": [ { - "Name": "PreviousFrameInputOutput", + "Name": "DepthInput", + "SlotType": "Input", + "ScopeAttachmentUsage": "Shader" + }, + { + "Name": "ScreenSpaceReflectionInputOutput", "SlotType": "InputOutput", "ScopeAttachmentUsage": "Shader" - } - ], - "ImageAttachments": [ + }, { - "Name": "PreviousFrameImage", - "SizeSource": { - "Source": { - "Pass": "Parent", - "Attachment": "SpecularInput" - } - }, - "ImageDescriptor": { - "Format": "R16G16B16A16_FLOAT", - "SharedQueueMask": "Graphics" - }, - "GenerateFullMipChain": true - } - ], - "Connections": [ - { - "LocalSlot": "PreviousFrameInputOutput", - "AttachmentRef": { - "Pass": "This", - "Attachment": "PreviousFrameImage" - } + "Name": "DownsampledDepthInputOutput", + "SlotType": "InputOutput", + "ScopeAttachmentUsage": "DepthStencil" } ] } diff --git a/Gems/Atom/Feature/Common/Assets/Passes/ReflectionScreenSpaceBlurVertical.pass b/Gems/Atom/Feature/Common/Assets/Passes/ReflectionScreenSpaceBlurVertical.pass index a616ed4c8e..af3878cf6b 100644 --- a/Gems/Atom/Feature/Common/Assets/Passes/ReflectionScreenSpaceBlurVertical.pass +++ b/Gems/Atom/Feature/Common/Assets/Passes/ReflectionScreenSpaceBlurVertical.pass @@ -7,6 +7,11 @@ "Name": "ReflectionScreenSpaceBlurVerticalPassTemplate", "PassClass": "ReflectionScreenSpaceBlurChildPass", "Slots": [ + { + "Name": "DepthInput", + "SlotType": "Input", + "ScopeAttachmentUsage": "Shader" + }, { "Name": "Input", "SlotType": "InputOutput", @@ -16,6 +21,20 @@ "Name": "Output", "SlotType": "InputOutput", "ScopeAttachmentUsage": "RenderTarget" + }, + { + "Name": "DownsampledDepthOutput", + "SlotType": "InputOutput", + "ScopeAttachmentUsage": "DepthStencil" + } + ], + "Connections": [ + { + "LocalSlot": "DepthInput", + "AttachmentRef": { + "Pass": "Parent", + "Attachment": "DepthInput" + } } ], "PassData": { diff --git a/Gems/Atom/Feature/Common/Assets/Passes/ReflectionScreenSpaceComposite.pass b/Gems/Atom/Feature/Common/Assets/Passes/ReflectionScreenSpaceComposite.pass index 5443c32406..17b58dbc9e 100644 --- a/Gems/Atom/Feature/Common/Assets/Passes/ReflectionScreenSpaceComposite.pass +++ b/Gems/Atom/Feature/Common/Assets/Passes/ReflectionScreenSpaceComposite.pass @@ -8,12 +8,12 @@ "PassClass": "ReflectionScreenSpaceCompositePass", "Slots": [ { - "Name": "TraceInput", + "Name": "ReflectionInput", "SlotType": "Input", "ScopeAttachmentUsage": "Shader" }, { - "Name": "PreviousFrameBufferInput", + "Name": "DownsampledDepthInput", "SlotType": "Input", "ScopeAttachmentUsage": "Shader" }, @@ -37,6 +37,11 @@ ] } }, + { + "Name": "PreviousFrameInputOutput", + "SlotType": "InputOutput", + "ScopeAttachmentUsage": "Shader" + }, { "Name": "DepthStencilInput", "SlotType": "Input", diff --git a/Gems/Atom/Feature/Common/Assets/Passes/ReflectionScreenSpaceTrace.pass b/Gems/Atom/Feature/Common/Assets/Passes/ReflectionScreenSpaceTrace.pass index 370db1f45a..824d23a046 100644 --- a/Gems/Atom/Feature/Common/Assets/Passes/ReflectionScreenSpaceTrace.pass +++ b/Gems/Atom/Feature/Common/Assets/Passes/ReflectionScreenSpaceTrace.pass @@ -5,7 +5,7 @@ "ClassData": { "PassTemplate": { "Name": "ReflectionScreenSpaceTracePassTemplate", - "PassClass": "FullScreenTriangle", + "PassClass": "ReflectionScreenSpaceTracePass", "Slots": [ { "Name": "DepthStencilTextureInput", @@ -28,24 +28,52 @@ "ScopeAttachmentUsage": "Shader" }, { - "Name": "DepthStencilInput", + "Name": "ReflectionInputOutput", "SlotType": "Input", - "ScopeAttachmentUsage": "DepthStencil", - "ImageViewDesc": { - "AspectFlags": [ - "Stencil" - ] + "ScopeAttachmentUsage": "Shader" + }, + { + "Name": "PreviousFrameInputOutput", + "SlotType": "Input", + "ScopeAttachmentUsage": "Shader" + }, + { + "Name": "ScreenSpaceReflectionOutput", + "SlotType": "Output", + "ScopeAttachmentUsage": "RenderTarget", + "LoadStoreAction": { + "ClearValue": { + "Value": [ + 0.0, + 0.0, + 0.0, + 0.0 + ] + }, + "LoadAction": "Clear" } }, { - "Name": "Output", + "Name": "DownsampledDepthOutput", "SlotType": "Output", - "ScopeAttachmentUsage": "RenderTarget" + "ScopeAttachmentUsage": "DepthStencil", + "LoadStoreAction": { + "ClearValue": { + "Type": "DepthStencil", + "Value": [ + 1.0, + {}, + {}, + {} + ] + }, + "LoadAction": "Clear" + } } ], "ImageAttachments": [ { - "Name": "TraceImage", + "Name": "ScreenSpaceReflectionImage", "SizeSource": { "Source": { "Pass": "This", @@ -56,9 +84,40 @@ "HeightMultiplier": 0.5 } }, - "MultisampleSource": { - "Pass": "This", - "Attachment": "SpecularF0Input" + "ImageDescriptor": { + "Format": "R16G16B16A16_FLOAT", + "MipLevels": "5", + "SharedQueueMask": "Graphics" + } + }, + { + "Name": "DownsampledDepthImage", + "SizeSource": { + "Source": { + "Pass": "Parent", + "Attachment": "DepthStencilInput" + }, + "Multipliers": { + "WidthMultiplier": 0.5, + "HeightMultiplier": 0.5 + } + }, + "FormatSource": { + "Pass": "Parent", + "Attachment": "DepthStencilInput" + }, + "ImageDescriptor": { + "MipLevels": "5", + "SharedQueueMask": "Graphics" + } + }, + { + "Name": "PreviousFrameImage", + "SizeSource": { + "Source": { + "Pass": "Parent", + "Attachment": "SpecularInput" + } }, "ImageDescriptor": { "Format": "R16G16B16A16_FLOAT", @@ -68,15 +127,28 @@ ], "Connections": [ { - "LocalSlot": "Output", + "LocalSlot": "ScreenSpaceReflectionOutput", "AttachmentRef": { "Pass": "This", - "Attachment": "TraceImage" + "Attachment": "ScreenSpaceReflectionImage" + } + }, + { + "LocalSlot": "DownsampledDepthOutput", + "AttachmentRef": { + "Pass": "This", + "Attachment": "DownsampledDepthImage" + } + }, + { + "LocalSlot": "PreviousFrameInputOutput", + "AttachmentRef": { + "Pass": "This", + "Attachment": "PreviousFrameImage" } } ], - "PassData": - { + "PassData": { "$type": "FullscreenTrianglePassData", "ShaderAsset": { "FilePath": "Shaders/Reflections/ReflectionScreenSpaceTrace.shader" diff --git a/Gems/Atom/Feature/Common/Assets/Shaders/Reflections/ReflectionScreenSpaceBlurCommon.azsli b/Gems/Atom/Feature/Common/Assets/Shaders/Reflections/ReflectionScreenSpaceBlurCommon.azsli index 1e4d4af8a2..3d38df2816 100644 --- a/Gems/Atom/Feature/Common/Assets/Shaders/Reflections/ReflectionScreenSpaceBlurCommon.azsli +++ b/Gems/Atom/Feature/Common/Assets/Shaders/Reflections/ReflectionScreenSpaceBlurCommon.azsli @@ -6,11 +6,31 @@ * */ -// 7-tap Gaussian Kernel (Sigma 1.1) -static const uint GaussianKernelSize = 7; -static const int2 TexelOffsetsV[GaussianKernelSize] = {{0, -3}, {0, -2}, {0, -1}, {0, 0}, {0, 1}, {0, 2}, {0, 3}}; -static const int2 TexelOffsetsH[GaussianKernelSize] = {{-3, 0}, {-2, 0}, {-1, 0}, {0, 0}, {1, 0}, {2, 0}, {3, 0}}; -static const float TexelWeights[GaussianKernelSize] = {0.010805f, 0.074929f, 0.238727f, 0.351078f, 0.238727f, 0.074929f, 0.010805f}; +// Gaussian Kernel Radius 9, Sigma 1.8 +static const uint GaussianKernelSize = 19; +static const int2 TexelOffsetsV[GaussianKernelSize] = {{0, -9}, {0, -8}, {0, -7}, {0, -6}, {0, -5}, {0, -4}, {0, -3}, {0, -2}, {0, -1}, {0, 0}, {0, 1}, {0, 2}, {0, 3}, {0, 4}, {0, 5}, {0, 6}, {0, 7}, {0, 8}, {0, 9}}; +static const int2 TexelOffsetsH[GaussianKernelSize] = {{-9, 0}, {-8, 0}, {-7, 0}, {-6, 0}, {-5, 0}, {-4, 0}, {-3, 0}, {-2, 0}, {-1, 0}, {0, 0}, {1, 0}, {2, 0}, {3, 0}, {4, 0}, {5, 0}, {6, 0}, {7, 0}, {8, 0}, {9, 0}}; +static const float TexelWeights[GaussianKernelSize] = { + 0.0000011022801820635918f, + 0.000014295732881160677f, + 0.0001370168487067367f, + 0.0009708086495991633f, + 0.005086391900047703f, + 0.019711193240183777f, + 0.056512463228943335f, + 0.11989501853796679f, + 0.18826323520204147f, + 0.21881694875889543f, + 0.18826323520204147f, + 0.11989501853796679f, + 0.056512463228943335f, + 0.019711193240183777f, + 0.005086391900047703f, + 0.0009708086495991633f, + 0.0001370168487067367f, + 0.000014295732881160677f, + 0.0000011022801820635918f +}; float3 GaussianFilter(uint2 screenCoords, int2 texelOffsets[GaussianKernelSize], RWTexture2D inputImage) { diff --git a/Gems/Atom/Feature/Common/Assets/Shaders/Reflections/ReflectionScreenSpaceBlurVertical.azsl b/Gems/Atom/Feature/Common/Assets/Shaders/Reflections/ReflectionScreenSpaceBlurVertical.azsl index cfc35d10e4..bdc787350e 100644 --- a/Gems/Atom/Feature/Common/Assets/Shaders/Reflections/ReflectionScreenSpaceBlurVertical.azsl +++ b/Gems/Atom/Feature/Common/Assets/Shaders/Reflections/ReflectionScreenSpaceBlurVertical.azsl @@ -10,12 +10,13 @@ #include #include -#include #include +#include #include "ReflectionScreenSpaceBlurCommon.azsli" ShaderResourceGroup PassSrg : SRG_PerPass { + Texture2DMS m_depth; RWTexture2D m_input; RWTexture2D m_output; uint m_imageWidth; @@ -26,13 +27,39 @@ ShaderResourceGroup PassSrg : SRG_PerPass #include // Pixel Shader +struct PSOutput +{ + float4 m_color : SV_Target0; + float m_depth : SV_Depth; +}; + PSOutput MainPS(VSOutput IN) { // vertical blur uses coordinates from the mip0 input image - uint2 coords = IN.m_position.xy * PassSrg::m_outputScale; - float3 result = GaussianFilter(coords, TexelOffsetsV, PassSrg::m_input); + uint2 halfResCoords = IN.m_position.xy * PassSrg::m_outputScale; + float3 result = GaussianFilter(halfResCoords, TexelOffsetsV, PassSrg::m_input); + + // downsample depth, using fullscreen image coordinates + float downsampledDepth = 0; + if (PassSrg::m_input[halfResCoords].w > 0.0f) + { + uint2 fullScreenCoords = halfResCoords * 2; + + for (int y = -2; y < 2; ++y) + { + for (int x = -2; x < 2; ++x) + { + float depth = PassSrg::m_depth.Load(fullScreenCoords + int2(x, y), 0).r; + if (depth > downsampledDepth) + { + downsampledDepth = depth; + } + } + } + } PSOutput OUT; OUT.m_color = float4(result, 1.0f); + OUT.m_depth = downsampledDepth; return OUT; } diff --git a/Gems/Atom/Feature/Common/Assets/Shaders/Reflections/ReflectionScreenSpaceBlurVertical.shader b/Gems/Atom/Feature/Common/Assets/Shaders/Reflections/ReflectionScreenSpaceBlurVertical.shader index dcebb4d2ae..92995bd69f 100644 --- a/Gems/Atom/Feature/Common/Assets/Shaders/Reflections/ReflectionScreenSpaceBlurVertical.shader +++ b/Gems/Atom/Feature/Common/Assets/Shaders/Reflections/ReflectionScreenSpaceBlurVertical.shader @@ -10,7 +10,8 @@ { "Depth" : { - "Enable" : false + "Enable" : true, // required to bind the depth buffer SRV + "CompareFunc" : "Always" } }, diff --git a/Gems/Atom/Feature/Common/Assets/Shaders/Reflections/ReflectionScreenSpaceComposite.azsl b/Gems/Atom/Feature/Common/Assets/Shaders/Reflections/ReflectionScreenSpaceComposite.azsl index a0c31442fa..6cd4ce16f5 100644 --- a/Gems/Atom/Feature/Common/Assets/Shaders/Reflections/ReflectionScreenSpaceComposite.azsl +++ b/Gems/Atom/Feature/Common/Assets/Shaders/Reflections/ReflectionScreenSpaceComposite.azsl @@ -12,17 +12,19 @@ #include #include #include +#include #include #include #include ShaderResourceGroup PassSrg : SRG_PerPass { - Texture2DMS m_trace; - Texture2D m_previousFrame; + Texture2D m_reflection; + Texture2D m_downsampledDepth; Texture2DMS m_normal; // RGB10 = Normal (Encoded), A2 = Flags Texture2DMS m_specularF0; // RGB8 = SpecularF0, A8 = Roughness Texture2DMS m_depth; + Texture2D m_previousFrame; Sampler LinearSampler { @@ -40,6 +42,49 @@ ShaderResourceGroup PassSrg : SRG_PerPass #include +float3 SampleReflection(float2 reflectionUV, float mip, float depth, float3 normal, uint2 invDimensions) +{ + const float DepthTolerance = 0.001f; + + // attempt to trivially accept the downsampled reflection texel + float downsampledDepth = PassSrg::m_downsampledDepth.SampleLevel(PassSrg::LinearSampler, reflectionUV, floor(mip)).r; + if (abs(depth - downsampledDepth) <= DepthTolerance) + { + // use this reflection sample + float3 reflection = PassSrg::m_reflection.SampleLevel(PassSrg::LinearSampler, reflectionUV, mip).rgb; + return reflection; + } + + // neighborhood search surrounding the downsampled texel, searching for the closest matching depth + float closestDepthDelta = 1.0f; + int2 closestOffsetUV = float2(0.0f, 0.0f); + for (int y = -4; y <= 4; ++y) + { + for (int x = -4; x <= 4; ++x) + { + float2 offsetUV = float2(x * invDimensions.x, y * invDimensions.y); + float downsampledDepth = PassSrg::m_downsampledDepth.SampleLevel(PassSrg::LinearSampler, reflectionUV + offsetUV, floor(mip)).r; + float depthDelta = abs(depth - downsampledDepth); + + if (depthDelta <= DepthTolerance) + { + // depth is within tolerance, use this texel + float3 reflection = PassSrg::m_reflection.SampleLevel(PassSrg::LinearSampler, reflectionUV + offsetUV, mip).rgb; + return reflection; + } + + if (closestDepthDelta > depthDelta) + { + closestDepthDelta = depthDelta; + closestOffsetUV = offsetUV; + } + } + } + + float3 reflection = PassSrg::m_reflection.SampleLevel(PassSrg::LinearSampler, reflectionUV + closestOffsetUV, mip).rgb; + return reflection; +} + // Pixel Shader PSOutput MainPS(VSOutput IN, in uint sampleIndex : SV_SampleIndex) { @@ -52,11 +97,21 @@ PSOutput MainPS(VSOutput IN, in uint sampleIndex : SV_SampleIndex) // compute trace image coordinates for the half-res image float2 traceCoords = screenCoords * 0.5f; - // load trace data and check w-component to see if there was a hit - float4 traceData = PassSrg::m_trace.Load(traceCoords, sampleIndex); - if (traceData.w <= 0.0f) + // check reflection data mip0 to see if there was a hit + float4 reflectionData = PassSrg::m_reflection.Load(uint3(traceCoords, 0)); + if (reflectionData.w <= 0.0f) { - // no hit, fallback to the cubemap reflections currently in the reflection buffer + // fallback to the cubemap reflections currently in the reflection buffer + discard; + } + + // load specular and roughness + float4 specularF0 = PassSrg::m_specularF0.Load(screenCoords, sampleIndex); + float roughness = specularF0.a; + const float MaxRoughness = 0.5f; + if (roughness > MaxRoughness) + { + // fallback to the cubemap reflections currently in the reflection buffer discard; } @@ -65,8 +120,9 @@ PSOutput MainPS(VSOutput IN, in uint sampleIndex : SV_SampleIndex) float depth = PassSrg::m_depth.Load(screenCoords, sampleIndex).r; float2 ndcPos = float2(UV.x, 1.0f - UV.y) * 2.0f - 1.0f; float4 projectedPos = float4(ndcPos, depth, 1.0f); - float4 positionWS = mul(ViewSrg::m_viewProjectionInverseMatrix, projectedPos); - positionWS /= positionWS.w; + float4 positionVS = mul(ViewSrg::m_projectionMatrixInverse, projectedPos); + positionVS /= positionVS.w; + float3 positionWS = mul(ViewSrg::m_viewMatrixInverse, positionVS).xyz; // compute ray from camera to surface position float3 cameraToPositionWS = normalize(positionWS.xyz - ViewSrg::m_worldPosition); @@ -74,42 +130,16 @@ PSOutput MainPS(VSOutput IN, in uint sampleIndex : SV_SampleIndex) // retrieve surface normal float4 encodedNormal = PassSrg::m_normal.Load(screenCoords, sampleIndex); float3 normalWS = DecodeNormalSignedOctahedron(encodedNormal.rgb); - - // compute surface specular - float4 specularF0 = PassSrg::m_specularF0.Load(screenCoords, sampleIndex); - float roughness = specularF0.a; float NdotV = dot(normalWS, -cameraToPositionWS); - float3 specular = FresnelSchlickWithRoughness(NdotV, specularF0.rgb, roughness); - // reconstruct the world space position of the trace coordinates - float2 traceUV = saturate(traceData.xy / dimensions); - float traceDepth = PassSrg::m_depth.Load(traceData.xy, sampleIndex).r; - float2 traceNDC = float2(traceUV.x, 1.0f - traceUV.y) * 2.0f - 1.0f; - float4 traceProjectedPos = float4(traceNDC, traceDepth, 1.0f); - float4 tracePositionVS = mul(ViewSrg::m_projectionMatrixInverse, traceProjectedPos); - tracePositionVS /= tracePositionVS.w; - float4 tracePositionWS = mul(ViewSrg::m_viewMatrixInverse, tracePositionVS); - - // reproject to the previous frame image coordinates - float4 tracePrevNDC = mul(ViewSrg::m_viewProjectionPrevMatrix, tracePositionWS); - tracePrevNDC /= tracePrevNDC.w; - float2 tracePrevUV = float2(tracePrevNDC.x, -1.0f * tracePrevNDC.y) * 0.5f + 0.5f; - - // compute the roughness mip to use in the previous frame image + // compute the roughness mip to use in the reflection image // remap the roughness mip into a lower range to more closely match the material roughness values - const float MaxRoughness = 0.5f; float mip = saturate(roughness / MaxRoughness) * PassSrg::m_maxMipLevel; - // sample reflection value from the roughness mip - float4 reflectionColor = float4(PassSrg::m_previousFrame.SampleLevel(PassSrg::LinearSampler, tracePrevUV, mip).rgb, 1.0f); - - // fade rays close to screen edge - const float ScreenFadeDistance = 0.95f; - float2 fadeAmount = max(max(0.0f, traceUV - ScreenFadeDistance), max(0.0f, 1.0f - traceUV - ScreenFadeDistance)); - fadeAmount /= (1.0f - ScreenFadeDistance); - float alpha = 1.0f - max(fadeAmount.x, fadeAmount.y); - + // sample reflection color from the mip chain + float3 reflectionColor = SampleReflection(IN.m_texCoord, mip, depth, normalWS, 1.0f / dimensions); + PSOutput OUT; - OUT.m_color = float4(reflectionColor.rgb * specular, alpha); + OUT.m_color = float4(reflectionColor, reflectionData.w); return OUT; } diff --git a/Gems/Atom/Feature/Common/Assets/Shaders/Reflections/ReflectionScreenSpaceTrace.azsl b/Gems/Atom/Feature/Common/Assets/Shaders/Reflections/ReflectionScreenSpaceTrace.azsl index c95befce05..7c18b7f5de 100644 --- a/Gems/Atom/Feature/Common/Assets/Shaders/Reflections/ReflectionScreenSpaceTrace.azsl +++ b/Gems/Atom/Feature/Common/Assets/Shaders/Reflections/ReflectionScreenSpaceTrace.azsl @@ -10,7 +10,7 @@ #include #include -#include +#include #include #include #include @@ -20,6 +20,18 @@ ShaderResourceGroup PassSrg : SRG_PerPass Texture2DMS m_depth; Texture2DMS m_normal; // RGB10 = Normal (Encoded), A2 = Flags Texture2DMS m_specularF0; // RGB8 = SpecularF0, A8 = Roughness + Texture2DMS m_reflection; + Texture2D m_previousFrame; + + Sampler LinearSampler + { + MinFilter = Linear; + MagFilter = Linear; + MipFilter = Linear; + AddressU = Clamp; + AddressV = Clamp; + AddressW = Clamp; + }; } #include @@ -49,6 +61,12 @@ VSOutput MainVS(VSInput input) } // Pixel Shader +struct PSOutput +{ + float4 m_color : SV_Target0; + float m_depth : SV_Depth; +}; + PSOutput MainPS(VSOutput IN) { // compute screen coords based on a half-res render target @@ -83,16 +101,83 @@ PSOutput MainPS(VSOutput IN) // reflect view ray around surface normal float3 reflectDirVS = normalize(reflect(cameraToPositionVS, normalVS)); + // check to see if the reflected direction is approaching the camera + float rdotv = dot(reflectDirVS, -cameraToPositionVS); + bool fallbackEdge = false; + if (rdotv >= -0.05f) + { + if (rdotv >= 0.0f) + { + // ray points back to camera, fallback to cubemaps + discard; + } + + // ray is approaching the camera direction, but not there yet - trace the reflection and set this + // as a non-reflected pixel, which will prevent artifacts at the boundary + fallbackEdge = true; + } + // trace screenspace rays against the depth buffer to find the screenspace intersection coordinates float4 result = float4(0.0f, 0.0f, 0.0f, 0.0f); float2 hitCoords = float2(0.0f, 0.0f); if (TraceRayScreenSpace(positionVS, reflectDirVS, dimensions, hitCoords)) { - float rdotv = dot(reflectDirVS, cameraToPositionVS); - result = float4(hitCoords, 0.0f, rdotv); + // reconstruct the world space position of the trace coordinates + float2 traceUV = saturate(hitCoords / dimensions); + float traceDepth = PassSrg::m_depth.Load(hitCoords, 0).r; + float2 traceNDC = float2(traceUV.x, 1.0f - traceUV.y) * 2.0f - 1.0f; + float4 traceProjectedPos = float4(traceNDC, traceDepth, 1.0f); + float4 tracePositionVS = mul(ViewSrg::m_projectionMatrixInverse, traceProjectedPos); + tracePositionVS /= tracePositionVS.w; + float4 tracePositionWS = mul(ViewSrg::m_viewMatrixInverse, tracePositionVS); + + // reproject to the previous frame image coordinates + float4 tracePrevNDC = mul(ViewSrg::m_viewProjectionPrevMatrix, tracePositionWS); + tracePrevNDC /= tracePrevNDC.w; + float2 tracePrevUV = float2(tracePrevNDC.x, -1.0f * tracePrevNDC.y) * 0.5f + 0.5f; + + // sample the previous frame image + result.rgb = PassSrg::m_previousFrame.SampleLevel(PassSrg::LinearSampler, tracePrevUV, 0).rgb; + + // apply surface specular + float3 specularF0 = PassSrg::m_specularF0.Load(screenCoords, 0).rgb; + result.rgb *= specularF0; + + // fade rays close to screen edge + const float ScreenFadeDistance = 0.95f; + float2 fadeAmount = max(max(0.0f, traceUV - ScreenFadeDistance), max(0.0f, 1.0f - traceUV - ScreenFadeDistance)); + fadeAmount /= (1.0f - ScreenFadeDistance); + result.a = fallbackEdge ? 0.0f : 1.0f - max(fadeAmount.x, fadeAmount.y); + } + else + { + // ray miss, add in the IBL/probe reflections from the specular pass + float4 positionWS = mul(ViewSrg::m_viewMatrixInverse, positionVS); + float3 cameraToPositionWS = normalize(positionWS - ViewSrg::m_worldPosition); + float3 reflectDirWS = normalize(reflect(cameraToPositionWS, normalWS)); + + result.rgb += PassSrg::m_reflection.Load(screenCoords, 0).rgb; + result.a = fallbackEdge ? 0.0f : 1.0f; + } + + // downsample depth + float downsampledDepth = 0.0f; + for (int y = -2; y < 2; ++y) + { + for (int x = -2; x < 2; ++x) + { + float depth = PassSrg::m_depth.Load(screenCoords + int2(x, y), 0).r; + + // take the closest depth sample (larger depth value due to reverse depth) + if (depth > downsampledDepth) + { + downsampledDepth = depth; + } + } } PSOutput OUT; OUT.m_color = result; + OUT.m_depth = downsampledDepth; return OUT; } diff --git a/Gems/Atom/Feature/Common/Assets/Shaders/Reflections/ReflectionScreenSpaceTrace.shader b/Gems/Atom/Feature/Common/Assets/Shaders/Reflections/ReflectionScreenSpaceTrace.shader index 563e0e3276..3ceabd404a 100644 --- a/Gems/Atom/Feature/Common/Assets/Shaders/Reflections/ReflectionScreenSpaceTrace.shader +++ b/Gems/Atom/Feature/Common/Assets/Shaders/Reflections/ReflectionScreenSpaceTrace.shader @@ -10,7 +10,8 @@ { "Depth" : { - "Enable" : false + "Enable" : true, // required to bind the depth buffer SRV + "CompareFunc" : "Always" } }, diff --git a/Gems/Atom/Feature/Common/Code/Source/CommonSystemComponent.cpp b/Gems/Atom/Feature/Common/Code/Source/CommonSystemComponent.cpp index 2e5db39880..c3c189eb62 100644 --- a/Gems/Atom/Feature/Common/Code/Source/CommonSystemComponent.cpp +++ b/Gems/Atom/Feature/Common/Code/Source/CommonSystemComponent.cpp @@ -100,6 +100,7 @@ #include #include #include +#include #include #include #include @@ -292,6 +293,7 @@ namespace AZ passSystem->AddPassCreator(Name("DeferredFogPass"), &DeferredFogPass::Create); // Add Reflection passes + passSystem->AddPassCreator(Name("ReflectionScreenSpaceTracePass"), &Render::ReflectionScreenSpaceTracePass::Create); passSystem->AddPassCreator(Name("ReflectionScreenSpaceBlurPass"), &Render::ReflectionScreenSpaceBlurPass::Create); passSystem->AddPassCreator(Name("ReflectionScreenSpaceBlurChildPass"), &Render::ReflectionScreenSpaceBlurChildPass::Create); passSystem->AddPassCreator(Name("ReflectionScreenSpaceCompositePass"), &Render::ReflectionScreenSpaceCompositePass::Create); diff --git a/Gems/Atom/Feature/Common/Code/Source/ReflectionScreenSpace/ReflectionCopyFrameBufferPass.cpp b/Gems/Atom/Feature/Common/Code/Source/ReflectionScreenSpace/ReflectionCopyFrameBufferPass.cpp index a1858a7e9d..8c5e36e706 100644 --- a/Gems/Atom/Feature/Common/Code/Source/ReflectionScreenSpace/ReflectionCopyFrameBufferPass.cpp +++ b/Gems/Atom/Feature/Common/Code/Source/ReflectionScreenSpace/ReflectionCopyFrameBufferPass.cpp @@ -7,7 +7,7 @@ */ #include "ReflectionCopyFrameBufferPass.h" -#include "ReflectionScreenSpaceBlurPass.h" +#include "ReflectionScreenSpaceTracePass.h" #include #include @@ -28,16 +28,16 @@ namespace AZ void ReflectionCopyFrameBufferPass::BuildInternal() { - RPI::PassFilter passFilter = RPI::PassFilter::CreateWithPassName(AZ::Name("ReflectionScreenSpaceBlurPass"), GetRenderPipeline()); + RPI::PassFilter passFilter = RPI::PassFilter::CreateWithPassName(AZ::Name("ReflectionScreenSpaceTracePass"), GetRenderPipeline()); RPI::PassSystemInterface::Get()->ForEachPass(passFilter, [this](RPI::Pass* pass) -> RPI::PassFilterExecutionFlow { - Render::ReflectionScreenSpaceBlurPass* blurPass = azrtti_cast(pass); - Data::Instance& frameBufferAttachment = blurPass->GetFrameBufferImageAttachment(); + Render::ReflectionScreenSpaceTracePass* tracePass = azrtti_cast(pass); + Data::Instance& frameBufferAttachment = tracePass->GetPreviousFrameImageAttachment(); RPI::PassAttachmentBinding& outputBinding = GetOutputBinding(0); AttachImageToSlot(outputBinding.m_name, frameBufferAttachment); - return RPI::PassFilterExecutionFlow::StopVisitingPasses; + return RPI::PassFilterExecutionFlow::StopVisitingPasses; }); FullscreenTrianglePass::BuildInternal(); diff --git a/Gems/Atom/Feature/Common/Code/Source/ReflectionScreenSpace/ReflectionScreenSpaceBlurPass.cpp b/Gems/Atom/Feature/Common/Code/Source/ReflectionScreenSpace/ReflectionScreenSpaceBlurPass.cpp index edd7ad1013..c0b25697a3 100644 --- a/Gems/Atom/Feature/Common/Code/Source/ReflectionScreenSpace/ReflectionScreenSpaceBlurPass.cpp +++ b/Gems/Atom/Feature/Common/Code/Source/ReflectionScreenSpace/ReflectionScreenSpaceBlurPass.cpp @@ -12,6 +12,7 @@ #include #include #include +#include #include #include #include @@ -79,7 +80,7 @@ namespace AZ horizontalBlurChildDesc.m_passTemplate = blurHorizontalPassTemplate; // add child passes to perform the vertical and horizontal Gaussian blur for each roughness mip level - for (uint32_t mip = 0; mip < m_numBlurMips; ++mip) + for (uint32_t mip = 0; mip < NumMipLevels - 1; ++mip) { // create Vertical blur child passes { @@ -114,35 +115,15 @@ namespace AZ RemoveChildren(); m_flags.m_createChildren = true; - Data::Instance pool = RPI::ImageSystemInterface::Get()->GetSystemAttachmentPool(); - - // retrieve the image attachment from the pass - AZ_Assert(m_ownedAttachments.size() == 1, "ReflectionScreenSpaceBlurPass must have exactly one ImageAttachment defined"); - RPI::Ptr reflectionImageAttachment = m_ownedAttachments[0]; - - // update the image attachment descriptor to sync up size and format - reflectionImageAttachment->Update(); - - // change the lifetime since we want it to live between frames - reflectionImageAttachment->m_lifetime = RHI::AttachmentLifetimeType::Imported; - - // set the bind flags - RHI::ImageDescriptor& imageDesc = reflectionImageAttachment->m_descriptor.m_image; - imageDesc.m_bindFlags |= RHI::ImageBindFlags::Color | RHI::ImageBindFlags::ShaderReadWrite; - - // create the image attachment - RHI::ClearValue clearValue = RHI::ClearValue::CreateVector4Float(0, 0, 0, 0); - m_frameBufferImageAttachment = RPI::AttachmentImage::Create(*pool.get(), imageDesc, Name(reflectionImageAttachment->m_path.GetCStr()), &clearValue, nullptr); - - reflectionImageAttachment->m_path = m_frameBufferImageAttachment->GetAttachmentId(); - reflectionImageAttachment->m_importedResource = m_frameBufferImageAttachment; - - uint32_t mipLevels = reflectionImageAttachment->m_descriptor.m_image.m_mipLevels; + // retrieve the reflection, downsampled normal, and downsampled depth attachments + RPI::PassAttachment* reflectionImageAttachment = GetInputOutputBinding(0).m_attachment.get(); RHI::Size imageSize = reflectionImageAttachment->m_descriptor.m_image.m_size; + RPI::PassAttachment* downsampledDepthImageAttachment = GetInputOutputBinding(1).m_attachment.get(); + // create transient attachments, one for each blur mip level AZStd::vector transientPassAttachments; - for (uint32_t mip = 1; mip <= mipLevels - 1; ++mip) + for (uint32_t mip = 1; mip <= NumMipLevels - 1; ++mip) { RHI::Size mipSize = imageSize.GetReducedMip(mip); @@ -160,8 +141,6 @@ namespace AZ m_ownedAttachments.push_back(transientPassAttachment); } - m_numBlurMips = mipLevels - 1; - // call ParentPass::BuildInternal() first to configure the slots and auto-add the empty bindings, // then we will assign attachments to the bindings ParentPass::BuildInternal(); @@ -170,13 +149,27 @@ namespace AZ uint32_t attachmentIndex = 0; for (auto& verticalBlurChildPass : m_verticalBlurChildPasses) { + // mip0 source input RPI::PassAttachmentBinding& inputAttachmentBinding = verticalBlurChildPass->GetInputOutputBinding(0); inputAttachmentBinding.SetAttachment(reflectionImageAttachment); inputAttachmentBinding.m_connectedBinding = &GetInputOutputBinding(0); + // mipN transient output RPI::PassAttachmentBinding& outputAttachmentBinding = verticalBlurChildPass->GetInputOutputBinding(1); outputAttachmentBinding.SetAttachment(transientPassAttachments[attachmentIndex]); + // setup downsampled depth output + // Note: this is a vertical pass output only, and each vertical child pass writes a specific mip level + uint32_t mipLevel = attachmentIndex + 1; + + // downsampled depth output + RPI::PassAttachmentBinding& downsampledDepthAttachmentBinding = verticalBlurChildPass->GetInputOutputBinding(2); + RHI::ImageViewDescriptor downsampledDepthOutputViewDesc; + downsampledDepthOutputViewDesc.m_mipSliceMin = static_cast(mipLevel); + downsampledDepthOutputViewDesc.m_mipSliceMax = static_cast(mipLevel); + downsampledDepthAttachmentBinding.m_unifiedScopeDesc.SetAsImage(downsampledDepthOutputViewDesc); + downsampledDepthAttachmentBinding.SetAttachment(downsampledDepthImageAttachment); + attachmentIndex++; } diff --git a/Gems/Atom/Feature/Common/Code/Source/ReflectionScreenSpace/ReflectionScreenSpaceBlurPass.h b/Gems/Atom/Feature/Common/Code/Source/ReflectionScreenSpace/ReflectionScreenSpaceBlurPass.h index b7ea98ae25..9548665c8a 100644 --- a/Gems/Atom/Feature/Common/Code/Source/ReflectionScreenSpace/ReflectionScreenSpaceBlurPass.h +++ b/Gems/Atom/Feature/Common/Code/Source/ReflectionScreenSpace/ReflectionScreenSpaceBlurPass.h @@ -29,12 +29,8 @@ namespace AZ //! Creates a new pass without a PassTemplate static RPI::Ptr Create(const RPI::PassDescriptor& descriptor); - //! Returns the frame buffer image attachment used by the ReflectionFrameBufferCopy pass - //! to store the previous frame image - Data::Instance& GetFrameBufferImageAttachment() { return m_frameBufferImageAttachment; } - - //! Returns the number of mip levels in the blur - uint32_t GetNumBlurMips() const { return m_numBlurMips; } + //! The total number of mip levels in the blur (including mip0) + static const uint32_t NumMipLevels = 5; private: explicit ReflectionScreenSpaceBlurPass(const RPI::PassDescriptor& descriptor); @@ -47,9 +43,6 @@ namespace AZ AZStd::vector> m_verticalBlurChildPasses; AZStd::vector> m_horizontalBlurChildPasses; - - Data::Instance m_frameBufferImageAttachment; - uint32_t m_numBlurMips = 0; }; } // namespace RPI } // namespace AZ diff --git a/Gems/Atom/Feature/Common/Code/Source/ReflectionScreenSpace/ReflectionScreenSpaceCompositePass.cpp b/Gems/Atom/Feature/Common/Code/Source/ReflectionScreenSpace/ReflectionScreenSpaceCompositePass.cpp index 1362191691..d27d4d90c9 100644 --- a/Gems/Atom/Feature/Common/Code/Source/ReflectionScreenSpace/ReflectionScreenSpaceCompositePass.cpp +++ b/Gems/Atom/Feature/Common/Code/Source/ReflectionScreenSpace/ReflectionScreenSpaceCompositePass.cpp @@ -26,6 +26,19 @@ namespace AZ { } + bool ReflectionScreenSpaceCompositePass::IsEnabled() const + { + // delay for a few frames to ensure that the previous frame texture is populated + static const uint32_t FrameDelay = 10; + if (m_frameDelayCount < FrameDelay) + { + m_frameDelayCount++; + return false; + } + + return true; + } + void ReflectionScreenSpaceCompositePass::CompileResources([[maybe_unused]] const RHI::FrameGraphCompileContext& context) { if (!m_shaderResourceGroup) @@ -33,22 +46,8 @@ namespace AZ return; } - RPI::PassFilter passFilter = RPI::PassFilter::CreateWithPassName(AZ::Name("ReflectionScreenSpaceBlurPass"), GetRenderPipeline()); - - RPI::PassSystemInterface::Get()->ForEachPass(passFilter, [this](RPI::Pass* pass) -> RPI::PassFilterExecutionFlow - { - Render::ReflectionScreenSpaceBlurPass* blurPass = azrtti_cast(pass); - - // compute the max mip level based on the available mips in the previous frame image, and capping it - // to stay within a range that has reasonable data - const uint32_t MaxNumRoughnessMips = 8; - uint32_t maxMipLevel = AZStd::min(MaxNumRoughnessMips, blurPass->GetNumBlurMips()) - 1; - - auto constantIndex = m_shaderResourceGroup->FindShaderInputConstantIndex(Name("m_maxMipLevel")); - m_shaderResourceGroup->SetConstant(constantIndex, maxMipLevel); - - return RPI::PassFilterExecutionFlow::StopVisitingPasses; - }); + auto constantIndex = m_shaderResourceGroup->FindShaderInputConstantIndex(Name("m_maxMipLevel")); + m_shaderResourceGroup->SetConstant(constantIndex, ReflectionScreenSpaceBlurPass::NumMipLevels - 1); FullscreenTrianglePass::CompileResources(context); } diff --git a/Gems/Atom/Feature/Common/Code/Source/ReflectionScreenSpace/ReflectionScreenSpaceCompositePass.h b/Gems/Atom/Feature/Common/Code/Source/ReflectionScreenSpace/ReflectionScreenSpaceCompositePass.h index c70a21cd1e..03b2834633 100644 --- a/Gems/Atom/Feature/Common/Code/Source/ReflectionScreenSpace/ReflectionScreenSpaceCompositePass.h +++ b/Gems/Atom/Feature/Common/Code/Source/ReflectionScreenSpace/ReflectionScreenSpaceCompositePass.h @@ -34,6 +34,9 @@ namespace AZ // Pass Overrides... void CompileResources(const RHI::FrameGraphCompileContext& context) override; + bool IsEnabled() const override; + + mutable uint32_t m_frameDelayCount = 0; }; } // namespace RPI } // namespace AZ diff --git a/Gems/Atom/Feature/Common/Code/Source/ReflectionScreenSpace/ReflectionScreenSpaceTracePass.cpp b/Gems/Atom/Feature/Common/Code/Source/ReflectionScreenSpace/ReflectionScreenSpaceTracePass.cpp new file mode 100644 index 0000000000..7f6bce8a00 --- /dev/null +++ b/Gems/Atom/Feature/Common/Code/Source/ReflectionScreenSpace/ReflectionScreenSpaceTracePass.cpp @@ -0,0 +1,58 @@ +/* + * 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 "ReflectionScreenSpaceTracePass.h" +#include +#include +#include +#include +#include + +namespace AZ +{ + namespace Render + { + RPI::Ptr ReflectionScreenSpaceTracePass::Create(const RPI::PassDescriptor& descriptor) + { + RPI::Ptr pass = aznew ReflectionScreenSpaceTracePass(descriptor); + return AZStd::move(pass); + } + + ReflectionScreenSpaceTracePass::ReflectionScreenSpaceTracePass(const RPI::PassDescriptor& descriptor) + : RPI::FullscreenTrianglePass(descriptor) + { + } + + void ReflectionScreenSpaceTracePass::BuildInternal() + { + Data::Instance pool = RPI::ImageSystemInterface::Get()->GetSystemAttachmentPool(); + + // retrieve the previous frame image attachment from the pass + AZ_Assert(m_ownedAttachments.size() == 3, "ReflectionScreenSpaceTracePass must have the following attachment images defined: ReflectionImage, DownSampledDepthImage, and PreviousFrameImage"); + RPI::Ptr previousFrameImageAttachment = m_ownedAttachments[2]; + + // update the image attachment descriptor to sync up size and format + previousFrameImageAttachment->Update(); + + // change the lifetime since we want it to live between frames + previousFrameImageAttachment->m_lifetime = RHI::AttachmentLifetimeType::Imported; + + // set the bind flags + RHI::ImageDescriptor& imageDesc = previousFrameImageAttachment->m_descriptor.m_image; + imageDesc.m_bindFlags |= RHI::ImageBindFlags::Color | RHI::ImageBindFlags::ShaderReadWrite; + + // create the image attachment + RHI::ClearValue clearValue = RHI::ClearValue::CreateVector4Float(0, 0, 0, 0); + m_previousFrameImageAttachment = RPI::AttachmentImage::Create(*pool.get(), imageDesc, Name(previousFrameImageAttachment->m_path.GetCStr()), &clearValue, nullptr); + + previousFrameImageAttachment->m_path = m_previousFrameImageAttachment->GetAttachmentId(); + previousFrameImageAttachment->m_importedResource = m_previousFrameImageAttachment; + } + + } // namespace RPI +} // namespace AZ diff --git a/Gems/Atom/Feature/Common/Code/Source/ReflectionScreenSpace/ReflectionScreenSpaceTracePass.h b/Gems/Atom/Feature/Common/Code/Source/ReflectionScreenSpace/ReflectionScreenSpaceTracePass.h new file mode 100644 index 0000000000..b03418bbac --- /dev/null +++ b/Gems/Atom/Feature/Common/Code/Source/ReflectionScreenSpace/ReflectionScreenSpaceTracePass.h @@ -0,0 +1,43 @@ +/* + * 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 +#include +#include +#include + +namespace AZ +{ + namespace Render + { + //! This pass traces screenspace reflections from the previous frame image. + class ReflectionScreenSpaceTracePass + : public RPI::FullscreenTrianglePass + { + AZ_RPI_PASS(DiffuseProbeGridDownsamplePass); + + public: + AZ_RTTI(Render::ReflectionScreenSpaceTracePass, "{70FD45E9-8363-4AA1-A514-3C24AC975E53}", FullscreenTrianglePass); + AZ_CLASS_ALLOCATOR(Render::ReflectionScreenSpaceTracePass, SystemAllocator, 0); + + //! Creates a new pass without a PassTemplate + static RPI::Ptr Create(const RPI::PassDescriptor& descriptor); + + Data::Instance& GetPreviousFrameImageAttachment() { return m_previousFrameImageAttachment; } + + private: + explicit ReflectionScreenSpaceTracePass(const RPI::PassDescriptor& descriptor); + + // Pass behavior overrides... + virtual void BuildInternal() override; + + Data::Instance m_previousFrameImageAttachment; + }; + } // namespace RPI +} // namespace AZ diff --git a/Gems/Atom/Feature/Common/Code/atom_feature_common_files.cmake b/Gems/Atom/Feature/Common/Code/atom_feature_common_files.cmake index 184460b210..3ed2ec8755 100644 --- a/Gems/Atom/Feature/Common/Code/atom_feature_common_files.cmake +++ b/Gems/Atom/Feature/Common/Code/atom_feature_common_files.cmake @@ -275,6 +275,8 @@ set(FILES Source/RayTracing/RayTracingPassData.h Source/ReflectionProbe/ReflectionProbeFeatureProcessor.cpp Source/ReflectionProbe/ReflectionProbe.cpp + Source/ReflectionScreenSpace/ReflectionScreenSpaceTracePass.cpp + Source/ReflectionScreenSpace/ReflectionScreenSpaceTracePass.h Source/ReflectionScreenSpace/ReflectionScreenSpaceBlurPass.cpp Source/ReflectionScreenSpace/ReflectionScreenSpaceBlurPass.h Source/ReflectionScreenSpace/ReflectionScreenSpaceBlurChildPass.cpp From 52742dff48faec87d8f24d02315dafe1226355f8 Mon Sep 17 00:00:00 2001 From: Olex Lozitskiy <5432499+AMZN-Olex@users.noreply.github.com> Date: Thu, 18 Nov 2021 16:01:52 -0500 Subject: [PATCH 121/345] Created Gem::Multiplayer.Tools.Static cmake target Signed-off-by: Olex Lozitskiy <5432499+AMZN-Olex@users.noreply.github.com> --- Gems/Multiplayer/Code/CMakeLists.txt | 27 +++++++++++++++++++++++---- 1 file changed, 23 insertions(+), 4 deletions(-) diff --git a/Gems/Multiplayer/Code/CMakeLists.txt b/Gems/Multiplayer/Code/CMakeLists.txt index 316734f777..8b2f1099b9 100644 --- a/Gems/Multiplayer/Code/CMakeLists.txt +++ b/Gems/Multiplayer/Code/CMakeLists.txt @@ -85,12 +85,32 @@ ly_create_alias(NAME Multiplayer.Clients NAMESPACE Gem TARGETS Gem::Multiplayer ly_create_alias(NAME Multiplayer.Servers NAMESPACE Gem TARGETS Gem::Multiplayer Gem::Multiplayer.Debug) if (PAL_TRAIT_BUILD_HOST_TOOLS) + ly_add_target( + NAME Multiplayer.Tools.Static STATIC + NAMESPACE Gem + FILES_CMAKE + multiplayer_tools_files.cmake + INCLUDE_DIRECTORIES + PRIVATE + ${pal_source_dir} + AZ::AzNetworking + Source + . + PUBLIC + Include + BUILD_DEPENDENCIES + PUBLIC + AZ::AzCore + AZ::AzFramework + AZ::AzNetworking + AZ::AzToolsFramework + ) + ly_add_target( NAME Multiplayer.Editor GEM_MODULE NAMESPACE Gem FILES_CMAKE multiplayer_editor_shared_files.cmake - multiplayer_tools_files.cmake COMPILE_DEFINITIONS PUBLIC MULTIPLAYER_EDITOR @@ -112,6 +132,7 @@ if (PAL_TRAIT_BUILD_HOST_TOOLS) Gem::Atom_RPI.Public Gem::Atom_RHI.Reflect Gem::Multiplayer.Static + Gem::Multiplayer.Tools.Static Gem::Multiplayer.Builders ) @@ -158,7 +179,6 @@ if (PAL_TRAIT_BUILD_TESTS_SUPPORTED) NAMESPACE Gem FILES_CMAKE multiplayer_tools_tests_files.cmake - multiplayer_tools_files.cmake INCLUDE_DIRECTORIES PRIVATE Tests @@ -168,10 +188,9 @@ if (PAL_TRAIT_BUILD_TESTS_SUPPORTED) PRIVATE AZ::AzTest AZ::AzTestShared - AZ::AzToolsFramework AZ::AzToolsFrameworkTestCommon - AZ::AzNetworking Gem::Multiplayer.Static + Gem::Multiplayer.Tools.Static ) ly_add_googletest( NAME Gem::Multiplayer.Builders.Tests From 2ab786670263b5576fdf05afce7752c091cfaad7 Mon Sep 17 00:00:00 2001 From: puvvadar Date: Thu, 18 Nov 2021 13:32:11 -0800 Subject: [PATCH 122/345] Re-resolve base.prefab Signed-off-by: puvvadar --- AutomatedTesting/Levels/Base/Base.prefab | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/AutomatedTesting/Levels/Base/Base.prefab b/AutomatedTesting/Levels/Base/Base.prefab index 8782591f9d..98495663b7 100644 --- a/AutomatedTesting/Levels/Base/Base.prefab +++ b/AutomatedTesting/Levels/Base/Base.prefab @@ -17,16 +17,7 @@ }, "Component_[3837204912784440039]": { "$type": "EditorDisabledCompositionComponent", - "Id": 3837204912784440039, - "ChildEntityOrderEntryArray": [ - { - "EntityId": "" - }, - { - "EntityId": "", - "SortIndex": 1 - } - ] + "Id": 3837204912784440039 }, "Component_[4272963378099646759]": { "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent", From cf4ef5e73b09975b5949075ff8772df9bafdaec9 Mon Sep 17 00:00:00 2001 From: antonmic <56370189+antonmic@users.noreply.github.com> Date: Thu, 18 Nov 2021 13:37:06 -0800 Subject: [PATCH 123/345] Addressed feedback from previous PR plus some cleanup Signed-off-by: antonmic <56370189+antonmic@users.noreply.github.com> --- .../Entity/EntityDebugDisplayBus.h | 3 + .../Code/Source/AuxGeom/AuxGeomDrawQueue.cpp | 7 +- .../Code/Source/AuxGeom/AuxGeomDrawQueue.h | 1 + .../Atom/RPI.Public/AuxGeom/AuxGeomDraw.h | 13 ++ .../AtomDebugDisplayViewportInterface.cpp | 113 ++++++++++++------ .../AtomDebugDisplayViewportInterface.h | 3 + 6 files changed, 100 insertions(+), 40 deletions(-) diff --git a/Code/Framework/AzFramework/AzFramework/Entity/EntityDebugDisplayBus.h b/Code/Framework/AzFramework/AzFramework/Entity/EntityDebugDisplayBus.h index 49506364f4..b81a0ab7f0 100644 --- a/Code/Framework/AzFramework/AzFramework/Entity/EntityDebugDisplayBus.h +++ b/Code/Framework/AzFramework/AzFramework/Entity/EntityDebugDisplayBus.h @@ -76,9 +76,12 @@ namespace AzFramework virtual void DrawSolidCone(const AZ::Vector3& pos, const AZ::Vector3& dir, float radius, float height, bool drawShaded = true) { (void)pos; (void)dir; (void)radius; (void)height; (void)drawShaded; } virtual void DrawWireCylinder(const AZ::Vector3& center, const AZ::Vector3& axis, float radius, float height) { (void)center; (void)axis; (void)radius; (void)height; } virtual void DrawSolidCylinder(const AZ::Vector3& center, const AZ::Vector3& axis, float radius, float height, bool drawShaded = true) { (void)center; (void)axis; (void)radius; (void)height; (void)drawShaded; } + virtual void DrawWireCylinderNoEnds(const AZ::Vector3& center, const AZ::Vector3& axis, float radius, float height) { (void)center; (void)axis; (void)radius; (void)height; } + virtual void DrawSolidCylinderNoEnds(const AZ::Vector3& center, const AZ::Vector3& axis, float radius, float height, bool drawShaded = true) { (void)center; (void)axis; (void)radius; (void)height; (void)drawShaded; } virtual void DrawWireCapsule(const AZ::Vector3& center, const AZ::Vector3& axis, float radius, float heightStraightSection) { (void)center; (void)axis; (void)radius; (void)heightStraightSection; } virtual void DrawWireSphere(const AZ::Vector3& pos, float radius) { (void)pos; (void)radius; } virtual void DrawWireSphere(const AZ::Vector3& pos, const AZ::Vector3 radius) { (void)pos; (void)radius; } + virtual void DrawWireHemisphere(const AZ::Vector3& pos, const AZ::Vector3& axis, float radius) { (void)pos; (void)axis; (void)radius; } virtual void DrawWireDisk(const AZ::Vector3& pos, const AZ::Vector3& dir, float radius) { (void)pos; (void)dir; (void)radius; } virtual void DrawBall(const AZ::Vector3& pos, float radius, bool drawShaded = true) { (void)pos; (void)radius; (void)drawShaded; } virtual void DrawDisk(const AZ::Vector3& pos, const AZ::Vector3& dir, float radius) { (void)pos; (void)dir; (void)radius; } diff --git a/Gems/Atom/Feature/Common/Code/Source/AuxGeom/AuxGeomDrawQueue.cpp b/Gems/Atom/Feature/Common/Code/Source/AuxGeom/AuxGeomDrawQueue.cpp index 7c713af96a..e2998e5009 100644 --- a/Gems/Atom/Feature/Common/Code/Source/AuxGeom/AuxGeomDrawQueue.cpp +++ b/Gems/Atom/Feature/Common/Code/Source/AuxGeom/AuxGeomDrawQueue.cpp @@ -322,9 +322,14 @@ namespace AZ return Matrix3x3::CreateFromColumns(unitOrthogonal, unitDirection, unitCross); } + void AuxGeomDrawQueue::DrawSphere(const AZ::Vector3& center, const AZ::Vector3& direction, float radius, const AZ::Color& color, DrawStyle style, DepthTest depthTest, DepthWrite depthWrite, FaceCullMode faceCull, int32_t viewProjOverrideIndex) + { + DrawSphereCommon(center, direction, radius, color, style, depthTest, depthWrite, faceCull, viewProjOverrideIndex, false); + } + void AuxGeomDrawQueue::DrawSphere(const AZ::Vector3& center, float radius, const AZ::Color& color, DrawStyle style, DepthTest depthTest, DepthWrite depthWrite, FaceCullMode faceCull, int32_t viewProjOverrideIndex) { - DrawSphereCommon(center, AZ::Vector3::CreateAxisY(), radius, color, style, depthTest, depthWrite, faceCull, viewProjOverrideIndex, false); + DrawSphereCommon(center, AZ::Vector3::CreateAxisZ(), radius, color, style, depthTest, depthWrite, faceCull, viewProjOverrideIndex, false); } void AuxGeomDrawQueue::DrawHemisphere(const AZ::Vector3& center, const AZ::Vector3& direction, float radius, const AZ::Color& color, DrawStyle style, DepthTest depthTest, DepthWrite depthWrite, FaceCullMode faceCull, int32_t viewProjOverrideIndex) diff --git a/Gems/Atom/Feature/Common/Code/Source/AuxGeom/AuxGeomDrawQueue.h b/Gems/Atom/Feature/Common/Code/Source/AuxGeom/AuxGeomDrawQueue.h index 2356abdf52..7fa1bbdca8 100644 --- a/Gems/Atom/Feature/Common/Code/Source/AuxGeom/AuxGeomDrawQueue.h +++ b/Gems/Atom/Feature/Common/Code/Source/AuxGeom/AuxGeomDrawQueue.h @@ -60,6 +60,7 @@ namespace AZ // Fixed shape draws void DrawQuad(float width, float height, const AZ::Matrix3x4& transform, const AZ::Color& color, DrawStyle style, DepthTest depthTest, DepthWrite depthWrite, FaceCullMode faceCull, int32_t viewProjOverrideIndex) override; void DrawSphere(const AZ::Vector3& center, float radius, const AZ::Color& color, DrawStyle style, DepthTest depthTest, DepthWrite depthWrite, FaceCullMode faceCull, int32_t viewProjOverrideIndex) override; + void DrawSphere(const AZ::Vector3& center, const AZ::Vector3& direction, float radius, const AZ::Color& color, DrawStyle style, DepthTest depthTest, DepthWrite depthWrite, FaceCullMode faceCull, int32_t viewProjOverrideIndex) override; void DrawHemisphere(const AZ::Vector3& center, const AZ::Vector3& direction, float radius, const AZ::Color& color, DrawStyle style, DepthTest depthTest, DepthWrite depthWrite, FaceCullMode faceCull, int32_t viewProjOverrideIndex) override; void DrawDisk(const AZ::Vector3& center, const AZ::Vector3& direction, float radius, const AZ::Color& color, DrawStyle style, DepthTest depthTest, DepthWrite depthWrite, FaceCullMode faceCull, int32_t viewProjOverrideIndex) override; void DrawCone(const AZ::Vector3& center, const AZ::Vector3& direction, float radius, float height, const AZ::Color& color, DrawStyle style, DepthTest depthTest, DepthWrite depthWrite, FaceCullMode faceCull, int32_t viewProjOverrideIndex) override; diff --git a/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/AuxGeom/AuxGeomDraw.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/AuxGeom/AuxGeomDraw.h index d6d2352097..29b127407e 100644 --- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/AuxGeom/AuxGeomDraw.h +++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/AuxGeom/AuxGeomDraw.h @@ -147,8 +147,21 @@ namespace AZ //! @param viewProjOverrideIndex Which view projection override entry to use, -1 if unused virtual void DrawSphere( const AZ::Vector3& center, float radius, const AZ::Color& color, DrawStyle style = DrawStyle::Shaded, DepthTest depthTest = DepthTest::On, DepthWrite depthWrite = DepthWrite::On, FaceCullMode faceCull = FaceCullMode::Back, int32_t viewProjOverrideIndex = -1) = 0; + //! Draw a sphere. + //! @param center The center of the sphere. + //! @param direction The direction vector. The Pole of the hemisphere will point along this vector. + //! @param radius The radius. + //! @param color The color to draw the sphere. + //! @param style The draw style (point, wireframe, solid, shaded etc). + //! @param depthTest If depth testing should be enabled + //! @param depthWrite If depth writing should be enabled + //! @param faceCull Which (if any) facing triangles should be culled + //! @param viewProjOverrideIndex Which view projection override entry to use, -1 if unused + virtual void DrawSphere(const AZ::Vector3& center, const AZ::Vector3& direction, float radius, const AZ::Color& color, DrawStyle style = DrawStyle::Shaded, DepthTest depthTest = DepthTest::On, DepthWrite depthWrite = DepthWrite::On, FaceCullMode faceCull = FaceCullMode::Back, int32_t viewProjOverrideIndex = -1) = 0; + //! Draw a hemisphere. //! @param center The center of the sphere. + //! @param direction The direction vector. The Pole of the hemisphere will point along this vector. //! @param radius The radius. //! @param color The color to draw the sphere. //! @param style The draw style (point, wireframe, solid, shaded etc). diff --git a/Gems/AtomLyIntegration/AtomBridge/Code/Source/AtomDebugDisplayViewportInterface.cpp b/Gems/AtomLyIntegration/AtomBridge/Code/Source/AtomDebugDisplayViewportInterface.cpp index b72a19c311..39cc2f63b2 100644 --- a/Gems/AtomLyIntegration/AtomBridge/Code/Source/AtomDebugDisplayViewportInterface.cpp +++ b/Gems/AtomLyIntegration/AtomBridge/Code/Source/AtomDebugDisplayViewportInterface.cpp @@ -1016,6 +1016,55 @@ namespace AZ::AtomBridge } } + void AtomDebugDisplayViewportInterface::DrawWireCylinderNoEnds(const AZ::Vector3& center, const AZ::Vector3& axis, float radius, float height) + { + if (m_auxGeomPtr) + { + const float scale = GetCurrentTransform().RetrieveScale().GetMaxElement(); + const AZ::Vector3 worldCenter = ToWorldSpacePosition(center); + const AZ::Vector3 worldAxis = ToWorldSpaceVector(axis); + m_auxGeomPtr->DrawCylinderNoEnds( + worldCenter, + worldAxis, + scale * radius, + scale * height, + m_rendState.m_color, + AZ::RPI::AuxGeomDraw::DrawStyle::Line, + m_rendState.m_depthTest, + m_rendState.m_depthWrite, + m_rendState.m_faceCullMode, + m_rendState.m_viewProjOverrideIndex + ); + } + } + + void AtomDebugDisplayViewportInterface::DrawSolidCylinderNoEnds( + const AZ::Vector3& center, + const AZ::Vector3& axis, + float radius, + float height, + bool drawShaded) + { + if (m_auxGeomPtr) + { + const float scale = GetCurrentTransform().RetrieveScale().GetMaxElement(); + const AZ::Vector3 worldCenter = ToWorldSpacePosition(center); + const AZ::Vector3 worldAxis = ToWorldSpaceVector(axis); + m_auxGeomPtr->DrawCylinderNoEnds( + worldCenter, + worldAxis, + scale * radius, + scale * height, + m_rendState.m_color, + drawShaded ? AZ::RPI::AuxGeomDraw::DrawStyle::Shaded : AZ::RPI::AuxGeomDraw::DrawStyle::Solid, + m_rendState.m_depthTest, + m_rendState.m_depthWrite, + m_rendState.m_faceCullMode, + m_rendState.m_viewProjOverrideIndex + ); + } + } + void AtomDebugDisplayViewportInterface::DrawWireCapsule( const AZ::Vector3& center, const AZ::Vector3& axis, @@ -1030,52 +1079,19 @@ namespace AZ::AtomBridge const AZ::Vector3 worldCenter = ToWorldSpacePosition(center); const AZ::Vector3 worldAxis = ToWorldSpaceVector(axis); - // Draw cylinder part (or just a circle around the middle) + // Draw cylinder part (if cylinder height is too small, ignore cylinder and just draw both hemispheres) if (heightStraightSection > FLT_EPSILON) { - m_auxGeomPtr->DrawCylinderNoEnds( - worldCenter, - worldAxis, - scale * radius, - scale * heightStraightSection, - m_rendState.m_color, - AZ::RPI::AuxGeomDraw::DrawStyle::Line, - m_rendState.m_depthTest, - m_rendState.m_depthWrite, - m_rendState.m_faceCullMode, - m_rendState.m_viewProjOverrideIndex - ); + DrawWireCylinderNoEnds(worldCenter, worldAxis, scale * radius, scale * heightStraightSection); } - AZ::Vector3 ortho1Normalized, ortho2Normalized; - CalcBasisVectors(axisNormalized, ortho1Normalized, ortho2Normalized); AZ::Vector3 centerToTopCircleCenter = axisNormalized * heightStraightSection * 0.5f; - AZ::Vector3 topCenter = center + centerToTopCircleCenter; - AZ::Vector3 bottomCenter = center - centerToTopCircleCenter; - m_auxGeomPtr->DrawHemisphere( - topCenter, - worldAxis, - scale * radius, - m_rendState.m_color, - AZ::RPI::AuxGeomDraw::DrawStyle::Line, - m_rendState.m_depthTest, - m_rendState.m_depthWrite, - m_rendState.m_faceCullMode, - m_rendState.m_viewProjOverrideIndex - ); + // Top hemisphere + DrawWireHemisphere(center + centerToTopCircleCenter, worldAxis, scale * radius); - m_auxGeomPtr->DrawHemisphere( - bottomCenter, - -worldAxis, - scale * radius, - m_rendState.m_color, - AZ::RPI::AuxGeomDraw::DrawStyle::Line, - m_rendState.m_depthTest, - m_rendState.m_depthWrite, - m_rendState.m_faceCullMode, - m_rendState.m_viewProjOverrideIndex - ); + // Bottom hemisphere + DrawWireHemisphere(center - centerToTopCircleCenter, -worldAxis, scale * radius); } } @@ -1122,6 +1138,25 @@ namespace AZ::AtomBridge } } + void AtomDebugDisplayViewportInterface::DrawWireHemisphere(const AZ::Vector3& pos, const AZ::Vector3& axis, float radius) + { + if (m_auxGeomPtr) + { + const float scale = GetCurrentTransform().RetrieveScale().GetMaxElement(); + m_auxGeomPtr->DrawHemisphere( + ToWorldSpacePosition(pos), + axis, + scale * radius, + m_rendState.m_color, + AZ::RPI::AuxGeomDraw::DrawStyle::Line, + m_rendState.m_depthTest, + m_rendState.m_depthWrite, + m_rendState.m_faceCullMode, + m_rendState.m_viewProjOverrideIndex + ); + } + } + void AtomDebugDisplayViewportInterface::DrawWireDisk(const AZ::Vector3& pos, const AZ::Vector3& dir, float radius) { if (m_auxGeomPtr) diff --git a/Gems/AtomLyIntegration/AtomBridge/Code/Source/AtomDebugDisplayViewportInterface.h b/Gems/AtomLyIntegration/AtomBridge/Code/Source/AtomDebugDisplayViewportInterface.h index 5f902c5884..7f7af9bbcb 100644 --- a/Gems/AtomLyIntegration/AtomBridge/Code/Source/AtomDebugDisplayViewportInterface.h +++ b/Gems/AtomLyIntegration/AtomBridge/Code/Source/AtomDebugDisplayViewportInterface.h @@ -168,9 +168,12 @@ namespace AZ::AtomBridge void DrawSolidCone(const AZ::Vector3& pos, const AZ::Vector3& dir, float radius, float height, bool drawShaded) override; void DrawWireCylinder(const AZ::Vector3& center, const AZ::Vector3& axis, float radius, float height) override; void DrawSolidCylinder(const AZ::Vector3& center, const AZ::Vector3& axis, float radius, float height, bool drawShaded) override; + void DrawWireCylinderNoEnds(const AZ::Vector3& center, const AZ::Vector3& axis, float radius, float height) override; + void DrawSolidCylinderNoEnds(const AZ::Vector3& center, const AZ::Vector3& axis, float radius, float height, bool drawShaded) override; void DrawWireCapsule(const AZ::Vector3& center, const AZ::Vector3& axis, float radius, float heightStraightSection) override; void DrawWireSphere(const AZ::Vector3& pos, float radius) override; void DrawWireSphere(const AZ::Vector3& pos, const AZ::Vector3 radius) override; + void DrawWireHemisphere(const AZ::Vector3& pos, const AZ::Vector3& axis, float radius) override; void DrawWireDisk(const AZ::Vector3& pos, const AZ::Vector3& dir, float radius) override; void DrawBall(const AZ::Vector3& pos, float radius, bool drawShaded) override; void DrawDisk(const AZ::Vector3& pos, const AZ::Vector3& dir, float radius) override; From e97f5de94a072f1942efea32ccc14b1a81c62d53 Mon Sep 17 00:00:00 2001 From: Guthrie Adams Date: Thu, 18 Nov 2021 15:48:47 -0600 Subject: [PATCH 124/345] Updated material version warning messages to include the affected asset Signed-off-by: Guthrie Adams --- .../Code/Source/RPI.Edit/Material/MaterialSourceData.cpp | 7 ++++--- .../Code/Source/RPI.Reflect/Material/MaterialAsset.cpp | 8 +++++--- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/Gems/Atom/RPI/Code/Source/RPI.Edit/Material/MaterialSourceData.cpp b/Gems/Atom/RPI/Code/Source/RPI.Edit/Material/MaterialSourceData.cpp index d6308ec655..dce27f3136 100644 --- a/Gems/Atom/RPI/Code/Source/RPI.Edit/Material/MaterialSourceData.cpp +++ b/Gems/Atom/RPI/Code/Source/RPI.Edit/Material/MaterialSourceData.cpp @@ -116,10 +116,11 @@ namespace AZ { m_properties = AZStd::move(newPropertyGroups); - AZ_Warning("MaterialSourceData", false, + AZ_Warning( + "MaterialSourceData", false, "This material is based on version '%u' of '%s', but the material type is now at version '%u'. " - "Automatic updates are available. Consider updating the .material source file.", - m_materialTypeVersion, m_materialType.c_str(), materialTypeSourceData.m_version); + "Automatic updates are available. Consider updating '%s'.", + m_materialTypeVersion, materialTypeFullPath.c_str(), materialTypeSourceData.m_version, materialSourceFilePath); } m_materialTypeVersion = materialTypeSourceData.m_version; diff --git a/Gems/Atom/RPI/Code/Source/RPI.Reflect/Material/MaterialAsset.cpp b/Gems/Atom/RPI/Code/Source/RPI.Reflect/Material/MaterialAsset.cpp index ac90333842..3c6947b83d 100644 --- a/Gems/Atom/RPI/Code/Source/RPI.Reflect/Material/MaterialAsset.cpp +++ b/Gems/Atom/RPI/Code/Source/RPI.Reflect/Material/MaterialAsset.cpp @@ -226,10 +226,12 @@ namespace AZ if (changesWereApplied) { - AZ_Warning("MaterialAsset", false, + AZ_Warning( + "MaterialAsset", false, "This material is based on version '%u' of %s, but the material type is now at version '%u'. " - "Automatic updates are available. Consider updating the .material source file.", - originalVersion, m_materialTypeAsset.ToString().c_str(), m_materialTypeAsset->GetVersion()); + "Automatic updates are available. Consider updating the .material source file for '%s'.", + originalVersion, m_materialTypeAsset.ToString().c_str(), m_materialTypeAsset->GetVersion(), + GetId().ToString().c_str()); } m_materialTypeVersion = m_materialTypeAsset->GetVersion(); From e8576acbb0510717d57f168096a9cc6ad0c2fbf9 Mon Sep 17 00:00:00 2001 From: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com> Date: Thu, 18 Nov 2021 14:16:56 -0800 Subject: [PATCH 125/345] Replace old Developer Preview release name with Stable 21.11 (#5759) Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com> --- Code/Editor/CryEdit.cpp | 2 +- cmake/Platform/Windows/Packaging/Bootstrapper.wxs | 2 +- cmake/Platform/Windows/Packaging/Shortcuts.wxs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Code/Editor/CryEdit.cpp b/Code/Editor/CryEdit.cpp index b77c6c4b3a..8ef21425c8 100644 --- a/Code/Editor/CryEdit.cpp +++ b/Code/Editor/CryEdit.cpp @@ -3834,7 +3834,7 @@ void CCryEditApp::SetEditorWindowTitle(QString sTitleStr, QString sPreTitleStr, { if (sTitleStr.isEmpty()) { - sTitleStr = QObject::tr("O3DE Editor [Developer Preview]"); + sTitleStr = QObject::tr("O3DE Editor [Stable 21.11]"); } if (!sPreTitleStr.isEmpty()) diff --git a/cmake/Platform/Windows/Packaging/Bootstrapper.wxs b/cmake/Platform/Windows/Packaging/Bootstrapper.wxs index f3af199bc2..5b3b9fee22 100644 --- a/cmake/Platform/Windows/Packaging/Bootstrapper.wxs +++ b/cmake/Platform/Windows/Packaging/Bootstrapper.wxs @@ -5,7 +5,7 @@ - - + From edb15946ca06072c26a5979f8a1682526ec5fce2 Mon Sep 17 00:00:00 2001 From: allisaurus <34254888+allisaurus@users.noreply.github.com> Date: Thu, 18 Nov 2021 14:35:24 -0800 Subject: [PATCH 126/345] Update resource mapping tool schema version (#5729) * Update resource mapping tool schema version Signed-off-by: allisaurus <34254888+allisaurus@users.noreply.github.com> --- .../Tests/ResourceMapping/AWSResourceMappingManagerTest.cpp | 2 +- Gems/AWSCore/Code/Tools/ResourceMappingTool/utils/json_utils.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Gems/AWSCore/Code/Tests/ResourceMapping/AWSResourceMappingManagerTest.cpp b/Gems/AWSCore/Code/Tests/ResourceMapping/AWSResourceMappingManagerTest.cpp index a90518006f..81ea166848 100644 --- a/Gems/AWSCore/Code/Tests/ResourceMapping/AWSResourceMappingManagerTest.cpp +++ b/Gems/AWSCore/Code/Tests/ResourceMapping/AWSResourceMappingManagerTest.cpp @@ -84,7 +84,7 @@ static constexpr const char TEST_VALID_EMPTY_ACCOUNTID_RESOURCE_MAPPING_CONFIG_F }, "AccountId": "", "Region": "us-west-2", - "Version": "1.0.0" + "Version": "1.1.0" })"; static constexpr const char TEST_INVALID_RESOURCE_MAPPING_CONFIG_FILE[] = diff --git a/Gems/AWSCore/Code/Tools/ResourceMappingTool/utils/json_utils.py b/Gems/AWSCore/Code/Tools/ResourceMappingTool/utils/json_utils.py index 7926cca970..8c094a895c 100755 --- a/Gems/AWSCore/Code/Tools/ResourceMappingTool/utils/json_utils.py +++ b/Gems/AWSCore/Code/Tools/ResourceMappingTool/utils/json_utils.py @@ -24,7 +24,7 @@ _RESOURCE_MAPPING_TYPE_JSON_KEY_NAME: str = "Type" _RESOURCE_MAPPING_NAMEID_JSON_KEY_NAME: str = "Name/ID" _RESOURCE_MAPPING_REGION_JSON_KEY_NAME: str = "Region" _RESOURCE_MAPPING_VERSION_JSON_KEY_NAME: str = "Version" -_RESOURCE_MAPPING_JSON_FORMAT_VERSION: str = "1.0.0" +_RESOURCE_MAPPING_JSON_FORMAT_VERSION: str = "1.1.0" RESOURCE_MAPPING_ACCOUNTID_JSON_KEY_NAME: str = "AccountId" RESOURCE_MAPPING_ACCOUNTID_TEMPLATE_VALUE: str = "EMPTY" From bc388762af5ffb615f46f6ef53b7f2f6ff6f185c Mon Sep 17 00:00:00 2001 From: lsemp3d <58790905+lsemp3d@users.noreply.github.com> Date: Thu, 18 Nov 2021 14:37:40 -0800 Subject: [PATCH 127/345] Updated more node names Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com> --- .../Classes/PhysicsSystemInterface.names | 47 +- ...SCognitoAuthorizationNotificationBus.names | 12 +- .../Handlers/AWSMetricsNotificationBus.names | 14 +- .../ActorComponentNotificationBus.names | 11 +- .../EBus/Handlers/ActorNotificationBus.names | 20 +- .../AnimGraphComponentNotificationBus.names | 71 +- .../BlastFamilyComponentNotificationBus.names | 4 +- .../NavigationComponentNotificationBus.names | 32 +- .../EBus/Senders/AreaLightRequestBus.names | 278 ++++--- .../Senders/AtomToolsDocumentRequestBus.names | 125 +-- .../AudioSystemComponentRequestBus.names | 77 +- .../CharacterControllerRequestBus.names | 75 +- .../Senders/CharacterGameplayRequestBus.names | 124 +++ .../EBus/Senders/CollisionFilteringBus.names | 43 +- .../ForceLinearDampingRequestBus.names | 58 ++ .../Senders/ForceLocalSpaceRequestBus.names | 102 +++ .../EBus/Senders/ForcePointRequestBus.names | 58 ++ .../Senders/ForceSimpleDragRequestBus.names | 58 ++ .../Senders/ForceSplineFollowRequestBus.names | 190 +++++ .../Senders/ForceWorldSpaceRequestBus.names | 102 +++ .../HeightfieldProviderRequestsBus.names | 234 ++++++ .../PhysXCharacterControllerRequestBus.names | 2 +- .../EBus/Senders/RigidBodyRequestBus.names | 722 ++++++++++++++++++ .../SimulatedBodyComponentRequestBus.names | 26 +- .../EBus/Senders/WindRequestsBus.names | 9 +- .../Nodes/PhysXWorld_BoxCastWithGroup.names | 100 +++ .../PhysXWorld_CapsuleCastWithGroup.names | 106 +++ .../PhysXWorld_OverlapBoxWithGroup.names | 58 ++ .../PhysXWorld_OverlapCapsuleWithGroup.names | 64 ++ .../PhysXWorld_OverlapSphereWithGroup.names | 58 ++ ...hysXWorld_RayCastLocalSpaceWithGroup.names | 94 +++ ...d_RayCastMultipleLocalSpaceWithGroup.names | 64 ++ ...hysXWorld_RayCastWorldSpaceWithGroup.names | 94 +++ .../PhysXWorld_SphereCastWithGroup.names | 100 +++ 34 files changed, 2809 insertions(+), 423 deletions(-) create mode 100644 Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/CharacterGameplayRequestBus.names create mode 100644 Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ForceLinearDampingRequestBus.names create mode 100644 Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ForceLocalSpaceRequestBus.names create mode 100644 Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ForcePointRequestBus.names create mode 100644 Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ForceSimpleDragRequestBus.names create mode 100644 Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ForceSplineFollowRequestBus.names create mode 100644 Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ForceWorldSpaceRequestBus.names create mode 100644 Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/HeightfieldProviderRequestsBus.names create mode 100644 Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/RigidBodyRequestBus.names create mode 100644 Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/PhysXWorld_BoxCastWithGroup.names create mode 100644 Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/PhysXWorld_CapsuleCastWithGroup.names create mode 100644 Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/PhysXWorld_OverlapBoxWithGroup.names create mode 100644 Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/PhysXWorld_OverlapCapsuleWithGroup.names create mode 100644 Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/PhysXWorld_OverlapSphereWithGroup.names create mode 100644 Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/PhysXWorld_RayCastLocalSpaceWithGroup.names create mode 100644 Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/PhysXWorld_RayCastMultipleLocalSpaceWithGroup.names create mode 100644 Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/PhysXWorld_RayCastWorldSpaceWithGroup.names create mode 100644 Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/PhysXWorld_SphereCastWithGroup.names diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/PhysicsSystemInterface.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/PhysicsSystemInterface.names index bd2751ecca..84b24aa2b2 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/PhysicsSystemInterface.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/PhysicsSystemInterface.names @@ -5,7 +5,8 @@ "context": "BehaviorClass", "variant": "", "details": { - "name": "PhysicsSystemInterface" + "name": "Physics System", + "category": "PhysX" }, "methods": [ { @@ -13,21 +14,20 @@ "context": "PhysicsSystemInterface", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetOnPresimulateEvent" + "tooltip": "When signaled, this will invoke Get On Presimulate Event" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetOnPresimulateEvent is invoked" + "tooltip": "Signaled after Get On Presimulate Event is invoked" }, "details": { - "name": "PhysicsSystemInterface::GetOnPresimulateEvent", - "category": "Other" + "name": "Get On Presimulate Event" }, "results": [ { "typeid": "{F0A3166F-115C-5C3E-8D65-28FBA4420028}", "details": { - "name": "Event*" + "name": "Event" } } ] @@ -37,21 +37,20 @@ "context": "PhysicsSystemInterface", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetOnPostsimulateEvent" + "tooltip": "When signaled, this will invoke Get On Postsimulate Event" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetOnPostsimulateEvent is invoked" + "tooltip": "Signaled after Get On Postsimulate Event is invoked" }, "details": { - "name": "PhysicsSystemInterface::GetOnPostsimulateEvent", - "category": "Other" + "name": "Get On Postsimulate Event" }, "results": [ { "typeid": "{F0A3166F-115C-5C3E-8D65-28FBA4420028}", "details": { - "name": "Event*" + "name": "Event" } } ] @@ -61,27 +60,26 @@ "context": "PhysicsSystemInterface", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetSceneHandle" + "tooltip": "When signaled, this will invoke Get Scene Handle" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetSceneHandle is invoked" + "tooltip": "Signaled after Get Scene Handle is invoked" }, "details": { - "name": "PhysicsSystemInterface::GetSceneHandle", - "category": "Other" + "name": "Get Scene Handle" }, "params": [ { "typeid": "{B6F4D92A-061B-4CB3-AAB5-984B599A53AE}", "details": { - "name": "SystemInterface*" + "name": "Interface" } }, { "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", "details": { - "name": "const AZStd::basic_string, alloc" + "name": "Scene Name" } } ], @@ -89,7 +87,7 @@ { "typeid": "{36669095-4036-5479-B116-41A32E4E16EA}", "details": { - "name": "tuple" + "name": "Scene Handle" } } ] @@ -99,27 +97,26 @@ "context": "PhysicsSystemInterface", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetScene" + "tooltip": "When signaled, this will invoke Get Scene" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetScene is invoked" + "tooltip": "Signaled after Get Scene is invoked" }, "details": { - "name": "PhysicsSystemInterface::GetScene", - "category": "Other" + "name": "Get Scene" }, "params": [ { "typeid": "{B6F4D92A-061B-4CB3-AAB5-984B599A53AE}", "details": { - "name": "SystemInterface*" + "name": "Interface" } }, { "typeid": "{36669095-4036-5479-B116-41A32E4E16EA}", "details": { - "name": "tuple" + "name": "Scene Handle" } } ], @@ -127,7 +124,7 @@ { "typeid": "{52BD8163-BDC4-4B09-ABB2-11DD1F601FFD}", "details": { - "name": "Scene*" + "name": "Scene" } } ] diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/AWSCognitoAuthorizationNotificationBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/AWSCognitoAuthorizationNotificationBus.names index dd039b28e9..b96ab2fb37 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/AWSCognitoAuthorizationNotificationBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/AWSCognitoAuthorizationNotificationBus.names @@ -5,20 +5,20 @@ "context": "EBusHandler", "variant": "", "details": { - "name": "AWSCognitoAuthorizationNotificationBus", - "category": "EBus Handlers" + "name": "AWS Cognito Authorization", + "category": "AWS Core" }, "methods": [ { "key": "OnRequestAWSCredentialsSuccess", "details": { - "name": "OnRequestAWSCredentialsSuccess" + "name": "On Request AWS Credentials Success" }, "params": [ { "typeid": "{02FB32C4-B94E-4084-9049-3DF32F87BD76}", "details": { - "name": "ClientAuthAWSCredentials" + "name": "AWS Client Auth Credentials" } } ] @@ -26,13 +26,13 @@ { "key": "OnRequestAWSCredentialsFail", "details": { - "name": "OnRequestAWSCredentialsFail" + "name": "On Request AWS Credentials Fail" }, "params": [ { "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", "details": { - "name": "AZStd::string" + "name": "Error" } } ] diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/AWSMetricsNotificationBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/AWSMetricsNotificationBus.names index 1aa4c85f74..64920f9444 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/AWSMetricsNotificationBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/AWSMetricsNotificationBus.names @@ -5,20 +5,20 @@ "context": "EBusHandler", "variant": "", "details": { - "name": "AWSMetricsNotificationBus", - "category": "EBus Handlers" + "name": "AWS Metrics", + "category": "AWS Core" }, "methods": [ { "key": "OnSendMetricsSuccess", "details": { - "name": "OnSendMetricsSuccess" + "name": "On Send Metrics Success" }, "params": [ { "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", "details": { - "name": "int" + "name": "Request Id" } } ] @@ -26,19 +26,19 @@ { "key": "OnSendMetricsFailure", "details": { - "name": "OnSendMetricsFailure" + "name": "On Send Metrics Failure" }, "params": [ { "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", "details": { - "name": "int" + "name": "Request Id" } }, { "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", "details": { - "name": "AZStd::string" + "name": "Error" } } ] diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/ActorComponentNotificationBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/ActorComponentNotificationBus.names index c4f08cd6f8..5b61508119 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/ActorComponentNotificationBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/ActorComponentNotificationBus.names @@ -5,19 +5,20 @@ "context": "EBusHandler", "variant": "", "details": { - "name": "ActorComponentNotificationBus" + "name": "Actor", + "category": "Animation" }, "methods": [ { "key": "OnActorInstanceCreated", "details": { - "name": "OnActorInstanceCreated" + "name": "On Actor Instance Created" }, "params": [ { "typeid": "{280A0170-EB6A-4E90-B2F1-E18D8EAEFB36}", "details": { - "name": "" + "name": "Actor Instance" } } ] @@ -25,13 +26,13 @@ { "key": "OnActorInstanceDestroyed", "details": { - "name": "OnActorInstanceDestroyed" + "name": "On Actor Instance Destroyed" }, "params": [ { "typeid": "{280A0170-EB6A-4E90-B2F1-E18D8EAEFB36}", "details": { - "name": "" + "name": "Actor Instance" } } ] diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/ActorNotificationBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/ActorNotificationBus.names index a43f1d827c..77cb8b59c5 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/ActorNotificationBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/ActorNotificationBus.names @@ -18,7 +18,7 @@ { "typeid": "{0C899DAC-6B19-4BDD-AD8C-8A11EF2A6729}", "details": { - "name": "MotionEvent" + "name": "Motion Event" } } ] @@ -32,7 +32,7 @@ { "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", "details": { - "name": "char" + "name": "Motion Name" } } ] @@ -46,7 +46,7 @@ { "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", "details": { - "name": "char" + "name": "State Name" } } ] @@ -60,7 +60,7 @@ { "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", "details": { - "name": "char" + "name": "State Name" } } ] @@ -74,7 +74,7 @@ { "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", "details": { - "name": "char" + "name": "State Name" } } ] @@ -88,7 +88,7 @@ { "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", "details": { - "name": "char" + "name": "State Name" } } ] @@ -102,13 +102,13 @@ { "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", "details": { - "name": "char" + "name": "From State" } }, { "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", "details": { - "name": "char" + "name": "To State" } } ] @@ -122,13 +122,13 @@ { "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", "details": { - "name": "char" + "name": "From State" } }, { "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", "details": { - "name": "char" + "name": "To State" } } ] diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/AnimGraphComponentNotificationBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/AnimGraphComponentNotificationBus.names index 4b0b1a6399..ec8d9fa193 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/AnimGraphComponentNotificationBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/AnimGraphComponentNotificationBus.names @@ -5,19 +5,20 @@ "context": "EBusHandler", "variant": "", "details": { - "name": "AnimGraphComponentNotificationBus" + "name": "Anim Graph", + "category": "Animation" }, "methods": [ { "key": "OnAnimGraphInstanceCreated", "details": { - "name": "OnAnimGraphInstanceCreated" + "name": "On Anim Graph Instance Created" }, "params": [ { "typeid": "{2CC86AA2-AFC0-434B-A317-B102FD02E76D}", "details": { - "name": "" + "name": "Anim Graph Instance" } } ] @@ -25,13 +26,13 @@ { "key": "OnAnimGraphInstanceDestroyed", "details": { - "name": "OnAnimGraphInstanceDestroyed" + "name": "On Anim Graph Instance Destroyed" }, "params": [ { "typeid": "{2CC86AA2-AFC0-434B-A317-B102FD02E76D}", "details": { - "name": "" + "name": "Anim Graph Instance" } } ] @@ -39,31 +40,31 @@ { "key": "OnAnimGraphFloatParameterChanged", "details": { - "name": "OnAnimGraphFloatParameterChanged" + "name": "On Anim Graph Float Parameter Changed" }, "params": [ { "typeid": "{2CC86AA2-AFC0-434B-A317-B102FD02E76D}", "details": { - "name": "" + "name": "Anim Graph Instance" } }, { "typeid": "{D6597933-47CD-4FC8-B911-63F3E2B0993A}", "details": { - "name": "AZ::u64" + "name": "Parameter Index" } }, { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", "details": { - "name": "float" + "name": "Previous Value" } }, { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", "details": { - "name": "float" + "name": "Current Value" } } ] @@ -71,31 +72,31 @@ { "key": "OnAnimGraphBoolParameterChanged", "details": { - "name": "OnAnimGraphBoolParameterChanged" + "name": "On Anim Graph Bool Parameter Changed" }, "params": [ { "typeid": "{2CC86AA2-AFC0-434B-A317-B102FD02E76D}", "details": { - "name": "" + "name": "Anim Graph Instance" } }, { "typeid": "{D6597933-47CD-4FC8-B911-63F3E2B0993A}", "details": { - "name": "AZ::u64" + "name": "Parameter Index" } }, { "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", "details": { - "name": "bool" + "name": "Previous Value" } }, { "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", "details": { - "name": "bool" + "name": "Current Value" } } ] @@ -103,31 +104,31 @@ { "key": "OnAnimGraphStringParameterChanged", "details": { - "name": "OnAnimGraphStringParameterChanged" + "name": "On Anim Graph String Parameter Changed" }, "params": [ { "typeid": "{2CC86AA2-AFC0-434B-A317-B102FD02E76D}", "details": { - "name": "" + "name": "Anim Graph Instance" } }, { "typeid": "{D6597933-47CD-4FC8-B911-63F3E2B0993A}", "details": { - "name": "AZ::u64" + "name": "Parameter Index" } }, { "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", "details": { - "name": "char" + "name": "Previous Value" } }, { "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", "details": { - "name": "char" + "name": "Current Value" } } ] @@ -135,31 +136,31 @@ { "key": "OnAnimGraphVector2ParameterChanged", "details": { - "name": "OnAnimGraphVector2ParameterChanged" + "name": "On Anim Graph Vector2 Parameter Changed" }, "params": [ { "typeid": "{2CC86AA2-AFC0-434B-A317-B102FD02E76D}", "details": { - "name": "" + "name": "Anim Graph Instance" } }, { "typeid": "{D6597933-47CD-4FC8-B911-63F3E2B0993A}", "details": { - "name": "AZ::u64" + "name": "Parameter Index" } }, { "typeid": "{3D80F623-C85C-4741-90D0-E4E66164E6BF}", "details": { - "name": "Vector2" + "name": "Previous Value" } }, { "typeid": "{3D80F623-C85C-4741-90D0-E4E66164E6BF}", "details": { - "name": "Vector2" + "name": "Current Value" } } ] @@ -167,31 +168,31 @@ { "key": "OnAnimGraphVector3ParameterChanged", "details": { - "name": "OnAnimGraphVector3ParameterChanged" + "name": "On Anim Graph Vector3 Parameter Changed" }, "params": [ { "typeid": "{2CC86AA2-AFC0-434B-A317-B102FD02E76D}", "details": { - "name": "" + "name": "Anim Graph Instance" } }, { "typeid": "{D6597933-47CD-4FC8-B911-63F3E2B0993A}", "details": { - "name": "AZ::u64" + "name": "Parameter Index" } }, { "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}", "details": { - "name": "Vector3" + "name": "Previous Value" } }, { "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}", "details": { - "name": "Vector3" + "name": "Current Value" } } ] @@ -199,31 +200,31 @@ { "key": "OnAnimGraphRotationParameterChanged", "details": { - "name": "OnAnimGraphRotationParameterChanged" + "name": "On Anim Graph Rotation Parameter Changed" }, "params": [ { "typeid": "{2CC86AA2-AFC0-434B-A317-B102FD02E76D}", "details": { - "name": "" + "name": "Anim Graph Instance" } }, { "typeid": "{D6597933-47CD-4FC8-B911-63F3E2B0993A}", "details": { - "name": "AZ::u64" + "name": "Parameter Index" } }, { "typeid": "{73103120-3DD3-4873-BAB3-9713FA2804FB}", "details": { - "name": "Quaternion" + "name": "Previous Value" } }, { "typeid": "{73103120-3DD3-4873-BAB3-9713FA2804FB}", "details": { - "name": "Quaternion" + "name": "Current Value" } } ] diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/BlastFamilyComponentNotificationBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/BlastFamilyComponentNotificationBus.names index b73860d14c..c8722bf36f 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/BlastFamilyComponentNotificationBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/BlastFamilyComponentNotificationBus.names @@ -5,8 +5,8 @@ "context": "EBusHandler", "variant": "", "details": { - "name": "BlastFamilyComponentNotificationBus", - "category": "EBus Handlers" + "name": "Blast Family", + "category": "Blast" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/NavigationComponentNotificationBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/NavigationComponentNotificationBus.names index 7a939652fb..b7549119c5 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/NavigationComponentNotificationBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/NavigationComponentNotificationBus.names @@ -5,20 +5,20 @@ "context": "EBusHandler", "variant": "", "details": { - "name": "NavigationComponentNotificationBus", - "category": "EBus Handlers" + "name": "Movement", + "category": "Navigation" }, "methods": [ { "key": "OnSearchingForPath", "details": { - "name": "OnSearchingForPath" + "name": "On Searching For Path" }, "params": [ { "typeid": "{43DA906B-7DEF-4CA8-9790-854106D3F983}", "details": { - "name": "RequestId", + "name": "Request Id", "tooltip": "Navigation request Id" } } @@ -27,13 +27,13 @@ { "key": "OnTraversalStarted", "details": { - "name": "OnTraversalStarted" + "name": "On Traversal Started" }, "params": [ { "typeid": "{43DA906B-7DEF-4CA8-9790-854106D3F983}", "details": { - "name": "RequestId", + "name": "Request Id", "tooltip": "Navigation request Id" } } @@ -42,27 +42,27 @@ { "key": "OnTraversalPathUpdate", "details": { - "name": "OnTraversalPathUpdate" + "name": "On Traversal Path Update" }, "params": [ { "typeid": "{43DA906B-7DEF-4CA8-9790-854106D3F983}", "details": { - "name": "RequestId", + "name": "Request Id", "tooltip": "Navigation request Id" } }, { "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}", "details": { - "name": "NextPathPosition", + "name": "Next Path Position", "tooltip": "Next path position" } }, { "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}", "details": { - "name": "InflectionPosition", + "name": "Inflection Position", "tooltip": "Next inflection position" } } @@ -71,13 +71,13 @@ { "key": "OnTraversalInProgress", "details": { - "name": "OnTraversalInProgress" + "name": "On Traversal In Progress" }, "params": [ { "typeid": "{43DA906B-7DEF-4CA8-9790-854106D3F983}", "details": { - "name": "RequestId", + "name": "Request Id", "tooltip": "Navigation request Id" } }, @@ -93,13 +93,13 @@ { "key": "OnTraversalComplete", "details": { - "name": "OnTraversalComplete" + "name": "On Traversal Complete" }, "params": [ { "typeid": "{43DA906B-7DEF-4CA8-9790-854106D3F983}", "details": { - "name": "RequestId", + "name": "Request Id", "tooltip": "Navigation request Id" } } @@ -108,13 +108,13 @@ { "key": "OnTraversalCancelled", "details": { - "name": "OnTraversalCancelled" + "name": "On Traversal Cancelled" }, "params": [ { "typeid": "{43DA906B-7DEF-4CA8-9790-854106D3F983}", "details": { - "name": "RequestId", + "name": "Request Id", "tooltip": "Navigation request Id" } } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AreaLightRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AreaLightRequestBus.names index fe409184f5..3b75eef182 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AreaLightRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AreaLightRequestBus.names @@ -5,27 +5,29 @@ "context": "EBusSender", "variant": "", "details": { - "name": "AreaLightRequestBus" + "name": "Area Light", + "category": "Lights" }, "methods": [ { "key": "SetFilteringSampleCount", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetFilteringSampleCount" + "tooltip": "When signaled, this will invoke Set Filtering Sample Count" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetFilteringSampleCount is invoked" + "tooltip": "Signaled after Set Filtering Sample Count is invoked" }, "details": { - "name": "SetFilteringSampleCount" + "name": "Set Filtering Sample Count", + "tooltip": "Sets the sample count for filtering of the shadow boundary. Maximum 64" }, "params": [ { "typeid": "{43DA906B-7DEF-4CA8-9790-854106D3F983}", "details": { - "name": "unsigned int" + "name": "Sample Count" } } ] @@ -34,20 +36,21 @@ "key": "SetIntensity", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetIntensity" + "tooltip": "When signaled, this will invoke Set Intensity" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetIntensity is invoked" + "tooltip": "Signaled after Set Intensity is invoked" }, "details": { - "name": "SetIntensity" + "name": "Set Intensity", + "tooltip": "Sets an area light's intensity and intensity mode. This value is indepedent from its color" }, "params": [ { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", "details": { - "name": "float" + "name": "Intensity" } } ] @@ -56,20 +59,21 @@ "key": "SetEsmExponent", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetEsmExponent" + "tooltip": "When signaled, this will invoke Set Esm Exponent" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetEsmExponent is invoked" + "tooltip": "Signaled after Set Esm Exponent is invoked" }, "details": { - "name": "SetEsmExponent" + "name": "Set Esm Exponent", + "tooltip": "Sets the Esm exponent. Higher values produce a steeper falloff between light and shadow" }, "params": [ { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", "details": { - "name": "float" + "name": "Exponent" } } ] @@ -78,20 +82,21 @@ "key": "GetOuterShutterAngle", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetOuterShutterAngle" + "tooltip": "When signaled, this will invoke Get Outer Shutter Angle" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetOuterShutterAngle is invoked" + "tooltip": "Signaled after Get Outer Shutter Angle is invoked" }, "details": { - "name": "GetOuterShutterAngle" + "name": "Get Outer Shutter Angle", + "tooltip": "Returns the outer angle of the shutters in degrees" }, "results": [ { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", "details": { - "name": "float" + "name": "Angle (Degrees)" } } ] @@ -100,20 +105,21 @@ "key": "GetInnerShutterAngle", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetInnerShutterAngle" + "tooltip": "When signaled, this will invoke Get Inner Shutter Angle" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetInnerShutterAngle is invoked" + "tooltip": "Signaled after Get Inner Shutter Angle is invoked" }, "details": { - "name": "GetInnerShutterAngle" + "name": "Get Inner Shutter Angle", + "tooltip": "Returns the outer angle of the shutters in degrees" }, "results": [ { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", "details": { - "name": "float" + "name": "Angles (Degrees)" } } ] @@ -122,14 +128,15 @@ "key": "SetColor", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetColor" + "tooltip": "When signaled, this will invoke Set Color" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetColor is invoked" + "tooltip": "Signaled after Set Color is invoked" }, "details": { - "name": "SetColor" + "name": "Set Color", + "tooltip": "Sets an area light's color. This value is indepedent from its intensity" }, "params": [ { @@ -144,20 +151,20 @@ "key": "SetShadowBias", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetShadowBias" + "tooltip": "When signaled, this will invoke Set Shadow Bias" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetShadowBias is invoked" + "tooltip": "Signaled after Set Shadow Bias is invoked" }, "details": { - "name": "SetShadowBias" + "name": "Set Shadow Bias" }, "params": [ { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", "details": { - "name": "float" + "name": "Bias" } } ] @@ -166,20 +173,22 @@ "key": "SetShadowFilterMethod", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetShadowFilterMethod" + "tooltip": "When signaled, this will invoke Set Shadow Filter Method" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetShadowFilterMethod is invoked" + "tooltip": "Signaled after Set Shadow Filter Method is invoked" }, "details": { - "name": "SetShadowFilterMethod" + "name": "Set Shadow Filter Method", + "tooltip": "Sets the filter method of shadows, 0: None, 1: Percentage Closer Filtering (PCF), 2: Exponential Shadow Maps (ESM), 3: ESM with PCF Fallback" }, "params": [ { "typeid": "{43DA906B-7DEF-4CA8-9790-854106D3F983}", "details": { - "name": "unsigned int" + "name": "Shadow Filter Method", + "tooltip": "0: None, 1: Percentage Closer Filtering (PCF), 2: Exponential Shadow Maps (ESM), 3: ESM with PCF Fallback" } } ] @@ -188,20 +197,21 @@ "key": "GetEsmExponent", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetEsmExponent" + "tooltip": "When signaled, this will invoke Get Esm Exponent" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetEsmExponent is invoked" + "tooltip": "Signaled after Get Esm Exponent is invoked" }, "details": { - "name": "GetEsmExponent" + "name": "Get Esm Exponent", + "tooltip": "Gets the Esm exponent. Higher values produce a steeper falloff between light and shadow" }, "results": [ { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", "details": { - "name": "float" + "name": "Exponent" } } ] @@ -210,20 +220,21 @@ "key": "SetInnerShutterAngle", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetInnerShutterAngle" + "tooltip": "When signaled, this will invoke Set Inner Shutter Angle" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetInnerShutterAngle is invoked" + "tooltip": "Signaled after Set Inner Shutter Angle is invoked" }, "details": { - "name": "SetInnerShutterAngle" + "name": "Set Inner Shutter Angle", + "tooltip": "Sets the inner angle of the shutters in degrees" }, "params": [ { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", "details": { - "name": "float" + "name": "Angle (Degrees)" } } ] @@ -232,20 +243,21 @@ "key": "SetEnableShadow", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetEnableShadow" + "tooltip": "When signaled, this will invoke Set Enable Shadow" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetEnableShadow is invoked" + "tooltip": "Signaled after Set Enable Shadow is invoked" }, "details": { - "name": "SetEnableShadow" + "name": "Set Enable Shadow", + "tooltip": "Sets if shadows should be enabled" }, "params": [ { "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", "details": { - "name": "bool" + "name": "Enable" } } ] @@ -254,20 +266,21 @@ "key": "SetUseFastApproximation", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetUseFastApproximation" + "tooltip": "When signaled, this will invoke Set Use Fast Approximation" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetUseFastApproximation is invoked" + "tooltip": "Signaled after Set Use Fast Approximation is invoked" }, "details": { - "name": "SetUseFastApproximation" + "name": "Set Use Fast Approximation", + "tooltip": "Sets whether the light should use the default high quality linearly transformed cosine lights (false) or a faster approximation (true)" }, "params": [ { "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", "details": { - "name": "bool" + "name": "Use Fast Approximation" } } ] @@ -276,20 +289,21 @@ "key": "GetUseFastApproximation", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetUseFastApproximation" + "tooltip": "When signaled, this will invoke Get Use Fast Approximation" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetUseFastApproximation is invoked" + "tooltip": "Signaled after Get Use Fast Approximation is invoked" }, "details": { - "name": "GetUseFastApproximation" + "name": "Get Use Fast Approximation", + "tooltip" : "Gets whether the light is using the default high quality linearly transformed cosine lights (false) or a faster approximation (true)" }, "results": [ { "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", "details": { - "name": "bool" + "name": "Uses Fast Approximation" } } ] @@ -298,20 +312,21 @@ "key": "GetFilteringSampleCount", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetFilteringSampleCount" + "tooltip": "When signaled, this will invoke Get Filtering Sample Count" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetFilteringSampleCount is invoked" + "tooltip": "Signaled after Get Filtering Sample Count is invoked" }, "details": { - "name": "GetFilteringSampleCount" + "name": "Get Filtering Sample Count", + "tooltip": "Gets the sample count for filtering of the shadow boundary" }, "results": [ { "typeid": "{43DA906B-7DEF-4CA8-9790-854106D3F983}", "details": { - "name": "unsigned int" + "name": "Sample Count" } } ] @@ -320,20 +335,21 @@ "key": "GetEnableShadow", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetEnableShadow" + "tooltip": "When signaled, this will invoke Get Enable Shadow" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetEnableShadow is invoked" + "tooltip": "Signaled after Get Enable Shadow is invoked" }, "details": { - "name": "GetEnableShadow" + "name": "Get Enable Shadow", + "tooltip": "Returns true if shadows are enabled" }, "results": [ { "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", "details": { - "name": "bool" + "name": "Enabled" } } ] @@ -342,20 +358,22 @@ "key": "GetShadowFilterMethod", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetShadowFilterMethod" + "tooltip": "When signaled, this will invoke Get Shadow Filter Method" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetShadowFilterMethod is invoked" + "tooltip": "Signaled after Get Shadow Filter Method is invoked" }, "details": { - "name": "GetShadowFilterMethod" + "name": "Get Shadow Filter Method", + "tooltip": "Gets the filter method of shadows, 0: None, 1: Percentage Closer Filtering (PCF), 2: Exponential Shadow Maps (ESM), 3: ESM with PCF Fallback" }, "results": [ { "typeid": "{43DA906B-7DEF-4CA8-9790-854106D3F983}", "details": { - "name": "unsigned int" + "name": "Filter Method", + "tooltip": "0: None, 1: Percentage Closer Filtering (PCF), 2: Exponential Shadow Maps (ESM), 3: ESM with PCF Fallback" } } ] @@ -364,20 +382,22 @@ "key": "GetIntensityMode", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetIntensityMode" + "tooltip": "When signaled, this will invoke Get Intensity Mode" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetIntensityMode is invoked" + "tooltip": "Signaled after Get Intensity Mode is invoked" }, "details": { - "name": "GetIntensityMode" + "name": "Get Intensity Mode", + "tooltip": "Gets an area light's photometric type\n0: Lumen (Total amount of luminous power emitted. Since a unit sphere is 4 pi steradians, 1 candela emitting uniformly in all directions is 4 pi lumens)\n1: Candela (Base unit of luminous intensity; luminous power per unit solid angle)\n2: Lux (One lux is one lumen per square meter. The same lux emitting from larger areas emits more lumens than smaller areas)\n3: Nit (Nits are candela per square meter. It can be calculated as Lux / Pi)\n4: Ev100Luminance (Exposure value for luminance - Similar to nits, A measurement of illuminance that grows exponentially. See https://en.wikipedia.org/wiki/Exposure_value)\n5: Ev100Illuminance (Exposure value for illuminance - Similar to lux, A measurement of illuminance that grows exponentially. See https://en.wikipedia.org/wiki/Exposure_value)" }, "results": [ { "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", "details": { - "name": "char" + "name": "Intensity Mode", + "tooltip": "0: Lumen (Total amount of luminous power emitted. Since a unit sphere is 4 pi steradians, 1 candela emitting uniformly in all directions is 4 pi lumens)\n1: Candela (Base unit of luminous intensity; luminous power per unit solid angle)\n2: Lux (One lux is one lumen per square meter. The same lux emitting from larger areas emits more lumens than smaller areas)\n3: Nit (Nits are candela per square meter. It can be calculated as Lux / Pi)\n4: Ev100Luminance (Exposure value for luminance - Similar to nits, A measurement of illuminance that grows exponentially. See https://en.wikipedia.org/wiki/Exposure_value)\n5: Ev100Illuminance (Exposure value for illuminance - Similar to lux, A measurement of illuminance that grows exponentially. See https://en.wikipedia.org/wiki/Exposure_value)" } } ] @@ -386,20 +406,21 @@ "key": "GetShadowBias", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetShadowBias" + "tooltip": "When signaled, this will invoke Get Shadow Bias" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetShadowBias is invoked" + "tooltip": "Signaled after Get Shadow Bias is invoked" }, "details": { - "name": "GetShadowBias" + "name": "Get Shadow Bias", + "tooltip": "Returns the shadow bias" }, "results": [ { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", "details": { - "name": "float" + "name": "Bias" } } ] @@ -408,20 +429,23 @@ "key": "SetAttenuationRadiusMode", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetAttenuationRadiusMode" + "tooltip": "When signaled, this will invoke Set Attenuation Radius Mode" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetAttenuationRadiusMode is invoked" + "tooltip": "Signaled after Set Attenuation Radius Mode is invoked" }, "details": { - "name": "SetAttenuationRadiusMode" + "name": "Set Attenuation Radius Mode", + "tooltip": "0: Automatic, the radius will immediately be recalculated based on the intensity\n1: Explicit, the radius value will be unchanged from its previous value" + }, "params": [ { "typeid": "{72B9409A-7D1A-4831-9CFE-FCB3FADD3426}", "details": { - "name": "unsigned char" + "name": "Mode", + "tooltip": "0: Automatic, the radius will immediately be recalculated based on the intensity\n1: Explicit, the radius value will be unchanged from its previous value" } } ] @@ -430,20 +454,20 @@ "key": "SetEmitsLightBothDirections", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetEmitsLightBothDirections" + "tooltip": "When signaled, this will invoke Set Emits Light Both Directions" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetEmitsLightBothDirections is invoked" + "tooltip": "Signaled after Set Emits Light Both Directions is invoked" }, "details": { - "name": "SetEmitsLightBothDirections" + "name": "Set Emits Light Both Directions" }, "params": [ { "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", "details": { - "name": "bool" + "name": "Enable" } } ] @@ -452,20 +476,20 @@ "key": "SetEnableShutters", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetEnableShutters" + "tooltip": "When signaled, this will invoke Set Enable Shutters" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetEnableShutters is invoked" + "tooltip": "Signaled after Set Enable Shutters is invoked" }, "details": { - "name": "SetEnableShutters" + "name": "Set Enable Shutters" }, "params": [ { "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", "details": { - "name": "bool" + "name": "Enable" } } ] @@ -474,20 +498,21 @@ "key": "GetShadowmapMaxSize", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetShadowmapMaxSize" + "tooltip": "When signaled, this will invoke Get Shadowmap Max Size" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetShadowmapMaxSize is invoked" + "tooltip": "Signaled after Get Shadowmap Max Size is invoked" }, "details": { - "name": "GetShadowmapMaxSize" + "name": "Get Shadowmap Max Size", + "tooltip": "Returns the maximum width and height of shadowmap" }, "results": [ { "typeid": "{43DA906B-7DEF-4CA8-9790-854106D3F983}", "details": { - "name": "unsigned int" + "name": "Max Size" } } ] @@ -496,20 +521,20 @@ "key": "GetEmitsLightBothDirections", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetEmitsLightBothDirections" + "tooltip": "When signaled, this will invoke Get Emits Light Both Directions" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetEmitsLightBothDirections is invoked" + "tooltip": "Signaled after Get Emits Light Both Directions is invoked" }, "details": { - "name": "GetEmitsLightBothDirections" + "name": "Get Emits Light Both Directions" }, "results": [ { "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", "details": { - "name": "bool" + "name": "Enabled" } } ] @@ -518,20 +543,21 @@ "key": "SetOuterShutterAngle", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetOuterShutterAngle" + "tooltip": "When signaled, this will invoke Set Outer Shutter Angle" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetOuterShutterAngle is invoked" + "tooltip": "Signaled after Set Outer Shutter Angle is invoked" }, "details": { - "name": "SetOuterShutterAngle" + "name": "Set Outer Shutter Angle", + "tooltip": "Sets the outer angle of the shutters in degrees" }, "params": [ { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", "details": { - "name": "float" + "name": "Angle (Degrees)" } } ] @@ -540,20 +566,21 @@ "key": "SetAttenuationRadius", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetAttenuationRadius" + "tooltip": "When signaled, this will invoke Set Attenuation Radius" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetAttenuationRadius is invoked" + "tooltip": "Signaled after Set Attenuation Radius is invoked" }, "details": { - "name": "SetAttenuationRadius" + "name": "Set Attenuation Radius", + "tooltip": "Set the distance and which an area light will no longer affect lighting. Setting this forces the Radius Calculation to Explicit mode" }, "params": [ { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", "details": { - "name": "float" + "name": "Radius" } } ] @@ -562,20 +589,21 @@ "key": "GetAttenuationRadius", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetAttenuationRadius" + "tooltip": "When signaled, this will invoke Get Attenuation Radius" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetAttenuationRadius is invoked" + "tooltip": "Signaled after Get Attenuation Radius is invoked" }, "details": { - "name": "GetAttenuationRadius" + "name": "Get Attenuation Radius", + "tooltip" : "Gets the distance at which the area light will no longer affect lighting" }, "results": [ { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", "details": { - "name": "float" + "name": "Radius" } } ] @@ -584,20 +612,21 @@ "key": "GetEnableShutters", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetEnableShutters" + "tooltip": "When signaled, this will invoke Get Enable Shutters" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetEnableShutters is invoked" + "tooltip": "Signaled after Get Enable Shutters is invoked" }, "details": { - "name": "GetEnableShutters" + "name": "Get Enable Shutters", + "tooltip": "Returns true if shutters are enabled" }, "results": [ { "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", "details": { - "name": "bool" + "name": "Enabled" } } ] @@ -606,14 +635,14 @@ "key": "GetColor", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetColor" + "tooltip": "When signaled, this will invoke Get Color" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetColor is invoked" + "tooltip": "Signaled after Get Color is invoked" }, "details": { - "name": "GetColor" + "name": "Get Color" }, "results": [ { @@ -628,20 +657,22 @@ "key": "ConvertToIntensityMode", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke ConvertToIntensityMode" + "tooltip": "When signaled, this will invoke Convert To Intensity Mode" }, "exit": { "name": "Out", - "tooltip": "Signaled after ConvertToIntensityMode is invoked" + "tooltip": "Signaled after Convert To Intensity Mode is invoked" }, "details": { - "name": "ConvertToIntensityMode" + "name": "Convert To Intensity Mode", + "tooltip": "Sets the photometric unit to the one provided and converts the intensity to the photometric unit so actual light intensity remains constant" }, "params": [ { "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", "details": { - "name": "char" + "name": "Mode", + "tooltip": "0: Lumen (Total amount of luminous power emitted. Since a unit sphere is 4 pi steradians, 1 candela emitting uniformly in all directions is 4 pi lumens)\n1: Candela (Base unit of luminous intensity; luminous power per unit solid angle)\n2: Lux (One lux is one lumen per square meter. The same lux emitting from larger areas emits more lumens than smaller areas)\n3: Nit (Nits are candela per square meter. It can be calculated as Lux / Pi)\n4: Ev100Luminance (Exposure value for luminance - Similar to nits, A measurement of illuminance that grows exponentially. See https://en.wikipedia.org/wiki/Exposure_value)\n5: Ev100Illuminance (Exposure value for illuminance - Similar to lux, A measurement of illuminance that grows exponentially. See https://en.wikipedia.org/wiki/Exposure_value)" } } ] @@ -650,20 +681,20 @@ "key": "SetShadowmapMaxSize", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetShadowmapMaxSize" + "tooltip": "When signaled, this will invoke Set Shadowmap Max Size" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetShadowmapMaxSize is invoked" + "tooltip": "Signaled after Set Shadowmap Max Size is invoked" }, "details": { - "name": "SetShadowmapMaxSize" + "name": "Set Shadowmap Max Size" }, "params": [ { "typeid": "{43DA906B-7DEF-4CA8-9790-854106D3F983}", "details": { - "name": "unsigned int" + "name": "Max Size" } } ] @@ -672,20 +703,21 @@ "key": "GetIntensity", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetIntensity" + "tooltip": "When signaled, this will invoke Get Intensity" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetIntensity is invoked" + "tooltip": "Signaled after Get Intensity is invoked" }, "details": { - "name": "GetIntensity" + "name": "Get Intensity", + "tooltip": "Gets an area light's intensity. This value is indepedent from its color" }, "results": [ { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", "details": { - "name": "float" + "name": "Intensity" } } ] diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AtomToolsDocumentRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AtomToolsDocumentRequestBus.names index d3439b0a67..40ecc8261c 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AtomToolsDocumentRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AtomToolsDocumentRequestBus.names @@ -5,27 +5,28 @@ "context": "EBusSender", "variant": "", "details": { - "name": "AtomToolsDocumentRequestBus" + "name": "Document", + "category": "Atom Tools" }, "methods": [ { "key": "CanRedo", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke CanRedo" + "tooltip": "When signaled, this will invoke Can Redo" }, "exit": { "name": "Out", - "tooltip": "Signaled after CanRedo is invoked" + "tooltip": "Signaled after Can Redo is invoked" }, "details": { - "name": "CanRedo" + "name": "Can Redo" }, "results": [ { "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", "details": { - "name": "bool" + "name": "Can Redo" } } ] @@ -34,20 +35,20 @@ "key": "SaveAsChild", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SaveAsChild" + "tooltip": "When signaled, this will invoke Save As Child" }, "exit": { "name": "Out", - "tooltip": "Signaled after SaveAsChild is invoked" + "tooltip": "Signaled after Save As Child is invoked" }, "details": { - "name": "SaveAsChild" + "name": "Save As Child" }, "params": [ { "typeid": "{7114E998-A8B4-519B-9342-A86D1587B4F7}", "details": { - "name": "" + "name": "Save Path" } } ], @@ -55,7 +56,7 @@ { "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", "details": { - "name": "bool" + "name": "Success" } } ] @@ -77,7 +78,7 @@ { "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", "details": { - "name": "bool" + "name": "Success" } } ] @@ -99,7 +100,7 @@ { "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", "details": { - "name": "bool" + "name": "Success" } } ] @@ -108,20 +109,20 @@ "key": "IsOpen", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke IsOpen" + "tooltip": "When signaled, this will invoke Is Open" }, "exit": { "name": "Out", - "tooltip": "Signaled after IsOpen is invoked" + "tooltip": "Signaled after Is Open is invoked" }, "details": { - "name": "IsOpen" + "name": "Is Open" }, "results": [ { "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", "details": { - "name": "bool" + "name": "Is Open" } } ] @@ -143,7 +144,7 @@ { "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", "details": { - "name": "bool" + "name": "Success" } } ] @@ -165,7 +166,7 @@ { "typeid": "{7114E998-A8B4-519B-9342-A86D1587B4F7}", "details": { - "name": "" + "name": "Load Path" } } ], @@ -173,7 +174,7 @@ { "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", "details": { - "name": "bool" + "name": "Success" } } ] @@ -182,20 +183,20 @@ "key": "CanUndo", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke CanUndo" + "tooltip": "When signaled, this will invoke Can Undo" }, "exit": { "name": "Out", - "tooltip": "Signaled after CanUndo is invoked" + "tooltip": "Signaled after Can Undo is invoked" }, "details": { - "name": "CanUndo" + "name": "Can Undo" }, "results": [ { "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", "details": { - "name": "bool" + "name": "Can Undo" } } ] @@ -204,26 +205,26 @@ "key": "SetPropertyValue", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetPropertyValue" + "tooltip": "When signaled, this will invoke Set Property Value" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetPropertyValue is invoked" + "tooltip": "Signaled after Set Property Value is invoked" }, "details": { - "name": "SetPropertyValue" + "name": "Set Property Value" }, "params": [ { "typeid": "{3D2B920C-9EFD-40D5-AAE0-DF131C3D4931}", "details": { - "name": "Name" + "name": "Property Full Name" } }, { "typeid": "{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}", "details": { - "name": "any" + "name": "Value" } } ] @@ -232,20 +233,20 @@ "key": "SaveAsCopy", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SaveAsCopy" + "tooltip": "When signaled, this will invoke Save As Copy" }, "exit": { "name": "Out", - "tooltip": "Signaled after SaveAsCopy is invoked" + "tooltip": "Signaled after Save As Copy is invoked" }, "details": { - "name": "SaveAsCopy" + "name": "Save As Copy" }, "params": [ { "typeid": "{7114E998-A8B4-519B-9342-A86D1587B4F7}", "details": { - "name": "" + "name": "Save Path" } } ], @@ -253,7 +254,7 @@ { "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", "details": { - "name": "bool" + "name": "Success" } } ] @@ -262,20 +263,20 @@ "key": "BeginEdit", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke BeginEdit" + "tooltip": "When signaled, this will invoke Begin Edit" }, "exit": { "name": "Out", - "tooltip": "Signaled after BeginEdit is invoked" + "tooltip": "Signaled after Begin Edit is invoked" }, "details": { - "name": "BeginEdit" + "name": "Begin Edit" }, "results": [ { "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", "details": { - "name": "bool" + "name": "Begin" } } ] @@ -284,20 +285,20 @@ "key": "GetPropertyValue", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetPropertyValue" + "tooltip": "When signaled, this will invoke Get Property Value" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetPropertyValue is invoked" + "tooltip": "Signaled after Get Property Value is invoked" }, "details": { - "name": "GetPropertyValue" + "name": "Get Property Value" }, "params": [ { "typeid": "{3D2B920C-9EFD-40D5-AAE0-DF131C3D4931}", "details": { - "name": "Name" + "name": "Property Full Name" } } ], @@ -305,7 +306,7 @@ { "typeid": "{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}", "details": { - "name": "any" + "name": "Value" } } ] @@ -327,7 +328,7 @@ { "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", "details": { - "name": "bool" + "name": "Success" } } ] @@ -343,13 +344,13 @@ "tooltip": "Signaled after IsModified is invoked" }, "details": { - "name": "IsModified" + "name": "Is Modified" }, "results": [ { "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", "details": { - "name": "bool" + "name": "Is Modified" } } ] @@ -358,20 +359,20 @@ "key": "EndEdit", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke EndEdit" + "tooltip": "When signaled, this will invoke End Edit" }, "exit": { "name": "Out", - "tooltip": "Signaled after EndEdit is invoked" + "tooltip": "Signaled after End Edit is invoked" }, "details": { - "name": "EndEdit" + "name": "End Edit" }, "results": [ { "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", "details": { - "name": "bool" + "name": "End Edit" } } ] @@ -380,20 +381,20 @@ "key": "GetAbsolutePath", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetAbsolutePath" + "tooltip": "When signaled, this will invoke Get Absolute Path" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetAbsolutePath is invoked" + "tooltip": "Signaled after Get Absolute Path is invoked" }, "details": { - "name": "GetAbsolutePath" + "name": "Get Absolute Path" }, "results": [ { "typeid": "{7114E998-A8B4-519B-9342-A86D1587B4F7}", "details": { - "name": "" + "name": "Path" } } ] @@ -402,20 +403,20 @@ "key": "GetRelativePath", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetRelativePath" + "tooltip": "When signaled, this will invoke Get Relative Path" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetRelativePath is invoked" + "tooltip": "Signaled after Get Relative Path is invoked" }, "details": { - "name": "GetRelativePath" + "name": "Get Relative Path" }, "results": [ { "typeid": "{7114E998-A8B4-519B-9342-A86D1587B4F7}", "details": { - "name": "" + "name": "Path" } } ] @@ -424,20 +425,20 @@ "key": "IsSavable", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke IsSavable" + "tooltip": "When signaled, this will invoke Is Savable" }, "exit": { "name": "Out", - "tooltip": "Signaled after IsSavable is invoked" + "tooltip": "Signaled after Is Savable is invoked" }, "details": { - "name": "IsSavable" + "name": "Is Savable" }, "results": [ { "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", "details": { - "name": "bool" + "name": "Is Savable" } } ] @@ -459,7 +460,7 @@ { "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", "details": { - "name": "bool" + "name": "Success" } } ] diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AudioSystemComponentRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AudioSystemComponentRequestBus.names index f92d691860..3409c106d3 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AudioSystemComponentRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AudioSystemComponentRequestBus.names @@ -5,7 +5,8 @@ "context": "EBusSender", "variant": "", "details": { - "name": "Audio System" + "name": "Audio System", + "category": "Audio" }, "methods": [ { @@ -19,7 +20,7 @@ "tooltip": "Signaled after LevelUnloadAudio is invoked" }, "details": { - "name": "LevelUnloadAudio" + "name": "Level Unload Audio" } }, { @@ -33,13 +34,13 @@ "tooltip": "Signaled after LevelLoadAudio is invoked" }, "details": { - "name": "LevelLoadAudio" + "name": "Level Load Audio" }, "params": [ { "typeid": "{7114E998-A8B4-519B-9342-A86D1587B4F7}", "details": { - "name": "" + "name": "Level Name" } } ] @@ -48,26 +49,26 @@ "key": "GlobalKillAudioTrigger", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GlobalKillAudioTrigger" + "tooltip": "When signaled, this will invoke Global Kill Audio Trigger" }, "exit": { "name": "Out", - "tooltip": "Signaled after GlobalKillAudioTrigger is invoked" + "tooltip": "Signaled after Global Kill Audio Trigger is invoked" }, "details": { - "name": "GlobalKillAudioTrigger" + "name": "Global Kill Audio Trigger" }, "params": [ { "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", "details": { - "name": "char" + "name": "Trigger Name" } }, { "typeid": "{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}", "details": { - "name": "EntityId", + "name": "Callback Owner", "tooltip": "Entity Unique Id" } } @@ -77,26 +78,26 @@ "key": "GlobalSetAudioRtpc", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GlobalSetAudioRtpc" + "tooltip": "When signaled, this will invoke Global Set Audio RTPC" }, "exit": { "name": "Out", - "tooltip": "Signaled after GlobalSetAudioRtpc is invoked" + "tooltip": "Signaled after Global Set Audio RTPC is invoked" }, "details": { - "name": "GlobalSetAudioRtpc" + "name": "Global Set Audio RTPC" }, "params": [ { "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", "details": { - "name": "char" + "name": "RTPC Name" } }, { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", "details": { - "name": "float" + "name": "Value" } } ] @@ -105,26 +106,26 @@ "key": "GlobalSetAudioSwitchState", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GlobalSetAudioSwitchState" + "tooltip": "When signaled, this will invoke Global Set Audio Switch State" }, "exit": { "name": "Out", - "tooltip": "Signaled after GlobalSetAudioSwitchState is invoked" + "tooltip": "Signaled after Global Set Audio Switch State is invoked" }, "details": { - "name": "GlobalSetAudioSwitchState" + "name": "Global Set Audio Switch State" }, "params": [ { "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", "details": { - "name": "char" + "name": "Switch Name" } }, { "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", "details": { - "name": "char" + "name": "State Name" } } ] @@ -140,13 +141,13 @@ "tooltip": "Signaled after GlobalRefreshAudio is invoked" }, "details": { - "name": "GlobalRefreshAudio" + "name": "Global Refresh Audio" }, "params": [ { "typeid": "{7114E998-A8B4-519B-9342-A86D1587B4F7}", "details": { - "name": "" + "name": "Level Name" } } ] @@ -155,40 +156,40 @@ "key": "GlobalMuteAudio", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GlobalMuteAudio" + "tooltip": "When signaled, this will invoke Global Mute Audio" }, "exit": { "name": "Out", - "tooltip": "Signaled after GlobalMuteAudio is invoked" + "tooltip": "Signaled after Global Mute Audio is invoked" }, "details": { - "name": "GlobalMuteAudio" + "name": "Global Mute Audio" } }, { "key": "GlobalExecuteAudioTrigger", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GlobalExecuteAudioTrigger" + "tooltip": "When signaled, this will invoke Global Execute Audio Trigger" }, "exit": { "name": "Out", - "tooltip": "Signaled after GlobalExecuteAudioTrigger is invoked" + "tooltip": "Signaled after Global Execute Audio Trigger is invoked" }, "details": { - "name": "GlobalExecuteAudioTrigger" + "name": "Global Execute Audio Trigger" }, "params": [ { "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", "details": { - "name": "char" + "name": "Trigger Name" } }, { "typeid": "{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}", "details": { - "name": "EntityId", + "name": "Callback Owner", "tooltip": "Entity Unique Id" } } @@ -198,42 +199,42 @@ "key": "GlobalStopAllSounds", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GlobalStopAllSounds" + "tooltip": "When signaled, this will invoke Global Stop All Sounds" }, "exit": { "name": "Out", - "tooltip": "Signaled after GlobalStopAllSounds is invoked" + "tooltip": "Signaled after Global Stop All Sounds is invoked" }, "details": { - "name": "GlobalStopAllSounds" + "name": "Global Stop All Sounds" } }, { "key": "GlobalUnmuteAudio", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GlobalUnmuteAudio" + "tooltip": "When signaled, this will invoke Global Unmute Audio" }, "exit": { "name": "Out", - "tooltip": "Signaled after GlobalUnmuteAudio is invoked" + "tooltip": "Signaled after Global Unmute Audio is invoked" }, "details": { - "name": "GlobalUnmuteAudio" + "name": "Global Unmute Audio" } }, { "key": "GlobalResetAudioRtpcs", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GlobalResetAudioRtpcs" + "tooltip": "When signaled, this will invoke Global Reset Audio RTPCs" }, "exit": { "name": "Out", - "tooltip": "Signaled after GlobalResetAudioRtpcs is invoked" + "tooltip": "Signaled after Global Reset Audio RTPCs is invoked" }, "details": { - "name": "GlobalResetAudioRtpcs" + "name": "Global Reset Audio RTPCs" } } ] diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/CharacterControllerRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/CharacterControllerRequestBus.names index b5b4dbfedd..df4a2d29df 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/CharacterControllerRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/CharacterControllerRequestBus.names @@ -5,7 +5,7 @@ "context": "EBusSender", "variant": "", "details": { - "name": "CharacterControllerRequestBus", + "name": "Character", "category": "PhysX" }, "methods": [ @@ -13,22 +13,20 @@ "key": "SetSlopeLimitDegrees", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke Set Slope Limit (degrees)" + "tooltip": "When signaled, this will invoke Set Slope Limit Degrees" }, "exit": { "name": "Out", - "tooltip": "Signaled after Set Slope Limit (degrees) is invoked" + "tooltip": "Signaled after Set Slope Limit Degrees is invoked" }, "details": { - "name": "Set Slope Limit (degrees)", - "tooltip": "Sets the maximum slope (in degrees) which the controller can ascend" + "name": "Set Slope Limit Degrees" }, "params": [ { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", "details": { - "name": "Slope Limit (degrees)", - "tooltip": "The new value for the maximum slope (in degrees) which the controller can ascend" + "name": "Slope Limit" } } ] @@ -37,21 +35,20 @@ "key": "GetSlopeLimitDegrees", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke Get Slope Limit (degrees)" + "tooltip": "When signaled, this will invoke Get Slope Limit Degrees" }, "exit": { "name": "Out", - "tooltip": "Signaled after Get Slope Limit (degrees) is invoked" + "tooltip": "Signaled after Get Slope Limit Degrees is invoked" }, "details": { - "name": "Get Slope Limit (degrees)", - "tooltip": "Gets the maximum slope (in degrees) which the controller can ascend" + "name": "Get Slope Limit Degrees" }, "results": [ { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", "details": { - "name": "float" + "name": "Slope Limit" } } ] @@ -67,15 +64,13 @@ "tooltip": "Signaled after Set Maximum Speed is invoked" }, "details": { - "name": "Set Maximum Speed", - "tooltip": "Sets the maximum speed, above which the accumulated requested velocity will be clamped" + "name": "Set Maximum Speed" }, "params": [ { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", "details": { - "name": "Maximum Speed", - "tooltip": "The new value for the maximum speed, above which the accumulated requested velocity will be clamped" + "name": "Maximum Speed" } } ] @@ -91,14 +86,13 @@ "tooltip": "Signaled after Get Up Direction is invoked" }, "details": { - "name": "Get Up Direction", - "tooltip": "Gets the direction considered to be upwards when simulating the character" + "name": "Get Up Direction" }, "results": [ { "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}", "details": { - "name": "Vector3" + "name": "Up" } } ] @@ -114,15 +108,13 @@ "tooltip": "Signaled after Add Velocity is invoked" }, "details": { - "name": "Add Velocity", - "tooltip": "Requests a velocity for the controller, to be accumulated with other requests this tick and cumulatively applied before the next physics update" + "name": "Add Velocity" }, "params": [ { "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}", "details": { - "name": "Velocity", - "tooltip": "The desired velocity" + "name": "Velocity" } } ] @@ -138,15 +130,13 @@ "tooltip": "Signaled after Set Base Position is invoked" }, "details": { - "name": "Set Base Position", - "tooltip": "Directly moves (teleports) the controller to a new base position" + "name": "Set Base Position" }, "params": [ { "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}", "details": { - "name": "Base Position", - "tooltip": "The new value for the controller's base position" + "name": "Position" } } ] @@ -162,14 +152,13 @@ "tooltip": "Signaled after Get Center Position is invoked" }, "details": { - "name": "Get Center Position", - "tooltip": "Gets the position of the controller's center" + "name": "Get Center Position" }, "results": [ { "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}", "details": { - "name": "Vector3" + "name": "Position" } } ] @@ -185,14 +174,13 @@ "tooltip": "Signaled after Get Step Height is invoked" }, "details": { - "name": "Get Step Height", - "tooltip": "Gets the maximum height of steps which the controller can ascend" + "name": "Get Step Height" }, "results": [ { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", "details": { - "name": "float" + "name": "Step Height" } } ] @@ -208,14 +196,13 @@ "tooltip": "Signaled after Get Base Position is invoked" }, "details": { - "name": "Get Base Position", - "tooltip": "Gets the position of the controller's base" + "name": "Get Base Position" }, "results": [ { "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}", "details": { - "name": "Vector3" + "name": "Position" } } ] @@ -231,15 +218,13 @@ "tooltip": "Signaled after Set Step Height is invoked" }, "details": { - "name": "Set Step Height", - "tooltip": "Sets the maximum height of steps which the controller can ascend" + "name": "Set Step Height" }, "params": [ { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", "details": { - "name": "Step Height", - "tooltip": "The new value for the maximum height of steps which the controller can ascend" + "name": "Step Height" } } ] @@ -255,14 +240,13 @@ "tooltip": "Signaled after Get Maximum Speed is invoked" }, "details": { - "name": "Get Maximum Speed", - "tooltip": "Gets the maximum speed, above which the accumulated requested velocity will be clamped" + "name": "Get Maximum Speed" }, "results": [ { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", "details": { - "name": "float" + "name": "Maximum Speed" } } ] @@ -278,14 +262,13 @@ "tooltip": "Signaled after Get Velocity is invoked" }, "details": { - "name": "Get Velocity", - "tooltip": "Gets the character's observed velocity from the last simulation update" + "name": "Get Velocity" }, "results": [ { "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}", "details": { - "name": "Vector3" + "name": "Velocity" } } ] diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/CharacterGameplayRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/CharacterGameplayRequestBus.names new file mode 100644 index 0000000000..6a957de61b --- /dev/null +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/CharacterGameplayRequestBus.names @@ -0,0 +1,124 @@ +{ + "entries": [ + { + "key": "CharacterGameplayRequestBus", + "context": "EBusSender", + "variant": "", + "details": { + "name": "Character" + }, + "methods": [ + { + "key": "GetFallingVelocity", + "entry": { + "name": "In", + "tooltip": "When signaled, this will invoke Get Falling Velocity" + }, + "exit": { + "name": "Out", + "tooltip": "Signaled after Get Falling Velocity is invoked" + }, + "details": { + "name": "Get Falling Velocity" + }, + "results": [ + { + "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}", + "details": { + "name": "Falling Velocity" + } + } + ] + }, + { + "key": "GetGravityMultiplier", + "entry": { + "name": "In", + "tooltip": "When signaled, this will invoke Get Gravity Multiplier" + }, + "exit": { + "name": "Out", + "tooltip": "Signaled after Get Gravity Multiplier is invoked" + }, + "details": { + "name": "Get Gravity Multiplier" + }, + "results": [ + { + "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", + "details": { + "name": "Gravity Multiplier" + } + } + ] + }, + { + "key": "SetGravityMultiplier", + "entry": { + "name": "In", + "tooltip": "When signaled, this will invoke Set Gravity Multiplier" + }, + "exit": { + "name": "Out", + "tooltip": "Signaled after Set Gravity Multiplier is invoked" + }, + "details": { + "name": "Set Gravity Multiplier" + }, + "params": [ + { + "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", + "details": { + "name": "Gravity Multiplier" + } + } + ] + }, + { + "key": "IsOnGround", + "entry": { + "name": "In", + "tooltip": "When signaled, this will invoke Is On Ground" + }, + "exit": { + "name": "Out", + "tooltip": "Signaled after Is On Ground is invoked" + }, + "details": { + "name": "Is On Ground" + }, + "results": [ + { + "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", + "details": { + "name": "Is On Ground" + } + } + ] + }, + { + "key": "SetFallingVelocity", + "entry": { + "name": "In", + "tooltip": "When signaled, this will invoke Set Falling Velocity" + }, + "exit": { + "name": "Out", + "tooltip": "Signaled after Set Falling Velocity is invoked" + }, + "details": { + "name": "Set Falling Velocity" + }, + "params": [ + { + "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}", + "details": { + "name": "Falling Velocity" + } + } + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/CollisionFilteringBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/CollisionFilteringBus.names index ea74fb1d02..1c8eba4b1f 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/CollisionFilteringBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/CollisionFilteringBus.names @@ -5,8 +5,7 @@ "context": "EBusSender", "variant": "", "details": { - "name": "CollisionFilteringBus", - "category": "PhysX" + "name": "Collision Filtering" }, "methods": [ { @@ -20,29 +19,25 @@ "tooltip": "Signaled after Toggle Collision Layer is invoked" }, "details": { - "name": "Toggle Collision Layer", - "tooltip": "Toggles a collision layer on or off on a collision group." + "name": "Toggle Collision Layer" }, "params": [ { "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", "details": { - "name": "Layer Name", - "tooltip": "The name of the layer to toggle. The layer name must exist in the PhysX Configuration otherwise this node will have no effect." + "name": "Layer Name" } }, { "typeid": "{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}", "details": { - "name": "Collider Tag", - "tooltip": "Use this to target a specific collider on the entity. If left blank, all colliders will be updated." + "name": "Collider Tag" } }, { "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", "details": { - "name": "Enabled", - "tooltip": "Toggles the layer on or off" + "name": "Enabled" } } ] @@ -58,22 +53,19 @@ "tooltip": "Signaled after Set Collision Group is invoked" }, "details": { - "name": "Set Collision Group", - "tooltip": "Sets the collision group on a collider" + "name": "Set Collision Group" }, "params": [ { "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", "details": { - "name": "Group Name", - "tooltip": "The name of the group to set. The group name must exist in the PhysX Configuration otherwise this node will have no effect." + "name": "Group Name" } }, { "typeid": "{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}", "details": { - "name": "Collider Tag", - "tooltip": "Use this to target a specific collider on the entity. If left blank, all colliders will be updated." + "name": "Collider Tag" } } ] @@ -89,14 +81,13 @@ "tooltip": "Signaled after Get Collision Group Name is invoked" }, "details": { - "name": "Get Collision Group Name", - "tooltip": "Gets the collision group on an entity. Note: multiple colliders on an entity are not supported." + "name": "Get Collision Group Name" }, "results": [ { "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", "details": { - "name": "AZStd::string" + "name": "Name" } } ] @@ -112,14 +103,13 @@ "tooltip": "Signaled after Get Collision Layer Name is invoked" }, "details": { - "name": "Get Collision Layer Name", - "tooltip": "Gets the collision layer on an entity. Note: multiple colliders on an entity are not supported." + "name": "Get Collision Layer Name" }, "results": [ { "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", "details": { - "name": "AZStd::string" + "name": "Name" } } ] @@ -135,22 +125,19 @@ "tooltip": "Signaled after Set Collision Layer is invoked" }, "details": { - "name": "Set Collision Layer", - "tooltip": "Sets the collision layer on a collider" + "name": "Set Collision Layer" }, "params": [ { "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", "details": { - "name": "Layer Name", - "tooltip": "The name of the layer to set. The layer name must exist in the PhysX Configuration otherwise this node will have no effect." + "name": "Layer Name" } }, { "typeid": "{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}", "details": { - "name": "Collider Tag", - "tooltip": "Use this to target a specific collider on the entity. If left blank, all colliders will be updated." + "name": "Collider Tag" } } ] diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ForceLinearDampingRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ForceLinearDampingRequestBus.names new file mode 100644 index 0000000000..46da76a5ca --- /dev/null +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ForceLinearDampingRequestBus.names @@ -0,0 +1,58 @@ +{ + "entries": [ + { + "key": "ForceLinearDampingRequestBus", + "context": "EBusSender", + "variant": "", + "details": { + "name": "Force Linear Damping" + }, + "methods": [ + { + "key": "SetDamping", + "entry": { + "name": "In", + "tooltip": "When signaled, this will invoke Set Damping" + }, + "exit": { + "name": "Out", + "tooltip": "Signaled after Set Damping is invoked" + }, + "details": { + "name": "Set Damping" + }, + "params": [ + { + "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", + "details": { + "name": "Damping" + } + } + ] + }, + { + "key": "GetDamping", + "entry": { + "name": "In", + "tooltip": "When signaled, this will invoke Get Damping" + }, + "exit": { + "name": "Out", + "tooltip": "Signaled after Get Damping is invoked" + }, + "details": { + "name": "Get Damping" + }, + "results": [ + { + "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", + "details": { + "name": "Damping" + } + } + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ForceLocalSpaceRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ForceLocalSpaceRequestBus.names new file mode 100644 index 0000000000..a3dd070013 --- /dev/null +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ForceLocalSpaceRequestBus.names @@ -0,0 +1,102 @@ +{ + "entries": [ + { + "key": "ForceLocalSpaceRequestBus", + "context": "EBusSender", + "variant": "", + "details": { + "name": "Force Local Space" + }, + "methods": [ + { + "key": "SetDirection", + "entry": { + "name": "In", + "tooltip": "When signaled, this will invoke Set Direction" + }, + "exit": { + "name": "Out", + "tooltip": "Signaled after SetDirection is invoked" + }, + "details": { + "name": "Set Direction" + }, + "params": [ + { + "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}", + "details": { + "name": "Direction" + } + } + ] + }, + { + "key": "GetDirection", + "entry": { + "name": "In", + "tooltip": "When signaled, this will invoke Get Direction" + }, + "exit": { + "name": "Out", + "tooltip": "Signaled after Get Direction is invoked" + }, + "details": { + "name": "Get Direction" + }, + "results": [ + { + "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}", + "details": { + "name": "Direction" + } + } + ] + }, + { + "key": "SetMagnitude", + "entry": { + "name": "In", + "tooltip": "When signaled, this will invoke Set Magnitude" + }, + "exit": { + "name": "Out", + "tooltip": "Signaled after Set Magnitude is invoked" + }, + "details": { + "name": "Set Magnitude" + }, + "params": [ + { + "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", + "details": { + "name": "Magnitude" + } + } + ] + }, + { + "key": "GetMagnitude", + "entry": { + "name": "In", + "tooltip": "When signaled, this will invoke Get Magnitude" + }, + "exit": { + "name": "Out", + "tooltip": "Signaled after Get Magnitude is invoked" + }, + "details": { + "name": "Get Magnitude" + }, + "results": [ + { + "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", + "details": { + "name": "Magnitude" + } + } + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ForcePointRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ForcePointRequestBus.names new file mode 100644 index 0000000000..767d9b1d35 --- /dev/null +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ForcePointRequestBus.names @@ -0,0 +1,58 @@ +{ + "entries": [ + { + "key": "ForcePointRequestBus", + "context": "EBusSender", + "variant": "", + "details": { + "name": "Force Point" + }, + "methods": [ + { + "key": "SetMagnitude", + "entry": { + "name": "In", + "tooltip": "When signaled, this will invoke Set Magnitude" + }, + "exit": { + "name": "Out", + "tooltip": "Signaled after Set Magnitude is invoked" + }, + "details": { + "name": "Set Magnitude" + }, + "params": [ + { + "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", + "details": { + "name": "Magnitude" + } + } + ] + }, + { + "key": "GetMagnitude", + "entry": { + "name": "In", + "tooltip": "When signaled, this will invoke Get Magnitude" + }, + "exit": { + "name": "Out", + "tooltip": "Signaled after Get Magnitude is invoked" + }, + "details": { + "name": "Get Magnitude" + }, + "results": [ + { + "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", + "details": { + "name": "Magnitude" + } + } + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ForceSimpleDragRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ForceSimpleDragRequestBus.names new file mode 100644 index 0000000000..075aa1b6a4 --- /dev/null +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ForceSimpleDragRequestBus.names @@ -0,0 +1,58 @@ +{ + "entries": [ + { + "key": "ForceSimpleDragRequestBus", + "context": "EBusSender", + "variant": "", + "details": { + "name": "Force Simple Drag" + }, + "methods": [ + { + "key": "SetDensity", + "entry": { + "name": "In", + "tooltip": "When signaled, this will invoke Set Density" + }, + "exit": { + "name": "Out", + "tooltip": "Signaled after Set Density is invoked" + }, + "details": { + "name": "Set Density" + }, + "params": [ + { + "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", + "details": { + "name": "Density" + } + } + ] + }, + { + "key": "GetDensity", + "entry": { + "name": "In", + "tooltip": "When signaled, this will invoke Get Density" + }, + "exit": { + "name": "Out", + "tooltip": "Signaled after Get Density is invoked" + }, + "details": { + "name": "Get Density" + }, + "results": [ + { + "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", + "details": { + "name": "Density" + } + } + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ForceSplineFollowRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ForceSplineFollowRequestBus.names new file mode 100644 index 0000000000..7143fd0b7f --- /dev/null +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ForceSplineFollowRequestBus.names @@ -0,0 +1,190 @@ +{ + "entries": [ + { + "key": "ForceSplineFollowRequestBus", + "context": "EBusSender", + "variant": "", + "details": { + "name": "Force Spline Follow" + }, + "methods": [ + { + "key": "GetLookAhead", + "entry": { + "name": "In", + "tooltip": "When signaled, this will invoke Get Look Ahead" + }, + "exit": { + "name": "Out", + "tooltip": "Signaled after Get Look Ahead is invoked" + }, + "details": { + "name": "Get Look Ahead" + }, + "results": [ + { + "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", + "details": { + "name": "Look Ahead" + } + } + ] + }, + { + "key": "SetLookAhead", + "entry": { + "name": "In", + "tooltip": "When signaled, this will invoke Set Look Ahead" + }, + "exit": { + "name": "Out", + "tooltip": "Signaled after Set Look Ahead is invoked" + }, + "details": { + "name": "Set Look Ahead" + }, + "params": [ + { + "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", + "details": { + "name": "Look Ahead" + } + } + ] + }, + { + "key": "SetTargetSpeed", + "entry": { + "name": "In", + "tooltip": "When signaled, this will invoke Set Target Speed" + }, + "exit": { + "name": "Out", + "tooltip": "Signaled after Set Target Speed is invoked" + }, + "details": { + "name": "Set Target Speed" + }, + "params": [ + { + "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", + "details": { + "name": "Target Speed" + } + } + ] + }, + { + "key": "GetFrequency", + "entry": { + "name": "In", + "tooltip": "When signaled, this will invoke Get Frequency" + }, + "exit": { + "name": "Out", + "tooltip": "Signaled after Get Frequency is invoked" + }, + "details": { + "name": "Get Frequency" + }, + "results": [ + { + "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", + "details": { + "name": "Frequency" + } + } + ] + }, + { + "key": "GetDampingRatio", + "entry": { + "name": "In", + "tooltip": "When signaled, this will invoke Get Damping Ratio" + }, + "exit": { + "name": "Out", + "tooltip": "Signaled after Get Damping Ratio is invoked" + }, + "details": { + "name": "Get Damping Ratio" + }, + "results": [ + { + "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", + "details": { + "name": "Damping Ratio" + } + } + ] + }, + { + "key": "SetFrequency", + "entry": { + "name": "In", + "tooltip": "When signaled, this will invoke Set Frequency" + }, + "exit": { + "name": "Out", + "tooltip": "Signaled after Set Frequency is invoked" + }, + "details": { + "name": "Set Frequency" + }, + "params": [ + { + "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", + "details": { + "name": "Frequency" + } + } + ] + }, + { + "key": "GetTargetSpeed", + "entry": { + "name": "In", + "tooltip": "When signaled, this will invoke Get Target Speed" + }, + "exit": { + "name": "Out", + "tooltip": "Signaled after Get Target Speed is invoked" + }, + "details": { + "name": "Get Target Speed" + }, + "results": [ + { + "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", + "details": { + "name": "Target Speed" + } + } + ] + }, + { + "key": "SetDampingRatio", + "entry": { + "name": "In", + "tooltip": "When signaled, this will invoke Set Damping Ratio" + }, + "exit": { + "name": "Out", + "tooltip": "Signaled after Set Damping Ratio is invoked" + }, + "details": { + "name": "Set Damping Ratio" + }, + "params": [ + { + "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", + "details": { + "name": "Damping Ratio" + } + } + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ForceWorldSpaceRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ForceWorldSpaceRequestBus.names new file mode 100644 index 0000000000..f9c1b2dcbe --- /dev/null +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ForceWorldSpaceRequestBus.names @@ -0,0 +1,102 @@ +{ + "entries": [ + { + "key": "ForceWorldSpaceRequestBus", + "context": "EBusSender", + "variant": "", + "details": { + "name": "Force World Space" + }, + "methods": [ + { + "key": "SetDirection", + "entry": { + "name": "In", + "tooltip": "When signaled, this will invoke Set Direction" + }, + "exit": { + "name": "Out", + "tooltip": "Signaled after Set Direction is invoked" + }, + "details": { + "name": "Set Direction" + }, + "params": [ + { + "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}", + "details": { + "name": "Direction" + } + } + ] + }, + { + "key": "GetDirection", + "entry": { + "name": "In", + "tooltip": "When signaled, this will invoke Get Direction" + }, + "exit": { + "name": "Out", + "tooltip": "Signaled after Get Direction is invoked" + }, + "details": { + "name": "Get Direction" + }, + "results": [ + { + "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}", + "details": { + "name": "Direction" + } + } + ] + }, + { + "key": "SetMagnitude", + "entry": { + "name": "In", + "tooltip": "When signaled, this will invoke Set Magnitude" + }, + "exit": { + "name": "Out", + "tooltip": "Signaled after Set Magnitude is invoked" + }, + "details": { + "name": "Set Magnitude" + }, + "params": [ + { + "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", + "details": { + "name": "Magnitude" + } + } + ] + }, + { + "key": "GetMagnitude", + "entry": { + "name": "In", + "tooltip": "When signaled, this will invoke Get Magnitude" + }, + "exit": { + "name": "Out", + "tooltip": "Signaled after Get Magnitude is invoked" + }, + "details": { + "name": "Get Magnitude" + }, + "results": [ + { + "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", + "details": { + "name": "Magnitude" + } + } + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/HeightfieldProviderRequestsBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/HeightfieldProviderRequestsBus.names new file mode 100644 index 0000000000..0524860818 --- /dev/null +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/HeightfieldProviderRequestsBus.names @@ -0,0 +1,234 @@ +{ + "entries": [ + { + "key": "HeightfieldProviderRequestsBus", + "context": "EBusSender", + "variant": "", + "details": { + "name": "Heightfield Provider" + }, + "methods": [ + { + "key": "GetHeightfieldMinHeight", + "entry": { + "name": "In", + "tooltip": "When signaled, this will invoke Get Heightfield Min Height" + }, + "exit": { + "name": "Out", + "tooltip": "Signaled after Get Heightfield Min Height is invoked" + }, + "details": { + "name": "Get Heightfield Min Height" + }, + "results": [ + { + "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", + "details": { + "name": "Heightfield Min Height" + } + } + ] + }, + { + "key": "GetHeights", + "entry": { + "name": "In", + "tooltip": "When signaled, this will invoke Get Heights" + }, + "exit": { + "name": "Out", + "tooltip": "Signaled after Get Heights is invoked" + }, + "details": { + "name": "Get Heights" + }, + "results": [ + { + "typeid": "{6106BF95-5ACD-5071-8D0E-4F846C2138AD}", + "details": { + "name": "Heights" + } + } + ] + }, + { + "key": "GetHeightfieldMaxHeight", + "entry": { + "name": "In", + "tooltip": "When signaled, this will invoke Get Heightfield Max Height" + }, + "exit": { + "name": "Out", + "tooltip": "Signaled after Get Heightfield Max Height is invoked" + }, + "details": { + "name": "Get Heightfield Max Height" + }, + "results": [ + { + "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", + "details": { + "name": "Heightfield Max Height" + } + } + ] + }, + { + "key": "GetHeightfieldGridColumns", + "entry": { + "name": "In", + "tooltip": "When signaled, this will invoke Get Heightfield Grid Columns" + }, + "exit": { + "name": "Out", + "tooltip": "Signaled after Get Heightfield Grid Columns is invoked" + }, + "details": { + "name": "Get Heightfield Grid Columns" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "Heightfield Grid Columns" + } + } + ] + }, + { + "key": "GetMaterialList", + "entry": { + "name": "In", + "tooltip": "When signaled, this will invoke Get Material List" + }, + "exit": { + "name": "Out", + "tooltip": "Signaled after Get Material List is invoked" + }, + "details": { + "name": "Get Material List" + }, + "results": [ + { + "typeid": "{82111EAD-9C65-57F0-BA72-46D6D931B434}", + "details": { + "name": "Material List" + } + } + ] + }, + { + "key": "GetHeightfieldTransform", + "entry": { + "name": "In", + "tooltip": "When signaled, this will invoke Get Heightfield Transform" + }, + "exit": { + "name": "Out", + "tooltip": "Signaled after Get Heightfield Transform is invoked" + }, + "details": { + "name": "Get Heightfield Transform" + }, + "results": [ + { + "typeid": "{5D9958E9-9F1E-4985-B532-FFFDE75FEDFD}", + "details": { + "name": "Heightfield Transform" + } + } + ] + }, + { + "key": "GetHeightfieldGridRows", + "entry": { + "name": "In", + "tooltip": "When signaled, this will invoke Get Heightfield Grid Rows" + }, + "exit": { + "name": "Out", + "tooltip": "Signaled after Get Heightfield Grid Rows is invoked" + }, + "details": { + "name": "Get Heightfield Grid Rows" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "Heightfield Grid Rows" + } + } + ] + }, + { + "key": "GetHeightfieldGridSpacing", + "entry": { + "name": "In", + "tooltip": "When signaled, this will invoke Get Heightfield Grid Spacing" + }, + "exit": { + "name": "Out", + "tooltip": "Signaled after Get Heightfield Grid Spacing is invoked" + }, + "details": { + "name": "Get Heightfield Grid Spacing" + }, + "results": [ + { + "typeid": "{3D80F623-C85C-4741-90D0-E4E66164E6BF}", + "details": { + "name": "Heightfield Grid Spacing" + } + } + ] + }, + { + "key": "GetHeightfieldAabb", + "entry": { + "name": "In", + "tooltip": "When signaled, this will invoke Get Heightfield AABB" + }, + "exit": { + "name": "Out", + "tooltip": "Signaled after Get Heightfield AABB is invoked" + }, + "details": { + "name": "Get Heightfield AABB" + }, + "results": [ + { + "typeid": "{A54C2B36-D5B8-46A1-A529-4EBDBD2450E7}", + "details": { + "name": "AABB" + } + } + ] + }, + { + "key": "GetHeightsAndMaterials", + "entry": { + "name": "In", + "tooltip": "When signaled, this will invoke Get Heights And Materials" + }, + "exit": { + "name": "Out", + "tooltip": "Signaled after Get Heights And Materials is invoked" + }, + "details": { + "name": "Get Heights And Materials" + }, + "results": [ + { + "typeid": "{887288A6-8B56-55A7-BD10-3E4B19CBFD6C}", + "details": { + "name": "Heights And Materials" + } + } + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/PhysXCharacterControllerRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/PhysXCharacterControllerRequestBus.names index c0c09a568d..e4b0b6086d 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/PhysXCharacterControllerRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/PhysXCharacterControllerRequestBus.names @@ -41,7 +41,7 @@ "tooltip": "Signaled after Get Radius is invoked" }, "details": { - "name": "Get adius" + "name": "Get Radius" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/RigidBodyRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/RigidBodyRequestBus.names new file mode 100644 index 0000000000..412136183b --- /dev/null +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/RigidBodyRequestBus.names @@ -0,0 +1,722 @@ +{ + "entries": [ + { + "key": "RigidBodyRequestBus", + "context": "EBusSender", + "variant": "", + "details": { + "name": "Rigid Body" + }, + "methods": [ + { + "key": "SetLinearVelocity", + "entry": { + "name": "In", + "tooltip": "When signaled, this will invoke Set Linear Velocity" + }, + "exit": { + "name": "Out", + "tooltip": "Signaled after Set Linear Velocity is invoked" + }, + "details": { + "name": "Set Linear Velocity" + }, + "params": [ + { + "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}", + "details": { + "name": "Linear Velocity" + } + } + ] + }, + { + "key": "SetKinematic", + "entry": { + "name": "In", + "tooltip": "When signaled, this will invoke Set Kinematic" + }, + "exit": { + "name": "Out", + "tooltip": "Signaled after Set Kinematic is invoked" + }, + "details": { + "name": "Set Kinematic" + }, + "params": [ + { + "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", + "details": { + "name": "Enabled" + } + } + ] + }, + { + "key": "SetMass", + "entry": { + "name": "In", + "tooltip": "When signaled, this will invoke Set Mass" + }, + "exit": { + "name": "Out", + "tooltip": "Signaled after Set Mass is invoked" + }, + "details": { + "name": "Set Mass" + }, + "params": [ + { + "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", + "details": { + "name": "Mass" + } + } + ] + }, + { + "key": "SetGravityEnabled", + "entry": { + "name": "In", + "tooltip": "When signaled, this will invoke Set Gravity Enabled" + }, + "exit": { + "name": "Out", + "tooltip": "Signaled after Set Gravity Enabled is invoked" + }, + "details": { + "name": "Set Gravity Enabled" + }, + "params": [ + { + "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", + "details": { + "name": "Enabled" + } + } + ] + }, + { + "key": "GetAabb", + "entry": { + "name": "In", + "tooltip": "When signaled, this will invoke Get AABB" + }, + "exit": { + "name": "Out", + "tooltip": "Signaled after Get AABB is invoked" + }, + "details": { + "name": "Get AABB" + }, + "results": [ + { + "typeid": "{A54C2B36-D5B8-46A1-A529-4EBDBD2450E7}", + "details": { + "name": "AABB" + } + } + ] + }, + { + "key": "ForceAwake", + "entry": { + "name": "In", + "tooltip": "When signaled, this will invoke Force Awake" + }, + "exit": { + "name": "Out", + "tooltip": "Signaled after Force Awake is invoked" + }, + "details": { + "name": "Force Awake" + } + }, + { + "key": "SetAngularDamping", + "entry": { + "name": "In", + "tooltip": "When signaled, this will invoke Set Angular Damping" + }, + "exit": { + "name": "Out", + "tooltip": "Signaled after Set Angular Damping is invoked" + }, + "details": { + "name": "Set Angular Damping" + }, + "params": [ + { + "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", + "details": { + "name": "Angular Damping" + } + } + ] + }, + { + "key": "ApplyAngularImpulse", + "entry": { + "name": "In", + "tooltip": "When signaled, this will invoke Apply Angular Impulse" + }, + "exit": { + "name": "Out", + "tooltip": "Signaled after Apply Angular Impulse is invoked" + }, + "details": { + "name": "Apply Angular Impulse" + }, + "params": [ + { + "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}", + "details": { + "name": "Angular Impulse" + } + } + ] + }, + { + "key": "DisablePhysics", + "entry": { + "name": "In", + "tooltip": "When signaled, this will invoke Disable Physics" + }, + "exit": { + "name": "Out", + "tooltip": "Signaled after Disable Physics is invoked" + }, + "details": { + "name": "Disable Physics" + } + }, + { + "key": "SetSimulationEnabled", + "entry": { + "name": "In", + "tooltip": "When signaled, this will invoke Set Simulation Enabled" + }, + "exit": { + "name": "Out", + "tooltip": "Signaled after Set Simulation Enabled is invoked" + }, + "details": { + "name": "Set Simulation Enabled" + }, + "params": [ + { + "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", + "details": { + "name": "Enabled" + } + } + ] + }, + { + "key": "GetLinearVelocityAtWorldPoint", + "entry": { + "name": "In", + "tooltip": "When signaled, this will invoke Get Linear Velocity At World Point" + }, + "exit": { + "name": "Out", + "tooltip": "Signaled after Get Linear Velocity At World Point is invoked" + }, + "details": { + "name": "Get Linear Velocity At World Point" + }, + "params": [ + { + "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}", + "details": { + "name": "Linear Velocity" + } + } + ], + "results": [ + { + "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}", + "details": { + "name": "World Point" + } + } + ] + }, + { + "key": "SetAngularVelocity", + "entry": { + "name": "In", + "tooltip": "When signaled, this will invoke Set Angular Velocity" + }, + "exit": { + "name": "Out", + "tooltip": "Signaled after Set Angular Velocity is invoked" + }, + "details": { + "name": "Set Angular Velocity" + }, + "params": [ + { + "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}", + "details": { + "name": "Angular Velocity" + } + } + ] + }, + { + "key": "SetCenterOfMassOffset", + "entry": { + "name": "In", + "tooltip": "When signaled, this will invoke Set Center Of Mass Offset" + }, + "exit": { + "name": "Out", + "tooltip": "Signaled after Set Center Of Mass Offset is invoked" + }, + "details": { + "name": "Set Center Of Mass Offset" + }, + "params": [ + { + "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}", + "details": { + "name": "Offset" + } + } + ] + }, + { + "key": "IsPhysicsEnabled", + "entry": { + "name": "In", + "tooltip": "When signaled, this will invoke Is Physics Enabled" + }, + "exit": { + "name": "Out", + "tooltip": "Signaled after Is Physics Enabled is invoked" + }, + "details": { + "name": "Is Physics Enabled" + }, + "results": [ + { + "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", + "details": { + "name": "Enabled" + } + } + ] + }, + { + "key": "GetSleepThreshold", + "entry": { + "name": "In", + "tooltip": "When signaled, this will invoke Get Sleep Threshold" + }, + "exit": { + "name": "Out", + "tooltip": "Signaled after Get Sleep Threshold is invoked" + }, + "details": { + "name": "Get Sleep Threshold" + }, + "results": [ + { + "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", + "details": { + "name": "Sleep Threshold" + } + } + ] + }, + { + "key": "SetKinematicTarget", + "entry": { + "name": "In", + "tooltip": "When signaled, this will invoke Set Kinematic Target" + }, + "exit": { + "name": "Out", + "tooltip": "Signaled after Set Kinematic Target is invoked" + }, + "details": { + "name": "Set Kinematic Target" + }, + "params": [ + { + "typeid": "{5D9958E9-9F1E-4985-B532-FFFDE75FEDFD}", + "details": { + "name": "Kinematic Target" + } + } + ] + }, + { + "key": "EnablePhysics", + "entry": { + "name": "In", + "tooltip": "When signaled, this will invoke Enable Physics" + }, + "exit": { + "name": "Out", + "tooltip": "Signaled after Enable Physics is invoked" + }, + "details": { + "name": "Enable Physics" + } + }, + { + "key": "GetLinearDamping", + "entry": { + "name": "In", + "tooltip": "When signaled, this will invoke Get Linear Damping" + }, + "exit": { + "name": "Out", + "tooltip": "Signaled after Get Linear Damping is invoked" + }, + "details": { + "name": "Get Linear Damping" + }, + "results": [ + { + "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", + "details": { + "name": "Linear Damping" + } + } + ] + }, + { + "key": "ApplyLinearImpulseAtWorldPoint", + "entry": { + "name": "In", + "tooltip": "When signaled, this will invoke Apply Linear Impulse At World Point" + }, + "exit": { + "name": "Out", + "tooltip": "Signaled after Apply Linear Impulse At World Point is invoked" + }, + "details": { + "name": "Apply Linear Impulse At World Point" + }, + "params": [ + { + "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}", + "details": { + "name": "Linear Impulse" + } + }, + { + "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}", + "details": { + "name": "World Point" + } + } + ] + }, + { + "key": "GetCenterOfMassWorld", + "entry": { + "name": "In", + "tooltip": "When signaled, this will invoke Get Center Of Mass World" + }, + "exit": { + "name": "Out", + "tooltip": "Signaled after Get Center Of Mass World is invoked" + }, + "details": { + "name": "Get Center Of Mass World" + }, + "results": [ + { + "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}", + "details": { + "name": "Center of Mass (World)" + } + } + ] + }, + { + "key": "GetCenterOfMassLocal", + "entry": { + "name": "In", + "tooltip": "When signaled, this will invoke Get Center Of Mass Local" + }, + "exit": { + "name": "Out", + "tooltip": "Signaled after Get Center Of Mass Local is invoked" + }, + "details": { + "name": "Get Center Of Mass Local" + }, + "results": [ + { + "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}", + "details": { + "name": "Center Of Mass (Local)" + } + } + ] + }, + { + "key": "SetLinearDamping", + "entry": { + "name": "In", + "tooltip": "When signaled, this will invoke Set Linear Damping" + }, + "exit": { + "name": "Out", + "tooltip": "Signaled after Set Linear Damping is invoked" + }, + "details": { + "name": "Set Linear Damping" + }, + "params": [ + { + "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", + "details": { + "name": "Linear Damping" + } + } + ] + }, + { + "key": "GetAngularDamping", + "entry": { + "name": "In", + "tooltip": "When signaled, this will invoke Get Angular Damping" + }, + "exit": { + "name": "Out", + "tooltip": "Signaled after Get Angular Damping is invoked" + }, + "details": { + "name": "Get Angular Damping" + }, + "results": [ + { + "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", + "details": { + "name": "Angular Damping" + } + } + ] + }, + { + "key": "GetLinearVelocity", + "entry": { + "name": "In", + "tooltip": "When signaled, this will invoke Get Linear Velocity" + }, + "exit": { + "name": "Out", + "tooltip": "Signaled after Get Linear Velocity is invoked" + }, + "details": { + "name": "Get Linear Velocity" + }, + "results": [ + { + "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}", + "details": { + "name": "Linear Velocity" + } + } + ] + }, + { + "key": "IsAwake", + "entry": { + "name": "In", + "tooltip": "When signaled, this will invoke Is Awake" + }, + "exit": { + "name": "Out", + "tooltip": "Signaled after Is Awake is invoked" + }, + "details": { + "name": "Is Awake" + }, + "results": [ + { + "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", + "details": { + "name": "Is Awake" + } + } + ] + }, + { + "key": "IsGravityEnabled", + "entry": { + "name": "In", + "tooltip": "When signaled, this will invoke Is Gravity Enabled" + }, + "exit": { + "name": "Out", + "tooltip": "Signaled after Is Gravity Enabled is invoked" + }, + "details": { + "name": "Is Gravity Enabled" + }, + "results": [ + { + "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", + "details": { + "name": "Is Gravity Enabled" + } + } + ] + }, + { + "key": "GetInverseMass", + "entry": { + "name": "In", + "tooltip": "When signaled, this will invoke Get Inverse Mass" + }, + "exit": { + "name": "Out", + "tooltip": "Signaled after Get Inverse Mass is invoked" + }, + "details": { + "name": "Get Inverse Mass" + }, + "results": [ + { + "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", + "details": { + "name": "Inverse Mass" + } + } + ] + }, + { + "key": "SetSleepThreshold", + "entry": { + "name": "In", + "tooltip": "When signaled, this will invoke Set Sleep Threshold" + }, + "exit": { + "name": "Out", + "tooltip": "Signaled after Set Sleep Threshold is invoked" + }, + "details": { + "name": "Set Sleep Threshold" + }, + "params": [ + { + "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", + "details": { + "name": "Sleep Threshold" + } + } + ] + }, + { + "key": "ForceAsleep", + "entry": { + "name": "In", + "tooltip": "When signaled, this will invoke Force Asleep" + }, + "exit": { + "name": "Out", + "tooltip": "Signaled after Force Asleep is invoked" + }, + "details": { + "name": "Force Asleep" + } + }, + { + "key": "GetMass", + "entry": { + "name": "In", + "tooltip": "When signaled, this will invoke Get Mass" + }, + "exit": { + "name": "Out", + "tooltip": "Signaled after Get Mass is invoked" + }, + "details": { + "name": "Get Mass" + }, + "results": [ + { + "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", + "details": { + "name": "Mass" + } + } + ] + }, + { + "key": "IsKinematic", + "entry": { + "name": "In", + "tooltip": "When signaled, this will invoke Is Kinematic" + }, + "exit": { + "name": "Out", + "tooltip": "Signaled after Is Kinematic is invoked" + }, + "details": { + "name": "Is Kinematic" + }, + "results": [ + { + "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", + "details": { + "name": "Is Kinematic" + } + } + ] + }, + { + "key": "ApplyLinearImpulse", + "entry": { + "name": "In", + "tooltip": "When signaled, this will invoke Apply Linear Impulse" + }, + "exit": { + "name": "Out", + "tooltip": "Signaled after Apply Linear Impulse is invoked" + }, + "details": { + "name": "Apply Linear Impulse" + }, + "params": [ + { + "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}", + "details": { + "name": "Linear Impulse" + } + } + ] + }, + { + "key": "GetAngularVelocity", + "entry": { + "name": "In", + "tooltip": "When signaled, this will invoke Get Angular Velocity" + }, + "exit": { + "name": "Out", + "tooltip": "Signaled after Get Angular Velocity is invoked" + }, + "details": { + "name": "Get Angular Velocity" + }, + "results": [ + { + "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}", + "details": { + "name": "Angular Velocity" + } + } + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/SimulatedBodyComponentRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/SimulatedBodyComponentRequestBus.names index 6b4bb30b91..fc0cf7e60d 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/SimulatedBodyComponentRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/SimulatedBodyComponentRequestBus.names @@ -5,8 +5,7 @@ "context": "EBusSender", "variant": "", "details": { - "name": "SimulatedBodyComponentRequestBus", - "category": "PhysX" + "name": "Simulated Body" }, "methods": [ { @@ -26,7 +25,7 @@ { "typeid": "{A54C2B36-D5B8-46A1-A529-4EBDBD2450E7}", "details": { - "name": "Aabb" + "name": "AABB" } } ] @@ -35,11 +34,11 @@ "key": "IsPhysicsEnabled", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke Is Physics Enabled" + "tooltip": "When signaled, this will invoke IsPhysicsEnabled" }, "exit": { "name": "Out", - "tooltip": "Signaled after Is Physics Enabled is invoked" + "tooltip": "Signaled after IsPhysicsEnabled is invoked" }, "details": { "name": "Is Physics Enabled" @@ -48,7 +47,7 @@ { "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", "details": { - "name": "bool" + "name": "Enabled" } } ] @@ -57,21 +56,20 @@ "key": "RayCast", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke Raycast (Single Body)" + "tooltip": "When signaled, this will invoke RayCast" }, "exit": { "name": "Out", - "tooltip": "Signaled after Raycast (Single Body) is invoked" + "tooltip": "Signaled after RayCast is invoked" }, "details": { - "name": "Raycast (Single Body)", - "tooltip": "Perform a raycast against a single simulated body (not the whole scene)" + "name": "Ray Cast" }, "params": [ { "typeid": "{53EAD088-A391-48F1-8370-2A1DBA31512F}", "details": { - "name": "Raycast Request", + "name": "RayCast Request", "tooltip": "Parameters for raycast" } } @@ -80,7 +78,7 @@ { "typeid": "{7A7201B9-67B5-438B-B4EB-F3EEBB78C617}", "details": { - "name": "SceneQueryHit" + "name": "Scene Query Hit" } } ] @@ -103,11 +101,11 @@ "key": "EnablePhysics", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke Enable Physics" + "tooltip": "When signaled, this will invoke EnablePhysics" }, "exit": { "name": "Out", - "tooltip": "Signaled after Enable Physics is invoked" + "tooltip": "Signaled after EnablePhysics is invoked" }, "details": { "name": "Enable Physics" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/WindRequestsBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/WindRequestsBus.names index ed7d56a8bb..3102c94ffb 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/WindRequestsBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/WindRequestsBus.names @@ -5,8 +5,7 @@ "context": "EBusSender", "variant": "", "details": { - "name": "WindRequestsBus", - "category": "PhysX" + "name": "Wind" }, "methods": [ { @@ -26,7 +25,7 @@ { "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}", "details": { - "name": "Vector3" + "name": "Global Wind Direction" } } ] @@ -56,7 +55,7 @@ { "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}", "details": { - "name": "Vector3" + "name": "Wind Direction" } } ] @@ -86,7 +85,7 @@ { "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}", "details": { - "name": "Vector3" + "name": "Wind Direction" } } ] diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/PhysXWorld_BoxCastWithGroup.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/PhysXWorld_BoxCastWithGroup.names new file mode 100644 index 0000000000..ceed8314ba --- /dev/null +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/PhysXWorld_BoxCastWithGroup.names @@ -0,0 +1,100 @@ +{ + "entries": [ + { + "key": "{022255F7-DD50-5654-967E-6E00E8360F00}", + "context": "ScriptCanvas::Node", + "variant": "", + "details": { + "name": "Box Cast With Group", + "category": "PhysX/World", + "tooltip": "Box Cast" + }, + "slots": [ + { + "key": "Input_In", + "details": { + "name": "In" + } + }, + { + "key": "Output_Out", + "details": { + "name": "Out" + } + }, + { + "key": "DataInput_Distance", + "details": { + "name": "Distance" + } + }, + { + "key": "DataInput_Pose", + "details": { + "name": "Pose" + } + }, + { + "key": "DataInput_Direction", + "details": { + "name": "Direction" + } + }, + { + "key": "DataInput_Dimensions", + "details": { + "name": "Dimensions" + } + }, + { + "key": "DataInput_Collision group", + "details": { + "name": "Collision group" + } + }, + { + "key": "DataInput_Ignore", + "details": { + "name": "Ignore" + } + }, + { + "key": "DataOutput_Object Hit", + "details": { + "name": "Object Hit" + } + }, + { + "key": "DataOutput_Position", + "details": { + "name": "Position" + } + }, + { + "key": "DataOutput_Normal", + "details": { + "name": "Normal" + } + }, + { + "key": "DataOutput_Distance", + "details": { + "name": "Distance" + } + }, + { + "key": "DataOutput_EntityId", + "details": { + "name": "EntityId" + } + }, + { + "key": "DataOutput_Surface", + "details": { + "name": "Surface" + } + } + ] + } + ] +} \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/PhysXWorld_CapsuleCastWithGroup.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/PhysXWorld_CapsuleCastWithGroup.names new file mode 100644 index 0000000000..a38ace417c --- /dev/null +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/PhysXWorld_CapsuleCastWithGroup.names @@ -0,0 +1,106 @@ +{ + "entries": [ + { + "key": "{1467D2BE-D829-5A8A-976D-6D06FDCD3310}", + "context": "ScriptCanvas::Node", + "variant": "", + "details": { + "name": "Capsule Cast With Group", + "category": "PhysX/World", + "tooltip": "CapsuleCast" + }, + "slots": [ + { + "key": "Input_In", + "details": { + "name": "In" + } + }, + { + "key": "Output_Out", + "details": { + "name": "Out" + } + }, + { + "key": "DataInput_Distance", + "details": { + "name": "Distance" + } + }, + { + "key": "DataInput_Pose", + "details": { + "name": "Pose" + } + }, + { + "key": "DataInput_Direction", + "details": { + "name": "Direction" + } + }, + { + "key": "DataInput_Height", + "details": { + "name": "Height" + } + }, + { + "key": "DataInput_Radius", + "details": { + "name": "Radius" + } + }, + { + "key": "DataInput_Collision group", + "details": { + "name": "Collision group" + } + }, + { + "key": "DataInput_Ignore", + "details": { + "name": "Ignore" + } + }, + { + "key": "DataOutput_Object Hit", + "details": { + "name": "Object Hit" + } + }, + { + "key": "DataOutput_Position", + "details": { + "name": "Position" + } + }, + { + "key": "DataOutput_Normal", + "details": { + "name": "Normal" + } + }, + { + "key": "DataOutput_Distance", + "details": { + "name": "Distance" + } + }, + { + "key": "DataOutput_EntityId", + "details": { + "name": "EntityId" + } + }, + { + "key": "DataOutput_Surface", + "details": { + "name": "Surface" + } + } + ] + } + ] +} \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/PhysXWorld_OverlapBoxWithGroup.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/PhysXWorld_OverlapBoxWithGroup.names new file mode 100644 index 0000000000..9b2e0a6c0b --- /dev/null +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/PhysXWorld_OverlapBoxWithGroup.names @@ -0,0 +1,58 @@ +{ + "entries": [ + { + "key": "{B4F46A1B-7C2F-553F-BAE8-867066A365FA}", + "context": "ScriptCanvas::Node", + "variant": "", + "details": { + "name": "Overlap Box With Group", + "category": "PhysX/World", + "tooltip": "Returns the objects overlapping a box at a position" + }, + "slots": [ + { + "key": "Input_In", + "details": { + "name": "In" + } + }, + { + "key": "Output_Out", + "details": { + "name": "Out" + } + }, + { + "key": "DataInput_Pose", + "details": { + "name": "Pose" + } + }, + { + "key": "DataInput_Dimensions", + "details": { + "name": "Dimensions" + } + }, + { + "key": "DataInput_Collision group", + "details": { + "name": "Collision group" + } + }, + { + "key": "DataInput_Ignore", + "details": { + "name": "Ignore" + } + }, + { + "key": "DataOutput_Result", + "details": { + "name": "Result" + } + } + ] + } + ] +} \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/PhysXWorld_OverlapCapsuleWithGroup.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/PhysXWorld_OverlapCapsuleWithGroup.names new file mode 100644 index 0000000000..c7ac36a35e --- /dev/null +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/PhysXWorld_OverlapCapsuleWithGroup.names @@ -0,0 +1,64 @@ +{ + "entries": [ + { + "key": "{588E1C8F-D18E-5C00-AF13-C4FCD5A9519D}", + "context": "ScriptCanvas::Node", + "variant": "", + "details": { + "name": "Overlap Capsule With Group", + "category": "PhysX/World", + "tooltip": "Returns the objects overlapping a capsule at a position" + }, + "slots": [ + { + "key": "Input_In", + "details": { + "name": "In" + } + }, + { + "key": "Output_Out", + "details": { + "name": "Out" + } + }, + { + "key": "DataInput_Pose", + "details": { + "name": "Pose" + } + }, + { + "key": "DataInput_Height", + "details": { + "name": "Height" + } + }, + { + "key": "DataInput_Radius", + "details": { + "name": "Radius" + } + }, + { + "key": "DataInput_Collision group", + "details": { + "name": "Collision group" + } + }, + { + "key": "DataInput_Ignore", + "details": { + "name": "Ignore" + } + }, + { + "key": "DataOutput_Result", + "details": { + "name": "Result" + } + } + ] + } + ] +} \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/PhysXWorld_OverlapSphereWithGroup.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/PhysXWorld_OverlapSphereWithGroup.names new file mode 100644 index 0000000000..de088ff96b --- /dev/null +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/PhysXWorld_OverlapSphereWithGroup.names @@ -0,0 +1,58 @@ +{ + "entries": [ + { + "key": "{4BEFF98E-4147-55AF-B105-29085951CBA9}", + "context": "ScriptCanvas::Node", + "variant": "", + "details": { + "name": "Overlap Sphere With Group", + "category": "PhysX/World", + "tooltip": "Returns the objects overlapping a sphere at a position" + }, + "slots": [ + { + "key": "Input_In", + "details": { + "name": "In" + } + }, + { + "key": "Output_Out", + "details": { + "name": "Out" + } + }, + { + "key": "DataInput_Position", + "details": { + "name": "Position" + } + }, + { + "key": "DataInput_Radius", + "details": { + "name": "Radius" + } + }, + { + "key": "DataInput_Collision group", + "details": { + "name": "Collision group" + } + }, + { + "key": "DataInput_Ignore", + "details": { + "name": "Ignore" + } + }, + { + "key": "DataOutput_Result", + "details": { + "name": "Result" + } + } + ] + } + ] +} \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/PhysXWorld_RayCastLocalSpaceWithGroup.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/PhysXWorld_RayCastLocalSpaceWithGroup.names new file mode 100644 index 0000000000..3724ef2bc0 --- /dev/null +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/PhysXWorld_RayCastLocalSpaceWithGroup.names @@ -0,0 +1,94 @@ +{ + "entries": [ + { + "key": "{BD7F9C50-62EA-56C0-9B8B-D23E5D28300D}", + "context": "ScriptCanvas::Node", + "variant": "", + "details": { + "name": "Ray Cast Local Space With Group", + "category": "PhysX/World", + "tooltip": "Returns the first entity hit by a ray cast in local space from the source entity in the specified direction." + }, + "slots": [ + { + "key": "Input_In", + "details": { + "name": "In" + } + }, + { + "key": "Output_Out", + "details": { + "name": "Out" + } + }, + { + "key": "DataInput_Source", + "details": { + "name": "Source" + } + }, + { + "key": "DataInput_Direction", + "details": { + "name": "Direction" + } + }, + { + "key": "DataInput_Distance", + "details": { + "name": "Distance" + } + }, + { + "key": "DataInput_Collision group", + "details": { + "name": "Collision group" + } + }, + { + "key": "DataInput_Ignore", + "details": { + "name": "Ignore" + } + }, + { + "key": "DataOutput_Object hit", + "details": { + "name": "Object hit" + } + }, + { + "key": "DataOutput_Position", + "details": { + "name": "Position" + } + }, + { + "key": "DataOutput_Normal", + "details": { + "name": "Normal" + } + }, + { + "key": "DataOutput_Distance", + "details": { + "name": "Distance" + } + }, + { + "key": "DataOutput_EntityId", + "details": { + "name": "EntityId" + } + }, + { + "key": "DataOutput_Surface", + "details": { + "name": "Surface" + } + } + ] + } + ] +} \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/PhysXWorld_RayCastMultipleLocalSpaceWithGroup.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/PhysXWorld_RayCastMultipleLocalSpaceWithGroup.names new file mode 100644 index 0000000000..4d0504b0fd --- /dev/null +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/PhysXWorld_RayCastMultipleLocalSpaceWithGroup.names @@ -0,0 +1,64 @@ +{ + "entries": [ + { + "key": "{FB91B476-0015-508A-AC0B-18F8A860EB7A}", + "context": "ScriptCanvas::Node", + "variant": "", + "details": { + "name": "Ray Cast Multiple Local Space With Group", + "category": "PhysX/World", + "tooltip": "Returns all entities hit by a ray cast in local space from the source entity in the specified direction." + }, + "slots": [ + { + "key": "Input_In", + "details": { + "name": "In" + } + }, + { + "key": "Output_Out", + "details": { + "name": "Out" + } + }, + { + "key": "DataInput_Source", + "details": { + "name": "Source" + } + }, + { + "key": "DataInput_Direction", + "details": { + "name": "Direction" + } + }, + { + "key": "DataInput_Distance", + "details": { + "name": "Distance" + } + }, + { + "key": "DataInput_Collision group", + "details": { + "name": "Collision group" + } + }, + { + "key": "DataInput_Ignore", + "details": { + "name": "Ignore" + } + }, + { + "key": "DataOutput_Objects hit", + "details": { + "name": "Objects hit" + } + } + ] + } + ] +} \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/PhysXWorld_RayCastWorldSpaceWithGroup.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/PhysXWorld_RayCastWorldSpaceWithGroup.names new file mode 100644 index 0000000000..194f9aebf0 --- /dev/null +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/PhysXWorld_RayCastWorldSpaceWithGroup.names @@ -0,0 +1,94 @@ +{ + "entries": [ + { + "key": "{33EE1562-D9B5-5DA2-BB9E-F1F75B927B9C}", + "context": "ScriptCanvas::Node", + "variant": "", + "details": { + "name": "Ray Cast World Space With Group", + "category": "PhysX/World", + "tooltip": "Returns the first entity hit by a ray cast in world space from the start position in the specified direction." + }, + "slots": [ + { + "key": "Input_In", + "details": { + "name": "In" + } + }, + { + "key": "Output_Out", + "details": { + "name": "Out" + } + }, + { + "key": "DataInput_Start", + "details": { + "name": "Start" + } + }, + { + "key": "DataInput_Direction", + "details": { + "name": "Direction" + } + }, + { + "key": "DataInput_Distance", + "details": { + "name": "Distance" + } + }, + { + "key": "DataInput_Collision group", + "details": { + "name": "Collision group" + } + }, + { + "key": "DataInput_Ignore", + "details": { + "name": "Ignore" + } + }, + { + "key": "DataOutput_Object hit", + "details": { + "name": "Object hit" + } + }, + { + "key": "DataOutput_Position", + "details": { + "name": "Position" + } + }, + { + "key": "DataOutput_Normal", + "details": { + "name": "Normal" + } + }, + { + "key": "DataOutput_Distance", + "details": { + "name": "Distance" + } + }, + { + "key": "DataOutput_EntityId", + "details": { + "name": "EntityId" + } + }, + { + "key": "DataOutput_Surface", + "details": { + "name": "Surface" + } + } + ] + } + ] +} \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/PhysXWorld_SphereCastWithGroup.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/PhysXWorld_SphereCastWithGroup.names new file mode 100644 index 0000000000..1190d91bca --- /dev/null +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/PhysXWorld_SphereCastWithGroup.names @@ -0,0 +1,100 @@ +{ + "entries": [ + { + "key": "{FF1EE92C-FD34-51E9-B128-00595ABB78E6}", + "context": "ScriptCanvas::Node", + "variant": "", + "details": { + "name": "Sphere Cast With Group", + "category": "PhysX/World", + "tooltip": "SphereCast" + }, + "slots": [ + { + "key": "Input_In", + "details": { + "name": "In" + } + }, + { + "key": "Output_Out", + "details": { + "name": "Out" + } + }, + { + "key": "DataInput_Distance", + "details": { + "name": "Distance" + } + }, + { + "key": "DataInput_Pose", + "details": { + "name": "Pose" + } + }, + { + "key": "DataInput_Direction", + "details": { + "name": "Direction" + } + }, + { + "key": "DataInput_Radius", + "details": { + "name": "Radius" + } + }, + { + "key": "DataInput_Collision group", + "details": { + "name": "Collision group" + } + }, + { + "key": "DataInput_Ignore", + "details": { + "name": "Ignore" + } + }, + { + "key": "DataOutput_Object Hit", + "details": { + "name": "Object Hit" + } + }, + { + "key": "DataOutput_Position", + "details": { + "name": "Position" + } + }, + { + "key": "DataOutput_Normal", + "details": { + "name": "Normal" + } + }, + { + "key": "DataOutput_Distance", + "details": { + "name": "Distance" + } + }, + { + "key": "DataOutput_EntityId", + "details": { + "name": "EntityId" + } + }, + { + "key": "DataOutput_Surface", + "details": { + "name": "Surface" + } + } + ] + } + ] +} \ No newline at end of file From 38c89e37c253d3f86c60614a1963d6fa14997bef Mon Sep 17 00:00:00 2001 From: puvvadar Date: Thu, 18 Nov 2021 14:39:20 -0800 Subject: [PATCH 128/345] Re-resolving Base.prefab with stabilization Signed-off-by: puvvadar --- AutomatedTesting/Levels/Base/Base.prefab | 79 +++++++++++++----------- 1 file changed, 44 insertions(+), 35 deletions(-) diff --git a/AutomatedTesting/Levels/Base/Base.prefab b/AutomatedTesting/Levels/Base/Base.prefab index 98495663b7..7765fe488e 100644 --- a/AutomatedTesting/Levels/Base/Base.prefab +++ b/AutomatedTesting/Levels/Base/Base.prefab @@ -1,52 +1,61 @@ { "ContainerEntity": { - "Id": "ContainerEntity", - "Name": "Base", + "Id": "Entity_[1146574390643]", + "Name": "Level", "Components": { - "Component_[10182366347512475253]": { - "$type": "EditorPrefabComponent", - "Id": 10182366347512475253 + "Component_[10641544592923449938]": { + "$type": "EditorInspectorComponent", + "Id": 10641544592923449938 }, - "Component_[12917798267488243668]": { - "$type": "EditorPendingCompositionComponent", - "Id": 12917798267488243668 - }, - "Component_[3261249813163778338]": { + "Component_[12039882709170782873]": { "$type": "EditorOnlyEntityComponent", - "Id": 3261249813163778338 + "Id": 12039882709170782873 }, - "Component_[3837204912784440039]": { - "$type": "EditorDisabledCompositionComponent", - "Id": 3837204912784440039 + "Component_[12265484671603697631]": { + "$type": "EditorPendingCompositionComponent", + "Id": 12265484671603697631 }, - "Component_[4272963378099646759]": { + "Component_[14126657869720434043]": { + "$type": "EditorEntitySortComponent", + "Id": 14126657869720434043, + "ChildEntityOrderEntryArray": [ + { + "EntityId": "" + }, + { + "EntityId": "", + "SortIndex": 1 + } + ] + }, + "Component_[15230859088967841193]": { "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent", - "Id": 4272963378099646759, + "Id": 15230859088967841193, "Parent Entity": "" }, - "Component_[4848458548047175816]": { - "$type": "EditorVisibilityComponent", - "Id": 4848458548047175816 + "Component_[16239496886950819870]": { + "$type": "EditorDisabledCompositionComponent", + "Id": 16239496886950819870 }, - "Component_[5787060997243919943]": { - "$type": "EditorInspectorComponent", - "Id": 5787060997243919943 - }, - "Component_[7804170251266531779]": { - "$type": "EditorLockComponent", - "Id": 7804170251266531779 - }, - "Component_[7874177159288365422]": { - "$type": "EditorEntitySortComponent", - "Id": 7874177159288365422 - }, - "Component_[8018146290632383969]": { + "Component_[5688118765544765547]": { "$type": "EditorEntityIconComponent", - "Id": 8018146290632383969 + "Id": 5688118765544765547 }, - "Component_[8452360690590857075]": { + "Component_[6545738857812235305]": { "$type": "SelectionComponent", - "Id": 8452360690590857075 + "Id": 6545738857812235305 + }, + "Component_[7247035804068349658]": { + "$type": "EditorPrefabComponent", + "Id": 7247035804068349658 + }, + "Component_[9307224322037797205]": { + "$type": "EditorLockComponent", + "Id": 9307224322037797205 + }, + "Component_[9562516168917670048]": { + "$type": "EditorVisibilityComponent", + "Id": 9562516168917670048 } } } From c097c5755c97d6471a7d7dd048ce56c7486439b5 Mon Sep 17 00:00:00 2001 From: lsemp3d <58790905+lsemp3d@users.noreply.github.com> Date: Thu, 18 Nov 2021 14:54:49 -0800 Subject: [PATCH 129/345] Updated more node names Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com> --- .../Classes/CollisionEvent.names | 46 ++++++++++----- .../Classes/PhysicsScene.names | 24 ++++---- .../Classes/SimulatedBody.names | 56 +++++++++---------- .../Classes/TriggerEvent.names | 22 ++++---- .../Senders/PrefabLoaderScriptingBus.names | 12 ++-- .../Senders/PrefabSystemScriptingBus.names | 14 ++--- 6 files changed, 94 insertions(+), 80 deletions(-) diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/CollisionEvent.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/CollisionEvent.names index 3613a3631f..335200a350 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/CollisionEvent.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/CollisionEvent.names @@ -5,7 +5,7 @@ "context": "BehaviorClass", "variant": "", "details": { - "name": "CollisionEvent" + "name": "Collision Event" }, "methods": [ { @@ -13,21 +13,20 @@ "context": "CollisionEvent", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetBody1EntityId" + "tooltip": "When signaled, this will invoke Get Body 1 Entity Id" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetBody1EntityId is invoked" + "tooltip": "Signaled after Get Body 1 Entity Id is invoked" }, "details": { - "name": "CollisionEvent::Get Body 1 EntityId", - "category": "Other" + "name": "Get Body 1 Entity Id" }, "params": [ { "typeid": "{7602AA36-792C-4BDC-BDF8-AA16792151A3}", "details": { - "name": "CollisionEvent*" + "name": "Collision Event" } } ], @@ -35,7 +34,7 @@ { "typeid": "{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}", "details": { - "name": "EntityId", + "name": "Entity Id", "tooltip": "Entity Unique Id" } } @@ -46,21 +45,20 @@ "context": "CollisionEvent", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetBody2EntityId" + "tooltip": "When signaled, this will invoke Get Body 2 Entity Id" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetBody2EntityId is invoked" + "tooltip": "Signaled after Get Body 2 Entity Id is invoked" }, "details": { - "name": "CollisionEvent::Get Body 2 EntityId", - "category": "Other" + "name": "Get Body 2 Entity Id" }, "params": [ { "typeid": "{7602AA36-792C-4BDC-BDF8-AA16792151A3}", "details": { - "name": "CollisionEvent*" + "name": "Collision Event" } } ], @@ -68,11 +66,33 @@ { "typeid": "{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}", "details": { - "name": "EntityId", + "name": "Entity Id", "tooltip": "Entity Unique Id" } } ] + }, + { + "key": "GetContacts", + "details": { + "name": "Get Contacts" + }, + "params": [ + { + "typeid": "{7602AA36-792C-4BDC-BDF8-AA16792151A3}", + "details": { + "name": "Collision Event" + } + } + ], + "results": [ + { + "typeid": "{009022A1-16A5-50B0-958F-F69C729985A3}", + "details": { + "name": "Contacts" + } + } + ] } ] } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/PhysicsScene.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/PhysicsScene.names index 19894bcc21..3c1ef2eaaa 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/PhysicsScene.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/PhysicsScene.names @@ -5,7 +5,7 @@ "context": "BehaviorClass", "variant": "", "details": { - "name": "PhysicsScene" + "name": "Physics Scene" }, "methods": [ { @@ -13,21 +13,20 @@ "context": "PhysicsScene", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetOnGravityChangeEvent" + "tooltip": "When signaled, this will invoke Get On Gravity Change Event" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetOnGravityChangeEvent is invoked" + "tooltip": "Signaled after Get On Gravity Change Event is invoked" }, "details": { - "name": "PhysicsScene::GetOnGravityChangeEvent", - "category": "Other" + "name": "Get On Gravity Change Event" }, "params": [ { "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", "details": { - "name": "const AZStd::basic_string, alloc" + "name": "Scene Name" } } ], @@ -35,7 +34,7 @@ { "typeid": "{4985DFB0-7CD9-5B28-980B-BA2C701BE3D6}", "details": { - "name": "Event const Vector3& >*" + "name": "Gravity Change Event" } } ] @@ -45,21 +44,20 @@ "context": "PhysicsScene", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke QueryScene" + "tooltip": "When signaled, this will invoke Query Scene" }, "exit": { "name": "Out", - "tooltip": "Signaled after QueryScene is invoked" + "tooltip": "Signaled after Query Scene is invoked" }, "details": { - "name": "PhysicsScene::QueryScene", - "category": "Other" + "name": "Query Scene" }, "params": [ { "typeid": "{52BD8163-BDC4-4B09-ABB2-11DD1F601FFD}", "details": { - "name": "Scene*" + "name": "Scene" } }, { @@ -74,7 +72,7 @@ { "typeid": "{BAFCC4E7-A06B-4909-B2AE-C89D9E84FE4E}", "details": { - "name": "SceneQueryHits" + "name": "Scene Query Hits" } } ] diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SimulatedBody.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SimulatedBody.names index e950654cad..ec697bbb71 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SimulatedBody.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SimulatedBody.names @@ -5,7 +5,7 @@ "context": "BehaviorClass", "variant": "", "details": { - "name": "SimulatedBody" + "name": "Simulated Body" }, "methods": [ { @@ -13,21 +13,20 @@ "context": "SimulatedBody", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetOnCollisionEndEvent" + "tooltip": "When signaled, this will invoke Get On Collision End Event" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetOnCollisionEndEvent is invoked" + "tooltip": "Signaled after Get On Collision End Event is invoked" }, "details": { - "name": "SimulatedBody::GetOnCollisionEndEvent", - "category": "Other" + "name": "Get On Collision End Event" }, "params": [ { "typeid": "{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}", "details": { - "name": "EntityId", + "name": "Entity Id", "tooltip": "Entity Unique Id" } } @@ -36,7 +35,7 @@ { "typeid": "{4C19E257-F929-524E-80E3-C910C5F3E2D9}", "details": { - "name": "Event const CollisionEvent& >*" + "name": "Collision Event" } } ] @@ -46,21 +45,20 @@ "context": "SimulatedBody", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetOnCollisionPersistEvent" + "tooltip": "When signaled, this will invoke Get On Collision Persist Event" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetOnCollisionPersistEvent is invoked" + "tooltip": "Signaled after Get On Collision Persist Event is invoked" }, "details": { - "name": "SimulatedBody::GetOnCollisionPersistEvent", - "category": "Other" + "name": "Get On Collision Persist Event" }, "params": [ { "typeid": "{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}", "details": { - "name": "EntityId", + "name": "Entity Id", "tooltip": "Entity Unique Id" } } @@ -69,7 +67,7 @@ { "typeid": "{4C19E257-F929-524E-80E3-C910C5F3E2D9}", "details": { - "name": "Event const CollisionEvent& >*" + "name": "Collision Event" } } ] @@ -79,21 +77,20 @@ "context": "SimulatedBody", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetOnTriggerEnterEvent" + "tooltip": "When signaled, this will invoke Get On Trigger Enter Event" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetOnTriggerEnterEvent is invoked" + "tooltip": "Signaled after Get On Trigger Enter Event is invoked" }, "details": { - "name": "SimulatedBody::GetOnTriggerEnterEvent", - "category": "Other" + "name": "Get On Trigger Enter Event" }, "params": [ { "typeid": "{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}", "details": { - "name": "EntityId", + "name": "Entity Id", "tooltip": "Entity Unique Id" } } @@ -102,7 +99,7 @@ { "typeid": "{C00D2478-E0F3-57A3-AB60-A04DFC515016}", "details": { - "name": "Event const TriggerEvent& >*" + "name": "Trigger Event" } } ] @@ -112,21 +109,20 @@ "context": "SimulatedBody", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetOnCollisionBeginEvent" + "tooltip": "When signaled, this will invoke Get On Collision Begin Event" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetOnCollisionBeginEvent is invoked" + "tooltip": "Signaled after Get On Collision Begin Event is invoked" }, "details": { - "name": "SimulatedBody::GetOnCollisionBeginEvent", - "category": "Other" + "name": "Get On Collision Begin Event" }, "params": [ { "typeid": "{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}", "details": { - "name": "EntityId", + "name": "Entity Id", "tooltip": "Entity Unique Id" } } @@ -135,7 +131,7 @@ { "typeid": "{4C19E257-F929-524E-80E3-C910C5F3E2D9}", "details": { - "name": "Event const CollisionEvent& >*" + "name": "Collision Event" } } ] @@ -145,21 +141,21 @@ "context": "SimulatedBody", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetOnTriggerExitEvent" + "tooltip": "When signaled, this will invoke Get On Trigger Exit Event" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetOnTriggerExitEvent is invoked" + "tooltip": "Signaled after Get On Trigger Exit Event is invoked" }, "details": { - "name": "SimulatedBody::GetOnTriggerExitEvent", + "name": "Get On Trigger Exit Event", "category": "Other" }, "params": [ { "typeid": "{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}", "details": { - "name": "EntityId", + "name": "Entity Id", "tooltip": "Entity Unique Id" } } @@ -168,7 +164,7 @@ { "typeid": "{C00D2478-E0F3-57A3-AB60-A04DFC515016}", "details": { - "name": "Event const TriggerEvent& >*" + "name": "Trigger Event" } } ] diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/TriggerEvent.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/TriggerEvent.names index ecac2ac2d5..a0da73d31c 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/TriggerEvent.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/TriggerEvent.names @@ -5,7 +5,7 @@ "context": "BehaviorClass", "variant": "", "details": { - "name": "TriggerEvent" + "name": "Trigger Event" }, "methods": [ { @@ -13,21 +13,21 @@ "context": "TriggerEvent", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetTriggerEntityId" + "tooltip": "When signaled, this will invoke Get Trigger Entity Id" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetTriggerEntityId is invoked" + "tooltip": "Signaled after Get Trigger Entity Id is invoked" }, "details": { - "name": "TriggerEvent::Get Trigger EntityId", + "name": "Get Trigger Entity Id", "category": "Other" }, "params": [ { "typeid": "{7A0851A3-2CBD-4A03-85D5-1C40221E7F61}", "details": { - "name": "TriggerEvent*" + "name": "Trigger Event" } } ], @@ -35,7 +35,7 @@ { "typeid": "{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}", "details": { - "name": "EntityId", + "name": "Entity Id", "tooltip": "Entity Unique Id" } } @@ -46,21 +46,21 @@ "context": "TriggerEvent", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetOtherEntityId" + "tooltip": "When signaled, this will invoke Get Other Entity Id" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetOtherEntityId is invoked" + "tooltip": "Signaled after Get Other Entity Id is invoked" }, "details": { - "name": "TriggerEvent::Get Other EntityId", + "name": "Get Other Entity Id", "category": "Other" }, "params": [ { "typeid": "{7A0851A3-2CBD-4A03-85D5-1C40221E7F61}", "details": { - "name": "TriggerEvent*" + "name": "Trigger Event" } } ], @@ -68,7 +68,7 @@ { "typeid": "{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}", "details": { - "name": "EntityId", + "name": "Entity Id", "tooltip": "Entity Unique Id" } } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/PrefabLoaderScriptingBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/PrefabLoaderScriptingBus.names index 791394e50a..1c90afdb38 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/PrefabLoaderScriptingBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/PrefabLoaderScriptingBus.names @@ -5,27 +5,27 @@ "context": "EBusSender", "variant": "", "details": { - "name": "PrefabLoaderScriptingBus" + "name": "Prefab Loader" }, "methods": [ { "key": "SaveTemplateToString", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SaveTemplateToString" + "tooltip": "When signaled, this will invoke Save Template To String" }, "exit": { "name": "Out", - "tooltip": "Signaled after SaveTemplateToString is invoked" + "tooltip": "Signaled after Save Template To String is invoked" }, "details": { - "name": "SaveTemplateToString" + "name": "Save Template To String" }, "params": [ { "typeid": "{D6597933-47CD-4FC8-B911-63F3E2B0993A}", "details": { - "name": "AZ::u64" + "name": "Template Id" } } ], @@ -33,7 +33,7 @@ { "typeid": "{92FC6941-F5F5-5141-97A4-1965FC8B09CD}", "details": { - "name": "" + "name": "Success" } } ] diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/PrefabSystemScriptingBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/PrefabSystemScriptingBus.names index 8c48798a87..5298a19f9e 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/PrefabSystemScriptingBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/PrefabSystemScriptingBus.names @@ -5,33 +5,33 @@ "context": "EBusSender", "variant": "", "details": { - "name": "PrefabSystemScriptingBus" + "name": "Prefab System" }, "methods": [ { "key": "CreatePrefab", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke CreatePrefab" + "tooltip": "When signaled, this will invoke Create Prefab" }, "exit": { "name": "Out", - "tooltip": "Signaled after CreatePrefab is invoked" + "tooltip": "Signaled after Create Prefab is invoked" }, "details": { - "name": "CreatePrefab" + "name": "Create Prefab" }, "params": [ { "typeid": "{4841CFF0-7A5C-519C-BD16-D3625E99605E}", "details": { - "name": "AZStd::vector" + "name": "Entity Ids" } }, { "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", "details": { - "name": "AZStd::string" + "name": "File Path" } } ], @@ -39,7 +39,7 @@ { "typeid": "{D6597933-47CD-4FC8-B911-63F3E2B0993A}", "details": { - "name": "AZ::u64" + "name": "Template Id" } } ] From 56900484fcecab198920d32d8b2c6fd89e30d50b Mon Sep 17 00:00:00 2001 From: amzn-mike <80125227+amzn-mike@users.noreply.github.com> Date: Thu, 18 Nov 2021 16:56:26 -0600 Subject: [PATCH 130/345] [SPEC-7644] ParallelDeepAssetReferences is failing intermittently (#5721) * Fixed race condition caused by trying to handle asset ready event before asset container has finished filling out all the data structures. Added check to only handle asset ready once init is complete Added unit test to verify fix Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com> * Re-enable test Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com> * Add missing space to error message Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com> * Add comment on sleep Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com> * Collapse nested namespace Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com> * Collapse nested namespace Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com> --- .../AzCore/AzCore/Asset/AssetContainer.cpp | 73 ++++++++++++------- .../AzCore/AzCore/Asset/AssetContainer.h | 16 ++-- .../AzCore/AzCore/Asset/AssetManager.h | 20 ++--- .../Tests/Asset/AssetManagerLoadingTests.cpp | 49 +++++++++++-- 4 files changed, 109 insertions(+), 49 deletions(-) diff --git a/Code/Framework/AzCore/AzCore/Asset/AssetContainer.cpp b/Code/Framework/AzCore/AzCore/Asset/AssetContainer.cpp index 7c5fd182c2..bab161fc0a 100644 --- a/Code/Framework/AzCore/AzCore/Asset/AssetContainer.cpp +++ b/Code/Framework/AzCore/AzCore/Asset/AssetContainer.cpp @@ -35,6 +35,43 @@ namespace AZ::Data AssetLoadBus::MultiHandler::BusDisconnect(); } + AZStd::vector>> AssetContainer::CreateAndQueueDependentAssets( + const AZStd::vector& dependencyInfoList, const AssetLoadParameters& loadParamsCopyWithNoLoadingFilter) + { + AZStd::vector>> dependencyAssets; + + for (auto& thisInfo : dependencyInfoList) + { + auto dependentAsset = AssetManager::Instance().FindOrCreateAsset( + thisInfo.m_assetId, thisInfo.m_assetType, AZ::Data::AssetLoadBehavior::Default); + + if (!dependentAsset || !dependentAsset.GetId().IsValid()) + { + AZ_Warning("AssetContainer", false, "Dependency Asset %s (%s) was not found\n", + thisInfo.m_assetId.ToString().c_str(), thisInfo.m_relativePath.c_str()); + RemoveWaitingAsset(thisInfo.m_assetId); + continue; + } + dependencyAssets.emplace_back(thisInfo, AZStd::move(dependentAsset)); + } + + // Queue the loading of all of the dependent assets before loading the root asset. + for (auto& [dependentAssetInfo, dependentAsset] : dependencyAssets) + { + // Queue each asset to load. + auto queuedDependentAsset = AssetManager::Instance().GetAssetInternal( + dependentAsset.GetId(), dependentAsset.GetType(), + AZ::Data::AssetLoadBehavior::Default, loadParamsCopyWithNoLoadingFilter, + dependentAssetInfo, HasPreloads(dependentAsset.GetId())); + + // Verify that the returned asset reference matches the one that we found or created and queued to load. + AZ_Assert(dependentAsset == queuedDependentAsset, "GetAssetInternal returned an unexpected asset reference for Asset %s", + dependentAsset.GetId().ToString().c_str()); + } + + return dependencyAssets; + } + void AssetContainer::AddDependentAssets(Asset rootAsset, const AssetLoadParameters& loadParams) { AssetId rootAssetId = rootAsset.GetId(); @@ -181,34 +218,7 @@ namespace AZ::Data // Since we've set the load filter to not load dependencies, we need to ensure all the assets are created beforehand // so the dependencies can be hooked up as soon as each asset gets serialized in, even if they start getting serialized // while we're still in the middle of triggering all of the asset loads below. - for (auto& thisInfo : dependencyInfoList) - { - auto dependentAsset = AssetManager::Instance().FindOrCreateAsset( - thisInfo.m_assetId, thisInfo.m_assetType, AZ::Data::AssetLoadBehavior::Default); - - if (!dependentAsset || !dependentAsset.GetId().IsValid()) - { - AZ_Warning("AssetContainer", false, "Dependency Asset %s (%s) was not found\n", - thisInfo.m_assetId.ToString().c_str(), thisInfo.m_relativePath.c_str()); - RemoveWaitingAsset(thisInfo.m_assetId); - continue; - } - dependencyAssets.emplace_back(thisInfo, AZStd::move(dependentAsset)); - } - - // Queue the loading of all of the dependent assets before loading the root asset. - for (auto& [dependentAssetInfo, dependentAsset] : dependencyAssets) - { - // Queue each asset to load. - auto queuedDependentAsset = AssetManager::Instance().GetAssetInternal( - dependentAsset.GetId(), dependentAsset.GetType(), - AZ::Data::AssetLoadBehavior::Default, loadParamsCopyWithNoLoadingFilter, - dependentAssetInfo, HasPreloads(dependentAsset.GetId())); - - // Verify that the returned asset reference matches the one that we found or created and queued to load. - AZ_Assert(dependentAsset == queuedDependentAsset, "GetAssetInternal returned an unexpected asset reference for Asset %s", - dependentAsset.GetId().ToString().c_str()); - } + dependencyAssets = CreateAndQueueDependentAssets(dependencyInfoList, loadParamsCopyWithNoLoadingFilter); // Add all of the queued dependent assets as dependencies { @@ -347,9 +357,16 @@ namespace AZ::Data void AssetContainer::HandleReadyAsset(Asset asset) { + // Wait until we've finished initialization before allowing this + // If a ready event happens before we've gotten all the maps/structures set up, there may be some missing data + // which can lead to a crash + // We'll go through and check the ready status of every dependency immediately after finishing initialization anyway + if (m_initComplete) + { RemoveFromAllWaitingPreloads(asset->GetId()); RemoveWaitingAsset(asset->GetId()); } + } void AssetContainer::OnAssetDataLoaded(Asset asset) { diff --git a/Code/Framework/AzCore/AzCore/Asset/AssetContainer.h b/Code/Framework/AzCore/AzCore/Asset/AssetContainer.h index e0091d678f..a05343ed0b 100644 --- a/Code/Framework/AzCore/AzCore/Asset/AssetContainer.h +++ b/Code/Framework/AzCore/AzCore/Asset/AssetContainer.h @@ -24,8 +24,8 @@ namespace AZ // AssetContainer loads an asset and all of its dependencies as a collection which is parallellized as much as possible. // With the container, the data will all load in parallel. Dependent asset loads will still obey the expected rules - // where PreLoad assets will emit OnAssetReady before the parent does, and QueueLoad assets will emit OnAssetReady in - // no guaranteed order. However, the OnAssetContainerReady signals will not emit until all PreLoad and QueueLoad assets + // where PreLoad assets will emit OnAssetReady before the parent does, and QueueLoad assets will emit OnAssetReady in + // no guaranteed order. However, the OnAssetContainerReady signals will not emit until all PreLoad and QueueLoad assets // are ready. NoLoad dependencies are not loaded by default but can be loaded along with their dependencies using the // same rules as above by using the LoadAll dependency rule. class AssetContainer : @@ -36,7 +36,7 @@ namespace AZ AZ_CLASS_ALLOCATOR(AssetContainer, SystemAllocator, 0); AssetContainer() = default; - + AssetContainer(Asset asset, const AssetLoadParameters& loadParams); ~AssetContainer(); @@ -81,6 +81,10 @@ namespace AZ // AssetLoadBus void OnAssetDataLoaded(AZ::Data::Asset asset) override; protected: + + virtual AZStd::vector>> CreateAndQueueDependentAssets( + const AZStd::vector& dependencyInfoList, const AssetLoadParameters& loadParamsCopyWithNoLoadingFilter); + // Waiting assets are those which have not yet signalled ready. In the case of PreLoad dependencies the data may have completed the load cycle but // the Assets aren't considered "Ready" yet if there are PreLoad dependencies still loading and will still be in the list until the point that asset and // All of its preload dependencies have been loaded, when it signals OnAssetReady @@ -97,7 +101,7 @@ namespace AZ void AddDependency(Asset&& addDependency); // Add a "graph section" to our list of dependencies. This checks the catalog for all Pre and Queue load assets which are dependents of the requested asset and kicks off loads - // NoLoads which are encounted are placed in another list and can be loaded on demand with the LoadDependency call. + // NoLoads which are encounted are placed in another list and can be loaded on demand with the LoadDependency call. void AddDependentAssets(Asset rootAsset, const AssetLoadParameters& loadParams); // If "PreLoad" assets are found in the graph these are cached and tracked with both OnAssetReady and OnAssetDataLoaded messages. @@ -117,7 +121,7 @@ namespace AZ // duringInit if we're coming from the checkReady method - containers that start ready don't need to signal void HandleReadyAsset(AZ::Data::Asset asset); - // Optimization to save the lookup in the dependencies map + // Optimization to save the lookup in the dependencies map AssetInternal::WeakAsset m_rootAsset; // The root asset id is stored here semi-redundantly on initialization so that we can still refer to it even if the @@ -136,7 +140,7 @@ namespace AZ AZStd::atomic_bool m_finalNotificationSent{false}; mutable AZStd::recursive_mutex m_preloadMutex; - // AssetId -> List of assets it is still waiting on + // AssetId -> List of assets it is still waiting on PreloadAssetListType m_preloadList; // AssetId -> List of assets waiting on it diff --git a/Code/Framework/AzCore/AzCore/Asset/AssetManager.h b/Code/Framework/AzCore/AzCore/Asset/AssetManager.h index f109bb278c..9666d434c1 100644 --- a/Code/Framework/AzCore/AzCore/Asset/AssetManager.h +++ b/Code/Framework/AzCore/AzCore/Asset/AssetManager.h @@ -169,14 +169,14 @@ namespace AZ /// Register handler with the system for a particular asset type. /// A handler should be registered for each asset type it handles. /// Please note that all the handlers are registered just once during app startup from the main thread - /// and therefore this is not a thread safe method and should not be invoked from different threads. + /// and therefore this is not a thread safe method and should not be invoked from different threads. void RegisterHandler(AssetHandler* handler, const AssetType& assetType); /// Unregister handler from the asset system. /// Please note that all the handlers are unregistered just once during app shutdown from the main thread /// and therefore this is not a thread safe method and should not be invoked from different threads. void UnregisterHandler(AssetHandler* handler); // @} - + // @{ Asset catalog management /// Register a catalog with the system for a particular asset type. /// A catalog should be registered for each asset type it is responsible for. @@ -295,7 +295,7 @@ namespace AZ /** * Old 'legacy' assetIds and asset hints can be automatically replaced with new ones during deserialize / assignment. * This operation can be somewhat costly, and its only useful if the program subsequently re-saves the files its loading so that - * the asset hints and assetIds actually persist. Thus, it can be disabled in situations where you know you are not going to be + * the asset hints and assetIds actually persist. Thus, it can be disabled in situations where you know you are not going to be * saving over or creating new source files (for example builders/background apps) * By default, it is enabled. */ @@ -316,7 +316,7 @@ namespace AZ * This method must be invoked before you start unregistering handlers manually and shutting down the asset manager. * This method ensures that all jobs in flight are either canceled or completed. * This method is automatically called in the destructor but if you are unregistering handlers manually, - * you must invoke it yourself. + * you must invoke it yourself. */ void PrepareShutDown(); @@ -366,7 +366,7 @@ namespace AZ /** * Creates a new shared AssetContainer with an optional loadFilter * **/ - AZStd::shared_ptr CreateAssetContainer(Asset asset, const AssetLoadParameters& loadParams = AssetLoadParameters{}) const; + virtual AZStd::shared_ptr CreateAssetContainer(Asset asset, const AssetLoadParameters& loadParams = AssetLoadParameters{}) const; /** @@ -452,7 +452,7 @@ namespace AZ // Variant of RegisterAssetLoading used for jobs which have been queued and need to verify the status of the asset - // before loading in order to prevent cases where a load is queued, then a blocking load goes through, then the queued + // before loading in order to prevent cases where a load is queued, then a blocking load goes through, then the queued // load is processed. This validation step leaves the loaded (And potentially modified) data as is in that case. bool ValidateAndRegisterAssetLoading(const Asset& asset); @@ -482,7 +482,7 @@ namespace AZ * the blocking. That will result in a single thread deadlock. * * If you need to queue work, the logic needs to be similar to this: - * + * AssetHandler::LoadResult MyAssetHandler::LoadAssetData(const Asset& asset, AZStd::shared_ptr stream, const AZ::Data::AssetFilterCB& assetLoadFilterCB) { @@ -496,13 +496,13 @@ namespace AZ } else { - // queue job to load asset in thread identified by m_loadingThreadId + // queue job to load asset in thread identified by m_loadingThreadId auto* queuedJob = QueueLoadingOnOtherThread(...); // block waiting for queued job to complete queuedJob->BlockUntilComplete(); } - + . . . @@ -525,7 +525,7 @@ namespace AZ //! Result from LoadAssetData - it either finished loading, didn't finish and is waiting for more data, or had an error. enum class LoadResult : u8 { - + Error, // The provided data failed to load correctly MoreDataRequired, // The provided data loaded correctly, but more data is required to finish the asset load LoadComplete // The provided data loaded correctly, and the asset has been created diff --git a/Code/Framework/AzCore/Tests/Asset/AssetManagerLoadingTests.cpp b/Code/Framework/AzCore/Tests/Asset/AssetManagerLoadingTests.cpp index 397bbd50c9..fe38451101 100644 --- a/Code/Framework/AzCore/Tests/Asset/AssetManagerLoadingTests.cpp +++ b/Code/Framework/AzCore/Tests/Asset/AssetManagerLoadingTests.cpp @@ -2282,6 +2282,45 @@ namespace UnitTest AssetManager::Destroy(); } + struct MockAssetContainer : AssetContainer + { + MockAssetContainer(Asset assetData, const AssetLoadParameters& loadParams) + { + // Copying the code in the original constructor, we can't call that constructor because it will not invoke our virtual method + m_rootAsset = AssetInternal::WeakAsset(assetData); + m_containerAssetId = m_rootAsset.GetId(); + + AddDependentAssets(assetData, loadParams); + } + + protected: + AZStd::vector>> CreateAndQueueDependentAssets( + const AZStd::vector& dependencyInfoList, const AssetLoadParameters& loadParamsCopyWithNoLoadingFilter) override + { + auto result = AssetContainer::CreateAndQueueDependentAssets(dependencyInfoList, loadParamsCopyWithNoLoadingFilter); + + // Sleep for a long enough time to allow asset loads to complete and start triggering AssetReady events + // This forces the race condition to occur + AZStd::this_thread::sleep_for(AZStd::chrono::milliseconds(500)); + + return result; + } + }; + + struct MockAssetManager : AssetManager + { + explicit MockAssetManager(const Descriptor& desc) + : AssetManager(desc) + { + } + + protected: + AZStd::shared_ptr CreateAssetContainer(Asset asset, const AssetLoadParameters& loadParams) const override + { + return AZStd::shared_ptr(aznew MockAssetContainer(asset, loadParams)); + } + }; + void ParallelDeepAssetReferences() { SerializeContext context; @@ -2289,7 +2328,7 @@ namespace UnitTest AssetWithAssetReference::Reflect(context); AssetManager::Descriptor desc; - AssetManager::Create(desc); + AssetManager::SetInstance(aznew MockAssetManager(desc)); auto& db = AssetManager::Instance(); @@ -2312,17 +2351,17 @@ namespace UnitTest // AssetC is MYASSETC AssetWithAssetReference c; - c.m_asset = AssetManager::Instance().CreateAsset(AssetId(MyAssetDId)); // point at D + c.m_asset = db.CreateAsset(AssetId(MyAssetDId)); // point at D EXPECT_TRUE(AZ::Utils::SaveObjectToFile(GetTestFolderPath() + "TestAsset3.txt", AZ::DataStream::ST_XML, &c, &context)); // AssetB is MYASSETB AssetWithAssetReference b; - b.m_asset = AssetManager::Instance().CreateAsset(AssetId(MyAssetCId)); // point at C + b.m_asset = db.CreateAsset(AssetId(MyAssetCId)); // point at C EXPECT_TRUE(AZ::Utils::SaveObjectToFile(GetTestFolderPath() + "TestAsset2.txt", AZ::DataStream::ST_XML, &b, &context)); // AssetA will be written to disk as MYASSETA AssetWithAssetReference a; - a.m_asset = AssetManager::Instance().CreateAsset(AssetId(MyAssetBId)); // point at B + a.m_asset = db.CreateAsset(AssetId(MyAssetBId)); // point at B EXPECT_TRUE(AZ::Utils::SaveObjectToFile(GetTestFolderPath() + "TestAsset1.txt", AZ::DataStream::ST_XML, &a, &context)); } @@ -2531,7 +2570,7 @@ namespace UnitTest TEST_F(AssetJobsMultithreadedTest, DISABLED_ParallelDeepAssetReferences) #else // temporarily disabled until sporadic failures can be root caused - TEST_F(AssetJobsMultithreadedTest, DISABLED_ParallelDeepAssetReferences) + TEST_F(AssetJobsMultithreadedTest, ParallelDeepAssetReferences) #endif // AZ_TRAIT_DISABLE_FAILED_ASSET_MANAGER_TESTS { ParallelDeepAssetReferences(); From 7e43b53d167fdde0ea08d38b000d7b9c58154fc2 Mon Sep 17 00:00:00 2001 From: AMZN-Phil Date: Thu, 18 Nov 2021 15:01:11 -0800 Subject: [PATCH 131/345] Extra gem download failure handling Signed-off-by: AMZN-Phil --- .../Source/GemCatalog/GemCatalogScreen.cpp | 19 +++++++++++++- .../Source/GemCatalog/GemCatalogScreen.h | 1 + .../Source/GemCatalog/GemModel.cpp | 26 +++++++++++++++++++ .../Source/GemCatalog/GemModel.h | 2 ++ 4 files changed, 47 insertions(+), 1 deletion(-) diff --git a/Code/Tools/ProjectManager/Source/GemCatalog/GemCatalogScreen.cpp b/Code/Tools/ProjectManager/Source/GemCatalog/GemCatalogScreen.cpp index c11a9b9de1..1d4f354fb5 100644 --- a/Code/Tools/ProjectManager/Source/GemCatalog/GemCatalogScreen.cpp +++ b/Code/Tools/ProjectManager/Source/GemCatalog/GemCatalogScreen.cpp @@ -57,6 +57,7 @@ namespace O3DE::ProjectManager vLayout->addWidget(m_headerWidget); connect(m_gemModel, &GemModel::gemStatusChanged, this, &GemCatalogScreen::OnGemStatusChanged); + connect(m_gemModel, &GemModel::dependencyGemStatusChanged, this, &GemCatalogScreen::OnDependencyGemStatusChanged); connect(m_gemModel->GetSelectionModel(), &QItemSelectionModel::selectionChanged, this, [this]{ ShowInspector(); }); connect(m_headerWidget, &GemCatalogHeaderWidget::RefreshGems, this, &GemCatalogScreen::Refresh); connect(m_headerWidget, &GemCatalogHeaderWidget::OpenGemsRepo, this, &GemCatalogScreen::HandleOpenGemRepo); @@ -279,7 +280,8 @@ namespace O3DE::ProjectManager { notification += tr(" and "); } - if (added && GemModel::GetDownloadStatus(modelIndex) == GemInfo::DownloadStatus::NotDownloaded) + if (added && (GemModel::GetDownloadStatus(modelIndex) == GemInfo::DownloadStatus::NotDownloaded) || + (GemModel::GetDownloadStatus(modelIndex) == GemInfo::DownloadStatus::DownloadFailed)) { m_downloadController->AddGemDownload(GemModel::GetName(modelIndex)); GemModel::SetDownloadStatus(*m_gemModel, modelIndex, GemInfo::DownloadStatus::Downloading); @@ -304,6 +306,18 @@ namespace O3DE::ProjectManager } } + void GemCatalogScreen::OnDependencyGemStatusChanged(const QString& gemName) + { + QModelIndex modelIndex = m_gemModel->FindIndexByNameString(gemName); + bool added = GemModel::IsAddedDependency(modelIndex); + if (added && (GemModel::GetDownloadStatus(modelIndex) == GemInfo::DownloadStatus::NotDownloaded) || + (GemModel::GetDownloadStatus(modelIndex) == GemInfo::DownloadStatus::DownloadFailed)) + { + m_downloadController->AddGemDownload(GemModel::GetName(modelIndex)); + GemModel::SetDownloadStatus(*m_gemModel, modelIndex, GemInfo::DownloadStatus::Downloading); + } + } + void GemCatalogScreen::SelectGem(const QString& gemName) { QModelIndex modelIndex = m_gemModel->FindIndexByNameString(gemName); @@ -383,6 +397,7 @@ namespace O3DE::ProjectManager // Remove gem from gems to be added to update any dependencies GemModel::SetIsAdded(*m_gemModel, modelIndex, false); + GemModel::DeactivateDependentGems(*m_gemModel, modelIndex); // Unregister the gem auto unregisterResult = PythonBindingsInterface::Get()->UnregisterGem(selectedGemPath); @@ -660,6 +675,8 @@ namespace O3DE::ProjectManager QModelIndex index = m_gemModel->FindIndexByNameString(gemName); if (index.isValid()) { + GemModel::SetIsAdded(*m_gemModel, index, false); + GemModel::DeactivateDependentGems(*m_gemModel, index); GemModel::SetDownloadStatus(*m_gemModel, index, GemInfo::DownloadFailed); } } diff --git a/Code/Tools/ProjectManager/Source/GemCatalog/GemCatalogScreen.h b/Code/Tools/ProjectManager/Source/GemCatalog/GemCatalogScreen.h index 2deaa41b9e..20b0c27ff8 100644 --- a/Code/Tools/ProjectManager/Source/GemCatalog/GemCatalogScreen.h +++ b/Code/Tools/ProjectManager/Source/GemCatalog/GemCatalogScreen.h @@ -53,6 +53,7 @@ namespace O3DE::ProjectManager public slots: void OnGemStatusChanged(const QString& gemName, uint32_t numChangedDependencies); + void OnDependencyGemStatusChanged(const QString& gemName); void OnAddGemClicked(); void SelectGem(const QString& gemName); void OnGemDownloadResult(const QString& gemName, bool succeeded = true); diff --git a/Code/Tools/ProjectManager/Source/GemCatalog/GemModel.cpp b/Code/Tools/ProjectManager/Source/GemCatalog/GemModel.cpp index 95fdc8e1e2..ca9be341c6 100644 --- a/Code/Tools/ProjectManager/Source/GemCatalog/GemModel.cpp +++ b/Code/Tools/ProjectManager/Source/GemCatalog/GemModel.cpp @@ -357,6 +357,8 @@ namespace O3DE::ProjectManager if (!IsAdded(dependency)) { numChangedDependencies++; + const QString dependencyName = gemModel->GetName(dependency); + gemModel->emit dependencyGemStatusChanged(dependencyName); } } } @@ -381,6 +383,8 @@ namespace O3DE::ProjectManager if (!IsAdded(dependency)) { numChangedDependencies++; + const QString dependencyName = gemModel->GetName(dependency); + gemModel->emit dependencyGemStatusChanged(dependencyName); } } } @@ -479,6 +483,28 @@ namespace O3DE::ProjectManager return previouslyAdded && !added; } + void GemModel::DeactivateDependentGems(QAbstractItemModel& model, const QModelIndex& modelIndex) + { + GemModel* gemModel = GetSourceModel(&model); + AZ_Assert(gemModel, "Failed to obtain GemModel"); + + QVector dependentGems = gemModel->GatherDependentGems(modelIndex); + if (!dependentGems.isEmpty()) + { + // we need to deactivate all gems that depend on this one + for (auto dependentModelIndex : dependentGems) + { + DeactivateDependentGems(model, dependentModelIndex); + } + + } + else + { + // Deactivate this gem + SetIsAdded(model, modelIndex, false); + } + } + void GemModel::SetDownloadStatus(QAbstractItemModel& model, const QModelIndex& modelIndex, GemInfo::DownloadStatus status) { model.setData(modelIndex, status, RoleDownloadStatus); diff --git a/Code/Tools/ProjectManager/Source/GemCatalog/GemModel.h b/Code/Tools/ProjectManager/Source/GemCatalog/GemModel.h index bb89d46861..cb99581468 100644 --- a/Code/Tools/ProjectManager/Source/GemCatalog/GemModel.h +++ b/Code/Tools/ProjectManager/Source/GemCatalog/GemModel.h @@ -99,6 +99,7 @@ namespace O3DE::ProjectManager static bool NeedsToBeRemoved(const QModelIndex& modelIndex, bool includeDependencies = false); static bool HasRequirement(const QModelIndex& modelIndex); static void UpdateDependencies(QAbstractItemModel& model, const QString& gemName, bool isAdded); + static void DeactivateDependentGems(QAbstractItemModel& model, const QModelIndex& modelIndex); static void SetDownloadStatus(QAbstractItemModel& model, const QModelIndex& modelIndex, GemInfo::DownloadStatus status); bool DoGemsToBeAddedHaveRequirements() const; @@ -113,6 +114,7 @@ namespace O3DE::ProjectManager signals: void gemStatusChanged(const QString& gemName, uint32_t numChangedDependencies); + void dependencyGemStatusChanged(const QString& gemName); protected slots: void OnRowsAboutToBeRemoved(const QModelIndex& parent, int first, int last); From ac959bcc01a52f1738e439b0291dfb8b0a73b388 Mon Sep 17 00:00:00 2001 From: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com> Date: Thu, 18 Nov 2021 15:06:58 -0800 Subject: [PATCH 132/345] Dragging an entity from outside the focused Prefab into it may crash the Editor (#5762) * Replace Instance References with EntityId of the Prefab Container (WIP) Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com> * Use the invalid entity id for the root instance and get the root instance every time to prevent weird Prefab EOS shenanigans. Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com> * Revert unnecessary changes, fix IsOwningPrefabBeingFocused to match previous behavior. Disable some tests that no longer apply correctly due to the testing environment not relying on the Prefab EOS. Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com> * Fix minor typo in test comment Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com> --- .../Prefab/PrefabFocusHandler.cpp | 137 +++++++++++------- .../Prefab/PrefabFocusHandler.h | 17 ++- .../Prefab/PrefabFocus/PrefabFocusTests.cpp | 8 +- 3 files changed, 102 insertions(+), 60 deletions(-) diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabFocusHandler.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabFocusHandler.cpp index 5b51944a75..744c53ef5a 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabFocusHandler.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabFocusHandler.cpp @@ -98,7 +98,7 @@ namespace AzToolsFramework::Prefab } // Retrieve parent of currently focused prefab. - InstanceOptionalReference parentInstance = m_instanceFocusHierarchy[hierarchySize - 2]; + InstanceOptionalReference parentInstance = GetReferenceFromContainerEntityId(m_instanceFocusHierarchy[hierarchySize - 2]); // Use container entity of parent Instance for focus operations. AZ::EntityId entityId = parentInstance->get().GetContainerEntityId(); @@ -132,7 +132,7 @@ namespace AzToolsFramework::Prefab return AZ::Failure(AZStd::string("Prefab Focus Handler: Invalid index on FocusOnPathIndex.")); } - InstanceOptionalReference focusedInstance = m_instanceFocusHierarchy[index]; + InstanceOptionalReference focusedInstance = GetReferenceFromContainerEntityId(m_instanceFocusHierarchy[index]); return FocusOnOwningPrefab(focusedInstance->get().GetContainerEntityId()); } @@ -172,7 +172,8 @@ namespace AzToolsFramework::Prefab // Close all container entities in the old path. CloseInstanceContainers(m_instanceFocusHierarchy); - m_focusedInstance = focusedInstance; + // Do not store the container for the root instance, use an invalid EntityId instead. + m_focusedInstanceContainerEntityId = focusedInstance->get().GetParentInstance().has_value() ? focusedInstance->get().GetContainerEntityId() : AZ::EntityId(); m_focusedTemplateId = focusedInstance->get().GetTemplateId(); // Focus on the descendants of the container entity in the Editor, if the interface is initialized. @@ -206,56 +207,55 @@ namespace AzToolsFramework::Prefab InstanceOptionalReference PrefabFocusHandler::GetFocusedPrefabInstance( [[maybe_unused]] AzFramework::EntityContextId entityContextId) const { - return m_focusedInstance; + return GetReferenceFromContainerEntityId(m_focusedInstanceContainerEntityId); } AZ::EntityId PrefabFocusHandler::GetFocusedPrefabContainerEntityId([[maybe_unused]] AzFramework::EntityContextId entityContextId) const { - if (!m_focusedInstance.has_value()) - { - // PrefabFocusHandler has not been initialized yet. - return AZ::EntityId(); - } - - return m_focusedInstance->get().GetContainerEntityId(); + return m_focusedInstanceContainerEntityId; } bool PrefabFocusHandler::IsOwningPrefabBeingFocused(AZ::EntityId entityId) const { - if (!m_focusedInstance.has_value()) - { - // PrefabFocusHandler has not been initialized yet. - return false; - } - if (!entityId.IsValid()) { return false; } InstanceOptionalReference instance = m_instanceEntityMapperInterface->FindOwningInstance(entityId); + if (!instance.has_value()) + { + return false; + } - return instance.has_value() && (&instance->get() == &m_focusedInstance->get()); + // If this is owned by the root instance, that corresponds to an invalid m_focusedInstanceContainerEntityId. + if (!instance->get().GetParentInstance().has_value()) + { + return !m_focusedInstanceContainerEntityId.IsValid(); + } + + return (instance->get().GetContainerEntityId() == m_focusedInstanceContainerEntityId); } bool PrefabFocusHandler::IsOwningPrefabInFocusHierarchy(AZ::EntityId entityId) const { - if (!m_focusedInstance.has_value()) - { - // PrefabFocusHandler has not been initialized yet. - return false; - } - if (!entityId.IsValid()) { return false; } + // If the focus is on the root, m_focusedInstanceContainerEntityId will be the invalid id. + // In those case all entities are in the focus hierarchy and should return true. + if (!m_focusedInstanceContainerEntityId.IsValid()) + { + return true; + } + InstanceOptionalReference instance = m_instanceEntityMapperInterface->FindOwningInstance(entityId); while (instance.has_value()) { - if (&instance->get() == &m_focusedInstance->get()) + if (instance->get().GetContainerEntityId() == m_focusedInstanceContainerEntityId) { return true; } @@ -290,8 +290,9 @@ namespace AzToolsFramework::Prefab // Determine if the entityId is the container for any of the instances in the vector. auto result = AZStd::find_if( m_instanceFocusHierarchy.begin(), m_instanceFocusHierarchy.end(), - [entityId](const InstanceOptionalReference& instance) + [&, entityId](const AZ::EntityId& containerEntityId) { + InstanceOptionalReference instance = GetReferenceFromContainerEntityId(containerEntityId); return (instance->get().GetContainerEntityId() == entityId); } ); @@ -316,8 +317,9 @@ namespace AzToolsFramework::Prefab // Determine if the templateId matches any of the instances in the vector. auto result = AZStd::find_if( m_instanceFocusHierarchy.begin(), m_instanceFocusHierarchy.end(), - [templateId](const InstanceOptionalReference& instance) + [&, templateId](const AZ::EntityId& containerEntityId) { + InstanceOptionalReference instance = GetReferenceFromContainerEntityId(containerEntityId); return (instance->get().GetTemplateId() == templateId); } ); @@ -336,10 +338,17 @@ namespace AzToolsFramework::Prefab AZStd::list instanceFocusList; - InstanceOptionalReference currentInstance = m_focusedInstance; + InstanceOptionalReference currentInstance = GetReferenceFromContainerEntityId(m_focusedInstanceContainerEntityId); while (currentInstance.has_value()) { - m_instanceFocusHierarchy.emplace_back(currentInstance); + if (currentInstance->get().GetParentInstance().has_value()) + { + m_instanceFocusHierarchy.emplace_back(currentInstance->get().GetContainerEntityId()); + } + else + { + m_instanceFocusHierarchy.emplace_back(AZ::EntityId()); + } currentInstance = currentInstance->get().GetParentInstance(); } @@ -357,42 +366,48 @@ namespace AzToolsFramework::Prefab size_t index = 0; size_t maxIndex = m_instanceFocusHierarchy.size() - 1; - for (const InstanceOptionalReference& instance : m_instanceFocusHierarchy) + for (const AZ::EntityId containerEntityId : m_instanceFocusHierarchy) { - AZStd::string prefabName; - - if (index < maxIndex) + InstanceOptionalReference instance = GetReferenceFromContainerEntityId(containerEntityId); + if (instance.has_value()) { - // Get the filename without the extension (stem). - prefabName = instance->get().GetTemplateSourcePath().Stem().Native(); - } - else - { - // Get the full filename. - prefabName = instance->get().GetTemplateSourcePath().Filename().Native(); - } + AZStd::string prefabName; - if (prefabSystemComponentInterface->IsTemplateDirty(instance->get().GetTemplateId())) - { - prefabName += "*"; - } + if (index < maxIndex) + { + // Get the filename without the extension (stem). + prefabName = instance->get().GetTemplateSourcePath().Stem().Native(); + } + else + { + // Get the full filename. + prefabName = instance->get().GetTemplateSourcePath().Filename().Native(); + } - m_instanceFocusPath.Append(prefabName); + if (prefabSystemComponentInterface->IsTemplateDirty(instance->get().GetTemplateId())) + { + prefabName += "*"; + } + + m_instanceFocusPath.Append(prefabName); + } ++index; } } - void PrefabFocusHandler::OpenInstanceContainers(const AZStd::vector& instances) const + void PrefabFocusHandler::OpenInstanceContainers(const AZStd::vector& instances) const { // If this is called outside the Editor, this interface won't be initialized. if (!m_containerEntityInterface) { return; } - - for (const InstanceOptionalReference& instance : instances) + + for (const AZ::EntityId containerEntityId : instances) { + InstanceOptionalReference instance = GetReferenceFromContainerEntityId(containerEntityId); + if (instance.has_value()) { m_containerEntityInterface->SetContainerOpen(instance->get().GetContainerEntityId(), true); @@ -400,7 +415,7 @@ namespace AzToolsFramework::Prefab } } - void PrefabFocusHandler::CloseInstanceContainers(const AZStd::vector& instances) const + void PrefabFocusHandler::CloseInstanceContainers(const AZStd::vector& instances) const { // If this is called outside the Editor, this interface won't be initialized. if (!m_containerEntityInterface) @@ -408,8 +423,10 @@ namespace AzToolsFramework::Prefab return; } - for (const InstanceOptionalReference& instance : instances) + for (const AZ::EntityId containerEntityId : instances) { + InstanceOptionalReference instance = GetReferenceFromContainerEntityId(containerEntityId); + if (instance.has_value()) { m_containerEntityInterface->SetContainerOpen(instance->get().GetContainerEntityId(), false); @@ -417,4 +434,22 @@ namespace AzToolsFramework::Prefab } } + InstanceOptionalReference PrefabFocusHandler::GetReferenceFromContainerEntityId(AZ::EntityId containerEntityId) const + { + if (!containerEntityId.IsValid()) + { + PrefabEditorEntityOwnershipInterface* prefabEditorEntityOwnershipInterface = + AZ::Interface::Get(); + + if (!prefabEditorEntityOwnershipInterface) + { + return AZStd::nullopt; + } + + return prefabEditorEntityOwnershipInterface->GetRootPrefabInstance(); + } + + return m_instanceEntityMapperInterface->FindOwningInstance(containerEntityId); + } + } // namespace AzToolsFramework::Prefab diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabFocusHandler.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabFocusHandler.h index 75b9666389..2e23059a01 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabFocusHandler.h +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabFocusHandler.h @@ -73,16 +73,19 @@ namespace AzToolsFramework::Prefab void RefreshInstanceFocusList(); void RefreshInstanceFocusPath(); - void OpenInstanceContainers(const AZStd::vector& instances) const; - void CloseInstanceContainers(const AZStd::vector& instances) const; + void OpenInstanceContainers(const AZStd::vector& instances) const; + void CloseInstanceContainers(const AZStd::vector& instances) const; - //! The instance the editor is currently focusing on. - InstanceOptionalReference m_focusedInstance; + InstanceOptionalReference GetReferenceFromContainerEntityId(AZ::EntityId containerEntityId) const; + + //! The EntityId of the prefab container entity for the instance the editor is currently focusing on. + AZ::EntityId m_focusedInstanceContainerEntityId = AZ::EntityId(); //! The templateId of the focused instance. TemplateId m_focusedTemplateId; - //! The list of instances going from the root (index 0) to the focused instance. - AZStd::vector m_instanceFocusHierarchy; - //! A path containing the names of the containers in the instance focus hierarchy, separated with a /. + //! The list of instances going from the root (index 0) to the focused instance, + //! referenced by their prefab container's EntityId. + AZStd::vector m_instanceFocusHierarchy; + //! A path containing the filenames of the instances in the focus hierarchy, separated with a /. AZ::IO::Path m_instanceFocusPath; ContainerEntityInterface* m_containerEntityInterface = nullptr; diff --git a/Code/Framework/AzToolsFramework/Tests/Prefab/PrefabFocus/PrefabFocusTests.cpp b/Code/Framework/AzToolsFramework/Tests/Prefab/PrefabFocus/PrefabFocusTests.cpp index 86c73e72e5..6bf964f038 100644 --- a/Code/Framework/AzToolsFramework/Tests/Prefab/PrefabFocus/PrefabFocusTests.cpp +++ b/Code/Framework/AzToolsFramework/Tests/Prefab/PrefabFocus/PrefabFocusTests.cpp @@ -106,7 +106,9 @@ namespace UnitTest inline static const char* Passenger2EntityName = "Passenger2"; }; - TEST_F(PrefabFocusTests, PrefabFocus_FocusOnOwningPrefab_RootContainer) + // Test was disabled because the implementation of GetFocusedPrefabInstance now relies on the Prefab EOS, + // which is not used by our test environment. This can be restored once Instance handles are implemented. + TEST_F(PrefabFocusTests, DISABLED_PrefabFocus_FocusOnOwningPrefab_RootContainer) { // Verify FocusOnOwningPrefab works when passing the container entity of the root prefab. { @@ -121,7 +123,9 @@ namespace UnitTest } } - TEST_F(PrefabFocusTests, PrefabFocus_FocusOnOwningPrefab_RootEntity) + // Test was disabled because the implementation of GetFocusedPrefabInstance now relies on the Prefab EOS, + // which is not used by our test environment. This can be restored once Instance handles are implemented. + TEST_F(PrefabFocusTests, DISABLED_PrefabFocus_FocusOnOwningPrefab_RootEntity) { // Verify FocusOnOwningPrefab works when passing a nested entity of the root prefab. { From ed40ed201a93974746ff391bfc6a27999085f553 Mon Sep 17 00:00:00 2001 From: Mike Chang Date: Thu, 18 Nov 2021 15:20:07 -0800 Subject: [PATCH 133/345] Add gpg public key (#5755) Signed-off-by: Mike Chang --- .../signer/Platform/Linux/o3de-releases.gpg | 53 +++++++++++++++++++ 1 file changed, 53 insertions(+) create mode 100644 scripts/signer/Platform/Linux/o3de-releases.gpg diff --git a/scripts/signer/Platform/Linux/o3de-releases.gpg b/scripts/signer/Platform/Linux/o3de-releases.gpg new file mode 100644 index 0000000000..602d822673 --- /dev/null +++ b/scripts/signer/Platform/Linux/o3de-releases.gpg @@ -0,0 +1,53 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- + +mQINBGGWliEBEADq6bmhQbp42ZKQ4NwlnWeyFf6LhcnhafnBrGYV+XGyva2mP6kV +I4w80V9BQSHqpYt2R71tVDxfa+DicH4NDA1NmWte+hZ5eENgvoj6VJrqZzUZihwy +DZTaw4oMMabAK4a4b4G+BMV7iW7b4HWLEUH4Vmgq9LxU9qz9Ni5BIIyyp9Abh0kS +fbF3/ZQKdNTcyoVNOlm/5ohQsEJCftGi2CJzqybgS+fRQxaC/v9vAt3/A9gCEccD +LBFHkzz+58ZumEP2CXOoy/TDYhx7jMJFRzy0o/vJTEOKoWMQS3t9CIcOuE3enjsK +0GlFZPhTZREiTosJy9sNuTM8bJBEcrGfSfZZ0GUAF8IvAJiHppSTqFe/H3iqHnww +1I+ap/v2nI4AzRljQQ5RBsHJxHuHeuyUOFqwuGddvhYssiG9KzTeov03anA8BRY6 +235kWQkR5+CuMb0sgSkwhCQ3tz3Oc20l8g8jRTeLjIkqVNDN6+FffBuJgJjU7eHu +01xw0mRqjxIPp21XsOzw4+hNQM98QLUhJXu5/hImP37V9223qyZMeCyODHyrk0h8 +wi5J6ZMEVymNDNRJ2dgLrDM2GG5DbY5rOVPpu0bsPHqGMHpipDd7hNQd78tRh6Jf +CzhLFiIMnHH+7c7HxhJUvbewHUiCyRQ7H3RRHi8cZMn2Wa3g13rYtJzSgQARAQAB +tFtvM2RlYmluYXJpZXMub3JnIChPM0RFIEJpbmFyeSBQcm9qZWN0IGEgU2VyaWVz +IG9mIExGIFByb2plY3RzLCBMTEMpIDxpbmZvQG8zZGViaW5hcmllcy5vcmc+iQJU +BBMBCgA+FiEEXtkClauXt9hZ4PvRSNjOEOJZqKQFAmGWliECGwMFCQWmPYAFCwkI +BwIGFQoJCAsCBBYCAwECHgECF4AACgkQSNjOEOJZqKTy8hAAs9YueTc6a3UNjWbN +Zx9L3bmLqMITthadFv1LuntCrU/hte44FeP74acqSZDGfWN381iYMGlw0ECsJB/d +DnElITiO9W1MNelansiX5zHlVUd6HuuEVZTsoQodWgbIEvs5bLA2HqKk03Mcb9uW +vyeYfOjknedZ7sfoe7HnkYEaPBgb/5Fkn6wTnDTb4CMAdZoy6+nfVQdTHIQ+PsDY +hlCR2q+jgZaNyRiW3gIz4PPpgaNIxT8JmRvGC/gseDf3l6xy4p7SH8eEsK8+oy2G +SrFxE6Ez9SySVc3PZHiS9eCEsoNhqAzV5RRP/UvpWhxM/mAgJHJI+wy5pbpFeLr3 +zTEOcCgXxVGBSX3BocoP8SLFP5zNocKhiG7eXQWvg/I1oGr8qPxC4aE+h6xtTaw+ +6/Wpd2PRMXoVVHDCuJy3qTNLus5sF6vmUDc69MYfzCmLqZDVjVdcTMgvQYv1VnOz +Td+/pnTIs4AYM0pQY2P/GdjIdGWVuRc1ssDisdjzUQvZMNKC9hnkKlJF0utCDqb1 +FAyN8u9dpbR3Yy98qy1thp2hebd6lVpLPU0YKUSYBGiyU74lIEqJUM9bnlLxFWgL +lGdjSpDbNUPIZrhVk86xR7EI3W3Br/5ygi0imtah96jdoHdW0XJzWAOTJBSmJUgD +vRtomV24xuu/lZZCGUXhy3nIFfi5Ag0EYZaWIQEQAKp1dCgW1r9WXEEiOnrgHSBb +GLKmJJuJEM7+hEW18PoSph+lmO/gqz/GKf647HWFon101+d80yexT4mFdT9G24L6 +WmPsJeVswcFzRSergq7/OTD5jmmElMmohTOlAApzhb7UUFotgvSOiwrxyhK5Hhk3 ++XCZGurZdKd02BVrwdI06I+t6t1BJAazoEYMcmwhvweW1DtKjMCdf+kUMZ/YlTos +VKXFz0tEANu4BDgNdO/jTBh+dIFGjxfMPSYCnUpz4BJQLnlRagNj86SetNl5qFVn +K6d8CCuqax2vk9MLw+fLOTbvde+GzamEYXYA840nffHx11V4JaL+xqGSWofh+r1q +4XI0WD7Ly8BTj3Gx8xOeVKGSetfQf+6w7r2X5Yg1iGN5y8e+7VJ9j4Ntn0bbk2Go +O7WDx3yZBqS7PiII5+ItLOIFfVqwGZzJXR3OBoRQWji03K/RXjthiyEHv0JBQFJi +95vBT1X3u5dgngQNSAYkLfMjPqwCmzOrIeZhkB9g/qvDwp1i80L7jTR+iOQPYa+9 +JuUwBBKfi6GqqbAoD0tLV+1/rnoi5aalN7WcgfBvIK7KqeGGjM9oJlotrkJf5Lsu +1RLdHlOTPq7ZNQ6MFB7BOi6KWAiWTARZchEJKAR4jqLLnU+qcV0QM0jUK2E/yzCG +KoID/HV+xipxdzAW+MiBABEBAAGJAjwEGAEKACYWIQRe2QKVq5e32Fng+9FI2M4Q +4lmopAUCYZaWIQIbDAUJBaY9gAAKCRBI2M4Q4lmopGOsD/9qqiU13ohVX/UjCZj3 +0Q7ShuC0mgRh8zxsfeFVQu5JkYXgSbe+4emsmzbSJ9VaZe1AOa+UGBNJG0BdHlbb +kZ1uEJJ5TkKzuPbJnF5Bj6N1Qk8C4dBMyTuouF+s5fwBgiz+eDTyRa/N6QSbPkvA +QiuivECA13gahp9sfcn0TGwLmqR6GyKWHNp3bCsxL1j3YKfEP2FTT1ko0V3qURtV +8FNuzA/kupgPVFgG60kujJ/PzDZ772k5TEpHRBw3Z6xfrS56o/eSXJunjFQPsTuw +5zJoMXUybGoOdBErEHL0bYw42jobJ+d1mOda9LPaA/ea51WWuyXIr+S66aHSgn0F +K5QewNazYpGekmQ6gpP7B9dUcGxJW3Hl3qkUV98GLANtAiUhr99Hx4oYD5lXE3jy +HN4nzFCBxG35rQzJ/GQ7wX93HgMU8pq20sHDZxNY9tD/TEMdeY2UashkMjjjTmT0 +7HySlvYJLpElfNlhhm/8H5Lo2UBIex+xemssOT+De46fU0EQI6zDPnFxABIy7ECF +VEVuMAyPjgUgxD2XyXk7yfxHs0cO34k0lhlT3D1mGF8VYZuTLJVtI7TQ72JhLmGy +oec1he0q8civF8GrSfKSObm1pN0/q9TtfYso6T/D3J13eJ1FW06+6iTl9bqUMqqS +uPvKa1dp3CCS3lhFfmP1Gcxi+w== +=2u1v +-----END PGP PUBLIC KEY BLOCK----- From a0ca98238f6e20ee3ee0a8b8fa9d5467e99f6c37 Mon Sep 17 00:00:00 2001 From: lsemp3d <58790905+lsemp3d@users.noreply.github.com> Date: Thu, 18 Nov 2021 15:46:30 -0800 Subject: [PATCH 134/345] Updated more node names Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com> --- .../TranslationAssets/Classes/Platform.names | 95 ++++- .../Classes/ScriptTimePoint.names | 34 +- .../Classes/SurfaceTagWeight.names | 90 ++++- .../TranslationAssets/Classes/Uuid.names | 97 ++--- .../Handlers/ConsoleNotificationBus.names | 7 +- .../EBus/Handlers/VariableNotification.names | 5 +- .../EBus/Senders/ConsoleRequestBus.names | 4 +- .../EBus/Senders/TerrainDataRequestBus.names | 349 ++++++++++-------- .../EBus/Senders/TickRequestBus.names | 17 +- .../Nodes/Nodeables_TimeDelay.names | 2 +- .../Nodes/String_ToLower.names | 13 +- .../Nodes/String_ToUpper.names | 13 +- .../Nodes/Timing_HeartBeat.names | 28 +- 13 files changed, 485 insertions(+), 269 deletions(-) diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/Platform.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/Platform.names index b7a5be6da9..cc41ff44a3 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/Platform.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/Platform.names @@ -14,21 +14,20 @@ "context": "Platform", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetName" + "tooltip": "When signaled, this will invoke Get Name" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetName is invoked" + "tooltip": "Signaled after Get Name is invoked" }, "details": { - "name": "Platform::GetName", - "category": "Utilities" + "name": "Get Name" }, "params": [ { "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", "details": { - "name": "int" + "name": "Id" } } ], @@ -36,7 +35,91 @@ { "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", "details": { - "name": "Number" + "name": "Name" + } + } + ] + }, + { + "key": "GetMac", + "details": { + "name": "Get Mac" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "Id" + } + } + ] + }, + { + "key": "GetLinux", + "details": { + "name": "Get Linux" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "Id" + } + } + ] + }, + { + "key": "GetiOS", + "details": { + "name": "Get iOS" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "Id" + } + } + ] + }, + { + "key": "GetWindows64", + "details": { + "name": "Get Windows64" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "Id" + } + } + ] + }, + { + "key": "GetAndroid64", + "details": { + "name": "Get Android64" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "Id" + } + } + ] + }, + { + "key": "GetCurrent", + "details": { + "name": "Get Current" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "Id" } } ] diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ScriptTimePoint.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ScriptTimePoint.names index 8cad1c3269..b43f891c4c 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ScriptTimePoint.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ScriptTimePoint.names @@ -5,8 +5,7 @@ "context": "BehaviorClass", "variant": "", "details": { - "name": "Script Time Point", - "category": "Timing" + "name": "Script Time Point" }, "methods": [ { @@ -14,21 +13,20 @@ "context": "ScriptTimePoint", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke ToString" + "tooltip": "When signaled, this will invoke To String" }, "exit": { "name": "Out", - "tooltip": "Signaled after ToString is invoked" + "tooltip": "Signaled after To String is invoked" }, "details": { - "name": "ScriptTimePoint::ToString", - "category": "Timing" + "name": "To String" }, "params": [ { "typeid": "{4C0F6AD4-0D4F-4354-AD4A-0C01E948245C}", "details": { - "name": "ScriptTimePoint*" + "name": "Script Time Point" } } ], @@ -46,21 +44,20 @@ "context": "ScriptTimePoint", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetSeconds" + "tooltip": "When signaled, this will invoke Get Seconds" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetSeconds is invoked" + "tooltip": "Signaled after Get Seconds is invoked" }, "details": { - "name": "ScriptTimePoint::GetSeconds", - "category": "Timing" + "name": "Get Seconds" }, "params": [ { "typeid": "{4C0F6AD4-0D4F-4354-AD4A-0C01E948245C}", "details": { - "name": "ScriptTimePoint*" + "name": "Script Time Point" } } ], @@ -68,7 +65,7 @@ { "typeid": "{110C4B14-11A8-4E9D-8638-5051013A56AC}", "details": { - "name": "Number" + "name": "Seconds" } } ] @@ -78,21 +75,20 @@ "context": "ScriptTimePoint", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetMilliseconds" + "tooltip": "When signaled, this will invoke Get Milliseconds" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetMilliseconds is invoked" + "tooltip": "Signaled after Get Milliseconds is invoked" }, "details": { - "name": "ScriptTimePoint::GetMilliseconds", - "category": "Timing" + "name": "Get Milliseconds" }, "params": [ { "typeid": "{4C0F6AD4-0D4F-4354-AD4A-0C01E948245C}", "details": { - "name": "ScriptTimePoint*" + "name": "Script Time Point" } } ], @@ -100,7 +96,7 @@ { "typeid": "{110C4B14-11A8-4E9D-8638-5051013A56AC}", "details": { - "name": "Number" + "name": "Milliseconds" } } ] diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SurfaceTagWeight.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SurfaceTagWeight.names index 0e950bcdbd..0f44e4f9c0 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SurfaceTagWeight.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SurfaceTagWeight.names @@ -5,8 +5,94 @@ "context": "BehaviorClass", "variant": "", "details": { - "name": "SurfaceTagWeight" - } + "name": "Surface Tag Weight" + }, + "methods": [ + { + "key": "GetsurfaceType", + "details": { + "name": "Get Surface Type" + }, + "params": [ + { + "typeid": "{EA14018E-E853-4BF5-8E13-D83BB99A54CC}", + "details": { + "name": "Surface Tag Weight" + } + } + ], + "results": [ + { + "typeid": "{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}", + "details": { + "name": "Tag" + } + } + ] + }, + { + "key": "SetsurfaceType", + "details": { + "name": "Set Surface Type" + }, + "params": [ + { + "typeid": "{EA14018E-E853-4BF5-8E13-D83BB99A54CC}", + "details": { + "name": "Surface Tag Weight" + } + }, + { + "typeid": "{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}", + "details": { + "name": "Tag" + } + } + ] + }, + { + "key": "Getweight", + "details": { + "name": "Get Weight" + }, + "params": [ + { + "typeid": "{EA14018E-E853-4BF5-8E13-D83BB99A54CC}", + "details": { + "name": "Surface Tag Weight" + } + } + ], + "results": [ + { + "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", + "details": { + "name": "Weight" + } + } + ] + }, + { + "key": "Setweight", + "details": { + "name": "Set Weight" + }, + "params": [ + { + "typeid": "{EA14018E-E853-4BF5-8E13-D83BB99A54CC}", + "details": { + "name": "Surface Tag Weight" + } + }, + { + "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", + "details": { + "name": "Weight" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/Uuid.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/Uuid.names index dbed05c272..1ba15fce9f 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/Uuid.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/Uuid.names @@ -5,8 +5,7 @@ "context": "BehaviorClass", "variant": "", "details": { - "name": "UUID", - "category": "Utilities" + "name": "Uuid" }, "methods": [ { @@ -14,22 +13,20 @@ "context": "Uuid", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke CreateRandom" + "tooltip": "When signaled, this will invoke Create Random" }, "exit": { "name": "Out", - "tooltip": "Signaled after CreateRandom is invoked" + "tooltip": "Signaled after Create Random is invoked" }, "details": { - "name": "Uuid::CreateRandom", - "category": "Utilities" + "name": "Create Random" }, "results": [ { "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}", "details": { - "name": "UUID", - "tooltip": "Universally Unique Identifier" + "name": "Uuid" } } ] @@ -39,22 +36,20 @@ "context": "Uuid", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke CreateNull" + "tooltip": "When signaled, this will invoke Create Null" }, "exit": { "name": "Out", - "tooltip": "Signaled after CreateNull is invoked" + "tooltip": "Signaled after Create Null is invoked" }, "details": { - "name": "Uuid::CreateNull", - "category": "Utilities" + "name": "Create Null" }, "results": [ { "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}", "details": { - "name": "Null UUID", - "tooltip": "Null Universally Unique Identifier" + "name": "Uuid" } } ] @@ -71,8 +66,7 @@ "tooltip": "Signaled after Create is invoked" }, "details": { - "name": "Uuid::Create", - "category": "Utilities" + "name": "Create" }, "results": [ { @@ -88,21 +82,20 @@ "context": "Uuid", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke CreateName" + "tooltip": "When signaled, this will invoke Create Name" }, "exit": { "name": "Out", - "tooltip": "Signaled after CreateName is invoked" + "tooltip": "Signaled after Create Name is invoked" }, "details": { - "name": "Uuid::CreateName", - "category": "Utilities" + "name": "Create Name" }, "params": [ { "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", "details": { - "name": "const char*" + "name": "Name" } } ], @@ -127,14 +120,13 @@ "tooltip": "Signaled after Clone is invoked" }, "details": { - "name": "Uuid::Clone", - "category": "Utilities" + "name": "Clone" }, "params": [ { "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}", "details": { - "name": "const AZ::Uuid&" + "name": "Uuid" } } ], @@ -152,27 +144,26 @@ "context": "Uuid", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke LessThan" + "tooltip": "When signaled, this will invoke Less Than" }, "exit": { "name": "Out", - "tooltip": "Signaled after LessThan is invoked" + "tooltip": "Signaled after Less Than is invoked" }, "details": { - "name": "Uuid::LessThan", - "category": "Utilities" + "name": "Less Than" }, "params": [ { "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}", "details": { - "name": "AZ::Uuid*" + "name": "Uuid" } }, { "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}", "details": { - "name": "const AZ::Uuid&" + "name": "Uuid" } } ], @@ -180,7 +171,7 @@ { "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", "details": { - "name": "Boolean" + "name": "Is Less Than" } } ] @@ -190,22 +181,20 @@ "context": "Uuid", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke IsNull" + "tooltip": "When signaled, this will invoke Is Null" }, "exit": { "name": "Out", - "tooltip": "Signaled after IsNull is invoked" + "tooltip": "Signaled after Is Null is invoked" }, "details": { - "name": "Uuid::IsNull", - "category": "Utilities" + "name": "Is Null" }, "params": [ { "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}", "details": { - "name": "UUID", - "tooltip": "Universally Unique Identifier" + "name": "Uuid" } } ], @@ -213,7 +202,7 @@ { "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", "details": { - "name": "Boolean" + "name": "Is Null" } } ] @@ -223,27 +212,26 @@ "context": "Uuid", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke CreateString" + "tooltip": "When signaled, this will invoke Create String" }, "exit": { "name": "Out", - "tooltip": "Signaled after CreateString is invoked" + "tooltip": "Signaled after Create String is invoked" }, "details": { - "name": "Uuid::CreateString", - "category": "Utilities" + "name": "Create String" }, "params": [ { "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", "details": { - "name": "const char*" + "name": "Name" } }, { "typeid": "{D6597933-47CD-4FC8-B911-63F3E2B0993A}", "details": { - "name": "AZ::u64" + "name": "Size" } } ], @@ -261,22 +249,20 @@ "context": "Uuid", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke ToString" + "tooltip": "When signaled, this will invoke To String" }, "exit": { "name": "Out", - "tooltip": "Signaled after ToString is invoked" + "tooltip": "Signaled after To String is invoked" }, "details": { - "name": "Uuid::ToString", - "category": "Utilities" + "name": "To String" }, "params": [ { "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}", "details": { - "name": "UUID", - "tooltip": "Universally Unique Identifier" + "name": "Uuid" } } ], @@ -301,22 +287,19 @@ "tooltip": "Signaled after Equal is invoked" }, "details": { - "name": "Uuid::Equal", - "category": "Utilities" + "name": "Equal" }, "params": [ { "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}", "details": { - "name": "UUID A", - "tooltip": "Universally Unique Identifier A" + "name": "Uuid" } }, { "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}", "details": { - "name": "UUID B", - "tooltip": "Universally Unique Identifier B" + "name": "Uuid" } } ], @@ -324,7 +307,7 @@ { "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", "details": { - "name": "Boolean" + "name": "Equal" } } ] diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/ConsoleNotificationBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/ConsoleNotificationBus.names index e96eef8e46..9bd1bfbbb1 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/ConsoleNotificationBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/ConsoleNotificationBus.names @@ -5,19 +5,20 @@ "context": "EBusHandler", "variant": "", "details": { - "name": "ConsoleNotificationBus" + "name": "Console", + "category": "Utilities" }, "methods": [ { "key": "OnConsoleCommandExecuted", "details": { - "name": "OnConsoleCommandExecuted" + "name": "On Console Command Executed" }, "params": [ { "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", "details": { - "name": "char" + "name": "Command" } } ] diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/VariableNotification.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/VariableNotification.names index c470e02dfb..486694b4bb 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/VariableNotification.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/VariableNotification.names @@ -5,14 +5,15 @@ "context": "EBusHandler", "variant": "", "details": { - "name": "VariableNotification", + "name": "Variable Notification", + "category": "Variables", "tooltip": "Notifications from the Variables in the current Script Canvas graph" }, "methods": [ { "key": "OnVariableValueChanged", "details": { - "name": "OnVariableValueChanged" + "name": "On Variable Value Changed" } } ] diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ConsoleRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ConsoleRequestBus.names index d956496c3e..eb2414b9b4 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ConsoleRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ConsoleRequestBus.names @@ -5,7 +5,7 @@ "context": "EBusSender", "variant": "", "details": { - "name": "ConsoleRequestBus", + "name": "Console", "category": "Utilities" }, "methods": [ @@ -26,7 +26,7 @@ { "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", "details": { - "name": "char" + "name": "Command" } } ] diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/TerrainDataRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/TerrainDataRequestBus.names index acd8f15026..f7ea7fa19e 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/TerrainDataRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/TerrainDataRequestBus.names @@ -5,124 +5,9 @@ "context": "EBusSender", "variant": "", "details": { - "name": "TerrainDataRequestBus" + "name": "Terrain Data" }, "methods": [ - { - "key": "GetNormalFromFloats", - "entry": { - "name": "In", - "tooltip": "When signaled, this will invoke Get Normal From Floats" - }, - "exit": { - "name": "Out", - "tooltip": "Signaled after Get Normal From Floats is invoked" - }, - "details": { - "name": "Get Normal From Floats" - }, - "params": [ - { - "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", - "details": { - "name": "X" - } - }, - { - "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", - "details": { - "name": "Y" - } - }, - { - "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", - "details": { - "name": "Sample Filter", - "tooltip": "0: Bilinear, 1: Clamp, 2: Exact" - } - }, - { - "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", - "details": { - "name": "Terrain Exists" - } - } - ], - "results": [ - { - "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}", - "details": { - "name": "Normal" - } - } - ] - }, - { - "key": "GetNormal", - "entry": { - "name": "In", - "tooltip": "When signaled, this will invoke Get Normal" - }, - "exit": { - "name": "Out", - "tooltip": "Signaled after Get Normal is invoked" - }, - "details": { - "name": "Get Normal" - }, - "params": [ - { - "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}", - "details": { - "name": "Position" - } - }, - { - "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", - "details": { - "name": "Sample Filter", - "tooltip": "0: Bilinear, 1: Clamp, 2: Exact" - - } - }, - { - "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", - "details": { - "name": "Terrain Exists" - } - } - ], - "results": [ - { - "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}", - "details": { - "name": "Normal" - } - } - ] - }, - { - "key": "GetTerrainAabb", - "entry": { - "name": "In", - "tooltip": "When signaled, this will invoke Get Terrain AABB" - }, - "exit": { - "name": "Out", - "tooltip": "Signaled after Get Terrain AABB is invoked" - }, - "details": { - "name": "Get Terrain AABB" - }, - "results": [ - { - "typeid": "{A54C2B36-D5B8-46A1-A529-4EBDBD2450E7}", - "details": { - "name": "AABB" - } - } - ] - }, { "key": "GetIsHoleFromFloats", "entry": { @@ -161,35 +46,35 @@ { "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", "details": { - "name": "Is Hole" + "name": "Terrain Exists" } } ] }, { - "key": "GetHeightFromFloats", + "key": "GetSurfaceWeightsFromVector2", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke Get Height From Floats" + "tooltip": "When signaled, this will invoke Get Surface Weights From Vector2" }, "exit": { "name": "Out", - "tooltip": "Signaled after Get Height From Floats is invoked" + "tooltip": "Signaled after Get Surface Weights From Vector2 is invoked" }, "details": { - "name": "Get Height From Floats" + "name": "Get Surface Weights From Vector2" }, "params": [ { - "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", + "typeid": "{3D80F623-C85C-4741-90D0-E4E66164E6BF}", "details": { - "name": "X" + "name": "Position" } }, { - "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", + "typeid": "{8F60B4D4-06F0-577C-AFB9-ECBFA7B66D4E}", "details": { - "name": "Y" + "name": "Surface Weights" } }, { @@ -205,12 +90,45 @@ "name": "Terrain Exists" } } - ], - "results": [ + ] + }, + { + "key": "GetSurfaceWeights", + "entry": { + "name": "In", + "tooltip": "When signaled, this will invoke GetSurfaceWeights" + }, + "exit": { + "name": "Out", + "tooltip": "Signaled after GetSurfaceWeights is invoked" + }, + "details": { + "name": "GetSurfaceWeights" + }, + "params": [ { - "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", + "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}", "details": { - "name": "Height" + "name": "Position" + } + }, + { + "typeid": "{8F60B4D4-06F0-577C-AFB9-ECBFA7B66D4E}", + "details": { + "name": "Surface Weights" + } + }, + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "Sample Filter", + "tooltip": "0: Bilinear, 1: Clamp, 2: Exact" + } + }, + { + "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", + "details": { + "name": "Terrain Exists" } } ] @@ -219,11 +137,11 @@ "key": "GetMaxSurfaceWeight", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetMaxSurfaceWeight" + "tooltip": "When signaled, this will invoke Get Max Surface Weight" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetMaxSurfaceWeight is invoked" + "tooltip": "Signaled after Get Max Surface Weight is invoked" }, "details": { "name": "Get Max Surface Weight" @@ -259,29 +177,129 @@ ] }, { - "key": "GetMaxSurfaceWeightFromFloats", + "key": "GetSurfacePointFromVector2", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke Get Max Surface Weight From Floats" + "tooltip": "When signaled, this will invoke Get Surface Point From Vector2" }, "exit": { "name": "Out", - "tooltip": "Signaled after Get Max Surface Weight From Floats is invoked" + "tooltip": "Signaled after Get Surface Point From Vector2 is invoked" }, "details": { - "name": "Get Max Surface Weight From Floats" + "name": "Get Surface Point From Vector2" }, "params": [ { - "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", + "typeid": "{3D80F623-C85C-4741-90D0-E4E66164E6BF}", "details": { - "name": "X" + "name": "Position" } }, { - "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", + "typeid": "{331A3D0E-BB1D-47BF-96A2-249FAA0D720D}", "details": { - "name": "Y" + "name": "Surface Point" + } + }, + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "Sample Filter", + "tooltip": "0: Bilinear, 1: Clamp, 2: Exact" + } + }, + { + "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", + "details": { + "name": "Terrain Exists" + } + } + ] + }, + { + "key": "GetTerrainHeightQueryResolution", + "entry": { + "name": "In", + "tooltip": "When signaled, this will invoke Get Terrain Height Query Resolution" + }, + "exit": { + "name": "Out", + "tooltip": "Signaled after Get Terrain Height Query Resolution is invoked" + }, + "details": { + "name": "Get Terrain Height Query Resolution" + }, + "results": [ + { + "typeid": "{3D80F623-C85C-4741-90D0-E4E66164E6BF}", + "details": { + "name": "Position" + } + } + ] + }, + { + "key": "GetNormal", + "entry": { + "name": "In", + "tooltip": "When signaled, this will invoke Get Normal" + }, + "exit": { + "name": "Out", + "tooltip": "Signaled after Get Normal is invoked" + }, + "details": { + "name": "Get Normal" + }, + "params": [ + { + "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}", + "details": { + "name": "Position" + } + }, + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "Sample Filter", + "tooltip": "0: Bilinear, 1: Clamp, 2: Exact" + } + }, + { + "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", + "details": { + "name": "Terrain Exists" + } + } + ], + "results": [ + { + "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}", + "details": { + "name": "Normal" + } + } + ] + }, + { + "key": "GetMaxSurfaceWeightFromVector2", + "entry": { + "name": "In", + "tooltip": "When signaled, this will invoke Get Max Surface Weight From Vector2" + }, + "exit": { + "name": "Out", + "tooltip": "Signaled after Get Max Surface Weight From Vector2 is invoked" + }, + "details": { + "name": "Get Max Surface Weight From Vector2" + }, + "params": [ + { + "typeid": "{3D80F623-C85C-4741-90D0-E4E66164E6BF}", + "details": { + "name": "Position" } }, { @@ -308,23 +326,23 @@ ] }, { - "key": "GetTerrainHeightQueryResolution", + "key": "GetTerrainAabb", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke Get Terrain Height Query Resolution" + "tooltip": "When signaled, this will invoke Get Terrain AABB" }, "exit": { "name": "Out", - "tooltip": "Signaled after Get Terrain Height Query Resolution is invoked" + "tooltip": "Signaled after Get Terrain AABB is invoked" }, "details": { - "name": "Get Terrain Height Query Resolution" + "name": "Get Terrain AABB" }, "results": [ { - "typeid": "{3D80F623-C85C-4741-90D0-E4E66164E6BF}", + "typeid": "{A54C2B36-D5B8-46A1-A529-4EBDBD2450E7}", "details": { - "name": "Resolution" + "name": "AABB" } } ] @@ -371,6 +389,47 @@ } } ] + }, + { + "key": "GetSurfacePoint", + "entry": { + "name": "In", + "tooltip": "When signaled, this will invoke Get Surface Point" + }, + "exit": { + "name": "Out", + "tooltip": "Signaled after Get Surface Point is invoked" + }, + "details": { + "name": "Get Surface Point" + }, + "params": [ + { + "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}", + "details": { + "name": "Position" + } + }, + { + "typeid": "{331A3D0E-BB1D-47BF-96A2-249FAA0D720D}", + "details": { + "name": "Surface Point" + } + }, + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "Sample Filter", + "tooltip": "0: Bilinear, 1: Clamp, 2: Exact" + } + }, + { + "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", + "details": { + "name": "Terrain Exists" + } + } + ] } ] } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/TickRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/TickRequestBus.names index 869d2cfcfb..414e66e411 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/TickRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/TickRequestBus.names @@ -5,8 +5,7 @@ "context": "EBusSender", "variant": "", "details": { - "name": "TickRequestBus", - "category": "Timing" + "name": "Tick" }, "methods": [ { @@ -20,14 +19,13 @@ "tooltip": "Signaled after Get Tick Delta Time is invoked" }, "details": { - "name": "Get Tick Delta Time", - "tooltip": "Gets the latest time between ticks" + "name": "Get Tick Delta Time" }, "results": [ { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", "details": { - "name": "float" + "name": "Delta Time" } } ] @@ -36,21 +34,20 @@ "key": "GetTimeAtCurrentTick", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke Get Time at Current Tick" + "tooltip": "When signaled, this will invoke Get Time At Current Tick" }, "exit": { "name": "Out", - "tooltip": "Signaled after Get Time at Current Tick is invoked" + "tooltip": "Signaled after Get Time At Current Tick is invoked" }, "details": { - "name": "Get Time at Current Tick", - "tooltip": "Gets the time in seconds since the epoch (January 1, 1970)" + "name": "Get Time At Current Tick" }, "results": [ { "typeid": "{4C0F6AD4-0D4F-4354-AD4A-0C01E948245C}", "details": { - "name": "ScriptTimePoint" + "name": "Script Time Point" } } ] diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Nodeables_TimeDelay.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Nodeables_TimeDelay.names index b17bebdcfc..fdf9afb0a1 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Nodeables_TimeDelay.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Nodeables_TimeDelay.names @@ -5,7 +5,7 @@ "context": "ScriptCanvas::Node", "variant": "", "details": { - "name": "TimeDelay", + "name": "Time Delay", "category": "Timing", "tooltip": "Delays all incoming execution for the specified number of ticks" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/String_ToLower.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/String_ToLower.names index 363f234f19..dd50ef41be 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/String_ToLower.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/String_ToLower.names @@ -5,10 +5,9 @@ "context": "ScriptCanvas::Node", "variant": "", "details": { - "name": "ToLower", + "name": "To Lower", "category": "String", - "tooltip": "Makes all the characters in the string lower case", - "subtitle": "String" + "tooltip": "Makes all the characters in the string lower case" }, "slots": [ { @@ -24,15 +23,15 @@ } }, { - "key": "DataInput_String: Source", + "key": "DataInput_Source", "details": { - "name": "String: Source" + "name": "Source" } }, { - "key": "DataOutput_Result: String", + "key": "DataOutput_Result", "details": { - "name": "Result: String" + "name": "Result" } } ] diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/String_ToUpper.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/String_ToUpper.names index 3ee857bff1..e66ac56087 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/String_ToUpper.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/String_ToUpper.names @@ -5,10 +5,9 @@ "context": "ScriptCanvas::Node", "variant": "", "details": { - "name": "ToUpper", + "name": "To Upper", "category": "String", - "tooltip": "Makes all the characters in the string upper case", - "subtitle": "String" + "tooltip": "Makes all the characters in the string upper case" }, "slots": [ { @@ -24,15 +23,15 @@ } }, { - "key": "DataInput_String: Source", + "key": "DataInput_Source", "details": { - "name": "String: Source" + "name": "Source" } }, { - "key": "DataOutput_Result: String", + "key": "DataOutput_Result", "details": { - "name": "Result: String" + "name": "Result" } } ] diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Timing_HeartBeat.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Timing_HeartBeat.names index 3b556a246a..5cc50f1e7d 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Timing_HeartBeat.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Timing_HeartBeat.names @@ -1,14 +1,13 @@ { "entries": [ { - "key": "{BA107060-249D-4818-9CEC-7573718273FC}", + "key": "{E73DB180-A325-763B-A1FE-517B548AF66E}", "context": "ScriptCanvas::Node", "variant": "", "details": { - "name": "HeartBeat", + "name": "Heart Beat", "category": "Timing", - "tooltip": "While active, will signal the output at the given interval.", - "subtitle": "Timing" + "tooltip": "While active, will signal the output at the given interval." }, "slots": [ { @@ -17,6 +16,18 @@ "name": "Start" } }, + { + "key": "DataInput_Interval", + "details": { + "name": "Interval" + } + }, + { + "key": "Output_On Start", + "details": { + "name": "On Start" + } + }, { "key": "Input_Stop", "details": { @@ -24,15 +35,16 @@ } }, { - "key": "Output_Pulse", + "key": "Output_On Stop", "details": { - "name": "Pulse" + "name": "On Stop" } }, { - "key": "DataInput_Interval", + "key": "Output_Pulse", "details": { - "name": "Interval" + "name": "Pulse", + "tooltip": "Signaled at each specified interval." } } ] From 0ecfb1b55724cfa515d41be1a1a2762eadfd8079 Mon Sep 17 00:00:00 2001 From: lsemp3d <58790905+lsemp3d@users.noreply.github.com> Date: Thu, 18 Nov 2021 16:23:55 -0800 Subject: [PATCH 135/345] Fixed file saving path for BehaviorClass generation + more node updates Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com> --- ...Framework__SurfaceData__SurfacePoint.names | 141 ++++++++++++++++++ .../Classes/SurfaceTagWeight.names | 3 +- .../Code/Tools/TranslationGeneration.cpp | 3 +- 3 files changed, 145 insertions(+), 2 deletions(-) create mode 100644 Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AzFramework__SurfaceData__SurfacePoint.names diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AzFramework__SurfaceData__SurfacePoint.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AzFramework__SurfaceData__SurfacePoint.names new file mode 100644 index 0000000000..dfcbac7dad --- /dev/null +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AzFramework__SurfaceData__SurfacePoint.names @@ -0,0 +1,141 @@ +{ + "entries": [ + { + "key": "AzFramework::SurfaceData::SurfacePoint", + "context": "BehaviorClass", + "variant": "", + "details": { + "name": "Surface Point", + "category": "Surface Data" + }, + "methods": [ + { + "key": "Getposition", + "details": { + "name": "Get Position" + }, + "params": [ + { + "typeid": "{331A3D0E-BB1D-47BF-96A2-249FAA0D720D}", + "details": { + "name": "Surface Point" + } + } + ], + "results": [ + { + "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}", + "details": { + "name": "Position" + } + } + ] + }, + { + "key": "Setposition", + "details": { + "name": "Set Position" + }, + "params": [ + { + "typeid": "{331A3D0E-BB1D-47BF-96A2-249FAA0D720D}", + "details": { + "name": "Surface Point" + } + }, + { + "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}", + "details": { + "name": "Position" + } + } + ] + }, + { + "key": "Getnormal", + "details": { + "name": "Get Normal" + }, + "params": [ + { + "typeid": "{331A3D0E-BB1D-47BF-96A2-249FAA0D720D}", + "details": { + "name": "Surface Point" + } + } + ], + "results": [ + { + "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}", + "details": { + "name": "Normal" + } + } + ] + }, + { + "key": "Setnormal", + "details": { + "name": "Set Normal" + }, + "params": [ + { + "typeid": "{331A3D0E-BB1D-47BF-96A2-249FAA0D720D}", + "details": { + "name": "Surface Point" + } + }, + { + "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}", + "details": { + "name": "Normal" + } + } + ] + }, + { + "key": "GetsurfaceTags", + "details": { + "name": "Get Surface Tags" + }, + "params": [ + { + "typeid": "{331A3D0E-BB1D-47BF-96A2-249FAA0D720D}", + "details": { + "name": "Surface Point" + } + } + ], + "results": [ + { + "typeid": "{8F60B4D4-06F0-577C-AFB9-ECBFA7B66D4E}", + "details": { + "name": "Surface Tags" + } + } + ] + }, + { + "key": "SetsurfaceTags", + "details": { + "name": "Set Surface Tags" + }, + "params": [ + { + "typeid": "{331A3D0E-BB1D-47BF-96A2-249FAA0D720D}", + "details": { + "name": "Surface Point" + } + }, + { + "typeid": "{8F60B4D4-06F0-577C-AFB9-ECBFA7B66D4E}", + "details": { + "name": "Surface Tags" + } + } + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SurfaceTagWeight.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SurfaceTagWeight.names index 0f44e4f9c0..0c1b3b7e1d 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SurfaceTagWeight.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SurfaceTagWeight.names @@ -5,7 +5,8 @@ "context": "BehaviorClass", "variant": "", "details": { - "name": "Surface Tag Weight" + "name": "Surface Tag Weight", + "category": "Surface Data" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Code/Tools/TranslationGeneration.cpp b/Gems/ScriptCanvas/Code/Tools/TranslationGeneration.cpp index a0747f78f0..c374f6e5c2 100644 --- a/Gems/ScriptCanvas/Code/Tools/TranslationGeneration.cpp +++ b/Gems/ScriptCanvas/Code/Tools/TranslationGeneration.cpp @@ -327,7 +327,8 @@ namespace ScriptCanvasEditorTools translationRoot.m_entries.push_back(entry); - AZStd::string fileName = AZStd::string::format("Classes/%s", className.c_str()); + AZStd::string sanitizedFilename = GraphCanvas::TranslationKey::Sanitize(className); + AZStd::string fileName = AZStd::string::format("Classes/%s", sanitizedFilename.c_str()); SaveJSONData(fileName, translationRoot); From 49e8f358581dad7ca0e8127905a9d5e864c41cee Mon Sep 17 00:00:00 2001 From: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> Date: Thu, 18 Nov 2021 16:26:49 -0800 Subject: [PATCH 136/345] Creates a deb package (#5567) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * configure/generation working Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> * Generates deb package forLinux Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> * Fixes to EngineFinder Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> * changes the owner of the installed folder so it is writable by the user Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> * jenkins scripts Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> * Fixes execution permission for scripts Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> * Fixes wrong parameter to build for linux Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> * removal of clang parameters in build_config.json Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> * Simplifies and fixes build configs Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> * fixes to EngineFinder Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> * Adds linux deb package upload and small fixes/organization cleanup Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> * fixes checksum generation Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> * Some more small fixes for reviewing Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> * Test if this space is necessary for cpack Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> * More fixes for installer jobs Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> * Adding eval to variables that need to double-expand Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> * Removing unused variables being passed Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> * Do not remove symlink Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> * Use cmake_path for concatenating paths Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> * removing quotes so the variable expands Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> * cleaned up some variables that have way too many ways to be passed Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> * Multiple fixes for Jenkins Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> * Cleanup/re-organization Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> * fixes some temp variables so we can run cpack jenkins jobs locally Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> * Delays cmake download to install step Cleanup on installer_windows.cmd, we already have the path to cpack (same as cmake, which is added to the path) Some simplification in the windows installer generation, we now generate the same even if we dont upload Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> * Fixes mac install Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> * CPack can generate hashes for us Defiine CPACK_OUTPUT_FILE_PREFIX to prevent the exe/msi from ending in the bin dir Remove unnecessary generation of folder from 3rdPartyPacakges which fails when including from cpack Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> * multiple fixes Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> * fixes typo Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> * more fixes Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> * Fixes for linux/mac/windows (fixing discrepancies with Jenkins) Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> * uploads to S3 from the upload directory and fixes the latest upload Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> * Adds ERROR_VARIABLE to S3 upload to find a Jenkins issue Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> * printing command invocation to try to figure out the errors Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> * Changes the hashing algorithm to sha256 and fixes the cmd used to call to pythojn Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> * wrong path being passed in mac Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> * removes compiler parameters from a config job (after rebase) Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> * more fixes fro deb packaging job Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> * small fix for fingerprint patching for latest Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> * Changing extension of public key and leaving better TODO places for code signing Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> * Removes sdl as a dependency, leaving it commented since it is needed for wwise Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> * fixes runtime copy during install, makes it more consistent with regular runtime dependencies and optimizes copy when there is already an install Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> * $ENV{DESTDIR} and CMAKE_INSTALL_PREFIX cannot be used in cmake_path because the CMAKE_INSTALL_PREFIX is absolute Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> * Fixing some runtime_dependencies optimizations, we cannot take size of a bundle Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> * Fixes warning in mac for an unused variable Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> * Fixes a variable that was being passed to fix qt frameworks Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> * More fixes for Jenkins Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> * Updates email to use for maintainer to match certificate Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> * make directory because in some cases the dependency is copied before the actual library and the directory has to be created Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> * Fix for a new warning/error in linux Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> * The sha file is created after the upload happens, so creating it Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> * remove the size comparison for install since it stomps over the copy from the target and doesnt trigger stripping Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> --- AutomatedTesting/CMakeLists.txt | 3 +- AutomatedTesting/cmake/CompilerSettings.cmake | 13 ++ .../{ => cmake}/EngineFinder.cmake | 42 ++++- .../Linux/CompilerSettings_linux.cmake | 0 .../AzCore/Serialization/AZStdContainers.inl | 2 +- .../AzToolsFramework/API/PythonLoader.h | 2 +- .../Template/cmake/CompilerSettings.cmake | 2 +- .../Linux/CompilerSettings_linux.cmake} | 0 Templates/DefaultProject/template.json | 4 +- .../Template/cmake/CompilerSettings.cmake | 2 +- .../Linux/CompilerSettings_linux.cmake | 0 Templates/MinimalProject/template.json | 4 +- cmake/3rdPartyPackages.cmake | 11 +- cmake/CompilerSettings.cmake | 2 +- cmake/Packaging.cmake | 177 +++++------------- cmake/Packaging/CMakeDownload.cmake.in | 54 ++++++ cmake/Platform/Common/Install_common.cmake | 17 +- .../Common/PackagingPostBuild_common.cmake | 114 +++++++++++ .../Common/PackagingPreBuild_common.cmake | 5 + .../runtime_dependencies_common.cmake.in | 1 + .../Linux/CompilerSettings_linux.cmake | 34 ++++ cmake/Platform/Linux/Install_linux.cmake | 29 ++- cmake/Platform/Linux/PAL_linux.cmake | 2 +- cmake/Platform/Linux/Packaging/postinst.in | 21 +++ cmake/Platform/Linux/Packaging/postrm.in | 15 ++ cmake/Platform/Linux/Packaging/prerm.in | 23 +++ .../Linux/PackagingPostBuild_linux.cmake | 62 ++++++ .../Linux/PackagingPreBuild_linux.cmake | 16 ++ cmake/Platform/Linux/Packaging_linux.cmake | 56 ++++++ .../Platform/Linux/platform_linux_files.cmake | 8 + .../Linux/runtime_dependencies_linux.cmake.in | 1 + cmake/Platform/Mac/InstallUtils_mac.cmake.in | 37 ++-- .../Platform/Mac/PackagingPostBuild_mac.cmake | 10 + .../Platform/Mac/PackagingPreBuild_mac.cmake | 10 + .../Mac/runtime_dependencies_mac.cmake.in | 19 +- ...cmake => PackagingPostBuild_windows.cmake} | 139 +++----------- ....cmake => PackagingPreBuild_windows.cmake} | 3 + .../Platform/Windows/Packaging_windows.cmake | 65 +++---- .../Windows/platform_windows_files.cmake | 5 +- .../build/Platform/Linux/build_config.json | 43 +++-- .../Platform/Linux/build_installer_linux.sh | 15 ++ scripts/build/Platform/Linux/build_linux.sh | 8 +- .../build/Platform/Linux/installer_linux.sh | 30 +++ .../build/Platform/Windows/build_config.json | 4 +- .../build/Platform/Windows/build_windows.cmd | 7 - .../build/Platform/Windows/env_windows.cmd | 11 ++ .../Platform/Windows/installer_windows.cmd | 14 +- scripts/build/Platform/iOS/build_config.json | 4 +- .../Linux/package-list.ubuntu-bionic.txt | 2 +- .../Linux/package-list.ubuntu-focal.txt | 2 +- 50 files changed, 771 insertions(+), 379 deletions(-) create mode 100644 AutomatedTesting/cmake/CompilerSettings.cmake rename AutomatedTesting/{ => cmake}/EngineFinder.cmake (63%) rename Templates/DefaultProject/Template/cmake/Platform/Linux/CompilerSettings.cmake => AutomatedTesting/cmake/Platform/Linux/CompilerSettings_linux.cmake (100%) rename Templates/{MinimalProject/Template/cmake/Platform/Linux/CompilerSettings.cmake => DefaultProject/Template/cmake/Platform/Linux/CompilerSettings_linux.cmake} (100%) rename cmake/Platform/Linux/CompilerSettings.cmake => Templates/MinimalProject/Template/cmake/Platform/Linux/CompilerSettings_linux.cmake (100%) create mode 100644 cmake/Packaging/CMakeDownload.cmake.in create mode 100644 cmake/Platform/Common/PackagingPostBuild_common.cmake create mode 100644 cmake/Platform/Common/PackagingPreBuild_common.cmake create mode 100644 cmake/Platform/Linux/CompilerSettings_linux.cmake create mode 100644 cmake/Platform/Linux/Packaging/postinst.in create mode 100644 cmake/Platform/Linux/Packaging/postrm.in create mode 100644 cmake/Platform/Linux/Packaging/prerm.in create mode 100644 cmake/Platform/Linux/PackagingPostBuild_linux.cmake create mode 100644 cmake/Platform/Linux/PackagingPreBuild_linux.cmake create mode 100644 cmake/Platform/Linux/Packaging_linux.cmake create mode 100644 cmake/Platform/Mac/PackagingPostBuild_mac.cmake create mode 100644 cmake/Platform/Mac/PackagingPreBuild_mac.cmake rename cmake/Platform/Windows/{PackagingPostBuild.cmake => PackagingPostBuild_windows.cmake} (52%) rename cmake/Platform/Windows/{PackagingPreBuild.cmake => PackagingPreBuild_windows.cmake} (93%) create mode 100755 scripts/build/Platform/Linux/build_installer_linux.sh create mode 100755 scripts/build/Platform/Linux/installer_linux.sh diff --git a/AutomatedTesting/CMakeLists.txt b/AutomatedTesting/CMakeLists.txt index dee9d73aea..1c5382ba4b 100644 --- a/AutomatedTesting/CMakeLists.txt +++ b/AutomatedTesting/CMakeLists.txt @@ -8,11 +8,12 @@ if(NOT PROJECT_NAME) cmake_minimum_required(VERSION 3.20) + include(cmake/CompilerSettings.cmake) project(AutomatedTesting LANGUAGES C CXX VERSION 1.0.0.0 ) - include(EngineFinder.cmake OPTIONAL) + include(cmake/EngineFinder.cmake OPTIONAL) find_package(o3de REQUIRED) o3de_initialize() else() diff --git a/AutomatedTesting/cmake/CompilerSettings.cmake b/AutomatedTesting/cmake/CompilerSettings.cmake new file mode 100644 index 0000000000..60bda1d45b --- /dev/null +++ b/AutomatedTesting/cmake/CompilerSettings.cmake @@ -0,0 +1,13 @@ +# +# 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 +# +# + +# File to tweak compiler settings before compiler detection happens (before project() is called) +# We dont have PAL enabled at this point, so we can only use pure-CMake variables +if("${CMAKE_HOST_SYSTEM_NAME}" STREQUAL "Linux") + include(cmake/Platform/Linux/CompilerSettings_linux.cmake) +endif() diff --git a/AutomatedTesting/EngineFinder.cmake b/AutomatedTesting/cmake/EngineFinder.cmake similarity index 63% rename from AutomatedTesting/EngineFinder.cmake rename to AutomatedTesting/cmake/EngineFinder.cmake index 0a34a43b77..15b96eb8a9 100644 --- a/AutomatedTesting/EngineFinder.cmake +++ b/AutomatedTesting/cmake/EngineFinder.cmake @@ -1,3 +1,4 @@ +# {BEGIN_LICENSE} # # 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. @@ -5,18 +6,34 @@ # SPDX-License-Identifier: Apache-2.0 OR MIT # # +# {END_LICENSE} # This file is copied during engine registration. Edits to this file will be lost next # time a registration happens. include_guard() # Read the engine name from the project_json file -file(READ ${CMAKE_CURRENT_LIST_DIR}/project.json project_json) -set_property(DIRECTORY APPEND PROPERTY CMAKE_CONFIGURE_DEPENDS ${CMAKE_CURRENT_LIST_DIR}/project.json) +file(READ ${CMAKE_CURRENT_SOURCE_DIR}/project.json project_json) +set_property(DIRECTORY APPEND PROPERTY CMAKE_CONFIGURE_DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/project.json) string(JSON LY_ENGINE_NAME_TO_USE ERROR_VARIABLE json_error GET ${project_json} engine) if(json_error) - message(FATAL_ERROR "Unable to read key 'engine' from 'project.json', error: ${json_error}") + message(FATAL_ERROR "Unable to read key 'engine' from 'project.json'\nError: ${json_error}") +endif() + +if(CMAKE_MODULE_PATH) + foreach(module_path ${CMAKE_MODULE_PATH}) + if(EXISTS ${module_path}/Findo3de.cmake) + file(READ ${module_path}/../engine.json engine_json) + string(JSON engine_name ERROR_VARIABLE json_error GET ${engine_json} engine_name) + if(json_error) + message(FATAL_ERROR "Unable to read key 'engine_name' from 'engine.json'\nError: ${json_error}") + endif() + if(LY_ENGINE_NAME_TO_USE STREQUAL engine_name) + return() # Engine being forced through CMAKE_MODULE_PATH + endif() + endif() + endforeach() endif() if(DEFINED ENV{USERPROFILE} AND EXISTS $ENV{USERPROFILE}) @@ -25,6 +42,11 @@ else() set(manifest_path $ENV{HOME}/.o3de/o3de_manifest.json) # Unix endif() +set(registration_error [=[ +Engine registration is required before configuring a project. +Run 'scripts/o3de register --this-engine' from the engine root. +]=]) + # Read the ~/.o3de/o3de_manifest.json file and look through the 'engines_path' object. # Find a key that matches LY_ENGINE_NAME_TO_USE and use that as the engine path. if(EXISTS ${manifest_path}) @@ -33,36 +55,38 @@ if(EXISTS ${manifest_path}) string(JSON engines_path_count ERROR_VARIABLE json_error LENGTH ${manifest_json} engines_path) if(json_error) - message(FATAL_ERROR "Unable to read key 'engines_path' from '${manifest_path}', error: ${json_error}") + message(FATAL_ERROR "Unable to read key 'engines_path' from '${manifest_path}'\nError: ${json_error}\n${registration_error}") endif() string(JSON engines_path_type ERROR_VARIABLE json_error TYPE ${manifest_json} engines_path) if(json_error OR NOT ${engines_path_type} STREQUAL "OBJECT") - message(FATAL_ERROR "Type of 'engines_path' in '${manifest_path}' is not a JSON Object, error: ${json_error}") + message(FATAL_ERROR "Type of 'engines_path' in '${manifest_path}' is not a JSON Object\nError: ${json_error}") endif() math(EXPR engines_path_count "${engines_path_count}-1") foreach(engine_path_index RANGE ${engines_path_count}) string(JSON engine_name ERROR_VARIABLE json_error MEMBER ${manifest_json} engines_path ${engine_path_index}) if(json_error) - message(FATAL_ERROR "Unable to read 'engines_path/${engine_path_index}' from '${manifest_path}', error: ${json_error}") + message(FATAL_ERROR "Unable to read 'engines_path/${engine_path_index}' from '${manifest_path}'\nError: ${json_error}") endif() if(LY_ENGINE_NAME_TO_USE STREQUAL engine_name) string(JSON engine_path ERROR_VARIABLE json_error GET ${manifest_json} engines_path ${engine_name}) if(json_error) - message(FATAL_ERROR "Unable to read value from 'engines_path/${engine_name}', error: ${json_error}") + message(FATAL_ERROR "Unable to read value from 'engines_path/${engine_name}'\nError: ${json_error}") endif() if(engine_path) list(APPEND CMAKE_MODULE_PATH "${engine_path}/cmake") - break() + return() endif() endif() endforeach() + + message(FATAL_ERROR "The project.json uses engine name '${LY_ENGINE_NAME_TO_USE}' but no engine with that name has been registered.\n${registration_error}") else() # If the user is passing CMAKE_MODULE_PATH we assume thats where we will find the engine if(NOT CMAKE_MODULE_PATH) - message(FATAL_ERROR "Engine registration is required before configuring a project. Please register an engine by running 'scripts/o3de register --this-engine'") + message(FATAL_ERROR "O3DE Manifest file not found.\n${registration_error}") endif() endif() diff --git a/Templates/DefaultProject/Template/cmake/Platform/Linux/CompilerSettings.cmake b/AutomatedTesting/cmake/Platform/Linux/CompilerSettings_linux.cmake similarity index 100% rename from Templates/DefaultProject/Template/cmake/Platform/Linux/CompilerSettings.cmake rename to AutomatedTesting/cmake/Platform/Linux/CompilerSettings_linux.cmake diff --git a/Code/Framework/AzCore/AzCore/Serialization/AZStdContainers.inl b/Code/Framework/AzCore/AzCore/Serialization/AZStdContainers.inl index 92d295cf08..a633af22da 100644 --- a/Code/Framework/AzCore/AzCore/Serialization/AZStdContainers.inl +++ b/Code/Framework/AzCore/AzCore/Serialization/AZStdContainers.inl @@ -89,7 +89,7 @@ namespace AZ template AZStd::enable_if_t::value> InitializeDefaultIfPodType(T& t) { - t = {}; + t = T{}; } template diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/API/PythonLoader.h b/Code/Framework/AzToolsFramework/AzToolsFramework/API/PythonLoader.h index 29125667d6..6acc160ddc 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/API/PythonLoader.h +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/API/PythonLoader.h @@ -19,7 +19,7 @@ namespace AzToolsFramework::EmbeddedPython ~PythonLoader(); private: - void* m_embeddedLibPythonHandle{ nullptr }; + [[maybe_unused]] void* m_embeddedLibPythonHandle{ nullptr }; }; } // namespace AzToolsFramework::EmbeddedPython diff --git a/Templates/DefaultProject/Template/cmake/CompilerSettings.cmake b/Templates/DefaultProject/Template/cmake/CompilerSettings.cmake index cf6614e4a5..60bda1d45b 100644 --- a/Templates/DefaultProject/Template/cmake/CompilerSettings.cmake +++ b/Templates/DefaultProject/Template/cmake/CompilerSettings.cmake @@ -9,5 +9,5 @@ # File to tweak compiler settings before compiler detection happens (before project() is called) # We dont have PAL enabled at this point, so we can only use pure-CMake variables if("${CMAKE_HOST_SYSTEM_NAME}" STREQUAL "Linux") - include(cmake/Platform/${CMAKE_HOST_SYSTEM_NAME}/CompilerSettings.cmake) + include(cmake/Platform/Linux/CompilerSettings_linux.cmake) endif() diff --git a/Templates/MinimalProject/Template/cmake/Platform/Linux/CompilerSettings.cmake b/Templates/DefaultProject/Template/cmake/Platform/Linux/CompilerSettings_linux.cmake similarity index 100% rename from Templates/MinimalProject/Template/cmake/Platform/Linux/CompilerSettings.cmake rename to Templates/DefaultProject/Template/cmake/Platform/Linux/CompilerSettings_linux.cmake diff --git a/Templates/DefaultProject/template.json b/Templates/DefaultProject/template.json index a36926f632..fcffafcb34 100644 --- a/Templates/DefaultProject/template.json +++ b/Templates/DefaultProject/template.json @@ -193,8 +193,8 @@ "isOptional": false }, { - "file": "cmake/Platform/Linux/CompilerSettings.cmake", - "origin": "cmake/Platform/Linux/CompilerSettings.cmake", + "file": "cmake/Platform/Linux/CompilerSettings_linux.cmake", + "origin": "cmake/Platform/Linux/CompilerSettings_linux.cmake", "isTemplated": false, "isOptional": false }, diff --git a/Templates/MinimalProject/Template/cmake/CompilerSettings.cmake b/Templates/MinimalProject/Template/cmake/CompilerSettings.cmake index cf6614e4a5..60bda1d45b 100644 --- a/Templates/MinimalProject/Template/cmake/CompilerSettings.cmake +++ b/Templates/MinimalProject/Template/cmake/CompilerSettings.cmake @@ -9,5 +9,5 @@ # File to tweak compiler settings before compiler detection happens (before project() is called) # We dont have PAL enabled at this point, so we can only use pure-CMake variables if("${CMAKE_HOST_SYSTEM_NAME}" STREQUAL "Linux") - include(cmake/Platform/${CMAKE_HOST_SYSTEM_NAME}/CompilerSettings.cmake) + include(cmake/Platform/Linux/CompilerSettings_linux.cmake) endif() diff --git a/cmake/Platform/Linux/CompilerSettings.cmake b/Templates/MinimalProject/Template/cmake/Platform/Linux/CompilerSettings_linux.cmake similarity index 100% rename from cmake/Platform/Linux/CompilerSettings.cmake rename to Templates/MinimalProject/Template/cmake/Platform/Linux/CompilerSettings_linux.cmake diff --git a/Templates/MinimalProject/template.json b/Templates/MinimalProject/template.json index 4260e71527..7d6a4f9b94 100644 --- a/Templates/MinimalProject/template.json +++ b/Templates/MinimalProject/template.json @@ -185,8 +185,8 @@ "isOptional": false }, { - "file": "cmake/Platform/Linux/CompilerSettings.cmake", - "origin": "cmake/Platform/Linux/CompilerSettings.cmake", + "file": "cmake/Platform/Linux/CompilerSettings_linux.cmake", + "origin": "cmake/Platform/Linux/CompilerSettings_linux.cmake", "isTemplated": false, "isOptional": false }, diff --git a/cmake/3rdPartyPackages.cmake b/cmake/3rdPartyPackages.cmake index efe67b4d24..a3f15bdb22 100644 --- a/cmake/3rdPartyPackages.cmake +++ b/cmake/3rdPartyPackages.cmake @@ -7,7 +7,7 @@ include_guard() -include(cmake/LySet.cmake) +include(${LY_ROOT_FOLDER}/cmake/LySet.cmake) # OVERVIEW: # this is the Open 3D Engine Package system. @@ -80,10 +80,7 @@ macro(ly_package_message) endif() endmacro() -file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/packages) - -include(cmake/LYPackage_S3Downloader.cmake) - +include(${LY_ROOT_FOLDER}/cmake/LYPackage_S3Downloader.cmake) # Attempts one time to download a file. # sets should_retry to true if the caller should retry due to an intermittent problem @@ -711,11 +708,11 @@ if (NOT CMAKE_SCRIPT_MODE_FILE) # include the built in 3rd party packages that are for every platform. # you can put your package associations anywhere, but this provides # a good starting point. - include(cmake/3rdParty/BuiltInPackages.cmake) + include(${LY_ROOT_FOLDER}/cmake/3rdParty/BuiltInPackages.cmake) endif() if(PAL_TRAIT_BUILD_HOST_TOOLS) - include(cmake/LYWrappers.cmake) + include(${LY_ROOT_FOLDER}/cmake/LYWrappers.cmake) # Importing this globally to handle AUTOMOC, AUTOUIC, AUTORCC ly_parse_third_party_dependencies(3rdParty::Qt) endif() diff --git a/cmake/CompilerSettings.cmake b/cmake/CompilerSettings.cmake index cf6614e4a5..60bda1d45b 100644 --- a/cmake/CompilerSettings.cmake +++ b/cmake/CompilerSettings.cmake @@ -9,5 +9,5 @@ # File to tweak compiler settings before compiler detection happens (before project() is called) # We dont have PAL enabled at this point, so we can only use pure-CMake variables if("${CMAKE_HOST_SYSTEM_NAME}" STREQUAL "Linux") - include(cmake/Platform/${CMAKE_HOST_SYSTEM_NAME}/CompilerSettings.cmake) + include(cmake/Platform/Linux/CompilerSettings_linux.cmake) endif() diff --git a/cmake/Packaging.cmake b/cmake/Packaging.cmake index 6a1e2d8cef..d716efb225 100644 --- a/cmake/Packaging.cmake +++ b/cmake/Packaging.cmake @@ -24,18 +24,23 @@ number will automatically appended as '/'. If LY_INSTALLER_AUTO_ full URL format will be: //" ) -set(LY_INSTALLER_UPLOAD_URL "" CACHE STRING -"Base URL used to upload the installer artifacts after generation, the host target and version number \ -will automatically appended as '/'. If LY_INSTALLER_AUTO_GEN_TAG is set, the full URL \ -format will be: //. Can also be set via LY_INSTALLER_UPLOAD_URL environment \ -variable. Currently only accepts S3 URLs e.g. s3:///" +set(CPACK_UPLOAD_URL "" CACHE STRING +"URL used to upload the installer artifacts after generation, the host target and version number \ +will automatically appended as '/'. If LY_INSTALLER_AUTO_GEN_TAG is set, the full URL \ +format will be: //. Currently only accepts S3 URLs e.g. s3:///" ) -set(LY_INSTALLER_AWS_PROFILE "" CACHE STRING -"AWS CLI profile for uploading artifacts. Can also be set via LY_INSTALLER_AWS_PROFILE environment variable." +set(CPACK_AWS_PROFILE "" CACHE STRING +"AWS CLI profile for uploading artifacts." ) +set(CPACK_THREADS 0) set(CPACK_DESIRED_CMAKE_VERSION 3.20.2) +if(${CPACK_DESIRED_CMAKE_VERSION} VERSION_LESS ${CMAKE_MINIMUM_REQUIRED_VERSION}) + message(FATAL_ERROR + "The desired version of CMake to be included in the package is " + "below the minimum required version of CMake to run") +endif() # set all common cpack variable overrides first so they can be accessible via configure_file # when the platform specific settings are applied below. additionally, any variable with @@ -44,15 +49,16 @@ set(CPACK_DESIRED_CMAKE_VERSION 3.20.2) set(CPACK_PACKAGE_NAME "${PROJECT_NAME}") set(CPACK_PACKAGE_FULL_NAME "Open3D Engine") set(CPACK_PACKAGE_VENDOR "O3DE Binary Project a Series of LF Projects, LLC") +set(CPACK_PACKAGE_CONTACT "info@o3debinaries.org") set(CPACK_PACKAGE_VERSION "${LY_VERSION_STRING}") set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Installation Tool") string(TOLOWER "${CPACK_PACKAGE_NAME}_${CPACK_PACKAGE_VERSION}" CPACK_PACKAGE_FILE_NAME) set(DEFAULT_LICENSE_NAME "Apache-2.0") -set(DEFAULT_LICENSE_FILE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE.txt") -set(CPACK_RESOURCE_FILE_LICENSE ${DEFAULT_LICENSE_FILE}) +set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE.txt") +set(CPACK_RESOURCE_FILE_README "${CMAKE_CURRENT_SOURCE_DIR}/README.md") set(CPACK_LICENSE_URL ${LY_INSTALLER_LICENSE_URL}) set(CPACK_PACKAGE_INSTALL_DIRECTORY "${CPACK_PACKAGE_NAME}/${CPACK_PACKAGE_VERSION}") @@ -60,6 +66,7 @@ set(CPACK_PACKAGE_INSTALL_DIRECTORY "${CPACK_PACKAGE_NAME}/${CPACK_PACKAGE_VERSI # neither of the SOURCE_DIR variables equate to anything during execution of pre/post build scripts set(CPACK_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/cmake) set(CPACK_BINARY_DIR ${CMAKE_BINARY_DIR}/_CPack) # to match other CPack out dirs +set(CPACK_OUTPUT_FILE_PREFIX CPackUploads) # this config file allows the dynamic setting of cpack variables at cpack-time instead of cmake configure set(CPACK_PROJECT_CONFIG_FILE ${CPACK_SOURCE_DIR}/PackagingConfig.cmake) @@ -74,132 +81,37 @@ if(NOT CPACK_GENERATOR) return() endif() -if(${CPACK_DESIRED_CMAKE_VERSION} VERSION_LESS ${CMAKE_MINIMUM_REQUIRED_VERSION}) - message(FATAL_ERROR - "The desired version of CMake to be included in the package is " - "below the minimum required version of CMake to run") -endif() - -# pull down the desired copy of CMake so it can be included in the package +# We will download the desired copy of CMake so it can be included in the package, we defer the downloading +# to the install process, to do so we generate a script that will perform the download and execute such script +# during the install process (before packaging) if(NOT (CPACK_CMAKE_PACKAGE_FILE AND CPACK_CMAKE_PACKAGE_HASH)) message(FATAL_ERROR "Packaging is missing one or more following properties required to include CMake: " " CPACK_CMAKE_PACKAGE_FILE, CPACK_CMAKE_PACKAGE_HASH") endif() -set(_cmake_package_dest ${CPACK_BINARY_DIR}/${CPACK_CMAKE_PACKAGE_FILE}) +# We download it to a different location because CPACK_PACKAGING_INSTALL_PREFIX will be removed during +# cpack generation. CPACK_BINARY_DIR persists across cpack invocations +set(LY_CMAKE_PACKAGE_DOWNLOAD_PATH ${CPACK_BINARY_DIR}/${CPACK_CMAKE_PACKAGE_FILE}) -if(EXISTS ${_cmake_package_dest}) - file(SHA256 ${_cmake_package_dest} hash_of_downloaded_file) - if (NOT "${hash_of_downloaded_file}" STREQUAL "${CPACK_CMAKE_PACKAGE_HASH}") - message(STATUS "CMake ${CPACK_DESIRED_CMAKE_VERSION} found at ${_cmake_package_dest} but expected hash missmatches, re-downloading...") - file(REMOVE ${_cmake_package_dest}) - else() - message(STATUS "CMake ${CPACK_DESIRED_CMAKE_VERSION} found") - endif() -endif() -if(NOT EXISTS ${_cmake_package_dest}) - # download it - string(REPLACE "." ";" _version_componets "${CPACK_DESIRED_CMAKE_VERSION}") - list(GET _version_componets 0 _major_version) - list(GET _version_componets 1 _minor_version) - - set(_url_version_tag "v${_major_version}.${_minor_version}") - set(_package_url "https://cmake.org/files/${_url_version_tag}/${CPACK_CMAKE_PACKAGE_FILE}") - - message(STATUS "Downloading CMake ${CPACK_DESIRED_CMAKE_VERSION} for packaging...") - download_file( - URL ${_package_url} - TARGET_FILE ${_cmake_package_dest} - EXPECTED_HASH ${CPACK_CMAKE_PACKAGE_HASH} - RESULTS _results - ) - list(GET _results 0 _status_code) - - if (${_status_code} EQUAL 0 AND EXISTS ${_cmake_package_dest}) - message(STATUS "CMake ${CPACK_DESIRED_CMAKE_VERSION} found") - else() - file(REMOVE ${_cmake_package_dest}) - list(REMOVE_AT _results 0) - - set(_error_message "An error occurred, code ${_status_code}. URL ${_package_url} - ${_results}") - - if(${_status_code} EQUAL 1) - string(APPEND _error_message - " Please double check the CPACK_CMAKE_PACKAGE_FILE and " - "CPACK_CMAKE_PACKAGE_HASH properties before trying again.") - endif() - - message(FATAL_ERROR ${_error_message}) - endif() -endif() - -ly_install(FILES ${_cmake_package_dest} - DESTINATION ./Tools/Redistributables/CMake +configure_file(${LY_ROOT_FOLDER}/cmake/Packaging/CMakeDownload.cmake.in + ${CPACK_BINARY_DIR}/CMakeDownload.cmake + @ONLY +) +ly_install(SCRIPT ${CPACK_BINARY_DIR}/CMakeDownload.cmake + COMPONENT ${CMAKE_INSTALL_DEFAULT_COMPONENT_NAME} +) +ly_install(FILES ${LY_CMAKE_PACKAGE_DOWNLOAD_PATH} + DESTINATION Tools/Redistributables/CMake COMPONENT ${CMAKE_INSTALL_DEFAULT_COMPONENT_NAME} ) -# the version string and git tags are intended to be synchronized so it should be safe to use that instead -# of directly calling into git which could get messy in certain scenarios -if(${CPACK_PACKAGE_VERSION} VERSION_GREATER "0.0.0.0") - set(_3rd_party_license_filename NOTICES.txt) - - set(_3rd_party_license_url "https://raw.githubusercontent.com/o3de/3p-package-source/${CPACK_PACKAGE_VERSION}/${_3rd_party_license_filename}") - set(_3rd_party_license_dest ${CPACK_BINARY_DIR}/${_3rd_party_license_filename}) - - # use the plain file downloader as we don't have the file hash available and using a dummy will - # delete the file once it fails hash verification - file(DOWNLOAD - ${_3rd_party_license_url} - ${_3rd_party_license_dest} - STATUS _status - TLS_VERIFY ON - ) - list(POP_FRONT _status _status_code) - - if (${_status_code} EQUAL 0 AND EXISTS ${_3rd_party_license_dest}) - ly_install(FILES ${_3rd_party_license_dest} - DESTINATION . - COMPONENT ${CMAKE_INSTALL_DEFAULT_COMPONENT_NAME} - ) - else() - file(REMOVE ${_3rd_party_license_dest}) - message(FATAL_ERROR "Failed to acquire the 3rd Party license manifest file at ${_3rd_party_license_url}. Error: ${_status}") - endif() -endif() - -# checks for and removes trailing slash -function(strip_trailing_slash in_url out_url) - string(LENGTH ${in_url} _url_length) - MATH(EXPR _url_length "${_url_length}-1") - - string(SUBSTRING ${in_url} 0 ${_url_length} _clean_url) - if("${in_url}" STREQUAL "${_clean_url}/") - set(${out_url} ${_clean_url} PARENT_SCOPE) - else() - set(${out_url} ${in_url} PARENT_SCOPE) - endif() -endfunction() - -if(NOT LY_INSTALLER_UPLOAD_URL AND DEFINED ENV{LY_INSTALLER_UPLOAD_URL}) - set(LY_INSTALLER_UPLOAD_URL $ENV{LY_INSTALLER_UPLOAD_URL}) -endif() - -if(LY_INSTALLER_UPLOAD_URL) - ly_is_s3_url(${LY_INSTALLER_UPLOAD_URL} _is_s3_bucket) - if(NOT _is_s3_bucket) - message(FATAL_ERROR "Only S3 installer uploading is supported at this time") - endif() - - if (LY_INSTALLER_AWS_PROFILE) - set(CPACK_AWS_PROFILE ${LY_INSTALLER_AWS_PROFILE}) - elseif (DEFINED ENV{LY_INSTALLER_AWS_PROFILE}) - set(CPACK_AWS_PROFILE $ENV{LY_INSTALLER_AWS_PROFILE}) - endif() - - strip_trailing_slash(${LY_INSTALLER_UPLOAD_URL} LY_INSTALLER_UPLOAD_URL) - set(CPACK_UPLOAD_URL ${LY_INSTALLER_UPLOAD_URL}) -endif() +# Set common CPACK variables to all platforms/generators +set(CPACK_STRIP_FILES TRUE) # always strip symbols on packaging +set(CPACK_PACKAGE_CHECKSUM SHA256) # Generate checksum file +set(CPACK_PRE_BUILD_SCRIPTS ${pal_dir}/PackagingPreBuild_${PAL_HOST_PLATFORM_NAME_LOWERCASE}.cmake) +set(CPACK_POST_BUILD_SCRIPTS ${pal_dir}/PackagingPostBuild_${PAL_HOST_PLATFORM_NAME_LOWERCASE}.cmake) +set(CPACK_LY_PYTHON_CMD ${LY_PYTHON_CMD}) # IMPORTANT: required to be included AFTER setting all property overrides include(CPack REQUIRED) @@ -268,13 +180,26 @@ foreach(external_dir ${LY_INSTALL_EXTERNAL_BUILD_DIRS}) ) endforeach() +# checks for and removes trailing slash +function(strip_trailing_slash in_url out_url) + string(LENGTH ${in_url} _url_length) + MATH(EXPR _url_length "${_url_length}-1") + + string(SUBSTRING ${in_url} 0 ${_url_length} _clean_url) + if("${in_url}" STREQUAL "${_clean_url}/") + set(${out_url} ${_clean_url} PARENT_SCOPE) + else() + set(${out_url} ${in_url} PARENT_SCOPE) + endif() +endfunction() + if(LY_INSTALLER_DOWNLOAD_URL) strip_trailing_slash(${LY_INSTALLER_DOWNLOAD_URL} LY_INSTALLER_DOWNLOAD_URL) # this will set the following variables: CPACK_DOWNLOAD_SITE, CPACK_DOWNLOAD_ALL, and CPACK_UPLOAD_DIRECTORY (local) cpack_configure_downloads( ${LY_INSTALLER_DOWNLOAD_URL} - UPLOAD_DIRECTORY ${CMAKE_BINARY_DIR}/_CPack_Uploads # to match the _CPack_Packages directory + UPLOAD_DIRECTORY ${CMAKE_BINARY_DIR}/CPackUploads # to match the _CPack_Packages directory ALL ) endif() diff --git a/cmake/Packaging/CMakeDownload.cmake.in b/cmake/Packaging/CMakeDownload.cmake.in new file mode 100644 index 0000000000..e84611b354 --- /dev/null +++ b/cmake/Packaging/CMakeDownload.cmake.in @@ -0,0 +1,54 @@ +# +# 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 +# +# + +set(LY_ROOT_FOLDER "@LY_ROOT_FOLDER@") +set(CMAKE_SCRIPT_MODE_FILE TRUE) +include(@LY_ROOT_FOLDER@/cmake/3rdPartyPackages.cmake) + +if(EXISTS "@LY_CMAKE_PACKAGE_DOWNLOAD_PATH@") + file(SHA256 "@LY_CMAKE_PACKAGE_DOWNLOAD_PATH@" hash_of_downloaded_file) + if (NOT "${hash_of_downloaded_file}" STREQUAL "@CPACK_CMAKE_PACKAGE_HASH@") + message(STATUS "CMake @CPACK_DESIRED_CMAKE_VERSION@ found at @LY_CMAKE_PACKAGE_DOWNLOAD_PATH@ but expected hash missmatches, re-downloading...") + file(REMOVE "@LY_CMAKE_PACKAGE_DOWNLOAD_PATH@") + else() + message(STATUS "CMake @CPACK_DESIRED_CMAKE_VERSION@ found") + endif() +endif() +if(NOT EXISTS "@LY_CMAKE_PACKAGE_DOWNLOAD_PATH@") + # download it + string(REPLACE "." ";" _version_components "@CPACK_DESIRED_CMAKE_VERSION@") + list(GET _version_components 0 _major_version) + list(GET _version_components 1 _minor_version) + + set(_url_version_tag "v${_major_version}.${_minor_version}") + set(_package_url "https://cmake.org/files/${_url_version_tag}/@CPACK_CMAKE_PACKAGE_FILE@") + + message(STATUS "Downloading CMake @CPACK_DESIRED_CMAKE_VERSION@ for packaging...") + download_file( + URL ${_package_url} + TARGET_FILE @LY_CMAKE_PACKAGE_DOWNLOAD_PATH@ + EXPECTED_HASH @CPACK_CMAKE_PACKAGE_HASH@ + RESULTS _results + ) + list(GET _results 0 _status_code) + + if (${_status_code} EQUAL 0 AND EXISTS "@LY_CMAKE_PACKAGE_DOWNLOAD_PATH@") + message(STATUS "CMake @CPACK_DESIRED_CMAKE_VERSION@ found") + else() + file(REMOVE "@LY_CMAKE_PACKAGE_DOWNLOAD_PATH@") + list(REMOVE_AT _results 0) + + set(_error_message "An error occurred, code ${_status_code}. URL ${_package_url} - ${_results}") + if(${_status_code} EQUAL 1) + string(APPEND _error_message + " Please double check the CPACK_CMAKE_PACKAGE_FILE and " + "CPACK_CMAKE_PACKAGE_HASH properties before trying again.") + endif() + message(FATAL_ERROR ${_error_message}) + endif() +endif() diff --git a/cmake/Platform/Common/Install_common.cmake b/cmake/Platform/Common/Install_common.cmake index 7904bbe611..1b41036311 100644 --- a/cmake/Platform/Common/Install_common.cmake +++ b/cmake/Platform/Common/Install_common.cmake @@ -569,9 +569,13 @@ function(ly_setup_runtime_dependencies) string(TOUPPER ${conf} UCONF) ly_install(CODE "function(ly_copy source_file target_directory) - cmake_path(GET source_file FILENAME file_name) - if(NOT EXISTS \${target_directory}/\${file_name}) - file(COPY \"\${source_file}\" DESTINATION \"\${target_directory}\" FILE_PERMISSIONS ${LY_COPY_PERMISSIONS}) + cmake_path(GET source_file FILENAME target_filename) + cmake_path(APPEND full_target_directory \"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}\" \"\${target_directory}\") + cmake_path(APPEND target_file \"\${full_target_directory}\" \"\${target_filename}\") + if(\"\${source_file}\" IS_NEWER_THAN \"\${target_file}\") + message(STATUS \"Copying \${source_file} to \${full_target_directory}...\") + file(COPY \"\${source_file}\" DESTINATION \"\${full_target_directory}\" FILE_PERMISSIONS ${LY_COPY_PERMISSIONS} FOLLOW_SYMLINK_CHAIN) + file(TOUCH_NOCREATE \"${target_file}\") endif() endfunction()" COMPONENT ${LY_INSTALL_PERMUTATION_COMPONENT}_${UCONF} @@ -596,12 +600,7 @@ endfunction()" endif() # runtime dependencies that need to be copied to the output - # Anywhere CMAKE_INSTALL_PREFIX is used, it has to be escaped so it is baked into the cmake_install.cmake script instead - # of baking the path. This is needed so `cmake --install --prefix ` works regardless of the CMAKE_INSTALL_PREFIX - # used to generate the solution. - # CMAKE_INSTALL_PREFIX is still used when building the INSTALL target - set(install_output_folder "\${CMAKE_INSTALL_PREFIX}/${runtime_output_directory}") - set(target_file_dir "${install_output_folder}/${target_runtime_output_subdirectory}") + set(target_file_dir "${runtime_output_directory}/${target_runtime_output_subdirectory}") ly_get_runtime_dependencies(runtime_dependencies ${target}) foreach(runtime_dependency ${runtime_dependencies}) unset(runtime_command) diff --git a/cmake/Platform/Common/PackagingPostBuild_common.cmake b/cmake/Platform/Common/PackagingPostBuild_common.cmake new file mode 100644 index 0000000000..6e3c7ddf0b --- /dev/null +++ b/cmake/Platform/Common/PackagingPostBuild_common.cmake @@ -0,0 +1,114 @@ +# +# 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 +# +# + +message(STATUS "Executing packaging postbuild...") + +# ly_is_s3_url +# if the given URL is a s3 url of thr form "s3://(stuff)" then sets +# the output_variable_name to TRUE otherwise unsets it. +function (ly_is_s3_url download_url output_variable_name) + if ("${download_url}" MATCHES "s3://.*") + set(${output_variable_name} TRUE PARENT_SCOPE) + else() + unset(${output_variable_name} PARENT_SCOPE) + endif() +endfunction() + +function(ly_upload_to_url in_url in_local_path in_file_regex) + + message(STATUS "Uploading ${in_local_path}/${in_file_regex} artifacts to ${CPACK_UPLOAD_URL}") + ly_is_s3_url(${in_url} _is_s3_bucket) + if(NOT _is_s3_bucket) + message(FATAL_ERROR "Only S3 installer uploading is supported at this time") + endif() + + # strip the scheme and extract the bucket/key prefix from the URL + string(REPLACE "s3://" "" _stripped_url ${in_url}) + string(REPLACE "/" ";" _tokens ${_stripped_url}) + + list(POP_FRONT _tokens _bucket) + string(JOIN "/" _prefix ${_tokens}) + + set(_extra_args [[{"ACL":"bucket-owner-full-control"}]]) + + file(TO_NATIVE_PATH "${LY_ROOT_FOLDER}/scripts/build/tools/upload_to_s3.py" _upload_script) + + set(_upload_command + ${CPACK_LY_PYTHON_CMD} -s + -u ${_upload_script} + --base_dir ${in_local_path} + --file_regex="${in_file_regex}" + --bucket ${_bucket} + --key_prefix ${_prefix} + --extra_args ${_extra_args} + ) + + if(CPACK_AWS_PROFILE) + list(APPEND _upload_command --profile ${CPACK_AWS_PROFILE}) + endif() + + execute_process( + COMMAND ${_upload_command} + RESULT_VARIABLE _upload_result + OUTPUT_VARIABLE _upload_output + ERROR_VARIABLE _upload_error + OUTPUT_STRIP_TRAILING_WHITESPACE + ) + + if (${_upload_result} EQUAL 0) + message(STATUS "Artifact uploading complete!") + else() + message(FATAL_ERROR "An error occurred uploading to s3.\n Output: ${_upload_output}\n\ Error: ${_upload_error}") + endif() +endfunction() + +function(ly_upload_to_latest in_url in_path) + + message(STATUS "Updating latest tagged build") + + # make sure we can extra the commit info from the URL first + string(REGEX MATCH "([0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]-[0-9a-zA-Z]+)" + commit_info ${in_url} + ) + if(NOT commit_info) + message(FATAL_ERROR "Failed to extract the build tag") + endif() + + # Create a temp directory where we are going to rename the file to take out the version + # and then upload it + set(temp_dir ${CPACK_BINARY_DIR}/temp) + if(NOT EXISTS ${temp_dir}) + file(MAKE_DIRECTORY ${temp_dir}) + endif() + file(COPY ${in_path} DESTINATION ${temp_dir}) + + cmake_path(GET in_path FILENAME in_path_filename) + string(REPLACE "_${CPACK_PACKAGE_VERSION}" "" non_versioned_in_path_filename ${in_path_filename}) + file(RENAME "${temp_dir}/${in_path_filename}" "${temp_dir}/${non_versioned_in_path_filename}") + + # include the commit info in a text file that will live next to the exe + set(_temp_info_file ${temp_dir}/build_tag.txt) + file(WRITE ${_temp_info_file} ${commit_info}) + + # update the URL and upload + string(REPLACE + ${commit_info} "Latest" + latest_upload_url ${in_url} + ) + + ly_upload_to_url( + ${latest_upload_url} + ${temp_dir} + ".*(${non_versioned_in_path_filename}|build_tag.txt)$" + ) + + # cleanup the temp files + file(REMOVE_RECURSE ${temp_dir}) + message(STATUS "Latest build update complete!") + +endfunction() \ No newline at end of file diff --git a/cmake/Platform/Common/PackagingPreBuild_common.cmake b/cmake/Platform/Common/PackagingPreBuild_common.cmake new file mode 100644 index 0000000000..e6b8a7796e --- /dev/null +++ b/cmake/Platform/Common/PackagingPreBuild_common.cmake @@ -0,0 +1,5 @@ +# For complete copyright and license terms please see the LICENSE at the root of this distribution. +# +# SPDX-License-Identifier: Apache-2.0 OR MIT +# +# diff --git a/cmake/Platform/Common/runtime_dependencies_common.cmake.in b/cmake/Platform/Common/runtime_dependencies_common.cmake.in index 263111903e..8717710a3b 100644 --- a/cmake/Platform/Common/runtime_dependencies_common.cmake.in +++ b/cmake/Platform/Common/runtime_dependencies_common.cmake.in @@ -22,6 +22,7 @@ function(ly_copy source_file target_directory) endif() if((NOT source_file_size EQUAL target_file_size) OR "${source_file}" IS_NEWER_THAN "${target_file}") message(STATUS "Copying \"${source_file}\" to \"${target_directory}\"...") + file(MAKE_DIRECTORY "${full_target_directory}") file(COPY "${source_file}" DESTINATION "${target_directory}" FILE_PERMISSIONS @LY_COPY_PERMISSIONS@ FOLLOW_SYMLINK_CHAIN) file(TOUCH_NOCREATE ${target_file}) endif() diff --git a/cmake/Platform/Linux/CompilerSettings_linux.cmake b/cmake/Platform/Linux/CompilerSettings_linux.cmake new file mode 100644 index 0000000000..9bb629c53b --- /dev/null +++ b/cmake/Platform/Linux/CompilerSettings_linux.cmake @@ -0,0 +1,34 @@ +# +# 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 +# +# + +if(NOT CMAKE_C_COMPILER AND NOT CMAKE_CXX_COMPILER AND NOT "$ENV{CC}" AND NOT "$ENV{CXX}") + set(path_search + /bin + /usr/bin + /usr/local/bin + /sbin + /usr/sbin + /usr/local/sbin + ) + list(TRANSFORM path_search APPEND "/clang-[0-9]*") + file(GLOB clang_versions ${path_search}) + if(clang_versions) + # Find and pick the highest installed version + list(SORT clang_versions COMPARE NATURAL) + list(GET clang_versions 0 clang_higher_version_path) + string(REGEX MATCH "clang-([0-9.]*)" clang_higher_version ${clang_higher_version_path}) + if(CMAKE_MATCH_1) + set(CMAKE_C_COMPILER clang-${CMAKE_MATCH_1}) + set(CMAKE_CXX_COMPILER clang++-${CMAKE_MATCH_1}) + else() + message(FATAL_ERROR "Clang not found, please install clang") + endif() + else() + message(FATAL_ERROR "Clang not found, please install clang") + endif() +endif() diff --git a/cmake/Platform/Linux/Install_linux.cmake b/cmake/Platform/Linux/Install_linux.cmake index 02baa6e61e..0f5494131a 100644 --- a/cmake/Platform/Linux/Install_linux.cmake +++ b/cmake/Platform/Linux/Install_linux.cmake @@ -9,14 +9,27 @@ #! ly_setup_runtime_dependencies_copy_function_override: Linux-specific copy function to handle RPATH fixes set(ly_copy_template [[ function(ly_copy source_file target_directory) - file(COPY "${source_file}" DESTINATION "${target_directory}" FILE_PERMISSIONS @LY_COPY_PERMISSIONS@ FOLLOW_SYMLINK_CHAIN) - get_filename_component(target_filename_ext "${source_file}" LAST_EXT) - if("${source_file}" MATCHES "qt/plugins" AND "${target_filename_ext}" STREQUAL ".so") - get_filename_component(target_filename "${source_file}" NAME) - file(RPATH_CHANGE FILE "${target_directory}/${target_filename}" OLD_RPATH "\$ORIGIN/../../lib" NEW_RPATH "\$ORIGIN/..") - elseif("${source_file}" MATCHES "lrelease") - get_filename_component(target_filename "${source_file}" NAME) - file(RPATH_CHANGE FILE "${target_directory}/${target_filename}" OLD_RPATH "\$ORIGIN/../lib" NEW_RPATH "\$ORIGIN") + cmake_path(GET source_file FILENAME target_filename) + cmake_path(APPEND full_target_directory "$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}" "${target_directory}") + cmake_path(APPEND target_file "${full_target_directory}" "${target_filename}") + if("${source_file}" IS_NEWER_THAN "${target_file}") + message(STATUS "Copying ${source_file} to ${full_target_directory}...") + file(MAKE_DIRECTORY "${full_target_directory}") + file(COPY "${source_file}" DESTINATION "${full_target_directory}" FILE_PERMISSIONS @LY_COPY_PERMISSIONS@ FOLLOW_SYMLINK_CHAIN) + file(TOUCH_NOCREATE "${target_file}") + + # Special case for install + cmake_PATH(GET source_file EXTENSION target_filename_ext) + if("${target_filename_ext}" STREQUAL ".so") + if("${source_file}" MATCHES "qt/plugins") + file(RPATH_CHANGE FILE "${target_file}" OLD_RPATH "\$ORIGIN/../../lib" NEW_RPATH "\$ORIGIN/..") + endif() + if(CMAKE_INSTALL_DO_STRIP) + execute_process(COMMAND @CMAKE_STRIP@ "${target_file}") + endif() + elseif("${source_file}" MATCHES "lrelease") + file(RPATH_CHANGE FILE "${target_file}" OLD_RPATH "\$ORIGIN/../lib" NEW_RPATH "\$ORIGIN") + endif() endif() endfunction()]]) diff --git a/cmake/Platform/Linux/PAL_linux.cmake b/cmake/Platform/Linux/PAL_linux.cmake index 4941f143a6..b7fd062c8c 100644 --- a/cmake/Platform/Linux/PAL_linux.cmake +++ b/cmake/Platform/Linux/PAL_linux.cmake @@ -16,7 +16,7 @@ ly_set(PAL_TRAIT_BUILD_TESTS_SUPPORTED TRUE) ly_set(PAL_TRAIT_BUILD_UNITY_SUPPORTED TRUE) ly_set(PAL_TRAIT_BUILD_UNITY_EXCLUDE_EXTENSIONS) ly_set(PAL_TRAIT_BUILD_EXCLUDE_ALL_TEST_RUNS_FROM_IDE FALSE) -ly_set(PAL_TRAIT_BUILD_CPACK_SUPPORTED FALSE) +ly_set(PAL_TRAIT_BUILD_CPACK_SUPPORTED TRUE) ly_set(PAL_TRAIT_PROF_PIX_SUPPORTED FALSE) diff --git a/cmake/Platform/Linux/Packaging/postinst.in b/cmake/Platform/Linux/Packaging/postinst.in new file mode 100644 index 0000000000..c6c0ba228d --- /dev/null +++ b/cmake/Platform/Linux/Packaging/postinst.in @@ -0,0 +1,21 @@ +#!/usr/bin/env bash +# +# 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 +# +# + +set -o errexit # exit on the first failure encountered + +{ + if [[ ! -f "/usr/lib/x86_64-linux-gnu/libffi.so.6" ]]; then + sudo ln -s /usr/lib/x86_64-linux-gnu/libffi.so.7 /usr/lib/x86_64-linux-gnu/libffi.so.6 + fi + + pushd @CPACK_PACKAGING_INSTALL_PREFIX@ + python/get_python.sh + chown -R $SUDO_USER . + popd +} &> /dev/null # hide output diff --git a/cmake/Platform/Linux/Packaging/postrm.in b/cmake/Platform/Linux/Packaging/postrm.in new file mode 100644 index 0000000000..acda38bf1e --- /dev/null +++ b/cmake/Platform/Linux/Packaging/postrm.in @@ -0,0 +1,15 @@ +#!/usr/bin/env bash +# +# 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 +# +# + +set -o errexit # exit on the first failure encountered + +{ + pushd @CPACK_PACKAGING_INSTALL_PREFIX@ + popd +} &> /dev/null # hide output diff --git a/cmake/Platform/Linux/Packaging/prerm.in b/cmake/Platform/Linux/Packaging/prerm.in new file mode 100644 index 0000000000..5595d7010f --- /dev/null +++ b/cmake/Platform/Linux/Packaging/prerm.in @@ -0,0 +1,23 @@ +#!/usr/bin/env bash +# +# 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 +# +# + +set -o errexit # exit on the first failure encountered + +{ + # We dont remove this symlink that we potentially created because the user could have + # installed themselves. + #if [[ -L "/usr/lib/x86_64-linux-gnu/libffi.so.6" ]]; then + # sudo rm /usr/lib/x86_64-linux-gnu/libffi.so.6 + #fi + + pushd @CPACK_PACKAGING_INSTALL_PREFIX@ + # delete python downloads + rm -rf python/downloaded_packages python/runtime + popd +} &> /dev/null # hide output diff --git a/cmake/Platform/Linux/PackagingPostBuild_linux.cmake b/cmake/Platform/Linux/PackagingPostBuild_linux.cmake new file mode 100644 index 0000000000..d92ee908fd --- /dev/null +++ b/cmake/Platform/Linux/PackagingPostBuild_linux.cmake @@ -0,0 +1,62 @@ +# +# 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 +# +# + +file(REAL_PATH "${CPACK_SOURCE_DIR}/.." LY_ROOT_FOLDER) +include(${LY_ROOT_FOLDER}/cmake/Platform/Common/PackagingPostBuild_common.cmake) + +file(${CPACK_PACKAGE_CHECKSUM} ${CPACK_TOPLEVEL_DIRECTORY}/${CPACK_PACKAGE_FILE_NAME}.deb file_checksum) +file(WRITE ${CPACK_TOPLEVEL_DIRECTORY}/${CPACK_PACKAGE_FILE_NAME}.deb.sha256 "${file_checksum} ${CPACK_PACKAGE_FILE_NAME}.deb") + +if(CPACK_UPLOAD_URL) + + # use the internal default path if somehow not specified from cpack_configure_downloads + if(NOT CPACK_UPLOAD_DIRECTORY) + set(CPACK_UPLOAD_DIRECTORY ${CPACK_PACKAGE_DIRECTORY}/CPackUploads) + endif() + + # Copy the artifacts intended to be uploaded to a remote server into the folder specified + # through CPACK_UPLOAD_DIRECTORY. This mimics the same process cpack does natively for + # some other frameworks that have built-in online installer support. + message(STATUS "Copying packaging artifacts to upload directory...") + file(REMOVE_RECURSE ${CPACK_UPLOAD_DIRECTORY}) + file(GLOB _artifacts + "${CPACK_TOPLEVEL_DIRECTORY}/*.deb" + "${CPACK_TOPLEVEL_DIRECTORY}/*.sha256" + ) + file(COPY ${_artifacts} + DESTINATION ${CPACK_UPLOAD_DIRECTORY} + ) + message(STATUS "Artifacts copied to ${CPACK_UPLOAD_DIRECTORY}") + + # TODO: copy gpg file to CPACK_UPLOAD_DIRECTORY + + ly_upload_to_url( + ${CPACK_UPLOAD_URL} + ${CPACK_UPLOAD_DIRECTORY} + ".*(.deb|.gpg|.sha256)$" + ) + + # for auto tagged builds, we will also upload a second copy of just the boostrapper + # to a special "Latest" folder under the branch in place of the commit date/hash + if(CPACK_AUTO_GEN_TAG) + + set(latest_deb_package "${CPACK_UPLOAD_DIRECTORY}/${CPACK_PACKAGE_NAME}_latest.deb") + file(COPY_FILE + ${CPACK_UPLOAD_DIRECTORY}/${CPACK_PACKAGE_FILE_NAME}.deb + ${latest_deb_package} + ) + ly_upload_to_latest(${CPACK_UPLOAD_URL} ${latest_deb_package}) + + # TODO: upload gpg file to latest + + # Generate a checksum file for latest and upload it + set(latest_hash_file "${CPACK_UPLOAD_DIRECTORY}/${CPACK_PACKAGE_NAME}_latest.deb.sha256") + file(WRITE "${latest_hash_file}" "${file_checksum} ${CPACK_PACKAGE_NAME}_latest.deb") + ly_upload_to_latest(${CPACK_UPLOAD_URL} "${latest_hash_file}") + endif() +endif() diff --git a/cmake/Platform/Linux/PackagingPreBuild_linux.cmake b/cmake/Platform/Linux/PackagingPreBuild_linux.cmake new file mode 100644 index 0000000000..31dc393307 --- /dev/null +++ b/cmake/Platform/Linux/PackagingPreBuild_linux.cmake @@ -0,0 +1,16 @@ +# +# 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 +# +# + +file(REAL_PATH "${CPACK_SOURCE_DIR}/.." LY_ROOT_FOLDER) +include(${LY_ROOT_FOLDER}/cmake/Platform/Common/PackagingPreBuild_common.cmake) + +if(NOT CPACK_UPLOAD_URL) # Skip signing if we are not uploading the package + return() +endif() + +# TODO: do signing diff --git a/cmake/Platform/Linux/Packaging_linux.cmake b/cmake/Platform/Linux/Packaging_linux.cmake new file mode 100644 index 0000000000..2e178429c3 --- /dev/null +++ b/cmake/Platform/Linux/Packaging_linux.cmake @@ -0,0 +1,56 @@ +# +# 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 +# +# + +set(CPACK_GENERATOR DEB) + +set(CPACK_PACKAGING_INSTALL_PREFIX "/opt/${CPACK_PACKAGE_NAME}/${LY_VERSION_STRING}") + +set(_cmake_package_name "cmake-${CPACK_DESIRED_CMAKE_VERSION}-linux-x86_64") +set(CPACK_CMAKE_PACKAGE_FILE "${_cmake_package_name}.tar.gz") +set(CPACK_CMAKE_PACKAGE_HASH "3f827544f9c82e74ddf5016461fdfcfea4ede58a26f82612f473bf6bfad8bfc2") + +# get all the package dependencies, extracted from scripts\build\build_node\Platform\Linux\package-list.ubuntu-focal.txt +set(package_dependencies + libffi7 + clang-12 + ninja-build + # Build Libraries + libglu1-mesa-dev # For Qt (GL dependency) + libxcb-xinerama0 # For Qt plugins at runtime + libxcb-xinput0 # For Qt plugins at runtime + libfontconfig1-dev # For Qt plugins at runtime + libcurl4-openssl-dev # For HttpRequestor + # libsdl2-dev # for WWise/Audio + libxcb-xkb-dev # For xcb keyboard input + libxkbcommon-x11-dev # For xcb keyboard input + libxkbcommon-dev # For xcb keyboard input + libxcb-xfixes0-dev # For mouse input + libxcb-xinput-dev # For mouse input + zlib1g-dev + mesa-common-dev +) +list(JOIN package_dependencies "," CPACK_DEBIAN_PACKAGE_DEPENDS) + +# Post-installation and pre/post removal scripts +configure_file("${LY_ROOT_FOLDER}/cmake/Platform/${PAL_PLATFORM_NAME}/Packaging/postinst.in" + "${CMAKE_BINARY_DIR}/cmake/Platform/${PAL_PLATFORM_NAME}/Packaging/postinst" + @ONLY +) +configure_file("${LY_ROOT_FOLDER}/cmake/Platform/${PAL_PLATFORM_NAME}/Packaging/prerm.in" + "${CMAKE_BINARY_DIR}/cmake/Platform/${PAL_PLATFORM_NAME}/Packaging/prerm" + @ONLY +) +configure_file("${LY_ROOT_FOLDER}/cmake/Platform/${PAL_PLATFORM_NAME}/Packaging/postrm.in" + "${CMAKE_BINARY_DIR}/cmake/Platform/${PAL_PLATFORM_NAME}/Packaging/postrm" + @ONLY +) +set(CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA + ${CMAKE_BINARY_DIR}/cmake/Platform/Linux/Packaging/postinst + ${CMAKE_BINARY_DIR}/cmake/Platform/Linux/Packaging/prerm + ${CMAKE_BINARY_DIR}/cmake/Platform/Linux/Packaging/postrm +) diff --git a/cmake/Platform/Linux/platform_linux_files.cmake b/cmake/Platform/Linux/platform_linux_files.cmake index fa5545cd26..d30959b8d2 100644 --- a/cmake/Platform/Linux/platform_linux_files.cmake +++ b/cmake/Platform/Linux/platform_linux_files.cmake @@ -10,11 +10,19 @@ set(FILES ../Common/Configurations_common.cmake ../Common/Clang/Configurations_clang.cmake ../Common/Install_common.cmake + ../Common/PackagingPostBuild_common.cmake + ../Common/PackagingPreBuild_common.cmake + CompilerSettings_linux.cmake Configurations_linux.cmake Install_linux.cmake LYTestWrappers_linux.cmake LYWrappers_linux.cmake + Packaging_linux.cmake + PackagingPostBuild_linux.cmake + PackagingPreBuild_linux.cmake PAL_linux.cmake PALDetection_linux.cmake RPathChange.cmake + runtime_dependencies_linux.cmake.in + RuntimeDependencies_linux.cmake ) diff --git a/cmake/Platform/Linux/runtime_dependencies_linux.cmake.in b/cmake/Platform/Linux/runtime_dependencies_linux.cmake.in index b7ecc57737..4ccf123e27 100644 --- a/cmake/Platform/Linux/runtime_dependencies_linux.cmake.in +++ b/cmake/Platform/Linux/runtime_dependencies_linux.cmake.in @@ -22,6 +22,7 @@ function(ly_copy source_file target_directory) endif() if((NOT source_file_size EQUAL target_file_size) OR "${source_file}" IS_NEWER_THAN "${target_file}") message(STATUS "Copying \"${source_file}\" to \"${target_directory}\"...") + file(MAKE_DIRECTORY "${full_target_directory}") file(COPY "${source_file}" DESTINATION "${target_directory}" FILE_PERMISSIONS @LY_COPY_PERMISSIONS@ FOLLOW_SYMLINK_CHAIN) file(TOUCH_NOCREATE "${target_file}") diff --git a/cmake/Platform/Mac/InstallUtils_mac.cmake.in b/cmake/Platform/Mac/InstallUtils_mac.cmake.in index d73c4db459..89ce4a59f2 100644 --- a/cmake/Platform/Mac/InstallUtils_mac.cmake.in +++ b/cmake/Platform/Mac/InstallUtils_mac.cmake.in @@ -130,27 +130,36 @@ endfunction() function(ly_copy source_file target_directory) - if("${source_file}" MATCHES "\\.[Ff]ramework[^\\.]") + if("${source_file}" MATCHES "\\.[Ff]ramework") # fixup origin to copy the whole Framework folder string(REGEX REPLACE "(.*\\.[Ff]ramework).*" "\\1" source_file "${source_file}") endif() - get_filename_component(target_filename "${source_file}" NAME) - file(COPY "${source_file}" DESTINATION "${target_directory}" FILE_PERMISSIONS @LY_COPY_PERMISSIONS@ FOLLOW_SYMLINK_CHAIN) - # Our Qt and Python frameworks aren't in the correct bundle format to be codesigned. - if("${target_filename}" MATCHES "(Qt[^.]+)\\.[Ff]ramework") - fixup_qt_framework(${CMAKE_MATCH_1} "${target_directory}/${target_filename}") - # For some Qt frameworks(QtCore), signing the bundle doesn't work because of bundle - # format issues(despite the fixes above). But once we've patched the framework above, there's - # only one executable that we need to sign so we can do it directly. - set(target_filename "${target_filename}/Versions/5/${CMAKE_MATCH_1}") - elseif("${target_filename}" MATCHES "Python.framework") - fixup_python_framework("${target_directory}/${target_filename}") - codesign_python_framework_binaries("${target_directory}/${target_filename}") + cmake_path(GET source_file FILENAME target_filename) + cmake_path(APPEND full_target_directory "$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}" "${target_directory}") + cmake_path(APPEND target_file "${full_target_directory}" "${target_filename}") + + if("${source_file}" IS_NEWER_THAN "${target_file}") + message(STATUS "Copying ${source_file} to ${full_target_directory}...") + file(MAKE_DIRECTORY "${full_target_directory}") + file(COPY "${source_file}" DESTINATION "${full_target_directory}" FILE_PERMISSIONS @LY_COPY_PERMISSIONS@ FOLLOW_SYMLINK_CHAIN) + file(TOUCH_NOCREATE "${target_file}") + + # Our Qt and Python frameworks aren't in the correct bundle format to be codesigned. + if("${target_filename}" MATCHES "(Qt[^.]+)\\.[Ff]ramework") + fixup_qt_framework(${CMAKE_MATCH_1} "${target_file}") + # For some Qt frameworks(QtCore), signing the bundle doesn't work because of bundle + # format issues(despite the fixes above). But once we've patched the framework above, there's + # only one executable that we need to sign so we can do it directly. + set(target_filename "${target_filename}/Versions/5/${CMAKE_MATCH_1}") + elseif("${target_filename}" MATCHES "Python.framework") + fixup_python_framework("${target_file}") + codesign_python_framework_binaries("${target_file}") + endif() + codesign_file("${target_file}" "none") endif() - codesign_file("${target_directory}/${target_filename}" "none") endfunction() diff --git a/cmake/Platform/Mac/PackagingPostBuild_mac.cmake b/cmake/Platform/Mac/PackagingPostBuild_mac.cmake new file mode 100644 index 0000000000..5fa3787c21 --- /dev/null +++ b/cmake/Platform/Mac/PackagingPostBuild_mac.cmake @@ -0,0 +1,10 @@ +# +# 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 +# +# + +file(REAL_PATH "${CPACK_SOURCE_DIR}/.." LY_ROOT_FOLDER) +include(${LY_ROOT_FOLDER}/cmake/Platform/Common/PackagingPostBuild_common.cmake) diff --git a/cmake/Platform/Mac/PackagingPreBuild_mac.cmake b/cmake/Platform/Mac/PackagingPreBuild_mac.cmake new file mode 100644 index 0000000000..1d30e21767 --- /dev/null +++ b/cmake/Platform/Mac/PackagingPreBuild_mac.cmake @@ -0,0 +1,10 @@ +# +# 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 +# +# + +file(REAL_PATH "${CPACK_SOURCE_DIR}/.." LY_ROOT_FOLDER) +include(${LY_ROOT_FOLDER}/cmake/Platform/Common/PackagingPreBuild_common.cmake) diff --git a/cmake/Platform/Mac/runtime_dependencies_mac.cmake.in b/cmake/Platform/Mac/runtime_dependencies_mac.cmake.in index 32bf777634..892a90640f 100644 --- a/cmake/Platform/Mac/runtime_dependencies_mac.cmake.in +++ b/cmake/Platform/Mac/runtime_dependencies_mac.cmake.in @@ -120,19 +120,28 @@ function(ly_copy source_file target_directory) file(MAKE_DIRECTORY "${target_directory}") endif() - if(NOT target_is_bundle) + set(is_framework FALSE) + if("${source_file}" MATCHES "\\.[Ff]ramework") + set(is_framework TRUE) + endif() + if(NOT is_framework) # if it is a bundle, there is no contention about the files in the destination, each bundle target will copy everything # we dont want these files to invalidate the bundle and cause a new signature file(LOCK ${target_file}.lock GUARD FUNCTION TIMEOUT 300) - endif() - file(SIZE "${source_file}" source_file_size) - if(EXISTS "${target_file}") - file(SIZE "${target_file}" target_file_size) + file(SIZE "${source_file}" source_file_size) + if(EXISTS "${target_file}") + file(SIZE "${target_file}" target_file_size) + else() + set(target_file_size 0) + endif() else() + set(source_file_size 0) set(target_file_size 0) endif() + if((NOT source_file_size EQUAL target_file_size) OR "${source_file}" IS_NEWER_THAN "${target_file}") message(STATUS "Copying \"${source_file}\" to \"${target_directory}\"...") + file(MAKE_DIRECTORY "${target_directory}") file(COPY "${source_file}" DESTINATION "${target_directory}" FILE_PERMISSIONS @LY_COPY_PERMISSIONS@ FOLLOW_SYMLINK_CHAIN) file(TOUCH_NOCREATE "${target_file}") set(anything_new TRUE PARENT_SCOPE) diff --git a/cmake/Platform/Windows/PackagingPostBuild.cmake b/cmake/Platform/Windows/PackagingPostBuild_windows.cmake similarity index 52% rename from cmake/Platform/Windows/PackagingPostBuild.cmake rename to cmake/Platform/Windows/PackagingPostBuild_windows.cmake index ac457bea87..0993135c23 100644 --- a/cmake/Platform/Windows/PackagingPostBuild.cmake +++ b/cmake/Platform/Windows/PackagingPostBuild_windows.cmake @@ -6,6 +6,9 @@ # # +file(REAL_PATH "${CPACK_SOURCE_DIR}/.." LY_ROOT_FOLDER) +include(${LY_ROOT_FOLDER}/cmake/Platform/Common/PackagingPostBuild_common.cmake) + # convert the path to a windows style path using string replace because TO_NATIVE_PATH # only works on real paths string(REPLACE "/" "\\" _fixed_package_install_dir ${CPACK_PACKAGE_INSTALL_DIRECTORY}) @@ -56,8 +59,7 @@ set(_light_command ) if(CPACK_UPLOAD_URL) # Skip signing if we are not uploading the package - file(REAL_PATH "${CPACK_SOURCE_DIR}/.." _root_path) - file(TO_NATIVE_PATH "${_root_path}/scripts/signer/Platform/Windows/signer.ps1" _sign_script) + file(TO_NATIVE_PATH "${LY_ROOT_FOLDER}/scripts/signer/Platform/Windows/signer.ps1" _sign_script) unset(_signing_command) find_program(_psiexec_path psexec.exe) @@ -111,16 +113,12 @@ if(NOT ${_light_result} EQUAL 0) message(FATAL_ERROR "An error occurred invoking light.exe. ${_light_errors}") endif() -file(COPY ${_bootstrap_output_file} - DESTINATION ${CPACK_PACKAGE_DIRECTORY} -) - -message(STATUS "Bootstrap installer generated to ${CPACK_PACKAGE_DIRECTORY}/${_bootstrap_filename}") +message(STATUS "Bootstrap installer generated to ${_bootstrap_output_file}") if(CPACK_UPLOAD_URL) # Skip signing if we are not uploading the package - message(STATUS "Signing bootstrap installer in ${CPACK_PACKAGE_DIRECTORY}") + message(STATUS "Signing bootstrap installer in ${_bootstrap_output_file}") execute_process( - COMMAND ${_signing_command} -bootstrapPath ${CPACK_PACKAGE_DIRECTORY}/${_bootstrap_filename} + COMMAND ${_signing_command} -bootstrapPath ${_bootstrap_output_file} RESULT_VARIABLE _signing_result ERROR_VARIABLE _signing_errors OUTPUT_VARIABLE _signing_output @@ -137,113 +135,32 @@ if(NOT CPACK_UPLOAD_DIRECTORY) set(CPACK_UPLOAD_DIRECTORY ${CPACK_PACKAGE_DIRECTORY}/CPackUploads) endif() -# copy the artifacts intended to be uploaded to a remote server into the folder specified -# through cpack_configure_downloads. this mimics the same process cpack does natively for +# Copy the artifacts intended to be uploaded to a remote server into the folder specified +# through CPACK_UPLOAD_DIRECTORY. This mimics the same process cpack does natively for # some other frameworks that have built-in online installer support. -message(STATUS "Copying installer artifacts to upload directory...") +message(STATUS "Copying packaging artifacts to upload directory...") file(REMOVE_RECURSE ${CPACK_UPLOAD_DIRECTORY}) -file(GLOB _artifacts "${_cpack_wix_out_dir}/*.msi" "${_cpack_wix_out_dir}/*.cab") +file(GLOB _artifacts + "${_cpack_wix_out_dir}/*.msi" + "${_cpack_wix_out_dir}/*.cab" + "${_cpack_wix_out_dir}/*.exe" +) file(COPY ${_artifacts} DESTINATION ${CPACK_UPLOAD_DIRECTORY} ) message(STATUS "Artifacts copied to ${CPACK_UPLOAD_DIRECTORY}") -if(NOT CPACK_UPLOAD_URL) - return() -endif() - -file(TO_NATIVE_PATH "${_cpack_wix_out_dir}" _cpack_wix_out_dir) -file(TO_NATIVE_PATH "${_root_path}/python/python.cmd" _python_cmd) -file(TO_NATIVE_PATH "${_root_path}/scripts/build/tools/upload_to_s3.py" _upload_script) - -function(upload_to_s3 in_url in_local_path in_file_regex) - - # strip the scheme and extract the bucket/key prefix from the URL - string(REPLACE "s3://" "" _stripped_url ${in_url}) - string(REPLACE "/" ";" _tokens ${_stripped_url}) - - list(POP_FRONT _tokens _bucket) - string(JOIN "/" _prefix ${_tokens}) - - set(_extra_args [[{"ACL":"bucket-owner-full-control"}]]) - - set(_upload_command - ${_python_cmd} -s - -u ${_upload_script} - --base_dir ${in_local_path} - --file_regex="${in_file_regex}" - --bucket ${_bucket} - --key_prefix ${_prefix} - --extra_args ${_extra_args} - ) - - if(CPACK_AWS_PROFILE) - list(APPEND _upload_command --profile ${CPACK_AWS_PROFILE}) - endif() - - execute_process( - COMMAND ${_upload_command} - RESULT_VARIABLE _upload_result - OUTPUT_VARIABLE _upload_output - OUTPUT_STRIP_TRAILING_WHITESPACE - ) - - if (NOT ${_upload_result} EQUAL 0) - message(FATAL_ERROR "An error occurred uploading to s3.\nOutput:\n${_upload_output}") - endif() -endfunction() - -message(STATUS "Uploading artifacts to ${CPACK_UPLOAD_URL}") -upload_to_s3( - ${CPACK_UPLOAD_URL} - ${_cpack_wix_out_dir} - ".*(cab|exe|msi)$" -) -message(STATUS "Artifact uploading complete!") - -# for auto tagged builds, we will also upload a second copy of just the boostrapper -# to a special "Latest" folder under the branch in place of the commit date/hash -if(CPACK_AUTO_GEN_TAG) - message(STATUS "Updating latest tagged build") - - # make sure we can extra the commit info from the URL first - string(REGEX MATCH "([0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]-[0-9a-zA-Z]+)" - _commit_info ${CPACK_UPLOAD_URL} - ) - if(NOT _commit_info) - message(FATAL_ERROR "Failed to extract the build tag") - endif() - - set(_temp_dir ${_cpack_wix_out_dir}/temp) - if(NOT EXISTS ${_temp_dir}) - file(MAKE_DIRECTORY ${_temp_dir}) - endif() - - # strip the version number form the exe name in the one uploaded to latest - string(TOLOWER "${CPACK_PACKAGE_NAME}_installer.exe" _non_versioned_exe) - set(_temp_exe_copy ${_temp_dir}/${_non_versioned_exe}) - - file(COPY ${_bootstrap_output_file} DESTINATION ${_temp_dir}) - file(RENAME "${_temp_dir}/${_bootstrap_filename}" ${_temp_exe_copy}) - - # include the commit info in a text file that will live next to the exe - set(_temp_info_file ${_temp_dir}/build_tag.txt) - file(WRITE ${_temp_info_file} ${_commit_info}) - - # update the URL and upload - string(REPLACE - ${_commit_info} "Latest" - _latest_upload_url ${CPACK_UPLOAD_URL} - ) - - upload_to_s3( - ${_latest_upload_url} - ${_temp_dir} - ".*(${_non_versioned_exe}|build_tag.txt)$" - ) - - # cleanup the temp files - file(REMOVE_RECURSE ${_temp_dir}) - - message(STATUS "Latest build update complete!") +if(CPACK_UPLOAD_URL) + file(TO_NATIVE_PATH "${_cpack_wix_out_dir}" _cpack_wix_out_dir) + ly_upload_to_url( + ${CPACK_UPLOAD_URL} + ${_cpack_wix_out_dir} + ".*(cab|exe|msi)$" + ) + + # for auto tagged builds, we will also upload a second copy of just the boostrapper + # to a special "Latest" folder under the branch in place of the commit date/hash + if(CPACK_AUTO_GEN_TAG) + ly_upload_to_latest(${CPACK_UPLOAD_URL} ${_bootstrap_output_file}) + endif() endif() diff --git a/cmake/Platform/Windows/PackagingPreBuild.cmake b/cmake/Platform/Windows/PackagingPreBuild_windows.cmake similarity index 93% rename from cmake/Platform/Windows/PackagingPreBuild.cmake rename to cmake/Platform/Windows/PackagingPreBuild_windows.cmake index 7f2eedf352..29995518da 100644 --- a/cmake/Platform/Windows/PackagingPreBuild.cmake +++ b/cmake/Platform/Windows/PackagingPreBuild_windows.cmake @@ -6,6 +6,9 @@ # # +file(REAL_PATH "${CPACK_SOURCE_DIR}/.." LY_ROOT_FOLDER) +include(${LY_ROOT_FOLDER}/cmake/Platform/Common/PackagingPreBuild_common.cmake) + if(NOT CPACK_UPLOAD_URL) # Skip signing if we are not uploading the package return() endif() diff --git a/cmake/Platform/Windows/Packaging_windows.cmake b/cmake/Platform/Windows/Packaging_windows.cmake index 7b8f5a6c19..f24e9dee1c 100644 --- a/cmake/Platform/Windows/Packaging_windows.cmake +++ b/cmake/Platform/Windows/Packaging_windows.cmake @@ -23,7 +23,6 @@ set(CPACK_WIX_ROOT ${LY_INSTALLER_WIX_ROOT}) set(CPACK_GENERATOR WIX) -set(CPACK_THREADS 0) set(_cmake_package_name "cmake-${CPACK_DESIRED_CMAKE_VERSION}-windows-x86_64") set(CPACK_CMAKE_PACKAGE_FILE "${_cmake_package_name}.zip") set(CPACK_CMAKE_PACKAGE_HASH "15a49e2ab81c1822d75b1b1a92f7863f58e31f6d6aac1c4103eef2b071be3112") @@ -105,47 +104,35 @@ set(_raw_text_license [[ #(loc.InstallEulaAcceptance) ]]) -# The offline installer generation will be a single monolithic MSI. The WIX burn tool for the bootstrapper EXE has a size limitation. -# So we will exclude the generation of the boostrapper EXE in the offline case. -if(LY_INSTALLER_DOWNLOAD_URL) - set(WIX_THEME_WARNING_IMAGE ${CPACK_SOURCE_DIR}/Platform/Windows/Packaging/warning.png) +set(WIX_THEME_WARNING_IMAGE ${CPACK_SOURCE_DIR}/Platform/Windows/Packaging/warning.png) - if(LY_INSTALLER_LICENSE_URL) - set(WIX_THEME_INSTALL_LICENSE_ELEMENTS ${_hyperlink_license}) - set(WIX_THEME_EULA_ACCEPTANCE_TEXT "<a href=\"#\">Terms of Use</a>") - else() - set(WIX_THEME_INSTALL_LICENSE_ELEMENTS ${_raw_text_license}) - set(WIX_THEME_EULA_ACCEPTANCE_TEXT "Terms of Use above") - endif() - - # theme ux file - configure_file( - "${CPACK_SOURCE_DIR}/Platform/Windows/Packaging/BootstrapperTheme.xml.in" - "${CPACK_BINARY_DIR}/BootstrapperTheme.xml" - @ONLY - ) - - # theme localization file - configure_file( - "${CPACK_SOURCE_DIR}/Platform/Windows/Packaging/BootstrapperTheme.wxl.in" - "${CPACK_BINARY_DIR}/BootstrapperTheme.wxl" - @ONLY - ) - - set(_embed_artifacts "no") - - # the bootstrapper will at the very least need a different upgrade guid - generate_wix_guid(CPACK_WIX_BOOTSTRAP_UPGRADE_GUID "${_guid_seed_base}_Bootstrap_UpgradeCode") - - set(CPACK_PRE_BUILD_SCRIPTS - ${CPACK_SOURCE_DIR}/Platform/Windows/PackagingPreBuild.cmake - ) - - set(CPACK_POST_BUILD_SCRIPTS - ${CPACK_SOURCE_DIR}/Platform/Windows/PackagingPostBuild.cmake - ) +if(LY_INSTALLER_LICENSE_URL) + set(WIX_THEME_INSTALL_LICENSE_ELEMENTS ${_hyperlink_license}) + set(WIX_THEME_EULA_ACCEPTANCE_TEXT "<a href=\"#\">Terms of Use</a>") +else() + set(WIX_THEME_INSTALL_LICENSE_ELEMENTS ${_raw_text_license}) + set(WIX_THEME_EULA_ACCEPTANCE_TEXT "Terms of Use above") endif() +# theme ux file +configure_file( + "${CPACK_SOURCE_DIR}/Platform/Windows/Packaging/BootstrapperTheme.xml.in" + "${CPACK_BINARY_DIR}/BootstrapperTheme.xml" + @ONLY +) + +# theme localization file +configure_file( + "${CPACK_SOURCE_DIR}/Platform/Windows/Packaging/BootstrapperTheme.wxl.in" + "${CPACK_BINARY_DIR}/BootstrapperTheme.wxl" + @ONLY +) + +set(_embed_artifacts "no") + +# the bootstrapper will at the very least need a different upgrade guid +generate_wix_guid(CPACK_WIX_BOOTSTRAP_UPGRADE_GUID "${_guid_seed_base}_Bootstrap_UpgradeCode") + set(CPACK_WIX_CANDLE_EXTRA_FLAGS -dCPACK_EMBED_ARTIFACTS=${_embed_artifacts} -dCPACK_CMAKE_PACKAGE_NAME=${_cmake_package_name} diff --git a/cmake/Platform/Windows/platform_windows_files.cmake b/cmake/Platform/Windows/platform_windows_files.cmake index fcc47ab6eb..984d985380 100644 --- a/cmake/Platform/Windows/platform_windows_files.cmake +++ b/cmake/Platform/Windows/platform_windows_files.cmake @@ -15,6 +15,8 @@ set(FILES ../Common/MSVC/VisualStudio_common.cmake ../Common/Install_common.cmake ../Common/LYWrappers_default.cmake + ../Common/PackagingPostBuild_common.cmake + ../Common/PackagingPreBuild_common.cmake ../Common/TargetIncludeSystemDirectories_unsupported.cmake Configurations_windows.cmake LYTestWrappers_windows.cmake @@ -23,7 +25,8 @@ set(FILES PALDetection_windows.cmake Install_windows.cmake Packaging_windows.cmake - PackagingPostBuild.cmake + PackagingPostBuild_windows.cmake + PackagingPreBuild_windows.cmake Packaging/Bootstrapper.wxs Packaging/BootstrapperTheme.wxl.in Packaging/BootstrapperTheme.xml.in diff --git a/scripts/build/Platform/Linux/build_config.json b/scripts/build/Platform/Linux/build_config.json index f485f43315..84d1726d47 100644 --- a/scripts/build/Platform/Linux/build_config.json +++ b/scripts/build/Platform/Linux/build_config.json @@ -37,7 +37,7 @@ "PARAMETERS": { "CONFIGURATION": "debug", "OUTPUT_DIRECTORY": "build/linux", - "CMAKE_OPTIONS": "-G 'Ninja Multi-Config' -DCMAKE_C_COMPILER=clang-12 -DCMAKE_CXX_COMPILER=clang++-12 -DLY_PARALLEL_LINK_JOBS=4", + "CMAKE_OPTIONS": "-G 'Ninja Multi-Config' -DLY_PARALLEL_LINK_JOBS=4", "CMAKE_LY_PROJECTS": "AutomatedTesting", "CMAKE_TARGET": "all" } @@ -53,7 +53,7 @@ "PARAMETERS": { "CONFIGURATION": "profile", "OUTPUT_DIRECTORY": "build/linux", - "CMAKE_OPTIONS": "-G 'Ninja Multi-Config' -DCMAKE_C_COMPILER=clang-12 -DCMAKE_CXX_COMPILER=clang++-12 -DLY_PARALLEL_LINK_JOBS=4", + "CMAKE_OPTIONS": "-G 'Ninja Multi-Config' -DLY_PARALLEL_LINK_JOBS=4", "CMAKE_LY_PROJECTS": "AutomatedTesting", "CMAKE_TARGET": "all" } @@ -66,7 +66,7 @@ "PARAMETERS": { "CONFIGURATION": "profile", "OUTPUT_DIRECTORY": "build/linux", - "CMAKE_OPTIONS": "-G 'Ninja Multi-Config' -DCMAKE_C_COMPILER=clang-12 -DCMAKE_CXX_COMPILER=clang++-12 -DLY_UNITY_BUILD=FALSE -DLY_PARALLEL_LINK_JOBS=4", + "CMAKE_OPTIONS": "-G 'Ninja Multi-Config' -DLY_UNITY_BUILD=FALSE -DLY_PARALLEL_LINK_JOBS=4", "CMAKE_LY_PROJECTS": "AutomatedTesting", "CMAKE_TARGET": "all" } @@ -80,7 +80,7 @@ "PARAMETERS": { "CONFIGURATION": "profile", "OUTPUT_DIRECTORY": "build/linux", - "CMAKE_OPTIONS": "-G 'Ninja Multi-Config' -DCMAKE_C_COMPILER=clang-12 -DCMAKE_CXX_COMPILER=clang++-12 -DLY_PARALLEL_LINK_JOBS=4", + "CMAKE_OPTIONS": "-G 'Ninja Multi-Config' -DLY_PARALLEL_LINK_JOBS=4", "CMAKE_LY_PROJECTS": "AutomatedTesting", "CMAKE_TARGET": "all", "CTEST_OPTIONS": "-E (AutomatedTesting::Atom_TestSuite_Main|AutomatedTesting::PrefabTests|AutomatedTesting::TerrainTests_Main|Gem::EMotionFX.Editor.Tests) -L (SUITE_smoke|SUITE_main) -LE (REQUIRES_gpu) --no-tests=error", @@ -93,7 +93,7 @@ "PARAMETERS": { "CONFIGURATION": "profile", "OUTPUT_DIRECTORY": "build/linux", - "CMAKE_OPTIONS": "-G 'Ninja Multi-Config' -DCMAKE_C_COMPILER=clang-12 -DCMAKE_CXX_COMPILER=clang++-12 -DLY_UNITY_BUILD=FALSE -DLY_PARALLEL_LINK_JOBS=4", + "CMAKE_OPTIONS": "-G 'Ninja Multi-Config' -DLY_UNITY_BUILD=FALSE -DLY_PARALLEL_LINK_JOBS=4", "CMAKE_LY_PROJECTS": "AutomatedTesting", "CMAKE_TARGET": "all", "CTEST_OPTIONS": "-E (AutomatedTesting::Atom_TestSuite_Main|AutomatedTesting::PrefabTests|AutomatedTesting::TerrainTests_Main|Gem::EMotionFX.Editor.Tests) -L (SUITE_smoke|SUITE_main) -LE (REQUIRES_gpu) --no-tests=error", @@ -110,7 +110,7 @@ "PARAMETERS": { "CONFIGURATION": "profile", "OUTPUT_DIRECTORY": "build/linux", - "CMAKE_OPTIONS": "-G 'Ninja Multi-Config' -DCMAKE_C_COMPILER=clang-12 -DCMAKE_CXX_COMPILER=clang++-12 -DLY_PARALLEL_LINK_JOBS=4", + "CMAKE_OPTIONS": "-G 'Ninja Multi-Config' -DLY_PARALLEL_LINK_JOBS=4", "CMAKE_LY_PROJECTS": "AutomatedTesting", "CMAKE_TARGET": "AssetProcessorBatch", "ASSET_PROCESSOR_BINARY": "bin/profile/AssetProcessorBatch", @@ -124,7 +124,7 @@ "PARAMETERS": { "CONFIGURATION": "profile", "OUTPUT_DIRECTORY": "build/linux", - "CMAKE_OPTIONS": "-G 'Ninja Multi-Config' -DCMAKE_C_COMPILER=clang-12 -DCMAKE_CXX_COMPILER=clang++-12 -DLY_UNITY_BUILD=FALSE -DLY_PARALLEL_LINK_JOBS=4", + "CMAKE_OPTIONS": "-G 'Ninja Multi-Config' -DLY_UNITY_BUILD=FALSE -DLY_PARALLEL_LINK_JOBS=4", "CMAKE_LY_PROJECTS": "AutomatedTesting", "CMAKE_TARGET": "AssetProcessorBatch", "ASSET_PROCESSOR_BINARY": "bin/profile/AssetProcessorBatch", @@ -142,7 +142,7 @@ "PARAMETERS": { "CONFIGURATION": "profile", "OUTPUT_DIRECTORY": "build/linux", - "CMAKE_OPTIONS": "-G 'Ninja Multi-Config' -DCMAKE_C_COMPILER=clang-12 -DCMAKE_CXX_COMPILER=clang++-12 -DLY_PARALLEL_LINK_JOBS=4", + "CMAKE_OPTIONS": "-G 'Ninja Multi-Config' -DLY_PARALLEL_LINK_JOBS=4", "CMAKE_LY_PROJECTS": "AutomatedTesting", "CMAKE_TARGET": "TEST_SUITE_periodic", "CTEST_OPTIONS": "-L (SUITE_periodic) --no-tests=error", @@ -162,7 +162,7 @@ "PARAMETERS": { "CONFIGURATION": "profile", "OUTPUT_DIRECTORY": "build/linux", - "CMAKE_OPTIONS": "-G 'Ninja Multi-Config' -DCMAKE_C_COMPILER=clang-12 -DCMAKE_CXX_COMPILER=clang++-12 -DLY_PARALLEL_LINK_JOBS=4 -DO3DE_HOME_PATH=\"${WORKSPACE}/home\" -DO3DE_REGISTER_ENGINE_PATH=\"${WORKSPACE}/o3de\" -DO3DE_REGISTER_THIS_ENGINE=TRUE", + "CMAKE_OPTIONS": "-G 'Ninja Multi-Config' -DLY_PARALLEL_LINK_JOBS=4", "CMAKE_LY_PROJECTS": "AutomatedTesting", "CMAKE_TARGET": "all", "CTEST_OPTIONS": "-L (SUITE_sandbox) --no-tests=error" @@ -178,7 +178,7 @@ "PARAMETERS": { "CONFIGURATION": "profile", "OUTPUT_DIRECTORY": "build/linux", - "CMAKE_OPTIONS": "-G 'Ninja Multi-Config' -DCMAKE_C_COMPILER=clang-12 -DCMAKE_CXX_COMPILER=clang++-12 -DLY_PARALLEL_LINK_JOBS=4", + "CMAKE_OPTIONS": "-G 'Ninja Multi-Config' -DLY_PARALLEL_LINK_JOBS=4", "CMAKE_LY_PROJECTS": "AutomatedTesting", "CMAKE_TARGET": "TEST_SUITE_benchmark", "CTEST_OPTIONS": "-L (SUITE_benchmark) --no-tests=error", @@ -195,7 +195,7 @@ "PARAMETERS": { "CONFIGURATION": "release", "OUTPUT_DIRECTORY": "build/linux", - "CMAKE_OPTIONS": "-G 'Ninja Multi-Config' -DCMAKE_C_COMPILER=clang-12 -DCMAKE_CXX_COMPILER=clang++-12 -DLY_PARALLEL_LINK_JOBS=4", + "CMAKE_OPTIONS": "-G 'Ninja Multi-Config' -DLY_PARALLEL_LINK_JOBS=4", "CMAKE_LY_PROJECTS": "AutomatedTesting", "CMAKE_TARGET": "all" } @@ -210,7 +210,7 @@ "PARAMETERS": { "CONFIGURATION": "release", "OUTPUT_DIRECTORY": "build/mono_linux", - "CMAKE_OPTIONS": "-G 'Ninja Multi-Config' -DCMAKE_C_COMPILER=clang-12 -DCMAKE_CXX_COMPILER=clang++-12 -DLY_MONOLITHIC_GAME=TRUE -DLY_PARALLEL_LINK_JOBS=4", + "CMAKE_OPTIONS": "-G 'Ninja Multi-Config' -DLY_MONOLITHIC_GAME=TRUE -DLY_PARALLEL_LINK_JOBS=4", "CMAKE_LY_PROJECTS": "AutomatedTesting", "CMAKE_TARGET": "all" } @@ -221,10 +221,25 @@ "PARAMETERS": { "CONFIGURATION": "profile", "OUTPUT_DIRECTORY": "build/linux", - "CMAKE_OPTIONS": "-G 'Ninja Multi-Config' -DCMAKE_C_COMPILER=clang-12 -DCMAKE_CXX_COMPILER=clang++-12 -DLY_PARALLEL_LINK_JOBS=4 -DLY_DISABLE_TEST_MODULES=TRUE", + "CMAKE_OPTIONS": "-G 'Ninja Multi-Config' -DLY_PARALLEL_LINK_JOBS=4 -DLY_DISABLE_TEST_MODULES=TRUE", "CMAKE_TARGET": "install" } }, + "installer": { + "TAGS": [ + "nightly-clean", + "nightly-installer" + ], + "COMMAND": "build_installer_linux.sh", + "PARAMETERS": { + "CONFIGURATION": "profile", + "OUTPUT_DIRECTORY": "build/linux", + "CMAKE_OPTIONS": "-G 'Ninja Multi-Config' -DLY_PARALLEL_LINK_JOBS=4 -DLY_DISABLE_TEST_MODULES=TRUE -DLY_VERSION_ENGINE_NAME=o3de-sdk", + "EXTRA_CMAKE_OPTIONS": "-DLY_INSTALLER_AUTO_GEN_TAG=TRUE -DLY_INSTALLER_DOWNLOAD_URL=${INSTALLER_DOWNLOAD_URL} -DLY_INSTALLER_LICENSE_URL=${INSTALLER_DOWNLOAD_URL}/license", + "CPACK_OPTIONS": "-D CPACK_UPLOAD_URL=${CPACK_UPLOAD_URL}", + "CMAKE_TARGET": "all" + } + }, "install_profile_pipe": { "TAGS": [ "nightly-incremental", @@ -254,7 +269,7 @@ "COMMAND_CWD": "${WORKSPACE}/${PROJECT_REPOSITORY_NAME}", "CONFIGURATION": "profile", "OUTPUT_DIRECTORY": "build/linux", - "CMAKE_OPTIONS": "-G 'Ninja Multi-Config' -DCMAKE_C_COMPILER=clang-12 -DCMAKE_CXX_COMPILER=clang++-12 -DLY_PARALLEL_LINK_JOBS=4 -DCMAKE_MODULE_PATH=${WORKSPACE}/o3de/install/cmake", + "CMAKE_OPTIONS": "-G 'Ninja Multi-Config' -DLY_PARALLEL_LINK_JOBS=4 -DCMAKE_MODULE_PATH=${WORKSPACE}/o3de/install/cmake", "CMAKE_TARGET": "all" } } diff --git a/scripts/build/Platform/Linux/build_installer_linux.sh b/scripts/build/Platform/Linux/build_installer_linux.sh new file mode 100755 index 0000000000..301eb5f16d --- /dev/null +++ b/scripts/build/Platform/Linux/build_installer_linux.sh @@ -0,0 +1,15 @@ +#!/usr/bin/env bash +# +# 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 +# +# + +set -o errexit # exit on the first failure encountered + +BASEDIR=$(dirname "$0") +source $BASEDIR/build_linux.sh + +source $BASEDIR/installer_linux.sh diff --git a/scripts/build/Platform/Linux/build_linux.sh b/scripts/build/Platform/Linux/build_linux.sh index ab51913550..c14d4b5073 100755 --- a/scripts/build/Platform/Linux/build_linux.sh +++ b/scripts/build/Platform/Linux/build_linux.sh @@ -37,13 +37,13 @@ else fi if [[ ! -z "$RUN_CONFIGURE" ]]; then # have to use eval since $CMAKE_OPTIONS (${EXTRA_CMAKE_OPTIONS}) contains quotes that need to be processed - echo [ci_build] ${CONFIGURE_CMD} + eval echo [ci_build] ${CONFIGURE_CMD} eval ${CONFIGURE_CMD} # Save the run only if success - echo "${CONFIGURE_CMD}" > ${LAST_CONFIGURE_CMD_FILE} + eval echo "${CONFIGURE_CMD}" > ${LAST_CONFIGURE_CMD_FILE} fi -echo [ci_build] cmake --build . --target ${CMAKE_TARGET} --config ${CONFIGURATION} -j $(grep -c processor /proc/cpuinfo) -- ${CMAKE_NATIVE_BUILD_ARGS} -cmake --build . --target ${CMAKE_TARGET} --config ${CONFIGURATION} -j $(grep -c processor /proc/cpuinfo) -- ${CMAKE_NATIVE_BUILD_ARGS} +eval echo [ci_build] cmake --build . --target ${CMAKE_TARGET} --config ${CONFIGURATION} -j $(grep -c processor /proc/cpuinfo) -- ${CMAKE_NATIVE_BUILD_ARGS} +eval cmake --build . --target ${CMAKE_TARGET} --config ${CONFIGURATION} -j $(grep -c processor /proc/cpuinfo) -- ${CMAKE_NATIVE_BUILD_ARGS} popd diff --git a/scripts/build/Platform/Linux/installer_linux.sh b/scripts/build/Platform/Linux/installer_linux.sh new file mode 100755 index 0000000000..3ded242522 --- /dev/null +++ b/scripts/build/Platform/Linux/installer_linux.sh @@ -0,0 +1,30 @@ +#!/usr/bin/env bash +# +# 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 +# +# + +set -o errexit # exit on the first failure encountered + +BASEDIR=$(dirname "$0") +source $BASEDIR/env_linux.sh + +mkdir -p ${OUTPUT_DIRECTORY} +SOURCE_DIRECTORY=${PWD} +pushd $OUTPUT_DIRECTORY + +if ! command -v cpack &> /dev/null; then + echo "[ci_build] CPack not found" + exit 1 +fi + +echo [ci_build] cpack --version +cpack --version + +eval echo [ci_build] cpack -C ${CONFIGURATION} ${CPACK_OPTIONS} +eval cpack -C ${CONFIGURATION} ${CPACK_OPTIONS} + +popd diff --git a/scripts/build/Platform/Windows/build_config.json b/scripts/build/Platform/Windows/build_config.json index 3260c9af79..6f1aaa1570 100644 --- a/scripts/build/Platform/Windows/build_config.json +++ b/scripts/build/Platform/Windows/build_config.json @@ -360,9 +360,9 @@ "CONFIGURATION": "profile", "OUTPUT_DIRECTORY": "build\\windows_vs2019", "CMAKE_OPTIONS": "-G \"Visual Studio 16 2019\" -DCMAKE_SYSTEM_VERSION=10.0 -DLY_DISABLE_TEST_MODULES=TRUE -DLY_VERSION_ENGINE_NAME=o3de-sdk -DLY_INSTALLER_WIX_ROOT=\"!WIX! \"", - "EXTRA_CMAKE_OPTIONS": "-DLY_INSTALLER_AUTO_GEN_TAG=ON -DLY_INSTALLER_DOWNLOAD_URL=!INSTALLER_DOWNLOAD_URL! -DLY_INSTALLER_LICENSE_URL=!INSTALLER_DOWNLOAD_URL!/license", - "CPACK_BUCKET": "%INSTALLER_BUCKET%", + "EXTRA_CMAKE_OPTIONS": "-DLY_INSTALLER_AUTO_GEN_TAG=TRUE -DLY_INSTALLER_DOWNLOAD_URL=!INSTALLER_DOWNLOAD_URL! -DLY_INSTALLER_LICENSE_URL=!INSTALLER_DOWNLOAD_URL!/license", "CMAKE_TARGET": "ALL_BUILD", + "CPACK_OPTIONS": "-D CPACK_UPLOAD_URL=\"!CPACK_UPLOAD_URL!\"", "CMAKE_NATIVE_BUILD_ARGS": "/m /nologo" } }, diff --git a/scripts/build/Platform/Windows/build_windows.cmd b/scripts/build/Platform/Windows/build_windows.cmd index b9e862e04f..6c3ce91397 100644 --- a/scripts/build/Platform/Windows/build_windows.cmd +++ b/scripts/build/Platform/Windows/build_windows.cmd @@ -9,13 +9,6 @@ REM SETLOCAL EnableDelayedExpansion -REM Jenkins reports MSB8029 when TMP/TEMP is not defined, define a dummy folder -SET TMP=%cd%/temp -SET TEMP=%cd%/temp -IF NOT EXIST %TMP% ( - MKDIR temp -) - CALL %~dp0env_windows.cmd IF NOT EXIST "%OUTPUT_DIRECTORY%" ( diff --git a/scripts/build/Platform/Windows/env_windows.cmd b/scripts/build/Platform/Windows/env_windows.cmd index f11d394519..73dc781f44 100644 --- a/scripts/build/Platform/Windows/env_windows.cmd +++ b/scripts/build/Platform/Windows/env_windows.cmd @@ -18,6 +18,17 @@ IF NOT "%COMMAND_CWD%"=="" ( CD %COMMAND_CWD% ) +REM Jenkins reports MSB8029 when TMP/TEMP is not defined, define a dummy folder +IF NOT "%TMP%"=="" ( + IF NOT "%WORKSPACE_TMP%"=="" ( + SET TMP=%WORKSPACE_TMP% + SET TEMP=%WORKSPACE_TMP% + ) ELSE ( + SET TMP=%cd%/temp + SET TEMP=%cd%/temp + ) +) + EXIT /b 0 :error diff --git a/scripts/build/Platform/Windows/installer_windows.cmd b/scripts/build/Platform/Windows/installer_windows.cmd index 87f53adc7f..8af8e7b625 100644 --- a/scripts/build/Platform/Windows/installer_windows.cmd +++ b/scripts/build/Platform/Windows/installer_windows.cmd @@ -17,10 +17,12 @@ IF NOT EXIST %OUTPUT_DIRECTORY% ( ) PUSHD %OUTPUT_DIRECTORY% -REM Override the temporary directory used by wix to the workspace -SET "WIX_TEMP=!WORKSPACE_TMP!/wix" -IF NOT EXIST "%WIX_TEMP%" ( - MKDIR "%WIX_TEMP%" +REM Override the temporary directory used by wix to the workspace (if we have a WORKSPACE_TMP) +IF NOT "%WORKSPACE_TMP%"=="" ( + SET "WIX_TEMP=!WORKSPACE_TMP!/wix" + IF NOT EXIST "%WIX_TEMP%" ( + MKDIR "%WIX_TEMP%" + ) ) REM Make sure we are using the CMake version of CPack and not the one that comes with chocolatey @@ -47,10 +49,6 @@ IF ERRORLEVEL 1 ( GOTO :popd_error ) -IF NOT "%CPACK_BUCKET%"=="" ( - SET "CPACK_OPTIONS=-D CPACK_UPLOAD_URL=s3://%CPACK_BUCKET% %CPACK_OPTIONS%" -) - ECHO [ci_build] "!CPACK_PATH!" -C %CONFIGURATION% %CPACK_OPTIONS% "!CPACK_PATH!" -C %CONFIGURATION% %CPACK_OPTIONS% IF NOT %ERRORLEVEL%==0 ( diff --git a/scripts/build/Platform/iOS/build_config.json b/scripts/build/Platform/iOS/build_config.json index 895f74daae..ec2b763dda 100644 --- a/scripts/build/Platform/iOS/build_config.json +++ b/scripts/build/Platform/iOS/build_config.json @@ -76,7 +76,7 @@ "PARAMETERS": { "CONFIGURATION": "profile", "OUTPUT_DIRECTORY": "build/mac", - "CMAKE_OPTIONS": "-G Xcode -DO3DE_HOME_PATH=\"${WORKSPACE}/home\" -DO3DE_REGISTER_ENGINE_PATH=\"${WORKSPACE}/o3de\" -DO3DE_REGISTER_THIS_ENGINE=TRUE", + "CMAKE_OPTIONS": "-G Xcode", "CMAKE_LY_PROJECTS": "AutomatedTesting", "CMAKE_TARGET": "AssetProcessorBatch", "ASSET_PROCESSOR_BINARY": "bin/profile/AssetProcessorBatch", @@ -112,7 +112,7 @@ "PARAMETERS": { "CONFIGURATION": "profile", "OUTPUT_DIRECTORY": "build/ios_test", - "CMAKE_OPTIONS": "-G Xcode -DCMAKE_TOOLCHAIN_FILE=cmake/Platform/iOS/Toolchain_ios.cmake -DLY_MONOLITHIC_GAME=FALSE -DCMAKE_XCODE_ATTRIBUTE_CODE_SIGNING_REQUIRED=TRUE -DLY_IOS_CODE_SIGNING_IDENTITY=\"\" -DCMAKE_XCODE_ATTRIBUTE_CODE_SIGN_ENTITLEMENTS=\"\" -DCMAKE_XCODE_ATTRIBUTE_CODE_SIGNING_ALLOWED=TRUE -DO3DE_HOME_PATH=\"${WORKSPACE}/home\" -DO3DE_REGISTER_ENGINE_PATH=\"${WORKSPACE}/o3de\" -DO3DE_REGISTER_THIS_ENGINE=TRUE", + "CMAKE_OPTIONS": "-G Xcode -DCMAKE_TOOLCHAIN_FILE=cmake/Platform/iOS/Toolchain_ios.cmake -DLY_MONOLITHIC_GAME=FALSE -DCMAKE_XCODE_ATTRIBUTE_CODE_SIGNING_REQUIRED=TRUE -DLY_IOS_CODE_SIGNING_IDENTITY=\"\" -DCMAKE_XCODE_ATTRIBUTE_CODE_SIGN_ENTITLEMENTS=\"\" -DCMAKE_XCODE_ATTRIBUTE_CODE_SIGNING_ALLOWED=TRUE", "CMAKE_TARGET": "ALL_BUILD", "CMAKE_NATIVE_BUILD_ARGS": "", "TARGET_DEVICE_NAME": "Lumberyard", diff --git a/scripts/build/build_node/Platform/Linux/package-list.ubuntu-bionic.txt b/scripts/build/build_node/Platform/Linux/package-list.ubuntu-bionic.txt index 2af55ab180..30259a6dc7 100644 --- a/scripts/build/build_node/Platform/Linux/package-list.ubuntu-bionic.txt +++ b/scripts/build/build_node/Platform/Linux/package-list.ubuntu-bionic.txt @@ -12,7 +12,7 @@ libxcb-xinerama0 # For Qt plugins at runtime libxcb-xinput0 # For Qt plugins at runtime libfontconfig1-dev # For Qt plugins at runtime libcurl4-openssl-dev # For HttpRequestor -libsdl2-dev # For WWise/Audio +# libsdl2-dev # For WWise/Audio libxcb-xkb-dev # For xcb keyboard input libxkbcommon-x11-dev # For xcb keyboard input libxkbcommon-dev # For xcb keyboard input diff --git a/scripts/build/build_node/Platform/Linux/package-list.ubuntu-focal.txt b/scripts/build/build_node/Platform/Linux/package-list.ubuntu-focal.txt index e0e03cda90..71958d74bd 100644 --- a/scripts/build/build_node/Platform/Linux/package-list.ubuntu-focal.txt +++ b/scripts/build/build_node/Platform/Linux/package-list.ubuntu-focal.txt @@ -12,7 +12,7 @@ libxcb-xinerama0 # For Qt plugins at runtime libxcb-xinput0 # For Qt plugins at runtime libfontconfig1-dev # For Qt plugins at runtime libcurl4-openssl-dev # For HttpRequestor -libsdl2-dev # for WWise/Audio +# libsdl2-dev # for WWise/Audio libxcb-xkb-dev # For xcb keyboard input libxkbcommon-x11-dev # For xcb keyboard input libxkbcommon-dev # For xcb keyboard input From 4ad6d3e9f75880558d4003474621b9ada3aef060 Mon Sep 17 00:00:00 2001 From: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com> Date: Thu, 18 Nov 2021 16:54:04 -0800 Subject: [PATCH 137/345] Updated project manager backgrounds (#5770) Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com> --- .../Resources/Backgrounds/DefaultBackground.jpg | 4 ++-- .../ProjectManager/Resources/Backgrounds/FtueBackground.jpg | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Code/Tools/ProjectManager/Resources/Backgrounds/DefaultBackground.jpg b/Code/Tools/ProjectManager/Resources/Backgrounds/DefaultBackground.jpg index 3af15393c4..0d2ec8a301 100644 --- a/Code/Tools/ProjectManager/Resources/Backgrounds/DefaultBackground.jpg +++ b/Code/Tools/ProjectManager/Resources/Backgrounds/DefaultBackground.jpg @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:342c3eaccf68a178dfd8c2b1792a93a8c9197c8184dca11bf90706d7481df087 -size 1611268 +oid sha256:e9ad0383f3b917fa7f4efa307a8e109a70bb5f66deb197189d013f60eb8dc32c +size 1010250 diff --git a/Code/Tools/ProjectManager/Resources/Backgrounds/FtueBackground.jpg b/Code/Tools/ProjectManager/Resources/Backgrounds/FtueBackground.jpg index 44291a8b1d..258dc62429 100644 --- a/Code/Tools/ProjectManager/Resources/Backgrounds/FtueBackground.jpg +++ b/Code/Tools/ProjectManager/Resources/Backgrounds/FtueBackground.jpg @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:797794816e4b1702f1ae1f32b408c95c79eb1f8a95aba43cfad9cccc181b0bda -size 1135182 +oid sha256:84aab95ec8a5e3ba6ecb3aff1a814afc3171a937aa658decd18c2740623bd172 +size 984146 From efd4862b345f2f08f24886f323ee6d6b6e1d486d Mon Sep 17 00:00:00 2001 From: lsemp3d <58790905+lsemp3d@users.noreply.github.com> Date: Thu, 18 Nov 2021 17:15:04 -0800 Subject: [PATCH 138/345] More node name updates Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com> --- .../TranslationAssets/Classes/Entity.names | 213 ++++++++-------- .../Classes/SettingsRegistryInterface.names | 240 +++++++++--------- .../Classes/Specializations.names | 57 ++--- 3 files changed, 246 insertions(+), 264 deletions(-) diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/Entity.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/Entity.names index 258e490a4e..a6d6ac1f03 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/Entity.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/Entity.names @@ -5,7 +5,7 @@ "context": "BehaviorClass", "variant": "", "details": { - "name": "Entity", + "name": "Behavior Entity", "category": "Entity" }, "methods": [ @@ -14,28 +14,28 @@ "context": "Entity", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetComponentName" + "tooltip": "When signaled, this will invoke Get Component Name" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetComponentName is invoked" + "tooltip": "Signaled after Get Component Name is invoked" }, "details": { - "name": "Entity::GetComponentName", - "category": "Entity" + "name": "Get Component Name", + "category": "Other" }, "params": [ { "typeid": "{41CC88A4-FE07-48E6-943D-998DE68AFF5C}", "details": { - "name": "BehaviorEntity*", + "name": "Behavior Entity", "tooltip": "Entity" } }, { "typeid": "{60A9A069-9C3D-465A-B7AD-0D6CC803990A}", "details": { - "name": "BehaviorComponentId" + "name": "Behavior Component Id" } } ], @@ -43,7 +43,7 @@ { "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", "details": { - "name": "AZStd::vector" + "name": "Component Name" } } ] @@ -53,28 +53,28 @@ "context": "Entity", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetComponentType" + "tooltip": "When signaled, this will invoke Get Component Type" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetComponentType is invoked" + "tooltip": "Signaled after Get Component Type is invoked" }, "details": { - "name": "Entity::GetComponentType", - "category": "Entity" + "name": "Get Component Type", + "category": "Other" }, "params": [ { "typeid": "{41CC88A4-FE07-48E6-943D-998DE68AFF5C}", "details": { - "name": "BehaviorEntity*", + "name": "Behavior Entity", "tooltip": "Entity" } }, { "typeid": "{60A9A069-9C3D-465A-B7AD-0D6CC803990A}", "details": { - "name": "BehaviorComponentId" + "name": "Behavior Component Id" } } ], @@ -82,7 +82,7 @@ { "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}", "details": { - "name": "Uuid" + "name": "Type" } } ] @@ -92,34 +92,34 @@ "context": "Entity", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke CreateComponent" + "tooltip": "When signaled, this will invoke Create Component" }, "exit": { "name": "Out", - "tooltip": "Signaled after CreateComponent is invoked" + "tooltip": "Signaled after Create Component is invoked" }, "details": { - "name": "Entity::CreateComponent", - "category": "Entity" + "name": "Create Component", + "category": "Other" }, "params": [ { "typeid": "{41CC88A4-FE07-48E6-943D-998DE68AFF5C}", "details": { - "name": "BehaviorEntity*", + "name": "Behavior Entity", "tooltip": "Entity" } }, { "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}", "details": { - "name": "const AZ::Uuid&" + "name": "Component Type" } }, { "typeid": "{0A7929DF-2932-40EA-B2B3-79BC1C3490D0}", "details": { - "name": "const ComponentConfig*" + "name": "Component Config*" } } ], @@ -127,7 +127,7 @@ { "typeid": "{60A9A069-9C3D-465A-B7AD-0D6CC803990A}", "details": { - "name": "Number" + "name": "Behavior Component Id" } } ] @@ -137,28 +137,28 @@ "context": "Entity", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke DestroyComponent" + "tooltip": "When signaled, this will invoke Destroy Component" }, "exit": { "name": "Out", - "tooltip": "Signaled after DestroyComponent is invoked" + "tooltip": "Signaled after Destroy Component is invoked" }, "details": { - "name": "Entity::DestroyComponent", - "category": "Entity" + "name": "Destroy Component", + "category": "Other" }, "params": [ { "typeid": "{41CC88A4-FE07-48E6-943D-998DE68AFF5C}", "details": { - "name": "BehaviorEntity*", + "name": "Behavior Entity", "tooltip": "Entity" } }, { "typeid": "{60A9A069-9C3D-465A-B7AD-0D6CC803990A}", "details": { - "name": "BehaviorComponentId" + "name": "Behavior Component Id" } } ], @@ -166,7 +166,7 @@ { "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", "details": { - "name": "Boolean" + "name": "Success" } } ] @@ -176,28 +176,28 @@ "context": "Entity", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke FindComponentOfType" + "tooltip": "When signaled, this will invoke Find Component Of Type" }, "exit": { "name": "Out", - "tooltip": "Signaled after FindComponentOfType is invoked" + "tooltip": "Signaled after Find Component Of Type is invoked" }, "details": { - "name": "Entity::FindComponentOfType", - "category": "Entity" + "name": "Find Component Of Type", + "category": "Other" }, "params": [ { "typeid": "{41CC88A4-FE07-48E6-943D-998DE68AFF5C}", "details": { - "name": "BehaviorEntity*", + "name": "Behavior Entity", "tooltip": "Entity" } }, { "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}", "details": { - "name": "const AZ::Uuid&" + "name": "Component Type" } } ], @@ -205,7 +205,7 @@ { "typeid": "{60A9A069-9C3D-465A-B7AD-0D6CC803990A}", "details": { - "name": "Component ID" + "name": "Behavior Component Id" } } ] @@ -215,34 +215,34 @@ "context": "Entity", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetComponentConfiguration" + "tooltip": "When signaled, this will invoke Set Component Configuration" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetComponentConfiguration is invoked" + "tooltip": "Signaled after Set Component Configuration is invoked" }, "details": { - "name": "Entity::SetComponentConfiguration", - "category": "Entity" + "name": "Set Component Configuration", + "category": "Other" }, "params": [ { "typeid": "{41CC88A4-FE07-48E6-943D-998DE68AFF5C}", "details": { - "name": "BehaviorEntity*", + "name": "Behavior Entity", "tooltip": "Entity" } }, { "typeid": "{60A9A069-9C3D-465A-B7AD-0D6CC803990A}", "details": { - "name": "BehaviorComponentId" + "name": "Behavior Component Id" } }, { "typeid": "{0A7929DF-2932-40EA-B2B3-79BC1C3490D0}", "details": { - "name": "const ComponentConfig&" + "name": "Component Config" } } ], @@ -250,7 +250,7 @@ { "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", "details": { - "name": "Boolean" + "name": "Success" } } ] @@ -260,21 +260,21 @@ "context": "Entity", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke IsValid" + "tooltip": "When signaled, this will invoke Is Valid" }, "exit": { "name": "Out", - "tooltip": "Signaled after IsValid is invoked" + "tooltip": "Signaled after Is Valid is invoked" }, "details": { - "name": "Entity::IsValid", - "category": "Entity/Game Entity" + "name": "Is Valid", + "category": "Other" }, "params": [ { "typeid": "{41CC88A4-FE07-48E6-943D-998DE68AFF5C}", "details": { - "name": "EntityID", + "name": "Behavior Entity", "tooltip": "Entity" } } @@ -283,7 +283,7 @@ { "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", "details": { - "name": "Boolean" + "name": "Is Valid" } } ] @@ -300,14 +300,14 @@ "tooltip": "Signaled after GetId is invoked" }, "details": { - "name": "Entity::GetId", - "category": "Entity" + "name": "Get Id", + "category": "Other" }, "params": [ { "typeid": "{41CC88A4-FE07-48E6-943D-998DE68AFF5C}", "details": { - "name": "BehaviorEntity*", + "name": "Behavior Entity", "tooltip": "Entity" } } @@ -316,7 +316,7 @@ { "typeid": "{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}", "details": { - "name": "EntityID", + "name": "Entity Id", "tooltip": "Entity Unique Id" } } @@ -334,14 +334,13 @@ "tooltip": "Signaled after GetOwningContextId is invoked" }, "details": { - "name": "Entity::GetOwningContextId", - "category": "Entity" + "name": "Get Owning Context Id" }, "params": [ { "typeid": "{41CC88A4-FE07-48E6-943D-998DE68AFF5C}", "details": { - "name": "BehaviorEntity*", + "name": "Behavior Entity", "tooltip": "Entity" } } @@ -350,7 +349,7 @@ { "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}", "details": { - "name": "Uuid" + "name": "Context Id" } } ] @@ -360,21 +359,21 @@ "context": "Entity", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetComponents" + "tooltip": "When signaled, this will invoke Get Components" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetComponents is invoked" + "tooltip": "Signaled after Get Components is invoked" }, "details": { - "name": "Entity::GetComponents", - "category": "Entity" + "name": "Get Components", + "category": "Other" }, "params": [ { "typeid": "{41CC88A4-FE07-48E6-943D-998DE68AFF5C}", "details": { - "name": "BehaviorEntity*", + "name": "Behavior Entity", "tooltip": "Entity" } } @@ -393,28 +392,28 @@ "context": "Entity", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke FindAllComponentsOfType" + "tooltip": "When signaled, this will invoke Find All Components Of Type" }, "exit": { "name": "Out", - "tooltip": "Signaled after FindAllComponentsOfType is invoked" + "tooltip": "Signaled after Find All Components Of Type is invoked" }, "details": { - "name": "Entity::FindAllComponentsOfType", - "category": "Entity" + "name": "Find All Components Of Type", + "category": "Other" }, "params": [ { "typeid": "{41CC88A4-FE07-48E6-943D-998DE68AFF5C}", "details": { - "name": "BehaviorEntity*", + "name": "Behavior Entity", "tooltip": "Entity" } }, { "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}", "details": { - "name": "const AZ::Uuid&" + "name": "Component Type" } } ], @@ -422,7 +421,7 @@ { "typeid": "{8293031B-ABC3-5CD2-A1CB-1DB6792ADD5C}", "details": { - "name": "AZStd::vector" + "name": "Components" } } ] @@ -432,34 +431,34 @@ "context": "Entity", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetComponentConfiguration" + "tooltip": "When signaled, this will invoke Get Component Configuration" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetComponentConfiguration is invoked" + "tooltip": "Signaled after Get Component Configuration is invoked" }, "details": { - "name": "Entity::GetComponentConfiguration", - "category": "Entity" + "name": "Get Component Configuration", + "category": "Other" }, "params": [ { "typeid": "{41CC88A4-FE07-48E6-943D-998DE68AFF5C}", "details": { - "name": "BehaviorEntity*", + "name": "Behavior Entity", "tooltip": "Entity" } }, { "typeid": "{60A9A069-9C3D-465A-B7AD-0D6CC803990A}", "details": { - "name": "BehaviorComponentId" + "name": "Behavior Component Id" } }, { "typeid": "{0A7929DF-2932-40EA-B2B3-79BC1C3490D0}", "details": { - "name": "ComponentConfig&" + "name": "Component Config" } } ], @@ -467,7 +466,7 @@ { "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", "details": { - "name": "Boolean" + "name": "Success" } } ] @@ -477,28 +476,28 @@ "context": "Entity", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetName" + "tooltip": "When signaled, this will invoke Set Name" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetName is invoked" + "tooltip": "Signaled after Set Name is invoked" }, "details": { - "name": "Entity::SetName", - "category": "Entity" + "name": "Set Name", + "category": "Other" }, "params": [ { "typeid": "{41CC88A4-FE07-48E6-943D-998DE68AFF5C}", "details": { - "name": "BehaviorEntity*", + "name": "Behavior Entity", "tooltip": "Entity" } }, { "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", "details": { - "name": "const char*" + "name": "Name" } } ] @@ -508,21 +507,21 @@ "context": "Entity", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke IsActivated" + "tooltip": "When signaled, this will invoke Is Activated" }, "exit": { "name": "Out", - "tooltip": "Signaled after IsActivated is invoked" + "tooltip": "Signaled after Is Activated is invoked" }, "details": { - "name": "Entity::IsActivated", - "category": "Entity" + "name": "Is Activated", + "category": "Other" }, "params": [ { "typeid": "{41CC88A4-FE07-48E6-943D-998DE68AFF5C}", "details": { - "name": "BehaviorEntity*", + "name": "Behavior Entity", "tooltip": "Entity" } } @@ -531,7 +530,7 @@ { "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", "details": { - "name": "Boolean" + "name": "Is Activated" } } ] @@ -548,14 +547,14 @@ "tooltip": "Signaled after Activate is invoked" }, "details": { - "name": "Entity::Activate", - "category": "Entity" + "name": "Activate", + "category": "Other" }, "params": [ { "typeid": "{41CC88A4-FE07-48E6-943D-998DE68AFF5C}", "details": { - "name": "BehaviorEntity*", + "name": "Behavior Entity", "tooltip": "Entity" } } @@ -573,14 +572,14 @@ "tooltip": "Signaled after Deactivate is invoked" }, "details": { - "name": "Entity::Deactivate", - "category": "Entity" + "name": "Deactivate", + "category": "Other" }, "params": [ { "typeid": "{41CC88A4-FE07-48E6-943D-998DE68AFF5C}", "details": { - "name": "BehaviorEntity*", + "name": "Behavior Entity", "tooltip": "Entity" } } @@ -591,21 +590,21 @@ "context": "Entity", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetName" + "tooltip": "When signaled, this will invoke Get Name" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetName is invoked" + "tooltip": "Signaled after Get Name is invoked" }, "details": { - "name": "Entity::GetName", - "category": "Entity" + "name": "GetName", + "category": "Other" }, "params": [ { "typeid": "{41CC88A4-FE07-48E6-943D-998DE68AFF5C}", "details": { - "name": "BehaviorEntity*", + "name": "Behavior Entity", "tooltip": "Entity" } } @@ -614,7 +613,7 @@ { "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", "details": { - "name": "String" + "name": "Name" } } ] @@ -631,14 +630,14 @@ "tooltip": "Signaled after Exists is invoked" }, "details": { - "name": "Entity::Exists", - "category": "Entity" + "name": "Exists", + "category": "Other" }, "params": [ { "typeid": "{41CC88A4-FE07-48E6-943D-998DE68AFF5C}", "details": { - "name": "BehaviorEntity*", + "name": "Behavior Entity", "tooltip": "Entity" } } @@ -647,7 +646,7 @@ { "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", "details": { - "name": "Boolean" + "name": "Exists" } } ] diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SettingsRegistryInterface.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SettingsRegistryInterface.names index 31cfa551b4..8500946948 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SettingsRegistryInterface.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SettingsRegistryInterface.names @@ -5,7 +5,8 @@ "context": "BehaviorClass", "variant": "", "details": { - "name": "SettingsRegistryInterface" + "name": "Settings Registry", + "category": "Registry" }, "methods": [ { @@ -13,27 +14,26 @@ "context": "SettingsRegistryInterface", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetFloat" + "tooltip": "When signaled, this will invoke Get Float" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetFloat is invoked" + "tooltip": "Signaled after Get Float is invoked" }, "details": { - "name": "SettingsRegistryInterface::GetFloat", - "category": "Other" + "name": "Get Float" }, "params": [ { "typeid": "{795C80A0-D243-473B-972A-C32CA487BAA5}", "details": { - "name": "SettingsRegistryScriptProxy*" + "name": "Settings Registry Proxy" } }, { "typeid": "{7114E998-A8B4-519B-9342-A86D1587B4F7}", "details": { - "name": "AZStd::basic_string_view>" + "name": "JSON Path" } } ], @@ -41,7 +41,7 @@ { "typeid": "{8FE8A00F-5FE8-54A1-A314-346843AD21B6}", "details": { - "name": "AZStd::optional" + "name": "Value" } } ] @@ -51,33 +51,32 @@ "context": "SettingsRegistryInterface", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetFloat" + "tooltip": "When signaled, this will invoke Set Float" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetFloat is invoked" + "tooltip": "Signaled after Set Float is invoked" }, "details": { - "name": "SettingsRegistryInterface::SetFloat", - "category": "Other" + "name": "Set Float" }, "params": [ { "typeid": "{795C80A0-D243-473B-972A-C32CA487BAA5}", "details": { - "name": "SettingsRegistryScriptProxy*" + "name": "Settings Registry Proxy" } }, { "typeid": "{7114E998-A8B4-519B-9342-A86D1587B4F7}", "details": { - "name": "AZStd::basic_string_view>" + "name": "JSON Path" } }, { "typeid": "{110C4B14-11A8-4E9D-8638-5051013A56AC}", "details": { - "name": "double" + "name": "Value" } } ], @@ -85,7 +84,7 @@ { "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", "details": { - "name": "bool" + "name": "Success" } } ] @@ -95,27 +94,26 @@ "context": "SettingsRegistryInterface", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke RemoveKey" + "tooltip": "When signaled, this will invoke Remove Key" }, "exit": { "name": "Out", - "tooltip": "Signaled after RemoveKey is invoked" + "tooltip": "Signaled after Remove Key is invoked" }, "details": { - "name": "SettingsRegistryInterface::RemoveKey", - "category": "Other" + "name": "Remove Key" }, "params": [ { "typeid": "{795C80A0-D243-473B-972A-C32CA487BAA5}", "details": { - "name": "SettingsRegistryScriptProxy*" + "name": "Settings Registry Proxy" } }, { "typeid": "{7114E998-A8B4-519B-9342-A86D1587B4F7}", "details": { - "name": "AZStd::basic_string_view>" + "name": "JSON Path" } } ], @@ -123,7 +121,7 @@ { "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", "details": { - "name": "bool" + "name": "Success" } } ] @@ -133,33 +131,32 @@ "context": "SettingsRegistryInterface", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetInt" + "tooltip": "When signaled, this will invoke Set Int" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetInt is invoked" + "tooltip": "Signaled after Set Int is invoked" }, "details": { - "name": "SettingsRegistryInterface::SetInt", - "category": "Other" + "name": "Set Int" }, "params": [ { "typeid": "{795C80A0-D243-473B-972A-C32CA487BAA5}", "details": { - "name": "SettingsRegistryScriptProxy*" + "name": "Settings Registry Proxy" } }, { "typeid": "{7114E998-A8B4-519B-9342-A86D1587B4F7}", "details": { - "name": "AZStd::basic_string_view>" + "name": "JSON Path" } }, { "typeid": "{70D8A282-A1EA-462D-9D04-51EDE81FAC2F}", "details": { - "name": "AZ::s64" + "name": "Value" } } ], @@ -167,7 +164,7 @@ { "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", "details": { - "name": "bool" + "name": "Success" } } ] @@ -177,33 +174,32 @@ "context": "SettingsRegistryInterface", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetUInt" + "tooltip": "When signaled, this will invoke Set UInt" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetUInt is invoked" + "tooltip": "Signaled after Set UInt is invoked" }, "details": { - "name": "SettingsRegistryInterface::SetUInt", - "category": "Other" + "name": "Set UInt" }, "params": [ { "typeid": "{795C80A0-D243-473B-972A-C32CA487BAA5}", "details": { - "name": "SettingsRegistryScriptProxy*" + "name": "Settings Registry Proxy" } }, { "typeid": "{7114E998-A8B4-519B-9342-A86D1587B4F7}", "details": { - "name": "AZStd::basic_string_view>" + "name": "JSON Path" } }, { "typeid": "{D6597933-47CD-4FC8-B911-63F3E2B0993A}", "details": { - "name": "AZ::u64" + "name": "Value" } } ], @@ -211,7 +207,7 @@ { "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", "details": { - "name": "bool" + "name": "Success" } } ] @@ -221,27 +217,26 @@ "context": "SettingsRegistryInterface", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetBool" + "tooltip": "When signaled, this will invoke Get Bool" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetBool is invoked" + "tooltip": "Signaled after Get Bool is invoked" }, "details": { - "name": "SettingsRegistryInterface::GetBool", - "category": "Other" + "name": "Get Bool" }, "params": [ { "typeid": "{795C80A0-D243-473B-972A-C32CA487BAA5}", "details": { - "name": "SettingsRegistryScriptProxy*" + "name": "Settings Registry Proxy" } }, { "typeid": "{7114E998-A8B4-519B-9342-A86D1587B4F7}", "details": { - "name": "AZStd::basic_string_view>" + "name": "JSON Path" } } ], @@ -249,7 +244,7 @@ { "typeid": "{0170062C-2E7E-5CEB-BAB8-F7663BEF7B3E}", "details": { - "name": "AZStd::optional" + "name": "Value" } } ] @@ -259,27 +254,26 @@ "context": "SettingsRegistryInterface", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetInt" + "tooltip": "When signaled, this will invoke Get Int" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetInt is invoked" + "tooltip": "Signaled after Get Int is invoked" }, "details": { - "name": "SettingsRegistryInterface::GetInt", - "category": "Other" + "name": "Get Int" }, "params": [ { "typeid": "{795C80A0-D243-473B-972A-C32CA487BAA5}", "details": { - "name": "SettingsRegistryScriptProxy*" + "name": "Settings Registry Proxy" } }, { "typeid": "{7114E998-A8B4-519B-9342-A86D1587B4F7}", "details": { - "name": "AZStd::basic_string_view>" + "name": "JSON Path" } } ], @@ -287,7 +281,7 @@ { "typeid": "{8E0A7AC1-C649-56B4-99CF-8BE08EEFC47B}", "details": { - "name": "AZStd::optional" + "name": "Value" } } ] @@ -297,27 +291,26 @@ "context": "SettingsRegistryInterface", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetUInt" + "tooltip": "When signaled, this will invoke Get UInt" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetUInt is invoked" + "tooltip": "Signaled after Get UInt is invoked" }, "details": { - "name": "SettingsRegistryInterface::GetUInt", - "category": "Other" + "name": "Get UInt" }, "params": [ { "typeid": "{795C80A0-D243-473B-972A-C32CA487BAA5}", "details": { - "name": "SettingsRegistryScriptProxy*" + "name": "Settings Registry Proxy" } }, { "typeid": "{7114E998-A8B4-519B-9342-A86D1587B4F7}", "details": { - "name": "AZStd::basic_string_view>" + "name": "JSON Path" } } ], @@ -325,7 +318,7 @@ { "typeid": "{858A22B8-1B5E-5016-BF33-B2469DD9CAD3}", "details": { - "name": "AZStd::optional" + "name": "Value" } } ] @@ -335,15 +328,14 @@ "context": "SettingsRegistryInterface", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetNotifyEvent" + "tooltip": "When signaled, this will invoke Get Notify Event" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetNotifyEvent is invoked" + "tooltip": "Signaled after Get Notify Event is invoked" }, "details": { - "name": "Get Notify Event", - "subtitle": "Settings Registry" + "name": "Get Notify Event" }, "params": [ { @@ -357,7 +349,7 @@ { "typeid": "{84290CFC-1335-5341-AD8B-0A3FE9FE46D0}", "details": { - "name": "Event" + "name": "Script Notify Event" } } ] @@ -367,33 +359,33 @@ "context": "SettingsRegistryInterface", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke MergeSettings" + "tooltip": "When signaled, this will invoke Merge Settings" }, "exit": { "name": "Out", - "tooltip": "Signaled after MergeSettings is invoked" + "tooltip": "Signaled after Merge Settings is invoked" }, "details": { - "name": "SettingsRegistryInterface::MergeSettings", - "category": "Other" + "name": "Merge Settings" }, "params": [ { "typeid": "{795C80A0-D243-473B-972A-C32CA487BAA5}", "details": { - "name": "SettingsRegistryScriptProxy*" + "name": "Settings Registry Proxy" } }, { "typeid": "{7114E998-A8B4-519B-9342-A86D1587B4F7}", "details": { - "name": "AZStd::basic_string_view>" + "name": "JSON Path" } }, { "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", "details": { - "name": "int" + "name": "Format", + "tooltip": "0: Json Path, 1: Json Merge Patch" } } ], @@ -401,7 +393,7 @@ { "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", "details": { - "name": "bool" + "name": "Success" } } ] @@ -411,39 +403,39 @@ "context": "SettingsRegistryInterface", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke MergeSettingsFile" + "tooltip": "When signaled, this will invoke Merge Settings File" }, "exit": { "name": "Out", - "tooltip": "Signaled after MergeSettingsFile is invoked" + "tooltip": "Signaled after Merge Settings File is invoked" }, "details": { - "name": "SettingsRegistryInterface::MergeSettingsFile", - "category": "Other" + "name": "Merge Settings File" }, "params": [ { "typeid": "{795C80A0-D243-473B-972A-C32CA487BAA5}", "details": { - "name": "SettingsRegistryScriptProxy*" + "name": "Settings Registry Proxy" } }, { "typeid": "{7114E998-A8B4-519B-9342-A86D1587B4F7}", "details": { - "name": "AZStd::basic_string_view>" + "name": "JSON Path" } }, { "typeid": "{7114E998-A8B4-519B-9342-A86D1587B4F7}", "details": { - "name": "AZStd::basic_string_view>" + "name": "Root Key" } }, { "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", "details": { - "name": "int" + "name": "Format", + "tooltip": "0: Json Path, 1: Json Merge Patch" } } ], @@ -451,7 +443,7 @@ { "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", "details": { - "name": "bool" + "name": "Success" } } ] @@ -461,27 +453,26 @@ "context": "SettingsRegistryInterface", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetString" + "tooltip": "When signaled, this will invoke Get String" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetString is invoked" + "tooltip": "Signaled after Get String is invoked" }, "details": { - "name": "SettingsRegistryInterface::GetString", - "category": "Other" + "name": "Get String" }, "params": [ { "typeid": "{795C80A0-D243-473B-972A-C32CA487BAA5}", "details": { - "name": "SettingsRegistryScriptProxy*" + "name": "Settings Registry Proxy" } }, { "typeid": "{7114E998-A8B4-519B-9342-A86D1587B4F7}", "details": { - "name": "AZStd::basic_string_view>" + "name": "JSON Path" } } ], @@ -489,7 +480,7 @@ { "typeid": "{B0D91084-263A-54B9-A4F3-7C5F4240E248}", "details": { - "name": "AZStd::optional, allocator>>" + "name": "Output" } } ] @@ -499,21 +490,20 @@ "context": "SettingsRegistryInterface", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke IsValid" + "tooltip": "When signaled, this will invoke Is Valid" }, "exit": { "name": "Out", - "tooltip": "Signaled after IsValid is invoked" + "tooltip": "Signaled after Is Valid is invoked" }, "details": { - "name": "SettingsRegistryInterface::IsValid", - "category": "Other" + "name": "Is Valid" }, "params": [ { "typeid": "{795C80A0-D243-473B-972A-C32CA487BAA5}", "details": { - "name": "SettingsRegistryScriptProxy*" + "name": "Settings Registry Proxy" } } ], @@ -521,7 +511,7 @@ { "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", "details": { - "name": "bool" + "name": "Success" } } ] @@ -531,39 +521,38 @@ "context": "SettingsRegistryInterface", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke MergeSettingsFolder" + "tooltip": "When signaled, this will invoke Merge Settings Folder" }, "exit": { "name": "Out", - "tooltip": "Signaled after MergeSettingsFolder is invoked" + "tooltip": "Signaled after Merge Settings Folder is invoked" }, "details": { - "name": "SettingsRegistryInterface::MergeSettingsFolder", - "category": "Other" + "name": "Merge Settings Folder" }, "params": [ { "typeid": "{795C80A0-D243-473B-972A-C32CA487BAA5}", "details": { - "name": "SettingsRegistryScriptProxy*" + "name": "Settings Registry Proxy" } }, { "typeid": "{7114E998-A8B4-519B-9342-A86D1587B4F7}", "details": { - "name": "AZStd::basic_string_view>" + "name": "JSON Path" } }, { "typeid": "{EB6B8ADF-ABAA-4D22-B596-127F9C611740}", "details": { - "name": "const SpecializationsProxy&" + "name": "Specializations Proxy" } }, { "typeid": "{7114E998-A8B4-519B-9342-A86D1587B4F7}", "details": { - "name": "AZStd::basic_string_view>" + "name": "JSON Path" } } ], @@ -571,7 +560,7 @@ { "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", "details": { - "name": "bool" + "name": "Success" } } ] @@ -581,33 +570,32 @@ "context": "SettingsRegistryInterface", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetBool" + "tooltip": "When signaled, this will invoke Set Bool" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetBool is invoked" + "tooltip": "Signaled after Set Bool is invoked" }, "details": { - "name": "SettingsRegistryInterface::SetBool", - "category": "Other" + "name": "Set Bool" }, "params": [ { "typeid": "{795C80A0-D243-473B-972A-C32CA487BAA5}", "details": { - "name": "SettingsRegistryScriptProxy*" + "name": "Settings Registry Proxy" } }, { "typeid": "{7114E998-A8B4-519B-9342-A86D1587B4F7}", "details": { - "name": "AZStd::basic_string_view>" + "name": "JSON Path" } }, { "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", "details": { - "name": "bool" + "name": "Success" } } ], @@ -615,7 +603,7 @@ { "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", "details": { - "name": "bool" + "name": "Success" } } ] @@ -625,33 +613,32 @@ "context": "SettingsRegistryInterface", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetString" + "tooltip": "When signaled, this will invoke Set String" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetString is invoked" + "tooltip": "Signaled after Set String is invoked" }, "details": { - "name": "SettingsRegistryInterface::SetString", - "category": "Other" + "name": "Set String" }, "params": [ { "typeid": "{795C80A0-D243-473B-972A-C32CA487BAA5}", "details": { - "name": "SettingsRegistryScriptProxy*" + "name": "Settings Registry Proxy" } }, { "typeid": "{7114E998-A8B4-519B-9342-A86D1587B4F7}", "details": { - "name": "AZStd::basic_string_view>" + "name": "JSON Path" } }, { "typeid": "{7114E998-A8B4-519B-9342-A86D1587B4F7}", "details": { - "name": "AZStd::basic_string_view>" + "name": "JSON Path" } } ], @@ -659,7 +646,7 @@ { "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", "details": { - "name": "bool" + "name": "Success" } } ] @@ -669,27 +656,26 @@ "context": "SettingsRegistryInterface", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke DumpSettings" + "tooltip": "When signaled, this will invoke Dump Settings" }, "exit": { "name": "Out", - "tooltip": "Signaled after DumpSettings is invoked" + "tooltip": "Signaled after Dump Settings is invoked" }, "details": { - "name": "SettingsRegistryInterface::DumpSettings", - "category": "Other" + "name": "Dump Settings" }, "params": [ { "typeid": "{795C80A0-D243-473B-972A-C32CA487BAA5}", "details": { - "name": "SettingsRegistryScriptProxy*" + "name": "Settings Registry Proxy" } }, { "typeid": "{7114E998-A8B4-519B-9342-A86D1587B4F7}", "details": { - "name": "AZStd::basic_string_view>" + "name": "JSON Path" } } ], @@ -697,7 +683,7 @@ { "typeid": "{B0D91084-263A-54B9-A4F3-7C5F4240E248}", "details": { - "name": "AZStd::optional, allocator>>" + "name": "Output" } } ] diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/Specializations.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/Specializations.names index db5ae9fccf..a9f36b42d3 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/Specializations.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/Specializations.names @@ -5,7 +5,8 @@ "context": "BehaviorClass", "variant": "", "details": { - "name": "Specializations" + "name": "Specializations", + "category": "Registry" }, "methods": [ { @@ -13,27 +14,27 @@ "context": "Specializations", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetPriority" + "tooltip": "When signaled, this will invoke Get Priority" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetPriority is invoked" + "tooltip": "Signaled after Get Priority is invoked" }, "details": { - "name": "Specializations::GetPriority", + "name": "Get Priority", "category": "Other" }, "params": [ { "typeid": "{EB6B8ADF-ABAA-4D22-B596-127F9C611740}", "details": { - "name": "SpecializationsProxy*" + "name": "Specializations Proxy" } }, { "typeid": "{7114E998-A8B4-519B-9342-A86D1587B4F7}", "details": { - "name": "AZStd::basic_string_view>" + "name": "Specialization" } } ], @@ -41,7 +42,7 @@ { "typeid": "{D6597933-47CD-4FC8-B911-63F3E2B0993A}", "details": { - "name": "AZ::u64" + "name": "Priority" } } ] @@ -51,21 +52,20 @@ "context": "Specializations", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetCount" + "tooltip": "When signaled, this will invoke Get Count" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetCount is invoked" + "tooltip": "Signaled after Get Count is invoked" }, "details": { - "name": "Specializations::GetCount", - "category": "Other" + "name": "Get Count" }, "params": [ { "typeid": "{EB6B8ADF-ABAA-4D22-B596-127F9C611740}", "details": { - "name": "SpecializationsProxy*" + "name": "Specializations Proxy" } } ], @@ -73,7 +73,7 @@ { "typeid": "{D6597933-47CD-4FC8-B911-63F3E2B0993A}", "details": { - "name": "AZ::u64" + "name": "Count" } } ] @@ -90,20 +90,19 @@ "tooltip": "Signaled after Contains is invoked" }, "details": { - "name": "Specializations::Contains", - "category": "Other" + "name": "Contains" }, "params": [ { "typeid": "{EB6B8ADF-ABAA-4D22-B596-127F9C611740}", "details": { - "name": "SpecializationsProxy*" + "name": "Specializations Proxy" } }, { "typeid": "{7114E998-A8B4-519B-9342-A86D1587B4F7}", "details": { - "name": "AZStd::basic_string_view>" + "name": "Specialization" } } ], @@ -111,7 +110,7 @@ { "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", "details": { - "name": "bool" + "name": "Contains" } } ] @@ -128,20 +127,19 @@ "tooltip": "Signaled after Append is invoked" }, "details": { - "name": "Specializations::Append", - "category": "Other" + "name": "Append" }, "params": [ { "typeid": "{EB6B8ADF-ABAA-4D22-B596-127F9C611740}", "details": { - "name": "SpecializationsProxy*" + "name": "Specializations Proxy" } }, { "typeid": "{7114E998-A8B4-519B-9342-A86D1587B4F7}", "details": { - "name": "AZStd::basic_string_view>" + "name": "Specialization" } } ], @@ -149,7 +147,7 @@ { "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", "details": { - "name": "bool" + "name": "Success" } } ] @@ -159,27 +157,26 @@ "context": "Specializations", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetSpecialization" + "tooltip": "When signaled, this will invoke Get Specialization" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetSpecialization is invoked" + "tooltip": "Signaled after Get Specialization is invoked" }, "details": { - "name": "Specializations::GetSpecialization", - "category": "Other" + "name": "Get Specialization" }, "params": [ { "typeid": "{EB6B8ADF-ABAA-4D22-B596-127F9C611740}", "details": { - "name": "SpecializationsProxy*" + "name": "Specializations Proxy" } }, { "typeid": "{D6597933-47CD-4FC8-B911-63F3E2B0993A}", "details": { - "name": "AZ::u64" + "name": "Index" } } ], @@ -187,7 +184,7 @@ { "typeid": "{7114E998-A8B4-519B-9342-A86D1587B4F7}", "details": { - "name": "AZStd::basic_string_view>" + "name": "Specialization" } } ] From 199a59e8f9824cef4a5c0ac3da1683bb7ded66a6 Mon Sep 17 00:00:00 2001 From: Steve Pham <82231385+spham-amzn@users.noreply.github.com> Date: Thu, 18 Nov 2021 17:30:24 -0800 Subject: [PATCH 139/345] Update package and hash for pyside2 (#5773) Signed-off-by: Steve Pham <82231385+spham-amzn@users.noreply.github.com> --- cmake/3rdParty/Platform/Linux/BuiltInPackages_linux.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/3rdParty/Platform/Linux/BuiltInPackages_linux.cmake b/cmake/3rdParty/Platform/Linux/BuiltInPackages_linux.cmake index 903364d8f5..a330966085 100644 --- a/cmake/3rdParty/Platform/Linux/BuiltInPackages_linux.cmake +++ b/cmake/3rdParty/Platform/Linux/BuiltInPackages_linux.cmake @@ -45,4 +45,4 @@ ly_associate_package(PACKAGE_NAME squish-ccr-deb557d-rev1-linux ly_associate_package(PACKAGE_NAME astc-encoder-3.2-rev1-linux TARGETS astc-encoder PACKAGE_HASH 2ba97a06474d609945f0ab4419af1f6bbffdd294ca6b869f5fcebec75c573c0f) ly_associate_package(PACKAGE_NAME ISPCTexComp-36b80aa-rev1-linux TARGETS ISPCTexComp PACKAGE_HASH 065fd12abe4247dde247330313763cf816c3375c221da030bdec35024947f259) ly_associate_package(PACKAGE_NAME lz4-1.9.3-vcpkg-rev4-linux TARGETS lz4 PACKAGE_HASH 5de3dbd3e2a3537c6555d759b3c5bb98e5456cf85c74ff6d046f809b7087290d) -ly_associate_package(PACKAGE_NAME pyside2-5.15.2-rev1-linux TARGETS pyside2 PACKAGE_HASH ec04291f3940e76ac817bc0c825f7a47f18d8760f0bdb8da4530732f2a69405e) +ly_associate_package(PACKAGE_NAME pyside2-5.15.2-rev2-linux TARGETS pyside2 PACKAGE_HASH 7589c397c8224d0c3ad691ff02e1afd55d9a1f9de1967c14eb8105dd2b0c4dd1) From a465bf30a7292ca5b088b8aaea4c8a34e98583ee Mon Sep 17 00:00:00 2001 From: AMZN-Phil Date: Thu, 18 Nov 2021 17:30:52 -0800 Subject: [PATCH 140/345] Iterate over dependent gems Signed-off-by: AMZN-Phil --- Code/Tools/ProjectManager/Source/GemCatalog/GemModel.cpp | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/Code/Tools/ProjectManager/Source/GemCatalog/GemModel.cpp b/Code/Tools/ProjectManager/Source/GemCatalog/GemModel.cpp index ca9be341c6..d163ab9076 100644 --- a/Code/Tools/ProjectManager/Source/GemCatalog/GemModel.cpp +++ b/Code/Tools/ProjectManager/Source/GemCatalog/GemModel.cpp @@ -494,15 +494,10 @@ namespace O3DE::ProjectManager // we need to deactivate all gems that depend on this one for (auto dependentModelIndex : dependentGems) { - DeactivateDependentGems(model, dependentModelIndex); + SetIsAdded(model, dependentModelIndex, false); } } - else - { - // Deactivate this gem - SetIsAdded(model, modelIndex, false); - } } void GemModel::SetDownloadStatus(QAbstractItemModel& model, const QModelIndex& modelIndex, GemInfo::DownloadStatus status) From 6b08e66e824fd477b65ef91b8f92976867240817 Mon Sep 17 00:00:00 2001 From: puvvadar Date: Thu, 18 Nov 2021 17:59:43 -0800 Subject: [PATCH 141/345] Cleaning up warns in Terrain PBR material Signed-off-by: puvvadar --- .../Terrain/DefaultPbrTerrain.material | 20 +------------------ 1 file changed, 1 insertion(+), 19 deletions(-) diff --git a/Gems/Terrain/Assets/Materials/Terrain/DefaultPbrTerrain.material b/Gems/Terrain/Assets/Materials/Terrain/DefaultPbrTerrain.material index d2acc2516a..7cf249a10d 100644 --- a/Gems/Terrain/Assets/Materials/Terrain/DefaultPbrTerrain.material +++ b/Gems/Terrain/Assets/Materials/Terrain/DefaultPbrTerrain.material @@ -2,23 +2,5 @@ "description": "", "materialType": "PbrTerrain.materialtype", "parentMaterial": "", - "propertyLayoutVersion": 1, - "properties": { - "baseColor": { - "color": [ 0.18, 0.18, 0.18 ], - "useTexture": false - }, - "normal": - { - "useTexture": false - }, - "roughness": - { - "useTexture": false - }, - "specularF0": - { - "useTexture": false - } - } + "propertyLayoutVersion": 1 } From 2fa83b5cfd4d5d0e803c74db5414b28596981ff4 Mon Sep 17 00:00:00 2001 From: puvvadar Date: Thu, 18 Nov 2021 19:49:43 -0800 Subject: [PATCH 142/345] Add debug logging to diagnose AP Logs Signed-off-by: puvvadar --- Tools/LyTestTools/ly_test_tools/o3de/asset_processor.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Tools/LyTestTools/ly_test_tools/o3de/asset_processor.py b/Tools/LyTestTools/ly_test_tools/o3de/asset_processor.py index 65319e05de..2a965975fa 100644 --- a/Tools/LyTestTools/ly_test_tools/o3de/asset_processor.py +++ b/Tools/LyTestTools/ly_test_tools/o3de/asset_processor.py @@ -188,6 +188,8 @@ class AssetProcessor(object): log = APLogParser(self._workspace.paths.ap_gui_log()) if len(log.runs): try: + for key in log.run[-1]: + logger.debug(f"Log contained key {key} with value {log.run[-1][key]}") port = log.runs[-1][port_type] logger.debug(f"Read port type {port_type} : {port}") return True From e091b913001c6ec74cb17774ccb2c592f1961843 Mon Sep 17 00:00:00 2001 From: puvvadar Date: Thu, 18 Nov 2021 20:25:47 -0800 Subject: [PATCH 143/345] Fix typo Signed-off-by: puvvadar --- Tools/LyTestTools/ly_test_tools/o3de/asset_processor.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Tools/LyTestTools/ly_test_tools/o3de/asset_processor.py b/Tools/LyTestTools/ly_test_tools/o3de/asset_processor.py index 2a965975fa..250f8c4e44 100644 --- a/Tools/LyTestTools/ly_test_tools/o3de/asset_processor.py +++ b/Tools/LyTestTools/ly_test_tools/o3de/asset_processor.py @@ -189,7 +189,7 @@ class AssetProcessor(object): if len(log.runs): try: for key in log.run[-1]: - logger.debug(f"Log contained key {key} with value {log.run[-1][key]}") + logger.debug(f"Log contained key {key} with value {log.runs[-1][key]}") port = log.runs[-1][port_type] logger.debug(f"Read port type {port_type} : {port}") return True From 23dcc527a7f1f42b2692d5f3f373e58cabd35d3d Mon Sep 17 00:00:00 2001 From: Olex Lozitskiy <5432499+AMZN-Olex@users.noreply.github.com> Date: Thu, 18 Nov 2021 23:33:42 -0500 Subject: [PATCH 144/345] Merges PR 5707 that resolves #5611. Signed-off-by: Olex Lozitskiy <5432499+AMZN-Olex@users.noreply.github.com> --- Gems/Multiplayer/Code/CMakeLists.txt | 43 ++++++------------- .../Code/Source/MultiplayerGem.cpp | 28 +++++++----- ...pp => MultiplayerToolsSystemComponent.cpp} | 20 +-------- ...le.h => MultiplayerToolsSystemComponent.h} | 14 ------ .../Code/multiplayer_tools_files.cmake | 4 +- 5 files changed, 33 insertions(+), 76 deletions(-) rename Gems/Multiplayer/Code/Source/{MultiplayerToolsModule.cpp => MultiplayerToolsSystemComponent.cpp} (66%) rename Gems/Multiplayer/Code/Source/{MultiplayerToolsModule.h => MultiplayerToolsSystemComponent.h} (72%) diff --git a/Gems/Multiplayer/Code/CMakeLists.txt b/Gems/Multiplayer/Code/CMakeLists.txt index b971e6a2ce..dee68fa969 100644 --- a/Gems/Multiplayer/Code/CMakeLists.txt +++ b/Gems/Multiplayer/Code/CMakeLists.txt @@ -86,44 +86,24 @@ ly_create_alias(NAME Multiplayer.Servers NAMESPACE Gem TARGETS Gem::Multiplayer if (PAL_TRAIT_BUILD_HOST_TOOLS) ly_add_target( - NAME Multiplayer.Builders.Static STATIC + NAME Multiplayer.Tools.Static STATIC NAMESPACE Gem FILES_CMAKE multiplayer_tools_files.cmake - COMPILE_DEFINITIONS - PUBLIC - MULTIPLAYER_TOOLS INCLUDE_DIRECTORIES PRIVATE - . - Source ${pal_source_dir} - PUBLIC - Include - BUILD_DEPENDENCIES - PUBLIC - AZ::AzToolsFramework - Gem::Multiplayer.Static - ) - - # by naming this target Multiplayer.Builders it ensures that it is loaded - # in any pipeline tools (Like Asset Processor, AssetBuilder, etc) - ly_add_target( - NAME Multiplayer.Builders GEM_MODULE - NAMESPACE Gem - FILES_CMAKE - multiplayer_tools_files.cmake - INCLUDE_DIRECTORIES - PRIVATE + AZ::AzNetworking Source . PUBLIC Include BUILD_DEPENDENCIES - PRIVATE - Gem::Multiplayer.Builders.Static - RUNTIME_DEPENDENCIES - Gem::Multiplayer.Editor + PUBLIC + AZ::AzCore + AZ::AzFramework + AZ::AzNetworking + AZ::AzToolsFramework ) ly_add_target( @@ -150,11 +130,13 @@ if (PAL_TRAIT_BUILD_HOST_TOOLS) AZ::AzNetworking AZ::AzToolsFramework Gem::Multiplayer.Static + Gem::Multiplayer.Tools.Static Gem::Multiplayer.Builders ) - + + ly_create_alias(NAME Multiplayer.Builders NAMESPACE Gem TARGETS Gem::Multiplayer.Editor) # use the Multiplayer.Editor module in tools like the Editor: Such tools also get the visual debug view: - ly_create_alias(NAME Multiplayer.Tools NAMESPACE Gem TARGETS Gem::Multiplayer.Editor Gem::Multiplayer.Debug Gem::Multiplayer.Builders) + ly_create_alias(NAME Multiplayer.Tools NAMESPACE Gem TARGETS Gem::Multiplayer.Debug Gem::Multiplayer.Builders) endif() if (PAL_TRAIT_BUILD_TESTS_SUPPORTED) @@ -205,7 +187,8 @@ if (PAL_TRAIT_BUILD_TESTS_SUPPORTED) AZ::AzTest AZ::AzTestShared AZ::AzToolsFrameworkTestCommon - Gem::Multiplayer.Builders.Static + Gem::Multiplayer.Static + Gem::Multiplayer.Tools.Static ) ly_add_googletest( NAME Gem::Multiplayer.Builders.Tests diff --git a/Gems/Multiplayer/Code/Source/MultiplayerGem.cpp b/Gems/Multiplayer/Code/Source/MultiplayerGem.cpp index 030964d81c..830f0e2ef4 100644 --- a/Gems/Multiplayer/Code/Source/MultiplayerGem.cpp +++ b/Gems/Multiplayer/Code/Source/MultiplayerGem.cpp @@ -6,10 +6,9 @@ * */ +#include #include #include -#include -#include #include #include #include @@ -20,25 +19,32 @@ namespace Multiplayer MultiplayerModule::MultiplayerModule() : AZ::Module() { - m_descriptors.insert(m_descriptors.end(), { - AzNetworking::NetworkingSystemComponent::CreateDescriptor(), - MultiplayerSystemComponent::CreateDescriptor(), - NetBindComponent::CreateDescriptor(), - NetworkSpawnableHolderComponent::CreateDescriptor(), - }); + m_descriptors.insert( + m_descriptors.end(), + { + AzNetworking::NetworkingSystemComponent::CreateDescriptor(), + MultiplayerSystemComponent::CreateDescriptor(), + NetBindComponent::CreateDescriptor(), + NetworkSpawnableHolderComponent::CreateDescriptor(), +#ifdef MULTIPLAYER_EDITOR + MultiplayerToolsSystemComponent::CreateDescriptor(), +#endif + }); CreateComponentDescriptors(m_descriptors); } AZ::ComponentTypeList MultiplayerModule::GetRequiredSystemComponents() const { - return AZ::ComponentTypeList - { + return AZ::ComponentTypeList{ azrtti_typeid(), azrtti_typeid(), +#ifdef MULTIPLAYER_EDITOR + azrtti_typeid(), +#endif }; } -} +} // namespace Multiplayer #if !defined(MULTIPLAYER_EDITOR) AZ_DECLARE_MODULE_CLASS(Gem_Multiplayer, Multiplayer::MultiplayerModule); diff --git a/Gems/Multiplayer/Code/Source/MultiplayerToolsModule.cpp b/Gems/Multiplayer/Code/Source/MultiplayerToolsSystemComponent.cpp similarity index 66% rename from Gems/Multiplayer/Code/Source/MultiplayerToolsModule.cpp rename to Gems/Multiplayer/Code/Source/MultiplayerToolsSystemComponent.cpp index ecda82a31b..058517d5dc 100644 --- a/Gems/Multiplayer/Code/Source/MultiplayerToolsModule.cpp +++ b/Gems/Multiplayer/Code/Source/MultiplayerToolsSystemComponent.cpp @@ -6,7 +6,7 @@ * */ -#include +#include #include #include @@ -39,22 +39,4 @@ namespace Multiplayer { m_didProcessNetPrefabs = didProcessNetPrefabs; } - - MultiplayerToolsModule::MultiplayerToolsModule() - : AZ::Module() - { - m_descriptors.insert(m_descriptors.end(), { - MultiplayerToolsSystemComponent::CreateDescriptor(), - }); - } - - AZ::ComponentTypeList MultiplayerToolsModule::GetRequiredSystemComponents() const - { - return AZ::ComponentTypeList - { - azrtti_typeid(), - }; - } } // namespace Multiplayer - -AZ_DECLARE_MODULE_CLASS(Gem_Multiplayer_Tools, Multiplayer::MultiplayerToolsModule); diff --git a/Gems/Multiplayer/Code/Source/MultiplayerToolsModule.h b/Gems/Multiplayer/Code/Source/MultiplayerToolsSystemComponent.h similarity index 72% rename from Gems/Multiplayer/Code/Source/MultiplayerToolsModule.h rename to Gems/Multiplayer/Code/Source/MultiplayerToolsSystemComponent.h index d0a6a81afb..3c4f8ea7a3 100644 --- a/Gems/Multiplayer/Code/Source/MultiplayerToolsModule.h +++ b/Gems/Multiplayer/Code/Source/MultiplayerToolsSystemComponent.h @@ -37,19 +37,5 @@ namespace Multiplayer bool m_didProcessNetPrefabs = false; }; - - class MultiplayerToolsModule - : public AZ::Module - { - public: - - AZ_RTTI(MultiplayerToolsModule, "{3F726172-21FC-48FA-8CFA-7D87EBA07E55}", AZ::Module); - AZ_CLASS_ALLOCATOR(MultiplayerToolsModule, AZ::SystemAllocator, 0); - - MultiplayerToolsModule(); - ~MultiplayerToolsModule() override = default; - - AZ::ComponentTypeList GetRequiredSystemComponents() const override; - }; } // namespace Multiplayer diff --git a/Gems/Multiplayer/Code/multiplayer_tools_files.cmake b/Gems/Multiplayer/Code/multiplayer_tools_files.cmake index aa948f4e75..b180e239a2 100644 --- a/Gems/Multiplayer/Code/multiplayer_tools_files.cmake +++ b/Gems/Multiplayer/Code/multiplayer_tools_files.cmake @@ -10,6 +10,6 @@ set(FILES Include/Multiplayer/IMultiplayerTools.h Source/Pipeline/NetworkPrefabProcessor.cpp Source/Pipeline/NetworkPrefabProcessor.h - Source/MultiplayerToolsModule.h - Source/MultiplayerToolsModule.cpp + Source/MultiplayerToolsSystemComponent.cpp + Source/MultiplayerToolsSystemComponent.h ) From 7dfd790de26364f94993fc5ed41a7d12b7afa475 Mon Sep 17 00:00:00 2001 From: puvvadar Date: Thu, 18 Nov 2021 21:01:38 -0800 Subject: [PATCH 145/345] Fix typo Signed-off-by: puvvadar --- Tools/LyTestTools/ly_test_tools/o3de/asset_processor.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Tools/LyTestTools/ly_test_tools/o3de/asset_processor.py b/Tools/LyTestTools/ly_test_tools/o3de/asset_processor.py index 250f8c4e44..3953de0b25 100644 --- a/Tools/LyTestTools/ly_test_tools/o3de/asset_processor.py +++ b/Tools/LyTestTools/ly_test_tools/o3de/asset_processor.py @@ -188,7 +188,7 @@ class AssetProcessor(object): log = APLogParser(self._workspace.paths.ap_gui_log()) if len(log.runs): try: - for key in log.run[-1]: + for key in log.runs[-1]: logger.debug(f"Log contained key {key} with value {log.runs[-1][key]}") port = log.runs[-1][port_type] logger.debug(f"Read port type {port_type} : {port}") From d30fdb759d07e54d36309680ffa4247f1481ceb2 Mon Sep 17 00:00:00 2001 From: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com> Date: Thu, 18 Nov 2021 21:27:43 -0800 Subject: [PATCH 146/345] Gem repo template (#5774) Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com> --- Templates/CMakeLists.txt | 1 + Templates/GemRepo/Template/gem.json | 19 +++++++++++++++++++ Templates/GemRepo/Template/repo.json | 11 +++++++++++ Templates/GemRepo/preview.png | 3 +++ Templates/GemRepo/template.json | 27 +++++++++++++++++++++++++++ engine.json | 1 + scripts/o3de/o3de/download.py | 5 +++++ 7 files changed, 67 insertions(+) create mode 100644 Templates/GemRepo/Template/gem.json create mode 100644 Templates/GemRepo/Template/repo.json create mode 100644 Templates/GemRepo/preview.png create mode 100644 Templates/GemRepo/template.json diff --git a/Templates/CMakeLists.txt b/Templates/CMakeLists.txt index 9735907a6a..5f5d561a9f 100644 --- a/Templates/CMakeLists.txt +++ b/Templates/CMakeLists.txt @@ -14,5 +14,6 @@ ly_install_directory( DefaultGem DefaultProject MinimalProject + GemRepo VERBATIM ) diff --git a/Templates/GemRepo/Template/gem.json b/Templates/GemRepo/Template/gem.json new file mode 100644 index 0000000000..292681b2b5 --- /dev/null +++ b/Templates/GemRepo/Template/gem.json @@ -0,0 +1,19 @@ +{ + "gem_name": "${Name}Gem", + "display_name": "${Name}Gem", + "license": "What license ${Name}Gem uses goes here: i.e. Apache-2.0 Or MIT", + "license_url": "", + "origin": "The primary repo for ${Name}Gem goes here: i.e. http://www.mydomain.com", + "summary": "A short description of ${Name}Gem which is zipped up in an archive named gem.zip in the root of the Gem Repo. Though not required, it is recommended that the sha256 of the gem.zip file should be placed in the sha256 field of this gem.json so the download can be verified.", + "origin_uri": "${RepoURI}/gem.zip", + "sha256": "", + "type": "Code", + "canonical_tags": [ + "Gem" + ], + "user_tags": [ + "${Name}Gem" + ], + "icon_path": "preview.png", + "requirements": "" +} diff --git a/Templates/GemRepo/Template/repo.json b/Templates/GemRepo/Template/repo.json new file mode 100644 index 0000000000..2af1fcfd2a --- /dev/null +++ b/Templates/GemRepo/Template/repo.json @@ -0,0 +1,11 @@ +{ + "repo_name":"${Name}", + "origin":"Origin for the ${Name} Gem Repository", + "repo_uri": "${RepoURI}", + "summary": "A Gem Repository with a single Gem in the root of the repository.", + "additional_info": "Additional info for ${Name}", + "last_updated": "", + "gems": [ + "${RepoURI}" + ] +} diff --git a/Templates/GemRepo/preview.png b/Templates/GemRepo/preview.png new file mode 100644 index 0000000000..78a2a735d2 --- /dev/null +++ b/Templates/GemRepo/preview.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6ae503ec99c8358991dc3c6e50737844d3602b81a49abbbed7d697d7238547c0 +size 28026 diff --git a/Templates/GemRepo/template.json b/Templates/GemRepo/template.json new file mode 100644 index 0000000000..88123a9dae --- /dev/null +++ b/Templates/GemRepo/template.json @@ -0,0 +1,27 @@ +{ + "template_name": "GemRepo", + "origin": "The primary repo for GemRepo goes here: i.e. http://www.mydomain.com", + "license": "What license GemRepo uses goes here: i.e. https://opensource.org/licenses/MIT", + "display_name": "GemRepo", + "summary": "A Gem Repository that contains a single Gem.", + "canonical_tags": [], + "user_tags": [ + "GemRepo" + ], + "icon_path": "preview.png", + "copyFiles": [ + { + "file": "gem.json", + "origin": "gem.json", + "isTemplated": true, + "isOptional": false + }, + { + "file": "repo.json", + "origin": "repo.json", + "isTemplated": true, + "isOptional": false + } + ], + "createDirectories": [] +} diff --git a/engine.json b/engine.json index 05ccd0abfd..2d182c78aa 100644 --- a/engine.json +++ b/engine.json @@ -90,6 +90,7 @@ "AutomatedTesting" ], "templates": [ + "Templates/GemRepo", "Templates/AssetGem", "Templates/DefaultGem", "Templates/DefaultProject", diff --git a/scripts/o3de/o3de/download.py b/scripts/o3de/o3de/download.py index a3dca1a97e..e88355bf06 100644 --- a/scripts/o3de/o3de/download.py +++ b/scripts/o3de/o3de/download.py @@ -48,6 +48,11 @@ def validate_downloaded_zip_sha256(download_uri_json_data: dict, download_zip_pa ' We cannot verify this is the actually the advertised object!!!') return 1 else: + if len(sha256A) == 0: + logger.warning('SECURITY WARNING: The advertised o3de object you downloaded has no "sha256"!!! Be VERY careful!!!' + ' We cannot verify this is the actually the advertised object!!!') + return 1 + with download_zip_path.open('rb') as f: sha256B = hashlib.sha256(f.read()).hexdigest() if sha256A != sha256B: From e50735c127d9a3a8e5f38fc737222e4b542a54f8 Mon Sep 17 00:00:00 2001 From: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com> Date: Fri, 19 Nov 2021 11:04:49 +0000 Subject: [PATCH 147/345] Improved look for viewport ui border close button (#5757) * improved look for viewport ui border close button Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com> * remove unused variable Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com> * removed commented 'fixme' calls Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com> * updates following PR feedback Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com> --- Code/Editor/ActionManager.cpp | 9 --- Code/Editor/ActionManager.h | 1 - Code/Editor/MainWindow.cpp | 26 ++------ .../ViewportUi/ViewportUiCluster.cpp | 3 - .../ViewportUi/ViewportUiDisplay.cpp | 65 ++++++++----------- .../ViewportUi/ViewportUiDisplay.h | 8 +-- .../ViewportUi/ViewportUiSwitcher.cpp | 5 -- 7 files changed, 35 insertions(+), 82 deletions(-) diff --git a/Code/Editor/ActionManager.cpp b/Code/Editor/ActionManager.cpp index ff74a2c208..4cc64a532e 100644 --- a/Code/Editor/ActionManager.cpp +++ b/Code/Editor/ActionManager.cpp @@ -152,15 +152,6 @@ ActionManager::ActionWrapper& ActionManager::ActionWrapper::SetMenu(DynamicMenu* return *this; } -ActionManager::ActionWrapper& ActionManager::ActionWrapper::SetApplyHoverEffect() -{ - // Our standard toolbar icons, when hovered on, get a white color effect. - // But for this to work we need .pngs that look good with this effect, so this only works with the standard toolbars - // and looks very ugly for other toolbars, including toolbars loaded from XML (which just show a white rectangle) - m_action->setProperty("IconHasHoverEffect", true); - return *this; -} - ActionManager::ActionWrapper& ActionManager::ActionWrapper::SetReserved() { m_action->setProperty("Reserved", true); diff --git a/Code/Editor/ActionManager.h b/Code/Editor/ActionManager.h index 8879bdc1fb..58504f860c 100644 --- a/Code/Editor/ActionManager.h +++ b/Code/Editor/ActionManager.h @@ -151,7 +151,6 @@ public: } ActionWrapper& SetMenu(DynamicMenu* menu); - ActionWrapper& SetApplyHoverEffect(); operator QAction*() const { return m_action; diff --git a/Code/Editor/MainWindow.cpp b/Code/Editor/MainWindow.cpp index e13a160bd6..cc5a4b6b3d 100644 --- a/Code/Editor/MainWindow.cpp +++ b/Code/Editor/MainWindow.cpp @@ -708,14 +708,10 @@ void MainWindow::InitActions() .SetShortcut(QKeySequence::Undo) .SetReserved() .SetStatusTip(tr("Undo last operation")) - //.SetMenu(new QMenu("FIXME")) - .SetApplyHoverEffect() .RegisterUpdateCallback(cryEdit, &CCryEditApp::OnUpdateUndo); am->AddAction(ID_REDO, tr("&Redo")) .SetShortcut(AzQtComponents::RedoKeySequence) .SetReserved() - //.SetMenu(new QMenu("FIXME")) - .SetApplyHoverEffect() .SetStatusTip(tr("Redo last undo operation")) .RegisterUpdateCallback(cryEdit, &CCryEditApp::OnUpdateRedo); @@ -731,7 +727,6 @@ void MainWindow::InitActions() // Modify actions am->AddAction(AzToolsFramework::EditModeMove, tr("Move")) .SetIcon(Style::icon("Move")) - .SetApplyHoverEffect() .SetShortcut(tr("1")) .SetToolTip(tr("Move (1)")) .SetCheckable(true) @@ -757,7 +752,6 @@ void MainWindow::InitActions() }); am->AddAction(AzToolsFramework::EditModeRotate, tr("Rotate")) .SetIcon(Style::icon("Translate")) - .SetApplyHoverEffect() .SetShortcut(tr("2")) .SetToolTip(tr("Rotate (2)")) .SetCheckable(true) @@ -783,7 +777,6 @@ void MainWindow::InitActions() }); am->AddAction(AzToolsFramework::EditModeScale, tr("Scale")) .SetIcon(Style::icon("Scale")) - .SetApplyHoverEffect() .SetShortcut(tr("3")) .SetToolTip(tr("Scale (3)")) .SetCheckable(true) @@ -808,7 +801,6 @@ void MainWindow::InitActions() am->AddAction(AzToolsFramework::SnapToGrid, tr("Snap to grid")) .SetIcon(Style::icon("Grid")) - .SetApplyHoverEffect() .SetShortcut(tr("G")) .SetToolTip(tr("Snap to grid (G)")) .SetStatusTip(tr("Toggles snap to grid")) @@ -821,7 +813,6 @@ void MainWindow::InitActions() am->AddAction(AzToolsFramework::SnapAngle, tr("Snap angle")) .SetIcon(Style::icon("Angle")) - .SetApplyHoverEffect() .SetStatusTip(tr("Snap angle")) .SetCheckable(true) .RegisterUpdateCallback([](QAction* action) { @@ -961,7 +952,6 @@ void MainWindow::InitActions() .SetShortcut(tr("Ctrl+P")) .SetToolTip(tr("Simulate (Ctrl+P)")) .SetStatusTip(tr("Enable processing of Physics and AI.")) - .SetApplyHoverEffect() .SetCheckable(true) .RegisterUpdateCallback(cryEdit, &CCryEditApp::OnSwitchPhysicsUpdate); am->AddAction(ID_GAME_SYNCPLAYER, tr("Move Player and Camera Separately")).SetCheckable(true) @@ -1051,8 +1041,7 @@ void MainWindow::InitActions() // Editors Toolbar actions am->AddAction(ID_OPEN_ASSET_BROWSER, tr("Asset browser")) - .SetToolTip(tr("Open Asset Browser")) - .SetApplyHoverEffect(); + .SetToolTip(tr("Open Asset Browser")); AZ::EBusReduceResult> emfxEnabled(false); using AnimationRequestBus = AzToolsFramework::EditorAnimationSystemRequestsBus; @@ -1062,8 +1051,7 @@ void MainWindow::InitActions() { QAction* action = am->AddAction(ID_OPEN_EMOTIONFX_EDITOR, tr("Animation Editor")) .SetToolTip(tr("Open Animation Editor (PREVIEW)")) - .SetIcon(QIcon(":/EMotionFX/EMFX_icon_32x32.png")) - .SetApplyHoverEffect(); + .SetIcon(QIcon(":/EMotionFX/EMFX_icon_32x32.png")); QObject::connect(action, &QAction::triggered, this, []() { QtViewPaneManager::instance()->OpenPane(LyViewPane::AnimationEditor); }); @@ -1071,12 +1059,10 @@ void MainWindow::InitActions() am->AddAction(ID_OPEN_AUDIO_CONTROLS_BROWSER, tr("Audio Controls Editor")) .SetToolTip(tr("Open Audio Controls Editor")) - .SetIcon(Style::icon("Audio")) - .SetApplyHoverEffect(); + .SetIcon(Style::icon("Audio")); am->AddAction(ID_OPEN_UICANVASEDITOR, tr(LyViewPane::UiEditor)) - .SetToolTip(tr("Open UI Editor")) - .SetApplyHoverEffect(); + .SetToolTip(tr("Open UI Editor")); // Edit Mode Toolbar Actions am->AddAction(IDC_SELECTION_MASK, tr("Selected Object Types")); @@ -1089,12 +1075,10 @@ void MainWindow::InitActions() // Object Toolbar Actions am->AddAction(ID_GOTO_SELECTED, tr("Go to selected object")) .SetIcon(Style::icon("select_object")) - .SetApplyHoverEffect() .Connect(&QAction::triggered, this, &MainWindow::OnGotoSelected); // Misc Toolbar Actions - am->AddAction(ID_OPEN_SUBSTANCE_EDITOR, tr("Open Substance Editor")) - .SetApplyHoverEffect(); + am->AddAction(ID_OPEN_SUBSTANCE_EDITOR, tr("Open Substance Editor")); } void MainWindow::InitToolActionHandlers() diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiCluster.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiCluster.cpp index bc299f9985..365ba237db 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiCluster.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiCluster.cpp @@ -62,9 +62,6 @@ namespace AzToolsFramework::ViewportUi::Internal return; } - // set hover to true by default - action->setProperty("IconHasHoverEffect", true); - // add the action addAction(action); diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiDisplay.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiDisplay.cpp index a728ce9ac8..ca8d409763 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiDisplay.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiDisplay.cpp @@ -20,10 +20,9 @@ namespace AzToolsFramework::ViewportUi::Internal { const static int HighlightBorderSize = 5; - const static char* HighlightBorderColor = "#4A90E2"; - const static int HighlightBorderBackButtonMargin = 5; + const static char* const HighlightBorderColor = "#4A90E2"; const static int HighlightBorderBackButtonIconSize = 20; - const static char* HighlightBorderBackButtonIconFile = "X_axis.svg"; + const static char* const HighlightBorderBackButtonIconFile = "X_axis.svg"; static void UnparentWidgets(ViewportUiElementIdInfoLookup& viewportUiElementIdInfoLookup) { @@ -258,7 +257,7 @@ namespace AzToolsFramework::ViewportUi::Internal auto viewportUiMapElement = m_viewportUiElements.find(elementId); if (viewportUiMapElement != m_viewportUiElements.end()) { - viewportUiMapElement->second.m_widget->setVisible(false); + viewportUiMapElement->second.m_widget->hide(); viewportUiMapElement->second.m_widget->setParent(nullptr); m_viewportUiElements.erase(viewportUiMapElement); } @@ -273,7 +272,7 @@ namespace AzToolsFramework::ViewportUi::Internal { if (ViewportUiElementInfo element = GetViewportUiElementInfo(elementId); element.m_widget) { - element.m_widget->setVisible(true); + element.m_widget->show(); } } @@ -281,7 +280,7 @@ namespace AzToolsFramework::ViewportUi::Internal { if (ViewportUiElementInfo element = GetViewportUiElementInfo(elementId); element.m_widget) { - element.m_widget->setVisible(false); + element.m_widget->hide(); } } @@ -298,14 +297,14 @@ namespace AzToolsFramework::ViewportUi::Internal void ViewportUiDisplay::CreateViewportBorder( const AZStd::string& borderTitle, AZStd::optional backButtonCallback) { - const AZStd::string styleSheet = AZStd::string::format( - "border: %dpx solid %s; border-top: %dpx solid %s;", HighlightBorderSize, HighlightBorderColor, ViewportUiTopBorderSize, - HighlightBorderColor); - m_uiOverlay.setStyleSheet(styleSheet.c_str()); + m_uiOverlay.setStyleSheet(QString("border: %1px solid %2; border-top: %3px solid %4;") + .arg( + QString::number(HighlightBorderSize), HighlightBorderColor, + QString::number(ViewportUiTopBorderSize), HighlightBorderColor)); m_uiOverlayLayout.setContentsMargins( HighlightBorderSize + ViewportUiOverlayMargin, ViewportUiTopBorderSize + ViewportUiOverlayMargin, HighlightBorderSize + ViewportUiOverlayMargin, HighlightBorderSize + ViewportUiOverlayMargin); - m_viewportBorderText.setVisible(true); + m_viewportBorderText.show(); m_viewportBorderText.setText(borderTitle.c_str()); // only display the back button if a callback was provided @@ -315,13 +314,13 @@ namespace AzToolsFramework::ViewportUi::Internal void ViewportUiDisplay::RemoveViewportBorder() { - m_viewportBorderText.setVisible(false); + m_viewportBorderText.hide(); m_uiOverlay.setStyleSheet("border: none;"); m_uiOverlayLayout.setContentsMargins( ViewportUiOverlayMargin, ViewportUiOverlayMargin + ViewportUiOverlayTopMarginPadding, ViewportUiOverlayMargin, ViewportUiOverlayMargin); m_viewportBorderBackButtonCallback.reset(); - m_viewportBorderBackButton.setVisible(false); + m_viewportBorderBackButton.hide(); } void ViewportUiDisplay::PositionViewportUiElementFromWorldSpace(ViewportUiElementId elementId, const AZ::Vector3& pos) @@ -358,41 +357,36 @@ namespace AzToolsFramework::ViewportUi::Internal void ViewportUiDisplay::InitializeUiOverlay() { - AZStd::string styleSheet; - m_uiMainWindow.setObjectName(QString("ViewportUiWindow")); ConfigureWindowForViewportUi(&m_uiMainWindow); - m_uiMainWindow.setVisible(false); + m_uiMainWindow.hide(); m_uiOverlay.setObjectName(QString("ViewportUiOverlay")); m_uiMainWindow.setCentralWidget(&m_uiOverlay); - m_uiOverlay.setVisible(false); + m_uiOverlay.hide(); // remove any spacing and margins from the UI Overlay Layout m_fullScreenLayout.setSpacing(0); m_fullScreenLayout.setContentsMargins(0, 0, 0, 0); m_fullScreenLayout.addLayout(&m_uiOverlayLayout, 0, 0, 1, 1); - // format the label which will appear on top of the highlight border - styleSheet = AZStd::string::format("background-color: %s; border: none;", HighlightBorderColor); - m_viewportBorderText.setStyleSheet(styleSheet.c_str()); + // style the label which will appear on top of the highlight border + m_viewportBorderText.setStyleSheet(QString("background-color: %1; border: none").arg(HighlightBorderColor)); m_viewportBorderText.setFixedHeight(ViewportUiTopBorderSize); - m_viewportBorderText.setVisible(false); + m_viewportBorderText.hide(); m_fullScreenLayout.addWidget(&m_viewportBorderText, 0, 0, Qt::AlignTop | Qt::AlignHCenter); - // format the back button which will appear in the top right of the highlight border - styleSheet = AZStd::string::format( - "border: 0px; padding-left: %dpx; padding-right: %dpx", HighlightBorderBackButtonMargin, HighlightBorderBackButtonMargin); - m_viewportBorderBackButton.setStyleSheet(styleSheet.c_str()); - m_viewportBorderBackButton.setVisible(false); - QIcon backButtonIcon(QString(AZStd::string::format(":/stylesheet/img/UI20/toolbar/%s", HighlightBorderBackButtonIconFile).c_str())); + m_viewportBorderBackButton.setAutoRaise(true); // hover highlight + m_viewportBorderBackButton.hide(); + + QIcon backButtonIcon(QString(":/stylesheet/img/UI20/toolbar/%1").arg(HighlightBorderBackButtonIconFile)); m_viewportBorderBackButton.setIcon(backButtonIcon); m_viewportBorderBackButton.setIconSize(QSize(HighlightBorderBackButtonIconSize, HighlightBorderBackButtonIconSize)); // setup the handler for the back button to call the user provided callback (if any) QObject::connect( - &m_viewportBorderBackButton, &QPushButton::clicked, - [this]() + &m_viewportBorderBackButton, &QToolButton::clicked, + [this] { if (m_viewportBorderBackButtonCallback.has_value()) { @@ -452,16 +446,9 @@ namespace AzToolsFramework::ViewportUi::Internal region += m_uiOverlay.childrenRegion(); // set viewport ui visibility depending on if elements are present - if (region.isEmpty() || !UiDisplayEnabled()) - { - m_uiMainWindow.setVisible(false); - m_uiOverlay.setVisible(false); - } - else - { - m_uiMainWindow.setVisible(true); - m_uiOverlay.setVisible(true); - } + const bool visible = !region.isEmpty() && UiDisplayEnabled(); + m_uiMainWindow.setVisible(visible); + m_uiOverlay.setVisible(visible); m_uiMainWindow.setMask(region); } diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiDisplay.h b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiDisplay.h index c75310a10f..dba0f25830 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiDisplay.h +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiDisplay.h @@ -17,7 +17,7 @@ #include #include #include -#include +#include AZ_PUSH_DISABLE_WARNING(4251, "-Wunknown-warning-option") #include @@ -115,9 +115,9 @@ namespace AzToolsFramework::ViewportUi::Internal QGridLayout m_fullScreenLayout; //!< The layout which extends across the full screen. ViewportUiDisplayLayout m_uiOverlayLayout; //!< The layout used for optionally anchoring Viewport UI Elements. QLabel m_viewportBorderText; //!< The text used for the viewport highlight border. - QPushButton m_viewportBorderBackButton; //!< The button to return from the viewport highlight border (only displayed if callback provided). - AZStd::optional - m_viewportBorderBackButtonCallback; //!< The optional callback for when the viewport highlight border back button is pressed. + QToolButton m_viewportBorderBackButton; //!< The button to return from the viewport highlight border (only displayed if callback provided). + //! The optional callback for when the viewport highlight border back button is pressed. + AZStd::optional m_viewportBorderBackButtonCallback; QWidget* m_renderOverlay; QPointer m_fullScreenWidget; //!< Reference to the widget attached to m_fullScreenLayout if any. diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiSwitcher.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiSwitcher.cpp index 6b8b1873f7..c4be11ac66 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiSwitcher.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiSwitcher.cpp @@ -22,8 +22,6 @@ namespace AzToolsFramework::ViewportUi::Internal // Add am empty active button (is set in the call to SetActiveMode) m_activeButton = new QToolButton(); - // No hover effect for the main button as it's not clickable - m_activeButton->setProperty("IconHasHoverEffect", false); m_activeButton->setCheckable(false); m_activeButton->setToolButtonStyle(Qt::ToolButtonTextBesideIcon); addWidget(m_activeButton); @@ -56,9 +54,6 @@ namespace AzToolsFramework::ViewportUi::Internal return; } - // set hover to true by default - action->setProperty("IconHasHoverEffect", true); - // add the action addAction(action); From 9e076db1fea6c91a7318cae5fa6f4e12b096e716 Mon Sep 17 00:00:00 2001 From: Benjamin Jillich <43751992+amzn-jillich@users.noreply.github.com> Date: Fri, 19 Nov 2021 14:48:10 +0100 Subject: [PATCH 148/345] [EMotion FX] In-place option isn't working correctly (#5743) The in-place option for the simple motion component, the motion anim graph node as well as in the motion window were not working in case the motion extraction node was not the root joint. The convention is to keep the motion extraction joint the root joint to make it work correctly - the isolated issue can be solved by only evaluating the motion extraction joint animation in case in-place is disabled and replace the is root joint check with one that checks if we are actually dealing with the motion extraction joint. Resolves #5636 Signed-off-by: Benjamin Jillich --- .../EMotionFX/Source/MotionData/NonUniformMotionData.cpp | 6 ++---- .../Code/EMotionFX/Source/MotionData/UniformMotionData.cpp | 6 ++---- Gems/EMotionFX/Code/Tests/AnimGraphMotionNodeTests.cpp | 2 ++ 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/Gems/EMotionFX/Code/EMotionFX/Source/MotionData/NonUniformMotionData.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/MotionData/NonUniformMotionData.cpp index 6ced6152e1..50f3a1f73f 100644 --- a/Gems/EMotionFX/Code/EMotionFX/Source/MotionData/NonUniformMotionData.cpp +++ b/Gems/EMotionFX/Code/EMotionFX/Source/MotionData/NonUniformMotionData.cpp @@ -78,7 +78,6 @@ namespace EMotionFX { const Actor* actor = settings.m_actorInstance->GetActor(); const MotionLinkData* motionLinkData = FindMotionLinkData(actor); - const Skeleton* skeleton = actor->GetSkeleton(); const size_t jointDataIndex = motionLinkData->GetJointDataLinks()[jointSkeletonIndex]; if (m_additive && jointDataIndex == InvalidIndex) @@ -88,7 +87,7 @@ namespace EMotionFX // Sample the interpolated data. Transform result; - const bool inPlace = (settings.m_inPlace && skeleton->GetNode(jointSkeletonIndex)->GetIsRootNode()); + const bool inPlace = (settings.m_inPlace && jointSkeletonIndex == actor->GetMotionExtractionNodeIndex()); if (jointDataIndex != InvalidIndex && !inPlace) { const JointData& jointData = m_jointData[jointDataIndex]; @@ -139,14 +138,13 @@ namespace EMotionFX const MotionLinkData* motionLinkData = FindMotionLinkData(actor); const ActorInstance* actorInstance = settings.m_actorInstance; - const Skeleton* skeleton = actor->GetSkeleton(); const Pose* bindPose = actorInstance->GetTransformData()->GetBindPose(); const size_t numNodes = actorInstance->GetNumEnabledNodes(); for (size_t i = 0; i < numNodes; ++i) { const uint16 jointIndex = actorInstance->GetEnabledNode(i); const size_t jointDataIndex = motionLinkData->GetJointDataLinks()[jointIndex]; - const bool inPlace = (settings.m_inPlace && skeleton->GetNode(jointIndex)->GetIsRootNode()); + const bool inPlace = (settings.m_inPlace && jointIndex == actor->GetMotionExtractionNodeIndex()); // Sample the interpolated data. Transform result; diff --git a/Gems/EMotionFX/Code/EMotionFX/Source/MotionData/UniformMotionData.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/MotionData/UniformMotionData.cpp index c4451ff902..881604c7ff 100644 --- a/Gems/EMotionFX/Code/EMotionFX/Source/MotionData/UniformMotionData.cpp +++ b/Gems/EMotionFX/Code/EMotionFX/Source/MotionData/UniformMotionData.cpp @@ -147,8 +147,7 @@ namespace EMotionFX size_t indexB; CalculateInterpolationIndicesUniform(settings.m_sampleTime, m_sampleSpacing, m_duration, m_numSamples, indexA, indexB, t); - const Skeleton* skeleton = actor->GetSkeleton(); - const bool inPlace = (settings.m_inPlace && skeleton->GetNode(jointSkeletonIndex)->GetIsRootNode()); + const bool inPlace = (settings.m_inPlace && jointSkeletonIndex == actor->GetMotionExtractionNodeIndex()); // Sample the interpolated data. Transform result; @@ -210,13 +209,12 @@ namespace EMotionFX const AZStd::vector& jointLinks = motionLinkData->GetJointDataLinks(); const ActorInstance* actorInstance = settings.m_actorInstance; - const Skeleton* skeleton = actor->GetSkeleton(); const Pose* bindPose = actorInstance->GetTransformData()->GetBindPose(); const size_t numNodes = actorInstance->GetNumEnabledNodes(); for (size_t i = 0; i < numNodes; ++i) { const size_t skeletonJointIndex = actorInstance->GetEnabledNode(i); - const bool inPlace = (settings.m_inPlace && skeleton->GetNode(skeletonJointIndex)->GetIsRootNode()); + const bool inPlace = (settings.m_inPlace && skeletonJointIndex == actor->GetMotionExtractionNodeIndex()); // Sample the interpolated data. Transform result; diff --git a/Gems/EMotionFX/Code/Tests/AnimGraphMotionNodeTests.cpp b/Gems/EMotionFX/Code/Tests/AnimGraphMotionNodeTests.cpp index a377495d6c..efff992564 100644 --- a/Gems/EMotionFX/Code/Tests/AnimGraphMotionNodeTests.cpp +++ b/Gems/EMotionFX/Code/Tests/AnimGraphMotionNodeTests.cpp @@ -161,6 +161,8 @@ namespace EMotionFX // Make sure all nodes exist. ASSERT_TRUE(rootNode && pelvisNode && lHandNode && lLoArmNode && lLoLegNode && lAnkleNode && rHandNode && rLoArmNode && rLoLegNode && rAnkleNode) << "All nodes used should exist."; + + m_actor->SetMotionExtractionNodeIndex(m_jackRootIndex); } void SetupMirrorNodes() From 3199cb9777b07cef158be9a0b337042307eefc34 Mon Sep 17 00:00:00 2001 From: greerdv Date: Fri, 19 Nov 2021 15:00:58 +0000 Subject: [PATCH 149/345] set initial collider component sub mode to translation Signed-off-by: greerdv --- Gems/PhysX/Code/Editor/ColliderComponentMode.cpp | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/Gems/PhysX/Code/Editor/ColliderComponentMode.cpp b/Gems/PhysX/Code/Editor/ColliderComponentMode.cpp index fbb8838bb8..c6ad0cd867 100644 --- a/Gems/PhysX/Code/Editor/ColliderComponentMode.cpp +++ b/Gems/PhysX/Code/Editor/ColliderComponentMode.cpp @@ -265,10 +265,7 @@ namespace PhysX m_buttonIds[static_cast(SubMode::Rotation)] = RegisterClusterButton(m_modeSelectionClusterId, "Rotate"); m_buttonIds[static_cast(SubMode::Dimensions)] = RegisterClusterButton(m_modeSelectionClusterId, "Scale"); - AzToolsFramework::ViewportUi::ViewportUiRequestBus::Event( - AzToolsFramework::ViewportUi::DefaultViewportId, - &AzToolsFramework::ViewportUi::ViewportUiRequestBus::Events::SetClusterActiveButton, m_modeSelectionClusterId, - m_buttonIds[static_cast(SubMode::Dimensions)]); + SetCurrentMode(SubMode::Offset); const auto onButtonClicked = [this](AzToolsFramework::ViewportUi::ButtonId buttonId) { if (buttonId == m_buttonIds[static_cast(SubMode::Offset)]) @@ -281,7 +278,7 @@ namespace PhysX } else if (buttonId == m_buttonIds[static_cast(SubMode::Dimensions)]) { - SetCurrentMode(SubMode::Dimensions); + SetCurrentMode(SubMode::Dimensions); } }; From e2f7893f842da7cc7dfb6ab64cf8cf93fd36f0e0 Mon Sep 17 00:00:00 2001 From: greerdv Date: Fri, 19 Nov 2021 15:23:09 +0000 Subject: [PATCH 150/345] fix collider component mode tests and mapping of number keys to component modes Signed-off-by: greerdv --- .../Code/Editor/ColliderComponentMode.cpp | 27 +++++++-------- .../Tests/PhysXColliderComponentModeTests.cpp | 34 +++++++++---------- 2 files changed, 30 insertions(+), 31 deletions(-) diff --git a/Gems/PhysX/Code/Editor/ColliderComponentMode.cpp b/Gems/PhysX/Code/Editor/ColliderComponentMode.cpp index c6ad0cd867..60e63c97d8 100644 --- a/Gems/PhysX/Code/Editor/ColliderComponentMode.cpp +++ b/Gems/PhysX/Code/Editor/ColliderComponentMode.cpp @@ -60,21 +60,9 @@ namespace PhysX AZStd::vector ColliderComponentMode::PopulateActionsImpl() { - - AzToolsFramework::ActionOverride setDimensionsModeAction; - setDimensionsModeAction.SetUri(SetDimensionsSubModeActionUri); - setDimensionsModeAction.SetKeySequence(QKeySequence(Qt::Key_1)); - setDimensionsModeAction.SetTitle("Set Resize Mode"); - setDimensionsModeAction.SetTip("Set resize mode"); - setDimensionsModeAction.SetEntityComponentIdPair(GetEntityComponentIdPair()); - setDimensionsModeAction.SetCallback([this]() - { - SetCurrentMode(SubMode::Dimensions); - }); - AzToolsFramework::ActionOverride setOffsetModeAction; setOffsetModeAction.SetUri(SetOffsetSubModeActionUri); - setOffsetModeAction.SetKeySequence(QKeySequence(Qt::Key_2)); + setOffsetModeAction.SetKeySequence(QKeySequence(Qt::Key_1)); setOffsetModeAction.SetTitle("Set Offset Mode"); setOffsetModeAction.SetTip("Set offset mode"); setOffsetModeAction.SetEntityComponentIdPair(GetEntityComponentIdPair()); @@ -85,7 +73,7 @@ namespace PhysX AzToolsFramework::ActionOverride setRotationModeAction; setRotationModeAction.SetUri(SetRotationSubModeActionUri); - setRotationModeAction.SetKeySequence(QKeySequence(Qt::Key_3)); + setRotationModeAction.SetKeySequence(QKeySequence(Qt::Key_2)); setRotationModeAction.SetTitle("Set Rotation Mode"); setRotationModeAction.SetTip("Set rotation mode"); setRotationModeAction.SetEntityComponentIdPair(GetEntityComponentIdPair()); @@ -94,6 +82,17 @@ namespace PhysX SetCurrentMode(SubMode::Rotation); }); + AzToolsFramework::ActionOverride setDimensionsModeAction; + setDimensionsModeAction.SetUri(SetDimensionsSubModeActionUri); + setDimensionsModeAction.SetKeySequence(QKeySequence(Qt::Key_3)); + setDimensionsModeAction.SetTitle("Set Resize Mode"); + setDimensionsModeAction.SetTip("Set resize mode"); + setDimensionsModeAction.SetEntityComponentIdPair(GetEntityComponentIdPair()); + setDimensionsModeAction.SetCallback([this]() + { + SetCurrentMode(SubMode::Dimensions); + }); + AzToolsFramework::ActionOverride resetModeAction; resetModeAction.SetUri(ResetSubModeActionUri); resetModeAction.SetKeySequence(QKeySequence(Qt::Key_R)); diff --git a/Gems/PhysX/Code/Tests/PhysXColliderComponentModeTests.cpp b/Gems/PhysX/Code/Tests/PhysXColliderComponentModeTests.cpp index 1f393386f8..2b5db1be67 100644 --- a/Gems/PhysX/Code/Tests/PhysXColliderComponentModeTests.cpp +++ b/Gems/PhysX/Code/Tests/PhysXColliderComponentModeTests.cpp @@ -66,7 +66,7 @@ namespace UnitTest PhysX::ColliderComponentModeRequests::SubMode subMode = PhysX::ColliderComponentModeRequests::SubMode::NumModes; PhysX::ColliderComponentModeRequestBus::BroadcastResult(subMode, &PhysX::ColliderComponentModeRequests::GetCurrentMode); - EXPECT_EQ(PhysX::ColliderComponentModeRequests::SubMode::Dimensions, subMode); + EXPECT_EQ(PhysX::ColliderComponentModeRequests::SubMode::Offset, subMode); // When the mouse wheel is scrolled while holding ctrl AzToolsFramework::ViewportInteraction::MouseInteractionEvent @@ -84,7 +84,7 @@ namespace UnitTest // Then the component mode is cycled. PhysX::ColliderComponentModeRequestBus::BroadcastResult(subMode, &PhysX::ColliderComponentModeRequests::GetCurrentMode); EXPECT_EQ(handled, MouseInteractionResult::Viewport); - EXPECT_EQ(PhysX::ColliderComponentModeRequests::SubMode::Offset, subMode); + EXPECT_EQ(PhysX::ColliderComponentModeRequests::SubMode::Dimensions, subMode); } TEST_F(PhysXColliderComponentModeTest, MouseWheelDownShouldSetPreviousMode) @@ -95,7 +95,7 @@ namespace UnitTest PhysX::ColliderComponentModeRequests::SubMode subMode = PhysX::ColliderComponentModeRequests::SubMode::NumModes; PhysX::ColliderComponentModeRequestBus::BroadcastResult(subMode, &PhysX::ColliderComponentModeRequests::GetCurrentMode); - EXPECT_EQ(PhysX::ColliderComponentModeRequests::SubMode::Dimensions, subMode); + EXPECT_EQ(PhysX::ColliderComponentModeRequests::SubMode::Offset, subMode); // When the mouse wheel is scrolled while holding ctrl AzToolsFramework::ViewportInteraction::MouseInteractionEvent @@ -116,7 +116,7 @@ namespace UnitTest EXPECT_EQ(PhysX::ColliderComponentModeRequests::SubMode::Rotation, subMode); } - TEST_F(PhysXColliderComponentModeTest, PressingKey1ShouldSetSizeMode) + TEST_F(PhysXColliderComponentModeTest, PressingKey1ShouldSetOffsetMode) { // Given there is a collider component in component mode. CreateColliderComponent(); @@ -124,17 +124,17 @@ namespace UnitTest PhysX::ColliderComponentModeRequests::SubMode subMode = PhysX::ColliderComponentModeRequests::SubMode::NumModes; PhysX::ColliderComponentModeRequestBus::BroadcastResult(subMode, &PhysX::ColliderComponentModeRequests::GetCurrentMode); - EXPECT_EQ(PhysX::ColliderComponentModeRequests::SubMode::Dimensions, subMode); + EXPECT_EQ(PhysX::ColliderComponentModeRequests::SubMode::Offset, subMode); // When the '1' key is pressed QTest::keyPress(&m_editorActions.m_componentModeWidget, Qt::Key_1); - // Then the component mode is set to Size. + // Then the component mode is set to Offset. PhysX::ColliderComponentModeRequestBus::BroadcastResult(subMode, &PhysX::ColliderComponentModeRequests::GetCurrentMode); - EXPECT_EQ(PhysX::ColliderComponentModeRequests::SubMode::Dimensions, subMode); + EXPECT_EQ(PhysX::ColliderComponentModeRequests::SubMode::Offset, subMode); } - TEST_F(PhysXColliderComponentModeTest, PressingKey2ShouldSetSizeMode) + TEST_F(PhysXColliderComponentModeTest, PressingKey2ShouldSetRotationMode) { // Given there is a collider component in component mode. auto colliderEntity = CreateColliderComponent(); @@ -143,14 +143,14 @@ namespace UnitTest PhysX::ColliderComponentModeRequests::SubMode subMode = PhysX::ColliderComponentModeRequests::SubMode::NumModes; PhysX::ColliderComponentModeRequestBus::BroadcastResult(subMode, &PhysX::ColliderComponentModeRequests::GetCurrentMode); - EXPECT_EQ(PhysX::ColliderComponentModeRequests::SubMode::Dimensions, subMode); + EXPECT_EQ(PhysX::ColliderComponentModeRequests::SubMode::Offset, subMode); // When the '2' key is pressed QTest::keyPress(&m_editorActions.m_componentModeWidget, Qt::Key_2); - // Then the component mode is set to Offset. + // Then the component mode is set to Rotation. PhysX::ColliderComponentModeRequestBus::BroadcastResult(subMode, &PhysX::ColliderComponentModeRequests::GetCurrentMode); - EXPECT_EQ(PhysX::ColliderComponentModeRequests::SubMode::Offset, subMode); + EXPECT_EQ(PhysX::ColliderComponentModeRequests::SubMode::Rotation, subMode); } TEST_F(PhysXColliderComponentModeTest, PressingKey3ShouldSetSizeMode) @@ -162,14 +162,14 @@ namespace UnitTest PhysX::ColliderComponentModeRequests::SubMode subMode = PhysX::ColliderComponentModeRequests::SubMode::NumModes; PhysX::ColliderComponentModeRequestBus::BroadcastResult(subMode, &PhysX::ColliderComponentModeRequests::GetCurrentMode); - EXPECT_EQ(PhysX::ColliderComponentModeRequests::SubMode::Dimensions, subMode); + EXPECT_EQ(PhysX::ColliderComponentModeRequests::SubMode::Offset, subMode); // When the '3' key is pressed QTest::keyPress(&m_editorActions.m_componentModeWidget, Qt::Key_3); - // Then the component mode is set to Rotation. + // Then the component mode is set to Size. PhysX::ColliderComponentModeRequestBus::BroadcastResult(subMode, &PhysX::ColliderComponentModeRequests::GetCurrentMode); - EXPECT_EQ(PhysX::ColliderComponentModeRequests::SubMode::Rotation, subMode); + EXPECT_EQ(PhysX::ColliderComponentModeRequests::SubMode::Dimensions, subMode); } TEST_F(PhysXColliderComponentModeTest, PressingKeyRShouldResetSphereRadius) @@ -292,7 +292,7 @@ namespace UnitTest // Check preconditions PhysX::ColliderComponentModeRequests::SubMode subMode = PhysX::ColliderComponentModeRequests::SubMode::NumModes; PhysX::ColliderComponentModeRequestBus::BroadcastResult(subMode, &PhysX::ColliderComponentModeRequests::GetCurrentMode); - EXPECT_EQ(PhysX::ColliderComponentModeRequests::SubMode::Dimensions, subMode); + EXPECT_EQ(PhysX::ColliderComponentModeRequests::SubMode::Offset, subMode); // Get the cluster and button Ids AzToolsFramework::ViewportUi::ClusterId modeSelectionClusterId; @@ -327,7 +327,7 @@ namespace UnitTest // Check preconditions PhysX::ColliderComponentModeRequests::SubMode subMode = PhysX::ColliderComponentModeRequests::SubMode::NumModes; PhysX::ColliderComponentModeRequestBus::BroadcastResult(subMode, &PhysX::ColliderComponentModeRequests::GetCurrentMode); - EXPECT_EQ(PhysX::ColliderComponentModeRequests::SubMode::Dimensions, subMode); + EXPECT_EQ(PhysX::ColliderComponentModeRequests::SubMode::Offset, subMode); // Get the cluster and button Ids AzToolsFramework::ViewportUi::ClusterId modeSelectionClusterId; @@ -362,7 +362,7 @@ namespace UnitTest // Check preconditions PhysX::ColliderComponentModeRequests::SubMode subMode = PhysX::ColliderComponentModeRequests::SubMode::NumModes; PhysX::ColliderComponentModeRequestBus::BroadcastResult(subMode, &PhysX::ColliderComponentModeRequests::GetCurrentMode); - EXPECT_EQ(PhysX::ColliderComponentModeRequests::SubMode::Dimensions, subMode); + EXPECT_EQ(PhysX::ColliderComponentModeRequests::SubMode::Offset, subMode); // Get the cluster and button Ids AzToolsFramework::ViewportUi::ClusterId modeSelectionClusterId; From 11f41a4467e4d1daf64a4c72209c26f3e5a2d7ba Mon Sep 17 00:00:00 2001 From: Steve Pham <82231385+spham-amzn@users.noreply.github.com> Date: Fri, 19 Nov 2021 08:22:53 -0800 Subject: [PATCH 151/345] Fix UI canvas save as start folder (#5756) Signed-off-by: Steve Pham <82231385+spham-amzn@users.noreply.github.com> --- Gems/LyShine/Code/Editor/EditorWindow.cpp | 26 +++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/Gems/LyShine/Code/Editor/EditorWindow.cpp b/Gems/LyShine/Code/Editor/EditorWindow.cpp index a4ad4d7043..7b60474ed5 100644 --- a/Gems/LyShine/Code/Editor/EditorWindow.cpp +++ b/Gems/LyShine/Code/Editor/EditorWindow.cpp @@ -8,6 +8,7 @@ #include "EditorCommon.h" #include "CanvasHelpers.h" #include "AssetDropHelpers.h" +#include #include #include #include @@ -697,15 +698,36 @@ bool EditorWindow::SaveCanvasToXml(UiCanvasMetadata& canvasMetadata, bool forceA else if (recentFiles.size() > 0) { dir = Path::GetPath(recentFiles.front()); - dir.append(canvasMetadata.m_canvasDisplayName.c_str()); } // Else go to the default canvas directory else { dir = FileHelpers::GetAbsoluteDir(UICANVASEDITOR_CANVAS_DIRECTORY); - dir.append(canvasMetadata.m_canvasDisplayName.c_str()); } + // Make sure the directory exists. If not, walk up the directory path until we find one that does + // so that we will have a consistent 'starting folder' in the 'AzQtComponents::FileDialog::GetSaveFileName' call + // across different platforms. + AZ::IO::FixedMaxPath dirPath(dir.toUtf8().constData()); + + while (!AZ::IO::SystemFile::IsDirectory(dirPath.c_str())) + { + AZ::IO::PathView parentPath = dirPath.ParentPath(); + if (parentPath == dirPath) + { + // We've reach the root path, need to break out whether or not + // the root path exists + break; + } + else + { + dirPath = parentPath; + } + } + // Append the default filename + dirPath /= canvasMetadata.m_canvasDisplayName; + dir = QString::fromUtf8(dirPath.c_str(), static_cast(dirPath.Native().size())); + QString filename = AzQtComponents::FileDialog::GetSaveFileName(nullptr, QString(), dir, From 4dd07111f91c00a448e622ff9fcf5b7f5057900c Mon Sep 17 00:00:00 2001 From: AMZN-Phil Date: Fri, 19 Nov 2021 08:31:32 -0800 Subject: [PATCH 152/345] Make version string settable from Jenkins Signed-off-by: AMZN-Phil --- scripts/build/Platform/Windows/build_config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/build/Platform/Windows/build_config.json b/scripts/build/Platform/Windows/build_config.json index de83294639..9eb9957729 100644 --- a/scripts/build/Platform/Windows/build_config.json +++ b/scripts/build/Platform/Windows/build_config.json @@ -363,7 +363,7 @@ "PARAMETERS": { "CONFIGURATION": "profile", "OUTPUT_DIRECTORY": "build\\windows_vs2019", - "CMAKE_OPTIONS": "-G \"Visual Studio 16 2019\" -DCMAKE_SYSTEM_VERSION=10.0 -DLY_UNITY_BUILD=TRUE -DLY_DISABLE_TEST_MODULES=TRUE -DLY_VERSION_ENGINE_NAME=o3de-sdk -DLY_INSTALLER_WIX_ROOT=\"!WIX! \"", + "CMAKE_OPTIONS": "-G \"Visual Studio 16 2019\" -DCMAKE_SYSTEM_VERSION=10.0 -DLY_UNITY_BUILD=TRUE -DLY_DISABLE_TEST_MODULES=TRUE -DLY_VERSION_ENGINE_NAME=o3de-sdk -DLY_VERSION_STRING=!O3DE_VERSION! -DLY_INSTALLER_WIX_ROOT=\"!WIX! \"", "EXTRA_CMAKE_OPTIONS": "-DLY_INSTALLER_AUTO_GEN_TAG=ON -DLY_INSTALLER_DOWNLOAD_URL=!INSTALLER_DOWNLOAD_URL! -DLY_INSTALLER_LICENSE_URL=!INSTALLER_DOWNLOAD_URL!/license", "CPACK_BUCKET": "!INSTALLER_BUCKET!", "CMAKE_LY_PROJECTS": "", From b89f5ee0c473a28d2023a970c50b7622acca4a61 Mon Sep 17 00:00:00 2001 From: Guthrie Adams Date: Thu, 18 Nov 2021 18:52:33 -0600 Subject: [PATCH 153/345] fixed tests Signed-off-by: Guthrie Adams --- .../RPI/Code/Source/RPI.Edit/Material/MaterialSourceData.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gems/Atom/RPI/Code/Source/RPI.Edit/Material/MaterialSourceData.cpp b/Gems/Atom/RPI/Code/Source/RPI.Edit/Material/MaterialSourceData.cpp index dce27f3136..fd073bbae4 100644 --- a/Gems/Atom/RPI/Code/Source/RPI.Edit/Material/MaterialSourceData.cpp +++ b/Gems/Atom/RPI/Code/Source/RPI.Edit/Material/MaterialSourceData.cpp @@ -119,8 +119,8 @@ namespace AZ AZ_Warning( "MaterialSourceData", false, "This material is based on version '%u' of '%s', but the material type is now at version '%u'. " - "Automatic updates are available. Consider updating '%s'.", - m_materialTypeVersion, materialTypeFullPath.c_str(), materialTypeSourceData.m_version, materialSourceFilePath); + "Automatic updates are available. Consider updating the .material source file: '%s'.", + m_materialTypeVersion, materialTypeFullPath.c_str(), materialTypeSourceData.m_version, materialSourceFilePath.data()); } m_materialTypeVersion = materialTypeSourceData.m_version; From ebb24d2285635ee8bd840a5b58b1a519b73d8c0a Mon Sep 17 00:00:00 2001 From: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com> Date: Fri, 19 Nov 2021 16:52:44 +0000 Subject: [PATCH 154/345] Improvement for click detection when clicking quickly between mouse moves (#5786) * improvement for click detection when clicking quickly between mouse moves Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com> * remove magic number and introduce constant Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com> * add missing update from camera test Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com> --- .../test_ModularViewportCameraController.cpp | 1 + .../test_ViewportManipulatorController.cpp | 78 ++++++++++++++++++- Code/Editor/ViewportManipulatorController.cpp | 19 +++-- Code/Editor/ViewportManipulatorController.h | 12 ++- .../AzFramework/Viewport/ClickDetector.cpp | 5 +- .../AzFramework/Viewport/ClickDetector.h | 6 +- .../AzFramework/Tests/ClickDetectorTests.cpp | 41 +++++++++- 7 files changed, 142 insertions(+), 20 deletions(-) diff --git a/Code/Editor/Lib/Tests/test_ModularViewportCameraController.cpp b/Code/Editor/Lib/Tests/test_ModularViewportCameraController.cpp index b796d6506c..656440f16e 100644 --- a/Code/Editor/Lib/Tests/test_ModularViewportCameraController.cpp +++ b/Code/Editor/Lib/Tests/test_ModularViewportCameraController.cpp @@ -389,6 +389,7 @@ namespace UnitTest m_controllerList->UpdateViewport({ TestViewportId, AzFramework::FloatSeconds(deltaTime), AZ::ScriptTimePoint() }); QTest::mouseRelease(m_rootWidget.get(), Qt::MouseButton::RightButton, Qt::NoModifier, start + mouseDelta); + m_controllerList->UpdateViewport({ TestViewportId, AzFramework::FloatSeconds(deltaTime), AZ::ScriptTimePoint() }); // update the position of the widget const auto offset = QPoint(500, 500); diff --git a/Code/Editor/Lib/Tests/test_ViewportManipulatorController.cpp b/Code/Editor/Lib/Tests/test_ViewportManipulatorController.cpp index 63e59ea940..81dcae9129 100644 --- a/Code/Editor/Lib/Tests/test_ViewportManipulatorController.cpp +++ b/Code/Editor/Lib/Tests/test_ViewportManipulatorController.cpp @@ -12,6 +12,7 @@ #include #include #include +#include namespace UnitTest { @@ -77,14 +78,15 @@ namespace UnitTest class ViewportManipulatorControllerFixture : public AllocatorsTestFixture { public: - static const AzFramework::ViewportId TestViewportId; + static inline constexpr AzFramework::ViewportId TestViewportId = 1234; + static inline const QSize WidgetSize = QSize(1920, 1080); void SetUp() override { AllocatorsTestFixture::SetUp(); m_rootWidget = AZStd::make_unique(); - m_rootWidget->setFixedSize(QSize(100, 100)); + m_rootWidget->setFixedSize(WidgetSize); QApplication::setActiveWindow(m_rootWidget.get()); m_controllerList = AZStd::make_shared(); @@ -111,8 +113,6 @@ namespace UnitTest AZStd::unique_ptr m_inputChannelMapper; }; - const AzFramework::ViewportId ViewportManipulatorControllerFixture::TestViewportId = AzFramework::ViewportId(0); - TEST_F(ViewportManipulatorControllerFixture, AnEventIsNotPropagatedToTheViewportWhenAManipulatorHandlesItFirst) { // forward input events to our controller list @@ -227,4 +227,74 @@ namespace UnitTest // the key was released (cleared) EXPECT_TRUE(endedEvent); } + + TEST_F(ViewportManipulatorControllerFixture, DoubleClickIsNotRegisteredIfMouseDeltaHasMovedMoreThanDeadzoneInClickInterval) + { + AzFramework::NativeWindowHandle nativeWindowHandle = nullptr; + + // forward input events to our controller list + QObject::connect( + m_inputChannelMapper.get(), &AzToolsFramework::QtEventToAzInputMapper::InputChannelUpdated, m_rootWidget.get(), + [this, nativeWindowHandle](const AzFramework::InputChannel* inputChannel, [[maybe_unused]] QEvent* event) + { + m_controllerList->HandleInputChannelEvent( + AzFramework::ViewportControllerInputEvent{ TestViewportId, nativeWindowHandle, *inputChannel }); + }); + + ::testing::NiceMock mockWindowRequests; + mockWindowRequests.Connect(nativeWindowHandle); + + using ::testing::Return; + // note: WindowRequests is used internally by ViewportManipulatorController + ON_CALL(mockWindowRequests, GetClientAreaSize()) + .WillByDefault(Return(AzFramework::WindowSize(WidgetSize.width(), WidgetSize.height()))); + + EditorInteractionViewportSelectionFake editorInteractionViewportFake; + editorInteractionViewportFake.m_internalHandleMouseManipulatorInteraction = [](const MouseInteractionEvent&) + { + // report the event was not handled (manipulator was not interacted with) + return false; + }; + + bool doubleClickDetected = false; + editorInteractionViewportFake.m_internalHandleMouseViewportInteraction = + [&doubleClickDetected](const MouseInteractionEvent& mouseInteractionEvent) + { + // ensure no double click event is detected with the given inputs below + if (mouseInteractionEvent.m_mouseEvent == AzToolsFramework::ViewportInteraction::MouseEvent::DoubleClick) + { + doubleClickDetected = true; + } + + return true; + }; + + editorInteractionViewportFake.Connect(); + + m_controllerList->Add(AZStd::make_shared()); + + // simulate a click, move, click + MouseMove(m_rootWidget.get(), QPoint(0, 0), QPoint(10, 10)); + MousePressAndMove(m_rootWidget.get(), QPoint(10, 10), QPoint(0, 0), Qt::MouseButton::LeftButton); + QTest::mouseRelease(m_rootWidget.get(), Qt::MouseButton::LeftButton, Qt::KeyboardModifier::NoModifier, QPoint(10, 10)); + MouseMove(m_rootWidget.get(), QPoint(10, 10), QPoint(20, 20)); + MousePressAndMove(m_rootWidget.get(), QPoint(20, 20), QPoint(0, 0), Qt::MouseButton::LeftButton); + QTest::mouseRelease(m_rootWidget.get(), Qt::MouseButton::LeftButton, Qt::KeyboardModifier::NoModifier, QPoint(20, 20)); + + // ensure no double click was detected + EXPECT_FALSE(doubleClickDetected); + + // simulate double click (sanity check it still is detected correctly with no movement) + MouseMove(m_rootWidget.get(), QPoint(0, 0), QPoint(10, 10)); + MousePressAndMove(m_rootWidget.get(), QPoint(10, 10), QPoint(0, 0), Qt::MouseButton::LeftButton); + QTest::mouseRelease(m_rootWidget.get(), Qt::MouseButton::LeftButton, Qt::KeyboardModifier::NoModifier, QPoint(10, 10)); + MousePressAndMove(m_rootWidget.get(), QPoint(10, 10), QPoint(0, 0), Qt::MouseButton::LeftButton); + QTest::mouseRelease(m_rootWidget.get(), Qt::MouseButton::LeftButton, Qt::KeyboardModifier::NoModifier, QPoint(10, 10)); + + // ensure a double click was detected + EXPECT_TRUE(doubleClickDetected); + + mockWindowRequests.Disconnect(); + editorInteractionViewportFake.Disconnect(); + } } // namespace UnitTest diff --git a/Code/Editor/ViewportManipulatorController.cpp b/Code/Editor/ViewportManipulatorController.cpp index 285b338ee9..e46328eb65 100644 --- a/Code/Editor/ViewportManipulatorController.cpp +++ b/Code/Editor/ViewportManipulatorController.cpp @@ -157,7 +157,7 @@ namespace SandboxEditor // Only insert the double click timing once we're done processing events, to avoid a false IsDoubleClick positive if (finishedProcessingEvents) { - m_pendingDoubleClicks[mouseButton] = m_curTime; + m_pendingDoubleClicks[mouseButton] = { m_currentTime, m_mouseInteraction.m_mousePick.m_screenCoordinates }; } eventType = MouseEvent::Down; } @@ -251,17 +251,22 @@ namespace SandboxEditor void ViewportManipulatorControllerInstance::UpdateViewport(const AzFramework::ViewportControllerUpdateEvent& event) { - m_curTime = event.m_time; + m_currentTime = event.m_time; } bool ViewportManipulatorControllerInstance::IsDoubleClick(AzToolsFramework::ViewportInteraction::MouseButton button) const { - auto clickIt = m_pendingDoubleClicks.find(button); - if (clickIt == m_pendingDoubleClicks.end()) + if (auto clickIt = m_pendingDoubleClicks.find(button); clickIt != m_pendingDoubleClicks.end()) { - return false; + const double doubleClickThresholdMilliseconds = qApp->doubleClickInterval(); + const bool insideTimeThreshold = + (m_currentTime.GetMilliseconds() - clickIt->second.m_time.GetMilliseconds()) < doubleClickThresholdMilliseconds; + const bool insideDistanceThreshold = + AzFramework::ScreenVectorLength(clickIt->second.m_position - m_mouseInteraction.m_mousePick.m_screenCoordinates) < + AzFramework::DefaultMouseMoveDeadZone; + return insideTimeThreshold && insideDistanceThreshold; } - const double doubleClickThresholdMilliseconds = qApp->doubleClickInterval(); - return (m_curTime.GetMilliseconds() - clickIt->second.GetMilliseconds()) < doubleClickThresholdMilliseconds; + + return false; } } // namespace SandboxEditor diff --git a/Code/Editor/ViewportManipulatorController.h b/Code/Editor/ViewportManipulatorController.h index d551eb3647..b9c359a544 100644 --- a/Code/Editor/ViewportManipulatorController.h +++ b/Code/Editor/ViewportManipulatorController.h @@ -39,8 +39,16 @@ namespace SandboxEditor static bool IsMouseMove(const AzFramework::InputChannel& inputChannel); static AzToolsFramework::ViewportInteraction::KeyboardModifier GetKeyboardModifier(const AzFramework::InputChannel& inputChannel); + //! Represents the time and location of a click. + struct ClickEvent + { + AZ::ScriptTimePoint m_time; + AzFramework::ScreenPoint m_position; + }; + AzToolsFramework::ViewportInteraction::MouseInteraction m_mouseInteraction; - AZStd::unordered_map m_pendingDoubleClicks; - AZ::ScriptTimePoint m_curTime; + AZStd::unordered_map m_pendingDoubleClicks; + + AZ::ScriptTimePoint m_currentTime; }; } // namespace SandboxEditor diff --git a/Code/Framework/AzFramework/AzFramework/Viewport/ClickDetector.cpp b/Code/Framework/AzFramework/AzFramework/Viewport/ClickDetector.cpp index 1b3645630e..294ff71974 100644 --- a/Code/Framework/AzFramework/AzFramework/Viewport/ClickDetector.cpp +++ b/Code/Framework/AzFramework/AzFramework/Viewport/ClickDetector.cpp @@ -24,11 +24,12 @@ namespace AzFramework ClickDetector::ClickOutcome ClickDetector::DetectClick(const ClickEvent clickEvent, const ScreenVector& cursorDelta) { + m_moveAccumulator += ScreenVectorLength(cursorDelta); + const auto previousDetectionState = m_detectionState; if (previousDetectionState == DetectionState::WaitingForMove) { // only allow the action to begin if the mouse has been moved a small amount - m_moveAccumulator += ScreenVectorLength(cursorDelta); if (m_moveAccumulator > m_deadZone) { m_detectionState = DetectionState::Moved; @@ -43,7 +44,7 @@ namespace AzFramework using FloatingPointSeconds = AZStd::chrono::duration; const auto diff = now - m_tryBeginTime.value(); - if (FloatingPointSeconds(diff).count() < m_doubleClickInterval) + if (FloatingPointSeconds(diff).count() < m_doubleClickInterval && m_moveAccumulator < m_deadZone) { return ClickOutcome::Nil; } diff --git a/Code/Framework/AzFramework/AzFramework/Viewport/ClickDetector.h b/Code/Framework/AzFramework/AzFramework/Viewport/ClickDetector.h index 70bdeb4619..544afe6d69 100644 --- a/Code/Framework/AzFramework/AzFramework/Viewport/ClickDetector.h +++ b/Code/Framework/AzFramework/AzFramework/Viewport/ClickDetector.h @@ -15,6 +15,10 @@ namespace AzFramework { + //! Default value to use for detecting if the mouse has moved far enough after a mouse down to no longer + //! register a click when a mouse up occurs. + inline constexpr float DefaultMouseMoveDeadZone = 2.0f; + struct ScreenVector; //! Utility class to help detect different types of mouse click (mouse down and up with @@ -66,7 +70,7 @@ namespace AzFramework }; float m_moveAccumulator = 0.0f; //!< How far the mouse has moved after mouse down. - float m_deadZone = 2.0f; //!< How far to move before a click is cancelled (when Move will fire). + float m_deadZone = DefaultMouseMoveDeadZone; //!< How far to move before a click is cancelled (when Move will fire). float m_doubleClickInterval = 0.4f; //!< Default double click interval, can be overridden. DetectionState m_detectionState; //!< Internal state of ClickDetector. //! Mouse down time (happens each mouse down, helps with double click handling). diff --git a/Code/Framework/AzFramework/Tests/ClickDetectorTests.cpp b/Code/Framework/AzFramework/Tests/ClickDetectorTests.cpp index 45bac2770e..62852c9b87 100644 --- a/Code/Framework/AzFramework/Tests/ClickDetectorTests.cpp +++ b/Code/Framework/AzFramework/Tests/ClickDetectorTests.cpp @@ -144,12 +144,45 @@ namespace UnitTest { using ::testing::Eq; - const ClickDetector::ClickOutcome downOutcome = - m_clickDetector.DetectClick(ClickDetector::ClickEvent::Down, ScreenVector(0, 0)); - const ClickDetector::ClickOutcome upOutcome = - m_clickDetector.DetectClick(ClickDetector::ClickEvent::Up, ScreenVector(50, 50)); + const ClickDetector::ClickOutcome downOutcome = m_clickDetector.DetectClick(ClickDetector::ClickEvent::Down, ScreenVector(0, 0)); + const ClickDetector::ClickOutcome upOutcome = m_clickDetector.DetectClick(ClickDetector::ClickEvent::Up, ScreenVector(50, 50)); EXPECT_THAT(downOutcome, Eq(ClickDetector::ClickOutcome::Nil)); EXPECT_THAT(upOutcome, Eq(ClickDetector::ClickOutcome::Release)); } + + //! note: ClickDetector does not explicitly return double clicks but if one occurs the ClickOutcome will be Nil + TEST_F(ClickDetectorFixture, DoubleClickIsRegisteredIfMouseDeltaHasMovedLessThanDeadzoneInClickInterval) + { + using ::testing::Eq; + + const ClickDetector::ClickOutcome firstDownOutcome = + m_clickDetector.DetectClick(ClickDetector::ClickEvent::Down, ScreenVector(0, 0)); + const ClickDetector::ClickOutcome firstUpOutcome = m_clickDetector.DetectClick(ClickDetector::ClickEvent::Up, ScreenVector(0, 0)); + const ClickDetector::ClickOutcome secondDownOutcome = + m_clickDetector.DetectClick(ClickDetector::ClickEvent::Down, ScreenVector(0, 0)); + const ClickDetector::ClickOutcome secondUpOutcome = m_clickDetector.DetectClick(ClickDetector::ClickEvent::Up, ScreenVector(0, 0)); + + EXPECT_THAT(firstDownOutcome, Eq(ClickDetector::ClickOutcome::Nil)); + EXPECT_THAT(firstUpOutcome, Eq(ClickDetector::ClickOutcome::Click)); + EXPECT_THAT(secondDownOutcome, Eq(ClickDetector::ClickOutcome::Nil)); + EXPECT_THAT(secondUpOutcome, Eq(ClickDetector::ClickOutcome::Nil)); + } + + TEST_F(ClickDetectorFixture, DoubleClickIsNotRegisteredIfMouseDeltaHasMovedMoreThanDeadzoneInClickInterval) + { + using ::testing::Eq; + + const ClickDetector::ClickOutcome firstDownOutcome = + m_clickDetector.DetectClick(ClickDetector::ClickEvent::Down, ScreenVector(0, 0)); + const ClickDetector::ClickOutcome firstUpOutcome = m_clickDetector.DetectClick(ClickDetector::ClickEvent::Up, ScreenVector(0, 0)); + const ClickDetector::ClickOutcome secondDownOutcome = + m_clickDetector.DetectClick(ClickDetector::ClickEvent::Down, ScreenVector(10, 10)); + const ClickDetector::ClickOutcome secondUpOutcome = m_clickDetector.DetectClick(ClickDetector::ClickEvent::Up, ScreenVector(0, 0)); + + EXPECT_THAT(firstDownOutcome, Eq(ClickDetector::ClickOutcome::Nil)); + EXPECT_THAT(firstUpOutcome, Eq(ClickDetector::ClickOutcome::Click)); + EXPECT_THAT(secondDownOutcome, Eq(ClickDetector::ClickOutcome::Nil)); + EXPECT_THAT(secondUpOutcome, Eq(ClickDetector::ClickOutcome::Click)); + } } // namespace UnitTest From 8fd9cbfb6456472473ec558c21de9aaa152a53c4 Mon Sep 17 00:00:00 2001 From: Qing Tao <55564570+VickyAtAZ@users.noreply.github.com> Date: Fri, 19 Nov 2021 09:02:11 -0800 Subject: [PATCH 155/345] ATOM-16854 Texture Settings dialog box crashes in the Editor (#5777) Changes include: -Fixed image preview issue which was trying to convert a compressed texture directly to QImage. -Fixed texture resolution display for cubemap in texture setting editor. -Sort the preset names in preset combo box -Fixed a crash when showing IBLSkybox preset info in texture setting editor Signed-off-by: Qing Tao <55564570+VickyAtAZ@users.noreply.github.com> --- .../BuilderSettings/BuilderSettingManager.cpp | 26 ++++++++ .../BuilderSettings/BuilderSettingManager.h | 4 ++ .../Source/BuilderSettings/CubemapSettings.h | 10 +-- .../BuilderSettings/ImageProcessingDefines.h | 3 +- .../Code/Source/Editor/EditorCommon.cpp | 17 +++-- .../Editor/TexturePresetSelectionWidget.cpp | 56 +++++++++++------ .../Code/Source/Processing/ImageConvert.cpp | 62 ------------------- .../Code/Source/Processing/ImageConvert.h | 3 - .../Source/Processing/ImageConvertJob.cpp | 34 +++------- .../Code/Source/Processing/ImageConvertJob.h | 14 +---- .../Code/Source/Processing/ImagePreview.cpp | 2 +- 11 files changed, 99 insertions(+), 132 deletions(-) diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/BuilderSettings/BuilderSettingManager.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/BuilderSettings/BuilderSettingManager.cpp index 2b24fc1bc4..487c659ade 100644 --- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/BuilderSettings/BuilderSettingManager.cpp +++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/BuilderSettings/BuilderSettingManager.cpp @@ -146,6 +146,25 @@ namespace ImageProcessingAtom return nullptr; } + AZStd::vector BuilderSettingManager::GetFileMasksForPreset(const PresetName& presetName) const + { + AZStd::vector fileMasks; + + AZStd::lock_guard lock(m_presetMapLock); + for (const auto& mapping:m_presetFilterMap) + { + for (const auto& preset : mapping.second) + { + if (preset == presetName) + { + fileMasks.push_back(mapping.first); + break; + } + } + } + return fileMasks; + } + const BuilderSettings* BuilderSettingManager::GetBuilderSetting(const PlatformName& platform) const { auto itr = m_builderSettings.find(platform); @@ -177,6 +196,13 @@ namespace ImageProcessingAtom return m_presetFilterMap; } + const AZStd::unordered_set& BuilderSettingManager::GetFullPresetList() const + { + AZStd::lock_guard lock(m_presetMapLock); + AZStd::string noFilter = AZStd::string(); + return m_presetFilterMap.find(noFilter)->second; + } + const PresetName BuilderSettingManager::GetPresetNameFromId(const AZ::Uuid& presetId) { AZStd::lock_guard lock(m_presetMapLock); diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/BuilderSettings/BuilderSettingManager.h b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/BuilderSettings/BuilderSettingManager.h index e4d45f4186..443b91bc07 100644 --- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/BuilderSettings/BuilderSettingManager.h +++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/BuilderSettings/BuilderSettingManager.h @@ -57,6 +57,8 @@ namespace ImageProcessingAtom const PresetSettings* GetPreset(const PresetName& presetName, const PlatformName& platform = "", AZStd::string_view* settingsFilePathOut = nullptr) const; + AZStd::vector GetFileMasksForPreset(const PresetName& presetName) const; + const BuilderSettings* GetBuilderSetting(const PlatformName& platform) const; //! Return A list of platform supported @@ -67,6 +69,8 @@ namespace ImageProcessingAtom //! @value set of preset setting names supporting the specified filemask const AZStd::map>& GetPresetFilterMap() const; + const AZStd::unordered_set& GetFullPresetList() const; + //! Find preset name based on the preset id. const PresetName GetPresetNameFromId(const AZ::Uuid& presetId); diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/BuilderSettings/CubemapSettings.h b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/BuilderSettings/CubemapSettings.h index 9135a0f4d1..77f804b646 100644 --- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/BuilderSettings/CubemapSettings.h +++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/BuilderSettings/CubemapSettings.h @@ -26,19 +26,19 @@ namespace ImageProcessingAtom static void Reflect(AZ::ReflectContext* context); // "cm_ftype", cubemap angular filter type: gaussian, cone, disc, cosine, cosine_power, ggx - CubemapFilterType m_filter; + CubemapFilterType m_filter = CubemapFilterType::ggx; // "cm_fangle", base filter angle for cubemap filtering(degrees), 0 - disabled - float m_angle; + float m_angle = 0; // "cm_fmipangle", initial mip filter angle for cubemap filtering(degrees), 0 - disabled - float m_mipAngle; + float m_mipAngle = 0; // "cm_fmipslope", mip filter angle multiplier for cubemap filtering, 1 - default" - float m_mipSlope; + float m_mipSlope = 1; // "cm_edgefixup", cubemap edge fix-up width, 0 - disabled - float m_edgeFixup; + float m_edgeFixup = 0; // generate an IBL specular cubemap bool m_generateIBLSpecular = false; diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/BuilderSettings/ImageProcessingDefines.h b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/BuilderSettings/ImageProcessingDefines.h index e421715995..7c35a0634e 100644 --- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/BuilderSettings/ImageProcessingDefines.h +++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/BuilderSettings/ImageProcessingDefines.h @@ -39,7 +39,8 @@ namespace ImageProcessingAtom #define STRING_OUTCOME_ERROR(error) AZ::Failure(AZStd::string(error)) // Common typedefs (with dependent forward-declarations) - typedef AZStd::string PlatformName, FileMask; + typedef AZStd::string PlatformName; + typedef AZStd::string FileMask; typedef AZ::Name PresetName; typedef AZStd::vector PlatformNameVector; typedef AZStd::list PlatformNameList; diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Editor/EditorCommon.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Editor/EditorCommon.cpp index ca999fcd10..3e255dcccc 100644 --- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Editor/EditorCommon.cpp +++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Editor/EditorCommon.cpp @@ -257,15 +257,22 @@ namespace ImageProcessingAtomEditor // Update input width and height if it's a cubemap if (presetSetting->m_cubemapSetting != nullptr) { - CubemapLayout *srcCubemap = CubemapLayout::CreateCubemapLayout(m_img); - if (srcCubemap == nullptr) + if (IsValidLatLongMap(m_img)) { - return false; + inputWidth = inputWidth/4; + } + else + { + CubemapLayout *srcCubemap = CubemapLayout::CreateCubemapLayout(m_img); + if (srcCubemap == nullptr) + { + return false; + } + inputWidth = srcCubemap->GetFaceSize(); + delete srcCubemap; } - inputWidth = srcCubemap->GetFaceSize(); inputHeight = inputWidth; outResolutionInfo.arrayCount = 6; - delete srcCubemap; } GetOutputExtent(inputWidth, inputHeight, outResolutionInfo.width, outResolutionInfo.height, outResolutionInfo.reduce, &textureSetting, presetSetting); diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Editor/TexturePresetSelectionWidget.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Editor/TexturePresetSelectionWidget.cpp index e50d95b907..cc341c5e31 100644 --- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Editor/TexturePresetSelectionWidget.cpp +++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Editor/TexturePresetSelectionWidget.cpp @@ -18,6 +18,27 @@ namespace ImageProcessingAtomEditor { using namespace ImageProcessingAtom; + + AZStd::string GetImageFileMask(const AZStd::string& imageFilePath) + { + const char FileMaskDelimiter = '_'; + + //get file name + AZStd::string fileName; + QString lowerFileName = imageFilePath.data(); + lowerFileName = lowerFileName.toLower(); + AzFramework::StringFunc::Path::GetFileName(lowerFileName.toUtf8().constData(), fileName); + + //get the substring from last '_' + size_t lastUnderScore = fileName.find_last_of(FileMaskDelimiter); + if (lastUnderScore != AZStd::string::npos) + { + return fileName.substr(lastUnderScore); + } + + return AZStd::string(); + } + TexturePresetSelectionWidget::TexturePresetSelectionWidget(EditorTextureSetting& textureSetting, QWidget* parent /*= nullptr*/) : QWidget(parent) , m_ui(new Ui::TexturePresetSelectionWidget) @@ -29,33 +50,31 @@ namespace ImageProcessingAtomEditor m_presetList.clear(); auto& presetFilterMap = BuilderSettingManager::Instance()->GetPresetFilterMap(); - AZStd::unordered_set noFilterPresetList; - - // Check if there is any filtered preset list first - for(auto& presetFilter : presetFilterMap) + if (m_listAllPresets) { - if (presetFilter.first.empty()) + m_presetList = BuilderSettingManager::Instance()->GetFullPresetList(); + } + else + { + auto fileMask = GetImageFileMask(m_textureSetting->m_textureName); + auto itr = presetFilterMap.find(fileMask); + if (itr != presetFilterMap.end()) { - noFilterPresetList = presetFilter.second; + m_presetList = itr->second; } - else if (IsMatchingWithFileMask(m_textureSetting->m_textureName, presetFilter.first)) + else { - for(const auto& presetName : presetFilter.second) - { - m_presetList.insert(presetName); - } + m_presetList = BuilderSettingManager::Instance()->GetFullPresetList(); } } - // If no filtered preset list available or should list all presets, use non-filter list - if (m_presetList.size() == 0 || m_listAllPresets) - { - m_presetList = noFilterPresetList; - } + QStringList stringList; foreach (const auto& presetName, m_presetList) { - m_ui->presetComboBox->addItem(QString(presetName.GetCStr())); + stringList.append(QString(presetName.GetCStr())); } + stringList.sort(); + m_ui->presetComboBox->addItems(stringList); // Set current preset const auto& currPreset = m_textureSetting->GetMultiplatformTextureSetting().m_preset; @@ -173,8 +192,9 @@ namespace ImageProcessingAtomEditor AZStd::string conventionText = ""; if (presetSettings) { + auto fileMasks = BuilderSettingManager::Instance()->GetFileMasksForPreset(presetSettings->m_name); int i = 0; - for (const PlatformName& filemask : presetSettings->m_fileMasks) + for (const auto& filemask : fileMasks) { conventionText += i > 0 ? " " + filemask : filemask; i++; diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/ImageConvert.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/ImageConvert.cpp index 471472486d..defca690a3 100644 --- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/ImageConvert.cpp +++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/ImageConvert.cpp @@ -905,68 +905,6 @@ namespace ImageProcessingAtom return result; } - IImageObjectPtr MergeOutputImageForPreview(IImageObjectPtr image, IImageObjectPtr alphaImage) - { - if (!image) - { - return IImageObjectPtr(); - } - - ImageToProcess imageToProcess(image); - imageToProcess.ConvertFormat(ePixelFormat_R8G8B8A8); - IImageObjectPtr previewImage = imageToProcess.Get(); - - // If there is separate Alpha image, combine it with output - if (alphaImage) - { - // Create pixel operation function for rgb and alpha images - IPixelOperationPtr imageOp = CreatePixelOperation(ePixelFormat_R8G8B8A8); - IPixelOperationPtr alphaOp = CreatePixelOperation(ePixelFormat_A8); - - // Convert the alpha image to A8 first - ImageToProcess imageToProcess2(alphaImage); - imageToProcess2.ConvertFormat(ePixelFormat_A8); - IImageObjectPtr previewImageAlpha = imageToProcess2.Get(); - - const uint32 imageMips = previewImage->GetMipCount(); - [[maybe_unused]] const uint32 alphaMips = previewImageAlpha->GetMipCount(); - - // Get count of bytes per pixel for both rgb and alpha images - uint32 imagePixelBytes = CPixelFormats::GetInstance().GetPixelFormatInfo(ePixelFormat_R8G8B8A8)->bitsPerBlock / 8; - uint32 alphaPixelBytes = CPixelFormats::GetInstance().GetPixelFormatInfo(ePixelFormat_A8)->bitsPerBlock / 8; - - AZ_Assert(imageMips <= alphaMips, "Mip level of alpha image is less than origin image!"); - - // For each mip level, set the alpha value to the image - for (uint32 mipLevel = 0; mipLevel < imageMips; ++mipLevel) - { - const uint32 pixelCount = previewImage->GetPixelCount(mipLevel); - [[maybe_unused]] const uint32 alphaPixelCount = previewImageAlpha->GetPixelCount(mipLevel); - - AZ_Assert(pixelCount == alphaPixelCount, "Pixel count for image and alpha image at mip level %d is not equal!", mipLevel); - - uint8* imageBuf; - uint32 pitch; - previewImage->GetImagePointer(mipLevel, imageBuf, pitch); - - uint8* alphaBuf; - uint32 alphaPitch; - previewImageAlpha->GetImagePointer(mipLevel, alphaBuf, alphaPitch); - - float rAlpha, gAlpha, bAlpha, aAlpha, rImage, gImage, bImage, aImage; - - for (uint32 i = 0; i < pixelCount; ++i, imageBuf += imagePixelBytes, alphaBuf += alphaPixelBytes) - { - alphaOp->GetRGBA(alphaBuf, rAlpha, gAlpha, bAlpha, aAlpha); - imageOp->GetRGBA(imageBuf, rImage, gImage, bImage, aImage); - imageOp->SetRGBA(imageBuf, rImage, gImage, bImage, aAlpha); - } - } - } - - return previewImage; - } - IImageObjectPtr ConvertImageForPreview(IImageObjectPtr image) { if (!image) diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/ImageConvert.h b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/ImageConvert.h index 0d06b15c39..ba3d21191f 100644 --- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/ImageConvert.h +++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/ImageConvert.h @@ -51,9 +51,6 @@ namespace ImageProcessingAtom //Converts the image to a RGBA8 format that can be displayed in a preview UI. IImageObjectPtr ConvertImageForPreview(IImageObjectPtr image); - //Combine image with alpha image if any and output as RGBA8 - IImageObjectPtr MergeOutputImageForPreview(IImageObjectPtr image, IImageObjectPtr alphaImage); - //get output image size and mip count based on the texture setting and preset setting //other helper functions diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/ImageConvertJob.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/ImageConvertJob.cpp index 0e4521ab24..d81685f0c6 100644 --- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/ImageConvertJob.cpp +++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/ImageConvertJob.cpp @@ -16,28 +16,14 @@ namespace ImageProcessingAtom { - IImageObjectPtr ImageConvertOutput::GetOutputImage(OutputImageType type) const + IImageObjectPtr ImageConvertOutput::GetOutputImage() const { - if (type < OutputImageType::Count) - { - return m_outputImage[static_cast(type)]; - } - else - { - return IImageObjectPtr(); - } + return m_outputImage; } - void ImageConvertOutput::SetOutputImage(IImageObjectPtr image, OutputImageType type) + void ImageConvertOutput::SetOutputImage(IImageObjectPtr image) { - if (type < OutputImageType::Count) - { - m_outputImage[static_cast(type)] = image; - } - else - { - AZ_Error("ImageProcess", false, "Cannot set output image to %d", type); - } + m_outputImage = image; } void ImageConvertOutput::SetReady(bool ready) @@ -62,10 +48,7 @@ namespace ImageProcessingAtom void ImageConvertOutput::Reset() { - for (int i = 0; i < static_cast(OutputImageType::Count); i++) - { - m_outputImage[i] = nullptr; - } + m_outputImage = nullptr; m_outputReady = false; m_progress = 0.0f; } @@ -109,13 +92,12 @@ namespace ImageProcessingAtom IImageObjectPtr outputImage = m_process->GetOutputImage(); - m_output->SetOutputImage(outputImage, ImageConvertOutput::Base); - if (!IsJobCancelled()) { - // For preview, combine image output with alpha if any + // convert the output image to RGBA format for preview m_output->SetProgress(1.0f / static_cast(m_previewProcessStep)); - m_output->SetOutputImage(outputImage, ImageConvertOutput::Preview); + IImageObjectPtr uncompressedImage = ConvertImageForPreview(outputImage); + m_output->SetOutputImage(uncompressedImage); } m_output->SetReady(true); diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/ImageConvertJob.h b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/ImageConvertJob.h index 9baa5dd1b4..ac15d47806 100644 --- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/ImageConvertJob.h +++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/ImageConvertJob.h @@ -21,16 +21,8 @@ namespace ImageProcessingAtom class ImageConvertOutput { public: - enum OutputImageType - { - Base = 0, // Might contains alpha or not - Alpha, // Separate alpha image - Preview, // Combine base image with alpha if any, format RGBA8 - Count - }; - - IImageObjectPtr GetOutputImage(OutputImageType type) const; - void SetOutputImage(IImageObjectPtr image, OutputImageType type); + IImageObjectPtr GetOutputImage() const; + void SetOutputImage(IImageObjectPtr image); void SetReady(bool ready); bool IsReady() const; float GetProgress() const; @@ -38,7 +30,7 @@ namespace ImageProcessingAtom void Reset(); private: - IImageObjectPtr m_outputImage[OutputImageType::Count]; + IImageObjectPtr m_outputImage; bool m_outputReady = false; float m_progress = 0.0f; }; diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/ImagePreview.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/ImagePreview.cpp index f51741eba9..896d5a8396 100644 --- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/ImagePreview.cpp +++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/ImagePreview.cpp @@ -86,7 +86,7 @@ namespace ImageProcessingAtom IImageObjectPtr ImagePreview::GetOutputImage() { - return m_output.GetOutputImage(ImageConvertOutput::Preview); + return m_output.GetOutputImage(); } ImagePreview::~ImagePreview() From 77279bfd55396524d3ba00c7b4407237e546035d Mon Sep 17 00:00:00 2001 From: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com> Date: Fri, 19 Nov 2021 11:04:53 -0600 Subject: [PATCH 156/345] Prevent updates to o3de_manifests.json if it is corrupted. (#5776) This behavior can be overridden using the --force option. Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com> --- scripts/o3de/o3de/manifest.py | 145 ++++++++++++------------ scripts/o3de/o3de/register.py | 207 +++++++++++++++++++--------------- 2 files changed, 189 insertions(+), 163 deletions(-) diff --git a/scripts/o3de/o3de/manifest.py b/scripts/o3de/o3de/manifest.py index ceaec55474..e46b819a7c 100644 --- a/scripts/o3de/o3de/manifest.py +++ b/scripts/o3de/o3de/manifest.py @@ -108,75 +108,79 @@ def get_o3de_third_party_folder() -> pathlib.Path: # o3de manifest file methods +def get_default_o3de_manifest_json_data() -> dict: + """ + Returns dict with default values suitable for storing + in the o3de_manifests.json + """ + username = os.path.split(get_home_folder())[-1] + + o3de_folder = get_o3de_folder() + default_engines_folder = get_o3de_engines_folder() + default_projects_folder = get_o3de_projects_folder() + default_gems_folder = get_o3de_gems_folder() + default_templates_folder = get_o3de_templates_folder() + default_restricted_folder = get_o3de_restricted_folder() + default_third_party_folder = get_o3de_third_party_folder() + + default_projects_restricted_folder = default_projects_folder / 'Restricted' + default_projects_restricted_folder.mkdir(parents=True, exist_ok=True) + default_gems_restricted_folder = default_gems_folder / 'Restricted' + default_gems_restricted_folder.mkdir(parents=True, exist_ok=True) + default_templates_restricted_folder = default_templates_folder / 'Restricted' + default_templates_restricted_folder.mkdir(parents=True, exist_ok=True) + + json_data = {} + json_data.update({'o3de_manifest_name': f'{username}'}) + json_data.update({'origin': o3de_folder.as_posix()}) + json_data.update({'default_engines_folder': default_engines_folder.as_posix()}) + json_data.update({'default_projects_folder': default_projects_folder.as_posix()}) + json_data.update({'default_gems_folder': default_gems_folder.as_posix()}) + json_data.update({'default_templates_folder': default_templates_folder.as_posix()}) + json_data.update({'default_restricted_folder': default_restricted_folder.as_posix()}) + json_data.update({'default_third_party_folder': default_third_party_folder.as_posix()}) + + json_data.update({'engines': []}) + json_data.update({'projects': []}) + json_data.update({'external_subdirectories': []}) + json_data.update({'templates': []}) + json_data.update({'restricted': []}) + json_data.update({'repos': []}) + + default_restricted_folder_json = default_restricted_folder / 'restricted.json' + if not default_restricted_folder_json.is_file(): + with default_restricted_folder_json.open('w') as s: + restricted_json_data = {} + restricted_json_data.update({'restricted_name': 'o3de'}) + s.write(json.dumps(restricted_json_data, indent=4) + '\n') + + default_projects_restricted_folder_json = default_projects_restricted_folder / 'restricted.json' + if not default_projects_restricted_folder_json.is_file(): + with default_projects_restricted_folder_json.open('w') as s: + restricted_json_data = {} + restricted_json_data.update({'restricted_name': 'projects'}) + s.write(json.dumps(restricted_json_data, indent=4) + '\n') + + default_gems_restricted_folder_json = default_gems_restricted_folder / 'restricted.json' + if not default_gems_restricted_folder_json.is_file(): + with default_gems_restricted_folder_json.open('w') as s: + restricted_json_data = {} + restricted_json_data.update({'restricted_name': 'gems'}) + s.write(json.dumps(restricted_json_data, indent=4) + '\n') + + default_templates_restricted_folder_json = default_templates_restricted_folder / 'restricted.json' + if not default_templates_restricted_folder_json.is_file(): + with default_templates_restricted_folder_json.open('w') as s: + restricted_json_data = {} + restricted_json_data.update({'restricted_name': 'templates'}) + s.write(json.dumps(restricted_json_data, indent=4) + '\n') + + return json_data + def get_o3de_manifest() -> pathlib.Path: manifest_path = get_o3de_folder() / 'o3de_manifest.json' if not manifest_path.is_file(): - username = os.path.split(get_home_folder())[-1] - - o3de_folder = get_o3de_folder() - default_registry_folder = get_o3de_registry_folder() - default_cache_folder = get_o3de_cache_folder() - default_downloads_folder = get_o3de_download_folder() - default_logs_folder = get_o3de_logs_folder() - default_engines_folder = get_o3de_engines_folder() - default_projects_folder = get_o3de_projects_folder() - default_gems_folder = get_o3de_gems_folder() - default_templates_folder = get_o3de_templates_folder() - default_restricted_folder = get_o3de_restricted_folder() - default_third_party_folder = get_o3de_third_party_folder() - - default_projects_restricted_folder = default_projects_folder / 'Restricted' - default_projects_restricted_folder.mkdir(parents=True, exist_ok=True) - default_gems_restricted_folder = default_gems_folder / 'Restricted' - default_gems_restricted_folder.mkdir(parents=True, exist_ok=True) - default_templates_restricted_folder = default_templates_folder / 'Restricted' - default_templates_restricted_folder.mkdir(parents=True, exist_ok=True) - - json_data = {} - json_data.update({'o3de_manifest_name': f'{username}'}) - json_data.update({'origin': o3de_folder.as_posix()}) - json_data.update({'default_engines_folder': default_engines_folder.as_posix()}) - json_data.update({'default_projects_folder': default_projects_folder.as_posix()}) - json_data.update({'default_gems_folder': default_gems_folder.as_posix()}) - json_data.update({'default_templates_folder': default_templates_folder.as_posix()}) - json_data.update({'default_restricted_folder': default_restricted_folder.as_posix()}) - json_data.update({'default_third_party_folder': default_third_party_folder.as_posix()}) - - json_data.update({'engines': []}) - json_data.update({'projects': []}) - json_data.update({'external_subdirectories': []}) - json_data.update({'templates': []}) - json_data.update({'restricted': []}) - json_data.update({'repos': []}) - - default_restricted_folder_json = default_restricted_folder / 'restricted.json' - if not default_restricted_folder_json.is_file(): - with default_restricted_folder_json.open('w') as s: - restricted_json_data = {} - restricted_json_data.update({'restricted_name': 'o3de'}) - s.write(json.dumps(restricted_json_data, indent=4) + '\n') - json_data.update({'default_restricted_folder': default_restricted_folder.as_posix()}) - - default_projects_restricted_folder_json = default_projects_restricted_folder / 'restricted.json' - if not default_projects_restricted_folder_json.is_file(): - with default_projects_restricted_folder_json.open('w') as s: - restricted_json_data = {} - restricted_json_data.update({'restricted_name': 'projects'}) - s.write(json.dumps(restricted_json_data, indent=4) + '\n') - - default_gems_restricted_folder_json = default_gems_restricted_folder / 'restricted.json' - if not default_gems_restricted_folder_json.is_file(): - with default_gems_restricted_folder_json.open('w') as s: - restricted_json_data = {} - restricted_json_data.update({'restricted_name': 'gems'}) - s.write(json.dumps(restricted_json_data, indent=4) + '\n') - - default_templates_restricted_folder_json = default_templates_restricted_folder / 'restricted.json' - if not default_templates_restricted_folder_json.is_file(): - with default_templates_restricted_folder_json.open('w') as s: - restricted_json_data = {} - restricted_json_data.update({'restricted_name': 'templates'}) - s.write(json.dumps(restricted_json_data, indent=4) + '\n') + json_data = get_default_o3de_manifest_json_data() with manifest_path.open('w') as s: s.write(json.dumps(json_data, indent=4) + '\n') @@ -188,6 +192,7 @@ def load_o3de_manifest(manifest_path: pathlib.Path = None) -> dict: """ Loads supplied manifest file or ~/.o3de/o3de_manifest.json if None + raises Json.JSONDecodeError if manifest data could not be decoded to JSON :param manifest_path: optional path to manifest file to load """ if not manifest_path: @@ -196,8 +201,10 @@ def load_o3de_manifest(manifest_path: pathlib.Path = None) -> dict: try: json_data = json.load(f) except json.JSONDecodeError as e: - logger.error(f'Manifest json failed to load: {str(e)}') - return {} + logger.error(f'Manifest json failed to load at path "{manifest_path}": {str(e)}') + # Re-raise the exception and let the caller + # determine if they can proceed + raise else: return json_data @@ -589,7 +596,7 @@ def get_registered(engine_name: str = None, if isinstance(engine, dict): engine_path = pathlib.Path(engine['path']).resolve() else: - engine_path = pathlib.Path(engine_object).resolve() + engine_path = pathlib.Path(engine).resolve() engine_json = engine_path / 'engine.json' with engine_json.open('r') as f: diff --git a/scripts/o3de/o3de/register.py b/scripts/o3de/o3de/register.py index de0934f2e5..2500df1568 100644 --- a/scripts/o3de/o3de/register.py +++ b/scripts/o3de/o3de/register.py @@ -560,6 +560,107 @@ def register_default_third_party_folder(json_data: dict, manifest.get_o3de_third_party_folder() if remove else default_third_party_folder, 'default_third_party_folder') + +def remove_invalid_o3de_projects(manifest_path: pathlib.Path = None) -> int: + if not manifest_path: + manifest_path = manifest.get_o3de_manifest() + + json_data = manifest.load_o3de_manifest(manifest_path) + + result = 0 + + for project in json_data.get('projects', []): + if not validation.valid_o3de_project_json(pathlib.Path(project).resolve() / 'project.json'): + logger.warning(f"Project path {project} is invalid.") + # Attempt to unregister all invalid projects even if previous projects failed to unregister + # but combine the result codes of each command. + result = register(project_path=pathlib.Path(project), remove=True) or result + + return result + + +def remove_invalid_o3de_objects() -> None: + for engine_path in manifest.get_engines(): + if not validation.valid_o3de_engine_json(pathlib.Path(engine_path).resolve() / 'engine.json'): + logger.warning(f"Engine path {engine_path} is invalid.") + register(engine_path=engine_path, remove=True) + + remove_invalid_o3de_projects() + + for external in manifest.get_external_subdirectories(): + external = pathlib.Path(external).resolve() + if not external.is_dir(): + logger.warning(f"External subdirectory {external} is invalid.") + register(engine_path=engine_path, external_subdir_path=external, remove=True) + + for template in manifest.get_templates(): + if not validation.valid_o3de_template_json(pathlib.Path(template).resolve() / 'template.json'): + logger.warning(f"Template path {template} is invalid.") + register(template_path=template, remove=True) + + for restricted in manifest.get_restricted(): + if not validation.valid_o3de_restricted_json(pathlib.Path(restricted).resolve() / 'restricted.json'): + logger.warning(f"Restricted path {restricted} is invalid.") + register(restricted_path=restricted, remove=True) + + json_data = manifest.load_o3de_manifest() + default_engines_folder = pathlib.Path( + json_data.get('default_engines_folder', manifest.get_o3de_engines_folder())).resolve() + if not default_engines_folder.is_dir(): + new_default_engines_folder = manifest.get_o3de_folder() / 'Engines' + new_default_engines_folder.mkdir(parents=True, exist_ok=True) + logger.warning( + f"Default engines folder {default_engines_folder} is invalid. Set default {new_default_engines_folder}") + register(default_engines_folder=new_default_engines_folder.as_posix()) + + default_projects_folder = pathlib.Path( + json_data.get('default_projects_folder', manifest.get_o3de_projects_folder())).resolve() + if not default_projects_folder.is_dir(): + new_default_projects_folder = manifest.get_o3de_folder() / 'Projects' + new_default_projects_folder.mkdir(parents=True, exist_ok=True) + logger.warning( + f"Default projects folder {default_projects_folder} is invalid. Set default {new_default_projects_folder}") + register(default_projects_folder=new_default_projects_folder.as_posix()) + + default_gems_folder = pathlib.Path(json_data.get('default_gems_folder', manifest.get_o3de_gems_folder())).resolve() + if not default_gems_folder.is_dir(): + new_default_gems_folder = manifest.get_o3de_folder() / 'Gems' + new_default_gems_folder.mkdir(parents=True, exist_ok=True) + logger.warning(f"Default gems folder {default_gems_folder} is invalid." + f" Set default {new_default_gems_folder}") + register(default_gems_folder=new_default_gems_folder.as_posix()) + + default_templates_folder = pathlib.Path( + json_data.get('default_templates_folder', manifest.get_o3de_templates_folder())).resolve() + if not default_templates_folder.is_dir(): + new_default_templates_folder = manifest.get_o3de_folder() / 'Templates' + new_default_templates_folder.mkdir(parents=True, exist_ok=True) + logger.warning( + f"Default templates folder {default_templates_folder} is invalid." + f" Set default {new_default_templates_folder}") + register(default_templates_folder=new_default_templates_folder.as_posix()) + + default_restricted_folder = pathlib.Path( + json_data.get('default_restricted_folder', manifest.get_o3de_restricted_folder())).resolve() + if not default_restricted_folder.is_dir(): + default_restricted_folder = manifest.get_o3de_folder() / 'Restricted' + default_restricted_folder.mkdir(parents=True, exist_ok=True) + logger.warning( + f"Default restricted folder {default_restricted_folder} is invalid." + f" Set default {default_restricted_folder}") + register(default_restricted_folder=default_restricted_folder.as_posix()) + + default_third_party_folder = pathlib.Path( + json_data.get('default_third_party_folder', manifest.get_o3de_third_party_folder())).resolve() + if not default_third_party_folder.is_dir(): + default_third_party_folder = manifest.get_o3de_folder() / '3rdParty' + default_third_party_folder.mkdir(parents=True, exist_ok=True) + logger.warning( + f"Default 3rd Party folder {default_third_party_folder} is invalid." + f" Set default {default_third_party_folder}") + register(default_third_party_folder=default_third_party_folder.as_posix()) + + def register(engine_path: pathlib.Path = None, project_path: pathlib.Path = None, gem_path: pathlib.Path = None, @@ -604,7 +705,18 @@ def register(engine_path: pathlib.Path = None, :return: 0 for success or non 0 failure code """ - json_data = manifest.load_o3de_manifest() + try: + json_data = manifest.load_o3de_manifest() + except json.JSONDecodeError: + if not force: + logger.error('O3DE object registration has halted due to JSON Decode Error in manifest at path:' + f' "{manifest.get_o3de_manifest()}".' + '\n Registration can be forced using the --force option,' + ' but that will result in the manifest using default data') + return 1 + else: + # Use a default manifest data an proceed + json_data = manifest.get_default_o3de_manifest_json_data() result = 0 @@ -679,99 +791,6 @@ def register(engine_path: pathlib.Path = None, return result -def remove_invalid_o3de_projects(manifest_path: pathlib.Path = None) -> int: - if not manifest_path: - manifest_path = manifest.get_o3de_manifest() - - json_data = manifest.load_o3de_manifest(manifest_path) - - result = 0 - - for project in json_data.get('projects', []): - if not validation.valid_o3de_project_json(pathlib.Path(project).resolve() / 'project.json'): - logger.warning(f"Project path {project} is invalid.") - # Attempt to unregister all invalid projects even if previous projects failed to unregister - # but combine the result codes of each command. - result = register(project_path=pathlib.Path(project), remove=True) or result - - return result - -def remove_invalid_o3de_objects() -> None: - for engine_path in manifest.get_engines(): - if not validation.valid_o3de_engine_json(pathlib.Path(engine_path).resolve() / 'engine.json'): - logger.warning(f"Engine path {engine_path} is invalid.") - register(engine_path=engine_path, remove=True) - - remove_invalid_o3de_projects() - - for external in manifest.get_external_subdirectories(): - external = pathlib.Path(external).resolve() - if not external.is_dir(): - logger.warning(f"External subdirectory {external} is invalid.") - register(engine_path=engine_path, external_subdir_path=external, remove=True) - - for template in manifest.get_templates(): - if not validation.valid_o3de_template_json(pathlib.Path(template).resolve() / 'template.json'): - logger.warning(f"Template path {template} is invalid.") - register(template_path=template, remove=True) - - for restricted in manifest.get_restricted(): - if not validation.valid_o3de_restricted_json(pathlib.Path(restricted).resolve() / 'restricted.json'): - logger.warning(f"Restricted path {restricted} is invalid.") - register(restricted_path=restricted, remove=True) - - json_data = manifest.load_o3de_manifest() - default_engines_folder = pathlib.Path(json_data.get('default_engines_folder', manifest.get_o3de_engines_folder())).resolve() - if not default_engines_folder.is_dir(): - new_default_engines_folder = manifest.get_o3de_folder() / 'Engines' - new_default_engines_folder.mkdir(parents=True, exist_ok=True) - logger.warning( - f"Default engines folder {default_engines_folder} is invalid. Set default {new_default_engines_folder}") - register(default_engines_folder=new_default_engines_folder.as_posix()) - - default_projects_folder = pathlib.Path(json_data.get('default_projects_folder', manifest.get_o3de_projects_folder())).resolve() - if not default_projects_folder.is_dir(): - new_default_projects_folder = manifest.get_o3de_folder() / 'Projects' - new_default_projects_folder.mkdir(parents=True, exist_ok=True) - logger.warning( - f"Default projects folder {default_projects_folder} is invalid. Set default {new_default_projects_folder}") - register(default_projects_folder=new_default_projects_folder.as_posix()) - - default_gems_folder = pathlib.Path(json_data.get('default_gems_folder', manifest.get_o3de_gems_folder())).resolve() - if not default_gems_folder.is_dir(): - new_default_gems_folder = manifest.get_o3de_folder() / 'Gems' - new_default_gems_folder.mkdir(parents=True, exist_ok=True) - logger.warning(f"Default gems folder {default_gems_folder} is invalid." - f" Set default {new_default_gems_folder}") - register(default_gems_folder=new_default_gems_folder.as_posix()) - - default_templates_folder = pathlib.Path(json_data.get('default_templates_folder', manifest.get_o3de_templates_folder())).resolve() - if not default_templates_folder.is_dir(): - new_default_templates_folder = manifest.get_o3de_folder() / 'Templates' - new_default_templates_folder.mkdir(parents=True, exist_ok=True) - logger.warning( - f"Default templates folder {default_templates_folder} is invalid." - f" Set default {new_default_templates_folder}") - register(default_templates_folder=new_default_templates_folder.as_posix()) - - default_restricted_folder = pathlib.Path(json_data.get('default_restricted_folder', manifest.get_o3de_restricted_folder())).resolve() - if not default_restricted_folder.is_dir(): - default_restricted_folder = manifest.get_o3de_folder() / 'Restricted' - default_restricted_folder.mkdir(parents=True, exist_ok=True) - logger.warning( - f"Default restricted folder {default_restricted_folder} is invalid." - f" Set default {default_restricted_folder}") - register(default_restricted_folder=default_restricted_folder.as_posix()) - - default_third_party_folder = pathlib.Path(json_data.get('default_third_party_folder', manifest.get_o3de_third_party_folder())).resolve() - if not default_third_party_folder.is_dir(): - default_third_party_folder = manifest.get_o3de_folder() / '3rdParty' - default_third_party_folder.mkdir(parents=True, exist_ok=True) - logger.warning( - f"Default 3rd Party folder {default_third_party_folder} is invalid." - f" Set default {default_third_party_folder}") - register(default_third_party_folder=default_third_party_folder.as_posix()) - def _run_register(args: argparse) -> int: if args.override_home_folder: From b4ff364a51c683b1fa30245cad7822f7ed231c3a Mon Sep 17 00:00:00 2001 From: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com> Date: Fri, 19 Nov 2021 09:11:48 -0800 Subject: [PATCH 157/345] Remove AI components from list of addable components in Inspector. (#5780) Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com> --- .../LmbrCentral/Code/Source/Ai/EditorNavigationAreaComponent.cpp | 1 + .../LmbrCentral/Code/Source/Ai/EditorNavigationSeedComponent.cpp | 1 + Gems/LmbrCentral/Code/Source/Ai/NavigationComponent.cpp | 1 + 3 files changed, 3 insertions(+) diff --git a/Gems/LmbrCentral/Code/Source/Ai/EditorNavigationAreaComponent.cpp b/Gems/LmbrCentral/Code/Source/Ai/EditorNavigationAreaComponent.cpp index f723918cf3..ed707ee9b3 100644 --- a/Gems/LmbrCentral/Code/Source/Ai/EditorNavigationAreaComponent.cpp +++ b/Gems/LmbrCentral/Code/Source/Ai/EditorNavigationAreaComponent.cpp @@ -47,6 +47,7 @@ namespace LmbrCentral { editContext->Class("Navigation Area", "Navigation Area configuration") ->ClassElement(AZ::Edit::ClassElements::EditorData, "") + ->Attribute(AZ::Edit::Attributes::AddableByUser, false) ->Attribute(AZ::Edit::Attributes::Category, "AI") ->Attribute(AZ::Edit::Attributes::Icon, "Icons/Components/NavigationArea.svg") ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/NavigationArea.svg") diff --git a/Gems/LmbrCentral/Code/Source/Ai/EditorNavigationSeedComponent.cpp b/Gems/LmbrCentral/Code/Source/Ai/EditorNavigationSeedComponent.cpp index 47999dbd4b..8d8727e314 100644 --- a/Gems/LmbrCentral/Code/Source/Ai/EditorNavigationSeedComponent.cpp +++ b/Gems/LmbrCentral/Code/Source/Ai/EditorNavigationSeedComponent.cpp @@ -32,6 +32,7 @@ namespace LmbrCentral editContext->Class("Navigation Seed", "Determines reachable navigation nodes") ->ClassElement(AZ::Edit::ClassElements::EditorData, "") ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Game", 0x232b318c)) + ->Attribute(AZ::Edit::Attributes::AddableByUser, false) ->Attribute(AZ::Edit::Attributes::Category, "AI") ->Attribute(AZ::Edit::Attributes::Icon, "Icons/Components/NavigationSeed.svg") ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/NavigationSeed.svg") diff --git a/Gems/LmbrCentral/Code/Source/Ai/NavigationComponent.cpp b/Gems/LmbrCentral/Code/Source/Ai/NavigationComponent.cpp index 500d5c17da..9798307d51 100644 --- a/Gems/LmbrCentral/Code/Source/Ai/NavigationComponent.cpp +++ b/Gems/LmbrCentral/Code/Source/Ai/NavigationComponent.cpp @@ -120,6 +120,7 @@ namespace LmbrCentral editContext->Class( "Navigation", "The Navigation component provides basic pathfinding and pathfollowing services to an entity") ->ClassElement(AZ::Edit::ClassElements::EditorData, "") + ->Attribute(AZ::Edit::Attributes::AddableByUser, false) ->Attribute(AZ::Edit::Attributes::Category, "AI") ->Attribute(AZ::Edit::Attributes::Icon, "Icons/Components/Navigation.svg") ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/Navigation.svg") From b0dc1ea6fa5c20b1ae6e53422e54706e7c3a36ef Mon Sep 17 00:00:00 2001 From: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com> Date: Fri, 19 Nov 2021 11:23:38 -0600 Subject: [PATCH 158/345] CMake Xcode Generator fix (#5771) Removed the generator expression from the `LY_ARCHIVE_FILE_SEARCH_MODE` define as Xcode doesn't support per-config per-file definitions. Updated the #else block in ArchiveVars to default to PakOnly mode if the `LY_ARCHIVE_FILE_SEARCH_MODE` define isn't set. Moved the the `LY_ARCHIVE_FILE_SEARCH_MODE` Cache Variable from cmake/Deployment.cmake to feature_options.cmake within the AzFramework folder. Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com> --- .../AzFramework/AzFramework/Archive/ArchiveVars.cpp | 8 +++++--- .../AzFramework/AzFramework/azframework_files.cmake | 1 + .../AzFramework/AzFramework/feature_options.cmake | 13 +++++++++++++ Code/Framework/AzFramework/CMakeLists.txt | 4 +++- cmake/Deployment.cmake | 5 ----- 5 files changed, 22 insertions(+), 9 deletions(-) create mode 100644 Code/Framework/AzFramework/AzFramework/feature_options.cmake diff --git a/Code/Framework/AzFramework/AzFramework/Archive/ArchiveVars.cpp b/Code/Framework/AzFramework/AzFramework/Archive/ArchiveVars.cpp index effb7168ad..0098d97b8d 100644 --- a/Code/Framework/AzFramework/AzFramework/Archive/ArchiveVars.cpp +++ b/Code/Framework/AzFramework/AzFramework/Archive/ArchiveVars.cpp @@ -13,10 +13,12 @@ namespace AZ::IO { FileSearchPriority GetDefaultFileSearchPriority() { -#if defined(LY_ARCHIVE_FILE_SEARCH_MODE_DEFAULT) - return FileSearchPriority{ LY_ARCHIVE_FILE_SEARCH_MODE_DEFAULT }; +#if defined(LY_ARCHIVE_FILE_SEARCH_MODE) + return FileSearchPriority{ LY_ARCHIVE_FILE_SEARCH_MODE }; #else - return FileSearchPriority{}; + return FileSearchPriority{ !ArchiveVars::IsReleaseConfig + ? FileSearchPriority::FileFirst + : FileSearchPriority::PakOnly }; #endif } } diff --git a/Code/Framework/AzFramework/AzFramework/azframework_files.cmake b/Code/Framework/AzFramework/AzFramework/azframework_files.cmake index 23abe99989..b8d428ab82 100644 --- a/Code/Framework/AzFramework/AzFramework/azframework_files.cmake +++ b/Code/Framework/AzFramework/AzFramework/azframework_files.cmake @@ -79,6 +79,7 @@ set(FILES CommandLine/CommandLine.h CommandLine/CommandRegistrationBus.h Debug/DebugCameraBus.h + feature_options.cmake Viewport/ViewportBus.h Viewport/ViewportBus.cpp Viewport/ViewportColors.h diff --git a/Code/Framework/AzFramework/AzFramework/feature_options.cmake b/Code/Framework/AzFramework/AzFramework/feature_options.cmake new file mode 100644 index 0000000000..e10ddf6ba6 --- /dev/null +++ b/Code/Framework/AzFramework/AzFramework/feature_options.cmake @@ -0,0 +1,13 @@ +# +# 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 +# +# + +set(LY_ARCHIVE_FILE_SEARCH_MODE "" CACHE STRING "Set the default file search mode to locate non-Pak files within the Archive System\n\ + Valid values are:\n\ + 0 = Search FileSystem first, before searching within mounted Paks (default in debug/profile)\n\ + 1 = Search mounted Paks first, before searching FileSystem\n\ + 2 = Search only mounted Paks (default in release)\n") diff --git a/Code/Framework/AzFramework/CMakeLists.txt b/Code/Framework/AzFramework/CMakeLists.txt index e4798c2f64..5e9e094a91 100644 --- a/Code/Framework/AzFramework/CMakeLists.txt +++ b/Code/Framework/AzFramework/CMakeLists.txt @@ -6,6 +6,8 @@ # # +include(AzFramework/feature_options.cmake) + ly_get_list_relative_pal_filename(pal_dir ${CMAKE_CURRENT_LIST_DIR}/Platform/${PAL_PLATFORM_NAME}) ly_get_list_relative_pal_filename(common_dir ${CMAKE_CURRENT_LIST_DIR}/Platform/Common) @@ -32,7 +34,7 @@ ly_add_target( 3rdParty::lz4 ) -set(LY_SEARCH_MODE_DEFINE $<$>:LY_ARCHIVE_FILE_SEARCH_MODE_DEFAULT=${LY_ARCHIVE_FILE_SEARCH_MODE}>) +set(LY_SEARCH_MODE_DEFINE $<$:LY_ARCHIVE_FILE_SEARCH_MODE=${LY_ARCHIVE_FILE_SEARCH_MODE}>) ly_add_source_properties( SOURCES diff --git a/cmake/Deployment.cmake b/cmake/Deployment.cmake index d78c1063f3..1f6f2fc0f3 100644 --- a/cmake/Deployment.cmake +++ b/cmake/Deployment.cmake @@ -10,8 +10,3 @@ set(LY_ASSET_DEPLOY_MODE "LOOSE" CACHE STRING "Set the Asset deployment when deploying to the target platform (LOOSE, PAK, VFS)") set(LY_ASSET_OVERRIDE_PAK_FOLDER_ROOT "" CACHE STRING "Optional root path to where Pak file folders are stored. By default, blank will use a predefined 'paks' root.") -set(LY_ARCHIVE_FILE_SEARCH_MODE "$<$:2>" CACHE STRING "Set the default file search mode to locate non-Pak files within the Archive System\n\ - Valid values are:\n\ - 0 = Search FileSystem first, before searching within mounted Paks\n\ - 1 = Search mounted Paks first, before searching FileSystem\n\ - 2 = Search only mounted Paks(default in release)\n") From 4ad35f424e01356a4745e5f50631dc050b328c98 Mon Sep 17 00:00:00 2001 From: John Jones-Steele <82226755+jjjoness@users.noreply.github.com> Date: Fri, 19 Nov 2021 17:57:38 +0000 Subject: [PATCH 159/345] Adds check to make sure that there are not too many samples created. (#5789) * Adds check to make sure that there are not too many samples created. Signed-off-by: John Jones-Steele <82226755+jjjoness@users.noreply.github.com> * Changes made from PR Signed-off-by: John Jones-Steele <82226755+jjjoness@users.noreply.github.com> * Changes made from PR 2 Signed-off-by: John Jones-Steele <82226755+jjjoness@users.noreply.github.com> --- .../UI/PropertyEditor/PropertyVectorCtrl.hxx | 5 +-- .../Components/TerrainWorldComponent.cpp | 44 ++++++++++++++++++- .../Source/Components/TerrainWorldComponent.h | 8 ++++ 3 files changed, 51 insertions(+), 6 deletions(-) diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyVectorCtrl.hxx b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyVectorCtrl.hxx index e5a6b5803c..cc61593154 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyVectorCtrl.hxx +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyVectorCtrl.hxx @@ -150,10 +150,7 @@ namespace AzToolsFramework TypeBeingHandled actualValue = instance; for (int idx = 0; idx < m_common.GetElementCount(); ++idx) { - if (elements[idx]->wasValueEditedByUser()) - { - actualValue.SetElement(idx, static_cast(elements[idx]->getValue())); - } + actualValue.SetElement(idx, static_cast(elements[idx]->getValue())); } instance = actualValue; } diff --git a/Gems/Terrain/Code/Source/Components/TerrainWorldComponent.cpp b/Gems/Terrain/Code/Source/Components/TerrainWorldComponent.cpp index bd65cf6abc..8d6bf8e4b0 100644 --- a/Gems/Terrain/Code/Source/Components/TerrainWorldComponent.cpp +++ b/Gems/Terrain/Code/Source/Components/TerrainWorldComponent.cpp @@ -40,15 +40,17 @@ namespace Terrain ->DataElement(AZ::Edit::UIHandlers::Default, &TerrainWorldConfig::m_worldMin, "World Bounds (Min)", "") // Temporary constraint until the rest of the Terrain system is updated to support larger worlds. + ->Attribute(AZ::Edit::Attributes::ChangeValidate, &TerrainWorldConfig::ValidateWorldMin) ->Attribute(AZ::Edit::Attributes::Min, -2048.0f) ->Attribute(AZ::Edit::Attributes::Max, 2048.0f) ->DataElement(AZ::Edit::UIHandlers::Default, &TerrainWorldConfig::m_worldMax, "World Bounds (Max)", "") // Temporary constraint until the rest of the Terrain system is updated to support larger worlds. + ->Attribute(AZ::Edit::Attributes::ChangeValidate, &TerrainWorldConfig::ValidateWorldMax) ->Attribute(AZ::Edit::Attributes::Min, -2048.0f) ->Attribute(AZ::Edit::Attributes::Max, 2048.0f) ->DataElement( AZ::Edit::UIHandlers::Default, &TerrainWorldConfig::m_heightQueryResolution, "Height Query Resolution (m)", "") - ; + ->Attribute(AZ::Edit::Attributes::ChangeValidate, &TerrainWorldConfig::ValidateWorldHeight); } } } @@ -128,4 +130,42 @@ namespace Terrain } return false; } -} + + float TerrainWorldConfig::NumberOfSamples(AZ::Vector3* min, AZ::Vector3* max, AZ::Vector2* heightQuery) + { + float numberOfSamples = ((max->GetX() - min->GetX()) / heightQuery->GetX()) * ((max->GetY() - min->GetY()) / heightQuery->GetY()); + return numberOfSamples; + } + + AZ::Outcome TerrainWorldConfig::DetermineMessage(float numSamples) + { + const float maximumSamplesAllowed = 8.0f * 1024.0f * 1024.0f; + if (numSamples < maximumSamplesAllowed) + { + return AZ::Success(); + } + return AZ::Failure(AZStd::string("The number of samples exceeds the maximum allowed.")); + } + + AZ::Outcome TerrainWorldConfig::ValidateWorldMin(void* newValue, [[maybe_unused]]const AZ::Uuid& valueType) + { + AZ::Vector3 minValue = *static_cast(newValue); + + return DetermineMessage(NumberOfSamples(&minValue, &m_worldMax, &m_heightQueryResolution)); + } + + AZ::Outcome TerrainWorldConfig::ValidateWorldMax(void* newValue, [[maybe_unused]] const AZ::Uuid& valueType) + { + AZ::Vector3 maxValue = *static_cast(newValue); + + return DetermineMessage(NumberOfSamples(&m_worldMin, &maxValue, &m_heightQueryResolution)); + } + + AZ::Outcome TerrainWorldConfig::ValidateWorldHeight(void* newValue, [[maybe_unused]] const AZ::Uuid& valueType) + { + AZ::Vector2 heightValue = *static_cast(newValue); + + return DetermineMessage(NumberOfSamples(&m_worldMin, &m_worldMax, &heightValue)); + } + +} // namespace Terrain diff --git a/Gems/Terrain/Code/Source/Components/TerrainWorldComponent.h b/Gems/Terrain/Code/Source/Components/TerrainWorldComponent.h index 2dfe1135c8..a396bcefc8 100644 --- a/Gems/Terrain/Code/Source/Components/TerrainWorldComponent.h +++ b/Gems/Terrain/Code/Source/Components/TerrainWorldComponent.h @@ -32,6 +32,14 @@ namespace Terrain AZ::Vector3 m_worldMin{ 0.0f, 0.0f, 0.0f }; AZ::Vector3 m_worldMax{ 1024.0f, 1024.0f, 1024.0f }; AZ::Vector2 m_heightQueryResolution{ 1.0f, 1.0f }; + + private: + AZ::Outcome ValidateWorldMin(void* newValue, const AZ::Uuid& valueType); + AZ::Outcome ValidateWorldMax(void* newValue, const AZ::Uuid& valueType); + AZ::Outcome ValidateWorldHeight(void* newValue, const AZ::Uuid& valueType); + float NumberOfSamples(AZ::Vector3* min, AZ::Vector3* max, AZ::Vector2* heightQuery); + AZ::Outcome DetermineMessage(float numSamples); + }; From 4ee2f341dc0dc709aedb446b57d5cca61b86160d Mon Sep 17 00:00:00 2001 From: Nicholas Van Sickle Date: Fri, 19 Nov 2021 10:05:19 -0800 Subject: [PATCH 160/345] Fix several Prefab outliner ordering issues (#5747) * Fix several Prefab outliner ordering issues This change does a few things to address instability in entity order when prefabs are enabled: - Changes ordering behavior on entity add to always be "insert after the last selected sibling of the new entity, or at the end if there is no selected sibling" - Adds some logic to ensure selection stays frozen during prefab propagation to allow this behavior to be used - Alters delta generation in `PrefabPublicHandler::CreateEntity` to use the template instead of reserializing the DOM - this avoids a whole bunch of patching issues caused by EditorEntitySortComponent doing post-hoc order fix-up and should generally be safer/faster as we're producing patches for the actual target for those patches - Because the duplicate action is DOM-driven, and there's some thorniness around making changes that will affect the template during propagation, this adds `PrefabPublicHandler::AddNewEntityToSortOrder` to directly patch the DOM for the duplicate case Two bits of this come from patches from the incredibly helpful @AMZN-daimini - Alters `PrefabPublicHandler::GenerateUndoNodesForEntityChangeAndUpdateCache` behavior for determining what's an override: we now check to see if we're part of the current focused instance but *not* owned by the focus instance directly. This lets entity order for nested prefabs get saved to the owning prefab instead of as an override. I'm putting this up for discussion without a feature flag gating it, but we may wish to make this a toggle or disable it outright for stabilization (in which case entity order won't be saved to the owning prefab) - Adds a custom serializer for EditorEntitySortComponent. This isn't strictly necessary now, but it was very useful for debugging and ended up receiving much more manual testing its migration path and save/load path more than I've tested without using the serializer. Signed-off-by: Nicholas Van Sickle * Add missing serializers Signed-off-by: Nicholas Van Sickle * Address some review feedback Signed-off-by: Nicholas Van Sickle * Generate patch in `PrefabPublicHandler::CreateEntity` using the instance's fully evaluated template in-memory Signed-off-by: Nicholas Van Sickle * Fix up comment Signed-off-by: Nicholas Van Sickle * Fix Linux build Signed-off-by: Nicholas Van Sickle * Try to make test less timing dependent (haven't been able to repro failure locally) Signed-off-by: Nicholas Van Sickle * Fix another build issue Signed-off-by: Nicholas Van Sickle * Fix unit test failures Signed-off-by: Nicholas Van Sickle * Fix a duplicate issue with sanitization that was causing sporadic test failure (thanks, test!) Signed-off-by: Nicholas Van Sickle * One more Linux fix... Signed-off-by: Nicholas Van Sickle --- .../EntityOutliner_EntityOrdering.py | 21 +- .../Application/ToolsApplication.cpp | 39 +++ .../Application/ToolsApplication.h | 11 + .../Entity/EditorEntityModel.cpp | 25 +- .../Entity/EditorEntitySortComponent.cpp | 110 ++++++-- .../Entity/EditorEntitySortComponent.h | 5 + .../EditorEntitySortComponentSerializer.cpp | 137 ++++++++++ .../EditorEntitySortComponentSerializer.h | 31 +++ .../Instance/InstanceUpdateExecutor.cpp | 5 +- .../AzToolsFramework/Prefab/PrefabDomUtils.h | 3 + .../Prefab/PrefabPublicHandler.cpp | 247 +++++++++++++++++- .../Prefab/PrefabPublicHandler.h | 2 + .../PropertyEditor/EntityPropertyEditor.cpp | 1 - .../aztoolsframework_files.cmake | 2 + 14 files changed, 598 insertions(+), 41 deletions(-) create mode 100644 Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntitySortComponentSerializer.cpp create mode 100644 Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntitySortComponentSerializer.h diff --git a/AutomatedTesting/Gem/PythonTests/editor/EditorScripts/EntityOutliner_EntityOrdering.py b/AutomatedTesting/Gem/PythonTests/editor/EditorScripts/EntityOutliner_EntityOrdering.py index e4575d4d17..5fa8130302 100644 --- a/AutomatedTesting/Gem/PythonTests/editor/EditorScripts/EntityOutliner_EntityOrdering.py +++ b/AutomatedTesting/Gem/PythonTests/editor/EditorScripts/EntityOutliner_EntityOrdering.py @@ -95,7 +95,8 @@ def EntityOutliner_EntityOrdering(): entity_outliner_model.dropMimeData( mime_data, QtCore.Qt.MoveAction, target_row, 0, target_index.parent() ) - QtWidgets.QApplication.processEvents() + # Wait after move to let events (i.e. prefab propagation) process + general.idle_wait(1.0) # Move an entity before another entity in the order by dragging the source above the target move_entity_before = lambda source_name, target_name: _move_entity( @@ -119,24 +120,24 @@ def EntityOutliner_EntityOrdering(): # Our new entity should be given a name with a number automatically new_entity = f"Entity{i+1}" - # The new entity should be added to the top of its parent entity - expected_order = [new_entity] + expected_order + # The new entity should be added to the bottom of its parent entity + expected_order = expected_order + [new_entity] verify_entities_sorted(expected_order) - # 3) Move "Entity1" to the top of the order - move_entity_before("Entity1", "Entity5") - expected_order = ["Entity1", "Entity5", "Entity4", "Entity3", "Entity2"] + # 3) Move "Entity5" to the top of the order + move_entity_before("Entity5", "Entity1") + expected_order = ["Entity5", "Entity1", "Entity2", "Entity3", "Entity4"] verify_entities_sorted(expected_order) - # 4) Move "Entity4" to the bottom of the order - move_entity_after("Entity4", "Entity2") - expected_order = ["Entity1", "Entity5", "Entity3", "Entity2", "Entity4"] + # 4) Move "Entity2" to the bottom of the order + move_entity_after("Entity2", "Entity4") + expected_order = ["Entity5", "Entity1", "Entity3", "Entity4", "Entity2"] verify_entities_sorted(expected_order) # 5) Add another new entity, ensure the rest of the order is unchanged create_entity() - expected_order = ["Entity6", "Entity1", "Entity5", "Entity3", "Entity2", "Entity4"] + expected_order = ["Entity5", "Entity1", "Entity3", "Entity4", "Entity2", "Entity6"] verify_entities_sorted(expected_order) diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Application/ToolsApplication.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Application/ToolsApplication.cpp index d3b3b09583..0412e454a6 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/Application/ToolsApplication.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Application/ToolsApplication.cpp @@ -238,12 +238,14 @@ namespace AzToolsFramework , m_isInIsolationMode(false) { ToolsApplicationRequests::Bus::Handler::BusConnect(); + AzToolsFramework::Prefab::PrefabPublicNotificationBus::Handler::BusConnect(); m_undoCache.RegisterToUndoCacheInterface(); } ToolsApplication::~ToolsApplication() { + AzToolsFramework::Prefab::PrefabPublicNotificationBus::Handler::BusDisconnect(); ToolsApplicationRequests::Bus::Handler::BusDisconnect(); Stop(); } @@ -564,6 +566,12 @@ namespace AzToolsFramework void ToolsApplication::MarkEntitySelected(AZ::EntityId entityId) { AZ_PROFILE_FUNCTION(AzToolsFramework); + + if (m_freezeSelectionUpdates) + { + return; + } + AZ_Assert(entityId.IsValid(), "Invalid entity Id being marked as selected."); EntityIdList::iterator foundIter = AZStd::find(m_selectedEntities.begin(), m_selectedEntities.end(), entityId); @@ -583,6 +591,11 @@ namespace AzToolsFramework { AZ_PROFILE_FUNCTION(AzToolsFramework); + if (m_freezeSelectionUpdates) + { + return; + } + EntityIdList entitiesSelected; entitiesSelected.reserve(entitiesToSelect.size()); @@ -606,6 +619,12 @@ namespace AzToolsFramework void ToolsApplication::MarkEntityDeselected(AZ::EntityId entityId) { AZ_PROFILE_FUNCTION(AzToolsFramework); + + if (m_freezeSelectionUpdates) + { + return; + } + auto foundIter = AZStd::find(m_selectedEntities.begin(), m_selectedEntities.end(), entityId); if (foundIter != m_selectedEntities.end()) { @@ -623,6 +642,11 @@ namespace AzToolsFramework { AZ_PROFILE_FUNCTION(AzToolsFramework); + if (m_freezeSelectionUpdates) + { + return; + } + ToolsApplicationEvents::Bus::Broadcast(&ToolsApplicationEvents::BeforeEntitySelectionChanged); EntityIdSet entitySetToDeselect(entitiesToDeselect.begin(), entitiesToDeselect.end()); @@ -677,6 +701,11 @@ namespace AzToolsFramework { AZ_PROFILE_FUNCTION(AzToolsFramework); + if (m_freezeSelectionUpdates) + { + return; + } + // We're setting the selection set as a batch from an external caller. // * Filter out any unselectable entities // * Calculate selection/deselection delta so we can notify specific entities only on change. @@ -1567,6 +1596,16 @@ namespace AzToolsFramework } } + void ToolsApplication::OnPrefabInstancePropagationBegin() + { + m_freezeSelectionUpdates = true; + } + + void ToolsApplication::OnPrefabInstancePropagationEnd() + { + m_freezeSelectionUpdates = false; + } + void ToolsApplication::CreateUndosForDirtyEntities() { AZ_PROFILE_FUNCTION(AzToolsFramework); diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Application/ToolsApplication.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Application/ToolsApplication.h index 5e9208b475..3dcb43f17d 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/Application/ToolsApplication.h +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Application/ToolsApplication.h @@ -16,6 +16,7 @@ #include #include #include +#include #pragma once @@ -29,6 +30,7 @@ namespace AzToolsFramework class ToolsApplication : public AzFramework::Application , public ToolsApplicationRequests::Bus::Handler + , public AzToolsFramework::Prefab::PrefabPublicNotificationBus::Handler { public: AZ_RTTI(ToolsApplication, "{2895561E-BE90-4CC3-8370-DD46FCF74C01}", AzFramework::Application); @@ -169,6 +171,14 @@ namespace AzToolsFramework }; ////////////////////////////////////////////////////////////////////////// + ////////////////////////////////////////////////////////////////////////// + // PrefabPublicNotificationBus::Handler + + void OnPrefabInstancePropagationBegin() override; + void OnPrefabInstancePropagationEnd() override; + + ////////////////////////////////////////////////////////////////////////// + void CreateUndosForDirtyEntities(); void ConsistencyCheckUndoCache(); AZ::Aabb m_selectionBounds; @@ -181,6 +191,7 @@ namespace AzToolsFramework bool m_isDuringUndoRedo; bool m_isInIsolationMode; EntityIdSet m_isolatedEntityIdSet; + bool m_freezeSelectionUpdates = false; EditorEntityAPI* m_editorEntityAPI = nullptr; diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntityModel.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntityModel.cpp index eaff64ba2e..e4d4f40bce 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntityModel.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntityModel.cpp @@ -449,16 +449,23 @@ namespace AzToolsFramework AZStd::unordered_map>::const_iterator orderItr = m_savedOrderInfo.find(childId); if (orderItr != m_savedOrderInfo.end() && orderItr->second.first == parentId) { - bool sortOrderUpdated = AzToolsFramework::RecoverEntitySortInfo(parentId, childId, orderItr->second.second); - m_savedOrderInfo.erase(childId); - - // force notify the child sort order changed on the parent entity info, but only if the restore didn't actually modify - // the order internally (and sent ChildEntityOrderArrayUpdated). that may seem heavy handed, and it is, but necessary - // to combat scenarios when the initial override detection returns a false positive (see comment about IDH comparisons - // in OnChildSortOrderChanged) and the slice instance source-to-live mapping hasn't been fully reconstructed yet. - if (!sortOrderUpdated) + bool isPrefabEnabled = false; + AzFramework::ApplicationRequests::Bus::BroadcastResult( + isPrefabEnabled, &AzFramework::ApplicationRequests::IsPrefabSystemEnabled); + // If prefabs are enabled, rely on the component to do a sanity check instead of restoring the order from the model + if (!isPrefabEnabled) { - parentInfo.OnChildSortOrderChanged(); + bool sortOrderUpdated = AzToolsFramework::RecoverEntitySortInfo(parentId, childId, orderItr->second.second); + m_savedOrderInfo.erase(childId); + + // force notify the child sort order changed on the parent entity info, but only if the restore didn't actually modify + // the order internally (and sent ChildEntityOrderArrayUpdated). that may seem heavy handed, and it is, but necessary + // to combat scenarios when the initial override detection returns a false positive (see comment about IDH comparisons + // in OnChildSortOrderChanged) and the slice instance source-to-live mapping hasn't been fully reconstructed yet. + if (!sortOrderUpdated) + { + parentInfo.OnChildSortOrderChanged(); + } } } else diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntitySortComponent.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntitySortComponent.cpp index 6936397187..8ade8c470f 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntitySortComponent.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntitySortComponent.cpp @@ -8,11 +8,17 @@ #include "EditorEntitySortComponent.h" #include "EditorEntityInfoBus.h" #include "EditorEntityHelpers.h" +#include #include #include +#include #include #include #include +#include +#include +#include +#include static_assert(sizeof(AZ::u64) == sizeof(AZ::EntityId), "We use AZ::EntityId for Persistent ID, which is a u64 under the hood. These must be the same size otherwise the persistent id will have to be rewritten"); @@ -51,6 +57,12 @@ namespace AzToolsFramework ; } } + + AZ::JsonRegistrationContext* jsonRegistration = azrtti_cast(context); + if (jsonRegistration) + { + jsonRegistration->Serializer()->HandlesType(); + } } void EditorEntitySortComponent::GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& services) @@ -167,9 +179,6 @@ namespace AzToolsFramework } MarkDirtyAndSendChangedEvent(); - - // Use the ToolsApplication to mark the entity dirty, this will only do something if we already have an undo batch - ToolsApplicationRequestBus::Broadcast(&ToolsApplicationRequestBus::Events::AddDirtyEntity, GetEntityId()); return true; } @@ -187,6 +196,10 @@ namespace AzToolsFramework else { EntityOrderArray::iterator insertPosition = GetFirstSelectedEntityPosition(); + if (insertPosition != m_childEntityOrderArray.end()) + { + ++insertPosition; + } retval = AddChildEntityInternal(entityId, false, insertPosition); } @@ -220,9 +233,6 @@ namespace AzToolsFramework MarkDirtyAndSendChangedEvent(); - // Use the ToolsApplication to mark the entity dirty, this will only do something if we already have an undo batch - ToolsApplicationRequestBus::Broadcast(&ToolsApplicationRequestBus::Events::AddDirtyEntity, GetEntityId()); - return true; } return false; @@ -272,6 +282,12 @@ namespace AzToolsFramework void EditorEntitySortComponent::OnPrefabInstancePropagationEnd() { m_ignoreIncomingOrderChanges = false; + + if (m_shouldSanityCheckStateAfterPropagation) + { + SanitizeOrderEntryArray(); + m_shouldSanityCheckStateAfterPropagation = false; + } } void EditorEntitySortComponent::MarkDirtyAndSendChangedEvent() @@ -280,14 +296,8 @@ namespace AzToolsFramework // one of the event listeners needs to build the InstanceDataHierarchy m_entityOrderIsDirty = true; - // Force an immediate update for prefabs, which won't receive PrepareSave - bool isPrefabEnabled = false; - AzFramework::ApplicationRequests::Bus::BroadcastResult( - isPrefabEnabled, &AzFramework::ApplicationRequests::IsPrefabSystemEnabled); - if (isPrefabEnabled) - { - PrepareSave(); - } + // Use the ToolsApplication to mark the entity dirty, this will only do something if we already have an undo batch + ToolsApplicationRequestBus::Broadcast(&ToolsApplicationRequestBus::Events::AddDirtyEntity, GetEntityId()); EditorEntitySortNotificationBus::Event(GetEntityId(), &EditorEntitySortNotificationBus::Events::ChildEntityOrderArrayUpdated); } @@ -308,9 +318,8 @@ namespace AzToolsFramework isPrefabEnabled, &AzFramework::ApplicationRequests::IsPrefabSystemEnabled); if (isPrefabEnabled) { - PostLoad(); + m_shouldSanityCheckStateAfterPropagation = true; } - // Send out that the order for our entity is now updated EditorEntitySortNotificationBus::Event(GetEntityId(), &EditorEntitySortNotificationBus::Events::ChildEntityOrderArrayUpdated); } @@ -336,6 +345,73 @@ namespace AzToolsFramework m_entityOrderIsDirty = false; } + void EditorEntitySortComponent::SanitizeOrderEntryArray() + { + bool shouldEmitDirtyState = false; + + // Remove invalid and duplicate entries that point at non-existent entities + AZStd::unordered_set duplicateIds; + for (auto it = m_childEntityOrderArray.begin(); it != m_childEntityOrderArray.end();) + { + if (!it->IsValid() || GetEntityById(*it) == nullptr || duplicateIds.contains(*it)) + { + it = m_childEntityOrderArray.erase(it); + shouldEmitDirtyState = true; + } + else + { + duplicateIds.insert(*it); + ++it; + } + } + + // Append any missing children + EntityIdList children; + AZ::TransformBus::EventResult(children, GetEntityId(), &AZ::TransformBus::Events::GetChildren); + for (auto it = m_childEntityOrderArray.begin(); it != m_childEntityOrderArray.end(); ++it) + { + if (auto removedChildrenIt = AZStd::remove(children.begin(), children.end(), *it); removedChildrenIt != children.end()) + { + children.erase(removedChildrenIt); + } + } + + AZStd::sort(children.begin(), children.end(), [](AZ::EntityId lhs, AZ::EntityId rhs) + { + return GetEntityById(lhs)->GetName() < GetEntityById(rhs)->GetName(); + }); + + if (!children.empty()) + { + shouldEmitDirtyState = true; + EntityOrderArray::iterator insertPosition = GetFirstSelectedEntityPosition(); + if (insertPosition != m_childEntityOrderArray.end()) + { + ++insertPosition; + } + m_childEntityOrderArray.insert(insertPosition, children.begin(), children.end()); + } + + // Clear out the vector to be rebuilt from persistent id + m_childEntityOrderEntryArray.resize(m_childEntityOrderArray.size()); + for (size_t i = 0; i < m_childEntityOrderArray.size(); ++i) + { + m_childEntityOrderEntryArray[i] = { + m_childEntityOrderArray[i], + static_cast(i) + }; + } + + RebuildEntityOrderCache(); + + if (shouldEmitDirtyState) + { + ToolsApplicationRequests::Bus::Broadcast(&ToolsApplicationRequests::Bus::Events::AddDirtyEntity, GetEntityId()); + } + + m_entityOrderIsDirty = false; + } + void EditorEntitySortComponent::PostLoad() { // Clear out the vector to be rebuilt from persistent id @@ -383,7 +459,7 @@ namespace AzToolsFramework firstSelectedEntityPos = selectedEntityPos < firstSelectedEntityPos ? selectedEntityPos : firstSelectedEntityPos; } - return firstSelectedEntityPos == m_childEntityOrderArray.end() ? m_childEntityOrderArray.begin() : firstSelectedEntityPos; + return firstSelectedEntityPos; } } } // namespace AzToolsFramework diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntitySortComponent.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntitySortComponent.h index 806e903c96..a4715fb041 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntitySortComponent.h +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntitySortComponent.h @@ -23,6 +23,8 @@ namespace AzToolsFramework , public EditorEntityContextNotificationBus::Handler , public AzToolsFramework::Prefab::PrefabPublicNotificationBus::Handler { + friend class JsonEditorEntitySortComponentSerializer; + public: AZ_COMPONENT(EditorEntitySortComponent, "{6EA1E03D-68B2-466D-97F7-83998C8C27F0}", EditorComponentBase); @@ -64,6 +66,8 @@ namespace AzToolsFramework void PrepareSave(); void PostLoad(); + void SanitizeOrderEntryArray(); + class EntitySortSerializationEvents : public AZ::SerializeContext::IEventHandler { @@ -112,6 +116,7 @@ namespace AzToolsFramework bool m_entityOrderIsDirty = true; ///< This flag indicates our stored serialization order data is out of date and must be rebuilt before serialization occurs bool m_ignoreIncomingOrderChanges = false; ///< This is set when prefab propagation occurs so that non-authored order changes can be ignored + bool m_shouldSanityCheckStateAfterPropagation = false; //< This is set after activation, to queue a cleanup of any invalid state after the next prefab propagation. }; } } // namespace AzToolsFramework diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntitySortComponentSerializer.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntitySortComponentSerializer.cpp new file mode 100644 index 0000000000..0ec13cedda --- /dev/null +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntitySortComponentSerializer.cpp @@ -0,0 +1,137 @@ +/* + * 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 +#include +#include +#include + +namespace AzToolsFramework::Components +{ + AZ_CLASS_ALLOCATOR_IMPL(JsonEditorEntitySortComponentSerializer, AZ::SystemAllocator, 0); + + AZ::JsonSerializationResult::Result JsonEditorEntitySortComponentSerializer::Load( + void* outputValue, + [[maybe_unused]] const AZ::Uuid& outputValueTypeId, + const rapidjson::Value& inputValue, + AZ::JsonDeserializerContext& context) + { + namespace JSR = AZ::JsonSerializationResult; + + AZ_Assert( + azrtti_typeid() == outputValueTypeId, + "Unable to deserialize EditorEntitySortComponent from json because the provided type is %s.", + outputValueTypeId.ToString().c_str()); + + EditorEntitySortComponent* sortComponentInstance = reinterpret_cast(outputValue); + AZ_Assert(sortComponentInstance, "Output value for JsonEditorEntitySortComponentSerializer can't be null."); + + JSR::ResultCode result(JSR::Tasks::ReadField); + { + JSR::ResultCode componentIdLoadResult = ContinueLoadingFromJsonObjectField( + &sortComponentInstance->m_id, azrtti_typeidm_id)>(), inputValue, + "Id", context); + + result.Combine(componentIdLoadResult); + } + + { + sortComponentInstance->m_childEntityOrderArray.clear(); + JSR::ResultCode enryLoadResult = ContinueLoadingFromJsonObjectField( + &sortComponentInstance->m_childEntityOrderArray, + azrtti_typeidm_childEntityOrderArray)>(), inputValue, "Child Entity Order", + context); + + // Migrate ChildEntityOrderEntryArray -> ChildEntityOrderArray + if (sortComponentInstance->m_childEntityOrderArray.empty()) + { + enryLoadResult = ContinueLoadingFromJsonObjectField( + &sortComponentInstance->m_childEntityOrderEntryArray, + azrtti_typeidm_childEntityOrderEntryArray)>(), inputValue, + "ChildEntityOrderEntryArray", context); + + AZStd::sort( + sortComponentInstance->m_childEntityOrderEntryArray.begin(), + sortComponentInstance->m_childEntityOrderEntryArray.end(), + [](const EditorEntitySortComponent::EntityOrderEntry& lhs, + const EditorEntitySortComponent::EntityOrderEntry& rhs) -> bool + { + return lhs.m_sortIndex < rhs.m_sortIndex; + }); + + // Sort by index and copy to the order array, any duplicates or invalid entries will be cleaned up by the sanitization pass + sortComponentInstance->m_childEntityOrderArray.resize(sortComponentInstance->m_childEntityOrderEntryArray.size()); + for (size_t i = 0; i < sortComponentInstance->m_childEntityOrderEntryArray.size(); ++i) + { + sortComponentInstance->m_childEntityOrderArray[i] = sortComponentInstance->m_childEntityOrderEntryArray[i].m_entityId; + } + } + + sortComponentInstance->RebuildEntityOrderCache(); + + result.Combine(enryLoadResult); + } + + return context.Report( + result, + result.GetProcessing() != JSR::Processing::Halted ? "Successfully loaded EditorEntitySortComponent information." + : "Failed to load EditorEntitySortComponent information."); + } + + AZ::JsonSerializationResult::Result JsonEditorEntitySortComponentSerializer::Store( + rapidjson::Value& outputValue, + const void* inputValue, + const void* defaultValue, + [[maybe_unused]] const AZ::Uuid& valueTypeId, + AZ::JsonSerializerContext& context) + { + namespace JSR = AZ::JsonSerializationResult; + + AZ_Assert( + azrtti_typeid() == valueTypeId, + "Unable to Serialize EditorEntitySortComponent because the provided type is %s.", + valueTypeId.ToString().c_str()); + + const EditorEntitySortComponent* sortComponentInstance = reinterpret_cast(inputValue); + AZ_Assert(sortComponentInstance, "Input value for JsonEditorEntitySortComponentSerializer can't be null."); + const EditorEntitySortComponent* defaultsortComponentInstance = + reinterpret_cast(defaultValue); + + JSR::ResultCode result(JSR::Tasks::WriteValue); + { + AZ::ScopedContextPath subPathName(context, "m_id"); + const AZ::ComponentId* componentId = &sortComponentInstance->m_id; + const AZ::ComponentId* defaultComponentId = + defaultsortComponentInstance ? &defaultsortComponentInstance->m_id : nullptr; + + JSR::ResultCode resultComponentId = ContinueStoringToJsonObjectField( + outputValue, "Id", componentId, defaultComponentId, azrtti_typeidm_id)>(), + context); + + result.Combine(resultComponentId); + } + + { + AZ::ScopedContextPath subPathName(context, "m_childEntityOrderArray"); + const EntityOrderArray* childEntityOrderArray = &sortComponentInstance->m_childEntityOrderArray; + const EntityOrderArray* defaultChildEntityOrderArray = + defaultsortComponentInstance ? &defaultsortComponentInstance->m_childEntityOrderArray : nullptr; + + JSR::ResultCode resultParentEntityId = ContinueStoringToJsonObjectField( + outputValue, "Child Entity Order", childEntityOrderArray, defaultChildEntityOrderArray, + azrtti_typeidm_childEntityOrderArray)>(), context); + + result.Combine(resultParentEntityId); + } + + return context.Report( + result, + result.GetProcessing() != JSR::Processing::Halted ? "Successfully stored EditorEntitySortComponent information." + : "Failed to store EditorEntitySortComponent information."); + } +} // namespace AzToolsFramework::Components diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntitySortComponentSerializer.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntitySortComponentSerializer.h new file mode 100644 index 0000000000..29d1f9c14a --- /dev/null +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntitySortComponentSerializer.h @@ -0,0 +1,31 @@ +/* + * 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 +#include + +namespace AzToolsFramework::Components +{ + class JsonEditorEntitySortComponentSerializer + : public AZ::BaseJsonSerializer + { + public: + AZ_RTTI(JsonEditorEntitySortComponentSerializer, "{5104782E-B34F-4D87-B1DF-BDFB1AF20D58}", BaseJsonSerializer); + AZ_CLASS_ALLOCATOR_DECL; + + AZ::JsonSerializationResult::Result Load( + void* outputValue, const AZ::Uuid& outputValueTypeId, const rapidjson::Value& inputValue, + AZ::JsonDeserializerContext& context) override; + + AZ::JsonSerializationResult::Result Store( + rapidjson::Value& outputValue, const void* inputValue, const void* defaultValue, const AZ::Uuid& valueTypeId, + AZ::JsonSerializerContext& context) override; + }; +} // namespace AzToolsFramework::Components diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Instance/InstanceUpdateExecutor.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Instance/InstanceUpdateExecutor.cpp index 9ef74167a6..6fe3e9e92b 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Instance/InstanceUpdateExecutor.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Instance/InstanceUpdateExecutor.cpp @@ -20,6 +20,7 @@ #include #include #include +#include namespace AzToolsFramework { @@ -244,10 +245,10 @@ namespace AzToolsFramework selectedEntityIds.erase(entityIdIterator--); } } - ToolsApplicationRequestBus::Broadcast(&ToolsApplicationRequests::SetSelectedEntities, selectedEntityIds); - // Notify Propagation has ended + // Notify Propagation has ended, then update selection (which is frozen during propagation, so this order matters) PrefabPublicNotificationBus::Broadcast(&PrefabPublicNotifications::OnPrefabInstancePropagationEnd); + ToolsApplicationRequestBus::Broadcast(&ToolsApplicationRequests::SetSelectedEntities, selectedEntityIds); } m_updatingTemplateInstancesInQueue = false; diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabDomUtils.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabDomUtils.h index 7cab24ad9f..89d1a046e5 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabDomUtils.h +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabDomUtils.h @@ -28,6 +28,9 @@ namespace AzToolsFramework inline static const char* EntityIdName = "Id"; inline static const char* EntitiesName = "Entities"; inline static const char* ContainerEntityName = "ContainerEntity"; + inline static const char* ComponentsName = "Components"; + inline static const char* EntityOrderName = "Child Entity Order"; + inline static const char* TypeName = "$type"; /** * Find Prefab value from given parent value and target value's name. diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabPublicHandler.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabPublicHandler.cpp index 32600853fd..26cc16f34b 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabPublicHandler.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabPublicHandler.cpp @@ -9,6 +9,7 @@ #include #include #include +#include #include #include @@ -29,6 +30,7 @@ #include #include #include +#include #include @@ -595,8 +597,41 @@ namespace AzToolsFramework Instance& entityOwningInstance = owningInstanceOfParentEntity->get(); + // Get the template for our owning instance from the root prefab DOM and use that to generate our patch + AZStd::vector pathOfInstances; + + InstanceOptionalReference rootInstance = owningInstanceOfParentEntity; + while (rootInstance->get().GetParentInstance() != AZStd::nullopt) + { + pathOfInstances.emplace_back(rootInstance); + rootInstance = rootInstance->get().GetParentInstance(); + } + + AZStd::string aliasPathResult = ""; + for (auto instanceIter = pathOfInstances.rbegin(); instanceIter != pathOfInstances.rend(); ++instanceIter) + { + aliasPathResult.append("/Instances/"); + aliasPathResult.append((*instanceIter)->get().GetInstanceAlias()); + } + + PrefabDomPath rootPrefabDomPath(aliasPathResult.c_str()); + + PrefabDom& rootPrefabTemplateDom = m_prefabSystemComponentInterface->FindTemplateDom(rootInstance->get().GetTemplateId()); + + auto instanceDomFromRootValue = rootPrefabDomPath.Get(rootPrefabTemplateDom); + if (!instanceDomFromRootValue) + { + return AZ::Failure("Could not load Instance DOM from the top level ancestor's DOM."); + } + + PrefabDomValueReference instanceDomFromRoot = *instanceDomFromRootValue; + if (!instanceDomFromRoot.has_value()) + { + return AZ::Failure("Could not load Instance DOM from the top level ancestor's DOM."); + } + PrefabDom instanceDomBeforeUpdate; - m_instanceToTemplateInterface->GenerateDomForInstance(instanceDomBeforeUpdate, entityOwningInstance); + instanceDomBeforeUpdate.CopyFrom(instanceDomFromRoot.value().get(), instanceDomBeforeUpdate.GetAllocator()); ScopedUndoBatch undoBatch("Add Entity"); @@ -674,6 +709,9 @@ namespace AzToolsFramework bool isInstanceContainerEntity = IsInstanceContainerEntity(entityId) && !IsLevelInstanceContainerEntity(entityId); bool isNewParentOwnedByDifferentInstance = false; + bool isInFocusTree = m_prefabFocusPublicInterface->IsOwningPrefabInFocusHierarchy(entityId); + bool isOwnedByFocusedPrefabInstance = m_prefabFocusPublicInterface->IsOwningPrefabBeingFocused(entityId); + if (beforeParentId != afterParentId) { // If the entity parent changed, verify if the owning instance changed too @@ -727,7 +765,7 @@ namespace AzToolsFramework } } - if (isInstanceContainerEntity) + if (isInFocusTree && !isOwnedByFocusedPrefabInstance) { if (isNewParentOwnedByDifferentInstance) { @@ -1653,6 +1691,144 @@ namespace AzToolsFramework return true; } + void PrefabPublicHandler::AddNewEntityToSortOrder( + Instance& owningInstance, + PrefabDom& domToAddEntityUnder, + const EntityAlias& parentEntityAlias, + const EntityAlias& entityToAddAlias) + { + // Find the parent entity to get its sort order component + auto findParentEntity = [&]() -> rapidjson::Value* + { + if (auto containerEntityIter = domToAddEntityUnder.FindMember(PrefabDomUtils::ContainerEntityName); + containerEntityIter != domToAddEntityUnder.MemberEnd()) + { + if (parentEntityAlias == containerEntityIter->value[PrefabDomUtils::EntityIdName].GetString()) + { + return &containerEntityIter->value; + } + } + + if (auto entitiesIter = domToAddEntityUnder.FindMember(PrefabDomUtils::EntitiesName); + entitiesIter != domToAddEntityUnder.MemberEnd()) + { + for (auto entityIter = entitiesIter->value.MemberBegin(); entityIter != entitiesIter->value.MemberEnd(); ++entityIter) + { + if (parentEntityAlias == entityIter->value[PrefabDomUtils::EntityIdName].GetString()) + { + return &entityIter->value; + } + } + } + + return nullptr; + }; + + rapidjson::Value* parentEntityValue = findParentEntity(); + if (parentEntityValue == nullptr) + { + return; + } + + // Get the list of selected entities, we'll insert our duplicated entities after the last selected + // sibling in their parent's list, e.g. for: + // - Entity1 + // - Entity2 (selected) + // - Entity3 + // - Entity4 (selected) + // - Entity5 + // Our duplicate selection command would create duplicate Entity2 and Entity4 and insert them after Entity4: + // - Entity1 + // - Entity2 + // - Entity3 + // - Entity4 + // - Entity2 (new, selected after duplicate) + // - Entity4 (new, selected after duplicate) + // - Entity5 + AzToolsFramework::EntityIdList selectedEntities; + AzToolsFramework::ToolsApplicationRequestBus::BroadcastResult( + selectedEntities, &AzToolsFramework::ToolsApplicationRequests::GetSelectedEntities); + + // Find the EditorEntitySortComponent DOM + auto componentsIter = parentEntityValue->FindMember(PrefabDomUtils::ComponentsName); + if (componentsIter == parentEntityValue->MemberEnd()) + { + return; + } + + for (auto componentIter = componentsIter->value.MemberBegin(); componentIter != componentIter->value.MemberEnd(); + ++componentIter) + { + // Check the component type + auto typeFieldIter = componentIter->value.FindMember(PrefabDomUtils::TypeName); + if (typeFieldIter == componentIter->value.MemberEnd()) + { + continue; + } + + AZ::JsonDeserializerSettings jsonDeserializerSettings; + AZ::Uuid typeId = AZ::Uuid::CreateNull(); + AZ::JsonSerialization::LoadTypeId(typeId, typeFieldIter->value); + + if (typeId != azrtti_typeid()) + { + continue; + } + + // Check for the entity order field + auto orderMembersIter = componentIter->value.FindMember(PrefabDomUtils::EntityOrderName); + if (orderMembersIter == componentIter->value.MemberEnd() || !orderMembersIter->value.IsArray()) + { + continue; + } + + // Scan for the last selected entity in the list (if any) to determine where to add our entries + rapidjson::Value newOrder(rapidjson::kArrayType); + auto insertValuesAfter = orderMembersIter->value.End(); + for (auto orderMemberIter = orderMembersIter->value.Begin(); orderMemberIter != orderMembersIter->value.End(); + ++orderMemberIter) + { + if (!orderMemberIter->IsString()) + { + continue; + } + const char* value = orderMemberIter->GetString(); + for (AZ::EntityId selectedEntity : selectedEntities) + { + auto alias = owningInstance.GetEntityAlias(selectedEntity); + if (alias.has_value() && alias.value().get() == value) + { + insertValuesAfter = orderMemberIter; + break; + } + } + } + + // Construct our new array with the new order - insertion may happen at end, so check for that in the loop itself + for (auto orderMemberIter = orderMembersIter->value.Begin();; ++orderMemberIter) + { + if (orderMemberIter != orderMembersIter->value.End()) + { + newOrder.PushBack(orderMemberIter->Move(), domToAddEntityUnder.GetAllocator()); + } + if (orderMemberIter == insertValuesAfter) + { + newOrder.PushBack( + rapidjson::Value(entityToAddAlias.c_str(), domToAddEntityUnder.GetAllocator()), + domToAddEntityUnder.GetAllocator()); + } + if (orderMemberIter == orderMembersIter->value.End()) + { + break; + } + } + + // Replace the order with our newly constructed one + orderMembersIter->value.Swap(newOrder); + break; + } + } + void PrefabPublicHandler::DuplicateNestedEntitiesInInstance(Instance& commonOwningInstance, const AZStd::vector& entities, PrefabDom& domToAddDuplicatedEntitiesUnder, EntityIdList& duplicatedEntityIds, AZStd::unordered_map& oldAliasToNewAliasMap) @@ -1710,6 +1886,73 @@ namespace AzToolsFramework PrefabDom entityDomAfter(&domToAddDuplicatedEntitiesUnder.GetAllocator()); entityDomAfter.Parse(newEntityDomString.toUtf8().constData()); + EntityAlias parentEntityAlias; + if (auto componentsIter = entityDomAfter.FindMember(PrefabDomUtils::ComponentsName); + componentsIter != entityDomAfter.MemberEnd()) + { + auto checkComponent = [&](const rapidjson::Value& value) -> bool + { + if (!value.IsObject()) + { + return false; + } + + // Check the component type + auto typeFieldIter = value.FindMember(PrefabDomUtils::TypeName); + if (typeFieldIter == value.MemberEnd()) + { + return false; + } + + AZ::JsonDeserializerSettings jsonDeserializerSettings; + AZ::Uuid typeId = AZ::Uuid::CreateNull(); + AZ::JsonSerialization::LoadTypeId(typeId, typeFieldIter->value); + + // Prefabs get serialized with the Editor transform component type, check for that + if (typeId != azrtti_typeid()) + { + return false; + } + + if (auto parentEntityIter = value.FindMember("Parent Entity"); + parentEntityIter != value.MemberEnd()) + { + parentEntityAlias = parentEntityIter->value.GetString(); + return true; + } + return false; + }; + + if (componentsIter->value.IsObject()) + { + for (auto componentIter = componentsIter->value.MemberBegin(); componentIter != componentsIter->value.MemberEnd(); + ++componentIter) + { + if (checkComponent(componentIter->value)) + { + break; + } + } + } + else if (componentsIter->value.IsArray()) + { + for (auto componentIter = componentsIter->value.Begin(); componentIter != componentsIter->value.End(); + ++componentIter) + { + if (checkComponent(*componentIter)) + { + break; + } + } + } + } + + // Insert our entity into its parent's sort order + if (!parentEntityAlias.empty()) + { + AddNewEntityToSortOrder(commonOwningInstance, domToAddDuplicatedEntitiesUnder, parentEntityAlias, newEntityAlias); + } + // Add the new Entity DOM to the Entities member of the instance rapidjson::Value aliasName(newEntityAlias.c_str(), static_cast(newEntityAlias.length()), domToAddDuplicatedEntitiesUnder.GetAllocator()); entitiesIter->value.AddMember(AZStd::move(aliasName), entityDomAfter, domToAddDuplicatedEntitiesUnder.GetAllocator()); diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabPublicHandler.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabPublicHandler.h index 4961be9d77..dd071ac09f 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabPublicHandler.h +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabPublicHandler.h @@ -78,6 +78,8 @@ namespace AzToolsFramework InstanceOptionalReference GetOwnerInstanceByEntityId(AZ::EntityId entityId) const; bool EntitiesBelongToSameInstance(const EntityIdList& entityIds) const; + void AddNewEntityToSortOrder(Instance& owningInstance, PrefabDom& domToAddEntityUnder, + const EntityAlias& parentEntityAlias, const EntityAlias& entityToAddAlias); /** * Duplicate a list of entities owned by a common owning instance by directly diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/EntityPropertyEditor.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/EntityPropertyEditor.cpp index 9ecbdf5ffc..fa419d5f14 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/EntityPropertyEditor.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/EntityPropertyEditor.cpp @@ -1599,7 +1599,6 @@ namespace AzToolsFramework for (size_t entityIndex = 1; entityIndex < m_selectedEntityIds.size(); ++entityIndex) { entity = GetSelectedEntityById(m_selectedEntityIds[entityIndex]); - AZ_Assert(entity, "Entity id selected for display but no such entity exists"); if (!entity) { continue; diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/aztoolsframework_files.cmake b/Code/Framework/AzToolsFramework/AzToolsFramework/aztoolsframework_files.cmake index d61d6486a9..9a891498de 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/aztoolsframework_files.cmake +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/aztoolsframework_files.cmake @@ -148,6 +148,8 @@ set(FILES Entity/EditorEntitySortBus.h Entity/EditorEntitySortComponent.cpp Entity/EditorEntitySortComponent.h + Entity/EditorEntitySortComponentSerializer.cpp + Entity/EditorEntitySortComponentSerializer.h Entity/EditorEntityTransformBus.h Entity/PrefabEditorEntityOwnershipInterface.h Entity/PrefabEditorEntityOwnershipService.h From edea1e560b101bc9d26207b4b821357b83782e6d Mon Sep 17 00:00:00 2001 From: puvvadar Date: Fri, 19 Nov 2021 10:07:01 -0800 Subject: [PATCH 161/345] Remove build debugging Signed-off-by: puvvadar --- Tools/LyTestTools/ly_test_tools/o3de/asset_processor.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/Tools/LyTestTools/ly_test_tools/o3de/asset_processor.py b/Tools/LyTestTools/ly_test_tools/o3de/asset_processor.py index 3953de0b25..65319e05de 100644 --- a/Tools/LyTestTools/ly_test_tools/o3de/asset_processor.py +++ b/Tools/LyTestTools/ly_test_tools/o3de/asset_processor.py @@ -188,8 +188,6 @@ class AssetProcessor(object): log = APLogParser(self._workspace.paths.ap_gui_log()) if len(log.runs): try: - for key in log.runs[-1]: - logger.debug(f"Log contained key {key} with value {log.runs[-1][key]}") port = log.runs[-1][port_type] logger.debug(f"Read port type {port_type} : {port}") return True From 8705b57f71756557f63957d0d095011f2c347a1b Mon Sep 17 00:00:00 2001 From: Ken Pruiksma Date: Fri, 19 Nov 2021 12:08:35 -0600 Subject: [PATCH 162/345] Adding unit tests for IndexedDataVector (#5724) * Rename IndexedDataVectorTests -> MultiIndexedDataVectorTests Signed-off-by: Ken Pruiksma * Adding unit tests for IndexedDataVector. Updated fixture for MultiIndexedDataVector. Signed-off-by: Ken Pruiksma * Fixed a bug in the test. Updated IndexedDataVector with more/better comments and removed a non-const function that wasn't necessary. Signed-off-by: Ken Pruiksma * Further updates to some comments Signed-off-by: Ken Pruiksma --- .../Atom/Feature/Utils/IndexedDataVector.h | 29 +- .../Atom/Feature/Utils/IndexedDataVector.inl | 8 +- .../Feature/Utils/MultiIndexedDataVector.h | 2 +- .../Code/Tests/IndexedDataVectorTests.cpp | 428 +++++++----------- .../Tests/MultiIndexedDataVectorTests.cpp | 320 +++++++++++++ .../atom_feature_common_tests_files.cmake | 1 + 6 files changed, 501 insertions(+), 287 deletions(-) create mode 100644 Gems/Atom/Feature/Common/Code/Tests/MultiIndexedDataVectorTests.cpp diff --git a/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/Utils/IndexedDataVector.h b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/Utils/IndexedDataVector.h index 82cc1e7d50..b2d483e48c 100644 --- a/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/Utils/IndexedDataVector.h +++ b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/Utils/IndexedDataVector.h @@ -27,31 +27,50 @@ namespace AZ::Render static constexpr IndexType NoFreeSlot = std::numeric_limits::max(); IndexType m_firstFreeSlot = NoFreeSlot; + //! Clears all data and resets to initial state. void Clear(); + + //! Creates a new entry, default-constructs it, and returns an index that references it. IndexType GetFreeSlotIndex(); + + //! Destroys the data referenced by index and frees that index for future use. void RemoveIndex(IndexType index); + + //! Destroys the data and related index by using a pointer to the data itself. void RemoveData(DataType* data); + //! Returns a reference to the data using the provided index. DataType& GetData(IndexType index); const DataType& GetData(IndexType index) const; + + //! Returns a count of how many items are stored in the IndexedDataVector size_t GetDataCount() const; + //! Returns a reference to the internal data vector. + //! This vector should not be altered by calling code or the IndexedDataVector will be corrupted AZStd::vector& GetDataVector(); const AZStd::vector& GetDataVector() const; + + //! Returns a reference to the internal vector. + const AZStd::vector& GetDataToIndexVector() const; - AZStd::vector& GetIndexVector(); - const AZStd::vector& GetIndexVector() const; - + //! Returns the offset into the internal data vector for a given index. IndexType GetRawIndex(IndexType index) const; + + //! Returns the logical index for data given its pointer, which could passed to + //! GetData() to retrieve the data again. IndexType GetIndexForData(const DataType* data) const; private: constexpr static size_t InitialReservedSize = 128; - // Stores data indices and an embedded free list + // Indices to data and an embedded free list in the unused entries AZStd::vector m_indices; - // Stores the indirection index + + // Map of the physical index in m_data to the logical index for that data in m_indices. AZStd::vector m_dataToIndices; + + // The actual data. AZStd::vector m_data; }; } // namespace AZ::Render diff --git a/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/Utils/IndexedDataVector.inl b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/Utils/IndexedDataVector.inl index 581186dbcc..03c3564ce9 100644 --- a/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/Utils/IndexedDataVector.inl +++ b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/Utils/IndexedDataVector.inl @@ -125,13 +125,7 @@ namespace AZ::Render } template - inline AZStd::vector& IndexedDataVector::GetIndexVector() - { - return m_dataToIndices; - } - - template - inline const AZStd::vector& IndexedDataVector::GetIndexVector() const + inline const AZStd::vector& IndexedDataVector::GetDataToIndexVector() const { return m_dataToIndices; } diff --git a/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/Utils/MultiIndexedDataVector.h b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/Utils/MultiIndexedDataVector.h index e815d85cf3..c0f11dd159 100644 --- a/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/Utils/MultiIndexedDataVector.h +++ b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/Utils/MultiIndexedDataVector.h @@ -17,7 +17,7 @@ namespace AZ { //! MultiIndexedDataVector is similar to IndexedDataVector but adds support for multiple different data vectors each containing different types //! i.e. structure of (N) arrays - //! See IndexedDataVectorTests.cpp for examples of use + //! See MultiIndexedDataVectorTests.cpp for examples of use template class MultiIndexedDataVector { diff --git a/Gems/Atom/Feature/Common/Code/Tests/IndexedDataVectorTests.cpp b/Gems/Atom/Feature/Common/Code/Tests/IndexedDataVectorTests.cpp index a9cb6e2621..88e67538c5 100644 --- a/Gems/Atom/Feature/Common/Code/Tests/IndexedDataVectorTests.cpp +++ b/Gems/Atom/Feature/Common/Code/Tests/IndexedDataVectorTests.cpp @@ -8,338 +8,218 @@ #include #include -#include +#include #include #include - namespace UnitTest { using namespace AZ; using namespace AZ::Render; - + class IndexedDataVectorTests - : public ::testing::Test + : public UnitTest::AllocatorsTestFixture { public: void SetUp() override { - CreateAllocator(); + UnitTest::AllocatorsTestFixture::SetUp(); } void TearDown() override { - DestroyAllocator(); + UnitTest::AllocatorsTestFixture::TearDown(); } - - private: - void CreateAllocator() + template + IndexedDataVector SetupIndexedDataVector(size_t size, T initialValue = T(0), T incrementAmount = T(1), AZStd::vector* indices = nullptr) { - static constexpr size_t NumMBToAllocate = 1; - SystemAllocator::Descriptor desc; - desc.m_heap.m_numFixedMemoryBlocks = 1; - desc.m_heap.m_fixedMemoryBlocksByteSize[0] = NumMBToAllocate * 1024 * 1024; - m_memBlock = AZ_OS_MALLOC( - desc.m_heap.m_fixedMemoryBlocksByteSize[0], - desc.m_heap.m_memoryBlockAlignment); - desc.m_heap.m_fixedMemoryBlocks[0] = m_memBlock; - - AllocatorInstance::Create(desc); + IndexedDataVector data; + T value = initialValue; + for (size_t i = 0; i < size; ++i) + { + uint16_t index = data.GetFreeSlotIndex(); + EXPECT_NE(index, IndexedDataVector::NoFreeSlot); + if (indices) + { + indices->push_back(index); + } + if (index != IndexedDataVector::NoFreeSlot) + { + data.GetData(index) = value; + value += incrementAmount; + } + } + return data; } - void DestroyAllocator() + template + void ShuffleIndexedDataVector(IndexedDataVector& dataVector, AZStd::vector& indices) { - AllocatorInstance::Destroy(); - AZ_OS_FREE(m_memBlock); - m_memBlock = nullptr; + AZStd::vector values; + + // remove every other element and store it + for (size_t i = 0; i < indices.size(); ++i) + { + values.push_back(dataVector.GetData(indices.at(i))); + dataVector.RemoveIndex(indices.at(i)); + indices.erase(&indices.at(i)); + } + + for (T value : values) + { + uint16_t index = dataVector.GetFreeSlotIndex(); + indices.push_back(index); + dataVector.GetData(index) = value; + } } - void* m_memBlock = nullptr; }; - - TEST_F(IndexedDataVectorTests, TestInsert) + + TEST_F(IndexedDataVectorTests, Construction) { - enum Types - { - IntType = 0, - DoubleType = 1, - }; - - MultiIndexedDataVector myVec; - constexpr int NumToInsert = 5; + IndexedDataVector testVector; + uint16_t index = testVector.GetFreeSlotIndex(); + EXPECT_NE(index, IndexedDataVector::NoFreeSlot); + } + + TEST_F(IndexedDataVectorTests, TestInsertGetBasic) + { + constexpr size_t count = 16; + constexpr int initialValue = 0; + constexpr int increment = 1; AZStd::vector indices; - - for (int i = 0; i < NumToInsert; ++i) + IndexedDataVector testVector = SetupIndexedDataVector(count, initialValue, increment, &indices); + + int value = initialValue; + for (size_t i = 0; i < count; ++i) { - auto index = myVec.GetFreeSlotIndex(); - indices.push_back(index); - myVec.GetData(index) = i; - myVec.GetData(index) = (double)i; + EXPECT_EQ(testVector.GetData(indices.at(i)), value); + value += increment; + } + } + + TEST_F(IndexedDataVectorTests, TestInsertGetComplex) + { + constexpr size_t count = 16; + constexpr int initialValue = 0; + constexpr int increment = 1; + + AZStd::vector indices; + IndexedDataVector testVector = SetupIndexedDataVector(count, initialValue, increment, &indices); + + // Create a set of the data that should be in the IndexedDataVector + AZStd::set values; + for (int i = 0; i < count; ++i) + { + values.emplace(initialValue + i * increment); } - for (size_t i = 0; i < NumToInsert; ++i) + // Add and remove items to shuffle the underlying data + ShuffleIndexedDataVector(testVector, indices); + + // Check to make sure all the data is still there + AZStd::vector& underlyingVector = testVector.GetDataVector(); + for (size_t i = 0; i < underlyingVector.size(); ++i) { - auto index = indices[i]; - EXPECT_EQ(i, myVec.GetData(index)); - EXPECT_EQ((double)i, myVec.GetData(index)); + EXPECT_TRUE(values.contains(underlyingVector.at(i))); } } TEST_F(IndexedDataVectorTests, TestSize) { - enum Types - { - IntType = 0, - }; + constexpr size_t count = 32; - MultiIndexedDataVector myVec; - constexpr int NumToInsert = 5; - for (int i = 0; i < NumToInsert; ++i) - { - auto index = myVec.GetFreeSlotIndex(); - myVec.GetData(index) = i; - } - EXPECT_EQ(NumToInsert, myVec.GetDataCount()); - EXPECT_EQ(NumToInsert, myVec.GetDataVector().size()); - - myVec.Clear(); - - EXPECT_EQ(0, myVec.GetDataCount()); - EXPECT_EQ(0, myVec.GetDataVector().size()); + IndexedDataVector testVector = SetupIndexedDataVector(count); + EXPECT_EQ(testVector.GetDataCount(), count); } - TEST_F(IndexedDataVectorTests, TestErase) + TEST_F(IndexedDataVectorTests, TestClear) { - enum Types - { - IntType = 0, - }; - - MultiIndexedDataVector myVec; - constexpr int NumToInsert = 200; - AZStd::unordered_map valueToIndex; - - for (int i = 0; i < NumToInsert; ++i) - { - auto index = myVec.GetFreeSlotIndex(); - valueToIndex[i] = index; - myVec.GetData(index) = i; - } - - // erase every even number - for (int i = 0; i < NumToInsert; i += 2) - { - uint16_t index = valueToIndex[i]; - auto previousRawIndex = myVec.GetRawIndex(index); - auto movedIndex = myVec.RemoveIndex(index); - if (movedIndex != MultiIndexedDataVector::NoFreeSlot) - { - auto newRawIndex = myVec.GetRawIndex(movedIndex); - - // RemoveIndex() returns the index of the item that moves into its spot if any, so check - // to make sure the Raw index of the old matches the raw index of the new - EXPECT_EQ(previousRawIndex, newRawIndex); - } - valueToIndex.erase(i); - } - - for (const auto& iter : valueToIndex) - { - int val = iter.first; - uint16_t index = iter.second; - EXPECT_EQ(val, myVec.GetData(index)); - } + constexpr size_t count = 32; + IndexedDataVector testVector = SetupIndexedDataVector(count); + testVector.Clear(); + EXPECT_EQ(testVector.GetDataCount(), 0); } - TEST_F(IndexedDataVectorTests, TestManyTypes) + TEST_F(IndexedDataVectorTests, TestRemove) { - enum Types + constexpr size_t count = 8; + constexpr int initialValue = 0; + constexpr int increment = 8; + + AZStd::vector indices; + IndexedDataVector testVector = SetupIndexedDataVector(count, initialValue, increment, &indices); + + // Remove every other element by index + for (uint16_t i = 0; i < count; i += 2) { - IntType = 0, - StringType = 1, - DoubleType = 2, - FloatType = 3, - CharType = 4, - }; - - MultiIndexedDataVector myVec; - auto index = myVec.GetFreeSlotIndex(); - - constexpr int TestIntVal = INT_MIN; - constexpr double TestDoubleVal = -DBL_MIN; - const AZStd::string TestStringVal = "This is an AZStd::string."; - constexpr float TestFloatVal = FLT_MAX; - const char* TestConstPointerVal = "This is a C array."; - - myVec.GetData(index) = TestIntVal; - myVec.GetData(index) = TestStringVal; - myVec.GetData(index) = TestDoubleVal; - myVec.GetData(index) = TestFloatVal; - myVec.GetData(index) = TestConstPointerVal; - - EXPECT_EQ(TestIntVal, static_cast(myVec.GetData(index))); - EXPECT_EQ(TestStringVal, static_cast(myVec.GetData(index))); - EXPECT_EQ(TestDoubleVal, static_cast(myVec.GetData(index))); - EXPECT_EQ(TestFloatVal, static_cast(myVec.GetData(index))); - EXPECT_STREQ(TestConstPointerVal, static_cast(myVec.GetData(index))); - } - - MultiIndexedDataVector CreateTestVector(AZStd::vector& indices) - { - enum Types - { - IntType = 0, - FloatType = 1, - }; - - MultiIndexedDataVector myVec; - constexpr int32_t Count = 10; - int32_t startInt = 10; - float startFloat = 2.0f; + testVector.RemoveIndex(i); + } - // Create some initial values - for (uint32_t i = 0; i < Count; ++i) + EXPECT_EQ(testVector.GetDataCount(), count / 2); + + // Make sure the rest of the data is still there + AZStd::vector remainingIndices; + for (size_t i = 1; i < count; i += 2) { - uint16_t index = myVec.GetFreeSlotIndex(); - indices.push_back(index); - myVec.GetData(index) = startInt; - myVec.GetData(index) = startFloat; - startInt += 1; - startFloat += 1.0f; + int value = testVector.GetData(indices.at(i)); + EXPECT_EQ(value, initialValue + increment * i); + remainingIndices.push_back(indices.at(i)); } - return myVec; + // remove the rest of the valus by value + for (uint16_t index : remainingIndices) + { + int* valuePtr = &testVector.GetData(index); + testVector.RemoveData(valuePtr); + } + + EXPECT_EQ(testVector.GetDataCount(), 0); + } + + TEST_F(IndexedDataVectorTests, TestIndexForData) + { + constexpr size_t count = 8; + constexpr int initialValue = 0; + constexpr int increment = 8; + + AZStd::vector indices; + IndexedDataVector testVector = SetupIndexedDataVector(count, initialValue, increment, &indices); + + // Add and remove items to shuffle the underlying data + ShuffleIndexedDataVector(testVector, indices); + + AZStd::vector& underlyingVector = testVector.GetDataVector(); + for (size_t i = 0; i < underlyingVector.size(); ++i) + { + int value = underlyingVector.at(i); + uint16_t index = testVector.GetIndexForData(&underlyingVector.at(i)); + + // The data from GetData(index) should match for the index retrieved using GetIndexForData() for the same data. + EXPECT_EQ(testVector.GetData(index), value); + } } - void CheckIndexedData(MultiIndexedDataVector& data, AZStd::vector& indices) + TEST_F(IndexedDataVectorTests, TestRawIndex) { - enum Types - { - IntType = 0, - FloatType = 1, - }; - - // For each index, get its data and make sure GetIndexForData returns the same - // index used to retrieve the data - for (uint32_t i = 0; i < data.GetDataCount(); ++i) - { - int32_t& intData = data.GetData(indices.at(i)); - uint16_t indexForData = data.GetIndexForData(&intData); - EXPECT_EQ(indices.at(i), indexForData); - - float& floatData = data.GetData(indices.at(i)); - indexForData = data.GetIndexForData(&floatData); - EXPECT_EQ(indices.at(i), indexForData); - } - } - - TEST_F(IndexedDataVectorTests, GetIndexForDataSimple) - { - AZStd::vector indices; - MultiIndexedDataVector myVec = CreateTestVector(indices); - CheckIndexedData(myVec, indices); - } - - TEST_F(IndexedDataVectorTests, GetIndexForDataComplex) - { - enum Types - { - IntType = 0, - FloatType = 1, - }; + constexpr size_t count = 8; + constexpr int initialValue = 0; + constexpr int increment = 8; AZStd::vector indices; - MultiIndexedDataVector myVec = CreateTestVector(indices); + IndexedDataVector testVector = SetupIndexedDataVector(count, initialValue, increment, &indices); - // remove every other value to shuffle the data around - for (uint32_t i = 0; i < myVec.GetDataCount(); i += 2) - { - myVec.RemoveIndex(indices.at(i)); - } + // Add and remove items to shuffle the underlying data + ShuffleIndexedDataVector(testVector, indices); - int32_t startInt = 100; - float startFloat = 20.0f; - - // Add some data back in - const size_t count = myVec.GetDataCount(); - for (uint32_t i = 0; i < count; i += 2) + AZStd::vector& underlyingVector = testVector.GetDataVector(); + for (size_t i = 0; i < indices.size(); ++i) { - uint16_t index = myVec.GetFreeSlotIndex(); - indices.at(i) = index; - myVec.GetData(index) = startInt; - myVec.GetData(index) = startFloat; - startInt += 1; - startFloat += 1.0f; + // Check that the data retrieved from GetData for a given index matches the data in the underlying vector for the raw index. + EXPECT_EQ(testVector.GetData(indices.at(i)), underlyingVector.at(testVector.GetRawIndex(indices.at(i)))); } - CheckIndexedData(myVec, indices); - } - - TEST_F(IndexedDataVectorTests, ForEach) - { - enum Types - { - IntType = 0, - FloatType = 1, - }; - - MultiIndexedDataVector myVec; - constexpr int32_t Count = 10; - int32_t startInt = 10; - float startFloat = 2.0f; - - AZStd::vector indices; - AZStd::set intValues; - AZStd::set floatValues; - - // Create some initial values - for (uint32_t i = 0; i < Count; ++i) - { - uint16_t index = myVec.GetFreeSlotIndex(); - indices.push_back(index); - myVec.GetData(index) = startInt; - myVec.GetData(index) = startFloat; - intValues.insert(startInt); - floatValues.insert(startFloat); - startInt += 1; - startFloat += 1.0f; - } - - uint32_t visitCount = 0; - myVec.ForEach([&](int32_t value) -> bool - { - intValues.erase(value); - ++visitCount; - return true; // keep iterating - }); - - // All ints should have been visited and found in the set - EXPECT_EQ(visitCount, Count); - EXPECT_EQ(intValues.size(), 0); - - visitCount = 0; - myVec.ForEach([&](float value) -> bool - { - floatValues.erase(value); - ++visitCount; - return true; // keep iterating - }); - - // All floats should have been visited and found in the set - EXPECT_EQ(visitCount, Count); - EXPECT_EQ(floatValues.size(), 0); - - visitCount = 0; - myVec.ForEach([&]([[maybe_unused]] int32_t value) -> bool - { - ++visitCount; - return false; // stop iterating - }); - - // Since false is immediately returned, only one element should have been visited. - EXPECT_EQ(visitCount, 1); - } } diff --git a/Gems/Atom/Feature/Common/Code/Tests/MultiIndexedDataVectorTests.cpp b/Gems/Atom/Feature/Common/Code/Tests/MultiIndexedDataVectorTests.cpp new file mode 100644 index 0000000000..5a317c41aa --- /dev/null +++ b/Gems/Atom/Feature/Common/Code/Tests/MultiIndexedDataVectorTests.cpp @@ -0,0 +1,320 @@ +/* + * 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 +#include +#include +#include +#include + + +namespace UnitTest +{ + using namespace AZ; + using namespace AZ::Render; + + class MultiIndexedDataVectorTests + : public UnitTest::AllocatorsTestFixture + { + public: + void SetUp() override + { + UnitTest::AllocatorsTestFixture::SetUp(); + } + + void TearDown() override + { + UnitTest::AllocatorsTestFixture::TearDown(); + } + }; + + TEST_F(MultiIndexedDataVectorTests, TestInsert) + { + enum Types + { + IntType = 0, + DoubleType = 1, + }; + + MultiIndexedDataVector myVec; + constexpr int NumToInsert = 5; + + AZStd::vector indices; + + for (int i = 0; i < NumToInsert; ++i) + { + auto index = myVec.GetFreeSlotIndex(); + indices.push_back(index); + myVec.GetData(index) = i; + myVec.GetData(index) = (double)i; + } + + for (size_t i = 0; i < NumToInsert; ++i) + { + auto index = indices[i]; + EXPECT_EQ(i, myVec.GetData(index)); + EXPECT_EQ((double)i, myVec.GetData(index)); + } + } + + TEST_F(MultiIndexedDataVectorTests, TestSize) + { + enum Types + { + IntType = 0, + }; + + MultiIndexedDataVector myVec; + constexpr int NumToInsert = 5; + for (int i = 0; i < NumToInsert; ++i) + { + auto index = myVec.GetFreeSlotIndex(); + myVec.GetData(index) = i; + } + EXPECT_EQ(NumToInsert, myVec.GetDataCount()); + EXPECT_EQ(NumToInsert, myVec.GetDataVector().size()); + + myVec.Clear(); + + EXPECT_EQ(0, myVec.GetDataCount()); + EXPECT_EQ(0, myVec.GetDataVector().size()); + } + + TEST_F(MultiIndexedDataVectorTests, TestErase) + { + enum Types + { + IntType = 0, + }; + + MultiIndexedDataVector myVec; + constexpr int NumToInsert = 200; + AZStd::unordered_map valueToIndex; + + for (int i = 0; i < NumToInsert; ++i) + { + auto index = myVec.GetFreeSlotIndex(); + valueToIndex[i] = index; + myVec.GetData(index) = i; + } + + // erase every even number + for (int i = 0; i < NumToInsert; i += 2) + { + uint16_t index = valueToIndex[i]; + auto previousRawIndex = myVec.GetRawIndex(index); + auto movedIndex = myVec.RemoveIndex(index); + if (movedIndex != MultiIndexedDataVector::NoFreeSlot) + { + auto newRawIndex = myVec.GetRawIndex(movedIndex); + + // RemoveIndex() returns the index of the item that moves into its spot if any, so check + // to make sure the Raw index of the old matches the raw index of the new + EXPECT_EQ(previousRawIndex, newRawIndex); + } + valueToIndex.erase(i); + } + + for (const auto& iter : valueToIndex) + { + int val = iter.first; + uint16_t index = iter.second; + EXPECT_EQ(val, myVec.GetData(index)); + } + } + + TEST_F(MultiIndexedDataVectorTests, TestManyTypes) + { + enum Types + { + IntType = 0, + StringType = 1, + DoubleType = 2, + FloatType = 3, + CharType = 4, + }; + + MultiIndexedDataVector myVec; + auto index = myVec.GetFreeSlotIndex(); + + constexpr int TestIntVal = INT_MIN; + constexpr double TestDoubleVal = -DBL_MIN; + const AZStd::string TestStringVal = "This is an AZStd::string."; + constexpr float TestFloatVal = FLT_MAX; + const char* TestConstPointerVal = "This is a C array."; + + myVec.GetData(index) = TestIntVal; + myVec.GetData(index) = TestStringVal; + myVec.GetData(index) = TestDoubleVal; + myVec.GetData(index) = TestFloatVal; + myVec.GetData(index) = TestConstPointerVal; + + EXPECT_EQ(TestIntVal, static_cast(myVec.GetData(index))); + EXPECT_EQ(TestStringVal, static_cast(myVec.GetData(index))); + EXPECT_EQ(TestDoubleVal, static_cast(myVec.GetData(index))); + EXPECT_EQ(TestFloatVal, static_cast(myVec.GetData(index))); + EXPECT_STREQ(TestConstPointerVal, static_cast(myVec.GetData(index))); + } + + MultiIndexedDataVector CreateTestVector(AZStd::vector& indices) + { + enum Types + { + IntType = 0, + FloatType = 1, + }; + + MultiIndexedDataVector myVec; + constexpr int32_t Count = 10; + int32_t startInt = 10; + float startFloat = 2.0f; + + // Create some initial values + for (uint32_t i = 0; i < Count; ++i) + { + uint16_t index = myVec.GetFreeSlotIndex(); + indices.push_back(index); + myVec.GetData(index) = startInt; + myVec.GetData(index) = startFloat; + startInt += 1; + startFloat += 1.0f; + } + + return myVec; + } + + void CheckIndexedData(MultiIndexedDataVector& data, AZStd::vector& indices) + { + enum Types + { + IntType = 0, + FloatType = 1, + }; + + // For each index, get its data and make sure GetIndexForData returns the same + // index used to retrieve the data + for (uint32_t i = 0; i < data.GetDataCount(); ++i) + { + int32_t& intData = data.GetData(indices.at(i)); + uint16_t indexForData = data.GetIndexForData(&intData); + EXPECT_EQ(indices.at(i), indexForData); + + float& floatData = data.GetData(indices.at(i)); + indexForData = data.GetIndexForData(&floatData); + EXPECT_EQ(indices.at(i), indexForData); + } + } + + TEST_F(MultiIndexedDataVectorTests, GetIndexForDataSimple) + { + AZStd::vector indices; + MultiIndexedDataVector myVec = CreateTestVector(indices); + CheckIndexedData(myVec, indices); + } + + TEST_F(MultiIndexedDataVectorTests, GetIndexForDataComplex) + { + enum Types + { + IntType = 0, + FloatType = 1, + }; + + AZStd::vector indices; + MultiIndexedDataVector myVec = CreateTestVector(indices); + + // remove every other value to shuffle the data around + for (uint32_t i = 0; i < myVec.GetDataCount(); i += 2) + { + myVec.RemoveIndex(indices.at(i)); + } + + int32_t startInt = 100; + float startFloat = 20.0f; + + // Add some data back in + const size_t count = myVec.GetDataCount(); + for (uint32_t i = 0; i < count; i += 2) + { + uint16_t index = myVec.GetFreeSlotIndex(); + indices.at(i) = index; + myVec.GetData(index) = startInt; + myVec.GetData(index) = startFloat; + startInt += 1; + startFloat += 1.0f; + } + + CheckIndexedData(myVec, indices); + } + + TEST_F(MultiIndexedDataVectorTests, ForEach) + { + enum Types + { + IntType = 0, + FloatType = 1, + }; + + MultiIndexedDataVector myVec; + constexpr int32_t Count = 10; + int32_t startInt = 10; + float startFloat = 2.0f; + + AZStd::vector indices; + AZStd::set intValues; + AZStd::set floatValues; + + // Create some initial values + for (uint32_t i = 0; i < Count; ++i) + { + uint16_t index = myVec.GetFreeSlotIndex(); + indices.push_back(index); + myVec.GetData(index) = startInt; + myVec.GetData(index) = startFloat; + intValues.insert(startInt); + floatValues.insert(startFloat); + startInt += 1; + startFloat += 1.0f; + } + + uint32_t visitCount = 0; + myVec.ForEach([&](int32_t value) -> bool + { + intValues.erase(value); + ++visitCount; + return true; // keep iterating + }); + + // All ints should have been visited and found in the set + EXPECT_EQ(visitCount, Count); + EXPECT_EQ(intValues.size(), 0); + + visitCount = 0; + myVec.ForEach([&](float value) -> bool + { + floatValues.erase(value); + ++visitCount; + return true; // keep iterating + }); + + // All floats should have been visited and found in the set + EXPECT_EQ(visitCount, Count); + EXPECT_EQ(floatValues.size(), 0); + + visitCount = 0; + myVec.ForEach([&]([[maybe_unused]] int32_t value) -> bool + { + ++visitCount; + return false; // stop iterating + }); + + // Since false is immediately returned, only one element should have been visited. + EXPECT_EQ(visitCount, 1); + + } +} diff --git a/Gems/Atom/Feature/Common/Code/atom_feature_common_tests_files.cmake b/Gems/Atom/Feature/Common/Code/atom_feature_common_tests_files.cmake index 1d94a2ae9e..99f3cf8e1a 100644 --- a/Gems/Atom/Feature/Common/Code/atom_feature_common_tests_files.cmake +++ b/Gems/Atom/Feature/Common/Code/atom_feature_common_tests_files.cmake @@ -11,6 +11,7 @@ set(FILES Tests/CommonTest.cpp Tests/CoreLights/ShadowmapAtlasTest.cpp Tests/IndexedDataVectorTests.cpp + Tests/MultiIndexedDataVectorTests.cpp Tests/IndexableListTests.cpp Tests/SparseVectorTests.cpp Tests/SkinnedMesh/SkinnedMeshDispatchItemTests.cpp From 5af76000aa66fb82f7bcf85d08a0c8ffdc5da5d0 Mon Sep 17 00:00:00 2001 From: mcphedar Date: Fri, 19 Nov 2021 12:36:11 -0600 Subject: [PATCH 163/345] Updating the name of the AR bug template Signed-off-by: mcphedar --- .github/ISSUE_TEMPLATE/ar_bug_report.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/ISSUE_TEMPLATE/ar_bug_report.md b/.github/ISSUE_TEMPLATE/ar_bug_report.md index 0d4aee9397..00aa80964f 100644 --- a/.github/ISSUE_TEMPLATE/ar_bug_report.md +++ b/.github/ISSUE_TEMPLATE/ar_bug_report.md @@ -1,5 +1,5 @@ --- -name: ar_bug_report.md +name: Automated_Review_bug_template.md about: Create a bug for a an issue found in the Automated Review title: 'AR Bug Report' labels: 'needs-triage,kind/bug,kind/automation' From 4be1e68bad1b627668a4517b00526bba6cc7acea Mon Sep 17 00:00:00 2001 From: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com> Date: Fri, 19 Nov 2021 10:45:06 -0800 Subject: [PATCH 164/345] Fix oversight from recent change to PrefabFocusHandler internals. (#5794) * Fix oversight from recent change to PrefabFocusHandler internals. Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com> * Introduce check for null instance in case this is called before the Prefab Focus Handler is initialized. Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com> --- .../AzToolsFramework/Prefab/PrefabFocusHandler.cpp | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabFocusHandler.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabFocusHandler.cpp index 744c53ef5a..3d764554ef 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabFocusHandler.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabFocusHandler.cpp @@ -212,7 +212,17 @@ namespace AzToolsFramework::Prefab AZ::EntityId PrefabFocusHandler::GetFocusedPrefabContainerEntityId([[maybe_unused]] AzFramework::EntityContextId entityContextId) const { - return m_focusedInstanceContainerEntityId; + if (m_focusedInstanceContainerEntityId.IsValid()) + { + return m_focusedInstanceContainerEntityId; + } + + if (auto instance = GetReferenceFromContainerEntityId(m_focusedInstanceContainerEntityId); instance.has_value()) + { + return instance->get().GetContainerEntityId(); + } + + return AZ::EntityId(); } bool PrefabFocusHandler::IsOwningPrefabBeingFocused(AZ::EntityId entityId) const From c0080d6b1fb7bf79e1c5adef053fb392c7baa334 Mon Sep 17 00:00:00 2001 From: Shirang Jia Date: Fri, 19 Nov 2021 10:45:09 -0800 Subject: [PATCH 165/345] Archive ap logs on s3 (#5620) * Archive ap logs on s3 Signed-off-by: Shirang Jia * Update copy_file.py Signed-off-by: Shirang Jia * Fix syntax from bad copy Signed-off-by: Shirang Jia * Change underscore in argument name to dash Signed-off-by: Shirang Jia * Add a general ArchiveArtifactsOnS3 function so we can use it to archive any files on S3 Signed-off-by: Shirang Jia * Swap order of excludes and includes Signed-off-by: Shirang Jia * Change artifactsSourceDir to artifactsSource since the value can be either a file or a directory Signed-off-by: Shirang Jia * Fix parameter Signed-off-by: Shirang Jia --- scripts/build/Jenkins/Jenkinsfile | 51 ++++++++++++++------------- scripts/build/tools/copy_file.py | 57 +++++++++++++++++++++++++++++++ 2 files changed, 85 insertions(+), 23 deletions(-) create mode 100644 scripts/build/tools/copy_file.py diff --git a/scripts/build/Jenkins/Jenkinsfile b/scripts/build/Jenkins/Jenkinsfile index beb4a21620..3b5ca8fe60 100644 --- a/scripts/build/Jenkins/Jenkinsfile +++ b/scripts/build/Jenkins/Jenkinsfile @@ -102,10 +102,6 @@ def IsJobEnabled(branchName, buildTypeMap, pipelineName, platformName) { } } -def IsAPLogUpload(branchName, jobName) { - return !IsPullRequest(branchName) && jobName.toLowerCase().contains('asset') && env.AP_LOGS_S3_BUCKET -} - def GetRunningPipelineName(JENKINS_JOB_NAME) { // If the job name has an underscore def job_parts = JENKINS_JOB_NAME.tokenize('/')[0].tokenize('_') @@ -433,26 +429,35 @@ def ExportTestScreenshots(Map options, String branchName, String platformName, S } } -def UploadAPLogs(Map options, String branchName, String platformName, String jobName, String workspace, Map params) { +// All files are included by default. +// --include will only re-include files that have been excluded from an --exclude filter. +//See more details at https://docs.aws.amazon.com/cli/latest/reference/s3/#use-of-exclude-and-include-filters +def ArchiveArtifactsOnS3(String artifactsSource, String s3Prefix="", boolean recursive=false, List includes=[], List excludes=[]) { + if (!fileExists(s3Prefix)) { + palMkdir(s3Prefix) + } + palSh("echo ${env.BUILD_URL} > ${s3Prefix}/build_url.txt") + // archiveArtifacts is very slow, so we only archive one file and upload the rest artifacts to the same bucket using S3 CLI. + archiveArtifacts artifacts: "${s3Prefix}/build_url.txt" + def command = "aws s3 cp ${artifactsSource} s3://${env.JENKINS_ARTIFACTS_S3_BUCKET}/${env.JENKINS_JOB_NAME}/${env.BUILD_NUMBER}/artifacts/${s3Prefix} " + excludes.each{ exclude -> + command += "--exclude \"${exclude}\" " + } + includes.each{ include -> + command += "--include \"${include}\" " + } + if (recursive) command += "--recursive " + palSh(command, "Archiving artifacts to ${env.JENKINS_JOB_NAME}/${env.BUILD_NUMBER}/artifacts/${s3Prefix}", false) +} + +def UploadAPLogs(String platformName, String jobName, String workspace, Map params) { dir("${workspace}/${ENGINE_REPOSITORY_NAME}") { projects = params.CMAKE_LY_PROJECTS.split(",") projects.each{ project -> - def apLogsPath = "${project}/user/log" - def s3UploadScriptPath = "scripts/build/tools/upload_to_s3.py" - if(env.IS_UNIX) { - pythonPath = "${options.PYTHON_DIR}/python.sh" - } - else { - pythonPath = "${options.PYTHON_DIR}/python.cmd" - } - def command = "${pythonPath} -u ${s3UploadScriptPath} --base_dir ${apLogsPath} " + - "--file_regex \".*\" --bucket ${env.AP_LOGS_S3_BUCKET} " + - "--search_subdirectories True --key_prefix ${env.JENKINS_JOB_NAME}/${branchName}/${env.BUILD_NUMBER}/${platformName}/${jobName} " + - '--extra_args {\\"ACL\\":\\"bucket-owner-full-control\\"}' - palSh(command, "Uploading AP logs for job ${jobName} for branch ${branchName}", false) - } + ArchiveArtifactsOnS3("${project}/user/log", "ap_logs/${platformName}/${jobName}/${project}", true) } } +} def PostBuildCommonSteps(String workspace, boolean mount = true) { echo 'Starting post-build common steps...' @@ -517,10 +522,10 @@ def CreateExportTestScreenshotsStage(Map pipelineConfig, String branchName, Stri } } -def CreateUploadAPLogsStage(Map pipelineConfig, String branchName, String platformName, String jobName, String workspace, Map params) { +def CreateUploadAPLogsStage(String platformName, String jobName, String workspace, Map params) { return { stage("${jobName}_upload_ap_logs") { - UploadAPLogs(pipelineConfig, branchName, platformName, jobName, workspace, params) + UploadAPLogs(platformName, jobName, workspace, params) } } } @@ -576,8 +581,8 @@ def CreateSingleNode(Map pipelineConfig, def platform, def build_job, Map envVar error "Node disconnected during build: ${e}" // Error raised to retry stage on a new node } } - if (IsAPLogUpload(branchName, build_job_name)) { - CreateUploadAPLogsStage(pipelineConfig, branchName, platform.key, build_job_name, envVars['WORKSPACE'], platform.value.build_types[build_job_name].PARAMETERS).call() + if (build_job_name.toLowerCase().contains('asset') && env.IS_UPLOAD_AP_LOGS?.toBoolean()) { + CreateUploadAPLogsStage(platform.key, build_job_name, envVars['WORKSPACE'], platform.value.build_types[build_job_name].PARAMETERS).call() } // All other errors will be raised outside the retry block currentResult = envVars['ON_FAILURE_MARK'] ?: 'FAILURE' diff --git a/scripts/build/tools/copy_file.py b/scripts/build/tools/copy_file.py new file mode 100644 index 0000000000..45b5e39d7a --- /dev/null +++ b/scripts/build/tools/copy_file.py @@ -0,0 +1,57 @@ +# +# 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 +# +# + +import argparse +import os +import sys +import glob +import shutil + + +def parse_args(): + parser = argparse.ArgumentParser() + parser.add_argument('-s', '--src-dir', dest='src_dir', required=True, help='Source directory to copy files from, if not specified, current directory is used.') + parser.add_argument('-r', '--file-regex', dest='file_regex', required=True, help='Globbing pattern used to match file names to copy.') + parser.add_argument('-t', '--target-dir', dest="target_dir", required=True, help='Target directory to copy files to.') + args = parser.parse_args() + if not os.path.isdir(args.src_dir): + print('ERROR: src_dir is not a valid directory.') + exit(1) + return args + + +def extended_path(path): + """ + Maximum Path Length Limitation on Windows is 260 characters, use extended-length path to bypass this limitation + """ + if sys.platform in ('win32', 'cli') and len(path) >= 260: + if path.startswith('\\'): + return r'\\?\UNC\{}'.format(path.lstrip('\\')) + else: + return r'\\?\{}'.format(path) + else: + return path + + +def copy_file(src_dir, file_regex, target_dir): + if not os.path.isdir(args.target_dir): + os.makedirs(target_dir) + for f in glob.glob(os.path.join(src_dir, file_regex), recursive=True): + if os.path.isfile(f): + relative_path = os.path.relpath(f, src_dir) + target_file_path = os.path.join(target_dir, relative_path) + target_file_dir = os.path.dirname(target_file_path) + if not os.path.isdir(target_file_dir): + os.makedirs(target_file_dir) + shutil.copy2(f, extended_path(target_file_path)) + print(f'{f} -> {target_file_path}') + + +if __name__ == "__main__": + args = parse_args() + copy_file(args.src_dir, args.file_regex, args.target_dir) From 278fdb63b4dbda7cc6f3b548d0dde0153676dfa1 Mon Sep 17 00:00:00 2001 From: mcphedar Date: Fri, 19 Nov 2021 12:49:45 -0600 Subject: [PATCH 166/345] Updating the title of the template Signed-off-by: mcphedar --- .github/ISSUE_TEMPLATE/ar_bug_report.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/ISSUE_TEMPLATE/ar_bug_report.md b/.github/ISSUE_TEMPLATE/ar_bug_report.md index 00aa80964f..93b6e70b03 100644 --- a/.github/ISSUE_TEMPLATE/ar_bug_report.md +++ b/.github/ISSUE_TEMPLATE/ar_bug_report.md @@ -1,5 +1,5 @@ --- -name: Automated_Review_bug_template.md +name: Automated Review bug report about: Create a bug for a an issue found in the Automated Review title: 'AR Bug Report' labels: 'needs-triage,kind/bug,kind/automation' From 99d2605a818f1bfe3291816fc289c342aa00629e Mon Sep 17 00:00:00 2001 From: lsemp3d <58790905+lsemp3d@users.noreply.github.com> Date: Fri, 19 Nov 2021 11:06:53 -0800 Subject: [PATCH 167/345] Improved generation by splitting up CamelCase text for names, updated more node names Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com> --- .../AtomToolsDocumentSystemSettings.names | 49 +- .../Classes/ComponentId.names | 31 +- .../Classes/ExposureControlConfig.names | 258 ++++++++++- .../Classes/LightConfig.names | 342 +++++++++++++- .../Classes/LightingPreset.names | 426 +++++++++++++++++- .../Classes/ModelPreset.names | 132 +++++- .../Classes/TransformConfig.names | 268 ++++++++++- .../AtomToolsDocumentSystemRequestBus.names | 113 ++--- ...AtomToolsMainWindowFactoryRequestBus.names | 15 +- .../AtomToolsMainWindowRequestBus.names | 63 +-- .../EBus/Senders/EditorCameraRequestBus.names | 39 +- ...ransformComponentSelectionRequestBus.names | 87 ++-- .../Senders/GameEntityContextRequestBus.names | 24 +- .../Senders/NonUniformScaleRequestBus.names | 7 +- .../EBus/Senders/TransformBus.names | 251 ++++------- .../Nodes/EntityEntity_GetEntityForward.names | 17 +- .../Nodes/EntityEntity_GetEntityRight.names | 17 +- .../Nodes/EntityEntity_GetEntityUp.names | 17 +- .../Nodes/EntityEntity_IsActive.names | 13 +- .../Nodes/EntityEntity_IsValid.names | 13 +- .../Nodes/EntityEntity_ToString.names | 13 +- .../Code/Tools/TranslationGeneration.cpp | 64 ++- .../Code/Tools/TranslationGeneration.h | 3 + 23 files changed, 1840 insertions(+), 422 deletions(-) diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AtomToolsDocumentSystemSettings.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AtomToolsDocumentSystemSettings.names index 966764e44a..8cb330e91d 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AtomToolsDocumentSystemSettings.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AtomToolsDocumentSystemSettings.names @@ -5,8 +5,53 @@ "context": "BehaviorClass", "variant": "", "details": { - "name": "AtomToolsDocumentSystemSettings" - } + "name": "Document System Settings", + "category": "Atom Tools" + }, + "methods": [ + { + "key": "GetshowReloadDocumentPrompt", + "details": { + "name": "Get Show Reload Document Prompt" + }, + "params": [ + { + "typeid": "{9E576D4F-A74A-4326-9135-C07284D0A3B9}", + "details": { + "name": "Document System Settings" + } + } + ], + "results": [ + { + "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", + "details": { + "name": "Enabled" + } + } + ] + }, + { + "key": "SetshowReloadDocumentPrompt", + "details": { + "name": "Set Show Reload Document Prompt" + }, + "params": [ + { + "typeid": "{9E576D4F-A74A-4326-9135-C07284D0A3B9}", + "details": { + "name": "Document System Settings" + } + }, + { + "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", + "details": { + "name": "Enabled" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ComponentId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ComponentId.names index b9a8574451..edc87d77f7 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ComponentId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ComponentId.names @@ -5,7 +5,7 @@ "context": "BehaviorClass", "variant": "", "details": { - "name": "ComponentID", + "name": "Component Id", "category": "Entity" }, "methods": [ @@ -14,21 +14,20 @@ "context": "ComponentId", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke IsValid" + "tooltip": "When signaled, this will invoke Is Valid" }, "exit": { "name": "Out", - "tooltip": "Signaled after IsValid is invoked" + "tooltip": "Signaled after Is Valid is invoked" }, "details": { - "name": "ComponentId::IsValid", - "category": "Entity" + "name": "Is Valid" }, "params": [ { "typeid": "{60A9A069-9C3D-465A-B7AD-0D6CC803990A}", "details": { - "name": "BehaviorComponentId*" + "name": "Behavior Component Id*" } } ], @@ -36,7 +35,7 @@ { "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", "details": { - "name": "Boolean" + "name": "Is Valid" } } ] @@ -53,20 +52,19 @@ "tooltip": "Signaled after Equal is invoked" }, "details": { - "name": "ComponentId::Equal", - "category": "Entity" + "name": "Equal" }, "params": [ { "typeid": "{60A9A069-9C3D-465A-B7AD-0D6CC803990A}", "details": { - "name": "BehaviorComponentId*" + "name": "Behavior Component Id" } }, { "typeid": "{60A9A069-9C3D-465A-B7AD-0D6CC803990A}", "details": { - "name": "const BehaviorComponentId&" + "name": "Behavior Component Id" } } ], @@ -74,7 +72,7 @@ { "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", "details": { - "name": "Boolean" + "name": "Is Equal" } } ] @@ -84,21 +82,20 @@ "context": "ComponentId", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke ToString" + "tooltip": "When signaled, this will invoke To String" }, "exit": { "name": "Out", - "tooltip": "Signaled after ToString is invoked" + "tooltip": "Signaled after To String is invoked" }, "details": { - "name": "ComponentId::ToString", - "category": "Entity" + "name": "To String" }, "params": [ { "typeid": "{60A9A069-9C3D-465A-B7AD-0D6CC803990A}", "details": { - "name": "BehaviorComponentId*" + "name": "Behavior Component Id*" } } ], diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ExposureControlConfig.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ExposureControlConfig.names index ef15a10176..b58c7ff990 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ExposureControlConfig.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ExposureControlConfig.names @@ -5,8 +5,262 @@ "context": "BehaviorClass", "variant": "", "details": { - "name": "ExposureControlConfig" - } + "name": "Exposure Control Config" + }, + "methods": [ + { + "key": "GetautoExposureSpeedUp", + "details": { + "name": "Get Auto Exposure Speed Up" + }, + "params": [ + { + "typeid": "{C6FD75F7-58BA-46CE-8FBA-2D64CB4ECFF9}", + "details": { + "name": "Exposure Control Config" + } + } + ], + "results": [ + { + "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", + "details": { + "name": "Auto Exposure Speed Up" + } + } + ] + }, + { + "key": "SetautoExposureSpeedUp", + "details": { + "name": "Set Auto Exposure Speed Up" + }, + "params": [ + { + "typeid": "{C6FD75F7-58BA-46CE-8FBA-2D64CB4ECFF9}", + "details": { + "name": "Exposure Control Config" + } + }, + { + "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", + "details": { + "name": "Auto Exposure Speed Up" + } + } + ] + }, + { + "key": "GetautoExposureSpeedDown", + "details": { + "name": "Get Auto Exposure Speed Down" + }, + "params": [ + { + "typeid": "{C6FD75F7-58BA-46CE-8FBA-2D64CB4ECFF9}", + "details": { + "name": "Exposure Control Config" + } + } + ], + "results": [ + { + "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", + "details": { + "name": "Auto Exposure Speed Down" + } + } + ] + }, + { + "key": "SetautoExposureSpeedDown", + "details": { + "name": "Setauto Exposure Speed Down" + }, + "params": [ + { + "typeid": "{C6FD75F7-58BA-46CE-8FBA-2D64CB4ECFF9}", + "details": { + "name": "Exposure Control Config" + } + }, + { + "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", + "details": { + "name": "Exposure Speed Down" + } + } + ] + }, + { + "key": "GetautoExposureMax", + "details": { + "name": "Get Auto Exposure Max" + }, + "params": [ + { + "typeid": "{C6FD75F7-58BA-46CE-8FBA-2D64CB4ECFF9}", + "details": { + "name": "Exposure Control Config" + } + } + ], + "results": [ + { + "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", + "details": { + "name": "Auto Exposure Max" + } + } + ] + }, + { + "key": "SetautoExposureMax", + "details": { + "name": "Set Auto Exposure Max" + }, + "params": [ + { + "typeid": "{C6FD75F7-58BA-46CE-8FBA-2D64CB4ECFF9}", + "details": { + "name": "Exposure Control Config" + } + }, + { + "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", + "details": { + "name": "Auto Exposure Max" + } + } + ] + }, + { + "key": "GetautoExposureMin", + "details": { + "name": "Get Auto Exposure Min" + }, + "params": [ + { + "typeid": "{C6FD75F7-58BA-46CE-8FBA-2D64CB4ECFF9}", + "details": { + "name": "Exposure Control Config" + } + } + ], + "results": [ + { + "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", + "details": { + "name": "Auto Exposure Min" + } + } + ] + }, + { + "key": "SetautoExposureMin", + "details": { + "name": "Set Auto Exposure Min" + }, + "params": [ + { + "typeid": "{C6FD75F7-58BA-46CE-8FBA-2D64CB4ECFF9}", + "details": { + "name": "Exposure Control Config" + } + }, + { + "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", + "details": { + "name": "Auto Exposure Min" + } + } + ] + }, + { + "key": "GetexposureControlType", + "details": { + "name": "Get Exposure Control Type" + }, + "params": [ + { + "typeid": "{C6FD75F7-58BA-46CE-8FBA-2D64CB4ECFF9}", + "details": { + "name": "Exposure Control Config" + } + } + ], + "results": [ + { + "typeid": "{43DA906B-7DEF-4CA8-9790-854106D3F983}", + "details": { + "name": "Exposure Control Type" + } + } + ] + }, + { + "key": "SetexposureControlType", + "details": { + "name": "Set Exposure Control Type" + }, + "params": [ + { + "typeid": "{C6FD75F7-58BA-46CE-8FBA-2D64CB4ECFF9}", + "details": { + "name": "Exposure Control Config" + } + }, + { + "typeid": "{43DA906B-7DEF-4CA8-9790-854106D3F983}", + "details": { + "name": "Exposure Control Type" + } + } + ] + }, + { + "key": "GetcompensateValue", + "details": { + "name": "Get Compensate Value" + }, + "params": [ + { + "typeid": "{C6FD75F7-58BA-46CE-8FBA-2D64CB4ECFF9}", + "details": { + "name": "Exposure Control Config" + } + } + ], + "results": [ + { + "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", + "details": { + "name": "Compensate Value" + } + } + ] + }, + { + "key": "SetcompensateValue", + "details": { + "name": "Set Compensate Value" + }, + "params": [ + { + "typeid": "{C6FD75F7-58BA-46CE-8FBA-2D64CB4ECFF9}", + "details": { + "name": "Exposure Control Config" + } + }, + { + "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", + "details": { + "name": "Compensate Value" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/LightConfig.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/LightConfig.names index 2ff191ad6c..a0e6ba654c 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/LightConfig.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/LightConfig.names @@ -5,8 +5,346 @@ "context": "BehaviorClass", "variant": "", "details": { - "name": "LightConfig" - } + "name": "Light Config" + }, + "methods": [ + { + "key": "GetshadowmapSize", + "details": { + "name": "Get Shadowmap Size" + }, + "params": [ + { + "typeid": "{02644F52-9483-47A8-9028-37671695C34E}", + "details": { + "name": "Light Config" + } + } + ], + "results": [ + { + "typeid": "{3EC1CE83-483D-41FD-9909-D22B03E56F4E}", + "details": { + "name": "Shadowmap Size" + } + } + ] + }, + { + "key": "SetshadowmapSize", + "details": { + "name": "Set Shadowmap Size" + }, + "params": [ + { + "typeid": "{02644F52-9483-47A8-9028-37671695C34E}", + "details": { + "name": "Light Config" + } + }, + { + "typeid": "{3EC1CE83-483D-41FD-9909-D22B03E56F4E}", + "details": { + "name": "Shadowmap Size" + } + } + ] + }, + { + "key": "GetshadowCascadeCount", + "details": { + "name": "Get Shadow Cascade Count" + }, + "params": [ + { + "typeid": "{02644F52-9483-47A8-9028-37671695C34E}", + "details": { + "name": "Light Config" + } + } + ], + "results": [ + { + "typeid": "{ECA0B403-C4F8-4B86-95FC-81688D046E40}", + "details": { + "name": "Shadow Cascade Count" + } + } + ] + }, + { + "key": "SetshadowCascadeCount", + "details": { + "name": "Set Shadow Cascade Count" + }, + "params": [ + { + "typeid": "{02644F52-9483-47A8-9028-37671695C34E}", + "details": { + "name": "Light Config" + } + }, + { + "typeid": "{ECA0B403-C4F8-4B86-95FC-81688D046E40}", + "details": { + "name": "Shadow Cascade Count" + } + } + ] + }, + { + "key": "GetenableShadowDebugColoring", + "details": { + "name": "Get Enable Shadow Debug Coloring" + }, + "params": [ + { + "typeid": "{02644F52-9483-47A8-9028-37671695C34E}", + "details": { + "name": "Light Config" + } + } + ], + "results": [ + { + "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", + "details": { + "name": "Enable" + } + } + ] + }, + { + "key": "SetenableShadowDebugColoring", + "details": { + "name": "Set Enable Shadow Debug Coloring" + }, + "params": [ + { + "typeid": "{02644F52-9483-47A8-9028-37671695C34E}", + "details": { + "name": "Light Config" + } + }, + { + "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", + "details": { + "name": "Enable" + } + } + ] + }, + { + "key": "Getintensity", + "details": { + "name": "Get Intensity" + }, + "params": [ + { + "typeid": "{02644F52-9483-47A8-9028-37671695C34E}", + "details": { + "name": "Light Config" + } + } + ], + "results": [ + { + "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", + "details": { + "name": "Intensity" + } + } + ] + }, + { + "key": "Setintensity", + "details": { + "name": "Set Intensity" + }, + "params": [ + { + "typeid": "{02644F52-9483-47A8-9028-37671695C34E}", + "details": { + "name": "Light Config" + } + }, + { + "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", + "details": { + "name": "Intensity" + } + } + ] + }, + { + "key": "GetshadowRatioLogarithmUniform", + "details": { + "name": "Get Shadow Ratio Logarithm Uniform" + }, + "params": [ + { + "typeid": "{02644F52-9483-47A8-9028-37671695C34E}", + "details": { + "name": "Light Config" + } + } + ], + "results": [ + { + "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", + "details": { + "name": "Shadow Ratio Logarithm Uniform" + } + } + ] + }, + { + "key": "SetshadowRatioLogarithmUniform", + "details": { + "name": "Set Shadow Ratio Logarithm Uniform" + }, + "params": [ + { + "typeid": "{02644F52-9483-47A8-9028-37671695C34E}", + "details": { + "name": "Light Config" + } + }, + { + "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", + "details": { + "name": "Shadow Ratio Logarithm Uniform" + } + } + ] + }, + { + "key": "Getcolor", + "details": { + "name": "Get Color" + }, + "params": [ + { + "typeid": "{02644F52-9483-47A8-9028-37671695C34E}", + "details": { + "name": "Light Config" + } + } + ], + "results": [ + { + "typeid": "{7894072A-9050-4F0F-901B-34B1A0D29417}", + "details": { + "name": "Color" + } + } + ] + }, + { + "key": "Setcolor", + "details": { + "name": "Set Color" + }, + "params": [ + { + "typeid": "{02644F52-9483-47A8-9028-37671695C34E}", + "details": { + "name": "Light Config" + } + }, + { + "typeid": "{7894072A-9050-4F0F-901B-34B1A0D29417}", + "details": { + "name": "Color" + } + } + ] + }, + { + "key": "Getdirection", + "details": { + "name": "Get Direction" + }, + "params": [ + { + "typeid": "{02644F52-9483-47A8-9028-37671695C34E}", + "details": { + "name": "Light Config" + } + } + ], + "results": [ + { + "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}", + "details": { + "name": "Direction" + } + } + ] + }, + { + "key": "Setdirection", + "details": { + "name": "Set Direction" + }, + "params": [ + { + "typeid": "{02644F52-9483-47A8-9028-37671695C34E}", + "details": { + "name": "Light Config" + } + }, + { + "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}", + "details": { + "name": "Direction" + } + } + ] + }, + { + "key": "GetshadowFarClipDistance", + "details": { + "name": "Get Shadow Far Clip Distance" + }, + "params": [ + { + "typeid": "{02644F52-9483-47A8-9028-37671695C34E}", + "details": { + "name": "Light Config" + } + } + ], + "results": [ + { + "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", + "details": { + "name": "Shadow Far Clip Distance" + } + } + ] + }, + { + "key": "SetshadowFarClipDistance", + "details": { + "name": "Set Shadow Far Clip Distance" + }, + "params": [ + { + "typeid": "{02644F52-9483-47A8-9028-37671695C34E}", + "details": { + "name": "Light Config" + } + }, + { + "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", + "details": { + "name": "Shadow Far Clip Distance" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/LightingPreset.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/LightingPreset.names index 3bad4ebca7..880ca19784 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/LightingPreset.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/LightingPreset.names @@ -5,8 +5,430 @@ "context": "BehaviorClass", "variant": "", "details": { - "name": "LightingPreset" - } + "name": "Lighting Preset" + }, + "methods": [ + { + "key": "GetshadowCatcherOpacity", + "details": { + "name": "Get Shadow Catcher Opacity" + }, + "params": [ + { + "typeid": "{6EEACBC0-2D97-414C-8E87-088E7BA231A9}", + "details": { + "name": "Lighting Preset" + } + } + ], + "results": [ + { + "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", + "details": { + "name": "Shadow Catcher Opacity" + } + } + ] + }, + { + "key": "SetshadowCatcherOpacity", + "details": { + "name": "Set Shadow Catcher Opacity" + }, + "params": [ + { + "typeid": "{6EEACBC0-2D97-414C-8E87-088E7BA231A9}", + "details": { + "name": "Lighting Preset" + } + }, + { + "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", + "details": { + "name": "Shadow Catcher Opacity" + } + } + ] + }, + { + "key": "GetskyboxExposure", + "details": { + "name": "Get Skybox Exposure" + }, + "params": [ + { + "typeid": "{6EEACBC0-2D97-414C-8E87-088E7BA231A9}", + "details": { + "name": "Lighting Preset" + } + } + ], + "results": [ + { + "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", + "details": { + "name": "Skybox Exposure" + } + } + ] + }, + { + "key": "SetskyboxExposure", + "details": { + "name": "Set Skybox Exposure" + }, + "params": [ + { + "typeid": "{6EEACBC0-2D97-414C-8E87-088E7BA231A9}", + "details": { + "name": "Lighting Preset" + } + }, + { + "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", + "details": { + "name": "Skybox Exposure" + } + } + ] + }, + { + "key": "Getlights", + "details": { + "name": "Get Lights" + }, + "params": [ + { + "typeid": "{6EEACBC0-2D97-414C-8E87-088E7BA231A9}", + "details": { + "name": "Lighting Preset" + } + } + ], + "results": [ + { + "typeid": "{33492660-D9A8-5E84-9CFB-03CBCD87919F}", + "details": { + "name": "Light Configs" + } + } + ] + }, + { + "key": "Setlights", + "details": { + "name": "Set Lights" + }, + "params": [ + { + "typeid": "{6EEACBC0-2D97-414C-8E87-088E7BA231A9}", + "details": { + "name": "Lighting Preset" + } + }, + { + "typeid": "{33492660-D9A8-5E84-9CFB-03CBCD87919F}", + "details": { + "name": "Light Configs" + } + } + ] + }, + { + "key": "GetiblExposure", + "details": { + "name": "Get IBL Exposure" + }, + "params": [ + { + "typeid": "{6EEACBC0-2D97-414C-8E87-088E7BA231A9}", + "details": { + "name": "Lighting Preset" + } + } + ], + "results": [ + { + "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", + "details": { + "name": "IBL Exposure" + } + } + ] + }, + { + "key": "SetiblExposure", + "details": { + "name": "Set IBL Exposure" + }, + "params": [ + { + "typeid": "{6EEACBC0-2D97-414C-8E87-088E7BA231A9}", + "details": { + "name": "Lighting Preset" + } + }, + { + "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", + "details": { + "name": "IBL Exposure" + } + } + ] + }, + { + "key": "GetskyboxImageAsset", + "details": { + "name": "Get Skybox Image Asset" + }, + "params": [ + { + "typeid": "{6EEACBC0-2D97-414C-8E87-088E7BA231A9}", + "details": { + "name": "Lighting Preset" + } + } + ], + "results": [ + { + "typeid": "{403A7CFE-B218-5D57-8540-BD58E734BCFE}", + "details": { + "name": "Skybox Image Asset" + } + } + ] + }, + { + "key": "SetskyboxImageAsset", + "details": { + "name": "Set Skybox Image Asset" + }, + "params": [ + { + "typeid": "{6EEACBC0-2D97-414C-8E87-088E7BA231A9}", + "details": { + "name": "Lighting Preset" + } + }, + { + "typeid": "{403A7CFE-B218-5D57-8540-BD58E734BCFE}", + "details": { + "name": "Skybox Image Asset" + } + } + ] + }, + { + "key": "GetiblSpecularImageAsset", + "details": { + "name": "Get IBL Specular Image Asset" + }, + "params": [ + { + "typeid": "{6EEACBC0-2D97-414C-8E87-088E7BA231A9}", + "details": { + "name": "Lighting Preset" + } + } + ], + "results": [ + { + "typeid": "{403A7CFE-B218-5D57-8540-BD58E734BCFE}", + "details": { + "name": "IBL Specular Image Asset" + } + } + ] + }, + { + "key": "SetiblSpecularImageAsset", + "details": { + "name": "Set IBL Specular Image Asset" + }, + "params": [ + { + "typeid": "{6EEACBC0-2D97-414C-8E87-088E7BA231A9}", + "details": { + "name": "Lighting Preset" + } + }, + { + "typeid": "{403A7CFE-B218-5D57-8540-BD58E734BCFE}", + "details": { + "name": "IBL Specular Image Asset" + } + } + ] + }, + { + "key": "GetdisplayName", + "details": { + "name": "Get Display Name" + }, + "params": [ + { + "typeid": "{6EEACBC0-2D97-414C-8E87-088E7BA231A9}", + "details": { + "name": "Lighting Preset" + } + } + ], + "results": [ + { + "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", + "details": { + "name": "Display Name" + } + } + ] + }, + { + "key": "SetdisplayName", + "details": { + "name": "Set Display Name" + }, + "params": [ + { + "typeid": "{6EEACBC0-2D97-414C-8E87-088E7BA231A9}", + "details": { + "name": "Lighting Preset" + } + }, + { + "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", + "details": { + "name": "Display Name" + } + } + ] + }, + { + "key": "GetalternateSkyboxImageAsset", + "details": { + "name": "Get Alternate Skybox Image Asset" + }, + "params": [ + { + "typeid": "{6EEACBC0-2D97-414C-8E87-088E7BA231A9}", + "details": { + "name": "Lighting Preset" + } + } + ], + "results": [ + { + "typeid": "{403A7CFE-B218-5D57-8540-BD58E734BCFE}", + "details": { + "name": "Alternate Skybox Image Asset" + } + } + ] + }, + { + "key": "SetalternateSkyboxImageAsset", + "details": { + "name": "Set Alternate Skybox Image Asset" + }, + "params": [ + { + "typeid": "{6EEACBC0-2D97-414C-8E87-088E7BA231A9}", + "details": { + "name": "Lighting Preset" + } + }, + { + "typeid": "{403A7CFE-B218-5D57-8540-BD58E734BCFE}", + "details": { + "name": "Alternate Skybox Image Asset" + } + } + ] + }, + { + "key": "GetiblDiffuseImageAsset", + "details": { + "name": "Get IBL Diffuse Image Asset" + }, + "params": [ + { + "typeid": "{6EEACBC0-2D97-414C-8E87-088E7BA231A9}", + "details": { + "name": "Lighting Preset" + } + } + ], + "results": [ + { + "typeid": "{403A7CFE-B218-5D57-8540-BD58E734BCFE}", + "details": { + "name": "IBL Diffuse Image Asset" + } + } + ] + }, + { + "key": "SetiblDiffuseImageAsset", + "details": { + "name": "Set IBL Diffuse Image Asset" + }, + "params": [ + { + "typeid": "{6EEACBC0-2D97-414C-8E87-088E7BA231A9}", + "details": { + "name": "Lighting Preset" + } + }, + { + "typeid": "{403A7CFE-B218-5D57-8540-BD58E734BCFE}", + "details": { + "name": "IBL Diffuse Image Asset" + } + } + ] + }, + { + "key": "Getexposure", + "details": { + "name": "Get Exposure" + }, + "params": [ + { + "typeid": "{6EEACBC0-2D97-414C-8E87-088E7BA231A9}", + "details": { + "name": "Lighting Preset" + } + } + ], + "results": [ + { + "typeid": "{C6FD75F7-58BA-46CE-8FBA-2D64CB4ECFF9}", + "details": { + "name": "Exposure Control Config" + } + } + ] + }, + { + "key": "Setexposure", + "details": { + "name": "Set Exposure" + }, + "params": [ + { + "typeid": "{6EEACBC0-2D97-414C-8E87-088E7BA231A9}", + "details": { + "name": "Lighting Preset" + } + }, + { + "typeid": "{C6FD75F7-58BA-46CE-8FBA-2D64CB4ECFF9}", + "details": { + "name": "Exposure Control Config" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ModelPreset.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ModelPreset.names index be96ebd842..ca6c97b051 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ModelPreset.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ModelPreset.names @@ -5,8 +5,136 @@ "context": "BehaviorClass", "variant": "", "details": { - "name": "ModelPreset" - } + "name": "Model Preset" + }, + "methods": [ + { + "key": "GetdisplayName", + "details": { + "name": "Get Display Name" + }, + "params": [ + { + "typeid": "{A7304AE2-EC26-44A4-8C00-89D9731CCB13}", + "details": { + "name": "Model Preset" + } + } + ], + "results": [ + { + "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", + "details": { + "name": "Display Name" + } + } + ] + }, + { + "key": "SetdisplayName", + "details": { + "name": "Set Display Name" + }, + "params": [ + { + "typeid": "{A7304AE2-EC26-44A4-8C00-89D9731CCB13}", + "details": { + "name": "Model Preset" + } + }, + { + "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", + "details": { + "name": "Display Name" + } + } + ] + }, + { + "key": "GetmodelAsset", + "details": { + "name": "Get Model Asset" + }, + "params": [ + { + "typeid": "{A7304AE2-EC26-44A4-8C00-89D9731CCB13}", + "details": { + "name": "Model Preset" + } + } + ], + "results": [ + { + "typeid": "{A1F6761B-B5CA-59E6-89FF-EB0ABDF6BD68}", + "details": { + "name": "Model Asset" + } + } + ] + }, + { + "key": "SetmodelAsset", + "details": { + "name": "Set Model Asset" + }, + "params": [ + { + "typeid": "{A7304AE2-EC26-44A4-8C00-89D9731CCB13}", + "details": { + "name": "Model Preset" + } + }, + { + "typeid": "{A1F6761B-B5CA-59E6-89FF-EB0ABDF6BD68}", + "details": { + "name": "Model Asset" + } + } + ] + }, + { + "key": "GetpreviewImageAsset", + "details": { + "name": "Get Preview Image Asset" + }, + "params": [ + { + "typeid": "{A7304AE2-EC26-44A4-8C00-89D9731CCB13}", + "details": { + "name": "Model Preset" + } + } + ], + "results": [ + { + "typeid": "{403A7CFE-B218-5D57-8540-BD58E734BCFE}", + "details": { + "name": "Preview Image Asset" + } + } + ] + }, + { + "key": "SetpreviewImageAsset", + "details": { + "name": "Set Preview Image Asset" + }, + "params": [ + { + "typeid": "{A7304AE2-EC26-44A4-8C00-89D9731CCB13}", + "details": { + "name": "Model Preset" + } + }, + { + "typeid": "{403A7CFE-B218-5D57-8540-BD58E734BCFE}", + "details": { + "name": "Preview Image Asset" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/TransformConfig.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/TransformConfig.names index f13c9a8f80..d9acd8a6cc 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/TransformConfig.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/TransformConfig.names @@ -5,7 +5,7 @@ "context": "BehaviorClass", "variant": "", "details": { - "name": "Transform", + "name": "Transform Config", "category": "Entity" }, "methods": [ @@ -14,27 +14,26 @@ "context": "TransformConfig", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetTransform" + "tooltip": "When signaled, this will invoke Set Transform" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetTransform is invoked" + "tooltip": "Signaled after Set Transform is invoked" }, "details": { - "name": "TransformConfig::SetTransform", - "category": "Entity" + "name": "Set Transform" }, "params": [ { "typeid": "{B3AAB26D-D075-4E2B-9653-9527EE363DF8}", "details": { - "name": "TransformConfig*" + "name": "Transform Config" } }, { "typeid": "{5D9958E9-9F1E-4985-B532-FFFDE75FEDFD}", "details": { - "name": "const Transform&" + "name": "Transform" } } ] @@ -44,33 +43,274 @@ "context": "TransformConfig", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetLocalAndWorldTransform" + "tooltip": "When signaled, this will invoke Set Local And World Transform" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetLocalAndWorldTransform is invoked" + "tooltip": "Signaled after Set Local And World Transform is invoked" }, "details": { - "name": "TransformConfig::SetLocalAndWorldTransform", - "category": "Entity" + "name": "Set Local And World Transform" }, "params": [ { "typeid": "{B3AAB26D-D075-4E2B-9653-9527EE363DF8}", "details": { - "name": "TransformConfig*" + "name": "Transform Config" } }, { "typeid": "{5D9958E9-9F1E-4985-B532-FFFDE75FEDFD}", "details": { - "name": "const Transform&" + "name": "Local" } }, { "typeid": "{5D9958E9-9F1E-4985-B532-FFFDE75FEDFD}", "details": { - "name": "const Transform&" + "name": "World" + } + } + ] + }, + { + "key": "GetparentActivationTransformMode", + "details": { + "name": "Get Parent Activation Transform Mode" + }, + "params": [ + { + "typeid": "{B3AAB26D-D075-4E2B-9653-9527EE363DF8}", + "details": { + "name": "Transform Config" + } + } + ], + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "Mode", + "tooltip": "0: Maintain Original Relative Transform\n1: Maintain Current World Transform" + } + } + ] + }, + { + "key": "SetparentActivationTransformMode", + "details": { + "name": "Set Parent Activation Transform Mode" + }, + "params": [ + { + "typeid": "{B3AAB26D-D075-4E2B-9653-9527EE363DF8}", + "details": { + "name": "Transform Config" + } + }, + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "Mode", + "tooltip": "0: Maintain Original Relative Transform\n1: Maintain Current World Transform" + } + } + ] + }, + { + "key": "GetparentId", + "details": { + "name": "Get Parent Id" + }, + "params": [ + { + "typeid": "{B3AAB26D-D075-4E2B-9653-9527EE363DF8}", + "details": { + "name": "Transform Config" + } + } + ], + "results": [ + { + "typeid": "{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}", + "details": { + "name": "Parent Id", + "tooltip": "Entity Unique Id" + } + } + ] + }, + { + "key": "SetparentId", + "details": { + "name": "Set Parent Id" + }, + "params": [ + { + "typeid": "{B3AAB26D-D075-4E2B-9653-9527EE363DF8}", + "details": { + "name": "Transform Config" + } + }, + { + "typeid": "{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}", + "details": { + "name": "Parent Id", + "tooltip": "Entity Unique Id" + } + } + ] + }, + { + "key": "GetworldTransform", + "details": { + "name": "Get World Transform" + }, + "params": [ + { + "typeid": "{B3AAB26D-D075-4E2B-9653-9527EE363DF8}", + "details": { + "name": "Transform Config" + } + } + ], + "results": [ + { + "typeid": "{5D9958E9-9F1E-4985-B532-FFFDE75FEDFD}", + "details": { + "name": "World" + } + } + ] + }, + { + "key": "SetworldTransform", + "details": { + "name": "Set World Transform" + }, + "params": [ + { + "typeid": "{B3AAB26D-D075-4E2B-9653-9527EE363DF8}", + "details": { + "name": "Transform Config" + } + }, + { + "typeid": "{5D9958E9-9F1E-4985-B532-FFFDE75FEDFD}", + "details": { + "name": "World" + } + } + ] + }, + { + "key": "GetMaintainCurrentWorldTransform", + "details": { + "name": "Get Maintain Current World Transform" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "Value" + } + } + ] + }, + { + "key": "GetisStatic", + "details": { + "name": "Get Is Static" + }, + "params": [ + { + "typeid": "{B3AAB26D-D075-4E2B-9653-9527EE363DF8}", + "details": { + "name": "Transform Config" + } + } + ], + "results": [ + { + "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", + "details": { + "name": "Is Static" + } + } + ] + }, + { + "key": "SetisStatic", + "details": { + "name": "Set Is Static" + }, + "params": [ + { + "typeid": "{B3AAB26D-D075-4E2B-9653-9527EE363DF8}", + "details": { + "name": "Transform Config" + } + }, + { + "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", + "details": { + "name": "Is Static" + } + } + ] + }, + { + "key": "GetMaintainOriginalRelativeTransform", + "details": { + "name": "Get Maintain Original Relative Transform" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "Value" + } + } + ] + }, + { + "key": "GetlocalTransform", + "details": { + "name": "Get Local Transform" + }, + "params": [ + { + "typeid": "{B3AAB26D-D075-4E2B-9653-9527EE363DF8}", + "details": { + "name": "Transform Config" + } + } + ], + "results": [ + { + "typeid": "{5D9958E9-9F1E-4985-B532-FFFDE75FEDFD}", + "details": { + "name": "Local" + } + } + ] + }, + { + "key": "SetlocalTransform", + "details": { + "name": "Set Local Transform" + }, + "params": [ + { + "typeid": "{B3AAB26D-D075-4E2B-9653-9527EE363DF8}", + "details": { + "name": "Transform Config" + } + }, + { + "typeid": "{5D9958E9-9F1E-4985-B532-FFFDE75FEDFD}", + "details": { + "name": "Local" } } ] diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AtomToolsDocumentSystemRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AtomToolsDocumentSystemRequestBus.names index d22bf3bc7c..9b65065453 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AtomToolsDocumentSystemRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AtomToolsDocumentSystemRequestBus.names @@ -5,27 +5,28 @@ "context": "EBusSender", "variant": "", "details": { - "name": "AtomToolsDocumentSystemRequestBus" + "name": "Document", + "category": "Atom Tools" }, "methods": [ { "key": "SaveDocument", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SaveDocument" + "tooltip": "When signaled, this will invoke Save Document" }, "exit": { "name": "Out", - "tooltip": "Signaled after SaveDocument is invoked" + "tooltip": "Signaled after Save Document is invoked" }, "details": { - "name": "SaveDocument" + "name": "Save Document" }, "params": [ { "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}", "details": { - "name": "AZ::Uuid" + "name": "Document Id" } } ], @@ -33,7 +34,7 @@ { "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", "details": { - "name": "bool" + "name": "Success" } } ] @@ -42,26 +43,26 @@ "key": "SaveDocumentAsChild", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SaveDocumentAsChild" + "tooltip": "When signaled, this will invoke Save Document As Child" }, "exit": { "name": "Out", - "tooltip": "Signaled after SaveDocumentAsChild is invoked" + "tooltip": "Signaled after Save Document As Child is invoked" }, "details": { - "name": "SaveDocumentAsChild" + "name": "Save Document As Child" }, "params": [ { "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}", "details": { - "name": "AZ::Uuid" + "name": "Document Id" } }, { "typeid": "{7114E998-A8B4-519B-9342-A86D1587B4F7}", "details": { - "name": "" + "name": "Target Path" } } ], @@ -69,7 +70,7 @@ { "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", "details": { - "name": "bool" + "name": "Success" } } ] @@ -78,20 +79,20 @@ "key": "OpenDocument", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke OpenDocument" + "tooltip": "When signaled, this will invoke Open Document" }, "exit": { "name": "Out", - "tooltip": "Signaled after OpenDocument is invoked" + "tooltip": "Signaled after Open Document is invoked" }, "details": { - "name": "OpenDocument" + "name": "Open Document" }, "params": [ { "typeid": "{7114E998-A8B4-519B-9342-A86D1587B4F7}", "details": { - "name": "" + "name": "Source Path" } } ], @@ -99,7 +100,7 @@ { "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}", "details": { - "name": "AZ::Uuid" + "name": "Document Id" } } ] @@ -108,26 +109,26 @@ "key": "CreateDocumentFromFile", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke CreateDocumentFromFile" + "tooltip": "When signaled, this will invoke Create Document From File" }, "exit": { "name": "Out", - "tooltip": "Signaled after CreateDocumentFromFile is invoked" + "tooltip": "Signaled after Create Document From File is invoked" }, "details": { - "name": "CreateDocumentFromFile" + "name": "Create Document From File" }, "params": [ { "typeid": "{7114E998-A8B4-519B-9342-A86D1587B4F7}", "details": { - "name": "" + "name": "Source Path" } }, { "typeid": "{7114E998-A8B4-519B-9342-A86D1587B4F7}", "details": { - "name": "" + "name": "Target Path" } } ], @@ -135,7 +136,7 @@ { "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}", "details": { - "name": "AZ::Uuid" + "name": "Document Id" } } ] @@ -144,20 +145,20 @@ "key": "CloseDocument", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke CloseDocument" + "tooltip": "When signaled, this will invoke Close Document" }, "exit": { "name": "Out", - "tooltip": "Signaled after CloseDocument is invoked" + "tooltip": "Signaled after Close Document is invoked" }, "details": { - "name": "CloseDocument" + "name": "Close Document" }, "params": [ { "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}", "details": { - "name": "AZ::Uuid" + "name": "Document Id" } } ], @@ -165,7 +166,7 @@ { "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", "details": { - "name": "bool" + "name": "Success" } } ] @@ -174,20 +175,20 @@ "key": "CloseAllDocuments", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke CloseAllDocuments" + "tooltip": "When signaled, this will invoke Close All Documents" }, "exit": { "name": "Out", - "tooltip": "Signaled after CloseAllDocuments is invoked" + "tooltip": "Signaled after Close All Documents is invoked" }, "details": { - "name": "CloseAllDocuments" + "name": "Close All Documents" }, "results": [ { "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", "details": { - "name": "bool" + "name": "Success" } } ] @@ -196,20 +197,20 @@ "key": "CloseAllDocumentsExcept", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke CloseAllDocumentsExcept" + "tooltip": "When signaled, this will invoke Close All Documents Except" }, "exit": { "name": "Out", - "tooltip": "Signaled after CloseAllDocumentsExcept is invoked" + "tooltip": "Signaled after Close All Documents Except is invoked" }, "details": { - "name": "CloseAllDocumentsExcept" + "name": "Close All Documents Except" }, "params": [ { "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}", "details": { - "name": "AZ::Uuid" + "name": "Document Id" } } ], @@ -217,7 +218,7 @@ { "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", "details": { - "name": "bool" + "name": "Success" } } ] @@ -226,20 +227,20 @@ "key": "CreateDocument", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke CreateDocument" + "tooltip": "When signaled, this will invoke Create Document" }, "exit": { "name": "Out", - "tooltip": "Signaled after CreateDocument is invoked" + "tooltip": "Signaled after Create Document is invoked" }, "details": { - "name": "CreateDocument" + "name": "Create Document" }, "results": [ { "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}", "details": { - "name": "AZ::Uuid" + "name": "Document Id" } } ] @@ -248,20 +249,20 @@ "key": "DestroyDocument", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke DestroyDocument" + "tooltip": "When signaled, this will invoke Destroy Document" }, "exit": { "name": "Out", - "tooltip": "Signaled after DestroyDocument is invoked" + "tooltip": "Signaled after Destroy Document is invoked" }, "details": { - "name": "DestroyDocument" + "name": "Destroy Document" }, "params": [ { "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}", "details": { - "name": "AZ::Uuid" + "name": "Document Id" } } ], @@ -269,7 +270,7 @@ { "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", "details": { - "name": "bool" + "name": "Success" } } ] @@ -278,26 +279,26 @@ "key": "SaveDocumentAsCopy", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SaveDocumentAsCopy" + "tooltip": "When signaled, this will invoke Save Document As Copy" }, "exit": { "name": "Out", - "tooltip": "Signaled after SaveDocumentAsCopy is invoked" + "tooltip": "Signaled after Save Document As Copy is invoked" }, "details": { - "name": "SaveDocumentAsCopy" + "name": "Save Document As Copy" }, "params": [ { "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}", "details": { - "name": "AZ::Uuid" + "name": "Document Id" } }, { "typeid": "{7114E998-A8B4-519B-9342-A86D1587B4F7}", "details": { - "name": "" + "name": "Target Path" } } ], @@ -305,7 +306,7 @@ { "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", "details": { - "name": "bool" + "name": "Success" } } ] @@ -314,20 +315,20 @@ "key": "SaveAllDocuments", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SaveAllDocuments" + "tooltip": "When signaled, this will invoke Save All Documents" }, "exit": { "name": "Out", - "tooltip": "Signaled after SaveAllDocuments is invoked" + "tooltip": "Signaled after Save All Documents is invoked" }, "details": { - "name": "SaveAllDocuments" + "name": "Save All Documents" }, "results": [ { "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", "details": { - "name": "bool" + "name": "Success" } } ] diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AtomToolsMainWindowFactoryRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AtomToolsMainWindowFactoryRequestBus.names index 87f3925316..9d074c4224 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AtomToolsMainWindowFactoryRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AtomToolsMainWindowFactoryRequestBus.names @@ -5,35 +5,36 @@ "context": "EBusSender", "variant": "", "details": { - "name": "AtomToolsMainWindowFactoryRequestBus" + "name": "Main Window Factory", + "category": "Atom Tools" }, "methods": [ { "key": "CreateMainWindow", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke CreateMainWindow" + "tooltip": "When signaled, this will invoke Create Main Window" }, "exit": { "name": "Out", - "tooltip": "Signaled after CreateMainWindow is invoked" + "tooltip": "Signaled after Create Main Window is invoked" }, "details": { - "name": "CreateMainWindow" + "name": "Create Main Window" } }, { "key": "DestroyMainWindow", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke DestroyMainWindow" + "tooltip": "When signaled, this will invoke Destroy Main Window" }, "exit": { "name": "Out", - "tooltip": "Signaled after DestroyMainWindow is invoked" + "tooltip": "Signaled after Destroy Main Window is invoked" }, "details": { - "name": "DestroyMainWindow" + "name": "Destroy Main Window" } } ] diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AtomToolsMainWindowRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AtomToolsMainWindowRequestBus.names index cb21434ad0..cb6fa04754 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AtomToolsMainWindowRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AtomToolsMainWindowRequestBus.names @@ -5,41 +5,42 @@ "context": "EBusSender", "variant": "", "details": { - "name": "AtomToolsMainWindowRequestBus" + "name": "Main Window", + "category": "Atom Tools" }, "methods": [ { "key": "UnlockViewportRenderTargetSize", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke UnlockViewportRenderTargetSize" + "tooltip": "When signaled, this will invoke Unlock Viewport Render Target Size" }, "exit": { "name": "Out", - "tooltip": "Signaled after UnlockViewportRenderTargetSize is invoked" + "tooltip": "Signaled after Unlock Viewport Render Target Size is invoked" }, "details": { - "name": "UnlockViewportRenderTargetSize" + "name": "Unlock Viewport Render Target Size" } }, { "key": "GetDockWidgetNames", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetDockWidgetNames" + "tooltip": "When signaled, this will invoke Get Dock Widget Names" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetDockWidgetNames is invoked" + "tooltip": "Signaled after Get Dock Widget Names is invoked" }, "details": { - "name": "GetDockWidgetNames" + "name": "Get Dock Widget Names" }, "results": [ { "typeid": "{99DAD0BC-740E-5E82-826B-8FC7968CC02C}", "details": { - "name": "AZStd::vector" + "name": "Widget Names" } } ] @@ -48,26 +49,26 @@ "key": "ResizeViewportRenderTarget", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke ResizeViewportRenderTarget" + "tooltip": "When signaled, this will invoke Resize Viewport Render Target" }, "exit": { "name": "Out", - "tooltip": "Signaled after ResizeViewportRenderTarget is invoked" + "tooltip": "Signaled after Resize Viewport Render Target is invoked" }, "details": { - "name": "ResizeViewportRenderTarget" + "name": "Resize Viewport Render Target" }, "params": [ { "typeid": "{43DA906B-7DEF-4CA8-9790-854106D3F983}", "details": { - "name": "unsigned int" + "name": "Width" } }, { "typeid": "{43DA906B-7DEF-4CA8-9790-854106D3F983}", "details": { - "name": "unsigned int" + "name": "Height" } } ] @@ -76,26 +77,26 @@ "key": "SetDockWidgetVisible", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetDockWidgetVisible" + "tooltip": "When signaled, this will invoke Set Dock Widget Visible" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetDockWidgetVisible is invoked" + "tooltip": "Signaled after Set Dock Widget Visible is invoked" }, "details": { - "name": "SetDockWidgetVisible" + "name": "Set Dock Widget Visible" }, "params": [ { "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", "details": { - "name": "AZStd::string" + "name": "Widget Name" } }, { "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", "details": { - "name": "bool" + "name": "Is Visible" } } ] @@ -104,20 +105,20 @@ "key": "IsDockWidgetVisible", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke IsDockWidgetVisible" + "tooltip": "When signaled, this will invoke Is Dock Widget Visible" }, "exit": { "name": "Out", - "tooltip": "Signaled after IsDockWidgetVisible is invoked" + "tooltip": "Signaled after Is Dock Widget Visible is invoked" }, "details": { - "name": "IsDockWidgetVisible" + "name": "Is Dock Widget Visible" }, "params": [ { "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", "details": { - "name": "AZStd::string" + "name": "Widget Name" } } ], @@ -125,7 +126,7 @@ { "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", "details": { - "name": "bool" + "name": "Is Visible" } } ] @@ -134,26 +135,26 @@ "key": "LockViewportRenderTargetSize", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke LockViewportRenderTargetSize" + "tooltip": "When signaled, this will invoke Lock Viewport Render Target Size" }, "exit": { "name": "Out", - "tooltip": "Signaled after LockViewportRenderTargetSize is invoked" + "tooltip": "Signaled after Lock Viewport Render Target Size is invoked" }, "details": { - "name": "LockViewportRenderTargetSize" + "name": "Lock Viewport Render Target Size" }, "params": [ { "typeid": "{43DA906B-7DEF-4CA8-9790-854106D3F983}", "details": { - "name": "unsigned int" + "name": "Width" } }, { "typeid": "{43DA906B-7DEF-4CA8-9790-854106D3F983}", "details": { - "name": "unsigned int" + "name": "Height" } } ] @@ -162,14 +163,14 @@ "key": "ActivateWindow", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke ActivateWindow" + "tooltip": "When signaled, this will invoke Activate Window" }, "exit": { "name": "Out", - "tooltip": "Signaled after ActivateWindow is invoked" + "tooltip": "Signaled after Activate Window is invoked" }, "details": { - "name": "ActivateWindow" + "name": "Activate Window" } } ] diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/EditorCameraRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/EditorCameraRequestBus.names index b028b96baa..cbc3fcc40e 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/EditorCameraRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/EditorCameraRequestBus.names @@ -5,27 +5,28 @@ "context": "EBusSender", "variant": "", "details": { - "name": "EditorCameraRequestBus" + "name": "Editor Camera", + "category": "Editor" }, "methods": [ { "key": "SetViewFromEntityPerspective", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetViewFromEntityPerspective" + "tooltip": "When signaled, this will invoke Set View From Entity Perspective" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetViewFromEntityPerspective is invoked" + "tooltip": "Signaled after Set View From Entity Perspective is invoked" }, "details": { - "name": "SetViewFromEntityPerspective" + "name": "Set View From Entity Perspective" }, "params": [ { "typeid": "{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}", "details": { - "name": "EntityId", + "name": "Entity Id", "tooltip": "Entity Unique Id" } } @@ -35,27 +36,27 @@ "key": "SetViewAndMovementLockFromEntityPerspective", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetViewAndMovementLockFromEntityPerspective" + "tooltip": "When signaled, this will invoke Set View And Movement Lock From Entity Perspective" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetViewAndMovementLockFromEntityPerspective is invoked" + "tooltip": "Signaled after Set View And Movement Lock From Entity Perspective is invoked" }, "details": { - "name": "SetViewAndMovementLockFromEntityPerspective" + "name": "Set View And Movement Lock From Entity Perspective" }, "params": [ { "typeid": "{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}", "details": { - "name": "EntityId", + "name": "Entity Id", "tooltip": "Entity Unique Id" } }, { "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", "details": { - "name": "bool" + "name": "Lock Camera Movement" } } ] @@ -64,20 +65,20 @@ "key": "GetCurrentViewEntityId", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetCurrentViewEntityId" + "tooltip": "When signaled, this will invoke Get Current View Entity Id" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetCurrentViewEntityId is invoked" + "tooltip": "Signaled after Get Current View Entity Id is invoked" }, "details": { - "name": "GetCurrentViewEntityId" + "name": "Get Current View Entity Id" }, "results": [ { "typeid": "{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}", "details": { - "name": "EntityId", + "name": "Entity Id", "tooltip": "Entity Unique Id" } } @@ -87,20 +88,20 @@ "key": "GetActiveCameraPosition", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetActiveCameraPosition" + "tooltip": "When signaled, this will invoke Get Active Camera Position" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetActiveCameraPosition is invoked" + "tooltip": "Signaled after Get Active Camera Position is invoked" }, "details": { - "name": "GetActiveCameraPosition" + "name": "Get Active Camera Position" }, "params": [ { "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}", "details": { - "name": "Vector3" + "name": "Position" } } ], @@ -108,7 +109,7 @@ { "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", "details": { - "name": "bool" + "name": "Success" } } ] diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/EditorTransformComponentSelectionRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/EditorTransformComponentSelectionRequestBus.names index 178c30bb43..61641cf327 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/EditorTransformComponentSelectionRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/EditorTransformComponentSelectionRequestBus.names @@ -5,27 +5,28 @@ "context": "EBusSender", "variant": "", "details": { - "name": "EditorTransformComponentSelectionRequestBus" + "name": "Editor Transform Component Selection", + "category": "Editor" }, "methods": [ { "key": "CopyTranslationToSelectedEntitiesGroup", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke CopyTranslationToSelectedEntitiesGroup" + "tooltip": "When signaled, this will invoke Copy Translation To Selected Entities Group" }, "exit": { "name": "Out", - "tooltip": "Signaled after CopyTranslationToSelectedEntitiesGroup is invoked" + "tooltip": "Signaled after Copy Translation To Selected Entities Group is invoked" }, "details": { - "name": "CopyTranslationToSelectedEntitiesGroup" + "name": "Copy Translation To Selected Entities Group" }, "params": [ { "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}", "details": { - "name": "Vector3" + "name": "Translation" } } ] @@ -34,14 +35,14 @@ "key": "CopyOrientationToSelectedEntitiesIndividual", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke CopyOrientationToSelectedEntitiesIndividual" + "tooltip": "When signaled, this will invoke Copy Orientation To Selected Entities Individual" }, "exit": { "name": "Out", - "tooltip": "Signaled after CopyOrientationToSelectedEntitiesIndividual is invoked" + "tooltip": "Signaled after Copy Orientation To Selected Entities Individual is invoked" }, "details": { - "name": "CopyOrientationToSelectedEntitiesIndividual" + "name": "Copy Orientation To Selected Entities Individual" }, "params": [ { @@ -56,14 +57,14 @@ "key": "CopyOrientationToSelectedEntitiesGroup", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke CopyOrientationToSelectedEntitiesGroup" + "tooltip": "When signaled, this will invoke Copy Orientation To Selected Entities Group" }, "exit": { "name": "Out", - "tooltip": "Signaled after CopyOrientationToSelectedEntitiesGroup is invoked" + "tooltip": "Signaled after Copy Orientation To Selected Entities Group is invoked" }, "details": { - "name": "CopyOrientationToSelectedEntitiesGroup" + "name": "Copy Orientation To Selected Entities Group" }, "params": [ { @@ -78,20 +79,20 @@ "key": "CopyTranslationToSelectedEntitiesIndividual", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke CopyTranslationToSelectedEntitiesIndividual" + "tooltip": "When signaled, this will invoke Copy Translation To Selected Entities Individual" }, "exit": { "name": "Out", - "tooltip": "Signaled after CopyTranslationToSelectedEntitiesIndividual is invoked" + "tooltip": "Signaled after Copy Translation To Selected Entities Individual is invoked" }, "details": { - "name": "CopyTranslationToSelectedEntitiesIndividual" + "name": "Copy Translation To Selected Entities Individual" }, "params": [ { "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}", "details": { - "name": "Vector3" + "name": "Translation" } } ] @@ -100,14 +101,14 @@ "key": "CopyScaleToSelectedEntitiesIndividualLocal", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke CopyScaleToSelectedEntitiesIndividualLocal" + "tooltip": "When signaled, this will invoke Copy Scale To Selected Entities Individual Local" }, "exit": { "name": "Out", - "tooltip": "Signaled after CopyScaleToSelectedEntitiesIndividualLocal is invoked" + "tooltip": "Signaled after Copy Scale To Selected Entities Individual Local is invoked" }, "details": { - "name": "CopyScaleToSelectedEntitiesIndividualLocal" + "name": "Copy Scale To Selected Entities Individual Local" }, "params": [ { @@ -122,20 +123,20 @@ "key": "OverrideManipulatorTranslation", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke OverrideManipulatorTranslation" + "tooltip": "When signaled, this will invoke Override Manipulator Translation" }, "exit": { "name": "Out", - "tooltip": "Signaled after OverrideManipulatorTranslation is invoked" + "tooltip": "Signaled after Override Manipulator Translation is invoked" }, "details": { - "name": "OverrideManipulatorTranslation" + "name": "Override Manipulator Translation" }, "params": [ { "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}", "details": { - "name": "Vector3" + "name": "Vector 3" } } ] @@ -144,14 +145,14 @@ "key": "RefreshManipulators", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke RefreshManipulators" + "tooltip": "When signaled, this will invoke Refresh Manipulators" }, "exit": { "name": "Out", - "tooltip": "Signaled after RefreshManipulators is invoked" + "tooltip": "Signaled after Refresh Manipulators is invoked" }, "details": { - "name": "RefreshManipulators" + "name": "Refresh Manipulators" }, "params": [ { @@ -166,14 +167,14 @@ "key": "OverrideManipulatorOrientation", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke OverrideManipulatorOrientation" + "tooltip": "When signaled, this will invoke Override Manipulator Orientation" }, "exit": { "name": "Out", - "tooltip": "Signaled after OverrideManipulatorOrientation is invoked" + "tooltip": "Signaled after Override Manipulator Orientation is invoked" }, "details": { - "name": "OverrideManipulatorOrientation" + "name": "Override Manipulator Orientation" }, "params": [ { @@ -188,14 +189,14 @@ "key": "GetTransformMode", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetTransformMode" + "tooltip": "When signaled, this will invoke Get Transform Mode" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetTransformMode is invoked" + "tooltip": "Signaled after Get Transform Mode is invoked" }, "details": { - "name": "GetTransformMode" + "name": "Get Transform Mode" }, "results": [ { @@ -210,14 +211,14 @@ "key": "CopyScaleToSelectedEntitiesIndividualWorld", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke CopyScaleToSelectedEntitiesIndividualWorld" + "tooltip": "When signaled, this will invoke Copy Scale To Selected Entities Individual World" }, "exit": { "name": "Out", - "tooltip": "Signaled after CopyScaleToSelectedEntitiesIndividualWorld is invoked" + "tooltip": "Signaled after Copy Scale To Selected Entities Individual World is invoked" }, "details": { - "name": "CopyScaleToSelectedEntitiesIndividualWorld" + "name": "Copy Scale To Selected Entities Individual World" }, "params": [ { @@ -232,14 +233,14 @@ "key": "SetTransformMode", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetTransformMode" + "tooltip": "When signaled, this will invoke Set Transform Mode" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetTransformMode is invoked" + "tooltip": "Signaled after Set Transform Mode is invoked" }, "details": { - "name": "SetTransformMode" + "name": "Set Transform Mode" }, "params": [ { @@ -254,28 +255,28 @@ "key": "ResetTranslationForSelectedEntitiesLocal", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke ResetTranslationForSelectedEntitiesLocal" + "tooltip": "When signaled, this will invoke Reset Translation For Selected Entities Local" }, "exit": { "name": "Out", - "tooltip": "Signaled after ResetTranslationForSelectedEntitiesLocal is invoked" + "tooltip": "Signaled after Reset Translation For Selected Entities Local is invoked" }, "details": { - "name": "ResetTranslationForSelectedEntitiesLocal" + "name": "Reset Translation For Selected Entities Local" } }, { "key": "ResetOrientationForSelectedEntitiesLocal", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke ResetOrientationForSelectedEntitiesLocal" + "tooltip": "When signaled, this will invoke Reset Orientation For Selected Entities Local" }, "exit": { "name": "Out", - "tooltip": "Signaled after ResetOrientationForSelectedEntitiesLocal is invoked" + "tooltip": "Signaled after Reset Orientation For Selected Entities Local is invoked" }, "details": { - "name": "ResetOrientationForSelectedEntitiesLocal" + "name": "Reset Orientation For Selected Entities Local" } } ] diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/GameEntityContextRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/GameEntityContextRequestBus.names index 4a93df4eb1..bb38d2256a 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/GameEntityContextRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/GameEntityContextRequestBus.names @@ -5,8 +5,8 @@ "context": "EBusSender", "variant": "", "details": { - "name": "GameEntityContextRequestBus", - "category": "Entity" + "name": "Game Entity Context", + "category": "Game Entity" }, "methods": [ { @@ -26,7 +26,7 @@ { "typeid": "{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}", "details": { - "name": "EntityId", + "name": "Entity Id", "tooltip": "Entity Unique Id" } } @@ -49,7 +49,7 @@ { "typeid": "{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}", "details": { - "name": "EntityId", + "name": "Entity Id", "tooltip": "Entity Unique Id" } } @@ -58,7 +58,7 @@ { "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", "details": { - "name": "AZStd::string" + "name": "Name" } } ] @@ -80,7 +80,7 @@ { "typeid": "{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}", "details": { - "name": "EntityId", + "name": "Entity Id", "tooltip": "Entity Unique Id" } } @@ -103,7 +103,7 @@ { "typeid": "{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}", "details": { - "name": "EntityId", + "name": "Entity Id", "tooltip": "Entity Unique Id" } } @@ -126,7 +126,7 @@ { "typeid": "{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}", "details": { - "name": "EntityId", + "name": "Entity Id", "tooltip": "Entity Unique Id" } } @@ -136,20 +136,20 @@ "key": "CreateGameEntity", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke CreateGameEntity" + "tooltip": "When signaled, this will invoke Create Game Entity" }, "exit": { "name": "Out", - "tooltip": "Signaled after CreateGameEntity is invoked" + "tooltip": "Signaled after Create Game Entity is invoked" }, "details": { - "name": "CreateGameEntity" + "name": "Create Game Entity" }, "params": [ { "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", "details": { - "name": "char" + "name": "Name" } } ], diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/NonUniformScaleRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/NonUniformScaleRequestBus.names index 7387063040..dee0920cf2 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/NonUniformScaleRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/NonUniformScaleRequestBus.names @@ -5,8 +5,7 @@ "context": "EBusSender", "variant": "", "details": { - "name": "NonUniformScaleRequestBus", - "category": "Entity" + "name": "Non Uniform Scale" }, "methods": [ { @@ -26,7 +25,7 @@ { "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}", "details": { - "name": "Vector3" + "name": "Scale" } } ] @@ -48,7 +47,7 @@ { "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}", "details": { - "name": "Non-uniform Scale" + "name": "Scale" } } ] diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/TransformBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/TransformBus.names index 29c14f4961..9ee4d4d58f 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/TransformBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/TransformBus.names @@ -5,7 +5,7 @@ "context": "EBusSender", "variant": "", "details": { - "name": "TransformBus", + "name": "Transform", "category": "Entity" }, "methods": [ @@ -13,20 +13,20 @@ "key": "SetLocalUniformScale", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetLocalUniformScale" + "tooltip": "When signaled, this will invoke Set Local Uniform Scale" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetLocalUniformScale is invoked" + "tooltip": "Signaled after Set Local Uniform Scale is invoked" }, "details": { - "name": "SetLocalUniformScale" + "name": "Set Local Uniform Scale" }, "params": [ { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", "details": { - "name": "float" + "name": "Local Uniform Scale" } } ] @@ -42,15 +42,13 @@ "tooltip": "Signaled after Set Local Rotation Quaternion is invoked" }, "details": { - "name": "Set Local Rotation Quaternion", - "tooltip": "Sets the entity's rotation in local space using a quaternion" + "name": "Set Local Rotation Quaternion" }, "params": [ { "typeid": "{73103120-3DD3-4873-BAB3-9713FA2804FB}", "details": { - "name": "Rotation", - "tooltip": "The quaternion to rotate around" + "name": "Quaternion" } } ] @@ -66,14 +64,13 @@ "tooltip": "Signaled after Get Local Rotation is invoked" }, "details": { - "name": "Get Local Rotation", - "tooltip": "Gets the entity's rotation in radians in local space" + "name": "Get Local Rotation" }, "results": [ { "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}", "details": { - "name": "Vector3" + "name": "Angles (Radians)" } } ] @@ -105,21 +102,20 @@ "key": "GetEntityAndAllDescendants", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke Get Entity and Descendants" + "tooltip": "When signaled, this will invoke Get Entity And All Descendants" }, "exit": { "name": "Out", - "tooltip": "Signaled after Get Entity and Descendants is invoked" + "tooltip": "Signaled after Get Entity And All Descendants is invoked" }, "details": { - "name": "Get Entity and Descendants", - "tooltip": "Returns the EntityID of the entity, the entity's children, the children's children, and so on" + "name": "Get Entity And All Descendants" }, "results": [ { "typeid": "{4841CFF0-7A5C-519C-BD16-D3625E99605E}", "details": { - "name": "AZStd::vector" + "name": "Entity and Descendants" } } ] @@ -135,15 +131,13 @@ "tooltip": "Signaled after Set Local Z is invoked" }, "details": { - "name": "Set Local Z", - "tooltip": "Gets the entity's Z coordinate in local space" + "name": "Set Local Z" }, "params": [ { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", "details": { - "name": "Z Translation", - "tooltip": "The entity's Z coordinate in local space" + "name": "Z" } } ] @@ -152,21 +146,20 @@ "key": "GetAllDescendants", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke Get Descendants" + "tooltip": "When signaled, this will invoke Get All Descendants" }, "exit": { "name": "Out", - "tooltip": "Signaled after Get Descendants is invoked" + "tooltip": "Signaled after Get All Descendants is invoked" }, "details": { - "name": "Get Descendants", - "tooltip": "Returns the entity's children, the children's children, and so on" + "name": "Get All Descendants" }, "results": [ { "typeid": "{4841CFF0-7A5C-519C-BD16-D3625E99605E}", "details": { - "name": "AZStd::vector" + "name": "Descendants" } } ] @@ -175,29 +168,26 @@ "key": "GetLocalAndWorld", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke Get Local and World" + "tooltip": "When signaled, this will invoke Get Local And World" }, "exit": { "name": "Out", - "tooltip": "Signaled after Get Local and World is invoked" + "tooltip": "Signaled after Get Local And World is invoked" }, "details": { - "name": "Get Local and World", - "tooltip": "Retrieves the entity's local and world transforms" + "name": "Get Local And World Transforms" }, "params": [ { "typeid": "{5D9958E9-9F1E-4985-B532-FFFDE75FEDFD}", "details": { - "name": "Local Transform", - "tooltip": "A reference to a transform that represents the entity's position relative to its parent entity" + "name": "Local" } }, { "typeid": "{5D9958E9-9F1E-4985-B532-FFFDE75FEDFD}", "details": { - "name": "Global Transform", - "tooltip": "A reference to a transform that represents the entity's position within the world" + "name": "World" } } ] @@ -213,15 +203,13 @@ "tooltip": "Signaled after Rotate Around Local Z is invoked" }, "details": { - "name": "Rotate Around Local Z", - "tooltip": "Rotates the entity around the Z axis in local space" + "name": "Rotate Around Local Z" }, "params": [ { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", "details": { - "name": "Z Rotation", - "tooltip": "The angle, in radians, to rotate the entity around the Z axis in local space" + "name": "Angle (Radians)" } } ] @@ -237,8 +225,7 @@ "tooltip": "Signaled after Get World Rotation Quaternion is invoked" }, "details": { - "name": "Get World Rotation Quaternion", - "tooltip": "Gets the entity's rotation in quaternion in world space" + "name": "Get World Rotation Quaternion" }, "results": [ { @@ -260,15 +247,13 @@ "tooltip": "Signaled after Rotate Around Local X is invoked" }, "details": { - "name": "Rotate Around Local X", - "tooltip": "Rotates the entity around the X axis in local space" + "name": "Rotate Around Local X" }, "params": [ { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", "details": { - "name": "X Rotation", - "tooltip": "The angle, in radians, to rotate the entity around the X axis in local space" + "name": "Angle (Radians)" } } ] @@ -284,15 +269,14 @@ "tooltip": "Signaled after Set Parent is invoked" }, "details": { - "name": "Set Parent", - "tooltip": "Sets the entity's parent entity" + "name": "Set Parent" }, "params": [ { "typeid": "{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}", "details": { "name": "Parent", - "tooltip": "The ID of the entity to set as the parent" + "tooltip": "Entity Unique Id" } } ] @@ -308,14 +292,13 @@ "tooltip": "Signaled after Get Local Z is invoked" }, "details": { - "name": "Get Local Z", - "tooltip": "Gets the entity's Z coordinate in local space" + "name": "Get Local Z" }, "results": [ { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", "details": { - "name": "float" + "name": "Z" } } ] @@ -328,18 +311,16 @@ }, "exit": { "name": "Out", - "tooltip": "Signaled after Set Local Rotation is invoked" + "tooltip": "Signaled after SetLocalRotation is invoked" }, "details": { - "name": "Set Local Rotation", - "tooltip": "Sets the entity's rotation in local space using a composition of rotations around the three axes" + "name": "Set Local Rotation" }, "params": [ { "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}", "details": { - "name": "Rotation", - "tooltip": "A three-dimensional vector, containing Euler angles in radians, that specifies a rotation around each axis" + "name": "Euler Angles (Radians)" } } ] @@ -355,15 +336,13 @@ "tooltip": "Signaled after Set Local X is invoked" }, "details": { - "name": "Set Local X", - "tooltip": "Sets the entity's X coordinate in local space" + "name": "Set Local X" }, "params": [ { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", "details": { - "name": "X Translation", - "tooltip": "A new value for the entity's X coordinate in local space" + "name": "X" } } ] @@ -379,8 +358,7 @@ "tooltip": "Signaled after Get Local Rotation Quaternion is invoked" }, "details": { - "name": "Get Local Rotation Quaternion", - "tooltip": "Gets the quaternion representing the entity's rotation in local space" + "name": "Get Local Rotation Quaternion" }, "results": [ { @@ -402,14 +380,13 @@ "tooltip": "Signaled after Get World X is invoked" }, "details": { - "name": "Get World X", - "tooltip": "Gets the entity's X coordinate in world space" + "name": "Get World X" }, "results": [ { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", "details": { - "name": "float" + "name": "X" } } ] @@ -425,15 +402,13 @@ "tooltip": "Signaled after Set World Translation is invoked" }, "details": { - "name": "Set World Translation", - "tooltip": "Sets the entity's world space translation, which represents how to move the entity to a new position within the world" + "name": "Set World Translation" }, "params": [ { "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}", "details": { - "name": "Translation", - "tooltip": "A three-dimensional translation vector" + "name": "World Translation" } } ] @@ -449,15 +424,13 @@ "tooltip": "Signaled after Move Entity is invoked" }, "details": { - "name": "Move Entity", - "tooltip": "Moves the entity within world space" + "name": "Move Entity" }, "params": [ { "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}", "details": { - "name": "Direction", - "tooltip": "A three-dimensional vector that contains the offset to apply to the entity" + "name": "Offset" } } ] @@ -473,14 +446,13 @@ "tooltip": "Signaled after Get Children is invoked" }, "details": { - "name": "Get Children", - "tooltip": "Returns the EntityIDs of the entity's immediate children" + "name": "Get Children" }, "results": [ { "typeid": "{4841CFF0-7A5C-519C-BD16-D3625E99605E}", "details": { - "name": "AZStd::vector" + "name": "Children" } } ] @@ -496,15 +468,14 @@ "tooltip": "Signaled after Set Parent Relative is invoked" }, "details": { - "name": "Set Parent Relative", - "tooltip": "Sets the entity's parent entity, moves the transform relative to the parent entity, and notifies all listeners" + "name": "Set Parent Relative" }, "params": [ { "typeid": "{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}", "details": { "name": "Parent", - "tooltip": "The ID of the entity to set as the parent" + "tooltip": "Entity Unique Id" } } ] @@ -520,15 +491,13 @@ "tooltip": "Signaled after Set World Transform is invoked" }, "details": { - "name": "Set World Transform", - "tooltip": "Sets the world transform and notifies all listeners" + "name": "Set World Transform" }, "params": [ { "typeid": "{5D9958E9-9F1E-4985-B532-FFFDE75FEDFD}", "details": { - "name": "Transform", - "tooltip": "A reference to a transform for positioning the entity within the world" + "name": "Transform" } } ] @@ -537,14 +506,14 @@ "key": "SetWorldRotationQuaternion", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetWorldRotationQuaternion" + "tooltip": "When signaled, this will invoke Set World Rotation Quaternion" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetWorldRotationQuaternion is invoked" + "tooltip": "Signaled after Set World Rotation Quaternion is invoked" }, "details": { - "name": "SetWorldRotationQuaternion" + "name": "Set World Rotation Quaternion" }, "params": [ { @@ -566,15 +535,13 @@ "tooltip": "Signaled after Set World X is invoked" }, "details": { - "name": "Set World X", - "tooltip": "Sets the entity's X coordinate in world space" + "name": "Set World X" }, "params": [ { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", "details": { - "name": "X Translation", - "tooltip": "A new value for the entity's X coordinate in world space" + "name": "X" } } ] @@ -590,14 +557,13 @@ "tooltip": "Signaled after Get World Y is invoked" }, "details": { - "name": "Get World Y", - "tooltip": "Gets the entity's Y coordinate in world space" + "name": "Get World Y" }, "results": [ { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", "details": { - "name": "float" + "name": "Y" } } ] @@ -606,20 +572,20 @@ "key": "GetLocalUniformScale", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetLocalUniformScale" + "tooltip": "When signaled, this will invoke Get Local Uniform Scale" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetLocalUniformScale is invoked" + "tooltip": "Signaled after Get Local Uniform Scale is invoked" }, "details": { - "name": "GetLocalUniformScale" + "name": "Get Local Uniform Scale" }, "results": [ { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", "details": { - "name": "float" + "name": "Uniform Scale" } } ] @@ -635,15 +601,13 @@ "tooltip": "Signaled after Set World Z is invoked" }, "details": { - "name": "Set World Z", - "tooltip": "Sets the entity's Z coordinate in world space" + "name": "Set World Z" }, "params": [ { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", "details": { - "name": "Z Translation", - "tooltip": "A new value for the entity's Z coordinate in world space" + "name": "Z" } } ] @@ -659,15 +623,13 @@ "tooltip": "Signaled after Set Local Transform is invoked" }, "details": { - "name": "Set Local Transform", - "tooltip": "Sets the entity's local transform and notifies all listeners" + "name": "Set Local Transform" }, "params": [ { "typeid": "{5D9958E9-9F1E-4985-B532-FFFDE75FEDFD}", "details": { - "name": "Transform", - "tooltip": "A reference to a transform for positioning the entity relative to its parent entity" + "name": "Transform" } } ] @@ -683,15 +645,13 @@ "tooltip": "Signaled after Set Local Translation is invoked" }, "details": { - "name": "Set Local Translation", - "tooltip": "Sets the entity's local space translation, which represents how to move the entity to a new position relative to its parent" + "name": "Set Local Translation" }, "params": [ { "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}", "details": { - "name": "Translation", - "tooltip": "A three-dimensional translation vector" + "name": "Translation" } } ] @@ -707,14 +667,13 @@ "tooltip": "Signaled after Get Local Scale is invoked" }, "details": { - "name": "Get Local Scale", - "tooltip": "Gets the scale of the entity along each axis in local space" + "name": "Get Local Scale" }, "results": [ { "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}", "details": { - "name": "Vector3" + "name": "Scale" } } ] @@ -730,15 +689,13 @@ "tooltip": "Signaled after Set World Y is invoked" }, "details": { - "name": "Set World Y", - "tooltip": "Sets the entity's Y coordinate in world space" + "name": "Set World Y" }, "params": [ { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", "details": { - "name": "Y Translation", - "tooltip": "A new value for the entity's Y coordinate in world space" + "name": "Y" } } ] @@ -754,15 +711,13 @@ "tooltip": "Signaled after Rotate Around Local Y is invoked" }, "details": { - "name": "Rotate Around Local Y", - "tooltip": "Rotates the entity around the Y axis in local space" + "name": "Rotate Around Local Y" }, "params": [ { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", "details": { - "name": "Y Rotation", - "tooltip": "The angle, in radians, to rotate the entity around the Y axis in local space" + "name": "Euler Angle (Radians)" } } ] @@ -778,14 +733,13 @@ "tooltip": "Signaled after Get Local Translation is invoked" }, "details": { - "name": "Get Local Translation", - "tooltip": "Gets the entity's local space translation" + "name": "Get Local Translation" }, "results": [ { "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}", "details": { - "name": "Vector3" + "name": "Translation" } } ] @@ -801,14 +755,14 @@ "tooltip": "Signaled after Get World Rotation is invoked" }, "details": { - "name": "Get World Rotation", - "tooltip": "Gets the entity's rotation in radians in world space" + "name": "Get World Rotation" }, "results": [ { "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}", "details": { - "name": "Vector3" + "name": "Euler Angles (Radians)", + "tooltip": "Euler angles (Pitch, Yaw, Roll), in radians" } } ] @@ -824,14 +778,13 @@ "tooltip": "Signaled after Get World Z is invoked" }, "details": { - "name": "Get World Z", - "tooltip": "Gets the entity's Z coordinate in world space" + "name": "Get World Z" }, "results": [ { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", "details": { - "name": "float" + "name": "Z" } } ] @@ -847,14 +800,13 @@ "tooltip": "Signaled after Get Local Y is invoked" }, "details": { - "name": "Get Local Y", - "tooltip": "Gets the entity's Y coordinate in local space" + "name": "Get Local Y" }, "results": [ { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", "details": { - "name": "float" + "name": "Y" } } ] @@ -870,14 +822,13 @@ "tooltip": "Signaled after Get World Translation is invoked" }, "details": { - "name": "Get World Translation", - "tooltip": "Gets the entity's world space translation" + "name": "Get World Translation" }, "results": [ { "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}", "details": { - "name": "Vector3" + "name": "Translation" } } ] @@ -893,15 +844,13 @@ "tooltip": "Signaled after Set Local Y is invoked" }, "details": { - "name": "Set Local Y", - "tooltip": "Sets the entity's Y coordinate in local space" + "name": "Set Local Y" }, "params": [ { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", "details": { - "name": "Y Position", - "tooltip": "A new value for the entity's Y coordinate in local space" + "name": "Y" } } ] @@ -917,14 +866,13 @@ "tooltip": "Signaled after Get Local X is invoked" }, "details": { - "name": "Get Local X", - "tooltip": "Gets the entity's X coordinate in local space" + "name": "Get Local X" }, "results": [ { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", "details": { - "name": "float" + "name": "X" } } ] @@ -940,8 +888,7 @@ "tooltip": "Signaled after Get World Transform is invoked" }, "details": { - "name": "Get World Transform", - "tooltip": "Returns the entity's world transform, including the parent transform" + "name": "Get World Transform" }, "results": [ { @@ -956,21 +903,20 @@ "key": "GetParentId", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke Get Parent ID" + "tooltip": "When signaled, this will invoke Get Parent Id" }, "exit": { "name": "Out", - "tooltip": "Signaled after Get Parent ID is invoked" + "tooltip": "Signaled after Get Parent Id is invoked" }, "details": { - "name": "Get Parent ID", - "tooltip": "Returns the EntityID of the entity's parent" + "name": "Get Parent Id" }, "results": [ { "typeid": "{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}", "details": { - "name": "EntityId", + "name": "Parent Id", "tooltip": "Entity Unique Id" } } @@ -980,21 +926,20 @@ "key": "IsStaticTransform", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke Is Static" + "tooltip": "When signaled, this will invoke Is Static Transform" }, "exit": { "name": "Out", - "tooltip": "Signaled after Is Static is invoked" + "tooltip": "Signaled after Is Static Transform is invoked" }, "details": { - "name": "Is Static", - "tooltip": "Returns whether the transform is static" + "name": "Is Static Transform" }, "results": [ { "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", "details": { - "name": "bool" + "name": "Is Static Transform" } } ] diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/EntityEntity_GetEntityForward.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/EntityEntity_GetEntityForward.names index 7830b046f7..3b3b996f45 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/EntityEntity_GetEntityForward.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/EntityEntity_GetEntityForward.names @@ -5,10 +5,9 @@ "context": "ScriptCanvas::Node", "variant": "", "details": { - "name": "GetEntityForward", + "name": "Get Entity Forward", "category": "Entity/Entity", - "tooltip": "returns the forward direction vector from the specified entity' world transform, scaled by a given value (O3DE uses Z up, right handed)", - "subtitle": "Entity" + "tooltip": "Returns the forward direction vector from the specified entity' world transform, scaled by a given value (O3DE uses Z up, right handed)" }, "slots": [ { @@ -24,21 +23,21 @@ } }, { - "key": "DataInput_EntityID: EntityId", + "key": "DataInput_EntityId", "details": { - "name": "EntityID: EntityId" + "name": "EntityId" } }, { - "key": "DataInput_Number: Scale", + "key": "DataInput_Scale", "details": { - "name": "Number: Scale" + "name": "Scale" } }, { - "key": "DataOutput_Result: Vector3", + "key": "DataOutput_Result", "details": { - "name": "Result: Vector3" + "name": "Result" } } ] diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/EntityEntity_GetEntityRight.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/EntityEntity_GetEntityRight.names index 9e990f6214..f2888839db 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/EntityEntity_GetEntityRight.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/EntityEntity_GetEntityRight.names @@ -5,10 +5,9 @@ "context": "ScriptCanvas::Node", "variant": "", "details": { - "name": "GetEntityRight", + "name": "Get Entity Right", "category": "Entity/Entity", - "tooltip": "returns the right direction vector from the specified entity's world transform, scaled by a given value (O3DE uses Z up, right handed)", - "subtitle": "Entity" + "tooltip": "Returns the right direction vector from the specified entity's world transform, scaled by a given value (O3DE uses Z up, right handed)" }, "slots": [ { @@ -24,21 +23,21 @@ } }, { - "key": "DataInput_EntityID: EntityId", + "key": "DataInput_EntityId", "details": { - "name": "EntityID: EntityId" + "name": "EntityId" } }, { - "key": "DataInput_Number: Scale", + "key": "DataInput_Scale", "details": { - "name": "Number: Scale" + "name": "Scale" } }, { - "key": "DataOutput_Result: Vector3", + "key": "DataOutput_Result", "details": { - "name": "Result: Vector3" + "name": "Result" } } ] diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/EntityEntity_GetEntityUp.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/EntityEntity_GetEntityUp.names index b9e6261532..d42ab7e908 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/EntityEntity_GetEntityUp.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/EntityEntity_GetEntityUp.names @@ -5,10 +5,9 @@ "context": "ScriptCanvas::Node", "variant": "", "details": { - "name": "GetEntityUp", + "name": "Get Entity Up", "category": "Entity/Entity", - "tooltip": "returns the up direction vector from the specified entity's world transform, scaled by a given value (O3DE uses Z up, right handed)", - "subtitle": "Entity" + "tooltip": "Returns the up direction vector from the specified entity's world transform, scaled by a given value (O3DE uses Z up, right handed)" }, "slots": [ { @@ -24,21 +23,21 @@ } }, { - "key": "DataInput_EntityID: EntityId", + "key": "DataInput_EntityId", "details": { - "name": "EntityID: EntityId" + "name": "EntityId" } }, { - "key": "DataInput_Number: Scale", + "key": "DataInput_Scale", "details": { - "name": "Number: Scale" + "name": "Scale" } }, { - "key": "DataOutput_Result: Vector3", + "key": "DataOutput_Result", "details": { - "name": "Result: Vector3" + "name": "Result" } } ] diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/EntityEntity_IsActive.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/EntityEntity_IsActive.names index 4ae41d7b6d..f43c9385e7 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/EntityEntity_IsActive.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/EntityEntity_IsActive.names @@ -5,10 +5,9 @@ "context": "ScriptCanvas::Node", "variant": "", "details": { - "name": "IsActive", + "name": "Is Active", "category": "Entity/Entity", - "tooltip": "returns true if entity with the provided Id is valid and active.", - "subtitle": "Entity" + "tooltip": "Returns true if entity with the provided Id is valid and active." }, "slots": [ { @@ -24,15 +23,15 @@ } }, { - "key": "DataInput_EntityID: Entity Id", + "key": "DataInput_Entity Id", "details": { - "name": "EntityID: Entity Id" + "name": "Entity Id" } }, { - "key": "DataOutput_Result: Boolean", + "key": "DataOutput_Result", "details": { - "name": "Result: Boolean" + "name": "Result" } } ] diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/EntityEntity_IsValid.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/EntityEntity_IsValid.names index 67ca271f59..19d8fab52e 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/EntityEntity_IsValid.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/EntityEntity_IsValid.names @@ -5,10 +5,9 @@ "context": "ScriptCanvas::Node", "variant": "", "details": { - "name": "IsValid", + "name": "Is Valid", "category": "Entity/Entity", - "tooltip": "returns true if Source is valid, else false", - "subtitle": "Entity" + "tooltip": "Returns true if Source is valid, else false" }, "slots": [ { @@ -24,15 +23,15 @@ } }, { - "key": "DataInput_EntityID: Source", + "key": "DataInput_Source", "details": { - "name": "EntityID: Source" + "name": "Source" } }, { - "key": "DataOutput_Result: Boolean", + "key": "DataOutput_Result", "details": { - "name": "Result: Boolean" + "name": "Result" } } ] diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/EntityEntity_ToString.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/EntityEntity_ToString.names index f8048d0839..2d9f1e3c77 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/EntityEntity_ToString.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/EntityEntity_ToString.names @@ -5,10 +5,9 @@ "context": "ScriptCanvas::Node", "variant": "", "details": { - "name": "ToString", + "name": "To String", "category": "Entity/Entity", - "tooltip": "returns a string representation of Source", - "subtitle": "Entity" + "tooltip": "Returns a string representation of Source" }, "slots": [ { @@ -24,15 +23,15 @@ } }, { - "key": "DataInput_EntityID: Source", + "key": "DataInput_Source", "details": { - "name": "EntityID: Source" + "name": "Source" } }, { - "key": "DataOutput_Result: String", + "key": "DataOutput_Result", "details": { - "name": "Result: String" + "name": "Result" } } ] diff --git a/Gems/ScriptCanvas/Code/Tools/TranslationGeneration.cpp b/Gems/ScriptCanvas/Code/Tools/TranslationGeneration.cpp index c374f6e5c2..c0a0f41e95 100644 --- a/Gems/ScriptCanvas/Code/Tools/TranslationGeneration.cpp +++ b/Gems/ScriptCanvas/Code/Tools/TranslationGeneration.cpp @@ -22,6 +22,7 @@ #include #include #include +#include #include @@ -87,6 +88,8 @@ namespace ScriptCanvasEditorTools entry.m_details.m_name = prettyName; } + SplitCamelCase(entry.m_details.m_name); + for (auto event : behaviorEBus->m_events) { const AZ::BehaviorEBusEventSender& ebusSender = event.second; @@ -112,6 +115,8 @@ namespace ScriptCanvasEditorTools eventEntry.m_details.m_name = prettyName.empty() ? eventName : prettyName; eventEntry.m_details.m_tooltip = Helpers::ReadStringAttribute(event.second.m_attributes, AZ::Script::Attributes::ToolTip); + SplitCamelCase(eventEntry.m_details.m_name); + eventEntry.m_entry.m_name = "In"; eventEntry.m_entry.m_tooltip = AZStd::string::format("When signaled, this will invoke %s", eventEntry.m_details.m_name.c_str()); eventEntry.m_exit.m_name = "Out"; @@ -141,6 +146,8 @@ namespace ScriptCanvasEditorTools argument.m_typeId = argumentType.ToString(); + SplitCamelCase(argument.m_details.m_name); + eventEntry.m_arguments.push_back(argument); } @@ -160,6 +167,8 @@ namespace ScriptCanvasEditorTools result.m_typeId = resultType.ToString(); + SplitCamelCase(result.m_details.m_name); + eventEntry.m_results.push_back(result); } @@ -229,6 +238,8 @@ namespace ScriptCanvasEditorTools details.m_category = Helpers::GetStringAttribute(behaviorClass, AZ::Script::Attributes::Category); details.m_tooltip = Helpers::GetStringAttribute(behaviorClass, AZ::Script::Attributes::ToolTip); + SplitCamelCase(details.m_name); + if (!behaviorClass->m_methods.empty()) { for (const auto& methodPair : behaviorClass->m_methods) @@ -246,10 +257,14 @@ namespace ScriptCanvasEditorTools methodEntry.m_details.m_tooltip = ""; methodEntry.m_details.m_name = methodPair.second->m_name; + AZStd::string prefix = className + "::"; + AZ::StringFunc::Replace(methodEntry.m_details.m_name, prefix.c_str(), ""); + SplitCamelCase(methodEntry.m_details.m_name); + methodEntry.m_entry.m_name = "In"; - methodEntry.m_entry.m_tooltip = AZStd::string::format("When signaled, this will invoke %s", cleanName.c_str()); + methodEntry.m_entry.m_tooltip = AZStd::string::format("When signaled, this will invoke %s", methodEntry.m_details.m_name.c_str()); methodEntry.m_exit.m_name = "Out"; - methodEntry.m_exit.m_tooltip = AZStd::string::format("Signaled after %s is invoked", cleanName.c_str()); + methodEntry.m_exit.m_tooltip = AZStd::string::format("Signaled after %s is invoked", methodEntry.m_details.m_name.c_str()); if (!Helpers::MethodHasAttribute(behaviorMethod, AZ::ScriptCanvasAttributes::FloatingFunction)) { @@ -260,11 +275,6 @@ namespace ScriptCanvasEditorTools methodEntry.m_details.m_category = Helpers::ReadStringAttribute(behaviorMethod->m_attributes, AZ::Script::Attributes::Category); } - if (methodEntry.m_details.m_category.empty()) - { - methodEntry.m_details.m_category = "Other"; - } - // Arguments (Input Slots) if (behaviorMethod->GetNumArguments() > 0) { @@ -285,6 +295,8 @@ namespace ScriptCanvasEditorTools argument.m_details.m_category = ""; argument.m_details.m_tooltip = argumentDescription; + SplitCamelCase(argument.m_details.m_name); + methodEntry.m_arguments.push_back(argument); } } @@ -305,6 +317,8 @@ namespace ScriptCanvasEditorTools result.m_details.m_name = resultParameter->m_name; result.m_details.m_tooltip = resultDescription; + SplitCamelCase(result.m_details.m_name); + methodEntry.m_results.push_back(result); } @@ -380,6 +394,8 @@ namespace ScriptCanvasEditorTools entry.m_context = "AZEventHandler"; entry.m_details.m_name = azEventEntry.m_eventName; + SplitCamelCase(entry.m_details.m_name); + for (const ScriptCanvas::Slot& slot : nodeComponent->GetSlots()) { Slot slotEntry; @@ -479,6 +495,8 @@ namespace ScriptCanvasEditorTools details.m_name = cleanName; } + SplitCamelCase(details.m_name); + // Tooltip attribute takes priority over the edit data description AZStd::string tooltip = Helpers::GetStringAttribute(classData, AZ::Script::Attributes::ToolTip); if (!tooltip.empty()) @@ -666,6 +684,7 @@ namespace ScriptCanvasEditorTools EntryDetails& details = entry.m_details; details.m_name = behaviorClass->m_name; + SplitCamelCase(details.m_name); // Get the pretty name AZStd::string prettyName; @@ -699,6 +718,7 @@ namespace ScriptCanvasEditorTools methodEntry.m_details.m_tooltip = Helpers::GetStringAttribute(behaviorMethod, AZ::Script::Attributes::ToolTip); methodEntry.m_details.m_name = methodPair.second->m_name; + SplitCamelCase(methodEntry.m_details.m_name); // Strip the className from the methodName AZStd::string qualifiedName = behaviorClass->m_name + "::"; @@ -731,6 +751,8 @@ namespace ScriptCanvasEditorTools argument.m_details.m_category = ""; argument.m_details.m_tooltip = argumentDescription; + SplitCamelCase(argument.m_details.m_name); + methodEntry.m_arguments.push_back(argument); } } @@ -751,6 +773,8 @@ namespace ScriptCanvasEditorTools result.m_details.m_name = resultName; result.m_details.m_tooltip = resultDescription; + SplitCamelCase(result.m_details.m_name); + methodEntry.m_results.push_back(result); } @@ -790,7 +814,8 @@ namespace ScriptCanvasEditorTools TranslationFormat translationRoot; translationRoot.m_entries.push_back(entry); - AZStd::string fileName = AZStd::string::format("Properties/%s", behaviorProperty->m_name.c_str()); + AZStd::string cleanName = GraphCanvas::TranslationKey::Sanitize(behaviorProperty->m_name); + AZStd::string fileName = AZStd::string::format("Properties/%s", cleanName.c_str()); SaveJSONData(fileName, translationRoot); } @@ -816,6 +841,8 @@ namespace ScriptCanvasEditorTools argument.m_details.m_category = ""; argument.m_details.m_tooltip = argumentDescription; + SplitCamelCase(argument.m_details.m_name); + methodEntry.m_arguments.push_back(argument); } } @@ -836,6 +863,8 @@ namespace ScriptCanvasEditorTools result.m_details.m_name = resultParameter->m_name; result.m_details.m_tooltip = resultDescription; + SplitCamelCase(result.m_details.m_name); + methodEntry.m_results.push_back(result); } } @@ -871,6 +900,8 @@ namespace ScriptCanvasEditorTools method.m_details.m_name = methodName; method.m_details.m_tooltip = behaviorProperty->m_getter->m_debugDescription ? behaviorProperty->m_getter->m_debugDescription : ""; + SplitCamelCase(method.m_details.m_name); + TranslateMethod(behaviorProperty->m_getter, method); entry->m_methods.push_back(method); @@ -891,6 +922,8 @@ namespace ScriptCanvasEditorTools method.m_details.m_name = methodName; method.m_details.m_tooltip = behaviorProperty->m_setter->m_debugDescription ? behaviorProperty->m_getter->m_debugDescription : ""; + SplitCamelCase(method.m_details.m_name); + TranslateMethod(behaviorProperty->m_setter, method); entry->m_methods.push_back(method); @@ -920,6 +953,8 @@ namespace ScriptCanvasEditorTools entry.m_details.m_tooltip = behaviorEbus->m_toolTip; entry.m_details.m_category = "EBus Handlers"; + SplitCamelCase(entry.m_details.m_name); + for (const AZ::BehaviorEBusHandler::BusForwarderEvent& event : handler->GetEvents()) { Method methodEntry; @@ -930,6 +965,8 @@ namespace ScriptCanvasEditorTools methodEntry.m_details.m_tooltip = ""; methodEntry.m_details.m_name = event.m_name; + SplitCamelCase(methodEntry.m_details.m_name); + // Arguments (Input Slots) if (!event.m_parameters.empty()) { @@ -974,6 +1011,8 @@ namespace ScriptCanvasEditorTools argument.m_details.m_name = argumentName; argument.m_details.m_tooltip = argumentDescription; + SplitCamelCase(argument.m_details.m_name); + methodEntry.m_arguments.push_back(argument); } } @@ -1004,6 +1043,8 @@ namespace ScriptCanvasEditorTools result.m_details.m_name = resultName; result.m_details.m_tooltip = resultDescription; + SplitCamelCase(result.m_details.m_name); + methodEntry.m_results.push_back(result); } @@ -1252,6 +1293,13 @@ namespace ScriptCanvasEditorTools } + void TranslationGeneration::SplitCamelCase(AZStd::string& text) + { + AZStd::regex splitRegex(R"(/[a-z]+|[0-9]+|(?:[A-Z][a-z]+)|(?:[A-Z]+(?=(?:[A-Z][a-z])|[^AZa-z]|[$\d\n]))/g)"); + text = AZStd::regex_replace(text, splitRegex, " $&"); + text = AZ::StringFunc::LStrip(text); + } + namespace Helpers { AZStd::string ReadStringAttribute(const AZ::AttributeArray& attributes, const AZ::Crc32& attribute) diff --git a/Gems/ScriptCanvas/Code/Tools/TranslationGeneration.h b/Gems/ScriptCanvas/Code/Tools/TranslationGeneration.h index b86e1fe969..0f84c48b22 100644 --- a/Gems/ScriptCanvas/Code/Tools/TranslationGeneration.h +++ b/Gems/ScriptCanvas/Code/Tools/TranslationGeneration.h @@ -142,6 +142,9 @@ namespace ScriptCanvasEditorTools //! Utility function that saves a TranslationFormat object in the desired JSON format void SaveJSONData(const AZStd::string& filename, TranslationFormat& translationRoot); + //! Utility function that splits camel-case syntax string into separate words + void SplitCamelCase(AZStd::string&); + //! Evaluates if the specified object has exclusion flags and should be skipped from generation template bool ShouldSkip(const T* object) const From 95da7fcb645224d4dcd50ede2fe282407927e31b Mon Sep 17 00:00:00 2001 From: Allen Jackson <23512001+jackalbe@users.noreply.github.com> Date: Fri, 19 Nov 2021 13:17:21 -0600 Subject: [PATCH 168/345] {lyn7060} adding 'Save as Prefab' for ProcPrefab (#5678) This adds the context menu to the Asset Browser to "Save as Prefab.." so that a Procedural Prefab asset template can be saved in the source assets folder Signed-off-by: Allen Jackson <23512001+jackalbe@users.noreply.github.com> --- .../PrefabGroup/ProceduralAssetHandler.cpp | 93 ++++++++++++++++++- 1 file changed, 91 insertions(+), 2 deletions(-) diff --git a/Gems/Prefab/PrefabBuilder/PrefabGroup/ProceduralAssetHandler.cpp b/Gems/Prefab/PrefabBuilder/PrefabGroup/ProceduralAssetHandler.cpp index 17ed4d9c0c..bcfedad8a8 100644 --- a/Gems/Prefab/PrefabBuilder/PrefabGroup/ProceduralAssetHandler.cpp +++ b/Gems/Prefab/PrefabBuilder/PrefabGroup/ProceduralAssetHandler.cpp @@ -8,12 +8,16 @@ #include #include +#include #include #include -#include +#include +#include +#include #include +#include #include -#include +#include namespace AZ::Prefab { @@ -21,6 +25,7 @@ namespace AZ::Prefab class PrefabGroupAssetHandler::AssetTypeInfoHandler final : public AZ::AssetTypeInfoBus::Handler + , protected AzToolsFramework::AssetBrowser::AssetBrowserInteractionNotificationBus::Handler { public: AZ_CLASS_ALLOCATOR(AssetTypeInfoHandler, AZ::SystemAllocator, 0); @@ -31,15 +36,21 @@ namespace AZ::Prefab const char* GetGroup() const override; const char* GetBrowserIcon() const override; void GetAssetTypeExtensions(AZStd::vector& extensions) override; + + // AzToolsFramework::AssetBrowser::AssetBrowserInteractionNotificationBus::Handler + void AddContextMenuActions(QWidget* caller, QMenu* menu, const AZStd::vector& entries) override; + bool SaveAsAuthoredPrefab(const AZ::Data::AssetId& assetId, const char* destinationFilename); }; PrefabGroupAssetHandler::AssetTypeInfoHandler::AssetTypeInfoHandler() { AZ::AssetTypeInfoBus::Handler::BusConnect(azrtti_typeid()); + AzToolsFramework::AssetBrowser::AssetBrowserInteractionNotificationBus::Handler::BusConnect(); } PrefabGroupAssetHandler::AssetTypeInfoHandler::~AssetTypeInfoHandler() { + AzToolsFramework::AssetBrowser::AssetBrowserInteractionNotificationBus::Handler::BusDisconnect(); AZ::AssetTypeInfoBus::Handler::BusDisconnect(azrtti_typeid()); } @@ -68,6 +79,84 @@ namespace AZ::Prefab extensions.push_back(PrefabGroupAssetHandler::s_Extension); } + void PrefabGroupAssetHandler::AssetTypeInfoHandler::AddContextMenuActions( + [[maybe_unused]] QWidget* caller, + QMenu* menu, + const AZStd::vector& entries) + { + using namespace AzToolsFramework::AssetBrowser; + auto entryIt = AZStd::find_if + ( + entries.begin(), + entries.end(), + [](const AssetBrowserEntry* entry) -> bool + { + return entry->GetEntryType() == AssetBrowserEntry::AssetEntryType::Product; + } + ); + + if (entryIt == entries.end()) + { + return; + } + else if ((*entryIt)->GetEntryType() == AssetBrowserEntry::AssetEntryType::Product) + { + ProductAssetBrowserEntry* product = azrtti_cast(*entryIt); + if (product->GetAssetType() == azrtti_typeid()) + { + AZ::Data::AssetId assetId = product->GetAssetId(); + menu->addAction("Save as Prefab...", [assetId, this]() + { + QString filePath = AzQtComponents::FileDialog::GetSaveFileName(nullptr, QString("Save to file"), "", QString("Prefab file (*.prefab)")); + if (filePath.isEmpty()) + { + return; + } + if (SaveAsAuthoredPrefab(assetId, filePath.toUtf8().data())) + { + AZ_Printf("Prefab", "Prefab was saved to a .prefab file %s", filePath.toUtf8().data()); + } + }); + } + } + } + + bool PrefabGroupAssetHandler::AssetTypeInfoHandler::SaveAsAuthoredPrefab(const AZ::Data::AssetId& assetId, const char* destinationFilename) + { + using namespace AzToolsFramework::Prefab; + using namespace AZ::Data; + + auto procPrefabAsset = AssetManager::Instance().GetAsset(assetId, AssetLoadBehavior::Default); + const auto status = AssetManager::Instance().BlockUntilLoadComplete(procPrefabAsset); + if (status != AssetData::AssetStatus::Ready) + { + return false; + } + + auto* prefabLoaderInterface = AZ::Interface::Get(); + if (!prefabLoaderInterface) + { + return false; + } + + const auto templateId = procPrefabAsset.GetAs()->GetTemplateId(); + AZStd::string outputJson; + if (prefabLoaderInterface->SaveTemplateToString(templateId, outputJson) == false) + { + return false; + } + + const auto fileMode = AZ::IO::OpenMode::ModeWrite | AZ::IO::OpenMode::ModeCreatePath | AZ::IO::OpenMode::ModeText; + AZ::IO::FileIOStream outputFileStream; + if (outputFileStream.Open(destinationFilename, fileMode) == false) + { + return false; + } + + outputFileStream.Write(outputJson.size(), outputJson.data()); + return true; + } + // PrefabGroupAssetHandler AZStd::string_view PrefabGroupAssetHandler::s_Extension{ "procprefab" }; From af85060856faef554308dadc8251349147680ecc Mon Sep 17 00:00:00 2001 From: amzn-mike <80125227+amzn-mike@users.noreply.github.com> Date: Fri, 19 Nov 2021 13:22:43 -0600 Subject: [PATCH 169/345] [SPEC-7644] Cherry Pick - ParallelDeepAssetReferences is failing intermittently (#5797) * [SPEC-7644] ParallelDeepAssetReferences is failing intermittently (#5721) * Fixed race condition caused by trying to handle asset ready event before asset container has finished filling out all the data structures. Added check to only handle asset ready once init is complete Added unit test to verify fix Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com> * Re-enable test Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com> * Add missing space to error message Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com> * Add comment on sleep Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com> * Collapse nested namespace Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com> * Collapse nested namespace Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com> (cherry picked from commit 56900484fcecab198920d32d8b2c6fd89e30d50b) # Conflicts: # Code/Framework/AzCore/AzCore/Asset/AssetContainer.cpp * Fix indentation Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com> --- .../AzCore/AzCore/Asset/AssetContainer.cpp | 83 +++++++++++-------- .../AzCore/AzCore/Asset/AssetContainer.h | 16 ++-- .../AzCore/AzCore/Asset/AssetManager.h | 20 ++--- .../Tests/Asset/AssetManagerLoadingTests.cpp | 49 +++++++++-- 4 files changed, 114 insertions(+), 54 deletions(-) diff --git a/Code/Framework/AzCore/AzCore/Asset/AssetContainer.cpp b/Code/Framework/AzCore/AzCore/Asset/AssetContainer.cpp index ce15c7bc4e..eb75852508 100644 --- a/Code/Framework/AzCore/AzCore/Asset/AssetContainer.cpp +++ b/Code/Framework/AzCore/AzCore/Asset/AssetContainer.cpp @@ -37,6 +37,43 @@ namespace AZ AssetLoadBus::MultiHandler::BusDisconnect(); } + AZStd::vector>> AssetContainer::CreateAndQueueDependentAssets( + const AZStd::vector& dependencyInfoList, const AssetLoadParameters& loadParamsCopyWithNoLoadingFilter) + { + AZStd::vector>> dependencyAssets; + + for (auto& thisInfo : dependencyInfoList) + { + auto dependentAsset = AssetManager::Instance().FindOrCreateAsset( + thisInfo.m_assetId, thisInfo.m_assetType, AZ::Data::AssetLoadBehavior::Default); + + if (!dependentAsset || !dependentAsset.GetId().IsValid()) + { + AZ_Warning("AssetContainer", false, "Dependency Asset %s (%s) was not found\n", + thisInfo.m_assetId.ToString().c_str(), thisInfo.m_relativePath.c_str()); + RemoveWaitingAsset(thisInfo.m_assetId); + continue; + } + dependencyAssets.emplace_back(thisInfo, AZStd::move(dependentAsset)); + } + + // Queue the loading of all of the dependent assets before loading the root asset. + for (auto& [dependentAssetInfo, dependentAsset] : dependencyAssets) + { + // Queue each asset to load. + auto queuedDependentAsset = AssetManager::Instance().GetAssetInternal( + dependentAsset.GetId(), dependentAsset.GetType(), + AZ::Data::AssetLoadBehavior::Default, loadParamsCopyWithNoLoadingFilter, + dependentAssetInfo, HasPreloads(dependentAsset.GetId())); + + // Verify that the returned asset reference matches the one that we found or created and queued to load. + AZ_Assert(dependentAsset == queuedDependentAsset, "GetAssetInternal returned an unexpected asset reference for Asset %s", + dependentAsset.GetId().ToString().c_str()); + } + + return dependencyAssets; + } + void AssetContainer::AddDependentAssets(Asset rootAsset, const AssetLoadParameters& loadParams) { AssetId rootAssetId = rootAsset.GetId(); @@ -183,34 +220,7 @@ namespace AZ // Since we've set the load filter to not load dependencies, we need to ensure all the assets are created beforehand // so the dependencies can be hooked up as soon as each asset gets serialized in, even if they start getting serialized // while we're still in the middle of triggering all of the asset loads below. - for (auto& thisInfo : dependencyInfoList) - { - auto dependentAsset = AssetManager::Instance().FindOrCreateAsset( - thisInfo.m_assetId, thisInfo.m_assetType, AZ::Data::AssetLoadBehavior::Default); - - if (!dependentAsset || !dependentAsset.GetId().IsValid()) - { - AZ_Warning("AssetContainer", false, "Dependency Asset %s (%s) was not found\n", - thisInfo.m_assetId.ToString().c_str(), thisInfo.m_relativePath.c_str()); - RemoveWaitingAsset(thisInfo.m_assetId); - continue; - } - dependencyAssets.emplace_back(thisInfo, AZStd::move(dependentAsset)); - } - - // Queue the loading of all of the dependent assets before loading the root asset. - for (auto& [dependentAssetInfo, dependentAsset] : dependencyAssets) - { - // Queue each asset to load. - auto queuedDependentAsset = AssetManager::Instance().GetAssetInternal( - dependentAsset.GetId(), dependentAsset.GetType(), - AZ::Data::AssetLoadBehavior::Default, loadParamsCopyWithNoLoadingFilter, - dependentAssetInfo, HasPreloads(dependentAsset.GetId())); - - // Verify that the returned asset reference matches the one that we found or created and queued to load. - AZ_Assert(dependentAsset == queuedDependentAsset, "GetAssetInternal returned an unexpected asset reference for Asset %s", - dependentAsset.GetId().ToString().c_str()); - } + dependencyAssets = CreateAndQueueDependentAssets(dependencyInfoList, loadParamsCopyWithNoLoadingFilter); // Add all of the queued dependent assets as dependencies { @@ -349,8 +359,15 @@ namespace AZ void AssetContainer::HandleReadyAsset(Asset asset) { - RemoveFromAllWaitingPreloads(asset->GetId()); - RemoveWaitingAsset(asset->GetId()); + // Wait until we've finished initialization before allowing this + // If a ready event happens before we've gotten all the maps/structures set up, there may be some missing data + // which can lead to a crash + // We'll go through and check the ready status of every dependency immediately after finishing initialization anyway + if (m_initComplete) + { + RemoveFromAllWaitingPreloads(asset->GetId()); + RemoveWaitingAsset(asset->GetId()); + } } void AssetContainer::OnAssetDataLoaded(Asset asset) @@ -389,7 +406,7 @@ namespace AZ AssetManager::Instance().ValidateAndPostLoad(thisAsset, true, false, nullptr); } - void AssetContainer::RemoveFromAllWaitingPreloads(const AssetId& thisId) + void AssetContainer::RemoveFromAllWaitingPreloads(const AssetId& thisId) { AZStd::unordered_set checkList; { @@ -547,7 +564,7 @@ namespace AZ if (!preloadList.empty()) { // This method can be entered as additional NoLoad dependency groups are loaded - the container could - // be in the middle of loading so we need to grab both mutexes. + // be in the middle of loading so we need to grab both mutexes. AZStd::scoped_lock lock(m_readyMutex, m_preloadMutex); for (auto thisListPair = preloadList.begin(); thisListPair != preloadList.end();) @@ -568,7 +585,7 @@ namespace AZ // will load the assets but won't/can't create a circular preload dependency chain if (*thisAsset == rootAssetId) { - AZ_Error("AssetContainer", false, "Circular preload dependency found - %s has a preload" + AZ_Error("AssetContainer", false, "Circular preload dependency found - %s has a preload" "dependency back to root %s\n", thisListPair->first.ToString().c_str(), rootAssetId.ToString().c_str()); diff --git a/Code/Framework/AzCore/AzCore/Asset/AssetContainer.h b/Code/Framework/AzCore/AzCore/Asset/AssetContainer.h index e0091d678f..a05343ed0b 100644 --- a/Code/Framework/AzCore/AzCore/Asset/AssetContainer.h +++ b/Code/Framework/AzCore/AzCore/Asset/AssetContainer.h @@ -24,8 +24,8 @@ namespace AZ // AssetContainer loads an asset and all of its dependencies as a collection which is parallellized as much as possible. // With the container, the data will all load in parallel. Dependent asset loads will still obey the expected rules - // where PreLoad assets will emit OnAssetReady before the parent does, and QueueLoad assets will emit OnAssetReady in - // no guaranteed order. However, the OnAssetContainerReady signals will not emit until all PreLoad and QueueLoad assets + // where PreLoad assets will emit OnAssetReady before the parent does, and QueueLoad assets will emit OnAssetReady in + // no guaranteed order. However, the OnAssetContainerReady signals will not emit until all PreLoad and QueueLoad assets // are ready. NoLoad dependencies are not loaded by default but can be loaded along with their dependencies using the // same rules as above by using the LoadAll dependency rule. class AssetContainer : @@ -36,7 +36,7 @@ namespace AZ AZ_CLASS_ALLOCATOR(AssetContainer, SystemAllocator, 0); AssetContainer() = default; - + AssetContainer(Asset asset, const AssetLoadParameters& loadParams); ~AssetContainer(); @@ -81,6 +81,10 @@ namespace AZ // AssetLoadBus void OnAssetDataLoaded(AZ::Data::Asset asset) override; protected: + + virtual AZStd::vector>> CreateAndQueueDependentAssets( + const AZStd::vector& dependencyInfoList, const AssetLoadParameters& loadParamsCopyWithNoLoadingFilter); + // Waiting assets are those which have not yet signalled ready. In the case of PreLoad dependencies the data may have completed the load cycle but // the Assets aren't considered "Ready" yet if there are PreLoad dependencies still loading and will still be in the list until the point that asset and // All of its preload dependencies have been loaded, when it signals OnAssetReady @@ -97,7 +101,7 @@ namespace AZ void AddDependency(Asset&& addDependency); // Add a "graph section" to our list of dependencies. This checks the catalog for all Pre and Queue load assets which are dependents of the requested asset and kicks off loads - // NoLoads which are encounted are placed in another list and can be loaded on demand with the LoadDependency call. + // NoLoads which are encounted are placed in another list and can be loaded on demand with the LoadDependency call. void AddDependentAssets(Asset rootAsset, const AssetLoadParameters& loadParams); // If "PreLoad" assets are found in the graph these are cached and tracked with both OnAssetReady and OnAssetDataLoaded messages. @@ -117,7 +121,7 @@ namespace AZ // duringInit if we're coming from the checkReady method - containers that start ready don't need to signal void HandleReadyAsset(AZ::Data::Asset asset); - // Optimization to save the lookup in the dependencies map + // Optimization to save the lookup in the dependencies map AssetInternal::WeakAsset m_rootAsset; // The root asset id is stored here semi-redundantly on initialization so that we can still refer to it even if the @@ -136,7 +140,7 @@ namespace AZ AZStd::atomic_bool m_finalNotificationSent{false}; mutable AZStd::recursive_mutex m_preloadMutex; - // AssetId -> List of assets it is still waiting on + // AssetId -> List of assets it is still waiting on PreloadAssetListType m_preloadList; // AssetId -> List of assets waiting on it diff --git a/Code/Framework/AzCore/AzCore/Asset/AssetManager.h b/Code/Framework/AzCore/AzCore/Asset/AssetManager.h index f109bb278c..9666d434c1 100644 --- a/Code/Framework/AzCore/AzCore/Asset/AssetManager.h +++ b/Code/Framework/AzCore/AzCore/Asset/AssetManager.h @@ -169,14 +169,14 @@ namespace AZ /// Register handler with the system for a particular asset type. /// A handler should be registered for each asset type it handles. /// Please note that all the handlers are registered just once during app startup from the main thread - /// and therefore this is not a thread safe method and should not be invoked from different threads. + /// and therefore this is not a thread safe method and should not be invoked from different threads. void RegisterHandler(AssetHandler* handler, const AssetType& assetType); /// Unregister handler from the asset system. /// Please note that all the handlers are unregistered just once during app shutdown from the main thread /// and therefore this is not a thread safe method and should not be invoked from different threads. void UnregisterHandler(AssetHandler* handler); // @} - + // @{ Asset catalog management /// Register a catalog with the system for a particular asset type. /// A catalog should be registered for each asset type it is responsible for. @@ -295,7 +295,7 @@ namespace AZ /** * Old 'legacy' assetIds and asset hints can be automatically replaced with new ones during deserialize / assignment. * This operation can be somewhat costly, and its only useful if the program subsequently re-saves the files its loading so that - * the asset hints and assetIds actually persist. Thus, it can be disabled in situations where you know you are not going to be + * the asset hints and assetIds actually persist. Thus, it can be disabled in situations where you know you are not going to be * saving over or creating new source files (for example builders/background apps) * By default, it is enabled. */ @@ -316,7 +316,7 @@ namespace AZ * This method must be invoked before you start unregistering handlers manually and shutting down the asset manager. * This method ensures that all jobs in flight are either canceled or completed. * This method is automatically called in the destructor but if you are unregistering handlers manually, - * you must invoke it yourself. + * you must invoke it yourself. */ void PrepareShutDown(); @@ -366,7 +366,7 @@ namespace AZ /** * Creates a new shared AssetContainer with an optional loadFilter * **/ - AZStd::shared_ptr CreateAssetContainer(Asset asset, const AssetLoadParameters& loadParams = AssetLoadParameters{}) const; + virtual AZStd::shared_ptr CreateAssetContainer(Asset asset, const AssetLoadParameters& loadParams = AssetLoadParameters{}) const; /** @@ -452,7 +452,7 @@ namespace AZ // Variant of RegisterAssetLoading used for jobs which have been queued and need to verify the status of the asset - // before loading in order to prevent cases where a load is queued, then a blocking load goes through, then the queued + // before loading in order to prevent cases where a load is queued, then a blocking load goes through, then the queued // load is processed. This validation step leaves the loaded (And potentially modified) data as is in that case. bool ValidateAndRegisterAssetLoading(const Asset& asset); @@ -482,7 +482,7 @@ namespace AZ * the blocking. That will result in a single thread deadlock. * * If you need to queue work, the logic needs to be similar to this: - * + * AssetHandler::LoadResult MyAssetHandler::LoadAssetData(const Asset& asset, AZStd::shared_ptr stream, const AZ::Data::AssetFilterCB& assetLoadFilterCB) { @@ -496,13 +496,13 @@ namespace AZ } else { - // queue job to load asset in thread identified by m_loadingThreadId + // queue job to load asset in thread identified by m_loadingThreadId auto* queuedJob = QueueLoadingOnOtherThread(...); // block waiting for queued job to complete queuedJob->BlockUntilComplete(); } - + . . . @@ -525,7 +525,7 @@ namespace AZ //! Result from LoadAssetData - it either finished loading, didn't finish and is waiting for more data, or had an error. enum class LoadResult : u8 { - + Error, // The provided data failed to load correctly MoreDataRequired, // The provided data loaded correctly, but more data is required to finish the asset load LoadComplete // The provided data loaded correctly, and the asset has been created diff --git a/Code/Framework/AzCore/Tests/Asset/AssetManagerLoadingTests.cpp b/Code/Framework/AzCore/Tests/Asset/AssetManagerLoadingTests.cpp index 3f2d9491a7..fdacd80542 100644 --- a/Code/Framework/AzCore/Tests/Asset/AssetManagerLoadingTests.cpp +++ b/Code/Framework/AzCore/Tests/Asset/AssetManagerLoadingTests.cpp @@ -2297,6 +2297,45 @@ namespace UnitTest AssetManager::Destroy(); } + struct MockAssetContainer : AssetContainer + { + MockAssetContainer(Asset assetData, const AssetLoadParameters& loadParams) + { + // Copying the code in the original constructor, we can't call that constructor because it will not invoke our virtual method + m_rootAsset = AssetInternal::WeakAsset(assetData); + m_containerAssetId = m_rootAsset.GetId(); + + AddDependentAssets(assetData, loadParams); + } + + protected: + AZStd::vector>> CreateAndQueueDependentAssets( + const AZStd::vector& dependencyInfoList, const AssetLoadParameters& loadParamsCopyWithNoLoadingFilter) override + { + auto result = AssetContainer::CreateAndQueueDependentAssets(dependencyInfoList, loadParamsCopyWithNoLoadingFilter); + + // Sleep for a long enough time to allow asset loads to complete and start triggering AssetReady events + // This forces the race condition to occur + AZStd::this_thread::sleep_for(AZStd::chrono::milliseconds(500)); + + return result; + } + }; + + struct MockAssetManager : AssetManager + { + explicit MockAssetManager(const Descriptor& desc) + : AssetManager(desc) + { + } + + protected: + AZStd::shared_ptr CreateAssetContainer(Asset asset, const AssetLoadParameters& loadParams) const override + { + return AZStd::shared_ptr(aznew MockAssetContainer(asset, loadParams)); + } + }; + void ParallelDeepAssetReferences() { SerializeContext context; @@ -2304,7 +2343,7 @@ namespace UnitTest AssetWithAssetReference::Reflect(context); AssetManager::Descriptor desc; - AssetManager::Create(desc); + AssetManager::SetInstance(aznew MockAssetManager(desc)); auto& db = AssetManager::Instance(); @@ -2327,17 +2366,17 @@ namespace UnitTest // AssetC is MYASSETC AssetWithAssetReference c; - c.m_asset = AssetManager::Instance().CreateAsset(AssetId(MyAssetDId)); // point at D + c.m_asset = db.CreateAsset(AssetId(MyAssetDId)); // point at D EXPECT_TRUE(AZ::Utils::SaveObjectToFile(GetTestFolderPath() + "TestAsset3.txt", AZ::DataStream::ST_XML, &c, &context)); // AssetB is MYASSETB AssetWithAssetReference b; - b.m_asset = AssetManager::Instance().CreateAsset(AssetId(MyAssetCId)); // point at C + b.m_asset = db.CreateAsset(AssetId(MyAssetCId)); // point at C EXPECT_TRUE(AZ::Utils::SaveObjectToFile(GetTestFolderPath() + "TestAsset2.txt", AZ::DataStream::ST_XML, &b, &context)); // AssetA will be written to disk as MYASSETA AssetWithAssetReference a; - a.m_asset = AssetManager::Instance().CreateAsset(AssetId(MyAssetBId)); // point at B + a.m_asset = db.CreateAsset(AssetId(MyAssetBId)); // point at B EXPECT_TRUE(AZ::Utils::SaveObjectToFile(GetTestFolderPath() + "TestAsset1.txt", AZ::DataStream::ST_XML, &a, &context)); } @@ -2546,7 +2585,7 @@ namespace UnitTest TEST_F(AssetJobsMultithreadedTest, DISABLED_ParallelDeepAssetReferences) #else // temporarily disabled until sporadic failures can be root caused - TEST_F(AssetJobsMultithreadedTest, DISABLED_ParallelDeepAssetReferences) + TEST_F(AssetJobsMultithreadedTest, ParallelDeepAssetReferences) #endif // AZ_TRAIT_DISABLE_FAILED_ASSET_MANAGER_TESTS { ParallelDeepAssetReferences(); From 1aa444d66988aad304cea0c102d54ef810ee0bf6 Mon Sep 17 00:00:00 2001 From: puvvadar Date: Fri, 19 Nov 2021 11:40:01 -0800 Subject: [PATCH 170/345] Update build copy back to Developer Preview Signed-off-by: puvvadar --- Code/Editor/CryEdit.cpp | 2 +- cmake/Platform/Windows/Packaging/Bootstrapper.wxs | 2 +- cmake/Platform/Windows/Packaging/Shortcuts.wxs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Code/Editor/CryEdit.cpp b/Code/Editor/CryEdit.cpp index 8c7c68dee8..ad04e355f5 100644 --- a/Code/Editor/CryEdit.cpp +++ b/Code/Editor/CryEdit.cpp @@ -3833,7 +3833,7 @@ void CCryEditApp::SetEditorWindowTitle(QString sTitleStr, QString sPreTitleStr, { if (sTitleStr.isEmpty()) { - sTitleStr = QObject::tr("O3DE Editor [Stable 21.11]"); + sTitleStr = QObject::tr("O3DE Editor [Developer Preview]"); } if (!sPreTitleStr.isEmpty()) diff --git a/cmake/Platform/Windows/Packaging/Bootstrapper.wxs b/cmake/Platform/Windows/Packaging/Bootstrapper.wxs index 2edbc65c41..f3af199bc2 100644 --- a/cmake/Platform/Windows/Packaging/Bootstrapper.wxs +++ b/cmake/Platform/Windows/Packaging/Bootstrapper.wxs @@ -5,7 +5,7 @@ - - + From 3cf3e45b38d66269862c47d482e2f794a7f6418f Mon Sep 17 00:00:00 2001 From: Steve Pham <82231385+spham-amzn@users.noreply.github.com> Date: Fri, 19 Nov 2021 12:09:00 -0800 Subject: [PATCH 171/345] Enable Resource Mapping Tool on Linux (#5779) * Enable and fix AWS Resource Mapping Tool on Linux - Enable the trait AWSCORE_EDITOR_RESOURCE_MAPPING_TOOL_ENABLED for Linux - Add additional traits to handle launching o3de local python on Linux - Update the resource_mapping_tool.py to support preloading the shared libraries for Pyside (like the QtForPython gem) in order to resolve the local pyside2 libraries Signed-off-by: Steve Pham <82231385+spham-amzn@users.noreply.github.com> * Update pyside2 to a RUNTIME dependency Signed-off-by: Steve Pham <82231385+spham-amzn@users.noreply.github.com> * Update special linux preloading comments for clarity Signed-off-by: Steve Pham <82231385+spham-amzn@users.noreply.github.com> * Add CR at the end of traits files Signed-off-by: Steve Pham <82231385+spham-amzn@users.noreply.github.com> * - Remove unnecessary extra argument '--executable-path' and use '--binaries-path' instead - Add linux only loading of pyside modules to 'setup_qt_environment' instead - Update README.md Signed-off-by: Steve Pham <82231385+spham-amzn@users.noreply.github.com> * Updated unit tests for test_environment_utils.py Signed-off-by: Steve Pham <82231385+spham-amzn@users.noreply.github.com> * Fix indentation for Linux specific logic in environment_utils.py Signed-off-by: Steve Pham <82231385+spham-amzn@users.noreply.github.com> * Fix (more) indentation for Linux specific logic in environment_utils.py Signed-off-by: Steve Pham <82231385+spham-amzn@users.noreply.github.com> * Replace exit with return in setup_qt_environment Signed-off-by: Steve Pham <82231385+spham-amzn@users.noreply.github.com> --- Gems/AWSCore/Code/CMakeLists.txt | 3 +++ .../Editor/UI/AWSCoreResourceMappingToolAction.h | 4 +++- .../Platform/Linux/AWSCoreEditor_Traits_Linux.h | 4 +++- .../Code/Platform/Mac/AWSCoreEditor_Traits_Mac.h | 2 ++ .../Windows/AWSCoreEditor_Traits_Windows.h | 2 ++ .../UI/AWSCoreResourceMappingToolAction.cpp | 2 +- .../Code/Tools/ResourceMappingTool/README.md | 10 ++++++++++ .../ResourceMappingTool/resource_mapping_tool.py | 1 + .../tests/unit/utils/test_environment_utils.py | 15 +++++++++++++-- .../utils/environment_utils.py | 15 +++++++++++++++ 10 files changed, 53 insertions(+), 5 deletions(-) diff --git a/Gems/AWSCore/Code/CMakeLists.txt b/Gems/AWSCore/Code/CMakeLists.txt index 7559f4720b..d84f7814c3 100644 --- a/Gems/AWSCore/Code/CMakeLists.txt +++ b/Gems/AWSCore/Code/CMakeLists.txt @@ -111,6 +111,9 @@ if (PAL_TRAIT_BUILD_HOST_TOOLS) BUILD_DEPENDENCIES PRIVATE Gem::AWSCore.Editor.Static + RUNTIME_DEPENDENCIES + 3rdParty::pyside2 + ) ly_add_dependencies(AWSCore.Editor AWSCore.ResourceMappingTool) diff --git a/Gems/AWSCore/Code/Include/Private/Editor/UI/AWSCoreResourceMappingToolAction.h b/Gems/AWSCore/Code/Include/Private/Editor/UI/AWSCoreResourceMappingToolAction.h index 1a4c428e68..a065773743 100644 --- a/Gems/AWSCore/Code/Include/Private/Editor/UI/AWSCoreResourceMappingToolAction.h +++ b/Gems/AWSCore/Code/Include/Private/Editor/UI/AWSCoreResourceMappingToolAction.h @@ -13,6 +13,8 @@ #include #include +#include "AWSCoreEditor_Traits_Platform.h" + namespace AWSCore { class AWSCoreResourceMappingToolAction @@ -22,7 +24,7 @@ namespace AWSCore static constexpr const char AWSCoreResourceMappingToolActionName[] = "AWSCoreResourceMappingToolAction"; static constexpr const char ResourceMappingToolDirectoryPath[] = "Gems/AWSCore/Code/Tools/ResourceMappingTool"; static constexpr const char ResourceMappingToolLogDirectoryPath[] = "user/log/"; - static constexpr const char EngineWindowsPythonEntryScriptPath[] = "python/python.cmd"; + static constexpr const char EngineWindowsPythonEntryScriptPath[] = AWSCORE_EDITOR_PYTHON_COMMAND; AWSCoreResourceMappingToolAction(const QString& text, QObject* parent = nullptr); diff --git a/Gems/AWSCore/Code/Platform/Linux/AWSCoreEditor_Traits_Linux.h b/Gems/AWSCore/Code/Platform/Linux/AWSCoreEditor_Traits_Linux.h index fb82911dd4..726d4cc86f 100644 --- a/Gems/AWSCore/Code/Platform/Linux/AWSCoreEditor_Traits_Linux.h +++ b/Gems/AWSCore/Code/Platform/Linux/AWSCoreEditor_Traits_Linux.h @@ -7,4 +7,6 @@ */ #pragma once -#define AWSCORE_EDITOR_RESOURCE_MAPPING_TOOL_ENABLED 0 +#define AWSCORE_EDITOR_RESOURCE_MAPPING_TOOL_ENABLED 1 +#define AWSCORE_EDITOR_PYTHON_DEBUG_ARGUMENT "" +#define AWSCORE_EDITOR_PYTHON_COMMAND "python/python.sh" diff --git a/Gems/AWSCore/Code/Platform/Mac/AWSCoreEditor_Traits_Mac.h b/Gems/AWSCore/Code/Platform/Mac/AWSCoreEditor_Traits_Mac.h index fb82911dd4..d815c8273e 100644 --- a/Gems/AWSCore/Code/Platform/Mac/AWSCoreEditor_Traits_Mac.h +++ b/Gems/AWSCore/Code/Platform/Mac/AWSCoreEditor_Traits_Mac.h @@ -8,3 +8,5 @@ #pragma once #define AWSCORE_EDITOR_RESOURCE_MAPPING_TOOL_ENABLED 0 +#define AWSCORE_EDITOR_PYTHON_DEBUG_ARGUMENT "" +#define AWSCORE_EDITOR_PYTHON_COMMAND "python/python.sh" diff --git a/Gems/AWSCore/Code/Platform/Windows/AWSCoreEditor_Traits_Windows.h b/Gems/AWSCore/Code/Platform/Windows/AWSCoreEditor_Traits_Windows.h index e1522db32c..6eca30a8ac 100644 --- a/Gems/AWSCore/Code/Platform/Windows/AWSCoreEditor_Traits_Windows.h +++ b/Gems/AWSCore/Code/Platform/Windows/AWSCoreEditor_Traits_Windows.h @@ -8,3 +8,5 @@ #pragma once #define AWSCORE_EDITOR_RESOURCE_MAPPING_TOOL_ENABLED 1 +#define AWSCORE_EDITOR_PYTHON_DEBUG_ARGUMENT "debug " +#define AWSCORE_EDITOR_PYTHON_COMMAND "python/python.cmd" diff --git a/Gems/AWSCore/Code/Source/Editor/UI/AWSCoreResourceMappingToolAction.cpp b/Gems/AWSCore/Code/Source/Editor/UI/AWSCoreResourceMappingToolAction.cpp index 858d30fa40..49f800dbea 100644 --- a/Gems/AWSCore/Code/Source/Editor/UI/AWSCoreResourceMappingToolAction.cpp +++ b/Gems/AWSCore/Code/Source/Editor/UI/AWSCoreResourceMappingToolAction.cpp @@ -58,7 +58,7 @@ namespace AWSCore if (m_isDebug) { return AZStd::string::format( - "\"%s\" debug -B \"%s\" --binaries-path \"%s\" --debug --profile \"%s\" --config-path \"%s\" --log-path \"%s\"", + "\"%s\" " AWSCORE_EDITOR_PYTHON_DEBUG_ARGUMENT "-B \"%s\" --binaries-path \"%s\" --debug --profile \"%s\" --config-path \"%s\" --log-path \"%s\"", m_enginePythonEntryPath.c_str(), m_toolScriptPath.c_str(), m_toolQtBinDirectoryPath.c_str(), profileName.c_str(), m_toolConfigDirectoryPath.c_str(), m_toolLogDirectoryPath.c_str()); } diff --git a/Gems/AWSCore/Code/Tools/ResourceMappingTool/README.md b/Gems/AWSCore/Code/Tools/ResourceMappingTool/README.md index e09ecc281f..29479fa3e1 100644 --- a/Gems/AWSCore/Code/Tools/ResourceMappingTool/README.md +++ b/Gems/AWSCore/Code/Tools/ResourceMappingTool/README.md @@ -39,6 +39,16 @@ Follow cmake instructions to configure your project, for example: ``` $ python\python.cmd debug Gems\AWSCore\Code\Tools\ResourceMappingTool\resource_mapping_tool.py --binaries_path \bin\debug\AWSCoreEditorQtBin ``` + * Linux + * release mode + ``` + $ python/python.sh Gems/AWSCore/Code/Tools/ResourceMappingTool/resource_mapping_tool.py --binaries_path /bin/profile/AWSCoreEditorQtBin + ``` + * debug mode + ``` + $ python/python.sh Gems/AWSCore/Code/Tools/ResourceMappingTool/resource_mapping_tool.py --binaries_path /bin/debug/AWSCoreEditorQtBin + ``` + * Note - Editor is integrated with the same engine python environment to launch Resource Mapping Tool. If it is failed to launch the tool in Editor, please follow above steps to make sure expected scripts/binaries are present. diff --git a/Gems/AWSCore/Code/Tools/ResourceMappingTool/resource_mapping_tool.py b/Gems/AWSCore/Code/Tools/ResourceMappingTool/resource_mapping_tool.py index 2351fd001b..b254960f77 100755 --- a/Gems/AWSCore/Code/Tools/ResourceMappingTool/resource_mapping_tool.py +++ b/Gems/AWSCore/Code/Tools/ResourceMappingTool/resource_mapping_tool.py @@ -20,6 +20,7 @@ argument_parser.add_argument('--debug', action='store_true', help='Execute on de argument_parser.add_argument('--log-path', help='Path to resource mapping tool logging directory ' '(if not provided, logging file will be located at tool directory)') argument_parser.add_argument('--profile', default='default', help='Named AWS profile to use for querying AWS resources') + arguments: Namespace = argument_parser.parse_args() # logging setup diff --git a/Gems/AWSCore/Code/Tools/ResourceMappingTool/tests/unit/utils/test_environment_utils.py b/Gems/AWSCore/Code/Tools/ResourceMappingTool/tests/unit/utils/test_environment_utils.py index 756d6fdb10..3d36a56468 100644 --- a/Gems/AWSCore/Code/Tools/ResourceMappingTool/tests/unit/utils/test_environment_utils.py +++ b/Gems/AWSCore/Code/Tools/ResourceMappingTool/tests/unit/utils/test_environment_utils.py @@ -5,6 +5,7 @@ For complete copyright and license terms please see the LICENSE at the root of t SPDX-License-Identifier: Apache-2.0 OR MIT """ +import platform from typing import List from unittest import TestCase from unittest.mock import (ANY, call, MagicMock, patch) @@ -27,14 +28,24 @@ class TestEnvironmentUtils(TestCase): self.addCleanup(os_pathsep_patcher.stop) self._mock_os_pathsep: MagicMock = os_pathsep_patcher.start() - def test_setup_qt_environment_global_flag_is_set(self) -> None: + @patch('os.path.exists') + @patch('ctypes.CDLL') + def test_setup_qt_environment_global_flag_is_set(self, mock_os_path_exists, mock_ctype_cdll) -> None: + mock_os_path_exists.return_value = True environment_utils.setup_qt_environment("dummy") self._mock_os_environ.copy.assert_called_once() self._mock_os_pathsep.join.assert_called_once() assert environment_utils.is_qt_linked() is True + if platform.system() == 'Linux': + mock_os_path_exists.assert_called() - def test_cleanup_qt_environment_global_flag_is_set(self) -> None: + @patch('os.path.exists') + @patch('ctypes.CDLL') + def test_cleanup_qt_environment_global_flag_is_set(self, mock_os_path_exists, mock_ctype_cdll) -> None: + mock_os_path_exists.return_value = True environment_utils.setup_qt_environment("dummy") assert environment_utils.is_qt_linked() is True environment_utils.cleanup_qt_environment() assert environment_utils.is_qt_linked() is False + if platform.system() == 'Linux': + mock_os_path_exists.assert_called() diff --git a/Gems/AWSCore/Code/Tools/ResourceMappingTool/utils/environment_utils.py b/Gems/AWSCore/Code/Tools/ResourceMappingTool/utils/environment_utils.py index 8600fe31b5..b67f64e715 100644 --- a/Gems/AWSCore/Code/Tools/ResourceMappingTool/utils/environment_utils.py +++ b/Gems/AWSCore/Code/Tools/ResourceMappingTool/utils/environment_utils.py @@ -7,6 +7,7 @@ SPDX-License-Identifier: Apache-2.0 OR MIT import logging import os +import platform from typing import Dict from utils import file_utils @@ -38,6 +39,20 @@ def setup_qt_environment(bin_path: str) -> None: new_path = os.pathsep.join([binaries_path, path]) os.environ['PATH'] = new_path + # On Linux, we need to load pyside2 and related modules as well + if platform.system() == 'Linux': + import ctypes + + preload_shared_libs = [f'{bin_path}/libpyside2.abi3.so.5.14', + f'{bin_path}/libQt5Widgets.so.5'] + + for preload_shared_lib in preload_shared_libs: + if not os.path.exists(preload_shared_lib): + logger.error(f"Cannot find required shared library at {preload_shared_lib}") + return + else: + ctypes.CDLL(preload_shared_lib) + global qt_binaries_linked qt_binaries_linked = True From dbc5d7a8bc5404b80fbc38b6b004aaa1f9e06df9 Mon Sep 17 00:00:00 2001 From: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> Date: Fri, 19 Nov 2021 14:07:25 -0800 Subject: [PATCH 172/345] Cherry-pick of Linux deb package to stabilization (#5778) * Cherry-pick 49e8f358581dad7ca0e8127905a9d5e864c41cee Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> * Merging differences from development of other changes that need to be there for deb packaging Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> * Picks a needed change for the installer Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> * Fixes warning in mac Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> * Takes version from environment if defined Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> * Do not pick up version if it is empty string since that will also break version comparison Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> * creating temp directories if they dont exist Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> * removing a dependency to itself (Multiplayer.Builders is an alias of Multiplayer.Editor) Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> * Filters which runtime dependencies are passed from private build dependencies to only those that are actual targets. This avoids something like a "d3d12" private build dependency from being passed to the runtime dependencies Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> --- AutomatedTesting/CMakeLists.txt | 3 +- AutomatedTesting/cmake/CompilerSettings.cmake | 13 + .../{ => cmake}/EngineFinder.cmake | 42 ++- .../Linux/CompilerSettings_linux.cmake | 0 .../AzCore/Serialization/AZStdContainers.inl | 2 +- .../AzToolsFramework/API/PythonLoader.h | 2 +- .../Prefab/PrefabFocusHandler.cpp | 6 +- Gems/Multiplayer/Code/CMakeLists.txt | 1 - Registry/CMakeLists.txt | 11 +- .../Template/cmake/CompilerSettings.cmake | 2 +- .../Linux/CompilerSettings_linux.cmake} | 0 Templates/DefaultProject/template.json | 4 +- .../Template/cmake/CompilerSettings.cmake | 2 +- .../Linux/CompilerSettings_linux.cmake | 0 Templates/MinimalProject/template.json | 4 +- cmake/3rdPartyPackages.cmake | 11 +- cmake/CompilerSettings.cmake | 2 +- cmake/Install.cmake | 54 +++- cmake/LYWrappers.cmake | 4 +- cmake/Packaging.cmake | 252 +++++++----------- cmake/Packaging/CMakeDownload.cmake.in | 54 ++++ cmake/Platform/Common/Install_common.cmake | 202 +++++++++----- .../Common/PackagingPostBuild_common.cmake | 114 ++++++++ .../Common/PackagingPreBuild_common.cmake | 5 + .../Common/RuntimeDependencies_common.cmake | 2 +- .../runtime_dependencies_common.cmake.in | 18 +- .../Linux/CompilerSettings_linux.cmake | 34 +++ cmake/Platform/Linux/Install_linux.cmake | 42 ++- cmake/Platform/Linux/PAL_linux.cmake | 2 +- cmake/Platform/Linux/Packaging/postinst.in | 21 ++ cmake/Platform/Linux/Packaging/postrm.in | 15 ++ cmake/Platform/Linux/Packaging/prerm.in | 23 ++ .../Linux/PackagingPostBuild_linux.cmake | 62 +++++ .../Linux/PackagingPreBuild_linux.cmake | 16 ++ cmake/Platform/Linux/Packaging_linux.cmake | 56 ++++ .../Platform/Linux/platform_linux_files.cmake | 8 + .../Linux/runtime_dependencies_linux.cmake.in | 26 +- cmake/Platform/Mac/InstallUtils_mac.cmake.in | 37 ++- cmake/Platform/Mac/Install_mac.cmake | 61 +++-- .../Platform/Mac/PackagingPostBuild_mac.cmake | 10 + .../Platform/Mac/PackagingPreBuild_mac.cmake | 10 + .../Mac/runtime_dependencies_mac.cmake.in | 35 ++- .../Platform/Windows/PackagingPostBuild.cmake | 237 ---------------- .../Windows/PackagingPostBuild_windows.cmake | 166 ++++++++++++ .../Platform/Windows/PackagingPreBuild.cmake | 37 --- .../Windows/PackagingPreBuild_windows.cmake | 60 +++++ .../Platform/Windows/Packaging_windows.cmake | 68 ++--- .../Windows/platform_windows_files.cmake | 5 +- cmake/Version.cmake | 5 + .../install/ConfigurationType_config.cmake.in | 2 +- .../build/Platform/Android/build_config.json | 10 +- .../build/Platform/Linux/build_config.json | 82 +++++- .../Platform/Linux/build_installer_linux.sh | 15 ++ scripts/build/Platform/Linux/build_linux.sh | 13 +- scripts/build/Platform/Linux/env_linux.sh | 5 + .../build/Platform/Linux/installer_linux.sh | 30 +++ scripts/build/Platform/Mac/build_config.json | 59 +++- scripts/build/Platform/Mac/build_mac.sh | 5 +- scripts/build/Platform/Mac/env_mac.sh | 5 + .../build/Platform/Windows/build_config.json | 72 +++-- .../build/Platform/Windows/build_windows.cmd | 12 +- .../build/Platform/Windows/env_windows.cmd | 23 ++ .../Platform/Windows/installer_windows.cmd | 14 +- .../Windows/package_build_config.json | 2 +- scripts/build/Platform/iOS/build_config.json | 10 +- .../Linux/package-list.ubuntu-bionic.txt | 9 +- .../Linux/package-list.ubuntu-focal.txt | 4 +- 67 files changed, 1475 insertions(+), 743 deletions(-) create mode 100644 AutomatedTesting/cmake/CompilerSettings.cmake rename AutomatedTesting/{ => cmake}/EngineFinder.cmake (63%) rename Templates/DefaultProject/Template/cmake/Platform/Linux/CompilerSettings.cmake => AutomatedTesting/cmake/Platform/Linux/CompilerSettings_linux.cmake (100%) rename Templates/{MinimalProject/Template/cmake/Platform/Linux/CompilerSettings.cmake => DefaultProject/Template/cmake/Platform/Linux/CompilerSettings_linux.cmake} (100%) rename cmake/Platform/Linux/CompilerSettings.cmake => Templates/MinimalProject/Template/cmake/Platform/Linux/CompilerSettings_linux.cmake (100%) create mode 100644 cmake/Packaging/CMakeDownload.cmake.in create mode 100644 cmake/Platform/Common/PackagingPostBuild_common.cmake create mode 100644 cmake/Platform/Common/PackagingPreBuild_common.cmake create mode 100644 cmake/Platform/Linux/CompilerSettings_linux.cmake create mode 100644 cmake/Platform/Linux/Packaging/postinst.in create mode 100644 cmake/Platform/Linux/Packaging/postrm.in create mode 100644 cmake/Platform/Linux/Packaging/prerm.in create mode 100644 cmake/Platform/Linux/PackagingPostBuild_linux.cmake create mode 100644 cmake/Platform/Linux/PackagingPreBuild_linux.cmake create mode 100644 cmake/Platform/Linux/Packaging_linux.cmake create mode 100644 cmake/Platform/Mac/PackagingPostBuild_mac.cmake create mode 100644 cmake/Platform/Mac/PackagingPreBuild_mac.cmake delete mode 100644 cmake/Platform/Windows/PackagingPostBuild.cmake create mode 100644 cmake/Platform/Windows/PackagingPostBuild_windows.cmake delete mode 100644 cmake/Platform/Windows/PackagingPreBuild.cmake create mode 100644 cmake/Platform/Windows/PackagingPreBuild_windows.cmake create mode 100755 scripts/build/Platform/Linux/build_installer_linux.sh create mode 100755 scripts/build/Platform/Linux/installer_linux.sh diff --git a/AutomatedTesting/CMakeLists.txt b/AutomatedTesting/CMakeLists.txt index dee9d73aea..1c5382ba4b 100644 --- a/AutomatedTesting/CMakeLists.txt +++ b/AutomatedTesting/CMakeLists.txt @@ -8,11 +8,12 @@ if(NOT PROJECT_NAME) cmake_minimum_required(VERSION 3.20) + include(cmake/CompilerSettings.cmake) project(AutomatedTesting LANGUAGES C CXX VERSION 1.0.0.0 ) - include(EngineFinder.cmake OPTIONAL) + include(cmake/EngineFinder.cmake OPTIONAL) find_package(o3de REQUIRED) o3de_initialize() else() diff --git a/AutomatedTesting/cmake/CompilerSettings.cmake b/AutomatedTesting/cmake/CompilerSettings.cmake new file mode 100644 index 0000000000..60bda1d45b --- /dev/null +++ b/AutomatedTesting/cmake/CompilerSettings.cmake @@ -0,0 +1,13 @@ +# +# 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 +# +# + +# File to tweak compiler settings before compiler detection happens (before project() is called) +# We dont have PAL enabled at this point, so we can only use pure-CMake variables +if("${CMAKE_HOST_SYSTEM_NAME}" STREQUAL "Linux") + include(cmake/Platform/Linux/CompilerSettings_linux.cmake) +endif() diff --git a/AutomatedTesting/EngineFinder.cmake b/AutomatedTesting/cmake/EngineFinder.cmake similarity index 63% rename from AutomatedTesting/EngineFinder.cmake rename to AutomatedTesting/cmake/EngineFinder.cmake index 0a34a43b77..15b96eb8a9 100644 --- a/AutomatedTesting/EngineFinder.cmake +++ b/AutomatedTesting/cmake/EngineFinder.cmake @@ -1,3 +1,4 @@ +# {BEGIN_LICENSE} # # 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. @@ -5,18 +6,34 @@ # SPDX-License-Identifier: Apache-2.0 OR MIT # # +# {END_LICENSE} # This file is copied during engine registration. Edits to this file will be lost next # time a registration happens. include_guard() # Read the engine name from the project_json file -file(READ ${CMAKE_CURRENT_LIST_DIR}/project.json project_json) -set_property(DIRECTORY APPEND PROPERTY CMAKE_CONFIGURE_DEPENDS ${CMAKE_CURRENT_LIST_DIR}/project.json) +file(READ ${CMAKE_CURRENT_SOURCE_DIR}/project.json project_json) +set_property(DIRECTORY APPEND PROPERTY CMAKE_CONFIGURE_DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/project.json) string(JSON LY_ENGINE_NAME_TO_USE ERROR_VARIABLE json_error GET ${project_json} engine) if(json_error) - message(FATAL_ERROR "Unable to read key 'engine' from 'project.json', error: ${json_error}") + message(FATAL_ERROR "Unable to read key 'engine' from 'project.json'\nError: ${json_error}") +endif() + +if(CMAKE_MODULE_PATH) + foreach(module_path ${CMAKE_MODULE_PATH}) + if(EXISTS ${module_path}/Findo3de.cmake) + file(READ ${module_path}/../engine.json engine_json) + string(JSON engine_name ERROR_VARIABLE json_error GET ${engine_json} engine_name) + if(json_error) + message(FATAL_ERROR "Unable to read key 'engine_name' from 'engine.json'\nError: ${json_error}") + endif() + if(LY_ENGINE_NAME_TO_USE STREQUAL engine_name) + return() # Engine being forced through CMAKE_MODULE_PATH + endif() + endif() + endforeach() endif() if(DEFINED ENV{USERPROFILE} AND EXISTS $ENV{USERPROFILE}) @@ -25,6 +42,11 @@ else() set(manifest_path $ENV{HOME}/.o3de/o3de_manifest.json) # Unix endif() +set(registration_error [=[ +Engine registration is required before configuring a project. +Run 'scripts/o3de register --this-engine' from the engine root. +]=]) + # Read the ~/.o3de/o3de_manifest.json file and look through the 'engines_path' object. # Find a key that matches LY_ENGINE_NAME_TO_USE and use that as the engine path. if(EXISTS ${manifest_path}) @@ -33,36 +55,38 @@ if(EXISTS ${manifest_path}) string(JSON engines_path_count ERROR_VARIABLE json_error LENGTH ${manifest_json} engines_path) if(json_error) - message(FATAL_ERROR "Unable to read key 'engines_path' from '${manifest_path}', error: ${json_error}") + message(FATAL_ERROR "Unable to read key 'engines_path' from '${manifest_path}'\nError: ${json_error}\n${registration_error}") endif() string(JSON engines_path_type ERROR_VARIABLE json_error TYPE ${manifest_json} engines_path) if(json_error OR NOT ${engines_path_type} STREQUAL "OBJECT") - message(FATAL_ERROR "Type of 'engines_path' in '${manifest_path}' is not a JSON Object, error: ${json_error}") + message(FATAL_ERROR "Type of 'engines_path' in '${manifest_path}' is not a JSON Object\nError: ${json_error}") endif() math(EXPR engines_path_count "${engines_path_count}-1") foreach(engine_path_index RANGE ${engines_path_count}) string(JSON engine_name ERROR_VARIABLE json_error MEMBER ${manifest_json} engines_path ${engine_path_index}) if(json_error) - message(FATAL_ERROR "Unable to read 'engines_path/${engine_path_index}' from '${manifest_path}', error: ${json_error}") + message(FATAL_ERROR "Unable to read 'engines_path/${engine_path_index}' from '${manifest_path}'\nError: ${json_error}") endif() if(LY_ENGINE_NAME_TO_USE STREQUAL engine_name) string(JSON engine_path ERROR_VARIABLE json_error GET ${manifest_json} engines_path ${engine_name}) if(json_error) - message(FATAL_ERROR "Unable to read value from 'engines_path/${engine_name}', error: ${json_error}") + message(FATAL_ERROR "Unable to read value from 'engines_path/${engine_name}'\nError: ${json_error}") endif() if(engine_path) list(APPEND CMAKE_MODULE_PATH "${engine_path}/cmake") - break() + return() endif() endif() endforeach() + + message(FATAL_ERROR "The project.json uses engine name '${LY_ENGINE_NAME_TO_USE}' but no engine with that name has been registered.\n${registration_error}") else() # If the user is passing CMAKE_MODULE_PATH we assume thats where we will find the engine if(NOT CMAKE_MODULE_PATH) - message(FATAL_ERROR "Engine registration is required before configuring a project. Please register an engine by running 'scripts/o3de register --this-engine'") + message(FATAL_ERROR "O3DE Manifest file not found.\n${registration_error}") endif() endif() diff --git a/Templates/DefaultProject/Template/cmake/Platform/Linux/CompilerSettings.cmake b/AutomatedTesting/cmake/Platform/Linux/CompilerSettings_linux.cmake similarity index 100% rename from Templates/DefaultProject/Template/cmake/Platform/Linux/CompilerSettings.cmake rename to AutomatedTesting/cmake/Platform/Linux/CompilerSettings_linux.cmake diff --git a/Code/Framework/AzCore/AzCore/Serialization/AZStdContainers.inl b/Code/Framework/AzCore/AzCore/Serialization/AZStdContainers.inl index bae79a6fe7..2a00652488 100644 --- a/Code/Framework/AzCore/AzCore/Serialization/AZStdContainers.inl +++ b/Code/Framework/AzCore/AzCore/Serialization/AZStdContainers.inl @@ -94,7 +94,7 @@ namespace AZ template AZStd::enable_if_t::value> InitializeDefaultIfPodType(T& t) { - t = {}; + t = T{}; } template diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/API/PythonLoader.h b/Code/Framework/AzToolsFramework/AzToolsFramework/API/PythonLoader.h index 29125667d6..6acc160ddc 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/API/PythonLoader.h +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/API/PythonLoader.h @@ -19,7 +19,7 @@ namespace AzToolsFramework::EmbeddedPython ~PythonLoader(); private: - void* m_embeddedLibPythonHandle{ nullptr }; + [[maybe_unused]] void* m_embeddedLibPythonHandle{ nullptr }; }; } // namespace AzToolsFramework::EmbeddedPython diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabFocusHandler.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabFocusHandler.cpp index 3d764554ef..f20c11a1d8 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabFocusHandler.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabFocusHandler.cpp @@ -376,7 +376,7 @@ namespace AzToolsFramework::Prefab size_t index = 0; size_t maxIndex = m_instanceFocusHierarchy.size() - 1; - for (const AZ::EntityId containerEntityId : m_instanceFocusHierarchy) + for (const AZ::EntityId& containerEntityId : m_instanceFocusHierarchy) { InstanceOptionalReference instance = GetReferenceFromContainerEntityId(containerEntityId); if (instance.has_value()) @@ -414,7 +414,7 @@ namespace AzToolsFramework::Prefab return; } - for (const AZ::EntityId containerEntityId : instances) + for (const AZ::EntityId& containerEntityId : instances) { InstanceOptionalReference instance = GetReferenceFromContainerEntityId(containerEntityId); @@ -433,7 +433,7 @@ namespace AzToolsFramework::Prefab return; } - for (const AZ::EntityId containerEntityId : instances) + for (const AZ::EntityId& containerEntityId : instances) { InstanceOptionalReference instance = GetReferenceFromContainerEntityId(containerEntityId); diff --git a/Gems/Multiplayer/Code/CMakeLists.txt b/Gems/Multiplayer/Code/CMakeLists.txt index dee68fa969..cc9988fe57 100644 --- a/Gems/Multiplayer/Code/CMakeLists.txt +++ b/Gems/Multiplayer/Code/CMakeLists.txt @@ -131,7 +131,6 @@ if (PAL_TRAIT_BUILD_HOST_TOOLS) AZ::AzToolsFramework Gem::Multiplayer.Static Gem::Multiplayer.Tools.Static - Gem::Multiplayer.Builders ) ly_create_alias(NAME Multiplayer.Builders NAMESPACE Gem TARGETS Gem::Multiplayer.Editor) diff --git a/Registry/CMakeLists.txt b/Registry/CMakeLists.txt index 773adac07f..df309ba657 100644 --- a/Registry/CMakeLists.txt +++ b/Registry/CMakeLists.txt @@ -12,6 +12,11 @@ endif() ly_install_directory(DIRECTORIES .) -ly_install_directory(DIRECTORIES ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/$/Registry - DESTINATION ${runtime_output_directory} -) +foreach(conf IN LISTS CMAKE_CONFIGURATION_TYPES) + string(TOUPPER ${conf} UCONF) + string(REPLACE "$" "${conf}" output ${runtime_output_directory}) + ly_install_directory(DIRECTORIES ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${conf}/Registry + DESTINATION ${output} + COMPONENT ${LY_INSTALL_PERMUTATION_COMPONENT}_${UCONF} + ) +endforeach() diff --git a/Templates/DefaultProject/Template/cmake/CompilerSettings.cmake b/Templates/DefaultProject/Template/cmake/CompilerSettings.cmake index cf6614e4a5..60bda1d45b 100644 --- a/Templates/DefaultProject/Template/cmake/CompilerSettings.cmake +++ b/Templates/DefaultProject/Template/cmake/CompilerSettings.cmake @@ -9,5 +9,5 @@ # File to tweak compiler settings before compiler detection happens (before project() is called) # We dont have PAL enabled at this point, so we can only use pure-CMake variables if("${CMAKE_HOST_SYSTEM_NAME}" STREQUAL "Linux") - include(cmake/Platform/${CMAKE_HOST_SYSTEM_NAME}/CompilerSettings.cmake) + include(cmake/Platform/Linux/CompilerSettings_linux.cmake) endif() diff --git a/Templates/MinimalProject/Template/cmake/Platform/Linux/CompilerSettings.cmake b/Templates/DefaultProject/Template/cmake/Platform/Linux/CompilerSettings_linux.cmake similarity index 100% rename from Templates/MinimalProject/Template/cmake/Platform/Linux/CompilerSettings.cmake rename to Templates/DefaultProject/Template/cmake/Platform/Linux/CompilerSettings_linux.cmake diff --git a/Templates/DefaultProject/template.json b/Templates/DefaultProject/template.json index a36926f632..fcffafcb34 100644 --- a/Templates/DefaultProject/template.json +++ b/Templates/DefaultProject/template.json @@ -193,8 +193,8 @@ "isOptional": false }, { - "file": "cmake/Platform/Linux/CompilerSettings.cmake", - "origin": "cmake/Platform/Linux/CompilerSettings.cmake", + "file": "cmake/Platform/Linux/CompilerSettings_linux.cmake", + "origin": "cmake/Platform/Linux/CompilerSettings_linux.cmake", "isTemplated": false, "isOptional": false }, diff --git a/Templates/MinimalProject/Template/cmake/CompilerSettings.cmake b/Templates/MinimalProject/Template/cmake/CompilerSettings.cmake index cf6614e4a5..60bda1d45b 100644 --- a/Templates/MinimalProject/Template/cmake/CompilerSettings.cmake +++ b/Templates/MinimalProject/Template/cmake/CompilerSettings.cmake @@ -9,5 +9,5 @@ # File to tweak compiler settings before compiler detection happens (before project() is called) # We dont have PAL enabled at this point, so we can only use pure-CMake variables if("${CMAKE_HOST_SYSTEM_NAME}" STREQUAL "Linux") - include(cmake/Platform/${CMAKE_HOST_SYSTEM_NAME}/CompilerSettings.cmake) + include(cmake/Platform/Linux/CompilerSettings_linux.cmake) endif() diff --git a/cmake/Platform/Linux/CompilerSettings.cmake b/Templates/MinimalProject/Template/cmake/Platform/Linux/CompilerSettings_linux.cmake similarity index 100% rename from cmake/Platform/Linux/CompilerSettings.cmake rename to Templates/MinimalProject/Template/cmake/Platform/Linux/CompilerSettings_linux.cmake diff --git a/Templates/MinimalProject/template.json b/Templates/MinimalProject/template.json index 4260e71527..7d6a4f9b94 100644 --- a/Templates/MinimalProject/template.json +++ b/Templates/MinimalProject/template.json @@ -185,8 +185,8 @@ "isOptional": false }, { - "file": "cmake/Platform/Linux/CompilerSettings.cmake", - "origin": "cmake/Platform/Linux/CompilerSettings.cmake", + "file": "cmake/Platform/Linux/CompilerSettings_linux.cmake", + "origin": "cmake/Platform/Linux/CompilerSettings_linux.cmake", "isTemplated": false, "isOptional": false }, diff --git a/cmake/3rdPartyPackages.cmake b/cmake/3rdPartyPackages.cmake index efe67b4d24..a3f15bdb22 100644 --- a/cmake/3rdPartyPackages.cmake +++ b/cmake/3rdPartyPackages.cmake @@ -7,7 +7,7 @@ include_guard() -include(cmake/LySet.cmake) +include(${LY_ROOT_FOLDER}/cmake/LySet.cmake) # OVERVIEW: # this is the Open 3D Engine Package system. @@ -80,10 +80,7 @@ macro(ly_package_message) endif() endmacro() -file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/packages) - -include(cmake/LYPackage_S3Downloader.cmake) - +include(${LY_ROOT_FOLDER}/cmake/LYPackage_S3Downloader.cmake) # Attempts one time to download a file. # sets should_retry to true if the caller should retry due to an intermittent problem @@ -711,11 +708,11 @@ if (NOT CMAKE_SCRIPT_MODE_FILE) # include the built in 3rd party packages that are for every platform. # you can put your package associations anywhere, but this provides # a good starting point. - include(cmake/3rdParty/BuiltInPackages.cmake) + include(${LY_ROOT_FOLDER}/cmake/3rdParty/BuiltInPackages.cmake) endif() if(PAL_TRAIT_BUILD_HOST_TOOLS) - include(cmake/LYWrappers.cmake) + include(${LY_ROOT_FOLDER}/cmake/LYWrappers.cmake) # Importing this globally to handle AUTOMOC, AUTOUIC, AUTORCC ly_parse_third_party_dependencies(3rdParty::Qt) endif() diff --git a/cmake/CompilerSettings.cmake b/cmake/CompilerSettings.cmake index cf6614e4a5..60bda1d45b 100644 --- a/cmake/CompilerSettings.cmake +++ b/cmake/CompilerSettings.cmake @@ -9,5 +9,5 @@ # File to tweak compiler settings before compiler detection happens (before project() is called) # We dont have PAL enabled at this point, so we can only use pure-CMake variables if("${CMAKE_HOST_SYSTEM_NAME}" STREQUAL "Linux") - include(cmake/Platform/${CMAKE_HOST_SYSTEM_NAME}/CompilerSettings.cmake) + include(cmake/Platform/Linux/CompilerSettings_linux.cmake) endif() diff --git a/cmake/Install.cmake b/cmake/Install.cmake index 3b74e6c654..b558590b9e 100644 --- a/cmake/Install.cmake +++ b/cmake/Install.cmake @@ -8,16 +8,38 @@ set(LY_INSTALL_ENABLED TRUE CACHE BOOL "Indicates if the install process is enabled") -if(LY_INSTALL_ENABLED) - ly_get_absolute_pal_filename(pal_dir ${CMAKE_CURRENT_SOURCE_DIR}/cmake/Platform/${PAL_PLATFORM_NAME}) - include(${pal_dir}/Install_${PAL_PLATFORM_NAME_LOWERCASE}.cmake) -endif() +#! ly_install: wrapper to install that handles common functionality +# +# \notes: +# - this wrapper handles the case where common installs are called multiple times from different +# build folders (when using LY_INSTALL_EXTERNAL_BUILD_DIRS) to generate install layouts that +# have multiple build permutations +# +function(ly_install) + + if(NOT LY_INSTALL_ENABLED) + return() + endif() + + cmake_parse_arguments(ly_install "" "COMPONENT" "" ${ARGN}) + if (NOT ly_install_COMPONENT OR "${ly_install_COMPONENT}" STREQUAL "${CMAKE_INSTALL_DEFAULT_COMPONENT_NAME}") + # if it is installing under the default component, we need to de-duplicate since we can have + # cases coming from different build directories (when using LY_INSTALL_EXTERNAL_BUILD_DIRS) + install(CODE "if(NOT LY_CORE_COMPONENT_ALREADY_INCLUDED)" ALL_COMPONENTS) + install(${ARGN}) + install(CODE "endif()\n" ALL_COMPONENTS) + else() + install(${ARGN}) + endif() + +endfunction() #! ly_install_directory: specifies a directory to be copied to the install layout at install time # # \arg:DIRECTORIES directories to install # \arg:DESTINATION (optional) destination to install the directory to (relative to CMAKE_PREFIX_PATH) # \arg:EXCLUDE_PATTERNS (optional) patterns to exclude +# \arg:COMPONENT (optional) component to use (defaults to CMAKE_INSTALL_DEFAULT_COMPONENT_NAME) # \arg:VERBATIM (optional) copies the directories as they are, this excludes the default exclude patterns # # \notes: @@ -34,7 +56,7 @@ function(ly_install_directory) endif() set(options VERBATIM) - set(oneValueArgs DESTINATION) + set(oneValueArgs DESTINATION COMPONENT) set(multiValueArgs DIRECTORIES EXCLUDE_PATTERNS) cmake_parse_arguments(ly_install_directory "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN}) @@ -42,6 +64,10 @@ function(ly_install_directory) if(NOT ly_install_directory_DIRECTORIES) message(FATAL_ERROR "You must provide at least a directory to install") endif() + + if(NOT ly_install_directory_COMPONENT) + set(ly_install_directory_COMPONENT ${CMAKE_INSTALL_DEFAULT_COMPONENT_NAME}) + endif() foreach(directory ${ly_install_directory_DIRECTORIES}) @@ -77,11 +103,12 @@ function(ly_install_directory) list(APPEND exclude_patterns PATTERN *.egg-info EXCLUDE) endif() - install(DIRECTORY ${directory} + ly_install(DIRECTORY ${directory} DESTINATION ${ly_install_directory_DESTINATION} - COMPONENT ${CMAKE_INSTALL_DEFAULT_COMPONENT_NAME} # use the deafult for the time being + COMPONENT ${ly_install_directory_COMPONENT} ${exclude_patterns} ) + endforeach() endfunction() @@ -126,7 +153,7 @@ function(ly_install_files) set(install_type FILES) endif() - install(${install_type} ${files} + ly_install(${install_type} ${files} DESTINATION ${ly_install_files_DESTINATION} COMPONENT ${CMAKE_INSTALL_DEFAULT_COMPONENT_NAME} # use the default for the time being ) @@ -144,7 +171,7 @@ function(ly_install_run_code CODE) return() endif() - install(CODE ${CODE} + ly_install(CODE ${CODE} COMPONENT ${CMAKE_INSTALL_DEFAULT_COMPONENT_NAME} # use the default for the time being ) @@ -161,8 +188,13 @@ function(ly_install_run_script SCRIPT) return() endif() - install(SCRIPT ${SCRIPT} + ly_install(SCRIPT ${SCRIPT} COMPONENT ${CMAKE_INSTALL_DEFAULT_COMPONENT_NAME} # use the default for the time being ) -endfunction() \ No newline at end of file +endfunction() + +if(LY_INSTALL_ENABLED) + ly_get_absolute_pal_filename(pal_dir ${CMAKE_CURRENT_SOURCE_DIR}/cmake/Platform/${PAL_PLATFORM_NAME}) + include(${pal_dir}/Install_${PAL_PLATFORM_NAME_LOWERCASE}.cmake) +endif() diff --git a/cmake/LYWrappers.cmake b/cmake/LYWrappers.cmake index 0416d41ece..ae097c9bb7 100644 --- a/cmake/LYWrappers.cmake +++ b/cmake/LYWrappers.cmake @@ -354,7 +354,7 @@ function(ly_add_target) # of running the copy of runtime dependencies, the stamp file is touched so the timestamp is updated. # Adding a config as part of the name since the stamp file is added to the VS project. # Note the STAMP_OUTPUT_FILE need to match with the one used in runtime dependencies (e.g. RuntimeDependencies_common.cmake) - set(STAMP_OUTPUT_FILE ${CMAKE_BINARY_DIR}/runtime_dependencies/$/${ly_add_target_NAME}_$.stamp) + set(STAMP_OUTPUT_FILE ${CMAKE_BINARY_DIR}/runtime_dependencies/$/${ly_add_target_NAME}.stamp) add_custom_command( OUTPUT ${STAMP_OUTPUT_FILE} DEPENDS "$>" @@ -367,7 +367,7 @@ function(ly_add_target) # stamp file on each configuration so it gets properly excluded by the generator unset(stamp_files_per_config) foreach(conf IN LISTS CMAKE_CONFIGURATION_TYPES) - set(stamp_file_conf ${CMAKE_BINARY_DIR}/runtime_dependencies/${conf}/${ly_add_target_NAME}_${conf}.stamp) + set(stamp_file_conf ${CMAKE_BINARY_DIR}/runtime_dependencies/${conf}/${ly_add_target_NAME}.stamp) set_source_files_properties(${stamp_file_conf} PROPERTIES GENERATED TRUE SKIP_AUTOGEN TRUE) list(APPEND stamp_files_per_config $<$:${stamp_file_conf}>) endforeach() diff --git a/cmake/Packaging.cmake b/cmake/Packaging.cmake index 006689549b..d716efb225 100644 --- a/cmake/Packaging.cmake +++ b/cmake/Packaging.cmake @@ -24,18 +24,23 @@ number will automatically appended as '/'. If LY_INSTALLER_AUTO_ full URL format will be: //" ) -set(LY_INSTALLER_UPLOAD_URL "" CACHE STRING -"Base URL used to upload the installer artifacts after generation, the host target and version number \ -will automatically appended as '/'. If LY_INSTALLER_AUTO_GEN_TAG is set, the full URL \ -format will be: //. Can also be set via LY_INSTALLER_UPLOAD_URL environment \ -variable. Currently only accepts S3 URLs e.g. s3:///" +set(CPACK_UPLOAD_URL "" CACHE STRING +"URL used to upload the installer artifacts after generation, the host target and version number \ +will automatically appended as '/'. If LY_INSTALLER_AUTO_GEN_TAG is set, the full URL \ +format will be: //. Currently only accepts S3 URLs e.g. s3:///" ) -set(LY_INSTALLER_AWS_PROFILE "" CACHE STRING -"AWS CLI profile for uploading artifacts. Can also be set via LY_INSTALLER_AWS_PROFILE environment variable." +set(CPACK_AWS_PROFILE "" CACHE STRING +"AWS CLI profile for uploading artifacts." ) +set(CPACK_THREADS 0) set(CPACK_DESIRED_CMAKE_VERSION 3.20.2) +if(${CPACK_DESIRED_CMAKE_VERSION} VERSION_LESS ${CMAKE_MINIMUM_REQUIRED_VERSION}) + message(FATAL_ERROR + "The desired version of CMake to be included in the package is " + "below the minimum required version of CMake to run") +endif() # set all common cpack variable overrides first so they can be accessible via configure_file # when the platform specific settings are applied below. additionally, any variable with @@ -44,15 +49,16 @@ set(CPACK_DESIRED_CMAKE_VERSION 3.20.2) set(CPACK_PACKAGE_NAME "${PROJECT_NAME}") set(CPACK_PACKAGE_FULL_NAME "Open3D Engine") set(CPACK_PACKAGE_VENDOR "O3DE Binary Project a Series of LF Projects, LLC") +set(CPACK_PACKAGE_CONTACT "info@o3debinaries.org") set(CPACK_PACKAGE_VERSION "${LY_VERSION_STRING}") set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Installation Tool") string(TOLOWER "${CPACK_PACKAGE_NAME}_${CPACK_PACKAGE_VERSION}" CPACK_PACKAGE_FILE_NAME) set(DEFAULT_LICENSE_NAME "Apache-2.0") -set(DEFAULT_LICENSE_FILE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE.txt") -set(CPACK_RESOURCE_FILE_LICENSE ${DEFAULT_LICENSE_FILE}) +set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE.txt") +set(CPACK_RESOURCE_FILE_README "${CMAKE_CURRENT_SOURCE_DIR}/README.md") set(CPACK_LICENSE_URL ${LY_INSTALLER_LICENSE_URL}) set(CPACK_PACKAGE_INSTALL_DIRECTORY "${CPACK_PACKAGE_NAME}/${CPACK_PACKAGE_VERSION}") @@ -60,6 +66,7 @@ set(CPACK_PACKAGE_INSTALL_DIRECTORY "${CPACK_PACKAGE_NAME}/${CPACK_PACKAGE_VERSI # neither of the SOURCE_DIR variables equate to anything during execution of pre/post build scripts set(CPACK_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/cmake) set(CPACK_BINARY_DIR ${CMAKE_BINARY_DIR}/_CPack) # to match other CPack out dirs +set(CPACK_OUTPUT_FILE_PREFIX CPackUploads) # this config file allows the dynamic setting of cpack variables at cpack-time instead of cmake configure set(CPACK_PROJECT_CONFIG_FILE ${CPACK_SOURCE_DIR}/PackagingConfig.cmake) @@ -74,97 +81,104 @@ if(NOT CPACK_GENERATOR) return() endif() -if(${CPACK_DESIRED_CMAKE_VERSION} VERSION_LESS ${CMAKE_MINIMUM_REQUIRED_VERSION}) - message(FATAL_ERROR - "The desired version of CMake to be included in the package is " - "below the minimum required version of CMake to run") -endif() - -# pull down the desired copy of CMake so it can be included in the package +# We will download the desired copy of CMake so it can be included in the package, we defer the downloading +# to the install process, to do so we generate a script that will perform the download and execute such script +# during the install process (before packaging) if(NOT (CPACK_CMAKE_PACKAGE_FILE AND CPACK_CMAKE_PACKAGE_HASH)) message(FATAL_ERROR "Packaging is missing one or more following properties required to include CMake: " " CPACK_CMAKE_PACKAGE_FILE, CPACK_CMAKE_PACKAGE_HASH") endif() -set(_cmake_package_dest ${CPACK_BINARY_DIR}/${CPACK_CMAKE_PACKAGE_FILE}) +# We download it to a different location because CPACK_PACKAGING_INSTALL_PREFIX will be removed during +# cpack generation. CPACK_BINARY_DIR persists across cpack invocations +set(LY_CMAKE_PACKAGE_DOWNLOAD_PATH ${CPACK_BINARY_DIR}/${CPACK_CMAKE_PACKAGE_FILE}) -if(EXISTS ${_cmake_package_dest}) - file(SHA256 ${_cmake_package_dest} hash_of_downloaded_file) - if (NOT "${hash_of_downloaded_file}" STREQUAL "${CPACK_CMAKE_PACKAGE_HASH}") - message(STATUS "CMake ${CPACK_DESIRED_CMAKE_VERSION} found at ${_cmake_package_dest} but expected hash missmatches, re-downloading...") - file(REMOVE ${_cmake_package_dest}) - else() - message(STATUS "CMake ${CPACK_DESIRED_CMAKE_VERSION} found") - endif() -endif() -if(NOT EXISTS ${_cmake_package_dest}) - # download it - string(REPLACE "." ";" _version_componets "${CPACK_DESIRED_CMAKE_VERSION}") - list(GET _version_componets 0 _major_version) - list(GET _version_componets 1 _minor_version) - - set(_url_version_tag "v${_major_version}.${_minor_version}") - set(_package_url "https://cmake.org/files/${_url_version_tag}/${CPACK_CMAKE_PACKAGE_FILE}") - - message(STATUS "Downloading CMake ${CPACK_DESIRED_CMAKE_VERSION} for packaging...") - download_file( - URL ${_package_url} - TARGET_FILE ${_cmake_package_dest} - EXPECTED_HASH ${CPACK_CMAKE_PACKAGE_HASH} - RESULTS _results - ) - list(GET _results 0 _status_code) - - if (${_status_code} EQUAL 0 AND EXISTS ${_cmake_package_dest}) - message(STATUS "CMake ${CPACK_DESIRED_CMAKE_VERSION} found") - else() - file(REMOVE ${_cmake_package_dest}) - list(REMOVE_AT _results 0) - - set(_error_message "An error occurred, code ${_status_code}. URL ${_package_url} - ${_results}") - - if(${_status_code} EQUAL 1) - string(APPEND _error_message - " Please double check the CPACK_CMAKE_PACKAGE_FILE and " - "CPACK_CMAKE_PACKAGE_HASH properties before trying again.") - endif() - - message(FATAL_ERROR ${_error_message}) - endif() -endif() - -install(FILES ${_cmake_package_dest} - DESTINATION ./Tools/Redistributables/CMake +configure_file(${LY_ROOT_FOLDER}/cmake/Packaging/CMakeDownload.cmake.in + ${CPACK_BINARY_DIR}/CMakeDownload.cmake + @ONLY +) +ly_install(SCRIPT ${CPACK_BINARY_DIR}/CMakeDownload.cmake + COMPONENT ${CMAKE_INSTALL_DEFAULT_COMPONENT_NAME} +) +ly_install(FILES ${LY_CMAKE_PACKAGE_DOWNLOAD_PATH} + DESTINATION Tools/Redistributables/CMake + COMPONENT ${CMAKE_INSTALL_DEFAULT_COMPONENT_NAME} ) -# the version string and git tags are intended to be synchronized so it should be safe to use that instead -# of directly calling into git which could get messy in certain scenarios -if(${CPACK_PACKAGE_VERSION} VERSION_GREATER "0.0.0.0") - set(_3rd_party_license_filename NOTICES.txt) +# Set common CPACK variables to all platforms/generators +set(CPACK_STRIP_FILES TRUE) # always strip symbols on packaging +set(CPACK_PACKAGE_CHECKSUM SHA256) # Generate checksum file +set(CPACK_PRE_BUILD_SCRIPTS ${pal_dir}/PackagingPreBuild_${PAL_HOST_PLATFORM_NAME_LOWERCASE}.cmake) +set(CPACK_POST_BUILD_SCRIPTS ${pal_dir}/PackagingPostBuild_${PAL_HOST_PLATFORM_NAME_LOWERCASE}.cmake) +set(CPACK_LY_PYTHON_CMD ${LY_PYTHON_CMD}) - set(_3rd_party_license_url "https://raw.githubusercontent.com/o3de/3p-package-source/${CPACK_PACKAGE_VERSION}/${_3rd_party_license_filename}") - set(_3rd_party_license_dest ${CPACK_BINARY_DIR}/${_3rd_party_license_filename}) +# IMPORTANT: required to be included AFTER setting all property overrides +include(CPack REQUIRED) - # use the plain file downloader as we don't have the file hash available and using a dummy will - # delete the file once it fails hash verification - file(DOWNLOAD - ${_3rd_party_license_url} - ${_3rd_party_license_dest} - STATUS _status - TLS_VERIFY ON - ) - list(POP_FRONT _status _status_code) +# configure ALL components here +file(APPEND "${CPACK_OUTPUT_CONFIG_FILE}" " +set(CPACK_COMPONENTS_ALL ${CMAKE_INSTALL_DEFAULT_COMPONENT_NAME}) +set(CPACK_COMPONENT_${CMAKE_INSTALL_DEFAULT_COMPONENT_NAME}_DISPLAY_NAME \"Common files\") +set(CPACK_COMPONENT_${CMAKE_INSTALL_DEFAULT_COMPONENT_NAME}_DESCRIPTION \"${PROJECT_NAME} Headers, scripts and common files\") +set(CPACK_COMPONENT_${CMAKE_INSTALL_DEFAULT_COMPONENT_NAME}_REQUIRED TRUE) +set(CPACK_COMPONENT_${CMAKE_INSTALL_DEFAULT_COMPONENT_NAME}_DISABLED FALSE) - if (${_status_code} EQUAL 0 AND EXISTS ${_3rd_party_license_dest}) - install(FILES ${_3rd_party_license_dest} - DESTINATION . - ) - else() - file(REMOVE ${_3rd_party_license_dest}) - message(FATAL_ERROR "Failed to acquire the 3rd Party license manifest file at ${_3rd_party_license_url}. Error: ${_status}") - endif() +include(CPackComponents.cmake) +") + +# Generate a file (CPackComponents.config) that we will include that defines the components +# for this build permutation. This way we can get components for other permutations being passed +# through LY_INSTALL_EXTERNAL_BUILD_DIRS +unset(cpack_components_contents) + +set(required "FALSE") +set(disabled "FALSE") +if(${LY_INSTALL_PERMUTATION_COMPONENT} STREQUAL DEFAULT) + set(required "TRUE") +else() + set(disabled "TRUE") endif() +string(APPEND cpack_components_contents " +list(APPEND CPACK_COMPONENTS_ALL ${LY_INSTALL_PERMUTATION_COMPONENT}) +set(CPACK_COMPONENT_${LY_INSTALL_PERMUTATION_COMPONENT}_DISPLAY_NAME \"${LY_BUILD_PERMUTATION} common files\") +set(CPACK_COMPONENT_${LY_INSTALL_PERMUTATION_COMPONENT}_DESCRIPTION \"${PROJECT_NAME} scripts and common files for ${LY_BUILD_PERMUTATION}\") +set(CPACK_COMPONENT_${LY_INSTALL_PERMUTATION_COMPONENT}_DEPENDS ${CMAKE_INSTALL_DEFAULT_COMPONENT_NAME}) +set(CPACK_COMPONENT_${LY_INSTALL_PERMUTATION_COMPONENT}_REQUIRED ${required}) +set(CPACK_COMPONENT_${LY_INSTALL_PERMUTATION_COMPONENT}_DISABLED ${disabled}) +") + +foreach(conf IN LISTS CMAKE_CONFIGURATION_TYPES) + string(TOUPPER ${conf} UCONF) + set(required "FALSE") + set(disabled "FALSE") + if(${conf} STREQUAL profile AND ${LY_INSTALL_PERMUTATION_COMPONENT} STREQUAL DEFAULT) + set(required "TRUE") + else() + set(disabled "TRUE") + endif() + + # Inject a check to not declare components that have not been built. We are using AzCore since that is a + # common target that will always be build, in every permutation and configuration + string(APPEND cpack_components_contents " +if(EXISTS \"${CMAKE_ARCHIVE_OUTPUT_DIRECTORY}/${conf}/${CMAKE_STATIC_LIBRARY_PREFIX}AzCore${CMAKE_STATIC_LIBRARY_SUFFIX}\") + list(APPEND CPACK_COMPONENTS_ALL ${LY_INSTALL_PERMUTATION_COMPONENT}_${UCONF}) + set(CPACK_COMPONENT_${LY_INSTALL_PERMUTATION_COMPONENT}_${UCONF}_DISPLAY_NAME \"Binaries for ${LY_BUILD_PERMUTATION} ${conf}\") + set(CPACK_COMPONENT_${LY_INSTALL_PERMUTATION_COMPONENT}_${UCONF}_DESCRIPTION \"${PROJECT_NAME} libraries and applications for ${LY_BUILD_PERMUTATION} ${conf}\") + set(CPACK_COMPONENT_${LY_INSTALL_PERMUTATION_COMPONENT}_${UCONF}_DEPENDS ${LY_INSTALL_PERMUTATION_COMPONENT}) + set(CPACK_COMPONENT_${LY_INSTALL_PERMUTATION_COMPONENT}_${UCONF}_REQUIRED ${required}) + set(CPACK_COMPONENT_${LY_INSTALL_PERMUTATION_COMPONENT}_${UCONF}_DISABLED ${disabled}) +endif() +") +endforeach() +file(WRITE "${CMAKE_BINARY_DIR}/CPackComponents.cmake" ${cpack_components_contents}) + +# Inject other build directories +foreach(external_dir ${LY_INSTALL_EXTERNAL_BUILD_DIRS}) + file(APPEND "${CPACK_OUTPUT_CONFIG_FILE}" + "include(${external_dir}/CPackComponents.cmake)\n" + ) +endforeach() # checks for and removes trailing slash function(strip_trailing_slash in_url out_url) @@ -179,75 +193,13 @@ function(strip_trailing_slash in_url out_url) endif() endfunction() -if(NOT LY_INSTALLER_UPLOAD_URL AND DEFINED ENV{LY_INSTALLER_UPLOAD_URL}) - set(LY_INSTALLER_UPLOAD_URL $ENV{LY_INSTALLER_UPLOAD_URL}) -endif() - -if(LY_INSTALLER_UPLOAD_URL) - ly_is_s3_url(${LY_INSTALLER_UPLOAD_URL} _is_s3_bucket) - if(NOT _is_s3_bucket) - message(FATAL_ERROR "Only S3 installer uploading is supported at this time") - endif() - - if (LY_INSTALLER_AWS_PROFILE) - set(CPACK_AWS_PROFILE ${LY_INSTALLER_AWS_PROFILE}) - elseif (DEFINED ENV{LY_INSTALLER_AWS_PROFILE}) - set(CPACK_AWS_PROFILE $ENV{LY_INSTALLER_AWS_PROFILE}) - endif() - - strip_trailing_slash(${LY_INSTALLER_UPLOAD_URL} LY_INSTALLER_UPLOAD_URL) - set(CPACK_UPLOAD_URL ${LY_INSTALLER_UPLOAD_URL}) -endif() - -# IMPORTANT: required to be included AFTER setting all property overrides -include(CPack REQUIRED) - -function(ly_configure_cpack_component ly_configure_cpack_component_NAME) - - set(options REQUIRED) - set(oneValueArgs DISPLAY_NAME DESCRIPTION LICENSE_NAME LICENSE_FILE) - set(multiValueArgs) - - cmake_parse_arguments(ly_configure_cpack_component "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN}) - - # default to optional - set(component_type DISABLED) - - if(ly_configure_cpack_component_REQUIRED) - set(component_type REQUIRED) - endif() - - set(license_name ${DEFAULT_LICENSE_NAME}) - set(license_file ${DEFAULT_LICENSE_FILE}) - - if(ly_configure_cpack_component_LICENSE_NAME AND ly_configure_cpack_component_LICENSE_FILE) - set(license_name ${ly_configure_cpack_component_LICENSE_NAME}) - set(license_file ${ly_configure_cpack_component_LICENSE_FILE}) - elseif(ly_configure_cpack_component_LICENSE_NAME OR ly_configure_cpack_component_LICENSE_FILE) - message(FATAL_ERROR "Invalid argument configuration. Both LICENSE_NAME and LICENSE_FILE must be set for ly_configure_cpack_component") - endif() - - cpack_add_component( - ${ly_configure_cpack_component_NAME} ${component_type} - DISPLAY_NAME ${ly_configure_cpack_component_DISPLAY_NAME} - DESCRIPTION ${ly_configure_cpack_component_DESCRIPTION} - ) -endfunction() - -# configure ALL components here -ly_configure_cpack_component( - ${CMAKE_INSTALL_DEFAULT_COMPONENT_NAME} REQUIRED - DISPLAY_NAME "${PROJECT_NAME} Core" - DESCRIPTION "${PROJECT_NAME} Headers, Libraries and Tools" -) - if(LY_INSTALLER_DOWNLOAD_URL) strip_trailing_slash(${LY_INSTALLER_DOWNLOAD_URL} LY_INSTALLER_DOWNLOAD_URL) # this will set the following variables: CPACK_DOWNLOAD_SITE, CPACK_DOWNLOAD_ALL, and CPACK_UPLOAD_DIRECTORY (local) cpack_configure_downloads( ${LY_INSTALLER_DOWNLOAD_URL} - UPLOAD_DIRECTORY ${CMAKE_BINARY_DIR}/_CPack_Uploads # to match the _CPack_Packages directory + UPLOAD_DIRECTORY ${CMAKE_BINARY_DIR}/CPackUploads # to match the _CPack_Packages directory ALL ) endif() diff --git a/cmake/Packaging/CMakeDownload.cmake.in b/cmake/Packaging/CMakeDownload.cmake.in new file mode 100644 index 0000000000..e84611b354 --- /dev/null +++ b/cmake/Packaging/CMakeDownload.cmake.in @@ -0,0 +1,54 @@ +# +# 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 +# +# + +set(LY_ROOT_FOLDER "@LY_ROOT_FOLDER@") +set(CMAKE_SCRIPT_MODE_FILE TRUE) +include(@LY_ROOT_FOLDER@/cmake/3rdPartyPackages.cmake) + +if(EXISTS "@LY_CMAKE_PACKAGE_DOWNLOAD_PATH@") + file(SHA256 "@LY_CMAKE_PACKAGE_DOWNLOAD_PATH@" hash_of_downloaded_file) + if (NOT "${hash_of_downloaded_file}" STREQUAL "@CPACK_CMAKE_PACKAGE_HASH@") + message(STATUS "CMake @CPACK_DESIRED_CMAKE_VERSION@ found at @LY_CMAKE_PACKAGE_DOWNLOAD_PATH@ but expected hash missmatches, re-downloading...") + file(REMOVE "@LY_CMAKE_PACKAGE_DOWNLOAD_PATH@") + else() + message(STATUS "CMake @CPACK_DESIRED_CMAKE_VERSION@ found") + endif() +endif() +if(NOT EXISTS "@LY_CMAKE_PACKAGE_DOWNLOAD_PATH@") + # download it + string(REPLACE "." ";" _version_components "@CPACK_DESIRED_CMAKE_VERSION@") + list(GET _version_components 0 _major_version) + list(GET _version_components 1 _minor_version) + + set(_url_version_tag "v${_major_version}.${_minor_version}") + set(_package_url "https://cmake.org/files/${_url_version_tag}/@CPACK_CMAKE_PACKAGE_FILE@") + + message(STATUS "Downloading CMake @CPACK_DESIRED_CMAKE_VERSION@ for packaging...") + download_file( + URL ${_package_url} + TARGET_FILE @LY_CMAKE_PACKAGE_DOWNLOAD_PATH@ + EXPECTED_HASH @CPACK_CMAKE_PACKAGE_HASH@ + RESULTS _results + ) + list(GET _results 0 _status_code) + + if (${_status_code} EQUAL 0 AND EXISTS "@LY_CMAKE_PACKAGE_DOWNLOAD_PATH@") + message(STATUS "CMake @CPACK_DESIRED_CMAKE_VERSION@ found") + else() + file(REMOVE "@LY_CMAKE_PACKAGE_DOWNLOAD_PATH@") + list(REMOVE_AT _results 0) + + set(_error_message "An error occurred, code ${_status_code}. URL ${_package_url} - ${_results}") + if(${_status_code} EQUAL 1) + string(APPEND _error_message + " Please double check the CPACK_CMAKE_PACKAGE_FILE and " + "CPACK_CMAKE_PACKAGE_HASH properties before trying again.") + endif() + message(FATAL_ERROR ${_error_message}) + endif() +endif() diff --git a/cmake/Platform/Common/Install_common.cmake b/cmake/Platform/Common/Install_common.cmake index f844b1bec9..46130f1345 100644 --- a/cmake/Platform/Common/Install_common.cmake +++ b/cmake/Platform/Common/Install_common.cmake @@ -8,6 +8,14 @@ include(cmake/FileUtil.cmake) +set(LY_INSTALL_EXTERNAL_BUILD_DIRS "" CACHE PATH "External build directories to be included in the install process. This allows to package non-monolithic and monolithic.") +unset(normalized_external_build_dirs) +foreach(external_dir ${LY_INSTALL_EXTERNAL_BUILD_DIRS}) + cmake_path(ABSOLUTE_PATH external_dir BASE_DIRECTORY ${LY_ROOT_FOLDER} NORMALIZE) + list(APPEND normalized_external_build_dirs ${external_dir}) +endforeach() +set(LY_INSTALL_EXTERNAL_BUILD_DIRS ${normalized_external_build_dirs}) + set(CMAKE_INSTALL_MESSAGE NEVER) # Simplify messages to reduce output noise define_property(TARGET PROPERTY LY_INSTALL_GENERATE_RUN_TARGET @@ -19,13 +27,25 @@ define_property(TARGET PROPERTY LY_INSTALL_GENERATE_RUN_TARGET ]] ) -ly_set(CMAKE_INSTALL_DEFAULT_COMPONENT_NAME Core) +# We can have elements being installed under the following components: +# - Core (required for all) (default) +# - Default +# - Default_$ +# - Monolithic +# - Monolithic_$ +# Debug/Monolithic are build permutations, so for a CMake run, it can only generate +# one of the permutations. Each build permutation can generate only one cmake_install.cmake. +# Each build permutation will generate the same elements in Core. +# CPack is able to put the two together by taking Core from one permutation and then taking +# each permutation. +ly_set(CMAKE_INSTALL_DEFAULT_COMPONENT_NAME CORE) if(LY_MONOLITHIC_GAME) set(LY_BUILD_PERMUTATION Monolithic) else() set(LY_BUILD_PERMUTATION Default) endif() +string(TOUPPER ${LY_BUILD_PERMUTATION} LY_INSTALL_PERMUTATION_COMPONENT) cmake_path(RELATIVE_PATH CMAKE_RUNTIME_OUTPUT_DIRECTORY BASE_DIRECTORY ${CMAKE_BINARY_DIR} OUTPUT_VARIABLE runtime_output_directory) cmake_path(RELATIVE_PATH CMAKE_LIBRARY_OUTPUT_DIRECTORY BASE_DIRECTORY ${CMAKE_BINARY_DIR} OUTPUT_VARIABLE library_output_directory) @@ -65,14 +85,24 @@ function(ly_setup_target OUTPUT_CONFIGURED_TARGET ALIAS_TARGET_NAME absolute_tar continue() endif() + # For some cases (e.g. codegen) we generate headers that end up in the BUILD_DIR. Since the BUILD_DIR + # is per-permutation, we need to install such headers per permutation. For the other cases, we can install + # under the default component since they are shared across permutations/configs. + cmake_path(IS_PREFIX CMAKE_BINARY_DIR ${include_directory} NORMALIZE include_directory_child_of_build) + if(NOT include_directory_child_of_build) + set(include_directory_component ${CMAKE_INSTALL_DEFAULT_COMPONENT_NAME}) + else() + set(include_directory_component ${LY_INSTALL_PERMUTATION_COMPONENT}) + endif() + unset(rel_include_dir) cmake_path(RELATIVE_PATH include_directory BASE_DIRECTORY ${LY_ROOT_FOLDER} OUTPUT_VARIABLE rel_include_dir) cmake_path(APPEND rel_include_dir "..") cmake_path(NORMAL_PATH rel_include_dir OUTPUT_VARIABLE destination_dir) - - install(DIRECTORY ${include_directory} + + ly_install(DIRECTORY ${include_directory} DESTINATION ${destination_dir} - COMPONENT ${CMAKE_INSTALL_DEFAULT_COMPONENT_NAME} + COMPONENT ${include_directory_component} FILES_MATCHING PATTERN *.h PATTERN *.hpp @@ -94,9 +124,9 @@ function(ly_setup_target OUTPUT_CONFIGURED_TARGET ALIAS_TARGET_NAME absolute_tar cmake_path(RELATIVE_PATH target_library_output_directory BASE_DIRECTORY ${CMAKE_LIBRARY_OUTPUT_DIRECTORY} OUTPUT_VARIABLE target_library_output_subdirectory) endif() - if(COMMAND ly_install_target_override) + if(COMMAND ly_setup_target_install_targets_override) # Mac needs special handling because of a cmake issue - ly_install_target_override(TARGET ${TARGET_NAME} + ly_setup_target_install_targets_override(TARGET ${TARGET_NAME} ARCHIVE_DIR ${archive_output_directory} LIBRARY_DIR ${library_output_directory} RUNTIME_DIR ${runtime_output_directory} @@ -104,18 +134,23 @@ function(ly_setup_target OUTPUT_CONFIGURED_TARGET ALIAS_TARGET_NAME absolute_tar RUNTIME_SUBDIR ${target_runtime_output_subdirectory} ) else() - install( - TARGETS ${TARGET_NAME} - ARCHIVE - DESTINATION ${archive_output_directory} - COMPONENT ${CMAKE_INSTALL_DEFAULT_COMPONENT_NAME} - LIBRARY - DESTINATION ${library_output_directory}/${target_library_output_subdirectory} - COMPONENT ${CMAKE_INSTALL_DEFAULT_COMPONENT_NAME} - RUNTIME - DESTINATION ${runtime_output_directory}/${target_runtime_output_subdirectory} - COMPONENT ${CMAKE_INSTALL_DEFAULT_COMPONENT_NAME} - ) + foreach(conf IN LISTS CMAKE_CONFIGURATION_TYPES) + string(TOUPPER ${conf} UCONF) + ly_install(TARGETS ${TARGET_NAME} + ARCHIVE + DESTINATION ${archive_output_directory} + COMPONENT ${LY_INSTALL_PERMUTATION_COMPONENT}_${UCONF} + CONFIGURATIONS ${conf} + LIBRARY + DESTINATION ${library_output_directory}/${target_library_output_subdirectory} + COMPONENT ${LY_INSTALL_PERMUTATION_COMPONENT}_${UCONF} + CONFIGURATIONS ${conf} + RUNTIME + DESTINATION ${runtime_output_directory}/${target_runtime_output_subdirectory} + COMPONENT ${LY_INSTALL_PERMUTATION_COMPONENT}_${UCONF} + CONFIGURATIONS ${conf} + ) + endforeach() endif() # CMakeLists.txt related files @@ -189,8 +224,14 @@ function(ly_setup_target OUTPUT_CONFIGURED_TARGET ALIAS_TARGET_NAME absolute_tar if("${target_type}" STREQUAL "STATIC_LIBRARY") set(build_deps_target "${build_deps_target};${build_deps_PRIVATE}") endif() - # But we will also pass the private dependencies as runtime dependencies (note the comment above) - set(RUNTIME_DEPENDENCIES_PLACEHOLDER ${build_deps_PRIVATE}) + + # But we will also pass the private dependencies as runtime dependencies (as long as they are targets, note the comment above) + foreach(build_dep_private IN LISTS build_deps_PRIVATE) + if(TARGET ${build_dep_private}) + list(APPEND RUNTIME_DEPENDENCIES_PLACEHOLDER "${build_dep_private}") + endif() + endforeach() + foreach(build_dependency IN LISTS build_deps_target) # Skip wrapping produced when targets are not created in the same directory if(build_dependency) @@ -280,10 +321,15 @@ set_property(TARGET ${NAME_PLACEHOLDER} set(target_install_source_dir ${CMAKE_CURRENT_BINARY_DIR}/install/${relative_target_source_dir}) file(GENERATE OUTPUT "${target_install_source_dir}/Platform/${PAL_PLATFORM_NAME}/${LY_BUILD_PERMUTATION}/${NAME_PLACEHOLDER}_$.cmake" CONTENT "${target_file_contents}") - install(FILES "${target_install_source_dir}/Platform/${PAL_PLATFORM_NAME}/${LY_BUILD_PERMUTATION}/${NAME_PLACEHOLDER}_$.cmake" - DESTINATION ${relative_target_source_dir}/Platform/${PAL_PLATFORM_NAME}/${LY_BUILD_PERMUTATION} - COMPONENT ${CMAKE_INSTALL_DEFAULT_COMPONENT_NAME} - ) + + foreach(conf IN LISTS CMAKE_CONFIGURATION_TYPES) + string(TOUPPER ${conf} UCONF) + ly_install(FILES "${target_install_source_dir}/Platform/${PAL_PLATFORM_NAME}/${LY_BUILD_PERMUTATION}/${NAME_PLACEHOLDER}_${conf}.cmake" + DESTINATION ${relative_target_source_dir}/Platform/${PAL_PLATFORM_NAME}/${LY_BUILD_PERMUTATION} + COMPONENT ${LY_INSTALL_PERMUTATION_COMPONENT}_${UCONF} + CONFIGURATIONS ${conf} + ) + endforeach() # Since a CMakeLists.txt could contain multiple targets, we generate it in a folder per target ly_file_read(${LY_ROOT_FOLDER}/cmake/install/InstalledTarget.in target_cmakelists_template) @@ -323,7 +369,8 @@ function(ly_setup_subdirectory absolute_target_source_dir) @cmake_copyright_comment@ include(Platform/${PAL_PLATFORM_NAME}/platform_${PAL_PLATFORM_NAME_LOWERCASE}.cmake) ]] @ONLY) - install(FILES "${target_install_source_dir}/CMakeLists.txt" + + ly_install(FILES "${target_install_source_dir}/CMakeLists.txt" DESTINATION ${relative_target_source_dir} COMPONENT ${CMAKE_INSTALL_DEFAULT_COMPONENT_NAME} ) @@ -338,7 +385,7 @@ else() include(Platform/${PAL_PLATFORM_NAME}/Default/permutation.cmake) endif() ]]) - install(FILES "${target_install_source_dir}/Platform/${PAL_PLATFORM_NAME}/platform_${PAL_PLATFORM_NAME_LOWERCASE}.cmake" + ly_install(FILES "${target_install_source_dir}/Platform/${PAL_PLATFORM_NAME}/platform_${PAL_PLATFORM_NAME_LOWERCASE}.cmake" DESTINATION ${relative_target_source_dir}/Platform/${PAL_PLATFORM_NAME} COMPONENT ${CMAKE_INSTALL_DEFAULT_COMPONENT_NAME} ) @@ -358,9 +405,10 @@ endif() "${GEM_VARIANT_TO_LOAD_PLACEHOLDER}" "${ENABLE_GEMS_PLACEHOLDER}" ) - install(FILES "${target_install_source_dir}/Platform/${PAL_PLATFORM_NAME}/${LY_BUILD_PERMUTATION}/permutation.cmake" - DESTINATION ${relative_target_source_dir}//Platform/${PAL_PLATFORM_NAME}/${LY_BUILD_PERMUTATION} - COMPONENT ${CMAKE_INSTALL_DEFAULT_COMPONENT_NAME} + + ly_install(FILES "${target_install_source_dir}/Platform/${PAL_PLATFORM_NAME}/${LY_BUILD_PERMUTATION}/permutation.cmake" + DESTINATION ${relative_target_source_dir}/Platform/${PAL_PLATFORM_NAME}/${LY_BUILD_PERMUTATION} + COMPONENT ${LY_INSTALL_PERMUTATION_COMPONENT} ) endfunction() @@ -368,7 +416,7 @@ endfunction() #! ly_setup_cmake_install: install the "cmake" folder function(ly_setup_cmake_install) - install(DIRECTORY "${LY_ROOT_FOLDER}/cmake" + ly_install(DIRECTORY "${LY_ROOT_FOLDER}/cmake" DESTINATION . COMPONENT ${CMAKE_INSTALL_DEFAULT_COMPONENT_NAME} PATTERN "__pycache__" EXCLUDE @@ -378,22 +426,24 @@ function(ly_setup_cmake_install) ) # Connect configuration types - install(FILES "${LY_ROOT_FOLDER}/cmake/install/ConfigurationTypes.cmake" + ly_install(FILES "${LY_ROOT_FOLDER}/cmake/install/ConfigurationTypes.cmake" DESTINATION cmake COMPONENT ${CMAKE_INSTALL_DEFAULT_COMPONENT_NAME} ) - # Inject code that will generate each ConfigurationType_.cmake file - set(install_configuration_type_template [=[ - configure_file(@LY_ROOT_FOLDER@/cmake/install/ConfigurationType_config.cmake.in - ${CMAKE_INSTALL_PREFIX}/cmake/Platform/@PAL_PLATFORM_NAME@/@LY_BUILD_PERMUTATION@/ConfigurationTypes_${CMAKE_INSTALL_CONFIG_NAME}.cmake + + # generate each ConfigurationType_.cmake file and install it under that configuration + foreach(conf IN LISTS CMAKE_CONFIGURATION_TYPES) + string(TOUPPER ${conf} UCONF) + configure_file("${LY_ROOT_FOLDER}/cmake/install/ConfigurationType_config.cmake.in" + "${CMAKE_BINARY_DIR}/cmake/Platform/${PAL_PLATFORM_NAME}/${LY_BUILD_PERMUTATION}/ConfigurationTypes_${conf}.cmake" @ONLY ) - message(STATUS "Generated ${CMAKE_INSTALL_PREFIX}/cmake/Platform/@PAL_PLATFORM_NAME@/@LY_BUILD_PERMUTATION@/ConfigurationTypes_${CMAKE_INSTALL_CONFIG_NAME}.cmake") - ]=]) - string(CONFIGURE "${install_configuration_type_template}" install_configuration_type @ONLY) - install(CODE "${install_configuration_type}" - COMPONENT ${CMAKE_INSTALL_DEFAULT_COMPONENT_NAME} - ) + ly_install(FILES "${CMAKE_BINARY_DIR}/cmake/Platform/${PAL_PLATFORM_NAME}/${LY_BUILD_PERMUTATION}/ConfigurationTypes_${conf}.cmake" + DESTINATION cmake/Platform/${PAL_PLATFORM_NAME}/${LY_BUILD_PERMUTATION} + COMPONENT ${LY_INSTALL_PERMUTATION_COMPONENT}_${UCONF} + CONFIGURATIONS ${conf} + ) + endforeach() # Transform the LY_EXTERNAL_SUBDIRS list into a json array set(indent " ") @@ -412,8 +462,7 @@ function(ly_setup_cmake_install) configure_file(${LY_ROOT_FOLDER}/cmake/install/engine.json.in ${CMAKE_CURRENT_BINARY_DIR}/cmake/engine.json @ONLY) - install( - FILES + ly_install(FILES "${LY_ROOT_FOLDER}/CMakeLists.txt" "${CMAKE_CURRENT_BINARY_DIR}/cmake/engine.json" DESTINATION . @@ -437,18 +486,18 @@ function(ly_setup_cmake_install) endforeach() endforeach() - install(FILES ${additional_find_files} + ly_install(FILES ${additional_find_files} DESTINATION cmake/3rdParty COMPONENT ${CMAKE_INSTALL_DEFAULT_COMPONENT_NAME} ) - install(FILES ${additional_platform_files} + ly_install(FILES ${additional_platform_files} DESTINATION cmake/3rdParty/Platform/${PAL_PLATFORM_NAME} COMPONENT ${CMAKE_INSTALL_DEFAULT_COMPONENT_NAME} ) # Findo3de.cmake file: we generate a different Findo3de.cmake file than the one we have in the source dir. configure_file(${LY_ROOT_FOLDER}/cmake/install/Findo3de.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/cmake/Findo3de.cmake @ONLY) - install(FILES "${CMAKE_CURRENT_BINARY_DIR}/cmake/Findo3de.cmake" + ly_install(FILES "${CMAKE_CURRENT_BINARY_DIR}/cmake/Findo3de.cmake" DESTINATION cmake COMPONENT ${CMAKE_INSTALL_DEFAULT_COMPONENT_NAME} ) @@ -467,9 +516,9 @@ function(ly_setup_cmake_install) ${find_subdirectories} " ) - install(FILES "${permutation_find_subdirectories}" + ly_install(FILES "${permutation_find_subdirectories}" DESTINATION cmake/Platform/${PAL_PLATFORM_NAME}/${LY_BUILD_PERMUTATION} - COMPONENT ${CMAKE_INSTALL_DEFAULT_COMPONENT_NAME} + COMPONENT ${LY_INSTALL_PERMUTATION_COMPONENT} ) set(pal_builtin_file ${CMAKE_CURRENT_BINARY_DIR}/cmake/3rdParty/Platform/${PAL_PLATFORM_NAME}/BuiltInPackages_${PAL_PLATFORM_NAME_LOWERCASE}.cmake) @@ -483,7 +532,7 @@ else() endif() " ) - install(FILES "${pal_builtin_file}" + ly_install(FILES "${pal_builtin_file}" DESTINATION cmake/3rdParty/Platform/${PAL_PLATFORM_NAME} COMPONENT ${CMAKE_INSTALL_DEFAULT_COMPONENT_NAME} ) @@ -506,9 +555,9 @@ endif() file(GENERATE OUTPUT ${permutation_builtin_file} CONTENT ${builtinpackages} ) - install(FILES "${permutation_builtin_file}" + ly_install(FILES "${permutation_builtin_file}" DESTINATION cmake/3rdParty/Platform/${PAL_PLATFORM_NAME}/${LY_BUILD_PERMUTATION} - COMPONENT ${CMAKE_INSTALL_DEFAULT_COMPONENT_NAME} + COMPONENT ${LY_INSTALL_PERMUTATION_COMPONENT} ) endfunction() @@ -517,15 +566,27 @@ endfunction() function(ly_setup_runtime_dependencies) # Common functions used by the bellow code - if(COMMAND ly_install_code_function_override) - ly_install_code_function_override() + if(COMMAND ly_setup_runtime_dependencies_copy_function_override) + ly_setup_runtime_dependencies_copy_function_override() else() - install(CODE + # despite this copy function being the same, we need to install it per component that uses it + # (which is per-configuration per-permutation component) + foreach(conf IN LISTS CMAKE_CONFIGURATION_TYPES) + string(TOUPPER ${conf} UCONF) + ly_install(CODE "function(ly_copy source_file target_directory) - file(COPY \"\${source_file}\" DESTINATION \"\${target_directory}\" FILE_PERMISSIONS ${LY_COPY_PERMISSIONS}) + cmake_path(GET source_file FILENAME target_filename) + cmake_path(APPEND full_target_directory \"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}\" \"\${target_directory}\") + cmake_path(APPEND target_file \"\${full_target_directory}\" \"\${target_filename}\") + if(\"\${source_file}\" IS_NEWER_THAN \"\${target_file}\") + message(STATUS \"Copying \${source_file} to \${full_target_directory}...\") + file(COPY \"\${source_file}\" DESTINATION \"\${full_target_directory}\" FILE_PERMISSIONS ${LY_COPY_PERMISSIONS} FOLLOW_SYMLINK_CHAIN) + file(TOUCH_NOCREATE \"${target_file}\") + endif() endfunction()" - COMPONENT ${CMAKE_INSTALL_DEFAULT_COMPONENT_NAME} - ) + COMPONENT ${LY_INSTALL_PERMUTATION_COMPONENT}_${UCONF} + ) + endforeach() endif() unset(runtime_commands) @@ -545,12 +606,7 @@ endfunction()" endif() # runtime dependencies that need to be copied to the output - # Anywhere CMAKE_INSTALL_PREFIX is used, it has to be escaped so it is baked into the cmake_install.cmake script instead - # of baking the path. This is needed so `cmake --install --prefix ` works regardless of the CMAKE_INSTALL_PREFIX - # used to generate the solution. - # CMAKE_INSTALL_PREFIX is still used when building the INSTALL target - set(install_output_folder "\${CMAKE_INSTALL_PREFIX}/${runtime_output_directory}") - set(target_file_dir "${install_output_folder}/${target_runtime_output_subdirectory}") + set(target_file_dir "${runtime_output_directory}/${target_runtime_output_subdirectory}") ly_get_runtime_dependencies(runtime_dependencies ${target}) foreach(runtime_dependency ${runtime_dependencies}) unset(runtime_command) @@ -564,9 +620,12 @@ endfunction()" list(REMOVE_DUPLICATES runtime_commands) list(JOIN runtime_commands " " runtime_commands_str) # the spaces are just to see the right identation in the cmake_install.cmake file - install(CODE "${runtime_commands_str}" - COMPONENT ${CMAKE_INSTALL_DEFAULT_COMPONENT_NAME} - ) + foreach(conf IN LISTS CMAKE_CONFIGURATION_TYPES) + string(TOUPPER ${conf} UCONF) + ly_install(CODE "${runtime_commands_str}" + COMPONENT ${LY_INSTALL_PERMUTATION_COMPONENT}_${UCONF} + ) + endforeach() endfunction() @@ -653,16 +712,17 @@ function(ly_setup_assets) endif() if(IS_DIRECTORY ${gem_absolute_path}) - install(DIRECTORY "${gem_absolute_path}" + ly_install(DIRECTORY "${gem_absolute_path}" DESTINATION ${gem_install_dest_dir} COMPONENT ${CMAKE_INSTALL_DEFAULT_COMPONENT_NAME} ) elseif (EXISTS ${gem_absolute_path}) - install(FILES ${gem_absolute_path} + ly_install(FILES ${gem_absolute_path} DESTINATION ${gem_install_dest_dir} COMPONENT ${CMAKE_INSTALL_DEFAULT_COMPONENT_NAME} ) endif() + endforeach() endforeach() @@ -733,7 +793,7 @@ function(ly_setup_o3de_install) ly_setup_assets() # Misc - install(FILES + ly_install(FILES ${LY_ROOT_FOLDER}/pytest.ini ${LY_ROOT_FOLDER}/LICENSE.txt ${LY_ROOT_FOLDER}/README.md @@ -743,7 +803,7 @@ function(ly_setup_o3de_install) # Inject other build directories foreach(external_dir ${LY_INSTALL_EXTERNAL_BUILD_DIRS}) - install(CODE + ly_install(CODE "set(LY_CORE_COMPONENT_ALREADY_INCLUDED TRUE) include(${external_dir}/cmake_install.cmake) set(LY_CORE_COMPONENT_ALREADY_INCLUDED FALSE)" @@ -755,4 +815,4 @@ set(LY_CORE_COMPONENT_ALREADY_INCLUDED FALSE)" ly_post_install_steps() endif() -endfunction() \ No newline at end of file +endfunction() diff --git a/cmake/Platform/Common/PackagingPostBuild_common.cmake b/cmake/Platform/Common/PackagingPostBuild_common.cmake new file mode 100644 index 0000000000..6e3c7ddf0b --- /dev/null +++ b/cmake/Platform/Common/PackagingPostBuild_common.cmake @@ -0,0 +1,114 @@ +# +# 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 +# +# + +message(STATUS "Executing packaging postbuild...") + +# ly_is_s3_url +# if the given URL is a s3 url of thr form "s3://(stuff)" then sets +# the output_variable_name to TRUE otherwise unsets it. +function (ly_is_s3_url download_url output_variable_name) + if ("${download_url}" MATCHES "s3://.*") + set(${output_variable_name} TRUE PARENT_SCOPE) + else() + unset(${output_variable_name} PARENT_SCOPE) + endif() +endfunction() + +function(ly_upload_to_url in_url in_local_path in_file_regex) + + message(STATUS "Uploading ${in_local_path}/${in_file_regex} artifacts to ${CPACK_UPLOAD_URL}") + ly_is_s3_url(${in_url} _is_s3_bucket) + if(NOT _is_s3_bucket) + message(FATAL_ERROR "Only S3 installer uploading is supported at this time") + endif() + + # strip the scheme and extract the bucket/key prefix from the URL + string(REPLACE "s3://" "" _stripped_url ${in_url}) + string(REPLACE "/" ";" _tokens ${_stripped_url}) + + list(POP_FRONT _tokens _bucket) + string(JOIN "/" _prefix ${_tokens}) + + set(_extra_args [[{"ACL":"bucket-owner-full-control"}]]) + + file(TO_NATIVE_PATH "${LY_ROOT_FOLDER}/scripts/build/tools/upload_to_s3.py" _upload_script) + + set(_upload_command + ${CPACK_LY_PYTHON_CMD} -s + -u ${_upload_script} + --base_dir ${in_local_path} + --file_regex="${in_file_regex}" + --bucket ${_bucket} + --key_prefix ${_prefix} + --extra_args ${_extra_args} + ) + + if(CPACK_AWS_PROFILE) + list(APPEND _upload_command --profile ${CPACK_AWS_PROFILE}) + endif() + + execute_process( + COMMAND ${_upload_command} + RESULT_VARIABLE _upload_result + OUTPUT_VARIABLE _upload_output + ERROR_VARIABLE _upload_error + OUTPUT_STRIP_TRAILING_WHITESPACE + ) + + if (${_upload_result} EQUAL 0) + message(STATUS "Artifact uploading complete!") + else() + message(FATAL_ERROR "An error occurred uploading to s3.\n Output: ${_upload_output}\n\ Error: ${_upload_error}") + endif() +endfunction() + +function(ly_upload_to_latest in_url in_path) + + message(STATUS "Updating latest tagged build") + + # make sure we can extra the commit info from the URL first + string(REGEX MATCH "([0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]-[0-9a-zA-Z]+)" + commit_info ${in_url} + ) + if(NOT commit_info) + message(FATAL_ERROR "Failed to extract the build tag") + endif() + + # Create a temp directory where we are going to rename the file to take out the version + # and then upload it + set(temp_dir ${CPACK_BINARY_DIR}/temp) + if(NOT EXISTS ${temp_dir}) + file(MAKE_DIRECTORY ${temp_dir}) + endif() + file(COPY ${in_path} DESTINATION ${temp_dir}) + + cmake_path(GET in_path FILENAME in_path_filename) + string(REPLACE "_${CPACK_PACKAGE_VERSION}" "" non_versioned_in_path_filename ${in_path_filename}) + file(RENAME "${temp_dir}/${in_path_filename}" "${temp_dir}/${non_versioned_in_path_filename}") + + # include the commit info in a text file that will live next to the exe + set(_temp_info_file ${temp_dir}/build_tag.txt) + file(WRITE ${_temp_info_file} ${commit_info}) + + # update the URL and upload + string(REPLACE + ${commit_info} "Latest" + latest_upload_url ${in_url} + ) + + ly_upload_to_url( + ${latest_upload_url} + ${temp_dir} + ".*(${non_versioned_in_path_filename}|build_tag.txt)$" + ) + + # cleanup the temp files + file(REMOVE_RECURSE ${temp_dir}) + message(STATUS "Latest build update complete!") + +endfunction() \ No newline at end of file diff --git a/cmake/Platform/Common/PackagingPreBuild_common.cmake b/cmake/Platform/Common/PackagingPreBuild_common.cmake new file mode 100644 index 0000000000..e6b8a7796e --- /dev/null +++ b/cmake/Platform/Common/PackagingPreBuild_common.cmake @@ -0,0 +1,5 @@ +# For complete copyright and license terms please see the LICENSE at the root of this distribution. +# +# SPDX-License-Identifier: Apache-2.0 OR MIT +# +# diff --git a/cmake/Platform/Common/RuntimeDependencies_common.cmake b/cmake/Platform/Common/RuntimeDependencies_common.cmake index 60e55453f8..a03f7f667b 100644 --- a/cmake/Platform/Common/RuntimeDependencies_common.cmake +++ b/cmake/Platform/Common/RuntimeDependencies_common.cmake @@ -272,7 +272,7 @@ function(ly_delayed_generate_runtime_dependencies) endforeach() # Generate the output file, note the STAMP_OUTPUT_FILE need to match with the one defined in LYWrappers.cmake - set(STAMP_OUTPUT_FILE ${CMAKE_BINARY_DIR}/runtime_dependencies/$/${target}_$.stamp) + set(STAMP_OUTPUT_FILE ${CMAKE_BINARY_DIR}/runtime_dependencies/$/${target}.stamp) set(target_file_dir "$") set(target_file "$") ly_file_read(${LY_RUNTIME_DEPENDENCIES_TEMPLATE} template_file) diff --git a/cmake/Platform/Common/runtime_dependencies_common.cmake.in b/cmake/Platform/Common/runtime_dependencies_common.cmake.in index 6e41dbaad1..8717710a3b 100644 --- a/cmake/Platform/Common/runtime_dependencies_common.cmake.in +++ b/cmake/Platform/Common/runtime_dependencies_common.cmake.in @@ -9,14 +9,22 @@ cmake_policy(SET CMP0012 NEW) # new policy for the if that evaluates a boolean out of "if(NOT ${same_location})" function(ly_copy source_file target_directory) - get_filename_component(target_filename "${source_file}" NAME) - cmake_path(COMPARE "${source_file}" EQUAL "${target_directory}/${target_filename}" same_location) + cmake_path(GET source_file FILENAME target_filename) + cmake_path(APPEND target_file "${target_directory}" "${target_filename}") + cmake_path(COMPARE "${source_file}" EQUAL "${target_file}" same_location) if(NOT ${same_location}) - file(LOCK ${target_directory}/${target_filename}.lock GUARD FUNCTION TIMEOUT 300) - if("${source_file}" IS_NEWER_THAN "${target_directory}/${target_filename}") + file(LOCK ${target_file}.lock GUARD FUNCTION TIMEOUT 300) + file(SIZE "${source_file}" source_file_size) + if(EXISTS "${target_file}") + file(SIZE "${target_file}" target_file_size) + else() + set(target_file_size 0) + endif() + if((NOT source_file_size EQUAL target_file_size) OR "${source_file}" IS_NEWER_THAN "${target_file}") message(STATUS "Copying \"${source_file}\" to \"${target_directory}\"...") + file(MAKE_DIRECTORY "${full_target_directory}") file(COPY "${source_file}" DESTINATION "${target_directory}" FILE_PERMISSIONS @LY_COPY_PERMISSIONS@ FOLLOW_SYMLINK_CHAIN) - file(TOUCH_NOCREATE ${target_directory}/${target_filename}) + file(TOUCH_NOCREATE ${target_file}) endif() endif() endfunction() diff --git a/cmake/Platform/Linux/CompilerSettings_linux.cmake b/cmake/Platform/Linux/CompilerSettings_linux.cmake new file mode 100644 index 0000000000..9bb629c53b --- /dev/null +++ b/cmake/Platform/Linux/CompilerSettings_linux.cmake @@ -0,0 +1,34 @@ +# +# 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 +# +# + +if(NOT CMAKE_C_COMPILER AND NOT CMAKE_CXX_COMPILER AND NOT "$ENV{CC}" AND NOT "$ENV{CXX}") + set(path_search + /bin + /usr/bin + /usr/local/bin + /sbin + /usr/sbin + /usr/local/sbin + ) + list(TRANSFORM path_search APPEND "/clang-[0-9]*") + file(GLOB clang_versions ${path_search}) + if(clang_versions) + # Find and pick the highest installed version + list(SORT clang_versions COMPARE NATURAL) + list(GET clang_versions 0 clang_higher_version_path) + string(REGEX MATCH "clang-([0-9.]*)" clang_higher_version ${clang_higher_version_path}) + if(CMAKE_MATCH_1) + set(CMAKE_C_COMPILER clang-${CMAKE_MATCH_1}) + set(CMAKE_CXX_COMPILER clang++-${CMAKE_MATCH_1}) + else() + message(FATAL_ERROR "Clang not found, please install clang") + endif() + else() + message(FATAL_ERROR "Clang not found, please install clang") + endif() +endif() diff --git a/cmake/Platform/Linux/Install_linux.cmake b/cmake/Platform/Linux/Install_linux.cmake index dea26e5872..0f5494131a 100644 --- a/cmake/Platform/Linux/Install_linux.cmake +++ b/cmake/Platform/Linux/Install_linux.cmake @@ -6,25 +6,41 @@ # # -#! ly_install_code_function_override: Linux-specific copy function to handle RPATH fixes +#! ly_setup_runtime_dependencies_copy_function_override: Linux-specific copy function to handle RPATH fixes set(ly_copy_template [[ function(ly_copy source_file target_directory) - file(COPY "${source_file}" DESTINATION "${target_directory}" FILE_PERMISSIONS @LY_COPY_PERMISSIONS@ FOLLOW_SYMLINK_CHAIN) - get_filename_component(target_filename_ext "${source_file}" LAST_EXT) - if("${source_file}" MATCHES "qt/plugins" AND "${target_filename_ext}" STREQUAL ".so") - get_filename_component(target_filename "${source_file}" NAME) - file(RPATH_CHANGE FILE "${target_directory}/${target_filename}" OLD_RPATH "\$ORIGIN/../../lib" NEW_RPATH "\$ORIGIN/..") - elseif("${source_file}" MATCHES "lrelease") - get_filename_component(target_filename "${source_file}" NAME) - file(RPATH_CHANGE FILE "${target_directory}/${target_filename}" OLD_RPATH "\$ORIGIN/../lib" NEW_RPATH "\$ORIGIN") + cmake_path(GET source_file FILENAME target_filename) + cmake_path(APPEND full_target_directory "$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}" "${target_directory}") + cmake_path(APPEND target_file "${full_target_directory}" "${target_filename}") + if("${source_file}" IS_NEWER_THAN "${target_file}") + message(STATUS "Copying ${source_file} to ${full_target_directory}...") + file(MAKE_DIRECTORY "${full_target_directory}") + file(COPY "${source_file}" DESTINATION "${full_target_directory}" FILE_PERMISSIONS @LY_COPY_PERMISSIONS@ FOLLOW_SYMLINK_CHAIN) + file(TOUCH_NOCREATE "${target_file}") + + # Special case for install + cmake_PATH(GET source_file EXTENSION target_filename_ext) + if("${target_filename_ext}" STREQUAL ".so") + if("${source_file}" MATCHES "qt/plugins") + file(RPATH_CHANGE FILE "${target_file}" OLD_RPATH "\$ORIGIN/../../lib" NEW_RPATH "\$ORIGIN/..") + endif() + if(CMAKE_INSTALL_DO_STRIP) + execute_process(COMMAND @CMAKE_STRIP@ "${target_file}") + endif() + elseif("${source_file}" MATCHES "lrelease") + file(RPATH_CHANGE FILE "${target_file}" OLD_RPATH "\$ORIGIN/../lib" NEW_RPATH "\$ORIGIN") + endif() endif() endfunction()]]) -function(ly_install_code_function_override) +function(ly_setup_runtime_dependencies_copy_function_override) string(CONFIGURE "${ly_copy_template}" ly_copy_function_linux @ONLY) - install(CODE "${ly_copy_function_linux}" - COMPONENT ${CMAKE_INSTALL_DEFAULT_COMPONENT_NAME} - ) + foreach(conf IN LISTS CMAKE_CONFIGURATION_TYPES) + string(TOUPPER ${conf} UCONF) + ly_install(CODE "${ly_copy_function_linux}" + COMPONENT ${LY_INSTALL_PERMUTATION_COMPONENT}_${UCONF} + ) + endforeach() endfunction() include(cmake/Platform/Common/Install_common.cmake) diff --git a/cmake/Platform/Linux/PAL_linux.cmake b/cmake/Platform/Linux/PAL_linux.cmake index e74adb287e..9383b8fcf6 100644 --- a/cmake/Platform/Linux/PAL_linux.cmake +++ b/cmake/Platform/Linux/PAL_linux.cmake @@ -16,7 +16,7 @@ ly_set(PAL_TRAIT_BUILD_TESTS_SUPPORTED TRUE) ly_set(PAL_TRAIT_BUILD_UNITY_SUPPORTED TRUE) ly_set(PAL_TRAIT_BUILD_UNITY_EXCLUDE_EXTENSIONS) ly_set(PAL_TRAIT_BUILD_EXCLUDE_ALL_TEST_RUNS_FROM_IDE FALSE) -ly_set(PAL_TRAIT_BUILD_CPACK_SUPPORTED FALSE) +ly_set(PAL_TRAIT_BUILD_CPACK_SUPPORTED TRUE) ly_set(PAL_TRAIT_PROF_PIX_SUPPORTED FALSE) diff --git a/cmake/Platform/Linux/Packaging/postinst.in b/cmake/Platform/Linux/Packaging/postinst.in new file mode 100644 index 0000000000..c6c0ba228d --- /dev/null +++ b/cmake/Platform/Linux/Packaging/postinst.in @@ -0,0 +1,21 @@ +#!/usr/bin/env bash +# +# 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 +# +# + +set -o errexit # exit on the first failure encountered + +{ + if [[ ! -f "/usr/lib/x86_64-linux-gnu/libffi.so.6" ]]; then + sudo ln -s /usr/lib/x86_64-linux-gnu/libffi.so.7 /usr/lib/x86_64-linux-gnu/libffi.so.6 + fi + + pushd @CPACK_PACKAGING_INSTALL_PREFIX@ + python/get_python.sh + chown -R $SUDO_USER . + popd +} &> /dev/null # hide output diff --git a/cmake/Platform/Linux/Packaging/postrm.in b/cmake/Platform/Linux/Packaging/postrm.in new file mode 100644 index 0000000000..acda38bf1e --- /dev/null +++ b/cmake/Platform/Linux/Packaging/postrm.in @@ -0,0 +1,15 @@ +#!/usr/bin/env bash +# +# 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 +# +# + +set -o errexit # exit on the first failure encountered + +{ + pushd @CPACK_PACKAGING_INSTALL_PREFIX@ + popd +} &> /dev/null # hide output diff --git a/cmake/Platform/Linux/Packaging/prerm.in b/cmake/Platform/Linux/Packaging/prerm.in new file mode 100644 index 0000000000..5595d7010f --- /dev/null +++ b/cmake/Platform/Linux/Packaging/prerm.in @@ -0,0 +1,23 @@ +#!/usr/bin/env bash +# +# 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 +# +# + +set -o errexit # exit on the first failure encountered + +{ + # We dont remove this symlink that we potentially created because the user could have + # installed themselves. + #if [[ -L "/usr/lib/x86_64-linux-gnu/libffi.so.6" ]]; then + # sudo rm /usr/lib/x86_64-linux-gnu/libffi.so.6 + #fi + + pushd @CPACK_PACKAGING_INSTALL_PREFIX@ + # delete python downloads + rm -rf python/downloaded_packages python/runtime + popd +} &> /dev/null # hide output diff --git a/cmake/Platform/Linux/PackagingPostBuild_linux.cmake b/cmake/Platform/Linux/PackagingPostBuild_linux.cmake new file mode 100644 index 0000000000..d92ee908fd --- /dev/null +++ b/cmake/Platform/Linux/PackagingPostBuild_linux.cmake @@ -0,0 +1,62 @@ +# +# 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 +# +# + +file(REAL_PATH "${CPACK_SOURCE_DIR}/.." LY_ROOT_FOLDER) +include(${LY_ROOT_FOLDER}/cmake/Platform/Common/PackagingPostBuild_common.cmake) + +file(${CPACK_PACKAGE_CHECKSUM} ${CPACK_TOPLEVEL_DIRECTORY}/${CPACK_PACKAGE_FILE_NAME}.deb file_checksum) +file(WRITE ${CPACK_TOPLEVEL_DIRECTORY}/${CPACK_PACKAGE_FILE_NAME}.deb.sha256 "${file_checksum} ${CPACK_PACKAGE_FILE_NAME}.deb") + +if(CPACK_UPLOAD_URL) + + # use the internal default path if somehow not specified from cpack_configure_downloads + if(NOT CPACK_UPLOAD_DIRECTORY) + set(CPACK_UPLOAD_DIRECTORY ${CPACK_PACKAGE_DIRECTORY}/CPackUploads) + endif() + + # Copy the artifacts intended to be uploaded to a remote server into the folder specified + # through CPACK_UPLOAD_DIRECTORY. This mimics the same process cpack does natively for + # some other frameworks that have built-in online installer support. + message(STATUS "Copying packaging artifacts to upload directory...") + file(REMOVE_RECURSE ${CPACK_UPLOAD_DIRECTORY}) + file(GLOB _artifacts + "${CPACK_TOPLEVEL_DIRECTORY}/*.deb" + "${CPACK_TOPLEVEL_DIRECTORY}/*.sha256" + ) + file(COPY ${_artifacts} + DESTINATION ${CPACK_UPLOAD_DIRECTORY} + ) + message(STATUS "Artifacts copied to ${CPACK_UPLOAD_DIRECTORY}") + + # TODO: copy gpg file to CPACK_UPLOAD_DIRECTORY + + ly_upload_to_url( + ${CPACK_UPLOAD_URL} + ${CPACK_UPLOAD_DIRECTORY} + ".*(.deb|.gpg|.sha256)$" + ) + + # for auto tagged builds, we will also upload a second copy of just the boostrapper + # to a special "Latest" folder under the branch in place of the commit date/hash + if(CPACK_AUTO_GEN_TAG) + + set(latest_deb_package "${CPACK_UPLOAD_DIRECTORY}/${CPACK_PACKAGE_NAME}_latest.deb") + file(COPY_FILE + ${CPACK_UPLOAD_DIRECTORY}/${CPACK_PACKAGE_FILE_NAME}.deb + ${latest_deb_package} + ) + ly_upload_to_latest(${CPACK_UPLOAD_URL} ${latest_deb_package}) + + # TODO: upload gpg file to latest + + # Generate a checksum file for latest and upload it + set(latest_hash_file "${CPACK_UPLOAD_DIRECTORY}/${CPACK_PACKAGE_NAME}_latest.deb.sha256") + file(WRITE "${latest_hash_file}" "${file_checksum} ${CPACK_PACKAGE_NAME}_latest.deb") + ly_upload_to_latest(${CPACK_UPLOAD_URL} "${latest_hash_file}") + endif() +endif() diff --git a/cmake/Platform/Linux/PackagingPreBuild_linux.cmake b/cmake/Platform/Linux/PackagingPreBuild_linux.cmake new file mode 100644 index 0000000000..31dc393307 --- /dev/null +++ b/cmake/Platform/Linux/PackagingPreBuild_linux.cmake @@ -0,0 +1,16 @@ +# +# 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 +# +# + +file(REAL_PATH "${CPACK_SOURCE_DIR}/.." LY_ROOT_FOLDER) +include(${LY_ROOT_FOLDER}/cmake/Platform/Common/PackagingPreBuild_common.cmake) + +if(NOT CPACK_UPLOAD_URL) # Skip signing if we are not uploading the package + return() +endif() + +# TODO: do signing diff --git a/cmake/Platform/Linux/Packaging_linux.cmake b/cmake/Platform/Linux/Packaging_linux.cmake new file mode 100644 index 0000000000..2e178429c3 --- /dev/null +++ b/cmake/Platform/Linux/Packaging_linux.cmake @@ -0,0 +1,56 @@ +# +# 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 +# +# + +set(CPACK_GENERATOR DEB) + +set(CPACK_PACKAGING_INSTALL_PREFIX "/opt/${CPACK_PACKAGE_NAME}/${LY_VERSION_STRING}") + +set(_cmake_package_name "cmake-${CPACK_DESIRED_CMAKE_VERSION}-linux-x86_64") +set(CPACK_CMAKE_PACKAGE_FILE "${_cmake_package_name}.tar.gz") +set(CPACK_CMAKE_PACKAGE_HASH "3f827544f9c82e74ddf5016461fdfcfea4ede58a26f82612f473bf6bfad8bfc2") + +# get all the package dependencies, extracted from scripts\build\build_node\Platform\Linux\package-list.ubuntu-focal.txt +set(package_dependencies + libffi7 + clang-12 + ninja-build + # Build Libraries + libglu1-mesa-dev # For Qt (GL dependency) + libxcb-xinerama0 # For Qt plugins at runtime + libxcb-xinput0 # For Qt plugins at runtime + libfontconfig1-dev # For Qt plugins at runtime + libcurl4-openssl-dev # For HttpRequestor + # libsdl2-dev # for WWise/Audio + libxcb-xkb-dev # For xcb keyboard input + libxkbcommon-x11-dev # For xcb keyboard input + libxkbcommon-dev # For xcb keyboard input + libxcb-xfixes0-dev # For mouse input + libxcb-xinput-dev # For mouse input + zlib1g-dev + mesa-common-dev +) +list(JOIN package_dependencies "," CPACK_DEBIAN_PACKAGE_DEPENDS) + +# Post-installation and pre/post removal scripts +configure_file("${LY_ROOT_FOLDER}/cmake/Platform/${PAL_PLATFORM_NAME}/Packaging/postinst.in" + "${CMAKE_BINARY_DIR}/cmake/Platform/${PAL_PLATFORM_NAME}/Packaging/postinst" + @ONLY +) +configure_file("${LY_ROOT_FOLDER}/cmake/Platform/${PAL_PLATFORM_NAME}/Packaging/prerm.in" + "${CMAKE_BINARY_DIR}/cmake/Platform/${PAL_PLATFORM_NAME}/Packaging/prerm" + @ONLY +) +configure_file("${LY_ROOT_FOLDER}/cmake/Platform/${PAL_PLATFORM_NAME}/Packaging/postrm.in" + "${CMAKE_BINARY_DIR}/cmake/Platform/${PAL_PLATFORM_NAME}/Packaging/postrm" + @ONLY +) +set(CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA + ${CMAKE_BINARY_DIR}/cmake/Platform/Linux/Packaging/postinst + ${CMAKE_BINARY_DIR}/cmake/Platform/Linux/Packaging/prerm + ${CMAKE_BINARY_DIR}/cmake/Platform/Linux/Packaging/postrm +) diff --git a/cmake/Platform/Linux/platform_linux_files.cmake b/cmake/Platform/Linux/platform_linux_files.cmake index fa5545cd26..d30959b8d2 100644 --- a/cmake/Platform/Linux/platform_linux_files.cmake +++ b/cmake/Platform/Linux/platform_linux_files.cmake @@ -10,11 +10,19 @@ set(FILES ../Common/Configurations_common.cmake ../Common/Clang/Configurations_clang.cmake ../Common/Install_common.cmake + ../Common/PackagingPostBuild_common.cmake + ../Common/PackagingPreBuild_common.cmake + CompilerSettings_linux.cmake Configurations_linux.cmake Install_linux.cmake LYTestWrappers_linux.cmake LYWrappers_linux.cmake + Packaging_linux.cmake + PackagingPostBuild_linux.cmake + PackagingPreBuild_linux.cmake PAL_linux.cmake PALDetection_linux.cmake RPathChange.cmake + runtime_dependencies_linux.cmake.in + RuntimeDependencies_linux.cmake ) diff --git a/cmake/Platform/Linux/runtime_dependencies_linux.cmake.in b/cmake/Platform/Linux/runtime_dependencies_linux.cmake.in index 394252e284..4ccf123e27 100644 --- a/cmake/Platform/Linux/runtime_dependencies_linux.cmake.in +++ b/cmake/Platform/Linux/runtime_dependencies_linux.cmake.in @@ -9,23 +9,33 @@ cmake_policy(SET CMP0012 NEW) # new policy for the if that evaluates a boolean out of "if(NOT ${same_location})" function(ly_copy source_file target_directory) - get_filename_component(target_filename "${source_file}" NAME) - get_filename_component(target_filename_ext "${source_file}" LAST_EXT) - cmake_path(COMPARE "${source_file}" EQUAL "${target_directory}/${target_filename}" same_location) + cmake_path(GET source_file FILENAME target_filename) + cmake_path(APPEND target_file "${target_directory}" "${target_filename}") + cmake_path(COMPARE "${source_file}" EQUAL "${target_file}" same_location) if(NOT ${same_location}) - file(LOCK ${target_directory}/${target_filename}.lock GUARD FUNCTION TIMEOUT 300) - if("${source_file}" IS_NEWER_THAN "${target_directory}/${target_filename}") + file(LOCK ${target_file}.lock GUARD FUNCTION TIMEOUT 300) + file(SIZE "${source_file}" source_file_size) + if(EXISTS "${target_file}") + file(SIZE "${target_file}" target_file_size) + else() + set(target_file_size 0) + endif() + if((NOT source_file_size EQUAL target_file_size) OR "${source_file}" IS_NEWER_THAN "${target_file}") + message(STATUS "Copying \"${source_file}\" to \"${target_directory}\"...") + file(MAKE_DIRECTORY "${full_target_directory}") file(COPY "${source_file}" DESTINATION "${target_directory}" FILE_PERMISSIONS @LY_COPY_PERMISSIONS@ FOLLOW_SYMLINK_CHAIN) - + file(TOUCH_NOCREATE "${target_file}") + # Special case, shared libraries that are copied from qt/plugins have their RPATH set to \$ORIGIN/../../lib # which is the correct relative path based on the source location. But when we copy it to their subfolder, # the rpath needs to be adjusted to the parent ($ORIGIN/..) if("${source_file}" MATCHES "qt/plugins" AND "${target_filename_ext}" STREQUAL ".so") - file(RPATH_CHANGE FILE "${target_directory}/${target_filename}" OLD_RPATH "\$ORIGIN/../../lib" NEW_RPATH "\$ORIGIN/..") + file(RPATH_CHANGE FILE "${target_file}" OLD_RPATH "\$ORIGIN/../../lib" NEW_RPATH "\$ORIGIN/..") endif() - endif() endif() endfunction() @LY_COPY_COMMANDS@ + +file(TOUCH @STAMP_OUTPUT_FILE@) diff --git a/cmake/Platform/Mac/InstallUtils_mac.cmake.in b/cmake/Platform/Mac/InstallUtils_mac.cmake.in index d73c4db459..89ce4a59f2 100644 --- a/cmake/Platform/Mac/InstallUtils_mac.cmake.in +++ b/cmake/Platform/Mac/InstallUtils_mac.cmake.in @@ -130,27 +130,36 @@ endfunction() function(ly_copy source_file target_directory) - if("${source_file}" MATCHES "\\.[Ff]ramework[^\\.]") + if("${source_file}" MATCHES "\\.[Ff]ramework") # fixup origin to copy the whole Framework folder string(REGEX REPLACE "(.*\\.[Ff]ramework).*" "\\1" source_file "${source_file}") endif() - get_filename_component(target_filename "${source_file}" NAME) - file(COPY "${source_file}" DESTINATION "${target_directory}" FILE_PERMISSIONS @LY_COPY_PERMISSIONS@ FOLLOW_SYMLINK_CHAIN) - # Our Qt and Python frameworks aren't in the correct bundle format to be codesigned. - if("${target_filename}" MATCHES "(Qt[^.]+)\\.[Ff]ramework") - fixup_qt_framework(${CMAKE_MATCH_1} "${target_directory}/${target_filename}") - # For some Qt frameworks(QtCore), signing the bundle doesn't work because of bundle - # format issues(despite the fixes above). But once we've patched the framework above, there's - # only one executable that we need to sign so we can do it directly. - set(target_filename "${target_filename}/Versions/5/${CMAKE_MATCH_1}") - elseif("${target_filename}" MATCHES "Python.framework") - fixup_python_framework("${target_directory}/${target_filename}") - codesign_python_framework_binaries("${target_directory}/${target_filename}") + cmake_path(GET source_file FILENAME target_filename) + cmake_path(APPEND full_target_directory "$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}" "${target_directory}") + cmake_path(APPEND target_file "${full_target_directory}" "${target_filename}") + + if("${source_file}" IS_NEWER_THAN "${target_file}") + message(STATUS "Copying ${source_file} to ${full_target_directory}...") + file(MAKE_DIRECTORY "${full_target_directory}") + file(COPY "${source_file}" DESTINATION "${full_target_directory}" FILE_PERMISSIONS @LY_COPY_PERMISSIONS@ FOLLOW_SYMLINK_CHAIN) + file(TOUCH_NOCREATE "${target_file}") + + # Our Qt and Python frameworks aren't in the correct bundle format to be codesigned. + if("${target_filename}" MATCHES "(Qt[^.]+)\\.[Ff]ramework") + fixup_qt_framework(${CMAKE_MATCH_1} "${target_file}") + # For some Qt frameworks(QtCore), signing the bundle doesn't work because of bundle + # format issues(despite the fixes above). But once we've patched the framework above, there's + # only one executable that we need to sign so we can do it directly. + set(target_filename "${target_filename}/Versions/5/${CMAKE_MATCH_1}") + elseif("${target_filename}" MATCHES "Python.framework") + fixup_python_framework("${target_file}") + codesign_python_framework_binaries("${target_file}") + endif() + codesign_file("${target_file}" "none") endif() - codesign_file("${target_directory}/${target_filename}" "none") endfunction() diff --git a/cmake/Platform/Mac/Install_mac.cmake b/cmake/Platform/Mac/Install_mac.cmake index bdc2300131..d5ab5d0fed 100644 --- a/cmake/Platform/Mac/Install_mac.cmake +++ b/cmake/Platform/Mac/Install_mac.cmake @@ -39,10 +39,10 @@ file(GENERATE # This needs to be done here because it needs to update the install prefix # before cmake does anything else in the install process. configure_file(${LY_ROOT_FOLDER}/cmake/Platform/Mac/PreInstallSteps_mac.cmake.in ${CMAKE_BINARY_DIR}/runtime_install/PreInstallSteps_mac.cmake @ONLY) -install(SCRIPT ${CMAKE_BINARY_DIR}/runtime_install/PreInstallSteps_mac.cmake COMPONENT ${CMAKE_INSTALL_DEFAULT_COMPONENT_NAME}) +ly_install(SCRIPT ${CMAKE_BINARY_DIR}/runtime_install/PreInstallSteps_mac.cmake COMPONENT ${CMAKE_INSTALL_DEFAULT_COMPONENT_NAME}) -#! ly_install_target_override: Mac specific target installation -function(ly_install_target_override) +#! ly_setup_target_install_targets_override: Mac specific target installation +function(ly_setup_target_install_targets_override) set(options) set(oneValueArgs TARGET ARCHIVE_DIR LIBRARY_DIR RUNTIME_DIR LIBRARY_SUBDIR RUNTIME_SUBDIR) @@ -58,24 +58,31 @@ function(ly_install_target_override) set_property(TARGET ${ly_platform_install_target_TARGET} PROPERTY RESOURCE "") endif() - install( - TARGETS ${ly_platform_install_target_TARGET} - ARCHIVE - DESTINATION ${ly_platform_install_target_ARCHIVE_DIR} - COMPONENT ${CMAKE_INSTALL_DEFAULT_COMPONENT_NAME} - LIBRARY - DESTINATION ${ly_platform_install_target_LIBRARY_DIR}/${ly_platform_install_target_LIBRARY_SUBDIR} - COMPONENT ${CMAKE_INSTALL_DEFAULT_COMPONENT_NAME} - RUNTIME - DESTINATION ${ly_platform_install_target_RUNTIME_DIR}/${ly_platform_install_target_RUNTIME_SUBDIR} - COMPONENT ${CMAKE_INSTALL_DEFAULT_COMPONENT_NAME} - BUNDLE - DESTINATION ${ly_platform_install_target_RUNTIME_DIR}/${ly_platform_install_target_RUNTIME_SUBDIR} - COMPONENT ${CMAKE_INSTALL_DEFAULT_COMPONENT_NAME} - RESOURCE - DESTINATION ${ly_platform_install_target_RUNTIME_DIR}/${ly_platform_install_target_RUNTIME_SUBDIR} - COMPONENT ${CMAKE_INSTALL_DEFAULT_COMPONENT_NAME} - ) + foreach(conf IN LISTS CMAKE_CONFIGURATION_TYPES) + string(TOUPPER ${conf} UCONF) + ly_install(TARGETS ${TARGET_NAME} + ARCHIVE + DESTINATION ${ly_platform_install_target_ARCHIVE_DIR} + COMPONENT ${LY_INSTALL_PERMUTATION_COMPONENT}_${UCONF} + CONFIGURATIONS ${conf} + LIBRARY + DESTINATION ${ly_platform_install_target_LIBRARY_DIR}/${ly_platform_install_target_LIBRARY_SUBDIR} + COMPONENT ${LY_INSTALL_PERMUTATION_COMPONENT}_${UCONF} + CONFIGURATIONS ${conf} + RUNTIME + DESTINATION ${ly_platform_install_target_RUNTIME_DIR}/${ly_platform_install_target_RUNTIME_SUBDIR} + COMPONENT ${LY_INSTALL_PERMUTATION_COMPONENT}_${UCONF} + CONFIGURATIONS ${conf} + BUNDLE + DESTINATION ${ly_platform_install_target_RUNTIME_DIR}/${ly_platform_install_target_RUNTIME_SUBDIR} + COMPONENT ${LY_INSTALL_PERMUTATION_COMPONENT}_${UCONF} + CONFIGURATIONS ${conf} + RESOURCE + DESTINATION ${ly_platform_install_target_RUNTIME_DIR}/${ly_platform_install_target_RUNTIME_SUBDIR} + COMPONENT ${LY_INSTALL_PERMUTATION_COMPONENT}_${UCONF} + CONFIGURATIONS ${conf} + ) + endforeach() set(install_relative_binaries_path "${ly_platform_install_target_RUNTIME_DIR}/${ly_platform_install_target_RUNTIME_SUBDIR}") @@ -102,11 +109,16 @@ function(ly_install_target_override) endif() endfunction() -#! ly_install_code_function_override: Mac specific copy function to handle frameworks -function(ly_install_code_function_override) +#! ly_setup_runtime_dependencies_copy_function_override: Mac specific copy function to handle frameworks +function(ly_setup_runtime_dependencies_copy_function_override) configure_file(${LY_ROOT_FOLDER}/cmake/Platform/Mac/InstallUtils_mac.cmake.in ${CMAKE_BINARY_DIR}/runtime_install/InstallUtils_mac.cmake @ONLY) - ly_install_run_script(${CMAKE_BINARY_DIR}/runtime_install/InstallUtils_mac.cmake) + foreach(conf IN LISTS CMAKE_CONFIGURATION_TYPES) + string(TOUPPER ${conf} UCONF) + ly_install(SCRIPT "${CMAKE_BINARY_DIR}/runtime_install/InstallUtils_mac.cmake" + COMPONENT ${LY_INSTALL_PERMUTATION_COMPONENT}_${UCONF} + ) + endforeach() endfunction() @@ -135,4 +147,3 @@ function(ly_post_install_steps) ") endfunction() - diff --git a/cmake/Platform/Mac/PackagingPostBuild_mac.cmake b/cmake/Platform/Mac/PackagingPostBuild_mac.cmake new file mode 100644 index 0000000000..5fa3787c21 --- /dev/null +++ b/cmake/Platform/Mac/PackagingPostBuild_mac.cmake @@ -0,0 +1,10 @@ +# +# 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 +# +# + +file(REAL_PATH "${CPACK_SOURCE_DIR}/.." LY_ROOT_FOLDER) +include(${LY_ROOT_FOLDER}/cmake/Platform/Common/PackagingPostBuild_common.cmake) diff --git a/cmake/Platform/Mac/PackagingPreBuild_mac.cmake b/cmake/Platform/Mac/PackagingPreBuild_mac.cmake new file mode 100644 index 0000000000..1d30e21767 --- /dev/null +++ b/cmake/Platform/Mac/PackagingPreBuild_mac.cmake @@ -0,0 +1,10 @@ +# +# 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 +# +# + +file(REAL_PATH "${CPACK_SOURCE_DIR}/.." LY_ROOT_FOLDER) +include(${LY_ROOT_FOLDER}/cmake/Platform/Common/PackagingPreBuild_common.cmake) diff --git a/cmake/Platform/Mac/runtime_dependencies_mac.cmake.in b/cmake/Platform/Mac/runtime_dependencies_mac.cmake.in index 11551f608f..892a90640f 100644 --- a/cmake/Platform/Mac/runtime_dependencies_mac.cmake.in +++ b/cmake/Platform/Mac/runtime_dependencies_mac.cmake.in @@ -34,7 +34,7 @@ endif() function(ly_copy source_file target_directory) - get_filename_component(target_filename "${source_file}" NAME) + cmake_path(GET source_file FILENAME target_filename) # If target_directory is a bundle if("${target_directory}" MATCHES "\\.app/Contents/MacOS") @@ -113,20 +113,37 @@ function(ly_copy source_file target_directory) endif() - cmake_path(COMPARE "${source_file}" EQUAL "${target_directory}/${target_filename}" same_location) + cmake_path(APPEND target_file "${target_directory}" "${target_filename}") + cmake_path(COMPARE "${source_file}" EQUAL "${target_file}" same_location) if(NOT ${same_location}) if(NOT EXISTS "${target_directory}") file(MAKE_DIRECTORY "${target_directory}") endif() - if(NOT EXISTS "${target_directory}/${target_filename}" OR "${source_file}" IS_NEWER_THAN "${target_directory}/${target_filename}") - message(STATUS "Copying \"${source_file}\" to \"${target_directory}\"...") - if(NOT target_is_bundle) - # if it is a bundle, there is no contention about the files in the destination, each bundle target will copy everything - # we dont want these files to invalidate the bundle and cause a new signature - file(LOCK ${target_directory}/${target_filename}.lock GUARD FUNCTION TIMEOUT 300) + + set(is_framework FALSE) + if("${source_file}" MATCHES "\\.[Ff]ramework") + set(is_framework TRUE) + endif() + if(NOT is_framework) + # if it is a bundle, there is no contention about the files in the destination, each bundle target will copy everything + # we dont want these files to invalidate the bundle and cause a new signature + file(LOCK ${target_file}.lock GUARD FUNCTION TIMEOUT 300) + file(SIZE "${source_file}" source_file_size) + if(EXISTS "${target_file}") + file(SIZE "${target_file}" target_file_size) + else() + set(target_file_size 0) endif() + else() + set(source_file_size 0) + set(target_file_size 0) + endif() + + if((NOT source_file_size EQUAL target_file_size) OR "${source_file}" IS_NEWER_THAN "${target_file}") + message(STATUS "Copying \"${source_file}\" to \"${target_directory}\"...") + file(MAKE_DIRECTORY "${target_directory}") file(COPY "${source_file}" DESTINATION "${target_directory}" FILE_PERMISSIONS @LY_COPY_PERMISSIONS@ FOLLOW_SYMLINK_CHAIN) - file(TOUCH_NOCREATE ${target_directory}/${target_filename}) + file(TOUCH_NOCREATE "${target_file}") set(anything_new TRUE PARENT_SCOPE) endif() endif() diff --git a/cmake/Platform/Windows/PackagingPostBuild.cmake b/cmake/Platform/Windows/PackagingPostBuild.cmake deleted file mode 100644 index 377a9fb221..0000000000 --- a/cmake/Platform/Windows/PackagingPostBuild.cmake +++ /dev/null @@ -1,237 +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 -# -# - -# convert the path to a windows style path using string replace because TO_NATIVE_PATH -# only works on real paths -string(REPLACE "/" "\\" _fixed_package_install_dir ${CPACK_PACKAGE_INSTALL_DIRECTORY}) - -# directory where the auto generated files live e.g /_CPack_Package/win64/WIX -set(_cpack_wix_out_dir ${CPACK_TOPLEVEL_DIRECTORY}) -set(_bootstrap_out_dir "${CPACK_TOPLEVEL_DIRECTORY}/bootstrap") - -set(_bootstrap_filename "${CPACK_PACKAGE_FILE_NAME}_installer.exe") -set(_bootstrap_output_file ${_cpack_wix_out_dir}/${_bootstrap_filename}) - -set(_ext_flags - -ext WixBalExtension -) - -set(_addtional_defines - -dCPACK_BOOTSTRAP_THEME_FILE=${CPACK_BINARY_DIR}/BootstrapperTheme - -dCPACK_BOOTSTRAP_UPGRADE_GUID=${CPACK_WIX_BOOTSTRAP_UPGRADE_GUID} - -dCPACK_DOWNLOAD_SITE=${CPACK_DOWNLOAD_SITE} - -dCPACK_LOCAL_INSTALLER_DIR=${_cpack_wix_out_dir} - -dCPACK_PACKAGE_FILE_NAME=${CPACK_PACKAGE_FILE_NAME} - -dCPACK_PACKAGE_INSTALL_DIRECTORY=${_fixed_package_install_dir} - -dCPACK_WIX_PRODUCT_LOGO=${CPACK_WIX_PRODUCT_LOGO} - -dCPACK_RESOURCE_PATH=${CPACK_SOURCE_DIR}/Platform/Windows/Packaging -) - -file(REAL_PATH "${CPACK_SOURCE_DIR}/.." _root_path) -file(TO_NATIVE_PATH "${_root_path}/scripts/signer/Platform/Windows/signer.ps1" _sign_script) - -if(CPACK_LICENSE_URL) - list(APPEND _addtional_defines -dCPACK_LICENSE_URL=${CPACK_LICENSE_URL}) -endif() - -set(_candle_command - ${CPACK_WIX_CANDLE_EXECUTABLE} - -nologo - -arch x64 - "-I${_cpack_wix_out_dir}" # to include cpack_variables.wxi - ${_addtional_defines} - ${_ext_flags} - "${CPACK_SOURCE_DIR}/Platform/Windows/Packaging/Bootstrapper.wxs" - -o "${_bootstrap_out_dir}/" -) - -set(_light_command - ${CPACK_WIX_LIGHT_EXECUTABLE} - -nologo - ${_ext_flags} - ${_bootstrap_out_dir}/*.wixobj - -o "${_bootstrap_output_file}" -) - -set(_signing_command - psexec.exe - -accepteula - -nobanner - -s - powershell.exe - -NoLogo - -ExecutionPolicy Bypass - -File ${_sign_script} -) - -message(STATUS "Signing package files in ${_cpack_wix_out_dir}") -execute_process( - COMMAND ${_signing_command} -packagePath ${_cpack_wix_out_dir} - RESULT_VARIABLE _signing_result - ERROR_VARIABLE _signing_errors - OUTPUT_VARIABLE _signing_output - ECHO_OUTPUT_VARIABLE -) - -if(NOT ${_signing_result} EQUAL 0) - message(FATAL_ERROR "An error occurred during signing package files. ${_signing_errors}") -endif() - -message(STATUS "Creating Bootstrap Installer...") -execute_process( - COMMAND ${_candle_command} - RESULT_VARIABLE _candle_result - ERROR_VARIABLE _candle_errors -) -if(NOT ${_candle_result} EQUAL 0) - message(FATAL_ERROR "An error occurred invoking candle.exe. ${_candle_errors}") -endif() - -execute_process( - COMMAND ${_light_command} - RESULT_VARIABLE _light_result - ERROR_VARIABLE _light_errors -) -if(NOT ${_light_result} EQUAL 0) - message(FATAL_ERROR "An error occurred invoking light.exe. ${_light_errors}") -endif() - -file(COPY ${_bootstrap_output_file} - DESTINATION ${CPACK_PACKAGE_DIRECTORY} -) - -message(STATUS "Bootstrap installer generated to ${CPACK_PACKAGE_DIRECTORY}/${_bootstrap_filename}") - -message(STATUS "Signing bootstrap installer in ${CPACK_PACKAGE_DIRECTORY}") -execute_process( - COMMAND ${_signing_command} -bootstrapPath ${CPACK_PACKAGE_DIRECTORY}/${_bootstrap_filename} - RESULT_VARIABLE _signing_result - ERROR_VARIABLE _signing_errors - OUTPUT_VARIABLE _signing_output - ECHO_OUTPUT_VARIABLE -) - -if(NOT ${_signing_result} EQUAL 0) - message(FATAL_ERROR "An error occurred during signing bootstrap installer. ${_signing_errors}") -endif() - -# use the internal default path if somehow not specified from cpack_configure_downloads -if(NOT CPACK_UPLOAD_DIRECTORY) - set(CPACK_UPLOAD_DIRECTORY ${CPACK_PACKAGE_DIRECTORY}/CPackUploads) -endif() - -# copy the artifacts intended to be uploaded to a remote server into the folder specified -# through cpack_configure_downloads. this mimics the same process cpack does natively for -# some other frameworks that have built-in online installer support. -message(STATUS "Copying installer artifacts to upload directory...") -file(REMOVE_RECURSE ${CPACK_UPLOAD_DIRECTORY}) -file(GLOB _artifacts "${_cpack_wix_out_dir}/*.msi" "${_cpack_wix_out_dir}/*.cab") -file(COPY ${_artifacts} - DESTINATION ${CPACK_UPLOAD_DIRECTORY} -) -message(STATUS "Artifacts copied to ${CPACK_UPLOAD_DIRECTORY}") - -if(NOT CPACK_UPLOAD_URL) - return() -endif() - -file(TO_NATIVE_PATH "${_cpack_wix_out_dir}" _cpack_wix_out_dir) -file(TO_NATIVE_PATH "${_root_path}/python/python.cmd" _python_cmd) -file(TO_NATIVE_PATH "${_root_path}/scripts/build/tools/upload_to_s3.py" _upload_script) - -function(upload_to_s3 in_url in_local_path in_file_regex) - - # strip the scheme and extract the bucket/key prefix from the URL - string(REPLACE "s3://" "" _stripped_url ${in_url}) - string(REPLACE "/" ";" _tokens ${_stripped_url}) - - list(POP_FRONT _tokens _bucket) - string(JOIN "/" _prefix ${_tokens}) - - set(_extra_args [[{"ACL":"bucket-owner-full-control"}]]) - - set(_upload_command - ${_python_cmd} -s - -u ${_upload_script} - --base_dir ${in_local_path} - --file_regex="${in_file_regex}" - --bucket ${_bucket} - --key_prefix ${_prefix} - --extra_args ${_extra_args} - ) - - if(CPACK_AWS_PROFILE) - list(APPEND _upload_command --profile ${CPACK_AWS_PROFILE}) - endif() - - execute_process( - COMMAND ${_upload_command} - RESULT_VARIABLE _upload_result - OUTPUT_VARIABLE _upload_output - OUTPUT_STRIP_TRAILING_WHITESPACE - ) - - if (NOT ${_upload_result} EQUAL 0) - message(FATAL_ERROR "An error occurred uploading to s3.\nOutput:\n${_upload_output}") - endif() -endfunction() - -message(STATUS "Uploading artifacts to ${CPACK_UPLOAD_URL}") -upload_to_s3( - ${CPACK_UPLOAD_URL} - ${_cpack_wix_out_dir} - ".*(cab|exe|msi)$" -) -message(STATUS "Artifact uploading complete!") - -# for auto tagged builds, we will also upload a second copy of just the boostrapper -# to a special "Latest" folder under the branch in place of the commit date/hash -if(CPACK_AUTO_GEN_TAG) - message(STATUS "Updating latest tagged build") - - # make sure we can extra the commit info from the URL first - string(REGEX MATCH "([0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]-[0-9a-zA-Z]+)" - _commit_info ${CPACK_UPLOAD_URL} - ) - if(NOT _commit_info) - message(FATAL_ERROR "Failed to extract the build tag") - endif() - - set(_temp_dir ${_cpack_wix_out_dir}/temp) - if(NOT EXISTS ${_temp_dir}) - file(MAKE_DIRECTORY ${_temp_dir}) - endif() - - # strip the version number form the exe name in the one uploaded to latest - string(TOLOWER "${CPACK_PACKAGE_NAME}_installer.exe" _non_versioned_exe) - set(_temp_exe_copy ${_temp_dir}/${_non_versioned_exe}) - - file(COPY ${_bootstrap_output_file} DESTINATION ${_temp_dir}) - file(RENAME "${_temp_dir}/${_bootstrap_filename}" ${_temp_exe_copy}) - - # include the commit info in a text file that will live next to the exe - set(_temp_info_file ${_temp_dir}/build_tag.txt) - file(WRITE ${_temp_info_file} ${_commit_info}) - - # update the URL and upload - string(REPLACE - ${_commit_info} "Latest" - _latest_upload_url ${CPACK_UPLOAD_URL} - ) - - upload_to_s3( - ${_latest_upload_url} - ${_temp_dir} - ".*(${_non_versioned_exe}|build_tag.txt)$" - ) - - # cleanup the temp files - file(REMOVE_RECURSE ${_temp_dir}) - - message(STATUS "Latest build update complete!") -endif() diff --git a/cmake/Platform/Windows/PackagingPostBuild_windows.cmake b/cmake/Platform/Windows/PackagingPostBuild_windows.cmake new file mode 100644 index 0000000000..0993135c23 --- /dev/null +++ b/cmake/Platform/Windows/PackagingPostBuild_windows.cmake @@ -0,0 +1,166 @@ +# +# 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 +# +# + +file(REAL_PATH "${CPACK_SOURCE_DIR}/.." LY_ROOT_FOLDER) +include(${LY_ROOT_FOLDER}/cmake/Platform/Common/PackagingPostBuild_common.cmake) + +# convert the path to a windows style path using string replace because TO_NATIVE_PATH +# only works on real paths +string(REPLACE "/" "\\" _fixed_package_install_dir ${CPACK_PACKAGE_INSTALL_DIRECTORY}) + +# directory where the auto generated files live e.g /_CPack_Package/win64/WIX +set(_cpack_wix_out_dir ${CPACK_TOPLEVEL_DIRECTORY}) +set(_bootstrap_out_dir "${CPACK_TOPLEVEL_DIRECTORY}/bootstrap") + +set(_bootstrap_filename "${CPACK_PACKAGE_FILE_NAME}_installer.exe") +set(_bootstrap_output_file ${_cpack_wix_out_dir}/${_bootstrap_filename}) + +set(_ext_flags + -ext WixBalExtension +) + +set(_addtional_defines + -dCPACK_BOOTSTRAP_THEME_FILE=${CPACK_BINARY_DIR}/BootstrapperTheme + -dCPACK_BOOTSTRAP_UPGRADE_GUID=${CPACK_WIX_BOOTSTRAP_UPGRADE_GUID} + -dCPACK_DOWNLOAD_SITE=${CPACK_DOWNLOAD_SITE} + -dCPACK_LOCAL_INSTALLER_DIR=${_cpack_wix_out_dir} + -dCPACK_PACKAGE_FILE_NAME=${CPACK_PACKAGE_FILE_NAME} + -dCPACK_PACKAGE_INSTALL_DIRECTORY=${_fixed_package_install_dir} + -dCPACK_WIX_PRODUCT_LOGO=${CPACK_WIX_PRODUCT_LOGO} + -dCPACK_RESOURCE_PATH=${CPACK_SOURCE_DIR}/Platform/Windows/Packaging +) + +if(CPACK_LICENSE_URL) + list(APPEND _addtional_defines -dCPACK_LICENSE_URL=${CPACK_LICENSE_URL}) +endif() + +set(_candle_command + ${CPACK_WIX_CANDLE_EXECUTABLE} + -nologo + -arch x64 + "-I${_cpack_wix_out_dir}" # to include cpack_variables.wxi + ${_addtional_defines} + ${_ext_flags} + "${CPACK_SOURCE_DIR}/Platform/Windows/Packaging/Bootstrapper.wxs" + -o "${_bootstrap_out_dir}/" +) + +set(_light_command + ${CPACK_WIX_LIGHT_EXECUTABLE} + -nologo + ${_ext_flags} + ${_bootstrap_out_dir}/*.wixobj + -o "${_bootstrap_output_file}" +) + +if(CPACK_UPLOAD_URL) # Skip signing if we are not uploading the package + file(TO_NATIVE_PATH "${LY_ROOT_FOLDER}/scripts/signer/Platform/Windows/signer.ps1" _sign_script) + + unset(_signing_command) + find_program(_psiexec_path psexec.exe) + if(_psiexec_path) + list(APPEND _signing_command + ${_psiexec_path} + -accepteula + -nobanner + -s + ) + endif() + + find_program(_powershell_path powershell.exe REQUIRED) + list(APPEND _signing_command + ${_powershell_path} + -NoLogo + -ExecutionPolicy Bypass + -File ${_sign_script} + ) + + message(STATUS "Signing package files in ${_cpack_wix_out_dir}") + execute_process( + COMMAND ${_signing_command} -packagePath ${_cpack_wix_out_dir} + RESULT_VARIABLE _signing_result + ERROR_VARIABLE _signing_errors + OUTPUT_VARIABLE _signing_output + ECHO_OUTPUT_VARIABLE + ) + + if(NOT ${_signing_result} EQUAL 0) + message(FATAL_ERROR "An error occurred during signing package files. ${_signing_errors}") + endif() +endif() + +message(STATUS "Creating Bootstrap Installer...") +execute_process( + COMMAND ${_candle_command} + RESULT_VARIABLE _candle_result + ERROR_VARIABLE _candle_errors +) +if(NOT ${_candle_result} EQUAL 0) + message(FATAL_ERROR "An error occurred invoking candle.exe. ${_candle_errors}") +endif() + +execute_process( + COMMAND ${_light_command} + RESULT_VARIABLE _light_result + ERROR_VARIABLE _light_errors +) +if(NOT ${_light_result} EQUAL 0) + message(FATAL_ERROR "An error occurred invoking light.exe. ${_light_errors}") +endif() + +message(STATUS "Bootstrap installer generated to ${_bootstrap_output_file}") + +if(CPACK_UPLOAD_URL) # Skip signing if we are not uploading the package + message(STATUS "Signing bootstrap installer in ${_bootstrap_output_file}") + execute_process( + COMMAND ${_signing_command} -bootstrapPath ${_bootstrap_output_file} + RESULT_VARIABLE _signing_result + ERROR_VARIABLE _signing_errors + OUTPUT_VARIABLE _signing_output + ECHO_OUTPUT_VARIABLE + ) + + if(NOT ${_signing_result} EQUAL 0) + message(FATAL_ERROR "An error occurred during signing bootstrap installer. ${_signing_errors}") + endif() +endif() + +# use the internal default path if somehow not specified from cpack_configure_downloads +if(NOT CPACK_UPLOAD_DIRECTORY) + set(CPACK_UPLOAD_DIRECTORY ${CPACK_PACKAGE_DIRECTORY}/CPackUploads) +endif() + +# Copy the artifacts intended to be uploaded to a remote server into the folder specified +# through CPACK_UPLOAD_DIRECTORY. This mimics the same process cpack does natively for +# some other frameworks that have built-in online installer support. +message(STATUS "Copying packaging artifacts to upload directory...") +file(REMOVE_RECURSE ${CPACK_UPLOAD_DIRECTORY}) +file(GLOB _artifacts + "${_cpack_wix_out_dir}/*.msi" + "${_cpack_wix_out_dir}/*.cab" + "${_cpack_wix_out_dir}/*.exe" +) +file(COPY ${_artifacts} + DESTINATION ${CPACK_UPLOAD_DIRECTORY} +) +message(STATUS "Artifacts copied to ${CPACK_UPLOAD_DIRECTORY}") + +if(CPACK_UPLOAD_URL) + file(TO_NATIVE_PATH "${_cpack_wix_out_dir}" _cpack_wix_out_dir) + ly_upload_to_url( + ${CPACK_UPLOAD_URL} + ${_cpack_wix_out_dir} + ".*(cab|exe|msi)$" + ) + + # for auto tagged builds, we will also upload a second copy of just the boostrapper + # to a special "Latest" folder under the branch in place of the commit date/hash + if(CPACK_AUTO_GEN_TAG) + ly_upload_to_latest(${CPACK_UPLOAD_URL} ${_bootstrap_output_file}) + endif() +endif() diff --git a/cmake/Platform/Windows/PackagingPreBuild.cmake b/cmake/Platform/Windows/PackagingPreBuild.cmake deleted file mode 100644 index d3924c7a02..0000000000 --- a/cmake/Platform/Windows/PackagingPreBuild.cmake +++ /dev/null @@ -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 -# -# - -file(REAL_PATH "${CPACK_SOURCE_DIR}/.." _root_path) -set(_cpack_wix_out_dir ${CPACK_TOPLEVEL_DIRECTORY}) -file(TO_NATIVE_PATH "${_root_path}/scripts/signer/Platform/Windows/signer.ps1" _sign_script) - -set(_signing_command - psexec.exe - -accepteula - -nobanner - -s - powershell.exe - -NoLogo - -ExecutionPolicy Bypass - -File ${_sign_script} -) - -message(STATUS "Signing executable files in ${_cpack_wix_out_dir}") -execute_process( - COMMAND ${_signing_command} -exePath ${_cpack_wix_out_dir} - RESULT_VARIABLE _signing_result - ERROR_VARIABLE _signing_errors - OUTPUT_VARIABLE _signing_output - ECHO_OUTPUT_VARIABLE -) - -if(NOT ${_signing_result} EQUAL 0) - message(FATAL_ERROR "An error occurred during signing executable files. ${_signing_errors}") -endif() - -message(STATUS "Signing exes complete!") diff --git a/cmake/Platform/Windows/PackagingPreBuild_windows.cmake b/cmake/Platform/Windows/PackagingPreBuild_windows.cmake new file mode 100644 index 0000000000..29995518da --- /dev/null +++ b/cmake/Platform/Windows/PackagingPreBuild_windows.cmake @@ -0,0 +1,60 @@ +# +# 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 +# +# + +file(REAL_PATH "${CPACK_SOURCE_DIR}/.." LY_ROOT_FOLDER) +include(${LY_ROOT_FOLDER}/cmake/Platform/Common/PackagingPreBuild_common.cmake) + +if(NOT CPACK_UPLOAD_URL) # Skip signing if we are not uploading the package + return() +endif() + +file(REAL_PATH "${CPACK_SOURCE_DIR}/.." _root_path) +set(_cpack_wix_out_dir ${CPACK_TOPLEVEL_DIRECTORY}) +file(TO_NATIVE_PATH "${_root_path}/scripts/signer/Platform/Windows/signer.ps1" _sign_script) + +unset(_signing_command) +find_program(_psiexec_path psexec.exe) +if(_psiexec_path) + list(APPEND _signing_command + ${_psiexec_path} + -accepteula + -nobanner + -s + ) +endif() + +find_program(_powershell_path powershell.exe REQUIRED) +list(APPEND _signing_command + ${_powershell_path} + -NoLogo + -ExecutionPolicy Bypass + -File ${_sign_script} +) + +# This requires to have a valid local certificate. In continuous integration, these certificates are stored +# in the machine directly. +# You can generate a test certificate to be able to run this in a PowerShell elevated promp with: +# New-SelfSignedCertificate -DnsName foo.o3de.com -Type CodeSigning -CertStoreLocation Cert:\CurrentUser\My +# Export-Certificate -Cert (Get-ChildItem Cert:\CurrentUser\My\) -Filepath "c:\selfsigned.crt" +# Import-Certificate -FilePath "c:\selfsigned.crt" -Cert Cert:\CurrentUser\TrustedPublisher +# Import-Certificate -FilePath "c:\selfsigned.crt" -Cert Cert:\CurrentUser\Root + +message(STATUS "Signing executable files in ${_cpack_wix_out_dir}") +execute_process( + COMMAND ${_signing_command} -exePath ${_cpack_wix_out_dir} + RESULT_VARIABLE _signing_result + ERROR_VARIABLE _signing_errors + OUTPUT_VARIABLE _signing_output + ECHO_OUTPUT_VARIABLE +) + +if(NOT ${_signing_result} EQUAL 0) + message(FATAL_ERROR "An error occurred during signing executable files. ${_signing_errors}") +else() + message(STATUS "Signing exes complete!") +endif() diff --git a/cmake/Platform/Windows/Packaging_windows.cmake b/cmake/Platform/Windows/Packaging_windows.cmake index 4a03df2fd2..f24e9dee1c 100644 --- a/cmake/Platform/Windows/Packaging_windows.cmake +++ b/cmake/Platform/Windows/Packaging_windows.cmake @@ -23,16 +23,12 @@ set(CPACK_WIX_ROOT ${LY_INSTALLER_WIX_ROOT}) set(CPACK_GENERATOR WIX) -set(CPACK_THREADS 0) set(_cmake_package_name "cmake-${CPACK_DESIRED_CMAKE_VERSION}-windows-x86_64") set(CPACK_CMAKE_PACKAGE_FILE "${_cmake_package_name}.zip") set(CPACK_CMAKE_PACKAGE_HASH "15a49e2ab81c1822d75b1b1a92f7863f58e31f6d6aac1c4103eef2b071be3112") -# workaround for shortening the path cpack installs to by stripping the platform directory and forcing monolithic -# mode to strip out component folders. this unfortunately is the closest we can get to changing the install location -# as CPACK_PACKAGING_INSTALL_PREFIX/CPACK_SET_DESTDIR isn't supported for the WiX generator +# workaround for shortening the path cpack installs to by stripping the platform directory set(CPACK_TOPLEVEL_TAG "") -set(CPACK_MONOLITHIC_INSTALL ON) # CPack will generate the WiX product/upgrade GUIDs further down the chain if they weren't supplied # however, they are unique for each run. instead, let's do the auto generation here and add it to @@ -108,45 +104,35 @@ set(_raw_text_license [[ #(loc.InstallEulaAcceptance) ]]) -if(LY_INSTALLER_DOWNLOAD_URL) - set(WIX_THEME_WARNING_IMAGE ${CPACK_SOURCE_DIR}/Platform/Windows/Packaging/warning.png) +set(WIX_THEME_WARNING_IMAGE ${CPACK_SOURCE_DIR}/Platform/Windows/Packaging/warning.png) - if(LY_INSTALLER_LICENSE_URL) - set(WIX_THEME_INSTALL_LICENSE_ELEMENTS ${_hyperlink_license}) - set(WIX_THEME_EULA_ACCEPTANCE_TEXT "<a href=\"#\">Terms of Use</a>") - else() - set(WIX_THEME_INSTALL_LICENSE_ELEMENTS ${_raw_text_license}) - set(WIX_THEME_EULA_ACCEPTANCE_TEXT "Terms of Use above") - endif() - - # theme ux file - configure_file( - "${CPACK_SOURCE_DIR}/Platform/Windows/Packaging/BootstrapperTheme.xml.in" - "${CPACK_BINARY_DIR}/BootstrapperTheme.xml" - @ONLY - ) - - # theme localization file - configure_file( - "${CPACK_SOURCE_DIR}/Platform/Windows/Packaging/BootstrapperTheme.wxl.in" - "${CPACK_BINARY_DIR}/BootstrapperTheme.wxl" - @ONLY - ) - - set(_embed_artifacts "no") - - # the bootstrapper will at the very least need a different upgrade guid - generate_wix_guid(CPACK_WIX_BOOTSTRAP_UPGRADE_GUID "${_guid_seed_base}_Bootstrap_UpgradeCode") - - set(CPACK_PRE_BUILD_SCRIPTS - ${CPACK_SOURCE_DIR}/Platform/Windows/PackagingPreBuild.cmake - ) - - set(CPACK_POST_BUILD_SCRIPTS - ${CPACK_SOURCE_DIR}/Platform/Windows/PackagingPostBuild.cmake - ) +if(LY_INSTALLER_LICENSE_URL) + set(WIX_THEME_INSTALL_LICENSE_ELEMENTS ${_hyperlink_license}) + set(WIX_THEME_EULA_ACCEPTANCE_TEXT "<a href=\"#\">Terms of Use</a>") +else() + set(WIX_THEME_INSTALL_LICENSE_ELEMENTS ${_raw_text_license}) + set(WIX_THEME_EULA_ACCEPTANCE_TEXT "Terms of Use above") endif() +# theme ux file +configure_file( + "${CPACK_SOURCE_DIR}/Platform/Windows/Packaging/BootstrapperTheme.xml.in" + "${CPACK_BINARY_DIR}/BootstrapperTheme.xml" + @ONLY +) + +# theme localization file +configure_file( + "${CPACK_SOURCE_DIR}/Platform/Windows/Packaging/BootstrapperTheme.wxl.in" + "${CPACK_BINARY_DIR}/BootstrapperTheme.wxl" + @ONLY +) + +set(_embed_artifacts "no") + +# the bootstrapper will at the very least need a different upgrade guid +generate_wix_guid(CPACK_WIX_BOOTSTRAP_UPGRADE_GUID "${_guid_seed_base}_Bootstrap_UpgradeCode") + set(CPACK_WIX_CANDLE_EXTRA_FLAGS -dCPACK_EMBED_ARTIFACTS=${_embed_artifacts} -dCPACK_CMAKE_PACKAGE_NAME=${_cmake_package_name} diff --git a/cmake/Platform/Windows/platform_windows_files.cmake b/cmake/Platform/Windows/platform_windows_files.cmake index fcc47ab6eb..984d985380 100644 --- a/cmake/Platform/Windows/platform_windows_files.cmake +++ b/cmake/Platform/Windows/platform_windows_files.cmake @@ -15,6 +15,8 @@ set(FILES ../Common/MSVC/VisualStudio_common.cmake ../Common/Install_common.cmake ../Common/LYWrappers_default.cmake + ../Common/PackagingPostBuild_common.cmake + ../Common/PackagingPreBuild_common.cmake ../Common/TargetIncludeSystemDirectories_unsupported.cmake Configurations_windows.cmake LYTestWrappers_windows.cmake @@ -23,7 +25,8 @@ set(FILES PALDetection_windows.cmake Install_windows.cmake Packaging_windows.cmake - PackagingPostBuild.cmake + PackagingPostBuild_windows.cmake + PackagingPreBuild_windows.cmake Packaging/Bootstrapper.wxs Packaging/BootstrapperTheme.wxl.in Packaging/BootstrapperTheme.xml.in diff --git a/cmake/Version.cmake b/cmake/Version.cmake index 662e75c3db..de93ebefef 100644 --- a/cmake/Version.cmake +++ b/cmake/Version.cmake @@ -11,3 +11,8 @@ set(LY_VERSION_COPYRIGHT_YEAR ${current_year} CACHE STRING "Open 3D Engine's cop set(LY_VERSION_STRING "0.0.0.0" CACHE STRING "Open 3D Engine's version") set(LY_VERSION_BUILD_NUMBER 0 CACHE STRING "Open 3D Engine's build number") set(LY_VERSION_ENGINE_NAME "o3de" CACHE STRING "Open 3D Engine's engine name") + +if("$ENV{O3DE_VERSION}") + # Overriding through environment + set(LY_VERSION_STRING "$ENV{O3DE_VERSION}") +endif() diff --git a/cmake/install/ConfigurationType_config.cmake.in b/cmake/install/ConfigurationType_config.cmake.in index 074e034899..0a6940d7ff 100644 --- a/cmake/install/ConfigurationType_config.cmake.in +++ b/cmake/install/ConfigurationType_config.cmake.in @@ -8,4 +8,4 @@ include_guard(GLOBAL) -list(APPEND CMAKE_CONFIGURATION_TYPES @CMAKE_INSTALL_CONFIG_NAME@) +list(APPEND CMAKE_CONFIGURATION_TYPES @conf@) diff --git a/scripts/build/Platform/Android/build_config.json b/scripts/build/Platform/Android/build_config.json index c1fbb1dd87..5e2da44a3c 100644 --- a/scripts/build/Platform/Android/build_config.json +++ b/scripts/build/Platform/Android/build_config.json @@ -35,7 +35,7 @@ "PARAMETERS": { "CONFIGURATION":"debug", "OUTPUT_DIRECTORY":"build\\android", - "CMAKE_OPTIONS":"-G \"Ninja Multi-Config\" -DCMAKE_TOOLCHAIN_FILE=cmake\\Platform\\Android\\Toolchain_android.cmake -DANDROID_ABI=arm64-v8a -DANDROID_ARM_MODE=arm -DANDROID_ARM_NEON=FALSE -DANDROID_NATIVE_API_LEVEL=21 -DLY_NDK_DIR=\"!LY_3RDPARTY_PATH!\\android-ndk\\r21d\" -DLY_UNITY_BUILD=TRUE", + "CMAKE_OPTIONS":"-G \"Ninja Multi-Config\" -DCMAKE_TOOLCHAIN_FILE=cmake\\Platform\\Android\\Toolchain_android.cmake -DANDROID_ABI=arm64-v8a -DANDROID_ARM_MODE=arm -DANDROID_ARM_NEON=FALSE -DANDROID_NATIVE_API_LEVEL=21 -DLY_NDK_DIR=\"!LY_3RDPARTY_PATH!\\android-ndk\\r21d\"", "CMAKE_LY_PROJECTS":"AutomatedTesting", "CMAKE_TARGET":"all", "CMAKE_BUILD_ARGS":"-j!NUMBER_OF_PROCESSORS!" @@ -60,7 +60,7 @@ "PARAMETERS": { "CONFIGURATION":"profile", "OUTPUT_DIRECTORY":"build\\android", - "CMAKE_OPTIONS":"-G \"Ninja Multi-Config\" -DCMAKE_TOOLCHAIN_FILE=cmake\\Platform\\Android\\Toolchain_android.cmake -DANDROID_ABI=arm64-v8a -DANDROID_ARM_MODE=arm -DANDROID_ARM_NEON=FALSE -DANDROID_NATIVE_API_LEVEL=21 -DLY_NDK_DIR=\"!LY_3RDPARTY_PATH!\\android-ndk\\r21d\" -DLY_UNITY_BUILD=TRUE", + "CMAKE_OPTIONS":"-G \"Ninja Multi-Config\" -DCMAKE_TOOLCHAIN_FILE=cmake\\Platform\\Android\\Toolchain_android.cmake -DANDROID_ABI=arm64-v8a -DANDROID_ARM_MODE=arm -DANDROID_ARM_NEON=FALSE -DANDROID_NATIVE_API_LEVEL=21 -DLY_NDK_DIR=\"!LY_3RDPARTY_PATH!\\android-ndk\\r21d\"", "CMAKE_LY_PROJECTS":"AutomatedTesting", "CMAKE_TARGET":"all", "CMAKE_BUILD_ARGS":"-j!NUMBER_OF_PROCESSORS!" @@ -93,7 +93,7 @@ "PARAMETERS": { "CONFIGURATION":"profile", "OUTPUT_DIRECTORY":"build\\windows_vs2019", - "CMAKE_OPTIONS":"-G \"Visual Studio 16 2019\" -DCMAKE_SYSTEM_VERSION=10.0 -DLY_UNITY_BUILD=TRUE", + "CMAKE_OPTIONS":"-G \"Visual Studio 16 2019\" -DCMAKE_SYSTEM_VERSION=10.0", "CMAKE_LY_PROJECTS":"AutomatedTesting", "CMAKE_TARGET":"AssetProcessorBatch", "CMAKE_NATIVE_BUILD_ARGS": "/m /nologo", @@ -112,7 +112,7 @@ "PARAMETERS": { "CONFIGURATION":"release", "OUTPUT_DIRECTORY":"build\\android", - "CMAKE_OPTIONS":"-G \"Ninja Multi-Config\" -DCMAKE_TOOLCHAIN_FILE=cmake\\Platform\\Android\\Toolchain_android.cmake -DANDROID_ABI=arm64-v8a -DANDROID_ARM_MODE=arm -DANDROID_ARM_NEON=FALSE -DANDROID_NATIVE_API_LEVEL=21 -DLY_NDK_DIR=\"!LY_3RDPARTY_PATH!\\android-ndk\\r21d\" -DLY_UNITY_BUILD=TRUE", + "CMAKE_OPTIONS":"-G \"Ninja Multi-Config\" -DCMAKE_TOOLCHAIN_FILE=cmake\\Platform\\Android\\Toolchain_android.cmake -DANDROID_ABI=arm64-v8a -DANDROID_ARM_MODE=arm -DANDROID_ARM_NEON=FALSE -DANDROID_NATIVE_API_LEVEL=21 -DLY_NDK_DIR=\"!LY_3RDPARTY_PATH!\\android-ndk\\r21d\"", "CMAKE_LY_PROJECTS":"AutomatedTesting", "CMAKE_TARGET":"all", "CMAKE_BUILD_ARGS":"-j!NUMBER_OF_PROCESSORS!" @@ -128,7 +128,7 @@ "PARAMETERS": { "CONFIGURATION":"release", "OUTPUT_DIRECTORY":"build\\mono_android", - "CMAKE_OPTIONS":"-G \"Ninja Multi-Config\" -DCMAKE_TOOLCHAIN_FILE=cmake\\Platform\\Android\\Toolchain_android.cmake -DANDROID_ABI=arm64-v8a -DANDROID_ARM_MODE=arm -DANDROID_ARM_NEON=FALSE -DANDROID_NATIVE_API_LEVEL=21 -DLY_NDK_DIR=\"!LY_3RDPARTY_PATH!\\android-ndk\\r21d\" -DLY_MONOLITHIC_GAME=TRUE -DLY_UNITY_BUILD=TRUE", + "CMAKE_OPTIONS":"-G \"Ninja Multi-Config\" -DCMAKE_TOOLCHAIN_FILE=cmake\\Platform\\Android\\Toolchain_android.cmake -DANDROID_ABI=arm64-v8a -DANDROID_ARM_MODE=arm -DANDROID_ARM_NEON=FALSE -DANDROID_NATIVE_API_LEVEL=21 -DLY_NDK_DIR=\"!LY_3RDPARTY_PATH!\\android-ndk\\r21d\" -DLY_MONOLITHIC_GAME=TRUE", "CMAKE_LY_PROJECTS":"AutomatedTesting", "CMAKE_TARGET":"all", "CMAKE_BUILD_ARGS":"-j!NUMBER_OF_PROCESSORS!" diff --git a/scripts/build/Platform/Linux/build_config.json b/scripts/build/Platform/Linux/build_config.json index 84c5976215..97f8cb8b7e 100644 --- a/scripts/build/Platform/Linux/build_config.json +++ b/scripts/build/Platform/Linux/build_config.json @@ -37,7 +37,7 @@ "PARAMETERS": { "CONFIGURATION": "debug", "OUTPUT_DIRECTORY": "build/linux", - "CMAKE_OPTIONS": "-G 'Ninja Multi-Config' -DCMAKE_C_COMPILER=clang-12 -DCMAKE_CXX_COMPILER=clang++-12 -DLY_UNITY_BUILD=TRUE -DLY_PARALLEL_LINK_JOBS=4", + "CMAKE_OPTIONS": "-G 'Ninja Multi-Config' -DLY_PARALLEL_LINK_JOBS=4", "CMAKE_LY_PROJECTS": "AutomatedTesting", "CMAKE_TARGET": "all" } @@ -53,7 +53,7 @@ "PARAMETERS": { "CONFIGURATION": "profile", "OUTPUT_DIRECTORY": "build/linux", - "CMAKE_OPTIONS": "-G 'Ninja Multi-Config' -DCMAKE_C_COMPILER=clang-12 -DCMAKE_CXX_COMPILER=clang++-12 -DLY_UNITY_BUILD=TRUE -DLY_PARALLEL_LINK_JOBS=4", + "CMAKE_OPTIONS": "-G 'Ninja Multi-Config' -DLY_PARALLEL_LINK_JOBS=4", "CMAKE_LY_PROJECTS": "AutomatedTesting", "CMAKE_TARGET": "all" } @@ -66,7 +66,7 @@ "PARAMETERS": { "CONFIGURATION": "profile", "OUTPUT_DIRECTORY": "build/linux", - "CMAKE_OPTIONS": "-G 'Ninja Multi-Config' -DCMAKE_C_COMPILER=clang-12 -DCMAKE_CXX_COMPILER=clang++-12 -DLY_UNITY_BUILD=FALSE -DLY_PARALLEL_LINK_JOBS=4", + "CMAKE_OPTIONS": "-G 'Ninja Multi-Config' -DLY_UNITY_BUILD=FALSE -DLY_PARALLEL_LINK_JOBS=4", "CMAKE_LY_PROJECTS": "AutomatedTesting", "CMAKE_TARGET": "all" } @@ -80,7 +80,7 @@ "PARAMETERS": { "CONFIGURATION": "profile", "OUTPUT_DIRECTORY": "build/linux", - "CMAKE_OPTIONS": "-G 'Ninja Multi-Config' -DCMAKE_C_COMPILER=clang-12 -DCMAKE_CXX_COMPILER=clang++-12 -DLY_UNITY_BUILD=TRUE -DLY_PARALLEL_LINK_JOBS=4", + "CMAKE_OPTIONS": "-G 'Ninja Multi-Config' -DLY_PARALLEL_LINK_JOBS=4", "CMAKE_LY_PROJECTS": "AutomatedTesting", "CMAKE_TARGET": "all", "CTEST_OPTIONS": "-E Gem::EMotionFX.Editor.Tests -LE (SUITE_sandbox|SUITE_awsi) -L FRAMEWORK_googletest --no-tests=error", @@ -93,7 +93,7 @@ "PARAMETERS": { "CONFIGURATION": "profile", "OUTPUT_DIRECTORY": "build/linux", - "CMAKE_OPTIONS": "-G 'Ninja Multi-Config' -DCMAKE_C_COMPILER=clang-12 -DCMAKE_CXX_COMPILER=clang++-12 -DLY_UNITY_BUILD=FALSE -DLY_PARALLEL_LINK_JOBS=4", + "CMAKE_OPTIONS": "-G 'Ninja Multi-Config' -DLY_UNITY_BUILD=FALSE -DLY_PARALLEL_LINK_JOBS=4", "CMAKE_LY_PROJECTS": "AutomatedTesting", "CMAKE_TARGET": "all", "CTEST_OPTIONS": "-E Gem::EMotionFX.Editor.Tests -LE (SUITE_sandbox|SUITE_awsi) -L FRAMEWORK_googletest --no-tests=error", @@ -110,7 +110,7 @@ "PARAMETERS": { "CONFIGURATION": "profile", "OUTPUT_DIRECTORY": "build/linux", - "CMAKE_OPTIONS": "-G 'Ninja Multi-Config' -DCMAKE_C_COMPILER=clang-12 -DCMAKE_CXX_COMPILER=clang++-12 -DLY_UNITY_BUILD=TRUE -DLY_PARALLEL_LINK_JOBS=4", + "CMAKE_OPTIONS": "-G 'Ninja Multi-Config' -DLY_PARALLEL_LINK_JOBS=4", "CMAKE_LY_PROJECTS": "AutomatedTesting", "CMAKE_TARGET": "AssetProcessorBatch", "ASSET_PROCESSOR_BINARY": "bin/profile/AssetProcessorBatch", @@ -124,7 +124,7 @@ "PARAMETERS": { "CONFIGURATION": "profile", "OUTPUT_DIRECTORY": "build/linux", - "CMAKE_OPTIONS": "-G 'Ninja Multi-Config' -DCMAKE_C_COMPILER=clang-12 -DCMAKE_CXX_COMPILER=clang++-12 -DLY_UNITY_BUILD=FALSE -DLY_PARALLEL_LINK_JOBS=4", + "CMAKE_OPTIONS": "-G 'Ninja Multi-Config' -DLY_UNITY_BUILD=FALSE -DLY_PARALLEL_LINK_JOBS=4", "CMAKE_LY_PROJECTS": "AutomatedTesting", "CMAKE_TARGET": "AssetProcessorBatch", "ASSET_PROCESSOR_BINARY": "bin/profile/AssetProcessorBatch", @@ -142,7 +142,7 @@ "PARAMETERS": { "CONFIGURATION": "profile", "OUTPUT_DIRECTORY": "build/linux", - "CMAKE_OPTIONS": "-G 'Ninja Multi-Config' -DCMAKE_C_COMPILER=clang-12 -DCMAKE_CXX_COMPILER=clang++-12 -DLY_UNITY_BUILD=TRUE -DLY_PARALLEL_LINK_JOBS=4", + "CMAKE_OPTIONS": "-G 'Ninja Multi-Config' -DLY_PARALLEL_LINK_JOBS=4", "CMAKE_LY_PROJECTS": "AutomatedTesting", "CMAKE_TARGET": "TEST_SUITE_periodic", "CTEST_OPTIONS": "-L (SUITE_periodic) --no-tests=error", @@ -162,7 +162,7 @@ "PARAMETERS": { "CONFIGURATION": "profile", "OUTPUT_DIRECTORY": "build/linux", - "CMAKE_OPTIONS": "-G 'Ninja Multi-Config' -DCMAKE_C_COMPILER=clang-12 -DCMAKE_CXX_COMPILER=clang++-12 -DLY_UNITY_BUILD=TRUE -DLY_PARALLEL_LINK_JOBS=4 -DO3DE_HOME_PATH=\"${WORKSPACE}/home\" -DO3DE_REGISTER_ENGINE_PATH=\"${WORKSPACE}/o3de\" -DO3DE_REGISTER_THIS_ENGINE=TRUE", + "CMAKE_OPTIONS": "-G 'Ninja Multi-Config' -DLY_PARALLEL_LINK_JOBS=4", "CMAKE_LY_PROJECTS": "AutomatedTesting", "CMAKE_TARGET": "all", "CTEST_OPTIONS": "-L (SUITE_sandbox) --no-tests=error" @@ -178,7 +178,7 @@ "PARAMETERS": { "CONFIGURATION": "profile", "OUTPUT_DIRECTORY": "build/linux", - "CMAKE_OPTIONS": "-G 'Ninja Multi-Config' -DCMAKE_C_COMPILER=clang-12 -DCMAKE_CXX_COMPILER=clang++-12 -DLY_UNITY_BUILD=TRUE -DLY_PARALLEL_LINK_JOBS=4", + "CMAKE_OPTIONS": "-G 'Ninja Multi-Config' -DLY_PARALLEL_LINK_JOBS=4", "CMAKE_LY_PROJECTS": "AutomatedTesting", "CMAKE_TARGET": "TEST_SUITE_benchmark", "CTEST_OPTIONS": "-L (SUITE_benchmark) --no-tests=error", @@ -195,7 +195,7 @@ "PARAMETERS": { "CONFIGURATION": "release", "OUTPUT_DIRECTORY": "build/linux", - "CMAKE_OPTIONS": "-G 'Ninja Multi-Config' -DCMAKE_C_COMPILER=clang-12 -DCMAKE_CXX_COMPILER=clang++-12 -DLY_UNITY_BUILD=TRUE -DLY_PARALLEL_LINK_JOBS=4", + "CMAKE_OPTIONS": "-G 'Ninja Multi-Config' -DLY_PARALLEL_LINK_JOBS=4", "CMAKE_LY_PROJECTS": "AutomatedTesting", "CMAKE_TARGET": "all" } @@ -210,9 +210,67 @@ "PARAMETERS": { "CONFIGURATION": "release", "OUTPUT_DIRECTORY": "build/mono_linux", - "CMAKE_OPTIONS": "-G 'Ninja Multi-Config' -DCMAKE_C_COMPILER=clang-12 -DCMAKE_CXX_COMPILER=clang++-12 -DLY_MONOLITHIC_GAME=TRUE -DLY_UNITY_BUILD=TRUE -DLY_PARALLEL_LINK_JOBS=4", + "CMAKE_OPTIONS": "-G 'Ninja Multi-Config' -DLY_MONOLITHIC_GAME=TRUE -DLY_PARALLEL_LINK_JOBS=4", "CMAKE_LY_PROJECTS": "AutomatedTesting", "CMAKE_TARGET": "all" } + }, + "install_profile": { + "TAGS": [], + "COMMAND": "build_linux.sh", + "PARAMETERS": { + "CONFIGURATION": "profile", + "OUTPUT_DIRECTORY": "build/linux", + "CMAKE_OPTIONS": "-G 'Ninja Multi-Config' -DLY_PARALLEL_LINK_JOBS=4 -DLY_DISABLE_TEST_MODULES=TRUE", + "CMAKE_TARGET": "install" + } + }, + "installer": { + "TAGS": [ + "nightly-clean", + "nightly-installer" + ], + "COMMAND": "build_installer_linux.sh", + "PARAMETERS": { + "CONFIGURATION": "profile", + "OUTPUT_DIRECTORY": "build/linux", + "CMAKE_OPTIONS": "-G 'Ninja Multi-Config' -DLY_PARALLEL_LINK_JOBS=4 -DLY_DISABLE_TEST_MODULES=TRUE -DLY_VERSION_ENGINE_NAME=o3de-sdk", + "EXTRA_CMAKE_OPTIONS": "-DLY_INSTALLER_AUTO_GEN_TAG=TRUE -DLY_INSTALLER_DOWNLOAD_URL=${INSTALLER_DOWNLOAD_URL} -DLY_INSTALLER_LICENSE_URL=${INSTALLER_DOWNLOAD_URL}/license", + "CPACK_OPTIONS": "-D CPACK_UPLOAD_URL=${CPACK_UPLOAD_URL}", + "CMAKE_TARGET": "all" + } + }, + "install_profile_pipe": { + "TAGS": [ + "nightly-incremental", + "nightly-clean" + ], + "PIPELINE_ENV": { + "PROJECT_REPOSITORY_NAME": "TestProject" + }, + "steps": [ + "install_profile", + "project_generate", + "project_engineinstall_profile" + ] + }, + "project_generate": { + "TAGS": [], + "COMMAND": "python_linux.sh", + "PARAMETERS": { + "SCRIPT_PATH": "install/scripts/o3de.py", + "SCRIPT_PARAMETERS": "create-project -pp ${WORKSPACE}/${PROJECT_REPOSITORY_NAME} --force" + } + }, + "project_engineinstall_profile": { + "TAGS": [], + "COMMAND": "build_linux.sh", + "PARAMETERS": { + "COMMAND_CWD": "${WORKSPACE}/${PROJECT_REPOSITORY_NAME}", + "CONFIGURATION": "profile", + "OUTPUT_DIRECTORY": "build/linux", + "CMAKE_OPTIONS": "-G 'Ninja Multi-Config' -DLY_PARALLEL_LINK_JOBS=4 -DCMAKE_MODULE_PATH=${WORKSPACE}/o3de/install/cmake", + "CMAKE_TARGET": "all" + } } } diff --git a/scripts/build/Platform/Linux/build_installer_linux.sh b/scripts/build/Platform/Linux/build_installer_linux.sh new file mode 100755 index 0000000000..301eb5f16d --- /dev/null +++ b/scripts/build/Platform/Linux/build_installer_linux.sh @@ -0,0 +1,15 @@ +#!/usr/bin/env bash +# +# 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 +# +# + +set -o errexit # exit on the first failure encountered + +BASEDIR=$(dirname "$0") +source $BASEDIR/build_linux.sh + +source $BASEDIR/installer_linux.sh diff --git a/scripts/build/Platform/Linux/build_linux.sh b/scripts/build/Platform/Linux/build_linux.sh index fd73e17a12..c14d4b5073 100755 --- a/scripts/build/Platform/Linux/build_linux.sh +++ b/scripts/build/Platform/Linux/build_linux.sh @@ -17,7 +17,10 @@ SOURCE_DIRECTORY=${PWD} pushd $OUTPUT_DIRECTORY LAST_CONFIGURE_CMD_FILE=ci_last_configure_cmd.txt -CONFIGURE_CMD="cmake ${SOURCE_DIRECTORY} ${CMAKE_OPTIONS} ${EXTRA_CMAKE_OPTIONS} -DLY_3RDPARTY_PATH=${LY_3RDPARTY_PATH} -DLY_PROJECTS='${CMAKE_LY_PROJECTS}'" +CONFIGURE_CMD="cmake ${SOURCE_DIRECTORY} ${CMAKE_OPTIONS} ${EXTRA_CMAKE_OPTIONS} -DLY_3RDPARTY_PATH=${LY_3RDPARTY_PATH}" +if [[ -n "$CMAKE_LY_PROJECTS" ]]; then + CONFIGURE_CMD="${CONFIGURE_CMD} -DLY_PROJECTS='${CMAKE_LY_PROJECTS}'" +fi if [[ ! -e "CMakeCache.txt" ]]; then echo [ci_build] First run, generating RUN_CONFIGURE=1 @@ -34,13 +37,13 @@ else fi if [[ ! -z "$RUN_CONFIGURE" ]]; then # have to use eval since $CMAKE_OPTIONS (${EXTRA_CMAKE_OPTIONS}) contains quotes that need to be processed - echo [ci_build] ${CONFIGURE_CMD} + eval echo [ci_build] ${CONFIGURE_CMD} eval ${CONFIGURE_CMD} # Save the run only if success - echo "${CONFIGURE_CMD}" > ${LAST_CONFIGURE_CMD_FILE} + eval echo "${CONFIGURE_CMD}" > ${LAST_CONFIGURE_CMD_FILE} fi -echo [ci_build] cmake --build . --target ${CMAKE_TARGET} --config ${CONFIGURATION} -j $(grep -c processor /proc/cpuinfo) -- ${CMAKE_NATIVE_BUILD_ARGS} -cmake --build . --target ${CMAKE_TARGET} --config ${CONFIGURATION} -j $(grep -c processor /proc/cpuinfo) -- ${CMAKE_NATIVE_BUILD_ARGS} +eval echo [ci_build] cmake --build . --target ${CMAKE_TARGET} --config ${CONFIGURATION} -j $(grep -c processor /proc/cpuinfo) -- ${CMAKE_NATIVE_BUILD_ARGS} +eval cmake --build . --target ${CMAKE_TARGET} --config ${CONFIGURATION} -j $(grep -c processor /proc/cpuinfo) -- ${CMAKE_NATIVE_BUILD_ARGS} popd diff --git a/scripts/build/Platform/Linux/env_linux.sh b/scripts/build/Platform/Linux/env_linux.sh index a03b9642fb..059bb119ff 100755 --- a/scripts/build/Platform/Linux/env_linux.sh +++ b/scripts/build/Platform/Linux/env_linux.sh @@ -18,3 +18,8 @@ if ! command -v ninja &> /dev/null; then echo "[ci_build] Ninja not found" exit 1 fi + +if [[ -n "${COMMAND_CWD}" ]]; then + echo $(eval echo [ci_build] Changing CWD to $COMMAND_CWD) + cd $(eval echo ${COMMAND_CWD}) +fi diff --git a/scripts/build/Platform/Linux/installer_linux.sh b/scripts/build/Platform/Linux/installer_linux.sh new file mode 100755 index 0000000000..3ded242522 --- /dev/null +++ b/scripts/build/Platform/Linux/installer_linux.sh @@ -0,0 +1,30 @@ +#!/usr/bin/env bash +# +# 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 +# +# + +set -o errexit # exit on the first failure encountered + +BASEDIR=$(dirname "$0") +source $BASEDIR/env_linux.sh + +mkdir -p ${OUTPUT_DIRECTORY} +SOURCE_DIRECTORY=${PWD} +pushd $OUTPUT_DIRECTORY + +if ! command -v cpack &> /dev/null; then + echo "[ci_build] CPack not found" + exit 1 +fi + +echo [ci_build] cpack --version +cpack --version + +eval echo [ci_build] cpack -C ${CONFIGURATION} ${CPACK_OPTIONS} +eval cpack -C ${CONFIGURATION} ${CPACK_OPTIONS} + +popd diff --git a/scripts/build/Platform/Mac/build_config.json b/scripts/build/Platform/Mac/build_config.json index 7eb3cb5699..34b02a1aec 100644 --- a/scripts/build/Platform/Mac/build_config.json +++ b/scripts/build/Platform/Mac/build_config.json @@ -37,7 +37,7 @@ "PARAMETERS": { "CONFIGURATION": "debug", "OUTPUT_DIRECTORY": "build/mac", - "CMAKE_OPTIONS": "-G Xcode -DLY_UNITY_BUILD=TRUE", + "CMAKE_OPTIONS": "-G Xcode", "CMAKE_LY_PROJECTS": "AutomatedTesting", "CMAKE_TARGET": "ALL_BUILD" } @@ -51,7 +51,7 @@ "PARAMETERS": { "CONFIGURATION": "profile", "OUTPUT_DIRECTORY": "build/mac", - "CMAKE_OPTIONS": "-G Xcode -DLY_UNITY_BUILD=TRUE", + "CMAKE_OPTIONS": "-G Xcode", "CMAKE_LY_PROJECTS": "AutomatedTesting", "CMAKE_TARGET": "ALL_BUILD" } @@ -81,7 +81,7 @@ "PARAMETERS": { "CONFIGURATION": "profile", "OUTPUT_DIRECTORY": "build/mac", - "CMAKE_OPTIONS": "-G Xcode -DLY_UNITY_BUILD=TRUE", + "CMAKE_OPTIONS": "-G Xcode", "CMAKE_LY_PROJECTS": "AutomatedTesting", "CMAKE_TARGET": "AssetProcessorBatch", "ASSET_PROCESSOR_BINARY": "bin/profile/AssetProcessorBatch", @@ -99,7 +99,7 @@ "PARAMETERS": { "CONFIGURATION": "profile", "OUTPUT_DIRECTORY": "build/mac", - "CMAKE_OPTIONS": "-G Xcode -DLY_UNITY_BUILD=TRUE", + "CMAKE_OPTIONS": "-G Xcode", "CMAKE_LY_PROJECTS": "AutomatedTesting", "CMAKE_TARGET": "TEST_SUITE_periodic", "CTEST_OPTIONS": "-L \"(SUITE_periodic)\"", @@ -116,7 +116,7 @@ "PARAMETERS": { "CONFIGURATION": "profile", "OUTPUT_DIRECTORY": "build/mac", - "CMAKE_OPTIONS": "-G Xcode -DLY_UNITY_BUILD=TRUE", + "CMAKE_OPTIONS": "-G Xcode", "CMAKE_LY_PROJECTS": "AutomatedTesting", "CMAKE_TARGET": "TEST_SUITE_benchmark", "CTEST_OPTIONS": "-L \"(SUITE_benchmark)\"", @@ -133,7 +133,7 @@ "PARAMETERS": { "CONFIGURATION": "release", "OUTPUT_DIRECTORY": "build/mac", - "CMAKE_OPTIONS": "-G Xcode -DLY_UNITY_BUILD=TRUE", + "CMAKE_OPTIONS": "-G Xcode", "CMAKE_LY_PROJECTS": "AutomatedTesting", "CMAKE_TARGET": "ALL_BUILD" } @@ -148,7 +148,7 @@ "PARAMETERS": { "CONFIGURATION": "release", "OUTPUT_DIRECTORY": "build/mono_mac", - "CMAKE_OPTIONS": "-G Xcode -DLY_MONOLITHIC_GAME=TRUE -DLY_UNITY_BUILD=TRUE", + "CMAKE_OPTIONS": "-G Xcode -DLY_MONOLITHIC_GAME=TRUE", "CMAKE_LY_PROJECTS": "AutomatedTesting", "CMAKE_TARGET": "ALL_BUILD" } @@ -162,5 +162,50 @@ "SCRIPT_PATH": "scripts/build/package/package.py", "SCRIPT_PARAMETERS": "--platform Mac --type all" } + }, + "install_profile": { + "TAGS": [], + "COMMAND": "build_mac.sh", + "PARAMETERS": { + "CONFIGURATION": "profile", + "OUTPUT_DIRECTORY": "build/mac", + "CMAKE_OPTIONS": "-G Xcode -DLY_DISABLE_TEST_MODULES=TRUE", + "CMAKE_LY_PROJECTS": "", + "CMAKE_TARGET": "install" + } + }, + "install_profile_pipe": { + "TAGS": [ + "nightly-incremental", + "nightly-clean" + ], + "PIPELINE_ENV": { + "PROJECT_REPOSITORY_NAME": "TestProject" + }, + "steps": [ + "install_profile", + "project_generate", + "project_engineinstall_profile" + ] + }, + "project_generate": { + "TAGS": [], + "COMMAND": "python_mac.sh", + "PARAMETERS": { + "SCRIPT_PATH": "install/O3DE_SDK.app/Contents/Engine/scripts/o3de.py", + "SCRIPT_PARAMETERS": "create-project -pp ${WORKSPACE}/${PROJECT_REPOSITORY_NAME} --force" + } + }, + "project_engineinstall_profile": { + "TAGS": [], + "COMMAND": "build_mac.sh", + "PARAMETERS": { + "COMMAND_CWD": "${WORKSPACE}/${PROJECT_REPOSITORY_NAME}", + "CONFIGURATION": "profile", + "OUTPUT_DIRECTORY": "build/mac", + "CMAKE_OPTIONS": "-G Xcode -DCMAKE_MODULE_PATH=${WORKSPACE}/o3de/install/O3DE_SDK.app/Contents/Engine/cmake", + "CMAKE_LY_PROJECTS": "", + "CMAKE_TARGET": "ALL_BUILD" + } } } diff --git a/scripts/build/Platform/Mac/build_mac.sh b/scripts/build/Platform/Mac/build_mac.sh index cb271212d6..169e91c24f 100755 --- a/scripts/build/Platform/Mac/build_mac.sh +++ b/scripts/build/Platform/Mac/build_mac.sh @@ -17,7 +17,10 @@ SOURCE_DIRECTORY=${PWD} pushd $OUTPUT_DIRECTORY LAST_CONFIGURE_CMD_FILE=ci_last_configure_cmd.txt -CONFIGURE_CMD="cmake ${SOURCE_DIRECTORY} ${CMAKE_OPTIONS} ${EXTRA_CMAKE_OPTIONS} -DLY_3RDPARTY_PATH=${LY_3RDPARTY_PATH} -DLY_PROJECTS='${CMAKE_LY_PROJECTS}'" +CONFIGURE_CMD="cmake ${SOURCE_DIRECTORY} ${CMAKE_OPTIONS} ${EXTRA_CMAKE_OPTIONS} -DLY_3RDPARTY_PATH=${LY_3RDPARTY_PATH}" +if [[ -n "$CMAKE_LY_PROJECTS" ]]; then + CONFIGURE_CMD="${CONFIGURE_CMD} -DLY_PROJECTS='${CMAKE_LY_PROJECTS}'" +fi if [[ ! -e "CMakeCache.txt" ]]; then echo [ci_build] First run, generating RUN_CONFIGURE=1 diff --git a/scripts/build/Platform/Mac/env_mac.sh b/scripts/build/Platform/Mac/env_mac.sh index 2c974a1efe..f5fd9f5773 100755 --- a/scripts/build/Platform/Mac/env_mac.sh +++ b/scripts/build/Platform/Mac/env_mac.sh @@ -13,3 +13,8 @@ if ! command -v cmake &> /dev/null; then echo "[ci_build] CMake not found" exit 1 fi + +if [[ -n "${COMMAND_CWD}" ]]; then + echo $(eval echo [ci_build] Changing CWD to $COMMAND_CWD) + cd $(eval echo ${COMMAND_CWD}) +fi diff --git a/scripts/build/Platform/Windows/build_config.json b/scripts/build/Platform/Windows/build_config.json index 9eb9957729..6f1aaa1570 100644 --- a/scripts/build/Platform/Windows/build_config.json +++ b/scripts/build/Platform/Windows/build_config.json @@ -56,7 +56,7 @@ "COMMAND": "python_windows.cmd", "PARAMETERS": { "SCRIPT_PATH": "scripts/build/ci_build_metrics.py", - "SCRIPT_PARAMETERS": "--platform=Windows --repository=!REPOSITORY_NAME! --jobname=!JOB_NAME! --jobnumber=!BUILD_NUMBER! --jobnode=!NODE_LABEL! --changelist=!CHANGE_ID!" + "SCRIPT_PARAMETERS": "--platform=Windows --repository=%REPOSITORY_NAME% --jobname=%JOB_NAME% --jobnumber=%BUILD_NUMBER% --jobnode=%NODE_LABEL% --changelist=%CHANGE_ID%" } }, "windows_packaging_all": { @@ -88,7 +88,7 @@ "CONFIGURATION": "profile", "SCRIPT_PATH": "scripts/build/TestImpactAnalysis/tiaf_driver.py", "SCRIPT_PARAMETERS": - "--config=\"!OUTPUT_DIRECTORY!/bin/TestImpactFramework/profile/Persistent/tiaf.json\" --src-branch=!BRANCH_NAME! --dst-branch=!CHANGE_TARGET! --commit=!CHANGE_ID! --s3-bucket=!TEST_IMPACT_S3_BUCKET! --mars-index-prefix=jonawals --s3-top-level-dir=!REPOSITORY_NAME! --build-number=!BUILD_NUMBER! --suite=main --test-failure-policy=continue" + "--config=\"%OUTPUT_DIRECTORY%/bin/TestImpactFramework/profile/Persistent/tiaf.json\" --src-branch=%BRANCH_NAME% --dst-branch=%CHANGE_TARGET% --commit=%CHANGE_ID% --s3-bucket=%TEST_IMPACT_S3_BUCKET% --mars-index-prefix=jonawals --s3-top-level-dir=%REPOSITORY_NAME% --build-number=%BUILD_NUMBER% --suite=main --test-failure-policy=continue" } }, "debug_vs2019": { @@ -99,7 +99,7 @@ "PARAMETERS": { "CONFIGURATION": "debug", "OUTPUT_DIRECTORY": "build\\windows_vs2019", - "CMAKE_OPTIONS": "-G \"Visual Studio 16 2019\" -DCMAKE_SYSTEM_VERSION=10.0 -DLY_UNITY_BUILD=TRUE", + "CMAKE_OPTIONS": "-G \"Visual Studio 16 2019\" -DCMAKE_SYSTEM_VERSION=10.0", "CMAKE_LY_PROJECTS": "AutomatedTesting", "CMAKE_TARGET": "ALL_BUILD", "CMAKE_NATIVE_BUILD_ARGS": "/m /nologo" @@ -113,7 +113,7 @@ "PARAMETERS": { "CONFIGURATION": "debug", "OUTPUT_DIRECTORY": "build\\windows_vs2019", - "CMAKE_OPTIONS": "-G \"Visual Studio 16 2019\" -DCMAKE_SYSTEM_VERSION=10.0 -DLY_UNITY_BUILD=TRUE", + "CMAKE_OPTIONS": "-G \"Visual Studio 16 2019\" -DCMAKE_SYSTEM_VERSION=10.0", "CMAKE_LY_PROJECTS": "AutomatedTesting", "CMAKE_TARGET": "TEST_SUITE_smoke TEST_SUITE_main", "CMAKE_NATIVE_BUILD_ARGS": "/m /nologo", @@ -131,7 +131,7 @@ "PARAMETERS": { "CONFIGURATION": "profile", "OUTPUT_DIRECTORY": "build\\windows_vs2019", - "CMAKE_OPTIONS": "-G \"Visual Studio 16 2019\" -DCMAKE_SYSTEM_VERSION=10.0 -DLY_UNITY_BUILD=TRUE -DLY_TEST_IMPACT_INSTRUMENTATION_BIN=!TEST_IMPACT_WIN_BINARY!", + "CMAKE_OPTIONS": "-G \"Visual Studio 16 2019\" -DCMAKE_SYSTEM_VERSION=10.0 -DLY_TEST_IMPACT_INSTRUMENTATION_BIN=%TEST_IMPACT_WIN_BINARY%", "CMAKE_LY_PROJECTS": "AutomatedTesting", "CMAKE_TARGET": "ALL_BUILD", "CMAKE_NATIVE_BUILD_ARGS": "/m /nologo" @@ -162,7 +162,7 @@ "PARAMETERS": { "CONFIGURATION": "profile", "OUTPUT_DIRECTORY": "build\\windows_vs2019", - "CMAKE_OPTIONS": "-G \"Visual Studio 16 2019\" -DCMAKE_SYSTEM_VERSION=10.0 -DLY_UNITY_BUILD=TRUE", + "CMAKE_OPTIONS": "-G \"Visual Studio 16 2019\" -DCMAKE_SYSTEM_VERSION=10.0", "CMAKE_LY_PROJECTS": "AutomatedTesting", "CMAKE_TARGET": "TEST_SUITE_smoke TEST_SUITE_main", "CMAKE_NATIVE_BUILD_ARGS": "/m /nologo", @@ -183,7 +183,7 @@ "PARAMETERS": { "CONFIGURATION": "profile", "OUTPUT_DIRECTORY": "build\\windows_vs2019", - "CMAKE_OPTIONS": "-G \"Visual Studio 16 2019\" -DCMAKE_SYSTEM_VERSION=10.0 -DLY_UNITY_BUILD=TRUE", + "CMAKE_OPTIONS": "-G \"Visual Studio 16 2019\" -DCMAKE_SYSTEM_VERSION=10.0", "CMAKE_LY_PROJECTS": "AutomatedTesting", "CMAKE_TARGET": "TEST_SUITE_smoke TEST_SUITE_main", "CMAKE_NATIVE_BUILD_ARGS": "/m /nologo", @@ -203,7 +203,7 @@ "PARAMETERS": { "CONFIGURATION": "profile", "OUTPUT_DIRECTORY": "build\\windows_vs2019", - "CMAKE_OPTIONS": "-G \"Visual Studio 16 2019\" -DCMAKE_SYSTEM_VERSION=10.0 -DLY_UNITY_BUILD=TRUE", + "CMAKE_OPTIONS": "-G \"Visual Studio 16 2019\" -DCMAKE_SYSTEM_VERSION=10.0", "CMAKE_LY_PROJECTS": "AutomatedTesting", "CMAKE_TARGET": "AssetProcessorBatch", "CMAKE_NATIVE_BUILD_ARGS": "/m /nologo", @@ -234,7 +234,7 @@ "PARAMETERS": { "CONFIGURATION": "profile", "OUTPUT_DIRECTORY": "build\\windows_vs2019", - "CMAKE_OPTIONS": "-G \"Visual Studio 16 2019\" -DCMAKE_SYSTEM_VERSION=10.0 -DLY_UNITY_BUILD=TRUE", + "CMAKE_OPTIONS": "-G \"Visual Studio 16 2019\" -DCMAKE_SYSTEM_VERSION=10.0", "CMAKE_LY_PROJECTS": "AutomatedTesting", "CMAKE_TARGET": "TEST_SUITE_awsi", "CMAKE_NATIVE_BUILD_ARGS": "/m /nologo", @@ -253,7 +253,7 @@ "PARAMETERS": { "CONFIGURATION": "profile", "OUTPUT_DIRECTORY": "build\\windows_vs2019", - "CMAKE_OPTIONS": "-G \"Visual Studio 16 2019\" -DCMAKE_SYSTEM_VERSION=10.0 -DLY_UNITY_BUILD=TRUE", + "CMAKE_OPTIONS": "-G \"Visual Studio 16 2019\" -DCMAKE_SYSTEM_VERSION=10.0", "CMAKE_LY_PROJECTS": "AutomatedTesting", "CMAKE_TARGET": "TEST_SUITE_periodic", "CMAKE_NATIVE_BUILD_ARGS": "/m /nologo", @@ -275,7 +275,7 @@ "PARAMETERS": { "CONFIGURATION": "profile", "OUTPUT_DIRECTORY": "build\\windows_vs2019", - "CMAKE_OPTIONS": "-G \"Visual Studio 16 2019\" -DCMAKE_SYSTEM_VERSION=10.0 -DLY_UNITY_BUILD=TRUE", + "CMAKE_OPTIONS": "-G \"Visual Studio 16 2019\" -DCMAKE_SYSTEM_VERSION=10.0", "CMAKE_LY_PROJECTS": "AutomatedTesting", "CMAKE_TARGET": "TEST_SUITE_sandbox", "CMAKE_NATIVE_BUILD_ARGS": "/m /nologo", @@ -294,7 +294,7 @@ "PARAMETERS": { "CONFIGURATION": "profile", "OUTPUT_DIRECTORY": "build\\windows_vs2019", - "CMAKE_OPTIONS": "-G \"Visual Studio 16 2019\" -DCMAKE_SYSTEM_VERSION=10.0 -DLY_UNITY_BUILD=TRUE", + "CMAKE_OPTIONS": "-G \"Visual Studio 16 2019\" -DCMAKE_SYSTEM_VERSION=10.0", "CMAKE_LY_PROJECTS": "AutomatedTesting", "CMAKE_TARGET": "TEST_SUITE_benchmark", "CMAKE_NATIVE_BUILD_ARGS": "/m /nologo", @@ -314,7 +314,7 @@ "PARAMETERS": { "CONFIGURATION": "release", "OUTPUT_DIRECTORY": "build\\windows_vs2019", - "CMAKE_OPTIONS": "-G \"Visual Studio 16 2019\" -DCMAKE_SYSTEM_VERSION=10.0 -DLY_UNITY_BUILD=TRUE", + "CMAKE_OPTIONS": "-G \"Visual Studio 16 2019\" -DCMAKE_SYSTEM_VERSION=10.0", "CMAKE_LY_PROJECTS": "AutomatedTesting", "CMAKE_TARGET": "ALL_BUILD", "CMAKE_NATIVE_BUILD_ARGS": "/m /nologo" @@ -330,23 +330,19 @@ "PARAMETERS": { "CONFIGURATION": "release", "OUTPUT_DIRECTORY": "build\\mono_windows_vs2019", - "CMAKE_OPTIONS": "-G \"Visual Studio 16 2019\" -DCMAKE_SYSTEM_VERSION=10.0 -DLY_MONOLITHIC_GAME=TRUE -DLY_UNITY_BUILD=TRUE", + "CMAKE_OPTIONS": "-G \"Visual Studio 16 2019\" -DCMAKE_SYSTEM_VERSION=10.0 -DLY_MONOLITHIC_GAME=TRUE", "CMAKE_LY_PROJECTS": "AutomatedTesting", "CMAKE_TARGET": "ALL_BUILD", "CMAKE_NATIVE_BUILD_ARGS": "/m /nologo" } }, "install_profile_vs2019": { - "TAGS": [ - "nightly-incremental", - "nightly-clean" - ], + "TAGS": [], "COMMAND": "build_windows.cmd", "PARAMETERS": { "CONFIGURATION": "profile", "OUTPUT_DIRECTORY": "build\\windows_vs2019", - "CMAKE_OPTIONS": "-G \"Visual Studio 16 2019\" -DCMAKE_SYSTEM_VERSION=10.0 -DLY_UNITY_BUILD=TRUE -DLY_DISABLE_TEST_MODULES=TRUE", - "CMAKE_LY_PROJECTS": "", + "CMAKE_OPTIONS": "-G \"Visual Studio 16 2019\" -DCMAKE_SYSTEM_VERSION=10.0 -DLY_DISABLE_TEST_MODULES=TRUE", "CMAKE_TARGET": "INSTALL", "CMAKE_NATIVE_BUILD_ARGS": "/m /nologo" } @@ -363,14 +359,35 @@ "PARAMETERS": { "CONFIGURATION": "profile", "OUTPUT_DIRECTORY": "build\\windows_vs2019", - "CMAKE_OPTIONS": "-G \"Visual Studio 16 2019\" -DCMAKE_SYSTEM_VERSION=10.0 -DLY_UNITY_BUILD=TRUE -DLY_DISABLE_TEST_MODULES=TRUE -DLY_VERSION_ENGINE_NAME=o3de-sdk -DLY_VERSION_STRING=!O3DE_VERSION! -DLY_INSTALLER_WIX_ROOT=\"!WIX! \"", - "EXTRA_CMAKE_OPTIONS": "-DLY_INSTALLER_AUTO_GEN_TAG=ON -DLY_INSTALLER_DOWNLOAD_URL=!INSTALLER_DOWNLOAD_URL! -DLY_INSTALLER_LICENSE_URL=!INSTALLER_DOWNLOAD_URL!/license", - "CPACK_BUCKET": "!INSTALLER_BUCKET!", - "CMAKE_LY_PROJECTS": "", + "CMAKE_OPTIONS": "-G \"Visual Studio 16 2019\" -DCMAKE_SYSTEM_VERSION=10.0 -DLY_DISABLE_TEST_MODULES=TRUE -DLY_VERSION_ENGINE_NAME=o3de-sdk -DLY_INSTALLER_WIX_ROOT=\"!WIX! \"", + "EXTRA_CMAKE_OPTIONS": "-DLY_INSTALLER_AUTO_GEN_TAG=TRUE -DLY_INSTALLER_DOWNLOAD_URL=!INSTALLER_DOWNLOAD_URL! -DLY_INSTALLER_LICENSE_URL=!INSTALLER_DOWNLOAD_URL!/license", "CMAKE_TARGET": "ALL_BUILD", + "CPACK_OPTIONS": "-D CPACK_UPLOAD_URL=\"!CPACK_UPLOAD_URL!\"", "CMAKE_NATIVE_BUILD_ARGS": "/m /nologo" } }, + "install_profile_vs2019_pipe": { + "TAGS": [ + "nightly-incremental", + "nightly-clean" + ], + "PIPELINE_ENV": { + "PROJECT_REPOSITORY_NAME": "TestProject" + }, + "steps": [ + "install_profile_vs2019", + "project_generate", + "project_engineinstall_profile_vs2019" + ] + }, + "project_generate": { + "TAGS": [], + "COMMAND": "python_windows.cmd", + "PARAMETERS": { + "SCRIPT_PATH": "install\\scripts\\o3de.py", + "SCRIPT_PARAMETERS": "create-project -pp %WORKSPACE%\\%PROJECT_REPOSITORY_NAME% --force" + } + }, "project_enginesource_profile_vs2019": { "TAGS": [ "project" @@ -382,8 +399,7 @@ "PARAMETERS": { "CONFIGURATION": "profile", "OUTPUT_DIRECTORY": "build\\windows_vs2019", - "CMAKE_OPTIONS": "-G \"Visual Studio 16 2019\" -DCMAKE_SYSTEM_VERSION=10.0 -DLY_UNITY_BUILD=TRUE -DCMAKE_MODULE_PATH=!WORKSPACE!/o3de/cmake", - "CMAKE_LY_PROJECTS": "", + "CMAKE_OPTIONS": "-G \"Visual Studio 16 2019\" -DCMAKE_SYSTEM_VERSION=10.0 -DCMAKE_MODULE_PATH=%WORKSPACE%/o3de/cmake", "CMAKE_TARGET": "ALL_BUILD", "CMAKE_NATIVE_BUILD_ARGS": "/m /nologo" } @@ -395,10 +411,10 @@ }, "COMMAND": "build_windows.cmd", "PARAMETERS": { + "COMMAND_CWD": "%WORKSPACE%\\%PROJECT_REPOSITORY_NAME%", "CONFIGURATION": "profile", "OUTPUT_DIRECTORY": "build\\windows_vs2019", - "CMAKE_OPTIONS": "-G \"Visual Studio 16 2019\" -DCMAKE_SYSTEM_VERSION=10.0 -DLY_UNITY_BUILD=TRUE -DCMAKE_MODULE_PATH=!WORKSPACE!/o3de/install/cmake", - "CMAKE_LY_PROJECTS": "", + "CMAKE_OPTIONS": "-G \"Visual Studio 16 2019\" -DCMAKE_SYSTEM_VERSION=10.0 -DCMAKE_MODULE_PATH=%WORKSPACE%/o3de/install/cmake", "CMAKE_TARGET": "ALL_BUILD", "CMAKE_NATIVE_BUILD_ARGS": "/m /nologo" } diff --git a/scripts/build/Platform/Windows/build_windows.cmd b/scripts/build/Platform/Windows/build_windows.cmd index b5a0245d1a..6c3ce91397 100644 --- a/scripts/build/Platform/Windows/build_windows.cmd +++ b/scripts/build/Platform/Windows/build_windows.cmd @@ -25,18 +25,14 @@ IF ERRORLEVEL 1 ( exit /b 1 ) -REM Jenkins reports MSB8029 when TMP/TEMP is not defined, define a dummy folder -SET TMP=%cd%/temp -SET TEMP=%cd%/temp -IF NOT EXIST %TMP% ( - MKDIR temp -) - REM Compute half the amount of processors so some jobs can run SET /a HALF_PROCESSORS = NUMBER_OF_PROCESSORS / 2 SET LAST_CONFIGURE_CMD_FILE=ci_last_configure_cmd.txt -SET CONFIGURE_CMD=cmake %SOURCE_DIRECTORY% %CMAKE_OPTIONS% %EXTRA_CMAKE_OPTIONS% -DLY_3RDPARTY_PATH="%LY_3RDPARTY_PATH%" -DLY_PROJECTS=%CMAKE_LY_PROJECTS% +SET CONFIGURE_CMD=cmake %SOURCE_DIRECTORY% %CMAKE_OPTIONS% %EXTRA_CMAKE_OPTIONS% -DLY_3RDPARTY_PATH="%LY_3RDPARTY_PATH%" +IF NOT "%CMAKE_LY_PROJECTS%"=="" ( + SET CONFIGURE_CMD=!CONFIGURE_CMD! -DLY_PROJECTS="%CMAKE_LY_PROJECTS%" +) IF NOT EXIST CMakeCache.txt ( ECHO [ci_build] First run, generating SET RUN_CONFIGURE=1 diff --git a/scripts/build/Platform/Windows/env_windows.cmd b/scripts/build/Platform/Windows/env_windows.cmd index 1c54e36bfc..a78946caf6 100644 --- a/scripts/build/Platform/Windows/env_windows.cmd +++ b/scripts/build/Platform/Windows/env_windows.cmd @@ -7,12 +7,35 @@ REM SPDX-License-Identifier: Apache-2.0 OR MIT REM REM +REM To get recursive folder creation +SETLOCAL EnableExtensions +SETLOCAL EnableDelayedExpansion + where /Q cmake IF NOT %ERRORLEVEL%==0 ( ECHO [ci_build] CMake not found GOTO :error ) +IF NOT "%COMMAND_CWD%"=="" ( + ECHO [ci_build] Changing CWD to %COMMAND_CWD% + CD %COMMAND_CWD% +) + +REM Jenkins reports MSB8029 when TMP/TEMP is not defined, define a dummy folder +IF NOT "%TMP%"=="" ( + IF NOT "%WORKSPACE_TMP%"=="" ( + SET TMP=%WORKSPACE_TMP% + SET TEMP=%WORKSPACE_TMP% + ) ELSE ( + SET TMP=%cd%/temp + SET TEMP=%cd%/temp + ) +) +IF NOT EXIST "!TMP!" ( + MKDIR "!TMP!" +) + EXIT /b 0 :error diff --git a/scripts/build/Platform/Windows/installer_windows.cmd b/scripts/build/Platform/Windows/installer_windows.cmd index 87f53adc7f..bbde450973 100644 --- a/scripts/build/Platform/Windows/installer_windows.cmd +++ b/scripts/build/Platform/Windows/installer_windows.cmd @@ -17,10 +17,12 @@ IF NOT EXIST %OUTPUT_DIRECTORY% ( ) PUSHD %OUTPUT_DIRECTORY% -REM Override the temporary directory used by wix to the workspace -SET "WIX_TEMP=!WORKSPACE_TMP!/wix" -IF NOT EXIST "%WIX_TEMP%" ( - MKDIR "%WIX_TEMP%" +REM Override the temporary directory used by wix to the workspace (if we have a WORKSPACE_TMP) +IF NOT "%WORKSPACE_TMP%"=="" ( + SET "WIX_TEMP=!WORKSPACE_TMP!/wix" + IF NOT EXIST "!WIX_TEMP!" ( + MKDIR "!WIX_TEMP!" + ) ) REM Make sure we are using the CMake version of CPack and not the one that comes with chocolatey @@ -47,10 +49,6 @@ IF ERRORLEVEL 1 ( GOTO :popd_error ) -IF NOT "%CPACK_BUCKET%"=="" ( - SET "CPACK_OPTIONS=-D CPACK_UPLOAD_URL=s3://%CPACK_BUCKET% %CPACK_OPTIONS%" -) - ECHO [ci_build] "!CPACK_PATH!" -C %CONFIGURATION% %CPACK_OPTIONS% "!CPACK_PATH!" -C %CONFIGURATION% %CPACK_OPTIONS% IF NOT %ERRORLEVEL%==0 ( diff --git a/scripts/build/Platform/Windows/package_build_config.json b/scripts/build/Platform/Windows/package_build_config.json index 89431ad96e..5eb96f1e38 100644 --- a/scripts/build/Platform/Windows/package_build_config.json +++ b/scripts/build/Platform/Windows/package_build_config.json @@ -4,7 +4,7 @@ "PARAMETERS": { "CONFIGURATION":"profile", "OUTPUT_DIRECTORY":"windows_vs2019", - "CMAKE_OPTIONS":"-G \"Visual Studio 16 2019\" -DCMAKE_SYSTEM_VERSION=10.0 -DLY_UNITY_BUILD=TRUE", + "CMAKE_OPTIONS":"-G \"Visual Studio 16 2019\" -DCMAKE_SYSTEM_VERSION=10.0", "CMAKE_LY_PROJECTS":"AtomTest;AtomSampleViewer", "CMAKE_TARGET":"ALL_BUILD", "CMAKE_NATIVE_BUILD_ARGS": "/m /nologo" diff --git a/scripts/build/Platform/iOS/build_config.json b/scripts/build/Platform/iOS/build_config.json index 01f545ffb6..ec2b763dda 100644 --- a/scripts/build/Platform/iOS/build_config.json +++ b/scripts/build/Platform/iOS/build_config.json @@ -27,7 +27,7 @@ "PARAMETERS": { "CONFIGURATION": "debug", "OUTPUT_DIRECTORY": "build/ios", - "CMAKE_OPTIONS": "-G Xcode -DCMAKE_TOOLCHAIN_FILE=cmake/Platform/iOS/Toolchain_ios.cmake -DLY_MONOLITHIC_GAME=TRUE -DCMAKE_XCODE_ATTRIBUTE_CODE_SIGNING_REQUIRED=FALSE -DLY_IOS_CODE_SIGNING_IDENTITY=\"\" -DCMAKE_XCODE_ATTRIBUTE_CODE_SIGN_ENTITLEMENTS=\"\" -DCMAKE_XCODE_ATTRIBUTE_CODE_SIGNING_ALLOWED=FALSE -DLY_UNITY_BUILD=TRUE", + "CMAKE_OPTIONS": "-G Xcode -DCMAKE_TOOLCHAIN_FILE=cmake/Platform/iOS/Toolchain_ios.cmake -DLY_MONOLITHIC_GAME=TRUE -DCMAKE_XCODE_ATTRIBUTE_CODE_SIGNING_REQUIRED=FALSE -DLY_IOS_CODE_SIGNING_IDENTITY=\"\" -DCMAKE_XCODE_ATTRIBUTE_CODE_SIGN_ENTITLEMENTS=\"\" -DCMAKE_XCODE_ATTRIBUTE_CODE_SIGNING_ALLOWED=FALSE", "CMAKE_LY_PROJECTS": "AutomatedTesting", "CMAKE_TARGET": "ALL_BUILD", "CMAKE_NATIVE_BUILD_ARGS": "-destination generic/platform=iOS" @@ -44,7 +44,7 @@ "PARAMETERS": { "CONFIGURATION": "profile", "OUTPUT_DIRECTORY": "build/ios", - "CMAKE_OPTIONS": "-G Xcode -DCMAKE_TOOLCHAIN_FILE=cmake/Platform/iOS/Toolchain_ios.cmake -DLY_MONOLITHIC_GAME=TRUE -DCMAKE_XCODE_ATTRIBUTE_CODE_SIGNING_REQUIRED=FALSE -DLY_IOS_CODE_SIGNING_IDENTITY=\"\" -DCMAKE_XCODE_ATTRIBUTE_CODE_SIGN_ENTITLEMENTS=\"\" -DCMAKE_XCODE_ATTRIBUTE_CODE_SIGNING_ALLOWED=FALSE -DLY_UNITY_BUILD=TRUE", + "CMAKE_OPTIONS": "-G Xcode -DCMAKE_TOOLCHAIN_FILE=cmake/Platform/iOS/Toolchain_ios.cmake -DLY_MONOLITHIC_GAME=TRUE -DCMAKE_XCODE_ATTRIBUTE_CODE_SIGNING_REQUIRED=FALSE -DLY_IOS_CODE_SIGNING_IDENTITY=\"\" -DCMAKE_XCODE_ATTRIBUTE_CODE_SIGN_ENTITLEMENTS=\"\" -DCMAKE_XCODE_ATTRIBUTE_CODE_SIGNING_ALLOWED=FALSE", "CMAKE_LY_PROJECTS": "AutomatedTesting", "CMAKE_TARGET": "ALL_BUILD", "CMAKE_NATIVE_BUILD_ARGS": "-destination generic/platform=iOS" @@ -76,7 +76,7 @@ "PARAMETERS": { "CONFIGURATION": "profile", "OUTPUT_DIRECTORY": "build/mac", - "CMAKE_OPTIONS": "-G Xcode -DLY_UNITY_BUILD=TRUE -DO3DE_HOME_PATH=\"${WORKSPACE}/home\" -DO3DE_REGISTER_ENGINE_PATH=\"${WORKSPACE}/o3de\" -DO3DE_REGISTER_THIS_ENGINE=TRUE", + "CMAKE_OPTIONS": "-G Xcode", "CMAKE_LY_PROJECTS": "AutomatedTesting", "CMAKE_TARGET": "AssetProcessorBatch", "ASSET_PROCESSOR_BINARY": "bin/profile/AssetProcessorBatch", @@ -94,7 +94,7 @@ "PARAMETERS": { "CONFIGURATION": "release", "OUTPUT_DIRECTORY": "build/ios", - "CMAKE_OPTIONS": "-G Xcode -DCMAKE_TOOLCHAIN_FILE=cmake/Platform/iOS/Toolchain_ios.cmake -DLY_MONOLITHIC_GAME=TRUE -DCMAKE_XCODE_ATTRIBUTE_CODE_SIGNING_REQUIRED=FALSE -DLY_IOS_CODE_SIGNING_IDENTITY=\"\" -DCMAKE_XCODE_ATTRIBUTE_CODE_SIGN_ENTITLEMENTS=\"\" -DCMAKE_XCODE_ATTRIBUTE_CODE_SIGNING_ALLOWED=FALSE -DLY_UNITY_BUILD=TRUE", + "CMAKE_OPTIONS": "-G Xcode -DCMAKE_TOOLCHAIN_FILE=cmake/Platform/iOS/Toolchain_ios.cmake -DLY_MONOLITHIC_GAME=TRUE -DCMAKE_XCODE_ATTRIBUTE_CODE_SIGNING_REQUIRED=FALSE -DLY_IOS_CODE_SIGNING_IDENTITY=\"\" -DCMAKE_XCODE_ATTRIBUTE_CODE_SIGN_ENTITLEMENTS=\"\" -DCMAKE_XCODE_ATTRIBUTE_CODE_SIGNING_ALLOWED=FALSE", "CMAKE_LY_PROJECTS": "AutomatedTesting", "CMAKE_TARGET": "ALL_BUILD", "CMAKE_NATIVE_BUILD_ARGS": "-destination generic/platform=iOS" @@ -112,7 +112,7 @@ "PARAMETERS": { "CONFIGURATION": "profile", "OUTPUT_DIRECTORY": "build/ios_test", - "CMAKE_OPTIONS": "-G Xcode -DCMAKE_TOOLCHAIN_FILE=cmake/Platform/iOS/Toolchain_ios.cmake -DLY_MONOLITHIC_GAME=FALSE -DCMAKE_XCODE_ATTRIBUTE_CODE_SIGNING_REQUIRED=TRUE -DLY_IOS_CODE_SIGNING_IDENTITY=\"\" -DCMAKE_XCODE_ATTRIBUTE_CODE_SIGN_ENTITLEMENTS=\"\" -DCMAKE_XCODE_ATTRIBUTE_CODE_SIGNING_ALLOWED=TRUE -DLY_UNITY_BUILD=TRUE -DO3DE_HOME_PATH=\"${WORKSPACE}/home\" -DO3DE_REGISTER_ENGINE_PATH=\"${WORKSPACE}/o3de\" -DO3DE_REGISTER_THIS_ENGINE=TRUE", + "CMAKE_OPTIONS": "-G Xcode -DCMAKE_TOOLCHAIN_FILE=cmake/Platform/iOS/Toolchain_ios.cmake -DLY_MONOLITHIC_GAME=FALSE -DCMAKE_XCODE_ATTRIBUTE_CODE_SIGNING_REQUIRED=TRUE -DLY_IOS_CODE_SIGNING_IDENTITY=\"\" -DCMAKE_XCODE_ATTRIBUTE_CODE_SIGN_ENTITLEMENTS=\"\" -DCMAKE_XCODE_ATTRIBUTE_CODE_SIGNING_ALLOWED=TRUE", "CMAKE_TARGET": "ALL_BUILD", "CMAKE_NATIVE_BUILD_ARGS": "", "TARGET_DEVICE_NAME": "Lumberyard", diff --git a/scripts/build/build_node/Platform/Linux/package-list.ubuntu-bionic.txt b/scripts/build/build_node/Platform/Linux/package-list.ubuntu-bionic.txt index 625909e214..30259a6dc7 100644 --- a/scripts/build/build_node/Platform/Linux/package-list.ubuntu-bionic.txt +++ b/scripts/build/build_node/Platform/Linux/package-list.ubuntu-bionic.txt @@ -2,7 +2,7 @@ # Build Tools Packages cmake/3.20.1-0kitware1ubuntu18.04.1 # For cmake -clang-6.0 # For Ninja Build System +clang-12 # For Ninja Build System ninja-build # For the compiler and its dependencies java-11-amazon-corretto-jdk # For Jenkins and Android @@ -12,7 +12,12 @@ libxcb-xinerama0 # For Qt plugins at runtime libxcb-xinput0 # For Qt plugins at runtime libfontconfig1-dev # For Qt plugins at runtime libcurl4-openssl-dev # For HttpRequestor -libsdl2-dev # for WWise/Audio +# libsdl2-dev # For WWise/Audio +libxcb-xkb-dev # For xcb keyboard input +libxkbcommon-x11-dev # For xcb keyboard input +libxkbcommon-dev # For xcb keyboard input +libxcb-xfixes0-dev # For mouse input +libxcb-xinput-dev # For mouse input zlib1g-dev mesa-common-dev diff --git a/scripts/build/build_node/Platform/Linux/package-list.ubuntu-focal.txt b/scripts/build/build_node/Platform/Linux/package-list.ubuntu-focal.txt index 2cbbe58b38..71958d74bd 100644 --- a/scripts/build/build_node/Platform/Linux/package-list.ubuntu-focal.txt +++ b/scripts/build/build_node/Platform/Linux/package-list.ubuntu-focal.txt @@ -12,9 +12,11 @@ libxcb-xinerama0 # For Qt plugins at runtime libxcb-xinput0 # For Qt plugins at runtime libfontconfig1-dev # For Qt plugins at runtime libcurl4-openssl-dev # For HttpRequestor -libsdl2-dev # for WWise/Audio +# libsdl2-dev # for WWise/Audio libxcb-xkb-dev # For xcb keyboard input libxkbcommon-x11-dev # For xcb keyboard input libxkbcommon-dev # For xcb keyboard input +libxcb-xfixes0-dev # For mouse input +libxcb-xinput-dev # For mouse input zlib1g-dev mesa-common-dev From 7100d48e167afdb5a642beceecd83e810845ed04 Mon Sep 17 00:00:00 2001 From: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> Date: Fri, 19 Nov 2021 15:59:21 -0800 Subject: [PATCH 173/345] Cherry-picking some changes from stabilization into development (#5810) Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> --- Gems/Multiplayer/Code/CMakeLists.txt | 1 - cmake/Platform/Common/Install_common.cmake | 12 +++++++++--- cmake/Platform/Mac/Install_mac.cmake | 1 - cmake/Version.cmake | 5 +++++ scripts/build/Platform/Windows/env_windows.cmd | 7 +++++++ scripts/build/Platform/Windows/installer_windows.cmd | 4 ++-- 6 files changed, 23 insertions(+), 7 deletions(-) diff --git a/Gems/Multiplayer/Code/CMakeLists.txt b/Gems/Multiplayer/Code/CMakeLists.txt index 8b2f1099b9..afe40408ab 100644 --- a/Gems/Multiplayer/Code/CMakeLists.txt +++ b/Gems/Multiplayer/Code/CMakeLists.txt @@ -133,7 +133,6 @@ if (PAL_TRAIT_BUILD_HOST_TOOLS) Gem::Atom_RHI.Reflect Gem::Multiplayer.Static Gem::Multiplayer.Tools.Static - Gem::Multiplayer.Builders ) ly_create_alias(NAME Multiplayer.Builders NAMESPACE Gem TARGETS Gem::Multiplayer.Editor) diff --git a/cmake/Platform/Common/Install_common.cmake b/cmake/Platform/Common/Install_common.cmake index 1b41036311..46130f1345 100644 --- a/cmake/Platform/Common/Install_common.cmake +++ b/cmake/Platform/Common/Install_common.cmake @@ -224,8 +224,14 @@ function(ly_setup_target OUTPUT_CONFIGURED_TARGET ALIAS_TARGET_NAME absolute_tar if("${target_type}" STREQUAL "STATIC_LIBRARY") set(build_deps_target "${build_deps_target};${build_deps_PRIVATE}") endif() - # But we will also pass the private dependencies as runtime dependencies (note the comment above) - set(RUNTIME_DEPENDENCIES_PLACEHOLDER ${build_deps_PRIVATE}) + + # But we will also pass the private dependencies as runtime dependencies (as long as they are targets, note the comment above) + foreach(build_dep_private IN LISTS build_deps_PRIVATE) + if(TARGET ${build_dep_private}) + list(APPEND RUNTIME_DEPENDENCIES_PLACEHOLDER "${build_dep_private}") + endif() + endforeach() + foreach(build_dependency IN LISTS build_deps_target) # Skip wrapping produced when targets are not created in the same directory if(build_dependency) @@ -809,4 +815,4 @@ set(LY_CORE_COMPONENT_ALREADY_INCLUDED FALSE)" ly_post_install_steps() endif() -endfunction() \ No newline at end of file +endfunction() diff --git a/cmake/Platform/Mac/Install_mac.cmake b/cmake/Platform/Mac/Install_mac.cmake index c75d860c3e..d5ab5d0fed 100644 --- a/cmake/Platform/Mac/Install_mac.cmake +++ b/cmake/Platform/Mac/Install_mac.cmake @@ -147,4 +147,3 @@ function(ly_post_install_steps) ") endfunction() - diff --git a/cmake/Version.cmake b/cmake/Version.cmake index 662e75c3db..de93ebefef 100644 --- a/cmake/Version.cmake +++ b/cmake/Version.cmake @@ -11,3 +11,8 @@ set(LY_VERSION_COPYRIGHT_YEAR ${current_year} CACHE STRING "Open 3D Engine's cop set(LY_VERSION_STRING "0.0.0.0" CACHE STRING "Open 3D Engine's version") set(LY_VERSION_BUILD_NUMBER 0 CACHE STRING "Open 3D Engine's build number") set(LY_VERSION_ENGINE_NAME "o3de" CACHE STRING "Open 3D Engine's engine name") + +if("$ENV{O3DE_VERSION}") + # Overriding through environment + set(LY_VERSION_STRING "$ENV{O3DE_VERSION}") +endif() diff --git a/scripts/build/Platform/Windows/env_windows.cmd b/scripts/build/Platform/Windows/env_windows.cmd index 73dc781f44..a78946caf6 100644 --- a/scripts/build/Platform/Windows/env_windows.cmd +++ b/scripts/build/Platform/Windows/env_windows.cmd @@ -7,6 +7,10 @@ REM SPDX-License-Identifier: Apache-2.0 OR MIT REM REM +REM To get recursive folder creation +SETLOCAL EnableExtensions +SETLOCAL EnableDelayedExpansion + where /Q cmake IF NOT %ERRORLEVEL%==0 ( ECHO [ci_build] CMake not found @@ -28,6 +32,9 @@ IF NOT "%TMP%"=="" ( SET TEMP=%cd%/temp ) ) +IF NOT EXIST "!TMP!" ( + MKDIR "!TMP!" +) EXIT /b 0 diff --git a/scripts/build/Platform/Windows/installer_windows.cmd b/scripts/build/Platform/Windows/installer_windows.cmd index 8af8e7b625..bbde450973 100644 --- a/scripts/build/Platform/Windows/installer_windows.cmd +++ b/scripts/build/Platform/Windows/installer_windows.cmd @@ -20,8 +20,8 @@ PUSHD %OUTPUT_DIRECTORY% REM Override the temporary directory used by wix to the workspace (if we have a WORKSPACE_TMP) IF NOT "%WORKSPACE_TMP%"=="" ( SET "WIX_TEMP=!WORKSPACE_TMP!/wix" - IF NOT EXIST "%WIX_TEMP%" ( - MKDIR "%WIX_TEMP%" + IF NOT EXIST "!WIX_TEMP!" ( + MKDIR "!WIX_TEMP!" ) ) From a0ab5920dafb3e20b29370f0cc63eda97c9d975b Mon Sep 17 00:00:00 2001 From: Steve Pham <82231385+spham-amzn@users.noreply.github.com> Date: Fri, 19 Nov 2021 18:04:15 -0800 Subject: [PATCH 174/345] Add trait to enable/disable the Resource Mapping Tool (#5814) * Add trait to enable/disable the Resource Mapping Tool Signed-off-by: spham <82231385+spham-amzn@users.noreply.github.com> * Moving ly_install_directory(DIRECTIORES Tools/ResourceMappingtool) into of the PAL_TRAIT_ENABLE_RESOURCE_MAPPING_TOOL block Signed-off-by: Steve Pham <82231385+spham-amzn@users.noreply.github.com> --- Gems/AWSCore/Code/CMakeLists.txt | 46 +++++++++++-------- .../Linux/PAL_traits_editor_linux.cmake | 9 ++++ .../Platform/Mac/PAL_traits_editor_mac.cmake | 9 ++++ .../Windows/PAL_traits_editor_windows.cmake | 9 ++++ 4 files changed, 54 insertions(+), 19 deletions(-) create mode 100644 Gems/AWSCore/Code/Platform/Linux/PAL_traits_editor_linux.cmake create mode 100644 Gems/AWSCore/Code/Platform/Mac/PAL_traits_editor_mac.cmake create mode 100644 Gems/AWSCore/Code/Platform/Windows/PAL_traits_editor_windows.cmake diff --git a/Gems/AWSCore/Code/CMakeLists.txt b/Gems/AWSCore/Code/CMakeLists.txt index d84f7814c3..f1521856e6 100644 --- a/Gems/AWSCore/Code/CMakeLists.txt +++ b/Gems/AWSCore/Code/CMakeLists.txt @@ -60,6 +60,9 @@ ly_create_alias( ) if (PAL_TRAIT_BUILD_HOST_TOOLS) + + include(${CMAKE_CURRENT_SOURCE_DIR}/Platform/${PAL_PLATFORM_NAME}/PAL_traits_editor_${PAL_PLATFORM_NAME_LOWERCASE}.cmake) + ly_add_target( NAME AWSCore.Editor.Static STATIC NAMESPACE Gem @@ -97,25 +100,31 @@ if (PAL_TRAIT_BUILD_HOST_TOOLS) Gem::AWSCore.Editor.Static ) - # This target is not a real gem module - # It is not meant to be loaded by the ModuleManager in C++ - ly_add_target( - NAME AWSCore.ResourceMappingTool MODULE - NAMESPACE Gem - OUTPUT_SUBDIRECTORY AWSCoreEditorQtBin - FILES_CMAKE - awscore_resourcemappingtool_files.cmake - INCLUDE_DIRECTORIES - PRIVATE - Include/Private - BUILD_DEPENDENCIES - PRIVATE - Gem::AWSCore.Editor.Static - RUNTIME_DEPENDENCIES - 3rdParty::pyside2 + if (PAL_TRAIT_ENABLE_RESOURCE_MAPPING_TOOL) - ) - ly_add_dependencies(AWSCore.Editor AWSCore.ResourceMappingTool) + # This target is not a real gem module + # It is not meant to be loaded by the ModuleManager in C++ + ly_add_target( + NAME AWSCore.ResourceMappingTool MODULE + NAMESPACE Gem + OUTPUT_SUBDIRECTORY AWSCoreEditorQtBin + FILES_CMAKE + awscore_resourcemappingtool_files.cmake + INCLUDE_DIRECTORIES + PRIVATE + Include/Private + BUILD_DEPENDENCIES + PRIVATE + Gem::AWSCore.Editor.Static + RUNTIME_DEPENDENCIES + 3rdParty::pyside2 + + ) + ly_add_dependencies(AWSCore.Editor AWSCore.ResourceMappingTool) + + ly_install_directory(DIRECTORIES Tools/ResourceMappingTool) + + endif() # Builders and Tools (such as the Editor use AWSCore.Editor) use the .Editor module above. ly_create_alias( @@ -192,4 +201,3 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED) endif() endif() -ly_install_directory(DIRECTORIES Tools/ResourceMappingTool) diff --git a/Gems/AWSCore/Code/Platform/Linux/PAL_traits_editor_linux.cmake b/Gems/AWSCore/Code/Platform/Linux/PAL_traits_editor_linux.cmake new file mode 100644 index 0000000000..deaaa60506 --- /dev/null +++ b/Gems/AWSCore/Code/Platform/Linux/PAL_traits_editor_linux.cmake @@ -0,0 +1,9 @@ +# +# 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 +# +# + +set(PAL_TRAIT_ENABLE_RESOURCE_MAPPING_TOOL TRUE) diff --git a/Gems/AWSCore/Code/Platform/Mac/PAL_traits_editor_mac.cmake b/Gems/AWSCore/Code/Platform/Mac/PAL_traits_editor_mac.cmake new file mode 100644 index 0000000000..e953c95955 --- /dev/null +++ b/Gems/AWSCore/Code/Platform/Mac/PAL_traits_editor_mac.cmake @@ -0,0 +1,9 @@ +# +# 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 +# +# + +set(PAL_TRAIT_ENABLE_RESOURCE_MAPPING_TOOL FALSE) diff --git a/Gems/AWSCore/Code/Platform/Windows/PAL_traits_editor_windows.cmake b/Gems/AWSCore/Code/Platform/Windows/PAL_traits_editor_windows.cmake new file mode 100644 index 0000000000..deaaa60506 --- /dev/null +++ b/Gems/AWSCore/Code/Platform/Windows/PAL_traits_editor_windows.cmake @@ -0,0 +1,9 @@ +# +# 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 +# +# + +set(PAL_TRAIT_ENABLE_RESOURCE_MAPPING_TOOL TRUE) From e1b6054ff849d4376b98dc59ceaa838e3b33b056 Mon Sep 17 00:00:00 2001 From: AMZN-Phil Date: Fri, 19 Nov 2021 19:13:19 -0800 Subject: [PATCH 175/345] Fix Project Manager not finding CMake on Windows Signed-off-by: AMZN-Phil --- .../Platform/Windows/ProjectUtils_windows.cpp | 30 ++++++++++--------- .../Source/ProjectBuilderWorker.cpp | 5 +--- .../ProjectManager/Source/ProjectUtils.cpp | 4 --- .../ProjectManager/Source/ProjectUtils.h | 4 +-- 4 files changed, 18 insertions(+), 25 deletions(-) diff --git a/Code/Tools/ProjectManager/Platform/Windows/ProjectUtils_windows.cpp b/Code/Tools/ProjectManager/Platform/Windows/ProjectUtils_windows.cpp index d08da1d5e1..365aac7069 100644 --- a/Code/Tools/ProjectManager/Platform/Windows/ProjectUtils_windows.cpp +++ b/Code/Tools/ProjectManager/Platform/Windows/ProjectUtils_windows.cpp @@ -21,7 +21,7 @@ namespace O3DE::ProjectManager { namespace ProjectUtils { - AZ::Outcome GetCommandLineProcessEnvironment() + AZ::Outcome SetupCommandLineProcessEnvironment() { // Use the engine path to insert a path for cmake auto engineInfoResult = PythonBindingsInterface::Get()->GetEngineInfo(); @@ -31,26 +31,30 @@ namespace O3DE::ProjectManager } auto engineInfo = engineInfoResult.GetValue(); - QProcessEnvironment currentEnvironment(QProcessEnvironment::systemEnvironment()); - - // Append cmake path to PATH incase it is missing + // Append cmake path to the current environment PATH incase it is missing, since if + // we are starting CMake itself the current application needs to find it using Path + // This also takes affect for all child processes. QDir cmakePath(engineInfo.m_path); cmakePath.cd("cmake/runtime/bin"); - QString pathValue = currentEnvironment.value("PATH"); - pathValue += ";" + cmakePath.path(); - currentEnvironment.insert("PATH", pathValue); - return AZ::Success(currentEnvironment); + QString pathEnv = qEnvironmentVariable("Path"); + if (!pathEnv.contains(cmakePath.path())) + { + pathEnv += ";" + cmakePath.path(); + qputenv("Path", pathEnv.toStdString().c_str()); + } + + return AZ::Success(); } AZ::Outcome FindSupportedCompilerForPlatform() { // Validate that cmake is installed - auto cmakeProcessEnvResult = GetCommandLineProcessEnvironment(); + auto cmakeProcessEnvResult = SetupCommandLineProcessEnvironment(); if (!cmakeProcessEnvResult.IsSuccess()) { return AZ::Failure(cmakeProcessEnvResult.GetError()); } - auto cmakeVersionQueryResult = ExecuteCommandResult("cmake", QStringList{"--version"}, cmakeProcessEnvResult.GetValue()); + auto cmakeVersionQueryResult = ExecuteCommandResult("cmake", QStringList{"--version"}); if (!cmakeVersionQueryResult.IsSuccess()) { return AZ::Failure(QObject::tr("CMake not found. \n\n" @@ -104,7 +108,7 @@ namespace O3DE::ProjectManager AZ::Outcome OpenCMakeGUI(const QString& projectPath) { - AZ::Outcome processEnvResult = GetCommandLineProcessEnvironment(); + AZ::Outcome processEnvResult = SetupCommandLineProcessEnvironment(); if (!processEnvResult.IsSuccess()) { return AZ::Failure(processEnvResult.GetError()); @@ -118,7 +122,6 @@ namespace O3DE::ProjectManager } QProcess process; - process.setProcessEnvironment(processEnvResult.GetValue()); // if the project build path is relative, it should be relative to the project path process.setWorkingDirectory(projectPath); @@ -139,7 +142,6 @@ namespace O3DE::ProjectManager return ExecuteCommandResultModalDialog( "cmd.exe", QStringList{"/c", batPath}, - QProcessEnvironment::systemEnvironment(), QObject::tr("Running get_python script...")); } @@ -157,7 +159,7 @@ namespace O3DE::ProjectManager .arg(shortcutPath) .arg(targetPath) .arg(arguments.join(' ')); - auto createShortcutResult = ExecuteCommandResult(cmd, QStringList{"-Command", arg}, QProcessEnvironment::systemEnvironment()); + auto createShortcutResult = ExecuteCommandResult(cmd, QStringList{"-Command", arg}); if (!createShortcutResult.IsSuccess()) { return AZ::Failure(QObject::tr("Failed to create desktop shortcut %1

" diff --git a/Code/Tools/ProjectManager/Source/ProjectBuilderWorker.cpp b/Code/Tools/ProjectManager/Source/ProjectBuilderWorker.cpp index c6a6b20a1d..7ec691fd81 100644 --- a/Code/Tools/ProjectManager/Source/ProjectBuilderWorker.cpp +++ b/Code/Tools/ProjectManager/Source/ProjectBuilderWorker.cpp @@ -117,18 +117,16 @@ namespace O3DE::ProjectManager // Show some kind of progress with very approximate estimates UpdateProgress(++m_progressEstimate); - auto currentEnvironmentRequest = ProjectUtils::GetCommandLineProcessEnvironment(); + auto currentEnvironmentRequest = ProjectUtils::SetupCommandLineProcessEnvironment(); if (!currentEnvironmentRequest.IsSuccess()) { QStringToAZTracePrint(currentEnvironmentRequest.GetError()); return AZ::Failure(currentEnvironmentRequest.GetError()); } - QProcessEnvironment currentEnvironment = currentEnvironmentRequest.GetValue(); m_configProjectProcess = new QProcess(this); m_configProjectProcess->setProcessChannelMode(QProcess::MergedChannels); m_configProjectProcess->setWorkingDirectory(m_projectInfo.m_path); - m_configProjectProcess->setProcessEnvironment(currentEnvironment); auto cmakeGenerateArgumentsResult = ConstructCmakeGenerateProjectArguments(engineInfo.m_thirdPartyPath); if (!cmakeGenerateArgumentsResult.IsSuccess()) @@ -181,7 +179,6 @@ namespace O3DE::ProjectManager m_buildProjectProcess = new QProcess(this); m_buildProjectProcess->setProcessChannelMode(QProcess::MergedChannels); m_buildProjectProcess->setWorkingDirectory(m_projectInfo.m_path); - m_buildProjectProcess->setProcessEnvironment(currentEnvironment); auto cmakeBuildArgumentsResult = ConstructCmakeBuildCommandArguments(); if (!cmakeBuildArgumentsResult.IsSuccess()) diff --git a/Code/Tools/ProjectManager/Source/ProjectUtils.cpp b/Code/Tools/ProjectManager/Source/ProjectUtils.cpp index 4a0e1c153c..b7748d8aa2 100644 --- a/Code/Tools/ProjectManager/Source/ProjectUtils.cpp +++ b/Code/Tools/ProjectManager/Source/ProjectUtils.cpp @@ -520,12 +520,10 @@ namespace O3DE::ProjectManager AZ::Outcome ExecuteCommandResultModalDialog( const QString& cmd, const QStringList& arguments, - const QProcessEnvironment& processEnv, const QString& title) { QString resultOutput; QProcess execProcess; - execProcess.setProcessEnvironment(processEnv); execProcess.setProcessChannelMode(QProcess::MergedChannels); QProgressDialog dialog(title, QObject::tr("Cancel"), /*minimum=*/0, /*maximum=*/0); @@ -611,11 +609,9 @@ namespace O3DE::ProjectManager AZ::Outcome ExecuteCommandResult( const QString& cmd, const QStringList& arguments, - const QProcessEnvironment& processEnv, int commandTimeoutSeconds /*= ProjectCommandLineTimeoutSeconds*/) { QProcess execProcess; - execProcess.setProcessEnvironment(processEnv); execProcess.setProcessChannelMode(QProcess::MergedChannels); execProcess.start(cmd, arguments); if (!execProcess.waitForStarted()) diff --git a/Code/Tools/ProjectManager/Source/ProjectUtils.h b/Code/Tools/ProjectManager/Source/ProjectUtils.h index ee605b5117..d84b367d5b 100644 --- a/Code/Tools/ProjectManager/Source/ProjectUtils.h +++ b/Code/Tools/ProjectManager/Source/ProjectUtils.h @@ -47,7 +47,6 @@ namespace O3DE::ProjectManager AZ::Outcome ExecuteCommandResult( const QString& cmd, const QStringList& arguments, - const QProcessEnvironment& processEnv, int commandTimeoutSeconds = ProjectCommandLineTimeoutSeconds); /** @@ -61,10 +60,9 @@ namespace O3DE::ProjectManager AZ::Outcome ExecuteCommandResultModalDialog( const QString& cmd, const QStringList& arguments, - const QProcessEnvironment& processEnv, const QString& title); - AZ::Outcome GetCommandLineProcessEnvironment(); + AZ::Outcome SetupCommandLineProcessEnvironment(); AZ::Outcome GetProjectBuildPath(const QString& projectPath); AZ::Outcome OpenCMakeGUI(const QString& projectPath); AZ::Outcome RunGetPythonScript(const QString& enginePath); From 74e1ee1862aec8485245fd94870c842327ffbbaa Mon Sep 17 00:00:00 2001 From: AMZN-Phil Date: Sat, 20 Nov 2021 10:23:50 -0800 Subject: [PATCH 176/345] Fix non-Windows platforms Signed-off-by: AMZN-Phil --- .../Platform/Linux/ProjectUtils_linux.cpp | 5 ++--- .../Platform/Mac/ProjectUtils_mac.cpp | 15 +++++++++------ 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/Code/Tools/ProjectManager/Platform/Linux/ProjectUtils_linux.cpp b/Code/Tools/ProjectManager/Platform/Linux/ProjectUtils_linux.cpp index a7bd2dae08..f9a1906b8a 100644 --- a/Code/Tools/ProjectManager/Platform/Linux/ProjectUtils_linux.cpp +++ b/Code/Tools/ProjectManager/Platform/Linux/ProjectUtils_linux.cpp @@ -19,10 +19,9 @@ namespace O3DE::ProjectManager // The list of clang C/C++ compiler command lines to validate on the host Linux system const QStringList SupportedClangVersions = {"13", "12", "11", "10", "9", "8", "7", "6.0"}; - AZ::Outcome GetCommandLineProcessEnvironment() + AZ::Outcome SetupCommandLineProcessEnvironment() { - QProcessEnvironment currentEnvironment(QProcessEnvironment::systemEnvironment()); - return AZ::Success(currentEnvironment); + return AZ::Success(); } AZ::Outcome FindSupportedCompilerForPlatform() diff --git a/Code/Tools/ProjectManager/Platform/Mac/ProjectUtils_mac.cpp b/Code/Tools/ProjectManager/Platform/Mac/ProjectUtils_mac.cpp index 62011bf04b..24a8fc1ff8 100644 --- a/Code/Tools/ProjectManager/Platform/Mac/ProjectUtils_mac.cpp +++ b/Code/Tools/ProjectManager/Platform/Mac/ProjectUtils_mac.cpp @@ -18,17 +18,20 @@ namespace O3DE::ProjectManager { namespace ProjectUtils { - AZ::Outcome GetCommandLineProcessEnvironment() + AZ::Outcome GetCommandLineProcessEnvironment() { // For CMake on Mac, if its installed through home-brew, then it will be installed // under /usr/local/bin, which may not be in the system PATH environment. // Add that path for the command line process so that it will be able to locate // a home-brew installed version of CMake - QProcessEnvironment currentEnvironment(QProcessEnvironment::systemEnvironment()); - QString pathValue = currentEnvironment.value("PATH"); - pathValue += ":/usr/local/bin"; - currentEnvironment.insert("PATH", pathValue); - return AZ::Success(currentEnvironment); + QString pathEnv = qEnvironmentVariable("PATH"); + if (!pathEnv.contains("/usr/local/bin")) + { + pathEnv += ":/usr/local/bin"; + qputenv("PATH", pathEnv.toStdString().c_str()); + } + + return AZ::Success(); } AZ::Outcome FindSupportedCompilerForPlatform() From def5b3a65d9863cb981197b2bcc2c34d5e478b76 Mon Sep 17 00:00:00 2001 From: AMZN-Phil Date: Sat, 20 Nov 2021 10:37:55 -0800 Subject: [PATCH 177/345] Fix additional left over references to QProcessEnvironment Signed-off-by: AMZN-Phil --- .../Linux/ProjectBuilderWorker_linux.cpp | 4 ++-- .../Platform/Linux/ProjectUtils_linux.cpp | 10 ++++------ .../Platform/Mac/ProjectBuilderWorker_mac.cpp | 6 ++---- .../Platform/Mac/ProjectUtils_mac.cpp | 18 +++++++++--------- 4 files changed, 17 insertions(+), 21 deletions(-) diff --git a/Code/Tools/ProjectManager/Platform/Linux/ProjectBuilderWorker_linux.cpp b/Code/Tools/ProjectManager/Platform/Linux/ProjectBuilderWorker_linux.cpp index fdeaef93bb..5cade609d7 100644 --- a/Code/Tools/ProjectManager/Platform/Linux/ProjectBuilderWorker_linux.cpp +++ b/Code/Tools/ProjectManager/Platform/Linux/ProjectBuilderWorker_linux.cpp @@ -19,7 +19,7 @@ namespace O3DE::ProjectManager { // Attempt to use the Ninja build system if it is installed (described in the o3de documentation) if possible, // otherwise default to the the default for Linux (Unix Makefiles) - auto whichNinjaResult = ProjectUtils::ExecuteCommandResult("which", QStringList{"ninja"}, QProcessEnvironment::systemEnvironment()); + auto whichNinjaResult = ProjectUtils::ExecuteCommandResult("which", QStringList{"ninja"}); QString cmakeGenerator = (whichNinjaResult.IsSuccess()) ? "Ninja Multi-Config" : "Unix Makefiles"; bool compileProfileOnBuild = (whichNinjaResult.IsSuccess()); @@ -38,7 +38,7 @@ namespace O3DE::ProjectManager AZ::Outcome ProjectBuilderWorker::ConstructCmakeBuildCommandArguments() const { - auto whichNinjaResult = ProjectUtils::ExecuteCommandResult("which", QStringList{"ninja"}, QProcessEnvironment::systemEnvironment()); + auto whichNinjaResult = ProjectUtils::ExecuteCommandResult("which", QStringList{"ninja"}); bool compileProfileOnBuild = (whichNinjaResult.IsSuccess()); QString targetBuildPath = QDir(m_projectInfo.m_path).filePath(ProjectBuildPathPostfix); QString launcherTargetName = m_projectInfo.m_projectName + ".GameLauncher"; diff --git a/Code/Tools/ProjectManager/Platform/Linux/ProjectUtils_linux.cpp b/Code/Tools/ProjectManager/Platform/Linux/ProjectUtils_linux.cpp index f9a1906b8a..cb8ea843e5 100644 --- a/Code/Tools/ProjectManager/Platform/Linux/ProjectUtils_linux.cpp +++ b/Code/Tools/ProjectManager/Platform/Linux/ProjectUtils_linux.cpp @@ -27,7 +27,7 @@ namespace O3DE::ProjectManager AZ::Outcome FindSupportedCompilerForPlatform() { // Validate that cmake is installed and is in the command line - auto whichCMakeResult = ProjectUtils::ExecuteCommandResult("which", QStringList{ProjectCMakeCommand}, QProcessEnvironment::systemEnvironment()); + auto whichCMakeResult = ProjectUtils::ExecuteCommandResult("which", QStringList{ProjectCMakeCommand}); if (!whichCMakeResult.IsSuccess()) { return AZ::Failure(QObject::tr("CMake not found.

" @@ -38,8 +38,8 @@ namespace O3DE::ProjectManager // Look for the first compatible version of clang. The list below will contain the known clang compilers that have been tested for O3DE. for (const QString& supportClangVersion : SupportedClangVersions) { - auto whichClangResult = ProjectUtils::ExecuteCommandResult("which", QStringList{QString("clang-%1").arg(supportClangVersion)}, QProcessEnvironment::systemEnvironment()); - auto whichClangPPResult = ProjectUtils::ExecuteCommandResult("which", QStringList{QString("clang++-%1").arg(supportClangVersion)}, QProcessEnvironment::systemEnvironment()); + auto whichClangResult = ProjectUtils::ExecuteCommandResult("which", QStringList{QString("clang-%1").arg(supportClangVersion)}); + auto whichClangPPResult = ProjectUtils::ExecuteCommandResult("which", QStringList{QString("clang++-%1").arg(supportClangVersion)}); if (whichClangResult.IsSuccess() && whichClangPPResult.IsSuccess()) { return AZ::Success(QString("clang-%1").arg(supportClangVersion)); @@ -53,7 +53,7 @@ namespace O3DE::ProjectManager AZ::Outcome OpenCMakeGUI(const QString& projectPath) { - AZ::Outcome processEnvResult = GetCommandLineProcessEnvironment(); + AZ::Outcome processEnvResult = SetupCommandLineProcessEnvironment(); if (!processEnvResult.IsSuccess()) { return AZ::Failure(processEnvResult.GetError()); @@ -67,7 +67,6 @@ namespace O3DE::ProjectManager } QProcess process; - process.setProcessEnvironment(processEnvResult.GetValue()); // if the project build path is relative, it should be relative to the project path process.setWorkingDirectory(projectPath); @@ -87,7 +86,6 @@ namespace O3DE::ProjectManager return ExecuteCommandResultModalDialog( QString("%1/python/get_python.sh").arg(engineRoot), {}, - QProcessEnvironment::systemEnvironment(), QObject::tr("Running get_python script...")); } diff --git a/Code/Tools/ProjectManager/Platform/Mac/ProjectBuilderWorker_mac.cpp b/Code/Tools/ProjectManager/Platform/Mac/ProjectBuilderWorker_mac.cpp index ab412d84d8..2a8bbf4839 100644 --- a/Code/Tools/ProjectManager/Platform/Mac/ProjectBuilderWorker_mac.cpp +++ b/Code/Tools/ProjectManager/Platform/Mac/ProjectBuilderWorker_mac.cpp @@ -19,16 +19,14 @@ namespace O3DE::ProjectManager { AZ::Outcome QueryInstalledCmakeFullPath() { - auto environmentRequest = ProjectUtils::GetCommandLineProcessEnvironment(); + auto environmentRequest = ProjectUtils::SetupCommandLineProcessEnvironment(); if (!environmentRequest.IsSuccess()) { return AZ::Failure(environmentRequest.GetError()); } - auto currentEnvironment = environmentRequest.GetValue(); auto queryCmakeInstalled = ProjectUtils::ExecuteCommandResult("which", - QStringList{ProjectCMakeCommand}, - currentEnvironment); + QStringList{ProjectCMakeCommand}); if (!queryCmakeInstalled.IsSuccess()) { return AZ::Failure(QObject::tr("Unable to detect CMake on this host.")); diff --git a/Code/Tools/ProjectManager/Platform/Mac/ProjectUtils_mac.cpp b/Code/Tools/ProjectManager/Platform/Mac/ProjectUtils_mac.cpp index 24a8fc1ff8..430e8974b7 100644 --- a/Code/Tools/ProjectManager/Platform/Mac/ProjectUtils_mac.cpp +++ b/Code/Tools/ProjectManager/Platform/Mac/ProjectUtils_mac.cpp @@ -18,7 +18,7 @@ namespace O3DE::ProjectManager { namespace ProjectUtils { - AZ::Outcome GetCommandLineProcessEnvironment() + AZ::Outcome SetupCommandLineProcessEnvironment() { // For CMake on Mac, if its installed through home-brew, then it will be installed // under /usr/local/bin, which may not be in the system PATH environment. @@ -36,13 +36,14 @@ namespace O3DE::ProjectManager AZ::Outcome FindSupportedCompilerForPlatform() { - QProcessEnvironment currentEnvironment(QProcessEnvironment::systemEnvironment()); - QString pathValue = currentEnvironment.value("PATH"); - pathValue += ":/usr/local/bin"; - currentEnvironment.insert("PATH", pathValue); + AZ::Outcome processEnvResult = SetupCommandLineProcessEnvironment(); + if (!processEnvResult.IsSuccess()) + { + return AZ::Failure(processEnvResult.GetError()); + } // Validate that we have cmake installed first - auto queryCmakeInstalled = ExecuteCommandResult("which", QStringList{ProjectCMakeCommand}, currentEnvironment); + auto queryCmakeInstalled = ExecuteCommandResult("which", QStringList{ProjectCMakeCommand}); if (!queryCmakeInstalled.IsSuccess()) { return AZ::Failure(QObject::tr("Unable to detect CMake on this host.")); @@ -50,7 +51,7 @@ namespace O3DE::ProjectManager QString cmakeInstalledPath = queryCmakeInstalled.GetValue().split("\n")[0]; // Query the version of the installed cmake - auto queryCmakeVersionQuery = ExecuteCommandResult(cmakeInstalledPath, QStringList{"-version"}, currentEnvironment); + auto queryCmakeVersionQuery = ExecuteCommandResult(cmakeInstalledPath, QStringList{"-version"}); if (!queryCmakeVersionQuery.IsSuccess()) { return AZ::Failure(QObject::tr("Unable to determine the version of CMake on this host.")); @@ -58,7 +59,7 @@ namespace O3DE::ProjectManager AZ_TracePrintf("Project Manager", "Cmake version %s detected.", queryCmakeVersionQuery.GetValue().split("\n")[0].toUtf8().constData()); // Query for the version of xcodebuild (if installed) - auto queryXcodeBuildVersion = ExecuteCommandResult("xcodebuild", QStringList{"-version"}, currentEnvironment); + auto queryXcodeBuildVersion = ExecuteCommandResult("xcodebuild", QStringList{"-version"}); if (!queryCmakeInstalled.IsSuccess()) { return AZ::Failure(QObject::tr("Unable to detect XCodeBuilder on this host.")); @@ -107,7 +108,6 @@ namespace O3DE::ProjectManager return ExecuteCommandResultModalDialog( QString("%1/python/get_python.sh").arg(engineRoot), {}, - QProcessEnvironment::systemEnvironment(), QObject::tr("Running get_python script...")); } From 02590a1766d0613a12ec3be95f10fd8f7057c402 Mon Sep 17 00:00:00 2001 From: Gene Walters Date: Sat, 20 Nov 2021 14:48:48 -0800 Subject: [PATCH 178/345] AzCoreLogSink will check if it's running in an editor-server and will allow stdouts Signed-off-by: Gene Walters --- Code/Framework/AzCore/AzCore/Debug/Trace.cpp | 4 ++-- Code/Legacy/CrySystem/AZCoreLogSink.h | 11 +++++++++++ .../Editor/MultiplayerEditorSystemComponent.cpp | 2 -- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/Code/Framework/AzCore/AzCore/Debug/Trace.cpp b/Code/Framework/AzCore/AzCore/Debug/Trace.cpp index 78dbf3c979..d8a39deebb 100644 --- a/Code/Framework/AzCore/AzCore/Debug/Trace.cpp +++ b/Code/Framework/AzCore/AzCore/Debug/Trace.cpp @@ -535,10 +535,10 @@ namespace AZ::Debug EBUS_EVENT(TraceMessageDrillerBus, OnOutput, window, message); TraceMessageResult result; EBUS_EVENT_RESULT(result, TraceMessageBus, OnOutput, window, message); - /* if (result.m_value) + if (result.m_value) { return; - }*/ + } } RawOutput(window, message); diff --git a/Code/Legacy/CrySystem/AZCoreLogSink.h b/Code/Legacy/CrySystem/AZCoreLogSink.h index 1b09c3198d..605367f418 100644 --- a/Code/Legacy/CrySystem/AZCoreLogSink.h +++ b/Code/Legacy/CrySystem/AZCoreLogSink.h @@ -180,6 +180,17 @@ public: CryLog("(%s) - %s", window, message); } + // If this is an editor-server, then allow the default trace behavior (fwrites to stdout) to occur + // The editor will being listening to the stdout of this server + if (const auto console = AZ::Interface::Get()) + { + bool editorsv_isDedicated = false; + if (console->GetCvarValue("editorsv_isDedicated", editorsv_isDedicated) == AZ::GetValueResult::Success) + { + return !editorsv_isDedicated; + } + } + return true; // suppress default AzCore behavior. } diff --git a/Gems/Multiplayer/Code/Source/Editor/MultiplayerEditorSystemComponent.cpp b/Gems/Multiplayer/Code/Source/Editor/MultiplayerEditorSystemComponent.cpp index d75fbcbc70..669393e31e 100644 --- a/Gems/Multiplayer/Code/Source/Editor/MultiplayerEditorSystemComponent.cpp +++ b/Gems/Multiplayer/Code/Source/Editor/MultiplayerEditorSystemComponent.cpp @@ -420,8 +420,6 @@ namespace Multiplayer void MultiplayerEditorSystemComponent::OnTick(float, AZ::ScriptTimePoint) { - AZ_TracePrintf("MultiplayerEditorSystemComponent", "OnTick Pump"); - m_serverProcessTracePrinter->Pump(); } From 0bd86cf0a4f7bf3a2f5a2bec63f420872a71d558 Mon Sep 17 00:00:00 2001 From: Gene Walters Date: Sat, 20 Nov 2021 14:58:09 -0800 Subject: [PATCH 179/345] small edit: removing pragma optimize offs Signed-off-by: Gene Walters --- Code/Framework/AzCore/AzCore/Debug/Trace.cpp | 2 -- .../AzFramework/Process/ProcessCommunicatorTracePrinter.cpp | 2 -- .../Windows/AzFramework/Process/ProcessCommunicator_Win.cpp | 2 -- Gems/Multiplayer/Code/Source/MultiplayerSystemComponent.cpp | 1 - 4 files changed, 7 deletions(-) diff --git a/Code/Framework/AzCore/AzCore/Debug/Trace.cpp b/Code/Framework/AzCore/AzCore/Debug/Trace.cpp index d8a39deebb..e2f0c6b29c 100644 --- a/Code/Framework/AzCore/AzCore/Debug/Trace.cpp +++ b/Code/Framework/AzCore/AzCore/Debug/Trace.cpp @@ -26,7 +26,6 @@ #include #include #include -#pragma optimize("", off) //< remember to place this after the #includes so that you only optimize the code you want namespace AZ::Debug { @@ -645,4 +644,3 @@ namespace AZ::Debug } } } // namspace AZ::Debug -#pragma optimize("", on) diff --git a/Code/Framework/AzFramework/AzFramework/Process/ProcessCommunicatorTracePrinter.cpp b/Code/Framework/AzFramework/AzFramework/Process/ProcessCommunicatorTracePrinter.cpp index ab9f7c8103..51674bb32c 100644 --- a/Code/Framework/AzFramework/AzFramework/Process/ProcessCommunicatorTracePrinter.cpp +++ b/Code/Framework/AzFramework/AzFramework/Process/ProcessCommunicatorTracePrinter.cpp @@ -8,7 +8,6 @@ #include "ProcessCommunicatorTracePrinter.h" -#pragma optimize("", off) //< remember to place this after the #includes so that you only optimize the code you want ProcessCommunicatorTracePrinter::ProcessCommunicatorTracePrinter(AzFramework::ProcessCommunicator* communicator, const char* window) : m_communicator(communicator), @@ -86,4 +85,3 @@ void ProcessCommunicatorTracePrinter::WriteCurrentString(bool isFromStdErr) bufferToUse.clear(); } } -#pragma optimize("", on) diff --git a/Code/Framework/AzFramework/Platform/Windows/AzFramework/Process/ProcessCommunicator_Win.cpp b/Code/Framework/AzFramework/Platform/Windows/AzFramework/Process/ProcessCommunicator_Win.cpp index 9c7bbfac15..c4629ccf2c 100644 --- a/Code/Framework/AzFramework/Platform/Windows/AzFramework/Process/ProcessCommunicator_Win.cpp +++ b/Code/Framework/AzFramework/Platform/Windows/AzFramework/Process/ProcessCommunicator_Win.cpp @@ -8,7 +8,6 @@ #include -#pragma optimize("", off) //< remember to place this after the #includes so that you only optimize the code you want namespace AzFramework { @@ -275,4 +274,3 @@ namespace AzFramework } } // namespace AzToolsFramework -#pragma optimize("", on) diff --git a/Gems/Multiplayer/Code/Source/MultiplayerSystemComponent.cpp b/Gems/Multiplayer/Code/Source/MultiplayerSystemComponent.cpp index 8eb6d2d777..503a8128b0 100644 --- a/Gems/Multiplayer/Code/Source/MultiplayerSystemComponent.cpp +++ b/Gems/Multiplayer/Code/Source/MultiplayerSystemComponent.cpp @@ -1137,7 +1137,6 @@ namespace Multiplayer AZStd::to_lower(sv_defaultPlayerSpawnAssetLowerCase.begin(), sv_defaultPlayerSpawnAssetLowerCase.end()); PrefabEntityId playerPrefabEntityId(AZ::Name(static_cast(sv_defaultPlayerSpawnAssetLowerCase).c_str())); INetworkEntityManager::EntityList entityList = m_networkEntityManager.CreateEntitiesImmediate(playerPrefabEntityId, NetEntityRole::Authority, AZ::Transform::CreateIdentity(), Multiplayer::AutoActivate::DoNotActivate); - AZ_TracePrintf("MultiplayerSystemComponent", "Server spawned the default player: %s", sv_defaultPlayerSpawnAssetLowerCase.c_str()) for (NetworkEntityHandle subEntity : entityList) { From bb906da58c22c02feeeb5ce6c3ef0f66e001443c Mon Sep 17 00:00:00 2001 From: Roman <69218254+amzn-rhhong@users.noreply.github.com> Date: Sat, 20 Nov 2021 14:59:36 -0800 Subject: [PATCH 180/345] when follow up camera option is on, then load another character, it should zoom to this character. (#5758) Signed-off-by: rhhong --- .../Code/Tools/EMStudio/AnimViewportWidget.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Gems/AtomLyIntegration/EMotionFXAtom/Code/Tools/EMStudio/AnimViewportWidget.cpp b/Gems/AtomLyIntegration/EMotionFXAtom/Code/Tools/EMStudio/AnimViewportWidget.cpp index 86529d16ec..43d8483a6b 100644 --- a/Gems/AtomLyIntegration/EMotionFXAtom/Code/Tools/EMStudio/AnimViewportWidget.cpp +++ b/Gems/AtomLyIntegration/EMotionFXAtom/Code/Tools/EMStudio/AnimViewportWidget.cpp @@ -55,13 +55,13 @@ namespace EMStudio void AnimViewportWidget::Reinit(bool resetCamera) { + m_renderer->Reinit(); + m_renderer->UpdateActorRenderFlag(m_renderFlags); + if (resetCamera) { ResetCamera(); } - - m_renderer->Reinit(); - m_renderer->UpdateActorRenderFlag(m_renderFlags); } EMotionFX::ActorRenderFlagBitset AnimViewportWidget::GetRenderFlags() const From 53ba07d898252e057678b2294ebd7eef80e719c4 Mon Sep 17 00:00:00 2001 From: Michael Pollind Date: Sun, 21 Nov 2021 00:19:46 -0800 Subject: [PATCH 181/345] bugfix: prevent Anchor buttons from overlapping when shrinking layout (#5552) Signed-off-by: Michael Pollind --- Gems/LyShine/Code/Editor/AnchorPresetsWidget.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Gems/LyShine/Code/Editor/AnchorPresetsWidget.cpp b/Gems/LyShine/Code/Editor/AnchorPresetsWidget.cpp index ca3701743e..bc6d73984a 100644 --- a/Gems/LyShine/Code/Editor/AnchorPresetsWidget.cpp +++ b/Gems/LyShine/Code/Editor/AnchorPresetsWidget.cpp @@ -18,7 +18,7 @@ #define UICANVASEDITOR_ANCHOR_ICON_PATH_SELECTED(presetIndex) (QString(":/Icons/AnchorIcon%1Selected.tif").arg(presetIndex, 2, 10, QChar('0'))) #define UICANVASEDITOR_ANCHOR_WIDGET_FIXED_SIZE (106) -#define UICANVASEDITOR_ANCHOR_BUTTON_AND_ICON_FIXED_SIZE (20) +#define UICANVASEDITOR_ANCHOR_BUTTON_AND_ICON_FIXED_SIZE (15) AnchorPresetsWidget::AnchorPresetsWidget(int defaultPresetIndex, PresetChanger presetChanger, @@ -27,8 +27,6 @@ AnchorPresetsWidget::AnchorPresetsWidget(int defaultPresetIndex, , m_presetIndex(defaultPresetIndex) , m_buttons(AnchorPresets::PresetIndexCount, nullptr) { - setFixedSize(UICANVASEDITOR_ANCHOR_WIDGET_FIXED_SIZE, UICANVASEDITOR_ANCHOR_WIDGET_FIXED_SIZE); - // The layout. QGridLayout* grid = new QGridLayout(this); grid->setContentsMargins(0, 0, 0, 0); @@ -38,6 +36,7 @@ AnchorPresetsWidget::AnchorPresetsWidget(int defaultPresetIndex, { for (int presetIndex = 0; presetIndex < AnchorPresets::PresetIndexCount; ++presetIndex) { + QLayout* boxLayout = new QVBoxLayout(); PresetButton* button = new PresetButton(UICANVASEDITOR_ANCHOR_ICON_PATH_DEFAULT(presetIndex), UICANVASEDITOR_ANCHOR_ICON_PATH_HOVER(presetIndex), UICANVASEDITOR_ANCHOR_ICON_PATH_SELECTED(presetIndex), @@ -50,8 +49,9 @@ AnchorPresetsWidget::AnchorPresetsWidget(int defaultPresetIndex, presetChanger(presetIndex); }, this); - - grid->addWidget(button, (presetIndex / 4), (presetIndex % 4)); + boxLayout->addWidget(button); + boxLayout->setContentsMargins(4,4,4,4); + grid->addItem(boxLayout, (presetIndex / 4), (presetIndex % 4)); m_buttons[ presetIndex ] = button; } From ce38e805bfe2849295460d6058d09944379ea241 Mon Sep 17 00:00:00 2001 From: Michael Pollind Date: Sun, 21 Nov 2021 08:18:25 -0800 Subject: [PATCH 182/345] chore: change minimum width and change fixed size Signed-off-by: Michael Pollind --- Gems/LyShine/Code/Editor/AnchorPresetsWidget.cpp | 4 ++-- Gems/LyShine/Code/Editor/PropertiesWidget.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gems/LyShine/Code/Editor/AnchorPresetsWidget.cpp b/Gems/LyShine/Code/Editor/AnchorPresetsWidget.cpp index bc6d73984a..84ff2e19a7 100644 --- a/Gems/LyShine/Code/Editor/AnchorPresetsWidget.cpp +++ b/Gems/LyShine/Code/Editor/AnchorPresetsWidget.cpp @@ -18,7 +18,7 @@ #define UICANVASEDITOR_ANCHOR_ICON_PATH_SELECTED(presetIndex) (QString(":/Icons/AnchorIcon%1Selected.tif").arg(presetIndex, 2, 10, QChar('0'))) #define UICANVASEDITOR_ANCHOR_WIDGET_FIXED_SIZE (106) -#define UICANVASEDITOR_ANCHOR_BUTTON_AND_ICON_FIXED_SIZE (15) +#define UICANVASEDITOR_ANCHOR_BUTTON_AND_ICON_FIXED_SIZE (20) AnchorPresetsWidget::AnchorPresetsWidget(int defaultPresetIndex, PresetChanger presetChanger, @@ -50,7 +50,7 @@ AnchorPresetsWidget::AnchorPresetsWidget(int defaultPresetIndex, }, this); boxLayout->addWidget(button); - boxLayout->setContentsMargins(4,4,4,4); + boxLayout->setContentsMargins(2, 2, 2, 2); grid->addItem(boxLayout, (presetIndex / 4), (presetIndex % 4)); m_buttons[ presetIndex ] = button; diff --git a/Gems/LyShine/Code/Editor/PropertiesWidget.cpp b/Gems/LyShine/Code/Editor/PropertiesWidget.cpp index c128fe15b9..e350a367c6 100644 --- a/Gems/LyShine/Code/Editor/PropertiesWidget.cpp +++ b/Gems/LyShine/Code/Editor/PropertiesWidget.cpp @@ -49,7 +49,7 @@ PropertiesWidget::PropertiesWidget(EditorWindow* editorWindow, m_refreshTimer.setSingleShot(true); } - setMinimumWidth(250); + setMinimumWidth(330); ToolsApplicationEvents::Bus::Handler::BusConnect(); } From 5145fceedcc3408f7fb23e225181556055b0935b Mon Sep 17 00:00:00 2001 From: moraaar Date: Mon, 22 Nov 2021 09:57:42 +0000 Subject: [PATCH 183/345] Fix some compilation errors due to warnings of potentially returning unitialized variables. (#5796) Signed-off-by: moraaar --- Gems/EMotionFX/Code/MCore/Source/Algorithms.cpp | 2 +- Gems/LyShine/Code/Source/Draw2d.cpp | 2 +- Gems/LyShine/Code/Source/UiTextComponent.cpp | 2 +- .../View/Widgets/DataTypePalette/DataTypePaletteModel.cpp | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Gems/EMotionFX/Code/MCore/Source/Algorithms.cpp b/Gems/EMotionFX/Code/MCore/Source/Algorithms.cpp index dd82385092..527407aaa8 100644 --- a/Gems/EMotionFX/Code/MCore/Source/Algorithms.cpp +++ b/Gems/EMotionFX/Code/MCore/Source/Algorithms.cpp @@ -293,7 +293,7 @@ namespace MCore // check if the test point is inside the polygon AZ::Vector2 ClosestPointToPoly(const AZ::Vector2* polyPoints, size_t numPoints, const AZ::Vector2& testPoint) { - AZ::Vector2 result; + AZ::Vector2 result = AZ::Vector2::CreateZero(); float closestDist = FLT_MAX; for (size_t i = 0; i < numPoints; ++i) { diff --git a/Gems/LyShine/Code/Source/Draw2d.cpp b/Gems/LyShine/Code/Source/Draw2d.cpp index 3476c530b2..9a97f27592 100644 --- a/Gems/LyShine/Code/Source/Draw2d.cpp +++ b/Gems/LyShine/Code/Source/Draw2d.cpp @@ -497,7 +497,7 @@ void CDraw2d::SetSortKey(int64_t key) AZ::Vector2 CDraw2d::Align(AZ::Vector2 position, AZ::Vector2 size, HAlign horizontalAlignment, VAlign verticalAlignment) { - AZ::Vector2 result; + AZ::Vector2 result = AZ::Vector2::CreateZero(); switch (horizontalAlignment) { case HAlign::Left: diff --git a/Gems/LyShine/Code/Source/UiTextComponent.cpp b/Gems/LyShine/Code/Source/UiTextComponent.cpp index e18a9cefe2..698dcc2b5e 100644 --- a/Gems/LyShine/Code/Source/UiTextComponent.cpp +++ b/Gems/LyShine/Code/Source/UiTextComponent.cpp @@ -4936,7 +4936,7 @@ AZStd::string UiTextComponent::GetLocalizedText([[maybe_unused]] const AZStd::st //////////////////////////////////////////////////////////////////////////////////////////////////// AZ::Vector2 UiTextComponent::CalculateAlignedPositionWithYOffset(const UiTransformInterface::RectPoints& points) { - AZ::Vector2 pos; + AZ::Vector2 pos = AZ::Vector2::CreateZero(); const DrawBatchLines& drawBatchLines = GetDrawBatchLines(); size_t numLinesOfText = drawBatchLines.batchLines.size(); diff --git a/Gems/ScriptCanvas/Code/Editor/View/Widgets/DataTypePalette/DataTypePaletteModel.cpp b/Gems/ScriptCanvas/Code/Editor/View/Widgets/DataTypePalette/DataTypePaletteModel.cpp index 0b2b4f3bcc..490fc1eb94 100644 --- a/Gems/ScriptCanvas/Code/Editor/View/Widgets/DataTypePalette/DataTypePaletteModel.cpp +++ b/Gems/ScriptCanvas/Code/Editor/View/Widgets/DataTypePalette/DataTypePaletteModel.cpp @@ -200,7 +200,7 @@ namespace ScriptCanvasEditor AZ::TypeId DataTypePaletteModel::FindTypeIdForIndex(const QModelIndex& index) const { - AZ::TypeId retVal; + AZ::TypeId retVal = AZ::TypeId::CreateNull(); if (index.row() >= 0 && index.row() < m_variableTypes.size()) { From bcce0678c4adab31431146130eb7d6d0826b64dd Mon Sep 17 00:00:00 2001 From: moraaar Date: Mon, 22 Nov 2021 09:57:51 +0000 Subject: [PATCH 184/345] Fix collider component validation function by checking if the asset is ready (#5795) Signed-off-by: moraaar --- Gems/PhysX/Code/Source/EditorColliderComponent.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Gems/PhysX/Code/Source/EditorColliderComponent.cpp b/Gems/PhysX/Code/Source/EditorColliderComponent.cpp index 262e40cb99..7e1d1c341f 100644 --- a/Gems/PhysX/Code/Source/EditorColliderComponent.cpp +++ b/Gems/PhysX/Code/Source/EditorColliderComponent.cpp @@ -760,7 +760,7 @@ namespace PhysX if (asset == m_shapeConfiguration.m_physicsAsset.m_pxAsset) { m_shapeConfiguration.m_physicsAsset.m_pxAsset = asset; - m_shapeConfiguration.m_physicsAsset.m_configuration.m_asset = m_shapeConfiguration.m_physicsAsset.m_pxAsset; + m_shapeConfiguration.m_physicsAsset.m_configuration.m_asset = asset; UpdateMaterialSlotsFromMeshAsset(); CreateStaticEditorCollider(); @@ -785,7 +785,9 @@ namespace PhysX { const PhysX::EditorRigidBodyComponent* entityRigidbody = m_entity->FindComponent(); - if (m_shapeConfiguration.m_physicsAsset.m_pxAsset && (m_shapeConfiguration.m_shapeType == Physics::ShapeType::PhysicsAsset) && entityRigidbody) + if (entityRigidbody && + m_shapeConfiguration.m_shapeType == Physics::ShapeType::PhysicsAsset && + m_shapeConfiguration.m_physicsAsset.m_pxAsset.IsReady()) { AZStd::vector> shapes; Utils::GetShapesFromAsset(m_shapeConfiguration.m_physicsAsset.m_configuration, m_configuration, m_hasNonUniformScale, From ab1b6d057d44d00c4d20eefcf012981f96f2acb9 Mon Sep 17 00:00:00 2001 From: moraaar Date: Mon, 22 Nov 2021 13:25:29 +0000 Subject: [PATCH 185/345] Fixed unused variable warning in Release configuration in Linux. (#5830) Signed-off-by: moraaar --- .../Linux/AzToolsFramework/API/PythonLoader_Linux.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Code/Framework/AzToolsFramework/Platform/Linux/AzToolsFramework/API/PythonLoader_Linux.cpp b/Code/Framework/AzToolsFramework/Platform/Linux/AzToolsFramework/API/PythonLoader_Linux.cpp index 76fa36a048..351cf69c15 100644 --- a/Code/Framework/AzToolsFramework/Platform/Linux/AzToolsFramework/API/PythonLoader_Linux.cpp +++ b/Code/Framework/AzToolsFramework/Platform/Linux/AzToolsFramework/API/PythonLoader_Linux.cpp @@ -15,10 +15,10 @@ namespace AzToolsFramework::EmbeddedPython PythonLoader::PythonLoader() { constexpr char libPythonName[] = "libpython3.7m.so.1.0"; - if (m_embeddedLibPythonHandle = dlopen(libPythonName, RTLD_NOW | RTLD_GLOBAL); - m_embeddedLibPythonHandle == nullptr) + m_embeddedLibPythonHandle = dlopen(libPythonName, RTLD_NOW | RTLD_GLOBAL); + if (m_embeddedLibPythonHandle == nullptr) { - char* err = dlerror(); + [[maybe_unused]] const char* err = dlerror(); AZ_Error("PythonLoader", false, "Failed to load %s with error: %s\n", libPythonName, err ? err : "Unknown Error"); } } From c2145a63877e0606e0dd534b8fd4da01cdc00256 Mon Sep 17 00:00:00 2001 From: AMZN-Phil Date: Mon, 22 Nov 2021 08:31:12 -0800 Subject: [PATCH 186/345] Use QStringList to avoid false matches against a partial path Signed-off-by: AMZN-Phil --- Code/Tools/ProjectManager/Platform/Mac/ProjectUtils_mac.cpp | 3 ++- .../ProjectManager/Platform/Windows/ProjectUtils_windows.cpp | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Code/Tools/ProjectManager/Platform/Mac/ProjectUtils_mac.cpp b/Code/Tools/ProjectManager/Platform/Mac/ProjectUtils_mac.cpp index 430e8974b7..0c232d44d1 100644 --- a/Code/Tools/ProjectManager/Platform/Mac/ProjectUtils_mac.cpp +++ b/Code/Tools/ProjectManager/Platform/Mac/ProjectUtils_mac.cpp @@ -25,7 +25,8 @@ namespace O3DE::ProjectManager // Add that path for the command line process so that it will be able to locate // a home-brew installed version of CMake QString pathEnv = qEnvironmentVariable("PATH"); - if (!pathEnv.contains("/usr/local/bin")) + QStringList pathEnvList = pathEnv.split(":"); + if (!pathEnvList.contains("/usr/local/bin")) { pathEnv += ":/usr/local/bin"; qputenv("PATH", pathEnv.toStdString().c_str()); diff --git a/Code/Tools/ProjectManager/Platform/Windows/ProjectUtils_windows.cpp b/Code/Tools/ProjectManager/Platform/Windows/ProjectUtils_windows.cpp index 365aac7069..92863b955c 100644 --- a/Code/Tools/ProjectManager/Platform/Windows/ProjectUtils_windows.cpp +++ b/Code/Tools/ProjectManager/Platform/Windows/ProjectUtils_windows.cpp @@ -37,7 +37,8 @@ namespace O3DE::ProjectManager QDir cmakePath(engineInfo.m_path); cmakePath.cd("cmake/runtime/bin"); QString pathEnv = qEnvironmentVariable("Path"); - if (!pathEnv.contains(cmakePath.path())) + QStringList pathEnvList = pathEnv.split(";"); + if (!pathEnvList.contains(cmakePath.path())) { pathEnv += ";" + cmakePath.path(); qputenv("Path", pathEnv.toStdString().c_str()); From ea26ce72892f2c926605150626c0d9574f553734 Mon Sep 17 00:00:00 2001 From: Gene Walters Date: Mon, 22 Nov 2021 08:34:44 -0800 Subject: [PATCH 187/345] Fully spelling out 'Autonomous' and 'Authority' in the test autocomponent based on review feedback Signed-off-by: Gene Walters --- .../NetworkTestPlayerComponent.AutoComponent.xml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/AutomatedTesting/Gem/Code/Source/AutoGen/NetworkTestPlayerComponent.AutoComponent.xml b/AutomatedTesting/Gem/Code/Source/AutoGen/NetworkTestPlayerComponent.AutoComponent.xml index 484f33d020..46d6191835 100644 --- a/AutomatedTesting/Gem/Code/Source/AutoGen/NetworkTestPlayerComponent.AutoComponent.xml +++ b/AutomatedTesting/Gem/Code/Source/AutoGen/NetworkTestPlayerComponent.AutoComponent.xml @@ -13,29 +13,29 @@ - + - + - + - + - + - + - + - + From 5c71a7481d2c58c8e2f4276edd6004bcf81427d3 Mon Sep 17 00:00:00 2001 From: amzn-phist <52085794+amzn-phist@users.noreply.github.com> Date: Mon, 22 Nov 2021 10:53:59 -0600 Subject: [PATCH 188/345] Modify resource limit function to warn (#5807) The function that modifies resource limits will return true always and warn instead of giving an error. Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com> --- .../Platform/Common/UnixLike/Launcher_UnixLike.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/Code/LauncherUnified/Platform/Common/UnixLike/Launcher_UnixLike.cpp b/Code/LauncherUnified/Platform/Common/UnixLike/Launcher_UnixLike.cpp index b873f30c6d..4e121f149c 100644 --- a/Code/LauncherUnified/Platform/Common/UnixLike/Launcher_UnixLike.cpp +++ b/Code/LauncherUnified/Platform/Common/UnixLike/Launcher_UnixLike.cpp @@ -49,18 +49,17 @@ namespace rlimit limit; if (getrlimit(resource, &limit) != 0) { - AZ_Error("Launcher", false, "[ERROR] Failed to get limit for resource %d. Error: %s", resource, strerror(errno)); - return false; + AZ_Warning("Launcher", false, "[WARNING] Unable to get limit for resource %d. Error: %s", resource, strerror(errno)); } if (updateLimit(limit)) { if (setrlimit(resource, &limit) != 0) { - AZ_Error("Launcher", false, "[ERROR] Failed to update resource limit for resource %d. Error: %s", resource, strerror(errno)); - return false; + AZ_Warning("Launcher", false, "[WARNING] Unable to update resource limit for resource %d. Error: %s", resource, strerror(errno)); } } + return true; } } From b3c0200345eb56d7a35b8a75deb12b479b0a839a Mon Sep 17 00:00:00 2001 From: Steve Pham <82231385+spham-amzn@users.noreply.github.com> Date: Mon, 22 Nov 2021 08:58:24 -0800 Subject: [PATCH 189/345] Restore missing variable 'target_filename_ext' needed to determine if RPATH fix is necessary or not (#5824) Signed-off-by: Steve Pham <82231385+spham-amzn@users.noreply.github.com> --- cmake/Platform/Linux/runtime_dependencies_linux.cmake.in | 1 + 1 file changed, 1 insertion(+) diff --git a/cmake/Platform/Linux/runtime_dependencies_linux.cmake.in b/cmake/Platform/Linux/runtime_dependencies_linux.cmake.in index 4ccf123e27..16445ef8d9 100644 --- a/cmake/Platform/Linux/runtime_dependencies_linux.cmake.in +++ b/cmake/Platform/Linux/runtime_dependencies_linux.cmake.in @@ -10,6 +10,7 @@ cmake_policy(SET CMP0012 NEW) # new policy for the if that evaluates a boolean o function(ly_copy source_file target_directory) cmake_path(GET source_file FILENAME target_filename) + cmake_PATH(GET source_file EXTENSION target_filename_ext) cmake_path(APPEND target_file "${target_directory}" "${target_filename}") cmake_path(COMPARE "${source_file}" EQUAL "${target_file}" same_location) if(NOT ${same_location}) From d958502f2c5c2cfa52b11dcf6478a875c14ccb1f Mon Sep 17 00:00:00 2001 From: AMZN-Phil Date: Mon, 22 Nov 2021 09:26:34 -0800 Subject: [PATCH 190/345] Check return value of qputenv Signed-off-by: AMZN-Phil --- Code/Tools/ProjectManager/Platform/Mac/ProjectUtils_mac.cpp | 5 ++++- .../ProjectManager/Platform/Windows/ProjectUtils_windows.cpp | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/Code/Tools/ProjectManager/Platform/Mac/ProjectUtils_mac.cpp b/Code/Tools/ProjectManager/Platform/Mac/ProjectUtils_mac.cpp index 0c232d44d1..07b08924f1 100644 --- a/Code/Tools/ProjectManager/Platform/Mac/ProjectUtils_mac.cpp +++ b/Code/Tools/ProjectManager/Platform/Mac/ProjectUtils_mac.cpp @@ -29,7 +29,10 @@ namespace O3DE::ProjectManager if (!pathEnvList.contains("/usr/local/bin")) { pathEnv += ":/usr/local/bin"; - qputenv("PATH", pathEnv.toStdString().c_str()); + if (!qputenv("PATH", pathEnv.toStdString().c_str())) + { + return AZ::Failure(QObject::tr("Failed to set PATH environment variable")); + } } return AZ::Success(); diff --git a/Code/Tools/ProjectManager/Platform/Windows/ProjectUtils_windows.cpp b/Code/Tools/ProjectManager/Platform/Windows/ProjectUtils_windows.cpp index 92863b955c..b8cfe65b1e 100644 --- a/Code/Tools/ProjectManager/Platform/Windows/ProjectUtils_windows.cpp +++ b/Code/Tools/ProjectManager/Platform/Windows/ProjectUtils_windows.cpp @@ -41,7 +41,10 @@ namespace O3DE::ProjectManager if (!pathEnvList.contains(cmakePath.path())) { pathEnv += ";" + cmakePath.path(); - qputenv("Path", pathEnv.toStdString().c_str()); + if (!qputenv("Path", pathEnv.toStdString().c_str())) + { + return AZ::Failure(QObject::tr("Failed to set Path environment variable")); + } } return AZ::Success(); From bd4e012eeb8793b5580d4cbe5274eeed69322854 Mon Sep 17 00:00:00 2001 From: greerdv Date: Mon, 22 Nov 2021 17:59:43 +0000 Subject: [PATCH 191/345] run clang format Signed-off-by: greerdv --- .../Code/Editor/ColliderComponentMode.cpp | 69 ++++++++++--------- 1 file changed, 36 insertions(+), 33 deletions(-) diff --git a/Gems/PhysX/Code/Editor/ColliderComponentMode.cpp b/Gems/PhysX/Code/Editor/ColliderComponentMode.cpp index 60e63c97d8..eba245eca5 100644 --- a/Gems/PhysX/Code/Editor/ColliderComponentMode.cpp +++ b/Gems/PhysX/Code/Editor/ColliderComponentMode.cpp @@ -7,20 +7,20 @@ */ #include "ColliderComponentMode.h" +#include "ColliderAssetScaleMode.h" +#include "ColliderBoxMode.h" +#include "ColliderCapsuleMode.h" #include "ColliderOffsetMode.h" #include "ColliderRotationMode.h" -#include "ColliderBoxMode.h" #include "ColliderSphereMode.h" -#include "ColliderCapsuleMode.h" -#include "ColliderAssetScaleMode.h" #include #include #include +#include #include #include -#include namespace PhysX { @@ -31,7 +31,7 @@ namespace PhysX const AZ::Crc32 SetOffsetSubModeActionUri = AZ_CRC("com.o3de.action.physx.setoffsetsubmode", 0xc06132e5); const AZ::Crc32 SetRotationSubModeActionUri = AZ_CRC("com.o3de.action.physx.setrotationsubmode", 0xc4225918); const AZ::Crc32 ResetSubModeActionUri = AZ_CRC("com.o3de.action.physx.resetsubmode", 0xb70b120e); - } + } // namespace AZ_CLASS_ALLOCATOR_IMPL(ColliderComponentMode, AZ::SystemAllocator, 0); @@ -66,10 +66,11 @@ namespace PhysX setOffsetModeAction.SetTitle("Set Offset Mode"); setOffsetModeAction.SetTip("Set offset mode"); setOffsetModeAction.SetEntityComponentIdPair(GetEntityComponentIdPair()); - setOffsetModeAction.SetCallback([this]() - { - SetCurrentMode(SubMode::Offset); - }); + setOffsetModeAction.SetCallback( + [this]() + { + SetCurrentMode(SubMode::Offset); + }); AzToolsFramework::ActionOverride setRotationModeAction; setRotationModeAction.SetUri(SetRotationSubModeActionUri); @@ -77,10 +78,11 @@ namespace PhysX setRotationModeAction.SetTitle("Set Rotation Mode"); setRotationModeAction.SetTip("Set rotation mode"); setRotationModeAction.SetEntityComponentIdPair(GetEntityComponentIdPair()); - setRotationModeAction.SetCallback([this]() - { - SetCurrentMode(SubMode::Rotation); - }); + setRotationModeAction.SetCallback( + [this]() + { + SetCurrentMode(SubMode::Rotation); + }); AzToolsFramework::ActionOverride setDimensionsModeAction; setDimensionsModeAction.SetUri(SetDimensionsSubModeActionUri); @@ -88,7 +90,8 @@ namespace PhysX setDimensionsModeAction.SetTitle("Set Resize Mode"); setDimensionsModeAction.SetTip("Set resize mode"); setDimensionsModeAction.SetEntityComponentIdPair(GetEntityComponentIdPair()); - setDimensionsModeAction.SetCallback([this]() + setDimensionsModeAction.SetCallback( + [this]() { SetCurrentMode(SubMode::Dimensions); }); @@ -99,12 +102,13 @@ namespace PhysX resetModeAction.SetTitle("Reset Current Mode"); resetModeAction.SetTip("Reset current mode"); resetModeAction.SetEntityComponentIdPair(GetEntityComponentIdPair()); - resetModeAction.SetCallback([this]() - { - ResetCurrentMode(); - }); + resetModeAction.SetCallback( + [this]() + { + ResetCurrentMode(); + }); - return {setDimensionsModeAction, setOffsetModeAction, setRotationModeAction, resetModeAction }; + return { setDimensionsModeAction, setOffsetModeAction, setRotationModeAction, resetModeAction }; } void ColliderComponentMode::CreateSubModes() @@ -156,8 +160,7 @@ namespace PhysX void ColliderComponentMode::SetCurrentMode(SubMode newMode) { - if (auto subMode = m_subModes.find(newMode); - subMode != m_subModes.end()) + if (auto subMode = m_subModes.find(newMode); subMode != m_subModes.end()) { m_subModes[m_subMode]->Teardown(GetEntityComponentIdPair()); m_subMode = newMode; @@ -211,19 +214,18 @@ namespace PhysX { /// The reason this is in a free function is because ColliderComponentMode /// privately inherits from ToolsApplicationNotificationBus. Trying to invoke - /// the bus inside the class scope causes the compiler to complain it's not accessible - /// to due private inheritence. - /// Using the global namespace operator :: should have fixed that, except there + /// the bus inside the class scope causes the compiler to complain it's not accessible + /// to due private inheritence. + /// Using the global namespace operator :: should have fixed that, except there /// is a bug in the microsoft compiler meaning it doesn't work. So this is a work around. AzToolsFramework::ToolsApplicationNotificationBus::Broadcast( - &AzToolsFramework::ToolsApplicationNotificationBus::Events::InvalidatePropertyDisplay, - AzToolsFramework::Refresh_Values); + &AzToolsFramework::ToolsApplicationNotificationBus::Events::InvalidatePropertyDisplay, AzToolsFramework::Refresh_Values); } void ColliderComponentMode::ResetCurrentMode() { m_subModes[m_subMode]->ResetValues(GetEntityComponentIdPair()); - m_subModes[m_subMode]->Refresh(GetEntityComponentIdPair()); + m_subModes[m_subMode]->Refresh(GetEntityComponentIdPair()); RefreshUI(); } @@ -247,8 +249,8 @@ namespace PhysX void ColliderComponentMode::RemoveSubModeSelectionCluster() { AzToolsFramework::ViewportUi::ViewportUiRequestBus::Event( - AzToolsFramework::ViewportUi::DefaultViewportId, - &AzToolsFramework::ViewportUi::ViewportUiRequestBus::Events::RemoveCluster, m_modeSelectionClusterId); + AzToolsFramework::ViewportUi::DefaultViewportId, &AzToolsFramework::ViewportUi::ViewportUiRequestBus::Events::RemoveCluster, + m_modeSelectionClusterId); } void ColliderComponentMode::CreateSubModeSelectionCluster() @@ -266,7 +268,8 @@ namespace PhysX SetCurrentMode(SubMode::Offset); - const auto onButtonClicked = [this](AzToolsFramework::ViewportUi::ButtonId buttonId) { + const auto onButtonClicked = [this](AzToolsFramework::ViewportUi::ButtonId buttonId) + { if (buttonId == m_buttonIds[static_cast(SubMode::Offset)]) { SetCurrentMode(SubMode::Offset); @@ -284,7 +287,7 @@ namespace PhysX m_modeSelectionHandler = AZ::Event::Handler(onButtonClicked); AzToolsFramework::ViewportUi::ViewportUiRequestBus::Event( AzToolsFramework::ViewportUi::DefaultViewportId, - &AzToolsFramework::ViewportUi::ViewportUiRequestBus::Events::RegisterClusterEventHandler, - m_modeSelectionClusterId, m_modeSelectionHandler); + &AzToolsFramework::ViewportUi::ViewportUiRequestBus::Events::RegisterClusterEventHandler, m_modeSelectionClusterId, + m_modeSelectionHandler); } -} +} // namespace PhysX From ab76254b4355846707664441ce37ca6576c8c4ab Mon Sep 17 00:00:00 2001 From: chiyenteng <82238204+chiyenteng@users.noreply.github.com> Date: Mon, 22 Nov 2021 10:45:18 -0800 Subject: [PATCH 192/345] Make prefab system enabled as default for automated tests (#5670) * Make prefab system enabled as default for automated tests Signed-off-by: chiyenteng <82238204+chiyenteng@users.noreply.github.com> * Modify auto tests after preventing regset saved into disk after editor main window closed Signed-off-by: chiyenteng <82238204+chiyenteng@users.noreply.github.com> * Uncomment xfail Signed-off-by: chiyenteng <82238204+chiyenteng@users.noreply.github.com> * Use --regset for editor tests Signed-off-by: chiyenteng <82238204+chiyenteng@users.noreply.github.com> --- .../Gem/PythonTests/Atom/TestSuite_Main.py | 2 + .../PythonTests/Atom/TestSuite_Main_GPU.py | 6 +- .../Atom/TestSuite_Main_GPU_Optimized.py | 2 + .../Gem/PythonTests/Atom/TestSuite_Sandbox.py | 2 + .../Gem/PythonTests/Blast/TestSuite_Main.py | 14 +- .../ComponentUpdateListProperty_test.py | 3 +- .../hydra_test_utils.py | 9 +- .../PythonTests/Multiplayer/TestSuite_Main.py | 1 - .../Multiplayer/TestSuite_Sandbox.py | 1 - .../Gem/PythonTests/NvCloth/TestSuite_Main.py | 4 +- .../Physics/TestSuite_InDevelopment.py | 66 +++--- .../Gem/PythonTests/Physics/TestSuite_Main.py | 28 +-- .../Physics/TestSuite_Main_Optimized.py | 5 +- .../PythonTests/Physics/TestSuite_Periodic.py | 199 +++++++++--------- .../PythonTests/Physics/TestSuite_Sandbox.py | 4 +- .../PythonTests/Physics/TestSuite_Utils.py | 6 +- .../Gem/PythonTests/Prefab/TestSuite_Main.py | 1 - .../Gem/PythonTests/Terrain/TestSuite_Main.py | 2 + .../PythonTests/WhiteBox/TestSuite_Main.py | 6 +- .../automatedtesting_shared/base.py | 7 +- .../Gem/PythonTests/editor/TestSuite_Main.py | 5 +- .../editor/TestSuite_Main_Optimized.py | 4 + .../PythonTests/editor/TestSuite_Periodic.py | 14 +- .../PythonTests/editor/TestSuite_Sandbox.py | 4 +- .../editor/TestSuite_Sandbox_Optimized.py | 2 + .../largeworlds/dyn_veg/TestSuite_Main.py | 4 +- .../dyn_veg/TestSuite_Main_Optimized.py | 2 + .../largeworlds/dyn_veg/TestSuite_Periodic.py | 82 ++++---- .../dyn_veg/TestSuite_Periodic_Optimized.py | 2 +- .../gradient_signal/TestSuite_Periodic.py | 26 +-- .../TestSuite_Periodic_Optimized.py | 2 + .../landscape_canvas/TestSuite_Main.py | 4 +- .../TestSuite_Main_Optimized.py | 2 + .../landscape_canvas/TestSuite_Periodic.py | 44 ++-- .../scripting/TestSuite_Periodic.py | 69 +++--- .../scripting/TestSuite_Sandbox.py | 2 +- .../test_Editor_NewExistingLevels_Works.py | 2 +- .../Registry/editorpreferences.setreg | 2 +- .../ly_test_tools/o3de/editor_test.py | 14 +- 39 files changed, 352 insertions(+), 302 deletions(-) diff --git a/AutomatedTesting/Gem/PythonTests/Atom/TestSuite_Main.py b/AutomatedTesting/Gem/PythonTests/Atom/TestSuite_Main.py index b4de39ae98..d79e144ae0 100644 --- a/AutomatedTesting/Gem/PythonTests/Atom/TestSuite_Main.py +++ b/AutomatedTesting/Gem/PythonTests/Atom/TestSuite_Main.py @@ -13,6 +13,8 @@ from ly_test_tools.o3de.editor_test import EditorSharedTest, EditorTestSuite @pytest.mark.parametrize("launcher_platform", ['windows_editor']) class TestAutomation(EditorTestSuite): + enable_prefab_system = False + @pytest.mark.test_case_id("C36525657") class AtomEditorComponents_BloomAdded(EditorSharedTest): from Atom.tests import hydra_AtomEditorComponents_BloomAdded as test_module diff --git a/AutomatedTesting/Gem/PythonTests/Atom/TestSuite_Main_GPU.py b/AutomatedTesting/Gem/PythonTests/Atom/TestSuite_Main_GPU.py index f0e92c7e3e..6a220d1bd8 100644 --- a/AutomatedTesting/Gem/PythonTests/Atom/TestSuite_Main_GPU.py +++ b/AutomatedTesting/Gem/PythonTests/Atom/TestSuite_Main_GPU.py @@ -104,6 +104,7 @@ class TestAllComponentsIndepthTests(object): halt_on_unexpected=True, cfg_args=[level], null_renderer=False, + enable_prefab_system=False, ) similarity_threshold = 0.99 @@ -158,6 +159,7 @@ class TestAllComponentsIndepthTests(object): halt_on_unexpected=True, cfg_args=[level], null_renderer=False, + enable_prefab_system=False, ) similarity_threshold = 0.99 @@ -205,6 +207,7 @@ class TestPerformanceBenchmarkSuite(object): halt_on_unexpected=True, cfg_args=[level], null_renderer=False, + enable_prefab_system=False, ) aggregator = BenchmarkDataAggregator(workspace, logger, 'periodic') @@ -242,5 +245,6 @@ class TestMaterialEditor(object): halt_on_unexpected=False, null_renderer=False, cfg_args=[cfg_args], - log_file_name="MaterialEditor.log" + log_file_name="MaterialEditor.log", + enable_prefab_system=False, ) diff --git a/AutomatedTesting/Gem/PythonTests/Atom/TestSuite_Main_GPU_Optimized.py b/AutomatedTesting/Gem/PythonTests/Atom/TestSuite_Main_GPU_Optimized.py index 568768e12e..7f97c132bb 100644 --- a/AutomatedTesting/Gem/PythonTests/Atom/TestSuite_Main_GPU_Optimized.py +++ b/AutomatedTesting/Gem/PythonTests/Atom/TestSuite_Main_GPU_Optimized.py @@ -23,6 +23,8 @@ class TestAutomation(EditorTestSuite): # Remove -autotest_mode from global_extra_cmdline_args since we need rendering for these tests. global_extra_cmdline_args = ["-BatchMode"] # Default is ["-BatchMode", "-autotest_mode"] + enable_prefab_system = False + @pytest.mark.test_case_id("C34603773") class AtomGPU_BasicLevelSetup_SetsUpLevel(EditorSharedTest): use_null_renderer = False # Default is True diff --git a/AutomatedTesting/Gem/PythonTests/Atom/TestSuite_Sandbox.py b/AutomatedTesting/Gem/PythonTests/Atom/TestSuite_Sandbox.py index 9ceb3c951f..292bb9c19c 100644 --- a/AutomatedTesting/Gem/PythonTests/Atom/TestSuite_Sandbox.py +++ b/AutomatedTesting/Gem/PythonTests/Atom/TestSuite_Sandbox.py @@ -85,6 +85,7 @@ class TestAtomEditorComponentsMain(object): halt_on_unexpected=True, null_renderer=True, cfg_args=cfg_args, + enable_prefab_system=False, ) @@ -155,5 +156,6 @@ class TestMaterialEditorBasicTests(object): halt_on_unexpected=True, null_renderer=True, log_file_name="MaterialEditor.log", + enable_prefab_system=False, ) diff --git a/AutomatedTesting/Gem/PythonTests/Blast/TestSuite_Main.py b/AutomatedTesting/Gem/PythonTests/Blast/TestSuite_Main.py index dbc4a1a456..a047d09d29 100644 --- a/AutomatedTesting/Gem/PythonTests/Blast/TestSuite_Main.py +++ b/AutomatedTesting/Gem/PythonTests/Blast/TestSuite_Main.py @@ -23,28 +23,28 @@ from base import TestAutomationBase class TestAutomation(TestAutomationBase): def test_ActorSplitsAfterCollision(self, request, workspace, editor, launcher_platform): from .tests import Blast_ActorSplitsAfterCollision as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) def test_ActorSplitsAfterRadialDamage(self, request, workspace, editor, launcher_platform): from .tests import Blast_ActorSplitsAfterRadialDamage as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) def test_ActorSplitsAfterCapsuleDamage(self, request, workspace, editor, launcher_platform): from .tests import Blast_ActorSplitsAfterCapsuleDamage as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) def test_ActorSplitsAfterImpactSpreadDamage(self, request, workspace, editor, launcher_platform): from .tests import Blast_ActorSplitsAfterImpactSpreadDamage as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) def test_ActorSplitsAfterShearDamage(self, request, workspace, editor, launcher_platform): from .tests import Blast_ActorSplitsAfterShearDamage as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) def test_ActorSplitsAfterTriangleDamage(self, request, workspace, editor, launcher_platform): from .tests import Blast_ActorSplitsAfterTriangleDamage as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) def test_ActorSplitsAfterStressDamage(self, request, workspace, editor, launcher_platform): from .tests import Blast_ActorSplitsAfterStressDamage as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) diff --git a/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/ComponentUpdateListProperty_test.py b/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/ComponentUpdateListProperty_test.py index ed677ea185..a8ca721cca 100755 --- a/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/ComponentUpdateListProperty_test.py +++ b/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/ComponentUpdateListProperty_test.py @@ -51,5 +51,6 @@ class TestComponentAssetListAutomation(object): editor, "ComponentUpdateListProperty_test_case.py", expected_lines=expected_lines, - cfg_args=[level] + cfg_args=[level], + enable_prefab_system=False, ) diff --git a/AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/editor_python_test_tools/hydra_test_utils.py b/AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/editor_python_test_tools/hydra_test_utils.py index 510d1b1149..ee36a640f0 100644 --- a/AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/editor_python_test_tools/hydra_test_utils.py +++ b/AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/editor_python_test_tools/hydra_test_utils.py @@ -29,7 +29,7 @@ def teardown_editor(editor): def launch_and_validate_results(request, test_directory, editor, editor_script, expected_lines, unexpected_lines=[], halt_on_unexpected=False, run_python="--runpythontest", auto_test_mode=True, null_renderer=True, cfg_args=[], - timeout=300, log_file_name="Editor.log"): + timeout=300, log_file_name="Editor.log", enable_prefab_system=True): """ Runs the Editor with the specified script, and monitors for expected log lines. :param request: Special fixture providing information of the requesting test function. @@ -45,17 +45,22 @@ def launch_and_validate_results(request, test_directory, editor, editor_script, :param cfg_args: Additional arguments for CFG, such as LevelName. :param timeout: Length of time for test to run. Default is 60. :param log_file_name: Name of the log file created by the editor. Defaults to 'Editor.log' + :param enable_prefab_system: Flag to determine whether to use new prefab system or use deprecated slice system. Defaults to True. """ test_case = os.path.join(test_directory, editor_script) request.addfinalizer(lambda: teardown_editor(editor)) logger.debug("Running automated test: {}".format(editor_script)) editor.args.extend(["--skipWelcomeScreenDialog", "--regset=/Amazon/Settings/EnableSourceControl=false", - "--regset=/Amazon/Preferences/EnablePrefabSystem=false", run_python, test_case, + run_python, test_case, f"--pythontestcase={request.node.name}", "--runpythonargs", " ".join(cfg_args)]) if auto_test_mode: editor.args.extend(["--autotest_mode"]) if null_renderer: editor.args.extend(["-rhi=Null"]) + if enable_prefab_system: + editor.args.extend(["--regset=/Amazon/Preferences/EnablePrefabSystem=true"]) + else: + editor.args.extend(["--regset=/Amazon/Preferences/EnablePrefabSystem=false"]) with editor.start(): diff --git a/AutomatedTesting/Gem/PythonTests/Multiplayer/TestSuite_Main.py b/AutomatedTesting/Gem/PythonTests/Multiplayer/TestSuite_Main.py index df1eb62943..450c760786 100644 --- a/AutomatedTesting/Gem/PythonTests/Multiplayer/TestSuite_Main.py +++ b/AutomatedTesting/Gem/PythonTests/Multiplayer/TestSuite_Main.py @@ -23,7 +23,6 @@ from base import TestAutomationBase class TestAutomation(TestAutomationBase): def _run_prefab_test(self, request, workspace, editor, test_module, batch_mode=True, autotest_mode=True): self._run_test(request, workspace, editor, test_module, - extra_cmdline_args=["--regset=/Amazon/Preferences/EnablePrefabSystem=true"], batch_mode=batch_mode, autotest_mode=autotest_mode) diff --git a/AutomatedTesting/Gem/PythonTests/Multiplayer/TestSuite_Sandbox.py b/AutomatedTesting/Gem/PythonTests/Multiplayer/TestSuite_Sandbox.py index 52ac19b26e..8f50d4d36d 100644 --- a/AutomatedTesting/Gem/PythonTests/Multiplayer/TestSuite_Sandbox.py +++ b/AutomatedTesting/Gem/PythonTests/Multiplayer/TestSuite_Sandbox.py @@ -24,7 +24,6 @@ from base import TestAutomationBase class TestAutomation(TestAutomationBase): def _run_prefab_test(self, request, workspace, editor, test_module, batch_mode=True, autotest_mode=True): self._run_test(request, workspace, editor, test_module, - extra_cmdline_args=["--regset=/Amazon/Preferences/EnablePrefabSystem=true"], batch_mode=batch_mode, autotest_mode=autotest_mode) diff --git a/AutomatedTesting/Gem/PythonTests/NvCloth/TestSuite_Main.py b/AutomatedTesting/Gem/PythonTests/NvCloth/TestSuite_Main.py index 49a776a48c..f35f098b0f 100644 --- a/AutomatedTesting/Gem/PythonTests/NvCloth/TestSuite_Main.py +++ b/AutomatedTesting/Gem/PythonTests/NvCloth/TestSuite_Main.py @@ -25,8 +25,8 @@ class TestAutomation(TestAutomationBase): def test_NvCloth_AddClothSimulationToMesh(self, request, workspace, editor, launcher_platform): from .tests import NvCloth_AddClothSimulationToMesh as test_module - self._run_test(request, workspace, editor, test_module, use_null_renderer = self.use_null_renderer) + self._run_test(request, workspace, editor, test_module, use_null_renderer = self.use_null_renderer, enable_prefab_system=False) def test_NvCloth_AddClothSimulationToActor(self, request, workspace, editor, launcher_platform): from .tests import NvCloth_AddClothSimulationToActor as test_module - self._run_test(request, workspace, editor, test_module, use_null_renderer = self.use_null_renderer) + self._run_test(request, workspace, editor, test_module, use_null_renderer = self.use_null_renderer, enable_prefab_system=False) diff --git a/AutomatedTesting/Gem/PythonTests/Physics/TestSuite_InDevelopment.py b/AutomatedTesting/Gem/PythonTests/Physics/TestSuite_InDevelopment.py index 9e3a9cb4ff..09d8f5635f 100755 --- a/AutomatedTesting/Gem/PythonTests/Physics/TestSuite_InDevelopment.py +++ b/AutomatedTesting/Gem/PythonTests/Physics/TestSuite_InDevelopment.py @@ -26,158 +26,158 @@ class TestAutomation(TestAutomationBase): r"AutomatedTesting\Levels\Physics\Material_LibraryCrudOperationsReflectOnRagdollBones") def test_Material_LibraryCrudOperationsReflectOnRagdollBones(self, request, workspace, editor, launcher_platform): from .tests.material import Material_LibraryCrudOperationsReflectOnRagdollBones as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) def test_Material_RagdollBones(self, request, workspace, editor, launcher_platform): from .tests.material import Material_RagdollBones as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) @fm.file_revert("c15308221_material_componentsinsyncwithlibrary.physmaterial", r"AutomatedTesting\Levels\Physics\Material_ComponentsInSyncWithLibrary") def test_Material_ComponentsInSyncWithLibrary(self, request, workspace, editor, launcher_platform): from .tests.material import Material_ComponentsInSyncWithLibrary as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) # BUG: LY-107723") def test_ScriptCanvas_SetKinematicTargetTransform(self, request, workspace, editor, launcher_platform): from .tests.script_canvas import ScriptCanvas_SetKinematicTargetTransform as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) # Failing, PhysXTerrain @fm.file_revert("c4925579_material_addmodifydeleteonterrain.physmaterial", r"AutomatedTesting\Levels\Physics\Material_LibraryCrudOperationsReflectOnTerrain") def test_Material_LibraryCrudOperationsReflectOnTerrain(self, request, workspace, editor, launcher_platform): from .tests.material import Material_LibraryCrudOperationsReflectOnTerrain as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) # Failing, PhysXTerrain def test_Terrain_TerrainTexturePainterWorks(self, request, workspace, editor, launcher_platform): from .tests.terrain import Terrain_TerrainTexturePainterWorks as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) # Failing, PhysXTerrain def test_Material_CanBeAssignedToTerrain(self, request, workspace, editor, launcher_platform): from .tests.material import Material_CanBeAssignedToTerrain as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) # Failing, PhysXTerrain def test_Material_DefaultLibraryConsistentOnAllFeatures(self, request, workspace, editor, launcher_platform): from .tests.material import Material_DefaultLibraryConsistentOnAllFeatures as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) # Failing, PhysXTerrain @fm.file_revert("all_ones_1.physmaterial", r"AutomatedTesting\Levels\Physics\Material_DefaultMaterialLibraryChangesWork") @fm.file_override("default.physxconfiguration", "Material_DefaultMaterialLibraryChangesWork.physxconfiguration", "AutomatedTesting") def test_Material_DefaultMaterialLibraryChangesWork(self, request, workspace, editor, launcher_platform): from .tests.material import Material_DefaultMaterialLibraryChangesWork as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) def test_Collider_SameCollisionGroupSameLayerCollide(self, request, workspace, editor, launcher_platform): from .tests.collider import Collider_SameCollisionGroupSameLayerCollide as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) def test_Ragdoll_OldRagdollSerializationNoErrors(self, request, workspace, editor, launcher_platform): from .tests.ragdoll import Ragdoll_OldRagdollSerializationNoErrors as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) @fm.file_override("default.physxconfiguration", "ScriptCanvas_OverlapNode.physxconfiguration") def test_ScriptCanvas_OverlapNode(self, request, workspace, editor, launcher_platform): from .tests.script_canvas import ScriptCanvas_OverlapNode as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) def test_Material_StaticFriction(self, request, workspace, editor, launcher_platform): from .tests.material import Material_StaticFriction as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) @fm.file_revert("c4888315_material_addmodifydeleteoncollider.physmaterial", r"AutomatedTesting\Levels\Physics\Material_LibraryCrudOperationsReflectOnCollider") def test_Material_LibraryCrudOperationsReflectOnCollider(self, request, workspace, editor, launcher_platform): from .tests.material import Material_LibraryCrudOperationsReflectOnCollider as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) @fm.file_revert("c15563573_material_addmodifydeleteoncharactercontroller.physmaterial", r"AutomatedTesting\Levels\Physics\Material_LibraryCrudOperationsReflectOnCharacterController") def test_Material_LibraryCrudOperationsReflectOnCharacterController(self, request, workspace, editor, launcher_platform): from .tests.material import Material_LibraryCrudOperationsReflectOnCharacterController as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) @fm.file_revert("c4888315_material_addmodifydeleteoncollider.physmaterial", r"AutomatedTesting\Levels\Physics\Material_LibraryCrudOperationsReflectOnCollider") def test_Material_LibraryCrudOperationsReflectOnCollider(self, request, workspace, editor, launcher_platform): from .tests.material import Material_LibraryCrudOperationsReflectOnCollider as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) @fm.file_revert("c15563573_material_addmodifydeleteoncharactercontroller.physmaterial", r"AutomatedTesting\Levels\Physics\Material_LibraryCrudOperationsReflectOnCharacterController") def test_Material_LibraryCrudOperationsReflectOnCharacterController(self, request, workspace, editor, launcher_platform): from .tests.material import Material_LibraryCrudOperationsReflectOnCharacterController as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) @fm.file_revert("c4044455_material_librarychangesinstantly.physmaterial", r"AutomatedTesting\Levels\Physics\C4044455_Material_LibraryChangesInstantly") def test_Material_LibraryChangesReflectInstantly(self, request, workspace, editor, launcher_platform): from .tests.material import Material_LibraryChangesReflectInstantly as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) @fm.file_revert("Material_LibraryUpdatedAcrossLevels.physmaterial", r"AutomatedTesting\Levels\Physics\Material_LibraryUpdatedAcrossLevels") def test_Material_LibraryUpdatedAcrossLevels(self, request, workspace, editor, launcher_platform): from .tests.material import Material_LibraryUpdatedAcrossLevels as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) def test_RigidBody_LinearDampingAffectsMotion(self, request, workspace, editor, launcher_platform): from .tests.rigid_body import RigidBody_LinearDampingAffectsMotion as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) def test_Terrain_CollisionAgainstRigidBody(self, request, workspace, editor, launcher_platform): from .tests.terrain import Terrain_CollisionAgainstRigidBody as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) def test_ShapeCollider_CylinderShapeCollides(self, request, workspace, editor, launcher_platform): from .tests.collider import ShapeCollider_CylinderShapeCollides as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) def test_Physics_WorldBodyBusWorksOnEditorComponents(self, request, workspace, editor, launcher_platform): from .tests import Physics_WorldBodyBusWorksOnEditorComponents as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) def test_Collider_PxMeshErrorIfNoMesh(self, request, workspace, editor, launcher_platform): from .tests.collider import Collider_PxMeshErrorIfNoMesh as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) def test_ForceRegion_ImpulsesBoxShapedRigidBody(self, request, workspace, editor, launcher_platform): from .tests.force_region import ForceRegion_ImpulsesBoxShapedRigidBody as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) def test_Terrain_SpawnSecondTerrainComponentWarning(self, request, workspace, editor, launcher_platform): from .tests.terrain import Terrain_SpawnSecondTerrainComponentWarning as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) def test_Terrain_AddPhysTerrainComponent(self, request, workspace, editor, launcher_platform): from .tests.terrain import Terrain_AddPhysTerrainComponent as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) def test_Terrain_CanAddMultipleTerrainComponents(self, request, workspace, editor, launcher_platform): from .tests.terrain import Terrain_CanAddMultipleTerrainComponents as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) def test_Terrain_MultipleTerrainComponentsWarning(self, request, workspace, editor, launcher_platform): from .tests.terrain import Terrain_MultipleTerrainComponentsWarning as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) def test_Terrain_MultipleTerrainComponentsWarning(self, request, workspace, editor, launcher_platform): from .tests.terrain import Terrain_MultipleTerrainComponentsWarning as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) def test_ForceRegion_HighValuesDirectionAxesWorkWithNoError(self, request, workspace, editor, launcher_platform): from .tests.force_region import ForceRegion_HighValuesDirectionAxesWorkWithNoError as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) def test_Terrain_MultipleResolutionsValid(self, request, workspace, editor, launcher_platform): from .tests.terrain import Terrain_MultipleResolutionsValid as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) def test_ForceRegion_SmallMagnitudeDeviationOnLargeForces(self, request, workspace, editor, launcher_platform): from .tests.force_region import ForceRegion_SmallMagnitudeDeviationOnLargeForces as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) diff --git a/AutomatedTesting/Gem/PythonTests/Physics/TestSuite_Main.py b/AutomatedTesting/Gem/PythonTests/Physics/TestSuite_Main.py index fb2744deda..07ae5f6ca0 100644 --- a/AutomatedTesting/Gem/PythonTests/Physics/TestSuite_Main.py +++ b/AutomatedTesting/Gem/PythonTests/Physics/TestSuite_Main.py @@ -30,33 +30,33 @@ class TestAutomation(TestAutomationBase): def test_RigidBody_EnablingGravityWorksUsingNotificationsPoC(self, request, workspace, editor, launcher_platform): from .tests.rigid_body import RigidBody_EnablingGravityWorksUsingNotificationsPoC as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) @revert_physics_config def test_ForceRegion_LocalSpaceForceOnRigidBodies(self, request, workspace, editor, launcher_platform): from .tests.force_region import ForceRegion_LocalSpaceForceOnRigidBodies as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) @revert_physics_config @fm.file_override('physxsystemconfiguration.setreg','Material_DynamicFriction.setreg_override', 'AutomatedTesting/Registry', search_subdirs=True) def test_Material_DynamicFriction(self, request, workspace, editor, launcher_platform): from .tests.material import Material_DynamicFriction as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) @revert_physics_config def test_Collider_SameCollisionGroupDiffLayersCollide(self, request, workspace, editor, launcher_platform): from .tests.collider import Collider_SameCollisionGroupDiffLayersCollide as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) @revert_physics_config def test_CharacterController_SwitchLevels(self, request, workspace, editor, launcher_platform): from .tests.character_controller import CharacterController_SwitchLevels as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) def test_Ragdoll_AddPhysxRagdollComponentWorks(self, request, workspace, editor, launcher_platform): from .tests.ragdoll import Ragdoll_AddPhysxRagdollComponentWorks as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) @revert_physics_config def test_ScriptCanvas_MultipleRaycastNode(self, request, workspace, editor, launcher_platform): @@ -64,43 +64,43 @@ class TestAutomation(TestAutomationBase): # Fixme: This test previously relied on unexpected lines log reading with is now not supported. # Now the log reading must be done inside the test, preferably with the Tracer() utility # unexpected_lines = ["Assert"] + test_module.Lines.unexpected - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) @revert_physics_config @fm.file_override('physxsystemconfiguration.setreg','Collider_DiffCollisionGroupDiffCollidingLayersNotCollide.setreg_override', 'AutomatedTesting/Registry', search_subdirs=True) def test_Collider_DiffCollisionGroupDiffCollidingLayersNotCollide(self, request, workspace, editor, launcher_platform): from .tests.collider import Collider_DiffCollisionGroupDiffCollidingLayersNotCollide as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) @revert_physics_config def test_Joints_HingeLeadFollowerCollide(self, request, workspace, editor, launcher_platform): from .tests.joints import Joints_HingeLeadFollowerCollide as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) @revert_physics_config def test_Collider_PxMeshConvexMeshCollides(self, request, workspace, editor, launcher_platform): from .tests.collider import Collider_PxMeshConvexMeshCollides as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) @revert_physics_config def test_ShapeCollider_CylinderShapeCollides(self, request, workspace, editor, launcher_platform): from .tests.shape_collider import ShapeCollider_CylinderShapeCollides as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) @revert_physics_config def test_C15425929_Undo_Redo(self, request, workspace, editor, launcher_platform): from .tests import Physics_UndoRedoWorksOnEntityWithPhysComponents as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) @pytest.mark.GROUP_tick @pytest.mark.xfail(reason="Test still under development.") def test_Tick_InterpolatedRigidBodyMotionIsSmooth(self, request, workspace, editor, launcher_platform): from .tests.tick import Tick_InterpolatedRigidBodyMotionIsSmooth as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) @pytest.mark.GROUP_tick @pytest.mark.xfail(reason="Test still under development.") def test_Tick_CharacterGameplayComponentMotionIsSmooth(self, request, workspace, editor, launcher_platform): from .tests.tick import Tick_CharacterGameplayComponentMotionIsSmooth as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) diff --git a/AutomatedTesting/Gem/PythonTests/Physics/TestSuite_Main_Optimized.py b/AutomatedTesting/Gem/PythonTests/Physics/TestSuite_Main_Optimized.py index 0661c6742b..b25b4340e8 100644 --- a/AutomatedTesting/Gem/PythonTests/Physics/TestSuite_Main_Optimized.py +++ b/AutomatedTesting/Gem/PythonTests/Physics/TestSuite_Main_Optimized.py @@ -59,9 +59,6 @@ class EditorSingleTest_WithFileOverrides(EditorSingleTest): @pytest.mark.parametrize("project", ["AutomatedTesting"]) class TestAutomationWithPrefabSystemEnabled(EditorTestSuite): - global_extra_cmdline_args = ['-BatchMode', '-autotest_mode', - '--regset=/Amazon/Preferences/EnablePrefabSystem=true'] - @staticmethod def get_number_parallel_editors(): return 16 @@ -81,6 +78,8 @@ class TestAutomationWithPrefabSystemEnabled(EditorTestSuite): @pytest.mark.parametrize("project", ["AutomatedTesting"]) class TestAutomation(EditorTestSuite): + enable_prefab_system = False + @staticmethod def get_number_parallel_editors(): return 16 diff --git a/AutomatedTesting/Gem/PythonTests/Physics/TestSuite_Periodic.py b/AutomatedTesting/Gem/PythonTests/Physics/TestSuite_Periodic.py index 55e51dd2f8..6daf852708 100755 --- a/AutomatedTesting/Gem/PythonTests/Physics/TestSuite_Periodic.py +++ b/AutomatedTesting/Gem/PythonTests/Physics/TestSuite_Periodic.py @@ -31,223 +31,223 @@ class TestAutomation(TestAutomationBase): @revert_physics_config def test_Terrain_NoPhysTerrainComponentNoCollision(self, request, workspace, editor, launcher_platform): from .tests.terrain import Terrain_NoPhysTerrainComponentNoCollision as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) @revert_physics_config def test_RigidBody_InitialLinearVelocity(self, request, workspace, editor, launcher_platform): from .tests.rigid_body import RigidBody_InitialLinearVelocity as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) @revert_physics_config def test_RigidBody_StartGravityEnabledWorks(self, request, workspace, editor, launcher_platform): from .tests.rigid_body import RigidBody_StartGravityEnabledWorks as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) @revert_physics_config def test_RigidBody_KinematicModeWorks(self, request, workspace, editor, launcher_platform): from .tests.rigid_body import RigidBody_KinematicModeWorks as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) @revert_physics_config def test_ForceRegion_LinearDampingForceOnRigidBodies(self, request, workspace, editor, launcher_platform): from .tests.force_region import ForceRegion_LinearDampingForceOnRigidBodies as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) @revert_physics_config def test_ForceRegion_SimpleDragForceOnRigidBodies(self, request, workspace, editor, launcher_platform): from .tests.force_region import ForceRegion_SimpleDragForceOnRigidBodies as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) @revert_physics_config def test_ForceRegion_CapsuleShapedForce(self, request, workspace, editor, launcher_platform): from .tests.force_region import ForceRegion_CapsuleShapedForce as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) @revert_physics_config def test_ForceRegion_ImpulsesCapsuleShapedRigidBody(self, request, workspace, editor, launcher_platform): from .tests.force_region import ForceRegion_ImpulsesCapsuleShapedRigidBody as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) @revert_physics_config def test_RigidBody_MomentOfInertiaManualSetting(self, request, workspace, editor, launcher_platform): from .tests.rigid_body import RigidBody_MomentOfInertiaManualSetting as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) @revert_physics_config def test_RigidBody_COM_ManualSettingWorks(self, request, workspace, editor, launcher_platform): from .tests.rigid_body import RigidBody_COM_ManualSettingWorks as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) @revert_physics_config def test_RigidBody_AddRigidBodyComponent(self, request, workspace, editor, launcher_platform): from .tests.rigid_body import RigidBody_AddRigidBodyComponent as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) @revert_physics_config def test_ForceRegion_SplineForceOnRigidBodies(self, request, workspace, editor, launcher_platform): from .tests.force_region import ForceRegion_SplineForceOnRigidBodies as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) @revert_physics_config @fm.file_override('physxsystemconfiguration.setreg','Material_RestitutionCombine.setreg_override', 'AutomatedTesting/Registry', search_subdirs=True) def test_Material_RestitutionCombine(self, request, workspace, editor, launcher_platform): from .tests.material import Material_RestitutionCombine as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) @revert_physics_config @fm.file_override('physxsystemconfiguration.setreg','Material_FrictionCombine.setreg_override', 'AutomatedTesting/Registry', search_subdirs=True) def test_Material_FrictionCombine(self, request, workspace, editor, launcher_platform): from .tests.material import Material_FrictionCombine as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) @revert_physics_config def test_Collider_ColliderPositionOffset(self, request, workspace, editor, launcher_platform): from .tests.collider import Collider_ColliderPositionOffset as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) @revert_physics_config def test_RigidBody_AngularDampingAffectsRotation(self, request, workspace, editor, launcher_platform): from .tests.rigid_body import RigidBody_AngularDampingAffectsRotation as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) @revert_physics_config def test_Physics_VerifyColliderRigidBodyMeshAndTerrainWorkTogether(self, request, workspace, editor, launcher_platform): from .tests import Physics_VerifyColliderRigidBodyMeshAndTerrainWorkTogether as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) @revert_physics_config def test_ForceRegion_MultipleForcesInSameComponentCombineForces(self, request, workspace, editor, launcher_platform): from .tests.force_region import ForceRegion_MultipleForcesInSameComponentCombineForces as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) @revert_physics_config def test_ForceRegion_ImpulsesPxMeshShapedRigidBody(self, request, workspace, editor, launcher_platform): from .tests.force_region import ForceRegion_ImpulsesPxMeshShapedRigidBody as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) @revert_physics_config def test_ScriptCanvas_TriggerEvents(self, request, workspace, editor, launcher_platform): from .tests.script_canvas import ScriptCanvas_TriggerEvents as test_module # FIXME: expected_lines = test_module.LogLines.expected_lines - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) @revert_physics_config def test_ForceRegion_ZeroPointForceDoesNothing(self, request, workspace, editor, launcher_platform): from .tests.force_region import ForceRegion_ZeroPointForceDoesNothing as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) @revert_physics_config def test_ForceRegion_ZeroWorldSpaceForceDoesNothing(self, request, workspace, editor, launcher_platform): from .tests.force_region import ForceRegion_ZeroWorldSpaceForceDoesNothing as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) @revert_physics_config def test_ForceRegion_ZeroLinearDampingDoesNothing(self, request, workspace, editor, launcher_platform): from .tests.force_region import ForceRegion_ZeroLinearDampingDoesNothing as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) @revert_physics_config def test_ForceRegion_MovingForceRegionChangesNetForce(self, request, workspace, editor, launcher_platform): from .tests.force_region import ForceRegion_MovingForceRegionChangesNetForce as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) @revert_physics_config def test_ScriptCanvas_CollisionEvents(self, request, workspace, editor, launcher_platform): from .tests.script_canvas import ScriptCanvas_CollisionEvents as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) @revert_physics_config def test_ForceRegion_DirectionHasNoAffectOnTotalForce(self, request, workspace, editor, launcher_platform): from .tests.force_region import ForceRegion_DirectionHasNoAffectOnTotalForce as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) @revert_physics_config def test_RigidBody_StartAsleepWorks(self, request, workspace, editor, launcher_platform): from .tests.rigid_body import RigidBody_StartAsleepWorks as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) @revert_physics_config def test_ForceRegion_SliceFileInstantiates(self, request, workspace, editor, launcher_platform): from .tests.force_region import ForceRegion_SliceFileInstantiates as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) @revert_physics_config def test_ForceRegion_ZeroLocalSpaceForceDoesNothing(self, request, workspace, editor, launcher_platform): from .tests.force_region import ForceRegion_ZeroLocalSpaceForceDoesNothing as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) @revert_physics_config def test_ForceRegion_ZeroSimpleDragForceDoesNothing(self, request, workspace, editor, launcher_platform): from .tests.force_region import ForceRegion_ZeroSimpleDragForceDoesNothing as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) @revert_physics_config def test_RigidBody_COM_ComputingWorks(self, request, workspace, editor, launcher_platform): from .tests.rigid_body import RigidBody_COM_ComputingWorks as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) @revert_physics_config def test_RigidBody_MassDifferentValuesWorks(self, request, workspace, editor, launcher_platform): from .tests.rigid_body import RigidBody_MassDifferentValuesWorks as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) @revert_physics_config @fm.file_override('physxsystemconfiguration.setreg','Material_RestitutionCombinePriorityOrder.setreg_override', 'AutomatedTesting/Registry', search_subdirs=True) def test_Material_RestitutionCombinePriorityOrder(self, request, workspace, editor, launcher_platform): from .tests.material import Material_RestitutionCombinePriorityOrder as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) @revert_physics_config def test_ForceRegion_SplineRegionWithModifiedTransform(self, request, workspace, editor, launcher_platform): from .tests.force_region import ForceRegion_SplineRegionWithModifiedTransform as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) @revert_physics_config def test_ScriptCanvas_ShapeCast(self, request, workspace, editor, launcher_platform): from .tests.script_canvas import ScriptCanvas_ShapeCast as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) @revert_physics_config def test_RigidBody_InitialAngularVelocity(self, request, workspace, editor, launcher_platform): from .tests.rigid_body import RigidBody_InitialAngularVelocity as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) @revert_physics_config def test_ForceRegion_ZeroSplineForceDoesNothing(self, request, workspace, editor, launcher_platform): from .tests.force_region import ForceRegion_ZeroSplineForceDoesNothing as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) @revert_physics_config def test_Physics_DynamicSliceWithPhysNotSpawnsStaticSlice(self, request, workspace, editor, launcher_platform): from .tests import Physics_DynamicSliceWithPhysNotSpawnsStaticSlice as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) @revert_physics_config def test_ForceRegion_PositionOffset(self, request, workspace, editor, launcher_platform): from .tests.force_region import ForceRegion_PositionOffset as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) @revert_physics_config @fm.file_override('physxsystemconfiguration.setreg','Material_FrictionCombinePriorityOrder.setreg_override', 'AutomatedTesting/Registry', search_subdirs=True) def test_Material_FrictionCombinePriorityOrder(self, request, workspace, editor, launcher_platform): from .tests.material import Material_FrictionCombinePriorityOrder as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) @pytest.mark.xfail( reason="Something with the CryRenderer disabling is causing this test to fail now.") @revert_physics_config def test_Ragdoll_LevelSwitchDoesNotCrash(self, request, workspace, editor, launcher_platform): from .tests.ragdoll import Ragdoll_LevelSwitchDoesNotCrash as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) @revert_physics_config def test_ForceRegion_MultipleComponentsCombineForces(self, request, workspace, editor, launcher_platform): from .tests.force_region import ForceRegion_MultipleComponentsCombineForces as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) # Marking the test as an expected failure due to sporadic failure on Automated Review: LYN-2580 # The test still runs, but a failure of the test doesn't result in the test run failing @@ -258,102 +258,102 @@ class TestAutomation(TestAutomationBase): 'AutomatedTesting/Registry', search_subdirs=True) def test_Material_PerFaceMaterialGetsCorrectMaterial(self, request, workspace, editor, launcher_platform): from .tests.material import Material_PerFaceMaterialGetsCorrectMaterial as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) @pytest.mark.xfail( reason="This test will sometimes fail as the ball will continue to roll before the timeout is reached.") @revert_physics_config def test_RigidBody_SleepWhenBelowKineticThreshold(self, request, workspace, editor, launcher_platform): from .tests.rigid_body import RigidBody_SleepWhenBelowKineticThreshold as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) @revert_physics_config def test_RigidBody_COM_NotIncludesTriggerShapes(self, request, workspace, editor, launcher_platform): from .tests.rigid_body import RigidBody_COM_NotIncludesTriggerShapes as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) @revert_physics_config def test_Material_NoEffectIfNoColliderShape(self, request, workspace, editor, launcher_platform): from .tests.material import Material_NoEffectIfNoColliderShape as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) @revert_physics_config def test_Collider_TriggerPassThrough(self, request, workspace, editor, launcher_platform): from .tests.collider import Collider_TriggerPassThrough as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) @revert_physics_config def test_RigidBody_SetGravityWorks(self, request, workspace, editor, launcher_platform): from .tests.rigid_body import RigidBody_SetGravityWorks as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) @revert_physics_config @fm.file_override('physxsystemconfiguration.setreg','Material_CharacterController.setreg_override', 'AutomatedTesting/Registry', search_subdirs=True) def test_Material_CharacterController(self, request, workspace, editor, launcher_platform): from .tests.material import Material_CharacterController as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) @revert_physics_config def test_Material_EmptyLibraryUsesDefault(self, request, workspace, editor, launcher_platform): from .tests.material import Material_EmptyLibraryUsesDefault as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) @revert_physics_config def test_ForceRegion_NoQuiverOnHighLinearDampingForce(self, request, workspace, editor, launcher_platform): from .tests.force_region import ForceRegion_NoQuiverOnHighLinearDampingForce as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) @revert_physics_config def test_RigidBody_ComputeInertiaWorks(self, request, workspace, editor, launcher_platform): from .tests.rigid_body import RigidBody_ComputeInertiaWorks as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) @revert_physics_config def test_ScriptCanvas_PostPhysicsUpdate(self, request, workspace, editor, launcher_platform): from .tests.script_canvas import ScriptCanvas_PostPhysicsUpdate as test_module # Fixme: unexpected_lines = ["Assert"] + test_module.Lines.unexpected - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) @revert_physics_config @fm.file_override('physxsystemconfiguration.setreg','Collider_NoneCollisionGroupSameLayerNotCollide.setreg_override', 'AutomatedTesting/Registry', search_subdirs=True) def test_Collider_NoneCollisionGroupSameLayerNotCollide(self, request, workspace, editor, launcher_platform): from .tests.collider import Collider_NoneCollisionGroupSameLayerNotCollide as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) @revert_physics_config @fm.file_override('physxsystemconfiguration.setreg','Collider_SameCollisionGroupSameCustomLayerCollide.setreg_override', 'AutomatedTesting/Registry', search_subdirs=True) def test_Collider_SameCollisionGroupSameCustomLayerCollide(self, request, workspace, editor, launcher_platform): from .tests.collider import Collider_SameCollisionGroupSameCustomLayerCollide as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) @revert_physics_config @fm.file_override('physxdefaultsceneconfiguration.setreg','ScriptCanvas_PostUpdateEvent.setreg_override', 'AutomatedTesting/Registry', search_subdirs=True) def test_ScriptCanvas_PostUpdateEvent(self, request, workspace, editor, launcher_platform): from .tests.script_canvas import ScriptCanvas_PostUpdateEvent as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) @revert_physics_config @fm.file_override('physxsystemconfiguration.setreg','Material_Restitution.setreg_override', 'AutomatedTesting/Registry', search_subdirs=True) def test_Material_Restitution(self, request, workspace, editor, launcher_platform): from .tests.material import Material_Restitution as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) @revert_physics_config @fm.file_override('physxdefaultsceneconfiguration.setreg', 'ScriptCanvas_PreUpdateEvent.setreg_override', 'AutomatedTesting/Registry', search_subdirs=True) def test_ScriptCanvas_PreUpdateEvent(self, request, workspace, editor, launcher_platform): from .tests.script_canvas import ScriptCanvas_PreUpdateEvent as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) @revert_physics_config def test_ForceRegion_PxMeshShapedForce(self, request, workspace, editor, launcher_platform): from .tests.force_region import ForceRegion_PxMeshShapedForce as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) # Marking the Test as expected to fail using the xfail decorator due to sporadic failure on Automated Review: SPEC-3146 # The test still runs, but a failure of the test doesn't result in the test run failing @@ -361,176 +361,173 @@ class TestAutomation(TestAutomationBase): @revert_physics_config def test_RigidBody_MaxAngularVelocityWorks(self, request, workspace, editor, launcher_platform): from .tests.rigid_body import RigidBody_MaxAngularVelocityWorks as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) @revert_physics_config def test_Joints_HingeSoftLimitsConstrained(self, request, workspace, editor, launcher_platform): from .tests.joints import Joints_HingeSoftLimitsConstrained as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) @revert_physics_config def test_Joints_BallSoftLimitsConstrained(self, request, workspace, editor, launcher_platform): from .tests.joints import Joints_BallSoftLimitsConstrained as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) @revert_physics_config def test_Joints_BallLeadFollowerCollide(self, request, workspace, editor, launcher_platform): from .tests.joints import Joints_BallLeadFollowerCollide as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) @revert_physics_config @fm.file_override('physxsystemconfiguration.setreg','Collider_AddingNewGroupWorks.setreg_override', 'AutomatedTesting/Registry', search_subdirs=True) def test_Collider_AddingNewGroupWorks(self, request, workspace, editor, launcher_platform): from .tests.collider import Collider_AddingNewGroupWorks as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) @revert_physics_config def test_ShapeCollider_InactiveWhenNoShapeComponent(self, request, workspace, editor, launcher_platform): from .tests.shape_collider import ShapeCollider_InactiveWhenNoShapeComponent as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) @revert_physics_config def test_Collider_CheckDefaultShapeSettingIsPxMesh(self, request, workspace, editor, launcher_platform): from .tests.collider import Collider_CheckDefaultShapeSettingIsPxMesh as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) @revert_physics_config def test_ShapeCollider_LargeNumberOfShapeCollidersWontCrashEditor(self, request, workspace, editor, launcher_platform): from .tests.shape_collider import ShapeCollider_LargeNumberOfShapeCollidersWontCrashEditor as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) @revert_physics_config def test_Collider_SphereShapeEditing(self, request, workspace, editor, launcher_platform): from .tests.collider import Collider_SphereShapeEditing as test_module - self._run_test(request, workspace, editor, test_module, - extra_cmdline_args=["--regset=/Amazon/Preferences/EnablePrefabSystem=true"]) + self._run_test(request, workspace, editor, test_module) @revert_physics_config def test_Collider_BoxShapeEditing(self, request, workspace, editor, launcher_platform): from .tests.collider import Collider_BoxShapeEditing as test_module - self._run_test(request, workspace, editor, test_module, - extra_cmdline_args=["--regset=/Amazon/Preferences/EnablePrefabSystem=true"]) + self._run_test(request, workspace, editor, test_module) @revert_physics_config def test_Collider_CapsuleShapeEditing(self, request, workspace, editor, launcher_platform): from .tests.collider import Collider_CapsuleShapeEditing as test_module - self._run_test(request, workspace, editor, test_module, - extra_cmdline_args=["--regset=/Amazon/Preferences/EnablePrefabSystem=true"]) + self._run_test(request, workspace, editor, test_module) def test_ForceRegion_WithNonTriggerColliderWarning(self, request, workspace, editor, launcher_platform): from .tests.force_region import ForceRegion_WithNonTriggerColliderWarning as test_module # Fixme: expected_lines = ["[Warning] (PhysX Force Region) - Please ensure collider component marked as trigger exists in entity"] - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) def test_ForceRegion_WorldSpaceForceOnRigidBodies(self, request, workspace, editor, launcher_platform): from .tests.force_region import ForceRegion_WorldSpaceForceOnRigidBodies as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) def test_ForceRegion_PointForceOnRigidBodies(self, request, workspace, editor, launcher_platform): from .tests.force_region import ForceRegion_PointForceOnRigidBodies as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) def test_ForceRegion_SphereShapedForce(self, request, workspace, editor, launcher_platform): from .tests.force_region import ForceRegion_SphereShapedForce as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) def test_ForceRegion_RotationalOffset(self, request, workspace, editor, launcher_platform): from .tests.force_region import ForceRegion_RotationalOffset as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) def test_Material_LibraryClearingAssignsDefault(self, request, workspace, editor, launcher_platform): from .tests.material import Material_LibraryClearingAssignsDefault as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) def test_Collider_AddColliderComponent(self, request, workspace, editor, launcher_platform): from .tests.collider import Collider_AddColliderComponent as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) @pytest.mark.xfail( reason="This will fail due to this issue ATOM-15487.") def test_Collider_PxMeshAutoAssignedWhenModifyingRenderMeshComponent(self, request, workspace, editor, launcher_platform): from .tests.collider import Collider_PxMeshAutoAssignedWhenModifyingRenderMeshComponent as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) def test_Collider_PxMeshAutoAssignedWhenAddingRenderMeshComponent(self, request, workspace, editor, launcher_platform): from .tests.collider import Collider_PxMeshAutoAssignedWhenAddingRenderMeshComponent as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) def test_Collider_MultipleSurfaceSlots(self, request, workspace, editor, launcher_platform): from .tests.collider import Collider_MultipleSurfaceSlots as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) def test_Collider_PxMeshNotAutoAssignedWhenNoPhysicsFbx(self, request, workspace, editor, launcher_platform): from .tests.collider import Collider_PxMeshNotAutoAssignedWhenNoPhysicsFbx as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) def test_RigidBody_EnablingGravityWorksPoC(self, request, workspace, editor, launcher_platform): from .tests.rigid_body import RigidBody_EnablingGravityWorksPoC as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) @revert_physics_config @fm.file_override('physxsystemconfiguration.setreg','Collider_CollisionGroupsWorkflow.setreg_override', 'AutomatedTesting/Registry', search_subdirs=True) def test_Collider_CollisionGroupsWorkflow(self, request, workspace, editor, launcher_platform): from .tests.collider import Collider_CollisionGroupsWorkflow as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) @revert_physics_config def test_Collider_ColliderRotationOffset(self, request, workspace, editor, launcher_platform): from .tests.collider import Collider_ColliderRotationOffset as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) @revert_physics_config def test_ForceRegion_ParentChildForcesCombineForces(self, request, workspace, editor, launcher_platform): from .tests.force_region import ForceRegion_ParentChildForcesCombineForces as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) @revert_physics_config def test_ShapeCollider_CanBeAddedWitNoWarnings(self, request, workspace, editor, launcher_platform): from .tests.shape_collider import ShapeCollider_CanBeAddedWitNoWarnings as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) @revert_physics_config def test_Physics_UndoRedoWorksOnEntityWithPhysComponents(self, request, workspace, editor, launcher_platform): from .tests import Physics_UndoRedoWorksOnEntityWithPhysComponents as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) def test_Joints_Fixed2BodiesConstrained(self, request, workspace, editor, launcher_platform): from .tests.joints import Joints_Fixed2BodiesConstrained as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) def test_Joints_Hinge2BodiesConstrained(self, request, workspace, editor, launcher_platform): from .tests.joints import Joints_Hinge2BodiesConstrained as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) def test_Joints_Ball2BodiesConstrained(self, request, workspace, editor, launcher_platform): from .tests.joints import Joints_Ball2BodiesConstrained as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) def test_Joints_FixedBreakable(self, request, workspace, editor, launcher_platform): from .tests.joints import Joints_FixedBreakable as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) def test_Joints_HingeBreakable(self, request, workspace, editor, launcher_platform): from .tests.joints import Joints_HingeBreakable as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) def test_Joints_BallBreakable(self, request, workspace, editor, launcher_platform): from .tests.joints import Joints_BallBreakable as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) def test_Joints_HingeNoLimitsConstrained(self, request, workspace, editor, launcher_platform): from .tests.joints import Joints_HingeNoLimitsConstrained as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) def test_Joints_BallNoLimitsConstrained(self, request, workspace, editor, launcher_platform): from .tests.joints import Joints_BallNoLimitsConstrained as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) def test_Joints_GlobalFrameConstrained(self, request, workspace, editor, launcher_platform): from .tests.joints import Joints_GlobalFrameConstrained as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) @revert_physics_config def test_Material_DefaultLibraryUpdatedAcrossLevels(self, request, workspace, editor, launcher_platform): @@ -540,7 +537,7 @@ class TestAutomation(TestAutomationBase): search_subdirs=True) def levels_before(self, request, workspace, editor, launcher_platform): from .tests.material import Material_DefaultLibraryUpdatedAcrossLevels_before as test_module_0 - self._run_test(request, workspace, editor, test_module_0) + self._run_test(request, workspace, editor, test_module_0, enable_prefab_system=False) # File override replaces the previous physxconfiguration file with another where the only difference is the default material library @fm.file_override("physxsystemconfiguration.setreg", @@ -549,7 +546,7 @@ class TestAutomation(TestAutomationBase): search_subdirs=True) def levels_after(self, request, workspace, editor, launcher_platform): from .tests.material import Material_DefaultLibraryUpdatedAcrossLevels_after as test_module_1 - self._run_test(request, workspace, editor, test_module_1) + self._run_test(request, workspace, editor, test_module_1, enable_prefab_system=False) levels_before(self, request, workspace, editor, launcher_platform) levels_after(self, request, workspace, editor, launcher_platform) \ No newline at end of file diff --git a/AutomatedTesting/Gem/PythonTests/Physics/TestSuite_Sandbox.py b/AutomatedTesting/Gem/PythonTests/Physics/TestSuite_Sandbox.py index 81fdc747d5..9b104ccfcf 100644 --- a/AutomatedTesting/Gem/PythonTests/Physics/TestSuite_Sandbox.py +++ b/AutomatedTesting/Gem/PythonTests/Physics/TestSuite_Sandbox.py @@ -32,7 +32,7 @@ class TestAutomation(TestAutomationBase): def test_ScriptCanvas_GetCollisionNameReturnsName(self, request, workspace, editor, launcher_platform): from .tests.script_canvas import ScriptCanvas_GetCollisionNameReturnsName as test_module # Fixme: expected_lines=["Layer Name: Right"] - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) ## Seems to be flaky, need to investigate def test_ScriptCanvas_GetCollisionNameReturnsNothingWhenHasToggledLayer(self, request, workspace, editor, launcher_platform): @@ -42,4 +42,4 @@ class TestAutomation(TestAutomationBase): # Fixme: for group in collision_groups: # Fixme: unexpected_lines.append(f"GroupName: {group}") # Fixme: expected_lines=["GroupName: "] - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) diff --git a/AutomatedTesting/Gem/PythonTests/Physics/TestSuite_Utils.py b/AutomatedTesting/Gem/PythonTests/Physics/TestSuite_Utils.py index 61c2816f50..3e00b684c0 100755 --- a/AutomatedTesting/Gem/PythonTests/Physics/TestSuite_Utils.py +++ b/AutomatedTesting/Gem/PythonTests/Physics/TestSuite_Utils.py @@ -30,11 +30,11 @@ class TestUtils(TestAutomationBase): expected_lines = [] unexpected_lines = ["Assert"] - self._run_test(request, workspace, editor, physmaterial_editor_test_module, expected_lines, unexpected_lines) + self._run_test(request, workspace, editor, physmaterial_editor_test_module, expected_lines, unexpected_lines, enable_prefab_system=False) def test_UtilTest_Tracer_PicksErrorsAndWarnings(self, request, workspace, launcher_platform, editor): from .utils import UtilTest_Tracer_PicksErrorsAndWarnings as testcase_module - self._run_test(request, workspace, editor, testcase_module, [], []) + self._run_test(request, workspace, editor, testcase_module, [], [], enable_prefab_system=False) def test_FileManagement_FindingFiles(self, workspace, launcher_platform): """ @@ -263,4 +263,4 @@ class TestUtils(TestAutomationBase): expected_lines = [] unexpected_lines = ["Assert"] - self._run_test(request, workspace, editor, test_module, expected_lines, unexpected_lines) + self._run_test(request, workspace, editor, test_module, expected_lines, unexpected_lines, enable_prefab_system=False) diff --git a/AutomatedTesting/Gem/PythonTests/Prefab/TestSuite_Main.py b/AutomatedTesting/Gem/PythonTests/Prefab/TestSuite_Main.py index 3c07105417..c1d4836342 100644 --- a/AutomatedTesting/Gem/PythonTests/Prefab/TestSuite_Main.py +++ b/AutomatedTesting/Gem/PythonTests/Prefab/TestSuite_Main.py @@ -23,7 +23,6 @@ class TestAutomation(TestAutomationBase): def _run_prefab_test(self, request, workspace, editor, test_module, batch_mode=True, autotest_mode=True): self._run_test(request, workspace, editor, test_module, - extra_cmdline_args=["--regset=/Amazon/Preferences/EnablePrefabSystem=true"], batch_mode=batch_mode, autotest_mode=autotest_mode) diff --git a/AutomatedTesting/Gem/PythonTests/Terrain/TestSuite_Main.py b/AutomatedTesting/Gem/PythonTests/Terrain/TestSuite_Main.py index c5eec74c08..786651713c 100644 --- a/AutomatedTesting/Gem/PythonTests/Terrain/TestSuite_Main.py +++ b/AutomatedTesting/Gem/PythonTests/Terrain/TestSuite_Main.py @@ -20,6 +20,8 @@ from ly_test_tools.o3de.editor_test import EditorTestSuite, EditorSharedTest @pytest.mark.parametrize("project", ["AutomatedTesting"]) class TestAutomation(EditorTestSuite): + enable_prefab_system = False + class test_AxisAlignedBoxShape_ConfigurationWorks(EditorSharedTest): from .EditorScripts import TerrainPhysicsCollider_ChangesSizeWithAxisAlignedBoxShapeChanges as test_module diff --git a/AutomatedTesting/Gem/PythonTests/WhiteBox/TestSuite_Main.py b/AutomatedTesting/Gem/PythonTests/WhiteBox/TestSuite_Main.py index fa6c81c98a..2fc717e256 100644 --- a/AutomatedTesting/Gem/PythonTests/WhiteBox/TestSuite_Main.py +++ b/AutomatedTesting/Gem/PythonTests/WhiteBox/TestSuite_Main.py @@ -24,12 +24,12 @@ from base import TestAutomationBase class TestAutomation(TestAutomationBase): def test_WhiteBox_AddComponentToEntity(self, request, workspace, editor, launcher_platform): from .tests import WhiteBox_AddComponentToEntity as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) def test_WhiteBox_SetDefaultShape(self, request, workspace, editor, launcher_platform): from .tests import WhiteBox_SetDefaultShape as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) def test_WhiteBox_SetInvisible(self, request, workspace, editor, launcher_platform): from .tests import WhiteBox_SetInvisible as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) diff --git a/AutomatedTesting/Gem/PythonTests/automatedtesting_shared/base.py b/AutomatedTesting/Gem/PythonTests/automatedtesting_shared/base.py index 41d693cb60..4543888a7c 100755 --- a/AutomatedTesting/Gem/PythonTests/automatedtesting_shared/base.py +++ b/AutomatedTesting/Gem/PythonTests/automatedtesting_shared/base.py @@ -52,7 +52,7 @@ class TestAutomationBase: cls._kill_ly_processes() def _run_test(self, request, workspace, editor, testcase_module, extra_cmdline_args=[], batch_mode=True, - autotest_mode=True, use_null_renderer=True): + autotest_mode=True, use_null_renderer=True, enable_prefab_system=True): test_starttime = time.time() self.logger = logging.getLogger(__name__) errors = [] @@ -97,6 +97,11 @@ class TestAutomationBase: pycmd += ["-BatchMode"] if autotest_mode: pycmd += ["-autotest_mode"] + if enable_prefab_system: + pycmd += ["--regset=/Amazon/Preferences/EnablePrefabSystem=true"] + else: + pycmd += ["--regset=/Amazon/Preferences/EnablePrefabSystem=false"] + pycmd += extra_cmdline_args editor.args.extend(pycmd) # args are added to the WinLauncher start command editor.start(backupFiles = False, launch_ap = False) diff --git a/AutomatedTesting/Gem/PythonTests/editor/TestSuite_Main.py b/AutomatedTesting/Gem/PythonTests/editor/TestSuite_Main.py index 49069569eb..c9e91687e0 100644 --- a/AutomatedTesting/Gem/PythonTests/editor/TestSuite_Main.py +++ b/AutomatedTesting/Gem/PythonTests/editor/TestSuite_Main.py @@ -33,14 +33,14 @@ class TestAutomation(TestAutomationBase): def test_BasicEditorWorkflows_LevelEntityComponentCRUD(self, request, workspace, editor, launcher_platform, remove_test_level): from .EditorScripts import BasicEditorWorkflows_LevelEntityComponentCRUD as test_module - self._run_test(request, workspace, editor, test_module, batch_mode=False, autotest_mode=False) + self._run_test(request, workspace, editor, test_module, batch_mode=False, autotest_mode=False, enable_prefab_system=False) @pytest.mark.REQUIRES_gpu def test_BasicEditorWorkflows_GPU_LevelEntityComponentCRUD(self, request, workspace, editor, launcher_platform, remove_test_level): from .EditorScripts import BasicEditorWorkflows_LevelEntityComponentCRUD as test_module self._run_test(request, workspace, editor, test_module, batch_mode=False, autotest_mode=False, - use_null_renderer=False) + use_null_renderer=False, enable_prefab_system=False) def test_EntityOutlienr_EntityOrdering(self, request, workspace, editor, launcher_platform): from .EditorScripts import EntityOutliner_EntityOrdering as test_module @@ -51,5 +51,4 @@ class TestAutomation(TestAutomationBase): test_module, batch_mode=False, autotest_mode=True, - extra_cmdline_args=["--regset=/Amazon/Preferences/EnablePrefabSystem=true"] ) diff --git a/AutomatedTesting/Gem/PythonTests/editor/TestSuite_Main_Optimized.py b/AutomatedTesting/Gem/PythonTests/editor/TestSuite_Main_Optimized.py index 820e4bd2aa..ccc4ee9737 100644 --- a/AutomatedTesting/Gem/PythonTests/editor/TestSuite_Main_Optimized.py +++ b/AutomatedTesting/Gem/PythonTests/editor/TestSuite_Main_Optimized.py @@ -21,6 +21,8 @@ class TestAutomationNoAutoTestMode(EditorTestSuite): # Disable -autotest_mode and -BatchMode. Tests cannot run in -BatchMode due to UI interactions, and these tests # interact with modal dialogs global_extra_cmdline_args = [] + + enable_prefab_system = False class test_BasicEditorWorkflows_LevelEntityComponentCRUD(EditorSingleTest): # Custom teardown to remove slice asset created during test @@ -56,6 +58,8 @@ class TestAutomationAutoTestMode(EditorTestSuite): # Enable only -autotest_mode for these tests. Tests cannot run in -BatchMode due to UI interactions global_extra_cmdline_args = ["-autotest_mode"] + enable_prefab_system = False + class test_AssetBrowser_TreeNavigation(EditorSharedTest): from .EditorScripts import AssetBrowser_TreeNavigation as test_module diff --git a/AutomatedTesting/Gem/PythonTests/editor/TestSuite_Periodic.py b/AutomatedTesting/Gem/PythonTests/editor/TestSuite_Periodic.py index f131a1c8bc..1bd1d7f987 100644 --- a/AutomatedTesting/Gem/PythonTests/editor/TestSuite_Periodic.py +++ b/AutomatedTesting/Gem/PythonTests/editor/TestSuite_Periodic.py @@ -32,29 +32,29 @@ class TestAutomation(TestAutomationBase): def test_AssetBrowser_TreeNavigation(self, request, workspace, editor, launcher_platform): from .EditorScripts import AssetBrowser_TreeNavigation as test_module - self._run_test(request, workspace, editor, test_module, batch_mode=False) + self._run_test(request, workspace, editor, test_module, batch_mode=False, enable_prefab_system=False) def test_AssetBrowser_SearchFiltering(self, request, workspace, editor, launcher_platform): from .EditorScripts import AssetBrowser_SearchFiltering as test_module - self._run_test(request, workspace, editor, test_module, batch_mode=False) + self._run_test(request, workspace, editor, test_module, batch_mode=False, enable_prefab_system=False) def test_AssetPicker_UI_UX(self, request, workspace, editor, launcher_platform): from .EditorScripts import AssetPicker_UI_UX as test_module - self._run_test(request, workspace, editor, test_module, autotest_mode=False, batch_mode=False) + self._run_test(request, workspace, editor, test_module, autotest_mode=False, batch_mode=False, enable_prefab_system=False) def test_ComponentCRUD_Add_Delete_Components(self, request, workspace, editor, launcher_platform): from .EditorScripts import ComponentCRUD_Add_Delete_Components as test_module - self._run_test(request, workspace, editor, test_module, batch_mode=False) + self._run_test(request, workspace, editor, test_module, batch_mode=False, enable_prefab_system=False) def test_InputBindings_Add_Remove_Input_Events(self, request, workspace, editor, launcher_platform): from .EditorScripts import InputBindings_Add_Remove_Input_Events as test_module - self._run_test(request, workspace, editor, test_module, batch_mode=False, autotest_mode=False) + self._run_test(request, workspace, editor, test_module, batch_mode=False, autotest_mode=False, enable_prefab_system=False) def test_Menus_ViewMenuOptions_Work(self, request, workspace, editor, launcher_platform): from .EditorScripts import Menus_ViewMenuOptions as test_module - self._run_test(request, workspace, editor, test_module, batch_mode=False) + self._run_test(request, workspace, editor, test_module, batch_mode=False, enable_prefab_system=False) @pytest.mark.skip(reason="Times out due to dialogs failing to dismiss: LYN-4208") def test_Menus_FileMenuOptions_Work(self, request, workspace, editor, launcher_platform): from .EditorScripts import Menus_FileMenuOptions as test_module - self._run_test(request, workspace, editor, test_module, batch_mode=False) + self._run_test(request, workspace, editor, test_module, batch_mode=False, enable_prefab_system=False) diff --git a/AutomatedTesting/Gem/PythonTests/editor/TestSuite_Sandbox.py b/AutomatedTesting/Gem/PythonTests/editor/TestSuite_Sandbox.py index 98a6620d9c..8a56a2dbfd 100644 --- a/AutomatedTesting/Gem/PythonTests/editor/TestSuite_Sandbox.py +++ b/AutomatedTesting/Gem/PythonTests/editor/TestSuite_Sandbox.py @@ -20,8 +20,8 @@ class TestAutomation(TestAutomationBase): def test_Menus_EditMenuOptions_Work(self, request, workspace, editor, launcher_platform): from .EditorScripts import Menus_EditMenuOptions as test_module - self._run_test(request, workspace, editor, test_module, batch_mode=False) + self._run_test(request, workspace, editor, test_module, batch_mode=False, enable_prefab_system=False) def test_Docking_BasicDockedTools(self, request, workspace, editor, launcher_platform): from .EditorScripts import Docking_BasicDockedTools as test_module - self._run_test(request, workspace, editor, test_module, batch_mode=False) + self._run_test(request, workspace, editor, test_module, batch_mode=False, enable_prefab_system=False) diff --git a/AutomatedTesting/Gem/PythonTests/editor/TestSuite_Sandbox_Optimized.py b/AutomatedTesting/Gem/PythonTests/editor/TestSuite_Sandbox_Optimized.py index 4a472095ae..ce0d5e43e9 100644 --- a/AutomatedTesting/Gem/PythonTests/editor/TestSuite_Sandbox_Optimized.py +++ b/AutomatedTesting/Gem/PythonTests/editor/TestSuite_Sandbox_Optimized.py @@ -19,6 +19,8 @@ class TestAutomationAutoTestMode(EditorTestSuite): # Enable only -autotest_mode for these tests. Tests cannot run in -BatchMode due to UI interactions global_extra_cmdline_args = ["-autotest_mode"] + enable_prefab_system = False + class test_Docking_BasicDockedTools(EditorSharedTest): from .EditorScripts import Docking_BasicDockedTools as test_module diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/TestSuite_Main.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/TestSuite_Main.py index 4c02c887ef..06c9c5f615 100644 --- a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/TestSuite_Main.py +++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/TestSuite_Main.py @@ -20,8 +20,8 @@ class TestAutomation(TestAutomationBase): def test_DynamicSliceInstanceSpawner_DynamicSliceSpawnerWorks(self, request, workspace, editor, launcher_platform): from .EditorScripts import DynamicSliceInstanceSpawner_DynamicSliceSpawnerWorks as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) def test_EmptyInstanceSpawner_EmptySpawnerWorks(self, request, workspace, editor, launcher_platform): from .EditorScripts import EmptyInstanceSpawner_EmptySpawnerWorks as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/TestSuite_Main_Optimized.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/TestSuite_Main_Optimized.py index ded2dda4e9..ed23af51ad 100644 --- a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/TestSuite_Main_Optimized.py +++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/TestSuite_Main_Optimized.py @@ -18,6 +18,8 @@ from ly_test_tools.o3de.editor_test import EditorSingleTest, EditorSharedTest, E @pytest.mark.parametrize("project", ["AutomatedTesting"]) class TestAutomation(EditorTestSuite): + enable_prefab_system = False + class test_DynamicSliceInstanceSpawner_DynamicSliceSpawnerWorks(EditorParallelTest): from .EditorScripts import DynamicSliceInstanceSpawner_DynamicSliceSpawnerWorks as test_module diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/TestSuite_Periodic.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/TestSuite_Periodic.py index 2780c0f471..d0d570950b 100644 --- a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/TestSuite_Periodic.py +++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/TestSuite_Periodic.py @@ -52,158 +52,158 @@ class TestAutomation(TestAutomationBase): def test_AltitudeFilter_ComponentAndOverrides_InstancesPlantAtSpecifiedAltitude(self, request, workspace, editor, launcher_platform): from .EditorScripts import AltitudeFilter_ComponentAndOverrides_InstancesPlantAtSpecifiedAltitude as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) def test_AltitudeFilter_ShapeSample_InstancesPlantAtSpecifiedAltitude(self, request, workspace, editor, launcher_platform): from .EditorScripts import AltitudeFilter_ShapeSample_InstancesPlantAtSpecifiedAltitude as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) def test_AltitudeFilter_FilterStageToggle(self, request, workspace, editor, launcher_platform): from .EditorScripts import AltitudeFilter_FilterStageToggle as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) def test_SpawnerSlices_SliceCreationAndVisibilityToggleWorks(self, request, workspace, editor, remove_test_slice, launcher_platform): from .EditorScripts import SpawnerSlices_SliceCreationAndVisibilityToggleWorks as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) def test_AssetListCombiner_CombinedDescriptorsExpressInConfiguredArea(self, request, workspace, editor, launcher_platform): from .EditorScripts import AssetListCombiner_CombinedDescriptorsExpressInConfiguredArea as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) def test_AssetWeightSelector_InstancesExpressBasedOnWeight(self, request, workspace, editor, launcher_platform): from .EditorScripts import AssetWeightSelector_InstancesExpressBasedOnWeight as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) @pytest.mark.xfail(reason="https://github.com/o3de/o3de/issues/4155") def test_DistanceBetweenFilter_InstancesPlantAtSpecifiedRadius(self, request, workspace, editor, launcher_platform): from .EditorScripts import DistanceBetweenFilter_InstancesPlantAtSpecifiedRadius as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) @pytest.mark.xfail(reason="https://github.com/o3de/o3de/issues/4155") def test_DistanceBetweenFilterOverrides_InstancesPlantAtSpecifiedRadius(self, request, workspace, editor, launcher_platform): from .EditorScripts import DistanceBetweenFilterOverrides_InstancesPlantAtSpecifiedRadius as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) def test_SurfaceDataRefreshes_RemainsStable(self, request, workspace, editor, launcher_platform): from .EditorScripts import SurfaceDataRefreshes_RemainsStable as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) def test_VegetationInstances_DespawnWhenOutOfRange(self, request, workspace, editor, launcher_platform): from .EditorScripts import VegetationInstances_DespawnWhenOutOfRange as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) def test_InstanceSpawnerPriority_LayerAndSubPriority_HigherValuesPlantOverLower(self, request, workspace, editor, launcher_platform): from .EditorScripts import InstanceSpawnerPriority_LayerAndSubPriority as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) def test_LayerBlocker_InstancesBlockedInConfiguredArea(self, request, workspace, editor, launcher_platform): from .EditorScripts import LayerBlocker_InstancesBlockedInConfiguredArea as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) def test_LayerSpawner_InheritBehaviorFlag(self, request, workspace, editor, launcher_platform): from .EditorScripts import LayerSpawner_InheritBehaviorFlag as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) def test_LayerSpawner_InstancesPlantInAllSupportedShapes(self, request, workspace, editor, launcher_platform): from .EditorScripts import LayerSpawner_InstancesPlantInAllSupportedShapes as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) def test_LayerSpawner_FilterStageToggle(self, request, workspace, editor, launcher_platform): from .EditorScripts import LayerSpawner_FilterStageToggle as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) @pytest.mark.xfail(reason="https://github.com/o3de/o3de/issues/2038") def test_LayerSpawner_InstancesRefreshUsingCorrectViewportCamera(self, request, workspace, editor, launcher_platform): from .EditorScripts import LayerSpawner_InstancesRefreshUsingCorrectViewportCamera as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) def test_MeshBlocker_InstancesBlockedByMesh(self, request, workspace, editor, launcher_platform): from .EditorScripts import MeshBlocker_InstancesBlockedByMesh as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) def test_MeshBlocker_InstancesBlockedByMeshHeightTuning(self, request, workspace, editor, launcher_platform): from .EditorScripts import MeshBlocker_InstancesBlockedByMeshHeightTuning as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) def test_MeshSurfaceTagEmitter_DependentOnMeshComponent(self, request, workspace, editor, launcher_platform): from .EditorScripts import MeshSurfaceTagEmitter_DependentOnMeshComponent as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) def test_MeshSurfaceTagEmitter_SurfaceTagsAddRemoveSuccessfully(self, request, workspace, editor, launcher_platform): from .EditorScripts import MeshSurfaceTagEmitter_SurfaceTagsAddRemoveSuccessfully as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) def test_PhysXColliderSurfaceTagEmitter_E2E_Editor(self, request, workspace, editor, launcher_platform): from .EditorScripts import PhysXColliderSurfaceTagEmitter_E2E_Editor as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) def test_PositionModifier_ComponentAndOverrides_InstancesPlantAtSpecifiedOffsets(self, request, workspace, editor, launcher_platform): from .EditorScripts import PositionModifier_ComponentAndOverrides_InstancesPlantAtSpecifiedOffsets as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) def test_PositionModifier_AutoSnapToSurfaceWorks(self, request, workspace, editor, launcher_platform): from .EditorScripts import PositionModifier_AutoSnapToSurfaceWorks as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) def test_RotationModifier_InstancesRotateWithinRange(self, request, workspace, editor, launcher_platform): from .EditorScripts import RotationModifier_InstancesRotateWithinRange as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) def test_RotationModifierOverrides_InstancesRotateWithinRange(self, request, workspace, editor, launcher_platform): from .EditorScripts import RotationModifierOverrides_InstancesRotateWithinRange as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) def test_ScaleModifier_InstancesProperlyScale(self, request, workspace, editor, launcher_platform): from .EditorScripts import ScaleModifier_InstancesProperlyScale as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) def test_ScaleModifierOverrides_InstancesProperlyScale(self, request, workspace, editor, launcher_platform): from .EditorScripts import ScaleModifierOverrides_InstancesProperlyScale as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) def test_ShapeIntersectionFilter_InstancesPlantInAssignedShape(self, request, workspace, editor, launcher_platform): from .EditorScripts import ShapeIntersectionFilter_InstancesPlantInAssignedShape as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) def test_ShapeIntersectionFilter_FilterStageToggle(self, request, workspace, editor, launcher_platform): from .EditorScripts import ShapeIntersectionFilter_FilterStageToggle as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) def test_SlopeAlignmentModifier_InstanceSurfaceAlignment(self, request, workspace, editor, launcher_platform): from .EditorScripts import SlopeAlignmentModifier_InstanceSurfaceAlignment as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) def test_SlopeAlignmentModifierOverrides_InstanceSurfaceAlignment(self, request, workspace, editor, launcher_platform): from .EditorScripts import SlopeAlignmentModifierOverrides_InstanceSurfaceAlignment as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) def test_SurfaceMaskFilter_BasicSurfaceTagCreation(self, request, workspace, editor, launcher_platform): from .EditorScripts import SurfaceMaskFilter_BasicSurfaceTagCreation as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) def test_SurfaceMaskFilter_ExclusiveSurfaceTags_Function(self, request, workspace, editor, launcher_platform): from .EditorScripts import SurfaceMaskFilter_ExclusionList as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) def test_SurfaceMaskFilter_InclusiveSurfaceTags_Function(self, request, workspace, editor, launcher_platform): from .EditorScripts import SurfaceMaskFilter_InclusionList as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) def test_SurfaceMaskFilterOverrides_MultipleDescriptorOverridesPlantAsExpected(self, request, workspace, editor, launcher_platform): from .EditorScripts import SurfaceMaskFilterOverrides_MultipleDescriptorOverridesPlantAsExpected as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) def test_SystemSettings_SectorPointDensity(self, request, workspace, editor, launcher_platform): from .EditorScripts import SystemSettings_SectorPointDensity as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) def test_SystemSettings_SectorSize(self, request, workspace, editor, launcher_platform): from .EditorScripts import SystemSettings_SectorSize as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) def test_SlopeFilter_ComponentAndOverrides_InstancesPlantOnValidSlopes(self, request, workspace, editor, launcher_platform): from .EditorScripts import SlopeFilter_ComponentAndOverrides_InstancesPlantOnValidSlope as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) @pytest.mark.SUITE_periodic @@ -219,7 +219,7 @@ class TestAutomationE2E(TestAutomationBase): file_system.delete([os.path.join(workspace.paths.engine_root(), project, "Levels", level)], True, True) from .EditorScripts import DynamicSliceInstanceSpawner_Embedded_E2E as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) @pytest.mark.parametrize("launcher_platform", ['windows']) def test_DynamicSliceInstanceSpawner_Embedded_E2E_Launcher(self, workspace, launcher, level, @@ -240,7 +240,7 @@ class TestAutomationE2E(TestAutomationBase): file_system.delete([os.path.join(workspace.paths.engine_root(), project, "Levels", level)], True, True) from .EditorScripts import DynamicSliceInstanceSpawner_External_E2E as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) @pytest.mark.parametrize("launcher_platform", ['windows']) def test_DynamicSliceInstanceSpawner_External_E2E_Launcher(self, workspace, launcher, level, @@ -261,7 +261,7 @@ class TestAutomationE2E(TestAutomationBase): file_system.delete([os.path.join(workspace.paths.engine_root(), project, "Levels", level)], True, True) from .EditorScripts import LayerBlender_E2E_Editor as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) @pytest.mark.parametrize("launcher_platform", ['windows']) @pytest.mark.xfail(reason="https://github.com/o3de/o3de/issues/4170") diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/TestSuite_Periodic_Optimized.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/TestSuite_Periodic_Optimized.py index 8d298e970b..f87d6567ef 100644 --- a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/TestSuite_Periodic_Optimized.py +++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/TestSuite_Periodic_Optimized.py @@ -17,7 +17,7 @@ from ly_test_tools.o3de.editor_test import EditorSingleTest, EditorSharedTest, E @pytest.mark.parametrize("project", ["AutomatedTesting"]) class TestAutomation(EditorTestSuite): - global_extra_cmdline_args = ["-BatchMode", "-autotest_mode", "--regset=/Amazon/Preferences/EnablePrefabSystem=true"] + global_extra_cmdline_args = ["-BatchMode", "-autotest_mode"] class test_DynVegUtils_TempPrefabCreationWorks(EditorSharedTest): from .EditorScripts import DynVegUtils_TempPrefabCreationWorks as test_module diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/gradient_signal/TestSuite_Periodic.py b/AutomatedTesting/Gem/PythonTests/largeworlds/gradient_signal/TestSuite_Periodic.py index 21eecf642c..3ad27eb973 100644 --- a/AutomatedTesting/Gem/PythonTests/largeworlds/gradient_signal/TestSuite_Periodic.py +++ b/AutomatedTesting/Gem/PythonTests/largeworlds/gradient_signal/TestSuite_Periodic.py @@ -20,52 +20,52 @@ class TestAutomation(TestAutomationBase): def test_GradientGenerators_Incompatibilities(self, request, workspace, editor, launcher_platform): from .EditorScripts import GradientGenerators_Incompatibilities as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) def test_GradientModifiers_Incompatibilities(self, request, workspace, editor, launcher_platform): from .EditorScripts import GradientModifiers_Incompatibilities as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) def test_GradientPreviewSettings_DefaultPinnedEntityIsSelf(self, request, workspace, editor, launcher_platform): from .EditorScripts import GradientPreviewSettings_DefaultPinnedEntityIsSelf as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) def test_GradientPreviewSettings_ClearingPinnedEntitySetsPreviewToOrigin(self, request, workspace, editor, launcher_platform): from .EditorScripts import GradientPreviewSettings_ClearingPinnedEntitySetsPreviewToOrigin as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) def test_GradientSampling_GradientReferencesAddRemoveSuccessfully(self, request, workspace, editor, launcher_platform): from .EditorScripts import GradientSampling_GradientReferencesAddRemoveSuccessfully as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) def test_GradientSurfaceTagEmitter_ComponentDependencies(self, request, workspace, editor, launcher_platform): from .EditorScripts import GradientSurfaceTagEmitter_ComponentDependencies as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) def test_GradientSurfaceTagEmitter_SurfaceTagsAddRemoveSuccessfully(self, request, workspace, editor, launcher_platform): from .EditorScripts import GradientSurfaceTagEmitter_SurfaceTagsAddRemoveSuccessfully as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) def test_GradientTransform_RequiresShape(self, request, workspace, editor, launcher_platform): from .EditorScripts import GradientTransform_RequiresShape as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) def test_GradientTransform_FrequencyZoomCanBeSetBeyondSliderRange(self, request, workspace, editor, launcher_platform): from .EditorScripts import GradientTransform_FrequencyZoomCanBeSetBeyondSliderRange as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) def test_GradientTransform_ComponentIncompatibleWithSpawners(self, request, workspace, editor, launcher_platform): from .EditorScripts import GradientTransform_ComponentIncompatibleWithSpawners as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) def test_GradientTransform_ComponentIncompatibleWithExpectedGradients(self, request, workspace, editor, launcher_platform): from .EditorScripts import GradientTransform_ComponentIncompatibleWithExpectedGradients as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) def test_ImageGradient_RequiresShape(self, request, workspace, editor, launcher_platform): from .EditorScripts import ImageGradient_RequiresShape as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) def test_ImageGradient_ProcessedImageAssignedSuccessfully(self, request, workspace, editor, launcher_platform): from .EditorScripts import ImageGradient_ProcessedImageAssignedSuccessfully as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/gradient_signal/TestSuite_Periodic_Optimized.py b/AutomatedTesting/Gem/PythonTests/largeworlds/gradient_signal/TestSuite_Periodic_Optimized.py index 514504d324..6ac0658b4d 100644 --- a/AutomatedTesting/Gem/PythonTests/largeworlds/gradient_signal/TestSuite_Periodic_Optimized.py +++ b/AutomatedTesting/Gem/PythonTests/largeworlds/gradient_signal/TestSuite_Periodic_Optimized.py @@ -15,6 +15,8 @@ from ly_test_tools.o3de.editor_test import EditorSingleTest, EditorSharedTest, E @pytest.mark.parametrize("project", ["AutomatedTesting"]) class TestAutomation(EditorTestSuite): + enable_prefab_system = False + class test_GradientGenerators_Incompatibilities(EditorSharedTest): from .EditorScripts import GradientGenerators_Incompatibilities as test_module diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/TestSuite_Main.py b/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/TestSuite_Main.py index af4855a546..dedc9c70c0 100644 --- a/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/TestSuite_Main.py +++ b/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/TestSuite_Main.py @@ -22,8 +22,8 @@ class TestAutomation(TestAutomationBase): def test_LandscapeCanvas_SlotConnections_UpdateComponentReferences(self, request, workspace, editor, launcher_platform): from .EditorScripts import SlotConnections_UpdateComponentReferences as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) def test_LandscapeCanvas_GradientMixer_NodeConstruction(self, request, workspace, editor, launcher_platform): from .EditorScripts import GradientMixer_NodeConstruction as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/TestSuite_Main_Optimized.py b/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/TestSuite_Main_Optimized.py index 1c3652cae9..402df133cb 100644 --- a/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/TestSuite_Main_Optimized.py +++ b/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/TestSuite_Main_Optimized.py @@ -18,6 +18,8 @@ from ly_test_tools.o3de.editor_test import EditorSingleTest, EditorSharedTest, E @pytest.mark.parametrize("project", ["AutomatedTesting"]) class TestAutomation(EditorTestSuite): + enable_prefab_system = False + class test_LandscapeCanvas_SlotConnections_UpdateComponentReferences(EditorSharedTest): from .EditorScripts import SlotConnections_UpdateComponentReferences as test_module diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/TestSuite_Periodic.py b/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/TestSuite_Periodic.py index ef8b3e492b..a719b1a7c0 100644 --- a/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/TestSuite_Periodic.py +++ b/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/TestSuite_Periodic.py @@ -33,89 +33,89 @@ class TestAutomation(TestAutomationBase): def test_LandscapeCanvas_AreaNodes_DependentComponentsAdded(self, request, workspace, editor, launcher_platform): from .EditorScripts import AreaNodes_DependentComponentsAdded as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) def test_LandscapeCanvas_AreaNodes_EntityCreatedOnNodeAdd(self, request, workspace, editor, launcher_platform): from .EditorScripts import AreaNodes_EntityCreatedOnNodeAdd as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) def test_LandscapeCanvas_AreaNodes_EntityRemovedOnNodeDelete(self, request, workspace, editor, launcher_platform): from .EditorScripts import AreaNodes_EntityRemovedOnNodeDelete as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) def test_LandscapeCanvas_LayerExtenderNodes_ComponentEntitySync(self, request, workspace, editor, launcher_platform): from .EditorScripts import LayerExtenderNodes_ComponentEntitySync as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) def test_LandscapeCanvas_Edit_DisabledNodeDuplication(self, request, workspace, editor, launcher_platform): from .EditorScripts import Edit_DisabledNodeDuplication as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) def test_LandscapeCanvas_Edit_UndoNodeDelete_SliceEntity(self, request, workspace, editor, launcher_platform): from .EditorScripts import Edit_UndoNodeDelete_SliceEntity as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) def test_LandscapeCanvas_NewGraph_CreatedSuccessfully(self, request, workspace, editor, launcher_platform): from .EditorScripts import NewGraph_CreatedSuccessfully as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) def test_LandscapeCanvas_Component_AddedRemoved(self, request, workspace, editor, launcher_platform): from .EditorScripts import Component_AddedRemoved as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) def test_LandscapeCanvas_GraphClosed_OnLevelChange(self, request, workspace, editor, launcher_platform): from .EditorScripts import GraphClosed_OnLevelChange as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) @pytest.mark.xfail(reason="https://github.com/o3de/o3de/issues/2201") def test_LandscapeCanvas_GraphClosed_OnEntityDelete(self, request, workspace, editor, launcher_platform): from .EditorScripts import GraphClosed_OnEntityDelete as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) def test_LandscapeCanvas_GraphClosed_TabbedGraphClosesIndependently(self, request, workspace, editor, launcher_platform): from .EditorScripts import GraphClosed_TabbedGraph as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) def test_LandscapeCanvas_Slice_CreateInstantiate(self, request, workspace, editor, remove_test_slice, launcher_platform): from .EditorScripts import Slice_CreateInstantiate as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) def test_LandscapeCanvas_GradientModifierNodes_EntityCreatedOnNodeAdd(self, request, workspace, editor, launcher_platform): from .EditorScripts import GradientModifierNodes_EntityCreatedOnNodeAdd as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) def test_LandscapeCanvas_GradientModifierNodes_EntityRemovedOnNodeDelete(self, request, workspace, editor, launcher_platform): from .EditorScripts import GradientModifierNodes_EntityRemovedOnNodeDelete as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) def test_LandscapeCanvas_GradientNodes_DependentComponentsAdded(self, request, workspace, editor, launcher_platform): from .EditorScripts import GradientNodes_DependentComponentsAdded as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) def test_LandscapeCanvas_GradientNodes_EntityCreatedOnNodeAdd(self, request, workspace, editor, launcher_platform): from .EditorScripts import GradientNodes_EntityCreatedOnNodeAdd as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) def test_LandscapeCanvas_GradientNodes_EntityRemovedOnNodeDelete(self, request, workspace, editor, launcher_platform): from .EditorScripts import GradientNodes_EntityRemovedOnNodeDelete as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) def test_LandscapeCanvas_GraphUpdates_UpdateComponents(self, request, workspace, editor, launcher_platform): from .EditorScripts import GraphUpdates_UpdateComponents as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) def test_LandscapeCanvas_ComponentUpdates_UpdateGraph(self, request, workspace, editor, launcher_platform): from .EditorScripts import ComponentUpdates_UpdateGraph as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) def test_LandscapeCanvas_LayerBlender_NodeConstruction(self, request, workspace, editor, launcher_platform): from .EditorScripts import LayerBlender_NodeConstruction as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) def test_LandscapeCanvas_ShapeNodes_EntityCreatedOnNodeAdd(self, request, workspace, editor, launcher_platform): from .EditorScripts import ShapeNodes_EntityCreatedOnNodeAdd as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) def test_LandscapeCanvas_ShapeNodes_EntityRemovedOnNodeDelete(self, request, workspace, editor, launcher_platform): from .EditorScripts import ShapeNodes_EntityRemovedOnNodeDelete as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) diff --git a/AutomatedTesting/Gem/PythonTests/scripting/TestSuite_Periodic.py b/AutomatedTesting/Gem/PythonTests/scripting/TestSuite_Periodic.py index b2001e6825..27af63ddbc 100755 --- a/AutomatedTesting/Gem/PythonTests/scripting/TestSuite_Periodic.py +++ b/AutomatedTesting/Gem/PythonTests/scripting/TestSuite_Periodic.py @@ -27,15 +27,15 @@ TEST_DIRECTORY = os.path.dirname(__file__) class TestAutomation(TestAutomationBase): def test_Pane_HappyPath_OpenCloseSuccessfully(self, request, workspace, editor, launcher_platform): from . import Pane_HappyPath_OpenCloseSuccessfully as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) def test_Pane_HappyPath_DocksProperly(self, request, workspace, editor, launcher_platform): from . import Pane_HappyPath_DocksProperly as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) def test_Pane_HappyPath_ResizesProperly(self, request, workspace, editor, launcher_platform): from . import Pane_HappyPath_ResizesProperly as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) @pytest.mark.xfail(reason="Test fails to find expected lines, it needs to be fixed.") @pytest.mark.parametrize("level", ["tmp_level"]) @@ -45,7 +45,7 @@ class TestAutomation(TestAutomationBase): request.addfinalizer(teardown) file_system.delete([os.path.join(workspace.paths.project(), "Levels", level)], True, True) from . import ScriptCanvas_TwoComponents_InteractSuccessfully as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) @pytest.mark.xfail(reason="Test fails to find expected lines, it needs to be fixed.") @pytest.mark.parametrize("level", ["tmp_level"]) @@ -55,15 +55,15 @@ class TestAutomation(TestAutomationBase): request.addfinalizer(teardown) file_system.delete([os.path.join(workspace.paths.project(), "Levels", level)], True, True) from . import ScriptCanvas_ChangingAssets_ComponentStable as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) def test_Graph_HappyPath_ZoomInZoomOut(self, request, workspace, editor, launcher_platform): from . import Graph_HappyPath_ZoomInZoomOut as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) def test_NodePalette_HappyPath_CanSelectNode(self, request, workspace, editor, launcher_platform): from . import NodePalette_HappyPath_CanSelectNode as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) @pytest.mark.xfail(reason="Test fails to find expected lines, it needs to be fixed.") @pytest.mark.parametrize("level", ["tmp_level"]) @@ -73,11 +73,11 @@ class TestAutomation(TestAutomationBase): request.addfinalizer(teardown) file_system.delete([os.path.join(workspace.paths.project(), "Levels", level)], True, True) from . import ScriptCanvasComponent_OnEntityActivatedDeactivated_PrintMessage as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) def test_NodePalette_HappyPath_ClearSelection(self, request, workspace, editor, launcher_platform, project): from . import NodePalette_HappyPath_ClearSelection as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) @pytest.mark.xfail(reason="Test fails to find expected lines, it needs to be fixed.") @pytest.mark.parametrize("level", ["tmp_level"]) @@ -87,7 +87,7 @@ class TestAutomation(TestAutomationBase): request.addfinalizer(teardown) file_system.delete([os.path.join(workspace.paths.project(), "Levels", level)], True, True) from . import ScriptCanvas_TwoEntities_UseSimultaneously as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) def test_ScriptEvent_HappyPath_CreatedWithoutError(self, request, workspace, editor, launcher_platform, project): def teardown(): @@ -99,19 +99,19 @@ class TestAutomation(TestAutomationBase): [os.path.join(workspace.paths.project(), "ScriptCanvas", "test_file.scriptevent")], True, True ) from . import ScriptEvent_HappyPath_CreatedWithoutError as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) def test_ScriptCanvasTools_Toggle_OpenCloseSuccess(self, request, workspace, editor, launcher_platform): from . import ScriptCanvasTools_Toggle_OpenCloseSuccess as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) def test_NodeInspector_HappyPath_VariableRenames(self, request, workspace, editor, launcher_platform, project): from . import NodeInspector_HappyPath_VariableRenames as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) def test_Debugger_HappyPath_TargetMultipleGraphs(self, request, workspace, editor, launcher_platform, project): from . import Debugger_HappyPath_TargetMultipleGraphs as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) @pytest.mark.parametrize("level", ["tmp_level"]) def test_Debugger_HappyPath_TargetMultipleEntities(self, request, workspace, editor, launcher_platform, project, level): @@ -120,16 +120,16 @@ class TestAutomation(TestAutomationBase): request.addfinalizer(teardown) file_system.delete([os.path.join(workspace.paths.project(), "Levels", level)], True, True) from . import Debugger_HappyPath_TargetMultipleEntities as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) @pytest.mark.xfail(reason="Test fails to find expected lines, it needs to be fixed.") def test_EditMenu_Default_UndoRedo(self, request, workspace, editor, launcher_platform, project): from . import EditMenu_Default_UndoRedo as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) def test_Pane_Undocked_ClosesSuccessfully(self, request, workspace, editor, launcher_platform): from . import Pane_Undocked_ClosesSuccessfully as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) @pytest.mark.parametrize("level", ["tmp_level"]) def test_Entity_HappyPath_AddScriptCanvasComponent(self, request, workspace, editor, launcher_platform, project, level): @@ -138,11 +138,11 @@ class TestAutomation(TestAutomationBase): request.addfinalizer(teardown) file_system.delete([os.path.join(workspace.paths.project(), "Levels", level)], True, True) from . import Entity_HappyPath_AddScriptCanvasComponent as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) def test_Pane_Default_RetainOnSCRestart(self, request, workspace, editor, launcher_platform): from . import Pane_Default_RetainOnSCRestart as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) @pytest.mark.xfail(reason="Test fails to find expected lines, it needs to be fixed.") @pytest.mark.parametrize("level", ["tmp_level"]) @@ -152,7 +152,7 @@ class TestAutomation(TestAutomationBase): request.addfinalizer(teardown) file_system.delete([os.path.join(workspace.paths.project(), "Levels", level)], True, True) from . import ScriptEvents_HappyPath_SendReceiveAcrossMultiple as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) @pytest.mark.xfail(reason="Test fails to find expected lines, it needs to be fixed.") @pytest.mark.parametrize("level", ["tmp_level"]) @@ -162,7 +162,7 @@ class TestAutomation(TestAutomationBase): request.addfinalizer(teardown) file_system.delete([os.path.join(workspace.paths.project(), "Levels", level)], True, True) from . import ScriptEvents_Default_SendReceiveSuccessfully as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) @pytest.mark.xfail(reason="Test fails to find expected lines, it needs to be fixed.") @pytest.mark.parametrize("level", ["tmp_level"]) @@ -172,24 +172,24 @@ class TestAutomation(TestAutomationBase): request.addfinalizer(teardown) file_system.delete([os.path.join(workspace.paths.project(), "Levels", level)], True, True) from . import ScriptEvents_ReturnSetType_Successfully as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) def test_NodeCategory_ExpandOnClick(self, request, workspace, editor, launcher_platform): from . import NodeCategory_ExpandOnClick as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) def test_NodePalette_SearchText_Deletion(self, request, workspace, editor, launcher_platform): from . import NodePalette_SearchText_Deletion as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) @pytest.mark.xfail(reason="Test fails to find expected lines, it needs to be fixed.") def test_VariableManager_UnpinVariableType_Works(self, request, workspace, editor, launcher_platform): from . import VariableManager_UnpinVariableType_Works as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) def test_Node_HappyPath_DuplicateNode(self, request, workspace, editor, launcher_platform): from . import Node_HappyPath_DuplicateNode as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) def test_ScriptEvent_AddRemoveParameter_ActionsSuccessful(self, request, workspace, editor, launcher_platform): def teardown(): @@ -201,7 +201,7 @@ class TestAutomation(TestAutomationBase): [os.path.join(workspace.paths.project(), "ScriptCanvas", "test_file.scriptevent")], True, True ) from . import ScriptEvent_AddRemoveParameter_ActionsSuccessful as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) # NOTE: We had to use hydra_test_utils.py, as TestAutomationBase run_test method # fails because of pyside_utils import @@ -220,7 +220,14 @@ class TestScriptCanvasTests(object): "File->Open action working as expected: True", ] hydra.launch_and_validate_results( - request, TEST_DIRECTORY, editor, "FileMenu_Default_NewAndOpen.py", expected_lines, auto_test_mode=False, timeout=60, + request, + TEST_DIRECTORY, + editor, + "FileMenu_Default_NewAndOpen.py", + expected_lines, + auto_test_mode=False, + timeout=60, + enable_prefab_system=False, ) @pytest.mark.xfail(reason="Test fails to find expected lines, it needs to be fixed.") @@ -239,6 +246,7 @@ class TestScriptCanvasTests(object): expected_lines, auto_test_mode=False, timeout=60, + enable_prefab_system=False, ) def test_GraphClose_Default_SavePrompt(self, request, editor, launcher_platform): @@ -255,6 +263,7 @@ class TestScriptCanvasTests(object): expected_lines, auto_test_mode=False, timeout=60, + enable_prefab_system=False, ) def test_VariableManager_Default_CreateDeleteVars(self, request, editor, launcher_platform): @@ -269,6 +278,7 @@ class TestScriptCanvasTests(object): expected_lines, auto_test_mode=False, timeout=60, + enable_prefab_system=False, ) @pytest.mark.parametrize( @@ -304,6 +314,7 @@ class TestScriptCanvasTests(object): cfg_args=[config.get('cfg_args')], auto_test_mode=False, timeout=60, + enable_prefab_system=False, ) @pytest.mark.xfail(reason="Test fails to find expected lines, it needs to be fixed.") @@ -332,6 +343,7 @@ class TestScriptCanvasTests(object): expected_lines, auto_test_mode=False, timeout=60, + enable_prefab_system=False, ) @pytest.mark.xfail(reason="Test fails to find expected lines, it needs to be fixed.") @@ -359,5 +371,6 @@ class TestScriptCanvasTests(object): expected_lines, auto_test_mode=False, timeout=60, + enable_prefab_system=False, ) \ No newline at end of file diff --git a/AutomatedTesting/Gem/PythonTests/scripting/TestSuite_Sandbox.py b/AutomatedTesting/Gem/PythonTests/scripting/TestSuite_Sandbox.py index 91b01d8d08..071ae2286c 100644 --- a/AutomatedTesting/Gem/PythonTests/scripting/TestSuite_Sandbox.py +++ b/AutomatedTesting/Gem/PythonTests/scripting/TestSuite_Sandbox.py @@ -23,4 +23,4 @@ class TestAutomation(TestAutomationBase): def test_Opening_Closing_Pane(self, request, workspace, editor, launcher_platform): from . import Opening_Closing_Pane as test_module - self._run_test(request, workspace, editor, test_module) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) diff --git a/AutomatedTesting/Gem/PythonTests/smoke/test_Editor_NewExistingLevels_Works.py b/AutomatedTesting/Gem/PythonTests/smoke/test_Editor_NewExistingLevels_Works.py index ebaebcfa92..5caf7744c4 100644 --- a/AutomatedTesting/Gem/PythonTests/smoke/test_Editor_NewExistingLevels_Works.py +++ b/AutomatedTesting/Gem/PythonTests/smoke/test_Editor_NewExistingLevels_Works.py @@ -31,4 +31,4 @@ class TestAutomation(TestAutomationBase): from . import Editor_NewExistingLevels_Works as test_module - self._run_test(request, workspace, editor, test_module, extra_cmdline_args=["--regset=/Amazon/Preferences/EnablePrefabSystem=false"]) + self._run_test(request, workspace, editor, test_module, enable_prefab_system=False) diff --git a/AutomatedTesting/Registry/editorpreferences.setreg b/AutomatedTesting/Registry/editorpreferences.setreg index b338d6acad..e76e04f9ba 100644 --- a/AutomatedTesting/Registry/editorpreferences.setreg +++ b/AutomatedTesting/Registry/editorpreferences.setreg @@ -1,7 +1,7 @@ { "Amazon": { "Preferences": { - "EnablePrefabSystem": false + "EnablePrefabSystem": true } } } \ No newline at end of file diff --git a/Tools/LyTestTools/ly_test_tools/o3de/editor_test.py b/Tools/LyTestTools/ly_test_tools/o3de/editor_test.py index ae6ed16321..29b6573f7a 100644 --- a/Tools/LyTestTools/ly_test_tools/o3de/editor_test.py +++ b/Tools/LyTestTools/ly_test_tools/o3de/editor_test.py @@ -303,6 +303,8 @@ class EditorTestSuite(): use_null_renderer = True # Maximum time for a single editor to stay open on a shared test timeout_editor_shared_test = 300 + # Flag to determine whether to use new prefab system or use deprecated slice system for this test suite + enable_prefab_system = True # Function to calculate number of editors to run in parallel, this can be overriden by the user @staticmethod @@ -741,7 +743,11 @@ class EditorTestSuite(): test_cmdline_args += ["--attach-debugger"] if test_spec.wait_for_debugger: test_cmdline_args += ["--wait-for-debugger"] - + if self.enable_prefab_system: + test_cmdline_args += ["--regset=/Amazon/Preferences/EnablePrefabSystem=true"] + else: + test_cmdline_args += ["--regset=/Amazon/Preferences/EnablePrefabSystem=false"] + # Cycle any old crash report in case it wasn't cycled properly editor_utils.cycle_crash_report(run_id, workspace) @@ -804,7 +810,11 @@ class EditorTestSuite(): test_cmdline_args += ["--attach-debugger"] if any([t.wait_for_debugger for t in test_spec_list]): test_cmdline_args += ["--wait-for-debugger"] - + if self.enable_prefab_system: + test_cmdline_args += ["--regset=/Amazon/Preferences/EnablePrefabSystem=true"] + else: + test_cmdline_args += ["--regset=/Amazon/Preferences/EnablePrefabSystem=false"] + # Cycle any old crash report in case it wasn't cycled properly editor_utils.cycle_crash_report(run_id, workspace) From 03e5fd213cc0b00a6020c3812e3aa2a6a688554b Mon Sep 17 00:00:00 2001 From: greerdv Date: Mon, 22 Nov 2021 18:46:29 +0000 Subject: [PATCH 193/345] feedback from PR Signed-off-by: greerdv --- .../Code/Editor/ColliderComponentMode.cpp | 40 ++++++++----------- .../PhysX/Code/Editor/ColliderComponentMode.h | 11 ++--- 2 files changed, 22 insertions(+), 29 deletions(-) diff --git a/Gems/PhysX/Code/Editor/ColliderComponentMode.cpp b/Gems/PhysX/Code/Editor/ColliderComponentMode.cpp index eba245eca5..76e687f26a 100644 --- a/Gems/PhysX/Code/Editor/ColliderComponentMode.cpp +++ b/Gems/PhysX/Code/Editor/ColliderComponentMode.cpp @@ -142,7 +142,7 @@ namespace PhysX if (mouseInteraction.m_mouseEvent == AzToolsFramework::ViewportInteraction::MouseEvent::Wheel && mouseInteraction.m_mouseInteraction.m_keyboardModifiers.Ctrl()) { - int direction = MouseWheelDelta(mouseInteraction) > 0.0f ? -1 : 1; + const int direction = MouseWheelDelta(mouseInteraction) > 0.0f ? -1 : 1; AZ::u32 currentModeIndex = static_cast(m_subMode); AZ::u32 numSubModes = static_cast(SubMode::NumModes); AZ::u32 nextModeIndex = (currentModeIndex + numSubModes + direction) % m_subModes.size(); @@ -160,29 +160,18 @@ namespace PhysX void ColliderComponentMode::SetCurrentMode(SubMode newMode) { - if (auto subMode = m_subModes.find(newMode); subMode != m_subModes.end()) - { - m_subModes[m_subMode]->Teardown(GetEntityComponentIdPair()); - m_subMode = newMode; - m_subModes[m_subMode]->Setup(GetEntityComponentIdPair()); + auto subMode = m_subModes.find(newMode); + AZ_Assert(subMode != m_subModes.end(), "Submode not found:%d", newMode); + m_subModes[m_subMode]->Teardown(GetEntityComponentIdPair()); + m_subMode = newMode; + m_subModes[m_subMode]->Setup(GetEntityComponentIdPair()); - const auto modeIndex = static_cast(newMode); - if (modeIndex < m_buttonIds.size()) - { - AzToolsFramework::ViewportUi::ViewportUiRequestBus::Event( - AzToolsFramework::ViewportUi::DefaultViewportId, - &AzToolsFramework::ViewportUi::ViewportUiRequestBus::Events::SetClusterActiveButton, m_modeSelectionClusterId, - m_buttonIds[modeIndex]); - } - else - { - AZ_Error("PhysX Collider Component Mode", false, "Invalid mode index %i.", modeIndex); - } - } - else - { - AZ_Assert(false, "Submode not found:%d", newMode); - } + const auto modeIndex = static_cast(newMode); + AZ_Assert(modeIndex < m_buttonIds.size(), "Invalid mode index %i.", modeIndex); + AzToolsFramework::ViewportUi::ViewportUiRequestBus::Event( + AzToolsFramework::ViewportUi::DefaultViewportId, + &AzToolsFramework::ViewportUi::ViewportUiRequestBus::Events::SetClusterActiveButton, m_modeSelectionClusterId, + m_buttonIds[modeIndex]); } AzToolsFramework::ViewportUi::ClusterId ColliderComponentMode::GetClusterId() const @@ -261,7 +250,6 @@ namespace PhysX &AzToolsFramework::ViewportUi::ViewportUiRequestBus::Events::CreateCluster, AzToolsFramework::ViewportUi::Alignment::TopLeft); // create and register the buttons - m_buttonIds.resize(static_cast(SubMode::NumModes)); m_buttonIds[static_cast(SubMode::Offset)] = RegisterClusterButton(m_modeSelectionClusterId, "Move"); m_buttonIds[static_cast(SubMode::Rotation)] = RegisterClusterButton(m_modeSelectionClusterId, "Rotate"); m_buttonIds[static_cast(SubMode::Dimensions)] = RegisterClusterButton(m_modeSelectionClusterId, "Scale"); @@ -282,6 +270,10 @@ namespace PhysX { SetCurrentMode(SubMode::Dimensions); } + else + { + AZ_Error("PhysX Collider Component Mode", false, "Unrecognized button ID."); + } }; m_modeSelectionHandler = AZ::Event::Handler(onButtonClicked); diff --git a/Gems/PhysX/Code/Editor/ColliderComponentMode.h b/Gems/PhysX/Code/Editor/ColliderComponentMode.h index bc8e7d9a0b..4c968bb87d 100644 --- a/Gems/PhysX/Code/Editor/ColliderComponentMode.h +++ b/Gems/PhysX/Code/Editor/ColliderComponentMode.h @@ -31,22 +31,22 @@ namespace PhysX ColliderComponentMode(const AZ::EntityComponentIdPair& entityComponentIdPair, AZ::Uuid componentType); ~ColliderComponentMode(); - // EditorBaseComponentMode ... + // EditorBaseComponentMode overrides ... void Refresh() override; AZStd::vector PopulateActionsImpl() override; AZStd::vector PopulateViewportUiImpl() override; - // ColliderComponentModeBus ... + // ColliderComponentModeBus overrides ... SubMode GetCurrentMode() override; void SetCurrentMode(SubMode index) override; - // ColliderComponentModeUiBus ... + // ColliderComponentModeUiBus overrides ... AzToolsFramework::ViewportUi::ButtonId GetOffsetButtonId() const override; AzToolsFramework::ViewportUi::ButtonId GetRotationButtonId() const override; AzToolsFramework::ViewportUi::ClusterId GetClusterId() const override; AzToolsFramework::ViewportUi::ButtonId GetDimensionsButtonId() const override; - // ComponentMode ... + // ComponentMode overrides ... AZStd::string GetComponentModeName() const override; private: @@ -66,7 +66,8 @@ namespace PhysX AzToolsFramework::ViewportUi::ClusterId m_modeSelectionClusterId; //!< Viewport UI cluster for changing sub mode. - AZStd::vector m_buttonIds; //!< Ids for the Viewport UI buttons for each mode. + //! Ids for the Viewport UI buttons for each mode. + AZStd::fixed_vector< AzToolsFramework::ViewportUi::ButtonId, static_cast(SubMode::NumModes)> m_buttonIds; AZ::Event::Handler m_modeSelectionHandler; //!< Event handler for sub mode changes. From 20a2a7900323ae537e43c42ede0cd1ee1f35bd36 Mon Sep 17 00:00:00 2001 From: lsemp3d <58790905+lsemp3d@users.noreply.github.com> Date: Mon, 22 Nov 2021 10:58:09 -0800 Subject: [PATCH 194/345] Updated more node names, no longer return data type string to control tooltip display in SC Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com> --- ...AZ__SceneAPI__Containers__SceneGraph.names | 581 ++++++++++++++++++ ...SceneAPI__DataTypes__IMeshData__Face.names | 52 ++ .../TranslationAssets/Classes/AxisType.names | 90 ++- .../Classes/BlastActorData.names | 105 ++++ .../Classes/BlendShapeData.names | 58 +- .../Classes/BlendShapeDataFace.names | 15 +- .../Classes/BoxShapeConfig.names | 50 +- .../Classes/CapsuleShapeConfig.names | 94 ++- .../TranslationAssets/Classes/Contact.names | 172 +++++- .../Classes/CylinderShapeConfig.names | 94 ++- .../Classes/InputEventNotificationId.names | 148 ++++- .../Classes/PhysicsSystemInterface.names | 16 +- .../Classes/SceneGraphName.names | 36 +- .../Classes/SliceInstantiationTicket.names | 34 +- .../TranslationAssets/Classes/UVCoords.names | 244 ++++++-- .../TranslationAssets/Classes/UiAnchors.names | 111 ++-- .../Classes/Unit Testing.names | 94 +-- .../Classes/UnitTesting.names | 484 +++++++++++++++ .../TranslationAssets/Classes/Uuid.names | 6 +- .../Classes/VertexColor.names | 94 ++- ...Audio System Component Notifications.names | 7 +- .../Handlers/InputSystemNotificationBus.names | 7 +- .../EBus/Handlers/LookAtNotification.names | 8 +- .../SpawnerComponentNotificationBus.names | 32 +- .../EBus/Senders/BloomRequestBus.names | 514 ++++++++-------- .../EBus/Senders/BoundsRequestBus.names | 18 +- .../EBus/Senders/DecalRequestBus.names | 67 +- .../EBus/Senders/DeferredFogRequestsBus.names | 179 +++--- .../EBus/Senders/InputSystemRequestBus.names | 9 +- .../EBus/Senders/LookAt.names | 34 +- .../LyShineExamplesCppExampleBus.names | 10 +- .../Multi-Position Audio Requests.names | 15 +- .../SimpleStateComponentRequestBus.names | 60 +- .../Senders/SpawnerComponentRequestBus.names | 89 ++- .../EBus/Senders/TagComponentRequestBus.names | 25 +- .../EBus/Senders/TagGlobalRequestBus.names | 9 +- .../EBus/Senders/UiTransformBus.names | 204 +++--- .../Nodes/Input_InputHandler.names | 4 +- .../Code/Editor/Components/EditorGraph.cpp | 6 +- 39 files changed, 2917 insertions(+), 958 deletions(-) create mode 100644 Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AZ__SceneAPI__Containers__SceneGraph.names create mode 100644 Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AZ__SceneAPI__DataTypes__IMeshData__Face.names create mode 100644 Gems/ScriptCanvas/Assets/TranslationAssets/Classes/BlastActorData.names create mode 100644 Gems/ScriptCanvas/Assets/TranslationAssets/Classes/UnitTesting.names diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AZ__SceneAPI__Containers__SceneGraph.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AZ__SceneAPI__Containers__SceneGraph.names new file mode 100644 index 0000000000..887aedbd5e --- /dev/null +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AZ__SceneAPI__Containers__SceneGraph.names @@ -0,0 +1,581 @@ +{ + "entries": [ + { + "key": "AZ::SceneAPI::Containers::SceneGraph", + "context": "BehaviorClass", + "variant": "", + "details": { + "name": "Scene Graph", + "category": "Scene Graph" + }, + "methods": [ + { + "key": "GetNodeChild", + "context": "AZ::SceneAPI::Containers::SceneGraph", + "entry": { + "name": "In", + "tooltip": "When signaled, this will invoke Get Node Child" + }, + "exit": { + "name": "Out", + "tooltip": "Signaled after Get Node Child is invoked" + }, + "details": { + "name": "Get Node Child" + }, + "params": [ + { + "typeid": "{CAC6556D-D5FE-4D0E-BCCD-8940357C1D35}", + "details": { + "name": "Scene Graph" + } + }, + { + "typeid": "{4AD18037-E629-480D-8165-997A137327FD}", + "details": { + "name": "Node Index" + } + } + ], + "results": [ + { + "typeid": "{4AD18037-E629-480D-8165-997A137327FD}", + "details": { + "name": "Node Index" + } + } + ] + }, + { + "key": "FindWithPath", + "context": "AZ::SceneAPI::Containers::SceneGraph", + "entry": { + "name": "In", + "tooltip": "When signaled, this will invoke Find With Path" + }, + "exit": { + "name": "Out", + "tooltip": "Signaled after Find With Path is invoked" + }, + "details": { + "name": "Find With Path" + }, + "params": [ + { + "typeid": "{CAC6556D-D5FE-4D0E-BCCD-8940357C1D35}", + "details": { + "name": "Scene Graph" + } + }, + { + "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", + "details": { + "name": "Path" + } + } + ], + "results": [ + { + "typeid": "{4AD18037-E629-480D-8165-997A137327FD}", + "details": { + "name": "Node Index" + } + } + ] + }, + { + "key": "HasNodeChild", + "context": "AZ::SceneAPI::Containers::SceneGraph", + "entry": { + "name": "In", + "tooltip": "When signaled, this will invoke Has Node Child" + }, + "exit": { + "name": "Out", + "tooltip": "Signaled after Has Node Child is invoked" + }, + "details": { + "name": "Has Node Child" + }, + "params": [ + { + "typeid": "{CAC6556D-D5FE-4D0E-BCCD-8940357C1D35}", + "details": { + "name": "Scene Graph" + } + }, + { + "typeid": "{4AD18037-E629-480D-8165-997A137327FD}", + "details": { + "name": "Node Index" + } + } + ], + "results": [ + { + "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", + "details": { + "name": "Has Node Child" + } + } + ] + }, + { + "key": "HasNodeParent", + "context": "AZ::SceneAPI::Containers::SceneGraph", + "entry": { + "name": "In", + "tooltip": "When signaled, this will invoke Has Node Parent" + }, + "exit": { + "name": "Out", + "tooltip": "Signaled after Has Node Parent is invoked" + }, + "details": { + "name": "Has Node Parent" + }, + "params": [ + { + "typeid": "{CAC6556D-D5FE-4D0E-BCCD-8940357C1D35}", + "details": { + "name": "Scene Graph" + } + }, + { + "typeid": "{4AD18037-E629-480D-8165-997A137327FD}", + "details": { + "name": "Node Index" + } + } + ], + "results": [ + { + "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", + "details": { + "name": "Has Node Parent" + } + } + ] + }, + { + "key": "GetNodeSibling", + "context": "AZ::SceneAPI::Containers::SceneGraph", + "entry": { + "name": "In", + "tooltip": "When signaled, this will invoke Get Node Sibling" + }, + "exit": { + "name": "Out", + "tooltip": "Signaled after Get Node Sibling is invoked" + }, + "details": { + "name": "Get Node Sibling" + }, + "params": [ + { + "typeid": "{CAC6556D-D5FE-4D0E-BCCD-8940357C1D35}", + "details": { + "name": "Scene Graph" + } + }, + { + "typeid": "{4AD18037-E629-480D-8165-997A137327FD}", + "details": { + "name": "Node Index" + } + } + ], + "results": [ + { + "typeid": "{4AD18037-E629-480D-8165-997A137327FD}", + "details": { + "name": "Node Index" + } + } + ] + }, + { + "key": "HasNodeSibling", + "context": "AZ::SceneAPI::Containers::SceneGraph", + "entry": { + "name": "In", + "tooltip": "When signaled, this will invoke Has Node Sibling" + }, + "exit": { + "name": "Out", + "tooltip": "Signaled after Has Node Sibling is invoked" + }, + "details": { + "name": "Has Node Sibling" + }, + "params": [ + { + "typeid": "{CAC6556D-D5FE-4D0E-BCCD-8940357C1D35}", + "details": { + "name": "Scene Graph" + } + }, + { + "typeid": "{4AD18037-E629-480D-8165-997A137327FD}", + "details": { + "name": "Node Index" + } + } + ], + "results": [ + { + "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", + "details": { + "name": "Has Node Sibling" + } + } + ] + }, + { + "key": "IsNodeEndPoint", + "context": "AZ::SceneAPI::Containers::SceneGraph", + "entry": { + "name": "In", + "tooltip": "When signaled, this will invoke Is Node End Point" + }, + "exit": { + "name": "Out", + "tooltip": "Signaled after Is Node End Point is invoked" + }, + "details": { + "name": "Is Node End Point" + }, + "params": [ + { + "typeid": "{CAC6556D-D5FE-4D0E-BCCD-8940357C1D35}", + "details": { + "name": "Scene Graph" + } + }, + { + "typeid": "{4AD18037-E629-480D-8165-997A137327FD}", + "details": { + "name": "Node Index" + } + } + ], + "results": [ + { + "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", + "details": { + "name": "Is Node End Point" + } + } + ] + }, + { + "key": "GetNodeCount", + "context": "AZ::SceneAPI::Containers::SceneGraph", + "entry": { + "name": "In", + "tooltip": "When signaled, this will invoke Get Node Count" + }, + "exit": { + "name": "Out", + "tooltip": "Signaled after Get Node Count is invoked" + }, + "details": { + "name": "Get Node Count" + }, + "params": [ + { + "typeid": "{CAC6556D-D5FE-4D0E-BCCD-8940357C1D35}", + "details": { + "name": "Scene Graph" + } + } + ], + "results": [ + { + "typeid": "{D6597933-47CD-4FC8-B911-63F3E2B0993A}", + "details": { + "name": "Node Count" + } + } + ] + }, + { + "key": "HasNodeContent", + "context": "AZ::SceneAPI::Containers::SceneGraph", + "entry": { + "name": "In", + "tooltip": "When signaled, this will invoke Has Node Content" + }, + "exit": { + "name": "Out", + "tooltip": "Signaled after Has Node Content is invoked" + }, + "details": { + "name": "Has Node Content" + }, + "params": [ + { + "typeid": "{CAC6556D-D5FE-4D0E-BCCD-8940357C1D35}", + "details": { + "name": "Scene Graph" + } + }, + { + "typeid": "{4AD18037-E629-480D-8165-997A137327FD}", + "details": { + "name": "Node Index" + } + } + ], + "results": [ + { + "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", + "details": { + "name": "Has Node Content" + } + } + ] + }, + { + "key": "GetNodeContent", + "context": "AZ::SceneAPI::Containers::SceneGraph", + "entry": { + "name": "In", + "tooltip": "When signaled, this will invoke Get Node Content" + }, + "exit": { + "name": "Out", + "tooltip": "Signaled after Get Node Content is invoked" + }, + "details": { + "name": "Get Node Content" + }, + "params": [ + { + "typeid": "{CAC6556D-D5FE-4D0E-BCCD-8940357C1D35}", + "details": { + "name": "Scene Graph" + } + }, + { + "typeid": "{4AD18037-E629-480D-8165-997A137327FD}", + "details": { + "name": "Node Index" + } + } + ], + "results": [ + { + "typeid": "{3EF0DDEC-C734-4804-BE99-82058FEBDA71}", + "details": { + "name": "Graph Object Proxy" + } + } + ] + }, + { + "key": "GetNodeName", + "context": "AZ::SceneAPI::Containers::SceneGraph", + "entry": { + "name": "In", + "tooltip": "When signaled, this will invoke Get Node Name" + }, + "exit": { + "name": "Out", + "tooltip": "Signaled after Get Node Name is invoked" + }, + "details": { + "name": "Get Node Name" + }, + "params": [ + { + "typeid": "{CAC6556D-D5FE-4D0E-BCCD-8940357C1D35}", + "details": { + "name": "Scene Graph" + } + }, + { + "typeid": "{4AD18037-E629-480D-8165-997A137327FD}", + "details": { + "name": "Node Index" + } + } + ], + "results": [ + { + "typeid": "{4077AC3C-B301-4F5A-BEA7-54D6511AEC2E}", + "details": { + "name": "Node Name" + } + } + ] + }, + { + "key": "GetRoot", + "context": "AZ::SceneAPI::Containers::SceneGraph", + "entry": { + "name": "In", + "tooltip": "When signaled, this will invoke Get Root" + }, + "exit": { + "name": "Out", + "tooltip": "Signaled after Get Root is invoked" + }, + "details": { + "name": "Get Root" + }, + "params": [ + { + "typeid": "{CAC6556D-D5FE-4D0E-BCCD-8940357C1D35}", + "details": { + "name": "Scene Graph" + } + } + ], + "results": [ + { + "typeid": "{4AD18037-E629-480D-8165-997A137327FD}", + "details": { + "name": "Node Index" + } + } + ] + }, + { + "key": "GetNodeSeperationCharacter", + "context": "AZ::SceneAPI::Containers::SceneGraph", + "entry": { + "name": "In", + "tooltip": "When signaled, this will invoke Get Node Separation Character" + }, + "exit": { + "name": "Out", + "tooltip": "Signaled after Get Node Separation Character is invoked" + }, + "details": { + "name": "Get Node Separation Character" + }, + "results": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "Separation Character" + } + } + ] + }, + { + "key": "GetNodeParent", + "context": "AZ::SceneAPI::Containers::SceneGraph", + "entry": { + "name": "In", + "tooltip": "When signaled, this will invoke Get Node Parent" + }, + "exit": { + "name": "Out", + "tooltip": "Signaled after Get Node Parent is invoked" + }, + "details": { + "name": "Get Node Parent" + }, + "params": [ + { + "typeid": "{CAC6556D-D5FE-4D0E-BCCD-8940357C1D35}", + "details": { + "name": "Scene Graph" + } + }, + { + "typeid": "{4AD18037-E629-480D-8165-997A137327FD}", + "details": { + "name": "Node Index" + } + } + ], + "results": [ + { + "typeid": "{4AD18037-E629-480D-8165-997A137327FD}", + "details": { + "name": "Node Index" + } + } + ] + }, + { + "key": "FindWithRootAndPath", + "context": "AZ::SceneAPI::Containers::SceneGraph", + "entry": { + "name": "In", + "tooltip": "When signaled, this will invoke Find With Root And Path" + }, + "exit": { + "name": "Out", + "tooltip": "Signaled after Find With Root And Path is invoked" + }, + "details": { + "name": "Find With Root And Path" + }, + "params": [ + { + "typeid": "{CAC6556D-D5FE-4D0E-BCCD-8940357C1D35}", + "details": { + "name": "Scene Graph" + } + }, + { + "typeid": "{4AD18037-E629-480D-8165-997A137327FD}", + "details": { + "name": "Node Index" + } + }, + { + "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", + "details": { + "name": "Path" + } + } + ], + "results": [ + { + "typeid": "{4AD18037-E629-480D-8165-997A137327FD}", + "details": { + "name": "Node Index" + } + } + ] + }, + { + "key": "IsValidName", + "context": "AZ::SceneAPI::Containers::SceneGraph", + "entry": { + "name": "In", + "tooltip": "When signaled, this will invoke Is Valid Name" + }, + "exit": { + "name": "Out", + "tooltip": "Signaled after Is Valid Name is invoked" + }, + "details": { + "name": "Is Valid Name" + }, + "params": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "Name" + } + } + ], + "results": [ + { + "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", + "details": { + "name": "Is Valid" + } + } + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AZ__SceneAPI__DataTypes__IMeshData__Face.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AZ__SceneAPI__DataTypes__IMeshData__Face.names new file mode 100644 index 0000000000..d40917fb34 --- /dev/null +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AZ__SceneAPI__DataTypes__IMeshData__Face.names @@ -0,0 +1,52 @@ +{ + "entries": [ + { + "key": "AZ::SceneAPI::DataTypes::IMeshData::Face", + "context": "BehaviorClass", + "variant": "", + "details": { + "name": "Mesh Data Face", + "category": "Scene Graph" + }, + "methods": [ + { + "key": "GetVertexIndex", + "context": "AZ::SceneAPI::DataTypes::IMeshData::Face", + "entry": { + "name": "In", + "tooltip": "When signaled, this will invoke Get Vertex Index" + }, + "exit": { + "name": "Out", + "tooltip": "Signaled after Get Vertex Index is invoked" + }, + "details": { + "name": "Get Vertex Index" + }, + "params": [ + { + "typeid": "{F9F49C1A-014F-46F5-A46F-B56D8CB46C2B}", + "details": { + "name": "Mesh Data Face" + } + }, + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "Face Index" + } + } + ], + "results": [ + { + "typeid": "{43DA906B-7DEF-4CA8-9790-854106D3F983}", + "details": { + "name": "Index" + } + } + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AxisType.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AxisType.names index 005a2d564e..bd64391719 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AxisType.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AxisType.names @@ -5,8 +5,94 @@ "context": "BehaviorClass", "variant": "", "details": { - "name": "AxisType" - } + "name": "Axis Type" + }, + "methods": [ + { + "key": "GetZNegative", + "details": { + "name": "Get -Z" + }, + "results": [ + { + "typeid": "{72B9409A-7D1A-4831-9CFE-FCB3FADD3426}", + "details": { + "name": "-Z" + } + } + ] + }, + { + "key": "GetZPositive", + "details": { + "name": "Get +Z" + }, + "results": [ + { + "typeid": "{72B9409A-7D1A-4831-9CFE-FCB3FADD3426}", + "details": { + "name": "+Z" + } + } + ] + }, + { + "key": "GetYPositive", + "details": { + "name": "Get +Y" + }, + "results": [ + { + "typeid": "{72B9409A-7D1A-4831-9CFE-FCB3FADD3426}", + "details": { + "name": "+Y" + } + } + ] + }, + { + "key": "GetXNegative", + "details": { + "name": "Get -X" + }, + "results": [ + { + "typeid": "{72B9409A-7D1A-4831-9CFE-FCB3FADD3426}", + "details": { + "name": "-X" + } + } + ] + }, + { + "key": "GetXPositive", + "details": { + "name": "Get +X" + }, + "results": [ + { + "typeid": "{72B9409A-7D1A-4831-9CFE-FCB3FADD3426}", + "details": { + "name": "+X" + } + } + ] + }, + { + "key": "GetYNegative", + "details": { + "name": "Get -Y" + }, + "results": [ + { + "typeid": "{72B9409A-7D1A-4831-9CFE-FCB3FADD3426}", + "details": { + "name": "-Y" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/BlastActorData.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/BlastActorData.names new file mode 100644 index 0000000000..a63a0541e0 --- /dev/null +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/BlastActorData.names @@ -0,0 +1,105 @@ +{ + "entries": [ + { + "key": "BlastActorData", + "context": "BehaviorClass", + "variant": "", + "details": { + "name": "Actor Data", + "category": "Blast" + }, + "methods": [ + { + "key": "GetEntityId", + "details": { + "name": "Get Entity Id" + }, + "params": [ + { + "typeid": "{A23453D5-79A8-49C8-B9F0-9CC35D711DD4}", + "details": { + "name": "Blast Actor Data*", + "tooltip": "Represents Blast Actor in a Script Canvas friendly format." + } + } + ], + "results": [ + { + "typeid": "{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}", + "details": { + "name": "Entity Id", + "tooltip": "Entity Unique Id" + } + } + ] + }, + { + "key": "SetEntityId", + "details": { + "name": "Set Entity Id" + }, + "params": [ + { + "typeid": "{A23453D5-79A8-49C8-B9F0-9CC35D711DD4}", + "details": { + "name": "Blast Actor Data*", + "tooltip": "Represents Blast Actor in a Script Canvas friendly format." + } + }, + { + "typeid": "{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}", + "details": { + "name": "Entity Id", + "tooltip": "Entity Unique Id" + } + } + ] + }, + { + "key": "GetIsStatic", + "details": { + "name": "Get Is Static" + }, + "params": [ + { + "typeid": "{A23453D5-79A8-49C8-B9F0-9CC35D711DD4}", + "details": { + "name": "Blast Actor Data*", + "tooltip": "Represents Blast Actor in a Script Canvas friendly format." + } + } + ], + "results": [ + { + "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", + "details": { + "name": "Is Static" + } + } + ] + }, + { + "key": "SetIsStatic", + "details": { + "name": "Set Is Static" + }, + "params": [ + { + "typeid": "{A23453D5-79A8-49C8-B9F0-9CC35D711DD4}", + "details": { + "name": "Blast Actor Data*", + "tooltip": "Represents Blast Actor in a Script Canvas friendly format." + } + }, + { + "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", + "details": { + "name": "Is Static" + } + } + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/BlendShapeData.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/BlendShapeData.names index f450864610..9dd686a898 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/BlendShapeData.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/BlendShapeData.names @@ -5,7 +5,7 @@ "context": "BehaviorClass", "variant": "", "details": { - "name": "BlendShapeData" + "name": "Blend Shape Data" }, "methods": [ { @@ -13,33 +13,32 @@ "context": "BlendShapeData", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetUV" + "tooltip": "When signaled, this will invoke Get UV" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetUV is invoked" + "tooltip": "Signaled after Get UV is invoked" }, "details": { - "name": "BlendShapeData::GetUV", - "category": "Other" + "name": "Get UV" }, "params": [ { "typeid": "{FF875C22-2E4F-4CE3-BA49-09BF78C70A09}", "details": { - "name": "BlendShapeData*" + "name": "Blend Shape Data" } }, { "typeid": "{43DA906B-7DEF-4CA8-9790-854106D3F983}", "details": { - "name": "unsigned int" + "name": "Vertex Index" } }, { "typeid": "{43DA906B-7DEF-4CA8-9790-854106D3F983}", "details": { - "name": "unsigned int" + "name": "UV Set Index" } } ], @@ -47,7 +46,7 @@ { "typeid": "{3D80F623-C85C-4741-90D0-E4E66164E6BF}", "details": { - "name": "const Vector2&" + "name": "UV" } } ] @@ -57,27 +56,26 @@ "context": "BlendShapeData", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetTangent" + "tooltip": "When signaled, this will invoke Get Tangent" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetTangent is invoked" + "tooltip": "Signaled after Get Tangent is invoked" }, "details": { - "name": "BlendShapeData::GetTangent", - "category": "Other" + "name": "Get Tangent" }, "params": [ { "typeid": "{FF875C22-2E4F-4CE3-BA49-09BF78C70A09}", "details": { - "name": "const BlendShapeData&" + "name": "Blend Shape Data" } }, { "typeid": "{D6597933-47CD-4FC8-B911-63F3E2B0993A}", "details": { - "name": "AZ::u64" + "name": "Index" } } ], @@ -85,7 +83,7 @@ { "typeid": "{0CE9FA36-1E3A-4C06-9254-B7C73A732053}", "details": { - "name": "Vector4" + "name": "Tangents" } } ] @@ -95,27 +93,26 @@ "context": "BlendShapeData", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetBitangent" + "tooltip": "When signaled, this will invoke Get Bitangent" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetBitangent is invoked" + "tooltip": "Signaled after Get Bitangent is invoked" }, "details": { - "name": "BlendShapeData::GetBitangent", - "category": "Other" + "name": "Get Bi-Tangent" }, "params": [ { "typeid": "{FF875C22-2E4F-4CE3-BA49-09BF78C70A09}", "details": { - "name": "const BlendShapeData&" + "name": "Blend Shape Data" } }, { "typeid": "{D6597933-47CD-4FC8-B911-63F3E2B0993A}", "details": { - "name": "AZ::u64" + "name": "Index" } } ], @@ -123,7 +120,7 @@ { "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}", "details": { - "name": "Vector3" + "name": "Bi-Tangent" } } ] @@ -133,33 +130,32 @@ "context": "BlendShapeData", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetColor" + "tooltip": "When signaled, this will invoke Get Color" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetColor is invoked" + "tooltip": "Signaled after Get Color is invoked" }, "details": { - "name": "BlendShapeData::GetColor", - "category": "Other" + "name": "Get Color" }, "params": [ { "typeid": "{FF875C22-2E4F-4CE3-BA49-09BF78C70A09}", "details": { - "name": "const BlendShapeData&" + "name": "Blend Shape Data" } }, { "typeid": "{72B9409A-7D1A-4831-9CFE-FCB3FADD3426}", "details": { - "name": "unsigned char" + "name": "Color Set Index" } }, { "typeid": "{72B9409A-7D1A-4831-9CFE-FCB3FADD3426}", "details": { - "name": "unsigned char" + "name": "Color Index" } } ], @@ -167,7 +163,7 @@ { "typeid": "{937E3BF8-5204-4D40-A8DA-C8F083C89F9F}", "details": { - "name": "SceneAPI::DataTypes::Color" + "name": "Color" } } ] diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/BlendShapeDataFace.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/BlendShapeDataFace.names index 2d4d4c2f92..c66094da05 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/BlendShapeDataFace.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/BlendShapeDataFace.names @@ -5,7 +5,7 @@ "context": "BehaviorClass", "variant": "", "details": { - "name": "BlendShapeDataFace" + "name": "Blend Shape Data Face" }, "methods": [ { @@ -13,27 +13,26 @@ "context": "BlendShapeDataFace", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetVertexIndex" + "tooltip": "When signaled, this will invoke Get Vertex Index" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetVertexIndex is invoked" + "tooltip": "Signaled after Get Vertex Index is invoked" }, "details": { - "name": "BlendShapeDataFace::GetVertexIndex", - "category": "Other" + "name": "Get Vertex Index" }, "params": [ { "typeid": "{C972EC9A-3A5C-47CD-9A92-ECB4C0C0451C}", "details": { - "name": "const SceneAPI::DataTypes::IBlendShapeData::Face&" + "name": "Blend Shape Data Face" } }, { "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", "details": { - "name": "int" + "name": "Face Index" } } ], @@ -41,7 +40,7 @@ { "typeid": "{43DA906B-7DEF-4CA8-9790-854106D3F983}", "details": { - "name": "unsigned int" + "name": "Vertex Index" } } ] diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/BoxShapeConfig.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/BoxShapeConfig.names index b5cad7c12d..33fa703a22 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/BoxShapeConfig.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/BoxShapeConfig.names @@ -5,8 +5,54 @@ "context": "BehaviorClass", "variant": "", "details": { - "name": "BoxShapeConfig" - } + "name": "Box Shape Config" + }, + "methods": [ + { + "key": "GetDimensions", + "details": { + "name": "Get Dimensions" + }, + "params": [ + { + "typeid": "{F034FBA2-AC2F-4E66-8152-14DFB90D6283}", + "details": { + "name": "Box Shape Config", + "tooltip": "Box shape configuration parameters" + } + } + ], + "results": [ + { + "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}", + "details": { + "name": "Dimensions" + } + } + ] + }, + { + "key": "SetDimensions", + "details": { + "name": "Set Dimensions" + }, + "params": [ + { + "typeid": "{F034FBA2-AC2F-4E66-8152-14DFB90D6283}", + "details": { + "name": "Box Shape Config", + "tooltip": "Box shape configuration parameters" + } + }, + { + "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}", + "details": { + "name": "Dimensions" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/CapsuleShapeConfig.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/CapsuleShapeConfig.names index 5172f2b9b9..3720501b2c 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/CapsuleShapeConfig.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/CapsuleShapeConfig.names @@ -5,8 +5,98 @@ "context": "BehaviorClass", "variant": "", "details": { - "name": "CapsuleShapeConfig" - } + "name": "Capsule Shape Config" + }, + "methods": [ + { + "key": "GetHeight", + "details": { + "name": "Get Height" + }, + "params": [ + { + "typeid": "{00931AEB-2AD8-42CE-B1DC-FA4332F51501}", + "details": { + "name": "Capsule Shape Config", + "tooltip": "Capsule shape configuration parameters" + } + } + ], + "results": [ + { + "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", + "details": { + "name": "Height" + } + } + ] + }, + { + "key": "SetHeight", + "details": { + "name": "Set Height" + }, + "params": [ + { + "typeid": "{00931AEB-2AD8-42CE-B1DC-FA4332F51501}", + "details": { + "name": "Capsule Shape Config", + "tooltip": "Capsule shape configuration parameters" + } + }, + { + "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", + "details": { + "name": "Height" + } + } + ] + }, + { + "key": "GetRadius", + "details": { + "name": "Get Radius" + }, + "params": [ + { + "typeid": "{00931AEB-2AD8-42CE-B1DC-FA4332F51501}", + "details": { + "name": "Capsule Shape Config", + "tooltip": "Capsule shape configuration parameters" + } + } + ], + "results": [ + { + "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", + "details": { + "name": "Radius" + } + } + ] + }, + { + "key": "SetRadius", + "details": { + "name": "Set Radius" + }, + "params": [ + { + "typeid": "{00931AEB-2AD8-42CE-B1DC-FA4332F51501}", + "details": { + "name": "Capsule Shape Config", + "tooltip": "Capsule shape configuration parameters" + } + }, + { + "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", + "details": { + "name": "Radius" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/Contact.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/Contact.names index 068759089b..0e0e29f073 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/Contact.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/Contact.names @@ -6,7 +6,177 @@ "variant": "", "details": { "name": "Contact" - } + }, + "methods": [ + { + "key": "GetPosition", + "details": { + "name": "Get Position" + }, + "params": [ + { + "typeid": "{D7439508-ED10-4395-9D48-1FC3D7815361}", + "details": { + "name": "Contact" + } + } + ], + "results": [ + { + "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}", + "details": { + "name": "Position" + } + } + ] + }, + { + "key": "SetPosition", + "details": { + "name": "Set Position" + }, + "params": [ + { + "typeid": "{D7439508-ED10-4395-9D48-1FC3D7815361}", + "details": { + "name": "Contact" + } + }, + { + "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}", + "details": { + "name": "Position" + } + } + ] + }, + { + "key": "GetNormal", + "details": { + "name": "Get Normal" + }, + "params": [ + { + "typeid": "{D7439508-ED10-4395-9D48-1FC3D7815361}", + "details": { + "name": "Contact" + } + } + ], + "results": [ + { + "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}", + "details": { + "name": "Normal" + } + } + ] + }, + { + "key": "SetNormal", + "details": { + "name": "Set Normal" + }, + "params": [ + { + "typeid": "{D7439508-ED10-4395-9D48-1FC3D7815361}", + "details": { + "name": "Contact" + } + }, + { + "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}", + "details": { + "name": "Normal" + } + } + ] + }, + { + "key": "GetImpulse", + "details": { + "name": "Get Impulse" + }, + "params": [ + { + "typeid": "{D7439508-ED10-4395-9D48-1FC3D7815361}", + "details": { + "name": "Contact" + } + } + ], + "results": [ + { + "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}", + "details": { + "name": "Impulse" + } + } + ] + }, + { + "key": "SetImpulse", + "details": { + "name": "Set Impulse" + }, + "params": [ + { + "typeid": "{D7439508-ED10-4395-9D48-1FC3D7815361}", + "details": { + "name": "Contact" + } + }, + { + "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}", + "details": { + "name": "Impulse" + } + } + ] + }, + { + "key": "GetSeparation", + "details": { + "name": "Get Separation" + }, + "params": [ + { + "typeid": "{D7439508-ED10-4395-9D48-1FC3D7815361}", + "details": { + "name": "Contact" + } + } + ], + "results": [ + { + "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", + "details": { + "name": "Separation" + } + } + ] + }, + { + "key": "SetSeparation", + "details": { + "name": "Set Separation" + }, + "params": [ + { + "typeid": "{D7439508-ED10-4395-9D48-1FC3D7815361}", + "details": { + "name": "Contact" + } + }, + { + "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", + "details": { + "name": "Separation" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/CylinderShapeConfig.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/CylinderShapeConfig.names index 633933e188..35503ee625 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/CylinderShapeConfig.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/CylinderShapeConfig.names @@ -5,8 +5,98 @@ "context": "BehaviorClass", "variant": "", "details": { - "name": "CylinderShapeConfig" - } + "name": "Cylinder Shape Config" + }, + "methods": [ + { + "key": "GetHeight", + "details": { + "name": "Get Height" + }, + "params": [ + { + "typeid": "{53254779-82F1-441E-9116-81E1FACFECF4}", + "details": { + "name": "Cylinder Shape Config", + "tooltip": "Cylinder shape configuration parameters" + } + } + ], + "results": [ + { + "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", + "details": { + "name": "Height" + } + } + ] + }, + { + "key": "SetHeight", + "details": { + "name": "Set Height" + }, + "params": [ + { + "typeid": "{53254779-82F1-441E-9116-81E1FACFECF4}", + "details": { + "name": "Cylinder Shape Config", + "tooltip": "Cylinder shape configuration parameters" + } + }, + { + "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", + "details": { + "name": "Height" + } + } + ] + }, + { + "key": "GetRadius", + "details": { + "name": "Get Radius" + }, + "params": [ + { + "typeid": "{53254779-82F1-441E-9116-81E1FACFECF4}", + "details": { + "name": "Cylinder Shape Config", + "tooltip": "Cylinder shape configuration parameters" + } + } + ], + "results": [ + { + "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", + "details": { + "name": "Radius" + } + } + ] + }, + { + "key": "SetRadius", + "details": { + "name": "Set Radius" + }, + "params": [ + { + "typeid": "{53254779-82F1-441E-9116-81E1FACFECF4}", + "details": { + "name": "Cylinder Shape Config", + "tooltip": "Cylinder shape configuration parameters" + } + }, + { + "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", + "details": { + "name": "Radius" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/InputEventNotificationId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/InputEventNotificationId.names index e964bd2518..7ba42921f1 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/InputEventNotificationId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/InputEventNotificationId.names @@ -5,8 +5,8 @@ "context": "BehaviorClass", "variant": "", "details": { - "name": "Input Event Notification ID", - "category": "Gameplay/Input" + "name": "Input", + "category": "Gameplay" }, "methods": [ { @@ -14,21 +14,20 @@ "context": "InputEventNotificationId", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke ToString" + "tooltip": "When signaled, this will invoke To String" }, "exit": { "name": "Out", - "tooltip": "Signaled after ToString is invoked" + "tooltip": "Signaled after To String is invoked" }, "details": { - "name": "InputEventNotificationId::ToString", - "category": "Gameplay/Input" + "name": "To String" }, "params": [ { "typeid": "{9E0F0801-348B-4FF9-AF9B-858D59404968}", "details": { - "name": "InputEventNotificationId*" + "name": "Input Event Notification Id" } } ], @@ -53,20 +52,19 @@ "tooltip": "Signaled after Equal is invoked" }, "details": { - "name": "InputEventNotificationId::Equal", - "category": "Gameplay/Input" + "name": "Equal" }, "params": [ { "typeid": "{9E0F0801-348B-4FF9-AF9B-858D59404968}", "details": { - "name": "InputEventNotificationId*" + "name": "Input Event Notification Id" } }, { "typeid": "{9E0F0801-348B-4FF9-AF9B-858D59404968}", "details": { - "name": "const InputEventNotificationId&" + "name": "Input Event Notification Id" } } ], @@ -74,7 +72,7 @@ { "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", "details": { - "name": "Boolean" + "name": "Equal" } } ] @@ -91,14 +89,13 @@ "tooltip": "Signaled after Clone is invoked" }, "details": { - "name": "InputEventNotificationId::Clone", - "category": "Gameplay/Input" + "name": "Clone" }, "params": [ { "typeid": "{9E0F0801-348B-4FF9-AF9B-858D59404968}", "details": { - "name": "InputEventNotificationId*" + "name": "Input Event Notification Id" } } ], @@ -106,7 +103,7 @@ { "typeid": "{9E0F0801-348B-4FF9-AF9B-858D59404968}", "details": { - "name": "InputEventNotificationID" + "name": "Input Event Notification Id" } } ] @@ -116,29 +113,26 @@ "context": "InputEventNotificationId", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke CreateInputEventNotificationId" + "tooltip": "When signaled, this will invoke Create Input Event Notification Id" }, "exit": { "name": "Out", - "tooltip": "Signaled after CreateInputEventNotificationId is invoked" + "tooltip": "Signaled after Create Input Event Notification Id is invoked" }, "details": { - "name": "InputEventNotificationId::CreateInputEventNotificationId", - "category": "Gameplay/Input" + "name": "Create Input Event Notification Id" }, "params": [ { "typeid": "{43DA906B-7DEF-4CA8-9790-854106D3F983}", "details": { - "name": "localUserId", - "tooltip": "Local user ID (0-3, or -1 for all users)" + "name": "Local User Id" } }, { "typeid": "{7114E998-A8B4-519B-9342-A86D1587B4F7}", "details": { - "name": "actionName", - "tooltip": "The name of the Input event action" + "name": "Value" } } ], @@ -146,7 +140,111 @@ { "typeid": "{9E0F0801-348B-4FF9-AF9B-858D59404968}", "details": { - "name": "InputEventNotificationID" + "name": "Input Event Notification Id" + } + } + ] + }, + { + "key": "GetactionNameCrc", + "details": { + "name": "Get Action Name Tag" + }, + "params": [ + { + "typeid": "{9E0F0801-348B-4FF9-AF9B-858D59404968}", + "details": { + "name": "Input Event Notification Id" + } + } + ], + "results": [ + { + "typeid": "{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}", + "details": { + "name": "Tag" + } + } + ] + }, + { + "key": "SetactionNameCrc", + "details": { + "name": "Set Action Name Tag" + }, + "params": [ + { + "typeid": "{9E0F0801-348B-4FF9-AF9B-858D59404968}", + "details": { + "name": "Input Event Notification Id" + } + }, + { + "typeid": "{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}", + "details": { + "name": "Tag" + } + } + ] + }, + { + "key": "GetlocalUserId", + "details": { + "name": "Get Local User Id" + }, + "params": [ + { + "typeid": "{9E0F0801-348B-4FF9-AF9B-858D59404968}", + "details": { + "name": "Input Event Notification Id" + } + } + ], + "results": [ + { + "typeid": "{43DA906B-7DEF-4CA8-9790-854106D3F983}", + "details": { + "name": "Local User Id" + } + } + ] + }, + { + "key": "SetlocalUserId", + "details": { + "name": "Set Local User Id" + }, + "params": [ + { + "typeid": "{9E0F0801-348B-4FF9-AF9B-858D59404968}", + "details": { + "name": "Input Event Notification Id" + } + }, + { + "typeid": "{43DA906B-7DEF-4CA8-9790-854106D3F983}", + "details": { + "name": "Local User Id" + } + } + ] + }, + { + "key": "SetactionName", + "details": { + "name": "Set Action Name" + }, + "params": [ + { + "typeid": "{9E0F0801-348B-4FF9-AF9B-858D59404968}", + "details": { + "name": "Input Event Notification Id" + } + }, + { + "typeid": "{7114E998-A8B4-519B-9342-A86D1587B4F7}", + "details": { + "name": "Action Name" } } ] diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/PhysicsSystemInterface.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/PhysicsSystemInterface.names index 84b24aa2b2..feaa908787 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/PhysicsSystemInterface.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/PhysicsSystemInterface.names @@ -14,14 +14,14 @@ "context": "PhysicsSystemInterface", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke Get On Presimulate Event" + "tooltip": "When signaled, this will invoke Get On Pre Simulate Event" }, "exit": { "name": "Out", - "tooltip": "Signaled after Get On Presimulate Event is invoked" + "tooltip": "Signaled after Get On Pre Simulate Event is invoked" }, "details": { - "name": "Get On Presimulate Event" + "name": "Get On Pre Simulate Event" }, "results": [ { @@ -37,14 +37,14 @@ "context": "PhysicsSystemInterface", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke Get On Postsimulate Event" + "tooltip": "When signaled, this will invoke Get On Post Simulate Event" }, "exit": { "name": "Out", - "tooltip": "Signaled after Get On Postsimulate Event is invoked" + "tooltip": "Signaled after Get On Post Simulate Event is invoked" }, "details": { - "name": "Get On Postsimulate Event" + "name": "Get On Post Simulate Event" }, "results": [ { @@ -73,7 +73,7 @@ { "typeid": "{B6F4D92A-061B-4CB3-AAB5-984B599A53AE}", "details": { - "name": "Interface" + "name": "System Interface" } }, { @@ -110,7 +110,7 @@ { "typeid": "{B6F4D92A-061B-4CB3-AAB5-984B599A53AE}", "details": { - "name": "Interface" + "name": "System Interface" } }, { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SceneGraphName.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SceneGraphName.names index f3bb103ae3..114882360c 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SceneGraphName.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SceneGraphName.names @@ -5,7 +5,8 @@ "context": "BehaviorClass", "variant": "", "details": { - "name": "SceneGraphName" + "name": "Scene Graph Name", + "category": "Scene Graph" }, "methods": [ { @@ -13,21 +14,20 @@ "context": "SceneGraphName", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetPath" + "tooltip": "When signaled, this will invoke Get Path" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetPath is invoked" + "tooltip": "Signaled after Get Path is invoked" }, "details": { - "name": "SceneGraphName::GetPath", - "category": "Other" + "name": "Get Path" }, "params": [ { "typeid": "{4077AC3C-B301-4F5A-BEA7-54D6511AEC2E}", "details": { - "name": "AZ::SceneAPI::Containers::SceneGraph::Name*" + "name": "Scene Graph Name" } } ], @@ -35,7 +35,7 @@ { "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", "details": { - "name": "const char*" + "name": "Path" } } ] @@ -45,21 +45,20 @@ "context": "SceneGraphName", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetName" + "tooltip": "When signaled, this will invoke Get Name" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetName is invoked" + "tooltip": "Signaled after Get Name is invoked" }, "details": { - "name": "SceneGraphName::GetName", - "category": "Other" + "name": "Get Name" }, "params": [ { "typeid": "{4077AC3C-B301-4F5A-BEA7-54D6511AEC2E}", "details": { - "name": "AZ::SceneAPI::Containers::SceneGraph::Name*" + "name": "Scene Graph Name" } } ], @@ -67,7 +66,7 @@ { "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", "details": { - "name": "const char*" + "name": "Name" } } ] @@ -77,21 +76,20 @@ "context": "SceneGraphName", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke ToString" + "tooltip": "When signaled, this will invoke To String" }, "exit": { "name": "Out", - "tooltip": "Signaled after ToString is invoked" + "tooltip": "Signaled after To String is invoked" }, "details": { - "name": "SceneGraphName::ToString", - "category": "Other" + "name": "To String" }, "params": [ { "typeid": "{4077AC3C-B301-4F5A-BEA7-54D6511AEC2E}", "details": { - "name": "const AZ::SceneAPI::Containers::SceneGraph::Name&" + "name": "Scene Graph Name" } } ], @@ -99,7 +97,7 @@ { "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", "details": { - "name": "const char*" + "name": "String" } } ] diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SliceInstantiationTicket.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SliceInstantiationTicket.names index b9edb1cfa1..ba49c58119 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SliceInstantiationTicket.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SliceInstantiationTicket.names @@ -5,8 +5,7 @@ "context": "BehaviorClass", "variant": "", "details": { - "name": "Slice Instantiation Ticket", - "category": "Gameplay" + "name": "Slice Instantiation Ticket" }, "methods": [ { @@ -21,20 +20,19 @@ "tooltip": "Signaled after Equal is invoked" }, "details": { - "name": "SliceInstantiationTicket::Equal", - "category": "Gameplay" + "name": "Equal" }, "params": [ { "typeid": "{E6E7C0C5-07C9-44BB-A38C-930431948667}", "details": { - "name": "SliceInstantiationTicket*" + "name": "Slice Instantiation Ticket*" } }, { "typeid": "{E6E7C0C5-07C9-44BB-A38C-930431948667}", "details": { - "name": "const SliceInstantiationTicket&" + "name": "const Slice Instantiation Ticket&" } } ], @@ -42,7 +40,7 @@ { "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", "details": { - "name": "Boolean" + "name": "Equal" } } ] @@ -52,21 +50,20 @@ "context": "SliceInstantiationTicket", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke ToString" + "tooltip": "When signaled, this will invoke To String" }, "exit": { "name": "Out", - "tooltip": "Signaled after ToString is invoked" + "tooltip": "Signaled after To String is invoked" }, "details": { - "name": "SliceInstantiationTicket::ToString", - "category": "Gameplay" + "name": "To String" }, "params": [ { "typeid": "{E6E7C0C5-07C9-44BB-A38C-930431948667}", "details": { - "name": "SliceInstantiationTicket*" + "name": "Slice Instantiation Ticket*" } } ], @@ -74,7 +71,7 @@ { "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", "details": { - "name": "AZStd::basic_string, allocator>" + "name": "String" } } ] @@ -84,21 +81,20 @@ "context": "SliceInstantiationTicket", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke IsValid" + "tooltip": "When signaled, this will invoke Is Valid" }, "exit": { "name": "Out", - "tooltip": "Signaled after IsValid is invoked" + "tooltip": "Signaled after Is Valid is invoked" }, "details": { - "name": "SliceInstantiationTicket::IsValid", - "category": "Gameplay" + "name": "Is Valid" }, "params": [ { "typeid": "{E6E7C0C5-07C9-44BB-A38C-930431948667}", "details": { - "name": "SliceInstantiationTicket*" + "name": "Slice Instantiation Ticket*" } } ], @@ -106,7 +102,7 @@ { "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", "details": { - "name": "Boolean" + "name": "Is Valid" } } ] diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/UVCoords.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/UVCoords.names index 57abfbff4b..9872b76aa1 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/UVCoords.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/UVCoords.names @@ -6,7 +6,7 @@ "variant": "", "details": { "name": "UV Coords", - "category": "UI/LyShine Examples" + "category": "UI/UI Examples" }, "methods": [ { @@ -14,50 +14,44 @@ "context": "UVCoords", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetUVCoords" + "tooltip": "When signaled, this will invoke SetUV Coords" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetUVCoords is invoked" + "tooltip": "Signaled after SetUV Coords is invoked" }, "details": { - "name": "UVCoords::SetUVCoords", - "category": "UI/LyShine Examples" + "name": "Set UV Coords" }, "params": [ { "typeid": "{E134EAE8-52A1-4E43-847B-09E546CC5B95}", "details": { - "name": "UV Coords", - "tooltip": "The UV coordinates to set" + "name": "UV Rect" } }, { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", "details": { - "name": "Left", - "tooltip": "The lower X UV coordinate [0-1]" + "name": "Left" } }, { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", "details": { - "name": "Top", - "tooltip": "The higher Y UV coordinate [0-1]" + "name": "Top" } }, { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", "details": { - "name": "Right", - "tooltip": "The higher X UV coordinate [0-1]" + "name": "Right" } }, { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", "details": { - "name": "Bottom", - "tooltip": "The lower Y UV coordinate [0-1]" + "name": "Bottom" } } ] @@ -67,29 +61,26 @@ "context": "UVCoords", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetBottom" + "tooltip": "When signaled, this will invoke Set Bottom" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetBottom is invoked" + "tooltip": "Signaled after Set Bottom is invoked" }, "details": { - "name": "UVCoords::SetBottom", - "category": "UI/LyShine Examples" + "name": "Set Bottom" }, "params": [ { "typeid": "{E134EAE8-52A1-4E43-847B-09E546CC5B95}", "details": { - "name": "UV Coords", - "tooltip": "The UV coordinates to set" + "name": "UV Rect" } }, { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", "details": { - "name": "Bottom", - "tooltip": "The lower Y UV coordinate [0-1]" + "name": "Bottom" } } ] @@ -99,29 +90,26 @@ "context": "UVCoords", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetRight" + "tooltip": "When signaled, this will invoke Set Right" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetRight is invoked" + "tooltip": "Signaled after Set Right is invoked" }, "details": { - "name": "UVCoords::SetRight", - "category": "UI/LyShine Examples" + "name": "Set Right" }, "params": [ { "typeid": "{E134EAE8-52A1-4E43-847B-09E546CC5B95}", "details": { - "name": "UV Coords", - "tooltip": "The UV coordinates to set" + "name": "UV Rect" } }, { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", "details": { - "name": "Right", - "tooltip": "The higher X UV coordinate [0-1]" + "name": "Right" } } ] @@ -131,29 +119,26 @@ "context": "UVCoords", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetTop" + "tooltip": "When signaled, this will invoke Set Top" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetTop is invoked" + "tooltip": "Signaled after Set Top is invoked" }, "details": { - "name": "UVCoords::SetTop", - "category": "UI/LyShine Examples" + "name": "Set Top" }, "params": [ { "typeid": "{E134EAE8-52A1-4E43-847B-09E546CC5B95}", "details": { - "name": "UV Coords", - "tooltip": "The UV coordinates to set" + "name": "UV Rect" } }, { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", "details": { - "name": "Top", - "tooltip": "The higher Y UV coordinate [0-1]" + "name": "Top" } } ] @@ -163,29 +148,194 @@ "context": "UVCoords", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetLeft" + "tooltip": "When signaled, this will invoke Set Left" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetLeft is invoked" + "tooltip": "Signaled after Set Left is invoked" }, "details": { - "name": "UVCoords::SetLeft", - "category": "UI/LyShine Examples" + "name": "Set Left" }, "params": [ { "typeid": "{E134EAE8-52A1-4E43-847B-09E546CC5B95}", "details": { - "name": "UV Coords", - "tooltip": "The UV coordinates to set" + "name": "UV Rect" } }, { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", "details": { - "name": "Left", - "tooltip": "Sets the lower X UV coordinate [0-1]" + "name": "Left" + } + } + ] + }, + { + "key": "Getleft", + "details": { + "name": "Left" + }, + "params": [ + { + "typeid": "{E134EAE8-52A1-4E43-847B-09E546CC5B95}", + "details": { + "name": "UV Rect" + } + } + ], + "results": [ + { + "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", + "details": { + "name": "Left" + } + } + ] + }, + { + "key": "Setleft", + "details": { + "name": "Set Left" + }, + "params": [ + { + "typeid": "{E134EAE8-52A1-4E43-847B-09E546CC5B95}", + "details": { + "name": "UV Rect" + } + }, + { + "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", + "details": { + "name": "Left" + } + } + ] + }, + { + "key": "Gettop", + "details": { + "name": "Top" + }, + "params": [ + { + "typeid": "{E134EAE8-52A1-4E43-847B-09E546CC5B95}", + "details": { + "name": "UV Rect" + } + } + ], + "results": [ + { + "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", + "details": { + "name": "Top" + } + } + ] + }, + { + "key": "Settop", + "details": { + "name": "Set Top" + }, + "params": [ + { + "typeid": "{E134EAE8-52A1-4E43-847B-09E546CC5B95}", + "details": { + "name": "UV Rect" + } + }, + { + "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", + "details": { + "name": "Top" + } + } + ] + }, + { + "key": "Getright", + "details": { + "name": "Get Right" + }, + "params": [ + { + "typeid": "{E134EAE8-52A1-4E43-847B-09E546CC5B95}", + "details": { + "name": "UV Rect" + } + } + ], + "results": [ + { + "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", + "details": { + "name": "Right" + } + } + ] + }, + { + "key": "Setright", + "details": { + "name": "Set Right" + }, + "params": [ + { + "typeid": "{E134EAE8-52A1-4E43-847B-09E546CC5B95}", + "details": { + "name": "UV Rect" + } + }, + { + "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", + "details": { + "name": "Right" + } + } + ] + }, + { + "key": "Getbottom", + "details": { + "name": "Get Bottom" + }, + "params": [ + { + "typeid": "{E134EAE8-52A1-4E43-847B-09E546CC5B95}", + "details": { + "name": "UV Rect" + } + } + ], + "results": [ + { + "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", + "details": { + "name": "Bottom" + } + } + ] + }, + { + "key": "Setbottom", + "details": { + "name": "Bottom" + }, + "params": [ + { + "typeid": "{E134EAE8-52A1-4E43-847B-09E546CC5B95}", + "details": { + "name": "UV Rect" + } + }, + { + "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", + "details": { + "name": "Bottom" } } ] diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/UiAnchors.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/UiAnchors.names index 9adfa70b6e..ce779a7f83 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/UiAnchors.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/UiAnchors.names @@ -5,7 +5,7 @@ "context": "BehaviorClass", "variant": "", "details": { - "name": "UiAnchors" + "name": "Ui Anchors" }, "methods": [ { @@ -13,21 +13,20 @@ "context": "UiAnchors", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetBottom" + "tooltip": "When signaled, this will invoke Set Bottom" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetBottom is invoked" + "tooltip": "Signaled after Set Bottom is invoked" }, "details": { - "name": "UiAnchors::SetBottom", - "category": "Other" + "name": "Set Bottom" }, "params": [ { "typeid": "{65D4346C-FB16-4CB0-9BDC-1185B122C4A9}", "details": { - "name": "Anchors*" + "name": "Anchors" } }, { @@ -43,21 +42,20 @@ "context": "UiAnchors", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetRight" + "tooltip": "When signaled, this will invoke Set Right" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetRight is invoked" + "tooltip": "Signaled after Set Right is invoked" }, "details": { - "name": "UiAnchors::SetRight", - "category": "Other" + "name": "Set Right" }, "params": [ { "typeid": "{65D4346C-FB16-4CB0-9BDC-1185B122C4A9}", "details": { - "name": "Anchors*" + "name": "Anchors" } }, { @@ -73,21 +71,20 @@ "context": "UiAnchors", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetTop" + "tooltip": "When signaled, this will invoke Set Top" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetTop is invoked" + "tooltip": "Signaled after Set Top is invoked" }, "details": { - "name": "UiAnchors::SetTop", - "category": "Other" + "name": "Set Top" }, "params": [ { "typeid": "{65D4346C-FB16-4CB0-9BDC-1185B122C4A9}", "details": { - "name": "Anchors*" + "name": "Anchors" } }, { @@ -103,21 +100,20 @@ "context": "UiAnchors", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetLeft" + "tooltip": "When signaled, this will invoke Set Left" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetLeft is invoked" + "tooltip": "Signaled after Set Left is invoked" }, "details": { - "name": "UiAnchors::SetLeft", - "category": "Other" + "name": "Set Left" }, "params": [ { "typeid": "{65D4346C-FB16-4CB0-9BDC-1185B122C4A9}", "details": { - "name": "Anchors*" + "name": "Anchors" } }, { @@ -133,21 +129,20 @@ "context": "UiAnchors", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetAnchors" + "tooltip": "When signaled, this will invoke Set Anchors" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetAnchors is invoked" + "tooltip": "Signaled after Set Anchors is invoked" }, "details": { - "name": "UiAnchors::SetAnchors", - "category": "Other" + "name": "Set Anchors" }, "params": [ { "typeid": "{65D4346C-FB16-4CB0-9BDC-1185B122C4A9}", "details": { - "name": "Anchors*" + "name": "Anchors" } }, { @@ -177,15 +172,15 @@ ] }, { - "key": "left", + "key": "Getleft", "details": { - "name": "UiAnchors::left::Getter" + "name": "Getleft" }, "params": [ { "typeid": "{65D4346C-FB16-4CB0-9BDC-1185B122C4A9}", "details": { - "name": "Anchors*" + "name": "" } } ], @@ -193,41 +188,41 @@ { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", "details": { - "name": "float&" + "name": "" } } ] }, { - "key": "left", + "key": "Setleft", "details": { - "name": "UiAnchors::left::Setter" + "name": "Setleft" }, "params": [ { "typeid": "{65D4346C-FB16-4CB0-9BDC-1185B122C4A9}", "details": { - "name": "Anchors*" + "name": "" } }, { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", "details": { - "name": "const float&" + "name": "" } } ] }, { - "key": "top", + "key": "Gettop", "details": { - "name": "UiAnchors::top::Getter" + "name": "Gettop" }, "params": [ { "typeid": "{65D4346C-FB16-4CB0-9BDC-1185B122C4A9}", "details": { - "name": "Anchors*" + "name": "" } } ], @@ -235,41 +230,41 @@ { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", "details": { - "name": "float&" + "name": "" } } ] }, { - "key": "top", + "key": "Settop", "details": { - "name": "UiAnchors::top::Setter" + "name": "Settop" }, "params": [ { "typeid": "{65D4346C-FB16-4CB0-9BDC-1185B122C4A9}", "details": { - "name": "Anchors*" + "name": "" } }, { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", "details": { - "name": "const float&" + "name": "" } } ] }, { - "key": "right", + "key": "Getright", "details": { - "name": "UiAnchors::right::Getter" + "name": "Getright" }, "params": [ { "typeid": "{65D4346C-FB16-4CB0-9BDC-1185B122C4A9}", "details": { - "name": "Anchors*" + "name": "" } } ], @@ -277,41 +272,41 @@ { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", "details": { - "name": "float&" + "name": "" } } ] }, { - "key": "right", + "key": "Setright", "details": { - "name": "UiAnchors::right::Setter" + "name": "Setright" }, "params": [ { "typeid": "{65D4346C-FB16-4CB0-9BDC-1185B122C4A9}", "details": { - "name": "Anchors*" + "name": "" } }, { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", "details": { - "name": "const float&" + "name": "" } } ] }, { - "key": "bottom", + "key": "Getbottom", "details": { - "name": "UiAnchors::bottom::Getter" + "name": "Getbottom" }, "params": [ { "typeid": "{65D4346C-FB16-4CB0-9BDC-1185B122C4A9}", "details": { - "name": "Anchors*" + "name": "" } } ], @@ -319,27 +314,27 @@ { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", "details": { - "name": "float&" + "name": "" } } ] }, { - "key": "bottom", + "key": "Setbottom", "details": { - "name": "UiAnchors::bottom::Setter" + "name": "Setbottom" }, "params": [ { "typeid": "{65D4346C-FB16-4CB0-9BDC-1185B122C4A9}", "details": { - "name": "Anchors*" + "name": "" } }, { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", "details": { - "name": "const float&" + "name": "" } } ] diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/Unit Testing.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/Unit Testing.names index c5eefda46c..fde1730637 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/Unit Testing.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/Unit Testing.names @@ -20,33 +20,33 @@ "tooltip": "Signaled after ExpectLessThanEqual is invoked" }, "details": { - "name": "Unit Testing::Expect Less Than Equal", + "name": "Expect Less Than Equal", "category": "Other" }, "params": [ { "typeid": "{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}", "details": { - "name": "const EntityId&", + "name": "Entity Id", "tooltip": "Entity Unique Id" } }, { "typeid": "{110C4B14-11A8-4E9D-8638-5051013A56AC}", "details": { - "name": "double" + "name": "Candidate" } }, { "typeid": "{110C4B14-11A8-4E9D-8638-5051013A56AC}", "details": { - "name": "double" + "name": "Reference" } }, { "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", "details": { - "name": "const AZStd::basic_string, alloc" + "name": "Report" } } ] @@ -70,26 +70,26 @@ { "typeid": "{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}", "details": { - "name": "const EntityId&", + "name": "Entity Id", "tooltip": "Entity Unique Id" } }, { "typeid": "{110C4B14-11A8-4E9D-8638-5051013A56AC}", "details": { - "name": "double" + "name": "Candidate" } }, { "typeid": "{110C4B14-11A8-4E9D-8638-5051013A56AC}", "details": { - "name": "double" + "name": "Reference" } }, { "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", "details": { - "name": "const AZStd::basic_string, alloc" + "name": "Report" } } ] @@ -106,21 +106,21 @@ "tooltip": "Signaled after MarkComplete is invoked" }, "details": { - "name": "Unit Testing::Mark Complete", + "name": "Mark Complete", "category": "Other" }, "params": [ { "typeid": "{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}", "details": { - "name": "const EntityId&", + "name": "Entity Id", "tooltip": "Entity Unique Id" } }, { "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", "details": { - "name": "const AZStd::basic_string, alloc" + "name": "Report" } } ] @@ -137,27 +137,27 @@ "tooltip": "Signaled after ExpectTrue is invoked" }, "details": { - "name": "Unit Testing::Expect True", + "name": "Expect True", "category": "Other" }, "params": [ { "typeid": "{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}", "details": { - "name": "const EntityId&", + "name": "Entity Id", "tooltip": "Entity Unique Id" } }, { "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", "details": { - "name": "bool" + "name": "Candidate" } }, { "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", "details": { - "name": "const AZStd::basic_string, alloc" + "name": "Report" } } ] @@ -174,21 +174,21 @@ "tooltip": "Signaled after Checkpoint is invoked" }, "details": { - "name": "Unit Testing::Checkpoint", + "name": "Checkpoint", "category": "Other" }, "params": [ { "typeid": "{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}", "details": { - "name": "const EntityId&", + "name": "Entity Id", "tooltip": "Entity Unique Id" } }, { "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", "details": { - "name": "const AZStd::basic_string, alloc" + "name": "Report" } } ] @@ -205,27 +205,27 @@ "tooltip": "Signaled after ExpectFalse is invoked" }, "details": { - "name": "Unit Testing::Expect False", + "name": "Expect False", "category": "Other" }, "params": [ { "typeid": "{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}", "details": { - "name": "const EntityId&", + "name": "Entity Id", "tooltip": "Entity Unique Id" } }, { "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", "details": { - "name": "bool" + "name": "Candidate" } }, { "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", "details": { - "name": "const AZStd::basic_string, alloc" + "name": "Report" } } ] @@ -242,33 +242,33 @@ "tooltip": "Signaled after ExpectEqual is invoked" }, "details": { - "name": "Unit Testing::Expect Equal", + "name": "Expect Equal", "category": "Other" }, "params": [ { "typeid": "{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}", "details": { - "name": "const EntityId&", + "name": "Entity Id", "tooltip": "Entity Unique Id" } }, { "typeid": "{A54C2B36-D5B8-46A1-A529-4EBDBD2450E7}", "details": { - "name": "Aabb" + "name": "Candidate" } }, { "typeid": "{A54C2B36-D5B8-46A1-A529-4EBDBD2450E7}", "details": { - "name": "Aabb" + "name": "Reference" } }, { "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", "details": { - "name": "const AZStd::basic_string, alloc" + "name": "Report" } } ] @@ -285,33 +285,33 @@ "tooltip": "Signaled after ExpectLessThan is invoked" }, "details": { - "name": "Unit Testing::Expect Less Than", + "name": "Expect Less Than", "category": "Other" }, "params": [ { "typeid": "{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}", "details": { - "name": "const EntityId&", + "name": "Entity Id", "tooltip": "Entity Unique Id" } }, { "typeid": "{110C4B14-11A8-4E9D-8638-5051013A56AC}", "details": { - "name": "double" + "name": "Candidate" } }, { "typeid": "{110C4B14-11A8-4E9D-8638-5051013A56AC}", "details": { - "name": "double" + "name": "Reference" } }, { "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", "details": { - "name": "const AZStd::basic_string, alloc" + "name": "Report" } } ] @@ -321,28 +321,28 @@ "context": "Unit Testing", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke AddSuccess" + "tooltip": "When signaled, this will invoke Add Success" }, "exit": { "name": "Out", - "tooltip": "Signaled after AddSuccess is invoked" + "tooltip": "Signaled after Add Success is invoked" }, "details": { - "name": "Unit Testing::Add Success", + "name": "Add Success", "category": "Other" }, "params": [ { "typeid": "{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}", "details": { - "name": "const EntityId&", + "name": "Entity Id", "tooltip": "Entity Unique Id" } }, { "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", "details": { - "name": "const AZStd::basic_string, alloc" + "name": "Report" } } ] @@ -359,14 +359,14 @@ "tooltip": "Signaled after ExpectNotEqual is invoked" }, "details": { - "name": "Unit Testing::Expect Not Equal", + "name": "Expect Not Equal", "category": "Other" }, "params": [ { "typeid": "{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}", "details": { - "name": "const EntityId&", + "name": "Entity Id", "tooltip": "Entity Unique Id" } }, @@ -385,7 +385,7 @@ { "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", "details": { - "name": "const AZStd::basic_string, alloc" + "name": "Report" } } ] @@ -402,14 +402,14 @@ "tooltip": "Signaled after ExpectGreaterThan is invoked" }, "details": { - "name": "Unit Testing::Expect Greater Than", + "name": "Expect Greater Than", "category": "Other" }, "params": [ { "typeid": "{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}", "details": { - "name": "const EntityId&", + "name": "Entity Id", "tooltip": "Entity Unique Id" } }, @@ -428,7 +428,7 @@ { "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", "details": { - "name": "const AZStd::basic_string, alloc" + "name": "Report" } } ] @@ -445,21 +445,21 @@ "tooltip": "Signaled after AddFailure is invoked" }, "details": { - "name": "Unit Testing::Add Failure", + "name": "Add Failure", "category": "Other" }, "params": [ { "typeid": "{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}", "details": { - "name": "const EntityId&", + "name": "Entity Id", "tooltip": "Entity Unique Id" } }, { "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", "details": { - "name": "const AZStd::basic_string, alloc" + "name": "Report" } } ] diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/UnitTesting.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/UnitTesting.names new file mode 100644 index 0000000000..9e5a209d69 --- /dev/null +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/UnitTesting.names @@ -0,0 +1,484 @@ +{ + "entries": [ + { + "key": "Unit Testing", + "context": "BehaviorClass", + "variant": "", + "details": { + "name": "Unit Testing" + }, + "methods": [ + { + "key": "ExpectLessThanEqual", + "context": "Unit Testing", + "entry": { + "name": "In", + "tooltip": "When signaled, this will invoke Expect Less Than Equal" + }, + "exit": { + "name": "Out", + "tooltip": "Signaled after Expect Less Than Equal is invoked" + }, + "details": { + "name": "Expect Less Than Equal" + }, + "params": [ + { + "typeid": "{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}", + "details": { + "name": "Entity Id", + "tooltip": "Entity Unique Id" + } + }, + { + "typeid": "{110C4B14-11A8-4E9D-8638-5051013A56AC}", + "details": { + "name": "Candidate", + "tooltip": "left of <=" + } + }, + { + "typeid": "{110C4B14-11A8-4E9D-8638-5051013A56AC}", + "details": { + "name": "Reference", + "tooltip": "right of <=" + } + }, + { + "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", + "details": { + "name": "Report", + "tooltip": "additional notes for the test report" + } + } + ] + }, + { + "key": "ExpectGreaterThanEqual", + "context": "Unit Testing", + "entry": { + "name": "In", + "tooltip": "When signaled, this will invoke Expect Greater Than Equal" + }, + "exit": { + "name": "Out", + "tooltip": "Signaled after Expect Greater Than Equal is invoked" + }, + "details": { + "name": "Expect Greater Than Equal" + }, + "params": [ + { + "typeid": "{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}", + "details": { + "name": "Entity Id", + "tooltip": "Entity Unique Id" + } + }, + { + "typeid": "{110C4B14-11A8-4E9D-8638-5051013A56AC}", + "details": { + "name": "Candidate", + "tooltip": "left of >=" + } + }, + { + "typeid": "{110C4B14-11A8-4E9D-8638-5051013A56AC}", + "details": { + "name": "Reference", + "tooltip": "right of >=" + } + }, + { + "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", + "details": { + "name": "Report", + "tooltip": "additional notes for the test report" + } + } + ] + }, + { + "key": "MarkComplete", + "context": "Unit Testing", + "entry": { + "name": "In", + "tooltip": "When signaled, this will invoke Mark Complete" + }, + "exit": { + "name": "Out", + "tooltip": "Signaled after Mark Complete is invoked" + }, + "details": { + "name": "Mark Complete" + }, + "params": [ + { + "typeid": "{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}", + "details": { + "name": "Entity Id", + "tooltip": "Entity Unique Id" + } + }, + { + "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", + "details": { + "name": "Report", + "tooltip": "additional notes for the test report" + } + } + ] + }, + { + "key": "ExpectTrue", + "context": "Unit Testing", + "entry": { + "name": "In", + "tooltip": "When signaled, this will invoke Expect True" + }, + "exit": { + "name": "Out", + "tooltip": "Signaled after Expect True is invoked" + }, + "details": { + "name": "Expect True" + }, + "params": [ + { + "typeid": "{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}", + "details": { + "name": "Entity Id", + "tooltip": "Entity Unique Id" + } + }, + { + "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", + "details": { + "name": "Candidate", + "tooltip": "a value that must be true" + } + }, + { + "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", + "details": { + "name": "Report", + "tooltip": "additional notes for the test report" + } + } + ] + }, + { + "key": "Checkpoint", + "context": "Unit Testing", + "entry": { + "name": "In", + "tooltip": "When signaled, this will invoke Checkpoint" + }, + "exit": { + "name": "Out", + "tooltip": "Signaled after Checkpoint is invoked" + }, + "details": { + "name": "Checkpoint" + }, + "params": [ + { + "typeid": "{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}", + "details": { + "name": "Entity Id", + "tooltip": "Entity Unique Id" + } + }, + { + "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", + "details": { + "name": "Report", + "tooltip": "additional notes for the test report" + } + } + ] + }, + { + "key": "ExpectFalse", + "context": "Unit Testing", + "entry": { + "name": "In", + "tooltip": "When signaled, this will invoke Expect False" + }, + "exit": { + "name": "Out", + "tooltip": "Signaled after Expect False is invoked" + }, + "details": { + "name": "Expect False" + }, + "params": [ + { + "typeid": "{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}", + "details": { + "name": "Entity Id", + "tooltip": "Entity Unique Id" + } + }, + { + "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", + "details": { + "name": "Candidate", + "tooltip": "a value that must be false" + } + }, + { + "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", + "details": { + "name": "Report", + "tooltip": "additional notes for the test report" + } + } + ] + }, + { + "key": "ExpectEqual", + "context": "Unit Testing", + "entry": { + "name": "In", + "tooltip": "When signaled, this will invoke Expect Equal" + }, + "exit": { + "name": "Out", + "tooltip": "Signaled after Expect Equal is invoked" + }, + "details": { + "name": "Expect Equal" + }, + "params": [ + { + "typeid": "{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}", + "details": { + "name": "Entity Id", + "tooltip": "Entity Unique Id" + } + }, + { + "typeid": "{A54C2B36-D5B8-46A1-A529-4EBDBD2450E7}", + "details": { + "name": "Candidate", + "tooltip": "left of ==" + } + }, + { + "typeid": "{A54C2B36-D5B8-46A1-A529-4EBDBD2450E7}", + "details": { + "name": "Reference", + "tooltip": "right of ==" + } + }, + { + "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", + "details": { + "name": "Report", + "tooltip": "additional notes for the test report" + } + } + ] + }, + { + "key": "ExpectLessThan", + "context": "Unit Testing", + "entry": { + "name": "In", + "tooltip": "When signaled, this will invoke Expect Less Than" + }, + "exit": { + "name": "Out", + "tooltip": "Signaled after Expect Less Than is invoked" + }, + "details": { + "name": "Expect Less Than" + }, + "params": [ + { + "typeid": "{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}", + "details": { + "name": "Entity Id", + "tooltip": "Entity Unique Id" + } + }, + { + "typeid": "{110C4B14-11A8-4E9D-8638-5051013A56AC}", + "details": { + "name": "Candidate", + "tooltip": "left of <" + } + }, + { + "typeid": "{110C4B14-11A8-4E9D-8638-5051013A56AC}", + "details": { + "name": "Reference", + "tooltip": "right of <" + } + }, + { + "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", + "details": { + "name": "Report", + "tooltip": "additional notes for the test report" + } + } + ] + }, + { + "key": "AddSuccess", + "context": "Unit Testing", + "entry": { + "name": "In", + "tooltip": "When signaled, this will invoke Add Success" + }, + "exit": { + "name": "Out", + "tooltip": "Signaled after Add Success is invoked" + }, + "details": { + "name": "Add Success" + }, + "params": [ + { + "typeid": "{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}", + "details": { + "name": "Entity Id", + "tooltip": "Entity Unique Id" + } + }, + { + "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", + "details": { + "name": "Report", + "tooltip": "additional notes for the test report" + } + } + ] + }, + { + "key": "ExpectNotEqual", + "context": "Unit Testing", + "entry": { + "name": "In", + "tooltip": "When signaled, this will invoke Expect Not Equal" + }, + "exit": { + "name": "Out", + "tooltip": "Signaled after Expect Not Equal is invoked" + }, + "details": { + "name": "Expect Not Equal" + }, + "params": [ + { + "typeid": "{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}", + "details": { + "name": "Entity Id", + "tooltip": "Entity Unique Id" + } + }, + { + "typeid": "{A54C2B36-D5B8-46A1-A529-4EBDBD2450E7}", + "details": { + "name": "Candidate", + "tooltip": "left of !=" + } + }, + { + "typeid": "{A54C2B36-D5B8-46A1-A529-4EBDBD2450E7}", + "details": { + "name": "Reference", + "tooltip": "right of !=" + } + }, + { + "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", + "details": { + "name": "Report", + "tooltip": "additional notes for the test report" + } + } + ] + }, + { + "key": "ExpectGreaterThan", + "context": "Unit Testing", + "entry": { + "name": "In", + "tooltip": "When signaled, this will invoke Expect Greater Than" + }, + "exit": { + "name": "Out", + "tooltip": "Signaled after Expect Greater Than is invoked" + }, + "details": { + "name": "Expect Greater Than" + }, + "params": [ + { + "typeid": "{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}", + "details": { + "name": "Entity Id", + "tooltip": "Entity Unique Id" + } + }, + { + "typeid": "{110C4B14-11A8-4E9D-8638-5051013A56AC}", + "details": { + "name": "Candidate", + "tooltip": "left of >" + } + }, + { + "typeid": "{110C4B14-11A8-4E9D-8638-5051013A56AC}", + "details": { + "name": "Reference", + "tooltip": "right of >" + } + }, + { + "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", + "details": { + "name": "Report", + "tooltip": "additional notes for the test report" + } + } + ] + }, + { + "key": "AddFailure", + "context": "Unit Testing", + "entry": { + "name": "In", + "tooltip": "When signaled, this will invoke Add Failure" + }, + "exit": { + "name": "Out", + "tooltip": "Signaled after Add Failure is invoked" + }, + "details": { + "name": "Add Failure" + }, + "params": [ + { + "typeid": "{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}", + "details": { + "name": "Entity Id", + "tooltip": "Entity Unique Id" + } + }, + { + "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", + "details": { + "name": "Report", + "tooltip": "additional notes for the test report" + } + } + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/Uuid.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/Uuid.names index 1ba15fce9f..78f3425305 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/Uuid.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/Uuid.names @@ -171,7 +171,7 @@ { "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", "details": { - "name": "Is Less Than" + "name": "Less Than" } } ] @@ -225,7 +225,7 @@ { "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", "details": { - "name": "Name" + "name": "String" } }, { @@ -307,7 +307,7 @@ { "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", "details": { - "name": "Equal" + "name": "Is Equal" } } ] diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/VertexColor.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/VertexColor.names index e7636f6353..af9efaf5a8 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/VertexColor.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/VertexColor.names @@ -5,8 +5,98 @@ "context": "BehaviorClass", "variant": "", "details": { - "name": "VertexColor" - } + "name": "Vertex Color" + }, + "methods": [ + { + "key": "Getred", + "details": { + "name": "Get Red" + }, + "params": [ + { + "typeid": "{937E3BF8-5204-4D40-A8DA-C8F083C89F9F}", + "details": { + "name": "Color" + } + } + ], + "results": [ + { + "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", + "details": { + "name": "Red" + } + } + ] + }, + { + "key": "Getgreen", + "details": { + "name": "Get Green" + }, + "params": [ + { + "typeid": "{937E3BF8-5204-4D40-A8DA-C8F083C89F9F}", + "details": { + "name": "Color" + } + } + ], + "results": [ + { + "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", + "details": { + "name": "Green" + } + } + ] + }, + { + "key": "Getblue", + "details": { + "name": "Get Blue" + }, + "params": [ + { + "typeid": "{937E3BF8-5204-4D40-A8DA-C8F083C89F9F}", + "details": { + "name": "Color" + } + } + ], + "results": [ + { + "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", + "details": { + "name": "Blue" + } + } + ] + }, + { + "key": "Getalpha", + "details": { + "name": "Get Alpha" + }, + "params": [ + { + "typeid": "{937E3BF8-5204-4D40-A8DA-C8F083C89F9F}", + "details": { + "name": "Color" + } + } + ], + "results": [ + { + "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", + "details": { + "name": "Alpha" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/Audio System Component Notifications.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/Audio System Component Notifications.names index adf505b728..2c8cd9b1b4 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/Audio System Component Notifications.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/Audio System Component Notifications.names @@ -5,19 +5,20 @@ "context": "EBusHandler", "variant": "", "details": { - "name": "Audio System Component Notifications" + "name": "Audio System", + "category": "EBus Handlers" }, "methods": [ { "key": "OnGamePaused", "details": { - "name": "OnGamePaused" + "name": "On Game Paused" } }, { "key": "OnGameUnpaused", "details": { - "name": "OnGameUnpaused" + "name": "On Game Unpaused" } } ] diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/InputSystemNotificationBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/InputSystemNotificationBus.names index 5aea1ad6b7..d77cbe0f32 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/InputSystemNotificationBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/InputSystemNotificationBus.names @@ -5,19 +5,20 @@ "context": "EBusHandler", "variant": "", "details": { - "name": "InputSystemNotificationBus" + "name": "Input System", + "category": "Input" }, "methods": [ { "key": "OnPreInputUpdate", "details": { - "name": "OnPreInputUpdate" + "name": "On Pre Input Update" } }, { "key": "OnPostInputUpdate", "details": { - "name": "OnPostInputUpdate" + "name": "On Post Input Update" } } ] diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/LookAtNotification.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/LookAtNotification.names index 6d1ff93ed4..21994e982c 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/LookAtNotification.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/LookAtNotification.names @@ -5,20 +5,20 @@ "context": "EBusHandler", "variant": "", "details": { - "name": "LookAtNotification", - "tooltip": "Notifications for the Look At Component" + "name": "Look At", + "category": "Gameplay" }, "methods": [ { "key": "OnTargetChanged", "details": { - "name": "OnTargetChanged" + "name": "On Target Changed" }, "params": [ { "typeid": "{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}", "details": { - "name": "EntityId", + "name": "Entity Id", "tooltip": "Entity Unique Id" } } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/SpawnerComponentNotificationBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/SpawnerComponentNotificationBus.names index 39c8a095af..ce3f913622 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/SpawnerComponentNotificationBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/SpawnerComponentNotificationBus.names @@ -12,15 +12,13 @@ { "key": "OnSpawnBegin", "details": { - "name": "On Spawn Begin", - "tooltip": "Notifies when the spawn starts" + "name": "On Spawn Begin" }, "params": [ { "typeid": "{E6E7C0C5-07C9-44BB-A38C-930431948667}", "details": { - "name": "Slice", - "tooltip": "Slice instance from the spawn event" + "name": "Slice Instantiation Ticket" } } ] @@ -28,15 +26,13 @@ { "key": "OnSpawnEnd", "details": { - "name": "On Spawn End", - "tooltip": "Notifies when the spawn completes" + "name": "On Spawn End" }, "params": [ { "typeid": "{E6E7C0C5-07C9-44BB-A38C-930431948667}", "details": { - "name": "Slice", - "tooltip": "Slice instance from the spawn event" + "name": "Slice Instantiation Ticket" } } ] @@ -44,22 +40,20 @@ { "key": "OnEntitySpawned", "details": { - "name": "On Entity Spawned", - "tooltip": "Notify that an entity has spawned, will be called once for each entity spawned in a slice" + "name": "On Entity Spawned" }, "params": [ { "typeid": "{E6E7C0C5-07C9-44BB-A38C-930431948667}", "details": { - "name": "Slice", - "tooltip": "Slice instance from the spawn event" + "name": "Slice Instantiation Ticket" } }, { "typeid": "{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}", "details": { - "name": "Entity", - "tooltip": "EntityID of the spawned entity, for each spawned entity" + "name": "Entity Id", + "tooltip": "Entity Unique Id" } } ] @@ -67,13 +61,13 @@ { "key": "OnSpawnedSliceDestroyed", "details": { - "name": "OnSpawnedSliceDestroyed" + "name": "On Spawned Slice Destroyed" }, "params": [ { "typeid": "{E6E7C0C5-07C9-44BB-A38C-930431948667}", "details": { - "name": "SliceInstantiationTicket" + "name": "Slice Instantiation Ticket" } } ] @@ -81,19 +75,19 @@ { "key": "OnEntitiesSpawned", "details": { - "name": "OnEntitiesSpawned" + "name": "On Entities Spawned" }, "params": [ { "typeid": "{E6E7C0C5-07C9-44BB-A38C-930431948667}", "details": { - "name": "SliceInstantiationTicket" + "name": "Slice Instantiation Ticket" } }, { "typeid": "{4841CFF0-7A5C-519C-BD16-D3625E99605E}", "details": { - "name": "AZStd::vector" + "name": "Entities" } } ] diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/BloomRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/BloomRequestBus.names index 0ae96265bc..13fb16f618 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/BloomRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/BloomRequestBus.names @@ -5,27 +5,27 @@ "context": "EBusSender", "variant": "", "details": { - "name": "BloomRequestBus" + "name": "Bloom Request Bus" }, "methods": [ { "key": "GetTintStage0Override", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetTintStage0Override" + "tooltip": "When signaled, this will invoke Get Tint Stage 0 Override" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetTintStage0Override is invoked" + "tooltip": "Signaled after Get Tint Stage 0 Override is invoked" }, "details": { - "name": "GetTintStage0Override" + "name": "Get Tint Stage 0 Override" }, "results": [ { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", "details": { - "name": "float" + "name": "Value" } } ] @@ -34,20 +34,20 @@ "key": "SetTintStage0Override", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetTintStage0Override" + "tooltip": "When signaled, this will invoke Set Tint Stage 0 Override" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetTintStage0Override is invoked" + "tooltip": "Signaled after Set Tint Stage 0 Override is invoked" }, "details": { - "name": "SetTintStage0Override" + "name": "Set Tint Stage 0 Override" }, "params": [ { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", "details": { - "name": "float" + "name": "Value" } } ] @@ -56,20 +56,20 @@ "key": "SetTintStage1", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetTintStage1" + "tooltip": "When signaled, this will invoke Set Tint Stage 1" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetTintStage1 is invoked" + "tooltip": "Signaled after Set Tint Stage 1 is invoked" }, "details": { - "name": "SetTintStage1" + "name": "Set Tint Stage 1" }, "params": [ { "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}", "details": { - "name": "Vector3" + "name": "Value" } } ] @@ -78,20 +78,20 @@ "key": "SetTintStage0", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetTintStage0" + "tooltip": "When signaled, this will invoke Set Tint Stage 0" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetTintStage0 is invoked" + "tooltip": "Signaled after Set Tint Stage 0 is invoked" }, "details": { - "name": "SetTintStage0" + "name": "Set Tint Stage 0" }, "params": [ { "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}", "details": { - "name": "Vector3" + "name": "Value" } } ] @@ -100,20 +100,20 @@ "key": "GetKernelSizeStage3Override", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetKernelSizeStage3Override" + "tooltip": "When signaled, this will invoke Get Kernel Size Stage 3 Override" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetKernelSizeStage3Override is invoked" + "tooltip": "Signaled after Get Kernel Size Stage 3 Override is invoked" }, "details": { - "name": "GetKernelSizeStage3Override" + "name": "Get Kernel Size Stage 3 Override" }, "results": [ { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", "details": { - "name": "float" + "name": "Value" } } ] @@ -122,20 +122,20 @@ "key": "GetTintStage3Override", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetTintStage3Override" + "tooltip": "When signaled, this will invoke Get Tint Stage 3 Override" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetTintStage3Override is invoked" + "tooltip": "Signaled after Get Tint Stage 3 Override is invoked" }, "details": { - "name": "GetTintStage3Override" + "name": "Get Tint Stage 3 Override" }, "results": [ { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", "details": { - "name": "float" + "name": "Value" } } ] @@ -144,20 +144,20 @@ "key": "SetKernelSizeScaleOverride", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetKernelSizeScaleOverride" + "tooltip": "When signaled, this will invoke Set Kernel Size Scale Override" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetKernelSizeScaleOverride is invoked" + "tooltip": "Signaled after Set Kernel Size Scale Override is invoked" }, "details": { - "name": "SetKernelSizeScaleOverride" + "name": "Set Kernel Size Scale Override" }, "params": [ { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", "details": { - "name": "float" + "name": "Value" } } ] @@ -166,20 +166,20 @@ "key": "SetKernelSizeStage2", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetKernelSizeStage2" + "tooltip": "When signaled, this will invoke Set Kernel Size Stage 2" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetKernelSizeStage2 is invoked" + "tooltip": "Signaled after Set Kernel Size Stage 2 is invoked" }, "details": { - "name": "SetKernelSizeStage2" + "name": "Set Kernel Size Stage 2" }, "params": [ { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", "details": { - "name": "float" + "name": "Value" } } ] @@ -188,20 +188,20 @@ "key": "GetKernelSizeStage4", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetKernelSizeStage4" + "tooltip": "When signaled, this will invoke Get Kernel Size Stage 4" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetKernelSizeStage4 is invoked" + "tooltip": "Signaled after Get Kernel Size Stage 4 is invoked" }, "details": { - "name": "GetKernelSizeStage4" + "name": "Get Kernel Size Stage 4" }, "results": [ { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", "details": { - "name": "float" + "name": "Value" } } ] @@ -210,20 +210,20 @@ "key": "GetTintStage0", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetTintStage0" + "tooltip": "When signaled, this will invoke Get Tint Stage 0" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetTintStage0 is invoked" + "tooltip": "Signaled after Get Tint Stage 0 is invoked" }, "details": { - "name": "GetTintStage0" + "name": "Get Tint Stage 0" }, "results": [ { "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}", "details": { - "name": "Vector3" + "name": "Value" } } ] @@ -232,20 +232,20 @@ "key": "SetTintStage4Override", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetTintStage4Override" + "tooltip": "When signaled, this will invoke Set Tint Stage 4 Override" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetTintStage4Override is invoked" + "tooltip": "Signaled after Set Tint Stage 4 Override is invoked" }, "details": { - "name": "SetTintStage4Override" + "name": "Set Tint Stage 4 Override" }, "params": [ { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", "details": { - "name": "float" + "name": "Value" } } ] @@ -254,20 +254,20 @@ "key": "GetKernelSizeScale", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetKernelSizeScale" + "tooltip": "When signaled, this will invoke Get Kernel Size Scale" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetKernelSizeScale is invoked" + "tooltip": "Signaled after Get Kernel Size Scale is invoked" }, "details": { - "name": "GetKernelSizeScale" + "name": "Get Kernel Size Scale" }, "results": [ { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", "details": { - "name": "float" + "name": "Value" } } ] @@ -276,20 +276,20 @@ "key": "GetKernelSizeStage2", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetKernelSizeStage2" + "tooltip": "When signaled, this will invoke Get Kernel Size Stage 2" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetKernelSizeStage2 is invoked" + "tooltip": "Signaled after Get Kernel Size Stage 2 is invoked" }, "details": { - "name": "GetKernelSizeStage2" + "name": "Get Kernel Size Stage 2" }, "results": [ { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", "details": { - "name": "float" + "name": "Value" } } ] @@ -298,20 +298,20 @@ "key": "SetTintStage1Override", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetTintStage1Override" + "tooltip": "When signaled, this will invoke Set Tint Stage 1 Override" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetTintStage1Override is invoked" + "tooltip": "Signaled after Set Tint Stage 1 Override is invoked" }, "details": { - "name": "SetTintStage1Override" + "name": "Set Tint Stage 1 Override" }, "params": [ { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", "details": { - "name": "float" + "name": "Value" } } ] @@ -320,20 +320,20 @@ "key": "SetTintStage3", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetTintStage3" + "tooltip": "When signaled, this will invoke Set Tint Stage 3" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetTintStage3 is invoked" + "tooltip": "Signaled after Set Tint Stage 3 is invoked" }, "details": { - "name": "SetTintStage3" + "name": "Set Tint Stage 3" }, "params": [ { "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}", "details": { - "name": "Vector3" + "name": "Value" } } ] @@ -342,20 +342,20 @@ "key": "GetEnabledOverride", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetEnabledOverride" + "tooltip": "When signaled, this will invoke Get Enabled Override" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetEnabledOverride is invoked" + "tooltip": "Signaled after Get Enabled Override is invoked" }, "details": { - "name": "GetEnabledOverride" + "name": "Get Enabled Override" }, "results": [ { "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", "details": { - "name": "bool" + "name": "Enabled" } } ] @@ -364,20 +364,20 @@ "key": "SetTintStage3Override", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetTintStage3Override" + "tooltip": "When signaled, this will invoke Set Tint Stage 3 Override" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetTintStage3Override is invoked" + "tooltip": "Signaled after Set Tint Stage 3 Override is invoked" }, "details": { - "name": "SetTintStage3Override" + "name": "Set Tint Stage 3 Override" }, "params": [ { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", "details": { - "name": "float" + "name": "Value" } } ] @@ -386,20 +386,20 @@ "key": "SetEnabledOverride", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetEnabledOverride" + "tooltip": "When signaled, this will invoke Set Enabled Override" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetEnabledOverride is invoked" + "tooltip": "Signaled after Set Enabled Override is invoked" }, "details": { - "name": "SetEnabledOverride" + "name": "Set Enabled Override" }, "params": [ { "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", "details": { - "name": "bool" + "name": "Enabled" } } ] @@ -408,20 +408,20 @@ "key": "SetKernelSizeStage0", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetKernelSizeStage0" + "tooltip": "When signaled, this will invoke Set Kernel Size Stage 0" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetKernelSizeStage0 is invoked" + "tooltip": "Signaled after Set Kernel Size Stage 0 is invoked" }, "details": { - "name": "SetKernelSizeStage0" + "name": "Set Kernel Size Stage 0" }, "params": [ { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", "details": { - "name": "float" + "name": "Value" } } ] @@ -430,20 +430,20 @@ "key": "GetKernelSizeStage0Override", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetKernelSizeStage0Override" + "tooltip": "When signaled, this will invoke Get Kernel Size Stage 0 Override" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetKernelSizeStage0Override is invoked" + "tooltip": "Signaled after Get Kernel Size Stage 0 Override is invoked" }, "details": { - "name": "GetKernelSizeStage0Override" + "name": "Get Kernel Size Stage 0 Override" }, "results": [ { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", "details": { - "name": "float" + "name": "Value" } } ] @@ -452,20 +452,20 @@ "key": "SetKernelSizeStage4Override", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetKernelSizeStage4Override" + "tooltip": "When signaled, this will invoke Set Kernel Size Stage 4 Override" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetKernelSizeStage4Override is invoked" + "tooltip": "Signaled after Set Kernel Size Stage 4 Override is invoked" }, "details": { - "name": "SetKernelSizeStage4Override" + "name": "Set Kernel Size Stage 4 Override" }, "params": [ { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", "details": { - "name": "float" + "name": "Value" } } ] @@ -474,20 +474,20 @@ "key": "GetTintStage2", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetTintStage2" + "tooltip": "When signaled, this will invoke Get Tint Stage 2" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetTintStage2 is invoked" + "tooltip": "Signaled after Get Tint Stage 2 is invoked" }, "details": { - "name": "GetTintStage2" + "name": "Get Tint Stage 2" }, "results": [ { "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}", "details": { - "name": "Vector3" + "name": "Value" } } ] @@ -496,20 +496,20 @@ "key": "GetTintStage4Override", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetTintStage4Override" + "tooltip": "When signaled, this will invoke Get Tint Stage 4 Override" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetTintStage4Override is invoked" + "tooltip": "Signaled after Get Tint Stage 4 Override is invoked" }, "details": { - "name": "GetTintStage4Override" + "name": "Get Tint Stage 4 Override" }, "results": [ { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", "details": { - "name": "float" + "name": "Value" } } ] @@ -518,20 +518,20 @@ "key": "SetKernelSizeStage0Override", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetKernelSizeStage0Override" + "tooltip": "When signaled, this will invoke Set Kernel Size Stage 0 Override" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetKernelSizeStage0Override is invoked" + "tooltip": "Signaled after Set Kernel Size Stage 0 Override is invoked" }, "details": { - "name": "SetKernelSizeStage0Override" + "name": "Set Kernel Size Stage 0 Override" }, "params": [ { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", "details": { - "name": "float" + "name": "Value" } } ] @@ -540,20 +540,20 @@ "key": "GetKernelSizeStage4Override", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetKernelSizeStage4Override" + "tooltip": "When signaled, this will invoke Get Kernel Size Stage 4 Override" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetKernelSizeStage4Override is invoked" + "tooltip": "Signaled after Get Kernel Size Stage 4 Override is invoked" }, "details": { - "name": "GetKernelSizeStage4Override" + "name": "Get Kernel Size Stage 4 Override" }, "results": [ { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", "details": { - "name": "float" + "name": "Value" } } ] @@ -562,20 +562,20 @@ "key": "GetTintStage2Override", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetTintStage2Override" + "tooltip": "When signaled, this will invoke Get Tint Stage 2 Override" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetTintStage2Override is invoked" + "tooltip": "Signaled after Get Tint Stage 2 Override is invoked" }, "details": { - "name": "GetTintStage2Override" + "name": "Get Tint Stage 2 Override" }, "results": [ { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", "details": { - "name": "float" + "name": "Value" } } ] @@ -584,20 +584,20 @@ "key": "GetTintStage3", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetTintStage3" + "tooltip": "When signaled, this will invoke Get Tint Stage 3" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetTintStage3 is invoked" + "tooltip": "Signaled after Get Tint Stage 3 is invoked" }, "details": { - "name": "GetTintStage3" + "name": "Get Tint Stage 3" }, "results": [ { "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}", "details": { - "name": "Vector3" + "name": "Value" } } ] @@ -606,20 +606,20 @@ "key": "SetKernelSizeScale", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetKernelSizeScale" + "tooltip": "When signaled, this will invoke Set Kernel Size Scale" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetKernelSizeScale is invoked" + "tooltip": "Signaled after Set Kernel Size Scale is invoked" }, "details": { - "name": "SetKernelSizeScale" + "name": "Set Kernel Size Scale" }, "params": [ { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", "details": { - "name": "float" + "name": "Value" } } ] @@ -628,20 +628,20 @@ "key": "GetIntensity", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetIntensity" + "tooltip": "When signaled, this will invoke Get Intensity" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetIntensity is invoked" + "tooltip": "Signaled after Get Intensity is invoked" }, "details": { - "name": "GetIntensity" + "name": "Get Intensity" }, "results": [ { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", "details": { - "name": "float" + "name": "Value" } } ] @@ -650,20 +650,20 @@ "key": "GetBicubicEnabledOverride", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetBicubicEnabledOverride" + "tooltip": "When signaled, this will invoke Get Bicubic Enabled Override" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetBicubicEnabledOverride is invoked" + "tooltip": "Signaled after Get Bicubic Enabled Override is invoked" }, "details": { - "name": "GetBicubicEnabledOverride" + "name": "Get Bicubic Enabled Override" }, "results": [ { "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", "details": { - "name": "bool" + "name": "Enabled" } } ] @@ -672,20 +672,20 @@ "key": "SetKernelSizeStage4", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetKernelSizeStage4" + "tooltip": "When signaled, this will invoke Set Kernel Size Stage 4" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetKernelSizeStage4 is invoked" + "tooltip": "Signaled after Set Kernel Size Stage 4 is invoked" }, "details": { - "name": "SetKernelSizeStage4" + "name": "Set Kernel Size Stage 4" }, "params": [ { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", "details": { - "name": "float" + "name": "Value" } } ] @@ -694,20 +694,20 @@ "key": "SetBicubicEnabled", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetBicubicEnabled" + "tooltip": "When signaled, this will invoke Set Bicubic Enabled" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetBicubicEnabled is invoked" + "tooltip": "Signaled after Set Bicubic Enabled is invoked" }, "details": { - "name": "SetBicubicEnabled" + "name": "Set Bicubic Enabled" }, "params": [ { "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", "details": { - "name": "bool" + "name": "Enabled" } } ] @@ -716,20 +716,20 @@ "key": "GetKernelSizeStage1Override", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetKernelSizeStage1Override" + "tooltip": "When signaled, this will invoke Get Kernel Size Stage 1 Override" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetKernelSizeStage1Override is invoked" + "tooltip": "Signaled after Get Kernel Size Stage 1 Override is invoked" }, "details": { - "name": "GetKernelSizeStage1Override" + "name": "Get Kernel Size Stage 1 Override" }, "results": [ { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", "details": { - "name": "float" + "name": "Value" } } ] @@ -738,20 +738,20 @@ "key": "GetThresholdOverride", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetThresholdOverride" + "tooltip": "When signaled, this will invoke Get Threshold Override" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetThresholdOverride is invoked" + "tooltip": "Signaled after Get Threshold Override is invoked" }, "details": { - "name": "GetThresholdOverride" + "name": "Get Threshold Override" }, "results": [ { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", "details": { - "name": "float" + "name": "Value" } } ] @@ -760,20 +760,20 @@ "key": "SetIntensity", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetIntensity" + "tooltip": "When signaled, this will invoke Set Intensity" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetIntensity is invoked" + "tooltip": "Signaled after Set Intensity is invoked" }, "details": { - "name": "SetIntensity" + "name": "Set Intensity" }, "params": [ { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", "details": { - "name": "float" + "name": "Value" } } ] @@ -782,20 +782,20 @@ "key": "SetBicubicEnabledOverride", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetBicubicEnabledOverride" + "tooltip": "When signaled, this will invoke Set Bicubic Enabled Override" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetBicubicEnabledOverride is invoked" + "tooltip": "Signaled after Set Bicubic Enabled Override is invoked" }, "details": { - "name": "SetBicubicEnabledOverride" + "name": "Set Bicubic Enabled Override" }, "params": [ { "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", "details": { - "name": "bool" + "name": "Enabled" } } ] @@ -804,20 +804,20 @@ "key": "GetKernelSizeStage1", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetKernelSizeStage1" + "tooltip": "When signaled, this will invoke Get Kernel Size Stage 1" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetKernelSizeStage1 is invoked" + "tooltip": "Signaled after Get Kernel Size Stage 1 is invoked" }, "details": { - "name": "GetKernelSizeStage1" + "name": "Get Kernel Size Stage 1" }, "results": [ { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", "details": { - "name": "float" + "name": "Value" } } ] @@ -826,20 +826,20 @@ "key": "GetKernelSizeStage2Override", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetKernelSizeStage2Override" + "tooltip": "When signaled, this will invoke Get Kernel Size Stage 2 Override" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetKernelSizeStage2Override is invoked" + "tooltip": "Signaled after Get Kernel Size Stage 2 Override is invoked" }, "details": { - "name": "GetKernelSizeStage2Override" + "name": "Get Kernel Size Stage 2 Override" }, "results": [ { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", "details": { - "name": "float" + "name": "Value" } } ] @@ -848,20 +848,20 @@ "key": "SetTintStage4", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetTintStage4" + "tooltip": "When signaled, this will invoke Set Tint Stage 4" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetTintStage4 is invoked" + "tooltip": "Signaled after Set Tint Stage 4 is invoked" }, "details": { - "name": "SetTintStage4" + "name": "Set Tint Stage 4" }, "params": [ { "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}", "details": { - "name": "Vector3" + "name": "Value" } } ] @@ -870,20 +870,20 @@ "key": "SetKernelSizeStage1", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetKernelSizeStage1" + "tooltip": "When signaled, this will invoke Set Kernel Size Stage 1" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetKernelSizeStage1 is invoked" + "tooltip": "Signaled after Set Kernel Size Stage 1 is invoked" }, "details": { - "name": "SetKernelSizeStage1" + "name": "Set Kernel Size Stage 1" }, "params": [ { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", "details": { - "name": "float" + "name": "Value" } } ] @@ -892,20 +892,20 @@ "key": "SetThresholdOverride", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetThresholdOverride" + "tooltip": "When signaled, this will invoke Set Threshold Override" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetThresholdOverride is invoked" + "tooltip": "Signaled after Set Threshold Override is invoked" }, "details": { - "name": "SetThresholdOverride" + "name": "Set Threshold Override" }, "params": [ { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", "details": { - "name": "float" + "name": "Value" } } ] @@ -914,20 +914,20 @@ "key": "GetTintStage1", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetTintStage1" + "tooltip": "When signaled, this will invoke Get Tint Stage 1" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetTintStage1 is invoked" + "tooltip": "Signaled after Get Tint Stage 1 is invoked" }, "details": { - "name": "GetTintStage1" + "name": "Get Tint Stage 1" }, "results": [ { "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}", "details": { - "name": "Vector3" + "name": "Value" } } ] @@ -936,20 +936,20 @@ "key": "GetKnee", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetKnee" + "tooltip": "When signaled, this will invoke Get Knee" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetKnee is invoked" + "tooltip": "Signaled after Get Knee is invoked" }, "details": { - "name": "GetKnee" + "name": "Get Knee" }, "results": [ { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", "details": { - "name": "float" + "name": "Value" } } ] @@ -958,20 +958,20 @@ "key": "SetThreshold", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetThreshold" + "tooltip": "When signaled, this will invoke Set Threshold" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetThreshold is invoked" + "tooltip": "Signaled after Set Threshold is invoked" }, "details": { - "name": "SetThreshold" + "name": "Set Threshold" }, "params": [ { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", "details": { - "name": "float" + "name": "Value" } } ] @@ -980,20 +980,20 @@ "key": "SetIntensityOverride", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetIntensityOverride" + "tooltip": "When signaled, this will invoke Set Intensity Override" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetIntensityOverride is invoked" + "tooltip": "Signaled after Set Intensity Override is invoked" }, "details": { - "name": "SetIntensityOverride" + "name": "Set Intensity Override" }, "params": [ { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", "details": { - "name": "float" + "name": "Value" } } ] @@ -1002,20 +1002,20 @@ "key": "GetEnabled", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetEnabled" + "tooltip": "When signaled, this will invoke Get Enabled" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetEnabled is invoked" + "tooltip": "Signaled after Get Enabled is invoked" }, "details": { - "name": "GetEnabled" + "name": "Get Enabled" }, "results": [ { "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", "details": { - "name": "bool" + "name": "Enabled" } } ] @@ -1024,20 +1024,20 @@ "key": "SetKernelSizeStage1Override", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetKernelSizeStage1Override" + "tooltip": "When signaled, this will invoke Set Kernel Size Stage 1 Override" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetKernelSizeStage1Override is invoked" + "tooltip": "Signaled after Set Kernel Size Stage 1 Override is invoked" }, "details": { - "name": "SetKernelSizeStage1Override" + "name": "Set Kernel Size Stage 1 Override" }, "params": [ { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", "details": { - "name": "float" + "name": "Value" } } ] @@ -1046,20 +1046,20 @@ "key": "GetKernelSizeStage0", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetKernelSizeStage0" + "tooltip": "When signaled, this will invoke Get Kernel Size Stage 0" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetKernelSizeStage0 is invoked" + "tooltip": "Signaled after Get Kernel Size Stage 0 is invoked" }, "details": { - "name": "GetKernelSizeStage0" + "name": "Get Kernel Size Stage 0" }, "results": [ { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", "details": { - "name": "float" + "name": "Value" } } ] @@ -1068,20 +1068,20 @@ "key": "SetTintStage2Override", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetTintStage2Override" + "tooltip": "When signaled, this will invoke Set Tint Stage 2 Override" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetTintStage2Override is invoked" + "tooltip": "Signaled after Set Tint Stage 2 Override is invoked" }, "details": { - "name": "SetTintStage2Override" + "name": "Set Tint Stage 2 Override" }, "params": [ { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", "details": { - "name": "float" + "name": "Value" } } ] @@ -1090,20 +1090,20 @@ "key": "GetTintStage4", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetTintStage4" + "tooltip": "When signaled, this will invoke Get Tint Stage 4" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetTintStage4 is invoked" + "tooltip": "Signaled after Get Tint Stage 4 is invoked" }, "details": { - "name": "GetTintStage4" + "name": "Get Tint Stage 4" }, "results": [ { "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}", "details": { - "name": "Vector3" + "name": "Value" } } ] @@ -1112,20 +1112,20 @@ "key": "GetKernelSizeScaleOverride", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetKernelSizeScaleOverride" + "tooltip": "When signaled, this will invoke Get Kernel Size Scale Override" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetKernelSizeScaleOverride is invoked" + "tooltip": "Signaled after Get Kernel Size Scale Override is invoked" }, "details": { - "name": "GetKernelSizeScaleOverride" + "name": "Get Kernel Size Scale Override" }, "results": [ { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", "details": { - "name": "float" + "name": "Value" } } ] @@ -1134,20 +1134,20 @@ "key": "SetKernelSizeStage2Override", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetKernelSizeStage2Override" + "tooltip": "When signaled, this will invoke Set Kernel Size Stage 2 Override" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetKernelSizeStage2Override is invoked" + "tooltip": "Signaled after Set Kernel Size Stage 2 Override is invoked" }, "details": { - "name": "SetKernelSizeStage2Override" + "name": "Set Kernel Size Stage 2 Override" }, "params": [ { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", "details": { - "name": "float" + "name": "Value" } } ] @@ -1156,20 +1156,20 @@ "key": "GetKernelSizeStage3", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetKernelSizeStage3" + "tooltip": "When signaled, this will invoke Get Kernel Size Stage 3" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetKernelSizeStage3 is invoked" + "tooltip": "Signaled after Get Kernel Size Stage 3 is invoked" }, "details": { - "name": "GetKernelSizeStage3" + "name": "Get Kernel Size Stage 3" }, "results": [ { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", "details": { - "name": "float" + "name": "Value" } } ] @@ -1178,20 +1178,20 @@ "key": "GetTintStage1Override", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetTintStage1Override" + "tooltip": "When signaled, this will invoke Get Tint Stage 1 Override" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetTintStage1Override is invoked" + "tooltip": "Signaled after Get Tint Stage 1 Override is invoked" }, "details": { - "name": "GetTintStage1Override" + "name": "Get Tint Stage 1 Override" }, "results": [ { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", "details": { - "name": "float" + "name": "Value" } } ] @@ -1200,20 +1200,20 @@ "key": "SetTintStage2", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetTintStage2" + "tooltip": "When signaled, this will invoke Set Tint Stage 2" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetTintStage2 is invoked" + "tooltip": "Signaled after Set Tint Stage 2 is invoked" }, "details": { - "name": "SetTintStage2" + "name": "Set Tint Stage 2" }, "params": [ { "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}", "details": { - "name": "Vector3" + "name": "Value" } } ] @@ -1222,20 +1222,20 @@ "key": "GetKneeOverride", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetKneeOverride" + "tooltip": "When signaled, this will invoke Get Knee Override" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetKneeOverride is invoked" + "tooltip": "Signaled after Get Knee Override is invoked" }, "details": { - "name": "GetKneeOverride" + "name": "Get Knee Override" }, "results": [ { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", "details": { - "name": "float" + "name": "Value" } } ] @@ -1244,20 +1244,20 @@ "key": "SetKnee", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetKnee" + "tooltip": "When signaled, this will invoke Set Knee" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetKnee is invoked" + "tooltip": "Signaled after Set Knee is invoked" }, "details": { - "name": "SetKnee" + "name": "Set Knee" }, "params": [ { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", "details": { - "name": "float" + "name": "Value" } } ] @@ -1266,20 +1266,20 @@ "key": "GetIntensityOverride", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetIntensityOverride" + "tooltip": "When signaled, this will invoke Get Intensity Override" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetIntensityOverride is invoked" + "tooltip": "Signaled after Get Intensity Override is invoked" }, "details": { - "name": "GetIntensityOverride" + "name": "Get Intensity Override" }, "results": [ { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", "details": { - "name": "float" + "name": "Value" } } ] @@ -1288,20 +1288,20 @@ "key": "SetEnabled", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetEnabled" + "tooltip": "When signaled, this will invoke Set Enabled" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetEnabled is invoked" + "tooltip": "Signaled after Set Enabled is invoked" }, "details": { - "name": "SetEnabled" + "name": "Set Enabled" }, "params": [ { "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", "details": { - "name": "bool" + "name": "Enabled" } } ] @@ -1310,20 +1310,20 @@ "key": "GetThreshold", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetThreshold" + "tooltip": "When signaled, this will invoke Get Threshold" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetThreshold is invoked" + "tooltip": "Signaled after Get Threshold is invoked" }, "details": { - "name": "GetThreshold" + "name": "Get Threshold" }, "results": [ { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", "details": { - "name": "float" + "name": "Value" } } ] @@ -1332,20 +1332,20 @@ "key": "SetKernelSizeStage3", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetKernelSizeStage3" + "tooltip": "When signaled, this will invoke Set Kernel Size Stage 3" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetKernelSizeStage3 is invoked" + "tooltip": "Signaled after Set Kernel Size Stage 3 is invoked" }, "details": { - "name": "SetKernelSizeStage3" + "name": "Set Kernel Size Stage 3" }, "params": [ { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", "details": { - "name": "float" + "name": "Value" } } ] @@ -1354,20 +1354,20 @@ "key": "SetKernelSizeStage3Override", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetKernelSizeStage3Override" + "tooltip": "When signaled, this will invoke Set Kernel Size Stage 3 Override" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetKernelSizeStage3Override is invoked" + "tooltip": "Signaled after Set Kernel Size Stage 3 Override is invoked" }, "details": { - "name": "SetKernelSizeStage3Override" + "name": "Set Kernel Size Stage 3 Override" }, "params": [ { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", "details": { - "name": "float" + "name": "Value" } } ] @@ -1376,20 +1376,20 @@ "key": "SetKneeOverride", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetKneeOverride" + "tooltip": "When signaled, this will invoke Set Knee Override" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetKneeOverride is invoked" + "tooltip": "Signaled after Set Knee Override is invoked" }, "details": { - "name": "SetKneeOverride" + "name": "Set Knee Override" }, "params": [ { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", "details": { - "name": "float" + "name": "Value" } } ] @@ -1398,20 +1398,20 @@ "key": "GetBicubicEnabled", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetBicubicEnabled" + "tooltip": "When signaled, this will invoke Get Bicubic Enabled" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetBicubicEnabled is invoked" + "tooltip": "Signaled after Get Bicubic Enabled is invoked" }, "details": { - "name": "GetBicubicEnabled" + "name": "Get Bicubic Enabled" }, "results": [ { "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", "details": { - "name": "bool" + "name": "Enabled" } } ] diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/BoundsRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/BoundsRequestBus.names index a778eb6039..d909eb0338 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/BoundsRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/BoundsRequestBus.names @@ -5,27 +5,27 @@ "context": "EBusSender", "variant": "", "details": { - "name": "BoundsRequestBus" + "name": "Bounds Request Bus" }, "methods": [ { "key": "GetWorldBounds", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetWorldBounds" + "tooltip": "When signaled, this will invoke Get World Bounds" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetWorldBounds is invoked" + "tooltip": "Signaled after Get World Bounds is invoked" }, "details": { - "name": "GetWorldBounds" + "name": "Get World Bounds" }, "results": [ { "typeid": "{A54C2B36-D5B8-46A1-A529-4EBDBD2450E7}", "details": { - "name": "Aabb" + "name": "AABB" } } ] @@ -34,20 +34,20 @@ "key": "GetLocalBounds", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetLocalBounds" + "tooltip": "When signaled, this will invoke Get Local Bounds" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetLocalBounds is invoked" + "tooltip": "Signaled after Get Local Bounds is invoked" }, "details": { - "name": "GetLocalBounds" + "name": "Get Local Bounds" }, "results": [ { "typeid": "{A54C2B36-D5B8-46A1-A529-4EBDBD2450E7}", "details": { - "name": "Aabb" + "name": "AABB" } } ] diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/DecalRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/DecalRequestBus.names index 2d69295887..27d0a36cd4 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/DecalRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/DecalRequestBus.names @@ -5,27 +5,28 @@ "context": "EBusSender", "variant": "", "details": { - "name": "DecalRequestBus" + "name": "Decal", + "category": "Rendering" }, "methods": [ { "key": "GetMaterial", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetMaterial" + "tooltip": "When signaled, this will invoke Get Material" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetMaterial is invoked" + "tooltip": "Signaled after Get Material is invoked" }, "details": { - "name": "GetMaterial" + "name": "Get Material" }, "results": [ { "typeid": "{652ED536-3402-439B-AEBE-4A5DBC554085}", "details": { - "name": "AssetId" + "name": "Asset Id" } } ] @@ -34,20 +35,20 @@ "key": "GetSortKey", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetSortKey" + "tooltip": "When signaled, this will invoke Get Sort Key" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetSortKey is invoked" + "tooltip": "Signaled after Get Sort Key is invoked" }, "details": { - "name": "GetSortKey" + "name": "Get Sort Key" }, "results": [ { "typeid": "{72B9409A-7D1A-4831-9CFE-FCB3FADD3426}", "details": { - "name": "unsigned char" + "name": "Sort Key" } } ] @@ -56,20 +57,20 @@ "key": "SetSortKey", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetSortKey" + "tooltip": "When signaled, this will invoke Set Sort Key" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetSortKey is invoked" + "tooltip": "Signaled after Set Sort Key is invoked" }, "details": { - "name": "SetSortKey" + "name": "Set Sort Key" }, "params": [ { "typeid": "{72B9409A-7D1A-4831-9CFE-FCB3FADD3426}", "details": { - "name": "unsigned char" + "name": "Sort Key" } } ] @@ -78,20 +79,20 @@ "key": "SetMaterial", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetMaterial" + "tooltip": "When signaled, this will invoke Set Material" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetMaterial is invoked" + "tooltip": "Signaled after Set Material is invoked" }, "details": { - "name": "SetMaterial" + "name": "Set Material" }, "params": [ { "typeid": "{652ED536-3402-439B-AEBE-4A5DBC554085}", "details": { - "name": "AssetId" + "name": "Asset Id" } } ] @@ -100,20 +101,20 @@ "key": "SetAttenuationAngle", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetAttenuationAngle" + "tooltip": "When signaled, this will invoke Set Attenuation Angle" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetAttenuationAngle is invoked" + "tooltip": "Signaled after Set Attenuation Angle is invoked" }, "details": { - "name": "SetAttenuationAngle" + "name": "Set Attenuation Angle" }, "params": [ { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", "details": { - "name": "float" + "name": "Attenuation Angle" } } ] @@ -122,20 +123,20 @@ "key": "GetOpacity", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetOpacity" + "tooltip": "When signaled, this will invoke Get Opacity" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetOpacity is invoked" + "tooltip": "Signaled after Get Opacity is invoked" }, "details": { - "name": "GetOpacity" + "name": "Get Opacity" }, "results": [ { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", "details": { - "name": "float" + "name": "Opacity" } } ] @@ -144,20 +145,20 @@ "key": "SetOpacity", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetOpacity" + "tooltip": "When signaled, this will invoke Set Opacity" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetOpacity is invoked" + "tooltip": "Signaled after Set Opacity is invoked" }, "details": { - "name": "SetOpacity" + "name": "Set Opacity" }, "params": [ { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", "details": { - "name": "float" + "name": "Opacity" } } ] @@ -166,20 +167,20 @@ "key": "GetAttenuationAngle", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetAttenuationAngle" + "tooltip": "When signaled, this will invoke Get Attenuation Angle" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetAttenuationAngle is invoked" + "tooltip": "Signaled after Get Attenuation Angle is invoked" }, "details": { - "name": "GetAttenuationAngle" + "name": "Get Attenuation Angle" }, "results": [ { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", "details": { - "name": "float" + "name": "Attenuation Angle" } } ] diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/DeferredFogRequestsBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/DeferredFogRequestsBus.names index ff796ed9d8..a7897a582a 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/DeferredFogRequestsBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/DeferredFogRequestsBus.names @@ -5,27 +5,28 @@ "context": "EBusSender", "variant": "", "details": { - "name": "DeferredFogRequestsBus" + "name": "Deferred Fog", + "category": "Rendering" }, "methods": [ { "key": "SetNoiseTexture", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetNoiseTexture" + "tooltip": "When signaled, this will invoke Set Noise Texture" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetNoiseTexture is invoked" + "tooltip": "Signaled after Set Noise Texture is invoked" }, "details": { - "name": "SetNoiseTexture" + "name": "Set Noise Texture" }, "params": [ { "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", "details": { - "name": "AZStd::string" + "name": "Path" } } ] @@ -34,20 +35,20 @@ "key": "SetNoiseTexCoordScale", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetNoiseTexCoordScale" + "tooltip": "When signaled, this will invoke Set Noise Tex Coord Scale" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetNoiseTexCoordScale is invoked" + "tooltip": "Signaled after Set Noise Tex Coord Scale is invoked" }, "details": { - "name": "SetNoiseTexCoordScale" + "name": "Set Noise Tex Coord Scale" }, "params": [ { "typeid": "{3D80F623-C85C-4741-90D0-E4E66164E6BF}", "details": { - "name": "Vector2" + "name": "Tex Coord Scale" } } ] @@ -56,20 +57,20 @@ "key": "SetNoiseTexCoord2Scale", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetNoiseTexCoord2Scale" + "tooltip": "When signaled, this will invoke Set Noise Tex Coord 2 Scale" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetNoiseTexCoord2Scale is invoked" + "tooltip": "Signaled after Set Noise Tex Coord 2 Scale is invoked" }, "details": { - "name": "SetNoiseTexCoord2Scale" + "name": "Set Noise Tex Coord 2 Scale" }, "params": [ { "typeid": "{3D80F623-C85C-4741-90D0-E4E66164E6BF}", "details": { - "name": "Vector2" + "name": "Tex Coord 2 Scale" } } ] @@ -78,20 +79,20 @@ "key": "GetFogMaxHeight", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetFogMaxHeight" + "tooltip": "When signaled, this will invoke Get Fog Max Height" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetFogMaxHeight is invoked" + "tooltip": "Signaled after Get Fog Max Height is invoked" }, "details": { - "name": "GetFogMaxHeight" + "name": "Get Fog Max Height" }, "results": [ { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", "details": { - "name": "float" + "name": "Max Height" } } ] @@ -100,20 +101,20 @@ "key": "GetNoiseTexCoordScale", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetNoiseTexCoordScale" + "tooltip": "When signaled, this will invoke Get Noise Tex Coord Scale" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetNoiseTexCoordScale is invoked" + "tooltip": "Signaled after Get Noise Tex Coord Scale is invoked" }, "details": { - "name": "GetNoiseTexCoordScale" + "name": "Get Noise Tex Coord Scale" }, "results": [ { "typeid": "{3D80F623-C85C-4741-90D0-E4E66164E6BF}", "details": { - "name": "Vector2" + "name": "Tex Coord Scale" } } ] @@ -122,20 +123,20 @@ "key": "GetNoiseTexCoordVelocity", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetNoiseTexCoordVelocity" + "tooltip": "When signaled, this will invoke Get Noise Tex Coord Velocity" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetNoiseTexCoordVelocity is invoked" + "tooltip": "Signaled after Get Noise Tex Coord Velocity is invoked" }, "details": { - "name": "GetNoiseTexCoordVelocity" + "name": "Get Noise Tex Coord Velocity" }, "results": [ { "typeid": "{3D80F623-C85C-4741-90D0-E4E66164E6BF}", "details": { - "name": "Vector2" + "name": "Tex Coord Velocity" } } ] @@ -144,20 +145,20 @@ "key": "SetFogEndDistance", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetFogEndDistance" + "tooltip": "When signaled, this will invoke Set Fog End Distance" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetFogEndDistance is invoked" + "tooltip": "Signaled after Set Fog End Distance is invoked" }, "details": { - "name": "SetFogEndDistance" + "name": "Set Fog End Distance" }, "params": [ { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", "details": { - "name": "float" + "name": "Fod End Distance" } } ] @@ -166,20 +167,20 @@ "key": "GetFogEndDistance", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetFogEndDistance" + "tooltip": "When signaled, this will invoke Get Fog End Distance" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetFogEndDistance is invoked" + "tooltip": "Signaled after Get Fog End Distance is invoked" }, "details": { - "name": "GetFogEndDistance" + "name": "Get Fog End Distance" }, "results": [ { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", "details": { - "name": "float" + "name": "Fog End Distance" } } ] @@ -188,20 +189,20 @@ "key": "GetNoiseTexCoord2Scale", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetNoiseTexCoord2Scale" + "tooltip": "When signaled, this will invoke Get Noise Tex Coord 2 Scale" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetNoiseTexCoord2Scale is invoked" + "tooltip": "Signaled after Get Noise Tex Coord 2 Scale is invoked" }, "details": { - "name": "GetNoiseTexCoord2Scale" + "name": "Get Noise Tex Coord 2 Scale" }, "results": [ { "typeid": "{3D80F623-C85C-4741-90D0-E4E66164E6BF}", "details": { - "name": "Vector2" + "name": "Tex Coord 2 Scale" } } ] @@ -210,20 +211,20 @@ "key": "SetNoiseTexCoord2Velocity", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetNoiseTexCoord2Velocity" + "tooltip": "When signaled, this will invoke Set Noise Tex Coord 2 Velocity" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetNoiseTexCoord2Velocity is invoked" + "tooltip": "Signaled after Set Noise Tex Coord 2 Velocity is invoked" }, "details": { - "name": "SetNoiseTexCoord2Velocity" + "name": "Set Noise Tex Coord 2 Velocity" }, "params": [ { "typeid": "{3D80F623-C85C-4741-90D0-E4E66164E6BF}", "details": { - "name": "Vector2" + "name": "Tex Coord 2 Velocity" } } ] @@ -232,20 +233,20 @@ "key": "GetFogStartDistance", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetFogStartDistance" + "tooltip": "When signaled, this will invoke Get Fog Start Distance" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetFogStartDistance is invoked" + "tooltip": "Signaled after Get Fog Start Distance is invoked" }, "details": { - "name": "GetFogStartDistance" + "name": "Get Fog Start Distance" }, "results": [ { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", "details": { - "name": "float" + "name": "Fog Start Distance" } } ] @@ -254,20 +255,20 @@ "key": "SetFogMaxHeight", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetFogMaxHeight" + "tooltip": "When signaled, this will invoke Set Fog Max Height" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetFogMaxHeight is invoked" + "tooltip": "Signaled after Set Fog Max Height is invoked" }, "details": { - "name": "SetFogMaxHeight" + "name": "Set Fog Max Height" }, "params": [ { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", "details": { - "name": "float" + "name": "Fog Max Height" } } ] @@ -276,20 +277,20 @@ "key": "SetNoiseTexCoordVelocity", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetNoiseTexCoordVelocity" + "tooltip": "When signaled, this will invoke Set Noise Tex Coord Velocity" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetNoiseTexCoordVelocity is invoked" + "tooltip": "Signaled after Set Noise Tex Coord Velocity is invoked" }, "details": { - "name": "SetNoiseTexCoordVelocity" + "name": "Set Noise Tex Coord Velocity" }, "params": [ { "typeid": "{3D80F623-C85C-4741-90D0-E4E66164E6BF}", "details": { - "name": "Vector2" + "name": "Tex Coord Velocity" } } ] @@ -298,20 +299,20 @@ "key": "GetNoiseTexCoord2Velocity", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetNoiseTexCoord2Velocity" + "tooltip": "When signaled, this will invoke Get Noise Tex Coord 2 Velocity" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetNoiseTexCoord2Velocity is invoked" + "tooltip": "Signaled after Get Noise Tex Coord 2 Velocity is invoked" }, "details": { - "name": "GetNoiseTexCoord2Velocity" + "name": "Get Noise Tex Coord 2 Velocity" }, "results": [ { "typeid": "{3D80F623-C85C-4741-90D0-E4E66164E6BF}", "details": { - "name": "Vector2" + "name": "Tex Coord 2 Velocity" } } ] @@ -320,20 +321,20 @@ "key": "SetFogStartDistance", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetFogStartDistance" + "tooltip": "When signaled, this will invoke Set Fog Start Distance" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetFogStartDistance is invoked" + "tooltip": "Signaled after Set Fog Start Distance is invoked" }, "details": { - "name": "SetFogStartDistance" + "name": "Set Fog Start Distance" }, "params": [ { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", "details": { - "name": "float" + "name": "Fog Start Distance" } } ] @@ -342,20 +343,20 @@ "key": "GetFogMinHeight", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetFogMinHeight" + "tooltip": "When signaled, this will invoke Get Fog Min Height" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetFogMinHeight is invoked" + "tooltip": "Signaled after Get Fog Min Height is invoked" }, "details": { - "name": "GetFogMinHeight" + "name": "Get Fog Min Height" }, "results": [ { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", "details": { - "name": "float" + "name": "Fog Min Height" } } ] @@ -364,20 +365,20 @@ "key": "GetFogColor", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetFogColor" + "tooltip": "When signaled, this will invoke Get Fog Color" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetFogColor is invoked" + "tooltip": "Signaled after Get Fog Color is invoked" }, "details": { - "name": "GetFogColor" + "name": "Get Fog Color" }, "results": [ { "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}", "details": { - "name": "Vector3" + "name": "Fog Color" } } ] @@ -386,20 +387,20 @@ "key": "SetOctavesBlendFactor", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetOctavesBlendFactor" + "tooltip": "When signaled, this will invoke Set Octaves Blend Factor" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetOctavesBlendFactor is invoked" + "tooltip": "Signaled after Set Octaves Blend Factor is invoked" }, "details": { - "name": "SetOctavesBlendFactor" + "name": "Set Octaves Blend Factor" }, "params": [ { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", "details": { - "name": "float" + "name": "Octaves Blend Factor" } } ] @@ -408,20 +409,20 @@ "key": "GetOctavesBlendFactor", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetOctavesBlendFactor" + "tooltip": "When signaled, this will invoke Get Octaves Blend Factor" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetOctavesBlendFactor is invoked" + "tooltip": "Signaled after Get Octaves Blend Factor is invoked" }, "details": { - "name": "GetOctavesBlendFactor" + "name": "Get Octaves Blend Factor" }, "results": [ { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", "details": { - "name": "float" + "name": "Octaves Blend Factor" } } ] @@ -430,20 +431,20 @@ "key": "SetFogColor", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetFogColor" + "tooltip": "When signaled, this will invoke Set Fog Color" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetFogColor is invoked" + "tooltip": "Signaled after Set Fog Color is invoked" }, "details": { - "name": "SetFogColor" + "name": "Set Fog Color" }, "params": [ { "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}", "details": { - "name": "Vector3" + "name": "Fog Color" } } ] @@ -452,20 +453,20 @@ "key": "SetFogMinHeight", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetFogMinHeight" + "tooltip": "When signaled, this will invoke Set Fog Min Height" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetFogMinHeight is invoked" + "tooltip": "Signaled after Set Fog Min Height is invoked" }, "details": { - "name": "SetFogMinHeight" + "name": "Set Fog Min Height" }, "params": [ { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", "details": { - "name": "float" + "name": "Fog Min Height" } } ] @@ -474,20 +475,20 @@ "key": "GetNoiseTexture", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetNoiseTexture" + "tooltip": "When signaled, this will invoke Get Noise Texture" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetNoiseTexture is invoked" + "tooltip": "Signaled after Get Noise Texture is invoked" }, "details": { - "name": "GetNoiseTexture" + "name": "Get Noise Texture" }, "results": [ { "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", "details": { - "name": "AZStd::string" + "name": "Path" } } ] diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/InputSystemRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/InputSystemRequestBus.names index 883bed230d..ca2b65415c 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/InputSystemRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/InputSystemRequestBus.names @@ -5,21 +5,22 @@ "context": "EBusSender", "variant": "", "details": { - "name": "InputSystemRequestBus" + "name": "Input System", + "category": "Input" }, "methods": [ { "key": "RecreateEnabledInputDevices", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke RecreateEnabledInputDevices" + "tooltip": "When signaled, this will invoke Recreate Enabled Input Devices" }, "exit": { "name": "Out", - "tooltip": "Signaled after RecreateEnabledInputDevices is invoked" + "tooltip": "Signaled after Recreate Enabled Input Devices is invoked" }, "details": { - "name": "RecreateEnabledInputDevices" + "name": "Recreate Enabled Input Devices" } } ] diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/LookAt.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/LookAt.names index f45199ea84..3e77e49839 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/LookAt.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/LookAt.names @@ -5,28 +5,30 @@ "context": "EBusSender", "variant": "", "details": { - "name": "LookAt" + "name": "Look At", + "category": "Gameplay" }, "methods": [ { "key": "SetTarget", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetTarget" + "tooltip": "When signaled, this will invoke Set Target" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetTarget is invoked" + "tooltip": "Signaled after Set Target is invoked" }, "details": { - "name": "SetTarget" + "name": "Set Target", + "tooltip": "Set the entity to look at" }, "params": [ { "typeid": "{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}", "details": { - "name": "EntityId", - "tooltip": "Entity Unique Id" + "name": "Target", + "tooltip": "The entity to look at" } } ] @@ -35,20 +37,22 @@ "key": "SetTargetPosition", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetTargetPosition" + "tooltip": "When signaled, this will invoke Set Target Position" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetTargetPosition is invoked" + "tooltip": "Signaled after Set Target Position is invoked" }, "details": { - "name": "SetTargetPosition" + "name": "Set Target Position", + "tooltip": "Sets the target position to look at." }, "params": [ { "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}", "details": { - "name": "Vector3" + "name": "Position", + "tooltip": "The position to look at" } } ] @@ -57,20 +61,22 @@ "key": "SetAxis", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetAxis" + "tooltip": "When signaled, this will invoke Set Axis" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetAxis is invoked" + "tooltip": "Signaled after Set Axis is invoked" }, "details": { - "name": "SetAxis" + "name": "Set Axis", + "tooltip": "Specify the forward axis to use as reference for the look at" }, "params": [ { "typeid": "{72B9409A-7D1A-4831-9CFE-FCB3FADD3426}", "details": { - "name": "unsigned char" + "name": "Axis", + "tooltip": "The forward axis to use as reference" } } ] diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/LyShineExamplesCppExampleBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/LyShineExamplesCppExampleBus.names index 6e8aff1df5..fcfb8f30c2 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/LyShineExamplesCppExampleBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/LyShineExamplesCppExampleBus.names @@ -5,8 +5,8 @@ "context": "EBusSender", "variant": "", "details": { - "name": "LyShineExamplesCppExampleBus", - "category": "UI/LyShine Examples" + "name": "UI Examples", + "category": "UI" }, "methods": [ { @@ -20,8 +20,7 @@ "tooltip": "Signaled after Create Canvas is invoked" }, "details": { - "name": "Create Canvas", - "tooltip": "Creates a canvas using C++" + "name": "Create Canvas" } }, { @@ -35,8 +34,7 @@ "tooltip": "Signaled after Destroy Canvas is invoked" }, "details": { - "name": "Destroy Canvas", - "tooltip": "Destroys a canvas using C++" + "name": "Destroy Canvas" } } ] diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/Multi-Position Audio Requests.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/Multi-Position Audio Requests.names index 8234e0cc58..7cee9b0a66 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/Multi-Position Audio Requests.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/Multi-Position Audio Requests.names @@ -9,7 +9,7 @@ }, "methods": [ { - "key": "AddEntity", + "key": "Add Entity", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Add Entity" @@ -42,7 +42,7 @@ "tooltip": "Signaled after Remove Entity is invoked" }, "details": { - "name": "RemoveEntity" + "name": "Remove Entity" }, "params": [ { @@ -58,22 +58,21 @@ "key": "SetBehaviorType", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetBehaviorType" + "tooltip": "When signaled, this will invoke Set Behavior Type" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetBehaviorType is invoked" + "tooltip": "Signaled after Set Behavior Type is invoked" }, "details": { - "name": "Set Behavior Type", - "tooltip": "0: Separate, 1: Blended" + "name": "Set Behavior Type" }, "params": [ { "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", "details": { - "name": "Behavior Type", - "tooltip": "0: Separate, 1: Blended" + "name": "Type", + "tooltip": "0: Separate\n1: Blended" } } ] diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/SimpleStateComponentRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/SimpleStateComponentRequestBus.names index c234b3503c..bd619cbd4d 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/SimpleStateComponentRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/SimpleStateComponentRequestBus.names @@ -5,7 +5,7 @@ "context": "EBusSender", "variant": "", "details": { - "name": "SimpleStateComponentRequestBus", + "name": "Simple State", "category": "Gameplay" }, "methods": [ @@ -13,21 +13,20 @@ "key": "GetNumStates", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke Get State Count" + "tooltip": "When signaled, this will invoke Get Num States" }, "exit": { "name": "Out", - "tooltip": "Signaled after Get State Count is invoked" + "tooltip": "Signaled after Get Num States is invoked" }, "details": { - "name": "Get State Count", - "tooltip": "Returns the number of states" + "name": "Get Num States" }, "results": [ { "typeid": "{43DA906B-7DEF-4CA8-9790-854106D3F983}", "details": { - "name": "unsigned int" + "name": "State Count" } } ] @@ -36,82 +35,76 @@ "key": "SetToLastState", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke Set To Last" + "tooltip": "When signaled, this will invoke Set To Last State" }, "exit": { "name": "Out", - "tooltip": "Signaled after Set To Last is invoked" + "tooltip": "Signaled after Set To Last State is invoked" }, "details": { - "name": "Set To Last", - "tooltip": "Sets to the last state in the state list" + "name": "Set To Last State" } }, { "key": "SetToPreviousState", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke Set To Previous" + "tooltip": "When signaled, this will invoke Set To Previous State" }, "exit": { "name": "Out", - "tooltip": "Signaled after Set To Previous is invoked" + "tooltip": "Signaled after Set To Previous State is invoked" }, "details": { - "name": "Set To Previous", - "tooltip": "Sets to the previous state in the state list from the current state" + "name": "Set To Previous State" } }, { "key": "SetToFirstState", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke Set To First" + "tooltip": "When signaled, this will invoke Set To First State" }, "exit": { "name": "Out", - "tooltip": "Signaled after Set To First is invoked" + "tooltip": "Signaled after Set To First State is invoked" }, "details": { - "name": "Set To First", - "tooltip": "Sets to the first state in the state list" + "name": "Set To First State" } }, { "key": "SetToNextState", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke Set To Next" + "tooltip": "When signaled, this will invoke Set To Next State" }, "exit": { "name": "Out", - "tooltip": "Signaled after Set To Next is invoked" + "tooltip": "Signaled after Set To Next State is invoked" }, "details": { - "name": "Set To Next", - "tooltip": "Sets to the next state in the state list from the current state" + "name": "Set To Next State" } }, { "key": "SetStateByIndex", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke Set State by Index" + "tooltip": "When signaled, this will invoke Set State By Index" }, "exit": { "name": "Out", - "tooltip": "Signaled after Set State by Index is invoked" + "tooltip": "Signaled after Set State By Index is invoked" }, "details": { - "name": "Set State by Index", - "tooltip": "Sets the state by index" + "name": "Set State By Index" }, "params": [ { "typeid": "{43DA906B-7DEF-4CA8-9790-854106D3F983}", "details": { - "name": "Index", - "tooltip": "State index" + "name": "Index" } } ] @@ -127,15 +120,13 @@ "tooltip": "Signaled after Set State is invoked" }, "details": { - "name": "Set State", - "tooltip": "Sets the state by name" + "name": "Set State" }, "params": [ { "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", "details": { - "name": "Name", - "tooltip": "State name" + "name": "State Name" } } ] @@ -151,14 +142,13 @@ "tooltip": "Signaled after Get Current State is invoked" }, "details": { - "name": "Get Current State", - "tooltip": "Gets the current state name" + "name": "Get Current State" }, "results": [ { "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", "details": { - "name": "char" + "name": "State Name" } } ] diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/SpawnerComponentRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/SpawnerComponentRequestBus.names index aa1b298bde..bd8d62d99a 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/SpawnerComponentRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/SpawnerComponentRequestBus.names @@ -5,7 +5,7 @@ "context": "EBusSender", "variant": "", "details": { - "name": "SpawnerComponentRequestBus", + "name": "Spawner", "category": "Gameplay" }, "methods": [ @@ -13,20 +13,20 @@ "key": "SetDynamicSlice", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetDynamicSlice" + "tooltip": "When signaled, this will invoke Set Dynamic Slice" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetDynamicSlice is invoked" + "tooltip": "Signaled after Set Dynamic Slice is invoked" }, "details": { - "name": "SetDynamicSlice" + "name": "Set Dynamic Slice" }, "params": [ { "typeid": "{652ED536-3402-439B-AEBE-4A5DBC554085}", "details": { - "name": "AssetId" + "name": "Asset Id" } } ] @@ -35,20 +35,20 @@ "key": "GetCurrentlySpawnedSlices", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetCurrentlySpawnedSlices" + "tooltip": "When signaled, this will invoke Get Currently Spawned Slices" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetCurrentlySpawnedSlices is invoked" + "tooltip": "Signaled after Get Currently Spawned Slices is invoked" }, "details": { - "name": "GetCurrentlySpawnedSlices" + "name": "Get Currently Spawned Slices" }, "results": [ { "typeid": "{DCAD95EA-9447-5B13-AACC-6C7223E1C04D}", "details": { - "name": "" + "name": "Spawned Slices" } } ] @@ -57,20 +57,20 @@ "key": "HasAnyCurrentlySpawnedSlices", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke HasAnyCurrentlySpawnedSlices" + "tooltip": "When signaled, this will invoke Has Any Currently Spawned Slices" }, "exit": { "name": "Out", - "tooltip": "Signaled after HasAnyCurrentlySpawnedSlices is invoked" + "tooltip": "Signaled after Has Any Currently Spawned Slices is invoked" }, "details": { - "name": "HasAnyCurrentlySpawnedSlices" + "name": "Has Any Currently Spawned Slices" }, "results": [ { "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", "details": { - "name": "bool" + "name": "Result" } } ] @@ -79,20 +79,20 @@ "key": "GetAllCurrentlySpawnedEntities", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetAllCurrentlySpawnedEntities" + "tooltip": "When signaled, this will invoke Get All Currently Spawned Entities" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetAllCurrentlySpawnedEntities is invoked" + "tooltip": "Signaled after Get All Currently Spawned Entities is invoked" }, "details": { - "name": "GetAllCurrentlySpawnedEntities" + "name": "Get All Currently Spawned Entities" }, "results": [ { "typeid": "{4841CFF0-7A5C-519C-BD16-D3625E99605E}", "details": { - "name": "AZStd::vector" + "name": "Spawned Entities" } } ] @@ -101,34 +101,34 @@ "key": "DestroyAllSpawnedSlices", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke DestroyAllSpawnedSlices" + "tooltip": "When signaled, this will invoke Destroy All Spawned Slices" }, "exit": { "name": "Out", - "tooltip": "Signaled after DestroyAllSpawnedSlices is invoked" + "tooltip": "Signaled after Destroy All Spawned Slices is invoked" }, "details": { - "name": "DestroyAllSpawnedSlices" + "name": "Destroy All Spawned Slices" } }, { "key": "GetCurrentEntitiesFromSpawnedSlice", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetCurrentEntitiesFromSpawnedSlice" + "tooltip": "When signaled, this will invoke Get Current Entities From Spawned Slice" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetCurrentEntitiesFromSpawnedSlice is invoked" + "tooltip": "Signaled after Get Current Entities From Spawned Slice is invoked" }, "details": { - "name": "GetCurrentEntitiesFromSpawnedSlice" + "name": "Get Current Entities From Spawned Slice" }, "params": [ { "typeid": "{E6E7C0C5-07C9-44BB-A38C-930431948667}", "details": { - "name": "SliceInstantiationTicket" + "name": "Slice Instantiation Ticket" } } ], @@ -136,7 +136,7 @@ { "typeid": "{4841CFF0-7A5C-519C-BD16-D3625E99605E}", "details": { - "name": "AZStd::vector" + "name": "Entities" } } ] @@ -145,20 +145,20 @@ "key": "DestroySpawnedSlice", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke DestroySpawnedSlice" + "tooltip": "When signaled, this will invoke Destroy Spawned Slice" }, "exit": { "name": "Out", - "tooltip": "Signaled after DestroySpawnedSlice is invoked" + "tooltip": "Signaled after Destroy Spawned Slice is invoked" }, "details": { - "name": "DestroySpawnedSlice" + "name": "Destroy Spawned Slice" }, "params": [ { "typeid": "{E6E7C0C5-07C9-44BB-A38C-930431948667}", "details": { - "name": "SliceInstantiationTicket" + "name": "Slice Instantiation Ticket" } } ] @@ -167,20 +167,20 @@ "key": "IsReadyToSpawn", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke IsReadyToSpawn" + "tooltip": "When signaled, this will invoke Is Ready To Spawn" }, "exit": { "name": "Out", - "tooltip": "Signaled after IsReadyToSpawn is invoked" + "tooltip": "Signaled after Is Ready To Spawn is invoked" }, "details": { - "name": "IsReadyToSpawn" + "name": "Is Ready To Spawn" }, "results": [ { "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", "details": { - "name": "bool" + "name": "Is Ready" } } ] @@ -196,15 +196,13 @@ "tooltip": "Signaled after Spawn Relative is invoked" }, "details": { - "name": "Spawn Relative", - "tooltip": "Spawn the selected slice at the entity's location with the provided relative offset" + "name": "Spawn Relative" }, "params": [ { "typeid": "{5D9958E9-9F1E-4985-B532-FFFDE75FEDFD}", "details": { - "name": "Offset", - "tooltip": "The relative offset from the entity" + "name": "Transform" } } ], @@ -212,8 +210,7 @@ { "typeid": "{E6E7C0C5-07C9-44BB-A38C-930431948667}", "details": { - "name": "SliceInstantiationTicket", - "tooltip": "The relative offset from the entity" + "name": "Slice Instantiation Ticket" } } ] @@ -229,14 +226,13 @@ "tooltip": "Signaled after Spawn is invoked" }, "details": { - "name": "Spawn", - "tooltip": "Spawns the designated slice at the entity's location" + "name": "Spawn" }, "results": [ { "typeid": "{E6E7C0C5-07C9-44BB-A38C-930431948667}", "details": { - "name": "SliceInstantiationTicket" + "name": "Slice Instantiation Ticket" } } ] @@ -252,15 +248,13 @@ "tooltip": "Signaled after Spawn Absolute is invoked" }, "details": { - "name": "Spawn Absolute", - "tooltip": "Spawn the selected slice at an absolute position" + "name": "Spawn Absolute" }, "params": [ { "typeid": "{5D9958E9-9F1E-4985-B532-FFFDE75FEDFD}", "details": { - "name": "Position", - "tooltip": "The absolute position where the entity should spawn" + "name": "Transform" } } ], @@ -268,8 +262,7 @@ { "typeid": "{E6E7C0C5-07C9-44BB-A38C-930431948667}", "details": { - "name": "SliceInstantiationTicket", - "tooltip": "The absolute position where the entity should spawn" + "name": "Slice Instantiation Ticket" } } ] diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/TagComponentRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/TagComponentRequestBus.names index b0b63a23ed..da9973205b 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/TagComponentRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/TagComponentRequestBus.names @@ -5,8 +5,8 @@ "context": "EBusSender", "variant": "", "details": { - "name": "TagComponentRequestBus", - "category": "Gameplay" + "name": "Requests", + "category": "Gameplay/Tag" }, "methods": [ { @@ -20,15 +20,13 @@ "tooltip": "Signaled after Has Tag is invoked" }, "details": { - "name": "Has Tag", - "tooltip": "Returns true if an entity has a specified tag" + "name": "Has Tag" }, "params": [ { "typeid": "{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}", "details": { - "name": "Tag", - "tooltip": "The tag to check if the source entity has" + "name": "Tag" } } ], @@ -36,8 +34,7 @@ { "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", "details": { - "name": "bool", - "tooltip": "The tag to check if the source entity has" + "name": "Has Tag" } } ] @@ -53,15 +50,13 @@ "tooltip": "Signaled after Add Tag is invoked" }, "details": { - "name": "Add Tag", - "tooltip": "Adds a tag to an entity if it didn't already have it" + "name": "Add Tag" }, "params": [ { "typeid": "{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}", "details": { - "name": "Tag", - "tooltip": "The tag to add to the entity" + "name": "Tag" } } ] @@ -77,15 +72,13 @@ "tooltip": "Signaled after Remove Tag is invoked" }, "details": { - "name": "Remove Tag", - "tooltip": "Removes a tag from an entity if it had it" + "name": "Remove Tag" }, "params": [ { "typeid": "{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}", "details": { - "name": "Tag", - "tooltip": "The tag to remove from the entity" + "name": "Tag" } } ] diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/TagGlobalRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/TagGlobalRequestBus.names index fa31042580..dca7386616 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/TagGlobalRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/TagGlobalRequestBus.names @@ -5,8 +5,8 @@ "context": "EBusSender", "variant": "", "details": { - "name": "TagGlobalRequestBus", - "category": "Gameplay" + "name": "Requests", + "category": "Gameplay/Tag" }, "methods": [ { @@ -20,14 +20,13 @@ "tooltip": "Signaled after Request Tagged Entities is invoked" }, "details": { - "name": "Request Tagged Entities", - "tooltip": "Returns the first responding entity that has a specified Tag" + "name": "Request Tagged Entities" }, "results": [ { "typeid": "{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}", "details": { - "name": "EntityId", + "name": "Entity Id", "tooltip": "Entity Unique Id" } } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiTransformBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiTransformBus.names index 6628f2c84c..a0df1276cc 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiTransformBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiTransformBus.names @@ -5,23 +5,21 @@ "context": "EBusSender", "variant": "", "details": { - "name": "UiTransformBus", - "category": "UI" + "name": "Ui Transform Bus" }, "methods": [ { "key": "GetPivotY", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke Get Pivot Y" + "tooltip": "When signaled, this will invoke Get PivotY" }, "exit": { "name": "Out", - "tooltip": "Signaled after Get Pivot Y is invoked" + "tooltip": "Signaled after Get PivotY is invoked" }, "details": { - "name": "Get Pivot Y", - "tooltip": "Gets the Y value of the pivot point" + "name": "Get PivotY" }, "results": [ { @@ -36,15 +34,14 @@ "key": "GetScaleX", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke Get Scale X" + "tooltip": "When signaled, this will invoke Get ScaleX" }, "exit": { "name": "Out", - "tooltip": "Signaled after Get Scale X is invoked" + "tooltip": "Signaled after Get ScaleX is invoked" }, "details": { - "name": "Get Scale X", - "tooltip": "Gets the X value of the scale" + "name": "Get ScaleX" }, "results": [ { @@ -66,14 +63,13 @@ "tooltip": "Signaled after Get Scale is invoked" }, "details": { - "name": "Get Scale", - "tooltip": "Gets the scale" + "name": "Get Scale" }, "results": [ { "typeid": "{3D80F623-C85C-4741-90D0-E4E66164E6BF}", "details": { - "name": "Vector2" + "name": "Vector 2" } } ] @@ -82,22 +78,20 @@ "key": "SetLocalPositionX", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke Set Local Position X" + "tooltip": "When signaled, this will invoke Set Local PositionX" }, "exit": { "name": "Out", - "tooltip": "Signaled after Set Local Position X is invoked" + "tooltip": "Signaled after Set Local PositionX is invoked" }, "details": { - "name": "Set Local Position X", - "tooltip": "Sets the X position of the element relative to the center of the element's anchors" + "name": "Set Local PositionX" }, "params": [ { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", "details": { - "name": "X Local Position", - "tooltip": "The X position of the element relative to the center of the element's anchors" + "name": "float" } } ] @@ -106,22 +100,20 @@ "key": "SetScaleX", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke Set Scale X" + "tooltip": "When signaled, this will invoke Set ScaleX" }, "exit": { "name": "Out", - "tooltip": "Signaled after Set Scale X is invoked" + "tooltip": "Signaled after Set ScaleX is invoked" }, "details": { - "name": "Set Scale X", - "tooltip": "Sets the X value of the scale" + "name": "Set ScaleX" }, "params": [ { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", "details": { - "name": "X Scale", - "tooltip": "The X value of the scale" + "name": "float" } } ] @@ -130,22 +122,20 @@ "key": "SetZRotation", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke Set Z Rotation" + "tooltip": "When signaled, this will invoke SetZ Rotation" }, "exit": { "name": "Out", - "tooltip": "Signaled after Set Z Rotation is invoked" + "tooltip": "Signaled after SetZ Rotation is invoked" }, "details": { - "name": "Set Z Rotation", - "tooltip": "Sets the rotation about the z-axis" + "name": "SetZ Rotation" }, "params": [ { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", "details": { - "name": "Z Rotation", - "tooltip": "The rotation about the z-axis" + "name": "float" } } ] @@ -161,8 +151,7 @@ "tooltip": "Signaled after Get Scale To Device Mode is invoked" }, "details": { - "name": "Get Scale To Device Mode", - "tooltip": "Returns how the element and all its children are scaled to allow for the difference between the authored canvas size and the actual viewport size" + "name": "Get Scale To Device Mode" }, "results": [ { @@ -184,15 +173,13 @@ "tooltip": "Signaled after Set Pivot is invoked" }, "details": { - "name": "Set Pivot", - "tooltip": "Sets the pivot point" + "name": "Set Pivot" }, "params": [ { "typeid": "{3D80F623-C85C-4741-90D0-E4E66164E6BF}", "details": { - "name": "Pivot", - "tooltip": "The pivot point" + "name": "Vector 2" } } ] @@ -201,15 +188,14 @@ "key": "GetScaleY", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke Get Scale Y" + "tooltip": "When signaled, this will invoke Get ScaleY" }, "exit": { "name": "Out", - "tooltip": "Signaled after Get Scale Y is invoked" + "tooltip": "Signaled after Get ScaleY is invoked" }, "details": { - "name": "Get Scale Y", - "tooltip": "Gets the Y value of the scale" + "name": "Get ScaleY" }, "results": [ { @@ -231,15 +217,13 @@ "tooltip": "Signaled after Move Local Position By is invoked" }, "details": { - "name": "Move Local Position By", - "tooltip": "Moves the element relative to the center of the element's anchors" + "name": "Move Local Position By" }, "params": [ { "typeid": "{3D80F623-C85C-4741-90D0-E4E66164E6BF}", "details": { - "name": "Offset", - "tooltip": "The amount to move the local position" + "name": "Vector 2" } } ] @@ -248,22 +232,20 @@ "key": "SetLocalPositionY", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke Set Local Position Y" + "tooltip": "When signaled, this will invoke Set Local PositionY" }, "exit": { "name": "Out", - "tooltip": "Signaled after Set Local Position Y is invoked" + "tooltip": "Signaled after Set Local PositionY is invoked" }, "details": { - "name": "Set Local Position Y", - "tooltip": "Sets the Y position of the element relative to the center of the element's anchors" + "name": "Set Local PositionY" }, "params": [ { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", "details": { - "name": "Y Local Position", - "tooltip": "The Y position of the element relative to the center of the element's anchors" + "name": "float" } } ] @@ -279,15 +261,13 @@ "tooltip": "Signaled after Set Viewport Position is invoked" }, "details": { - "name": "Set Viewport Position", - "tooltip": "Sets the position of the element in viewport space" + "name": "Set Viewport Position" }, "params": [ { "typeid": "{3D80F623-C85C-4741-90D0-E4E66164E6BF}", "details": { - "name": "Position", - "tooltip": "The position of the element in viewport space" + "name": "Vector 2" } } ] @@ -303,15 +283,13 @@ "tooltip": "Signaled after Set Scale To Device Mode is invoked" }, "details": { - "name": "Set Scale To Device Mode", - "tooltip": "Sets how the element and all its children should be scaled to allow for the difference between the authored canvas size and the actual viewport size" + "name": "Set Scale To Device Mode" }, "params": [ { "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", "details": { - "name": "Scale to Device Mode", - "tooltip": "Indicates how the element and all its children are scaled to allow for the difference between the authored canvas size and the actual viewport size (0=None, 1=Scale to fit (uniformly), 2=Scale to fill (uniformly), 3=Scale to fit X (uniformly), 4=Scale to fit Y (uniformly), 5=Stretch to fill (non-uniformly), 6=Stretch to fit X (non-uniformly), 7=Stretch to fit Y (non-uniformly))" + "name": "int" } } ] @@ -320,15 +298,14 @@ "key": "GetLocalPositionX", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke Get Local Position X" + "tooltip": "When signaled, this will invoke Get Local PositionX" }, "exit": { "name": "Out", - "tooltip": "Signaled after Get Local Position X is invoked" + "tooltip": "Signaled after Get Local PositionX is invoked" }, "details": { - "name": "Get Local Position X", - "tooltip": "Gets the X position of the element relative to the center of the element's anchors" + "name": "Get Local PositionX" }, "results": [ { @@ -350,15 +327,13 @@ "tooltip": "Signaled after Move Canvas Position By is invoked" }, "details": { - "name": "Move Canvas Position By", - "tooltip": "Moves the element in canvas space" + "name": "Move Canvas Position By" }, "params": [ { "typeid": "{3D80F623-C85C-4741-90D0-E4E66164E6BF}", "details": { - "name": "Offset", - "tooltip": "The amount to move the canvas position" + "name": "Vector 2" } } ] @@ -367,22 +342,20 @@ "key": "SetPivotX", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke Set Pivot X" + "tooltip": "When signaled, this will invoke Set PivotX" }, "exit": { "name": "Out", - "tooltip": "Signaled after Set Pivot X is invoked" + "tooltip": "Signaled after Set PivotX is invoked" }, "details": { - "name": "Set Pivot X", - "tooltip": "Sets the X value of the pivot point" + "name": "Set PivotX" }, "params": [ { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", "details": { - "name": "X Pivot", - "tooltip": "The X value of the pivot point" + "name": "float" } } ] @@ -398,15 +371,13 @@ "tooltip": "Signaled after Move Viewport Position By is invoked" }, "details": { - "name": "Move Viewport Position By", - "tooltip": "Moves the element in viewport space" + "name": "Move Viewport Position By" }, "params": [ { "typeid": "{3D80F623-C85C-4741-90D0-E4E66164E6BF}", "details": { - "name": "Offset", - "tooltip": "The amount to move the viewport position" + "name": "Vector 2" } } ] @@ -415,22 +386,20 @@ "key": "SetPivotY", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke Set Pivot Y" + "tooltip": "When signaled, this will invoke Set PivotY" }, "exit": { "name": "Out", - "tooltip": "Signaled after Set Pivot Y is invoked" + "tooltip": "Signaled after Set PivotY is invoked" }, "details": { - "name": "Set Pivot Y", - "tooltip": "Sets the Y value of the pivot point" + "name": "Set PivotY" }, "params": [ { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", "details": { - "name": "Y Pivot", - "tooltip": "The Y value of the pivot point" + "name": "float" } } ] @@ -446,14 +415,13 @@ "tooltip": "Signaled after Get Viewport Position is invoked" }, "details": { - "name": "Get Viewport Position", - "tooltip": "Gets the position of the element in viewport space" + "name": "Get Viewport Position" }, "results": [ { "typeid": "{3D80F623-C85C-4741-90D0-E4E66164E6BF}", "details": { - "name": "Vector2" + "name": "Vector 2" } } ] @@ -469,15 +437,13 @@ "tooltip": "Signaled after Set Scale is invoked" }, "details": { - "name": "Set Scale", - "tooltip": "Sets the scale" + "name": "Set Scale" }, "params": [ { "typeid": "{3D80F623-C85C-4741-90D0-E4E66164E6BF}", "details": { - "name": "Scale", - "tooltip": "The scale" + "name": "Vector 2" } } ] @@ -493,15 +459,13 @@ "tooltip": "Signaled after Set Local Position is invoked" }, "details": { - "name": "Set Local Position", - "tooltip": "Sets the position of the element relative to the center of the element's anchors" + "name": "Set Local Position" }, "params": [ { "typeid": "{3D80F623-C85C-4741-90D0-E4E66164E6BF}", "details": { - "name": "Local Position", - "tooltip": "The position of the element relative to the center of the element's anchors" + "name": "Vector 2" } } ] @@ -517,14 +481,13 @@ "tooltip": "Signaled after Get Canvas Position is invoked" }, "details": { - "name": "Get Canvas Position", - "tooltip": "Gets the position of the element in canvas space" + "name": "Get Canvas Position" }, "results": [ { "typeid": "{3D80F623-C85C-4741-90D0-E4E66164E6BF}", "details": { - "name": "Vector2" + "name": "Vector 2" } } ] @@ -533,15 +496,14 @@ "key": "GetPivotX", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke Get Pivot X" + "tooltip": "When signaled, this will invoke Get PivotX" }, "exit": { "name": "Out", - "tooltip": "Signaled after Get Pivot X is invoked" + "tooltip": "Signaled after Get PivotX is invoked" }, "details": { - "name": "Get Pivot X", - "tooltip": "Gets the X value of the pivot point" + "name": "Get PivotX" }, "results": [ { @@ -556,15 +518,14 @@ "key": "GetZRotation", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke Get Z Rotation" + "tooltip": "When signaled, this will invoke GetZ Rotation" }, "exit": { "name": "Out", - "tooltip": "Signaled after Get Z Rotation is invoked" + "tooltip": "Signaled after GetZ Rotation is invoked" }, "details": { - "name": "Get Z Rotation", - "tooltip": "Gets the rotation about the z-axis" + "name": "GetZ Rotation" }, "results": [ { @@ -586,14 +547,13 @@ "tooltip": "Signaled after Get Local Position is invoked" }, "details": { - "name": "Get Local Position", - "tooltip": "Gets the position of the element relative to the center of the element's anchors" + "name": "Get Local Position" }, "results": [ { "typeid": "{3D80F623-C85C-4741-90D0-E4E66164E6BF}", "details": { - "name": "Vector2" + "name": "Vector 2" } } ] @@ -602,22 +562,20 @@ "key": "SetScaleY", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke Set Scale Y" + "tooltip": "When signaled, this will invoke Set ScaleY" }, "exit": { "name": "Out", - "tooltip": "Signaled after Set Scale Y is invoked" + "tooltip": "Signaled after Set ScaleY is invoked" }, "details": { - "name": "Set Scale Y", - "tooltip": "Sets the Y value of the scale" + "name": "Set ScaleY" }, "params": [ { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", "details": { - "name": "Y Scale", - "tooltip": "The Y value of the scale" + "name": "float" } } ] @@ -633,14 +591,13 @@ "tooltip": "Signaled after Get Pivot is invoked" }, "details": { - "name": "Get Pivot", - "tooltip": "Gets the pivot point" + "name": "Get Pivot" }, "results": [ { "typeid": "{3D80F623-C85C-4741-90D0-E4E66164E6BF}", "details": { - "name": "Vector2" + "name": "Vector 2" } } ] @@ -656,15 +613,13 @@ "tooltip": "Signaled after Set Canvas Position is invoked" }, "details": { - "name": "Set Canvas Position", - "tooltip": "Sets the position of the element in canvas space" + "name": "Set Canvas Position" }, "params": [ { "typeid": "{3D80F623-C85C-4741-90D0-E4E66164E6BF}", "details": { - "name": "Position", - "tooltip": "The position of the element in canvas space" + "name": "Vector 2" } } ] @@ -673,15 +628,14 @@ "key": "GetLocalPositionY", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke Get Local Position Y" + "tooltip": "When signaled, this will invoke Get Local PositionY" }, "exit": { "name": "Out", - "tooltip": "Signaled after Get Local Position Y is invoked" + "tooltip": "Signaled after Get Local PositionY is invoked" }, "details": { - "name": "Get Local Position Y", - "tooltip": "Gets the Y position of the element relative to the center of the element's anchors" + "name": "Get Local PositionY" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Input_InputHandler.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Input_InputHandler.names index 3d8d866497..3c875880c4 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Input_InputHandler.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Input_InputHandler.names @@ -5,8 +5,8 @@ "context": "ScriptCanvas::Node", "variant": "", "details": { - "name": "InputHandler", - "category": "Input", + "name": "Input Handler", + "category": "Input/Input System", "tooltip": "Handle processed input events found in input binding assets" }, "slots": [ diff --git a/Gems/ScriptCanvas/Code/Editor/Components/EditorGraph.cpp b/Gems/ScriptCanvas/Code/Editor/Components/EditorGraph.cpp index ec6e7d8f4c..77f791483b 100644 --- a/Gems/ScriptCanvas/Code/Editor/Components/EditorGraph.cpp +++ b/Gems/ScriptCanvas/Code/Editor/Components/EditorGraph.cpp @@ -1078,9 +1078,11 @@ namespace ScriptCanvasEditor return CanCreateConnectionBetween(scSourceEndpoint, scTargetEndpoint).IsSuccess(); } - AZStd::string Graph::GetDataTypeString(const AZ::Uuid& typeId) + AZStd::string Graph::GetDataTypeString(const AZ::Uuid&) { - return TranslationHelper::GetSafeTypeName(ScriptCanvas::Data::FromAZType(typeId)); + // This is used by the default tooltip setting in GraphCanvas, returning an empty string + // in order for tooltips to be fully controlled by ScriptCanvas + return {}; } void Graph::OnRemoveUnusedNodes() From 1a0d466443cd10b11851d4f78702bf6d79539df6 Mon Sep 17 00:00:00 2001 From: Nicholas Lawson <70027408+lawsonamzn@users.noreply.github.com> Date: Mon, 22 Nov 2021 11:18:19 -0800 Subject: [PATCH 195/345] Adds simple stats tracking to AssetProcessor (#5573) * Adds simple stats tracking to AssetProcessor The system captures cumulative and individual processing times. It avoids touching any part of the app which affects decision making or flow, or altering any structures such as JobEntry which are involved in processing, in order to keep it as simple and small as possible. Signed-off-by: lawsonamzn <70027408+lawsonamzn@users.noreply.github.com> --- .../assetprocessor_static_files.cmake | 2 + .../assetprocessor_test_files.cmake | 1 + .../AssetManager/assetProcessorManager.cpp | 24 ++ .../tests/utilities/StatsCaptureTest.cpp | 200 +++++++++ .../native/utilities/ApplicationManager.cpp | 14 +- .../utilities/ApplicationManagerBase.cpp | 1 + .../native/utilities/StatsCapture.cpp | 394 ++++++++++++++++++ .../native/utilities/StatsCapture.h | 40 ++ .../native/utilities/assetUtils.cpp | 7 +- Registry/AssetProcessorPlatformConfig.setreg | 13 + 10 files changed, 692 insertions(+), 4 deletions(-) create mode 100644 Code/Tools/AssetProcessor/native/tests/utilities/StatsCaptureTest.cpp create mode 100644 Code/Tools/AssetProcessor/native/utilities/StatsCapture.cpp create mode 100644 Code/Tools/AssetProcessor/native/utilities/StatsCapture.h diff --git a/Code/Tools/AssetProcessor/assetprocessor_static_files.cmake b/Code/Tools/AssetProcessor/assetprocessor_static_files.cmake index bce2458477..aa1d85d433 100644 --- a/Code/Tools/AssetProcessor/assetprocessor_static_files.cmake +++ b/Code/Tools/AssetProcessor/assetprocessor_static_files.cmake @@ -105,6 +105,8 @@ set(FILES native/utilities/PlatformConfiguration.cpp native/utilities/PlatformConfiguration.h native/utilities/PotentialDependencies.h + native/utilities/StatsCapture.cpp + native/utilities/StatsCapture.h native/utilities/SpecializedDependencyScanner.h native/utilities/ThreadHelper.cpp native/utilities/ThreadHelper.h diff --git a/Code/Tools/AssetProcessor/assetprocessor_test_files.cmake b/Code/Tools/AssetProcessor/assetprocessor_test_files.cmake index 6aebc8bc25..3a336ce97b 100644 --- a/Code/Tools/AssetProcessor/assetprocessor_test_files.cmake +++ b/Code/Tools/AssetProcessor/assetprocessor_test_files.cmake @@ -36,6 +36,7 @@ set(FILES native/tests/platformconfiguration/platformconfigurationtests.h native/tests/utilities/JobModelTest.cpp native/tests/utilities/JobModelTest.h + native/tests/utilities/StatsCaptureTest.cpp native/tests/AssetCatalog/AssetCatalogUnitTests.cpp native/tests/assetscanner/AssetScannerTests.h native/tests/assetscanner/AssetScannerTests.cpp diff --git a/Code/Tools/AssetProcessor/native/AssetManager/assetProcessorManager.cpp b/Code/Tools/AssetProcessor/native/AssetManager/assetProcessorManager.cpp index 05fe760bcb..de0f919a14 100644 --- a/Code/Tools/AssetProcessor/native/AssetManager/assetProcessorManager.cpp +++ b/Code/Tools/AssetProcessor/native/AssetManager/assetProcessorManager.cpp @@ -25,6 +25,7 @@ #include #include +#include #include "AssetRequestHandler.h" @@ -123,6 +124,9 @@ namespace AssetProcessor { if (status == AssetProcessor::AssetScanningStatus::Started) { + // capture scanning stats: + AssetProcessor::StatsCapture::BeginCaptureStat("AssetScanning"); + // Ensure that the source file list is populated before a scan begins m_sourceFilesInDatabase.clear(); m_fileModTimes.clear(); @@ -176,6 +180,8 @@ namespace AssetProcessor (status == AssetProcessor::AssetScanningStatus::Stopped)) { m_isCurrentlyScanning = false; + AssetProcessor::StatsCapture::EndCaptureStat("AssetScanning"); + // we cannot invoke this immediately - the scanner might be done, but we aren't actually ready until we've processed all remaining messages: QMetaObject::invokeMethod(this, "CheckMissingFiles", Qt::QueuedConnection); } @@ -209,13 +215,24 @@ namespace AssetProcessor } else { + QString statKey = QString("ProcessJob,%1,%2,%3").arg(jobEntry.m_databaseSourceName).arg(jobEntry.m_jobKey).arg(jobEntry.m_platformInfo.m_identifier.c_str()); + if (status == JobStatus::InProgress) { //update to in progress status m_jobRunKeyToJobInfoMap[jobEntry.m_jobRunKey].m_status = JobStatus::InProgress; + // stats tracking. Start accumulating time. + AssetProcessor::StatsCapture::BeginCaptureStat(statKey.toUtf8().constData()); + } else //if failed or succeeded remove from the map { + // note that sometimes this gets called twice, once by the RCJobs thread and once by the AP itself, + // because sometimes jobs take a short cut from "started" -> "failed" or "started" -> "complete + // without going thru the RC. + // as such, all the code in this block should be crafted to work regardless of whether its double called. + AssetProcessor::StatsCapture::EndCaptureStat(statKey.toUtf8().constData()); + m_jobRunKeyToJobInfoMap.erase(jobEntry.m_jobRunKey); Q_EMIT SourceFinished(sourceUUID, legacySourceUUID); Q_EMIT JobComplete(jobEntry, status); @@ -3355,8 +3372,13 @@ namespace AssetProcessor AZStd::string logFileName = AssetUtilities::ComputeJobLogFileName(createJobsRequest); { AssetUtilities::JobLogTraceListener jobLogTraceListener(logFileName, runKey, true); + // track the time it takes to createJobs. We can perform analysis later to present it by extension and other stats. + QString statKey = QString("CreateJobs,%1,%2").arg(actualRelativePath).arg(builderInfo.m_name.c_str()); + AssetProcessor::StatsCapture::BeginCaptureStat(statKey.toUtf8().constData()); builderInfo.m_createJobFunction(createJobsRequest, createJobsResponse); + AssetProcessor::StatsCapture::EndCaptureStat(statKey.toUtf8().constData()); } + AssetProcessor::SetThreadLocalJobId(0); bool isBuilderMissingFingerprint = (createJobsResponse.m_result == AssetBuilderSDK::CreateJobsResultCode::Success @@ -4839,5 +4861,7 @@ namespace AssetProcessor } return filesFound; } + + } // namespace AssetProcessor diff --git a/Code/Tools/AssetProcessor/native/tests/utilities/StatsCaptureTest.cpp b/Code/Tools/AssetProcessor/native/tests/utilities/StatsCaptureTest.cpp new file mode 100644 index 0000000000..ed7177e841 --- /dev/null +++ b/Code/Tools/AssetProcessor/native/tests/utilities/StatsCaptureTest.cpp @@ -0,0 +1,200 @@ +/* + * 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 +#include +#include +#include +#include +#include +#include + +// the simple stats capture system has a trivial interface and only writes to printf. +// So the simplest tests we can do is make sure it only asserts when it should +// and doesn't assert in cases when it shouldn't, and that the stats are reasonable +// in printf format. + +namespace AssetProcessor +{ +// Its okay to talk to this system when unintialized, you can gain some perf +// by not intializing it at all +TEST_F(AssetProcessorTest, StatsCaptureTest_UninitializedSystemDoesNotAssert) +{ + AssetProcessor::StatsCapture::BeginCaptureStat("Test"); + AssetProcessor::StatsCapture::EndCaptureStat("Test"); + AssetProcessor::StatsCapture::Dump(); + AssetProcessor::StatsCapture::Shutdown(); +} + +// Double-intiailize is an error +TEST_F(AssetProcessorTest, StatsCaptureTest_DoubleInitializeIsAnAssert) +{ + m_errorAbsorber->Clear(); + + AssetProcessor::StatsCapture::Initialize(); + AssetProcessor::StatsCapture::Initialize(); + + EXPECT_EQ(m_errorAbsorber->m_numErrorsAbsorbed, 0); + EXPECT_EQ(m_errorAbsorber->m_numAssertsAbsorbed, 1); // not allowed to assert on this + + AssetProcessor::StatsCapture::BeginCaptureStat("Test"); + AssetProcessor::StatsCapture::Shutdown(); +} + +class StatsCaptureOutputTest : public AssetProcessorTest, public AZ::Debug::TraceMessageBus::Handler +{ +public: + void SetUp() override + { + AssetProcessorTest::SetUp(); + AssetProcessor::StatsCapture::Initialize(); + } + + // dump but also capture the dump as a vector of lines: + void Dump() + { + AZ::Debug::TraceMessageBus::Handler::BusConnect(); + AssetProcessor::StatsCapture::Dump(); + AZ::Debug::TraceMessageBus::Handler::BusDisconnect(); + } + + virtual bool OnPrintf(const char* /*window*/, const char* message) + { + m_gatheredMessages.emplace_back(message); + AZ::StringFunc::TrimWhiteSpace(m_gatheredMessages.back(), true, true); + return false; + } + + void TearDown() override + { + m_gatheredMessages = {}; + + AssetProcessor::StatsCapture::Shutdown(); + AssetProcessorTest::TearDown(); + } + + AZStd::vector m_gatheredMessages; +}; + +// turning off machine and human readable mode, should not dump anything. +TEST_F(StatsCaptureOutputTest, StatsCaptureTest_DisabledByRegset_DumpsNothing) +{ + auto registry = AZ::SettingsRegistry::Get(); + ASSERT_NE(registry, nullptr); + registry->Set("/Amazon/AssetProcessor/Settings/Stats/HumanReadable", false); + registry->Set("/Amazon/AssetProcessor/Settings/Stats/MachineReadable", false); + AssetProcessor::StatsCapture::BeginCaptureStat("Test"); + AssetProcessor::StatsCapture::EndCaptureStat("Test"); + Dump(); + EXPECT_EQ(m_gatheredMessages.size(), 0); +} + +// turning on Human Readable, turn off Machine Readable, should not output any machine readable stats. +TEST_F(StatsCaptureOutputTest, StatsCaptureTest_HumanReadableOnly_DumpsNoMachineReadable) +{ + auto registry = AZ::SettingsRegistry::Get(); + ASSERT_NE(registry, nullptr); + registry->Set("/Amazon/AssetProcessor/Settings/Stats/HumanReadable", true); + registry->Set("/Amazon/AssetProcessor/Settings/Stats/MachineReadable", false); + AssetProcessor::StatsCapture::BeginCaptureStat("Test"); + AssetProcessor::StatsCapture::EndCaptureStat("Test"); + Dump(); + EXPECT_GT(m_gatheredMessages.size(), 0); + for (const auto& message : m_gatheredMessages) + { + // we expect to see ZERO "Machine Readable" lines + EXPECT_FALSE(message.contains("MachineReadableStat:")) << "Found unexpected line in output: " << message.c_str(); + } +} + +// Turn on Machine Readable, Turn off Human Readable, ensure only Machine Readable stats emitted. +TEST_F(StatsCaptureOutputTest, StatsCaptureTest_MachineReadableOnly_DumpsNoHumanReadable) +{ + auto registry = AZ::SettingsRegistry::Get(); + ASSERT_NE(registry, nullptr); + registry->Set("/Amazon/AssetProcessor/Settings/Stats/HumanReadable", false); + registry->Set("/Amazon/AssetProcessor/Settings/Stats/MachineReadable", true); + AssetProcessor::StatsCapture::BeginCaptureStat("Test"); + AssetProcessor::StatsCapture::EndCaptureStat("Test"); + Dump(); + for (const auto& message : m_gatheredMessages) + { + // we expect to see ONLY "Machine Readable" lines + EXPECT_TRUE(message.contains("MachineReadableStat:")) << "Found unexpected line in output: " << message.c_str(); + } + EXPECT_GT(m_gatheredMessages.size(), 0); +} + + +// The interface for StatsCapture just captures and then dumps. +// For us to test this, we thus have to capture and parse the dump output. +TEST_F(StatsCaptureOutputTest, StatsCaptureTest_Sanity) +{ + auto registry = AZ::SettingsRegistry::Get(); + ASSERT_NE(registry, nullptr); + + // Make it output in "machine raadable" format so that it is simpler to parse. + registry->Set("/Amazon/AssetProcessor/Settings/Stats/HumanReadable", false); + registry->Set("/Amazon/AssetProcessor/Settings/Stats/MachineReadable", true); + AssetProcessor::StatsCapture::BeginCaptureStat("CreateJobs,foo,mybuilder"); + AssetProcessor::StatsCapture::EndCaptureStat("CreateJobs,foo,mybuilder"); + + // Intentionally not using sleeps in this test. It means that the + // captured duration will be likely 0 but its not worth it to slow down tests. + // If the durations end up 0 its going to be extremely noticable in day-to-day use. + AssetProcessor::StatsCapture::BeginCaptureStat("CreateJobs,foo,mybuilder"); + AssetProcessor::StatsCapture::EndCaptureStat("CreateJobs,foo,mybuilder"); + + // for the second stat, we'll double capture and double end, in order to test debounce + AssetProcessor::StatsCapture::BeginCaptureStat("CreateJobs,foo2,mybuilder"); + AssetProcessor::StatsCapture::BeginCaptureStat("CreateJobs,foo2,mybuilder"); + AssetProcessor::StatsCapture::EndCaptureStat("CreateJobs,foo2,mybuilder2"); + AssetProcessor::StatsCapture::EndCaptureStat("CreateJobs,foo2,mybuilder2"); + + m_gatheredMessages.clear(); + Dump(); + EXPECT_GT(m_gatheredMessages.size(), 0); + + // We'll parse the machine readable stat lines here and make sure that the following is true + // mybuilder appears + // mybuilder appears only once but count is 2 + bool foundFoo = false; + bool foundFoo2 = false; + + for (const auto& stat : m_gatheredMessages) + { + if (stat.contains("MachineReadableStat:")) + { + AZStd::vector tokens; + AZ::StringFunc::Tokenize(stat, tokens, ":", false, false); + ASSERT_EQ(tokens.size(), 5); // should be "MachineReadableStat:time:count:average:name) + const auto& countData = tokens[2]; + const auto& nameData = tokens[4]; + + if (AZ::StringFunc::Equal(nameData, "CreateJobs,foo,mybuilder")) + { + EXPECT_FALSE(foundFoo); // should only find one of these + foundFoo = true; + EXPECT_STREQ(countData.c_str(), "2"); + } + + if (AZ::StringFunc::Equal(nameData, "CreateJobs,foo2,mybuilder2")) + { + EXPECT_FALSE(foundFoo2); // should only find one of these + foundFoo2 = true; + EXPECT_STREQ(countData.c_str(), "1"); + } + } + } + + EXPECT_TRUE(foundFoo) << "The expected token CreateJobs,foo,mybuilder did not appear in the output."; + EXPECT_TRUE(foundFoo2) << "The expected CreateJobs.foo2.mybuilder2 did not appear in the output"; +} + +} + diff --git a/Code/Tools/AssetProcessor/native/utilities/ApplicationManager.cpp b/Code/Tools/AssetProcessor/native/utilities/ApplicationManager.cpp index a024ce6c7a..7a14f158d6 100644 --- a/Code/Tools/AssetProcessor/native/utilities/ApplicationManager.cpp +++ b/Code/Tools/AssetProcessor/native/utilities/ApplicationManager.cpp @@ -16,7 +16,8 @@ #include #include -#include "native/resourcecompiler/RCBuilder.h" +#include +#include #include #include @@ -200,6 +201,10 @@ ApplicationManager::~ApplicationManager() delete m_appDependencies[idx]; } + // end stats capture (dump and shutdown) + AssetProcessor::StatsCapture::Dump(); + AssetProcessor::StatsCapture::Shutdown(); + qInstallMessageHandler(nullptr); //deleting QCoreApplication/QApplication @@ -571,6 +576,8 @@ bool ApplicationManager::StartAZFramework() bool ApplicationManager::ActivateModules() { + AssetProcessor::StatsCapture::BeginCaptureStat("LoadingModules"); + // we load the editor xml for our modules since it contains the list of gems we need for tools to function (not just runtime) connect(&m_frameworkApp, &AssetProcessorAZApplication::AssetProcessorStatus, this, [this](AssetProcessor::AssetProcessorStatusEntry entry) @@ -587,6 +594,8 @@ bool ApplicationManager::ActivateModules() } m_frameworkApp.LoadDynamicModules(); + + AssetProcessor::StatsCapture::EndCaptureStat("LoadingModules"); return true; } @@ -618,6 +627,9 @@ ApplicationManager::BeforeRunStatus ApplicationManager::BeforeRun() return ApplicationManager::BeforeRunStatus::Status_Failure; } + // enable stats capture from this point on + AssetProcessor::StatsCapture::Initialize(); + return ApplicationManager::BeforeRunStatus::Status_Success; } diff --git a/Code/Tools/AssetProcessor/native/utilities/ApplicationManagerBase.cpp b/Code/Tools/AssetProcessor/native/utilities/ApplicationManagerBase.cpp index 966b0f6723..eb230ce336 100644 --- a/Code/Tools/AssetProcessor/native/utilities/ApplicationManagerBase.cpp +++ b/Code/Tools/AssetProcessor/native/utilities/ApplicationManagerBase.cpp @@ -1173,6 +1173,7 @@ void ApplicationManagerBase::InitBuilderManager() { m_builderManager->ConnectionLost(connId); }); + } void ApplicationManagerBase::ShutdownBuilderManager() diff --git a/Code/Tools/AssetProcessor/native/utilities/StatsCapture.cpp b/Code/Tools/AssetProcessor/native/utilities/StatsCapture.cpp new file mode 100644 index 0000000000..1174e2500c --- /dev/null +++ b/Code/Tools/AssetProcessor/native/utilities/StatsCapture.cpp @@ -0,0 +1,394 @@ + /* + * 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 +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include + +namespace AssetProcessor +{ + namespace StatsCapture + { + // This class captures stats by storing them in a map of type + // [name of stat] -> Stat struct + // It can then analyze these stats and produce more stats from the original + // Captures, before dumping. + class StatsCaptureImpl final + { + public: + AZ_CLASS_ALLOCATOR(StatsCaptureImpl, AZ::SystemAllocator, 0); + + void BeginCaptureStat(AZStd::string_view statName); + void EndCaptureStat(AZStd::string_view statName); + void Dump(); + private: + using timepoint = AZStd::chrono::high_resolution_clock::time_point; + using duration = AZStd::chrono::milliseconds; + struct StatsEntry + { + duration m_cumulativeTime = {}; // The total amount of time spent on this. + timepoint m_operationStartTime = {}; // Async tracking - the last time stamp an operation started. + int64_t m_operationCount = 0; // In case there's more than one sample. Used to calc average. + }; + + AZStd::unordered_map m_stats; + bool m_dumpMachineReadableStats = false; + bool m_dumpHumanReadableStats = true; + + // Make a friendly time string of the format nnHnnMhhS.xxxms + AZStd::string FormatDuration(const duration& duration) + { + int64_t milliseconds = duration.count(); + constexpr int64_t millisecondsInASecond = 1000; + constexpr int64_t millisecondsInAMinute = millisecondsInASecond * 60; + constexpr int64_t millisecondsInAnHour = millisecondsInAMinute * 60; + + int64_t hours = milliseconds / millisecondsInAnHour; + milliseconds -= hours * millisecondsInAnHour; + + int64_t minutes = milliseconds / millisecondsInAMinute; + milliseconds -= minutes * millisecondsInAMinute; + + int64_t seconds = milliseconds / millisecondsInASecond; + milliseconds -= seconds * millisecondsInASecond; + + // omit the sections which dont make sense for readability + if (hours) + { + return AZStd::string::format("%02" PRId64 "h%02" PRId64 "m%02" PRId64 "s%03" PRId64 "ms" , hours, minutes, seconds, milliseconds); + } + else if (minutes) + { + return AZStd::string::format(" %02" PRId64 "m%02" PRId64 "s%03" PRId64 "ms", minutes, seconds, milliseconds); + } + else if (seconds) + { + return AZStd::string::format(" %02" PRId64 "s%03" PRId64 "ms", seconds, milliseconds); + } + + return AZStd::string::format(" %03" PRId64 "ms", milliseconds); + } + + // Prints out a single stat. + void PrintStat([[maybe_unused]] const char* name, duration milliseconds, int64_t count) + { + // note that name may be unused as it only appears in Trace macros, which are + // stripped out in release builds. + if (count <= 1) + { + count = 1; + } + + duration average(static_cast(static_cast(milliseconds.count()) / static_cast(count))); + + if (m_dumpHumanReadableStats) + { + if (count > 1) + { + AZ_TracePrintf(AssetProcessor::ConsoleChannel, " Time: %s, Count: %4" PRId64 ", Average: %s, EventName: %s\n", + FormatDuration(milliseconds).c_str(), + count, + FormatDuration(average).c_str(), + name); + } + else + { + AZ_TracePrintf(AssetProcessor::ConsoleChannel, " Time: %s, EventName: %s\n", + FormatDuration(milliseconds).c_str(), + name); + } + } + if (m_dumpMachineReadableStats) + { + // machine Readable mode prints raw milliseconds and uses a CSV-like format + // note that the stat itself may contain commas, so we dont acutally separate with comma + // instead we separate with : + // and each "interesting line" is 'MachineReadableStat:milliseconds:count:average:name' + AZ_TracePrintf(AssetProcessor::ConsoleChannel, "MachineReadableStat:%" PRId64 ":%" PRId64 ":%" PRId64 ":%s\n", + milliseconds.count(), + count, + count > 1 ? average.count() : milliseconds.count(), + name); + } + } + + // calls PrintStat on each element in the vector. + void PrintStatsArray(AZStd::vector& keys, int maxToPrint, const char* header) + { + if ((m_dumpHumanReadableStats)&&(header)) + { + AZ_TracePrintf(AssetProcessor::ConsoleChannel,"Top %i %s\n", maxToPrint, header); + } + + auto sortByTimeDescending = [&](const AZStd::string& s1, const AZStd::string& s2) + { + return this->m_stats[s1].m_cumulativeTime > this->m_stats[s2].m_cumulativeTime; + }; + + AZStd::sort(keys.begin(), keys.end(), sortByTimeDescending); + + for (int idx = 0; idx < maxToPrint; ++idx) + { + if (idx < keys.size()) + { + PrintStat(keys[idx].c_str(), m_stats[keys[idx]].m_cumulativeTime, m_stats[keys[idx]].m_operationCount); + } + } + } + }; + + + void StatsCaptureImpl::BeginCaptureStat(AZStd::string_view statName) + { + StatsEntry& existingStat = m_stats[statName]; + if (existingStat.m_operationStartTime != timepoint()) + { + // prevent double 'Begins' + return; + } + existingStat.m_operationStartTime = AZStd::chrono::high_resolution_clock::now(); + } + + void StatsCaptureImpl::EndCaptureStat(AZStd::string_view statName) + { + StatsEntry& existingStat = m_stats[statName]; + if (existingStat.m_operationStartTime != timepoint()) + { + existingStat.m_cumulativeTime = AZStd::chrono::high_resolution_clock::now() - existingStat.m_operationStartTime; + existingStat.m_operationCount = existingStat.m_operationCount + 1; + existingStat.m_operationStartTime = timepoint(); // reset the start time so that double 'Ends' are ignored. + } + } + + void StatsCaptureImpl::Dump() + { + timepoint startTimeStamp = AZStd::chrono::high_resolution_clock::now(); + + auto settingsRegistry = AZ::SettingsRegistry::Get(); + + int maxCumulativeStats = 5; // default max cumulative stats to show + int maxIndividualStats = 5; // default max individual files to show + + if (settingsRegistry) + { + AZ::u64 cumulativeStats = static_cast(maxCumulativeStats); + AZ::u64 individualStats = static_cast(maxIndividualStats); + settingsRegistry->Get(m_dumpHumanReadableStats, "/Amazon/AssetProcessor/Settings/Stats/HumanReadable"); + settingsRegistry->Get(m_dumpMachineReadableStats, "/Amazon/AssetProcessor/Settings/Stats/MachineReadable"); + settingsRegistry->Get(cumulativeStats, "/Amazon/AssetProcessor/Settings/Stats/MaxCumulativeStats"); + settingsRegistry->Get(individualStats, "/Amazon/AssetProcessor/Settings/Stats/MaxIndividualStats"); + maxCumulativeStats = static_cast(cumulativeStats); + maxIndividualStats = static_cast(individualStats); + } + + if ((!m_dumpHumanReadableStats)&&(!m_dumpMachineReadableStats)) + { + return; + } + + AZStd::vector allCreateJobs; // individual + AZStd::vector allCreateJobsByBuilder; // bucketed by builder + AZStd::vector allProcessJobs; // individual + AZStd::vector allProcessJobsByPlatform; // bucketed by platform + AZStd::vector allProcessJobsByJobKey; // bucketed by type of job (job key) + AZStd::vector allHashFiles; + + // capture only existing keys as we will be expanding the stats + // this approach avoids mutating an iterator. + AZStd::vector statKeys; + for (const auto& element : m_stats) + { + statKeys.push_back(element.first); + } + + for (const AZStd::string& statKey : statKeys) + { + const StatsEntry& statistic = m_stats[statKey]; + // Createjobs stats encode like (CreateJobs,sourcefilepath,builderid) + if (AZ::StringFunc::StartsWith(statKey, "CreateJobs,", true)) + { + allCreateJobs.push_back(statKey); + AZStd::vector tokens; + AZ::StringFunc::Tokenize(statKey, tokens, ",", false, false); + + // look up the builder so you can get its name: + AZStd::string_view builderName = tokens[2]; + + // synthesize a stat to track per-builder createjobs times: + { + AZStd::string newStatKey = AZStd::string::format("CreateJobsByBuilder,%.*s", AZ_STRING_ARG(builderName)); + + auto insertion = m_stats.insert(newStatKey); + StatsEntry& statToSynth = insertion.first->second; + statToSynth.m_cumulativeTime += statistic.m_cumulativeTime; + statToSynth.m_operationCount += statistic.m_operationCount; + if (insertion.second) + { + allCreateJobsByBuilder.push_back(newStatKey); + } + } + // synthesize a stat to track total createjobs times: + { + StatsEntry& statToSynth = m_stats["CreateJobsTotal"]; + statToSynth.m_cumulativeTime += statistic.m_cumulativeTime; + statToSynth.m_operationCount += statistic.m_operationCount; + } + } + else if (AZ::StringFunc::StartsWith(statKey, "ProcessJob,", true)) + { + allProcessJobs.push_back(statKey); + // processjob has the format ProcessJob,sourcename,jobkey,platformname + AZStd::vector tokens; + AZ::StringFunc::Tokenize(statKey, tokens, ",", false, false); + AZStd::string_view jobKey = tokens[2]; + AZStd::string_view platformName = tokens[3]; + + // synthesize a stat to record process time accumulated by job key platform + { + AZStd::string newStatKey = AZStd::string::format("ProcessJobsByPlatform,%.*s", AZ_STRING_ARG(platformName)); + auto insertion = m_stats.insert(newStatKey); + StatsEntry& statToSynth = insertion.first->second; + statToSynth.m_cumulativeTime += statistic.m_cumulativeTime; + statToSynth.m_operationCount += statistic.m_operationCount; + if (insertion.second) + { + allProcessJobsByPlatform.push_back(newStatKey); + } + } + + // synthesize a stat to record process time accumulated job key total across all platforms + { + AZStd::string newStatKey = AZStd::string::format("ProcessJobsByJobKey,%.*s", AZ_STRING_ARG(jobKey)); + auto insertion = m_stats.insert(newStatKey); + StatsEntry& statToSynth = insertion.first->second; + statToSynth.m_cumulativeTime += statistic.m_cumulativeTime; + statToSynth.m_operationCount += statistic.m_operationCount; + if (insertion.second) + { + allProcessJobsByJobKey.push_back(newStatKey); + } + } + // synthesize a stat to track total processjob times: + { + StatsEntry& statToSynth = m_stats["ProcessJobsTotal"]; + statToSynth.m_cumulativeTime += statistic.m_cumulativeTime; + statToSynth.m_operationCount += statistic.m_operationCount; + } + } + else if (AZ::StringFunc::StartsWith(statKey, "HashFile,", true)) + { + allHashFiles.push_back(statKey); + // processjob has the format ProcessJob,sourcename,jobkey,platformname + // synthesize a stat to track total hash times: + StatsEntry& statToSynth = m_stats["HashFileTotal"]; + statToSynth.m_cumulativeTime += statistic.m_cumulativeTime; + statToSynth.m_operationCount += statistic.m_operationCount; + } + } + + StatsEntry& gemLoadStat = m_stats["LoadingModules"]; + PrintStat("LoadingGems", gemLoadStat.m_cumulativeTime, 1); + // analysis-related stats + + StatsEntry& totalScanTime = m_stats["AssetScanning"]; + PrintStat("AssetScanning", totalScanTime.m_cumulativeTime, totalScanTime.m_operationCount); + StatsEntry& totalHashTime = m_stats["HashFileTotal"]; + PrintStat("HashFileTotal", totalHashTime.m_cumulativeTime, totalHashTime.m_operationCount); + PrintStatsArray(allHashFiles, maxIndividualStats, "longest individual file hashes:"); + + // CreateJobs stats + StatsEntry& totalCreateJobs = m_stats["CreateJobsTotal"]; + if (totalCreateJobs.m_operationCount) + { + PrintStat("CreateJobsTotal", totalCreateJobs.m_cumulativeTime, totalCreateJobs.m_operationCount); + PrintStatsArray(allCreateJobs, maxIndividualStats, "longest individual CreateJobs"); + PrintStatsArray(allCreateJobsByBuilder, maxCumulativeStats, "longest CreateJobs By builder"); + } + + // ProcessJobs stats + StatsEntry& totalProcessJobs = m_stats["ProcessJobsTotal"]; + if (totalProcessJobs.m_operationCount) + { + PrintStat("ProcessJobsTotal", totalProcessJobs.m_cumulativeTime, totalProcessJobs.m_operationCount); + PrintStatsArray(allProcessJobs, maxIndividualStats, "longest individual ProcessJob"); + PrintStatsArray(allProcessJobsByJobKey, maxCumulativeStats, "cumulative time spent in ProcessJob by JobKey"); + PrintStatsArray(allProcessJobsByPlatform, maxCumulativeStats, "cumulative time spent in ProcessJob by Platform"); + } + duration costToGenerateStats = AZStd::chrono::high_resolution_clock::now() - startTimeStamp; + PrintStat("ComputeStatsTime", costToGenerateStats, 1); + } + + // Public interface: + static StatsCaptureImpl* g_instance = nullptr; + + //! call this one time before capturing stats. + void Initialize() + { + if (g_instance) + { + AZ_Assert(false, "An instance of StatsCaptureImpl already exists."); + return; + } + g_instance = aznew StatsCaptureImpl(); + } + + //! Call this one time as part of shutting down. + //! note that while it is an error to double-initialize, it is intentionally + //! not an error to call any other function when uninitialized, allowing this system + //! to essentially be "turned off" just by not initializing it in the first place. + void Shutdown() + { + if (g_instance) + { + delete g_instance; + g_instance = nullptr; + } + } + + //! Start the clock running for a particular stat name. + void BeginCaptureStat(AZStd::string_view statName) + { + if (g_instance) + { + g_instance->BeginCaptureStat(statName); + } + } + + //! Stop the clock running for a particular stat name. + void EndCaptureStat(AZStd::string_view statName) + { + if (g_instance) + { + g_instance->EndCaptureStat(statName); + } + } + + //! Do additional processing and then write the cumulative stats to log. + //! Note that since this is an AP-specific system, the analysis done in the dump function + //! is going to make a lot of assumptions about the way the data is encoded. + void Dump() + { + if (g_instance) + { + g_instance->Dump(); + } + } + } +} diff --git a/Code/Tools/AssetProcessor/native/utilities/StatsCapture.h b/Code/Tools/AssetProcessor/native/utilities/StatsCapture.h new file mode 100644 index 0000000000..dd3c9abccf --- /dev/null +++ b/Code/Tools/AssetProcessor/native/utilities/StatsCapture.h @@ -0,0 +1,40 @@ +/* + * 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 + * + */ + +// This is an AssetProcessor-only stats capture system. Its kept out-of-band +// from the rest of the Asset Processor systems so that it can avoid interfering +// with the rest of the processing decision making and other parts of AssetProcessor. +// This is not meant to be used anywhere except in AssetProcessor. + +#pragma once + +#include + +namespace AssetProcessor +{ + namespace StatsCapture + { + //! call this one time before capturing stats. + void Initialize(); + + //! Call this one time as part of shutting down. + void Shutdown(); + + //! Start the clock running for a particular stat name. + void BeginCaptureStat(AZStd::string_view statName); + + //! Stop the clock running for a particular stat name. + void EndCaptureStat(AZStd::string_view statName); + + //! Do additional processing and then write the cumulative stats to log. + //! Note that since this is an AP-specific system, the analysis done in the dump function + //! is going to make a lot of assumptions about the way the data is encoded. + void Dump(); + } + +} diff --git a/Code/Tools/AssetProcessor/native/utilities/assetUtils.cpp b/Code/Tools/AssetProcessor/native/utilities/assetUtils.cpp index 340f5343bd..ae70ee7fe5 100644 --- a/Code/Tools/AssetProcessor/native/utilities/assetUtils.cpp +++ b/Code/Tools/AssetProcessor/native/utilities/assetUtils.cpp @@ -10,9 +10,10 @@ #include #include -#include "native/utilities/PlatformConfiguration.h" -#include "native/AssetManager/FileStateCache.h" -#include "native/AssetDatabase/AssetDatabase.h" +#include +#include +#include +#include #include #include #include diff --git a/Registry/AssetProcessorPlatformConfig.setreg b/Registry/AssetProcessorPlatformConfig.setreg index c8d8dd9a80..cf793a9802 100644 --- a/Registry/AssetProcessorPlatformConfig.setreg +++ b/Registry/AssetProcessorPlatformConfig.setreg @@ -21,6 +21,19 @@ "Amazon": { "AssetProcessor": { "Settings": { + "Stats": { + // Setting MachineReadable to true will output stats in more of a CSV-like format that is ideal for script ingestion + "MachineReadable" : false, + // Setting HumanReadable to true will output stats in a friendly human format that is ideal for human reading + "HumanReadable" : true, + // To turn off stats output entirely, set both HumanReadable and MachineReadable to false. + // the maximum number of stats to show for cumulative stats like the time taken + // across all jobs of a certain type, or all jobs cumulative across a whole platform + "MaxCumulativeStats" : 4, + // the maximum number of stats to show for individual stats like how long a specific + // individual job took. + "MaxIndividualStats" : 4 + }, "Platform pc": { "tags": "tools,renderer,dx12,vulkan,null" }, From a3a4038acaa23f79aac5bdd1557ad6bad78e9718 Mon Sep 17 00:00:00 2001 From: Roman <69218254+amzn-rhhong@users.noreply.github.com> Date: Mon, 22 Nov 2021 11:38:35 -0800 Subject: [PATCH 196/345] Added joint orientation rendering (#5821) * Render joint orientation Signed-off-by: rhhong * fix build error Signed-off-by: rhhong * CR feedback Signed-off-by: rhhong --- .../Code/Source/AtomActorDebugDraw.cpp | 106 +++++++++++++++++- .../Code/Source/AtomActorDebugDraw.h | 22 +++- .../Tools/EMStudio/AnimViewportToolBar.cpp | 2 +- .../Source/RenderPlugin/RenderOptions.cpp | 2 + .../Rendering/RenderActorSettings.h | 1 + 5 files changed, 126 insertions(+), 7 deletions(-) diff --git a/Gems/AtomLyIntegration/EMotionFXAtom/Code/Source/AtomActorDebugDraw.cpp b/Gems/AtomLyIntegration/EMotionFXAtom/Code/Source/AtomActorDebugDraw.cpp index a079cb660c..a6dc818fc5 100644 --- a/Gems/AtomLyIntegration/EMotionFXAtom/Code/Source/AtomActorDebugDraw.cpp +++ b/Gems/AtomLyIntegration/EMotionFXAtom/Code/Source/AtomActorDebugDraw.cpp @@ -6,6 +6,8 @@ * */ +#include + #include #include #include @@ -25,6 +27,7 @@ namespace AZ::Render { AtomActorDebugDraw::AtomActorDebugDraw(AZ::EntityId entityId) + : m_entityId(entityId) { m_auxGeomFeatureProcessor = RPI::Scene::GetFeatureProcessorForEntity(entityId); } @@ -42,9 +45,11 @@ namespace AZ::Render return; } - const RPI::Scene* scene = RPI::Scene::GetSceneForEntityId(instance->GetEntityId()); + const RPI::Scene* scene = RPI::Scene::GetSceneForEntityId(m_entityId); const RPI::ViewportContextPtr viewport = AZ::Interface::Get()->GetViewportContextByScene(scene); + AzFramework::DebugDisplayRequests* debugDisplay = GetDebugDisplay(viewport->GetId()); const AZ::Render::RenderActorSettings& renderActorSettings = EMotionFX::GetRenderActorSettings(); + const float scaleMultiplier = CalculateScaleMultiplier(instance); // Render aabb if (renderFlags[EMotionFX::ActorRenderFlag::RENDER_AABB]) @@ -75,6 +80,12 @@ namespace AZ::Render RenderEMFXDebugDraw(instance); } + // Render + if (renderFlags[EMotionFX::ActorRenderFlag::RENDER_NODEORIENTATION]) + { + RenderNodeOrientations(instance, debugDisplay, renderActorSettings.m_nodeOrientationScale * scaleMultiplier); + } + // Render vertex normal, face normal, tagent and wireframe. const bool renderVertexNormals = renderFlags[EMotionFX::ActorRenderFlag::RENDER_VERTEXNORMALS]; const bool renderFaceNormals = renderFlags[EMotionFX::ActorRenderFlag::RENDER_FACENORMALS]; @@ -87,7 +98,6 @@ namespace AZ::Render const EMotionFX::Pose* pose = instance->GetTransformData()->GetCurrentPose(); const size_t geomLODLevel = instance->GetLODLevel(); const size_t numEnabled = instance->GetNumEnabledNodes(); - const float scaleMultiplier = CalculateScaleMultiplier(instance); for (size_t i = 0; i < numEnabled; ++i) { EMotionFX::Node* node = instance->GetActor()->GetSkeleton()->GetNode(instance->GetEnabledNode(i)); @@ -175,6 +185,13 @@ namespace AZ::Render } } + AzFramework::DebugDisplayRequests* AtomActorDebugDraw::GetDebugDisplay(AzFramework::ViewportId viewportId) + { + AzFramework::DebugDisplayRequestBus::BusPtr debugDisplayBus; + AzFramework::DebugDisplayRequestBus::Bind(debugDisplayBus, viewportId); + return AzFramework::DebugDisplayRequestBus::FindFirstHandler(debugDisplayBus); + } + void AtomActorDebugDraw::RenderAABB(EMotionFX::ActorInstance* instance, const AZ::Color& aabbColor) { RPI::AuxGeomDrawPtr auxGeom = m_auxGeomFeatureProcessor->GetDrawQueue(); @@ -610,4 +627,89 @@ namespace AZ::Render m_fontDrawInterface->DrawScreenAlignedText3d(m_drawParams, joint->GetName()); } } + + void AtomActorDebugDraw::RenderNodeOrientations(EMotionFX::ActorInstance* actorInstance, + AzFramework::DebugDisplayRequests* debugDisplay, float scale) + { + // Get the actor and the transform data + const float unitScale = + 1.0f / (float)MCore::Distance::ConvertValue(1.0f, MCore::Distance::UNITTYPE_METERS, EMotionFX::GetEMotionFX().GetUnitType()); + const EMotionFX::Actor* actor = actorInstance->GetActor(); + const EMotionFX::Skeleton* skeleton = actor->GetSkeleton(); + const EMotionFX::TransformData* transformData = actorInstance->GetTransformData(); + const EMotionFX::Pose* pose = transformData->GetCurrentPose(); + const float constPreScale = scale * unitScale * 3.0f; + + const size_t numEnabled = actorInstance->GetNumEnabledNodes(); + for (size_t i = 0; i < numEnabled; ++i) + { + EMotionFX::Node* joint = skeleton->GetNode(actorInstance->GetEnabledNode(i)); + const size_t jointIndex = joint->GetNodeIndex(); + + static const float axisBoneScale = 50.0f; + const float size = CalculateBoneScale(actorInstance, joint) * constPreScale * axisBoneScale; + AZ::Transform worldTM = pose->GetWorldSpaceTransform(jointIndex).ToAZTransform(); + RenderLineAxis(debugDisplay, worldTM, size, false /*selected*/); + } + } + + void AtomActorDebugDraw::RenderLineAxis( + AzFramework::DebugDisplayRequests* debugDisplay, + AZ::Transform worldTM, + float size, + bool selected, + bool renderAxisName) + { + const float axisHeight = size * 0.7f; + const float frontSize = size * 5.0f + 0.2f; + const AZ::Vector3 position = worldTM.GetTranslation(); + + // Render x axis + { + AZ::Color xSelectedColor = selected ? AZ::Colors::Orange : AZ::Colors::Red; + + const AZ::Vector3 xAxisDir = (worldTM.TransformPoint(AZ::Vector3(size, 0.0f, 0.0f)) - position).GetNormalized(); + const AZ::Vector3 xAxisArrowStart = position + xAxisDir * axisHeight; + debugDisplay->SetColor(xSelectedColor); + debugDisplay->DrawArrow(position, xAxisArrowStart, size); + + if (renderAxisName) + { + const AZ::Vector3 xNamePos = position + xAxisDir * (size * 1.15f); + debugDisplay->DrawTextLabel(xNamePos, frontSize, "X"); + } + } + + // Render y axis + { + AZ::Color ySelectedColor = selected ? AZ::Colors::Orange : AZ::Colors::Blue; + + const AZ::Vector3 yAxisDir = (worldTM.TransformPoint(AZ::Vector3(0.0f, size, 0.0f)) - position).GetNormalized(); + const AZ::Vector3 yAxisArrowStart = position + yAxisDir * axisHeight; + debugDisplay->SetColor(ySelectedColor); + debugDisplay->DrawArrow(position, yAxisArrowStart, size); + + if (renderAxisName) + { + const AZ::Vector3 yNamePos = position + yAxisDir * (size * 1.15f); + debugDisplay->DrawTextLabel(yNamePos, frontSize, "Y"); + } + } + + // Render z axis + { + AZ::Color zSelectedColor = selected ? AZ::Colors::Orange : AZ::Colors::Green; + + const AZ::Vector3 zAxisDir = (worldTM.TransformPoint(AZ::Vector3(0.0f, 0.0f, size)) - position).GetNormalized(); + const AZ::Vector3 zAxisArrowStart = position + zAxisDir * axisHeight; + debugDisplay->SetColor(zSelectedColor); + debugDisplay->DrawArrow(position, zAxisArrowStart, size); + + if (renderAxisName) + { + const AZ::Vector3 zNamePos = position + zAxisDir * (size * 1.15f); + debugDisplay->DrawTextLabel(zNamePos, frontSize, "Z"); + } + } + } } // namespace AZ::Render diff --git a/Gems/AtomLyIntegration/EMotionFXAtom/Code/Source/AtomActorDebugDraw.h b/Gems/AtomLyIntegration/EMotionFXAtom/Code/Source/AtomActorDebugDraw.h index 6289077fe2..d3a6bc44f3 100644 --- a/Gems/AtomLyIntegration/EMotionFXAtom/Code/Source/AtomActorDebugDraw.h +++ b/Gems/AtomLyIntegration/EMotionFXAtom/Code/Source/AtomActorDebugDraw.h @@ -15,6 +15,11 @@ #include #include +namespace AzFramework +{ + class DebugDisplayRequests; +} + namespace EMotionFX { class Mesh; @@ -42,6 +47,7 @@ namespace AZ::Render float CalculateBoneScale(EMotionFX::ActorInstance* actorInstance, EMotionFX::Node* node); float CalculateScaleMultiplier(EMotionFX::ActorInstance* instance) const; void PrepareForMesh(EMotionFX::Mesh* mesh, const AZ::Transform& worldTM); + AzFramework::DebugDisplayRequests* GetDebugDisplay(AzFramework::ViewportId viewportId); void RenderAABB(EMotionFX::ActorInstance* instance, const AZ::Color& aabbColor); void RenderLineSkeleton(EMotionFX::ActorInstance* instance, const AZ::Color& skeletonColor); @@ -63,11 +69,18 @@ namespace AZ::Render void RenderWireframe(EMotionFX::Mesh* mesh, const AZ::Transform& worldTM, float wireframeScale, float scaleMultiplier, const AZ::Color& wireframeColor); void RenderJointNames(EMotionFX::ActorInstance* actorInstance, RPI::ViewportContextPtr viewportContext, const AZ::Color& jointNameColor); + void RenderNodeOrientations(EMotionFX::ActorInstance* actorInstance, AzFramework::DebugDisplayRequests* debugDisplay, float scale = 1.0f); + void RenderLineAxis( + AzFramework::DebugDisplayRequests* debugDisplay, + AZ::Transform worldTM, //!< The world space transformation matrix to visualize. */ + float size, //!< The size value in units is used to control the scaling of the axis. */ + bool selected, //!< Set to true if you want to render the axis using the selection color. */ + bool renderAxisName = false); - EMotionFX::Mesh* m_currentMesh = nullptr; /**< A pointer to the mesh whose world space positions are in the pre-calculated positions buffer. - NULL in case we haven't pre-calculated any positions yet. */ - AZStd::vector m_worldSpacePositions; /**< The buffer used to store world space positions for rendering normals - tangents and the wireframe. */ + EMotionFX::Mesh* m_currentMesh = nullptr; //!< A pointer to the mesh whose world space positions are in the pre-calculated positions buffer. + //!< NULL in case we haven't pre-calculated any positions yet. + AZStd::vector m_worldSpacePositions; //!< The buffer used to store world space positions for rendering normals + //!< tangents and the wireframe. static constexpr float BaseFontSize = 0.7f; const Vector3 TopRightBorderPadding = AZ::Vector3(-40.0f, 22.0f, 0.0f); @@ -75,6 +88,7 @@ namespace AZ::Render RPI::AuxGeomFeatureProcessorInterface* m_auxGeomFeatureProcessor = nullptr; AZStd::vector m_auxVertices; AZStd::vector m_auxColors; + EntityId m_entityId; AzFramework::TextDrawParameters m_drawParams; AzFramework::FontDrawInterface* m_fontDrawInterface = nullptr; diff --git a/Gems/AtomLyIntegration/EMotionFXAtom/Code/Tools/EMStudio/AnimViewportToolBar.cpp b/Gems/AtomLyIntegration/EMotionFXAtom/Code/Tools/EMStudio/AnimViewportToolBar.cpp index 4fb59afd1b..7bb8d49418 100644 --- a/Gems/AtomLyIntegration/EMotionFXAtom/Code/Tools/EMStudio/AnimViewportToolBar.cpp +++ b/Gems/AtomLyIntegration/EMotionFXAtom/Code/Tools/EMStudio/AnimViewportToolBar.cpp @@ -46,8 +46,8 @@ namespace EMStudio CreateViewOptionEntry(contextMenu, "Line Skeleton", EMotionFX::ActorRenderFlag::RENDER_LINESKELETON); CreateViewOptionEntry(contextMenu, "Solid Skeleton", EMotionFX::ActorRenderFlag::RENDER_SKELETON); CreateViewOptionEntry(contextMenu, "Joint Names", EMotionFX::ActorRenderFlag::RENDER_NODENAMES); + CreateViewOptionEntry(contextMenu, "Joint Orientations", EMotionFX::ActorRenderFlag::RENDER_NODEORIENTATION); // [EMFX-TODO] Add those option once implemented. - // CreateViewOptionEntry(contextMenu, "Joint Orientations", EMotionFX::ActorRenderFlag::RENDER_NODEORIENTATION); // CreateViewOptionEntry(contextMenu, "Actor Bind Pose", EMotionFX::ActorRenderFlag::RENDER_ACTORBINDPOSE); contextMenu->addSeparator(); CreateViewOptionEntry(contextMenu, "Hit Detection Colliders", EMotionFX::ActorRenderFlag::RENDER_HITDETECTION_COLLIDERS); diff --git a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/RenderPlugin/RenderOptions.cpp b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/RenderPlugin/RenderOptions.cpp index c7cdecafe0..241412c6c8 100644 --- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/RenderPlugin/RenderOptions.cpp +++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/RenderPlugin/RenderOptions.cpp @@ -1063,6 +1063,7 @@ namespace EMStudio settings.m_vertexNormalsScale = m_vertexNormalsScale; settings.m_faceNormalsScale = m_faceNormalsScale; settings.m_tangentsScale = m_tangentsScale; + settings.m_nodeOrientationScale = m_nodeOrientationScale; settings.m_vertexNormalsColor = m_vertexNormalsColor; settings.m_faceNormalsColor = m_faceNormalsColor; @@ -1112,6 +1113,7 @@ namespace EMStudio void RenderOptions::OnNodeOrientationScaleChangedCallback() const { PluginOptionsNotificationsBus::Event(s_nodeOrientationScaleOptionName, &PluginOptionsNotificationsBus::Events::OnOptionChanged, s_nodeOrientationScaleOptionName); + CopyToRenderActorSettings(EMotionFX::GetRenderActorSettings()); } void RenderOptions::OnScaleBonesOnLengthChangedCallback() const diff --git a/Gems/EMotionFX/Code/Source/Integration/Rendering/RenderActorSettings.h b/Gems/EMotionFX/Code/Source/Integration/Rendering/RenderActorSettings.h index 0fa7842ded..0260d1aae5 100644 --- a/Gems/EMotionFX/Code/Source/Integration/Rendering/RenderActorSettings.h +++ b/Gems/EMotionFX/Code/Source/Integration/Rendering/RenderActorSettings.h @@ -26,6 +26,7 @@ namespace AZ::Render float m_faceNormalsScale = 1.0f; float m_tangentsScale = 1.0f; float m_wireframeScale = 1.0f; + float m_nodeOrientationScale = 1.0f; AZ::Color m_hitDetectionColliderColor{0.44f, 0.44f, 0.44f, 1.0f}; AZ::Color m_selectedHitDetectionColliderColor{ 0.3f, 0.56f, 0.88f, 1.0f }; From 5d09e8d42e7f820c56f4e9ac3a8eb41d88286fcb Mon Sep 17 00:00:00 2001 From: lsemp3d <58790905+lsemp3d@users.noreply.github.com> Date: Mon, 22 Nov 2021 12:22:38 -0800 Subject: [PATCH 197/345] Fixed generated property names, pull argument names from BC when available, auto-reload on asset change Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com> --- Gems/GraphCanvas/Code/Source/GraphCanvas.cpp | 10 +++++++ Gems/GraphCanvas/Code/Source/GraphCanvas.h | 3 ++ .../TranslationAssets/Properties/ALPHA.names | 21 +++++++++++-- .../AreaBlenderComponentTypeId.names | 28 +++++++++++++++++ .../Properties/AreaLightComponentTypeId.names | 21 +++++++++++-- .../AudioObstructionType_Ignore.names | 21 +++++++++++-- .../AudioObstructionType_MultiRay.names | 21 +++++++++++-- .../AudioObstructionType_SingleRay.names | 21 +++++++++++-- .../AudioPreloadComponentLoadType_Auto.names | 21 +++++++++++-- ...AudioPreloadComponentLoadType_Manual.names | 21 +++++++++++-- .../AxisAlignedBoxShapeComponentTypeId.names | 21 +++++++++++-- .../TranslationAssets/Properties/BRAVO.names | 21 +++++++++++-- .../Properties/BlendFactor_AlphaDest.names | 21 +++++++++++-- .../BlendFactor_AlphaDestInverse.names | 21 +++++++++++-- .../Properties/BlendFactor_AlphaSource.names | 21 +++++++++++-- .../Properties/BlendFactor_AlphaSource1.names | 21 +++++++++++-- .../BlendFactor_AlphaSource1Inverse.names | 21 +++++++++++-- .../BlendFactor_AlphaSourceInverse.names | 21 +++++++++++-- .../BlendFactor_AlphaSourceSaturate.names | 21 +++++++++++-- .../Properties/BlendFactor_ColorDest.names | 21 +++++++++++-- .../BlendFactor_ColorDestInverse.names | 21 +++++++++++-- .../Properties/BlendFactor_ColorSource.names | 21 +++++++++++-- .../Properties/BlendFactor_ColorSource1.names | 21 +++++++++++-- .../BlendFactor_ColorSource1Inverse.names | 21 +++++++++++-- .../BlendFactor_ColorSourceInverse.names | 21 +++++++++++-- .../Properties/BlendFactor_Factor.names | 21 +++++++++++-- .../BlendFactor_FactorInverse.names | 21 +++++++++++-- .../Properties/BlendFactor_Invalid.names | 21 +++++++++++-- .../Properties/BlendFactor_One.names | 21 +++++++++++-- .../Properties/BlendFactor_Zero.names | 21 +++++++++++-- .../Properties/BlendOp_Add.names | 21 +++++++++++-- .../Properties/BlendOp_Invalid.names | 21 +++++++++++-- .../Properties/BlendOp_Maximum.names | 21 +++++++++++-- .../Properties/BlendOp_Minimum.names | 21 +++++++++++-- .../Properties/BlendOp_Subtract.names | 21 +++++++++++-- .../Properties/BlendOp_SubtractReverse.names | 21 +++++++++++-- .../Properties/BlockerComponentTypeId.names | 28 +++++++++++++++++ .../Properties/BloomComponentTypeId.names | 21 +++++++++++-- .../Properties/BoxShapeComponentTypeId.names | 21 +++++++++++-- .../Properties/CHARLIE.names | 21 +++++++++++-- .../TranslationAssets/Properties/CUBE.names | 28 +++++++++++++++++ .../Properties/CYLINDER.names | 28 +++++++++++++++++ .../CapsuleShapeComponentTypeId.names | 21 +++++++++++-- .../ConstantGradientComponentTypeId.names | 21 +++++++++++-- .../Properties/CullMode_Back.names | 21 +++++++++++-- .../Properties/CullMode_Front.names | 21 +++++++++++-- .../Properties/CullMode_Invalid.names | 21 +++++++++++-- .../Properties/CullMode_None.names | 21 +++++++++++-- .../CylinderShapeComponentTypeId.names | 21 +++++++++++-- .../Properties/DecalComponentTypeId.names | 21 +++++++++++-- .../Properties/DefaultLodOverride.names | 21 +++++++++++-- .../Properties/DefaultLodType.names | 21 +++++++++++-- .../DefaultMaterialAssignment.names | 21 +++++++++++-- .../DefaultMaterialAssignmentId.names | 21 +++++++++++-- .../DefaultMaterialAssignmentMap.names | 21 +++++++++++-- .../Properties/DefaultPhysicsSceneId.names | 21 +++++++++++-- .../Properties/DefaultPhysicsSceneName.names | 21 +++++++++++-- .../DeferredFogComponentTypeId.names | 21 +++++++++++-- .../DepthOfFieldComponentTypeId.names | 21 +++++++++++-- .../Properties/DepthWriteMask_All.names | 21 +++++++++++-- .../Properties/DepthWriteMask_Invalid.names | 21 +++++++++++-- .../Properties/DepthWriteMask_Zero.names | 21 +++++++++++-- ...escriptorListCombinerComponentTypeId.names | 28 +++++++++++++++++ .../DescriptorListComponentTypeId.names | 28 +++++++++++++++++ ...criptorWeightSelectorComponentTypeId.names | 28 +++++++++++++++++ ...useGlobalIlluminationComponentTypeId.names | 21 +++++++++++-- .../DiffuseProbeGridComponentTypeId.names | 21 +++++++++++-- .../DirectionalLightComponentTypeId.names | 21 +++++++++++-- .../Properties/DiskShapeComponentTypeId.names | 21 +++++++++++-- .../DisplayMapperComponentTypeId.names | 21 +++++++++++-- .../DisplaySettings_HideHelpers.names | 21 +++++++++++-- .../DisplaySettings_HideLinks.names | 21 +++++++++++-- .../DisplaySettings_HideTracks.names | 21 +++++++++++-- .../DisplaySettings_NoCollision.names | 21 +++++++++++-- .../Properties/DisplaySettings_NoLabels.names | 21 +++++++++++-- .../Properties/DisplaySettings_Physics.names | 21 +++++++++++-- ...isplaySettings_SerializableFlagsMask.names | 21 +++++++++++-- ...DisplaySettings_ShowDimensionFigures.names | 21 +++++++++++-- ...DistanceBetweenFilterComponentTypeId.names | 28 +++++++++++++++++ .../DistributionFilterComponentTypeId.names | 28 +++++++++++++++++ .../DitherGradientComponentTypeId.names | 21 +++++++++++-- .../EditorAreaLightComponentTypeId.names | 21 +++++++++++-- .../EditorBloomComponentTypeId.names | 21 +++++++++++-- .../EditorDecalComponentTypeId.names | 21 +++++++++++-- .../EditorDeferredFogComponentTypeId.names | 21 +++++++++++-- .../EditorDepthOfFieldComponentTypeId.names | 21 +++++++++++-- ...useGlobalIlluminationComponentTypeId.names | 21 +++++++++++-- ...ditorDiffuseProbeGridComponentTypeId.names | 21 +++++++++++-- ...ditorDirectionalLightComponentTypeId.names | 21 +++++++++++-- .../EditorDisplayMapperComponentTypeId.names | 21 +++++++++++-- ...EditorEntityReferenceComponentTypeId.names | 21 +++++++++++-- .../EditorEntityStartStatus_EditorOnly.names | 21 +++++++++++-- .../EditorEntityStartStatus_StartActive.names | 21 +++++++++++-- ...ditorEntityStartStatus_StartInactive.names | 21 +++++++++++-- ...EditorExposureControlComponentTypeId.names | 21 +++++++++++-- ...radientWeightModifierComponentTypeId.names | 21 +++++++++++-- .../EditorGridComponentTypeId.names | 21 +++++++++++-- .../EditorHDRiSkyboxComponentTypeId.names | 21 +++++++++++-- .../EditorHairComponentTypeId.names | 28 +++++++++++++++++ ...EditorImageBasedLightComponentTypeId.names | 21 +++++++++++-- ...ditorLookModificationComponentTypeId.names | 21 +++++++++++-- .../EditorMaterialComponentTypeId.names | 21 +++++++++++-- .../EditorMeshComponentTypeId.names | 21 +++++++++++-- ...EditorNonUniformScaleComponentTypeId.names | 21 +++++++++++-- ...OcclusionCullingPlaneComponentTypeId.names | 21 +++++++++++-- .../EditorPhysicalSkyComponentTypeId.names | 21 +++++++++++-- .../Properties/EditorPhysicsSceneId.names | 21 +++++++++++-- .../Properties/EditorPhysicsSceneName.names | 21 +++++++++++-- .../EditorPostFxLayerComponentTypeId.names | 21 +++++++++++-- .../EditorPrefabComponentTypeId.names | 28 +++++++++++++++++ ...rRadiusWeightModifierComponentTypeId.names | 21 +++++++++++-- ...EditorReflectionProbeComponentTypeId.names | 21 +++++++++++-- ...orShapeWeightModifierComponentTypeId.names | 21 +++++++++++-- .../EditorSsaoComponentTypeId.names | 21 +++++++++++-- .../EditorTransformComponentTypeId.names | 21 +++++++++++-- .../EntityReferenceComponentTypeId.names | 21 +++++++++++-- .../ExposureControlComponentTypeId.names | 21 +++++++++++-- .../FastNoiseGradientComponentTypeId.names | 28 +++++++++++++++++ .../Properties/FillMode_Invalid.names | 21 +++++++++++-- .../Properties/FillMode_Solid.names | 21 +++++++++++-- .../Properties/FillMode_Wireframe.names | 21 +++++++++++-- .../Properties/FloatEpsilon.names | 21 +++++++++++-- .../FrameCaptureResult_FileWriteError.names | 21 +++++++++++-- .../FrameCaptureResult_InternalError.names | 21 +++++++++++-- .../FrameCaptureResult_InvalidArgument.names | 21 +++++++++++-- .../Properties/FrameCaptureResult_None.names | 21 +++++++++++-- .../FrameCaptureResult_Success.names | 21 +++++++++++-- ...FrameCaptureResult_UnsupportedFormat.names | 21 +++++++++++-- .../GradientSurfaceDataComponentTypeId.names | 21 +++++++++++-- .../GradientTransformComponentTypeId.names | 21 +++++++++++-- ...radientWeightModifierComponentTypeId.names | 21 +++++++++++-- .../Properties/GridComponentTypeId.names | 21 +++++++++++-- .../HDRiSkyboxComponentTypeId.names | 21 +++++++++++-- .../Properties/HairComponentTypeId.names | 28 +++++++++++++++++ .../Properties/ICOSAHEDRON.names | 28 +++++++++++++++++ .../ImageBasedLightComponentTypeId.names | 21 +++++++++++-- .../ImageGradientComponentTypeId.names | 21 +++++++++++-- .../Properties/InvalidComponentId.names | 21 +++++++++++-- .../Properties/InvalidParameterIndex.names | 21 +++++++++++-- .../Properties/InvalidTemplateId.names | 21 +++++++++++-- .../InvertGradientComponentTypeId.names | 21 +++++++++++-- .../Properties/JsonMergePatch.names | 21 +++++++++++-- .../Properties/JsonPatch.names | 21 +++++++++++-- .../LANDSCAPE_CANVAS_EDITOR_ID.names | 28 +++++++++++++++++ .../LevelSettingsComponentTypeId.names | 28 +++++++++++++++++ .../LevelsGradientComponentTypeId.names | 21 +++++++++++-- ...LightAttenuationRadiusMode_Automatic.names | 21 +++++++++++-- .../LightAttenuationRadiusMode_Explicit.names | 21 +++++++++++-- .../LookModificationComponentTypeId.names | 21 +++++++++++-- .../Properties/MaterialComponentTypeId.names | 21 +++++++++++-- ...erialPropertyGroupVisibility_Enabled.names | 21 +++++++++++-- ...terialPropertyGroupVisibility_Hidden.names | 21 +++++++++++-- .../MaterialPropertyVisibility_Disabled.names | 21 +++++++++++-- .../MaterialPropertyVisibility_Enabled.names | 21 +++++++++++-- .../MaterialPropertyVisibility_Hidden.names | 21 +++++++++++-- .../MeshBlockerComponentTypeId.names | 28 +++++++++++++++++ .../Properties/MeshComponentTypeId.names | 21 +++++++++++-- .../MixedGradientComponentTypeId.names | 21 +++++++++++-- .../MultiPositionBehaviorType_Blended.names | 21 +++++++++++-- .../MultiPositionBehaviorType_Separate.names | 21 +++++++++++-- ...OcclusionCullingPlaneComponentTypeId.names | 21 +++++++++++-- .../PerlinGradientComponentTypeId.names | 21 +++++++++++-- .../Properties/PhotometricUnit_Candela.names | 21 +++++++++++-- .../PhotometricUnit_Ev100_Illuminance.names | 21 +++++++++++-- .../PhotometricUnit_Ev100_Luminance.names | 21 +++++++++++-- .../Properties/PhotometricUnit_Lumen.names | 21 +++++++++++-- .../Properties/PhotometricUnit_Lux.names | 21 +++++++++++-- .../Properties/PhotometricUnit_Nit.names | 21 +++++++++++-- .../Properties/PhotometricUnit_Unknown.names | 21 +++++++++++-- .../PhysicalSkyComponentTypeId.names | 21 +++++++++++-- .../PositionModifierComponentTypeId.names | 28 +++++++++++++++++ .../PostFxLayerComponentTypeId.names | 21 +++++++++++-- .../PosterizeGradientComponentTypeId.names | 21 +++++++++++-- .../ProviderNameEnum_AWSCognitoIDP.names | 28 +++++++++++++++++ .../Properties/ProviderNameEnum_Google.names | 28 +++++++++++++++++ .../ProviderNameEnum_LoginWithAmazon.names | 28 +++++++++++++++++ .../Properties/ProviderNameEnum_None.names | 28 +++++++++++++++++ .../Properties/QuadShapeComponentTypeId.names | 21 +++++++++++-- .../RadiusWeightModifierComponentTypeId.names | 21 +++++++++++-- .../RandomGradientComponentTypeId.names | 21 +++++++++++-- .../ReferenceGradientComponentTypeId.names | 21 +++++++++++-- .../ReferenceShapeComponentTypeId.names | 28 +++++++++++++++++ .../ReflectionProbeComponentTypeId.names | 21 +++++++++++-- .../RotationModifierComponentTypeId.names | 28 +++++++++++++++++ .../TranslationAssets/Properties/SPHERE.names | 28 +++++++++++++++++ .../ScaleModifierComponentTypeId.names | 28 +++++++++++++++++ .../Properties/ShadowFilterMethod_ESM.names | 21 +++++++++++-- .../ShadowFilterMethod_ESM_PCF.names | 21 +++++++++++-- .../Properties/ShadowFilterMethod_None.names | 21 +++++++++++-- .../Properties/ShadowFilterMethod_PCF.names | 21 +++++++++++-- .../Properties/ShadowmapSize_1024.names | 21 +++++++++++-- .../Properties/ShadowmapSize_2045.names | 21 +++++++++++-- .../Properties/ShadowmapSize_256.names | 21 +++++++++++-- .../Properties/ShadowmapSize_512.names | 21 +++++++++++-- .../Properties/ShadowmapSize_None.names | 21 +++++++++++-- ...peAreaFalloffGradientComponentTypeId.names | 21 +++++++++++-- .../ShapeChangeReasons_ShapeChanged.names | 21 +++++++++++-- .../ShapeChangeReasons_TransformChanged.names | 21 +++++++++++-- ...apeIntersectionFilterComponentTypeId.names | 28 +++++++++++++++++ .../Properties/ShapeType_Heightfield.names | 28 +++++++++++++++++ .../ShapeWeightModifierComponentTypeId.names | 21 +++++++++++-- ...lopeAlignmentModifierComponentTypeId.names | 8 ++--- .../SmoothStepGradientComponentTypeId.names | 21 +++++++++++-- .../Properties/SpawnerComponentTypeId.names | 21 +++++++++++-- .../SphereShapeComponentTypeId.names | 21 +++++++++++-- .../Properties/SsaoComponentTypeId.names | 21 +++++++++++-- .../Properties/StencilOp_Decrement.names | 21 +++++++++++-- .../StencilOp_DecrementSaturate.names | 21 +++++++++++-- .../Properties/StencilOp_Increment.names | 21 +++++++++++-- .../StencilOp_IncrementSaturate.names | 21 +++++++++++-- .../Properties/StencilOp_Invalid.names | 21 +++++++++++-- .../Properties/StencilOp_Invert.names | 21 +++++++++++-- .../Properties/StencilOp_Keep.names | 21 +++++++++++-- .../Properties/StencilOp_Replace.names | 21 +++++++++++-- .../Properties/StencilOp_Zero.names | 21 +++++++++++-- ...SurfaceAltitudeFilterComponentTypeId.names | 28 +++++++++++++++++ ...rfaceAltitudeGradientComponentTypeId.names | 21 +++++++++++-- ...urfaceMaskDepthFilterComponentTypeId.names | 28 +++++++++++++++++ .../SurfaceMaskFilterComponentTypeId.names | 28 +++++++++++++++++ .../SurfaceMaskGradientComponentTypeId.names | 21 +++++++++++-- .../SurfaceSlopeFilterComponentTypeId.names | 28 +++++++++++++++++ .../SurfaceSlopeGradientComponentTypeId.names | 21 +++++++++++-- .../SystemConfigPlatform_Android.names | 21 +++++++++++-- ...SystemConfigPlatform_InvalidPlatform.names | 21 +++++++++++-- .../Properties/SystemConfigPlatform_Ios.names | 21 +++++++++++-- .../Properties/SystemConfigPlatform_Mac.names | 21 +++++++++++-- .../SystemConfigPlatform_OsxMetal.names | 21 +++++++++++-- .../Properties/SystemConfigPlatform_Pc.names | 21 +++++++++++-- .../SystemConfigPlatform_Provo.names | 21 +++++++++++-- .../Properties/SystemConfigSpec_Auto.names | 21 +++++++++++-- .../Properties/SystemConfigSpec_High.names | 21 +++++++++++-- .../Properties/SystemConfigSpec_Low.names | 21 +++++++++++-- .../Properties/SystemConfigSpec_Medium.names | 21 +++++++++++-- .../SystemConfigSpec_VeryHigh.names | 21 +++++++++++-- .../Properties/SystemEntityId.names | 22 ++++++++++++-- .../Properties/TETRAHEDRON.names | 28 +++++++++++++++++ .../ThresholdGradientComponentTypeId.names | 21 +++++++++++-- .../Properties/TransformComponentTypeId.names | 21 +++++++++++-- .../Properties/TransformMode_Rotation.names | 21 +++++++++++-- .../Properties/TransformMode_Scale.names | 21 +++++++++++-- .../TransformMode_Translation.names | 21 +++++++++++-- .../Properties/TransformPivot_Center.names | 21 +++++++++++-- .../Properties/TransformPivot_Object.names | 21 +++++++++++-- .../Properties/TransformRefreshType_All.names | 21 +++++++++++-- .../TransformRefreshType_Orientation.names | 21 +++++++++++-- .../TransformRefreshType_Translation.names | 21 +++++++++++-- .../Properties/TubeShapeComponentTypeId.names | 21 +++++++++++-- .../UiLayoutCellUnspecifiedSize.names | 21 +++++++++++-- .../VegetationSpawnerComponentTypeId.names | 28 +++++++++++++++++ .../Properties/eSSB_GotoEndTime.names | 21 +++++++++++-- .../Properties/eSSB_GotoStartTime.names | 21 +++++++++++-- .../Properties/eSSB_LeaveTime.names | 21 +++++++++++-- .../eUiAnimationEvent_Aborted.names | 21 +++++++++++-- .../eUiAnimationEvent_Started.names | 21 +++++++++++-- .../eUiAnimationEvent_Stopped.names | 21 +++++++++++-- .../eUiAnimationEvent_Updated.names | 21 +++++++++++-- .../Properties/eUiDragState_Invalid.names | 21 +++++++++++-- .../Properties/eUiDragState_Normal.names | 21 +++++++++++-- .../Properties/eUiDragState_Valid.names | 21 +++++++++++-- .../Properties/eUiDropState_Invalid.names | 21 +++++++++++-- .../Properties/eUiDropState_Normal.names | 21 +++++++++++-- .../Properties/eUiDropState_Valid.names | 21 +++++++++++-- .../eUiDynamicContentDBColorType_Free.names | 21 +++++++++++-- .../eUiDynamicContentDBColorType_Paid.names | 21 +++++++++++-- .../Properties/eUiEmitShape_Circle.names | 21 +++++++++++-- .../Properties/eUiEmitShape_Point.names | 21 +++++++++++-- .../Properties/eUiEmitShape_Quad.names | 21 +++++++++++-- .../eUiFillCornerOrigin_BottomLeft.names | 21 +++++++++++-- .../eUiFillCornerOrigin_BottomRight.names | 21 +++++++++++-- .../eUiFillCornerOrigin_TopLeft.names | 21 +++++++++++-- .../eUiFillCornerOrigin_TopRight.names | 21 +++++++++++-- .../Properties/eUiFillEdgeOrigin_Bottom.names | 21 +++++++++++-- .../Properties/eUiFillEdgeOrigin_Left.names | 21 +++++++++++-- .../Properties/eUiFillEdgeOrigin_Right.names | 21 +++++++++++-- .../Properties/eUiFillEdgeOrigin_Top.names | 21 +++++++++++-- .../Properties/eUiFillType_Linear.names | 21 +++++++++++-- .../Properties/eUiFillType_None.names | 21 +++++++++++-- .../Properties/eUiFillType_Radial.names | 21 +++++++++++-- .../Properties/eUiFillType_RadialCorner.names | 21 +++++++++++-- .../Properties/eUiFillType_RadialEdge.names | 21 +++++++++++-- ...iFlipbookAnimationFramerateUnits_FPS.names | 21 +++++++++++-- ...mationFramerateUnits_SecondsPerFrame.names | 21 +++++++++++-- .../eUiFlipbookAnimationLoopType_Linear.names | 21 +++++++++++-- .../eUiFlipbookAnimationLoopType_None.names | 21 +++++++++++-- ...UiFlipbookAnimationLoopType_PingPong.names | 21 +++++++++++-- .../Properties/eUiHAlign_Center.names | 21 +++++++++++-- .../Properties/eUiHAlign_Left.names | 21 +++++++++++-- .../Properties/eUiHAlign_Right.names | 21 +++++++++++-- .../eUiHorizontalOrder_LeftToRight.names | 21 +++++++++++-- .../eUiHorizontalOrder_RightToLeft.names | 21 +++++++++++-- .../eUiImageSequenceImageType_Fixed.names | 21 +++++++++++-- .../eUiImageSequenceImageType_Stretched.names | 21 +++++++++++-- ...ageSequenceImageType_StretchedToFill.names | 21 +++++++++++-- ...mageSequenceImageType_StretchedToFit.names | 21 +++++++++++-- .../Properties/eUiImageType_Fixed.names | 21 +++++++++++-- .../Properties/eUiImageType_Sliced.names | 21 +++++++++++-- .../Properties/eUiImageType_Stretched.names | 21 +++++++++++-- .../eUiImageType_StretchedToFill.names | 21 +++++++++++-- .../eUiImageType_StretchedToFit.names | 21 +++++++++++-- .../Properties/eUiImageType_Tiled.names | 21 +++++++++++-- .../eUiInteractableState_Disabled.names | 21 +++++++++++-- .../eUiInteractableState_Hover.names | 21 +++++++++++-- .../eUiInteractableState_Normal.names | 21 +++++++++++-- .../eUiInteractableState_Pressed.names | 21 +++++++++++-- ...ridStartingDirection_HorizontalOrder.names | 21 +++++++++++-- ...tGridStartingDirection_VerticalOrder.names | 21 +++++++++++-- .../eUiNavigationMode_Automatic.names | 21 +++++++++++-- .../Properties/eUiNavigationMode_Custom.names | 21 +++++++++++-- .../Properties/eUiNavigationMode_None.names | 21 +++++++++++-- .../eUiParticleCoordinateType_Cartesian.names | 21 +++++++++++-- .../eUiParticleCoordinateType_Polar.names | 21 +++++++++++-- ...ialDirectionType_RelativeToEmitAngle.names | 21 +++++++++++-- ...irectionType_RelativeToEmitterCenter.names | 21 +++++++++++-- ...eUiScaleToDeviceMode_NonUniformScale.names | 21 +++++++++++-- .../eUiScaleToDeviceMode_None.names | 21 +++++++++++-- .../eUiScaleToDeviceMode_ScaleXOnly.names | 21 +++++++++++-- .../eUiScaleToDeviceMode_ScaleYOnly.names | 21 +++++++++++-- ...ScaleToDeviceMode_UniformScaleToFill.names | 21 +++++++++++-- ...iScaleToDeviceMode_UniformScaleToFit.names | 21 +++++++++++-- ...ScaleToDeviceMode_UniformScaleToFitX.names | 21 +++++++++++-- ...ScaleToDeviceMode_UniformScaleToFitY.names | 21 +++++++++++-- ...ollBoxScrollBarVisibility_AlwaysShow.names | 21 +++++++++++-- ...crollBoxScrollBarVisibility_AutoHide.names | 21 +++++++++++-- ...Visibility_AutoHideAndResizeViewport.names | 21 +++++++++++-- .../eUiScrollBoxSnapMode_Children.names | 21 +++++++++++-- .../eUiScrollBoxSnapMode_Grid.names | 21 +++++++++++-- .../eUiScrollBoxSnapMode_None.names | 21 +++++++++++-- .../eUiScrollerOrientation_Horizontal.names | 21 +++++++++++-- .../eUiScrollerOrientation_Vertical.names | 21 +++++++++++-- .../eUiSpriteType_RenderTarget.names | 21 +++++++++++-- .../eUiSpriteType_SpriteAsset.names | 21 +++++++++++-- .../eUiTextOverflowMode_ClipText.names | 21 +++++++++++-- .../eUiTextOverflowMode_Ellipsis.names | 21 +++++++++++-- .../eUiTextOverflowMode_OverflowText.names | 21 +++++++++++-- .../Properties/eUiTextShrinkToFit_None.names | 21 +++++++++++-- .../eUiTextShrinkToFit_Uniform.names | 21 +++++++++++-- .../eUiTextShrinkToFit_WidthOnly.names | 21 +++++++++++-- .../eUiTextWrapTextSetting_NoWrap.names | 21 +++++++++++-- .../eUiTextWrapTextSetting_Wrap.names | 21 +++++++++++-- ...ayAutoPositionMode_OffsetFromElement.names | 21 +++++++++++-- ...playAutoPositionMode_OffsetFromMouse.names | 21 +++++++++++-- ...eUiTooltipDisplayTriggerMode_OnClick.names | 21 +++++++++++-- ...eUiTooltipDisplayTriggerMode_OnHover.names | 21 +++++++++++-- ...eUiTooltipDisplayTriggerMode_OnPress.names | 21 +++++++++++-- .../Properties/eUiVAlign_Bottom.names | 21 +++++++++++-- .../Properties/eUiVAlign_Center.names | 21 +++++++++++-- .../Properties/eUiVAlign_Top.names | 21 +++++++++++-- .../eUiVerticalOrder_BottomToTop.names | 21 +++++++++++-- .../eUiVerticalOrder_TopToBottom.names | 21 +++++++++++-- .../Properties/g_ProfilerSystem.names | 28 +++++++++++++++++ .../Properties/g_SettingsRegistry.names | 21 +++++++++++-- .../ScriptCanvasNodePaletteDockWidget.cpp | 15 ++++------ .../Code/Tools/TranslationGeneration.cpp | 30 ++++++++++++++----- 353 files changed, 6661 insertions(+), 959 deletions(-) create mode 100644 Gems/ScriptCanvas/Assets/TranslationAssets/Properties/AreaBlenderComponentTypeId.names create mode 100644 Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlockerComponentTypeId.names create mode 100644 Gems/ScriptCanvas/Assets/TranslationAssets/Properties/CUBE.names create mode 100644 Gems/ScriptCanvas/Assets/TranslationAssets/Properties/CYLINDER.names create mode 100644 Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DescriptorListCombinerComponentTypeId.names create mode 100644 Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DescriptorListComponentTypeId.names create mode 100644 Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DescriptorWeightSelectorComponentTypeId.names create mode 100644 Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DistanceBetweenFilterComponentTypeId.names create mode 100644 Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DistributionFilterComponentTypeId.names create mode 100644 Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorHairComponentTypeId.names create mode 100644 Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorPrefabComponentTypeId.names create mode 100644 Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FastNoiseGradientComponentTypeId.names create mode 100644 Gems/ScriptCanvas/Assets/TranslationAssets/Properties/HairComponentTypeId.names create mode 100644 Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ICOSAHEDRON.names create mode 100644 Gems/ScriptCanvas/Assets/TranslationAssets/Properties/LANDSCAPE_CANVAS_EDITOR_ID.names create mode 100644 Gems/ScriptCanvas/Assets/TranslationAssets/Properties/LevelSettingsComponentTypeId.names create mode 100644 Gems/ScriptCanvas/Assets/TranslationAssets/Properties/MeshBlockerComponentTypeId.names create mode 100644 Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PositionModifierComponentTypeId.names create mode 100644 Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ProviderNameEnum_AWSCognitoIDP.names create mode 100644 Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ProviderNameEnum_Google.names create mode 100644 Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ProviderNameEnum_LoginWithAmazon.names create mode 100644 Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ProviderNameEnum_None.names create mode 100644 Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ReferenceShapeComponentTypeId.names create mode 100644 Gems/ScriptCanvas/Assets/TranslationAssets/Properties/RotationModifierComponentTypeId.names create mode 100644 Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SPHERE.names create mode 100644 Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ScaleModifierComponentTypeId.names create mode 100644 Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShapeIntersectionFilterComponentTypeId.names create mode 100644 Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShapeType_Heightfield.names create mode 100644 Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SurfaceAltitudeFilterComponentTypeId.names create mode 100644 Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SurfaceMaskDepthFilterComponentTypeId.names create mode 100644 Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SurfaceMaskFilterComponentTypeId.names create mode 100644 Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SurfaceSlopeFilterComponentTypeId.names create mode 100644 Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TETRAHEDRON.names create mode 100644 Gems/ScriptCanvas/Assets/TranslationAssets/Properties/VegetationSpawnerComponentTypeId.names create mode 100644 Gems/ScriptCanvas/Assets/TranslationAssets/Properties/g_ProfilerSystem.names diff --git a/Gems/GraphCanvas/Code/Source/GraphCanvas.cpp b/Gems/GraphCanvas/Code/Source/GraphCanvas.cpp index f51c2c1272..8b5b166bb2 100644 --- a/Gems/GraphCanvas/Code/Source/GraphCanvas.cpp +++ b/Gems/GraphCanvas/Code/Source/GraphCanvas.cpp @@ -386,6 +386,16 @@ namespace GraphCanvas AZ::Data::AssetCatalogRequestBus::Broadcast(&AZ::Data::AssetCatalogRequestBus::Events::EnumerateAssets, nullptr, collectAssetsCb, postEnumerateCb); } + void GraphCanvasSystemComponent::OnCatalogAssetChanged(const AZ::Data::AssetId& assetId) + { + AZ::Data::AssetInfo assetInfo; + AZ::Data::AssetCatalogRequestBus::BroadcastResult(assetInfo, &AZ::Data::AssetCatalogRequestBus::Events::GetAssetInfoById, assetId); + if (assetInfo.m_assetType == azrtti_typeid()) + { + GraphCanvas::TranslationRequestBus::Broadcast(&GraphCanvas::TranslationRequests::Restore); + } + } + void GraphCanvasSystemComponent::UnregisterAssetHandler() { if (m_assetHandler) diff --git a/Gems/GraphCanvas/Code/Source/GraphCanvas.h b/Gems/GraphCanvas/Code/Source/GraphCanvas.h index 7a4d9677ab..0b47e9010a 100644 --- a/Gems/GraphCanvas/Code/Source/GraphCanvas.h +++ b/Gems/GraphCanvas/Code/Source/GraphCanvas.h @@ -77,7 +77,10 @@ namespace GraphCanvas AZ::EntityId CreateVirtualChild(const AZ::EntityId& real, const AZStd::string& virtualChildElement) const override; //// + // AzFramework::AssetCatalogEventBus::Handler void OnCatalogLoaded(const char* /*catalogFile*/) override; + void OnCatalogAssetChanged(const AZ::Data::AssetId&) override; + //// AZStd::unique_ptr m_assetHandler; diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ALPHA.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ALPHA.names index 3ec467cbfd..422d65f267 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ALPHA.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ALPHA.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "ALPHA::Getter", - "category": "Constants" - } + "name": "ALPHA" + }, + "methods": [ + { + "key": "GetALPHA", + "details": { + "name": "GetALPHA" + }, + "results": [ + { + "typeid": "{43DA906B-7DEF-4CA8-9790-854106D3F983}", + "details": { + "name": "unsigned int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/AreaBlenderComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/AreaBlenderComponentTypeId.names new file mode 100644 index 0000000000..0e645f79fb --- /dev/null +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/AreaBlenderComponentTypeId.names @@ -0,0 +1,28 @@ +{ + "entries": [ + { + "key": "AreaBlenderComponentTypeId", + "context": "Constant", + "variant": "", + "details": { + "name": "Area Blender Component Type Id" + }, + "methods": [ + { + "key": "GetAreaBlenderComponentTypeId", + "details": { + "name": "Get Area Blender Component Type Id" + }, + "results": [ + { + "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}", + "details": { + "name": "AZ:: Uuid" + } + } + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/AreaLightComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/AreaLightComponentTypeId.names index 2585ca9071..3593eaf8dc 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/AreaLightComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/AreaLightComponentTypeId.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "AreaLightComponentTypeId::Getter", - "category": "Constants" - } + "name": "Area Light Component Type Id" + }, + "methods": [ + { + "key": "GetAreaLightComponentTypeId", + "details": { + "name": "Get Area Light Component Type Id" + }, + "results": [ + { + "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}", + "details": { + "name": "AZ:: Uuid" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/AudioObstructionType_Ignore.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/AudioObstructionType_Ignore.names index a8099784d0..4843af9c3e 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/AudioObstructionType_Ignore.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/AudioObstructionType_Ignore.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "AudioObstructionType_Ignore::Getter", - "category": "Constants" - } + "name": "Audio Obstruction Type_ Ignore" + }, + "methods": [ + { + "key": "GetAudioObstructionType_Ignore", + "details": { + "name": "Get Audio Obstruction Type_ Ignore" + }, + "results": [ + { + "typeid": "{43DA906B-7DEF-4CA8-9790-854106D3F983}", + "details": { + "name": "unsigned int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/AudioObstructionType_MultiRay.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/AudioObstructionType_MultiRay.names index 4c0cdc5803..22532e76b3 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/AudioObstructionType_MultiRay.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/AudioObstructionType_MultiRay.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "AudioObstructionType_MultiRay::Getter", - "category": "Constants" - } + "name": "Audio Obstruction Type_ Multi Ray" + }, + "methods": [ + { + "key": "GetAudioObstructionType_MultiRay", + "details": { + "name": "Get Audio Obstruction Type_ Multi Ray" + }, + "results": [ + { + "typeid": "{43DA906B-7DEF-4CA8-9790-854106D3F983}", + "details": { + "name": "unsigned int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/AudioObstructionType_SingleRay.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/AudioObstructionType_SingleRay.names index bf61f3430f..d31dc2281f 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/AudioObstructionType_SingleRay.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/AudioObstructionType_SingleRay.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "AudioObstructionType_SingleRay::Getter", - "category": "Constants" - } + "name": "Audio Obstruction Type_ Single Ray" + }, + "methods": [ + { + "key": "GetAudioObstructionType_SingleRay", + "details": { + "name": "Get Audio Obstruction Type_ Single Ray" + }, + "results": [ + { + "typeid": "{43DA906B-7DEF-4CA8-9790-854106D3F983}", + "details": { + "name": "unsigned int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/AudioPreloadComponentLoadType_Auto.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/AudioPreloadComponentLoadType_Auto.names index 0522c4b2e8..0ca6591eb7 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/AudioPreloadComponentLoadType_Auto.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/AudioPreloadComponentLoadType_Auto.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "AudioPreloadComponentLoadType_Auto::Getter", - "category": "Constants" - } + "name": "Audio Preload Component Load Type_ Auto" + }, + "methods": [ + { + "key": "GetAudioPreloadComponentLoadType_Auto", + "details": { + "name": "Get Audio Preload Component Load Type_ Auto" + }, + "results": [ + { + "typeid": "{43DA906B-7DEF-4CA8-9790-854106D3F983}", + "details": { + "name": "unsigned int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/AudioPreloadComponentLoadType_Manual.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/AudioPreloadComponentLoadType_Manual.names index e81b8fd73c..540e9fec5f 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/AudioPreloadComponentLoadType_Manual.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/AudioPreloadComponentLoadType_Manual.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "AudioPreloadComponentLoadType_Manual::Getter", - "category": "Constants" - } + "name": "Audio Preload Component Load Type_ Manual" + }, + "methods": [ + { + "key": "GetAudioPreloadComponentLoadType_Manual", + "details": { + "name": "Get Audio Preload Component Load Type_ Manual" + }, + "results": [ + { + "typeid": "{43DA906B-7DEF-4CA8-9790-854106D3F983}", + "details": { + "name": "unsigned int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/AxisAlignedBoxShapeComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/AxisAlignedBoxShapeComponentTypeId.names index 5437a6a5c9..b8ba70f008 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/AxisAlignedBoxShapeComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/AxisAlignedBoxShapeComponentTypeId.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "AxisAlignedBoxShapeComponentTypeId::Getter", - "category": "Constants" - } + "name": "Axis Aligned Box Shape Component Type Id" + }, + "methods": [ + { + "key": "GetAxisAlignedBoxShapeComponentTypeId", + "details": { + "name": "Get Axis Aligned Box Shape Component Type Id" + }, + "results": [ + { + "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}", + "details": { + "name": "AZ:: Uuid" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BRAVO.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BRAVO.names index c1cd1a28bf..e6260d16f8 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BRAVO.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BRAVO.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "BRAVO::Getter", - "category": "Constants" - } + "name": "BRAVO" + }, + "methods": [ + { + "key": "GetBRAVO", + "details": { + "name": "GetBRAVO" + }, + "results": [ + { + "typeid": "{43DA906B-7DEF-4CA8-9790-854106D3F983}", + "details": { + "name": "unsigned int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_AlphaDest.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_AlphaDest.names index 74f2fe9c14..6e4303a369 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_AlphaDest.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_AlphaDest.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "BlendFactor_AlphaDest::Getter", - "category": "Constants" - } + "name": "Blend Factor_ Alpha Dest" + }, + "methods": [ + { + "key": "GetBlendFactor_AlphaDest", + "details": { + "name": "Get Blend Factor_ Alpha Dest" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_AlphaDestInverse.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_AlphaDestInverse.names index ae1804aa64..34aaf341e3 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_AlphaDestInverse.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_AlphaDestInverse.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "BlendFactor_AlphaDestInverse::Getter", - "category": "Constants" - } + "name": "Blend Factor_ Alpha Dest Inverse" + }, + "methods": [ + { + "key": "GetBlendFactor_AlphaDestInverse", + "details": { + "name": "Get Blend Factor_ Alpha Dest Inverse" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_AlphaSource.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_AlphaSource.names index 252dca2bcb..352ea52c3e 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_AlphaSource.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_AlphaSource.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "BlendFactor_AlphaSource::Getter", - "category": "Constants" - } + "name": "Blend Factor_ Alpha Source" + }, + "methods": [ + { + "key": "GetBlendFactor_AlphaSource", + "details": { + "name": "Get Blend Factor_ Alpha Source" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_AlphaSource1.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_AlphaSource1.names index 8924ea6c15..a75fe9a20b 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_AlphaSource1.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_AlphaSource1.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "BlendFactor_AlphaSource1::Getter", - "category": "Constants" - } + "name": "Blend Factor_ Alpha Source 1" + }, + "methods": [ + { + "key": "GetBlendFactor_AlphaSource1", + "details": { + "name": "Get Blend Factor_ Alpha Source 1" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_AlphaSource1Inverse.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_AlphaSource1Inverse.names index af6c0b6dd5..caaca96606 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_AlphaSource1Inverse.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_AlphaSource1Inverse.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "BlendFactor_AlphaSource1Inverse::Getter", - "category": "Constants" - } + "name": "Blend Factor_ Alpha Source 1 Inverse" + }, + "methods": [ + { + "key": "GetBlendFactor_AlphaSource1Inverse", + "details": { + "name": "Get Blend Factor_ Alpha Source 1 Inverse" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_AlphaSourceInverse.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_AlphaSourceInverse.names index f933c877a8..6b93669c94 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_AlphaSourceInverse.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_AlphaSourceInverse.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "BlendFactor_AlphaSourceInverse::Getter", - "category": "Constants" - } + "name": "Blend Factor_ Alpha Source Inverse" + }, + "methods": [ + { + "key": "GetBlendFactor_AlphaSourceInverse", + "details": { + "name": "Get Blend Factor_ Alpha Source Inverse" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_AlphaSourceSaturate.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_AlphaSourceSaturate.names index a2a027ea6b..6cfb5ce6e4 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_AlphaSourceSaturate.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_AlphaSourceSaturate.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "BlendFactor_AlphaSourceSaturate::Getter", - "category": "Constants" - } + "name": "Blend Factor_ Alpha Source Saturate" + }, + "methods": [ + { + "key": "GetBlendFactor_AlphaSourceSaturate", + "details": { + "name": "Get Blend Factor_ Alpha Source Saturate" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_ColorDest.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_ColorDest.names index 1f9c086e82..3ce6059a31 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_ColorDest.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_ColorDest.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "BlendFactor_ColorDest::Getter", - "category": "Constants" - } + "name": "Blend Factor_ Color Dest" + }, + "methods": [ + { + "key": "GetBlendFactor_ColorDest", + "details": { + "name": "Get Blend Factor_ Color Dest" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_ColorDestInverse.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_ColorDestInverse.names index 93fa5750ef..86d4b79450 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_ColorDestInverse.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_ColorDestInverse.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "BlendFactor_ColorDestInverse::Getter", - "category": "Constants" - } + "name": "Blend Factor_ Color Dest Inverse" + }, + "methods": [ + { + "key": "GetBlendFactor_ColorDestInverse", + "details": { + "name": "Get Blend Factor_ Color Dest Inverse" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_ColorSource.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_ColorSource.names index 317b1f283b..c8596fa6e6 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_ColorSource.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_ColorSource.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "BlendFactor_ColorSource::Getter", - "category": "Constants" - } + "name": "Blend Factor_ Color Source" + }, + "methods": [ + { + "key": "GetBlendFactor_ColorSource", + "details": { + "name": "Get Blend Factor_ Color Source" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_ColorSource1.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_ColorSource1.names index 0a9db7be52..63c3565d8e 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_ColorSource1.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_ColorSource1.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "BlendFactor_ColorSource1::Getter", - "category": "Constants" - } + "name": "Blend Factor_ Color Source 1" + }, + "methods": [ + { + "key": "GetBlendFactor_ColorSource1", + "details": { + "name": "Get Blend Factor_ Color Source 1" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_ColorSource1Inverse.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_ColorSource1Inverse.names index 68e4f3e1ca..19ea1a68b2 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_ColorSource1Inverse.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_ColorSource1Inverse.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "BlendFactor_ColorSource1Inverse::Getter", - "category": "Constants" - } + "name": "Blend Factor_ Color Source 1 Inverse" + }, + "methods": [ + { + "key": "GetBlendFactor_ColorSource1Inverse", + "details": { + "name": "Get Blend Factor_ Color Source 1 Inverse" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_ColorSourceInverse.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_ColorSourceInverse.names index cd84b391d8..b7d40bb84e 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_ColorSourceInverse.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_ColorSourceInverse.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "BlendFactor_ColorSourceInverse::Getter", - "category": "Constants" - } + "name": "Blend Factor_ Color Source Inverse" + }, + "methods": [ + { + "key": "GetBlendFactor_ColorSourceInverse", + "details": { + "name": "Get Blend Factor_ Color Source Inverse" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_Factor.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_Factor.names index 2b7648e44c..a9f207fb72 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_Factor.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_Factor.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "BlendFactor_Factor::Getter", - "category": "Constants" - } + "name": "Blend Factor_ Factor" + }, + "methods": [ + { + "key": "GetBlendFactor_Factor", + "details": { + "name": "Get Blend Factor_ Factor" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_FactorInverse.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_FactorInverse.names index f5a6d3ae3a..2290eaa56a 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_FactorInverse.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_FactorInverse.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "BlendFactor_FactorInverse::Getter", - "category": "Constants" - } + "name": "Blend Factor_ Factor Inverse" + }, + "methods": [ + { + "key": "GetBlendFactor_FactorInverse", + "details": { + "name": "Get Blend Factor_ Factor Inverse" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_Invalid.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_Invalid.names index c5b269624b..ba1323b0c5 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_Invalid.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_Invalid.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "BlendFactor_Invalid::Getter", - "category": "Constants" - } + "name": "Blend Factor_ Invalid" + }, + "methods": [ + { + "key": "GetBlendFactor_Invalid", + "details": { + "name": "Get Blend Factor_ Invalid" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_One.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_One.names index fee52d4844..9a6410d3a0 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_One.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_One.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "BlendFactor_One::Getter", - "category": "Constants" - } + "name": "Blend Factor_ One" + }, + "methods": [ + { + "key": "GetBlendFactor_One", + "details": { + "name": "Get Blend Factor_ One" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_Zero.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_Zero.names index 35c7e8df15..5118abe847 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_Zero.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_Zero.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "BlendFactor_Zero::Getter", - "category": "Constants" - } + "name": "Blend Factor_ Zero" + }, + "methods": [ + { + "key": "GetBlendFactor_Zero", + "details": { + "name": "Get Blend Factor_ Zero" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendOp_Add.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendOp_Add.names index e27d493605..9feda67158 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendOp_Add.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendOp_Add.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "BlendOp_Add::Getter", - "category": "Constants" - } + "name": "Blend Op_ Add" + }, + "methods": [ + { + "key": "GetBlendOp_Add", + "details": { + "name": "Get Blend Op_ Add" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendOp_Invalid.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendOp_Invalid.names index 7d099cc394..b9e879c997 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendOp_Invalid.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendOp_Invalid.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "BlendOp_Invalid::Getter", - "category": "Constants" - } + "name": "Blend Op_ Invalid" + }, + "methods": [ + { + "key": "GetBlendOp_Invalid", + "details": { + "name": "Get Blend Op_ Invalid" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendOp_Maximum.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendOp_Maximum.names index 1970242769..dc83763166 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendOp_Maximum.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendOp_Maximum.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "BlendOp_Maximum::Getter", - "category": "Constants" - } + "name": "Blend Op_ Maximum" + }, + "methods": [ + { + "key": "GetBlendOp_Maximum", + "details": { + "name": "Get Blend Op_ Maximum" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendOp_Minimum.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendOp_Minimum.names index 714568e008..309d401fb7 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendOp_Minimum.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendOp_Minimum.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "BlendOp_Minimum::Getter", - "category": "Constants" - } + "name": "Blend Op_ Minimum" + }, + "methods": [ + { + "key": "GetBlendOp_Minimum", + "details": { + "name": "Get Blend Op_ Minimum" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendOp_Subtract.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendOp_Subtract.names index 6faf93dbf4..042bdb1e1b 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendOp_Subtract.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendOp_Subtract.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "BlendOp_Subtract::Getter", - "category": "Constants" - } + "name": "Blend Op_ Subtract" + }, + "methods": [ + { + "key": "GetBlendOp_Subtract", + "details": { + "name": "Get Blend Op_ Subtract" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendOp_SubtractReverse.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendOp_SubtractReverse.names index b8f98b7600..1fedcfea87 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendOp_SubtractReverse.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendOp_SubtractReverse.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "BlendOp_SubtractReverse::Getter", - "category": "Constants" - } + "name": "Blend Op_ Subtract Reverse" + }, + "methods": [ + { + "key": "GetBlendOp_SubtractReverse", + "details": { + "name": "Get Blend Op_ Subtract Reverse" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlockerComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlockerComponentTypeId.names new file mode 100644 index 0000000000..d9bf8e6178 --- /dev/null +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlockerComponentTypeId.names @@ -0,0 +1,28 @@ +{ + "entries": [ + { + "key": "BlockerComponentTypeId", + "context": "Constant", + "variant": "", + "details": { + "name": "Blocker Component Type Id" + }, + "methods": [ + { + "key": "GetBlockerComponentTypeId", + "details": { + "name": "Get Blocker Component Type Id" + }, + "results": [ + { + "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}", + "details": { + "name": "AZ:: Uuid" + } + } + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BloomComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BloomComponentTypeId.names index 0d8ba9a325..1de372e9ac 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BloomComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BloomComponentTypeId.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "BloomComponentTypeId::Getter", - "category": "Constants" - } + "name": "Bloom Component Type Id" + }, + "methods": [ + { + "key": "GetBloomComponentTypeId", + "details": { + "name": "Get Bloom Component Type Id" + }, + "results": [ + { + "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}", + "details": { + "name": "AZ:: Uuid" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BoxShapeComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BoxShapeComponentTypeId.names index 5f076bd6a5..ff3b6beaaa 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BoxShapeComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BoxShapeComponentTypeId.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "BoxShapeComponentTypeId::Getter", - "category": "Constants" - } + "name": "Box Shape Component Type Id" + }, + "methods": [ + { + "key": "GetBoxShapeComponentTypeId", + "details": { + "name": "Get Box Shape Component Type Id" + }, + "results": [ + { + "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}", + "details": { + "name": "AZ:: Uuid" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/CHARLIE.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/CHARLIE.names index 85f7c894f4..191d3adfa6 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/CHARLIE.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/CHARLIE.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "CHARLIE::Getter", - "category": "Constants" - } + "name": "CHARLIE" + }, + "methods": [ + { + "key": "GetCHARLIE", + "details": { + "name": "GetCHARLIE" + }, + "results": [ + { + "typeid": "{43DA906B-7DEF-4CA8-9790-854106D3F983}", + "details": { + "name": "unsigned int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/CUBE.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/CUBE.names new file mode 100644 index 0000000000..24b91264b3 --- /dev/null +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/CUBE.names @@ -0,0 +1,28 @@ +{ + "entries": [ + { + "key": "CUBE", + "context": "Constant", + "variant": "", + "details": { + "name": "CUBE" + }, + "methods": [ + { + "key": "GetCUBE", + "details": { + "name": "GetCUBE" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/CYLINDER.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/CYLINDER.names new file mode 100644 index 0000000000..1a3a8194c7 --- /dev/null +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/CYLINDER.names @@ -0,0 +1,28 @@ +{ + "entries": [ + { + "key": "CYLINDER", + "context": "Constant", + "variant": "", + "details": { + "name": "CYLINDER" + }, + "methods": [ + { + "key": "GetCYLINDER", + "details": { + "name": "GetCYLINDER" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/CapsuleShapeComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/CapsuleShapeComponentTypeId.names index a17f6781d4..5806ac5b22 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/CapsuleShapeComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/CapsuleShapeComponentTypeId.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "CapsuleShapeComponentTypeId::Getter", - "category": "Constants" - } + "name": "Capsule Shape Component Type Id" + }, + "methods": [ + { + "key": "GetCapsuleShapeComponentTypeId", + "details": { + "name": "Get Capsule Shape Component Type Id" + }, + "results": [ + { + "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}", + "details": { + "name": "AZ:: Uuid" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ConstantGradientComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ConstantGradientComponentTypeId.names index 0ff818c566..379246c5c0 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ConstantGradientComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ConstantGradientComponentTypeId.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "ConstantGradientComponentTypeId::Getter", - "category": "Constants" - } + "name": "Constant Gradient Component Type Id" + }, + "methods": [ + { + "key": "GetConstantGradientComponentTypeId", + "details": { + "name": "Get Constant Gradient Component Type Id" + }, + "results": [ + { + "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}", + "details": { + "name": "AZ:: Uuid" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/CullMode_Back.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/CullMode_Back.names index 61d2c8369e..b6baeda612 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/CullMode_Back.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/CullMode_Back.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "CullMode_Back::Getter", - "category": "Constants" - } + "name": "Cull Mode_ Back" + }, + "methods": [ + { + "key": "GetCullMode_Back", + "details": { + "name": "Get Cull Mode_ Back" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/CullMode_Front.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/CullMode_Front.names index 7f5a35a7f2..143d95ecc0 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/CullMode_Front.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/CullMode_Front.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "CullMode_Front::Getter", - "category": "Constants" - } + "name": "Cull Mode_ Front" + }, + "methods": [ + { + "key": "GetCullMode_Front", + "details": { + "name": "Get Cull Mode_ Front" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/CullMode_Invalid.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/CullMode_Invalid.names index 4eb73b06ea..1853ff0e5e 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/CullMode_Invalid.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/CullMode_Invalid.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "CullMode_Invalid::Getter", - "category": "Constants" - } + "name": "Cull Mode_ Invalid" + }, + "methods": [ + { + "key": "GetCullMode_Invalid", + "details": { + "name": "Get Cull Mode_ Invalid" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/CullMode_None.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/CullMode_None.names index 182e9c7573..d12a4993be 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/CullMode_None.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/CullMode_None.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "CullMode_None::Getter", - "category": "Constants" - } + "name": "Cull Mode_ None" + }, + "methods": [ + { + "key": "GetCullMode_None", + "details": { + "name": "Get Cull Mode_ None" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/CylinderShapeComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/CylinderShapeComponentTypeId.names index 3dadc415fd..e53b6da3a5 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/CylinderShapeComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/CylinderShapeComponentTypeId.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "CylinderShapeComponentTypeId::Getter", - "category": "Constants" - } + "name": "Cylinder Shape Component Type Id" + }, + "methods": [ + { + "key": "GetCylinderShapeComponentTypeId", + "details": { + "name": "Get Cylinder Shape Component Type Id" + }, + "results": [ + { + "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}", + "details": { + "name": "AZ:: Uuid" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DecalComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DecalComponentTypeId.names index 2a6aaa134e..611436b375 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DecalComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DecalComponentTypeId.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "DecalComponentTypeId::Getter", - "category": "Constants" - } + "name": "Decal Component Type Id" + }, + "methods": [ + { + "key": "GetDecalComponentTypeId", + "details": { + "name": "Get Decal Component Type Id" + }, + "results": [ + { + "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}", + "details": { + "name": "AZ:: Uuid" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DefaultLodOverride.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DefaultLodOverride.names index c46ee43b8b..6d435835d0 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DefaultLodOverride.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DefaultLodOverride.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "DefaultLodOverride::Getter", - "category": "Constants" - } + "name": "Default Lod Override" + }, + "methods": [ + { + "key": "GetDefaultLodOverride", + "details": { + "name": "Get Default Lod Override" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DefaultLodType.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DefaultLodType.names index 6e166c3480..cc81542ee0 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DefaultLodType.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DefaultLodType.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "DefaultLodType::Getter", - "category": "Constants" - } + "name": "Default Lod Type" + }, + "methods": [ + { + "key": "GetDefaultLodType", + "details": { + "name": "Get Default Lod Type" + }, + "results": [ + { + "typeid": "{72B9409A-7D1A-4831-9CFE-FCB3FADD3426}", + "details": { + "name": "unsigned char" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DefaultMaterialAssignment.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DefaultMaterialAssignment.names index f435b539a8..ab9af578b2 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DefaultMaterialAssignment.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DefaultMaterialAssignment.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "DefaultMaterialAssignment::Getter", - "category": "Constants" - } + "name": "Default Material Assignment" + }, + "methods": [ + { + "key": "GetDefaultMaterialAssignment", + "details": { + "name": "Get Default Material Assignment" + }, + "results": [ + { + "typeid": "{C66E5214-A24B-4722-B7F0-5991E6F8F163}", + "details": { + "name": "AZ:: Render:: Material Assignment" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DefaultMaterialAssignmentId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DefaultMaterialAssignmentId.names index b3188d9452..3f58471a22 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DefaultMaterialAssignmentId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DefaultMaterialAssignmentId.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "DefaultMaterialAssignmentId::Getter", - "category": "Constants" - } + "name": "Default Material Assignment Id" + }, + "methods": [ + { + "key": "GetDefaultMaterialAssignmentId", + "details": { + "name": "Get Default Material Assignment Id" + }, + "results": [ + { + "typeid": "{EB603581-4654-4C17-B6DE-AE61E79EDA97}", + "details": { + "name": "AZ:: Render:: Material Assignment Id" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DefaultMaterialAssignmentMap.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DefaultMaterialAssignmentMap.names index 248cf3f7ae..6bf0c18be5 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DefaultMaterialAssignmentMap.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DefaultMaterialAssignmentMap.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "DefaultMaterialAssignmentMap::Getter", - "category": "Constants" - } + "name": "Default Material Assignment Map" + }, + "methods": [ + { + "key": "GetDefaultMaterialAssignmentMap", + "details": { + "name": "Get Default Material Assignment Map" + }, + "results": [ + { + "typeid": "{50F6716F-698B-5A6C-AACD-940597FDEC24}", + "details": { + "name": "AZ Std::unordered_map" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DefaultPhysicsSceneId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DefaultPhysicsSceneId.names index 142b97a590..dc93bc89cc 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DefaultPhysicsSceneId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DefaultPhysicsSceneId.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "DefaultPhysicsSceneId::Getter", - "category": "Constants" - } + "name": "Default Physics Scene Id" + }, + "methods": [ + { + "key": "GetDefaultPhysicsSceneId", + "details": { + "name": "Get Default Physics Scene Id" + }, + "results": [ + { + "typeid": "{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}", + "details": { + "name": "Crc 32" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DefaultPhysicsSceneName.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DefaultPhysicsSceneName.names index bb32deaea4..65f1edc0bf 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DefaultPhysicsSceneName.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DefaultPhysicsSceneName.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "DefaultPhysicsSceneName::Getter", - "category": "Constants" - } + "name": "Default Physics Scene Name" + }, + "methods": [ + { + "key": "GetDefaultPhysicsSceneName", + "details": { + "name": "Get Default Physics Scene Name" + }, + "results": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DeferredFogComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DeferredFogComponentTypeId.names index 4c4899f264..3bbd2c69da 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DeferredFogComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DeferredFogComponentTypeId.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "DeferredFogComponentTypeId::Getter", - "category": "Constants" - } + "name": "Deferred Fog Component Type Id" + }, + "methods": [ + { + "key": "GetDeferredFogComponentTypeId", + "details": { + "name": "Get Deferred Fog Component Type Id" + }, + "results": [ + { + "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}", + "details": { + "name": "AZ:: Uuid" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DepthOfFieldComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DepthOfFieldComponentTypeId.names index 2104b9642f..f3edefd291 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DepthOfFieldComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DepthOfFieldComponentTypeId.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "DepthOfFieldComponentTypeId::Getter", - "category": "Constants" - } + "name": "Depth Of Field Component Type Id" + }, + "methods": [ + { + "key": "GetDepthOfFieldComponentTypeId", + "details": { + "name": "Get Depth Of Field Component Type Id" + }, + "results": [ + { + "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}", + "details": { + "name": "AZ:: Uuid" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DepthWriteMask_All.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DepthWriteMask_All.names index e169a19258..c1247f9834 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DepthWriteMask_All.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DepthWriteMask_All.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "DepthWriteMask_All::Getter", - "category": "Constants" - } + "name": "Depth Write Mask_ All" + }, + "methods": [ + { + "key": "GetDepthWriteMask_All", + "details": { + "name": "Get Depth Write Mask_ All" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DepthWriteMask_Invalid.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DepthWriteMask_Invalid.names index 4789194d25..a4887d3986 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DepthWriteMask_Invalid.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DepthWriteMask_Invalid.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "DepthWriteMask_Invalid::Getter", - "category": "Constants" - } + "name": "Depth Write Mask_ Invalid" + }, + "methods": [ + { + "key": "GetDepthWriteMask_Invalid", + "details": { + "name": "Get Depth Write Mask_ Invalid" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DepthWriteMask_Zero.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DepthWriteMask_Zero.names index 4268b4d8f8..c25e5b683d 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DepthWriteMask_Zero.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DepthWriteMask_Zero.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "DepthWriteMask_Zero::Getter", - "category": "Constants" - } + "name": "Depth Write Mask_ Zero" + }, + "methods": [ + { + "key": "GetDepthWriteMask_Zero", + "details": { + "name": "Get Depth Write Mask_ Zero" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DescriptorListCombinerComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DescriptorListCombinerComponentTypeId.names new file mode 100644 index 0000000000..0b4ea93d62 --- /dev/null +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DescriptorListCombinerComponentTypeId.names @@ -0,0 +1,28 @@ +{ + "entries": [ + { + "key": "DescriptorListCombinerComponentTypeId", + "context": "Constant", + "variant": "", + "details": { + "name": "Descriptor List Combiner Component Type Id" + }, + "methods": [ + { + "key": "GetDescriptorListCombinerComponentTypeId", + "details": { + "name": "Get Descriptor List Combiner Component Type Id" + }, + "results": [ + { + "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}", + "details": { + "name": "AZ:: Uuid" + } + } + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DescriptorListComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DescriptorListComponentTypeId.names new file mode 100644 index 0000000000..2e5faa3958 --- /dev/null +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DescriptorListComponentTypeId.names @@ -0,0 +1,28 @@ +{ + "entries": [ + { + "key": "DescriptorListComponentTypeId", + "context": "Constant", + "variant": "", + "details": { + "name": "Descriptor List Component Type Id" + }, + "methods": [ + { + "key": "GetDescriptorListComponentTypeId", + "details": { + "name": "Get Descriptor List Component Type Id" + }, + "results": [ + { + "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}", + "details": { + "name": "AZ:: Uuid" + } + } + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DescriptorWeightSelectorComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DescriptorWeightSelectorComponentTypeId.names new file mode 100644 index 0000000000..3e3c9c41d7 --- /dev/null +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DescriptorWeightSelectorComponentTypeId.names @@ -0,0 +1,28 @@ +{ + "entries": [ + { + "key": "DescriptorWeightSelectorComponentTypeId", + "context": "Constant", + "variant": "", + "details": { + "name": "Descriptor Weight Selector Component Type Id" + }, + "methods": [ + { + "key": "GetDescriptorWeightSelectorComponentTypeId", + "details": { + "name": "Get Descriptor Weight Selector Component Type Id" + }, + "results": [ + { + "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}", + "details": { + "name": "AZ:: Uuid" + } + } + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DiffuseGlobalIlluminationComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DiffuseGlobalIlluminationComponentTypeId.names index 2e633a1192..fbd3e36e8f 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DiffuseGlobalIlluminationComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DiffuseGlobalIlluminationComponentTypeId.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "DiffuseGlobalIlluminationComponentTypeId::Getter", - "category": "Constants" - } + "name": "Diffuse Global Illumination Component Type Id" + }, + "methods": [ + { + "key": "GetDiffuseGlobalIlluminationComponentTypeId", + "details": { + "name": "Get Diffuse Global Illumination Component Type Id" + }, + "results": [ + { + "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}", + "details": { + "name": "AZ:: Uuid" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DiffuseProbeGridComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DiffuseProbeGridComponentTypeId.names index c5b5f17bde..899d97641b 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DiffuseProbeGridComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DiffuseProbeGridComponentTypeId.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "DiffuseProbeGridComponentTypeId::Getter", - "category": "Constants" - } + "name": "Diffuse Probe Grid Component Type Id" + }, + "methods": [ + { + "key": "GetDiffuseProbeGridComponentTypeId", + "details": { + "name": "Get Diffuse Probe Grid Component Type Id" + }, + "results": [ + { + "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}", + "details": { + "name": "AZ:: Uuid" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DirectionalLightComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DirectionalLightComponentTypeId.names index 0ad98b326e..660d41eb5d 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DirectionalLightComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DirectionalLightComponentTypeId.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "DirectionalLightComponentTypeId::Getter", - "category": "Constants" - } + "name": "Directional Light Component Type Id" + }, + "methods": [ + { + "key": "GetDirectionalLightComponentTypeId", + "details": { + "name": "Get Directional Light Component Type Id" + }, + "results": [ + { + "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}", + "details": { + "name": "AZ:: Uuid" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DiskShapeComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DiskShapeComponentTypeId.names index cac82ca189..044432a574 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DiskShapeComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DiskShapeComponentTypeId.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "DiskShapeComponentTypeId::Getter", - "category": "Constants" - } + "name": "Disk Shape Component Type Id" + }, + "methods": [ + { + "key": "GetDiskShapeComponentTypeId", + "details": { + "name": "Get Disk Shape Component Type Id" + }, + "results": [ + { + "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}", + "details": { + "name": "AZ:: Uuid" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DisplayMapperComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DisplayMapperComponentTypeId.names index 9117f367ee..c9ff71c852 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DisplayMapperComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DisplayMapperComponentTypeId.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "DisplayMapperComponentTypeId::Getter", - "category": "Constants" - } + "name": "Display Mapper Component Type Id" + }, + "methods": [ + { + "key": "GetDisplayMapperComponentTypeId", + "details": { + "name": "Get Display Mapper Component Type Id" + }, + "results": [ + { + "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}", + "details": { + "name": "AZ:: Uuid" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DisplaySettings_HideHelpers.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DisplaySettings_HideHelpers.names index 488a8f7ec2..35e3dfbfdd 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DisplaySettings_HideHelpers.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DisplaySettings_HideHelpers.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "DisplaySettings_HideHelpers::Getter", - "category": "Constants" - } + "name": "Display Settings_ Hide Helpers" + }, + "methods": [ + { + "key": "GetDisplaySettings_HideHelpers", + "details": { + "name": "Get Display Settings_ Hide Helpers" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DisplaySettings_HideLinks.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DisplaySettings_HideLinks.names index d532e8ff35..6bbe7840b8 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DisplaySettings_HideLinks.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DisplaySettings_HideLinks.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "DisplaySettings_HideLinks::Getter", - "category": "Constants" - } + "name": "Display Settings_ Hide Links" + }, + "methods": [ + { + "key": "GetDisplaySettings_HideLinks", + "details": { + "name": "Get Display Settings_ Hide Links" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DisplaySettings_HideTracks.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DisplaySettings_HideTracks.names index ade09a965c..c67b3236a5 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DisplaySettings_HideTracks.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DisplaySettings_HideTracks.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "DisplaySettings_HideTracks::Getter", - "category": "Constants" - } + "name": "Display Settings_ Hide Tracks" + }, + "methods": [ + { + "key": "GetDisplaySettings_HideTracks", + "details": { + "name": "Get Display Settings_ Hide Tracks" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DisplaySettings_NoCollision.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DisplaySettings_NoCollision.names index 0cece10c67..2c06048179 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DisplaySettings_NoCollision.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DisplaySettings_NoCollision.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "DisplaySettings_NoCollision::Getter", - "category": "Constants" - } + "name": "Display Settings_ No Collision" + }, + "methods": [ + { + "key": "GetDisplaySettings_NoCollision", + "details": { + "name": "Get Display Settings_ No Collision" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DisplaySettings_NoLabels.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DisplaySettings_NoLabels.names index d855c9ce0e..23ef0c0ddd 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DisplaySettings_NoLabels.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DisplaySettings_NoLabels.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "DisplaySettings_NoLabels::Getter", - "category": "Constants" - } + "name": "Display Settings_ No Labels" + }, + "methods": [ + { + "key": "GetDisplaySettings_NoLabels", + "details": { + "name": "Get Display Settings_ No Labels" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DisplaySettings_Physics.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DisplaySettings_Physics.names index 237968c10e..1ed2194a31 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DisplaySettings_Physics.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DisplaySettings_Physics.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "DisplaySettings_Physics::Getter", - "category": "Constants" - } + "name": "Display Settings_ Physics" + }, + "methods": [ + { + "key": "GetDisplaySettings_Physics", + "details": { + "name": "Get Display Settings_ Physics" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DisplaySettings_SerializableFlagsMask.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DisplaySettings_SerializableFlagsMask.names index c6e4c44cb2..ab122edd5e 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DisplaySettings_SerializableFlagsMask.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DisplaySettings_SerializableFlagsMask.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "DisplaySettings_SerializableFlagsMask::Getter", - "category": "Constants" - } + "name": "Display Settings_ Serializable Flags Mask" + }, + "methods": [ + { + "key": "GetDisplaySettings_SerializableFlagsMask", + "details": { + "name": "Get Display Settings_ Serializable Flags Mask" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DisplaySettings_ShowDimensionFigures.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DisplaySettings_ShowDimensionFigures.names index 2c3f42a6c5..82a333fde2 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DisplaySettings_ShowDimensionFigures.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DisplaySettings_ShowDimensionFigures.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "DisplaySettings_ShowDimensionFigures::Getter", - "category": "Constants" - } + "name": "Display Settings_ Show Dimension Figures" + }, + "methods": [ + { + "key": "GetDisplaySettings_ShowDimensionFigures", + "details": { + "name": "Get Display Settings_ Show Dimension Figures" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DistanceBetweenFilterComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DistanceBetweenFilterComponentTypeId.names new file mode 100644 index 0000000000..a959835ec8 --- /dev/null +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DistanceBetweenFilterComponentTypeId.names @@ -0,0 +1,28 @@ +{ + "entries": [ + { + "key": "DistanceBetweenFilterComponentTypeId", + "context": "Constant", + "variant": "", + "details": { + "name": "Distance Between Filter Component Type Id" + }, + "methods": [ + { + "key": "GetDistanceBetweenFilterComponentTypeId", + "details": { + "name": "Get Distance Between Filter Component Type Id" + }, + "results": [ + { + "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}", + "details": { + "name": "AZ:: Uuid" + } + } + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DistributionFilterComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DistributionFilterComponentTypeId.names new file mode 100644 index 0000000000..6c3050def5 --- /dev/null +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DistributionFilterComponentTypeId.names @@ -0,0 +1,28 @@ +{ + "entries": [ + { + "key": "DistributionFilterComponentTypeId", + "context": "Constant", + "variant": "", + "details": { + "name": "Distribution Filter Component Type Id" + }, + "methods": [ + { + "key": "GetDistributionFilterComponentTypeId", + "details": { + "name": "Get Distribution Filter Component Type Id" + }, + "results": [ + { + "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}", + "details": { + "name": "AZ:: Uuid" + } + } + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DitherGradientComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DitherGradientComponentTypeId.names index f4be6282d0..92462cece4 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DitherGradientComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DitherGradientComponentTypeId.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "DitherGradientComponentTypeId::Getter", - "category": "Constants" - } + "name": "Dither Gradient Component Type Id" + }, + "methods": [ + { + "key": "GetDitherGradientComponentTypeId", + "details": { + "name": "Get Dither Gradient Component Type Id" + }, + "results": [ + { + "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}", + "details": { + "name": "AZ:: Uuid" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorAreaLightComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorAreaLightComponentTypeId.names index fd410df4f9..a283f79413 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorAreaLightComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorAreaLightComponentTypeId.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "EditorAreaLightComponentTypeId::Getter", - "category": "Constants" - } + "name": "Editor Area Light Component Type Id" + }, + "methods": [ + { + "key": "GetEditorAreaLightComponentTypeId", + "details": { + "name": "Get Editor Area Light Component Type Id" + }, + "results": [ + { + "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}", + "details": { + "name": "AZ:: Uuid" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorBloomComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorBloomComponentTypeId.names index 2d2f101be0..f6b2016cc6 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorBloomComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorBloomComponentTypeId.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "EditorBloomComponentTypeId::Getter", - "category": "Constants" - } + "name": "Editor Bloom Component Type Id" + }, + "methods": [ + { + "key": "GetEditorBloomComponentTypeId", + "details": { + "name": "Get Editor Bloom Component Type Id" + }, + "results": [ + { + "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}", + "details": { + "name": "AZ:: Uuid" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorDecalComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorDecalComponentTypeId.names index a40f551364..b8a36069a8 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorDecalComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorDecalComponentTypeId.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "EditorDecalComponentTypeId::Getter", - "category": "Constants" - } + "name": "Editor Decal Component Type Id" + }, + "methods": [ + { + "key": "GetEditorDecalComponentTypeId", + "details": { + "name": "Get Editor Decal Component Type Id" + }, + "results": [ + { + "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}", + "details": { + "name": "AZ:: Uuid" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorDeferredFogComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorDeferredFogComponentTypeId.names index c0f17922f6..2df1d4ec84 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorDeferredFogComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorDeferredFogComponentTypeId.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "EditorDeferredFogComponentTypeId::Getter", - "category": "Constants" - } + "name": "Editor Deferred Fog Component Type Id" + }, + "methods": [ + { + "key": "GetEditorDeferredFogComponentTypeId", + "details": { + "name": "Get Editor Deferred Fog Component Type Id" + }, + "results": [ + { + "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}", + "details": { + "name": "AZ:: Uuid" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorDepthOfFieldComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorDepthOfFieldComponentTypeId.names index fc16e176bd..dbaaaa147f 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorDepthOfFieldComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorDepthOfFieldComponentTypeId.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "EditorDepthOfFieldComponentTypeId::Getter", - "category": "Constants" - } + "name": "Editor Depth Of Field Component Type Id" + }, + "methods": [ + { + "key": "GetEditorDepthOfFieldComponentTypeId", + "details": { + "name": "Get Editor Depth Of Field Component Type Id" + }, + "results": [ + { + "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}", + "details": { + "name": "AZ:: Uuid" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorDiffuseGlobalIlluminationComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorDiffuseGlobalIlluminationComponentTypeId.names index ab9f4e04f0..9eb3c93944 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorDiffuseGlobalIlluminationComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorDiffuseGlobalIlluminationComponentTypeId.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "EditorDiffuseGlobalIlluminationComponentTypeId::Getter", - "category": "Constants" - } + "name": "Editor Diffuse Global Illumination Component Type Id" + }, + "methods": [ + { + "key": "GetEditorDiffuseGlobalIlluminationComponentTypeId", + "details": { + "name": "Get Editor Diffuse Global Illumination Component Type Id" + }, + "results": [ + { + "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}", + "details": { + "name": "AZ:: Uuid" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorDiffuseProbeGridComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorDiffuseProbeGridComponentTypeId.names index 24e649c4b0..00bee56378 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorDiffuseProbeGridComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorDiffuseProbeGridComponentTypeId.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "EditorDiffuseProbeGridComponentTypeId::Getter", - "category": "Constants" - } + "name": "Editor Diffuse Probe Grid Component Type Id" + }, + "methods": [ + { + "key": "GetEditorDiffuseProbeGridComponentTypeId", + "details": { + "name": "Get Editor Diffuse Probe Grid Component Type Id" + }, + "results": [ + { + "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}", + "details": { + "name": "AZ:: Uuid" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorDirectionalLightComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorDirectionalLightComponentTypeId.names index 0caf18913a..99f34c0d3c 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorDirectionalLightComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorDirectionalLightComponentTypeId.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "EditorDirectionalLightComponentTypeId::Getter", - "category": "Constants" - } + "name": "Editor Directional Light Component Type Id" + }, + "methods": [ + { + "key": "GetEditorDirectionalLightComponentTypeId", + "details": { + "name": "Get Editor Directional Light Component Type Id" + }, + "results": [ + { + "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}", + "details": { + "name": "AZ:: Uuid" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorDisplayMapperComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorDisplayMapperComponentTypeId.names index 6a449cb643..0e388dd703 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorDisplayMapperComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorDisplayMapperComponentTypeId.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "EditorDisplayMapperComponentTypeId::Getter", - "category": "Constants" - } + "name": "Editor Display Mapper Component Type Id" + }, + "methods": [ + { + "key": "GetEditorDisplayMapperComponentTypeId", + "details": { + "name": "Get Editor Display Mapper Component Type Id" + }, + "results": [ + { + "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}", + "details": { + "name": "AZ:: Uuid" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorEntityReferenceComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorEntityReferenceComponentTypeId.names index f0214aec06..e83689b243 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorEntityReferenceComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorEntityReferenceComponentTypeId.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "EditorEntityReferenceComponentTypeId::Getter", - "category": "Constants" - } + "name": "Editor Entity Reference Component Type Id" + }, + "methods": [ + { + "key": "GetEditorEntityReferenceComponentTypeId", + "details": { + "name": "Get Editor Entity Reference Component Type Id" + }, + "results": [ + { + "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}", + "details": { + "name": "AZ:: Uuid" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorEntityStartStatus_EditorOnly.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorEntityStartStatus_EditorOnly.names index e4ca34fdb0..65d7e78197 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorEntityStartStatus_EditorOnly.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorEntityStartStatus_EditorOnly.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "EditorEntityStartStatus_EditorOnly::Getter", - "category": "Constants" - } + "name": "Editor Entity Start Status_ Editor Only" + }, + "methods": [ + { + "key": "GetEditorEntityStartStatus_EditorOnly", + "details": { + "name": "Get Editor Entity Start Status_ Editor Only" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorEntityStartStatus_StartActive.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorEntityStartStatus_StartActive.names index 51e4369297..2c26e7c619 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorEntityStartStatus_StartActive.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorEntityStartStatus_StartActive.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "EditorEntityStartStatus_StartActive::Getter", - "category": "Constants" - } + "name": "Editor Entity Start Status_ Start Active" + }, + "methods": [ + { + "key": "GetEditorEntityStartStatus_StartActive", + "details": { + "name": "Get Editor Entity Start Status_ Start Active" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorEntityStartStatus_StartInactive.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorEntityStartStatus_StartInactive.names index fa41555722..54c3a17d75 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorEntityStartStatus_StartInactive.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorEntityStartStatus_StartInactive.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "EditorEntityStartStatus_StartInactive::Getter", - "category": "Constants" - } + "name": "Editor Entity Start Status_ Start Inactive" + }, + "methods": [ + { + "key": "GetEditorEntityStartStatus_StartInactive", + "details": { + "name": "Get Editor Entity Start Status_ Start Inactive" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorExposureControlComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorExposureControlComponentTypeId.names index 3b9c6f893f..2fd540d06c 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorExposureControlComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorExposureControlComponentTypeId.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "EditorExposureControlComponentTypeId::Getter", - "category": "Constants" - } + "name": "Editor Exposure Control Component Type Id" + }, + "methods": [ + { + "key": "GetEditorExposureControlComponentTypeId", + "details": { + "name": "Get Editor Exposure Control Component Type Id" + }, + "results": [ + { + "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}", + "details": { + "name": "AZ:: Uuid" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorGradientWeightModifierComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorGradientWeightModifierComponentTypeId.names index dc20398559..da58fa9259 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorGradientWeightModifierComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorGradientWeightModifierComponentTypeId.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "EditorGradientWeightModifierComponentTypeId::Getter", - "category": "Constants" - } + "name": "Editor Gradient Weight Modifier Component Type Id" + }, + "methods": [ + { + "key": "GetEditorGradientWeightModifierComponentTypeId", + "details": { + "name": "Get Editor Gradient Weight Modifier Component Type Id" + }, + "results": [ + { + "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}", + "details": { + "name": "AZ:: Uuid" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorGridComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorGridComponentTypeId.names index 5f3dbe3e87..de70fdea93 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorGridComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorGridComponentTypeId.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "EditorGridComponentTypeId::Getter", - "category": "Constants" - } + "name": "Editor Grid Component Type Id" + }, + "methods": [ + { + "key": "GetEditorGridComponentTypeId", + "details": { + "name": "Get Editor Grid Component Type Id" + }, + "results": [ + { + "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}", + "details": { + "name": "AZ:: Uuid" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorHDRiSkyboxComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorHDRiSkyboxComponentTypeId.names index d1e49132a9..0854b542a8 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorHDRiSkyboxComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorHDRiSkyboxComponentTypeId.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "EditorHDRiSkyboxComponentTypeId::Getter", - "category": "Constants" - } + "name": "EditorHD Ri Skybox Component Type Id" + }, + "methods": [ + { + "key": "GetEditorHDRiSkyboxComponentTypeId", + "details": { + "name": "Get EditorHD Ri Skybox Component Type Id" + }, + "results": [ + { + "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}", + "details": { + "name": "AZ:: Uuid" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorHairComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorHairComponentTypeId.names new file mode 100644 index 0000000000..9bba733295 --- /dev/null +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorHairComponentTypeId.names @@ -0,0 +1,28 @@ +{ + "entries": [ + { + "key": "EditorHairComponentTypeId", + "context": "Constant", + "variant": "", + "details": { + "name": "Editor Hair Component Type Id" + }, + "methods": [ + { + "key": "GetEditorHairComponentTypeId", + "details": { + "name": "Get Editor Hair Component Type Id" + }, + "results": [ + { + "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}", + "details": { + "name": "AZ:: Uuid" + } + } + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorImageBasedLightComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorImageBasedLightComponentTypeId.names index e6ddff36a2..bc680351c1 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorImageBasedLightComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorImageBasedLightComponentTypeId.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "EditorImageBasedLightComponentTypeId::Getter", - "category": "Constants" - } + "name": "Editor Image Based Light Component Type Id" + }, + "methods": [ + { + "key": "GetEditorImageBasedLightComponentTypeId", + "details": { + "name": "Get Editor Image Based Light Component Type Id" + }, + "results": [ + { + "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}", + "details": { + "name": "AZ:: Uuid" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorLookModificationComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorLookModificationComponentTypeId.names index 39bcdad1e5..0268909af8 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorLookModificationComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorLookModificationComponentTypeId.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "EditorLookModificationComponentTypeId::Getter", - "category": "Constants" - } + "name": "Editor Look Modification Component Type Id" + }, + "methods": [ + { + "key": "GetEditorLookModificationComponentTypeId", + "details": { + "name": "Get Editor Look Modification Component Type Id" + }, + "results": [ + { + "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}", + "details": { + "name": "AZ:: Uuid" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorMaterialComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorMaterialComponentTypeId.names index 35b3db3305..4fb9c163d5 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorMaterialComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorMaterialComponentTypeId.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "EditorMaterialComponentTypeId::Getter", - "category": "Constants" - } + "name": "Editor Material Component Type Id" + }, + "methods": [ + { + "key": "GetEditorMaterialComponentTypeId", + "details": { + "name": "Get Editor Material Component Type Id" + }, + "results": [ + { + "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}", + "details": { + "name": "AZ:: Uuid" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorMeshComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorMeshComponentTypeId.names index 8ca2af81eb..4e5011457a 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorMeshComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorMeshComponentTypeId.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "EditorMeshComponentTypeId::Getter", - "category": "Constants" - } + "name": "Editor Mesh Component Type Id" + }, + "methods": [ + { + "key": "GetEditorMeshComponentTypeId", + "details": { + "name": "Get Editor Mesh Component Type Id" + }, + "results": [ + { + "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}", + "details": { + "name": "AZ:: Uuid" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorNonUniformScaleComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorNonUniformScaleComponentTypeId.names index ea5a58d742..6d4a0843d9 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorNonUniformScaleComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorNonUniformScaleComponentTypeId.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "EditorNonUniformScaleComponentTypeId::Getter", - "category": "Constants" - } + "name": "Editor Non Uniform Scale Component Type Id" + }, + "methods": [ + { + "key": "GetEditorNonUniformScaleComponentTypeId", + "details": { + "name": "Get Editor Non Uniform Scale Component Type Id" + }, + "results": [ + { + "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}", + "details": { + "name": "AZ:: Uuid" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorOcclusionCullingPlaneComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorOcclusionCullingPlaneComponentTypeId.names index 4c2b06be1a..68e47583b4 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorOcclusionCullingPlaneComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorOcclusionCullingPlaneComponentTypeId.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "EditorOcclusionCullingPlaneComponentTypeId::Getter", - "category": "Constants" - } + "name": "Editor Occlusion Culling Plane Component Type Id" + }, + "methods": [ + { + "key": "GetEditorOcclusionCullingPlaneComponentTypeId", + "details": { + "name": "Get Editor Occlusion Culling Plane Component Type Id" + }, + "results": [ + { + "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}", + "details": { + "name": "AZ:: Uuid" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorPhysicalSkyComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorPhysicalSkyComponentTypeId.names index a1ec685c88..24baef9d81 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorPhysicalSkyComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorPhysicalSkyComponentTypeId.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "EditorPhysicalSkyComponentTypeId::Getter", - "category": "Constants" - } + "name": "Editor Physical Sky Component Type Id" + }, + "methods": [ + { + "key": "GetEditorPhysicalSkyComponentTypeId", + "details": { + "name": "Get Editor Physical Sky Component Type Id" + }, + "results": [ + { + "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}", + "details": { + "name": "AZ:: Uuid" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorPhysicsSceneId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorPhysicsSceneId.names index d98a729c34..1af12c6c6a 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorPhysicsSceneId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorPhysicsSceneId.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "EditorPhysicsSceneId::Getter", - "category": "Constants" - } + "name": "Editor Physics Scene Id" + }, + "methods": [ + { + "key": "GetEditorPhysicsSceneId", + "details": { + "name": "Get Editor Physics Scene Id" + }, + "results": [ + { + "typeid": "{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}", + "details": { + "name": "Crc 32" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorPhysicsSceneName.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorPhysicsSceneName.names index 0a209f241c..c145101628 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorPhysicsSceneName.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorPhysicsSceneName.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "EditorPhysicsSceneName::Getter", - "category": "Constants" - } + "name": "Editor Physics Scene Name" + }, + "methods": [ + { + "key": "GetEditorPhysicsSceneName", + "details": { + "name": "Get Editor Physics Scene Name" + }, + "results": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorPostFxLayerComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorPostFxLayerComponentTypeId.names index d6372c4c94..36d903072d 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorPostFxLayerComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorPostFxLayerComponentTypeId.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "EditorPostFxLayerComponentTypeId::Getter", - "category": "Constants" - } + "name": "Editor Post Fx Layer Component Type Id" + }, + "methods": [ + { + "key": "GetEditorPostFxLayerComponentTypeId", + "details": { + "name": "Get Editor Post Fx Layer Component Type Id" + }, + "results": [ + { + "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}", + "details": { + "name": "AZ:: Uuid" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorPrefabComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorPrefabComponentTypeId.names new file mode 100644 index 0000000000..7e83dd392c --- /dev/null +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorPrefabComponentTypeId.names @@ -0,0 +1,28 @@ +{ + "entries": [ + { + "key": "EditorPrefabComponentTypeId", + "context": "Constant", + "variant": "", + "details": { + "name": "Editor Prefab Component Type Id" + }, + "methods": [ + { + "key": "GetEditorPrefabComponentTypeId", + "details": { + "name": "Get Editor Prefab Component Type Id" + }, + "results": [ + { + "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}", + "details": { + "name": "AZ:: Uuid" + } + } + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorRadiusWeightModifierComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorRadiusWeightModifierComponentTypeId.names index e8d4299ea7..ce044aeb6c 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorRadiusWeightModifierComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorRadiusWeightModifierComponentTypeId.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "EditorRadiusWeightModifierComponentTypeId::Getter", - "category": "Constants" - } + "name": "Editor Radius Weight Modifier Component Type Id" + }, + "methods": [ + { + "key": "GetEditorRadiusWeightModifierComponentTypeId", + "details": { + "name": "Get Editor Radius Weight Modifier Component Type Id" + }, + "results": [ + { + "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}", + "details": { + "name": "AZ:: Uuid" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorReflectionProbeComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorReflectionProbeComponentTypeId.names index 2bbbb9d789..382bc43d85 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorReflectionProbeComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorReflectionProbeComponentTypeId.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "EditorReflectionProbeComponentTypeId::Getter", - "category": "Constants" - } + "name": "Editor Reflection Probe Component Type Id" + }, + "methods": [ + { + "key": "GetEditorReflectionProbeComponentTypeId", + "details": { + "name": "Get Editor Reflection Probe Component Type Id" + }, + "results": [ + { + "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}", + "details": { + "name": "AZ:: Uuid" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorShapeWeightModifierComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorShapeWeightModifierComponentTypeId.names index 3abeafda2a..eaf1c926ee 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorShapeWeightModifierComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorShapeWeightModifierComponentTypeId.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "EditorShapeWeightModifierComponentTypeId::Getter", - "category": "Constants" - } + "name": "Editor Shape Weight Modifier Component Type Id" + }, + "methods": [ + { + "key": "GetEditorShapeWeightModifierComponentTypeId", + "details": { + "name": "Get Editor Shape Weight Modifier Component Type Id" + }, + "results": [ + { + "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}", + "details": { + "name": "AZ:: Uuid" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorSsaoComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorSsaoComponentTypeId.names index d1d030c18b..6e1de64a18 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorSsaoComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorSsaoComponentTypeId.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "EditorSsaoComponentTypeId::Getter", - "category": "Constants" - } + "name": "Editor Ssao Component Type Id" + }, + "methods": [ + { + "key": "GetEditorSsaoComponentTypeId", + "details": { + "name": "Get Editor Ssao Component Type Id" + }, + "results": [ + { + "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}", + "details": { + "name": "AZ:: Uuid" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorTransformComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorTransformComponentTypeId.names index ce90232aea..4fa1899ee5 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorTransformComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorTransformComponentTypeId.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "EditorTransformComponentTypeId::Getter", - "category": "Constants" - } + "name": "Editor Transform Component Type Id" + }, + "methods": [ + { + "key": "GetEditorTransformComponentTypeId", + "details": { + "name": "Get Editor Transform Component Type Id" + }, + "results": [ + { + "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}", + "details": { + "name": "AZ:: Uuid" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EntityReferenceComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EntityReferenceComponentTypeId.names index d2e2fd6713..958604cc43 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EntityReferenceComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EntityReferenceComponentTypeId.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "EntityReferenceComponentTypeId::Getter", - "category": "Constants" - } + "name": "Entity Reference Component Type Id" + }, + "methods": [ + { + "key": "GetEntityReferenceComponentTypeId", + "details": { + "name": "Get Entity Reference Component Type Id" + }, + "results": [ + { + "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}", + "details": { + "name": "AZ:: Uuid" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ExposureControlComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ExposureControlComponentTypeId.names index e88dd26549..df48a559c0 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ExposureControlComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ExposureControlComponentTypeId.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "ExposureControlComponentTypeId::Getter", - "category": "Constants" - } + "name": "Exposure Control Component Type Id" + }, + "methods": [ + { + "key": "GetExposureControlComponentTypeId", + "details": { + "name": "Get Exposure Control Component Type Id" + }, + "results": [ + { + "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}", + "details": { + "name": "AZ:: Uuid" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FastNoiseGradientComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FastNoiseGradientComponentTypeId.names new file mode 100644 index 0000000000..84bd2b4583 --- /dev/null +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FastNoiseGradientComponentTypeId.names @@ -0,0 +1,28 @@ +{ + "entries": [ + { + "key": "FastNoiseGradientComponentTypeId", + "context": "Constant", + "variant": "", + "details": { + "name": "Fast Noise Gradient Component Type Id" + }, + "methods": [ + { + "key": "GetFastNoiseGradientComponentTypeId", + "details": { + "name": "Get Fast Noise Gradient Component Type Id" + }, + "results": [ + { + "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}", + "details": { + "name": "AZ:: Uuid" + } + } + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FillMode_Invalid.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FillMode_Invalid.names index 27cd936beb..bc3025ba93 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FillMode_Invalid.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FillMode_Invalid.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "FillMode_Invalid::Getter", - "category": "Constants" - } + "name": "Fill Mode_ Invalid" + }, + "methods": [ + { + "key": "GetFillMode_Invalid", + "details": { + "name": "Get Fill Mode_ Invalid" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FillMode_Solid.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FillMode_Solid.names index e3f52f0784..2fede46e00 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FillMode_Solid.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FillMode_Solid.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "FillMode_Solid::Getter", - "category": "Constants" - } + "name": "Fill Mode_ Solid" + }, + "methods": [ + { + "key": "GetFillMode_Solid", + "details": { + "name": "Get Fill Mode_ Solid" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FillMode_Wireframe.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FillMode_Wireframe.names index cdbe3521f7..0e88c95626 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FillMode_Wireframe.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FillMode_Wireframe.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "FillMode_Wireframe::Getter", - "category": "Constants" - } + "name": "Fill Mode_ Wireframe" + }, + "methods": [ + { + "key": "GetFillMode_Wireframe", + "details": { + "name": "Get Fill Mode_ Wireframe" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FloatEpsilon.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FloatEpsilon.names index 438ba833c5..b186c5227c 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FloatEpsilon.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FloatEpsilon.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "FloatEpsilon::Getter", - "category": "Constants" - } + "name": "Float Epsilon" + }, + "methods": [ + { + "key": "GetFloatEpsilon", + "details": { + "name": "Get Float Epsilon" + }, + "results": [ + { + "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", + "details": { + "name": "float" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FrameCaptureResult_FileWriteError.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FrameCaptureResult_FileWriteError.names index f0e0e3e68e..309c149eca 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FrameCaptureResult_FileWriteError.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FrameCaptureResult_FileWriteError.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "FrameCaptureResult_FileWriteError::Getter", - "category": "Constants" - } + "name": "Frame Capture Result_ File Write Error" + }, + "methods": [ + { + "key": "GetFrameCaptureResult_FileWriteError", + "details": { + "name": "Get Frame Capture Result_ File Write Error" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FrameCaptureResult_InternalError.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FrameCaptureResult_InternalError.names index 823225c397..fdd46c6d5d 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FrameCaptureResult_InternalError.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FrameCaptureResult_InternalError.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "FrameCaptureResult_InternalError::Getter", - "category": "Constants" - } + "name": "Frame Capture Result_ Internal Error" + }, + "methods": [ + { + "key": "GetFrameCaptureResult_InternalError", + "details": { + "name": "Get Frame Capture Result_ Internal Error" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FrameCaptureResult_InvalidArgument.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FrameCaptureResult_InvalidArgument.names index 360800ac3e..dcb41c67aa 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FrameCaptureResult_InvalidArgument.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FrameCaptureResult_InvalidArgument.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "FrameCaptureResult_InvalidArgument::Getter", - "category": "Constants" - } + "name": "Frame Capture Result_ Invalid Argument" + }, + "methods": [ + { + "key": "GetFrameCaptureResult_InvalidArgument", + "details": { + "name": "Get Frame Capture Result_ Invalid Argument" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FrameCaptureResult_None.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FrameCaptureResult_None.names index a6ba18d32f..847802e5cc 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FrameCaptureResult_None.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FrameCaptureResult_None.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "FrameCaptureResult_None::Getter", - "category": "Constants" - } + "name": "Frame Capture Result_ None" + }, + "methods": [ + { + "key": "GetFrameCaptureResult_None", + "details": { + "name": "Get Frame Capture Result_ None" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FrameCaptureResult_Success.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FrameCaptureResult_Success.names index 789fd31acf..359ae90726 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FrameCaptureResult_Success.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FrameCaptureResult_Success.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "FrameCaptureResult_Success::Getter", - "category": "Constants" - } + "name": "Frame Capture Result_ Success" + }, + "methods": [ + { + "key": "GetFrameCaptureResult_Success", + "details": { + "name": "Get Frame Capture Result_ Success" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FrameCaptureResult_UnsupportedFormat.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FrameCaptureResult_UnsupportedFormat.names index 136406261d..3fa969b1b2 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FrameCaptureResult_UnsupportedFormat.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FrameCaptureResult_UnsupportedFormat.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "FrameCaptureResult_UnsupportedFormat::Getter", - "category": "Constants" - } + "name": "Frame Capture Result_ Unsupported Format" + }, + "methods": [ + { + "key": "GetFrameCaptureResult_UnsupportedFormat", + "details": { + "name": "Get Frame Capture Result_ Unsupported Format" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/GradientSurfaceDataComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/GradientSurfaceDataComponentTypeId.names index 90e43a4a20..f9d71f573b 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/GradientSurfaceDataComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/GradientSurfaceDataComponentTypeId.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "GradientSurfaceDataComponentTypeId::Getter", - "category": "Constants" - } + "name": "Gradient Surface Data Component Type Id" + }, + "methods": [ + { + "key": "GetGradientSurfaceDataComponentTypeId", + "details": { + "name": "Get Gradient Surface Data Component Type Id" + }, + "results": [ + { + "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}", + "details": { + "name": "AZ:: Uuid" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/GradientTransformComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/GradientTransformComponentTypeId.names index 339c4d2904..b704ef2a56 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/GradientTransformComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/GradientTransformComponentTypeId.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "GradientTransformComponentTypeId::Getter", - "category": "Constants" - } + "name": "Gradient Transform Component Type Id" + }, + "methods": [ + { + "key": "GetGradientTransformComponentTypeId", + "details": { + "name": "Get Gradient Transform Component Type Id" + }, + "results": [ + { + "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}", + "details": { + "name": "AZ:: Uuid" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/GradientWeightModifierComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/GradientWeightModifierComponentTypeId.names index cee5ed45f5..8a0fca75fc 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/GradientWeightModifierComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/GradientWeightModifierComponentTypeId.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "GradientWeightModifierComponentTypeId::Getter", - "category": "Constants" - } + "name": "Gradient Weight Modifier Component Type Id" + }, + "methods": [ + { + "key": "GetGradientWeightModifierComponentTypeId", + "details": { + "name": "Get Gradient Weight Modifier Component Type Id" + }, + "results": [ + { + "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}", + "details": { + "name": "AZ:: Uuid" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/GridComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/GridComponentTypeId.names index e6ca6375da..9d0eb31c18 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/GridComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/GridComponentTypeId.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "GridComponentTypeId::Getter", - "category": "Constants" - } + "name": "Grid Component Type Id" + }, + "methods": [ + { + "key": "GetGridComponentTypeId", + "details": { + "name": "Get Grid Component Type Id" + }, + "results": [ + { + "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}", + "details": { + "name": "AZ:: Uuid" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/HDRiSkyboxComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/HDRiSkyboxComponentTypeId.names index ce30501f5a..704c5d7d24 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/HDRiSkyboxComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/HDRiSkyboxComponentTypeId.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "HDRiSkyboxComponentTypeId::Getter", - "category": "Constants" - } + "name": "HD Ri Skybox Component Type Id" + }, + "methods": [ + { + "key": "GetHDRiSkyboxComponentTypeId", + "details": { + "name": "GetHD Ri Skybox Component Type Id" + }, + "results": [ + { + "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}", + "details": { + "name": "AZ:: Uuid" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/HairComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/HairComponentTypeId.names new file mode 100644 index 0000000000..cf078292a0 --- /dev/null +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/HairComponentTypeId.names @@ -0,0 +1,28 @@ +{ + "entries": [ + { + "key": "HairComponentTypeId", + "context": "Constant", + "variant": "", + "details": { + "name": "Hair Component Type Id" + }, + "methods": [ + { + "key": "GetHairComponentTypeId", + "details": { + "name": "Get Hair Component Type Id" + }, + "results": [ + { + "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}", + "details": { + "name": "AZ:: Uuid" + } + } + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ICOSAHEDRON.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ICOSAHEDRON.names new file mode 100644 index 0000000000..4c273fbbf7 --- /dev/null +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ICOSAHEDRON.names @@ -0,0 +1,28 @@ +{ + "entries": [ + { + "key": "ICOSAHEDRON", + "context": "Constant", + "variant": "", + "details": { + "name": "ICOSAHEDRON" + }, + "methods": [ + { + "key": "GetICOSAHEDRON", + "details": { + "name": "GetICOSAHEDRON" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ImageBasedLightComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ImageBasedLightComponentTypeId.names index 7669ee6318..25d19bd73e 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ImageBasedLightComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ImageBasedLightComponentTypeId.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "ImageBasedLightComponentTypeId::Getter", - "category": "Constants" - } + "name": "Image Based Light Component Type Id" + }, + "methods": [ + { + "key": "GetImageBasedLightComponentTypeId", + "details": { + "name": "Get Image Based Light Component Type Id" + }, + "results": [ + { + "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}", + "details": { + "name": "AZ:: Uuid" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ImageGradientComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ImageGradientComponentTypeId.names index 6fa8464e57..e68215a756 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ImageGradientComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ImageGradientComponentTypeId.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "ImageGradientComponentTypeId::Getter", - "category": "Constants" - } + "name": "Image Gradient Component Type Id" + }, + "methods": [ + { + "key": "GetImageGradientComponentTypeId", + "details": { + "name": "Get Image Gradient Component Type Id" + }, + "results": [ + { + "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}", + "details": { + "name": "AZ:: Uuid" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/InvalidComponentId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/InvalidComponentId.names index 5b2d673f0b..908b2bc0aa 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/InvalidComponentId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/InvalidComponentId.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "InvalidComponentId::Getter", - "category": "Constants" - } + "name": "Invalid Component Id" + }, + "methods": [ + { + "key": "GetInvalidComponentId", + "details": { + "name": "Get Invalid Component Id" + }, + "results": [ + { + "typeid": "{D6597933-47CD-4FC8-B911-63F3E2B0993A}", + "details": { + "name": "AZ::u 64" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/InvalidParameterIndex.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/InvalidParameterIndex.names index 9d3edcdbee..6860443397 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/InvalidParameterIndex.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/InvalidParameterIndex.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "InvalidParameterIndex::Getter", - "category": "Constants" - } + "name": "Invalid Parameter Index" + }, + "methods": [ + { + "key": "GetInvalidParameterIndex", + "details": { + "name": "Get Invalid Parameter Index" + }, + "results": [ + { + "typeid": "{D6597933-47CD-4FC8-B911-63F3E2B0993A}", + "details": { + "name": "AZ::u 64" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/InvalidTemplateId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/InvalidTemplateId.names index 30f928664c..10430e9507 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/InvalidTemplateId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/InvalidTemplateId.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "InvalidTemplateId::Getter", - "category": "Constants" - } + "name": "Invalid Template Id" + }, + "methods": [ + { + "key": "GetInvalidTemplateId", + "details": { + "name": "Get Invalid Template Id" + }, + "results": [ + { + "typeid": "{D6597933-47CD-4FC8-B911-63F3E2B0993A}", + "details": { + "name": "AZ::u 64" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/InvertGradientComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/InvertGradientComponentTypeId.names index 0c6d3253b5..a809c0f220 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/InvertGradientComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/InvertGradientComponentTypeId.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "InvertGradientComponentTypeId::Getter", - "category": "Constants" - } + "name": "Invert Gradient Component Type Id" + }, + "methods": [ + { + "key": "GetInvertGradientComponentTypeId", + "details": { + "name": "Get Invert Gradient Component Type Id" + }, + "results": [ + { + "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}", + "details": { + "name": "AZ:: Uuid" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/JsonMergePatch.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/JsonMergePatch.names index 53e973e3a5..b1334c1b04 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/JsonMergePatch.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/JsonMergePatch.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "JsonMergePatch::Getter", - "category": "Constants" - } + "name": "Json Merge Patch" + }, + "methods": [ + { + "key": "GetJsonMergePatch", + "details": { + "name": "Get Json Merge Patch" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/JsonPatch.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/JsonPatch.names index fec9372c25..9823329c76 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/JsonPatch.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/JsonPatch.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "JsonPatch::Getter", - "category": "Constants" - } + "name": "Json Patch" + }, + "methods": [ + { + "key": "GetJsonPatch", + "details": { + "name": "Get Json Patch" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/LANDSCAPE_CANVAS_EDITOR_ID.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/LANDSCAPE_CANVAS_EDITOR_ID.names new file mode 100644 index 0000000000..ddb8739fb5 --- /dev/null +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/LANDSCAPE_CANVAS_EDITOR_ID.names @@ -0,0 +1,28 @@ +{ + "entries": [ + { + "key": "LANDSCAPE_CANVAS_EDITOR_ID", + "context": "Constant", + "variant": "", + "details": { + "name": "LANDSCAPE_CANVAS_EDITOR_ID" + }, + "methods": [ + { + "key": "GetLANDSCAPE_CANVAS_EDITOR_ID", + "details": { + "name": "GetLANDSCAPE_CANVAS_EDITOR_ID" + }, + "results": [ + { + "typeid": "{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}", + "details": { + "name": "Crc 32" + } + } + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/LevelSettingsComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/LevelSettingsComponentTypeId.names new file mode 100644 index 0000000000..d6617651b0 --- /dev/null +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/LevelSettingsComponentTypeId.names @@ -0,0 +1,28 @@ +{ + "entries": [ + { + "key": "LevelSettingsComponentTypeId", + "context": "Constant", + "variant": "", + "details": { + "name": "Level Settings Component Type Id" + }, + "methods": [ + { + "key": "GetLevelSettingsComponentTypeId", + "details": { + "name": "Get Level Settings Component Type Id" + }, + "results": [ + { + "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}", + "details": { + "name": "AZ:: Uuid" + } + } + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/LevelsGradientComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/LevelsGradientComponentTypeId.names index 294b87f61e..1269dc913d 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/LevelsGradientComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/LevelsGradientComponentTypeId.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "LevelsGradientComponentTypeId::Getter", - "category": "Constants" - } + "name": "Levels Gradient Component Type Id" + }, + "methods": [ + { + "key": "GetLevelsGradientComponentTypeId", + "details": { + "name": "Get Levels Gradient Component Type Id" + }, + "results": [ + { + "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}", + "details": { + "name": "AZ:: Uuid" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/LightAttenuationRadiusMode_Automatic.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/LightAttenuationRadiusMode_Automatic.names index 2bbf9c2d54..6f1dc4d864 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/LightAttenuationRadiusMode_Automatic.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/LightAttenuationRadiusMode_Automatic.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "LightAttenuationRadiusMode_Automatic::Getter", - "category": "Constants" - } + "name": "Light Attenuation Radius Mode_ Automatic" + }, + "methods": [ + { + "key": "GetLightAttenuationRadiusMode_Automatic", + "details": { + "name": "Get Light Attenuation Radius Mode_ Automatic" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/LightAttenuationRadiusMode_Explicit.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/LightAttenuationRadiusMode_Explicit.names index 7f24ff6286..765780244c 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/LightAttenuationRadiusMode_Explicit.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/LightAttenuationRadiusMode_Explicit.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "LightAttenuationRadiusMode_Explicit::Getter", - "category": "Constants" - } + "name": "Light Attenuation Radius Mode_ Explicit" + }, + "methods": [ + { + "key": "GetLightAttenuationRadiusMode_Explicit", + "details": { + "name": "Get Light Attenuation Radius Mode_ Explicit" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/LookModificationComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/LookModificationComponentTypeId.names index cd9bf7661f..4baa41a46c 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/LookModificationComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/LookModificationComponentTypeId.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "LookModificationComponentTypeId::Getter", - "category": "Constants" - } + "name": "Look Modification Component Type Id" + }, + "methods": [ + { + "key": "GetLookModificationComponentTypeId", + "details": { + "name": "Get Look Modification Component Type Id" + }, + "results": [ + { + "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}", + "details": { + "name": "AZ:: Uuid" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/MaterialComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/MaterialComponentTypeId.names index 0f13cdb0d6..74884d3f5b 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/MaterialComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/MaterialComponentTypeId.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "MaterialComponentTypeId::Getter", - "category": "Constants" - } + "name": "Material Component Type Id" + }, + "methods": [ + { + "key": "GetMaterialComponentTypeId", + "details": { + "name": "Get Material Component Type Id" + }, + "results": [ + { + "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}", + "details": { + "name": "AZ:: Uuid" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/MaterialPropertyGroupVisibility_Enabled.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/MaterialPropertyGroupVisibility_Enabled.names index 22ced2479c..dbb82178a6 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/MaterialPropertyGroupVisibility_Enabled.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/MaterialPropertyGroupVisibility_Enabled.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "MaterialPropertyGroupVisibility_Enabled::Getter", - "category": "Constants" - } + "name": "Material Property Group Visibility_ Enabled" + }, + "methods": [ + { + "key": "GetMaterialPropertyGroupVisibility_Enabled", + "details": { + "name": "Get Material Property Group Visibility_ Enabled" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/MaterialPropertyGroupVisibility_Hidden.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/MaterialPropertyGroupVisibility_Hidden.names index 0b332ba6e4..9d3e1c8fe1 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/MaterialPropertyGroupVisibility_Hidden.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/MaterialPropertyGroupVisibility_Hidden.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "MaterialPropertyGroupVisibility_Hidden::Getter", - "category": "Constants" - } + "name": "Material Property Group Visibility_ Hidden" + }, + "methods": [ + { + "key": "GetMaterialPropertyGroupVisibility_Hidden", + "details": { + "name": "Get Material Property Group Visibility_ Hidden" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/MaterialPropertyVisibility_Disabled.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/MaterialPropertyVisibility_Disabled.names index 7b22c9120c..57c9d7f7f8 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/MaterialPropertyVisibility_Disabled.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/MaterialPropertyVisibility_Disabled.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "MaterialPropertyVisibility_Disabled::Getter", - "category": "Constants" - } + "name": "Material Property Visibility_ Disabled" + }, + "methods": [ + { + "key": "GetMaterialPropertyVisibility_Disabled", + "details": { + "name": "Get Material Property Visibility_ Disabled" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/MaterialPropertyVisibility_Enabled.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/MaterialPropertyVisibility_Enabled.names index 7da9316556..236d9f46c0 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/MaterialPropertyVisibility_Enabled.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/MaterialPropertyVisibility_Enabled.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "MaterialPropertyVisibility_Enabled::Getter", - "category": "Constants" - } + "name": "Material Property Visibility_ Enabled" + }, + "methods": [ + { + "key": "GetMaterialPropertyVisibility_Enabled", + "details": { + "name": "Get Material Property Visibility_ Enabled" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/MaterialPropertyVisibility_Hidden.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/MaterialPropertyVisibility_Hidden.names index 0d79119c32..ef82b44a20 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/MaterialPropertyVisibility_Hidden.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/MaterialPropertyVisibility_Hidden.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "MaterialPropertyVisibility_Hidden::Getter", - "category": "Constants" - } + "name": "Material Property Visibility_ Hidden" + }, + "methods": [ + { + "key": "GetMaterialPropertyVisibility_Hidden", + "details": { + "name": "Get Material Property Visibility_ Hidden" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/MeshBlockerComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/MeshBlockerComponentTypeId.names new file mode 100644 index 0000000000..d9e1c8278c --- /dev/null +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/MeshBlockerComponentTypeId.names @@ -0,0 +1,28 @@ +{ + "entries": [ + { + "key": "MeshBlockerComponentTypeId", + "context": "Constant", + "variant": "", + "details": { + "name": "Mesh Blocker Component Type Id" + }, + "methods": [ + { + "key": "GetMeshBlockerComponentTypeId", + "details": { + "name": "Get Mesh Blocker Component Type Id" + }, + "results": [ + { + "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}", + "details": { + "name": "AZ:: Uuid" + } + } + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/MeshComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/MeshComponentTypeId.names index ba1709fcf2..e16d0ddb6d 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/MeshComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/MeshComponentTypeId.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "MeshComponentTypeId::Getter", - "category": "Constants" - } + "name": "Mesh Component Type Id" + }, + "methods": [ + { + "key": "GetMeshComponentTypeId", + "details": { + "name": "Get Mesh Component Type Id" + }, + "results": [ + { + "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}", + "details": { + "name": "AZ:: Uuid" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/MixedGradientComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/MixedGradientComponentTypeId.names index f0364c7c45..3b6f317f3a 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/MixedGradientComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/MixedGradientComponentTypeId.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "MixedGradientComponentTypeId::Getter", - "category": "Constants" - } + "name": "Mixed Gradient Component Type Id" + }, + "methods": [ + { + "key": "GetMixedGradientComponentTypeId", + "details": { + "name": "Get Mixed Gradient Component Type Id" + }, + "results": [ + { + "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}", + "details": { + "name": "AZ:: Uuid" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/MultiPositionBehaviorType_Blended.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/MultiPositionBehaviorType_Blended.names index 7e95390e2e..dd9ec1d543 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/MultiPositionBehaviorType_Blended.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/MultiPositionBehaviorType_Blended.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "MultiPositionBehaviorType_Blended::Getter", - "category": "Constants" - } + "name": "Multi Position Behavior Type_ Blended" + }, + "methods": [ + { + "key": "GetMultiPositionBehaviorType_Blended", + "details": { + "name": "Get Multi Position Behavior Type_ Blended" + }, + "results": [ + { + "typeid": "{43DA906B-7DEF-4CA8-9790-854106D3F983}", + "details": { + "name": "unsigned int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/MultiPositionBehaviorType_Separate.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/MultiPositionBehaviorType_Separate.names index 476c8b91ef..bb3547d228 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/MultiPositionBehaviorType_Separate.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/MultiPositionBehaviorType_Separate.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "MultiPositionBehaviorType_Separate::Getter", - "category": "Constants" - } + "name": "Multi Position Behavior Type_ Separate" + }, + "methods": [ + { + "key": "GetMultiPositionBehaviorType_Separate", + "details": { + "name": "Get Multi Position Behavior Type_ Separate" + }, + "results": [ + { + "typeid": "{43DA906B-7DEF-4CA8-9790-854106D3F983}", + "details": { + "name": "unsigned int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/OcclusionCullingPlaneComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/OcclusionCullingPlaneComponentTypeId.names index 471b5d63d3..334bfb5e3b 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/OcclusionCullingPlaneComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/OcclusionCullingPlaneComponentTypeId.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "OcclusionCullingPlaneComponentTypeId::Getter", - "category": "Constants" - } + "name": "Occlusion Culling Plane Component Type Id" + }, + "methods": [ + { + "key": "GetOcclusionCullingPlaneComponentTypeId", + "details": { + "name": "Get Occlusion Culling Plane Component Type Id" + }, + "results": [ + { + "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}", + "details": { + "name": "AZ:: Uuid" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PerlinGradientComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PerlinGradientComponentTypeId.names index 0779352f77..7de51940f3 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PerlinGradientComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PerlinGradientComponentTypeId.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "PerlinGradientComponentTypeId::Getter", - "category": "Constants" - } + "name": "Perlin Gradient Component Type Id" + }, + "methods": [ + { + "key": "GetPerlinGradientComponentTypeId", + "details": { + "name": "Get Perlin Gradient Component Type Id" + }, + "results": [ + { + "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}", + "details": { + "name": "AZ:: Uuid" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PhotometricUnit_Candela.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PhotometricUnit_Candela.names index 0923efc251..d3ff806f34 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PhotometricUnit_Candela.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PhotometricUnit_Candela.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "PhotometricUnit_Candela::Getter", - "category": "Constants" - } + "name": "Photometric Unit_ Candela" + }, + "methods": [ + { + "key": "GetPhotometricUnit_Candela", + "details": { + "name": "Get Photometric Unit_ Candela" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PhotometricUnit_Ev100_Illuminance.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PhotometricUnit_Ev100_Illuminance.names index 841af8eb4d..b647a1d0a7 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PhotometricUnit_Ev100_Illuminance.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PhotometricUnit_Ev100_Illuminance.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "PhotometricUnit_Ev100_Illuminance::Getter", - "category": "Constants" - } + "name": "Photometric Unit_ Ev 100_ Illuminance" + }, + "methods": [ + { + "key": "GetPhotometricUnit_Ev100_Illuminance", + "details": { + "name": "Get Photometric Unit_ Ev 100_ Illuminance" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PhotometricUnit_Ev100_Luminance.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PhotometricUnit_Ev100_Luminance.names index b6df92e7d2..78aa896046 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PhotometricUnit_Ev100_Luminance.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PhotometricUnit_Ev100_Luminance.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "PhotometricUnit_Ev100_Luminance::Getter", - "category": "Constants" - } + "name": "Photometric Unit_ Ev 100_ Luminance" + }, + "methods": [ + { + "key": "GetPhotometricUnit_Ev100_Luminance", + "details": { + "name": "Get Photometric Unit_ Ev 100_ Luminance" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PhotometricUnit_Lumen.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PhotometricUnit_Lumen.names index 2d06fd13a3..8926e6b454 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PhotometricUnit_Lumen.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PhotometricUnit_Lumen.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "PhotometricUnit_Lumen::Getter", - "category": "Constants" - } + "name": "Photometric Unit_ Lumen" + }, + "methods": [ + { + "key": "GetPhotometricUnit_Lumen", + "details": { + "name": "Get Photometric Unit_ Lumen" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PhotometricUnit_Lux.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PhotometricUnit_Lux.names index b16b5a6b9e..61c674804c 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PhotometricUnit_Lux.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PhotometricUnit_Lux.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "PhotometricUnit_Lux::Getter", - "category": "Constants" - } + "name": "Photometric Unit_ Lux" + }, + "methods": [ + { + "key": "GetPhotometricUnit_Lux", + "details": { + "name": "Get Photometric Unit_ Lux" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PhotometricUnit_Nit.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PhotometricUnit_Nit.names index 33af8d043e..7c24b466d6 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PhotometricUnit_Nit.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PhotometricUnit_Nit.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "PhotometricUnit_Nit::Getter", - "category": "Constants" - } + "name": "Photometric Unit_ Nit" + }, + "methods": [ + { + "key": "GetPhotometricUnit_Nit", + "details": { + "name": "Get Photometric Unit_ Nit" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PhotometricUnit_Unknown.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PhotometricUnit_Unknown.names index d748e688e2..36cceb8887 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PhotometricUnit_Unknown.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PhotometricUnit_Unknown.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "PhotometricUnit_Unknown::Getter", - "category": "Constants" - } + "name": "Photometric Unit_ Unknown" + }, + "methods": [ + { + "key": "GetPhotometricUnit_Unknown", + "details": { + "name": "Get Photometric Unit_ Unknown" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PhysicalSkyComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PhysicalSkyComponentTypeId.names index 05b71703e9..6c44b769fc 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PhysicalSkyComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PhysicalSkyComponentTypeId.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "PhysicalSkyComponentTypeId::Getter", - "category": "Constants" - } + "name": "Physical Sky Component Type Id" + }, + "methods": [ + { + "key": "GetPhysicalSkyComponentTypeId", + "details": { + "name": "Get Physical Sky Component Type Id" + }, + "results": [ + { + "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}", + "details": { + "name": "AZ:: Uuid" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PositionModifierComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PositionModifierComponentTypeId.names new file mode 100644 index 0000000000..83d0b371b7 --- /dev/null +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PositionModifierComponentTypeId.names @@ -0,0 +1,28 @@ +{ + "entries": [ + { + "key": "PositionModifierComponentTypeId", + "context": "Constant", + "variant": "", + "details": { + "name": "Position Modifier Component Type Id" + }, + "methods": [ + { + "key": "GetPositionModifierComponentTypeId", + "details": { + "name": "Get Position Modifier Component Type Id" + }, + "results": [ + { + "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}", + "details": { + "name": "AZ:: Uuid" + } + } + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PostFxLayerComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PostFxLayerComponentTypeId.names index b45a4432ef..f8460db8ab 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PostFxLayerComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PostFxLayerComponentTypeId.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "PostFxLayerComponentTypeId::Getter", - "category": "Constants" - } + "name": "Post Fx Layer Component Type Id" + }, + "methods": [ + { + "key": "GetPostFxLayerComponentTypeId", + "details": { + "name": "Get Post Fx Layer Component Type Id" + }, + "results": [ + { + "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}", + "details": { + "name": "AZ:: Uuid" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PosterizeGradientComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PosterizeGradientComponentTypeId.names index 1325364e24..25f572bad9 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PosterizeGradientComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PosterizeGradientComponentTypeId.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "PosterizeGradientComponentTypeId::Getter", - "category": "Constants" - } + "name": "Posterize Gradient Component Type Id" + }, + "methods": [ + { + "key": "GetPosterizeGradientComponentTypeId", + "details": { + "name": "Get Posterize Gradient Component Type Id" + }, + "results": [ + { + "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}", + "details": { + "name": "AZ:: Uuid" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ProviderNameEnum_AWSCognitoIDP.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ProviderNameEnum_AWSCognitoIDP.names new file mode 100644 index 0000000000..d9659db972 --- /dev/null +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ProviderNameEnum_AWSCognitoIDP.names @@ -0,0 +1,28 @@ +{ + "entries": [ + { + "key": "ProviderNameEnum_AWSCognitoIDP", + "context": "Constant", + "variant": "", + "details": { + "name": "Provider Name Enum_AWS CognitoIDP" + }, + "methods": [ + { + "key": "GetProviderNameEnum_AWSCognitoIDP", + "details": { + "name": "Get Provider Name Enum_AWS CognitoIDP" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ProviderNameEnum_Google.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ProviderNameEnum_Google.names new file mode 100644 index 0000000000..97b8137c21 --- /dev/null +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ProviderNameEnum_Google.names @@ -0,0 +1,28 @@ +{ + "entries": [ + { + "key": "ProviderNameEnum_Google", + "context": "Constant", + "variant": "", + "details": { + "name": "Provider Name Enum_ Google" + }, + "methods": [ + { + "key": "GetProviderNameEnum_Google", + "details": { + "name": "Get Provider Name Enum_ Google" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ProviderNameEnum_LoginWithAmazon.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ProviderNameEnum_LoginWithAmazon.names new file mode 100644 index 0000000000..64d5165e1b --- /dev/null +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ProviderNameEnum_LoginWithAmazon.names @@ -0,0 +1,28 @@ +{ + "entries": [ + { + "key": "ProviderNameEnum_LoginWithAmazon", + "context": "Constant", + "variant": "", + "details": { + "name": "Provider Name Enum_ Login With Amazon" + }, + "methods": [ + { + "key": "GetProviderNameEnum_LoginWithAmazon", + "details": { + "name": "Get Provider Name Enum_ Login With Amazon" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ProviderNameEnum_None.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ProviderNameEnum_None.names new file mode 100644 index 0000000000..aeb13781fa --- /dev/null +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ProviderNameEnum_None.names @@ -0,0 +1,28 @@ +{ + "entries": [ + { + "key": "ProviderNameEnum_None", + "context": "Constant", + "variant": "", + "details": { + "name": "Provider Name Enum_ None" + }, + "methods": [ + { + "key": "GetProviderNameEnum_None", + "details": { + "name": "Get Provider Name Enum_ None" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/QuadShapeComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/QuadShapeComponentTypeId.names index 5d98a25b38..2c2e19cd82 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/QuadShapeComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/QuadShapeComponentTypeId.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "QuadShapeComponentTypeId::Getter", - "category": "Constants" - } + "name": "Quad Shape Component Type Id" + }, + "methods": [ + { + "key": "GetQuadShapeComponentTypeId", + "details": { + "name": "Get Quad Shape Component Type Id" + }, + "results": [ + { + "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}", + "details": { + "name": "AZ:: Uuid" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/RadiusWeightModifierComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/RadiusWeightModifierComponentTypeId.names index 43cfe542c0..c06cbd0552 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/RadiusWeightModifierComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/RadiusWeightModifierComponentTypeId.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "RadiusWeightModifierComponentTypeId::Getter", - "category": "Constants" - } + "name": "Radius Weight Modifier Component Type Id" + }, + "methods": [ + { + "key": "GetRadiusWeightModifierComponentTypeId", + "details": { + "name": "Get Radius Weight Modifier Component Type Id" + }, + "results": [ + { + "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}", + "details": { + "name": "AZ:: Uuid" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/RandomGradientComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/RandomGradientComponentTypeId.names index 58045dbdec..10172a3f5a 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/RandomGradientComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/RandomGradientComponentTypeId.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "RandomGradientComponentTypeId::Getter", - "category": "Constants" - } + "name": "Random Gradient Component Type Id" + }, + "methods": [ + { + "key": "GetRandomGradientComponentTypeId", + "details": { + "name": "Get Random Gradient Component Type Id" + }, + "results": [ + { + "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}", + "details": { + "name": "AZ:: Uuid" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ReferenceGradientComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ReferenceGradientComponentTypeId.names index 89e3a955d1..cc42f83864 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ReferenceGradientComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ReferenceGradientComponentTypeId.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "ReferenceGradientComponentTypeId::Getter", - "category": "Constants" - } + "name": "Reference Gradient Component Type Id" + }, + "methods": [ + { + "key": "GetReferenceGradientComponentTypeId", + "details": { + "name": "Get Reference Gradient Component Type Id" + }, + "results": [ + { + "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}", + "details": { + "name": "AZ:: Uuid" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ReferenceShapeComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ReferenceShapeComponentTypeId.names new file mode 100644 index 0000000000..1f21c00e47 --- /dev/null +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ReferenceShapeComponentTypeId.names @@ -0,0 +1,28 @@ +{ + "entries": [ + { + "key": "ReferenceShapeComponentTypeId", + "context": "Constant", + "variant": "", + "details": { + "name": "Reference Shape Component Type Id" + }, + "methods": [ + { + "key": "GetReferenceShapeComponentTypeId", + "details": { + "name": "Get Reference Shape Component Type Id" + }, + "results": [ + { + "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}", + "details": { + "name": "AZ:: Uuid" + } + } + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ReflectionProbeComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ReflectionProbeComponentTypeId.names index 9d8cf61239..589ba7dc8f 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ReflectionProbeComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ReflectionProbeComponentTypeId.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "ReflectionProbeComponentTypeId::Getter", - "category": "Constants" - } + "name": "Reflection Probe Component Type Id" + }, + "methods": [ + { + "key": "GetReflectionProbeComponentTypeId", + "details": { + "name": "Get Reflection Probe Component Type Id" + }, + "results": [ + { + "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}", + "details": { + "name": "AZ:: Uuid" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/RotationModifierComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/RotationModifierComponentTypeId.names new file mode 100644 index 0000000000..e5859c211d --- /dev/null +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/RotationModifierComponentTypeId.names @@ -0,0 +1,28 @@ +{ + "entries": [ + { + "key": "RotationModifierComponentTypeId", + "context": "Constant", + "variant": "", + "details": { + "name": "Rotation Modifier Component Type Id" + }, + "methods": [ + { + "key": "GetRotationModifierComponentTypeId", + "details": { + "name": "Get Rotation Modifier Component Type Id" + }, + "results": [ + { + "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}", + "details": { + "name": "AZ:: Uuid" + } + } + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SPHERE.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SPHERE.names new file mode 100644 index 0000000000..e1b58440fa --- /dev/null +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SPHERE.names @@ -0,0 +1,28 @@ +{ + "entries": [ + { + "key": "SPHERE", + "context": "Constant", + "variant": "", + "details": { + "name": "SPHERE" + }, + "methods": [ + { + "key": "GetSPHERE", + "details": { + "name": "GetSPHERE" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ScaleModifierComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ScaleModifierComponentTypeId.names new file mode 100644 index 0000000000..ae4984eb2a --- /dev/null +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ScaleModifierComponentTypeId.names @@ -0,0 +1,28 @@ +{ + "entries": [ + { + "key": "ScaleModifierComponentTypeId", + "context": "Constant", + "variant": "", + "details": { + "name": "Scale Modifier Component Type Id" + }, + "methods": [ + { + "key": "GetScaleModifierComponentTypeId", + "details": { + "name": "Get Scale Modifier Component Type Id" + }, + "results": [ + { + "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}", + "details": { + "name": "AZ:: Uuid" + } + } + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShadowFilterMethod_ESM.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShadowFilterMethod_ESM.names index 3542ed76bb..9aca5ca2a5 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShadowFilterMethod_ESM.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShadowFilterMethod_ESM.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "ShadowFilterMethod_ESM::Getter", - "category": "Constants" - } + "name": "Shadow Filter Method_ESM" + }, + "methods": [ + { + "key": "GetShadowFilterMethod_ESM", + "details": { + "name": "Get Shadow Filter Method_ESM" + }, + "results": [ + { + "typeid": "{43DA906B-7DEF-4CA8-9790-854106D3F983}", + "details": { + "name": "unsigned int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShadowFilterMethod_ESM_PCF.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShadowFilterMethod_ESM_PCF.names index 57736a0912..766937f8e8 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShadowFilterMethod_ESM_PCF.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShadowFilterMethod_ESM_PCF.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "ShadowFilterMethod_ESM_PCF::Getter", - "category": "Constants" - } + "name": "Shadow Filter Method_ESM_PCF" + }, + "methods": [ + { + "key": "GetShadowFilterMethod_ESM_PCF", + "details": { + "name": "Get Shadow Filter Method_ESM_PCF" + }, + "results": [ + { + "typeid": "{43DA906B-7DEF-4CA8-9790-854106D3F983}", + "details": { + "name": "unsigned int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShadowFilterMethod_None.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShadowFilterMethod_None.names index 90a1da18fe..721746a957 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShadowFilterMethod_None.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShadowFilterMethod_None.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "ShadowFilterMethod_None::Getter", - "category": "Constants" - } + "name": "Shadow Filter Method_ None" + }, + "methods": [ + { + "key": "GetShadowFilterMethod_None", + "details": { + "name": "Get Shadow Filter Method_ None" + }, + "results": [ + { + "typeid": "{43DA906B-7DEF-4CA8-9790-854106D3F983}", + "details": { + "name": "unsigned int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShadowFilterMethod_PCF.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShadowFilterMethod_PCF.names index 0600bfc8d2..83c985d96e 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShadowFilterMethod_PCF.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShadowFilterMethod_PCF.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "ShadowFilterMethod_PCF::Getter", - "category": "Constants" - } + "name": "Shadow Filter Method_PCF" + }, + "methods": [ + { + "key": "GetShadowFilterMethod_PCF", + "details": { + "name": "Get Shadow Filter Method_PCF" + }, + "results": [ + { + "typeid": "{43DA906B-7DEF-4CA8-9790-854106D3F983}", + "details": { + "name": "unsigned int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShadowmapSize_1024.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShadowmapSize_1024.names index 0814f06cce..c1d463fac8 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShadowmapSize_1024.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShadowmapSize_1024.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "ShadowmapSize_1024::Getter", - "category": "Constants" - } + "name": "Shadowmap Size_ 1024" + }, + "methods": [ + { + "key": "GetShadowmapSize_1024", + "details": { + "name": "Get Shadowmap Size_ 1024" + }, + "results": [ + { + "typeid": "{43DA906B-7DEF-4CA8-9790-854106D3F983}", + "details": { + "name": "unsigned int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShadowmapSize_2045.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShadowmapSize_2045.names index 4ed139c23a..cc09f640e8 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShadowmapSize_2045.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShadowmapSize_2045.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "ShadowmapSize_2045::Getter", - "category": "Constants" - } + "name": "Shadowmap Size_ 2045" + }, + "methods": [ + { + "key": "GetShadowmapSize_2045", + "details": { + "name": "Get Shadowmap Size_ 2045" + }, + "results": [ + { + "typeid": "{43DA906B-7DEF-4CA8-9790-854106D3F983}", + "details": { + "name": "unsigned int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShadowmapSize_256.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShadowmapSize_256.names index 174dcbd1e7..3adaf56aa3 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShadowmapSize_256.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShadowmapSize_256.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "ShadowmapSize_256::Getter", - "category": "Constants" - } + "name": "Shadowmap Size_ 256" + }, + "methods": [ + { + "key": "GetShadowmapSize_256", + "details": { + "name": "Get Shadowmap Size_ 256" + }, + "results": [ + { + "typeid": "{43DA906B-7DEF-4CA8-9790-854106D3F983}", + "details": { + "name": "unsigned int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShadowmapSize_512.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShadowmapSize_512.names index 476a558ad6..7f7897321f 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShadowmapSize_512.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShadowmapSize_512.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "ShadowmapSize_512::Getter", - "category": "Constants" - } + "name": "Shadowmap Size_ 512" + }, + "methods": [ + { + "key": "GetShadowmapSize_512", + "details": { + "name": "Get Shadowmap Size_ 512" + }, + "results": [ + { + "typeid": "{43DA906B-7DEF-4CA8-9790-854106D3F983}", + "details": { + "name": "unsigned int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShadowmapSize_None.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShadowmapSize_None.names index a1f9c51c8f..b4a2ecaaa6 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShadowmapSize_None.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShadowmapSize_None.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "ShadowmapSize_None::Getter", - "category": "Constants" - } + "name": "Shadowmap Size_ None" + }, + "methods": [ + { + "key": "GetShadowmapSize_None", + "details": { + "name": "Get Shadowmap Size_ None" + }, + "results": [ + { + "typeid": "{43DA906B-7DEF-4CA8-9790-854106D3F983}", + "details": { + "name": "unsigned int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShapeAreaFalloffGradientComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShapeAreaFalloffGradientComponentTypeId.names index a1e9881e41..de238de3b5 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShapeAreaFalloffGradientComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShapeAreaFalloffGradientComponentTypeId.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "ShapeAreaFalloffGradientComponentTypeId::Getter", - "category": "Constants" - } + "name": "Shape Area Falloff Gradient Component Type Id" + }, + "methods": [ + { + "key": "GetShapeAreaFalloffGradientComponentTypeId", + "details": { + "name": "Get Shape Area Falloff Gradient Component Type Id" + }, + "results": [ + { + "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}", + "details": { + "name": "AZ:: Uuid" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShapeChangeReasons_ShapeChanged.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShapeChangeReasons_ShapeChanged.names index 700decf418..dbd88b811a 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShapeChangeReasons_ShapeChanged.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShapeChangeReasons_ShapeChanged.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "ShapeChangeReasons_ShapeChanged::Getter", - "category": "Constants" - } + "name": "Shape Change Reasons_ Shape Changed" + }, + "methods": [ + { + "key": "GetShapeChangeReasons_ShapeChanged", + "details": { + "name": "Get Shape Change Reasons_ Shape Changed" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShapeChangeReasons_TransformChanged.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShapeChangeReasons_TransformChanged.names index 441ee1a3bc..9ac0270776 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShapeChangeReasons_TransformChanged.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShapeChangeReasons_TransformChanged.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "ShapeChangeReasons_TransformChanged::Getter", - "category": "Constants" - } + "name": "Shape Change Reasons_ Transform Changed" + }, + "methods": [ + { + "key": "GetShapeChangeReasons_TransformChanged", + "details": { + "name": "Get Shape Change Reasons_ Transform Changed" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShapeIntersectionFilterComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShapeIntersectionFilterComponentTypeId.names new file mode 100644 index 0000000000..9781d5467c --- /dev/null +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShapeIntersectionFilterComponentTypeId.names @@ -0,0 +1,28 @@ +{ + "entries": [ + { + "key": "ShapeIntersectionFilterComponentTypeId", + "context": "Constant", + "variant": "", + "details": { + "name": "Shape Intersection Filter Component Type Id" + }, + "methods": [ + { + "key": "GetShapeIntersectionFilterComponentTypeId", + "details": { + "name": "Get Shape Intersection Filter Component Type Id" + }, + "results": [ + { + "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}", + "details": { + "name": "AZ:: Uuid" + } + } + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShapeType_Heightfield.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShapeType_Heightfield.names new file mode 100644 index 0000000000..8a8c1dd7a2 --- /dev/null +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShapeType_Heightfield.names @@ -0,0 +1,28 @@ +{ + "entries": [ + { + "key": "ShapeType_Heightfield", + "context": "Constant", + "variant": "", + "details": { + "name": "Shape Type_ Heightfield" + }, + "methods": [ + { + "key": "GetShapeType_Heightfield", + "details": { + "name": "Get Shape Type_ Heightfield" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShapeWeightModifierComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShapeWeightModifierComponentTypeId.names index 947f0d1a0d..102b419c18 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShapeWeightModifierComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShapeWeightModifierComponentTypeId.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "ShapeWeightModifierComponentTypeId::Getter", - "category": "Constants" - } + "name": "Shape Weight Modifier Component Type Id" + }, + "methods": [ + { + "key": "GetShapeWeightModifierComponentTypeId", + "details": { + "name": "Get Shape Weight Modifier Component Type Id" + }, + "results": [ + { + "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}", + "details": { + "name": "AZ:: Uuid" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SlopeAlignmentModifierComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SlopeAlignmentModifierComponentTypeId.names index 74e704cb34..a0112472e8 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SlopeAlignmentModifierComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SlopeAlignmentModifierComponentTypeId.names @@ -5,19 +5,19 @@ "context": "Constant", "variant": "", "details": { - "name": "" + "name": "Slope Alignment Modifier Component Type Id" }, "methods": [ { - "key": "SlopeAlignmentModifierComponentTypeId", + "key": "GetSlopeAlignmentModifierComponentTypeId", "details": { - "name": "SlopeAlignmentModifierComponentTypeId::Getter" + "name": "Get Slope Alignment Modifier Component Type Id" }, "results": [ { "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}", "details": { - "name": "AZ::Uuid" + "name": "AZ:: Uuid" } } ] diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SmoothStepGradientComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SmoothStepGradientComponentTypeId.names index 0e2ee25219..d4cba89404 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SmoothStepGradientComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SmoothStepGradientComponentTypeId.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "SmoothStepGradientComponentTypeId::Getter", - "category": "Constants" - } + "name": "Smooth Step Gradient Component Type Id" + }, + "methods": [ + { + "key": "GetSmoothStepGradientComponentTypeId", + "details": { + "name": "Get Smooth Step Gradient Component Type Id" + }, + "results": [ + { + "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}", + "details": { + "name": "AZ:: Uuid" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SpawnerComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SpawnerComponentTypeId.names index 72a66d38e8..7df8fde2ba 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SpawnerComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SpawnerComponentTypeId.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "SpawnerComponentTypeId::Getter", - "category": "Constants" - } + "name": "Spawner Component Type Id" + }, + "methods": [ + { + "key": "GetSpawnerComponentTypeId", + "details": { + "name": "Get Spawner Component Type Id" + }, + "results": [ + { + "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}", + "details": { + "name": "AZ:: Uuid" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SphereShapeComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SphereShapeComponentTypeId.names index cedd42ef6a..f1e496ff29 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SphereShapeComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SphereShapeComponentTypeId.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "SphereShapeComponentTypeId::Getter", - "category": "Constants" - } + "name": "Sphere Shape Component Type Id" + }, + "methods": [ + { + "key": "GetSphereShapeComponentTypeId", + "details": { + "name": "Get Sphere Shape Component Type Id" + }, + "results": [ + { + "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}", + "details": { + "name": "AZ:: Uuid" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SsaoComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SsaoComponentTypeId.names index 525dbdcdd0..0a7b4b135b 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SsaoComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SsaoComponentTypeId.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "SsaoComponentTypeId::Getter", - "category": "Constants" - } + "name": "Ssao Component Type Id" + }, + "methods": [ + { + "key": "GetSsaoComponentTypeId", + "details": { + "name": "Get Ssao Component Type Id" + }, + "results": [ + { + "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}", + "details": { + "name": "AZ:: Uuid" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/StencilOp_Decrement.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/StencilOp_Decrement.names index da6699bfbe..b948a50f04 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/StencilOp_Decrement.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/StencilOp_Decrement.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "StencilOp_Decrement::Getter", - "category": "Constants" - } + "name": "Stencil Op_ Decrement" + }, + "methods": [ + { + "key": "GetStencilOp_Decrement", + "details": { + "name": "Get Stencil Op_ Decrement" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/StencilOp_DecrementSaturate.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/StencilOp_DecrementSaturate.names index 46fce46fc3..9adc67f65a 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/StencilOp_DecrementSaturate.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/StencilOp_DecrementSaturate.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "StencilOp_DecrementSaturate::Getter", - "category": "Constants" - } + "name": "Stencil Op_ Decrement Saturate" + }, + "methods": [ + { + "key": "GetStencilOp_DecrementSaturate", + "details": { + "name": "Get Stencil Op_ Decrement Saturate" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/StencilOp_Increment.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/StencilOp_Increment.names index 9d20ca70fb..c3b6c5993c 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/StencilOp_Increment.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/StencilOp_Increment.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "StencilOp_Increment::Getter", - "category": "Constants" - } + "name": "Stencil Op_ Increment" + }, + "methods": [ + { + "key": "GetStencilOp_Increment", + "details": { + "name": "Get Stencil Op_ Increment" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/StencilOp_IncrementSaturate.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/StencilOp_IncrementSaturate.names index 77bfc0a95e..d354391187 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/StencilOp_IncrementSaturate.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/StencilOp_IncrementSaturate.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "StencilOp_IncrementSaturate::Getter", - "category": "Constants" - } + "name": "Stencil Op_ Increment Saturate" + }, + "methods": [ + { + "key": "GetStencilOp_IncrementSaturate", + "details": { + "name": "Get Stencil Op_ Increment Saturate" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/StencilOp_Invalid.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/StencilOp_Invalid.names index 7f6e5fc38a..0293650ded 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/StencilOp_Invalid.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/StencilOp_Invalid.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "StencilOp_Invalid::Getter", - "category": "Constants" - } + "name": "Stencil Op_ Invalid" + }, + "methods": [ + { + "key": "GetStencilOp_Invalid", + "details": { + "name": "Get Stencil Op_ Invalid" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/StencilOp_Invert.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/StencilOp_Invert.names index 021e089ac1..1be4d20a8f 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/StencilOp_Invert.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/StencilOp_Invert.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "StencilOp_Invert::Getter", - "category": "Constants" - } + "name": "Stencil Op_ Invert" + }, + "methods": [ + { + "key": "GetStencilOp_Invert", + "details": { + "name": "Get Stencil Op_ Invert" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/StencilOp_Keep.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/StencilOp_Keep.names index e4e4fc1956..07070cfa6c 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/StencilOp_Keep.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/StencilOp_Keep.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "StencilOp_Keep::Getter", - "category": "Constants" - } + "name": "Stencil Op_ Keep" + }, + "methods": [ + { + "key": "GetStencilOp_Keep", + "details": { + "name": "Get Stencil Op_ Keep" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/StencilOp_Replace.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/StencilOp_Replace.names index 331397d027..7516df67dc 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/StencilOp_Replace.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/StencilOp_Replace.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "StencilOp_Replace::Getter", - "category": "Constants" - } + "name": "Stencil Op_ Replace" + }, + "methods": [ + { + "key": "GetStencilOp_Replace", + "details": { + "name": "Get Stencil Op_ Replace" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/StencilOp_Zero.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/StencilOp_Zero.names index 9d17600aad..0d042fb3db 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/StencilOp_Zero.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/StencilOp_Zero.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "StencilOp_Zero::Getter", - "category": "Constants" - } + "name": "Stencil Op_ Zero" + }, + "methods": [ + { + "key": "GetStencilOp_Zero", + "details": { + "name": "Get Stencil Op_ Zero" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SurfaceAltitudeFilterComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SurfaceAltitudeFilterComponentTypeId.names new file mode 100644 index 0000000000..e950e88376 --- /dev/null +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SurfaceAltitudeFilterComponentTypeId.names @@ -0,0 +1,28 @@ +{ + "entries": [ + { + "key": "SurfaceAltitudeFilterComponentTypeId", + "context": "Constant", + "variant": "", + "details": { + "name": "Surface Altitude Filter Component Type Id" + }, + "methods": [ + { + "key": "GetSurfaceAltitudeFilterComponentTypeId", + "details": { + "name": "Get Surface Altitude Filter Component Type Id" + }, + "results": [ + { + "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}", + "details": { + "name": "AZ:: Uuid" + } + } + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SurfaceAltitudeGradientComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SurfaceAltitudeGradientComponentTypeId.names index 01d0ca9912..4d76dc8edf 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SurfaceAltitudeGradientComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SurfaceAltitudeGradientComponentTypeId.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "SurfaceAltitudeGradientComponentTypeId::Getter", - "category": "Constants" - } + "name": "Surface Altitude Gradient Component Type Id" + }, + "methods": [ + { + "key": "GetSurfaceAltitudeGradientComponentTypeId", + "details": { + "name": "Get Surface Altitude Gradient Component Type Id" + }, + "results": [ + { + "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}", + "details": { + "name": "AZ:: Uuid" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SurfaceMaskDepthFilterComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SurfaceMaskDepthFilterComponentTypeId.names new file mode 100644 index 0000000000..8558288edc --- /dev/null +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SurfaceMaskDepthFilterComponentTypeId.names @@ -0,0 +1,28 @@ +{ + "entries": [ + { + "key": "SurfaceMaskDepthFilterComponentTypeId", + "context": "Constant", + "variant": "", + "details": { + "name": "Surface Mask Depth Filter Component Type Id" + }, + "methods": [ + { + "key": "GetSurfaceMaskDepthFilterComponentTypeId", + "details": { + "name": "Get Surface Mask Depth Filter Component Type Id" + }, + "results": [ + { + "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}", + "details": { + "name": "AZ:: Uuid" + } + } + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SurfaceMaskFilterComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SurfaceMaskFilterComponentTypeId.names new file mode 100644 index 0000000000..a3fb8cd45e --- /dev/null +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SurfaceMaskFilterComponentTypeId.names @@ -0,0 +1,28 @@ +{ + "entries": [ + { + "key": "SurfaceMaskFilterComponentTypeId", + "context": "Constant", + "variant": "", + "details": { + "name": "Surface Mask Filter Component Type Id" + }, + "methods": [ + { + "key": "GetSurfaceMaskFilterComponentTypeId", + "details": { + "name": "Get Surface Mask Filter Component Type Id" + }, + "results": [ + { + "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}", + "details": { + "name": "AZ:: Uuid" + } + } + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SurfaceMaskGradientComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SurfaceMaskGradientComponentTypeId.names index d98abc6e80..5378ef2178 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SurfaceMaskGradientComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SurfaceMaskGradientComponentTypeId.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "SurfaceMaskGradientComponentTypeId::Getter", - "category": "Constants" - } + "name": "Surface Mask Gradient Component Type Id" + }, + "methods": [ + { + "key": "GetSurfaceMaskGradientComponentTypeId", + "details": { + "name": "Get Surface Mask Gradient Component Type Id" + }, + "results": [ + { + "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}", + "details": { + "name": "AZ:: Uuid" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SurfaceSlopeFilterComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SurfaceSlopeFilterComponentTypeId.names new file mode 100644 index 0000000000..6b08be224e --- /dev/null +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SurfaceSlopeFilterComponentTypeId.names @@ -0,0 +1,28 @@ +{ + "entries": [ + { + "key": "SurfaceSlopeFilterComponentTypeId", + "context": "Constant", + "variant": "", + "details": { + "name": "Surface Slope Filter Component Type Id" + }, + "methods": [ + { + "key": "GetSurfaceSlopeFilterComponentTypeId", + "details": { + "name": "Get Surface Slope Filter Component Type Id" + }, + "results": [ + { + "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}", + "details": { + "name": "AZ:: Uuid" + } + } + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SurfaceSlopeGradientComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SurfaceSlopeGradientComponentTypeId.names index 29955c91f4..22fe915b5f 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SurfaceSlopeGradientComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SurfaceSlopeGradientComponentTypeId.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "SurfaceSlopeGradientComponentTypeId::Getter", - "category": "Constants" - } + "name": "Surface Slope Gradient Component Type Id" + }, + "methods": [ + { + "key": "GetSurfaceSlopeGradientComponentTypeId", + "details": { + "name": "Get Surface Slope Gradient Component Type Id" + }, + "results": [ + { + "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}", + "details": { + "name": "AZ:: Uuid" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigPlatform_Android.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigPlatform_Android.names index b615174731..2b0e83d18c 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigPlatform_Android.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigPlatform_Android.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "SystemConfigPlatform_Android::Getter", - "category": "Constants" - } + "name": "System Config Platform_ Android" + }, + "methods": [ + { + "key": "GetSystemConfigPlatform_Android", + "details": { + "name": "Get System Config Platform_ Android" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigPlatform_InvalidPlatform.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigPlatform_InvalidPlatform.names index ebb0dc01bf..5052de3e87 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigPlatform_InvalidPlatform.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigPlatform_InvalidPlatform.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "SystemConfigPlatform_InvalidPlatform::Getter", - "category": "Constants" - } + "name": "System Config Platform_ Invalid Platform" + }, + "methods": [ + { + "key": "GetSystemConfigPlatform_InvalidPlatform", + "details": { + "name": "Get System Config Platform_ Invalid Platform" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigPlatform_Ios.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigPlatform_Ios.names index 2de01a41e9..4d68ebd9f9 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigPlatform_Ios.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigPlatform_Ios.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "SystemConfigPlatform_Ios::Getter", - "category": "Constants" - } + "name": "System Config Platform_ Ios" + }, + "methods": [ + { + "key": "GetSystemConfigPlatform_Ios", + "details": { + "name": "Get System Config Platform_ Ios" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigPlatform_Mac.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigPlatform_Mac.names index 50dc9a573f..527664909c 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigPlatform_Mac.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigPlatform_Mac.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "SystemConfigPlatform_Mac::Getter", - "category": "Constants" - } + "name": "System Config Platform_ Mac" + }, + "methods": [ + { + "key": "GetSystemConfigPlatform_Mac", + "details": { + "name": "Get System Config Platform_ Mac" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigPlatform_OsxMetal.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigPlatform_OsxMetal.names index 8005565fca..c32a4c0305 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigPlatform_OsxMetal.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigPlatform_OsxMetal.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "SystemConfigPlatform_OsxMetal::Getter", - "category": "Constants" - } + "name": "System Config Platform_ Osx Metal" + }, + "methods": [ + { + "key": "GetSystemConfigPlatform_OsxMetal", + "details": { + "name": "Get System Config Platform_ Osx Metal" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigPlatform_Pc.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigPlatform_Pc.names index a1b962ea90..9715f8274a 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigPlatform_Pc.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigPlatform_Pc.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "SystemConfigPlatform_Pc::Getter", - "category": "Constants" - } + "name": "System Config Platform_ Pc" + }, + "methods": [ + { + "key": "GetSystemConfigPlatform_Pc", + "details": { + "name": "Get System Config Platform_ Pc" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigPlatform_Provo.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigPlatform_Provo.names index 46e8d46b17..cbe6204323 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigPlatform_Provo.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigPlatform_Provo.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "SystemConfigPlatform_Provo::Getter", - "category": "Constants" - } + "name": "System Config Platform_ Provo" + }, + "methods": [ + { + "key": "GetSystemConfigPlatform_Provo", + "details": { + "name": "Get System Config Platform_ Provo" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigSpec_Auto.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigSpec_Auto.names index 51484e63d5..dc73e63b25 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigSpec_Auto.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigSpec_Auto.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "SystemConfigSpec_Auto::Getter", - "category": "Constants" - } + "name": "System Config Spec_ Auto" + }, + "methods": [ + { + "key": "GetSystemConfigSpec_Auto", + "details": { + "name": "Get System Config Spec_ Auto" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigSpec_High.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigSpec_High.names index 80c2de7669..7a2cd3d7d6 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigSpec_High.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigSpec_High.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "SystemConfigSpec_High::Getter", - "category": "Constants" - } + "name": "System Config Spec_ High" + }, + "methods": [ + { + "key": "GetSystemConfigSpec_High", + "details": { + "name": "Get System Config Spec_ High" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigSpec_Low.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigSpec_Low.names index 5a4dee45d5..f452beb446 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigSpec_Low.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigSpec_Low.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "SystemConfigSpec_Low::Getter", - "category": "Constants" - } + "name": "System Config Spec_ Low" + }, + "methods": [ + { + "key": "GetSystemConfigSpec_Low", + "details": { + "name": "Get System Config Spec_ Low" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigSpec_Medium.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigSpec_Medium.names index 52485ed95b..4f5bf2b012 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigSpec_Medium.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigSpec_Medium.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "SystemConfigSpec_Medium::Getter", - "category": "Constants" - } + "name": "System Config Spec_ Medium" + }, + "methods": [ + { + "key": "GetSystemConfigSpec_Medium", + "details": { + "name": "Get System Config Spec_ Medium" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigSpec_VeryHigh.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigSpec_VeryHigh.names index 9d71dadc2d..34fd10f8a2 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigSpec_VeryHigh.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigSpec_VeryHigh.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "SystemConfigSpec_VeryHigh::Getter", - "category": "Constants" - } + "name": "System Config Spec_ Very High" + }, + "methods": [ + { + "key": "GetSystemConfigSpec_VeryHigh", + "details": { + "name": "Get System Config Spec_ Very High" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemEntityId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemEntityId.names index 3a6a3c2c04..b1d5c9d2be 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemEntityId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemEntityId.names @@ -5,9 +5,25 @@ "context": "Constant", "variant": "", "details": { - "name": "SystemEntityId::Getter", - "category": "Constants" - } + "name": "System Entity Id" + }, + "methods": [ + { + "key": "GetSystemEntityId", + "details": { + "name": "Get System Entity Id" + }, + "results": [ + { + "typeid": "{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}", + "details": { + "name": "Entity Id", + "tooltip": "Entity Unique Id" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TETRAHEDRON.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TETRAHEDRON.names new file mode 100644 index 0000000000..d96e472832 --- /dev/null +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TETRAHEDRON.names @@ -0,0 +1,28 @@ +{ + "entries": [ + { + "key": "TETRAHEDRON", + "context": "Constant", + "variant": "", + "details": { + "name": "TETRAHEDRON" + }, + "methods": [ + { + "key": "GetTETRAHEDRON", + "details": { + "name": "GetTETRAHEDRON" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ThresholdGradientComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ThresholdGradientComponentTypeId.names index c40a8f1281..8488cbce53 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ThresholdGradientComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ThresholdGradientComponentTypeId.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "ThresholdGradientComponentTypeId::Getter", - "category": "Constants" - } + "name": "Threshold Gradient Component Type Id" + }, + "methods": [ + { + "key": "GetThresholdGradientComponentTypeId", + "details": { + "name": "Get Threshold Gradient Component Type Id" + }, + "results": [ + { + "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}", + "details": { + "name": "AZ:: Uuid" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TransformComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TransformComponentTypeId.names index a140864cdc..a69bfb6041 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TransformComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TransformComponentTypeId.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "TransformComponentTypeId::Getter", - "category": "Constants" - } + "name": "Transform Component Type Id" + }, + "methods": [ + { + "key": "GetTransformComponentTypeId", + "details": { + "name": "Get Transform Component Type Id" + }, + "results": [ + { + "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}", + "details": { + "name": "AZ:: Uuid" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TransformMode_Rotation.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TransformMode_Rotation.names index a573b13ba1..f82b0c9a77 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TransformMode_Rotation.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TransformMode_Rotation.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "TransformMode_Rotation::Getter", - "category": "Constants" - } + "name": "Transform Mode_ Rotation" + }, + "methods": [ + { + "key": "GetTransformMode_Rotation", + "details": { + "name": "Get Transform Mode_ Rotation" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TransformMode_Scale.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TransformMode_Scale.names index d04c443780..844fd9702b 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TransformMode_Scale.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TransformMode_Scale.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "TransformMode_Scale::Getter", - "category": "Constants" - } + "name": "Transform Mode_ Scale" + }, + "methods": [ + { + "key": "GetTransformMode_Scale", + "details": { + "name": "Get Transform Mode_ Scale" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TransformMode_Translation.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TransformMode_Translation.names index 05fb942bd8..e1997464bb 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TransformMode_Translation.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TransformMode_Translation.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "TransformMode_Translation::Getter", - "category": "Constants" - } + "name": "Transform Mode_ Translation" + }, + "methods": [ + { + "key": "GetTransformMode_Translation", + "details": { + "name": "Get Transform Mode_ Translation" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TransformPivot_Center.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TransformPivot_Center.names index a2aef08ec4..667d526cf6 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TransformPivot_Center.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TransformPivot_Center.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "TransformPivot_Center::Getter", - "category": "Constants" - } + "name": "Transform Pivot_ Center" + }, + "methods": [ + { + "key": "GetTransformPivot_Center", + "details": { + "name": "Get Transform Pivot_ Center" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TransformPivot_Object.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TransformPivot_Object.names index 010e4a0eb2..0c2a139f8d 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TransformPivot_Object.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TransformPivot_Object.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "TransformPivot_Object::Getter", - "category": "Constants" - } + "name": "Transform Pivot_ Object" + }, + "methods": [ + { + "key": "GetTransformPivot_Object", + "details": { + "name": "Get Transform Pivot_ Object" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TransformRefreshType_All.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TransformRefreshType_All.names index 4161f154b3..118145148d 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TransformRefreshType_All.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TransformRefreshType_All.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "TransformRefreshType_All::Getter", - "category": "Constants" - } + "name": "Transform Refresh Type_ All" + }, + "methods": [ + { + "key": "GetTransformRefreshType_All", + "details": { + "name": "Get Transform Refresh Type_ All" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TransformRefreshType_Orientation.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TransformRefreshType_Orientation.names index 920fc60dfd..00351a1cde 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TransformRefreshType_Orientation.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TransformRefreshType_Orientation.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "TransformRefreshType_Orientation::Getter", - "category": "Constants" - } + "name": "Transform Refresh Type_ Orientation" + }, + "methods": [ + { + "key": "GetTransformRefreshType_Orientation", + "details": { + "name": "Get Transform Refresh Type_ Orientation" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TransformRefreshType_Translation.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TransformRefreshType_Translation.names index 80b256f896..f7dd8f9562 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TransformRefreshType_Translation.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TransformRefreshType_Translation.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "TransformRefreshType_Translation::Getter", - "category": "Constants" - } + "name": "Transform Refresh Type_ Translation" + }, + "methods": [ + { + "key": "GetTransformRefreshType_Translation", + "details": { + "name": "Get Transform Refresh Type_ Translation" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TubeShapeComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TubeShapeComponentTypeId.names index dad5748f53..3469a9bfcb 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TubeShapeComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TubeShapeComponentTypeId.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "TubeShapeComponentTypeId::Getter", - "category": "Constants" - } + "name": "Tube Shape Component Type Id" + }, + "methods": [ + { + "key": "GetTubeShapeComponentTypeId", + "details": { + "name": "Get Tube Shape Component Type Id" + }, + "results": [ + { + "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}", + "details": { + "name": "AZ:: Uuid" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/UiLayoutCellUnspecifiedSize.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/UiLayoutCellUnspecifiedSize.names index d9b6976e89..187f9f64e0 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/UiLayoutCellUnspecifiedSize.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/UiLayoutCellUnspecifiedSize.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "UiLayoutCellUnspecifiedSize::Getter", - "category": "Constants" - } + "name": "Ui Layout Cell Unspecified Size" + }, + "methods": [ + { + "key": "GetUiLayoutCellUnspecifiedSize", + "details": { + "name": "Get Ui Layout Cell Unspecified Size" + }, + "results": [ + { + "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", + "details": { + "name": "float" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/VegetationSpawnerComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/VegetationSpawnerComponentTypeId.names new file mode 100644 index 0000000000..e6ff409cab --- /dev/null +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/VegetationSpawnerComponentTypeId.names @@ -0,0 +1,28 @@ +{ + "entries": [ + { + "key": "VegetationSpawnerComponentTypeId", + "context": "Constant", + "variant": "", + "details": { + "name": "Vegetation Spawner Component Type Id" + }, + "methods": [ + { + "key": "GetVegetationSpawnerComponentTypeId", + "details": { + "name": "Get Vegetation Spawner Component Type Id" + }, + "results": [ + { + "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}", + "details": { + "name": "AZ:: Uuid" + } + } + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eSSB_GotoEndTime.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eSSB_GotoEndTime.names index 89b6606748..1b2a59a3ac 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eSSB_GotoEndTime.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eSSB_GotoEndTime.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "eSSB_GotoEndTime::Getter", - "category": "Constants" - } + "name": "eSSB_ Goto End Time" + }, + "methods": [ + { + "key": "GeteSSB_GotoEndTime", + "details": { + "name": "GeteSSB_ Goto End Time" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eSSB_GotoStartTime.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eSSB_GotoStartTime.names index 69c4ae2f1f..d3c320d8a6 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eSSB_GotoStartTime.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eSSB_GotoStartTime.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "eSSB_GotoStartTime::Getter", - "category": "Constants" - } + "name": "eSSB_ Goto Start Time" + }, + "methods": [ + { + "key": "GeteSSB_GotoStartTime", + "details": { + "name": "GeteSSB_ Goto Start Time" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eSSB_LeaveTime.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eSSB_LeaveTime.names index 55136e9f17..b5be9dd560 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eSSB_LeaveTime.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eSSB_LeaveTime.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "eSSB_LeaveTime::Getter", - "category": "Constants" - } + "name": "eSSB_ Leave Time" + }, + "methods": [ + { + "key": "GeteSSB_LeaveTime", + "details": { + "name": "GeteSSB_ Leave Time" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiAnimationEvent_Aborted.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiAnimationEvent_Aborted.names index e2feeb0734..36b358499f 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiAnimationEvent_Aborted.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiAnimationEvent_Aborted.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "eUiAnimationEvent_Aborted::Getter", - "category": "Constants" - } + "name": "e Ui Animation Event_ Aborted" + }, + "methods": [ + { + "key": "GeteUiAnimationEvent_Aborted", + "details": { + "name": "Gete Ui Animation Event_ Aborted" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiAnimationEvent_Started.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiAnimationEvent_Started.names index 45c20aacf3..c0f26f3b80 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiAnimationEvent_Started.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiAnimationEvent_Started.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "eUiAnimationEvent_Started::Getter", - "category": "Constants" - } + "name": "e Ui Animation Event_ Started" + }, + "methods": [ + { + "key": "GeteUiAnimationEvent_Started", + "details": { + "name": "Gete Ui Animation Event_ Started" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiAnimationEvent_Stopped.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiAnimationEvent_Stopped.names index 20c8d48e42..eb3534ef7e 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiAnimationEvent_Stopped.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiAnimationEvent_Stopped.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "eUiAnimationEvent_Stopped::Getter", - "category": "Constants" - } + "name": "e Ui Animation Event_ Stopped" + }, + "methods": [ + { + "key": "GeteUiAnimationEvent_Stopped", + "details": { + "name": "Gete Ui Animation Event_ Stopped" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiAnimationEvent_Updated.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiAnimationEvent_Updated.names index 69221891f7..a36af03fe2 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiAnimationEvent_Updated.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiAnimationEvent_Updated.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "eUiAnimationEvent_Updated::Getter", - "category": "Constants" - } + "name": "e Ui Animation Event_ Updated" + }, + "methods": [ + { + "key": "GeteUiAnimationEvent_Updated", + "details": { + "name": "Gete Ui Animation Event_ Updated" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiDragState_Invalid.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiDragState_Invalid.names index 6062cced48..2497d54ba8 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiDragState_Invalid.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiDragState_Invalid.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "eUiDragState_Invalid::Getter", - "category": "Constants" - } + "name": "e Ui Drag State_ Invalid" + }, + "methods": [ + { + "key": "GeteUiDragState_Invalid", + "details": { + "name": "Gete Ui Drag State_ Invalid" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiDragState_Normal.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiDragState_Normal.names index c5c06e8057..02d43a96ce 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiDragState_Normal.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiDragState_Normal.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "eUiDragState_Normal::Getter", - "category": "Constants" - } + "name": "e Ui Drag State_ Normal" + }, + "methods": [ + { + "key": "GeteUiDragState_Normal", + "details": { + "name": "Gete Ui Drag State_ Normal" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiDragState_Valid.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiDragState_Valid.names index d8ad67098a..53a2e16ada 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiDragState_Valid.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiDragState_Valid.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "eUiDragState_Valid::Getter", - "category": "Constants" - } + "name": "e Ui Drag State_ Valid" + }, + "methods": [ + { + "key": "GeteUiDragState_Valid", + "details": { + "name": "Gete Ui Drag State_ Valid" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiDropState_Invalid.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiDropState_Invalid.names index 7f0745b6f3..bb1ec4dbf8 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiDropState_Invalid.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiDropState_Invalid.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "eUiDropState_Invalid::Getter", - "category": "Constants" - } + "name": "e Ui Drop State_ Invalid" + }, + "methods": [ + { + "key": "GeteUiDropState_Invalid", + "details": { + "name": "Gete Ui Drop State_ Invalid" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiDropState_Normal.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiDropState_Normal.names index b7325d9c15..386bdac441 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiDropState_Normal.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiDropState_Normal.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "eUiDropState_Normal::Getter", - "category": "Constants" - } + "name": "e Ui Drop State_ Normal" + }, + "methods": [ + { + "key": "GeteUiDropState_Normal", + "details": { + "name": "Gete Ui Drop State_ Normal" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiDropState_Valid.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiDropState_Valid.names index 19551341da..8b62c5a02b 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiDropState_Valid.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiDropState_Valid.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "eUiDropState_Valid::Getter", - "category": "Constants" - } + "name": "e Ui Drop State_ Valid" + }, + "methods": [ + { + "key": "GeteUiDropState_Valid", + "details": { + "name": "Gete Ui Drop State_ Valid" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiDynamicContentDBColorType_Free.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiDynamicContentDBColorType_Free.names index b3dbc87cac..ff22b824da 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiDynamicContentDBColorType_Free.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiDynamicContentDBColorType_Free.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "eUiDynamicContentDBColorType_Free::Getter", - "category": "Constants" - } + "name": "e Ui Dynamic ContentDB Color Type_ Free" + }, + "methods": [ + { + "key": "GeteUiDynamicContentDBColorType_Free", + "details": { + "name": "Gete Ui Dynamic ContentDB Color Type_ Free" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiDynamicContentDBColorType_Paid.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiDynamicContentDBColorType_Paid.names index b58a8484ee..ff1838c16b 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiDynamicContentDBColorType_Paid.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiDynamicContentDBColorType_Paid.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "eUiDynamicContentDBColorType_Paid::Getter", - "category": "Constants" - } + "name": "e Ui Dynamic ContentDB Color Type_ Paid" + }, + "methods": [ + { + "key": "GeteUiDynamicContentDBColorType_Paid", + "details": { + "name": "Gete Ui Dynamic ContentDB Color Type_ Paid" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiEmitShape_Circle.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiEmitShape_Circle.names index 7bcdda54e2..066a57d4c6 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiEmitShape_Circle.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiEmitShape_Circle.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "eUiEmitShape_Circle::Getter", - "category": "Constants" - } + "name": "e Ui Emit Shape_ Circle" + }, + "methods": [ + { + "key": "GeteUiEmitShape_Circle", + "details": { + "name": "Gete Ui Emit Shape_ Circle" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiEmitShape_Point.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiEmitShape_Point.names index 60ef452594..597db250cd 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiEmitShape_Point.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiEmitShape_Point.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "eUiEmitShape_Point::Getter", - "category": "Constants" - } + "name": "e Ui Emit Shape_ Point" + }, + "methods": [ + { + "key": "GeteUiEmitShape_Point", + "details": { + "name": "Gete Ui Emit Shape_ Point" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiEmitShape_Quad.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiEmitShape_Quad.names index 25ec6925de..d57fae5143 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiEmitShape_Quad.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiEmitShape_Quad.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "eUiEmitShape_Quad::Getter", - "category": "Constants" - } + "name": "e Ui Emit Shape_ Quad" + }, + "methods": [ + { + "key": "GeteUiEmitShape_Quad", + "details": { + "name": "Gete Ui Emit Shape_ Quad" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFillCornerOrigin_BottomLeft.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFillCornerOrigin_BottomLeft.names index 11a00014b9..397847d48a 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFillCornerOrigin_BottomLeft.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFillCornerOrigin_BottomLeft.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "eUiFillCornerOrigin_BottomLeft::Getter", - "category": "Constants" - } + "name": "e Ui Fill Corner Origin_ Bottom Left" + }, + "methods": [ + { + "key": "GeteUiFillCornerOrigin_BottomLeft", + "details": { + "name": "Gete Ui Fill Corner Origin_ Bottom Left" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFillCornerOrigin_BottomRight.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFillCornerOrigin_BottomRight.names index b1121d2e37..f85a19b391 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFillCornerOrigin_BottomRight.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFillCornerOrigin_BottomRight.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "eUiFillCornerOrigin_BottomRight::Getter", - "category": "Constants" - } + "name": "e Ui Fill Corner Origin_ Bottom Right" + }, + "methods": [ + { + "key": "GeteUiFillCornerOrigin_BottomRight", + "details": { + "name": "Gete Ui Fill Corner Origin_ Bottom Right" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFillCornerOrigin_TopLeft.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFillCornerOrigin_TopLeft.names index 16e3c41732..284c6f4be5 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFillCornerOrigin_TopLeft.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFillCornerOrigin_TopLeft.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "eUiFillCornerOrigin_TopLeft::Getter", - "category": "Constants" - } + "name": "e Ui Fill Corner Origin_ Top Left" + }, + "methods": [ + { + "key": "GeteUiFillCornerOrigin_TopLeft", + "details": { + "name": "Gete Ui Fill Corner Origin_ Top Left" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFillCornerOrigin_TopRight.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFillCornerOrigin_TopRight.names index a923c46942..9663ee9c08 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFillCornerOrigin_TopRight.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFillCornerOrigin_TopRight.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "eUiFillCornerOrigin_TopRight::Getter", - "category": "Constants" - } + "name": "e Ui Fill Corner Origin_ Top Right" + }, + "methods": [ + { + "key": "GeteUiFillCornerOrigin_TopRight", + "details": { + "name": "Gete Ui Fill Corner Origin_ Top Right" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFillEdgeOrigin_Bottom.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFillEdgeOrigin_Bottom.names index 914282a199..58e054f87d 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFillEdgeOrigin_Bottom.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFillEdgeOrigin_Bottom.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "eUiFillEdgeOrigin_Bottom::Getter", - "category": "Constants" - } + "name": "e Ui Fill Edge Origin_ Bottom" + }, + "methods": [ + { + "key": "GeteUiFillEdgeOrigin_Bottom", + "details": { + "name": "Gete Ui Fill Edge Origin_ Bottom" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFillEdgeOrigin_Left.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFillEdgeOrigin_Left.names index a88450c7b4..af5ca29669 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFillEdgeOrigin_Left.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFillEdgeOrigin_Left.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "eUiFillEdgeOrigin_Left::Getter", - "category": "Constants" - } + "name": "e Ui Fill Edge Origin_ Left" + }, + "methods": [ + { + "key": "GeteUiFillEdgeOrigin_Left", + "details": { + "name": "Gete Ui Fill Edge Origin_ Left" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFillEdgeOrigin_Right.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFillEdgeOrigin_Right.names index db5d528b2e..bcf740418a 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFillEdgeOrigin_Right.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFillEdgeOrigin_Right.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "eUiFillEdgeOrigin_Right::Getter", - "category": "Constants" - } + "name": "e Ui Fill Edge Origin_ Right" + }, + "methods": [ + { + "key": "GeteUiFillEdgeOrigin_Right", + "details": { + "name": "Gete Ui Fill Edge Origin_ Right" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFillEdgeOrigin_Top.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFillEdgeOrigin_Top.names index 6cb79b40d9..9f27a31c81 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFillEdgeOrigin_Top.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFillEdgeOrigin_Top.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "eUiFillEdgeOrigin_Top::Getter", - "category": "Constants" - } + "name": "e Ui Fill Edge Origin_ Top" + }, + "methods": [ + { + "key": "GeteUiFillEdgeOrigin_Top", + "details": { + "name": "Gete Ui Fill Edge Origin_ Top" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFillType_Linear.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFillType_Linear.names index 6a1530c0b3..7a5d679878 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFillType_Linear.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFillType_Linear.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "eUiFillType_Linear::Getter", - "category": "Constants" - } + "name": "e Ui Fill Type_ Linear" + }, + "methods": [ + { + "key": "GeteUiFillType_Linear", + "details": { + "name": "Gete Ui Fill Type_ Linear" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFillType_None.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFillType_None.names index 868d562df1..e0b8ddc402 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFillType_None.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFillType_None.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "eUiFillType_None::Getter", - "category": "Constants" - } + "name": "e Ui Fill Type_ None" + }, + "methods": [ + { + "key": "GeteUiFillType_None", + "details": { + "name": "Gete Ui Fill Type_ None" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFillType_Radial.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFillType_Radial.names index ae01ffdcf6..88042d6c94 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFillType_Radial.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFillType_Radial.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "eUiFillType_Radial::Getter", - "category": "Constants" - } + "name": "e Ui Fill Type_ Radial" + }, + "methods": [ + { + "key": "GeteUiFillType_Radial", + "details": { + "name": "Gete Ui Fill Type_ Radial" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFillType_RadialCorner.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFillType_RadialCorner.names index 4dcecb752d..c1753ef859 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFillType_RadialCorner.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFillType_RadialCorner.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "eUiFillType_RadialCorner::Getter", - "category": "Constants" - } + "name": "e Ui Fill Type_ Radial Corner" + }, + "methods": [ + { + "key": "GeteUiFillType_RadialCorner", + "details": { + "name": "Gete Ui Fill Type_ Radial Corner" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFillType_RadialEdge.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFillType_RadialEdge.names index a8e9d490d2..7c3b91bd9b 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFillType_RadialEdge.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFillType_RadialEdge.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "eUiFillType_RadialEdge::Getter", - "category": "Constants" - } + "name": "e Ui Fill Type_ Radial Edge" + }, + "methods": [ + { + "key": "GeteUiFillType_RadialEdge", + "details": { + "name": "Gete Ui Fill Type_ Radial Edge" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFlipbookAnimationFramerateUnits_FPS.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFlipbookAnimationFramerateUnits_FPS.names index 476f62879e..711294f44a 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFlipbookAnimationFramerateUnits_FPS.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFlipbookAnimationFramerateUnits_FPS.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "eUiFlipbookAnimationFramerateUnits_FPS::Getter", - "category": "Constants" - } + "name": "e Ui Flipbook Animation Framerate Units_FPS" + }, + "methods": [ + { + "key": "GeteUiFlipbookAnimationFramerateUnits_FPS", + "details": { + "name": "Gete Ui Flipbook Animation Framerate Units_FPS" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFlipbookAnimationFramerateUnits_SecondsPerFrame.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFlipbookAnimationFramerateUnits_SecondsPerFrame.names index 2d567073a0..543cf58fa6 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFlipbookAnimationFramerateUnits_SecondsPerFrame.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFlipbookAnimationFramerateUnits_SecondsPerFrame.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "eUiFlipbookAnimationFramerateUnits_SecondsPerFrame::Getter", - "category": "Constants" - } + "name": "e Ui Flipbook Animation Framerate Units_ Seconds Per Frame" + }, + "methods": [ + { + "key": "GeteUiFlipbookAnimationFramerateUnits_SecondsPerFrame", + "details": { + "name": "Gete Ui Flipbook Animation Framerate Units_ Seconds Per Frame" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFlipbookAnimationLoopType_Linear.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFlipbookAnimationLoopType_Linear.names index d794ec96f0..8776ce8a57 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFlipbookAnimationLoopType_Linear.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFlipbookAnimationLoopType_Linear.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "eUiFlipbookAnimationLoopType_Linear::Getter", - "category": "Constants" - } + "name": "e Ui Flipbook Animation Loop Type_ Linear" + }, + "methods": [ + { + "key": "GeteUiFlipbookAnimationLoopType_Linear", + "details": { + "name": "Gete Ui Flipbook Animation Loop Type_ Linear" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFlipbookAnimationLoopType_None.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFlipbookAnimationLoopType_None.names index 2cdbfea52c..443ee66aac 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFlipbookAnimationLoopType_None.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFlipbookAnimationLoopType_None.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "eUiFlipbookAnimationLoopType_None::Getter", - "category": "Constants" - } + "name": "e Ui Flipbook Animation Loop Type_ None" + }, + "methods": [ + { + "key": "GeteUiFlipbookAnimationLoopType_None", + "details": { + "name": "Gete Ui Flipbook Animation Loop Type_ None" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFlipbookAnimationLoopType_PingPong.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFlipbookAnimationLoopType_PingPong.names index 9c9c1cd016..95be18fec1 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFlipbookAnimationLoopType_PingPong.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFlipbookAnimationLoopType_PingPong.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "eUiFlipbookAnimationLoopType_PingPong::Getter", - "category": "Constants" - } + "name": "e Ui Flipbook Animation Loop Type_ Ping Pong" + }, + "methods": [ + { + "key": "GeteUiFlipbookAnimationLoopType_PingPong", + "details": { + "name": "Gete Ui Flipbook Animation Loop Type_ Ping Pong" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiHAlign_Center.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiHAlign_Center.names index faf4797114..9076cd7d22 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiHAlign_Center.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiHAlign_Center.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "eUiHAlign_Center::Getter", - "category": "Constants" - } + "name": "e UiH Align_ Center" + }, + "methods": [ + { + "key": "GeteUiHAlign_Center", + "details": { + "name": "Gete UiH Align_ Center" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiHAlign_Left.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiHAlign_Left.names index 01cd8f3812..357605a5fc 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiHAlign_Left.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiHAlign_Left.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "eUiHAlign_Left::Getter", - "category": "Constants" - } + "name": "e UiH Align_ Left" + }, + "methods": [ + { + "key": "GeteUiHAlign_Left", + "details": { + "name": "Gete UiH Align_ Left" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiHAlign_Right.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiHAlign_Right.names index 03ff7072ef..b2b6a77525 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiHAlign_Right.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiHAlign_Right.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "eUiHAlign_Right::Getter", - "category": "Constants" - } + "name": "e UiH Align_ Right" + }, + "methods": [ + { + "key": "GeteUiHAlign_Right", + "details": { + "name": "Gete UiH Align_ Right" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiHorizontalOrder_LeftToRight.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiHorizontalOrder_LeftToRight.names index f2a0494385..7ecd515dce 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiHorizontalOrder_LeftToRight.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiHorizontalOrder_LeftToRight.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "eUiHorizontalOrder_LeftToRight::Getter", - "category": "Constants" - } + "name": "e Ui Horizontal Order_ Left To Right" + }, + "methods": [ + { + "key": "GeteUiHorizontalOrder_LeftToRight", + "details": { + "name": "Gete Ui Horizontal Order_ Left To Right" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiHorizontalOrder_RightToLeft.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiHorizontalOrder_RightToLeft.names index 133113e8ce..f4c17a7f0f 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiHorizontalOrder_RightToLeft.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiHorizontalOrder_RightToLeft.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "eUiHorizontalOrder_RightToLeft::Getter", - "category": "Constants" - } + "name": "e Ui Horizontal Order_ Right To Left" + }, + "methods": [ + { + "key": "GeteUiHorizontalOrder_RightToLeft", + "details": { + "name": "Gete Ui Horizontal Order_ Right To Left" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiImageSequenceImageType_Fixed.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiImageSequenceImageType_Fixed.names index f82d1d4eb0..64d23d4244 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiImageSequenceImageType_Fixed.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiImageSequenceImageType_Fixed.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "eUiImageSequenceImageType_Fixed::Getter", - "category": "Constants" - } + "name": "e Ui Image Sequence Image Type_ Fixed" + }, + "methods": [ + { + "key": "GeteUiImageSequenceImageType_Fixed", + "details": { + "name": "Gete Ui Image Sequence Image Type_ Fixed" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiImageSequenceImageType_Stretched.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiImageSequenceImageType_Stretched.names index a4b48dc8ad..113cfa68b9 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiImageSequenceImageType_Stretched.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiImageSequenceImageType_Stretched.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "eUiImageSequenceImageType_Stretched::Getter", - "category": "Constants" - } + "name": "e Ui Image Sequence Image Type_ Stretched" + }, + "methods": [ + { + "key": "GeteUiImageSequenceImageType_Stretched", + "details": { + "name": "Gete Ui Image Sequence Image Type_ Stretched" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiImageSequenceImageType_StretchedToFill.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiImageSequenceImageType_StretchedToFill.names index c59426f677..5db0235189 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiImageSequenceImageType_StretchedToFill.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiImageSequenceImageType_StretchedToFill.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "eUiImageSequenceImageType_StretchedToFill::Getter", - "category": "Constants" - } + "name": "e Ui Image Sequence Image Type_ Stretched To Fill" + }, + "methods": [ + { + "key": "GeteUiImageSequenceImageType_StretchedToFill", + "details": { + "name": "Gete Ui Image Sequence Image Type_ Stretched To Fill" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiImageSequenceImageType_StretchedToFit.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiImageSequenceImageType_StretchedToFit.names index 9ba3d30e62..f519d2af74 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiImageSequenceImageType_StretchedToFit.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiImageSequenceImageType_StretchedToFit.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "eUiImageSequenceImageType_StretchedToFit::Getter", - "category": "Constants" - } + "name": "e Ui Image Sequence Image Type_ Stretched To Fit" + }, + "methods": [ + { + "key": "GeteUiImageSequenceImageType_StretchedToFit", + "details": { + "name": "Gete Ui Image Sequence Image Type_ Stretched To Fit" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiImageType_Fixed.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiImageType_Fixed.names index 0a65819fc1..e70fb18686 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiImageType_Fixed.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiImageType_Fixed.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "eUiImageType_Fixed::Getter", - "category": "Constants" - } + "name": "e Ui Image Type_ Fixed" + }, + "methods": [ + { + "key": "GeteUiImageType_Fixed", + "details": { + "name": "Gete Ui Image Type_ Fixed" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiImageType_Sliced.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiImageType_Sliced.names index f9f1bc3743..d5f9c5574e 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiImageType_Sliced.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiImageType_Sliced.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "eUiImageType_Sliced::Getter", - "category": "Constants" - } + "name": "e Ui Image Type_ Sliced" + }, + "methods": [ + { + "key": "GeteUiImageType_Sliced", + "details": { + "name": "Gete Ui Image Type_ Sliced" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiImageType_Stretched.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiImageType_Stretched.names index fc2312db15..b1ec151b0f 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiImageType_Stretched.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiImageType_Stretched.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "eUiImageType_Stretched::Getter", - "category": "Constants" - } + "name": "e Ui Image Type_ Stretched" + }, + "methods": [ + { + "key": "GeteUiImageType_Stretched", + "details": { + "name": "Gete Ui Image Type_ Stretched" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiImageType_StretchedToFill.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiImageType_StretchedToFill.names index a30508aa7e..39933e7430 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiImageType_StretchedToFill.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiImageType_StretchedToFill.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "eUiImageType_StretchedToFill::Getter", - "category": "Constants" - } + "name": "e Ui Image Type_ Stretched To Fill" + }, + "methods": [ + { + "key": "GeteUiImageType_StretchedToFill", + "details": { + "name": "Gete Ui Image Type_ Stretched To Fill" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiImageType_StretchedToFit.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiImageType_StretchedToFit.names index be3b007a7e..d1ed5df199 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiImageType_StretchedToFit.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiImageType_StretchedToFit.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "eUiImageType_StretchedToFit::Getter", - "category": "Constants" - } + "name": "e Ui Image Type_ Stretched To Fit" + }, + "methods": [ + { + "key": "GeteUiImageType_StretchedToFit", + "details": { + "name": "Gete Ui Image Type_ Stretched To Fit" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiImageType_Tiled.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiImageType_Tiled.names index 0a6e5b0977..0ed3869995 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiImageType_Tiled.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiImageType_Tiled.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "eUiImageType_Tiled::Getter", - "category": "Constants" - } + "name": "e Ui Image Type_ Tiled" + }, + "methods": [ + { + "key": "GeteUiImageType_Tiled", + "details": { + "name": "Gete Ui Image Type_ Tiled" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiInteractableState_Disabled.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiInteractableState_Disabled.names index 43ed9dfac2..da3d4fbfc0 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiInteractableState_Disabled.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiInteractableState_Disabled.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "eUiInteractableState_Disabled::Getter", - "category": "Constants" - } + "name": "e Ui Interactable State_ Disabled" + }, + "methods": [ + { + "key": "GeteUiInteractableState_Disabled", + "details": { + "name": "Gete Ui Interactable State_ Disabled" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiInteractableState_Hover.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiInteractableState_Hover.names index 7e005729fd..2257f1dcbd 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiInteractableState_Hover.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiInteractableState_Hover.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "eUiInteractableState_Hover::Getter", - "category": "Constants" - } + "name": "e Ui Interactable State_ Hover" + }, + "methods": [ + { + "key": "GeteUiInteractableState_Hover", + "details": { + "name": "Gete Ui Interactable State_ Hover" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiInteractableState_Normal.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiInteractableState_Normal.names index 51d7e81522..2cb2fcd975 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiInteractableState_Normal.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiInteractableState_Normal.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "eUiInteractableState_Normal::Getter", - "category": "Constants" - } + "name": "e Ui Interactable State_ Normal" + }, + "methods": [ + { + "key": "GeteUiInteractableState_Normal", + "details": { + "name": "Gete Ui Interactable State_ Normal" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiInteractableState_Pressed.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiInteractableState_Pressed.names index b578408cd2..4c1e9aa266 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiInteractableState_Pressed.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiInteractableState_Pressed.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "eUiInteractableState_Pressed::Getter", - "category": "Constants" - } + "name": "e Ui Interactable State_ Pressed" + }, + "methods": [ + { + "key": "GeteUiInteractableState_Pressed", + "details": { + "name": "Gete Ui Interactable State_ Pressed" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiLayoutGridStartingDirection_HorizontalOrder.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiLayoutGridStartingDirection_HorizontalOrder.names index d0c3ef3a79..70e158351c 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiLayoutGridStartingDirection_HorizontalOrder.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiLayoutGridStartingDirection_HorizontalOrder.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "eUiLayoutGridStartingDirection_HorizontalOrder::Getter", - "category": "Constants" - } + "name": "e Ui Layout Grid Starting Direction_ Horizontal Order" + }, + "methods": [ + { + "key": "GeteUiLayoutGridStartingDirection_HorizontalOrder", + "details": { + "name": "Gete Ui Layout Grid Starting Direction_ Horizontal Order" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiLayoutGridStartingDirection_VerticalOrder.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiLayoutGridStartingDirection_VerticalOrder.names index fd32fb89c9..18e0a58815 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiLayoutGridStartingDirection_VerticalOrder.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiLayoutGridStartingDirection_VerticalOrder.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "eUiLayoutGridStartingDirection_VerticalOrder::Getter", - "category": "Constants" - } + "name": "e Ui Layout Grid Starting Direction_ Vertical Order" + }, + "methods": [ + { + "key": "GeteUiLayoutGridStartingDirection_VerticalOrder", + "details": { + "name": "Gete Ui Layout Grid Starting Direction_ Vertical Order" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiNavigationMode_Automatic.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiNavigationMode_Automatic.names index 1743a1ebdb..81b5baba5d 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiNavigationMode_Automatic.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiNavigationMode_Automatic.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "eUiNavigationMode_Automatic::Getter", - "category": "Constants" - } + "name": "e Ui Navigation Mode_ Automatic" + }, + "methods": [ + { + "key": "GeteUiNavigationMode_Automatic", + "details": { + "name": "Gete Ui Navigation Mode_ Automatic" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiNavigationMode_Custom.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiNavigationMode_Custom.names index 8a3ee33916..40a95b266f 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiNavigationMode_Custom.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiNavigationMode_Custom.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "eUiNavigationMode_Custom::Getter", - "category": "Constants" - } + "name": "e Ui Navigation Mode_ Custom" + }, + "methods": [ + { + "key": "GeteUiNavigationMode_Custom", + "details": { + "name": "Gete Ui Navigation Mode_ Custom" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiNavigationMode_None.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiNavigationMode_None.names index abc9248282..f23dde9d9b 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiNavigationMode_None.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiNavigationMode_None.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "eUiNavigationMode_None::Getter", - "category": "Constants" - } + "name": "e Ui Navigation Mode_ None" + }, + "methods": [ + { + "key": "GeteUiNavigationMode_None", + "details": { + "name": "Gete Ui Navigation Mode_ None" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiParticleCoordinateType_Cartesian.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiParticleCoordinateType_Cartesian.names index 33a1db8e62..cd7b5fbcad 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiParticleCoordinateType_Cartesian.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiParticleCoordinateType_Cartesian.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "eUiParticleCoordinateType_Cartesian::Getter", - "category": "Constants" - } + "name": "e Ui Particle Coordinate Type_ Cartesian" + }, + "methods": [ + { + "key": "GeteUiParticleCoordinateType_Cartesian", + "details": { + "name": "Gete Ui Particle Coordinate Type_ Cartesian" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiParticleCoordinateType_Polar.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiParticleCoordinateType_Polar.names index 3ddbf1792c..1e6648fc40 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiParticleCoordinateType_Polar.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiParticleCoordinateType_Polar.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "eUiParticleCoordinateType_Polar::Getter", - "category": "Constants" - } + "name": "e Ui Particle Coordinate Type_ Polar" + }, + "methods": [ + { + "key": "GeteUiParticleCoordinateType_Polar", + "details": { + "name": "Gete Ui Particle Coordinate Type_ Polar" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiParticleInitialDirectionType_RelativeToEmitAngle.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiParticleInitialDirectionType_RelativeToEmitAngle.names index f9a8ae7ceb..eea2d97ffc 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiParticleInitialDirectionType_RelativeToEmitAngle.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiParticleInitialDirectionType_RelativeToEmitAngle.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "eUiParticleInitialDirectionType_RelativeToEmitAngle::Getter", - "category": "Constants" - } + "name": "e Ui Particle Initial Direction Type_ Relative To Emit Angle" + }, + "methods": [ + { + "key": "GeteUiParticleInitialDirectionType_RelativeToEmitAngle", + "details": { + "name": "Gete Ui Particle Initial Direction Type_ Relative To Emit Angle" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiParticleInitialDirectionType_RelativeToEmitterCenter.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiParticleInitialDirectionType_RelativeToEmitterCenter.names index 6486a80003..39cce6f9df 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiParticleInitialDirectionType_RelativeToEmitterCenter.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiParticleInitialDirectionType_RelativeToEmitterCenter.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "eUiParticleInitialDirectionType_RelativeToEmitterCenter::Getter", - "category": "Constants" - } + "name": "e Ui Particle Initial Direction Type_ Relative To Emitter Center" + }, + "methods": [ + { + "key": "GeteUiParticleInitialDirectionType_RelativeToEmitterCenter", + "details": { + "name": "Gete Ui Particle Initial Direction Type_ Relative To Emitter Center" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScaleToDeviceMode_NonUniformScale.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScaleToDeviceMode_NonUniformScale.names index 605ed1aba5..2eec2256c8 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScaleToDeviceMode_NonUniformScale.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScaleToDeviceMode_NonUniformScale.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "eUiScaleToDeviceMode_NonUniformScale::Getter", - "category": "Constants" - } + "name": "e Ui Scale To Device Mode_ Non Uniform Scale" + }, + "methods": [ + { + "key": "GeteUiScaleToDeviceMode_NonUniformScale", + "details": { + "name": "Gete Ui Scale To Device Mode_ Non Uniform Scale" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScaleToDeviceMode_None.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScaleToDeviceMode_None.names index 88c08b06ec..21956957ed 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScaleToDeviceMode_None.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScaleToDeviceMode_None.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "eUiScaleToDeviceMode_None::Getter", - "category": "Constants" - } + "name": "e Ui Scale To Device Mode_ None" + }, + "methods": [ + { + "key": "GeteUiScaleToDeviceMode_None", + "details": { + "name": "Gete Ui Scale To Device Mode_ None" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScaleToDeviceMode_ScaleXOnly.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScaleToDeviceMode_ScaleXOnly.names index 5804e7aeaa..427b40f1fe 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScaleToDeviceMode_ScaleXOnly.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScaleToDeviceMode_ScaleXOnly.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "eUiScaleToDeviceMode_ScaleXOnly::Getter", - "category": "Constants" - } + "name": "e Ui Scale To Device Mode_ ScaleX Only" + }, + "methods": [ + { + "key": "GeteUiScaleToDeviceMode_ScaleXOnly", + "details": { + "name": "Gete Ui Scale To Device Mode_ ScaleX Only" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScaleToDeviceMode_ScaleYOnly.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScaleToDeviceMode_ScaleYOnly.names index e5ea4e5f5c..52c6f4110d 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScaleToDeviceMode_ScaleYOnly.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScaleToDeviceMode_ScaleYOnly.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "eUiScaleToDeviceMode_ScaleYOnly::Getter", - "category": "Constants" - } + "name": "e Ui Scale To Device Mode_ ScaleY Only" + }, + "methods": [ + { + "key": "GeteUiScaleToDeviceMode_ScaleYOnly", + "details": { + "name": "Gete Ui Scale To Device Mode_ ScaleY Only" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScaleToDeviceMode_UniformScaleToFill.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScaleToDeviceMode_UniformScaleToFill.names index aa1f56984b..b9d8dac813 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScaleToDeviceMode_UniformScaleToFill.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScaleToDeviceMode_UniformScaleToFill.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "eUiScaleToDeviceMode_UniformScaleToFill::Getter", - "category": "Constants" - } + "name": "e Ui Scale To Device Mode_ Uniform Scale To Fill" + }, + "methods": [ + { + "key": "GeteUiScaleToDeviceMode_UniformScaleToFill", + "details": { + "name": "Gete Ui Scale To Device Mode_ Uniform Scale To Fill" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScaleToDeviceMode_UniformScaleToFit.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScaleToDeviceMode_UniformScaleToFit.names index 3b603fabc1..dfc36e8e5f 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScaleToDeviceMode_UniformScaleToFit.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScaleToDeviceMode_UniformScaleToFit.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "eUiScaleToDeviceMode_UniformScaleToFit::Getter", - "category": "Constants" - } + "name": "e Ui Scale To Device Mode_ Uniform Scale To Fit" + }, + "methods": [ + { + "key": "GeteUiScaleToDeviceMode_UniformScaleToFit", + "details": { + "name": "Gete Ui Scale To Device Mode_ Uniform Scale To Fit" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScaleToDeviceMode_UniformScaleToFitX.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScaleToDeviceMode_UniformScaleToFitX.names index ce90c47c88..7cd6dcd0bf 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScaleToDeviceMode_UniformScaleToFitX.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScaleToDeviceMode_UniformScaleToFitX.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "eUiScaleToDeviceMode_UniformScaleToFitX::Getter", - "category": "Constants" - } + "name": "e Ui Scale To Device Mode_ Uniform Scale To FitX" + }, + "methods": [ + { + "key": "GeteUiScaleToDeviceMode_UniformScaleToFitX", + "details": { + "name": "Gete Ui Scale To Device Mode_ Uniform Scale To FitX" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScaleToDeviceMode_UniformScaleToFitY.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScaleToDeviceMode_UniformScaleToFitY.names index a0ba060b36..4b324e82cc 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScaleToDeviceMode_UniformScaleToFitY.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScaleToDeviceMode_UniformScaleToFitY.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "eUiScaleToDeviceMode_UniformScaleToFitY::Getter", - "category": "Constants" - } + "name": "e Ui Scale To Device Mode_ Uniform Scale To FitY" + }, + "methods": [ + { + "key": "GeteUiScaleToDeviceMode_UniformScaleToFitY", + "details": { + "name": "Gete Ui Scale To Device Mode_ Uniform Scale To FitY" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScrollBoxScrollBarVisibility_AlwaysShow.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScrollBoxScrollBarVisibility_AlwaysShow.names index 61931775a9..8a142a4135 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScrollBoxScrollBarVisibility_AlwaysShow.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScrollBoxScrollBarVisibility_AlwaysShow.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "eUiScrollBoxScrollBarVisibility_AlwaysShow::Getter", - "category": "Constants" - } + "name": "e Ui Scroll Box Scroll Bar Visibility_ Always Show" + }, + "methods": [ + { + "key": "GeteUiScrollBoxScrollBarVisibility_AlwaysShow", + "details": { + "name": "Gete Ui Scroll Box Scroll Bar Visibility_ Always Show" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScrollBoxScrollBarVisibility_AutoHide.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScrollBoxScrollBarVisibility_AutoHide.names index 48de4a7899..d3890dbe39 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScrollBoxScrollBarVisibility_AutoHide.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScrollBoxScrollBarVisibility_AutoHide.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "eUiScrollBoxScrollBarVisibility_AutoHide::Getter", - "category": "Constants" - } + "name": "e Ui Scroll Box Scroll Bar Visibility_ Auto Hide" + }, + "methods": [ + { + "key": "GeteUiScrollBoxScrollBarVisibility_AutoHide", + "details": { + "name": "Gete Ui Scroll Box Scroll Bar Visibility_ Auto Hide" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScrollBoxScrollBarVisibility_AutoHideAndResizeViewport.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScrollBoxScrollBarVisibility_AutoHideAndResizeViewport.names index 560df7e007..b8dd306b90 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScrollBoxScrollBarVisibility_AutoHideAndResizeViewport.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScrollBoxScrollBarVisibility_AutoHideAndResizeViewport.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "eUiScrollBoxScrollBarVisibility_AutoHideAndResizeViewport::Getter", - "category": "Constants" - } + "name": "e Ui Scroll Box Scroll Bar Visibility_ Auto Hide And Resize Viewport" + }, + "methods": [ + { + "key": "GeteUiScrollBoxScrollBarVisibility_AutoHideAndResizeViewport", + "details": { + "name": "Gete Ui Scroll Box Scroll Bar Visibility_ Auto Hide And Resize Viewport" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScrollBoxSnapMode_Children.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScrollBoxSnapMode_Children.names index 0b540c47a4..774f4686af 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScrollBoxSnapMode_Children.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScrollBoxSnapMode_Children.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "eUiScrollBoxSnapMode_Children::Getter", - "category": "Constants" - } + "name": "e Ui Scroll Box Snap Mode_ Children" + }, + "methods": [ + { + "key": "GeteUiScrollBoxSnapMode_Children", + "details": { + "name": "Gete Ui Scroll Box Snap Mode_ Children" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScrollBoxSnapMode_Grid.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScrollBoxSnapMode_Grid.names index 5696a2ac17..0c59459061 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScrollBoxSnapMode_Grid.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScrollBoxSnapMode_Grid.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "eUiScrollBoxSnapMode_Grid::Getter", - "category": "Constants" - } + "name": "e Ui Scroll Box Snap Mode_ Grid" + }, + "methods": [ + { + "key": "GeteUiScrollBoxSnapMode_Grid", + "details": { + "name": "Gete Ui Scroll Box Snap Mode_ Grid" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScrollBoxSnapMode_None.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScrollBoxSnapMode_None.names index 107536dc88..bbc375573a 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScrollBoxSnapMode_None.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScrollBoxSnapMode_None.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "eUiScrollBoxSnapMode_None::Getter", - "category": "Constants" - } + "name": "e Ui Scroll Box Snap Mode_ None" + }, + "methods": [ + { + "key": "GeteUiScrollBoxSnapMode_None", + "details": { + "name": "Gete Ui Scroll Box Snap Mode_ None" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScrollerOrientation_Horizontal.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScrollerOrientation_Horizontal.names index a9a7e4b62f..67a0b79d1d 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScrollerOrientation_Horizontal.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScrollerOrientation_Horizontal.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "eUiScrollerOrientation_Horizontal::Getter", - "category": "Constants" - } + "name": "e Ui Scroller Orientation_ Horizontal" + }, + "methods": [ + { + "key": "GeteUiScrollerOrientation_Horizontal", + "details": { + "name": "Gete Ui Scroller Orientation_ Horizontal" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScrollerOrientation_Vertical.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScrollerOrientation_Vertical.names index fee533f819..a19fc02930 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScrollerOrientation_Vertical.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScrollerOrientation_Vertical.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "eUiScrollerOrientation_Vertical::Getter", - "category": "Constants" - } + "name": "e Ui Scroller Orientation_ Vertical" + }, + "methods": [ + { + "key": "GeteUiScrollerOrientation_Vertical", + "details": { + "name": "Gete Ui Scroller Orientation_ Vertical" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiSpriteType_RenderTarget.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiSpriteType_RenderTarget.names index f1b2b162d4..6753095ad0 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiSpriteType_RenderTarget.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiSpriteType_RenderTarget.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "eUiSpriteType_RenderTarget::Getter", - "category": "Constants" - } + "name": "e Ui Sprite Type_ Render Target" + }, + "methods": [ + { + "key": "GeteUiSpriteType_RenderTarget", + "details": { + "name": "Gete Ui Sprite Type_ Render Target" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiSpriteType_SpriteAsset.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiSpriteType_SpriteAsset.names index 4fb031214f..3e13e14026 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiSpriteType_SpriteAsset.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiSpriteType_SpriteAsset.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "eUiSpriteType_SpriteAsset::Getter", - "category": "Constants" - } + "name": "e Ui Sprite Type_ Sprite Asset" + }, + "methods": [ + { + "key": "GeteUiSpriteType_SpriteAsset", + "details": { + "name": "Gete Ui Sprite Type_ Sprite Asset" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTextOverflowMode_ClipText.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTextOverflowMode_ClipText.names index 4020030b26..9728a3e741 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTextOverflowMode_ClipText.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTextOverflowMode_ClipText.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "eUiTextOverflowMode_ClipText::Getter", - "category": "Constants" - } + "name": "e Ui Text Overflow Mode_ Clip Text" + }, + "methods": [ + { + "key": "GeteUiTextOverflowMode_ClipText", + "details": { + "name": "Gete Ui Text Overflow Mode_ Clip Text" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTextOverflowMode_Ellipsis.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTextOverflowMode_Ellipsis.names index 340acecf48..ef62f342f4 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTextOverflowMode_Ellipsis.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTextOverflowMode_Ellipsis.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "eUiTextOverflowMode_Ellipsis::Getter", - "category": "Constants" - } + "name": "e Ui Text Overflow Mode_ Ellipsis" + }, + "methods": [ + { + "key": "GeteUiTextOverflowMode_Ellipsis", + "details": { + "name": "Gete Ui Text Overflow Mode_ Ellipsis" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTextOverflowMode_OverflowText.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTextOverflowMode_OverflowText.names index 5de46b4a76..20caaff753 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTextOverflowMode_OverflowText.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTextOverflowMode_OverflowText.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "eUiTextOverflowMode_OverflowText::Getter", - "category": "Constants" - } + "name": "e Ui Text Overflow Mode_ Overflow Text" + }, + "methods": [ + { + "key": "GeteUiTextOverflowMode_OverflowText", + "details": { + "name": "Gete Ui Text Overflow Mode_ Overflow Text" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTextShrinkToFit_None.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTextShrinkToFit_None.names index 5331e830f4..7d55b34012 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTextShrinkToFit_None.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTextShrinkToFit_None.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "eUiTextShrinkToFit_None::Getter", - "category": "Constants" - } + "name": "e Ui Text Shrink To Fit_ None" + }, + "methods": [ + { + "key": "GeteUiTextShrinkToFit_None", + "details": { + "name": "Gete Ui Text Shrink To Fit_ None" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTextShrinkToFit_Uniform.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTextShrinkToFit_Uniform.names index 175534eafd..dcbf83f093 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTextShrinkToFit_Uniform.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTextShrinkToFit_Uniform.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "eUiTextShrinkToFit_Uniform::Getter", - "category": "Constants" - } + "name": "e Ui Text Shrink To Fit_ Uniform" + }, + "methods": [ + { + "key": "GeteUiTextShrinkToFit_Uniform", + "details": { + "name": "Gete Ui Text Shrink To Fit_ Uniform" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTextShrinkToFit_WidthOnly.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTextShrinkToFit_WidthOnly.names index 95b5d2b424..e40dbe79e0 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTextShrinkToFit_WidthOnly.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTextShrinkToFit_WidthOnly.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "eUiTextShrinkToFit_WidthOnly::Getter", - "category": "Constants" - } + "name": "e Ui Text Shrink To Fit_ Width Only" + }, + "methods": [ + { + "key": "GeteUiTextShrinkToFit_WidthOnly", + "details": { + "name": "Gete Ui Text Shrink To Fit_ Width Only" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTextWrapTextSetting_NoWrap.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTextWrapTextSetting_NoWrap.names index 04dc16a0ae..692f4c5736 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTextWrapTextSetting_NoWrap.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTextWrapTextSetting_NoWrap.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "eUiTextWrapTextSetting_NoWrap::Getter", - "category": "Constants" - } + "name": "e Ui Text Wrap Text Setting_ No Wrap" + }, + "methods": [ + { + "key": "GeteUiTextWrapTextSetting_NoWrap", + "details": { + "name": "Gete Ui Text Wrap Text Setting_ No Wrap" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTextWrapTextSetting_Wrap.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTextWrapTextSetting_Wrap.names index 75fe851271..71327e85c7 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTextWrapTextSetting_Wrap.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTextWrapTextSetting_Wrap.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "eUiTextWrapTextSetting_Wrap::Getter", - "category": "Constants" - } + "name": "e Ui Text Wrap Text Setting_ Wrap" + }, + "methods": [ + { + "key": "GeteUiTextWrapTextSetting_Wrap", + "details": { + "name": "Gete Ui Text Wrap Text Setting_ Wrap" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTooltipDisplayAutoPositionMode_OffsetFromElement.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTooltipDisplayAutoPositionMode_OffsetFromElement.names index 473b16b42d..82bb033dc0 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTooltipDisplayAutoPositionMode_OffsetFromElement.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTooltipDisplayAutoPositionMode_OffsetFromElement.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "eUiTooltipDisplayAutoPositionMode_OffsetFromElement::Getter", - "category": "Constants" - } + "name": "e Ui Tooltip Display Auto Position Mode_ Offset From Element" + }, + "methods": [ + { + "key": "GeteUiTooltipDisplayAutoPositionMode_OffsetFromElement", + "details": { + "name": "Gete Ui Tooltip Display Auto Position Mode_ Offset From Element" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTooltipDisplayAutoPositionMode_OffsetFromMouse.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTooltipDisplayAutoPositionMode_OffsetFromMouse.names index 4876380d2b..2fea22706c 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTooltipDisplayAutoPositionMode_OffsetFromMouse.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTooltipDisplayAutoPositionMode_OffsetFromMouse.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "eUiTooltipDisplayAutoPositionMode_OffsetFromMouse::Getter", - "category": "Constants" - } + "name": "e Ui Tooltip Display Auto Position Mode_ Offset From Mouse" + }, + "methods": [ + { + "key": "GeteUiTooltipDisplayAutoPositionMode_OffsetFromMouse", + "details": { + "name": "Gete Ui Tooltip Display Auto Position Mode_ Offset From Mouse" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTooltipDisplayTriggerMode_OnClick.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTooltipDisplayTriggerMode_OnClick.names index 607b9793a2..be3f715e03 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTooltipDisplayTriggerMode_OnClick.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTooltipDisplayTriggerMode_OnClick.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "eUiTooltipDisplayTriggerMode_OnClick::Getter", - "category": "Constants" - } + "name": "e Ui Tooltip Display Trigger Mode_ On Click" + }, + "methods": [ + { + "key": "GeteUiTooltipDisplayTriggerMode_OnClick", + "details": { + "name": "Gete Ui Tooltip Display Trigger Mode_ On Click" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTooltipDisplayTriggerMode_OnHover.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTooltipDisplayTriggerMode_OnHover.names index 705be843d8..90a75bfcc3 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTooltipDisplayTriggerMode_OnHover.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTooltipDisplayTriggerMode_OnHover.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "eUiTooltipDisplayTriggerMode_OnHover::Getter", - "category": "Constants" - } + "name": "e Ui Tooltip Display Trigger Mode_ On Hover" + }, + "methods": [ + { + "key": "GeteUiTooltipDisplayTriggerMode_OnHover", + "details": { + "name": "Gete Ui Tooltip Display Trigger Mode_ On Hover" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTooltipDisplayTriggerMode_OnPress.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTooltipDisplayTriggerMode_OnPress.names index 28eb9c5118..c1b17d5d3d 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTooltipDisplayTriggerMode_OnPress.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTooltipDisplayTriggerMode_OnPress.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "eUiTooltipDisplayTriggerMode_OnPress::Getter", - "category": "Constants" - } + "name": "e Ui Tooltip Display Trigger Mode_ On Press" + }, + "methods": [ + { + "key": "GeteUiTooltipDisplayTriggerMode_OnPress", + "details": { + "name": "Gete Ui Tooltip Display Trigger Mode_ On Press" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiVAlign_Bottom.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiVAlign_Bottom.names index 46aa499d0b..7c38c1be00 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiVAlign_Bottom.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiVAlign_Bottom.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "eUiVAlign_Bottom::Getter", - "category": "Constants" - } + "name": "e UiV Align_ Bottom" + }, + "methods": [ + { + "key": "GeteUiVAlign_Bottom", + "details": { + "name": "Gete UiV Align_ Bottom" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiVAlign_Center.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiVAlign_Center.names index 2f64297cf4..fd9b1d2090 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiVAlign_Center.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiVAlign_Center.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "eUiVAlign_Center::Getter", - "category": "Constants" - } + "name": "e UiV Align_ Center" + }, + "methods": [ + { + "key": "GeteUiVAlign_Center", + "details": { + "name": "Gete UiV Align_ Center" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiVAlign_Top.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiVAlign_Top.names index d688313c21..8ad21a484f 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiVAlign_Top.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiVAlign_Top.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "eUiVAlign_Top::Getter", - "category": "Constants" - } + "name": "e UiV Align_ Top" + }, + "methods": [ + { + "key": "GeteUiVAlign_Top", + "details": { + "name": "Gete UiV Align_ Top" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiVerticalOrder_BottomToTop.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiVerticalOrder_BottomToTop.names index a9f3b06c9a..2cd82d2e5c 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiVerticalOrder_BottomToTop.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiVerticalOrder_BottomToTop.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "eUiVerticalOrder_BottomToTop::Getter", - "category": "Constants" - } + "name": "e Ui Vertical Order_ Bottom To Top" + }, + "methods": [ + { + "key": "GeteUiVerticalOrder_BottomToTop", + "details": { + "name": "Gete Ui Vertical Order_ Bottom To Top" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiVerticalOrder_TopToBottom.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiVerticalOrder_TopToBottom.names index 67532f62eb..d800d7f9ce 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiVerticalOrder_TopToBottom.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiVerticalOrder_TopToBottom.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "eUiVerticalOrder_TopToBottom::Getter", - "category": "Constants" - } + "name": "e Ui Vertical Order_ Top To Bottom" + }, + "methods": [ + { + "key": "GeteUiVerticalOrder_TopToBottom", + "details": { + "name": "Gete Ui Vertical Order_ Top To Bottom" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/g_ProfilerSystem.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/g_ProfilerSystem.names new file mode 100644 index 0000000000..077380fe1b --- /dev/null +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/g_ProfilerSystem.names @@ -0,0 +1,28 @@ +{ + "entries": [ + { + "key": "g_ProfilerSystem", + "context": "Constant", + "variant": "", + "details": { + "name": "g_ Profiler System" + }, + "methods": [ + { + "key": "Getg_ProfilerSystem", + "details": { + "name": "Getg_ Profiler System" + }, + "results": [ + { + "typeid": "{D671FB70-8B09-4C3A-96CD-06A339F3138E}", + "details": { + "name": "Profiler System Script Proxy" + } + } + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/g_SettingsRegistry.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/g_SettingsRegistry.names index a713b4f4fa..1e53727b85 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/g_SettingsRegistry.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/g_SettingsRegistry.names @@ -5,9 +5,24 @@ "context": "Constant", "variant": "", "details": { - "name": "g_SettingsRegistry::Getter", - "category": "Constants" - } + "name": "g_ Settings Registry" + }, + "methods": [ + { + "key": "Getg_SettingsRegistry", + "details": { + "name": "Getg_ Settings Registry" + }, + "results": [ + { + "typeid": "{795C80A0-D243-473B-972A-C32CA487BAA5}", + "details": { + "name": "Settings Registry Script Proxy" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Code/Editor/View/Widgets/ScriptCanvasNodePaletteDockWidget.cpp b/Gems/ScriptCanvas/Code/Editor/View/Widgets/ScriptCanvasNodePaletteDockWidget.cpp index 9b97d707d0..7ea4af9032 100644 --- a/Gems/ScriptCanvas/Code/Editor/View/Widgets/ScriptCanvasNodePaletteDockWidget.cpp +++ b/Gems/ScriptCanvas/Code/Editor/View/Widgets/ScriptCanvasNodePaletteDockWidget.cpp @@ -877,17 +877,14 @@ namespace ScriptCanvasEditor { QModelIndexList indexList = GetTreeView()->selectionModel()->selectedRows(); - if (indexList.size() == 1) + QSortFilterProxyModel* filterModel = static_cast(GetTreeView()->model()); + + for (const QModelIndex& index : indexList) { - QSortFilterProxyModel* filterModel = static_cast(GetTreeView()->model()); + QModelIndex sourceIndex = filterModel->mapToSource(index); - for (const QModelIndex& index : indexList) - { - QModelIndex sourceIndex = filterModel->mapToSource(index); - - GraphCanvas::NodePaletteTreeItem* nodePaletteItem = static_cast(sourceIndex.internalPointer()); - nodePaletteItem->GenerateTranslationData(); - } + GraphCanvas::NodePaletteTreeItem* nodePaletteItem = static_cast(sourceIndex.internalPointer()); + nodePaletteItem->GenerateTranslationData(); } } diff --git a/Gems/ScriptCanvas/Code/Tools/TranslationGeneration.cpp b/Gems/ScriptCanvas/Code/Tools/TranslationGeneration.cpp index c0a0f41e95..fdaca020b4 100644 --- a/Gems/ScriptCanvas/Code/Tools/TranslationGeneration.cpp +++ b/Gems/ScriptCanvas/Code/Tools/TranslationGeneration.cpp @@ -278,21 +278,33 @@ namespace ScriptCanvasEditorTools // Arguments (Input Slots) if (behaviorMethod->GetNumArguments() > 0) { - for (size_t argIndex = 0; argIndex < behaviorMethod->GetNumArguments(); ++argIndex) + size_t startIndex = behaviorMethod->HasResult() ? 1 : 0; + for (size_t argIndex = startIndex; argIndex < behaviorMethod->GetNumArguments(); ++argIndex) { const AZ::BehaviorParameter* parameter = behaviorMethod->GetArgument(argIndex); Argument argument; AZStd::string argumentKey = parameter->m_typeId.ToString(); - AZStd::string argumentName = parameter->m_name; - AZStd::string argumentDescription = ""; + AZStd::string argumentName; + AZStd::string argumentDescription; Helpers::GetTypeNameAndDescription(parameter->m_typeId, argumentName, argumentDescription); + const AZStd::string* argName = behaviorMethod->GetArgumentName(argIndex); + if (argName && !(*argName).empty()) + { + argumentName = *argName; + } + + const AZStd::string* argDesc = behaviorMethod->GetArgumentToolTip(argIndex); + if (argDesc && !(*argDesc).empty()) + { + argumentDescription = *argDesc; + } + argument.m_typeId = argumentKey; - argument.m_details.m_name = parameter->m_name; - argument.m_details.m_category = ""; + argument.m_details.m_name = argumentName; argument.m_details.m_tooltip = argumentDescription; SplitCamelCase(argument.m_details.m_name); @@ -837,7 +849,7 @@ namespace ScriptCanvasEditorTools Helpers::GetTypeNameAndDescription(parameter->m_typeId, argumentName, argumentDescription); argument.m_typeId = argumentKey; - argument.m_details.m_name = parameter->m_name; + argument.m_details.m_name = behaviorMethod->GetArgumentName(argIndex) ? *behaviorMethod->GetArgumentName(argIndex) : argumentName; argument.m_details.m_category = ""; argument.m_details.m_tooltip = argumentDescription; @@ -860,7 +872,7 @@ namespace ScriptCanvasEditorTools Helpers::GetTypeNameAndDescription(resultParameter->m_typeId, resultName, resultDescription); result.m_typeId = resultKey; - result.m_details.m_name = resultParameter->m_name; + result.m_details.m_name = behaviorMethod->GetArgumentName(0) ? *behaviorMethod->GetArgumentName(0) : resultName; result.m_details.m_tooltip = resultDescription; SplitCamelCase(result.m_details.m_name); @@ -885,6 +897,9 @@ namespace ScriptCanvasEditorTools { entry->m_key = className; entry->m_context = context; + + entry->m_details.m_name = className; + SplitCamelCase(entry->m_details.m_name); } if (behaviorProperty->m_getter) @@ -1298,6 +1313,7 @@ namespace ScriptCanvasEditorTools AZStd::regex splitRegex(R"(/[a-z]+|[0-9]+|(?:[A-Z][a-z]+)|(?:[A-Z]+(?=(?:[A-Z][a-z])|[^AZa-z]|[$\d\n]))/g)"); text = AZStd::regex_replace(text, splitRegex, " $&"); text = AZ::StringFunc::LStrip(text); + AZ::StringFunc::Replace(text, " ", " "); } namespace Helpers From 1f2385ca1adb422380b52252925f6eb397a2172d Mon Sep 17 00:00:00 2001 From: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com> Date: Mon, 22 Nov 2021 15:35:37 -0600 Subject: [PATCH 198/345] Added missing doc links. (#5841) Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com> --- .../EditorComponents/EditorTerrainHeightGradientListComponent.h | 2 +- .../EditorComponents/EditorTerrainLayerSpawnerComponent.h | 2 +- .../EditorTerrainSurfaceGradientListComponent.h | 2 +- .../EditorTerrainSurfaceMaterialsListComponent.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Gems/Terrain/Code/Source/EditorComponents/EditorTerrainHeightGradientListComponent.h b/Gems/Terrain/Code/Source/EditorComponents/EditorTerrainHeightGradientListComponent.h index 2433eda009..623d58f1bc 100644 --- a/Gems/Terrain/Code/Source/EditorComponents/EditorTerrainHeightGradientListComponent.h +++ b/Gems/Terrain/Code/Source/EditorComponents/EditorTerrainHeightGradientListComponent.h @@ -27,6 +27,6 @@ namespace Terrain static constexpr const char* const s_componentDescription = "Provides height data for a region to the terrain system"; static constexpr const char* const s_icon = "Editor/Icons/Components/TerrainHeight.svg"; static constexpr const char* const s_viewportIcon = "Editor/Icons/Components/Viewport/TerrainHeight.svg"; - static constexpr const char* const s_helpUrl = ""; + static constexpr const char* const s_helpUrl = "https://o3de.org/docs/user-guide/components/reference/terrain/height_gradient_list/"; }; } diff --git a/Gems/Terrain/Code/Source/EditorComponents/EditorTerrainLayerSpawnerComponent.h b/Gems/Terrain/Code/Source/EditorComponents/EditorTerrainLayerSpawnerComponent.h index 1eb3413d52..4018e0d377 100644 --- a/Gems/Terrain/Code/Source/EditorComponents/EditorTerrainLayerSpawnerComponent.h +++ b/Gems/Terrain/Code/Source/EditorComponents/EditorTerrainLayerSpawnerComponent.h @@ -27,6 +27,6 @@ namespace Terrain static constexpr const char* const s_componentDescription = "Defines a terrain region for use by the terrain system"; static constexpr const char* const s_icon = "Editor/Icons/Components/TerrainLayerSpawner.svg"; static constexpr const char* const s_viewportIcon = "Editor/Icons/Components/Viewport/TerrainLayerSpawner.svg"; - static constexpr const char* const s_helpUrl = ""; + static constexpr const char* const s_helpUrl = "https://o3de.org/docs/user-guide/components/reference/terrain/layer_spawner/"; }; } diff --git a/Gems/Terrain/Code/Source/EditorComponents/EditorTerrainSurfaceGradientListComponent.h b/Gems/Terrain/Code/Source/EditorComponents/EditorTerrainSurfaceGradientListComponent.h index 3cf9e7fc47..58cb776823 100644 --- a/Gems/Terrain/Code/Source/EditorComponents/EditorTerrainSurfaceGradientListComponent.h +++ b/Gems/Terrain/Code/Source/EditorComponents/EditorTerrainSurfaceGradientListComponent.h @@ -27,6 +27,6 @@ namespace Terrain static constexpr const char* const s_componentDescription = "Provides a mapping between gradients and surface tags for use by the terrain system."; static constexpr const char* const s_icon = "Editor/Icons/Components/TerrainSurfaceGradientList.svg"; static constexpr const char* const s_viewportIcon = "Editor/Icons/Components/Viewport/TerrainSurfaceGradientList.svg"; - static constexpr const char* const s_helpUrl = ""; + static constexpr const char* const s_helpUrl = "https://o3de.org/docs/user-guide/components/reference/terrain/surface-gradient-list/"; }; } diff --git a/Gems/Terrain/Code/Source/TerrainRenderer/EditorComponents/EditorTerrainSurfaceMaterialsListComponent.h b/Gems/Terrain/Code/Source/TerrainRenderer/EditorComponents/EditorTerrainSurfaceMaterialsListComponent.h index 7fe8c82522..973e85a6d2 100644 --- a/Gems/Terrain/Code/Source/TerrainRenderer/EditorComponents/EditorTerrainSurfaceMaterialsListComponent.h +++ b/Gems/Terrain/Code/Source/TerrainRenderer/EditorComponents/EditorTerrainSurfaceMaterialsListComponent.h @@ -27,6 +27,6 @@ namespace Terrain static constexpr const char* const s_componentDescription = "Provides a mapping between surface tags and render materials."; static constexpr const char* const s_icon = "Editor/Icons/Components/TerrainSurfaceMaterials.svg"; static constexpr const char* const s_viewportIcon = "Editor/Icons/Components/Viewport/TerrainSurfaceMaterials.svg"; - static constexpr const char* const s_helpUrl = ""; + static constexpr const char* const s_helpUrl = "https://o3de.org/docs/user-guide/components/reference/terrain/surface-material-list/"; }; } From 9513ab8d1ee530ebc7fb7fdd79db2a092d174b69 Mon Sep 17 00:00:00 2001 From: greerdv Date: Mon, 22 Nov 2021 21:54:00 +0000 Subject: [PATCH 199/345] switch back to vector for button ids since there may not be a 1 to 1 mapping to modes in future Signed-off-by: greerdv --- Gems/PhysX/Code/Editor/ColliderComponentMode.cpp | 1 + Gems/PhysX/Code/Editor/ColliderComponentMode.h | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Gems/PhysX/Code/Editor/ColliderComponentMode.cpp b/Gems/PhysX/Code/Editor/ColliderComponentMode.cpp index 76e687f26a..1f1cdd79fa 100644 --- a/Gems/PhysX/Code/Editor/ColliderComponentMode.cpp +++ b/Gems/PhysX/Code/Editor/ColliderComponentMode.cpp @@ -250,6 +250,7 @@ namespace PhysX &AzToolsFramework::ViewportUi::ViewportUiRequestBus::Events::CreateCluster, AzToolsFramework::ViewportUi::Alignment::TopLeft); // create and register the buttons + m_buttonIds.resize(static_cast(SubMode::NumModes)); m_buttonIds[static_cast(SubMode::Offset)] = RegisterClusterButton(m_modeSelectionClusterId, "Move"); m_buttonIds[static_cast(SubMode::Rotation)] = RegisterClusterButton(m_modeSelectionClusterId, "Rotate"); m_buttonIds[static_cast(SubMode::Dimensions)] = RegisterClusterButton(m_modeSelectionClusterId, "Scale"); diff --git a/Gems/PhysX/Code/Editor/ColliderComponentMode.h b/Gems/PhysX/Code/Editor/ColliderComponentMode.h index 4c968bb87d..a756075513 100644 --- a/Gems/PhysX/Code/Editor/ColliderComponentMode.h +++ b/Gems/PhysX/Code/Editor/ColliderComponentMode.h @@ -66,8 +66,7 @@ namespace PhysX AzToolsFramework::ViewportUi::ClusterId m_modeSelectionClusterId; //!< Viewport UI cluster for changing sub mode. - //! Ids for the Viewport UI buttons for each mode. - AZStd::fixed_vector< AzToolsFramework::ViewportUi::ButtonId, static_cast(SubMode::NumModes)> m_buttonIds; + AZStd::vector m_buttonIds; //!< Ids for the Viewport UI buttons for each mode. AZ::Event::Handler m_modeSelectionHandler; //!< Event handler for sub mode changes. From be2a32d68d3d9d47329804416b211acb4c578e56 Mon Sep 17 00:00:00 2001 From: Steve Pham <82231385+spham-amzn@users.noreply.github.com> Date: Mon, 22 Nov 2021 14:19:59 -0800 Subject: [PATCH 200/345] Fix unused variable errors (#5843) Signed-off-by: Steve Pham <82231385+spham-amzn@users.noreply.github.com> --- .../Code/Source/BuilderSettings/BuilderSettingManager.cpp | 2 +- .../Code/Source/Platform/Linux/InitializeEmbeddedPyside2.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/BuilderSettings/BuilderSettingManager.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/BuilderSettings/BuilderSettingManager.cpp index 487c659ade..1ae406c6fd 100644 --- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/BuilderSettings/BuilderSettingManager.cpp +++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/BuilderSettings/BuilderSettingManager.cpp @@ -52,7 +52,7 @@ namespace ImageProcessingAtom namespace { - static constexpr const char* const LogWindow = "Image Processing"; + [[maybe_unused]] static constexpr const char* const LogWindow = "Image Processing"; } #if defined(AZ_TOOLS_EXPAND_FOR_RESTRICTED_PLATFORMS) diff --git a/Gems/QtForPython/Code/Source/Platform/Linux/InitializeEmbeddedPyside2.h b/Gems/QtForPython/Code/Source/Platform/Linux/InitializeEmbeddedPyside2.h index f27b54810f..094a4f8548 100644 --- a/Gems/QtForPython/Code/Source/Platform/Linux/InitializeEmbeddedPyside2.h +++ b/Gems/QtForPython/Code/Source/Platform/Linux/InitializeEmbeddedPyside2.h @@ -38,7 +38,7 @@ namespace QtForPython void* moduleHandle = dlopen(moduleToLoad, RTLD_NOW | RTLD_GLOBAL); if (!moduleHandle) { - const char* loadError = dlerror(); + [[maybe_unused]] const char* loadError = dlerror(); AZ_Error("QtForPython", false, "Unable to load python library %s for Pyside2: %s", moduleToLoad, loadError ? loadError : "Unknown Error"); } From ccb5336843d4b31cb14b953ba8f3da7d3f21e5c0 Mon Sep 17 00:00:00 2001 From: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> Date: Mon, 22 Nov 2021 14:21:02 -0800 Subject: [PATCH 201/345] Reading 3rdparty from manifest if it exists (#5840) * Reading 3rdparty from manifest if it exists, removnig the need to pass it across the board, updated jenkins paths so 3rdparty is put into the workspace Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> * Removes unneded space Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> * Changes how we get the NDK folder Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> * needs delayed expansion Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> * Ninja is in the path, is not needed for Android Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> --- .../EditorPythonTestTools/README.txt | 2 +- .../Code/Tools/ResourceMappingTool/README.md | 2 +- README.md | 4 +-- cmake/3rdParty.cmake | 22 ++++++++++++++++ .../Platform/Android/Toolchain_android.cmake | 8 ++++-- .../build/Platform/Android/build_config.json | 10 ++++---- .../build/Platform/Android/gradle_windows.cmd | 25 +++---------------- scripts/build/Platform/Android/pipeline.json | 3 ++- scripts/build/Platform/Linux/build_linux.sh | 2 +- scripts/build/Platform/Linux/pipeline.json | 2 +- scripts/build/Platform/Mac/build_mac.sh | 2 +- .../build/Platform/Windows/build_windows.cmd | 2 +- scripts/build/Platform/Windows/pipeline.json | 2 +- scripts/build/Platform/iOS/build_ios_test.sh | 2 +- scripts/build/Platform/iOS/pipeline.json | 2 +- scripts/o3de/README.txt | 2 +- 16 files changed, 51 insertions(+), 41 deletions(-) diff --git a/AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/README.txt b/AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/README.txt index 90afee39bc..642d7279a4 100644 --- a/AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/README.txt +++ b/AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/README.txt @@ -28,7 +28,7 @@ Assuming CMake is already setup on your operating system, below are some sample cd /path/to/od3e/ mkdir windows_vs2019 cd windows_vs2019 - cmake .. -G "Visual Studio 16 2019" -A x64 -T host=x64 -DLY_3RDPARTY_PATH="%3RDPARTYPATH%" -DLY_PROJECTS=AutomatedTesting + cmake .. -G "Visual Studio 16 2019" -DLY_PROJECTS=AutomatedTesting To manually install the project in development mode using your own installed Python interpreter: cd /path/to/od3e/AutomatedTesting/Gem/PythonTests/EditorPythonTestTools diff --git a/Gems/AWSCore/Code/Tools/ResourceMappingTool/README.md b/Gems/AWSCore/Code/Tools/ResourceMappingTool/README.md index e09ecc281f..38b7c48d2f 100644 --- a/Gems/AWSCore/Code/Tools/ResourceMappingTool/README.md +++ b/Gems/AWSCore/Code/Tools/ResourceMappingTool/README.md @@ -17,7 +17,7 @@ Or follow **AWS CLI** configuration which can be reused by boto3 lib: 1. In order to use engine python environment, it requires to link Qt binaries for this tool. Follow cmake instructions to configure your project, for example: ``` - $ cmake -B -S . -G "Visual Studio 16 2019" -DLY_3RDPARTY_PATH= -DLY_PROJECTS= + $ cmake -B -S . -G "Visual Studio 16 2019" -DLY_PROJECTS= ``` 2. At this point, double check engine python environment gets setup under */python/runtime* directory diff --git a/README.md b/README.md index 6f500a3dd3..11fec028bc 100644 --- a/README.md +++ b/README.md @@ -102,12 +102,12 @@ For more details on the steps above, refer to [Setting up O3DE from GitHub](http 1. Configure a solution for your project. ``` - cmake -B -S -G "Visual Studio 16" -DLY_3RDPARTY_PATH=<3rdParty cache path> + cmake -B -S -G "Visual Studio 16" ``` Example: ``` - cmake -B C:\my-project\build\windows_vs2019 -S C:\my-project -G "Visual Studio 16" -DLY_3RDPARTY_PATH=C:\o3de-packages + cmake -B C:\my-project\build\windows_vs2019 -S C:\my-project -G "Visual Studio 16" ``` > Note: Do not use trailing slashes for the <3rdParty cache path>. diff --git a/cmake/3rdParty.cmake b/cmake/3rdParty.cmake index 4b7f929279..7d98c3ea3e 100644 --- a/cmake/3rdParty.cmake +++ b/cmake/3rdParty.cmake @@ -25,6 +25,15 @@ define_property(TARGET PROPERTY LY_SYSTEM_LIBRARY # \arg:output_third_party_path name of variable to set the default project directory into # It defaults to the ~/.o3de/3rdParty directory function(get_default_third_party_folder output_third_party_path) + + # 1. Highest priority, cache variable, that will override the value of any of the cases below + # 2. if defined in an env variable, take it from there + if($ENV{LY_3RDPARTY_PATH}) + set(${output_third_party_path} $ENV{LY_3RDPARTY_PATH} PARENT_SCOPE) + return() + endif() + + # 3. If defined in the o3de_manifest.json, take it from there cmake_path(SET home_directory "$ENV{USERPROFILE}") # Windows if(NOT EXISTS ${home_directory}) cmake_path(SET home_directory "$ENV{HOME}") # Unix @@ -33,7 +42,20 @@ function(get_default_third_party_folder output_third_party_path) endif() endif() + set(manifest_path ${home_directory}/.o3de/o3de_manifest.json) + if(EXISTS ${manifest_path}) + file(READ ${manifest_path} manifest_json) + string(JSON default_third_party_folder ERROR_VARIABLE json_error GET ${manifest_json} default_third_party_folder) + if(NOT json_error) + set_property(DIRECTORY APPEND PROPERTY CMAKE_CONFIGURE_DEPENDS ${manifest_path}) + set(${output_third_party_path} ${default_third_party_folder} PARENT_SCOPE) + return() + endif() + endif() + + # 4. Lowest priority, use the home directory as the location for 3rdparty set(${output_third_party_path} ${home_directory}/.o3de/3rdParty PARENT_SCOPE) + endfunction() get_default_third_party_folder(o3de_default_third_party_path) diff --git a/cmake/Platform/Android/Toolchain_android.cmake b/cmake/Platform/Android/Toolchain_android.cmake index aff5c6faf8..b5c4a56fd6 100644 --- a/cmake/Platform/Android/Toolchain_android.cmake +++ b/cmake/Platform/Android/Toolchain_android.cmake @@ -11,10 +11,14 @@ if(LY_TOOLCHAIN_NDK_API_LEVEL) endif() # Verify that the NDK environment is set and points to the support NDK - +if(NOT ${LY_NDK_DIR}) + if($ENV{LY_NDK_DIR}) + set(LY_NDK_DIR $ENV{LY_NDK_DIR}) + endif() +endif() file(TO_CMAKE_PATH "${LY_NDK_DIR}" LY_NDK_DIR) if(NOT LY_NDK_DIR) - message(FATAL_ERROR "Environment var for NDK is empty. Could not find the NDK installation folder") + message(FATAL_ERROR "Environment and cache var for NDK is empty. Could not find the NDK installation folder") endif() set(LY_ANDROID_NDK_TOOLCHAIN ${LY_NDK_DIR}/build/cmake/android.toolchain.cmake) diff --git a/scripts/build/Platform/Android/build_config.json b/scripts/build/Platform/Android/build_config.json index 5e2da44a3c..dbdafcf97d 100644 --- a/scripts/build/Platform/Android/build_config.json +++ b/scripts/build/Platform/Android/build_config.json @@ -35,7 +35,7 @@ "PARAMETERS": { "CONFIGURATION":"debug", "OUTPUT_DIRECTORY":"build\\android", - "CMAKE_OPTIONS":"-G \"Ninja Multi-Config\" -DCMAKE_TOOLCHAIN_FILE=cmake\\Platform\\Android\\Toolchain_android.cmake -DANDROID_ABI=arm64-v8a -DANDROID_ARM_MODE=arm -DANDROID_ARM_NEON=FALSE -DANDROID_NATIVE_API_LEVEL=21 -DLY_NDK_DIR=\"!LY_3RDPARTY_PATH!\\android-ndk\\r21d\"", + "CMAKE_OPTIONS":"-G \"Ninja Multi-Config\" -DCMAKE_TOOLCHAIN_FILE=cmake\\Platform\\Android\\Toolchain_android.cmake -DANDROID_ABI=arm64-v8a -DANDROID_ARM_MODE=arm -DANDROID_ARM_NEON=FALSE -DANDROID_NATIVE_API_LEVEL=21 -DLY_NDK_DIR=\"!LY_NDK_DIR!\"", "CMAKE_LY_PROJECTS":"AutomatedTesting", "CMAKE_TARGET":"all", "CMAKE_BUILD_ARGS":"-j!NUMBER_OF_PROCESSORS!" @@ -60,7 +60,7 @@ "PARAMETERS": { "CONFIGURATION":"profile", "OUTPUT_DIRECTORY":"build\\android", - "CMAKE_OPTIONS":"-G \"Ninja Multi-Config\" -DCMAKE_TOOLCHAIN_FILE=cmake\\Platform\\Android\\Toolchain_android.cmake -DANDROID_ABI=arm64-v8a -DANDROID_ARM_MODE=arm -DANDROID_ARM_NEON=FALSE -DANDROID_NATIVE_API_LEVEL=21 -DLY_NDK_DIR=\"!LY_3RDPARTY_PATH!\\android-ndk\\r21d\"", + "CMAKE_OPTIONS":"-G \"Ninja Multi-Config\" -DCMAKE_TOOLCHAIN_FILE=cmake\\Platform\\Android\\Toolchain_android.cmake -DANDROID_ABI=arm64-v8a -DANDROID_ARM_MODE=arm -DANDROID_ARM_NEON=FALSE -DANDROID_NATIVE_API_LEVEL=21 -DLY_NDK_DIR=\"!LY_NDK_DIR!\"", "CMAKE_LY_PROJECTS":"AutomatedTesting", "CMAKE_TARGET":"all", "CMAKE_BUILD_ARGS":"-j!NUMBER_OF_PROCESSORS!" @@ -76,7 +76,7 @@ "PARAMETERS": { "CONFIGURATION":"profile", "OUTPUT_DIRECTORY":"build\\android", - "CMAKE_OPTIONS":"-G \"Ninja Multi-Config\" -DCMAKE_TOOLCHAIN_FILE=cmake\\Platform\\Android\\Toolchain_android.cmake -DANDROID_ABI=arm64-v8a -DANDROID_ARM_MODE=arm -DANDROID_ARM_NEON=FALSE -DANDROID_NATIVE_API_LEVEL=21 -DLY_NDK_DIR=\"!LY_3RDPARTY_PATH!\\android-ndk\\r21d\" -DLY_UNITY_BUILD=FALSE", + "CMAKE_OPTIONS":"-G \"Ninja Multi-Config\" -DCMAKE_TOOLCHAIN_FILE=cmake\\Platform\\Android\\Toolchain_android.cmake -DANDROID_ABI=arm64-v8a -DANDROID_ARM_MODE=arm -DANDROID_ARM_NEON=FALSE -DANDROID_NATIVE_API_LEVEL=21 -DLY_NDK_DIR=\"!LY_NDK_DIR!\" -DLY_UNITY_BUILD=FALSE", "CMAKE_LY_PROJECTS":"AutomatedTesting", "CMAKE_TARGET":"all", "CMAKE_BUILD_ARGS":"-j!NUMBER_OF_PROCESSORS!" @@ -112,7 +112,7 @@ "PARAMETERS": { "CONFIGURATION":"release", "OUTPUT_DIRECTORY":"build\\android", - "CMAKE_OPTIONS":"-G \"Ninja Multi-Config\" -DCMAKE_TOOLCHAIN_FILE=cmake\\Platform\\Android\\Toolchain_android.cmake -DANDROID_ABI=arm64-v8a -DANDROID_ARM_MODE=arm -DANDROID_ARM_NEON=FALSE -DANDROID_NATIVE_API_LEVEL=21 -DLY_NDK_DIR=\"!LY_3RDPARTY_PATH!\\android-ndk\\r21d\"", + "CMAKE_OPTIONS":"-G \"Ninja Multi-Config\" -DCMAKE_TOOLCHAIN_FILE=cmake\\Platform\\Android\\Toolchain_android.cmake -DANDROID_ABI=arm64-v8a -DANDROID_ARM_MODE=arm -DANDROID_ARM_NEON=FALSE -DANDROID_NATIVE_API_LEVEL=21 -DLY_NDK_DIR=\"!LY_NDK_DIR!\"", "CMAKE_LY_PROJECTS":"AutomatedTesting", "CMAKE_TARGET":"all", "CMAKE_BUILD_ARGS":"-j!NUMBER_OF_PROCESSORS!" @@ -128,7 +128,7 @@ "PARAMETERS": { "CONFIGURATION":"release", "OUTPUT_DIRECTORY":"build\\mono_android", - "CMAKE_OPTIONS":"-G \"Ninja Multi-Config\" -DCMAKE_TOOLCHAIN_FILE=cmake\\Platform\\Android\\Toolchain_android.cmake -DANDROID_ABI=arm64-v8a -DANDROID_ARM_MODE=arm -DANDROID_ARM_NEON=FALSE -DANDROID_NATIVE_API_LEVEL=21 -DLY_NDK_DIR=\"!LY_3RDPARTY_PATH!\\android-ndk\\r21d\" -DLY_MONOLITHIC_GAME=TRUE", + "CMAKE_OPTIONS":"-G \"Ninja Multi-Config\" -DCMAKE_TOOLCHAIN_FILE=cmake\\Platform\\Android\\Toolchain_android.cmake -DANDROID_ABI=arm64-v8a -DANDROID_ARM_MODE=arm -DANDROID_ARM_NEON=FALSE -DANDROID_NATIVE_API_LEVEL=21 -DLY_NDK_DIR=\"!LY_NDK_DIR!\" -DLY_MONOLITHIC_GAME=TRUE", "CMAKE_LY_PROJECTS":"AutomatedTesting", "CMAKE_TARGET":"all", "CMAKE_BUILD_ARGS":"-j!NUMBER_OF_PROCESSORS!" diff --git a/scripts/build/Platform/Android/gradle_windows.cmd b/scripts/build/Platform/Android/gradle_windows.cmd index b353a8f641..bb98799444 100644 --- a/scripts/build/Platform/Android/gradle_windows.cmd +++ b/scripts/build/Platform/Android/gradle_windows.cmd @@ -23,23 +23,6 @@ IF NOT EXIST "%GRADLE_BUILD_HOME%" ( GOTO :error ) -IF NOT EXIST "%LY_NINJA_PATH%" ( - SET LY_NINJA_PATH=%LY_3RDPARTY_PATH%/ninja/1.10.1/Windows -) -IF NOT EXIST "%LY_NINJA_PATH%" ( - ECHO [ci_build] FAIL: LY_NINJA_PATH=%LY_NINJA_PATH% - GOTO :error -) - -REM Make sure that Ninja in the Path variable -ECHO Testing ninja on the current path variable -call ninja --version -IF %ERRORLEVEL%==0 GOTO ninja_on_path -ECHO Ninja wasnt in the call path, add the value set by LY_NINJA_PATH -SET PATH=%PATH%;%LY_NINJA_PATH% - -:ninja_on_path - IF NOT "%ANDROID_GRADLE_PLUGIN%" == "" ( set ANDROID_GRADLE_PLUGIN_OPTION=--gradle-plugin-version=%ANDROID_GRADLE_PLUGIN% ) @@ -132,11 +115,11 @@ IF "%GENERATE_SIGNED_APK%"=="true" ( ECHO Using keystore file at %CI_ANDROID_KEYSTORE_FILE_ABS% ) - ECHO [ci_build] %PYTHON% cmake\Tools\Platform\Android\generate_android_project.py --engine-root=. --build-dir=%OUTPUT_DIRECTORY% -g %GAME_PROJECT% --gradle-install-path=%GRADLE_BUILD_HOME% --ninja-install-path=%LY_NINJA_PATH% --third-party-path=%LY_3RDPARTY_PATH% --enable-unity-build --android-sdk-path=%ANDROID_HOME% %ANDROID_GRADLE_PLUGIN_OPTION% --signconfig-store-file %CI_ANDROID_KEYSTORE_FILE_ABS% --signconfig-store-password %CI_ANDROID_KEYSTORE_PASSWORD% --signconfig-key-alias %CI_ANDROID_KEYSTORE_ALIAS% --signconfig-key-password %CI_ANDROID_KEYSTORE_PASSWORD% %ADDITIONAL_GENERATE_ARGS% --overwrite-existing - CALL %PYTHON% cmake\Tools\Platform\Android\generate_android_project.py --engine-root=. --build-dir=%OUTPUT_DIRECTORY% -g %GAME_PROJECT% --gradle-install-path=%GRADLE_BUILD_HOME% --ninja-install-path=%LY_NINJA_PATH% --third-party-path=%LY_3RDPARTY_PATH% --enable-unity-build --android-sdk-path=%ANDROID_HOME% %ANDROID_GRADLE_PLUGIN_OPTION% --signconfig-store-file %CI_ANDROID_KEYSTORE_FILE_ABS% --signconfig-store-password %CI_ANDROID_KEYSTORE_PASSWORD% --signconfig-key-alias %CI_ANDROID_KEYSTORE_ALIAS% --signconfig-key-password %CI_ANDROID_KEYSTORE_PASSWORD% %ADDITIONAL_GENERATE_ARGS% --overwrite-existing + ECHO [ci_build] %PYTHON% cmake\Tools\Platform\Android\generate_android_project.py --engine-root=. --build-dir=%OUTPUT_DIRECTORY% -g %GAME_PROJECT% --gradle-install-path=%GRADLE_BUILD_HOME% --third-party-path=%LY_3RDPARTY_PATH% --enable-unity-build --android-sdk-path=%ANDROID_HOME% %ANDROID_GRADLE_PLUGIN_OPTION% --signconfig-store-file %CI_ANDROID_KEYSTORE_FILE_ABS% --signconfig-store-password %CI_ANDROID_KEYSTORE_PASSWORD% --signconfig-key-alias %CI_ANDROID_KEYSTORE_ALIAS% --signconfig-key-password %CI_ANDROID_KEYSTORE_PASSWORD% %ADDITIONAL_GENERATE_ARGS% --overwrite-existing + CALL %PYTHON% cmake\Tools\Platform\Android\generate_android_project.py --engine-root=. --build-dir=%OUTPUT_DIRECTORY% -g %GAME_PROJECT% --gradle-install-path=%GRADLE_BUILD_HOME% --third-party-path=%LY_3RDPARTY_PATH% --enable-unity-build --android-sdk-path=%ANDROID_HOME% %ANDROID_GRADLE_PLUGIN_OPTION% --signconfig-store-file %CI_ANDROID_KEYSTORE_FILE_ABS% --signconfig-store-password %CI_ANDROID_KEYSTORE_PASSWORD% --signconfig-key-alias %CI_ANDROID_KEYSTORE_ALIAS% --signconfig-key-password %CI_ANDROID_KEYSTORE_PASSWORD% %ADDITIONAL_GENERATE_ARGS% --overwrite-existing ) ELSE ( - ECHO [ci_build] %PYTHON% cmake\Tools\Platform\Android\generate_android_project.py --engine-root=. --build-dir=%OUTPUT_DIRECTORY% -g %GAME_PROJECT% %GRADLE_OVERRIDE_OPTION% --ninja-install-path=%LY_NINJA_PATH% --third-party-path=%LY_3RDPARTY_PATH% --enable-unity-build %ANDROID_GRADLE_PLUGIN_OPTION% --android-sdk-path=%ANDROID_HOME% %ADDITIONAL_GENERATE_ARGS% --overwrite-existing - CALL %PYTHON% cmake\Tools\Platform\Android\generate_android_project.py --engine-root=. --build-dir=%OUTPUT_DIRECTORY% -g %GAME_PROJECT% --gradle-install-path=%GRADLE_BUILD_HOME% --ninja-install-path=%LY_NINJA_PATH% --third-party-path=%LY_3RDPARTY_PATH% --enable-unity-build %ANDROID_GRADLE_PLUGIN_OPTION% --android-sdk-path=%ANDROID_HOME% %ADDITIONAL_GENERATE_ARGS% --overwrite-existing + ECHO [ci_build] %PYTHON% cmake\Tools\Platform\Android\generate_android_project.py --engine-root=. --build-dir=%OUTPUT_DIRECTORY% -g %GAME_PROJECT% %GRADLE_OVERRIDE_OPTION% --third-party-path=%LY_3RDPARTY_PATH% --enable-unity-build %ANDROID_GRADLE_PLUGIN_OPTION% --android-sdk-path=%ANDROID_HOME% %ADDITIONAL_GENERATE_ARGS% --overwrite-existing + CALL %PYTHON% cmake\Tools\Platform\Android\generate_android_project.py --engine-root=. --build-dir=%OUTPUT_DIRECTORY% -g %GAME_PROJECT% --gradle-install-path=%GRADLE_BUILD_HOME% --third-party-path=%LY_3RDPARTY_PATH% --enable-unity-build %ANDROID_GRADLE_PLUGIN_OPTION% --android-sdk-path=%ANDROID_HOME% %ADDITIONAL_GENERATE_ARGS% --overwrite-existing ) REM Validate the android project generation diff --git a/scripts/build/Platform/Android/pipeline.json b/scripts/build/Platform/Android/pipeline.json index 551374a027..230d5d3477 100644 --- a/scripts/build/Platform/Android/pipeline.json +++ b/scripts/build/Platform/Android/pipeline.json @@ -2,7 +2,8 @@ "ENV": { "GRADLE_HOME": "C:/Gradle/gradle-7.0", "NODE_LABEL": "windows-b3c8994f1", - "LY_3RDPARTY_PATH": "C:/ly/3rdParty", + "LY_3RDPARTY_PATH": "D:/workspace/3rdParty", + "LY_NDK_DIR": "C:/ly/3rdParty/android-ndk/r21d", "TIMEOUT": 30, "WORKSPACE": "D:/workspace", "MOUNT_VOLUME": true diff --git a/scripts/build/Platform/Linux/build_linux.sh b/scripts/build/Platform/Linux/build_linux.sh index c14d4b5073..328445738b 100755 --- a/scripts/build/Platform/Linux/build_linux.sh +++ b/scripts/build/Platform/Linux/build_linux.sh @@ -17,7 +17,7 @@ SOURCE_DIRECTORY=${PWD} pushd $OUTPUT_DIRECTORY LAST_CONFIGURE_CMD_FILE=ci_last_configure_cmd.txt -CONFIGURE_CMD="cmake ${SOURCE_DIRECTORY} ${CMAKE_OPTIONS} ${EXTRA_CMAKE_OPTIONS} -DLY_3RDPARTY_PATH=${LY_3RDPARTY_PATH}" +CONFIGURE_CMD="cmake ${SOURCE_DIRECTORY} ${CMAKE_OPTIONS} ${EXTRA_CMAKE_OPTIONS}" if [[ -n "$CMAKE_LY_PROJECTS" ]]; then CONFIGURE_CMD="${CONFIGURE_CMD} -DLY_PROJECTS='${CMAKE_LY_PROJECTS}'" fi diff --git a/scripts/build/Platform/Linux/pipeline.json b/scripts/build/Platform/Linux/pipeline.json index 7f16ec6ab5..f44ed5f9de 100644 --- a/scripts/build/Platform/Linux/pipeline.json +++ b/scripts/build/Platform/Linux/pipeline.json @@ -1,7 +1,7 @@ { "ENV": { "NODE_LABEL": "linux-707531fc7", - "LY_3RDPARTY_PATH": "/home/lybuilder/ly/workspace/3rdParty", + "LY_3RDPARTY_PATH": "/data/workspace/3rdParty", "TIMEOUT": 30, "WORKSPACE": "/data/workspace", "MOUNT_VOLUME": true diff --git a/scripts/build/Platform/Mac/build_mac.sh b/scripts/build/Platform/Mac/build_mac.sh index 169e91c24f..a0401f664c 100755 --- a/scripts/build/Platform/Mac/build_mac.sh +++ b/scripts/build/Platform/Mac/build_mac.sh @@ -17,7 +17,7 @@ SOURCE_DIRECTORY=${PWD} pushd $OUTPUT_DIRECTORY LAST_CONFIGURE_CMD_FILE=ci_last_configure_cmd.txt -CONFIGURE_CMD="cmake ${SOURCE_DIRECTORY} ${CMAKE_OPTIONS} ${EXTRA_CMAKE_OPTIONS} -DLY_3RDPARTY_PATH=${LY_3RDPARTY_PATH}" +CONFIGURE_CMD="cmake ${SOURCE_DIRECTORY} ${CMAKE_OPTIONS} ${EXTRA_CMAKE_OPTIONS}" if [[ -n "$CMAKE_LY_PROJECTS" ]]; then CONFIGURE_CMD="${CONFIGURE_CMD} -DLY_PROJECTS='${CMAKE_LY_PROJECTS}'" fi diff --git a/scripts/build/Platform/Windows/build_windows.cmd b/scripts/build/Platform/Windows/build_windows.cmd index 6c3ce91397..9e9b124adb 100644 --- a/scripts/build/Platform/Windows/build_windows.cmd +++ b/scripts/build/Platform/Windows/build_windows.cmd @@ -29,7 +29,7 @@ REM Compute half the amount of processors so some jobs can run SET /a HALF_PROCESSORS = NUMBER_OF_PROCESSORS / 2 SET LAST_CONFIGURE_CMD_FILE=ci_last_configure_cmd.txt -SET CONFIGURE_CMD=cmake %SOURCE_DIRECTORY% %CMAKE_OPTIONS% %EXTRA_CMAKE_OPTIONS% -DLY_3RDPARTY_PATH="%LY_3RDPARTY_PATH%" +SET CONFIGURE_CMD=cmake %SOURCE_DIRECTORY% %CMAKE_OPTIONS% %EXTRA_CMAKE_OPTIONS% IF NOT "%CMAKE_LY_PROJECTS%"=="" ( SET CONFIGURE_CMD=!CONFIGURE_CMD! -DLY_PROJECTS="%CMAKE_LY_PROJECTS%" ) diff --git a/scripts/build/Platform/Windows/pipeline.json b/scripts/build/Platform/Windows/pipeline.json index 6be55ec82d..b18a1e8c63 100644 --- a/scripts/build/Platform/Windows/pipeline.json +++ b/scripts/build/Platform/Windows/pipeline.json @@ -1,7 +1,7 @@ { "ENV": { "NODE_LABEL": "windows-b3c8994f1", - "LY_3RDPARTY_PATH": "C:/ly/3rdParty", + "LY_3RDPARTY_PATH": "D:/workspace/3rdParty", "TIMEOUT": 30, "WORKSPACE": "D:/workspace", "MOUNT_VOLUME": true diff --git a/scripts/build/Platform/iOS/build_ios_test.sh b/scripts/build/Platform/iOS/build_ios_test.sh index b683948e72..7869b900db 100755 --- a/scripts/build/Platform/iOS/build_ios_test.sh +++ b/scripts/build/Platform/iOS/build_ios_test.sh @@ -19,7 +19,7 @@ SOURCE_DIRECTORY=${PWD} ECHO Configuring for iOS Testing LAST_CONFIGURE_CMD_FILE=ci_last_configure_cmd.txt -CONFIGURE_CMD="cmake -B ${OUTPUT_DIRECTORY} ${SOURCE_DIRECTORY} ${CMAKE_OPTIONS} ${EXTRA_CMAKE_OPTIONS} -DLY_3RDPARTY_PATH=${LY_3RDPARTY_PATH}" +CONFIGURE_CMD="cmake -B ${OUTPUT_DIRECTORY} ${SOURCE_DIRECTORY} ${CMAKE_OPTIONS} ${EXTRA_CMAKE_OPTIONS}" if [[ ! -e "CMakeCache.txt" ]]; then echo [ci_build] First run, generating RUN_CONFIGURE=1 diff --git a/scripts/build/Platform/iOS/pipeline.json b/scripts/build/Platform/iOS/pipeline.json index e8cea0f06d..a5e2ff710e 100644 --- a/scripts/build/Platform/iOS/pipeline.json +++ b/scripts/build/Platform/iOS/pipeline.json @@ -1,7 +1,7 @@ { "ENV": { "NODE_LABEL": "mac-bigsur-2fc3a22", - "LY_3RDPARTY_PATH": "/Users/lybuilder/3rdParty", + "LY_3RDPARTY_PATH": "/Users/lybuilder/workspace/3rdParty", "TIMEOUT": 30, "WORKSPACE": "/Users/lybuilder/workspace", "MOUNT_VOLUME": false diff --git a/scripts/o3de/README.txt b/scripts/o3de/README.txt index 07d23fab82..ded52bb264 100644 --- a/scripts/o3de/README.txt +++ b/scripts/o3de/README.txt @@ -23,7 +23,7 @@ INSTALL It is recommended to set up these these tools with O3DE's CMake build commands. Assuming CMake is already setup on your operating system, below are some sample build commands: cd /path/to/od3e/ - cmake -B windows_vs2019 -S . -G"Visual Studio 16" -DLY_3RDPARTY_PATH="%LY_3RDPARTY_PATH%" + cmake -B windows_vs2019 -S . -G"Visual Studio 16" To manually install the project in development mode using your own installed Python interpreter: cd /path/to/od3e/o3de From ba329378677590cdad0019c476cccccb5dec102f Mon Sep 17 00:00:00 2001 From: Steve Pham <82231385+spham-amzn@users.noreply.github.com> Date: Mon, 22 Nov 2021 15:32:54 -0800 Subject: [PATCH 202/345] Cherry pick release unused warning error into Stabilization/2110 (#5845) * Fixed unused variable warning in Release configuration in Linux. (#5830) Signed-off-by: moraaar * Fix unused variable errors (#5843) Signed-off-by: Steve Pham <82231385+spham-amzn@users.noreply.github.com> Co-authored-by: moraaar --- .../Linux/AzToolsFramework/API/PythonLoader_Linux.cpp | 6 +++--- .../Code/Source/BuilderSettings/BuilderSettingManager.cpp | 2 +- .../Code/Source/Platform/Linux/InitializeEmbeddedPyside2.h | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Code/Framework/AzToolsFramework/Platform/Linux/AzToolsFramework/API/PythonLoader_Linux.cpp b/Code/Framework/AzToolsFramework/Platform/Linux/AzToolsFramework/API/PythonLoader_Linux.cpp index 76fa36a048..351cf69c15 100644 --- a/Code/Framework/AzToolsFramework/Platform/Linux/AzToolsFramework/API/PythonLoader_Linux.cpp +++ b/Code/Framework/AzToolsFramework/Platform/Linux/AzToolsFramework/API/PythonLoader_Linux.cpp @@ -15,10 +15,10 @@ namespace AzToolsFramework::EmbeddedPython PythonLoader::PythonLoader() { constexpr char libPythonName[] = "libpython3.7m.so.1.0"; - if (m_embeddedLibPythonHandle = dlopen(libPythonName, RTLD_NOW | RTLD_GLOBAL); - m_embeddedLibPythonHandle == nullptr) + m_embeddedLibPythonHandle = dlopen(libPythonName, RTLD_NOW | RTLD_GLOBAL); + if (m_embeddedLibPythonHandle == nullptr) { - char* err = dlerror(); + [[maybe_unused]] const char* err = dlerror(); AZ_Error("PythonLoader", false, "Failed to load %s with error: %s\n", libPythonName, err ? err : "Unknown Error"); } } diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/BuilderSettings/BuilderSettingManager.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/BuilderSettings/BuilderSettingManager.cpp index 487c659ade..1ae406c6fd 100644 --- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/BuilderSettings/BuilderSettingManager.cpp +++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/BuilderSettings/BuilderSettingManager.cpp @@ -52,7 +52,7 @@ namespace ImageProcessingAtom namespace { - static constexpr const char* const LogWindow = "Image Processing"; + [[maybe_unused]] static constexpr const char* const LogWindow = "Image Processing"; } #if defined(AZ_TOOLS_EXPAND_FOR_RESTRICTED_PLATFORMS) diff --git a/Gems/QtForPython/Code/Source/Platform/Linux/InitializeEmbeddedPyside2.h b/Gems/QtForPython/Code/Source/Platform/Linux/InitializeEmbeddedPyside2.h index f27b54810f..094a4f8548 100644 --- a/Gems/QtForPython/Code/Source/Platform/Linux/InitializeEmbeddedPyside2.h +++ b/Gems/QtForPython/Code/Source/Platform/Linux/InitializeEmbeddedPyside2.h @@ -38,7 +38,7 @@ namespace QtForPython void* moduleHandle = dlopen(moduleToLoad, RTLD_NOW | RTLD_GLOBAL); if (!moduleHandle) { - const char* loadError = dlerror(); + [[maybe_unused]] const char* loadError = dlerror(); AZ_Error("QtForPython", false, "Unable to load python library %s for Pyside2: %s", moduleToLoad, loadError ? loadError : "Unknown Error"); } From b6ce643a7429844e857ac10b4745ea5f3fdbcf50 Mon Sep 17 00:00:00 2001 From: lsemp3d <58790905+lsemp3d@users.noreply.github.com> Date: Mon, 22 Nov 2021 16:30:09 -0800 Subject: [PATCH 203/345] Categorized all constants Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com> --- .../TranslationAssets/Classes/AxisType.names | 3 +- .../EBus/Handlers/ActorNotificationBus.names | 18 +- ...Audio System Component Notifications.names | 4 +- .../EBus/Senders/DepthOfFieldRequestBus.names | 367 +++++++++--------- .../Senders/DirectionalLightRequestBus.names | 317 ++++++++------- .../TranslationAssets/Properties/ALPHA.names | 28 -- .../AreaBlenderComponentTypeId.names | 3 +- .../Properties/AreaLightComponentTypeId.names | 3 +- .../AudioObstructionType_Ignore.names | 5 +- .../AudioObstructionType_MultiRay.names | 3 +- .../AudioObstructionType_SingleRay.names | 3 +- .../AudioPreloadComponentLoadType_Auto.names | 5 +- ...AudioPreloadComponentLoadType_Manual.names | 5 +- .../AxisAlignedBoxShapeComponentTypeId.names | 3 +- .../TranslationAssets/Properties/BRAVO.names | 28 -- .../Properties/BlendFactor_AlphaDest.names | 5 +- .../BlendFactor_AlphaDestInverse.names | 5 +- .../Properties/BlendFactor_AlphaSource.names | 7 +- .../Properties/BlendFactor_AlphaSource1.names | 5 +- .../BlendFactor_AlphaSource1Inverse.names | 5 +- .../BlendFactor_AlphaSourceInverse.names | 5 +- .../BlendFactor_AlphaSourceSaturate.names | 5 +- .../Properties/BlendFactor_ColorDest.names | 5 +- .../BlendFactor_ColorDestInverse.names | 5 +- .../Properties/BlendFactor_ColorSource.names | 5 +- .../Properties/BlendFactor_ColorSource1.names | 5 +- .../BlendFactor_ColorSource1Inverse.names | 5 +- .../BlendFactor_ColorSourceInverse.names | 5 +- .../Properties/BlendFactor_Factor.names | 5 +- .../BlendFactor_FactorInverse.names | 5 +- .../Properties/BlendFactor_Invalid.names | 5 +- .../Properties/BlendFactor_One.names | 5 +- .../Properties/BlendFactor_Zero.names | 5 +- .../Properties/BlendOp_Add.names | 5 +- .../Properties/BlendOp_Invalid.names | 5 +- .../Properties/BlendOp_Maximum.names | 5 +- .../Properties/BlendOp_Minimum.names | 7 +- .../Properties/BlendOp_Subtract.names | 5 +- .../Properties/BlendOp_SubtractReverse.names | 5 +- .../Properties/BlockerComponentTypeId.names | 3 +- .../Properties/BloomComponentTypeId.names | 3 +- .../Properties/BoxShapeComponentTypeId.names | 3 +- .../Properties/CHARLIE.names | 28 -- .../TranslationAssets/Properties/CUBE.names | 5 +- .../Properties/CYLINDER.names | 5 +- .../CapsuleShapeComponentTypeId.names | 3 +- .../ConstantGradientComponentTypeId.names | 3 +- .../Properties/CullMode_Back.names | 5 +- .../Properties/CullMode_Front.names | 5 +- .../Properties/CullMode_Invalid.names | 5 +- .../Properties/CullMode_None.names | 5 +- .../CylinderShapeComponentTypeId.names | 3 +- .../Properties/DecalComponentTypeId.names | 3 +- .../Properties/DefaultLodOverride.names | 3 +- .../Properties/DefaultLodType.names | 3 +- .../DefaultMaterialAssignment.names | 3 +- .../DefaultMaterialAssignmentId.names | 3 +- .../DefaultMaterialAssignmentMap.names | 3 +- .../Properties/DefaultPhysicsSceneId.names | 3 +- .../Properties/DefaultPhysicsSceneName.names | 3 +- .../DeferredFogComponentTypeId.names | 3 +- .../DepthOfFieldComponentTypeId.names | 3 +- .../Properties/DepthWriteMask_All.names | 3 +- .../Properties/DepthWriteMask_Invalid.names | 3 +- .../Properties/DepthWriteMask_Zero.names | 3 +- ...escriptorListCombinerComponentTypeId.names | 3 +- .../DescriptorListComponentTypeId.names | 3 +- ...criptorWeightSelectorComponentTypeId.names | 3 +- ...useGlobalIlluminationComponentTypeId.names | 3 +- .../DiffuseProbeGridComponentTypeId.names | 3 +- .../DirectionalLightComponentTypeId.names | 3 +- .../Properties/DiskShapeComponentTypeId.names | 3 +- .../DisplayMapperComponentTypeId.names | 3 +- .../DisplaySettings_HideHelpers.names | 5 +- .../DisplaySettings_HideLinks.names | 5 +- .../DisplaySettings_HideTracks.names | 5 +- .../DisplaySettings_NoCollision.names | 5 +- .../Properties/DisplaySettings_NoLabels.names | 5 +- .../Properties/DisplaySettings_Physics.names | 5 +- ...isplaySettings_SerializableFlagsMask.names | 5 +- ...DisplaySettings_ShowDimensionFigures.names | 5 +- ...DistanceBetweenFilterComponentTypeId.names | 3 +- .../DistributionFilterComponentTypeId.names | 3 +- .../DitherGradientComponentTypeId.names | 3 +- .../EditorAreaLightComponentTypeId.names | 3 +- .../EditorBloomComponentTypeId.names | 3 +- .../EditorDecalComponentTypeId.names | 3 +- .../EditorDeferredFogComponentTypeId.names | 3 +- .../EditorDepthOfFieldComponentTypeId.names | 3 +- ...useGlobalIlluminationComponentTypeId.names | 3 +- ...ditorDiffuseProbeGridComponentTypeId.names | 3 +- ...ditorDirectionalLightComponentTypeId.names | 3 +- .../EditorDisplayMapperComponentTypeId.names | 3 +- ...EditorEntityReferenceComponentTypeId.names | 3 +- .../EditorEntityStartStatus_EditorOnly.names | 3 +- .../EditorEntityStartStatus_StartActive.names | 3 +- ...ditorEntityStartStatus_StartInactive.names | 3 +- ...EditorExposureControlComponentTypeId.names | 3 +- ...radientWeightModifierComponentTypeId.names | 3 +- .../EditorGridComponentTypeId.names | 3 +- .../EditorHDRiSkyboxComponentTypeId.names | 3 +- .../EditorHairComponentTypeId.names | 3 +- ...EditorImageBasedLightComponentTypeId.names | 3 +- ...ditorLookModificationComponentTypeId.names | 3 +- .../EditorMaterialComponentTypeId.names | 3 +- .../EditorMeshComponentTypeId.names | 3 +- ...EditorNonUniformScaleComponentTypeId.names | 3 +- ...OcclusionCullingPlaneComponentTypeId.names | 3 +- .../EditorPhysicalSkyComponentTypeId.names | 3 +- .../Properties/EditorPhysicsSceneId.names | 3 +- .../Properties/EditorPhysicsSceneName.names | 3 +- .../EditorPostFxLayerComponentTypeId.names | 3 +- .../EditorPrefabComponentTypeId.names | 3 +- ...rRadiusWeightModifierComponentTypeId.names | 3 +- ...EditorReflectionProbeComponentTypeId.names | 3 +- ...orShapeWeightModifierComponentTypeId.names | 3 +- .../EditorSsaoComponentTypeId.names | 3 +- .../EditorTransformComponentTypeId.names | 3 +- .../EntityReferenceComponentTypeId.names | 3 +- .../ExposureControlComponentTypeId.names | 3 +- .../FastNoiseGradientComponentTypeId.names | 3 +- .../Properties/FillMode_Invalid.names | 3 +- .../Properties/FillMode_Solid.names | 3 +- .../Properties/FillMode_Wireframe.names | 3 +- .../Properties/FloatEpsilon.names | 3 +- .../FrameCaptureResult_FileWriteError.names | 3 +- .../FrameCaptureResult_InternalError.names | 3 +- .../FrameCaptureResult_InvalidArgument.names | 3 +- .../Properties/FrameCaptureResult_None.names | 3 +- .../FrameCaptureResult_Success.names | 3 +- ...FrameCaptureResult_UnsupportedFormat.names | 3 +- .../GradientSurfaceDataComponentTypeId.names | 3 +- .../GradientTransformComponentTypeId.names | 3 +- ...radientWeightModifierComponentTypeId.names | 3 +- .../Properties/GridComponentTypeId.names | 3 +- .../HDRiSkyboxComponentTypeId.names | 3 +- .../Properties/HairComponentTypeId.names | 3 +- .../Properties/ICOSAHEDRON.names | 5 +- .../ImageBasedLightComponentTypeId.names | 3 +- .../ImageGradientComponentTypeId.names | 3 +- .../Properties/InvalidComponentId.names | 3 +- .../Properties/InvalidParameterIndex.names | 3 +- .../Properties/InvalidTemplateId.names | 3 +- .../InvertGradientComponentTypeId.names | 3 +- .../Properties/JsonMergePatch.names | 3 +- .../Properties/JsonPatch.names | 3 +- .../LANDSCAPE_CANVAS_EDITOR_ID.names | 5 +- .../LevelSettingsComponentTypeId.names | 3 +- .../LevelsGradientComponentTypeId.names | 3 +- ...LightAttenuationRadiusMode_Automatic.names | 3 +- .../LightAttenuationRadiusMode_Explicit.names | 3 +- .../LookModificationComponentTypeId.names | 3 +- .../Properties/MaterialComponentTypeId.names | 3 +- ...erialPropertyGroupVisibility_Enabled.names | 3 +- ...terialPropertyGroupVisibility_Hidden.names | 3 +- .../MaterialPropertyVisibility_Disabled.names | 3 +- .../MaterialPropertyVisibility_Enabled.names | 3 +- .../MaterialPropertyVisibility_Hidden.names | 3 +- .../MeshBlockerComponentTypeId.names | 3 +- .../Properties/MeshComponentTypeId.names | 3 +- .../MixedGradientComponentTypeId.names | 3 +- .../MultiPositionBehaviorType_Blended.names | 3 +- .../MultiPositionBehaviorType_Separate.names | 3 +- ...OcclusionCullingPlaneComponentTypeId.names | 3 +- .../PerlinGradientComponentTypeId.names | 3 +- .../Properties/PhotometricUnit_Candela.names | 3 +- .../PhotometricUnit_Ev100_Illuminance.names | 3 +- .../PhotometricUnit_Ev100_Luminance.names | 3 +- .../Properties/PhotometricUnit_Lumen.names | 3 +- .../Properties/PhotometricUnit_Lux.names | 3 +- .../Properties/PhotometricUnit_Nit.names | 3 +- .../Properties/PhotometricUnit_Unknown.names | 3 +- .../PhysicalSkyComponentTypeId.names | 3 +- .../PositionModifierComponentTypeId.names | 3 +- .../PostFxLayerComponentTypeId.names | 3 +- .../PosterizeGradientComponentTypeId.names | 3 +- .../ProviderNameEnum_AWSCognitoIDP.names | 3 +- .../Properties/ProviderNameEnum_Google.names | 3 +- .../ProviderNameEnum_LoginWithAmazon.names | 3 +- .../Properties/ProviderNameEnum_None.names | 5 +- .../Properties/QuadShapeComponentTypeId.names | 3 +- .../RadiusWeightModifierComponentTypeId.names | 3 +- .../RandomGradientComponentTypeId.names | 3 +- .../ReferenceGradientComponentTypeId.names | 3 +- .../ReferenceShapeComponentTypeId.names | 3 +- .../ReflectionProbeComponentTypeId.names | 3 +- .../RotationModifierComponentTypeId.names | 3 +- .../TranslationAssets/Properties/SPHERE.names | 5 +- .../ScaleModifierComponentTypeId.names | 3 +- .../Properties/ShadowFilterMethod_ESM.names | 3 +- .../ShadowFilterMethod_ESM_PCF.names | 3 +- .../Properties/ShadowFilterMethod_None.names | 3 +- .../Properties/ShadowFilterMethod_PCF.names | 3 +- .../Properties/ShadowmapSize_1024.names | 3 +- .../Properties/ShadowmapSize_2045.names | 3 +- .../Properties/ShadowmapSize_256.names | 3 +- .../Properties/ShadowmapSize_512.names | 3 +- .../Properties/ShadowmapSize_None.names | 3 +- ...peAreaFalloffGradientComponentTypeId.names | 3 +- .../ShapeChangeReasons_ShapeChanged.names | 3 +- .../ShapeChangeReasons_TransformChanged.names | 3 +- ...apeIntersectionFilterComponentTypeId.names | 3 +- .../Properties/ShapeType_Heightfield.names | 3 +- .../ShapeWeightModifierComponentTypeId.names | 3 +- ...lopeAlignmentModifierComponentTypeId.names | 3 +- .../SmoothStepGradientComponentTypeId.names | 3 +- .../Properties/SpawnerComponentTypeId.names | 3 +- .../SphereShapeComponentTypeId.names | 3 +- .../Properties/SsaoComponentTypeId.names | 3 +- .../Properties/StencilOp_Decrement.names | 5 +- .../StencilOp_DecrementSaturate.names | 5 +- .../Properties/StencilOp_Increment.names | 5 +- .../StencilOp_IncrementSaturate.names | 5 +- .../Properties/StencilOp_Invalid.names | 5 +- .../Properties/StencilOp_Invert.names | 5 +- .../Properties/StencilOp_Keep.names | 5 +- .../Properties/StencilOp_Replace.names | 5 +- .../Properties/StencilOp_Zero.names | 5 +- ...SurfaceAltitudeFilterComponentTypeId.names | 3 +- ...rfaceAltitudeGradientComponentTypeId.names | 3 +- ...urfaceMaskDepthFilterComponentTypeId.names | 3 +- .../SurfaceMaskFilterComponentTypeId.names | 3 +- .../SurfaceMaskGradientComponentTypeId.names | 3 +- .../SurfaceSlopeFilterComponentTypeId.names | 3 +- .../SurfaceSlopeGradientComponentTypeId.names | 3 +- .../SystemConfigPlatform_Android.names | 3 +- ...SystemConfigPlatform_InvalidPlatform.names | 3 +- .../Properties/SystemConfigPlatform_Ios.names | 3 +- .../Properties/SystemConfigPlatform_Mac.names | 3 +- .../SystemConfigPlatform_OsxMetal.names | 3 +- .../Properties/SystemConfigPlatform_Pc.names | 3 +- .../SystemConfigPlatform_Provo.names | 3 +- .../Properties/SystemConfigSpec_Auto.names | 3 +- .../Properties/SystemConfigSpec_High.names | 3 +- .../Properties/SystemConfigSpec_Low.names | 3 +- .../Properties/SystemConfigSpec_Medium.names | 3 +- .../SystemConfigSpec_VeryHigh.names | 3 +- .../Properties/SystemEntityId.names | 3 +- .../Properties/TETRAHEDRON.names | 5 +- .../ThresholdGradientComponentTypeId.names | 3 +- .../Properties/TransformComponentTypeId.names | 3 +- .../Properties/TransformMode_Rotation.names | 3 +- .../Properties/TransformMode_Scale.names | 3 +- .../TransformMode_Translation.names | 3 +- .../Properties/TransformPivot_Center.names | 3 +- .../Properties/TransformPivot_Object.names | 3 +- .../Properties/TransformRefreshType_All.names | 3 +- .../TransformRefreshType_Orientation.names | 3 +- .../TransformRefreshType_Translation.names | 3 +- .../Properties/TubeShapeComponentTypeId.names | 3 +- .../UiLayoutCellUnspecifiedSize.names | 5 +- .../VegetationSpawnerComponentTypeId.names | 3 +- .../Properties/eSSB_GotoEndTime.names | 3 +- .../Properties/eSSB_GotoStartTime.names | 3 +- .../Properties/eSSB_LeaveTime.names | 3 +- .../eUiAnimationEvent_Aborted.names | 5 +- .../eUiAnimationEvent_Started.names | 5 +- .../eUiAnimationEvent_Stopped.names | 5 +- .../eUiAnimationEvent_Updated.names | 5 +- .../Properties/eUiDragState_Invalid.names | 5 +- .../Properties/eUiDragState_Normal.names | 5 +- .../Properties/eUiDragState_Valid.names | 5 +- .../Properties/eUiDropState_Invalid.names | 5 +- .../Properties/eUiDropState_Normal.names | 5 +- .../Properties/eUiDropState_Valid.names | 5 +- .../eUiDynamicContentDBColorType_Free.names | 5 +- .../eUiDynamicContentDBColorType_Paid.names | 5 +- .../Properties/eUiEmitShape_Circle.names | 5 +- .../Properties/eUiEmitShape_Point.names | 5 +- .../Properties/eUiEmitShape_Quad.names | 5 +- .../eUiFillCornerOrigin_BottomLeft.names | 5 +- .../eUiFillCornerOrigin_BottomRight.names | 5 +- .../eUiFillCornerOrigin_TopLeft.names | 5 +- .../eUiFillCornerOrigin_TopRight.names | 5 +- .../Properties/eUiFillEdgeOrigin_Bottom.names | 5 +- .../Properties/eUiFillEdgeOrigin_Left.names | 5 +- .../Properties/eUiFillEdgeOrigin_Right.names | 5 +- .../Properties/eUiFillEdgeOrigin_Top.names | 6 +- .../Properties/eUiFillType_Linear.names | 5 +- .../Properties/eUiFillType_None.names | 5 +- .../Properties/eUiFillType_Radial.names | 5 +- .../Properties/eUiFillType_RadialCorner.names | 5 +- .../Properties/eUiFillType_RadialEdge.names | 5 +- ...iFlipbookAnimationFramerateUnits_FPS.names | 5 +- ...mationFramerateUnits_SecondsPerFrame.names | 5 +- .../eUiFlipbookAnimationLoopType_Linear.names | 5 +- .../eUiFlipbookAnimationLoopType_None.names | 5 +- ...UiFlipbookAnimationLoopType_PingPong.names | 5 +- .../Properties/eUiHAlign_Center.names | 5 +- .../Properties/eUiHAlign_Left.names | 5 +- .../Properties/eUiHAlign_Right.names | 5 +- .../eUiHorizontalOrder_LeftToRight.names | 5 +- .../eUiHorizontalOrder_RightToLeft.names | 5 +- .../eUiImageSequenceImageType_Fixed.names | 5 +- .../eUiImageSequenceImageType_Stretched.names | 5 +- ...ageSequenceImageType_StretchedToFill.names | 5 +- ...mageSequenceImageType_StretchedToFit.names | 5 +- .../Properties/eUiImageType_Fixed.names | 5 +- .../Properties/eUiImageType_Sliced.names | 5 +- .../Properties/eUiImageType_Stretched.names | 5 +- .../eUiImageType_StretchedToFill.names | 5 +- .../eUiImageType_StretchedToFit.names | 5 +- .../Properties/eUiImageType_Tiled.names | 5 +- .../eUiInteractableState_Disabled.names | 5 +- .../eUiInteractableState_Hover.names | 5 +- .../eUiInteractableState_Normal.names | 5 +- .../eUiInteractableState_Pressed.names | 5 +- ...ridStartingDirection_HorizontalOrder.names | 5 +- ...tGridStartingDirection_VerticalOrder.names | 5 +- .../eUiNavigationMode_Automatic.names | 5 +- .../Properties/eUiNavigationMode_Custom.names | 5 +- .../Properties/eUiNavigationMode_None.names | 5 +- .../eUiParticleCoordinateType_Cartesian.names | 5 +- .../eUiParticleCoordinateType_Polar.names | 5 +- ...ialDirectionType_RelativeToEmitAngle.names | 5 +- ...irectionType_RelativeToEmitterCenter.names | 5 +- ...eUiScaleToDeviceMode_NonUniformScale.names | 5 +- .../eUiScaleToDeviceMode_None.names | 5 +- .../eUiScaleToDeviceMode_ScaleXOnly.names | 5 +- .../eUiScaleToDeviceMode_ScaleYOnly.names | 5 +- ...ScaleToDeviceMode_UniformScaleToFill.names | 5 +- ...iScaleToDeviceMode_UniformScaleToFit.names | 5 +- ...ScaleToDeviceMode_UniformScaleToFitX.names | 5 +- ...ScaleToDeviceMode_UniformScaleToFitY.names | 5 +- ...ollBoxScrollBarVisibility_AlwaysShow.names | 5 +- ...crollBoxScrollBarVisibility_AutoHide.names | 5 +- ...Visibility_AutoHideAndResizeViewport.names | 5 +- .../eUiScrollBoxSnapMode_Children.names | 5 +- .../eUiScrollBoxSnapMode_Grid.names | 5 +- .../eUiScrollBoxSnapMode_None.names | 5 +- .../eUiScrollerOrientation_Horizontal.names | 5 +- .../eUiScrollerOrientation_Vertical.names | 5 +- .../eUiSpriteType_RenderTarget.names | 5 +- .../eUiSpriteType_SpriteAsset.names | 5 +- .../eUiTextOverflowMode_ClipText.names | 5 +- .../eUiTextOverflowMode_Ellipsis.names | 5 +- .../eUiTextOverflowMode_OverflowText.names | 5 +- .../Properties/eUiTextShrinkToFit_None.names | 5 +- .../eUiTextShrinkToFit_Uniform.names | 5 +- .../eUiTextShrinkToFit_WidthOnly.names | 5 +- .../eUiTextWrapTextSetting_NoWrap.names | 5 +- .../eUiTextWrapTextSetting_Wrap.names | 5 +- ...ayAutoPositionMode_OffsetFromElement.names | 5 +- ...playAutoPositionMode_OffsetFromMouse.names | 5 +- ...eUiTooltipDisplayTriggerMode_OnClick.names | 5 +- ...eUiTooltipDisplayTriggerMode_OnHover.names | 5 +- ...eUiTooltipDisplayTriggerMode_OnPress.names | 5 +- .../Properties/eUiVAlign_Bottom.names | 5 +- .../Properties/eUiVAlign_Center.names | 5 +- .../Properties/eUiVAlign_Top.names | 5 +- .../eUiVerticalOrder_BottomToTop.names | 5 +- .../eUiVerticalOrder_TopToBottom.names | 5 +- .../Properties/g_ProfilerSystem.names | 3 +- .../Properties/g_SettingsRegistry.names | 3 +- 354 files changed, 1226 insertions(+), 916 deletions(-) delete mode 100644 Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ALPHA.names delete mode 100644 Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BRAVO.names delete mode 100644 Gems/ScriptCanvas/Assets/TranslationAssets/Properties/CHARLIE.names diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AxisType.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AxisType.names index bd64391719..c6e75adc4a 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AxisType.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AxisType.names @@ -5,7 +5,8 @@ "context": "BehaviorClass", "variant": "", "details": { - "name": "Axis Type" + "name": "Axis Type", + "category": "Constants" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/ActorNotificationBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/ActorNotificationBus.names index 77cb8b59c5..82e8a54750 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/ActorNotificationBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/ActorNotificationBus.names @@ -32,7 +32,7 @@ { "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", "details": { - "name": "Motion Name" + "name": "char" } } ] @@ -46,7 +46,7 @@ { "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", "details": { - "name": "State Name" + "name": "char" } } ] @@ -60,7 +60,7 @@ { "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", "details": { - "name": "State Name" + "name": "char" } } ] @@ -74,7 +74,7 @@ { "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", "details": { - "name": "State Name" + "name": "char" } } ] @@ -88,7 +88,7 @@ { "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", "details": { - "name": "State Name" + "name": "char" } } ] @@ -102,13 +102,13 @@ { "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", "details": { - "name": "From State" + "name": "char" } }, { "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", "details": { - "name": "To State" + "name": "char" } } ] @@ -122,13 +122,13 @@ { "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", "details": { - "name": "From State" + "name": "char" } }, { "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", "details": { - "name": "To State" + "name": "char" } } ] diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/Audio System Component Notifications.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/Audio System Component Notifications.names index 2c8cd9b1b4..7803611d90 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/Audio System Component Notifications.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/Audio System Component Notifications.names @@ -5,8 +5,8 @@ "context": "EBusHandler", "variant": "", "details": { - "name": "Audio System", - "category": "EBus Handlers" + "name": "Audio System", + "category": "Audio" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/DepthOfFieldRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/DepthOfFieldRequestBus.names index 1fbc15e794..ef3d070f51 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/DepthOfFieldRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/DepthOfFieldRequestBus.names @@ -5,27 +5,28 @@ "context": "EBusSender", "variant": "", "details": { - "name": "DepthOfFieldRequestBus" + "name": "Depth Of Field", + "category": "Post Process" }, "methods": [ { "key": "GetEnableDebugColoringOverride", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetEnableDebugColoringOverride" + "tooltip": "When signaled, this will invoke Get Enable Debug Coloring Override" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetEnableDebugColoringOverride is invoked" + "tooltip": "Signaled after Get Enable Debug Coloring Override is invoked" }, "details": { - "name": "GetEnableDebugColoringOverride" + "name": "Get Enable Debug Coloring Override" }, "results": [ { "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", "details": { - "name": "bool" + "name": "Enabled" } } ] @@ -34,20 +35,20 @@ "key": "GetAutoFocusSpeedOverride", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetAutoFocusSpeedOverride" + "tooltip": "When signaled, this will invoke Get Auto Focus Speed Override" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetAutoFocusSpeedOverride is invoked" + "tooltip": "Signaled after Get Auto Focus Speed Override is invoked" }, "details": { - "name": "GetAutoFocusSpeedOverride" + "name": "Get Auto Focus Speed Override" }, "results": [ { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", "details": { - "name": "float" + "name": "Auto Focus Speed" } } ] @@ -56,20 +57,20 @@ "key": "SetAutoFocusSensitivity", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetAutoFocusSensitivity" + "tooltip": "When signaled, this will invoke Set Auto Focus Sensitivity" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetAutoFocusSensitivity is invoked" + "tooltip": "Signaled after Set Auto Focus Sensitivity is invoked" }, "details": { - "name": "SetAutoFocusSensitivity" + "name": "Set Auto Focus Sensitivity" }, "params": [ { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", "details": { - "name": "float" + "name": "Auto Focus Sensitivity" } } ] @@ -78,20 +79,20 @@ "key": "SetAutoFocusDelayOverride", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetAutoFocusDelayOverride" + "tooltip": "When signaled, this will invoke Set Auto Focus Delay Override" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetAutoFocusDelayOverride is invoked" + "tooltip": "Signaled after Set Auto Focus Delay Override is invoked" }, "details": { - "name": "SetAutoFocusDelayOverride" + "name": "Set Auto Focus Delay Override" }, "params": [ { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", "details": { - "name": "float" + "name": "Auto Focus Delay" } } ] @@ -100,20 +101,20 @@ "key": "GetAutoFocusScreenPosition", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetAutoFocusScreenPosition" + "tooltip": "When signaled, this will invoke Get Auto Focus Screen Position" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetAutoFocusScreenPosition is invoked" + "tooltip": "Signaled after Get Auto Focus Screen Position is invoked" }, "details": { - "name": "GetAutoFocusScreenPosition" + "name": "Get Auto Focus Screen Position" }, "results": [ { "typeid": "{3D80F623-C85C-4741-90D0-E4E66164E6BF}", "details": { - "name": "Vector2" + "name": "Auto Focus Screen" } } ] @@ -122,20 +123,20 @@ "key": "GetEnableDebugColoring", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetEnableDebugColoring" + "tooltip": "When signaled, this will invoke Get Enable Debug Coloring" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetEnableDebugColoring is invoked" + "tooltip": "Signaled after Get Enable Debug Coloring is invoked" }, "details": { - "name": "GetEnableDebugColoring" + "name": "Get Enable Debug Coloring" }, "results": [ { "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", "details": { - "name": "bool" + "name": "Enabled" } } ] @@ -144,20 +145,20 @@ "key": "SetFocusDistance", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetFocusDistance" + "tooltip": "When signaled, this will invoke Set Focus Distance" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetFocusDistance is invoked" + "tooltip": "Signaled after Set Focus Distance is invoked" }, "details": { - "name": "SetFocusDistance" + "name": "Set Focus Distance" }, "params": [ { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", "details": { - "name": "float" + "name": "Focus Distance" } } ] @@ -166,20 +167,20 @@ "key": "SetQualityLevel", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetQualityLevel" + "tooltip": "When signaled, this will invoke Set Quality Level" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetQualityLevel is invoked" + "tooltip": "Signaled after Set Quality Level is invoked" }, "details": { - "name": "SetQualityLevel" + "name": "Set Quality Level" }, "params": [ { "typeid": "{43DA906B-7DEF-4CA8-9790-854106D3F983}", "details": { - "name": "unsigned int" + "name": "Quality Level" } } ] @@ -188,20 +189,20 @@ "key": "SetCameraEntityId", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetCameraEntityId" + "tooltip": "When signaled, this will invoke Set Camera Entity Id" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetCameraEntityId is invoked" + "tooltip": "Signaled after Set Camera Entity Id is invoked" }, "details": { - "name": "SetCameraEntityId" + "name": "Set Camera Entity Id" }, "params": [ { "typeid": "{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}", "details": { - "name": "EntityId", + "name": "Entity Id", "tooltip": "Entity Unique Id" } } @@ -211,20 +212,20 @@ "key": "SetAutoFocusDelay", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetAutoFocusDelay" + "tooltip": "When signaled, this will invoke Set Auto Focus Delay" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetAutoFocusDelay is invoked" + "tooltip": "Signaled after Set Auto Focus Delay is invoked" }, "details": { - "name": "SetAutoFocusDelay" + "name": "Set Auto Focus Delay" }, "params": [ { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", "details": { - "name": "float" + "name": "Auto Focus Delay" } } ] @@ -233,20 +234,20 @@ "key": "GetAutoFocusDelay", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetAutoFocusDelay" + "tooltip": "When signaled, this will invoke Get Auto Focus Delay" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetAutoFocusDelay is invoked" + "tooltip": "Signaled after Get Auto Focus Delay is invoked" }, "details": { - "name": "GetAutoFocusDelay" + "name": "Get Auto Focus Delay" }, "results": [ { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", "details": { - "name": "float" + "name": "Auto Focus Delay" } } ] @@ -255,20 +256,20 @@ "key": "SetAutoFocusScreenPosition", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetAutoFocusScreenPosition" + "tooltip": "When signaled, this will invoke Set Auto Focus Screen Position" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetAutoFocusScreenPosition is invoked" + "tooltip": "Signaled after Set Auto Focus Screen Position is invoked" }, "details": { - "name": "SetAutoFocusScreenPosition" + "name": "Set Auto Focus Screen Position" }, "params": [ { "typeid": "{3D80F623-C85C-4741-90D0-E4E66164E6BF}", "details": { - "name": "Vector2" + "name": "Auto Focus Screen Position" } } ] @@ -277,20 +278,20 @@ "key": "GetFNumber", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetFNumber" + "tooltip": "When signaled, this will invoke GetF Number" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetFNumber is invoked" + "tooltip": "Signaled after GetF Number is invoked" }, "details": { - "name": "GetFNumber" + "name": "Get F Number" }, "results": [ { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", "details": { - "name": "float" + "name": "F Number" } } ] @@ -299,20 +300,20 @@ "key": "SetApertureFOverride", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetApertureFOverride" + "tooltip": "When signaled, this will invoke Set ApertureF Override" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetApertureFOverride is invoked" + "tooltip": "Signaled after Set ApertureF Override is invoked" }, "details": { - "name": "SetApertureFOverride" + "name": "Set Aperture F Override" }, "params": [ { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", "details": { - "name": "float" + "name": "Aperture F" } } ] @@ -321,20 +322,20 @@ "key": "SetEnabled", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetEnabled" + "tooltip": "When signaled, this will invoke Set Enabled" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetEnabled is invoked" + "tooltip": "Signaled after Set Enabled is invoked" }, "details": { - "name": "SetEnabled" + "name": "Set Enabled" }, "params": [ { "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", "details": { - "name": "bool" + "name": "Enabled" } } ] @@ -343,20 +344,20 @@ "key": "SetAutoFocusScreenPositionOverride", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetAutoFocusScreenPositionOverride" + "tooltip": "When signaled, this will invoke Set Auto Focus Screen Position Override" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetAutoFocusScreenPositionOverride is invoked" + "tooltip": "Signaled after Set Auto Focus Screen Position Override is invoked" }, "details": { - "name": "SetAutoFocusScreenPositionOverride" + "name": "Set Auto Focus Screen Position Override" }, "params": [ { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", "details": { - "name": "float" + "name": "Auto Focus Screen Position" } } ] @@ -365,20 +366,20 @@ "key": "GetQualityLevelOverride", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetQualityLevelOverride" + "tooltip": "When signaled, this will invoke Get Quality Level Override" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetQualityLevelOverride is invoked" + "tooltip": "Signaled after Get Quality Level Override is invoked" }, "details": { - "name": "GetQualityLevelOverride" + "name": "Get Quality Level Override" }, "results": [ { "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", "details": { - "name": "bool" + "name": "Quality Level" } } ] @@ -387,20 +388,20 @@ "key": "SetAutoFocusSpeedOverride", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetAutoFocusSpeedOverride" + "tooltip": "When signaled, this will invoke Set Auto Focus Speed Override" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetAutoFocusSpeedOverride is invoked" + "tooltip": "Signaled after Set Auto Focus Speed Override is invoked" }, "details": { - "name": "SetAutoFocusSpeedOverride" + "name": "Set Auto Focus Speed Override" }, "params": [ { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", "details": { - "name": "float" + "name": "Auto Focus Speed" } } ] @@ -409,20 +410,20 @@ "key": "GetEnableAutoFocusOverride", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetEnableAutoFocusOverride" + "tooltip": "When signaled, this will invoke Get Enable Auto Focus Override" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetEnableAutoFocusOverride is invoked" + "tooltip": "Signaled after Get Enable Auto Focus Override is invoked" }, "details": { - "name": "GetEnableAutoFocusOverride" + "name": "Get Enable Auto Focus Override" }, "results": [ { "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", "details": { - "name": "bool" + "name": "Enabled" } } ] @@ -431,20 +432,20 @@ "key": "SetEnableDebugColoring", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetEnableDebugColoring" + "tooltip": "When signaled, this will invoke Set Enable Debug Coloring" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetEnableDebugColoring is invoked" + "tooltip": "Signaled after Set Enable Debug Coloring is invoked" }, "details": { - "name": "SetEnableDebugColoring" + "name": "Set Enable Debug Coloring" }, "params": [ { "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", "details": { - "name": "bool" + "name": "Enabled" } } ] @@ -453,20 +454,20 @@ "key": "SetFocusDistanceOverride", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetFocusDistanceOverride" + "tooltip": "When signaled, this will invoke Set Focus Distance Override" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetFocusDistanceOverride is invoked" + "tooltip": "Signaled after Set Focus Distance Override is invoked" }, "details": { - "name": "SetFocusDistanceOverride" + "name": "Set Focus Distance Override" }, "params": [ { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", "details": { - "name": "float" + "name": "Focus Distance" } } ] @@ -475,20 +476,20 @@ "key": "GetEnableAutoFocus", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetEnableAutoFocus" + "tooltip": "When signaled, this will invoke Get Enable Auto Focus" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetEnableAutoFocus is invoked" + "tooltip": "Signaled after Get Enable Auto Focus is invoked" }, "details": { - "name": "GetEnableAutoFocus" + "name": "Get Enable Auto Focus" }, "results": [ { "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", "details": { - "name": "bool" + "name": "Enable" } } ] @@ -497,20 +498,20 @@ "key": "SetApertureF", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetApertureF" + "tooltip": "When signaled, this will invoke Set ApertureF" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetApertureF is invoked" + "tooltip": "Signaled after Set ApertureF is invoked" }, "details": { - "name": "SetApertureF" + "name": "Set Aperture F" }, "params": [ { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", "details": { - "name": "float" + "name": "Aperture F" } } ] @@ -519,14 +520,14 @@ "key": "SetCameraEntityIdOverride", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetCameraEntityIdOverride" + "tooltip": "When signaled, this will invoke Set Camera Entity Id Override" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetCameraEntityIdOverride is invoked" + "tooltip": "Signaled after Set Camera Entity Id Override is invoked" }, "details": { - "name": "SetCameraEntityIdOverride" + "name": "Set Camera Entity Id Override" }, "params": [ { @@ -541,20 +542,20 @@ "key": "GetEnabled", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetEnabled" + "tooltip": "When signaled, this will invoke Get Enabled" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetEnabled is invoked" + "tooltip": "Signaled after Get Enabled is invoked" }, "details": { - "name": "GetEnabled" + "name": "Get Enabled" }, "results": [ { "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", "details": { - "name": "bool" + "name": "Enabled" } } ] @@ -563,20 +564,20 @@ "key": "GetFocusDistance", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetFocusDistance" + "tooltip": "When signaled, this will invoke Get Focus Distance" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetFocusDistance is invoked" + "tooltip": "Signaled after Get Focus Distance is invoked" }, "details": { - "name": "GetFocusDistance" + "name": "Get Focus Distance" }, "results": [ { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", "details": { - "name": "float" + "name": "Focus Distance" } } ] @@ -585,20 +586,20 @@ "key": "GetEnabledOverride", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetEnabledOverride" + "tooltip": "When signaled, this will invoke Get Enabled Override" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetEnabledOverride is invoked" + "tooltip": "Signaled after Get Enabled Override is invoked" }, "details": { - "name": "GetEnabledOverride" + "name": "Get Enabled Override" }, "results": [ { "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", "details": { - "name": "bool" + "name": "Enabled" } } ] @@ -607,20 +608,20 @@ "key": "GetCameraEntityId", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetCameraEntityId" + "tooltip": "When signaled, this will invoke Get Camera Entity Id" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetCameraEntityId is invoked" + "tooltip": "Signaled after Get Camera Entity Id is invoked" }, "details": { - "name": "GetCameraEntityId" + "name": "Get Camera Entity Id" }, "results": [ { "typeid": "{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}", "details": { - "name": "EntityId", + "name": "Entity Id", "tooltip": "Entity Unique Id" } } @@ -630,20 +631,20 @@ "key": "GetAutoFocusScreenPositionOverride", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetAutoFocusScreenPositionOverride" + "tooltip": "When signaled, this will invoke Get Auto Focus Screen Position Override" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetAutoFocusScreenPositionOverride is invoked" + "tooltip": "Signaled after Get Auto Focus Screen Position Override is invoked" }, "details": { - "name": "GetAutoFocusScreenPositionOverride" + "name": "Get Auto Focus Screen Position Override" }, "results": [ { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", "details": { - "name": "float" + "name": "Auto Focus Screen Position" } } ] @@ -652,20 +653,20 @@ "key": "GetAutoFocusSpeed", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetAutoFocusSpeed" + "tooltip": "When signaled, this will invoke Get Auto Focus Speed" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetAutoFocusSpeed is invoked" + "tooltip": "Signaled after Get Auto Focus Speed is invoked" }, "details": { - "name": "GetAutoFocusSpeed" + "name": "Get Auto Focus Speed" }, "results": [ { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", "details": { - "name": "float" + "name": "Auto Focus Speed" } } ] @@ -674,20 +675,20 @@ "key": "SetEnabledOverride", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetEnabledOverride" + "tooltip": "When signaled, this will invoke Set Enabled Override" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetEnabledOverride is invoked" + "tooltip": "Signaled after Set Enabled Override is invoked" }, "details": { - "name": "SetEnabledOverride" + "name": "Set Enabled Override" }, "params": [ { "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", "details": { - "name": "bool" + "name": "Enabled" } } ] @@ -696,20 +697,20 @@ "key": "GetAutoFocusSensitivity", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetAutoFocusSensitivity" + "tooltip": "When signaled, this will invoke Get Auto Focus Sensitivity" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetAutoFocusSensitivity is invoked" + "tooltip": "Signaled after Get Auto Focus Sensitivity is invoked" }, "details": { - "name": "GetAutoFocusSensitivity" + "name": "Get Auto Focus Sensitivity" }, "results": [ { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", "details": { - "name": "float" + "name": "Auto Focus Sensitivity" } } ] @@ -718,20 +719,20 @@ "key": "GetAutoFocusDelayOverride", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetAutoFocusDelayOverride" + "tooltip": "When signaled, this will invoke Get Auto Focus Delay Override" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetAutoFocusDelayOverride is invoked" + "tooltip": "Signaled after Get Auto Focus Delay Override is invoked" }, "details": { - "name": "GetAutoFocusDelayOverride" + "name": "Get Auto Focus Delay Override" }, "results": [ { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", "details": { - "name": "float" + "name": "Auto Focus Delay" } } ] @@ -740,20 +741,20 @@ "key": "GetApertureF", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetApertureF" + "tooltip": "When signaled, this will invoke Get ApertureF" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetApertureF is invoked" + "tooltip": "Signaled after Get ApertureF is invoked" }, "details": { - "name": "GetApertureF" + "name": "Get Aperture F" }, "results": [ { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", "details": { - "name": "float" + "name": "Aperture F" } } ] @@ -762,20 +763,20 @@ "key": "GetApertureFOverride", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetApertureFOverride" + "tooltip": "When signaled, this will invoke Get ApertureF Override" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetApertureFOverride is invoked" + "tooltip": "Signaled after Get ApertureF Override is invoked" }, "details": { - "name": "GetApertureFOverride" + "name": "Get Aperture F Override" }, "results": [ { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", "details": { - "name": "float" + "name": "Aperture F" } } ] @@ -784,20 +785,20 @@ "key": "SetAutoFocusSensitivityOverride", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetAutoFocusSensitivityOverride" + "tooltip": "When signaled, this will invoke Set Auto Focus Sensitivity Override" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetAutoFocusSensitivityOverride is invoked" + "tooltip": "Signaled after Set Auto Focus Sensitivity Override is invoked" }, "details": { - "name": "SetAutoFocusSensitivityOverride" + "name": "Set Auto Focus Sensitivity Override" }, "params": [ { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", "details": { - "name": "float" + "name": "Auto Focus Sensitivity" } } ] @@ -806,20 +807,20 @@ "key": "SetQualityLevelOverride", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetQualityLevelOverride" + "tooltip": "When signaled, this will invoke Set Quality Level Override" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetQualityLevelOverride is invoked" + "tooltip": "Signaled after Set Quality Level Override is invoked" }, "details": { - "name": "SetQualityLevelOverride" + "name": "Set Quality Level Override" }, "params": [ { "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", "details": { - "name": "bool" + "name": "Quality Level" } } ] @@ -828,20 +829,20 @@ "key": "GetFocusDistanceOverride", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetFocusDistanceOverride" + "tooltip": "When signaled, this will invoke Get Focus Distance Override" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetFocusDistanceOverride is invoked" + "tooltip": "Signaled after Get Focus Distance Override is invoked" }, "details": { - "name": "GetFocusDistanceOverride" + "name": "Get Focus Distance Override" }, "results": [ { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", "details": { - "name": "float" + "name": "Focus Distance" } } ] @@ -850,20 +851,20 @@ "key": "SetAutoFocusSpeed", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetAutoFocusSpeed" + "tooltip": "When signaled, this will invoke Set Auto Focus Speed" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetAutoFocusSpeed is invoked" + "tooltip": "Signaled after Set Auto Focus Speed is invoked" }, "details": { - "name": "SetAutoFocusSpeed" + "name": "Set Auto Focus Speed" }, "params": [ { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", "details": { - "name": "float" + "name": "Auto Focus Speed" } } ] @@ -872,20 +873,20 @@ "key": "SetEnableAutoFocusOverride", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetEnableAutoFocusOverride" + "tooltip": "When signaled, this will invoke Set Enable Auto Focus Override" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetEnableAutoFocusOverride is invoked" + "tooltip": "Signaled after Set Enable Auto Focus Override is invoked" }, "details": { - "name": "SetEnableAutoFocusOverride" + "name": "Set Enable Auto Focus Override" }, "params": [ { "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", "details": { - "name": "bool" + "name": "Enable" } } ] @@ -894,20 +895,20 @@ "key": "GetQualityLevel", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetQualityLevel" + "tooltip": "When signaled, this will invoke Get Quality Level" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetQualityLevel is invoked" + "tooltip": "Signaled after Get Quality Level is invoked" }, "details": { - "name": "GetQualityLevel" + "name": "Get Quality Level" }, "results": [ { "typeid": "{43DA906B-7DEF-4CA8-9790-854106D3F983}", "details": { - "name": "unsigned int" + "name": "Quality Level" } } ] @@ -916,20 +917,20 @@ "key": "GetAutoFocusSensitivityOverride", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetAutoFocusSensitivityOverride" + "tooltip": "When signaled, this will invoke Get Auto Focus Sensitivity Override" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetAutoFocusSensitivityOverride is invoked" + "tooltip": "Signaled after Get Auto Focus Sensitivity Override is invoked" }, "details": { - "name": "GetAutoFocusSensitivityOverride" + "name": "Get Auto Focus Sensitivity Override" }, "results": [ { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", "details": { - "name": "float" + "name": "Auto Focus Sensitivity" } } ] @@ -938,20 +939,20 @@ "key": "SetEnableDebugColoringOverride", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetEnableDebugColoringOverride" + "tooltip": "When signaled, this will invoke Set Enable Debug Coloring Override" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetEnableDebugColoringOverride is invoked" + "tooltip": "Signaled after Set Enable Debug Coloring Override is invoked" }, "details": { - "name": "SetEnableDebugColoringOverride" + "name": "Set Enable Debug Coloring Override" }, "params": [ { "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", "details": { - "name": "bool" + "name": "Enable" } } ] @@ -960,20 +961,20 @@ "key": "SetFNumber", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetFNumber" + "tooltip": "When signaled, this will invoke SetF Number" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetFNumber is invoked" + "tooltip": "Signaled after SetF Number is invoked" }, "details": { - "name": "SetFNumber" + "name": "Set F Number" }, "params": [ { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", "details": { - "name": "float" + "name": "F Number" } } ] @@ -982,14 +983,14 @@ "key": "GetCameraEntityIdOverride", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetCameraEntityIdOverride" + "tooltip": "When signaled, this will invoke Get Camera Entity Id Override" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetCameraEntityIdOverride is invoked" + "tooltip": "Signaled after Get Camera Entity Id Override is invoked" }, "details": { - "name": "GetCameraEntityIdOverride" + "name": "Get Camera Entity Id Override" }, "results": [ { @@ -1004,20 +1005,20 @@ "key": "SetEnableAutoFocus", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetEnableAutoFocus" + "tooltip": "When signaled, this will invoke Set Enable Auto Focus" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetEnableAutoFocus is invoked" + "tooltip": "Signaled after Set Enable Auto Focus is invoked" }, "details": { - "name": "SetEnableAutoFocus" + "name": "Set Enable Auto Focus" }, "params": [ { "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", "details": { - "name": "bool" + "name": "Enable" } } ] diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/DirectionalLightRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/DirectionalLightRequestBus.names index 40b3627894..5813d51e40 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/DirectionalLightRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/DirectionalLightRequestBus.names @@ -5,27 +5,50 @@ "context": "EBusSender", "variant": "", "details": { - "name": "DirectionalLightRequestBus" + "name": "Directional Light", + "category": "Lights" }, "methods": [ { - "key": "GetShadowBias", + "key": "GetNormalShadowBias", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetShadowBias" + "tooltip": "When signaled, this will invoke Get Normal Shadow Bias" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetShadowBias is invoked" + "tooltip": "Signaled after Get Normal Shadow Bias is invoked" }, "details": { - "name": "GetShadowBias" + "name": "Get Normal Shadow Bias" }, "results": [ { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", "details": { - "name": "float" + "name": "Normal Shadow Bias" + } + } + ] + }, + { + "key": "GetShadowBias", + "entry": { + "name": "In", + "tooltip": "When signaled, this will invoke Get Shadow Bias" + }, + "exit": { + "name": "Out", + "tooltip": "Signaled after Get Shadow Bias is invoked" + }, + "details": { + "name": "Get Shadow Bias" + }, + "results": [ + { + "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", + "details": { + "name": "Shadow Bias" } } ] @@ -34,20 +57,20 @@ "key": "SetAngularDiameter", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetAngularDiameter" + "tooltip": "When signaled, this will invoke Set Angular Diameter" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetAngularDiameter is invoked" + "tooltip": "Signaled after Set Angular Diameter is invoked" }, "details": { - "name": "SetAngularDiameter" + "name": "Set Angular Diameter" }, "params": [ { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", "details": { - "name": "float" + "name": "Angular Diameter" } } ] @@ -56,20 +79,20 @@ "key": "GetShadowFarClipDistance", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetShadowFarClipDistance" + "tooltip": "When signaled, this will invoke Get Shadow Far Clip Distance" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetShadowFarClipDistance is invoked" + "tooltip": "Signaled after Get Shadow Far Clip Distance is invoked" }, "details": { - "name": "GetShadowFarClipDistance" + "name": "Get Shadow Far Clip Distance" }, "results": [ { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", "details": { - "name": "float" + "name": "Shadow Far Clip Distance" } } ] @@ -78,20 +101,20 @@ "key": "SetShadowBias", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetShadowBias" + "tooltip": "When signaled, this will invoke Set Shadow Bias" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetShadowBias is invoked" + "tooltip": "Signaled after Set Shadow Bias is invoked" }, "details": { - "name": "SetShadowBias" + "name": "Set Shadow Bias" }, "params": [ { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", "details": { - "name": "float" + "name": "Shadow Bias" } } ] @@ -100,20 +123,20 @@ "key": "SetIntensity", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetIntensity" + "tooltip": "When signaled, this will invoke Set Intensity" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetIntensity is invoked" + "tooltip": "Signaled after Set Intensity is invoked" }, "details": { - "name": "SetIntensity" + "name": "Set Intensity" }, "params": [ { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", "details": { - "name": "float" + "name": "Intensity" } } ] @@ -122,20 +145,20 @@ "key": "SetSplitRatio", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetSplitRatio" + "tooltip": "When signaled, this will invoke Set Split Ratio" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetSplitRatio is invoked" + "tooltip": "Signaled after Set Split Ratio is invoked" }, "details": { - "name": "SetSplitRatio" + "name": "Set Split Ratio" }, "params": [ { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", "details": { - "name": "float" + "name": "Split Ratio" } } ] @@ -144,20 +167,20 @@ "key": "GetFilteringSampleCount", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetFilteringSampleCount" + "tooltip": "When signaled, this will invoke Get Filtering Sample Count" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetFilteringSampleCount is invoked" + "tooltip": "Signaled after Get Filtering Sample Count is invoked" }, "details": { - "name": "GetFilteringSampleCount" + "name": "Get Filtering Sample Count" }, "results": [ { "typeid": "{43DA906B-7DEF-4CA8-9790-854106D3F983}", "details": { - "name": "unsigned int" + "name": "Filtering Sample Count" } } ] @@ -166,20 +189,20 @@ "key": "GetShadowFilterMethod", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetShadowFilterMethod" + "tooltip": "When signaled, this will invoke Get Shadow Filter Method" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetShadowFilterMethod is invoked" + "tooltip": "Signaled after Get Shadow Filter Method is invoked" }, "details": { - "name": "GetShadowFilterMethod" + "name": "Get Shadow Filter Method" }, "results": [ { "typeid": "{43DA906B-7DEF-4CA8-9790-854106D3F983}", "details": { - "name": "unsigned int" + "name": "Shadow Filter Method" } } ] @@ -188,20 +211,20 @@ "key": "GetCameraEntityId", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetCameraEntityId" + "tooltip": "When signaled, this will invoke Get Camera Entity Id" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetCameraEntityId is invoked" + "tooltip": "Signaled after Get Camera Entity Id is invoked" }, "details": { - "name": "GetCameraEntityId" + "name": "Get Camera Entity Id" }, "results": [ { "typeid": "{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}", "details": { - "name": "EntityId", + "name": "Camera Entity Id", "tooltip": "Entity Unique Id" } } @@ -211,20 +234,20 @@ "key": "SetDebugColoringEnabled", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetDebugColoringEnabled" + "tooltip": "When signaled, this will invoke Set Debug Coloring Enabled" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetDebugColoringEnabled is invoked" + "tooltip": "Signaled after Set Debug Coloring Enabled is invoked" }, "details": { - "name": "SetDebugColoringEnabled" + "name": "Set Debug Coloring Enabled" }, "params": [ { "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", "details": { - "name": "bool" + "name": "Enabled" } } ] @@ -233,20 +256,20 @@ "key": "GetDebugColoringEnabled", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetDebugColoringEnabled" + "tooltip": "When signaled, this will invoke Get Debug Coloring Enabled" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetDebugColoringEnabled is invoked" + "tooltip": "Signaled after Get Debug Coloring Enabled is invoked" }, "details": { - "name": "GetDebugColoringEnabled" + "name": "Get Debug Coloring Enabled" }, "results": [ { "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", "details": { - "name": "bool" + "name": "Enabled" } } ] @@ -255,20 +278,20 @@ "key": "GetViewFrustumCorrectionEnabled", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetViewFrustumCorrectionEnabled" + "tooltip": "When signaled, this will invoke Get View Frustum Correction Enabled" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetViewFrustumCorrectionEnabled is invoked" + "tooltip": "Signaled after Get View Frustum Correction Enabled is invoked" }, "details": { - "name": "GetViewFrustumCorrectionEnabled" + "name": "Get View Frustum Correction Enabled" }, "results": [ { "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", "details": { - "name": "bool" + "name": "Enabled" } } ] @@ -277,20 +300,20 @@ "key": "SetViewFrustumCorrectionEnabled", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetViewFrustumCorrectionEnabled" + "tooltip": "When signaled, this will invoke Set View Frustum Correction Enabled" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetViewFrustumCorrectionEnabled is invoked" + "tooltip": "Signaled after Set View Frustum Correction Enabled is invoked" }, "details": { - "name": "SetViewFrustumCorrectionEnabled" + "name": "Set View Frustum Correction Enabled" }, "params": [ { "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", "details": { - "name": "bool" + "name": "Enabled" } } ] @@ -299,20 +322,20 @@ "key": "SetGroundHeight", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetGroundHeight" + "tooltip": "When signaled, this will invoke Set Ground Height" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetGroundHeight is invoked" + "tooltip": "Signaled after Set Ground Height is invoked" }, "details": { - "name": "SetGroundHeight" + "name": "Set Ground Height" }, "params": [ { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", "details": { - "name": "float" + "name": "Ground Height" } } ] @@ -321,20 +344,20 @@ "key": "GetShadowReceiverPlaneBiasEnabled", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetShadowReceiverPlaneBiasEnabled" + "tooltip": "When signaled, this will invoke Get Shadow Receiver Plane Bias Enabled" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetShadowReceiverPlaneBiasEnabled is invoked" + "tooltip": "Signaled after Get Shadow Receiver Plane Bias Enabled is invoked" }, "details": { - "name": "GetShadowReceiverPlaneBiasEnabled" + "name": "Get Shadow Receiver Plane Bias Enabled" }, "results": [ { "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", "details": { - "name": "bool" + "name": "Shadow Receiver Plane Bias" } } ] @@ -343,20 +366,20 @@ "key": "SetShadowmapSize", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetShadowmapSize" + "tooltip": "When signaled, this will invoke Set Shadowmap Size" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetShadowmapSize is invoked" + "tooltip": "Signaled after Set Shadowmap Size is invoked" }, "details": { - "name": "SetShadowmapSize" + "name": "Set Shadowmap Size" }, "params": [ { "typeid": "{43DA906B-7DEF-4CA8-9790-854106D3F983}", "details": { - "name": "unsigned int" + "name": "Shadowmap Size" } } ] @@ -365,20 +388,20 @@ "key": "SetShadowFarClipDistance", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetShadowFarClipDistance" + "tooltip": "When signaled, this will invoke Set Shadow Far Clip Distance" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetShadowFarClipDistance is invoked" + "tooltip": "Signaled after Set Shadow Far Clip Distance is invoked" }, "details": { - "name": "SetShadowFarClipDistance" + "name": "Set Shadow Far Clip Distance" }, "params": [ { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", "details": { - "name": "float" + "name": "Shadow Far Clip Distance" } } ] @@ -387,20 +410,20 @@ "key": "SetCameraEntityId", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetCameraEntityId" + "tooltip": "When signaled, this will invoke Set Camera Entity Id" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetCameraEntityId is invoked" + "tooltip": "Signaled after Set Camera Entity Id is invoked" }, "details": { - "name": "SetCameraEntityId" + "name": "Set Camera Entity Id" }, "params": [ { "typeid": "{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}", "details": { - "name": "EntityId", + "name": "Camera Entity Id", "tooltip": "Entity Unique Id" } } @@ -410,14 +433,14 @@ "key": "GetColor", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetColor" + "tooltip": "When signaled, this will invoke Get Color" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetColor is invoked" + "tooltip": "Signaled after Get Color is invoked" }, "details": { - "name": "GetColor" + "name": "Get Color" }, "results": [ { @@ -432,20 +455,20 @@ "key": "SetSplitAutomatic", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetSplitAutomatic" + "tooltip": "When signaled, this will invoke Set Split Automatic" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetSplitAutomatic is invoked" + "tooltip": "Signaled after Set Split Automatic is invoked" }, "details": { - "name": "SetSplitAutomatic" + "name": "Set Split Automatic" }, "params": [ { "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", "details": { - "name": "bool" + "name": "Split Automatic" } } ] @@ -454,20 +477,20 @@ "key": "SetCascadeFarDepth", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetCascadeFarDepth" + "tooltip": "When signaled, this will invoke Set Cascade Far Depth" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetCascadeFarDepth is invoked" + "tooltip": "Signaled after Set Cascade Far Depth is invoked" }, "details": { - "name": "SetCascadeFarDepth" + "name": "Set Cascade Far Depth" }, "params": [ { "typeid": "{0CE9FA36-1E3A-4C06-9254-B7C73A732053}", "details": { - "name": "Vector4" + "name": "Cascade Far Depth" } } ] @@ -476,20 +499,20 @@ "key": "GetSplitAutomatic", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetSplitAutomatic" + "tooltip": "When signaled, this will invoke Get Split Automatic" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetSplitAutomatic is invoked" + "tooltip": "Signaled after Get Split Automatic is invoked" }, "details": { - "name": "GetSplitAutomatic" + "name": "Get Split Automatic" }, "results": [ { "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", "details": { - "name": "bool" + "name": "Split Automatic" } } ] @@ -498,20 +521,20 @@ "key": "GetGroundHeight", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetGroundHeight" + "tooltip": "When signaled, this will invoke Get Ground Height" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetGroundHeight is invoked" + "tooltip": "Signaled after Get Ground Height is invoked" }, "details": { - "name": "GetGroundHeight" + "name": "Get Ground Height" }, "results": [ { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", "details": { - "name": "float" + "name": "Ground Height" } } ] @@ -520,20 +543,20 @@ "key": "SetCascadeCount", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetCascadeCount" + "tooltip": "When signaled, this will invoke Set Cascade Count" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetCascadeCount is invoked" + "tooltip": "Signaled after Set Cascade Count is invoked" }, "details": { - "name": "SetCascadeCount" + "name": "Set Cascade Count" }, "params": [ { "typeid": "{43DA906B-7DEF-4CA8-9790-854106D3F983}", "details": { - "name": "unsigned int" + "name": "Cascade Count" } } ] @@ -542,20 +565,20 @@ "key": "SetFilteringSampleCount", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetFilteringSampleCount" + "tooltip": "When signaled, this will invoke Set Filtering Sample Count" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetFilteringSampleCount is invoked" + "tooltip": "Signaled after Set Filtering Sample Count is invoked" }, "details": { - "name": "SetFilteringSampleCount" + "name": "Set Filtering Sample Count" }, "params": [ { "typeid": "{43DA906B-7DEF-4CA8-9790-854106D3F983}", "details": { - "name": "unsigned int" + "name": "Filtering Sample Count" } } ] @@ -564,20 +587,20 @@ "key": "GetCascadeCount", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetCascadeCount" + "tooltip": "When signaled, this will invoke Get Cascade Count" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetCascadeCount is invoked" + "tooltip": "Signaled after Get Cascade Count is invoked" }, "details": { - "name": "GetCascadeCount" + "name": "Get Cascade Count" }, "results": [ { "typeid": "{43DA906B-7DEF-4CA8-9790-854106D3F983}", "details": { - "name": "unsigned int" + "name": "Cascade Count" } } ] @@ -586,20 +609,42 @@ "key": "GetIntensity", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetIntensity" + "tooltip": "When signaled, this will invoke Get Intensity" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetIntensity is invoked" + "tooltip": "Signaled after Get Intensity is invoked" }, "details": { - "name": "GetIntensity" + "name": "Get Intensity" }, "results": [ { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", "details": { - "name": "float" + "name": "Intensity" + } + } + ] + }, + { + "key": "SetNormalShadowBias", + "entry": { + "name": "In", + "tooltip": "When signaled, this will invoke Set Normal Shadow Bias" + }, + "exit": { + "name": "Out", + "tooltip": "Signaled after Set Normal Shadow Bias is invoked" + }, + "details": { + "name": "Set Normal Shadow Bias" + }, + "params": [ + { + "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", + "details": { + "name": "Normal Shadow Bias" } } ] @@ -608,20 +653,20 @@ "key": "GetShadowmapSize", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetShadowmapSize" + "tooltip": "When signaled, this will invoke Get Shadowmap Size" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetShadowmapSize is invoked" + "tooltip": "Signaled after Get Shadowmap Size is invoked" }, "details": { - "name": "GetShadowmapSize" + "name": "Get Shadowmap Size" }, "results": [ { "typeid": "{43DA906B-7DEF-4CA8-9790-854106D3F983}", "details": { - "name": "unsigned int" + "name": "Shadowmap Size" } } ] @@ -630,20 +675,20 @@ "key": "GetAngularDiameter", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetAngularDiameter" + "tooltip": "When signaled, this will invoke Get Angular Diameter" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetAngularDiameter is invoked" + "tooltip": "Signaled after Get Angular Diameter is invoked" }, "details": { - "name": "GetAngularDiameter" + "name": "Get Angular Diameter" }, "results": [ { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", "details": { - "name": "float" + "name": "Angular Diameter" } } ] @@ -652,20 +697,20 @@ "key": "SetShadowFilterMethod", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetShadowFilterMethod" + "tooltip": "When signaled, this will invoke Set Shadow Filter Method" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetShadowFilterMethod is invoked" + "tooltip": "Signaled after Set Shadow Filter Method is invoked" }, "details": { - "name": "SetShadowFilterMethod" + "name": "Set Shadow Filter Method" }, "params": [ { "typeid": "{43DA906B-7DEF-4CA8-9790-854106D3F983}", "details": { - "name": "unsigned int" + "name": "Shadow Filter Method" } } ] @@ -674,20 +719,20 @@ "key": "SetShadowReceiverPlaneBiasEnabled", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetShadowReceiverPlaneBiasEnabled" + "tooltip": "When signaled, this will invoke Set Shadow Receiver Plane Bias Enabled" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetShadowReceiverPlaneBiasEnabled is invoked" + "tooltip": "Signaled after Set Shadow Receiver Plane Bias Enabled is invoked" }, "details": { - "name": "SetShadowReceiverPlaneBiasEnabled" + "name": "Set Shadow Receiver Plane Bias Enabled" }, "params": [ { "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", "details": { - "name": "bool" + "name": "Enabled" } } ] @@ -696,20 +741,20 @@ "key": "GetSplitRatio", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetSplitRatio" + "tooltip": "When signaled, this will invoke Get Split Ratio" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetSplitRatio is invoked" + "tooltip": "Signaled after Get Split Ratio is invoked" }, "details": { - "name": "GetSplitRatio" + "name": "Get Split Ratio" }, "results": [ { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", "details": { - "name": "float" + "name": "Split Ratio" } } ] @@ -718,20 +763,20 @@ "key": "GetCascadeFarDepth", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetCascadeFarDepth" + "tooltip": "When signaled, this will invoke Get Cascade Far Depth" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetCascadeFarDepth is invoked" + "tooltip": "Signaled after Get Cascade Far Depth is invoked" }, "details": { - "name": "GetCascadeFarDepth" + "name": "Get Cascade Far Depth" }, "results": [ { "typeid": "{0CE9FA36-1E3A-4C06-9254-B7C73A732053}", "details": { - "name": "Vector4" + "name": "Cascade Far Depth" } } ] @@ -740,14 +785,14 @@ "key": "SetColor", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetColor" + "tooltip": "When signaled, this will invoke Set Color" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetColor is invoked" + "tooltip": "Signaled after Set Color is invoked" }, "details": { - "name": "SetColor" + "name": "Set Color" }, "params": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ALPHA.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ALPHA.names deleted file mode 100644 index 422d65f267..0000000000 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ALPHA.names +++ /dev/null @@ -1,28 +0,0 @@ -{ - "entries": [ - { - "key": "ALPHA", - "context": "Constant", - "variant": "", - "details": { - "name": "ALPHA" - }, - "methods": [ - { - "key": "GetALPHA", - "details": { - "name": "GetALPHA" - }, - "results": [ - { - "typeid": "{43DA906B-7DEF-4CA8-9790-854106D3F983}", - "details": { - "name": "unsigned int" - } - } - ] - } - ] - } - ] -} \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/AreaBlenderComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/AreaBlenderComponentTypeId.names index 0e645f79fb..2082bae8c1 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/AreaBlenderComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/AreaBlenderComponentTypeId.names @@ -5,7 +5,8 @@ "context": "Constant", "variant": "", "details": { - "name": "Area Blender Component Type Id" + "name": "Area Blender Component Type Id", + "category": "Constants/Editor" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/AreaLightComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/AreaLightComponentTypeId.names index 3593eaf8dc..4bace9efd3 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/AreaLightComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/AreaLightComponentTypeId.names @@ -5,7 +5,8 @@ "context": "Constant", "variant": "", "details": { - "name": "Area Light Component Type Id" + "name": "Area Light Component Type Id", + "category": "Constants/Editor" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/AudioObstructionType_Ignore.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/AudioObstructionType_Ignore.names index 4843af9c3e..0fc41d9cc0 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/AudioObstructionType_Ignore.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/AudioObstructionType_Ignore.names @@ -5,13 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "Audio Obstruction Type_ Ignore" + "name": " Ignore", + "category": "Constants/Audio Obstruction" }, "methods": [ { "key": "GetAudioObstructionType_Ignore", "details": { - "name": "Get Audio Obstruction Type_ Ignore" + "name": "Ignore" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/AudioObstructionType_MultiRay.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/AudioObstructionType_MultiRay.names index 22532e76b3..04995d42ee 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/AudioObstructionType_MultiRay.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/AudioObstructionType_MultiRay.names @@ -5,7 +5,8 @@ "context": "Constant", "variant": "", "details": { - "name": "Audio Obstruction Type_ Multi Ray" + "name": "Audio Obstruction Type_ Multi Ray", + "category": "Constants/Audio Obstruction" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/AudioObstructionType_SingleRay.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/AudioObstructionType_SingleRay.names index d31dc2281f..3629694797 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/AudioObstructionType_SingleRay.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/AudioObstructionType_SingleRay.names @@ -5,7 +5,8 @@ "context": "Constant", "variant": "", "details": { - "name": "Audio Obstruction Type_ Single Ray" + "name": "Audio Obstruction Type_ Single Ray", + "category": "Constants/Audio Obstruction" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/AudioPreloadComponentLoadType_Auto.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/AudioPreloadComponentLoadType_Auto.names index 0ca6591eb7..42a4678689 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/AudioPreloadComponentLoadType_Auto.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/AudioPreloadComponentLoadType_Auto.names @@ -5,13 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "Audio Preload Component Load Type_ Auto" + "name": "Load Type Auto", + "category": "Constants/Audio Preload" }, "methods": [ { "key": "GetAudioPreloadComponentLoadType_Auto", "details": { - "name": "Get Audio Preload Component Load Type_ Auto" + "name": "Load Type Auto" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/AudioPreloadComponentLoadType_Manual.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/AudioPreloadComponentLoadType_Manual.names index 540e9fec5f..ff0548b4d5 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/AudioPreloadComponentLoadType_Manual.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/AudioPreloadComponentLoadType_Manual.names @@ -5,13 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "Audio Preload Component Load Type_ Manual" + "name": "Load Type Manual", + "category": "Constants/Audio Preload" }, "methods": [ { "key": "GetAudioPreloadComponentLoadType_Manual", "details": { - "name": "Get Audio Preload Component Load Type_ Manual" + "name": "Load Type Manual" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/AxisAlignedBoxShapeComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/AxisAlignedBoxShapeComponentTypeId.names index b8ba70f008..f2669d1486 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/AxisAlignedBoxShapeComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/AxisAlignedBoxShapeComponentTypeId.names @@ -5,7 +5,8 @@ "context": "Constant", "variant": "", "details": { - "name": "Axis Aligned Box Shape Component Type Id" + "name": "Axis Aligned Box Shape Component Type Id", + "category": "Constants/Editor" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BRAVO.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BRAVO.names deleted file mode 100644 index e6260d16f8..0000000000 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BRAVO.names +++ /dev/null @@ -1,28 +0,0 @@ -{ - "entries": [ - { - "key": "BRAVO", - "context": "Constant", - "variant": "", - "details": { - "name": "BRAVO" - }, - "methods": [ - { - "key": "GetBRAVO", - "details": { - "name": "GetBRAVO" - }, - "results": [ - { - "typeid": "{43DA906B-7DEF-4CA8-9790-854106D3F983}", - "details": { - "name": "unsigned int" - } - } - ] - } - ] - } - ] -} \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_AlphaDest.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_AlphaDest.names index 6e4303a369..121e36f159 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_AlphaDest.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_AlphaDest.names @@ -5,13 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "Blend Factor_ Alpha Dest" + "name": "Alpha Dest", + "category": "Constants/Blend Factor" }, "methods": [ { "key": "GetBlendFactor_AlphaDest", "details": { - "name": "Get Blend Factor_ Alpha Dest" + "name": "Get Alpha Dest" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_AlphaDestInverse.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_AlphaDestInverse.names index 34aaf341e3..297c930e3a 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_AlphaDestInverse.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_AlphaDestInverse.names @@ -5,13 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "Blend Factor_ Alpha Dest Inverse" + "name": "Alpha Dest Inverse", + "category": "Constants/Blend Factor" }, "methods": [ { "key": "GetBlendFactor_AlphaDestInverse", "details": { - "name": "Get Blend Factor_ Alpha Dest Inverse" + "name": "Get Alpha Dest Inverse" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_AlphaSource.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_AlphaSource.names index 352ea52c3e..29c8fefc3a 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_AlphaSource.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_AlphaSource.names @@ -5,13 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "Blend Factor_ Alpha Source" + "name": "Alpha Source", + "category": "Constants/Blend Factor" }, "methods": [ { - "key": "GetBlendFactor_AlphaSource", + "key": "AlphaSource", "details": { - "name": "Get Blend Factor_ Alpha Source" + "name": "Get Alpha Source" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_AlphaSource1.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_AlphaSource1.names index a75fe9a20b..7b6903bbc1 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_AlphaSource1.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_AlphaSource1.names @@ -5,13 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "Blend Factor_ Alpha Source 1" + "name": "Alpha Source 1", + "category": "Constants/Blend Factor" }, "methods": [ { "key": "GetBlendFactor_AlphaSource1", "details": { - "name": "Get Blend Factor_ Alpha Source 1" + "name": "Get Alpha Source 1" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_AlphaSource1Inverse.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_AlphaSource1Inverse.names index caaca96606..f2a547b532 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_AlphaSource1Inverse.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_AlphaSource1Inverse.names @@ -5,13 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "Blend Factor_ Alpha Source 1 Inverse" + "name": "Alpha Source 1 Inverse", + "category": "Constants/Blend Factor" }, "methods": [ { "key": "GetBlendFactor_AlphaSource1Inverse", "details": { - "name": "Get Blend Factor_ Alpha Source 1 Inverse" + "name": "Get Alpha Source 1 Inverse" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_AlphaSourceInverse.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_AlphaSourceInverse.names index 6b93669c94..fffd959b55 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_AlphaSourceInverse.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_AlphaSourceInverse.names @@ -5,13 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "Blend Factor_ Alpha Source Inverse" + "name": "Alpha Source Inverse", + "category": "Constants/Blend Factor" }, "methods": [ { "key": "GetBlendFactor_AlphaSourceInverse", "details": { - "name": "Get Blend Factor_ Alpha Source Inverse" + "name": "Get Alpha Source Inverse" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_AlphaSourceSaturate.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_AlphaSourceSaturate.names index 6cfb5ce6e4..8314fc4883 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_AlphaSourceSaturate.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_AlphaSourceSaturate.names @@ -5,13 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "Blend Factor_ Alpha Source Saturate" + "name": "Alpha Source Saturate", + "category": "Constants/Blend Factor" }, "methods": [ { "key": "GetBlendFactor_AlphaSourceSaturate", "details": { - "name": "Get Blend Factor_ Alpha Source Saturate" + "name": "Get Alpha Source Saturate" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_ColorDest.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_ColorDest.names index 3ce6059a31..1528aa60d6 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_ColorDest.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_ColorDest.names @@ -5,13 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "Blend Factor_ Color Dest" + "name": "Color Dest", + "category": "Constants/Blend Factor" }, "methods": [ { "key": "GetBlendFactor_ColorDest", "details": { - "name": "Get Blend Factor_ Color Dest" + "name": "Get Color Dest" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_ColorDestInverse.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_ColorDestInverse.names index 86d4b79450..902dc74f8c 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_ColorDestInverse.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_ColorDestInverse.names @@ -5,13 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "Blend Factor_ Color Dest Inverse" + "name": "Color Dest Inverse", + "category": "Constants/Blend Factor" }, "methods": [ { "key": "GetBlendFactor_ColorDestInverse", "details": { - "name": "Get Blend Factor_ Color Dest Inverse" + "name": "Get Color Dest Inverse" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_ColorSource.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_ColorSource.names index c8596fa6e6..6d96e116a7 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_ColorSource.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_ColorSource.names @@ -5,13 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "Blend Factor_ Color Source" + "name": "Color Source", + "category": "Constants/Blend Factor" }, "methods": [ { "key": "GetBlendFactor_ColorSource", "details": { - "name": "Get Blend Factor_ Color Source" + "name": "Get Color Source" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_ColorSource1.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_ColorSource1.names index 63c3565d8e..71f421585e 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_ColorSource1.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_ColorSource1.names @@ -5,13 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "Blend Factor_ Color Source 1" + "name": "Color Source 1", + "category": "Constants/Blend Factor" }, "methods": [ { "key": "GetBlendFactor_ColorSource1", "details": { - "name": "Get Blend Factor_ Color Source 1" + "name": "Get Color Source 1" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_ColorSource1Inverse.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_ColorSource1Inverse.names index 19ea1a68b2..0b41014722 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_ColorSource1Inverse.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_ColorSource1Inverse.names @@ -5,13 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "Blend Factor_ Color Source 1 Inverse" + "name": "Color Source 1 Inverse", + "category": "Constants/Blend Factor" }, "methods": [ { "key": "GetBlendFactor_ColorSource1Inverse", "details": { - "name": "Get Blend Factor_ Color Source 1 Inverse" + "name": "Get Color Source 1 Inverse" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_ColorSourceInverse.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_ColorSourceInverse.names index b7d40bb84e..90764c6e1a 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_ColorSourceInverse.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_ColorSourceInverse.names @@ -5,13 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "Blend Factor_ Color Source Inverse" + "name": "Color Source Inverse", + "category": "Constants/Blend Factor" }, "methods": [ { "key": "GetBlendFactor_ColorSourceInverse", "details": { - "name": "Get Blend Factor_ Color Source Inverse" + "name": "Get Color Source Inverse" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_Factor.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_Factor.names index a9f207fb72..cdde70371b 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_Factor.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_Factor.names @@ -5,13 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "Blend Factor_ Factor" + "name": "Factor", + "category": "Constants/Blend Factor" }, "methods": [ { "key": "GetBlendFactor_Factor", "details": { - "name": "Get Blend Factor_ Factor" + "name": "Get Factor" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_FactorInverse.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_FactorInverse.names index 2290eaa56a..e2ceb0ad91 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_FactorInverse.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_FactorInverse.names @@ -5,13 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "Blend Factor_ Factor Inverse" + "name": "Factor Inverse", + "category": "Constants/Blend Factor" }, "methods": [ { "key": "GetBlendFactor_FactorInverse", "details": { - "name": "Get Blend Factor_ Factor Inverse" + "name": "Get Factor Inverse" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_Invalid.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_Invalid.names index ba1323b0c5..a3fc69cf25 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_Invalid.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_Invalid.names @@ -5,13 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "Blend Factor_ Invalid" + "name": "Invalid", + "category": "Constants/Blend Factor" }, "methods": [ { "key": "GetBlendFactor_Invalid", "details": { - "name": "Get Blend Factor_ Invalid" + "name": "Get Invalid" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_One.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_One.names index 9a6410d3a0..78cb105c4e 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_One.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_One.names @@ -5,13 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "Blend Factor_ One" + "name": "One", + "category": "Constants/Blend Factor" }, "methods": [ { "key": "GetBlendFactor_One", "details": { - "name": "Get Blend Factor_ One" + "name": "Get One" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_Zero.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_Zero.names index 5118abe847..230913d961 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_Zero.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_Zero.names @@ -5,13 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "Blend Factor_ Zero" + "name": "Zero", + "category": "Constants/Blend Factor" }, "methods": [ { "key": "GetBlendFactor_Zero", "details": { - "name": "Get Blend Factor_ Zero" + "name": "Get Zero" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendOp_Add.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendOp_Add.names index 9feda67158..b425f2038b 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendOp_Add.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendOp_Add.names @@ -5,13 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "Blend Op_ Add" + "name": "Add", + "category": "Constants/Blend Operation" }, "methods": [ { "key": "GetBlendOp_Add", "details": { - "name": "Get Blend Op_ Add" + "name": "Get Add" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendOp_Invalid.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendOp_Invalid.names index b9e879c997..9aa3ee6903 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendOp_Invalid.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendOp_Invalid.names @@ -5,13 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "Blend Op_ Invalid" + "name": "Invalid", + "category": "Constants/Blend Operation" }, "methods": [ { "key": "GetBlendOp_Invalid", "details": { - "name": "Get Blend Op_ Invalid" + "name": "Get Invalid" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendOp_Maximum.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendOp_Maximum.names index dc83763166..12e6b0f955 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendOp_Maximum.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendOp_Maximum.names @@ -5,13 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "Blend Op_ Maximum" + "name": "Maximum", + "category": "Constants/Blend Operation" }, "methods": [ { "key": "GetBlendOp_Maximum", "details": { - "name": "Get Blend Op_ Maximum" + "name": "Get Maximum" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendOp_Minimum.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendOp_Minimum.names index 309d401fb7..ca08b9af27 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendOp_Minimum.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendOp_Minimum.names @@ -5,13 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "Blend Op_ Minimum" + "name": "Minimum", + "category": "Constants/Blend Operation" }, "methods": [ { - "key": "GetBlendOp_Minimum", + "key": "Minimum", "details": { - "name": "Get Blend Op_ Minimum" + "name": "Get Minimum" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendOp_Subtract.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendOp_Subtract.names index 042bdb1e1b..1b3ad085e5 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendOp_Subtract.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendOp_Subtract.names @@ -5,13 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "Blend Op_ Subtract" + "name": "Subtract", + "category": "Constants/Blend Operation" }, "methods": [ { "key": "GetBlendOp_Subtract", "details": { - "name": "Get Blend Op_ Subtract" + "name": "Get Subtract" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendOp_SubtractReverse.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendOp_SubtractReverse.names index 1fedcfea87..53df604d84 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendOp_SubtractReverse.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendOp_SubtractReverse.names @@ -5,13 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "Blend Op_ Subtract Reverse" + "name": "Subtract Reverse", + "category": "Constants/Blend Operation" }, "methods": [ { "key": "GetBlendOp_SubtractReverse", "details": { - "name": "Get Blend Op_ Subtract Reverse" + "name": "Get Subtract Reverse" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlockerComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlockerComponentTypeId.names index d9bf8e6178..4f5ecb7f53 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlockerComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlockerComponentTypeId.names @@ -5,7 +5,8 @@ "context": "Constant", "variant": "", "details": { - "name": "Blocker Component Type Id" + "name": "Blocker Component Type Id", + "category": "Constants/Editor" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BloomComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BloomComponentTypeId.names index 1de372e9ac..64cce778c6 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BloomComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BloomComponentTypeId.names @@ -5,7 +5,8 @@ "context": "Constant", "variant": "", "details": { - "name": "Bloom Component Type Id" + "name": "Bloom Component Type Id", + "category": "Constants/Editor" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BoxShapeComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BoxShapeComponentTypeId.names index ff3b6beaaa..fd99213100 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BoxShapeComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BoxShapeComponentTypeId.names @@ -5,7 +5,8 @@ "context": "Constant", "variant": "", "details": { - "name": "Box Shape Component Type Id" + "name": "Box Shape Component Type Id", + "category": "Constants/Editor" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/CHARLIE.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/CHARLIE.names deleted file mode 100644 index 191d3adfa6..0000000000 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/CHARLIE.names +++ /dev/null @@ -1,28 +0,0 @@ -{ - "entries": [ - { - "key": "CHARLIE", - "context": "Constant", - "variant": "", - "details": { - "name": "CHARLIE" - }, - "methods": [ - { - "key": "GetCHARLIE", - "details": { - "name": "GetCHARLIE" - }, - "results": [ - { - "typeid": "{43DA906B-7DEF-4CA8-9790-854106D3F983}", - "details": { - "name": "unsigned int" - } - } - ] - } - ] - } - ] -} \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/CUBE.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/CUBE.names index 24b91264b3..b51cbc89e5 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/CUBE.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/CUBE.names @@ -5,13 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "CUBE" + "name": "Cube", + "category": "Constants/White Box" }, "methods": [ { "key": "GetCUBE", "details": { - "name": "GetCUBE" + "name": "Cube" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/CYLINDER.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/CYLINDER.names index 1a3a8194c7..bffa51f9ca 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/CYLINDER.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/CYLINDER.names @@ -5,13 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "CYLINDER" + "name": "Cylinder", + "category": "Constants/White Box" }, "methods": [ { "key": "GetCYLINDER", "details": { - "name": "GetCYLINDER" + "name": "Cylinder" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/CapsuleShapeComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/CapsuleShapeComponentTypeId.names index 5806ac5b22..9ed7a47c5c 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/CapsuleShapeComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/CapsuleShapeComponentTypeId.names @@ -5,7 +5,8 @@ "context": "Constant", "variant": "", "details": { - "name": "Capsule Shape Component Type Id" + "name": "Capsule Shape Component Type Id", + "category": "Constants/Editor" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ConstantGradientComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ConstantGradientComponentTypeId.names index 379246c5c0..cdf8701183 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ConstantGradientComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ConstantGradientComponentTypeId.names @@ -5,7 +5,8 @@ "context": "Constant", "variant": "", "details": { - "name": "Constant Gradient Component Type Id" + "name": "Constant Gradient Component Type Id", + "category": "Constants/Editor" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/CullMode_Back.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/CullMode_Back.names index b6baeda612..bdba8338db 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/CullMode_Back.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/CullMode_Back.names @@ -5,13 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "Cull Mode_ Back" + "name": "Back", + "category": "Constants/Cull Mode" }, "methods": [ { "key": "GetCullMode_Back", "details": { - "name": "Get Cull Mode_ Back" + "name": "Get Back" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/CullMode_Front.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/CullMode_Front.names index 143d95ecc0..b75bf908d2 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/CullMode_Front.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/CullMode_Front.names @@ -5,13 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "Cull Mode_ Front" + "name": "Front", + "category": "Constants/Cull Mode" }, "methods": [ { "key": "GetCullMode_Front", "details": { - "name": "Get Cull Mode_ Front" + "name": "Get Front" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/CullMode_Invalid.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/CullMode_Invalid.names index 1853ff0e5e..150e1cc258 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/CullMode_Invalid.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/CullMode_Invalid.names @@ -5,13 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "Cull Mode_ Invalid" + "name": "Invalid", + "category": "Constants/Cull Mode" }, "methods": [ { "key": "GetCullMode_Invalid", "details": { - "name": "Get Cull Mode_ Invalid" + "name": "Get Invalid" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/CullMode_None.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/CullMode_None.names index d12a4993be..6dee6b2bd8 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/CullMode_None.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/CullMode_None.names @@ -5,13 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "Cull Mode_ None" + "name": "None", + "category": "Constants/Cull Mode" }, "methods": [ { "key": "GetCullMode_None", "details": { - "name": "Get Cull Mode_ None" + "name": "Get None" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/CylinderShapeComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/CylinderShapeComponentTypeId.names index e53b6da3a5..ed35cb40b5 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/CylinderShapeComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/CylinderShapeComponentTypeId.names @@ -5,7 +5,8 @@ "context": "Constant", "variant": "", "details": { - "name": "Cylinder Shape Component Type Id" + "name": "Cylinder Shape Component Type Id", + "category": "Constants/Editor" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DecalComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DecalComponentTypeId.names index 611436b375..ee13b45215 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DecalComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DecalComponentTypeId.names @@ -5,7 +5,8 @@ "context": "Constant", "variant": "", "details": { - "name": "Decal Component Type Id" + "name": "Decal Component Type Id", + "category": "Constants/Editor" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DefaultLodOverride.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DefaultLodOverride.names index 6d435835d0..aa356e7ce8 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DefaultLodOverride.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DefaultLodOverride.names @@ -5,7 +5,8 @@ "context": "Constant", "variant": "", "details": { - "name": "Default Lod Override" + "name": "Default Lod Override", + "category": "Constants/Defaults" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DefaultLodType.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DefaultLodType.names index cc81542ee0..ca4dbc315f 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DefaultLodType.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DefaultLodType.names @@ -5,7 +5,8 @@ "context": "Constant", "variant": "", "details": { - "name": "Default Lod Type" + "name": "Default Lod Type", + "category": "Constants/Defaults" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DefaultMaterialAssignment.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DefaultMaterialAssignment.names index ab9af578b2..55d2a1bff0 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DefaultMaterialAssignment.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DefaultMaterialAssignment.names @@ -5,7 +5,8 @@ "context": "Constant", "variant": "", "details": { - "name": "Default Material Assignment" + "name": "Default Material Assignment", + "category": "Constants/Defaults" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DefaultMaterialAssignmentId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DefaultMaterialAssignmentId.names index 3f58471a22..5d105b63c5 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DefaultMaterialAssignmentId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DefaultMaterialAssignmentId.names @@ -5,7 +5,8 @@ "context": "Constant", "variant": "", "details": { - "name": "Default Material Assignment Id" + "name": "Default Material Assignment Id", + "category": "Constants/Defaults" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DefaultMaterialAssignmentMap.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DefaultMaterialAssignmentMap.names index 6bf0c18be5..c64da412e1 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DefaultMaterialAssignmentMap.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DefaultMaterialAssignmentMap.names @@ -5,7 +5,8 @@ "context": "Constant", "variant": "", "details": { - "name": "Default Material Assignment Map" + "name": "Default Material Assignment Map", + "category": "Constants/Defaults" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DefaultPhysicsSceneId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DefaultPhysicsSceneId.names index dc93bc89cc..5868303abd 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DefaultPhysicsSceneId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DefaultPhysicsSceneId.names @@ -5,7 +5,8 @@ "context": "Constant", "variant": "", "details": { - "name": "Default Physics Scene Id" + "name": "Default Physics Scene Id", + "category": "Constants/Defaults" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DefaultPhysicsSceneName.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DefaultPhysicsSceneName.names index 65f1edc0bf..0d83dbeaa4 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DefaultPhysicsSceneName.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DefaultPhysicsSceneName.names @@ -5,7 +5,8 @@ "context": "Constant", "variant": "", "details": { - "name": "Default Physics Scene Name" + "name": "Default Physics Scene Name", + "category": "Constants/Defaults" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DeferredFogComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DeferredFogComponentTypeId.names index 3bbd2c69da..dbfcf1ceab 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DeferredFogComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DeferredFogComponentTypeId.names @@ -5,7 +5,8 @@ "context": "Constant", "variant": "", "details": { - "name": "Deferred Fog Component Type Id" + "name": "Deferred Fog Component Type Id", + "category": "Constants/Editor" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DepthOfFieldComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DepthOfFieldComponentTypeId.names index f3edefd291..e166e29ac2 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DepthOfFieldComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DepthOfFieldComponentTypeId.names @@ -5,7 +5,8 @@ "context": "Constant", "variant": "", "details": { - "name": "Depth Of Field Component Type Id" + "name": "Depth Of Field Component Type Id", + "category": "Constants/Editor" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DepthWriteMask_All.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DepthWriteMask_All.names index c1247f9834..3306462911 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DepthWriteMask_All.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DepthWriteMask_All.names @@ -5,7 +5,8 @@ "context": "Constant", "variant": "", "details": { - "name": "Depth Write Mask_ All" + "name": "Depth Write Mask_ All", + "category": "Constants/Depth Write Mask" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DepthWriteMask_Invalid.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DepthWriteMask_Invalid.names index a4887d3986..890b110969 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DepthWriteMask_Invalid.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DepthWriteMask_Invalid.names @@ -5,7 +5,8 @@ "context": "Constant", "variant": "", "details": { - "name": "Depth Write Mask_ Invalid" + "name": "Depth Write Mask_ Invalid", + "category": "Constants/Depth Write Mask" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DepthWriteMask_Zero.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DepthWriteMask_Zero.names index c25e5b683d..17e0fdfc11 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DepthWriteMask_Zero.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DepthWriteMask_Zero.names @@ -5,7 +5,8 @@ "context": "Constant", "variant": "", "details": { - "name": "Depth Write Mask_ Zero" + "name": "Depth Write Mask_ Zero", + "category": "Constants/Depth Write Mask" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DescriptorListCombinerComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DescriptorListCombinerComponentTypeId.names index 0b4ea93d62..5be6ea02cc 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DescriptorListCombinerComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DescriptorListCombinerComponentTypeId.names @@ -5,7 +5,8 @@ "context": "Constant", "variant": "", "details": { - "name": "Descriptor List Combiner Component Type Id" + "name": "Descriptor List Combiner Component Type Id", + "category": "Constants/Editor" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DescriptorListComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DescriptorListComponentTypeId.names index 2e5faa3958..fab274e61a 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DescriptorListComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DescriptorListComponentTypeId.names @@ -5,7 +5,8 @@ "context": "Constant", "variant": "", "details": { - "name": "Descriptor List Component Type Id" + "name": "Descriptor List Component Type Id", + "category": "Constants/Editor" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DescriptorWeightSelectorComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DescriptorWeightSelectorComponentTypeId.names index 3e3c9c41d7..4c34e62926 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DescriptorWeightSelectorComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DescriptorWeightSelectorComponentTypeId.names @@ -5,7 +5,8 @@ "context": "Constant", "variant": "", "details": { - "name": "Descriptor Weight Selector Component Type Id" + "name": "Descriptor Weight Selector Component Type Id", + "category": "Constants/Editor" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DiffuseGlobalIlluminationComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DiffuseGlobalIlluminationComponentTypeId.names index fbd3e36e8f..6b1e0d2274 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DiffuseGlobalIlluminationComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DiffuseGlobalIlluminationComponentTypeId.names @@ -5,7 +5,8 @@ "context": "Constant", "variant": "", "details": { - "name": "Diffuse Global Illumination Component Type Id" + "name": "Diffuse Global Illumination Component Type Id", + "category": "Constants/Editor" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DiffuseProbeGridComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DiffuseProbeGridComponentTypeId.names index 899d97641b..17b3fe0d71 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DiffuseProbeGridComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DiffuseProbeGridComponentTypeId.names @@ -5,7 +5,8 @@ "context": "Constant", "variant": "", "details": { - "name": "Diffuse Probe Grid Component Type Id" + "name": "Diffuse Probe Grid Component Type Id", + "category": "Constants/Editor" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DirectionalLightComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DirectionalLightComponentTypeId.names index 660d41eb5d..e26bad9485 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DirectionalLightComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DirectionalLightComponentTypeId.names @@ -5,7 +5,8 @@ "context": "Constant", "variant": "", "details": { - "name": "Directional Light Component Type Id" + "name": "Directional Light Component Type Id", + "category": "Constants/Editor" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DiskShapeComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DiskShapeComponentTypeId.names index 044432a574..3785153499 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DiskShapeComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DiskShapeComponentTypeId.names @@ -5,7 +5,8 @@ "context": "Constant", "variant": "", "details": { - "name": "Disk Shape Component Type Id" + "name": "Disk Shape Component Type Id", + "category": "Constants/Editor" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DisplayMapperComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DisplayMapperComponentTypeId.names index c9ff71c852..14ac43a4f1 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DisplayMapperComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DisplayMapperComponentTypeId.names @@ -5,7 +5,8 @@ "context": "Constant", "variant": "", "details": { - "name": "Display Mapper Component Type Id" + "name": "Display Mapper Component Type Id", + "category": "Constants/Editor" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DisplaySettings_HideHelpers.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DisplaySettings_HideHelpers.names index 35e3dfbfdd..39edc099c6 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DisplaySettings_HideHelpers.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DisplaySettings_HideHelpers.names @@ -5,13 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "Display Settings_ Hide Helpers" + "name": "Hide Helpers", + "category": "Constants/Display Settings" }, "methods": [ { "key": "GetDisplaySettings_HideHelpers", "details": { - "name": "Get Display Settings_ Hide Helpers" + "name": "Get Hide Helpers" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DisplaySettings_HideLinks.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DisplaySettings_HideLinks.names index 6bbe7840b8..718bfd6bb9 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DisplaySettings_HideLinks.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DisplaySettings_HideLinks.names @@ -5,13 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "Display Settings_ Hide Links" + "name": "Hide Links", + "category": "Constants/Display Settings" }, "methods": [ { "key": "GetDisplaySettings_HideLinks", "details": { - "name": "Get Display Settings_ Hide Links" + "name": "Get Hide Links" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DisplaySettings_HideTracks.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DisplaySettings_HideTracks.names index c67b3236a5..92d364f846 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DisplaySettings_HideTracks.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DisplaySettings_HideTracks.names @@ -5,13 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "Display Settings_ Hide Tracks" + "name": "Hide Tracks", + "category": "Constants/Display Settings" }, "methods": [ { "key": "GetDisplaySettings_HideTracks", "details": { - "name": "Get Display Settings_ Hide Tracks" + "name": "Get Hide Tracks" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DisplaySettings_NoCollision.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DisplaySettings_NoCollision.names index 2c06048179..1d889e2a36 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DisplaySettings_NoCollision.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DisplaySettings_NoCollision.names @@ -5,13 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "Display Settings_ No Collision" + "name": "No Collision", + "category": "Constants/Display Settings" }, "methods": [ { "key": "GetDisplaySettings_NoCollision", "details": { - "name": "Get Display Settings_ No Collision" + "name": "Get No Collision" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DisplaySettings_NoLabels.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DisplaySettings_NoLabels.names index 23ef0c0ddd..d5e7eac4ea 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DisplaySettings_NoLabels.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DisplaySettings_NoLabels.names @@ -5,13 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "Display Settings_ No Labels" + "name": "No Labels", + "category": "Constants/Display Settings" }, "methods": [ { "key": "GetDisplaySettings_NoLabels", "details": { - "name": "Get Display Settings_ No Labels" + "name": "Get No Labels" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DisplaySettings_Physics.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DisplaySettings_Physics.names index 1ed2194a31..211f15d61c 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DisplaySettings_Physics.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DisplaySettings_Physics.names @@ -5,13 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "Display Settings_ Physics" + "name": "Physics", + "category": "Constants/Display Settings" }, "methods": [ { "key": "GetDisplaySettings_Physics", "details": { - "name": "Get Display Settings_ Physics" + "name": "Get Physics" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DisplaySettings_SerializableFlagsMask.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DisplaySettings_SerializableFlagsMask.names index ab122edd5e..c58ff484a5 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DisplaySettings_SerializableFlagsMask.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DisplaySettings_SerializableFlagsMask.names @@ -5,13 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "Display Settings_ Serializable Flags Mask" + "name": "Serializable Flags Mask", + "category": "Constants/Display Settings" }, "methods": [ { "key": "GetDisplaySettings_SerializableFlagsMask", "details": { - "name": "Get Display Settings_ Serializable Flags Mask" + "name": "Get Serializable Flags Mask" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DisplaySettings_ShowDimensionFigures.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DisplaySettings_ShowDimensionFigures.names index 82a333fde2..c9e85d3655 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DisplaySettings_ShowDimensionFigures.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DisplaySettings_ShowDimensionFigures.names @@ -5,13 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "Display Settings_ Show Dimension Figures" + "name": "Show Dimension Figures", + "category": "Constants/Display Settings" }, "methods": [ { "key": "GetDisplaySettings_ShowDimensionFigures", "details": { - "name": "Get Display Settings_ Show Dimension Figures" + "name": "Get Show Dimension Figures" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DistanceBetweenFilterComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DistanceBetweenFilterComponentTypeId.names index a959835ec8..02b22eb18b 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DistanceBetweenFilterComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DistanceBetweenFilterComponentTypeId.names @@ -5,7 +5,8 @@ "context": "Constant", "variant": "", "details": { - "name": "Distance Between Filter Component Type Id" + "name": "Distance Between Filter Component Type Id", + "category": "Constants/Editor" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DistributionFilterComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DistributionFilterComponentTypeId.names index 6c3050def5..9397391c26 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DistributionFilterComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DistributionFilterComponentTypeId.names @@ -5,7 +5,8 @@ "context": "Constant", "variant": "", "details": { - "name": "Distribution Filter Component Type Id" + "name": "Distribution Filter Component Type Id", + "category": "Constants/Editor" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DitherGradientComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DitherGradientComponentTypeId.names index 92462cece4..e1e8fc004e 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DitherGradientComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DitherGradientComponentTypeId.names @@ -5,7 +5,8 @@ "context": "Constant", "variant": "", "details": { - "name": "Dither Gradient Component Type Id" + "name": "Dither Gradient Component Type Id", + "category": "Constants/Editor/Component Type Id" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorAreaLightComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorAreaLightComponentTypeId.names index a283f79413..3ccdef3c90 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorAreaLightComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorAreaLightComponentTypeId.names @@ -5,7 +5,8 @@ "context": "Constant", "variant": "", "details": { - "name": "Editor Area Light Component Type Id" + "name": "Editor Area Light Component Type Id", + "category": "Constants/Editor/Component Type Id" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorBloomComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorBloomComponentTypeId.names index f6b2016cc6..ea31089a11 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorBloomComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorBloomComponentTypeId.names @@ -5,7 +5,8 @@ "context": "Constant", "variant": "", "details": { - "name": "Editor Bloom Component Type Id" + "name": "Editor Bloom Component Type Id", + "category": "Constants/Editor/Component Type Id" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorDecalComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorDecalComponentTypeId.names index b8a36069a8..b69fcb372a 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorDecalComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorDecalComponentTypeId.names @@ -5,7 +5,8 @@ "context": "Constant", "variant": "", "details": { - "name": "Editor Decal Component Type Id" + "name": "Editor Decal Component Type Id", + "category": "Constants/Editor/Component Type Id" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorDeferredFogComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorDeferredFogComponentTypeId.names index 2df1d4ec84..6db10fabfb 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorDeferredFogComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorDeferredFogComponentTypeId.names @@ -5,7 +5,8 @@ "context": "Constant", "variant": "", "details": { - "name": "Editor Deferred Fog Component Type Id" + "name": "Editor Deferred Fog Component Type Id", + "category": "Constants/Editor/Component Type Id" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorDepthOfFieldComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorDepthOfFieldComponentTypeId.names index dbaaaa147f..2dfe8dc95f 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorDepthOfFieldComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorDepthOfFieldComponentTypeId.names @@ -5,7 +5,8 @@ "context": "Constant", "variant": "", "details": { - "name": "Editor Depth Of Field Component Type Id" + "name": "Editor Depth Of Field Component Type Id", + "category": "Constants/Editor/Component Type Id" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorDiffuseGlobalIlluminationComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorDiffuseGlobalIlluminationComponentTypeId.names index 9eb3c93944..936e7d3dcc 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorDiffuseGlobalIlluminationComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorDiffuseGlobalIlluminationComponentTypeId.names @@ -5,7 +5,8 @@ "context": "Constant", "variant": "", "details": { - "name": "Editor Diffuse Global Illumination Component Type Id" + "name": "Editor Diffuse Global Illumination Component Type Id", + "category": "Constants/Editor/Component Type Id" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorDiffuseProbeGridComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorDiffuseProbeGridComponentTypeId.names index 00bee56378..41fe82f546 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorDiffuseProbeGridComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorDiffuseProbeGridComponentTypeId.names @@ -5,7 +5,8 @@ "context": "Constant", "variant": "", "details": { - "name": "Editor Diffuse Probe Grid Component Type Id" + "name": "Editor Diffuse Probe Grid Component Type Id", + "category": "Constants/Editor" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorDirectionalLightComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorDirectionalLightComponentTypeId.names index 99f34c0d3c..0df16ac38a 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorDirectionalLightComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorDirectionalLightComponentTypeId.names @@ -5,7 +5,8 @@ "context": "Constant", "variant": "", "details": { - "name": "Editor Directional Light Component Type Id" + "name": "Editor Directional Light Component Type Id", + "category": "Constants/Editor" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorDisplayMapperComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorDisplayMapperComponentTypeId.names index 0e388dd703..115f43abc6 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorDisplayMapperComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorDisplayMapperComponentTypeId.names @@ -5,7 +5,8 @@ "context": "Constant", "variant": "", "details": { - "name": "Editor Display Mapper Component Type Id" + "name": "Editor Display Mapper Component Type Id", + "category": "Constants/Editor" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorEntityReferenceComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorEntityReferenceComponentTypeId.names index e83689b243..fb4126a455 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorEntityReferenceComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorEntityReferenceComponentTypeId.names @@ -5,7 +5,8 @@ "context": "Constant", "variant": "", "details": { - "name": "Editor Entity Reference Component Type Id" + "name": "Editor Entity Reference Component Type Id", + "category": "Constants/Editor" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorEntityStartStatus_EditorOnly.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorEntityStartStatus_EditorOnly.names index 65d7e78197..9c661077d4 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorEntityStartStatus_EditorOnly.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorEntityStartStatus_EditorOnly.names @@ -5,7 +5,8 @@ "context": "Constant", "variant": "", "details": { - "name": "Editor Entity Start Status_ Editor Only" + "name": "Editor Entity Start Status_ Editor Only", + "category": "Constants/Editor" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorEntityStartStatus_StartActive.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorEntityStartStatus_StartActive.names index 2c26e7c619..16256448a3 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorEntityStartStatus_StartActive.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorEntityStartStatus_StartActive.names @@ -5,7 +5,8 @@ "context": "Constant", "variant": "", "details": { - "name": "Editor Entity Start Status_ Start Active" + "name": "Editor Entity Start Status_ Start Active", + "category": "Constants/Editor" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorEntityStartStatus_StartInactive.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorEntityStartStatus_StartInactive.names index 54c3a17d75..b65178acca 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorEntityStartStatus_StartInactive.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorEntityStartStatus_StartInactive.names @@ -5,7 +5,8 @@ "context": "Constant", "variant": "", "details": { - "name": "Editor Entity Start Status_ Start Inactive" + "name": "Editor Entity Start Status_ Start Inactive", + "category": "Constants/Editor" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorExposureControlComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorExposureControlComponentTypeId.names index 2fd540d06c..6048df512b 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorExposureControlComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorExposureControlComponentTypeId.names @@ -5,7 +5,8 @@ "context": "Constant", "variant": "", "details": { - "name": "Editor Exposure Control Component Type Id" + "name": "Editor Exposure Control Component Type Id", + "category": "Constants/Editor" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorGradientWeightModifierComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorGradientWeightModifierComponentTypeId.names index da58fa9259..089ce77046 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorGradientWeightModifierComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorGradientWeightModifierComponentTypeId.names @@ -5,7 +5,8 @@ "context": "Constant", "variant": "", "details": { - "name": "Editor Gradient Weight Modifier Component Type Id" + "name": "Editor Gradient Weight Modifier Component Type Id", + "category": "Constants/Editor" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorGridComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorGridComponentTypeId.names index de70fdea93..82d83055b5 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorGridComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorGridComponentTypeId.names @@ -5,7 +5,8 @@ "context": "Constant", "variant": "", "details": { - "name": "Editor Grid Component Type Id" + "name": "Editor Grid Component Type Id", + "category": "Constants/Editor" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorHDRiSkyboxComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorHDRiSkyboxComponentTypeId.names index 0854b542a8..21db0e71f6 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorHDRiSkyboxComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorHDRiSkyboxComponentTypeId.names @@ -5,7 +5,8 @@ "context": "Constant", "variant": "", "details": { - "name": "EditorHD Ri Skybox Component Type Id" + "name": "EditorHD Ri Skybox Component Type Id", + "category": "Constants/Editor" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorHairComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorHairComponentTypeId.names index 9bba733295..4023cf04bf 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorHairComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorHairComponentTypeId.names @@ -5,7 +5,8 @@ "context": "Constant", "variant": "", "details": { - "name": "Editor Hair Component Type Id" + "name": "Editor Hair Component Type Id", + "category": "Constants/Editor" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorImageBasedLightComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorImageBasedLightComponentTypeId.names index bc680351c1..8163c59d3e 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorImageBasedLightComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorImageBasedLightComponentTypeId.names @@ -5,7 +5,8 @@ "context": "Constant", "variant": "", "details": { - "name": "Editor Image Based Light Component Type Id" + "name": "Editor Image Based Light Component Type Id", + "category": "Constants/Editor" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorLookModificationComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorLookModificationComponentTypeId.names index 0268909af8..285f3a3666 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorLookModificationComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorLookModificationComponentTypeId.names @@ -5,7 +5,8 @@ "context": "Constant", "variant": "", "details": { - "name": "Editor Look Modification Component Type Id" + "name": "Editor Look Modification Component Type Id", + "category": "Constants/Editor" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorMaterialComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorMaterialComponentTypeId.names index 4fb9c163d5..e6b3f37bf9 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorMaterialComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorMaterialComponentTypeId.names @@ -5,7 +5,8 @@ "context": "Constant", "variant": "", "details": { - "name": "Editor Material Component Type Id" + "name": "Editor Material Component Type Id", + "category": "Constants/Editor" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorMeshComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorMeshComponentTypeId.names index 4e5011457a..a2def3a185 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorMeshComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorMeshComponentTypeId.names @@ -5,7 +5,8 @@ "context": "Constant", "variant": "", "details": { - "name": "Editor Mesh Component Type Id" + "name": "Editor Mesh Component Type Id", + "category": "Constants/Editor" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorNonUniformScaleComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorNonUniformScaleComponentTypeId.names index 6d4a0843d9..6b6b0b9ca9 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorNonUniformScaleComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorNonUniformScaleComponentTypeId.names @@ -5,7 +5,8 @@ "context": "Constant", "variant": "", "details": { - "name": "Editor Non Uniform Scale Component Type Id" + "name": "Editor Non Uniform Scale Component Type Id", + "category": "Constants/Editor" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorOcclusionCullingPlaneComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorOcclusionCullingPlaneComponentTypeId.names index 68e47583b4..73f96098d9 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorOcclusionCullingPlaneComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorOcclusionCullingPlaneComponentTypeId.names @@ -5,7 +5,8 @@ "context": "Constant", "variant": "", "details": { - "name": "Editor Occlusion Culling Plane Component Type Id" + "name": "Editor Occlusion Culling Plane Component Type Id", + "category": "Constants/Editor" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorPhysicalSkyComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorPhysicalSkyComponentTypeId.names index 24baef9d81..6309ed6321 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorPhysicalSkyComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorPhysicalSkyComponentTypeId.names @@ -5,7 +5,8 @@ "context": "Constant", "variant": "", "details": { - "name": "Editor Physical Sky Component Type Id" + "name": "Editor Physical Sky Component Type Id", + "category": "Constants/Editor" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorPhysicsSceneId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorPhysicsSceneId.names index 1af12c6c6a..99a9d21ddf 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorPhysicsSceneId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorPhysicsSceneId.names @@ -5,7 +5,8 @@ "context": "Constant", "variant": "", "details": { - "name": "Editor Physics Scene Id" + "name": "Editor Physics Scene Id", + "category": "Constants/Editor" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorPhysicsSceneName.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorPhysicsSceneName.names index c145101628..2ac4fb9bab 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorPhysicsSceneName.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorPhysicsSceneName.names @@ -5,7 +5,8 @@ "context": "Constant", "variant": "", "details": { - "name": "Editor Physics Scene Name" + "name": "Editor Physics Scene Name", + "category": "Constants/Editor" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorPostFxLayerComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorPostFxLayerComponentTypeId.names index 36d903072d..76336a7ae0 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorPostFxLayerComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorPostFxLayerComponentTypeId.names @@ -5,7 +5,8 @@ "context": "Constant", "variant": "", "details": { - "name": "Editor Post Fx Layer Component Type Id" + "name": "Editor Post Fx Layer Component Type Id", + "category": "Constants/Editor" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorPrefabComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorPrefabComponentTypeId.names index 7e83dd392c..23f9abfa1c 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorPrefabComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorPrefabComponentTypeId.names @@ -5,7 +5,8 @@ "context": "Constant", "variant": "", "details": { - "name": "Editor Prefab Component Type Id" + "name": "Editor Prefab Component Type Id", + "category": "Constants/Editor" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorRadiusWeightModifierComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorRadiusWeightModifierComponentTypeId.names index ce044aeb6c..899d0a0da1 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorRadiusWeightModifierComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorRadiusWeightModifierComponentTypeId.names @@ -5,7 +5,8 @@ "context": "Constant", "variant": "", "details": { - "name": "Editor Radius Weight Modifier Component Type Id" + "name": "Editor Radius Weight Modifier Component Type Id", + "category": "Constants/Editor" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorReflectionProbeComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorReflectionProbeComponentTypeId.names index 382bc43d85..aaea2f0d5c 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorReflectionProbeComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorReflectionProbeComponentTypeId.names @@ -5,7 +5,8 @@ "context": "Constant", "variant": "", "details": { - "name": "Editor Reflection Probe Component Type Id" + "name": "Editor Reflection Probe Component Type Id", + "category": "Constants/Editor" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorShapeWeightModifierComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorShapeWeightModifierComponentTypeId.names index eaf1c926ee..32910e23cb 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorShapeWeightModifierComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorShapeWeightModifierComponentTypeId.names @@ -5,7 +5,8 @@ "context": "Constant", "variant": "", "details": { - "name": "Editor Shape Weight Modifier Component Type Id" + "name": "Editor Shape Weight Modifier Component Type Id", + "category": "Constants/Editor" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorSsaoComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorSsaoComponentTypeId.names index 6e1de64a18..163d0b924f 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorSsaoComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorSsaoComponentTypeId.names @@ -5,7 +5,8 @@ "context": "Constant", "variant": "", "details": { - "name": "Editor Ssao Component Type Id" + "name": "Editor Ssao Component Type Id", + "category": "Constants/Editor" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorTransformComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorTransformComponentTypeId.names index 4fa1899ee5..2e925bacb5 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorTransformComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorTransformComponentTypeId.names @@ -5,7 +5,8 @@ "context": "Constant", "variant": "", "details": { - "name": "Editor Transform Component Type Id" + "name": "Editor Transform Component Type Id", + "category": "Constants/Editor" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EntityReferenceComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EntityReferenceComponentTypeId.names index 958604cc43..3028bc10a9 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EntityReferenceComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EntityReferenceComponentTypeId.names @@ -5,7 +5,8 @@ "context": "Constant", "variant": "", "details": { - "name": "Entity Reference Component Type Id" + "name": "Entity Reference Component Type Id", + "category": "Constants/Editor" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ExposureControlComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ExposureControlComponentTypeId.names index df48a559c0..e647de6ad3 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ExposureControlComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ExposureControlComponentTypeId.names @@ -5,7 +5,8 @@ "context": "Constant", "variant": "", "details": { - "name": "Exposure Control Component Type Id" + "name": "Exposure Control Component Type Id", + "category": "Constants/Editor" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FastNoiseGradientComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FastNoiseGradientComponentTypeId.names index 84bd2b4583..041c43701a 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FastNoiseGradientComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FastNoiseGradientComponentTypeId.names @@ -5,7 +5,8 @@ "context": "Constant", "variant": "", "details": { - "name": "Fast Noise Gradient Component Type Id" + "name": "Fast Noise Gradient Component Type Id", + "category": "Constants/Editor" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FillMode_Invalid.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FillMode_Invalid.names index bc3025ba93..40a47d894d 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FillMode_Invalid.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FillMode_Invalid.names @@ -5,7 +5,8 @@ "context": "Constant", "variant": "", "details": { - "name": "Fill Mode_ Invalid" + "name": "Fill Mode_ Invalid", + "category": "Constants/Fill Mode" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FillMode_Solid.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FillMode_Solid.names index 2fede46e00..4de555958e 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FillMode_Solid.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FillMode_Solid.names @@ -5,7 +5,8 @@ "context": "Constant", "variant": "", "details": { - "name": "Fill Mode_ Solid" + "name": "Fill Mode_ Solid", + "category": "Constants/Fill Mode" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FillMode_Wireframe.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FillMode_Wireframe.names index 0e88c95626..86889a4f2c 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FillMode_Wireframe.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FillMode_Wireframe.names @@ -5,7 +5,8 @@ "context": "Constant", "variant": "", "details": { - "name": "Fill Mode_ Wireframe" + "name": "Fill Mode_ Wireframe", + "category": "Constants/Fill Mode" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FloatEpsilon.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FloatEpsilon.names index b186c5227c..34e6063417 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FloatEpsilon.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FloatEpsilon.names @@ -5,7 +5,8 @@ "context": "Constant", "variant": "", "details": { - "name": "Float Epsilon" + "name": "Float Epsilon", + "category": "Constants/Numeric" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FrameCaptureResult_FileWriteError.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FrameCaptureResult_FileWriteError.names index 309c149eca..835f31cdeb 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FrameCaptureResult_FileWriteError.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FrameCaptureResult_FileWriteError.names @@ -5,7 +5,8 @@ "context": "Constant", "variant": "", "details": { - "name": "Frame Capture Result_ File Write Error" + "name": "Frame Capture Result_ File Write Error", + "category": "Constants/Frame Capture Result" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FrameCaptureResult_InternalError.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FrameCaptureResult_InternalError.names index fdd46c6d5d..6ffed14cc8 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FrameCaptureResult_InternalError.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FrameCaptureResult_InternalError.names @@ -5,7 +5,8 @@ "context": "Constant", "variant": "", "details": { - "name": "Frame Capture Result_ Internal Error" + "name": "Frame Capture Result_ Internal Error", + "category": "Constants/Frame Capture Result" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FrameCaptureResult_InvalidArgument.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FrameCaptureResult_InvalidArgument.names index dcb41c67aa..0193fd194b 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FrameCaptureResult_InvalidArgument.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FrameCaptureResult_InvalidArgument.names @@ -5,7 +5,8 @@ "context": "Constant", "variant": "", "details": { - "name": "Frame Capture Result_ Invalid Argument" + "name": "Frame Capture Result_ Invalid Argument", + "category": "Constants/Frame Capture Result" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FrameCaptureResult_None.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FrameCaptureResult_None.names index 847802e5cc..55be309ce2 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FrameCaptureResult_None.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FrameCaptureResult_None.names @@ -5,7 +5,8 @@ "context": "Constant", "variant": "", "details": { - "name": "Frame Capture Result_ None" + "name": "Frame Capture Result_ None", + "category": "Constants/Frame Capture Result" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FrameCaptureResult_Success.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FrameCaptureResult_Success.names index 359ae90726..0098802261 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FrameCaptureResult_Success.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FrameCaptureResult_Success.names @@ -5,7 +5,8 @@ "context": "Constant", "variant": "", "details": { - "name": "Frame Capture Result_ Success" + "name": "Frame Capture Result_ Success", + "category": "Constants/Frame Capture Result" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FrameCaptureResult_UnsupportedFormat.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FrameCaptureResult_UnsupportedFormat.names index 3fa969b1b2..07e0345d30 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FrameCaptureResult_UnsupportedFormat.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FrameCaptureResult_UnsupportedFormat.names @@ -5,7 +5,8 @@ "context": "Constant", "variant": "", "details": { - "name": "Frame Capture Result_ Unsupported Format" + "name": "Frame Capture Result_ Unsupported Format", + "category": "Constants/Frame Capture Result" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/GradientSurfaceDataComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/GradientSurfaceDataComponentTypeId.names index f9d71f573b..738344fe5d 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/GradientSurfaceDataComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/GradientSurfaceDataComponentTypeId.names @@ -5,7 +5,8 @@ "context": "Constant", "variant": "", "details": { - "name": "Gradient Surface Data Component Type Id" + "name": "Gradient Surface Data Component Type Id", + "category": "Constants/Editor" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/GradientTransformComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/GradientTransformComponentTypeId.names index b704ef2a56..4a87849a90 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/GradientTransformComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/GradientTransformComponentTypeId.names @@ -5,7 +5,8 @@ "context": "Constant", "variant": "", "details": { - "name": "Gradient Transform Component Type Id" + "name": "Gradient Transform Component Type Id", + "category": "Constants/Editor" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/GradientWeightModifierComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/GradientWeightModifierComponentTypeId.names index 8a0fca75fc..6c330f20a6 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/GradientWeightModifierComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/GradientWeightModifierComponentTypeId.names @@ -5,7 +5,8 @@ "context": "Constant", "variant": "", "details": { - "name": "Gradient Weight Modifier Component Type Id" + "name": "Gradient Weight Modifier Component Type Id", + "category": "Constants/Editor" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/GridComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/GridComponentTypeId.names index 9d0eb31c18..47ceaedf7d 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/GridComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/GridComponentTypeId.names @@ -5,7 +5,8 @@ "context": "Constant", "variant": "", "details": { - "name": "Grid Component Type Id" + "name": "Grid Component Type Id", + "category": "Constants/Editor" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/HDRiSkyboxComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/HDRiSkyboxComponentTypeId.names index 704c5d7d24..e751828cbd 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/HDRiSkyboxComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/HDRiSkyboxComponentTypeId.names @@ -5,7 +5,8 @@ "context": "Constant", "variant": "", "details": { - "name": "HD Ri Skybox Component Type Id" + "name": "HD Ri Skybox Component Type Id", + "category": "Constants/Editor" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/HairComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/HairComponentTypeId.names index cf078292a0..622365e02b 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/HairComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/HairComponentTypeId.names @@ -5,7 +5,8 @@ "context": "Constant", "variant": "", "details": { - "name": "Hair Component Type Id" + "name": "Hair Component Type Id", + "category": "Constants/Editor" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ICOSAHEDRON.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ICOSAHEDRON.names index 4c273fbbf7..a682faf391 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ICOSAHEDRON.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ICOSAHEDRON.names @@ -5,13 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "ICOSAHEDRON" + "name": "Icosahedron", + "category": "Constants/White Box" }, "methods": [ { "key": "GetICOSAHEDRON", "details": { - "name": "GetICOSAHEDRON" + "name": "Icosahedron" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ImageBasedLightComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ImageBasedLightComponentTypeId.names index 25d19bd73e..ce12489188 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ImageBasedLightComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ImageBasedLightComponentTypeId.names @@ -5,7 +5,8 @@ "context": "Constant", "variant": "", "details": { - "name": "Image Based Light Component Type Id" + "name": "Image Based Light Component Type Id", + "category": "Constants/Editor" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ImageGradientComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ImageGradientComponentTypeId.names index e68215a756..33833b9276 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ImageGradientComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ImageGradientComponentTypeId.names @@ -5,7 +5,8 @@ "context": "Constant", "variant": "", "details": { - "name": "Image Gradient Component Type Id" + "name": "Image Gradient Component Type Id", + "category": "Constants/Editor" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/InvalidComponentId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/InvalidComponentId.names index 908b2bc0aa..fd02ea1cff 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/InvalidComponentId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/InvalidComponentId.names @@ -5,7 +5,8 @@ "context": "Constant", "variant": "", "details": { - "name": "Invalid Component Id" + "name": "Invalid Component Id", + "category": "Constants/Editor" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/InvalidParameterIndex.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/InvalidParameterIndex.names index 6860443397..7b51f760c6 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/InvalidParameterIndex.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/InvalidParameterIndex.names @@ -5,7 +5,8 @@ "context": "Constant", "variant": "", "details": { - "name": "Invalid Parameter Index" + "name": "Invalid Parameter Index", + "category": "Constants/Editor" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/InvalidTemplateId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/InvalidTemplateId.names index 10430e9507..06a39600c4 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/InvalidTemplateId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/InvalidTemplateId.names @@ -5,7 +5,8 @@ "context": "Constant", "variant": "", "details": { - "name": "Invalid Template Id" + "name": "Invalid Template Id", + "category": "Constants/Editor" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/InvertGradientComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/InvertGradientComponentTypeId.names index a809c0f220..bbf4a4894d 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/InvertGradientComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/InvertGradientComponentTypeId.names @@ -5,7 +5,8 @@ "context": "Constant", "variant": "", "details": { - "name": "Invert Gradient Component Type Id" + "name": "Invert Gradient Component Type Id", + "category": "Constants/Editor" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/JsonMergePatch.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/JsonMergePatch.names index b1334c1b04..d9d2570e7f 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/JsonMergePatch.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/JsonMergePatch.names @@ -5,7 +5,8 @@ "context": "Constant", "variant": "", "details": { - "name": "Json Merge Patch" + "name": "Json Merge Patch", + "category": "Constants/Json" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/JsonPatch.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/JsonPatch.names index 9823329c76..f6ac94bc60 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/JsonPatch.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/JsonPatch.names @@ -5,7 +5,8 @@ "context": "Constant", "variant": "", "details": { - "name": "Json Patch" + "name": "Json Patch", + "category": "Constants/Json" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/LANDSCAPE_CANVAS_EDITOR_ID.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/LANDSCAPE_CANVAS_EDITOR_ID.names index ddb8739fb5..533d7bc0e4 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/LANDSCAPE_CANVAS_EDITOR_ID.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/LANDSCAPE_CANVAS_EDITOR_ID.names @@ -5,13 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "LANDSCAPE_CANVAS_EDITOR_ID" + "name": "Editor Id", + "category": "Constants/Landscape Canvas" }, "methods": [ { "key": "GetLANDSCAPE_CANVAS_EDITOR_ID", "details": { - "name": "GetLANDSCAPE_CANVAS_EDITOR_ID" + "name": "Editor Id" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/LevelSettingsComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/LevelSettingsComponentTypeId.names index d6617651b0..cae16f3af6 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/LevelSettingsComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/LevelSettingsComponentTypeId.names @@ -5,7 +5,8 @@ "context": "Constant", "variant": "", "details": { - "name": "Level Settings Component Type Id" + "name": "Level Settings Component Type Id", + "category": "Constants/Editor" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/LevelsGradientComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/LevelsGradientComponentTypeId.names index 1269dc913d..1fb4d80484 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/LevelsGradientComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/LevelsGradientComponentTypeId.names @@ -5,7 +5,8 @@ "context": "Constant", "variant": "", "details": { - "name": "Levels Gradient Component Type Id" + "name": "Levels Gradient Component Type Id", + "category": "Constants/Editor" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/LightAttenuationRadiusMode_Automatic.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/LightAttenuationRadiusMode_Automatic.names index 6f1dc4d864..57545e1f5e 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/LightAttenuationRadiusMode_Automatic.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/LightAttenuationRadiusMode_Automatic.names @@ -5,7 +5,8 @@ "context": "Constant", "variant": "", "details": { - "name": "Light Attenuation Radius Mode_ Automatic" + "name": "Light Attenuation Radius Mode_ Automatic", + "category": "Constants/Light Attenuation Radius Mode" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/LightAttenuationRadiusMode_Explicit.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/LightAttenuationRadiusMode_Explicit.names index 765780244c..63855f489d 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/LightAttenuationRadiusMode_Explicit.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/LightAttenuationRadiusMode_Explicit.names @@ -5,7 +5,8 @@ "context": "Constant", "variant": "", "details": { - "name": "Light Attenuation Radius Mode_ Explicit" + "name": "Light Attenuation Radius Mode_ Explicit", + "category": "Constants/Light Attenuation Radius Mode" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/LookModificationComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/LookModificationComponentTypeId.names index 4baa41a46c..ee6f688929 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/LookModificationComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/LookModificationComponentTypeId.names @@ -5,7 +5,8 @@ "context": "Constant", "variant": "", "details": { - "name": "Look Modification Component Type Id" + "name": "Look Modification Component Type Id", + "category": "Constants/Editor" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/MaterialComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/MaterialComponentTypeId.names index 74884d3f5b..c4804c0db2 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/MaterialComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/MaterialComponentTypeId.names @@ -5,7 +5,8 @@ "context": "Constant", "variant": "", "details": { - "name": "Material Component Type Id" + "name": "Material Component Type Id", + "category": "Constants/Editor" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/MaterialPropertyGroupVisibility_Enabled.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/MaterialPropertyGroupVisibility_Enabled.names index dbb82178a6..b8efbaba27 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/MaterialPropertyGroupVisibility_Enabled.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/MaterialPropertyGroupVisibility_Enabled.names @@ -5,7 +5,8 @@ "context": "Constant", "variant": "", "details": { - "name": "Material Property Group Visibility_ Enabled" + "name": "Material Property Group Visibility_ Enabled", + "category": "Constants/Material Property" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/MaterialPropertyGroupVisibility_Hidden.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/MaterialPropertyGroupVisibility_Hidden.names index 9d3e1c8fe1..ee24475d35 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/MaterialPropertyGroupVisibility_Hidden.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/MaterialPropertyGroupVisibility_Hidden.names @@ -5,7 +5,8 @@ "context": "Constant", "variant": "", "details": { - "name": "Material Property Group Visibility_ Hidden" + "name": "Material Property Group Visibility_ Hidden", + "category": "Constants/Material Property" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/MaterialPropertyVisibility_Disabled.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/MaterialPropertyVisibility_Disabled.names index 57c9d7f7f8..20ccbae176 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/MaterialPropertyVisibility_Disabled.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/MaterialPropertyVisibility_Disabled.names @@ -5,7 +5,8 @@ "context": "Constant", "variant": "", "details": { - "name": "Material Property Visibility_ Disabled" + "name": "Material Property Visibility_ Disabled", + "category": "Constants/Material Property" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/MaterialPropertyVisibility_Enabled.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/MaterialPropertyVisibility_Enabled.names index 236d9f46c0..833a5c7e36 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/MaterialPropertyVisibility_Enabled.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/MaterialPropertyVisibility_Enabled.names @@ -5,7 +5,8 @@ "context": "Constant", "variant": "", "details": { - "name": "Material Property Visibility_ Enabled" + "name": "Material Property Visibility_ Enabled", + "category": "Constants/Material Property" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/MaterialPropertyVisibility_Hidden.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/MaterialPropertyVisibility_Hidden.names index ef82b44a20..324be1d807 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/MaterialPropertyVisibility_Hidden.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/MaterialPropertyVisibility_Hidden.names @@ -5,7 +5,8 @@ "context": "Constant", "variant": "", "details": { - "name": "Material Property Visibility_ Hidden" + "name": "Material Property Visibility_ Hidden", + "category": "Constants/Material Property" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/MeshBlockerComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/MeshBlockerComponentTypeId.names index d9e1c8278c..73ff4a28d7 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/MeshBlockerComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/MeshBlockerComponentTypeId.names @@ -5,7 +5,8 @@ "context": "Constant", "variant": "", "details": { - "name": "Mesh Blocker Component Type Id" + "name": "Mesh Blocker Component Type Id", + "category": "Constants/Editor" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/MeshComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/MeshComponentTypeId.names index e16d0ddb6d..d34efd836f 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/MeshComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/MeshComponentTypeId.names @@ -5,7 +5,8 @@ "context": "Constant", "variant": "", "details": { - "name": "Mesh Component Type Id" + "name": "Mesh Component Type Id", + "category": "Constants/Editor" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/MixedGradientComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/MixedGradientComponentTypeId.names index 3b6f317f3a..d58bfe9c55 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/MixedGradientComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/MixedGradientComponentTypeId.names @@ -5,7 +5,8 @@ "context": "Constant", "variant": "", "details": { - "name": "Mixed Gradient Component Type Id" + "name": "Mixed Gradient Component Type Id", + "category": "Constants/Editor" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/MultiPositionBehaviorType_Blended.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/MultiPositionBehaviorType_Blended.names index dd9ec1d543..7b6b84a619 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/MultiPositionBehaviorType_Blended.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/MultiPositionBehaviorType_Blended.names @@ -5,7 +5,8 @@ "context": "Constant", "variant": "", "details": { - "name": "Multi Position Behavior Type_ Blended" + "name": "Multi Position Behavior Type_ Blended", + "category": "Constants/Material Property" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/MultiPositionBehaviorType_Separate.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/MultiPositionBehaviorType_Separate.names index bb3547d228..d4066425cc 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/MultiPositionBehaviorType_Separate.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/MultiPositionBehaviorType_Separate.names @@ -5,7 +5,8 @@ "context": "Constant", "variant": "", "details": { - "name": "Multi Position Behavior Type_ Separate" + "name": "Multi Position Behavior Type_ Separate", + "category": "Constants/Multi Position Behavior Type" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/OcclusionCullingPlaneComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/OcclusionCullingPlaneComponentTypeId.names index 334bfb5e3b..8f8b5a8449 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/OcclusionCullingPlaneComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/OcclusionCullingPlaneComponentTypeId.names @@ -5,7 +5,8 @@ "context": "Constant", "variant": "", "details": { - "name": "Occlusion Culling Plane Component Type Id" + "name": "Occlusion Culling Plane Component Type Id", + "category": "Constants/Editor" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PerlinGradientComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PerlinGradientComponentTypeId.names index 7de51940f3..761277822f 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PerlinGradientComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PerlinGradientComponentTypeId.names @@ -5,7 +5,8 @@ "context": "Constant", "variant": "", "details": { - "name": "Perlin Gradient Component Type Id" + "name": "Perlin Gradient Component Type Id", + "category": "Constants/Editor" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PhotometricUnit_Candela.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PhotometricUnit_Candela.names index d3ff806f34..eff06aee6d 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PhotometricUnit_Candela.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PhotometricUnit_Candela.names @@ -5,7 +5,8 @@ "context": "Constant", "variant": "", "details": { - "name": "Photometric Unit_ Candela" + "name": "Photometric Unit_ Candela", + "category": "Constants/Photometric Unit" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PhotometricUnit_Ev100_Illuminance.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PhotometricUnit_Ev100_Illuminance.names index b647a1d0a7..b6a79808b7 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PhotometricUnit_Ev100_Illuminance.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PhotometricUnit_Ev100_Illuminance.names @@ -5,7 +5,8 @@ "context": "Constant", "variant": "", "details": { - "name": "Photometric Unit_ Ev 100_ Illuminance" + "name": "Photometric Unit_ Ev 100_ Illuminance", + "category": "Constants/Photometric Unit" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PhotometricUnit_Ev100_Luminance.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PhotometricUnit_Ev100_Luminance.names index 78aa896046..df41518350 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PhotometricUnit_Ev100_Luminance.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PhotometricUnit_Ev100_Luminance.names @@ -5,7 +5,8 @@ "context": "Constant", "variant": "", "details": { - "name": "Photometric Unit_ Ev 100_ Luminance" + "name": "Photometric Unit_ Ev 100_ Luminance", + "category": "Constants/Photometric Unit" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PhotometricUnit_Lumen.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PhotometricUnit_Lumen.names index 8926e6b454..5ac043877c 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PhotometricUnit_Lumen.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PhotometricUnit_Lumen.names @@ -5,7 +5,8 @@ "context": "Constant", "variant": "", "details": { - "name": "Photometric Unit_ Lumen" + "name": "Photometric Unit_ Lumen", + "category": "Constants/Photometric Unit" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PhotometricUnit_Lux.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PhotometricUnit_Lux.names index 61c674804c..2d42c3784b 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PhotometricUnit_Lux.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PhotometricUnit_Lux.names @@ -5,7 +5,8 @@ "context": "Constant", "variant": "", "details": { - "name": "Photometric Unit_ Lux" + "name": "Photometric Unit_ Lux", + "category": "Constants/Photometric Unit" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PhotometricUnit_Nit.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PhotometricUnit_Nit.names index 7c24b466d6..ee0a94625c 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PhotometricUnit_Nit.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PhotometricUnit_Nit.names @@ -5,7 +5,8 @@ "context": "Constant", "variant": "", "details": { - "name": "Photometric Unit_ Nit" + "name": "Photometric Unit_ Nit", + "category": "Constants/Photometric Unit" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PhotometricUnit_Unknown.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PhotometricUnit_Unknown.names index 36cceb8887..74f02b9e3f 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PhotometricUnit_Unknown.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PhotometricUnit_Unknown.names @@ -5,7 +5,8 @@ "context": "Constant", "variant": "", "details": { - "name": "Photometric Unit_ Unknown" + "name": "Photometric Unit_ Unknown", + "category": "Constants/Photometric Unit" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PhysicalSkyComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PhysicalSkyComponentTypeId.names index 6c44b769fc..b1dcaa1816 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PhysicalSkyComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PhysicalSkyComponentTypeId.names @@ -5,7 +5,8 @@ "context": "Constant", "variant": "", "details": { - "name": "Physical Sky Component Type Id" + "name": "Physical Sky Component Type Id", + "category": "Constants/Editor" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PositionModifierComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PositionModifierComponentTypeId.names index 83d0b371b7..72757fc200 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PositionModifierComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PositionModifierComponentTypeId.names @@ -5,7 +5,8 @@ "context": "Constant", "variant": "", "details": { - "name": "Position Modifier Component Type Id" + "name": "Position Modifier Component Type Id", + "category": "Constants/Editor" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PostFxLayerComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PostFxLayerComponentTypeId.names index f8460db8ab..c82036d25d 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PostFxLayerComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PostFxLayerComponentTypeId.names @@ -5,7 +5,8 @@ "context": "Constant", "variant": "", "details": { - "name": "Post Fx Layer Component Type Id" + "name": "Post Fx Layer Component Type Id", + "category": "Constants/Editor" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PosterizeGradientComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PosterizeGradientComponentTypeId.names index 25f572bad9..64bcc46fd5 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PosterizeGradientComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PosterizeGradientComponentTypeId.names @@ -5,7 +5,8 @@ "context": "Constant", "variant": "", "details": { - "name": "Posterize Gradient Component Type Id" + "name": "Posterize Gradient Component Type Id", + "category": "Constants/Editor" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ProviderNameEnum_AWSCognitoIDP.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ProviderNameEnum_AWSCognitoIDP.names index d9659db972..6154d681da 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ProviderNameEnum_AWSCognitoIDP.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ProviderNameEnum_AWSCognitoIDP.names @@ -5,7 +5,8 @@ "context": "Constant", "variant": "", "details": { - "name": "Provider Name Enum_AWS CognitoIDP" + "name": "Provider Name Enum_AWS CognitoIDP", + "category": "Constants/Provider Name" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ProviderNameEnum_Google.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ProviderNameEnum_Google.names index 97b8137c21..38e31081a9 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ProviderNameEnum_Google.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ProviderNameEnum_Google.names @@ -5,7 +5,8 @@ "context": "Constant", "variant": "", "details": { - "name": "Provider Name Enum_ Google" + "name": "Provider Name Enum_ Google", + "category": "Constants/Provider Name" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ProviderNameEnum_LoginWithAmazon.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ProviderNameEnum_LoginWithAmazon.names index 64d5165e1b..994d48f714 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ProviderNameEnum_LoginWithAmazon.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ProviderNameEnum_LoginWithAmazon.names @@ -5,7 +5,8 @@ "context": "Constant", "variant": "", "details": { - "name": "Provider Name Enum_ Login With Amazon" + "name": "Provider Name Enum_ Login With Amazon", + "category": "Constants/Provider Name" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ProviderNameEnum_None.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ProviderNameEnum_None.names index aeb13781fa..cbdd311d17 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ProviderNameEnum_None.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ProviderNameEnum_None.names @@ -5,13 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "Provider Name Enum_ None" + "name": "None", + "category": "Constants/Provider Name" }, "methods": [ { "key": "GetProviderNameEnum_None", "details": { - "name": "Get Provider Name Enum_ None" + "name": "None" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/QuadShapeComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/QuadShapeComponentTypeId.names index 2c2e19cd82..b76b48d344 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/QuadShapeComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/QuadShapeComponentTypeId.names @@ -5,7 +5,8 @@ "context": "Constant", "variant": "", "details": { - "name": "Quad Shape Component Type Id" + "name": "Quad Shape Component Type Id", + "category": "Constants/Editor" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/RadiusWeightModifierComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/RadiusWeightModifierComponentTypeId.names index c06cbd0552..6afb19615a 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/RadiusWeightModifierComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/RadiusWeightModifierComponentTypeId.names @@ -5,7 +5,8 @@ "context": "Constant", "variant": "", "details": { - "name": "Radius Weight Modifier Component Type Id" + "name": "Radius Weight Modifier Component Type Id", + "category": "Constants/Editor" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/RandomGradientComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/RandomGradientComponentTypeId.names index 10172a3f5a..7c13c137eb 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/RandomGradientComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/RandomGradientComponentTypeId.names @@ -5,7 +5,8 @@ "context": "Constant", "variant": "", "details": { - "name": "Random Gradient Component Type Id" + "name": "Random Gradient Component Type Id", + "category": "Constants/Editor" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ReferenceGradientComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ReferenceGradientComponentTypeId.names index cc42f83864..b4efb57b58 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ReferenceGradientComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ReferenceGradientComponentTypeId.names @@ -5,7 +5,8 @@ "context": "Constant", "variant": "", "details": { - "name": "Reference Gradient Component Type Id" + "name": "Reference Gradient Component Type Id", + "category": "Constants/Editor" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ReferenceShapeComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ReferenceShapeComponentTypeId.names index 1f21c00e47..9341b6e685 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ReferenceShapeComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ReferenceShapeComponentTypeId.names @@ -5,7 +5,8 @@ "context": "Constant", "variant": "", "details": { - "name": "Reference Shape Component Type Id" + "name": "Reference Shape Component Type Id", + "category": "Constants/Editor" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ReflectionProbeComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ReflectionProbeComponentTypeId.names index 589ba7dc8f..a2b4a72f2a 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ReflectionProbeComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ReflectionProbeComponentTypeId.names @@ -5,7 +5,8 @@ "context": "Constant", "variant": "", "details": { - "name": "Reflection Probe Component Type Id" + "name": "Reflection Probe Component Type Id", + "category": "Constants/Editor" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/RotationModifierComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/RotationModifierComponentTypeId.names index e5859c211d..28ca1a8234 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/RotationModifierComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/RotationModifierComponentTypeId.names @@ -5,7 +5,8 @@ "context": "Constant", "variant": "", "details": { - "name": "Rotation Modifier Component Type Id" + "name": "Rotation Modifier Component Type Id", + "category": "Constants/Editor" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SPHERE.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SPHERE.names index e1b58440fa..d5477cdc51 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SPHERE.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SPHERE.names @@ -5,13 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "SPHERE" + "name": "Sphere", + "category": "Constants/White Box" }, "methods": [ { "key": "GetSPHERE", "details": { - "name": "GetSPHERE" + "name": "Sphere" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ScaleModifierComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ScaleModifierComponentTypeId.names index ae4984eb2a..7a626da7fa 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ScaleModifierComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ScaleModifierComponentTypeId.names @@ -5,7 +5,8 @@ "context": "Constant", "variant": "", "details": { - "name": "Scale Modifier Component Type Id" + "name": "Scale Modifier Component Type Id", + "category": "Constants/Editor" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShadowFilterMethod_ESM.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShadowFilterMethod_ESM.names index 9aca5ca2a5..a9ffc81f9c 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShadowFilterMethod_ESM.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShadowFilterMethod_ESM.names @@ -5,7 +5,8 @@ "context": "Constant", "variant": "", "details": { - "name": "Shadow Filter Method_ESM" + "name": "Shadow Filter Method_ESM", + "category": "Constants/Shadowmap" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShadowFilterMethod_ESM_PCF.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShadowFilterMethod_ESM_PCF.names index 766937f8e8..c4347ea123 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShadowFilterMethod_ESM_PCF.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShadowFilterMethod_ESM_PCF.names @@ -5,7 +5,8 @@ "context": "Constant", "variant": "", "details": { - "name": "Shadow Filter Method_ESM_PCF" + "name": "Shadow Filter Method_ESM_PCF", + "category": "Constants/Shadowmap" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShadowFilterMethod_None.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShadowFilterMethod_None.names index 721746a957..0688532394 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShadowFilterMethod_None.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShadowFilterMethod_None.names @@ -5,7 +5,8 @@ "context": "Constant", "variant": "", "details": { - "name": "Shadow Filter Method_ None" + "name": "Shadow Filter Method_ None", + "category": "Constants/Shadowmap" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShadowFilterMethod_PCF.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShadowFilterMethod_PCF.names index 83c985d96e..75b3fb5ec4 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShadowFilterMethod_PCF.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShadowFilterMethod_PCF.names @@ -5,7 +5,8 @@ "context": "Constant", "variant": "", "details": { - "name": "Shadow Filter Method_PCF" + "name": "Shadow Filter Method_PCF", + "category": "Constants/Shadowmap" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShadowmapSize_1024.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShadowmapSize_1024.names index c1d463fac8..b08aa1b6d2 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShadowmapSize_1024.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShadowmapSize_1024.names @@ -5,7 +5,8 @@ "context": "Constant", "variant": "", "details": { - "name": "Shadowmap Size_ 1024" + "name": "Shadowmap Size_ 1024", + "category": "Constants/Shadowmap" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShadowmapSize_2045.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShadowmapSize_2045.names index cc09f640e8..061792241e 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShadowmapSize_2045.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShadowmapSize_2045.names @@ -5,7 +5,8 @@ "context": "Constant", "variant": "", "details": { - "name": "Shadowmap Size_ 2045" + "name": "Shadowmap Size_ 2045", + "category": "Constants/Shadowmap" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShadowmapSize_256.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShadowmapSize_256.names index 3adaf56aa3..89f780b148 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShadowmapSize_256.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShadowmapSize_256.names @@ -5,7 +5,8 @@ "context": "Constant", "variant": "", "details": { - "name": "Shadowmap Size_ 256" + "name": "Shadowmap Size_ 256", + "category": "Constants/Shadowmap" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShadowmapSize_512.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShadowmapSize_512.names index 7f7897321f..17a30a0491 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShadowmapSize_512.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShadowmapSize_512.names @@ -5,7 +5,8 @@ "context": "Constant", "variant": "", "details": { - "name": "Shadowmap Size_ 512" + "name": "Shadowmap Size_ 512", + "category": "Constants/Shadowmap" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShadowmapSize_None.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShadowmapSize_None.names index b4a2ecaaa6..7154a5b1e2 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShadowmapSize_None.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShadowmapSize_None.names @@ -5,7 +5,8 @@ "context": "Constant", "variant": "", "details": { - "name": "Shadowmap Size_ None" + "name": "Shadowmap Size_ None", + "category": "Constants/Shadowmap" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShapeAreaFalloffGradientComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShapeAreaFalloffGradientComponentTypeId.names index de238de3b5..f37ce58bed 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShapeAreaFalloffGradientComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShapeAreaFalloffGradientComponentTypeId.names @@ -5,7 +5,8 @@ "context": "Constant", "variant": "", "details": { - "name": "Shape Area Falloff Gradient Component Type Id" + "name": "Shape Area Falloff Gradient Component Type Id", + "category": "Constants/Editor" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShapeChangeReasons_ShapeChanged.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShapeChangeReasons_ShapeChanged.names index dbd88b811a..ebe7eb050b 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShapeChangeReasons_ShapeChanged.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShapeChangeReasons_ShapeChanged.names @@ -5,7 +5,8 @@ "context": "Constant", "variant": "", "details": { - "name": "Shape Change Reasons_ Shape Changed" + "name": "Shape Change Reasons_ Shape Changed", + "category": "Constants/Editor" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShapeChangeReasons_TransformChanged.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShapeChangeReasons_TransformChanged.names index 9ac0270776..fa38216c96 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShapeChangeReasons_TransformChanged.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShapeChangeReasons_TransformChanged.names @@ -5,7 +5,8 @@ "context": "Constant", "variant": "", "details": { - "name": "Shape Change Reasons_ Transform Changed" + "name": "Shape Change Reasons_ Transform Changed", + "category": "Constants/Editor" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShapeIntersectionFilterComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShapeIntersectionFilterComponentTypeId.names index 9781d5467c..681b7c550b 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShapeIntersectionFilterComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShapeIntersectionFilterComponentTypeId.names @@ -5,7 +5,8 @@ "context": "Constant", "variant": "", "details": { - "name": "Shape Intersection Filter Component Type Id" + "name": "Shape Intersection Filter Component Type Id", + "category": "Constants/Editor" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShapeType_Heightfield.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShapeType_Heightfield.names index 8a8c1dd7a2..ed198b5f81 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShapeType_Heightfield.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShapeType_Heightfield.names @@ -5,7 +5,8 @@ "context": "Constant", "variant": "", "details": { - "name": "Shape Type_ Heightfield" + "name": "Shape Type_ Heightfield", + "category": "Constants/Shape Type" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShapeWeightModifierComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShapeWeightModifierComponentTypeId.names index 102b419c18..063249f099 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShapeWeightModifierComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShapeWeightModifierComponentTypeId.names @@ -5,7 +5,8 @@ "context": "Constant", "variant": "", "details": { - "name": "Shape Weight Modifier Component Type Id" + "name": "Shape Weight Modifier Component Type Id", + "category": "Constants/Editor" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SlopeAlignmentModifierComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SlopeAlignmentModifierComponentTypeId.names index a0112472e8..6888e86823 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SlopeAlignmentModifierComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SlopeAlignmentModifierComponentTypeId.names @@ -5,7 +5,8 @@ "context": "Constant", "variant": "", "details": { - "name": "Slope Alignment Modifier Component Type Id" + "name": "Slope Alignment Modifier Component Type Id", + "category": "Constants/Editor" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SmoothStepGradientComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SmoothStepGradientComponentTypeId.names index d4cba89404..fafba6ee97 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SmoothStepGradientComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SmoothStepGradientComponentTypeId.names @@ -5,7 +5,8 @@ "context": "Constant", "variant": "", "details": { - "name": "Smooth Step Gradient Component Type Id" + "name": "Smooth Step Gradient Component Type Id", + "category": "Constants/Editor" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SpawnerComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SpawnerComponentTypeId.names index 7df8fde2ba..246a3f7355 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SpawnerComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SpawnerComponentTypeId.names @@ -5,7 +5,8 @@ "context": "Constant", "variant": "", "details": { - "name": "Spawner Component Type Id" + "name": "Spawner Component Type Id", + "category": "Constants/Editor" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SphereShapeComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SphereShapeComponentTypeId.names index f1e496ff29..1b551366f7 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SphereShapeComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SphereShapeComponentTypeId.names @@ -5,7 +5,8 @@ "context": "Constant", "variant": "", "details": { - "name": "Sphere Shape Component Type Id" + "name": "Sphere Shape Component Type Id", + "category": "Constants/Editor" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SsaoComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SsaoComponentTypeId.names index 0a7b4b135b..3c4cb0c86a 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SsaoComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SsaoComponentTypeId.names @@ -5,7 +5,8 @@ "context": "Constant", "variant": "", "details": { - "name": "Ssao Component Type Id" + "name": "Ssao Component Type Id", + "category": "Constants/Editor" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/StencilOp_Decrement.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/StencilOp_Decrement.names index b948a50f04..0a0c624384 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/StencilOp_Decrement.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/StencilOp_Decrement.names @@ -5,13 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "Stencil Op_ Decrement" + "name": "Decrement", + "category": "Constants/Stencil Op" }, "methods": [ { "key": "GetStencilOp_Decrement", "details": { - "name": "Get Stencil Op_ Decrement" + "name": "Decrement" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/StencilOp_DecrementSaturate.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/StencilOp_DecrementSaturate.names index 9adc67f65a..2731512d65 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/StencilOp_DecrementSaturate.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/StencilOp_DecrementSaturate.names @@ -5,13 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "Stencil Op_ Decrement Saturate" + "name": "Decrement Saturate", + "category": "Constants/Stencil Op" }, "methods": [ { "key": "GetStencilOp_DecrementSaturate", "details": { - "name": "Get Stencil Op_ Decrement Saturate" + "name": "Decrement Saturate" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/StencilOp_Increment.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/StencilOp_Increment.names index c3b6c5993c..5db4556355 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/StencilOp_Increment.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/StencilOp_Increment.names @@ -5,13 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "Stencil Op_ Increment" + "name": "Increment", + "category": "Constants/Stencil Op" }, "methods": [ { "key": "GetStencilOp_Increment", "details": { - "name": "Get Stencil Op_ Increment" + "name": "Increment" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/StencilOp_IncrementSaturate.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/StencilOp_IncrementSaturate.names index d354391187..58fab39678 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/StencilOp_IncrementSaturate.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/StencilOp_IncrementSaturate.names @@ -5,13 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "Stencil Op_ Increment Saturate" + "name": "Increment Saturate", + "category": "Constants/Stencil Op" }, "methods": [ { "key": "GetStencilOp_IncrementSaturate", "details": { - "name": "Get Stencil Op_ Increment Saturate" + "name": "Increment Saturate" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/StencilOp_Invalid.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/StencilOp_Invalid.names index 0293650ded..88db34395d 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/StencilOp_Invalid.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/StencilOp_Invalid.names @@ -5,13 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "Stencil Op_ Invalid" + "name": "Invalid", + "category": "Constants/Stencil Op" }, "methods": [ { "key": "GetStencilOp_Invalid", "details": { - "name": "Get Stencil Op_ Invalid" + "name": "Invalid" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/StencilOp_Invert.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/StencilOp_Invert.names index 1be4d20a8f..fca3c17879 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/StencilOp_Invert.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/StencilOp_Invert.names @@ -5,13 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "Stencil Op_ Invert" + "name": "Invert", + "category": "Constants/Stencil Op" }, "methods": [ { "key": "GetStencilOp_Invert", "details": { - "name": "Get Stencil Op_ Invert" + "name": "Invert" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/StencilOp_Keep.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/StencilOp_Keep.names index 07070cfa6c..f8b7a01331 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/StencilOp_Keep.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/StencilOp_Keep.names @@ -5,13 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "Stencil Op_ Keep" + "name": "Keep", + "category": "Constants/Stencil Op" }, "methods": [ { "key": "GetStencilOp_Keep", "details": { - "name": "Get Stencil Op_ Keep" + "name": "Keep" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/StencilOp_Replace.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/StencilOp_Replace.names index 7516df67dc..cca0e966da 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/StencilOp_Replace.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/StencilOp_Replace.names @@ -5,13 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "Stencil Op_ Replace" + "name": "Replace", + "category": "Constants/Stencil Op" }, "methods": [ { "key": "GetStencilOp_Replace", "details": { - "name": "Get Stencil Op_ Replace" + "name": "Replace" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/StencilOp_Zero.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/StencilOp_Zero.names index 0d042fb3db..097a299965 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/StencilOp_Zero.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/StencilOp_Zero.names @@ -5,13 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "Stencil Op_ Zero" + "name": "Zero", + "category": "Constants/Stencil Op" }, "methods": [ { "key": "GetStencilOp_Zero", "details": { - "name": "Get Stencil Op_ Zero" + "name": "Zero" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SurfaceAltitudeFilterComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SurfaceAltitudeFilterComponentTypeId.names index e950e88376..076e6cb4ac 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SurfaceAltitudeFilterComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SurfaceAltitudeFilterComponentTypeId.names @@ -5,7 +5,8 @@ "context": "Constant", "variant": "", "details": { - "name": "Surface Altitude Filter Component Type Id" + "name": "Surface Altitude Filter Component Type Id", + "category": "Constants/Editor" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SurfaceAltitudeGradientComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SurfaceAltitudeGradientComponentTypeId.names index 4d76dc8edf..0ee59615d4 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SurfaceAltitudeGradientComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SurfaceAltitudeGradientComponentTypeId.names @@ -5,7 +5,8 @@ "context": "Constant", "variant": "", "details": { - "name": "Surface Altitude Gradient Component Type Id" + "name": "Surface Altitude Gradient Component Type Id", + "category": "Constants/Editor" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SurfaceMaskDepthFilterComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SurfaceMaskDepthFilterComponentTypeId.names index 8558288edc..d1a59d8734 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SurfaceMaskDepthFilterComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SurfaceMaskDepthFilterComponentTypeId.names @@ -5,7 +5,8 @@ "context": "Constant", "variant": "", "details": { - "name": "Surface Mask Depth Filter Component Type Id" + "name": "Surface Mask Depth Filter Component Type Id", + "category": "Constants/Editor" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SurfaceMaskFilterComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SurfaceMaskFilterComponentTypeId.names index a3fb8cd45e..30f887a203 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SurfaceMaskFilterComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SurfaceMaskFilterComponentTypeId.names @@ -5,7 +5,8 @@ "context": "Constant", "variant": "", "details": { - "name": "Surface Mask Filter Component Type Id" + "name": "Surface Mask Filter Component Type Id", + "category": "Constants/Editor" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SurfaceMaskGradientComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SurfaceMaskGradientComponentTypeId.names index 5378ef2178..7b015e0e05 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SurfaceMaskGradientComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SurfaceMaskGradientComponentTypeId.names @@ -5,7 +5,8 @@ "context": "Constant", "variant": "", "details": { - "name": "Surface Mask Gradient Component Type Id" + "name": "Surface Mask Gradient Component Type Id", + "category": "Constants/Editor" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SurfaceSlopeFilterComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SurfaceSlopeFilterComponentTypeId.names index 6b08be224e..25861d5f82 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SurfaceSlopeFilterComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SurfaceSlopeFilterComponentTypeId.names @@ -5,7 +5,8 @@ "context": "Constant", "variant": "", "details": { - "name": "Surface Slope Filter Component Type Id" + "name": "Surface Slope Filter Component Type Id", + "category": "Constants/Editor" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SurfaceSlopeGradientComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SurfaceSlopeGradientComponentTypeId.names index 22fe915b5f..9d245b8937 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SurfaceSlopeGradientComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SurfaceSlopeGradientComponentTypeId.names @@ -5,7 +5,8 @@ "context": "Constant", "variant": "", "details": { - "name": "Surface Slope Gradient Component Type Id" + "name": "Surface Slope Gradient Component Type Id", + "category": "Constants/Editor" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigPlatform_Android.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigPlatform_Android.names index 2b0e83d18c..069cda6ab9 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigPlatform_Android.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigPlatform_Android.names @@ -5,7 +5,8 @@ "context": "Constant", "variant": "", "details": { - "name": "System Config Platform_ Android" + "name": "System Config Platform_ Android", + "category": "Constants/System Configuration" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigPlatform_InvalidPlatform.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigPlatform_InvalidPlatform.names index 5052de3e87..a8a6686667 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigPlatform_InvalidPlatform.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigPlatform_InvalidPlatform.names @@ -5,7 +5,8 @@ "context": "Constant", "variant": "", "details": { - "name": "System Config Platform_ Invalid Platform" + "name": "System Config Platform_ Invalid Platform", + "category": "Constants/System Configuration" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigPlatform_Ios.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigPlatform_Ios.names index 4d68ebd9f9..c22ef5a1db 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigPlatform_Ios.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigPlatform_Ios.names @@ -5,7 +5,8 @@ "context": "Constant", "variant": "", "details": { - "name": "System Config Platform_ Ios" + "name": "System Config Platform_ Ios", + "category": "Constants/System Configuration" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigPlatform_Mac.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigPlatform_Mac.names index 527664909c..b7198ea4a1 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigPlatform_Mac.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigPlatform_Mac.names @@ -5,7 +5,8 @@ "context": "Constant", "variant": "", "details": { - "name": "System Config Platform_ Mac" + "name": "System Config Platform_ Mac", + "category": "Constants/System Configuration" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigPlatform_OsxMetal.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigPlatform_OsxMetal.names index c32a4c0305..deb52ff2d1 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigPlatform_OsxMetal.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigPlatform_OsxMetal.names @@ -5,7 +5,8 @@ "context": "Constant", "variant": "", "details": { - "name": "System Config Platform_ Osx Metal" + "name": "System Config Platform_ Osx Metal", + "category": "Constants/System Configuration" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigPlatform_Pc.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigPlatform_Pc.names index 9715f8274a..a89123fa76 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigPlatform_Pc.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigPlatform_Pc.names @@ -5,7 +5,8 @@ "context": "Constant", "variant": "", "details": { - "name": "System Config Platform_ Pc" + "name": "System Config Platform_ Pc", + "category": "Constants/System Configuration" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigPlatform_Provo.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigPlatform_Provo.names index cbe6204323..43c31306c6 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigPlatform_Provo.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigPlatform_Provo.names @@ -5,7 +5,8 @@ "context": "Constant", "variant": "", "details": { - "name": "System Config Platform_ Provo" + "name": "System Config Platform_ Provo", + "category": "Constants/System Configuration" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigSpec_Auto.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigSpec_Auto.names index dc73e63b25..94cf562847 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigSpec_Auto.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigSpec_Auto.names @@ -5,7 +5,8 @@ "context": "Constant", "variant": "", "details": { - "name": "System Config Spec_ Auto" + "name": "System Config Spec_ Auto", + "category": "Constants/System Configuration" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigSpec_High.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigSpec_High.names index 7a2cd3d7d6..66e2d70bcf 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigSpec_High.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigSpec_High.names @@ -5,7 +5,8 @@ "context": "Constant", "variant": "", "details": { - "name": "System Config Spec_ High" + "name": "System Config Spec_ High", + "category": "Constants/System Configuration" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigSpec_Low.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigSpec_Low.names index f452beb446..6be746da05 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigSpec_Low.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigSpec_Low.names @@ -5,7 +5,8 @@ "context": "Constant", "variant": "", "details": { - "name": "System Config Spec_ Low" + "name": "System Config Spec_ Low", + "category": "Constants/System Configuration" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigSpec_Medium.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigSpec_Medium.names index 4f5bf2b012..92999f9aa6 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigSpec_Medium.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigSpec_Medium.names @@ -5,7 +5,8 @@ "context": "Constant", "variant": "", "details": { - "name": "System Config Spec_ Medium" + "name": "System Config Spec_ Medium", + "category": "Constants/System Configuration" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigSpec_VeryHigh.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigSpec_VeryHigh.names index 34fd10f8a2..1ccbff8818 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigSpec_VeryHigh.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigSpec_VeryHigh.names @@ -5,7 +5,8 @@ "context": "Constant", "variant": "", "details": { - "name": "System Config Spec_ Very High" + "name": "System Config Spec_ Very High", + "category": "Constants/System Configuration" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemEntityId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemEntityId.names index b1d5c9d2be..79a659cdf7 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemEntityId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemEntityId.names @@ -5,7 +5,8 @@ "context": "Constant", "variant": "", "details": { - "name": "System Entity Id" + "name": "System Entity Id", + "category": "Constants/System" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TETRAHEDRON.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TETRAHEDRON.names index d96e472832..4a6e78add2 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TETRAHEDRON.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TETRAHEDRON.names @@ -5,13 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "TETRAHEDRON" + "name": "Tetrahedron", + "category": "Constants/White Box" }, "methods": [ { "key": "GetTETRAHEDRON", "details": { - "name": "GetTETRAHEDRON" + "name": "Tetrahedron" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ThresholdGradientComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ThresholdGradientComponentTypeId.names index 8488cbce53..616332678e 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ThresholdGradientComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ThresholdGradientComponentTypeId.names @@ -5,7 +5,8 @@ "context": "Constant", "variant": "", "details": { - "name": "Threshold Gradient Component Type Id" + "name": "Threshold Gradient Component Type Id", + "category": "Constants/Editor" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TransformComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TransformComponentTypeId.names index a69bfb6041..2eba02da39 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TransformComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TransformComponentTypeId.names @@ -5,7 +5,8 @@ "context": "Constant", "variant": "", "details": { - "name": "Transform Component Type Id" + "name": "Transform Component Type Id", + "category": "Constants/Transform" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TransformMode_Rotation.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TransformMode_Rotation.names index f82b0c9a77..a544207953 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TransformMode_Rotation.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TransformMode_Rotation.names @@ -5,7 +5,8 @@ "context": "Constant", "variant": "", "details": { - "name": "Transform Mode_ Rotation" + "name": "Transform Mode_ Rotation", + "category": "Constants/Transform" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TransformMode_Scale.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TransformMode_Scale.names index 844fd9702b..75685c4f0d 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TransformMode_Scale.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TransformMode_Scale.names @@ -5,7 +5,8 @@ "context": "Constant", "variant": "", "details": { - "name": "Transform Mode_ Scale" + "name": "Transform Mode_ Scale", + "category": "Constants/Transform" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TransformMode_Translation.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TransformMode_Translation.names index e1997464bb..5bf6853c21 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TransformMode_Translation.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TransformMode_Translation.names @@ -5,7 +5,8 @@ "context": "Constant", "variant": "", "details": { - "name": "Transform Mode_ Translation" + "name": "Transform Mode_ Translation", + "category": "Constants/Transform" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TransformPivot_Center.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TransformPivot_Center.names index 667d526cf6..29762a711a 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TransformPivot_Center.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TransformPivot_Center.names @@ -5,7 +5,8 @@ "context": "Constant", "variant": "", "details": { - "name": "Transform Pivot_ Center" + "name": "Transform Pivot_ Center", + "category": "Constants/Transform" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TransformPivot_Object.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TransformPivot_Object.names index 0c2a139f8d..fa1f7fa8ad 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TransformPivot_Object.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TransformPivot_Object.names @@ -5,7 +5,8 @@ "context": "Constant", "variant": "", "details": { - "name": "Transform Pivot_ Object" + "name": "Transform Pivot_ Object", + "category": "Constants/Transform" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TransformRefreshType_All.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TransformRefreshType_All.names index 118145148d..3d2499003b 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TransformRefreshType_All.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TransformRefreshType_All.names @@ -5,7 +5,8 @@ "context": "Constant", "variant": "", "details": { - "name": "Transform Refresh Type_ All" + "name": "Transform Refresh Type_ All", + "category": "Constants/Transform" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TransformRefreshType_Orientation.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TransformRefreshType_Orientation.names index 00351a1cde..74d8f9f157 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TransformRefreshType_Orientation.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TransformRefreshType_Orientation.names @@ -5,7 +5,8 @@ "context": "Constant", "variant": "", "details": { - "name": "Transform Refresh Type_ Orientation" + "name": "Transform Refresh Type_ Orientation", + "category": "Constants/Transform" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TransformRefreshType_Translation.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TransformRefreshType_Translation.names index f7dd8f9562..b0d6b1a151 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TransformRefreshType_Translation.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TransformRefreshType_Translation.names @@ -5,7 +5,8 @@ "context": "Constant", "variant": "", "details": { - "name": "Transform Refresh Type_ Translation" + "name": "Transform Refresh Type_ Translation", + "category": "Constants/Transform" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TubeShapeComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TubeShapeComponentTypeId.names index 3469a9bfcb..3b9600333b 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TubeShapeComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TubeShapeComponentTypeId.names @@ -5,7 +5,8 @@ "context": "Constant", "variant": "", "details": { - "name": "Tube Shape Component Type Id" + "name": "Tube Shape Component Type Id", + "category": "Constants/Transform" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/UiLayoutCellUnspecifiedSize.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/UiLayoutCellUnspecifiedSize.names index 187f9f64e0..21292a03d5 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/UiLayoutCellUnspecifiedSize.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/UiLayoutCellUnspecifiedSize.names @@ -5,13 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "Ui Layout Cell Unspecified Size" + "name": "Cell Unspecified Size", + "category": "Constants/UI/Ui Layout" }, "methods": [ { "key": "GetUiLayoutCellUnspecifiedSize", "details": { - "name": "Get Ui Layout Cell Unspecified Size" + "name": "Layout Cell Unspecified Size" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/VegetationSpawnerComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/VegetationSpawnerComponentTypeId.names index e6ff409cab..98bc312731 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/VegetationSpawnerComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/VegetationSpawnerComponentTypeId.names @@ -5,7 +5,8 @@ "context": "Constant", "variant": "", "details": { - "name": "Vegetation Spawner Component Type Id" + "name": "Vegetation Spawner Component Type Id", + "category": "Constants/Vegetation Spawner" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eSSB_GotoEndTime.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eSSB_GotoEndTime.names index 1b2a59a3ac..597eaaf288 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eSSB_GotoEndTime.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eSSB_GotoEndTime.names @@ -5,7 +5,8 @@ "context": "Constant", "variant": "", "details": { - "name": "eSSB_ Goto End Time" + "name": "eSSB_ Goto End Time", + "category": "Constants/SSB" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eSSB_GotoStartTime.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eSSB_GotoStartTime.names index d3c320d8a6..10602a0a80 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eSSB_GotoStartTime.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eSSB_GotoStartTime.names @@ -5,7 +5,8 @@ "context": "Constant", "variant": "", "details": { - "name": "eSSB_ Goto Start Time" + "name": "eSSB_ Goto Start Time", + "category": "Constants/SSB" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eSSB_LeaveTime.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eSSB_LeaveTime.names index b5be9dd560..cb7819dedd 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eSSB_LeaveTime.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eSSB_LeaveTime.names @@ -5,7 +5,8 @@ "context": "Constant", "variant": "", "details": { - "name": "eSSB_ Leave Time" + "name": "eSSB_ Leave Time", + "category": "Constants/SSB" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiAnimationEvent_Aborted.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiAnimationEvent_Aborted.names index 36b358499f..9db98c8f4f 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiAnimationEvent_Aborted.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiAnimationEvent_Aborted.names @@ -5,13 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "e Ui Animation Event_ Aborted" + "name": "Aborted", + "category": "Constants/UI/Animation Event" }, "methods": [ { "key": "GeteUiAnimationEvent_Aborted", "details": { - "name": "Gete Ui Animation Event_ Aborted" + "name": "Aborted" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiAnimationEvent_Started.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiAnimationEvent_Started.names index c0f26f3b80..eed0cb1509 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiAnimationEvent_Started.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiAnimationEvent_Started.names @@ -5,13 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "e Ui Animation Event_ Started" + "name": "Started", + "category": "Constants/UI/Animation Event" }, "methods": [ { "key": "GeteUiAnimationEvent_Started", "details": { - "name": "Gete Ui Animation Event_ Started" + "name": "Get Started" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiAnimationEvent_Stopped.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiAnimationEvent_Stopped.names index eb3534ef7e..16adfb71b6 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiAnimationEvent_Stopped.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiAnimationEvent_Stopped.names @@ -5,13 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "e Ui Animation Event_ Stopped" + "name": "Stopped", + "category": "Constants/UI/Animation Event" }, "methods": [ { "key": "GeteUiAnimationEvent_Stopped", "details": { - "name": "Gete Ui Animation Event_ Stopped" + "name": "Stopped" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiAnimationEvent_Updated.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiAnimationEvent_Updated.names index a36af03fe2..a4005325dd 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiAnimationEvent_Updated.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiAnimationEvent_Updated.names @@ -5,13 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "e Ui Animation Event_ Updated" + "name": "Updated", + "category": "Constants/UI/Animation Event" }, "methods": [ { "key": "GeteUiAnimationEvent_Updated", "details": { - "name": "Gete Ui Animation Event_ Updated" + "name": "Updated" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiDragState_Invalid.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiDragState_Invalid.names index 2497d54ba8..b7391f4ac1 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiDragState_Invalid.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiDragState_Invalid.names @@ -5,13 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "e Ui Drag State_ Invalid" + "name": "Invalid", + "category": "Constants/UI/Drag State" }, "methods": [ { "key": "GeteUiDragState_Invalid", "details": { - "name": "Gete Ui Drag State_ Invalid" + "name": "Invalid" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiDragState_Normal.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiDragState_Normal.names index 02d43a96ce..08cf051848 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiDragState_Normal.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiDragState_Normal.names @@ -5,13 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "e Ui Drag State_ Normal" + "name": "Normal", + "category": "Constants/UI/Drag State" }, "methods": [ { "key": "GeteUiDragState_Normal", "details": { - "name": "Gete Ui Drag State_ Normal" + "name": "Normal" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiDragState_Valid.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiDragState_Valid.names index 53a2e16ada..c8daad2e03 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiDragState_Valid.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiDragState_Valid.names @@ -5,13 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "e Ui Drag State_ Valid" + "name": "Valid", + "category": "Constants/UI/Drag State" }, "methods": [ { "key": "GeteUiDragState_Valid", "details": { - "name": "Gete Ui Drag State_ Valid" + "name": "Valid" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiDropState_Invalid.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiDropState_Invalid.names index bb1ec4dbf8..1c36980fda 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiDropState_Invalid.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiDropState_Invalid.names @@ -5,13 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "e Ui Drop State_ Invalid" + "name": "Invalid", + "category": "Constants/UI/Drop State" }, "methods": [ { "key": "GeteUiDropState_Invalid", "details": { - "name": "Gete Ui Drop State_ Invalid" + "name": "Invalid" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiDropState_Normal.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiDropState_Normal.names index 386bdac441..11b6cc6366 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiDropState_Normal.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiDropState_Normal.names @@ -5,13 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "e Ui Drop State_ Normal" + "name": "Normal", + "category": "Constants/UI/Drop State" }, "methods": [ { "key": "GeteUiDropState_Normal", "details": { - "name": "Gete Ui Drop State_ Normal" + "name": "Normal" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiDropState_Valid.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiDropState_Valid.names index 8b62c5a02b..8438d8f5ad 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiDropState_Valid.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiDropState_Valid.names @@ -5,13 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "e Ui Drop State_ Valid" + "name": "Valid", + "category": "Constants/UI/Drop State" }, "methods": [ { "key": "GeteUiDropState_Valid", "details": { - "name": "Gete Ui Drop State_ Valid" + "name": "Valid" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiDynamicContentDBColorType_Free.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiDynamicContentDBColorType_Free.names index ff22b824da..77cf8713fd 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiDynamicContentDBColorType_Free.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiDynamicContentDBColorType_Free.names @@ -5,13 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "e Ui Dynamic ContentDB Color Type_ Free" + "name": "Color Type Free", + "category": "Constants/UI/Dynamic ContentDB" }, "methods": [ { "key": "GeteUiDynamicContentDBColorType_Free", "details": { - "name": "Gete Ui Dynamic ContentDB Color Type_ Free" + "name": "Color Type Free" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiDynamicContentDBColorType_Paid.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiDynamicContentDBColorType_Paid.names index ff1838c16b..209601c715 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiDynamicContentDBColorType_Paid.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiDynamicContentDBColorType_Paid.names @@ -5,13 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "e Ui Dynamic ContentDB Color Type_ Paid" + "name": "Color Type Paid", + "category": "Constants/UI/Dynamic ContentDB" }, "methods": [ { "key": "GeteUiDynamicContentDBColorType_Paid", "details": { - "name": "Gete Ui Dynamic ContentDB Color Type_ Paid" + "name": "Color Type Paid" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiEmitShape_Circle.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiEmitShape_Circle.names index 066a57d4c6..69925bb220 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiEmitShape_Circle.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiEmitShape_Circle.names @@ -5,13 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "e Ui Emit Shape_ Circle" + "name": "Circle", + "category": "Constants/UI/Emit Shape" }, "methods": [ { "key": "GeteUiEmitShape_Circle", "details": { - "name": "Gete Ui Emit Shape_ Circle" + "name": "Circle" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiEmitShape_Point.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiEmitShape_Point.names index 597db250cd..2ccc0456a7 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiEmitShape_Point.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiEmitShape_Point.names @@ -5,13 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "e Ui Emit Shape_ Point" + "name": "Point", + "category": "Constants/UI/Emit Shape" }, "methods": [ { "key": "GeteUiEmitShape_Point", "details": { - "name": "Gete Ui Emit Shape_ Point" + "name": "Point" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiEmitShape_Quad.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiEmitShape_Quad.names index d57fae5143..017f799b17 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiEmitShape_Quad.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiEmitShape_Quad.names @@ -5,13 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "e Ui Emit Shape_ Quad" + "name": "Quad", + "category": "Constants/UI/Emit Shape" }, "methods": [ { "key": "GeteUiEmitShape_Quad", "details": { - "name": "Gete Ui Emit Shape_ Quad" + "name": "Quad" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFillCornerOrigin_BottomLeft.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFillCornerOrigin_BottomLeft.names index 397847d48a..41ed31a1a0 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFillCornerOrigin_BottomLeft.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFillCornerOrigin_BottomLeft.names @@ -5,13 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "e Ui Fill Corner Origin_ Bottom Left" + "name": "Bottom Left", + "category": "Constants/UI/Fill Corner" }, "methods": [ { "key": "GeteUiFillCornerOrigin_BottomLeft", "details": { - "name": "Gete Ui Fill Corner Origin_ Bottom Left" + "name": "Bottom Left" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFillCornerOrigin_BottomRight.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFillCornerOrigin_BottomRight.names index f85a19b391..fa80def3d8 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFillCornerOrigin_BottomRight.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFillCornerOrigin_BottomRight.names @@ -5,13 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "e Ui Fill Corner Origin_ Bottom Right" + "name": "Bottom Right", + "category": "Constants/UI/Fill Corner" }, "methods": [ { "key": "GeteUiFillCornerOrigin_BottomRight", "details": { - "name": "Gete Ui Fill Corner Origin_ Bottom Right" + "name": "Bottom Right" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFillCornerOrigin_TopLeft.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFillCornerOrigin_TopLeft.names index 284c6f4be5..527b84e8b6 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFillCornerOrigin_TopLeft.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFillCornerOrigin_TopLeft.names @@ -5,13 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "e Ui Fill Corner Origin_ Top Left" + "name": "Top Left", + "category": "Constants/UI/Fill Corner" }, "methods": [ { "key": "GeteUiFillCornerOrigin_TopLeft", "details": { - "name": "Gete Ui Fill Corner Origin_ Top Left" + "name": "Top Left" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFillCornerOrigin_TopRight.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFillCornerOrigin_TopRight.names index 9663ee9c08..918cd98730 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFillCornerOrigin_TopRight.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFillCornerOrigin_TopRight.names @@ -5,13 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "e Ui Fill Corner Origin_ Top Right" + "name": "Top Right", + "category": "Constants/UI/Fill Corner" }, "methods": [ { "key": "GeteUiFillCornerOrigin_TopRight", "details": { - "name": "Gete Ui Fill Corner Origin_ Top Right" + "name": "Top Right" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFillEdgeOrigin_Bottom.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFillEdgeOrigin_Bottom.names index 58e054f87d..767449a8bb 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFillEdgeOrigin_Bottom.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFillEdgeOrigin_Bottom.names @@ -5,13 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "e Ui Fill Edge Origin_ Bottom" + "name": "Bottom", + "category": "Constants/UI/Fill Edge" }, "methods": [ { "key": "GeteUiFillEdgeOrigin_Bottom", "details": { - "name": "Gete Ui Fill Edge Origin_ Bottom" + "name": "Bottom" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFillEdgeOrigin_Left.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFillEdgeOrigin_Left.names index af5ca29669..c03e600494 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFillEdgeOrigin_Left.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFillEdgeOrigin_Left.names @@ -5,13 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "e Ui Fill Edge Origin_ Left" + "name": "Left", + "category": "Constants/UI/Fill Edge" }, "methods": [ { "key": "GeteUiFillEdgeOrigin_Left", "details": { - "name": "Gete Ui Fill Edge Origin_ Left" + "name": "Left" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFillEdgeOrigin_Right.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFillEdgeOrigin_Right.names index bcf740418a..5f2b9c3b94 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFillEdgeOrigin_Right.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFillEdgeOrigin_Right.names @@ -5,13 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "e Ui Fill Edge Origin_ Right" + "name": "Right", + "category": "Constants/UI/Fill Edge" }, "methods": [ { "key": "GeteUiFillEdgeOrigin_Right", "details": { - "name": "Gete Ui Fill Edge Origin_ Right" + "name": "Right" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFillEdgeOrigin_Top.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFillEdgeOrigin_Top.names index 9f27a31c81..c301c1fd8f 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFillEdgeOrigin_Top.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFillEdgeOrigin_Top.names @@ -5,13 +5,15 @@ "context": "Constant", "variant": "", "details": { - "name": "e Ui Fill Edge Origin_ Top" + "name": "Top", + "category": "Constants/UI/Fill Edge", + "subtitle": "Fill Edge" }, "methods": [ { "key": "GeteUiFillEdgeOrigin_Top", "details": { - "name": "Gete Ui Fill Edge Origin_ Top" + "name": "Top" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFillType_Linear.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFillType_Linear.names index 7a5d679878..4e5e6a8efd 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFillType_Linear.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFillType_Linear.names @@ -5,13 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "e Ui Fill Type_ Linear" + "name": "Linear", + "category": "Constants/UI/Fill Type" }, "methods": [ { "key": "GeteUiFillType_Linear", "details": { - "name": "Gete Ui Fill Type_ Linear" + "name": "Linear" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFillType_None.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFillType_None.names index e0b8ddc402..e417d91494 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFillType_None.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFillType_None.names @@ -5,13 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "e Ui Fill Type_ None" + "name": "None", + "category": "Constants/UI/Fill Type" }, "methods": [ { "key": "GeteUiFillType_None", "details": { - "name": "Gete Ui Fill Type_ None" + "name": "None" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFillType_Radial.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFillType_Radial.names index 88042d6c94..861dcc8fa4 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFillType_Radial.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFillType_Radial.names @@ -5,13 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "e Ui Fill Type_ Radial" + "name": "Radial", + "category": "Constants/UI/Fill Type" }, "methods": [ { "key": "GeteUiFillType_Radial", "details": { - "name": "Gete Ui Fill Type_ Radial" + "name": "Radial" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFillType_RadialCorner.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFillType_RadialCorner.names index c1753ef859..c301567d43 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFillType_RadialCorner.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFillType_RadialCorner.names @@ -5,13 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "e Ui Fill Type_ Radial Corner" + "name": "Radial Corner", + "category": "Constants/UI/Fill Type" }, "methods": [ { "key": "GeteUiFillType_RadialCorner", "details": { - "name": "Gete Ui Fill Type_ Radial Corner" + "name": "Radial Corner" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFillType_RadialEdge.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFillType_RadialEdge.names index 7c3b91bd9b..bc738c6054 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFillType_RadialEdge.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFillType_RadialEdge.names @@ -5,13 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "e Ui Fill Type_ Radial Edge" + "name": "Radial Edge", + "category": "Constants/UI/Fill Type" }, "methods": [ { "key": "GeteUiFillType_RadialEdge", "details": { - "name": "Gete Ui Fill Type_ Radial Edge" + "name": "Radial Edge" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFlipbookAnimationFramerateUnits_FPS.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFlipbookAnimationFramerateUnits_FPS.names index 711294f44a..248e0da6aa 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFlipbookAnimationFramerateUnits_FPS.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFlipbookAnimationFramerateUnits_FPS.names @@ -5,13 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "e Ui Flipbook Animation Framerate Units_FPS" + "name": "Frames Per Second", + "category": "Constants/UI/Flipbook Animation" }, "methods": [ { "key": "GeteUiFlipbookAnimationFramerateUnits_FPS", "details": { - "name": "Gete Ui Flipbook Animation Framerate Units_FPS" + "name": "Frames Per Second" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFlipbookAnimationFramerateUnits_SecondsPerFrame.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFlipbookAnimationFramerateUnits_SecondsPerFrame.names index 543cf58fa6..a1d309e3b2 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFlipbookAnimationFramerateUnits_SecondsPerFrame.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFlipbookAnimationFramerateUnits_SecondsPerFrame.names @@ -5,13 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "e Ui Flipbook Animation Framerate Units_ Seconds Per Frame" + "name": "Seconds Per Frame", + "category": "Constants/UI/Flipbook Animation" }, "methods": [ { "key": "GeteUiFlipbookAnimationFramerateUnits_SecondsPerFrame", "details": { - "name": "Gete Ui Flipbook Animation Framerate Units_ Seconds Per Frame" + "name": "Seconds Per Frame" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFlipbookAnimationLoopType_Linear.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFlipbookAnimationLoopType_Linear.names index 8776ce8a57..6877841a85 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFlipbookAnimationLoopType_Linear.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFlipbookAnimationLoopType_Linear.names @@ -5,13 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "e Ui Flipbook Animation Loop Type_ Linear" + "name": "Linear", + "category": "Constants/UI/Flipbook Animation/Loop Type" }, "methods": [ { "key": "GeteUiFlipbookAnimationLoopType_Linear", "details": { - "name": "Gete Ui Flipbook Animation Loop Type_ Linear" + "name": "Linear" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFlipbookAnimationLoopType_None.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFlipbookAnimationLoopType_None.names index 443ee66aac..8f905a8cd5 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFlipbookAnimationLoopType_None.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFlipbookAnimationLoopType_None.names @@ -5,13 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "e Ui Flipbook Animation Loop Type_ None" + "name": "None", + "category": "Constants/UI/Flipbook Animation/Loop Type" }, "methods": [ { "key": "GeteUiFlipbookAnimationLoopType_None", "details": { - "name": "Gete Ui Flipbook Animation Loop Type_ None" + "name": "None" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFlipbookAnimationLoopType_PingPong.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFlipbookAnimationLoopType_PingPong.names index 95be18fec1..454498eec7 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFlipbookAnimationLoopType_PingPong.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFlipbookAnimationLoopType_PingPong.names @@ -5,13 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "e Ui Flipbook Animation Loop Type_ Ping Pong" + "name": "Ping Pong", + "category": "Constants/UI/Flipbook Animation/Loop Type" }, "methods": [ { "key": "GeteUiFlipbookAnimationLoopType_PingPong", "details": { - "name": "Gete Ui Flipbook Animation Loop Type_ Ping Pong" + "name": "Ping Pong" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiHAlign_Center.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiHAlign_Center.names index 9076cd7d22..b32ed9461e 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiHAlign_Center.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiHAlign_Center.names @@ -5,13 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "e UiH Align_ Center" + "name": "Horizontal Align Center", + "category": "Constants/UI/Align" }, "methods": [ { "key": "GeteUiHAlign_Center", "details": { - "name": "Gete UiH Align_ Center" + "name": "Horizontal Align: Center" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiHAlign_Left.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiHAlign_Left.names index 357605a5fc..19cb732c31 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiHAlign_Left.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiHAlign_Left.names @@ -5,13 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "e UiH Align_ Left" + "name": "Horizontal Align Left", + "category": "Constants/UI/Align" }, "methods": [ { "key": "GeteUiHAlign_Left", "details": { - "name": "Gete UiH Align_ Left" + "name": "Horizontal Align: Left" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiHAlign_Right.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiHAlign_Right.names index b2b6a77525..4573fef1ea 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiHAlign_Right.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiHAlign_Right.names @@ -5,13 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "e UiH Align_ Right" + "name": "Horizontal Align Right", + "category": "Constants/UI/Align" }, "methods": [ { "key": "GeteUiHAlign_Right", "details": { - "name": "Gete UiH Align_ Right" + "name": "Horizontal Align: Right" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiHorizontalOrder_LeftToRight.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiHorizontalOrder_LeftToRight.names index 7ecd515dce..d800e93dd2 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiHorizontalOrder_LeftToRight.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiHorizontalOrder_LeftToRight.names @@ -5,13 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "e Ui Horizontal Order_ Left To Right" + "name": "Left To Right", + "category": "Constants/UI/Order/Horizontal" }, "methods": [ { "key": "GeteUiHorizontalOrder_LeftToRight", "details": { - "name": "Gete Ui Horizontal Order_ Left To Right" + "name": "Left To Right" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiHorizontalOrder_RightToLeft.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiHorizontalOrder_RightToLeft.names index f4c17a7f0f..f6993b4ba4 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiHorizontalOrder_RightToLeft.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiHorizontalOrder_RightToLeft.names @@ -5,13 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "e Ui Horizontal Order_ Right To Left" + "name": "Right To Left", + "category": "Constants/UI/Order/Horizontal Order" }, "methods": [ { "key": "GeteUiHorizontalOrder_RightToLeft", "details": { - "name": "Gete Ui Horizontal Order_ Right To Left" + "name": "Right To Left" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiImageSequenceImageType_Fixed.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiImageSequenceImageType_Fixed.names index 64d23d4244..86fe1cb7d4 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiImageSequenceImageType_Fixed.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiImageSequenceImageType_Fixed.names @@ -5,13 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "e Ui Image Sequence Image Type_ Fixed" + "name": "Image Sequence Image Type_ Fixed", + "category": "Constants/UI" }, "methods": [ { "key": "GeteUiImageSequenceImageType_Fixed", "details": { - "name": "Gete Ui Image Sequence Image Type_ Fixed" + "name": "Get Image Sequence Image Type_ Fixed" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiImageSequenceImageType_Stretched.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiImageSequenceImageType_Stretched.names index 113cfa68b9..d716a8bd8b 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiImageSequenceImageType_Stretched.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiImageSequenceImageType_Stretched.names @@ -5,13 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "e Ui Image Sequence Image Type_ Stretched" + "name": "Image Sequence Image Type_ Stretched", + "category": "Constants/UI" }, "methods": [ { "key": "GeteUiImageSequenceImageType_Stretched", "details": { - "name": "Gete Ui Image Sequence Image Type_ Stretched" + "name": "Get Image Sequence Image Type_ Stretched" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiImageSequenceImageType_StretchedToFill.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiImageSequenceImageType_StretchedToFill.names index 5db0235189..097c5579cd 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiImageSequenceImageType_StretchedToFill.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiImageSequenceImageType_StretchedToFill.names @@ -5,13 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "e Ui Image Sequence Image Type_ Stretched To Fill" + "name": "Image Sequence Image Type_ Stretched To Fill", + "category": "Constants/UI" }, "methods": [ { "key": "GeteUiImageSequenceImageType_StretchedToFill", "details": { - "name": "Gete Ui Image Sequence Image Type_ Stretched To Fill" + "name": "Get Image Sequence Image Type_ Stretched To Fill" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiImageSequenceImageType_StretchedToFit.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiImageSequenceImageType_StretchedToFit.names index f519d2af74..fe98c38bed 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiImageSequenceImageType_StretchedToFit.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiImageSequenceImageType_StretchedToFit.names @@ -5,13 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "e Ui Image Sequence Image Type_ Stretched To Fit" + "name": "Image Sequence Image Type_ Stretched To Fit", + "category": "Constants/UI" }, "methods": [ { "key": "GeteUiImageSequenceImageType_StretchedToFit", "details": { - "name": "Gete Ui Image Sequence Image Type_ Stretched To Fit" + "name": "Get Image Sequence Image Type_ Stretched To Fit" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiImageType_Fixed.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiImageType_Fixed.names index e70fb18686..11d42e165f 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiImageType_Fixed.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiImageType_Fixed.names @@ -5,13 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "e Ui Image Type_ Fixed" + "name": "Image Type_ Fixed", + "category": "Constants/UI" }, "methods": [ { "key": "GeteUiImageType_Fixed", "details": { - "name": "Gete Ui Image Type_ Fixed" + "name": "Get Image Type_ Fixed" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiImageType_Sliced.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiImageType_Sliced.names index d5f9c5574e..7c214242e9 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiImageType_Sliced.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiImageType_Sliced.names @@ -5,13 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "e Ui Image Type_ Sliced" + "name": "Image Type_ Sliced", + "category": "Constants/UI" }, "methods": [ { "key": "GeteUiImageType_Sliced", "details": { - "name": "Gete Ui Image Type_ Sliced" + "name": "Get Image Type_ Sliced" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiImageType_Stretched.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiImageType_Stretched.names index b1ec151b0f..0c5e4e2483 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiImageType_Stretched.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiImageType_Stretched.names @@ -5,13 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "e Ui Image Type_ Stretched" + "name": "Image Type_ Stretched", + "category": "Constants/UI" }, "methods": [ { "key": "GeteUiImageType_Stretched", "details": { - "name": "Gete Ui Image Type_ Stretched" + "name": "Get Image Type_ Stretched" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiImageType_StretchedToFill.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiImageType_StretchedToFill.names index 39933e7430..d94fc392da 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiImageType_StretchedToFill.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiImageType_StretchedToFill.names @@ -5,13 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "e Ui Image Type_ Stretched To Fill" + "name": "Image Type_ Stretched To Fill", + "category": "Constants/UI" }, "methods": [ { "key": "GeteUiImageType_StretchedToFill", "details": { - "name": "Gete Ui Image Type_ Stretched To Fill" + "name": "Get Image Type_ Stretched To Fill" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiImageType_StretchedToFit.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiImageType_StretchedToFit.names index d1ed5df199..3ac5edf2df 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiImageType_StretchedToFit.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiImageType_StretchedToFit.names @@ -5,13 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "e Ui Image Type_ Stretched To Fit" + "name": "Image Type_ Stretched To Fit", + "category": "Constants/UI" }, "methods": [ { "key": "GeteUiImageType_StretchedToFit", "details": { - "name": "Gete Ui Image Type_ Stretched To Fit" + "name": "Get Image Type_ Stretched To Fit" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiImageType_Tiled.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiImageType_Tiled.names index 0ed3869995..080fe2e050 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiImageType_Tiled.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiImageType_Tiled.names @@ -5,13 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "e Ui Image Type_ Tiled" + "name": "Image Type_ Tiled", + "category": "Constants/UI" }, "methods": [ { "key": "GeteUiImageType_Tiled", "details": { - "name": "Gete Ui Image Type_ Tiled" + "name": "Get Image Type_ Tiled" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiInteractableState_Disabled.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiInteractableState_Disabled.names index da3d4fbfc0..3a30dac18d 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiInteractableState_Disabled.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiInteractableState_Disabled.names @@ -5,13 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "e Ui Interactable State_ Disabled" + "name": "Interactable State_ Disabled", + "category": "Constants/UI" }, "methods": [ { "key": "GeteUiInteractableState_Disabled", "details": { - "name": "Gete Ui Interactable State_ Disabled" + "name": "Get Interactable State_ Disabled" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiInteractableState_Hover.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiInteractableState_Hover.names index 2257f1dcbd..2f4a8de7d3 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiInteractableState_Hover.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiInteractableState_Hover.names @@ -5,13 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "e Ui Interactable State_ Hover" + "name": "Interactable State_ Hover", + "category": "Constants/UI" }, "methods": [ { "key": "GeteUiInteractableState_Hover", "details": { - "name": "Gete Ui Interactable State_ Hover" + "name": "Get Interactable State_ Hover" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiInteractableState_Normal.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiInteractableState_Normal.names index 2cb2fcd975..49a857a81e 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiInteractableState_Normal.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiInteractableState_Normal.names @@ -5,13 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "e Ui Interactable State_ Normal" + "name": "Interactable State_ Normal", + "category": "Constants/UI" }, "methods": [ { "key": "GeteUiInteractableState_Normal", "details": { - "name": "Gete Ui Interactable State_ Normal" + "name": "Get Interactable State_ Normal" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiInteractableState_Pressed.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiInteractableState_Pressed.names index 4c1e9aa266..61492a7d87 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiInteractableState_Pressed.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiInteractableState_Pressed.names @@ -5,13 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "e Ui Interactable State_ Pressed" + "name": "Interactable State_ Pressed", + "category": "Constants/UI" }, "methods": [ { "key": "GeteUiInteractableState_Pressed", "details": { - "name": "Gete Ui Interactable State_ Pressed" + "name": "Get Interactable State_ Pressed" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiLayoutGridStartingDirection_HorizontalOrder.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiLayoutGridStartingDirection_HorizontalOrder.names index 70e158351c..7dc93920d5 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiLayoutGridStartingDirection_HorizontalOrder.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiLayoutGridStartingDirection_HorizontalOrder.names @@ -5,13 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "e Ui Layout Grid Starting Direction_ Horizontal Order" + "name": "Layout Grid Starting Direction_ Horizontal Order", + "category": "Constants/UI" }, "methods": [ { "key": "GeteUiLayoutGridStartingDirection_HorizontalOrder", "details": { - "name": "Gete Ui Layout Grid Starting Direction_ Horizontal Order" + "name": "Get Layout Grid Starting Direction_ Horizontal Order" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiLayoutGridStartingDirection_VerticalOrder.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiLayoutGridStartingDirection_VerticalOrder.names index 18e0a58815..05b0632d2e 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiLayoutGridStartingDirection_VerticalOrder.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiLayoutGridStartingDirection_VerticalOrder.names @@ -5,13 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "e Ui Layout Grid Starting Direction_ Vertical Order" + "name": "Layout Grid Starting Direction_ Vertical Order", + "category": "Constants/UI" }, "methods": [ { "key": "GeteUiLayoutGridStartingDirection_VerticalOrder", "details": { - "name": "Gete Ui Layout Grid Starting Direction_ Vertical Order" + "name": "Get Layout Grid Starting Direction_ Vertical Order" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiNavigationMode_Automatic.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiNavigationMode_Automatic.names index 81b5baba5d..45af6e0414 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiNavigationMode_Automatic.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiNavigationMode_Automatic.names @@ -5,13 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "e Ui Navigation Mode_ Automatic" + "name": "Navigation Mode_ Automatic", + "category": "Constants/UI" }, "methods": [ { "key": "GeteUiNavigationMode_Automatic", "details": { - "name": "Gete Ui Navigation Mode_ Automatic" + "name": "Get Navigation Mode_ Automatic" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiNavigationMode_Custom.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiNavigationMode_Custom.names index 40a95b266f..f743182797 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiNavigationMode_Custom.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiNavigationMode_Custom.names @@ -5,13 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "e Ui Navigation Mode_ Custom" + "name": "Navigation Mode_ Custom", + "category": "Constants/UI" }, "methods": [ { "key": "GeteUiNavigationMode_Custom", "details": { - "name": "Gete Ui Navigation Mode_ Custom" + "name": "Get Navigation Mode_ Custom" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiNavigationMode_None.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiNavigationMode_None.names index f23dde9d9b..e3222f1899 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiNavigationMode_None.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiNavigationMode_None.names @@ -5,13 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "e Ui Navigation Mode_ None" + "name": "Navigation Mode_ None", + "category": "Constants/UI" }, "methods": [ { "key": "GeteUiNavigationMode_None", "details": { - "name": "Gete Ui Navigation Mode_ None" + "name": "Get Navigation Mode_ None" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiParticleCoordinateType_Cartesian.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiParticleCoordinateType_Cartesian.names index cd7b5fbcad..02de5092e2 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiParticleCoordinateType_Cartesian.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiParticleCoordinateType_Cartesian.names @@ -5,13 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "e Ui Particle Coordinate Type_ Cartesian" + "name": "Particle Coordinate Type_ Cartesian", + "category": "Constants/UI" }, "methods": [ { "key": "GeteUiParticleCoordinateType_Cartesian", "details": { - "name": "Gete Ui Particle Coordinate Type_ Cartesian" + "name": "Get Particle Coordinate Type_ Cartesian" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiParticleCoordinateType_Polar.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiParticleCoordinateType_Polar.names index 1e6648fc40..7f1226b83d 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiParticleCoordinateType_Polar.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiParticleCoordinateType_Polar.names @@ -5,13 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "e Ui Particle Coordinate Type_ Polar" + "name": "Particle Coordinate Type_ Polar", + "category": "Constants/UI" }, "methods": [ { "key": "GeteUiParticleCoordinateType_Polar", "details": { - "name": "Gete Ui Particle Coordinate Type_ Polar" + "name": "Get Particle Coordinate Type_ Polar" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiParticleInitialDirectionType_RelativeToEmitAngle.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiParticleInitialDirectionType_RelativeToEmitAngle.names index eea2d97ffc..1f488f6ad6 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiParticleInitialDirectionType_RelativeToEmitAngle.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiParticleInitialDirectionType_RelativeToEmitAngle.names @@ -5,13 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "e Ui Particle Initial Direction Type_ Relative To Emit Angle" + "name": "Particle Initial Direction Type_ Relative To Emit Angle", + "category": "Constants/UI" }, "methods": [ { "key": "GeteUiParticleInitialDirectionType_RelativeToEmitAngle", "details": { - "name": "Gete Ui Particle Initial Direction Type_ Relative To Emit Angle" + "name": "Get Particle Initial Direction Type_ Relative To Emit Angle" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiParticleInitialDirectionType_RelativeToEmitterCenter.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiParticleInitialDirectionType_RelativeToEmitterCenter.names index 39cce6f9df..598328bcfd 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiParticleInitialDirectionType_RelativeToEmitterCenter.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiParticleInitialDirectionType_RelativeToEmitterCenter.names @@ -5,13 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "e Ui Particle Initial Direction Type_ Relative To Emitter Center" + "name": "Particle Initial Direction Type_ Relative To Emitter Center", + "category": "Constants/UI" }, "methods": [ { "key": "GeteUiParticleInitialDirectionType_RelativeToEmitterCenter", "details": { - "name": "Gete Ui Particle Initial Direction Type_ Relative To Emitter Center" + "name": "Get Particle Initial Direction Type_ Relative To Emitter Center" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScaleToDeviceMode_NonUniformScale.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScaleToDeviceMode_NonUniformScale.names index 2eec2256c8..1870b958c4 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScaleToDeviceMode_NonUniformScale.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScaleToDeviceMode_NonUniformScale.names @@ -5,13 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "e Ui Scale To Device Mode_ Non Uniform Scale" + "name": "Scale To Device Mode_ Non Uniform Scale", + "category": "Constants/UI" }, "methods": [ { "key": "GeteUiScaleToDeviceMode_NonUniformScale", "details": { - "name": "Gete Ui Scale To Device Mode_ Non Uniform Scale" + "name": "Get Scale To Device Mode_ Non Uniform Scale" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScaleToDeviceMode_None.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScaleToDeviceMode_None.names index 21956957ed..32dec98d22 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScaleToDeviceMode_None.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScaleToDeviceMode_None.names @@ -5,13 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "e Ui Scale To Device Mode_ None" + "name": "Scale To Device Mode_ None", + "category": "Constants/UI" }, "methods": [ { "key": "GeteUiScaleToDeviceMode_None", "details": { - "name": "Gete Ui Scale To Device Mode_ None" + "name": "Get Scale To Device Mode_ None" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScaleToDeviceMode_ScaleXOnly.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScaleToDeviceMode_ScaleXOnly.names index 427b40f1fe..b98aaf0d81 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScaleToDeviceMode_ScaleXOnly.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScaleToDeviceMode_ScaleXOnly.names @@ -5,13 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "e Ui Scale To Device Mode_ ScaleX Only" + "name": "Scale To Device Mode_ ScaleX Only", + "category": "Constants/UI" }, "methods": [ { "key": "GeteUiScaleToDeviceMode_ScaleXOnly", "details": { - "name": "Gete Ui Scale To Device Mode_ ScaleX Only" + "name": "Get Scale To Device Mode_ ScaleX Only" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScaleToDeviceMode_ScaleYOnly.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScaleToDeviceMode_ScaleYOnly.names index 52c6f4110d..e40a06a234 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScaleToDeviceMode_ScaleYOnly.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScaleToDeviceMode_ScaleYOnly.names @@ -5,13 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "e Ui Scale To Device Mode_ ScaleY Only" + "name": "Scale To Device Mode_ ScaleY Only", + "category": "Constants/UI" }, "methods": [ { "key": "GeteUiScaleToDeviceMode_ScaleYOnly", "details": { - "name": "Gete Ui Scale To Device Mode_ ScaleY Only" + "name": "Get Scale To Device Mode_ ScaleY Only" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScaleToDeviceMode_UniformScaleToFill.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScaleToDeviceMode_UniformScaleToFill.names index b9d8dac813..2372c16959 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScaleToDeviceMode_UniformScaleToFill.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScaleToDeviceMode_UniformScaleToFill.names @@ -5,13 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "e Ui Scale To Device Mode_ Uniform Scale To Fill" + "name": "Scale To Device Mode_ Uniform Scale To Fill", + "category": "Constants/UI" }, "methods": [ { "key": "GeteUiScaleToDeviceMode_UniformScaleToFill", "details": { - "name": "Gete Ui Scale To Device Mode_ Uniform Scale To Fill" + "name": "Get Scale To Device Mode_ Uniform Scale To Fill" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScaleToDeviceMode_UniformScaleToFit.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScaleToDeviceMode_UniformScaleToFit.names index dfc36e8e5f..78e6bb3984 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScaleToDeviceMode_UniformScaleToFit.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScaleToDeviceMode_UniformScaleToFit.names @@ -5,13 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "e Ui Scale To Device Mode_ Uniform Scale To Fit" + "name": "Scale To Device Mode_ Uniform Scale To Fit", + "category": "Constants/UI" }, "methods": [ { "key": "GeteUiScaleToDeviceMode_UniformScaleToFit", "details": { - "name": "Gete Ui Scale To Device Mode_ Uniform Scale To Fit" + "name": "Get Scale To Device Mode_ Uniform Scale To Fit" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScaleToDeviceMode_UniformScaleToFitX.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScaleToDeviceMode_UniformScaleToFitX.names index 7cd6dcd0bf..2776f51857 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScaleToDeviceMode_UniformScaleToFitX.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScaleToDeviceMode_UniformScaleToFitX.names @@ -5,13 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "e Ui Scale To Device Mode_ Uniform Scale To FitX" + "name": "Scale To Device Mode_ Uniform Scale To FitX", + "category": "Constants/UI" }, "methods": [ { "key": "GeteUiScaleToDeviceMode_UniformScaleToFitX", "details": { - "name": "Gete Ui Scale To Device Mode_ Uniform Scale To FitX" + "name": "Get Scale To Device Mode_ Uniform Scale To FitX" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScaleToDeviceMode_UniformScaleToFitY.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScaleToDeviceMode_UniformScaleToFitY.names index 4b324e82cc..458287576d 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScaleToDeviceMode_UniformScaleToFitY.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScaleToDeviceMode_UniformScaleToFitY.names @@ -5,13 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "e Ui Scale To Device Mode_ Uniform Scale To FitY" + "name": "Scale To Device Mode_ Uniform Scale To FitY", + "category": "Constants/UI" }, "methods": [ { "key": "GeteUiScaleToDeviceMode_UniformScaleToFitY", "details": { - "name": "Gete Ui Scale To Device Mode_ Uniform Scale To FitY" + "name": "Get Scale To Device Mode_ Uniform Scale To FitY" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScrollBoxScrollBarVisibility_AlwaysShow.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScrollBoxScrollBarVisibility_AlwaysShow.names index 8a142a4135..98ec53c042 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScrollBoxScrollBarVisibility_AlwaysShow.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScrollBoxScrollBarVisibility_AlwaysShow.names @@ -5,13 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "e Ui Scroll Box Scroll Bar Visibility_ Always Show" + "name": "Scroll Box Scroll Bar Visibility_ Always Show", + "category": "Constants/UI" }, "methods": [ { "key": "GeteUiScrollBoxScrollBarVisibility_AlwaysShow", "details": { - "name": "Gete Ui Scroll Box Scroll Bar Visibility_ Always Show" + "name": "Get Scroll Box Scroll Bar Visibility_ Always Show" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScrollBoxScrollBarVisibility_AutoHide.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScrollBoxScrollBarVisibility_AutoHide.names index d3890dbe39..924af3e349 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScrollBoxScrollBarVisibility_AutoHide.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScrollBoxScrollBarVisibility_AutoHide.names @@ -5,13 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "e Ui Scroll Box Scroll Bar Visibility_ Auto Hide" + "name": "Scroll Box Scroll Bar Visibility_ Auto Hide", + "category": "Constants/UI" }, "methods": [ { "key": "GeteUiScrollBoxScrollBarVisibility_AutoHide", "details": { - "name": "Gete Ui Scroll Box Scroll Bar Visibility_ Auto Hide" + "name": "Get Scroll Box Scroll Bar Visibility_ Auto Hide" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScrollBoxScrollBarVisibility_AutoHideAndResizeViewport.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScrollBoxScrollBarVisibility_AutoHideAndResizeViewport.names index b8dd306b90..ab524c1ccb 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScrollBoxScrollBarVisibility_AutoHideAndResizeViewport.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScrollBoxScrollBarVisibility_AutoHideAndResizeViewport.names @@ -5,13 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "e Ui Scroll Box Scroll Bar Visibility_ Auto Hide And Resize Viewport" + "name": "Scroll Box Scroll Bar Visibility_ Auto Hide And Resize Viewport", + "category": "Constants/UI" }, "methods": [ { "key": "GeteUiScrollBoxScrollBarVisibility_AutoHideAndResizeViewport", "details": { - "name": "Gete Ui Scroll Box Scroll Bar Visibility_ Auto Hide And Resize Viewport" + "name": "Get Scroll Box Scroll Bar Visibility_ Auto Hide And Resize Viewport" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScrollBoxSnapMode_Children.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScrollBoxSnapMode_Children.names index 774f4686af..4c4b353073 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScrollBoxSnapMode_Children.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScrollBoxSnapMode_Children.names @@ -5,13 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "e Ui Scroll Box Snap Mode_ Children" + "name": "Scroll Box Snap Mode_ Children", + "category": "Constants/UI" }, "methods": [ { "key": "GeteUiScrollBoxSnapMode_Children", "details": { - "name": "Gete Ui Scroll Box Snap Mode_ Children" + "name": "Get Scroll Box Snap Mode_ Children" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScrollBoxSnapMode_Grid.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScrollBoxSnapMode_Grid.names index 0c59459061..91485a265d 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScrollBoxSnapMode_Grid.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScrollBoxSnapMode_Grid.names @@ -5,13 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "e Ui Scroll Box Snap Mode_ Grid" + "name": "Scroll Box Snap Mode_ Grid", + "category": "Constants/UI" }, "methods": [ { "key": "GeteUiScrollBoxSnapMode_Grid", "details": { - "name": "Gete Ui Scroll Box Snap Mode_ Grid" + "name": "Get Scroll Box Snap Mode_ Grid" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScrollBoxSnapMode_None.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScrollBoxSnapMode_None.names index bbc375573a..cd99b454b6 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScrollBoxSnapMode_None.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScrollBoxSnapMode_None.names @@ -5,13 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "e Ui Scroll Box Snap Mode_ None" + "name": "Scroll Box Snap Mode_ None", + "category": "Constants/UI" }, "methods": [ { "key": "GeteUiScrollBoxSnapMode_None", "details": { - "name": "Gete Ui Scroll Box Snap Mode_ None" + "name": "Get Scroll Box Snap Mode_ None" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScrollerOrientation_Horizontal.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScrollerOrientation_Horizontal.names index 67a0b79d1d..a2d70fb3c1 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScrollerOrientation_Horizontal.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScrollerOrientation_Horizontal.names @@ -5,13 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "e Ui Scroller Orientation_ Horizontal" + "name": "Scroller Orientation_ Horizontal", + "category": "Constants/UI" }, "methods": [ { "key": "GeteUiScrollerOrientation_Horizontal", "details": { - "name": "Gete Ui Scroller Orientation_ Horizontal" + "name": "Get Scroller Orientation_ Horizontal" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScrollerOrientation_Vertical.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScrollerOrientation_Vertical.names index a19fc02930..9ba58b8b5f 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScrollerOrientation_Vertical.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScrollerOrientation_Vertical.names @@ -5,13 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "e Ui Scroller Orientation_ Vertical" + "name": "Scroller Orientation_ Vertical", + "category": "Constants/UI" }, "methods": [ { "key": "GeteUiScrollerOrientation_Vertical", "details": { - "name": "Gete Ui Scroller Orientation_ Vertical" + "name": "Get Scroller Orientation_ Vertical" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiSpriteType_RenderTarget.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiSpriteType_RenderTarget.names index 6753095ad0..1a78044b7d 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiSpriteType_RenderTarget.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiSpriteType_RenderTarget.names @@ -5,13 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "e Ui Sprite Type_ Render Target" + "name": "Sprite Type_ Render Target", + "category": "Constants/UI" }, "methods": [ { "key": "GeteUiSpriteType_RenderTarget", "details": { - "name": "Gete Ui Sprite Type_ Render Target" + "name": "Get Sprite Type_ Render Target" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiSpriteType_SpriteAsset.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiSpriteType_SpriteAsset.names index 3e13e14026..2d3b3abf39 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiSpriteType_SpriteAsset.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiSpriteType_SpriteAsset.names @@ -5,13 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "e Ui Sprite Type_ Sprite Asset" + "name": "Sprite Type_ Sprite Asset", + "category": "Constants/UI" }, "methods": [ { "key": "GeteUiSpriteType_SpriteAsset", "details": { - "name": "Gete Ui Sprite Type_ Sprite Asset" + "name": "Get Sprite Type_ Sprite Asset" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTextOverflowMode_ClipText.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTextOverflowMode_ClipText.names index 9728a3e741..d824a3ad54 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTextOverflowMode_ClipText.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTextOverflowMode_ClipText.names @@ -5,13 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "e Ui Text Overflow Mode_ Clip Text" + "name": "Text Overflow Mode_ Clip Text", + "category": "Constants/UI" }, "methods": [ { "key": "GeteUiTextOverflowMode_ClipText", "details": { - "name": "Gete Ui Text Overflow Mode_ Clip Text" + "name": "Get Text Overflow Mode_ Clip Text" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTextOverflowMode_Ellipsis.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTextOverflowMode_Ellipsis.names index ef62f342f4..732f646b76 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTextOverflowMode_Ellipsis.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTextOverflowMode_Ellipsis.names @@ -5,13 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "e Ui Text Overflow Mode_ Ellipsis" + "name": "Text Overflow Mode_ Ellipsis", + "category": "Constants/UI" }, "methods": [ { "key": "GeteUiTextOverflowMode_Ellipsis", "details": { - "name": "Gete Ui Text Overflow Mode_ Ellipsis" + "name": "Get Text Overflow Mode_ Ellipsis" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTextOverflowMode_OverflowText.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTextOverflowMode_OverflowText.names index 20caaff753..230d49a728 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTextOverflowMode_OverflowText.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTextOverflowMode_OverflowText.names @@ -5,13 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "e Ui Text Overflow Mode_ Overflow Text" + "name": "Text Overflow Mode_ Overflow Text", + "category": "Constants/UI" }, "methods": [ { "key": "GeteUiTextOverflowMode_OverflowText", "details": { - "name": "Gete Ui Text Overflow Mode_ Overflow Text" + "name": "Get Text Overflow Mode_ Overflow Text" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTextShrinkToFit_None.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTextShrinkToFit_None.names index 7d55b34012..619fe0d94f 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTextShrinkToFit_None.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTextShrinkToFit_None.names @@ -5,13 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "e Ui Text Shrink To Fit_ None" + "name": "Text Shrink To Fit_ None", + "category": "Constants/UI" }, "methods": [ { "key": "GeteUiTextShrinkToFit_None", "details": { - "name": "Gete Ui Text Shrink To Fit_ None" + "name": "Get Text Shrink To Fit_ None" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTextShrinkToFit_Uniform.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTextShrinkToFit_Uniform.names index dcbf83f093..8a781a85eb 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTextShrinkToFit_Uniform.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTextShrinkToFit_Uniform.names @@ -5,13 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "e Ui Text Shrink To Fit_ Uniform" + "name": "Text Shrink To Fit Uniform", + "category": "Constants/UI" }, "methods": [ { "key": "GeteUiTextShrinkToFit_Uniform", "details": { - "name": "Gete Ui Text Shrink To Fit_ Uniform" + "name": "Get Text Shrink To Fit Uniform" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTextShrinkToFit_WidthOnly.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTextShrinkToFit_WidthOnly.names index e40dbe79e0..75012522d2 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTextShrinkToFit_WidthOnly.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTextShrinkToFit_WidthOnly.names @@ -5,13 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "e Ui Text Shrink To Fit_ Width Only" + "name": "Text Shrink To Fit_ Width Only", + "category": "Constants/UI" }, "methods": [ { "key": "GeteUiTextShrinkToFit_WidthOnly", "details": { - "name": "Gete Ui Text Shrink To Fit_ Width Only" + "name": "Get Text Shrink To Fit_ Width Only" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTextWrapTextSetting_NoWrap.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTextWrapTextSetting_NoWrap.names index 692f4c5736..8aaf6bfb90 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTextWrapTextSetting_NoWrap.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTextWrapTextSetting_NoWrap.names @@ -5,13 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "e Ui Text Wrap Text Setting_ No Wrap" + "name": "Text Setting No Wrap", + "category": "Constants/UI/Text Wrap" }, "methods": [ { "key": "GeteUiTextWrapTextSetting_NoWrap", "details": { - "name": "Gete Ui Text Wrap Text Setting_ No Wrap" + "name": "Get Text Setting No Wrap" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTextWrapTextSetting_Wrap.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTextWrapTextSetting_Wrap.names index 71327e85c7..bb8f5794e8 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTextWrapTextSetting_Wrap.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTextWrapTextSetting_Wrap.names @@ -5,13 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "e Ui Text Wrap Text Setting_ Wrap" + "name": "Text Wrap Text Setting_ Wrap", + "category": "Constants/UI" }, "methods": [ { "key": "GeteUiTextWrapTextSetting_Wrap", "details": { - "name": "Gete Ui Text Wrap Text Setting_ Wrap" + "name": "Get Text Wrap Text Setting Wrap" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTooltipDisplayAutoPositionMode_OffsetFromElement.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTooltipDisplayAutoPositionMode_OffsetFromElement.names index 82bb033dc0..912e075028 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTooltipDisplayAutoPositionMode_OffsetFromElement.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTooltipDisplayAutoPositionMode_OffsetFromElement.names @@ -5,13 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "e Ui Tooltip Display Auto Position Mode_ Offset From Element" + "name": "Tooltip Display Auto Position Mode_ Offset From Element", + "category": "Constants/UI" }, "methods": [ { "key": "GeteUiTooltipDisplayAutoPositionMode_OffsetFromElement", "details": { - "name": "Gete Ui Tooltip Display Auto Position Mode_ Offset From Element" + "name": "GetTooltip Display Auto Position Mode_ Offset From Element" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTooltipDisplayAutoPositionMode_OffsetFromMouse.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTooltipDisplayAutoPositionMode_OffsetFromMouse.names index 2fea22706c..fd294801e2 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTooltipDisplayAutoPositionMode_OffsetFromMouse.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTooltipDisplayAutoPositionMode_OffsetFromMouse.names @@ -5,13 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "e Ui Tooltip Display Auto Position Mode_ Offset From Mouse" + "name": "Tooltip Display Auto Position Mode_ Offset From Mouse", + "category": "Constants/UI" }, "methods": [ { "key": "GeteUiTooltipDisplayAutoPositionMode_OffsetFromMouse", "details": { - "name": "Gete Ui Tooltip Display Auto Position Mode_ Offset From Mouse" + "name": "GetTooltip Display Auto Position Mode_ Offset From Mouse" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTooltipDisplayTriggerMode_OnClick.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTooltipDisplayTriggerMode_OnClick.names index be3f715e03..003c81db6b 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTooltipDisplayTriggerMode_OnClick.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTooltipDisplayTriggerMode_OnClick.names @@ -5,13 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "e Ui Tooltip Display Trigger Mode_ On Click" + "name": "Tooltip Display Trigger Mode On Click", + "category": "Constants/UI" }, "methods": [ { "key": "GeteUiTooltipDisplayTriggerMode_OnClick", "details": { - "name": "Gete Ui Tooltip Display Trigger Mode_ On Click" + "name": "Get Tooltip Display Trigger Mode On Click" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTooltipDisplayTriggerMode_OnHover.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTooltipDisplayTriggerMode_OnHover.names index 90a75bfcc3..b8e100e5dc 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTooltipDisplayTriggerMode_OnHover.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTooltipDisplayTriggerMode_OnHover.names @@ -5,13 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "e Ui Tooltip Display Trigger Mode_ On Hover" + "name": "Tooltip Display Trigger Mode_ On Hover", + "category": "Constants/UI" }, "methods": [ { "key": "GeteUiTooltipDisplayTriggerMode_OnHover", "details": { - "name": "Gete Ui Tooltip Display Trigger Mode_ On Hover" + "name": "Get Tooltip Display Trigger Mode_ On Hover" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTooltipDisplayTriggerMode_OnPress.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTooltipDisplayTriggerMode_OnPress.names index c1b17d5d3d..c0774be947 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTooltipDisplayTriggerMode_OnPress.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTooltipDisplayTriggerMode_OnPress.names @@ -5,13 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "e Ui Tooltip Display Trigger Mode_ On Press" + "name": "Tooltip Display Trigger Mode_ On Press", + "category": "Constants/UI" }, "methods": [ { "key": "GeteUiTooltipDisplayTriggerMode_OnPress", "details": { - "name": "Gete Ui Tooltip Display Trigger Mode_ On Press" + "name": "Get Tooltip Display Trigger Mode_ On Press" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiVAlign_Bottom.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiVAlign_Bottom.names index 7c38c1be00..1ca5e4426e 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiVAlign_Bottom.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiVAlign_Bottom.names @@ -5,13 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "e UiV Align_ Bottom" + "name": "Vertical Align Bottom", + "category": "Constants/UI/Align" }, "methods": [ { "key": "GeteUiVAlign_Bottom", "details": { - "name": "Gete UiV Align_ Bottom" + "name": "Vertical Align: Bottom" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiVAlign_Center.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiVAlign_Center.names index fd9b1d2090..bd9b68a692 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiVAlign_Center.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiVAlign_Center.names @@ -5,13 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "e UiV Align_ Center" + "name": "Vertical Align Center", + "category": "Constants/UI/Align" }, "methods": [ { "key": "GeteUiVAlign_Center", "details": { - "name": "Gete UiV Align_ Center" + "name": "Vertical Align: Center" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiVAlign_Top.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiVAlign_Top.names index 8ad21a484f..6bbf6778b9 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiVAlign_Top.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiVAlign_Top.names @@ -5,13 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "e UiV Align_ Top" + "name": "Vertical Align Top", + "category": "Constants/UI/Align" }, "methods": [ { "key": "GeteUiVAlign_Top", "details": { - "name": "Gete UiV Align_ Top" + "name": "Vertical Align: Top" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiVerticalOrder_BottomToTop.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiVerticalOrder_BottomToTop.names index 2cd82d2e5c..3e9b9f61d3 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiVerticalOrder_BottomToTop.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiVerticalOrder_BottomToTop.names @@ -5,13 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "e Ui Vertical Order_ Bottom To Top" + "name": "Bottom To Top", + "category": "Constants/UI/Order/Vertical" }, "methods": [ { "key": "GeteUiVerticalOrder_BottomToTop", "details": { - "name": "Gete Ui Vertical Order_ Bottom To Top" + "name": "Bottom To Top" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiVerticalOrder_TopToBottom.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiVerticalOrder_TopToBottom.names index d800d7f9ce..3488c07a31 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiVerticalOrder_TopToBottom.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiVerticalOrder_TopToBottom.names @@ -5,13 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "e Ui Vertical Order_ Top To Bottom" + "name": "Top To Bottom", + "category": "Constants/UI/Order/Vertical" }, "methods": [ { "key": "GeteUiVerticalOrder_TopToBottom", "details": { - "name": "Gete Ui Vertical Order_ Top To Bottom" + "name": "Top To Bottom" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/g_ProfilerSystem.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/g_ProfilerSystem.names index 077380fe1b..b4af408222 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/g_ProfilerSystem.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/g_ProfilerSystem.names @@ -5,7 +5,8 @@ "context": "Constant", "variant": "", "details": { - "name": "g_ Profiler System" + "name": "g_ Profiler System", + "category": "Constants/Profiler" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/g_SettingsRegistry.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/g_SettingsRegistry.names index 1e53727b85..fe51c6ad00 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/g_SettingsRegistry.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/g_SettingsRegistry.names @@ -5,7 +5,8 @@ "context": "Constant", "variant": "", "details": { - "name": "g_ Settings Registry" + "name": "g_ Settings Registry", + "category": "Constants/Settings" }, "methods": [ { From 81bf27c4e063caef087a9da8efb2e3c026dd1b87 Mon Sep 17 00:00:00 2001 From: carlitosan <82187351+carlitosan@users.noreply.github.com> Date: Mon, 22 Nov 2021 16:57:21 -0800 Subject: [PATCH 204/345] remove scripteventreference deprecated code Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com> --- .../ScriptEventReferencesComponent.cpp | 92 ------------------- .../ScriptEventReferencesComponent.h | 44 --------- .../Source/Editor/ScriptEventsEditorGem.cpp | 2 - .../Code/Source/ScriptEventsGem.cpp | 5 +- .../Code/scriptevents_common_files.cmake | 2 - 5 files changed, 1 insertion(+), 144 deletions(-) delete mode 100644 Gems/ScriptEvents/Code/Include/ScriptEvents/Components/ScriptEventReferencesComponent.cpp delete mode 100644 Gems/ScriptEvents/Code/Include/ScriptEvents/Components/ScriptEventReferencesComponent.h diff --git a/Gems/ScriptEvents/Code/Include/ScriptEvents/Components/ScriptEventReferencesComponent.cpp b/Gems/ScriptEvents/Code/Include/ScriptEvents/Components/ScriptEventReferencesComponent.cpp deleted file mode 100644 index 696d2af4d2..0000000000 --- a/Gems/ScriptEvents/Code/Include/ScriptEvents/Components/ScriptEventReferencesComponent.cpp +++ /dev/null @@ -1,92 +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 "ScriptEventReferencesComponent.h" - -namespace ScriptEvents -{ - namespace Components - { - void ScriptEventReferencesComponent::Reflect(AZ::ReflectContext* context) - { - if (AZ::SerializeContext* serializeContext = azrtti_cast(context)) - { - // The Script Event References component is no longer necessary, as all Script Event assets - // will be properly loaded as needed. - serializeContext->ClassDeprecate("ScriptEventReferencesComponent", "{D0F440AC-32D4-49EC-8B93-860B188266A6}"); - } - } - - void ScriptEventReferencesComponent::Activate() - { - for (auto& scriptEventReferences : m_scriptEventAssets) - { - const auto& asset = scriptEventReferences.GetAsset(); - if (asset) - { - if (!AZ::Data::AssetBus::MultiHandler::BusIsConnectedId(asset.GetId())) - { - AZ::Data::AssetBus::MultiHandler::BusConnect(asset.GetId()); - } - - // Load the asset if it's not ready - if (!asset.IsReady()) - { - AZ::Data::AssetInfo assetInfo; - AZ::Data::AssetCatalogRequestBus::BroadcastResult(assetInfo, &AZ::Data::AssetCatalogRequests::GetAssetInfoById, asset.GetId()); - if (assetInfo.m_assetId.IsValid()) - { - AZ::Data::AssetManager::Instance().GetAsset(asset.GetId(), azrtti_typeid(), AZ::Data::AssetLoadBehavior::Default) - .BlockUntilLoadComplete(); - } - } - } - else - { - AZ_Warning("Script Events", false, "ScriptEventReferencesComponent could not find Script Event asset: %s", scriptEventReferences.GetDefinition() ? scriptEventReferences.GetDefinition()->GetName().c_str() : scriptEventReferences.GetAsset().GetId().ToString().c_str()); - } - } - } - - void ScriptEventReferencesComponent::Deactivate() - { - for (auto& scriptEventReferences : m_scriptEventAssets) - { - const auto& asset = scriptEventReferences.GetAsset(); - if (asset) - { - AZ::Data::AssetBus::MultiHandler::BusDisconnect(asset.GetId()); - } - } - } - - void ScriptEventReferencesComponent::GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& provided) - { - provided.push_back(AZ_CRC("ScriptEventReference", 0x3df92d40)); - } - - void ScriptEventReferencesComponent::GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible) - { - incompatible.push_back(AZ_CRC("ScriptEventReference", 0x3df92d40)); - } - - void ScriptEventReferencesComponent::GetDependentServices(AZ::ComponentDescriptor::DependencyArrayType& dependent) - { - dependent.push_back(AZ_CRC("LuaScriptService", 0x21d76c4b)); - } - - void ScriptEventReferencesComponent::OnAssetReady(AZ::Data::Asset asset) - { - if (ScriptEventsAsset* scriptEventAsset = asset.GetAs()) - { - scriptEventAsset->m_definition.RegisterInternal(); - } - } - - } -} diff --git a/Gems/ScriptEvents/Code/Include/ScriptEvents/Components/ScriptEventReferencesComponent.h b/Gems/ScriptEvents/Code/Include/ScriptEvents/Components/ScriptEventReferencesComponent.h deleted file mode 100644 index 562cab9b52..0000000000 --- a/Gems/ScriptEvents/Code/Include/ScriptEvents/Components/ScriptEventReferencesComponent.h +++ /dev/null @@ -1,44 +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 -#include - -namespace ScriptEvents -{ - namespace Components - { - class ScriptEventReferencesComponent - : public AZ::Component - , private AZ::Data::AssetBus::MultiHandler - - { - public: - - AZ_COMPONENT(ScriptEventReferencesComponent, "{D0F440AC-32D4-49EC-8B93-860B188266A6}", AZ::Component); - - ////////////////////////////////////////////////////////////////////////// - // AZ::Component - void Init() override {} - void Activate() override; - void Deactivate() override; - ////////////////////////////////////////////////////////////////////////// - - static void GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& provided); - static void GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible); - static void GetDependentServices(AZ::ComponentDescriptor::DependencyArrayType& dependent); - - void OnAssetReady(AZ::Data::Asset asset) override; - static void Reflect(AZ::ReflectContext* reflection); - - AZStd::vector m_scriptEventAssets; - }; - } -} diff --git a/Gems/ScriptEvents/Code/Source/Editor/ScriptEventsEditorGem.cpp b/Gems/ScriptEvents/Code/Source/Editor/ScriptEventsEditorGem.cpp index 8ab014ec15..3dec167f73 100644 --- a/Gems/ScriptEvents/Code/Source/Editor/ScriptEventsEditorGem.cpp +++ b/Gems/ScriptEvents/Code/Source/Editor/ScriptEventsEditorGem.cpp @@ -9,7 +9,6 @@ #include #include -#include #include #include @@ -74,7 +73,6 @@ namespace ScriptEvents m_descriptors.insert(m_descriptors.end(), { ScriptEventsEditor::ScriptEventEditorSystemComponent::CreateDescriptor(), - ScriptEvents::Components::ScriptEventReferencesComponent::CreateDescriptor(), ScriptEventsBuilder::ScriptEventsBuilderComponent::CreateDescriptor(), }); } diff --git a/Gems/ScriptEvents/Code/Source/ScriptEventsGem.cpp b/Gems/ScriptEvents/Code/Source/ScriptEventsGem.cpp index e4fb44f548..bc46993649 100644 --- a/Gems/ScriptEvents/Code/Source/ScriptEventsGem.cpp +++ b/Gems/ScriptEvents/Code/Source/ScriptEventsGem.cpp @@ -12,8 +12,6 @@ #include -#include - namespace ScriptEvents { ScriptEventsModule::ScriptEventsModule() @@ -23,8 +21,7 @@ namespace ScriptEvents ScriptEventModuleConfigurationRequestBus::Handler::BusConnect(); m_descriptors.insert(m_descriptors.end(), { - ScriptEvents::ScriptEventsSystemComponent::CreateDescriptor(), - ScriptEvents::Components::ScriptEventReferencesComponent::CreateDescriptor(), + ScriptEvents::ScriptEventsSystemComponent::CreateDescriptor() }); } diff --git a/Gems/ScriptEvents/Code/scriptevents_common_files.cmake b/Gems/ScriptEvents/Code/scriptevents_common_files.cmake index a7ecd9e049..a038bb2c90 100644 --- a/Gems/ScriptEvents/Code/scriptevents_common_files.cmake +++ b/Gems/ScriptEvents/Code/scriptevents_common_files.cmake @@ -42,6 +42,4 @@ set(FILES Include/ScriptEvents/Internal/BehaviorContextBinding/ScriptEventsBindingBus.h Include/ScriptEvents/Internal/BehaviorContextBinding/ScriptEventBinding.h Include/ScriptEvents/Internal/BehaviorContextBinding/ScriptEventBinding.cpp - Include/ScriptEvents/Components/ScriptEventReferencesComponent.h - Include/ScriptEvents/Components/ScriptEventReferencesComponent.cpp ) From eb402ee361b9dd303d86586a694d359549c99e24 Mon Sep 17 00:00:00 2001 From: lsemp3d <58790905+lsemp3d@users.noreply.github.com> Date: Mon, 22 Nov 2021 17:01:18 -0800 Subject: [PATCH 205/345] Improved categories and names for constants Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com> --- .../Properties/AudioObstructionType_MultiRay.names | 4 ++-- .../Properties/AudioObstructionType_SingleRay.names | 4 ++-- .../Properties/DepthWriteMask_All.names | 4 ++-- .../Properties/DepthWriteMask_Invalid.names | 4 ++-- .../Properties/DepthWriteMask_Zero.names | 4 ++-- .../TranslationAssets/Properties/FillMode_Invalid.names | 4 ++-- .../TranslationAssets/Properties/FillMode_Solid.names | 4 ++-- .../Properties/FillMode_Wireframe.names | 4 ++-- .../TranslationAssets/Properties/FloatEpsilon.names | 2 +- .../Properties/FrameCaptureResult_FileWriteError.names | 4 ++-- .../Properties/FrameCaptureResult_InternalError.names | 4 ++-- .../Properties/FrameCaptureResult_InvalidArgument.names | 4 ++-- .../Properties/FrameCaptureResult_None.names | 4 ++-- .../Properties/FrameCaptureResult_Success.names | 4 ++-- .../FrameCaptureResult_UnsupportedFormat.names | 4 ++-- .../LightAttenuationRadiusMode_Automatic.names | 4 ++-- .../Properties/LightAttenuationRadiusMode_Explicit.names | 4 ++-- .../MaterialPropertyGroupVisibility_Enabled.names | 6 +++--- .../MaterialPropertyGroupVisibility_Hidden.names | 6 +++--- .../Properties/MaterialPropertyVisibility_Disabled.names | 6 +++--- .../Properties/MaterialPropertyVisibility_Enabled.names | 6 +++--- .../Properties/MaterialPropertyVisibility_Hidden.names | 6 +++--- .../Properties/MultiPositionBehaviorType_Blended.names | 6 +++--- .../Properties/MultiPositionBehaviorType_Separate.names | 4 ++-- .../Properties/PhotometricUnit_Candela.names | 4 ++-- .../Properties/PhotometricUnit_Ev100_Illuminance.names | 4 ++-- .../Properties/PhotometricUnit_Ev100_Luminance.names | 4 ++-- .../Properties/PhotometricUnit_Lumen.names | 4 ++-- .../Properties/PhotometricUnit_Lux.names | 4 ++-- .../Properties/PhotometricUnit_Nit.names | 4 ++-- .../Properties/PhotometricUnit_Unknown.names | 4 ++-- .../Properties/ProviderNameEnum_AWSCognitoIDP.names | 4 ++-- .../Properties/ProviderNameEnum_Google.names | 4 ++-- .../Properties/ProviderNameEnum_LoginWithAmazon.names | 4 ++-- .../Properties/ShadowFilterMethod_ESM.names | 6 +++--- .../Properties/ShadowFilterMethod_ESM_PCF.names | 6 +++--- .../Properties/ShadowFilterMethod_None.names | 6 +++--- .../Properties/ShadowFilterMethod_PCF.names | 6 +++--- .../Properties/ShadowmapSize_1024.names | 6 +++--- .../Properties/ShadowmapSize_2045.names | 6 +++--- .../TranslationAssets/Properties/ShadowmapSize_256.names | 6 +++--- .../TranslationAssets/Properties/ShadowmapSize_512.names | 6 +++--- .../Properties/ShadowmapSize_None.names | 6 +++--- .../Properties/ShapeType_Heightfield.names | 9 +++++---- .../Properties/SystemConfigPlatform_Android.names | 4 ++-- .../SystemConfigPlatform_InvalidPlatform.names | 4 ++-- .../Properties/SystemConfigPlatform_Ios.names | 4 ++-- .../Properties/SystemConfigPlatform_Mac.names | 4 ++-- .../Properties/SystemConfigPlatform_OsxMetal.names | 4 ++-- .../Properties/SystemConfigPlatform_Pc.names | 4 ++-- .../Properties/SystemConfigPlatform_Provo.names | 4 ++-- .../Properties/SystemConfigSpec_Auto.names | 6 +++--- .../Properties/SystemConfigSpec_High.names | 6 +++--- .../Properties/SystemConfigSpec_Low.names | 6 +++--- .../Properties/SystemConfigSpec_Medium.names | 6 +++--- .../Properties/SystemConfigSpec_VeryHigh.names | 6 +++--- .../Properties/TransformComponentTypeId.names | 2 +- .../Properties/TransformMode_Rotation.names | 6 +++--- .../Properties/TransformMode_Scale.names | 6 +++--- .../Properties/TransformMode_Translation.names | 6 +++--- .../Properties/TransformPivot_Center.names | 6 +++--- .../Properties/TransformPivot_Object.names | 6 +++--- .../Properties/TransformRefreshType_All.names | 6 +++--- .../Properties/TransformRefreshType_Orientation.names | 6 +++--- .../Properties/TransformRefreshType_Translation.names | 6 +++--- .../Properties/TubeShapeComponentTypeId.names | 2 +- .../Properties/VegetationSpawnerComponentTypeId.names | 2 +- .../TranslationAssets/Properties/eSSB_GotoEndTime.names | 6 +++--- .../Properties/eSSB_GotoStartTime.names | 6 +++--- .../TranslationAssets/Properties/eSSB_LeaveTime.names | 6 +++--- .../Properties/eUiImageSequenceImageType_Fixed.names | 6 +++--- .../Properties/eUiImageSequenceImageType_Stretched.names | 6 +++--- .../eUiImageSequenceImageType_StretchedToFill.names | 6 +++--- .../eUiImageSequenceImageType_StretchedToFit.names | 6 +++--- .../Properties/eUiImageType_Fixed.names | 6 +++--- .../Properties/eUiImageType_Sliced.names | 6 +++--- .../Properties/eUiImageType_Stretched.names | 6 +++--- .../Properties/eUiImageType_StretchedToFill.names | 6 +++--- .../Properties/eUiImageType_StretchedToFit.names | 6 +++--- .../Properties/eUiImageType_Tiled.names | 6 +++--- .../TranslationAssets/Properties/g_ProfilerSystem.names | 4 ++-- .../Properties/g_SettingsRegistry.names | 4 ++-- 82 files changed, 204 insertions(+), 203 deletions(-) diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/AudioObstructionType_MultiRay.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/AudioObstructionType_MultiRay.names index 04995d42ee..353dd5a480 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/AudioObstructionType_MultiRay.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/AudioObstructionType_MultiRay.names @@ -5,14 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "Audio Obstruction Type_ Multi Ray", + "name": "Multi Ray", "category": "Constants/Audio Obstruction" }, "methods": [ { "key": "GetAudioObstructionType_MultiRay", "details": { - "name": "Get Audio Obstruction Type_ Multi Ray" + "name": "Multi Ray" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/AudioObstructionType_SingleRay.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/AudioObstructionType_SingleRay.names index 3629694797..cfd4b08ada 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/AudioObstructionType_SingleRay.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/AudioObstructionType_SingleRay.names @@ -5,14 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "Audio Obstruction Type_ Single Ray", + "name": "Single Ray", "category": "Constants/Audio Obstruction" }, "methods": [ { "key": "GetAudioObstructionType_SingleRay", "details": { - "name": "Get Audio Obstruction Type_ Single Ray" + "name": "Single Ray" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DepthWriteMask_All.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DepthWriteMask_All.names index 3306462911..4e01e31626 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DepthWriteMask_All.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DepthWriteMask_All.names @@ -5,14 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "Depth Write Mask_ All", + "name": "All", "category": "Constants/Depth Write Mask" }, "methods": [ { "key": "GetDepthWriteMask_All", "details": { - "name": "Get Depth Write Mask_ All" + "name": "All" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DepthWriteMask_Invalid.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DepthWriteMask_Invalid.names index 890b110969..121170fff3 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DepthWriteMask_Invalid.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DepthWriteMask_Invalid.names @@ -5,14 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "Depth Write Mask_ Invalid", + "name": "Invalid", "category": "Constants/Depth Write Mask" }, "methods": [ { "key": "GetDepthWriteMask_Invalid", "details": { - "name": "Get Depth Write Mask_ Invalid" + "name": "Invalid" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DepthWriteMask_Zero.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DepthWriteMask_Zero.names index 17e0fdfc11..3ee05feb70 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DepthWriteMask_Zero.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DepthWriteMask_Zero.names @@ -5,14 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "Depth Write Mask_ Zero", + "name": "Zero", "category": "Constants/Depth Write Mask" }, "methods": [ { "key": "GetDepthWriteMask_Zero", "details": { - "name": "Get Depth Write Mask_ Zero" + "name": "Zero" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FillMode_Invalid.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FillMode_Invalid.names index 40a47d894d..f93f276062 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FillMode_Invalid.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FillMode_Invalid.names @@ -5,14 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "Fill Mode_ Invalid", + "name": "Invalid", "category": "Constants/Fill Mode" }, "methods": [ { "key": "GetFillMode_Invalid", "details": { - "name": "Get Fill Mode_ Invalid" + "name": "Invalid" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FillMode_Solid.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FillMode_Solid.names index 4de555958e..7dc99cfd1d 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FillMode_Solid.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FillMode_Solid.names @@ -5,14 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "Fill Mode_ Solid", + "name": "Solid", "category": "Constants/Fill Mode" }, "methods": [ { "key": "GetFillMode_Solid", "details": { - "name": "Get Fill Mode_ Solid" + "name": "Solid" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FillMode_Wireframe.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FillMode_Wireframe.names index 86889a4f2c..f820d7d106 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FillMode_Wireframe.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FillMode_Wireframe.names @@ -5,14 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "Fill Mode_ Wireframe", + "name": "Wireframe", "category": "Constants/Fill Mode" }, "methods": [ { "key": "GetFillMode_Wireframe", "details": { - "name": "Get Fill Mode_ Wireframe" + "name": "Wireframe" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FloatEpsilon.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FloatEpsilon.names index 34e6063417..017cd8a36b 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FloatEpsilon.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FloatEpsilon.names @@ -12,7 +12,7 @@ { "key": "GetFloatEpsilon", "details": { - "name": "Get Float Epsilon" + "name": "Float Epsilon" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FrameCaptureResult_FileWriteError.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FrameCaptureResult_FileWriteError.names index 835f31cdeb..8a9f90d664 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FrameCaptureResult_FileWriteError.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FrameCaptureResult_FileWriteError.names @@ -5,14 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "Frame Capture Result_ File Write Error", + "name": "File Write Error", "category": "Constants/Frame Capture Result" }, "methods": [ { "key": "GetFrameCaptureResult_FileWriteError", "details": { - "name": "Get Frame Capture Result_ File Write Error" + "name": "File Write Error" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FrameCaptureResult_InternalError.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FrameCaptureResult_InternalError.names index 6ffed14cc8..0bee22fd8d 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FrameCaptureResult_InternalError.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FrameCaptureResult_InternalError.names @@ -5,14 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "Frame Capture Result_ Internal Error", + "name": "Internal Error", "category": "Constants/Frame Capture Result" }, "methods": [ { "key": "GetFrameCaptureResult_InternalError", "details": { - "name": "Get Frame Capture Result_ Internal Error" + "name": "Internal Error" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FrameCaptureResult_InvalidArgument.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FrameCaptureResult_InvalidArgument.names index 0193fd194b..21699eef84 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FrameCaptureResult_InvalidArgument.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FrameCaptureResult_InvalidArgument.names @@ -5,14 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "Frame Capture Result_ Invalid Argument", + "name": "Invalid Argument", "category": "Constants/Frame Capture Result" }, "methods": [ { "key": "GetFrameCaptureResult_InvalidArgument", "details": { - "name": "Get Frame Capture Result_ Invalid Argument" + "name": "Invalid Argument" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FrameCaptureResult_None.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FrameCaptureResult_None.names index 55be309ce2..95b49529b3 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FrameCaptureResult_None.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FrameCaptureResult_None.names @@ -5,14 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "Frame Capture Result_ None", + "name": "None", "category": "Constants/Frame Capture Result" }, "methods": [ { "key": "GetFrameCaptureResult_None", "details": { - "name": "Get Frame Capture Result_ None" + "name": "None" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FrameCaptureResult_Success.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FrameCaptureResult_Success.names index 0098802261..1b9a6a257e 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FrameCaptureResult_Success.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FrameCaptureResult_Success.names @@ -5,14 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "Frame Capture Result_ Success", + "name": "Success", "category": "Constants/Frame Capture Result" }, "methods": [ { "key": "GetFrameCaptureResult_Success", "details": { - "name": "Get Frame Capture Result_ Success" + "name": "Success" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FrameCaptureResult_UnsupportedFormat.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FrameCaptureResult_UnsupportedFormat.names index 07e0345d30..bda7719923 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FrameCaptureResult_UnsupportedFormat.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FrameCaptureResult_UnsupportedFormat.names @@ -5,14 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "Frame Capture Result_ Unsupported Format", + "name": "Unsupported Format", "category": "Constants/Frame Capture Result" }, "methods": [ { "key": "GetFrameCaptureResult_UnsupportedFormat", "details": { - "name": "Get Frame Capture Result_ Unsupported Format" + "name": "Unsupported Format" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/LightAttenuationRadiusMode_Automatic.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/LightAttenuationRadiusMode_Automatic.names index 57545e1f5e..82997c40a5 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/LightAttenuationRadiusMode_Automatic.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/LightAttenuationRadiusMode_Automatic.names @@ -5,14 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "Light Attenuation Radius Mode_ Automatic", + "name": "Automatic", "category": "Constants/Light Attenuation Radius Mode" }, "methods": [ { "key": "GetLightAttenuationRadiusMode_Automatic", "details": { - "name": "Get Light Attenuation Radius Mode_ Automatic" + "name": "Automatic" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/LightAttenuationRadiusMode_Explicit.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/LightAttenuationRadiusMode_Explicit.names index 63855f489d..546a8f21d8 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/LightAttenuationRadiusMode_Explicit.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/LightAttenuationRadiusMode_Explicit.names @@ -5,14 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "Light Attenuation Radius Mode_ Explicit", + "name": "Explicit", "category": "Constants/Light Attenuation Radius Mode" }, "methods": [ { "key": "GetLightAttenuationRadiusMode_Explicit", "details": { - "name": "Get Light Attenuation Radius Mode_ Explicit" + "name": "Explicit" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/MaterialPropertyGroupVisibility_Enabled.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/MaterialPropertyGroupVisibility_Enabled.names index b8efbaba27..76b190410d 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/MaterialPropertyGroupVisibility_Enabled.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/MaterialPropertyGroupVisibility_Enabled.names @@ -5,14 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "Material Property Group Visibility_ Enabled", - "category": "Constants/Material Property" + "name": "Enabled", + "category": "Constants/Material Property Group Visibility" }, "methods": [ { "key": "GetMaterialPropertyGroupVisibility_Enabled", "details": { - "name": "Get Material Property Group Visibility_ Enabled" + "name": "Enabled" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/MaterialPropertyGroupVisibility_Hidden.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/MaterialPropertyGroupVisibility_Hidden.names index ee24475d35..b2457aed71 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/MaterialPropertyGroupVisibility_Hidden.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/MaterialPropertyGroupVisibility_Hidden.names @@ -5,14 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "Material Property Group Visibility_ Hidden", - "category": "Constants/Material Property" + "name": "Hidden", + "category": "Constants/Material Property Group Visibility" }, "methods": [ { "key": "GetMaterialPropertyGroupVisibility_Hidden", "details": { - "name": "Get Material Property Group Visibility_ Hidden" + "name": "Hidden" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/MaterialPropertyVisibility_Disabled.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/MaterialPropertyVisibility_Disabled.names index 20ccbae176..a04dc06e3a 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/MaterialPropertyVisibility_Disabled.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/MaterialPropertyVisibility_Disabled.names @@ -5,14 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "Material Property Visibility_ Disabled", - "category": "Constants/Material Property" + "name": "Disabled", + "category": "Constants/Material Property Visibility" }, "methods": [ { "key": "GetMaterialPropertyVisibility_Disabled", "details": { - "name": "Get Material Property Visibility_ Disabled" + "name": "Disabled" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/MaterialPropertyVisibility_Enabled.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/MaterialPropertyVisibility_Enabled.names index 833a5c7e36..b6343d4452 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/MaterialPropertyVisibility_Enabled.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/MaterialPropertyVisibility_Enabled.names @@ -5,14 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "Material Property Visibility_ Enabled", - "category": "Constants/Material Property" + "name": "Enabled", + "category": "Constants/Material Property Visibility" }, "methods": [ { "key": "GetMaterialPropertyVisibility_Enabled", "details": { - "name": "Get Material Property Visibility_ Enabled" + "name": "Enabled" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/MaterialPropertyVisibility_Hidden.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/MaterialPropertyVisibility_Hidden.names index 324be1d807..d585f38b3d 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/MaterialPropertyVisibility_Hidden.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/MaterialPropertyVisibility_Hidden.names @@ -5,14 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "Material Property Visibility_ Hidden", - "category": "Constants/Material Property" + "name": "Hidden", + "category": "Constants/Material Property Visibility" }, "methods": [ { "key": "GetMaterialPropertyVisibility_Hidden", "details": { - "name": "Get Material Property Visibility_ Hidden" + "name": "Hidden" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/MultiPositionBehaviorType_Blended.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/MultiPositionBehaviorType_Blended.names index 7b6b84a619..5584463927 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/MultiPositionBehaviorType_Blended.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/MultiPositionBehaviorType_Blended.names @@ -5,14 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "Multi Position Behavior Type_ Blended", - "category": "Constants/Material Property" + "name": "Blended", + "category": "Constants/Multi Position Behavior Type" }, "methods": [ { "key": "GetMultiPositionBehaviorType_Blended", "details": { - "name": "Get Multi Position Behavior Type_ Blended" + "name": "Blended" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/MultiPositionBehaviorType_Separate.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/MultiPositionBehaviorType_Separate.names index d4066425cc..6aa2d44c74 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/MultiPositionBehaviorType_Separate.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/MultiPositionBehaviorType_Separate.names @@ -5,14 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "Multi Position Behavior Type_ Separate", + "name": "Separate", "category": "Constants/Multi Position Behavior Type" }, "methods": [ { "key": "GetMultiPositionBehaviorType_Separate", "details": { - "name": "Get Multi Position Behavior Type_ Separate" + "name": "Separate" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PhotometricUnit_Candela.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PhotometricUnit_Candela.names index eff06aee6d..777b65e033 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PhotometricUnit_Candela.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PhotometricUnit_Candela.names @@ -5,14 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "Photometric Unit_ Candela", + "name": "Candela", "category": "Constants/Photometric Unit" }, "methods": [ { "key": "GetPhotometricUnit_Candela", "details": { - "name": "Get Photometric Unit_ Candela" + "name": "Candela" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PhotometricUnit_Ev100_Illuminance.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PhotometricUnit_Ev100_Illuminance.names index b6a79808b7..0be63e5f79 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PhotometricUnit_Ev100_Illuminance.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PhotometricUnit_Ev100_Illuminance.names @@ -5,14 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "Photometric Unit_ Ev 100_ Illuminance", + "name": "Ev 100 Illuminance", "category": "Constants/Photometric Unit" }, "methods": [ { "key": "GetPhotometricUnit_Ev100_Illuminance", "details": { - "name": "Get Photometric Unit_ Ev 100_ Illuminance" + "name": "Ev 100 Illuminance" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PhotometricUnit_Ev100_Luminance.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PhotometricUnit_Ev100_Luminance.names index df41518350..c0d66a0bff 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PhotometricUnit_Ev100_Luminance.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PhotometricUnit_Ev100_Luminance.names @@ -5,14 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "Photometric Unit_ Ev 100_ Luminance", + "name": "Ev 100 Luminance", "category": "Constants/Photometric Unit" }, "methods": [ { "key": "GetPhotometricUnit_Ev100_Luminance", "details": { - "name": "Get Photometric Unit_ Ev 100_ Luminance" + "name": "Ev 100 Luminance" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PhotometricUnit_Lumen.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PhotometricUnit_Lumen.names index 5ac043877c..4484ca6141 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PhotometricUnit_Lumen.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PhotometricUnit_Lumen.names @@ -5,14 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "Photometric Unit_ Lumen", + "name": "Lumen", "category": "Constants/Photometric Unit" }, "methods": [ { "key": "GetPhotometricUnit_Lumen", "details": { - "name": "Get Photometric Unit_ Lumen" + "name": "Lumen" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PhotometricUnit_Lux.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PhotometricUnit_Lux.names index 2d42c3784b..8b0fba4085 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PhotometricUnit_Lux.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PhotometricUnit_Lux.names @@ -5,14 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "Photometric Unit_ Lux", + "name": "Lux", "category": "Constants/Photometric Unit" }, "methods": [ { "key": "GetPhotometricUnit_Lux", "details": { - "name": "Get Photometric Unit_ Lux" + "name": "Lux" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PhotometricUnit_Nit.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PhotometricUnit_Nit.names index ee0a94625c..5e5326dc76 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PhotometricUnit_Nit.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PhotometricUnit_Nit.names @@ -5,14 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "Photometric Unit_ Nit", + "name": "Nit", "category": "Constants/Photometric Unit" }, "methods": [ { "key": "GetPhotometricUnit_Nit", "details": { - "name": "Get Photometric Unit_ Nit" + "name": "Nit" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PhotometricUnit_Unknown.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PhotometricUnit_Unknown.names index 74f02b9e3f..aa7a690895 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PhotometricUnit_Unknown.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PhotometricUnit_Unknown.names @@ -5,14 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "Photometric Unit_ Unknown", + "name": "Unknown", "category": "Constants/Photometric Unit" }, "methods": [ { "key": "GetPhotometricUnit_Unknown", "details": { - "name": "Get Photometric Unit_ Unknown" + "name": "Unknown" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ProviderNameEnum_AWSCognitoIDP.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ProviderNameEnum_AWSCognitoIDP.names index 6154d681da..51b18f6a3f 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ProviderNameEnum_AWSCognitoIDP.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ProviderNameEnum_AWSCognitoIDP.names @@ -5,14 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "Provider Name Enum_AWS CognitoIDP", + "name": "AWS Cognito IDP", "category": "Constants/Provider Name" }, "methods": [ { "key": "GetProviderNameEnum_AWSCognitoIDP", "details": { - "name": "Get Provider Name Enum_AWS CognitoIDP" + "name": "AWS Cognito IDP" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ProviderNameEnum_Google.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ProviderNameEnum_Google.names index 38e31081a9..c6f5875b85 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ProviderNameEnum_Google.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ProviderNameEnum_Google.names @@ -5,14 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "Provider Name Enum_ Google", + "name": "Google", "category": "Constants/Provider Name" }, "methods": [ { "key": "GetProviderNameEnum_Google", "details": { - "name": "Get Provider Name Enum_ Google" + "name": "Google" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ProviderNameEnum_LoginWithAmazon.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ProviderNameEnum_LoginWithAmazon.names index 994d48f714..9ce06d95bc 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ProviderNameEnum_LoginWithAmazon.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ProviderNameEnum_LoginWithAmazon.names @@ -5,14 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "Provider Name Enum_ Login With Amazon", + "name": "Amazon", "category": "Constants/Provider Name" }, "methods": [ { "key": "GetProviderNameEnum_LoginWithAmazon", "details": { - "name": "Get Provider Name Enum_ Login With Amazon" + "name": "Amazon" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShadowFilterMethod_ESM.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShadowFilterMethod_ESM.names index a9ffc81f9c..2c61e96479 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShadowFilterMethod_ESM.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShadowFilterMethod_ESM.names @@ -5,14 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "Shadow Filter Method_ESM", - "category": "Constants/Shadowmap" + "name": "ESM", + "category": "Constants/Shadowmap/Filter" }, "methods": [ { "key": "GetShadowFilterMethod_ESM", "details": { - "name": "Get Shadow Filter Method_ESM" + "name": "ESM" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShadowFilterMethod_ESM_PCF.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShadowFilterMethod_ESM_PCF.names index c4347ea123..af77df03ec 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShadowFilterMethod_ESM_PCF.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShadowFilterMethod_ESM_PCF.names @@ -5,14 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "Shadow Filter Method_ESM_PCF", - "category": "Constants/Shadowmap" + "name": "ESM_PCF", + "category": "Constants/Shadowmap/Filter" }, "methods": [ { "key": "GetShadowFilterMethod_ESM_PCF", "details": { - "name": "Get Shadow Filter Method_ESM_PCF" + "name": "ESM_PCF" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShadowFilterMethod_None.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShadowFilterMethod_None.names index 0688532394..872c8175d4 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShadowFilterMethod_None.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShadowFilterMethod_None.names @@ -5,14 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "Shadow Filter Method_ None", - "category": "Constants/Shadowmap" + "name": "None", + "category": "Constants/Shadowmap/Filter" }, "methods": [ { "key": "GetShadowFilterMethod_None", "details": { - "name": "Get Shadow Filter Method_ None" + "name": "None" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShadowFilterMethod_PCF.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShadowFilterMethod_PCF.names index 75b3fb5ec4..3186d0931a 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShadowFilterMethod_PCF.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShadowFilterMethod_PCF.names @@ -5,14 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "Shadow Filter Method_PCF", - "category": "Constants/Shadowmap" + "name": "PCF", + "category": "Constants/Shadowmap/Filter" }, "methods": [ { "key": "GetShadowFilterMethod_PCF", "details": { - "name": "Get Shadow Filter Method_PCF" + "name": "PCF" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShadowmapSize_1024.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShadowmapSize_1024.names index b08aa1b6d2..5f8abb02c3 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShadowmapSize_1024.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShadowmapSize_1024.names @@ -5,14 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "Shadowmap Size_ 1024", - "category": "Constants/Shadowmap" + "name": "1024", + "category": "Constants/Shadowmap/Size" }, "methods": [ { "key": "GetShadowmapSize_1024", "details": { - "name": "Get Shadowmap Size_ 1024" + "name": "1024" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShadowmapSize_2045.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShadowmapSize_2045.names index 061792241e..18b12dbdaa 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShadowmapSize_2045.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShadowmapSize_2045.names @@ -5,14 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "Shadowmap Size_ 2045", - "category": "Constants/Shadowmap" + "name": "2045", + "category": "Constants/Shadowmap/Size" }, "methods": [ { "key": "GetShadowmapSize_2045", "details": { - "name": "Get Shadowmap Size_ 2045" + "name": "2045" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShadowmapSize_256.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShadowmapSize_256.names index 89f780b148..0711591646 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShadowmapSize_256.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShadowmapSize_256.names @@ -5,14 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "Shadowmap Size_ 256", - "category": "Constants/Shadowmap" + "name": "256", + "category": "Constants/Shadowmap/Size" }, "methods": [ { "key": "GetShadowmapSize_256", "details": { - "name": "Get Shadowmap Size_ 256" + "name": "256" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShadowmapSize_512.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShadowmapSize_512.names index 17a30a0491..b2d763f207 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShadowmapSize_512.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShadowmapSize_512.names @@ -5,14 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "Shadowmap Size_ 512", - "category": "Constants/Shadowmap" + "name": "512", + "category": "Constants/Shadowmap/Size" }, "methods": [ { "key": "GetShadowmapSize_512", "details": { - "name": "Get Shadowmap Size_ 512" + "name": "512" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShadowmapSize_None.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShadowmapSize_None.names index 7154a5b1e2..58a6bc303f 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShadowmapSize_None.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShadowmapSize_None.names @@ -5,14 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "Shadowmap Size_ None", - "category": "Constants/Shadowmap" + "name": "None", + "category": "Constants/Shadowmap/Size" }, "methods": [ { "key": "GetShadowmapSize_None", "details": { - "name": "Get Shadowmap Size_ None" + "name": "None" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShapeType_Heightfield.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShapeType_Heightfield.names index ed198b5f81..51c2b8eb0a 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShapeType_Heightfield.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShapeType_Heightfield.names @@ -5,20 +5,21 @@ "context": "Constant", "variant": "", "details": { - "name": "Shape Type_ Heightfield", - "category": "Constants/Shape Type" + "name": "Get Shape Type: Heightfield", + "category": "Constants/Physics" }, "methods": [ { "key": "GetShapeType_Heightfield", "details": { - "name": "Get Shape Type_ Heightfield" + "name": "Get Shape Type: Heightfield", + "subtitle": "Shape Type" }, "results": [ { "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", "details": { - "name": "int" + "name": "Shape Type" } } ] diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigPlatform_Android.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigPlatform_Android.names index 069cda6ab9..92b95f2eaf 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigPlatform_Android.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigPlatform_Android.names @@ -5,14 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "System Config Platform_ Android", + "name": "Android", "category": "Constants/System Configuration" }, "methods": [ { "key": "GetSystemConfigPlatform_Android", "details": { - "name": "Get System Config Platform_ Android" + "name": "Android" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigPlatform_InvalidPlatform.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigPlatform_InvalidPlatform.names index a8a6686667..eef4a9709b 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigPlatform_InvalidPlatform.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigPlatform_InvalidPlatform.names @@ -5,14 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "System Config Platform_ Invalid Platform", + "name": "Invalid Platform", "category": "Constants/System Configuration" }, "methods": [ { "key": "GetSystemConfigPlatform_InvalidPlatform", "details": { - "name": "Get System Config Platform_ Invalid Platform" + "name": "Invalid Platform" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigPlatform_Ios.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigPlatform_Ios.names index c22ef5a1db..176c31ae50 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigPlatform_Ios.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigPlatform_Ios.names @@ -5,14 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "System Config Platform_ Ios", + "name": "Ios", "category": "Constants/System Configuration" }, "methods": [ { "key": "GetSystemConfigPlatform_Ios", "details": { - "name": "Get System Config Platform_ Ios" + "name": "Ios" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigPlatform_Mac.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigPlatform_Mac.names index b7198ea4a1..86e2686493 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigPlatform_Mac.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigPlatform_Mac.names @@ -5,14 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "System Config Platform_ Mac", + "name": "Mac", "category": "Constants/System Configuration" }, "methods": [ { "key": "GetSystemConfigPlatform_Mac", "details": { - "name": "Get System Config Platform_ Mac" + "name": "Mac" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigPlatform_OsxMetal.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigPlatform_OsxMetal.names index deb52ff2d1..b65d572c09 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigPlatform_OsxMetal.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigPlatform_OsxMetal.names @@ -5,14 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "System Config Platform_ Osx Metal", + "name": "Osx Metal", "category": "Constants/System Configuration" }, "methods": [ { "key": "GetSystemConfigPlatform_OsxMetal", "details": { - "name": "Get System Config Platform_ Osx Metal" + "name": "Osx Metal" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigPlatform_Pc.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigPlatform_Pc.names index a89123fa76..7653461096 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigPlatform_Pc.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigPlatform_Pc.names @@ -5,14 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "System Config Platform_ Pc", + "name": "Pc", "category": "Constants/System Configuration" }, "methods": [ { "key": "GetSystemConfigPlatform_Pc", "details": { - "name": "Get System Config Platform_ Pc" + "name": "Pc" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigPlatform_Provo.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigPlatform_Provo.names index 43c31306c6..62f4f8eda5 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigPlatform_Provo.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigPlatform_Provo.names @@ -5,14 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "System Config Platform_ Provo", + "name": "Provo", "category": "Constants/System Configuration" }, "methods": [ { "key": "GetSystemConfigPlatform_Provo", "details": { - "name": "Get System Config Platform_ Provo" + "name": "Provo" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigSpec_Auto.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigSpec_Auto.names index 94cf562847..0646ab299a 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigSpec_Auto.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigSpec_Auto.names @@ -5,14 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "System Config Spec_ Auto", - "category": "Constants/System Configuration" + "name": "Auto", + "category": "Constants/System Spec" }, "methods": [ { "key": "GetSystemConfigSpec_Auto", "details": { - "name": "Get System Config Spec_ Auto" + "name": "Auto" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigSpec_High.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigSpec_High.names index 66e2d70bcf..dfaa1277cf 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigSpec_High.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigSpec_High.names @@ -5,14 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "System Config Spec_ High", - "category": "Constants/System Configuration" + "name": "High", + "category": "Constants/System Spec" }, "methods": [ { "key": "GetSystemConfigSpec_High", "details": { - "name": "Get System Config Spec_ High" + "name": "High" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigSpec_Low.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigSpec_Low.names index 6be746da05..af875a7704 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigSpec_Low.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigSpec_Low.names @@ -5,14 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "System Config Spec_ Low", - "category": "Constants/System Configuration" + "name": "Low", + "category": "Constants/System Spec" }, "methods": [ { "key": "GetSystemConfigSpec_Low", "details": { - "name": "Get System Config Spec_ Low" + "name": "Low" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigSpec_Medium.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigSpec_Medium.names index 92999f9aa6..c4b7c9aefd 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigSpec_Medium.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigSpec_Medium.names @@ -5,14 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "System Config Spec_ Medium", - "category": "Constants/System Configuration" + "name": "Medium", + "category": "Constants/System Spec" }, "methods": [ { "key": "GetSystemConfigSpec_Medium", "details": { - "name": "Get System Config Spec_ Medium" + "name": "Medium" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigSpec_VeryHigh.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigSpec_VeryHigh.names index 1ccbff8818..169f3fb7ea 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigSpec_VeryHigh.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigSpec_VeryHigh.names @@ -5,14 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "System Config Spec_ Very High", - "category": "Constants/System Configuration" + "name": "Very High", + "category": "Constants/System Spec" }, "methods": [ { "key": "GetSystemConfigSpec_VeryHigh", "details": { - "name": "Get System Config Spec_ Very High" + "name": "Very High" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TransformComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TransformComponentTypeId.names index 2eba02da39..29d57c5b38 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TransformComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TransformComponentTypeId.names @@ -6,7 +6,7 @@ "variant": "", "details": { "name": "Transform Component Type Id", - "category": "Constants/Transform" + "category": "Constants/Editor" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TransformMode_Rotation.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TransformMode_Rotation.names index a544207953..3b70a204a8 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TransformMode_Rotation.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TransformMode_Rotation.names @@ -5,14 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "Transform Mode_ Rotation", - "category": "Constants/Transform" + "name": "Rotation", + "category": "Constants/Transform/Mode" }, "methods": [ { "key": "GetTransformMode_Rotation", "details": { - "name": "Get Transform Mode_ Rotation" + "name": "Rotation" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TransformMode_Scale.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TransformMode_Scale.names index 75685c4f0d..5e425db9b1 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TransformMode_Scale.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TransformMode_Scale.names @@ -5,14 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "Transform Mode_ Scale", - "category": "Constants/Transform" + "name": "Scale", + "category": "Constants/Transform/Mode" }, "methods": [ { "key": "GetTransformMode_Scale", "details": { - "name": "Get Transform Mode_ Scale" + "name": "Scale" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TransformMode_Translation.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TransformMode_Translation.names index 5bf6853c21..23eca9bd48 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TransformMode_Translation.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TransformMode_Translation.names @@ -5,14 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "Transform Mode_ Translation", - "category": "Constants/Transform" + "name": "Translation", + "category": "Constants/Transform/Mode" }, "methods": [ { "key": "GetTransformMode_Translation", "details": { - "name": "Get Transform Mode_ Translation" + "name": "Translation" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TransformPivot_Center.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TransformPivot_Center.names index 29762a711a..a4d5f859b0 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TransformPivot_Center.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TransformPivot_Center.names @@ -5,14 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "Transform Pivot_ Center", - "category": "Constants/Transform" + "name": "Center", + "category": "Constants/Transform/Pivot" }, "methods": [ { "key": "GetTransformPivot_Center", "details": { - "name": "Get Transform Pivot_ Center" + "name": "Center" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TransformPivot_Object.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TransformPivot_Object.names index fa1f7fa8ad..3c4f11fb3a 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TransformPivot_Object.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TransformPivot_Object.names @@ -5,14 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "Transform Pivot_ Object", - "category": "Constants/Transform" + "name": "Object", + "category": "Constants/Transform/Pivot" }, "methods": [ { "key": "GetTransformPivot_Object", "details": { - "name": "Get Transform Pivot_ Object" + "name": "Object" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TransformRefreshType_All.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TransformRefreshType_All.names index 3d2499003b..844376c960 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TransformRefreshType_All.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TransformRefreshType_All.names @@ -5,14 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "Transform Refresh Type_ All", - "category": "Constants/Transform" + "name": "All", + "category": "Constants/Transform/Refresh Type" }, "methods": [ { "key": "GetTransformRefreshType_All", "details": { - "name": "Get Transform Refresh Type_ All" + "name": "All" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TransformRefreshType_Orientation.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TransformRefreshType_Orientation.names index 74d8f9f157..37ee133fb6 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TransformRefreshType_Orientation.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TransformRefreshType_Orientation.names @@ -5,14 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "Transform Refresh Type_ Orientation", - "category": "Constants/Transform" + "name": "Orientation", + "category": "Constants/Transform/Refresh Type" }, "methods": [ { "key": "GetTransformRefreshType_Orientation", "details": { - "name": "Get Transform Refresh Type_ Orientation" + "name": "Orientation" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TransformRefreshType_Translation.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TransformRefreshType_Translation.names index b0d6b1a151..11c492d799 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TransformRefreshType_Translation.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TransformRefreshType_Translation.names @@ -5,14 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "Transform Refresh Type_ Translation", - "category": "Constants/Transform" + "name": "Translation", + "category": "Constants/Transform/Refresh Type" }, "methods": [ { "key": "GetTransformRefreshType_Translation", "details": { - "name": "Get Transform Refresh Type_ Translation" + "name": "Translation" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TubeShapeComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TubeShapeComponentTypeId.names index 3b9600333b..0f674980a7 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TubeShapeComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TubeShapeComponentTypeId.names @@ -6,7 +6,7 @@ "variant": "", "details": { "name": "Tube Shape Component Type Id", - "category": "Constants/Transform" + "category": "Constants/Editor" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/VegetationSpawnerComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/VegetationSpawnerComponentTypeId.names index 98bc312731..cc405ebb88 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/VegetationSpawnerComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/VegetationSpawnerComponentTypeId.names @@ -6,7 +6,7 @@ "variant": "", "details": { "name": "Vegetation Spawner Component Type Id", - "category": "Constants/Vegetation Spawner" + "category": "Constants/Editor" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eSSB_GotoEndTime.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eSSB_GotoEndTime.names index 597eaaf288..0f52fd70a6 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eSSB_GotoEndTime.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eSSB_GotoEndTime.names @@ -5,14 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "eSSB_ Goto End Time", - "category": "Constants/SSB" + "name": "Goto End Time", + "category": "Constants/UI/Animation/Sequence Stop Behavior" }, "methods": [ { "key": "GeteSSB_GotoEndTime", "details": { - "name": "GeteSSB_ Goto End Time" + "name": "Goto End Time" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eSSB_GotoStartTime.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eSSB_GotoStartTime.names index 10602a0a80..f5ff272c4a 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eSSB_GotoStartTime.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eSSB_GotoStartTime.names @@ -5,14 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "eSSB_ Goto Start Time", - "category": "Constants/SSB" + "name": "Goto Start Time", + "category": "Constants/UI/Animation/Sequence Stop Behavior" }, "methods": [ { "key": "GeteSSB_GotoStartTime", "details": { - "name": "GeteSSB_ Goto Start Time" + "name": "Goto Start Time" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eSSB_LeaveTime.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eSSB_LeaveTime.names index cb7819dedd..a018009749 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eSSB_LeaveTime.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eSSB_LeaveTime.names @@ -5,14 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "eSSB_ Leave Time", - "category": "Constants/SSB" + "name": "Leave Time", + "category": "Constants/UI/Animation/Sequence Stop Behavior" }, "methods": [ { "key": "GeteSSB_LeaveTime", "details": { - "name": "GeteSSB_ Leave Time" + "name": "Leave Time" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiImageSequenceImageType_Fixed.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiImageSequenceImageType_Fixed.names index 86fe1cb7d4..ed0463cc65 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiImageSequenceImageType_Fixed.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiImageSequenceImageType_Fixed.names @@ -5,14 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "Image Sequence Image Type_ Fixed", - "category": "Constants/UI" + "name": "Image Type: Fixed", + "category": "Constants/UI/Image Sequence" }, "methods": [ { "key": "GeteUiImageSequenceImageType_Fixed", "details": { - "name": "Get Image Sequence Image Type_ Fixed" + "name": "Image Type: Fixed" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiImageSequenceImageType_Stretched.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiImageSequenceImageType_Stretched.names index d716a8bd8b..337d22613d 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiImageSequenceImageType_Stretched.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiImageSequenceImageType_Stretched.names @@ -5,14 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "Image Sequence Image Type_ Stretched", - "category": "Constants/UI" + "name": "Image Type: Stretched", + "category": "Constants/UI/Image Sequence" }, "methods": [ { "key": "GeteUiImageSequenceImageType_Stretched", "details": { - "name": "Get Image Sequence Image Type_ Stretched" + "name": "Image Type: Stretched" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiImageSequenceImageType_StretchedToFill.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiImageSequenceImageType_StretchedToFill.names index 097c5579cd..d696007a94 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiImageSequenceImageType_StretchedToFill.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiImageSequenceImageType_StretchedToFill.names @@ -5,14 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "Image Sequence Image Type_ Stretched To Fill", - "category": "Constants/UI" + "name": "Image Type: Stretched To Fill", + "category": "Constants/UI/Image Sequence" }, "methods": [ { "key": "GeteUiImageSequenceImageType_StretchedToFill", "details": { - "name": "Get Image Sequence Image Type_ Stretched To Fill" + "name": "Image Type: Stretched To Fill" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiImageSequenceImageType_StretchedToFit.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiImageSequenceImageType_StretchedToFit.names index fe98c38bed..b6964caf7a 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiImageSequenceImageType_StretchedToFit.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiImageSequenceImageType_StretchedToFit.names @@ -5,14 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "Image Sequence Image Type_ Stretched To Fit", - "category": "Constants/UI" + "name": "Image Type: Stretched To Fit", + "category": "Constants/UI/Image Sequence" }, "methods": [ { "key": "GeteUiImageSequenceImageType_StretchedToFit", "details": { - "name": "Get Image Sequence Image Type_ Stretched To Fit" + "name": "Image Type: Stretched To Fit" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiImageType_Fixed.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiImageType_Fixed.names index 11d42e165f..4679be61eb 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiImageType_Fixed.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiImageType_Fixed.names @@ -5,14 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "Image Type_ Fixed", - "category": "Constants/UI" + "name": "Fixed", + "category": "Constants/UI/Image Type" }, "methods": [ { "key": "GeteUiImageType_Fixed", "details": { - "name": "Get Image Type_ Fixed" + "name": "Fixed" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiImageType_Sliced.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiImageType_Sliced.names index 7c214242e9..b0cb0e83f2 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiImageType_Sliced.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiImageType_Sliced.names @@ -5,14 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "Image Type_ Sliced", - "category": "Constants/UI" + "name": "Sliced", + "category": "Constants/UI/Image Type" }, "methods": [ { "key": "GeteUiImageType_Sliced", "details": { - "name": "Get Image Type_ Sliced" + "name": "Sliced" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiImageType_Stretched.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiImageType_Stretched.names index 0c5e4e2483..3b2cc5cc71 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiImageType_Stretched.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiImageType_Stretched.names @@ -5,14 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "Image Type_ Stretched", - "category": "Constants/UI" + "name": "Stretched", + "category": "Constants/UI/Image Type" }, "methods": [ { "key": "GeteUiImageType_Stretched", "details": { - "name": "Get Image Type_ Stretched" + "name": "Stretched" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiImageType_StretchedToFill.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiImageType_StretchedToFill.names index d94fc392da..d3caf1df5f 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiImageType_StretchedToFill.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiImageType_StretchedToFill.names @@ -5,14 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "Image Type_ Stretched To Fill", - "category": "Constants/UI" + "name": "Stretched To Fill", + "category": "Constants/UI/Image Type" }, "methods": [ { "key": "GeteUiImageType_StretchedToFill", "details": { - "name": "Get Image Type_ Stretched To Fill" + "name": "Stretched To Fill" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiImageType_StretchedToFit.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiImageType_StretchedToFit.names index 3ac5edf2df..f0921a21f0 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiImageType_StretchedToFit.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiImageType_StretchedToFit.names @@ -5,14 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "Image Type_ Stretched To Fit", - "category": "Constants/UI" + "name": "Stretched To Fit", + "category": "Constants/UI/Image Type" }, "methods": [ { "key": "GeteUiImageType_StretchedToFit", "details": { - "name": "Get Image Type_ Stretched To Fit" + "name": "Stretched To Fit" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiImageType_Tiled.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiImageType_Tiled.names index 080fe2e050..0bb880e96c 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiImageType_Tiled.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiImageType_Tiled.names @@ -5,14 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "Image Type_ Tiled", - "category": "Constants/UI" + "name": "Tiled", + "category": "Constants/UI/Image Type" }, "methods": [ { "key": "GeteUiImageType_Tiled", "details": { - "name": "Get Image Type_ Tiled" + "name": "Tiled" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/g_ProfilerSystem.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/g_ProfilerSystem.names index b4af408222..6e1de3a3f9 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/g_ProfilerSystem.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/g_ProfilerSystem.names @@ -5,14 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "g_ Profiler System", + "name": "Profiler System", "category": "Constants/Profiler" }, "methods": [ { "key": "Getg_ProfilerSystem", "details": { - "name": "Getg_ Profiler System" + "name": "Profiler System" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/g_SettingsRegistry.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/g_SettingsRegistry.names index fe51c6ad00..79ebec28d0 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/g_SettingsRegistry.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/g_SettingsRegistry.names @@ -5,14 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "g_ Settings Registry", + "name": "Settings Registry", "category": "Constants/Settings" }, "methods": [ { "key": "Getg_SettingsRegistry", "details": { - "name": "Getg_ Settings Registry" + "name": "Settings Registry" }, "results": [ { From 42c939555446d40770103b14b4fef6cf18b2e3b1 Mon Sep 17 00:00:00 2001 From: lsemp3d <58790905+lsemp3d@users.noreply.github.com> Date: Mon, 22 Nov 2021 17:16:28 -0800 Subject: [PATCH 206/345] Updated more categories and names for constants Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com> --- .../Properties/eUiHorizontalOrder_RightToLeft.names | 2 +- .../Properties/eUiInteractableState_Disabled.names | 6 +++--- .../Properties/eUiInteractableState_Hover.names | 6 +++--- .../Properties/eUiInteractableState_Normal.names | 6 +++--- .../Properties/eUiInteractableState_Pressed.names | 6 +++--- .../eUiLayoutGridStartingDirection_HorizontalOrder.names | 6 +++--- .../eUiLayoutGridStartingDirection_VerticalOrder.names | 6 +++--- .../Properties/eUiNavigationMode_Automatic.names | 6 +++--- .../Properties/eUiNavigationMode_Custom.names | 6 +++--- .../Properties/eUiNavigationMode_None.names | 6 +++--- .../Properties/eUiParticleCoordinateType_Cartesian.names | 6 +++--- .../Properties/eUiParticleCoordinateType_Polar.names | 6 +++--- ...UiParticleInitialDirectionType_RelativeToEmitAngle.names | 6 +++--- ...rticleInitialDirectionType_RelativeToEmitterCenter.names | 6 +++--- .../Properties/eUiScaleToDeviceMode_NonUniformScale.names | 6 +++--- .../Properties/eUiScaleToDeviceMode_None.names | 6 +++--- .../Properties/eUiScaleToDeviceMode_ScaleXOnly.names | 6 +++--- .../Properties/eUiScaleToDeviceMode_ScaleYOnly.names | 6 +++--- .../eUiScaleToDeviceMode_UniformScaleToFill.names | 6 +++--- .../Properties/eUiScaleToDeviceMode_UniformScaleToFit.names | 6 +++--- .../eUiScaleToDeviceMode_UniformScaleToFitX.names | 6 +++--- .../eUiScaleToDeviceMode_UniformScaleToFitY.names | 6 +++--- .../eUiScrollBoxScrollBarVisibility_AlwaysShow.names | 6 +++--- .../eUiScrollBoxScrollBarVisibility_AutoHide.names | 6 +++--- ...llBoxScrollBarVisibility_AutoHideAndResizeViewport.names | 6 +++--- .../Properties/eUiScrollBoxSnapMode_Children.names | 6 +++--- .../Properties/eUiScrollBoxSnapMode_Grid.names | 6 +++--- .../Properties/eUiScrollBoxSnapMode_None.names | 6 +++--- .../Properties/eUiScrollerOrientation_Horizontal.names | 6 +++--- .../Properties/eUiScrollerOrientation_Vertical.names | 6 +++--- .../Properties/eUiSpriteType_RenderTarget.names | 6 +++--- .../Properties/eUiSpriteType_SpriteAsset.names | 6 +++--- .../Properties/eUiTextOverflowMode_ClipText.names | 6 +++--- .../Properties/eUiTextOverflowMode_Ellipsis.names | 6 +++--- .../Properties/eUiTextOverflowMode_OverflowText.names | 6 +++--- .../Properties/eUiTextShrinkToFit_None.names | 6 +++--- .../Properties/eUiTextShrinkToFit_Uniform.names | 6 +++--- .../Properties/eUiTextShrinkToFit_WidthOnly.names | 6 +++--- .../Properties/eUiTextWrapTextSetting_NoWrap.names | 4 ++-- .../Properties/eUiTextWrapTextSetting_Wrap.names | 6 +++--- ...UiTooltipDisplayAutoPositionMode_OffsetFromElement.names | 6 +++--- .../eUiTooltipDisplayAutoPositionMode_OffsetFromMouse.names | 6 +++--- .../Properties/eUiTooltipDisplayTriggerMode_OnClick.names | 6 +++--- .../Properties/eUiTooltipDisplayTriggerMode_OnHover.names | 6 +++--- .../Properties/eUiTooltipDisplayTriggerMode_OnPress.names | 6 +++--- 45 files changed, 132 insertions(+), 132 deletions(-) diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiHorizontalOrder_RightToLeft.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiHorizontalOrder_RightToLeft.names index f6993b4ba4..37e58d0133 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiHorizontalOrder_RightToLeft.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiHorizontalOrder_RightToLeft.names @@ -6,7 +6,7 @@ "variant": "", "details": { "name": "Right To Left", - "category": "Constants/UI/Order/Horizontal Order" + "category": "Constants/UI/Order/Horizontal" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiInteractableState_Disabled.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiInteractableState_Disabled.names index 3a30dac18d..e5c4b554d4 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiInteractableState_Disabled.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiInteractableState_Disabled.names @@ -5,14 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "Interactable State_ Disabled", - "category": "Constants/UI" + "name": "Disabled", + "category": "Constants/UI/Interactable State" }, "methods": [ { "key": "GeteUiInteractableState_Disabled", "details": { - "name": "Get Interactable State_ Disabled" + "name": "Disabled" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiInteractableState_Hover.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiInteractableState_Hover.names index 2f4a8de7d3..db241dba54 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiInteractableState_Hover.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiInteractableState_Hover.names @@ -5,14 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "Interactable State_ Hover", - "category": "Constants/UI" + "name": "Hover", + "category": "Constants/UI/Interactable State" }, "methods": [ { "key": "GeteUiInteractableState_Hover", "details": { - "name": "Get Interactable State_ Hover" + "name": "Hover" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiInteractableState_Normal.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiInteractableState_Normal.names index 49a857a81e..5e77a58173 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiInteractableState_Normal.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiInteractableState_Normal.names @@ -5,14 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "Interactable State_ Normal", - "category": "Constants/UI" + "name": "Normal", + "category": "Constants/UI/Interactable State" }, "methods": [ { "key": "GeteUiInteractableState_Normal", "details": { - "name": "Get Interactable State_ Normal" + "name": "Normal" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiInteractableState_Pressed.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiInteractableState_Pressed.names index 61492a7d87..075983878d 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiInteractableState_Pressed.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiInteractableState_Pressed.names @@ -5,14 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "Interactable State_ Pressed", - "category": "Constants/UI" + "name": "Pressed", + "category": "Constants/UI/Interactable State" }, "methods": [ { "key": "GeteUiInteractableState_Pressed", "details": { - "name": "Get Interactable State_ Pressed" + "name": "Pressed" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiLayoutGridStartingDirection_HorizontalOrder.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiLayoutGridStartingDirection_HorizontalOrder.names index 7dc93920d5..d90f8355f9 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiLayoutGridStartingDirection_HorizontalOrder.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiLayoutGridStartingDirection_HorizontalOrder.names @@ -5,14 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "Layout Grid Starting Direction_ Horizontal Order", - "category": "Constants/UI" + "name": "Horizontal Order", + "category": "Constants/UI/Layout Grid Starting Direction" }, "methods": [ { "key": "GeteUiLayoutGridStartingDirection_HorizontalOrder", "details": { - "name": "Get Layout Grid Starting Direction_ Horizontal Order" + "name": "Horizontal Order" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiLayoutGridStartingDirection_VerticalOrder.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiLayoutGridStartingDirection_VerticalOrder.names index 05b0632d2e..5146e150ad 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiLayoutGridStartingDirection_VerticalOrder.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiLayoutGridStartingDirection_VerticalOrder.names @@ -5,14 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "Layout Grid Starting Direction_ Vertical Order", - "category": "Constants/UI" + "name": "Vertical Order", + "category": "Constants/UI/Layout Grid Starting Direction" }, "methods": [ { "key": "GeteUiLayoutGridStartingDirection_VerticalOrder", "details": { - "name": "Get Layout Grid Starting Direction_ Vertical Order" + "name": "Vertical Order" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiNavigationMode_Automatic.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiNavigationMode_Automatic.names index 45af6e0414..8b5ee13097 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiNavigationMode_Automatic.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiNavigationMode_Automatic.names @@ -5,14 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "Navigation Mode_ Automatic", - "category": "Constants/UI" + "name": "Automatic", + "category": "Constants/UI/Navigation Mode" }, "methods": [ { "key": "GeteUiNavigationMode_Automatic", "details": { - "name": "Get Navigation Mode_ Automatic" + "name": "Automatic" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiNavigationMode_Custom.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiNavigationMode_Custom.names index f743182797..3fa1e4ae0d 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiNavigationMode_Custom.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiNavigationMode_Custom.names @@ -5,14 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "Navigation Mode_ Custom", - "category": "Constants/UI" + "name": "Custom", + "category": "Constants/UI/Navigation Mode" }, "methods": [ { "key": "GeteUiNavigationMode_Custom", "details": { - "name": "Get Navigation Mode_ Custom" + "name": "Custom" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiNavigationMode_None.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiNavigationMode_None.names index e3222f1899..a8486f60c4 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiNavigationMode_None.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiNavigationMode_None.names @@ -5,14 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "Navigation Mode_ None", - "category": "Constants/UI" + "name": "None", + "category": "Constants/UI/Navigation Mode" }, "methods": [ { "key": "GeteUiNavigationMode_None", "details": { - "name": "Get Navigation Mode_ None" + "name": "None" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiParticleCoordinateType_Cartesian.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiParticleCoordinateType_Cartesian.names index 02de5092e2..de73959a50 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiParticleCoordinateType_Cartesian.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiParticleCoordinateType_Cartesian.names @@ -5,14 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "Particle Coordinate Type_ Cartesian", - "category": "Constants/UI" + "name": "Cartesian", + "category": "Constants/UI/Particle Coordinate Type" }, "methods": [ { "key": "GeteUiParticleCoordinateType_Cartesian", "details": { - "name": "Get Particle Coordinate Type_ Cartesian" + "name": "Cartesian" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiParticleCoordinateType_Polar.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiParticleCoordinateType_Polar.names index 7f1226b83d..e7cbd628b4 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiParticleCoordinateType_Polar.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiParticleCoordinateType_Polar.names @@ -5,14 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "Particle Coordinate Type_ Polar", - "category": "Constants/UI" + "name": "Polar", + "category": "Constants/UI/Particle Coordinate Type" }, "methods": [ { "key": "GeteUiParticleCoordinateType_Polar", "details": { - "name": "Get Particle Coordinate Type_ Polar" + "name": "Polar" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiParticleInitialDirectionType_RelativeToEmitAngle.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiParticleInitialDirectionType_RelativeToEmitAngle.names index 1f488f6ad6..c285810dab 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiParticleInitialDirectionType_RelativeToEmitAngle.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiParticleInitialDirectionType_RelativeToEmitAngle.names @@ -5,14 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "Particle Initial Direction Type_ Relative To Emit Angle", - "category": "Constants/UI" + "name": "Relative To Emit Angle", + "category": "Constants/UI/Particle Initial Direction Type" }, "methods": [ { "key": "GeteUiParticleInitialDirectionType_RelativeToEmitAngle", "details": { - "name": "Get Particle Initial Direction Type_ Relative To Emit Angle" + "name": "Relative To Emit Angle" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiParticleInitialDirectionType_RelativeToEmitterCenter.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiParticleInitialDirectionType_RelativeToEmitterCenter.names index 598328bcfd..c63cd92dc1 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiParticleInitialDirectionType_RelativeToEmitterCenter.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiParticleInitialDirectionType_RelativeToEmitterCenter.names @@ -5,14 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "Particle Initial Direction Type_ Relative To Emitter Center", - "category": "Constants/UI" + "name": "Relative To Emitter Center", + "category": "Constants/UI/Particle Initial Direction Type" }, "methods": [ { "key": "GeteUiParticleInitialDirectionType_RelativeToEmitterCenter", "details": { - "name": "Get Particle Initial Direction Type_ Relative To Emitter Center" + "name": "Relative To Emitter Center" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScaleToDeviceMode_NonUniformScale.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScaleToDeviceMode_NonUniformScale.names index 1870b958c4..321d718ef9 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScaleToDeviceMode_NonUniformScale.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScaleToDeviceMode_NonUniformScale.names @@ -5,14 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "Scale To Device Mode_ Non Uniform Scale", - "category": "Constants/UI" + "name": "Non Uniform Scale", + "category": "Constants/UI/Scale To Device Mode" }, "methods": [ { "key": "GeteUiScaleToDeviceMode_NonUniformScale", "details": { - "name": "Get Scale To Device Mode_ Non Uniform Scale" + "name": "Non Uniform Scale" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScaleToDeviceMode_None.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScaleToDeviceMode_None.names index 32dec98d22..e682613ba4 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScaleToDeviceMode_None.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScaleToDeviceMode_None.names @@ -5,14 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "Scale To Device Mode_ None", - "category": "Constants/UI" + "name": "None", + "category": "Constants/UI/Scale To Device Mode" }, "methods": [ { "key": "GeteUiScaleToDeviceMode_None", "details": { - "name": "Get Scale To Device Mode_ None" + "name": "None" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScaleToDeviceMode_ScaleXOnly.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScaleToDeviceMode_ScaleXOnly.names index b98aaf0d81..452396fec6 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScaleToDeviceMode_ScaleXOnly.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScaleToDeviceMode_ScaleXOnly.names @@ -5,14 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "Scale To Device Mode_ ScaleX Only", - "category": "Constants/UI" + "name": "Scale X Only", + "category": "Constants/UI/Scale To Device Mode" }, "methods": [ { "key": "GeteUiScaleToDeviceMode_ScaleXOnly", "details": { - "name": "Get Scale To Device Mode_ ScaleX Only" + "name": "Scale X Only" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScaleToDeviceMode_ScaleYOnly.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScaleToDeviceMode_ScaleYOnly.names index e40a06a234..258af26dab 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScaleToDeviceMode_ScaleYOnly.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScaleToDeviceMode_ScaleYOnly.names @@ -5,14 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "Scale To Device Mode_ ScaleY Only", - "category": "Constants/UI" + "name": "Scale Y Only", + "category": "Constants/UI/Scale To Device Mode" }, "methods": [ { "key": "GeteUiScaleToDeviceMode_ScaleYOnly", "details": { - "name": "Get Scale To Device Mode_ ScaleY Only" + "name": "Scale Y Only" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScaleToDeviceMode_UniformScaleToFill.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScaleToDeviceMode_UniformScaleToFill.names index 2372c16959..d72089664d 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScaleToDeviceMode_UniformScaleToFill.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScaleToDeviceMode_UniformScaleToFill.names @@ -5,14 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "Scale To Device Mode_ Uniform Scale To Fill", - "category": "Constants/UI" + "name": "Uniform Scale To Fill", + "category": "Constants/UI/Scale To Device Mode" }, "methods": [ { "key": "GeteUiScaleToDeviceMode_UniformScaleToFill", "details": { - "name": "Get Scale To Device Mode_ Uniform Scale To Fill" + "name": "Uniform Scale To Fill" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScaleToDeviceMode_UniformScaleToFit.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScaleToDeviceMode_UniformScaleToFit.names index 78e6bb3984..2428ebb6c3 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScaleToDeviceMode_UniformScaleToFit.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScaleToDeviceMode_UniformScaleToFit.names @@ -5,14 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "Scale To Device Mode_ Uniform Scale To Fit", - "category": "Constants/UI" + "name": "Uniform Scale To Fit", + "category": "Constants/UI/Scale To Device Mode" }, "methods": [ { "key": "GeteUiScaleToDeviceMode_UniformScaleToFit", "details": { - "name": "Get Scale To Device Mode_ Uniform Scale To Fit" + "name": "Uniform Scale To Fit" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScaleToDeviceMode_UniformScaleToFitX.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScaleToDeviceMode_UniformScaleToFitX.names index 2776f51857..ea892546f4 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScaleToDeviceMode_UniformScaleToFitX.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScaleToDeviceMode_UniformScaleToFitX.names @@ -5,14 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "Scale To Device Mode_ Uniform Scale To FitX", - "category": "Constants/UI" + "name": "Uniform Scale To Fit X", + "category": "Constants/UI/Scale To Device Mode" }, "methods": [ { "key": "GeteUiScaleToDeviceMode_UniformScaleToFitX", "details": { - "name": "Get Scale To Device Mode_ Uniform Scale To FitX" + "name": "Uniform Scale To Fit X" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScaleToDeviceMode_UniformScaleToFitY.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScaleToDeviceMode_UniformScaleToFitY.names index 458287576d..69a7da174f 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScaleToDeviceMode_UniformScaleToFitY.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScaleToDeviceMode_UniformScaleToFitY.names @@ -5,14 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "Scale To Device Mode_ Uniform Scale To FitY", - "category": "Constants/UI" + "name": "Uniform Scale To Fit Y", + "category": "Constants/UI/Scale To Device Mode" }, "methods": [ { "key": "GeteUiScaleToDeviceMode_UniformScaleToFitY", "details": { - "name": "Get Scale To Device Mode_ Uniform Scale To FitY" + "name": "Uniform Scale To Fit Y" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScrollBoxScrollBarVisibility_AlwaysShow.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScrollBoxScrollBarVisibility_AlwaysShow.names index 98ec53c042..fcbfa1ac3b 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScrollBoxScrollBarVisibility_AlwaysShow.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScrollBoxScrollBarVisibility_AlwaysShow.names @@ -5,14 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "Scroll Box Scroll Bar Visibility_ Always Show", - "category": "Constants/UI" + "name": "Always Show", + "category": "Constants/UI/Scroll Box Scroll Bar Visibility" }, "methods": [ { "key": "GeteUiScrollBoxScrollBarVisibility_AlwaysShow", "details": { - "name": "Get Scroll Box Scroll Bar Visibility_ Always Show" + "name": "Always Show" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScrollBoxScrollBarVisibility_AutoHide.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScrollBoxScrollBarVisibility_AutoHide.names index 924af3e349..14cc2bc099 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScrollBoxScrollBarVisibility_AutoHide.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScrollBoxScrollBarVisibility_AutoHide.names @@ -5,14 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "Scroll Box Scroll Bar Visibility_ Auto Hide", - "category": "Constants/UI" + "name": "Auto Hide", + "category": "Constants/UI/Scroll Box Scroll Bar Visibility" }, "methods": [ { "key": "GeteUiScrollBoxScrollBarVisibility_AutoHide", "details": { - "name": "Get Scroll Box Scroll Bar Visibility_ Auto Hide" + "name": "Auto Hide" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScrollBoxScrollBarVisibility_AutoHideAndResizeViewport.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScrollBoxScrollBarVisibility_AutoHideAndResizeViewport.names index ab524c1ccb..e8d4412664 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScrollBoxScrollBarVisibility_AutoHideAndResizeViewport.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScrollBoxScrollBarVisibility_AutoHideAndResizeViewport.names @@ -5,14 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "Scroll Box Scroll Bar Visibility_ Auto Hide And Resize Viewport", - "category": "Constants/UI" + "name": "Auto Hide And Resize Viewport", + "category": "Constants/UI/Scroll Box Scroll Bar Visibility" }, "methods": [ { "key": "GeteUiScrollBoxScrollBarVisibility_AutoHideAndResizeViewport", "details": { - "name": "Get Scroll Box Scroll Bar Visibility_ Auto Hide And Resize Viewport" + "name": "Auto Hide And Resize Viewport" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScrollBoxSnapMode_Children.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScrollBoxSnapMode_Children.names index 4c4b353073..4015cd6d34 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScrollBoxSnapMode_Children.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScrollBoxSnapMode_Children.names @@ -5,14 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "Scroll Box Snap Mode_ Children", - "category": "Constants/UI" + "name": "Children", + "category": "Constants/UI/Scroll Box Snap Mode" }, "methods": [ { "key": "GeteUiScrollBoxSnapMode_Children", "details": { - "name": "Get Scroll Box Snap Mode_ Children" + "name": "Children" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScrollBoxSnapMode_Grid.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScrollBoxSnapMode_Grid.names index 91485a265d..ff071ef16b 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScrollBoxSnapMode_Grid.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScrollBoxSnapMode_Grid.names @@ -5,14 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "Scroll Box Snap Mode_ Grid", - "category": "Constants/UI" + "name": "Grid", + "category": "Constants/UI/Scroll Box Snap Mode" }, "methods": [ { "key": "GeteUiScrollBoxSnapMode_Grid", "details": { - "name": "Get Scroll Box Snap Mode_ Grid" + "name": "Grid" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScrollBoxSnapMode_None.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScrollBoxSnapMode_None.names index cd99b454b6..0057833d49 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScrollBoxSnapMode_None.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScrollBoxSnapMode_None.names @@ -5,14 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "Scroll Box Snap Mode_ None", - "category": "Constants/UI" + "name": "None", + "category": "Constants/UI/Scroll Box Snap Mode" }, "methods": [ { "key": "GeteUiScrollBoxSnapMode_None", "details": { - "name": "Get Scroll Box Snap Mode_ None" + "name": "None" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScrollerOrientation_Horizontal.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScrollerOrientation_Horizontal.names index a2d70fb3c1..7f50d532ad 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScrollerOrientation_Horizontal.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScrollerOrientation_Horizontal.names @@ -5,14 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "Scroller Orientation_ Horizontal", - "category": "Constants/UI" + "name": "Horizontal", + "category": "Constants/UI/Scroller Orientation" }, "methods": [ { "key": "GeteUiScrollerOrientation_Horizontal", "details": { - "name": "Get Scroller Orientation_ Horizontal" + "name": "Horizontal" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScrollerOrientation_Vertical.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScrollerOrientation_Vertical.names index 9ba58b8b5f..f781abf3ae 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScrollerOrientation_Vertical.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScrollerOrientation_Vertical.names @@ -5,14 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "Scroller Orientation_ Vertical", - "category": "Constants/UI" + "name": "Vertical", + "category": "Constants/UI/Scroller Orientation" }, "methods": [ { "key": "GeteUiScrollerOrientation_Vertical", "details": { - "name": "Get Scroller Orientation_ Vertical" + "name": "Vertical" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiSpriteType_RenderTarget.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiSpriteType_RenderTarget.names index 1a78044b7d..fcde09686e 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiSpriteType_RenderTarget.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiSpriteType_RenderTarget.names @@ -5,14 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "Sprite Type_ Render Target", - "category": "Constants/UI" + "name": "Render Target", + "category": "Constants/UI/Sprite Type" }, "methods": [ { "key": "GeteUiSpriteType_RenderTarget", "details": { - "name": "Get Sprite Type_ Render Target" + "name": "Render Target" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiSpriteType_SpriteAsset.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiSpriteType_SpriteAsset.names index 2d3b3abf39..90e11c7daf 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiSpriteType_SpriteAsset.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiSpriteType_SpriteAsset.names @@ -5,14 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "Sprite Type_ Sprite Asset", - "category": "Constants/UI" + "name": "Sprite Asset", + "category": "Constants/UI/Sprite Type" }, "methods": [ { "key": "GeteUiSpriteType_SpriteAsset", "details": { - "name": "Get Sprite Type_ Sprite Asset" + "name": "Sprite Asset" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTextOverflowMode_ClipText.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTextOverflowMode_ClipText.names index d824a3ad54..972ae6cfc2 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTextOverflowMode_ClipText.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTextOverflowMode_ClipText.names @@ -5,14 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "Text Overflow Mode_ Clip Text", - "category": "Constants/UI" + "name": "Clip Text", + "category": "Constants/UI/Text Overflow Mode" }, "methods": [ { "key": "GeteUiTextOverflowMode_ClipText", "details": { - "name": "Get Text Overflow Mode_ Clip Text" + "name": "Clip Text" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTextOverflowMode_Ellipsis.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTextOverflowMode_Ellipsis.names index 732f646b76..ab13c84f66 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTextOverflowMode_Ellipsis.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTextOverflowMode_Ellipsis.names @@ -5,14 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "Text Overflow Mode_ Ellipsis", - "category": "Constants/UI" + "name": "Ellipsis", + "category": "Constants/UI/Text Overflow Mode" }, "methods": [ { "key": "GeteUiTextOverflowMode_Ellipsis", "details": { - "name": "Get Text Overflow Mode_ Ellipsis" + "name": "Ellipsis" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTextOverflowMode_OverflowText.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTextOverflowMode_OverflowText.names index 230d49a728..e291cf2f0e 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTextOverflowMode_OverflowText.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTextOverflowMode_OverflowText.names @@ -5,14 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "Text Overflow Mode_ Overflow Text", - "category": "Constants/UI" + "name": "Overflow Text", + "category": "Constants/UI/Text Overflow Mode" }, "methods": [ { "key": "GeteUiTextOverflowMode_OverflowText", "details": { - "name": "Get Text Overflow Mode_ Overflow Text" + "name": "Overflow Text" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTextShrinkToFit_None.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTextShrinkToFit_None.names index 619fe0d94f..e82d2af4eb 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTextShrinkToFit_None.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTextShrinkToFit_None.names @@ -5,14 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "Text Shrink To Fit_ None", - "category": "Constants/UI" + "name": "None", + "category": "Constants/UI/Text Shrink To Fit" }, "methods": [ { "key": "GeteUiTextShrinkToFit_None", "details": { - "name": "Get Text Shrink To Fit_ None" + "name": "None" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTextShrinkToFit_Uniform.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTextShrinkToFit_Uniform.names index 8a781a85eb..d499a68e0d 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTextShrinkToFit_Uniform.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTextShrinkToFit_Uniform.names @@ -5,14 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "Text Shrink To Fit Uniform", - "category": "Constants/UI" + "name": "Uniform", + "category": "Constants/UI/Text Shrink To Fit" }, "methods": [ { "key": "GeteUiTextShrinkToFit_Uniform", "details": { - "name": "Get Text Shrink To Fit Uniform" + "name": "Uniform" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTextShrinkToFit_WidthOnly.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTextShrinkToFit_WidthOnly.names index 75012522d2..739888fd70 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTextShrinkToFit_WidthOnly.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTextShrinkToFit_WidthOnly.names @@ -5,14 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "Text Shrink To Fit_ Width Only", - "category": "Constants/UI" + "name": "Width Only", + "category": "Constants/UI/Text Shrink To Fit" }, "methods": [ { "key": "GeteUiTextShrinkToFit_WidthOnly", "details": { - "name": "Get Text Shrink To Fit_ Width Only" + "name": "Width Only" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTextWrapTextSetting_NoWrap.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTextWrapTextSetting_NoWrap.names index 8aaf6bfb90..b71d8cbb8b 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTextWrapTextSetting_NoWrap.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTextWrapTextSetting_NoWrap.names @@ -5,14 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "Text Setting No Wrap", + "name": "No Wrap", "category": "Constants/UI/Text Wrap" }, "methods": [ { "key": "GeteUiTextWrapTextSetting_NoWrap", "details": { - "name": "Get Text Setting No Wrap" + "name": "No Wrap" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTextWrapTextSetting_Wrap.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTextWrapTextSetting_Wrap.names index bb8f5794e8..39c2250114 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTextWrapTextSetting_Wrap.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTextWrapTextSetting_Wrap.names @@ -5,14 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "Text Wrap Text Setting_ Wrap", - "category": "Constants/UI" + "name": "Wrap", + "category": "Constants/UI/Text Wrap" }, "methods": [ { "key": "GeteUiTextWrapTextSetting_Wrap", "details": { - "name": "Get Text Wrap Text Setting Wrap" + "name": "Wrap" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTooltipDisplayAutoPositionMode_OffsetFromElement.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTooltipDisplayAutoPositionMode_OffsetFromElement.names index 912e075028..88c75ee730 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTooltipDisplayAutoPositionMode_OffsetFromElement.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTooltipDisplayAutoPositionMode_OffsetFromElement.names @@ -5,14 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "Tooltip Display Auto Position Mode_ Offset From Element", - "category": "Constants/UI" + "name": "Offset From Element", + "category": "Constants/UI/Tooltip Display Auto Position Mode" }, "methods": [ { "key": "GeteUiTooltipDisplayAutoPositionMode_OffsetFromElement", "details": { - "name": "GetTooltip Display Auto Position Mode_ Offset From Element" + "name": "Offset From Element" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTooltipDisplayAutoPositionMode_OffsetFromMouse.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTooltipDisplayAutoPositionMode_OffsetFromMouse.names index fd294801e2..c22716abbb 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTooltipDisplayAutoPositionMode_OffsetFromMouse.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTooltipDisplayAutoPositionMode_OffsetFromMouse.names @@ -5,14 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "Tooltip Display Auto Position Mode_ Offset From Mouse", - "category": "Constants/UI" + "name": "Offset From Mouse", + "category": "Constants/UI/Tooltip Display Auto Position Mode" }, "methods": [ { "key": "GeteUiTooltipDisplayAutoPositionMode_OffsetFromMouse", "details": { - "name": "GetTooltip Display Auto Position Mode_ Offset From Mouse" + "name": "Offset From Mouse" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTooltipDisplayTriggerMode_OnClick.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTooltipDisplayTriggerMode_OnClick.names index 003c81db6b..af10e96af1 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTooltipDisplayTriggerMode_OnClick.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTooltipDisplayTriggerMode_OnClick.names @@ -5,14 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "Tooltip Display Trigger Mode On Click", - "category": "Constants/UI" + "name": "On Click", + "category": "Constants/UI/Tooltip Display Trigger Mode" }, "methods": [ { "key": "GeteUiTooltipDisplayTriggerMode_OnClick", "details": { - "name": "Get Tooltip Display Trigger Mode On Click" + "name": "On Click" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTooltipDisplayTriggerMode_OnHover.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTooltipDisplayTriggerMode_OnHover.names index b8e100e5dc..3cd2343053 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTooltipDisplayTriggerMode_OnHover.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTooltipDisplayTriggerMode_OnHover.names @@ -5,14 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "Tooltip Display Trigger Mode_ On Hover", - "category": "Constants/UI" + "name": "On Hover", + "category": "Constants/UI/Tooltip Display Trigger Mode" }, "methods": [ { "key": "GeteUiTooltipDisplayTriggerMode_OnHover", "details": { - "name": "Get Tooltip Display Trigger Mode_ On Hover" + "name": "On Hover" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTooltipDisplayTriggerMode_OnPress.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTooltipDisplayTriggerMode_OnPress.names index c0774be947..6fcfc3d88d 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTooltipDisplayTriggerMode_OnPress.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTooltipDisplayTriggerMode_OnPress.names @@ -5,14 +5,14 @@ "context": "Constant", "variant": "", "details": { - "name": "Tooltip Display Trigger Mode_ On Press", - "category": "Constants/UI" + "name": "On Press", + "category": "Constants/UI/Tooltip Display Trigger Mode" }, "methods": [ { "key": "GeteUiTooltipDisplayTriggerMode_OnPress", "details": { - "name": "Get Tooltip Display Trigger Mode_ On Press" + "name": "On Press" }, "results": [ { From 9e6e83ff7f93839e5dbe352d7bdf23a6a3381a01 Mon Sep 17 00:00:00 2001 From: lsemp3d <58790905+lsemp3d@users.noreply.github.com> Date: Mon, 22 Nov 2021 17:21:19 -0800 Subject: [PATCH 207/345] First pass at rendering node name generation Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com> --- .../Classes/AcesParameterOverrides.names | 292 +++++++- .../Classes/MaterialAssignment.names | 92 ++- .../Classes/MaterialAssignmentId.names | 179 +++-- .../Classes/MaterialComponentConfig.names | 51 +- .../Classes/ShaderSemantic.names | 92 ++- .../MeshComponentNotificationBus.names | 5 +- .../Senders/MaterialComponentRequestBus.names | 699 +++++++++--------- .../EBus/Senders/PhysicalSkyRequestBus.names | 51 +- .../EBus/Senders/SkyBoxFogRequestBus.names | 51 +- .../EBus/Senders/ViewportRequestBus.names | 47 +- 10 files changed, 1048 insertions(+), 511 deletions(-) diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AcesParameterOverrides.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AcesParameterOverrides.names index 50a563d9c4..d3a32c2709 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AcesParameterOverrides.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AcesParameterOverrides.names @@ -5,7 +5,8 @@ "context": "BehaviorClass", "variant": "", "details": { - "name": "AcesParameterOverrides" + "name": "Aces Parameter Overrides", + "category": "Rendering" }, "methods": [ { @@ -13,21 +14,300 @@ "context": "AcesParameterOverrides", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke LoadPreset" + "tooltip": "When signaled, this will invoke Load Preset" }, "exit": { "name": "Out", - "tooltip": "Signaled after LoadPreset is invoked" + "tooltip": "Signaled after Load Preset is invoked" }, "details": { - "name": "AcesParameterOverrides::LoadPreset", - "category": "Other" + "name": "Load Preset" }, "params": [ { "typeid": "{3EE8C0D4-3792-46C0-B91C-B89A81C36B91}", "details": { - "name": "AcesParameterOverrides*" + "name": "Aces Parameter Overrides" + } + } + ] + }, + { + "key": "GetOutputDeviceTransformType_4000Nits", + "details": { + "name": "Get Output Device Transform Type_ 4000 Nits" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + }, + { + "key": "GetOutputDeviceTransformType_2000Nits", + "details": { + "name": "Get Output Device Transform Type_ 2000 Nits" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + }, + { + "key": "GetapplyCATD60toD65", + "details": { + "name": "GetapplyCATD 60toD 65" + }, + "params": [ + { + "typeid": "{3EE8C0D4-3792-46C0-B91C-B89A81C36B91}", + "details": { + "name": "" + } + } + ], + "results": [ + { + "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", + "details": { + "name": "" + } + } + ] + }, + { + "key": "SetapplyCATD60toD65", + "details": { + "name": "SetapplyCATD 60toD 65" + }, + "params": [ + { + "typeid": "{3EE8C0D4-3792-46C0-B91C-B89A81C36B91}", + "details": { + "name": "" + } + }, + { + "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", + "details": { + "name": "" + } + } + ] + }, + { + "key": "GetOutputDeviceTransformType_48Nits", + "details": { + "name": "Get Output Device Transform Type_ 48 Nits" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + }, + { + "key": "GetOutputDeviceTransformType_NumOutputDeviceTransformTypes", + "details": { + "name": "Get Output Device Transform Type_ Num Output Device Transform Types" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + }, + { + "key": "GetOutputDeviceTransformType_1000Nits", + "details": { + "name": "Get Output Device Transform Type_ 1000 Nits" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + }, + { + "key": "GetapplyDesaturation", + "details": { + "name": "Getapply Desaturation" + }, + "params": [ + { + "typeid": "{3EE8C0D4-3792-46C0-B91C-B89A81C36B91}", + "details": { + "name": "" + } + } + ], + "results": [ + { + "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", + "details": { + "name": "" + } + } + ] + }, + { + "key": "SetapplyDesaturation", + "details": { + "name": "Setapply Desaturation" + }, + "params": [ + { + "typeid": "{3EE8C0D4-3792-46C0-B91C-B89A81C36B91}", + "details": { + "name": "" + } + }, + { + "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", + "details": { + "name": "" + } + } + ] + }, + { + "key": "Getpreset", + "details": { + "name": "Getpreset" + }, + "params": [ + { + "typeid": "{3EE8C0D4-3792-46C0-B91C-B89A81C36B91}", + "details": { + "name": "" + } + } + ], + "results": [ + { + "typeid": "{B94085B7-C0D4-466A-A791-188A4559EC8D}", + "details": { + "name": "" + } + } + ] + }, + { + "key": "Setpreset", + "details": { + "name": "Setpreset" + }, + "params": [ + { + "typeid": "{3EE8C0D4-3792-46C0-B91C-B89A81C36B91}", + "details": { + "name": "" + } + }, + { + "typeid": "{B94085B7-C0D4-466A-A791-188A4559EC8D}", + "details": { + "name": "" + } + } + ] + }, + { + "key": "GetalterSurround", + "details": { + "name": "Getalter Surround" + }, + "params": [ + { + "typeid": "{3EE8C0D4-3792-46C0-B91C-B89A81C36B91}", + "details": { + "name": "" + } + } + ], + "results": [ + { + "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", + "details": { + "name": "" + } + } + ] + }, + { + "key": "SetalterSurround", + "details": { + "name": "Setalter Surround" + }, + "params": [ + { + "typeid": "{3EE8C0D4-3792-46C0-B91C-B89A81C36B91}", + "details": { + "name": "" + } + }, + { + "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", + "details": { + "name": "" + } + } + ] + }, + { + "key": "GetoverrideDefaults", + "details": { + "name": "Getoverride Defaults" + }, + "params": [ + { + "typeid": "{3EE8C0D4-3792-46C0-B91C-B89A81C36B91}", + "details": { + "name": "" + } + } + ], + "results": [ + { + "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", + "details": { + "name": "" + } + } + ] + }, + { + "key": "SetoverrideDefaults", + "details": { + "name": "Setoverride Defaults" + }, + "params": [ + { + "typeid": "{3EE8C0D4-3792-46C0-B91C-B89A81C36B91}", + "details": { + "name": "" + } + }, + { + "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", + "details": { + "name": "" } } ] diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MaterialAssignment.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MaterialAssignment.names index a77e2615b8..529159f6e5 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MaterialAssignment.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MaterialAssignment.names @@ -5,7 +5,8 @@ "context": "BehaviorClass", "variant": "", "details": { - "name": "MaterialAssignment" + "name": "Material Assignment", + "category": "Rendering" }, "methods": [ { @@ -13,29 +14,104 @@ "context": "MaterialAssignment", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke ToString" + "tooltip": "When signaled, this will invoke To String" }, "exit": { "name": "Out", - "tooltip": "Signaled after ToString is invoked" + "tooltip": "Signaled after To String is invoked" }, "details": { - "name": "MaterialAssignment::ToString", - "category": "Other" + "name": "To String" + }, + "results": [ + { + "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", + "details": { + "name": "AZ Std::basic_string, allocator>" + } + } + ] + }, + { + "key": "GetmaterialAsset", + "details": { + "name": "Getmaterial Asset" }, "params": [ { "typeid": "{C66E5214-A24B-4722-B7F0-5991E6F8F163}", "details": { - "name": "AZ::Render::MaterialAssignment*" + "name": "" } } ], "results": [ { - "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", + "typeid": "{834DC049-5EC3-5C29-B621-5F0046864DC4}", "details": { - "name": "AZStd::basic_string, allocator>" + "name": "" + } + } + ] + }, + { + "key": "SetmaterialAsset", + "details": { + "name": "Setmaterial Asset" + }, + "params": [ + { + "typeid": "{C66E5214-A24B-4722-B7F0-5991E6F8F163}", + "details": { + "name": "" + } + }, + { + "typeid": "{834DC049-5EC3-5C29-B621-5F0046864DC4}", + "details": { + "name": "" + } + } + ] + }, + { + "key": "GetpropertyOverrides", + "details": { + "name": "Getproperty Overrides" + }, + "params": [ + { + "typeid": "{C66E5214-A24B-4722-B7F0-5991E6F8F163}", + "details": { + "name": "" + } + } + ], + "results": [ + { + "typeid": "{6E6962E1-04C9-56F9-89C4-361031CC1384}", + "details": { + "name": "" + } + } + ] + }, + { + "key": "SetpropertyOverrides", + "details": { + "name": "Setproperty Overrides" + }, + "params": [ + { + "typeid": "{C66E5214-A24B-4722-B7F0-5991E6F8F163}", + "details": { + "name": "" + } + }, + { + "typeid": "{6E6962E1-04C9-56F9-89C4-361031CC1384}", + "details": { + "name": "" } } ] diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MaterialAssignmentId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MaterialAssignmentId.names index 6a5c0d5b60..cf708d0d9b 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MaterialAssignmentId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MaterialAssignmentId.names @@ -5,7 +5,8 @@ "context": "BehaviorClass", "variant": "", "details": { - "name": "MaterialAssignmentId" + "name": "Material Assignment Id", + "category": "Rendering" }, "methods": [ { @@ -13,29 +14,20 @@ "context": "MaterialAssignmentId", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke ToString" + "tooltip": "When signaled, this will invoke To String" }, "exit": { "name": "Out", - "tooltip": "Signaled after ToString is invoked" + "tooltip": "Signaled after To String is invoked" }, "details": { - "name": "MaterialAssignmentId::ToString", - "category": "Other" + "name": "To String" }, - "params": [ - { - "typeid": "{EB603581-4654-4C17-B6DE-AE61E79EDA97}", - "details": { - "name": "AZ::Render::MaterialAssignmentId*" - } - } - ], "results": [ { "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", "details": { - "name": "AZStd::basic_string, allocator>" + "name": "AZ Std::basic_string, allocator>" } } ] @@ -45,24 +37,15 @@ "context": "MaterialAssignmentId", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke IsAssetOnly" + "tooltip": "When signaled, this will invoke Is Asset Only" }, "exit": { "name": "Out", - "tooltip": "Signaled after IsAssetOnly is invoked" + "tooltip": "Signaled after Is Asset Only is invoked" }, "details": { - "name": "MaterialAssignmentId::IsAssetOnly", - "category": "Other" + "name": "Is Asset Only" }, - "params": [ - { - "typeid": "{EB603581-4654-4C17-B6DE-AE61E79EDA97}", - "details": { - "name": "AZ::Render::MaterialAssignmentId*" - } - } - ], "results": [ { "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", @@ -77,24 +60,15 @@ "context": "MaterialAssignmentId", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke IsSlotIdOnly" + "tooltip": "When signaled, this will invoke Is Slot Id Only" }, "exit": { "name": "Out", - "tooltip": "Signaled after IsSlotIdOnly is invoked" + "tooltip": "Signaled after Is Slot Id Only is invoked" }, "details": { - "name": "MaterialAssignmentId::IsSlotIdOnly", - "category": "Other" + "name": "Is Slot Id Only" }, - "params": [ - { - "typeid": "{EB603581-4654-4C17-B6DE-AE61E79EDA97}", - "details": { - "name": "AZ::Render::MaterialAssignmentId*" - } - } - ], "results": [ { "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", @@ -109,24 +83,15 @@ "context": "MaterialAssignmentId", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke IsLodAndSlotId" + "tooltip": "When signaled, this will invoke Is Lod And Slot Id" }, "exit": { "name": "Out", - "tooltip": "Signaled after IsLodAndSlotId is invoked" + "tooltip": "Signaled after Is Lod And Slot Id is invoked" }, "details": { - "name": "MaterialAssignmentId::IsLodAndSlotId", - "category": "Other" + "name": "Is Lod And Slot Id" }, - "params": [ - { - "typeid": "{EB603581-4654-4C17-B6DE-AE61E79EDA97}", - "details": { - "name": "AZ::Render::MaterialAssignmentId*" - } - } - ], "results": [ { "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", @@ -141,24 +106,15 @@ "context": "MaterialAssignmentId", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke IsDefault" + "tooltip": "When signaled, this will invoke Is Default" }, "exit": { "name": "Out", - "tooltip": "Signaled after IsDefault is invoked" + "tooltip": "Signaled after Is Default is invoked" }, "details": { - "name": "MaterialAssignmentId::IsDefault", - "category": "Other" + "name": "Is Default" }, - "params": [ - { - "typeid": "{EB603581-4654-4C17-B6DE-AE61E79EDA97}", - "details": { - "name": "AZ::Render::MaterialAssignmentId*" - } - } - ], "results": [ { "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", @@ -173,24 +129,15 @@ "context": "MaterialAssignmentId", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke IsLodAndAsset" + "tooltip": "When signaled, this will invoke Is Lod And Asset" }, "exit": { "name": "Out", - "tooltip": "Signaled after IsLodAndAsset is invoked" + "tooltip": "Signaled after Is Lod And Asset is invoked" }, "details": { - "name": "MaterialAssignmentId::IsLodAndAsset", - "category": "Other" + "name": "Is Lod And Asset" }, - "params": [ - { - "typeid": "{EB603581-4654-4C17-B6DE-AE61E79EDA97}", - "details": { - "name": "AZ::Render::MaterialAssignmentId*" - } - } - ], "results": [ { "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", @@ -199,6 +146,90 @@ } } ] + }, + { + "key": "GetlodIndex", + "details": { + "name": "Getlod Index" + }, + "params": [ + { + "typeid": "{EB603581-4654-4C17-B6DE-AE61E79EDA97}", + "details": { + "name": "" + } + } + ], + "results": [ + { + "typeid": "{D6597933-47CD-4FC8-B911-63F3E2B0993A}", + "details": { + "name": "" + } + } + ] + }, + { + "key": "SetlodIndex", + "details": { + "name": "Setlod Index" + }, + "params": [ + { + "typeid": "{EB603581-4654-4C17-B6DE-AE61E79EDA97}", + "details": { + "name": "" + } + }, + { + "typeid": "{D6597933-47CD-4FC8-B911-63F3E2B0993A}", + "details": { + "name": "" + } + } + ] + }, + { + "key": "GetmaterialSlotStableId", + "details": { + "name": "Getmaterial Slot Stable Id" + }, + "params": [ + { + "typeid": "{EB603581-4654-4C17-B6DE-AE61E79EDA97}", + "details": { + "name": "" + } + } + ], + "results": [ + { + "typeid": "{43DA906B-7DEF-4CA8-9790-854106D3F983}", + "details": { + "name": "" + } + } + ] + }, + { + "key": "SetmaterialSlotStableId", + "details": { + "name": "Setmaterial Slot Stable Id" + }, + "params": [ + { + "typeid": "{EB603581-4654-4C17-B6DE-AE61E79EDA97}", + "details": { + "name": "" + } + }, + { + "typeid": "{43DA906B-7DEF-4CA8-9790-854106D3F983}", + "details": { + "name": "" + } + } + ] } ] } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MaterialComponentConfig.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MaterialComponentConfig.names index 66798ef901..c5b1138e12 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MaterialComponentConfig.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MaterialComponentConfig.names @@ -5,8 +5,55 @@ "context": "BehaviorClass", "variant": "", "details": { - "name": "MaterialComponentConfig" - } + "name": "Material Component Config", + "category": "Rendering" + }, + "methods": [ + { + "key": "Getmaterials", + "details": { + "name": "Getmaterials" + }, + "params": [ + { + "typeid": "{3366C279-32AE-48F6-839B-7700AE117A54}", + "details": { + "name": "", + "tooltip": "Material Component Config" + } + } + ], + "results": [ + { + "typeid": "{50F6716F-698B-5A6C-AACD-940597FDEC24}", + "details": { + "name": "" + } + } + ] + }, + { + "key": "Setmaterials", + "details": { + "name": "Setmaterials" + }, + "params": [ + { + "typeid": "{3366C279-32AE-48F6-839B-7700AE117A54}", + "details": { + "name": "", + "tooltip": "Material Component Config" + } + }, + { + "typeid": "{50F6716F-698B-5A6C-AACD-940597FDEC24}", + "details": { + "name": "" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ShaderSemantic.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ShaderSemantic.names index 011619c1e3..f6f6d153c4 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ShaderSemantic.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ShaderSemantic.names @@ -5,7 +5,8 @@ "context": "BehaviorClass", "variant": "", "details": { - "name": "ShaderSemantic" + "name": "Shader Semantic", + "category": "Rendering" }, "methods": [ { @@ -13,29 +14,104 @@ "context": "ShaderSemantic", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke ToString" + "tooltip": "When signaled, this will invoke To String" }, "exit": { "name": "Out", - "tooltip": "Signaled after ToString is invoked" + "tooltip": "Signaled after To String is invoked" }, "details": { - "name": "ShaderSemantic::ToString", - "category": "Other" + "name": "To String" + }, + "results": [ + { + "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", + "details": { + "name": "AZ Std::basic_string, allocator>" + } + } + ] + }, + { + "key": "Getname", + "details": { + "name": "Getname" }, "params": [ { "typeid": "{C6FFF25F-FE52-4D08-8D96-D04C14048816}", "details": { - "name": "ShaderSemantic*" + "name": "" } } ], "results": [ { - "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", + "typeid": "{3D2B920C-9EFD-40D5-AAE0-DF131C3D4931}", "details": { - "name": "AZStd::basic_string, allocator>" + "name": "" + } + } + ] + }, + { + "key": "Setname", + "details": { + "name": "Setname" + }, + "params": [ + { + "typeid": "{C6FFF25F-FE52-4D08-8D96-D04C14048816}", + "details": { + "name": "" + } + }, + { + "typeid": "{3D2B920C-9EFD-40D5-AAE0-DF131C3D4931}", + "details": { + "name": "" + } + } + ] + }, + { + "key": "Getindex", + "details": { + "name": "Getindex" + }, + "params": [ + { + "typeid": "{C6FFF25F-FE52-4D08-8D96-D04C14048816}", + "details": { + "name": "" + } + } + ], + "results": [ + { + "typeid": "{43DA906B-7DEF-4CA8-9790-854106D3F983}", + "details": { + "name": "" + } + } + ] + }, + { + "key": "Setindex", + "details": { + "name": "Setindex" + }, + "params": [ + { + "typeid": "{C6FFF25F-FE52-4D08-8D96-D04C14048816}", + "details": { + "name": "" + } + }, + { + "typeid": "{43DA906B-7DEF-4CA8-9790-854106D3F983}", + "details": { + "name": "" } } ] diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/MeshComponentNotificationBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/MeshComponentNotificationBus.names index a62652ba47..66175bd1bf 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/MeshComponentNotificationBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/MeshComponentNotificationBus.names @@ -5,13 +5,14 @@ "context": "EBusHandler", "variant": "", "details": { - "name": "MeshComponentNotificationBus" + "name": "Mesh", + "category": "Rendering" }, "methods": [ { "key": "OnModelReady", "details": { - "name": "OnModelReady" + "name": "On Model Ready" }, "params": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/MaterialComponentRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/MaterialComponentRequestBus.names index d5a66328b5..a7e2f67610 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/MaterialComponentRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/MaterialComponentRequestBus.names @@ -5,27 +5,28 @@ "context": "EBusSender", "variant": "", "details": { - "name": "MaterialComponentRequestBus" + "name": "Material", + "category": "Rendering" }, "methods": [ { "key": "GetPropertyOverrides", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetPropertyOverrides" + "tooltip": "When signaled, this will invoke Get Property Overrides" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetPropertyOverrides is invoked" + "tooltip": "Signaled after Get Property Overrides is invoked" }, "details": { - "name": "GetPropertyOverrides" + "name": "Get Property Overrides" }, "params": [ { "typeid": "{EB603581-4654-4C17-B6DE-AE61E79EDA97}", "details": { - "name": "AZ::Render::MaterialAssignmentId" + "name": "AZ:: Render:: Material Assignment Id" } } ], @@ -33,7 +34,7 @@ { "typeid": "{6E6962E1-04C9-56F9-89C4-361031CC1384}", "details": { - "name": "AZStd::unordered_map" + "name": "AZ Std::unordered_map" } } ] @@ -42,26 +43,26 @@ "key": "SetPropertyOverrides", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetPropertyOverrides" + "tooltip": "When signaled, this will invoke Set Property Overrides" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetPropertyOverrides is invoked" + "tooltip": "Signaled after Set Property Overrides is invoked" }, "details": { - "name": "SetPropertyOverrides" + "name": "Set Property Overrides" }, "params": [ { "typeid": "{EB603581-4654-4C17-B6DE-AE61E79EDA97}", "details": { - "name": "AZ::Render::MaterialAssignmentId" + "name": "AZ:: Render:: Material Assignment Id" } }, { "typeid": "{6E6962E1-04C9-56F9-89C4-361031CC1384}", "details": { - "name": "AZStd::unordered_map" + "name": "AZ Std::unordered_map" } } ] @@ -70,26 +71,26 @@ "key": "ClearPropertyOverride", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke ClearPropertyOverride" + "tooltip": "When signaled, this will invoke Clear Property Override" }, "exit": { "name": "Out", - "tooltip": "Signaled after ClearPropertyOverride is invoked" + "tooltip": "Signaled after Clear Property Override is invoked" }, "details": { - "name": "ClearPropertyOverride" + "name": "Clear Property Override" }, "params": [ { "typeid": "{EB603581-4654-4C17-B6DE-AE61E79EDA97}", "details": { - "name": "AZ::Render::MaterialAssignmentId" + "name": "AZ:: Render:: Material Assignment Id" } }, { "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", "details": { - "name": "AZStd::string" + "name": "AZ Std::string" } } ] @@ -98,20 +99,20 @@ "key": "ClearPropertyOverrides", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke ClearPropertyOverrides" + "tooltip": "When signaled, this will invoke Clear Property Overrides" }, "exit": { "name": "Out", - "tooltip": "Signaled after ClearPropertyOverrides is invoked" + "tooltip": "Signaled after Clear Property Overrides is invoked" }, "details": { - "name": "ClearPropertyOverrides" + "name": "Clear Property Overrides" }, "params": [ { "typeid": "{EB603581-4654-4C17-B6DE-AE61E79EDA97}", "details": { - "name": "AZ::Render::MaterialAssignmentId" + "name": "AZ:: Render:: Material Assignment Id" } } ] @@ -120,26 +121,26 @@ "key": "GetPropertyOverrideVector4", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetPropertyOverrideVector4" + "tooltip": "When signaled, this will invoke Get Property Override Vector 4" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetPropertyOverrideVector4 is invoked" + "tooltip": "Signaled after Get Property Override Vector 4 is invoked" }, "details": { - "name": "GetPropertyOverrideVector4" + "name": "Get Property Override Vector 4" }, "params": [ { "typeid": "{EB603581-4654-4C17-B6DE-AE61E79EDA97}", "details": { - "name": "AZ::Render::MaterialAssignmentId" + "name": "AZ:: Render:: Material Assignment Id" } }, { "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", "details": { - "name": "AZStd::string" + "name": "AZ Std::string" } } ], @@ -147,43 +148,7 @@ { "typeid": "{0CE9FA36-1E3A-4C06-9254-B7C73A732053}", "details": { - "name": "Vector4" - } - } - ] - }, - { - "key": "GetPropertyOverrideImageInstance", - "entry": { - "name": "In", - "tooltip": "When signaled, this will invoke GetPropertyOverrideImageInstance" - }, - "exit": { - "name": "Out", - "tooltip": "Signaled after GetPropertyOverrideImageInstance is invoked" - }, - "details": { - "name": "GetPropertyOverrideImageInstance" - }, - "params": [ - { - "typeid": "{EB603581-4654-4C17-B6DE-AE61E79EDA97}", - "details": { - "name": "AZ::Render::MaterialAssignmentId" - } - }, - { - "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", - "details": { - "name": "AZStd::string" - } - } - ], - "results": [ - { - "typeid": "{C0311D23-97F1-556C-B6A4-ECD726543686}", - "details": { - "name": "AZStd::intrusive_ptr" + "name": "Vector 4" } } ] @@ -192,26 +157,26 @@ "key": "GetPropertyOverrideUInt32", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetPropertyOverrideUInt32" + "tooltip": "When signaled, this will invoke Get Property OverrideU Int 32" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetPropertyOverrideUInt32 is invoked" + "tooltip": "Signaled after Get Property OverrideU Int 32 is invoked" }, "details": { - "name": "GetPropertyOverrideUInt32" + "name": "Get Property OverrideU Int 32" }, "params": [ { "typeid": "{EB603581-4654-4C17-B6DE-AE61E79EDA97}", "details": { - "name": "AZ::Render::MaterialAssignmentId" + "name": "AZ:: Render:: Material Assignment Id" } }, { "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", "details": { - "name": "AZStd::string" + "name": "AZ Std::string" } } ], @@ -228,26 +193,26 @@ "key": "GetPropertyOverrideBool", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetPropertyOverrideBool" + "tooltip": "When signaled, this will invoke Get Property Override Bool" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetPropertyOverrideBool is invoked" + "tooltip": "Signaled after Get Property Override Bool is invoked" }, "details": { - "name": "GetPropertyOverrideBool" + "name": "Get Property Override Bool" }, "params": [ { "typeid": "{EB603581-4654-4C17-B6DE-AE61E79EDA97}", "details": { - "name": "AZ::Render::MaterialAssignmentId" + "name": "AZ:: Render:: Material Assignment Id" } }, { "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", "details": { - "name": "AZStd::string" + "name": "AZ Std::string" } } ], @@ -261,37 +226,35 @@ ] }, { - "key": "GetPropertyOverrideImageAsset", + "key": "SetPropertyOverrideEnum", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetPropertyOverrideImageAsset" + "tooltip": "When signaled, this will invoke Set Property Override Enum" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetPropertyOverrideImageAsset is invoked" + "tooltip": "Signaled after Set Property Override Enum is invoked" }, "details": { - "name": "GetPropertyOverrideImageAsset" + "name": "Set Property Override Enum" }, "params": [ { "typeid": "{EB603581-4654-4C17-B6DE-AE61E79EDA97}", "details": { - "name": "AZ::Render::MaterialAssignmentId" + "name": "AZ:: Render:: Material Assignment Id" } }, { "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", "details": { - "name": "AZStd::string" + "name": "AZ Std::string" } - } - ], - "results": [ + }, { - "typeid": "{4BA06517-EDEC-59DC-B5FE-2FDE64BBEF6E}", + "typeid": "{43DA906B-7DEF-4CA8-9790-854106D3F983}", "details": { - "name": "Asset" + "name": "unsigned int" } } ] @@ -300,32 +263,68 @@ "key": "SetPropertyOverrideVector2", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetPropertyOverrideVector2" + "tooltip": "When signaled, this will invoke Set Property Override Vector 2" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetPropertyOverrideVector2 is invoked" + "tooltip": "Signaled after Set Property Override Vector 2 is invoked" }, "details": { - "name": "SetPropertyOverrideVector2" + "name": "Set Property Override Vector 2" }, "params": [ { "typeid": "{EB603581-4654-4C17-B6DE-AE61E79EDA97}", "details": { - "name": "AZ::Render::MaterialAssignmentId" + "name": "AZ:: Render:: Material Assignment Id" } }, { "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", "details": { - "name": "AZStd::string" + "name": "AZ Std::string" } }, { "typeid": "{3D80F623-C85C-4741-90D0-E4E66164E6BF}", "details": { - "name": "Vector2" + "name": "Vector 2" + } + } + ] + }, + { + "key": "GetPropertyOverrideImage", + "entry": { + "name": "In", + "tooltip": "When signaled, this will invoke Get Property Override Image" + }, + "exit": { + "name": "Out", + "tooltip": "Signaled after Get Property Override Image is invoked" + }, + "details": { + "name": "Get Property Override Image" + }, + "params": [ + { + "typeid": "{EB603581-4654-4C17-B6DE-AE61E79EDA97}", + "details": { + "name": "AZ:: Render:: Material Assignment Id" + } + }, + { + "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", + "details": { + "name": "AZ Std::string" + } + } + ], + "results": [ + { + "typeid": "{652ED536-3402-439B-AEBE-4A5DBC554085}", + "details": { + "name": "Asset Id" } } ] @@ -334,90 +333,34 @@ "key": "ClearAllPropertyOverrides", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke ClearAllPropertyOverrides" + "tooltip": "When signaled, this will invoke Clear All Property Overrides" }, "exit": { "name": "Out", - "tooltip": "Signaled after ClearAllPropertyOverrides is invoked" + "tooltip": "Signaled after Clear All Property Overrides is invoked" }, "details": { - "name": "ClearAllPropertyOverrides" + "name": "Clear All Property Overrides" } }, - { - "key": "ClearMaterialOverride", - "entry": { - "name": "In", - "tooltip": "When signaled, this will invoke ClearMaterialOverride" - }, - "exit": { - "name": "Out", - "tooltip": "Signaled after ClearMaterialOverride is invoked" - }, - "details": { - "name": "ClearMaterialOverride" - }, - "params": [ - { - "typeid": "{EB603581-4654-4C17-B6DE-AE61E79EDA97}", - "details": { - "name": "AZ::Render::MaterialAssignmentId" - } - } - ] - }, - { - "key": "SetPropertyOverrideImageInstance", - "entry": { - "name": "In", - "tooltip": "When signaled, this will invoke SetPropertyOverrideImageInstance" - }, - "exit": { - "name": "Out", - "tooltip": "Signaled after SetPropertyOverrideImageInstance is invoked" - }, - "details": { - "name": "SetPropertyOverrideImageInstance" - }, - "params": [ - { - "typeid": "{EB603581-4654-4C17-B6DE-AE61E79EDA97}", - "details": { - "name": "AZ::Render::MaterialAssignmentId" - } - }, - { - "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", - "details": { - "name": "AZStd::string" - } - }, - { - "typeid": "{C0311D23-97F1-556C-B6A4-ECD726543686}", - "details": { - "name": "AZStd::intrusive_ptr" - } - } - ] - }, { "key": "GetMaterialSlotLabel", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetMaterialSlotLabel" + "tooltip": "When signaled, this will invoke Get Material Slot Label" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetMaterialSlotLabel is invoked" + "tooltip": "Signaled after Get Material Slot Label is invoked" }, "details": { - "name": "GetMaterialSlotLabel" + "name": "Get Material Slot Label" }, "params": [ { "typeid": "{EB603581-4654-4C17-B6DE-AE61E79EDA97}", "details": { - "name": "AZ::Render::MaterialAssignmentId" + "name": "AZ:: Render:: Material Assignment Id" } } ], @@ -425,7 +368,7 @@ { "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", "details": { - "name": "AZStd::string" + "name": "AZ Std::string" } } ] @@ -434,32 +377,32 @@ "key": "SetPropertyOverrideVector3", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetPropertyOverrideVector3" + "tooltip": "When signaled, this will invoke Set Property Override Vector 3" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetPropertyOverrideVector3 is invoked" + "tooltip": "Signaled after Set Property Override Vector 3 is invoked" }, "details": { - "name": "SetPropertyOverrideVector3" + "name": "Set Property Override Vector 3" }, "params": [ { "typeid": "{EB603581-4654-4C17-B6DE-AE61E79EDA97}", "details": { - "name": "AZ::Render::MaterialAssignmentId" + "name": "AZ:: Render:: Material Assignment Id" } }, { "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", "details": { - "name": "AZStd::string" + "name": "AZ Std::string" } }, { "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}", "details": { - "name": "Vector3" + "name": "Vector 3" } } ] @@ -468,40 +411,40 @@ "key": "ClearInvalidMaterialOverrides", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke ClearInvalidMaterialOverrides" + "tooltip": "When signaled, this will invoke Clear Invalid Material Overrides" }, "exit": { "name": "Out", - "tooltip": "Signaled after ClearInvalidMaterialOverrides is invoked" + "tooltip": "Signaled after Clear Invalid Material Overrides is invoked" }, "details": { - "name": "ClearInvalidMaterialOverrides" + "name": "Clear Invalid Material Overrides" } }, { "key": "SetPropertyOverrideBool", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetPropertyOverrideBool" + "tooltip": "When signaled, this will invoke Set Property Override Bool" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetPropertyOverrideBool is invoked" + "tooltip": "Signaled after Set Property Override Bool is invoked" }, "details": { - "name": "SetPropertyOverrideBool" + "name": "Set Property Override Bool" }, "params": [ { "typeid": "{EB603581-4654-4C17-B6DE-AE61E79EDA97}", "details": { - "name": "AZ::Render::MaterialAssignmentId" + "name": "AZ:: Render:: Material Assignment Id" } }, { "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", "details": { - "name": "AZStd::string" + "name": "AZ Std::string" } }, { @@ -516,46 +459,46 @@ "key": "RepairInvalidMaterialOverrides", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke RepairInvalidMaterialOverrides" + "tooltip": "When signaled, this will invoke Repair Invalid Material Overrides" }, "exit": { "name": "Out", - "tooltip": "Signaled after RepairInvalidMaterialOverrides is invoked" + "tooltip": "Signaled after Repair Invalid Material Overrides is invoked" }, "details": { - "name": "RepairInvalidMaterialOverrides" + "name": "Repair Invalid Material Overrides" } }, { "key": "SetPropertyOverrideString", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetPropertyOverrideString" + "tooltip": "When signaled, this will invoke Set Property Override String" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetPropertyOverrideString is invoked" + "tooltip": "Signaled after Set Property Override String is invoked" }, "details": { - "name": "SetPropertyOverrideString" + "name": "Set Property Override String" }, "params": [ { "typeid": "{EB603581-4654-4C17-B6DE-AE61E79EDA97}", "details": { - "name": "AZ::Render::MaterialAssignmentId" + "name": "AZ:: Render:: Material Assignment Id" } }, { "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", "details": { - "name": "AZStd::string" + "name": "AZ Std::string" } }, { "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", "details": { - "name": "AZStd::string" + "name": "AZ Std::string" } } ] @@ -564,20 +507,20 @@ "key": "SetDefaultMaterialOverride", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetDefaultMaterialOverride" + "tooltip": "When signaled, this will invoke Set Default Material Override" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetDefaultMaterialOverride is invoked" + "tooltip": "Signaled after Set Default Material Override is invoked" }, "details": { - "name": "SetDefaultMaterialOverride" + "name": "Set Default Material Override" }, "params": [ { "typeid": "{652ED536-3402-439B-AEBE-4A5DBC554085}", "details": { - "name": "AssetId" + "name": "Asset Id" } } ] @@ -586,20 +529,20 @@ "key": "GetDefaultMaterialOverride", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetDefaultMaterialOverride" + "tooltip": "When signaled, this will invoke Get Default Material Override" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetDefaultMaterialOverride is invoked" + "tooltip": "Signaled after Get Default Material Override is invoked" }, "details": { - "name": "GetDefaultMaterialOverride" + "name": "Get Default Material Override" }, "results": [ { "typeid": "{652ED536-3402-439B-AEBE-4A5DBC554085}", "details": { - "name": "AssetId" + "name": "Asset Id" } } ] @@ -608,20 +551,20 @@ "key": "SetMaterialOverrides", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetMaterialOverrides" + "tooltip": "When signaled, this will invoke Set Material Overrides" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetMaterialOverrides is invoked" + "tooltip": "Signaled after Set Material Overrides is invoked" }, "details": { - "name": "SetMaterialOverrides" + "name": "Set Material Overrides" }, "params": [ { "typeid": "{50F6716F-698B-5A6C-AACD-940597FDEC24}", "details": { - "name": "AZStd::unordered_map" + "name": "AZ Std::unordered_map" } } ] @@ -630,26 +573,26 @@ "key": "GetPropertyOverrideString", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetPropertyOverrideString" + "tooltip": "When signaled, this will invoke Get Property Override String" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetPropertyOverrideString is invoked" + "tooltip": "Signaled after Get Property Override String is invoked" }, "details": { - "name": "GetPropertyOverrideString" + "name": "Get Property Override String" }, "params": [ { "typeid": "{EB603581-4654-4C17-B6DE-AE61E79EDA97}", "details": { - "name": "AZ::Render::MaterialAssignmentId" + "name": "AZ:: Render:: Material Assignment Id" } }, { "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", "details": { - "name": "AZStd::string" + "name": "AZ Std::string" } } ], @@ -657,7 +600,7 @@ { "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", "details": { - "name": "AZStd::string" + "name": "AZ Std::string" } } ] @@ -666,20 +609,20 @@ "key": "GetMaterialOverrides", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetMaterialOverrides" + "tooltip": "When signaled, this will invoke Get Material Overrides" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetMaterialOverrides is invoked" + "tooltip": "Signaled after Get Material Overrides is invoked" }, "details": { - "name": "GetMaterialOverrides" + "name": "Get Material Overrides" }, "results": [ { "typeid": "{50F6716F-698B-5A6C-AACD-940597FDEC24}", "details": { - "name": "AZStd::unordered_map" + "name": "AZ Std::unordered_map" } } ] @@ -688,20 +631,20 @@ "key": "GetMaterialOverride", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetMaterialOverride" + "tooltip": "When signaled, this will invoke Get Material Override" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetMaterialOverride is invoked" + "tooltip": "Signaled after Get Material Override is invoked" }, "details": { - "name": "GetMaterialOverride" + "name": "Get Material Override" }, "params": [ { "typeid": "{EB603581-4654-4C17-B6DE-AE61E79EDA97}", "details": { - "name": "AZ::Render::MaterialAssignmentId" + "name": "AZ:: Render:: Material Assignment Id" } } ], @@ -709,7 +652,7 @@ { "typeid": "{652ED536-3402-439B-AEBE-4A5DBC554085}", "details": { - "name": "AssetId" + "name": "Asset Id" } } ] @@ -718,32 +661,32 @@ "key": "SetPropertyOverrideVector4", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetPropertyOverrideVector4" + "tooltip": "When signaled, this will invoke Set Property Override Vector 4" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetPropertyOverrideVector4 is invoked" + "tooltip": "Signaled after Set Property Override Vector 4 is invoked" }, "details": { - "name": "SetPropertyOverrideVector4" + "name": "Set Property Override Vector 4" }, "params": [ { "typeid": "{EB603581-4654-4C17-B6DE-AE61E79EDA97}", "details": { - "name": "AZ::Render::MaterialAssignmentId" + "name": "AZ:: Render:: Material Assignment Id" } }, { "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", "details": { - "name": "AZStd::string" + "name": "AZ Std::string" } }, { "typeid": "{0CE9FA36-1E3A-4C06-9254-B7C73A732053}", "details": { - "name": "Vector4" + "name": "Vector 4" } } ] @@ -752,26 +695,26 @@ "key": "SetPropertyOverrideUInt32", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetPropertyOverrideUInt32" + "tooltip": "When signaled, this will invoke Set Property OverrideU Int 32" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetPropertyOverrideUInt32 is invoked" + "tooltip": "Signaled after Set Property OverrideU Int 32 is invoked" }, "details": { - "name": "SetPropertyOverrideUInt32" + "name": "Set Property OverrideU Int 32" }, "params": [ { "typeid": "{EB603581-4654-4C17-B6DE-AE61E79EDA97}", "details": { - "name": "AZ::Render::MaterialAssignmentId" + "name": "AZ:: Render:: Material Assignment Id" } }, { "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", "details": { - "name": "AZStd::string" + "name": "AZ Std::string" } }, { @@ -786,26 +729,26 @@ "key": "FindMaterialAssignmentId", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke FindMaterialAssignmentId" + "tooltip": "When signaled, this will invoke Find Material Assignment Id" }, "exit": { "name": "Out", - "tooltip": "Signaled after FindMaterialAssignmentId is invoked" + "tooltip": "Signaled after Find Material Assignment Id is invoked" }, "details": { - "name": "FindMaterialAssignmentId" + "name": "Find Material Assignment Id" }, "params": [ { "typeid": "{D6597933-47CD-4FC8-B911-63F3E2B0993A}", "details": { - "name": "AZ::u64" + "name": "AZ::u 64" } }, { "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", "details": { - "name": "AZStd::string" + "name": "AZ Std::string" } } ], @@ -813,41 +756,7 @@ { "typeid": "{EB603581-4654-4C17-B6DE-AE61E79EDA97}", "details": { - "name": "AZ::Render::MaterialAssignmentId" - } - } - ] - }, - { - "key": "SetPropertyOverrideImageAsset", - "entry": { - "name": "In", - "tooltip": "When signaled, this will invoke SetPropertyOverrideImageAsset" - }, - "exit": { - "name": "Out", - "tooltip": "Signaled after SetPropertyOverrideImageAsset is invoked" - }, - "details": { - "name": "SetPropertyOverrideImageAsset" - }, - "params": [ - { - "typeid": "{EB603581-4654-4C17-B6DE-AE61E79EDA97}", - "details": { - "name": "AZ::Render::MaterialAssignmentId" - } - }, - { - "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", - "details": { - "name": "AZStd::string" - } - }, - { - "typeid": "{4BA06517-EDEC-59DC-B5FE-2FDE64BBEF6E}", - "details": { - "name": "Asset" + "name": "AZ:: Render:: Material Assignment Id" } } ] @@ -856,26 +765,26 @@ "key": "GetPropertyOverrideInt32", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetPropertyOverrideInt32" + "tooltip": "When signaled, this will invoke Get Property Override Int 32" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetPropertyOverrideInt32 is invoked" + "tooltip": "Signaled after Get Property Override Int 32 is invoked" }, "details": { - "name": "GetPropertyOverrideInt32" + "name": "Get Property Override Int 32" }, "params": [ { "typeid": "{EB603581-4654-4C17-B6DE-AE61E79EDA97}", "details": { - "name": "AZ::Render::MaterialAssignmentId" + "name": "AZ:: Render:: Material Assignment Id" } }, { "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", "details": { - "name": "AZStd::string" + "name": "AZ Std::string" } } ], @@ -889,29 +798,65 @@ ] }, { - "key": "SetPropertyOverride", + "key": "GetPropertyOverrideEnum", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetPropertyOverride" + "tooltip": "When signaled, this will invoke Get Property Override Enum" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetPropertyOverride is invoked" + "tooltip": "Signaled after Get Property Override Enum is invoked" }, "details": { - "name": "SetPropertyOverride" + "name": "Get Property Override Enum" }, "params": [ { "typeid": "{EB603581-4654-4C17-B6DE-AE61E79EDA97}", "details": { - "name": "AZ::Render::MaterialAssignmentId" + "name": "AZ:: Render:: Material Assignment Id" } }, { "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", "details": { - "name": "AZStd::string" + "name": "AZ Std::string" + } + } + ], + "results": [ + { + "typeid": "{43DA906B-7DEF-4CA8-9790-854106D3F983}", + "details": { + "name": "unsigned int" + } + } + ] + }, + { + "key": "SetPropertyOverride", + "entry": { + "name": "In", + "tooltip": "When signaled, this will invoke Set Property Override" + }, + "exit": { + "name": "Out", + "tooltip": "Signaled after Set Property Override is invoked" + }, + "details": { + "name": "Set Property Override" + }, + "params": [ + { + "typeid": "{EB603581-4654-4C17-B6DE-AE61E79EDA97}", + "details": { + "name": "AZ:: Render:: Material Assignment Id" + } + }, + { + "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", + "details": { + "name": "AZ Std::string" } }, { @@ -926,20 +871,20 @@ "key": "GetOriginalMaterialAssignments", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetOriginalMaterialAssignments" + "tooltip": "When signaled, this will invoke Get Original Material Assignments" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetOriginalMaterialAssignments is invoked" + "tooltip": "Signaled after Get Original Material Assignments is invoked" }, "details": { - "name": "GetOriginalMaterialAssignments" + "name": "Get Original Material Assignments" }, "results": [ { "typeid": "{50F6716F-698B-5A6C-AACD-940597FDEC24}", "details": { - "name": "AZStd::unordered_map" + "name": "AZ Std::unordered_map" } } ] @@ -948,26 +893,26 @@ "key": "GetPropertyOverride", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetPropertyOverride" + "tooltip": "When signaled, this will invoke Get Property Override" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetPropertyOverride is invoked" + "tooltip": "Signaled after Get Property Override is invoked" }, "details": { - "name": "GetPropertyOverride" + "name": "Get Property Override" }, "params": [ { "typeid": "{EB603581-4654-4C17-B6DE-AE61E79EDA97}", "details": { - "name": "AZ::Render::MaterialAssignmentId" + "name": "AZ:: Render:: Material Assignment Id" } }, { "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", "details": { - "name": "AZStd::string" + "name": "AZ Std::string" } } ], @@ -984,34 +929,34 @@ "key": "ClearModelMaterialOverrides", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke ClearModelMaterialOverrides" + "tooltip": "When signaled, this will invoke Clear Model Material Overrides" }, "exit": { "name": "Out", - "tooltip": "Signaled after ClearModelMaterialOverrides is invoked" + "tooltip": "Signaled after Clear Model Material Overrides is invoked" }, "details": { - "name": "ClearModelMaterialOverrides" + "name": "Clear Model Material Overrides" } }, { "key": "GetDefaultMaterialAssetId", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetDefaultMaterialAssetId" + "tooltip": "When signaled, this will invoke Get Default Material Asset Id" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetDefaultMaterialAssetId is invoked" + "tooltip": "Signaled after Get Default Material Asset Id is invoked" }, "details": { - "name": "GetDefaultMaterialAssetId" + "name": "Get Default Material Asset Id" }, "params": [ { "typeid": "{EB603581-4654-4C17-B6DE-AE61E79EDA97}", "details": { - "name": "AZ::Render::MaterialAssignmentId" + "name": "AZ:: Render:: Material Assignment Id" } } ], @@ -1019,7 +964,7 @@ { "typeid": "{652ED536-3402-439B-AEBE-4A5DBC554085}", "details": { - "name": "AssetId" + "name": "Asset Id" } } ] @@ -1028,26 +973,26 @@ "key": "SetPropertyOverrideInt32", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetPropertyOverrideInt32" + "tooltip": "When signaled, this will invoke Set Property Override Int 32" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetPropertyOverrideInt32 is invoked" + "tooltip": "Signaled after Set Property Override Int 32 is invoked" }, "details": { - "name": "SetPropertyOverrideInt32" + "name": "Set Property Override Int 32" }, "params": [ { "typeid": "{EB603581-4654-4C17-B6DE-AE61E79EDA97}", "details": { - "name": "AZ::Render::MaterialAssignmentId" + "name": "AZ:: Render:: Material Assignment Id" } }, { "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", "details": { - "name": "AZStd::string" + "name": "AZ Std::string" } }, { @@ -1059,29 +1004,63 @@ ] }, { - "key": "GetPropertyOverrideVector2", + "key": "SetPropertyOverrideImage", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetPropertyOverrideVector2" + "tooltip": "When signaled, this will invoke Set Property Override Image" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetPropertyOverrideVector2 is invoked" + "tooltip": "Signaled after Set Property Override Image is invoked" }, "details": { - "name": "GetPropertyOverrideVector2" + "name": "Set Property Override Image" }, "params": [ { "typeid": "{EB603581-4654-4C17-B6DE-AE61E79EDA97}", "details": { - "name": "AZ::Render::MaterialAssignmentId" + "name": "AZ:: Render:: Material Assignment Id" } }, { "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", "details": { - "name": "AZStd::string" + "name": "AZ Std::string" + } + }, + { + "typeid": "{652ED536-3402-439B-AEBE-4A5DBC554085}", + "details": { + "name": "Asset Id" + } + } + ] + }, + { + "key": "GetPropertyOverrideVector2", + "entry": { + "name": "In", + "tooltip": "When signaled, this will invoke Get Property Override Vector 2" + }, + "exit": { + "name": "Out", + "tooltip": "Signaled after Get Property Override Vector 2 is invoked" + }, + "details": { + "name": "Get Property Override Vector 2" + }, + "params": [ + { + "typeid": "{EB603581-4654-4C17-B6DE-AE61E79EDA97}", + "details": { + "name": "AZ:: Render:: Material Assignment Id" + } + }, + { + "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", + "details": { + "name": "AZ Std::string" } } ], @@ -1089,7 +1068,7 @@ { "typeid": "{3D80F623-C85C-4741-90D0-E4E66164E6BF}", "details": { - "name": "Vector2" + "name": "Vector 2" } } ] @@ -1098,40 +1077,40 @@ "key": "ClearAllMaterialOverrides", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke ClearAllMaterialOverrides" + "tooltip": "When signaled, this will invoke Clear All Material Overrides" }, "exit": { "name": "Out", - "tooltip": "Signaled after ClearAllMaterialOverrides is invoked" + "tooltip": "Signaled after Clear All Material Overrides is invoked" }, "details": { - "name": "ClearAllMaterialOverrides" + "name": "Clear All Material Overrides" } }, { "key": "GetPropertyOverrideColor", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetPropertyOverrideColor" + "tooltip": "When signaled, this will invoke Get Property Override Color" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetPropertyOverrideColor is invoked" + "tooltip": "Signaled after Get Property Override Color is invoked" }, "details": { - "name": "GetPropertyOverrideColor" + "name": "Get Property Override Color" }, "params": [ { "typeid": "{EB603581-4654-4C17-B6DE-AE61E79EDA97}", "details": { - "name": "AZ::Render::MaterialAssignmentId" + "name": "AZ:: Render:: Material Assignment Id" } }, { "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", "details": { - "name": "AZStd::string" + "name": "AZ Std::string" } } ], @@ -1148,26 +1127,26 @@ "key": "SetPropertyOverrideFloat", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetPropertyOverrideFloat" + "tooltip": "When signaled, this will invoke Set Property Override Float" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetPropertyOverrideFloat is invoked" + "tooltip": "Signaled after Set Property Override Float is invoked" }, "details": { - "name": "SetPropertyOverrideFloat" + "name": "Set Property Override Float" }, "params": [ { "typeid": "{EB603581-4654-4C17-B6DE-AE61E79EDA97}", "details": { - "name": "AZ::Render::MaterialAssignmentId" + "name": "AZ:: Render:: Material Assignment Id" } }, { "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", "details": { - "name": "AZStd::string" + "name": "AZ Std::string" } }, { @@ -1179,57 +1158,101 @@ ] }, { - "key": "ClearLodMaterialOverrides", + "key": "ApplyAutomaticPropertyUpdates", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke ClearLodMaterialOverrides" + "tooltip": "When signaled, this will invoke Apply Automatic Property Updates" }, "exit": { "name": "Out", - "tooltip": "Signaled after ClearLodMaterialOverrides is invoked" + "tooltip": "Signaled after Apply Automatic Property Updates is invoked" }, "details": { - "name": "ClearLodMaterialOverrides" + "name": "Apply Automatic Property Updates" + }, + "results": [ + { + "typeid": "{43DA906B-7DEF-4CA8-9790-854106D3F983}", + "details": { + "name": "unsigned int" + } + } + ] + }, + { + "key": "ClearMaterialOverride", + "entry": { + "name": "In", + "tooltip": "When signaled, this will invoke Clear Material Override" + }, + "exit": { + "name": "Out", + "tooltip": "Signaled after Clear Material Override is invoked" + }, + "details": { + "name": "Clear Material Override" + }, + "params": [ + { + "typeid": "{EB603581-4654-4C17-B6DE-AE61E79EDA97}", + "details": { + "name": "AZ:: Render:: Material Assignment Id" + } + } + ] + }, + { + "key": "ClearLodMaterialOverrides", + "entry": { + "name": "In", + "tooltip": "When signaled, this will invoke Clear Lod Material Overrides" + }, + "exit": { + "name": "Out", + "tooltip": "Signaled after Clear Lod Material Overrides is invoked" + }, + "details": { + "name": "Clear Lod Material Overrides" } }, { "key": "ClearIncompatibleMaterialOverrides", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke ClearIncompatibleMaterialOverrides" + "tooltip": "When signaled, this will invoke Clear Incompatible Material Overrides" }, "exit": { "name": "Out", - "tooltip": "Signaled after ClearIncompatibleMaterialOverrides is invoked" + "tooltip": "Signaled after Clear Incompatible Material Overrides is invoked" }, "details": { - "name": "ClearIncompatibleMaterialOverrides" + "name": "Clear Incompatible Material Overrides" } }, { "key": "GetPropertyOverrideVector3", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetPropertyOverrideVector3" + "tooltip": "When signaled, this will invoke Get Property Override Vector 3" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetPropertyOverrideVector3 is invoked" + "tooltip": "Signaled after Get Property Override Vector 3 is invoked" }, "details": { - "name": "GetPropertyOverrideVector3" + "name": "Get Property Override Vector 3" }, "params": [ { "typeid": "{EB603581-4654-4C17-B6DE-AE61E79EDA97}", "details": { - "name": "AZ::Render::MaterialAssignmentId" + "name": "AZ:: Render:: Material Assignment Id" } }, { "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", "details": { - "name": "AZStd::string" + "name": "AZ Std::string" } } ], @@ -1237,7 +1260,7 @@ { "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}", "details": { - "name": "Vector3" + "name": "Vector 3" } } ] @@ -1246,40 +1269,40 @@ "key": "ClearDefaultMaterialOverride", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke ClearDefaultMaterialOverride" + "tooltip": "When signaled, this will invoke Clear Default Material Override" }, "exit": { "name": "Out", - "tooltip": "Signaled after ClearDefaultMaterialOverride is invoked" + "tooltip": "Signaled after Clear Default Material Override is invoked" }, "details": { - "name": "ClearDefaultMaterialOverride" + "name": "Clear Default Material Override" } }, { "key": "SetPropertyOverrideColor", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetPropertyOverrideColor" + "tooltip": "When signaled, this will invoke Set Property Override Color" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetPropertyOverrideColor is invoked" + "tooltip": "Signaled after Set Property Override Color is invoked" }, "details": { - "name": "SetPropertyOverrideColor" + "name": "Set Property Override Color" }, "params": [ { "typeid": "{EB603581-4654-4C17-B6DE-AE61E79EDA97}", "details": { - "name": "AZ::Render::MaterialAssignmentId" + "name": "AZ:: Render:: Material Assignment Id" } }, { "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", "details": { - "name": "AZStd::string" + "name": "AZ Std::string" } }, { @@ -1294,26 +1317,26 @@ "key": "SetMaterialOverride", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetMaterialOverride" + "tooltip": "When signaled, this will invoke Set Material Override" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetMaterialOverride is invoked" + "tooltip": "Signaled after Set Material Override is invoked" }, "details": { - "name": "SetMaterialOverride" + "name": "Set Material Override" }, "params": [ { "typeid": "{EB603581-4654-4C17-B6DE-AE61E79EDA97}", "details": { - "name": "AZ::Render::MaterialAssignmentId" + "name": "AZ:: Render:: Material Assignment Id" } }, { "typeid": "{652ED536-3402-439B-AEBE-4A5DBC554085}", "details": { - "name": "AssetId" + "name": "Asset Id" } } ] @@ -1322,26 +1345,26 @@ "key": "GetPropertyOverrideFloat", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetPropertyOverrideFloat" + "tooltip": "When signaled, this will invoke Get Property Override Float" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetPropertyOverrideFloat is invoked" + "tooltip": "Signaled after Get Property Override Float is invoked" }, "details": { - "name": "GetPropertyOverrideFloat" + "name": "Get Property Override Float" }, "params": [ { "typeid": "{EB603581-4654-4C17-B6DE-AE61E79EDA97}", "details": { - "name": "AZ::Render::MaterialAssignmentId" + "name": "AZ:: Render:: Material Assignment Id" } }, { "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", "details": { - "name": "AZStd::string" + "name": "AZ Std::string" } } ], diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/PhysicalSkyRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/PhysicalSkyRequestBus.names index ccd14962a2..a83525bb17 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/PhysicalSkyRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/PhysicalSkyRequestBus.names @@ -5,21 +5,22 @@ "context": "EBusSender", "variant": "", "details": { - "name": "PhysicalSkyRequestBus" + "name": "Physical Sky", + "category": "Rendering" }, "methods": [ { "key": "SetSkyIntensity", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetSkyIntensity" + "tooltip": "When signaled, this will invoke Set Sky Intensity" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetSkyIntensity is invoked" + "tooltip": "Signaled after Set Sky Intensity is invoked" }, "details": { - "name": "SetSkyIntensity" + "name": "Set Sky Intensity" }, "params": [ { @@ -34,14 +35,14 @@ "key": "SetSunIntensity", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetSunIntensity" + "tooltip": "When signaled, this will invoke Set Sun Intensity" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetSunIntensity is invoked" + "tooltip": "Signaled after Set Sun Intensity is invoked" }, "details": { - "name": "SetSunIntensity" + "name": "Set Sun Intensity" }, "params": [ { @@ -56,14 +57,14 @@ "key": "GetSunIntensity", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetSunIntensity" + "tooltip": "When signaled, this will invoke Get Sun Intensity" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetSunIntensity is invoked" + "tooltip": "Signaled after Get Sun Intensity is invoked" }, "details": { - "name": "GetSunIntensity" + "name": "Get Sun Intensity" }, "results": [ { @@ -78,14 +79,14 @@ "key": "GetSunRadiusFactor", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetSunRadiusFactor" + "tooltip": "When signaled, this will invoke Get Sun Radius Factor" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetSunRadiusFactor is invoked" + "tooltip": "Signaled after Get Sun Radius Factor is invoked" }, "details": { - "name": "GetSunRadiusFactor" + "name": "Get Sun Radius Factor" }, "results": [ { @@ -100,14 +101,14 @@ "key": "SetSunRadiusFactor", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetSunRadiusFactor" + "tooltip": "When signaled, this will invoke Set Sun Radius Factor" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetSunRadiusFactor is invoked" + "tooltip": "Signaled after Set Sun Radius Factor is invoked" }, "details": { - "name": "SetSunRadiusFactor" + "name": "Set Sun Radius Factor" }, "params": [ { @@ -122,14 +123,14 @@ "key": "GetTurbidity", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetTurbidity" + "tooltip": "When signaled, this will invoke Get Turbidity" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetTurbidity is invoked" + "tooltip": "Signaled after Get Turbidity is invoked" }, "details": { - "name": "GetTurbidity" + "name": "Get Turbidity" }, "results": [ { @@ -144,14 +145,14 @@ "key": "GetSkyIntensity", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetSkyIntensity" + "tooltip": "When signaled, this will invoke Get Sky Intensity" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetSkyIntensity is invoked" + "tooltip": "Signaled after Get Sky Intensity is invoked" }, "details": { - "name": "GetSkyIntensity" + "name": "Get Sky Intensity" }, "results": [ { @@ -166,14 +167,14 @@ "key": "SetTurbidity", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetTurbidity" + "tooltip": "When signaled, this will invoke Set Turbidity" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetTurbidity is invoked" + "tooltip": "Signaled after Set Turbidity is invoked" }, "details": { - "name": "SetTurbidity" + "name": "Set Turbidity" }, "params": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/SkyBoxFogRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/SkyBoxFogRequestBus.names index 477f4fc85c..b0921723a6 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/SkyBoxFogRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/SkyBoxFogRequestBus.names @@ -5,21 +5,22 @@ "context": "EBusSender", "variant": "", "details": { - "name": "SkyBoxFogRequestBus" + "name": "Sky Box Fog", + "category": "Rendering" }, "methods": [ { "key": "GetBottomHeight", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetBottomHeight" + "tooltip": "When signaled, this will invoke Get Bottom Height" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetBottomHeight is invoked" + "tooltip": "Signaled after Get Bottom Height is invoked" }, "details": { - "name": "GetBottomHeight" + "name": "Get Bottom Height" }, "results": [ { @@ -34,14 +35,14 @@ "key": "GetColor", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetColor" + "tooltip": "When signaled, this will invoke Get Color" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetColor is invoked" + "tooltip": "Signaled after Get Color is invoked" }, "details": { - "name": "GetColor" + "name": "Get Color" }, "results": [ { @@ -56,14 +57,14 @@ "key": "SetBottomHeight", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetBottomHeight" + "tooltip": "When signaled, this will invoke Set Bottom Height" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetBottomHeight is invoked" + "tooltip": "Signaled after Set Bottom Height is invoked" }, "details": { - "name": "SetBottomHeight" + "name": "Set Bottom Height" }, "params": [ { @@ -78,14 +79,14 @@ "key": "SetColor", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetColor" + "tooltip": "When signaled, this will invoke Set Color" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetColor is invoked" + "tooltip": "Signaled after Set Color is invoked" }, "details": { - "name": "SetColor" + "name": "Set Color" }, "params": [ { @@ -100,14 +101,14 @@ "key": "GetTopHeight", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetTopHeight" + "tooltip": "When signaled, this will invoke Get Top Height" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetTopHeight is invoked" + "tooltip": "Signaled after Get Top Height is invoked" }, "details": { - "name": "GetTopHeight" + "name": "Get Top Height" }, "results": [ { @@ -122,14 +123,14 @@ "key": "IsEnabled", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke IsEnabled" + "tooltip": "When signaled, this will invoke Is Enabled" }, "exit": { "name": "Out", - "tooltip": "Signaled after IsEnabled is invoked" + "tooltip": "Signaled after Is Enabled is invoked" }, "details": { - "name": "IsEnabled" + "name": "Is Enabled" }, "results": [ { @@ -144,14 +145,14 @@ "key": "SetTopHeight", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetTopHeight" + "tooltip": "When signaled, this will invoke Set Top Height" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetTopHeight is invoked" + "tooltip": "Signaled after Set Top Height is invoked" }, "details": { - "name": "SetTopHeight" + "name": "Set Top Height" }, "params": [ { @@ -166,14 +167,14 @@ "key": "SetEnabled", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetEnabled" + "tooltip": "When signaled, this will invoke Set Enabled" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetEnabled is invoked" + "tooltip": "Signaled after Set Enabled is invoked" }, "details": { - "name": "SetEnabled" + "name": "Set Enabled" }, "params": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ViewportRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ViewportRequestBus.names index 56ea2c0882..d555b4def6 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ViewportRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ViewportRequestBus.names @@ -5,21 +5,22 @@ "context": "EBusSender", "variant": "", "details": { - "name": "ViewportRequestBus" + "name": "Viewport", + "category": "Rendering" }, "methods": [ { "key": "SetCameraTransform", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetCameraTransform" + "tooltip": "When signaled, this will invoke Set Camera Transform" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetCameraTransform is invoked" + "tooltip": "Signaled after Set Camera Transform is invoked" }, "details": { - "name": "SetCameraTransform" + "name": "Set Camera Transform" }, "params": [ { @@ -34,20 +35,20 @@ "key": "GetCameraProjectionMatrix", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetCameraProjectionMatrix" + "tooltip": "When signaled, this will invoke Get Camera Projection Matrix" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetCameraProjectionMatrix is invoked" + "tooltip": "Signaled after Get Camera Projection Matrix is invoked" }, "details": { - "name": "GetCameraProjectionMatrix" + "name": "Get Camera Projection Matrix" }, "results": [ { "typeid": "{157193C7-B673-4A2B-8B43-5681DCC3DEC3}", "details": { - "name": "Matrix4x4" + "name": "Matrix 4x 4" } } ] @@ -56,20 +57,20 @@ "key": "SetCameraViewMatrix", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetCameraViewMatrix" + "tooltip": "When signaled, this will invoke Set Camera View Matrix" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetCameraViewMatrix is invoked" + "tooltip": "Signaled after Set Camera View Matrix is invoked" }, "details": { - "name": "SetCameraViewMatrix" + "name": "Set Camera View Matrix" }, "params": [ { "typeid": "{157193C7-B673-4A2B-8B43-5681DCC3DEC3}", "details": { - "name": "Matrix4x4" + "name": "Matrix 4x 4" } } ] @@ -78,20 +79,20 @@ "key": "GetCameraViewMatrix", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetCameraViewMatrix" + "tooltip": "When signaled, this will invoke Get Camera View Matrix" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetCameraViewMatrix is invoked" + "tooltip": "Signaled after Get Camera View Matrix is invoked" }, "details": { - "name": "GetCameraViewMatrix" + "name": "Get Camera View Matrix" }, "results": [ { "typeid": "{157193C7-B673-4A2B-8B43-5681DCC3DEC3}", "details": { - "name": "Matrix4x4" + "name": "Matrix 4x 4" } } ] @@ -100,20 +101,20 @@ "key": "SetCameraProjectionMatrix", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetCameraProjectionMatrix" + "tooltip": "When signaled, this will invoke Set Camera Projection Matrix" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetCameraProjectionMatrix is invoked" + "tooltip": "Signaled after Set Camera Projection Matrix is invoked" }, "details": { - "name": "SetCameraProjectionMatrix" + "name": "Set Camera Projection Matrix" }, "params": [ { "typeid": "{157193C7-B673-4A2B-8B43-5681DCC3DEC3}", "details": { - "name": "Matrix4x4" + "name": "Matrix 4x 4" } } ] @@ -122,14 +123,14 @@ "key": "GetCameraTransform", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetCameraTransform" + "tooltip": "When signaled, this will invoke Get Camera Transform" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetCameraTransform is invoked" + "tooltip": "Signaled after Get Camera Transform is invoked" }, "details": { - "name": "GetCameraTransform" + "name": "Get Camera Transform" }, "results": [ { From ebd679d8cff3065ead9880fd79c21f7af91f2e4a Mon Sep 17 00:00:00 2001 From: Shirang Jia Date: Mon, 22 Nov 2021 17:46:49 -0800 Subject: [PATCH 208/345] Don't fail the build when AP logs upload fails (#5849) * Fix retry of failures from catch block Signed-off-by: Shirang Jia * Make the build unstable when AP load fails Signed-off-by: Shirang Jia * Remove test codes Signed-off-by: Shirang Jia --- scripts/build/Jenkins/Jenkinsfile | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/scripts/build/Jenkins/Jenkinsfile b/scripts/build/Jenkins/Jenkinsfile index 3b5ca8fe60..98011503af 100644 --- a/scripts/build/Jenkins/Jenkinsfile +++ b/scripts/build/Jenkins/Jenkinsfile @@ -451,10 +451,12 @@ def ArchiveArtifactsOnS3(String artifactsSource, String s3Prefix="", boolean rec } def UploadAPLogs(String platformName, String jobName, String workspace, Map params) { - dir("${workspace}/${ENGINE_REPOSITORY_NAME}") { - projects = params.CMAKE_LY_PROJECTS.split(",") - projects.each{ project -> - ArchiveArtifactsOnS3("${project}/user/log", "ap_logs/${platformName}/${jobName}/${project}", true) + catchError(message: "Error archiving AssetProcessor logs (this won't fail the build)", buildResult: 'UNSTABLE', stageResult: 'FAILURE') { + dir("${workspace}/${ENGINE_REPOSITORY_NAME}") { + projects = params.CMAKE_LY_PROJECTS.split(",") + projects.each{ project -> + ArchiveArtifactsOnS3("${project}/user/log", "ap_logs/${platformName}/${jobName}/${project}", true) + } } } } From ff862a2f206aa2449e4c7ee77d2914b091103086 Mon Sep 17 00:00:00 2001 From: Gene Walters Date: Mon, 22 Nov 2021 18:56:48 -0800 Subject: [PATCH 209/345] Fix memory leak of ProcessWatcher Signed-off-by: Gene Walters --- .../Editor/MultiplayerEditorSystemComponent.cpp | 13 +++++++++---- .../Editor/MultiplayerEditorSystemComponent.h | 6 ++++-- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/Gems/Multiplayer/Code/Source/Editor/MultiplayerEditorSystemComponent.cpp b/Gems/Multiplayer/Code/Source/Editor/MultiplayerEditorSystemComponent.cpp index 669393e31e..7cc6fbc1b5 100644 --- a/Gems/Multiplayer/Code/Source/Editor/MultiplayerEditorSystemComponent.cpp +++ b/Gems/Multiplayer/Code/Source/Editor/MultiplayerEditorSystemComponent.cpp @@ -193,7 +193,7 @@ namespace Multiplayer } } - AzFramework::ProcessWatcher* LaunchEditorServer() + void MultiplayerEditorSystemComponent::LaunchEditorServer() { // Assemble the server's path AZ::CVarFixedString serverProcess = editorsv_process; @@ -248,7 +248,13 @@ namespace Multiplayer "MultiplayerEditor", processLaunchInfo.m_launchResult != AzFramework::ProcessLauncher::ProcessLaunchResult::PLR_MissingFile, "LaunchEditorServer failed! The ServerLauncher binary is missing! (%s) Please build server launcher.", serverPath.c_str()) - return outProcess; + // Stop the previous server if one exists + if (m_serverProcessWatcher) + { + m_serverProcessWatcher->TerminateProcess(0); + } + m_serverProcessWatcher.reset(outProcess); + m_serverProcessTracePrinter = AZStd::make_unique(m_serverProcessWatcher->GetCommunicator(), "EditorServer"); } void MultiplayerEditorSystemComponent::OnGameEntitiesStarted() @@ -308,8 +314,7 @@ namespace Multiplayer editorNetworkInterface->Listen(editorsv_port); // Launch the editor-server - m_serverProcessWatcher = LaunchEditorServer(); - m_serverProcessTracePrinter = AZStd::make_unique(m_serverProcessWatcher->GetCommunicator(), "EditorServer"); + LaunchEditorServer(); AZ::TickBus::Handler::BusConnect(); } else diff --git a/Gems/Multiplayer/Code/Source/Editor/MultiplayerEditorSystemComponent.h b/Gems/Multiplayer/Code/Source/Editor/MultiplayerEditorSystemComponent.h index 330a2c9d81..5e49f8f08d 100644 --- a/Gems/Multiplayer/Code/Source/Editor/MultiplayerEditorSystemComponent.h +++ b/Gems/Multiplayer/Code/Source/Editor/MultiplayerEditorSystemComponent.h @@ -83,7 +83,9 @@ namespace Multiplayer bool IsInGameMode() override; //! @} - private: + private: + void LaunchEditorServer(); + //! EditorEvents::Handler overrides //! @{ void OnEditorNotifyEvent(EEditorNotifyEvent event) override; @@ -106,7 +108,7 @@ namespace Multiplayer //! @} IEditor* m_editor = nullptr; - AzFramework::ProcessWatcher* m_serverProcessWatcher = nullptr; + AZStd::unique_ptr m_serverProcessWatcher = nullptr; AZStd::unique_ptr m_serverProcessTracePrinter = nullptr; AzNetworking::ConnectionId m_editorConnId; From 2fbb2a73c6a3faad4ede23b5ce8016e5093f5624 Mon Sep 17 00:00:00 2001 From: Benjamin Jillich <43751992+amzn-jillich@users.noreply.github.com> Date: Tue, 23 Nov 2021 08:55:53 +0100 Subject: [PATCH 210/345] Animation Editor: Morph targets window shows duplicated morph targets (#5831) Dialog stack wasn't deleting the morph target widgets after reinitializing the window which ended up in duplicated morph targets Signed-off-by: Benjamin Jillich --- .../EMotionFX/Code/MysticQt/Source/DialogStack.cpp | 14 +++++++++----- Gems/EMotionFX/Code/MysticQt/Source/DialogStack.h | 12 ++---------- 2 files changed, 11 insertions(+), 15 deletions(-) diff --git a/Gems/EMotionFX/Code/MysticQt/Source/DialogStack.cpp b/Gems/EMotionFX/Code/MysticQt/Source/DialogStack.cpp index 5e9cf66fa7..30d54c6b7b 100644 --- a/Gems/EMotionFX/Code/MysticQt/Source/DialogStack.cpp +++ b/Gems/EMotionFX/Code/MysticQt/Source/DialogStack.cpp @@ -71,8 +71,6 @@ namespace MysticQt setWidget(m_rootSplitter); } - - // destructor DialogStack::~DialogStack() { } @@ -81,6 +79,14 @@ namespace MysticQt // get rid of all dialogs and their allocated memory void DialogStack::Clear() { + for (Dialog& dialog : m_dialogs) + { + if (dialog.m_dialogWidget) + { + dialog.m_dialogWidget->deleteLater(); + } + } + // destroy the dialogs m_dialogs.clear(); @@ -679,6 +685,4 @@ namespace MysticQt return; } } -} // namespace MysticQt - -#include +} // namespace MysticQt diff --git a/Gems/EMotionFX/Code/MysticQt/Source/DialogStack.h b/Gems/EMotionFX/Code/MysticQt/Source/DialogStack.h index bf93b5d23f..64a48fb392 100644 --- a/Gems/EMotionFX/Code/MysticQt/Source/DialogStack.h +++ b/Gems/EMotionFX/Code/MysticQt/Source/DialogStack.h @@ -6,10 +6,8 @@ * */ -#ifndef __MYSTICQT_DIALOGSTACK_H -#define __MYSTICQT_DIALOGSTACK_H +#pragma once -// #if !defined(Q_MOC_RUN) #include "MysticQtConfig.h" #include @@ -30,14 +28,10 @@ namespace MysticQt { class DialogStackSplitter; - /** - * - * - */ class MYSTICQT_API DialogStack : public QScrollArea { - Q_OBJECT + Q_OBJECT // AUTOMOC public: DialogStack(QWidget* parent = nullptr); @@ -89,5 +83,3 @@ namespace MysticQt int32 m_prevMouseY; }; } // namespace MysticQt - -#endif From f3347f56db0406798e6c768c6f8892147e0527d3 Mon Sep 17 00:00:00 2001 From: greerdv Date: Tue, 23 Nov 2021 09:40:13 +0000 Subject: [PATCH 211/345] remove variable only used in assert Signed-off-by: greerdv --- Gems/PhysX/Code/Editor/ColliderComponentMode.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Gems/PhysX/Code/Editor/ColliderComponentMode.cpp b/Gems/PhysX/Code/Editor/ColliderComponentMode.cpp index 1f1cdd79fa..e5e75d88a3 100644 --- a/Gems/PhysX/Code/Editor/ColliderComponentMode.cpp +++ b/Gems/PhysX/Code/Editor/ColliderComponentMode.cpp @@ -160,8 +160,7 @@ namespace PhysX void ColliderComponentMode::SetCurrentMode(SubMode newMode) { - auto subMode = m_subModes.find(newMode); - AZ_Assert(subMode != m_subModes.end(), "Submode not found:%d", newMode); + AZ_Assert(m_subModes.find(newMode) != m_subModes.end(), "Submode not found:%d", newMode); m_subModes[m_subMode]->Teardown(GetEntityComponentIdPair()); m_subMode = newMode; m_subModes[m_subMode]->Setup(GetEntityComponentIdPair()); From e52557ee7610488211aa0c590d329a852d39fcad Mon Sep 17 00:00:00 2001 From: amzn-sean <75276488+amzn-sean@users.noreply.github.com> Date: Tue, 23 Nov 2021 10:54:00 +0000 Subject: [PATCH 212/345] restoring physx joint typed tests on all platforms (#5836) Signed-off-by: amzn-sean <75276488+amzn-sean@users.noreply.github.com> --- Gems/PhysX/Code/CMakeLists.txt | 8 -------- Gems/PhysX/Code/Source/Platform/Android/PAL_android.cmake | 2 -- Gems/PhysX/Code/Source/Platform/Linux/PAL_linux.cmake | 1 - Gems/PhysX/Code/Source/Platform/Mac/PAL_mac.cmake | 1 - Gems/PhysX/Code/Source/Platform/Windows/PAL_windows.cmake | 1 - Gems/PhysX/Code/Source/Platform/iOS/PAL_ios.cmake | 1 - Gems/PhysX/Code/Tests/PhysXJointsTest.cpp | 3 --- 7 files changed, 17 deletions(-) diff --git a/Gems/PhysX/Code/CMakeLists.txt b/Gems/PhysX/Code/CMakeLists.txt index bb3d7c08a2..fcb2f8ab20 100644 --- a/Gems/PhysX/Code/CMakeLists.txt +++ b/Gems/PhysX/Code/CMakeLists.txt @@ -182,14 +182,6 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED) Gem::LmbrCentral ) - if(PAL_TRAIT_JOINTS_TYPED_TEST_CASE) - ly_add_source_properties( - SOURCES Tests/PhysXJointsTest.cpp - PROPERTY COMPILE_DEFINITIONS - VALUES ENABLE_JOINTS_TYPED_TEST_CASE - ) - endif() - ly_add_googletest( NAME Gem::PhysX.Tests ) diff --git a/Gems/PhysX/Code/Source/Platform/Android/PAL_android.cmake b/Gems/PhysX/Code/Source/Platform/Android/PAL_android.cmake index e6a2b35d36..1d078bb505 100644 --- a/Gems/PhysX/Code/Source/Platform/Android/PAL_android.cmake +++ b/Gems/PhysX/Code/Source/Platform/Android/PAL_android.cmake @@ -7,5 +7,3 @@ # set(PAL_TRAIT_PHYSX_SUPPORTED TRUE) -set(PAL_TRAIT_JOINTS_TYPED_TEST_CASE FALSE) - diff --git a/Gems/PhysX/Code/Source/Platform/Linux/PAL_linux.cmake b/Gems/PhysX/Code/Source/Platform/Linux/PAL_linux.cmake index 0d9c4f1e3a..43c92ab916 100644 --- a/Gems/PhysX/Code/Source/Platform/Linux/PAL_linux.cmake +++ b/Gems/PhysX/Code/Source/Platform/Linux/PAL_linux.cmake @@ -7,7 +7,6 @@ # set(PAL_TRAIT_PHYSX_SUPPORTED TRUE) -set(PAL_TRAIT_JOINTS_TYPED_TEST_CASE FALSE) if(PAL_TRAIT_BUILD_HOST_TOOLS) ly_associate_package(PACKAGE_NAME poly2tri-7f0487a-rev1-linux TARGETS poly2tri PACKAGE_HASH b16eef8f0bc469de0e3056d28d7484cf42659667e39b68b239f0d3a4cbb533d0) diff --git a/Gems/PhysX/Code/Source/Platform/Mac/PAL_mac.cmake b/Gems/PhysX/Code/Source/Platform/Mac/PAL_mac.cmake index 141a80ae59..992280bceb 100644 --- a/Gems/PhysX/Code/Source/Platform/Mac/PAL_mac.cmake +++ b/Gems/PhysX/Code/Source/Platform/Mac/PAL_mac.cmake @@ -7,7 +7,6 @@ # set(PAL_TRAIT_PHYSX_SUPPORTED TRUE) -set(PAL_TRAIT_JOINTS_TYPED_TEST_CASE FALSE) if(PAL_TRAIT_BUILD_HOST_TOOLS) ly_associate_package(PACKAGE_NAME poly2tri-7f0487a-rev1-mac TARGETS poly2tri PACKAGE_HASH 23e49e6b06d79327985d17b40bff20ab202519c283a842378f5f1791c1bf8dbc) diff --git a/Gems/PhysX/Code/Source/Platform/Windows/PAL_windows.cmake b/Gems/PhysX/Code/Source/Platform/Windows/PAL_windows.cmake index 7abd7ab9e9..336bb89c40 100644 --- a/Gems/PhysX/Code/Source/Platform/Windows/PAL_windows.cmake +++ b/Gems/PhysX/Code/Source/Platform/Windows/PAL_windows.cmake @@ -7,7 +7,6 @@ # set(PAL_TRAIT_PHYSX_SUPPORTED TRUE) -set(PAL_TRAIT_JOINTS_TYPED_TEST_CASE TRUE) if(PAL_TRAIT_BUILD_HOST_TOOLS) ly_associate_package(PACKAGE_NAME poly2tri-7f0487a-rev1-windows TARGETS poly2tri PACKAGE_HASH 5fea2bf294e5130e0654fbfa39f192e6369f3853901dde90bb9b3f3a11edcb1e) diff --git a/Gems/PhysX/Code/Source/Platform/iOS/PAL_ios.cmake b/Gems/PhysX/Code/Source/Platform/iOS/PAL_ios.cmake index 6316fa60c6..1d078bb505 100644 --- a/Gems/PhysX/Code/Source/Platform/iOS/PAL_ios.cmake +++ b/Gems/PhysX/Code/Source/Platform/iOS/PAL_ios.cmake @@ -7,4 +7,3 @@ # set(PAL_TRAIT_PHYSX_SUPPORTED TRUE) -set(PAL_TRAIT_JOINTS_TYPED_TEST_CASE FALSE) diff --git a/Gems/PhysX/Code/Tests/PhysXJointsTest.cpp b/Gems/PhysX/Code/Tests/PhysXJointsTest.cpp index 3a7eac0884..8a624e0223 100644 --- a/Gems/PhysX/Code/Tests/PhysXJointsTest.cpp +++ b/Gems/PhysX/Code/Tests/PhysXJointsTest.cpp @@ -267,8 +267,6 @@ namespace PhysX EXPECT_GT(followerEndPosition.GetZ(), followerPosition.GetZ()); } -// for some reason TYPED_TEST_CASE with the fixture is not working on Android + Linux -#ifdef ENABLE_JOINTS_TYPED_TEST_CASE template class PhysXJointsApiTest : public PhysX::GenericPhysicsInterfaceTest { @@ -347,5 +345,4 @@ namespace PhysX EXPECT_GT(childCurrentPos.GetX(), this->m_childInitialPos.GetX()); } -#endif // ENABLE_JOINTS_TYPED_TEST_CASE } From 23750b8c813b80738196126750883626128cf817 Mon Sep 17 00:00:00 2001 From: greerdv Date: Tue, 23 Nov 2021 11:34:31 +0000 Subject: [PATCH 213/345] fix direction of manipulator scaling for asset collider when axes are flipped Signed-off-by: greerdv --- Gems/PhysX/Code/CMakeLists.txt | 1 + .../Code/Editor/ColliderAssetScaleMode.cpp | 2 +- .../Tests/PhysXColliderComponentModeTests.cpp | 51 +++++++++++++++++++ Gems/PhysX/Code/Tests/TestColliderComponent.h | 16 +++--- 4 files changed, 61 insertions(+), 9 deletions(-) diff --git a/Gems/PhysX/Code/CMakeLists.txt b/Gems/PhysX/Code/CMakeLists.txt index bb3d7c08a2..164ce7c79c 100644 --- a/Gems/PhysX/Code/CMakeLists.txt +++ b/Gems/PhysX/Code/CMakeLists.txt @@ -224,6 +224,7 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED) AZ::AzTestShared AZ::AzTest AZ::AzToolsFrameworkTestCommon + AZ::AzManipulatorTestFramework.Static Gem::PhysX.Static Gem::PhysX.Mocks Gem::PhysX.Editor.Static diff --git a/Gems/PhysX/Code/Editor/ColliderAssetScaleMode.cpp b/Gems/PhysX/Code/Editor/ColliderAssetScaleMode.cpp index ea08bb8160..67917bc49a 100644 --- a/Gems/PhysX/Code/Editor/ColliderAssetScaleMode.cpp +++ b/Gems/PhysX/Code/Editor/ColliderAssetScaleMode.cpp @@ -59,7 +59,7 @@ namespace PhysX m_dimensionsManipulators.InstallAxisMouseMoveCallback( [this, idPair] (const AzToolsFramework::LinearManipulator::Action& action) { - OnManipulatorMoved(action.LocalScaleOffset() + m_initialScale, idPair); + OnManipulatorMoved(action.m_start.m_sign * action.LocalScaleOffset() + m_initialScale, idPair); }); m_dimensionsManipulators.InstallUniformLeftMouseDownCallback( diff --git a/Gems/PhysX/Code/Tests/PhysXColliderComponentModeTests.cpp b/Gems/PhysX/Code/Tests/PhysXColliderComponentModeTests.cpp index 1f393386f8..85168d17d0 100644 --- a/Gems/PhysX/Code/Tests/PhysXColliderComponentModeTests.cpp +++ b/Gems/PhysX/Code/Tests/PhysXColliderComponentModeTests.cpp @@ -8,10 +8,13 @@ #include "TestColliderComponent.h" +#include +#include #include #include #include #include +#include #include #include #include @@ -386,4 +389,52 @@ namespace UnitTest PhysX::ColliderComponentModeRequestBus::BroadcastResult(subMode, &PhysX::ColliderComponentModeRequests::GetCurrentMode); EXPECT_EQ(PhysX::ColliderComponentModeRequests::SubMode::Dimensions, subMode); } + + using PhysXColliderComponentModeManipulatorTest = + UnitTest::IndirectCallManipulatorViewportInteractionFixtureMixin; + + TEST_F(PhysXColliderComponentModeManipulatorTest, AssetScaleManipulatorsScaleInCorrectDirection) + { + auto colliderEntity = CreateColliderComponent(); + colliderEntity->FindComponent()->SetShapeType(Physics::ShapeType::PhysicsAsset); + colliderEntity->FindComponent()->SetAssetScale(AZ::Vector3::CreateOne()); + EnterComponentMode(); + PhysX::ColliderComponentModeRequestBus::Broadcast(&PhysX::ColliderComponentModeRequests::SetCurrentMode, + PhysX::ColliderComponentModeRequests::SubMode::Dimensions); + + // position the camera so the X axis manipulator will be flipped + AzFramework::SetCameraTransform( + m_cameraState, + AZ::Transform::CreateFromQuaternionAndTranslation( + AZ::Quaternion::CreateRotationZ(-AZ::Constants::QuarterPi), AZ::Vector3(-5.0f, -5.0f, 0.0f))); + + // select a point in world space slightly displaced from the position of the entity in the negative x direction + // in order to grab the X manipulator + const float x = 0.1f; + const float xDelta = 0.1f; + const AZ::Vector3 worldStart(-x, 0.0f, 0.0f); + + // position in world space to drag to + const AZ::Vector3 worldEnd(-(x + xDelta), 0.0f, 0.0f); + + const auto screenStart = AzFramework::WorldToScreen(worldStart, m_cameraState); + const auto screenEnd = AzFramework::WorldToScreen(worldEnd, m_cameraState); + + m_actionDispatcher + ->CameraState(m_cameraState) + // move the mouse to interact with the x scale manipulator + ->MousePosition(screenStart) + // drag to move the manipulator + ->MouseLButtonDown() + ->MousePosition(screenEnd) + ->MouseLButtonUp(); + + const auto WorldToScreenMultiplier = 1.0f / AzToolsFramework::CalculateScreenToWorldMultiplier(worldStart, m_cameraState); + const auto assetScale = colliderEntity->FindComponent()->GetAssetScale(); + // need quite a large tolerance because using screen co-ordinates limits precision + const float tolerance = 0.01f; + EXPECT_NEAR(assetScale.GetX(), 1.0f + xDelta * WorldToScreenMultiplier, tolerance); + EXPECT_NEAR(assetScale.GetY(), 1.0f, tolerance); + EXPECT_NEAR(assetScale.GetZ(), 1.0f, tolerance); + } } // namespace UnitTest diff --git a/Gems/PhysX/Code/Tests/TestColliderComponent.h b/Gems/PhysX/Code/Tests/TestColliderComponent.h index 91d3f16122..52b208ea80 100644 --- a/Gems/PhysX/Code/Tests/TestColliderComponent.h +++ b/Gems/PhysX/Code/Tests/TestColliderComponent.h @@ -67,13 +67,13 @@ namespace UnitTest private: AzToolsFramework::ComponentModeFramework::ComponentModeDelegate m_componentModeDelegate; - AZ::Vector3 m_offset; - AZ::Quaternion m_rotation; - AZ::Transform m_transform; - Physics::ShapeType m_shapeType; - float m_sphereRadius; - float m_capsuleHeight; - float m_capsuleRadius; - AZ::Vector3 m_assetScale; + AZ::Vector3 m_offset = AZ::Vector3::CreateZero(); + AZ::Quaternion m_rotation = AZ::Quaternion::CreateIdentity(); + AZ::Transform m_transform = AZ::Transform::CreateIdentity(); + Physics::ShapeType m_shapeType = Physics::ShapeType::PhysicsAsset; + float m_sphereRadius = 0.5f; + float m_capsuleHeight = 1.0f; + float m_capsuleRadius = 0.25f; + AZ::Vector3 m_assetScale = AZ::Vector3::CreateOne(); }; } // namespace UnitTest From ea0afae50256a7481d4529370380a7a1a73fe288 Mon Sep 17 00:00:00 2001 From: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com> Date: Tue, 23 Nov 2021 12:28:38 +0000 Subject: [PATCH 214/345] Fix for how viewport icons highlight (accent) when sticky select is disabled (#5833) * fix for how viewport icons highlight when sticky select is disabled Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com> * naming - update highlight to accent Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com> --- .../EditorTransformComponentSelection.cpp | 72 ++++--- .../EditorTransformComponentSelection.h | 19 +- ...EditorTransformComponentSelectionTests.cpp | 192 ++++++++++++++++++ 3 files changed, 251 insertions(+), 32 deletions(-) diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorTransformComponentSelection.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorTransformComponentSelection.cpp index 9ac28cfd91..d0318ee181 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorTransformComponentSelection.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorTransformComponentSelection.cpp @@ -27,7 +27,6 @@ #include #include #include -#include #include #include #include @@ -893,37 +892,34 @@ namespace AzToolsFramework prevModifiers = action.m_modifiers; } - static void HandleAccents( - const bool hasSelectedEntities, - const AZ::EntityId entityIdUnderCursor, - const bool ctrlHeld, - AZ::EntityId& hoveredEntityId, + void HandleAccents( + const AZ::EntityId currentEntityIdUnderCursor, + AZ::EntityId& hoveredEntityIdUnderCursor, + const HandleAccentsContext& handleAccentsContext, const ViewportInteraction::MouseButtons mouseButtons, - const bool usingBoxSelect) + const AZStd::function& setEntityAccentedFn) { - AZ_PROFILE_FUNCTION(AzToolsFramework); - const bool invalidMouseButtonHeld = mouseButtons.Middle() || mouseButtons.Right(); + const bool hasSelectedEntities = handleAccentsContext.m_hasSelectedEntities; + const bool ctrlHeld = handleAccentsContext.m_ctrlHeld; + const bool boxSelect = handleAccentsContext.m_usingBoxSelect; + const bool stickySelect = handleAccentsContext.m_usingStickySelect; + const bool canSelect = stickySelect ? !hasSelectedEntities || ctrlHeld : true; - if ((hoveredEntityId.IsValid() && hoveredEntityId != entityIdUnderCursor) || - (hasSelectedEntities && !ctrlHeld && hoveredEntityId.IsValid()) || invalidMouseButtonHeld) + const bool removePreviousAccent = + (currentEntityIdUnderCursor != hoveredEntityIdUnderCursor && hoveredEntityIdUnderCursor.IsValid()) || invalidMouseButtonHeld; + const bool addNextAccent = currentEntityIdUnderCursor.IsValid() && canSelect && !invalidMouseButtonHeld && !boxSelect; + + if (removePreviousAccent) { - if (hoveredEntityId.IsValid()) - { - ToolsApplicationRequestBus::Broadcast(&ToolsApplicationRequests::SetEntityHighlighted, hoveredEntityId, false); - - hoveredEntityId.SetInvalid(); - } + setEntityAccentedFn(hoveredEntityIdUnderCursor, false); + hoveredEntityIdUnderCursor.SetInvalid(); } - if (!invalidMouseButtonHeld && !usingBoxSelect && (!hasSelectedEntities || ctrlHeld)) + if (addNextAccent) { - if (entityIdUnderCursor.IsValid()) - { - ToolsApplicationRequestBus::Broadcast(&ToolsApplicationRequests::SetEntityHighlighted, entityIdUnderCursor, true); - - hoveredEntityId = entityIdUnderCursor; - } + setEntityAccentedFn(currentEntityIdUnderCursor, true); + hoveredEntityIdUnderCursor = currentEntityIdUnderCursor; } } @@ -1781,7 +1777,7 @@ namespace AzToolsFramework const AzFramework::CameraState cameraState = GetCameraState(viewportId); const auto cursorEntityIdQuery = m_editorHelpers->FindEntityIdUnderCursor(cameraState, mouseInteraction); - m_cachedEntityIdUnderCursor = cursorEntityIdQuery.ContainerAncestorEntityId(); + m_currentEntityIdUnderCursor = cursorEntityIdQuery.ContainerAncestorEntityId(); const auto selectClickEvent = ClickDetectorEventFromViewportInteraction(mouseInteraction); m_cursorState.SetCurrentPosition(mouseInteraction.m_mouseInteraction.m_mousePick.m_screenCoordinates); @@ -1802,7 +1798,7 @@ namespace AzToolsFramework mouseInteraction.m_mouseInteraction, AZ::Aabb::CreateFromMinMax(boxPosition - scaledSize, boxPosition + scaledSize))) { - m_cachedEntityIdUnderCursor = entityId; + m_currentEntityIdUnderCursor = entityId; } } } @@ -1822,7 +1818,7 @@ namespace AzToolsFramework return true; } - const AZ::EntityId entityIdUnderCursor = m_cachedEntityIdUnderCursor; + const AZ::EntityId entityIdUnderCursor = m_currentEntityIdUnderCursor; if (mouseInteraction.m_mouseEvent == ViewportInteraction::MouseEvent::DoubleClick && mouseInteraction.m_mouseInteraction.m_mouseButtons.Left()) @@ -3341,9 +3337,23 @@ namespace AzToolsFramework m_cursorState.Update(); + bool stickySelect = false; + ViewportInteraction::ViewportSettingsRequestBus::EventResult( + stickySelect, viewportInfo.m_viewportId, &ViewportInteraction::ViewportSettingsRequestBus::Events::StickySelectEnabled); + + HandleAccentsContext handleAccentsContext; + handleAccentsContext.m_ctrlHeld = keyboardModifiers.Ctrl(); + handleAccentsContext.m_hasSelectedEntities = !m_selectedEntityIds.empty(); + handleAccentsContext.m_usingBoxSelect = m_boxSelect.Active(); + handleAccentsContext.m_usingStickySelect = stickySelect; + HandleAccents( - !m_selectedEntityIds.empty(), m_cachedEntityIdUnderCursor, keyboardModifiers.Ctrl(), m_hoveredEntityId, - ViewportInteraction::BuildMouseButtons(QGuiApplication::mouseButtons()), m_boxSelect.Active()); + m_currentEntityIdUnderCursor, m_hoveredEntityId, handleAccentsContext, + ViewportInteraction::BuildMouseButtons(QGuiApplication::mouseButtons()), + [](const AZ::EntityId entityId, bool highlighted) + { + ToolsApplicationRequestBus::Broadcast(&ToolsApplicationRequests::SetEntityHighlighted, entityId, highlighted); + }); const ReferenceFrame referenceFrame = m_spaceCluster.m_spaceLock.value_or(ReferenceFrameFromModifiers(keyboardModifiers)); @@ -3589,7 +3599,8 @@ namespace AzToolsFramework if (auto prefabFocusPublicInterface = AZ::Interface::Get()) { AzFramework::EntityContextId editorEntityContextId = GetEntityContextId(); - if (AZ::EntityId focusRoot = prefabFocusPublicInterface->GetFocusedPrefabContainerEntityId(editorEntityContextId); focusRoot.IsValid()) + if (AZ::EntityId focusRoot = prefabFocusPublicInterface->GetFocusedPrefabContainerEntityId(editorEntityContextId); + focusRoot.IsValid()) { m_selectedEntityIds.erase(focusRoot); } @@ -3721,7 +3732,6 @@ namespace AzToolsFramework break; case ViewportEditorMode::Focus: { - ViewportUi::ViewportUiRequestBus::Event( ViewportUi::DefaultViewportId, &ViewportUi::ViewportUiRequestBus::Events::RemoveViewportBorder); } diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorTransformComponentSelection.h b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorTransformComponentSelection.h index 1e1cc6d2e1..10f83db739 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorTransformComponentSelection.h +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorTransformComponentSelection.h @@ -317,7 +317,7 @@ namespace AzToolsFramework void SetAllViewportUiVisible(bool visible); AZ::EntityId m_hoveredEntityId; //!< What EntityId is the mouse currently hovering over (if any). - AZ::EntityId m_cachedEntityIdUnderCursor; //!< Store the EntityId on each mouse move for use in Display. + AZ::EntityId m_currentEntityIdUnderCursor; //!< Store the EntityId on each mouse move for use in Display. AZ::EntityId m_editorCameraComponentEntityId; //!< The EditorCameraComponent EntityId if it is set. EntityIdSet m_selectedEntityIds; //!< Represents the current entities in the selection. @@ -357,6 +357,23 @@ namespace AzToolsFramework bool m_viewportUiVisible = true; //!< Used to hide/show the viewport ui elements. }; + //! Bundles viewport state that impacts how accents are added/removed in HandleAccents. + struct HandleAccentsContext + { + bool m_hasSelectedEntities; + bool m_ctrlHeld; + bool m_usingBoxSelect; + bool m_usingStickySelect; + }; + + //! Updates whether accents (icon highlights) are added/removed for a given entity based on the cursor position. + void HandleAccents( + AZ::EntityId currentEntityIdUnderCursor, + AZ::EntityId& hoveredEntityIdUnderCursor, + const HandleAccentsContext& handleAccentsContext, + ViewportInteraction::MouseButtons mouseButtons, + const AZStd::function& setEntityAccentedFn); + //! The ETCS (EntityTransformComponentSelection) namespace contains functions and data used exclusively by //! the EditorTransformComponentSelection type. Functions in this namespace are exposed to facilitate testing //! and should not be used outside of EditorTransformComponentSelection or EditorTransformComponentSelectionTests. diff --git a/Code/Framework/AzToolsFramework/Tests/EditorTransformComponentSelectionTests.cpp b/Code/Framework/AzToolsFramework/Tests/EditorTransformComponentSelectionTests.cpp index 4f4c3eb456..f4077e992b 100644 --- a/Code/Framework/AzToolsFramework/Tests/EditorTransformComponentSelectionTests.cpp +++ b/Code/Framework/AzToolsFramework/Tests/EditorTransformComponentSelectionTests.cpp @@ -2781,4 +2781,196 @@ namespace UnitTest /////////////////////////////////////////////////////////////////////////////////////////////////////////////// } + TEST(HandleAccents, CurrentValidEntityIdBecomesHoveredWithNoSelectionAndUnstickySelect) + { + namespace azvi = AzToolsFramework::ViewportInteraction; + + const AZ::EntityId currentEntityId = AZ::EntityId(12345); + AZ::EntityId hoveredEntityEntityId; + + AzToolsFramework::HandleAccentsContext handleAccentsContext; + handleAccentsContext.m_ctrlHeld = false; + handleAccentsContext.m_hasSelectedEntities = false; + handleAccentsContext.m_usingBoxSelect = false; + handleAccentsContext.m_usingStickySelect = false; + + bool currentEntityIdAccentAdded = false; + AzToolsFramework::HandleAccents( + currentEntityId, hoveredEntityEntityId, handleAccentsContext, azvi::MouseButtonsFromButton(azvi::MouseButton::None), + [¤tEntityIdAccentAdded, currentEntityId](const AZ::EntityId entityId, const bool accent) + { + if (entityId == currentEntityId && accent) + { + currentEntityIdAccentAdded = true; + } + }); + + using ::testing::Eq; + using ::testing::IsTrue; + EXPECT_THAT(currentEntityId, Eq(hoveredEntityEntityId)); + EXPECT_THAT(currentEntityIdAccentAdded, IsTrue()); + } + + TEST(HandleAccents, CurrentValidEntityIdBecomesHoveredWithSelectionAndUnstickySelect) + { + namespace azvi = AzToolsFramework::ViewportInteraction; + + const AZ::EntityId currentEntityId = AZ::EntityId(12345); + AZ::EntityId hoveredEntityEntityId; + + AzToolsFramework::HandleAccentsContext handleAccentsContext; + handleAccentsContext.m_ctrlHeld = false; + handleAccentsContext.m_hasSelectedEntities = true; + handleAccentsContext.m_usingBoxSelect = false; + handleAccentsContext.m_usingStickySelect = false; + + bool currentEntityIdAccentAdded = false; + AzToolsFramework::HandleAccents( + currentEntityId, hoveredEntityEntityId, handleAccentsContext, azvi::MouseButtonsFromButton(azvi::MouseButton::None), + [¤tEntityIdAccentAdded, currentEntityId](const AZ::EntityId entityId, const bool accent) + { + if (entityId == currentEntityId && accent) + { + currentEntityIdAccentAdded = true; + } + }); + + using ::testing::Eq; + using ::testing::IsTrue; + EXPECT_THAT(currentEntityId, Eq(hoveredEntityEntityId)); + EXPECT_THAT(currentEntityIdAccentAdded, IsTrue()); + } + + TEST(HandleAccents, CurrentValidEntityIdDoesNotBecomeHoveredWithSelectionUnstickySelectAndInvalidButton) + { + namespace azvi = AzToolsFramework::ViewportInteraction; + + const AZ::EntityId currentEntityId = AZ::EntityId(12345); + AZ::EntityId hoveredEntityEntityId = AZ::EntityId(54321); + + AzToolsFramework::HandleAccentsContext handleAccentsContext; + handleAccentsContext.m_ctrlHeld = false; + handleAccentsContext.m_hasSelectedEntities = false; + handleAccentsContext.m_usingBoxSelect = false; + handleAccentsContext.m_usingStickySelect = false; + + bool hoveredEntityIdAccentRemoved = false; + AzToolsFramework::HandleAccents( + currentEntityId, hoveredEntityEntityId, handleAccentsContext, azvi::MouseButtonsFromButton(azvi::MouseButton::Middle), + [&hoveredEntityIdAccentRemoved, hoveredEntityEntityId](const AZ::EntityId entityId, const bool accent) + { + if (entityId == hoveredEntityEntityId && !accent) + { + hoveredEntityIdAccentRemoved = true; + } + }); + + using ::testing::Eq; + using ::testing::IsFalse; + using ::testing::IsTrue; + EXPECT_THAT(hoveredEntityEntityId.IsValid(), IsFalse()); + EXPECT_THAT(hoveredEntityIdAccentRemoved, IsTrue()); + } + + TEST(HandleAccents, CurrentValidEntityIdDoesNotBecomeHoveredWithSelectionUnstickySelectAndDoingBoxSelect) + { + namespace azvi = AzToolsFramework::ViewportInteraction; + + const AZ::EntityId currentEntityId = AZ::EntityId(12345); + AZ::EntityId hoveredEntityEntityId = AZ::EntityId(54321); + + AzToolsFramework::HandleAccentsContext handleAccentsContext; + handleAccentsContext.m_ctrlHeld = false; + handleAccentsContext.m_hasSelectedEntities = false; + handleAccentsContext.m_usingBoxSelect = true; + handleAccentsContext.m_usingStickySelect = false; + + bool hoveredEntityIdAccentRemoved = false; + AzToolsFramework::HandleAccents( + currentEntityId, hoveredEntityEntityId, handleAccentsContext, azvi::MouseButtonsFromButton(azvi::MouseButton::None), + [&hoveredEntityIdAccentRemoved, hoveredEntityEntityId](const AZ::EntityId entityId, const bool accent) + { + if (entityId == hoveredEntityEntityId && !accent) + { + hoveredEntityIdAccentRemoved = true; + } + }); + + using ::testing::Eq; + using ::testing::IsFalse; + using ::testing::IsTrue; + EXPECT_THAT(hoveredEntityEntityId.IsValid(), IsFalse()); + EXPECT_THAT(hoveredEntityIdAccentRemoved, IsTrue()); + } + + // mimics the mouse moving off of hovered entity onto a new entity with sticky select enabled + TEST(HandleAccents, CurrentValidEntityIdDoesNotBecomeHoveredWithSelectionAndStickySelect) + { + namespace azvi = AzToolsFramework::ViewportInteraction; + + const AZ::EntityId currentEntityId = AZ::EntityId(12345); + AZ::EntityId hoveredEntityEntityId = AZ::EntityId(54321); + + AzToolsFramework::HandleAccentsContext handleAccentsContext; + handleAccentsContext.m_ctrlHeld = false; + handleAccentsContext.m_hasSelectedEntities = true; + handleAccentsContext.m_usingBoxSelect = false; + handleAccentsContext.m_usingStickySelect = true; + + bool hoveredEntityIdAccentRemoved = false; + AzToolsFramework::HandleAccents( + currentEntityId, hoveredEntityEntityId, handleAccentsContext, azvi::MouseButtonsFromButton(azvi::MouseButton::None), + [&hoveredEntityIdAccentRemoved, hoveredEntityEntityId](const AZ::EntityId entityId, const bool accent) + { + if (entityId == hoveredEntityEntityId && !accent) + { + hoveredEntityIdAccentRemoved = true; + } + }); + + using ::testing::Eq; + using ::testing::IsFalse; + using ::testing::IsTrue; + EXPECT_THAT(hoveredEntityIdAccentRemoved, IsTrue()); + EXPECT_THAT(hoveredEntityEntityId.IsValid(), IsFalse()); + } + + TEST(HandleAccents, CurrentValidEntityIdDoesBecomeHoveredWithSelectionAndStickySelectAndCtrl) + { + namespace azvi = AzToolsFramework::ViewportInteraction; + + const AZ::EntityId currentEntityId = AZ::EntityId(12345); + AZ::EntityId hoveredEntityEntityId = AZ::EntityId(54321); + + AzToolsFramework::HandleAccentsContext handleAccentsContext; + handleAccentsContext.m_ctrlHeld = true; + handleAccentsContext.m_hasSelectedEntities = true; + handleAccentsContext.m_usingBoxSelect = false; + handleAccentsContext.m_usingStickySelect = true; + + bool currentEntityIdAccentAdded = false; + bool hoveredEntityIdAccentRemoved = false; + AzToolsFramework::HandleAccents( + currentEntityId, hoveredEntityEntityId, handleAccentsContext, azvi::MouseButtonsFromButton(azvi::MouseButton::None), + [&hoveredEntityIdAccentRemoved, ¤tEntityIdAccentAdded, currentEntityId, + hoveredEntityEntityId](const AZ::EntityId entityId, const bool accent) + { + if (entityId == currentEntityId && accent) + { + currentEntityIdAccentAdded = true; + } + + if (entityId == hoveredEntityEntityId && !accent) + { + hoveredEntityIdAccentRemoved = true; + } + }); + + using ::testing::Eq; + using ::testing::IsFalse; + using ::testing::IsTrue; + EXPECT_THAT(currentEntityIdAccentAdded, IsTrue()); + EXPECT_THAT(hoveredEntityIdAccentRemoved, IsTrue()); + EXPECT_THAT(hoveredEntityEntityId, Eq(AZ::EntityId(12345))); + } } // namespace UnitTest From 39ba06b84ed5c93c6a2c3a4dff2f3d3b4c214a6c Mon Sep 17 00:00:00 2001 From: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com> Date: Tue, 23 Nov 2021 09:21:27 -0600 Subject: [PATCH 215/345] misc small terrain bugfixes (#5834) * Removed "chatty" profile markers. These three markers were making terrain refreshes take ~200% longer in profile builds. Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com> * Terrain surface data wasn't updating its AABB correctly. The code was making an invalid assumption that changes to the world bounds would result in an invalid dirtyRegion. It actually gets a valid region encapsulating the old and new bounds. The fix is an additional check to see if the terrain bounds changed. Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com> * Addressed previous PR feedback that terrainSystem ought to be a local variable in each test. Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com> --- .../Components/GradientTransformComponent.cpp | 2 - .../Components/ImageGradientComponent.cpp | 2 - .../GradientSignal/Code/Source/ImageAsset.cpp | 2 - .../TerrainSurfaceDataSystemComponent.cpp | 8 +- Gems/Terrain/Code/Tests/TerrainSystemTest.cpp | 73 +++++++++---------- 5 files changed, 40 insertions(+), 47 deletions(-) diff --git a/Gems/GradientSignal/Code/Source/Components/GradientTransformComponent.cpp b/Gems/GradientSignal/Code/Source/Components/GradientTransformComponent.cpp index 38936dc302..57de6f776a 100644 --- a/Gems/GradientSignal/Code/Source/Components/GradientTransformComponent.cpp +++ b/Gems/GradientSignal/Code/Source/Components/GradientTransformComponent.cpp @@ -324,8 +324,6 @@ namespace GradientSignal void GradientTransformComponent::TransformPositionToUVW(const AZ::Vector3& inPosition, AZ::Vector3& outUVW, const bool shouldNormalizeOutput, bool& wasPointRejected) const { - AZ_PROFILE_FUNCTION(Entity); - AZStd::lock_guard lock(m_cacheMutex); //transforming coordinate into "local" relative space of shape bounds diff --git a/Gems/GradientSignal/Code/Source/Components/ImageGradientComponent.cpp b/Gems/GradientSignal/Code/Source/Components/ImageGradientComponent.cpp index 6fe8d32484..021e083ea6 100644 --- a/Gems/GradientSignal/Code/Source/Components/ImageGradientComponent.cpp +++ b/Gems/GradientSignal/Code/Source/Components/ImageGradientComponent.cpp @@ -191,8 +191,6 @@ namespace GradientSignal float ImageGradientComponent::GetValue(const GradientSampleParams& sampleParams) const { - AZ_PROFILE_FUNCTION(Entity); - AZ::Vector3 uvw = sampleParams.m_position; bool wasPointRejected = false; diff --git a/Gems/GradientSignal/Code/Source/ImageAsset.cpp b/Gems/GradientSignal/Code/Source/ImageAsset.cpp index c67f86c6b8..7e73dc32d6 100644 --- a/Gems/GradientSignal/Code/Source/ImageAsset.cpp +++ b/Gems/GradientSignal/Code/Source/ImageAsset.cpp @@ -153,8 +153,6 @@ namespace GradientSignal float GetValueFromImageAsset(const AZ::Data::Asset& imageAsset, const AZ::Vector3& uvw, float tilingX, float tilingY, float defaultValue) { - AZ_PROFILE_FUNCTION(Entity); - if (imageAsset.IsReady()) { const auto& image = imageAsset.Get(); diff --git a/Gems/Terrain/Code/Source/Components/TerrainSurfaceDataSystemComponent.cpp b/Gems/Terrain/Code/Source/Components/TerrainSurfaceDataSystemComponent.cpp index 7395e66d06..65e8600d62 100644 --- a/Gems/Terrain/Code/Source/Components/TerrainSurfaceDataSystemComponent.cpp +++ b/Gems/Terrain/Code/Source/Components/TerrainSurfaceDataSystemComponent.cpp @@ -214,10 +214,10 @@ namespace Terrain { AZ_Assert((m_providerHandle != SurfaceData::InvalidSurfaceDataRegistryHandle), "Invalid surface data handle"); - // Our terrain was valid before and after, it just changed in some way. If we have a valid dirty region passed in - // then it's possible that the heightmap has been modified in the Editor. Otherwise, just notify that the entire - // terrain has changed in some way. - if (dirtyRegion.IsValid()) + // Our terrain was valid before and after, it just changed in some way. If we have a valid dirty region, and the terrain + // bounds themselves haven't changed, just notify that our terrain data has changed within the bounds. Otherwise, notify + // that the entire terrain provider needs to be updated, since it either has new bounds or the entire set of data is dirty. + if (dirtyRegion.IsValid() && m_terrainBounds.IsClose(terrainBoundsBeforeUpdate)) { SurfaceData::SurfaceDataSystemRequestBus::Broadcast( &SurfaceData::SurfaceDataSystemRequestBus::Events::RefreshSurfaceData, dirtyRegion); diff --git a/Gems/Terrain/Code/Tests/TerrainSystemTest.cpp b/Gems/Terrain/Code/Tests/TerrainSystemTest.cpp index 4d149e8527..c2f8c2620c 100644 --- a/Gems/Terrain/Code/Tests/TerrainSystemTest.cpp +++ b/Gems/Terrain/Code/Tests/TerrainSystemTest.cpp @@ -41,7 +41,6 @@ namespace UnitTest }; AZ::ComponentApplication m_app; - AZStd::unique_ptr m_terrainSystem; AZStd::unique_ptr> m_boxShapeRequests; AZStd::unique_ptr> m_shapeRequests; @@ -59,7 +58,6 @@ namespace UnitTest void TearDown() override { - m_terrainSystem.reset(); m_boxShapeRequests.reset(); m_shapeRequests.reset(); m_terrainAreaHeightRequests.reset(); @@ -96,16 +94,17 @@ namespace UnitTest // Create a terrain system with reasonable defaults for testing, but with the ability to override the defaults // on a test-by-test basis. - void CreateAndActivateTerrainSystem( + AZStd::unique_ptr CreateAndActivateTerrainSystem( AZ::Vector2 queryResolution = AZ::Vector2(1.0f), AZ::Aabb worldBounds = AZ::Aabb::CreateFromMinMax(AZ::Vector3(-128.0f), AZ::Vector3(128.0f))) { // Create the terrain system and give it one tick to fully initialize itself. - m_terrainSystem = AZStd::make_unique(); - m_terrainSystem->SetTerrainAabb(worldBounds); - m_terrainSystem->SetTerrainHeightQueryResolution(queryResolution); - m_terrainSystem->Activate(); + auto terrainSystem = AZStd::make_unique(); + terrainSystem->SetTerrainAabb(worldBounds); + terrainSystem->SetTerrainHeightQueryResolution(queryResolution); + terrainSystem->Activate(); AZ::TickBus::Broadcast(&AZ::TickBus::Events::OnTick, 0.f, AZ::ScriptTimePoint{}); + return terrainSystem; } AZStd::unique_ptr CreateAndActivateMockTerrainLayerSpawner( @@ -144,16 +143,16 @@ namespace UnitTest { // Trivially verify that the terrain system can successfully be constructed and destructed without errors. - m_terrainSystem = AZStd::make_unique(); + auto terrainSystem = AZStd::make_unique(); } TEST_F(TerrainSystemTest, TrivialActivateDeactivate) { // Verify that the terrain system can be activated and deactivated without errors. - m_terrainSystem = AZStd::make_unique(); - m_terrainSystem->Activate(); - m_terrainSystem->Deactivate(); + auto terrainSystem = AZStd::make_unique(); + terrainSystem->Activate(); + terrainSystem->Deactivate(); } TEST_F(TerrainSystemTest, CreateEventsCalledOnActivation) @@ -164,8 +163,8 @@ namespace UnitTest EXPECT_CALL(mockTerrainListener, OnTerrainDataCreateBegin()).Times(AtLeast(1)); EXPECT_CALL(mockTerrainListener, OnTerrainDataCreateEnd()).Times(AtLeast(1)); - m_terrainSystem = AZStd::make_unique(); - m_terrainSystem->Activate(); + auto terrainSystem = AZStd::make_unique(); + terrainSystem->Activate(); } TEST_F(TerrainSystemTest, DestroyEventsCalledOnDeactivation) @@ -176,9 +175,9 @@ namespace UnitTest EXPECT_CALL(mockTerrainListener, OnTerrainDataDestroyBegin()).Times(AtLeast(1)); EXPECT_CALL(mockTerrainListener, OnTerrainDataDestroyEnd()).Times(AtLeast(1)); - m_terrainSystem = AZStd::make_unique(); - m_terrainSystem->Activate(); - m_terrainSystem->Deactivate(); + auto terrainSystem = AZStd::make_unique(); + terrainSystem->Activate(); + terrainSystem->Deactivate(); } TEST_F(TerrainSystemTest, TerrainDoesNotExistWhenNoTerrainLayerSpawnersAreRegistered) @@ -190,9 +189,9 @@ namespace UnitTest // a normal facing up the Z axis. // Create and activate the terrain system with our testing defaults for world bounds and query resolution. - CreateAndActivateTerrainSystem(); + auto terrainSystem = CreateAndActivateTerrainSystem(); - AZ::Aabb worldBounds = m_terrainSystem->GetTerrainAabb(); + AZ::Aabb worldBounds = terrainSystem->GetTerrainAabb(); // Loop through several points within the world bounds, including on the edges, and verify that they all return false for // terrainExists with default heights and normals. @@ -203,17 +202,17 @@ namespace UnitTest AZ::Vector3 position(x, y, 0.0f); bool terrainExists = true; float height = - m_terrainSystem->GetHeight(position, AzFramework::Terrain::TerrainDataRequests::Sampler::EXACT, &terrainExists); + terrainSystem->GetHeight(position, AzFramework::Terrain::TerrainDataRequests::Sampler::EXACT, &terrainExists); EXPECT_FALSE(terrainExists); EXPECT_FLOAT_EQ(height, worldBounds.GetMin().GetZ()); terrainExists = true; AZ::Vector3 normal = - m_terrainSystem->GetNormal(position, AzFramework::Terrain::TerrainDataRequests::Sampler::EXACT, &terrainExists); + terrainSystem->GetNormal(position, AzFramework::Terrain::TerrainDataRequests::Sampler::EXACT, &terrainExists); EXPECT_FALSE(terrainExists); EXPECT_EQ(normal, AZ::Vector3::CreateAxisZ()); - bool isHole = m_terrainSystem->GetIsHoleFromFloats( + bool isHole = terrainSystem->GetIsHoleFromFloats( position.GetX(), position.GetY(), AzFramework::Terrain::TerrainDataRequests::Sampler::EXACT); EXPECT_TRUE(isHole); } @@ -242,7 +241,7 @@ namespace UnitTest // Verify that terrain exists within the layer spawner bounds, and doesn't exist outside of it. // Create and activate the terrain system with our testing defaults for world bounds and query resolution. - CreateAndActivateTerrainSystem(); + auto terrainSystem = CreateAndActivateTerrainSystem(); // Create a box that's twice as big as the layer spawner box. Loop through it and verify that points within the layer box contain // terrain and the expected height & normal values, and points outside the layer box don't contain terrain. @@ -255,9 +254,9 @@ namespace UnitTest { AZ::Vector3 position(x, y, 0.0f); bool heightQueryTerrainExists = false; - float height = m_terrainSystem->GetHeight( + float height = terrainSystem->GetHeight( position, AzFramework::Terrain::TerrainDataRequests::Sampler::EXACT, &heightQueryTerrainExists); - bool isHole = m_terrainSystem->GetIsHoleFromFloats( + bool isHole = terrainSystem->GetIsHoleFromFloats( position.GetX(), position.GetY(), AzFramework::Terrain::TerrainDataRequests::Sampler::EXACT); if (spawnerBox.Contains(AZ::Vector3(position.GetX(), position.GetY(), spawnerBox.GetMin().GetZ()))) @@ -297,7 +296,7 @@ namespace UnitTest // Create and activate the terrain system with our testing defaults for world bounds, and a query resolution that exactly matches // the frequency of our sine wave. If our height queries rely on the query resolution, we should always get a value of 0. const AZ::Vector2 queryResolution(frequencyMeters); - CreateAndActivateTerrainSystem(queryResolution); + auto terrainSystem = CreateAndActivateTerrainSystem(queryResolution); // Test an arbitrary set of points that should all produce non-zero heights with the EXACT sampler. They're not aligned with the // query resolution, or with the 0 points on the sine wave. @@ -307,7 +306,7 @@ namespace UnitTest AZ::Vector3 position(nonZeroPoint.GetX(), nonZeroPoint.GetY(), 0.0f); bool heightQueryTerrainExists = false; float height = - m_terrainSystem->GetHeight(position, AzFramework::Terrain::TerrainDataRequests::Sampler::EXACT, &heightQueryTerrainExists); + terrainSystem->GetHeight(position, AzFramework::Terrain::TerrainDataRequests::Sampler::EXACT, &heightQueryTerrainExists); // We've chosen a bunch of places on the sine wave that should return a non-zero positive or negative value. constexpr float epsilon = 0.0001f; @@ -322,7 +321,7 @@ namespace UnitTest AZ::Vector3 position(zeroPoint.GetX(), zeroPoint.GetY(), 0.0f); bool heightQueryTerrainExists = false; float height = - m_terrainSystem->GetHeight(position, AzFramework::Terrain::TerrainDataRequests::Sampler::EXACT, &heightQueryTerrainExists); + terrainSystem->GetHeight(position, AzFramework::Terrain::TerrainDataRequests::Sampler::EXACT, &heightQueryTerrainExists); constexpr float epsilon = 0.0001f; EXPECT_NEAR(height, 0.0f, epsilon); @@ -348,7 +347,7 @@ namespace UnitTest // Create and activate the terrain system with our testing defaults for world bounds, and a query resolution at 0.25 meter // intervals. const AZ::Vector2 queryResolution(0.25f); - CreateAndActivateTerrainSystem(queryResolution); + auto terrainSystem = CreateAndActivateTerrainSystem(queryResolution); // Test some points and verify that the results always go "downward", whether they're in positive or negative space. // (Z contains the the expected result for convenience). @@ -371,7 +370,7 @@ namespace UnitTest AZ::Vector3 position(testPoint.m_testLocation.GetX(), testPoint.m_testLocation.GetY(), 0.0f); bool heightQueryTerrainExists = false; float height = - m_terrainSystem->GetHeight(position, AzFramework::Terrain::TerrainDataRequests::Sampler::CLAMP, &heightQueryTerrainExists); + terrainSystem->GetHeight(position, AzFramework::Terrain::TerrainDataRequests::Sampler::CLAMP, &heightQueryTerrainExists); constexpr float epsilon = 0.0001f; EXPECT_NEAR(height, expectedHeight, epsilon); @@ -410,7 +409,7 @@ namespace UnitTest // Create and activate the terrain system with our testing defaults for world bounds, and a query resolution at 1 meter intervals. const AZ::Vector2 queryResolution(frequencyMeters); - CreateAndActivateTerrainSystem(queryResolution); + auto terrainSystem = CreateAndActivateTerrainSystem(queryResolution); // Test some points and verify that the results are the expected bilinear filtered result, // whether they're in positive or negative space. @@ -466,7 +465,7 @@ namespace UnitTest AZ::Vector3 position(testPoint.m_testLocation.GetX(), testPoint.m_testLocation.GetY(), 0.0f); bool heightQueryTerrainExists = false; - float height = m_terrainSystem->GetHeight( + float height = terrainSystem->GetHeight( position, AzFramework::Terrain::TerrainDataRequests::Sampler::BILINEAR, &heightQueryTerrainExists); // Verify that our height query returned the bilinear filtered result we expect. @@ -479,7 +478,7 @@ namespace UnitTest { // When there is more than one surface/weight defined, they should all be returned in descending weight order. - CreateAndActivateTerrainSystem(); + auto terrainSystem = CreateAndActivateTerrainSystem(); const AZ::Aabb aabb = AZ::Aabb::CreateFromMinMax(AZ::Vector3::CreateZero(), AZ::Vector3::CreateOne()); auto entity = CreateAndActivateMockTerrainLayerSpawner( @@ -508,11 +507,11 @@ namespace UnitTest AzFramework::SurfaceData::SurfaceTagWeightList outSurfaceWeights; // Asking for values outside the layer spawner bounds, should result in no results. - m_terrainSystem->GetSurfaceWeights(aabb.GetMax() + AZ::Vector3::CreateOne(), outSurfaceWeights); + terrainSystem->GetSurfaceWeights(aabb.GetMax() + AZ::Vector3::CreateOne(), outSurfaceWeights); EXPECT_TRUE(outSurfaceWeights.empty()); // Inside the layer spawner box should give us all of the added surface weights. - m_terrainSystem->GetSurfaceWeights(aabb.GetCenter(), outSurfaceWeights); + terrainSystem->GetSurfaceWeights(aabb.GetCenter(), outSurfaceWeights); EXPECT_EQ(outSurfaceWeights.size(), 3); @@ -531,7 +530,7 @@ namespace UnitTest TEST_F(TerrainSystemTest, GetMaxSurfaceWeightsReturnsBiggestValidSurfaceWeight) { - CreateAndActivateTerrainSystem(); + auto terrainSystem = CreateAndActivateTerrainSystem(); const AZ::Aabb aabb = AZ::Aabb::CreateFromMinMax(AZ::Vector3::CreateZero(), AZ::Vector3::CreateOne()); auto entity = CreateAndActivateMockTerrainLayerSpawner( @@ -562,12 +561,12 @@ namespace UnitTest // Asking for values outside the layer spawner bounds, should result in an invalid result. AzFramework::SurfaceData::SurfaceTagWeight tagWeight = - m_terrainSystem->GetMaxSurfaceWeight(aabb.GetMax() + AZ::Vector3::CreateOne()); + terrainSystem->GetMaxSurfaceWeight(aabb.GetMax() + AZ::Vector3::CreateOne()); EXPECT_EQ(tagWeight.m_surfaceType, AZ::Crc32(AzFramework::SurfaceData::Constants::s_unassignedTagName)); // Inside the layer spawner box should give us the highest weighted tag (tag1). - tagWeight = m_terrainSystem->GetMaxSurfaceWeight(aabb.GetCenter()); + tagWeight = terrainSystem->GetMaxSurfaceWeight(aabb.GetCenter()); EXPECT_EQ(tagWeight.m_surfaceType, tagWeight1.m_surfaceType); EXPECT_NEAR(tagWeight.m_weight, tagWeight1.m_weight, 0.01f); From 2da3ab42fdc8c5b9a6c2fd6e5e8669d80ca4361a Mon Sep 17 00:00:00 2001 From: lsemp3d <58790905+lsemp3d@users.noreply.github.com> Date: Tue, 23 Nov 2021 08:50:41 -0800 Subject: [PATCH 216/345] Renamed 'key' to 'base' to avoid future problems with secrets patterns, cleanup and improvements Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com> --- .../Nodes/General/GeneralNodeTitleComponent.h | 1 - Gems/GraphCanvas/Code/Source/GraphCanvas.cpp | 1 - .../Source/Translation/TranslationAsset.h | 14 +-- .../Translation/TranslationSerializer.cpp | 28 ++--- .../Translation/TranslationSerializer.h | 13 ++ .../Code/Source/Widgets/GraphCanvasLabel.h | 1 - .../GraphCanvas/Components/Nodes/NodeBus.h | 1 - .../Components/Nodes/NodeTitleBus.h | 1 - .../GraphCanvas/Components/Slots/SlotBus.h | 1 - .../GraphCanvas/Types/TranslationTypes.h | 116 ------------------ .../Code/graphcanvas_staticlib_files.cmake | 3 +- .../Classes/MaterialComponentConfig.names | 8 +- .../AuthenticationProviderRequestBus.names | 2 +- .../Code/Editor/Nodes/NodeDisplayUtils.cpp | 4 +- .../Editor/Translation/TranslationHelper.h | 1 - .../DataTypePalette/DataTypePaletteModel.cpp | 1 - .../UnitTestPanel/UnitTestTreeView.cpp | 1 - .../VariablePaletteTableView.cpp | 1 - .../Code/Tools/TranslationGeneration.cpp | 19 +-- ...rReferenceExample.ScriptCanvasNodeable.xml | 20 ++- .../Code/Source/ScriptCanvasTestBus.cpp | 9 +- 21 files changed, 74 insertions(+), 172 deletions(-) delete mode 100644 Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Types/TranslationTypes.h diff --git a/Gems/GraphCanvas/Code/Source/Components/Nodes/General/GeneralNodeTitleComponent.h b/Gems/GraphCanvas/Code/Source/Components/Nodes/General/GeneralNodeTitleComponent.h index 84963c7997..ce8ea4c8a9 100644 --- a/Gems/GraphCanvas/Code/Source/Components/Nodes/General/GeneralNodeTitleComponent.h +++ b/Gems/GraphCanvas/Code/Source/Components/Nodes/General/GeneralNodeTitleComponent.h @@ -19,7 +19,6 @@ #include #include #include -#include #include namespace GraphCanvas diff --git a/Gems/GraphCanvas/Code/Source/GraphCanvas.cpp b/Gems/GraphCanvas/Code/Source/GraphCanvas.cpp index 8b5b166bb2..dfcb106777 100644 --- a/Gems/GraphCanvas/Code/Source/GraphCanvas.cpp +++ b/Gems/GraphCanvas/Code/Source/GraphCanvas.cpp @@ -58,7 +58,6 @@ #include #include -#include #include #include diff --git a/Gems/GraphCanvas/Code/Source/Translation/TranslationAsset.h b/Gems/GraphCanvas/Code/Source/Translation/TranslationAsset.h index 653aac3afc..b31bf25851 100644 --- a/Gems/GraphCanvas/Code/Source/Translation/TranslationAsset.h +++ b/Gems/GraphCanvas/Code/Source/Translation/TranslationAsset.h @@ -59,14 +59,14 @@ namespace GraphCanvas //! //! Requirements: //! - Must have a top level array called "entries" - //! - Must provide a "key" element for any entry added + //! - Must provide a "base" element for any entry added //! //! Example: //! //! { //! "entries": [ //! { - //! "key": "Globals", + //! "base": "Globals", //! "details": { //! "name": "My Name", //! "tooltip": "My Tooltip" @@ -90,21 +90,21 @@ namespace GraphCanvas //! Globals.details.somearray.0.name //! Globals.details.somearray.1.name //! - //! There is one important aspect however, if an element in an array has a "key" value, the value of this key + //! There is one important aspect however, if an element in an array has a "base" value, the value of this key //! will replace the index. This is useful when the index and/or ordering of an entry is not relevant or may //! change. //! //! "somearray": [ { //! "name": "First one" - //! "key": "a_key" + //! "base": "a_key" //! }, { //! "name": "Second one", - //! "key": "b_key" + //! "base": "b_key" //! } ] //! - //! Globals.details.somearray.0.key == "a_key" + //! Globals.details.somearray.0.base == "a_key" //! Globals.details.somearray.0.name == "First one" - //! Globals.details.somearray.1.key == "b_key" + //! Globals.details.somearray.1.base == "b_key" //! Globals.details.somearray.1.name == "Second one" //! class TranslationAssetHandler diff --git a/Gems/GraphCanvas/Code/Source/Translation/TranslationSerializer.cpp b/Gems/GraphCanvas/Code/Source/Translation/TranslationSerializer.cpp index bb42f77c49..1f76b53b27 100644 --- a/Gems/GraphCanvas/Code/Source/Translation/TranslationSerializer.cpp +++ b/Gems/GraphCanvas/Code/Source/Translation/TranslationSerializer.cpp @@ -11,17 +11,6 @@ namespace GraphCanvas { - namespace Schema - { - namespace Field - { - static constexpr char key[] = "key"; - static constexpr char context[] = "context"; - static constexpr char variant[] = "variant"; - static constexpr char entries[] = "entries"; - } - } - AZ_CLASS_ALLOCATOR_IMPL(TranslationFormatSerializer, AZ::SystemAllocator, 0); void AddEntryToDatabase(const AZStd::string& baseKey, const AZStd::string& name, const rapidjson::Value& it, TranslationFormat* translationFormat) @@ -76,11 +65,15 @@ namespace GraphCanvas const rapidjson::Value& array = it; for (rapidjson::SizeType i = 0; i < array.Size(); ++i) { - // so, here, I need to go in and if there is a "key" member within the object, then I need to use that, - // if there isn't, I can use the %d + // if there is a "base" member within the object, then use it, otherwise use the index if (array[i].IsObject()) { - if (array[i].HasMember(Schema::Field::key)) + if (array[i].HasMember(Schema::Field::deprecated_key)) + { + AZStd::string innerKey = array[i].FindMember(Schema::Field::deprecated_key)->value.GetString(); + itemKey.append(AZStd::string::format(".%s", innerKey.c_str())); + } + else if (array[i].HasMember(Schema::Field::key)) { AZStd::string innerKey = array[i].FindMember(Schema::Field::key)->value.GetString(); itemKey.append(AZStd::string::format(".%s", innerKey.c_str())); @@ -133,7 +126,12 @@ namespace GraphCanvas AZStd::string keyStr; rapidjson::Value::ConstMemberIterator keyValue; - if (entry.HasMember(Schema::Field::key)) + if (entry.HasMember(Schema::Field::deprecated_key)) + { + keyValue = entry.FindMember(Schema::Field::deprecated_key); + keyStr = keyValue->value.GetString(); + } + else if (entry.HasMember(Schema::Field::key)) { keyValue = entry.FindMember(Schema::Field::key); keyStr = keyValue->value.GetString(); diff --git a/Gems/GraphCanvas/Code/Source/Translation/TranslationSerializer.h b/Gems/GraphCanvas/Code/Source/Translation/TranslationSerializer.h index fa7e6e64e1..605e06a76b 100644 --- a/Gems/GraphCanvas/Code/Source/Translation/TranslationSerializer.h +++ b/Gems/GraphCanvas/Code/Source/Translation/TranslationSerializer.h @@ -23,4 +23,17 @@ namespace GraphCanvas AZ::JsonSerializationResult::Result Store(rapidjson::Value& outputValue, const void* inputValue, const void* defaultValue, const AZ::Uuid& valueTypeId, AZ::JsonSerializerContext& context) override; }; + + namespace Schema + { + namespace Field + { + // Moved away from "key" due to some strict filtering on secrets + static constexpr char deprecated_key[] = "key"; + static constexpr char key[] = "base"; + static constexpr char context[] = "context"; + static constexpr char variant[] = "variant"; + static constexpr char entries[] = "entries"; + } + } } diff --git a/Gems/GraphCanvas/Code/Source/Widgets/GraphCanvasLabel.h b/Gems/GraphCanvas/Code/Source/Widgets/GraphCanvasLabel.h index 4e52218721..3fbd934909 100644 --- a/Gems/GraphCanvas/Code/Source/Widgets/GraphCanvasLabel.h +++ b/Gems/GraphCanvas/Code/Source/Widgets/GraphCanvasLabel.h @@ -16,7 +16,6 @@ AZ_PUSH_DISABLE_WARNING(4251 4800, "-Wunknown-warning-option") AZ_POP_DISABLE_WARNING #include -#include namespace GraphCanvas { diff --git a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/Nodes/NodeBus.h b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/Nodes/NodeBus.h index 513400b470..d5b8a7ff57 100644 --- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/Nodes/NodeBus.h +++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/Nodes/NodeBus.h @@ -15,7 +15,6 @@ #include #include #include -#include #include diff --git a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/Nodes/NodeTitleBus.h b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/Nodes/NodeTitleBus.h index 88846739d0..6470ebfbd1 100644 --- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/Nodes/NodeTitleBus.h +++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/Nodes/NodeTitleBus.h @@ -11,7 +11,6 @@ #include #include -#include #include #include diff --git a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/Slots/SlotBus.h b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/Slots/SlotBus.h index a3f8bfb757..8df36232fe 100644 --- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/Slots/SlotBus.h +++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/Slots/SlotBus.h @@ -16,7 +16,6 @@ #include #include -#include class QGraphicsLayoutItem; diff --git a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Types/TranslationTypes.h b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Types/TranslationTypes.h deleted file mode 100644 index 7205be7c00..0000000000 --- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Types/TranslationTypes.h +++ /dev/null @@ -1,116 +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 - -#include - -namespace GraphCanvas -{ - struct TranslationKeyedString - { - public: - AZ_TYPE_INFO(TranslationKeyedString, "{B796685C-0335-4E74-9EF8-A1933E8B2142}"); - AZ_CLASS_ALLOCATOR(TranslationKeyedString, AZ::SystemAllocator, 0); - - static void Reflect(AZ::ReflectContext* context) - { - AZ::SerializeContext* serializeContext = azrtti_cast(context); - if (!serializeContext) - { - return; - } - - serializeContext->Class() - ->Version(1) - ->Field("Fallback", &TranslationKeyedString::m_fallback) - ->Field("Context", &TranslationKeyedString::m_context) - ->Field("Key", &TranslationKeyedString::m_key) - ; - } - - TranslationKeyedString() - : m_dirtyText(true) - { - } - - ~TranslationKeyedString() = default; - - TranslationKeyedString(const AZStd::string& fallback, const AZStd::string& context = AZStd::string(), const AZStd::string& key = AZStd::string()) - : m_fallback(fallback) - , m_context(context) - , m_key(key) - , m_dirtyText(true) - { - } - - const AZStd::string GetDisplayString() const - { - if (m_dirtyText) - { - const_cast(this)->TranslateString(); - } - - return m_display; - } - - void TranslateString() - { - m_display = m_fallback; - - if (!m_context.empty() && !m_key.empty()) - { - AZStd::string translatedText = QCoreApplication::translate(m_context.c_str(), m_key.c_str()).toUtf8().data(); - - if (translatedText != m_key) - { - m_display = translatedText; - } - } - - m_dirtyText = false; - } - - bool empty() const - { - return m_fallback.empty() && (m_context.empty() || m_key.empty()); - } - - bool operator==(const TranslationKeyedString& other) const - { - return m_fallback == other.m_fallback - && m_context == other.m_context - && m_key == other.m_key - ; - } - - void Clear() - { - m_key.clear(); - m_context.clear(); - m_fallback.clear(); - } - - void SetFallback(const AZStd::string& fallback) - { - m_fallback = fallback; - m_dirtyText = true; - } - - AZStd::string m_context; - AZStd::string m_key; - AZStd::string m_display; - - private: - AZStd::string m_fallback; - - bool m_dirtyText; - }; -} diff --git a/Gems/GraphCanvas/Code/graphcanvas_staticlib_files.cmake b/Gems/GraphCanvas/Code/graphcanvas_staticlib_files.cmake index b62ff303a6..455b5673d3 100644 --- a/Gems/GraphCanvas/Code/graphcanvas_staticlib_files.cmake +++ b/Gems/GraphCanvas/Code/graphcanvas_staticlib_files.cmake @@ -102,8 +102,7 @@ set(FILES StaticLib/GraphCanvas/Types/GraphCanvasGraphData.h StaticLib/GraphCanvas/Types/GraphCanvasGraphSerialization.cpp StaticLib/GraphCanvas/Types/GraphCanvasGraphSerialization.h - StaticLib/GraphCanvas/Types/SceneMemberComponentSaveData.h - StaticLib/GraphCanvas/Types/TranslationTypes.h + StaticLib/GraphCanvas/Types/SceneMemberComponentSaveData.h StaticLib/GraphCanvas/Types/Types.h StaticLib/GraphCanvas/Types/QtMetaTypes.h StaticLib/GraphCanvas/Widgets/Resources/default_style.json diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MaterialComponentConfig.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MaterialComponentConfig.names index c5b1138e12..27edc76275 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MaterialComponentConfig.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MaterialComponentConfig.names @@ -12,7 +12,7 @@ { "key": "Getmaterials", "details": { - "name": "Getmaterials" + "name": "Get Materials" }, "params": [ { @@ -27,7 +27,7 @@ { "typeid": "{50F6716F-698B-5A6C-AACD-940597FDEC24}", "details": { - "name": "" + "name": "Material Assignment Map" } } ] @@ -35,7 +35,7 @@ { "key": "Setmaterials", "details": { - "name": "Setmaterials" + "name": "Set Materials" }, "params": [ { @@ -48,7 +48,7 @@ { "typeid": "{50F6716F-698B-5A6C-AACD-940597FDEC24}", "details": { - "name": "" + "name": "Material Assignment Map" } } ] diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AuthenticationProviderRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AuthenticationProviderRequestBus.names index 237d70340b..b9b48b88f6 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AuthenticationProviderRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AuthenticationProviderRequestBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "AuthenticationProviderRequestBus", + "base": "AuthenticationProviderRequestBus", "context": "EBusSender", "variant": "", "details": { diff --git a/Gems/ScriptCanvas/Code/Editor/Nodes/NodeDisplayUtils.cpp b/Gems/ScriptCanvas/Code/Editor/Nodes/NodeDisplayUtils.cpp index cba39afe81..26caa5fc2f 100644 --- a/Gems/ScriptCanvas/Code/Editor/Nodes/NodeDisplayUtils.cpp +++ b/Gems/ScriptCanvas/Code/Editor/Nodes/NodeDisplayUtils.cpp @@ -335,7 +335,7 @@ namespace ScriptCanvasEditor::Nodes AZStd::string updatedMethodName = methodName; if (isAccessor) { - if (methodNode->GetMethodType() == ScriptCanvas::MethodType::Getter) + if (methodNode->GetMethodType() == ScriptCanvas::MethodType::Getter || methodNode->GetMethodType() == ScriptCanvas::MethodType::Free) { updatedMethodName = "Get"; } @@ -351,7 +351,7 @@ namespace ScriptCanvasEditor::Nodes if (methodDetails.m_subtitle.empty()) { - methodDetails.m_subtitle = details.m_name; + methodDetails.m_subtitle = details.m_category; } // Add to the tooltip the C++ class for reference diff --git a/Gems/ScriptCanvas/Code/Editor/Translation/TranslationHelper.h b/Gems/ScriptCanvas/Code/Editor/Translation/TranslationHelper.h index 189b665647..bd37ab0e2f 100644 --- a/Gems/ScriptCanvas/Code/Editor/Translation/TranslationHelper.h +++ b/Gems/ScriptCanvas/Code/Editor/Translation/TranslationHelper.h @@ -14,7 +14,6 @@ #include #include -#include #include #include #include diff --git a/Gems/ScriptCanvas/Code/Editor/View/Widgets/DataTypePalette/DataTypePaletteModel.cpp b/Gems/ScriptCanvas/Code/Editor/View/Widgets/DataTypePalette/DataTypePaletteModel.cpp index 490fc1eb94..a31444921b 100644 --- a/Gems/ScriptCanvas/Code/Editor/View/Widgets/DataTypePalette/DataTypePaletteModel.cpp +++ b/Gems/ScriptCanvas/Code/Editor/View/Widgets/DataTypePalette/DataTypePaletteModel.cpp @@ -16,7 +16,6 @@ #include #include -#include #include #include diff --git a/Gems/ScriptCanvas/Code/Editor/View/Widgets/UnitTestPanel/UnitTestTreeView.cpp b/Gems/ScriptCanvas/Code/Editor/View/Widgets/UnitTestPanel/UnitTestTreeView.cpp index 00ce022cb5..2e9c5d1852 100644 --- a/Gems/ScriptCanvas/Code/Editor/View/Widgets/UnitTestPanel/UnitTestTreeView.cpp +++ b/Gems/ScriptCanvas/Code/Editor/View/Widgets/UnitTestPanel/UnitTestTreeView.cpp @@ -19,7 +19,6 @@ #include -#include #include #include diff --git a/Gems/ScriptCanvas/Code/Editor/View/Widgets/VariablePanel/VariablePaletteTableView.cpp b/Gems/ScriptCanvas/Code/Editor/View/Widgets/VariablePanel/VariablePaletteTableView.cpp index 56b0cb3e55..6fdf154d69 100644 --- a/Gems/ScriptCanvas/Code/Editor/View/Widgets/VariablePanel/VariablePaletteTableView.cpp +++ b/Gems/ScriptCanvas/Code/Editor/View/Widgets/VariablePanel/VariablePaletteTableView.cpp @@ -18,7 +18,6 @@ #include -#include #include #include diff --git a/Gems/ScriptCanvas/Code/Tools/TranslationGeneration.cpp b/Gems/ScriptCanvas/Code/Tools/TranslationGeneration.cpp index fdaca020b4..4fcc904752 100644 --- a/Gems/ScriptCanvas/Code/Tools/TranslationGeneration.cpp +++ b/Gems/ScriptCanvas/Code/Tools/TranslationGeneration.cpp @@ -33,6 +33,7 @@ #include #include +#include namespace ScriptCanvasEditorTools { @@ -848,8 +849,9 @@ namespace ScriptCanvasEditorTools Helpers::GetTypeNameAndDescription(parameter->m_typeId, argumentName, argumentDescription); + const AZStd::string* argName = behaviorMethod->GetArgumentName(argIndex); argument.m_typeId = argumentKey; - argument.m_details.m_name = behaviorMethod->GetArgumentName(argIndex) ? *behaviorMethod->GetArgumentName(argIndex) : argumentName; + argument.m_details.m_name = argName ? *argName : argumentName; argument.m_details.m_category = ""; argument.m_details.m_tooltip = argumentDescription; @@ -871,8 +873,9 @@ namespace ScriptCanvasEditorTools Helpers::GetTypeNameAndDescription(resultParameter->m_typeId, resultName, resultDescription); + const AZStd::string* resName = behaviorMethod->GetArgumentName(0); result.m_typeId = resultKey; - result.m_details.m_name = behaviorMethod->GetArgumentName(0) ? *behaviorMethod->GetArgumentName(0) : resultName; + result.m_details.m_name = resName ? *resName : resultName; result.m_details.m_tooltip = resultDescription; SplitCamelCase(result.m_details.m_name); @@ -1093,13 +1096,13 @@ namespace ScriptCanvasEditorTools rapidjson_ly::Value value(rapidjson_ly::kStringType); value.SetString(entrySource.m_key.c_str(), document.GetAllocator()); - entry.AddMember("key", value, document.GetAllocator()); + entry.AddMember(GraphCanvas::Schema::Field::key, value, document.GetAllocator()); value.SetString(entrySource.m_context.c_str(), document.GetAllocator()); - entry.AddMember("context", value, document.GetAllocator()); + entry.AddMember(GraphCanvas::Schema::Field::context, value, document.GetAllocator()); value.SetString(entrySource.m_variant.c_str(), document.GetAllocator()); - entry.AddMember("variant", value, document.GetAllocator()); + entry.AddMember(GraphCanvas::Schema::Field::variant, value, document.GetAllocator()); rapidjson_ly::Value details(rapidjson_ly::kObjectType); value.SetString(entrySource.m_details.m_name.c_str(), document.GetAllocator()); @@ -1120,12 +1123,12 @@ namespace ScriptCanvasEditorTools rapidjson_ly::Value theMethod(rapidjson_ly::kObjectType); value.SetString(methodSource.m_key.c_str(), document.GetAllocator()); - theMethod.AddMember("key", value, document.GetAllocator()); + theMethod.AddMember(GraphCanvas::Schema::Field::key, value, document.GetAllocator()); if (!methodSource.m_context.empty()) { value.SetString(methodSource.m_context.c_str(), document.GetAllocator()); - theMethod.AddMember("context", value, document.GetAllocator()); + theMethod.AddMember(GraphCanvas::Schema::Field::context, value, document.GetAllocator()); } if (!methodSource.m_entry.m_name.empty()) @@ -1233,7 +1236,7 @@ namespace ScriptCanvasEditorTools rapidjson_ly::Value theSlot(rapidjson_ly::kObjectType); value.SetString(slotSource.m_key.c_str(), document.GetAllocator()); - theSlot.AddMember("key", value, document.GetAllocator()); + theSlot.AddMember(GraphCanvas::Schema::Field::key, value, document.GetAllocator()); rapidjson_ly::Value sloDetails(rapidjson_ly::kObjectType); if (!slotSource.m_details.m_name.empty()) diff --git a/Gems/ScriptCanvasTesting/Code/Source/Nodes/Nodeables/ValuePointerReferenceExample.ScriptCanvasNodeable.xml b/Gems/ScriptCanvasTesting/Code/Source/Nodes/Nodeables/ValuePointerReferenceExample.ScriptCanvasNodeable.xml index 0be3c8c81a..a2a89509e6 100644 --- a/Gems/ScriptCanvasTesting/Code/Source/Nodes/Nodeables/ValuePointerReferenceExample.ScriptCanvasNodeable.xml +++ b/Gems/ScriptCanvasTesting/Code/Source/Nodes/Nodeables/ValuePointerReferenceExample.ScriptCanvasNodeable.xml @@ -1,13 +1,22 @@ + + + @@ -24,9 +33,10 @@ PreferredClassName="Branch Input Type Example" Base="ScriptCanvas::Nodeable" Icon="Icons/ScriptCanvas/Placeholder.png" - Category="Tests" + Category="Examples" GeneratePropertyFriend="True" Namespace="None" + EditAttributes="AZ::Script::Attributes::ExcludeFrom@AZ::Script::Attributes::ExcludeFlags::All" Description="Example of branch passing as input by value, pointer and reference."> @@ -46,9 +56,10 @@ PreferredClassName="Input Type Example" Base="ScriptCanvas::Nodeable" Icon="Icons/ScriptCanvas/Placeholder.png" - Category="Tests" + Category="Examples" GeneratePropertyFriend="True" Namespace="None" + EditAttributes="AZ::Script::Attributes::ExcludeFrom@AZ::Script::Attributes::ExcludeFlags::All" Description="Example of passing as input by value, pointer and reference."> @@ -65,9 +76,10 @@ PreferredClassName="Property Example" Base="ScriptCanvas::Nodeable" Icon="Icons/ScriptCanvas/Placeholder.png" - Category="Tests" + Category="Examples" GeneratePropertyFriend="True" Namespace="None" + EditAttributes="AZ::Script::Attributes::ExcludeFrom@AZ::Script::Attributes::ExcludeFlags::All" Description="Example of using properties."> diff --git a/Gems/ScriptCanvasTesting/Code/Source/ScriptCanvasTestBus.cpp b/Gems/ScriptCanvasTesting/Code/Source/ScriptCanvasTestBus.cpp index 0a0f71bead..c983717a0d 100644 --- a/Gems/ScriptCanvasTesting/Code/Source/ScriptCanvasTestBus.cpp +++ b/Gems/ScriptCanvasTesting/Code/Source/ScriptCanvasTestBus.cpp @@ -26,9 +26,12 @@ namespace ScriptCanvasTesting if (AZ::BehaviorContext* behaviorContext = azrtti_cast(context)) { - behaviorContext->EnumProperty<(AZ::u32)TestEnum::Alpha>("ALPHA"); - behaviorContext->EnumProperty<(AZ::u32)TestEnum::Bravo>("BRAVO"); - behaviorContext->EnumProperty<(AZ::u32)TestEnum::Charlie>("CHARLIE"); + behaviorContext->EnumProperty<(AZ::u32)TestEnum::Alpha>("ALPHA") + ->Attribute(AZ::Script::Attributes::ExcludeFrom, AZ::Script::Attributes::ExcludeFlags::All); + behaviorContext->EnumProperty<(AZ::u32)TestEnum::Bravo>("BRAVO") + ->Attribute(AZ::Script::Attributes::ExcludeFrom, AZ::Script::Attributes::ExcludeFlags::All); + behaviorContext->EnumProperty<(AZ::u32)TestEnum::Charlie>("CHARLIE") + ->Attribute(AZ::Script::Attributes::ExcludeFrom, AZ::Script::Attributes::ExcludeFlags::All); } } From 389f29f0e7cd9da96d23df8f1d054c2533602d1f Mon Sep 17 00:00:00 2001 From: AMZN-koppersr <82230785+AMZN-koppersr@users.noreply.github.com> Date: Tue, 23 Nov 2021 09:26:37 -0800 Subject: [PATCH 217/345] Performance improvement for fixed_vector AZStd::fixed_vector had all its functions marked with constexpr, but this requires all member variables to be fully initialized. This meant that the internal array used to store elements always has to be fully initialized. This was done for trivial classes but not for non-trivial classes. As a result trivial classes always did a memset (or more optimized versions for smaller buffers) while the non-trivial version couldn't actually be stored in a constexpr variable. Since AZStd::fixed_vector is meant to be dynamic the choice was made to remove the constexpr from all non-static member functions in favor of avoiding the overhead of memset, which profiling showed was a considerable overhead depending on the reserved size. If a truly constexpr array is needed than AZStd::array is a better choice as that's designed to not by dynamic. Signed-off-by: AMZN-koppersr <82230785+AMZN-koppersr@users.noreply.github.com> --- .../AzCore/std/containers/fixed_vector.h | 152 +++++++++--------- .../AzCore/Tests/AZStd/VectorAndArray.cpp | 42 ++--- 2 files changed, 97 insertions(+), 97 deletions(-) diff --git a/Code/Framework/AzCore/AzCore/std/containers/fixed_vector.h b/Code/Framework/AzCore/AzCore/std/containers/fixed_vector.h index 7c0cca0308..5a54c2a589 100644 --- a/Code/Framework/AzCore/AzCore/std/containers/fixed_vector.h +++ b/Code/Framework/AzCore/AzCore/std/containers/fixed_vector.h @@ -130,10 +130,11 @@ namespace AZStd::Internal //! Constructors - constexpr fixed_trivial_storage() = default; + fixed_trivial_storage() = default; template >> - constexpr fixed_trivial_storage(AZStd::initializer_list ilist) noexcept + fixed_trivial_storage(AZStd::initializer_list ilist) noexcept + : m_size(aznumeric_caster(ilist.size())) { AZSTD_CONTAINER_ASSERT(ilist.size() <= capacity(), "Initializer list cannot be larger than storage capacity"); size_t index{}; @@ -141,20 +142,19 @@ namespace AZStd::Internal { m_data[index++] = element; } - resize_no_construct(ilist.size()); } - constexpr pointer data() noexcept + pointer data() noexcept { return m_data; } - constexpr const_pointer data() const noexcept + const_pointer data() const noexcept { return m_data; } //! Number of elements currently stored. - constexpr size_type size() const noexcept + size_type size() const noexcept { return m_size; } @@ -164,12 +164,12 @@ namespace AZStd::Internal return Capacity; } //! Is the storage empty? - constexpr bool empty() const noexcept + bool empty() const noexcept { return size() == 0; } //! Is the storage full? - constexpr bool full() const noexcept + bool full() const noexcept { return size() == capacity(); } @@ -186,7 +186,7 @@ namespace AZStd::Internal //! Increases size of the storage by one. //! Always fails for empty storage. template >> - constexpr reference emplace_back(Args&&... args) noexcept + reference emplace_back(Args&&... args) noexcept { AZSTD_CONTAINER_ASSERT(!full(), "emplace_back cannot be invoked on full storage"); reference new_element = *(data() + size()); @@ -196,7 +196,7 @@ namespace AZStd::Internal } //! Removes the last element of the storage. //! Precondition: size is not empty - constexpr void pop_back() noexcept + void pop_back() noexcept { AZSTD_CONTAINER_ASSERT(!empty(), "pop_back cannot be invoked on empty storage"); resize_no_construct(size() - 1); @@ -205,7 +205,7 @@ namespace AZStd::Internal //! removing elements (unsafe). //! //! Updates the size of the container while checking that the new size is less than capacity - constexpr void resize_no_construct(size_t new_size) noexcept + void resize_no_construct(size_t new_size) noexcept { AZSTD_CONTAINER_ASSERT(new_size <= capacity(), "New size cannot be larger than capacity"); m_size = aznumeric_cast(new_size); @@ -215,19 +215,19 @@ namespace AZStd::Internal //! This does not modify the size of the storage //! This is a no-op for trivial types template >> - constexpr void unsafe_destroy(InputIt, InputIt) noexcept + void unsafe_destroy(InputIt, InputIt) noexcept { } //! Destructs all elements of the storage. //! This does not modify the size of the storage //! This is a no-op for trivial types - constexpr void unsafe_destroy_all() noexcept + void unsafe_destroy_all() noexcept { } private: - T m_data[Capacity]{}; + T m_data[Capacity]; size_type m_size{}; }; @@ -245,7 +245,7 @@ namespace AZStd::Internal using reference = T&; using const_reference = const T&; - constexpr fixed_non_trivial_storage() = default; + fixed_non_trivial_storage() = default; ~fixed_non_trivial_storage() noexcept { @@ -253,7 +253,7 @@ namespace AZStd::Internal } template >> - constexpr fixed_non_trivial_storage(AZStd::initializer_list ilist) noexcept(noexcept(emplace_back(AZStd::declval()))) + fixed_non_trivial_storage(AZStd::initializer_list ilist) noexcept(noexcept(emplace_back(AZStd::declval()))) { AZSTD_CONTAINER_ASSERT(ilist.size() <= capacity(), "Initializer list cannot be larger than storage capacity"); for (const U& element : ilist) @@ -272,7 +272,7 @@ namespace AZStd::Internal } //! Number of elements currently stored. - constexpr size_type size() const noexcept + size_type size() const noexcept { return m_size; } @@ -282,12 +282,12 @@ namespace AZStd::Internal return Capacity; } //! Is the storage empty? - constexpr bool empty() const noexcept + bool empty() const noexcept { return size() == 0; } //! Is the storage full? - constexpr bool full() const noexcept + bool full() const noexcept { return size() == capacity(); } @@ -325,7 +325,7 @@ namespace AZStd::Internal //! removing elements (unsafe). //! //! Updates the size of the container while checking that the new size is less than capacity - constexpr void resize_no_construct(size_t new_size) noexcept + void resize_no_construct(size_t new_size) noexcept { AZSTD_CONTAINER_ASSERT(new_size <= capacity(), "New size cannot be larger than capacity"); m_size = aznumeric_cast(new_size); @@ -402,23 +402,23 @@ namespace AZStd ////////////////////////////////////////////////////////////////////////// // 23.2.4.1 construct/copy/destroy - constexpr fixed_vector() = default; + fixed_vector() = default; - constexpr explicit fixed_vector(size_type numElements, const_reference value = value_type()) + explicit fixed_vector(size_type numElements, const_reference value = value_type()) { resize_no_construct(numElements); AZStd::uninitialized_fill_n(data(), numElements, value); } template >> - constexpr fixed_vector(InputIt first, InputIt last) + fixed_vector(InputIt first, InputIt last) { resize_no_construct(AZStd::distance(first, last)); AZStd::uninitialized_copy(first, last, data()); } - constexpr fixed_vector(const fixed_vector& rhs) + fixed_vector(const fixed_vector& rhs) { resize_no_construct(rhs.size()); AZStd::uninitialized_copy(rhs.data(), rhs.data() + rhs.size(), data()); @@ -428,7 +428,7 @@ namespace AZStd // It performs an AZStd::move on each of the fixed_vector elements instead // of swapping pointers to the allocted memory address // as it is unable to perform that operations due to the storage being baked into the container - constexpr fixed_vector(fixed_vector&& rhs) + fixed_vector(fixed_vector&& rhs) { resize_no_construct(rhs.size()); AZStd::uninitialized_move(rhs.data(), rhs.data() + rhs.size(), data()); @@ -440,7 +440,7 @@ namespace AZStd // into a fixed_vector given that the type in question isn't the same type as this fixed_vector type template && !AZStd::is_convertible_v>> - constexpr fixed_vector(VectorContainer&& rhs) + fixed_vector(VectorContainer&& rhs) { constexpr bool is_const_or_lvalue_reference = AZStd::is_lvalue_reference_v || AZStd::is_const_v; @@ -459,12 +459,12 @@ namespace AZStd } } - constexpr fixed_vector(AZStd::initializer_list ilist) + fixed_vector(AZStd::initializer_list ilist) : base_type(ilist) { } - constexpr fixed_vector& operator=(const fixed_vector& rhs) + fixed_vector& operator=(const fixed_vector& rhs) { if (this == &rhs) { @@ -475,7 +475,7 @@ namespace AZStd return assign_helper(rhs); } - constexpr fixed_vector& operator=(fixed_vector&& rhs) + fixed_vector& operator=(fixed_vector&& rhs) { if (this == &rhs) { @@ -487,23 +487,23 @@ namespace AZStd } template - constexpr AZStd::enable_if_t, fixed_vector>, fixed_vector>& operator=(VectorContainer&& rhs) + AZStd::enable_if_t, fixed_vector>, fixed_vector>& operator=(VectorContainer&& rhs) { return assign_helper(AZStd::forward(rhs)); } - constexpr iterator begin() { return iterator(data()); } - constexpr const_iterator begin() const { return const_iterator(data()); } - constexpr const_iterator cbegin() const { return const_iterator(data()); } - constexpr iterator end() { return iterator(data() + size()); } - constexpr const_iterator end() const { return const_iterator(data() + size()); } - constexpr const_iterator cend() const { return const_iterator(data() + size()); } - constexpr reverse_iterator rbegin() { return reverse_iterator(end()); } - constexpr const_reverse_iterator rbegin() const { return const_reverse_iterator(end()); } - constexpr const_reverse_iterator crbegin() const { return const_reverse_iterator(end()); } - constexpr reverse_iterator rend() { return reverse_iterator(begin()); } - constexpr const_reverse_iterator rend() const { return const_reverse_iterator(begin()); } - constexpr const_reverse_iterator crend() const { return const_reverse_iterator(begin()); } + iterator begin() { return iterator(data()); } + const_iterator begin() const { return const_iterator(data()); } + const_iterator cbegin() const { return const_iterator(data()); } + iterator end() { return iterator(data() + size()); } + const_iterator end() const { return const_iterator(data() + size()); } + const_iterator cend() const { return const_iterator(data() + size()); } + reverse_iterator rbegin() { return reverse_iterator(end()); } + const_reverse_iterator rbegin() const { return const_reverse_iterator(end()); } + const_reverse_iterator crbegin() const { return const_reverse_iterator(end()); } + reverse_iterator rend() { return reverse_iterator(begin()); } + const_reverse_iterator rend() const { return const_reverse_iterator(begin()); } + const_reverse_iterator crend() const { return const_reverse_iterator(begin()); } // bring in fixed_vector_storage functions into scope using base_type::data; @@ -514,7 +514,7 @@ namespace AZStd // extension method using base_type::resize_no_construct; - constexpr size_type size() const noexcept + size_type size() const noexcept { return base_type::size(); } @@ -527,12 +527,12 @@ namespace AZStd return base_type::max_size(); } - constexpr void resize(size_type newSize) + void resize(size_type newSize) { return resize(newSize, value_type{}); } - constexpr void resize(size_type newSize, const_reference value) + void resize(size_type newSize, const_reference value) { size_type dataSize = size(); if (dataSize < newSize) @@ -547,7 +547,7 @@ namespace AZStd // Removes unused capacity - For fixed_vector this only asserts // that the supplied capacity is not longer than the fixed_vector capacity - constexpr void reserve(size_type newCapacity) + void reserve(size_type newCapacity) { // No-op - Implemented to provide consistent std::vector AZSTD_CONTAINER_ASSERT(newCapacity <= capacity(), @@ -556,79 +556,79 @@ namespace AZStd } // Removes unused capacity - For fixed_vector this does nothing - constexpr void shrink_to_fit() + void shrink_to_fit() { // No-op - Implemented to provide consistent std::vector } - constexpr reference at(size_type position) + reference at(size_type position) { AZSTD_CONTAINER_ASSERT(position < size(), "AZStd::fixed_vector<>::at - position is out of range"); return *(data() + position); } - constexpr const_reference at(size_type position) const + const_reference at(size_type position) const { AZSTD_CONTAINER_ASSERT(position < size(), "AZStd::fixed_vector<>::at - position is out of range"); return *(data() + position); } - constexpr reference operator[](size_type position) + reference operator[](size_type position) { AZSTD_CONTAINER_ASSERT(position < size(), "AZStd::fixed_vector<>::at - position is out of range"); return *(data() + position); } - constexpr const_reference operator[](size_type position) const + const_reference operator[](size_type position) const { AZSTD_CONTAINER_ASSERT(position < size(), "AZStd::fixed_vector<>::at - position is out of range"); return *(data() + position); } - constexpr reference front() + reference front() { AZSTD_CONTAINER_ASSERT(!empty(), "AZStd::fixed_vector<>::front - container is empty!"); return *data(); } - constexpr const_reference front() const + const_reference front() const { AZSTD_CONTAINER_ASSERT(!empty(), "AZStd::fixed_vector<>::front - container is empty!"); return *data(); } - constexpr reference back() + reference back() { AZSTD_CONTAINER_ASSERT(!empty(), "AZStd::fixed_vector<>::back - container is empty!"); return *(data() + size() - 1); } - constexpr const_reference back() const + const_reference back() const { AZSTD_CONTAINER_ASSERT(!empty(), "AZStd::fixed_vector<>::back - container is empty!"); return *(data() + size() - 1); } - constexpr void push_back(const_reference value) + void push_back(const_reference value) { emplace_back(value); } - constexpr void assign(size_type numElements, const_reference value) + void assign(size_type numElements, const_reference value) { clear(); insert(end(), numElements, value); } template >> - constexpr void assign(InputIt first, InputIt last) + void assign(InputIt first, InputIt last) { clear(); insert(end(), first, last); } - constexpr void assign(AZStd::initializer_list ilist) + void assign(AZStd::initializer_list ilist) { assign(ilist.begin(), ilist.end()); } template >> - constexpr iterator emplace(const_iterator insertPos, Args&&... args) + iterator emplace(const_iterator insertPos, Args&&... args) { AZSTD_CONTAINER_ASSERT(!full(), "Cannot emplace on a full fixed_vector"); AZSTD_CONTAINER_ASSERT(insertPos >= cbegin() && insertPos <= cend(), "insert position must be in range of container"); @@ -645,18 +645,18 @@ namespace AZStd AZStd::construct_at(insertPosPtr, AZStd::forward(args)...); return iterator(insertPosPtr); } - constexpr iterator insert(const_iterator insertPos, const_reference value) + iterator insert(const_iterator insertPos, const_reference value) { AZSTD_CONTAINER_ASSERT(insertPos >= cbegin() && insertPos <= cend(), "insert position must be in range of container"); return emplace(insertPos, value); } - constexpr iterator insert(const_iterator insertPos, value_type&& value) + iterator insert(const_iterator insertPos, value_type&& value) { AZSTD_CONTAINER_ASSERT(insertPos >= cbegin() && insertPos <= cend(), "insert position must be in range of container"); return emplace(insertPos, AZStd::move(value)); } - constexpr void insert(const_iterator insertPos, size_type numElements, const_reference value) + void insert(const_iterator insertPos, size_type numElements, const_reference value) { if (numElements == 0) { @@ -708,24 +708,24 @@ namespace AZStd } template>> - constexpr void insert(const_iterator insertPos, InputIt first, InputIt last) + void insert(const_iterator insertPos, InputIt first, InputIt last) { // specialize for iterator categories. AZSTD_CONTAINER_ASSERT(insertPos >= cbegin() && insertPos <= cend(), "insert position must be in range of container"); insert_iter(insertPos, first, last, typename iterator_traits::iterator_category()); }; - constexpr void insert(const_iterator insertPos, AZStd::initializer_list ilist) + void insert(const_iterator insertPos, AZStd::initializer_list ilist) { insert(insertPos, ilist.begin(), ilist.end()); } - constexpr iterator erase(const_iterator elementIter) + iterator erase(const_iterator elementIter) { return erase(elementIter, elementIter + 1); } - constexpr iterator erase(const_iterator first, const_iterator last) + iterator erase(const_iterator first, const_iterator last) { AZSTD_CONTAINER_ASSERT(first >= cbegin() && last <= cend(), "erase iterator must be inside the range of fixed_vector container"); iterator dataStart = begin(); @@ -741,12 +741,12 @@ namespace AZStd return dataStart + offset; } - constexpr void clear() + void clear() { base_type::unsafe_destroy_all(); resize_no_construct(0); } - constexpr void swap(fixed_vector& rhs) + void swap(fixed_vector& rhs) { // Fixed containers cannot swap pointers, they need to do full copies. // The strategy is to extend the smaller fixed_vector to be the size @@ -776,12 +776,12 @@ namespace AZStd } // Validate container status. - constexpr bool validate() const + bool validate() const { return size() <= max_size(); } // Validate iterator. - constexpr int validate_iterator(const_iterator iter) const + int validate_iterator(const_iterator iter) const { const_pointer start = data(); const_pointer end = data() + size(); @@ -799,19 +799,19 @@ namespace AZStd } // pushes back an empty without a provided instance. - constexpr void push_back() + void push_back() { emplace_back(); } - constexpr void leak_and_reset() + void leak_and_reset() { resize_no_construct(0); } private: template - constexpr fixed_vector& assign_helper(VectorContainer&& rhs) + fixed_vector& assign_helper(VectorContainer&& rhs) { constexpr bool is_const_or_lvalue_reference = AZStd::is_lvalue_reference_v || AZStd::is_const_v; @@ -872,7 +872,7 @@ namespace AZStd } template - constexpr void insert_iter(const_iterator insertPos, Iterator first, Iterator last, const forward_iterator_tag&) + void insert_iter(const_iterator insertPos, Iterator first, Iterator last, const forward_iterator_tag&) { size_type numElements = AZStd::distance(first, last); if (numElements == 0) @@ -923,7 +923,7 @@ namespace AZStd } template - constexpr void insert_iter(const_iterator insertPos, Iterator first, Iterator last, const input_iterator_tag&) + void insert_iter(const_iterator insertPos, Iterator first, Iterator last, const input_iterator_tag&) { iterator dataStart = data(); size_type offset = AZStd::distance(dataStart, insertPos); diff --git a/Code/Framework/AzCore/Tests/AZStd/VectorAndArray.cpp b/Code/Framework/AzCore/Tests/AZStd/VectorAndArray.cpp index 47c3630091..b3eab244c4 100644 --- a/Code/Framework/AzCore/Tests/AZStd/VectorAndArray.cpp +++ b/Code/Framework/AzCore/Tests/AZStd/VectorAndArray.cpp @@ -753,7 +753,7 @@ namespace UnitTest TEST_F(Arrays, FixedVectorCanCopyAndMoveWithDifferentCapacity) { - constexpr AZStd::fixed_vector sourceVector{ 1,2,3,4,5 }; + AZStd::fixed_vector sourceVector{ 1,2,3,4,5 }; AZStd::fixed_vector copyConstructVector{ sourceVector }; EXPECT_EQ(sourceVector, copyConstructVector); @@ -768,32 +768,32 @@ namespace UnitTest AZStd::fixed_vector moveAssignVector = AZStd::move(moveConstructVector); - constexpr AZStd::fixed_vector expectedVector{ 1,2,3,4,5,6 }; + AZStd::fixed_vector expectedVector{ 1,2,3,4,5,6 }; EXPECT_EQ(expectedVector, moveAssignVector); } TEST_F(Arrays, FixedVectorComparisonOperatorsSucceedAsExpected) { - constexpr AZStd::fixed_vector testVector{ 1,2,3,4,5 }; - constexpr AZStd::fixed_vector equalVector{ 1,2,3,4,5 }; - constexpr AZStd::fixed_vector notEqualVectorDifferentSize{ 1,2,3,4,5,6 }; - constexpr AZStd::fixed_vector lessVector{ 1,2,3,4,4 }; - constexpr AZStd::fixed_vector greaterVectorDifferentSize{ 1,2,3,4,5, 1 }; + AZStd::fixed_vector testVector{ 1,2,3,4,5 }; + AZStd::fixed_vector equalVector{ 1,2,3,4,5 }; + AZStd::fixed_vector notEqualVectorDifferentSize{ 1,2,3,4,5,6 }; + AZStd::fixed_vector lessVector{ 1,2,3,4,4 }; + AZStd::fixed_vector greaterVectorDifferentSize{ 1,2,3,4,5, 1 }; - static_assert(testVector == equalVector); - static_assert(testVector != notEqualVectorDifferentSize); - static_assert(testVector != lessVector); - static_assert(lessVector < testVector); - static_assert(lessVector < greaterVectorDifferentSize); - static_assert(lessVector <= lessVector); - static_assert(lessVector <= testVector); - static_assert(lessVector <= greaterVectorDifferentSize); - static_assert(testVector > lessVector); - static_assert(testVector > lessVector); - static_assert(notEqualVectorDifferentSize > testVector); - static_assert(testVector >= testVector); - static_assert(testVector >= lessVector); - static_assert(greaterVectorDifferentSize > lessVector); + EXPECT_EQ(testVector, equalVector); + EXPECT_NE(testVector, notEqualVectorDifferentSize); + EXPECT_NE(testVector, lessVector); + EXPECT_LT(lessVector, testVector); + EXPECT_LT(lessVector, greaterVectorDifferentSize); + EXPECT_LE(lessVector, lessVector); + EXPECT_LE(lessVector, testVector); + EXPECT_LE(lessVector, greaterVectorDifferentSize); + EXPECT_GT(testVector, lessVector); + EXPECT_GT(testVector, lessVector); + EXPECT_GT(notEqualVectorDifferentSize, testVector); + EXPECT_GE(testVector, testVector); + EXPECT_GE(testVector, lessVector); + EXPECT_GT(greaterVectorDifferentSize, lessVector); } TEST_F(Arrays, VectorSwap) From 33e44a4813b5beb109225085ed05e0d35e5dfa11 Mon Sep 17 00:00:00 2001 From: Gene Walters Date: Tue, 23 Nov 2021 09:27:50 -0800 Subject: [PATCH 218/345] revert rawoutput function. we'll update any of the logs we care about to include newlines Signed-off-by: Gene Walters --- Code/Framework/AzCore/AzCore/Debug/Trace.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/Code/Framework/AzCore/AzCore/Debug/Trace.cpp b/Code/Framework/AzCore/AzCore/Debug/Trace.cpp index e2f0c6b29c..2c2b8215c0 100644 --- a/Code/Framework/AzCore/AzCore/Debug/Trace.cpp +++ b/Code/Framework/AzCore/AzCore/Debug/Trace.cpp @@ -558,7 +558,6 @@ namespace AZ::Debug fwrite(windowView.data(), 1, windowView.size(), stdout); fwrite(windowMessageSeparator.data(), 1, windowMessageSeparator.size(), stdout); fwrite(messageView.data(), 1, messageView.size(), stdout); - fwrite("\n\r", 1, 2, stdout); } //========================================================================= From d30ac7cfa636ef400241aea0088a05d8780ccab9 Mon Sep 17 00:00:00 2001 From: lsemp3d <58790905+lsemp3d@users.noreply.github.com> Date: Tue, 23 Nov 2021 10:36:34 -0800 Subject: [PATCH 219/345] Updated all names files to use 'base' instead of 'key' to avoid validation issues Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com> --- .../AZEvents/OnCollisionBeginevent.names | 18 +- .../AZEvents/OnCollisionEndevent.names | 18 +- .../AZEvents/OnCollisionPersistevent.names | 18 +- .../AZEvents/OnGravityChangedevent.names | 18 +- .../AZEvents/OnTriggerEnterevent.names | 18 +- .../AZEvents/OnTriggerExitevent.names | 18 +- .../AZEvents/Postsimulateevent.names | 16 +- .../AZEvents/Presimulateevent.names | 16 +- .../SettingsRegistryNotifyEvent.names | 16 +- .../AWSMetrics_AttributesSubmissionList.names | 6 +- .../Classes/AWSMetrics_MetricsAttribute.names | 10 +- .../Classes/AWSScriptBehaviorDynamoDB.names | 6 +- .../Classes/AWSScriptBehaviorLambda.names | 6 +- .../Classes/AWSScriptBehaviorS3.names | 10 +- ...AZ__SceneAPI__Containers__SceneGraph.names | 34 +- ...SceneAPI__DataTypes__IMeshData__Face.names | 4 +- .../Classes/AcesParameterOverrides.names | 34 +- .../Classes/ActorComponent.names | 2 +- .../Classes/AnimationData.names | 2 +- .../TranslationAssets/Classes/AssetData.names | 12 +- .../TranslationAssets/Classes/AssetId.names | 10 +- .../TranslationAssets/Classes/AssetInfo.names | 10 +- .../AtomToolsDocumentSystemSettings.names | 6 +- .../Classes/AuthenticationTokens.names | 14 +- .../TranslationAssets/Classes/AxisType.names | 14 +- ...Framework__SurfaceData__SurfacePoint.names | 14 +- .../Classes/BlastActorData.names | 10 +- .../Classes/BlendShapeAnimationData.names | 2 +- .../Classes/BlendShapeData.names | 10 +- .../Classes/BlendShapeDataFace.names | 4 +- .../Classes/BoxShapeConfig.names | 6 +- .../Classes/CameraComponent.names | 2 +- .../Classes/CapsuleShapeConfig.names | 10 +- .../Classes/ClientAuthAWSCredentials.names | 14 +- .../Classes/CollisionEvent.names | 8 +- .../Classes/CollisionGroup.names | 2 +- .../Classes/ComponentId.names | 8 +- .../Classes/ConstantGradientComponent.names | 2 +- .../Classes/ConstantGradientConfig.names | 2 +- .../TranslationAssets/Classes/Contact.names | 18 +- .../TranslationAssets/Classes/CryRange.names | 2 +- .../Classes/CylinderShapeConfig.names | 10 +- .../Classes/DiskShapeConfig.names | 2 +- .../Classes/DisplaySettingsState.names | 4 +- .../Classes/DitherGradientComponent.names | 2 +- .../Classes/DitherGradientConfig.names | 2 +- .../Classes/EditorActorComponent.names | 2 +- .../Classes/EditorCameraComponent.names | 2 +- .../Classes/EditorLayerComponent.names | 6 +- .../Classes/EditorMaterialComponentSlot.names | 2 +- .../Classes/EditorSequenceComponent.names | 2 +- .../Classes/EditorSimpleMotionComponent.names | 2 +- .../Classes/EditorTransformBus.names | 2 +- .../Classes/Entity Transform.names | 4 +- .../TranslationAssets/Classes/Entity.names | 38 +- .../Classes/EntityComponentIdPair.names | 8 +- .../Classes/EntityEntity_VM.names | 14 +- .../Classes/EntityType.names | 2 +- ...ecutionStateInterpretedPerActivation.names | 2 +- ...InterpretedPerActivationOnGraphStart.names | 2 +- .../ExecutionStateInterpretedPure.names | 2 +- ...tionStateInterpretedPureOnGraphStart.names | 2 +- .../ExecutionStateInterpretedSingleton.names | 2 +- .../Classes/ExportProduct.names | 2 +- .../Classes/ExportProductList.names | 8 +- .../Classes/ExposureControlConfig.names | 26 +- .../Classes/GameplayNotificationId.names | 8 +- .../Classes/GradientSampleParams.names | 2 +- .../Classes/GradientSampler.names | 2 +- .../GradientSurfaceDataComponent.names | 2 +- .../Classes/GradientSurfaceDataConfig.names | 10 +- .../Classes/GradientTransformComponent.names | 2 +- .../Classes/GradientTransformConfig.names | 2 +- .../Classes/GraphModelSlotId.names | 2 +- .../Classes/IAnimationData.names | 8 +- .../Classes/IBlendShapeAnimationData.names | 10 +- .../Classes/IBlendShapeData.names | 20 +- .../Classes/IGraphObject.names | 2 +- .../TranslationAssets/Classes/IMeshData.names | 6 +- .../Classes/ImageGradientComponent.names | 2 +- .../Classes/ImageGradientConfig.names | 2 +- .../Classes/InputDeviceGamepad.names | 2 +- .../Classes/InputDeviceKeyboard.names | 2 +- .../Classes/InputDeviceMotion.names | 2 +- .../Classes/InputDeviceMouse.names | 2 +- .../Classes/InputDeviceTouch.names | 2 +- .../Classes/InputDeviceVirtualKeyboard.names | 2 +- .../Classes/InputEventNotificationId.names | 20 +- .../Classes/InvertGradientComponent.names | 2 +- .../Classes/InvertGradientConfig.names | 2 +- .../Classes/LevelsGradientComponent.names | 2 +- .../Classes/LevelsGradientConfig.names | 2 +- .../Classes/LightConfig.names | 34 +- .../Classes/LightingPreset.names | 42 +- .../Classes/MaterialAssignment.names | 12 +- .../Classes/MaterialAssignmentId.names | 22 +- .../Classes/MaterialComponentConfig.names | 6 +- .../Classes/MaterialData.names | 38 +- .../TranslationAssets/Classes/Math.names | 56 +- .../Classes/MathAABB_VM.names | 56 +- .../Classes/MathColor_VM.names | 34 +- .../Classes/MathCrc32_VM.names | 4 +- .../Classes/MathMatrix3x3_VM.names | 68 +- .../Classes/MathMatrix4x4_VM.names | 56 +- .../Classes/MathOBB_VM.names | 16 +- .../Classes/MathPlane_VM.names | 22 +- .../Classes/MathQuaternion_VM.names | 66 +- .../Classes/MathRandom_VM.names | 44 +- .../Classes/MathTransform_VM.names | 46 +- .../TranslationAssets/Classes/MathUtils.names | 20 +- .../Classes/MathVector2_VM.names | 64 +- .../Classes/MathVector3_VM.names | 72 +- .../Classes/MathVector4_VM.names | 52 +- .../TranslationAssets/Classes/Math_VM.names | 8 +- .../TranslationAssets/Classes/Matrix3x4.names | 128 +- .../TranslationAssets/Classes/MeshData.names | 24 +- .../Classes/MeshVertexBitangentData.names | 10 +- .../Classes/MeshVertexColorData.names | 8 +- .../Classes/MeshVertexTangentData.names | 10 +- .../Classes/MeshVertexUVData.names | 8 +- .../Classes/MixedGradientComponent.names | 2 +- .../Classes/MixedGradientConfig.names | 10 +- .../Classes/MixedGradientLayer.names | 2 +- .../Classes/ModelPreset.names | 14 +- .../Classes/MotionEvent.names | 2 +- .../Classes/MultiplayerSystemComponent.names | 4 +- .../TranslationAssets/Classes/Name.names | 10 +- .../Classes/NetBindComponent.names | 10 +- ...tworkTestPlayerComponentNetworkInput.names | 12 +- .../TranslationAssets/Classes/NodeIndex.names | 12 +- .../Classes/OutputDeviceTransformType.names | 2 +- .../Classes/PerlinGradientComponent.names | 2 +- .../Classes/PerlinGradientConfig.names | 2 +- .../Classes/PhysicsScene.names | 6 +- .../Classes/PhysicsSystemInterface.names | 10 +- .../TranslationAssets/Classes/Platform.names | 16 +- .../Classes/PolygonPrism.names | 6 +- .../Classes/PositionSplineQueryResult.names | 2 +- .../Classes/PosterizeGradientComponent.names | 2 +- .../Classes/PosterizeGradientConfig.names | 2 +- .../Classes/PropertyTreeEditor.names | 32 +- .../Classes/PythonBehaviorInfo.names | 2 +- .../Classes/RandomGradientComponent.names | 2 +- .../Classes/RandomGradientConfig.names | 2 +- .../Classes/RandomTimedSpawnerComponent.names | 2 +- .../Classes/RaySplineQueryResult.names | 2 +- .../Classes/ReferenceGradientComponent.names | 2 +- .../Classes/ReferenceGradientConfig.names | 2 +- .../Classes/ReferenceShapeConfig.names | 6 +- .../Classes/RuntimeData.names | 4 +- .../TranslationAssets/Classes/Scene.names | 4 +- .../Classes/SceneGraphName.names | 8 +- .../Classes/SceneManifest.names | 6 +- .../Classes/SceneQueries.names | 4 +- .../Classes/ScriptTimePoint.names | 8 +- .../Classes/SearchFilter.names | 2 +- .../Classes/SequenceComponent.names | 2 +- .../Classes/SettingsRegistryInterface.names | 36 +- .../Classes/ShaderCollectionItem.names | 10 +- .../Classes/ShaderOptionGroup.names | 8 +- .../Classes/ShaderSemantic.names | 12 +- .../Classes/ShaderVariantId.names | 6 +- .../Classes/ShaderVariantInfo.names | 2 +- .../Classes/ShaderVariantListSourceData.names | 2 +- .../ShapeAreaFalloffGradientComponent.names | 2 +- .../ShapeAreaFalloffGradientConfig.names | 2 +- .../Classes/SimpleAssetReferenceBase.names | 10 +- .../Classes/SimpleMotionComponent.names | 2 +- .../Classes/SimulatedBody.names | 12 +- .../Classes/SliceInstanceAddress.names | 4 +- .../Classes/SliceInstantiationTicket.names | 8 +- .../Classes/SmoothStep.names | 2 +- .../Classes/SmoothStepGradientComponent.names | 2 +- .../Classes/SmoothStepGradientConfig.names | 2 +- .../Classes/SpawnerConfig.names | 2 +- .../Classes/Specializations.names | 12 +- .../Classes/SphereShapeConfig.names | 2 +- .../TranslationAssets/Classes/String.names | 16 +- .../TranslationAssets/Classes/String_VM.names | 8 +- .../SurfaceAltitudeGradientComponent.names | 2 +- .../SurfaceAltitudeGradientConfig.names | 10 +- .../SurfaceMaskGradientComponent.names | 2 +- .../Classes/SurfaceMaskGradientConfig.names | 10 +- .../SurfaceSlopeGradientComponent.names | 2 +- .../Classes/SurfaceSlopeGradientConfig.names | 10 +- .../Classes/SurfaceTagWeight.names | 10 +- .../Classes/Tag Helper.names | 4 +- .../Classes/TestTupleMethods.names | 4 +- .../Classes/ThresholdGradientComponent.names | 2 +- .../Classes/ThresholdGradientConfig.names | 2 +- .../TranslationAssets/Classes/TickOrder.names | 2 +- .../Classes/TransformComponent.names | 2 +- .../Classes/TransformConfig.names | 30 +- .../Classes/TriggerEvent.names | 6 +- .../Classes/TypeExposition.names | 6 +- .../TranslationAssets/Classes/UVCoords.names | 28 +- .../TranslationAssets/Classes/UiAnchors.names | 28 +- .../Classes/UiFaderComponent.names | 2 +- .../Classes/UiImageComponent.names | 2 +- .../Classes/UiImageSequenceComponent.names | 2 +- .../Classes/UiLayoutCellComponent.names | 2 +- .../Classes/UiLayoutColumnComponent.names | 2 +- .../Classes/UiLayoutRowComponent.names | 2 +- .../TranslationAssets/Classes/UiOffsets.names | 12 +- .../TranslationAssets/Classes/UiPadding.names | 12 +- .../Classes/UiParticleEmitterComponent.names | 2 +- .../Classes/UiScrollBarComponent.names | 2 +- .../Classes/UiSliderComponent.names | 2 +- .../Classes/UiTextComponent.names | 2 +- .../Classes/UiTextInputComponent.names | 2 +- .../Classes/UiTooltipDisplayComponent.names | 2 +- .../Classes/UiTransform2dComponent.names | 2 +- .../Classes/Unit Testing.names | 26 +- .../Classes/UnitTesting.names | 26 +- .../TranslationAssets/Classes/Uuid.names | 22 +- .../Classes/VertexColor.names | 10 +- .../Classes/ViewPaneOptions.names | 2 +- ...SCognitoAuthorizationNotificationBus.names | 6 +- ...CognitoUserManagementNotificationBus.names | 26 +- .../AWSDynamoDBBehaviorNotificationBus.names | 6 +- .../AWSLambdaBehaviorNotificationBus.names | 6 +- .../Handlers/AWSMetricsNotificationBus.names | 6 +- .../AWSS3BehaviorNotificationBus.names | 10 +- .../ActorComponentNotificationBus.names | 6 +- .../EBus/Handlers/ActorNotificationBus.names | 18 +- .../AnimGraphComponentNotificationBus.names | 18 +- .../AttachmentComponentNotificationBus.names | 6 +- ...Audio System Component Notifications.names | 6 +- ...AudioTriggerComponentNotificationBus.names | 4 +- ...uthenticationProviderNotificationBus.names | 26 +- .../BlastFamilyComponentNotificationBus.names | 6 +- .../EBus/Handlers/CameraNotificationBus.names | 8 +- .../Handlers/CollisionNotificationBus.names | 8 +- .../Handlers/ConsoleNotificationBus.names | 4 +- .../EditorComponentModeNotificationBus.names | 4 +- .../EditorEntityContextNotificationBus.names | 6 +- .../EBus/Handlers/EditorEventBus.names | 4 +- .../EBus/Handlers/EntityBus.names | 6 +- .../FrameCaptureNotificationBus.names | 4 +- .../EBus/Handlers/GlobalScriptEvents.names | 8 +- .../Handlers/InputSystemNotificationBus.names | 6 +- .../EBus/Handlers/LocalScriptEvents.names | 8 +- .../EBus/Handlers/LookAtNotification.names | 4 +- .../MeshComponentNotificationBus.names | 4 +- .../NavigationComponentNotificationBus.names | 14 +- ...NetworkTestPlayerComponentBusHandler.names | 6 +- .../ProfilingCaptureNotificationBus.names | 10 +- .../ScriptBuildingNotificationBus.names | 6 +- .../SequenceComponentNotificationBus.names | 16 +- .../ShapeComponentNotificationsBus.names | 4 +- .../SimpleStateComponentNotificationBus.names | 4 +- .../SpawnerComponentNotificationBus.names | 12 +- .../EBus/Handlers/SubmarineEvents.names | 4 +- .../TagComponentNotificationsBus.names | 6 +- .../Handlers/TagGlobalNotificationBus.names | 6 +- .../EBus/Handlers/TickBus.names | 6 +- .../ToolsApplicationNotificationBus.names | 6 +- .../EBus/Handlers/TraceMessageBus.names | 20 +- .../Handlers/TransformNotificationBus.names | 10 +- .../Handlers/TriggerNotificationBus.names | 6 +- .../Handlers/UiAnimationNotificationBus.names | 6 +- .../Handlers/UiButtonNotificationBus.names | 4 +- .../UiCanvasAssetRefNotificationBus.names | 4 +- .../UiCanvasInputNotificationBus.names | 18 +- .../Handlers/UiCanvasNotificationBus.names | 4 +- .../Handlers/UiCanvasRefNotificationBus.names | 4 +- .../Handlers/UiCheckboxNotificationBus.names | 4 +- .../Handlers/UiDraggableNotificationBus.names | 8 +- .../UiDropTargetNotificationBus.names | 8 +- .../Handlers/UiDropdownNotificationBus.names | 8 +- .../UiDropdownOptionNotificationBus.names | 4 +- .../Handlers/UiDynamicScrollBoxDataBus.names | 20 +- ...namicScrollBoxElementNotificationBus.names | 14 +- .../Handlers/UiFaderNotificationBus.names | 8 +- .../UiFlipbookAnimationNotificationsBus.names | 8 +- .../EBus/Handlers/UiInitializationBus.names | 4 +- .../UiInteractableNotificationBus.names | 12 +- .../UiMarkupButtonNotificationsBus.names | 12 +- .../UiRadioButtonGroupNotificationBus.names | 4 +- .../UiRadioButtonNotificationBus.names | 4 +- .../Handlers/UiScrollBoxNotificationBus.names | 6 +- .../UiScrollableNotificationBus.names | 6 +- .../Handlers/UiScrollerNotificationBus.names | 6 +- .../Handlers/UiSliderNotificationBus.names | 6 +- .../Handlers/UiSpawnerNotificationBus.names | 14 +- .../Handlers/UiTextInputNotificationBus.names | 8 +- .../EBus/Handlers/VariableNotification.names | 4 +- .../EBus/Handlers/ViewPaneCallbackBus.names | 4 +- .../AWSCognitoAuthorizationRequestBus.names | 12 +- .../AWSCognitoUserManagementRequestBus.names | 16 +- .../EBus/Senders/AWSMetricsRequestBus.names | 6 +- .../AWSResourceMappingRequestBus.names | 16 +- .../Senders/ActorComponentRequestBus.names | 16 +- .../AnimAudioComponentRequestBus.names | 8 +- .../AnimGraphComponentNetworkRequestBus.names | 12 +- .../AnimGraphComponentRequestBus.names | 70 +- .../Senders/ArcBallControllerRequestBus.names | 38 +- .../EBus/Senders/AreaLightRequestBus.names | 64 +- .../EBus/Senders/AreaSystemRequestBus.names | 6 +- .../AssetCollectionAsyncLoaderTestBus.names | 14 +- .../EBus/Senders/AssetEditorRequestBus.names | 8 +- .../Senders/AtomToolsDocumentRequestBus.names | 40 +- .../AtomToolsDocumentSystemRequestBus.names | 24 +- ...AtomToolsMainWindowFactoryRequestBus.names | 6 +- .../AtomToolsMainWindowRequestBus.names | 16 +- .../AttachmentComponentRequestBus.names | 8 +- .../AudioEnvironmentComponentRequestBus.names | 6 +- .../AudioListenerComponentRequestBus.names | 10 +- .../AudioPreloadComponentRequestBus.names | 12 +- .../AudioRtpcComponentRequestBus.names | 6 +- .../AudioSwitchComponentRequestBus.names | 6 +- .../AudioSystemComponentRequestBus.names | 24 +- .../AudioTriggerComponentRequestBus.names | 16 +- .../AuthenticationProviderRequestBus.names | 22 +- .../BlastFamilyComponentRequestBus.names | 4 +- .../Senders/BlastFamilyDamageRequestBus.names | 18 +- .../EBus/Senders/BloomRequestBus.names | 130 +- .../EBus/Senders/BoundsRequestBus.names | 6 +- .../BoxShapeComponentRequestsBus.names | 8 +- .../EBus/Senders/CameraRequestBus.names | 34 +- .../EBus/Senders/CameraSystemRequestBus.names | 4 +- .../CapsuleShapeComponentRequestsBus.names | 8 +- .../CharacterControllerRequestBus.names | 26 +- .../Senders/CharacterGameplayRequestBus.names | 12 +- .../EBus/Senders/CollisionFilteringBus.names | 12 +- .../Senders/ComponentApplicationBus.names | 6 +- .../ComponentModeSystemRequestBus.names | 6 +- .../EBus/Senders/ConsoleRequestBus.names | 4 +- .../Senders/ConstantGradientRequestBus.names | 6 +- .../CylinderShapeComponentRequestsBus.names | 8 +- .../EBus/Senders/DebugDrawRequestBus.names | 32 +- .../EBus/Senders/DecalRequestBus.names | 18 +- .../EBus/Senders/DeferredFogRequestsBus.names | 46 +- .../EBus/Senders/DepthOfFieldRequestBus.names | 94 +- .../Senders/DirectionalLightRequestBus.names | 74 +- .../DiskShapeComponentRequestsBus.names | 8 +- .../Senders/DitherGradientRequestBus.names | 20 +- .../EBus/Senders/EditorCameraRequestBus.names | 10 +- .../Senders/EditorCameraViewRequestBus.names | 4 +- .../EBus/Senders/EditorEntityAPIBus.names | 12 +- .../EditorEntityContextRequestBus.names | 4 +- .../Senders/EditorEntityInfoRequestBus.names | 22 +- .../EditorLayerComponentRequestBus.names | 8 +- .../EditorLayerTrackViewRequestBus.names | 46 +- .../Senders/EditorReflectionProbeBus.names | 4 +- .../EBus/Senders/EditorRequestBus.names | 6 +- .../EditorToolsApplicationRequestBus.names | 20 +- ...ransformComponentSelectionRequestBus.names | 28 +- .../Senders/ExposureControlRequestBus.names | 66 +- .../EBus/Senders/FlyCameraInputBus.names | 6 +- .../ForceLinearDampingRequestBus.names | 6 +- .../Senders/ForceLocalSpaceRequestBus.names | 10 +- .../EBus/Senders/ForcePointRequestBus.names | 6 +- .../Senders/ForceSimpleDragRequestBus.names | 6 +- .../Senders/ForceSplineFollowRequestBus.names | 18 +- .../Senders/ForceWorldSpaceRequestBus.names | 10 +- .../EBus/Senders/FrameCaptureRequestBus.names | 8 +- .../Senders/GameEntityContextRequestBus.names | 14 +- .../EBus/Senders/GradientRequestBus.names | 4 +- .../GradientSurfaceDataRequestBus.names | 22 +- .../GradientTransformModifierRequestBus.names | 58 +- .../Senders/GraphControllerRequestBus.names | 16 +- .../EBus/Senders/GraphManagerRequestBus.names | 4 +- .../Senders/GridComponentRequestBus.names | 26 +- .../Senders/HDRColorGradingRequestBus.names | 138 +- .../EBus/Senders/HDRiSkyboxRequestBus.names | 6 +- .../HeightfieldProviderRequestsBus.names | 22 +- .../ImageBasedLightComponentRequestBus.names | 18 +- .../Senders/ImageGradientRequestBus.names | 14 +- .../EBus/Senders/InputSystemRequestBus.names | 4 +- .../Senders/InvertGradientRequestBus.names | 4 +- .../Senders/LevelsGradientRequestBus.names | 24 +- .../EBus/Senders/LookAt.names | 8 +- .../Senders/LookModificationRequestBus.names | 30 +- .../LyShineExamplesCppExampleBus.names | 6 +- .../Senders/MaterialComponentRequestBus.names | 98 +- .../Senders/MixedGradientRequestBus.names | 10 +- .../Multi-Position Audio Requests.names | 8 +- .../NavigationComponentRequestBus.names | 16 +- .../Senders/NonUniformScaleRequestBus.names | 6 +- .../Senders/PerformanceStatisticsEBus.names | 12 +- .../Senders/PerlinGradientRequestBus.names | 18 +- .../PhysXCharacterControllerRequestBus.names | 20 +- .../EBus/Senders/PhysicalSkyRequestBus.names | 18 +- ...PolygonPrismShapeComponentRequestBus.names | 16 +- .../EBus/Senders/PostFxLayerRequestBus.names | 10 +- .../Senders/PosterizeGradientRequestBus.names | 12 +- .../Senders/PrefabLoaderScriptingBus.names | 4 +- .../EBus/Senders/PrefabPublicRequestBus.names | 8 +- .../Senders/PrefabSystemScriptingBus.names | 4 +- .../Senders/ProfilingCaptureRequestBus.names | 10 +- .../EBus/Senders/PythonEditorBus.names | 60 +- .../QuadShapeComponentRequestsBus.names | 14 +- .../Senders/RandomGradientRequestBus.names | 6 +- .../RandomTimedSpawnerRequestBus.names | 22 +- .../Senders/ReferenceGradientRequestBus.names | 4 +- .../RenderMeshComponentRequestBus.names | 30 +- .../EBus/Senders/RigidBodyRequestBus.names | 68 +- .../EBus/Senders/SceneRequestBus.names | 10 +- .../Senders/SequenceComponentRequestBus.names | 24 +- .../ShapeAreaFalloffGradientRequestBus.names | 14 +- .../Senders/ShapeComponentRequestsBus.names | 12 +- .../SimpleMotionComponentRequestBus.names | 34 +- .../SimpleStateComponentRequestBus.names | 18 +- .../SimulatedBodyComponentRequestBus.names | 12 +- .../EBus/Senders/SkyBoxFogRequestBus.names | 18 +- .../EBus/Senders/SliceRequestBus.names | 12 +- .../SmoothStepGradientRequestBus.names | 4 +- .../EBus/Senders/SmoothStepRequestBus.names | 14 +- .../Senders/SpawnerComponentRequestBus.names | 24 +- .../SphereShapeComponentRequestsBus.names | 6 +- .../Senders/SplineComponentRequestBus.names | 16 +- .../EBus/Senders/SsaoRequestBus.names | 66 +- .../SurfaceAltitudeGradientRequestBus.names | 22 +- .../SurfaceMaskGradientRequestBus.names | 10 +- .../SurfaceSlopeGradientRequestBus.names | 22 +- .../EBus/Senders/TagComponentRequestBus.names | 8 +- .../EBus/Senders/TagGlobalRequestBus.names | 4 +- .../EBus/Senders/TerrainDataRequestBus.names | 24 +- .../Senders/ThresholdGradientRequestBus.names | 8 +- .../EBus/Senders/TickRequestBus.names | 6 +- .../Senders/ToolsApplicationRequestBus.names | 38 +- .../EBus/Senders/TransformBus.names | 86 +- .../TubeShapeComponentRequestsBus.names | 12 +- .../EBus/Senders/UiAnimationBus.names | 28 +- .../EBus/Senders/UiButtonBus.names | 6 +- .../EBus/Senders/UiCanvasAssetRefBus.names | 6 +- .../EBus/Senders/UiCanvasBus.names | 80 +- .../EBus/Senders/UiCanvasManagerBus.names | 10 +- .../EBus/Senders/UiCanvasProxyRefBus.names | 4 +- .../EBus/Senders/UiCanvasRefBus.names | 4 +- .../EBus/Senders/UiCheckboxBus.names | 28 +- .../EBus/Senders/UiClickableTextBus.names | 4 +- .../EBus/Senders/UiCursorBus.names | 12 +- .../EBus/Senders/UiCustomImageBus.names | 18 +- .../EBus/Senders/UiDraggableBus.names | 20 +- .../EBus/Senders/UiDropTargetBus.names | 10 +- .../EBus/Senders/UiDropdownBus.names | 50 +- .../EBus/Senders/UiDropdownOptionBus.names | 14 +- .../Senders/UiDynamicContentDatabaseBus.names | 12 +- .../EBus/Senders/UiDynamicLayoutBus.names | 4 +- .../EBus/Senders/UiDynamicScrollBoxBus.names | 62 +- .../EBus/Senders/UiElementBus.names | 30 +- .../EBus/Senders/UiFaderBus.names | 14 +- .../EBus/Senders/UiFlipbookAnimationBus.names | 52 +- .../EBus/Senders/UiImageBus.names | 60 +- .../EBus/Senders/UiImageSequenceBus.names | 6 +- .../EBus/Senders/UiIndexableImageBus.names | 14 +- .../Senders/UiInteractableActionsBus.names | 18 +- .../EBus/Senders/UiInteractableBus.names | 14 +- .../Senders/UiInteractableStatesBus.names | 28 +- .../EBus/Senders/UiLayoutBus.names | 14 +- .../EBus/Senders/UiLayoutCellBus.names | 34 +- .../EBus/Senders/UiLayoutColumnBus.names | 14 +- .../EBus/Senders/UiLayoutFitterBus.names | 10 +- .../EBus/Senders/UiLayoutGridBus.names | 26 +- .../EBus/Senders/UiLayoutRowBus.names | 14 +- .../EBus/Senders/UiMarkupButtonBus.names | 10 +- .../EBus/Senders/UiMaskBus.names | 26 +- .../EBus/Senders/UiNavigationBus.names | 22 +- .../EBus/Senders/UiParticleEmitterBus.names | 206 +- .../EBus/Senders/UiRadioButtonBus.names | 26 +- .../EBus/Senders/UiRadioButtonGroupBus.names | 20 +- .../EBus/Senders/UiScrollBarBus.names | 26 +- .../EBus/Senders/UiScrollBoxBus.names | 62 +- .../EBus/Senders/UiScrollerBus.names | 18 +- .../EBus/Senders/UiSliderBus.names | 38 +- .../EBus/Senders/UiSpawnerBus.names | 8 +- .../EBus/Senders/UiTextBus.names | 64 +- .../EBus/Senders/UiTextInputBus.names | 54 +- .../EBus/Senders/UiTooltipBus.names | 6 +- .../EBus/Senders/UiTooltipDisplayBus.names | 34 +- .../EBus/Senders/UiTransform2dBus.names | 20 +- .../EBus/Senders/UiTransformBus.names | 60 +- .../EBus/Senders/ViewportRequestBus.names | 14 +- .../EBus/Senders/WindRequestsBus.names | 8 +- .../GlobalMethods/CreateBoxCastRequest.names | 4 +- .../CreateBoxOverlapRequest.names | 4 +- .../CreateCapsuleCastRequest.names | 4 +- .../CreateCapsuleOverlapRequest.names | 4 +- .../CreateSphereCastRequest.names | 4 +- .../CreateSphereOverlapRequest.names | 4 +- .../GlobalMethods/GetPhysicsSystem.names | 4 +- .../SaveShaderVariantListSourceData.names | 4 +- .../GlobalMethods/SettingsRegistry.names | 4 +- .../GlobalMethods/Terminate.names | 4 +- .../GlobalMethods/add_layer_node.names | 4 +- .../GlobalMethods/add_node.names | 4 +- .../GlobalMethods/add_selected_entities.names | 4 +- .../GlobalMethods/add_track.names | 4 +- .../GlobalMethods/attach_debugger.names | 4 +- .../GlobalMethods/bind_viewport.names | 4 +- .../GlobalMethods/clear_selection.names | 4 +- .../GlobalMethods/close_pane.names | 4 +- .../GlobalMethods/combo_box.names | 4 +- .../GlobalMethods/crash.names | 4 +- .../GlobalMethods/create_level.names | 4 +- .../create_level_no_prompt.names | 4 +- .../GlobalMethods/delete_node.names | 4 +- .../GlobalMethods/delete_object.names | 4 +- .../GlobalMethods/delete_selected.names | 4 +- .../GlobalMethods/delete_sequence.names | 4 +- .../GlobalMethods/delete_track.names | 4 +- .../GlobalMethods/draw_label.names | 4 +- .../GlobalMethods/dump_exposed_classes.names | 4 +- .../GlobalMethods/edit_box.names | 4 +- .../edit_box_check_data_type.names | 4 +- .../GlobalMethods/enable_for_all.names | 4 +- .../GlobalMethods/enter_game_mode.names | 4 +- .../GlobalMethods/enter_simulation_mode.names | 4 +- .../GlobalMethods/execute_command.names | 4 +- .../GlobalMethods/exit.names | 4 +- .../GlobalMethods/exit_game_mode.names | 4 +- .../GlobalMethods/exit_no_prompt.names | 4 +- .../GlobalMethods/exit_simulation_mode.names | 4 +- .../GlobalMethods/export_to_engine.names | 4 +- .../GlobalMethods/find_editor_entity.names | 4 +- .../GlobalMethods/find_game_entity.names | 4 +- .../GlobalMethods/freeze_object.names | 4 +- .../GlobalMethods/get_active_viewport.names | 4 +- .../GlobalMethods/get_all_objects.names | 4 +- .../GlobalMethods/get_axis_constraint.names | 4 +- .../GlobalMethods/get_config_platform.names | 4 +- .../GlobalMethods/get_config_spec.names | 4 +- .../get_current_level_name.names | 4 +- .../get_current_level_path.names | 4 +- .../get_current_view_position.names | 4 +- .../get_current_view_rotation.names | 4 +- .../GlobalMethods/get_cvar.names | 4 +- .../GlobalMethods/get_file_alias.names | 4 +- .../GlobalMethods/get_game_folder.names | 4 +- .../get_interpolated_value.names | 4 +- .../GlobalMethods/get_key_value.names | 4 +- .../get_misc_editor_settings.names | 4 +- .../get_names_of_selected_objects.names | 4 +- .../GlobalMethods/get_node_name.names | 4 +- .../GlobalMethods/get_num_nodes.names | 4 +- .../GlobalMethods/get_num_selected.names | 4 +- .../GlobalMethods/get_num_sequences.names | 4 +- .../GlobalMethods/get_num_track_keys.names | 4 +- .../GlobalMethods/get_pak_from_file.names | 4 +- .../GlobalMethods/get_pane_class_names.names | 4 +- .../GlobalMethods/get_position.names | 4 +- .../GlobalMethods/get_rotation.names | 4 +- .../GlobalMethods/get_scale.names | 4 +- .../GlobalMethods/get_selection_aabb.names | 4 +- .../GlobalMethods/get_selection_center.names | 4 +- .../GlobalMethods/get_sequence_name.names | 4 +- .../get_sequence_time_range.names | 4 +- .../GlobalMethods/get_view_pane_layout.names | 4 +- .../GlobalMethods/get_viewport_count.names | 4 +- .../get_viewport_expansion_policy.names | 4 +- .../GlobalMethods/get_viewport_size.names | 4 +- .../GlobalMethods/hide_all_objects.names | 4 +- .../GlobalMethods/hide_object.names | 4 +- .../GlobalMethods/idle_enable.names | 4 +- .../GlobalMethods/idle_is_enabled.names | 4 +- .../GlobalMethods/idle_wait.names | 4 +- .../GlobalMethods/idle_wait_frames.names | 4 +- .../GlobalMethods/is_helpers_shown.names | 4 +- .../GlobalMethods/is_idle_enabled.names | 4 +- .../GlobalMethods/is_in_game_mode.names | 4 +- .../GlobalMethods/is_in_simulation_mode.names | 4 +- .../GlobalMethods/is_object_frozen.names | 4 +- .../GlobalMethods/is_object_hidden.names | 4 +- .../GlobalMethods/is_pane_visible.names | 4 +- .../GlobalMethods/launch_lua_editor.names | 4 +- .../GlobalMethods/load_all_plugins.names | 4 +- .../TranslationAssets/GlobalMethods/log.names | 4 +- .../GlobalMethods/message_box.names | 4 +- .../GlobalMethods/message_box_ok.names | 4 +- .../GlobalMethods/message_box_yes_no.names | 4 +- .../GlobalMethods/new_sequence.names | 4 +- .../GlobalMethods/open_file_box.names | 4 +- .../GlobalMethods/open_level.names | 4 +- .../GlobalMethods/open_level_no_prompt.names | 4 +- .../GlobalMethods/open_pane.names | 4 +- .../GlobalMethods/play_sequence.names | 4 +- .../GlobalMethods/redo.names | 4 +- .../GlobalMethods/reload_current_level.names | 4 +- .../GlobalMethods/rename_object.names | 4 +- .../GlobalMethods/resize_viewport.names | 4 +- .../GlobalMethods/run_console.names | 4 +- .../GlobalMethods/run_file.names | 4 +- .../GlobalMethods/run_file_parameters.names | 4 +- .../GlobalMethods/save_level.names | 4 +- .../GlobalMethods/select_object.names | 4 +- .../GlobalMethods/select_objects.names | 4 +- .../GlobalMethods/set_active_viewport.names | 4 +- .../GlobalMethods/set_axis_constraint.names | 4 +- .../GlobalMethods/set_config_spec.names | 4 +- .../GlobalMethods/set_current_sequence.names | 4 +- .../set_current_view_position.names | 4 +- .../set_current_view_rotation.names | 4 +- .../GlobalMethods/set_cvar.names | 4 +- .../GlobalMethods/set_cvar_float.names | 4 +- .../GlobalMethods/set_cvar_integer.names | 4 +- .../GlobalMethods/set_cvar_string.names | 4 +- .../set_misc_editor_settings.names | 4 +- .../GlobalMethods/set_position.names | 4 +- .../GlobalMethods/set_recording.names | 4 +- .../GlobalMethods/set_result_to_failure.names | 4 +- .../GlobalMethods/set_result_to_success.names | 4 +- .../GlobalMethods/set_rotation.names | 4 +- .../GlobalMethods/set_scale.names | 4 +- .../set_sequence_time_range.names | 4 +- .../GlobalMethods/set_time.names | 4 +- .../GlobalMethods/set_view_pane_layout.names | 4 +- .../set_viewport_expansion_policy.names | 4 +- .../GlobalMethods/set_viewport_size.names | 4 +- .../start_process_detached.names | 4 +- .../GlobalMethods/stop_sequence.names | 4 +- .../GlobalMethods/test_output.names | 4 +- .../GlobalMethods/toggle_helpers.names | 4 +- .../GlobalMethods/undo.names | 4 +- .../GlobalMethods/unfreeze_object.names | 4 +- .../GlobalMethods/unhide_all_objects.names | 4 +- .../GlobalMethods/unhide_object.names | 4 +- .../GlobalMethods/unselect_objects.names | 4 +- .../GlobalMethods/update_viewport.names | 4 +- .../GlobalMethods/wait_for_debugger.names | 4 +- .../Assets/TranslationAssets/Globals.names | 6 +- .../Nodes/Containers_AddElementatEnd.names | 10 +- .../Nodes/Containers_ClearAllElements.names | 10 +- .../Nodes/Containers_Erase.names | 12 +- .../Nodes/Containers_ForEach.names | 12 +- .../Nodes/Containers_GetElement.names | 10 +- .../Nodes/Containers_GetFirstElement.names | 8 +- .../Nodes/Containers_GetLastElement.names | 8 +- .../Nodes/Containers_GetSize.names | 10 +- .../Nodes/Containers_Insert.names | 10 +- .../Nodes/Containers_IsEmpty.names | 14 +- .../Nodes/Core_AZEventHandler.names | 12 +- .../Nodes/Core_EventHandler.names | 12 +- .../Nodes/Core_FunctionCallNode.names | 2 +- .../Nodes/Core_FunctionDefinition.names | 6 +- .../TranslationAssets/Nodes/Core_Method.names | 2 +- .../Nodes/Core_MethodOverloaded.names | 2 +- .../Nodes/Core_Nodeling.names | 2 +- .../Nodes/Core_ReceiveScriptEvent.names | 12 +- .../Nodes/Core_SendScriptEvent.names | 6 +- .../Nodes/Deprecated_Add.names | 12 +- .../Nodes/Deprecated_DivideByNumber.names | 12 +- .../Nodes/Deprecated_DivideByVector.names | 12 +- .../Nodes/Deprecated_Length.names | 10 +- .../Nodes/Deprecated_MultiplyByColor.names | 12 +- .../Nodes/Deprecated_MultiplyByMatrix.names | 12 +- .../Nodes/Deprecated_MultiplyByRotation.names | 12 +- .../Deprecated_MultiplyByTransform.names | 12 +- .../Nodes/Deprecated_MultiplyByVector.names | 12 +- .../Nodes/Deprecated_Negate.names | 10 +- .../Nodes/Deprecated_Subtract.names | 12 +- .../Nodes/Developer_Mock.names | 2 +- .../Nodes/Developer_WrapperMock.names | 2 +- .../Nodes/EntityEntity_GetEntityForward.names | 12 +- .../Nodes/EntityEntity_GetEntityRight.names | 12 +- .../Nodes/EntityEntity_GetEntityUp.names | 12 +- .../Nodes/EntityEntity_IsActive.names | 10 +- .../Nodes/EntityEntity_IsValid.names | 10 +- .../Nodes/EntityEntity_ToString.names | 10 +- .../Nodes/Input_InputHandler.names | 16 +- .../Nodes/Internal_ExpressionNodeBase.names | 4 +- .../Nodes/Internal_ScriptEvent.names | 2 +- .../Nodes/Internal_StringFormatted.names | 8 +- .../Nodes/LogicDeprecated_Indexer.names | 20 +- .../TranslationAssets/Nodes/Logic_And.names | 14 +- .../TranslationAssets/Nodes/Logic_Any.names | 6 +- .../TranslationAssets/Nodes/Logic_Break.names | 6 +- .../TranslationAssets/Nodes/Logic_Cycle.names | 6 +- .../TranslationAssets/Nodes/Logic_If.names | 10 +- .../Nodes/Logic_IsNull.names | 12 +- .../Nodes/Logic_Multiplexer.names | 22 +- .../TranslationAssets/Nodes/Logic_Not.names | 12 +- .../TranslationAssets/Nodes/Logic_Once.names | 10 +- .../TranslationAssets/Nodes/Logic_Or.names | 14 +- .../Nodes/Logic_OrderedSequencer.names | 6 +- .../Nodes/Logic_RandomSignal.names | 8 +- .../Nodes/Logic_Sequencer.names | 26 +- .../Nodes/Logic_Switch.names | 8 +- .../TranslationAssets/Nodes/Logic_While.names | 10 +- .../Nodes/MathAABB_AddAABB.names | 12 +- .../Nodes/MathAABB_AddPoint.names | 12 +- .../Nodes/MathAABB_ApplyTransform.names | 12 +- .../Nodes/MathAABB_Center.names | 10 +- .../Nodes/MathAABB_Clamp.names | 12 +- .../Nodes/MathAABB_ContainsAABB.names | 12 +- .../Nodes/MathAABB_ContainsVector3.names | 12 +- .../Nodes/MathAABB_Distance.names | 12 +- .../Nodes/MathAABB_Expand.names | 12 +- .../Nodes/MathAABB_Extents.names | 10 +- .../MathAABB_FromCenterHalfExtents.names | 12 +- .../Nodes/MathAABB_FromCenterRadius.names | 12 +- .../Nodes/MathAABB_FromMinMax.names | 12 +- .../Nodes/MathAABB_FromOBB.names | 10 +- .../Nodes/MathAABB_FromPoint.names | 10 +- .../Nodes/MathAABB_GetMax.names | 10 +- .../Nodes/MathAABB_GetMin.names | 10 +- .../Nodes/MathAABB_IsFinite.names | 10 +- .../Nodes/MathAABB_IsValid.names | 10 +- .../Nodes/MathAABB_Null.names | 8 +- .../Nodes/MathAABB_Overlaps.names | 12 +- .../Nodes/MathAABB_SurfaceArea.names | 10 +- .../Nodes/MathAABB_ToSphere.names | 12 +- .../Nodes/MathAABB_Translate.names | 12 +- .../Nodes/MathAABB_XExtent.names | 10 +- .../Nodes/MathAABB_YExtent.names | 10 +- .../Nodes/MathAABB_ZExtent.names | 10 +- .../Nodes/MathColor_Dot.names | 12 +- .../Nodes/MathColor_Dot3.names | 12 +- .../Nodes/MathColor_FromValues.names | 16 +- .../Nodes/MathColor_FromVector3.names | 10 +- .../MathColor_FromVector3AndNumber.names | 12 +- .../Nodes/MathColor_GammaToLinear.names | 10 +- .../Nodes/MathColor_IsClose.names | 14 +- .../Nodes/MathColor_IsZero.names | 12 +- .../Nodes/MathColor_LinearToGamma.names | 10 +- .../Nodes/MathColor_MultiplyByNumber.names | 12 +- .../Nodes/MathColor_One.names | 8 +- .../Nodes/MathComparisons_EqualTo_==_.names | 14 +- .../Nodes/MathComparisons_GreaterThan__.names | 14 +- ...hComparisons_GreaterThanorEqualTo_=_.names | 14 +- .../Nodes/MathComparisons_LessThan___.names | 14 +- ...athComparisons_LessThanorEqualTo__=_.names | 14 +- .../MathComparisons_NotEqualTo_!=_.names | 14 +- .../Nodes/MathCrc32_FromString.names | 10 +- .../Nodes/MathMatrix3x3_FromColumns.names | 14 +- .../MathMatrix3x3_FromCrossProduct.names | 10 +- .../Nodes/MathMatrix3x3_FromDiagonal.names | 10 +- .../Nodes/MathMatrix3x3_FromMatrix4x4.names | 10 +- .../Nodes/MathMatrix3x3_FromQuaternion.names | 10 +- .../MathMatrix3x3_FromRotationXDegrees.names | 10 +- .../MathMatrix3x3_FromRotationYDegrees.names | 10 +- .../MathMatrix3x3_FromRotationZDegrees.names | 10 +- .../Nodes/MathMatrix3x3_FromRows.names | 14 +- .../Nodes/MathMatrix3x3_FromScale.names | 10 +- .../Nodes/MathMatrix3x3_FromTransform.names | 10 +- .../Nodes/MathMatrix3x3_GetColumn.names | 12 +- .../Nodes/MathMatrix3x3_GetColumns.names | 14 +- .../Nodes/MathMatrix3x3_GetDiagonal.names | 10 +- .../Nodes/MathMatrix3x3_GetElement.names | 14 +- .../Nodes/MathMatrix3x3_GetRow.names | 12 +- .../Nodes/MathMatrix3x3_GetRows.names | 14 +- .../Nodes/MathMatrix3x3_Invert.names | 10 +- .../Nodes/MathMatrix3x3_IsClose.names | 14 +- .../Nodes/MathMatrix3x3_IsFinite.names | 10 +- .../Nodes/MathMatrix3x3_IsOrthogonal.names | 10 +- .../MathMatrix3x3_MultiplyByNumber.names | 12 +- .../MathMatrix3x3_MultiplyByVector.names | 12 +- .../Nodes/MathMatrix3x3_Orthogonalize.names | 10 +- .../Nodes/MathMatrix3x3_ToAdjugate.names | 10 +- .../Nodes/MathMatrix3x3_ToDeterminant.names | 10 +- .../Nodes/MathMatrix3x3_ToScale.names | 10 +- .../Nodes/MathMatrix3x3_Transpose.names | 10 +- .../Nodes/MathMatrix3x3_Zero.names | 8 +- .../Nodes/MathMatrix4x4_FromColumns.names | 16 +- .../Nodes/MathMatrix4x4_FromDiagonal.names | 10 +- .../Nodes/MathMatrix4x4_FromMatrix3x3.names | 10 +- .../Nodes/MathMatrix4x4_FromQuaternion.names | 10 +- ...trix4x4_FromQuaternionAndTranslation.names | 12 +- .../MathMatrix4x4_FromRotationXDegrees.names | 10 +- .../MathMatrix4x4_FromRotationYDegrees.names | 10 +- .../MathMatrix4x4_FromRotationZDegrees.names | 10 +- .../Nodes/MathMatrix4x4_FromRows.names | 16 +- .../Nodes/MathMatrix4x4_FromScale.names | 10 +- .../Nodes/MathMatrix4x4_FromTransform.names | 10 +- .../Nodes/MathMatrix4x4_FromTranslation.names | 10 +- .../Nodes/MathMatrix4x4_GetColumn.names | 12 +- .../Nodes/MathMatrix4x4_GetColumns.names | 16 +- .../Nodes/MathMatrix4x4_GetDiagonal.names | 10 +- .../Nodes/MathMatrix4x4_GetElement.names | 14 +- .../Nodes/MathMatrix4x4_GetRow.names | 12 +- .../Nodes/MathMatrix4x4_GetRows.names | 16 +- .../Nodes/MathMatrix4x4_GetTranslation.names | 10 +- .../Nodes/MathMatrix4x4_Invert.names | 10 +- .../Nodes/MathMatrix4x4_IsClose.names | 14 +- .../Nodes/MathMatrix4x4_IsFinite.names | 10 +- .../MathMatrix4x4_MultiplyByVector.names | 12 +- .../Nodes/MathMatrix4x4_ToScale.names | 10 +- .../Nodes/MathMatrix4x4_Transpose.names | 10 +- .../Nodes/MathMatrix4x4_Zero.names | 8 +- .../Nodes/MathNumberDeprecated_Add.names | 12 +- .../Nodes/MathNumberDeprecated_Divide.names | 12 +- .../Nodes/MathNumberDeprecated_Multiply.names | 12 +- .../Nodes/MathNumberDeprecated_Subtract.names | 12 +- .../Nodes/MathOBB_FromAabb.names | 10 +- ...B_FromPositionRotationAndHalfLengths.names | 14 +- .../Nodes/MathOBB_GetAxisX.names | 10 +- .../Nodes/MathOBB_GetAxisY.names | 10 +- .../Nodes/MathOBB_GetAxisZ.names | 10 +- .../Nodes/MathOBB_GetPosition.names | 10 +- .../Nodes/MathOBB_IsFinite.names | 10 +- .../Nodes/MathPlane_DistanceToPoint.names | 12 +- .../Nodes/MathPlane_FromCoefficients.names | 16 +- .../MathPlane_FromNormalAndDistance.names | 12 +- .../Nodes/MathPlane_FromNormalAndPoint.names | 12 +- .../Nodes/MathPlane_GetDistance.names | 10 +- .../Nodes/MathPlane_GetNormal.names | 10 +- ...thPlane_GetPlaneEquationCoefficients.names | 16 +- .../Nodes/MathPlane_IsFinite.names | 10 +- .../Nodes/MathPlane_Project.names | 12 +- .../Nodes/MathPlane_Transform.names | 12 +- .../Nodes/MathQuaternion_Conjugate.names | 10 +- ...uaternion_ConvertTransformToRotation.names | 10 +- ...MathQuaternion_CreateFromEulerAngles.names | 14 +- .../Nodes/MathQuaternion_Dot.names | 12 +- .../MathQuaternion_FromAxisAngleDegrees.names | 12 +- .../Nodes/MathQuaternion_FromMatrix3x3.names | 10 +- .../Nodes/MathQuaternion_FromMatrix4x4.names | 10 +- .../Nodes/MathQuaternion_FromTransform.names | 10 +- .../Nodes/MathQuaternion_InvertFull.names | 10 +- .../Nodes/MathQuaternion_IsClose.names | 14 +- .../Nodes/MathQuaternion_IsFinite.names | 10 +- .../Nodes/MathQuaternion_IsIdentity.names | 12 +- .../Nodes/MathQuaternion_IsZero.names | 12 +- .../MathQuaternion_LengthReciprocal.names | 10 +- .../Nodes/MathQuaternion_LengthSquared.names | 10 +- .../Nodes/MathQuaternion_Lerp.names | 14 +- .../MathQuaternion_MultiplyByNumber.names | 12 +- .../Nodes/MathQuaternion_Negate.names | 10 +- .../Nodes/MathQuaternion_Normalize.names | 10 +- .../Nodes/MathQuaternion_RotateVector3.names | 12 +- .../MathQuaternion_RotationXDegrees.names | 10 +- .../MathQuaternion_RotationYDegrees.names | 10 +- .../MathQuaternion_RotationZDegrees.names | 10 +- .../Nodes/MathQuaternion_ShortestArc.names | 12 +- .../Nodes/MathQuaternion_Slerp.names | 14 +- .../Nodes/MathQuaternion_Squad.names | 18 +- .../Nodes/MathQuaternion_ToAngleDegrees.names | 10 +- .../Nodes/MathRandom_RandomColor.names | 12 +- .../Nodes/MathRandom_RandomGrayscale.names | 12 +- .../Nodes/MathRandom_RandomInteger.names | 12 +- .../Nodes/MathRandom_RandomNumber.names | 12 +- .../Nodes/MathRandom_RandomPointInArc.names | 18 +- .../Nodes/MathRandom_RandomPointInBox.names | 10 +- .../MathRandom_RandomPointInCircle.names | 10 +- .../Nodes/MathRandom_RandomPointInCone.names | 12 +- .../MathRandom_RandomPointInCylinder.names | 12 +- .../MathRandom_RandomPointInEllipsoid.names | 10 +- .../MathRandom_RandomPointInSphere.names | 10 +- .../MathRandom_RandomPointInSquare.names | 10 +- .../Nodes/MathRandom_RandomPointInWedge.names | 20 +- .../MathRandom_RandomPointOnCircle.names | 10 +- .../MathRandom_RandomPointOnSphere.names | 10 +- .../Nodes/MathRandom_RandomQuaternion.names | 12 +- .../Nodes/MathRandom_RandomUnitVector2.names | 8 +- .../Nodes/MathRandom_RandomUnitVector3.names | 8 +- .../Nodes/MathRandom_RandomVector2.names | 12 +- .../Nodes/MathRandom_RandomVector3.names | 12 +- .../Nodes/MathRandom_RandomVector4.names | 12 +- .../Nodes/MathTransform_FromMatrix3x3.names | 10 +- ...ransform_FromMatrix3x3AndTranslation.names | 12 +- .../Nodes/MathTransform_FromRotation.names | 10 +- ...Transform_FromRotationAndTranslation.names | 12 +- .../Nodes/MathTransform_FromScale.names | 10 +- .../Nodes/MathTransform_FromTranslation.names | 10 +- .../Nodes/MathTransform_GetForward.names | 12 +- .../Nodes/MathTransform_GetRight.names | 12 +- .../Nodes/MathTransform_GetTranslation.names | 10 +- .../Nodes/MathTransform_GetUp.names | 12 +- .../Nodes/MathTransform_IsClose.names | 14 +- .../Nodes/MathTransform_IsFinite.names | 10 +- .../Nodes/MathTransform_IsOrthogonal.names | 12 +- ...MathTransform_MultiplyByUniformScale.names | 12 +- .../MathTransform_MultiplyByVector3.names | 12 +- .../MathTransform_MultiplyByVector4.names | 12 +- .../Nodes/MathTransform_Orthogonalize.names | 10 +- .../MathTransform_RotationXDegrees.names | 10 +- .../MathTransform_RotationYDegrees.names | 10 +- .../MathTransform_RotationZDegrees.names | 10 +- .../Nodes/MathTransform_ToScale.names | 10 +- .../Nodes/MathVector2_Absolute.names | 10 +- .../Nodes/MathVector2_Angle.names | 10 +- .../Nodes/MathVector2_Clamp.names | 14 +- .../Nodes/MathVector2_DirectionTo.names | 14 +- .../Nodes/MathVector2_Distance.names | 12 +- .../Nodes/MathVector2_DistanceSquared.names | 12 +- .../Nodes/MathVector2_Dot.names | 12 +- .../Nodes/MathVector2_FromValues.names | 12 +- .../Nodes/MathVector2_GetElement.names | 12 +- .../Nodes/MathVector2_IsClose.names | 14 +- .../Nodes/MathVector2_IsFinite.names | 10 +- .../Nodes/MathVector2_IsNormalized.names | 12 +- .../Nodes/MathVector2_IsZero.names | 12 +- .../Nodes/MathVector2_Length.names | 10 +- .../Nodes/MathVector2_LengthSquared.names | 10 +- .../Nodes/MathVector2_Lerp.names | 14 +- .../Nodes/MathVector2_Max.names | 12 +- .../Nodes/MathVector2_Min.names | 12 +- .../Nodes/MathVector2_MultiplyByNumber.names | 12 +- .../Nodes/MathVector2_Negate.names | 10 +- .../Nodes/MathVector2_Normalize.names | 10 +- .../Nodes/MathVector2_Project.names | 12 +- .../Nodes/MathVector2_SetX.names | 12 +- .../Nodes/MathVector2_SetY.names | 12 +- .../Nodes/MathVector2_Slerp.names | 14 +- .../Nodes/MathVector2_ToPerpendicular.names | 10 +- .../Nodes/MathVector3_Absolute.names | 10 +- .../Nodes/MathVector3_BuildTangentBasis.names | 12 +- .../Nodes/MathVector3_Clamp.names | 14 +- .../Nodes/MathVector3_Cross.names | 12 +- .../Nodes/MathVector3_DirectionTo.names | 14 +- .../Nodes/MathVector3_Distance.names | 12 +- .../Nodes/MathVector3_DistanceSquared.names | 12 +- .../Nodes/MathVector3_Dot.names | 12 +- .../Nodes/MathVector3_FromValues.names | 14 +- .../Nodes/MathVector3_GetElement.names | 12 +- .../Nodes/MathVector3_IsClose.names | 14 +- .../Nodes/MathVector3_IsFinite.names | 10 +- .../Nodes/MathVector3_IsNormalized.names | 12 +- .../Nodes/MathVector3_IsPerpendicular.names | 14 +- .../Nodes/MathVector3_IsZero.names | 12 +- .../Nodes/MathVector3_Length.names | 10 +- .../Nodes/MathVector3_LengthReciprocal.names | 10 +- .../Nodes/MathVector3_LengthSquared.names | 10 +- .../Nodes/MathVector3_Lerp.names | 14 +- .../Nodes/MathVector3_Max.names | 12 +- .../Nodes/MathVector3_Min.names | 12 +- .../Nodes/MathVector3_MultiplyByNumber.names | 12 +- .../Nodes/MathVector3_Negate.names | 10 +- .../Nodes/MathVector3_Normalize.names | 10 +- .../Nodes/MathVector3_Project.names | 12 +- .../Nodes/MathVector3_Reciprocal.names | 10 +- .../Nodes/MathVector3_SetX.names | 12 +- .../Nodes/MathVector3_SetY.names | 12 +- .../Nodes/MathVector3_SetZ.names | 12 +- .../Nodes/MathVector3_Slerp.names | 14 +- .../Nodes/MathVector4_Absolute.names | 10 +- .../Nodes/MathVector4_DirectionTo.names | 14 +- .../Nodes/MathVector4_Dot.names | 12 +- .../Nodes/MathVector4_FromValues.names | 16 +- .../Nodes/MathVector4_GetElement.names | 12 +- .../Nodes/MathVector4_IsClose.names | 14 +- .../Nodes/MathVector4_IsFinite.names | 10 +- .../Nodes/MathVector4_IsNormalized.names | 12 +- .../Nodes/MathVector4_IsZero.names | 12 +- .../Nodes/MathVector4_Length.names | 10 +- .../Nodes/MathVector4_LengthReciprocal.names | 10 +- .../Nodes/MathVector4_LengthSquared.names | 10 +- .../Nodes/MathVector4_MultiplyByNumber.names | 12 +- .../Nodes/MathVector4_Negate.names | 10 +- .../Nodes/MathVector4_Normalize.names | 10 +- .../Nodes/MathVector4_Reciprocal.names | 10 +- .../Nodes/MathVector4_SetW.names | 12 +- .../Nodes/MathVector4_SetX.names | 12 +- .../Nodes/MathVector4_SetY.names | 12 +- .../Nodes/MathVector4_SetZ.names | 12 +- .../TranslationAssets/Nodes/Math_Add_+_.names | 12 +- .../Nodes/Math_Divide__.names | 12 +- .../Nodes/Math_DividebyNumber__.names | 12 +- .../TranslationAssets/Nodes/Math_Length.names | 10 +- .../Nodes/Math_LerpBetween.names | 26 +- .../Nodes/Math_MathExpression.names | 8 +- .../Nodes/Math_MultiplyAndAdd.names | 14 +- .../Nodes/Math_Multiply_x_.names | 12 +- .../Nodes/Math_StringToNumber.names | 8 +- .../Nodes/Math_Subtract_-_.names | 12 +- .../Nodes/Math_ThreeGeneric.names | 18 +- .../Nodes/Nodeables_Duration.names | 14 +- .../Nodes/Nodeables_Repeater.names | 14 +- .../Nodes/Nodeables_TimeDelay.names | 10 +- ...peratorsMath_OperatorArithmeticUnary.names | 12 +- .../Nodes/Operators_OperatorArithmetic.names | 12 +- .../Nodes/Operators_OperatorBase.names | 6 +- .../Nodes/PhysXWorld_BoxCastWithGroup.names | 30 +- .../PhysXWorld_CapsuleCastWithGroup.names | 32 +- .../PhysXWorld_OverlapBoxWithGroup.names | 16 +- .../PhysXWorld_OverlapCapsuleWithGroup.names | 18 +- .../PhysXWorld_OverlapSphereWithGroup.names | 16 +- ...hysXWorld_RayCastLocalSpaceWithGroup.names | 28 +- ...d_RayCastMultipleLocalSpaceWithGroup.names | 18 +- ...hysXWorld_RayCastWorldSpaceWithGroup.names | 28 +- .../PhysXWorld_SphereCastWithGroup.names | 30 +- .../Nodes/Spawning_Spawn.names | 16 +- .../Nodes/String_BuildString.names | 10 +- .../Nodes/String_ContainsString.names | 18 +- .../Nodes/String_EndsWith.names | 14 +- .../TranslationAssets/Nodes/String_Join.names | 12 +- .../Nodes/String_ReplaceString.names | 16 +- .../Nodes/String_Split.names | 12 +- .../Nodes/String_StartsWith.names | 14 +- .../Nodes/String_Substring.names | 14 +- .../Nodes/String_ToLower.names | 10 +- .../Nodes/String_ToUpper.names | 10 +- .../Nodes/Tests_BranchInputTypeExample.names | 20 +- ...ts_BranchMethodSharedDataSlotExample.names | 22 +- ...sts_InputMethodSharedDataSlotExample.names | 24 +- .../Nodes/Tests_InputTypeExample.names | 20 +- .../Nodes/Tests_PropertyExample.names | 6 +- .../Nodes/Tests_ReturnTypeExample.names | 20 +- .../Nodes/Timing_Delay.names | 30 +- .../Nodes/Timing_Duration.names | 12 +- .../Nodes/Timing_HeartBeat.names | 14 +- .../Nodes/Timing_OnGraphStart.names | 4 +- .../Nodes/Timing_TickDelay.names | 10 +- .../Nodes/Timing_TimeDelay.names | 8 +- .../Nodes/Timing_Timer.names | 12 +- .../Uncategorized_ArithmeticExpression.names | 12 +- .../Nodes/Uncategorized_BinaryOperator.names | 4 +- .../Uncategorized_BooleanExpression.names | 10 +- .../Uncategorized_ComparisonExpression.names | 14 +- .../Uncategorized_EqualityExpression.names | 14 +- .../Nodes/Uncategorized_GetVariable.names | 6 +- .../Nodes/Uncategorized_NodeableNode.names | 2 +- ...Uncategorized_NodeableNodeOverloaded.names | 2 +- .../Nodes/Uncategorized_SetVariable.names | 6 +- .../Nodes/Uncategorized_UnaryExpression.names | 12 +- .../Nodes/Uncategorized_UnaryOperator.names | 4 +- .../Nodes/UtilitiesDebug_Print.names | 8 +- .../UtilitiesUnitTesting_AddFailure.names | 8 +- .../UtilitiesUnitTesting_AddSuccess.names | 8 +- .../UtilitiesUnitTesting_Checkpoint.names | 8 +- .../UtilitiesUnitTesting_ExpectEqual.names | 12 +- .../UtilitiesUnitTesting_ExpectFalse.names | 10 +- ...ilitiesUnitTesting_ExpectGreaterThan.names | 12 +- ...esUnitTesting_ExpectGreaterThanEqual.names | 12 +- .../UtilitiesUnitTesting_ExpectLessThan.names | 12 +- ...itiesUnitTesting_ExpectLessThanEqual.names | 12 +- .../UtilitiesUnitTesting_ExpectNotEqual.names | 12 +- .../UtilitiesUnitTesting_ExpectTrue.names | 10 +- .../UtilitiesUnitTesting_MarkComplete.names | 8 +- .../Nodes/Utilities_BaseTimerNode.names | 4 +- .../Nodes/Utilities_ExtractProperties.names | 8 +- .../Nodes/Utilities_Repeater.names | 12 +- .../AreaBlenderComponentTypeId.names | 4 +- .../Properties/AreaLightComponentTypeId.names | 4 +- .../AudioObstructionType_Ignore.names | 4 +- .../AudioObstructionType_MultiRay.names | 4 +- .../AudioObstructionType_SingleRay.names | 4 +- .../AudioPreloadComponentLoadType_Auto.names | 4 +- ...AudioPreloadComponentLoadType_Manual.names | 4 +- .../AxisAlignedBoxShapeComponentTypeId.names | 4 +- .../Properties/BlendFactor_AlphaDest.names | 4 +- .../BlendFactor_AlphaDestInverse.names | 4 +- .../Properties/BlendFactor_AlphaSource.names | 4 +- .../Properties/BlendFactor_AlphaSource1.names | 4 +- .../BlendFactor_AlphaSource1Inverse.names | 4 +- .../BlendFactor_AlphaSourceInverse.names | 4 +- .../BlendFactor_AlphaSourceSaturate.names | 4 +- .../Properties/BlendFactor_ColorDest.names | 4 +- .../BlendFactor_ColorDestInverse.names | 4 +- .../Properties/BlendFactor_ColorSource.names | 4 +- .../Properties/BlendFactor_ColorSource1.names | 4 +- .../BlendFactor_ColorSource1Inverse.names | 4 +- .../BlendFactor_ColorSourceInverse.names | 4 +- .../Properties/BlendFactor_Factor.names | 4 +- .../BlendFactor_FactorInverse.names | 4 +- .../Properties/BlendFactor_Invalid.names | 4 +- .../Properties/BlendFactor_One.names | 4 +- .../Properties/BlendFactor_Zero.names | 4 +- .../Properties/BlendOp_Add.names | 4 +- .../Properties/BlendOp_Invalid.names | 4 +- .../Properties/BlendOp_Maximum.names | 4 +- .../Properties/BlendOp_Minimum.names | 4 +- .../Properties/BlendOp_Subtract.names | 4 +- .../Properties/BlendOp_SubtractReverse.names | 4 +- .../Properties/BlockerComponentTypeId.names | 4 +- .../Properties/BloomComponentTypeId.names | 4 +- .../Properties/BoxShapeComponentTypeId.names | 4 +- .../TranslationAssets/Properties/CUBE.names | 4 +- .../Properties/CYLINDER.names | 4 +- .../CapsuleShapeComponentTypeId.names | 4 +- .../ConstantGradientComponentTypeId.names | 4 +- .../Properties/CullMode_Back.names | 4 +- .../Properties/CullMode_Front.names | 4 +- .../Properties/CullMode_Invalid.names | 4 +- .../Properties/CullMode_None.names | 4 +- .../CylinderShapeComponentTypeId.names | 4 +- .../Properties/DecalComponentTypeId.names | 4 +- .../Properties/DefaultLodOverride.names | 4 +- .../Properties/DefaultLodType.names | 4 +- .../DefaultMaterialAssignment.names | 4 +- .../DefaultMaterialAssignmentId.names | 4 +- .../DefaultMaterialAssignmentMap.names | 4 +- .../Properties/DefaultPhysicsSceneId.names | 4 +- .../Properties/DefaultPhysicsSceneName.names | 4 +- .../DeferredFogComponentTypeId.names | 4 +- .../DepthOfFieldComponentTypeId.names | 4 +- .../Properties/DepthWriteMask_All.names | 4 +- .../Properties/DepthWriteMask_Invalid.names | 4 +- .../Properties/DepthWriteMask_Zero.names | 4 +- ...escriptorListCombinerComponentTypeId.names | 4 +- .../DescriptorListComponentTypeId.names | 4 +- ...criptorWeightSelectorComponentTypeId.names | 4 +- ...useGlobalIlluminationComponentTypeId.names | 4 +- .../DiffuseProbeGridComponentTypeId.names | 4 +- .../DirectionalLightComponentTypeId.names | 4 +- .../Properties/DiskShapeComponentTypeId.names | 4 +- .../DisplayMapperComponentTypeId.names | 4 +- .../DisplaySettings_HideHelpers.names | 4 +- .../DisplaySettings_HideLinks.names | 4 +- .../DisplaySettings_HideTracks.names | 4 +- .../DisplaySettings_NoCollision.names | 4 +- .../Properties/DisplaySettings_NoLabels.names | 4 +- .../Properties/DisplaySettings_Physics.names | 4 +- ...isplaySettings_SerializableFlagsMask.names | 4 +- ...DisplaySettings_ShowDimensionFigures.names | 4 +- ...DistanceBetweenFilterComponentTypeId.names | 4 +- .../DistributionFilterComponentTypeId.names | 4 +- .../DitherGradientComponentTypeId.names | 4 +- .../EditorAreaLightComponentTypeId.names | 4 +- .../EditorBloomComponentTypeId.names | 4 +- .../EditorDecalComponentTypeId.names | 4 +- .../EditorDeferredFogComponentTypeId.names | 4 +- .../EditorDepthOfFieldComponentTypeId.names | 4 +- ...useGlobalIlluminationComponentTypeId.names | 4 +- ...ditorDiffuseProbeGridComponentTypeId.names | 4 +- ...ditorDirectionalLightComponentTypeId.names | 4 +- .../EditorDisplayMapperComponentTypeId.names | 4 +- ...EditorEntityReferenceComponentTypeId.names | 4 +- .../EditorEntityStartStatus_EditorOnly.names | 4 +- .../EditorEntityStartStatus_StartActive.names | 4 +- ...ditorEntityStartStatus_StartInactive.names | 4 +- ...EditorExposureControlComponentTypeId.names | 4 +- ...radientWeightModifierComponentTypeId.names | 4 +- .../EditorGridComponentTypeId.names | 4 +- .../EditorHDRiSkyboxComponentTypeId.names | 4 +- .../EditorHairComponentTypeId.names | 4 +- ...EditorImageBasedLightComponentTypeId.names | 4 +- ...ditorLookModificationComponentTypeId.names | 4 +- .../EditorMaterialComponentTypeId.names | 4 +- .../EditorMeshComponentTypeId.names | 4 +- ...EditorNonUniformScaleComponentTypeId.names | 4 +- ...OcclusionCullingPlaneComponentTypeId.names | 4 +- .../EditorPhysicalSkyComponentTypeId.names | 4 +- .../Properties/EditorPhysicsSceneId.names | 4 +- .../Properties/EditorPhysicsSceneName.names | 4 +- .../EditorPostFxLayerComponentTypeId.names | 4 +- .../EditorPrefabComponentTypeId.names | 4 +- ...rRadiusWeightModifierComponentTypeId.names | 4 +- ...EditorReflectionProbeComponentTypeId.names | 4 +- ...orShapeWeightModifierComponentTypeId.names | 4 +- .../EditorSsaoComponentTypeId.names | 4 +- .../EditorTransformComponentTypeId.names | 4 +- .../EntityReferenceComponentTypeId.names | 4 +- .../ExposureControlComponentTypeId.names | 4 +- .../FastNoiseGradientComponentTypeId.names | 4 +- .../Properties/FillMode_Invalid.names | 4 +- .../Properties/FillMode_Solid.names | 4 +- .../Properties/FillMode_Wireframe.names | 4 +- .../Properties/FloatEpsilon.names | 4 +- .../FrameCaptureResult_FileWriteError.names | 4 +- .../FrameCaptureResult_InternalError.names | 4 +- .../FrameCaptureResult_InvalidArgument.names | 4 +- .../Properties/FrameCaptureResult_None.names | 4 +- .../FrameCaptureResult_Success.names | 4 +- ...FrameCaptureResult_UnsupportedFormat.names | 4 +- .../GradientSurfaceDataComponentTypeId.names | 4 +- .../GradientTransformComponentTypeId.names | 4 +- ...radientWeightModifierComponentTypeId.names | 4 +- .../Properties/GridComponentTypeId.names | 4 +- .../HDRiSkyboxComponentTypeId.names | 4 +- .../Properties/HairComponentTypeId.names | 4 +- .../Properties/ICOSAHEDRON.names | 4 +- .../ImageBasedLightComponentTypeId.names | 4 +- .../ImageGradientComponentTypeId.names | 4 +- .../Properties/InvalidComponentId.names | 4 +- .../Properties/InvalidParameterIndex.names | 4 +- .../Properties/InvalidTemplateId.names | 4 +- .../InvertGradientComponentTypeId.names | 4 +- .../Properties/JsonMergePatch.names | 4 +- .../Properties/JsonPatch.names | 4 +- .../LANDSCAPE_CANVAS_EDITOR_ID.names | 4 +- .../LevelSettingsComponentTypeId.names | 4 +- .../LevelsGradientComponentTypeId.names | 4 +- ...LightAttenuationRadiusMode_Automatic.names | 4 +- .../LightAttenuationRadiusMode_Explicit.names | 4 +- .../LookModificationComponentTypeId.names | 4 +- .../Properties/MaterialComponentTypeId.names | 4 +- ...erialPropertyGroupVisibility_Enabled.names | 4 +- ...terialPropertyGroupVisibility_Hidden.names | 4 +- .../MaterialPropertyVisibility_Disabled.names | 4 +- .../MaterialPropertyVisibility_Enabled.names | 4 +- .../MaterialPropertyVisibility_Hidden.names | 4 +- .../MeshBlockerComponentTypeId.names | 4 +- .../Properties/MeshComponentTypeId.names | 4 +- .../MixedGradientComponentTypeId.names | 4 +- .../MultiPositionBehaviorType_Blended.names | 4 +- .../MultiPositionBehaviorType_Separate.names | 4 +- ...OcclusionCullingPlaneComponentTypeId.names | 4 +- .../PerlinGradientComponentTypeId.names | 4 +- .../Properties/PhotometricUnit_Candela.names | 4 +- .../PhotometricUnit_Ev100_Illuminance.names | 4 +- .../PhotometricUnit_Ev100_Luminance.names | 4 +- .../Properties/PhotometricUnit_Lumen.names | 4 +- .../Properties/PhotometricUnit_Lux.names | 4 +- .../Properties/PhotometricUnit_Nit.names | 4 +- .../Properties/PhotometricUnit_Unknown.names | 4 +- .../PhysicalSkyComponentTypeId.names | 4 +- .../PositionModifierComponentTypeId.names | 4 +- .../PostFxLayerComponentTypeId.names | 4 +- .../PosterizeGradientComponentTypeId.names | 4 +- .../ProviderNameEnum_AWSCognitoIDP.names | 4 +- .../Properties/ProviderNameEnum_Google.names | 4 +- .../ProviderNameEnum_LoginWithAmazon.names | 4 +- .../Properties/ProviderNameEnum_None.names | 4 +- .../Properties/QuadShapeComponentTypeId.names | 4 +- .../RadiusWeightModifierComponentTypeId.names | 4 +- .../RandomGradientComponentTypeId.names | 4 +- .../ReferenceGradientComponentTypeId.names | 4 +- .../ReferenceShapeComponentTypeId.names | 4 +- .../ReflectionProbeComponentTypeId.names | 4 +- .../RotationModifierComponentTypeId.names | 4 +- .../TranslationAssets/Properties/SPHERE.names | 4 +- .../ScaleModifierComponentTypeId.names | 4 +- .../Properties/ShadowFilterMethod_ESM.names | 4 +- .../ShadowFilterMethod_ESM_PCF.names | 4 +- .../Properties/ShadowFilterMethod_None.names | 4 +- .../Properties/ShadowFilterMethod_PCF.names | 4 +- .../Properties/ShadowmapSize_1024.names | 4 +- .../Properties/ShadowmapSize_2045.names | 4 +- .../Properties/ShadowmapSize_256.names | 4 +- .../Properties/ShadowmapSize_512.names | 4 +- .../Properties/ShadowmapSize_None.names | 4 +- ...peAreaFalloffGradientComponentTypeId.names | 4 +- .../ShapeChangeReasons_ShapeChanged.names | 4 +- .../ShapeChangeReasons_TransformChanged.names | 4 +- ...apeIntersectionFilterComponentTypeId.names | 4 +- .../Properties/ShapeType_Box.names | 4 +- .../Properties/ShapeType_Cylinder.names | 4 +- .../Properties/ShapeType_Heightfield.names | 4 +- .../Properties/ShapeType_PhysicsAsset.names | 4 +- .../Properties/ShapeType_Sphere.names | 4 +- .../ShapeWeightModifierComponentTypeId.names | 4 +- ...lopeAlignmentModifierComponentTypeId.names | 4 +- .../SmoothStepGradientComponentTypeId.names | 4 +- .../Properties/SpawnerComponentTypeId.names | 4 +- .../SphereShapeComponentTypeId.names | 4 +- .../Properties/SsaoComponentTypeId.names | 4 +- .../Properties/StencilOp_Decrement.names | 4 +- .../StencilOp_DecrementSaturate.names | 4 +- .../Properties/StencilOp_Increment.names | 4 +- .../StencilOp_IncrementSaturate.names | 4 +- .../Properties/StencilOp_Invalid.names | 4 +- .../Properties/StencilOp_Invert.names | 4 +- .../Properties/StencilOp_Keep.names | 4 +- .../Properties/StencilOp_Replace.names | 4 +- .../Properties/StencilOp_Zero.names | 4 +- ...SurfaceAltitudeFilterComponentTypeId.names | 4 +- ...rfaceAltitudeGradientComponentTypeId.names | 4 +- ...urfaceMaskDepthFilterComponentTypeId.names | 4 +- .../SurfaceMaskFilterComponentTypeId.names | 4 +- .../SurfaceMaskGradientComponentTypeId.names | 4 +- .../SurfaceSlopeFilterComponentTypeId.names | 4 +- .../SurfaceSlopeGradientComponentTypeId.names | 4 +- .../SystemConfigPlatform_Android.names | 4 +- ...SystemConfigPlatform_InvalidPlatform.names | 4 +- .../Properties/SystemConfigPlatform_Ios.names | 4 +- .../Properties/SystemConfigPlatform_Mac.names | 4 +- .../SystemConfigPlatform_OsxMetal.names | 4 +- .../Properties/SystemConfigPlatform_Pc.names | 4 +- .../SystemConfigPlatform_Provo.names | 4 +- .../Properties/SystemConfigSpec_Auto.names | 4 +- .../Properties/SystemConfigSpec_High.names | 4 +- .../Properties/SystemConfigSpec_Low.names | 4 +- .../Properties/SystemConfigSpec_Medium.names | 4 +- .../SystemConfigSpec_VeryHigh.names | 4 +- .../Properties/SystemEntityId.names | 4 +- .../Properties/TETRAHEDRON.names | 4 +- .../ThresholdGradientComponentTypeId.names | 4 +- .../Properties/TransformComponentTypeId.names | 4 +- .../Properties/TransformMode_Rotation.names | 4 +- .../Properties/TransformMode_Scale.names | 4 +- .../TransformMode_Translation.names | 4 +- .../Properties/TransformPivot_Center.names | 4 +- .../Properties/TransformPivot_Object.names | 4 +- .../Properties/TransformRefreshType_All.names | 4 +- .../TransformRefreshType_Orientation.names | 4 +- .../TransformRefreshType_Translation.names | 4 +- .../Properties/TubeShapeComponentTypeId.names | 4 +- .../UiLayoutCellUnspecifiedSize.names | 4 +- .../VegetationSpawnerComponentTypeId.names | 4 +- .../Properties/eSSB_GotoEndTime.names | 4 +- .../Properties/eSSB_GotoStartTime.names | 4 +- .../Properties/eSSB_LeaveTime.names | 4 +- .../eUiAnimationEvent_Aborted.names | 4 +- .../eUiAnimationEvent_Started.names | 4 +- .../eUiAnimationEvent_Stopped.names | 4 +- .../eUiAnimationEvent_Updated.names | 4 +- .../Properties/eUiDragState_Invalid.names | 4 +- .../Properties/eUiDragState_Normal.names | 4 +- .../Properties/eUiDragState_Valid.names | 4 +- .../Properties/eUiDropState_Invalid.names | 4 +- .../Properties/eUiDropState_Normal.names | 4 +- .../Properties/eUiDropState_Valid.names | 4 +- .../eUiDynamicContentDBColorType_Free.names | 4 +- .../eUiDynamicContentDBColorType_Paid.names | 4 +- .../Properties/eUiEmitShape_Circle.names | 4 +- .../Properties/eUiEmitShape_Point.names | 4 +- .../Properties/eUiEmitShape_Quad.names | 4 +- .../eUiFillCornerOrigin_BottomLeft.names | 4 +- .../eUiFillCornerOrigin_BottomRight.names | 4 +- .../eUiFillCornerOrigin_TopLeft.names | 4 +- .../eUiFillCornerOrigin_TopRight.names | 4 +- .../Properties/eUiFillEdgeOrigin_Bottom.names | 4 +- .../Properties/eUiFillEdgeOrigin_Left.names | 4 +- .../Properties/eUiFillEdgeOrigin_Right.names | 4 +- .../Properties/eUiFillEdgeOrigin_Top.names | 4 +- .../Properties/eUiFillType_Linear.names | 4 +- .../Properties/eUiFillType_None.names | 4 +- .../Properties/eUiFillType_Radial.names | 4 +- .../Properties/eUiFillType_RadialCorner.names | 4 +- .../Properties/eUiFillType_RadialEdge.names | 4 +- ...iFlipbookAnimationFramerateUnits_FPS.names | 4 +- ...mationFramerateUnits_SecondsPerFrame.names | 4 +- .../eUiFlipbookAnimationLoopType_Linear.names | 4 +- .../eUiFlipbookAnimationLoopType_None.names | 4 +- ...UiFlipbookAnimationLoopType_PingPong.names | 4 +- .../Properties/eUiHAlign_Center.names | 4 +- .../Properties/eUiHAlign_Left.names | 4 +- .../Properties/eUiHAlign_Right.names | 4 +- .../eUiHorizontalOrder_LeftToRight.names | 4 +- .../eUiHorizontalOrder_RightToLeft.names | 4 +- .../eUiImageSequenceImageType_Fixed.names | 4 +- .../eUiImageSequenceImageType_Stretched.names | 4 +- ...ageSequenceImageType_StretchedToFill.names | 4 +- ...mageSequenceImageType_StretchedToFit.names | 4 +- .../Properties/eUiImageType_Fixed.names | 4 +- .../Properties/eUiImageType_Sliced.names | 4 +- .../Properties/eUiImageType_Stretched.names | 4 +- .../eUiImageType_StretchedToFill.names | 4 +- .../eUiImageType_StretchedToFit.names | 4 +- .../Properties/eUiImageType_Tiled.names | 4 +- .../eUiInteractableState_Disabled.names | 4 +- .../eUiInteractableState_Hover.names | 4 +- .../eUiInteractableState_Normal.names | 4 +- .../eUiInteractableState_Pressed.names | 4 +- ...ridStartingDirection_HorizontalOrder.names | 4 +- ...tGridStartingDirection_VerticalOrder.names | 4 +- .../eUiNavigationMode_Automatic.names | 4 +- .../Properties/eUiNavigationMode_Custom.names | 4 +- .../Properties/eUiNavigationMode_None.names | 4 +- .../eUiParticleCoordinateType_Cartesian.names | 4 +- .../eUiParticleCoordinateType_Polar.names | 4 +- ...ialDirectionType_RelativeToEmitAngle.names | 4 +- ...irectionType_RelativeToEmitterCenter.names | 4 +- ...eUiScaleToDeviceMode_NonUniformScale.names | 4 +- .../eUiScaleToDeviceMode_None.names | 4 +- .../eUiScaleToDeviceMode_ScaleXOnly.names | 4 +- .../eUiScaleToDeviceMode_ScaleYOnly.names | 4 +- ...ScaleToDeviceMode_UniformScaleToFill.names | 4 +- ...iScaleToDeviceMode_UniformScaleToFit.names | 4 +- ...ScaleToDeviceMode_UniformScaleToFitX.names | 4 +- ...ScaleToDeviceMode_UniformScaleToFitY.names | 4 +- ...ollBoxScrollBarVisibility_AlwaysShow.names | 4 +- ...crollBoxScrollBarVisibility_AutoHide.names | 4 +- ...Visibility_AutoHideAndResizeViewport.names | 4 +- .../eUiScrollBoxSnapMode_Children.names | 4 +- .../eUiScrollBoxSnapMode_Grid.names | 4 +- .../eUiScrollBoxSnapMode_None.names | 4 +- .../eUiScrollerOrientation_Horizontal.names | 4 +- .../eUiScrollerOrientation_Vertical.names | 4 +- .../eUiSpriteType_RenderTarget.names | 4 +- .../eUiSpriteType_SpriteAsset.names | 4 +- .../eUiTextOverflowMode_ClipText.names | 4 +- .../eUiTextOverflowMode_Ellipsis.names | 4 +- .../eUiTextOverflowMode_OverflowText.names | 4 +- .../Properties/eUiTextShrinkToFit_None.names | 4 +- .../eUiTextShrinkToFit_Uniform.names | 4 +- .../eUiTextShrinkToFit_WidthOnly.names | 4 +- .../eUiTextWrapTextSetting_NoWrap.names | 4 +- .../eUiTextWrapTextSetting_Wrap.names | 4 +- ...ayAutoPositionMode_OffsetFromElement.names | 4 +- ...playAutoPositionMode_OffsetFromMouse.names | 4 +- ...eUiTooltipDisplayTriggerMode_OnClick.names | 4 +- ...eUiTooltipDisplayTriggerMode_OnHover.names | 4 +- ...eUiTooltipDisplayTriggerMode_OnPress.names | 4 +- .../Properties/eUiVAlign_Bottom.names | 4 +- .../Properties/eUiVAlign_Center.names | 4 +- .../Properties/eUiVAlign_Top.names | 4 +- .../eUiVerticalOrder_BottomToTop.names | 4 +- .../eUiVerticalOrder_TopToBottom.names | 4 +- .../Properties/g_ProfilerSystem.names | 4 +- .../Properties/g_SettingsRegistry.names | 4 +- .../Types/OnDemandReflectedTypes.names | 6454 ++++++++--------- 1374 files changed, 10157 insertions(+), 10157 deletions(-) diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/AZEvents/OnCollisionBeginevent.names b/Gems/ScriptCanvas/Assets/TranslationAssets/AZEvents/OnCollisionBeginevent.names index 98a2d3f85b..d77596c36e 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/AZEvents/OnCollisionBeginevent.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/AZEvents/OnCollisionBeginevent.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "On Collision Begin event", + "base": "On Collision Begin event", "context": "AZEventHandler", "variant": "", "details": { @@ -9,49 +9,49 @@ }, "slots": [ { - "key": "Simulated Body Handle", + "base": "Simulated Body Handle", "details": { "name": "Simulated Body Handle" } }, { - "key": "Collision Event", + "base": "Collision Event", "details": { "name": "Collision Event" } }, { - "key": "On Collision Begin event", + "base": "On Collision Begin event", "details": { "name": "On Collision Begin event" } }, { - "key": "Connect", + "base": "Connect", "details": { "name": "Connect" } }, { - "key": "Disconnect", + "base": "Disconnect", "details": { "name": "Disconnect" } }, { - "key": "On Connected", + "base": "On Connected", "details": { "name": "On Connected" } }, { - "key": "On Disconnected", + "base": "On Disconnected", "details": { "name": "On Disconnected" } }, { - "key": "OnEvent", + "base": "OnEvent", "details": { "name": "OnEvent" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/AZEvents/OnCollisionEndevent.names b/Gems/ScriptCanvas/Assets/TranslationAssets/AZEvents/OnCollisionEndevent.names index 4844732dd4..1d2c622e8c 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/AZEvents/OnCollisionEndevent.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/AZEvents/OnCollisionEndevent.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "On Collision End event", + "base": "On Collision End event", "context": "AZEventHandler", "variant": "", "details": { @@ -9,49 +9,49 @@ }, "slots": [ { - "key": "Simulated Body Handle", + "base": "Simulated Body Handle", "details": { "name": "Simulated Body Handle" } }, { - "key": "Collision Event", + "base": "Collision Event", "details": { "name": "Collision Event" } }, { - "key": "On Collision End event", + "base": "On Collision End event", "details": { "name": "On Collision End event" } }, { - "key": "Connect", + "base": "Connect", "details": { "name": "Connect" } }, { - "key": "Disconnect", + "base": "Disconnect", "details": { "name": "Disconnect" } }, { - "key": "On Connected", + "base": "On Connected", "details": { "name": "On Connected" } }, { - "key": "On Disconnected", + "base": "On Disconnected", "details": { "name": "On Disconnected" } }, { - "key": "OnEvent", + "base": "OnEvent", "details": { "name": "OnEvent" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/AZEvents/OnCollisionPersistevent.names b/Gems/ScriptCanvas/Assets/TranslationAssets/AZEvents/OnCollisionPersistevent.names index 7ee4cd8f5c..c685623d88 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/AZEvents/OnCollisionPersistevent.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/AZEvents/OnCollisionPersistevent.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "On Collision Persist event", + "base": "On Collision Persist event", "context": "AZEventHandler", "variant": "", "details": { @@ -9,49 +9,49 @@ }, "slots": [ { - "key": "Simulated Body Handle", + "base": "Simulated Body Handle", "details": { "name": "Simulated Body Handle" } }, { - "key": "Collision Event", + "base": "Collision Event", "details": { "name": "Collision Event" } }, { - "key": "On Collision Persist event", + "base": "On Collision Persist event", "details": { "name": "On Collision Persist event" } }, { - "key": "Connect", + "base": "Connect", "details": { "name": "Connect" } }, { - "key": "Disconnect", + "base": "Disconnect", "details": { "name": "Disconnect" } }, { - "key": "On Connected", + "base": "On Connected", "details": { "name": "On Connected" } }, { - "key": "On Disconnected", + "base": "On Disconnected", "details": { "name": "On Disconnected" } }, { - "key": "OnEvent", + "base": "OnEvent", "details": { "name": "OnEvent" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/AZEvents/OnGravityChangedevent.names b/Gems/ScriptCanvas/Assets/TranslationAssets/AZEvents/OnGravityChangedevent.names index 7841a0bc78..dce2578ca9 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/AZEvents/OnGravityChangedevent.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/AZEvents/OnGravityChangedevent.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "On Gravity Changed event", + "base": "On Gravity Changed event", "context": "AZEventHandler", "variant": "", "details": { @@ -9,49 +9,49 @@ }, "slots": [ { - "key": "Scene Handle", + "base": "Scene Handle", "details": { "name": "Scene Handle" } }, { - "key": "Gravity Vector", + "base": "Gravity Vector", "details": { "name": "Gravity Vector" } }, { - "key": "On Gravity Changed event", + "base": "On Gravity Changed event", "details": { "name": "On Gravity Changed event" } }, { - "key": "Connect", + "base": "Connect", "details": { "name": "Connect" } }, { - "key": "Disconnect", + "base": "Disconnect", "details": { "name": "Disconnect" } }, { - "key": "On Connected", + "base": "On Connected", "details": { "name": "On Connected" } }, { - "key": "On Disconnected", + "base": "On Disconnected", "details": { "name": "On Disconnected" } }, { - "key": "OnEvent", + "base": "OnEvent", "details": { "name": "OnEvent" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/AZEvents/OnTriggerEnterevent.names b/Gems/ScriptCanvas/Assets/TranslationAssets/AZEvents/OnTriggerEnterevent.names index b1adfeb30b..0850092f0f 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/AZEvents/OnTriggerEnterevent.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/AZEvents/OnTriggerEnterevent.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "On Trigger Enter event", + "base": "On Trigger Enter event", "context": "AZEventHandler", "variant": "", "details": { @@ -9,49 +9,49 @@ }, "slots": [ { - "key": "Simulated Body Handle", + "base": "Simulated Body Handle", "details": { "name": "Simulated Body Handle" } }, { - "key": "Trigger Event", + "base": "Trigger Event", "details": { "name": "Trigger Event" } }, { - "key": "On Trigger Enter event", + "base": "On Trigger Enter event", "details": { "name": "On Trigger Enter event" } }, { - "key": "Connect", + "base": "Connect", "details": { "name": "Connect" } }, { - "key": "Disconnect", + "base": "Disconnect", "details": { "name": "Disconnect" } }, { - "key": "On Connected", + "base": "On Connected", "details": { "name": "On Connected" } }, { - "key": "On Disconnected", + "base": "On Disconnected", "details": { "name": "On Disconnected" } }, { - "key": "OnEvent", + "base": "OnEvent", "details": { "name": "OnEvent" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/AZEvents/OnTriggerExitevent.names b/Gems/ScriptCanvas/Assets/TranslationAssets/AZEvents/OnTriggerExitevent.names index 0c70ada73d..87c1c8e65f 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/AZEvents/OnTriggerExitevent.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/AZEvents/OnTriggerExitevent.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "On Trigger Exit event", + "base": "On Trigger Exit event", "context": "AZEventHandler", "variant": "", "details": { @@ -9,49 +9,49 @@ }, "slots": [ { - "key": "Simulated Body Handle", + "base": "Simulated Body Handle", "details": { "name": "Simulated Body Handle" } }, { - "key": "Trigger Event", + "base": "Trigger Event", "details": { "name": "Trigger Event" } }, { - "key": "On Trigger Exit event", + "base": "On Trigger Exit event", "details": { "name": "On Trigger Exit event" } }, { - "key": "Connect", + "base": "Connect", "details": { "name": "Connect" } }, { - "key": "Disconnect", + "base": "Disconnect", "details": { "name": "Disconnect" } }, { - "key": "On Connected", + "base": "On Connected", "details": { "name": "On Connected" } }, { - "key": "On Disconnected", + "base": "On Disconnected", "details": { "name": "On Disconnected" } }, { - "key": "OnEvent", + "base": "OnEvent", "details": { "name": "OnEvent" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/AZEvents/Postsimulateevent.names b/Gems/ScriptCanvas/Assets/TranslationAssets/AZEvents/Postsimulateevent.names index 3cbbe32b4d..cbf2b98cb2 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/AZEvents/Postsimulateevent.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/AZEvents/Postsimulateevent.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "Postsimulate event", + "base": "Postsimulate event", "context": "AZEventHandler", "variant": "", "details": { @@ -9,43 +9,43 @@ }, "slots": [ { - "key": "Tick time", + "base": "Tick time", "details": { "name": "Tick time" } }, { - "key": "Postsimulate event", + "base": "Postsimulate event", "details": { "name": "Postsimulate event" } }, { - "key": "Connect", + "base": "Connect", "details": { "name": "Connect" } }, { - "key": "Disconnect", + "base": "Disconnect", "details": { "name": "Disconnect" } }, { - "key": "On Connected", + "base": "On Connected", "details": { "name": "On Connected" } }, { - "key": "On Disconnected", + "base": "On Disconnected", "details": { "name": "On Disconnected" } }, { - "key": "OnEvent", + "base": "OnEvent", "details": { "name": "OnEvent" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/AZEvents/Presimulateevent.names b/Gems/ScriptCanvas/Assets/TranslationAssets/AZEvents/Presimulateevent.names index d3fb8cca6e..d71831f458 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/AZEvents/Presimulateevent.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/AZEvents/Presimulateevent.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "Presimulate event", + "base": "Presimulate event", "context": "AZEventHandler", "variant": "", "details": { @@ -9,43 +9,43 @@ }, "slots": [ { - "key": "Tick time", + "base": "Tick time", "details": { "name": "Tick time" } }, { - "key": "Presimulate event", + "base": "Presimulate event", "details": { "name": "Presimulate event" } }, { - "key": "Connect", + "base": "Connect", "details": { "name": "Connect" } }, { - "key": "Disconnect", + "base": "Disconnect", "details": { "name": "Disconnect" } }, { - "key": "On Connected", + "base": "On Connected", "details": { "name": "On Connected" } }, { - "key": "On Disconnected", + "base": "On Disconnected", "details": { "name": "On Disconnected" } }, { - "key": "OnEvent", + "base": "OnEvent", "details": { "name": "OnEvent" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/AZEvents/SettingsRegistryNotifyEvent.names b/Gems/ScriptCanvas/Assets/TranslationAssets/AZEvents/SettingsRegistryNotifyEvent.names index 09ec65d790..6460d967b9 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/AZEvents/SettingsRegistryNotifyEvent.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/AZEvents/SettingsRegistryNotifyEvent.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "SettingsRegistry Notify Event", + "base": "SettingsRegistry Notify Event", "context": "AZEventHandler", "variant": "", "details": { @@ -9,43 +9,43 @@ }, "slots": [ { - "key": "Json Path", + "base": "Json Path", "details": { "name": "Json Path" } }, { - "key": "SettingsRegistry Notify Event", + "base": "SettingsRegistry Notify Event", "details": { "name": "SettingsRegistry Notify Event" } }, { - "key": "Connect", + "base": "Connect", "details": { "name": "Connect" } }, { - "key": "Disconnect", + "base": "Disconnect", "details": { "name": "Disconnect" } }, { - "key": "On Connected", + "base": "On Connected", "details": { "name": "On Connected" } }, { - "key": "On Disconnected", + "base": "On Disconnected", "details": { "name": "On Disconnected" } }, { - "key": "OnEvent", + "base": "OnEvent", "details": { "name": "OnEvent" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AWSMetrics_AttributesSubmissionList.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AWSMetrics_AttributesSubmissionList.names index e0c9852e54..68e19cbfca 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AWSMetrics_AttributesSubmissionList.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AWSMetrics_AttributesSubmissionList.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "AWSMetrics_AttributesSubmissionList", + "base": "AWSMetrics_AttributesSubmissionList", "context": "BehaviorClass", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "Getattributes", + "base": "Getattributes", "details": { "name": "Get Attributes" }, @@ -32,7 +32,7 @@ ] }, { - "key": "Setattributes", + "base": "Setattributes", "details": { "name": "Set Attributes" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AWSMetrics_MetricsAttribute.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AWSMetrics_MetricsAttribute.names index 57a94769b0..a3ac9a92c5 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AWSMetrics_MetricsAttribute.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AWSMetrics_MetricsAttribute.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "AWSMetrics_MetricsAttribute", + "base": "AWSMetrics_MetricsAttribute", "context": "BehaviorClass", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "SetName", + "base": "SetName", "context": "AWSMetrics_MetricsAttribute", "entry": { "name": "In", @@ -39,7 +39,7 @@ ] }, { - "key": "SetStrValue", + "base": "SetStrValue", "context": "AWSMetrics_MetricsAttribute", "entry": { "name": "In", @@ -68,7 +68,7 @@ ] }, { - "key": "SetIntValue", + "base": "SetIntValue", "context": "AWSMetrics_MetricsAttribute", "entry": { "name": "In", @@ -97,7 +97,7 @@ ] }, { - "key": "SetDoubleValue", + "base": "SetDoubleValue", "context": "AWSMetrics_MetricsAttribute", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AWSScriptBehaviorDynamoDB.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AWSScriptBehaviorDynamoDB.names index 3d9e963484..46ba1bad8d 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AWSScriptBehaviorDynamoDB.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AWSScriptBehaviorDynamoDB.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "AWSScriptBehaviorDynamoDB", + "base": "AWSScriptBehaviorDynamoDB", "context": "BehaviorClass", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetItem", + "base": "GetItem", "context": "AWSScriptBehaviorDynamoDB", "entry": { "name": "In", @@ -40,7 +40,7 @@ ] }, { - "key": "GetItemRaw", + "base": "GetItemRaw", "context": "AWSScriptBehaviorDynamoDB", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AWSScriptBehaviorLambda.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AWSScriptBehaviorLambda.names index 9ee4a606b9..db4a42a152 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AWSScriptBehaviorLambda.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AWSScriptBehaviorLambda.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "AWSScriptBehaviorLambda", + "base": "AWSScriptBehaviorLambda", "context": "BehaviorClass", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "Invoke", + "base": "Invoke", "context": "AWSScriptBehaviorLambda", "entry": { "name": "In", @@ -39,7 +39,7 @@ ] }, { - "key": "InvokeRaw", + "base": "InvokeRaw", "context": "AWSScriptBehaviorLambda", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AWSScriptBehaviorS3.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AWSScriptBehaviorS3.names index 7630385d28..c4dd1d5827 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AWSScriptBehaviorS3.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AWSScriptBehaviorS3.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "AWSScriptBehaviorS3", + "base": "AWSScriptBehaviorS3", "context": "BehaviorClass", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetObject", + "base": "GetObject", "context": "AWSScriptBehaviorS3", "entry": { "name": "In", @@ -45,7 +45,7 @@ ] }, { - "key": "GetObjectRaw", + "base": "GetObjectRaw", "context": "AWSScriptBehaviorS3", "entry": { "name": "In", @@ -86,7 +86,7 @@ ] }, { - "key": "HeadObject", + "base": "HeadObject", "context": "AWSScriptBehaviorS3", "entry": { "name": "In", @@ -115,7 +115,7 @@ ] }, { - "key": "HeadObjectRaw", + "base": "HeadObjectRaw", "context": "AWSScriptBehaviorS3", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AZ__SceneAPI__Containers__SceneGraph.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AZ__SceneAPI__Containers__SceneGraph.names index 887aedbd5e..9526e9d8af 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AZ__SceneAPI__Containers__SceneGraph.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AZ__SceneAPI__Containers__SceneGraph.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "AZ::SceneAPI::Containers::SceneGraph", + "base": "AZ::SceneAPI::Containers::SceneGraph", "context": "BehaviorClass", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetNodeChild", + "base": "GetNodeChild", "context": "AZ::SceneAPI::Containers::SceneGraph", "entry": { "name": "In", @@ -47,7 +47,7 @@ ] }, { - "key": "FindWithPath", + "base": "FindWithPath", "context": "AZ::SceneAPI::Containers::SceneGraph", "entry": { "name": "In", @@ -84,7 +84,7 @@ ] }, { - "key": "HasNodeChild", + "base": "HasNodeChild", "context": "AZ::SceneAPI::Containers::SceneGraph", "entry": { "name": "In", @@ -121,7 +121,7 @@ ] }, { - "key": "HasNodeParent", + "base": "HasNodeParent", "context": "AZ::SceneAPI::Containers::SceneGraph", "entry": { "name": "In", @@ -158,7 +158,7 @@ ] }, { - "key": "GetNodeSibling", + "base": "GetNodeSibling", "context": "AZ::SceneAPI::Containers::SceneGraph", "entry": { "name": "In", @@ -195,7 +195,7 @@ ] }, { - "key": "HasNodeSibling", + "base": "HasNodeSibling", "context": "AZ::SceneAPI::Containers::SceneGraph", "entry": { "name": "In", @@ -232,7 +232,7 @@ ] }, { - "key": "IsNodeEndPoint", + "base": "IsNodeEndPoint", "context": "AZ::SceneAPI::Containers::SceneGraph", "entry": { "name": "In", @@ -269,7 +269,7 @@ ] }, { - "key": "GetNodeCount", + "base": "GetNodeCount", "context": "AZ::SceneAPI::Containers::SceneGraph", "entry": { "name": "In", @@ -300,7 +300,7 @@ ] }, { - "key": "HasNodeContent", + "base": "HasNodeContent", "context": "AZ::SceneAPI::Containers::SceneGraph", "entry": { "name": "In", @@ -337,7 +337,7 @@ ] }, { - "key": "GetNodeContent", + "base": "GetNodeContent", "context": "AZ::SceneAPI::Containers::SceneGraph", "entry": { "name": "In", @@ -374,7 +374,7 @@ ] }, { - "key": "GetNodeName", + "base": "GetNodeName", "context": "AZ::SceneAPI::Containers::SceneGraph", "entry": { "name": "In", @@ -411,7 +411,7 @@ ] }, { - "key": "GetRoot", + "base": "GetRoot", "context": "AZ::SceneAPI::Containers::SceneGraph", "entry": { "name": "In", @@ -442,7 +442,7 @@ ] }, { - "key": "GetNodeSeperationCharacter", + "base": "GetNodeSeperationCharacter", "context": "AZ::SceneAPI::Containers::SceneGraph", "entry": { "name": "In", @@ -465,7 +465,7 @@ ] }, { - "key": "GetNodeParent", + "base": "GetNodeParent", "context": "AZ::SceneAPI::Containers::SceneGraph", "entry": { "name": "In", @@ -502,7 +502,7 @@ ] }, { - "key": "FindWithRootAndPath", + "base": "FindWithRootAndPath", "context": "AZ::SceneAPI::Containers::SceneGraph", "entry": { "name": "In", @@ -545,7 +545,7 @@ ] }, { - "key": "IsValidName", + "base": "IsValidName", "context": "AZ::SceneAPI::Containers::SceneGraph", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AZ__SceneAPI__DataTypes__IMeshData__Face.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AZ__SceneAPI__DataTypes__IMeshData__Face.names index d40917fb34..49dd69edf3 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AZ__SceneAPI__DataTypes__IMeshData__Face.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AZ__SceneAPI__DataTypes__IMeshData__Face.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "AZ::SceneAPI::DataTypes::IMeshData::Face", + "base": "AZ::SceneAPI::DataTypes::IMeshData::Face", "context": "BehaviorClass", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetVertexIndex", + "base": "GetVertexIndex", "context": "AZ::SceneAPI::DataTypes::IMeshData::Face", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AcesParameterOverrides.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AcesParameterOverrides.names index d3a32c2709..d1c7a70e04 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AcesParameterOverrides.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AcesParameterOverrides.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "AcesParameterOverrides", + "base": "AcesParameterOverrides", "context": "BehaviorClass", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "LoadPreset", + "base": "LoadPreset", "context": "AcesParameterOverrides", "entry": { "name": "In", @@ -33,7 +33,7 @@ ] }, { - "key": "GetOutputDeviceTransformType_4000Nits", + "base": "GetOutputDeviceTransformType_4000Nits", "details": { "name": "Get Output Device Transform Type_ 4000 Nits" }, @@ -47,7 +47,7 @@ ] }, { - "key": "GetOutputDeviceTransformType_2000Nits", + "base": "GetOutputDeviceTransformType_2000Nits", "details": { "name": "Get Output Device Transform Type_ 2000 Nits" }, @@ -61,7 +61,7 @@ ] }, { - "key": "GetapplyCATD60toD65", + "base": "GetapplyCATD60toD65", "details": { "name": "GetapplyCATD 60toD 65" }, @@ -83,7 +83,7 @@ ] }, { - "key": "SetapplyCATD60toD65", + "base": "SetapplyCATD60toD65", "details": { "name": "SetapplyCATD 60toD 65" }, @@ -103,7 +103,7 @@ ] }, { - "key": "GetOutputDeviceTransformType_48Nits", + "base": "GetOutputDeviceTransformType_48Nits", "details": { "name": "Get Output Device Transform Type_ 48 Nits" }, @@ -117,7 +117,7 @@ ] }, { - "key": "GetOutputDeviceTransformType_NumOutputDeviceTransformTypes", + "base": "GetOutputDeviceTransformType_NumOutputDeviceTransformTypes", "details": { "name": "Get Output Device Transform Type_ Num Output Device Transform Types" }, @@ -131,7 +131,7 @@ ] }, { - "key": "GetOutputDeviceTransformType_1000Nits", + "base": "GetOutputDeviceTransformType_1000Nits", "details": { "name": "Get Output Device Transform Type_ 1000 Nits" }, @@ -145,7 +145,7 @@ ] }, { - "key": "GetapplyDesaturation", + "base": "GetapplyDesaturation", "details": { "name": "Getapply Desaturation" }, @@ -167,7 +167,7 @@ ] }, { - "key": "SetapplyDesaturation", + "base": "SetapplyDesaturation", "details": { "name": "Setapply Desaturation" }, @@ -187,7 +187,7 @@ ] }, { - "key": "Getpreset", + "base": "Getpreset", "details": { "name": "Getpreset" }, @@ -209,7 +209,7 @@ ] }, { - "key": "Setpreset", + "base": "Setpreset", "details": { "name": "Setpreset" }, @@ -229,7 +229,7 @@ ] }, { - "key": "GetalterSurround", + "base": "GetalterSurround", "details": { "name": "Getalter Surround" }, @@ -251,7 +251,7 @@ ] }, { - "key": "SetalterSurround", + "base": "SetalterSurround", "details": { "name": "Setalter Surround" }, @@ -271,7 +271,7 @@ ] }, { - "key": "GetoverrideDefaults", + "base": "GetoverrideDefaults", "details": { "name": "Getoverride Defaults" }, @@ -293,7 +293,7 @@ ] }, { - "key": "SetoverrideDefaults", + "base": "SetoverrideDefaults", "details": { "name": "Setoverride Defaults" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ActorComponent.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ActorComponent.names index a87e636a17..b6092e23f7 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ActorComponent.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ActorComponent.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "ActorComponent", + "base": "ActorComponent", "context": "BehaviorClass", "variant": "", "details": { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AnimationData.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AnimationData.names index 54155ecbde..d026c998ba 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AnimationData.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AnimationData.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "AnimationData", + "base": "AnimationData", "context": "BehaviorClass", "variant": "", "details": { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AssetData.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AssetData.names index c7fd08013f..c9a8cfe791 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AssetData.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AssetData.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "AssetData", + "base": "AssetData", "context": "BehaviorClass", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetUseCount", + "base": "GetUseCount", "context": "AssetData", "entry": { "name": "In", @@ -41,7 +41,7 @@ ] }, { - "key": "IsLoading", + "base": "IsLoading", "context": "AssetData", "entry": { "name": "In", @@ -79,7 +79,7 @@ ] }, { - "key": "IsError", + "base": "IsError", "context": "AssetData", "entry": { "name": "In", @@ -110,7 +110,7 @@ ] }, { - "key": "IsReady", + "base": "IsReady", "context": "AssetData", "entry": { "name": "In", @@ -141,7 +141,7 @@ ] }, { - "key": "GetId", + "base": "GetId", "context": "AssetData", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AssetId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AssetId.names index 0cebae5057..18c20bbd5a 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AssetId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AssetId.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "AssetId", + "base": "AssetId", "context": "BehaviorClass", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "CreateString", + "base": "CreateString", "context": "AssetId", "entry": { "name": "In", @@ -41,7 +41,7 @@ ] }, { - "key": "IsValid", + "base": "IsValid", "context": "AssetId", "entry": { "name": "In", @@ -72,7 +72,7 @@ ] }, { - "key": "ToString", + "base": "ToString", "context": "AssetId", "entry": { "name": "In", @@ -103,7 +103,7 @@ ] }, { - "key": "IsEqual", + "base": "IsEqual", "context": "AssetId", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AssetInfo.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AssetInfo.names index 3c14063340..39abff351c 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AssetInfo.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AssetInfo.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "AssetInfo", + "base": "AssetInfo", "context": "BehaviorClass", "variant": "", "details": { @@ -9,7 +9,7 @@ }, "methods": [ { - "key": "assetId", + "base": "assetId", "details": { "name": "Get Asset Id" }, @@ -31,7 +31,7 @@ ] }, { - "key": "assetType", + "base": "assetType", "details": { "name": "Get Asset Type" }, @@ -53,7 +53,7 @@ ] }, { - "key": "sizeBytes", + "base": "sizeBytes", "details": { "name": "Get Size (Bytes)" }, @@ -75,7 +75,7 @@ ] }, { - "key": "relativePath", + "base": "relativePath", "details": { "name": "Get Relative Path" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AtomToolsDocumentSystemSettings.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AtomToolsDocumentSystemSettings.names index 8cb330e91d..b5c7982730 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AtomToolsDocumentSystemSettings.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AtomToolsDocumentSystemSettings.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "AtomToolsDocumentSystemSettings", + "base": "AtomToolsDocumentSystemSettings", "context": "BehaviorClass", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetshowReloadDocumentPrompt", + "base": "GetshowReloadDocumentPrompt", "details": { "name": "Get Show Reload Document Prompt" }, @@ -32,7 +32,7 @@ ] }, { - "key": "SetshowReloadDocumentPrompt", + "base": "SetshowReloadDocumentPrompt", "details": { "name": "Set Show Reload Document Prompt" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AuthenticationTokens.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AuthenticationTokens.names index fde350b776..c041aa00ff 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AuthenticationTokens.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AuthenticationTokens.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "AuthenticationTokens", + "base": "AuthenticationTokens", "context": "BehaviorClass", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetAccessToken", + "base": "GetAccessToken", "details": { "name": "Get Access Token" }, @@ -32,7 +32,7 @@ ] }, { - "key": "SetAccessToken", + "base": "SetAccessToken", "details": { "name": "Set Access Token" }, @@ -52,7 +52,7 @@ ] }, { - "key": "GetOpenIdToken", + "base": "GetOpenIdToken", "context": "getter", "details": { "name": "Get OpenId Token" @@ -75,7 +75,7 @@ ] }, { - "key": "SetOpenIdToken", + "base": "SetOpenIdToken", "context": "setter", "details": { "name": "Set OpenId Token" @@ -96,7 +96,7 @@ ] }, { - "key": "GetRefreshToken", + "base": "GetRefreshToken", "context": "getter", "details": { "name": "Get Refresh Token" @@ -119,7 +119,7 @@ ] }, { - "key": "SetRefreshToken", + "base": "SetRefreshToken", "context": "setter", "details": { "name": "Set Refresh Token" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AxisType.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AxisType.names index c6e75adc4a..c5fc0fe1f3 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AxisType.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AxisType.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "AxisType", + "base": "AxisType", "context": "BehaviorClass", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetZNegative", + "base": "GetZNegative", "details": { "name": "Get -Z" }, @@ -24,7 +24,7 @@ ] }, { - "key": "GetZPositive", + "base": "GetZPositive", "details": { "name": "Get +Z" }, @@ -38,7 +38,7 @@ ] }, { - "key": "GetYPositive", + "base": "GetYPositive", "details": { "name": "Get +Y" }, @@ -52,7 +52,7 @@ ] }, { - "key": "GetXNegative", + "base": "GetXNegative", "details": { "name": "Get -X" }, @@ -66,7 +66,7 @@ ] }, { - "key": "GetXPositive", + "base": "GetXPositive", "details": { "name": "Get +X" }, @@ -80,7 +80,7 @@ ] }, { - "key": "GetYNegative", + "base": "GetYNegative", "details": { "name": "Get -Y" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AzFramework__SurfaceData__SurfacePoint.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AzFramework__SurfaceData__SurfacePoint.names index dfcbac7dad..b78273d630 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AzFramework__SurfaceData__SurfacePoint.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AzFramework__SurfaceData__SurfacePoint.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "AzFramework::SurfaceData::SurfacePoint", + "base": "AzFramework::SurfaceData::SurfacePoint", "context": "BehaviorClass", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "Getposition", + "base": "Getposition", "details": { "name": "Get Position" }, @@ -32,7 +32,7 @@ ] }, { - "key": "Setposition", + "base": "Setposition", "details": { "name": "Set Position" }, @@ -52,7 +52,7 @@ ] }, { - "key": "Getnormal", + "base": "Getnormal", "details": { "name": "Get Normal" }, @@ -74,7 +74,7 @@ ] }, { - "key": "Setnormal", + "base": "Setnormal", "details": { "name": "Set Normal" }, @@ -94,7 +94,7 @@ ] }, { - "key": "GetsurfaceTags", + "base": "GetsurfaceTags", "details": { "name": "Get Surface Tags" }, @@ -116,7 +116,7 @@ ] }, { - "key": "SetsurfaceTags", + "base": "SetsurfaceTags", "details": { "name": "Set Surface Tags" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/BlastActorData.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/BlastActorData.names index a63a0541e0..04aa2f21c2 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/BlastActorData.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/BlastActorData.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "BlastActorData", + "base": "BlastActorData", "context": "BehaviorClass", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetEntityId", + "base": "GetEntityId", "details": { "name": "Get Entity Id" }, @@ -34,7 +34,7 @@ ] }, { - "key": "SetEntityId", + "base": "SetEntityId", "details": { "name": "Set Entity Id" }, @@ -56,7 +56,7 @@ ] }, { - "key": "GetIsStatic", + "base": "GetIsStatic", "details": { "name": "Get Is Static" }, @@ -79,7 +79,7 @@ ] }, { - "key": "SetIsStatic", + "base": "SetIsStatic", "details": { "name": "Set Is Static" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/BlendShapeAnimationData.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/BlendShapeAnimationData.names index 640613b7b0..61b54272a5 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/BlendShapeAnimationData.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/BlendShapeAnimationData.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "BlendShapeAnimationData", + "base": "BlendShapeAnimationData", "context": "BehaviorClass", "variant": "", "details": { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/BlendShapeData.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/BlendShapeData.names index 9dd686a898..d6a19b9837 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/BlendShapeData.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/BlendShapeData.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "BlendShapeData", + "base": "BlendShapeData", "context": "BehaviorClass", "variant": "", "details": { @@ -9,7 +9,7 @@ }, "methods": [ { - "key": "GetUV", + "base": "GetUV", "context": "BlendShapeData", "entry": { "name": "In", @@ -52,7 +52,7 @@ ] }, { - "key": "GetTangent", + "base": "GetTangent", "context": "BlendShapeData", "entry": { "name": "In", @@ -89,7 +89,7 @@ ] }, { - "key": "GetBitangent", + "base": "GetBitangent", "context": "BlendShapeData", "entry": { "name": "In", @@ -126,7 +126,7 @@ ] }, { - "key": "GetColor", + "base": "GetColor", "context": "BlendShapeData", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/BlendShapeDataFace.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/BlendShapeDataFace.names index c66094da05..abbdfd2f2f 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/BlendShapeDataFace.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/BlendShapeDataFace.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "BlendShapeDataFace", + "base": "BlendShapeDataFace", "context": "BehaviorClass", "variant": "", "details": { @@ -9,7 +9,7 @@ }, "methods": [ { - "key": "GetVertexIndex", + "base": "GetVertexIndex", "context": "BlendShapeDataFace", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/BoxShapeConfig.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/BoxShapeConfig.names index 33fa703a22..aac06f415c 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/BoxShapeConfig.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/BoxShapeConfig.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "BoxShapeConfig", + "base": "BoxShapeConfig", "context": "BehaviorClass", "variant": "", "details": { @@ -9,7 +9,7 @@ }, "methods": [ { - "key": "GetDimensions", + "base": "GetDimensions", "details": { "name": "Get Dimensions" }, @@ -32,7 +32,7 @@ ] }, { - "key": "SetDimensions", + "base": "SetDimensions", "details": { "name": "Set Dimensions" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/CameraComponent.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/CameraComponent.names index 1b0a02f28e..7a687e359e 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/CameraComponent.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/CameraComponent.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "CameraComponent", + "base": "CameraComponent", "context": "BehaviorClass", "variant": "", "details": { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/CapsuleShapeConfig.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/CapsuleShapeConfig.names index 3720501b2c..6fe97b25e6 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/CapsuleShapeConfig.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/CapsuleShapeConfig.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "CapsuleShapeConfig", + "base": "CapsuleShapeConfig", "context": "BehaviorClass", "variant": "", "details": { @@ -9,7 +9,7 @@ }, "methods": [ { - "key": "GetHeight", + "base": "GetHeight", "details": { "name": "Get Height" }, @@ -32,7 +32,7 @@ ] }, { - "key": "SetHeight", + "base": "SetHeight", "details": { "name": "Set Height" }, @@ -53,7 +53,7 @@ ] }, { - "key": "GetRadius", + "base": "GetRadius", "details": { "name": "Get Radius" }, @@ -76,7 +76,7 @@ ] }, { - "key": "SetRadius", + "base": "SetRadius", "details": { "name": "Set Radius" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ClientAuthAWSCredentials.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ClientAuthAWSCredentials.names index 3d1fc2e80e..da4fd03629 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ClientAuthAWSCredentials.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ClientAuthAWSCredentials.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "ClientAuthAWSCredentials", + "base": "ClientAuthAWSCredentials", "context": "BehaviorClass", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetAWSAccessKeyId", + "base": "GetAWSAccessKeyId", "details": { "name": "Get AWS Access Key Id" }, @@ -32,7 +32,7 @@ ] }, { - "key": "SetAWSAccessKeyId", + "base": "SetAWSAccessKeyId", "details": { "name": "Set AWS Access Key Id" }, @@ -52,7 +52,7 @@ ] }, { - "key": "GetAWSSecretKey", + "base": "GetAWSSecretKey", "details": { "name": "Get AWS Secret Key" }, @@ -74,7 +74,7 @@ ] }, { - "key": "SetAWSSecretKey", + "base": "SetAWSSecretKey", "details": { "name": "Set AWS Secret Key" }, @@ -94,7 +94,7 @@ ] }, { - "key": "GetAWSSessionToken", + "base": "GetAWSSessionToken", "details": { "name": "Get AWS Session Token" }, @@ -116,7 +116,7 @@ ] }, { - "key": "SetAWSSessionToken", + "base": "SetAWSSessionToken", "details": { "name": "Set AWS Session Token" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/CollisionEvent.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/CollisionEvent.names index 335200a350..5d4d37d1f3 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/CollisionEvent.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/CollisionEvent.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "CollisionEvent", + "base": "CollisionEvent", "context": "BehaviorClass", "variant": "", "details": { @@ -9,7 +9,7 @@ }, "methods": [ { - "key": "GetBody1EntityId", + "base": "GetBody1EntityId", "context": "CollisionEvent", "entry": { "name": "In", @@ -41,7 +41,7 @@ ] }, { - "key": "GetBody2EntityId", + "base": "GetBody2EntityId", "context": "CollisionEvent", "entry": { "name": "In", @@ -73,7 +73,7 @@ ] }, { - "key": "GetContacts", + "base": "GetContacts", "details": { "name": "Get Contacts" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/CollisionGroup.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/CollisionGroup.names index ba4a63ebe2..2892f8b5c5 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/CollisionGroup.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/CollisionGroup.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "CollisionGroup", + "base": "CollisionGroup", "context": "BehaviorClass", "variant": "", "details": { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ComponentId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ComponentId.names index edc87d77f7..32213e9d4b 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ComponentId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ComponentId.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "ComponentId", + "base": "ComponentId", "context": "BehaviorClass", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "IsValid", + "base": "IsValid", "context": "ComponentId", "entry": { "name": "In", @@ -41,7 +41,7 @@ ] }, { - "key": "Equal", + "base": "Equal", "context": "ComponentId", "entry": { "name": "In", @@ -78,7 +78,7 @@ ] }, { - "key": "ToString", + "base": "ToString", "context": "ComponentId", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ConstantGradientComponent.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ConstantGradientComponent.names index 0e0fdad150..e51e6c292b 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ConstantGradientComponent.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ConstantGradientComponent.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "ConstantGradientComponent", + "base": "ConstantGradientComponent", "context": "BehaviorClass", "variant": "", "details": { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ConstantGradientConfig.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ConstantGradientConfig.names index ed5c46c4fa..c7110f1a52 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ConstantGradientConfig.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ConstantGradientConfig.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "ConstantGradientConfig", + "base": "ConstantGradientConfig", "context": "BehaviorClass", "variant": "", "details": { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/Contact.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/Contact.names index 0e0e29f073..547cb70970 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/Contact.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/Contact.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "Contact", + "base": "Contact", "context": "BehaviorClass", "variant": "", "details": { @@ -9,7 +9,7 @@ }, "methods": [ { - "key": "GetPosition", + "base": "GetPosition", "details": { "name": "Get Position" }, @@ -31,7 +31,7 @@ ] }, { - "key": "SetPosition", + "base": "SetPosition", "details": { "name": "Set Position" }, @@ -51,7 +51,7 @@ ] }, { - "key": "GetNormal", + "base": "GetNormal", "details": { "name": "Get Normal" }, @@ -73,7 +73,7 @@ ] }, { - "key": "SetNormal", + "base": "SetNormal", "details": { "name": "Set Normal" }, @@ -93,7 +93,7 @@ ] }, { - "key": "GetImpulse", + "base": "GetImpulse", "details": { "name": "Get Impulse" }, @@ -115,7 +115,7 @@ ] }, { - "key": "SetImpulse", + "base": "SetImpulse", "details": { "name": "Set Impulse" }, @@ -135,7 +135,7 @@ ] }, { - "key": "GetSeparation", + "base": "GetSeparation", "details": { "name": "Get Separation" }, @@ -157,7 +157,7 @@ ] }, { - "key": "SetSeparation", + "base": "SetSeparation", "details": { "name": "Set Separation" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/CryRange.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/CryRange.names index 39791a3b8b..aae928f16f 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/CryRange.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/CryRange.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "CryRange", + "base": "CryRange", "context": "BehaviorClass", "variant": "", "details": { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/CylinderShapeConfig.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/CylinderShapeConfig.names index 35503ee625..89ee21fe7d 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/CylinderShapeConfig.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/CylinderShapeConfig.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "CylinderShapeConfig", + "base": "CylinderShapeConfig", "context": "BehaviorClass", "variant": "", "details": { @@ -9,7 +9,7 @@ }, "methods": [ { - "key": "GetHeight", + "base": "GetHeight", "details": { "name": "Get Height" }, @@ -32,7 +32,7 @@ ] }, { - "key": "SetHeight", + "base": "SetHeight", "details": { "name": "Set Height" }, @@ -53,7 +53,7 @@ ] }, { - "key": "GetRadius", + "base": "GetRadius", "details": { "name": "Get Radius" }, @@ -76,7 +76,7 @@ ] }, { - "key": "SetRadius", + "base": "SetRadius", "details": { "name": "Set Radius" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/DiskShapeConfig.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/DiskShapeConfig.names index 82cd174850..6f4af06f00 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/DiskShapeConfig.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/DiskShapeConfig.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "DiskShapeConfig", + "base": "DiskShapeConfig", "context": "BehaviorClass", "variant": "", "details": { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/DisplaySettingsState.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/DisplaySettingsState.names index 6911c3d15e..2addd0d656 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/DisplaySettingsState.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/DisplaySettingsState.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "DisplaySettingsState", + "base": "DisplaySettingsState", "context": "BehaviorClass", "variant": "", "details": { @@ -9,7 +9,7 @@ }, "methods": [ { - "key": "ToString", + "base": "ToString", "context": "DisplaySettingsState", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/DitherGradientComponent.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/DitherGradientComponent.names index 36d4024bce..e3b269f248 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/DitherGradientComponent.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/DitherGradientComponent.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "DitherGradientComponent", + "base": "DitherGradientComponent", "context": "BehaviorClass", "variant": "", "details": { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/DitherGradientConfig.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/DitherGradientConfig.names index bdbf4d34e4..94ee3bc7c7 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/DitherGradientConfig.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/DitherGradientConfig.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "DitherGradientConfig", + "base": "DitherGradientConfig", "context": "BehaviorClass", "variant": "", "details": { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/EditorActorComponent.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/EditorActorComponent.names index 9ff8e9933c..d07b60cb07 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/EditorActorComponent.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/EditorActorComponent.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "EditorActorComponent", + "base": "EditorActorComponent", "context": "BehaviorClass", "variant": "", "details": { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/EditorCameraComponent.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/EditorCameraComponent.names index ad933a1918..23724acac1 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/EditorCameraComponent.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/EditorCameraComponent.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "EditorCameraComponent", + "base": "EditorCameraComponent", "context": "BehaviorClass", "variant": "", "details": { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/EditorLayerComponent.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/EditorLayerComponent.names index f8cdb2e825..415af30964 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/EditorLayerComponent.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/EditorLayerComponent.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "EditorLayerComponent", + "base": "EditorLayerComponent", "context": "BehaviorClass", "variant": "", "details": { @@ -9,7 +9,7 @@ }, "methods": [ { - "key": "CreateLayerEntityFromName", + "base": "CreateLayerEntityFromName", "context": "EditorLayerComponent", "entry": { "name": "In", @@ -42,7 +42,7 @@ ] }, { - "key": "RecoverLayer", + "base": "RecoverLayer", "context": "EditorLayerComponent", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/EditorMaterialComponentSlot.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/EditorMaterialComponentSlot.names index fbb74f130d..5b20e07711 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/EditorMaterialComponentSlot.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/EditorMaterialComponentSlot.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "EditorMaterialComponentSlot", + "base": "EditorMaterialComponentSlot", "context": "BehaviorClass", "variant": "", "details": { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/EditorSequenceComponent.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/EditorSequenceComponent.names index 32e5072aa2..7e29d2e3cb 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/EditorSequenceComponent.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/EditorSequenceComponent.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "EditorSequenceComponent", + "base": "EditorSequenceComponent", "context": "BehaviorClass", "variant": "", "details": { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/EditorSimpleMotionComponent.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/EditorSimpleMotionComponent.names index 8ae6402242..fa1366b36a 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/EditorSimpleMotionComponent.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/EditorSimpleMotionComponent.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "EditorSimpleMotionComponent", + "base": "EditorSimpleMotionComponent", "context": "BehaviorClass", "variant": "", "details": { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/EditorTransformBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/EditorTransformBus.names index 11b6390631..cb681cedbd 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/EditorTransformBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/EditorTransformBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "EditorTransformBus", + "base": "EditorTransformBus", "context": "BehaviorClass", "variant": "", "details": { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/Entity Transform.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/Entity Transform.names index 86c3415b37..389c88d709 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/Entity Transform.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/Entity Transform.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "Entity Transform", + "base": "Entity Transform", "context": "BehaviorClass", "variant": "", "details": { @@ -9,7 +9,7 @@ }, "methods": [ { - "key": "Rotate", + "base": "Rotate", "context": "Entity Transform", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/Entity.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/Entity.names index a6d6ac1f03..22a3a46c7c 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/Entity.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/Entity.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "Entity", + "base": "Entity", "context": "BehaviorClass", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetComponentName", + "base": "GetComponentName", "context": "Entity", "entry": { "name": "In", @@ -49,7 +49,7 @@ ] }, { - "key": "GetComponentType", + "base": "GetComponentType", "context": "Entity", "entry": { "name": "In", @@ -88,7 +88,7 @@ ] }, { - "key": "CreateComponent", + "base": "CreateComponent", "context": "Entity", "entry": { "name": "In", @@ -133,7 +133,7 @@ ] }, { - "key": "DestroyComponent", + "base": "DestroyComponent", "context": "Entity", "entry": { "name": "In", @@ -172,7 +172,7 @@ ] }, { - "key": "FindComponentOfType", + "base": "FindComponentOfType", "context": "Entity", "entry": { "name": "In", @@ -211,7 +211,7 @@ ] }, { - "key": "SetComponentConfiguration", + "base": "SetComponentConfiguration", "context": "Entity", "entry": { "name": "In", @@ -256,7 +256,7 @@ ] }, { - "key": "IsValid", + "base": "IsValid", "context": "Entity", "entry": { "name": "In", @@ -289,7 +289,7 @@ ] }, { - "key": "GetId", + "base": "GetId", "context": "Entity", "entry": { "name": "In", @@ -323,7 +323,7 @@ ] }, { - "key": "GetOwningContextId", + "base": "GetOwningContextId", "context": "Entity", "entry": { "name": "In", @@ -355,7 +355,7 @@ ] }, { - "key": "GetComponents", + "base": "GetComponents", "context": "Entity", "entry": { "name": "In", @@ -388,7 +388,7 @@ ] }, { - "key": "FindAllComponentsOfType", + "base": "FindAllComponentsOfType", "context": "Entity", "entry": { "name": "In", @@ -427,7 +427,7 @@ ] }, { - "key": "GetComponentConfiguration", + "base": "GetComponentConfiguration", "context": "Entity", "entry": { "name": "In", @@ -472,7 +472,7 @@ ] }, { - "key": "SetName", + "base": "SetName", "context": "Entity", "entry": { "name": "In", @@ -503,7 +503,7 @@ ] }, { - "key": "IsActivated", + "base": "IsActivated", "context": "Entity", "entry": { "name": "In", @@ -536,7 +536,7 @@ ] }, { - "key": "Activate", + "base": "Activate", "context": "Entity", "entry": { "name": "In", @@ -561,7 +561,7 @@ ] }, { - "key": "Deactivate", + "base": "Deactivate", "context": "Entity", "entry": { "name": "In", @@ -586,7 +586,7 @@ ] }, { - "key": "GetName", + "base": "GetName", "context": "Entity", "entry": { "name": "In", @@ -619,7 +619,7 @@ ] }, { - "key": "Exists", + "base": "Exists", "context": "Entity", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/EntityComponentIdPair.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/EntityComponentIdPair.names index 65f9f52bd9..50268aecb5 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/EntityComponentIdPair.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/EntityComponentIdPair.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "EntityComponentIdPair", + "base": "EntityComponentIdPair", "context": "BehaviorClass", "variant": "", "details": { @@ -9,7 +9,7 @@ }, "methods": [ { - "key": "GetEntityId", + "base": "GetEntityId", "context": "EntityComponentIdPair", "entry": { "name": "In", @@ -42,7 +42,7 @@ ] }, { - "key": "Equal", + "base": "Equal", "context": "EntityComponentIdPair", "entry": { "name": "In", @@ -80,7 +80,7 @@ ] }, { - "key": "ToString", + "base": "ToString", "context": "EntityComponentIdPair", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/EntityEntity_VM.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/EntityEntity_VM.names index fe98c15e8c..ea810ec9f0 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/EntityEntity_VM.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/EntityEntity_VM.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "EntityEntity_VM", + "base": "EntityEntity_VM", "context": "BehaviorClass", "variant": "", "details": { @@ -9,7 +9,7 @@ }, "methods": [ { - "key": "ToString", + "base": "ToString", "context": "EntityEntity_VM", "entry": { "name": "In", @@ -42,7 +42,7 @@ ] }, { - "key": "IsValid", + "base": "IsValid", "context": "EntityEntity_VM", "entry": { "name": "In", @@ -75,7 +75,7 @@ ] }, { - "key": "GetEntityForward", + "base": "GetEntityForward", "context": "EntityEntity_VM", "entry": { "name": "In", @@ -114,7 +114,7 @@ ] }, { - "key": "IsActive", + "base": "IsActive", "context": "EntityEntity_VM", "entry": { "name": "In", @@ -147,7 +147,7 @@ ] }, { - "key": "GetEntityRight", + "base": "GetEntityRight", "context": "EntityEntity_VM", "entry": { "name": "In", @@ -186,7 +186,7 @@ ] }, { - "key": "GetEntityUp", + "base": "GetEntityUp", "context": "EntityEntity_VM", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/EntityType.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/EntityType.names index c536170171..3389be627a 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/EntityType.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/EntityType.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "EntityType", + "base": "EntityType", "context": "BehaviorClass", "variant": "", "details": { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ExecutionStateInterpretedPerActivation.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ExecutionStateInterpretedPerActivation.names index 121cf63347..a6a5e8142a 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ExecutionStateInterpretedPerActivation.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ExecutionStateInterpretedPerActivation.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "ExecutionStateInterpretedPerActivation", + "base": "ExecutionStateInterpretedPerActivation", "context": "BehaviorClass", "variant": "", "details": { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ExecutionStateInterpretedPerActivationOnGraphStart.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ExecutionStateInterpretedPerActivationOnGraphStart.names index f0138954e0..416c6b2f5b 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ExecutionStateInterpretedPerActivationOnGraphStart.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ExecutionStateInterpretedPerActivationOnGraphStart.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "ExecutionStateInterpretedPerActivationOnGraphStart", + "base": "ExecutionStateInterpretedPerActivationOnGraphStart", "context": "BehaviorClass", "variant": "", "details": { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ExecutionStateInterpretedPure.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ExecutionStateInterpretedPure.names index fdd633d126..0dd0d06720 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ExecutionStateInterpretedPure.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ExecutionStateInterpretedPure.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "ExecutionStateInterpretedPure", + "base": "ExecutionStateInterpretedPure", "context": "BehaviorClass", "variant": "", "details": { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ExecutionStateInterpretedPureOnGraphStart.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ExecutionStateInterpretedPureOnGraphStart.names index c979b46dbd..94204607cc 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ExecutionStateInterpretedPureOnGraphStart.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ExecutionStateInterpretedPureOnGraphStart.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "ExecutionStateInterpretedPureOnGraphStart", + "base": "ExecutionStateInterpretedPureOnGraphStart", "context": "BehaviorClass", "variant": "", "details": { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ExecutionStateInterpretedSingleton.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ExecutionStateInterpretedSingleton.names index 3fa218a880..3303bba243 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ExecutionStateInterpretedSingleton.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ExecutionStateInterpretedSingleton.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "ExecutionStateInterpretedSingleton", + "base": "ExecutionStateInterpretedSingleton", "context": "BehaviorClass", "variant": "", "details": { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ExportProduct.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ExportProduct.names index a8035016f6..b42f87cf63 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ExportProduct.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ExportProduct.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "ExportProduct", + "base": "ExportProduct", "context": "BehaviorClass", "variant": "", "details": { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ExportProductList.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ExportProductList.names index e2dac48874..c3bbaf92a3 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ExportProductList.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ExportProductList.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "ExportProductList", + "base": "ExportProductList", "context": "BehaviorClass", "variant": "", "details": { @@ -9,7 +9,7 @@ }, "methods": [ { - "key": "AddProduct", + "base": "AddProduct", "context": "ExportProductList", "entry": { "name": "In", @@ -39,7 +39,7 @@ ] }, { - "key": "GetProducts", + "base": "GetProducts", "context": "ExportProductList", "entry": { "name": "In", @@ -71,7 +71,7 @@ ] }, { - "key": "AddDependencyToProduct", + "base": "AddDependencyToProduct", "context": "ExportProductList", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ExposureControlConfig.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ExposureControlConfig.names index b58c7ff990..fc0bf98597 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ExposureControlConfig.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ExposureControlConfig.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "ExposureControlConfig", + "base": "ExposureControlConfig", "context": "BehaviorClass", "variant": "", "details": { @@ -9,7 +9,7 @@ }, "methods": [ { - "key": "GetautoExposureSpeedUp", + "base": "GetautoExposureSpeedUp", "details": { "name": "Get Auto Exposure Speed Up" }, @@ -31,7 +31,7 @@ ] }, { - "key": "SetautoExposureSpeedUp", + "base": "SetautoExposureSpeedUp", "details": { "name": "Set Auto Exposure Speed Up" }, @@ -51,7 +51,7 @@ ] }, { - "key": "GetautoExposureSpeedDown", + "base": "GetautoExposureSpeedDown", "details": { "name": "Get Auto Exposure Speed Down" }, @@ -73,7 +73,7 @@ ] }, { - "key": "SetautoExposureSpeedDown", + "base": "SetautoExposureSpeedDown", "details": { "name": "Setauto Exposure Speed Down" }, @@ -93,7 +93,7 @@ ] }, { - "key": "GetautoExposureMax", + "base": "GetautoExposureMax", "details": { "name": "Get Auto Exposure Max" }, @@ -115,7 +115,7 @@ ] }, { - "key": "SetautoExposureMax", + "base": "SetautoExposureMax", "details": { "name": "Set Auto Exposure Max" }, @@ -135,7 +135,7 @@ ] }, { - "key": "GetautoExposureMin", + "base": "GetautoExposureMin", "details": { "name": "Get Auto Exposure Min" }, @@ -157,7 +157,7 @@ ] }, { - "key": "SetautoExposureMin", + "base": "SetautoExposureMin", "details": { "name": "Set Auto Exposure Min" }, @@ -177,7 +177,7 @@ ] }, { - "key": "GetexposureControlType", + "base": "GetexposureControlType", "details": { "name": "Get Exposure Control Type" }, @@ -199,7 +199,7 @@ ] }, { - "key": "SetexposureControlType", + "base": "SetexposureControlType", "details": { "name": "Set Exposure Control Type" }, @@ -219,7 +219,7 @@ ] }, { - "key": "GetcompensateValue", + "base": "GetcompensateValue", "details": { "name": "Get Compensate Value" }, @@ -241,7 +241,7 @@ ] }, { - "key": "SetcompensateValue", + "base": "SetcompensateValue", "details": { "name": "Set Compensate Value" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/GameplayNotificationId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/GameplayNotificationId.names index 686f40b859..27dab194a4 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/GameplayNotificationId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/GameplayNotificationId.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "GameplayNotificationId", + "base": "GameplayNotificationId", "context": "BehaviorClass", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "ToString", + "base": "ToString", "context": "GameplayNotificationId", "entry": { "name": "In", @@ -42,7 +42,7 @@ ] }, { - "key": "Equal", + "base": "Equal", "context": "GameplayNotificationId", "entry": { "name": "In", @@ -80,7 +80,7 @@ ] }, { - "key": "Clone", + "base": "Clone", "context": "GameplayNotificationId", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/GradientSampleParams.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/GradientSampleParams.names index 233f8b4ba9..8db90358b4 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/GradientSampleParams.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/GradientSampleParams.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "GradientSampleParams", + "base": "GradientSampleParams", "context": "BehaviorClass", "variant": "", "details": { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/GradientSampler.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/GradientSampler.names index ebf2a37da5..57f65951aa 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/GradientSampler.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/GradientSampler.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "GradientSampler", + "base": "GradientSampler", "context": "BehaviorClass", "variant": "", "details": { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/GradientSurfaceDataComponent.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/GradientSurfaceDataComponent.names index 16b8c9437d..dbc0134c40 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/GradientSurfaceDataComponent.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/GradientSurfaceDataComponent.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "GradientSurfaceDataComponent", + "base": "GradientSurfaceDataComponent", "context": "BehaviorClass", "variant": "", "details": { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/GradientSurfaceDataConfig.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/GradientSurfaceDataConfig.names index c176bcd603..0a488feb78 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/GradientSurfaceDataConfig.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/GradientSurfaceDataConfig.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "GradientSurfaceDataConfig", + "base": "GradientSurfaceDataConfig", "context": "BehaviorClass", "variant": "", "details": { @@ -9,7 +9,7 @@ }, "methods": [ { - "key": "GetNumTags", + "base": "GetNumTags", "context": "GradientSurfaceDataConfig", "entry": { "name": "In", @@ -41,7 +41,7 @@ ] }, { - "key": "GetTag", + "base": "GetTag", "context": "GradientSurfaceDataConfig", "entry": { "name": "In", @@ -79,7 +79,7 @@ ] }, { - "key": "RemoveTag", + "base": "RemoveTag", "context": "GradientSurfaceDataConfig", "entry": { "name": "In", @@ -109,7 +109,7 @@ ] }, { - "key": "AddTag", + "base": "AddTag", "context": "GradientSurfaceDataConfig", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/GradientTransformComponent.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/GradientTransformComponent.names index 007c0f28a3..f0f587922a 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/GradientTransformComponent.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/GradientTransformComponent.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "GradientTransformComponent", + "base": "GradientTransformComponent", "context": "BehaviorClass", "variant": "", "details": { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/GradientTransformConfig.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/GradientTransformConfig.names index 8686f131d6..1156dfc75e 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/GradientTransformConfig.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/GradientTransformConfig.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "GradientTransformConfig", + "base": "GradientTransformConfig", "context": "BehaviorClass", "variant": "", "details": { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/GraphModelSlotId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/GraphModelSlotId.names index 67c5edb8e7..232ec5f34a 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/GraphModelSlotId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/GraphModelSlotId.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "GraphModelSlotId", + "base": "GraphModelSlotId", "context": "BehaviorClass", "variant": "", "details": { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/IAnimationData.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/IAnimationData.names index 2dc1fd3ce8..c258755cf5 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/IAnimationData.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/IAnimationData.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "IAnimationData", + "base": "IAnimationData", "context": "BehaviorClass", "variant": "", "details": { @@ -9,7 +9,7 @@ }, "methods": [ { - "key": "GetKeyFrameCount", + "base": "GetKeyFrameCount", "context": "IAnimationData", "entry": { "name": "In", @@ -41,7 +41,7 @@ ] }, { - "key": "GetKeyFrame", + "base": "GetKeyFrame", "context": "IAnimationData", "entry": { "name": "In", @@ -79,7 +79,7 @@ ] }, { - "key": "GetTimeStepBetweenFrames", + "base": "GetTimeStepBetweenFrames", "context": "IAnimationData", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/IBlendShapeAnimationData.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/IBlendShapeAnimationData.names index a326b0b586..1d73f54d56 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/IBlendShapeAnimationData.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/IBlendShapeAnimationData.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "IBlendShapeAnimationData", + "base": "IBlendShapeAnimationData", "context": "BehaviorClass", "variant": "", "details": { @@ -9,7 +9,7 @@ }, "methods": [ { - "key": "GetBlendShapeName", + "base": "GetBlendShapeName", "context": "IBlendShapeAnimationData", "entry": { "name": "In", @@ -41,7 +41,7 @@ ] }, { - "key": "GetKeyFrameCount", + "base": "GetKeyFrameCount", "context": "IBlendShapeAnimationData", "entry": { "name": "In", @@ -73,7 +73,7 @@ ] }, { - "key": "GetKeyFrame", + "base": "GetKeyFrame", "context": "IBlendShapeAnimationData", "entry": { "name": "In", @@ -111,7 +111,7 @@ ] }, { - "key": "GetTimeStepBetweenFrames", + "base": "GetTimeStepBetweenFrames", "context": "IBlendShapeAnimationData", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/IBlendShapeData.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/IBlendShapeData.names index 5c4f91be1a..24143c053c 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/IBlendShapeData.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/IBlendShapeData.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "IBlendShapeData", + "base": "IBlendShapeData", "context": "BehaviorClass", "variant": "", "details": { @@ -9,7 +9,7 @@ }, "methods": [ { - "key": "GetNormal", + "base": "GetNormal", "context": "IBlendShapeData", "entry": { "name": "In", @@ -47,7 +47,7 @@ ] }, { - "key": "GetFaceVertexIndex", + "base": "GetFaceVertexIndex", "context": "IBlendShapeData", "entry": { "name": "In", @@ -91,7 +91,7 @@ ] }, { - "key": "GetFaceInfo", + "base": "GetFaceInfo", "context": "IBlendShapeData", "entry": { "name": "In", @@ -129,7 +129,7 @@ ] }, { - "key": "GetPosition", + "base": "GetPosition", "context": "IBlendShapeData", "entry": { "name": "In", @@ -167,7 +167,7 @@ ] }, { - "key": "GetUsedPointIndexForControlPoint", + "base": "GetUsedPointIndexForControlPoint", "context": "IBlendShapeData", "entry": { "name": "In", @@ -205,7 +205,7 @@ ] }, { - "key": "GetVertexCount", + "base": "GetVertexCount", "context": "IBlendShapeData", "entry": { "name": "In", @@ -237,7 +237,7 @@ ] }, { - "key": "GetFaceCount", + "base": "GetFaceCount", "context": "IBlendShapeData", "entry": { "name": "In", @@ -269,7 +269,7 @@ ] }, { - "key": "GetControlPointIndex", + "base": "GetControlPointIndex", "context": "IBlendShapeData", "entry": { "name": "In", @@ -307,7 +307,7 @@ ] }, { - "key": "GetUsedControlPointCount", + "base": "GetUsedControlPointCount", "context": "IBlendShapeData", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/IGraphObject.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/IGraphObject.names index a330f6bdae..b804be2319 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/IGraphObject.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/IGraphObject.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "IGraphObject", + "base": "IGraphObject", "context": "BehaviorClass", "variant": "", "details": { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/IMeshData.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/IMeshData.names index 608c225f3d..2ac54d8ab0 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/IMeshData.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/IMeshData.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "IMeshData", + "base": "IMeshData", "context": "BehaviorClass", "variant": "", "details": { @@ -9,7 +9,7 @@ }, "methods": [ { - "key": "GetUnitSizeInMeters", + "base": "GetUnitSizeInMeters", "context": "IMeshData", "entry": { "name": "In", @@ -41,7 +41,7 @@ ] }, { - "key": "GetOriginalUnitSizeInMeters", + "base": "GetOriginalUnitSizeInMeters", "context": "IMeshData", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ImageGradientComponent.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ImageGradientComponent.names index 186eee8f38..194c7eb028 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ImageGradientComponent.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ImageGradientComponent.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "ImageGradientComponent", + "base": "ImageGradientComponent", "context": "BehaviorClass", "variant": "", "details": { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ImageGradientConfig.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ImageGradientConfig.names index d774b0d054..75e0b09edf 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ImageGradientConfig.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ImageGradientConfig.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "ImageGradientConfig", + "base": "ImageGradientConfig", "context": "BehaviorClass", "variant": "", "details": { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/InputDeviceGamepad.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/InputDeviceGamepad.names index 69ce4ef1ce..462cc30656 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/InputDeviceGamepad.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/InputDeviceGamepad.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "InputDeviceGamepad", + "base": "InputDeviceGamepad", "context": "BehaviorClass", "variant": "", "details": { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/InputDeviceKeyboard.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/InputDeviceKeyboard.names index f041229250..f9b49b0fc9 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/InputDeviceKeyboard.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/InputDeviceKeyboard.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "InputDeviceKeyboard", + "base": "InputDeviceKeyboard", "context": "BehaviorClass", "variant": "", "details": { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/InputDeviceMotion.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/InputDeviceMotion.names index 92421945e7..994989916f 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/InputDeviceMotion.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/InputDeviceMotion.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "InputDeviceMotion", + "base": "InputDeviceMotion", "context": "BehaviorClass", "variant": "", "details": { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/InputDeviceMouse.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/InputDeviceMouse.names index 762d2fe576..dd47cb6405 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/InputDeviceMouse.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/InputDeviceMouse.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "InputDeviceMouse", + "base": "InputDeviceMouse", "context": "BehaviorClass", "variant": "", "details": { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/InputDeviceTouch.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/InputDeviceTouch.names index 082e6e65cf..b34a2bfe64 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/InputDeviceTouch.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/InputDeviceTouch.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "InputDeviceTouch", + "base": "InputDeviceTouch", "context": "BehaviorClass", "variant": "", "details": { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/InputDeviceVirtualKeyboard.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/InputDeviceVirtualKeyboard.names index 770640e7f7..6ed1e9058b 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/InputDeviceVirtualKeyboard.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/InputDeviceVirtualKeyboard.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "InputDeviceVirtualKeyboard", + "base": "InputDeviceVirtualKeyboard", "context": "BehaviorClass", "variant": "", "details": { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/InputEventNotificationId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/InputEventNotificationId.names index 7ba42921f1..c510b34efd 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/InputEventNotificationId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/InputEventNotificationId.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "InputEventNotificationId", + "base": "InputEventNotificationId", "context": "BehaviorClass", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "ToString", + "base": "ToString", "context": "InputEventNotificationId", "entry": { "name": "In", @@ -41,7 +41,7 @@ ] }, { - "key": "Equal", + "base": "Equal", "context": "InputEventNotificationId", "entry": { "name": "In", @@ -78,7 +78,7 @@ ] }, { - "key": "Clone", + "base": "Clone", "context": "InputEventNotificationId", "entry": { "name": "In", @@ -109,7 +109,7 @@ ] }, { - "key": "CreateInputEventNotificationId", + "base": "CreateInputEventNotificationId", "context": "InputEventNotificationId", "entry": { "name": "In", @@ -146,7 +146,7 @@ ] }, { - "key": "GetactionNameCrc", + "base": "GetactionNameCrc", "details": { "name": "Get Action Name Tag" }, @@ -168,7 +168,7 @@ ] }, { - "key": "SetactionNameCrc", + "base": "SetactionNameCrc", "details": { "name": "Set Action Name Tag" }, @@ -188,7 +188,7 @@ ] }, { - "key": "GetlocalUserId", + "base": "GetlocalUserId", "details": { "name": "Get Local User Id" }, @@ -210,7 +210,7 @@ ] }, { - "key": "SetlocalUserId", + "base": "SetlocalUserId", "details": { "name": "Set Local User Id" }, @@ -230,7 +230,7 @@ ] }, { - "key": "SetactionName", + "base": "SetactionName", "details": { "name": "Set Action Name" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/InvertGradientComponent.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/InvertGradientComponent.names index 8e72ef70d6..80153489d0 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/InvertGradientComponent.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/InvertGradientComponent.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "InvertGradientComponent", + "base": "InvertGradientComponent", "context": "BehaviorClass", "variant": "", "details": { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/InvertGradientConfig.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/InvertGradientConfig.names index 21840537c4..0c7f50683f 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/InvertGradientConfig.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/InvertGradientConfig.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "InvertGradientConfig", + "base": "InvertGradientConfig", "context": "BehaviorClass", "variant": "", "details": { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/LevelsGradientComponent.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/LevelsGradientComponent.names index 08c34aea98..c44335f796 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/LevelsGradientComponent.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/LevelsGradientComponent.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "LevelsGradientComponent", + "base": "LevelsGradientComponent", "context": "BehaviorClass", "variant": "", "details": { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/LevelsGradientConfig.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/LevelsGradientConfig.names index badb39ba8e..6b1b6f5d1f 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/LevelsGradientConfig.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/LevelsGradientConfig.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "LevelsGradientConfig", + "base": "LevelsGradientConfig", "context": "BehaviorClass", "variant": "", "details": { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/LightConfig.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/LightConfig.names index a0e6ba654c..9695d74586 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/LightConfig.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/LightConfig.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "LightConfig", + "base": "LightConfig", "context": "BehaviorClass", "variant": "", "details": { @@ -9,7 +9,7 @@ }, "methods": [ { - "key": "GetshadowmapSize", + "base": "GetshadowmapSize", "details": { "name": "Get Shadowmap Size" }, @@ -31,7 +31,7 @@ ] }, { - "key": "SetshadowmapSize", + "base": "SetshadowmapSize", "details": { "name": "Set Shadowmap Size" }, @@ -51,7 +51,7 @@ ] }, { - "key": "GetshadowCascadeCount", + "base": "GetshadowCascadeCount", "details": { "name": "Get Shadow Cascade Count" }, @@ -73,7 +73,7 @@ ] }, { - "key": "SetshadowCascadeCount", + "base": "SetshadowCascadeCount", "details": { "name": "Set Shadow Cascade Count" }, @@ -93,7 +93,7 @@ ] }, { - "key": "GetenableShadowDebugColoring", + "base": "GetenableShadowDebugColoring", "details": { "name": "Get Enable Shadow Debug Coloring" }, @@ -115,7 +115,7 @@ ] }, { - "key": "SetenableShadowDebugColoring", + "base": "SetenableShadowDebugColoring", "details": { "name": "Set Enable Shadow Debug Coloring" }, @@ -135,7 +135,7 @@ ] }, { - "key": "Getintensity", + "base": "Getintensity", "details": { "name": "Get Intensity" }, @@ -157,7 +157,7 @@ ] }, { - "key": "Setintensity", + "base": "Setintensity", "details": { "name": "Set Intensity" }, @@ -177,7 +177,7 @@ ] }, { - "key": "GetshadowRatioLogarithmUniform", + "base": "GetshadowRatioLogarithmUniform", "details": { "name": "Get Shadow Ratio Logarithm Uniform" }, @@ -199,7 +199,7 @@ ] }, { - "key": "SetshadowRatioLogarithmUniform", + "base": "SetshadowRatioLogarithmUniform", "details": { "name": "Set Shadow Ratio Logarithm Uniform" }, @@ -219,7 +219,7 @@ ] }, { - "key": "Getcolor", + "base": "Getcolor", "details": { "name": "Get Color" }, @@ -241,7 +241,7 @@ ] }, { - "key": "Setcolor", + "base": "Setcolor", "details": { "name": "Set Color" }, @@ -261,7 +261,7 @@ ] }, { - "key": "Getdirection", + "base": "Getdirection", "details": { "name": "Get Direction" }, @@ -283,7 +283,7 @@ ] }, { - "key": "Setdirection", + "base": "Setdirection", "details": { "name": "Set Direction" }, @@ -303,7 +303,7 @@ ] }, { - "key": "GetshadowFarClipDistance", + "base": "GetshadowFarClipDistance", "details": { "name": "Get Shadow Far Clip Distance" }, @@ -325,7 +325,7 @@ ] }, { - "key": "SetshadowFarClipDistance", + "base": "SetshadowFarClipDistance", "details": { "name": "Set Shadow Far Clip Distance" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/LightingPreset.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/LightingPreset.names index 880ca19784..2de6836faf 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/LightingPreset.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/LightingPreset.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "LightingPreset", + "base": "LightingPreset", "context": "BehaviorClass", "variant": "", "details": { @@ -9,7 +9,7 @@ }, "methods": [ { - "key": "GetshadowCatcherOpacity", + "base": "GetshadowCatcherOpacity", "details": { "name": "Get Shadow Catcher Opacity" }, @@ -31,7 +31,7 @@ ] }, { - "key": "SetshadowCatcherOpacity", + "base": "SetshadowCatcherOpacity", "details": { "name": "Set Shadow Catcher Opacity" }, @@ -51,7 +51,7 @@ ] }, { - "key": "GetskyboxExposure", + "base": "GetskyboxExposure", "details": { "name": "Get Skybox Exposure" }, @@ -73,7 +73,7 @@ ] }, { - "key": "SetskyboxExposure", + "base": "SetskyboxExposure", "details": { "name": "Set Skybox Exposure" }, @@ -93,7 +93,7 @@ ] }, { - "key": "Getlights", + "base": "Getlights", "details": { "name": "Get Lights" }, @@ -115,7 +115,7 @@ ] }, { - "key": "Setlights", + "base": "Setlights", "details": { "name": "Set Lights" }, @@ -135,7 +135,7 @@ ] }, { - "key": "GetiblExposure", + "base": "GetiblExposure", "details": { "name": "Get IBL Exposure" }, @@ -157,7 +157,7 @@ ] }, { - "key": "SetiblExposure", + "base": "SetiblExposure", "details": { "name": "Set IBL Exposure" }, @@ -177,7 +177,7 @@ ] }, { - "key": "GetskyboxImageAsset", + "base": "GetskyboxImageAsset", "details": { "name": "Get Skybox Image Asset" }, @@ -199,7 +199,7 @@ ] }, { - "key": "SetskyboxImageAsset", + "base": "SetskyboxImageAsset", "details": { "name": "Set Skybox Image Asset" }, @@ -219,7 +219,7 @@ ] }, { - "key": "GetiblSpecularImageAsset", + "base": "GetiblSpecularImageAsset", "details": { "name": "Get IBL Specular Image Asset" }, @@ -241,7 +241,7 @@ ] }, { - "key": "SetiblSpecularImageAsset", + "base": "SetiblSpecularImageAsset", "details": { "name": "Set IBL Specular Image Asset" }, @@ -261,7 +261,7 @@ ] }, { - "key": "GetdisplayName", + "base": "GetdisplayName", "details": { "name": "Get Display Name" }, @@ -283,7 +283,7 @@ ] }, { - "key": "SetdisplayName", + "base": "SetdisplayName", "details": { "name": "Set Display Name" }, @@ -303,7 +303,7 @@ ] }, { - "key": "GetalternateSkyboxImageAsset", + "base": "GetalternateSkyboxImageAsset", "details": { "name": "Get Alternate Skybox Image Asset" }, @@ -325,7 +325,7 @@ ] }, { - "key": "SetalternateSkyboxImageAsset", + "base": "SetalternateSkyboxImageAsset", "details": { "name": "Set Alternate Skybox Image Asset" }, @@ -345,7 +345,7 @@ ] }, { - "key": "GetiblDiffuseImageAsset", + "base": "GetiblDiffuseImageAsset", "details": { "name": "Get IBL Diffuse Image Asset" }, @@ -367,7 +367,7 @@ ] }, { - "key": "SetiblDiffuseImageAsset", + "base": "SetiblDiffuseImageAsset", "details": { "name": "Set IBL Diffuse Image Asset" }, @@ -387,7 +387,7 @@ ] }, { - "key": "Getexposure", + "base": "Getexposure", "details": { "name": "Get Exposure" }, @@ -409,7 +409,7 @@ ] }, { - "key": "Setexposure", + "base": "Setexposure", "details": { "name": "Set Exposure" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MaterialAssignment.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MaterialAssignment.names index 529159f6e5..eee8e79088 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MaterialAssignment.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MaterialAssignment.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "MaterialAssignment", + "base": "MaterialAssignment", "context": "BehaviorClass", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "ToString", + "base": "ToString", "context": "MaterialAssignment", "entry": { "name": "In", @@ -33,7 +33,7 @@ ] }, { - "key": "GetmaterialAsset", + "base": "GetmaterialAsset", "details": { "name": "Getmaterial Asset" }, @@ -55,7 +55,7 @@ ] }, { - "key": "SetmaterialAsset", + "base": "SetmaterialAsset", "details": { "name": "Setmaterial Asset" }, @@ -75,7 +75,7 @@ ] }, { - "key": "GetpropertyOverrides", + "base": "GetpropertyOverrides", "details": { "name": "Getproperty Overrides" }, @@ -97,7 +97,7 @@ ] }, { - "key": "SetpropertyOverrides", + "base": "SetpropertyOverrides", "details": { "name": "Setproperty Overrides" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MaterialAssignmentId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MaterialAssignmentId.names index cf708d0d9b..4f8e8299ff 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MaterialAssignmentId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MaterialAssignmentId.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "MaterialAssignmentId", + "base": "MaterialAssignmentId", "context": "BehaviorClass", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "ToString", + "base": "ToString", "context": "MaterialAssignmentId", "entry": { "name": "In", @@ -33,7 +33,7 @@ ] }, { - "key": "IsAssetOnly", + "base": "IsAssetOnly", "context": "MaterialAssignmentId", "entry": { "name": "In", @@ -56,7 +56,7 @@ ] }, { - "key": "IsSlotIdOnly", + "base": "IsSlotIdOnly", "context": "MaterialAssignmentId", "entry": { "name": "In", @@ -79,7 +79,7 @@ ] }, { - "key": "IsLodAndSlotId", + "base": "IsLodAndSlotId", "context": "MaterialAssignmentId", "entry": { "name": "In", @@ -102,7 +102,7 @@ ] }, { - "key": "IsDefault", + "base": "IsDefault", "context": "MaterialAssignmentId", "entry": { "name": "In", @@ -125,7 +125,7 @@ ] }, { - "key": "IsLodAndAsset", + "base": "IsLodAndAsset", "context": "MaterialAssignmentId", "entry": { "name": "In", @@ -148,7 +148,7 @@ ] }, { - "key": "GetlodIndex", + "base": "GetlodIndex", "details": { "name": "Getlod Index" }, @@ -170,7 +170,7 @@ ] }, { - "key": "SetlodIndex", + "base": "SetlodIndex", "details": { "name": "Setlod Index" }, @@ -190,7 +190,7 @@ ] }, { - "key": "GetmaterialSlotStableId", + "base": "GetmaterialSlotStableId", "details": { "name": "Getmaterial Slot Stable Id" }, @@ -212,7 +212,7 @@ ] }, { - "key": "SetmaterialSlotStableId", + "base": "SetmaterialSlotStableId", "details": { "name": "Setmaterial Slot Stable Id" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MaterialComponentConfig.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MaterialComponentConfig.names index 27edc76275..e167ff79a5 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MaterialComponentConfig.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MaterialComponentConfig.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "MaterialComponentConfig", + "base": "MaterialComponentConfig", "context": "BehaviorClass", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "Getmaterials", + "base": "Getmaterials", "details": { "name": "Get Materials" }, @@ -33,7 +33,7 @@ ] }, { - "key": "Setmaterials", + "base": "Setmaterials", "details": { "name": "Set Materials" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MaterialData.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MaterialData.names index fc1aaa0e0b..a3736cd467 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MaterialData.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MaterialData.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "MaterialData", + "base": "MaterialData", "context": "BehaviorClass", "variant": "", "details": { @@ -9,7 +9,7 @@ }, "methods": [ { - "key": "GetBaseColor", + "base": "GetBaseColor", "context": "MaterialData", "entry": { "name": "In", @@ -42,7 +42,7 @@ ] }, { - "key": "GetUseRoughnessMap", + "base": "GetUseRoughnessMap", "context": "MaterialData", "entry": { "name": "In", @@ -75,7 +75,7 @@ ] }, { - "key": "GetShininess", + "base": "GetShininess", "context": "MaterialData", "entry": { "name": "In", @@ -108,7 +108,7 @@ ] }, { - "key": "GetUseEmissiveMap", + "base": "GetUseEmissiveMap", "context": "MaterialData", "entry": { "name": "In", @@ -141,7 +141,7 @@ ] }, { - "key": "GetEmissiveColor", + "base": "GetEmissiveColor", "context": "MaterialData", "entry": { "name": "In", @@ -174,7 +174,7 @@ ] }, { - "key": "GetSpecularColor", + "base": "GetSpecularColor", "context": "MaterialData", "entry": { "name": "In", @@ -207,7 +207,7 @@ ] }, { - "key": "GetUniqueId", + "base": "GetUniqueId", "context": "MaterialData", "entry": { "name": "In", @@ -240,7 +240,7 @@ ] }, { - "key": "GetDiffuseColor", + "base": "GetDiffuseColor", "context": "MaterialData", "entry": { "name": "In", @@ -273,7 +273,7 @@ ] }, { - "key": "GetEmissiveIntensity", + "base": "GetEmissiveIntensity", "context": "MaterialData", "entry": { "name": "In", @@ -306,7 +306,7 @@ ] }, { - "key": "GetMaterialName", + "base": "GetMaterialName", "context": "MaterialData", "entry": { "name": "In", @@ -339,7 +339,7 @@ ] }, { - "key": "GetUseMetallicMap", + "base": "GetUseMetallicMap", "context": "MaterialData", "entry": { "name": "In", @@ -372,7 +372,7 @@ ] }, { - "key": "GetMetallicFactor", + "base": "GetMetallicFactor", "context": "MaterialData", "entry": { "name": "In", @@ -405,7 +405,7 @@ ] }, { - "key": "GetRoughnessFactor", + "base": "GetRoughnessFactor", "context": "MaterialData", "entry": { "name": "In", @@ -438,7 +438,7 @@ ] }, { - "key": "GetUseAOMap", + "base": "GetUseAOMap", "context": "MaterialData", "entry": { "name": "In", @@ -471,7 +471,7 @@ ] }, { - "key": "GetTexture", + "base": "GetTexture", "context": "MaterialData", "entry": { "name": "In", @@ -510,7 +510,7 @@ ] }, { - "key": "IsNoDraw", + "base": "IsNoDraw", "context": "MaterialData", "entry": { "name": "In", @@ -543,7 +543,7 @@ ] }, { - "key": "GetOpacity", + "base": "GetOpacity", "context": "MaterialData", "entry": { "name": "In", @@ -576,7 +576,7 @@ ] }, { - "key": "GetUseColorMap", + "base": "GetUseColorMap", "context": "MaterialData", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/Math.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/Math.names index 546608f0b0..4cb39e58a4 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/Math.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/Math.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "Math", + "base": "Math", "context": "BehaviorClass", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "DivideByNumber", + "base": "DivideByNumber", "context": "Math", "entry": { "name": "In", @@ -48,7 +48,7 @@ ] }, { - "key": "Round", + "base": "Round", "context": "Math", "entry": { "name": "In", @@ -80,7 +80,7 @@ ] }, { - "key": "Sqrt", + "base": "Sqrt", "context": "Math", "entry": { "name": "In", @@ -112,7 +112,7 @@ ] }, { - "key": "Mod", + "base": "Mod", "context": "Math", "entry": { "name": "In", @@ -150,7 +150,7 @@ ] }, { - "key": "Ceil", + "base": "Ceil", "context": "Math", "entry": { "name": "In", @@ -182,7 +182,7 @@ ] }, { - "key": "IsEven", + "base": "IsEven", "context": "Math", "entry": { "name": "In", @@ -214,7 +214,7 @@ ] }, { - "key": "IsClose", + "base": "IsClose", "context": "Math", "entry": { "name": "In", @@ -258,7 +258,7 @@ ] }, { - "key": "ArcSin", + "base": "ArcSin", "context": "Math", "entry": { "name": "In", @@ -290,7 +290,7 @@ ] }, { - "key": "ArcTan", + "base": "ArcTan", "context": "Math", "entry": { "name": "In", @@ -322,7 +322,7 @@ ] }, { - "key": "Max", + "base": "Max", "context": "Math", "entry": { "name": "In", @@ -360,7 +360,7 @@ ] }, { - "key": "Tan", + "base": "Tan", "context": "Math", "entry": { "name": "In", @@ -392,7 +392,7 @@ ] }, { - "key": "ArcTan2", + "base": "ArcTan2", "context": "Math", "entry": { "name": "In", @@ -430,7 +430,7 @@ ] }, { - "key": "Floor", + "base": "Floor", "context": "Math", "entry": { "name": "In", @@ -462,7 +462,7 @@ ] }, { - "key": "Min", + "base": "Min", "context": "Math", "entry": { "name": "In", @@ -500,7 +500,7 @@ ] }, { - "key": "Lerp", + "base": "Lerp", "context": "Math", "entry": { "name": "In", @@ -544,7 +544,7 @@ ] }, { - "key": "LerpInverse", + "base": "LerpInverse", "context": "Math", "entry": { "name": "In", @@ -588,7 +588,7 @@ ] }, { - "key": "IsOdd", + "base": "IsOdd", "context": "Math", "entry": { "name": "In", @@ -620,7 +620,7 @@ ] }, { - "key": "Abs", + "base": "Abs", "context": "Math", "entry": { "name": "In", @@ -651,7 +651,7 @@ ] }, { - "key": "RadToDeg", + "base": "RadToDeg", "context": "Math", "entry": { "name": "In", @@ -683,7 +683,7 @@ ] }, { - "key": "Sin", + "base": "Sin", "context": "Math", "entry": { "name": "In", @@ -715,7 +715,7 @@ ] }, { - "key": "Cos", + "base": "Cos", "context": "Math", "entry": { "name": "In", @@ -747,7 +747,7 @@ ] }, { - "key": "ArcCos", + "base": "ArcCos", "context": "Math", "entry": { "name": "In", @@ -779,7 +779,7 @@ ] }, { - "key": "Sign", + "base": "Sign", "context": "Math", "entry": { "name": "In", @@ -811,7 +811,7 @@ ] }, { - "key": "Clamp", + "base": "Clamp", "context": "Math", "entry": { "name": "In", @@ -855,7 +855,7 @@ ] }, { - "key": "GetSinCos", + "base": "GetSinCos", "context": "Math", "entry": { "name": "In", @@ -891,7 +891,7 @@ ] }, { - "key": "DegToRad", + "base": "DegToRad", "context": "Math", "entry": { "name": "In", @@ -923,7 +923,7 @@ ] }, { - "key": "Pow", + "base": "Pow", "context": "Math", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MathAABB_VM.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MathAABB_VM.names index b8a8e84eea..56f6267643 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MathAABB_VM.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MathAABB_VM.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "MathAABB_VM", + "base": "MathAABB_VM", "context": "BehaviorClass", "variant": "", "details": { @@ -9,7 +9,7 @@ }, "methods": [ { - "key": "Overlaps", + "base": "Overlaps", "context": "MathAABB_VM", "entry": { "name": "In", @@ -47,7 +47,7 @@ ] }, { - "key": "SurfaceArea", + "base": "SurfaceArea", "context": "MathAABB_VM", "entry": { "name": "In", @@ -79,7 +79,7 @@ ] }, { - "key": "ToSphere", + "base": "ToSphere", "context": "MathAABB_VM", "entry": { "name": "In", @@ -111,7 +111,7 @@ ] }, { - "key": "FromOBB", + "base": "FromOBB", "context": "MathAABB_VM", "entry": { "name": "In", @@ -143,7 +143,7 @@ ] }, { - "key": "Translate", + "base": "Translate", "context": "MathAABB_VM", "entry": { "name": "In", @@ -181,7 +181,7 @@ ] }, { - "key": "ContainsVector3", + "base": "ContainsVector3", "context": "MathAABB_VM", "entry": { "name": "In", @@ -219,7 +219,7 @@ ] }, { - "key": "Distance", + "base": "Distance", "context": "MathAABB_VM", "entry": { "name": "In", @@ -257,7 +257,7 @@ ] }, { - "key": "FromPoint", + "base": "FromPoint", "context": "MathAABB_VM", "entry": { "name": "In", @@ -289,7 +289,7 @@ ] }, { - "key": "Null", + "base": "Null", "context": "MathAABB_VM", "entry": { "name": "In", @@ -313,7 +313,7 @@ ] }, { - "key": "YExtent", + "base": "YExtent", "context": "MathAABB_VM", "entry": { "name": "In", @@ -345,7 +345,7 @@ ] }, { - "key": "Clamp", + "base": "Clamp", "context": "MathAABB_VM", "entry": { "name": "In", @@ -383,7 +383,7 @@ ] }, { - "key": "ContainsAABB", + "base": "ContainsAABB", "context": "MathAABB_VM", "entry": { "name": "In", @@ -421,7 +421,7 @@ ] }, { - "key": "Expand", + "base": "Expand", "context": "MathAABB_VM", "entry": { "name": "In", @@ -459,7 +459,7 @@ ] }, { - "key": "Extents", + "base": "Extents", "context": "MathAABB_VM", "entry": { "name": "In", @@ -491,7 +491,7 @@ ] }, { - "key": "FromCenterHalfExtents", + "base": "FromCenterHalfExtents", "context": "MathAABB_VM", "entry": { "name": "In", @@ -529,7 +529,7 @@ ] }, { - "key": "GetMin", + "base": "GetMin", "context": "MathAABB_VM", "entry": { "name": "In", @@ -561,7 +561,7 @@ ] }, { - "key": "ApplyTransform", + "base": "ApplyTransform", "context": "MathAABB_VM", "entry": { "name": "In", @@ -599,7 +599,7 @@ ] }, { - "key": "Center", + "base": "Center", "context": "MathAABB_VM", "entry": { "name": "In", @@ -631,7 +631,7 @@ ] }, { - "key": "FromMinMax", + "base": "FromMinMax", "context": "MathAABB_VM", "entry": { "name": "In", @@ -669,7 +669,7 @@ ] }, { - "key": "IsFinite", + "base": "IsFinite", "context": "MathAABB_VM", "entry": { "name": "In", @@ -701,7 +701,7 @@ ] }, { - "key": "IsValid", + "base": "IsValid", "context": "MathAABB_VM", "entry": { "name": "In", @@ -733,7 +733,7 @@ ] }, { - "key": "GetMax", + "base": "GetMax", "context": "MathAABB_VM", "entry": { "name": "In", @@ -765,7 +765,7 @@ ] }, { - "key": "XExtent", + "base": "XExtent", "context": "MathAABB_VM", "entry": { "name": "In", @@ -797,7 +797,7 @@ ] }, { - "key": "AddPoint", + "base": "AddPoint", "context": "MathAABB_VM", "entry": { "name": "In", @@ -835,7 +835,7 @@ ] }, { - "key": "AddAABB", + "base": "AddAABB", "context": "MathAABB_VM", "entry": { "name": "In", @@ -873,7 +873,7 @@ ] }, { - "key": "FromCenterRadius", + "base": "FromCenterRadius", "context": "MathAABB_VM", "entry": { "name": "In", @@ -911,7 +911,7 @@ ] }, { - "key": "ZExtent", + "base": "ZExtent", "context": "MathAABB_VM", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MathColor_VM.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MathColor_VM.names index d63799df8b..cc13a61532 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MathColor_VM.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MathColor_VM.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "MathColor_VM", + "base": "MathColor_VM", "context": "BehaviorClass", "variant": "", "details": { @@ -9,7 +9,7 @@ }, "methods": [ { - "key": "One", + "base": "One", "context": "MathColor_VM", "entry": { "name": "In", @@ -33,7 +33,7 @@ ] }, { - "key": "LinearToGamma", + "base": "LinearToGamma", "context": "MathColor_VM", "entry": { "name": "In", @@ -65,7 +65,7 @@ ] }, { - "key": "FromVector3", + "base": "FromVector3", "context": "MathColor_VM", "entry": { "name": "In", @@ -97,7 +97,7 @@ ] }, { - "key": "MultiplyByNumber", + "base": "MultiplyByNumber", "context": "MathColor_VM", "entry": { "name": "In", @@ -135,7 +135,7 @@ ] }, { - "key": "Negate", + "base": "Negate", "context": "MathColor_VM", "entry": { "name": "In", @@ -167,7 +167,7 @@ ] }, { - "key": "Dot3", + "base": "Dot3", "context": "MathColor_VM", "entry": { "name": "In", @@ -205,7 +205,7 @@ ] }, { - "key": "Dot", + "base": "Dot", "context": "MathColor_VM", "entry": { "name": "In", @@ -243,7 +243,7 @@ ] }, { - "key": "FromValues", + "base": "FromValues", "context": "MathColor_VM", "entry": { "name": "In", @@ -293,7 +293,7 @@ ] }, { - "key": "DivideByNumber", + "base": "DivideByNumber", "context": "MathColor_VM", "entry": { "name": "In", @@ -331,7 +331,7 @@ ] }, { - "key": "FromVector3AndNumber", + "base": "FromVector3AndNumber", "context": "MathColor_VM", "entry": { "name": "In", @@ -369,7 +369,7 @@ ] }, { - "key": "GammaToLinear", + "base": "GammaToLinear", "context": "MathColor_VM", "entry": { "name": "In", @@ -401,7 +401,7 @@ ] }, { - "key": "IsClose", + "base": "IsClose", "context": "MathColor_VM", "entry": { "name": "In", @@ -445,7 +445,7 @@ ] }, { - "key": "IsZero", + "base": "IsZero", "context": "MathColor_VM", "entry": { "name": "In", @@ -483,7 +483,7 @@ ] }, { - "key": "MultiplyByColor", + "base": "MultiplyByColor", "context": "MathColor_VM", "entry": { "name": "In", @@ -521,7 +521,7 @@ ] }, { - "key": "Add", + "base": "Add", "context": "MathColor_VM", "entry": { "name": "In", @@ -559,7 +559,7 @@ ] }, { - "key": "Subtract", + "base": "Subtract", "context": "MathColor_VM", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MathCrc32_VM.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MathCrc32_VM.names index 1b2b5a4e7d..339b02c5fd 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MathCrc32_VM.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MathCrc32_VM.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "MathCrc32_VM", + "base": "MathCrc32_VM", "context": "BehaviorClass", "variant": "", "details": { @@ -9,7 +9,7 @@ }, "methods": [ { - "key": "FromString", + "base": "FromString", "context": "MathCrc32_VM", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MathMatrix3x3_VM.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MathMatrix3x3_VM.names index a66332a5fa..b1722ef645 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MathMatrix3x3_VM.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MathMatrix3x3_VM.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "MathMatrix3x3_VM", + "base": "MathMatrix3x3_VM", "context": "BehaviorClass", "variant": "", "details": { @@ -9,7 +9,7 @@ }, "methods": [ { - "key": "Transpose", + "base": "Transpose", "context": "MathMatrix3x3_VM", "entry": { "name": "In", @@ -41,7 +41,7 @@ ] }, { - "key": "Zero", + "base": "Zero", "context": "MathMatrix3x3_VM", "entry": { "name": "In", @@ -65,7 +65,7 @@ ] }, { - "key": "Subtract", + "base": "Subtract", "context": "MathMatrix3x3_VM", "entry": { "name": "In", @@ -103,7 +103,7 @@ ] }, { - "key": "GetElement", + "base": "GetElement", "context": "MathMatrix3x3_VM", "entry": { "name": "In", @@ -147,7 +147,7 @@ ] }, { - "key": "Invert", + "base": "Invert", "context": "MathMatrix3x3_VM", "entry": { "name": "In", @@ -179,7 +179,7 @@ ] }, { - "key": "GetDiagonal", + "base": "GetDiagonal", "context": "MathMatrix3x3_VM", "entry": { "name": "In", @@ -211,7 +211,7 @@ ] }, { - "key": "GetColumn", + "base": "GetColumn", "context": "MathMatrix3x3_VM", "entry": { "name": "In", @@ -249,7 +249,7 @@ ] }, { - "key": "MultiplyByVector", + "base": "MultiplyByVector", "context": "MathMatrix3x3_VM", "entry": { "name": "In", @@ -287,7 +287,7 @@ ] }, { - "key": "Add", + "base": "Add", "context": "MathMatrix3x3_VM", "entry": { "name": "In", @@ -325,7 +325,7 @@ ] }, { - "key": "IsFinite", + "base": "IsFinite", "context": "MathMatrix3x3_VM", "entry": { "name": "In", @@ -357,7 +357,7 @@ ] }, { - "key": "DivideByNumber", + "base": "DivideByNumber", "context": "MathMatrix3x3_VM", "entry": { "name": "In", @@ -395,7 +395,7 @@ ] }, { - "key": "ToAdjugate", + "base": "ToAdjugate", "context": "MathMatrix3x3_VM", "entry": { "name": "In", @@ -427,7 +427,7 @@ ] }, { - "key": "IsClose", + "base": "IsClose", "context": "MathMatrix3x3_VM", "entry": { "name": "In", @@ -471,7 +471,7 @@ ] }, { - "key": "MultiplyByMatrix", + "base": "MultiplyByMatrix", "context": "MathMatrix3x3_VM", "entry": { "name": "In", @@ -509,7 +509,7 @@ ] }, { - "key": "IsOrthogonal", + "base": "IsOrthogonal", "context": "MathMatrix3x3_VM", "entry": { "name": "In", @@ -541,7 +541,7 @@ ] }, { - "key": "Orthogonalize", + "base": "Orthogonalize", "context": "MathMatrix3x3_VM", "entry": { "name": "In", @@ -573,7 +573,7 @@ ] }, { - "key": "GetRows", + "base": "GetRows", "context": "MathMatrix3x3_VM", "entry": { "name": "In", @@ -605,7 +605,7 @@ ] }, { - "key": "FromCrossProduct", + "base": "FromCrossProduct", "context": "MathMatrix3x3_VM", "entry": { "name": "In", @@ -637,7 +637,7 @@ ] }, { - "key": "GetColumns", + "base": "GetColumns", "context": "MathMatrix3x3_VM", "entry": { "name": "In", @@ -669,7 +669,7 @@ ] }, { - "key": "FromTransform", + "base": "FromTransform", "context": "MathMatrix3x3_VM", "entry": { "name": "In", @@ -701,7 +701,7 @@ ] }, { - "key": "FromScale", + "base": "FromScale", "context": "MathMatrix3x3_VM", "entry": { "name": "In", @@ -733,7 +733,7 @@ ] }, { - "key": "ToScale", + "base": "ToScale", "context": "MathMatrix3x3_VM", "entry": { "name": "In", @@ -765,7 +765,7 @@ ] }, { - "key": "FromQuaternion", + "base": "FromQuaternion", "context": "MathMatrix3x3_VM", "entry": { "name": "In", @@ -797,7 +797,7 @@ ] }, { - "key": "MultiplyByNumber", + "base": "MultiplyByNumber", "context": "MathMatrix3x3_VM", "entry": { "name": "In", @@ -835,7 +835,7 @@ ] }, { - "key": "GetRow", + "base": "GetRow", "context": "MathMatrix3x3_VM", "entry": { "name": "In", @@ -873,7 +873,7 @@ ] }, { - "key": "FromRotationYDegrees", + "base": "FromRotationYDegrees", "context": "MathMatrix3x3_VM", "entry": { "name": "In", @@ -905,7 +905,7 @@ ] }, { - "key": "FromRows", + "base": "FromRows", "context": "MathMatrix3x3_VM", "entry": { "name": "In", @@ -949,7 +949,7 @@ ] }, { - "key": "FromDiagonal", + "base": "FromDiagonal", "context": "MathMatrix3x3_VM", "entry": { "name": "In", @@ -981,7 +981,7 @@ ] }, { - "key": "FromRotationZDegrees", + "base": "FromRotationZDegrees", "context": "MathMatrix3x3_VM", "entry": { "name": "In", @@ -1013,7 +1013,7 @@ ] }, { - "key": "FromMatrix4x4", + "base": "FromMatrix4x4", "context": "MathMatrix3x3_VM", "entry": { "name": "In", @@ -1045,7 +1045,7 @@ ] }, { - "key": "FromColumns", + "base": "FromColumns", "context": "MathMatrix3x3_VM", "entry": { "name": "In", @@ -1089,7 +1089,7 @@ ] }, { - "key": "FromRotationXDegrees", + "base": "FromRotationXDegrees", "context": "MathMatrix3x3_VM", "entry": { "name": "In", @@ -1121,7 +1121,7 @@ ] }, { - "key": "ToDeterminant", + "base": "ToDeterminant", "context": "MathMatrix3x3_VM", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MathMatrix4x4_VM.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MathMatrix4x4_VM.names index ec8549b966..7df54c7060 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MathMatrix4x4_VM.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MathMatrix4x4_VM.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "MathMatrix4x4_VM", + "base": "MathMatrix4x4_VM", "context": "BehaviorClass", "variant": "", "details": { @@ -9,7 +9,7 @@ }, "methods": [ { - "key": "GetRow", + "base": "GetRow", "context": "MathMatrix4x4_VM", "entry": { "name": "In", @@ -47,7 +47,7 @@ ] }, { - "key": "FromRotationXDegrees", + "base": "FromRotationXDegrees", "context": "MathMatrix4x4_VM", "entry": { "name": "In", @@ -79,7 +79,7 @@ ] }, { - "key": "FromRotationZDegrees", + "base": "FromRotationZDegrees", "context": "MathMatrix4x4_VM", "entry": { "name": "In", @@ -111,7 +111,7 @@ ] }, { - "key": "FromRows", + "base": "FromRows", "context": "MathMatrix4x4_VM", "entry": { "name": "In", @@ -161,7 +161,7 @@ ] }, { - "key": "ToScale", + "base": "ToScale", "context": "MathMatrix4x4_VM", "entry": { "name": "In", @@ -193,7 +193,7 @@ ] }, { - "key": "FromQuaternion", + "base": "FromQuaternion", "context": "MathMatrix4x4_VM", "entry": { "name": "In", @@ -225,7 +225,7 @@ ] }, { - "key": "FromScale", + "base": "FromScale", "context": "MathMatrix4x4_VM", "entry": { "name": "In", @@ -257,7 +257,7 @@ ] }, { - "key": "FromTransform", + "base": "FromTransform", "context": "MathMatrix4x4_VM", "entry": { "name": "In", @@ -289,7 +289,7 @@ ] }, { - "key": "GetTranslation", + "base": "GetTranslation", "context": "MathMatrix4x4_VM", "entry": { "name": "In", @@ -321,7 +321,7 @@ ] }, { - "key": "FromQuaternionAndTranslation", + "base": "FromQuaternionAndTranslation", "context": "MathMatrix4x4_VM", "entry": { "name": "In", @@ -359,7 +359,7 @@ ] }, { - "key": "GetColumn", + "base": "GetColumn", "context": "MathMatrix4x4_VM", "entry": { "name": "In", @@ -397,7 +397,7 @@ ] }, { - "key": "GetDiagonal", + "base": "GetDiagonal", "context": "MathMatrix4x4_VM", "entry": { "name": "In", @@ -429,7 +429,7 @@ ] }, { - "key": "Invert", + "base": "Invert", "context": "MathMatrix4x4_VM", "entry": { "name": "In", @@ -461,7 +461,7 @@ ] }, { - "key": "IsClose", + "base": "IsClose", "context": "MathMatrix4x4_VM", "entry": { "name": "In", @@ -505,7 +505,7 @@ ] }, { - "key": "FromMatrix3x3", + "base": "FromMatrix3x3", "context": "MathMatrix4x4_VM", "entry": { "name": "In", @@ -537,7 +537,7 @@ ] }, { - "key": "GetColumns", + "base": "GetColumns", "context": "MathMatrix4x4_VM", "entry": { "name": "In", @@ -569,7 +569,7 @@ ] }, { - "key": "GetRows", + "base": "GetRows", "context": "MathMatrix4x4_VM", "entry": { "name": "In", @@ -601,7 +601,7 @@ ] }, { - "key": "MultiplyByMatrix", + "base": "MultiplyByMatrix", "context": "MathMatrix4x4_VM", "entry": { "name": "In", @@ -639,7 +639,7 @@ ] }, { - "key": "FromDiagonal", + "base": "FromDiagonal", "context": "MathMatrix4x4_VM", "entry": { "name": "In", @@ -671,7 +671,7 @@ ] }, { - "key": "FromRotationYDegrees", + "base": "FromRotationYDegrees", "context": "MathMatrix4x4_VM", "entry": { "name": "In", @@ -703,7 +703,7 @@ ] }, { - "key": "GetElement", + "base": "GetElement", "context": "MathMatrix4x4_VM", "entry": { "name": "In", @@ -747,7 +747,7 @@ ] }, { - "key": "Transpose", + "base": "Transpose", "context": "MathMatrix4x4_VM", "entry": { "name": "In", @@ -779,7 +779,7 @@ ] }, { - "key": "FromColumns", + "base": "FromColumns", "context": "MathMatrix4x4_VM", "entry": { "name": "In", @@ -829,7 +829,7 @@ ] }, { - "key": "FromTranslation", + "base": "FromTranslation", "context": "MathMatrix4x4_VM", "entry": { "name": "In", @@ -861,7 +861,7 @@ ] }, { - "key": "IsFinite", + "base": "IsFinite", "context": "MathMatrix4x4_VM", "entry": { "name": "In", @@ -893,7 +893,7 @@ ] }, { - "key": "MultiplyByVector", + "base": "MultiplyByVector", "context": "MathMatrix4x4_VM", "entry": { "name": "In", @@ -931,7 +931,7 @@ ] }, { - "key": "Zero", + "base": "Zero", "context": "MathMatrix4x4_VM", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MathOBB_VM.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MathOBB_VM.names index 4776bbbd8a..4932723ee9 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MathOBB_VM.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MathOBB_VM.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "MathOBB_VM", + "base": "MathOBB_VM", "context": "BehaviorClass", "variant": "", "details": { @@ -9,7 +9,7 @@ }, "methods": [ { - "key": "GetPosition", + "base": "GetPosition", "context": "MathOBB_VM", "entry": { "name": "In", @@ -41,7 +41,7 @@ ] }, { - "key": "GetAxisY", + "base": "GetAxisY", "context": "MathOBB_VM", "entry": { "name": "In", @@ -73,7 +73,7 @@ ] }, { - "key": "GetAxisX", + "base": "GetAxisX", "context": "MathOBB_VM", "entry": { "name": "In", @@ -105,7 +105,7 @@ ] }, { - "key": "FromAabb", + "base": "FromAabb", "context": "MathOBB_VM", "entry": { "name": "In", @@ -137,7 +137,7 @@ ] }, { - "key": "FromPositionRotationAndHalfLengths", + "base": "FromPositionRotationAndHalfLengths", "context": "MathOBB_VM", "entry": { "name": "In", @@ -181,7 +181,7 @@ ] }, { - "key": "GetAxisZ", + "base": "GetAxisZ", "context": "MathOBB_VM", "entry": { "name": "In", @@ -213,7 +213,7 @@ ] }, { - "key": "IsFinite", + "base": "IsFinite", "context": "MathOBB_VM", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MathPlane_VM.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MathPlane_VM.names index adea5df187..36d88d5fe9 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MathPlane_VM.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MathPlane_VM.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "MathPlane_VM", + "base": "MathPlane_VM", "context": "BehaviorClass", "variant": "", "details": { @@ -9,7 +9,7 @@ }, "methods": [ { - "key": "GetPlaneEquationCoefficients", + "base": "GetPlaneEquationCoefficients", "context": "MathPlane_VM", "entry": { "name": "In", @@ -41,7 +41,7 @@ ] }, { - "key": "GetDistance", + "base": "GetDistance", "context": "MathPlane_VM", "entry": { "name": "In", @@ -73,7 +73,7 @@ ] }, { - "key": "Project", + "base": "Project", "context": "MathPlane_VM", "entry": { "name": "In", @@ -111,7 +111,7 @@ ] }, { - "key": "FromNormalAndPoint", + "base": "FromNormalAndPoint", "context": "MathPlane_VM", "entry": { "name": "In", @@ -149,7 +149,7 @@ ] }, { - "key": "IsFinite", + "base": "IsFinite", "context": "MathPlane_VM", "entry": { "name": "In", @@ -181,7 +181,7 @@ ] }, { - "key": "Transform", + "base": "Transform", "context": "MathPlane_VM", "entry": { "name": "In", @@ -219,7 +219,7 @@ ] }, { - "key": "DistanceToPoint", + "base": "DistanceToPoint", "context": "MathPlane_VM", "entry": { "name": "In", @@ -257,7 +257,7 @@ ] }, { - "key": "FromCoefficients", + "base": "FromCoefficients", "context": "MathPlane_VM", "entry": { "name": "In", @@ -307,7 +307,7 @@ ] }, { - "key": "FromNormalAndDistance", + "base": "FromNormalAndDistance", "context": "MathPlane_VM", "entry": { "name": "In", @@ -345,7 +345,7 @@ ] }, { - "key": "GetNormal", + "base": "GetNormal", "context": "MathPlane_VM", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MathQuaternion_VM.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MathQuaternion_VM.names index 4fc4390979..cc9f2ba875 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MathQuaternion_VM.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MathQuaternion_VM.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "MathQuaternion_VM", + "base": "MathQuaternion_VM", "context": "BehaviorClass", "variant": "", "details": { @@ -9,7 +9,7 @@ }, "methods": [ { - "key": "Subtract", + "base": "Subtract", "context": "MathQuaternion_VM", "entry": { "name": "In", @@ -47,7 +47,7 @@ ] }, { - "key": "RotationYDegrees", + "base": "RotationYDegrees", "context": "MathQuaternion_VM", "entry": { "name": "In", @@ -79,7 +79,7 @@ ] }, { - "key": "Normalize", + "base": "Normalize", "context": "MathQuaternion_VM", "entry": { "name": "In", @@ -111,7 +111,7 @@ ] }, { - "key": "LengthReciprocal", + "base": "LengthReciprocal", "context": "MathQuaternion_VM", "entry": { "name": "In", @@ -143,7 +143,7 @@ ] }, { - "key": "CreateFromEulerAngles", + "base": "CreateFromEulerAngles", "context": "MathQuaternion_VM", "entry": { "name": "In", @@ -187,7 +187,7 @@ ] }, { - "key": "IsIdentity", + "base": "IsIdentity", "context": "MathQuaternion_VM", "entry": { "name": "In", @@ -225,7 +225,7 @@ ] }, { - "key": "FromTransform", + "base": "FromTransform", "context": "MathQuaternion_VM", "entry": { "name": "In", @@ -257,7 +257,7 @@ ] }, { - "key": "Lerp", + "base": "Lerp", "context": "MathQuaternion_VM", "entry": { "name": "In", @@ -301,7 +301,7 @@ ] }, { - "key": "RotationZDegrees", + "base": "RotationZDegrees", "context": "MathQuaternion_VM", "entry": { "name": "In", @@ -333,7 +333,7 @@ ] }, { - "key": "ConvertTransformToRotation", + "base": "ConvertTransformToRotation", "context": "MathQuaternion_VM", "entry": { "name": "In", @@ -365,7 +365,7 @@ ] }, { - "key": "ShortestArc", + "base": "ShortestArc", "context": "MathQuaternion_VM", "entry": { "name": "In", @@ -403,7 +403,7 @@ ] }, { - "key": "RotationXDegrees", + "base": "RotationXDegrees", "context": "MathQuaternion_VM", "entry": { "name": "In", @@ -435,7 +435,7 @@ ] }, { - "key": "IsZero", + "base": "IsZero", "context": "MathQuaternion_VM", "entry": { "name": "In", @@ -473,7 +473,7 @@ ] }, { - "key": "IsClose", + "base": "IsClose", "context": "MathQuaternion_VM", "entry": { "name": "In", @@ -517,7 +517,7 @@ ] }, { - "key": "Length", + "base": "Length", "context": "MathQuaternion_VM", "entry": { "name": "In", @@ -549,7 +549,7 @@ ] }, { - "key": "Conjugate", + "base": "Conjugate", "context": "MathQuaternion_VM", "entry": { "name": "In", @@ -581,7 +581,7 @@ ] }, { - "key": "ToAngleDegrees", + "base": "ToAngleDegrees", "context": "MathQuaternion_VM", "entry": { "name": "In", @@ -613,7 +613,7 @@ ] }, { - "key": "Dot", + "base": "Dot", "context": "MathQuaternion_VM", "entry": { "name": "In", @@ -651,7 +651,7 @@ ] }, { - "key": "Negate", + "base": "Negate", "context": "MathQuaternion_VM", "entry": { "name": "In", @@ -683,7 +683,7 @@ ] }, { - "key": "Add", + "base": "Add", "context": "MathQuaternion_VM", "entry": { "name": "In", @@ -721,7 +721,7 @@ ] }, { - "key": "MultiplyByNumber", + "base": "MultiplyByNumber", "context": "MathQuaternion_VM", "entry": { "name": "In", @@ -759,7 +759,7 @@ ] }, { - "key": "Slerp", + "base": "Slerp", "context": "MathQuaternion_VM", "entry": { "name": "In", @@ -803,7 +803,7 @@ ] }, { - "key": "InvertFull", + "base": "InvertFull", "context": "MathQuaternion_VM", "entry": { "name": "In", @@ -835,7 +835,7 @@ ] }, { - "key": "FromMatrix4x4", + "base": "FromMatrix4x4", "context": "MathQuaternion_VM", "entry": { "name": "In", @@ -867,7 +867,7 @@ ] }, { - "key": "RotateVector3", + "base": "RotateVector3", "context": "MathQuaternion_VM", "entry": { "name": "In", @@ -905,7 +905,7 @@ ] }, { - "key": "FromMatrix3x3", + "base": "FromMatrix3x3", "context": "MathQuaternion_VM", "entry": { "name": "In", @@ -937,7 +937,7 @@ ] }, { - "key": "Squad", + "base": "Squad", "context": "MathQuaternion_VM", "entry": { "name": "In", @@ -993,7 +993,7 @@ ] }, { - "key": "FromAxisAngleDegrees", + "base": "FromAxisAngleDegrees", "context": "MathQuaternion_VM", "entry": { "name": "In", @@ -1031,7 +1031,7 @@ ] }, { - "key": "LengthSquared", + "base": "LengthSquared", "context": "MathQuaternion_VM", "entry": { "name": "In", @@ -1063,7 +1063,7 @@ ] }, { - "key": "IsFinite", + "base": "IsFinite", "context": "MathQuaternion_VM", "entry": { "name": "In", @@ -1095,7 +1095,7 @@ ] }, { - "key": "DivideByNumber", + "base": "DivideByNumber", "context": "MathQuaternion_VM", "entry": { "name": "In", @@ -1133,7 +1133,7 @@ ] }, { - "key": "MultiplyByRotation", + "base": "MultiplyByRotation", "context": "MathQuaternion_VM", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MathRandom_VM.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MathRandom_VM.names index 0ac7a5b5a0..9dffa229ca 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MathRandom_VM.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MathRandom_VM.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "MathRandom_VM", + "base": "MathRandom_VM", "context": "BehaviorClass", "variant": "", "details": { @@ -9,7 +9,7 @@ }, "methods": [ { - "key": "RandomPointOnSphere", + "base": "RandomPointOnSphere", "context": "MathRandom_VM", "entry": { "name": "In", @@ -41,7 +41,7 @@ ] }, { - "key": "RandomPointInCircle", + "base": "RandomPointInCircle", "context": "MathRandom_VM", "entry": { "name": "In", @@ -73,7 +73,7 @@ ] }, { - "key": "RandomPointInSquare", + "base": "RandomPointInSquare", "context": "MathRandom_VM", "entry": { "name": "In", @@ -105,7 +105,7 @@ ] }, { - "key": "RandomUnitVector2", + "base": "RandomUnitVector2", "context": "MathRandom_VM", "entry": { "name": "In", @@ -129,7 +129,7 @@ ] }, { - "key": "RandomVector2", + "base": "RandomVector2", "context": "MathRandom_VM", "entry": { "name": "In", @@ -167,7 +167,7 @@ ] }, { - "key": "RandomPointInCylinder", + "base": "RandomPointInCylinder", "context": "MathRandom_VM", "entry": { "name": "In", @@ -205,7 +205,7 @@ ] }, { - "key": "RandomQuaternion", + "base": "RandomQuaternion", "context": "MathRandom_VM", "entry": { "name": "In", @@ -243,7 +243,7 @@ ] }, { - "key": "RandomVector4", + "base": "RandomVector4", "context": "MathRandom_VM", "entry": { "name": "In", @@ -281,7 +281,7 @@ ] }, { - "key": "RandomPointInBox", + "base": "RandomPointInBox", "context": "MathRandom_VM", "entry": { "name": "In", @@ -313,7 +313,7 @@ ] }, { - "key": "RandomPointOnCircle", + "base": "RandomPointOnCircle", "context": "MathRandom_VM", "entry": { "name": "In", @@ -345,7 +345,7 @@ ] }, { - "key": "RandomPointInEllipsoid", + "base": "RandomPointInEllipsoid", "context": "MathRandom_VM", "entry": { "name": "In", @@ -377,7 +377,7 @@ ] }, { - "key": "RandomInteger", + "base": "RandomInteger", "context": "MathRandom_VM", "entry": { "name": "In", @@ -415,7 +415,7 @@ ] }, { - "key": "RandomPointInWedge", + "base": "RandomPointInWedge", "context": "MathRandom_VM", "entry": { "name": "In", @@ -477,7 +477,7 @@ ] }, { - "key": "RandomGrayscale", + "base": "RandomGrayscale", "context": "MathRandom_VM", "entry": { "name": "In", @@ -515,7 +515,7 @@ ] }, { - "key": "RandomPointInCone", + "base": "RandomPointInCone", "context": "MathRandom_VM", "entry": { "name": "In", @@ -553,7 +553,7 @@ ] }, { - "key": "RandomColor", + "base": "RandomColor", "context": "MathRandom_VM", "entry": { "name": "In", @@ -591,7 +591,7 @@ ] }, { - "key": "RandomNumber", + "base": "RandomNumber", "context": "MathRandom_VM", "entry": { "name": "In", @@ -629,7 +629,7 @@ ] }, { - "key": "RandomPointInSphere", + "base": "RandomPointInSphere", "context": "MathRandom_VM", "entry": { "name": "In", @@ -661,7 +661,7 @@ ] }, { - "key": "RandomUnitVector3", + "base": "RandomUnitVector3", "context": "MathRandom_VM", "entry": { "name": "In", @@ -685,7 +685,7 @@ ] }, { - "key": "RandomVector3", + "base": "RandomVector3", "context": "MathRandom_VM", "entry": { "name": "In", @@ -723,7 +723,7 @@ ] }, { - "key": "RandomPointInArc", + "base": "RandomPointInArc", "context": "MathRandom_VM", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MathTransform_VM.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MathTransform_VM.names index da20b78d90..392596d90b 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MathTransform_VM.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MathTransform_VM.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "MathTransform_VM", + "base": "MathTransform_VM", "context": "BehaviorClass", "variant": "", "details": { @@ -9,7 +9,7 @@ }, "methods": [ { - "key": "RotationZDegrees", + "base": "RotationZDegrees", "context": "MathTransform_VM", "entry": { "name": "In", @@ -41,7 +41,7 @@ ] }, { - "key": "GetUp", + "base": "GetUp", "context": "MathTransform_VM", "entry": { "name": "In", @@ -79,7 +79,7 @@ ] }, { - "key": "GetForward", + "base": "GetForward", "context": "MathTransform_VM", "entry": { "name": "In", @@ -117,7 +117,7 @@ ] }, { - "key": "IsClose", + "base": "IsClose", "context": "MathTransform_VM", "entry": { "name": "In", @@ -161,7 +161,7 @@ ] }, { - "key": "RotationXDegrees", + "base": "RotationXDegrees", "context": "MathTransform_VM", "entry": { "name": "In", @@ -193,7 +193,7 @@ ] }, { - "key": "FromTranslation", + "base": "FromTranslation", "context": "MathTransform_VM", "entry": { "name": "In", @@ -225,7 +225,7 @@ ] }, { - "key": "IsFinite", + "base": "IsFinite", "context": "MathTransform_VM", "entry": { "name": "In", @@ -257,7 +257,7 @@ ] }, { - "key": "MultiplyByUniformScale", + "base": "MultiplyByUniformScale", "context": "MathTransform_VM", "entry": { "name": "In", @@ -295,7 +295,7 @@ ] }, { - "key": "MultiplyByTransform", + "base": "MultiplyByTransform", "context": "MathTransform_VM", "entry": { "name": "In", @@ -333,7 +333,7 @@ ] }, { - "key": "FromRotation", + "base": "FromRotation", "context": "MathTransform_VM", "entry": { "name": "In", @@ -365,7 +365,7 @@ ] }, { - "key": "RotationYDegrees", + "base": "RotationYDegrees", "context": "MathTransform_VM", "entry": { "name": "In", @@ -397,7 +397,7 @@ ] }, { - "key": "FromRotationAndTranslation", + "base": "FromRotationAndTranslation", "context": "MathTransform_VM", "entry": { "name": "In", @@ -435,7 +435,7 @@ ] }, { - "key": "MultiplyByVector3", + "base": "MultiplyByVector3", "context": "MathTransform_VM", "entry": { "name": "In", @@ -473,7 +473,7 @@ ] }, { - "key": "MultiplyByVector4", + "base": "MultiplyByVector4", "context": "MathTransform_VM", "entry": { "name": "In", @@ -511,7 +511,7 @@ ] }, { - "key": "ToScale", + "base": "ToScale", "context": "MathTransform_VM", "entry": { "name": "In", @@ -543,7 +543,7 @@ ] }, { - "key": "FromMatrix3x3", + "base": "FromMatrix3x3", "context": "MathTransform_VM", "entry": { "name": "In", @@ -575,7 +575,7 @@ ] }, { - "key": "GetRight", + "base": "GetRight", "context": "MathTransform_VM", "entry": { "name": "In", @@ -613,7 +613,7 @@ ] }, { - "key": "IsOrthogonal", + "base": "IsOrthogonal", "context": "MathTransform_VM", "entry": { "name": "In", @@ -651,7 +651,7 @@ ] }, { - "key": "Orthogonalize", + "base": "Orthogonalize", "context": "MathTransform_VM", "entry": { "name": "In", @@ -683,7 +683,7 @@ ] }, { - "key": "FromMatrix3x3AndTranslation", + "base": "FromMatrix3x3AndTranslation", "context": "MathTransform_VM", "entry": { "name": "In", @@ -721,7 +721,7 @@ ] }, { - "key": "FromScale", + "base": "FromScale", "context": "MathTransform_VM", "entry": { "name": "In", @@ -753,7 +753,7 @@ ] }, { - "key": "GetTranslation", + "base": "GetTranslation", "context": "MathTransform_VM", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MathUtils.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MathUtils.names index 20232e4b0a..d394306ed0 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MathUtils.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MathUtils.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "MathUtils", + "base": "MathUtils", "context": "BehaviorClass", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "ConvertEulerDegreesToQuaternion", + "base": "ConvertEulerDegreesToQuaternion", "context": "MathUtils", "entry": { "name": "In", @@ -41,7 +41,7 @@ ] }, { - "key": "ConvertEulerDegreesToTransformPrecise", + "base": "ConvertEulerDegreesToTransformPrecise", "context": "MathUtils", "entry": { "name": "In", @@ -73,7 +73,7 @@ ] }, { - "key": "ConvertEulerDegreesToTransform", + "base": "ConvertEulerDegreesToTransform", "context": "MathUtils", "entry": { "name": "In", @@ -104,7 +104,7 @@ ] }, { - "key": "ConvertQuaternionToEulerRadians", + "base": "ConvertQuaternionToEulerRadians", "context": "MathUtils", "entry": { "name": "In", @@ -135,7 +135,7 @@ ] }, { - "key": "CreateLookAt", + "base": "CreateLookAt", "context": "MathUtils", "entry": { "name": "In", @@ -179,7 +179,7 @@ ] }, { - "key": "ConvertTransformToEulerRadians", + "base": "ConvertTransformToEulerRadians", "context": "MathUtils", "entry": { "name": "In", @@ -210,7 +210,7 @@ ] }, { - "key": "ConvertQuaternionToEulerDegrees", + "base": "ConvertQuaternionToEulerDegrees", "context": "MathUtils", "entry": { "name": "In", @@ -241,7 +241,7 @@ ] }, { - "key": "ConvertTransformToEulerDegrees", + "base": "ConvertTransformToEulerDegrees", "context": "MathUtils", "entry": { "name": "In", @@ -272,7 +272,7 @@ ] }, { - "key": "ConvertEulerRadiansToQuaternion", + "base": "ConvertEulerRadiansToQuaternion", "context": "MathUtils", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MathVector2_VM.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MathVector2_VM.names index aefb8a3b4b..ad6cca60a4 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MathVector2_VM.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MathVector2_VM.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "MathVector2_VM", + "base": "MathVector2_VM", "context": "BehaviorClass", "variant": "", "details": { @@ -9,7 +9,7 @@ }, "methods": [ { - "key": "DirectionTo", + "base": "DirectionTo", "context": "MathVector2_VM", "entry": { "name": "In", @@ -53,7 +53,7 @@ ] }, { - "key": "Subtract", + "base": "Subtract", "context": "MathVector2_VM", "entry": { "name": "In", @@ -91,7 +91,7 @@ ] }, { - "key": "Project", + "base": "Project", "context": "MathVector2_VM", "entry": { "name": "In", @@ -129,7 +129,7 @@ ] }, { - "key": "Distance", + "base": "Distance", "context": "MathVector2_VM", "entry": { "name": "In", @@ -167,7 +167,7 @@ ] }, { - "key": "FromValues", + "base": "FromValues", "context": "MathVector2_VM", "entry": { "name": "In", @@ -205,7 +205,7 @@ ] }, { - "key": "Dot", + "base": "Dot", "context": "MathVector2_VM", "entry": { "name": "In", @@ -243,7 +243,7 @@ ] }, { - "key": "Angle", + "base": "Angle", "context": "MathVector2_VM", "entry": { "name": "In", @@ -275,7 +275,7 @@ ] }, { - "key": "Negate", + "base": "Negate", "context": "MathVector2_VM", "entry": { "name": "In", @@ -307,7 +307,7 @@ ] }, { - "key": "MultiplyByVector", + "base": "MultiplyByVector", "context": "MathVector2_VM", "entry": { "name": "In", @@ -345,7 +345,7 @@ ] }, { - "key": "Add", + "base": "Add", "context": "MathVector2_VM", "entry": { "name": "In", @@ -383,7 +383,7 @@ ] }, { - "key": "Clamp", + "base": "Clamp", "context": "MathVector2_VM", "entry": { "name": "In", @@ -427,7 +427,7 @@ ] }, { - "key": "MultiplyByNumber", + "base": "MultiplyByNumber", "context": "MathVector2_VM", "entry": { "name": "In", @@ -465,7 +465,7 @@ ] }, { - "key": "Slerp", + "base": "Slerp", "context": "MathVector2_VM", "entry": { "name": "In", @@ -509,7 +509,7 @@ ] }, { - "key": "IsZero", + "base": "IsZero", "context": "MathVector2_VM", "entry": { "name": "In", @@ -547,7 +547,7 @@ ] }, { - "key": "SetY", + "base": "SetY", "context": "MathVector2_VM", "entry": { "name": "In", @@ -585,7 +585,7 @@ ] }, { - "key": "IsClose", + "base": "IsClose", "context": "MathVector2_VM", "entry": { "name": "In", @@ -629,7 +629,7 @@ ] }, { - "key": "DivideByNumber", + "base": "DivideByNumber", "context": "MathVector2_VM", "entry": { "name": "In", @@ -667,7 +667,7 @@ ] }, { - "key": "IsNormalized", + "base": "IsNormalized", "context": "MathVector2_VM", "entry": { "name": "In", @@ -705,7 +705,7 @@ ] }, { - "key": "LengthSquared", + "base": "LengthSquared", "context": "MathVector2_VM", "entry": { "name": "In", @@ -737,7 +737,7 @@ ] }, { - "key": "IsFinite", + "base": "IsFinite", "context": "MathVector2_VM", "entry": { "name": "In", @@ -769,7 +769,7 @@ ] }, { - "key": "ToPerpendicular", + "base": "ToPerpendicular", "context": "MathVector2_VM", "entry": { "name": "In", @@ -801,7 +801,7 @@ ] }, { - "key": "Normalize", + "base": "Normalize", "context": "MathVector2_VM", "entry": { "name": "In", @@ -833,7 +833,7 @@ ] }, { - "key": "Max", + "base": "Max", "context": "MathVector2_VM", "entry": { "name": "In", @@ -871,7 +871,7 @@ ] }, { - "key": "GetElement", + "base": "GetElement", "context": "MathVector2_VM", "entry": { "name": "In", @@ -909,7 +909,7 @@ ] }, { - "key": "Absolute", + "base": "Absolute", "context": "MathVector2_VM", "entry": { "name": "In", @@ -941,7 +941,7 @@ ] }, { - "key": "SetX", + "base": "SetX", "context": "MathVector2_VM", "entry": { "name": "In", @@ -979,7 +979,7 @@ ] }, { - "key": "Min", + "base": "Min", "context": "MathVector2_VM", "entry": { "name": "In", @@ -1017,7 +1017,7 @@ ] }, { - "key": "DivideByVector", + "base": "DivideByVector", "context": "MathVector2_VM", "entry": { "name": "In", @@ -1055,7 +1055,7 @@ ] }, { - "key": "DistanceSquared", + "base": "DistanceSquared", "context": "MathVector2_VM", "entry": { "name": "In", @@ -1093,7 +1093,7 @@ ] }, { - "key": "Length", + "base": "Length", "context": "MathVector2_VM", "entry": { "name": "In", @@ -1125,7 +1125,7 @@ ] }, { - "key": "Lerp", + "base": "Lerp", "context": "MathVector2_VM", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MathVector3_VM.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MathVector3_VM.names index 001fc94f4d..445031012f 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MathVector3_VM.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MathVector3_VM.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "MathVector3_VM", + "base": "MathVector3_VM", "context": "BehaviorClass", "variant": "", "details": { @@ -9,7 +9,7 @@ }, "methods": [ { - "key": "Reciprocal", + "base": "Reciprocal", "context": "MathVector3_VM", "entry": { "name": "In", @@ -41,7 +41,7 @@ ] }, { - "key": "Subtract", + "base": "Subtract", "context": "MathVector3_VM", "entry": { "name": "In", @@ -79,7 +79,7 @@ ] }, { - "key": "Project", + "base": "Project", "context": "MathVector3_VM", "entry": { "name": "In", @@ -117,7 +117,7 @@ ] }, { - "key": "Normalize", + "base": "Normalize", "context": "MathVector3_VM", "entry": { "name": "In", @@ -149,7 +149,7 @@ ] }, { - "key": "Distance", + "base": "Distance", "context": "MathVector3_VM", "entry": { "name": "In", @@ -187,7 +187,7 @@ ] }, { - "key": "SetZ", + "base": "SetZ", "context": "MathVector3_VM", "entry": { "name": "In", @@ -225,7 +225,7 @@ ] }, { - "key": "Max", + "base": "Max", "context": "MathVector3_VM", "entry": { "name": "In", @@ -263,7 +263,7 @@ ] }, { - "key": "GetElement", + "base": "GetElement", "context": "MathVector3_VM", "entry": { "name": "In", @@ -301,7 +301,7 @@ ] }, { - "key": "Absolute", + "base": "Absolute", "context": "MathVector3_VM", "entry": { "name": "In", @@ -333,7 +333,7 @@ ] }, { - "key": "BuildTangentBasis", + "base": "BuildTangentBasis", "context": "MathVector3_VM", "entry": { "name": "In", @@ -365,7 +365,7 @@ ] }, { - "key": "Clamp", + "base": "Clamp", "context": "MathVector3_VM", "entry": { "name": "In", @@ -409,7 +409,7 @@ ] }, { - "key": "MultiplyByNumber", + "base": "MultiplyByNumber", "context": "MathVector3_VM", "entry": { "name": "In", @@ -447,7 +447,7 @@ ] }, { - "key": "Slerp", + "base": "Slerp", "context": "MathVector3_VM", "entry": { "name": "In", @@ -491,7 +491,7 @@ ] }, { - "key": "IsZero", + "base": "IsZero", "context": "MathVector3_VM", "entry": { "name": "In", @@ -529,7 +529,7 @@ ] }, { - "key": "SetY", + "base": "SetY", "context": "MathVector3_VM", "entry": { "name": "In", @@ -567,7 +567,7 @@ ] }, { - "key": "IsClose", + "base": "IsClose", "context": "MathVector3_VM", "entry": { "name": "In", @@ -611,7 +611,7 @@ ] }, { - "key": "Cross", + "base": "Cross", "context": "MathVector3_VM", "entry": { "name": "In", @@ -649,7 +649,7 @@ ] }, { - "key": "DirectionTo", + "base": "DirectionTo", "context": "MathVector3_VM", "entry": { "name": "In", @@ -693,7 +693,7 @@ ] }, { - "key": "MultiplyByVector", + "base": "MultiplyByVector", "context": "MathVector3_VM", "entry": { "name": "In", @@ -731,7 +731,7 @@ ] }, { - "key": "Negate", + "base": "Negate", "context": "MathVector3_VM", "entry": { "name": "In", @@ -763,7 +763,7 @@ ] }, { - "key": "Add", + "base": "Add", "context": "MathVector3_VM", "entry": { "name": "In", @@ -801,7 +801,7 @@ ] }, { - "key": "IsPerpendicular", + "base": "IsPerpendicular", "context": "MathVector3_VM", "entry": { "name": "In", @@ -845,7 +845,7 @@ ] }, { - "key": "IsFinite", + "base": "IsFinite", "context": "MathVector3_VM", "entry": { "name": "In", @@ -877,7 +877,7 @@ ] }, { - "key": "DivideByNumber", + "base": "DivideByNumber", "context": "MathVector3_VM", "entry": { "name": "In", @@ -915,7 +915,7 @@ ] }, { - "key": "IsNormalized", + "base": "IsNormalized", "context": "MathVector3_VM", "entry": { "name": "In", @@ -953,7 +953,7 @@ ] }, { - "key": "LengthSquared", + "base": "LengthSquared", "context": "MathVector3_VM", "entry": { "name": "In", @@ -985,7 +985,7 @@ ] }, { - "key": "FromValues", + "base": "FromValues", "context": "MathVector3_VM", "entry": { "name": "In", @@ -1029,7 +1029,7 @@ ] }, { - "key": "Dot", + "base": "Dot", "context": "MathVector3_VM", "entry": { "name": "In", @@ -1067,7 +1067,7 @@ ] }, { - "key": "SetX", + "base": "SetX", "context": "MathVector3_VM", "entry": { "name": "In", @@ -1105,7 +1105,7 @@ ] }, { - "key": "LengthReciprocal", + "base": "LengthReciprocal", "context": "MathVector3_VM", "entry": { "name": "In", @@ -1137,7 +1137,7 @@ ] }, { - "key": "Min", + "base": "Min", "context": "MathVector3_VM", "entry": { "name": "In", @@ -1175,7 +1175,7 @@ ] }, { - "key": "DistanceSquared", + "base": "DistanceSquared", "context": "MathVector3_VM", "entry": { "name": "In", @@ -1213,7 +1213,7 @@ ] }, { - "key": "Length", + "base": "Length", "context": "MathVector3_VM", "entry": { "name": "In", @@ -1245,7 +1245,7 @@ ] }, { - "key": "DivideByVector", + "base": "DivideByVector", "context": "MathVector3_VM", "entry": { "name": "In", @@ -1283,7 +1283,7 @@ ] }, { - "key": "Lerp", + "base": "Lerp", "context": "MathVector3_VM", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MathVector4_VM.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MathVector4_VM.names index 87654cb3f9..5caadf4728 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MathVector4_VM.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MathVector4_VM.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "MathVector4_VM", + "base": "MathVector4_VM", "context": "BehaviorClass", "variant": "", "details": { @@ -9,7 +9,7 @@ }, "methods": [ { - "key": "SetW", + "base": "SetW", "context": "MathVector4_VM", "entry": { "name": "In", @@ -47,7 +47,7 @@ ] }, { - "key": "SetX", + "base": "SetX", "context": "MathVector4_VM", "entry": { "name": "In", @@ -85,7 +85,7 @@ ] }, { - "key": "IsNormalized", + "base": "IsNormalized", "context": "MathVector4_VM", "entry": { "name": "In", @@ -123,7 +123,7 @@ ] }, { - "key": "LengthSquared", + "base": "LengthSquared", "context": "MathVector4_VM", "entry": { "name": "In", @@ -155,7 +155,7 @@ ] }, { - "key": "MultiplyByNumber", + "base": "MultiplyByNumber", "context": "MathVector4_VM", "entry": { "name": "In", @@ -193,7 +193,7 @@ ] }, { - "key": "Negate", + "base": "Negate", "context": "MathVector4_VM", "entry": { "name": "In", @@ -225,7 +225,7 @@ ] }, { - "key": "Dot", + "base": "Dot", "context": "MathVector4_VM", "entry": { "name": "In", @@ -263,7 +263,7 @@ ] }, { - "key": "FromValues", + "base": "FromValues", "context": "MathVector4_VM", "entry": { "name": "In", @@ -313,7 +313,7 @@ ] }, { - "key": "IsFinite", + "base": "IsFinite", "context": "MathVector4_VM", "entry": { "name": "In", @@ -345,7 +345,7 @@ ] }, { - "key": "Length", + "base": "Length", "context": "MathVector4_VM", "entry": { "name": "In", @@ -377,7 +377,7 @@ ] }, { - "key": "MultiplyByVector", + "base": "MultiplyByVector", "context": "MathVector4_VM", "entry": { "name": "In", @@ -415,7 +415,7 @@ ] }, { - "key": "DirectionTo", + "base": "DirectionTo", "context": "MathVector4_VM", "entry": { "name": "In", @@ -459,7 +459,7 @@ ] }, { - "key": "DivideByVector", + "base": "DivideByVector", "context": "MathVector4_VM", "entry": { "name": "In", @@ -497,7 +497,7 @@ ] }, { - "key": "LengthReciprocal", + "base": "LengthReciprocal", "context": "MathVector4_VM", "entry": { "name": "In", @@ -529,7 +529,7 @@ ] }, { - "key": "SetZ", + "base": "SetZ", "context": "MathVector4_VM", "entry": { "name": "In", @@ -567,7 +567,7 @@ ] }, { - "key": "Normalize", + "base": "Normalize", "context": "MathVector4_VM", "entry": { "name": "In", @@ -599,7 +599,7 @@ ] }, { - "key": "DivideByNumber", + "base": "DivideByNumber", "context": "MathVector4_VM", "entry": { "name": "In", @@ -637,7 +637,7 @@ ] }, { - "key": "IsClose", + "base": "IsClose", "context": "MathVector4_VM", "entry": { "name": "In", @@ -681,7 +681,7 @@ ] }, { - "key": "IsZero", + "base": "IsZero", "context": "MathVector4_VM", "entry": { "name": "In", @@ -719,7 +719,7 @@ ] }, { - "key": "Add", + "base": "Add", "context": "MathVector4_VM", "entry": { "name": "In", @@ -757,7 +757,7 @@ ] }, { - "key": "GetElement", + "base": "GetElement", "context": "MathVector4_VM", "entry": { "name": "In", @@ -795,7 +795,7 @@ ] }, { - "key": "Reciprocal", + "base": "Reciprocal", "context": "MathVector4_VM", "entry": { "name": "In", @@ -827,7 +827,7 @@ ] }, { - "key": "Subtract", + "base": "Subtract", "context": "MathVector4_VM", "entry": { "name": "In", @@ -865,7 +865,7 @@ ] }, { - "key": "Absolute", + "base": "Absolute", "context": "MathVector4_VM", "entry": { "name": "In", @@ -897,7 +897,7 @@ ] }, { - "key": "SetY", + "base": "SetY", "context": "MathVector4_VM", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/Math_VM.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/Math_VM.names index d3b492ff31..e8a695f972 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/Math_VM.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/Math_VM.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "Math_VM", + "base": "Math_VM", "context": "BehaviorClass", "variant": "", "details": { @@ -9,7 +9,7 @@ }, "methods": [ { - "key": "ThreeGeneric", + "base": "ThreeGeneric", "context": "Math_VM", "entry": { "name": "In", @@ -53,7 +53,7 @@ ] }, { - "key": "MultiplyAndAdd", + "base": "MultiplyAndAdd", "context": "Math_VM", "entry": { "name": "In", @@ -97,7 +97,7 @@ ] }, { - "key": "StringToNumber", + "base": "StringToNumber", "context": "Math_VM", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/Matrix3x4.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/Matrix3x4.names index a2f2bed3f9..4b529d8dda 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/Matrix3x4.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/Matrix3x4.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "Matrix3x4", + "base": "Matrix3x4", "context": "BehaviorClass", "variant": "", "details": { @@ -9,7 +9,7 @@ }, "methods": [ { - "key": "CreateZero", + "base": "CreateZero", "context": "Matrix3x4", "entry": { "name": "In", @@ -33,7 +33,7 @@ ] }, { - "key": "SetRotationPartFromQuaternion", + "base": "SetRotationPartFromQuaternion", "context": "Matrix3x4", "entry": { "name": "In", @@ -63,7 +63,7 @@ ] }, { - "key": "CreateFromColumns", + "base": "CreateFromColumns", "context": "Matrix3x4", "entry": { "name": "In", @@ -113,7 +113,7 @@ ] }, { - "key": "IsClose", + "base": "IsClose", "context": "Matrix3x4", "entry": { "name": "In", @@ -157,7 +157,7 @@ ] }, { - "key": "IsOrthogonal", + "base": "IsOrthogonal", "context": "Matrix3x4", "entry": { "name": "In", @@ -195,7 +195,7 @@ ] }, { - "key": "Orthogonalize", + "base": "Orthogonalize", "context": "Matrix3x4", "entry": { "name": "In", @@ -219,7 +219,7 @@ ] }, { - "key": "CreateFromMatrix3x3", + "base": "CreateFromMatrix3x3", "context": "Matrix3x4", "entry": { "name": "In", @@ -251,7 +251,7 @@ ] }, { - "key": "RetrieveScale", + "base": "RetrieveScale", "context": "Matrix3x4", "entry": { "name": "In", @@ -283,7 +283,7 @@ ] }, { - "key": "CreateRotationX", + "base": "CreateRotationX", "context": "Matrix3x4", "entry": { "name": "In", @@ -315,7 +315,7 @@ ] }, { - "key": "CreateFromMatrix3x3AndTranslation", + "base": "CreateFromMatrix3x3AndTranslation", "context": "Matrix3x4", "entry": { "name": "In", @@ -352,7 +352,7 @@ ] }, { - "key": "ToString", + "base": "ToString", "context": "Matrix3x4", "entry": { "name": "In", @@ -383,7 +383,7 @@ ] }, { - "key": "ExtractScale", + "base": "ExtractScale", "context": "Matrix3x4", "entry": { "name": "In", @@ -415,7 +415,7 @@ ] }, { - "key": "GetTranspose", + "base": "GetTranspose", "context": "Matrix3x4", "entry": { "name": "In", @@ -446,7 +446,7 @@ ] }, { - "key": "InvertFast", + "base": "InvertFast", "context": "Matrix3x4", "entry": { "name": "In", @@ -470,7 +470,7 @@ ] }, { - "key": "CreateFromRows", + "base": "CreateFromRows", "context": "Matrix3x4", "entry": { "name": "In", @@ -514,7 +514,7 @@ ] }, { - "key": "CreateTranslation", + "base": "CreateTranslation", "context": "Matrix3x4", "entry": { "name": "In", @@ -546,7 +546,7 @@ ] }, { - "key": "GetTranspose3x3", + "base": "GetTranspose3x3", "context": "Matrix3x4", "entry": { "name": "In", @@ -578,7 +578,7 @@ ] }, { - "key": "SetColumn", + "base": "SetColumn", "context": "Matrix3x4", "entry": { "name": "In", @@ -614,7 +614,7 @@ ] }, { - "key": "GetRow", + "base": "GetRow", "context": "Matrix3x4", "entry": { "name": "In", @@ -652,7 +652,7 @@ ] }, { - "key": "GetInverseFast", + "base": "GetInverseFast", "context": "Matrix3x4", "entry": { "name": "In", @@ -684,7 +684,7 @@ ] }, { - "key": "GetOrthogonalized", + "base": "GetOrthogonalized", "context": "Matrix3x4", "entry": { "name": "In", @@ -717,7 +717,7 @@ ] }, { - "key": "Multiply3x3", + "base": "Multiply3x3", "context": "Matrix3x4", "entry": { "name": "In", @@ -755,7 +755,7 @@ ] }, { - "key": "IsFinite", + "base": "IsFinite", "context": "Matrix3x4", "entry": { "name": "In", @@ -787,7 +787,7 @@ ] }, { - "key": "CreateFromQuaternion", + "base": "CreateFromQuaternion", "context": "Matrix3x4", "entry": { "name": "In", @@ -819,7 +819,7 @@ ] }, { - "key": "SetBasisAndTranslation", + "base": "SetBasisAndTranslation", "context": "Matrix3x4", "entry": { "name": "In", @@ -867,7 +867,7 @@ ] }, { - "key": "MultiplyVector4", + "base": "MultiplyVector4", "context": "Matrix3x4", "entry": { "name": "In", @@ -905,7 +905,7 @@ ] }, { - "key": "CreateScale", + "base": "CreateScale", "context": "Matrix3x4", "entry": { "name": "In", @@ -937,7 +937,7 @@ ] }, { - "key": "CreateDiagonal", + "base": "CreateDiagonal", "context": "Matrix3x4", "entry": { "name": "In", @@ -969,7 +969,7 @@ ] }, { - "key": "GetTranslation", + "base": "GetTranslation", "context": "Matrix3x4", "entry": { "name": "In", @@ -1001,7 +1001,7 @@ ] }, { - "key": "InvertFull", + "base": "InvertFull", "context": "Matrix3x4", "entry": { "name": "In", @@ -1025,7 +1025,7 @@ ] }, { - "key": "SetColumns", + "base": "SetColumns", "context": "Matrix3x4", "entry": { "name": "In", @@ -1073,7 +1073,7 @@ ] }, { - "key": "SetElement", + "base": "SetElement", "context": "Matrix3x4", "entry": { "name": "In", @@ -1115,7 +1115,7 @@ ] }, { - "key": "Equal", + "base": "Equal", "context": "Matrix3x4", "entry": { "name": "In", @@ -1153,7 +1153,7 @@ ] }, { - "key": "GetDeterminant3x3", + "base": "GetDeterminant3x3", "context": "Matrix3x4", "entry": { "name": "In", @@ -1185,7 +1185,7 @@ ] }, { - "key": "GetColumns", + "base": "GetColumns", "context": "Matrix3x4", "entry": { "name": "In", @@ -1233,7 +1233,7 @@ ] }, { - "key": "SetRows", + "base": "SetRows", "context": "Matrix3x4", "entry": { "name": "In", @@ -1275,7 +1275,7 @@ ] }, { - "key": "GetMultipliedByScale", + "base": "GetMultipliedByScale", "context": "Matrix3x4", "entry": { "name": "In", @@ -1313,7 +1313,7 @@ ] }, { - "key": "CreateRotationZ", + "base": "CreateRotationZ", "context": "Matrix3x4", "entry": { "name": "In", @@ -1345,7 +1345,7 @@ ] }, { - "key": "CreateFromQuaternionAndTranslation", + "base": "CreateFromQuaternionAndTranslation", "context": "Matrix3x4", "entry": { "name": "In", @@ -1383,7 +1383,7 @@ ] }, { - "key": "GetRowAsVector3", + "base": "GetRowAsVector3", "context": "Matrix3x4", "entry": { "name": "In", @@ -1421,7 +1421,7 @@ ] }, { - "key": "MultiplyMatrix3x4", + "base": "MultiplyMatrix3x4", "context": "Matrix3x4", "entry": { "name": "In", @@ -1459,7 +1459,7 @@ ] }, { - "key": "GetRows", + "base": "GetRows", "context": "Matrix3x4", "entry": { "name": "In", @@ -1501,7 +1501,7 @@ ] }, { - "key": "Clone", + "base": "Clone", "context": "Matrix3x4", "entry": { "name": "In", @@ -1533,7 +1533,7 @@ ] }, { - "key": "MultiplyVector3", + "base": "MultiplyVector3", "context": "Matrix3x4", "entry": { "name": "In", @@ -1571,7 +1571,7 @@ ] }, { - "key": "CreateIdentity", + "base": "CreateIdentity", "context": "Matrix3x4", "entry": { "name": "In", @@ -1595,7 +1595,7 @@ ] }, { - "key": "GetBasisAndTranslation", + "base": "GetBasisAndTranslation", "context": "Matrix3x4", "entry": { "name": "In", @@ -1643,7 +1643,7 @@ ] }, { - "key": "CreateFromValue", + "base": "CreateFromValue", "context": "Matrix3x4", "entry": { "name": "In", @@ -1675,7 +1675,7 @@ ] }, { - "key": "GetElement", + "base": "GetElement", "context": "Matrix3x4", "entry": { "name": "In", @@ -1719,7 +1719,7 @@ ] }, { - "key": "Transpose3x3", + "base": "Transpose3x3", "context": "Matrix3x4", "entry": { "name": "In", @@ -1743,7 +1743,7 @@ ] }, { - "key": "Transpose", + "base": "Transpose", "context": "Matrix3x4", "entry": { "name": "In", @@ -1767,7 +1767,7 @@ ] }, { - "key": "CreateRotationY", + "base": "CreateRotationY", "context": "Matrix3x4", "entry": { "name": "In", @@ -1799,7 +1799,7 @@ ] }, { - "key": "SetRow", + "base": "SetRow", "context": "Matrix3x4", "entry": { "name": "In", @@ -1835,7 +1835,7 @@ ] }, { - "key": "GetInverseFull", + "base": "GetInverseFull", "context": "Matrix3x4", "entry": { "name": "In", @@ -1867,7 +1867,7 @@ ] }, { - "key": "GetColumn", + "base": "GetColumn", "context": "Matrix3x4", "entry": { "name": "In", @@ -1905,7 +1905,7 @@ ] }, { - "key": "SetTranslation", + "base": "SetTranslation", "context": "Matrix3x4", "entry": { "name": "In", @@ -1935,7 +1935,7 @@ ] }, { - "key": "basisX", + "base": "basisX", "context": "Getter", "details": { "name": "Get Basis X" @@ -1958,7 +1958,7 @@ ] }, { - "key": "basisX", + "base": "basisX", "context": "Setter", "details": { "name": "Set Basis X" @@ -1979,7 +1979,7 @@ ] }, { - "key": "basisY", + "base": "basisY", "context": "Getter", "details": { "name": "Get Basis Y" @@ -2002,7 +2002,7 @@ ] }, { - "key": "basisY", + "base": "basisY", "context": "Setter", "details": { "name": "Set Basis Y" @@ -2023,7 +2023,7 @@ ] }, { - "key": "basisZ", + "base": "basisZ", "context": "Getter", "details": { "name": "Get Basis Z" @@ -2046,7 +2046,7 @@ ] }, { - "key": "basisZ", + "base": "basisZ", "context": "Setter", "details": { "name": "Set Basis Z" @@ -2067,7 +2067,7 @@ ] }, { - "key": "translation", + "base": "translation", "context": "Getter", "details": { "name": "Get Translation" @@ -2090,7 +2090,7 @@ ] }, { - "key": "translation", + "base": "translation", "context": "Setter", "details": { "name": "Set Translation" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MeshData.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MeshData.names index 9e6b60edbb..6e82906a0f 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MeshData.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MeshData.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "MeshData", + "base": "MeshData", "context": "BehaviorClass", "variant": "", "details": { @@ -9,7 +9,7 @@ }, "methods": [ { - "key": "GetVertexIndex", + "base": "GetVertexIndex", "context": "MeshData", "entry": { "name": "In", @@ -53,7 +53,7 @@ ] }, { - "key": "GetPosition", + "base": "GetPosition", "context": "MeshData", "entry": { "name": "In", @@ -91,7 +91,7 @@ ] }, { - "key": "GetFaceInfo", + "base": "GetFaceInfo", "context": "MeshData", "entry": { "name": "In", @@ -129,7 +129,7 @@ ] }, { - "key": "HasNormalData", + "base": "HasNormalData", "context": "MeshData", "entry": { "name": "In", @@ -161,7 +161,7 @@ ] }, { - "key": "GetNormal", + "base": "GetNormal", "context": "MeshData", "entry": { "name": "In", @@ -199,7 +199,7 @@ ] }, { - "key": "GetUsedPointIndexForControlPoint", + "base": "GetUsedPointIndexForControlPoint", "context": "MeshData", "entry": { "name": "In", @@ -237,7 +237,7 @@ ] }, { - "key": "GetVertexCount", + "base": "GetVertexCount", "context": "MeshData", "entry": { "name": "In", @@ -269,7 +269,7 @@ ] }, { - "key": "GetFaceCount", + "base": "GetFaceCount", "context": "MeshData", "entry": { "name": "In", @@ -301,7 +301,7 @@ ] }, { - "key": "GetUsedControlPointCount", + "base": "GetUsedControlPointCount", "context": "MeshData", "entry": { "name": "In", @@ -333,7 +333,7 @@ ] }, { - "key": "GetFaceMaterialId", + "base": "GetFaceMaterialId", "context": "MeshData", "entry": { "name": "In", @@ -371,7 +371,7 @@ ] }, { - "key": "GetControlPointIndex", + "base": "GetControlPointIndex", "context": "MeshData", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MeshVertexBitangentData.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MeshVertexBitangentData.names index e46faa5cfa..71a6080574 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MeshVertexBitangentData.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MeshVertexBitangentData.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "MeshVertexBitangentData", + "base": "MeshVertexBitangentData", "context": "BehaviorClass", "variant": "", "details": { @@ -9,7 +9,7 @@ }, "methods": [ { - "key": "GetCount", + "base": "GetCount", "context": "MeshVertexBitangentData", "entry": { "name": "In", @@ -41,7 +41,7 @@ ] }, { - "key": "GetBitangent", + "base": "GetBitangent", "context": "MeshVertexBitangentData", "entry": { "name": "In", @@ -79,7 +79,7 @@ ] }, { - "key": "GetBitangentSetIndex", + "base": "GetBitangentSetIndex", "context": "MeshVertexBitangentData", "entry": { "name": "In", @@ -111,7 +111,7 @@ ] }, { - "key": "GetGenerationMethod", + "base": "GetGenerationMethod", "context": "MeshVertexBitangentData", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MeshVertexColorData.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MeshVertexColorData.names index 961508f944..a0a7c099c8 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MeshVertexColorData.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MeshVertexColorData.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "MeshVertexColorData", + "base": "MeshVertexColorData", "context": "BehaviorClass", "variant": "", "details": { @@ -9,7 +9,7 @@ }, "methods": [ { - "key": "GetCustomName", + "base": "GetCustomName", "context": "MeshVertexColorData", "entry": { "name": "In", @@ -41,7 +41,7 @@ ] }, { - "key": "GetCount", + "base": "GetCount", "context": "MeshVertexColorData", "entry": { "name": "In", @@ -73,7 +73,7 @@ ] }, { - "key": "GetColor", + "base": "GetColor", "context": "MeshVertexColorData", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MeshVertexTangentData.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MeshVertexTangentData.names index 6866276dca..6e67408931 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MeshVertexTangentData.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MeshVertexTangentData.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "MeshVertexTangentData", + "base": "MeshVertexTangentData", "context": "BehaviorClass", "variant": "", "details": { @@ -9,7 +9,7 @@ }, "methods": [ { - "key": "GetCount", + "base": "GetCount", "context": "MeshVertexTangentData", "entry": { "name": "In", @@ -41,7 +41,7 @@ ] }, { - "key": "GetTangent", + "base": "GetTangent", "context": "MeshVertexTangentData", "entry": { "name": "In", @@ -79,7 +79,7 @@ ] }, { - "key": "GetTangentSetIndex", + "base": "GetTangentSetIndex", "context": "MeshVertexTangentData", "entry": { "name": "In", @@ -111,7 +111,7 @@ ] }, { - "key": "GetGenerationMethod", + "base": "GetGenerationMethod", "context": "MeshVertexTangentData", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MeshVertexUVData.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MeshVertexUVData.names index 474a4b91b3..78372ea7ae 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MeshVertexUVData.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MeshVertexUVData.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "MeshVertexUVData", + "base": "MeshVertexUVData", "context": "BehaviorClass", "variant": "", "details": { @@ -9,7 +9,7 @@ }, "methods": [ { - "key": "GetCustomName", + "base": "GetCustomName", "context": "MeshVertexUVData", "entry": { "name": "In", @@ -41,7 +41,7 @@ ] }, { - "key": "GetCount", + "base": "GetCount", "context": "MeshVertexUVData", "entry": { "name": "In", @@ -73,7 +73,7 @@ ] }, { - "key": "GetUV", + "base": "GetUV", "context": "MeshVertexUVData", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MixedGradientComponent.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MixedGradientComponent.names index f0aa39575a..d25ce96a86 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MixedGradientComponent.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MixedGradientComponent.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "MixedGradientComponent", + "base": "MixedGradientComponent", "context": "BehaviorClass", "variant": "", "details": { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MixedGradientConfig.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MixedGradientConfig.names index c603845990..a9d42f497a 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MixedGradientConfig.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MixedGradientConfig.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "MixedGradientConfig", + "base": "MixedGradientConfig", "context": "BehaviorClass", "variant": "", "details": { @@ -9,7 +9,7 @@ }, "methods": [ { - "key": "GetNumLayers", + "base": "GetNumLayers", "context": "MixedGradientConfig", "entry": { "name": "In", @@ -41,7 +41,7 @@ ] }, { - "key": "AddLayer", + "base": "AddLayer", "context": "MixedGradientConfig", "entry": { "name": "In", @@ -65,7 +65,7 @@ ] }, { - "key": "RemoveLayer", + "base": "RemoveLayer", "context": "MixedGradientConfig", "entry": { "name": "In", @@ -95,7 +95,7 @@ ] }, { - "key": "GetLayer", + "base": "GetLayer", "context": "MixedGradientConfig", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MixedGradientLayer.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MixedGradientLayer.names index b8588fa56c..e192fe2c63 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MixedGradientLayer.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MixedGradientLayer.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "MixedGradientLayer", + "base": "MixedGradientLayer", "context": "BehaviorClass", "variant": "", "details": { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ModelPreset.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ModelPreset.names index ca6c97b051..c69a75db5e 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ModelPreset.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ModelPreset.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "ModelPreset", + "base": "ModelPreset", "context": "BehaviorClass", "variant": "", "details": { @@ -9,7 +9,7 @@ }, "methods": [ { - "key": "GetdisplayName", + "base": "GetdisplayName", "details": { "name": "Get Display Name" }, @@ -31,7 +31,7 @@ ] }, { - "key": "SetdisplayName", + "base": "SetdisplayName", "details": { "name": "Set Display Name" }, @@ -51,7 +51,7 @@ ] }, { - "key": "GetmodelAsset", + "base": "GetmodelAsset", "details": { "name": "Get Model Asset" }, @@ -73,7 +73,7 @@ ] }, { - "key": "SetmodelAsset", + "base": "SetmodelAsset", "details": { "name": "Set Model Asset" }, @@ -93,7 +93,7 @@ ] }, { - "key": "GetpreviewImageAsset", + "base": "GetpreviewImageAsset", "details": { "name": "Get Preview Image Asset" }, @@ -115,7 +115,7 @@ ] }, { - "key": "SetpreviewImageAsset", + "base": "SetpreviewImageAsset", "details": { "name": "Set Preview Image Asset" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MotionEvent.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MotionEvent.names index b75bf1286a..320f4e128f 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MotionEvent.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MotionEvent.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "MotionEvent", + "base": "MotionEvent", "context": "BehaviorClass", "variant": "", "details": { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MultiplayerSystemComponent.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MultiplayerSystemComponent.names index cfa35a377f..d7ed32a229 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MultiplayerSystemComponent.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MultiplayerSystemComponent.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "MultiplayerSystemComponent", + "base": "MultiplayerSystemComponent", "context": "BehaviorClass", "variant": "", "details": { @@ -9,7 +9,7 @@ }, "methods": [ { - "key": "GetOnClientDisconnectedEvent", + "base": "GetOnClientDisconnectedEvent", "context": "MultiplayerSystemComponent", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/Name.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/Name.names index 1104d336a2..746c94bf6a 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/Name.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/Name.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "Name", + "base": "Name", "context": "BehaviorClass", "variant": "", "details": { @@ -9,7 +9,7 @@ }, "methods": [ { - "key": "ToString", + "base": "ToString", "context": "Name", "entry": { "name": "In", @@ -41,7 +41,7 @@ ] }, { - "key": "Set", + "base": "Set", "context": "Name", "entry": { "name": "In", @@ -71,7 +71,7 @@ ] }, { - "key": "IsEmpty", + "base": "IsEmpty", "context": "Name", "entry": { "name": "In", @@ -103,7 +103,7 @@ ] }, { - "key": "Equal", + "base": "Equal", "context": "Name", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/NetBindComponent.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/NetBindComponent.names index 5fe51e3a68..0a5f5f8de8 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/NetBindComponent.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/NetBindComponent.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "NetBindComponent", + "base": "NetBindComponent", "context": "BehaviorClass", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "IsNetEntityRoleAuthority", + "base": "IsNetEntityRoleAuthority", "context": "NetBindComponent", "entry": { "name": "In", @@ -43,7 +43,7 @@ ] }, { - "key": "IsNetEntityRoleAutonomous", + "base": "IsNetEntityRoleAutonomous", "context": "NetBindComponent", "entry": { "name": "In", @@ -76,7 +76,7 @@ ] }, { - "key": "IsNetEntityRoleClient", + "base": "IsNetEntityRoleClient", "context": "NetBindComponent", "entry": { "name": "In", @@ -109,7 +109,7 @@ ] }, { - "key": "IsNetEntityRoleServer", + "base": "IsNetEntityRoleServer", "context": "NetBindComponent", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/NetworkTestPlayerComponentNetworkInput.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/NetworkTestPlayerComponentNetworkInput.names index 0a6c5db61f..011315360d 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/NetworkTestPlayerComponentNetworkInput.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/NetworkTestPlayerComponentNetworkInput.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "NetworkTestPlayerComponentNetworkInput", + "base": "NetworkTestPlayerComponentNetworkInput", "context": "BehaviorClass", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "CreateFromValues", + "base": "CreateFromValues", "context": "NetworkTestPlayerComponentNetworkInput", "entry": { "name": "In", @@ -47,7 +47,7 @@ ] }, { - "key": "FwdBack", + "base": "FwdBack", "details": { "name": "Get Forward Back" }, @@ -69,7 +69,7 @@ ] }, { - "key": "FwdBack", + "base": "FwdBack", "details": { "name": "Set Forward Back" }, @@ -89,7 +89,7 @@ ] }, { - "key": "LeftRight", + "base": "LeftRight", "details": { "name": "Get Left Right" }, @@ -111,7 +111,7 @@ ] }, { - "key": "LeftRight", + "base": "LeftRight", "details": { "name": "Set Left Right" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/NodeIndex.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/NodeIndex.names index 2cfbfb6ff8..12170c59ab 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/NodeIndex.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/NodeIndex.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "NodeIndex", + "base": "NodeIndex", "context": "BehaviorClass", "variant": "", "details": { @@ -9,7 +9,7 @@ }, "methods": [ { - "key": "Equal", + "base": "Equal", "context": "NodeIndex", "entry": { "name": "In", @@ -47,7 +47,7 @@ ] }, { - "key": "ToString", + "base": "ToString", "context": "NodeIndex", "entry": { "name": "In", @@ -79,7 +79,7 @@ ] }, { - "key": "IsValid", + "base": "IsValid", "context": "NodeIndex", "entry": { "name": "In", @@ -111,7 +111,7 @@ ] }, { - "key": "Distance", + "base": "Distance", "context": "NodeIndex", "entry": { "name": "In", @@ -149,7 +149,7 @@ ] }, { - "key": "AsNumber", + "base": "AsNumber", "context": "NodeIndex", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/OutputDeviceTransformType.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/OutputDeviceTransformType.names index eefbac6a0b..7ceb39b27b 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/OutputDeviceTransformType.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/OutputDeviceTransformType.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "OutputDeviceTransformType", + "base": "OutputDeviceTransformType", "context": "BehaviorClass", "variant": "", "details": { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/PerlinGradientComponent.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/PerlinGradientComponent.names index 6acda4e4e1..1f84509238 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/PerlinGradientComponent.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/PerlinGradientComponent.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "PerlinGradientComponent", + "base": "PerlinGradientComponent", "context": "BehaviorClass", "variant": "", "details": { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/PerlinGradientConfig.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/PerlinGradientConfig.names index 3f36153bb8..970558cfd9 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/PerlinGradientConfig.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/PerlinGradientConfig.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "PerlinGradientConfig", + "base": "PerlinGradientConfig", "context": "BehaviorClass", "variant": "", "details": { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/PhysicsScene.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/PhysicsScene.names index 3c1ef2eaaa..07faa4053b 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/PhysicsScene.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/PhysicsScene.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "PhysicsScene", + "base": "PhysicsScene", "context": "BehaviorClass", "variant": "", "details": { @@ -9,7 +9,7 @@ }, "methods": [ { - "key": "GetOnGravityChangeEvent", + "base": "GetOnGravityChangeEvent", "context": "PhysicsScene", "entry": { "name": "In", @@ -40,7 +40,7 @@ ] }, { - "key": "QueryScene", + "base": "QueryScene", "context": "PhysicsScene", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/PhysicsSystemInterface.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/PhysicsSystemInterface.names index feaa908787..d1eb03798d 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/PhysicsSystemInterface.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/PhysicsSystemInterface.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "PhysicsSystemInterface", + "base": "PhysicsSystemInterface", "context": "BehaviorClass", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetOnPresimulateEvent", + "base": "GetOnPresimulateEvent", "context": "PhysicsSystemInterface", "entry": { "name": "In", @@ -33,7 +33,7 @@ ] }, { - "key": "GetOnPostsimulateEvent", + "base": "GetOnPostsimulateEvent", "context": "PhysicsSystemInterface", "entry": { "name": "In", @@ -56,7 +56,7 @@ ] }, { - "key": "GetSceneHandle", + "base": "GetSceneHandle", "context": "PhysicsSystemInterface", "entry": { "name": "In", @@ -93,7 +93,7 @@ ] }, { - "key": "GetScene", + "base": "GetScene", "context": "PhysicsSystemInterface", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/Platform.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/Platform.names index cc41ff44a3..c07b27df44 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/Platform.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/Platform.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "Platform", + "base": "Platform", "context": "BehaviorClass", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetName", + "base": "GetName", "context": "Platform", "entry": { "name": "In", @@ -41,7 +41,7 @@ ] }, { - "key": "GetMac", + "base": "GetMac", "details": { "name": "Get Mac" }, @@ -55,7 +55,7 @@ ] }, { - "key": "GetLinux", + "base": "GetLinux", "details": { "name": "Get Linux" }, @@ -69,7 +69,7 @@ ] }, { - "key": "GetiOS", + "base": "GetiOS", "details": { "name": "Get iOS" }, @@ -83,7 +83,7 @@ ] }, { - "key": "GetWindows64", + "base": "GetWindows64", "details": { "name": "Get Windows64" }, @@ -97,7 +97,7 @@ ] }, { - "key": "GetAndroid64", + "base": "GetAndroid64", "details": { "name": "Get Android64" }, @@ -111,7 +111,7 @@ ] }, { - "key": "GetCurrent", + "base": "GetCurrent", "details": { "name": "Get Current" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/PolygonPrism.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/PolygonPrism.names index 193f0e94c9..3b2cc44451 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/PolygonPrism.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/PolygonPrism.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "PolygonPrism", + "base": "PolygonPrism", "context": "BehaviorClass", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "height", + "base": "height", "details": { "name": "Get Height" }, @@ -33,7 +33,7 @@ ] }, { - "key": "vertexContainer", + "base": "vertexContainer", "details": { "name": "Get Vertex Container" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/PositionSplineQueryResult.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/PositionSplineQueryResult.names index 6a778c30a2..478a499b8e 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/PositionSplineQueryResult.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/PositionSplineQueryResult.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "PositionSplineQueryResult", + "base": "PositionSplineQueryResult", "context": "BehaviorClass", "variant": "", "details": { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/PosterizeGradientComponent.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/PosterizeGradientComponent.names index 5768ce41f2..6c2372d99c 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/PosterizeGradientComponent.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/PosterizeGradientComponent.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "PosterizeGradientComponent", + "base": "PosterizeGradientComponent", "context": "BehaviorClass", "variant": "", "details": { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/PosterizeGradientConfig.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/PosterizeGradientConfig.names index bea4631714..03b82c4262 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/PosterizeGradientConfig.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/PosterizeGradientConfig.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "PosterizeGradientConfig", + "base": "PosterizeGradientConfig", "context": "BehaviorClass", "variant": "", "details": { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/PropertyTreeEditor.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/PropertyTreeEditor.names index a4da66e5fd..8224b2617c 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/PropertyTreeEditor.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/PropertyTreeEditor.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "PropertyTreeEditor", + "base": "PropertyTreeEditor", "context": "BehaviorClass", "variant": "", "details": { @@ -9,7 +9,7 @@ }, "methods": [ { - "key": "ResetContainer", + "base": "ResetContainer", "context": "PropertyTreeEditor", "entry": { "name": "In", @@ -47,7 +47,7 @@ ] }, { - "key": "CompareProperty", + "base": "CompareProperty", "context": "PropertyTreeEditor", "entry": { "name": "In", @@ -91,7 +91,7 @@ ] }, { - "key": "IsContainer", + "base": "IsContainer", "context": "PropertyTreeEditor", "entry": { "name": "In", @@ -129,7 +129,7 @@ ] }, { - "key": "GetContainerCount", + "base": "GetContainerCount", "context": "PropertyTreeEditor", "entry": { "name": "In", @@ -167,7 +167,7 @@ ] }, { - "key": "SetProperty", + "base": "SetProperty", "context": "PropertyTreeEditor", "entry": { "name": "In", @@ -211,7 +211,7 @@ ] }, { - "key": "AppendContainerItem", + "base": "AppendContainerItem", "context": "PropertyTreeEditor", "entry": { "name": "In", @@ -255,7 +255,7 @@ ] }, { - "key": "GetProperty", + "base": "GetProperty", "context": "PropertyTreeEditor", "entry": { "name": "In", @@ -293,7 +293,7 @@ ] }, { - "key": "AddContainerItem", + "base": "AddContainerItem", "context": "PropertyTreeEditor", "entry": { "name": "In", @@ -343,7 +343,7 @@ ] }, { - "key": "RemoveContainerItem", + "base": "RemoveContainerItem", "context": "PropertyTreeEditor", "entry": { "name": "In", @@ -387,7 +387,7 @@ ] }, { - "key": "BuildPathsListWithTypes", + "base": "BuildPathsListWithTypes", "context": "PropertyTreeEditor", "entry": { "name": "In", @@ -419,7 +419,7 @@ ] }, { - "key": "HasAttribute", + "base": "HasAttribute", "context": "PropertyTreeEditor", "entry": { "name": "In", @@ -463,7 +463,7 @@ ] }, { - "key": "BuildPathsList", + "base": "BuildPathsList", "context": "PropertyTreeEditor", "entry": { "name": "In", @@ -495,7 +495,7 @@ ] }, { - "key": "SetVisibleEnforcement", + "base": "SetVisibleEnforcement", "context": "PropertyTreeEditor", "entry": { "name": "In", @@ -525,7 +525,7 @@ ] }, { - "key": "UpdateContainerItem", + "base": "UpdateContainerItem", "context": "PropertyTreeEditor", "entry": { "name": "In", @@ -575,7 +575,7 @@ ] }, { - "key": "GetContainerItem", + "base": "GetContainerItem", "context": "PropertyTreeEditor", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/PythonBehaviorInfo.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/PythonBehaviorInfo.names index 44d606200e..cbc3f91d4d 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/PythonBehaviorInfo.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/PythonBehaviorInfo.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "PythonBehaviorInfo", + "base": "PythonBehaviorInfo", "context": "BehaviorClass", "variant": "", "details": { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/RandomGradientComponent.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/RandomGradientComponent.names index 39484e12ca..528f0f6ba1 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/RandomGradientComponent.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/RandomGradientComponent.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "RandomGradientComponent", + "base": "RandomGradientComponent", "context": "BehaviorClass", "variant": "", "details": { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/RandomGradientConfig.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/RandomGradientConfig.names index 437018b5ee..16cde16465 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/RandomGradientConfig.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/RandomGradientConfig.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "RandomGradientConfig", + "base": "RandomGradientConfig", "context": "BehaviorClass", "variant": "", "details": { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/RandomTimedSpawnerComponent.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/RandomTimedSpawnerComponent.names index 580b4b9b73..7be82eb510 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/RandomTimedSpawnerComponent.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/RandomTimedSpawnerComponent.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "RandomTimedSpawnerComponent", + "base": "RandomTimedSpawnerComponent", "context": "BehaviorClass", "variant": "", "details": { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/RaySplineQueryResult.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/RaySplineQueryResult.names index d8bae42895..0c143f7bca 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/RaySplineQueryResult.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/RaySplineQueryResult.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "RaySplineQueryResult", + "base": "RaySplineQueryResult", "context": "BehaviorClass", "variant": "", "details": { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ReferenceGradientComponent.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ReferenceGradientComponent.names index f8e307243e..f55bd9b2fc 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ReferenceGradientComponent.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ReferenceGradientComponent.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "ReferenceGradientComponent", + "base": "ReferenceGradientComponent", "context": "BehaviorClass", "variant": "", "details": { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ReferenceGradientConfig.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ReferenceGradientConfig.names index f54a665d2d..75c14d2132 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ReferenceGradientConfig.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ReferenceGradientConfig.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "ReferenceGradientConfig", + "base": "ReferenceGradientConfig", "context": "BehaviorClass", "variant": "", "details": { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ReferenceShapeConfig.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ReferenceShapeConfig.names index ba88940ef2..c312519f02 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ReferenceShapeConfig.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ReferenceShapeConfig.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "ReferenceShapeConfig", + "base": "ReferenceShapeConfig", "context": "BehaviorClass", "variant": "", "details": { @@ -9,7 +9,7 @@ }, "methods": [ { - "key": "shapeEntityId", + "base": "shapeEntityId", "details": { "name": "ReferenceShapeConfig::shapeEntityId::Getter" }, @@ -32,7 +32,7 @@ ] }, { - "key": "shapeEntityId", + "base": "shapeEntityId", "details": { "name": "ReferenceShapeConfig::shapeEntityId::Setter" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/RuntimeData.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/RuntimeData.names index d0b45d418a..9736c7e787 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/RuntimeData.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/RuntimeData.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "RuntimeData", + "base": "RuntimeData", "context": "BehaviorClass", "variant": "", "details": { @@ -9,7 +9,7 @@ }, "methods": [ { - "key": "GetRequiredAssets", + "base": "GetRequiredAssets", "context": "RuntimeData", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/Scene.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/Scene.names index 38c123e0cf..febcc224f1 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/Scene.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/Scene.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "Scene", + "base": "Scene", "context": "BehaviorClass", "variant": "", "details": { @@ -9,7 +9,7 @@ }, "methods": [ { - "key": "GetOriginalSceneOrientation", + "base": "GetOriginalSceneOrientation", "context": "Scene", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SceneGraphName.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SceneGraphName.names index 114882360c..5c7fb58120 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SceneGraphName.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SceneGraphName.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "SceneGraphName", + "base": "SceneGraphName", "context": "BehaviorClass", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetPath", + "base": "GetPath", "context": "SceneGraphName", "entry": { "name": "In", @@ -41,7 +41,7 @@ ] }, { - "key": "GetName", + "base": "GetName", "context": "SceneGraphName", "entry": { "name": "In", @@ -72,7 +72,7 @@ ] }, { - "key": "ToString", + "base": "ToString", "context": "SceneGraphName", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SceneManifest.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SceneManifest.names index ede7f6ea12..bc018a3011 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SceneManifest.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SceneManifest.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "SceneManifest", + "base": "SceneManifest", "context": "BehaviorClass", "variant": "", "details": { @@ -9,7 +9,7 @@ }, "methods": [ { - "key": "ImportFromJson", + "base": "ImportFromJson", "context": "SceneManifest", "entry": { "name": "In", @@ -47,7 +47,7 @@ ] }, { - "key": "ExportToJson", + "base": "ExportToJson", "context": "SceneManifest", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SceneQueries.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SceneQueries.names index 731a41bac1..1aa7a6642c 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SceneQueries.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SceneQueries.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "SceneQueries", + "base": "SceneQueries", "context": "BehaviorClass", "variant": "", "details": { @@ -9,7 +9,7 @@ }, "methods": [ { - "key": "CreateRayCastRequest", + "base": "CreateRayCastRequest", "context": "SceneQueries", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ScriptTimePoint.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ScriptTimePoint.names index b43f891c4c..c80e6d466b 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ScriptTimePoint.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ScriptTimePoint.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "ScriptTimePoint", + "base": "ScriptTimePoint", "context": "BehaviorClass", "variant": "", "details": { @@ -9,7 +9,7 @@ }, "methods": [ { - "key": "ToString", + "base": "ToString", "context": "ScriptTimePoint", "entry": { "name": "In", @@ -40,7 +40,7 @@ ] }, { - "key": "GetSeconds", + "base": "GetSeconds", "context": "ScriptTimePoint", "entry": { "name": "In", @@ -71,7 +71,7 @@ ] }, { - "key": "GetMilliseconds", + "base": "GetMilliseconds", "context": "ScriptTimePoint", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SearchFilter.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SearchFilter.names index 851aef1fda..693e465864 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SearchFilter.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SearchFilter.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "SearchFilter", + "base": "SearchFilter", "context": "BehaviorClass", "variant": "", "details": { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SequenceComponent.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SequenceComponent.names index 59c9be78f7..c330e85e85 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SequenceComponent.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SequenceComponent.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "SequenceComponent", + "base": "SequenceComponent", "context": "BehaviorClass", "variant": "", "details": { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SettingsRegistryInterface.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SettingsRegistryInterface.names index 8500946948..660fb5206f 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SettingsRegistryInterface.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SettingsRegistryInterface.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "SettingsRegistryInterface", + "base": "SettingsRegistryInterface", "context": "BehaviorClass", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetFloat", + "base": "GetFloat", "context": "SettingsRegistryInterface", "entry": { "name": "In", @@ -47,7 +47,7 @@ ] }, { - "key": "SetFloat", + "base": "SetFloat", "context": "SettingsRegistryInterface", "entry": { "name": "In", @@ -90,7 +90,7 @@ ] }, { - "key": "RemoveKey", + "base": "RemoveKey", "context": "SettingsRegistryInterface", "entry": { "name": "In", @@ -127,7 +127,7 @@ ] }, { - "key": "SetInt", + "base": "SetInt", "context": "SettingsRegistryInterface", "entry": { "name": "In", @@ -170,7 +170,7 @@ ] }, { - "key": "SetUInt", + "base": "SetUInt", "context": "SettingsRegistryInterface", "entry": { "name": "In", @@ -213,7 +213,7 @@ ] }, { - "key": "GetBool", + "base": "GetBool", "context": "SettingsRegistryInterface", "entry": { "name": "In", @@ -250,7 +250,7 @@ ] }, { - "key": "GetInt", + "base": "GetInt", "context": "SettingsRegistryInterface", "entry": { "name": "In", @@ -287,7 +287,7 @@ ] }, { - "key": "GetUInt", + "base": "GetUInt", "context": "SettingsRegistryInterface", "entry": { "name": "In", @@ -324,7 +324,7 @@ ] }, { - "key": "GetNotifyEvent", + "base": "GetNotifyEvent", "context": "SettingsRegistryInterface", "entry": { "name": "In", @@ -355,7 +355,7 @@ ] }, { - "key": "MergeSettings", + "base": "MergeSettings", "context": "SettingsRegistryInterface", "entry": { "name": "In", @@ -399,7 +399,7 @@ ] }, { - "key": "MergeSettingsFile", + "base": "MergeSettingsFile", "context": "SettingsRegistryInterface", "entry": { "name": "In", @@ -449,7 +449,7 @@ ] }, { - "key": "GetString", + "base": "GetString", "context": "SettingsRegistryInterface", "entry": { "name": "In", @@ -486,7 +486,7 @@ ] }, { - "key": "IsValid", + "base": "IsValid", "context": "SettingsRegistryInterface", "entry": { "name": "In", @@ -517,7 +517,7 @@ ] }, { - "key": "MergeSettingsFolder", + "base": "MergeSettingsFolder", "context": "SettingsRegistryInterface", "entry": { "name": "In", @@ -566,7 +566,7 @@ ] }, { - "key": "SetBool", + "base": "SetBool", "context": "SettingsRegistryInterface", "entry": { "name": "In", @@ -609,7 +609,7 @@ ] }, { - "key": "SetString", + "base": "SetString", "context": "SettingsRegistryInterface", "entry": { "name": "In", @@ -652,7 +652,7 @@ ] }, { - "key": "DumpSettings", + "base": "DumpSettings", "context": "SettingsRegistryInterface", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ShaderCollectionItem.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ShaderCollectionItem.names index 94fe0bb982..0e081769b4 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ShaderCollectionItem.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ShaderCollectionItem.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "ShaderCollectionItem", + "base": "ShaderCollectionItem", "context": "BehaviorClass", "variant": "", "details": { @@ -9,7 +9,7 @@ }, "methods": [ { - "key": "GetShaderAsset", + "base": "GetShaderAsset", "context": "ShaderCollectionItem", "entry": { "name": "In", @@ -41,7 +41,7 @@ ] }, { - "key": "GetShaderAssetId", + "base": "GetShaderAssetId", "context": "ShaderCollectionItem", "entry": { "name": "In", @@ -73,7 +73,7 @@ ] }, { - "key": "GetShaderVariantId", + "base": "GetShaderVariantId", "context": "ShaderCollectionItem", "entry": { "name": "In", @@ -105,7 +105,7 @@ ] }, { - "key": "GetShaderOptionGroup", + "base": "GetShaderOptionGroup", "context": "ShaderCollectionItem", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ShaderOptionGroup.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ShaderOptionGroup.names index 59c02d8c6d..24c1085b7d 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ShaderOptionGroup.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ShaderOptionGroup.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "ShaderOptionGroup", + "base": "ShaderOptionGroup", "context": "BehaviorClass", "variant": "", "details": { @@ -9,7 +9,7 @@ }, "methods": [ { - "key": "GetValueByOptionName", + "base": "GetValueByOptionName", "context": "ShaderOptionGroup", "entry": { "name": "In", @@ -47,7 +47,7 @@ ] }, { - "key": "GetShaderOptionDescriptors", + "base": "GetShaderOptionDescriptors", "context": "ShaderOptionGroup", "entry": { "name": "In", @@ -79,7 +79,7 @@ ] }, { - "key": "GetShaderVariantId", + "base": "GetShaderVariantId", "context": "ShaderOptionGroup", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ShaderSemantic.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ShaderSemantic.names index f6f6d153c4..372a9a7e79 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ShaderSemantic.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ShaderSemantic.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "ShaderSemantic", + "base": "ShaderSemantic", "context": "BehaviorClass", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "ToString", + "base": "ToString", "context": "ShaderSemantic", "entry": { "name": "In", @@ -33,7 +33,7 @@ ] }, { - "key": "Getname", + "base": "Getname", "details": { "name": "Getname" }, @@ -55,7 +55,7 @@ ] }, { - "key": "Setname", + "base": "Setname", "details": { "name": "Setname" }, @@ -75,7 +75,7 @@ ] }, { - "key": "Getindex", + "base": "Getindex", "details": { "name": "Getindex" }, @@ -97,7 +97,7 @@ ] }, { - "key": "Setindex", + "base": "Setindex", "details": { "name": "Setindex" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ShaderVariantId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ShaderVariantId.names index c6aa37ec83..b56def1788 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ShaderVariantId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ShaderVariantId.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "ShaderVariantId", + "base": "ShaderVariantId", "context": "BehaviorClass", "variant": "", "details": { @@ -9,7 +9,7 @@ }, "methods": [ { - "key": "Equal", + "base": "Equal", "context": "ShaderVariantId", "entry": { "name": "In", @@ -47,7 +47,7 @@ ] }, { - "key": "IsEmpty", + "base": "IsEmpty", "context": "ShaderVariantId", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ShaderVariantInfo.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ShaderVariantInfo.names index 215b56ccee..3f503edf3c 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ShaderVariantInfo.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ShaderVariantInfo.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "ShaderVariantInfo", + "base": "ShaderVariantInfo", "context": "BehaviorClass", "variant": "", "details": { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ShaderVariantListSourceData.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ShaderVariantListSourceData.names index d8ff471af0..42dc75b474 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ShaderVariantListSourceData.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ShaderVariantListSourceData.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "ShaderVariantListSourceData", + "base": "ShaderVariantListSourceData", "context": "BehaviorClass", "variant": "", "details": { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ShapeAreaFalloffGradientComponent.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ShapeAreaFalloffGradientComponent.names index 1935304451..728a4412b5 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ShapeAreaFalloffGradientComponent.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ShapeAreaFalloffGradientComponent.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "ShapeAreaFalloffGradientComponent", + "base": "ShapeAreaFalloffGradientComponent", "context": "BehaviorClass", "variant": "", "details": { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ShapeAreaFalloffGradientConfig.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ShapeAreaFalloffGradientConfig.names index 03da764cf9..32fd92f533 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ShapeAreaFalloffGradientConfig.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ShapeAreaFalloffGradientConfig.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "ShapeAreaFalloffGradientConfig", + "base": "ShapeAreaFalloffGradientConfig", "context": "BehaviorClass", "variant": "", "details": { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SimpleAssetReferenceBase.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SimpleAssetReferenceBase.names index 67c99ad82e..083e61fc8a 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SimpleAssetReferenceBase.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SimpleAssetReferenceBase.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "SimpleAssetReferenceBase", + "base": "SimpleAssetReferenceBase", "context": "BehaviorClass", "variant": "", "details": { @@ -9,7 +9,7 @@ }, "methods": [ { - "key": "SetAssetPath", + "base": "SetAssetPath", "context": "SimpleAssetReferenceBase", "entry": { "name": "In", @@ -39,7 +39,7 @@ ] }, { - "key": "assetPath", + "base": "assetPath", "details": { "name": "Get Asset Path" }, @@ -62,7 +62,7 @@ ] }, { - "key": "assetType", + "base": "assetType", "details": { "name": "Get Asset Type" }, @@ -85,7 +85,7 @@ ] }, { - "key": "fileFilter", + "base": "fileFilter", "details": { "name": "Get File Filter" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SimpleMotionComponent.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SimpleMotionComponent.names index 9867741842..cac9c16821 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SimpleMotionComponent.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SimpleMotionComponent.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "SimpleMotionComponent", + "base": "SimpleMotionComponent", "context": "BehaviorClass", "variant": "", "details": { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SimulatedBody.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SimulatedBody.names index ec697bbb71..05f66ca154 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SimulatedBody.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SimulatedBody.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "SimulatedBody", + "base": "SimulatedBody", "context": "BehaviorClass", "variant": "", "details": { @@ -9,7 +9,7 @@ }, "methods": [ { - "key": "GetOnCollisionEndEvent", + "base": "GetOnCollisionEndEvent", "context": "SimulatedBody", "entry": { "name": "In", @@ -41,7 +41,7 @@ ] }, { - "key": "GetOnCollisionPersistEvent", + "base": "GetOnCollisionPersistEvent", "context": "SimulatedBody", "entry": { "name": "In", @@ -73,7 +73,7 @@ ] }, { - "key": "GetOnTriggerEnterEvent", + "base": "GetOnTriggerEnterEvent", "context": "SimulatedBody", "entry": { "name": "In", @@ -105,7 +105,7 @@ ] }, { - "key": "GetOnCollisionBeginEvent", + "base": "GetOnCollisionBeginEvent", "context": "SimulatedBody", "entry": { "name": "In", @@ -137,7 +137,7 @@ ] }, { - "key": "GetOnTriggerExitEvent", + "base": "GetOnTriggerExitEvent", "context": "SimulatedBody", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SliceInstanceAddress.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SliceInstanceAddress.names index 003b833a1d..3aa69fd61a 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SliceInstanceAddress.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SliceInstanceAddress.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "SliceInstanceAddress", + "base": "SliceInstanceAddress", "context": "BehaviorClass", "variant": "", "details": { @@ -9,7 +9,7 @@ }, "methods": [ { - "key": "IsValid", + "base": "IsValid", "context": "SliceInstanceAddress", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SliceInstantiationTicket.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SliceInstantiationTicket.names index ba49c58119..325c544763 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SliceInstantiationTicket.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SliceInstantiationTicket.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "SliceInstantiationTicket", + "base": "SliceInstantiationTicket", "context": "BehaviorClass", "variant": "", "details": { @@ -9,7 +9,7 @@ }, "methods": [ { - "key": "Equal", + "base": "Equal", "context": "SliceInstantiationTicket", "entry": { "name": "In", @@ -46,7 +46,7 @@ ] }, { - "key": "ToString", + "base": "ToString", "context": "SliceInstantiationTicket", "entry": { "name": "In", @@ -77,7 +77,7 @@ ] }, { - "key": "IsValid", + "base": "IsValid", "context": "SliceInstantiationTicket", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SmoothStep.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SmoothStep.names index 2fff9e6f59..a95cd5d878 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SmoothStep.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SmoothStep.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "SmoothStep", + "base": "SmoothStep", "context": "BehaviorClass", "variant": "", "details": { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SmoothStepGradientComponent.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SmoothStepGradientComponent.names index 42374f5c08..63bbb21361 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SmoothStepGradientComponent.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SmoothStepGradientComponent.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "SmoothStepGradientComponent", + "base": "SmoothStepGradientComponent", "context": "BehaviorClass", "variant": "", "details": { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SmoothStepGradientConfig.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SmoothStepGradientConfig.names index d9d27df79b..29331f4a45 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SmoothStepGradientConfig.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SmoothStepGradientConfig.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "SmoothStepGradientConfig", + "base": "SmoothStepGradientConfig", "context": "BehaviorClass", "variant": "", "details": { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SpawnerConfig.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SpawnerConfig.names index f78e690f18..fafcb74e0b 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SpawnerConfig.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SpawnerConfig.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "SpawnerConfig", + "base": "SpawnerConfig", "context": "BehaviorClass", "variant": "", "details": { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/Specializations.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/Specializations.names index a9f36b42d3..6e7070b006 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/Specializations.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/Specializations.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "Specializations", + "base": "Specializations", "context": "BehaviorClass", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetPriority", + "base": "GetPriority", "context": "Specializations", "entry": { "name": "In", @@ -48,7 +48,7 @@ ] }, { - "key": "GetCount", + "base": "GetCount", "context": "Specializations", "entry": { "name": "In", @@ -79,7 +79,7 @@ ] }, { - "key": "Contains", + "base": "Contains", "context": "Specializations", "entry": { "name": "In", @@ -116,7 +116,7 @@ ] }, { - "key": "Append", + "base": "Append", "context": "Specializations", "entry": { "name": "In", @@ -153,7 +153,7 @@ ] }, { - "key": "GetSpecialization", + "base": "GetSpecialization", "context": "Specializations", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SphereShapeConfig.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SphereShapeConfig.names index be4d2dbdb2..889b0dbe55 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SphereShapeConfig.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SphereShapeConfig.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "SphereShapeConfig", + "base": "SphereShapeConfig", "context": "BehaviorClass", "variant": "", "details": { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/String.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/String.names index 3bee4fbec1..b8d70936e4 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/String.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/String.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "String", + "base": "String", "context": "BehaviorClass", "variant": "", "details": { @@ -9,7 +9,7 @@ }, "methods": [ { - "key": "ReplaceString", + "base": "ReplaceString", "context": "String", "entry": { "name": "In", @@ -59,7 +59,7 @@ ] }, { - "key": "Join", + "base": "Join", "context": "String", "entry": { "name": "In", @@ -97,7 +97,7 @@ ] }, { - "key": "StartsWith", + "base": "StartsWith", "context": "String", "entry": { "name": "In", @@ -141,7 +141,7 @@ ] }, { - "key": "ContainsString", + "base": "ContainsString", "context": "String", "entry": { "name": "In", @@ -191,7 +191,7 @@ ] }, { - "key": "Split", + "base": "Split", "context": "String", "entry": { "name": "In", @@ -229,7 +229,7 @@ ] }, { - "key": "IsValidFindPosition", + "base": "IsValidFindPosition", "context": "String", "entry": { "name": "In", @@ -261,7 +261,7 @@ ] }, { - "key": "EndsWith", + "base": "EndsWith", "context": "String", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/String_VM.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/String_VM.names index 38a203d02f..86a0f9e3c0 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/String_VM.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/String_VM.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "String_VM", + "base": "String_VM", "context": "BehaviorClass", "variant": "", "details": { @@ -9,7 +9,7 @@ }, "methods": [ { - "key": "ToLower", + "base": "ToLower", "context": "String_VM", "entry": { "name": "In", @@ -41,7 +41,7 @@ ] }, { - "key": "ToUpper", + "base": "ToUpper", "context": "String_VM", "entry": { "name": "In", @@ -73,7 +73,7 @@ ] }, { - "key": "Substring", + "base": "Substring", "context": "String_VM", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SurfaceAltitudeGradientComponent.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SurfaceAltitudeGradientComponent.names index c42e70fd88..6d5e6004b3 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SurfaceAltitudeGradientComponent.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SurfaceAltitudeGradientComponent.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "SurfaceAltitudeGradientComponent", + "base": "SurfaceAltitudeGradientComponent", "context": "BehaviorClass", "variant": "", "details": { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SurfaceAltitudeGradientConfig.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SurfaceAltitudeGradientConfig.names index 2886505974..55f73fe1a0 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SurfaceAltitudeGradientConfig.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SurfaceAltitudeGradientConfig.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "SurfaceAltitudeGradientConfig", + "base": "SurfaceAltitudeGradientConfig", "context": "BehaviorClass", "variant": "", "details": { @@ -9,7 +9,7 @@ }, "methods": [ { - "key": "GetNumTags", + "base": "GetNumTags", "context": "SurfaceAltitudeGradientConfig", "entry": { "name": "In", @@ -42,7 +42,7 @@ ] }, { - "key": "GetTag", + "base": "GetTag", "context": "SurfaceAltitudeGradientConfig", "entry": { "name": "In", @@ -81,7 +81,7 @@ ] }, { - "key": "RemoveTag", + "base": "RemoveTag", "context": "SurfaceAltitudeGradientConfig", "entry": { "name": "In", @@ -112,7 +112,7 @@ ] }, { - "key": "AddTag", + "base": "AddTag", "context": "SurfaceAltitudeGradientConfig", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SurfaceMaskGradientComponent.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SurfaceMaskGradientComponent.names index e82633638e..d3c50d9034 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SurfaceMaskGradientComponent.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SurfaceMaskGradientComponent.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "SurfaceMaskGradientComponent", + "base": "SurfaceMaskGradientComponent", "context": "BehaviorClass", "variant": "", "details": { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SurfaceMaskGradientConfig.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SurfaceMaskGradientConfig.names index 126e5cb118..4bf5c687ec 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SurfaceMaskGradientConfig.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SurfaceMaskGradientConfig.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "SurfaceMaskGradientConfig", + "base": "SurfaceMaskGradientConfig", "context": "BehaviorClass", "variant": "", "details": { @@ -9,7 +9,7 @@ }, "methods": [ { - "key": "GetNumTags", + "base": "GetNumTags", "context": "SurfaceMaskGradientConfig", "entry": { "name": "In", @@ -41,7 +41,7 @@ ] }, { - "key": "GetTag", + "base": "GetTag", "context": "SurfaceMaskGradientConfig", "entry": { "name": "In", @@ -79,7 +79,7 @@ ] }, { - "key": "RemoveTag", + "base": "RemoveTag", "context": "SurfaceMaskGradientConfig", "entry": { "name": "In", @@ -109,7 +109,7 @@ ] }, { - "key": "AddTag", + "base": "AddTag", "context": "SurfaceMaskGradientConfig", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SurfaceSlopeGradientComponent.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SurfaceSlopeGradientComponent.names index 94dbbf61a6..dad8d7b765 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SurfaceSlopeGradientComponent.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SurfaceSlopeGradientComponent.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "SurfaceSlopeGradientComponent", + "base": "SurfaceSlopeGradientComponent", "context": "BehaviorClass", "variant": "", "details": { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SurfaceSlopeGradientConfig.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SurfaceSlopeGradientConfig.names index c57eb21d4b..4a9e8e25dd 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SurfaceSlopeGradientConfig.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SurfaceSlopeGradientConfig.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "SurfaceSlopeGradientConfig", + "base": "SurfaceSlopeGradientConfig", "context": "BehaviorClass", "variant": "", "details": { @@ -9,7 +9,7 @@ }, "methods": [ { - "key": "GetNumTags", + "base": "GetNumTags", "context": "SurfaceSlopeGradientConfig", "entry": { "name": "In", @@ -41,7 +41,7 @@ ] }, { - "key": "GetTag", + "base": "GetTag", "context": "SurfaceSlopeGradientConfig", "entry": { "name": "In", @@ -79,7 +79,7 @@ ] }, { - "key": "RemoveTag", + "base": "RemoveTag", "context": "SurfaceSlopeGradientConfig", "entry": { "name": "In", @@ -109,7 +109,7 @@ ] }, { - "key": "AddTag", + "base": "AddTag", "context": "SurfaceSlopeGradientConfig", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SurfaceTagWeight.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SurfaceTagWeight.names index 0c1b3b7e1d..52c8078238 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SurfaceTagWeight.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SurfaceTagWeight.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "SurfaceTagWeight", + "base": "SurfaceTagWeight", "context": "BehaviorClass", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetsurfaceType", + "base": "GetsurfaceType", "details": { "name": "Get Surface Type" }, @@ -32,7 +32,7 @@ ] }, { - "key": "SetsurfaceType", + "base": "SetsurfaceType", "details": { "name": "Set Surface Type" }, @@ -52,7 +52,7 @@ ] }, { - "key": "Getweight", + "base": "Getweight", "details": { "name": "Get Weight" }, @@ -74,7 +74,7 @@ ] }, { - "key": "Setweight", + "base": "Setweight", "details": { "name": "Set Weight" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/Tag Helper.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/Tag Helper.names index 32e587c80f..65996b7b3b 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/Tag Helper.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/Tag Helper.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "Tag Helper", + "base": "Tag Helper", "context": "BehaviorClass", "variant": "", "details": { @@ -9,7 +9,7 @@ }, "methods": [ { - "key": "GetEntitiesbyTag", + "base": "GetEntitiesbyTag", "context": "Tag Helper", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/TestTupleMethods.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/TestTupleMethods.names index dd5a04064c..03702818ca 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/TestTupleMethods.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/TestTupleMethods.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "TestTupleMethods", + "base": "TestTupleMethods", "context": "BehaviorClass", "variant": "", "details": { @@ -9,7 +9,7 @@ }, "methods": [ { - "key": "Three", + "base": "Three", "context": "TestTupleMethods", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ThresholdGradientComponent.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ThresholdGradientComponent.names index ea113281c7..1418df947e 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ThresholdGradientComponent.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ThresholdGradientComponent.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "ThresholdGradientComponent", + "base": "ThresholdGradientComponent", "context": "BehaviorClass", "variant": "", "details": { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ThresholdGradientConfig.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ThresholdGradientConfig.names index 9fc1ac28ca..4ca077834f 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ThresholdGradientConfig.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ThresholdGradientConfig.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "ThresholdGradientConfig", + "base": "ThresholdGradientConfig", "context": "BehaviorClass", "variant": "", "details": { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/TickOrder.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/TickOrder.names index db75d9c39b..a6716ab37e 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/TickOrder.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/TickOrder.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "TickOrder", + "base": "TickOrder", "context": "BehaviorClass", "variant": "", "details": { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/TransformComponent.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/TransformComponent.names index 5c7d439587..ebf6400d43 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/TransformComponent.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/TransformComponent.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "TransformComponent", + "base": "TransformComponent", "context": "BehaviorClass", "variant": "", "details": { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/TransformConfig.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/TransformConfig.names index d9acd8a6cc..3c5ade5a55 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/TransformConfig.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/TransformConfig.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "TransformConfig", + "base": "TransformConfig", "context": "BehaviorClass", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "SetTransform", + "base": "SetTransform", "context": "TransformConfig", "entry": { "name": "In", @@ -39,7 +39,7 @@ ] }, { - "key": "SetLocalAndWorldTransform", + "base": "SetLocalAndWorldTransform", "context": "TransformConfig", "entry": { "name": "In", @@ -74,7 +74,7 @@ ] }, { - "key": "GetparentActivationTransformMode", + "base": "GetparentActivationTransformMode", "details": { "name": "Get Parent Activation Transform Mode" }, @@ -97,7 +97,7 @@ ] }, { - "key": "SetparentActivationTransformMode", + "base": "SetparentActivationTransformMode", "details": { "name": "Set Parent Activation Transform Mode" }, @@ -118,7 +118,7 @@ ] }, { - "key": "GetparentId", + "base": "GetparentId", "details": { "name": "Get Parent Id" }, @@ -141,7 +141,7 @@ ] }, { - "key": "SetparentId", + "base": "SetparentId", "details": { "name": "Set Parent Id" }, @@ -162,7 +162,7 @@ ] }, { - "key": "GetworldTransform", + "base": "GetworldTransform", "details": { "name": "Get World Transform" }, @@ -184,7 +184,7 @@ ] }, { - "key": "SetworldTransform", + "base": "SetworldTransform", "details": { "name": "Set World Transform" }, @@ -204,7 +204,7 @@ ] }, { - "key": "GetMaintainCurrentWorldTransform", + "base": "GetMaintainCurrentWorldTransform", "details": { "name": "Get Maintain Current World Transform" }, @@ -218,7 +218,7 @@ ] }, { - "key": "GetisStatic", + "base": "GetisStatic", "details": { "name": "Get Is Static" }, @@ -240,7 +240,7 @@ ] }, { - "key": "SetisStatic", + "base": "SetisStatic", "details": { "name": "Set Is Static" }, @@ -260,7 +260,7 @@ ] }, { - "key": "GetMaintainOriginalRelativeTransform", + "base": "GetMaintainOriginalRelativeTransform", "details": { "name": "Get Maintain Original Relative Transform" }, @@ -274,7 +274,7 @@ ] }, { - "key": "GetlocalTransform", + "base": "GetlocalTransform", "details": { "name": "Get Local Transform" }, @@ -296,7 +296,7 @@ ] }, { - "key": "SetlocalTransform", + "base": "SetlocalTransform", "details": { "name": "Set Local Transform" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/TriggerEvent.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/TriggerEvent.names index a0da73d31c..7dd601aab9 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/TriggerEvent.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/TriggerEvent.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "TriggerEvent", + "base": "TriggerEvent", "context": "BehaviorClass", "variant": "", "details": { @@ -9,7 +9,7 @@ }, "methods": [ { - "key": "GetTriggerEntityId", + "base": "GetTriggerEntityId", "context": "TriggerEvent", "entry": { "name": "In", @@ -42,7 +42,7 @@ ] }, { - "key": "GetOtherEntityId", + "base": "GetOtherEntityId", "context": "TriggerEvent", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/TypeExposition.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/TypeExposition.names index 4157b33300..5cb7fe9b2d 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/TypeExposition.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/TypeExposition.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "TypeExposition", + "base": "TypeExposition", "context": "BehaviorClass", "variant": "", "details": { @@ -9,7 +9,7 @@ }, "methods": [ { - "key": "Reflect_AZStd__array_AZ__Vector3_2", + "base": "Reflect_AZStd__array_AZ__Vector3_2", "context": "TypeExposition", "entry": { "name": "In", @@ -41,7 +41,7 @@ ] }, { - "key": "Reflect_AZ__Outcome_AZ__Vector3_void", + "base": "Reflect_AZ__Outcome_AZ__Vector3_void", "context": "TypeExposition", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/UVCoords.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/UVCoords.names index 9872b76aa1..ecbd6b8618 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/UVCoords.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/UVCoords.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "UVCoords", + "base": "UVCoords", "context": "BehaviorClass", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "SetUVCoords", + "base": "SetUVCoords", "context": "UVCoords", "entry": { "name": "In", @@ -57,7 +57,7 @@ ] }, { - "key": "SetBottom", + "base": "SetBottom", "context": "UVCoords", "entry": { "name": "In", @@ -86,7 +86,7 @@ ] }, { - "key": "SetRight", + "base": "SetRight", "context": "UVCoords", "entry": { "name": "In", @@ -115,7 +115,7 @@ ] }, { - "key": "SetTop", + "base": "SetTop", "context": "UVCoords", "entry": { "name": "In", @@ -144,7 +144,7 @@ ] }, { - "key": "SetLeft", + "base": "SetLeft", "context": "UVCoords", "entry": { "name": "In", @@ -173,7 +173,7 @@ ] }, { - "key": "Getleft", + "base": "Getleft", "details": { "name": "Left" }, @@ -195,7 +195,7 @@ ] }, { - "key": "Setleft", + "base": "Setleft", "details": { "name": "Set Left" }, @@ -215,7 +215,7 @@ ] }, { - "key": "Gettop", + "base": "Gettop", "details": { "name": "Top" }, @@ -237,7 +237,7 @@ ] }, { - "key": "Settop", + "base": "Settop", "details": { "name": "Set Top" }, @@ -257,7 +257,7 @@ ] }, { - "key": "Getright", + "base": "Getright", "details": { "name": "Get Right" }, @@ -279,7 +279,7 @@ ] }, { - "key": "Setright", + "base": "Setright", "details": { "name": "Set Right" }, @@ -299,7 +299,7 @@ ] }, { - "key": "Getbottom", + "base": "Getbottom", "details": { "name": "Get Bottom" }, @@ -321,7 +321,7 @@ ] }, { - "key": "Setbottom", + "base": "Setbottom", "details": { "name": "Bottom" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/UiAnchors.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/UiAnchors.names index ce779a7f83..6f0f08fdb0 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/UiAnchors.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/UiAnchors.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "UiAnchors", + "base": "UiAnchors", "context": "BehaviorClass", "variant": "", "details": { @@ -9,7 +9,7 @@ }, "methods": [ { - "key": "SetBottom", + "base": "SetBottom", "context": "UiAnchors", "entry": { "name": "In", @@ -38,7 +38,7 @@ ] }, { - "key": "SetRight", + "base": "SetRight", "context": "UiAnchors", "entry": { "name": "In", @@ -67,7 +67,7 @@ ] }, { - "key": "SetTop", + "base": "SetTop", "context": "UiAnchors", "entry": { "name": "In", @@ -96,7 +96,7 @@ ] }, { - "key": "SetLeft", + "base": "SetLeft", "context": "UiAnchors", "entry": { "name": "In", @@ -125,7 +125,7 @@ ] }, { - "key": "SetAnchors", + "base": "SetAnchors", "context": "UiAnchors", "entry": { "name": "In", @@ -172,7 +172,7 @@ ] }, { - "key": "Getleft", + "base": "Getleft", "details": { "name": "Getleft" }, @@ -194,7 +194,7 @@ ] }, { - "key": "Setleft", + "base": "Setleft", "details": { "name": "Setleft" }, @@ -214,7 +214,7 @@ ] }, { - "key": "Gettop", + "base": "Gettop", "details": { "name": "Gettop" }, @@ -236,7 +236,7 @@ ] }, { - "key": "Settop", + "base": "Settop", "details": { "name": "Settop" }, @@ -256,7 +256,7 @@ ] }, { - "key": "Getright", + "base": "Getright", "details": { "name": "Getright" }, @@ -278,7 +278,7 @@ ] }, { - "key": "Setright", + "base": "Setright", "details": { "name": "Setright" }, @@ -298,7 +298,7 @@ ] }, { - "key": "Getbottom", + "base": "Getbottom", "details": { "name": "Getbottom" }, @@ -320,7 +320,7 @@ ] }, { - "key": "Setbottom", + "base": "Setbottom", "details": { "name": "Setbottom" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/UiFaderComponent.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/UiFaderComponent.names index 6266f8234c..7f7fcd9478 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/UiFaderComponent.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/UiFaderComponent.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "UiFaderComponent", + "base": "UiFaderComponent", "context": "BehaviorClass", "variant": "", "details": { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/UiImageComponent.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/UiImageComponent.names index 66935473be..42ce5b7de3 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/UiImageComponent.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/UiImageComponent.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "UiImageComponent", + "base": "UiImageComponent", "context": "BehaviorClass", "variant": "", "details": { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/UiImageSequenceComponent.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/UiImageSequenceComponent.names index e0f2292b8d..86c01c7510 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/UiImageSequenceComponent.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/UiImageSequenceComponent.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "UiImageSequenceComponent", + "base": "UiImageSequenceComponent", "context": "BehaviorClass", "variant": "", "details": { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/UiLayoutCellComponent.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/UiLayoutCellComponent.names index 123be9bca5..d7f8882110 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/UiLayoutCellComponent.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/UiLayoutCellComponent.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "UiLayoutCellComponent", + "base": "UiLayoutCellComponent", "context": "BehaviorClass", "variant": "", "details": { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/UiLayoutColumnComponent.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/UiLayoutColumnComponent.names index 7962c9e48b..bc37e12574 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/UiLayoutColumnComponent.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/UiLayoutColumnComponent.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "UiLayoutColumnComponent", + "base": "UiLayoutColumnComponent", "context": "BehaviorClass", "variant": "", "details": { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/UiLayoutRowComponent.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/UiLayoutRowComponent.names index 7617b10f9c..7f576d62e9 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/UiLayoutRowComponent.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/UiLayoutRowComponent.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "UiLayoutRowComponent", + "base": "UiLayoutRowComponent", "context": "BehaviorClass", "variant": "", "details": { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/UiOffsets.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/UiOffsets.names index dcf4704ca1..6b7aa8422a 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/UiOffsets.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/UiOffsets.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "UiOffsets", + "base": "UiOffsets", "context": "BehaviorClass", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "SetBottom", + "base": "SetBottom", "context": "UiOffsets", "entry": { "name": "In", @@ -42,7 +42,7 @@ ] }, { - "key": "SetRight", + "base": "SetRight", "context": "UiOffsets", "entry": { "name": "In", @@ -74,7 +74,7 @@ ] }, { - "key": "SetOffsets", + "base": "SetOffsets", "context": "UiOffsets", "entry": { "name": "In", @@ -127,7 +127,7 @@ ] }, { - "key": "SetTop", + "base": "SetTop", "context": "UiOffsets", "entry": { "name": "In", @@ -159,7 +159,7 @@ ] }, { - "key": "SetLeft", + "base": "SetLeft", "context": "UiOffsets", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/UiPadding.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/UiPadding.names index 296735cd1d..5b1e4d4f93 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/UiPadding.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/UiPadding.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "UiPadding", + "base": "UiPadding", "context": "BehaviorClass", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "SetPadding", + "base": "SetPadding", "context": "UiPadding", "entry": { "name": "In", @@ -63,7 +63,7 @@ ] }, { - "key": "SetBottom", + "base": "SetBottom", "context": "UiPadding", "entry": { "name": "In", @@ -95,7 +95,7 @@ ] }, { - "key": "SetRight", + "base": "SetRight", "context": "UiPadding", "entry": { "name": "In", @@ -127,7 +127,7 @@ ] }, { - "key": "SetTop", + "base": "SetTop", "context": "UiPadding", "entry": { "name": "In", @@ -159,7 +159,7 @@ ] }, { - "key": "SetLeft", + "base": "SetLeft", "context": "UiPadding", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/UiParticleEmitterComponent.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/UiParticleEmitterComponent.names index ba5463b7a0..8218d063fb 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/UiParticleEmitterComponent.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/UiParticleEmitterComponent.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "UiParticleEmitterComponent", + "base": "UiParticleEmitterComponent", "context": "BehaviorClass", "variant": "", "details": { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/UiScrollBarComponent.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/UiScrollBarComponent.names index 81a27fcdf1..13a890a74e 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/UiScrollBarComponent.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/UiScrollBarComponent.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "UiScrollBarComponent", + "base": "UiScrollBarComponent", "context": "BehaviorClass", "variant": "", "details": { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/UiSliderComponent.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/UiSliderComponent.names index 269ae95c1c..52a5928940 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/UiSliderComponent.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/UiSliderComponent.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "UiSliderComponent", + "base": "UiSliderComponent", "context": "BehaviorClass", "variant": "", "details": { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/UiTextComponent.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/UiTextComponent.names index ffed23d747..e611e3bc50 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/UiTextComponent.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/UiTextComponent.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "UiTextComponent", + "base": "UiTextComponent", "context": "BehaviorClass", "variant": "", "details": { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/UiTextInputComponent.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/UiTextInputComponent.names index ca2bd78b61..872ee6c4b0 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/UiTextInputComponent.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/UiTextInputComponent.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "UiTextInputComponent", + "base": "UiTextInputComponent", "context": "BehaviorClass", "variant": "", "details": { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/UiTooltipDisplayComponent.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/UiTooltipDisplayComponent.names index b39c29cf97..436f9265b7 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/UiTooltipDisplayComponent.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/UiTooltipDisplayComponent.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "UiTooltipDisplayComponent", + "base": "UiTooltipDisplayComponent", "context": "BehaviorClass", "variant": "", "details": { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/UiTransform2dComponent.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/UiTransform2dComponent.names index 4f0a04958a..dd8b4126c6 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/UiTransform2dComponent.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/UiTransform2dComponent.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "UiTransform2dComponent", + "base": "UiTransform2dComponent", "context": "BehaviorClass", "variant": "", "details": { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/Unit Testing.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/Unit Testing.names index fde1730637..7dcec69b68 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/Unit Testing.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/Unit Testing.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "Unit Testing", + "base": "Unit Testing", "context": "BehaviorClass", "variant": "", "details": { @@ -9,7 +9,7 @@ }, "methods": [ { - "key": "ExpectLessThanEqual", + "base": "ExpectLessThanEqual", "context": "Unit Testing", "entry": { "name": "In", @@ -52,7 +52,7 @@ ] }, { - "key": "ExpectGreaterThanEqual", + "base": "ExpectGreaterThanEqual", "context": "Unit Testing", "entry": { "name": "In", @@ -95,7 +95,7 @@ ] }, { - "key": "MarkComplete", + "base": "MarkComplete", "context": "Unit Testing", "entry": { "name": "In", @@ -126,7 +126,7 @@ ] }, { - "key": "ExpectTrue", + "base": "ExpectTrue", "context": "Unit Testing", "entry": { "name": "In", @@ -163,7 +163,7 @@ ] }, { - "key": "Checkpoint", + "base": "Checkpoint", "context": "Unit Testing", "entry": { "name": "In", @@ -194,7 +194,7 @@ ] }, { - "key": "ExpectFalse", + "base": "ExpectFalse", "context": "Unit Testing", "entry": { "name": "In", @@ -231,7 +231,7 @@ ] }, { - "key": "ExpectEqual", + "base": "ExpectEqual", "context": "Unit Testing", "entry": { "name": "In", @@ -274,7 +274,7 @@ ] }, { - "key": "ExpectLessThan", + "base": "ExpectLessThan", "context": "Unit Testing", "entry": { "name": "In", @@ -317,7 +317,7 @@ ] }, { - "key": "AddSuccess", + "base": "AddSuccess", "context": "Unit Testing", "entry": { "name": "In", @@ -348,7 +348,7 @@ ] }, { - "key": "ExpectNotEqual", + "base": "ExpectNotEqual", "context": "Unit Testing", "entry": { "name": "In", @@ -391,7 +391,7 @@ ] }, { - "key": "ExpectGreaterThan", + "base": "ExpectGreaterThan", "context": "Unit Testing", "entry": { "name": "In", @@ -434,7 +434,7 @@ ] }, { - "key": "AddFailure", + "base": "AddFailure", "context": "Unit Testing", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/UnitTesting.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/UnitTesting.names index 9e5a209d69..64ecdb414a 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/UnitTesting.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/UnitTesting.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "Unit Testing", + "base": "Unit Testing", "context": "BehaviorClass", "variant": "", "details": { @@ -9,7 +9,7 @@ }, "methods": [ { - "key": "ExpectLessThanEqual", + "base": "ExpectLessThanEqual", "context": "Unit Testing", "entry": { "name": "In", @@ -54,7 +54,7 @@ ] }, { - "key": "ExpectGreaterThanEqual", + "base": "ExpectGreaterThanEqual", "context": "Unit Testing", "entry": { "name": "In", @@ -99,7 +99,7 @@ ] }, { - "key": "MarkComplete", + "base": "MarkComplete", "context": "Unit Testing", "entry": { "name": "In", @@ -130,7 +130,7 @@ ] }, { - "key": "ExpectTrue", + "base": "ExpectTrue", "context": "Unit Testing", "entry": { "name": "In", @@ -168,7 +168,7 @@ ] }, { - "key": "Checkpoint", + "base": "Checkpoint", "context": "Unit Testing", "entry": { "name": "In", @@ -199,7 +199,7 @@ ] }, { - "key": "ExpectFalse", + "base": "ExpectFalse", "context": "Unit Testing", "entry": { "name": "In", @@ -237,7 +237,7 @@ ] }, { - "key": "ExpectEqual", + "base": "ExpectEqual", "context": "Unit Testing", "entry": { "name": "In", @@ -282,7 +282,7 @@ ] }, { - "key": "ExpectLessThan", + "base": "ExpectLessThan", "context": "Unit Testing", "entry": { "name": "In", @@ -327,7 +327,7 @@ ] }, { - "key": "AddSuccess", + "base": "AddSuccess", "context": "Unit Testing", "entry": { "name": "In", @@ -358,7 +358,7 @@ ] }, { - "key": "ExpectNotEqual", + "base": "ExpectNotEqual", "context": "Unit Testing", "entry": { "name": "In", @@ -403,7 +403,7 @@ ] }, { - "key": "ExpectGreaterThan", + "base": "ExpectGreaterThan", "context": "Unit Testing", "entry": { "name": "In", @@ -448,7 +448,7 @@ ] }, { - "key": "AddFailure", + "base": "AddFailure", "context": "Unit Testing", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/Uuid.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/Uuid.names index 78f3425305..26ab64071d 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/Uuid.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/Uuid.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "Uuid", + "base": "Uuid", "context": "BehaviorClass", "variant": "", "details": { @@ -9,7 +9,7 @@ }, "methods": [ { - "key": "CreateRandom", + "base": "CreateRandom", "context": "Uuid", "entry": { "name": "In", @@ -32,7 +32,7 @@ ] }, { - "key": "CreateNull", + "base": "CreateNull", "context": "Uuid", "entry": { "name": "In", @@ -55,7 +55,7 @@ ] }, { - "key": "Create", + "base": "Create", "context": "Uuid", "entry": { "name": "In", @@ -78,7 +78,7 @@ ] }, { - "key": "CreateName", + "base": "CreateName", "context": "Uuid", "entry": { "name": "In", @@ -109,7 +109,7 @@ ] }, { - "key": "Clone", + "base": "Clone", "context": "Uuid", "entry": { "name": "In", @@ -140,7 +140,7 @@ ] }, { - "key": "LessThan", + "base": "LessThan", "context": "Uuid", "entry": { "name": "In", @@ -177,7 +177,7 @@ ] }, { - "key": "IsNull", + "base": "IsNull", "context": "Uuid", "entry": { "name": "In", @@ -208,7 +208,7 @@ ] }, { - "key": "CreateString", + "base": "CreateString", "context": "Uuid", "entry": { "name": "In", @@ -245,7 +245,7 @@ ] }, { - "key": "ToString", + "base": "ToString", "context": "Uuid", "entry": { "name": "In", @@ -276,7 +276,7 @@ ] }, { - "key": "Equal", + "base": "Equal", "context": "Uuid", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/VertexColor.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/VertexColor.names index af9efaf5a8..19024105d3 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/VertexColor.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/VertexColor.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "VertexColor", + "base": "VertexColor", "context": "BehaviorClass", "variant": "", "details": { @@ -9,7 +9,7 @@ }, "methods": [ { - "key": "Getred", + "base": "Getred", "details": { "name": "Get Red" }, @@ -31,7 +31,7 @@ ] }, { - "key": "Getgreen", + "base": "Getgreen", "details": { "name": "Get Green" }, @@ -53,7 +53,7 @@ ] }, { - "key": "Getblue", + "base": "Getblue", "details": { "name": "Get Blue" }, @@ -75,7 +75,7 @@ ] }, { - "key": "Getalpha", + "base": "Getalpha", "details": { "name": "Get Alpha" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ViewPaneOptions.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ViewPaneOptions.names index 7a5a2c6d09..6d88ffc05b 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ViewPaneOptions.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ViewPaneOptions.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "ViewPaneOptions", + "base": "ViewPaneOptions", "context": "BehaviorClass", "variant": "", "details": { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/AWSCognitoAuthorizationNotificationBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/AWSCognitoAuthorizationNotificationBus.names index b96ab2fb37..94be770939 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/AWSCognitoAuthorizationNotificationBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/AWSCognitoAuthorizationNotificationBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "AWSCognitoAuthorizationNotificationBus", + "base": "AWSCognitoAuthorizationNotificationBus", "context": "EBusHandler", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "OnRequestAWSCredentialsSuccess", + "base": "OnRequestAWSCredentialsSuccess", "details": { "name": "On Request AWS Credentials Success" }, @@ -24,7 +24,7 @@ ] }, { - "key": "OnRequestAWSCredentialsFail", + "base": "OnRequestAWSCredentialsFail", "details": { "name": "On Request AWS Credentials Fail" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/AWSCognitoUserManagementNotificationBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/AWSCognitoUserManagementNotificationBus.names index a796ec0f48..0286fffc7d 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/AWSCognitoUserManagementNotificationBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/AWSCognitoUserManagementNotificationBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "AWSCognitoUserManagementNotificationBus", + "base": "AWSCognitoUserManagementNotificationBus", "context": "EBusHandler", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "OnEmailSignUpSuccess", + "base": "OnEmailSignUpSuccess", "details": { "name": "On Email Sign Up Success" }, @@ -24,7 +24,7 @@ ] }, { - "key": "OnEmailSignUpFail", + "base": "OnEmailSignUpFail", "details": { "name": "On Email Sign Up Fail" }, @@ -38,7 +38,7 @@ ] }, { - "key": "OnPhoneSignUpSuccess", + "base": "OnPhoneSignUpSuccess", "details": { "name": "On Phone Sign Up Success" }, @@ -52,7 +52,7 @@ ] }, { - "key": "OnPhoneSignUpFail", + "base": "OnPhoneSignUpFail", "details": { "name": "On Phone Sign Up Fail" }, @@ -66,13 +66,13 @@ ] }, { - "key": "OnConfirmSignUpSuccess", + "base": "OnConfirmSignUpSuccess", "details": { "name": "On Confirm Sign Up Success" } }, { - "key": "OnConfirmSignUpFail", + "base": "OnConfirmSignUpFail", "details": { "name": "On Confirm Sign Up Fail" }, @@ -86,13 +86,13 @@ ] }, { - "key": "OnForgotPasswordSuccess", + "base": "OnForgotPasswordSuccess", "details": { "name": "On Forgot Password Success" } }, { - "key": "OnForgotPasswordFail", + "base": "OnForgotPasswordFail", "details": { "name": "On Forgot Password Fail" }, @@ -106,13 +106,13 @@ ] }, { - "key": "OnConfirmForgotPasswordSuccess", + "base": "OnConfirmForgotPasswordSuccess", "details": { "name": "On Confirm Forgot Password Success" } }, { - "key": "OnConfirmForgotPasswordFail", + "base": "OnConfirmForgotPasswordFail", "details": { "name": "On Confirm Forgot Password Fail" }, @@ -126,13 +126,13 @@ ] }, { - "key": "OnEnableMFASuccess", + "base": "OnEnableMFASuccess", "details": { "name": "On Enable MFA Success" } }, { - "key": "OnEnableMFAFail", + "base": "OnEnableMFAFail", "details": { "name": "On Enable MFA Fail" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/AWSDynamoDBBehaviorNotificationBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/AWSDynamoDBBehaviorNotificationBus.names index c5840d7bdb..77e324d882 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/AWSDynamoDBBehaviorNotificationBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/AWSDynamoDBBehaviorNotificationBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "AWSDynamoDBBehaviorNotificationBus", + "base": "AWSDynamoDBBehaviorNotificationBus", "context": "EBusHandler", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "OnGetItemSuccess", + "base": "OnGetItemSuccess", "details": { "name": "On Get Item Success" }, @@ -24,7 +24,7 @@ ] }, { - "key": "OnGetItemError", + "base": "OnGetItemError", "details": { "name": "On Get Item Error" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/AWSLambdaBehaviorNotificationBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/AWSLambdaBehaviorNotificationBus.names index 713ece5219..b02432eb5f 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/AWSLambdaBehaviorNotificationBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/AWSLambdaBehaviorNotificationBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "AWSLambdaBehaviorNotificationBus", + "base": "AWSLambdaBehaviorNotificationBus", "context": "EBusHandler", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "OnInvokeSuccess", + "base": "OnInvokeSuccess", "details": { "name": "On Invoke Success" }, @@ -24,7 +24,7 @@ ] }, { - "key": "OnInvokeError", + "base": "OnInvokeError", "details": { "name": "On Invoke Error" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/AWSMetricsNotificationBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/AWSMetricsNotificationBus.names index 64920f9444..22a39aece5 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/AWSMetricsNotificationBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/AWSMetricsNotificationBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "AWSMetricsNotificationBus", + "base": "AWSMetricsNotificationBus", "context": "EBusHandler", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "OnSendMetricsSuccess", + "base": "OnSendMetricsSuccess", "details": { "name": "On Send Metrics Success" }, @@ -24,7 +24,7 @@ ] }, { - "key": "OnSendMetricsFailure", + "base": "OnSendMetricsFailure", "details": { "name": "On Send Metrics Failure" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/AWSS3BehaviorNotificationBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/AWSS3BehaviorNotificationBus.names index 55b093d348..38b0d6467d 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/AWSS3BehaviorNotificationBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/AWSS3BehaviorNotificationBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "AWSS3BehaviorNotificationBus", + "base": "AWSS3BehaviorNotificationBus", "context": "EBusHandler", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "OnHeadObjectSuccess", + "base": "OnHeadObjectSuccess", "details": { "name": "On Head Object Success" }, @@ -24,7 +24,7 @@ ] }, { - "key": "OnHeadObjectError", + "base": "OnHeadObjectError", "details": { "name": "On Head Object Error" }, @@ -38,7 +38,7 @@ ] }, { - "key": "OnGetObjectSuccess", + "base": "OnGetObjectSuccess", "details": { "name": "On Get Object Success" }, @@ -52,7 +52,7 @@ ] }, { - "key": "OnGetObjectError", + "base": "OnGetObjectError", "details": { "name": "On Get Object Error" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/ActorComponentNotificationBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/ActorComponentNotificationBus.names index 5b61508119..4ea752408b 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/ActorComponentNotificationBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/ActorComponentNotificationBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "ActorComponentNotificationBus", + "base": "ActorComponentNotificationBus", "context": "EBusHandler", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "OnActorInstanceCreated", + "base": "OnActorInstanceCreated", "details": { "name": "On Actor Instance Created" }, @@ -24,7 +24,7 @@ ] }, { - "key": "OnActorInstanceDestroyed", + "base": "OnActorInstanceDestroyed", "details": { "name": "On Actor Instance Destroyed" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/ActorNotificationBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/ActorNotificationBus.names index 82e8a54750..103b584015 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/ActorNotificationBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/ActorNotificationBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "ActorNotificationBus", + "base": "ActorNotificationBus", "context": "EBusHandler", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "OnMotionEvent", + "base": "OnMotionEvent", "details": { "name": "On Motion Event" }, @@ -24,7 +24,7 @@ ] }, { - "key": "OnMotionLoop", + "base": "OnMotionLoop", "details": { "name": "On Motion Loop" }, @@ -38,7 +38,7 @@ ] }, { - "key": "OnStateEntering", + "base": "OnStateEntering", "details": { "name": "On State Entering" }, @@ -52,7 +52,7 @@ ] }, { - "key": "OnStateEntered", + "base": "OnStateEntered", "details": { "name": "On State Entered" }, @@ -66,7 +66,7 @@ ] }, { - "key": "OnStateExiting", + "base": "OnStateExiting", "details": { "name": "On State Exiting" }, @@ -80,7 +80,7 @@ ] }, { - "key": "OnStateExited", + "base": "OnStateExited", "details": { "name": "On State Exited" }, @@ -94,7 +94,7 @@ ] }, { - "key": "OnStateTransitionStart", + "base": "OnStateTransitionStart", "details": { "name": "On State Transition Start" }, @@ -114,7 +114,7 @@ ] }, { - "key": "OnStateTransitionEnd", + "base": "OnStateTransitionEnd", "details": { "name": "On State Transition End" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/AnimGraphComponentNotificationBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/AnimGraphComponentNotificationBus.names index ec8d9fa193..f34fe7445a 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/AnimGraphComponentNotificationBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/AnimGraphComponentNotificationBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "AnimGraphComponentNotificationBus", + "base": "AnimGraphComponentNotificationBus", "context": "EBusHandler", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "OnAnimGraphInstanceCreated", + "base": "OnAnimGraphInstanceCreated", "details": { "name": "On Anim Graph Instance Created" }, @@ -24,7 +24,7 @@ ] }, { - "key": "OnAnimGraphInstanceDestroyed", + "base": "OnAnimGraphInstanceDestroyed", "details": { "name": "On Anim Graph Instance Destroyed" }, @@ -38,7 +38,7 @@ ] }, { - "key": "OnAnimGraphFloatParameterChanged", + "base": "OnAnimGraphFloatParameterChanged", "details": { "name": "On Anim Graph Float Parameter Changed" }, @@ -70,7 +70,7 @@ ] }, { - "key": "OnAnimGraphBoolParameterChanged", + "base": "OnAnimGraphBoolParameterChanged", "details": { "name": "On Anim Graph Bool Parameter Changed" }, @@ -102,7 +102,7 @@ ] }, { - "key": "OnAnimGraphStringParameterChanged", + "base": "OnAnimGraphStringParameterChanged", "details": { "name": "On Anim Graph String Parameter Changed" }, @@ -134,7 +134,7 @@ ] }, { - "key": "OnAnimGraphVector2ParameterChanged", + "base": "OnAnimGraphVector2ParameterChanged", "details": { "name": "On Anim Graph Vector2 Parameter Changed" }, @@ -166,7 +166,7 @@ ] }, { - "key": "OnAnimGraphVector3ParameterChanged", + "base": "OnAnimGraphVector3ParameterChanged", "details": { "name": "On Anim Graph Vector3 Parameter Changed" }, @@ -198,7 +198,7 @@ ] }, { - "key": "OnAnimGraphRotationParameterChanged", + "base": "OnAnimGraphRotationParameterChanged", "details": { "name": "On Anim Graph Rotation Parameter Changed" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/AttachmentComponentNotificationBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/AttachmentComponentNotificationBus.names index 64f2f4c204..76c3024999 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/AttachmentComponentNotificationBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/AttachmentComponentNotificationBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "AttachmentComponentNotificationBus", + "base": "AttachmentComponentNotificationBus", "context": "EBusHandler", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "OnAttached", + "base": "OnAttached", "details": { "name": "On Attached" }, @@ -25,7 +25,7 @@ ] }, { - "key": "OnDetached", + "base": "OnDetached", "details": { "name": "On Detached" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/Audio System Component Notifications.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/Audio System Component Notifications.names index 7803611d90..7909af5ebd 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/Audio System Component Notifications.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/Audio System Component Notifications.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "Audio System Component Notifications", + "base": "Audio System Component Notifications", "context": "EBusHandler", "variant": "", "details": { @@ -10,13 +10,13 @@ }, "methods": [ { - "key": "OnGamePaused", + "base": "OnGamePaused", "details": { "name": "On Game Paused" } }, { - "key": "OnGameUnpaused", + "base": "OnGameUnpaused", "details": { "name": "On Game Unpaused" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/AudioTriggerComponentNotificationBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/AudioTriggerComponentNotificationBus.names index d134f20f74..45baf45199 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/AudioTriggerComponentNotificationBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/AudioTriggerComponentNotificationBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "AudioTriggerComponentNotificationBus", + "base": "AudioTriggerComponentNotificationBus", "context": "EBusHandler", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "OnTriggerFinished", + "base": "OnTriggerFinished", "details": { "name": "On Trigger Finished", "tooltip": "Executes when an audio trigger has finished playing (the sound has ended)." diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/AuthenticationProviderNotificationBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/AuthenticationProviderNotificationBus.names index f90336780e..c567504c83 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/AuthenticationProviderNotificationBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/AuthenticationProviderNotificationBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "AuthenticationProviderNotificationBus", + "base": "AuthenticationProviderNotificationBus", "context": "EBusHandler", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "OnPasswordGrantSingleFactorSignInSuccess", + "base": "OnPasswordGrantSingleFactorSignInSuccess", "details": { "name": "On Password Grant Single Factor Sign In Success" }, @@ -24,7 +24,7 @@ ] }, { - "key": "OnPasswordGrantSingleFactorSignInFail", + "base": "OnPasswordGrantSingleFactorSignInFail", "details": { "name": "On Password Grant Single Factor Sign In Fail" }, @@ -38,13 +38,13 @@ ] }, { - "key": "OnPasswordGrantMultiFactorSignInSuccess", + "base": "OnPasswordGrantMultiFactorSignInSuccess", "details": { "name": "On Password Grant Multi Factor Sign In Success" } }, { - "key": "OnPasswordGrantMultiFactorSignInFail", + "base": "OnPasswordGrantMultiFactorSignInFail", "details": { "name": "On Password Grant Multi Factor Sign In Fail" }, @@ -58,7 +58,7 @@ ] }, { - "key": "OnPasswordGrantMultiFactorConfirmSignInSuccess", + "base": "OnPasswordGrantMultiFactorConfirmSignInSuccess", "details": { "name": "On Password Grant Multi Factor Confirm Sign In Success" }, @@ -72,7 +72,7 @@ ] }, { - "key": "OnPasswordGrantMultiFactorConfirmSignInFail", + "base": "OnPasswordGrantMultiFactorConfirmSignInFail", "details": { "name": "On Password Grant Multi Factor Confirm Sign In Fail" }, @@ -86,7 +86,7 @@ ] }, { - "key": "OnDeviceCodeGrantSignInSuccess", + "base": "OnDeviceCodeGrantSignInSuccess", "details": { "name": "On Device Code Grant Sign In Success" }, @@ -112,7 +112,7 @@ ] }, { - "key": "OnDeviceCodeGrantSignInFail", + "base": "OnDeviceCodeGrantSignInFail", "details": { "name": "On Device Code Grant Sign In Fail" }, @@ -126,7 +126,7 @@ ] }, { - "key": "OnDeviceCodeGrantConfirmSignInSuccess", + "base": "OnDeviceCodeGrantConfirmSignInSuccess", "details": { "name": "On Device Code Grant Confirm Sign In Success" }, @@ -140,7 +140,7 @@ ] }, { - "key": "OnDeviceCodeGrantConfirmSignInFail", + "base": "OnDeviceCodeGrantConfirmSignInFail", "details": { "name": "On Device Code Grant Confirm Sign In Fail" }, @@ -154,7 +154,7 @@ ] }, { - "key": "OnRefreshTokensSuccess", + "base": "OnRefreshTokensSuccess", "details": { "name": "On Refresh Tokens Success" }, @@ -168,7 +168,7 @@ ] }, { - "key": "OnRefreshTokensFail", + "base": "OnRefreshTokensFail", "details": { "name": "On Refresh Tokens Fail" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/BlastFamilyComponentNotificationBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/BlastFamilyComponentNotificationBus.names index c8722bf36f..b083994547 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/BlastFamilyComponentNotificationBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/BlastFamilyComponentNotificationBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "BlastFamilyComponentNotificationBus", + "base": "BlastFamilyComponentNotificationBus", "context": "EBusHandler", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "OnActorCreated", + "base": "OnActorCreated", "details": { "name": "On Actor Created" }, @@ -25,7 +25,7 @@ ] }, { - "key": "OnActorDestroyed", + "base": "OnActorDestroyed", "details": { "name": "On Actor Destroyed" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/CameraNotificationBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/CameraNotificationBus.names index 3c12c9643e..d1c0a4942e 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/CameraNotificationBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/CameraNotificationBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "CameraNotificationBus", + "base": "CameraNotificationBus", "context": "EBusHandler", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "OnCameraAdded", + "base": "OnCameraAdded", "details": { "name": "On Camera Added" }, @@ -25,7 +25,7 @@ ] }, { - "key": "OnCameraRemoved", + "base": "OnCameraRemoved", "details": { "name": "On Camera Removed" }, @@ -40,7 +40,7 @@ ] }, { - "key": "OnActiveViewChanged", + "base": "OnActiveViewChanged", "details": { "name": "On Active View Changed" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/CollisionNotificationBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/CollisionNotificationBus.names index bf835079c8..76327e1006 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/CollisionNotificationBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/CollisionNotificationBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "CollisionNotificationBus", + "base": "CollisionNotificationBus", "context": "EBusHandler", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "OnCollisionBegin", + "base": "OnCollisionBegin", "details": { "name": "On Collision Begin" }, @@ -31,7 +31,7 @@ ] }, { - "key": "OnCollisionPersist", + "base": "OnCollisionPersist", "details": { "name": "On Collision Persist", "tooltip": "Raised while this collider is in contact with another collider" @@ -53,7 +53,7 @@ ] }, { - "key": "OnCollisionEnd", + "base": "OnCollisionEnd", "details": { "name": "On Collision End", "tooltip": "Raised when a collider loses contact with another collider" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/ConsoleNotificationBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/ConsoleNotificationBus.names index 9bd1bfbbb1..0f990a40b1 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/ConsoleNotificationBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/ConsoleNotificationBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "ConsoleNotificationBus", + "base": "ConsoleNotificationBus", "context": "EBusHandler", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "OnConsoleCommandExecuted", + "base": "OnConsoleCommandExecuted", "details": { "name": "On Console Command Executed" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/EditorComponentModeNotificationBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/EditorComponentModeNotificationBus.names index 2dfae7ace9..391f467a6b 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/EditorComponentModeNotificationBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/EditorComponentModeNotificationBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "EditorComponentModeNotificationBus", + "base": "EditorComponentModeNotificationBus", "context": "EBusHandler", "variant": "", "details": { @@ -9,7 +9,7 @@ }, "methods": [ { - "key": "ActiveComponentModeChanged", + "base": "ActiveComponentModeChanged", "details": { "name": "ActiveComponentModeChanged" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/EditorEntityContextNotificationBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/EditorEntityContextNotificationBus.names index 699b59c46c..52472570a4 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/EditorEntityContextNotificationBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/EditorEntityContextNotificationBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "EditorEntityContextNotificationBus", + "base": "EditorEntityContextNotificationBus", "context": "EBusHandler", "variant": "", "details": { @@ -9,7 +9,7 @@ }, "methods": [ { - "key": "OnEditorEntityCreated", + "base": "OnEditorEntityCreated", "details": { "name": "OnEditorEntityCreated" }, @@ -24,7 +24,7 @@ ] }, { - "key": "OnEditorEntityDeleted", + "base": "OnEditorEntityDeleted", "details": { "name": "OnEditorEntityDeleted" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/EditorEventBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/EditorEventBus.names index 7aa15f1009..6327d02fb3 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/EditorEventBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/EditorEventBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "EditorEventBus", + "base": "EditorEventBus", "context": "EBusHandler", "variant": "", "details": { @@ -9,7 +9,7 @@ }, "methods": [ { - "key": "NotifyRegisterViews", + "base": "NotifyRegisterViews", "details": { "name": "NotifyRegisterViews" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/EntityBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/EntityBus.names index b72951159e..3e3cec1916 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/EntityBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/EntityBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "EntityBus", + "base": "EntityBus", "context": "EBusHandler", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "OnEntityActivated", + "base": "OnEntityActivated", "details": { "name": "On Entity Activated", "tooltip": "Signals that an entity was activated" @@ -26,7 +26,7 @@ ] }, { - "key": "OnEntityDeactivated", + "base": "OnEntityDeactivated", "details": { "name": "On Entity Deactivated", "tooltip": "Signals that an entity is being deactivated" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/FrameCaptureNotificationBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/FrameCaptureNotificationBus.names index a3067cb11a..ab5be84903 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/FrameCaptureNotificationBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/FrameCaptureNotificationBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "FrameCaptureNotificationBus", + "base": "FrameCaptureNotificationBus", "context": "EBusHandler", "variant": "", "details": { @@ -9,7 +9,7 @@ }, "methods": [ { - "key": "OnCaptureFinished", + "base": "OnCaptureFinished", "details": { "name": "OnCaptureFinished" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/GlobalScriptEvents.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/GlobalScriptEvents.names index 7a62831c76..4b0b9d1ef5 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/GlobalScriptEvents.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/GlobalScriptEvents.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "GlobalScriptEvents", + "base": "GlobalScriptEvents", "context": "EBusHandler", "variant": "", "details": { @@ -9,13 +9,13 @@ }, "methods": [ { - "key": "Void", + "base": "Void", "details": { "name": "Void" } }, { - "key": "Not", + "base": "Not", "details": { "name": "Not" }, @@ -37,7 +37,7 @@ ] }, { - "key": "Increment", + "base": "Increment", "details": { "name": "Increment" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/InputSystemNotificationBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/InputSystemNotificationBus.names index d77cbe0f32..b3893a3486 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/InputSystemNotificationBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/InputSystemNotificationBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "InputSystemNotificationBus", + "base": "InputSystemNotificationBus", "context": "EBusHandler", "variant": "", "details": { @@ -10,13 +10,13 @@ }, "methods": [ { - "key": "OnPreInputUpdate", + "base": "OnPreInputUpdate", "details": { "name": "On Pre Input Update" } }, { - "key": "OnPostInputUpdate", + "base": "OnPostInputUpdate", "details": { "name": "On Post Input Update" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/LocalScriptEvents.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/LocalScriptEvents.names index bb23219646..ed27ffe5e1 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/LocalScriptEvents.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/LocalScriptEvents.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "LocalScriptEvents", + "base": "LocalScriptEvents", "context": "EBusHandler", "variant": "", "details": { @@ -9,13 +9,13 @@ }, "methods": [ { - "key": "Void", + "base": "Void", "details": { "name": "Void" } }, { - "key": "Not", + "base": "Not", "details": { "name": "Not" }, @@ -37,7 +37,7 @@ ] }, { - "key": "Increment", + "base": "Increment", "details": { "name": "Increment" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/LookAtNotification.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/LookAtNotification.names index 21994e982c..e27ea1f05b 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/LookAtNotification.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/LookAtNotification.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "LookAtNotification", + "base": "LookAtNotification", "context": "EBusHandler", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "OnTargetChanged", + "base": "OnTargetChanged", "details": { "name": "On Target Changed" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/MeshComponentNotificationBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/MeshComponentNotificationBus.names index 66175bd1bf..08e5be460a 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/MeshComponentNotificationBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/MeshComponentNotificationBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "MeshComponentNotificationBus", + "base": "MeshComponentNotificationBus", "context": "EBusHandler", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "OnModelReady", + "base": "OnModelReady", "details": { "name": "On Model Ready" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/NavigationComponentNotificationBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/NavigationComponentNotificationBus.names index b7549119c5..15e4a9a85f 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/NavigationComponentNotificationBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/NavigationComponentNotificationBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "NavigationComponentNotificationBus", + "base": "NavigationComponentNotificationBus", "context": "EBusHandler", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "OnSearchingForPath", + "base": "OnSearchingForPath", "details": { "name": "On Searching For Path" }, @@ -25,7 +25,7 @@ ] }, { - "key": "OnTraversalStarted", + "base": "OnTraversalStarted", "details": { "name": "On Traversal Started" }, @@ -40,7 +40,7 @@ ] }, { - "key": "OnTraversalPathUpdate", + "base": "OnTraversalPathUpdate", "details": { "name": "On Traversal Path Update" }, @@ -69,7 +69,7 @@ ] }, { - "key": "OnTraversalInProgress", + "base": "OnTraversalInProgress", "details": { "name": "On Traversal In Progress" }, @@ -91,7 +91,7 @@ ] }, { - "key": "OnTraversalComplete", + "base": "OnTraversalComplete", "details": { "name": "On Traversal Complete" }, @@ -106,7 +106,7 @@ ] }, { - "key": "OnTraversalCancelled", + "base": "OnTraversalCancelled", "details": { "name": "On Traversal Cancelled" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/NetworkTestPlayerComponentBusHandler.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/NetworkTestPlayerComponentBusHandler.names index 9d69acdc02..ddb3349d59 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/NetworkTestPlayerComponentBusHandler.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/NetworkTestPlayerComponentBusHandler.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "NetworkTestPlayerComponentBusHandler", + "base": "NetworkTestPlayerComponentBusHandler", "context": "EBusHandler", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "CreateInput", + "base": "CreateInput", "details": { "name": "Create Input" }, @@ -32,7 +32,7 @@ ] }, { - "key": "ProcessInput", + "base": "ProcessInput", "details": { "name": "Process Input" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/ProfilingCaptureNotificationBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/ProfilingCaptureNotificationBus.names index d1e76ba23a..d02dcfb1a0 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/ProfilingCaptureNotificationBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/ProfilingCaptureNotificationBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "ProfilingCaptureNotificationBus", + "base": "ProfilingCaptureNotificationBus", "context": "EBusHandler", "variant": "", "details": { @@ -9,7 +9,7 @@ }, "methods": [ { - "key": "OnCaptureQueryTimestampFinished", + "base": "OnCaptureQueryTimestampFinished", "details": { "name": "OnCaptureQueryTimestampFinished" }, @@ -29,7 +29,7 @@ ] }, { - "key": "OnCaptureCpuFrameTimeFinished", + "base": "OnCaptureCpuFrameTimeFinished", "details": { "name": "OnCaptureCpuFrameTimeFinished" }, @@ -49,7 +49,7 @@ ] }, { - "key": "OnCaptureQueryPipelineStatisticsFinished", + "base": "OnCaptureQueryPipelineStatisticsFinished", "details": { "name": "OnCaptureQueryPipelineStatisticsFinished" }, @@ -69,7 +69,7 @@ ] }, { - "key": "OnCaptureBenchmarkMetadataFinished", + "base": "OnCaptureBenchmarkMetadataFinished", "details": { "name": "OnCaptureBenchmarkMetadataFinished" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/ScriptBuildingNotificationBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/ScriptBuildingNotificationBus.names index 08af710bc3..3d501e7ad9 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/ScriptBuildingNotificationBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/ScriptBuildingNotificationBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "ScriptBuildingNotificationBus", + "base": "ScriptBuildingNotificationBus", "context": "EBusHandler", "variant": "", "details": { @@ -9,7 +9,7 @@ }, "methods": [ { - "key": "OnUpdateManifest", + "base": "OnUpdateManifest", "details": { "name": "OnUpdateManifest" }, @@ -31,7 +31,7 @@ ] }, { - "key": "OnPrepareForExport", + "base": "OnPrepareForExport", "details": { "name": "OnPrepareForExport" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/SequenceComponentNotificationBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/SequenceComponentNotificationBus.names index cadb4ef7f1..146d5b4401 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/SequenceComponentNotificationBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/SequenceComponentNotificationBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "SequenceComponentNotificationBus", + "base": "SequenceComponentNotificationBus", "context": "EBusHandler", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "OnStart", + "base": "OnStart", "details": { "name": "On Start", "tooltip": "Called when Sequence starts" @@ -25,7 +25,7 @@ ] }, { - "key": "OnStop", + "base": "OnStop", "details": { "name": "On Stop", "tooltip": "Called when Sequence stops" @@ -40,21 +40,21 @@ ] }, { - "key": "OnPause", + "base": "OnPause", "details": { "name": "On Pause", "tooltip": "Called when Sequence pauses" } }, { - "key": "OnResume", + "base": "OnResume", "details": { "name": "On Resume", "tooltip": "Called when Sequence resumes" } }, { - "key": "OnAbort", + "base": "OnAbort", "details": { "name": "On Abort", "tooltip": "Called when Sequence is aborted" @@ -69,7 +69,7 @@ ] }, { - "key": "OnUpdate", + "base": "OnUpdate", "details": { "name": "On Update", "tooltip": "Called when Sequence is updated. That is, when the current play time changes, or the playback speed changes" @@ -84,7 +84,7 @@ ] }, { - "key": "OnTrackEventTriggered", + "base": "OnTrackEventTriggered", "details": { "name": "On Track Event Triggered", "tooltip": "Called when Sequence Event is triggered" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/ShapeComponentNotificationsBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/ShapeComponentNotificationsBus.names index 8041830dff..5a3a4ae797 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/ShapeComponentNotificationsBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/ShapeComponentNotificationsBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "ShapeComponentNotificationsBus", + "base": "ShapeComponentNotificationsBus", "context": "EBusHandler", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "OnShapeChanged", + "base": "OnShapeChanged", "details": { "name": "On Shape Changed" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/SimpleStateComponentNotificationBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/SimpleStateComponentNotificationBus.names index 2fe77025c7..3c198f9de5 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/SimpleStateComponentNotificationBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/SimpleStateComponentNotificationBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "SimpleStateComponentNotificationBus", + "base": "SimpleStateComponentNotificationBus", "context": "EBusHandler", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "OnStateChanged", + "base": "OnStateChanged", "details": { "name": "On State Changed", "tooltip": "Notifies that the state has changed from state oldName to state newName" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/SpawnerComponentNotificationBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/SpawnerComponentNotificationBus.names index ce3f913622..31f0b8a34f 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/SpawnerComponentNotificationBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/SpawnerComponentNotificationBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "SpawnerComponentNotificationBus", + "base": "SpawnerComponentNotificationBus", "context": "EBusHandler", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "OnSpawnBegin", + "base": "OnSpawnBegin", "details": { "name": "On Spawn Begin" }, @@ -24,7 +24,7 @@ ] }, { - "key": "OnSpawnEnd", + "base": "OnSpawnEnd", "details": { "name": "On Spawn End" }, @@ -38,7 +38,7 @@ ] }, { - "key": "OnEntitySpawned", + "base": "OnEntitySpawned", "details": { "name": "On Entity Spawned" }, @@ -59,7 +59,7 @@ ] }, { - "key": "OnSpawnedSliceDestroyed", + "base": "OnSpawnedSliceDestroyed", "details": { "name": "On Spawned Slice Destroyed" }, @@ -73,7 +73,7 @@ ] }, { - "key": "OnEntitiesSpawned", + "base": "OnEntitiesSpawned", "details": { "name": "On Entities Spawned" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/SubmarineEvents.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/SubmarineEvents.names index a2e75129cf..93469fc2e1 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/SubmarineEvents.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/SubmarineEvents.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "SubmarineEvents", + "base": "SubmarineEvents", "context": "EBusHandler", "variant": "", "details": { @@ -9,7 +9,7 @@ }, "methods": [ { - "key": "SetSpeed", + "base": "SetSpeed", "details": { "name": "SetSpeed" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/TagComponentNotificationsBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/TagComponentNotificationsBus.names index 1fc8a7cdab..9067ed5694 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/TagComponentNotificationsBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/TagComponentNotificationsBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "TagComponentNotificationsBus", + "base": "TagComponentNotificationsBus", "context": "EBusHandler", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "OnTagAdded", + "base": "OnTagAdded", "details": { "name": "On Tag Added", "tooltip": "Executes when a tag is added to the source entity" @@ -26,7 +26,7 @@ ] }, { - "key": "OnTagRemoved", + "base": "OnTagRemoved", "details": { "name": "On Tag Removed", "tooltip": "Executes when a tag is removed from the source entity" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/TagGlobalNotificationBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/TagGlobalNotificationBus.names index e5b8179b69..e1a74900be 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/TagGlobalNotificationBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/TagGlobalNotificationBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "TagGlobalNotificationBus", + "base": "TagGlobalNotificationBus", "context": "EBusHandler", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "OnEntityTagAdded", + "base": "OnEntityTagAdded", "details": { "name": "On Entity Tag Added", "tooltip": "Executes when the specified source tag is added to any entity" @@ -26,7 +26,7 @@ ] }, { - "key": "OnEntityTagRemoved", + "base": "OnEntityTagRemoved", "details": { "name": "On Entity Tag Removed", "tooltip": "Executes when the specified source tag is removed from any entity" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/TickBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/TickBus.names index 5144e771d3..690529859a 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/TickBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/TickBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "TickBus", + "base": "TickBus", "context": "EBusHandler", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "OnTick", + "base": "OnTick", "details": { "name": "On Tick", "tooltip": "Signals that the application has issued a tick" @@ -33,7 +33,7 @@ ] }, { - "key": "GetTickOrder", + "base": "GetTickOrder", "details": { "name": "Get Tick Order", "tooltip": "Specifies the order in which a handler receives tick events relative to other handlers" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/ToolsApplicationNotificationBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/ToolsApplicationNotificationBus.names index 9572139c16..7829467814 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/ToolsApplicationNotificationBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/ToolsApplicationNotificationBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "ToolsApplicationNotificationBus", + "base": "ToolsApplicationNotificationBus", "context": "EBusHandler", "variant": "", "details": { @@ -9,7 +9,7 @@ }, "methods": [ { - "key": "EntityRegistered", + "base": "EntityRegistered", "details": { "name": "EntityRegistered" }, @@ -24,7 +24,7 @@ ] }, { - "key": "EntityDeregistered", + "base": "EntityDeregistered", "details": { "name": "EntityDeregistered" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/TraceMessageBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/TraceMessageBus.names index 0d01423428..3f5bb30372 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/TraceMessageBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/TraceMessageBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "TraceMessageBus", + "base": "TraceMessageBus", "context": "EBusHandler", "variant": "", "details": { @@ -9,7 +9,7 @@ }, "methods": [ { - "key": "OnPreAssert", + "base": "OnPreAssert", "details": { "name": "OnPreAssert" }, @@ -49,7 +49,7 @@ ] }, { - "key": "OnPreError", + "base": "OnPreError", "details": { "name": "OnPreError" }, @@ -95,7 +95,7 @@ ] }, { - "key": "OnPreWarning", + "base": "OnPreWarning", "details": { "name": "OnPreWarning" }, @@ -141,7 +141,7 @@ ] }, { - "key": "OnAssert", + "base": "OnAssert", "details": { "name": "OnAssert" }, @@ -163,7 +163,7 @@ ] }, { - "key": "OnError", + "base": "OnError", "details": { "name": "OnError" }, @@ -191,7 +191,7 @@ ] }, { - "key": "OnWarning", + "base": "OnWarning", "details": { "name": "OnWarning" }, @@ -219,7 +219,7 @@ ] }, { - "key": "OnException", + "base": "OnException", "details": { "name": "OnException" }, @@ -241,7 +241,7 @@ ] }, { - "key": "OnPrintf", + "base": "OnPrintf", "details": { "name": "OnPrintf" }, @@ -269,7 +269,7 @@ ] }, { - "key": "OnOutput", + "base": "OnOutput", "details": { "name": "OnOutput" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/TransformNotificationBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/TransformNotificationBus.names index 88090b8a30..aefaab4035 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/TransformNotificationBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/TransformNotificationBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "TransformNotificationBus", + "base": "TransformNotificationBus", "context": "EBusHandler", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "OnTransformChanged", + "base": "OnTransformChanged", "details": { "name": "On Transform Changed", "tooltip": "Signals that the local or world transform of the entity changed" @@ -33,7 +33,7 @@ ] }, { - "key": "OnParentChanged", + "base": "OnParentChanged", "details": { "name": "On Parent Changed", "tooltip": "Signals that the parent of the entity changed" @@ -56,7 +56,7 @@ ] }, { - "key": "OnChildAdded", + "base": "OnChildAdded", "details": { "name": "On Child Added", "tooltip": "Signals that a child was added to the entity" @@ -72,7 +72,7 @@ ] }, { - "key": "OnChildRemoved", + "base": "OnChildRemoved", "details": { "name": "On Child Removed", "tooltip": "Signals that a child was removed from the entity" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/TriggerNotificationBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/TriggerNotificationBus.names index 726763e12e..a78fcf4dc4 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/TriggerNotificationBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/TriggerNotificationBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "TriggerNotificationBus", + "base": "TriggerNotificationBus", "context": "EBusHandler", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "OnTriggerEnter", + "base": "OnTriggerEnter", "details": { "name": "On Trigger Enter", "tooltip": "Triggered when another collider enters this trigger" @@ -26,7 +26,7 @@ ] }, { - "key": "OnTriggerExit", + "base": "OnTriggerExit", "details": { "name": "On Trigger Exit", "tooltip": "Triggered when another collider exits this trigger" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiAnimationNotificationBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiAnimationNotificationBus.names index cb4411af2f..06a9ed1f38 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiAnimationNotificationBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiAnimationNotificationBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "UiAnimationNotificationBus", + "base": "UiAnimationNotificationBus", "context": "EBusHandler", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "OnUiAnimationEvent", + "base": "OnUiAnimationEvent", "details": { "name": "On Animation Event", "tooltip": "Executes when an animation event occurs" @@ -33,7 +33,7 @@ ] }, { - "key": "OnUiTrackEvent", + "base": "OnUiTrackEvent", "details": { "name": "OnUiTrackEvent" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiButtonNotificationBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiButtonNotificationBus.names index 3e4f19f235..7e36a2ba20 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiButtonNotificationBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiButtonNotificationBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "UiButtonNotificationBus", + "base": "UiButtonNotificationBus", "context": "EBusHandler", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "OnButtonClick", + "base": "OnButtonClick", "details": { "name": "On Button Click", "tooltip": "Executes when the button has been clicked" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiCanvasAssetRefNotificationBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiCanvasAssetRefNotificationBus.names index de65b7363a..15e2b87526 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiCanvasAssetRefNotificationBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiCanvasAssetRefNotificationBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "UiCanvasAssetRefNotificationBus", + "base": "UiCanvasAssetRefNotificationBus", "context": "EBusHandler", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "OnCanvasLoadedIntoEntity", + "base": "OnCanvasLoadedIntoEntity", "details": { "name": "On Canvas Loaded Into Entity", "tooltip": "Executes when the canvas asset reference loads a canvas" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiCanvasInputNotificationBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiCanvasInputNotificationBus.names index 597f57c4f2..86d7ff6b69 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiCanvasInputNotificationBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiCanvasInputNotificationBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "UiCanvasInputNotificationBus", + "base": "UiCanvasInputNotificationBus", "context": "EBusHandler", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "OnCanvasPrimaryPressed", + "base": "OnCanvasPrimaryPressed", "details": { "name": "On Canvas Primary Pressed", "tooltip": "Executes on a positional input press" @@ -26,7 +26,7 @@ ] }, { - "key": "OnCanvasPrimaryReleased", + "base": "OnCanvasPrimaryReleased", "details": { "name": "On Canvas Primary Released", "tooltip": "Executes on a positional input release" @@ -42,7 +42,7 @@ ] }, { - "key": "OnCanvasMultiTouchPressed", + "base": "OnCanvasMultiTouchPressed", "details": { "name": "On Canvas Multi-touch Pressed", "tooltip": "Executes on a positional input press" @@ -65,7 +65,7 @@ ] }, { - "key": "OnCanvasMultiTouchReleased", + "base": "OnCanvasMultiTouchReleased", "details": { "name": "On Canvas Multi-touch Released", "tooltip": "Executes on a positional input release" @@ -88,7 +88,7 @@ ] }, { - "key": "OnCanvasHoverStart", + "base": "OnCanvasHoverStart", "details": { "name": "On Canvas Hover Start", "tooltip": "Executes when an element starts being hovered" @@ -104,7 +104,7 @@ ] }, { - "key": "OnCanvasHoverEnd", + "base": "OnCanvasHoverEnd", "details": { "name": "On Canvas Hover End", "tooltip": "Executes when an element ends being hovered" @@ -120,7 +120,7 @@ ] }, { - "key": "OnCanvasEnterPressed", + "base": "OnCanvasEnterPressed", "details": { "name": "On Canvas Enter Pressed", "tooltip": "Executes when the “enter” key is pressed" @@ -136,7 +136,7 @@ ] }, { - "key": "OnCanvasEnterReleased", + "base": "OnCanvasEnterReleased", "details": { "name": "On Canvas Enter Released", "tooltip": "Executes when the enter key is released" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiCanvasNotificationBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiCanvasNotificationBus.names index 662890e4d3..e919f654c7 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiCanvasNotificationBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiCanvasNotificationBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "UiCanvasNotificationBus", + "base": "UiCanvasNotificationBus", "context": "EBusHandler", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "OnAction", + "base": "OnAction", "details": { "name": "On Action", "tooltip": "Executes when the canvas sends an action" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiCanvasRefNotificationBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiCanvasRefNotificationBus.names index 79b4773d25..9677c9241a 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiCanvasRefNotificationBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiCanvasRefNotificationBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "UiCanvasRefNotificationBus", + "base": "UiCanvasRefNotificationBus", "context": "EBusHandler", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "OnCanvasRefChanged", + "base": "OnCanvasRefChanged", "details": { "name": "On Canvas Ref Changed", "tooltip": "Executes when the canvas referenced by a UiCanvasAssetRefComponent has changed. This can happen when \"Load Canvas\", \"Unload Canvas\", or \"Set Canvas Ref Entity\" is called" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiCheckboxNotificationBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiCheckboxNotificationBus.names index f7c17fcac3..d64769915e 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiCheckboxNotificationBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiCheckboxNotificationBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "UiCheckboxNotificationBus", + "base": "UiCheckboxNotificationBus", "context": "EBusHandler", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "OnCheckboxStateChange", + "base": "OnCheckboxStateChange", "details": { "name": "On Checkbox State Change", "tooltip": "Executes when the checkbox state has changed" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiDraggableNotificationBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiDraggableNotificationBus.names index e4460fb79c..6fa083ccf6 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiDraggableNotificationBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiDraggableNotificationBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "UiDraggableNotificationBus", + "base": "UiDraggableNotificationBus", "context": "EBusHandler", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "OnDragStart", + "base": "OnDragStart", "details": { "name": "On Drag Start", "tooltip": "Executes when dragging is detected on the draggable component. For mouse or touch input, this occurs when movement has been detected after the press or touch" @@ -26,7 +26,7 @@ ] }, { - "key": "OnDrag", + "base": "OnDrag", "details": { "name": "On Drag", "tooltip": "Executes each time the drag position changes during dragging. \"On Drag\" events happen only between \"On Drag Start\" and \"On Drag End\" events" @@ -42,7 +42,7 @@ ] }, { - "key": "OnDragEnd", + "base": "OnDragEnd", "details": { "name": "On Drag End", "tooltip": "Executes at the end of dragging when the release input event occurs. The \"On Drag End\" notification is sent before the \"On Drop\" drop target notification" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiDropTargetNotificationBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiDropTargetNotificationBus.names index efd1277d08..1cc9259db4 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiDropTargetNotificationBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiDropTargetNotificationBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "UiDropTargetNotificationBus", + "base": "UiDropTargetNotificationBus", "context": "EBusHandler", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "OnDropHoverStart", + "base": "OnDropHoverStart", "details": { "name": "On Drop Hover Start", "tooltip": "Executes when the focus starts to be on the drop target during dragging" @@ -26,7 +26,7 @@ ] }, { - "key": "OnDropHoverEnd", + "base": "OnDropHoverEnd", "details": { "name": "On Drop Hover End", "tooltip": "Executes when the focus stops being on the drop target during dragging" @@ -42,7 +42,7 @@ ] }, { - "key": "OnDrop", + "base": "OnDrop", "details": { "name": "On Drop", "tooltip": "Executes when a draggable element is dropped on the drop target. Implement the game logic of what should happen on drag and drop here" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiDropdownNotificationBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiDropdownNotificationBus.names index 2bf6ab7674..be7c62fbb6 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiDropdownNotificationBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiDropdownNotificationBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "UiDropdownNotificationBus", + "base": "UiDropdownNotificationBus", "context": "EBusHandler", "variant": "", "details": { @@ -10,21 +10,21 @@ }, "methods": [ { - "key": "OnDropdownExpanded", + "base": "OnDropdownExpanded", "details": { "name": "On Dropdown Expanded", "tooltip": "Executes when the dropdown is expanded" } }, { - "key": "OnDropdownCollapsed", + "base": "OnDropdownCollapsed", "details": { "name": "On Dropdown Collapsed", "tooltip": "Executes when the dropdown is collapsed" } }, { - "key": "OnDropdownValueChanged", + "base": "OnDropdownValueChanged", "details": { "name": "On Dropdown Value Changed", "tooltip": "Executes when an option is selected" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiDropdownOptionNotificationBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiDropdownOptionNotificationBus.names index ae0dfa4c70..f285f552a0 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiDropdownOptionNotificationBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiDropdownOptionNotificationBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "UiDropdownOptionNotificationBus", + "base": "UiDropdownOptionNotificationBus", "context": "EBusHandler", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "OnDropdownOptionSelected", + "base": "OnDropdownOptionSelected", "details": { "name": "On Dropdown Option Selected", "tooltip": "Executes when the dropdown option was selected" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiDynamicScrollBoxDataBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiDynamicScrollBoxDataBus.names index 2f3c04119f..19407e35ea 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiDynamicScrollBoxDataBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiDynamicScrollBoxDataBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "UiDynamicScrollBoxDataBus", + "base": "UiDynamicScrollBoxDataBus", "context": "EBusHandler", "variant": "", "details": { @@ -11,7 +11,7 @@ }, "methods": [ { - "key": "GetNumElements", + "base": "GetNumElements", "details": { "name": "Get Number Of Elements", "tooltip": "Gets the number of elements in the list. Called when the list is being constructed (in the component's InGamePostActivate or when RefreshContent is being called explicitly). Used with lists that are not divided into sections" @@ -26,7 +26,7 @@ ] }, { - "key": "GetElementWidth", + "base": "GetElementWidth", "details": { "name": "Get Element Width", "tooltip": "Gets the width of an element at the specified index. Called when an element’s size is needed by a horizontal list of variable element sizes, and the “auto calculate size” option is disabled. Used with lists that are not divided into sections" @@ -51,7 +51,7 @@ ] }, { - "key": "GetElementHeight", + "base": "GetElementHeight", "details": { "name": "Get Element Height", "tooltip": "Gets the height of an element at the specified index. Called when an element’s size is needed by a vertical list of variable element sizes, and the “auto calculate size” option is disabled. Used with lists that are not divided into sections" @@ -76,7 +76,7 @@ ] }, { - "key": "GetNumSections", + "base": "GetNumSections", "details": { "name": "Get Number Of Sections", "tooltip": "Gets the number of sections in the list. Called when the list is being constructed (in the component's InGamePostActivate or when RefreshContent is being called explicitly). Used with lists that are divided into section" @@ -91,7 +91,7 @@ ] }, { - "key": "GetNumElementsInSection", + "base": "GetNumElementsInSection", "details": { "name": "Get Num Elements in Section", "tooltip": "Gets the number of elements in the specified section. Called when the list is being constructed (in the component's InGamePostActivate or when RefreshContent is being called explicitly). Used with lists that are divided into sections" @@ -116,7 +116,7 @@ ] }, { - "key": "GetElementInSectionWidth", + "base": "GetElementInSectionWidth", "details": { "name": "Get Element In Section Width", "tooltip": "Gets the width of an element at the specified section and element index. Called when an element’s size is needed by a horizontal list of variable element sizes, and the “auto calculate size” option is disabled. Used with lists that are divided into sections" @@ -148,7 +148,7 @@ ] }, { - "key": "GetElementInSectionHeight", + "base": "GetElementInSectionHeight", "details": { "name": "Get Element In Section Height", "tooltip": "Gets the height of an element at the specified section and element index. Called when an element’s size is needed by a vertical list of variable element sizes, and the “auto calculate size” option is disabled. Used with lists that are divided into sections" @@ -180,7 +180,7 @@ ] }, { - "key": "GetSectionHeaderWidth", + "base": "GetSectionHeaderWidth", "details": { "name": "Get Section Header Width", "tooltip": "Gets the width of a header at the specified section. Called when a header’s size is needed by a horizontal list of variable header sizes, and the “auto calculate size” option is disabled. Used with lists that are divided into sections" @@ -205,7 +205,7 @@ ] }, { - "key": "GetSectionHeaderHeight", + "base": "GetSectionHeaderHeight", "details": { "name": "Get Section Header Height", "tooltip": "Gets the height of a header at the specified section. Called when a header's size is needed by a vertical list of variable header sizes, and the “auto calculate size” option is disabled. Used with lists that are divided into sections" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiDynamicScrollBoxElementNotificationBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiDynamicScrollBoxElementNotificationBus.names index 5c0f5a4c26..3978c48472 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiDynamicScrollBoxElementNotificationBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiDynamicScrollBoxElementNotificationBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "UiDynamicScrollBoxElementNotificationBus", + "base": "UiDynamicScrollBoxElementNotificationBus", "context": "EBusHandler", "variant": "", "details": { @@ -11,7 +11,7 @@ }, "methods": [ { - "key": "OnElementBecomingVisible", + "base": "OnElementBecomingVisible", "details": { "name": "On Element Becoming Visible", "tooltip": "Executes when a child of the scroll box is about to become visible. Use this event to populate the child with data for display" @@ -34,7 +34,7 @@ ] }, { - "key": "OnPrepareElementForSizeCalculation", + "base": "OnPrepareElementForSizeCalculation", "details": { "name": "On Prepare Element For Size Calculation", "tooltip": "Executes when elements have variable sizes and are set to auto calculate. Used with lists that are not divided into sections" @@ -57,7 +57,7 @@ ] }, { - "key": "OnElementInSectionBecomingVisible", + "base": "OnElementInSectionBecomingVisible", "details": { "name": "On Element In Section Becoming Visible", "tooltip": "Executes when an element in a section is about to become visible. Used to populate the element with data for display. Used with lists that are divided into sections" @@ -87,7 +87,7 @@ ] }, { - "key": "OnPrepareElementInSectionForSizeCalculation", + "base": "OnPrepareElementInSectionForSizeCalculation", "details": { "name": "On Prepare Element In Section For Size Calculation", "tooltip": "Executes when elements in sections have variable sizes and are set to auto calculate. Used with lists that are divided into sections" @@ -117,7 +117,7 @@ ] }, { - "key": "OnSectionHeaderBecomingVisible", + "base": "OnSectionHeaderBecomingVisible", "details": { "name": "On Section Header Becoming Visible", "tooltip": "Executes when a header is about to become visible. Used to populate the header with data for display. Used with lists that are divided into sections" @@ -140,7 +140,7 @@ ] }, { - "key": "OnPrepareSectionHeaderForSizeCalculation", + "base": "OnPrepareSectionHeaderForSizeCalculation", "details": { "name": "On Prepare Section Header For Size Calculation", "tooltip": "Executes when headers have variable sizes and are set to auto calculate. Used with lists that are divided into sections" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiFaderNotificationBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiFaderNotificationBus.names index b400fcc52b..b6ad05a4e5 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiFaderNotificationBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiFaderNotificationBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "UiFaderNotificationBus", + "base": "UiFaderNotificationBus", "context": "EBusHandler", "variant": "", "details": { @@ -10,21 +10,21 @@ }, "methods": [ { - "key": "OnFadeComplete", + "base": "OnFadeComplete", "details": { "name": "On Fade Complete", "tooltip": "Executes when the fade is done" } }, { - "key": "OnFadeInterrupted", + "base": "OnFadeInterrupted", "details": { "name": "On Fade Interrupted", "tooltip": "Executes when the fade has been interrupted" } }, { - "key": "OnFaderDestroyed", + "base": "OnFaderDestroyed", "details": { "name": "On Fader Destroyed", "tooltip": "Executes when the fader component has been destroyed" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiFlipbookAnimationNotificationsBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiFlipbookAnimationNotificationsBus.names index 674ccb7ff5..8446eb9b12 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiFlipbookAnimationNotificationsBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiFlipbookAnimationNotificationsBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "UiFlipbookAnimationNotificationsBus", + "base": "UiFlipbookAnimationNotificationsBus", "context": "EBusHandler", "variant": "", "details": { @@ -10,21 +10,21 @@ }, "methods": [ { - "key": "OnAnimationStarted", + "base": "OnAnimationStarted", "details": { "name": "On Animation Started", "tooltip": "Executes when the flipbook animation has begun playing" } }, { - "key": "OnAnimationStopped", + "base": "OnAnimationStopped", "details": { "name": "On Animation Stopped", "tooltip": "Executes when the flipbook animation has stopped playing" } }, { - "key": "OnLoopSequenceCompleted", + "base": "OnLoopSequenceCompleted", "details": { "name": "On Loop Sequence Completed", "tooltip": "Executes when the flipbook animation has completed one loop iteration. This triggers only when the \"Loop Type\" of the flipbook animation is configured to anything other than \"None\".\n\nFor \"Linear\" loops, this triggers when \"End Frame\" is displayed.\n\nFor \"Ping Pong\" loops, this triggers when either \"Start Frame\" or \"End Frame\" is displayed (depending on the current loop direction of the loop)" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiInitializationBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiInitializationBus.names index 7231f093d9..074d8dd7b9 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiInitializationBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiInitializationBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "UiInitializationBus", + "base": "UiInitializationBus", "context": "EBusHandler", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "InGamePostActivate", + "base": "InGamePostActivate", "details": { "name": "In-game Post-activate", "tooltip": "Executes after all loaded UI elements have been activated and their parent and canvas references fixed-up" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiInteractableNotificationBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiInteractableNotificationBus.names index 07aec6b83a..635630c1b0 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiInteractableNotificationBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiInteractableNotificationBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "UiInteractableNotificationBus", + "base": "UiInteractableNotificationBus", "context": "EBusHandler", "variant": "", "details": { @@ -10,35 +10,35 @@ }, "methods": [ { - "key": "OnHoverStart", + "base": "OnHoverStart", "details": { "name": "On Hover Start", "tooltip": "Executes when the interactive element starts being hovered" } }, { - "key": "OnHoverEnd", + "base": "OnHoverEnd", "details": { "name": "On Hover End", "tooltip": "Executes when the interactive element ends being hovered" } }, { - "key": "OnPressed", + "base": "OnPressed", "details": { "name": "On Pressed", "tooltip": "Executes when the interactive element has been pressed" } }, { - "key": "OnReleased", + "base": "OnReleased", "details": { "name": "On Released", "tooltip": "Executes when the interactive element has been released" } }, { - "key": "OnReceivedHoverByNavigatingFromDescendant", + "base": "OnReceivedHoverByNavigatingFromDescendant", "details": { "name": "On Received Hover By Navigating From Descendant", "tooltip": "Executes when the interactive element receives the hover by being navigated to from a descendant" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiMarkupButtonNotificationsBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiMarkupButtonNotificationsBus.names index 435af88d0a..6d3b96553c 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiMarkupButtonNotificationsBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiMarkupButtonNotificationsBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "UiMarkupButtonNotificationsBus", + "base": "UiMarkupButtonNotificationsBus", "context": "EBusHandler", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "OnHoverStart", + "base": "OnHoverStart", "details": { "name": "On Hover Start", "tooltip": "Executes when the button has become hovered" @@ -40,7 +40,7 @@ ] }, { - "key": "OnHoverEnd", + "base": "OnHoverEnd", "details": { "name": "On Hover End", "tooltip": "Executes when the button is no longer hovered" @@ -70,7 +70,7 @@ ] }, { - "key": "OnPressed", + "base": "OnPressed", "details": { "name": "On Pressed", "tooltip": "Executes when the button receives a press event" @@ -100,7 +100,7 @@ ] }, { - "key": "OnReleased", + "base": "OnReleased", "details": { "name": "On Released", "tooltip": "Executes when the button receives a release event" @@ -130,7 +130,7 @@ ] }, { - "key": "OnClick", + "base": "OnClick", "details": { "name": "On Click", "tooltip": "Executes when the button is clicked (a release on the button following a press on the button)" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiRadioButtonGroupNotificationBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiRadioButtonGroupNotificationBus.names index bf3f1b1bc1..d21eb84512 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiRadioButtonGroupNotificationBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiRadioButtonGroupNotificationBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "UiRadioButtonGroupNotificationBus", + "base": "UiRadioButtonGroupNotificationBus", "context": "EBusHandler", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "OnRadioButtonGroupStateChange", + "base": "OnRadioButtonGroupStateChange", "details": { "name": "On Radio Button Group State Change", "tooltip": "Executes when the radio button group state has changed" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiRadioButtonNotificationBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiRadioButtonNotificationBus.names index 4c15af7a33..7219cce771 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiRadioButtonNotificationBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiRadioButtonNotificationBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "UiRadioButtonNotificationBus", + "base": "UiRadioButtonNotificationBus", "context": "EBusHandler", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "OnRadioButtonStateChange", + "base": "OnRadioButtonStateChange", "details": { "name": "On RadioButton State Change", "tooltip": "Executes when the radio button state has changed" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiScrollBoxNotificationBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiScrollBoxNotificationBus.names index acad307dbb..9e8a042255 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiScrollBoxNotificationBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiScrollBoxNotificationBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "UiScrollBoxNotificationBus", + "base": "UiScrollBoxNotificationBus", "context": "EBusHandler", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "OnScrollOffsetChanging", + "base": "OnScrollOffsetChanging", "details": { "name": "On Scroll Offset Changing", "tooltip": "Executes when the scroll offset is changing" @@ -26,7 +26,7 @@ ] }, { - "key": "OnScrollOffsetChanged", + "base": "OnScrollOffsetChanged", "details": { "name": "On Scroll Offset Changed", "tooltip": "Executes when the scroll offset has changed" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiScrollableNotificationBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiScrollableNotificationBus.names index 5de1e45ad6..7c4092175c 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiScrollableNotificationBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiScrollableNotificationBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "UiScrollableNotificationBus", + "base": "UiScrollableNotificationBus", "context": "EBusHandler", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "OnScrollableValueChanging", + "base": "OnScrollableValueChanging", "details": { "name": "On Scrollable Value Changing", "tooltip": "Executes when the scroll value is changing" @@ -26,7 +26,7 @@ ] }, { - "key": "OnScrollableValueChanged", + "base": "OnScrollableValueChanged", "details": { "name": "On Scrollable Value Changed", "tooltip": "Executes when the scroll value has changed" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiScrollerNotificationBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiScrollerNotificationBus.names index a12b67ac57..fc5e701451 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiScrollerNotificationBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiScrollerNotificationBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "UiScrollerNotificationBus", + "base": "UiScrollerNotificationBus", "context": "EBusHandler", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "OnScrollerValueChanging", + "base": "OnScrollerValueChanging", "details": { "name": "On Scroller Value Changing", "tooltip": "Executes when the scroller value is changing" @@ -26,7 +26,7 @@ ] }, { - "key": "OnScrollerValueChanged", + "base": "OnScrollerValueChanged", "details": { "name": "On Scroller Value Changed", "tooltip": "Executes when the scroller value has changed" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiSliderNotificationBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiSliderNotificationBus.names index 76c9fde12a..770ca8d183 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiSliderNotificationBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiSliderNotificationBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "UiSliderNotificationBus", + "base": "UiSliderNotificationBus", "context": "EBusHandler", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "OnSliderValueChanging", + "base": "OnSliderValueChanging", "details": { "name": "On Slider Value Changing", "tooltip": "Executes when the slider value is changing" @@ -26,7 +26,7 @@ ] }, { - "key": "OnSliderValueChanged", + "base": "OnSliderValueChanged", "details": { "name": "On Slider Value Changed", "tooltip": "Executes when the slider value has finished changing" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiSpawnerNotificationBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiSpawnerNotificationBus.names index 9c3bb637ec..e78828f936 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiSpawnerNotificationBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiSpawnerNotificationBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "UiSpawnerNotificationBus", + "base": "UiSpawnerNotificationBus", "context": "EBusHandler", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "OnSpawnBegin", + "base": "OnSpawnBegin", "details": { "name": "On Spawn Begin", "tooltip": "Executes when the slice has been spawned, but entities have not yet been activated. \"On Entity Spawned\" events are about to be dispatched" @@ -26,7 +26,7 @@ ] }, { - "key": "OnEntitySpawned", + "base": "OnEntitySpawned", "details": { "name": "On Entity Spawned", "tooltip": "Executes when an entity has been created during a spawn. Called once for each entity created while spawning a slice" @@ -49,7 +49,7 @@ ] }, { - "key": "OnEntitiesSpawned", + "base": "OnEntitiesSpawned", "details": { "name": "On Entities Spawned", "tooltip": "Executes when all entities have been created during a spawn.\n\nCalled only once for each spawn request. Called after the \"On Entity Spawned\" calls and before the \"On Spawn End\" call" @@ -72,7 +72,7 @@ ] }, { - "key": "OnTopLevelEntitiesSpawned", + "base": "OnTopLevelEntitiesSpawned", "details": { "name": "On Top Level Entities Spawned", "tooltip": "Executes when all top-level entities have been created during the spawn.\n\nTop-level entities are entities that do not have any parent within the slice. Typically, there is only one top-level entity for each slice.\n\nCalled only once for each spawn request. Called after the \"On Entity Spawned\" calls and before the \"On Spawn End\" call" @@ -95,7 +95,7 @@ ] }, { - "key": "OnSpawnEnd", + "base": "OnSpawnEnd", "details": { "name": "On Spawn End", "tooltip": "Executes when a slice has been spawned. Called once for each spawn request. All \"On Entity Spawned\" events have been dispatched" @@ -111,7 +111,7 @@ ] }, { - "key": "OnSpawnFailed", + "base": "OnSpawnFailed", "details": { "name": "On Spawn Failed", "tooltip": "Executes when a spawn request has failed" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiTextInputNotificationBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiTextInputNotificationBus.names index 4bc897df5d..b5ad552ef1 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiTextInputNotificationBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiTextInputNotificationBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "UiTextInputNotificationBus", + "base": "UiTextInputNotificationBus", "context": "EBusHandler", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "OnTextInputChange", + "base": "OnTextInputChange", "details": { "name": "On Text Input Change", "tooltip": "Executes when a character is added, removed, or changed" @@ -26,7 +26,7 @@ ] }, { - "key": "OnTextInputEndEdit", + "base": "OnTextInputEndEdit", "details": { "name": "On Text Input End Edit", "tooltip": "Executes when edit of text is completed" @@ -42,7 +42,7 @@ ] }, { - "key": "OnTextInputEnter", + "base": "OnTextInputEnter", "details": { "name": "On Text Input Enter", "tooltip": "Executes when \"Enter\" is pressed on the keyboard" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/VariableNotification.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/VariableNotification.names index 486694b4bb..3ef35b24b7 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/VariableNotification.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/VariableNotification.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "VariableNotification", + "base": "VariableNotification", "context": "EBusHandler", "variant": "", "details": { @@ -11,7 +11,7 @@ }, "methods": [ { - "key": "OnVariableValueChanged", + "base": "OnVariableValueChanged", "details": { "name": "On Variable Value Changed" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/ViewPaneCallbackBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/ViewPaneCallbackBus.names index b77d3caf75..45bbf4cbc9 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/ViewPaneCallbackBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/ViewPaneCallbackBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "ViewPaneCallbackBus", + "base": "ViewPaneCallbackBus", "context": "EBusHandler", "variant": "", "details": { @@ -9,7 +9,7 @@ }, "methods": [ { - "key": "CreateViewPaneWidget", + "base": "CreateViewPaneWidget", "details": { "name": "CreateViewPaneWidget" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AWSCognitoAuthorizationRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AWSCognitoAuthorizationRequestBus.names index 9ba441a6c8..3b01bcc40b 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AWSCognitoAuthorizationRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AWSCognitoAuthorizationRequestBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "AWSCognitoAuthorizationRequestBus", + "base": "AWSCognitoAuthorizationRequestBus", "context": "EBusSender", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "Reset", + "base": "Reset", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Reset" @@ -24,7 +24,7 @@ } }, { - "key": "GetIdentityId", + "base": "GetIdentityId", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetIdentityId" @@ -46,7 +46,7 @@ ] }, { - "key": "HasPersistedLogins", + "base": "HasPersistedLogins", "entry": { "name": "In", "tooltip": "When signaled, this will invoke HasPersistedLogins" @@ -68,7 +68,7 @@ ] }, { - "key": "Initialize", + "base": "Initialize", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Initialize" @@ -90,7 +90,7 @@ ] }, { - "key": "RequestAWSCredentialsAsync", + "base": "RequestAWSCredentialsAsync", "entry": { "name": "In", "tooltip": "When signaled, this will invoke RequestAWSCredentialsAsync" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AWSCognitoUserManagementRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AWSCognitoUserManagementRequestBus.names index 932378a747..1c1cab22fd 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AWSCognitoUserManagementRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AWSCognitoUserManagementRequestBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "AWSCognitoUserManagementRequestBus", + "base": "AWSCognitoUserManagementRequestBus", "context": "EBusSender", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "EnableMFAAsync", + "base": "EnableMFAAsync", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Enable MFA Async" @@ -33,7 +33,7 @@ ] }, { - "key": "ConfirmSignUpAsync", + "base": "ConfirmSignUpAsync", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Confirm Sign Up Async" @@ -63,7 +63,7 @@ ] }, { - "key": "PhoneSignUpAsync", + "base": "PhoneSignUpAsync", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Phone Sign Up Async" @@ -100,7 +100,7 @@ ] }, { - "key": "EmailSignUpAsync", + "base": "EmailSignUpAsync", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Email Sign Up Async" @@ -137,7 +137,7 @@ ] }, { - "key": "ConfirmForgotPasswordAsync", + "base": "ConfirmForgotPasswordAsync", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Confirm Forgot Password Async" @@ -174,7 +174,7 @@ ] }, { - "key": "Initialize", + "base": "Initialize", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Initialize" @@ -196,7 +196,7 @@ ] }, { - "key": "ForgotPasswordAsync", + "base": "ForgotPasswordAsync", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Forgot Password Async" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AWSMetricsRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AWSMetricsRequestBus.names index b725fc3de1..99df5e2d5e 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AWSMetricsRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AWSMetricsRequestBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "AWSMetricsRequestBus", + "base": "AWSMetricsRequestBus", "context": "EBusSender", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "SubmitMetrics", + "base": "SubmitMetrics", "entry": { "name": "In", "tooltip": "When signaled, this will invoke SubmitMetrics" @@ -62,7 +62,7 @@ ] }, { - "key": "FlushMetrics", + "base": "FlushMetrics", "entry": { "name": "In", "tooltip": "When signaled, this will invoke FlushMetrics" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AWSResourceMappingRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AWSResourceMappingRequestBus.names index f7ed1d7591..4bda3ef0ff 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AWSResourceMappingRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AWSResourceMappingRequestBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "AWSResourceMappingRequestBus", + "base": "AWSResourceMappingRequestBus", "context": "EBusSender", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetResourceNameId", + "base": "GetResourceNameId", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Resource Name Id" @@ -41,7 +41,7 @@ ] }, { - "key": "GetResourceRegion", + "base": "GetResourceRegion", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Resource Region" @@ -72,7 +72,7 @@ ] }, { - "key": "GetDefaultRegion", + "base": "GetDefaultRegion", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Default Region" @@ -94,7 +94,7 @@ ] }, { - "key": "GetDefaultAccountId", + "base": "GetDefaultAccountId", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Default Account Id" @@ -116,7 +116,7 @@ ] }, { - "key": "GetResourceAccountId", + "base": "GetResourceAccountId", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Resource Account Id" @@ -147,7 +147,7 @@ ] }, { - "key": "GetResourceType", + "base": "GetResourceType", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Resource Type" @@ -178,7 +178,7 @@ ] }, { - "key": "ReloadConfigFile", + "base": "ReloadConfigFile", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Reload Config File" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ActorComponentRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ActorComponentRequestBus.names index 5deea3567a..d40cfe2045 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ActorComponentRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ActorComponentRequestBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "ActorComponentRequestBus", + "base": "ActorComponentRequestBus", "context": "EBusSender", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetRenderCharacter", + "base": "GetRenderCharacter", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Render Character" @@ -32,7 +32,7 @@ ] }, { - "key": "DetachFromEntity", + "base": "DetachFromEntity", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Detach From Entity" @@ -46,7 +46,7 @@ } }, { - "key": "GetRenderActorVisible", + "base": "GetRenderActorVisible", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Render Actor Visible" @@ -68,7 +68,7 @@ ] }, { - "key": "AttachToEntity", + "base": "AttachToEntity", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Attach To Entity" @@ -99,7 +99,7 @@ ] }, { - "key": "SetRenderCharacter", + "base": "SetRenderCharacter", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Render Character" @@ -121,7 +121,7 @@ ] }, { - "key": "GetJointTransform", + "base": "GetJointTransform", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Joint Transform" @@ -158,7 +158,7 @@ ] }, { - "key": "GetJointIndexByName", + "base": "GetJointIndexByName", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Joint Index By Name" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AnimAudioComponentRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AnimAudioComponentRequestBus.names index 3620304e48..25180e8ae7 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AnimAudioComponentRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AnimAudioComponentRequestBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "AnimAudioComponentRequestBus", + "base": "AnimAudioComponentRequestBus", "context": "EBusSender", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "AddTriggerEvent", + "base": "AddTriggerEvent", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Add Trigger Event" @@ -45,7 +45,7 @@ ] }, { - "key": "ClearTriggerEvents", + "base": "ClearTriggerEvents", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Clear Trigger Events" @@ -60,7 +60,7 @@ } }, { - "key": "RemoveTriggerEvent", + "base": "RemoveTriggerEvent", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Remove Trigger Event" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AnimGraphComponentNetworkRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AnimGraphComponentNetworkRequestBus.names index 177eded8e5..865335410e 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AnimGraphComponentNetworkRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AnimGraphComponentNetworkRequestBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "AnimGraphComponentNetworkRequestBus", + "base": "AnimGraphComponentNetworkRequestBus", "context": "EBusSender", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetActiveStates", + "base": "GetActiveStates", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Active States" @@ -32,7 +32,7 @@ ] }, { - "key": "CreateSnapshot", + "base": "CreateSnapshot", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Create Snapshot" @@ -54,7 +54,7 @@ ] }, { - "key": "SetActiveStates", + "base": "SetActiveStates", "entry": { "name": "In", "tooltip": "When signaled, this will invoke SetActiveStates" @@ -76,7 +76,7 @@ ] }, { - "key": "IsAssetReady", + "base": "IsAssetReady", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Is Asset Ready" @@ -98,7 +98,7 @@ ] }, { - "key": "HasSnapshot", + "base": "HasSnapshot", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Has Snapshot" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AnimGraphComponentRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AnimGraphComponentRequestBus.names index 7e0ea4f5fa..976c253f89 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AnimGraphComponentRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AnimGraphComponentRequestBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "AnimGraphComponentRequestBus", + "base": "AnimGraphComponentRequestBus", "context": "EBusSender", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetVisualizeEnabled", + "base": "GetVisualizeEnabled", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Visualize Enabled" @@ -32,7 +32,7 @@ ] }, { - "key": "SetNamedParameterRotation", + "base": "SetNamedParameterRotation", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Named Parameter Rotation" @@ -60,7 +60,7 @@ ] }, { - "key": "SetParameterString", + "base": "SetParameterString", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Parameter String" @@ -88,7 +88,7 @@ ] }, { - "key": "GetNamedParameterString", + "base": "GetNamedParameterString", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Named Parameter String" @@ -118,7 +118,7 @@ ] }, { - "key": "GetNamedParameterVector2", + "base": "GetNamedParameterVector2", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Named Parameter Vector2" @@ -148,7 +148,7 @@ ] }, { - "key": "GetParameterFloat", + "base": "GetParameterFloat", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Parameter Float" @@ -178,7 +178,7 @@ ] }, { - "key": "SetParameterRotation", + "base": "SetParameterRotation", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Parameter Rotation" @@ -206,7 +206,7 @@ ] }, { - "key": "GetNamedParameterFloat", + "base": "GetNamedParameterFloat", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Named Parameter Float" @@ -236,7 +236,7 @@ ] }, { - "key": "SetParameterBool", + "base": "SetParameterBool", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Parameter Bool" @@ -264,7 +264,7 @@ ] }, { - "key": "FindParameterName", + "base": "FindParameterName", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Find Parameter Name" @@ -294,7 +294,7 @@ ] }, { - "key": "GetNamedParameterBool", + "base": "GetNamedParameterBool", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Named Parameter Bool" @@ -324,7 +324,7 @@ ] }, { - "key": "SetParameterFloat", + "base": "SetParameterFloat", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Parameter Float" @@ -352,7 +352,7 @@ ] }, { - "key": "GetParameterVector2", + "base": "GetParameterVector2", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Parameter Vector2" @@ -382,7 +382,7 @@ ] }, { - "key": "GetParameterBool", + "base": "GetParameterBool", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Parameter Bool" @@ -412,7 +412,7 @@ ] }, { - "key": "SetNamedParameterVector3", + "base": "SetNamedParameterVector3", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Named Parameter Vector3" @@ -440,7 +440,7 @@ ] }, { - "key": "FindParameterIndex", + "base": "FindParameterIndex", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Find Parameter Index" @@ -470,7 +470,7 @@ ] }, { - "key": "SetNamedParameterString", + "base": "SetNamedParameterString", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Named Parameter String" @@ -498,7 +498,7 @@ ] }, { - "key": "SetParameterVector3", + "base": "SetParameterVector3", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Parameter Vector3" @@ -526,7 +526,7 @@ ] }, { - "key": "GetParameterVector3", + "base": "GetParameterVector3", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Parameter Vector3" @@ -556,7 +556,7 @@ ] }, { - "key": "SyncAnimGraph", + "base": "SyncAnimGraph", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Sync Anim Graph" @@ -579,7 +579,7 @@ ] }, { - "key": "SetParameterRotationEuler", + "base": "SetParameterRotationEuler", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Parameter Rotation Euler" @@ -607,7 +607,7 @@ ] }, { - "key": "GetParameterRotationEuler", + "base": "GetParameterRotationEuler", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Parameter Rotation Euler" @@ -637,7 +637,7 @@ ] }, { - "key": "GetParameterRotation", + "base": "GetParameterRotation", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Parameter Rotation" @@ -667,7 +667,7 @@ ] }, { - "key": "GetNamedParameterRotationEuler", + "base": "GetNamedParameterRotationEuler", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Named Parameter Rotation Euler" @@ -697,7 +697,7 @@ ] }, { - "key": "DesyncAnimGraph", + "base": "DesyncAnimGraph", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Desync Anim Graph" @@ -720,7 +720,7 @@ ] }, { - "key": "SetNamedParameterRotationEuler", + "base": "SetNamedParameterRotationEuler", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Named Parameter Rotation Euler" @@ -748,7 +748,7 @@ ] }, { - "key": "SetParameterVector2", + "base": "SetParameterVector2", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Parameter Vector2" @@ -776,7 +776,7 @@ ] }, { - "key": "GetNamedParameterRotation", + "base": "GetNamedParameterRotation", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Named Parameter Rotation" @@ -806,7 +806,7 @@ ] }, { - "key": "SetNamedParameterBool", + "base": "SetNamedParameterBool", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Named Parameter Bool" @@ -834,7 +834,7 @@ ] }, { - "key": "SetVisualizeEnabled", + "base": "SetVisualizeEnabled", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Visualize Enabled" @@ -856,7 +856,7 @@ ] }, { - "key": "SetNamedParameterFloat", + "base": "SetNamedParameterFloat", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Named Parameter Float" @@ -884,7 +884,7 @@ ] }, { - "key": "SetNamedParameterVector2", + "base": "SetNamedParameterVector2", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Named Parameter Vector2" @@ -912,7 +912,7 @@ ] }, { - "key": "GetNamedParameterVector3", + "base": "GetNamedParameterVector3", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Named Parameter Vector3" @@ -942,7 +942,7 @@ ] }, { - "key": "GetParameterString", + "base": "GetParameterString", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Parameter String" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ArcBallControllerRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ArcBallControllerRequestBus.names index 9c9ef0b882..293c391360 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ArcBallControllerRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ArcBallControllerRequestBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "ArcBallControllerRequestBus", + "base": "ArcBallControllerRequestBus", "context": "EBusSender", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetPan", + "base": "GetPan", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetPan" @@ -33,7 +33,7 @@ ] }, { - "key": "GetCenter", + "base": "GetCenter", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetCenter" @@ -56,7 +56,7 @@ ] }, { - "key": "SetZoomingSensitivity", + "base": "SetZoomingSensitivity", "entry": { "name": "In", "tooltip": "When signaled, this will invoke SetZoomingSensitivity" @@ -79,7 +79,7 @@ ] }, { - "key": "GetPitch", + "base": "GetPitch", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetPitch" @@ -102,7 +102,7 @@ ] }, { - "key": "SetPanningSensitivity", + "base": "SetPanningSensitivity", "entry": { "name": "In", "tooltip": "When signaled, this will invoke SetPanningSensitivity" @@ -125,7 +125,7 @@ ] }, { - "key": "GetZoomingSensitivity", + "base": "GetZoomingSensitivity", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetZoomingSensitivity" @@ -148,7 +148,7 @@ ] }, { - "key": "SetHeading", + "base": "SetHeading", "entry": { "name": "In", "tooltip": "When signaled, this will invoke SetHeading" @@ -171,7 +171,7 @@ ] }, { - "key": "GetMaxDistance", + "base": "GetMaxDistance", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetMaxDistance" @@ -194,7 +194,7 @@ ] }, { - "key": "SetDistance", + "base": "SetDistance", "entry": { "name": "In", "tooltip": "When signaled, this will invoke SetDistance" @@ -217,7 +217,7 @@ ] }, { - "key": "SetMinDistance", + "base": "SetMinDistance", "entry": { "name": "In", "tooltip": "When signaled, this will invoke SetMinDistance" @@ -240,7 +240,7 @@ ] }, { - "key": "SetMaxDistance", + "base": "SetMaxDistance", "entry": { "name": "In", "tooltip": "When signaled, this will invoke SetMaxDistance" @@ -263,7 +263,7 @@ ] }, { - "key": "GetMinDistance", + "base": "GetMinDistance", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetMinDistance" @@ -286,7 +286,7 @@ ] }, { - "key": "GetHeading", + "base": "GetHeading", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetHeading" @@ -309,7 +309,7 @@ ] }, { - "key": "GetPanningSensitivity", + "base": "GetPanningSensitivity", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetPanningSensitivity" @@ -332,7 +332,7 @@ ] }, { - "key": "SetCenter", + "base": "SetCenter", "entry": { "name": "In", "tooltip": "When signaled, this will invoke SetCenter" @@ -355,7 +355,7 @@ ] }, { - "key": "SetPan", + "base": "SetPan", "entry": { "name": "In", "tooltip": "When signaled, this will invoke SetPan" @@ -378,7 +378,7 @@ ] }, { - "key": "SetPitch", + "base": "SetPitch", "entry": { "name": "In", "tooltip": "When signaled, this will invoke SetPitch" @@ -401,7 +401,7 @@ ] }, { - "key": "GetDistance", + "base": "GetDistance", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetDistance" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AreaLightRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AreaLightRequestBus.names index 3b75eef182..d57b9b6ffe 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AreaLightRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AreaLightRequestBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "AreaLightRequestBus", + "base": "AreaLightRequestBus", "context": "EBusSender", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "SetFilteringSampleCount", + "base": "SetFilteringSampleCount", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Filtering Sample Count" @@ -33,7 +33,7 @@ ] }, { - "key": "SetIntensity", + "base": "SetIntensity", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Intensity" @@ -56,7 +56,7 @@ ] }, { - "key": "SetEsmExponent", + "base": "SetEsmExponent", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Esm Exponent" @@ -79,7 +79,7 @@ ] }, { - "key": "GetOuterShutterAngle", + "base": "GetOuterShutterAngle", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Outer Shutter Angle" @@ -102,7 +102,7 @@ ] }, { - "key": "GetInnerShutterAngle", + "base": "GetInnerShutterAngle", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Inner Shutter Angle" @@ -125,7 +125,7 @@ ] }, { - "key": "SetColor", + "base": "SetColor", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Color" @@ -148,7 +148,7 @@ ] }, { - "key": "SetShadowBias", + "base": "SetShadowBias", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Shadow Bias" @@ -170,7 +170,7 @@ ] }, { - "key": "SetShadowFilterMethod", + "base": "SetShadowFilterMethod", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Shadow Filter Method" @@ -194,7 +194,7 @@ ] }, { - "key": "GetEsmExponent", + "base": "GetEsmExponent", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Esm Exponent" @@ -217,7 +217,7 @@ ] }, { - "key": "SetInnerShutterAngle", + "base": "SetInnerShutterAngle", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Inner Shutter Angle" @@ -240,7 +240,7 @@ ] }, { - "key": "SetEnableShadow", + "base": "SetEnableShadow", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Enable Shadow" @@ -263,7 +263,7 @@ ] }, { - "key": "SetUseFastApproximation", + "base": "SetUseFastApproximation", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Use Fast Approximation" @@ -286,7 +286,7 @@ ] }, { - "key": "GetUseFastApproximation", + "base": "GetUseFastApproximation", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Use Fast Approximation" @@ -309,7 +309,7 @@ ] }, { - "key": "GetFilteringSampleCount", + "base": "GetFilteringSampleCount", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Filtering Sample Count" @@ -332,7 +332,7 @@ ] }, { - "key": "GetEnableShadow", + "base": "GetEnableShadow", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Enable Shadow" @@ -355,7 +355,7 @@ ] }, { - "key": "GetShadowFilterMethod", + "base": "GetShadowFilterMethod", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Shadow Filter Method" @@ -379,7 +379,7 @@ ] }, { - "key": "GetIntensityMode", + "base": "GetIntensityMode", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Intensity Mode" @@ -403,7 +403,7 @@ ] }, { - "key": "GetShadowBias", + "base": "GetShadowBias", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Shadow Bias" @@ -426,7 +426,7 @@ ] }, { - "key": "SetAttenuationRadiusMode", + "base": "SetAttenuationRadiusMode", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Attenuation Radius Mode" @@ -451,7 +451,7 @@ ] }, { - "key": "SetEmitsLightBothDirections", + "base": "SetEmitsLightBothDirections", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Emits Light Both Directions" @@ -473,7 +473,7 @@ ] }, { - "key": "SetEnableShutters", + "base": "SetEnableShutters", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Enable Shutters" @@ -495,7 +495,7 @@ ] }, { - "key": "GetShadowmapMaxSize", + "base": "GetShadowmapMaxSize", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Shadowmap Max Size" @@ -518,7 +518,7 @@ ] }, { - "key": "GetEmitsLightBothDirections", + "base": "GetEmitsLightBothDirections", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Emits Light Both Directions" @@ -540,7 +540,7 @@ ] }, { - "key": "SetOuterShutterAngle", + "base": "SetOuterShutterAngle", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Outer Shutter Angle" @@ -563,7 +563,7 @@ ] }, { - "key": "SetAttenuationRadius", + "base": "SetAttenuationRadius", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Attenuation Radius" @@ -586,7 +586,7 @@ ] }, { - "key": "GetAttenuationRadius", + "base": "GetAttenuationRadius", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Attenuation Radius" @@ -609,7 +609,7 @@ ] }, { - "key": "GetEnableShutters", + "base": "GetEnableShutters", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Enable Shutters" @@ -632,7 +632,7 @@ ] }, { - "key": "GetColor", + "base": "GetColor", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Color" @@ -654,7 +654,7 @@ ] }, { - "key": "ConvertToIntensityMode", + "base": "ConvertToIntensityMode", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Convert To Intensity Mode" @@ -678,7 +678,7 @@ ] }, { - "key": "SetShadowmapMaxSize", + "base": "SetShadowmapMaxSize", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Shadowmap Max Size" @@ -700,7 +700,7 @@ ] }, { - "key": "GetIntensity", + "base": "GetIntensity", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Intensity" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AreaSystemRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AreaSystemRequestBus.names index 0986961990..fd994b7663 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AreaSystemRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AreaSystemRequestBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "AreaSystemRequestBus", + "base": "AreaSystemRequestBus", "context": "EBusSender", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetInstanceCountInAabb", + "base": "GetInstanceCountInAabb", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Instance Count In AABB" @@ -40,7 +40,7 @@ ] }, { - "key": "GetInstancesInAabb", + "base": "GetInstancesInAabb", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Instances In AABB" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AssetCollectionAsyncLoaderTestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AssetCollectionAsyncLoaderTestBus.names index c6af4aa7fb..98a242a478 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AssetCollectionAsyncLoaderTestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AssetCollectionAsyncLoaderTestBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "AssetCollectionAsyncLoaderTestBus", + "base": "AssetCollectionAsyncLoaderTestBus", "context": "EBusSender", "variant": "", "details": { @@ -9,7 +9,7 @@ }, "methods": [ { - "key": "GetPendingAssetsList", + "base": "GetPendingAssetsList", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetPendingAssetsList" @@ -31,7 +31,7 @@ ] }, { - "key": "GetCountOfPendingAssets", + "base": "GetCountOfPendingAssets", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetCountOfPendingAssets" @@ -53,7 +53,7 @@ ] }, { - "key": "ValidateAssetWasLoaded", + "base": "ValidateAssetWasLoaded", "entry": { "name": "In", "tooltip": "When signaled, this will invoke ValidateAssetWasLoaded" @@ -83,7 +83,7 @@ ] }, { - "key": "CancelLoadingAssets", + "base": "CancelLoadingAssets", "entry": { "name": "In", "tooltip": "When signaled, this will invoke CancelLoadingAssets" @@ -97,7 +97,7 @@ } }, { - "key": "StartLoadingAssetsFromAssetList", + "base": "StartLoadingAssetsFromAssetList", "entry": { "name": "In", "tooltip": "When signaled, this will invoke StartLoadingAssetsFromAssetList" @@ -127,7 +127,7 @@ ] }, { - "key": "StartLoadingAssetsFromJsonFile", + "base": "StartLoadingAssetsFromJsonFile", "entry": { "name": "In", "tooltip": "When signaled, this will invoke StartLoadingAssetsFromJsonFile" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AssetEditorRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AssetEditorRequestBus.names index 958a9e4dba..5c93fe893d 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AssetEditorRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AssetEditorRequestBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "AssetEditorRequestBus", + "base": "AssetEditorRequestBus", "context": "EBusSender", "variant": "", "details": { @@ -9,7 +9,7 @@ }, "methods": [ { - "key": "CreateNewGraph", + "base": "CreateNewGraph", "entry": { "name": "In", "tooltip": "When signaled, this will invoke CreateNewGraph" @@ -32,7 +32,7 @@ ] }, { - "key": "ContainsGraph", + "base": "ContainsGraph", "entry": { "name": "In", "tooltip": "When signaled, this will invoke ContainsGraph" @@ -63,7 +63,7 @@ ] }, { - "key": "CloseGraph", + "base": "CloseGraph", "entry": { "name": "In", "tooltip": "When signaled, this will invoke CloseGraph" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AtomToolsDocumentRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AtomToolsDocumentRequestBus.names index 40ecc8261c..13e66d2420 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AtomToolsDocumentRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AtomToolsDocumentRequestBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "AtomToolsDocumentRequestBus", + "base": "AtomToolsDocumentRequestBus", "context": "EBusSender", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "CanRedo", + "base": "CanRedo", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Can Redo" @@ -32,7 +32,7 @@ ] }, { - "key": "SaveAsChild", + "base": "SaveAsChild", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Save As Child" @@ -62,7 +62,7 @@ ] }, { - "key": "Reopen", + "base": "Reopen", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Reopen" @@ -84,7 +84,7 @@ ] }, { - "key": "Save", + "base": "Save", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Save" @@ -106,7 +106,7 @@ ] }, { - "key": "IsOpen", + "base": "IsOpen", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Is Open" @@ -128,7 +128,7 @@ ] }, { - "key": "Undo", + "base": "Undo", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Undo" @@ -150,7 +150,7 @@ ] }, { - "key": "Open", + "base": "Open", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Open" @@ -180,7 +180,7 @@ ] }, { - "key": "CanUndo", + "base": "CanUndo", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Can Undo" @@ -202,7 +202,7 @@ ] }, { - "key": "SetPropertyValue", + "base": "SetPropertyValue", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Property Value" @@ -230,7 +230,7 @@ ] }, { - "key": "SaveAsCopy", + "base": "SaveAsCopy", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Save As Copy" @@ -260,7 +260,7 @@ ] }, { - "key": "BeginEdit", + "base": "BeginEdit", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Begin Edit" @@ -282,7 +282,7 @@ ] }, { - "key": "GetPropertyValue", + "base": "GetPropertyValue", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Property Value" @@ -312,7 +312,7 @@ ] }, { - "key": "Close", + "base": "Close", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Close" @@ -334,7 +334,7 @@ ] }, { - "key": "IsModified", + "base": "IsModified", "entry": { "name": "In", "tooltip": "When signaled, this will invoke IsModified" @@ -356,7 +356,7 @@ ] }, { - "key": "EndEdit", + "base": "EndEdit", "entry": { "name": "In", "tooltip": "When signaled, this will invoke End Edit" @@ -378,7 +378,7 @@ ] }, { - "key": "GetAbsolutePath", + "base": "GetAbsolutePath", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Absolute Path" @@ -400,7 +400,7 @@ ] }, { - "key": "GetRelativePath", + "base": "GetRelativePath", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Relative Path" @@ -422,7 +422,7 @@ ] }, { - "key": "IsSavable", + "base": "IsSavable", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Is Savable" @@ -444,7 +444,7 @@ ] }, { - "key": "Redo", + "base": "Redo", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Redo" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AtomToolsDocumentSystemRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AtomToolsDocumentSystemRequestBus.names index 9b65065453..020f951c51 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AtomToolsDocumentSystemRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AtomToolsDocumentSystemRequestBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "AtomToolsDocumentSystemRequestBus", + "base": "AtomToolsDocumentSystemRequestBus", "context": "EBusSender", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "SaveDocument", + "base": "SaveDocument", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Save Document" @@ -40,7 +40,7 @@ ] }, { - "key": "SaveDocumentAsChild", + "base": "SaveDocumentAsChild", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Save Document As Child" @@ -76,7 +76,7 @@ ] }, { - "key": "OpenDocument", + "base": "OpenDocument", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Open Document" @@ -106,7 +106,7 @@ ] }, { - "key": "CreateDocumentFromFile", + "base": "CreateDocumentFromFile", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Create Document From File" @@ -142,7 +142,7 @@ ] }, { - "key": "CloseDocument", + "base": "CloseDocument", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Close Document" @@ -172,7 +172,7 @@ ] }, { - "key": "CloseAllDocuments", + "base": "CloseAllDocuments", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Close All Documents" @@ -194,7 +194,7 @@ ] }, { - "key": "CloseAllDocumentsExcept", + "base": "CloseAllDocumentsExcept", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Close All Documents Except" @@ -224,7 +224,7 @@ ] }, { - "key": "CreateDocument", + "base": "CreateDocument", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Create Document" @@ -246,7 +246,7 @@ ] }, { - "key": "DestroyDocument", + "base": "DestroyDocument", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Destroy Document" @@ -276,7 +276,7 @@ ] }, { - "key": "SaveDocumentAsCopy", + "base": "SaveDocumentAsCopy", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Save Document As Copy" @@ -312,7 +312,7 @@ ] }, { - "key": "SaveAllDocuments", + "base": "SaveAllDocuments", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Save All Documents" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AtomToolsMainWindowFactoryRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AtomToolsMainWindowFactoryRequestBus.names index 9d074c4224..bbb141f329 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AtomToolsMainWindowFactoryRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AtomToolsMainWindowFactoryRequestBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "AtomToolsMainWindowFactoryRequestBus", + "base": "AtomToolsMainWindowFactoryRequestBus", "context": "EBusSender", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "CreateMainWindow", + "base": "CreateMainWindow", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Create Main Window" @@ -24,7 +24,7 @@ } }, { - "key": "DestroyMainWindow", + "base": "DestroyMainWindow", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Destroy Main Window" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AtomToolsMainWindowRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AtomToolsMainWindowRequestBus.names index cb6fa04754..741afa30af 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AtomToolsMainWindowRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AtomToolsMainWindowRequestBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "AtomToolsMainWindowRequestBus", + "base": "AtomToolsMainWindowRequestBus", "context": "EBusSender", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "UnlockViewportRenderTargetSize", + "base": "UnlockViewportRenderTargetSize", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Unlock Viewport Render Target Size" @@ -24,7 +24,7 @@ } }, { - "key": "GetDockWidgetNames", + "base": "GetDockWidgetNames", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Dock Widget Names" @@ -46,7 +46,7 @@ ] }, { - "key": "ResizeViewportRenderTarget", + "base": "ResizeViewportRenderTarget", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Resize Viewport Render Target" @@ -74,7 +74,7 @@ ] }, { - "key": "SetDockWidgetVisible", + "base": "SetDockWidgetVisible", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Dock Widget Visible" @@ -102,7 +102,7 @@ ] }, { - "key": "IsDockWidgetVisible", + "base": "IsDockWidgetVisible", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Is Dock Widget Visible" @@ -132,7 +132,7 @@ ] }, { - "key": "LockViewportRenderTargetSize", + "base": "LockViewportRenderTargetSize", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Lock Viewport Render Target Size" @@ -160,7 +160,7 @@ ] }, { - "key": "ActivateWindow", + "base": "ActivateWindow", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Activate Window" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AttachmentComponentRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AttachmentComponentRequestBus.names index 416c0dfae3..5e097988a6 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AttachmentComponentRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AttachmentComponentRequestBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "AttachmentComponentRequestBus", + "base": "AttachmentComponentRequestBus", "context": "EBusSender", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "Attach", + "base": "Attach", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Attach" @@ -45,7 +45,7 @@ ] }, { - "key": "Detach", + "base": "Detach", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Detach" @@ -59,7 +59,7 @@ } }, { - "key": "SetAttachmentOffset", + "base": "SetAttachmentOffset", "entry": { "name": "In", "tooltip": "When signaled, this will invoke SetAttachmentOffset" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AudioEnvironmentComponentRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AudioEnvironmentComponentRequestBus.names index 641d11c99c..6d5ba9f6a2 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AudioEnvironmentComponentRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AudioEnvironmentComponentRequestBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "AudioEnvironmentComponentRequestBus", + "base": "AudioEnvironmentComponentRequestBus", "context": "EBusSender", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "SetAmount", + "base": "SetAmount", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Amount" @@ -33,7 +33,7 @@ ] }, { - "key": "SetEnvironmentAmount", + "base": "SetEnvironmentAmount", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Environment Amount" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AudioListenerComponentRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AudioListenerComponentRequestBus.names index c08b9854d9..4f1afdb06d 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AudioListenerComponentRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AudioListenerComponentRequestBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "AudioListenerComponentRequestBus", + "base": "AudioListenerComponentRequestBus", "context": "EBusSender", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "SetRotationEntity", + "base": "SetRotationEntity", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Rotation Entity" @@ -34,7 +34,7 @@ ] }, { - "key": "SetPositionEntity", + "base": "SetPositionEntity", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Position Entity" @@ -58,7 +58,7 @@ ] }, { - "key": "SetFullTransformEntity", + "base": "SetFullTransformEntity", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Full Transform Entity" @@ -82,7 +82,7 @@ ] }, { - "key": "SetListenerEnabled", + "base": "SetListenerEnabled", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Listener Enabled" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AudioPreloadComponentRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AudioPreloadComponentRequestBus.names index beb17272ec..f2ce00d72e 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AudioPreloadComponentRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AudioPreloadComponentRequestBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "AudioPreloadComponentRequestBus", + "base": "AudioPreloadComponentRequestBus", "context": "EBusSender", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "IsLoaded", + "base": "IsLoaded", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Is Loaded" @@ -40,7 +40,7 @@ ] }, { - "key": "Unload", + "base": "Unload", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Unload" @@ -54,7 +54,7 @@ } }, { - "key": "UnloadPreload", + "base": "UnloadPreload", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Unload Preload" @@ -76,7 +76,7 @@ ] }, { - "key": "Load", + "base": "Load", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Load" @@ -90,7 +90,7 @@ } }, { - "key": "LoadPreload", + "base": "LoadPreload", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Load Preload" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AudioRtpcComponentRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AudioRtpcComponentRequestBus.names index 6ea496f6b1..2053611961 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AudioRtpcComponentRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AudioRtpcComponentRequestBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "AudioRtpcComponentRequestBus", + "base": "AudioRtpcComponentRequestBus", "context": "EBusSender", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "SetValue", + "base": "SetValue", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Value" @@ -33,7 +33,7 @@ ] }, { - "key": "SetRtpcValue", + "base": "SetRtpcValue", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set RTPC Value" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AudioSwitchComponentRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AudioSwitchComponentRequestBus.names index cb2ca6db64..87d263ac96 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AudioSwitchComponentRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AudioSwitchComponentRequestBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "AudioSwitchComponentRequestBus", + "base": "AudioSwitchComponentRequestBus", "context": "EBusSender", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "SetState", + "base": "SetState", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set State" @@ -34,7 +34,7 @@ ] }, { - "key": "SetSwitchState", + "base": "SetSwitchState", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Switch State" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AudioSystemComponentRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AudioSystemComponentRequestBus.names index 3409c106d3..526eada299 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AudioSystemComponentRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AudioSystemComponentRequestBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "AudioSystemComponentRequestBus", + "base": "AudioSystemComponentRequestBus", "context": "EBusSender", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "LevelUnloadAudio", + "base": "LevelUnloadAudio", "entry": { "name": "In", "tooltip": "When signaled, this will invoke LevelUnloadAudio" @@ -24,7 +24,7 @@ } }, { - "key": "LevelLoadAudio", + "base": "LevelLoadAudio", "entry": { "name": "In", "tooltip": "When signaled, this will invoke LevelLoadAudio" @@ -46,7 +46,7 @@ ] }, { - "key": "GlobalKillAudioTrigger", + "base": "GlobalKillAudioTrigger", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Global Kill Audio Trigger" @@ -75,7 +75,7 @@ ] }, { - "key": "GlobalSetAudioRtpc", + "base": "GlobalSetAudioRtpc", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Global Set Audio RTPC" @@ -103,7 +103,7 @@ ] }, { - "key": "GlobalSetAudioSwitchState", + "base": "GlobalSetAudioSwitchState", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Global Set Audio Switch State" @@ -131,7 +131,7 @@ ] }, { - "key": "GlobalRefreshAudio", + "base": "GlobalRefreshAudio", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GlobalRefreshAudio" @@ -153,7 +153,7 @@ ] }, { - "key": "GlobalMuteAudio", + "base": "GlobalMuteAudio", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Global Mute Audio" @@ -167,7 +167,7 @@ } }, { - "key": "GlobalExecuteAudioTrigger", + "base": "GlobalExecuteAudioTrigger", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Global Execute Audio Trigger" @@ -196,7 +196,7 @@ ] }, { - "key": "GlobalStopAllSounds", + "base": "GlobalStopAllSounds", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Global Stop All Sounds" @@ -210,7 +210,7 @@ } }, { - "key": "GlobalUnmuteAudio", + "base": "GlobalUnmuteAudio", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Global Unmute Audio" @@ -224,7 +224,7 @@ } }, { - "key": "GlobalResetAudioRtpcs", + "base": "GlobalResetAudioRtpcs", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Global Reset Audio RTPCs" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AudioTriggerComponentRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AudioTriggerComponentRequestBus.names index 111c2d328c..3f584ca463 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AudioTriggerComponentRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AudioTriggerComponentRequestBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "AudioTriggerComponentRequestBus", + "base": "AudioTriggerComponentRequestBus", "context": "EBusSender", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "SetObstructionType", + "base": "SetObstructionType", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Obstruction Type" @@ -33,7 +33,7 @@ ] }, { - "key": "KillAllTriggers", + "base": "KillAllTriggers", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Kill All Triggers" @@ -48,7 +48,7 @@ } }, { - "key": "ExecuteTrigger", + "base": "ExecuteTrigger", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Execute Trigger" @@ -72,7 +72,7 @@ ] }, { - "key": "SetMovesWithEntity", + "base": "SetMovesWithEntity", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Moves With Entity" @@ -96,7 +96,7 @@ ] }, { - "key": "Stop", + "base": "Stop", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Stop" @@ -111,7 +111,7 @@ } }, { - "key": "Play", + "base": "Play", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Play" @@ -126,7 +126,7 @@ } }, { - "key": "KillTrigger", + "base": "KillTrigger", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Kill Trigger" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AuthenticationProviderRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AuthenticationProviderRequestBus.names index b9b48b88f6..c0db453e2e 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AuthenticationProviderRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AuthenticationProviderRequestBus.names @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "SignOut", + "base": "SignOut", "entry": { "name": "In", "tooltip": "When signaled, this will invoke SignOut" @@ -42,7 +42,7 @@ ] }, { - "key": "DeviceCodeGrantConfirmSignInAsync", + "base": "DeviceCodeGrantConfirmSignInAsync", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Device Code Grant Confirm Sign In Async" @@ -65,7 +65,7 @@ ] }, { - "key": "DeviceCodeGrantSignInAsync", + "base": "DeviceCodeGrantSignInAsync", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Device Code Grant Sign In Async" @@ -88,7 +88,7 @@ ] }, { - "key": "PasswordGrantMultiFactorSignInAsync", + "base": "PasswordGrantMultiFactorSignInAsync", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Password Grant Multi Factor Sign In Async" @@ -125,7 +125,7 @@ ] }, { - "key": "GetAuthenticationTokens", + "base": "GetAuthenticationTokens", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Authentication Tokens" @@ -156,7 +156,7 @@ ] }, { - "key": "GetTokensWithRefreshAsync", + "base": "GetTokensWithRefreshAsync", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Tokens With Refresh Async" @@ -179,7 +179,7 @@ ] }, { - "key": "IsSignedIn", + "base": "IsSignedIn", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Is Signed In" @@ -210,7 +210,7 @@ ] }, { - "key": "PasswordGrantSingleFactorSignInAsync", + "base": "PasswordGrantSingleFactorSignInAsync", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Password GrantSingle Factor Sign In Async" @@ -247,7 +247,7 @@ ] }, { - "key": "RefreshTokensAsync", + "base": "RefreshTokensAsync", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Refresh Tokens Async" @@ -270,7 +270,7 @@ ] }, { - "key": "Initialize", + "base": "Initialize", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Initialize" @@ -300,7 +300,7 @@ ] }, { - "key": "PasswordGrantMultiFactorConfirmSignInAsync", + "base": "PasswordGrantMultiFactorConfirmSignInAsync", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Password Grant Multi Factor Confirm Sign In Async" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/BlastFamilyComponentRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/BlastFamilyComponentRequestBus.names index f4c2192375..3c71a6e04c 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/BlastFamilyComponentRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/BlastFamilyComponentRequestBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "BlastFamilyComponentRequestBus", + "base": "BlastFamilyComponentRequestBus", "context": "EBusSender", "variant": "", "details": { @@ -9,7 +9,7 @@ }, "methods": [ { - "key": "Get Actors Data", + "base": "Get Actors Data", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Actors Data" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/BlastFamilyDamageRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/BlastFamilyDamageRequestBus.names index 9ef94a60bd..9dec40475a 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/BlastFamilyDamageRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/BlastFamilyDamageRequestBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "BlastFamilyDamageRequestBus", + "base": "BlastFamilyDamageRequestBus", "context": "EBusSender", "variant": "", "details": { @@ -9,7 +9,7 @@ }, "methods": [ { - "key": "Get Family Id", + "base": "Get Family Id", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Family Id" @@ -32,7 +32,7 @@ ] }, { - "key": "Destroy actor", + "base": "Destroy actor", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Destroy actor" @@ -46,7 +46,7 @@ } }, { - "key": "Triangle Damage", + "base": "Triangle Damage", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Triangle Damage" @@ -90,7 +90,7 @@ ] }, { - "key": "Impact Spread Damage", + "base": "Impact Spread Damage", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Impact Spread Damage" @@ -134,7 +134,7 @@ ] }, { - "key": "Stress Damage", + "base": "Stress Damage", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Stress Damage" @@ -164,7 +164,7 @@ ] }, { - "key": "Shear Damage", + "base": "Shear Damage", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Shear Damage" @@ -215,7 +215,7 @@ ] }, { - "key": "Capsule Damage", + "base": "Capsule Damage", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Capsule Damage" @@ -266,7 +266,7 @@ ] }, { - "key": "Radial Damage", + "base": "Radial Damage", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Radial Damage" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/BloomRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/BloomRequestBus.names index 13fb16f618..dbbadc1aaf 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/BloomRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/BloomRequestBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "BloomRequestBus", + "base": "BloomRequestBus", "context": "EBusSender", "variant": "", "details": { @@ -9,7 +9,7 @@ }, "methods": [ { - "key": "GetTintStage0Override", + "base": "GetTintStage0Override", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Tint Stage 0 Override" @@ -31,7 +31,7 @@ ] }, { - "key": "SetTintStage0Override", + "base": "SetTintStage0Override", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Tint Stage 0 Override" @@ -53,7 +53,7 @@ ] }, { - "key": "SetTintStage1", + "base": "SetTintStage1", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Tint Stage 1" @@ -75,7 +75,7 @@ ] }, { - "key": "SetTintStage0", + "base": "SetTintStage0", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Tint Stage 0" @@ -97,7 +97,7 @@ ] }, { - "key": "GetKernelSizeStage3Override", + "base": "GetKernelSizeStage3Override", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Kernel Size Stage 3 Override" @@ -119,7 +119,7 @@ ] }, { - "key": "GetTintStage3Override", + "base": "GetTintStage3Override", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Tint Stage 3 Override" @@ -141,7 +141,7 @@ ] }, { - "key": "SetKernelSizeScaleOverride", + "base": "SetKernelSizeScaleOverride", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Kernel Size Scale Override" @@ -163,7 +163,7 @@ ] }, { - "key": "SetKernelSizeStage2", + "base": "SetKernelSizeStage2", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Kernel Size Stage 2" @@ -185,7 +185,7 @@ ] }, { - "key": "GetKernelSizeStage4", + "base": "GetKernelSizeStage4", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Kernel Size Stage 4" @@ -207,7 +207,7 @@ ] }, { - "key": "GetTintStage0", + "base": "GetTintStage0", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Tint Stage 0" @@ -229,7 +229,7 @@ ] }, { - "key": "SetTintStage4Override", + "base": "SetTintStage4Override", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Tint Stage 4 Override" @@ -251,7 +251,7 @@ ] }, { - "key": "GetKernelSizeScale", + "base": "GetKernelSizeScale", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Kernel Size Scale" @@ -273,7 +273,7 @@ ] }, { - "key": "GetKernelSizeStage2", + "base": "GetKernelSizeStage2", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Kernel Size Stage 2" @@ -295,7 +295,7 @@ ] }, { - "key": "SetTintStage1Override", + "base": "SetTintStage1Override", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Tint Stage 1 Override" @@ -317,7 +317,7 @@ ] }, { - "key": "SetTintStage3", + "base": "SetTintStage3", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Tint Stage 3" @@ -339,7 +339,7 @@ ] }, { - "key": "GetEnabledOverride", + "base": "GetEnabledOverride", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Enabled Override" @@ -361,7 +361,7 @@ ] }, { - "key": "SetTintStage3Override", + "base": "SetTintStage3Override", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Tint Stage 3 Override" @@ -383,7 +383,7 @@ ] }, { - "key": "SetEnabledOverride", + "base": "SetEnabledOverride", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Enabled Override" @@ -405,7 +405,7 @@ ] }, { - "key": "SetKernelSizeStage0", + "base": "SetKernelSizeStage0", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Kernel Size Stage 0" @@ -427,7 +427,7 @@ ] }, { - "key": "GetKernelSizeStage0Override", + "base": "GetKernelSizeStage0Override", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Kernel Size Stage 0 Override" @@ -449,7 +449,7 @@ ] }, { - "key": "SetKernelSizeStage4Override", + "base": "SetKernelSizeStage4Override", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Kernel Size Stage 4 Override" @@ -471,7 +471,7 @@ ] }, { - "key": "GetTintStage2", + "base": "GetTintStage2", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Tint Stage 2" @@ -493,7 +493,7 @@ ] }, { - "key": "GetTintStage4Override", + "base": "GetTintStage4Override", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Tint Stage 4 Override" @@ -515,7 +515,7 @@ ] }, { - "key": "SetKernelSizeStage0Override", + "base": "SetKernelSizeStage0Override", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Kernel Size Stage 0 Override" @@ -537,7 +537,7 @@ ] }, { - "key": "GetKernelSizeStage4Override", + "base": "GetKernelSizeStage4Override", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Kernel Size Stage 4 Override" @@ -559,7 +559,7 @@ ] }, { - "key": "GetTintStage2Override", + "base": "GetTintStage2Override", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Tint Stage 2 Override" @@ -581,7 +581,7 @@ ] }, { - "key": "GetTintStage3", + "base": "GetTintStage3", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Tint Stage 3" @@ -603,7 +603,7 @@ ] }, { - "key": "SetKernelSizeScale", + "base": "SetKernelSizeScale", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Kernel Size Scale" @@ -625,7 +625,7 @@ ] }, { - "key": "GetIntensity", + "base": "GetIntensity", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Intensity" @@ -647,7 +647,7 @@ ] }, { - "key": "GetBicubicEnabledOverride", + "base": "GetBicubicEnabledOverride", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Bicubic Enabled Override" @@ -669,7 +669,7 @@ ] }, { - "key": "SetKernelSizeStage4", + "base": "SetKernelSizeStage4", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Kernel Size Stage 4" @@ -691,7 +691,7 @@ ] }, { - "key": "SetBicubicEnabled", + "base": "SetBicubicEnabled", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Bicubic Enabled" @@ -713,7 +713,7 @@ ] }, { - "key": "GetKernelSizeStage1Override", + "base": "GetKernelSizeStage1Override", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Kernel Size Stage 1 Override" @@ -735,7 +735,7 @@ ] }, { - "key": "GetThresholdOverride", + "base": "GetThresholdOverride", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Threshold Override" @@ -757,7 +757,7 @@ ] }, { - "key": "SetIntensity", + "base": "SetIntensity", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Intensity" @@ -779,7 +779,7 @@ ] }, { - "key": "SetBicubicEnabledOverride", + "base": "SetBicubicEnabledOverride", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Bicubic Enabled Override" @@ -801,7 +801,7 @@ ] }, { - "key": "GetKernelSizeStage1", + "base": "GetKernelSizeStage1", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Kernel Size Stage 1" @@ -823,7 +823,7 @@ ] }, { - "key": "GetKernelSizeStage2Override", + "base": "GetKernelSizeStage2Override", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Kernel Size Stage 2 Override" @@ -845,7 +845,7 @@ ] }, { - "key": "SetTintStage4", + "base": "SetTintStage4", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Tint Stage 4" @@ -867,7 +867,7 @@ ] }, { - "key": "SetKernelSizeStage1", + "base": "SetKernelSizeStage1", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Kernel Size Stage 1" @@ -889,7 +889,7 @@ ] }, { - "key": "SetThresholdOverride", + "base": "SetThresholdOverride", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Threshold Override" @@ -911,7 +911,7 @@ ] }, { - "key": "GetTintStage1", + "base": "GetTintStage1", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Tint Stage 1" @@ -933,7 +933,7 @@ ] }, { - "key": "GetKnee", + "base": "GetKnee", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Knee" @@ -955,7 +955,7 @@ ] }, { - "key": "SetThreshold", + "base": "SetThreshold", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Threshold" @@ -977,7 +977,7 @@ ] }, { - "key": "SetIntensityOverride", + "base": "SetIntensityOverride", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Intensity Override" @@ -999,7 +999,7 @@ ] }, { - "key": "GetEnabled", + "base": "GetEnabled", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Enabled" @@ -1021,7 +1021,7 @@ ] }, { - "key": "SetKernelSizeStage1Override", + "base": "SetKernelSizeStage1Override", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Kernel Size Stage 1 Override" @@ -1043,7 +1043,7 @@ ] }, { - "key": "GetKernelSizeStage0", + "base": "GetKernelSizeStage0", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Kernel Size Stage 0" @@ -1065,7 +1065,7 @@ ] }, { - "key": "SetTintStage2Override", + "base": "SetTintStage2Override", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Tint Stage 2 Override" @@ -1087,7 +1087,7 @@ ] }, { - "key": "GetTintStage4", + "base": "GetTintStage4", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Tint Stage 4" @@ -1109,7 +1109,7 @@ ] }, { - "key": "GetKernelSizeScaleOverride", + "base": "GetKernelSizeScaleOverride", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Kernel Size Scale Override" @@ -1131,7 +1131,7 @@ ] }, { - "key": "SetKernelSizeStage2Override", + "base": "SetKernelSizeStage2Override", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Kernel Size Stage 2 Override" @@ -1153,7 +1153,7 @@ ] }, { - "key": "GetKernelSizeStage3", + "base": "GetKernelSizeStage3", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Kernel Size Stage 3" @@ -1175,7 +1175,7 @@ ] }, { - "key": "GetTintStage1Override", + "base": "GetTintStage1Override", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Tint Stage 1 Override" @@ -1197,7 +1197,7 @@ ] }, { - "key": "SetTintStage2", + "base": "SetTintStage2", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Tint Stage 2" @@ -1219,7 +1219,7 @@ ] }, { - "key": "GetKneeOverride", + "base": "GetKneeOverride", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Knee Override" @@ -1241,7 +1241,7 @@ ] }, { - "key": "SetKnee", + "base": "SetKnee", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Knee" @@ -1263,7 +1263,7 @@ ] }, { - "key": "GetIntensityOverride", + "base": "GetIntensityOverride", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Intensity Override" @@ -1285,7 +1285,7 @@ ] }, { - "key": "SetEnabled", + "base": "SetEnabled", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Enabled" @@ -1307,7 +1307,7 @@ ] }, { - "key": "GetThreshold", + "base": "GetThreshold", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Threshold" @@ -1329,7 +1329,7 @@ ] }, { - "key": "SetKernelSizeStage3", + "base": "SetKernelSizeStage3", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Kernel Size Stage 3" @@ -1351,7 +1351,7 @@ ] }, { - "key": "SetKernelSizeStage3Override", + "base": "SetKernelSizeStage3Override", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Kernel Size Stage 3 Override" @@ -1373,7 +1373,7 @@ ] }, { - "key": "SetKneeOverride", + "base": "SetKneeOverride", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Knee Override" @@ -1395,7 +1395,7 @@ ] }, { - "key": "GetBicubicEnabled", + "base": "GetBicubicEnabled", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Bicubic Enabled" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/BoundsRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/BoundsRequestBus.names index d909eb0338..87ea2b079c 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/BoundsRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/BoundsRequestBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "BoundsRequestBus", + "base": "BoundsRequestBus", "context": "EBusSender", "variant": "", "details": { @@ -9,7 +9,7 @@ }, "methods": [ { - "key": "GetWorldBounds", + "base": "GetWorldBounds", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get World Bounds" @@ -31,7 +31,7 @@ ] }, { - "key": "GetLocalBounds", + "base": "GetLocalBounds", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Local Bounds" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/BoxShapeComponentRequestsBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/BoxShapeComponentRequestsBus.names index 816dc5e4ec..16fbe8c4bd 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/BoxShapeComponentRequestsBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/BoxShapeComponentRequestsBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "BoxShapeComponentRequestsBus", + "base": "BoxShapeComponentRequestsBus", "context": "EBusSender", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetBoxConfiguration", + "base": "GetBoxConfiguration", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Configuration" @@ -34,7 +34,7 @@ ] }, { - "key": "GetBoxDimensions", + "base": "GetBoxDimensions", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Dimensions" @@ -57,7 +57,7 @@ ] }, { - "key": "SetBoxDimensions", + "base": "SetBoxDimensions", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Dimensions" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/CameraRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/CameraRequestBus.names index 4fbeba0aa7..6c0112bfc2 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/CameraRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/CameraRequestBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "CameraRequestBus", + "base": "CameraRequestBus", "context": "EBusSender", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetOrthographicHalfWidth", + "base": "GetOrthographicHalfWidth", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Orthographic Half Width" @@ -32,7 +32,7 @@ ] }, { - "key": "GetFov", + "base": "GetFov", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Field of View" @@ -54,7 +54,7 @@ ] }, { - "key": "SetFovRadians", + "base": "SetFovRadians", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Field of View (Radians)" @@ -76,7 +76,7 @@ ] }, { - "key": "SetNearClipDistance", + "base": "SetNearClipDistance", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Near Clip Distance" @@ -98,7 +98,7 @@ ] }, { - "key": "IsOrthographic", + "base": "IsOrthographic", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Is Orthographic" @@ -120,7 +120,7 @@ ] }, { - "key": "SetFovDegrees", + "base": "SetFovDegrees", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Field of View (Degrees)" @@ -142,7 +142,7 @@ ] }, { - "key": "GetFovRadians", + "base": "GetFovRadians", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Field of View (Radians)" @@ -164,7 +164,7 @@ ] }, { - "key": "SetFov", + "base": "SetFov", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Field of View" @@ -186,7 +186,7 @@ ] }, { - "key": "MakeActiveView", + "base": "MakeActiveView", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Make Active View" @@ -200,7 +200,7 @@ } }, { - "key": "GetFarClipDistance", + "base": "GetFarClipDistance", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Far Clip Distance" @@ -222,7 +222,7 @@ ] }, { - "key": "GetFovDegrees", + "base": "GetFovDegrees", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Field of View (Degrees)" @@ -244,7 +244,7 @@ ] }, { - "key": "SetOrthographic", + "base": "SetOrthographic", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Orthographic" @@ -266,7 +266,7 @@ ] }, { - "key": "SetOrthographicHalfWidth", + "base": "SetOrthographicHalfWidth", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Orthographic Half Width" @@ -288,7 +288,7 @@ ] }, { - "key": "GetNearClipDistance", + "base": "GetNearClipDistance", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Near Clip Distance" @@ -310,7 +310,7 @@ ] }, { - "key": "SetFarClipDistance", + "base": "SetFarClipDistance", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Far Clip Distance" @@ -332,7 +332,7 @@ ] }, { - "key": "IsActiveView", + "base": "IsActiveView", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Is Active View" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/CameraSystemRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/CameraSystemRequestBus.names index 6ad6354cd4..c8f9638b52 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/CameraSystemRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/CameraSystemRequestBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "CameraSystemRequestBus", + "base": "CameraSystemRequestBus", "context": "EBusSender", "variant": "", "details": { @@ -9,7 +9,7 @@ }, "methods": [ { - "key": "GetActiveCamera", + "base": "GetActiveCamera", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Active Camera" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/CapsuleShapeComponentRequestsBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/CapsuleShapeComponentRequestsBus.names index ac6a688b01..d8d9222b09 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/CapsuleShapeComponentRequestsBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/CapsuleShapeComponentRequestsBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "CapsuleShapeComponentRequestsBus", + "base": "CapsuleShapeComponentRequestsBus", "context": "EBusSender", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetCapsuleConfiguration", + "base": "GetCapsuleConfiguration", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Configuration" @@ -34,7 +34,7 @@ ] }, { - "key": "SetHeight", + "base": "SetHeight", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Height" @@ -58,7 +58,7 @@ ] }, { - "key": "SetRadius", + "base": "SetRadius", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Radius" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/CharacterControllerRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/CharacterControllerRequestBus.names index df4a2d29df..e0226d0a6f 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/CharacterControllerRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/CharacterControllerRequestBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "CharacterControllerRequestBus", + "base": "CharacterControllerRequestBus", "context": "EBusSender", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "SetSlopeLimitDegrees", + "base": "SetSlopeLimitDegrees", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Slope Limit Degrees" @@ -32,7 +32,7 @@ ] }, { - "key": "GetSlopeLimitDegrees", + "base": "GetSlopeLimitDegrees", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Slope Limit Degrees" @@ -54,7 +54,7 @@ ] }, { - "key": "SetMaximumSpeed", + "base": "SetMaximumSpeed", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Maximum Speed" @@ -76,7 +76,7 @@ ] }, { - "key": "GetUpDirection", + "base": "GetUpDirection", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Up Direction" @@ -98,7 +98,7 @@ ] }, { - "key": "AddVelocity", + "base": "AddVelocity", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Add Velocity" @@ -120,7 +120,7 @@ ] }, { - "key": "SetBasePosition", + "base": "SetBasePosition", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Base Position" @@ -142,7 +142,7 @@ ] }, { - "key": "GetCenterPosition", + "base": "GetCenterPosition", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Center Position" @@ -164,7 +164,7 @@ ] }, { - "key": "GetStepHeight", + "base": "GetStepHeight", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Step Height" @@ -186,7 +186,7 @@ ] }, { - "key": "GetBasePosition", + "base": "GetBasePosition", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Base Position" @@ -208,7 +208,7 @@ ] }, { - "key": "SetStepHeight", + "base": "SetStepHeight", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Step Height" @@ -230,7 +230,7 @@ ] }, { - "key": "GetMaximumSpeed", + "base": "GetMaximumSpeed", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Maximum Speed" @@ -252,7 +252,7 @@ ] }, { - "key": "GetVelocity", + "base": "GetVelocity", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Velocity" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/CharacterGameplayRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/CharacterGameplayRequestBus.names index 6a957de61b..f3b01b7898 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/CharacterGameplayRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/CharacterGameplayRequestBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "CharacterGameplayRequestBus", + "base": "CharacterGameplayRequestBus", "context": "EBusSender", "variant": "", "details": { @@ -9,7 +9,7 @@ }, "methods": [ { - "key": "GetFallingVelocity", + "base": "GetFallingVelocity", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Falling Velocity" @@ -31,7 +31,7 @@ ] }, { - "key": "GetGravityMultiplier", + "base": "GetGravityMultiplier", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Gravity Multiplier" @@ -53,7 +53,7 @@ ] }, { - "key": "SetGravityMultiplier", + "base": "SetGravityMultiplier", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Gravity Multiplier" @@ -75,7 +75,7 @@ ] }, { - "key": "IsOnGround", + "base": "IsOnGround", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Is On Ground" @@ -97,7 +97,7 @@ ] }, { - "key": "SetFallingVelocity", + "base": "SetFallingVelocity", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Falling Velocity" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/CollisionFilteringBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/CollisionFilteringBus.names index 1c8eba4b1f..b4f903b1d2 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/CollisionFilteringBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/CollisionFilteringBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "CollisionFilteringBus", + "base": "CollisionFilteringBus", "context": "EBusSender", "variant": "", "details": { @@ -9,7 +9,7 @@ }, "methods": [ { - "key": "ToggleCollisionLayer", + "base": "ToggleCollisionLayer", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Toggle Collision Layer" @@ -43,7 +43,7 @@ ] }, { - "key": "SetCollisionGroup", + "base": "SetCollisionGroup", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Collision Group" @@ -71,7 +71,7 @@ ] }, { - "key": "GetCollisionGroupName", + "base": "GetCollisionGroupName", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Collision Group Name" @@ -93,7 +93,7 @@ ] }, { - "key": "GetCollisionLayerName", + "base": "GetCollisionLayerName", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Collision Layer Name" @@ -115,7 +115,7 @@ ] }, { - "key": "SetCollisionLayer", + "base": "SetCollisionLayer", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Collision Layer" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ComponentApplicationBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ComponentApplicationBus.names index 59eb3e5025..21682964e3 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ComponentApplicationBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ComponentApplicationBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "ComponentApplicationBus", + "base": "ComponentApplicationBus", "context": "EBusSender", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetEntityName", + "base": "GetEntityName", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Entity Name" @@ -41,7 +41,7 @@ ] }, { - "key": "SetEntityName", + "base": "SetEntityName", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Entity Name" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ComponentModeSystemRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ComponentModeSystemRequestBus.names index c2cbe27fbb..d657a8218a 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ComponentModeSystemRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ComponentModeSystemRequestBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "ComponentModeSystemRequestBus", + "base": "ComponentModeSystemRequestBus", "context": "EBusSender", "variant": "", "details": { @@ -9,7 +9,7 @@ }, "methods": [ { - "key": "EnterComponentMode", + "base": "EnterComponentMode", "entry": { "name": "In", "tooltip": "When signaled, this will invoke EnterComponentMode" @@ -31,7 +31,7 @@ ] }, { - "key": "EndComponentMode", + "base": "EndComponentMode", "entry": { "name": "In", "tooltip": "When signaled, this will invoke EndComponentMode" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ConsoleRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ConsoleRequestBus.names index eb2414b9b4..2f2c1a69f7 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ConsoleRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ConsoleRequestBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "ConsoleRequestBus", + "base": "ConsoleRequestBus", "context": "EBusSender", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "ExecuteConsoleCommand", + "base": "ExecuteConsoleCommand", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Execute Console Command" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ConstantGradientRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ConstantGradientRequestBus.names index 6d445cc293..a7313a9ffd 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ConstantGradientRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ConstantGradientRequestBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "ConstantGradientRequestBus", + "base": "ConstantGradientRequestBus", "context": "EBusSender", "variant": "", "details": { @@ -9,7 +9,7 @@ }, "methods": [ { - "key": "GetConstantValue", + "base": "GetConstantValue", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetConstantValue" @@ -31,7 +31,7 @@ ] }, { - "key": "SetConstantValue", + "base": "SetConstantValue", "entry": { "name": "In", "tooltip": "When signaled, this will invoke SetConstantValue" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/CylinderShapeComponentRequestsBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/CylinderShapeComponentRequestsBus.names index a4bd93758f..b4de59a887 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/CylinderShapeComponentRequestsBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/CylinderShapeComponentRequestsBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "CylinderShapeComponentRequestsBus", + "base": "CylinderShapeComponentRequestsBus", "context": "EBusSender", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetCylinderConfiguration", + "base": "GetCylinderConfiguration", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Configuration" @@ -34,7 +34,7 @@ ] }, { - "key": "SetHeight", + "base": "SetHeight", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Height" @@ -58,7 +58,7 @@ ] }, { - "key": "SetRadius", + "base": "SetRadius", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Radius" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/DebugDrawRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/DebugDrawRequestBus.names index 18933932f8..78c04e0aea 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/DebugDrawRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/DebugDrawRequestBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "DebugDrawRequestBus", + "base": "DebugDrawRequestBus", "context": "EBusSender", "variant": "", "details": { @@ -9,7 +9,7 @@ }, "methods": [ { - "key": "DrawTextOnEntity", + "base": "DrawTextOnEntity", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Draw Text On Entity" @@ -50,7 +50,7 @@ ] }, { - "key": "DrawRayEntityToDirection", + "base": "DrawRayEntityToDirection", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Draw Ray Entity To Direction" @@ -91,7 +91,7 @@ ] }, { - "key": "DrawObb", + "base": "DrawObb", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Draw Oriented Bounding Box" @@ -125,7 +125,7 @@ ] }, { - "key": "DrawObbOnEntity", + "base": "DrawObbOnEntity", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Draw Oriented Bounding Box on Entity" @@ -166,7 +166,7 @@ ] }, { - "key": "DrawRayLocationToDirection", + "base": "DrawRayLocationToDirection", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Draw Ray Location To Direction" @@ -206,7 +206,7 @@ ] }, { - "key": "DrawSphereOnEntity", + "base": "DrawSphereOnEntity", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Draw Sphere On Entity" @@ -247,7 +247,7 @@ ] }, { - "key": "DrawAabbOnEntity", + "base": "DrawAabbOnEntity", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Draw Axis Aligned Bounding Box On Entity" @@ -288,7 +288,7 @@ ] }, { - "key": "DrawLineEntityToEntity", + "base": "DrawLineEntityToEntity", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Draw Line Entity To Entity" @@ -330,7 +330,7 @@ ] }, { - "key": "DrawTextAtLocation", + "base": "DrawTextAtLocation", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Draw Text At Location" @@ -370,7 +370,7 @@ ] }, { - "key": "DrawTextOnScreen", + "base": "DrawTextOnScreen", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Draw Text On Screen" @@ -404,7 +404,7 @@ ] }, { - "key": "DrawAabb", + "base": "DrawAabb", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Draw Axis Aligned Bounding Box" @@ -438,7 +438,7 @@ ] }, { - "key": "DrawLineLocationToLocation", + "base": "DrawLineLocationToLocation", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Draw Line Location To Location" @@ -478,7 +478,7 @@ ] }, { - "key": "DrawLineEntityToLocation", + "base": "DrawLineEntityToLocation", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Draw Line Entity To Location" @@ -519,7 +519,7 @@ ] }, { - "key": "DrawRayEntityToEntity", + "base": "DrawRayEntityToEntity", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Draw Ray Entity To Entity" @@ -561,7 +561,7 @@ ] }, { - "key": "DrawSphereAtLocation", + "base": "DrawSphereAtLocation", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Draw Sphere At Location" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/DecalRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/DecalRequestBus.names index 27d0a36cd4..7be614892d 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/DecalRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/DecalRequestBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "DecalRequestBus", + "base": "DecalRequestBus", "context": "EBusSender", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetMaterial", + "base": "GetMaterial", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Material" @@ -32,7 +32,7 @@ ] }, { - "key": "GetSortKey", + "base": "GetSortKey", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Sort Key" @@ -54,7 +54,7 @@ ] }, { - "key": "SetSortKey", + "base": "SetSortKey", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Sort Key" @@ -76,7 +76,7 @@ ] }, { - "key": "SetMaterial", + "base": "SetMaterial", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Material" @@ -98,7 +98,7 @@ ] }, { - "key": "SetAttenuationAngle", + "base": "SetAttenuationAngle", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Attenuation Angle" @@ -120,7 +120,7 @@ ] }, { - "key": "GetOpacity", + "base": "GetOpacity", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Opacity" @@ -142,7 +142,7 @@ ] }, { - "key": "SetOpacity", + "base": "SetOpacity", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Opacity" @@ -164,7 +164,7 @@ ] }, { - "key": "GetAttenuationAngle", + "base": "GetAttenuationAngle", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Attenuation Angle" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/DeferredFogRequestsBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/DeferredFogRequestsBus.names index a7897a582a..a3ba8eda5d 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/DeferredFogRequestsBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/DeferredFogRequestsBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "DeferredFogRequestsBus", + "base": "DeferredFogRequestsBus", "context": "EBusSender", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "SetNoiseTexture", + "base": "SetNoiseTexture", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Noise Texture" @@ -32,7 +32,7 @@ ] }, { - "key": "SetNoiseTexCoordScale", + "base": "SetNoiseTexCoordScale", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Noise Tex Coord Scale" @@ -54,7 +54,7 @@ ] }, { - "key": "SetNoiseTexCoord2Scale", + "base": "SetNoiseTexCoord2Scale", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Noise Tex Coord 2 Scale" @@ -76,7 +76,7 @@ ] }, { - "key": "GetFogMaxHeight", + "base": "GetFogMaxHeight", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Fog Max Height" @@ -98,7 +98,7 @@ ] }, { - "key": "GetNoiseTexCoordScale", + "base": "GetNoiseTexCoordScale", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Noise Tex Coord Scale" @@ -120,7 +120,7 @@ ] }, { - "key": "GetNoiseTexCoordVelocity", + "base": "GetNoiseTexCoordVelocity", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Noise Tex Coord Velocity" @@ -142,7 +142,7 @@ ] }, { - "key": "SetFogEndDistance", + "base": "SetFogEndDistance", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Fog End Distance" @@ -164,7 +164,7 @@ ] }, { - "key": "GetFogEndDistance", + "base": "GetFogEndDistance", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Fog End Distance" @@ -186,7 +186,7 @@ ] }, { - "key": "GetNoiseTexCoord2Scale", + "base": "GetNoiseTexCoord2Scale", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Noise Tex Coord 2 Scale" @@ -208,7 +208,7 @@ ] }, { - "key": "SetNoiseTexCoord2Velocity", + "base": "SetNoiseTexCoord2Velocity", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Noise Tex Coord 2 Velocity" @@ -230,7 +230,7 @@ ] }, { - "key": "GetFogStartDistance", + "base": "GetFogStartDistance", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Fog Start Distance" @@ -252,7 +252,7 @@ ] }, { - "key": "SetFogMaxHeight", + "base": "SetFogMaxHeight", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Fog Max Height" @@ -274,7 +274,7 @@ ] }, { - "key": "SetNoiseTexCoordVelocity", + "base": "SetNoiseTexCoordVelocity", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Noise Tex Coord Velocity" @@ -296,7 +296,7 @@ ] }, { - "key": "GetNoiseTexCoord2Velocity", + "base": "GetNoiseTexCoord2Velocity", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Noise Tex Coord 2 Velocity" @@ -318,7 +318,7 @@ ] }, { - "key": "SetFogStartDistance", + "base": "SetFogStartDistance", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Fog Start Distance" @@ -340,7 +340,7 @@ ] }, { - "key": "GetFogMinHeight", + "base": "GetFogMinHeight", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Fog Min Height" @@ -362,7 +362,7 @@ ] }, { - "key": "GetFogColor", + "base": "GetFogColor", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Fog Color" @@ -384,7 +384,7 @@ ] }, { - "key": "SetOctavesBlendFactor", + "base": "SetOctavesBlendFactor", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Octaves Blend Factor" @@ -406,7 +406,7 @@ ] }, { - "key": "GetOctavesBlendFactor", + "base": "GetOctavesBlendFactor", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Octaves Blend Factor" @@ -428,7 +428,7 @@ ] }, { - "key": "SetFogColor", + "base": "SetFogColor", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Fog Color" @@ -450,7 +450,7 @@ ] }, { - "key": "SetFogMinHeight", + "base": "SetFogMinHeight", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Fog Min Height" @@ -472,7 +472,7 @@ ] }, { - "key": "GetNoiseTexture", + "base": "GetNoiseTexture", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Noise Texture" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/DepthOfFieldRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/DepthOfFieldRequestBus.names index ef3d070f51..781ef189cc 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/DepthOfFieldRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/DepthOfFieldRequestBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "DepthOfFieldRequestBus", + "base": "DepthOfFieldRequestBus", "context": "EBusSender", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetEnableDebugColoringOverride", + "base": "GetEnableDebugColoringOverride", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Enable Debug Coloring Override" @@ -32,7 +32,7 @@ ] }, { - "key": "GetAutoFocusSpeedOverride", + "base": "GetAutoFocusSpeedOverride", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Auto Focus Speed Override" @@ -54,7 +54,7 @@ ] }, { - "key": "SetAutoFocusSensitivity", + "base": "SetAutoFocusSensitivity", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Auto Focus Sensitivity" @@ -76,7 +76,7 @@ ] }, { - "key": "SetAutoFocusDelayOverride", + "base": "SetAutoFocusDelayOverride", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Auto Focus Delay Override" @@ -98,7 +98,7 @@ ] }, { - "key": "GetAutoFocusScreenPosition", + "base": "GetAutoFocusScreenPosition", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Auto Focus Screen Position" @@ -120,7 +120,7 @@ ] }, { - "key": "GetEnableDebugColoring", + "base": "GetEnableDebugColoring", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Enable Debug Coloring" @@ -142,7 +142,7 @@ ] }, { - "key": "SetFocusDistance", + "base": "SetFocusDistance", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Focus Distance" @@ -164,7 +164,7 @@ ] }, { - "key": "SetQualityLevel", + "base": "SetQualityLevel", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Quality Level" @@ -186,7 +186,7 @@ ] }, { - "key": "SetCameraEntityId", + "base": "SetCameraEntityId", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Camera Entity Id" @@ -209,7 +209,7 @@ ] }, { - "key": "SetAutoFocusDelay", + "base": "SetAutoFocusDelay", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Auto Focus Delay" @@ -231,7 +231,7 @@ ] }, { - "key": "GetAutoFocusDelay", + "base": "GetAutoFocusDelay", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Auto Focus Delay" @@ -253,7 +253,7 @@ ] }, { - "key": "SetAutoFocusScreenPosition", + "base": "SetAutoFocusScreenPosition", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Auto Focus Screen Position" @@ -275,7 +275,7 @@ ] }, { - "key": "GetFNumber", + "base": "GetFNumber", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetF Number" @@ -297,7 +297,7 @@ ] }, { - "key": "SetApertureFOverride", + "base": "SetApertureFOverride", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set ApertureF Override" @@ -319,7 +319,7 @@ ] }, { - "key": "SetEnabled", + "base": "SetEnabled", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Enabled" @@ -341,7 +341,7 @@ ] }, { - "key": "SetAutoFocusScreenPositionOverride", + "base": "SetAutoFocusScreenPositionOverride", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Auto Focus Screen Position Override" @@ -363,7 +363,7 @@ ] }, { - "key": "GetQualityLevelOverride", + "base": "GetQualityLevelOverride", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Quality Level Override" @@ -385,7 +385,7 @@ ] }, { - "key": "SetAutoFocusSpeedOverride", + "base": "SetAutoFocusSpeedOverride", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Auto Focus Speed Override" @@ -407,7 +407,7 @@ ] }, { - "key": "GetEnableAutoFocusOverride", + "base": "GetEnableAutoFocusOverride", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Enable Auto Focus Override" @@ -429,7 +429,7 @@ ] }, { - "key": "SetEnableDebugColoring", + "base": "SetEnableDebugColoring", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Enable Debug Coloring" @@ -451,7 +451,7 @@ ] }, { - "key": "SetFocusDistanceOverride", + "base": "SetFocusDistanceOverride", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Focus Distance Override" @@ -473,7 +473,7 @@ ] }, { - "key": "GetEnableAutoFocus", + "base": "GetEnableAutoFocus", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Enable Auto Focus" @@ -495,7 +495,7 @@ ] }, { - "key": "SetApertureF", + "base": "SetApertureF", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set ApertureF" @@ -517,7 +517,7 @@ ] }, { - "key": "SetCameraEntityIdOverride", + "base": "SetCameraEntityIdOverride", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Camera Entity Id Override" @@ -539,7 +539,7 @@ ] }, { - "key": "GetEnabled", + "base": "GetEnabled", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Enabled" @@ -561,7 +561,7 @@ ] }, { - "key": "GetFocusDistance", + "base": "GetFocusDistance", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Focus Distance" @@ -583,7 +583,7 @@ ] }, { - "key": "GetEnabledOverride", + "base": "GetEnabledOverride", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Enabled Override" @@ -605,7 +605,7 @@ ] }, { - "key": "GetCameraEntityId", + "base": "GetCameraEntityId", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Camera Entity Id" @@ -628,7 +628,7 @@ ] }, { - "key": "GetAutoFocusScreenPositionOverride", + "base": "GetAutoFocusScreenPositionOverride", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Auto Focus Screen Position Override" @@ -650,7 +650,7 @@ ] }, { - "key": "GetAutoFocusSpeed", + "base": "GetAutoFocusSpeed", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Auto Focus Speed" @@ -672,7 +672,7 @@ ] }, { - "key": "SetEnabledOverride", + "base": "SetEnabledOverride", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Enabled Override" @@ -694,7 +694,7 @@ ] }, { - "key": "GetAutoFocusSensitivity", + "base": "GetAutoFocusSensitivity", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Auto Focus Sensitivity" @@ -716,7 +716,7 @@ ] }, { - "key": "GetAutoFocusDelayOverride", + "base": "GetAutoFocusDelayOverride", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Auto Focus Delay Override" @@ -738,7 +738,7 @@ ] }, { - "key": "GetApertureF", + "base": "GetApertureF", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get ApertureF" @@ -760,7 +760,7 @@ ] }, { - "key": "GetApertureFOverride", + "base": "GetApertureFOverride", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get ApertureF Override" @@ -782,7 +782,7 @@ ] }, { - "key": "SetAutoFocusSensitivityOverride", + "base": "SetAutoFocusSensitivityOverride", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Auto Focus Sensitivity Override" @@ -804,7 +804,7 @@ ] }, { - "key": "SetQualityLevelOverride", + "base": "SetQualityLevelOverride", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Quality Level Override" @@ -826,7 +826,7 @@ ] }, { - "key": "GetFocusDistanceOverride", + "base": "GetFocusDistanceOverride", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Focus Distance Override" @@ -848,7 +848,7 @@ ] }, { - "key": "SetAutoFocusSpeed", + "base": "SetAutoFocusSpeed", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Auto Focus Speed" @@ -870,7 +870,7 @@ ] }, { - "key": "SetEnableAutoFocusOverride", + "base": "SetEnableAutoFocusOverride", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Enable Auto Focus Override" @@ -892,7 +892,7 @@ ] }, { - "key": "GetQualityLevel", + "base": "GetQualityLevel", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Quality Level" @@ -914,7 +914,7 @@ ] }, { - "key": "GetAutoFocusSensitivityOverride", + "base": "GetAutoFocusSensitivityOverride", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Auto Focus Sensitivity Override" @@ -936,7 +936,7 @@ ] }, { - "key": "SetEnableDebugColoringOverride", + "base": "SetEnableDebugColoringOverride", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Enable Debug Coloring Override" @@ -958,7 +958,7 @@ ] }, { - "key": "SetFNumber", + "base": "SetFNumber", "entry": { "name": "In", "tooltip": "When signaled, this will invoke SetF Number" @@ -980,7 +980,7 @@ ] }, { - "key": "GetCameraEntityIdOverride", + "base": "GetCameraEntityIdOverride", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Camera Entity Id Override" @@ -1002,7 +1002,7 @@ ] }, { - "key": "SetEnableAutoFocus", + "base": "SetEnableAutoFocus", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Enable Auto Focus" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/DirectionalLightRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/DirectionalLightRequestBus.names index 5813d51e40..bed5f6de73 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/DirectionalLightRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/DirectionalLightRequestBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "DirectionalLightRequestBus", + "base": "DirectionalLightRequestBus", "context": "EBusSender", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetNormalShadowBias", + "base": "GetNormalShadowBias", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Normal Shadow Bias" @@ -32,7 +32,7 @@ ] }, { - "key": "GetShadowBias", + "base": "GetShadowBias", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Shadow Bias" @@ -54,7 +54,7 @@ ] }, { - "key": "SetAngularDiameter", + "base": "SetAngularDiameter", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Angular Diameter" @@ -76,7 +76,7 @@ ] }, { - "key": "GetShadowFarClipDistance", + "base": "GetShadowFarClipDistance", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Shadow Far Clip Distance" @@ -98,7 +98,7 @@ ] }, { - "key": "SetShadowBias", + "base": "SetShadowBias", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Shadow Bias" @@ -120,7 +120,7 @@ ] }, { - "key": "SetIntensity", + "base": "SetIntensity", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Intensity" @@ -142,7 +142,7 @@ ] }, { - "key": "SetSplitRatio", + "base": "SetSplitRatio", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Split Ratio" @@ -164,7 +164,7 @@ ] }, { - "key": "GetFilteringSampleCount", + "base": "GetFilteringSampleCount", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Filtering Sample Count" @@ -186,7 +186,7 @@ ] }, { - "key": "GetShadowFilterMethod", + "base": "GetShadowFilterMethod", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Shadow Filter Method" @@ -208,7 +208,7 @@ ] }, { - "key": "GetCameraEntityId", + "base": "GetCameraEntityId", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Camera Entity Id" @@ -231,7 +231,7 @@ ] }, { - "key": "SetDebugColoringEnabled", + "base": "SetDebugColoringEnabled", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Debug Coloring Enabled" @@ -253,7 +253,7 @@ ] }, { - "key": "GetDebugColoringEnabled", + "base": "GetDebugColoringEnabled", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Debug Coloring Enabled" @@ -275,7 +275,7 @@ ] }, { - "key": "GetViewFrustumCorrectionEnabled", + "base": "GetViewFrustumCorrectionEnabled", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get View Frustum Correction Enabled" @@ -297,7 +297,7 @@ ] }, { - "key": "SetViewFrustumCorrectionEnabled", + "base": "SetViewFrustumCorrectionEnabled", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set View Frustum Correction Enabled" @@ -319,7 +319,7 @@ ] }, { - "key": "SetGroundHeight", + "base": "SetGroundHeight", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Ground Height" @@ -341,7 +341,7 @@ ] }, { - "key": "GetShadowReceiverPlaneBiasEnabled", + "base": "GetShadowReceiverPlaneBiasEnabled", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Shadow Receiver Plane Bias Enabled" @@ -363,7 +363,7 @@ ] }, { - "key": "SetShadowmapSize", + "base": "SetShadowmapSize", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Shadowmap Size" @@ -385,7 +385,7 @@ ] }, { - "key": "SetShadowFarClipDistance", + "base": "SetShadowFarClipDistance", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Shadow Far Clip Distance" @@ -407,7 +407,7 @@ ] }, { - "key": "SetCameraEntityId", + "base": "SetCameraEntityId", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Camera Entity Id" @@ -430,7 +430,7 @@ ] }, { - "key": "GetColor", + "base": "GetColor", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Color" @@ -452,7 +452,7 @@ ] }, { - "key": "SetSplitAutomatic", + "base": "SetSplitAutomatic", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Split Automatic" @@ -474,7 +474,7 @@ ] }, { - "key": "SetCascadeFarDepth", + "base": "SetCascadeFarDepth", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Cascade Far Depth" @@ -496,7 +496,7 @@ ] }, { - "key": "GetSplitAutomatic", + "base": "GetSplitAutomatic", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Split Automatic" @@ -518,7 +518,7 @@ ] }, { - "key": "GetGroundHeight", + "base": "GetGroundHeight", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Ground Height" @@ -540,7 +540,7 @@ ] }, { - "key": "SetCascadeCount", + "base": "SetCascadeCount", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Cascade Count" @@ -562,7 +562,7 @@ ] }, { - "key": "SetFilteringSampleCount", + "base": "SetFilteringSampleCount", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Filtering Sample Count" @@ -584,7 +584,7 @@ ] }, { - "key": "GetCascadeCount", + "base": "GetCascadeCount", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Cascade Count" @@ -606,7 +606,7 @@ ] }, { - "key": "GetIntensity", + "base": "GetIntensity", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Intensity" @@ -628,7 +628,7 @@ ] }, { - "key": "SetNormalShadowBias", + "base": "SetNormalShadowBias", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Normal Shadow Bias" @@ -650,7 +650,7 @@ ] }, { - "key": "GetShadowmapSize", + "base": "GetShadowmapSize", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Shadowmap Size" @@ -672,7 +672,7 @@ ] }, { - "key": "GetAngularDiameter", + "base": "GetAngularDiameter", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Angular Diameter" @@ -694,7 +694,7 @@ ] }, { - "key": "SetShadowFilterMethod", + "base": "SetShadowFilterMethod", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Shadow Filter Method" @@ -716,7 +716,7 @@ ] }, { - "key": "SetShadowReceiverPlaneBiasEnabled", + "base": "SetShadowReceiverPlaneBiasEnabled", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Shadow Receiver Plane Bias Enabled" @@ -738,7 +738,7 @@ ] }, { - "key": "GetSplitRatio", + "base": "GetSplitRatio", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Split Ratio" @@ -760,7 +760,7 @@ ] }, { - "key": "GetCascadeFarDepth", + "base": "GetCascadeFarDepth", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Cascade Far Depth" @@ -782,7 +782,7 @@ ] }, { - "key": "SetColor", + "base": "SetColor", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Color" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/DiskShapeComponentRequestsBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/DiskShapeComponentRequestsBus.names index ad7012b470..8ba928cf1a 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/DiskShapeComponentRequestsBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/DiskShapeComponentRequestsBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "DiskShapeComponentRequestsBus", + "base": "DiskShapeComponentRequestsBus", "context": "EBusSender", "variant": "", "details": { @@ -9,7 +9,7 @@ }, "methods": [ { - "key": "GetDiskConfiguration", + "base": "GetDiskConfiguration", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetDiskConfiguration" @@ -32,7 +32,7 @@ ] }, { - "key": "SetRadius", + "base": "SetRadius", "entry": { "name": "In", "tooltip": "When signaled, this will invoke SetRadius" @@ -54,7 +54,7 @@ ] }, { - "key": "GetRadius", + "base": "GetRadius", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetRadius" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/DitherGradientRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/DitherGradientRequestBus.names index 87a65a50e9..3eb019767f 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/DitherGradientRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/DitherGradientRequestBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "DitherGradientRequestBus", + "base": "DitherGradientRequestBus", "context": "EBusSender", "variant": "", "details": { @@ -9,7 +9,7 @@ }, "methods": [ { - "key": "GetPatternType", + "base": "GetPatternType", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetPatternType" @@ -31,7 +31,7 @@ ] }, { - "key": "SetPatternType", + "base": "SetPatternType", "entry": { "name": "In", "tooltip": "When signaled, this will invoke SetPatternType" @@ -53,7 +53,7 @@ ] }, { - "key": "SetPatternOffset", + "base": "SetPatternOffset", "entry": { "name": "In", "tooltip": "When signaled, this will invoke SetPatternOffset" @@ -75,7 +75,7 @@ ] }, { - "key": "GetPatternOffset", + "base": "GetPatternOffset", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetPatternOffset" @@ -97,7 +97,7 @@ ] }, { - "key": "GetPointsPerUnit", + "base": "GetPointsPerUnit", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetPointsPerUnit" @@ -119,7 +119,7 @@ ] }, { - "key": "SetPointsPerUnit", + "base": "SetPointsPerUnit", "entry": { "name": "In", "tooltip": "When signaled, this will invoke SetPointsPerUnit" @@ -141,7 +141,7 @@ ] }, { - "key": "SetUseSystemPointsPerUnit", + "base": "SetUseSystemPointsPerUnit", "entry": { "name": "In", "tooltip": "When signaled, this will invoke SetUseSystemPointsPerUnit" @@ -163,7 +163,7 @@ ] }, { - "key": "GetUseSystemPointsPerUnit", + "base": "GetUseSystemPointsPerUnit", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetUseSystemPointsPerUnit" @@ -185,7 +185,7 @@ ] }, { - "key": "GetGradientSampler", + "base": "GetGradientSampler", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetGradientSampler" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/EditorCameraRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/EditorCameraRequestBus.names index cbc3fcc40e..000d01dd63 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/EditorCameraRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/EditorCameraRequestBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "EditorCameraRequestBus", + "base": "EditorCameraRequestBus", "context": "EBusSender", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "SetViewFromEntityPerspective", + "base": "SetViewFromEntityPerspective", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set View From Entity Perspective" @@ -33,7 +33,7 @@ ] }, { - "key": "SetViewAndMovementLockFromEntityPerspective", + "base": "SetViewAndMovementLockFromEntityPerspective", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set View And Movement Lock From Entity Perspective" @@ -62,7 +62,7 @@ ] }, { - "key": "GetCurrentViewEntityId", + "base": "GetCurrentViewEntityId", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Current View Entity Id" @@ -85,7 +85,7 @@ ] }, { - "key": "GetActiveCameraPosition", + "base": "GetActiveCameraPosition", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Active Camera Position" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/EditorCameraViewRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/EditorCameraViewRequestBus.names index e24bf3f6d2..1fd0dafc6e 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/EditorCameraViewRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/EditorCameraViewRequestBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "EditorCameraViewRequestBus", + "base": "EditorCameraViewRequestBus", "context": "EBusSender", "variant": "", "details": { @@ -9,7 +9,7 @@ }, "methods": [ { - "key": "ToggleCameraAsActiveView", + "base": "ToggleCameraAsActiveView", "entry": { "name": "In", "tooltip": "When signaled, this will invoke ToggleCameraAsActiveView" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/EditorEntityAPIBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/EditorEntityAPIBus.names index 590311828a..2e11a4e4ee 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/EditorEntityAPIBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/EditorEntityAPIBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "EditorEntityAPIBus", + "base": "EditorEntityAPIBus", "context": "EBusSender", "variant": "", "details": { @@ -9,7 +9,7 @@ }, "methods": [ { - "key": "SetVisibilityState", + "base": "SetVisibilityState", "entry": { "name": "In", "tooltip": "When signaled, this will invoke SetVisibilityState" @@ -31,7 +31,7 @@ ] }, { - "key": "SetLockState", + "base": "SetLockState", "entry": { "name": "In", "tooltip": "When signaled, this will invoke SetLockState" @@ -53,7 +53,7 @@ ] }, { - "key": "SetStartStatus", + "base": "SetStartStatus", "entry": { "name": "In", "tooltip": "When signaled, this will invoke SetStartStatus" @@ -75,7 +75,7 @@ ] }, { - "key": "SetName", + "base": "SetName", "entry": { "name": "In", "tooltip": "When signaled, this will invoke SetName" @@ -97,7 +97,7 @@ ] }, { - "key": "SetParent", + "base": "SetParent", "entry": { "name": "In", "tooltip": "When signaled, this will invoke SetParent" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/EditorEntityContextRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/EditorEntityContextRequestBus.names index 6071cd821c..f87678c0fa 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/EditorEntityContextRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/EditorEntityContextRequestBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "EditorEntityContextRequestBus", + "base": "EditorEntityContextRequestBus", "context": "EBusSender", "variant": "", "details": { @@ -9,7 +9,7 @@ }, "methods": [ { - "key": "GetEditorEntityContextId", + "base": "GetEditorEntityContextId", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetEditorEntityContextId" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/EditorEntityInfoRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/EditorEntityInfoRequestBus.names index 955cee31e7..c8c2085ede 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/EditorEntityInfoRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/EditorEntityInfoRequestBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "EditorEntityInfoRequestBus", + "base": "EditorEntityInfoRequestBus", "context": "EBusSender", "variant": "", "details": { @@ -9,7 +9,7 @@ }, "methods": [ { - "key": "GetName", + "base": "GetName", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetName" @@ -31,7 +31,7 @@ ] }, { - "key": "IsVisible", + "base": "IsVisible", "entry": { "name": "In", "tooltip": "When signaled, this will invoke IsVisible" @@ -53,7 +53,7 @@ ] }, { - "key": "GetChildIndex", + "base": "GetChildIndex", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetChildIndex" @@ -84,7 +84,7 @@ ] }, { - "key": "GetStartStatus", + "base": "GetStartStatus", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetStartStatus" @@ -106,7 +106,7 @@ ] }, { - "key": "GetChild", + "base": "GetChild", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetChild" @@ -137,7 +137,7 @@ ] }, { - "key": "GetChildCount", + "base": "GetChildCount", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetChildCount" @@ -159,7 +159,7 @@ ] }, { - "key": "GetChildren", + "base": "GetChildren", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetChildren" @@ -181,7 +181,7 @@ ] }, { - "key": "IsLocked", + "base": "IsLocked", "entry": { "name": "In", "tooltip": "When signaled, this will invoke IsLocked" @@ -203,7 +203,7 @@ ] }, { - "key": "GetParent", + "base": "GetParent", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetParent" @@ -226,7 +226,7 @@ ] }, { - "key": "IsHidden", + "base": "IsHidden", "entry": { "name": "In", "tooltip": "When signaled, this will invoke IsHidden" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/EditorLayerComponentRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/EditorLayerComponentRequestBus.names index 820632b705..f280f11360 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/EditorLayerComponentRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/EditorLayerComponentRequestBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "EditorLayerComponentRequestBus", + "base": "EditorLayerComponentRequestBus", "context": "EBusSender", "variant": "", "details": { @@ -9,7 +9,7 @@ }, "methods": [ { - "key": "SetVisibility", + "base": "SetVisibility", "entry": { "name": "In", "tooltip": "When signaled, this will invoke SetVisibility" @@ -31,7 +31,7 @@ ] }, { - "key": "SetLayerColor", + "base": "SetLayerColor", "entry": { "name": "In", "tooltip": "When signaled, this will invoke SetLayerColor" @@ -53,7 +53,7 @@ ] }, { - "key": "GetColorPropertyValue", + "base": "GetColorPropertyValue", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetColorPropertyValue" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/EditorLayerTrackViewRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/EditorLayerTrackViewRequestBus.names index 6f7bf51a14..58712e28bd 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/EditorLayerTrackViewRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/EditorLayerTrackViewRequestBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "EditorLayerTrackViewRequestBus", + "base": "EditorLayerTrackViewRequestBus", "context": "EBusSender", "variant": "", "details": { @@ -9,7 +9,7 @@ }, "methods": [ { - "key": "NewSequence", + "base": "NewSequence", "entry": { "name": "In", "tooltip": "When signaled, this will invoke NewSequence" @@ -37,7 +37,7 @@ ] }, { - "key": "SetRecording", + "base": "SetRecording", "entry": { "name": "In", "tooltip": "When signaled, this will invoke SetRecording" @@ -59,7 +59,7 @@ ] }, { - "key": "GetNumSequences", + "base": "GetNumSequences", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetNumSequences" @@ -81,7 +81,7 @@ ] }, { - "key": "GetSequenceName", + "base": "GetSequenceName", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetSequenceName" @@ -111,7 +111,7 @@ ] }, { - "key": "GetSequenceTimeRange", + "base": "GetSequenceTimeRange", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetSequenceTimeRange" @@ -141,7 +141,7 @@ ] }, { - "key": "PlaySequence", + "base": "PlaySequence", "entry": { "name": "In", "tooltip": "When signaled, this will invoke PlaySequence" @@ -155,7 +155,7 @@ } }, { - "key": "GetNodeName", + "base": "GetNodeName", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetNodeName" @@ -191,7 +191,7 @@ ] }, { - "key": "SetSequenceTimeRange", + "base": "SetSequenceTimeRange", "entry": { "name": "In", "tooltip": "When signaled, this will invoke SetSequenceTimeRange" @@ -225,7 +225,7 @@ ] }, { - "key": "DeleteSequence", + "base": "DeleteSequence", "entry": { "name": "In", "tooltip": "When signaled, this will invoke DeleteSequence" @@ -247,7 +247,7 @@ ] }, { - "key": "GetKeyValue", + "base": "GetKeyValue", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetKeyValue" @@ -301,7 +301,7 @@ ] }, { - "key": "StopSequence", + "base": "StopSequence", "entry": { "name": "In", "tooltip": "When signaled, this will invoke StopSequence" @@ -315,7 +315,7 @@ } }, { - "key": "AddSelectedEntities", + "base": "AddSelectedEntities", "entry": { "name": "In", "tooltip": "When signaled, this will invoke AddSelectedEntities" @@ -329,7 +329,7 @@ } }, { - "key": "GetNumTrackKeys", + "base": "GetNumTrackKeys", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetNumTrackKeys" @@ -377,7 +377,7 @@ ] }, { - "key": "AddLayerNode", + "base": "AddLayerNode", "entry": { "name": "In", "tooltip": "When signaled, this will invoke AddLayerNode" @@ -391,7 +391,7 @@ } }, { - "key": "DeleteNode", + "base": "DeleteNode", "entry": { "name": "In", "tooltip": "When signaled, this will invoke DeleteNode" @@ -419,7 +419,7 @@ ] }, { - "key": "GetInterpolatedValue", + "base": "GetInterpolatedValue", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetInterpolatedValue" @@ -473,7 +473,7 @@ ] }, { - "key": "GetNumNodes", + "base": "GetNumNodes", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetNumNodes" @@ -503,7 +503,7 @@ ] }, { - "key": "AddNode", + "base": "AddNode", "entry": { "name": "In", "tooltip": "When signaled, this will invoke AddNode" @@ -531,7 +531,7 @@ ] }, { - "key": "AddTrack", + "base": "AddTrack", "entry": { "name": "In", "tooltip": "When signaled, this will invoke AddTrack" @@ -565,7 +565,7 @@ ] }, { - "key": "DeleteTrack", + "base": "DeleteTrack", "entry": { "name": "In", "tooltip": "When signaled, this will invoke DeleteTrack" @@ -605,7 +605,7 @@ ] }, { - "key": "SetCurrentSequence", + "base": "SetCurrentSequence", "entry": { "name": "In", "tooltip": "When signaled, this will invoke SetCurrentSequence" @@ -627,7 +627,7 @@ ] }, { - "key": "SetTime", + "base": "SetTime", "entry": { "name": "In", "tooltip": "When signaled, this will invoke SetTime" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/EditorReflectionProbeBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/EditorReflectionProbeBus.names index 78a087ae6b..9893d61dad 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/EditorReflectionProbeBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/EditorReflectionProbeBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "EditorReflectionProbeBus", + "base": "EditorReflectionProbeBus", "context": "EBusSender", "variant": "", "details": { @@ -9,7 +9,7 @@ }, "methods": [ { - "key": "BakeReflectionProbe", + "base": "BakeReflectionProbe", "entry": { "name": "In", "tooltip": "When signaled, this will invoke BakeReflectionProbe" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/EditorRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/EditorRequestBus.names index 658dcf6369..55ee11ab52 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/EditorRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/EditorRequestBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "EditorRequestBus", + "base": "EditorRequestBus", "context": "EBusSender", "variant": "", "details": { @@ -9,7 +9,7 @@ }, "methods": [ { - "key": "RegisterCustomViewPane", + "base": "RegisterCustomViewPane", "entry": { "name": "In", "tooltip": "When signaled, this will invoke RegisterCustomViewPane" @@ -43,7 +43,7 @@ ] }, { - "key": "UnregisterViewPane", + "base": "UnregisterViewPane", "entry": { "name": "In", "tooltip": "When signaled, this will invoke UnregisterViewPane" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/EditorToolsApplicationRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/EditorToolsApplicationRequestBus.names index 1734915b62..1fd4ea025a 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/EditorToolsApplicationRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/EditorToolsApplicationRequestBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "EditorToolsApplicationRequestBus", + "base": "EditorToolsApplicationRequestBus", "context": "EBusSender", "variant": "", "details": { @@ -9,7 +9,7 @@ }, "methods": [ { - "key": "Exit", + "base": "Exit", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Exit" @@ -23,7 +23,7 @@ } }, { - "key": "GetCurrentLevelName", + "base": "GetCurrentLevelName", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetCurrentLevelName" @@ -45,7 +45,7 @@ ] }, { - "key": "GetGameFolder", + "base": "GetGameFolder", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetGameFolder" @@ -67,7 +67,7 @@ ] }, { - "key": "CreateLevelNoPrompt", + "base": "CreateLevelNoPrompt", "entry": { "name": "In", "tooltip": "When signaled, this will invoke CreateLevelNoPrompt" @@ -109,7 +109,7 @@ ] }, { - "key": "OpenLevelNoPrompt", + "base": "OpenLevelNoPrompt", "entry": { "name": "In", "tooltip": "When signaled, this will invoke OpenLevelNoPrompt" @@ -139,7 +139,7 @@ ] }, { - "key": "GetCurrentLevelPath", + "base": "GetCurrentLevelPath", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetCurrentLevelPath" @@ -161,7 +161,7 @@ ] }, { - "key": "ExitNoPrompt", + "base": "ExitNoPrompt", "entry": { "name": "In", "tooltip": "When signaled, this will invoke ExitNoPrompt" @@ -175,7 +175,7 @@ } }, { - "key": "OpenLevel", + "base": "OpenLevel", "entry": { "name": "In", "tooltip": "When signaled, this will invoke OpenLevel" @@ -205,7 +205,7 @@ ] }, { - "key": "CreateLevel", + "base": "CreateLevel", "entry": { "name": "In", "tooltip": "When signaled, this will invoke CreateLevel" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/EditorTransformComponentSelectionRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/EditorTransformComponentSelectionRequestBus.names index 61641cf327..bd7e0157b9 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/EditorTransformComponentSelectionRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/EditorTransformComponentSelectionRequestBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "EditorTransformComponentSelectionRequestBus", + "base": "EditorTransformComponentSelectionRequestBus", "context": "EBusSender", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "CopyTranslationToSelectedEntitiesGroup", + "base": "CopyTranslationToSelectedEntitiesGroup", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Copy Translation To Selected Entities Group" @@ -32,7 +32,7 @@ ] }, { - "key": "CopyOrientationToSelectedEntitiesIndividual", + "base": "CopyOrientationToSelectedEntitiesIndividual", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Copy Orientation To Selected Entities Individual" @@ -54,7 +54,7 @@ ] }, { - "key": "CopyOrientationToSelectedEntitiesGroup", + "base": "CopyOrientationToSelectedEntitiesGroup", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Copy Orientation To Selected Entities Group" @@ -76,7 +76,7 @@ ] }, { - "key": "CopyTranslationToSelectedEntitiesIndividual", + "base": "CopyTranslationToSelectedEntitiesIndividual", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Copy Translation To Selected Entities Individual" @@ -98,7 +98,7 @@ ] }, { - "key": "CopyScaleToSelectedEntitiesIndividualLocal", + "base": "CopyScaleToSelectedEntitiesIndividualLocal", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Copy Scale To Selected Entities Individual Local" @@ -120,7 +120,7 @@ ] }, { - "key": "OverrideManipulatorTranslation", + "base": "OverrideManipulatorTranslation", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Override Manipulator Translation" @@ -142,7 +142,7 @@ ] }, { - "key": "RefreshManipulators", + "base": "RefreshManipulators", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Refresh Manipulators" @@ -164,7 +164,7 @@ ] }, { - "key": "OverrideManipulatorOrientation", + "base": "OverrideManipulatorOrientation", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Override Manipulator Orientation" @@ -186,7 +186,7 @@ ] }, { - "key": "GetTransformMode", + "base": "GetTransformMode", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Transform Mode" @@ -208,7 +208,7 @@ ] }, { - "key": "CopyScaleToSelectedEntitiesIndividualWorld", + "base": "CopyScaleToSelectedEntitiesIndividualWorld", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Copy Scale To Selected Entities Individual World" @@ -230,7 +230,7 @@ ] }, { - "key": "SetTransformMode", + "base": "SetTransformMode", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Transform Mode" @@ -252,7 +252,7 @@ ] }, { - "key": "ResetTranslationForSelectedEntitiesLocal", + "base": "ResetTranslationForSelectedEntitiesLocal", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Reset Translation For Selected Entities Local" @@ -266,7 +266,7 @@ } }, { - "key": "ResetOrientationForSelectedEntitiesLocal", + "base": "ResetOrientationForSelectedEntitiesLocal", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Reset Orientation For Selected Entities Local" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ExposureControlRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ExposureControlRequestBus.names index 89ecca21dc..35662639a7 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ExposureControlRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ExposureControlRequestBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "ExposureControlRequestBus", + "base": "ExposureControlRequestBus", "context": "EBusSender", "variant": "", "details": { @@ -9,7 +9,7 @@ }, "methods": [ { - "key": "SetEyeAdaptationSpeedDownOverride", + "base": "SetEyeAdaptationSpeedDownOverride", "entry": { "name": "In", "tooltip": "When signaled, this will invoke SetEyeAdaptationSpeedDownOverride" @@ -31,7 +31,7 @@ ] }, { - "key": "GetEnabled", + "base": "GetEnabled", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetEnabled" @@ -53,7 +53,7 @@ ] }, { - "key": "SetEnabledOverride", + "base": "SetEnabledOverride", "entry": { "name": "In", "tooltip": "When signaled, this will invoke SetEnabledOverride" @@ -75,7 +75,7 @@ ] }, { - "key": "SetManualCompensation", + "base": "SetManualCompensation", "entry": { "name": "In", "tooltip": "When signaled, this will invoke SetManualCompensation" @@ -97,7 +97,7 @@ ] }, { - "key": "SetEyeAdaptationSpeedDown", + "base": "SetEyeAdaptationSpeedDown", "entry": { "name": "In", "tooltip": "When signaled, this will invoke SetEyeAdaptationSpeedDown" @@ -119,7 +119,7 @@ ] }, { - "key": "GetExposureControlTypeOverride", + "base": "GetExposureControlTypeOverride", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetExposureControlTypeOverride" @@ -141,7 +141,7 @@ ] }, { - "key": "GetHeatmapEnabled", + "base": "GetHeatmapEnabled", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetHeatmapEnabled" @@ -163,7 +163,7 @@ ] }, { - "key": "SetEyeAdaptationSpeedUpOverride", + "base": "SetEyeAdaptationSpeedUpOverride", "entry": { "name": "In", "tooltip": "When signaled, this will invoke SetEyeAdaptationSpeedUpOverride" @@ -185,7 +185,7 @@ ] }, { - "key": "SetExposureControlType", + "base": "SetExposureControlType", "entry": { "name": "In", "tooltip": "When signaled, this will invoke SetExposureControlType" @@ -207,7 +207,7 @@ ] }, { - "key": "SetEnabled", + "base": "SetEnabled", "entry": { "name": "In", "tooltip": "When signaled, this will invoke SetEnabled" @@ -229,7 +229,7 @@ ] }, { - "key": "GetExposureControlType", + "base": "GetExposureControlType", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetExposureControlType" @@ -251,7 +251,7 @@ ] }, { - "key": "SetEyeAdaptationExposureMax", + "base": "SetEyeAdaptationExposureMax", "entry": { "name": "In", "tooltip": "When signaled, this will invoke SetEyeAdaptationExposureMax" @@ -273,7 +273,7 @@ ] }, { - "key": "GetEyeAdaptationSpeedDownOverride", + "base": "GetEyeAdaptationSpeedDownOverride", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetEyeAdaptationSpeedDownOverride" @@ -295,7 +295,7 @@ ] }, { - "key": "GetManualCompensationOverride", + "base": "GetManualCompensationOverride", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetManualCompensationOverride" @@ -317,7 +317,7 @@ ] }, { - "key": "GetHeatmapEnabledOverride", + "base": "GetHeatmapEnabledOverride", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetHeatmapEnabledOverride" @@ -339,7 +339,7 @@ ] }, { - "key": "SetEyeAdaptationSpeedUp", + "base": "SetEyeAdaptationSpeedUp", "entry": { "name": "In", "tooltip": "When signaled, this will invoke SetEyeAdaptationSpeedUp" @@ -361,7 +361,7 @@ ] }, { - "key": "GetEyeAdaptationSpeedUpOverride", + "base": "GetEyeAdaptationSpeedUpOverride", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetEyeAdaptationSpeedUpOverride" @@ -383,7 +383,7 @@ ] }, { - "key": "GetEyeAdaptationExposureMinOverride", + "base": "GetEyeAdaptationExposureMinOverride", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetEyeAdaptationExposureMinOverride" @@ -405,7 +405,7 @@ ] }, { - "key": "GetEyeAdaptationExposureMaxOverride", + "base": "GetEyeAdaptationExposureMaxOverride", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetEyeAdaptationExposureMaxOverride" @@ -427,7 +427,7 @@ ] }, { - "key": "GetEnabledOverride", + "base": "GetEnabledOverride", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetEnabledOverride" @@ -449,7 +449,7 @@ ] }, { - "key": "SetExposureControlTypeOverride", + "base": "SetExposureControlTypeOverride", "entry": { "name": "In", "tooltip": "When signaled, this will invoke SetExposureControlTypeOverride" @@ -471,7 +471,7 @@ ] }, { - "key": "GetEyeAdaptationExposureMin", + "base": "GetEyeAdaptationExposureMin", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetEyeAdaptationExposureMin" @@ -493,7 +493,7 @@ ] }, { - "key": "GetManualCompensation", + "base": "GetManualCompensation", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetManualCompensation" @@ -515,7 +515,7 @@ ] }, { - "key": "SetEyeAdaptationExposureMinOverride", + "base": "SetEyeAdaptationExposureMinOverride", "entry": { "name": "In", "tooltip": "When signaled, this will invoke SetEyeAdaptationExposureMinOverride" @@ -537,7 +537,7 @@ ] }, { - "key": "SetManualCompensationOverride", + "base": "SetManualCompensationOverride", "entry": { "name": "In", "tooltip": "When signaled, this will invoke SetManualCompensationOverride" @@ -559,7 +559,7 @@ ] }, { - "key": "GetEyeAdaptationSpeedDown", + "base": "GetEyeAdaptationSpeedDown", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetEyeAdaptationSpeedDown" @@ -581,7 +581,7 @@ ] }, { - "key": "GetEyeAdaptationSpeedUp", + "base": "GetEyeAdaptationSpeedUp", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetEyeAdaptationSpeedUp" @@ -603,7 +603,7 @@ ] }, { - "key": "SetEyeAdaptationExposureMin", + "base": "SetEyeAdaptationExposureMin", "entry": { "name": "In", "tooltip": "When signaled, this will invoke SetEyeAdaptationExposureMin" @@ -625,7 +625,7 @@ ] }, { - "key": "SetHeatmapEnabled", + "base": "SetHeatmapEnabled", "entry": { "name": "In", "tooltip": "When signaled, this will invoke SetHeatmapEnabled" @@ -647,7 +647,7 @@ ] }, { - "key": "SetEyeAdaptationExposureMaxOverride", + "base": "SetEyeAdaptationExposureMaxOverride", "entry": { "name": "In", "tooltip": "When signaled, this will invoke SetEyeAdaptationExposureMaxOverride" @@ -669,7 +669,7 @@ ] }, { - "key": "GetEyeAdaptationExposureMax", + "base": "GetEyeAdaptationExposureMax", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetEyeAdaptationExposureMax" @@ -691,7 +691,7 @@ ] }, { - "key": "SetHeatmapEnabledOverride", + "base": "SetHeatmapEnabledOverride", "entry": { "name": "In", "tooltip": "When signaled, this will invoke SetHeatmapEnabledOverride" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/FlyCameraInputBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/FlyCameraInputBus.names index 616cabcfb5..d8bba2a01f 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/FlyCameraInputBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/FlyCameraInputBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "FlyCameraInputBus", + "base": "FlyCameraInputBus", "context": "EBusSender", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "SetIsEnabled", + "base": "SetIsEnabled", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Is Enabled" @@ -32,7 +32,7 @@ ] }, { - "key": "GetIsEnabled", + "base": "GetIsEnabled", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Is Enabled" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ForceLinearDampingRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ForceLinearDampingRequestBus.names index 46da76a5ca..a54c222351 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ForceLinearDampingRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ForceLinearDampingRequestBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "ForceLinearDampingRequestBus", + "base": "ForceLinearDampingRequestBus", "context": "EBusSender", "variant": "", "details": { @@ -9,7 +9,7 @@ }, "methods": [ { - "key": "SetDamping", + "base": "SetDamping", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Damping" @@ -31,7 +31,7 @@ ] }, { - "key": "GetDamping", + "base": "GetDamping", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Damping" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ForceLocalSpaceRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ForceLocalSpaceRequestBus.names index a3dd070013..bc3416daca 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ForceLocalSpaceRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ForceLocalSpaceRequestBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "ForceLocalSpaceRequestBus", + "base": "ForceLocalSpaceRequestBus", "context": "EBusSender", "variant": "", "details": { @@ -9,7 +9,7 @@ }, "methods": [ { - "key": "SetDirection", + "base": "SetDirection", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Direction" @@ -31,7 +31,7 @@ ] }, { - "key": "GetDirection", + "base": "GetDirection", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Direction" @@ -53,7 +53,7 @@ ] }, { - "key": "SetMagnitude", + "base": "SetMagnitude", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Magnitude" @@ -75,7 +75,7 @@ ] }, { - "key": "GetMagnitude", + "base": "GetMagnitude", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Magnitude" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ForcePointRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ForcePointRequestBus.names index 767d9b1d35..0c0f959f66 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ForcePointRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ForcePointRequestBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "ForcePointRequestBus", + "base": "ForcePointRequestBus", "context": "EBusSender", "variant": "", "details": { @@ -9,7 +9,7 @@ }, "methods": [ { - "key": "SetMagnitude", + "base": "SetMagnitude", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Magnitude" @@ -31,7 +31,7 @@ ] }, { - "key": "GetMagnitude", + "base": "GetMagnitude", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Magnitude" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ForceSimpleDragRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ForceSimpleDragRequestBus.names index 075aa1b6a4..a5540e1f3a 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ForceSimpleDragRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ForceSimpleDragRequestBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "ForceSimpleDragRequestBus", + "base": "ForceSimpleDragRequestBus", "context": "EBusSender", "variant": "", "details": { @@ -9,7 +9,7 @@ }, "methods": [ { - "key": "SetDensity", + "base": "SetDensity", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Density" @@ -31,7 +31,7 @@ ] }, { - "key": "GetDensity", + "base": "GetDensity", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Density" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ForceSplineFollowRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ForceSplineFollowRequestBus.names index 7143fd0b7f..9cf29c9653 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ForceSplineFollowRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ForceSplineFollowRequestBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "ForceSplineFollowRequestBus", + "base": "ForceSplineFollowRequestBus", "context": "EBusSender", "variant": "", "details": { @@ -9,7 +9,7 @@ }, "methods": [ { - "key": "GetLookAhead", + "base": "GetLookAhead", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Look Ahead" @@ -31,7 +31,7 @@ ] }, { - "key": "SetLookAhead", + "base": "SetLookAhead", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Look Ahead" @@ -53,7 +53,7 @@ ] }, { - "key": "SetTargetSpeed", + "base": "SetTargetSpeed", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Target Speed" @@ -75,7 +75,7 @@ ] }, { - "key": "GetFrequency", + "base": "GetFrequency", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Frequency" @@ -97,7 +97,7 @@ ] }, { - "key": "GetDampingRatio", + "base": "GetDampingRatio", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Damping Ratio" @@ -119,7 +119,7 @@ ] }, { - "key": "SetFrequency", + "base": "SetFrequency", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Frequency" @@ -141,7 +141,7 @@ ] }, { - "key": "GetTargetSpeed", + "base": "GetTargetSpeed", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Target Speed" @@ -163,7 +163,7 @@ ] }, { - "key": "SetDampingRatio", + "base": "SetDampingRatio", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Damping Ratio" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ForceWorldSpaceRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ForceWorldSpaceRequestBus.names index f9c1b2dcbe..bb7f2efc9b 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ForceWorldSpaceRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ForceWorldSpaceRequestBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "ForceWorldSpaceRequestBus", + "base": "ForceWorldSpaceRequestBus", "context": "EBusSender", "variant": "", "details": { @@ -9,7 +9,7 @@ }, "methods": [ { - "key": "SetDirection", + "base": "SetDirection", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Direction" @@ -31,7 +31,7 @@ ] }, { - "key": "GetDirection", + "base": "GetDirection", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Direction" @@ -53,7 +53,7 @@ ] }, { - "key": "SetMagnitude", + "base": "SetMagnitude", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Magnitude" @@ -75,7 +75,7 @@ ] }, { - "key": "GetMagnitude", + "base": "GetMagnitude", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Magnitude" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/FrameCaptureRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/FrameCaptureRequestBus.names index 6d7bcf4b37..6730264044 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/FrameCaptureRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/FrameCaptureRequestBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "FrameCaptureRequestBus", + "base": "FrameCaptureRequestBus", "context": "EBusSender", "variant": "", "details": { @@ -9,7 +9,7 @@ }, "methods": [ { - "key": "CaptureScreenshot", + "base": "CaptureScreenshot", "entry": { "name": "In", "tooltip": "When signaled, this will invoke CaptureScreenshot" @@ -39,7 +39,7 @@ ] }, { - "key": "CaptureScreenshotWithPreview", + "base": "CaptureScreenshotWithPreview", "entry": { "name": "In", "tooltip": "When signaled, this will invoke CaptureScreenshotWithPreview" @@ -69,7 +69,7 @@ ] }, { - "key": "CapturePassAttachment", + "base": "CapturePassAttachment", "entry": { "name": "In", "tooltip": "When signaled, this will invoke CapturePassAttachment" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/GameEntityContextRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/GameEntityContextRequestBus.names index bb38d2256a..fcb99ddf16 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/GameEntityContextRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/GameEntityContextRequestBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "GameEntityContextRequestBus", + "base": "GameEntityContextRequestBus", "context": "EBusSender", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "DeactivateGameEntity", + "base": "DeactivateGameEntity", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Deactivate Game Entity" @@ -33,7 +33,7 @@ ] }, { - "key": "GetEntityName", + "base": "GetEntityName", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Entity Name" @@ -64,7 +64,7 @@ ] }, { - "key": "ActivateGameEntity", + "base": "ActivateGameEntity", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Activate Game Entity" @@ -87,7 +87,7 @@ ] }, { - "key": "DestroyGameEntityAndDescendants", + "base": "DestroyGameEntityAndDescendants", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Destroy Game Entity And Descendants" @@ -110,7 +110,7 @@ ] }, { - "key": "DestroyGameEntity", + "base": "DestroyGameEntity", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Destroy Game Entity" @@ -133,7 +133,7 @@ ] }, { - "key": "CreateGameEntity", + "base": "CreateGameEntity", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Create Game Entity" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/GradientRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/GradientRequestBus.names index 166b973286..0837fb2d27 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/GradientRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/GradientRequestBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "GradientRequestBus", + "base": "GradientRequestBus", "context": "EBusSender", "variant": "", "details": { @@ -9,7 +9,7 @@ }, "methods": [ { - "key": "GetValue", + "base": "GetValue", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetValue" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/GradientSurfaceDataRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/GradientSurfaceDataRequestBus.names index 122331320f..7e7b9260b5 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/GradientSurfaceDataRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/GradientSurfaceDataRequestBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "GradientSurfaceDataRequestBus", + "base": "GradientSurfaceDataRequestBus", "context": "EBusSender", "variant": "", "details": { @@ -9,7 +9,7 @@ }, "methods": [ { - "key": "GetThresholdMax", + "base": "GetThresholdMax", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetThresholdMax" @@ -31,7 +31,7 @@ ] }, { - "key": "SetThresholdMax", + "base": "SetThresholdMax", "entry": { "name": "In", "tooltip": "When signaled, this will invoke SetThresholdMax" @@ -53,7 +53,7 @@ ] }, { - "key": "GetNumTags", + "base": "GetNumTags", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetNumTags" @@ -75,7 +75,7 @@ ] }, { - "key": "RemoveTag", + "base": "RemoveTag", "entry": { "name": "In", "tooltip": "When signaled, this will invoke RemoveTag" @@ -97,7 +97,7 @@ ] }, { - "key": "GetThresholdMin", + "base": "GetThresholdMin", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetThresholdMin" @@ -119,7 +119,7 @@ ] }, { - "key": "SetShapeConstraintEntityId", + "base": "SetShapeConstraintEntityId", "entry": { "name": "In", "tooltip": "When signaled, this will invoke SetShapeConstraintEntityId" @@ -142,7 +142,7 @@ ] }, { - "key": "SetThresholdMin", + "base": "SetThresholdMin", "entry": { "name": "In", "tooltip": "When signaled, this will invoke SetThresholdMin" @@ -164,7 +164,7 @@ ] }, { - "key": "GetTag", + "base": "GetTag", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetTag" @@ -194,7 +194,7 @@ ] }, { - "key": "AddTag", + "base": "AddTag", "entry": { "name": "In", "tooltip": "When signaled, this will invoke AddTag" @@ -216,7 +216,7 @@ ] }, { - "key": "GetShapeConstraintEntityId", + "base": "GetShapeConstraintEntityId", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetShapeConstraintEntityId" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/GradientTransformModifierRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/GradientTransformModifierRequestBus.names index c814d47ba7..8628947f96 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/GradientTransformModifierRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/GradientTransformModifierRequestBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "GradientTransformModifierRequestBus", + "base": "GradientTransformModifierRequestBus", "context": "EBusSender", "variant": "", "details": { @@ -9,7 +9,7 @@ }, "methods": [ { - "key": "SetOverrideTranslate", + "base": "SetOverrideTranslate", "entry": { "name": "In", "tooltip": "When signaled, this will invoke SetOverrideTranslate" @@ -31,7 +31,7 @@ ] }, { - "key": "GetRotate", + "base": "GetRotate", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetRotate" @@ -53,7 +53,7 @@ ] }, { - "key": "GetBounds", + "base": "GetBounds", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetBounds" @@ -75,7 +75,7 @@ ] }, { - "key": "SetTransformType", + "base": "SetTransformType", "entry": { "name": "In", "tooltip": "When signaled, this will invoke SetTransformType" @@ -97,7 +97,7 @@ ] }, { - "key": "GetOverrideTranslate", + "base": "GetOverrideTranslate", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetOverrideTranslate" @@ -119,7 +119,7 @@ ] }, { - "key": "GetOverrideBounds", + "base": "GetOverrideBounds", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetOverrideBounds" @@ -141,7 +141,7 @@ ] }, { - "key": "SetRotate", + "base": "SetRotate", "entry": { "name": "In", "tooltip": "When signaled, this will invoke SetRotate" @@ -163,7 +163,7 @@ ] }, { - "key": "SetOverrideScale", + "base": "SetOverrideScale", "entry": { "name": "In", "tooltip": "When signaled, this will invoke SetOverrideScale" @@ -185,7 +185,7 @@ ] }, { - "key": "GetScale", + "base": "GetScale", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetScale" @@ -207,7 +207,7 @@ ] }, { - "key": "SetScale", + "base": "SetScale", "entry": { "name": "In", "tooltip": "When signaled, this will invoke SetScale" @@ -229,7 +229,7 @@ ] }, { - "key": "GetIs3D", + "base": "GetIs3D", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetIs3D" @@ -251,7 +251,7 @@ ] }, { - "key": "SetShapeReference", + "base": "SetShapeReference", "entry": { "name": "In", "tooltip": "When signaled, this will invoke SetShapeReference" @@ -274,7 +274,7 @@ ] }, { - "key": "SetBounds", + "base": "SetBounds", "entry": { "name": "In", "tooltip": "When signaled, this will invoke SetBounds" @@ -296,7 +296,7 @@ ] }, { - "key": "SetFrequencyZoom", + "base": "SetFrequencyZoom", "entry": { "name": "In", "tooltip": "When signaled, this will invoke SetFrequencyZoom" @@ -318,7 +318,7 @@ ] }, { - "key": "SetWrappingType", + "base": "SetWrappingType", "entry": { "name": "In", "tooltip": "When signaled, this will invoke SetWrappingType" @@ -340,7 +340,7 @@ ] }, { - "key": "GetShapeReference", + "base": "GetShapeReference", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetShapeReference" @@ -363,7 +363,7 @@ ] }, { - "key": "SetOverrideBounds", + "base": "SetOverrideBounds", "entry": { "name": "In", "tooltip": "When signaled, this will invoke SetOverrideBounds" @@ -385,7 +385,7 @@ ] }, { - "key": "GetTransformType", + "base": "GetTransformType", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetTransformType" @@ -407,7 +407,7 @@ ] }, { - "key": "GetOverrideScale", + "base": "GetOverrideScale", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetOverrideScale" @@ -429,7 +429,7 @@ ] }, { - "key": "SetIs3D", + "base": "SetIs3D", "entry": { "name": "In", "tooltip": "When signaled, this will invoke SetIs3D" @@ -451,7 +451,7 @@ ] }, { - "key": "SetAllowReference", + "base": "SetAllowReference", "entry": { "name": "In", "tooltip": "When signaled, this will invoke SetAllowReference" @@ -473,7 +473,7 @@ ] }, { - "key": "SetTranslate", + "base": "SetTranslate", "entry": { "name": "In", "tooltip": "When signaled, this will invoke SetTranslate" @@ -495,7 +495,7 @@ ] }, { - "key": "SetOverrideRotate", + "base": "SetOverrideRotate", "entry": { "name": "In", "tooltip": "When signaled, this will invoke SetOverrideRotate" @@ -517,7 +517,7 @@ ] }, { - "key": "GetAllowReference", + "base": "GetAllowReference", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetAllowReference" @@ -539,7 +539,7 @@ ] }, { - "key": "GetTranslate", + "base": "GetTranslate", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetTranslate" @@ -561,7 +561,7 @@ ] }, { - "key": "GetOverrideRotate", + "base": "GetOverrideRotate", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetOverrideRotate" @@ -583,7 +583,7 @@ ] }, { - "key": "GetFrequencyZoom", + "base": "GetFrequencyZoom", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetFrequencyZoom" @@ -605,7 +605,7 @@ ] }, { - "key": "GetWrappingType", + "base": "GetWrappingType", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetWrappingType" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/GraphControllerRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/GraphControllerRequestBus.names index 8622a204c2..73d3e8ea01 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/GraphControllerRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/GraphControllerRequestBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "GraphControllerRequestBus", + "base": "GraphControllerRequestBus", "context": "EBusSender", "variant": "", "details": { @@ -9,7 +9,7 @@ }, "methods": [ { - "key": "RemoveConnection", + "base": "RemoveConnection", "entry": { "name": "In", "tooltip": "When signaled, this will invoke RemoveConnection" @@ -39,7 +39,7 @@ ] }, { - "key": "AddConnection", + "base": "AddConnection", "entry": { "name": "In", "tooltip": "When signaled, this will invoke AddConnection" @@ -75,7 +75,7 @@ ] }, { - "key": "WrapNode", + "base": "WrapNode", "entry": { "name": "In", "tooltip": "When signaled, this will invoke WrapNode" @@ -103,7 +103,7 @@ ] }, { - "key": "AddConnectionBySlotId", + "base": "AddConnectionBySlotId", "entry": { "name": "In", "tooltip": "When signaled, this will invoke AddConnectionBySlotId" @@ -151,7 +151,7 @@ ] }, { - "key": "AddNode", + "base": "AddNode", "entry": { "name": "In", "tooltip": "When signaled, this will invoke AddNode" @@ -188,7 +188,7 @@ ] }, { - "key": "RemoveNode", + "base": "RemoveNode", "entry": { "name": "In", "tooltip": "When signaled, this will invoke RemoveNode" @@ -218,7 +218,7 @@ ] }, { - "key": "ExtendSlot", + "base": "ExtendSlot", "entry": { "name": "In", "tooltip": "When signaled, this will invoke ExtendSlot" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/GraphManagerRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/GraphManagerRequestBus.names index 13ba4a2b7c..09dc3e9b12 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/GraphManagerRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/GraphManagerRequestBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "GraphManagerRequestBus", + "base": "GraphManagerRequestBus", "context": "EBusSender", "variant": "", "details": { @@ -9,7 +9,7 @@ }, "methods": [ { - "key": "GetGraph", + "base": "GetGraph", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetGraph" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/GridComponentRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/GridComponentRequestBus.names index d30ad4cbc3..8e5415a449 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/GridComponentRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/GridComponentRequestBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "GridComponentRequestBus", + "base": "GridComponentRequestBus", "context": "EBusSender", "variant": "", "details": { @@ -9,7 +9,7 @@ }, "methods": [ { - "key": "SetSecondaryColor", + "base": "SetSecondaryColor", "entry": { "name": "In", "tooltip": "When signaled, this will invoke SetSecondaryColor" @@ -31,7 +31,7 @@ ] }, { - "key": "GetPrimarySpacing", + "base": "GetPrimarySpacing", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetPrimarySpacing" @@ -53,7 +53,7 @@ ] }, { - "key": "GetSecondaryColor", + "base": "GetSecondaryColor", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetSecondaryColor" @@ -75,7 +75,7 @@ ] }, { - "key": "SetAxisColor", + "base": "SetAxisColor", "entry": { "name": "In", "tooltip": "When signaled, this will invoke SetAxisColor" @@ -97,7 +97,7 @@ ] }, { - "key": "SetPrimaryColor", + "base": "SetPrimaryColor", "entry": { "name": "In", "tooltip": "When signaled, this will invoke SetPrimaryColor" @@ -119,7 +119,7 @@ ] }, { - "key": "GetAxisColor", + "base": "GetAxisColor", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetAxisColor" @@ -141,7 +141,7 @@ ] }, { - "key": "SetPrimarySpacing", + "base": "SetPrimarySpacing", "entry": { "name": "In", "tooltip": "When signaled, this will invoke SetPrimarySpacing" @@ -163,7 +163,7 @@ ] }, { - "key": "GetSecondarySpacing", + "base": "GetSecondarySpacing", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetSecondarySpacing" @@ -185,7 +185,7 @@ ] }, { - "key": "SetSecondarySpacing", + "base": "SetSecondarySpacing", "entry": { "name": "In", "tooltip": "When signaled, this will invoke SetSecondarySpacing" @@ -207,7 +207,7 @@ ] }, { - "key": "SetSize", + "base": "SetSize", "entry": { "name": "In", "tooltip": "When signaled, this will invoke SetSize" @@ -229,7 +229,7 @@ ] }, { - "key": "GetSize", + "base": "GetSize", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetSize" @@ -251,7 +251,7 @@ ] }, { - "key": "GetPrimaryColor", + "base": "GetPrimaryColor", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetPrimaryColor" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/HDRColorGradingRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/HDRColorGradingRequestBus.names index 906dd005cc..9327231516 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/HDRColorGradingRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/HDRColorGradingRequestBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "HDRColorGradingRequestBus", + "base": "HDRColorGradingRequestBus", "context": "EBusSender", "variant": "", "details": { @@ -9,7 +9,7 @@ }, "methods": [ { - "key": "SetCustomMinExposure", + "base": "SetCustomMinExposure", "entry": { "name": "In", "tooltip": "When signaled, this will invoke SetCustomMinExposure" @@ -31,7 +31,7 @@ ] }, { - "key": "GetFinalAdjustmentWeight", + "base": "GetFinalAdjustmentWeight", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetFinalAdjustmentWeight" @@ -53,7 +53,7 @@ ] }, { - "key": "SetSmhHighlightsColor", + "base": "SetSmhHighlightsColor", "entry": { "name": "In", "tooltip": "When signaled, this will invoke SetSmhHighlightsColor" @@ -75,7 +75,7 @@ ] }, { - "key": "SetLutResolution", + "base": "SetLutResolution", "entry": { "name": "In", "tooltip": "When signaled, this will invoke SetLutResolution" @@ -97,7 +97,7 @@ ] }, { - "key": "GetSmhMidtonesColor", + "base": "GetSmhMidtonesColor", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetSmhMidtonesColor" @@ -119,7 +119,7 @@ ] }, { - "key": "GetSmhHighlightsEnd", + "base": "GetSmhHighlightsEnd", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetSmhHighlightsEnd" @@ -141,7 +141,7 @@ ] }, { - "key": "GetCustomMinExposure", + "base": "GetCustomMinExposure", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetCustomMinExposure" @@ -163,7 +163,7 @@ ] }, { - "key": "SetSmhHighlightsEnd", + "base": "SetSmhHighlightsEnd", "entry": { "name": "In", "tooltip": "When signaled, this will invoke SetSmhHighlightsEnd" @@ -185,7 +185,7 @@ ] }, { - "key": "GetChannelMixingGreen", + "base": "GetChannelMixingGreen", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetChannelMixingGreen" @@ -207,7 +207,7 @@ ] }, { - "key": "SetSmhShadowsEnd", + "base": "SetSmhShadowsEnd", "entry": { "name": "In", "tooltip": "When signaled, this will invoke SetSmhShadowsEnd" @@ -229,7 +229,7 @@ ] }, { - "key": "SetSmhWeight", + "base": "SetSmhWeight", "entry": { "name": "In", "tooltip": "When signaled, this will invoke SetSmhWeight" @@ -251,7 +251,7 @@ ] }, { - "key": "SetShaperPresetType", + "base": "SetShaperPresetType", "entry": { "name": "In", "tooltip": "When signaled, this will invoke SetShaperPresetType" @@ -273,7 +273,7 @@ ] }, { - "key": "GetShaperPresetType", + "base": "GetShaperPresetType", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetShaperPresetType" @@ -295,7 +295,7 @@ ] }, { - "key": "SetEnabled", + "base": "SetEnabled", "entry": { "name": "In", "tooltip": "When signaled, this will invoke SetEnabled" @@ -317,7 +317,7 @@ ] }, { - "key": "GetSmhShadowsColor", + "base": "GetSmhShadowsColor", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetSmhShadowsColor" @@ -339,7 +339,7 @@ ] }, { - "key": "GetColorGradingPreSaturation", + "base": "GetColorGradingPreSaturation", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetColorGradingPreSaturation" @@ -361,7 +361,7 @@ ] }, { - "key": "GetSplitToneHighlightsColor", + "base": "GetSplitToneHighlightsColor", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetSplitToneHighlightsColor" @@ -383,7 +383,7 @@ ] }, { - "key": "GetColorGradingHueShift", + "base": "GetColorGradingHueShift", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetColorGradingHueShift" @@ -405,7 +405,7 @@ ] }, { - "key": "SetColorGradingExposure", + "base": "SetColorGradingExposure", "entry": { "name": "In", "tooltip": "When signaled, this will invoke SetColorGradingExposure" @@ -427,7 +427,7 @@ ] }, { - "key": "GetColorFilterSwatch", + "base": "GetColorFilterSwatch", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetColorFilterSwatch" @@ -449,7 +449,7 @@ ] }, { - "key": "GetWhiteBalanceTint", + "base": "GetWhiteBalanceTint", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetWhiteBalanceTint" @@ -471,7 +471,7 @@ ] }, { - "key": "GetColorGradingExposure", + "base": "GetColorGradingExposure", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetColorGradingExposure" @@ -493,7 +493,7 @@ ] }, { - "key": "GetSmhWeight", + "base": "GetSmhWeight", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetSmhWeight" @@ -515,7 +515,7 @@ ] }, { - "key": "SetSmhMidtonesColor", + "base": "SetSmhMidtonesColor", "entry": { "name": "In", "tooltip": "When signaled, this will invoke SetSmhMidtonesColor" @@ -537,7 +537,7 @@ ] }, { - "key": "SetChannelMixingBlue", + "base": "SetChannelMixingBlue", "entry": { "name": "In", "tooltip": "When signaled, this will invoke SetChannelMixingBlue" @@ -559,7 +559,7 @@ ] }, { - "key": "GetGenerateLut", + "base": "GetGenerateLut", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetGenerateLut" @@ -581,7 +581,7 @@ ] }, { - "key": "SetSplitToneBalance", + "base": "SetSplitToneBalance", "entry": { "name": "In", "tooltip": "When signaled, this will invoke SetSplitToneBalance" @@ -603,7 +603,7 @@ ] }, { - "key": "GetLutResolution", + "base": "GetLutResolution", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetLutResolution" @@ -625,7 +625,7 @@ ] }, { - "key": "SetColorGradingContrast", + "base": "SetColorGradingContrast", "entry": { "name": "In", "tooltip": "When signaled, this will invoke SetColorGradingContrast" @@ -647,7 +647,7 @@ ] }, { - "key": "GetWhiteBalanceKelvin", + "base": "GetWhiteBalanceKelvin", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetWhiteBalanceKelvin" @@ -669,7 +669,7 @@ ] }, { - "key": "SetSplitToneHighlightsColor", + "base": "SetSplitToneHighlightsColor", "entry": { "name": "In", "tooltip": "When signaled, this will invoke SetSplitToneHighlightsColor" @@ -691,7 +691,7 @@ ] }, { - "key": "GetSmhShadowsEnd", + "base": "GetSmhShadowsEnd", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetSmhShadowsEnd" @@ -713,7 +713,7 @@ ] }, { - "key": "SetSmhHighlightsStart", + "base": "SetSmhHighlightsStart", "entry": { "name": "In", "tooltip": "When signaled, this will invoke SetSmhHighlightsStart" @@ -735,7 +735,7 @@ ] }, { - "key": "SetColorFilterSwatch", + "base": "SetColorFilterSwatch", "entry": { "name": "In", "tooltip": "When signaled, this will invoke SetColorFilterSwatch" @@ -757,7 +757,7 @@ ] }, { - "key": "GetColorGradingFilterIntensity", + "base": "GetColorGradingFilterIntensity", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetColorGradingFilterIntensity" @@ -779,7 +779,7 @@ ] }, { - "key": "SetWhiteBalanceWeight", + "base": "SetWhiteBalanceWeight", "entry": { "name": "In", "tooltip": "When signaled, this will invoke SetWhiteBalanceWeight" @@ -801,7 +801,7 @@ ] }, { - "key": "SetSmhShadowsStart", + "base": "SetSmhShadowsStart", "entry": { "name": "In", "tooltip": "When signaled, this will invoke SetSmhShadowsStart" @@ -823,7 +823,7 @@ ] }, { - "key": "GetChannelMixingRed", + "base": "GetChannelMixingRed", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetChannelMixingRed" @@ -845,7 +845,7 @@ ] }, { - "key": "GetColorGradingFilterMultiply", + "base": "GetColorGradingFilterMultiply", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetColorGradingFilterMultiply" @@ -867,7 +867,7 @@ ] }, { - "key": "SetColorGradingFilterMultiply", + "base": "SetColorGradingFilterMultiply", "entry": { "name": "In", "tooltip": "When signaled, this will invoke SetColorGradingFilterMultiply" @@ -889,7 +889,7 @@ ] }, { - "key": "SetSplitToneShadowsColor", + "base": "SetSplitToneShadowsColor", "entry": { "name": "In", "tooltip": "When signaled, this will invoke SetSplitToneShadowsColor" @@ -911,7 +911,7 @@ ] }, { - "key": "SetSplitToneWeight", + "base": "SetSplitToneWeight", "entry": { "name": "In", "tooltip": "When signaled, this will invoke SetSplitToneWeight" @@ -933,7 +933,7 @@ ] }, { - "key": "GetSplitToneShadowsColor", + "base": "GetSplitToneShadowsColor", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetSplitToneShadowsColor" @@ -955,7 +955,7 @@ ] }, { - "key": "GetSmhHighlightsStart", + "base": "GetSmhHighlightsStart", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetSmhHighlightsStart" @@ -977,7 +977,7 @@ ] }, { - "key": "SetChannelMixingRed", + "base": "SetChannelMixingRed", "entry": { "name": "In", "tooltip": "When signaled, this will invoke SetChannelMixingRed" @@ -999,7 +999,7 @@ ] }, { - "key": "SetChannelMixingGreen", + "base": "SetChannelMixingGreen", "entry": { "name": "In", "tooltip": "When signaled, this will invoke SetChannelMixingGreen" @@ -1021,7 +1021,7 @@ ] }, { - "key": "SetColorGradingFilterIntensity", + "base": "SetColorGradingFilterIntensity", "entry": { "name": "In", "tooltip": "When signaled, this will invoke SetColorGradingFilterIntensity" @@ -1043,7 +1043,7 @@ ] }, { - "key": "SetGenerateLut", + "base": "SetGenerateLut", "entry": { "name": "In", "tooltip": "When signaled, this will invoke SetGenerateLut" @@ -1065,7 +1065,7 @@ ] }, { - "key": "SetColorAdjustmentWeight", + "base": "SetColorAdjustmentWeight", "entry": { "name": "In", "tooltip": "When signaled, this will invoke SetColorAdjustmentWeight" @@ -1087,7 +1087,7 @@ ] }, { - "key": "GetSmhShadowsStart", + "base": "GetSmhShadowsStart", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetSmhShadowsStart" @@ -1109,7 +1109,7 @@ ] }, { - "key": "SetSmhShadowsColor", + "base": "SetSmhShadowsColor", "entry": { "name": "In", "tooltip": "When signaled, this will invoke SetSmhShadowsColor" @@ -1131,7 +1131,7 @@ ] }, { - "key": "SetFinalAdjustmentWeight", + "base": "SetFinalAdjustmentWeight", "entry": { "name": "In", "tooltip": "When signaled, this will invoke SetFinalAdjustmentWeight" @@ -1153,7 +1153,7 @@ ] }, { - "key": "GetColorGradingPostSaturation", + "base": "GetColorGradingPostSaturation", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetColorGradingPostSaturation" @@ -1175,7 +1175,7 @@ ] }, { - "key": "SetColorGradingPreSaturation", + "base": "SetColorGradingPreSaturation", "entry": { "name": "In", "tooltip": "When signaled, this will invoke SetColorGradingPreSaturation" @@ -1197,7 +1197,7 @@ ] }, { - "key": "SetColorGradingHueShift", + "base": "SetColorGradingHueShift", "entry": { "name": "In", "tooltip": "When signaled, this will invoke SetColorGradingHueShift" @@ -1219,7 +1219,7 @@ ] }, { - "key": "GetSplitToneBalance", + "base": "GetSplitToneBalance", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetSplitToneBalance" @@ -1241,7 +1241,7 @@ ] }, { - "key": "GetColorAdjustmentWeight", + "base": "GetColorAdjustmentWeight", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetColorAdjustmentWeight" @@ -1263,7 +1263,7 @@ ] }, { - "key": "GetSmhHighlightsColor", + "base": "GetSmhHighlightsColor", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetSmhHighlightsColor" @@ -1285,7 +1285,7 @@ ] }, { - "key": "GetSplitToneWeight", + "base": "GetSplitToneWeight", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetSplitToneWeight" @@ -1307,7 +1307,7 @@ ] }, { - "key": "SetColorGradingPostSaturation", + "base": "SetColorGradingPostSaturation", "entry": { "name": "In", "tooltip": "When signaled, this will invoke SetColorGradingPostSaturation" @@ -1329,7 +1329,7 @@ ] }, { - "key": "SetWhiteBalanceKelvin", + "base": "SetWhiteBalanceKelvin", "entry": { "name": "In", "tooltip": "When signaled, this will invoke SetWhiteBalanceKelvin" @@ -1351,7 +1351,7 @@ ] }, { - "key": "GetWhiteBalanceWeight", + "base": "GetWhiteBalanceWeight", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetWhiteBalanceWeight" @@ -1373,7 +1373,7 @@ ] }, { - "key": "GetColorGradingContrast", + "base": "GetColorGradingContrast", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetColorGradingContrast" @@ -1395,7 +1395,7 @@ ] }, { - "key": "GetEnabled", + "base": "GetEnabled", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetEnabled" @@ -1417,7 +1417,7 @@ ] }, { - "key": "GetCustomMaxExposure", + "base": "GetCustomMaxExposure", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetCustomMaxExposure" @@ -1439,7 +1439,7 @@ ] }, { - "key": "SetWhiteBalanceTint", + "base": "SetWhiteBalanceTint", "entry": { "name": "In", "tooltip": "When signaled, this will invoke SetWhiteBalanceTint" @@ -1461,7 +1461,7 @@ ] }, { - "key": "GetChannelMixingBlue", + "base": "GetChannelMixingBlue", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetChannelMixingBlue" @@ -1483,7 +1483,7 @@ ] }, { - "key": "SetCustomMaxExposure", + "base": "SetCustomMaxExposure", "entry": { "name": "In", "tooltip": "When signaled, this will invoke SetCustomMaxExposure" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/HDRiSkyboxRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/HDRiSkyboxRequestBus.names index c28a18dfc4..e93be00413 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/HDRiSkyboxRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/HDRiSkyboxRequestBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "HDRiSkyboxRequestBus", + "base": "HDRiSkyboxRequestBus", "context": "EBusSender", "variant": "", "details": { @@ -9,7 +9,7 @@ }, "methods": [ { - "key": "SetExposure", + "base": "SetExposure", "entry": { "name": "In", "tooltip": "When signaled, this will invoke SetExposure" @@ -31,7 +31,7 @@ ] }, { - "key": "GetExposure", + "base": "GetExposure", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetExposure" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/HeightfieldProviderRequestsBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/HeightfieldProviderRequestsBus.names index 0524860818..a27119f0b6 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/HeightfieldProviderRequestsBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/HeightfieldProviderRequestsBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "HeightfieldProviderRequestsBus", + "base": "HeightfieldProviderRequestsBus", "context": "EBusSender", "variant": "", "details": { @@ -9,7 +9,7 @@ }, "methods": [ { - "key": "GetHeightfieldMinHeight", + "base": "GetHeightfieldMinHeight", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Heightfield Min Height" @@ -31,7 +31,7 @@ ] }, { - "key": "GetHeights", + "base": "GetHeights", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Heights" @@ -53,7 +53,7 @@ ] }, { - "key": "GetHeightfieldMaxHeight", + "base": "GetHeightfieldMaxHeight", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Heightfield Max Height" @@ -75,7 +75,7 @@ ] }, { - "key": "GetHeightfieldGridColumns", + "base": "GetHeightfieldGridColumns", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Heightfield Grid Columns" @@ -97,7 +97,7 @@ ] }, { - "key": "GetMaterialList", + "base": "GetMaterialList", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Material List" @@ -119,7 +119,7 @@ ] }, { - "key": "GetHeightfieldTransform", + "base": "GetHeightfieldTransform", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Heightfield Transform" @@ -141,7 +141,7 @@ ] }, { - "key": "GetHeightfieldGridRows", + "base": "GetHeightfieldGridRows", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Heightfield Grid Rows" @@ -163,7 +163,7 @@ ] }, { - "key": "GetHeightfieldGridSpacing", + "base": "GetHeightfieldGridSpacing", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Heightfield Grid Spacing" @@ -185,7 +185,7 @@ ] }, { - "key": "GetHeightfieldAabb", + "base": "GetHeightfieldAabb", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Heightfield AABB" @@ -207,7 +207,7 @@ ] }, { - "key": "GetHeightsAndMaterials", + "base": "GetHeightsAndMaterials", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Heights And Materials" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ImageBasedLightComponentRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ImageBasedLightComponentRequestBus.names index 090c4abb00..92b7f6375b 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ImageBasedLightComponentRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ImageBasedLightComponentRequestBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "ImageBasedLightComponentRequestBus", + "base": "ImageBasedLightComponentRequestBus", "context": "EBusSender", "variant": "", "details": { @@ -9,7 +9,7 @@ }, "methods": [ { - "key": "GetDiffuseImageAssetId", + "base": "GetDiffuseImageAssetId", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetDiffuseImageAssetId" @@ -31,7 +31,7 @@ ] }, { - "key": "SetDiffuseImageAssetPath", + "base": "SetDiffuseImageAssetPath", "entry": { "name": "In", "tooltip": "When signaled, this will invoke SetDiffuseImageAssetPath" @@ -53,7 +53,7 @@ ] }, { - "key": "SetDiffuseImageAssetId", + "base": "SetDiffuseImageAssetId", "entry": { "name": "In", "tooltip": "When signaled, this will invoke SetDiffuseImageAssetId" @@ -75,7 +75,7 @@ ] }, { - "key": "GetSpecularImageAssetId", + "base": "GetSpecularImageAssetId", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetSpecularImageAssetId" @@ -97,7 +97,7 @@ ] }, { - "key": "SetSpecularImageAssetPath", + "base": "SetSpecularImageAssetPath", "entry": { "name": "In", "tooltip": "When signaled, this will invoke SetSpecularImageAssetPath" @@ -119,7 +119,7 @@ ] }, { - "key": "GetSpecularImageAssetPath", + "base": "GetSpecularImageAssetPath", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetSpecularImageAssetPath" @@ -141,7 +141,7 @@ ] }, { - "key": "GetDiffuseImageAssetPath", + "base": "GetDiffuseImageAssetPath", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetDiffuseImageAssetPath" @@ -163,7 +163,7 @@ ] }, { - "key": "SetSpecularImageAssetId", + "base": "SetSpecularImageAssetId", "entry": { "name": "In", "tooltip": "When signaled, this will invoke SetSpecularImageAssetId" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ImageGradientRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ImageGradientRequestBus.names index f4f826d7b6..12aefcefaf 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ImageGradientRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ImageGradientRequestBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "ImageGradientRequestBus", + "base": "ImageGradientRequestBus", "context": "EBusSender", "variant": "", "details": { @@ -9,7 +9,7 @@ }, "methods": [ { - "key": "SetTilingX", + "base": "SetTilingX", "entry": { "name": "In", "tooltip": "When signaled, this will invoke SetTilingX" @@ -31,7 +31,7 @@ ] }, { - "key": "GetTilingX", + "base": "GetTilingX", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetTilingX" @@ -53,7 +53,7 @@ ] }, { - "key": "SetImageAssetPath", + "base": "SetImageAssetPath", "entry": { "name": "In", "tooltip": "When signaled, this will invoke SetImageAssetPath" @@ -75,7 +75,7 @@ ] }, { - "key": "SetTilingY", + "base": "SetTilingY", "entry": { "name": "In", "tooltip": "When signaled, this will invoke SetTilingY" @@ -97,7 +97,7 @@ ] }, { - "key": "GetImageAssetPath", + "base": "GetImageAssetPath", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetImageAssetPath" @@ -119,7 +119,7 @@ ] }, { - "key": "GetTilingY", + "base": "GetTilingY", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetTilingY" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/InputSystemRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/InputSystemRequestBus.names index ca2b65415c..a30ad8ba30 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/InputSystemRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/InputSystemRequestBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "InputSystemRequestBus", + "base": "InputSystemRequestBus", "context": "EBusSender", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "RecreateEnabledInputDevices", + "base": "RecreateEnabledInputDevices", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Recreate Enabled Input Devices" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/InvertGradientRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/InvertGradientRequestBus.names index 4fc68d7cd8..2fb486c743 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/InvertGradientRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/InvertGradientRequestBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "InvertGradientRequestBus", + "base": "InvertGradientRequestBus", "context": "EBusSender", "variant": "", "details": { @@ -9,7 +9,7 @@ }, "methods": [ { - "key": "GetGradientSampler", + "base": "GetGradientSampler", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetGradientSampler" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/LevelsGradientRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/LevelsGradientRequestBus.names index b261321830..565c85bdbc 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/LevelsGradientRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/LevelsGradientRequestBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "LevelsGradientRequestBus", + "base": "LevelsGradientRequestBus", "context": "EBusSender", "variant": "", "details": { @@ -9,7 +9,7 @@ }, "methods": [ { - "key": "GetOutputMax", + "base": "GetOutputMax", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetOutputMax" @@ -31,7 +31,7 @@ ] }, { - "key": "SetInputMax", + "base": "SetInputMax", "entry": { "name": "In", "tooltip": "When signaled, this will invoke SetInputMax" @@ -53,7 +53,7 @@ ] }, { - "key": "SetOutputMax", + "base": "SetOutputMax", "entry": { "name": "In", "tooltip": "When signaled, this will invoke SetOutputMax" @@ -75,7 +75,7 @@ ] }, { - "key": "SetInputMid", + "base": "SetInputMid", "entry": { "name": "In", "tooltip": "When signaled, this will invoke SetInputMid" @@ -97,7 +97,7 @@ ] }, { - "key": "SetOutputMin", + "base": "SetOutputMin", "entry": { "name": "In", "tooltip": "When signaled, this will invoke SetOutputMin" @@ -119,7 +119,7 @@ ] }, { - "key": "GetGradientSampler", + "base": "GetGradientSampler", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetGradientSampler" @@ -141,7 +141,7 @@ ] }, { - "key": "SetInputMin", + "base": "SetInputMin", "entry": { "name": "In", "tooltip": "When signaled, this will invoke SetInputMin" @@ -163,7 +163,7 @@ ] }, { - "key": "GetInputMid", + "base": "GetInputMid", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetInputMid" @@ -185,7 +185,7 @@ ] }, { - "key": "GetInputMax", + "base": "GetInputMax", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetInputMax" @@ -207,7 +207,7 @@ ] }, { - "key": "GetOutputMin", + "base": "GetOutputMin", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetOutputMin" @@ -229,7 +229,7 @@ ] }, { - "key": "GetInputMin", + "base": "GetInputMin", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetInputMin" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/LookAt.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/LookAt.names index 3e77e49839..699b0195ca 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/LookAt.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/LookAt.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "LookAt", + "base": "LookAt", "context": "EBusSender", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "SetTarget", + "base": "SetTarget", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Target" @@ -34,7 +34,7 @@ ] }, { - "key": "SetTargetPosition", + "base": "SetTargetPosition", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Target Position" @@ -58,7 +58,7 @@ ] }, { - "key": "SetAxis", + "base": "SetAxis", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Axis" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/LookModificationRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/LookModificationRequestBus.names index 7e38e83e06..27cdb67ed7 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/LookModificationRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/LookModificationRequestBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "LookModificationRequestBus", + "base": "LookModificationRequestBus", "context": "EBusSender", "variant": "", "details": { @@ -9,7 +9,7 @@ }, "methods": [ { - "key": "SetColorGradingLutOverride", + "base": "SetColorGradingLutOverride", "entry": { "name": "In", "tooltip": "When signaled, this will invoke SetColorGradingLutOverride" @@ -31,7 +31,7 @@ ] }, { - "key": "SetCustomMaxExposure", + "base": "SetCustomMaxExposure", "entry": { "name": "In", "tooltip": "When signaled, this will invoke SetCustomMaxExposure" @@ -53,7 +53,7 @@ ] }, { - "key": "SetCustomMinExposure", + "base": "SetCustomMinExposure", "entry": { "name": "In", "tooltip": "When signaled, this will invoke SetCustomMinExposure" @@ -75,7 +75,7 @@ ] }, { - "key": "GetCustomMinExposure", + "base": "GetCustomMinExposure", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetCustomMinExposure" @@ -97,7 +97,7 @@ ] }, { - "key": "GetColorGradingLut", + "base": "GetColorGradingLut", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetColorGradingLut" @@ -119,7 +119,7 @@ ] }, { - "key": "GetColorGradingLutIntensity", + "base": "GetColorGradingLutIntensity", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetColorGradingLutIntensity" @@ -141,7 +141,7 @@ ] }, { - "key": "GetColorGradingLutOverride", + "base": "GetColorGradingLutOverride", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetColorGradingLutOverride" @@ -163,7 +163,7 @@ ] }, { - "key": "SetColorGradingLut", + "base": "SetColorGradingLut", "entry": { "name": "In", "tooltip": "When signaled, this will invoke SetColorGradingLut" @@ -185,7 +185,7 @@ ] }, { - "key": "SetColorGradingLutIntensity", + "base": "SetColorGradingLutIntensity", "entry": { "name": "In", "tooltip": "When signaled, this will invoke SetColorGradingLutIntensity" @@ -207,7 +207,7 @@ ] }, { - "key": "SetEnabled", + "base": "SetEnabled", "entry": { "name": "In", "tooltip": "When signaled, this will invoke SetEnabled" @@ -229,7 +229,7 @@ ] }, { - "key": "GetEnabled", + "base": "GetEnabled", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetEnabled" @@ -251,7 +251,7 @@ ] }, { - "key": "SetShaperPresetType", + "base": "SetShaperPresetType", "entry": { "name": "In", "tooltip": "When signaled, this will invoke SetShaperPresetType" @@ -273,7 +273,7 @@ ] }, { - "key": "GetShaperPresetType", + "base": "GetShaperPresetType", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetShaperPresetType" @@ -295,7 +295,7 @@ ] }, { - "key": "GetCustomMaxExposure", + "base": "GetCustomMaxExposure", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetCustomMaxExposure" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/LyShineExamplesCppExampleBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/LyShineExamplesCppExampleBus.names index fcfb8f30c2..3287656724 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/LyShineExamplesCppExampleBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/LyShineExamplesCppExampleBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "LyShineExamplesCppExampleBus", + "base": "LyShineExamplesCppExampleBus", "context": "EBusSender", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "CreateCanvas", + "base": "CreateCanvas", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Create Canvas" @@ -24,7 +24,7 @@ } }, { - "key": "DestroyCanvas", + "base": "DestroyCanvas", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Destroy Canvas" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/MaterialComponentRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/MaterialComponentRequestBus.names index a7e2f67610..fa2ade0412 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/MaterialComponentRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/MaterialComponentRequestBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "MaterialComponentRequestBus", + "base": "MaterialComponentRequestBus", "context": "EBusSender", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetPropertyOverrides", + "base": "GetPropertyOverrides", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Property Overrides" @@ -40,7 +40,7 @@ ] }, { - "key": "SetPropertyOverrides", + "base": "SetPropertyOverrides", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Property Overrides" @@ -68,7 +68,7 @@ ] }, { - "key": "ClearPropertyOverride", + "base": "ClearPropertyOverride", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Clear Property Override" @@ -96,7 +96,7 @@ ] }, { - "key": "ClearPropertyOverrides", + "base": "ClearPropertyOverrides", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Clear Property Overrides" @@ -118,7 +118,7 @@ ] }, { - "key": "GetPropertyOverrideVector4", + "base": "GetPropertyOverrideVector4", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Property Override Vector 4" @@ -154,7 +154,7 @@ ] }, { - "key": "GetPropertyOverrideUInt32", + "base": "GetPropertyOverrideUInt32", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Property OverrideU Int 32" @@ -190,7 +190,7 @@ ] }, { - "key": "GetPropertyOverrideBool", + "base": "GetPropertyOverrideBool", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Property Override Bool" @@ -226,7 +226,7 @@ ] }, { - "key": "SetPropertyOverrideEnum", + "base": "SetPropertyOverrideEnum", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Property Override Enum" @@ -260,7 +260,7 @@ ] }, { - "key": "SetPropertyOverrideVector2", + "base": "SetPropertyOverrideVector2", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Property Override Vector 2" @@ -294,7 +294,7 @@ ] }, { - "key": "GetPropertyOverrideImage", + "base": "GetPropertyOverrideImage", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Property Override Image" @@ -330,7 +330,7 @@ ] }, { - "key": "ClearAllPropertyOverrides", + "base": "ClearAllPropertyOverrides", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Clear All Property Overrides" @@ -344,7 +344,7 @@ } }, { - "key": "GetMaterialSlotLabel", + "base": "GetMaterialSlotLabel", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Material Slot Label" @@ -374,7 +374,7 @@ ] }, { - "key": "SetPropertyOverrideVector3", + "base": "SetPropertyOverrideVector3", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Property Override Vector 3" @@ -408,7 +408,7 @@ ] }, { - "key": "ClearInvalidMaterialOverrides", + "base": "ClearInvalidMaterialOverrides", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Clear Invalid Material Overrides" @@ -422,7 +422,7 @@ } }, { - "key": "SetPropertyOverrideBool", + "base": "SetPropertyOverrideBool", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Property Override Bool" @@ -456,7 +456,7 @@ ] }, { - "key": "RepairInvalidMaterialOverrides", + "base": "RepairInvalidMaterialOverrides", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Repair Invalid Material Overrides" @@ -470,7 +470,7 @@ } }, { - "key": "SetPropertyOverrideString", + "base": "SetPropertyOverrideString", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Property Override String" @@ -504,7 +504,7 @@ ] }, { - "key": "SetDefaultMaterialOverride", + "base": "SetDefaultMaterialOverride", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Default Material Override" @@ -526,7 +526,7 @@ ] }, { - "key": "GetDefaultMaterialOverride", + "base": "GetDefaultMaterialOverride", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Default Material Override" @@ -548,7 +548,7 @@ ] }, { - "key": "SetMaterialOverrides", + "base": "SetMaterialOverrides", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Material Overrides" @@ -570,7 +570,7 @@ ] }, { - "key": "GetPropertyOverrideString", + "base": "GetPropertyOverrideString", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Property Override String" @@ -606,7 +606,7 @@ ] }, { - "key": "GetMaterialOverrides", + "base": "GetMaterialOverrides", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Material Overrides" @@ -628,7 +628,7 @@ ] }, { - "key": "GetMaterialOverride", + "base": "GetMaterialOverride", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Material Override" @@ -658,7 +658,7 @@ ] }, { - "key": "SetPropertyOverrideVector4", + "base": "SetPropertyOverrideVector4", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Property Override Vector 4" @@ -692,7 +692,7 @@ ] }, { - "key": "SetPropertyOverrideUInt32", + "base": "SetPropertyOverrideUInt32", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Property OverrideU Int 32" @@ -726,7 +726,7 @@ ] }, { - "key": "FindMaterialAssignmentId", + "base": "FindMaterialAssignmentId", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Find Material Assignment Id" @@ -762,7 +762,7 @@ ] }, { - "key": "GetPropertyOverrideInt32", + "base": "GetPropertyOverrideInt32", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Property Override Int 32" @@ -798,7 +798,7 @@ ] }, { - "key": "GetPropertyOverrideEnum", + "base": "GetPropertyOverrideEnum", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Property Override Enum" @@ -834,7 +834,7 @@ ] }, { - "key": "SetPropertyOverride", + "base": "SetPropertyOverride", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Property Override" @@ -868,7 +868,7 @@ ] }, { - "key": "GetOriginalMaterialAssignments", + "base": "GetOriginalMaterialAssignments", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Original Material Assignments" @@ -890,7 +890,7 @@ ] }, { - "key": "GetPropertyOverride", + "base": "GetPropertyOverride", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Property Override" @@ -926,7 +926,7 @@ ] }, { - "key": "ClearModelMaterialOverrides", + "base": "ClearModelMaterialOverrides", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Clear Model Material Overrides" @@ -940,7 +940,7 @@ } }, { - "key": "GetDefaultMaterialAssetId", + "base": "GetDefaultMaterialAssetId", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Default Material Asset Id" @@ -970,7 +970,7 @@ ] }, { - "key": "SetPropertyOverrideInt32", + "base": "SetPropertyOverrideInt32", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Property Override Int 32" @@ -1004,7 +1004,7 @@ ] }, { - "key": "SetPropertyOverrideImage", + "base": "SetPropertyOverrideImage", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Property Override Image" @@ -1038,7 +1038,7 @@ ] }, { - "key": "GetPropertyOverrideVector2", + "base": "GetPropertyOverrideVector2", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Property Override Vector 2" @@ -1074,7 +1074,7 @@ ] }, { - "key": "ClearAllMaterialOverrides", + "base": "ClearAllMaterialOverrides", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Clear All Material Overrides" @@ -1088,7 +1088,7 @@ } }, { - "key": "GetPropertyOverrideColor", + "base": "GetPropertyOverrideColor", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Property Override Color" @@ -1124,7 +1124,7 @@ ] }, { - "key": "SetPropertyOverrideFloat", + "base": "SetPropertyOverrideFloat", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Property Override Float" @@ -1158,7 +1158,7 @@ ] }, { - "key": "ApplyAutomaticPropertyUpdates", + "base": "ApplyAutomaticPropertyUpdates", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Apply Automatic Property Updates" @@ -1180,7 +1180,7 @@ ] }, { - "key": "ClearMaterialOverride", + "base": "ClearMaterialOverride", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Clear Material Override" @@ -1202,7 +1202,7 @@ ] }, { - "key": "ClearLodMaterialOverrides", + "base": "ClearLodMaterialOverrides", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Clear Lod Material Overrides" @@ -1216,7 +1216,7 @@ } }, { - "key": "ClearIncompatibleMaterialOverrides", + "base": "ClearIncompatibleMaterialOverrides", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Clear Incompatible Material Overrides" @@ -1230,7 +1230,7 @@ } }, { - "key": "GetPropertyOverrideVector3", + "base": "GetPropertyOverrideVector3", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Property Override Vector 3" @@ -1266,7 +1266,7 @@ ] }, { - "key": "ClearDefaultMaterialOverride", + "base": "ClearDefaultMaterialOverride", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Clear Default Material Override" @@ -1280,7 +1280,7 @@ } }, { - "key": "SetPropertyOverrideColor", + "base": "SetPropertyOverrideColor", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Property Override Color" @@ -1314,7 +1314,7 @@ ] }, { - "key": "SetMaterialOverride", + "base": "SetMaterialOverride", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Material Override" @@ -1342,7 +1342,7 @@ ] }, { - "key": "GetPropertyOverrideFloat", + "base": "GetPropertyOverrideFloat", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Property Override Float" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/MixedGradientRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/MixedGradientRequestBus.names index 3fd5976810..5c5910b2ad 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/MixedGradientRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/MixedGradientRequestBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "MixedGradientRequestBus", + "base": "MixedGradientRequestBus", "context": "EBusSender", "variant": "", "details": { @@ -9,7 +9,7 @@ }, "methods": [ { - "key": "GetNumLayers", + "base": "GetNumLayers", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetNumLayers" @@ -31,7 +31,7 @@ ] }, { - "key": "AddLayer", + "base": "AddLayer", "entry": { "name": "In", "tooltip": "When signaled, this will invoke AddLayer" @@ -45,7 +45,7 @@ } }, { - "key": "RemoveLayer", + "base": "RemoveLayer", "entry": { "name": "In", "tooltip": "When signaled, this will invoke RemoveLayer" @@ -67,7 +67,7 @@ ] }, { - "key": "GetLayer", + "base": "GetLayer", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetLayer" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/Multi-Position Audio Requests.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/Multi-Position Audio Requests.names index 7cee9b0a66..d30deb459a 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/Multi-Position Audio Requests.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/Multi-Position Audio Requests.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "Multi-Position Audio Requests", + "base": "Multi-Position Audio Requests", "context": "EBusSender", "variant": "", "details": { @@ -9,7 +9,7 @@ }, "methods": [ { - "key": "Add Entity", + "base": "Add Entity", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Add Entity" @@ -32,7 +32,7 @@ ] }, { - "key": "RemoveEntity", + "base": "RemoveEntity", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Remove Entity" @@ -55,7 +55,7 @@ ] }, { - "key": "SetBehaviorType", + "base": "SetBehaviorType", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Behavior Type" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/NavigationComponentRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/NavigationComponentRequestBus.names index 88b015bda8..d30f1a0cf6 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/NavigationComponentRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/NavigationComponentRequestBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "NavigationComponentRequestBus", + "base": "NavigationComponentRequestBus", "context": "EBusSender", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "SetAgentSpeed", + "base": "SetAgentSpeed", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Agent Speed" @@ -33,7 +33,7 @@ ] }, { - "key": "SetAgentMovementMethod", + "base": "SetAgentMovementMethod", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Agent Movement Method" @@ -56,7 +56,7 @@ ] }, { - "key": "GetAgentSpeed", + "base": "GetAgentSpeed", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetAgentSpeed" @@ -78,7 +78,7 @@ ] }, { - "key": "FindPathToPosition", + "base": "FindPathToPosition", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Find Path To Position" @@ -109,7 +109,7 @@ ] }, { - "key": "Stop", + "base": "Stop", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Stop" @@ -132,7 +132,7 @@ ] }, { - "key": "FindPathToEntity", + "base": "FindPathToEntity", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Find Path To Entity" @@ -163,7 +163,7 @@ ] }, { - "key": "GetAgentMovementMethod", + "base": "GetAgentMovementMethod", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Agent Movement Method" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/NonUniformScaleRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/NonUniformScaleRequestBus.names index dee0920cf2..ac540f94df 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/NonUniformScaleRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/NonUniformScaleRequestBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "NonUniformScaleRequestBus", + "base": "NonUniformScaleRequestBus", "context": "EBusSender", "variant": "", "details": { @@ -9,7 +9,7 @@ }, "methods": [ { - "key": "GetScale", + "base": "GetScale", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Scale" @@ -31,7 +31,7 @@ ] }, { - "key": "SetScale", + "base": "SetScale", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Scale" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/PerformanceStatisticsEBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/PerformanceStatisticsEBus.names index a4cb505c02..a09063b01e 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/PerformanceStatisticsEBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/PerformanceStatisticsEBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "PerformanceStatisticsEBus", + "base": "PerformanceStatisticsEBus", "context": "EBusSender", "variant": "", "details": { @@ -9,7 +9,7 @@ }, "methods": [ { - "key": "TrackPerFrameStop", + "base": "TrackPerFrameStop", "entry": { "name": "In", "tooltip": "When signaled, this will invoke TrackPerFrameStop" @@ -23,7 +23,7 @@ } }, { - "key": "TrackPerFrameStart", + "base": "TrackPerFrameStart", "entry": { "name": "In", "tooltip": "When signaled, this will invoke TrackPerFrameStart" @@ -37,7 +37,7 @@ } }, { - "key": "TrackAccumulatedStart", + "base": "TrackAccumulatedStart", "entry": { "name": "In", "tooltip": "When signaled, this will invoke TrackAccumulatedStart" @@ -59,7 +59,7 @@ ] }, { - "key": "TrackAccumulatedStop", + "base": "TrackAccumulatedStop", "entry": { "name": "In", "tooltip": "When signaled, this will invoke TrackAccumulatedStop" @@ -73,7 +73,7 @@ } }, { - "key": "ClearSnaphotStatistics", + "base": "ClearSnaphotStatistics", "entry": { "name": "In", "tooltip": "When signaled, this will invoke ClearSnaphotStatistics" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/PerlinGradientRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/PerlinGradientRequestBus.names index 0d1e7a800e..60ac349b37 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/PerlinGradientRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/PerlinGradientRequestBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "PerlinGradientRequestBus", + "base": "PerlinGradientRequestBus", "context": "EBusSender", "variant": "", "details": { @@ -9,7 +9,7 @@ }, "methods": [ { - "key": "SetOctaves", + "base": "SetOctaves", "entry": { "name": "In", "tooltip": "When signaled, this will invoke SetOctaves" @@ -31,7 +31,7 @@ ] }, { - "key": "GetFrequency", + "base": "GetFrequency", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetFrequency" @@ -53,7 +53,7 @@ ] }, { - "key": "GetOctaves", + "base": "GetOctaves", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetOctaves" @@ -75,7 +75,7 @@ ] }, { - "key": "SetFrequency", + "base": "SetFrequency", "entry": { "name": "In", "tooltip": "When signaled, this will invoke SetFrequency" @@ -97,7 +97,7 @@ ] }, { - "key": "SetAmplitude", + "base": "SetAmplitude", "entry": { "name": "In", "tooltip": "When signaled, this will invoke SetAmplitude" @@ -119,7 +119,7 @@ ] }, { - "key": "GetAmplitude", + "base": "GetAmplitude", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetAmplitude" @@ -141,7 +141,7 @@ ] }, { - "key": "GetRandomSeed", + "base": "GetRandomSeed", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetRandomSeed" @@ -163,7 +163,7 @@ ] }, { - "key": "SetRandomSeed", + "base": "SetRandomSeed", "entry": { "name": "In", "tooltip": "When signaled, this will invoke SetRandomSeed" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/PhysXCharacterControllerRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/PhysXCharacterControllerRequestBus.names index e4b0b6086d..dfec47011a 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/PhysXCharacterControllerRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/PhysXCharacterControllerRequestBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "PhysXCharacterControllerRequestBus", + "base": "PhysXCharacterControllerRequestBus", "context": "EBusSender", "variant": "", "details": { @@ -9,7 +9,7 @@ }, "methods": [ { - "key": "GetHalfForwardExtent", + "base": "GetHalfForwardExtent", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Half Forward Extent" @@ -31,7 +31,7 @@ ] }, { - "key": "GetRadius", + "base": "GetRadius", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Radius" @@ -53,7 +53,7 @@ ] }, { - "key": "SetRadius", + "base": "SetRadius", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Radius" @@ -75,7 +75,7 @@ ] }, { - "key": "SetHalfForwardExtent", + "base": "SetHalfForwardExtent", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Half Forward Extent" @@ -97,7 +97,7 @@ ] }, { - "key": "SetHeight", + "base": "SetHeight", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Height" @@ -119,7 +119,7 @@ ] }, { - "key": "GetHalfSideExtent", + "base": "GetHalfSideExtent", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Half Side Extent" @@ -141,7 +141,7 @@ ] }, { - "key": "GetHeight", + "base": "GetHeight", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Height" @@ -163,7 +163,7 @@ ] }, { - "key": "Resize", + "base": "Resize", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Resize" @@ -185,7 +185,7 @@ ] }, { - "key": "SetHalfSideExtent", + "base": "SetHalfSideExtent", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Half Side Extent" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/PhysicalSkyRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/PhysicalSkyRequestBus.names index a83525bb17..31500b0762 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/PhysicalSkyRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/PhysicalSkyRequestBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "PhysicalSkyRequestBus", + "base": "PhysicalSkyRequestBus", "context": "EBusSender", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "SetSkyIntensity", + "base": "SetSkyIntensity", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Sky Intensity" @@ -32,7 +32,7 @@ ] }, { - "key": "SetSunIntensity", + "base": "SetSunIntensity", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Sun Intensity" @@ -54,7 +54,7 @@ ] }, { - "key": "GetSunIntensity", + "base": "GetSunIntensity", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Sun Intensity" @@ -76,7 +76,7 @@ ] }, { - "key": "GetSunRadiusFactor", + "base": "GetSunRadiusFactor", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Sun Radius Factor" @@ -98,7 +98,7 @@ ] }, { - "key": "SetSunRadiusFactor", + "base": "SetSunRadiusFactor", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Sun Radius Factor" @@ -120,7 +120,7 @@ ] }, { - "key": "GetTurbidity", + "base": "GetTurbidity", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Turbidity" @@ -142,7 +142,7 @@ ] }, { - "key": "GetSkyIntensity", + "base": "GetSkyIntensity", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Sky Intensity" @@ -164,7 +164,7 @@ ] }, { - "key": "SetTurbidity", + "base": "SetTurbidity", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Turbidity" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/PolygonPrismShapeComponentRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/PolygonPrismShapeComponentRequestBus.names index 8cd660beaf..c8beed2423 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/PolygonPrismShapeComponentRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/PolygonPrismShapeComponentRequestBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "PolygonPrismShapeComponentRequestBus", + "base": "PolygonPrismShapeComponentRequestBus", "context": "EBusSender", "variant": "", "details": { @@ -9,7 +9,7 @@ }, "methods": [ { - "key": "ClearVertices", + "base": "ClearVertices", "entry": { "name": "In", "tooltip": "When signaled, this will invoke ClearVertices" @@ -23,7 +23,7 @@ } }, { - "key": "InsertVertex", + "base": "InsertVertex", "entry": { "name": "In", "tooltip": "When signaled, this will invoke InsertVertex" @@ -59,7 +59,7 @@ ] }, { - "key": "UpdateVertex", + "base": "UpdateVertex", "entry": { "name": "In", "tooltip": "When signaled, this will invoke UpdateVertex" @@ -95,7 +95,7 @@ ] }, { - "key": "AddVertex", + "base": "AddVertex", "entry": { "name": "In", "tooltip": "When signaled, this will invoke AddVertex" @@ -117,7 +117,7 @@ ] }, { - "key": "GetPolygonPrism", + "base": "GetPolygonPrism", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetPolygonPrism" @@ -139,7 +139,7 @@ ] }, { - "key": "SetHeight", + "base": "SetHeight", "entry": { "name": "In", "tooltip": "When signaled, this will invoke SetHeight" @@ -161,7 +161,7 @@ ] }, { - "key": "RemoveVertex", + "base": "RemoveVertex", "entry": { "name": "In", "tooltip": "When signaled, this will invoke RemoveVertex" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/PostFxLayerRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/PostFxLayerRequestBus.names index c66a6e75db..7491c77700 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/PostFxLayerRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/PostFxLayerRequestBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "PostFxLayerRequestBus", + "base": "PostFxLayerRequestBus", "context": "EBusSender", "variant": "", "details": { @@ -9,7 +9,7 @@ }, "methods": [ { - "key": "SetPriority", + "base": "SetPriority", "entry": { "name": "In", "tooltip": "When signaled, this will invoke SetPriority" @@ -31,7 +31,7 @@ ] }, { - "key": "GetPriority", + "base": "GetPriority", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetPriority" @@ -53,7 +53,7 @@ ] }, { - "key": "SetOverrideFactor", + "base": "SetOverrideFactor", "entry": { "name": "In", "tooltip": "When signaled, this will invoke SetOverrideFactor" @@ -75,7 +75,7 @@ ] }, { - "key": "GetOverrideFactor", + "base": "GetOverrideFactor", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetOverrideFactor" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/PosterizeGradientRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/PosterizeGradientRequestBus.names index 86d059cdb7..846c1589bd 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/PosterizeGradientRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/PosterizeGradientRequestBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "PosterizeGradientRequestBus", + "base": "PosterizeGradientRequestBus", "context": "EBusSender", "variant": "", "details": { @@ -9,7 +9,7 @@ }, "methods": [ { - "key": "GetGradientSampler", + "base": "GetGradientSampler", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetGradientSampler" @@ -31,7 +31,7 @@ ] }, { - "key": "GetModeType", + "base": "GetModeType", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetModeType" @@ -53,7 +53,7 @@ ] }, { - "key": "SetModeType", + "base": "SetModeType", "entry": { "name": "In", "tooltip": "When signaled, this will invoke SetModeType" @@ -75,7 +75,7 @@ ] }, { - "key": "SetBands", + "base": "SetBands", "entry": { "name": "In", "tooltip": "When signaled, this will invoke SetBands" @@ -97,7 +97,7 @@ ] }, { - "key": "GetBands", + "base": "GetBands", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetBands" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/PrefabLoaderScriptingBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/PrefabLoaderScriptingBus.names index 1c90afdb38..c57b57f9fe 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/PrefabLoaderScriptingBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/PrefabLoaderScriptingBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "PrefabLoaderScriptingBus", + "base": "PrefabLoaderScriptingBus", "context": "EBusSender", "variant": "", "details": { @@ -9,7 +9,7 @@ }, "methods": [ { - "key": "SaveTemplateToString", + "base": "SaveTemplateToString", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Save Template To String" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/PrefabPublicRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/PrefabPublicRequestBus.names index d38129153c..772497d00e 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/PrefabPublicRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/PrefabPublicRequestBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "PrefabPublicRequestBus", + "base": "PrefabPublicRequestBus", "context": "EBusSender", "variant": "", "details": { @@ -9,7 +9,7 @@ }, "methods": [ { - "key": "CreatePrefabInMemory", + "base": "CreatePrefabInMemory", "entry": { "name": "In", "tooltip": "When signaled, this will invoke CreatePrefabInMemory" @@ -45,7 +45,7 @@ ] }, { - "key": "InstantiatePrefab", + "base": "InstantiatePrefab", "entry": { "name": "In", "tooltip": "When signaled, this will invoke InstantiatePrefab" @@ -88,7 +88,7 @@ ] }, { - "key": "DeleteEntitiesAndAllDescendantsInInstance", + "base": "DeleteEntitiesAndAllDescendantsInInstance", "entry": { "name": "In", "tooltip": "When signaled, this will invoke DeleteEntitiesAndAllDescendantsInInstance" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/PrefabSystemScriptingBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/PrefabSystemScriptingBus.names index 5298a19f9e..511c0523d1 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/PrefabSystemScriptingBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/PrefabSystemScriptingBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "PrefabSystemScriptingBus", + "base": "PrefabSystemScriptingBus", "context": "EBusSender", "variant": "", "details": { @@ -9,7 +9,7 @@ }, "methods": [ { - "key": "CreatePrefab", + "base": "CreatePrefab", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Create Prefab" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ProfilingCaptureRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ProfilingCaptureRequestBus.names index a837c5d68a..12c0139b45 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ProfilingCaptureRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ProfilingCaptureRequestBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "ProfilingCaptureRequestBus", + "base": "ProfilingCaptureRequestBus", "context": "EBusSender", "variant": "", "details": { @@ -9,7 +9,7 @@ }, "methods": [ { - "key": "CapturePassTimestamp", + "base": "CapturePassTimestamp", "entry": { "name": "In", "tooltip": "When signaled, this will invoke CapturePassTimestamp" @@ -39,7 +39,7 @@ ] }, { - "key": "CaptureCpuFrameTime", + "base": "CaptureCpuFrameTime", "entry": { "name": "In", "tooltip": "When signaled, this will invoke CaptureCpuFrameTime" @@ -69,7 +69,7 @@ ] }, { - "key": "CapturePassPipelineStatistics", + "base": "CapturePassPipelineStatistics", "entry": { "name": "In", "tooltip": "When signaled, this will invoke CapturePassPipelineStatistics" @@ -99,7 +99,7 @@ ] }, { - "key": "CaptureBenchmarkMetadata", + "base": "CaptureBenchmarkMetadata", "entry": { "name": "In", "tooltip": "When signaled, this will invoke CaptureBenchmarkMetadata" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/PythonEditorBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/PythonEditorBus.names index 65a5b9d9b2..9cc731f39f 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/PythonEditorBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/PythonEditorBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "PythonEditorBus", + "base": "PythonEditorBus", "context": "EBusSender", "variant": "", "details": { @@ -9,7 +9,7 @@ }, "methods": [ { - "key": "ExecuteCommand", + "base": "ExecuteCommand", "entry": { "name": "In", "tooltip": "When signaled, this will invoke ExecuteCommand" @@ -31,7 +31,7 @@ ] }, { - "key": "GetCVar", + "base": "GetCVar", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetCVar" @@ -61,7 +61,7 @@ ] }, { - "key": "IsInSimulationMode", + "base": "IsInSimulationMode", "entry": { "name": "In", "tooltip": "When signaled, this will invoke IsInSimulationMode" @@ -83,7 +83,7 @@ ] }, { - "key": "SetAxisConstraint", + "base": "SetAxisConstraint", "entry": { "name": "In", "tooltip": "When signaled, this will invoke SetAxisConstraint" @@ -105,7 +105,7 @@ ] }, { - "key": "IsInGameMode", + "base": "IsInGameMode", "entry": { "name": "In", "tooltip": "When signaled, this will invoke IsInGameMode" @@ -127,7 +127,7 @@ ] }, { - "key": "SetCVarFromFloat", + "base": "SetCVarFromFloat", "entry": { "name": "In", "tooltip": "When signaled, this will invoke SetCVarFromFloat" @@ -155,7 +155,7 @@ ] }, { - "key": "MessageBoxYesNo", + "base": "MessageBoxYesNo", "entry": { "name": "In", "tooltip": "When signaled, this will invoke MessageBoxYesNo" @@ -185,7 +185,7 @@ ] }, { - "key": "Redo", + "base": "Redo", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Redo" @@ -199,7 +199,7 @@ } }, { - "key": "SetCVarFromInteger", + "base": "SetCVarFromInteger", "entry": { "name": "In", "tooltip": "When signaled, this will invoke SetCVarFromInteger" @@ -227,7 +227,7 @@ ] }, { - "key": "DrawLabel", + "base": "DrawLabel", "entry": { "name": "In", "tooltip": "When signaled, this will invoke DrawLabel" @@ -291,7 +291,7 @@ ] }, { - "key": "Undo", + "base": "Undo", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Undo" @@ -305,7 +305,7 @@ } }, { - "key": "Log", + "base": "Log", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Log" @@ -327,7 +327,7 @@ ] }, { - "key": "ComboBox", + "base": "ComboBox", "entry": { "name": "In", "tooltip": "When signaled, this will invoke ComboBox" @@ -369,7 +369,7 @@ ] }, { - "key": "ExitGameMode", + "base": "ExitGameMode", "entry": { "name": "In", "tooltip": "When signaled, this will invoke ExitGameMode" @@ -383,7 +383,7 @@ } }, { - "key": "OpenFileBox", + "base": "OpenFileBox", "entry": { "name": "In", "tooltip": "When signaled, this will invoke OpenFileBox" @@ -405,7 +405,7 @@ ] }, { - "key": "MessageBoxOk", + "base": "MessageBoxOk", "entry": { "name": "In", "tooltip": "When signaled, this will invoke MessageBoxOk" @@ -435,7 +435,7 @@ ] }, { - "key": "RunFile", + "base": "RunFile", "entry": { "name": "In", "tooltip": "When signaled, this will invoke RunFile" @@ -457,7 +457,7 @@ ] }, { - "key": "EditBoxCheckDataType", + "base": "EditBoxCheckDataType", "entry": { "name": "In", "tooltip": "When signaled, this will invoke EditBoxCheckDataType" @@ -487,7 +487,7 @@ ] }, { - "key": "SetCVarFromString", + "base": "SetCVarFromString", "entry": { "name": "In", "tooltip": "When signaled, this will invoke SetCVarFromString" @@ -515,7 +515,7 @@ ] }, { - "key": "RunConsole", + "base": "RunConsole", "entry": { "name": "In", "tooltip": "When signaled, this will invoke RunConsole" @@ -537,7 +537,7 @@ ] }, { - "key": "ExitSimulationMode", + "base": "ExitSimulationMode", "entry": { "name": "In", "tooltip": "When signaled, this will invoke ExitSimulationMode" @@ -551,7 +551,7 @@ } }, { - "key": "SetCVar", + "base": "SetCVar", "entry": { "name": "In", "tooltip": "When signaled, this will invoke SetCVar" @@ -579,7 +579,7 @@ ] }, { - "key": "GetPakFromFile", + "base": "GetPakFromFile", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetPakFromFile" @@ -609,7 +609,7 @@ ] }, { - "key": "RunFileParameters", + "base": "RunFileParameters", "entry": { "name": "In", "tooltip": "When signaled, this will invoke RunFileParameters" @@ -637,7 +637,7 @@ ] }, { - "key": "EnterSimulationMode", + "base": "EnterSimulationMode", "entry": { "name": "In", "tooltip": "When signaled, this will invoke EnterSimulationMode" @@ -651,7 +651,7 @@ } }, { - "key": "GetAxisConstraint", + "base": "GetAxisConstraint", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetAxisConstraint" @@ -673,7 +673,7 @@ ] }, { - "key": "EnterGameMode", + "base": "EnterGameMode", "entry": { "name": "In", "tooltip": "When signaled, this will invoke EnterGameMode" @@ -687,7 +687,7 @@ } }, { - "key": "MessageBoxOkCancel", + "base": "MessageBoxOkCancel", "entry": { "name": "In", "tooltip": "When signaled, this will invoke MessageBoxOkCancel" @@ -717,7 +717,7 @@ ] }, { - "key": "EditBox", + "base": "EditBox", "entry": { "name": "In", "tooltip": "When signaled, this will invoke EditBox" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/QuadShapeComponentRequestsBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/QuadShapeComponentRequestsBus.names index c6ed9646fc..41779ee90d 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/QuadShapeComponentRequestsBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/QuadShapeComponentRequestsBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "QuadShapeComponentRequestsBus", + "base": "QuadShapeComponentRequestsBus", "context": "EBusSender", "variant": "", "details": { @@ -9,7 +9,7 @@ }, "methods": [ { - "key": "SetQuadHeight", + "base": "SetQuadHeight", "entry": { "name": "In", "tooltip": "When signaled, this will invoke SetQuadHeight" @@ -31,7 +31,7 @@ ] }, { - "key": "GetQuadWidth", + "base": "GetQuadWidth", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetQuadWidth" @@ -53,7 +53,7 @@ ] }, { - "key": "GetQuadHeight", + "base": "GetQuadHeight", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetQuadHeight" @@ -75,7 +75,7 @@ ] }, { - "key": "GetQuadConfiguration", + "base": "GetQuadConfiguration", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetQuadConfiguration" @@ -98,7 +98,7 @@ ] }, { - "key": "SetQuadWidth", + "base": "SetQuadWidth", "entry": { "name": "In", "tooltip": "When signaled, this will invoke SetQuadWidth" @@ -120,7 +120,7 @@ ] }, { - "key": "GetQuadOrientation", + "base": "GetQuadOrientation", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetQuadOrientation" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/RandomGradientRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/RandomGradientRequestBus.names index 38a342f1b4..e0632ebf07 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/RandomGradientRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/RandomGradientRequestBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "RandomGradientRequestBus", + "base": "RandomGradientRequestBus", "context": "EBusSender", "variant": "", "details": { @@ -9,7 +9,7 @@ }, "methods": [ { - "key": "GetRandomSeed", + "base": "GetRandomSeed", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetRandomSeed" @@ -31,7 +31,7 @@ ] }, { - "key": "SetRandomSeed", + "base": "SetRandomSeed", "entry": { "name": "In", "tooltip": "When signaled, this will invoke SetRandomSeed" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/RandomTimedSpawnerRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/RandomTimedSpawnerRequestBus.names index 89849e3596..f1afd0e575 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/RandomTimedSpawnerRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/RandomTimedSpawnerRequestBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "RandomTimedSpawnerRequestBus", + "base": "RandomTimedSpawnerRequestBus", "context": "EBusSender", "variant": "", "details": { @@ -9,7 +9,7 @@ }, "methods": [ { - "key": "SetSpawnDelay", + "base": "SetSpawnDelay", "entry": { "name": "In", "tooltip": "When signaled, this will invoke SetSpawnDelay" @@ -31,7 +31,7 @@ ] }, { - "key": "GetSpawnDelay", + "base": "GetSpawnDelay", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetSpawnDelay" @@ -53,7 +53,7 @@ ] }, { - "key": "SetSpawnDelayVariation", + "base": "SetSpawnDelayVariation", "entry": { "name": "In", "tooltip": "When signaled, this will invoke SetSpawnDelayVariation" @@ -75,7 +75,7 @@ ] }, { - "key": "SetRandomDistribution", + "base": "SetRandomDistribution", "entry": { "name": "In", "tooltip": "When signaled, this will invoke SetRandomDistribution" @@ -97,7 +97,7 @@ ] }, { - "key": "IsEnabled", + "base": "IsEnabled", "entry": { "name": "In", "tooltip": "When signaled, this will invoke IsEnabled" @@ -119,7 +119,7 @@ ] }, { - "key": "Disable", + "base": "Disable", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Disable" @@ -133,7 +133,7 @@ } }, { - "key": "Toggle", + "base": "Toggle", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Toggle" @@ -147,7 +147,7 @@ } }, { - "key": "GetRandomDistribution", + "base": "GetRandomDistribution", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetRandomDistribution" @@ -169,7 +169,7 @@ ] }, { - "key": "Enable", + "base": "Enable", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Enable" @@ -183,7 +183,7 @@ } }, { - "key": "GetSpawnDelayVariation", + "base": "GetSpawnDelayVariation", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetSpawnDelayVariation" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ReferenceGradientRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ReferenceGradientRequestBus.names index c4be7ca85b..59e8d9a1ee 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ReferenceGradientRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ReferenceGradientRequestBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "ReferenceGradientRequestBus", + "base": "ReferenceGradientRequestBus", "context": "EBusSender", "variant": "", "details": { @@ -9,7 +9,7 @@ }, "methods": [ { - "key": "GetGradientSampler", + "base": "GetGradientSampler", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetGradientSampler" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/RenderMeshComponentRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/RenderMeshComponentRequestBus.names index 7323de56d7..f31b4c9ace 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/RenderMeshComponentRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/RenderMeshComponentRequestBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "RenderMeshComponentRequestBus", + "base": "RenderMeshComponentRequestBus", "context": "EBusSender", "variant": "", "details": { @@ -9,7 +9,7 @@ }, "methods": [ { - "key": "GetLodOverride", + "base": "GetLodOverride", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetLodOverride" @@ -31,7 +31,7 @@ ] }, { - "key": "GetSortKey", + "base": "GetSortKey", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetSortKey" @@ -53,7 +53,7 @@ ] }, { - "key": "SetQualityDecayRate", + "base": "SetQualityDecayRate", "entry": { "name": "In", "tooltip": "When signaled, this will invoke SetQualityDecayRate" @@ -75,7 +75,7 @@ ] }, { - "key": "SetSortKey", + "base": "SetSortKey", "entry": { "name": "In", "tooltip": "When signaled, this will invoke SetSortKey" @@ -97,7 +97,7 @@ ] }, { - "key": "GetModelAssetPath", + "base": "GetModelAssetPath", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetModelAssetPath" @@ -119,7 +119,7 @@ ] }, { - "key": "SetLodType", + "base": "SetLodType", "entry": { "name": "In", "tooltip": "When signaled, this will invoke SetLodType" @@ -141,7 +141,7 @@ ] }, { - "key": "SetLodOverride", + "base": "SetLodOverride", "entry": { "name": "In", "tooltip": "When signaled, this will invoke SetLodOverride" @@ -163,7 +163,7 @@ ] }, { - "key": "SetMinimumScreenCoverage", + "base": "SetMinimumScreenCoverage", "entry": { "name": "In", "tooltip": "When signaled, this will invoke SetMinimumScreenCoverage" @@ -185,7 +185,7 @@ ] }, { - "key": "SetModelAssetId", + "base": "SetModelAssetId", "entry": { "name": "In", "tooltip": "When signaled, this will invoke SetModelAssetId" @@ -207,7 +207,7 @@ ] }, { - "key": "GetLodType", + "base": "GetLodType", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetLodType" @@ -229,7 +229,7 @@ ] }, { - "key": "GetMinimumScreenCoverage", + "base": "GetMinimumScreenCoverage", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetMinimumScreenCoverage" @@ -251,7 +251,7 @@ ] }, { - "key": "GetModelAssetId", + "base": "GetModelAssetId", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetModelAssetId" @@ -273,7 +273,7 @@ ] }, { - "key": "SetModelAssetPath", + "base": "SetModelAssetPath", "entry": { "name": "In", "tooltip": "When signaled, this will invoke SetModelAssetPath" @@ -295,7 +295,7 @@ ] }, { - "key": "GetQualityDecayRate", + "base": "GetQualityDecayRate", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetQualityDecayRate" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/RigidBodyRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/RigidBodyRequestBus.names index 412136183b..474e3f89e3 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/RigidBodyRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/RigidBodyRequestBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "RigidBodyRequestBus", + "base": "RigidBodyRequestBus", "context": "EBusSender", "variant": "", "details": { @@ -9,7 +9,7 @@ }, "methods": [ { - "key": "SetLinearVelocity", + "base": "SetLinearVelocity", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Linear Velocity" @@ -31,7 +31,7 @@ ] }, { - "key": "SetKinematic", + "base": "SetKinematic", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Kinematic" @@ -53,7 +53,7 @@ ] }, { - "key": "SetMass", + "base": "SetMass", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Mass" @@ -75,7 +75,7 @@ ] }, { - "key": "SetGravityEnabled", + "base": "SetGravityEnabled", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Gravity Enabled" @@ -97,7 +97,7 @@ ] }, { - "key": "GetAabb", + "base": "GetAabb", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get AABB" @@ -119,7 +119,7 @@ ] }, { - "key": "ForceAwake", + "base": "ForceAwake", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Force Awake" @@ -133,7 +133,7 @@ } }, { - "key": "SetAngularDamping", + "base": "SetAngularDamping", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Angular Damping" @@ -155,7 +155,7 @@ ] }, { - "key": "ApplyAngularImpulse", + "base": "ApplyAngularImpulse", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Apply Angular Impulse" @@ -177,7 +177,7 @@ ] }, { - "key": "DisablePhysics", + "base": "DisablePhysics", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Disable Physics" @@ -191,7 +191,7 @@ } }, { - "key": "SetSimulationEnabled", + "base": "SetSimulationEnabled", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Simulation Enabled" @@ -213,7 +213,7 @@ ] }, { - "key": "GetLinearVelocityAtWorldPoint", + "base": "GetLinearVelocityAtWorldPoint", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Linear Velocity At World Point" @@ -243,7 +243,7 @@ ] }, { - "key": "SetAngularVelocity", + "base": "SetAngularVelocity", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Angular Velocity" @@ -265,7 +265,7 @@ ] }, { - "key": "SetCenterOfMassOffset", + "base": "SetCenterOfMassOffset", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Center Of Mass Offset" @@ -287,7 +287,7 @@ ] }, { - "key": "IsPhysicsEnabled", + "base": "IsPhysicsEnabled", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Is Physics Enabled" @@ -309,7 +309,7 @@ ] }, { - "key": "GetSleepThreshold", + "base": "GetSleepThreshold", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Sleep Threshold" @@ -331,7 +331,7 @@ ] }, { - "key": "SetKinematicTarget", + "base": "SetKinematicTarget", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Kinematic Target" @@ -353,7 +353,7 @@ ] }, { - "key": "EnablePhysics", + "base": "EnablePhysics", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Enable Physics" @@ -367,7 +367,7 @@ } }, { - "key": "GetLinearDamping", + "base": "GetLinearDamping", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Linear Damping" @@ -389,7 +389,7 @@ ] }, { - "key": "ApplyLinearImpulseAtWorldPoint", + "base": "ApplyLinearImpulseAtWorldPoint", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Apply Linear Impulse At World Point" @@ -417,7 +417,7 @@ ] }, { - "key": "GetCenterOfMassWorld", + "base": "GetCenterOfMassWorld", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Center Of Mass World" @@ -439,7 +439,7 @@ ] }, { - "key": "GetCenterOfMassLocal", + "base": "GetCenterOfMassLocal", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Center Of Mass Local" @@ -461,7 +461,7 @@ ] }, { - "key": "SetLinearDamping", + "base": "SetLinearDamping", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Linear Damping" @@ -483,7 +483,7 @@ ] }, { - "key": "GetAngularDamping", + "base": "GetAngularDamping", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Angular Damping" @@ -505,7 +505,7 @@ ] }, { - "key": "GetLinearVelocity", + "base": "GetLinearVelocity", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Linear Velocity" @@ -527,7 +527,7 @@ ] }, { - "key": "IsAwake", + "base": "IsAwake", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Is Awake" @@ -549,7 +549,7 @@ ] }, { - "key": "IsGravityEnabled", + "base": "IsGravityEnabled", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Is Gravity Enabled" @@ -571,7 +571,7 @@ ] }, { - "key": "GetInverseMass", + "base": "GetInverseMass", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Inverse Mass" @@ -593,7 +593,7 @@ ] }, { - "key": "SetSleepThreshold", + "base": "SetSleepThreshold", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Sleep Threshold" @@ -615,7 +615,7 @@ ] }, { - "key": "ForceAsleep", + "base": "ForceAsleep", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Force Asleep" @@ -629,7 +629,7 @@ } }, { - "key": "GetMass", + "base": "GetMass", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Mass" @@ -651,7 +651,7 @@ ] }, { - "key": "IsKinematic", + "base": "IsKinematic", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Is Kinematic" @@ -673,7 +673,7 @@ ] }, { - "key": "ApplyLinearImpulse", + "base": "ApplyLinearImpulse", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Apply Linear Impulse" @@ -695,7 +695,7 @@ ] }, { - "key": "GetAngularVelocity", + "base": "GetAngularVelocity", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Angular Velocity" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/SceneRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/SceneRequestBus.names index 346e1aa1f4..475200cf08 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/SceneRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/SceneRequestBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "SceneRequestBus", + "base": "SceneRequestBus", "context": "EBusSender", "variant": "", "details": { @@ -9,7 +9,7 @@ }, "methods": [ { - "key": "CutSelection", + "base": "CutSelection", "entry": { "name": "In", "tooltip": "When signaled, this will invoke CutSelection" @@ -23,7 +23,7 @@ } }, { - "key": "CopySelection", + "base": "CopySelection", "entry": { "name": "In", "tooltip": "When signaled, this will invoke CopySelection" @@ -37,7 +37,7 @@ } }, { - "key": "Paste", + "base": "Paste", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Paste" @@ -51,7 +51,7 @@ } }, { - "key": "DuplicateSelection", + "base": "DuplicateSelection", "entry": { "name": "In", "tooltip": "When signaled, this will invoke DuplicateSelection" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/SequenceComponentRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/SequenceComponentRequestBus.names index f51021f9b4..d7fc9033e4 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/SequenceComponentRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/SequenceComponentRequestBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "SequenceComponentRequestBus", + "base": "SequenceComponentRequestBus", "context": "EBusSender", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetPlaySpeed", + "base": "GetPlaySpeed", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetPlaySpeed" @@ -33,7 +33,7 @@ ] }, { - "key": "JumpToTime", + "base": "JumpToTime", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Jump To Time" @@ -56,7 +56,7 @@ ] }, { - "key": "Resume", + "base": "Resume", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Resume" @@ -71,7 +71,7 @@ } }, { - "key": "JumpToEnd", + "base": "JumpToEnd", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Jump To End" @@ -86,7 +86,7 @@ } }, { - "key": "GetCurrentPlayTime", + "base": "GetCurrentPlayTime", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Current Play Time" @@ -109,7 +109,7 @@ ] }, { - "key": "Pause", + "base": "Pause", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Pause" @@ -124,7 +124,7 @@ } }, { - "key": "PlayBetweenTimes", + "base": "PlayBetweenTimes", "entry": { "name": "In", "tooltip": "When signaled, this will invoke PlayBetweenTimes" @@ -153,7 +153,7 @@ ] }, { - "key": "Stop", + "base": "Stop", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Stop" @@ -168,7 +168,7 @@ } }, { - "key": "JumpToBeginning", + "base": "JumpToBeginning", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Jump To Beginning" @@ -183,7 +183,7 @@ } }, { - "key": "Play", + "base": "Play", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Play" @@ -198,7 +198,7 @@ } }, { - "key": "SetPlaySpeed", + "base": "SetPlaySpeed", "entry": { "name": "In", "tooltip": "When signaled, this will invoke SetPlaySpeed" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ShapeAreaFalloffGradientRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ShapeAreaFalloffGradientRequestBus.names index 9c42af794f..7e786744b9 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ShapeAreaFalloffGradientRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ShapeAreaFalloffGradientRequestBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "ShapeAreaFalloffGradientRequestBus", + "base": "ShapeAreaFalloffGradientRequestBus", "context": "EBusSender", "variant": "", "details": { @@ -9,7 +9,7 @@ }, "methods": [ { - "key": "SetFalloffType", + "base": "SetFalloffType", "entry": { "name": "In", "tooltip": "When signaled, this will invoke SetFalloffType" @@ -31,7 +31,7 @@ ] }, { - "key": "SetFalloffWidth", + "base": "SetFalloffWidth", "entry": { "name": "In", "tooltip": "When signaled, this will invoke SetFalloffWidth" @@ -53,7 +53,7 @@ ] }, { - "key": "GetFalloffType", + "base": "GetFalloffType", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetFalloffType" @@ -75,7 +75,7 @@ ] }, { - "key": "GetFalloffWidth", + "base": "GetFalloffWidth", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetFalloffWidth" @@ -97,7 +97,7 @@ ] }, { - "key": "SetShapeEntityId", + "base": "SetShapeEntityId", "entry": { "name": "In", "tooltip": "When signaled, this will invoke SetShapeEntityId" @@ -120,7 +120,7 @@ ] }, { - "key": "GetShapeEntityId", + "base": "GetShapeEntityId", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetShapeEntityId" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ShapeComponentRequestsBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ShapeComponentRequestsBus.names index f58f8d8dce..c3bc56c418 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ShapeComponentRequestsBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ShapeComponentRequestsBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "ShapeComponentRequestsBus", + "base": "ShapeComponentRequestsBus", "context": "EBusSender", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "DistanceSquaredFromPoint", + "base": "DistanceSquaredFromPoint", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Distance Squared From Point" @@ -43,7 +43,7 @@ ] }, { - "key": "DistanceFromPoint", + "base": "DistanceFromPoint", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Distance From Point" @@ -76,7 +76,7 @@ ] }, { - "key": "IsPointInside", + "base": "IsPointInside", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Is Point Inside" @@ -109,7 +109,7 @@ ] }, { - "key": "GetEncompassingAabb", + "base": "GetEncompassingAabb", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Encompassing Aabb" @@ -132,7 +132,7 @@ ] }, { - "key": "GetShapeType", + "base": "GetShapeType", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Shape Type" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/SimpleMotionComponentRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/SimpleMotionComponentRequestBus.names index 182ded9e83..fb09158ca4 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/SimpleMotionComponentRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/SimpleMotionComponentRequestBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "SimpleMotionComponentRequestBus", + "base": "SimpleMotionComponentRequestBus", "context": "EBusSender", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "BlendOutTime", + "base": "BlendOutTime", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Blend Out Time" @@ -32,7 +32,7 @@ ] }, { - "key": "GetBlendInTime", + "base": "GetBlendInTime", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Blend In Time" @@ -54,7 +54,7 @@ ] }, { - "key": "PlayMotion", + "base": "PlayMotion", "entry": { "name": "In", "tooltip": "When signaled, this will invoke PlayMotion" @@ -68,7 +68,7 @@ } }, { - "key": "GetMotion", + "base": "GetMotion", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetMotion" @@ -90,7 +90,7 @@ ] }, { - "key": "GetBlendOutTime", + "base": "GetBlendOutTime", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Blend Out Time" @@ -112,7 +112,7 @@ ] }, { - "key": "ReverseMotion", + "base": "ReverseMotion", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Reverse Motion" @@ -134,7 +134,7 @@ ] }, { - "key": "GetPlaySpeed", + "base": "GetPlaySpeed", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Play Speed" @@ -156,7 +156,7 @@ ] }, { - "key": "GetPlayTime", + "base": "GetPlayTime", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Play Time" @@ -178,7 +178,7 @@ ] }, { - "key": "RetargetMotion", + "base": "RetargetMotion", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Retarget Motion" @@ -200,7 +200,7 @@ ] }, { - "key": "SetPlaySpeed", + "base": "SetPlaySpeed", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Play Speed" @@ -222,7 +222,7 @@ ] }, { - "key": "Motion", + "base": "Motion", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Motion" @@ -244,7 +244,7 @@ ] }, { - "key": "BlendInTime", + "base": "BlendInTime", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Blend In Time" @@ -266,7 +266,7 @@ ] }, { - "key": "GetLoopMotion", + "base": "GetLoopMotion", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Loop Motion" @@ -288,7 +288,7 @@ ] }, { - "key": "PlayTime", + "base": "PlayTime", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Play Time" @@ -310,7 +310,7 @@ ] }, { - "key": "LoopMotion", + "base": "LoopMotion", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Loop Motion" @@ -332,7 +332,7 @@ ] }, { - "key": "MirrorMotion", + "base": "MirrorMotion", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Mirror Motion" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/SimpleStateComponentRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/SimpleStateComponentRequestBus.names index bd619cbd4d..4dbabdfb97 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/SimpleStateComponentRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/SimpleStateComponentRequestBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "SimpleStateComponentRequestBus", + "base": "SimpleStateComponentRequestBus", "context": "EBusSender", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetNumStates", + "base": "GetNumStates", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Num States" @@ -32,7 +32,7 @@ ] }, { - "key": "SetToLastState", + "base": "SetToLastState", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set To Last State" @@ -46,7 +46,7 @@ } }, { - "key": "SetToPreviousState", + "base": "SetToPreviousState", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set To Previous State" @@ -60,7 +60,7 @@ } }, { - "key": "SetToFirstState", + "base": "SetToFirstState", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set To First State" @@ -74,7 +74,7 @@ } }, { - "key": "SetToNextState", + "base": "SetToNextState", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set To Next State" @@ -88,7 +88,7 @@ } }, { - "key": "SetStateByIndex", + "base": "SetStateByIndex", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set State By Index" @@ -110,7 +110,7 @@ ] }, { - "key": "SetState", + "base": "SetState", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set State" @@ -132,7 +132,7 @@ ] }, { - "key": "GetCurrentState", + "base": "GetCurrentState", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Current State" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/SimulatedBodyComponentRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/SimulatedBodyComponentRequestBus.names index fc0cf7e60d..e646bbef2f 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/SimulatedBodyComponentRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/SimulatedBodyComponentRequestBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "SimulatedBodyComponentRequestBus", + "base": "SimulatedBodyComponentRequestBus", "context": "EBusSender", "variant": "", "details": { @@ -9,7 +9,7 @@ }, "methods": [ { - "key": "GetAabb", + "base": "GetAabb", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get AABB" @@ -31,7 +31,7 @@ ] }, { - "key": "IsPhysicsEnabled", + "base": "IsPhysicsEnabled", "entry": { "name": "In", "tooltip": "When signaled, this will invoke IsPhysicsEnabled" @@ -53,7 +53,7 @@ ] }, { - "key": "RayCast", + "base": "RayCast", "entry": { "name": "In", "tooltip": "When signaled, this will invoke RayCast" @@ -84,7 +84,7 @@ ] }, { - "key": "DisablePhysics", + "base": "DisablePhysics", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Disable Physics" @@ -98,7 +98,7 @@ } }, { - "key": "EnablePhysics", + "base": "EnablePhysics", "entry": { "name": "In", "tooltip": "When signaled, this will invoke EnablePhysics" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/SkyBoxFogRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/SkyBoxFogRequestBus.names index b0921723a6..9a283e509f 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/SkyBoxFogRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/SkyBoxFogRequestBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "SkyBoxFogRequestBus", + "base": "SkyBoxFogRequestBus", "context": "EBusSender", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetBottomHeight", + "base": "GetBottomHeight", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Bottom Height" @@ -32,7 +32,7 @@ ] }, { - "key": "GetColor", + "base": "GetColor", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Color" @@ -54,7 +54,7 @@ ] }, { - "key": "SetBottomHeight", + "base": "SetBottomHeight", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Bottom Height" @@ -76,7 +76,7 @@ ] }, { - "key": "SetColor", + "base": "SetColor", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Color" @@ -98,7 +98,7 @@ ] }, { - "key": "GetTopHeight", + "base": "GetTopHeight", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Top Height" @@ -120,7 +120,7 @@ ] }, { - "key": "IsEnabled", + "base": "IsEnabled", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Is Enabled" @@ -142,7 +142,7 @@ ] }, { - "key": "SetTopHeight", + "base": "SetTopHeight", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Top Height" @@ -164,7 +164,7 @@ ] }, { - "key": "SetEnabled", + "base": "SetEnabled", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Enabled" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/SliceRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/SliceRequestBus.names index 1794a68d04..309ad9b20c 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/SliceRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/SliceRequestBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "SliceRequestBus", + "base": "SliceRequestBus", "context": "EBusSender", "variant": "", "details": { @@ -9,7 +9,7 @@ }, "methods": [ { - "key": "CreateNewSlice", + "base": "CreateNewSlice", "entry": { "name": "In", "tooltip": "When signaled, this will invoke CreateNewSlice" @@ -46,7 +46,7 @@ ] }, { - "key": "InstantiateSliceFromAssetId", + "base": "InstantiateSliceFromAssetId", "entry": { "name": "In", "tooltip": "When signaled, this will invoke InstantiateSliceFromAssetId" @@ -82,7 +82,7 @@ ] }, { - "key": "SetSliceDynamic", + "base": "SetSliceDynamic", "entry": { "name": "In", "tooltip": "When signaled, this will invoke SetSliceDynamic" @@ -110,7 +110,7 @@ ] }, { - "key": "ShowPushDialog", + "base": "ShowPushDialog", "entry": { "name": "In", "tooltip": "When signaled, this will invoke ShowPushDialog" @@ -132,7 +132,7 @@ ] }, { - "key": "IsSliceDynamic", + "base": "IsSliceDynamic", "entry": { "name": "In", "tooltip": "When signaled, this will invoke IsSliceDynamic" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/SmoothStepGradientRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/SmoothStepGradientRequestBus.names index 2c51d78c35..8d3bbb5337 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/SmoothStepGradientRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/SmoothStepGradientRequestBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "SmoothStepGradientRequestBus", + "base": "SmoothStepGradientRequestBus", "context": "EBusSender", "variant": "", "details": { @@ -9,7 +9,7 @@ }, "methods": [ { - "key": "GetGradientSampler", + "base": "GetGradientSampler", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetGradientSampler" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/SmoothStepRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/SmoothStepRequestBus.names index 719b54ec45..28b91a0a34 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/SmoothStepRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/SmoothStepRequestBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "SmoothStepRequestBus", + "base": "SmoothStepRequestBus", "context": "EBusSender", "variant": "", "details": { @@ -9,7 +9,7 @@ }, "methods": [ { - "key": "GetFallOffStrength", + "base": "GetFallOffStrength", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetFallOffStrength" @@ -31,7 +31,7 @@ ] }, { - "key": "SetFallOffStrength", + "base": "SetFallOffStrength", "entry": { "name": "In", "tooltip": "When signaled, this will invoke SetFallOffStrength" @@ -53,7 +53,7 @@ ] }, { - "key": "GetFallOffRange", + "base": "GetFallOffRange", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetFallOffRange" @@ -75,7 +75,7 @@ ] }, { - "key": "SetFallOffMidpoint", + "base": "SetFallOffMidpoint", "entry": { "name": "In", "tooltip": "When signaled, this will invoke SetFallOffMidpoint" @@ -97,7 +97,7 @@ ] }, { - "key": "SetFallOffRange", + "base": "SetFallOffRange", "entry": { "name": "In", "tooltip": "When signaled, this will invoke SetFallOffRange" @@ -119,7 +119,7 @@ ] }, { - "key": "GetFallOffMidpoint", + "base": "GetFallOffMidpoint", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetFallOffMidpoint" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/SpawnerComponentRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/SpawnerComponentRequestBus.names index bd8d62d99a..b9aeb3538a 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/SpawnerComponentRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/SpawnerComponentRequestBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "SpawnerComponentRequestBus", + "base": "SpawnerComponentRequestBus", "context": "EBusSender", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "SetDynamicSlice", + "base": "SetDynamicSlice", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Dynamic Slice" @@ -32,7 +32,7 @@ ] }, { - "key": "GetCurrentlySpawnedSlices", + "base": "GetCurrentlySpawnedSlices", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Currently Spawned Slices" @@ -54,7 +54,7 @@ ] }, { - "key": "HasAnyCurrentlySpawnedSlices", + "base": "HasAnyCurrentlySpawnedSlices", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Has Any Currently Spawned Slices" @@ -76,7 +76,7 @@ ] }, { - "key": "GetAllCurrentlySpawnedEntities", + "base": "GetAllCurrentlySpawnedEntities", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get All Currently Spawned Entities" @@ -98,7 +98,7 @@ ] }, { - "key": "DestroyAllSpawnedSlices", + "base": "DestroyAllSpawnedSlices", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Destroy All Spawned Slices" @@ -112,7 +112,7 @@ } }, { - "key": "GetCurrentEntitiesFromSpawnedSlice", + "base": "GetCurrentEntitiesFromSpawnedSlice", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Current Entities From Spawned Slice" @@ -142,7 +142,7 @@ ] }, { - "key": "DestroySpawnedSlice", + "base": "DestroySpawnedSlice", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Destroy Spawned Slice" @@ -164,7 +164,7 @@ ] }, { - "key": "IsReadyToSpawn", + "base": "IsReadyToSpawn", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Is Ready To Spawn" @@ -186,7 +186,7 @@ ] }, { - "key": "SpawnRelative", + "base": "SpawnRelative", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Spawn Relative" @@ -216,7 +216,7 @@ ] }, { - "key": "Spawn", + "base": "Spawn", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Spawn" @@ -238,7 +238,7 @@ ] }, { - "key": "SpawnAbsolute", + "base": "SpawnAbsolute", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Spawn Absolute" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/SphereShapeComponentRequestsBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/SphereShapeComponentRequestsBus.names index cc5521d074..170c490510 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/SphereShapeComponentRequestsBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/SphereShapeComponentRequestsBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "SphereShapeComponentRequestsBus", + "base": "SphereShapeComponentRequestsBus", "context": "EBusSender", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetSphereConfiguration", + "base": "GetSphereConfiguration", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Configuration" @@ -34,7 +34,7 @@ ] }, { - "key": "SetRadius", + "base": "SetRadius", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Radius" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/SplineComponentRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/SplineComponentRequestBus.names index 067ddc4c0b..7f4e164a01 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/SplineComponentRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/SplineComponentRequestBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "SplineComponentRequestBus", + "base": "SplineComponentRequestBus", "context": "EBusSender", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "ClearVertices", + "base": "ClearVertices", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Clear Vertices" @@ -24,7 +24,7 @@ } }, { - "key": "RemoveVertex", + "base": "RemoveVertex", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Remove Vertex" @@ -54,7 +54,7 @@ ] }, { - "key": "UpdateVertex", + "base": "UpdateVertex", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Update Vertex" @@ -90,7 +90,7 @@ ] }, { - "key": "AddVertex", + "base": "AddVertex", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Add Vertex" @@ -112,7 +112,7 @@ ] }, { - "key": "GetSpline", + "base": "GetSpline", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Spline" @@ -134,7 +134,7 @@ ] }, { - "key": "SetClosed", + "base": "SetClosed", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Closed" @@ -156,7 +156,7 @@ ] }, { - "key": "InsertVertex", + "base": "InsertVertex", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Insert Vertex" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/SsaoRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/SsaoRequestBus.names index a0d6ebdedd..1d58037a04 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/SsaoRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/SsaoRequestBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "SsaoRequestBus", + "base": "SsaoRequestBus", "context": "EBusSender", "variant": "", "details": { @@ -9,7 +9,7 @@ }, "methods": [ { - "key": "SetBlurDepthFalloffStrength", + "base": "SetBlurDepthFalloffStrength", "entry": { "name": "In", "tooltip": "When signaled, this will invoke SetBlurDepthFalloffStrength" @@ -31,7 +31,7 @@ ] }, { - "key": "SetBlurDepthFalloffThreshold", + "base": "SetBlurDepthFalloffThreshold", "entry": { "name": "In", "tooltip": "When signaled, this will invoke SetBlurDepthFalloffThreshold" @@ -53,7 +53,7 @@ ] }, { - "key": "SetEnableDownsampleOverride", + "base": "SetEnableDownsampleOverride", "entry": { "name": "In", "tooltip": "When signaled, this will invoke SetEnableDownsampleOverride" @@ -75,7 +75,7 @@ ] }, { - "key": "SetEnableBlurOverride", + "base": "SetEnableBlurOverride", "entry": { "name": "In", "tooltip": "When signaled, this will invoke SetEnableBlurOverride" @@ -97,7 +97,7 @@ ] }, { - "key": "GetEnabledOverride", + "base": "GetEnabledOverride", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetEnabledOverride" @@ -119,7 +119,7 @@ ] }, { - "key": "GetSamplingRadius", + "base": "GetSamplingRadius", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetSamplingRadius" @@ -141,7 +141,7 @@ ] }, { - "key": "SetBlurDepthFalloffStrengthOverride", + "base": "SetBlurDepthFalloffStrengthOverride", "entry": { "name": "In", "tooltip": "When signaled, this will invoke SetBlurDepthFalloffStrengthOverride" @@ -163,7 +163,7 @@ ] }, { - "key": "GetBlurDepthFalloffThresholdOverride", + "base": "GetBlurDepthFalloffThresholdOverride", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetBlurDepthFalloffThresholdOverride" @@ -185,7 +185,7 @@ ] }, { - "key": "GetBlurDepthFalloffThreshold", + "base": "GetBlurDepthFalloffThreshold", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetBlurDepthFalloffThreshold" @@ -207,7 +207,7 @@ ] }, { - "key": "GetSamplingRadiusOverride", + "base": "GetSamplingRadiusOverride", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetSamplingRadiusOverride" @@ -229,7 +229,7 @@ ] }, { - "key": "SetStrengthOverride", + "base": "SetStrengthOverride", "entry": { "name": "In", "tooltip": "When signaled, this will invoke SetStrengthOverride" @@ -251,7 +251,7 @@ ] }, { - "key": "GetStrength", + "base": "GetStrength", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetStrength" @@ -273,7 +273,7 @@ ] }, { - "key": "GetEnabled", + "base": "GetEnabled", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetEnabled" @@ -295,7 +295,7 @@ ] }, { - "key": "GetEnableDownsample", + "base": "GetEnableDownsample", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetEnableDownsample" @@ -317,7 +317,7 @@ ] }, { - "key": "GetBlurDepthFalloffStrength", + "base": "GetBlurDepthFalloffStrength", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetBlurDepthFalloffStrength" @@ -339,7 +339,7 @@ ] }, { - "key": "SetBlurConstFalloff", + "base": "SetBlurConstFalloff", "entry": { "name": "In", "tooltip": "When signaled, this will invoke SetBlurConstFalloff" @@ -361,7 +361,7 @@ ] }, { - "key": "GetEnableDownsampleOverride", + "base": "GetEnableDownsampleOverride", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetEnableDownsampleOverride" @@ -383,7 +383,7 @@ ] }, { - "key": "GetEnableBlurOverride", + "base": "GetEnableBlurOverride", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetEnableBlurOverride" @@ -405,7 +405,7 @@ ] }, { - "key": "SetSamplingRadiusOverride", + "base": "SetSamplingRadiusOverride", "entry": { "name": "In", "tooltip": "When signaled, this will invoke SetSamplingRadiusOverride" @@ -427,7 +427,7 @@ ] }, { - "key": "SetSamplingRadius", + "base": "SetSamplingRadius", "entry": { "name": "In", "tooltip": "When signaled, this will invoke SetSamplingRadius" @@ -449,7 +449,7 @@ ] }, { - "key": "SetStrength", + "base": "SetStrength", "entry": { "name": "In", "tooltip": "When signaled, this will invoke SetStrength" @@ -471,7 +471,7 @@ ] }, { - "key": "SetEnabled", + "base": "SetEnabled", "entry": { "name": "In", "tooltip": "When signaled, this will invoke SetEnabled" @@ -493,7 +493,7 @@ ] }, { - "key": "GetStrengthOverride", + "base": "GetStrengthOverride", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetStrengthOverride" @@ -515,7 +515,7 @@ ] }, { - "key": "GetEnableBlur", + "base": "GetEnableBlur", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetEnableBlur" @@ -537,7 +537,7 @@ ] }, { - "key": "SetEnableDownsample", + "base": "SetEnableDownsample", "entry": { "name": "In", "tooltip": "When signaled, this will invoke SetEnableDownsample" @@ -559,7 +559,7 @@ ] }, { - "key": "SetBlurDepthFalloffThresholdOverride", + "base": "SetBlurDepthFalloffThresholdOverride", "entry": { "name": "In", "tooltip": "When signaled, this will invoke SetBlurDepthFalloffThresholdOverride" @@ -581,7 +581,7 @@ ] }, { - "key": "SetBlurConstFalloffOverride", + "base": "SetBlurConstFalloffOverride", "entry": { "name": "In", "tooltip": "When signaled, this will invoke SetBlurConstFalloffOverride" @@ -603,7 +603,7 @@ ] }, { - "key": "GetBlurConstFalloff", + "base": "GetBlurConstFalloff", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetBlurConstFalloff" @@ -625,7 +625,7 @@ ] }, { - "key": "SetEnabledOverride", + "base": "SetEnabledOverride", "entry": { "name": "In", "tooltip": "When signaled, this will invoke SetEnabledOverride" @@ -647,7 +647,7 @@ ] }, { - "key": "SetEnableBlur", + "base": "SetEnableBlur", "entry": { "name": "In", "tooltip": "When signaled, this will invoke SetEnableBlur" @@ -669,7 +669,7 @@ ] }, { - "key": "GetBlurConstFalloffOverride", + "base": "GetBlurConstFalloffOverride", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetBlurConstFalloffOverride" @@ -691,7 +691,7 @@ ] }, { - "key": "GetBlurDepthFalloffStrengthOverride", + "base": "GetBlurDepthFalloffStrengthOverride", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetBlurDepthFalloffStrengthOverride" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/SurfaceAltitudeGradientRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/SurfaceAltitudeGradientRequestBus.names index a8ff8ab8fd..ff2d814e8b 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/SurfaceAltitudeGradientRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/SurfaceAltitudeGradientRequestBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "SurfaceAltitudeGradientRequestBus", + "base": "SurfaceAltitudeGradientRequestBus", "context": "EBusSender", "variant": "", "details": { @@ -9,7 +9,7 @@ }, "methods": [ { - "key": "GetNumTags", + "base": "GetNumTags", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetNumTags" @@ -31,7 +31,7 @@ ] }, { - "key": "RemoveTag", + "base": "RemoveTag", "entry": { "name": "In", "tooltip": "When signaled, this will invoke RemoveTag" @@ -53,7 +53,7 @@ ] }, { - "key": "GetAltitudeMax", + "base": "GetAltitudeMax", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetAltitudeMax" @@ -75,7 +75,7 @@ ] }, { - "key": "SetAltitudeMin", + "base": "SetAltitudeMin", "entry": { "name": "In", "tooltip": "When signaled, this will invoke SetAltitudeMin" @@ -97,7 +97,7 @@ ] }, { - "key": "GetAltitudeMin", + "base": "GetAltitudeMin", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetAltitudeMin" @@ -119,7 +119,7 @@ ] }, { - "key": "GetTag", + "base": "GetTag", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetTag" @@ -149,7 +149,7 @@ ] }, { - "key": "AddTag", + "base": "AddTag", "entry": { "name": "In", "tooltip": "When signaled, this will invoke AddTag" @@ -171,7 +171,7 @@ ] }, { - "key": "SetShapeEntityId", + "base": "SetShapeEntityId", "entry": { "name": "In", "tooltip": "When signaled, this will invoke SetShapeEntityId" @@ -194,7 +194,7 @@ ] }, { - "key": "SetAltitudeMax", + "base": "SetAltitudeMax", "entry": { "name": "In", "tooltip": "When signaled, this will invoke SetAltitudeMax" @@ -216,7 +216,7 @@ ] }, { - "key": "GetShapeEntityId", + "base": "GetShapeEntityId", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetShapeEntityId" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/SurfaceMaskGradientRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/SurfaceMaskGradientRequestBus.names index b71f80ddf9..13ea976480 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/SurfaceMaskGradientRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/SurfaceMaskGradientRequestBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "SurfaceMaskGradientRequestBus", + "base": "SurfaceMaskGradientRequestBus", "context": "EBusSender", "variant": "", "details": { @@ -9,7 +9,7 @@ }, "methods": [ { - "key": "GetNumTags", + "base": "GetNumTags", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetNumTags" @@ -31,7 +31,7 @@ ] }, { - "key": "GetTag", + "base": "GetTag", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetTag" @@ -61,7 +61,7 @@ ] }, { - "key": "RemoveTag", + "base": "RemoveTag", "entry": { "name": "In", "tooltip": "When signaled, this will invoke RemoveTag" @@ -83,7 +83,7 @@ ] }, { - "key": "AddTag", + "base": "AddTag", "entry": { "name": "In", "tooltip": "When signaled, this will invoke AddTag" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/SurfaceSlopeGradientRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/SurfaceSlopeGradientRequestBus.names index 9b0cd3802c..8db09b1773 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/SurfaceSlopeGradientRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/SurfaceSlopeGradientRequestBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "SurfaceSlopeGradientRequestBus", + "base": "SurfaceSlopeGradientRequestBus", "context": "EBusSender", "variant": "", "details": { @@ -9,7 +9,7 @@ }, "methods": [ { - "key": "SetRampType", + "base": "SetRampType", "entry": { "name": "In", "tooltip": "When signaled, this will invoke SetRampType" @@ -31,7 +31,7 @@ ] }, { - "key": "GetTag", + "base": "GetTag", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetTag" @@ -61,7 +61,7 @@ ] }, { - "key": "AddTag", + "base": "AddTag", "entry": { "name": "In", "tooltip": "When signaled, this will invoke AddTag" @@ -83,7 +83,7 @@ ] }, { - "key": "SetSlopeMax", + "base": "SetSlopeMax", "entry": { "name": "In", "tooltip": "When signaled, this will invoke SetSlopeMax" @@ -105,7 +105,7 @@ ] }, { - "key": "GetNumTags", + "base": "GetNumTags", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetNumTags" @@ -127,7 +127,7 @@ ] }, { - "key": "RemoveTag", + "base": "RemoveTag", "entry": { "name": "In", "tooltip": "When signaled, this will invoke RemoveTag" @@ -149,7 +149,7 @@ ] }, { - "key": "GetRampType", + "base": "GetRampType", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetRampType" @@ -171,7 +171,7 @@ ] }, { - "key": "GetSlopeMax", + "base": "GetSlopeMax", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetSlopeMax" @@ -193,7 +193,7 @@ ] }, { - "key": "SetSlopeMin", + "base": "SetSlopeMin", "entry": { "name": "In", "tooltip": "When signaled, this will invoke SetSlopeMin" @@ -215,7 +215,7 @@ ] }, { - "key": "GetSlopeMin", + "base": "GetSlopeMin", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetSlopeMin" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/TagComponentRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/TagComponentRequestBus.names index da9973205b..f1d8a7bc31 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/TagComponentRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/TagComponentRequestBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "TagComponentRequestBus", + "base": "TagComponentRequestBus", "context": "EBusSender", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "HasTag", + "base": "HasTag", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Has Tag" @@ -40,7 +40,7 @@ ] }, { - "key": "AddTag", + "base": "AddTag", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Add Tag" @@ -62,7 +62,7 @@ ] }, { - "key": "RemoveTag", + "base": "RemoveTag", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Remove Tag" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/TagGlobalRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/TagGlobalRequestBus.names index dca7386616..8136a2c947 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/TagGlobalRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/TagGlobalRequestBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "TagGlobalRequestBus", + "base": "TagGlobalRequestBus", "context": "EBusSender", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "RequestTaggedEntities", + "base": "RequestTaggedEntities", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Request Tagged Entities" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/TerrainDataRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/TerrainDataRequestBus.names index f7ea7fa19e..50b0c9794b 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/TerrainDataRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/TerrainDataRequestBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "TerrainDataRequestBus", + "base": "TerrainDataRequestBus", "context": "EBusSender", "variant": "", "details": { @@ -9,7 +9,7 @@ }, "methods": [ { - "key": "GetIsHoleFromFloats", + "base": "GetIsHoleFromFloats", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Is Hole From Floats" @@ -52,7 +52,7 @@ ] }, { - "key": "GetSurfaceWeightsFromVector2", + "base": "GetSurfaceWeightsFromVector2", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Surface Weights From Vector2" @@ -93,7 +93,7 @@ ] }, { - "key": "GetSurfaceWeights", + "base": "GetSurfaceWeights", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetSurfaceWeights" @@ -134,7 +134,7 @@ ] }, { - "key": "GetMaxSurfaceWeight", + "base": "GetMaxSurfaceWeight", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Max Surface Weight" @@ -177,7 +177,7 @@ ] }, { - "key": "GetSurfacePointFromVector2", + "base": "GetSurfacePointFromVector2", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Surface Point From Vector2" @@ -218,7 +218,7 @@ ] }, { - "key": "GetTerrainHeightQueryResolution", + "base": "GetTerrainHeightQueryResolution", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Terrain Height Query Resolution" @@ -240,7 +240,7 @@ ] }, { - "key": "GetNormal", + "base": "GetNormal", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Normal" @@ -283,7 +283,7 @@ ] }, { - "key": "GetMaxSurfaceWeightFromVector2", + "base": "GetMaxSurfaceWeightFromVector2", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Max Surface Weight From Vector2" @@ -326,7 +326,7 @@ ] }, { - "key": "GetTerrainAabb", + "base": "GetTerrainAabb", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Terrain AABB" @@ -348,7 +348,7 @@ ] }, { - "key": "GetHeight", + "base": "GetHeight", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Height" @@ -391,7 +391,7 @@ ] }, { - "key": "GetSurfacePoint", + "base": "GetSurfacePoint", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Surface Point" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ThresholdGradientRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ThresholdGradientRequestBus.names index 0ad659c691..b5eceff545 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ThresholdGradientRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ThresholdGradientRequestBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "ThresholdGradientRequestBus", + "base": "ThresholdGradientRequestBus", "context": "EBusSender", "variant": "", "details": { @@ -9,7 +9,7 @@ }, "methods": [ { - "key": "GetThreshold", + "base": "GetThreshold", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetThreshold" @@ -31,7 +31,7 @@ ] }, { - "key": "SetThreshold", + "base": "SetThreshold", "entry": { "name": "In", "tooltip": "When signaled, this will invoke SetThreshold" @@ -53,7 +53,7 @@ ] }, { - "key": "GetGradientSampler", + "base": "GetGradientSampler", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetGradientSampler" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/TickRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/TickRequestBus.names index 414e66e411..6c8e29af70 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/TickRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/TickRequestBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "TickRequestBus", + "base": "TickRequestBus", "context": "EBusSender", "variant": "", "details": { @@ -9,7 +9,7 @@ }, "methods": [ { - "key": "GetTickDeltaTime", + "base": "GetTickDeltaTime", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Tick Delta Time" @@ -31,7 +31,7 @@ ] }, { - "key": "GetTimeAtCurrentTick", + "base": "GetTimeAtCurrentTick", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Time At Current Tick" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ToolsApplicationRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ToolsApplicationRequestBus.names index 055931428e..148c96005b 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ToolsApplicationRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ToolsApplicationRequestBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "ToolsApplicationRequestBus", + "base": "ToolsApplicationRequestBus", "context": "EBusSender", "variant": "", "details": { @@ -9,7 +9,7 @@ }, "methods": [ { - "key": "MarkEntitySelected", + "base": "MarkEntitySelected", "entry": { "name": "In", "tooltip": "When signaled, this will invoke MarkEntitySelected" @@ -32,7 +32,7 @@ ] }, { - "key": "IsSelected", + "base": "IsSelected", "entry": { "name": "In", "tooltip": "When signaled, this will invoke IsSelected" @@ -63,7 +63,7 @@ ] }, { - "key": "GetSelectedEntitiesCount", + "base": "GetSelectedEntitiesCount", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetSelectedEntitiesCount" @@ -85,7 +85,7 @@ ] }, { - "key": "GetSelectedEntities", + "base": "GetSelectedEntities", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetSelectedEntities" @@ -107,7 +107,7 @@ ] }, { - "key": "DeleteEntitiesAndAllDescendants", + "base": "DeleteEntitiesAndAllDescendants", "entry": { "name": "In", "tooltip": "When signaled, this will invoke DeleteEntitiesAndAllDescendants" @@ -129,7 +129,7 @@ ] }, { - "key": "GetExistingEntity", + "base": "GetExistingEntity", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetExistingEntity" @@ -160,7 +160,7 @@ ] }, { - "key": "SetSelectedEntities", + "base": "SetSelectedEntities", "entry": { "name": "In", "tooltip": "When signaled, this will invoke SetSelectedEntities" @@ -182,7 +182,7 @@ ] }, { - "key": "MarkEntitiesSelected", + "base": "MarkEntitiesSelected", "entry": { "name": "In", "tooltip": "When signaled, this will invoke MarkEntitiesSelected" @@ -204,7 +204,7 @@ ] }, { - "key": "MarkEntityDeselected", + "base": "MarkEntityDeselected", "entry": { "name": "In", "tooltip": "When signaled, this will invoke MarkEntityDeselected" @@ -227,7 +227,7 @@ ] }, { - "key": "GetCurrentLevelEntityId", + "base": "GetCurrentLevelEntityId", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetCurrentLevelEntityId" @@ -250,7 +250,7 @@ ] }, { - "key": "AreAnyEntitiesSelected", + "base": "AreAnyEntitiesSelected", "entry": { "name": "In", "tooltip": "When signaled, this will invoke AreAnyEntitiesSelected" @@ -272,7 +272,7 @@ ] }, { - "key": "CreateNewEntityAtPosition", + "base": "CreateNewEntityAtPosition", "entry": { "name": "In", "tooltip": "When signaled, this will invoke CreateNewEntityAtPosition" @@ -310,7 +310,7 @@ ] }, { - "key": "DeleteEntityAndAllDescendants", + "base": "DeleteEntityAndAllDescendants", "entry": { "name": "In", "tooltip": "When signaled, this will invoke DeleteEntityAndAllDescendants" @@ -333,7 +333,7 @@ ] }, { - "key": "CreateNewEntity", + "base": "CreateNewEntity", "entry": { "name": "In", "tooltip": "When signaled, this will invoke CreateNewEntity" @@ -365,7 +365,7 @@ ] }, { - "key": "EntityExists", + "base": "EntityExists", "entry": { "name": "In", "tooltip": "When signaled, this will invoke EntityExists" @@ -396,7 +396,7 @@ ] }, { - "key": "DeleteEntityById", + "base": "DeleteEntityById", "entry": { "name": "In", "tooltip": "When signaled, this will invoke DeleteEntityById" @@ -419,7 +419,7 @@ ] }, { - "key": "DeleteEntities", + "base": "DeleteEntities", "entry": { "name": "In", "tooltip": "When signaled, this will invoke DeleteEntities" @@ -441,7 +441,7 @@ ] }, { - "key": "MarkEntitiesDeselected", + "base": "MarkEntitiesDeselected", "entry": { "name": "In", "tooltip": "When signaled, this will invoke MarkEntitiesDeselected" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/TransformBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/TransformBus.names index 9ee4d4d58f..2d8bc4ede4 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/TransformBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/TransformBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "TransformBus", + "base": "TransformBus", "context": "EBusSender", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "SetLocalUniformScale", + "base": "SetLocalUniformScale", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Local Uniform Scale" @@ -32,7 +32,7 @@ ] }, { - "key": "SetLocalRotationQuaternion", + "base": "SetLocalRotationQuaternion", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Local Rotation Quaternion" @@ -54,7 +54,7 @@ ] }, { - "key": "GetLocalRotation", + "base": "GetLocalRotation", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Local Rotation" @@ -76,7 +76,7 @@ ] }, { - "key": "GetLocalTM", + "base": "GetLocalTM", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Local Transform" @@ -99,7 +99,7 @@ ] }, { - "key": "GetEntityAndAllDescendants", + "base": "GetEntityAndAllDescendants", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Entity And All Descendants" @@ -121,7 +121,7 @@ ] }, { - "key": "SetLocalZ", + "base": "SetLocalZ", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Local Z" @@ -143,7 +143,7 @@ ] }, { - "key": "GetAllDescendants", + "base": "GetAllDescendants", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get All Descendants" @@ -165,7 +165,7 @@ ] }, { - "key": "GetLocalAndWorld", + "base": "GetLocalAndWorld", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Local And World" @@ -193,7 +193,7 @@ ] }, { - "key": "RotateAroundLocalZ", + "base": "RotateAroundLocalZ", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Rotate Around Local Z" @@ -215,7 +215,7 @@ ] }, { - "key": "GetWorldRotationQuaternion", + "base": "GetWorldRotationQuaternion", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get World Rotation Quaternion" @@ -237,7 +237,7 @@ ] }, { - "key": "RotateAroundLocalX", + "base": "RotateAroundLocalX", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Rotate Around Local X" @@ -259,7 +259,7 @@ ] }, { - "key": "SetParent", + "base": "SetParent", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Parent" @@ -282,7 +282,7 @@ ] }, { - "key": "GetLocalZ", + "base": "GetLocalZ", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Local Z" @@ -304,7 +304,7 @@ ] }, { - "key": "SetLocalRotation", + "base": "SetLocalRotation", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Local Rotation" @@ -326,7 +326,7 @@ ] }, { - "key": "SetLocalX", + "base": "SetLocalX", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Local X" @@ -348,7 +348,7 @@ ] }, { - "key": "GetLocalRotationQuaternion", + "base": "GetLocalRotationQuaternion", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Local Rotation Quaternion" @@ -370,7 +370,7 @@ ] }, { - "key": "GetWorldX", + "base": "GetWorldX", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get World X" @@ -392,7 +392,7 @@ ] }, { - "key": "SetWorldTranslation", + "base": "SetWorldTranslation", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set World Translation" @@ -414,7 +414,7 @@ ] }, { - "key": "MoveEntity", + "base": "MoveEntity", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Move Entity" @@ -436,7 +436,7 @@ ] }, { - "key": "GetChildren", + "base": "GetChildren", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Children" @@ -458,7 +458,7 @@ ] }, { - "key": "SetParentRelative", + "base": "SetParentRelative", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Parent Relative" @@ -481,7 +481,7 @@ ] }, { - "key": "SetWorldTM", + "base": "SetWorldTM", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set World Transform" @@ -503,7 +503,7 @@ ] }, { - "key": "SetWorldRotationQuaternion", + "base": "SetWorldRotationQuaternion", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set World Rotation Quaternion" @@ -525,7 +525,7 @@ ] }, { - "key": "SetWorldX", + "base": "SetWorldX", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set World X" @@ -547,7 +547,7 @@ ] }, { - "key": "GetWorldY", + "base": "GetWorldY", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get World Y" @@ -569,7 +569,7 @@ ] }, { - "key": "GetLocalUniformScale", + "base": "GetLocalUniformScale", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Local Uniform Scale" @@ -591,7 +591,7 @@ ] }, { - "key": "SetWorldZ", + "base": "SetWorldZ", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set World Z" @@ -613,7 +613,7 @@ ] }, { - "key": "SetLocalTM", + "base": "SetLocalTM", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Local Transform" @@ -635,7 +635,7 @@ ] }, { - "key": "SetLocalTranslation", + "base": "SetLocalTranslation", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Local Translation" @@ -657,7 +657,7 @@ ] }, { - "key": "GetLocalScale", + "base": "GetLocalScale", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Local Scale" @@ -679,7 +679,7 @@ ] }, { - "key": "SetWorldY", + "base": "SetWorldY", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set World Y" @@ -701,7 +701,7 @@ ] }, { - "key": "RotateAroundLocalY", + "base": "RotateAroundLocalY", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Rotate Around Local Y" @@ -723,7 +723,7 @@ ] }, { - "key": "GetLocalTranslation", + "base": "GetLocalTranslation", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Local Translation" @@ -745,7 +745,7 @@ ] }, { - "key": "GetWorldRotation", + "base": "GetWorldRotation", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get World Rotation" @@ -768,7 +768,7 @@ ] }, { - "key": "GetWorldZ", + "base": "GetWorldZ", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get World Z" @@ -790,7 +790,7 @@ ] }, { - "key": "GetLocalY", + "base": "GetLocalY", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Local Y" @@ -812,7 +812,7 @@ ] }, { - "key": "GetWorldTranslation", + "base": "GetWorldTranslation", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get World Translation" @@ -834,7 +834,7 @@ ] }, { - "key": "SetLocalY", + "base": "SetLocalY", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Local Y" @@ -856,7 +856,7 @@ ] }, { - "key": "GetLocalX", + "base": "GetLocalX", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Local X" @@ -878,7 +878,7 @@ ] }, { - "key": "GetWorldTM", + "base": "GetWorldTM", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get World Transform" @@ -900,7 +900,7 @@ ] }, { - "key": "GetParentId", + "base": "GetParentId", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Parent Id" @@ -923,7 +923,7 @@ ] }, { - "key": "IsStaticTransform", + "base": "IsStaticTransform", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Is Static Transform" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/TubeShapeComponentRequestsBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/TubeShapeComponentRequestsBus.names index b038d91560..87b0584dbf 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/TubeShapeComponentRequestsBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/TubeShapeComponentRequestsBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "TubeShapeComponentRequestsBus", + "base": "TubeShapeComponentRequestsBus", "context": "EBusSender", "variant": "", "details": { @@ -9,7 +9,7 @@ }, "methods": [ { - "key": "GetVariableRadius", + "base": "GetVariableRadius", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetVariableRadius" @@ -39,7 +39,7 @@ ] }, { - "key": "SetVariableRadius", + "base": "SetVariableRadius", "entry": { "name": "In", "tooltip": "When signaled, this will invoke SetVariableRadius" @@ -67,7 +67,7 @@ ] }, { - "key": "SetRadius", + "base": "SetRadius", "entry": { "name": "In", "tooltip": "When signaled, this will invoke SetRadius" @@ -89,7 +89,7 @@ ] }, { - "key": "GetRadius", + "base": "GetRadius", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetRadius" @@ -111,7 +111,7 @@ ] }, { - "key": "GetTotalRadius", + "base": "GetTotalRadius", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetTotalRadius" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiAnimationBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiAnimationBus.names index 5618698361..8681104e2c 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiAnimationBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiAnimationBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "UiAnimationBus", + "base": "UiAnimationBus", "context": "EBusSender", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "ResetSequence", + "base": "ResetSequence", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Reset Sequence" @@ -34,7 +34,7 @@ ] }, { - "key": "GetSequencePlayingSpeed", + "base": "GetSequencePlayingSpeed", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Sequence Playing Speed" @@ -67,7 +67,7 @@ ] }, { - "key": "GetSequencePlayingTime", + "base": "GetSequencePlayingTime", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Sequence Playing Time" @@ -100,7 +100,7 @@ ] }, { - "key": "AbortSequence", + "base": "AbortSequence", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Abort Sequence" @@ -124,7 +124,7 @@ ] }, { - "key": "IsSequencePlaying", + "base": "IsSequencePlaying", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Is Sequence Playing" @@ -157,7 +157,7 @@ ] }, { - "key": "GetSequenceLength", + "base": "GetSequenceLength", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Sequence Length" @@ -190,7 +190,7 @@ ] }, { - "key": "StopSequence", + "base": "StopSequence", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Stop Sequence" @@ -214,7 +214,7 @@ ] }, { - "key": "PlaySequenceRange", + "base": "PlaySequenceRange", "entry": { "name": "In", "tooltip": "When signaled, this will invoke PlaySequenceRange" @@ -248,7 +248,7 @@ ] }, { - "key": "PauseSequence", + "base": "PauseSequence", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Pause Sequence" @@ -272,7 +272,7 @@ ] }, { - "key": "ResumeSequence", + "base": "ResumeSequence", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Resume Sequence" @@ -296,7 +296,7 @@ ] }, { - "key": "StartSequence", + "base": "StartSequence", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Start Sequence" @@ -320,7 +320,7 @@ ] }, { - "key": "SetSequencePlayingSpeed", + "base": "SetSequencePlayingSpeed", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Sequence Playing Speed" @@ -351,7 +351,7 @@ ] }, { - "key": "SetSequenceStopBehavior", + "base": "SetSequenceStopBehavior", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Sequence Stop Behavior" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiButtonBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiButtonBus.names index 93c278b55f..b3228e764f 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiButtonBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiButtonBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "UiButtonBus", + "base": "UiButtonBus", "context": "EBusSender", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetOnClickActionName", + "base": "GetOnClickActionName", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get On Click Action Name" @@ -33,7 +33,7 @@ ] }, { - "key": "SetOnClickActionName", + "base": "SetOnClickActionName", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set On Click Action Name" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiCanvasAssetRefBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiCanvasAssetRefBus.names index 7e1cc1941a..74538a9aed 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiCanvasAssetRefBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiCanvasAssetRefBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "UiCanvasAssetRefBus", + "base": "UiCanvasAssetRefBus", "context": "EBusSender", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "LoadCanvas", + "base": "LoadCanvas", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Load Canvas" @@ -34,7 +34,7 @@ ] }, { - "key": "UnloadCanvas", + "base": "UnloadCanvas", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Unload Canvas" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiCanvasBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiCanvasBus.names index 5a039e9720..9403cf7cfb 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiCanvasBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiCanvasBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "UiCanvasBus", + "base": "UiCanvasBus", "context": "EBusSender", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "ForceHoverInteractable", + "base": "ForceHoverInteractable", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Force Hover Interactable" @@ -34,7 +34,7 @@ ] }, { - "key": "GetNavigationRepeatPeriod", + "base": "GetNavigationRepeatPeriod", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetNavigationRepeatPeriod" @@ -56,7 +56,7 @@ ] }, { - "key": "GetNavigationRepeatDelay", + "base": "GetNavigationRepeatDelay", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetNavigationRepeatDelay" @@ -78,7 +78,7 @@ ] }, { - "key": "GetHoverInteractable", + "base": "GetHoverInteractable", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Hover Interactable" @@ -102,7 +102,7 @@ ] }, { - "key": "SetNavigationThreshold", + "base": "SetNavigationThreshold", "entry": { "name": "In", "tooltip": "When signaled, this will invoke SetNavigationThreshold" @@ -124,7 +124,7 @@ ] }, { - "key": "SetIsConsumingAllInputEvents", + "base": "SetIsConsumingAllInputEvents", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Is Consuming All Input Events" @@ -148,7 +148,7 @@ ] }, { - "key": "SetDrawOrder", + "base": "SetDrawOrder", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Draw Order" @@ -172,7 +172,7 @@ ] }, { - "key": "GetIsPositionalInputSupported", + "base": "GetIsPositionalInputSupported", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Is Positional Input Supported" @@ -195,7 +195,7 @@ ] }, { - "key": "RecomputeChangedLayouts", + "base": "RecomputeChangedLayouts", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Recompute Changed Layouts" @@ -210,7 +210,7 @@ } }, { - "key": "SetRenderTargetName", + "base": "SetRenderTargetName", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Render Target Name" @@ -234,7 +234,7 @@ ] }, { - "key": "GetTooltipDisplayElement", + "base": "GetTooltipDisplayElement", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Tooltip Display Element" @@ -258,7 +258,7 @@ ] }, { - "key": "GetIsNavigationSupported", + "base": "GetIsNavigationSupported", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Is Navigation Supported" @@ -281,7 +281,7 @@ ] }, { - "key": "SetNavigationRepeatPeriod", + "base": "SetNavigationRepeatPeriod", "entry": { "name": "In", "tooltip": "When signaled, this will invoke SetNavigationRepeatPeriod" @@ -303,7 +303,7 @@ ] }, { - "key": "GetRenderTargetName", + "base": "GetRenderTargetName", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Render Target Name" @@ -326,7 +326,7 @@ ] }, { - "key": "FindElementByName", + "base": "FindElementByName", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Find Element By Name" @@ -359,7 +359,7 @@ ] }, { - "key": "SetTooltipDisplayElement", + "base": "SetTooltipDisplayElement", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Tooltip Display Element" @@ -383,7 +383,7 @@ ] }, { - "key": "GetChildElement", + "base": "GetChildElement", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Child Element" @@ -416,7 +416,7 @@ ] }, { - "key": "GetKeepLoadedOnLevelUnload", + "base": "GetKeepLoadedOnLevelUnload", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Keep Loaded On Level Unload" @@ -439,7 +439,7 @@ ] }, { - "key": "GetIsTextPixelAligned", + "base": "GetIsTextPixelAligned", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Is Text Pixel Aligned" @@ -462,7 +462,7 @@ ] }, { - "key": "GetIsConsumingAllInputEvents", + "base": "GetIsConsumingAllInputEvents", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Is Consuming All Input Events" @@ -485,7 +485,7 @@ ] }, { - "key": "GetNavigationThreshold", + "base": "GetNavigationThreshold", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetNavigationThreshold" @@ -507,7 +507,7 @@ ] }, { - "key": "SetKeepLoadedOnLevelUnload", + "base": "SetKeepLoadedOnLevelUnload", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Keep Loaded On Level Unload" @@ -531,7 +531,7 @@ ] }, { - "key": "SetIsMultiTouchSupported", + "base": "SetIsMultiTouchSupported", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Is Multi-touch Supported" @@ -555,7 +555,7 @@ ] }, { - "key": "SetIsRenderToTexture", + "base": "SetIsRenderToTexture", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Render To Texture" @@ -579,7 +579,7 @@ ] }, { - "key": "GetChildElements", + "base": "GetChildElements", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Child Elements" @@ -602,7 +602,7 @@ ] }, { - "key": "GetNumChildElements", + "base": "GetNumChildElements", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Number Of Child Elements" @@ -625,7 +625,7 @@ ] }, { - "key": "GetIsPixelAligned", + "base": "GetIsPixelAligned", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Is Pixel Aligned" @@ -648,7 +648,7 @@ ] }, { - "key": "GetEnabled", + "base": "GetEnabled", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Is Enabled" @@ -671,7 +671,7 @@ ] }, { - "key": "SetIsNavigationSupported", + "base": "SetIsNavigationSupported", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Is Navigation Supported" @@ -695,7 +695,7 @@ ] }, { - "key": "GetDrawOrder", + "base": "GetDrawOrder", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Draw Order" @@ -718,7 +718,7 @@ ] }, { - "key": "ForceEnterInputEventOnInteractable", + "base": "ForceEnterInputEventOnInteractable", "entry": { "name": "In", "tooltip": "When signaled, this will invoke ForceEnterInputEventOnInteractable" @@ -741,7 +741,7 @@ ] }, { - "key": "GetIsMultiTouchSupported", + "base": "GetIsMultiTouchSupported", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Is Multi-touch Supported" @@ -764,7 +764,7 @@ ] }, { - "key": "SetIsPixelAligned", + "base": "SetIsPixelAligned", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Is Pixel Aligned" @@ -788,7 +788,7 @@ ] }, { - "key": "SetIsPositionalInputSupported", + "base": "SetIsPositionalInputSupported", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Is Positional Input Supported" @@ -812,7 +812,7 @@ ] }, { - "key": "CloneElement", + "base": "CloneElement", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Clone Element" @@ -859,7 +859,7 @@ ] }, { - "key": "SetNavigationRepeatDelay", + "base": "SetNavigationRepeatDelay", "entry": { "name": "In", "tooltip": "When signaled, this will invoke SetNavigationRepeatDelay" @@ -881,7 +881,7 @@ ] }, { - "key": "GetIsRenderToTexture", + "base": "GetIsRenderToTexture", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Render To Texture" @@ -904,7 +904,7 @@ ] }, { - "key": "SetEnabled", + "base": "SetEnabled", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Is Enabled" @@ -928,7 +928,7 @@ ] }, { - "key": "SetIsTextPixelAligned", + "base": "SetIsTextPixelAligned", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Is Text Pixel Aligned" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiCanvasManagerBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiCanvasManagerBus.names index fe30e0079a..2776264467 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiCanvasManagerBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiCanvasManagerBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "UiCanvasManagerBus", + "base": "UiCanvasManagerBus", "context": "EBusSender", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "CreateCanvas", + "base": "CreateCanvas", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Create Canvas" @@ -34,7 +34,7 @@ ] }, { - "key": "LoadCanvas", + "base": "LoadCanvas", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Load Canvas" @@ -67,7 +67,7 @@ ] }, { - "key": "UnloadCanvas", + "base": "UnloadCanvas", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Unload Canvas" @@ -91,7 +91,7 @@ ] }, { - "key": "FindLoadedCanvasByPathName", + "base": "FindLoadedCanvasByPathName", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Find Loaded Canvas By Pathname" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiCanvasProxyRefBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiCanvasProxyRefBus.names index 170be3be23..bcd50ded75 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiCanvasProxyRefBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiCanvasProxyRefBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "UiCanvasProxyRefBus", + "base": "UiCanvasProxyRefBus", "context": "EBusSender", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "SetCanvasRefEntity", + "base": "SetCanvasRefEntity", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Canvas Ref Entity" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiCanvasRefBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiCanvasRefBus.names index c1c98b7f64..9d2758982d 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiCanvasRefBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiCanvasRefBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "UiCanvasRefBus", + "base": "UiCanvasRefBus", "context": "EBusSender", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetCanvas", + "base": "GetCanvas", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Canvas" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiCheckboxBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiCheckboxBus.names index ce0125bae0..4a41b40fa6 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiCheckboxBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiCheckboxBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "UiCheckboxBus", + "base": "UiCheckboxBus", "context": "EBusSender", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "SetChangedActionName", + "base": "SetChangedActionName", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Changed Action Name" @@ -34,7 +34,7 @@ ] }, { - "key": "GetChangedActionName", + "base": "GetChangedActionName", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Changed Action Name" @@ -57,7 +57,7 @@ ] }, { - "key": "SetCheckedEntity", + "base": "SetCheckedEntity", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Checked Entity" @@ -81,7 +81,7 @@ ] }, { - "key": "SetUncheckedEntity", + "base": "SetUncheckedEntity", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Unchecked Entity" @@ -105,7 +105,7 @@ ] }, { - "key": "SetTurnOnActionName", + "base": "SetTurnOnActionName", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Turn On Action Name" @@ -129,7 +129,7 @@ ] }, { - "key": "GetTurnOffActionName", + "base": "GetTurnOffActionName", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Turn Off Action Name" @@ -152,7 +152,7 @@ ] }, { - "key": "SetState", + "base": "SetState", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set State" @@ -176,7 +176,7 @@ ] }, { - "key": "ToggleState", + "base": "ToggleState", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Toggle State" @@ -199,7 +199,7 @@ ] }, { - "key": "GetState", + "base": "GetState", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get State" @@ -222,7 +222,7 @@ ] }, { - "key": "GetCheckedEntity", + "base": "GetCheckedEntity", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Checked Entity" @@ -246,7 +246,7 @@ ] }, { - "key": "GetUncheckedEntity", + "base": "GetUncheckedEntity", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Unchecked Entity" @@ -270,7 +270,7 @@ ] }, { - "key": "GetTurnOnActionName", + "base": "GetTurnOnActionName", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Turn On Action Name" @@ -293,7 +293,7 @@ ] }, { - "key": "SetTurnOffActionName", + "base": "SetTurnOffActionName", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Turn Off Action Name" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiClickableTextBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiClickableTextBus.names index 6400213daa..a822472301 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiClickableTextBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiClickableTextBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "UiClickableTextBus", + "base": "UiClickableTextBus", "context": "EBusSender", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "SetClickableTextColor", + "base": "SetClickableTextColor", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Clickable Text Color" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiCursorBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiCursorBus.names index 936ff3475e..488021ff3b 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiCursorBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiCursorBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "UiCursorBus", + "base": "UiCursorBus", "context": "EBusSender", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetUiCursorPosition", + "base": "GetUiCursorPosition", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Position" @@ -33,7 +33,7 @@ ] }, { - "key": "IsUiCursorVisible", + "base": "IsUiCursorVisible", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Is Visible" @@ -56,7 +56,7 @@ ] }, { - "key": "DecrementVisibleCounter", + "base": "DecrementVisibleCounter", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Decrement Visible Counter" @@ -71,7 +71,7 @@ } }, { - "key": "IncrementVisibleCounter", + "base": "IncrementVisibleCounter", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Increment Visible Counter" @@ -86,7 +86,7 @@ } }, { - "key": "SetUiCursor", + "base": "SetUiCursor", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Cursor" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiCustomImageBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiCustomImageBus.names index c92295875e..1662986211 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiCustomImageBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiCustomImageBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "UiCustomImageBus", + "base": "UiCustomImageBus", "context": "EBusSender", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetClamp", + "base": "GetClamp", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Clamp" @@ -33,7 +33,7 @@ ] }, { - "key": "SetUVs", + "base": "SetUVs", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set UVs" @@ -57,7 +57,7 @@ ] }, { - "key": "SetClamp", + "base": "SetClamp", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Clamp" @@ -81,7 +81,7 @@ ] }, { - "key": "SetSpritePathname", + "base": "SetSpritePathname", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Sprite Pathname" @@ -105,7 +105,7 @@ ] }, { - "key": "GetSpritePathname", + "base": "GetSpritePathname", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Sprite Pathname" @@ -128,7 +128,7 @@ ] }, { - "key": "GetUVs", + "base": "GetUVs", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get UVs" @@ -151,7 +151,7 @@ ] }, { - "key": "SetColor", + "base": "SetColor", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Color" @@ -175,7 +175,7 @@ ] }, { - "key": "GetColor", + "base": "GetColor", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Color" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiDraggableBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiDraggableBus.names index 15b47dfce5..7a47d5fd04 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiDraggableBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiDraggableBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "UiDraggableBus", + "base": "UiDraggableBus", "context": "EBusSender", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "ProxyDragEnd", + "base": "ProxyDragEnd", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Proxy Drag End" @@ -34,7 +34,7 @@ ] }, { - "key": "RedoDrag", + "base": "RedoDrag", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Redo Drag" @@ -58,7 +58,7 @@ ] }, { - "key": "SetAsProxy", + "base": "SetAsProxy", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set As Proxy" @@ -89,7 +89,7 @@ ] }, { - "key": "IsProxy", + "base": "IsProxy", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Is Proxy" @@ -112,7 +112,7 @@ ] }, { - "key": "SetDragState", + "base": "SetDragState", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Drag State" @@ -136,7 +136,7 @@ ] }, { - "key": "GetCanDropOnAnyCanvas", + "base": "GetCanDropOnAnyCanvas", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Can Drop On Any Canvas" @@ -159,7 +159,7 @@ ] }, { - "key": "SetCanDropOnAnyCanvas", + "base": "SetCanDropOnAnyCanvas", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Can Drop On Any Canvas" @@ -183,7 +183,7 @@ ] }, { - "key": "GetDragState", + "base": "GetDragState", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Drag State" @@ -206,7 +206,7 @@ ] }, { - "key": "GetOriginalFromProxy", + "base": "GetOriginalFromProxy", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Original From Proxy" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiDropTargetBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiDropTargetBus.names index 58e4ab05b5..a6c382dd26 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiDropTargetBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiDropTargetBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "UiDropTargetBus", + "base": "UiDropTargetBus", "context": "EBusSender", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetOnDropActionName", + "base": "GetOnDropActionName", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get On Drop Action Name" @@ -33,7 +33,7 @@ ] }, { - "key": "SetOnDropActionName", + "base": "SetOnDropActionName", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set On Drop Action Name" @@ -57,7 +57,7 @@ ] }, { - "key": "GetDropState", + "base": "GetDropState", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Drop State" @@ -80,7 +80,7 @@ ] }, { - "key": "SetDropState", + "base": "SetDropState", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Drop State" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiDropdownBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiDropdownBus.names index f390bdb7f4..88bb28acc3 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiDropdownBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiDropdownBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "UiDropdownBus", + "base": "UiDropdownBus", "context": "EBusSender", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetOptionSelectedActionName", + "base": "GetOptionSelectedActionName", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Option Selected Action Name" @@ -33,7 +33,7 @@ ] }, { - "key": "GetWaitTime", + "base": "GetWaitTime", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Wait Time" @@ -56,7 +56,7 @@ ] }, { - "key": "SetCollapseOnOutsideClick", + "base": "SetCollapseOnOutsideClick", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Collapse On Outside Click" @@ -80,7 +80,7 @@ ] }, { - "key": "SetExpandOnHover", + "base": "SetExpandOnHover", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Expand On Hover" @@ -104,7 +104,7 @@ ] }, { - "key": "Expand", + "base": "Expand", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Expand" @@ -119,7 +119,7 @@ } }, { - "key": "Collapse", + "base": "Collapse", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Collapse" @@ -134,7 +134,7 @@ } }, { - "key": "SetCollapsedActionName", + "base": "SetCollapsedActionName", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Collapsed Action Name" @@ -158,7 +158,7 @@ ] }, { - "key": "GetExpandOnHover", + "base": "GetExpandOnHover", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Expand On Hover" @@ -181,7 +181,7 @@ ] }, { - "key": "SetWaitTime", + "base": "SetWaitTime", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Wait Time" @@ -205,7 +205,7 @@ ] }, { - "key": "GetCollapseOnOutsideClick", + "base": "GetCollapseOnOutsideClick", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Collapse On Outside Click" @@ -228,7 +228,7 @@ ] }, { - "key": "GetExpandedParentId", + "base": "GetExpandedParentId", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Expanded Parent" @@ -252,7 +252,7 @@ ] }, { - "key": "GetTextElement", + "base": "GetTextElement", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Text Element" @@ -276,7 +276,7 @@ ] }, { - "key": "GetIconElement", + "base": "GetIconElement", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Icon Element" @@ -300,7 +300,7 @@ ] }, { - "key": "SetIconElement", + "base": "SetIconElement", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Icon Element" @@ -324,7 +324,7 @@ ] }, { - "key": "SetExpandedActionName", + "base": "SetExpandedActionName", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Expanded Action Name" @@ -348,7 +348,7 @@ ] }, { - "key": "SetContent", + "base": "SetContent", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Content" @@ -372,7 +372,7 @@ ] }, { - "key": "SetTextElement", + "base": "SetTextElement", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Text Element" @@ -396,7 +396,7 @@ ] }, { - "key": "SetValue", + "base": "SetValue", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Value" @@ -420,7 +420,7 @@ ] }, { - "key": "GetContent", + "base": "GetContent", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Content" @@ -444,7 +444,7 @@ ] }, { - "key": "GetExpandedActionName", + "base": "GetExpandedActionName", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Expanded Action Name" @@ -467,7 +467,7 @@ ] }, { - "key": "GetCollapsedActionName", + "base": "GetCollapsedActionName", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Collapsed Action Name" @@ -490,7 +490,7 @@ ] }, { - "key": "GetValue", + "base": "GetValue", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Value" @@ -514,7 +514,7 @@ ] }, { - "key": "SetExpandedParentId", + "base": "SetExpandedParentId", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Expanded Parent" @@ -538,7 +538,7 @@ ] }, { - "key": "SetOptionSelectedActionName", + "base": "SetOptionSelectedActionName", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Option Selected Action Name" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiDropdownOptionBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiDropdownOptionBus.names index 9ba0e74993..3535c5ccd5 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiDropdownOptionBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiDropdownOptionBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "UiDropdownOptionBus", + "base": "UiDropdownOptionBus", "context": "EBusSender", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetTextElement", + "base": "GetTextElement", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Text Element" @@ -34,7 +34,7 @@ ] }, { - "key": "GetIconElement", + "base": "GetIconElement", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Icon Element" @@ -58,7 +58,7 @@ ] }, { - "key": "SetIconElement", + "base": "SetIconElement", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Icon Element" @@ -82,7 +82,7 @@ ] }, { - "key": "SetOwningDropdown", + "base": "SetOwningDropdown", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Owning Dropdown" @@ -106,7 +106,7 @@ ] }, { - "key": "SetTextElement", + "base": "SetTextElement", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Text Element" @@ -130,7 +130,7 @@ ] }, { - "key": "GetOwningDropdown", + "base": "GetOwningDropdown", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Owning Dropdown" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiDynamicContentDatabaseBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiDynamicContentDatabaseBus.names index f51a09ebb1..09642e35f2 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiDynamicContentDatabaseBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiDynamicContentDatabaseBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "UiDynamicContentDatabaseBus", + "base": "UiDynamicContentDatabaseBus", "context": "EBusSender", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "Refresh", + "base": "Refresh", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Refresh" @@ -41,7 +41,7 @@ ] }, { - "key": "GetColorPrice", + "base": "GetColorPrice", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Color Price" @@ -81,7 +81,7 @@ ] }, { - "key": "GetColorName", + "base": "GetColorName", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Color Name" @@ -121,7 +121,7 @@ ] }, { - "key": "GetColor", + "base": "GetColor", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Color" @@ -161,7 +161,7 @@ ] }, { - "key": "GetNumColors", + "base": "GetNumColors", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Number Of Colors" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiDynamicLayoutBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiDynamicLayoutBus.names index edfc147085..1f3cc89f60 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiDynamicLayoutBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiDynamicLayoutBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "UiDynamicLayoutBus", + "base": "UiDynamicLayoutBus", "context": "EBusSender", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "SetNumChildElements", + "base": "SetNumChildElements", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Number Of Child Elements" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiDynamicScrollBoxBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiDynamicScrollBoxBus.names index f386c97dde..9f8b4acd23 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiDynamicScrollBoxBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiDynamicScrollBoxBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "UiDynamicScrollBoxBus", + "base": "UiDynamicScrollBoxBus", "context": "EBusSender", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "SetSectionsEnabled", + "base": "SetSectionsEnabled", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Sections Enabled" @@ -34,7 +34,7 @@ ] }, { - "key": "GetEstimatedVariableElementSize", + "base": "GetEstimatedVariableElementSize", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Estimated Variable Element Size" @@ -57,7 +57,7 @@ ] }, { - "key": "SetAutoCalculateVariableElementSize", + "base": "SetAutoCalculateVariableElementSize", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Auto-calculate Variable Element Size" @@ -81,7 +81,7 @@ ] }, { - "key": "GetEstimatedVariableHeaderSize", + "base": "GetEstimatedVariableHeaderSize", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Estimated Variable Header Size" @@ -104,7 +104,7 @@ ] }, { - "key": "SetEstimatedVariableHeaderSize", + "base": "SetEstimatedVariableHeaderSize", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Estimated Variable Header Size" @@ -128,7 +128,7 @@ ] }, { - "key": "SetPrototypeElement", + "base": "SetPrototypeElement", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Prototype Element" @@ -152,7 +152,7 @@ ] }, { - "key": "SetElementsVaryInSize", + "base": "SetElementsVaryInSize", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Elements Vary In Size" @@ -176,7 +176,7 @@ ] }, { - "key": "RemoveElementsFromFront", + "base": "RemoveElementsFromFront", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Remove Elements From Front" @@ -200,7 +200,7 @@ ] }, { - "key": "GetElementIndexOfChild", + "base": "GetElementIndexOfChild", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Element Index Of Child" @@ -233,7 +233,7 @@ ] }, { - "key": "GetElementsVaryInSize", + "base": "GetElementsVaryInSize", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Elements Vary In Size" @@ -256,7 +256,7 @@ ] }, { - "key": "GetHeadersSticky", + "base": "GetHeadersSticky", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Headers Sticky" @@ -279,7 +279,7 @@ ] }, { - "key": "GetAutoRefreshOnPostActivate", + "base": "GetAutoRefreshOnPostActivate", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Auto-refresh On Post-activate" @@ -302,7 +302,7 @@ ] }, { - "key": "SetEstimatedVariableElementSize", + "base": "SetEstimatedVariableElementSize", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Estimated Variable Element Size" @@ -326,7 +326,7 @@ ] }, { - "key": "SetPrototypeHeader", + "base": "SetPrototypeHeader", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Prototype Header" @@ -350,7 +350,7 @@ ] }, { - "key": "GetSectionsEnabled", + "base": "GetSectionsEnabled", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Sections Enabled" @@ -373,7 +373,7 @@ ] }, { - "key": "ScrollToEnd", + "base": "ScrollToEnd", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Scroll To End" @@ -388,7 +388,7 @@ } }, { - "key": "GetPrototypeElement", + "base": "GetPrototypeElement", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Prototype Element" @@ -412,7 +412,7 @@ ] }, { - "key": "SetHeadersVaryInSize", + "base": "SetHeadersVaryInSize", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Headers Vary In Size" @@ -436,7 +436,7 @@ ] }, { - "key": "AddElementsToEnd", + "base": "AddElementsToEnd", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Add Elements To End" @@ -467,7 +467,7 @@ ] }, { - "key": "GetChildAtElementIndex", + "base": "GetChildAtElementIndex", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Child At Element Index" @@ -500,7 +500,7 @@ ] }, { - "key": "SetHeadersSticky", + "base": "SetHeadersSticky", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Headers Sticky" @@ -524,7 +524,7 @@ ] }, { - "key": "GetChildAtSectionAndElementIndex", + "base": "GetChildAtSectionAndElementIndex", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Child At Section And Element Index" @@ -564,7 +564,7 @@ ] }, { - "key": "SetAutoRefreshOnPostActivate", + "base": "SetAutoRefreshOnPostActivate", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Auto-refresh On Post-activate" @@ -588,7 +588,7 @@ ] }, { - "key": "GetSectionIndexOfChild", + "base": "GetSectionIndexOfChild", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Section Index Of Child" @@ -621,7 +621,7 @@ ] }, { - "key": "RefreshContent", + "base": "RefreshContent", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Refresh Content" @@ -636,7 +636,7 @@ } }, { - "key": "GetHeadersVaryInSize", + "base": "GetHeadersVaryInSize", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Headers Vary In Size" @@ -659,7 +659,7 @@ ] }, { - "key": "GetPrototypeHeader", + "base": "GetPrototypeHeader", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Prototype Header" @@ -683,7 +683,7 @@ ] }, { - "key": "SetAutoCalculateVariableHeaderSize", + "base": "SetAutoCalculateVariableHeaderSize", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Auto-calculate Variable Header Size" @@ -707,7 +707,7 @@ ] }, { - "key": "GetAutoCalculateVariableElementSize", + "base": "GetAutoCalculateVariableElementSize", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Auto-calculate Variable Element Size" @@ -730,7 +730,7 @@ ] }, { - "key": "GetAutoCalculateVariableHeaderSize", + "base": "GetAutoCalculateVariableHeaderSize", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Auto-calculate Variable Header Size" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiElementBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiElementBus.names index 61645c6432..e55be9b55d 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiElementBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiElementBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "UiElementBus", + "base": "UiElementBus", "context": "EBusSender", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "FindChildByName", + "base": "FindChildByName", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Find Child By Name" @@ -43,7 +43,7 @@ ] }, { - "key": "GetChild", + "base": "GetChild", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Child" @@ -76,7 +76,7 @@ ] }, { - "key": "GetNumChildElements", + "base": "GetNumChildElements", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Number Of Child Elements" @@ -99,7 +99,7 @@ ] }, { - "key": "GetChildren", + "base": "GetChildren", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Children" @@ -122,7 +122,7 @@ ] }, { - "key": "DestroyElement", + "base": "DestroyElement", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Destroy Element" @@ -137,7 +137,7 @@ } }, { - "key": "IsAncestor", + "base": "IsAncestor", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Is Ancestor" @@ -170,7 +170,7 @@ ] }, { - "key": "GetParent", + "base": "GetParent", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Parent" @@ -194,7 +194,7 @@ ] }, { - "key": "FindDescendantByName", + "base": "FindDescendantByName", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Find Descendant By Name" @@ -227,7 +227,7 @@ ] }, { - "key": "IsEnabled", + "base": "IsEnabled", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Is Enabled" @@ -250,7 +250,7 @@ ] }, { - "key": "GetCanvas", + "base": "GetCanvas", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Canvas" @@ -274,7 +274,7 @@ ] }, { - "key": "Reparent", + "base": "Reparent", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Reparent" @@ -305,7 +305,7 @@ ] }, { - "key": "GetName", + "base": "GetName", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Name" @@ -328,7 +328,7 @@ ] }, { - "key": "GetIndexOfChildByEntityId", + "base": "GetIndexOfChildByEntityId", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Index Of Child By EntityID" @@ -361,7 +361,7 @@ ] }, { - "key": "SetIsEnabled", + "base": "SetIsEnabled", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Is Enabled" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiFaderBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiFaderBus.names index 32e99d34f7..7a00e412d7 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiFaderBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiFaderBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "UiFaderBus", + "base": "UiFaderBus", "context": "EBusSender", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetUseRenderToTexture", + "base": "GetUseRenderToTexture", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Use Render To Texture" @@ -33,7 +33,7 @@ ] }, { - "key": "IsFading", + "base": "IsFading", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Is Fading" @@ -56,7 +56,7 @@ ] }, { - "key": "Fade", + "base": "Fade", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Fade" @@ -87,7 +87,7 @@ ] }, { - "key": "SetFadeValue", + "base": "SetFadeValue", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Fade Value" @@ -111,7 +111,7 @@ ] }, { - "key": "GetFadeValue", + "base": "GetFadeValue", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Fade Value" @@ -134,7 +134,7 @@ ] }, { - "key": "SetUseRenderToTexture", + "base": "SetUseRenderToTexture", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Use Render To Texture" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiFlipbookAnimationBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiFlipbookAnimationBus.names index 341fd798d4..16feca1593 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiFlipbookAnimationBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiFlipbookAnimationBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "UiFlipbookAnimationBus", + "base": "UiFlipbookAnimationBus", "context": "EBusSender", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetLoopType", + "base": "GetLoopType", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Loop Type" @@ -33,7 +33,7 @@ ] }, { - "key": "GetReverseDelay", + "base": "GetReverseDelay", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Reverse Delay" @@ -56,7 +56,7 @@ ] }, { - "key": "SetIsAutoPlay", + "base": "SetIsAutoPlay", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Is Auto Play Enabled" @@ -80,7 +80,7 @@ ] }, { - "key": "SetCurrentFrame", + "base": "SetCurrentFrame", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Current Frame" @@ -104,7 +104,7 @@ ] }, { - "key": "GetLoopStartFrame", + "base": "GetLoopStartFrame", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Loop Start Frame" @@ -127,7 +127,7 @@ ] }, { - "key": "SetLoopType", + "base": "SetLoopType", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Loop Type" @@ -151,7 +151,7 @@ ] }, { - "key": "GetStartDelay", + "base": "GetStartDelay", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Start Delay" @@ -174,7 +174,7 @@ ] }, { - "key": "SetStartDelay", + "base": "SetStartDelay", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Start Delay" @@ -198,7 +198,7 @@ ] }, { - "key": "GetCurrentFrame", + "base": "GetCurrentFrame", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Current Frame" @@ -221,7 +221,7 @@ ] }, { - "key": "GetFramerate", + "base": "GetFramerate", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Framerate" @@ -244,7 +244,7 @@ ] }, { - "key": "SetLoopDelay", + "base": "SetLoopDelay", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Loop Delay" @@ -268,7 +268,7 @@ ] }, { - "key": "GetStartFrame", + "base": "GetStartFrame", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Start Frame" @@ -291,7 +291,7 @@ ] }, { - "key": "SetFramerateUnit", + "base": "SetFramerateUnit", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Framerate Unit" @@ -315,7 +315,7 @@ ] }, { - "key": "IsPlaying", + "base": "IsPlaying", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Is Playing" @@ -338,7 +338,7 @@ ] }, { - "key": "SetEndFrame", + "base": "SetEndFrame", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set End Frame" @@ -362,7 +362,7 @@ ] }, { - "key": "SetLoopStartFrame", + "base": "SetLoopStartFrame", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Loop Start Frame" @@ -386,7 +386,7 @@ ] }, { - "key": "SetReverseDelay", + "base": "SetReverseDelay", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Reverse Delay" @@ -410,7 +410,7 @@ ] }, { - "key": "Stop", + "base": "Stop", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Stop" @@ -425,7 +425,7 @@ } }, { - "key": "SetFramerate", + "base": "SetFramerate", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Framerate" @@ -449,7 +449,7 @@ ] }, { - "key": "GetIsAutoPlay", + "base": "GetIsAutoPlay", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Is Auto Play Enabled" @@ -472,7 +472,7 @@ ] }, { - "key": "Start", + "base": "Start", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Start" @@ -487,7 +487,7 @@ } }, { - "key": "SetStartFrame", + "base": "SetStartFrame", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Start Frame" @@ -511,7 +511,7 @@ ] }, { - "key": "GetEndFrame", + "base": "GetEndFrame", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get End Frame" @@ -534,7 +534,7 @@ ] }, { - "key": "GetFramerateUnit", + "base": "GetFramerateUnit", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Framerate Unit" @@ -557,7 +557,7 @@ ] }, { - "key": "GetLoopDelay", + "base": "GetLoopDelay", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Loop Delay" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiImageBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiImageBus.names index ed79b2aaad..cef46a7fea 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiImageBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiImageBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "UiImageBus", + "base": "UiImageBus", "context": "EBusSender", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetColor", + "base": "GetColor", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Color" @@ -33,7 +33,7 @@ ] }, { - "key": "SetColor", + "base": "SetColor", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Color" @@ -57,7 +57,7 @@ ] }, { - "key": "SetSpriteType", + "base": "SetSpriteType", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Sprite Type" @@ -81,7 +81,7 @@ ] }, { - "key": "GetFillClockwise", + "base": "GetFillClockwise", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Fill Clockwise" @@ -104,7 +104,7 @@ ] }, { - "key": "SetRenderTargetName", + "base": "SetRenderTargetName", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Render Target Name" @@ -128,7 +128,7 @@ ] }, { - "key": "SetSpritePathnameIfExists", + "base": "SetSpritePathnameIfExists", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Sprite Pathname If Exists" @@ -161,7 +161,7 @@ ] }, { - "key": "SetEdgeFillOrigin", + "base": "SetEdgeFillOrigin", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Edge Fill Origin" @@ -185,7 +185,7 @@ ] }, { - "key": "GetEdgeFillOrigin", + "base": "GetEdgeFillOrigin", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Edge Fill Origin" @@ -208,7 +208,7 @@ ] }, { - "key": "SetFillClockwise", + "base": "SetFillClockwise", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Fill Clockwise" @@ -232,7 +232,7 @@ ] }, { - "key": "SetSpritePathname", + "base": "SetSpritePathname", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Sprite Pathname" @@ -256,7 +256,7 @@ ] }, { - "key": "SetFillCenter", + "base": "SetFillCenter", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Fill Center" @@ -280,7 +280,7 @@ ] }, { - "key": "SetAlpha", + "base": "SetAlpha", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Alpha" @@ -304,7 +304,7 @@ ] }, { - "key": "SetFillType", + "base": "SetFillType", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Fill Type" @@ -328,7 +328,7 @@ ] }, { - "key": "SetFillAmount", + "base": "SetFillAmount", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Fill Amount" @@ -352,7 +352,7 @@ ] }, { - "key": "GetRadialFillStartAngle", + "base": "GetRadialFillStartAngle", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Radial Fill Start Angle" @@ -375,7 +375,7 @@ ] }, { - "key": "GetRenderTargetName", + "base": "GetRenderTargetName", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Render Target Name" @@ -398,7 +398,7 @@ ] }, { - "key": "SetIsRenderTargetSRGB", + "base": "SetIsRenderTargetSRGB", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Is Render Target sRGB" @@ -422,7 +422,7 @@ ] }, { - "key": "GetAlpha", + "base": "GetAlpha", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Alpha" @@ -445,7 +445,7 @@ ] }, { - "key": "GetIsRenderTargetSRGB", + "base": "GetIsRenderTargetSRGB", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Is Render Target sRGB" @@ -468,7 +468,7 @@ ] }, { - "key": "SetImageType", + "base": "SetImageType", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Image Type" @@ -492,7 +492,7 @@ ] }, { - "key": "GetSpritePathname", + "base": "GetSpritePathname", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Sprite Pathname" @@ -515,7 +515,7 @@ ] }, { - "key": "GetFillType", + "base": "GetFillType", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Fill Type" @@ -538,7 +538,7 @@ ] }, { - "key": "SetCornerFillOrigin", + "base": "SetCornerFillOrigin", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Corner Fill Origin" @@ -562,7 +562,7 @@ ] }, { - "key": "GetCornerFillOrigin", + "base": "GetCornerFillOrigin", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Corner Fill Origin" @@ -585,7 +585,7 @@ ] }, { - "key": "GetImageType", + "base": "GetImageType", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Image Type" @@ -608,7 +608,7 @@ ] }, { - "key": "SetRadialFillStartAngle", + "base": "SetRadialFillStartAngle", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Radial Fill Start Angle" @@ -632,7 +632,7 @@ ] }, { - "key": "GetSpriteType", + "base": "GetSpriteType", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Sprite Type" @@ -655,7 +655,7 @@ ] }, { - "key": "GetFillAmount", + "base": "GetFillAmount", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Fill Amount" @@ -678,7 +678,7 @@ ] }, { - "key": "GetFillCenter", + "base": "GetFillCenter", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Fill Center" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiImageSequenceBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiImageSequenceBus.names index 90f0a59580..8b8f44c08a 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiImageSequenceBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiImageSequenceBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "UiImageSequenceBus", + "base": "UiImageSequenceBus", "context": "EBusSender", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetImageType", + "base": "GetImageType", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Image Type" @@ -33,7 +33,7 @@ ] }, { - "key": "SetImageType", + "base": "SetImageType", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Image Type" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiIndexableImageBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiIndexableImageBus.names index 40f92ace00..82b63fa0ec 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiIndexableImageBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiIndexableImageBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "UiIndexableImageBus", + "base": "UiIndexableImageBus", "context": "EBusSender", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetImageIndexAlias", + "base": "GetImageIndexAlias", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Image Index Alias" @@ -43,7 +43,7 @@ ] }, { - "key": "GetImageIndexCount", + "base": "GetImageIndexCount", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Image Index Count" @@ -66,7 +66,7 @@ ] }, { - "key": "SetImageIndex", + "base": "SetImageIndex", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Image Index" @@ -90,7 +90,7 @@ ] }, { - "key": "SetImageIndexAlias", + "base": "SetImageIndexAlias", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Image Index Alias" @@ -121,7 +121,7 @@ ] }, { - "key": "GetImageIndexFromAlias", + "base": "GetImageIndexFromAlias", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Image Index From Alias" @@ -154,7 +154,7 @@ ] }, { - "key": "GetImageIndex", + "base": "GetImageIndex", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Image Index" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiInteractableActionsBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiInteractableActionsBus.names index b124f9ccd5..715cc06063 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiInteractableActionsBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiInteractableActionsBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "UiInteractableActionsBus", + "base": "UiInteractableActionsBus", "context": "EBusSender", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "SetPressedActionName", + "base": "SetPressedActionName", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Pressed Action Name" @@ -34,7 +34,7 @@ ] }, { - "key": "GetPressedActionName", + "base": "GetPressedActionName", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Pressed Action Name" @@ -57,7 +57,7 @@ ] }, { - "key": "GetHoverEndActionName", + "base": "GetHoverEndActionName", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Hover End Action Name" @@ -80,7 +80,7 @@ ] }, { - "key": "SetHoverStartActionName", + "base": "SetHoverStartActionName", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Hover Start Action Name" @@ -104,7 +104,7 @@ ] }, { - "key": "GetHoverStartActionName", + "base": "GetHoverStartActionName", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Hover Start Action Name" @@ -127,7 +127,7 @@ ] }, { - "key": "SetHoverEndActionName", + "base": "SetHoverEndActionName", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Hover End Action Name" @@ -151,7 +151,7 @@ ] }, { - "key": "GetReleasedActionName", + "base": "GetReleasedActionName", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Released Action Name" @@ -174,7 +174,7 @@ ] }, { - "key": "SetReleasedActionName", + "base": "SetReleasedActionName", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Released Action Name" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiInteractableBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiInteractableBus.names index b340e96673..139822292a 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiInteractableBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiInteractableBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "UiInteractableBus", + "base": "UiInteractableBus", "context": "EBusSender", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "SetIsAutoActivationEnabled", + "base": "SetIsAutoActivationEnabled", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Is Auto Activation Enabled" @@ -34,7 +34,7 @@ ] }, { - "key": "GetIsAutoActivationEnabled", + "base": "GetIsAutoActivationEnabled", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Is Auto Activation Enabled" @@ -57,7 +57,7 @@ ] }, { - "key": "SetIsHandlingMultiTouchEvents", + "base": "SetIsHandlingMultiTouchEvents", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Is Handling Multi-touch Events" @@ -81,7 +81,7 @@ ] }, { - "key": "IsHandlingMultiTouchEvents", + "base": "IsHandlingMultiTouchEvents", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Is Handling Multi-touch Events" @@ -104,7 +104,7 @@ ] }, { - "key": "IsHandlingEvents", + "base": "IsHandlingEvents", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Is Handling Events" @@ -127,7 +127,7 @@ ] }, { - "key": "SetIsHandlingEvents", + "base": "SetIsHandlingEvents", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Is Handling Events" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiInteractableStatesBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiInteractableStatesBus.names index b194ece0de..93f51786c7 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiInteractableStatesBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiInteractableStatesBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "UiInteractableStatesBus", + "base": "UiInteractableStatesBus", "context": "EBusSender", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "SetStateFont", + "base": "SetStateFont", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set State Font" @@ -55,7 +55,7 @@ ] }, { - "key": "SetStateSpritePathname", + "base": "SetStateSpritePathname", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set State Sprite Pathname" @@ -93,7 +93,7 @@ ] }, { - "key": "GetStateFontPathname", + "base": "GetStateFontPathname", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get State Font Pathname" @@ -133,7 +133,7 @@ ] }, { - "key": "HasStateFont", + "base": "HasStateFont", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Has State Font" @@ -173,7 +173,7 @@ ] }, { - "key": "SetStateAlpha", + "base": "SetStateAlpha", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set State Alpha" @@ -211,7 +211,7 @@ ] }, { - "key": "GetStateAlpha", + "base": "GetStateAlpha", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get State Alpha" @@ -251,7 +251,7 @@ ] }, { - "key": "GetStateFontEffectIndex", + "base": "GetStateFontEffectIndex", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get State Font Effect Index" @@ -291,7 +291,7 @@ ] }, { - "key": "HasStateColor", + "base": "HasStateColor", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Has State Color" @@ -331,7 +331,7 @@ ] }, { - "key": "GetStateSpritePathname", + "base": "GetStateSpritePathname", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get State Sprite Pathname" @@ -371,7 +371,7 @@ ] }, { - "key": "HasStateSprite", + "base": "HasStateSprite", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Has State Sprite" @@ -411,7 +411,7 @@ ] }, { - "key": "SetStateColor", + "base": "SetStateColor", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set State Color" @@ -449,7 +449,7 @@ ] }, { - "key": "HasStateAlpha", + "base": "HasStateAlpha", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Has State Alpha" @@ -489,7 +489,7 @@ ] }, { - "key": "GetStateColor", + "base": "GetStateColor", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get State Color" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiLayoutBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiLayoutBus.names index 022dbc0abe..72760e1a72 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiLayoutBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiLayoutBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "UiLayoutBus", + "base": "UiLayoutBus", "context": "EBusSender", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "SetIgnoreDefaultLayoutCells", + "base": "SetIgnoreDefaultLayoutCells", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Ignore Default Layout Cells" @@ -34,7 +34,7 @@ ] }, { - "key": "SetVerticalChildAlignment", + "base": "SetVerticalChildAlignment", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Vertical Child Alignment" @@ -58,7 +58,7 @@ ] }, { - "key": "SetHorizontalChildAlignment", + "base": "SetHorizontalChildAlignment", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Horizontal Child Alignment" @@ -82,7 +82,7 @@ ] }, { - "key": "GetHorizontalChildAlignment", + "base": "GetHorizontalChildAlignment", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Horizontal Child Alignment" @@ -105,7 +105,7 @@ ] }, { - "key": "GetVerticalChildAlignment", + "base": "GetVerticalChildAlignment", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Vertical Child Alignment" @@ -128,7 +128,7 @@ ] }, { - "key": "GetIgnoreDefaultLayoutCells", + "base": "GetIgnoreDefaultLayoutCells", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Ignore Default Layout Cells" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiLayoutCellBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiLayoutCellBus.names index 8f96afa8ff..8e95d005db 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiLayoutCellBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiLayoutCellBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "UiLayoutCellBus", + "base": "UiLayoutCellBus", "context": "EBusSender", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "SetExtraHeightRatio", + "base": "SetExtraHeightRatio", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Extra Height Ratio" @@ -34,7 +34,7 @@ ] }, { - "key": "GetExtraWidthRatio", + "base": "GetExtraWidthRatio", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Extra Width Ratio" @@ -57,7 +57,7 @@ ] }, { - "key": "SetExtraWidthRatio", + "base": "SetExtraWidthRatio", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Extra Width Ratio" @@ -81,7 +81,7 @@ ] }, { - "key": "SetMaxWidth", + "base": "SetMaxWidth", "entry": { "name": "In", "tooltip": "When signaled, this will invoke SetMaxWidth" @@ -103,7 +103,7 @@ ] }, { - "key": "SetMaxHeight", + "base": "SetMaxHeight", "entry": { "name": "In", "tooltip": "When signaled, this will invoke SetMaxHeight" @@ -125,7 +125,7 @@ ] }, { - "key": "GetMaxWidth", + "base": "GetMaxWidth", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetMaxWidth" @@ -147,7 +147,7 @@ ] }, { - "key": "GetMaxHeight", + "base": "GetMaxHeight", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetMaxHeight" @@ -169,7 +169,7 @@ ] }, { - "key": "GetExtraHeightRatio", + "base": "GetExtraHeightRatio", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Extra Height Ratio" @@ -192,7 +192,7 @@ ] }, { - "key": "GetTargetHeight", + "base": "GetTargetHeight", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Target Height" @@ -215,7 +215,7 @@ ] }, { - "key": "SetMinWidth", + "base": "SetMinWidth", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Min Width" @@ -239,7 +239,7 @@ ] }, { - "key": "SetMinHeight", + "base": "SetMinHeight", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Min Height" @@ -263,7 +263,7 @@ ] }, { - "key": "GetMinWidth", + "base": "GetMinWidth", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Min Width" @@ -286,7 +286,7 @@ ] }, { - "key": "GetMinHeight", + "base": "GetMinHeight", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Min Height" @@ -309,7 +309,7 @@ ] }, { - "key": "GetTargetWidth", + "base": "GetTargetWidth", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Target Width" @@ -332,7 +332,7 @@ ] }, { - "key": "SetTargetWidth", + "base": "SetTargetWidth", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Target Width" @@ -356,7 +356,7 @@ ] }, { - "key": "SetTargetHeight", + "base": "SetTargetHeight", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Target Height" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiLayoutColumnBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiLayoutColumnBus.names index a89fe4382b..8cba866475 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiLayoutColumnBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiLayoutColumnBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "UiLayoutColumnBus", + "base": "UiLayoutColumnBus", "context": "EBusSender", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "SetSpacing", + "base": "SetSpacing", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Spacing" @@ -34,7 +34,7 @@ ] }, { - "key": "GetOrder", + "base": "GetOrder", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Order" @@ -57,7 +57,7 @@ ] }, { - "key": "SetOrder", + "base": "SetOrder", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Order" @@ -81,7 +81,7 @@ ] }, { - "key": "GetSpacing", + "base": "GetSpacing", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Spacing" @@ -104,7 +104,7 @@ ] }, { - "key": "GetPadding", + "base": "GetPadding", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Padding" @@ -127,7 +127,7 @@ ] }, { - "key": "SetPadding", + "base": "SetPadding", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Padding" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiLayoutFitterBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiLayoutFitterBus.names index 392ac7fbaf..2c2a32bd85 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiLayoutFitterBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiLayoutFitterBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "UiLayoutFitterBus", + "base": "UiLayoutFitterBus", "context": "EBusSender", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetHorizontalFit", + "base": "GetHorizontalFit", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Horizontal Fit" @@ -33,7 +33,7 @@ ] }, { - "key": "SetHorizontalFit", + "base": "SetHorizontalFit", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Horizontal Fit" @@ -57,7 +57,7 @@ ] }, { - "key": "GetVerticalFit", + "base": "GetVerticalFit", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Vertical Fit" @@ -80,7 +80,7 @@ ] }, { - "key": "SetVerticalFit", + "base": "SetVerticalFit", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Vertical Fit" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiLayoutGridBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiLayoutGridBus.names index 40430d754f..0ac2f4eba0 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiLayoutGridBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiLayoutGridBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "UiLayoutGridBus", + "base": "UiLayoutGridBus", "context": "EBusSender", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetStartingDirection", + "base": "GetStartingDirection", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Starting Direction" @@ -33,7 +33,7 @@ ] }, { - "key": "SetHorizontalOrder", + "base": "SetHorizontalOrder", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Horizontal Order" @@ -57,7 +57,7 @@ ] }, { - "key": "SetCellSize", + "base": "SetCellSize", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Cell Size" @@ -81,7 +81,7 @@ ] }, { - "key": "SetSpacing", + "base": "SetSpacing", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Spacing" @@ -105,7 +105,7 @@ ] }, { - "key": "GetSpacing", + "base": "GetSpacing", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Spacing" @@ -128,7 +128,7 @@ ] }, { - "key": "GetCellSize", + "base": "GetCellSize", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Cell Size" @@ -151,7 +151,7 @@ ] }, { - "key": "GetPadding", + "base": "GetPadding", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Padding" @@ -174,7 +174,7 @@ ] }, { - "key": "SetPadding", + "base": "SetPadding", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Padding" @@ -198,7 +198,7 @@ ] }, { - "key": "GetHorizontalOrder", + "base": "GetHorizontalOrder", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Horizontal Order" @@ -221,7 +221,7 @@ ] }, { - "key": "GetVerticalOrder", + "base": "GetVerticalOrder", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Vertical Order" @@ -244,7 +244,7 @@ ] }, { - "key": "SetVerticalOrder", + "base": "SetVerticalOrder", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Vertical Order" @@ -268,7 +268,7 @@ ] }, { - "key": "SetStartingDirection", + "base": "SetStartingDirection", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Starting Direction" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiLayoutRowBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiLayoutRowBus.names index c4c714a0cb..ca27e01284 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiLayoutRowBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiLayoutRowBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "UiLayoutRowBus", + "base": "UiLayoutRowBus", "context": "EBusSender", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "SetSpacing", + "base": "SetSpacing", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Spacing" @@ -34,7 +34,7 @@ ] }, { - "key": "GetOrder", + "base": "GetOrder", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Order" @@ -57,7 +57,7 @@ ] }, { - "key": "SetOrder", + "base": "SetOrder", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Order" @@ -81,7 +81,7 @@ ] }, { - "key": "GetSpacing", + "base": "GetSpacing", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Spacing" @@ -104,7 +104,7 @@ ] }, { - "key": "GetPadding", + "base": "GetPadding", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Padding" @@ -127,7 +127,7 @@ ] }, { - "key": "SetPadding", + "base": "SetPadding", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Padding" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiMarkupButtonBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiMarkupButtonBus.names index ac687d97bf..0e5de7b07c 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiMarkupButtonBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiMarkupButtonBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "UiMarkupButtonBus", + "base": "UiMarkupButtonBus", "context": "EBusSender", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetLinkColor", + "base": "GetLinkColor", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Link Color" @@ -33,7 +33,7 @@ ] }, { - "key": "SetLinkColor", + "base": "SetLinkColor", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Link Color" @@ -57,7 +57,7 @@ ] }, { - "key": "GetLinkHoverColor", + "base": "GetLinkHoverColor", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Link Hover Color" @@ -80,7 +80,7 @@ ] }, { - "key": "SetLinkHoverColor", + "base": "SetLinkHoverColor", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Link Hover Color" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiMaskBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiMaskBus.names index 366f157871..178235f2a1 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiMaskBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiMaskBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "UiMaskBus", + "base": "UiMaskBus", "context": "EBusSender", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "SetDrawInFront", + "base": "SetDrawInFront", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Draw In Front" @@ -34,7 +34,7 @@ ] }, { - "key": "GetUseRenderToTexture", + "base": "GetUseRenderToTexture", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Use Render To Texture" @@ -57,7 +57,7 @@ ] }, { - "key": "GetDrawInFront", + "base": "GetDrawInFront", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Draw In Front" @@ -80,7 +80,7 @@ ] }, { - "key": "GetDrawBehind", + "base": "GetDrawBehind", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Draw Behind" @@ -103,7 +103,7 @@ ] }, { - "key": "GetIsInteractionMaskingEnabled", + "base": "GetIsInteractionMaskingEnabled", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Is Interaction Masking Enabled" @@ -126,7 +126,7 @@ ] }, { - "key": "GetUseAlphaTest", + "base": "GetUseAlphaTest", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Use Alpha Test" @@ -149,7 +149,7 @@ ] }, { - "key": "SetIsMaskingEnabled", + "base": "SetIsMaskingEnabled", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Is Masking Enabled" @@ -173,7 +173,7 @@ ] }, { - "key": "SetUseRenderToTexture", + "base": "SetUseRenderToTexture", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Use Render To Texture" @@ -197,7 +197,7 @@ ] }, { - "key": "GetIsMaskingEnabled", + "base": "GetIsMaskingEnabled", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Is Masking Enabled" @@ -220,7 +220,7 @@ ] }, { - "key": "SetIsInteractionMaskingEnabled", + "base": "SetIsInteractionMaskingEnabled", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Is Interaction Masking Enabled" @@ -244,7 +244,7 @@ ] }, { - "key": "SetDrawBehind", + "base": "SetDrawBehind", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Draw Behind" @@ -268,7 +268,7 @@ ] }, { - "key": "SetUseAlphaTest", + "base": "SetUseAlphaTest", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Use Alpha Test" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiNavigationBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiNavigationBus.names index 6fd6a83c3b..0ca8dd3b8b 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiNavigationBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiNavigationBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "UiNavigationBus", + "base": "UiNavigationBus", "context": "EBusSender", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetOnRightEntity", + "base": "GetOnRightEntity", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get On Right Entity" @@ -34,7 +34,7 @@ ] }, { - "key": "SetOnLeftEntity", + "base": "SetOnLeftEntity", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set On Left Entity" @@ -58,7 +58,7 @@ ] }, { - "key": "GetOnLeftEntity", + "base": "GetOnLeftEntity", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get On Left Entity" @@ -82,7 +82,7 @@ ] }, { - "key": "SetOnDownEntity", + "base": "SetOnDownEntity", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set On Down Entity" @@ -106,7 +106,7 @@ ] }, { - "key": "GetOnUpEntity", + "base": "GetOnUpEntity", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get On Up Entity" @@ -130,7 +130,7 @@ ] }, { - "key": "SetOnUpEntity", + "base": "SetOnUpEntity", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set On Up Entity" @@ -154,7 +154,7 @@ ] }, { - "key": "SetOnRightEntity", + "base": "SetOnRightEntity", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set On Right Entity" @@ -178,7 +178,7 @@ ] }, { - "key": "SetNavigationMode", + "base": "SetNavigationMode", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Navigation Mode" @@ -202,7 +202,7 @@ ] }, { - "key": "GetOnDownEntity", + "base": "GetOnDownEntity", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get On Down Entity" @@ -226,7 +226,7 @@ ] }, { - "key": "GetNavigationMode", + "base": "GetNavigationMode", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Navigation Mode" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiParticleEmitterBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiParticleEmitterBus.names index 4803b9fe8b..c408434db4 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiParticleEmitterBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiParticleEmitterBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "UiParticleEmitterBus", + "base": "UiParticleEmitterBus", "context": "EBusSender", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "SetParticleColorTintVariation", + "base": "SetParticleColorTintVariation", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Particle Color Tint Variation" @@ -34,7 +34,7 @@ ] }, { - "key": "GetSpriteSheetFrameDelay", + "base": "GetSpriteSheetFrameDelay", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Sprite Sheet Frame Delay" @@ -57,7 +57,7 @@ ] }, { - "key": "SetParticleAlpha", + "base": "SetParticleAlpha", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Particle Alpha" @@ -81,7 +81,7 @@ ] }, { - "key": "GetIsEmitting", + "base": "GetIsEmitting", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Is Emitting" @@ -104,7 +104,7 @@ ] }, { - "key": "SetParticleHeight", + "base": "SetParticleHeight", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Particle Height" @@ -128,7 +128,7 @@ ] }, { - "key": "GetSpriteSheetCellIndex", + "base": "GetSpriteSheetCellIndex", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Sprite Sheet Cell Index" @@ -151,7 +151,7 @@ ] }, { - "key": "GetIsParticleInitialRotationFromInitialVelocity", + "base": "GetIsParticleInitialRotationFromInitialVelocity", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Is Particle Initial Rotation From Initial Velocity" @@ -174,7 +174,7 @@ ] }, { - "key": "GetParticleLifetime", + "base": "GetParticleLifetime", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Particle Lifetime" @@ -197,7 +197,7 @@ ] }, { - "key": "GetIsRandomSeedFixed", + "base": "GetIsRandomSeedFixed", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Is Random Seed Fixed" @@ -220,7 +220,7 @@ ] }, { - "key": "GetSpritePathname", + "base": "GetSpritePathname", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Sprite Pathname" @@ -243,7 +243,7 @@ ] }, { - "key": "GetParticleLifetimeVariation", + "base": "GetParticleLifetimeVariation", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Particle Lifetime Variation" @@ -266,7 +266,7 @@ ] }, { - "key": "GetParticleColor", + "base": "GetParticleColor", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Particle Color" @@ -289,7 +289,7 @@ ] }, { - "key": "GetParticleInitialRotationVariation", + "base": "GetParticleInitialRotationVariation", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Particle Initial Rotation Variation" @@ -312,7 +312,7 @@ ] }, { - "key": "SetParticleLifetimeVariation", + "base": "SetParticleLifetimeVariation", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Particle Lifetime Variation" @@ -336,7 +336,7 @@ ] }, { - "key": "GetIsEmitOnEdge", + "base": "GetIsEmitOnEdge", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Is Emit On Edge" @@ -359,7 +359,7 @@ ] }, { - "key": "GetParticleRotationSpeedVariation", + "base": "GetParticleRotationSpeedVariation", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Particle Rotation Speed Variation" @@ -382,7 +382,7 @@ ] }, { - "key": "SetIsEmitOnActivate", + "base": "SetIsEmitOnActivate", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Is Emit On Activate" @@ -406,7 +406,7 @@ ] }, { - "key": "GetParticleRotationSpeed", + "base": "GetParticleRotationSpeed", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Particle Rotation Speed" @@ -429,7 +429,7 @@ ] }, { - "key": "SetParticleRotationSpeed", + "base": "SetParticleRotationSpeed", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Particle Rotation Speed" @@ -453,7 +453,7 @@ ] }, { - "key": "GetIsParticlePositionRelativeToEmitter", + "base": "GetIsParticlePositionRelativeToEmitter", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Is Particle Position Relative To Emitter" @@ -476,7 +476,7 @@ ] }, { - "key": "SetIsParticleAspectRatioLocked", + "base": "SetIsParticleAspectRatioLocked", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Is Particle Aspect Ratio Locked" @@ -500,7 +500,7 @@ ] }, { - "key": "SetEmitAngleVariation", + "base": "SetEmitAngleVariation", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Emit Angle Variation" @@ -524,7 +524,7 @@ ] }, { - "key": "SetParticleLifetime", + "base": "SetParticleLifetime", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Particle Lifetime" @@ -548,7 +548,7 @@ ] }, { - "key": "SetSpriteSheetFrameDelay", + "base": "SetSpriteSheetFrameDelay", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Sprite Sheet Frame Delay" @@ -572,7 +572,7 @@ ] }, { - "key": "SetIsParticleInitialRotationFromInitialVelocity", + "base": "SetIsParticleInitialRotationFromInitialVelocity", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Is Particle Initial Rotation From Initial Velocity" @@ -596,7 +596,7 @@ ] }, { - "key": "SetParticleAccelerationMovementSpace", + "base": "SetParticleAccelerationMovementSpace", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Particle Acceleration Movement Space" @@ -620,7 +620,7 @@ ] }, { - "key": "SetIsSpriteSheetAnimated", + "base": "SetIsSpriteSheetAnimated", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Is Sprite Sheet Animated" @@ -644,7 +644,7 @@ ] }, { - "key": "SetIsParticleCountLimited", + "base": "SetIsParticleCountLimited", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Is Particle Count Limited" @@ -668,7 +668,7 @@ ] }, { - "key": "GetParticleSize", + "base": "GetParticleSize", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Particle Size" @@ -691,7 +691,7 @@ ] }, { - "key": "GetParticleAccelerationMovementSpace", + "base": "GetParticleAccelerationMovementSpace", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Particle Acceleration Movement Space" @@ -714,7 +714,7 @@ ] }, { - "key": "SetEmitAngle", + "base": "SetEmitAngle", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Emit Angle" @@ -738,7 +738,7 @@ ] }, { - "key": "SetParticleEmitRate", + "base": "SetParticleEmitRate", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Particle Emit Rate" @@ -762,7 +762,7 @@ ] }, { - "key": "GetMaxParticles", + "base": "GetMaxParticles", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Max Particles" @@ -785,7 +785,7 @@ ] }, { - "key": "GetParticleColorBrightnessVariation", + "base": "GetParticleColorBrightnessVariation", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Particle Color Brightness Variation" @@ -808,7 +808,7 @@ ] }, { - "key": "SetMaxParticles", + "base": "SetMaxParticles", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Max Particles" @@ -832,7 +832,7 @@ ] }, { - "key": "GetInsideEmitDistance", + "base": "GetInsideEmitDistance", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Inside Emit Distance" @@ -855,7 +855,7 @@ ] }, { - "key": "SetParticlePivot", + "base": "SetParticlePivot", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Particle Pivot" @@ -879,7 +879,7 @@ ] }, { - "key": "GetParticleInitialDirectionType", + "base": "GetParticleInitialDirectionType", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Particle Initial Direction Type" @@ -902,7 +902,7 @@ ] }, { - "key": "SetEmitterLifetime", + "base": "SetEmitterLifetime", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Emitter Lifetime" @@ -926,7 +926,7 @@ ] }, { - "key": "GetSpriteSheetCellEndIndex", + "base": "GetSpriteSheetCellEndIndex", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Sprite Sheet Cell End Index" @@ -949,7 +949,7 @@ ] }, { - "key": "SetIsEmitOnEdge", + "base": "SetIsEmitOnEdge", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Is Emit On Edge" @@ -973,7 +973,7 @@ ] }, { - "key": "GetParticleColorTintVariation", + "base": "GetParticleColorTintVariation", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Particle Color Tint Variation" @@ -996,7 +996,7 @@ ] }, { - "key": "SetParticleInitialVelocity", + "base": "SetParticleInitialVelocity", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Particle Initial Velocity" @@ -1020,7 +1020,7 @@ ] }, { - "key": "GetIsParticleCountLimited", + "base": "GetIsParticleCountLimited", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Is Particle Count Limited" @@ -1043,7 +1043,7 @@ ] }, { - "key": "SetParticleWidthVariation", + "base": "SetParticleWidthVariation", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Particle Width Variation" @@ -1067,7 +1067,7 @@ ] }, { - "key": "GetOutsideEmitDistance", + "base": "GetOutsideEmitDistance", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Outside Emit Distance" @@ -1090,7 +1090,7 @@ ] }, { - "key": "GetIsParticleLifetimeInfinite", + "base": "GetIsParticleLifetimeInfinite", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Is Particle Lifetime Infinite" @@ -1113,7 +1113,7 @@ ] }, { - "key": "SetIsParticleRotationFromVelocity", + "base": "SetIsParticleRotationFromVelocity", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Is Particle Rotation From Velocity" @@ -1137,7 +1137,7 @@ ] }, { - "key": "GetIsSpriteSheetAnimated", + "base": "GetIsSpriteSheetAnimated", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Is Sprite Sheet Animated" @@ -1160,7 +1160,7 @@ ] }, { - "key": "SetInsideEmitDistance", + "base": "SetInsideEmitDistance", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Inside Emit Distance" @@ -1184,7 +1184,7 @@ ] }, { - "key": "SetSpritePathname", + "base": "SetSpritePathname", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Sprite Pathname" @@ -1208,7 +1208,7 @@ ] }, { - "key": "GetEmitterShape", + "base": "GetEmitterShape", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Emitter Shape" @@ -1231,7 +1231,7 @@ ] }, { - "key": "SetOutsideEmitDistance", + "base": "SetOutsideEmitDistance", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Outside Emit Distance" @@ -1255,7 +1255,7 @@ ] }, { - "key": "SetRandomSeed", + "base": "SetRandomSeed", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Random Seed" @@ -1279,7 +1279,7 @@ ] }, { - "key": "GetIsParticleRotationFromVelocity", + "base": "GetIsParticleRotationFromVelocity", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Is Particle Rotation From Velocity" @@ -1302,7 +1302,7 @@ ] }, { - "key": "GetRandomSeed", + "base": "GetRandomSeed", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Random Seed" @@ -1325,7 +1325,7 @@ ] }, { - "key": "GetParticleEmitRate", + "base": "GetParticleEmitRate", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Particle Emit Rate" @@ -1348,7 +1348,7 @@ ] }, { - "key": "GetIsSpriteSheetIndexRandom", + "base": "GetIsSpriteSheetIndexRandom", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Is Sprite Sheet Index Random" @@ -1371,7 +1371,7 @@ ] }, { - "key": "SetIsEmitting", + "base": "SetIsEmitting", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Is Emitting" @@ -1395,7 +1395,7 @@ ] }, { - "key": "GetParticleWidth", + "base": "GetParticleWidth", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Particle Width" @@ -1418,7 +1418,7 @@ ] }, { - "key": "GetParticleInitialRotation", + "base": "GetParticleInitialRotation", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Particle Initial Rotation" @@ -1441,7 +1441,7 @@ ] }, { - "key": "SetIsSpriteSheetAnimationLooped", + "base": "SetIsSpriteSheetAnimationLooped", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Is Sprite Sheet Animation Looped" @@ -1465,7 +1465,7 @@ ] }, { - "key": "SetParticleInitialRotationVariation", + "base": "SetParticleInitialRotationVariation", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Particle Initial Rotation Variation" @@ -1489,7 +1489,7 @@ ] }, { - "key": "SetIsRandomSeedFixed", + "base": "SetIsRandomSeedFixed", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Is Random Seed Fixed" @@ -1513,7 +1513,7 @@ ] }, { - "key": "SetIsEmitterLifetimeInfinite", + "base": "SetIsEmitterLifetimeInfinite", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Is Emitter Lifetime Infinite" @@ -1537,7 +1537,7 @@ ] }, { - "key": "GetEmitAngle", + "base": "GetEmitAngle", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Emit Angle" @@ -1560,7 +1560,7 @@ ] }, { - "key": "GetIsEmitterLifetimeInfinite", + "base": "GetIsEmitterLifetimeInfinite", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Is Emitter Lifetime Infinite" @@ -1583,7 +1583,7 @@ ] }, { - "key": "SetIsHitParticleCountOnActivate", + "base": "SetIsHitParticleCountOnActivate", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Is Hit Particle Count On Activate" @@ -1607,7 +1607,7 @@ ] }, { - "key": "SetParticleMovementCoordinateType", + "base": "SetParticleMovementCoordinateType", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Particle Movement Coordinate Type" @@ -1631,7 +1631,7 @@ ] }, { - "key": "SetSpriteSheetCellEndIndex", + "base": "SetSpriteSheetCellEndIndex", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Sprite Sheet Cell End Index" @@ -1655,7 +1655,7 @@ ] }, { - "key": "SetParticleColor", + "base": "SetParticleColor", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Particle Color" @@ -1679,7 +1679,7 @@ ] }, { - "key": "SetSpriteSheetCellIndex", + "base": "SetSpriteSheetCellIndex", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Sprite Sheet Cell Index" @@ -1703,7 +1703,7 @@ ] }, { - "key": "SetIsParticleLifetimeInfinite", + "base": "SetIsParticleLifetimeInfinite", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Is Particle Lifetime Infinite" @@ -1727,7 +1727,7 @@ ] }, { - "key": "SetParticleSpeed", + "base": "SetParticleSpeed", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Particle Speed" @@ -1751,7 +1751,7 @@ ] }, { - "key": "GetIsHitParticleCountOnActivate", + "base": "GetIsHitParticleCountOnActivate", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Is Hit Particle Count On Activate" @@ -1774,7 +1774,7 @@ ] }, { - "key": "GetParticleAlpha", + "base": "GetParticleAlpha", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Particle Alpha" @@ -1797,7 +1797,7 @@ ] }, { - "key": "GetEmitAngleVariation", + "base": "GetEmitAngleVariation", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Emit Angle Variation" @@ -1820,7 +1820,7 @@ ] }, { - "key": "SetEmitterShape", + "base": "SetEmitterShape", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Emitter Shape" @@ -1844,7 +1844,7 @@ ] }, { - "key": "GetParticleSpeedVariation", + "base": "GetParticleSpeedVariation", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Particle Speed Variation" @@ -1867,7 +1867,7 @@ ] }, { - "key": "SetParticleAcceleration", + "base": "SetParticleAcceleration", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Particle Acceleration" @@ -1891,7 +1891,7 @@ ] }, { - "key": "SetParticleSpeedVariation", + "base": "SetParticleSpeedVariation", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Particle Speed Variation" @@ -1915,7 +1915,7 @@ ] }, { - "key": "GetIsParticleAspectRatioLocked", + "base": "GetIsParticleAspectRatioLocked", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Is Particle Aspect Ratio Locked" @@ -1938,7 +1938,7 @@ ] }, { - "key": "GetIsSpriteSheetAnimationLooped", + "base": "GetIsSpriteSheetAnimationLooped", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Is Sprite Sheet Animation Looped" @@ -1961,7 +1961,7 @@ ] }, { - "key": "GetParticleAcceleration", + "base": "GetParticleAcceleration", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Particle Acceleration" @@ -1984,7 +1984,7 @@ ] }, { - "key": "SetIsSpriteSheetIndexRandom", + "base": "SetIsSpriteSheetIndexRandom", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Is Sprite Sheet Index Random" @@ -2008,7 +2008,7 @@ ] }, { - "key": "GetParticleMovementCoordinateType", + "base": "GetParticleMovementCoordinateType", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Particle Movement Coordinate Type" @@ -2031,7 +2031,7 @@ ] }, { - "key": "GetParticleInitialVelocity", + "base": "GetParticleInitialVelocity", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Particle Initial Velocity" @@ -2054,7 +2054,7 @@ ] }, { - "key": "SetParticleWidth", + "base": "SetParticleWidth", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Particle Width" @@ -2078,7 +2078,7 @@ ] }, { - "key": "SetParticleSize", + "base": "SetParticleSize", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Particle Size" @@ -2102,7 +2102,7 @@ ] }, { - "key": "GetEmitterLifetime", + "base": "GetEmitterLifetime", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Emitter Lifetime" @@ -2125,7 +2125,7 @@ ] }, { - "key": "GetParticleSpeed", + "base": "GetParticleSpeed", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Particle Speed" @@ -2148,7 +2148,7 @@ ] }, { - "key": "SetParticleRotationSpeedVariation", + "base": "SetParticleRotationSpeedVariation", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Particle Rotation Speed Variation" @@ -2172,7 +2172,7 @@ ] }, { - "key": "GetParticleHeight", + "base": "GetParticleHeight", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Particle Height" @@ -2195,7 +2195,7 @@ ] }, { - "key": "SetParticleHeightVariation", + "base": "SetParticleHeightVariation", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Particle Height Variation" @@ -2219,7 +2219,7 @@ ] }, { - "key": "SetParticleInitialRotation", + "base": "SetParticleInitialRotation", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Particle Initial Rotation" @@ -2243,7 +2243,7 @@ ] }, { - "key": "GetParticlePivot", + "base": "GetParticlePivot", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Particle Pivot" @@ -2266,7 +2266,7 @@ ] }, { - "key": "GetParticleWidthVariation", + "base": "GetParticleWidthVariation", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Particle Width Variation" @@ -2289,7 +2289,7 @@ ] }, { - "key": "GetIsEmitOnActivate", + "base": "GetIsEmitOnActivate", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Is Emit On Activate" @@ -2312,7 +2312,7 @@ ] }, { - "key": "SetIsParticlePositionRelativeToEmitter", + "base": "SetIsParticlePositionRelativeToEmitter", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Is Particle Position Relative To Emitter" @@ -2336,7 +2336,7 @@ ] }, { - "key": "SetParticleInitialDirectionType", + "base": "SetParticleInitialDirectionType", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Particle Initial Direction Type" @@ -2360,7 +2360,7 @@ ] }, { - "key": "GetParticleHeightVariation", + "base": "GetParticleHeightVariation", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Particle Height Variation" @@ -2383,7 +2383,7 @@ ] }, { - "key": "SetParticleColorBrightnessVariation", + "base": "SetParticleColorBrightnessVariation", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Particle Color Brightness Variation" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiRadioButtonBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiRadioButtonBus.names index 42e23202c6..292353e770 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiRadioButtonBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiRadioButtonBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "UiRadioButtonBus", + "base": "UiRadioButtonBus", "context": "EBusSender", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "SetChangedActionName", + "base": "SetChangedActionName", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Changed Action Name" @@ -34,7 +34,7 @@ ] }, { - "key": "GetChangedActionName", + "base": "GetChangedActionName", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Changed Action Name" @@ -57,7 +57,7 @@ ] }, { - "key": "SetCheckedEntity", + "base": "SetCheckedEntity", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Checked Entity" @@ -81,7 +81,7 @@ ] }, { - "key": "SetUncheckedEntity", + "base": "SetUncheckedEntity", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Unchecked Entity" @@ -105,7 +105,7 @@ ] }, { - "key": "SetTurnOnActionName", + "base": "SetTurnOnActionName", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Turn On Action Name" @@ -129,7 +129,7 @@ ] }, { - "key": "GetTurnOffActionName", + "base": "GetTurnOffActionName", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Turn Off Action Name" @@ -152,7 +152,7 @@ ] }, { - "key": "GetGroup", + "base": "GetGroup", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Group" @@ -176,7 +176,7 @@ ] }, { - "key": "GetState", + "base": "GetState", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get State" @@ -199,7 +199,7 @@ ] }, { - "key": "GetCheckedEntity", + "base": "GetCheckedEntity", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Checked Entity" @@ -223,7 +223,7 @@ ] }, { - "key": "GetUncheckedEntity", + "base": "GetUncheckedEntity", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Unchecked Entity" @@ -247,7 +247,7 @@ ] }, { - "key": "GetTurnOnActionName", + "base": "GetTurnOnActionName", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Turn On Action Name" @@ -270,7 +270,7 @@ ] }, { - "key": "SetTurnOffActionName", + "base": "SetTurnOffActionName", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Turn Off Action Name" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiRadioButtonGroupBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiRadioButtonGroupBus.names index 2cde33edfb..f0a4172a6f 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiRadioButtonGroupBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiRadioButtonGroupBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "UiRadioButtonGroupBus", + "base": "UiRadioButtonGroupBus", "context": "EBusSender", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "AddRadioButton", + "base": "AddRadioButton", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Add Radio Button" @@ -34,7 +34,7 @@ ] }, { - "key": "SetChangedActionName", + "base": "SetChangedActionName", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Changed Action Name" @@ -58,7 +58,7 @@ ] }, { - "key": "SetAllowUncheck", + "base": "SetAllowUncheck", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Allow Uncheck" @@ -82,7 +82,7 @@ ] }, { - "key": "ContainsRadioButton", + "base": "ContainsRadioButton", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Contains Radio Button" @@ -115,7 +115,7 @@ ] }, { - "key": "GetChangedActionName", + "base": "GetChangedActionName", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Changed Action Name" @@ -138,7 +138,7 @@ ] }, { - "key": "GetAllowUncheck", + "base": "GetAllowUncheck", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Allow Uncheck" @@ -161,7 +161,7 @@ ] }, { - "key": "RemoveRadioButton", + "base": "RemoveRadioButton", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Remove Radio Button" @@ -185,7 +185,7 @@ ] }, { - "key": "SetState", + "base": "SetState", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set State" @@ -216,7 +216,7 @@ ] }, { - "key": "GetState", + "base": "GetState", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get State" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiScrollBarBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiScrollBarBus.names index 8ca81f9cca..9f77750c89 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiScrollBarBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiScrollBarBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "UiScrollBarBus", + "base": "UiScrollBarBus", "context": "EBusSender", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetAutoFadeSpeed", + "base": "GetAutoFadeSpeed", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetAutoFadeSpeed" @@ -32,7 +32,7 @@ ] }, { - "key": "IsAutoFadeEnabled", + "base": "IsAutoFadeEnabled", "entry": { "name": "In", "tooltip": "When signaled, this will invoke IsAutoFadeEnabled" @@ -54,7 +54,7 @@ ] }, { - "key": "SetAutoFadeSpeed", + "base": "SetAutoFadeSpeed", "entry": { "name": "In", "tooltip": "When signaled, this will invoke SetAutoFadeSpeed" @@ -76,7 +76,7 @@ ] }, { - "key": "SetHandleEntity", + "base": "SetHandleEntity", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Handle Entity" @@ -100,7 +100,7 @@ ] }, { - "key": "GetHandleEntity", + "base": "GetHandleEntity", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Handle Entity" @@ -124,7 +124,7 @@ ] }, { - "key": "GetAutoFadeDelay", + "base": "GetAutoFadeDelay", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetAutoFadeDelay" @@ -146,7 +146,7 @@ ] }, { - "key": "GetMinHandlePixelSize", + "base": "GetMinHandlePixelSize", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Min Handle Pixel Size" @@ -169,7 +169,7 @@ ] }, { - "key": "SetAutoFadeEnabled", + "base": "SetAutoFadeEnabled", "entry": { "name": "In", "tooltip": "When signaled, this will invoke SetAutoFadeEnabled" @@ -191,7 +191,7 @@ ] }, { - "key": "SetHandleSize", + "base": "SetHandleSize", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Handle Size" @@ -215,7 +215,7 @@ ] }, { - "key": "SetMinHandlePixelSize", + "base": "SetMinHandlePixelSize", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Min Handle Pixel Size" @@ -239,7 +239,7 @@ ] }, { - "key": "GetHandleSize", + "base": "GetHandleSize", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Handle Size" @@ -262,7 +262,7 @@ ] }, { - "key": "SetAutoFadeDelay", + "base": "SetAutoFadeDelay", "entry": { "name": "In", "tooltip": "When signaled, this will invoke SetAutoFadeDelay" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiScrollBoxBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiScrollBoxBus.names index 9198231a79..0b5c2ef252 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiScrollBoxBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiScrollBoxBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "UiScrollBoxBus", + "base": "UiScrollBoxBus", "context": "EBusSender", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "FindClosestContentChildElement", + "base": "FindClosestContentChildElement", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Find Closest Content Child Element" @@ -34,7 +34,7 @@ ] }, { - "key": "GetHorizontalScrollBarVisibility", + "base": "GetHorizontalScrollBarVisibility", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Horizontal Scroll Bar Visibility" @@ -57,7 +57,7 @@ ] }, { - "key": "GetVerticalScrollBarEntity", + "base": "GetVerticalScrollBarEntity", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Vertical Scroll Bar Entity" @@ -81,7 +81,7 @@ ] }, { - "key": "SetHorizontalScrollBarVisibility", + "base": "SetHorizontalScrollBarVisibility", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Horizontal Scroll Bar Visibility" @@ -105,7 +105,7 @@ ] }, { - "key": "SetScrollOffsetChangingActionName", + "base": "SetScrollOffsetChangingActionName", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Scroll Offset Changing Action Name" @@ -129,7 +129,7 @@ ] }, { - "key": "GetScrollOffsetChangingActionName", + "base": "GetScrollOffsetChangingActionName", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Scroll Offset Changing Action Name" @@ -152,7 +152,7 @@ ] }, { - "key": "GetHorizontalScrollBarEntity", + "base": "GetHorizontalScrollBarEntity", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Horizontal Scroll Bar Entity" @@ -176,7 +176,7 @@ ] }, { - "key": "HasHorizontalContentToScroll", + "base": "HasHorizontalContentToScroll", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Has Horizontal Content To Scroll" @@ -199,7 +199,7 @@ ] }, { - "key": "SetContentEntity", + "base": "SetContentEntity", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Content Entity" @@ -223,7 +223,7 @@ ] }, { - "key": "GetIsScrollingConstrained", + "base": "GetIsScrollingConstrained", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Is Scrolling Constrained" @@ -246,7 +246,7 @@ ] }, { - "key": "HasVerticalContentToScroll", + "base": "HasVerticalContentToScroll", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Has Vertical Content To Scroll" @@ -269,7 +269,7 @@ ] }, { - "key": "GetIsVerticalScrollingEnabled", + "base": "GetIsVerticalScrollingEnabled", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Is Vertical Scrolling Enabled" @@ -292,7 +292,7 @@ ] }, { - "key": "GetVerticalScrollBarVisibility", + "base": "GetVerticalScrollBarVisibility", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Vertical Scroll Bar Visibility" @@ -315,7 +315,7 @@ ] }, { - "key": "SetIsHorizontalScrollingEnabled", + "base": "SetIsHorizontalScrollingEnabled", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Is Horizontal Scrolling Enabled" @@ -339,7 +339,7 @@ ] }, { - "key": "GetNormalizedScrollValue", + "base": "GetNormalizedScrollValue", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Normalized Scroll Value" @@ -362,7 +362,7 @@ ] }, { - "key": "SetScrollOffset", + "base": "SetScrollOffset", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Scroll Offset" @@ -386,7 +386,7 @@ ] }, { - "key": "SetHorizontalScrollBarEntity", + "base": "SetHorizontalScrollBarEntity", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Horizontal Scroll Bar Entity" @@ -410,7 +410,7 @@ ] }, { - "key": "GetScrollOffset", + "base": "GetScrollOffset", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Scroll Offset" @@ -433,7 +433,7 @@ ] }, { - "key": "GetScrollOffsetChangedActionName", + "base": "GetScrollOffsetChangedActionName", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Scroll Offset Changed Action Name" @@ -456,7 +456,7 @@ ] }, { - "key": "SetVerticalScrollBarVisibility", + "base": "SetVerticalScrollBarVisibility", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Vertical Scroll Bar Visibility" @@ -480,7 +480,7 @@ ] }, { - "key": "GetIsHorizontalScrollingEnabled", + "base": "GetIsHorizontalScrollingEnabled", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Is Horizontal Scrolling Enabled" @@ -503,7 +503,7 @@ ] }, { - "key": "SetIsScrollingConstrained", + "base": "SetIsScrollingConstrained", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Is Scrolling Constrained" @@ -527,7 +527,7 @@ ] }, { - "key": "SetSnapGrid", + "base": "SetSnapGrid", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Snap Grid" @@ -551,7 +551,7 @@ ] }, { - "key": "SetIsVerticalScrollingEnabled", + "base": "SetIsVerticalScrollingEnabled", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Is Vertical Scrolling Enabled" @@ -575,7 +575,7 @@ ] }, { - "key": "GetSnapGrid", + "base": "GetSnapGrid", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Snap Grid" @@ -598,7 +598,7 @@ ] }, { - "key": "GetSnapMode", + "base": "GetSnapMode", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Snap Mode" @@ -621,7 +621,7 @@ ] }, { - "key": "SetScrollOffsetChangedActionName", + "base": "SetScrollOffsetChangedActionName", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Scroll Offset Changed Action Name" @@ -645,7 +645,7 @@ ] }, { - "key": "SetVerticalScrollBarEntity", + "base": "SetVerticalScrollBarEntity", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Vertical Scroll Bar Entity" @@ -669,7 +669,7 @@ ] }, { - "key": "GetContentEntity", + "base": "GetContentEntity", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Content Entity" @@ -693,7 +693,7 @@ ] }, { - "key": "SetSnapMode", + "base": "SetSnapMode", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Snap Mode" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiScrollerBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiScrollerBus.names index c2b3fd4a76..4bb1ea334d 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiScrollerBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiScrollerBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "UiScrollerBus", + "base": "UiScrollerBus", "context": "EBusSender", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetValueChangedActionName", + "base": "GetValueChangedActionName", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Value Changed Action Name" @@ -33,7 +33,7 @@ ] }, { - "key": "SetOrientation", + "base": "SetOrientation", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Orientation" @@ -57,7 +57,7 @@ ] }, { - "key": "GetOrientation", + "base": "GetOrientation", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Orientation" @@ -80,7 +80,7 @@ ] }, { - "key": "GetValueChangingActionName", + "base": "GetValueChangingActionName", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Value Changing Action Name" @@ -103,7 +103,7 @@ ] }, { - "key": "SetValueChangingActionName", + "base": "SetValueChangingActionName", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Value Changing Action Name" @@ -127,7 +127,7 @@ ] }, { - "key": "SetValue", + "base": "SetValue", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Value" @@ -151,7 +151,7 @@ ] }, { - "key": "GetValue", + "base": "GetValue", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Value" @@ -174,7 +174,7 @@ ] }, { - "key": "SetValueChangedActionName", + "base": "SetValueChangedActionName", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Value Changed Action Name" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiSliderBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiSliderBus.names index 48e06905c7..e9d5e49722 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiSliderBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiSliderBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "UiSliderBus", + "base": "UiSliderBus", "context": "EBusSender", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetValueChangingActionName", + "base": "GetValueChangingActionName", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Value Changing Action Name" @@ -33,7 +33,7 @@ ] }, { - "key": "SetValueChangingActionName", + "base": "SetValueChangingActionName", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Value Changing Action Name" @@ -57,7 +57,7 @@ ] }, { - "key": "GetManipulatorEntity", + "base": "GetManipulatorEntity", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Manipulator Entity" @@ -81,7 +81,7 @@ ] }, { - "key": "SetTrackEntity", + "base": "SetTrackEntity", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Track Entity" @@ -105,7 +105,7 @@ ] }, { - "key": "GetFillEntity", + "base": "GetFillEntity", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Fill Entity" @@ -129,7 +129,7 @@ ] }, { - "key": "SetFillEntity", + "base": "SetFillEntity", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Fill Entity" @@ -153,7 +153,7 @@ ] }, { - "key": "SetManipulatorEntity", + "base": "SetManipulatorEntity", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Manipulator Entity" @@ -177,7 +177,7 @@ ] }, { - "key": "GetValueChangedActionName", + "base": "GetValueChangedActionName", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Value Changed Action Name" @@ -200,7 +200,7 @@ ] }, { - "key": "GetTrackEntity", + "base": "GetTrackEntity", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Track Entity" @@ -224,7 +224,7 @@ ] }, { - "key": "GetMinValue", + "base": "GetMinValue", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Min Value" @@ -247,7 +247,7 @@ ] }, { - "key": "SetMinValue", + "base": "SetMinValue", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Min Value" @@ -271,7 +271,7 @@ ] }, { - "key": "SetStepValue", + "base": "SetStepValue", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Step Value" @@ -295,7 +295,7 @@ ] }, { - "key": "SetValue", + "base": "SetValue", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Value" @@ -319,7 +319,7 @@ ] }, { - "key": "SetMaxValue", + "base": "SetMaxValue", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Max Value" @@ -343,7 +343,7 @@ ] }, { - "key": "GetStepValue", + "base": "GetStepValue", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Step Value" @@ -366,7 +366,7 @@ ] }, { - "key": "GetValue", + "base": "GetValue", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Value" @@ -389,7 +389,7 @@ ] }, { - "key": "GetMaxValue", + "base": "GetMaxValue", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Max Value" @@ -412,7 +412,7 @@ ] }, { - "key": "SetValueChangedActionName", + "base": "SetValueChangedActionName", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Value Changed Action Name" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiSpawnerBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiSpawnerBus.names index 013efee91d..cc1ed40f00 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiSpawnerBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiSpawnerBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "UiSpawnerBus", + "base": "UiSpawnerBus", "context": "EBusSender", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "Spawn", + "base": "Spawn", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Spawn" @@ -33,7 +33,7 @@ ] }, { - "key": "SpawnRelative", + "base": "SpawnRelative", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Spawn Relative" @@ -66,7 +66,7 @@ ] }, { - "key": "SpawnAbsolute", + "base": "SpawnAbsolute", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Spawn Absolute" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiTextBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiTextBus.names index 1bc31f0a93..26fd061c0c 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiTextBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiTextBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "UiTextBus", + "base": "UiTextBus", "context": "EBusSender", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetTextHeight", + "base": "GetTextHeight", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Text Height" @@ -33,7 +33,7 @@ ] }, { - "key": "GetColor", + "base": "GetColor", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Color" @@ -56,7 +56,7 @@ ] }, { - "key": "GetLineSpacing", + "base": "GetLineSpacing", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Line Spacing" @@ -79,7 +79,7 @@ ] }, { - "key": "GetTextWidth", + "base": "GetTextWidth", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Text Width" @@ -102,7 +102,7 @@ ] }, { - "key": "SetWrapText", + "base": "SetWrapText", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Wrap Text" @@ -126,7 +126,7 @@ ] }, { - "key": "GetFontEffectName", + "base": "GetFontEffectName", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Font Effect Name" @@ -159,7 +159,7 @@ ] }, { - "key": "GetShrinkToFit", + "base": "GetShrinkToFit", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Shrink To Fit" @@ -182,7 +182,7 @@ ] }, { - "key": "GetOverflowMode", + "base": "GetOverflowMode", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Overflow Mode" @@ -205,7 +205,7 @@ ] }, { - "key": "GetFontEffect", + "base": "GetFontEffect", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Font Effect" @@ -228,7 +228,7 @@ ] }, { - "key": "SetFontEffect", + "base": "SetFontEffect", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Font Effect" @@ -252,7 +252,7 @@ ] }, { - "key": "GetHorizontalTextAlignment", + "base": "GetHorizontalTextAlignment", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Horizontal Text Alignment" @@ -275,7 +275,7 @@ ] }, { - "key": "GetFont", + "base": "GetFont", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Font" @@ -298,7 +298,7 @@ ] }, { - "key": "SetVerticalTextAlignment", + "base": "SetVerticalTextAlignment", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Vertical Text Alignment" @@ -322,7 +322,7 @@ ] }, { - "key": "GetVerticalTextAlignment", + "base": "GetVerticalTextAlignment", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Vertical Text Alignment" @@ -345,7 +345,7 @@ ] }, { - "key": "SetOverflowMode", + "base": "SetOverflowMode", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Overflow Mode" @@ -369,7 +369,7 @@ ] }, { - "key": "SetColor", + "base": "SetColor", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Color" @@ -393,7 +393,7 @@ ] }, { - "key": "SetFontSize", + "base": "SetFontSize", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Font Size" @@ -417,7 +417,7 @@ ] }, { - "key": "SetCharacterSpacing", + "base": "SetCharacterSpacing", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Character Spacing" @@ -441,7 +441,7 @@ ] }, { - "key": "SetLineSpacing", + "base": "SetLineSpacing", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Line Spacing" @@ -465,7 +465,7 @@ ] }, { - "key": "GetCharacterSpacing", + "base": "GetCharacterSpacing", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Character Spacing" @@ -488,7 +488,7 @@ ] }, { - "key": "SetHorizontalTextAlignment", + "base": "SetHorizontalTextAlignment", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Horizontal Text Alignment" @@ -512,7 +512,7 @@ ] }, { - "key": "SetText", + "base": "SetText", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Text" @@ -536,7 +536,7 @@ ] }, { - "key": "SetFont", + "base": "SetFont", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Font" @@ -560,7 +560,7 @@ ] }, { - "key": "SetFontEffectByName", + "base": "SetFontEffectByName", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Font Effect By Name" @@ -584,7 +584,7 @@ ] }, { - "key": "SetIsMarkupEnabled", + "base": "SetIsMarkupEnabled", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Is Markup Enabled" @@ -608,7 +608,7 @@ ] }, { - "key": "GetWrapText", + "base": "GetWrapText", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Wrap Text" @@ -631,7 +631,7 @@ ] }, { - "key": "GetText", + "base": "GetText", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Text" @@ -654,7 +654,7 @@ ] }, { - "key": "GetTextSize", + "base": "GetTextSize", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetTextSize" @@ -676,7 +676,7 @@ ] }, { - "key": "GetIsMarkupEnabled", + "base": "GetIsMarkupEnabled", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Is Markup Enabled" @@ -699,7 +699,7 @@ ] }, { - "key": "GetFontSize", + "base": "GetFontSize", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Font Size" @@ -722,7 +722,7 @@ ] }, { - "key": "SetShrinkToFit", + "base": "SetShrinkToFit", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Shrink To Fit" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiTextInputBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiTextInputBus.names index b8a8cd69da..cff4ff2e7f 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiTextInputBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiTextInputBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "UiTextInputBus", + "base": "UiTextInputBus", "context": "EBusSender", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "SetChangeAction", + "base": "SetChangeAction", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Change Action" @@ -34,7 +34,7 @@ ] }, { - "key": "GetEndEditAction", + "base": "GetEndEditAction", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get End Edit Action" @@ -57,7 +57,7 @@ ] }, { - "key": "SetEndEditAction", + "base": "SetEndEditAction", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set End Edit Action" @@ -81,7 +81,7 @@ ] }, { - "key": "GetPlaceHolderTextEntity", + "base": "GetPlaceHolderTextEntity", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Placeholder Text Entity" @@ -105,7 +105,7 @@ ] }, { - "key": "GetIsPasswordField", + "base": "GetIsPasswordField", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Is Password Field" @@ -128,7 +128,7 @@ ] }, { - "key": "GetChangeAction", + "base": "GetChangeAction", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Change Action" @@ -151,7 +151,7 @@ ] }, { - "key": "SetEnterAction", + "base": "SetEnterAction", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Enter Action" @@ -175,7 +175,7 @@ ] }, { - "key": "SetText", + "base": "SetText", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Text" @@ -199,7 +199,7 @@ ] }, { - "key": "SetIsClipboardEnabled", + "base": "SetIsClipboardEnabled", "entry": { "name": "In", "tooltip": "When signaled, this will invoke SetIsClipboardEnabled" @@ -221,7 +221,7 @@ ] }, { - "key": "SetMaxStringLength", + "base": "SetMaxStringLength", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Max String Length" @@ -245,7 +245,7 @@ ] }, { - "key": "GetEnterAction", + "base": "GetEnterAction", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Enter Action" @@ -268,7 +268,7 @@ ] }, { - "key": "GetText", + "base": "GetText", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Text" @@ -291,7 +291,7 @@ ] }, { - "key": "GetCursorBlinkInterval", + "base": "GetCursorBlinkInterval", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Cursor Blink Interval" @@ -314,7 +314,7 @@ ] }, { - "key": "GetMaxStringLength", + "base": "GetMaxStringLength", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Max String Length" @@ -337,7 +337,7 @@ ] }, { - "key": "SetIsPasswordField", + "base": "SetIsPasswordField", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Is Password Field" @@ -361,7 +361,7 @@ ] }, { - "key": "GetTextCursorColor", + "base": "GetTextCursorColor", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Text Cursor Color" @@ -384,7 +384,7 @@ ] }, { - "key": "SetTextEntity", + "base": "SetTextEntity", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Text Entity" @@ -408,7 +408,7 @@ ] }, { - "key": "SetTextSelectionColor", + "base": "SetTextSelectionColor", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Text Selection Color" @@ -432,7 +432,7 @@ ] }, { - "key": "SetTextCursorColor", + "base": "SetTextCursorColor", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Text Cursor Color" @@ -456,7 +456,7 @@ ] }, { - "key": "SetCursorBlinkInterval", + "base": "SetCursorBlinkInterval", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Cursor Blink Interval" @@ -480,7 +480,7 @@ ] }, { - "key": "GetTextEntity", + "base": "GetTextEntity", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Text Entity" @@ -504,7 +504,7 @@ ] }, { - "key": "SetPlaceHolderTextEntity", + "base": "SetPlaceHolderTextEntity", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Placeholder Text Entity" @@ -528,7 +528,7 @@ ] }, { - "key": "GetReplacementCharacter", + "base": "GetReplacementCharacter", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Replacement Character" @@ -551,7 +551,7 @@ ] }, { - "key": "GetIsClipboardEnabled", + "base": "GetIsClipboardEnabled", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetIsClipboardEnabled" @@ -573,7 +573,7 @@ ] }, { - "key": "GetTextSelectionColor", + "base": "GetTextSelectionColor", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Text Selection Color" @@ -596,7 +596,7 @@ ] }, { - "key": "SetReplacementCharacter", + "base": "SetReplacementCharacter", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Replacement Character" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiTooltipBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiTooltipBus.names index 65fa7736e2..f782d63f36 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiTooltipBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiTooltipBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "UiTooltipBus", + "base": "UiTooltipBus", "context": "EBusSender", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetText", + "base": "GetText", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Text" @@ -33,7 +33,7 @@ ] }, { - "key": "SetText", + "base": "SetText", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Text" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiTooltipDisplayBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiTooltipDisplayBus.names index ddf95a0888..7ec2d0a089 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiTooltipDisplayBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiTooltipDisplayBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "UiTooltipDisplayBus", + "base": "UiTooltipDisplayBus", "context": "EBusSender", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetAutoSize", + "base": "GetAutoSize", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Auto Size" @@ -33,7 +33,7 @@ ] }, { - "key": "GetTextEntity", + "base": "GetTextEntity", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Text Entity" @@ -57,7 +57,7 @@ ] }, { - "key": "GetDelayTime", + "base": "GetDelayTime", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Delay Time" @@ -80,7 +80,7 @@ ] }, { - "key": "SetDelayTime", + "base": "SetDelayTime", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Delay Time" @@ -104,7 +104,7 @@ ] }, { - "key": "SetDisplayTime", + "base": "SetDisplayTime", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Display Time" @@ -128,7 +128,7 @@ ] }, { - "key": "SetOffset", + "base": "SetOffset", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Offset" @@ -152,7 +152,7 @@ ] }, { - "key": "GetOffset", + "base": "GetOffset", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Offset" @@ -175,7 +175,7 @@ ] }, { - "key": "GetAutoPositionMode", + "base": "GetAutoPositionMode", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Auto Position Mode" @@ -198,7 +198,7 @@ ] }, { - "key": "SetAutoPosition", + "base": "SetAutoPosition", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Auto Position" @@ -222,7 +222,7 @@ ] }, { - "key": "SetAutoSize", + "base": "SetAutoSize", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Auto Size" @@ -246,7 +246,7 @@ ] }, { - "key": "GetAutoPosition", + "base": "GetAutoPosition", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Auto Position" @@ -269,7 +269,7 @@ ] }, { - "key": "SetTextEntity", + "base": "SetTextEntity", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Text Entity" @@ -293,7 +293,7 @@ ] }, { - "key": "GetDisplayTime", + "base": "GetDisplayTime", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Display Time" @@ -316,7 +316,7 @@ ] }, { - "key": "GetTriggerMode", + "base": "GetTriggerMode", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetTriggerMode" @@ -338,7 +338,7 @@ ] }, { - "key": "SetTriggerMode", + "base": "SetTriggerMode", "entry": { "name": "In", "tooltip": "When signaled, this will invoke SetTriggerMode" @@ -360,7 +360,7 @@ ] }, { - "key": "SetAutoPositionMode", + "base": "SetAutoPositionMode", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Auto Position Mode" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiTransform2dBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiTransform2dBus.names index 112788b514..3c7570072b 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiTransform2dBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiTransform2dBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "UiTransform2dBus", + "base": "UiTransform2dBus", "context": "EBusSender", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetLocalHeight", + "base": "GetLocalHeight", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Local Height" @@ -33,7 +33,7 @@ ] }, { - "key": "SetLocalHeight", + "base": "SetLocalHeight", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Local Height" @@ -57,7 +57,7 @@ ] }, { - "key": "GetLocalWidth", + "base": "GetLocalWidth", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Local Width" @@ -80,7 +80,7 @@ ] }, { - "key": "SetPivotAndAdjustOffsets", + "base": "SetPivotAndAdjustOffsets", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Pivot And Adjust Offsets" @@ -104,7 +104,7 @@ ] }, { - "key": "SetLocalWidth", + "base": "SetLocalWidth", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Local Width" @@ -128,7 +128,7 @@ ] }, { - "key": "GetOffsets", + "base": "GetOffsets", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Offsets" @@ -151,7 +151,7 @@ ] }, { - "key": "SetAnchors", + "base": "SetAnchors", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Anchors" @@ -189,7 +189,7 @@ ] }, { - "key": "GetAnchors", + "base": "GetAnchors", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Anchors" @@ -212,7 +212,7 @@ ] }, { - "key": "SetOffsets", + "base": "SetOffsets", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Offsets" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiTransformBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiTransformBus.names index a0df1276cc..92a8ea1989 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiTransformBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiTransformBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "UiTransformBus", + "base": "UiTransformBus", "context": "EBusSender", "variant": "", "details": { @@ -9,7 +9,7 @@ }, "methods": [ { - "key": "GetPivotY", + "base": "GetPivotY", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get PivotY" @@ -31,7 +31,7 @@ ] }, { - "key": "GetScaleX", + "base": "GetScaleX", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get ScaleX" @@ -53,7 +53,7 @@ ] }, { - "key": "GetScale", + "base": "GetScale", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Scale" @@ -75,7 +75,7 @@ ] }, { - "key": "SetLocalPositionX", + "base": "SetLocalPositionX", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Local PositionX" @@ -97,7 +97,7 @@ ] }, { - "key": "SetScaleX", + "base": "SetScaleX", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set ScaleX" @@ -119,7 +119,7 @@ ] }, { - "key": "SetZRotation", + "base": "SetZRotation", "entry": { "name": "In", "tooltip": "When signaled, this will invoke SetZ Rotation" @@ -141,7 +141,7 @@ ] }, { - "key": "GetScaleToDeviceMode", + "base": "GetScaleToDeviceMode", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Scale To Device Mode" @@ -163,7 +163,7 @@ ] }, { - "key": "SetPivot", + "base": "SetPivot", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Pivot" @@ -185,7 +185,7 @@ ] }, { - "key": "GetScaleY", + "base": "GetScaleY", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get ScaleY" @@ -207,7 +207,7 @@ ] }, { - "key": "MoveLocalPositionBy", + "base": "MoveLocalPositionBy", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Move Local Position By" @@ -229,7 +229,7 @@ ] }, { - "key": "SetLocalPositionY", + "base": "SetLocalPositionY", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Local PositionY" @@ -251,7 +251,7 @@ ] }, { - "key": "SetViewportPosition", + "base": "SetViewportPosition", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Viewport Position" @@ -273,7 +273,7 @@ ] }, { - "key": "SetScaleToDeviceMode", + "base": "SetScaleToDeviceMode", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Scale To Device Mode" @@ -295,7 +295,7 @@ ] }, { - "key": "GetLocalPositionX", + "base": "GetLocalPositionX", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Local PositionX" @@ -317,7 +317,7 @@ ] }, { - "key": "MoveCanvasPositionBy", + "base": "MoveCanvasPositionBy", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Move Canvas Position By" @@ -339,7 +339,7 @@ ] }, { - "key": "SetPivotX", + "base": "SetPivotX", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set PivotX" @@ -361,7 +361,7 @@ ] }, { - "key": "MoveViewportPositionBy", + "base": "MoveViewportPositionBy", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Move Viewport Position By" @@ -383,7 +383,7 @@ ] }, { - "key": "SetPivotY", + "base": "SetPivotY", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set PivotY" @@ -405,7 +405,7 @@ ] }, { - "key": "GetViewportPosition", + "base": "GetViewportPosition", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Viewport Position" @@ -427,7 +427,7 @@ ] }, { - "key": "SetScale", + "base": "SetScale", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Scale" @@ -449,7 +449,7 @@ ] }, { - "key": "SetLocalPosition", + "base": "SetLocalPosition", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Local Position" @@ -471,7 +471,7 @@ ] }, { - "key": "GetCanvasPosition", + "base": "GetCanvasPosition", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Canvas Position" @@ -493,7 +493,7 @@ ] }, { - "key": "GetPivotX", + "base": "GetPivotX", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get PivotX" @@ -515,7 +515,7 @@ ] }, { - "key": "GetZRotation", + "base": "GetZRotation", "entry": { "name": "In", "tooltip": "When signaled, this will invoke GetZ Rotation" @@ -537,7 +537,7 @@ ] }, { - "key": "GetLocalPosition", + "base": "GetLocalPosition", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Local Position" @@ -559,7 +559,7 @@ ] }, { - "key": "SetScaleY", + "base": "SetScaleY", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set ScaleY" @@ -581,7 +581,7 @@ ] }, { - "key": "GetPivot", + "base": "GetPivot", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Pivot" @@ -603,7 +603,7 @@ ] }, { - "key": "SetCanvasPosition", + "base": "SetCanvasPosition", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Canvas Position" @@ -625,7 +625,7 @@ ] }, { - "key": "GetLocalPositionY", + "base": "GetLocalPositionY", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Local PositionY" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ViewportRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ViewportRequestBus.names index d555b4def6..bd483d39de 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ViewportRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ViewportRequestBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "ViewportRequestBus", + "base": "ViewportRequestBus", "context": "EBusSender", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "SetCameraTransform", + "base": "SetCameraTransform", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Camera Transform" @@ -32,7 +32,7 @@ ] }, { - "key": "GetCameraProjectionMatrix", + "base": "GetCameraProjectionMatrix", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Camera Projection Matrix" @@ -54,7 +54,7 @@ ] }, { - "key": "SetCameraViewMatrix", + "base": "SetCameraViewMatrix", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Camera View Matrix" @@ -76,7 +76,7 @@ ] }, { - "key": "GetCameraViewMatrix", + "base": "GetCameraViewMatrix", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Camera View Matrix" @@ -98,7 +98,7 @@ ] }, { - "key": "SetCameraProjectionMatrix", + "base": "SetCameraProjectionMatrix", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Set Camera Projection Matrix" @@ -120,7 +120,7 @@ ] }, { - "key": "GetCameraTransform", + "base": "GetCameraTransform", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Camera Transform" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/WindRequestsBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/WindRequestsBus.names index 3102c94ffb..5913af7499 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/WindRequestsBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/WindRequestsBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "WindRequestsBus", + "base": "WindRequestsBus", "context": "EBusSender", "variant": "", "details": { @@ -9,7 +9,7 @@ }, "methods": [ { - "key": "GetGlobalWind", + "base": "GetGlobalWind", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Global Wind" @@ -31,7 +31,7 @@ ] }, { - "key": "GetWindAtPosition", + "base": "GetWindAtPosition", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Wind At Position" @@ -61,7 +61,7 @@ ] }, { - "key": "GetWindInsideAabb", + "base": "GetWindInsideAabb", "entry": { "name": "In", "tooltip": "When signaled, this will invoke Get Wind Inside AABB" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/CreateBoxCastRequest.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/CreateBoxCastRequest.names index 6dc3d8f8d4..72b911f0cd 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/CreateBoxCastRequest.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/CreateBoxCastRequest.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "CreateBoxCastRequest", + "base": "CreateBoxCastRequest", "context": "Method", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "CreateBoxCastRequest", + "base": "CreateBoxCastRequest", "context": "Global", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/CreateBoxOverlapRequest.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/CreateBoxOverlapRequest.names index 35928f8446..984c7008ab 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/CreateBoxOverlapRequest.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/CreateBoxOverlapRequest.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "CreateBoxOverlapRequest", + "base": "CreateBoxOverlapRequest", "context": "Method", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "CreateBoxOverlapRequest", + "base": "CreateBoxOverlapRequest", "context": "Global", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/CreateCapsuleCastRequest.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/CreateCapsuleCastRequest.names index ef8e84f3ea..8ae6f324e6 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/CreateCapsuleCastRequest.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/CreateCapsuleCastRequest.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "CreateCapsuleCastRequest", + "base": "CreateCapsuleCastRequest", "context": "Method", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "CreateCapsuleCastRequest", + "base": "CreateCapsuleCastRequest", "context": "Global", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/CreateCapsuleOverlapRequest.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/CreateCapsuleOverlapRequest.names index d78d1c9063..d9b5f8d555 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/CreateCapsuleOverlapRequest.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/CreateCapsuleOverlapRequest.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "CreateCapsuleOverlapRequest", + "base": "CreateCapsuleOverlapRequest", "context": "Method", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "CreateCapsuleOverlapRequest", + "base": "CreateCapsuleOverlapRequest", "context": "Global", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/CreateSphereCastRequest.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/CreateSphereCastRequest.names index 884dbf070e..c8dbbf9509 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/CreateSphereCastRequest.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/CreateSphereCastRequest.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "CreateSphereCastRequest", + "base": "CreateSphereCastRequest", "context": "Method", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "CreateSphereCastRequest", + "base": "CreateSphereCastRequest", "context": "Global", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/CreateSphereOverlapRequest.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/CreateSphereOverlapRequest.names index eaf91c144a..3656d75837 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/CreateSphereOverlapRequest.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/CreateSphereOverlapRequest.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "CreateSphereOverlapRequest", + "base": "CreateSphereOverlapRequest", "context": "Method", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "CreateSphereOverlapRequest", + "base": "CreateSphereOverlapRequest", "context": "Global", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/GetPhysicsSystem.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/GetPhysicsSystem.names index d2b64d5071..ddaf1afb71 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/GetPhysicsSystem.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/GetPhysicsSystem.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "GetPhysicsSystem", + "base": "GetPhysicsSystem", "context": "Method", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetPhysicsSystem", + "base": "GetPhysicsSystem", "context": "Global", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/SaveShaderVariantListSourceData.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/SaveShaderVariantListSourceData.names index 1301717ba3..c78a97bab8 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/SaveShaderVariantListSourceData.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/SaveShaderVariantListSourceData.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "SaveShaderVariantListSourceData", + "base": "SaveShaderVariantListSourceData", "context": "Method", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "SaveShaderVariantListSourceData", + "base": "SaveShaderVariantListSourceData", "context": "Global", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/SettingsRegistry.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/SettingsRegistry.names index 373047e735..8d55c7c22c 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/SettingsRegistry.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/SettingsRegistry.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "SettingsRegistry", + "base": "SettingsRegistry", "context": "Method", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "SettingsRegistry", + "base": "SettingsRegistry", "context": "Global", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/Terminate.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/Terminate.names index d36c4cf37f..177cc5510a 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/Terminate.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/Terminate.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "Terminate", + "base": "Terminate", "context": "Method", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "Terminate", + "base": "Terminate", "context": "Global", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/add_layer_node.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/add_layer_node.names index bf4e5fcbe9..b6732eb7bf 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/add_layer_node.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/add_layer_node.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "add_layer_node", + "base": "add_layer_node", "context": "Method", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "add_layer_node", + "base": "add_layer_node", "context": "Global", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/add_node.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/add_node.names index 8f52238b58..0c7a598968 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/add_node.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/add_node.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "add_node", + "base": "add_node", "context": "Method", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "add_node", + "base": "add_node", "context": "Global", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/add_selected_entities.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/add_selected_entities.names index 926e5adef6..fa67e69277 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/add_selected_entities.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/add_selected_entities.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "add_selected_entities", + "base": "add_selected_entities", "context": "Method", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "add_selected_entities", + "base": "add_selected_entities", "context": "Global", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/add_track.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/add_track.names index c048cbf6fa..312eafd1d4 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/add_track.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/add_track.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "add_track", + "base": "add_track", "context": "Method", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "add_track", + "base": "add_track", "context": "Global", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/attach_debugger.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/attach_debugger.names index 398b3ec25a..8432caefe0 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/attach_debugger.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/attach_debugger.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "attach_debugger", + "base": "attach_debugger", "context": "Method", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "attach_debugger", + "base": "attach_debugger", "context": "Global", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/bind_viewport.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/bind_viewport.names index a09ec96fd9..ad2bbcd5f9 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/bind_viewport.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/bind_viewport.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "bind_viewport", + "base": "bind_viewport", "context": "Method", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "bind_viewport", + "base": "bind_viewport", "context": "Global", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/clear_selection.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/clear_selection.names index 8c8d8318c5..2105e431b1 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/clear_selection.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/clear_selection.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "clear_selection", + "base": "clear_selection", "context": "Method", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "clear_selection", + "base": "clear_selection", "context": "Global", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/close_pane.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/close_pane.names index 7fc51967b2..cc31fc5bce 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/close_pane.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/close_pane.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "close_pane", + "base": "close_pane", "context": "Method", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "close_pane", + "base": "close_pane", "context": "Global", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/combo_box.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/combo_box.names index 7ce138a740..09d4a594f9 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/combo_box.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/combo_box.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "combo_box", + "base": "combo_box", "context": "Method", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "combo_box", + "base": "combo_box", "context": "Global", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/crash.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/crash.names index 9708005711..c45360fa27 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/crash.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/crash.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "crash", + "base": "crash", "context": "Method", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "crash", + "base": "crash", "context": "Global", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/create_level.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/create_level.names index 4e75ca5197..f893c6e77d 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/create_level.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/create_level.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "create_level", + "base": "create_level", "context": "Method", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "create_level", + "base": "create_level", "context": "Global", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/create_level_no_prompt.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/create_level_no_prompt.names index 1935a970d1..82185c453f 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/create_level_no_prompt.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/create_level_no_prompt.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "create_level_no_prompt", + "base": "create_level_no_prompt", "context": "Method", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "create_level_no_prompt", + "base": "create_level_no_prompt", "context": "Global", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/delete_node.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/delete_node.names index 7c621e25e9..689a66a1c6 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/delete_node.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/delete_node.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "delete_node", + "base": "delete_node", "context": "Method", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "delete_node", + "base": "delete_node", "context": "Global", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/delete_object.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/delete_object.names index b134e71fec..13c8aae783 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/delete_object.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/delete_object.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "delete_object", + "base": "delete_object", "context": "Method", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "delete_object", + "base": "delete_object", "context": "Global", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/delete_selected.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/delete_selected.names index 1da4b2cb26..bc09f6f0af 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/delete_selected.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/delete_selected.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "delete_selected", + "base": "delete_selected", "context": "Method", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "delete_selected", + "base": "delete_selected", "context": "Global", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/delete_sequence.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/delete_sequence.names index bdc0052f2a..64ec10e0ac 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/delete_sequence.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/delete_sequence.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "delete_sequence", + "base": "delete_sequence", "context": "Method", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "delete_sequence", + "base": "delete_sequence", "context": "Global", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/delete_track.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/delete_track.names index 135c53ad30..ca1f49b29c 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/delete_track.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/delete_track.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "delete_track", + "base": "delete_track", "context": "Method", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "delete_track", + "base": "delete_track", "context": "Global", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/draw_label.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/draw_label.names index ae1d5befe5..cff6a5c812 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/draw_label.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/draw_label.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "draw_label", + "base": "draw_label", "context": "Method", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "draw_label", + "base": "draw_label", "context": "Global", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/dump_exposed_classes.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/dump_exposed_classes.names index 5716162f4f..d7b1bf9d23 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/dump_exposed_classes.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/dump_exposed_classes.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "dump_exposed_classes", + "base": "dump_exposed_classes", "context": "Method", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "dump_exposed_classes", + "base": "dump_exposed_classes", "context": "Global", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/edit_box.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/edit_box.names index 0a74f98f8d..59b1eea8db 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/edit_box.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/edit_box.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "edit_box", + "base": "edit_box", "context": "Method", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "edit_box", + "base": "edit_box", "context": "Global", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/edit_box_check_data_type.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/edit_box_check_data_type.names index 52ff4b7b28..582787dc7b 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/edit_box_check_data_type.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/edit_box_check_data_type.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "edit_box_check_data_type", + "base": "edit_box_check_data_type", "context": "Method", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "edit_box_check_data_type", + "base": "edit_box_check_data_type", "context": "Global", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/enable_for_all.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/enable_for_all.names index 09e4f5c426..c32a111c5d 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/enable_for_all.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/enable_for_all.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "enable_for_all", + "base": "enable_for_all", "context": "Method", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "enable_for_all", + "base": "enable_for_all", "context": "Global", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/enter_game_mode.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/enter_game_mode.names index 52e02faa81..84e713519b 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/enter_game_mode.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/enter_game_mode.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "enter_game_mode", + "base": "enter_game_mode", "context": "Method", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "enter_game_mode", + "base": "enter_game_mode", "context": "Global", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/enter_simulation_mode.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/enter_simulation_mode.names index b5b97de500..67a399c5b2 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/enter_simulation_mode.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/enter_simulation_mode.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "enter_simulation_mode", + "base": "enter_simulation_mode", "context": "Method", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "enter_simulation_mode", + "base": "enter_simulation_mode", "context": "Global", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/execute_command.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/execute_command.names index 3558aa7cdb..7410e5a7b6 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/execute_command.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/execute_command.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "execute_command", + "base": "execute_command", "context": "Method", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "execute_command", + "base": "execute_command", "context": "Global", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/exit.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/exit.names index b494190ca9..335edab62c 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/exit.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/exit.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "exit", + "base": "exit", "context": "Method", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "exit", + "base": "exit", "context": "Global", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/exit_game_mode.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/exit_game_mode.names index 61ece2079d..e202395b15 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/exit_game_mode.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/exit_game_mode.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "exit_game_mode", + "base": "exit_game_mode", "context": "Method", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "exit_game_mode", + "base": "exit_game_mode", "context": "Global", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/exit_no_prompt.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/exit_no_prompt.names index c869bb6d06..240fac0896 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/exit_no_prompt.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/exit_no_prompt.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "exit_no_prompt", + "base": "exit_no_prompt", "context": "Method", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "exit_no_prompt", + "base": "exit_no_prompt", "context": "Global", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/exit_simulation_mode.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/exit_simulation_mode.names index e8b6419c7e..1fbf1ae15a 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/exit_simulation_mode.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/exit_simulation_mode.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "exit_simulation_mode", + "base": "exit_simulation_mode", "context": "Method", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "exit_simulation_mode", + "base": "exit_simulation_mode", "context": "Global", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/export_to_engine.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/export_to_engine.names index 8ada50e7a7..1201f008b6 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/export_to_engine.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/export_to_engine.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "export_to_engine", + "base": "export_to_engine", "context": "Method", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "export_to_engine", + "base": "export_to_engine", "context": "Global", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/find_editor_entity.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/find_editor_entity.names index c9ec658126..f4a6511cb0 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/find_editor_entity.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/find_editor_entity.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "find_editor_entity", + "base": "find_editor_entity", "context": "Method", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "find_editor_entity", + "base": "find_editor_entity", "context": "Global", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/find_game_entity.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/find_game_entity.names index bf1fe91241..49edae2728 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/find_game_entity.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/find_game_entity.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "find_game_entity", + "base": "find_game_entity", "context": "Method", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "find_game_entity", + "base": "find_game_entity", "context": "Global", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/freeze_object.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/freeze_object.names index c413c4a4c1..86902f625d 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/freeze_object.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/freeze_object.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "freeze_object", + "base": "freeze_object", "context": "Method", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "freeze_object", + "base": "freeze_object", "context": "Global", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_active_viewport.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_active_viewport.names index 23d8096ac1..d8df792445 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_active_viewport.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_active_viewport.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "get_active_viewport", + "base": "get_active_viewport", "context": "Method", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "get_active_viewport", + "base": "get_active_viewport", "context": "Global", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_all_objects.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_all_objects.names index b7686d1760..d39e48c0d9 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_all_objects.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_all_objects.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "get_all_objects", + "base": "get_all_objects", "context": "Method", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "get_all_objects", + "base": "get_all_objects", "context": "Global", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_axis_constraint.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_axis_constraint.names index d9073b1058..8b7e6c5217 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_axis_constraint.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_axis_constraint.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "get_axis_constraint", + "base": "get_axis_constraint", "context": "Method", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "get_axis_constraint", + "base": "get_axis_constraint", "context": "Global", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_config_platform.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_config_platform.names index 4b0e8ac35b..c330306110 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_config_platform.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_config_platform.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "get_config_platform", + "base": "get_config_platform", "context": "Method", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "get_config_platform", + "base": "get_config_platform", "context": "Global", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_config_spec.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_config_spec.names index 9dc53f4507..e20edd59c6 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_config_spec.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_config_spec.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "get_config_spec", + "base": "get_config_spec", "context": "Method", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "get_config_spec", + "base": "get_config_spec", "context": "Global", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_current_level_name.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_current_level_name.names index 365cba6b9e..8c8833b372 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_current_level_name.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_current_level_name.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "get_current_level_name", + "base": "get_current_level_name", "context": "Method", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "get_current_level_name", + "base": "get_current_level_name", "context": "Global", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_current_level_path.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_current_level_path.names index 82b407a8fe..846b236e48 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_current_level_path.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_current_level_path.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "get_current_level_path", + "base": "get_current_level_path", "context": "Method", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "get_current_level_path", + "base": "get_current_level_path", "context": "Global", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_current_view_position.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_current_view_position.names index a5e07d14d3..c5509b1cf9 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_current_view_position.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_current_view_position.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "get_current_view_position", + "base": "get_current_view_position", "context": "Method", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "get_current_view_position", + "base": "get_current_view_position", "context": "Global", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_current_view_rotation.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_current_view_rotation.names index 6be7bff047..f2de184318 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_current_view_rotation.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_current_view_rotation.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "get_current_view_rotation", + "base": "get_current_view_rotation", "context": "Method", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "get_current_view_rotation", + "base": "get_current_view_rotation", "context": "Global", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_cvar.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_cvar.names index 22d8fa62b4..e3acfc818b 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_cvar.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_cvar.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "get_cvar", + "base": "get_cvar", "context": "Method", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "get_cvar", + "base": "get_cvar", "context": "Global", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_file_alias.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_file_alias.names index 9a1d048865..f52c2db932 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_file_alias.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_file_alias.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "get_file_alias", + "base": "get_file_alias", "context": "Method", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "get_file_alias", + "base": "get_file_alias", "context": "Global", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_game_folder.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_game_folder.names index b2280925ff..67e6a1cebe 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_game_folder.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_game_folder.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "get_game_folder", + "base": "get_game_folder", "context": "Method", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "get_game_folder", + "base": "get_game_folder", "context": "Global", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_interpolated_value.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_interpolated_value.names index 3f5469407e..76229b6777 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_interpolated_value.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_interpolated_value.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "get_interpolated_value", + "base": "get_interpolated_value", "context": "Method", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "get_interpolated_value", + "base": "get_interpolated_value", "context": "Global", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_key_value.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_key_value.names index 69a7dcd7a4..25ff2b7731 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_key_value.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_key_value.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "get_key_value", + "base": "get_key_value", "context": "Method", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "get_key_value", + "base": "get_key_value", "context": "Global", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_misc_editor_settings.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_misc_editor_settings.names index 7759957362..613c0322cb 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_misc_editor_settings.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_misc_editor_settings.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "get_misc_editor_settings", + "base": "get_misc_editor_settings", "context": "Method", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "get_misc_editor_settings", + "base": "get_misc_editor_settings", "context": "Global", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_names_of_selected_objects.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_names_of_selected_objects.names index 6343079ee3..fd53f4eabb 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_names_of_selected_objects.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_names_of_selected_objects.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "get_names_of_selected_objects", + "base": "get_names_of_selected_objects", "context": "Method", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "get_names_of_selected_objects", + "base": "get_names_of_selected_objects", "context": "Global", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_node_name.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_node_name.names index abc8bc12b3..2ea9de8513 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_node_name.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_node_name.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "get_node_name", + "base": "get_node_name", "context": "Method", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "get_node_name", + "base": "get_node_name", "context": "Global", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_num_nodes.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_num_nodes.names index fea8d6d51e..87a6db5f5a 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_num_nodes.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_num_nodes.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "get_num_nodes", + "base": "get_num_nodes", "context": "Method", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "get_num_nodes", + "base": "get_num_nodes", "context": "Global", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_num_selected.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_num_selected.names index cd260f6dc8..3761118834 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_num_selected.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_num_selected.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "get_num_selected", + "base": "get_num_selected", "context": "Method", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "get_num_selected", + "base": "get_num_selected", "context": "Global", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_num_sequences.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_num_sequences.names index 7101578f9d..74ba982883 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_num_sequences.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_num_sequences.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "get_num_sequences", + "base": "get_num_sequences", "context": "Method", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "get_num_sequences", + "base": "get_num_sequences", "context": "Global", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_num_track_keys.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_num_track_keys.names index 06963345ee..cbaf89bc8c 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_num_track_keys.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_num_track_keys.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "get_num_track_keys", + "base": "get_num_track_keys", "context": "Method", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "get_num_track_keys", + "base": "get_num_track_keys", "context": "Global", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_pak_from_file.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_pak_from_file.names index 828f298ed9..ec00c17b40 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_pak_from_file.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_pak_from_file.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "get_pak_from_file", + "base": "get_pak_from_file", "context": "Method", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "get_pak_from_file", + "base": "get_pak_from_file", "context": "Global", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_pane_class_names.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_pane_class_names.names index d4d90062e7..52b66ebbb0 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_pane_class_names.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_pane_class_names.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "get_pane_class_names", + "base": "get_pane_class_names", "context": "Method", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "get_pane_class_names", + "base": "get_pane_class_names", "context": "Global", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_position.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_position.names index 9256be10cd..31de8b96dc 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_position.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_position.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "get_position", + "base": "get_position", "context": "Method", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "get_position", + "base": "get_position", "context": "Global", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_rotation.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_rotation.names index 9a0fc2c866..4d5c644b46 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_rotation.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_rotation.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "get_rotation", + "base": "get_rotation", "context": "Method", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "get_rotation", + "base": "get_rotation", "context": "Global", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_scale.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_scale.names index bca8c0935a..c444d34332 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_scale.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_scale.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "get_scale", + "base": "get_scale", "context": "Method", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "get_scale", + "base": "get_scale", "context": "Global", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_selection_aabb.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_selection_aabb.names index 8563f61cc9..e0835c4823 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_selection_aabb.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_selection_aabb.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "get_selection_aabb", + "base": "get_selection_aabb", "context": "Method", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "get_selection_aabb", + "base": "get_selection_aabb", "context": "Global", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_selection_center.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_selection_center.names index 9bd01010e4..445ef2d2ac 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_selection_center.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_selection_center.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "get_selection_center", + "base": "get_selection_center", "context": "Method", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "get_selection_center", + "base": "get_selection_center", "context": "Global", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_sequence_name.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_sequence_name.names index 3dbe9bc854..83482c09d2 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_sequence_name.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_sequence_name.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "get_sequence_name", + "base": "get_sequence_name", "context": "Method", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "get_sequence_name", + "base": "get_sequence_name", "context": "Global", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_sequence_time_range.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_sequence_time_range.names index ae8a229a75..2231d6c807 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_sequence_time_range.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_sequence_time_range.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "get_sequence_time_range", + "base": "get_sequence_time_range", "context": "Method", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "get_sequence_time_range", + "base": "get_sequence_time_range", "context": "Global", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_view_pane_layout.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_view_pane_layout.names index a149b94dd8..aa014dcab8 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_view_pane_layout.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_view_pane_layout.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "get_view_pane_layout", + "base": "get_view_pane_layout", "context": "Method", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "get_view_pane_layout", + "base": "get_view_pane_layout", "context": "Global", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_viewport_count.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_viewport_count.names index 7b616139ee..462816b556 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_viewport_count.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_viewport_count.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "get_viewport_count", + "base": "get_viewport_count", "context": "Method", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "get_viewport_count", + "base": "get_viewport_count", "context": "Global", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_viewport_expansion_policy.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_viewport_expansion_policy.names index 23d2dae3d3..04ee539630 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_viewport_expansion_policy.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_viewport_expansion_policy.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "get_viewport_expansion_policy", + "base": "get_viewport_expansion_policy", "context": "Method", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "get_viewport_expansion_policy", + "base": "get_viewport_expansion_policy", "context": "Global", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_viewport_size.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_viewport_size.names index 33cc93441d..254dce0763 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_viewport_size.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/get_viewport_size.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "get_viewport_size", + "base": "get_viewport_size", "context": "Method", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "get_viewport_size", + "base": "get_viewport_size", "context": "Global", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/hide_all_objects.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/hide_all_objects.names index 8d5d77a78f..61bc6e2f23 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/hide_all_objects.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/hide_all_objects.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "hide_all_objects", + "base": "hide_all_objects", "context": "Method", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "hide_all_objects", + "base": "hide_all_objects", "context": "Global", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/hide_object.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/hide_object.names index f30f0a4e37..4df0d7458b 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/hide_object.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/hide_object.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "hide_object", + "base": "hide_object", "context": "Method", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "hide_object", + "base": "hide_object", "context": "Global", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/idle_enable.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/idle_enable.names index 8ab9d80d37..751e63dad2 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/idle_enable.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/idle_enable.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "idle_enable", + "base": "idle_enable", "context": "Method", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "idle_enable", + "base": "idle_enable", "context": "Global", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/idle_is_enabled.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/idle_is_enabled.names index 35fccf8339..7a910121fb 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/idle_is_enabled.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/idle_is_enabled.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "idle_is_enabled", + "base": "idle_is_enabled", "context": "Method", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "idle_is_enabled", + "base": "idle_is_enabled", "context": "Global", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/idle_wait.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/idle_wait.names index 04574b306e..e90a794abb 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/idle_wait.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/idle_wait.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "idle_wait", + "base": "idle_wait", "context": "Method", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "idle_wait", + "base": "idle_wait", "context": "Global", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/idle_wait_frames.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/idle_wait_frames.names index bbbb2e2d6c..809ba3291a 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/idle_wait_frames.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/idle_wait_frames.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "idle_wait_frames", + "base": "idle_wait_frames", "context": "Method", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "idle_wait_frames", + "base": "idle_wait_frames", "context": "Global", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/is_helpers_shown.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/is_helpers_shown.names index 7945c6f747..bddddbf5f6 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/is_helpers_shown.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/is_helpers_shown.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "is_helpers_shown", + "base": "is_helpers_shown", "context": "Method", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "is_helpers_shown", + "base": "is_helpers_shown", "context": "Global", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/is_idle_enabled.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/is_idle_enabled.names index 82e2f26261..690c6a9e26 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/is_idle_enabled.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/is_idle_enabled.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "is_idle_enabled", + "base": "is_idle_enabled", "context": "Method", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "is_idle_enabled", + "base": "is_idle_enabled", "context": "Global", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/is_in_game_mode.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/is_in_game_mode.names index c190c8f51a..62612ae3f0 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/is_in_game_mode.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/is_in_game_mode.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "is_in_game_mode", + "base": "is_in_game_mode", "context": "Method", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "is_in_game_mode", + "base": "is_in_game_mode", "context": "Global", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/is_in_simulation_mode.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/is_in_simulation_mode.names index 1cbf43acde..f4ae7b054a 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/is_in_simulation_mode.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/is_in_simulation_mode.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "is_in_simulation_mode", + "base": "is_in_simulation_mode", "context": "Method", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "is_in_simulation_mode", + "base": "is_in_simulation_mode", "context": "Global", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/is_object_frozen.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/is_object_frozen.names index 7f8463fe2e..77c9aa1f3b 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/is_object_frozen.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/is_object_frozen.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "is_object_frozen", + "base": "is_object_frozen", "context": "Method", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "is_object_frozen", + "base": "is_object_frozen", "context": "Global", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/is_object_hidden.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/is_object_hidden.names index 05439afc23..46d6757c9f 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/is_object_hidden.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/is_object_hidden.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "is_object_hidden", + "base": "is_object_hidden", "context": "Method", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "is_object_hidden", + "base": "is_object_hidden", "context": "Global", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/is_pane_visible.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/is_pane_visible.names index 1c5ccdbbb9..1912f6cd4a 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/is_pane_visible.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/is_pane_visible.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "is_pane_visible", + "base": "is_pane_visible", "context": "Method", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "is_pane_visible", + "base": "is_pane_visible", "context": "Global", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/launch_lua_editor.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/launch_lua_editor.names index 6441e1bcbf..faf537d82c 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/launch_lua_editor.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/launch_lua_editor.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "launch_lua_editor", + "base": "launch_lua_editor", "context": "Method", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "launch_lua_editor", + "base": "launch_lua_editor", "context": "Global", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/load_all_plugins.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/load_all_plugins.names index 7dd292c231..ea52f9730f 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/load_all_plugins.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/load_all_plugins.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "load_all_plugins", + "base": "load_all_plugins", "context": "Method", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "load_all_plugins", + "base": "load_all_plugins", "context": "Global", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/log.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/log.names index 45ac6166f3..77d1490486 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/log.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/log.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "log", + "base": "log", "context": "Method", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "log", + "base": "log", "context": "Global", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/message_box.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/message_box.names index 934130445b..173dab3495 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/message_box.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/message_box.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "message_box", + "base": "message_box", "context": "Method", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "message_box", + "base": "message_box", "context": "Global", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/message_box_ok.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/message_box_ok.names index 41baa649e6..d743366a40 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/message_box_ok.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/message_box_ok.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "message_box_ok", + "base": "message_box_ok", "context": "Method", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "message_box_ok", + "base": "message_box_ok", "context": "Global", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/message_box_yes_no.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/message_box_yes_no.names index ddbdb555ce..4025735021 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/message_box_yes_no.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/message_box_yes_no.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "message_box_yes_no", + "base": "message_box_yes_no", "context": "Method", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "message_box_yes_no", + "base": "message_box_yes_no", "context": "Global", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/new_sequence.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/new_sequence.names index 2a3f847e54..39736db34c 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/new_sequence.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/new_sequence.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "new_sequence", + "base": "new_sequence", "context": "Method", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "new_sequence", + "base": "new_sequence", "context": "Global", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/open_file_box.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/open_file_box.names index 5f4f3c1149..859d6ddeae 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/open_file_box.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/open_file_box.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "open_file_box", + "base": "open_file_box", "context": "Method", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "open_file_box", + "base": "open_file_box", "context": "Global", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/open_level.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/open_level.names index 61e4630f84..2f3d6933bd 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/open_level.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/open_level.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "open_level", + "base": "open_level", "context": "Method", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "open_level", + "base": "open_level", "context": "Global", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/open_level_no_prompt.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/open_level_no_prompt.names index 10cbd7b1b9..51662f268d 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/open_level_no_prompt.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/open_level_no_prompt.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "open_level_no_prompt", + "base": "open_level_no_prompt", "context": "Method", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "open_level_no_prompt", + "base": "open_level_no_prompt", "context": "Global", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/open_pane.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/open_pane.names index 9f830cbee5..d438c7759f 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/open_pane.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/open_pane.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "open_pane", + "base": "open_pane", "context": "Method", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "open_pane", + "base": "open_pane", "context": "Global", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/play_sequence.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/play_sequence.names index 4d12503a1e..df1c6cb348 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/play_sequence.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/play_sequence.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "play_sequence", + "base": "play_sequence", "context": "Method", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "play_sequence", + "base": "play_sequence", "context": "Global", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/redo.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/redo.names index 463692b784..0a16085a12 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/redo.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/redo.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "redo", + "base": "redo", "context": "Method", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "redo", + "base": "redo", "context": "Global", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/reload_current_level.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/reload_current_level.names index f031946ef4..9d327766d3 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/reload_current_level.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/reload_current_level.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "reload_current_level", + "base": "reload_current_level", "context": "Method", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "reload_current_level", + "base": "reload_current_level", "context": "Global", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/rename_object.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/rename_object.names index 8ad522a4bb..4cd5fdb146 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/rename_object.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/rename_object.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "rename_object", + "base": "rename_object", "context": "Method", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "rename_object", + "base": "rename_object", "context": "Global", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/resize_viewport.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/resize_viewport.names index 799a539c9b..586f480591 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/resize_viewport.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/resize_viewport.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "resize_viewport", + "base": "resize_viewport", "context": "Method", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "resize_viewport", + "base": "resize_viewport", "context": "Global", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/run_console.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/run_console.names index be7fec1827..0454fdc37a 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/run_console.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/run_console.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "run_console", + "base": "run_console", "context": "Method", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "run_console", + "base": "run_console", "context": "Global", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/run_file.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/run_file.names index a3afd9cbe6..4724515921 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/run_file.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/run_file.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "run_file", + "base": "run_file", "context": "Method", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "run_file", + "base": "run_file", "context": "Global", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/run_file_parameters.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/run_file_parameters.names index 97ddd6da4d..6417544230 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/run_file_parameters.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/run_file_parameters.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "run_file_parameters", + "base": "run_file_parameters", "context": "Method", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "run_file_parameters", + "base": "run_file_parameters", "context": "Global", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/save_level.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/save_level.names index 4d857d6b8c..f96f70092a 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/save_level.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/save_level.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "save_level", + "base": "save_level", "context": "Method", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "save_level", + "base": "save_level", "context": "Global", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/select_object.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/select_object.names index 49d369b69d..c317cc8741 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/select_object.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/select_object.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "select_object", + "base": "select_object", "context": "Method", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "select_object", + "base": "select_object", "context": "Global", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/select_objects.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/select_objects.names index f2ba054656..30582c5674 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/select_objects.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/select_objects.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "select_objects", + "base": "select_objects", "context": "Method", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "select_objects", + "base": "select_objects", "context": "Global", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/set_active_viewport.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/set_active_viewport.names index 6e39f72c7a..dec588e357 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/set_active_viewport.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/set_active_viewport.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "set_active_viewport", + "base": "set_active_viewport", "context": "Method", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "set_active_viewport", + "base": "set_active_viewport", "context": "Global", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/set_axis_constraint.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/set_axis_constraint.names index 976102bf40..df895c8aec 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/set_axis_constraint.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/set_axis_constraint.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "set_axis_constraint", + "base": "set_axis_constraint", "context": "Method", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "set_axis_constraint", + "base": "set_axis_constraint", "context": "Global", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/set_config_spec.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/set_config_spec.names index 3b6db1b770..61f95d9a04 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/set_config_spec.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/set_config_spec.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "set_config_spec", + "base": "set_config_spec", "context": "Method", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "set_config_spec", + "base": "set_config_spec", "context": "Global", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/set_current_sequence.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/set_current_sequence.names index 39d766270b..aa878daf01 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/set_current_sequence.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/set_current_sequence.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "set_current_sequence", + "base": "set_current_sequence", "context": "Method", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "set_current_sequence", + "base": "set_current_sequence", "context": "Global", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/set_current_view_position.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/set_current_view_position.names index d3d6c11b6d..7639083302 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/set_current_view_position.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/set_current_view_position.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "set_current_view_position", + "base": "set_current_view_position", "context": "Method", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "set_current_view_position", + "base": "set_current_view_position", "context": "Global", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/set_current_view_rotation.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/set_current_view_rotation.names index 528a8c067d..afffc8bc0f 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/set_current_view_rotation.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/set_current_view_rotation.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "set_current_view_rotation", + "base": "set_current_view_rotation", "context": "Method", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "set_current_view_rotation", + "base": "set_current_view_rotation", "context": "Global", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/set_cvar.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/set_cvar.names index 1bf5764d4d..181d11bef8 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/set_cvar.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/set_cvar.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "set_cvar", + "base": "set_cvar", "context": "Method", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "set_cvar", + "base": "set_cvar", "context": "Global", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/set_cvar_float.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/set_cvar_float.names index cc310cc8a9..c788a79edc 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/set_cvar_float.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/set_cvar_float.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "set_cvar_float", + "base": "set_cvar_float", "context": "Method", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "set_cvar_float", + "base": "set_cvar_float", "context": "Global", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/set_cvar_integer.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/set_cvar_integer.names index 032fe7cc99..f5ec182a8a 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/set_cvar_integer.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/set_cvar_integer.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "set_cvar_integer", + "base": "set_cvar_integer", "context": "Method", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "set_cvar_integer", + "base": "set_cvar_integer", "context": "Global", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/set_cvar_string.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/set_cvar_string.names index a5f7742511..f096f5528f 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/set_cvar_string.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/set_cvar_string.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "set_cvar_string", + "base": "set_cvar_string", "context": "Method", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "set_cvar_string", + "base": "set_cvar_string", "context": "Global", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/set_misc_editor_settings.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/set_misc_editor_settings.names index 3c1367794d..00adf7c80f 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/set_misc_editor_settings.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/set_misc_editor_settings.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "set_misc_editor_settings", + "base": "set_misc_editor_settings", "context": "Method", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "set_misc_editor_settings", + "base": "set_misc_editor_settings", "context": "Global", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/set_position.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/set_position.names index f37822b1df..fc9d588b4d 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/set_position.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/set_position.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "set_position", + "base": "set_position", "context": "Method", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "set_position", + "base": "set_position", "context": "Global", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/set_recording.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/set_recording.names index 602dab9b4e..80c0825e98 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/set_recording.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/set_recording.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "set_recording", + "base": "set_recording", "context": "Method", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "set_recording", + "base": "set_recording", "context": "Global", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/set_result_to_failure.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/set_result_to_failure.names index 27678d2797..5ee0d43f1f 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/set_result_to_failure.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/set_result_to_failure.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "set_result_to_failure", + "base": "set_result_to_failure", "context": "Method", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "set_result_to_failure", + "base": "set_result_to_failure", "context": "Global", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/set_result_to_success.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/set_result_to_success.names index 8cd35d8c2c..1abb4b73f1 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/set_result_to_success.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/set_result_to_success.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "set_result_to_success", + "base": "set_result_to_success", "context": "Method", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "set_result_to_success", + "base": "set_result_to_success", "context": "Global", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/set_rotation.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/set_rotation.names index 796a6d4c20..c4024f2fc3 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/set_rotation.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/set_rotation.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "set_rotation", + "base": "set_rotation", "context": "Method", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "set_rotation", + "base": "set_rotation", "context": "Global", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/set_scale.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/set_scale.names index edbb104612..9f2072047c 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/set_scale.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/set_scale.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "set_scale", + "base": "set_scale", "context": "Method", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "set_scale", + "base": "set_scale", "context": "Global", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/set_sequence_time_range.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/set_sequence_time_range.names index aa0d3839c6..5d48f6e909 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/set_sequence_time_range.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/set_sequence_time_range.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "set_sequence_time_range", + "base": "set_sequence_time_range", "context": "Method", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "set_sequence_time_range", + "base": "set_sequence_time_range", "context": "Global", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/set_time.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/set_time.names index 85ad69a1d7..7cec862361 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/set_time.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/set_time.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "set_time", + "base": "set_time", "context": "Method", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "set_time", + "base": "set_time", "context": "Global", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/set_view_pane_layout.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/set_view_pane_layout.names index 622b51ca4b..bedaf68083 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/set_view_pane_layout.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/set_view_pane_layout.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "set_view_pane_layout", + "base": "set_view_pane_layout", "context": "Method", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "set_view_pane_layout", + "base": "set_view_pane_layout", "context": "Global", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/set_viewport_expansion_policy.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/set_viewport_expansion_policy.names index 7e4ac4e305..cbcfd8722b 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/set_viewport_expansion_policy.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/set_viewport_expansion_policy.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "set_viewport_expansion_policy", + "base": "set_viewport_expansion_policy", "context": "Method", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "set_viewport_expansion_policy", + "base": "set_viewport_expansion_policy", "context": "Global", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/set_viewport_size.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/set_viewport_size.names index e5bc133444..473499e785 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/set_viewport_size.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/set_viewport_size.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "set_viewport_size", + "base": "set_viewport_size", "context": "Method", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "set_viewport_size", + "base": "set_viewport_size", "context": "Global", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/start_process_detached.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/start_process_detached.names index df5e6182a2..284efd4cb1 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/start_process_detached.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/start_process_detached.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "start_process_detached", + "base": "start_process_detached", "context": "Method", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "start_process_detached", + "base": "start_process_detached", "context": "Global", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/stop_sequence.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/stop_sequence.names index 63f38ab444..8bd02f3962 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/stop_sequence.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/stop_sequence.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "stop_sequence", + "base": "stop_sequence", "context": "Method", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "stop_sequence", + "base": "stop_sequence", "context": "Global", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/test_output.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/test_output.names index acd55d4b22..472f548239 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/test_output.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/test_output.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "test_output", + "base": "test_output", "context": "Method", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "test_output", + "base": "test_output", "context": "Global", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/toggle_helpers.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/toggle_helpers.names index 0afcc9d471..f3d5f14365 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/toggle_helpers.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/toggle_helpers.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "toggle_helpers", + "base": "toggle_helpers", "context": "Method", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "toggle_helpers", + "base": "toggle_helpers", "context": "Global", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/undo.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/undo.names index 3fb0afdbf4..9b222815c6 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/undo.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/undo.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "undo", + "base": "undo", "context": "Method", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "undo", + "base": "undo", "context": "Global", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/unfreeze_object.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/unfreeze_object.names index ad29537ab6..5b1d3c5d5c 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/unfreeze_object.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/unfreeze_object.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "unfreeze_object", + "base": "unfreeze_object", "context": "Method", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "unfreeze_object", + "base": "unfreeze_object", "context": "Global", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/unhide_all_objects.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/unhide_all_objects.names index 204e2a3fbc..c2526a981a 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/unhide_all_objects.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/unhide_all_objects.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "unhide_all_objects", + "base": "unhide_all_objects", "context": "Method", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "unhide_all_objects", + "base": "unhide_all_objects", "context": "Global", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/unhide_object.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/unhide_object.names index 22a74940a8..d15ceed4bb 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/unhide_object.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/unhide_object.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "unhide_object", + "base": "unhide_object", "context": "Method", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "unhide_object", + "base": "unhide_object", "context": "Global", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/unselect_objects.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/unselect_objects.names index f0052c8c3d..19b8dba917 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/unselect_objects.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/unselect_objects.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "unselect_objects", + "base": "unselect_objects", "context": "Method", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "unselect_objects", + "base": "unselect_objects", "context": "Global", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/update_viewport.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/update_viewport.names index da63239c14..d31ccb6f5a 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/update_viewport.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/update_viewport.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "update_viewport", + "base": "update_viewport", "context": "Method", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "update_viewport", + "base": "update_viewport", "context": "Global", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/wait_for_debugger.names b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/wait_for_debugger.names index 1000a983b8..a8d361cd31 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/wait_for_debugger.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/GlobalMethods/wait_for_debugger.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "wait_for_debugger", + "base": "wait_for_debugger", "context": "Method", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "wait_for_debugger", + "base": "wait_for_debugger", "context": "Global", "entry": { "name": "In", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Globals.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Globals.names index 1b93f04513..678897118c 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Globals.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Globals.names @@ -1,7 +1,7 @@ { "entries" : [ { - "key": "EBusSenderBusId", + "base": "EBusSenderBusId", "context": "Globals", "details": { "name": "Source", @@ -9,7 +9,7 @@ } }, { - "key": "EBusHandlerBusId", + "base": "EBusHandlerBusId", "context": "Globals", "details": { @@ -18,7 +18,7 @@ } }, { - "key": "MissingFunction", + "base": "MissingFunction", "context": "Globals", "details": { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Containers_AddElementatEnd.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Containers_AddElementatEnd.names index 0d072e6ea8..30d402f254 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Containers_AddElementatEnd.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Containers_AddElementatEnd.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{11DDEEC1-7111-4655-B47F-8F0372B1A1A9}", + "base": "{11DDEEC1-7111-4655-B47F-8F0372B1A1A9}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -12,26 +12,26 @@ }, "slots": [ { - "key": "DataInput_Source", + "base": "DataInput_Source", "details": { "name": "Source" } }, { - "key": "DataOutput_Container", + "base": "DataOutput_Container", "details": { "name": "Container" } }, { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In", "tooltip": "Input signal" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out", "tooltip": "Output signal" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Containers_ClearAllElements.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Containers_ClearAllElements.names index b47f53879c..4e071c5e32 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Containers_ClearAllElements.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Containers_ClearAllElements.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{26DDC284-BD01-471E-BA8F-36C3A1ADA169}", + "base": "{26DDC284-BD01-471E-BA8F-36C3A1ADA169}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -12,25 +12,25 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Source", + "base": "DataInput_Source", "details": { "name": "Source" } }, { - "key": "DataOutput_Container", + "base": "DataOutput_Container", "details": { "name": "Container" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Containers_Erase.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Containers_Erase.names index e383061fa8..601836b23d 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Containers_Erase.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Containers_Erase.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{F1A891C9-81D4-4675-A57A-F11AB415F95F}", + "base": "{F1A891C9-81D4-4675-A57A-F11AB415F95F}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -12,33 +12,33 @@ }, "slots": [ { - "key": "DataInput_Source", + "base": "DataInput_Source", "details": { "name": "Source" } }, { - "key": "DataOutput_Container", + "base": "DataOutput_Container", "details": { "name": "Container" } }, { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In", "tooltip": "Input signal" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out", "tooltip": "Output signal" } }, { - "key": "Output_Element Not Found", + "base": "Output_Element Not Found", "details": { "name": "Element Not Found", "tooltip": "Triggered if the specified element was not found" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Containers_ForEach.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Containers_ForEach.names index a2761b6317..817bbf8e17 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Containers_ForEach.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Containers_ForEach.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{31823035-A3FF-4B8D-A3A6-819519478B7C}", + "base": "{31823035-A3FF-4B8D-A3A6-819519478B7C}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,34 +11,34 @@ }, "slots": [ { - "key": "DataInput_Source", + "base": "DataInput_Source", "details": { "name": "Source" } }, { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In", "tooltip": "Signaled upon node entry" } }, { - "key": "Input_Break", + "base": "Input_Break", "details": { "name": "Break", "tooltip": "Stops the iteration when signaled" } }, { - "key": "Output_Each", + "base": "Output_Each", "details": { "name": "Each", "tooltip": "Signalled after each element of the container" } }, { - "key": "Output_Finished", + "base": "Output_Finished", "details": { "name": "Finished", "tooltip": "The container has been fully iterated over" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Containers_GetElement.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Containers_GetElement.names index 78e2fa80bb..fab464a029 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Containers_GetElement.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Containers_GetElement.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{6A4FE29F-3BAA-40D6-8BEE-CDE9CCBD7885}", + "base": "{6A4FE29F-3BAA-40D6-8BEE-CDE9CCBD7885}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -12,27 +12,27 @@ }, "slots": [ { - "key": "DataInput_Source", + "base": "DataInput_Source", "details": { "name": "Source" } }, { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In", "tooltip": "Input signal" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out", "tooltip": "Output signal" } }, { - "key": "Output_Key Not Found", + "base": "Output_Key Not Found", "details": { "name": "Key Not Found", "tooltip": "Triggered if the specified key was not found" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Containers_GetFirstElement.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Containers_GetFirstElement.names index 0caeac4589..fa616642b4 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Containers_GetFirstElement.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Containers_GetFirstElement.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{B0E10176-5DFE-4D34-BEF8-7EB575929CE7}", + "base": "{B0E10176-5DFE-4D34-BEF8-7EB575929CE7}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -12,20 +12,20 @@ }, "slots": [ { - "key": "DataInput_Source", + "base": "DataInput_Source", "details": { "name": "Source" } }, { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In", "tooltip": "Input signal" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out", "tooltip": "Output signal" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Containers_GetLastElement.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Containers_GetLastElement.names index cf9a85190a..2c13a87d7b 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Containers_GetLastElement.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Containers_GetLastElement.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{B7E79DC5-21DA-4001-8284-85707C71C29B}", + "base": "{B7E79DC5-21DA-4001-8284-85707C71C29B}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -12,20 +12,20 @@ }, "slots": [ { - "key": "DataInput_Source", + "base": "DataInput_Source", "details": { "name": "Source" } }, { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In", "tooltip": "Input signal" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out", "tooltip": "Output signal" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Containers_GetSize.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Containers_GetSize.names index 2f79842f7b..1f7dbdad03 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Containers_GetSize.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Containers_GetSize.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{981EA18E-F421-4B39-9FF7-27322F3E8B14}", + "base": "{981EA18E-F421-4B39-9FF7-27322F3E8B14}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -12,25 +12,25 @@ }, "slots": [ { - "key": "DataOutput_Size", + "base": "DataOutput_Size", "details": { "name": "Size" } }, { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Source", + "base": "DataInput_Source", "details": { "name": "Source" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Containers_Insert.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Containers_Insert.names index 1aaf93f172..347510eeeb 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Containers_Insert.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Containers_Insert.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{122B30C9-30A6-4CAF-B4E3-327A6C1A1E38}", + "base": "{122B30C9-30A6-4CAF-B4E3-327A6C1A1E38}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -12,26 +12,26 @@ }, "slots": [ { - "key": "DataInput_Source", + "base": "DataInput_Source", "details": { "name": "Source" } }, { - "key": "DataOutput_Container", + "base": "DataOutput_Container", "details": { "name": "Container" } }, { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In", "tooltip": "Input signal" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out", "tooltip": "Output signal" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Containers_IsEmpty.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Containers_IsEmpty.names index 80ea4073b0..a3254521e2 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Containers_IsEmpty.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Containers_IsEmpty.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{670FCD62-BAA8-4812-9CF2-C3F2EC5F54F5}", + "base": "{670FCD62-BAA8-4812-9CF2-C3F2EC5F54F5}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -12,39 +12,39 @@ }, "slots": [ { - "key": "DataOutput_Is Empty", + "base": "DataOutput_Is Empty", "details": { "name": "Is Empty" } }, { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "Output_True", + "base": "Output_True", "details": { "name": "True", "tooltip": "The container is empty" } }, { - "key": "Output_False", + "base": "Output_False", "details": { "name": "False", "tooltip": "The container is not empty" } }, { - "key": "DataInput_Source", + "base": "DataInput_Source", "details": { "name": "Source" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Core_AZEventHandler.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Core_AZEventHandler.names index fad144c78d..af1e8efe7a 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Core_AZEventHandler.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Core_AZEventHandler.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{38B808C5-152C-4643-A08C-463EBED55E19}", + "base": "{38B808C5-152C-4643-A08C-463EBED55E19}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,35 +11,35 @@ }, "slots": [ { - "key": "Input_Connect", + "base": "Input_Connect", "details": { "name": "Connect", "tooltip": "Connect the AZ Event to this AZ Event Handler." } }, { - "key": "Input_Disconnect", + "base": "Input_Disconnect", "details": { "name": "Disconnect", "tooltip": "Disconnect current AZ Event from this AZ Event Handler." } }, { - "key": "Output_On Connected", + "base": "Output_On Connected", "details": { "name": "On Connected", "tooltip": "Signaled when a connection has taken place." } }, { - "key": "Output_On Disconnected", + "base": "Output_On Disconnected", "details": { "name": "On Disconnected", "tooltip": "Signaled when this event handler is disconnected." } }, { - "key": "Output_OnEvent", + "base": "Output_OnEvent", "details": { "name": "OnEvent", "tooltip": "Triggered when the AZ Event invokes Signal() function." diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Core_EventHandler.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Core_EventHandler.names index f48256fc26..1a09bb23d9 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Core_EventHandler.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Core_EventHandler.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{33E12915-EFCA-4AA7-A188-D694DAD58980}", + "base": "{33E12915-EFCA-4AA7-A188-D694DAD58980}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,35 +11,35 @@ }, "slots": [ { - "key": "Input_Connect", + "base": "Input_Connect", "details": { "name": "Connect", "tooltip": "Connect this event handler to the specified entity." } }, { - "key": "Input_Disconnect", + "base": "Input_Disconnect", "details": { "name": "Disconnect", "tooltip": "Disconnect this event handler." } }, { - "key": "Output_OnConnected", + "base": "Output_OnConnected", "details": { "name": "OnConnected", "tooltip": "Signaled when a connection has taken place." } }, { - "key": "Output_OnDisconnected", + "base": "Output_OnDisconnected", "details": { "name": "OnDisconnected", "tooltip": "Signaled when this event handler is disconnected." } }, { - "key": "Output_OnFailure", + "base": "Output_OnFailure", "details": { "name": "OnFailure", "tooltip": "Signaled when it is not possible to connect this handler." diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Core_FunctionCallNode.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Core_FunctionCallNode.names index ee37919f03..6d7518a9f2 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Core_FunctionCallNode.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Core_FunctionCallNode.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{ECFDD30E-A16D-4435-97B7-B2A4DF3C543A}", + "base": "{ECFDD30E-A16D-4435-97B7-B2A4DF3C543A}", "context": "ScriptCanvas::Node", "variant": "", "details": { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Core_FunctionDefinition.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Core_FunctionDefinition.names index 6a92f74240..da666253e6 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Core_FunctionDefinition.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Core_FunctionDefinition.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{4EE28D9F-67FB-4E61-B777-5DC5B059710F}", + "base": "{4EE28D9F-67FB-4E61-B777-5DC5B059710F}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -12,13 +12,13 @@ }, "slots": [ { - "key": "Input_ ", + "base": "Input_ ", "details": { "name": " " } }, { - "key": "Output_ ", + "base": "Output_ ", "details": { "name": " " } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Core_Method.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Core_Method.names index bcf7aa9fc1..a3caeb6440 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Core_Method.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Core_Method.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{E42861BD-1956-45AE-8DD7-CCFC1E3E5ACF}", + "base": "{E42861BD-1956-45AE-8DD7-CCFC1E3E5ACF}", "context": "ScriptCanvas::Node", "variant": "", "details": { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Core_MethodOverloaded.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Core_MethodOverloaded.names index 75b1a6e9ff..8c778bf0b6 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Core_MethodOverloaded.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Core_MethodOverloaded.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{C1E3C9D0-42E3-4D00-AE73-2A881E7E76A8}", + "base": "{C1E3C9D0-42E3-4D00-AE73-2A881E7E76A8}", "context": "ScriptCanvas::Node", "variant": "", "details": { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Core_Nodeling.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Core_Nodeling.names index 1de4824300..58dd499c58 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Core_Nodeling.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Core_Nodeling.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{4413EEA0-8D81-4D61-A1E1-3C1A437F3643}", + "base": "{4413EEA0-8D81-4D61-A1E1-3C1A437F3643}", "context": "ScriptCanvas::Node", "variant": "", "details": { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Core_ReceiveScriptEvent.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Core_ReceiveScriptEvent.names index a8bb3559df..ee0a92ccae 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Core_ReceiveScriptEvent.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Core_ReceiveScriptEvent.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{76CF9938-4A7E-4CDA-8DF3-77C10239D99C}", + "base": "{76CF9938-4A7E-4CDA-8DF3-77C10239D99C}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,35 +11,35 @@ }, "slots": [ { - "key": "Input_Connect", + "base": "Input_Connect", "details": { "name": "Connect", "tooltip": "Connect this event handler to the specified entity." } }, { - "key": "Input_Disconnect", + "base": "Input_Disconnect", "details": { "name": "Disconnect", "tooltip": "Disconnect this event handler." } }, { - "key": "Output_OnConnected", + "base": "Output_OnConnected", "details": { "name": "OnConnected", "tooltip": "Signaled when a connection has taken place." } }, { - "key": "Output_OnDisconnected", + "base": "Output_OnDisconnected", "details": { "name": "OnDisconnected", "tooltip": "Signaled when this event handler is disconnected." } }, { - "key": "Output_OnFailure", + "base": "Output_OnFailure", "details": { "name": "OnFailure", "tooltip": "Signaled when it is not possible to connect this handler." diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Core_SendScriptEvent.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Core_SendScriptEvent.names index 6d1949f5de..d5faa52c52 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Core_SendScriptEvent.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Core_SendScriptEvent.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{64A97CC3-2BEA-4B47-809B-6C7DA34FD00F}", + "base": "{64A97CC3-2BEA-4B47-809B-6C7DA34FD00F}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,14 +11,14 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In", "tooltip": "Fires the specified ScriptEvent when signaled" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out", "tooltip": "Trigged after the ScriptEvent has been signaled and returns" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Deprecated_Add.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Deprecated_Add.names index f3535c9627..e78805904d 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Deprecated_Add.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Deprecated_Add.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{2AFC1F99-6216-58E1-9E06-7F0E50C64E53}", + "base": "{2AFC1F99-6216-58E1-9E06-7F0E50C64E53}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -12,31 +12,31 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Matrix3x3: A", + "base": "DataInput_Matrix3x3: A", "details": { "name": "Matrix3x3: A" } }, { - "key": "DataInput_Matrix3x3: B", + "base": "DataInput_Matrix3x3: B", "details": { "name": "Matrix3x3: B" } }, { - "key": "DataOutput_Result: Matrix3x3", + "base": "DataOutput_Result: Matrix3x3", "details": { "name": "Result: Matrix3x3" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Deprecated_DivideByNumber.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Deprecated_DivideByNumber.names index 2ed99278ea..32e7e9b9ca 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Deprecated_DivideByNumber.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Deprecated_DivideByNumber.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{397FA4E6-72E7-51EB-A546-70415FCCE4B0}", + "base": "{397FA4E6-72E7-51EB-A546-70415FCCE4B0}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -12,31 +12,31 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Matrix3x3: Source", + "base": "DataInput_Matrix3x3: Source", "details": { "name": "Matrix3x3: Source" } }, { - "key": "DataInput_Number: Divisor", + "base": "DataInput_Number: Divisor", "details": { "name": "Number: Divisor" } }, { - "key": "DataOutput_Result: Matrix3x3", + "base": "DataOutput_Result: Matrix3x3", "details": { "name": "Result: Matrix3x3" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Deprecated_DivideByVector.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Deprecated_DivideByVector.names index 047ddaf2cd..d0fbd8fefb 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Deprecated_DivideByVector.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Deprecated_DivideByVector.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{57BA2085-2225-5E7E-B132-9CCD0AFC55EA}", + "base": "{57BA2085-2225-5E7E-B132-9CCD0AFC55EA}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -12,31 +12,31 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Vector3: Numerator", + "base": "DataInput_Vector3: Numerator", "details": { "name": "Vector3: Numerator" } }, { - "key": "DataInput_Vector3: Divisor", + "base": "DataInput_Vector3: Divisor", "details": { "name": "Vector3: Divisor" } }, { - "key": "DataOutput_Result: Vector3", + "base": "DataOutput_Result: Vector3", "details": { "name": "Result: Vector3" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Deprecated_Length.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Deprecated_Length.names index c1bd57ec2d..1f534b7480 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Deprecated_Length.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Deprecated_Length.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{F269F2DB-F2D8-515D-BA5C-4C9E28A725E3}", + "base": "{F269F2DB-F2D8-515D-BA5C-4C9E28A725E3}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -12,25 +12,25 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Quaternion: Source", + "base": "DataInput_Quaternion: Source", "details": { "name": "Quaternion: Source" } }, { - "key": "DataOutput_Result: Number", + "base": "DataOutput_Result: Number", "details": { "name": "Result: Number" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Deprecated_MultiplyByColor.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Deprecated_MultiplyByColor.names index 3b78e5ec29..b5330e253a 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Deprecated_MultiplyByColor.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Deprecated_MultiplyByColor.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{8EE5053F-63BF-5E73-A88F-BD09C09DA9DB}", + "base": "{8EE5053F-63BF-5E73-A88F-BD09C09DA9DB}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -12,31 +12,31 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Color: A", + "base": "DataInput_Color: A", "details": { "name": "Color: A" } }, { - "key": "DataInput_Color: B", + "base": "DataInput_Color: B", "details": { "name": "Color: B" } }, { - "key": "DataOutput_Result: Color", + "base": "DataOutput_Result: Color", "details": { "name": "Result: Color" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Deprecated_MultiplyByMatrix.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Deprecated_MultiplyByMatrix.names index 5e5ebdf865..934d7deea7 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Deprecated_MultiplyByMatrix.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Deprecated_MultiplyByMatrix.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{FDB0FF00-F185-5CCF-851A-BBD5116C43EC}", + "base": "{FDB0FF00-F185-5CCF-851A-BBD5116C43EC}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -12,31 +12,31 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Matrix3x3: A", + "base": "DataInput_Matrix3x3: A", "details": { "name": "Matrix3x3: A" } }, { - "key": "DataInput_Matrix3x3: B", + "base": "DataInput_Matrix3x3: B", "details": { "name": "Matrix3x3: B" } }, { - "key": "DataOutput_Result: Matrix3x3", + "base": "DataOutput_Result: Matrix3x3", "details": { "name": "Result: Matrix3x3" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Deprecated_MultiplyByRotation.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Deprecated_MultiplyByRotation.names index 0dd6bdd33e..fa8a381927 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Deprecated_MultiplyByRotation.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Deprecated_MultiplyByRotation.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{F2A25BFC-41AA-5F9F-ABDF-48B662349AD6}", + "base": "{F2A25BFC-41AA-5F9F-ABDF-48B662349AD6}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -12,31 +12,31 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Quaternion: A", + "base": "DataInput_Quaternion: A", "details": { "name": "Quaternion: A" } }, { - "key": "DataInput_Quaternion: B", + "base": "DataInput_Quaternion: B", "details": { "name": "Quaternion: B" } }, { - "key": "DataOutput_Result: Quaternion", + "base": "DataOutput_Result: Quaternion", "details": { "name": "Result: Quaternion" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Deprecated_MultiplyByTransform.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Deprecated_MultiplyByTransform.names index 9f62840b3e..946f79aa5e 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Deprecated_MultiplyByTransform.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Deprecated_MultiplyByTransform.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{65B35991-D740-5DE6-815D-4FF5A24F08FD}", + "base": "{65B35991-D740-5DE6-815D-4FF5A24F08FD}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -12,31 +12,31 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Transform: A", + "base": "DataInput_Transform: A", "details": { "name": "Transform: A" } }, { - "key": "DataInput_Transform: B", + "base": "DataInput_Transform: B", "details": { "name": "Transform: B" } }, { - "key": "DataOutput_Result: Transform", + "base": "DataOutput_Result: Transform", "details": { "name": "Result: Transform" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Deprecated_MultiplyByVector.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Deprecated_MultiplyByVector.names index 9f9a08d3e4..70747caf68 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Deprecated_MultiplyByVector.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Deprecated_MultiplyByVector.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{111CD1EE-A5E8-583B-B339-FD48AFE7341C}", + "base": "{111CD1EE-A5E8-583B-B339-FD48AFE7341C}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -12,31 +12,31 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Vector4: Source", + "base": "DataInput_Vector4: Source", "details": { "name": "Vector4: Source" } }, { - "key": "DataInput_Vector4: Multiplier", + "base": "DataInput_Vector4: Multiplier", "details": { "name": "Vector4: Multiplier" } }, { - "key": "DataOutput_Result: Vector4", + "base": "DataOutput_Result: Vector4", "details": { "name": "Result: Vector4" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Deprecated_Negate.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Deprecated_Negate.names index c2fa0e5b4e..4f209d49d4 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Deprecated_Negate.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Deprecated_Negate.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{E2BE3BC4-5C86-5425-981D-E6A5EECC2C0C}", + "base": "{E2BE3BC4-5C86-5425-981D-E6A5EECC2C0C}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -12,25 +12,25 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Color: Source", + "base": "DataInput_Color: Source", "details": { "name": "Color: Source" } }, { - "key": "DataOutput_Result: Color", + "base": "DataOutput_Result: Color", "details": { "name": "Result: Color" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Deprecated_Subtract.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Deprecated_Subtract.names index 324007d226..ddd6536be0 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Deprecated_Subtract.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Deprecated_Subtract.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{C94009EE-73ED-5CA2-B1AC-026EB08D1EF5}", + "base": "{C94009EE-73ED-5CA2-B1AC-026EB08D1EF5}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -12,31 +12,31 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Vector3: A", + "base": "DataInput_Vector3: A", "details": { "name": "Vector3: A" } }, { - "key": "DataInput_Vector3: B", + "base": "DataInput_Vector3: B", "details": { "name": "Vector3: B" } }, { - "key": "DataOutput_Result: Vector3", + "base": "DataOutput_Result: Vector3", "details": { "name": "Result: Vector3" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Developer_Mock.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Developer_Mock.names index 4e33483463..28d26f5b30 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Developer_Mock.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Developer_Mock.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{91B3D89A-4A4B-49FF-AD91-CAAC49E141A8}", + "base": "{91B3D89A-4A4B-49FF-AD91-CAAC49E141A8}", "context": "ScriptCanvas::Node", "variant": "", "details": { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Developer_WrapperMock.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Developer_WrapperMock.names index 156e80f7a8..de6117ff88 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Developer_WrapperMock.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Developer_WrapperMock.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{14C6CE68-906A-4D2F-89BA-153774CE8015}", + "base": "{14C6CE68-906A-4D2F-89BA-153774CE8015}", "context": "ScriptCanvas::Node", "variant": "", "details": { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/EntityEntity_GetEntityForward.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/EntityEntity_GetEntityForward.names index 3b3b996f45..582552020f 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/EntityEntity_GetEntityForward.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/EntityEntity_GetEntityForward.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{1657EA13-3DAF-5E38-8964-D4480017C601}", + "base": "{1657EA13-3DAF-5E38-8964-D4480017C601}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,31 +11,31 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_EntityId", + "base": "DataInput_EntityId", "details": { "name": "EntityId" } }, { - "key": "DataInput_Scale", + "base": "DataInput_Scale", "details": { "name": "Scale" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/EntityEntity_GetEntityRight.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/EntityEntity_GetEntityRight.names index f2888839db..1d8a2958e5 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/EntityEntity_GetEntityRight.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/EntityEntity_GetEntityRight.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{6DE350DE-4FB9-5D7C-816A-48A3371613F3}", + "base": "{6DE350DE-4FB9-5D7C-816A-48A3371613F3}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,31 +11,31 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_EntityId", + "base": "DataInput_EntityId", "details": { "name": "EntityId" } }, { - "key": "DataInput_Scale", + "base": "DataInput_Scale", "details": { "name": "Scale" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/EntityEntity_GetEntityUp.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/EntityEntity_GetEntityUp.names index d42ab7e908..55e4e5c419 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/EntityEntity_GetEntityUp.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/EntityEntity_GetEntityUp.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{B091D01E-170D-5FCC-9525-89CED4CDAB27}", + "base": "{B091D01E-170D-5FCC-9525-89CED4CDAB27}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,31 +11,31 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_EntityId", + "base": "DataInput_EntityId", "details": { "name": "EntityId" } }, { - "key": "DataInput_Scale", + "base": "DataInput_Scale", "details": { "name": "Scale" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/EntityEntity_IsActive.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/EntityEntity_IsActive.names index f43c9385e7..5969f5e851 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/EntityEntity_IsActive.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/EntityEntity_IsActive.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{E15BFD9C-5DD0-5BA9-8573-E3D38CC9ACD0}", + "base": "{E15BFD9C-5DD0-5BA9-8573-E3D38CC9ACD0}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,25 +11,25 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Entity Id", + "base": "DataInput_Entity Id", "details": { "name": "Entity Id" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/EntityEntity_IsValid.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/EntityEntity_IsValid.names index 19d8fab52e..5f8783a4d6 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/EntityEntity_IsValid.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/EntityEntity_IsValid.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{54817D10-8D9E-5801-A507-8A2CE16F94E4}", + "base": "{54817D10-8D9E-5801-A507-8A2CE16F94E4}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,25 +11,25 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Source", + "base": "DataInput_Source", "details": { "name": "Source" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/EntityEntity_ToString.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/EntityEntity_ToString.names index 2d9f1e3c77..1c2d36859d 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/EntityEntity_ToString.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/EntityEntity_ToString.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{BFC3DC19-979B-5277-8B42-00FCF0CCF52D}", + "base": "{BFC3DC19-979B-5277-8B42-00FCF0CCF52D}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,25 +11,25 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Source", + "base": "DataInput_Source", "details": { "name": "Source" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Input_InputHandler.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Input_InputHandler.names index 3c875880c4..e11a54b639 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Input_InputHandler.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Input_InputHandler.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{0A2EB488-5A6A-E166-BB62-23FF81499E33}", + "base": "{0A2EB488-5A6A-E166-BB62-23FF81499E33}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,47 +11,47 @@ }, "slots": [ { - "key": "Input_Connect Event", + "base": "Input_Connect Event", "details": { "name": "Connect Event", "tooltip": "Connect to input event name as defined in an input binding asset." } }, { - "key": "DataInput_Event Name", + "base": "DataInput_Event Name", "details": { "name": "Event Name" } }, { - "key": "Output_On Connect Event", + "base": "Output_On Connect Event", "details": { "name": "On Connect Event", "tooltip": "Connect to input event name as defined in an input binding asset." } }, { - "key": "Output_Pressed", + "base": "Output_Pressed", "details": { "name": "Pressed", "tooltip": "Signaled when the input event begins." } }, { - "key": "DataOutput_value", + "base": "DataOutput_value", "details": { "name": "value" } }, { - "key": "Output_Held", + "base": "Output_Held", "details": { "name": "Held", "tooltip": "Signaled while the input event is active." } }, { - "key": "Output_Released", + "base": "Output_Released", "details": { "name": "Released", "tooltip": "Signaled when the input event ends." diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Internal_ExpressionNodeBase.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Internal_ExpressionNodeBase.names index 3d681d3e39..2d9711106c 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Internal_ExpressionNodeBase.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Internal_ExpressionNodeBase.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{797C800D-8C96-4675-B5B5-2A321AC09433}", + "base": "{797C800D-8C96-4675-B5B5-2A321AC09433}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -12,7 +12,7 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In", "tooltip": "Input signal" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Internal_ScriptEvent.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Internal_ScriptEvent.names index 82e6bc7617..d475d33102 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Internal_ScriptEvent.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Internal_ScriptEvent.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{B6614CEC-4788-476C-A19A-BA0A8B490C73}", + "base": "{B6614CEC-4788-476C-A19A-BA0A8B490C73}", "context": "ScriptCanvas::Node", "variant": "", "details": { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Internal_StringFormatted.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Internal_StringFormatted.names index be94cea028..12ad68d7e3 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Internal_StringFormatted.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Internal_StringFormatted.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{0B1577E0-339D-4573-93D1-6C311AD12A13}", + "base": "{0B1577E0-339D-4573-93D1-6C311AD12A13}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -12,20 +12,20 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In", "tooltip": "Input signal" } }, { - "key": "DataInput_Value", + "base": "DataInput_Value", "details": { "name": "Value" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/LogicDeprecated_Indexer.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/LogicDeprecated_Indexer.names index 82d430365d..21b990bd6e 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/LogicDeprecated_Indexer.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/LogicDeprecated_Indexer.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{61E2CDC6-5CFA-47A2-8936-6A4332511E28}", + "base": "{61E2CDC6-5CFA-47A2-8936-6A4332511E28}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -12,63 +12,63 @@ }, "slots": [ { - "key": "Input_In0", + "base": "Input_In0", "details": { "name": "In0", "tooltip": "Input 0" } }, { - "key": "Input_In1", + "base": "Input_In1", "details": { "name": "In1", "tooltip": "Input 1" } }, { - "key": "Input_In2", + "base": "Input_In2", "details": { "name": "In2", "tooltip": "Input 2" } }, { - "key": "Input_In3", + "base": "Input_In3", "details": { "name": "In3", "tooltip": "Input 3" } }, { - "key": "Input_In4", + "base": "Input_In4", "details": { "name": "In4", "tooltip": "Input 4" } }, { - "key": "Input_In5", + "base": "Input_In5", "details": { "name": "In5", "tooltip": "Input 5" } }, { - "key": "Input_In6", + "base": "Input_In6", "details": { "name": "In6", "tooltip": "Input 6" } }, { - "key": "Input_In7", + "base": "Input_In7", "details": { "name": "In7", "tooltip": "Input 7" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out", "tooltip": "Signaled when the node is triggered." diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Logic_And.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Logic_And.names index 24c7fefe80..a98ca0b451 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Logic_And.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Logic_And.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{4043C9B7-4ACC-42FE-9C46-EAD7BB718C99}", + "base": "{4043C9B7-4ACC-42FE-9C46-EAD7BB718C99}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,40 +11,40 @@ }, "slots": [ { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } }, { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In", "tooltip": "Signal to perform the evaluation when desired." } }, { - "key": "Output_True", + "base": "Output_True", "details": { "name": "True", "tooltip": "Signaled if the result of the operation is true." } }, { - "key": "Output_False", + "base": "Output_False", "details": { "name": "False", "tooltip": "Signaled if the result of the operation is false." } }, { - "key": "DataInput_Value A", + "base": "DataInput_Value A", "details": { "name": "Value A" } }, { - "key": "DataInput_Value B", + "base": "DataInput_Value B", "details": { "name": "Value B" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Logic_Any.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Logic_Any.names index 4d57734566..d323290c96 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Logic_Any.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Logic_Any.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{6359C34F-3C34-4784-9FFD-18F1C8E3482D}", + "base": "{6359C34F-3C34-4784-9FFD-18F1C8E3482D}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,13 +11,13 @@ }, "slots": [ { - "key": "Input_Input 0", + "base": "Input_Input 0", "details": { "name": "Input 0" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out", "tooltip": "Signaled when the node receives a signal from the selected index" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Logic_Break.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Logic_Break.names index 0f07c55f1b..9763a75d7c 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Logic_Break.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Logic_Break.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{931A68D0-E3AD-44A7-A7BB-126A8F39C02F}", + "base": "{931A68D0-E3AD-44A7-A7BB-126A8F39C02F}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -12,13 +12,13 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out 0", + "base": "Output_Out 0", "details": { "name": "Out 0", "tooltip": "Output 0" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Logic_Cycle.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Logic_Cycle.names index 16f28e96b8..0f7c401571 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Logic_Cycle.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Logic_Cycle.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{974258F5-EE1B-4AEE-B956-C7B303801847}", + "base": "{974258F5-EE1B-4AEE-B956-C7B303801847}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,13 +11,13 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out 0", + "base": "Output_Out 0", "details": { "name": "Out 0", "tooltip": "Output 0" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Logic_If.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Logic_If.names index 95fde7b078..34d7c6b746 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Logic_If.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Logic_If.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{F19CC10A-02FD-4E75-ADAA-9CFBD8A4E2F8}", + "base": "{F19CC10A-02FD-4E75-ADAA-9CFBD8A4E2F8}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,27 +11,27 @@ }, "slots": [ { - "key": "DataInput_Condition", + "base": "DataInput_Condition", "details": { "name": "Condition" } }, { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In", "tooltip": "Input signal" } }, { - "key": "Output_True", + "base": "Output_True", "details": { "name": "True", "tooltip": "Signaled if the condition provided evaluates to true." } }, { - "key": "Output_False", + "base": "Output_False", "details": { "name": "False", "tooltip": "Signaled if the condition provided evaluates to false." diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Logic_IsNull.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Logic_IsNull.names index 381a1c56f2..b36abc7903 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Logic_IsNull.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Logic_IsNull.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{760CE936-7059-42A3-A177-530A662E4ECF}", + "base": "{760CE936-7059-42A3-A177-530A662E4ECF}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,33 +11,33 @@ }, "slots": [ { - "key": "DataInput_Reference", + "base": "DataInput_Reference", "details": { "name": "Reference" } }, { - "key": "DataOutput_Is Null", + "base": "DataOutput_Is Null", "details": { "name": "Is Null" } }, { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In", "tooltip": "Input signal" } }, { - "key": "Output_True", + "base": "Output_True", "details": { "name": "True", "tooltip": "Signaled if the reference provided is null." } }, { - "key": "Output_False", + "base": "Output_False", "details": { "name": "False", "tooltip": "Signaled if the reference provided is not null." diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Logic_Multiplexer.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Logic_Multiplexer.names index c7e7a7ebd3..a0c6110b96 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Logic_Multiplexer.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Logic_Multiplexer.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{2FE432CB-9969-4273-BE04-DEF949C288F0}", + "base": "{2FE432CB-9969-4273-BE04-DEF949C288F0}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,69 +11,69 @@ }, "slots": [ { - "key": "DataInput_Index", + "base": "DataInput_Index", "details": { "name": "Index" } }, { - "key": "Input_In0", + "base": "Input_In0", "details": { "name": "In0", "tooltip": "Input 0" } }, { - "key": "Input_In1", + "base": "Input_In1", "details": { "name": "In1", "tooltip": "Input 1" } }, { - "key": "Input_In2", + "base": "Input_In2", "details": { "name": "In2", "tooltip": "Input 2" } }, { - "key": "Input_In3", + "base": "Input_In3", "details": { "name": "In3", "tooltip": "Input 3" } }, { - "key": "Input_In4", + "base": "Input_In4", "details": { "name": "In4", "tooltip": "Input 4" } }, { - "key": "Input_In5", + "base": "Input_In5", "details": { "name": "In5", "tooltip": "Input 5" } }, { - "key": "Input_In6", + "base": "Input_In6", "details": { "name": "In6", "tooltip": "Input 6" } }, { - "key": "Input_In7", + "base": "Input_In7", "details": { "name": "In7", "tooltip": "Input 7" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out", "tooltip": "Signaled when the node receives a signal from the selected index" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Logic_Not.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Logic_Not.names index 79b7924e1f..37104685a0 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Logic_Not.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Logic_Not.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{EF6BA813-9AF9-45CF-A8A4-7F800D7B7CB0}", + "base": "{EF6BA813-9AF9-45CF-A8A4-7F800D7B7CB0}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,33 +11,33 @@ }, "slots": [ { - "key": "DataInput_Value", + "base": "DataInput_Value", "details": { "name": "Value" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } }, { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In", "tooltip": "Signal to perform the evaluation when desired." } }, { - "key": "Output_True", + "base": "Output_True", "details": { "name": "True", "tooltip": "Signaled if the result of the operation is true." } }, { - "key": "Output_False", + "base": "Output_False", "details": { "name": "False", "tooltip": "Signaled if the result of the operation is false." diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Logic_Once.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Logic_Once.names index e841ecdb2d..f35f338941 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Logic_Once.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Logic_Once.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{0E37D3CA-2862-4667-BFDB-7393DD48241B}", + "base": "{0E37D3CA-2862-4667-BFDB-7393DD48241B}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,28 +11,28 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In", "tooltip": "Input signal" } }, { - "key": "Input_Reset", + "base": "Input_Reset", "details": { "name": "Reset", "tooltip": "Reset signal" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out", "tooltip": "Output signal" } }, { - "key": "Output_On Reset", + "base": "Output_On Reset", "details": { "name": "On Reset", "tooltip": "Triggered when Reset" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Logic_Or.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Logic_Or.names index 334acb117e..492f4d2a44 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Logic_Or.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Logic_Or.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{363F9994-8D55-4117-BE94-EFF536BDAC17}", + "base": "{363F9994-8D55-4117-BE94-EFF536BDAC17}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,40 +11,40 @@ }, "slots": [ { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } }, { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In", "tooltip": "Signal to perform the evaluation when desired." } }, { - "key": "Output_True", + "base": "Output_True", "details": { "name": "True", "tooltip": "Signaled if the result of the operation is true." } }, { - "key": "Output_False", + "base": "Output_False", "details": { "name": "False", "tooltip": "Signaled if the result of the operation is false." } }, { - "key": "DataInput_Value A", + "base": "DataInput_Value A", "details": { "name": "Value A" } }, { - "key": "DataInput_Value B", + "base": "DataInput_Value B", "details": { "name": "Value B" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Logic_OrderedSequencer.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Logic_OrderedSequencer.names index 10b97e3dab..c82ae5b04f 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Logic_OrderedSequencer.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Logic_OrderedSequencer.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{BAFDA139-49A8-453B-A556-D4F4BA213B5C}", + "base": "{BAFDA139-49A8-453B-A556-D4F4BA213B5C}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -12,13 +12,13 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out 0", + "base": "Output_Out 0", "details": { "name": "Out 0", "tooltip": "Output 0" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Logic_RandomSignal.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Logic_RandomSignal.names index 6fb5e1341f..75094119a8 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Logic_RandomSignal.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Logic_RandomSignal.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{DFB13C5E-5FB3-4650-BD3A-E1AD79CD42AC}", + "base": "{DFB13C5E-5FB3-4650-BD3A-E1AD79CD42AC}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -12,19 +12,19 @@ }, "slots": [ { - "key": "DataInput_Weight 1", + "base": "DataInput_Weight 1", "details": { "name": "Weight 1" } }, { - "key": "Output_Out 1", + "base": "Output_Out 1", "details": { "name": "Out 1" } }, { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In", "tooltip": "Input signal" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Logic_Sequencer.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Logic_Sequencer.names index a97c4240c3..8856ddd2ac 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Logic_Sequencer.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Logic_Sequencer.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{CB98B828-BF86-4623-BF73-396A68FA386A}", + "base": "{CB98B828-BF86-4623-BF73-396A68FA386A}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,82 +11,82 @@ }, "slots": [ { - "key": "DataInput_Index", + "base": "DataInput_Index", "details": { "name": "Index" } }, { - "key": "DataInput_Order", + "base": "DataInput_Order", "details": { "name": "Order" } }, { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In", "tooltip": "Input signal" } }, { - "key": "Input_Next", + "base": "Input_Next", "details": { "name": "Next", "tooltip": "When next is activated, it enables the next output" } }, { - "key": "Output_Out0", + "base": "Output_Out0", "details": { "name": "Out0", "tooltip": "Output 0" } }, { - "key": "Output_Out1", + "base": "Output_Out1", "details": { "name": "Out1", "tooltip": "Output 1" } }, { - "key": "Output_Out2", + "base": "Output_Out2", "details": { "name": "Out2", "tooltip": "Output 2" } }, { - "key": "Output_Out3", + "base": "Output_Out3", "details": { "name": "Out3", "tooltip": "Output 3" } }, { - "key": "Output_Out4", + "base": "Output_Out4", "details": { "name": "Out4", "tooltip": "Output 4" } }, { - "key": "Output_Out5", + "base": "Output_Out5", "details": { "name": "Out5", "tooltip": "Output 5" } }, { - "key": "Output_Out6", + "base": "Output_Out6", "details": { "name": "Out6", "tooltip": "Output 6" } }, { - "key": "Output_Out7", + "base": "Output_Out7", "details": { "name": "Out7", "tooltip": "Output 7" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Logic_Switch.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Logic_Switch.names index 20d7175aba..3791eb864e 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Logic_Switch.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Logic_Switch.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{E1B5F3F8-AFEE-42C9-A22C-CB93F8281CC4}", + "base": "{E1B5F3F8-AFEE-42C9-A22C-CB93F8281CC4}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,19 +11,19 @@ }, "slots": [ { - "key": "DataInput_Index", + "base": "DataInput_Index", "details": { "name": "Index" } }, { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out 0", + "base": "Output_Out 0", "details": { "name": "Out 0", "tooltip": "Output 0" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Logic_While.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Logic_While.names index ccd9bfb6b3..a1bd16a211 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Logic_While.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Logic_While.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{C5BDF392-9669-4928-A0F5-F55B8A5B3BAC}", + "base": "{C5BDF392-9669-4928-A0F5-F55B8A5B3BAC}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,26 +11,26 @@ }, "slots": [ { - "key": "DataInput_Condition", + "base": "DataInput_Condition", "details": { "name": "Condition" } }, { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out", "tooltip": "Signalled if the condition is false, or if the loop calls the break node" } }, { - "key": "Output_Loop", + "base": "Output_Loop", "details": { "name": "Loop", "tooltip": "Signalled if the condition is true, and every time the last node of 'Loop' finishes" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_AddAABB.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_AddAABB.names index 0b5c5f26ea..81545f0ba2 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_AddAABB.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_AddAABB.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{0C1257A0-DB57-5E29-9CA4-595B3AE8BA87}", + "base": "{0C1257A0-DB57-5E29-9CA4-595B3AE8BA87}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -12,31 +12,31 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_AABB: A", + "base": "DataInput_AABB: A", "details": { "name": "First" } }, { - "key": "DataInput_AABB: B", + "base": "DataInput_AABB: B", "details": { "name": "Second" } }, { - "key": "DataOutput_Result: AABB", + "base": "DataOutput_Result: AABB", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_AddPoint.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_AddPoint.names index e22bafcc60..fd88952e19 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_AddPoint.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_AddPoint.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{2FEFADF8-0D3F-5796-BB6B-C7B8758A5751}", + "base": "{2FEFADF8-0D3F-5796-BB6B-C7B8758A5751}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -12,31 +12,31 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_AABB: Source", + "base": "DataInput_AABB: Source", "details": { "name": "Source" } }, { - "key": "DataInput_Vector3: Point", + "base": "DataInput_Vector3: Point", "details": { "name": "Point" } }, { - "key": "DataOutput_Result: AABB", + "base": "DataOutput_Result: AABB", "details": { "name": "AABB" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_ApplyTransform.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_ApplyTransform.names index ad01a37239..874cd39c9f 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_ApplyTransform.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_ApplyTransform.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{B1930C91-3527-593E-A382-DACC9E9C2245}", + "base": "{B1930C91-3527-593E-A382-DACC9E9C2245}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -12,31 +12,31 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_AABB: Source", + "base": "DataInput_AABB: Source", "details": { "name": "Source" } }, { - "key": "DataInput_Transform: Transform", + "base": "DataInput_Transform: Transform", "details": { "name": "Transform" } }, { - "key": "DataOutput_Result: AABB", + "base": "DataOutput_Result: AABB", "details": { "name": "AABB" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_Center.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_Center.names index 5f3fe027f2..c9118de014 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_Center.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_Center.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{5B16FDCF-5FB0-5059-97E6-76AA11871337}", + "base": "{5B16FDCF-5FB0-5059-97E6-76AA11871337}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -12,25 +12,25 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_AABB: Source", + "base": "DataInput_AABB: Source", "details": { "name": "Source" } }, { - "key": "DataOutput_Result: Vector3", + "base": "DataOutput_Result: Vector3", "details": { "name": "Center" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_Clamp.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_Clamp.names index 0e7ee2c5bf..2062682005 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_Clamp.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_Clamp.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{A03CA593-2B2E-5BEE-9A63-118D2F1E9DED}", + "base": "{A03CA593-2B2E-5BEE-9A63-118D2F1E9DED}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -12,31 +12,31 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_AABB: Source", + "base": "DataInput_AABB: Source", "details": { "name": "Source" } }, { - "key": "DataInput_AABB: Clamp", + "base": "DataInput_AABB: Clamp", "details": { "name": "Clamp" } }, { - "key": "DataOutput_Result: AABB", + "base": "DataOutput_Result: AABB", "details": { "name": "AABB" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_ContainsAABB.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_ContainsAABB.names index aad3bbf1c1..7c208bcdd6 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_ContainsAABB.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_ContainsAABB.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{A0A7B5F1-F191-52A8-838A-DB39AADBA457}", + "base": "{A0A7B5F1-F191-52A8-838A-DB39AADBA457}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -12,31 +12,31 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_AABB: Source", + "base": "DataInput_AABB: Source", "details": { "name": "Source" } }, { - "key": "DataInput_AABB: Candidate", + "base": "DataInput_AABB: Candidate", "details": { "name": "Candidate" } }, { - "key": "DataOutput_Result: Boolean", + "base": "DataOutput_Result: Boolean", "details": { "name": "Contains" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_ContainsVector3.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_ContainsVector3.names index 9fc7673965..c3d7c00e94 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_ContainsVector3.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_ContainsVector3.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{BD9731E7-78AD-5864-8617-25DE422C6CDE}", + "base": "{BD9731E7-78AD-5864-8617-25DE422C6CDE}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -12,31 +12,31 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_AABB: Source", + "base": "DataInput_AABB: Source", "details": { "name": "Source" } }, { - "key": "DataInput_Vector3: Candidate", + "base": "DataInput_Vector3: Candidate", "details": { "name": "Candidate" } }, { - "key": "DataOutput_Result: Boolean", + "base": "DataOutput_Result: Boolean", "details": { "name": "Contains" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_Distance.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_Distance.names index 579771fef0..7c8e0ebb3a 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_Distance.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_Distance.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{6D65A9E0-733D-5277-B7CA-983E1468A40A}", + "base": "{6D65A9E0-733D-5277-B7CA-983E1468A40A}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -12,31 +12,31 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_AABB: Source", + "base": "DataInput_AABB: Source", "details": { "name": "Source" } }, { - "key": "DataInput_Vector3: Point", + "base": "DataInput_Vector3: Point", "details": { "name": "Point" } }, { - "key": "DataOutput_Result: Number", + "base": "DataOutput_Result: Number", "details": { "name": "Distance" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_Expand.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_Expand.names index 08a7f8ee38..05390a20e5 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_Expand.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_Expand.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{8B74AC3B-2089-5D55-BD66-3F57B3212D57}", + "base": "{8B74AC3B-2089-5D55-BD66-3F57B3212D57}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -12,31 +12,31 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_AABB: Source", + "base": "DataInput_AABB: Source", "details": { "name": "Source" } }, { - "key": "DataInput_Vector3: Delta", + "base": "DataInput_Vector3: Delta", "details": { "name": "Delta" } }, { - "key": "DataOutput_Result: AABB", + "base": "DataOutput_Result: AABB", "details": { "name": "AABB" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_Extents.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_Extents.names index 2cbc987e31..db3ddc567f 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_Extents.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_Extents.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{C98626B6-E60F-525C-8763-4A906AD31903}", + "base": "{C98626B6-E60F-525C-8763-4A906AD31903}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -12,25 +12,25 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "Source", + "base": "Source", "details": { "name": "Source" } }, { - "key": "DataOutput_Result: Vector3", + "base": "DataOutput_Result: Vector3", "details": { "name": "Extents" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_FromCenterHalfExtents.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_FromCenterHalfExtents.names index 3261d0c3d2..d1c6a9ca27 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_FromCenterHalfExtents.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_FromCenterHalfExtents.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{3EF44A2E-F065-5F2A-906D-A139AEA6DF4E}", + "base": "{3EF44A2E-F065-5F2A-906D-A139AEA6DF4E}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -12,31 +12,31 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Vector3: Center", + "base": "DataInput_Vector3: Center", "details": { "name": "Center" } }, { - "key": "DataInput_Vector3: HalfExtents", + "base": "DataInput_Vector3: HalfExtents", "details": { "name": "Half Extents" } }, { - "key": "DataOutput_Result: AABB", + "base": "DataOutput_Result: AABB", "details": { "name": "AABB" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_FromCenterRadius.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_FromCenterRadius.names index 204047ee15..06a369986d 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_FromCenterRadius.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_FromCenterRadius.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{2AC22BD2-2150-58C2-8C0A-F9B83E2559F5}", + "base": "{2AC22BD2-2150-58C2-8C0A-F9B83E2559F5}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -12,31 +12,31 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Vector3: Center", + "base": "DataInput_Vector3: Center", "details": { "name": "Center" } }, { - "key": "DataInput_Number: Radius", + "base": "DataInput_Number: Radius", "details": { "name": "Radius" } }, { - "key": "DataOutput_Result: AABB", + "base": "DataOutput_Result: AABB", "details": { "name": "AABB" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_FromMinMax.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_FromMinMax.names index 2b6030e8fb..982b3b8342 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_FromMinMax.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_FromMinMax.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{8B033820-B205-560A-A735-8BBED0B02DDD}", + "base": "{8B033820-B205-560A-A735-8BBED0B02DDD}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -12,31 +12,31 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Vector3: Min", + "base": "DataInput_Vector3: Min", "details": { "name": "Min" } }, { - "key": "DataInput_Vector3: Max", + "base": "DataInput_Vector3: Max", "details": { "name": "Max" } }, { - "key": "DataOutput_Result: AABB", + "base": "DataOutput_Result: AABB", "details": { "name": "AABB" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_FromOBB.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_FromOBB.names index 189aa8d744..205f2373e4 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_FromOBB.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_FromOBB.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{95A84A7D-9D3C-59AE-9463-1CC41D275239}", + "base": "{95A84A7D-9D3C-59AE-9463-1CC41D275239}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -12,25 +12,25 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_OBB: Source", + "base": "DataInput_OBB: Source", "details": { "name": "Source" } }, { - "key": "DataOutput_Result: AABB", + "base": "DataOutput_Result: AABB", "details": { "name": "AABB" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_FromPoint.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_FromPoint.names index 433a318baf..7bd74f5e61 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_FromPoint.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_FromPoint.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{E578074B-7D9E-5339-A2CC-1A23B32E27B5}", + "base": "{E578074B-7D9E-5339-A2CC-1A23B32E27B5}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -12,25 +12,25 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Vector3: Source", + "base": "DataInput_Vector3: Source", "details": { "name": "Source" } }, { - "key": "DataOutput_Result: AABB", + "base": "DataOutput_Result: AABB", "details": { "name": "AABB" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_GetMax.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_GetMax.names index 3ef427e774..0eb6d80940 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_GetMax.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_GetMax.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{6C71D076-0427-56B4-8A95-1DCB1835D1BF}", + "base": "{6C71D076-0427-56B4-8A95-1DCB1835D1BF}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -12,25 +12,25 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_AABB: Source", + "base": "DataInput_AABB: Source", "details": { "name": "Source" } }, { - "key": "DataOutput_Result: Vector3", + "base": "DataOutput_Result: Vector3", "details": { "name": "Max" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_GetMin.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_GetMin.names index d8acde7296..8bcf1804db 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_GetMin.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_GetMin.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{E699BC04-CAA6-5E1A-BBC0-797510227CBC}", + "base": "{E699BC04-CAA6-5E1A-BBC0-797510227CBC}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -12,25 +12,25 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_AABB: Source", + "base": "DataInput_AABB: Source", "details": { "name": "Source" } }, { - "key": "DataOutput_Result: Vector3", + "base": "DataOutput_Result: Vector3", "details": { "name": "Min" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_IsFinite.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_IsFinite.names index 004ecd1e0e..14a10d9b46 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_IsFinite.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_IsFinite.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{5B585330-B99A-5FDF-BA3C-CDA72468D4CA}", + "base": "{5B585330-B99A-5FDF-BA3C-CDA72468D4CA}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -12,25 +12,25 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_AABB: Source", + "base": "DataInput_AABB: Source", "details": { "name": "Source" } }, { - "key": "DataOutput_Result: Boolean", + "base": "DataOutput_Result: Boolean", "details": { "name": "Is Finite" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_IsValid.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_IsValid.names index 7f7f08e3cf..9c6d0dc8ff 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_IsValid.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_IsValid.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{30BE564D-B68D-5D23-BDA1-625A7A8F9504}", + "base": "{30BE564D-B68D-5D23-BDA1-625A7A8F9504}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -12,25 +12,25 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_AABB: Source", + "base": "DataInput_AABB: Source", "details": { "name": "AABB: Source" } }, { - "key": "DataOutput_Result: Boolean", + "base": "DataOutput_Result: Boolean", "details": { "name": "Is Valid" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_Null.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_Null.names index 62c7cb2b17..48c6bd2b60 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_Null.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_Null.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{783E6976-E519-5BC0-BD33-049847564F5E}", + "base": "{783E6976-E519-5BC0-BD33-049847564F5E}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -12,19 +12,19 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataOutput_Result: AABB", + "base": "DataOutput_Result: AABB", "details": { "name": "Invalid AABB" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_Overlaps.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_Overlaps.names index 4474f1220b..56b83a6eb8 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_Overlaps.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_Overlaps.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{CE4AF636-AB72-589D-92E9-A3C75A3F9C7F}", + "base": "{CE4AF636-AB72-589D-92E9-A3C75A3F9C7F}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -12,31 +12,31 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_AABB: A", + "base": "DataInput_AABB: A", "details": { "name": "AABB: A" } }, { - "key": "DataInput_AABB: B", + "base": "DataInput_AABB: B", "details": { "name": "AABB: B" } }, { - "key": "DataOutput_Result: Boolean", + "base": "DataOutput_Result: Boolean", "details": { "name": "Result: Boolean" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_SurfaceArea.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_SurfaceArea.names index 2b206cfcfc..b0e2985fbb 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_SurfaceArea.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_SurfaceArea.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{46EE9F31-DDE1-5482-9A03-A0D4A6BE429C}", + "base": "{46EE9F31-DDE1-5482-9A03-A0D4A6BE429C}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -12,25 +12,25 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_AABB: Source", + "base": "DataInput_AABB: Source", "details": { "name": "AABB: Source" } }, { - "key": "DataOutput_Result: Number", + "base": "DataOutput_Result: Number", "details": { "name": "Result: Number" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_ToSphere.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_ToSphere.names index 9a07c147c6..e77bde466f 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_ToSphere.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_ToSphere.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{214CCB41-01CA-578C-9D7F-1237202A885B}", + "base": "{214CCB41-01CA-578C-9D7F-1237202A885B}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -12,31 +12,31 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_AABB: Source", + "base": "DataInput_AABB: Source", "details": { "name": "AABB: Source" } }, { - "key": "DataOutput_Center: Vector3", + "base": "DataOutput_Center: Vector3", "details": { "name": "Center: Vector3" } }, { - "key": "DataOutput_Radius: Number", + "base": "DataOutput_Radius: Number", "details": { "name": "Radius: Number" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_Translate.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_Translate.names index 01037b2bff..0be4731085 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_Translate.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_Translate.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{22DBE624-D16E-51E7-BFF5-6C136E8E4581}", + "base": "{22DBE624-D16E-51E7-BFF5-6C136E8E4581}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -12,31 +12,31 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_AABB: Source", + "base": "DataInput_AABB: Source", "details": { "name": "AABB: Source" } }, { - "key": "DataInput_Vector3: Translation", + "base": "DataInput_Vector3: Translation", "details": { "name": "Vector3: Translation" } }, { - "key": "DataOutput_Result: AABB", + "base": "DataOutput_Result: AABB", "details": { "name": "Result: AABB" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_XExtent.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_XExtent.names index 23e8921ab8..f6051e7dc8 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_XExtent.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_XExtent.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{58B36FE7-19EB-5407-95BD-D16C62F04E0D}", + "base": "{58B36FE7-19EB-5407-95BD-D16C62F04E0D}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -12,25 +12,25 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_AABB: Source", + "base": "DataInput_AABB: Source", "details": { "name": "AABB: Source" } }, { - "key": "DataOutput_Result: Number", + "base": "DataOutput_Result: Number", "details": { "name": "Result: Number" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_YExtent.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_YExtent.names index 3e28799512..eab2924849 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_YExtent.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_YExtent.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{631968DE-47B3-5214-B564-E14025135BAA}", + "base": "{631968DE-47B3-5214-B564-E14025135BAA}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -12,25 +12,25 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_AABB: Source", + "base": "DataInput_AABB: Source", "details": { "name": "AABB: Source" } }, { - "key": "DataOutput_Result: Number", + "base": "DataOutput_Result: Number", "details": { "name": "Result: Number" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_ZExtent.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_ZExtent.names index c470eafa0c..4a107a844d 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_ZExtent.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathAABB_ZExtent.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{0CE6DD20-9E09-5CCE-A514-196958FD4871}", + "base": "{0CE6DD20-9E09-5CCE-A514-196958FD4871}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -12,25 +12,25 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_AABB: Source", + "base": "DataInput_AABB: Source", "details": { "name": "AABB: Source" } }, { - "key": "DataOutput_Result: Number", + "base": "DataOutput_Result: Number", "details": { "name": "Result: Number" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathColor_Dot.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathColor_Dot.names index 9433f13d04..a3eef6a2e7 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathColor_Dot.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathColor_Dot.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{92A67932-241C-5BF4-8D4F-327F3E819F56}", + "base": "{92A67932-241C-5BF4-8D4F-327F3E819F56}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -12,31 +12,31 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Color: A", + "base": "DataInput_Color: A", "details": { "name": "Color: A" } }, { - "key": "DataInput_Color: B", + "base": "DataInput_Color: B", "details": { "name": "Color: B" } }, { - "key": "DataOutput_Result: Number", + "base": "DataOutput_Result: Number", "details": { "name": "Result: Number" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathColor_Dot3.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathColor_Dot3.names index 16d5b36eb0..7ddb05f4dd 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathColor_Dot3.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathColor_Dot3.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{91E89FD2-F929-5491-BD2A-4B83D2455AAB}", + "base": "{91E89FD2-F929-5491-BD2A-4B83D2455AAB}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,31 +11,31 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_A", + "base": "DataInput_A", "details": { "name": "A" } }, { - "key": "DataInput_B", + "base": "DataInput_B", "details": { "name": "B" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathColor_FromValues.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathColor_FromValues.names index 01b5ac9cb9..45e436bce6 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathColor_FromValues.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathColor_FromValues.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{84F9B63C-F6F5-58AD-8669-C25287CDC037}", + "base": "{84F9B63C-F6F5-58AD-8669-C25287CDC037}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,43 +11,43 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_R", + "base": "DataInput_R", "details": { "name": "R" } }, { - "key": "DataInput_G", + "base": "DataInput_G", "details": { "name": "G" } }, { - "key": "DataInput_B", + "base": "DataInput_B", "details": { "name": "B" } }, { - "key": "DataInput_A", + "base": "DataInput_A", "details": { "name": "A" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathColor_FromVector3.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathColor_FromVector3.names index e87ad523b0..c709935b7c 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathColor_FromVector3.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathColor_FromVector3.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{4EC849DB-B390-5C13-ADE9-A0CD8F06D63E}", + "base": "{4EC849DB-B390-5C13-ADE9-A0CD8F06D63E}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,25 +11,25 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_RGB", + "base": "DataInput_RGB", "details": { "name": "RGB" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathColor_FromVector3AndNumber.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathColor_FromVector3AndNumber.names index 3d657ed1a0..61004481db 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathColor_FromVector3AndNumber.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathColor_FromVector3AndNumber.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{5829F3E6-1F1D-58C2-BD72-66D4DE866AB9}", + "base": "{5829F3E6-1F1D-58C2-BD72-66D4DE866AB9}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -12,31 +12,31 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Vector3: RGB", + "base": "DataInput_Vector3: RGB", "details": { "name": "Red, Green, Blue" } }, { - "key": "DataInput_Number: A", + "base": "DataInput_Number: A", "details": { "name": "Alpha" } }, { - "key": "DataOutput_Result: Color", + "base": "DataOutput_Result: Color", "details": { "name": "Color" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathColor_GammaToLinear.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathColor_GammaToLinear.names index f9ed687835..b02a810b0f 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathColor_GammaToLinear.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathColor_GammaToLinear.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{721CF0C9-BE86-59B4-A5B6-AC936744CE5E}", + "base": "{721CF0C9-BE86-59B4-A5B6-AC936744CE5E}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -12,25 +12,25 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Color: Source", + "base": "DataInput_Color: Source", "details": { "name": "Source" } }, { - "key": "DataOutput_Result: Color", + "base": "DataOutput_Result: Color", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathColor_IsClose.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathColor_IsClose.names index 430cf90d8b..7f7038d383 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathColor_IsClose.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathColor_IsClose.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{629BABFE-B9D2-5D29-BCC1-3E5CBDD7CAA4}", + "base": "{629BABFE-B9D2-5D29-BCC1-3E5CBDD7CAA4}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -12,37 +12,37 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Color: A", + "base": "DataInput_Color: A", "details": { "name": "First" } }, { - "key": "DataInput_Color: B", + "base": "DataInput_Color: B", "details": { "name": "Second" } }, { - "key": "DataInput_Number: Tolerance", + "base": "DataInput_Number: Tolerance", "details": { "name": "Tolerance" } }, { - "key": "DataOutput_Result: Boolean", + "base": "DataOutput_Result: Boolean", "details": { "name": "Is Close" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathColor_IsZero.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathColor_IsZero.names index f22b3e3773..31b2a61f3d 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathColor_IsZero.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathColor_IsZero.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{8A949DAB-0F0E-52FA-83EF-EA75B38076C8}", + "base": "{8A949DAB-0F0E-52FA-83EF-EA75B38076C8}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -12,31 +12,31 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Color: Source", + "base": "DataInput_Color: Source", "details": { "name": "Source" } }, { - "key": "DataInput_Number: Tolerance", + "base": "DataInput_Number: Tolerance", "details": { "name": "Tolerance" } }, { - "key": "DataOutput_Result: Boolean", + "base": "DataOutput_Result: Boolean", "details": { "name": "Is Zero" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathColor_LinearToGamma.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathColor_LinearToGamma.names index fa1d06b510..ba7118a997 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathColor_LinearToGamma.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathColor_LinearToGamma.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{8F561D51-2991-5493-8CED-B2FBAF168E72}", + "base": "{8F561D51-2991-5493-8CED-B2FBAF168E72}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,25 +11,25 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Source", + "base": "DataInput_Source", "details": { "name": "Source" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathColor_MultiplyByNumber.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathColor_MultiplyByNumber.names index 4bf7062cb7..7f67402d65 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathColor_MultiplyByNumber.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathColor_MultiplyByNumber.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{B779B815-EC1B-5075-A167-0F213445BB53}", + "base": "{B779B815-EC1B-5075-A167-0F213445BB53}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -12,31 +12,31 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Color: Source", + "base": "DataInput_Color: Source", "details": { "name": "Color: Source" } }, { - "key": "DataInput_Number: Multiplier", + "base": "DataInput_Number: Multiplier", "details": { "name": "Number: Multiplier" } }, { - "key": "DataOutput_Result: Color", + "base": "DataOutput_Result: Color", "details": { "name": "Result: Color" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathColor_One.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathColor_One.names index 99d7f96b84..7034549282 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathColor_One.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathColor_One.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{E70E232F-9B2E-5802-9A58-422D47D88405}", + "base": "{E70E232F-9B2E-5802-9A58-422D47D88405}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -12,19 +12,19 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataOutput_Result: Color", + "base": "DataOutput_Result: Color", "details": { "name": "Result: Color" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathComparisons_EqualTo_==_.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathComparisons_EqualTo_==_.names index fdf52ec08d..e3c8499aee 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathComparisons_EqualTo_==_.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathComparisons_EqualTo_==_.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{02A3A3E6-9D80-432B-8AF5-F3AF24CF6959}", + "base": "{02A3A3E6-9D80-432B-8AF5-F3AF24CF6959}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,40 +11,40 @@ }, "slots": [ { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } }, { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In", "tooltip": "Signal to perform the evaluation when desired." } }, { - "key": "Output_True", + "base": "Output_True", "details": { "name": "True", "tooltip": "Signaled if the result of the operation is true." } }, { - "key": "Output_False", + "base": "Output_False", "details": { "name": "False", "tooltip": "Signaled if the result of the operation is false." } }, { - "key": "DataInput_Value A", + "base": "DataInput_Value A", "details": { "name": "Value A" } }, { - "key": "DataInput_Value B", + "base": "DataInput_Value B", "details": { "name": "Value B" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathComparisons_GreaterThan__.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathComparisons_GreaterThan__.names index b2c3ca2d50..36f3163ae4 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathComparisons_GreaterThan__.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathComparisons_GreaterThan__.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{218F5872-8D89-4FEA-9761-662625E29580}", + "base": "{218F5872-8D89-4FEA-9761-662625E29580}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,40 +11,40 @@ }, "slots": [ { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } }, { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In", "tooltip": "Signal to perform the evaluation when desired." } }, { - "key": "Output_True", + "base": "Output_True", "details": { "name": "True", "tooltip": "Signaled if the result of the operation is true." } }, { - "key": "Output_False", + "base": "Output_False", "details": { "name": "False", "tooltip": "Signaled if the result of the operation is false." } }, { - "key": "DataInput_Value A", + "base": "DataInput_Value A", "details": { "name": "Value A" } }, { - "key": "DataInput_Value B", + "base": "DataInput_Value B", "details": { "name": "Value B" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathComparisons_GreaterThanorEqualTo_=_.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathComparisons_GreaterThanorEqualTo_=_.names index 5422a38082..68dc66c790 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathComparisons_GreaterThanorEqualTo_=_.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathComparisons_GreaterThanorEqualTo_=_.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{8CA0C442-9139-4180-96EC-300FF888C35A}", + "base": "{8CA0C442-9139-4180-96EC-300FF888C35A}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,40 +11,40 @@ }, "slots": [ { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } }, { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In", "tooltip": "Signal to perform the evaluation when desired." } }, { - "key": "Output_True", + "base": "Output_True", "details": { "name": "True", "tooltip": "Signaled if the result of the operation is true." } }, { - "key": "Output_False", + "base": "Output_False", "details": { "name": "False", "tooltip": "Signaled if the result of the operation is false." } }, { - "key": "DataInput_Value A", + "base": "DataInput_Value A", "details": { "name": "Value A" } }, { - "key": "DataInput_Value B", + "base": "DataInput_Value B", "details": { "name": "Value B" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathComparisons_LessThan___.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathComparisons_LessThan___.names index 44db07b347..1247a766f5 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathComparisons_LessThan___.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathComparisons_LessThan___.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{1B93426F-AAA2-4134-BE9A-C33B8F07F867}", + "base": "{1B93426F-AAA2-4134-BE9A-C33B8F07F867}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,40 +11,40 @@ }, "slots": [ { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } }, { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In", "tooltip": "Signal to perform the evaluation when desired." } }, { - "key": "Output_True", + "base": "Output_True", "details": { "name": "True", "tooltip": "Signaled if the result of the operation is true." } }, { - "key": "Output_False", + "base": "Output_False", "details": { "name": "False", "tooltip": "Signaled if the result of the operation is false." } }, { - "key": "DataInput_Value A", + "base": "DataInput_Value A", "details": { "name": "Value A" } }, { - "key": "DataInput_Value B", + "base": "DataInput_Value B", "details": { "name": "Value B" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathComparisons_LessThanorEqualTo__=_.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathComparisons_LessThanorEqualTo__=_.names index 1c06e26cd6..f0e9e1602f 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathComparisons_LessThanorEqualTo__=_.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathComparisons_LessThanorEqualTo__=_.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{73F6E302-A2E9-4BE6-A88F-98F81A24100D}", + "base": "{73F6E302-A2E9-4BE6-A88F-98F81A24100D}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,40 +11,40 @@ }, "slots": [ { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } }, { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In", "tooltip": "Signal to perform the evaluation when desired." } }, { - "key": "Output_True", + "base": "Output_True", "details": { "name": "True", "tooltip": "Signaled if the result of the operation is true." } }, { - "key": "Output_False", + "base": "Output_False", "details": { "name": "False", "tooltip": "Signaled if the result of the operation is false." } }, { - "key": "DataInput_Value A", + "base": "DataInput_Value A", "details": { "name": "Value A" } }, { - "key": "DataInput_Value B", + "base": "DataInput_Value B", "details": { "name": "Value B" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathComparisons_NotEqualTo_!=_.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathComparisons_NotEqualTo_!=_.names index e14af5ed2f..6be7dfcbf6 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathComparisons_NotEqualTo_!=_.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathComparisons_NotEqualTo_!=_.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{C8D7A10F-A919-4467-96B1-F1852C282628}", + "base": "{C8D7A10F-A919-4467-96B1-F1852C282628}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,40 +11,40 @@ }, "slots": [ { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } }, { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In", "tooltip": "Signal to perform the evaluation when desired." } }, { - "key": "Output_True", + "base": "Output_True", "details": { "name": "True", "tooltip": "Signaled if the result of the operation is true." } }, { - "key": "Output_False", + "base": "Output_False", "details": { "name": "False", "tooltip": "Signaled if the result of the operation is false." } }, { - "key": "DataInput_Value A", + "base": "DataInput_Value A", "details": { "name": "Value A" } }, { - "key": "DataInput_Value B", + "base": "DataInput_Value B", "details": { "name": "Value B" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathCrc32_FromString.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathCrc32_FromString.names index 56b63ed01f..5ab5075de1 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathCrc32_FromString.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathCrc32_FromString.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{5C734A52-7CB1-5571-B6B2-F1C19A8CCE5A}", + "base": "{5C734A52-7CB1-5571-B6B2-F1C19A8CCE5A}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,25 +11,25 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Value", + "base": "DataInput_Value", "details": { "name": "Text" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_FromColumns.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_FromColumns.names index e9c3ac7672..3d2cd9186f 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_FromColumns.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_FromColumns.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{2185A730-0CA3-5B97-8150-51D9F28EA9C8}", + "base": "{2185A730-0CA3-5B97-8150-51D9F28EA9C8}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,37 +11,37 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Column1", + "base": "DataInput_Column1", "details": { "name": "Column 1" } }, { - "key": "DataInput_Column2", + "base": "DataInput_Column2", "details": { "name": "Column 2" } }, { - "key": "DataInput_Column3", + "base": "DataInput_Column3", "details": { "name": "Column 3" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_FromCrossProduct.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_FromCrossProduct.names index f823176f14..03cfbb8526 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_FromCrossProduct.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_FromCrossProduct.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{06538E6D-FE44-5A9C-8081-083D5D19D4FC}", + "base": "{06538E6D-FE44-5A9C-8081-083D5D19D4FC}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,25 +11,25 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Source", + "base": "DataInput_Source", "details": { "name": "Source" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_FromDiagonal.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_FromDiagonal.names index 9f9c083534..9725855cf1 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_FromDiagonal.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_FromDiagonal.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{F99F5D84-CDE6-5130-BAAC-7377F52D34FD}", + "base": "{F99F5D84-CDE6-5130-BAAC-7377F52D34FD}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,25 +11,25 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Source", + "base": "DataInput_Source", "details": { "name": "Source" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_FromMatrix4x4.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_FromMatrix4x4.names index f88782a2ee..4f8d7ec9d9 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_FromMatrix4x4.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_FromMatrix4x4.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{5E5DA784-9D18-595F-BB1E-FA3AC8BA7DD6}", + "base": "{5E5DA784-9D18-595F-BB1E-FA3AC8BA7DD6}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,25 +11,25 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Source", + "base": "DataInput_Source", "details": { "name": "Source" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_FromQuaternion.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_FromQuaternion.names index 1ddbce8343..64c63a37e2 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_FromQuaternion.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_FromQuaternion.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{1D87EFAE-3FC2-5D8A-931D-7D56DB4E3123}", + "base": "{1D87EFAE-3FC2-5D8A-931D-7D56DB4E3123}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,25 +11,25 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Source", + "base": "DataInput_Source", "details": { "name": "Source" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_FromRotationXDegrees.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_FromRotationXDegrees.names index 20c7570899..23275a718e 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_FromRotationXDegrees.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_FromRotationXDegrees.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{478D4CC5-BC42-574A-A81C-818FA9A3C635}", + "base": "{478D4CC5-BC42-574A-A81C-818FA9A3C635}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,25 +11,25 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Degrees", + "base": "DataInput_Degrees", "details": { "name": "Degrees" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_FromRotationYDegrees.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_FromRotationYDegrees.names index c5558e192a..e52288fade 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_FromRotationYDegrees.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_FromRotationYDegrees.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{A69D13B7-FBC3-5038-93CD-4FB822CFF8D4}", + "base": "{A69D13B7-FBC3-5038-93CD-4FB822CFF8D4}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,25 +11,25 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Degrees", + "base": "DataInput_Degrees", "details": { "name": "Degrees" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_FromRotationZDegrees.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_FromRotationZDegrees.names index 3c31f1c3ab..888a75aff2 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_FromRotationZDegrees.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_FromRotationZDegrees.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{5E449312-5741-59EB-A778-7FB6C75DB90A}", + "base": "{5E449312-5741-59EB-A778-7FB6C75DB90A}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,25 +11,25 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Degrees", + "base": "DataInput_Degrees", "details": { "name": "Degrees" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_FromRows.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_FromRows.names index 7bcda04e10..3a3cdb722d 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_FromRows.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_FromRows.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{B70E2447-DE12-5D81-80E4-06BEE5A0219E}", + "base": "{B70E2447-DE12-5D81-80E4-06BEE5A0219E}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,37 +11,37 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Row1", + "base": "DataInput_Row1", "details": { "name": "Row 1" } }, { - "key": "DataInput_Row2", + "base": "DataInput_Row2", "details": { "name": "Row 2" } }, { - "key": "DataInput_Row3", + "base": "DataInput_Row3", "details": { "name": "Row 3" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_FromScale.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_FromScale.names index 1caf6865ca..3040759f1f 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_FromScale.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_FromScale.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{A3F6A35C-068E-57D5-9761-69DC5AB0BD1B}", + "base": "{A3F6A35C-068E-57D5-9761-69DC5AB0BD1B}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,25 +11,25 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Scale", + "base": "DataInput_Scale", "details": { "name": "Scale" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_FromTransform.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_FromTransform.names index 509fda12d3..11a310374e 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_FromTransform.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_FromTransform.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{F54FFF79-75FF-5444-B941-DF216680BEA1}", + "base": "{F54FFF79-75FF-5444-B941-DF216680BEA1}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,25 +11,25 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Transform", + "base": "DataInput_Transform", "details": { "name": "Transform" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_GetColumn.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_GetColumn.names index a34e468150..60a538ecd7 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_GetColumn.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_GetColumn.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{50724E19-5472-5E35-9F88-F226ABB37D1A}", + "base": "{50724E19-5472-5E35-9F88-F226ABB37D1A}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,31 +11,31 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Source", + "base": "DataInput_Source", "details": { "name": "Source" } }, { - "key": "DataInput_Column", + "base": "DataInput_Column", "details": { "name": "Column" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_GetColumns.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_GetColumns.names index 104ca88d50..5cb723836e 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_GetColumns.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_GetColumns.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{13EE83FC-EA87-5957-966F-EFD4E88A7698}", + "base": "{13EE83FC-EA87-5957-966F-EFD4E88A7698}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,37 +11,37 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Source", + "base": "DataInput_Source", "details": { "name": "Source" } }, { - "key": "DataOutput_Column1", + "base": "DataOutput_Column1", "details": { "name": "Column 1" } }, { - "key": "DataOutput_Column2", + "base": "DataOutput_Column2", "details": { "name": "Column 2" } }, { - "key": "DataOutput_Column3", + "base": "DataOutput_Column3", "details": { "name": "Column 3" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_GetDiagonal.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_GetDiagonal.names index 1c64bf8f40..3516b89257 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_GetDiagonal.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_GetDiagonal.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{68B65AD0-B42F-5C85-B194-4FC6C31AD237}", + "base": "{68B65AD0-B42F-5C85-B194-4FC6C31AD237}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,25 +11,25 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Source", + "base": "DataInput_Source", "details": { "name": "Source" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_GetElement.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_GetElement.names index 0cf502fad0..7d9f46c441 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_GetElement.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_GetElement.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{6FA2A21C-2189-55E4-B65E-2A961586F31E}", + "base": "{6FA2A21C-2189-55E4-B65E-2A961586F31E}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,37 +11,37 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Source", + "base": "DataInput_Source", "details": { "name": "Source" } }, { - "key": "DataInput_Row", + "base": "DataInput_Row", "details": { "name": "Row" } }, { - "key": "DataInput_Column", + "base": "DataInput_Column", "details": { "name": "Column" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_GetRow.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_GetRow.names index f886bcbd50..f85577a201 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_GetRow.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_GetRow.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{89B55821-3E77-5410-B0EC-336A3D747308}", + "base": "{89B55821-3E77-5410-B0EC-336A3D747308}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,31 +11,31 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Source", + "base": "DataInput_Source", "details": { "name": "Source" } }, { - "key": "DataInput_Row", + "base": "DataInput_Row", "details": { "name": "Row" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_GetRows.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_GetRows.names index fc06f37dfb..98834cbfe4 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_GetRows.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_GetRows.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{8DE78AF8-44B4-58D8-AC3B-7B4ED77B75DF}", + "base": "{8DE78AF8-44B4-58D8-AC3B-7B4ED77B75DF}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,37 +11,37 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Source", + "base": "DataInput_Source", "details": { "name": "Source" } }, { - "key": "DataOutput_Row1", + "base": "DataOutput_Row1", "details": { "name": "Row 1" } }, { - "key": "DataOutput_Row2", + "base": "DataOutput_Row2", "details": { "name": "Row 2" } }, { - "key": "DataOutput_Row3", + "base": "DataOutput_Row3", "details": { "name": "Row 3" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_Invert.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_Invert.names index 24131fb847..c128a22337 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_Invert.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_Invert.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{1F420C54-6920-511B-9025-D91E92ABF0C3}", + "base": "{1F420C54-6920-511B-9025-D91E92ABF0C3}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,25 +11,25 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Source", + "base": "DataInput_Source", "details": { "name": "Source" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_IsClose.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_IsClose.names index 403df39120..03d72efaf8 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_IsClose.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_IsClose.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{87F8C39D-47CC-5E63-B02A-675F2F1EE56E}", + "base": "{87F8C39D-47CC-5E63-B02A-675F2F1EE56E}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,37 +11,37 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_A", + "base": "DataInput_A", "details": { "name": "A" } }, { - "key": "DataInput_B", + "base": "DataInput_B", "details": { "name": "B" } }, { - "key": "DataInput_Tolerance", + "base": "DataInput_Tolerance", "details": { "name": "Tolerance" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_IsFinite.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_IsFinite.names index be00053f63..11cf183614 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_IsFinite.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_IsFinite.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{36E2943D-23B3-5CBA-A7EC-AA51288075AA}", + "base": "{36E2943D-23B3-5CBA-A7EC-AA51288075AA}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,25 +11,25 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Source", + "base": "DataInput_Source", "details": { "name": "Source" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_IsOrthogonal.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_IsOrthogonal.names index 68dbdac032..f0e0fba7e1 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_IsOrthogonal.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_IsOrthogonal.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{1A78319F-7924-5114-8D85-C09C6F8D701D}", + "base": "{1A78319F-7924-5114-8D85-C09C6F8D701D}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,25 +11,25 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Source", + "base": "DataInput_Source", "details": { "name": "Source" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_MultiplyByNumber.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_MultiplyByNumber.names index 174394484a..79f5fee679 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_MultiplyByNumber.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_MultiplyByNumber.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{2B0CF330-B397-519C-867F-800AECBB84A8}", + "base": "{2B0CF330-B397-519C-867F-800AECBB84A8}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,31 +11,31 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Source", + "base": "DataInput_Source", "details": { "name": "Source" } }, { - "key": "DataInput_Multiplier", + "base": "DataInput_Multiplier", "details": { "name": "Multiplier" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_MultiplyByVector.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_MultiplyByVector.names index bc6f6fa58e..bd4f2c6ece 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_MultiplyByVector.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_MultiplyByVector.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{6FAEAA22-12D6-51E5-8600-F60103ECFF8C}", + "base": "{6FAEAA22-12D6-51E5-8600-F60103ECFF8C}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,31 +11,31 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Source", + "base": "DataInput_Source", "details": { "name": "Source" } }, { - "key": "DataInput_Vector", + "base": "DataInput_Vector", "details": { "name": "Vector" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_Orthogonalize.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_Orthogonalize.names index 626c0007f0..cb1a2ffc69 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_Orthogonalize.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_Orthogonalize.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{BFC5A535-734B-54E8-BDF1-B60120D831EC}", + "base": "{BFC5A535-734B-54E8-BDF1-B60120D831EC}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,25 +11,25 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Source", + "base": "DataInput_Source", "details": { "name": "Source" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_ToAdjugate.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_ToAdjugate.names index ee10f47d79..32dc94b070 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_ToAdjugate.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_ToAdjugate.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{FDE00D83-D0A6-5ACA-B48B-DD5E0415FF80}", + "base": "{FDE00D83-D0A6-5ACA-B48B-DD5E0415FF80}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,25 +11,25 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Source", + "base": "DataInput_Source", "details": { "name": "Source" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_ToDeterminant.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_ToDeterminant.names index c1f45fec65..eecd614044 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_ToDeterminant.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_ToDeterminant.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{D0C69C1C-1653-54A4-8A5A-1ECB3500D9C1}", + "base": "{D0C69C1C-1653-54A4-8A5A-1ECB3500D9C1}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,25 +11,25 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Source", + "base": "DataInput_Source", "details": { "name": "Source" } }, { - "key": "DataOutput_Determinant", + "base": "DataOutput_Determinant", "details": { "name": "Determinant" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_ToScale.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_ToScale.names index ded60634b3..27680a0107 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_ToScale.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_ToScale.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{8250935C-5B8D-5DF4-9E09-FDA2A445C099}", + "base": "{8250935C-5B8D-5DF4-9E09-FDA2A445C099}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,25 +11,25 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Source", + "base": "DataInput_Source", "details": { "name": "Source" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_Transpose.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_Transpose.names index c03d1e9be7..495a34df7c 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_Transpose.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_Transpose.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{F57314B3-AFD8-5BDB-A0F0-8EAF5C13CAC9}", + "base": "{F57314B3-AFD8-5BDB-A0F0-8EAF5C13CAC9}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,25 +11,25 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Source", + "base": "DataInput_Source", "details": { "name": "Source" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_Zero.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_Zero.names index c9102e659b..036dd90b45 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_Zero.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix3x3_Zero.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{66D46B8E-5722-57DB-8760-61AE1D69E6A3}", + "base": "{66D46B8E-5722-57DB-8760-61AE1D69E6A3}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,19 +11,19 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix4x4_FromColumns.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix4x4_FromColumns.names index 313c923ecb..8ff9f22184 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix4x4_FromColumns.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix4x4_FromColumns.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{B17F2D7F-22DF-512D-BF2A-98890D337661}", + "base": "{B17F2D7F-22DF-512D-BF2A-98890D337661}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -12,43 +12,43 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Vector4: Column1", + "base": "DataInput_Vector4: Column1", "details": { "name": "Vector4: Column1" } }, { - "key": "DataInput_Vector4: Column2", + "base": "DataInput_Vector4: Column2", "details": { "name": "Vector4: Column2" } }, { - "key": "DataInput_Vector4: Column3", + "base": "DataInput_Vector4: Column3", "details": { "name": "Vector4: Column3" } }, { - "key": "DataInput_Vector4: Column4", + "base": "DataInput_Vector4: Column4", "details": { "name": "Vector4: Column4" } }, { - "key": "DataOutput_Result: Matrix4x4", + "base": "DataOutput_Result: Matrix4x4", "details": { "name": "Result: Matrix4x4" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix4x4_FromDiagonal.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix4x4_FromDiagonal.names index 9e20e78471..60d8c29b6d 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix4x4_FromDiagonal.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix4x4_FromDiagonal.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{4DD9115A-D1D0-53B3-8CC5-EA08EAA8BF13}", + "base": "{4DD9115A-D1D0-53B3-8CC5-EA08EAA8BF13}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,25 +11,25 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Source", + "base": "DataInput_Source", "details": { "name": "Source" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix4x4_FromMatrix3x3.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix4x4_FromMatrix3x3.names index 7366425c7f..634489bc27 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix4x4_FromMatrix3x3.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix4x4_FromMatrix3x3.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{ACD49054-0267-55C7-80E9-1513CAD9182F}", + "base": "{ACD49054-0267-55C7-80E9-1513CAD9182F}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,25 +11,25 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Source", + "base": "DataInput_Source", "details": { "name": "Source" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix4x4_FromQuaternion.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix4x4_FromQuaternion.names index af2093be55..abdd77ac84 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix4x4_FromQuaternion.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix4x4_FromQuaternion.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{B522091B-B802-5B9C-97CB-B208F58FC535}", + "base": "{B522091B-B802-5B9C-97CB-B208F58FC535}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -12,25 +12,25 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Quaternion: Source", + "base": "DataInput_Quaternion: Source", "details": { "name": "Quaternion: Source" } }, { - "key": "DataOutput_Result: Matrix4x4", + "base": "DataOutput_Result: Matrix4x4", "details": { "name": "Result: Matrix4x4" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix4x4_FromQuaternionAndTranslation.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix4x4_FromQuaternionAndTranslation.names index c2720c5eaa..a922fb957d 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix4x4_FromQuaternionAndTranslation.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix4x4_FromQuaternionAndTranslation.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{18B8A477-A413-5477-ACA7-8A27C7C9A966}", + "base": "{18B8A477-A413-5477-ACA7-8A27C7C9A966}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,31 +11,31 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Rotation", + "base": "DataInput_Rotation", "details": { "name": "Rotation" } }, { - "key": "DataInput_Translation", + "base": "DataInput_Translation", "details": { "name": "Translation" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix4x4_FromRotationXDegrees.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix4x4_FromRotationXDegrees.names index c4d2296372..092564c7c2 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix4x4_FromRotationXDegrees.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix4x4_FromRotationXDegrees.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{A50EB8F8-1BF9-5E03-9CC3-628CF58A3996}", + "base": "{A50EB8F8-1BF9-5E03-9CC3-628CF58A3996}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,25 +11,25 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Degrees", + "base": "DataInput_Degrees", "details": { "name": "Degrees" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix4x4_FromRotationYDegrees.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix4x4_FromRotationYDegrees.names index 2d99cd99a0..1b1796ed2f 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix4x4_FromRotationYDegrees.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix4x4_FromRotationYDegrees.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{14332A8E-425B-5A31-A8D3-EDFD96DE4BA5}", + "base": "{14332A8E-425B-5A31-A8D3-EDFD96DE4BA5}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -12,25 +12,25 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Number: Degrees", + "base": "DataInput_Number: Degrees", "details": { "name": "Degrees" } }, { - "key": "DataOutput_Result: Matrix4x4", + "base": "DataOutput_Result: Matrix4x4", "details": { "name": "Matrix4x4" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix4x4_FromRotationZDegrees.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix4x4_FromRotationZDegrees.names index 43287ab848..8b449f02a7 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix4x4_FromRotationZDegrees.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix4x4_FromRotationZDegrees.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{99E6908F-AA83-571C-AC12-8DA12B112F79}", + "base": "{99E6908F-AA83-571C-AC12-8DA12B112F79}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,25 +11,25 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Degrees", + "base": "DataInput_Degrees", "details": { "name": "Degrees" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix4x4_FromRows.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix4x4_FromRows.names index faefebca77..fba64d8d32 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix4x4_FromRows.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix4x4_FromRows.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{B5272AB2-1312-5B55-A801-2A976B31665E}", + "base": "{B5272AB2-1312-5B55-A801-2A976B31665E}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,43 +11,43 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Row1", + "base": "DataInput_Row1", "details": { "name": "Row 1" } }, { - "key": "DataInput_Row2", + "base": "DataInput_Row2", "details": { "name": "Row 2" } }, { - "key": "DataInput_Row3", + "base": "DataInput_Row3", "details": { "name": "Row 3" } }, { - "key": "DataInput_Row4", + "base": "DataInput_Row4", "details": { "name": "Row 4" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix4x4_FromScale.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix4x4_FromScale.names index 8be2fed246..314a856dbe 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix4x4_FromScale.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix4x4_FromScale.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{B49D6046-B959-53B1-88AD-E977038DB001}", + "base": "{B49D6046-B959-53B1-88AD-E977038DB001}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -12,25 +12,25 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Vector3: Scale", + "base": "DataInput_Vector3: Scale", "details": { "name": "Vector3: Scale" } }, { - "key": "DataOutput_Result: Matrix4x4", + "base": "DataOutput_Result: Matrix4x4", "details": { "name": "Matrix4x4" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix4x4_FromTransform.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix4x4_FromTransform.names index 3966f964ee..a9e0062987 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix4x4_FromTransform.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix4x4_FromTransform.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{739E534B-CD9B-55DF-9757-89B0C379387F}", + "base": "{739E534B-CD9B-55DF-9757-89B0C379387F}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -12,25 +12,25 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Transform: Transform", + "base": "DataInput_Transform: Transform", "details": { "name": "Transform" } }, { - "key": "DataOutput_Result: Matrix4x4", + "base": "DataOutput_Result: Matrix4x4", "details": { "name": "Matrix4x4" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix4x4_FromTranslation.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix4x4_FromTranslation.names index 0a6606a9c9..45af601aea 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix4x4_FromTranslation.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix4x4_FromTranslation.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{35D8B012-2C19-5570-A606-4E644D01A9AD}", + "base": "{35D8B012-2C19-5570-A606-4E644D01A9AD}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -12,25 +12,25 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Vector3: Source", + "base": "DataInput_Vector3: Source", "details": { "name": "Translation" } }, { - "key": "DataOutput_Result: Matrix4x4", + "base": "DataOutput_Result: Matrix4x4", "details": { "name": "Matrix4x4" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix4x4_GetColumn.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix4x4_GetColumn.names index 6c970c53e3..fbf0e8d1c2 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix4x4_GetColumn.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix4x4_GetColumn.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{DE1D987E-8B96-5899-B663-CA4269A284DC}", + "base": "{DE1D987E-8B96-5899-B663-CA4269A284DC}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -12,31 +12,31 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Matrix4x4: Source", + "base": "DataInput_Matrix4x4: Source", "details": { "name": "Source" } }, { - "key": "DataInput_Number: Column", + "base": "DataInput_Number: Column", "details": { "name": "Column" } }, { - "key": "DataOutput_Result: Vector4", + "base": "DataOutput_Result: Vector4", "details": { "name": "Column" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix4x4_GetColumns.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix4x4_GetColumns.names index 8a4e1e477c..d9f7201afc 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix4x4_GetColumns.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix4x4_GetColumns.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{A2A41479-B90B-5615-A72E-AAB3A6D0332E}", + "base": "{A2A41479-B90B-5615-A72E-AAB3A6D0332E}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -12,43 +12,43 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Matrix4x4: Source", + "base": "DataInput_Matrix4x4: Source", "details": { "name": "Source" } }, { - "key": "DataOutput_Column1: Vector4", + "base": "DataOutput_Column1: Vector4", "details": { "name": "Column 1" } }, { - "key": "DataOutput_Column2: Vector4", + "base": "DataOutput_Column2: Vector4", "details": { "name": "Column 2" } }, { - "key": "DataOutput_Column3: Vector4", + "base": "DataOutput_Column3: Vector4", "details": { "name": "Column 3" } }, { - "key": "DataOutput_Column4: Vector4", + "base": "DataOutput_Column4: Vector4", "details": { "name": "Column 4" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix4x4_GetDiagonal.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix4x4_GetDiagonal.names index 8777669eb2..e1b0efe63c 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix4x4_GetDiagonal.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix4x4_GetDiagonal.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{7ECE6E97-31F9-5455-8560-BB6578CD1F3D}", + "base": "{7ECE6E97-31F9-5455-8560-BB6578CD1F3D}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,25 +11,25 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Source", + "base": "DataInput_Source", "details": { "name": "Source" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix4x4_GetElement.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix4x4_GetElement.names index fb047a7762..c5409e7d8f 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix4x4_GetElement.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix4x4_GetElement.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{2677AF1E-FAC3-5360-96E4-CC3054372340}", + "base": "{2677AF1E-FAC3-5360-96E4-CC3054372340}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,37 +11,37 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Source", + "base": "DataInput_Source", "details": { "name": "Source" } }, { - "key": "DataInput_Row", + "base": "DataInput_Row", "details": { "name": "Row" } }, { - "key": "DataInput_Column", + "base": "DataInput_Column", "details": { "name": "Column" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix4x4_GetRow.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix4x4_GetRow.names index 9c2f1bd04c..09a624c5f3 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix4x4_GetRow.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix4x4_GetRow.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{6A153DA6-666E-59ED-93B7-5EE7F19EFC02}", + "base": "{6A153DA6-666E-59ED-93B7-5EE7F19EFC02}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,31 +11,31 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Source", + "base": "DataInput_Source", "details": { "name": "Source" } }, { - "key": "DataInput_Row", + "base": "DataInput_Row", "details": { "name": "Row" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix4x4_GetRows.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix4x4_GetRows.names index c0209cfa3c..c189d8f68a 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix4x4_GetRows.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix4x4_GetRows.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{3A69C35B-287E-5F0F-A372-713B77B0CBC6}", + "base": "{3A69C35B-287E-5F0F-A372-713B77B0CBC6}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,43 +11,43 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Source", + "base": "DataInput_Source", "details": { "name": "Source" } }, { - "key": "DataOutput_Row1", + "base": "DataOutput_Row1", "details": { "name": "Row1" } }, { - "key": "DataOutput_Row2", + "base": "DataOutput_Row2", "details": { "name": "Row2" } }, { - "key": "DataOutput_Row3", + "base": "DataOutput_Row3", "details": { "name": "Row3" } }, { - "key": "DataOutput_Row4", + "base": "DataOutput_Row4", "details": { "name": "Row4" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix4x4_GetTranslation.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix4x4_GetTranslation.names index 97c74a96fa..b035564d83 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix4x4_GetTranslation.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix4x4_GetTranslation.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{B71EAC83-D0E9-5E1C-B694-6665896F49FE}", + "base": "{B71EAC83-D0E9-5E1C-B694-6665896F49FE}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,25 +11,25 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Source", + "base": "DataInput_Source", "details": { "name": "Source" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix4x4_Invert.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix4x4_Invert.names index 3746071075..89adc7d466 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix4x4_Invert.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix4x4_Invert.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{4E82FDCE-50B3-5AFD-8E96-57E982B94D74}", + "base": "{4E82FDCE-50B3-5AFD-8E96-57E982B94D74}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,25 +11,25 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Source", + "base": "DataInput_Source", "details": { "name": "Source" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix4x4_IsClose.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix4x4_IsClose.names index 3dea7660d6..9bf12495f9 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix4x4_IsClose.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix4x4_IsClose.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{52504B30-D3B4-5C09-80D6-3CAF47DAEB1E}", + "base": "{52504B30-D3B4-5C09-80D6-3CAF47DAEB1E}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,37 +11,37 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_A", + "base": "DataInput_A", "details": { "name": "A" } }, { - "key": "DataInput_B", + "base": "DataInput_B", "details": { "name": "B" } }, { - "key": "DataInput_Tolerance", + "base": "DataInput_Tolerance", "details": { "name": "Tolerance" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix4x4_IsFinite.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix4x4_IsFinite.names index f589f90a96..9fea9efe33 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix4x4_IsFinite.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix4x4_IsFinite.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{90FFB3EE-DBFF-57C7-8D10-136810B762F2}", + "base": "{90FFB3EE-DBFF-57C7-8D10-136810B762F2}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,25 +11,25 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Source", + "base": "DataInput_Source", "details": { "name": "Source" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix4x4_MultiplyByVector.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix4x4_MultiplyByVector.names index b68524d78b..79bb32bbf3 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix4x4_MultiplyByVector.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix4x4_MultiplyByVector.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{CE8BA72E-E595-5653-9229-D77A0CB1BAFA}", + "base": "{CE8BA72E-E595-5653-9229-D77A0CB1BAFA}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,31 +11,31 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Source", + "base": "DataInput_Source", "details": { "name": "Source" } }, { - "key": "DataInput_Vector", + "base": "DataInput_Vector", "details": { "name": "Vector" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix4x4_ToScale.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix4x4_ToScale.names index 1c06bcc228..eeae11fc39 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix4x4_ToScale.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix4x4_ToScale.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{2FB31ABF-7712-5C5F-BE1B-409D1D0AC120}", + "base": "{2FB31ABF-7712-5C5F-BE1B-409D1D0AC120}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,25 +11,25 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Source", + "base": "DataInput_Source", "details": { "name": "Source" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix4x4_Transpose.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix4x4_Transpose.names index 922ac1ee22..621a831e9a 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix4x4_Transpose.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix4x4_Transpose.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{8A4A10DF-A019-57A6-BF9D-493BBCA6B5E2}", + "base": "{8A4A10DF-A019-57A6-BF9D-493BBCA6B5E2}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,25 +11,25 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Source", + "base": "DataInput_Source", "details": { "name": "Source" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix4x4_Zero.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix4x4_Zero.names index 9e2a4628df..3a208bbab5 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix4x4_Zero.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathMatrix4x4_Zero.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{9BCEE0D6-B0A0-5944-AC25-7A8111798704}", + "base": "{9BCEE0D6-B0A0-5944-AC25-7A8111798704}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,19 +11,19 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathNumberDeprecated_Add.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathNumberDeprecated_Add.names index d178d0f04b..9e3a0728d6 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathNumberDeprecated_Add.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathNumberDeprecated_Add.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{6C52B2D1-3526-4855-A217-5106D54F6B90}", + "base": "{6C52B2D1-3526-4855-A217-5106D54F6B90}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -12,33 +12,33 @@ }, "slots": [ { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } }, { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In", "tooltip": "Signal to perform the evaluation when desired." } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out", "tooltip": "Signaled after the arithmetic operation is done." } }, { - "key": "DataInput_Value A", + "base": "DataInput_Value A", "details": { "name": "Value A" } }, { - "key": "DataInput_Value B", + "base": "DataInput_Value B", "details": { "name": "Value B" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathNumberDeprecated_Divide.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathNumberDeprecated_Divide.names index 7d1a6635e4..7f4e449aad 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathNumberDeprecated_Divide.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathNumberDeprecated_Divide.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{7379D5B4-787B-4C46-9394-288F16E5BF3A}", + "base": "{7379D5B4-787B-4C46-9394-288F16E5BF3A}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -12,33 +12,33 @@ }, "slots": [ { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } }, { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In", "tooltip": "Signal to perform the evaluation when desired." } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out", "tooltip": "Signaled after the arithmetic operation is done." } }, { - "key": "DataInput_Value A", + "base": "DataInput_Value A", "details": { "name": "Value A" } }, { - "key": "DataInput_Value B", + "base": "DataInput_Value B", "details": { "name": "Value B" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathNumberDeprecated_Multiply.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathNumberDeprecated_Multiply.names index 7c1f96ab53..57be0e3fb3 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathNumberDeprecated_Multiply.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathNumberDeprecated_Multiply.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{1BC9A5A9-9BF3-4DA7-A8F7-911254AEB243}", + "base": "{1BC9A5A9-9BF3-4DA7-A8F7-911254AEB243}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -12,33 +12,33 @@ }, "slots": [ { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } }, { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In", "tooltip": "Signal to perform the evaluation when desired." } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out", "tooltip": "Signaled after the arithmetic operation is done." } }, { - "key": "DataInput_Value A", + "base": "DataInput_Value A", "details": { "name": "Value A" } }, { - "key": "DataInput_Value B", + "base": "DataInput_Value B", "details": { "name": "Value B" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathNumberDeprecated_Subtract.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathNumberDeprecated_Subtract.names index 01b8a41cae..4fa1764fde 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathNumberDeprecated_Subtract.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathNumberDeprecated_Subtract.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{A10AD4C7-B633-4A75-8210-1353A87441E4}", + "base": "{A10AD4C7-B633-4A75-8210-1353A87441E4}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -12,33 +12,33 @@ }, "slots": [ { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } }, { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In", "tooltip": "Signal to perform the evaluation when desired." } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out", "tooltip": "Signaled after the arithmetic operation is done." } }, { - "key": "DataInput_Value A", + "base": "DataInput_Value A", "details": { "name": "Value A" } }, { - "key": "DataInput_Value B", + "base": "DataInput_Value B", "details": { "name": "Value B" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathOBB_FromAabb.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathOBB_FromAabb.names index 62c13d11c8..9280f009e8 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathOBB_FromAabb.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathOBB_FromAabb.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{25B5779B-C1A0-5963-8F5F-1A7C59F675CD}", + "base": "{25B5779B-C1A0-5963-8F5F-1A7C59F675CD}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,25 +11,25 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Source", + "base": "DataInput_Source", "details": { "name": "Source" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathOBB_FromPositionRotationAndHalfLengths.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathOBB_FromPositionRotationAndHalfLengths.names index d59a1fdd33..bc125f2c9d 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathOBB_FromPositionRotationAndHalfLengths.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathOBB_FromPositionRotationAndHalfLengths.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{6F7A0335-C2D2-53A3-BF18-B3735DBFF8AA}", + "base": "{6F7A0335-C2D2-53A3-BF18-B3735DBFF8AA}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,37 +11,37 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Position", + "base": "DataInput_Position", "details": { "name": "Position" } }, { - "key": "DataInput_Rotation", + "base": "DataInput_Rotation", "details": { "name": "Rotation" } }, { - "key": "DataInput_HalfLengths", + "base": "DataInput_HalfLengths", "details": { "name": "Half Lengths" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathOBB_GetAxisX.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathOBB_GetAxisX.names index abfb3f23f5..5c2860e739 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathOBB_GetAxisX.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathOBB_GetAxisX.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{924A1027-ECC4-574D-808A-E4A4EB128552}", + "base": "{924A1027-ECC4-574D-808A-E4A4EB128552}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,25 +11,25 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Source", + "base": "DataInput_Source", "details": { "name": "Source" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathOBB_GetAxisY.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathOBB_GetAxisY.names index 2bb5294f11..d8d58baa9b 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathOBB_GetAxisY.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathOBB_GetAxisY.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{20C14ACD-F093-5E7D-8EA8-AD89ACDA8438}", + "base": "{20C14ACD-F093-5E7D-8EA8-AD89ACDA8438}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,25 +11,25 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Source", + "base": "DataInput_Source", "details": { "name": "Source" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathOBB_GetAxisZ.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathOBB_GetAxisZ.names index 03363e3123..3f10c5cb1b 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathOBB_GetAxisZ.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathOBB_GetAxisZ.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{1A6BADCE-77F7-59F4-9F27-6C08B9D13374}", + "base": "{1A6BADCE-77F7-59F4-9F27-6C08B9D13374}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,25 +11,25 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Source", + "base": "DataInput_Source", "details": { "name": "Source" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathOBB_GetPosition.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathOBB_GetPosition.names index d69e720586..8165f22a9c 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathOBB_GetPosition.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathOBB_GetPosition.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{44BAE83D-1C90-5026-BD0D-65406C837A27}", + "base": "{44BAE83D-1C90-5026-BD0D-65406C837A27}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,25 +11,25 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Source", + "base": "DataInput_Source", "details": { "name": "Source" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathOBB_IsFinite.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathOBB_IsFinite.names index 73e7d36a6e..6a60006d56 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathOBB_IsFinite.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathOBB_IsFinite.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{150329C4-45BF-5E9C-9358-41C648586F00}", + "base": "{150329C4-45BF-5E9C-9358-41C648586F00}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,25 +11,25 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Source", + "base": "DataInput_Source", "details": { "name": "Source" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathPlane_DistanceToPoint.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathPlane_DistanceToPoint.names index 7d80966095..5353e147be 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathPlane_DistanceToPoint.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathPlane_DistanceToPoint.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{7D49F3FC-A625-5166-9CF6-6F3757A56C14}", + "base": "{7D49F3FC-A625-5166-9CF6-6F3757A56C14}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,31 +11,31 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Source", + "base": "DataInput_Source", "details": { "name": "Source" } }, { - "key": "DataInput_Point", + "base": "DataInput_Point", "details": { "name": "Point" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathPlane_FromCoefficients.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathPlane_FromCoefficients.names index 808f50a2d1..8fc08635fd 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathPlane_FromCoefficients.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathPlane_FromCoefficients.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{C281152D-1617-52B6-BB82-8146F881CCA5}", + "base": "{C281152D-1617-52B6-BB82-8146F881CCA5}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,43 +11,43 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_A", + "base": "DataInput_A", "details": { "name": "A" } }, { - "key": "DataInput_B", + "base": "DataInput_B", "details": { "name": "B" } }, { - "key": "DataInput_C", + "base": "DataInput_C", "details": { "name": "C" } }, { - "key": "DataInput_D", + "base": "DataInput_D", "details": { "name": "D" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathPlane_FromNormalAndDistance.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathPlane_FromNormalAndDistance.names index c4578ba333..52e5389e0f 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathPlane_FromNormalAndDistance.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathPlane_FromNormalAndDistance.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{85C2F69F-4E0D-5336-B1B1-29AE5A8339E2}", + "base": "{85C2F69F-4E0D-5336-B1B1-29AE5A8339E2}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,31 +11,31 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Normal", + "base": "DataInput_Normal", "details": { "name": "Normal" } }, { - "key": "DataInput_Distance", + "base": "DataInput_Distance", "details": { "name": "Distance" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathPlane_FromNormalAndPoint.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathPlane_FromNormalAndPoint.names index e590504d18..3c33889597 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathPlane_FromNormalAndPoint.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathPlane_FromNormalAndPoint.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{ED542A26-BBB3-5747-A40C-2CD08C369C54}", + "base": "{ED542A26-BBB3-5747-A40C-2CD08C369C54}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,31 +11,31 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Normal", + "base": "DataInput_Normal", "details": { "name": "Normal" } }, { - "key": "DataInput_Point", + "base": "DataInput_Point", "details": { "name": "Point" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathPlane_GetDistance.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathPlane_GetDistance.names index d097209d63..5673a596f7 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathPlane_GetDistance.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathPlane_GetDistance.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{5A3021D3-46AC-5751-B057-7B4E476417F3}", + "base": "{5A3021D3-46AC-5751-B057-7B4E476417F3}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,25 +11,25 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Source", + "base": "DataInput_Source", "details": { "name": "Source" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathPlane_GetNormal.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathPlane_GetNormal.names index b149b8451a..4db582ee90 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathPlane_GetNormal.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathPlane_GetNormal.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{76467598-DB87-59DD-8B65-B7636880EAB4}", + "base": "{76467598-DB87-59DD-8B65-B7636880EAB4}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,25 +11,25 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Source", + "base": "DataInput_Source", "details": { "name": "Source" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathPlane_GetPlaneEquationCoefficients.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathPlane_GetPlaneEquationCoefficients.names index 2a904695e9..36c6e35769 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathPlane_GetPlaneEquationCoefficients.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathPlane_GetPlaneEquationCoefficients.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{9F5030EF-15D1-5AEC-988E-8BE2D9C6DD64}", + "base": "{9F5030EF-15D1-5AEC-988E-8BE2D9C6DD64}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,43 +11,43 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Source", + "base": "DataInput_Source", "details": { "name": "Source" } }, { - "key": "DataOutput_A", + "base": "DataOutput_A", "details": { "name": "A" } }, { - "key": "DataOutput_B", + "base": "DataOutput_B", "details": { "name": "B" } }, { - "key": "DataOutput_C", + "base": "DataOutput_C", "details": { "name": "C" } }, { - "key": "DataOutput_D", + "base": "DataOutput_D", "details": { "name": "D" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathPlane_IsFinite.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathPlane_IsFinite.names index efdd4a332e..6bf24dfac5 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathPlane_IsFinite.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathPlane_IsFinite.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{AB336D86-5967-568C-9E2E-D678BAE4DFAC}", + "base": "{AB336D86-5967-568C-9E2E-D678BAE4DFAC}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,25 +11,25 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Source", + "base": "DataInput_Source", "details": { "name": "Source" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathPlane_Project.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathPlane_Project.names index ec23385c33..8ff3251e3b 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathPlane_Project.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathPlane_Project.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{BE7F52C0-3FEA-5C78-BAB1-41A8BFEB38EC}", + "base": "{BE7F52C0-3FEA-5C78-BAB1-41A8BFEB38EC}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,31 +11,31 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Source", + "base": "DataInput_Source", "details": { "name": "Source" } }, { - "key": "DataInput_Point", + "base": "DataInput_Point", "details": { "name": "Point" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathPlane_Transform.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathPlane_Transform.names index f075b312ad..d06be76f8c 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathPlane_Transform.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathPlane_Transform.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{43FB92F5-CBC4-553E-982B-714EA2226D42}", + "base": "{43FB92F5-CBC4-553E-982B-714EA2226D42}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,31 +11,31 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Source", + "base": "DataInput_Source", "details": { "name": "Source" } }, { - "key": "DataInput_Transform", + "base": "DataInput_Transform", "details": { "name": "Transform" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_Conjugate.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_Conjugate.names index 204cd35042..13f58a276b 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_Conjugate.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_Conjugate.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{1328993D-4413-5E46-9116-3AA5C25E97D2}", + "base": "{1328993D-4413-5E46-9116-3AA5C25E97D2}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,25 +11,25 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Source", + "base": "DataInput_Source", "details": { "name": "Source" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_ConvertTransformToRotation.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_ConvertTransformToRotation.names index 3d0d0823b1..bdf1980570 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_ConvertTransformToRotation.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_ConvertTransformToRotation.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{10B3E787-BC20-5317-9553-647D40D79DCD}", + "base": "{10B3E787-BC20-5317-9553-647D40D79DCD}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -10,25 +10,25 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Transform", + "base": "DataInput_Transform", "details": { "name": "Transform" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_CreateFromEulerAngles.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_CreateFromEulerAngles.names index 69cdb0f4b9..3ea8425186 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_CreateFromEulerAngles.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_CreateFromEulerAngles.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{82FB60FB-2417-5BDC-ADF7-9C08DE88E793}", + "base": "{82FB60FB-2417-5BDC-ADF7-9C08DE88E793}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,37 +11,37 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Pitch", + "base": "DataInput_Pitch", "details": { "name": "Pitch" } }, { - "key": "DataInput_Roll", + "base": "DataInput_Roll", "details": { "name": "Roll" } }, { - "key": "DataInput_Yaw", + "base": "DataInput_Yaw", "details": { "name": "Yaw" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_Dot.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_Dot.names index 26fe0c1b79..dce76a8cc0 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_Dot.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_Dot.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{46366DEB-4F16-54AF-A618-073E0E2C1DA4}", + "base": "{46366DEB-4F16-54AF-A618-073E0E2C1DA4}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,31 +11,31 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_A", + "base": "DataInput_A", "details": { "name": "A" } }, { - "key": "DataInput_B", + "base": "DataInput_B", "details": { "name": "B" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_FromAxisAngleDegrees.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_FromAxisAngleDegrees.names index 9851c3fd8f..2007847335 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_FromAxisAngleDegrees.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_FromAxisAngleDegrees.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{6AEAAC03-A8D7-5C29-9F23-07FF59EE55D7}", + "base": "{6AEAAC03-A8D7-5C29-9F23-07FF59EE55D7}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,31 +11,31 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Axis", + "base": "DataInput_Axis", "details": { "name": "Axis" } }, { - "key": "DataInput_Degrees", + "base": "DataInput_Degrees", "details": { "name": "Degrees" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_FromMatrix3x3.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_FromMatrix3x3.names index 906014820e..646714b48d 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_FromMatrix3x3.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_FromMatrix3x3.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{59C4651F-A5E7-59FD-81FE-D7BD07B36346}", + "base": "{59C4651F-A5E7-59FD-81FE-D7BD07B36346}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,25 +11,25 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Source", + "base": "DataInput_Source", "details": { "name": "Source" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_FromMatrix4x4.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_FromMatrix4x4.names index cbfd1dc1ea..b6b38f7297 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_FromMatrix4x4.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_FromMatrix4x4.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{B2C7B9DD-C9DD-5971-AA76-95603BED9BD8}", + "base": "{B2C7B9DD-C9DD-5971-AA76-95603BED9BD8}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,25 +11,25 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Source", + "base": "DataInput_Source", "details": { "name": "Source" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_FromTransform.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_FromTransform.names index 3a708bac08..9fb08ffa2b 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_FromTransform.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_FromTransform.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{2F3E079E-23F9-5BC4-9B1A-DD2FAFBF921F}", + "base": "{2F3E079E-23F9-5BC4-9B1A-DD2FAFBF921F}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,25 +11,25 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Source", + "base": "DataInput_Source", "details": { "name": "Source" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_InvertFull.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_InvertFull.names index fc4ab2f1c7..ceeebae083 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_InvertFull.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_InvertFull.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{25150C46-3ECA-596A-8643-DB9B143D17C9}", + "base": "{25150C46-3ECA-596A-8643-DB9B143D17C9}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,25 +11,25 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Source", + "base": "DataInput_Source", "details": { "name": "Source" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_IsClose.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_IsClose.names index 4af70867e8..302acb0e94 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_IsClose.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_IsClose.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{7CF70E06-039B-5DFB-BA6D-A94DBB010A91}", + "base": "{7CF70E06-039B-5DFB-BA6D-A94DBB010A91}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,37 +11,37 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_A", + "base": "DataInput_A", "details": { "name": "A" } }, { - "key": "DataInput_B", + "base": "DataInput_B", "details": { "name": "B" } }, { - "key": "DataInput_Tolerance", + "base": "DataInput_Tolerance", "details": { "name": "Tolerance" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_IsFinite.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_IsFinite.names index 0ccd7a1ce7..deda4ab105 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_IsFinite.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_IsFinite.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{0FF1A082-1200-57C4-8CE6-A17844BEBD1A}", + "base": "{0FF1A082-1200-57C4-8CE6-A17844BEBD1A}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,25 +11,25 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Source", + "base": "DataInput_Source", "details": { "name": "Source" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_IsIdentity.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_IsIdentity.names index 62655f407c..b4cda49248 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_IsIdentity.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_IsIdentity.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{6D6D359A-BD00-5ADA-B634-C4F6B0949BFF}", + "base": "{6D6D359A-BD00-5ADA-B634-C4F6B0949BFF}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,31 +11,31 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Source", + "base": "DataInput_Source", "details": { "name": "Source" } }, { - "key": "DataInput_Tolerance", + "base": "DataInput_Tolerance", "details": { "name": "Tolerance" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_IsZero.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_IsZero.names index 9ab1882a09..99bde6bd2b 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_IsZero.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_IsZero.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{F7805CC3-4A0A-58BD-968F-5D1CAA4D8215}", + "base": "{F7805CC3-4A0A-58BD-968F-5D1CAA4D8215}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,31 +11,31 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Source", + "base": "DataInput_Source", "details": { "name": "Source" } }, { - "key": "DataInput_Tolerance", + "base": "DataInput_Tolerance", "details": { "name": "Tolerance" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_LengthReciprocal.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_LengthReciprocal.names index 772ab4f4d6..591b61fb3a 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_LengthReciprocal.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_LengthReciprocal.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{4CDE86F1-8ABD-5F13-8BFE-622728F845DC}", + "base": "{4CDE86F1-8ABD-5F13-8BFE-622728F845DC}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,25 +11,25 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Source", + "base": "DataInput_Source", "details": { "name": "Source" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_LengthSquared.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_LengthSquared.names index 8890491e60..1c50bdc5e6 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_LengthSquared.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_LengthSquared.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{FC266E04-338B-57CE-A529-28056AB3AB43}", + "base": "{FC266E04-338B-57CE-A529-28056AB3AB43}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,25 +11,25 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Source", + "base": "DataInput_Source", "details": { "name": "Source" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_Lerp.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_Lerp.names index 16925c829a..11bb5d0816 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_Lerp.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_Lerp.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{A3B1E26D-BF69-5009-A3B4-868DBE3106A3}", + "base": "{A3B1E26D-BF69-5009-A3B4-868DBE3106A3}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,37 +11,37 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_From", + "base": "DataInput_From", "details": { "name": "From" } }, { - "key": "DataInput_To", + "base": "DataInput_To", "details": { "name": "To" } }, { - "key": "DataInput_T", + "base": "DataInput_T", "details": { "name": "T" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_MultiplyByNumber.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_MultiplyByNumber.names index 9c8fdd2ada..d632a64250 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_MultiplyByNumber.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_MultiplyByNumber.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{36ECEF91-815A-5D40-B21F-0CAA4D6DAD53}", + "base": "{36ECEF91-815A-5D40-B21F-0CAA4D6DAD53}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,31 +11,31 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Source", + "base": "DataInput_Source", "details": { "name": "Source" } }, { - "key": "DataInput_Multiplier", + "base": "DataInput_Multiplier", "details": { "name": "Multiplier" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_Negate.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_Negate.names index ac5912acc4..effceed57e 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_Negate.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_Negate.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{0E9A2E40-9EEE-5D46-92BD-60E20F99E96E}", + "base": "{0E9A2E40-9EEE-5D46-92BD-60E20F99E96E}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,25 +11,25 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Source", + "base": "DataInput_Source", "details": { "name": "Source" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_Normalize.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_Normalize.names index c5773851d4..83adfd8e38 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_Normalize.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_Normalize.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{215978F2-1B5F-597D-BE5D-C01A1E77F2BF}", + "base": "{215978F2-1B5F-597D-BE5D-C01A1E77F2BF}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,25 +11,25 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Source", + "base": "DataInput_Source", "details": { "name": "Source" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_RotateVector3.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_RotateVector3.names index cbd26e5162..a18c86703c 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_RotateVector3.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_RotateVector3.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{56C01595-FE08-54FC-9668-D203D59F506D}", + "base": "{56C01595-FE08-54FC-9668-D203D59F506D}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,31 +11,31 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Quaternion", + "base": "DataInput_Quaternion", "details": { "name": "Quaternion" } }, { - "key": "DataInput_Vector", + "base": "DataInput_Vector", "details": { "name": "Vector" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_RotationXDegrees.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_RotationXDegrees.names index 4eb971a203..ad554e2364 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_RotationXDegrees.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_RotationXDegrees.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{261E424C-4241-5777-8742-21945C69FD29}", + "base": "{261E424C-4241-5777-8742-21945C69FD29}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,25 +11,25 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Degrees", + "base": "DataInput_Degrees", "details": { "name": "Degrees" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_RotationYDegrees.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_RotationYDegrees.names index aada946ccc..047af94ec0 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_RotationYDegrees.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_RotationYDegrees.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{66AC039B-8D0D-5E4C-A4EA-20F767C4EAF5}", + "base": "{66AC039B-8D0D-5E4C-A4EA-20F767C4EAF5}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,25 +11,25 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Degrees", + "base": "DataInput_Degrees", "details": { "name": "Degrees" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_RotationZDegrees.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_RotationZDegrees.names index 7a72aa9330..abd872aa1c 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_RotationZDegrees.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_RotationZDegrees.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{1373DA97-B94D-5DBB-9F0C-175CAE46851A}", + "base": "{1373DA97-B94D-5DBB-9F0C-175CAE46851A}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,25 +11,25 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Degrees", + "base": "DataInput_Degrees", "details": { "name": "Degrees" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_ShortestArc.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_ShortestArc.names index deb69f734f..7bed39e779 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_ShortestArc.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_ShortestArc.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{7809B038-3F50-533D-8AEF-35CDBDDFCA71}", + "base": "{7809B038-3F50-533D-8AEF-35CDBDDFCA71}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,31 +11,31 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_From", + "base": "DataInput_From", "details": { "name": "From" } }, { - "key": "DataInput_To", + "base": "DataInput_To", "details": { "name": "To" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_Slerp.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_Slerp.names index a1d1dfa30b..f5a9f2333c 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_Slerp.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_Slerp.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{92A204FE-A6E2-5EB7-B2A2-F782DBA8C1C3}", + "base": "{92A204FE-A6E2-5EB7-B2A2-F782DBA8C1C3}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,37 +11,37 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_From", + "base": "DataInput_From", "details": { "name": "From" } }, { - "key": "DataInput_To", + "base": "DataInput_To", "details": { "name": "To" } }, { - "key": "DataInput_T", + "base": "DataInput_T", "details": { "name": "T" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_Squad.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_Squad.names index c9efc06f69..2c0915cb83 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_Squad.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_Squad.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{E7275C69-D728-5468-9402-C4FBA1ADDA97}", + "base": "{E7275C69-D728-5468-9402-C4FBA1ADDA97}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,49 +11,49 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_From", + "base": "DataInput_From", "details": { "name": "From" } }, { - "key": "DataInput_To", + "base": "DataInput_To", "details": { "name": "To" } }, { - "key": "DataInput_In", + "base": "DataInput_In", "details": { "name": "In" } }, { - "key": "DataInput_Out", + "base": "DataInput_Out", "details": { "name": "Out" } }, { - "key": "DataInput_T", + "base": "DataInput_T", "details": { "name": "T" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_ToAngleDegrees.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_ToAngleDegrees.names index 11efc83cb5..cdfeaaa8e7 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_ToAngleDegrees.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathQuaternion_ToAngleDegrees.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{D3471394-97F1-5A37-82E0-F570B882F9C9}", + "base": "{D3471394-97F1-5A37-82E0-F570B882F9C9}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,25 +11,25 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Source", + "base": "DataInput_Source", "details": { "name": "Source" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathRandom_RandomColor.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathRandom_RandomColor.names index 2e70823599..74c0f7e2e3 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathRandom_RandomColor.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathRandom_RandomColor.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{66072FDF-E318-5A40-B0C1-FD9EE0F59D7B}", + "base": "{66072FDF-E318-5A40-B0C1-FD9EE0F59D7B}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,31 +11,31 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Min", + "base": "DataInput_Min", "details": { "name": "Min" } }, { - "key": "DataInput_Max", + "base": "DataInput_Max", "details": { "name": "Max" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathRandom_RandomGrayscale.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathRandom_RandomGrayscale.names index 15bb0a397c..3fa603ca9a 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathRandom_RandomGrayscale.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathRandom_RandomGrayscale.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{E16EC7BB-A046-5CD7-B26C-0A75358A37F2}", + "base": "{E16EC7BB-A046-5CD7-B26C-0A75358A37F2}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,31 +11,31 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Min", + "base": "DataInput_Min", "details": { "name": "Min" } }, { - "key": "DataInput_Max", + "base": "DataInput_Max", "details": { "name": "Max" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathRandom_RandomInteger.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathRandom_RandomInteger.names index 4fad43953b..0e3131a398 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathRandom_RandomInteger.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathRandom_RandomInteger.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{48BF5246-995E-5EFD-B541-F468937D2423}", + "base": "{48BF5246-995E-5EFD-B541-F468937D2423}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,31 +11,31 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Min", + "base": "DataInput_Min", "details": { "name": "Min" } }, { - "key": "DataInput_Max", + "base": "DataInput_Max", "details": { "name": "Max" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathRandom_RandomNumber.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathRandom_RandomNumber.names index 3dfe2b70c6..f2208525d2 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathRandom_RandomNumber.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathRandom_RandomNumber.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{898C7B53-2829-58ED-A053-1641A2BC14E2}", + "base": "{898C7B53-2829-58ED-A053-1641A2BC14E2}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,31 +11,31 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Min", + "base": "DataInput_Min", "details": { "name": "Min" } }, { - "key": "DataInput_Max", + "base": "DataInput_Max", "details": { "name": "Max" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathRandom_RandomPointInArc.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathRandom_RandomPointInArc.names index 76cc80bb9a..fb23ddf7c2 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathRandom_RandomPointInArc.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathRandom_RandomPointInArc.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{3A668745-A312-5849-A2D3-AEF533F2CE3D}", + "base": "{3A668745-A312-5849-A2D3-AEF533F2CE3D}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,49 +11,49 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Origin", + "base": "DataInput_Origin", "details": { "name": "Origin" } }, { - "key": "DataInput_Direction", + "base": "DataInput_Direction", "details": { "name": "Direction" } }, { - "key": "DataInput_Normal", + "base": "DataInput_Normal", "details": { "name": "Normal" } }, { - "key": "DataInput_Radius", + "base": "DataInput_Radius", "details": { "name": "Radius" } }, { - "key": "DataInput_Angle", + "base": "DataInput_Angle", "details": { "name": "Angle" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathRandom_RandomPointInBox.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathRandom_RandomPointInBox.names index 3e66186f01..a5cd2fdeac 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathRandom_RandomPointInBox.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathRandom_RandomPointInBox.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{8F7532AC-DABD-5EE6-8D84-A063032A82D4}", + "base": "{8F7532AC-DABD-5EE6-8D84-A063032A82D4}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,25 +11,25 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Dimensions", + "base": "DataInput_Dimensions", "details": { "name": "Dimensions" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathRandom_RandomPointInCircle.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathRandom_RandomPointInCircle.names index fa9aa601c7..e4dbeb4dd3 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathRandom_RandomPointInCircle.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathRandom_RandomPointInCircle.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{90F4E470-10AB-5D78-9B20-100132F0BEA9}", + "base": "{90F4E470-10AB-5D78-9B20-100132F0BEA9}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,25 +11,25 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Radius", + "base": "DataInput_Radius", "details": { "name": "Radius" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathRandom_RandomPointInCone.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathRandom_RandomPointInCone.names index 7b48818c3a..4c7270d0f4 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathRandom_RandomPointInCone.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathRandom_RandomPointInCone.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{00464520-3FAA-5725-BE01-4F13A50E430F}", + "base": "{00464520-3FAA-5725-BE01-4F13A50E430F}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,31 +11,31 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Radius", + "base": "DataInput_Radius", "details": { "name": "Radius" } }, { - "key": "DataInput_Angle", + "base": "DataInput_Angle", "details": { "name": "Angle" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathRandom_RandomPointInCylinder.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathRandom_RandomPointInCylinder.names index 4f383fc218..92dcefe8c7 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathRandom_RandomPointInCylinder.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathRandom_RandomPointInCylinder.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{DE205B79-32D5-5FA9-868A-442CE0388F7F}", + "base": "{DE205B79-32D5-5FA9-868A-442CE0388F7F}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,31 +11,31 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Radius", + "base": "DataInput_Radius", "details": { "name": "Radius" } }, { - "key": "DataInput_Height", + "base": "DataInput_Height", "details": { "name": "Height" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathRandom_RandomPointInEllipsoid.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathRandom_RandomPointInEllipsoid.names index 0097ccc4a5..21d3ca2f96 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathRandom_RandomPointInEllipsoid.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathRandom_RandomPointInEllipsoid.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{3234ADB9-4B1E-594B-8AF6-EC857CCA1241}", + "base": "{3234ADB9-4B1E-594B-8AF6-EC857CCA1241}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,25 +11,25 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Dimensions", + "base": "DataInput_Dimensions", "details": { "name": "Dimensions" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathRandom_RandomPointInSphere.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathRandom_RandomPointInSphere.names index ef39e9d0bf..60d4a9cbd8 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathRandom_RandomPointInSphere.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathRandom_RandomPointInSphere.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{5C87299A-E9AF-591D-8E20-4A1B8F4A92CD}", + "base": "{5C87299A-E9AF-591D-8E20-4A1B8F4A92CD}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,25 +11,25 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Radius", + "base": "DataInput_Radius", "details": { "name": "Radius" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathRandom_RandomPointInSquare.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathRandom_RandomPointInSquare.names index 9793721ef9..82d6f6e156 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathRandom_RandomPointInSquare.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathRandom_RandomPointInSquare.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{4CF31307-D138-5021-A5AE-F352C95DC212}", + "base": "{4CF31307-D138-5021-A5AE-F352C95DC212}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,25 +11,25 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Dimensions", + "base": "DataInput_Dimensions", "details": { "name": "Dimensions" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathRandom_RandomPointInWedge.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathRandom_RandomPointInWedge.names index 89f9558c38..401c3afcb4 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathRandom_RandomPointInWedge.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathRandom_RandomPointInWedge.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{A2D614BC-1636-5F54-868A-BF5544910967}", + "base": "{A2D614BC-1636-5F54-868A-BF5544910967}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,55 +11,55 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Origin", + "base": "DataInput_Origin", "details": { "name": "Origin" } }, { - "key": "DataInput_Direction", + "base": "DataInput_Direction", "details": { "name": "Direction" } }, { - "key": "DataInput_Normal", + "base": "DataInput_Normal", "details": { "name": "Normal" } }, { - "key": "DataInput_Radius", + "base": "DataInput_Radius", "details": { "name": "Radius" } }, { - "key": "DataInput_Height", + "base": "DataInput_Height", "details": { "name": "Height" } }, { - "key": "DataInput_Angle", + "base": "DataInput_Angle", "details": { "name": "Angle" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathRandom_RandomPointOnCircle.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathRandom_RandomPointOnCircle.names index 428cd58136..39433c405e 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathRandom_RandomPointOnCircle.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathRandom_RandomPointOnCircle.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{D726B72F-9300-5D21-BE2C-8CB089BFDBA3}", + "base": "{D726B72F-9300-5D21-BE2C-8CB089BFDBA3}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,25 +11,25 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Radius", + "base": "DataInput_Radius", "details": { "name": "Radius" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathRandom_RandomPointOnSphere.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathRandom_RandomPointOnSphere.names index f648814dfc..6e54bb7d72 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathRandom_RandomPointOnSphere.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathRandom_RandomPointOnSphere.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{7DFA3F08-B554-550A-93F8-4D7CBAA775E9}", + "base": "{7DFA3F08-B554-550A-93F8-4D7CBAA775E9}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,25 +11,25 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Radius", + "base": "DataInput_Radius", "details": { "name": "Radius" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathRandom_RandomQuaternion.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathRandom_RandomQuaternion.names index 161d7552d4..ccae17450c 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathRandom_RandomQuaternion.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathRandom_RandomQuaternion.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{E9902EB1-82B9-5EF2-B7B6-51BAFECA0B91}", + "base": "{E9902EB1-82B9-5EF2-B7B6-51BAFECA0B91}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,31 +11,31 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Min", + "base": "DataInput_Min", "details": { "name": "Min" } }, { - "key": "DataInput_Max", + "base": "DataInput_Max", "details": { "name": "Max" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathRandom_RandomUnitVector2.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathRandom_RandomUnitVector2.names index c27266cdcf..e1b9340392 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathRandom_RandomUnitVector2.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathRandom_RandomUnitVector2.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{4DC88D65-16B5-525C-AA9A-5C19F2F9165C}", + "base": "{4DC88D65-16B5-525C-AA9A-5C19F2F9165C}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,19 +11,19 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathRandom_RandomUnitVector3.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathRandom_RandomUnitVector3.names index 2a7ca79279..06990bde99 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathRandom_RandomUnitVector3.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathRandom_RandomUnitVector3.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{D0A2F62C-EB98-51CC-A482-80F9623CE128}", + "base": "{D0A2F62C-EB98-51CC-A482-80F9623CE128}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,19 +11,19 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathRandom_RandomVector2.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathRandom_RandomVector2.names index b185b25309..0128628cb4 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathRandom_RandomVector2.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathRandom_RandomVector2.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{00E27150-6B42-5C54-B600-70051B106C82}", + "base": "{00E27150-6B42-5C54-B600-70051B106C82}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,31 +11,31 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Min", + "base": "DataInput_Min", "details": { "name": "Min" } }, { - "key": "DataInput_Max", + "base": "DataInput_Max", "details": { "name": "Max" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathRandom_RandomVector3.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathRandom_RandomVector3.names index 3be02e9d63..d77f6e96c6 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathRandom_RandomVector3.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathRandom_RandomVector3.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{0A1CA315-EFAB-50DC-8C61-2C9763D25E31}", + "base": "{0A1CA315-EFAB-50DC-8C61-2C9763D25E31}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,31 +11,31 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Min", + "base": "DataInput_Min", "details": { "name": "Min" } }, { - "key": "DataInput_Max", + "base": "DataInput_Max", "details": { "name": "Max" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathRandom_RandomVector4.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathRandom_RandomVector4.names index 060a2aa54c..df7bd9384f 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathRandom_RandomVector4.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathRandom_RandomVector4.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{1C8987BF-7EA0-58CF-A4CC-2A998C9ADA68}", + "base": "{1C8987BF-7EA0-58CF-A4CC-2A998C9ADA68}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,31 +11,31 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Min", + "base": "DataInput_Min", "details": { "name": "Min" } }, { - "key": "DataInput_Max", + "base": "DataInput_Max", "details": { "name": "Max" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathTransform_FromMatrix3x3.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathTransform_FromMatrix3x3.names index 6467b86b65..70826cd581 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathTransform_FromMatrix3x3.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathTransform_FromMatrix3x3.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{BC6D613C-CBE5-5B01-9207-16D0B158799D}", + "base": "{BC6D613C-CBE5-5B01-9207-16D0B158799D}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,25 +11,25 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Source", + "base": "DataInput_Source", "details": { "name": "Source" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathTransform_FromMatrix3x3AndTranslation.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathTransform_FromMatrix3x3AndTranslation.names index a982f27f00..a64be79b93 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathTransform_FromMatrix3x3AndTranslation.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathTransform_FromMatrix3x3AndTranslation.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{D2321D1F-C3B8-516E-AFE2-3A536A89BCAB}", + "base": "{D2321D1F-C3B8-516E-AFE2-3A536A89BCAB}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,31 +11,31 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Matrix", + "base": "DataInput_Matrix", "details": { "name": "Matrix" } }, { - "key": "DataInput_Translation", + "base": "DataInput_Translation", "details": { "name": "Translation" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathTransform_FromRotation.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathTransform_FromRotation.names index 8f9e25ac73..db1f5d7706 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathTransform_FromRotation.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathTransform_FromRotation.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{B5BCF19E-2EF2-584E-B4B6-0FC7E9FEE99B}", + "base": "{B5BCF19E-2EF2-584E-B4B6-0FC7E9FEE99B}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,25 +11,25 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Source", + "base": "DataInput_Source", "details": { "name": "Source" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathTransform_FromRotationAndTranslation.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathTransform_FromRotationAndTranslation.names index 86af19524d..0a44bbe29f 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathTransform_FromRotationAndTranslation.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathTransform_FromRotationAndTranslation.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{C2A304B1-9D48-5A2A-BCEE-69BCD72379E3}", + "base": "{C2A304B1-9D48-5A2A-BCEE-69BCD72379E3}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,31 +11,31 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Rotation", + "base": "DataInput_Rotation", "details": { "name": "Rotation" } }, { - "key": "DataInput_Translation", + "base": "DataInput_Translation", "details": { "name": "Translation" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathTransform_FromScale.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathTransform_FromScale.names index c7b3729287..071ead3598 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathTransform_FromScale.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathTransform_FromScale.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{5DAB6076-4F49-5163-9E3C-CE3DF59E710C}", + "base": "{5DAB6076-4F49-5163-9E3C-CE3DF59E710C}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,25 +11,25 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Scale", + "base": "DataInput_Scale", "details": { "name": "Scale" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathTransform_FromTranslation.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathTransform_FromTranslation.names index 9de04cbca8..391dfd9bee 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathTransform_FromTranslation.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathTransform_FromTranslation.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{DFCF0A6F-9907-52B1-BBF3-632CB929C1B1}", + "base": "{DFCF0A6F-9907-52B1-BBF3-632CB929C1B1}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,25 +11,25 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Translation", + "base": "DataInput_Translation", "details": { "name": "Translation" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathTransform_GetForward.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathTransform_GetForward.names index 60ca484883..9356423bc4 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathTransform_GetForward.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathTransform_GetForward.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{1D27BC5A-44D6-526E-B1EC-4B080B750ED1}", + "base": "{1D27BC5A-44D6-526E-B1EC-4B080B750ED1}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,31 +11,31 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Source", + "base": "DataInput_Source", "details": { "name": "Source" } }, { - "key": "DataInput_Scale", + "base": "DataInput_Scale", "details": { "name": "Scale" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathTransform_GetRight.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathTransform_GetRight.names index 9c9105301e..8723a54349 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathTransform_GetRight.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathTransform_GetRight.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{78E62FB8-7CD0-5E4D-BA31-9E62867C4F6A}", + "base": "{78E62FB8-7CD0-5E4D-BA31-9E62867C4F6A}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,31 +11,31 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Source", + "base": "DataInput_Source", "details": { "name": "Source" } }, { - "key": "DataInput_Scale", + "base": "DataInput_Scale", "details": { "name": "Scale" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathTransform_GetTranslation.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathTransform_GetTranslation.names index 657ae89af1..276db70fa1 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathTransform_GetTranslation.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathTransform_GetTranslation.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{BA0C1841-5632-5329-BCD3-CDF12B1D8682}", + "base": "{BA0C1841-5632-5329-BCD3-CDF12B1D8682}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,25 +11,25 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Source", + "base": "DataInput_Source", "details": { "name": "Source" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathTransform_GetUp.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathTransform_GetUp.names index 9eae139080..cf3dbd3e8c 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathTransform_GetUp.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathTransform_GetUp.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{0351A1F0-7F51-58C2-9ED4-F617B897A523}", + "base": "{0351A1F0-7F51-58C2-9ED4-F617B897A523}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,31 +11,31 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Source", + "base": "DataInput_Source", "details": { "name": "Source" } }, { - "key": "DataInput_Scale", + "base": "DataInput_Scale", "details": { "name": "Scale" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathTransform_IsClose.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathTransform_IsClose.names index 47fdde6039..65af93c3d0 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathTransform_IsClose.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathTransform_IsClose.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{D58A9E0D-5C09-56AB-8D8C-C9C501BA62A3}", + "base": "{D58A9E0D-5C09-56AB-8D8C-C9C501BA62A3}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,37 +11,37 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_A", + "base": "DataInput_A", "details": { "name": "A" } }, { - "key": "DataInput_B", + "base": "DataInput_B", "details": { "name": "B" } }, { - "key": "DataInput_Tolerance", + "base": "DataInput_Tolerance", "details": { "name": "Tolerance" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathTransform_IsFinite.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathTransform_IsFinite.names index 5a820ec8aa..f98506dd62 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathTransform_IsFinite.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathTransform_IsFinite.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{BFF80CFD-5A54-5ADA-83FF-3849FD4E675D}", + "base": "{BFF80CFD-5A54-5ADA-83FF-3849FD4E675D}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,25 +11,25 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Source", + "base": "DataInput_Source", "details": { "name": "Source" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathTransform_IsOrthogonal.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathTransform_IsOrthogonal.names index 77f686a375..f4dd80a4a2 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathTransform_IsOrthogonal.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathTransform_IsOrthogonal.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{D6B704EB-62A7-5CEB-B715-4CD402E1BAF9}", + "base": "{D6B704EB-62A7-5CEB-B715-4CD402E1BAF9}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,31 +11,31 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Source", + "base": "DataInput_Source", "details": { "name": "Source" } }, { - "key": "DataInput_Tolerance", + "base": "DataInput_Tolerance", "details": { "name": "Tolerance" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathTransform_MultiplyByUniformScale.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathTransform_MultiplyByUniformScale.names index a898617aa1..f8bcbc41a7 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathTransform_MultiplyByUniformScale.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathTransform_MultiplyByUniformScale.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{493F14D7-FC42-5544-9BA1-400762EB6D41}", + "base": "{493F14D7-FC42-5544-9BA1-400762EB6D41}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,31 +11,31 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Source", + "base": "DataInput_Source", "details": { "name": "Source" } }, { - "key": "DataInput_Scale", + "base": "DataInput_Scale", "details": { "name": "Scale" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathTransform_MultiplyByVector3.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathTransform_MultiplyByVector3.names index e227c1ef2b..d51e766840 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathTransform_MultiplyByVector3.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathTransform_MultiplyByVector3.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{00EEE23E-7FAC-5DE4-A3B1-9AC4DBD40AE4}", + "base": "{00EEE23E-7FAC-5DE4-A3B1-9AC4DBD40AE4}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,31 +11,31 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Source", + "base": "DataInput_Source", "details": { "name": "Source" } }, { - "key": "DataInput_Multiplier", + "base": "DataInput_Multiplier", "details": { "name": "Multiplier" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathTransform_MultiplyByVector4.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathTransform_MultiplyByVector4.names index 64820d14e1..2e11891d0f 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathTransform_MultiplyByVector4.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathTransform_MultiplyByVector4.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{FB87C32E-BB06-5499-B210-4EE109C419DC}", + "base": "{FB87C32E-BB06-5499-B210-4EE109C419DC}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,31 +11,31 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Source", + "base": "DataInput_Source", "details": { "name": "Source" } }, { - "key": "DataInput_Multiplier", + "base": "DataInput_Multiplier", "details": { "name": "Multiplier" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathTransform_Orthogonalize.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathTransform_Orthogonalize.names index 4e803bc6b7..94598629b6 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathTransform_Orthogonalize.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathTransform_Orthogonalize.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{0CF20F04-C784-546B-80FB-0A705BB3D25A}", + "base": "{0CF20F04-C784-546B-80FB-0A705BB3D25A}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,25 +11,25 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Source", + "base": "DataInput_Source", "details": { "name": "Source" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathTransform_RotationXDegrees.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathTransform_RotationXDegrees.names index d50b4f99e4..353eb26615 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathTransform_RotationXDegrees.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathTransform_RotationXDegrees.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{93283EA1-ADED-53B8-B3BE-A7B933918286}", + "base": "{93283EA1-ADED-53B8-B3BE-A7B933918286}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,25 +11,25 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Degrees", + "base": "DataInput_Degrees", "details": { "name": "Degrees" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathTransform_RotationYDegrees.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathTransform_RotationYDegrees.names index 2da86bdade..d5f5469593 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathTransform_RotationYDegrees.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathTransform_RotationYDegrees.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{380DB52D-3BEB-553C-B903-F5824AE1A0C6}", + "base": "{380DB52D-3BEB-553C-B903-F5824AE1A0C6}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,25 +11,25 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Degrees", + "base": "DataInput_Degrees", "details": { "name": "Degrees" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathTransform_RotationZDegrees.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathTransform_RotationZDegrees.names index 75a0e7d1ec..8431b15578 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathTransform_RotationZDegrees.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathTransform_RotationZDegrees.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{70D7DC40-B9AB-55F6-8E80-A9F8EA9BE964}", + "base": "{70D7DC40-B9AB-55F6-8E80-A9F8EA9BE964}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,25 +11,25 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Degrees", + "base": "DataInput_Degrees", "details": { "name": "Degrees" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathTransform_ToScale.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathTransform_ToScale.names index 3e9da773e0..531f0b1b38 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathTransform_ToScale.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathTransform_ToScale.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{AC6712AA-0494-5879-B7F8-4B04352924DE}", + "base": "{AC6712AA-0494-5879-B7F8-4B04352924DE}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,25 +11,25 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Source", + "base": "DataInput_Source", "details": { "name": "Source" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector2_Absolute.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector2_Absolute.names index 8eb626b066..bd72341c6d 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector2_Absolute.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector2_Absolute.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{97858B5F-57A8-5DE4-BA1D-ABE2504DE79D}", + "base": "{97858B5F-57A8-5DE4-BA1D-ABE2504DE79D}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,25 +11,25 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Source", + "base": "DataInput_Source", "details": { "name": "Source" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector2_Angle.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector2_Angle.names index d70cb4b898..7efe070c80 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector2_Angle.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector2_Angle.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{BAA9A44B-EC0E-536B-B64A-EA652596F40A}", + "base": "{BAA9A44B-EC0E-536B-B64A-EA652596F40A}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,25 +11,25 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Angle", + "base": "DataInput_Angle", "details": { "name": "Angle" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector2_Clamp.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector2_Clamp.names index 970b1647a8..2a4f580d95 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector2_Clamp.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector2_Clamp.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{636D27FE-E3E3-5983-A364-9147CD42F2D2}", + "base": "{636D27FE-E3E3-5983-A364-9147CD42F2D2}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,37 +11,37 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Source", + "base": "DataInput_Source", "details": { "name": "Source" } }, { - "key": "DataInput_Min", + "base": "DataInput_Min", "details": { "name": "Min" } }, { - "key": "DataInput_Max", + "base": "DataInput_Max", "details": { "name": "Max" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector2_DirectionTo.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector2_DirectionTo.names index 53b667f5d4..58ef596560 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector2_DirectionTo.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector2_DirectionTo.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{ECDE911F-56B4-5D91-86A6-32C4F9461305}", + "base": "{ECDE911F-56B4-5D91-86A6-32C4F9461305}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,37 +11,37 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_From", + "base": "DataInput_From", "details": { "name": "From" } }, { - "key": "DataInput_To", + "base": "DataInput_To", "details": { "name": "To" } }, { - "key": "DataInput_Scale", + "base": "DataInput_Scale", "details": { "name": "Scale" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector2_Distance.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector2_Distance.names index 81c7caac36..5d6b79ef69 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector2_Distance.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector2_Distance.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{38BE4B13-7B8C-5FCF-9313-74E6C9C3BE06}", + "base": "{38BE4B13-7B8C-5FCF-9313-74E6C9C3BE06}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,31 +11,31 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_A", + "base": "DataInput_A", "details": { "name": "A" } }, { - "key": "DataInput_B", + "base": "DataInput_B", "details": { "name": "B" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector2_DistanceSquared.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector2_DistanceSquared.names index d8282d40d0..cc12b409ee 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector2_DistanceSquared.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector2_DistanceSquared.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{1CBF4712-4BB5-5FB9-BC5F-C34E0C076334}", + "base": "{1CBF4712-4BB5-5FB9-BC5F-C34E0C076334}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,31 +11,31 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_A", + "base": "DataInput_A", "details": { "name": "A" } }, { - "key": "DataInput_B", + "base": "DataInput_B", "details": { "name": "B" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector2_Dot.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector2_Dot.names index 21a9836da5..19db3eb635 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector2_Dot.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector2_Dot.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{9F91A118-D85A-5357-ACE3-92A78AA2C4FC}", + "base": "{9F91A118-D85A-5357-ACE3-92A78AA2C4FC}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,31 +11,31 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_A", + "base": "DataInput_A", "details": { "name": "A" } }, { - "key": "DataInput_B", + "base": "DataInput_B", "details": { "name": "B" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector2_FromValues.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector2_FromValues.names index 1825d3b69f..d68a9ffc30 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector2_FromValues.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector2_FromValues.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{10158AAB-73B0-5863-A7CA-11616E05CBE4}", + "base": "{10158AAB-73B0-5863-A7CA-11616E05CBE4}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,31 +11,31 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_X", + "base": "DataInput_X", "details": { "name": "X" } }, { - "key": "DataInput_Y", + "base": "DataInput_Y", "details": { "name": "Y" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector2_GetElement.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector2_GetElement.names index 4abdac379a..bcd119556c 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector2_GetElement.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector2_GetElement.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{4843E512-0335-5411-A548-8AC8245B6845}", + "base": "{4843E512-0335-5411-A548-8AC8245B6845}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,31 +11,31 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Source", + "base": "DataInput_Source", "details": { "name": "Source" } }, { - "key": "DataInput_Index", + "base": "DataInput_Index", "details": { "name": "Index" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector2_IsClose.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector2_IsClose.names index 30d0f9eab6..4146bc08de 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector2_IsClose.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector2_IsClose.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{82F6EBA6-BBF5-5063-84E6-8C4BCEF7E4A3}", + "base": "{82F6EBA6-BBF5-5063-84E6-8C4BCEF7E4A3}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,37 +11,37 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_A", + "base": "DataInput_A", "details": { "name": "A" } }, { - "key": "DataInput_B", + "base": "DataInput_B", "details": { "name": "B" } }, { - "key": "DataInput_Tolerance", + "base": "DataInput_Tolerance", "details": { "name": "Tolerance" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector2_IsFinite.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector2_IsFinite.names index d170de9066..9b45bb21b7 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector2_IsFinite.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector2_IsFinite.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{3D6F65B5-020D-55EE-B807-C54D10DDC647}", + "base": "{3D6F65B5-020D-55EE-B807-C54D10DDC647}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,25 +11,25 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Source", + "base": "DataInput_Source", "details": { "name": "Source" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector2_IsNormalized.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector2_IsNormalized.names index aecdcde55d..151baa29b0 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector2_IsNormalized.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector2_IsNormalized.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{AD815735-ED31-535E-BEEF-471259B271E3}", + "base": "{AD815735-ED31-535E-BEEF-471259B271E3}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,31 +11,31 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Source", + "base": "DataInput_Source", "details": { "name": "Source" } }, { - "key": "DataInput_Tolerance", + "base": "DataInput_Tolerance", "details": { "name": "Tolerance" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector2_IsZero.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector2_IsZero.names index d0869fffd0..3f183cfe56 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector2_IsZero.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector2_IsZero.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{A8F6E886-BFCC-5546-8516-1564C1A56D18}", + "base": "{A8F6E886-BFCC-5546-8516-1564C1A56D18}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,31 +11,31 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Source", + "base": "DataInput_Source", "details": { "name": "Source" } }, { - "key": "DataInput_Tolerance", + "base": "DataInput_Tolerance", "details": { "name": "Tolerance" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector2_Length.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector2_Length.names index 99e7922e75..cb76ac347b 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector2_Length.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector2_Length.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{AD0A51F8-F87B-504E-84F0-8C60927D3798}", + "base": "{AD0A51F8-F87B-504E-84F0-8C60927D3798}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,25 +11,25 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Source", + "base": "DataInput_Source", "details": { "name": "Source" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector2_LengthSquared.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector2_LengthSquared.names index 6ff64af10f..112d82d5e3 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector2_LengthSquared.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector2_LengthSquared.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{EF19330A-6FF7-5B8C-B029-C429525A3223}", + "base": "{EF19330A-6FF7-5B8C-B029-C429525A3223}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,25 +11,25 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Source", + "base": "DataInput_Source", "details": { "name": "Source" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector2_Lerp.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector2_Lerp.names index 78bf3b0d6f..49711526b7 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector2_Lerp.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector2_Lerp.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{978B5227-CE5B-501A-8EA8-54DE40DFF558}", + "base": "{978B5227-CE5B-501A-8EA8-54DE40DFF558}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,37 +11,37 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_From", + "base": "DataInput_From", "details": { "name": "From" } }, { - "key": "DataInput_To", + "base": "DataInput_To", "details": { "name": "To" } }, { - "key": "DataInput_T", + "base": "DataInput_T", "details": { "name": "T" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector2_Max.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector2_Max.names index 6b906d80bf..d6ff44c21c 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector2_Max.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector2_Max.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{5CA4EE87-53A9-514C-8278-F311F447B7B1}", + "base": "{5CA4EE87-53A9-514C-8278-F311F447B7B1}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,31 +11,31 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_A", + "base": "DataInput_A", "details": { "name": "A" } }, { - "key": "DataInput_B", + "base": "DataInput_B", "details": { "name": "B" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector2_Min.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector2_Min.names index bc50faf138..5563f69c00 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector2_Min.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector2_Min.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{894F73E5-0447-5627-9B16-FDD649DA7A42}", + "base": "{894F73E5-0447-5627-9B16-FDD649DA7A42}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,31 +11,31 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_A", + "base": "DataInput_A", "details": { "name": "A" } }, { - "key": "DataInput_B", + "base": "DataInput_B", "details": { "name": "B" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector2_MultiplyByNumber.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector2_MultiplyByNumber.names index 14e227c51d..f63137d25f 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector2_MultiplyByNumber.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector2_MultiplyByNumber.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{4FA0D3F0-A95B-5DEB-B46D-E9D08C43D55E}", + "base": "{4FA0D3F0-A95B-5DEB-B46D-E9D08C43D55E}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,31 +11,31 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Source", + "base": "DataInput_Source", "details": { "name": "Source" } }, { - "key": "DataInput_Multiplier", + "base": "DataInput_Multiplier", "details": { "name": "Multiplier" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector2_Negate.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector2_Negate.names index d0501ee1b3..1eb48cf3a5 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector2_Negate.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector2_Negate.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{E4C28D60-B4AA-555A-BE46-DB4D7196C532}", + "base": "{E4C28D60-B4AA-555A-BE46-DB4D7196C532}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,25 +11,25 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Source", + "base": "DataInput_Source", "details": { "name": "Source" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector2_Normalize.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector2_Normalize.names index a8c9e0ef3b..ae4ee365ef 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector2_Normalize.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector2_Normalize.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{E019ADBA-0793-5653-A4BD-446F41FED0BC}", + "base": "{E019ADBA-0793-5653-A4BD-446F41FED0BC}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,25 +11,25 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Source", + "base": "DataInput_Source", "details": { "name": "Source" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector2_Project.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector2_Project.names index e6a60b35aa..e6bd531852 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector2_Project.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector2_Project.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{F4826124-F3C7-59B5-B92B-4CD00AADFED3}", + "base": "{F4826124-F3C7-59B5-B92B-4CD00AADFED3}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,31 +11,31 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_A", + "base": "DataInput_A", "details": { "name": "A" } }, { - "key": "DataInput_B", + "base": "DataInput_B", "details": { "name": "B" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector2_SetX.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector2_SetX.names index 001c062eb8..4a96a8154e 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector2_SetX.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector2_SetX.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{6FA3AADA-3B14-5C7C-8F7C-75818C3AEC94}", + "base": "{6FA3AADA-3B14-5C7C-8F7C-75818C3AEC94}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,31 +11,31 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Source", + "base": "DataInput_Source", "details": { "name": "Source" } }, { - "key": "DataInput_X", + "base": "DataInput_X", "details": { "name": "X" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector2_SetY.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector2_SetY.names index cb0655fafc..bdde07b53c 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector2_SetY.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector2_SetY.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{2969A368-000E-5723-8821-1B97790917E7}", + "base": "{2969A368-000E-5723-8821-1B97790917E7}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,31 +11,31 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Source", + "base": "DataInput_Source", "details": { "name": "Source" } }, { - "key": "DataInput_Y", + "base": "DataInput_Y", "details": { "name": "Y" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector2_Slerp.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector2_Slerp.names index d6e29b7a5f..26b5579174 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector2_Slerp.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector2_Slerp.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{6071D322-86AF-5900-B073-33E74146525B}", + "base": "{6071D322-86AF-5900-B073-33E74146525B}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,37 +11,37 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_From", + "base": "DataInput_From", "details": { "name": "From" } }, { - "key": "DataInput_To", + "base": "DataInput_To", "details": { "name": "To" } }, { - "key": "DataInput_T", + "base": "DataInput_T", "details": { "name": "T" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector2_ToPerpendicular.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector2_ToPerpendicular.names index 5ea65c816c..f78ec6a232 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector2_ToPerpendicular.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector2_ToPerpendicular.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{78889490-B826-5682-9464-117DB8083AF4}", + "base": "{78889490-B826-5682-9464-117DB8083AF4}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,25 +11,25 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Source", + "base": "DataInput_Source", "details": { "name": "Source" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_Absolute.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_Absolute.names index dbaeb967a2..a20c7413d7 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_Absolute.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_Absolute.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{8C3D49FD-9913-5104-B67B-2DFC9223E08B}", + "base": "{8C3D49FD-9913-5104-B67B-2DFC9223E08B}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,25 +11,25 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Source", + "base": "DataInput_Source", "details": { "name": "Source" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_BuildTangentBasis.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_BuildTangentBasis.names index 05aec1da52..8f08fb24c2 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_BuildTangentBasis.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_BuildTangentBasis.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{07875A9A-81DF-59BA-95E8-3BB5D3E7CF0E}", + "base": "{07875A9A-81DF-59BA-95E8-3BB5D3E7CF0E}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,31 +11,31 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Normal", + "base": "DataInput_Normal", "details": { "name": "Normal" } }, { - "key": "DataOutput_Tangent", + "base": "DataOutput_Tangent", "details": { "name": "Tangent" } }, { - "key": "DataOutput_Bitangent", + "base": "DataOutput_Bitangent", "details": { "name": "Bitangent" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_Clamp.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_Clamp.names index 28e5747493..15109364fd 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_Clamp.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_Clamp.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{F14339D1-DB1C-584F-A91E-2D10D29255DF}", + "base": "{F14339D1-DB1C-584F-A91E-2D10D29255DF}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,37 +11,37 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Source", + "base": "DataInput_Source", "details": { "name": "Source" } }, { - "key": "DataInput_Min", + "base": "DataInput_Min", "details": { "name": "Min" } }, { - "key": "DataInput_Max", + "base": "DataInput_Max", "details": { "name": "Max" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_Cross.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_Cross.names index 64f6d9f992..a23b88920e 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_Cross.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_Cross.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{8645F3FA-D1BE-59A2-B183-19FEA198101D}", + "base": "{8645F3FA-D1BE-59A2-B183-19FEA198101D}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,31 +11,31 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_A", + "base": "DataInput_A", "details": { "name": "A" } }, { - "key": "DataInput_B", + "base": "DataInput_B", "details": { "name": "B" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_DirectionTo.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_DirectionTo.names index b0e542b842..5071b5d52c 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_DirectionTo.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_DirectionTo.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{CA0FE782-4D45-5CFD-94D4-88CC687429FB}", + "base": "{CA0FE782-4D45-5CFD-94D4-88CC687429FB}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,37 +11,37 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_From", + "base": "DataInput_From", "details": { "name": "From" } }, { - "key": "DataInput_To", + "base": "DataInput_To", "details": { "name": "To" } }, { - "key": "DataInput_Scale", + "base": "DataInput_Scale", "details": { "name": "Scale" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_Distance.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_Distance.names index 1c8df2ccc5..3d38a8d9d1 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_Distance.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_Distance.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{2326F5E9-022F-5754-9A65-8E4BBD712A5A}", + "base": "{2326F5E9-022F-5754-9A65-8E4BBD712A5A}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,31 +11,31 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_A", + "base": "DataInput_A", "details": { "name": "A" } }, { - "key": "DataInput_B", + "base": "DataInput_B", "details": { "name": "B" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_DistanceSquared.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_DistanceSquared.names index 5e33d91136..56f45fbec4 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_DistanceSquared.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_DistanceSquared.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{920C0CA6-3393-5AC7-805E-09D52E134ED4}", + "base": "{920C0CA6-3393-5AC7-805E-09D52E134ED4}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,31 +11,31 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_A", + "base": "DataInput_A", "details": { "name": "A" } }, { - "key": "DataInput_B", + "base": "DataInput_B", "details": { "name": "B" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_Dot.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_Dot.names index 06a80b4078..c86dac30a0 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_Dot.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_Dot.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{233F747E-7E53-5F9F-8355-EBF96FAAAEE4}", + "base": "{233F747E-7E53-5F9F-8355-EBF96FAAAEE4}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,31 +11,31 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_A", + "base": "DataInput_A", "details": { "name": "A" } }, { - "key": "DataInput_B", + "base": "DataInput_B", "details": { "name": "B" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_FromValues.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_FromValues.names index 42a47d5fcf..10831f85ed 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_FromValues.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_FromValues.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{A3F601EF-4E3C-5852-ADE9-D3F8FA9D571D}", + "base": "{A3F601EF-4E3C-5852-ADE9-D3F8FA9D571D}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,37 +11,37 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_X", + "base": "DataInput_X", "details": { "name": "X" } }, { - "key": "DataInput_Y", + "base": "DataInput_Y", "details": { "name": "Y" } }, { - "key": "DataInput_Z", + "base": "DataInput_Z", "details": { "name": "Z" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_GetElement.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_GetElement.names index 89d4c218e4..ae6ce083ac 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_GetElement.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_GetElement.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{E009C313-15F5-5B1F-99F0-8C83555BA8E1}", + "base": "{E009C313-15F5-5B1F-99F0-8C83555BA8E1}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,31 +11,31 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Source", + "base": "DataInput_Source", "details": { "name": "Source" } }, { - "key": "DataInput_Index", + "base": "DataInput_Index", "details": { "name": "Index" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_IsClose.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_IsClose.names index 2eef451673..5e5c09923c 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_IsClose.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_IsClose.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{4C54A897-39D7-5612-AAA6-B5CC25D65CE2}", + "base": "{4C54A897-39D7-5612-AAA6-B5CC25D65CE2}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,37 +11,37 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_A", + "base": "DataInput_A", "details": { "name": "A" } }, { - "key": "DataInput_B", + "base": "DataInput_B", "details": { "name": "B" } }, { - "key": "DataInput_Tolerance", + "base": "DataInput_Tolerance", "details": { "name": "Tolerance" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_IsFinite.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_IsFinite.names index c1e14e8db0..e527e8bf35 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_IsFinite.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_IsFinite.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{7C09FF34-0608-57A9-8CEE-66DCA0485F08}", + "base": "{7C09FF34-0608-57A9-8CEE-66DCA0485F08}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,25 +11,25 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Source", + "base": "DataInput_Source", "details": { "name": "Source" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_IsNormalized.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_IsNormalized.names index 35f2e6421a..e9f64e84fb 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_IsNormalized.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_IsNormalized.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{7C895C3A-972B-5CF4-9F1D-62C2A9BBBEAD}", + "base": "{7C895C3A-972B-5CF4-9F1D-62C2A9BBBEAD}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,31 +11,31 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Source", + "base": "DataInput_Source", "details": { "name": "Source" } }, { - "key": "DataInput_Tolerance", + "base": "DataInput_Tolerance", "details": { "name": "Tolerance" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_IsPerpendicular.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_IsPerpendicular.names index 82c3388632..c4adec6436 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_IsPerpendicular.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_IsPerpendicular.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{775DA8B7-881F-55AF-911B-9CD28DC5F9B0}", + "base": "{775DA8B7-881F-55AF-911B-9CD28DC5F9B0}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,37 +11,37 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_A", + "base": "DataInput_A", "details": { "name": "A" } }, { - "key": "DataInput_B", + "base": "DataInput_B", "details": { "name": "B" } }, { - "key": "DataInput_Tolerance", + "base": "DataInput_Tolerance", "details": { "name": "Tolerance" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_IsZero.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_IsZero.names index 0d80b3395c..f65485eb78 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_IsZero.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_IsZero.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{282F32C7-5806-5C1A-BA31-E14E37913599}", + "base": "{282F32C7-5806-5C1A-BA31-E14E37913599}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,31 +11,31 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Source", + "base": "DataInput_Source", "details": { "name": "Source" } }, { - "key": "DataInput_Tolerance", + "base": "DataInput_Tolerance", "details": { "name": "Tolerance" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_Length.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_Length.names index 4c23c9cbbd..6861dab138 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_Length.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_Length.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{899CC124-10D8-5081-BD8E-00BD2B0DAD2B}", + "base": "{899CC124-10D8-5081-BD8E-00BD2B0DAD2B}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,25 +11,25 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Source", + "base": "DataInput_Source", "details": { "name": "Source" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_LengthReciprocal.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_LengthReciprocal.names index be22489f6d..12ded27f2e 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_LengthReciprocal.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_LengthReciprocal.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{299657FE-6A44-52DA-919E-3F266EFC7535}", + "base": "{299657FE-6A44-52DA-919E-3F266EFC7535}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,25 +11,25 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Source", + "base": "DataInput_Source", "details": { "name": "Source" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_LengthSquared.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_LengthSquared.names index 4c6d79d1e5..9a97dbb263 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_LengthSquared.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_LengthSquared.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{12A6C1D4-5C8A-5FFB-B7BC-E5E983DA72CC}", + "base": "{12A6C1D4-5C8A-5FFB-B7BC-E5E983DA72CC}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,25 +11,25 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Source", + "base": "DataInput_Source", "details": { "name": "Source" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_Lerp.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_Lerp.names index 5d0b9792c9..c320ce31a5 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_Lerp.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_Lerp.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{722A4327-0D64-5ADF-BCDD-CDCF7EDDD16D}", + "base": "{722A4327-0D64-5ADF-BCDD-CDCF7EDDD16D}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,37 +11,37 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_From", + "base": "DataInput_From", "details": { "name": "From" } }, { - "key": "DataInput_To", + "base": "DataInput_To", "details": { "name": "To" } }, { - "key": "DataInput_T", + "base": "DataInput_T", "details": { "name": "T" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_Max.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_Max.names index 38acf91419..d429e45202 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_Max.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_Max.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{C1E9BE9C-DD4E-5AD5-BFBD-23A012619BD3}", + "base": "{C1E9BE9C-DD4E-5AD5-BFBD-23A012619BD3}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,31 +11,31 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_A", + "base": "DataInput_A", "details": { "name": "A" } }, { - "key": "DataInput_B", + "base": "DataInput_B", "details": { "name": "B" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_Min.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_Min.names index 1a47a31834..eef2baf012 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_Min.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_Min.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{343EA674-C05F-5803-BB86-C6D26C3F6D89}", + "base": "{343EA674-C05F-5803-BB86-C6D26C3F6D89}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,31 +11,31 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_A", + "base": "DataInput_A", "details": { "name": "A" } }, { - "key": "DataInput_B", + "base": "DataInput_B", "details": { "name": "B" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_MultiplyByNumber.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_MultiplyByNumber.names index 95e2710e33..9637449b22 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_MultiplyByNumber.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_MultiplyByNumber.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{B1CAAC2D-A568-5CB2-B580-5B239D013466}", + "base": "{B1CAAC2D-A568-5CB2-B580-5B239D013466}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,31 +11,31 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Source", + "base": "DataInput_Source", "details": { "name": "Source" } }, { - "key": "DataInput_Multiplier", + "base": "DataInput_Multiplier", "details": { "name": "Multiplier" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_Negate.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_Negate.names index e578384975..b0fa0beae4 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_Negate.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_Negate.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{A239FB13-643C-5D47-9580-A373491FECCA}", + "base": "{A239FB13-643C-5D47-9580-A373491FECCA}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,25 +11,25 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Source", + "base": "DataInput_Source", "details": { "name": "Source" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_Normalize.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_Normalize.names index cf0a181d0b..a0f535b4d4 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_Normalize.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_Normalize.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{CF4EBDEE-B16A-5402-B44D-75FF06AD89AE}", + "base": "{CF4EBDEE-B16A-5402-B44D-75FF06AD89AE}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,25 +11,25 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Source", + "base": "DataInput_Source", "details": { "name": "Source" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_Project.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_Project.names index 80df59908d..ff18755ecb 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_Project.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_Project.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{D24123BA-6C59-5F58-90E2-FCB085384BAA}", + "base": "{D24123BA-6C59-5F58-90E2-FCB085384BAA}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,31 +11,31 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_A", + "base": "DataInput_A", "details": { "name": "A" } }, { - "key": "DataInput_B", + "base": "DataInput_B", "details": { "name": "B" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_Reciprocal.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_Reciprocal.names index dd3de8c146..de65bf82ea 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_Reciprocal.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_Reciprocal.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{E90663EA-FFD1-5908-8530-3C21BD6A9A62}", + "base": "{E90663EA-FFD1-5908-8530-3C21BD6A9A62}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,25 +11,25 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Source", + "base": "DataInput_Source", "details": { "name": "Source" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_SetX.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_SetX.names index 47e3273302..7db313ffca 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_SetX.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_SetX.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{A5945988-1E94-5560-B1EE-B513AD113E1C}", + "base": "{A5945988-1E94-5560-B1EE-B513AD113E1C}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,31 +11,31 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Source", + "base": "DataInput_Source", "details": { "name": "Source" } }, { - "key": "DataInput_X", + "base": "DataInput_X", "details": { "name": "X" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_SetY.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_SetY.names index 8456f9de21..db5299df5b 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_SetY.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_SetY.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{08880FE1-8C3E-5380-A3FF-CA1AE16953FC}", + "base": "{08880FE1-8C3E-5380-A3FF-CA1AE16953FC}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,31 +11,31 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Source", + "base": "DataInput_Source", "details": { "name": "Source" } }, { - "key": "DataInput_Y", + "base": "DataInput_Y", "details": { "name": "Y" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_SetZ.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_SetZ.names index a92a4e5a7f..c8239d2d46 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_SetZ.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_SetZ.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{12C93A22-5B0B-55CC-90FC-7DB17C1C36DF}", + "base": "{12C93A22-5B0B-55CC-90FC-7DB17C1C36DF}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,31 +11,31 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Source", + "base": "DataInput_Source", "details": { "name": "Source" } }, { - "key": "DataInput_Z", + "base": "DataInput_Z", "details": { "name": "Z" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_Slerp.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_Slerp.names index 09251d7f13..5052d03400 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_Slerp.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector3_Slerp.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{55EA4F53-2789-54B2-9CC7-4DB62B2CB270}", + "base": "{55EA4F53-2789-54B2-9CC7-4DB62B2CB270}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,37 +11,37 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_From", + "base": "DataInput_From", "details": { "name": "From" } }, { - "key": "DataInput_To", + "base": "DataInput_To", "details": { "name": "To" } }, { - "key": "DataInput_T", + "base": "DataInput_T", "details": { "name": "T" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector4_Absolute.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector4_Absolute.names index 5ea08e0e68..c5ebee0f5a 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector4_Absolute.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector4_Absolute.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{A5BAEA40-C676-5C16-AEA0-D01C78E5918E}", + "base": "{A5BAEA40-C676-5C16-AEA0-D01C78E5918E}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,25 +11,25 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Source", + "base": "DataInput_Source", "details": { "name": "Source" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector4_DirectionTo.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector4_DirectionTo.names index d1fdcbe653..e8ab09461e 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector4_DirectionTo.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector4_DirectionTo.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{1FC1ABCB-220E-5CBF-AE38-14E7389D0AE4}", + "base": "{1FC1ABCB-220E-5CBF-AE38-14E7389D0AE4}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,37 +11,37 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_From", + "base": "DataInput_From", "details": { "name": "From" } }, { - "key": "DataInput_To", + "base": "DataInput_To", "details": { "name": "To" } }, { - "key": "DataInput_Scale", + "base": "DataInput_Scale", "details": { "name": "Scale" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector4_Dot.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector4_Dot.names index 59dfbbc61f..d780f4379b 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector4_Dot.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector4_Dot.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{59AF8BA5-11BA-5E5E-982C-2E7A8C6600D4}", + "base": "{59AF8BA5-11BA-5E5E-982C-2E7A8C6600D4}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,31 +11,31 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_A", + "base": "DataInput_A", "details": { "name": "A" } }, { - "key": "DataInput_B", + "base": "DataInput_B", "details": { "name": "B" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector4_FromValues.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector4_FromValues.names index 73f6088330..1f362d71f9 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector4_FromValues.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector4_FromValues.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{DFDC391C-782D-58D9-BF81-C7B13A0F4CFC}", + "base": "{DFDC391C-782D-58D9-BF81-C7B13A0F4CFC}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,43 +11,43 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_X", + "base": "DataInput_X", "details": { "name": "X" } }, { - "key": "DataInput_Y", + "base": "DataInput_Y", "details": { "name": "Y" } }, { - "key": "DataInput_Z", + "base": "DataInput_Z", "details": { "name": "Z" } }, { - "key": "DataInput_W", + "base": "DataInput_W", "details": { "name": "W" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector4_GetElement.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector4_GetElement.names index 7b37a541e7..f09bda9acf 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector4_GetElement.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector4_GetElement.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{1AC44E60-9560-58DD-A210-48A755155D6D}", + "base": "{1AC44E60-9560-58DD-A210-48A755155D6D}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,31 +11,31 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Source", + "base": "DataInput_Source", "details": { "name": "Source" } }, { - "key": "DataInput_Index", + "base": "DataInput_Index", "details": { "name": "Index" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector4_IsClose.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector4_IsClose.names index 583d85d028..5881c02adb 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector4_IsClose.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector4_IsClose.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{DD9F50A6-AC60-59E1-8C63-C6C392DA8C15}", + "base": "{DD9F50A6-AC60-59E1-8C63-C6C392DA8C15}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,37 +11,37 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_A", + "base": "DataInput_A", "details": { "name": "A" } }, { - "key": "DataInput_B", + "base": "DataInput_B", "details": { "name": "B" } }, { - "key": "DataInput_Tolerance", + "base": "DataInput_Tolerance", "details": { "name": "Tolerance" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector4_IsFinite.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector4_IsFinite.names index 603a38f9c8..9e1c8e5ba0 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector4_IsFinite.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector4_IsFinite.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{138EE359-9CA0-520B-873D-90C2183C96FE}", + "base": "{138EE359-9CA0-520B-873D-90C2183C96FE}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,25 +11,25 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Source", + "base": "DataInput_Source", "details": { "name": "Source" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector4_IsNormalized.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector4_IsNormalized.names index 7ae2964f40..92b367b6e2 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector4_IsNormalized.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector4_IsNormalized.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{B2EE1FD3-D33D-5348-AC29-E2D08C1E3363}", + "base": "{B2EE1FD3-D33D-5348-AC29-E2D08C1E3363}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,31 +11,31 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Source", + "base": "DataInput_Source", "details": { "name": "Source" } }, { - "key": "DataInput_Tolerance", + "base": "DataInput_Tolerance", "details": { "name": "Tolerance" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector4_IsZero.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector4_IsZero.names index a1bbb08d27..6d2bacb0b2 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector4_IsZero.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector4_IsZero.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{EBD3BEF3-0FA8-5508-8C9B-BDCA64A00E5E}", + "base": "{EBD3BEF3-0FA8-5508-8C9B-BDCA64A00E5E}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,31 +11,31 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Source", + "base": "DataInput_Source", "details": { "name": "Source" } }, { - "key": "DataInput_Tolerance", + "base": "DataInput_Tolerance", "details": { "name": "Tolerance" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector4_Length.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector4_Length.names index b6329060b3..2aa5585b43 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector4_Length.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector4_Length.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{768CD3CA-09E3-51EB-AE59-8D34DC0D12A8}", + "base": "{768CD3CA-09E3-51EB-AE59-8D34DC0D12A8}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,25 +11,25 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Source", + "base": "DataInput_Source", "details": { "name": "Source" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector4_LengthReciprocal.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector4_LengthReciprocal.names index cfe495d8a6..4affd32f7c 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector4_LengthReciprocal.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector4_LengthReciprocal.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{60E6D939-6105-53CB-865B-4F401A1B487B}", + "base": "{60E6D939-6105-53CB-865B-4F401A1B487B}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,25 +11,25 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Source", + "base": "DataInput_Source", "details": { "name": "Source" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector4_LengthSquared.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector4_LengthSquared.names index f4602d127a..1abb6d4e9b 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector4_LengthSquared.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector4_LengthSquared.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{4DFB1966-BDE3-55C3-A0B4-0D04926AB732}", + "base": "{4DFB1966-BDE3-55C3-A0B4-0D04926AB732}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,25 +11,25 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Source", + "base": "DataInput_Source", "details": { "name": "Source" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector4_MultiplyByNumber.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector4_MultiplyByNumber.names index 556582c9d8..c9cd4b2513 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector4_MultiplyByNumber.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector4_MultiplyByNumber.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{317BA61D-AEEA-566E-A113-2384C5BDADD6}", + "base": "{317BA61D-AEEA-566E-A113-2384C5BDADD6}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,31 +11,31 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Source", + "base": "DataInput_Source", "details": { "name": "Source" } }, { - "key": "DataInput_Multiplier", + "base": "DataInput_Multiplier", "details": { "name": "Multiplier" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector4_Negate.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector4_Negate.names index 8cf9ae9226..74da5c724d 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector4_Negate.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector4_Negate.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{B8B0E83E-F1C3-5F0B-93A5-1756B79E1316}", + "base": "{B8B0E83E-F1C3-5F0B-93A5-1756B79E1316}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,25 +11,25 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Source", + "base": "DataInput_Source", "details": { "name": "Source" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector4_Normalize.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector4_Normalize.names index 5b1dc01d6f..9d51b0e78d 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector4_Normalize.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector4_Normalize.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{9337FBC7-20D8-51C7-8D69-D9E53B739BD7}", + "base": "{9337FBC7-20D8-51C7-8D69-D9E53B739BD7}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,25 +11,25 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Source", + "base": "DataInput_Source", "details": { "name": "Source" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector4_Reciprocal.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector4_Reciprocal.names index 82a67c218a..f493b7bf20 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector4_Reciprocal.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector4_Reciprocal.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{A7AB6D14-CDAF-519D-B29F-2E1292257A4C}", + "base": "{A7AB6D14-CDAF-519D-B29F-2E1292257A4C}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,25 +11,25 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Source", + "base": "DataInput_Source", "details": { "name": "Source" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector4_SetW.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector4_SetW.names index 79d028c7c3..c89ebd7840 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector4_SetW.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector4_SetW.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{48337108-38AA-5A58-BBFD-D15560A0B685}", + "base": "{48337108-38AA-5A58-BBFD-D15560A0B685}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,31 +11,31 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Source", + "base": "DataInput_Source", "details": { "name": "Source" } }, { - "key": "DataInput_W", + "base": "DataInput_W", "details": { "name": "W" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector4_SetX.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector4_SetX.names index ea852cfdc5..b9b9e96845 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector4_SetX.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector4_SetX.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{E39B02FA-3231-57AC-8D2F-E9448E2CECD3}", + "base": "{E39B02FA-3231-57AC-8D2F-E9448E2CECD3}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,31 +11,31 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Source", + "base": "DataInput_Source", "details": { "name": "Source" } }, { - "key": "DataInput_X", + "base": "DataInput_X", "details": { "name": "X" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector4_SetY.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector4_SetY.names index 9f3e456472..f0f2b04cf8 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector4_SetY.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector4_SetY.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{45D44536-DCE8-5CC1-9311-9BC79BBF333C}", + "base": "{45D44536-DCE8-5CC1-9311-9BC79BBF333C}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,31 +11,31 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Source", + "base": "DataInput_Source", "details": { "name": "Source" } }, { - "key": "DataInput_Y", + "base": "DataInput_Y", "details": { "name": "Y" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector4_SetZ.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector4_SetZ.names index b3db2cb06c..3467d2ca52 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector4_SetZ.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathVector4_SetZ.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{8CC2A1A7-FD41-5C7B-BC1A-BEF5BBF74D62}", + "base": "{8CC2A1A7-FD41-5C7B-BC1A-BEF5BBF74D62}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,31 +11,31 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Source", + "base": "DataInput_Source", "details": { "name": "Source" } }, { - "key": "DataInput_Z", + "base": "DataInput_Z", "details": { "name": "Z" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Math_Add_+_.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Math_Add_+_.names index c48a0bdaf7..fb9b199a4d 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Math_Add_+_.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Math_Add_+_.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{C1B42FEC-0545-4511-9FAC-11E0387FEDF0}", + "base": "{C1B42FEC-0545-4511-9FAC-11E0387FEDF0}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -12,31 +12,31 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Value", + "base": "DataInput_Value", "details": { "name": "Value" } }, { - "key": "DataInput_Value", + "base": "DataInput_Value", "details": { "name": "Value" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Math_Divide__.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Math_Divide__.names index b5aa513ee4..40d1552274 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Math_Divide__.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Math_Divide__.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{DC17E19F-3829-410D-9A0B-AD60C6066DAA}", + "base": "{DC17E19F-3829-410D-9A0B-AD60C6066DAA}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -12,31 +12,31 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Value", + "base": "DataInput_Value", "details": { "name": "Value" } }, { - "key": "DataInput_Value", + "base": "DataInput_Value", "details": { "name": "Value" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Math_DividebyNumber__.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Math_DividebyNumber__.names index 9b56075a42..45005dc5c4 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Math_DividebyNumber__.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Math_DividebyNumber__.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{8305B5C9-1B9F-4D5B-B3E7-66925F491E9D}", + "base": "{8305B5C9-1B9F-4D5B-B3E7-66925F491E9D}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -12,31 +12,31 @@ }, "slots": [ { - "key": "DataInput_Divisor", + "base": "DataInput_Divisor", "details": { "name": "Divisor" } }, { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Source", + "base": "DataInput_Source", "details": { "name": "Source" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Math_Length.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Math_Length.names index 172d57f5db..3f2a833f95 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Math_Length.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Math_Length.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{AEE15BEA-CD51-4C1A-B06D-C09FB9EAA005}", + "base": "{AEE15BEA-CD51-4C1A-B06D-C09FB9EAA005}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -12,25 +12,25 @@ }, "slots": [ { - "key": "DataOutput_Length", + "base": "DataOutput_Length", "details": { "name": "Length" } }, { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Source", + "base": "DataInput_Source", "details": { "name": "Source" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Math_LerpBetween.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Math_LerpBetween.names index a63e64bfa4..53eaa8ebb6 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Math_LerpBetween.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Math_LerpBetween.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{A4CFB2F2-4045-47ED-AE73-ED60C2072EE4}", + "base": "{A4CFB2F2-4045-47ED-AE73-ED60C2072EE4}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,78 +11,78 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In", "tooltip": "Starts the lerp action from the beginning." } }, { - "key": "DataInput_Start", + "base": "DataInput_Start", "details": { "name": "Start" } }, { - "key": "DataInput_Stop", + "base": "DataInput_Stop", "details": { "name": "Stop" } }, { - "key": "DataInput_Speed", + "base": "DataInput_Speed", "details": { "name": "Speed" } }, { - "key": "DataInput_Maximum Duration", + "base": "DataInput_Maximum Duration", "details": { "name": "Maximum Duration" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out", "tooltip": "Executes immediately after the lerp action is started." } }, { - "key": "Input_Cancel", + "base": "Input_Cancel", "details": { "name": "Cancel", "tooltip": "Stops the lerp action immediately." } }, { - "key": "Output_Canceled", + "base": "Output_Canceled", "details": { "name": "Canceled", "tooltip": "Executes immediately after the operation is canceled." } }, { - "key": "Output_Tick", + "base": "Output_Tick", "details": { "name": "Tick", "tooltip": "Signaled at each step of the lerp." } }, { - "key": "DataOutput_Step", + "base": "DataOutput_Step", "details": { "name": "Step" } }, { - "key": "DataOutput_Percent", + "base": "DataOutput_Percent", "details": { "name": "Percent" } }, { - "key": "Output_Lerp Complete", + "base": "Output_Lerp Complete", "details": { "name": "Lerp Complete", "tooltip": "Signaled after the last Tick, when the lerp is complete" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Math_MathExpression.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Math_MathExpression.names index 552aa8a101..4928054d0e 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Math_MathExpression.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Math_MathExpression.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{A5841DE8-CA11-4364-9C34-5ECE8B9623D7}", + "base": "{A5841DE8-CA11-4364-9C34-5ECE8B9623D7}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -12,20 +12,20 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In", "tooltip": "Input signal" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out", "tooltip": "Output signal" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Math_MultiplyAndAdd.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Math_MultiplyAndAdd.names index accfab49fc..f8af2d0c67 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Math_MultiplyAndAdd.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Math_MultiplyAndAdd.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{9A2FDC22-90E1-5A32-9670-156BB7EE8149}", + "base": "{9A2FDC22-90E1-5A32-9670-156BB7EE8149}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -10,37 +10,37 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Multiplicand", + "base": "DataInput_Multiplicand", "details": { "name": "Multiplicand" } }, { - "key": "DataInput_Multiplier", + "base": "DataInput_Multiplier", "details": { "name": "Multiplier" } }, { - "key": "DataInput_Addend", + "base": "DataInput_Addend", "details": { "name": "Addend" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Math_Multiply_x_.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Math_Multiply_x_.names index ba52de3900..6293bab799 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Math_Multiply_x_.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Math_Multiply_x_.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{E9BB45A1-AE96-47B0-B2BF-2927D420A28C}", + "base": "{E9BB45A1-AE96-47B0-B2BF-2927D420A28C}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -12,31 +12,31 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Value", + "base": "DataInput_Value", "details": { "name": "Value" } }, { - "key": "DataInput_Value", + "base": "DataInput_Value", "details": { "name": "Value" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Math_StringToNumber.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Math_StringToNumber.names index e6423917de..534d469271 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Math_StringToNumber.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Math_StringToNumber.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{8A57777C-AD84-5CF4-B411-03ABF982EF55}", + "base": "{8A57777C-AD84-5CF4-B411-03ABF982EF55}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,19 +11,19 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Math_Subtract_-_.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Math_Subtract_-_.names index 67ed5cf859..423ec056ea 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Math_Subtract_-_.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Math_Subtract_-_.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{D0615D0A-027F-47F6-A02B-E35DAF22F431}", + "base": "{D0615D0A-027F-47F6-A02B-E35DAF22F431}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -12,31 +12,31 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Value", + "base": "DataInput_Value", "details": { "name": "Value" } }, { - "key": "DataInput_Value", + "base": "DataInput_Value", "details": { "name": "Value" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Math_ThreeGeneric.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Math_ThreeGeneric.names index edcbe2783a..9b73829ea8 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Math_ThreeGeneric.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Math_ThreeGeneric.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{9E334D28-CBB3-53AF-AFA1-8223F50312CE}", + "base": "{9E334D28-CBB3-53AF-AFA1-8223F50312CE}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -12,49 +12,49 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Vector3: One", + "base": "DataInput_Vector3: One", "details": { "name": "Vector3: One" } }, { - "key": "DataInput_String: Two", + "base": "DataInput_String: Two", "details": { "name": "String: Two" } }, { - "key": "DataInput_Boolean: Three", + "base": "DataInput_Boolean: Three", "details": { "name": "Boolean: Three" } }, { - "key": "DataOutput_One: Vector3", + "base": "DataOutput_One: Vector3", "details": { "name": "One: Vector3" } }, { - "key": "DataOutput_Two: String", + "base": "DataOutput_Two: String", "details": { "name": "Two: String" } }, { - "key": "DataOutput_Three: Boolean", + "base": "DataOutput_Three: Boolean", "details": { "name": "Three: Boolean" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Nodeables_Duration.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Nodeables_Duration.names index 67aca7a003..a1153b6eac 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Nodeables_Duration.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Nodeables_Duration.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{CCF1F41F-39C2-C847-9D9E-0155C8B46E1C}", + "base": "{CCF1F41F-39C2-C847-9D9E-0155C8B46E1C}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,38 +11,38 @@ }, "slots": [ { - "key": "Input_Start", + "base": "Input_Start", "details": { "name": "Start" } }, { - "key": "DataInput_Duration", + "base": "DataInput_Duration", "details": { "name": "Duration" } }, { - "key": "Output_On Start", + "base": "Output_On Start", "details": { "name": "On Start" } }, { - "key": "Output_OnTick", + "base": "Output_OnTick", "details": { "name": "OnTick", "tooltip": "Signaled every frame while the duration is active." } }, { - "key": "DataOutput_Elapsed", + "base": "DataOutput_Elapsed", "details": { "name": "Elapsed" } }, { - "key": "Output_Done", + "base": "Output_Done", "details": { "name": "Done", "tooltip": "Signaled after waiting for the specified amount of times." diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Nodeables_Repeater.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Nodeables_Repeater.names index 7f2fe575d7..21f18b994f 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Nodeables_Repeater.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Nodeables_Repeater.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{AB587027-2270-4CA6-242F-6069C6D9BBB6}", + "base": "{AB587027-2270-4CA6-242F-6069C6D9BBB6}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,38 +11,38 @@ }, "slots": [ { - "key": "Input_Start", + "base": "Input_Start", "details": { "name": "Start" } }, { - "key": "DataInput_Repetitions", + "base": "DataInput_Repetitions", "details": { "name": "Repetitions" } }, { - "key": "DataInput_Interval", + "base": "DataInput_Interval", "details": { "name": "Interval" } }, { - "key": "Output_On Start", + "base": "Output_On Start", "details": { "name": "On Start" } }, { - "key": "Output_Complete", + "base": "Output_Complete", "details": { "name": "Complete", "tooltip": "Signaled upon node exit" } }, { - "key": "Output_Action", + "base": "Output_Action", "details": { "name": "Action", "tooltip": "Signaled every repetition" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Nodeables_TimeDelay.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Nodeables_TimeDelay.names index fdf9afb0a1..dd4c6412f3 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Nodeables_TimeDelay.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Nodeables_TimeDelay.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{D3629902-02E9-AE59-0424-F366D342B433}", + "base": "{D3629902-02E9-AE59-0424-F366D342B433}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,25 +11,25 @@ }, "slots": [ { - "key": "Input_Start", + "base": "Input_Start", "details": { "name": "Start" } }, { - "key": "DataInput_Delay", + "base": "DataInput_Delay", "details": { "name": "Delay" } }, { - "key": "Output_On Start", + "base": "Output_On Start", "details": { "name": "On Start" } }, { - "key": "Output_Done", + "base": "Output_Done", "details": { "name": "Done", "tooltip": "Signaled after waiting for the specified amount of times." diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/OperatorsMath_OperatorArithmeticUnary.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/OperatorsMath_OperatorArithmeticUnary.names index 3b14103cc8..8f3826e4f0 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/OperatorsMath_OperatorArithmeticUnary.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/OperatorsMath_OperatorArithmeticUnary.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{4B68DF49-35DE-48CF-BCE3-F892CCF2639D}", + "base": "{4B68DF49-35DE-48CF-BCE3-F892CCF2639D}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,31 +11,31 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Value", + "base": "DataInput_Value", "details": { "name": "Value" } }, { - "key": "DataInput_Value", + "base": "DataInput_Value", "details": { "name": "Value" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Operators_OperatorArithmetic.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Operators_OperatorArithmetic.names index f01ee442be..20913eedaf 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Operators_OperatorArithmetic.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Operators_OperatorArithmetic.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{FE0589B0-F835-4CD5-BBD3-86510CBB985B}", + "base": "{FE0589B0-F835-4CD5-BBD3-86510CBB985B}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,31 +11,31 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Value", + "base": "DataInput_Value", "details": { "name": "Value" } }, { - "key": "DataInput_Value", + "base": "DataInput_Value", "details": { "name": "Value" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Operators_OperatorBase.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Operators_OperatorBase.names index 523ca60c85..9b62348cdc 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Operators_OperatorBase.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Operators_OperatorBase.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{30FED030-71ED-4498-AB2C-F5586DFA490E}", + "base": "{30FED030-71ED-4498-AB2C-F5586DFA490E}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,14 +11,14 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In", "tooltip": "Input signal" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out", "tooltip": "Output signal" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/PhysXWorld_BoxCastWithGroup.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/PhysXWorld_BoxCastWithGroup.names index ceed8314ba..671fdd730e 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/PhysXWorld_BoxCastWithGroup.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/PhysXWorld_BoxCastWithGroup.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{022255F7-DD50-5654-967E-6E00E8360F00}", + "base": "{022255F7-DD50-5654-967E-6E00E8360F00}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,85 +11,85 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Distance", + "base": "DataInput_Distance", "details": { "name": "Distance" } }, { - "key": "DataInput_Pose", + "base": "DataInput_Pose", "details": { "name": "Pose" } }, { - "key": "DataInput_Direction", + "base": "DataInput_Direction", "details": { "name": "Direction" } }, { - "key": "DataInput_Dimensions", + "base": "DataInput_Dimensions", "details": { "name": "Dimensions" } }, { - "key": "DataInput_Collision group", + "base": "DataInput_Collision group", "details": { "name": "Collision group" } }, { - "key": "DataInput_Ignore", + "base": "DataInput_Ignore", "details": { "name": "Ignore" } }, { - "key": "DataOutput_Object Hit", + "base": "DataOutput_Object Hit", "details": { "name": "Object Hit" } }, { - "key": "DataOutput_Position", + "base": "DataOutput_Position", "details": { "name": "Position" } }, { - "key": "DataOutput_Normal", + "base": "DataOutput_Normal", "details": { "name": "Normal" } }, { - "key": "DataOutput_Distance", + "base": "DataOutput_Distance", "details": { "name": "Distance" } }, { - "key": "DataOutput_EntityId", + "base": "DataOutput_EntityId", "details": { "name": "EntityId" } }, { - "key": "DataOutput_Surface", + "base": "DataOutput_Surface", "details": { "name": "Surface" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/PhysXWorld_CapsuleCastWithGroup.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/PhysXWorld_CapsuleCastWithGroup.names index a38ace417c..4dfca63478 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/PhysXWorld_CapsuleCastWithGroup.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/PhysXWorld_CapsuleCastWithGroup.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{1467D2BE-D829-5A8A-976D-6D06FDCD3310}", + "base": "{1467D2BE-D829-5A8A-976D-6D06FDCD3310}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,91 +11,91 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Distance", + "base": "DataInput_Distance", "details": { "name": "Distance" } }, { - "key": "DataInput_Pose", + "base": "DataInput_Pose", "details": { "name": "Pose" } }, { - "key": "DataInput_Direction", + "base": "DataInput_Direction", "details": { "name": "Direction" } }, { - "key": "DataInput_Height", + "base": "DataInput_Height", "details": { "name": "Height" } }, { - "key": "DataInput_Radius", + "base": "DataInput_Radius", "details": { "name": "Radius" } }, { - "key": "DataInput_Collision group", + "base": "DataInput_Collision group", "details": { "name": "Collision group" } }, { - "key": "DataInput_Ignore", + "base": "DataInput_Ignore", "details": { "name": "Ignore" } }, { - "key": "DataOutput_Object Hit", + "base": "DataOutput_Object Hit", "details": { "name": "Object Hit" } }, { - "key": "DataOutput_Position", + "base": "DataOutput_Position", "details": { "name": "Position" } }, { - "key": "DataOutput_Normal", + "base": "DataOutput_Normal", "details": { "name": "Normal" } }, { - "key": "DataOutput_Distance", + "base": "DataOutput_Distance", "details": { "name": "Distance" } }, { - "key": "DataOutput_EntityId", + "base": "DataOutput_EntityId", "details": { "name": "EntityId" } }, { - "key": "DataOutput_Surface", + "base": "DataOutput_Surface", "details": { "name": "Surface" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/PhysXWorld_OverlapBoxWithGroup.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/PhysXWorld_OverlapBoxWithGroup.names index 9b2e0a6c0b..f49e3d2461 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/PhysXWorld_OverlapBoxWithGroup.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/PhysXWorld_OverlapBoxWithGroup.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{B4F46A1B-7C2F-553F-BAE8-867066A365FA}", + "base": "{B4F46A1B-7C2F-553F-BAE8-867066A365FA}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,43 +11,43 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Pose", + "base": "DataInput_Pose", "details": { "name": "Pose" } }, { - "key": "DataInput_Dimensions", + "base": "DataInput_Dimensions", "details": { "name": "Dimensions" } }, { - "key": "DataInput_Collision group", + "base": "DataInput_Collision group", "details": { "name": "Collision group" } }, { - "key": "DataInput_Ignore", + "base": "DataInput_Ignore", "details": { "name": "Ignore" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/PhysXWorld_OverlapCapsuleWithGroup.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/PhysXWorld_OverlapCapsuleWithGroup.names index c7ac36a35e..291dc8ea75 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/PhysXWorld_OverlapCapsuleWithGroup.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/PhysXWorld_OverlapCapsuleWithGroup.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{588E1C8F-D18E-5C00-AF13-C4FCD5A9519D}", + "base": "{588E1C8F-D18E-5C00-AF13-C4FCD5A9519D}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,49 +11,49 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Pose", + "base": "DataInput_Pose", "details": { "name": "Pose" } }, { - "key": "DataInput_Height", + "base": "DataInput_Height", "details": { "name": "Height" } }, { - "key": "DataInput_Radius", + "base": "DataInput_Radius", "details": { "name": "Radius" } }, { - "key": "DataInput_Collision group", + "base": "DataInput_Collision group", "details": { "name": "Collision group" } }, { - "key": "DataInput_Ignore", + "base": "DataInput_Ignore", "details": { "name": "Ignore" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/PhysXWorld_OverlapSphereWithGroup.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/PhysXWorld_OverlapSphereWithGroup.names index de088ff96b..bd48cbf7ad 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/PhysXWorld_OverlapSphereWithGroup.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/PhysXWorld_OverlapSphereWithGroup.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{4BEFF98E-4147-55AF-B105-29085951CBA9}", + "base": "{4BEFF98E-4147-55AF-B105-29085951CBA9}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,43 +11,43 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Position", + "base": "DataInput_Position", "details": { "name": "Position" } }, { - "key": "DataInput_Radius", + "base": "DataInput_Radius", "details": { "name": "Radius" } }, { - "key": "DataInput_Collision group", + "base": "DataInput_Collision group", "details": { "name": "Collision group" } }, { - "key": "DataInput_Ignore", + "base": "DataInput_Ignore", "details": { "name": "Ignore" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/PhysXWorld_RayCastLocalSpaceWithGroup.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/PhysXWorld_RayCastLocalSpaceWithGroup.names index 3724ef2bc0..a61a7a1579 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/PhysXWorld_RayCastLocalSpaceWithGroup.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/PhysXWorld_RayCastLocalSpaceWithGroup.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{BD7F9C50-62EA-56C0-9B8B-D23E5D28300D}", + "base": "{BD7F9C50-62EA-56C0-9B8B-D23E5D28300D}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,79 +11,79 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Source", + "base": "DataInput_Source", "details": { "name": "Source" } }, { - "key": "DataInput_Direction", + "base": "DataInput_Direction", "details": { "name": "Direction" } }, { - "key": "DataInput_Distance", + "base": "DataInput_Distance", "details": { "name": "Distance" } }, { - "key": "DataInput_Collision group", + "base": "DataInput_Collision group", "details": { "name": "Collision group" } }, { - "key": "DataInput_Ignore", + "base": "DataInput_Ignore", "details": { "name": "Ignore" } }, { - "key": "DataOutput_Object hit", + "base": "DataOutput_Object hit", "details": { "name": "Object hit" } }, { - "key": "DataOutput_Position", + "base": "DataOutput_Position", "details": { "name": "Position" } }, { - "key": "DataOutput_Normal", + "base": "DataOutput_Normal", "details": { "name": "Normal" } }, { - "key": "DataOutput_Distance", + "base": "DataOutput_Distance", "details": { "name": "Distance" } }, { - "key": "DataOutput_EntityId", + "base": "DataOutput_EntityId", "details": { "name": "EntityId" } }, { - "key": "DataOutput_Surface", + "base": "DataOutput_Surface", "details": { "name": "Surface" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/PhysXWorld_RayCastMultipleLocalSpaceWithGroup.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/PhysXWorld_RayCastMultipleLocalSpaceWithGroup.names index 4d0504b0fd..f2d2934035 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/PhysXWorld_RayCastMultipleLocalSpaceWithGroup.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/PhysXWorld_RayCastMultipleLocalSpaceWithGroup.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{FB91B476-0015-508A-AC0B-18F8A860EB7A}", + "base": "{FB91B476-0015-508A-AC0B-18F8A860EB7A}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,49 +11,49 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Source", + "base": "DataInput_Source", "details": { "name": "Source" } }, { - "key": "DataInput_Direction", + "base": "DataInput_Direction", "details": { "name": "Direction" } }, { - "key": "DataInput_Distance", + "base": "DataInput_Distance", "details": { "name": "Distance" } }, { - "key": "DataInput_Collision group", + "base": "DataInput_Collision group", "details": { "name": "Collision group" } }, { - "key": "DataInput_Ignore", + "base": "DataInput_Ignore", "details": { "name": "Ignore" } }, { - "key": "DataOutput_Objects hit", + "base": "DataOutput_Objects hit", "details": { "name": "Objects hit" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/PhysXWorld_RayCastWorldSpaceWithGroup.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/PhysXWorld_RayCastWorldSpaceWithGroup.names index 194f9aebf0..8051204ab7 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/PhysXWorld_RayCastWorldSpaceWithGroup.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/PhysXWorld_RayCastWorldSpaceWithGroup.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{33EE1562-D9B5-5DA2-BB9E-F1F75B927B9C}", + "base": "{33EE1562-D9B5-5DA2-BB9E-F1F75B927B9C}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,79 +11,79 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Start", + "base": "DataInput_Start", "details": { "name": "Start" } }, { - "key": "DataInput_Direction", + "base": "DataInput_Direction", "details": { "name": "Direction" } }, { - "key": "DataInput_Distance", + "base": "DataInput_Distance", "details": { "name": "Distance" } }, { - "key": "DataInput_Collision group", + "base": "DataInput_Collision group", "details": { "name": "Collision group" } }, { - "key": "DataInput_Ignore", + "base": "DataInput_Ignore", "details": { "name": "Ignore" } }, { - "key": "DataOutput_Object hit", + "base": "DataOutput_Object hit", "details": { "name": "Object hit" } }, { - "key": "DataOutput_Position", + "base": "DataOutput_Position", "details": { "name": "Position" } }, { - "key": "DataOutput_Normal", + "base": "DataOutput_Normal", "details": { "name": "Normal" } }, { - "key": "DataOutput_Distance", + "base": "DataOutput_Distance", "details": { "name": "Distance" } }, { - "key": "DataOutput_EntityId", + "base": "DataOutput_EntityId", "details": { "name": "EntityId" } }, { - "key": "DataOutput_Surface", + "base": "DataOutput_Surface", "details": { "name": "Surface" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/PhysXWorld_SphereCastWithGroup.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/PhysXWorld_SphereCastWithGroup.names index 1190d91bca..705fa25d66 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/PhysXWorld_SphereCastWithGroup.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/PhysXWorld_SphereCastWithGroup.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{FF1EE92C-FD34-51E9-B128-00595ABB78E6}", + "base": "{FF1EE92C-FD34-51E9-B128-00595ABB78E6}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,85 +11,85 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Distance", + "base": "DataInput_Distance", "details": { "name": "Distance" } }, { - "key": "DataInput_Pose", + "base": "DataInput_Pose", "details": { "name": "Pose" } }, { - "key": "DataInput_Direction", + "base": "DataInput_Direction", "details": { "name": "Direction" } }, { - "key": "DataInput_Radius", + "base": "DataInput_Radius", "details": { "name": "Radius" } }, { - "key": "DataInput_Collision group", + "base": "DataInput_Collision group", "details": { "name": "Collision group" } }, { - "key": "DataInput_Ignore", + "base": "DataInput_Ignore", "details": { "name": "Ignore" } }, { - "key": "DataOutput_Object Hit", + "base": "DataOutput_Object Hit", "details": { "name": "Object Hit" } }, { - "key": "DataOutput_Position", + "base": "DataOutput_Position", "details": { "name": "Position" } }, { - "key": "DataOutput_Normal", + "base": "DataOutput_Normal", "details": { "name": "Normal" } }, { - "key": "DataOutput_Distance", + "base": "DataOutput_Distance", "details": { "name": "Distance" } }, { - "key": "DataOutput_EntityId", + "base": "DataOutput_EntityId", "details": { "name": "EntityId" } }, { - "key": "DataOutput_Surface", + "base": "DataOutput_Surface", "details": { "name": "Surface" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Spawning_Spawn.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Spawning_Spawn.names index d553da7dc0..3f099577f9 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Spawning_Spawn.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Spawning_Spawn.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{2447798B-B970-FDBA-A2E2-B563513663F0}", + "base": "{2447798B-B970-FDBA-A2E2-B563513663F0}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -12,43 +12,43 @@ }, "slots": [ { - "key": "Input_Request Spawn", + "base": "Input_Request Spawn", "details": { "name": "Request Spawn" } }, { - "key": "DataInput_Translation", + "base": "DataInput_Translation", "details": { "name": "Translation" } }, { - "key": "DataInput_Rotation", + "base": "DataInput_Rotation", "details": { "name": "Rotation" } }, { - "key": "DataInput_Scale", + "base": "DataInput_Scale", "details": { "name": "Scale" } }, { - "key": "Output_Spawn Requested", + "base": "Output_Spawn Requested", "details": { "name": "Spawn Requested" } }, { - "key": "Output_On Spawn", + "base": "Output_On Spawn", "details": { "name": "On Spawn" } }, { - "key": "DataOutput_SpawnedEntitiesList", + "base": "DataOutput_SpawnedEntitiesList", "details": { "name": "SpawnedEntitiesList" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/String_BuildString.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/String_BuildString.names index 90d3c24605..4576c21318 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/String_BuildString.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/String_BuildString.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{B16259BA-9CF6-4143-B09B-5A0F3B4585E6}", + "base": "{B16259BA-9CF6-4143-B09B-5A0F3B4585E6}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -12,26 +12,26 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In", "tooltip": "Input signal" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Value", + "base": "DataInput_Value", "details": { "name": "Value" } }, { - "key": "DataOutput_String", + "base": "DataOutput_String", "details": { "name": "String" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/String_ContainsString.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/String_ContainsString.names index 75a5a11fd9..7cb1b668d4 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/String_ContainsString.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/String_ContainsString.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{8481E892-DE37-4CCF-86AA-E4770DE90643}", + "base": "{8481E892-DE37-4CCF-86AA-E4770DE90643}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -12,51 +12,51 @@ }, "slots": [ { - "key": "DataInput_Source", + "base": "DataInput_Source", "details": { "name": "Source" } }, { - "key": "DataInput_Pattern", + "base": "DataInput_Pattern", "details": { "name": "Pattern" } }, { - "key": "DataInput_Search From End", + "base": "DataInput_Search From End", "details": { "name": "Search From End" } }, { - "key": "DataInput_Case Sensitive", + "base": "DataInput_Case Sensitive", "details": { "name": "Case Sensitive" } }, { - "key": "DataOutput_Index", + "base": "DataOutput_Index", "details": { "name": "Index" } }, { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In", "tooltip": "Input signal" } }, { - "key": "Output_True", + "base": "Output_True", "details": { "name": "True", "tooltip": "The string contains the provided pattern." } }, { - "key": "Output_False", + "base": "Output_False", "details": { "name": "False", "tooltip": "The string did not contain the provided pattern." diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/String_EndsWith.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/String_EndsWith.names index bdb2892e8b..35ba6f17b4 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/String_EndsWith.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/String_EndsWith.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{6C1CECA6-C155-4ED5-96BC-1D4F11C7A0FE}", + "base": "{6C1CECA6-C155-4ED5-96BC-1D4F11C7A0FE}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -12,38 +12,38 @@ }, "slots": [ { - "key": "DataInput_Source", + "base": "DataInput_Source", "details": { "name": "Source" } }, { - "key": "DataInput_Pattern", + "base": "DataInput_Pattern", "details": { "name": "Pattern" } }, { - "key": "DataInput_Case Sensitive", + "base": "DataInput_Case Sensitive", "details": { "name": "Case Sensitive" } }, { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In", "tooltip": "Input signal" } }, { - "key": "Output_True", + "base": "Output_True", "details": { "name": "True" } }, { - "key": "Output_False", + "base": "Output_False", "details": { "name": "False" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/String_Join.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/String_Join.names index 148bd56ed1..fd379e063c 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/String_Join.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/String_Join.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{121E5B89-5A8A-4477-A3B7-078B0F1B36FD}", + "base": "{121E5B89-5A8A-4477-A3B7-078B0F1B36FD}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -12,32 +12,32 @@ }, "slots": [ { - "key": "DataInput_String Array", + "base": "DataInput_String Array", "details": { "name": "String Array" } }, { - "key": "DataInput_Separator", + "base": "DataInput_Separator", "details": { "name": "Separator" } }, { - "key": "DataOutput_String", + "base": "DataOutput_String", "details": { "name": "String" } }, { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In", "tooltip": "Input signal" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/String_ReplaceString.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/String_ReplaceString.names index 1fd973605f..2edaaa842e 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/String_ReplaceString.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/String_ReplaceString.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{197D0BAA-FCAF-4922-872B-3A95BEA574B2}", + "base": "{197D0BAA-FCAF-4922-872B-3A95BEA574B2}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -12,44 +12,44 @@ }, "slots": [ { - "key": "DataInput_Source", + "base": "DataInput_Source", "details": { "name": "Source" } }, { - "key": "DataInput_Replace", + "base": "DataInput_Replace", "details": { "name": "Replace" } }, { - "key": "DataInput_With", + "base": "DataInput_With", "details": { "name": "With" } }, { - "key": "DataInput_Case Sensitive", + "base": "DataInput_Case Sensitive", "details": { "name": "Case Sensitive" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } }, { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In", "tooltip": "Input signal" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/String_Split.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/String_Split.names index 95e24059a9..a16adf32b8 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/String_Split.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/String_Split.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{327EFC0F-F71E-4028-BAF9-C4223B933FB6}", + "base": "{327EFC0F-F71E-4028-BAF9-C4223B933FB6}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -12,32 +12,32 @@ }, "slots": [ { - "key": "DataInput_Source", + "base": "DataInput_Source", "details": { "name": "Source" } }, { - "key": "DataInput_Delimiters", + "base": "DataInput_Delimiters", "details": { "name": "Delimiters" } }, { - "key": "DataOutput_String Array", + "base": "DataOutput_String Array", "details": { "name": "String Array" } }, { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In", "tooltip": "Input signal" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/String_StartsWith.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/String_StartsWith.names index 998d5eef12..0538597e7a 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/String_StartsWith.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/String_StartsWith.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{60EB479A-CF31-4734-B2E5-422828A54A46}", + "base": "{60EB479A-CF31-4734-B2E5-422828A54A46}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -12,38 +12,38 @@ }, "slots": [ { - "key": "DataInput_Source", + "base": "DataInput_Source", "details": { "name": "Source" } }, { - "key": "DataInput_Pattern", + "base": "DataInput_Pattern", "details": { "name": "Pattern" } }, { - "key": "DataInput_Case Sensitive", + "base": "DataInput_Case Sensitive", "details": { "name": "Case Sensitive" } }, { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In", "tooltip": "Input signal" } }, { - "key": "Output_True", + "base": "Output_True", "details": { "name": "True" } }, { - "key": "Output_False", + "base": "Output_False", "details": { "name": "False" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/String_Substring.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/String_Substring.names index 219b98d938..ff14a4fe42 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/String_Substring.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/String_Substring.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{F57D790D-01D5-5241-865C-3348CCB3536B}", + "base": "{F57D790D-01D5-5241-865C-3348CCB3536B}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -12,37 +12,37 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_String: Source", + "base": "DataInput_String: Source", "details": { "name": "String: Source" } }, { - "key": "DataInput_Number: From", + "base": "DataInput_Number: From", "details": { "name": "Number: From" } }, { - "key": "DataInput_Number: Length", + "base": "DataInput_Number: Length", "details": { "name": "Number: Length" } }, { - "key": "DataOutput_Result: String", + "base": "DataOutput_Result: String", "details": { "name": "Result: String" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/String_ToLower.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/String_ToLower.names index dd50ef41be..1d761cd3cf 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/String_ToLower.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/String_ToLower.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{B81632B7-AE9E-50D1-9F19-00F92F77B580}", + "base": "{B81632B7-AE9E-50D1-9F19-00F92F77B580}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,25 +11,25 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Source", + "base": "DataInput_Source", "details": { "name": "Source" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/String_ToUpper.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/String_ToUpper.names index e66ac56087..bee39e0683 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/String_ToUpper.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/String_ToUpper.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{3AB66179-2097-5C83-BA8F-B8BD1D75D1CA}", + "base": "{3AB66179-2097-5C83-BA8F-B8BD1D75D1CA}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,25 +11,25 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Source", + "base": "DataInput_Source", "details": { "name": "Source" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Tests_BranchInputTypeExample.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Tests_BranchInputTypeExample.names index b7e47558dd..4fd4b95308 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Tests_BranchInputTypeExample.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Tests_BranchInputTypeExample.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{FDD3D684-2C9A-0C05-D2A3-FD67685D8F26}", + "base": "{FDD3D684-2C9A-0C05-D2A3-FD67685D8F26}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -12,55 +12,55 @@ }, "slots": [ { - "key": "Input_Get Internal Vector", + "base": "Input_Get Internal Vector", "details": { "name": "Get Internal Vector" } }, { - "key": "Output_On Get Internal Vector", + "base": "Output_On Get Internal Vector", "details": { "name": "On Get Internal Vector" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } }, { - "key": "Input_Branches On Input Type", + "base": "Input_Branches On Input Type", "details": { "name": "Branches On Input Type" } }, { - "key": "DataInput_Input Type", + "base": "DataInput_Input Type", "details": { "name": "Input Type" } }, { - "key": "Output_By Value", + "base": "Output_By Value", "details": { "name": "By Value" } }, { - "key": "DataOutput_Value Input", + "base": "DataOutput_Value Input", "details": { "name": "Value Input" } }, { - "key": "Output_By Pointer", + "base": "Output_By Pointer", "details": { "name": "By Pointer" } }, { - "key": "DataOutput_Pointer Input", + "base": "DataOutput_Pointer Input", "details": { "name": "Pointer Input" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Tests_BranchMethodSharedDataSlotExample.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Tests_BranchMethodSharedDataSlotExample.names index 602a337a7d..cb1b376ffa 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Tests_BranchMethodSharedDataSlotExample.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Tests_BranchMethodSharedDataSlotExample.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{131C7ECE-D083-F7CD-09FC-EE0FCF80AB86}", + "base": "{131C7ECE-D083-F7CD-09FC-EE0FCF80AB86}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -12,61 +12,61 @@ }, "slots": [ { - "key": "Output_One String", + "base": "Output_One String", "details": { "name": "One String" } }, { - "key": "DataOutput_string", + "base": "DataOutput_string", "details": { "name": "string" } }, { - "key": "Output_Two Strings", + "base": "Output_Two Strings", "details": { "name": "Two Strings" } }, { - "key": "DataOutput_string1", + "base": "DataOutput_string1", "details": { "name": "string1" } }, { - "key": "DataOutput_string2", + "base": "DataOutput_string2", "details": { "name": "string2" } }, { - "key": "Output_Three Strings", + "base": "Output_Three Strings", "details": { "name": "Three Strings" } }, { - "key": "DataOutput_string3", + "base": "DataOutput_string3", "details": { "name": "string3" } }, { - "key": "Output_Square", + "base": "Output_Square", "details": { "name": "Square" } }, { - "key": "Output_Pants", + "base": "Output_Pants", "details": { "name": "Pants" } }, { - "key": "Output_Hello", + "base": "Output_Hello", "details": { "name": "Hello" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Tests_InputMethodSharedDataSlotExample.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Tests_InputMethodSharedDataSlotExample.names index c19d2a2ba5..2ea2b7c637 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Tests_InputMethodSharedDataSlotExample.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Tests_InputMethodSharedDataSlotExample.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{32B1B2DB-59E6-88D7-14A3-9C5366A39A81}", + "base": "{32B1B2DB-59E6-88D7-14A3-9C5366A39A81}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -12,67 +12,67 @@ }, "slots": [ { - "key": "Input_Append Hello", + "base": "Input_Append Hello", "details": { "name": "Append Hello" } }, { - "key": "DataInput_str", + "base": "DataInput_str", "details": { "name": "str" } }, { - "key": "Output_On Append Hello", + "base": "Output_On Append Hello", "details": { "name": "On Append Hello" } }, { - "key": "DataOutput_Output", + "base": "DataOutput_Output", "details": { "name": "Output" } }, { - "key": "Input_Concatenate Two", + "base": "Input_Concatenate Two", "details": { "name": "Concatenate Two" } }, { - "key": "DataInput_a", + "base": "DataInput_a", "details": { "name": "a" } }, { - "key": "DataInput_b", + "base": "DataInput_b", "details": { "name": "b" } }, { - "key": "Output_On Concatenate Two", + "base": "Output_On Concatenate Two", "details": { "name": "On Concatenate Two" } }, { - "key": "Input_Concatenate Three", + "base": "Input_Concatenate Three", "details": { "name": "Concatenate Three" } }, { - "key": "DataInput_c", + "base": "DataInput_c", "details": { "name": "c" } }, { - "key": "Output_On Concatenate Three", + "base": "Output_On Concatenate Three", "details": { "name": "On Concatenate Three" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Tests_InputTypeExample.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Tests_InputTypeExample.names index e34cc1ceb4..0497af8efc 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Tests_InputTypeExample.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Tests_InputTypeExample.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{42CC5090-BE28-E017-8704-FD732475CECD}", + "base": "{42CC5090-BE28-E017-8704-FD732475CECD}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -12,55 +12,55 @@ }, "slots": [ { - "key": "Input_Clear By Value", + "base": "Input_Clear By Value", "details": { "name": "Clear By Value" } }, { - "key": "DataInput_Value Input", + "base": "DataInput_Value Input", "details": { "name": "Value Input" } }, { - "key": "Output_On Clear By Value", + "base": "Output_On Clear By Value", "details": { "name": "On Clear By Value" } }, { - "key": "Input_Clear By Pointer", + "base": "Input_Clear By Pointer", "details": { "name": "Clear By Pointer" } }, { - "key": "DataInput_Pointer Input", + "base": "DataInput_Pointer Input", "details": { "name": "Pointer Input" } }, { - "key": "Output_On Clear By Pointer", + "base": "Output_On Clear By Pointer", "details": { "name": "On Clear By Pointer" } }, { - "key": "Input_Clear By Reference", + "base": "Input_Clear By Reference", "details": { "name": "Clear By Reference" } }, { - "key": "DataInput_Reference Input", + "base": "DataInput_Reference Input", "details": { "name": "Reference Input" } }, { - "key": "Output_On Clear By Reference", + "base": "Output_On Clear By Reference", "details": { "name": "On Clear By Reference" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Tests_PropertyExample.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Tests_PropertyExample.names index 0f9ac7a14d..8360f6b541 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Tests_PropertyExample.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Tests_PropertyExample.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{9F0A9171-A7E0-4973-5658-F7470E5DD51F}", + "base": "{9F0A9171-A7E0-4973-5658-F7470E5DD51F}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -12,13 +12,13 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In" } }, { - "key": "Output_On In", + "base": "Output_On In", "details": { "name": "On In" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Tests_ReturnTypeExample.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Tests_ReturnTypeExample.names index ce9ce723a7..555fc92580 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Tests_ReturnTypeExample.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Tests_ReturnTypeExample.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{97C6661E-069C-877B-4FBC-AD14CCCBB43D}", + "base": "{97C6661E-069C-877B-4FBC-AD14CCCBB43D}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -12,55 +12,55 @@ }, "slots": [ { - "key": "Input_Return By Value", + "base": "Input_Return By Value", "details": { "name": "Return By Value" } }, { - "key": "Output_On Return By Value", + "base": "Output_On Return By Value", "details": { "name": "On Return By Value" } }, { - "key": "DataOutput_Value", + "base": "DataOutput_Value", "details": { "name": "Value" } }, { - "key": "Input_Return By Pointer", + "base": "Input_Return By Pointer", "details": { "name": "Return By Pointer" } }, { - "key": "Output_On Return By Pointer", + "base": "Output_On Return By Pointer", "details": { "name": "On Return By Pointer" } }, { - "key": "DataOutput_Pointer", + "base": "DataOutput_Pointer", "details": { "name": "Pointer" } }, { - "key": "Input_Return By Reference", + "base": "Input_Return By Reference", "details": { "name": "Return By Reference" } }, { - "key": "Output_On Return By Reference", + "base": "Output_On Return By Reference", "details": { "name": "On Return By Reference" } }, { - "key": "DataOutput_Reference", + "base": "DataOutput_Reference", "details": { "name": "Reference" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Timing_Delay.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Timing_Delay.names index 6dadfcd802..7d9f1d9d64 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Timing_Delay.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Timing_Delay.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{233C84A7-44DE-A948-D65C-46C11F1F7162}", + "base": "{233C84A7-44DE-A948-D65C-46C11F1F7162}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -12,92 +12,92 @@ }, "slots": [ { - "key": "Input_Start", + "base": "Input_Start", "details": { "name": "Start", "tooltip": "When signaled, execution is delayed at this node according to the specified properties." } }, { - "key": "DataInput_Start: Time", + "base": "DataInput_Start: Time", "details": { "name": "Start: Time" } }, { - "key": "DataInput_Start: Loop", + "base": "DataInput_Start: Loop", "details": { "name": "Start: Loop" } }, { - "key": "DataInput_Start: Hold", + "base": "DataInput_Start: Hold", "details": { "name": "Start: Hold" } }, { - "key": "Output_On Start", + "base": "Output_On Start", "details": { "name": "On Start", "tooltip": "When signaled, execution is delayed at this node according to the specified properties." } }, { - "key": "Input_Reset", + "base": "Input_Reset", "details": { "name": "Reset", "tooltip": "When signaled, execution is delayed at this node according to the specified properties." } }, { - "key": "DataInput_Reset: Time", + "base": "DataInput_Reset: Time", "details": { "name": "Reset: Time" } }, { - "key": "DataInput_Reset: Loop", + "base": "DataInput_Reset: Loop", "details": { "name": "Reset: Loop" } }, { - "key": "DataInput_Reset: Hold", + "base": "DataInput_Reset: Hold", "details": { "name": "Reset: Hold" } }, { - "key": "Output_On Reset", + "base": "Output_On Reset", "details": { "name": "On Reset", "tooltip": "When signaled, execution is delayed at this node according to the specified properties." } }, { - "key": "Input_Cancel", + "base": "Input_Cancel", "details": { "name": "Cancel", "tooltip": "Cancels the current delay." } }, { - "key": "Output_On Cancel", + "base": "Output_On Cancel", "details": { "name": "On Cancel", "tooltip": "Cancels the current delay." } }, { - "key": "Output_Done", + "base": "Output_Done", "details": { "name": "Done", "tooltip": "Signaled when the delay reaches zero." } }, { - "key": "DataOutput_Elapsed", + "base": "DataOutput_Elapsed", "details": { "name": "Elapsed" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Timing_Duration.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Timing_Duration.names index 33b72debaa..d3ef973ec7 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Timing_Duration.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Timing_Duration.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{D93538FF-3553-4C65-AB81-9089C5270214}", + "base": "{D93538FF-3553-4C65-AB81-9089C5270214}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,33 +11,33 @@ }, "slots": [ { - "key": "DataInput_Duration", + "base": "DataInput_Duration", "details": { "name": "Duration" } }, { - "key": "DataOutput_Elapsed", + "base": "DataOutput_Elapsed", "details": { "name": "Elapsed" } }, { - "key": "Input_Start", + "base": "Input_Start", "details": { "name": "Start", "tooltip": "Starts the countdown" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out", "tooltip": "Signaled every frame while the duration is active." } }, { - "key": "Output_Done", + "base": "Output_Done", "details": { "name": "Done", "tooltip": "Signaled once the duration is complete." diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Timing_HeartBeat.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Timing_HeartBeat.names index 5cc50f1e7d..c024e58c31 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Timing_HeartBeat.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Timing_HeartBeat.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{E73DB180-A325-763B-A1FE-517B548AF66E}", + "base": "{E73DB180-A325-763B-A1FE-517B548AF66E}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,37 +11,37 @@ }, "slots": [ { - "key": "Input_Start", + "base": "Input_Start", "details": { "name": "Start" } }, { - "key": "DataInput_Interval", + "base": "DataInput_Interval", "details": { "name": "Interval" } }, { - "key": "Output_On Start", + "base": "Output_On Start", "details": { "name": "On Start" } }, { - "key": "Input_Stop", + "base": "Input_Stop", "details": { "name": "Stop" } }, { - "key": "Output_On Stop", + "base": "Output_On Stop", "details": { "name": "On Stop" } }, { - "key": "Output_Pulse", + "base": "Output_Pulse", "details": { "name": "Pulse", "tooltip": "Signaled at each specified interval." diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Timing_OnGraphStart.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Timing_OnGraphStart.names index 0664dfcccc..d5162caf05 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Timing_OnGraphStart.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Timing_OnGraphStart.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{F200B22A-5903-483A-BF63-5241BC03632B}", + "base": "{F200B22A-5903-483A-BF63-5241BC03632B}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -12,7 +12,7 @@ }, "slots": [ { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out", "tooltip": "Signaled when the entity that owns this graph is fully activated." diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Timing_TickDelay.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Timing_TickDelay.names index 994c19dcb2..a682f2b7ec 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Timing_TickDelay.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Timing_TickDelay.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{399A2608-77E3-41F9-90FA-58A9B6E0E34D}", + "base": "{399A2608-77E3-41F9-90FA-58A9B6E0E34D}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,26 +11,26 @@ }, "slots": [ { - "key": "DataInput_Ticks", + "base": "DataInput_Ticks", "details": { "name": "Ticks" } }, { - "key": "DataInput_Tick Order", + "base": "DataInput_Tick Order", "details": { "name": "Tick Order" } }, { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In", "tooltip": "When signaled, execution is delayed at this node for the specified amount of frames." } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out", "tooltip": "Signaled after waiting for the specified amount of frames." diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Timing_TimeDelay.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Timing_TimeDelay.names index 07e418a798..bfe267f227 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Timing_TimeDelay.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Timing_TimeDelay.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{364F5AC9-8351-44B6-A069-03367B21F7AA}", + "base": "{364F5AC9-8351-44B6-A069-03367B21F7AA}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,21 +11,21 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In", "tooltip": "When signaled, execution is delayed at this node for the specified amount of times." } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out", "tooltip": "Signaled after waiting for the specified amount of times." } }, { - "key": "DataInput_Delay", + "base": "DataInput_Delay", "details": { "name": "Delay" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Timing_Timer.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Timing_Timer.names index 03846acfea..87b2c1cefa 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Timing_Timer.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Timing_Timer.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{60CF8540-E51A-434D-A32C-461C41D68AF9}", + "base": "{60CF8540-E51A-434D-A32C-461C41D68AF9}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,33 +11,33 @@ }, "slots": [ { - "key": "DataOutput_Milliseconds", + "base": "DataOutput_Milliseconds", "details": { "name": "Milliseconds" } }, { - "key": "DataOutput_Seconds", + "base": "DataOutput_Seconds", "details": { "name": "Seconds" } }, { - "key": "Input_Start", + "base": "Input_Start", "details": { "name": "Start", "tooltip": "Starts the timer." } }, { - "key": "Input_Stop", + "base": "Input_Stop", "details": { "name": "Stop", "tooltip": "Stops the timer." } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out", "tooltip": "Signaled every frame while the timer is running." diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Uncategorized_ArithmeticExpression.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Uncategorized_ArithmeticExpression.names index 5888ef600b..8412a5383d 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Uncategorized_ArithmeticExpression.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Uncategorized_ArithmeticExpression.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{B13F8DE1-E017-484D-9910-BABFB355D72E}", + "base": "{B13F8DE1-E017-484D-9910-BABFB355D72E}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -10,33 +10,33 @@ }, "slots": [ { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } }, { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In", "tooltip": "Signal to perform the evaluation when desired." } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out", "tooltip": "Signaled after the arithmetic operation is done." } }, { - "key": "DataInput_Value A", + "base": "DataInput_Value A", "details": { "name": "Value A" } }, { - "key": "DataInput_Value B", + "base": "DataInput_Value B", "details": { "name": "Value B" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Uncategorized_BinaryOperator.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Uncategorized_BinaryOperator.names index 99250a91e7..e07670e988 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Uncategorized_BinaryOperator.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Uncategorized_BinaryOperator.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{5BD0E8C7-9B0A-42F5-9EB0-199E6EC8FA99}", + "base": "{5BD0E8C7-9B0A-42F5-9EB0-199E6EC8FA99}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In", "tooltip": "Signal to perform the evaluation when desired." diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Uncategorized_BooleanExpression.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Uncategorized_BooleanExpression.names index 1c510ed8f2..7df3ca9423 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Uncategorized_BooleanExpression.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Uncategorized_BooleanExpression.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{36C69825-CFF8-4F70-8F3B-1A9227E8BEEA}", + "base": "{36C69825-CFF8-4F70-8F3B-1A9227E8BEEA}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -10,27 +10,27 @@ }, "slots": [ { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } }, { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In", "tooltip": "Signal to perform the evaluation when desired." } }, { - "key": "Output_True", + "base": "Output_True", "details": { "name": "True", "tooltip": "Signaled if the result of the operation is true." } }, { - "key": "Output_False", + "base": "Output_False", "details": { "name": "False", "tooltip": "Signaled if the result of the operation is false." diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Uncategorized_ComparisonExpression.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Uncategorized_ComparisonExpression.names index aa9f24a5a4..f59d822ffb 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Uncategorized_ComparisonExpression.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Uncategorized_ComparisonExpression.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{82C50EAD-D3DD-45D2-BFCE-981D95771DC8}", + "base": "{82C50EAD-D3DD-45D2-BFCE-981D95771DC8}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -10,40 +10,40 @@ }, "slots": [ { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } }, { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In", "tooltip": "Signal to perform the evaluation when desired." } }, { - "key": "Output_True", + "base": "Output_True", "details": { "name": "True", "tooltip": "Signaled if the result of the operation is true." } }, { - "key": "Output_False", + "base": "Output_False", "details": { "name": "False", "tooltip": "Signaled if the result of the operation is false." } }, { - "key": "DataInput_Value A", + "base": "DataInput_Value A", "details": { "name": "Value A" } }, { - "key": "DataInput_Value B", + "base": "DataInput_Value B", "details": { "name": "Value B" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Uncategorized_EqualityExpression.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Uncategorized_EqualityExpression.names index 9e85f54642..f8404345b7 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Uncategorized_EqualityExpression.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Uncategorized_EqualityExpression.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{78D20EB6-BA07-4071-B646-7C2D68A0A4A6}", + "base": "{78D20EB6-BA07-4071-B646-7C2D68A0A4A6}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -10,40 +10,40 @@ }, "slots": [ { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } }, { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In", "tooltip": "Signal to perform the evaluation when desired." } }, { - "key": "Output_True", + "base": "Output_True", "details": { "name": "True", "tooltip": "Signaled if the result of the operation is true." } }, { - "key": "Output_False", + "base": "Output_False", "details": { "name": "False", "tooltip": "Signaled if the result of the operation is false." } }, { - "key": "DataInput_Value A", + "base": "DataInput_Value A", "details": { "name": "Value A" } }, { - "key": "DataInput_Value B", + "base": "DataInput_Value B", "details": { "name": "Value B" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Uncategorized_GetVariable.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Uncategorized_GetVariable.names index a2c586b1d5..a2a6475525 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Uncategorized_GetVariable.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Uncategorized_GetVariable.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{8225BE35-4C45-4A32-94D9-3DE114F6F5AF}", + "base": "{8225BE35-4C45-4A32-94D9-3DE114F6F5AF}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -10,14 +10,14 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In", "tooltip": "When signaled sends the property referenced by this node to a Data Output slot" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out", "tooltip": "Signaled after the referenced property has been pushed to the Data Output slot" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Uncategorized_NodeableNode.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Uncategorized_NodeableNode.names index db32104037..d884e287da 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Uncategorized_NodeableNode.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Uncategorized_NodeableNode.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{80351020-5778-491A-B6CA-C78364C19499}", + "base": "{80351020-5778-491A-B6CA-C78364C19499}", "context": "ScriptCanvas::Node", "variant": "", "details": { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Uncategorized_NodeableNodeOverloaded.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Uncategorized_NodeableNodeOverloaded.names index dcedf6840c..fa7c4723e1 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Uncategorized_NodeableNodeOverloaded.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Uncategorized_NodeableNodeOverloaded.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{C5C21008-F0B8-4FC8-843E-9C5C50B9DCDC}", + "base": "{C5C21008-F0B8-4FC8-843E-9C5C50B9DCDC}", "context": "ScriptCanvas::Node", "variant": "", "details": { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Uncategorized_SetVariable.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Uncategorized_SetVariable.names index 190dfb4c28..b4e5f12867 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Uncategorized_SetVariable.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Uncategorized_SetVariable.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{5EFD2942-AFF9-4137-939C-023AEAA72EB0}", + "base": "{5EFD2942-AFF9-4137-939C-023AEAA72EB0}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -10,14 +10,14 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In", "tooltip": "When signaled sends the variable referenced by this node to a Data Output slot" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out", "tooltip": "Signaled after the referenced variable has been pushed to the Data Output slot" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Uncategorized_UnaryExpression.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Uncategorized_UnaryExpression.names index 28ca30346b..4933d2d9bc 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Uncategorized_UnaryExpression.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Uncategorized_UnaryExpression.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{70FF2162-3D01-41F1-B009-7DC071A38471}", + "base": "{70FF2162-3D01-41F1-B009-7DC071A38471}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -10,33 +10,33 @@ }, "slots": [ { - "key": "DataInput_Value", + "base": "DataInput_Value", "details": { "name": "Value" } }, { - "key": "DataOutput_Result", + "base": "DataOutput_Result", "details": { "name": "Result" } }, { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In", "tooltip": "Signal to perform the evaluation when desired." } }, { - "key": "Output_True", + "base": "Output_True", "details": { "name": "True", "tooltip": "Signaled if the result of the operation is true." } }, { - "key": "Output_False", + "base": "Output_False", "details": { "name": "False", "tooltip": "Signaled if the result of the operation is false." diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Uncategorized_UnaryOperator.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Uncategorized_UnaryOperator.names index 3717b44595..b18fe07c1f 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Uncategorized_UnaryOperator.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Uncategorized_UnaryOperator.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{B0BF8615-D718-4115-B3D8-CAB554BC6863}", + "base": "{B0BF8615-D718-4115-B3D8-CAB554BC6863}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In", "tooltip": "Signal to perform the evaluation when desired." diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/UtilitiesDebug_Print.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/UtilitiesDebug_Print.names index b1817d9acd..0b238ad007 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/UtilitiesDebug_Print.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/UtilitiesDebug_Print.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{E1940FB4-83FE-4594-9AFF-375FF7603338}", + "base": "{E1940FB4-83FE-4594-9AFF-375FF7603338}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -12,20 +12,20 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In", "tooltip": "Input signal" } }, { - "key": "DataInput_Value", + "base": "DataInput_Value", "details": { "name": "Value" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/UtilitiesUnitTesting_AddFailure.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/UtilitiesUnitTesting_AddFailure.names index 8f0eb7f3af..f1e851bd4d 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/UtilitiesUnitTesting_AddFailure.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/UtilitiesUnitTesting_AddFailure.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{1C4971A7-DE76-4E8E-9381-F579A57B2A78}", + "base": "{1C4971A7-DE76-4E8E-9381-F579A57B2A78}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,20 +11,20 @@ }, "slots": [ { - "key": "DataInput_Report", + "base": "DataInput_Report", "details": { "name": "Report" } }, { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In", "tooltip": "Input signal" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/UtilitiesUnitTesting_AddSuccess.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/UtilitiesUnitTesting_AddSuccess.names index 0b3b7a1399..5ebb61abdb 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/UtilitiesUnitTesting_AddSuccess.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/UtilitiesUnitTesting_AddSuccess.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{0D5B9544-C36B-490F-899A-E260D8351620}", + "base": "{0D5B9544-C36B-490F-899A-E260D8351620}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,20 +11,20 @@ }, "slots": [ { - "key": "DataInput_Report", + "base": "DataInput_Report", "details": { "name": "Report" } }, { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In", "tooltip": "Input signal" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/UtilitiesUnitTesting_Checkpoint.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/UtilitiesUnitTesting_Checkpoint.names index 3ad1d73949..c87e917ec6 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/UtilitiesUnitTesting_Checkpoint.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/UtilitiesUnitTesting_Checkpoint.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{E65449D2-45A9-402B-ADF7-4E4F27A99245}", + "base": "{E65449D2-45A9-402B-ADF7-4E4F27A99245}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,20 +11,20 @@ }, "slots": [ { - "key": "DataInput_Report", + "base": "DataInput_Report", "details": { "name": "Report" } }, { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In", "tooltip": "Input signal" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/UtilitiesUnitTesting_ExpectEqual.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/UtilitiesUnitTesting_ExpectEqual.names index 6a0e5938b7..82e29a3761 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/UtilitiesUnitTesting_ExpectEqual.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/UtilitiesUnitTesting_ExpectEqual.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{856DB72A-48CB-4142-A032-1253D3AB8BEC}", + "base": "{856DB72A-48CB-4142-A032-1253D3AB8BEC}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,32 +11,32 @@ }, "slots": [ { - "key": "DataInput_Report", + "base": "DataInput_Report", "details": { "name": "Report" } }, { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In", "tooltip": "Input signal" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Candidate", + "base": "DataInput_Candidate", "details": { "name": "Candidate" } }, { - "key": "DataInput_Reference", + "base": "DataInput_Reference", "details": { "name": "Reference" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/UtilitiesUnitTesting_ExpectFalse.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/UtilitiesUnitTesting_ExpectFalse.names index f5f80e56ea..0ece11c5d3 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/UtilitiesUnitTesting_ExpectFalse.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/UtilitiesUnitTesting_ExpectFalse.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{3838E12C-CEAB-4CED-9958-B6C0399FCD92}", + "base": "{3838E12C-CEAB-4CED-9958-B6C0399FCD92}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,26 +11,26 @@ }, "slots": [ { - "key": "DataInput_Candidate", + "base": "DataInput_Candidate", "details": { "name": "Candidate" } }, { - "key": "DataInput_Report", + "base": "DataInput_Report", "details": { "name": "Report" } }, { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In", "tooltip": "Input signal" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/UtilitiesUnitTesting_ExpectGreaterThan.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/UtilitiesUnitTesting_ExpectGreaterThan.names index 73dabca9d7..b5e85fc361 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/UtilitiesUnitTesting_ExpectGreaterThan.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/UtilitiesUnitTesting_ExpectGreaterThan.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{8DD464A5-C09D-4017-82B7-B1EA672BA9EA}", + "base": "{8DD464A5-C09D-4017-82B7-B1EA672BA9EA}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,32 +11,32 @@ }, "slots": [ { - "key": "DataInput_Report", + "base": "DataInput_Report", "details": { "name": "Report" } }, { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In", "tooltip": "Input signal" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Candidate", + "base": "DataInput_Candidate", "details": { "name": "Candidate" } }, { - "key": "DataInput_Reference", + "base": "DataInput_Reference", "details": { "name": "Reference" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/UtilitiesUnitTesting_ExpectGreaterThanEqual.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/UtilitiesUnitTesting_ExpectGreaterThanEqual.names index cf1068fdbe..3d82f05c18 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/UtilitiesUnitTesting_ExpectGreaterThanEqual.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/UtilitiesUnitTesting_ExpectGreaterThanEqual.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{8EB4E313-1479-4428-AE0C-75F233C5F5EB}", + "base": "{8EB4E313-1479-4428-AE0C-75F233C5F5EB}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,32 +11,32 @@ }, "slots": [ { - "key": "DataInput_Report", + "base": "DataInput_Report", "details": { "name": "Report" } }, { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In", "tooltip": "Input signal" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Candidate", + "base": "DataInput_Candidate", "details": { "name": "Candidate" } }, { - "key": "DataInput_Reference", + "base": "DataInput_Reference", "details": { "name": "Reference" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/UtilitiesUnitTesting_ExpectLessThan.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/UtilitiesUnitTesting_ExpectLessThan.names index 6d2ac88907..f3a875700a 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/UtilitiesUnitTesting_ExpectLessThan.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/UtilitiesUnitTesting_ExpectLessThan.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{693FD406-8735-4DBB-B0A8-39E7DA467559}", + "base": "{693FD406-8735-4DBB-B0A8-39E7DA467559}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,32 +11,32 @@ }, "slots": [ { - "key": "DataInput_Report", + "base": "DataInput_Report", "details": { "name": "Report" } }, { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In", "tooltip": "Input signal" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Candidate", + "base": "DataInput_Candidate", "details": { "name": "Candidate" } }, { - "key": "DataInput_Reference", + "base": "DataInput_Reference", "details": { "name": "Reference" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/UtilitiesUnitTesting_ExpectLessThanEqual.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/UtilitiesUnitTesting_ExpectLessThanEqual.names index 8c9bb8df5f..1897bf12fe 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/UtilitiesUnitTesting_ExpectLessThanEqual.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/UtilitiesUnitTesting_ExpectLessThanEqual.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{52D4803F-6273-4A4E-96CC-F2892CFE433B}", + "base": "{52D4803F-6273-4A4E-96CC-F2892CFE433B}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,32 +11,32 @@ }, "slots": [ { - "key": "DataInput_Report", + "base": "DataInput_Report", "details": { "name": "Report" } }, { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In", "tooltip": "Input signal" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Candidate", + "base": "DataInput_Candidate", "details": { "name": "Candidate" } }, { - "key": "DataInput_Reference", + "base": "DataInput_Reference", "details": { "name": "Reference" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/UtilitiesUnitTesting_ExpectNotEqual.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/UtilitiesUnitTesting_ExpectNotEqual.names index ef1b954761..cbe4045c11 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/UtilitiesUnitTesting_ExpectNotEqual.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/UtilitiesUnitTesting_ExpectNotEqual.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{66334794-0F98-4BFC-9DB0-8AB6A4052D09}", + "base": "{66334794-0F98-4BFC-9DB0-8AB6A4052D09}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,32 +11,32 @@ }, "slots": [ { - "key": "DataInput_Report", + "base": "DataInput_Report", "details": { "name": "Report" } }, { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In", "tooltip": "Input signal" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } }, { - "key": "DataInput_Candidate", + "base": "DataInput_Candidate", "details": { "name": "Candidate" } }, { - "key": "DataInput_Reference", + "base": "DataInput_Reference", "details": { "name": "Reference" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/UtilitiesUnitTesting_ExpectTrue.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/UtilitiesUnitTesting_ExpectTrue.names index 62c2dfb710..71bf43b22a 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/UtilitiesUnitTesting_ExpectTrue.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/UtilitiesUnitTesting_ExpectTrue.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{88F9BE2D-F591-45AD-9682-FBB67C39C504}", + "base": "{88F9BE2D-F591-45AD-9682-FBB67C39C504}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,26 +11,26 @@ }, "slots": [ { - "key": "DataInput_Candidate", + "base": "DataInput_Candidate", "details": { "name": "Candidate" } }, { - "key": "DataInput_Report", + "base": "DataInput_Report", "details": { "name": "Report" } }, { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In", "tooltip": "Input signal" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/UtilitiesUnitTesting_MarkComplete.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/UtilitiesUnitTesting_MarkComplete.names index 4a0b442e56..67c838c832 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/UtilitiesUnitTesting_MarkComplete.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/UtilitiesUnitTesting_MarkComplete.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{DC0BCFE9-3066-4232-AA68-AAFB206C917F}", + "base": "{DC0BCFE9-3066-4232-AA68-AAFB206C917F}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -11,20 +11,20 @@ }, "slots": [ { - "key": "DataInput_Report", + "base": "DataInput_Report", "details": { "name": "Report" } }, { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In", "tooltip": "Input signal" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Utilities_BaseTimerNode.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Utilities_BaseTimerNode.names index 32ac04b759..4a46770857 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Utilities_BaseTimerNode.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Utilities_BaseTimerNode.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{BAD6C904-6078-49E8-B461-CA4410B785A4}", + "base": "{BAD6C904-6078-49E8-B461-CA4410B785A4}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -12,7 +12,7 @@ }, "slots": [ { - "key": "DataInput_Delay", + "base": "DataInput_Delay", "details": { "name": "Delay" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Utilities_ExtractProperties.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Utilities_ExtractProperties.names index 7f052d76d3..3ce4ed1f67 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Utilities_ExtractProperties.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Utilities_ExtractProperties.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{D4C9DA8E-838B-41C6-B870-C75294C323DC}", + "base": "{D4C9DA8E-838B-41C6-B870-C75294C323DC}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -12,21 +12,21 @@ }, "slots": [ { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In", "tooltip": "When signaled assigns property values using the supplied source input" } }, { - "key": "Output_Out", + "base": "Output_Out", "details": { "name": "Out", "tooltip": "Signaled after all property haves have been pushed to the output slots" } }, { - "key": "DataInput_Source", + "base": "DataInput_Source", "details": { "name": "Source" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Utilities_Repeater.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Utilities_Repeater.names index c2e45a57a2..e34c059680 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Utilities_Repeater.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/Utilities_Repeater.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{0A38EDCA-0571-48F0-9199-F6168C1EAAF0}", + "base": "{0A38EDCA-0571-48F0-9199-F6168C1EAAF0}", "context": "ScriptCanvas::Node", "variant": "", "details": { @@ -12,34 +12,34 @@ }, "slots": [ { - "key": "DataInput_Repetitions", + "base": "DataInput_Repetitions", "details": { "name": "Repetitions" } }, { - "key": "Input_In", + "base": "Input_In", "details": { "name": "In", "tooltip": "Input signal" } }, { - "key": "Output_Complete", + "base": "Output_Complete", "details": { "name": "Complete", "tooltip": "Signaled upon node exit" } }, { - "key": "Output_Action", + "base": "Output_Action", "details": { "name": "Action", "tooltip": "The signal that will be repeated" } }, { - "key": "DataInput_Interval", + "base": "DataInput_Interval", "details": { "name": "Interval" } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/AreaBlenderComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/AreaBlenderComponentTypeId.names index 2082bae8c1..f024e4e28b 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/AreaBlenderComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/AreaBlenderComponentTypeId.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "AreaBlenderComponentTypeId", + "base": "AreaBlenderComponentTypeId", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetAreaBlenderComponentTypeId", + "base": "GetAreaBlenderComponentTypeId", "details": { "name": "Get Area Blender Component Type Id" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/AreaLightComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/AreaLightComponentTypeId.names index 4bace9efd3..c1a45e9088 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/AreaLightComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/AreaLightComponentTypeId.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "AreaLightComponentTypeId", + "base": "AreaLightComponentTypeId", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetAreaLightComponentTypeId", + "base": "GetAreaLightComponentTypeId", "details": { "name": "Get Area Light Component Type Id" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/AudioObstructionType_Ignore.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/AudioObstructionType_Ignore.names index 0fc41d9cc0..f3de6ac1c3 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/AudioObstructionType_Ignore.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/AudioObstructionType_Ignore.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "AudioObstructionType_Ignore", + "base": "AudioObstructionType_Ignore", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetAudioObstructionType_Ignore", + "base": "GetAudioObstructionType_Ignore", "details": { "name": "Ignore" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/AudioObstructionType_MultiRay.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/AudioObstructionType_MultiRay.names index 353dd5a480..b9b6d4fc0a 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/AudioObstructionType_MultiRay.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/AudioObstructionType_MultiRay.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "AudioObstructionType_MultiRay", + "base": "AudioObstructionType_MultiRay", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetAudioObstructionType_MultiRay", + "base": "GetAudioObstructionType_MultiRay", "details": { "name": "Multi Ray" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/AudioObstructionType_SingleRay.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/AudioObstructionType_SingleRay.names index cfd4b08ada..b86d40f250 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/AudioObstructionType_SingleRay.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/AudioObstructionType_SingleRay.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "AudioObstructionType_SingleRay", + "base": "AudioObstructionType_SingleRay", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetAudioObstructionType_SingleRay", + "base": "GetAudioObstructionType_SingleRay", "details": { "name": "Single Ray" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/AudioPreloadComponentLoadType_Auto.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/AudioPreloadComponentLoadType_Auto.names index 42a4678689..f6d2c8a197 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/AudioPreloadComponentLoadType_Auto.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/AudioPreloadComponentLoadType_Auto.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "AudioPreloadComponentLoadType_Auto", + "base": "AudioPreloadComponentLoadType_Auto", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetAudioPreloadComponentLoadType_Auto", + "base": "GetAudioPreloadComponentLoadType_Auto", "details": { "name": "Load Type Auto" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/AudioPreloadComponentLoadType_Manual.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/AudioPreloadComponentLoadType_Manual.names index ff0548b4d5..4d5feaad5b 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/AudioPreloadComponentLoadType_Manual.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/AudioPreloadComponentLoadType_Manual.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "AudioPreloadComponentLoadType_Manual", + "base": "AudioPreloadComponentLoadType_Manual", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetAudioPreloadComponentLoadType_Manual", + "base": "GetAudioPreloadComponentLoadType_Manual", "details": { "name": "Load Type Manual" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/AxisAlignedBoxShapeComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/AxisAlignedBoxShapeComponentTypeId.names index f2669d1486..abbb47ca89 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/AxisAlignedBoxShapeComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/AxisAlignedBoxShapeComponentTypeId.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "AxisAlignedBoxShapeComponentTypeId", + "base": "AxisAlignedBoxShapeComponentTypeId", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetAxisAlignedBoxShapeComponentTypeId", + "base": "GetAxisAlignedBoxShapeComponentTypeId", "details": { "name": "Get Axis Aligned Box Shape Component Type Id" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_AlphaDest.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_AlphaDest.names index 121e36f159..fdde3cc1d1 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_AlphaDest.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_AlphaDest.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "BlendFactor_AlphaDest", + "base": "BlendFactor_AlphaDest", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetBlendFactor_AlphaDest", + "base": "GetBlendFactor_AlphaDest", "details": { "name": "Get Alpha Dest" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_AlphaDestInverse.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_AlphaDestInverse.names index 297c930e3a..c94109b0cd 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_AlphaDestInverse.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_AlphaDestInverse.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "BlendFactor_AlphaDestInverse", + "base": "BlendFactor_AlphaDestInverse", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetBlendFactor_AlphaDestInverse", + "base": "GetBlendFactor_AlphaDestInverse", "details": { "name": "Get Alpha Dest Inverse" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_AlphaSource.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_AlphaSource.names index 29c8fefc3a..b8825ce046 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_AlphaSource.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_AlphaSource.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "BlendFactor_AlphaSource", + "base": "BlendFactor_AlphaSource", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "AlphaSource", + "base": "AlphaSource", "details": { "name": "Get Alpha Source" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_AlphaSource1.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_AlphaSource1.names index 7b6903bbc1..cb229071a4 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_AlphaSource1.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_AlphaSource1.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "BlendFactor_AlphaSource1", + "base": "BlendFactor_AlphaSource1", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetBlendFactor_AlphaSource1", + "base": "GetBlendFactor_AlphaSource1", "details": { "name": "Get Alpha Source 1" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_AlphaSource1Inverse.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_AlphaSource1Inverse.names index f2a547b532..bf9b3144bf 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_AlphaSource1Inverse.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_AlphaSource1Inverse.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "BlendFactor_AlphaSource1Inverse", + "base": "BlendFactor_AlphaSource1Inverse", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetBlendFactor_AlphaSource1Inverse", + "base": "GetBlendFactor_AlphaSource1Inverse", "details": { "name": "Get Alpha Source 1 Inverse" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_AlphaSourceInverse.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_AlphaSourceInverse.names index fffd959b55..49eff72742 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_AlphaSourceInverse.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_AlphaSourceInverse.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "BlendFactor_AlphaSourceInverse", + "base": "BlendFactor_AlphaSourceInverse", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetBlendFactor_AlphaSourceInverse", + "base": "GetBlendFactor_AlphaSourceInverse", "details": { "name": "Get Alpha Source Inverse" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_AlphaSourceSaturate.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_AlphaSourceSaturate.names index 8314fc4883..8a104eba15 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_AlphaSourceSaturate.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_AlphaSourceSaturate.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "BlendFactor_AlphaSourceSaturate", + "base": "BlendFactor_AlphaSourceSaturate", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetBlendFactor_AlphaSourceSaturate", + "base": "GetBlendFactor_AlphaSourceSaturate", "details": { "name": "Get Alpha Source Saturate" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_ColorDest.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_ColorDest.names index 1528aa60d6..a17f1e2915 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_ColorDest.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_ColorDest.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "BlendFactor_ColorDest", + "base": "BlendFactor_ColorDest", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetBlendFactor_ColorDest", + "base": "GetBlendFactor_ColorDest", "details": { "name": "Get Color Dest" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_ColorDestInverse.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_ColorDestInverse.names index 902dc74f8c..25553bed9e 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_ColorDestInverse.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_ColorDestInverse.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "BlendFactor_ColorDestInverse", + "base": "BlendFactor_ColorDestInverse", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetBlendFactor_ColorDestInverse", + "base": "GetBlendFactor_ColorDestInverse", "details": { "name": "Get Color Dest Inverse" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_ColorSource.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_ColorSource.names index 6d96e116a7..c693053cb7 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_ColorSource.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_ColorSource.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "BlendFactor_ColorSource", + "base": "BlendFactor_ColorSource", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetBlendFactor_ColorSource", + "base": "GetBlendFactor_ColorSource", "details": { "name": "Get Color Source" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_ColorSource1.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_ColorSource1.names index 71f421585e..62407ba8c9 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_ColorSource1.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_ColorSource1.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "BlendFactor_ColorSource1", + "base": "BlendFactor_ColorSource1", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetBlendFactor_ColorSource1", + "base": "GetBlendFactor_ColorSource1", "details": { "name": "Get Color Source 1" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_ColorSource1Inverse.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_ColorSource1Inverse.names index 0b41014722..4e1178fd61 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_ColorSource1Inverse.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_ColorSource1Inverse.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "BlendFactor_ColorSource1Inverse", + "base": "BlendFactor_ColorSource1Inverse", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetBlendFactor_ColorSource1Inverse", + "base": "GetBlendFactor_ColorSource1Inverse", "details": { "name": "Get Color Source 1 Inverse" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_ColorSourceInverse.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_ColorSourceInverse.names index 90764c6e1a..e33a9389ee 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_ColorSourceInverse.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_ColorSourceInverse.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "BlendFactor_ColorSourceInverse", + "base": "BlendFactor_ColorSourceInverse", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetBlendFactor_ColorSourceInverse", + "base": "GetBlendFactor_ColorSourceInverse", "details": { "name": "Get Color Source Inverse" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_Factor.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_Factor.names index cdde70371b..1e235c0054 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_Factor.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_Factor.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "BlendFactor_Factor", + "base": "BlendFactor_Factor", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetBlendFactor_Factor", + "base": "GetBlendFactor_Factor", "details": { "name": "Get Factor" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_FactorInverse.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_FactorInverse.names index e2ceb0ad91..69eddb1fab 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_FactorInverse.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_FactorInverse.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "BlendFactor_FactorInverse", + "base": "BlendFactor_FactorInverse", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetBlendFactor_FactorInverse", + "base": "GetBlendFactor_FactorInverse", "details": { "name": "Get Factor Inverse" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_Invalid.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_Invalid.names index a3fc69cf25..0751a6a29f 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_Invalid.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_Invalid.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "BlendFactor_Invalid", + "base": "BlendFactor_Invalid", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetBlendFactor_Invalid", + "base": "GetBlendFactor_Invalid", "details": { "name": "Get Invalid" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_One.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_One.names index 78cb105c4e..3909d3cffe 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_One.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_One.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "BlendFactor_One", + "base": "BlendFactor_One", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetBlendFactor_One", + "base": "GetBlendFactor_One", "details": { "name": "Get One" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_Zero.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_Zero.names index 230913d961..638a238661 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_Zero.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendFactor_Zero.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "BlendFactor_Zero", + "base": "BlendFactor_Zero", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetBlendFactor_Zero", + "base": "GetBlendFactor_Zero", "details": { "name": "Get Zero" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendOp_Add.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendOp_Add.names index b425f2038b..ad4cf9dd21 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendOp_Add.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendOp_Add.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "BlendOp_Add", + "base": "BlendOp_Add", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetBlendOp_Add", + "base": "GetBlendOp_Add", "details": { "name": "Get Add" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendOp_Invalid.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendOp_Invalid.names index 9aa3ee6903..1b19a6d22a 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendOp_Invalid.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendOp_Invalid.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "BlendOp_Invalid", + "base": "BlendOp_Invalid", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetBlendOp_Invalid", + "base": "GetBlendOp_Invalid", "details": { "name": "Get Invalid" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendOp_Maximum.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendOp_Maximum.names index 12e6b0f955..2bd78c05f2 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendOp_Maximum.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendOp_Maximum.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "BlendOp_Maximum", + "base": "BlendOp_Maximum", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetBlendOp_Maximum", + "base": "GetBlendOp_Maximum", "details": { "name": "Get Maximum" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendOp_Minimum.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendOp_Minimum.names index ca08b9af27..f28d104183 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendOp_Minimum.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendOp_Minimum.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "BlendOp_Minimum", + "base": "BlendOp_Minimum", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "Minimum", + "base": "Minimum", "details": { "name": "Get Minimum" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendOp_Subtract.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendOp_Subtract.names index 1b3ad085e5..bab41f7aa3 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendOp_Subtract.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendOp_Subtract.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "BlendOp_Subtract", + "base": "BlendOp_Subtract", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetBlendOp_Subtract", + "base": "GetBlendOp_Subtract", "details": { "name": "Get Subtract" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendOp_SubtractReverse.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendOp_SubtractReverse.names index 53df604d84..74d3c63499 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendOp_SubtractReverse.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlendOp_SubtractReverse.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "BlendOp_SubtractReverse", + "base": "BlendOp_SubtractReverse", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetBlendOp_SubtractReverse", + "base": "GetBlendOp_SubtractReverse", "details": { "name": "Get Subtract Reverse" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlockerComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlockerComponentTypeId.names index 4f5ecb7f53..b2590a66f5 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlockerComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BlockerComponentTypeId.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "BlockerComponentTypeId", + "base": "BlockerComponentTypeId", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetBlockerComponentTypeId", + "base": "GetBlockerComponentTypeId", "details": { "name": "Get Blocker Component Type Id" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BloomComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BloomComponentTypeId.names index 64cce778c6..da75eeee0a 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BloomComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BloomComponentTypeId.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "BloomComponentTypeId", + "base": "BloomComponentTypeId", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetBloomComponentTypeId", + "base": "GetBloomComponentTypeId", "details": { "name": "Get Bloom Component Type Id" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BoxShapeComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BoxShapeComponentTypeId.names index fd99213100..47e43d6214 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BoxShapeComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/BoxShapeComponentTypeId.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "BoxShapeComponentTypeId", + "base": "BoxShapeComponentTypeId", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetBoxShapeComponentTypeId", + "base": "GetBoxShapeComponentTypeId", "details": { "name": "Get Box Shape Component Type Id" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/CUBE.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/CUBE.names index b51cbc89e5..3ec26e189b 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/CUBE.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/CUBE.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "CUBE", + "base": "CUBE", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetCUBE", + "base": "GetCUBE", "details": { "name": "Cube" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/CYLINDER.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/CYLINDER.names index bffa51f9ca..b893ee0fef 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/CYLINDER.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/CYLINDER.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "CYLINDER", + "base": "CYLINDER", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetCYLINDER", + "base": "GetCYLINDER", "details": { "name": "Cylinder" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/CapsuleShapeComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/CapsuleShapeComponentTypeId.names index 9ed7a47c5c..cdb1bbc238 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/CapsuleShapeComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/CapsuleShapeComponentTypeId.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "CapsuleShapeComponentTypeId", + "base": "CapsuleShapeComponentTypeId", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetCapsuleShapeComponentTypeId", + "base": "GetCapsuleShapeComponentTypeId", "details": { "name": "Get Capsule Shape Component Type Id" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ConstantGradientComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ConstantGradientComponentTypeId.names index cdf8701183..6ff166295b 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ConstantGradientComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ConstantGradientComponentTypeId.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "ConstantGradientComponentTypeId", + "base": "ConstantGradientComponentTypeId", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetConstantGradientComponentTypeId", + "base": "GetConstantGradientComponentTypeId", "details": { "name": "Get Constant Gradient Component Type Id" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/CullMode_Back.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/CullMode_Back.names index bdba8338db..7f7caceb93 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/CullMode_Back.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/CullMode_Back.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "CullMode_Back", + "base": "CullMode_Back", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetCullMode_Back", + "base": "GetCullMode_Back", "details": { "name": "Get Back" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/CullMode_Front.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/CullMode_Front.names index b75bf908d2..b7f8af903b 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/CullMode_Front.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/CullMode_Front.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "CullMode_Front", + "base": "CullMode_Front", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetCullMode_Front", + "base": "GetCullMode_Front", "details": { "name": "Get Front" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/CullMode_Invalid.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/CullMode_Invalid.names index 150e1cc258..e5367958fa 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/CullMode_Invalid.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/CullMode_Invalid.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "CullMode_Invalid", + "base": "CullMode_Invalid", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetCullMode_Invalid", + "base": "GetCullMode_Invalid", "details": { "name": "Get Invalid" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/CullMode_None.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/CullMode_None.names index 6dee6b2bd8..c563d43a64 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/CullMode_None.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/CullMode_None.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "CullMode_None", + "base": "CullMode_None", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetCullMode_None", + "base": "GetCullMode_None", "details": { "name": "Get None" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/CylinderShapeComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/CylinderShapeComponentTypeId.names index ed35cb40b5..2934f89ed4 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/CylinderShapeComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/CylinderShapeComponentTypeId.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "CylinderShapeComponentTypeId", + "base": "CylinderShapeComponentTypeId", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetCylinderShapeComponentTypeId", + "base": "GetCylinderShapeComponentTypeId", "details": { "name": "Get Cylinder Shape Component Type Id" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DecalComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DecalComponentTypeId.names index ee13b45215..2187dfeb24 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DecalComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DecalComponentTypeId.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "DecalComponentTypeId", + "base": "DecalComponentTypeId", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetDecalComponentTypeId", + "base": "GetDecalComponentTypeId", "details": { "name": "Get Decal Component Type Id" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DefaultLodOverride.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DefaultLodOverride.names index aa356e7ce8..1ac1fdb105 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DefaultLodOverride.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DefaultLodOverride.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "DefaultLodOverride", + "base": "DefaultLodOverride", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetDefaultLodOverride", + "base": "GetDefaultLodOverride", "details": { "name": "Get Default Lod Override" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DefaultLodType.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DefaultLodType.names index ca4dbc315f..f5884c2a8c 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DefaultLodType.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DefaultLodType.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "DefaultLodType", + "base": "DefaultLodType", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetDefaultLodType", + "base": "GetDefaultLodType", "details": { "name": "Get Default Lod Type" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DefaultMaterialAssignment.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DefaultMaterialAssignment.names index 55d2a1bff0..2086ad1c9b 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DefaultMaterialAssignment.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DefaultMaterialAssignment.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "DefaultMaterialAssignment", + "base": "DefaultMaterialAssignment", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetDefaultMaterialAssignment", + "base": "GetDefaultMaterialAssignment", "details": { "name": "Get Default Material Assignment" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DefaultMaterialAssignmentId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DefaultMaterialAssignmentId.names index 5d105b63c5..edf35bc3b1 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DefaultMaterialAssignmentId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DefaultMaterialAssignmentId.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "DefaultMaterialAssignmentId", + "base": "DefaultMaterialAssignmentId", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetDefaultMaterialAssignmentId", + "base": "GetDefaultMaterialAssignmentId", "details": { "name": "Get Default Material Assignment Id" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DefaultMaterialAssignmentMap.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DefaultMaterialAssignmentMap.names index c64da412e1..50867c97e1 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DefaultMaterialAssignmentMap.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DefaultMaterialAssignmentMap.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "DefaultMaterialAssignmentMap", + "base": "DefaultMaterialAssignmentMap", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetDefaultMaterialAssignmentMap", + "base": "GetDefaultMaterialAssignmentMap", "details": { "name": "Get Default Material Assignment Map" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DefaultPhysicsSceneId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DefaultPhysicsSceneId.names index 5868303abd..e66d74e456 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DefaultPhysicsSceneId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DefaultPhysicsSceneId.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "DefaultPhysicsSceneId", + "base": "DefaultPhysicsSceneId", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetDefaultPhysicsSceneId", + "base": "GetDefaultPhysicsSceneId", "details": { "name": "Get Default Physics Scene Id" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DefaultPhysicsSceneName.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DefaultPhysicsSceneName.names index 0d83dbeaa4..07a47cfae4 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DefaultPhysicsSceneName.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DefaultPhysicsSceneName.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "DefaultPhysicsSceneName", + "base": "DefaultPhysicsSceneName", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetDefaultPhysicsSceneName", + "base": "GetDefaultPhysicsSceneName", "details": { "name": "Get Default Physics Scene Name" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DeferredFogComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DeferredFogComponentTypeId.names index dbfcf1ceab..4ab65691fe 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DeferredFogComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DeferredFogComponentTypeId.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "DeferredFogComponentTypeId", + "base": "DeferredFogComponentTypeId", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetDeferredFogComponentTypeId", + "base": "GetDeferredFogComponentTypeId", "details": { "name": "Get Deferred Fog Component Type Id" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DepthOfFieldComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DepthOfFieldComponentTypeId.names index e166e29ac2..3d24f7dd7e 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DepthOfFieldComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DepthOfFieldComponentTypeId.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "DepthOfFieldComponentTypeId", + "base": "DepthOfFieldComponentTypeId", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetDepthOfFieldComponentTypeId", + "base": "GetDepthOfFieldComponentTypeId", "details": { "name": "Get Depth Of Field Component Type Id" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DepthWriteMask_All.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DepthWriteMask_All.names index 4e01e31626..fda594cedf 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DepthWriteMask_All.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DepthWriteMask_All.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "DepthWriteMask_All", + "base": "DepthWriteMask_All", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetDepthWriteMask_All", + "base": "GetDepthWriteMask_All", "details": { "name": "All" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DepthWriteMask_Invalid.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DepthWriteMask_Invalid.names index 121170fff3..d28d0a68f1 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DepthWriteMask_Invalid.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DepthWriteMask_Invalid.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "DepthWriteMask_Invalid", + "base": "DepthWriteMask_Invalid", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetDepthWriteMask_Invalid", + "base": "GetDepthWriteMask_Invalid", "details": { "name": "Invalid" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DepthWriteMask_Zero.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DepthWriteMask_Zero.names index 3ee05feb70..e33a0af623 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DepthWriteMask_Zero.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DepthWriteMask_Zero.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "DepthWriteMask_Zero", + "base": "DepthWriteMask_Zero", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetDepthWriteMask_Zero", + "base": "GetDepthWriteMask_Zero", "details": { "name": "Zero" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DescriptorListCombinerComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DescriptorListCombinerComponentTypeId.names index 5be6ea02cc..4b66d5c7a2 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DescriptorListCombinerComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DescriptorListCombinerComponentTypeId.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "DescriptorListCombinerComponentTypeId", + "base": "DescriptorListCombinerComponentTypeId", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetDescriptorListCombinerComponentTypeId", + "base": "GetDescriptorListCombinerComponentTypeId", "details": { "name": "Get Descriptor List Combiner Component Type Id" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DescriptorListComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DescriptorListComponentTypeId.names index fab274e61a..c190cc2a6d 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DescriptorListComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DescriptorListComponentTypeId.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "DescriptorListComponentTypeId", + "base": "DescriptorListComponentTypeId", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetDescriptorListComponentTypeId", + "base": "GetDescriptorListComponentTypeId", "details": { "name": "Get Descriptor List Component Type Id" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DescriptorWeightSelectorComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DescriptorWeightSelectorComponentTypeId.names index 4c34e62926..806f846ca7 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DescriptorWeightSelectorComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DescriptorWeightSelectorComponentTypeId.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "DescriptorWeightSelectorComponentTypeId", + "base": "DescriptorWeightSelectorComponentTypeId", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetDescriptorWeightSelectorComponentTypeId", + "base": "GetDescriptorWeightSelectorComponentTypeId", "details": { "name": "Get Descriptor Weight Selector Component Type Id" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DiffuseGlobalIlluminationComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DiffuseGlobalIlluminationComponentTypeId.names index 6b1e0d2274..123f3768a0 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DiffuseGlobalIlluminationComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DiffuseGlobalIlluminationComponentTypeId.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "DiffuseGlobalIlluminationComponentTypeId", + "base": "DiffuseGlobalIlluminationComponentTypeId", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetDiffuseGlobalIlluminationComponentTypeId", + "base": "GetDiffuseGlobalIlluminationComponentTypeId", "details": { "name": "Get Diffuse Global Illumination Component Type Id" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DiffuseProbeGridComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DiffuseProbeGridComponentTypeId.names index 17b3fe0d71..255fda6778 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DiffuseProbeGridComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DiffuseProbeGridComponentTypeId.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "DiffuseProbeGridComponentTypeId", + "base": "DiffuseProbeGridComponentTypeId", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetDiffuseProbeGridComponentTypeId", + "base": "GetDiffuseProbeGridComponentTypeId", "details": { "name": "Get Diffuse Probe Grid Component Type Id" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DirectionalLightComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DirectionalLightComponentTypeId.names index e26bad9485..bc81a2d511 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DirectionalLightComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DirectionalLightComponentTypeId.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "DirectionalLightComponentTypeId", + "base": "DirectionalLightComponentTypeId", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetDirectionalLightComponentTypeId", + "base": "GetDirectionalLightComponentTypeId", "details": { "name": "Get Directional Light Component Type Id" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DiskShapeComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DiskShapeComponentTypeId.names index 3785153499..fee2376420 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DiskShapeComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DiskShapeComponentTypeId.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "DiskShapeComponentTypeId", + "base": "DiskShapeComponentTypeId", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetDiskShapeComponentTypeId", + "base": "GetDiskShapeComponentTypeId", "details": { "name": "Get Disk Shape Component Type Id" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DisplayMapperComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DisplayMapperComponentTypeId.names index 14ac43a4f1..b284f80a68 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DisplayMapperComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DisplayMapperComponentTypeId.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "DisplayMapperComponentTypeId", + "base": "DisplayMapperComponentTypeId", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetDisplayMapperComponentTypeId", + "base": "GetDisplayMapperComponentTypeId", "details": { "name": "Get Display Mapper Component Type Id" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DisplaySettings_HideHelpers.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DisplaySettings_HideHelpers.names index 39edc099c6..9f47789e24 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DisplaySettings_HideHelpers.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DisplaySettings_HideHelpers.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "DisplaySettings_HideHelpers", + "base": "DisplaySettings_HideHelpers", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetDisplaySettings_HideHelpers", + "base": "GetDisplaySettings_HideHelpers", "details": { "name": "Get Hide Helpers" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DisplaySettings_HideLinks.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DisplaySettings_HideLinks.names index 718bfd6bb9..93fc163a67 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DisplaySettings_HideLinks.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DisplaySettings_HideLinks.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "DisplaySettings_HideLinks", + "base": "DisplaySettings_HideLinks", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetDisplaySettings_HideLinks", + "base": "GetDisplaySettings_HideLinks", "details": { "name": "Get Hide Links" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DisplaySettings_HideTracks.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DisplaySettings_HideTracks.names index 92d364f846..45872cce0d 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DisplaySettings_HideTracks.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DisplaySettings_HideTracks.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "DisplaySettings_HideTracks", + "base": "DisplaySettings_HideTracks", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetDisplaySettings_HideTracks", + "base": "GetDisplaySettings_HideTracks", "details": { "name": "Get Hide Tracks" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DisplaySettings_NoCollision.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DisplaySettings_NoCollision.names index 1d889e2a36..096407f338 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DisplaySettings_NoCollision.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DisplaySettings_NoCollision.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "DisplaySettings_NoCollision", + "base": "DisplaySettings_NoCollision", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetDisplaySettings_NoCollision", + "base": "GetDisplaySettings_NoCollision", "details": { "name": "Get No Collision" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DisplaySettings_NoLabels.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DisplaySettings_NoLabels.names index d5e7eac4ea..b0d8562db6 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DisplaySettings_NoLabels.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DisplaySettings_NoLabels.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "DisplaySettings_NoLabels", + "base": "DisplaySettings_NoLabels", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetDisplaySettings_NoLabels", + "base": "GetDisplaySettings_NoLabels", "details": { "name": "Get No Labels" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DisplaySettings_Physics.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DisplaySettings_Physics.names index 211f15d61c..224f6d48f0 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DisplaySettings_Physics.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DisplaySettings_Physics.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "DisplaySettings_Physics", + "base": "DisplaySettings_Physics", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetDisplaySettings_Physics", + "base": "GetDisplaySettings_Physics", "details": { "name": "Get Physics" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DisplaySettings_SerializableFlagsMask.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DisplaySettings_SerializableFlagsMask.names index c58ff484a5..ae664ce8a6 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DisplaySettings_SerializableFlagsMask.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DisplaySettings_SerializableFlagsMask.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "DisplaySettings_SerializableFlagsMask", + "base": "DisplaySettings_SerializableFlagsMask", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetDisplaySettings_SerializableFlagsMask", + "base": "GetDisplaySettings_SerializableFlagsMask", "details": { "name": "Get Serializable Flags Mask" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DisplaySettings_ShowDimensionFigures.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DisplaySettings_ShowDimensionFigures.names index c9e85d3655..d6d9de0549 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DisplaySettings_ShowDimensionFigures.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DisplaySettings_ShowDimensionFigures.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "DisplaySettings_ShowDimensionFigures", + "base": "DisplaySettings_ShowDimensionFigures", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetDisplaySettings_ShowDimensionFigures", + "base": "GetDisplaySettings_ShowDimensionFigures", "details": { "name": "Get Show Dimension Figures" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DistanceBetweenFilterComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DistanceBetweenFilterComponentTypeId.names index 02b22eb18b..2e1801b3b0 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DistanceBetweenFilterComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DistanceBetweenFilterComponentTypeId.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "DistanceBetweenFilterComponentTypeId", + "base": "DistanceBetweenFilterComponentTypeId", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetDistanceBetweenFilterComponentTypeId", + "base": "GetDistanceBetweenFilterComponentTypeId", "details": { "name": "Get Distance Between Filter Component Type Id" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DistributionFilterComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DistributionFilterComponentTypeId.names index 9397391c26..b5e1b96354 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DistributionFilterComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DistributionFilterComponentTypeId.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "DistributionFilterComponentTypeId", + "base": "DistributionFilterComponentTypeId", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetDistributionFilterComponentTypeId", + "base": "GetDistributionFilterComponentTypeId", "details": { "name": "Get Distribution Filter Component Type Id" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DitherGradientComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DitherGradientComponentTypeId.names index e1e8fc004e..b43e059a52 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DitherGradientComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/DitherGradientComponentTypeId.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "DitherGradientComponentTypeId", + "base": "DitherGradientComponentTypeId", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetDitherGradientComponentTypeId", + "base": "GetDitherGradientComponentTypeId", "details": { "name": "Get Dither Gradient Component Type Id" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorAreaLightComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorAreaLightComponentTypeId.names index 3ccdef3c90..c219df25cf 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorAreaLightComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorAreaLightComponentTypeId.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "EditorAreaLightComponentTypeId", + "base": "EditorAreaLightComponentTypeId", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetEditorAreaLightComponentTypeId", + "base": "GetEditorAreaLightComponentTypeId", "details": { "name": "Get Editor Area Light Component Type Id" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorBloomComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorBloomComponentTypeId.names index ea31089a11..29cb903318 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorBloomComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorBloomComponentTypeId.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "EditorBloomComponentTypeId", + "base": "EditorBloomComponentTypeId", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetEditorBloomComponentTypeId", + "base": "GetEditorBloomComponentTypeId", "details": { "name": "Get Editor Bloom Component Type Id" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorDecalComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorDecalComponentTypeId.names index b69fcb372a..30bb2a1c29 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorDecalComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorDecalComponentTypeId.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "EditorDecalComponentTypeId", + "base": "EditorDecalComponentTypeId", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetEditorDecalComponentTypeId", + "base": "GetEditorDecalComponentTypeId", "details": { "name": "Get Editor Decal Component Type Id" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorDeferredFogComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorDeferredFogComponentTypeId.names index 6db10fabfb..d8bdd04e6b 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorDeferredFogComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorDeferredFogComponentTypeId.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "EditorDeferredFogComponentTypeId", + "base": "EditorDeferredFogComponentTypeId", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetEditorDeferredFogComponentTypeId", + "base": "GetEditorDeferredFogComponentTypeId", "details": { "name": "Get Editor Deferred Fog Component Type Id" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorDepthOfFieldComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorDepthOfFieldComponentTypeId.names index 2dfe8dc95f..df6073be7c 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorDepthOfFieldComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorDepthOfFieldComponentTypeId.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "EditorDepthOfFieldComponentTypeId", + "base": "EditorDepthOfFieldComponentTypeId", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetEditorDepthOfFieldComponentTypeId", + "base": "GetEditorDepthOfFieldComponentTypeId", "details": { "name": "Get Editor Depth Of Field Component Type Id" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorDiffuseGlobalIlluminationComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorDiffuseGlobalIlluminationComponentTypeId.names index 936e7d3dcc..3ce4b30d34 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorDiffuseGlobalIlluminationComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorDiffuseGlobalIlluminationComponentTypeId.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "EditorDiffuseGlobalIlluminationComponentTypeId", + "base": "EditorDiffuseGlobalIlluminationComponentTypeId", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetEditorDiffuseGlobalIlluminationComponentTypeId", + "base": "GetEditorDiffuseGlobalIlluminationComponentTypeId", "details": { "name": "Get Editor Diffuse Global Illumination Component Type Id" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorDiffuseProbeGridComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorDiffuseProbeGridComponentTypeId.names index 41fe82f546..2d76298124 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorDiffuseProbeGridComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorDiffuseProbeGridComponentTypeId.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "EditorDiffuseProbeGridComponentTypeId", + "base": "EditorDiffuseProbeGridComponentTypeId", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetEditorDiffuseProbeGridComponentTypeId", + "base": "GetEditorDiffuseProbeGridComponentTypeId", "details": { "name": "Get Editor Diffuse Probe Grid Component Type Id" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorDirectionalLightComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorDirectionalLightComponentTypeId.names index 0df16ac38a..697762e490 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorDirectionalLightComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorDirectionalLightComponentTypeId.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "EditorDirectionalLightComponentTypeId", + "base": "EditorDirectionalLightComponentTypeId", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetEditorDirectionalLightComponentTypeId", + "base": "GetEditorDirectionalLightComponentTypeId", "details": { "name": "Get Editor Directional Light Component Type Id" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorDisplayMapperComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorDisplayMapperComponentTypeId.names index 115f43abc6..18c54519a9 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorDisplayMapperComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorDisplayMapperComponentTypeId.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "EditorDisplayMapperComponentTypeId", + "base": "EditorDisplayMapperComponentTypeId", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetEditorDisplayMapperComponentTypeId", + "base": "GetEditorDisplayMapperComponentTypeId", "details": { "name": "Get Editor Display Mapper Component Type Id" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorEntityReferenceComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorEntityReferenceComponentTypeId.names index fb4126a455..96f3adf90b 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorEntityReferenceComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorEntityReferenceComponentTypeId.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "EditorEntityReferenceComponentTypeId", + "base": "EditorEntityReferenceComponentTypeId", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetEditorEntityReferenceComponentTypeId", + "base": "GetEditorEntityReferenceComponentTypeId", "details": { "name": "Get Editor Entity Reference Component Type Id" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorEntityStartStatus_EditorOnly.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorEntityStartStatus_EditorOnly.names index 9c661077d4..f9536eeddc 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorEntityStartStatus_EditorOnly.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorEntityStartStatus_EditorOnly.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "EditorEntityStartStatus_EditorOnly", + "base": "EditorEntityStartStatus_EditorOnly", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetEditorEntityStartStatus_EditorOnly", + "base": "GetEditorEntityStartStatus_EditorOnly", "details": { "name": "Get Editor Entity Start Status_ Editor Only" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorEntityStartStatus_StartActive.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorEntityStartStatus_StartActive.names index 16256448a3..a6585f24ed 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorEntityStartStatus_StartActive.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorEntityStartStatus_StartActive.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "EditorEntityStartStatus_StartActive", + "base": "EditorEntityStartStatus_StartActive", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetEditorEntityStartStatus_StartActive", + "base": "GetEditorEntityStartStatus_StartActive", "details": { "name": "Get Editor Entity Start Status_ Start Active" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorEntityStartStatus_StartInactive.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorEntityStartStatus_StartInactive.names index b65178acca..20ed53be3d 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorEntityStartStatus_StartInactive.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorEntityStartStatus_StartInactive.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "EditorEntityStartStatus_StartInactive", + "base": "EditorEntityStartStatus_StartInactive", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetEditorEntityStartStatus_StartInactive", + "base": "GetEditorEntityStartStatus_StartInactive", "details": { "name": "Get Editor Entity Start Status_ Start Inactive" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorExposureControlComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorExposureControlComponentTypeId.names index 6048df512b..d5722e7279 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorExposureControlComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorExposureControlComponentTypeId.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "EditorExposureControlComponentTypeId", + "base": "EditorExposureControlComponentTypeId", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetEditorExposureControlComponentTypeId", + "base": "GetEditorExposureControlComponentTypeId", "details": { "name": "Get Editor Exposure Control Component Type Id" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorGradientWeightModifierComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorGradientWeightModifierComponentTypeId.names index 089ce77046..12178cd421 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorGradientWeightModifierComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorGradientWeightModifierComponentTypeId.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "EditorGradientWeightModifierComponentTypeId", + "base": "EditorGradientWeightModifierComponentTypeId", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetEditorGradientWeightModifierComponentTypeId", + "base": "GetEditorGradientWeightModifierComponentTypeId", "details": { "name": "Get Editor Gradient Weight Modifier Component Type Id" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorGridComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorGridComponentTypeId.names index 82d83055b5..72969664a5 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorGridComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorGridComponentTypeId.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "EditorGridComponentTypeId", + "base": "EditorGridComponentTypeId", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetEditorGridComponentTypeId", + "base": "GetEditorGridComponentTypeId", "details": { "name": "Get Editor Grid Component Type Id" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorHDRiSkyboxComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorHDRiSkyboxComponentTypeId.names index 21db0e71f6..52bd2fe5af 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorHDRiSkyboxComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorHDRiSkyboxComponentTypeId.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "EditorHDRiSkyboxComponentTypeId", + "base": "EditorHDRiSkyboxComponentTypeId", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetEditorHDRiSkyboxComponentTypeId", + "base": "GetEditorHDRiSkyboxComponentTypeId", "details": { "name": "Get EditorHD Ri Skybox Component Type Id" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorHairComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorHairComponentTypeId.names index 4023cf04bf..17df6d3de5 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorHairComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorHairComponentTypeId.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "EditorHairComponentTypeId", + "base": "EditorHairComponentTypeId", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetEditorHairComponentTypeId", + "base": "GetEditorHairComponentTypeId", "details": { "name": "Get Editor Hair Component Type Id" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorImageBasedLightComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorImageBasedLightComponentTypeId.names index 8163c59d3e..a57151ad18 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorImageBasedLightComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorImageBasedLightComponentTypeId.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "EditorImageBasedLightComponentTypeId", + "base": "EditorImageBasedLightComponentTypeId", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetEditorImageBasedLightComponentTypeId", + "base": "GetEditorImageBasedLightComponentTypeId", "details": { "name": "Get Editor Image Based Light Component Type Id" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorLookModificationComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorLookModificationComponentTypeId.names index 285f3a3666..6d2fdbd5f0 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorLookModificationComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorLookModificationComponentTypeId.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "EditorLookModificationComponentTypeId", + "base": "EditorLookModificationComponentTypeId", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetEditorLookModificationComponentTypeId", + "base": "GetEditorLookModificationComponentTypeId", "details": { "name": "Get Editor Look Modification Component Type Id" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorMaterialComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorMaterialComponentTypeId.names index e6b3f37bf9..385edba4d8 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorMaterialComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorMaterialComponentTypeId.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "EditorMaterialComponentTypeId", + "base": "EditorMaterialComponentTypeId", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetEditorMaterialComponentTypeId", + "base": "GetEditorMaterialComponentTypeId", "details": { "name": "Get Editor Material Component Type Id" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorMeshComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorMeshComponentTypeId.names index a2def3a185..59cdcabefa 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorMeshComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorMeshComponentTypeId.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "EditorMeshComponentTypeId", + "base": "EditorMeshComponentTypeId", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetEditorMeshComponentTypeId", + "base": "GetEditorMeshComponentTypeId", "details": { "name": "Get Editor Mesh Component Type Id" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorNonUniformScaleComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorNonUniformScaleComponentTypeId.names index 6b6b0b9ca9..bde0970c36 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorNonUniformScaleComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorNonUniformScaleComponentTypeId.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "EditorNonUniformScaleComponentTypeId", + "base": "EditorNonUniformScaleComponentTypeId", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetEditorNonUniformScaleComponentTypeId", + "base": "GetEditorNonUniformScaleComponentTypeId", "details": { "name": "Get Editor Non Uniform Scale Component Type Id" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorOcclusionCullingPlaneComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorOcclusionCullingPlaneComponentTypeId.names index 73f96098d9..bd40fae6ac 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorOcclusionCullingPlaneComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorOcclusionCullingPlaneComponentTypeId.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "EditorOcclusionCullingPlaneComponentTypeId", + "base": "EditorOcclusionCullingPlaneComponentTypeId", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetEditorOcclusionCullingPlaneComponentTypeId", + "base": "GetEditorOcclusionCullingPlaneComponentTypeId", "details": { "name": "Get Editor Occlusion Culling Plane Component Type Id" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorPhysicalSkyComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorPhysicalSkyComponentTypeId.names index 6309ed6321..f021e937f5 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorPhysicalSkyComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorPhysicalSkyComponentTypeId.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "EditorPhysicalSkyComponentTypeId", + "base": "EditorPhysicalSkyComponentTypeId", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetEditorPhysicalSkyComponentTypeId", + "base": "GetEditorPhysicalSkyComponentTypeId", "details": { "name": "Get Editor Physical Sky Component Type Id" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorPhysicsSceneId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorPhysicsSceneId.names index 99a9d21ddf..3961b7492a 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorPhysicsSceneId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorPhysicsSceneId.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "EditorPhysicsSceneId", + "base": "EditorPhysicsSceneId", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetEditorPhysicsSceneId", + "base": "GetEditorPhysicsSceneId", "details": { "name": "Get Editor Physics Scene Id" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorPhysicsSceneName.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorPhysicsSceneName.names index 2ac4fb9bab..1c8884e7a3 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorPhysicsSceneName.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorPhysicsSceneName.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "EditorPhysicsSceneName", + "base": "EditorPhysicsSceneName", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetEditorPhysicsSceneName", + "base": "GetEditorPhysicsSceneName", "details": { "name": "Get Editor Physics Scene Name" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorPostFxLayerComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorPostFxLayerComponentTypeId.names index 76336a7ae0..45c05cc768 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorPostFxLayerComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorPostFxLayerComponentTypeId.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "EditorPostFxLayerComponentTypeId", + "base": "EditorPostFxLayerComponentTypeId", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetEditorPostFxLayerComponentTypeId", + "base": "GetEditorPostFxLayerComponentTypeId", "details": { "name": "Get Editor Post Fx Layer Component Type Id" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorPrefabComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorPrefabComponentTypeId.names index 23f9abfa1c..c120f6de8e 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorPrefabComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorPrefabComponentTypeId.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "EditorPrefabComponentTypeId", + "base": "EditorPrefabComponentTypeId", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetEditorPrefabComponentTypeId", + "base": "GetEditorPrefabComponentTypeId", "details": { "name": "Get Editor Prefab Component Type Id" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorRadiusWeightModifierComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorRadiusWeightModifierComponentTypeId.names index 899d0a0da1..f7b519633f 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorRadiusWeightModifierComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorRadiusWeightModifierComponentTypeId.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "EditorRadiusWeightModifierComponentTypeId", + "base": "EditorRadiusWeightModifierComponentTypeId", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetEditorRadiusWeightModifierComponentTypeId", + "base": "GetEditorRadiusWeightModifierComponentTypeId", "details": { "name": "Get Editor Radius Weight Modifier Component Type Id" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorReflectionProbeComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorReflectionProbeComponentTypeId.names index aaea2f0d5c..caf01ce791 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorReflectionProbeComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorReflectionProbeComponentTypeId.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "EditorReflectionProbeComponentTypeId", + "base": "EditorReflectionProbeComponentTypeId", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetEditorReflectionProbeComponentTypeId", + "base": "GetEditorReflectionProbeComponentTypeId", "details": { "name": "Get Editor Reflection Probe Component Type Id" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorShapeWeightModifierComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorShapeWeightModifierComponentTypeId.names index 32910e23cb..965d0a0264 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorShapeWeightModifierComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorShapeWeightModifierComponentTypeId.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "EditorShapeWeightModifierComponentTypeId", + "base": "EditorShapeWeightModifierComponentTypeId", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetEditorShapeWeightModifierComponentTypeId", + "base": "GetEditorShapeWeightModifierComponentTypeId", "details": { "name": "Get Editor Shape Weight Modifier Component Type Id" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorSsaoComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorSsaoComponentTypeId.names index 163d0b924f..c041c1bf04 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorSsaoComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorSsaoComponentTypeId.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "EditorSsaoComponentTypeId", + "base": "EditorSsaoComponentTypeId", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetEditorSsaoComponentTypeId", + "base": "GetEditorSsaoComponentTypeId", "details": { "name": "Get Editor Ssao Component Type Id" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorTransformComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorTransformComponentTypeId.names index 2e925bacb5..d3d17c73cc 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorTransformComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EditorTransformComponentTypeId.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "EditorTransformComponentTypeId", + "base": "EditorTransformComponentTypeId", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetEditorTransformComponentTypeId", + "base": "GetEditorTransformComponentTypeId", "details": { "name": "Get Editor Transform Component Type Id" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EntityReferenceComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EntityReferenceComponentTypeId.names index 3028bc10a9..e5d76d415c 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EntityReferenceComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/EntityReferenceComponentTypeId.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "EntityReferenceComponentTypeId", + "base": "EntityReferenceComponentTypeId", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetEntityReferenceComponentTypeId", + "base": "GetEntityReferenceComponentTypeId", "details": { "name": "Get Entity Reference Component Type Id" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ExposureControlComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ExposureControlComponentTypeId.names index e647de6ad3..cea1b1bcee 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ExposureControlComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ExposureControlComponentTypeId.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "ExposureControlComponentTypeId", + "base": "ExposureControlComponentTypeId", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetExposureControlComponentTypeId", + "base": "GetExposureControlComponentTypeId", "details": { "name": "Get Exposure Control Component Type Id" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FastNoiseGradientComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FastNoiseGradientComponentTypeId.names index 041c43701a..3a1b1e3def 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FastNoiseGradientComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FastNoiseGradientComponentTypeId.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "FastNoiseGradientComponentTypeId", + "base": "FastNoiseGradientComponentTypeId", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetFastNoiseGradientComponentTypeId", + "base": "GetFastNoiseGradientComponentTypeId", "details": { "name": "Get Fast Noise Gradient Component Type Id" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FillMode_Invalid.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FillMode_Invalid.names index f93f276062..aa856455f5 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FillMode_Invalid.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FillMode_Invalid.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "FillMode_Invalid", + "base": "FillMode_Invalid", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetFillMode_Invalid", + "base": "GetFillMode_Invalid", "details": { "name": "Invalid" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FillMode_Solid.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FillMode_Solid.names index 7dc99cfd1d..1eecbacacf 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FillMode_Solid.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FillMode_Solid.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "FillMode_Solid", + "base": "FillMode_Solid", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetFillMode_Solid", + "base": "GetFillMode_Solid", "details": { "name": "Solid" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FillMode_Wireframe.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FillMode_Wireframe.names index f820d7d106..382f55dca8 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FillMode_Wireframe.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FillMode_Wireframe.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "FillMode_Wireframe", + "base": "FillMode_Wireframe", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetFillMode_Wireframe", + "base": "GetFillMode_Wireframe", "details": { "name": "Wireframe" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FloatEpsilon.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FloatEpsilon.names index 017cd8a36b..b5dc4c02d7 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FloatEpsilon.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FloatEpsilon.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "FloatEpsilon", + "base": "FloatEpsilon", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetFloatEpsilon", + "base": "GetFloatEpsilon", "details": { "name": "Float Epsilon" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FrameCaptureResult_FileWriteError.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FrameCaptureResult_FileWriteError.names index 8a9f90d664..81ab3e2c12 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FrameCaptureResult_FileWriteError.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FrameCaptureResult_FileWriteError.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "FrameCaptureResult_FileWriteError", + "base": "FrameCaptureResult_FileWriteError", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetFrameCaptureResult_FileWriteError", + "base": "GetFrameCaptureResult_FileWriteError", "details": { "name": "File Write Error" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FrameCaptureResult_InternalError.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FrameCaptureResult_InternalError.names index 0bee22fd8d..168f94594e 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FrameCaptureResult_InternalError.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FrameCaptureResult_InternalError.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "FrameCaptureResult_InternalError", + "base": "FrameCaptureResult_InternalError", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetFrameCaptureResult_InternalError", + "base": "GetFrameCaptureResult_InternalError", "details": { "name": "Internal Error" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FrameCaptureResult_InvalidArgument.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FrameCaptureResult_InvalidArgument.names index 21699eef84..983e8193e3 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FrameCaptureResult_InvalidArgument.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FrameCaptureResult_InvalidArgument.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "FrameCaptureResult_InvalidArgument", + "base": "FrameCaptureResult_InvalidArgument", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetFrameCaptureResult_InvalidArgument", + "base": "GetFrameCaptureResult_InvalidArgument", "details": { "name": "Invalid Argument" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FrameCaptureResult_None.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FrameCaptureResult_None.names index 95b49529b3..8ab7a2ff17 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FrameCaptureResult_None.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FrameCaptureResult_None.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "FrameCaptureResult_None", + "base": "FrameCaptureResult_None", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetFrameCaptureResult_None", + "base": "GetFrameCaptureResult_None", "details": { "name": "None" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FrameCaptureResult_Success.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FrameCaptureResult_Success.names index 1b9a6a257e..a7704a07a0 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FrameCaptureResult_Success.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FrameCaptureResult_Success.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "FrameCaptureResult_Success", + "base": "FrameCaptureResult_Success", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetFrameCaptureResult_Success", + "base": "GetFrameCaptureResult_Success", "details": { "name": "Success" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FrameCaptureResult_UnsupportedFormat.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FrameCaptureResult_UnsupportedFormat.names index bda7719923..f16d51f8a0 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FrameCaptureResult_UnsupportedFormat.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/FrameCaptureResult_UnsupportedFormat.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "FrameCaptureResult_UnsupportedFormat", + "base": "FrameCaptureResult_UnsupportedFormat", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetFrameCaptureResult_UnsupportedFormat", + "base": "GetFrameCaptureResult_UnsupportedFormat", "details": { "name": "Unsupported Format" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/GradientSurfaceDataComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/GradientSurfaceDataComponentTypeId.names index 738344fe5d..977aa61049 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/GradientSurfaceDataComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/GradientSurfaceDataComponentTypeId.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "GradientSurfaceDataComponentTypeId", + "base": "GradientSurfaceDataComponentTypeId", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetGradientSurfaceDataComponentTypeId", + "base": "GetGradientSurfaceDataComponentTypeId", "details": { "name": "Get Gradient Surface Data Component Type Id" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/GradientTransformComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/GradientTransformComponentTypeId.names index 4a87849a90..ff20414bcf 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/GradientTransformComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/GradientTransformComponentTypeId.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "GradientTransformComponentTypeId", + "base": "GradientTransformComponentTypeId", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetGradientTransformComponentTypeId", + "base": "GetGradientTransformComponentTypeId", "details": { "name": "Get Gradient Transform Component Type Id" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/GradientWeightModifierComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/GradientWeightModifierComponentTypeId.names index 6c330f20a6..f5f5bfbbc9 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/GradientWeightModifierComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/GradientWeightModifierComponentTypeId.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "GradientWeightModifierComponentTypeId", + "base": "GradientWeightModifierComponentTypeId", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetGradientWeightModifierComponentTypeId", + "base": "GetGradientWeightModifierComponentTypeId", "details": { "name": "Get Gradient Weight Modifier Component Type Id" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/GridComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/GridComponentTypeId.names index 47ceaedf7d..dbe919d573 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/GridComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/GridComponentTypeId.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "GridComponentTypeId", + "base": "GridComponentTypeId", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetGridComponentTypeId", + "base": "GetGridComponentTypeId", "details": { "name": "Get Grid Component Type Id" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/HDRiSkyboxComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/HDRiSkyboxComponentTypeId.names index e751828cbd..d840a65997 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/HDRiSkyboxComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/HDRiSkyboxComponentTypeId.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "HDRiSkyboxComponentTypeId", + "base": "HDRiSkyboxComponentTypeId", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetHDRiSkyboxComponentTypeId", + "base": "GetHDRiSkyboxComponentTypeId", "details": { "name": "GetHD Ri Skybox Component Type Id" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/HairComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/HairComponentTypeId.names index 622365e02b..072a9214c8 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/HairComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/HairComponentTypeId.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "HairComponentTypeId", + "base": "HairComponentTypeId", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetHairComponentTypeId", + "base": "GetHairComponentTypeId", "details": { "name": "Get Hair Component Type Id" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ICOSAHEDRON.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ICOSAHEDRON.names index a682faf391..50fd81277d 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ICOSAHEDRON.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ICOSAHEDRON.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "ICOSAHEDRON", + "base": "ICOSAHEDRON", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetICOSAHEDRON", + "base": "GetICOSAHEDRON", "details": { "name": "Icosahedron" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ImageBasedLightComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ImageBasedLightComponentTypeId.names index ce12489188..9216b7bfb0 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ImageBasedLightComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ImageBasedLightComponentTypeId.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "ImageBasedLightComponentTypeId", + "base": "ImageBasedLightComponentTypeId", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetImageBasedLightComponentTypeId", + "base": "GetImageBasedLightComponentTypeId", "details": { "name": "Get Image Based Light Component Type Id" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ImageGradientComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ImageGradientComponentTypeId.names index 33833b9276..7a19cff05d 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ImageGradientComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ImageGradientComponentTypeId.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "ImageGradientComponentTypeId", + "base": "ImageGradientComponentTypeId", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetImageGradientComponentTypeId", + "base": "GetImageGradientComponentTypeId", "details": { "name": "Get Image Gradient Component Type Id" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/InvalidComponentId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/InvalidComponentId.names index fd02ea1cff..726f894d8d 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/InvalidComponentId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/InvalidComponentId.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "InvalidComponentId", + "base": "InvalidComponentId", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetInvalidComponentId", + "base": "GetInvalidComponentId", "details": { "name": "Get Invalid Component Id" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/InvalidParameterIndex.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/InvalidParameterIndex.names index 7b51f760c6..a278dccb34 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/InvalidParameterIndex.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/InvalidParameterIndex.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "InvalidParameterIndex", + "base": "InvalidParameterIndex", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetInvalidParameterIndex", + "base": "GetInvalidParameterIndex", "details": { "name": "Get Invalid Parameter Index" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/InvalidTemplateId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/InvalidTemplateId.names index 06a39600c4..34f0345f45 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/InvalidTemplateId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/InvalidTemplateId.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "InvalidTemplateId", + "base": "InvalidTemplateId", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetInvalidTemplateId", + "base": "GetInvalidTemplateId", "details": { "name": "Get Invalid Template Id" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/InvertGradientComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/InvertGradientComponentTypeId.names index bbf4a4894d..e09f65f71f 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/InvertGradientComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/InvertGradientComponentTypeId.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "InvertGradientComponentTypeId", + "base": "InvertGradientComponentTypeId", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetInvertGradientComponentTypeId", + "base": "GetInvertGradientComponentTypeId", "details": { "name": "Get Invert Gradient Component Type Id" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/JsonMergePatch.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/JsonMergePatch.names index d9d2570e7f..dda23f91e7 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/JsonMergePatch.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/JsonMergePatch.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "JsonMergePatch", + "base": "JsonMergePatch", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetJsonMergePatch", + "base": "GetJsonMergePatch", "details": { "name": "Get Json Merge Patch" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/JsonPatch.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/JsonPatch.names index f6ac94bc60..c5288b5e5a 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/JsonPatch.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/JsonPatch.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "JsonPatch", + "base": "JsonPatch", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetJsonPatch", + "base": "GetJsonPatch", "details": { "name": "Get Json Patch" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/LANDSCAPE_CANVAS_EDITOR_ID.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/LANDSCAPE_CANVAS_EDITOR_ID.names index 533d7bc0e4..b9aabee87c 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/LANDSCAPE_CANVAS_EDITOR_ID.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/LANDSCAPE_CANVAS_EDITOR_ID.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "LANDSCAPE_CANVAS_EDITOR_ID", + "base": "LANDSCAPE_CANVAS_EDITOR_ID", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetLANDSCAPE_CANVAS_EDITOR_ID", + "base": "GetLANDSCAPE_CANVAS_EDITOR_ID", "details": { "name": "Editor Id" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/LevelSettingsComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/LevelSettingsComponentTypeId.names index cae16f3af6..af01c5f258 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/LevelSettingsComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/LevelSettingsComponentTypeId.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "LevelSettingsComponentTypeId", + "base": "LevelSettingsComponentTypeId", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetLevelSettingsComponentTypeId", + "base": "GetLevelSettingsComponentTypeId", "details": { "name": "Get Level Settings Component Type Id" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/LevelsGradientComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/LevelsGradientComponentTypeId.names index 1fb4d80484..0f44a7eb3d 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/LevelsGradientComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/LevelsGradientComponentTypeId.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "LevelsGradientComponentTypeId", + "base": "LevelsGradientComponentTypeId", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetLevelsGradientComponentTypeId", + "base": "GetLevelsGradientComponentTypeId", "details": { "name": "Get Levels Gradient Component Type Id" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/LightAttenuationRadiusMode_Automatic.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/LightAttenuationRadiusMode_Automatic.names index 82997c40a5..8dac5f9651 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/LightAttenuationRadiusMode_Automatic.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/LightAttenuationRadiusMode_Automatic.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "LightAttenuationRadiusMode_Automatic", + "base": "LightAttenuationRadiusMode_Automatic", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetLightAttenuationRadiusMode_Automatic", + "base": "GetLightAttenuationRadiusMode_Automatic", "details": { "name": "Automatic" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/LightAttenuationRadiusMode_Explicit.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/LightAttenuationRadiusMode_Explicit.names index 546a8f21d8..d3f754b147 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/LightAttenuationRadiusMode_Explicit.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/LightAttenuationRadiusMode_Explicit.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "LightAttenuationRadiusMode_Explicit", + "base": "LightAttenuationRadiusMode_Explicit", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetLightAttenuationRadiusMode_Explicit", + "base": "GetLightAttenuationRadiusMode_Explicit", "details": { "name": "Explicit" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/LookModificationComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/LookModificationComponentTypeId.names index ee6f688929..4455d529d9 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/LookModificationComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/LookModificationComponentTypeId.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "LookModificationComponentTypeId", + "base": "LookModificationComponentTypeId", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetLookModificationComponentTypeId", + "base": "GetLookModificationComponentTypeId", "details": { "name": "Get Look Modification Component Type Id" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/MaterialComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/MaterialComponentTypeId.names index c4804c0db2..30f9afc015 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/MaterialComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/MaterialComponentTypeId.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "MaterialComponentTypeId", + "base": "MaterialComponentTypeId", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetMaterialComponentTypeId", + "base": "GetMaterialComponentTypeId", "details": { "name": "Get Material Component Type Id" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/MaterialPropertyGroupVisibility_Enabled.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/MaterialPropertyGroupVisibility_Enabled.names index 76b190410d..2f7eceec8e 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/MaterialPropertyGroupVisibility_Enabled.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/MaterialPropertyGroupVisibility_Enabled.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "MaterialPropertyGroupVisibility_Enabled", + "base": "MaterialPropertyGroupVisibility_Enabled", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetMaterialPropertyGroupVisibility_Enabled", + "base": "GetMaterialPropertyGroupVisibility_Enabled", "details": { "name": "Enabled" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/MaterialPropertyGroupVisibility_Hidden.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/MaterialPropertyGroupVisibility_Hidden.names index b2457aed71..398499a02e 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/MaterialPropertyGroupVisibility_Hidden.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/MaterialPropertyGroupVisibility_Hidden.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "MaterialPropertyGroupVisibility_Hidden", + "base": "MaterialPropertyGroupVisibility_Hidden", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetMaterialPropertyGroupVisibility_Hidden", + "base": "GetMaterialPropertyGroupVisibility_Hidden", "details": { "name": "Hidden" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/MaterialPropertyVisibility_Disabled.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/MaterialPropertyVisibility_Disabled.names index a04dc06e3a..41647e6229 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/MaterialPropertyVisibility_Disabled.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/MaterialPropertyVisibility_Disabled.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "MaterialPropertyVisibility_Disabled", + "base": "MaterialPropertyVisibility_Disabled", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetMaterialPropertyVisibility_Disabled", + "base": "GetMaterialPropertyVisibility_Disabled", "details": { "name": "Disabled" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/MaterialPropertyVisibility_Enabled.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/MaterialPropertyVisibility_Enabled.names index b6343d4452..0b8f55854a 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/MaterialPropertyVisibility_Enabled.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/MaterialPropertyVisibility_Enabled.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "MaterialPropertyVisibility_Enabled", + "base": "MaterialPropertyVisibility_Enabled", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetMaterialPropertyVisibility_Enabled", + "base": "GetMaterialPropertyVisibility_Enabled", "details": { "name": "Enabled" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/MaterialPropertyVisibility_Hidden.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/MaterialPropertyVisibility_Hidden.names index d585f38b3d..f07a8c1a52 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/MaterialPropertyVisibility_Hidden.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/MaterialPropertyVisibility_Hidden.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "MaterialPropertyVisibility_Hidden", + "base": "MaterialPropertyVisibility_Hidden", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetMaterialPropertyVisibility_Hidden", + "base": "GetMaterialPropertyVisibility_Hidden", "details": { "name": "Hidden" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/MeshBlockerComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/MeshBlockerComponentTypeId.names index 73ff4a28d7..d20e624867 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/MeshBlockerComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/MeshBlockerComponentTypeId.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "MeshBlockerComponentTypeId", + "base": "MeshBlockerComponentTypeId", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetMeshBlockerComponentTypeId", + "base": "GetMeshBlockerComponentTypeId", "details": { "name": "Get Mesh Blocker Component Type Id" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/MeshComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/MeshComponentTypeId.names index d34efd836f..0833a7bb15 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/MeshComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/MeshComponentTypeId.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "MeshComponentTypeId", + "base": "MeshComponentTypeId", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetMeshComponentTypeId", + "base": "GetMeshComponentTypeId", "details": { "name": "Get Mesh Component Type Id" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/MixedGradientComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/MixedGradientComponentTypeId.names index d58bfe9c55..3780e45102 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/MixedGradientComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/MixedGradientComponentTypeId.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "MixedGradientComponentTypeId", + "base": "MixedGradientComponentTypeId", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetMixedGradientComponentTypeId", + "base": "GetMixedGradientComponentTypeId", "details": { "name": "Get Mixed Gradient Component Type Id" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/MultiPositionBehaviorType_Blended.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/MultiPositionBehaviorType_Blended.names index 5584463927..3d14e91e22 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/MultiPositionBehaviorType_Blended.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/MultiPositionBehaviorType_Blended.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "MultiPositionBehaviorType_Blended", + "base": "MultiPositionBehaviorType_Blended", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetMultiPositionBehaviorType_Blended", + "base": "GetMultiPositionBehaviorType_Blended", "details": { "name": "Blended" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/MultiPositionBehaviorType_Separate.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/MultiPositionBehaviorType_Separate.names index 6aa2d44c74..15577ca173 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/MultiPositionBehaviorType_Separate.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/MultiPositionBehaviorType_Separate.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "MultiPositionBehaviorType_Separate", + "base": "MultiPositionBehaviorType_Separate", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetMultiPositionBehaviorType_Separate", + "base": "GetMultiPositionBehaviorType_Separate", "details": { "name": "Separate" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/OcclusionCullingPlaneComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/OcclusionCullingPlaneComponentTypeId.names index 8f8b5a8449..685d61f8a7 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/OcclusionCullingPlaneComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/OcclusionCullingPlaneComponentTypeId.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "OcclusionCullingPlaneComponentTypeId", + "base": "OcclusionCullingPlaneComponentTypeId", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetOcclusionCullingPlaneComponentTypeId", + "base": "GetOcclusionCullingPlaneComponentTypeId", "details": { "name": "Get Occlusion Culling Plane Component Type Id" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PerlinGradientComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PerlinGradientComponentTypeId.names index 761277822f..d16cca8ebb 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PerlinGradientComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PerlinGradientComponentTypeId.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "PerlinGradientComponentTypeId", + "base": "PerlinGradientComponentTypeId", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetPerlinGradientComponentTypeId", + "base": "GetPerlinGradientComponentTypeId", "details": { "name": "Get Perlin Gradient Component Type Id" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PhotometricUnit_Candela.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PhotometricUnit_Candela.names index 777b65e033..5312a86409 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PhotometricUnit_Candela.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PhotometricUnit_Candela.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "PhotometricUnit_Candela", + "base": "PhotometricUnit_Candela", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetPhotometricUnit_Candela", + "base": "GetPhotometricUnit_Candela", "details": { "name": "Candela" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PhotometricUnit_Ev100_Illuminance.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PhotometricUnit_Ev100_Illuminance.names index 0be63e5f79..ffb2e3875f 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PhotometricUnit_Ev100_Illuminance.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PhotometricUnit_Ev100_Illuminance.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "PhotometricUnit_Ev100_Illuminance", + "base": "PhotometricUnit_Ev100_Illuminance", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetPhotometricUnit_Ev100_Illuminance", + "base": "GetPhotometricUnit_Ev100_Illuminance", "details": { "name": "Ev 100 Illuminance" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PhotometricUnit_Ev100_Luminance.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PhotometricUnit_Ev100_Luminance.names index c0d66a0bff..b0a0fe6a47 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PhotometricUnit_Ev100_Luminance.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PhotometricUnit_Ev100_Luminance.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "PhotometricUnit_Ev100_Luminance", + "base": "PhotometricUnit_Ev100_Luminance", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetPhotometricUnit_Ev100_Luminance", + "base": "GetPhotometricUnit_Ev100_Luminance", "details": { "name": "Ev 100 Luminance" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PhotometricUnit_Lumen.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PhotometricUnit_Lumen.names index 4484ca6141..9e67c249af 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PhotometricUnit_Lumen.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PhotometricUnit_Lumen.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "PhotometricUnit_Lumen", + "base": "PhotometricUnit_Lumen", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetPhotometricUnit_Lumen", + "base": "GetPhotometricUnit_Lumen", "details": { "name": "Lumen" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PhotometricUnit_Lux.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PhotometricUnit_Lux.names index 8b0fba4085..a82a2cbc0a 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PhotometricUnit_Lux.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PhotometricUnit_Lux.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "PhotometricUnit_Lux", + "base": "PhotometricUnit_Lux", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetPhotometricUnit_Lux", + "base": "GetPhotometricUnit_Lux", "details": { "name": "Lux" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PhotometricUnit_Nit.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PhotometricUnit_Nit.names index 5e5326dc76..3a66270b8a 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PhotometricUnit_Nit.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PhotometricUnit_Nit.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "PhotometricUnit_Nit", + "base": "PhotometricUnit_Nit", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetPhotometricUnit_Nit", + "base": "GetPhotometricUnit_Nit", "details": { "name": "Nit" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PhotometricUnit_Unknown.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PhotometricUnit_Unknown.names index aa7a690895..f07cfd2be4 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PhotometricUnit_Unknown.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PhotometricUnit_Unknown.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "PhotometricUnit_Unknown", + "base": "PhotometricUnit_Unknown", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetPhotometricUnit_Unknown", + "base": "GetPhotometricUnit_Unknown", "details": { "name": "Unknown" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PhysicalSkyComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PhysicalSkyComponentTypeId.names index b1dcaa1816..acd3e30945 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PhysicalSkyComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PhysicalSkyComponentTypeId.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "PhysicalSkyComponentTypeId", + "base": "PhysicalSkyComponentTypeId", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetPhysicalSkyComponentTypeId", + "base": "GetPhysicalSkyComponentTypeId", "details": { "name": "Get Physical Sky Component Type Id" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PositionModifierComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PositionModifierComponentTypeId.names index 72757fc200..3934036ae6 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PositionModifierComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PositionModifierComponentTypeId.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "PositionModifierComponentTypeId", + "base": "PositionModifierComponentTypeId", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetPositionModifierComponentTypeId", + "base": "GetPositionModifierComponentTypeId", "details": { "name": "Get Position Modifier Component Type Id" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PostFxLayerComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PostFxLayerComponentTypeId.names index c82036d25d..a09eb0fe51 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PostFxLayerComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PostFxLayerComponentTypeId.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "PostFxLayerComponentTypeId", + "base": "PostFxLayerComponentTypeId", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetPostFxLayerComponentTypeId", + "base": "GetPostFxLayerComponentTypeId", "details": { "name": "Get Post Fx Layer Component Type Id" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PosterizeGradientComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PosterizeGradientComponentTypeId.names index 64bcc46fd5..28956d8520 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PosterizeGradientComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/PosterizeGradientComponentTypeId.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "PosterizeGradientComponentTypeId", + "base": "PosterizeGradientComponentTypeId", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetPosterizeGradientComponentTypeId", + "base": "GetPosterizeGradientComponentTypeId", "details": { "name": "Get Posterize Gradient Component Type Id" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ProviderNameEnum_AWSCognitoIDP.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ProviderNameEnum_AWSCognitoIDP.names index 51b18f6a3f..35dd35606c 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ProviderNameEnum_AWSCognitoIDP.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ProviderNameEnum_AWSCognitoIDP.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "ProviderNameEnum_AWSCognitoIDP", + "base": "ProviderNameEnum_AWSCognitoIDP", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetProviderNameEnum_AWSCognitoIDP", + "base": "GetProviderNameEnum_AWSCognitoIDP", "details": { "name": "AWS Cognito IDP" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ProviderNameEnum_Google.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ProviderNameEnum_Google.names index c6f5875b85..11b91a902c 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ProviderNameEnum_Google.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ProviderNameEnum_Google.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "ProviderNameEnum_Google", + "base": "ProviderNameEnum_Google", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetProviderNameEnum_Google", + "base": "GetProviderNameEnum_Google", "details": { "name": "Google" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ProviderNameEnum_LoginWithAmazon.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ProviderNameEnum_LoginWithAmazon.names index 9ce06d95bc..9f63f5a2ad 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ProviderNameEnum_LoginWithAmazon.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ProviderNameEnum_LoginWithAmazon.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "ProviderNameEnum_LoginWithAmazon", + "base": "ProviderNameEnum_LoginWithAmazon", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetProviderNameEnum_LoginWithAmazon", + "base": "GetProviderNameEnum_LoginWithAmazon", "details": { "name": "Amazon" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ProviderNameEnum_None.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ProviderNameEnum_None.names index cbdd311d17..5f7f21d88a 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ProviderNameEnum_None.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ProviderNameEnum_None.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "ProviderNameEnum_None", + "base": "ProviderNameEnum_None", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetProviderNameEnum_None", + "base": "GetProviderNameEnum_None", "details": { "name": "None" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/QuadShapeComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/QuadShapeComponentTypeId.names index b76b48d344..913f9c6a8e 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/QuadShapeComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/QuadShapeComponentTypeId.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "QuadShapeComponentTypeId", + "base": "QuadShapeComponentTypeId", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetQuadShapeComponentTypeId", + "base": "GetQuadShapeComponentTypeId", "details": { "name": "Get Quad Shape Component Type Id" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/RadiusWeightModifierComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/RadiusWeightModifierComponentTypeId.names index 6afb19615a..b47fe93984 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/RadiusWeightModifierComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/RadiusWeightModifierComponentTypeId.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "RadiusWeightModifierComponentTypeId", + "base": "RadiusWeightModifierComponentTypeId", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetRadiusWeightModifierComponentTypeId", + "base": "GetRadiusWeightModifierComponentTypeId", "details": { "name": "Get Radius Weight Modifier Component Type Id" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/RandomGradientComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/RandomGradientComponentTypeId.names index 7c13c137eb..625f76bba8 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/RandomGradientComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/RandomGradientComponentTypeId.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "RandomGradientComponentTypeId", + "base": "RandomGradientComponentTypeId", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetRandomGradientComponentTypeId", + "base": "GetRandomGradientComponentTypeId", "details": { "name": "Get Random Gradient Component Type Id" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ReferenceGradientComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ReferenceGradientComponentTypeId.names index b4efb57b58..b96e97dfaa 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ReferenceGradientComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ReferenceGradientComponentTypeId.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "ReferenceGradientComponentTypeId", + "base": "ReferenceGradientComponentTypeId", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetReferenceGradientComponentTypeId", + "base": "GetReferenceGradientComponentTypeId", "details": { "name": "Get Reference Gradient Component Type Id" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ReferenceShapeComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ReferenceShapeComponentTypeId.names index 9341b6e685..bbcfd7f88c 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ReferenceShapeComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ReferenceShapeComponentTypeId.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "ReferenceShapeComponentTypeId", + "base": "ReferenceShapeComponentTypeId", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetReferenceShapeComponentTypeId", + "base": "GetReferenceShapeComponentTypeId", "details": { "name": "Get Reference Shape Component Type Id" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ReflectionProbeComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ReflectionProbeComponentTypeId.names index a2b4a72f2a..5b6d58c067 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ReflectionProbeComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ReflectionProbeComponentTypeId.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "ReflectionProbeComponentTypeId", + "base": "ReflectionProbeComponentTypeId", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetReflectionProbeComponentTypeId", + "base": "GetReflectionProbeComponentTypeId", "details": { "name": "Get Reflection Probe Component Type Id" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/RotationModifierComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/RotationModifierComponentTypeId.names index 28ca1a8234..18c7ac1f82 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/RotationModifierComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/RotationModifierComponentTypeId.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "RotationModifierComponentTypeId", + "base": "RotationModifierComponentTypeId", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetRotationModifierComponentTypeId", + "base": "GetRotationModifierComponentTypeId", "details": { "name": "Get Rotation Modifier Component Type Id" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SPHERE.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SPHERE.names index d5477cdc51..4743d85db3 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SPHERE.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SPHERE.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "SPHERE", + "base": "SPHERE", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetSPHERE", + "base": "GetSPHERE", "details": { "name": "Sphere" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ScaleModifierComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ScaleModifierComponentTypeId.names index 7a626da7fa..cee50e1569 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ScaleModifierComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ScaleModifierComponentTypeId.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "ScaleModifierComponentTypeId", + "base": "ScaleModifierComponentTypeId", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetScaleModifierComponentTypeId", + "base": "GetScaleModifierComponentTypeId", "details": { "name": "Get Scale Modifier Component Type Id" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShadowFilterMethod_ESM.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShadowFilterMethod_ESM.names index 2c61e96479..9d16d36c6b 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShadowFilterMethod_ESM.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShadowFilterMethod_ESM.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "ShadowFilterMethod_ESM", + "base": "ShadowFilterMethod_ESM", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetShadowFilterMethod_ESM", + "base": "GetShadowFilterMethod_ESM", "details": { "name": "ESM" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShadowFilterMethod_ESM_PCF.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShadowFilterMethod_ESM_PCF.names index af77df03ec..75750dd2a2 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShadowFilterMethod_ESM_PCF.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShadowFilterMethod_ESM_PCF.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "ShadowFilterMethod_ESM_PCF", + "base": "ShadowFilterMethod_ESM_PCF", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetShadowFilterMethod_ESM_PCF", + "base": "GetShadowFilterMethod_ESM_PCF", "details": { "name": "ESM_PCF" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShadowFilterMethod_None.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShadowFilterMethod_None.names index 872c8175d4..f604ed1147 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShadowFilterMethod_None.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShadowFilterMethod_None.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "ShadowFilterMethod_None", + "base": "ShadowFilterMethod_None", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetShadowFilterMethod_None", + "base": "GetShadowFilterMethod_None", "details": { "name": "None" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShadowFilterMethod_PCF.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShadowFilterMethod_PCF.names index 3186d0931a..7d63db3ad7 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShadowFilterMethod_PCF.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShadowFilterMethod_PCF.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "ShadowFilterMethod_PCF", + "base": "ShadowFilterMethod_PCF", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetShadowFilterMethod_PCF", + "base": "GetShadowFilterMethod_PCF", "details": { "name": "PCF" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShadowmapSize_1024.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShadowmapSize_1024.names index 5f8abb02c3..82fcb11aaf 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShadowmapSize_1024.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShadowmapSize_1024.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "ShadowmapSize_1024", + "base": "ShadowmapSize_1024", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetShadowmapSize_1024", + "base": "GetShadowmapSize_1024", "details": { "name": "1024" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShadowmapSize_2045.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShadowmapSize_2045.names index 18b12dbdaa..545ecbe5f7 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShadowmapSize_2045.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShadowmapSize_2045.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "ShadowmapSize_2045", + "base": "ShadowmapSize_2045", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetShadowmapSize_2045", + "base": "GetShadowmapSize_2045", "details": { "name": "2045" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShadowmapSize_256.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShadowmapSize_256.names index 0711591646..26b11da3d9 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShadowmapSize_256.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShadowmapSize_256.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "ShadowmapSize_256", + "base": "ShadowmapSize_256", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetShadowmapSize_256", + "base": "GetShadowmapSize_256", "details": { "name": "256" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShadowmapSize_512.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShadowmapSize_512.names index b2d763f207..541b28b10d 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShadowmapSize_512.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShadowmapSize_512.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "ShadowmapSize_512", + "base": "ShadowmapSize_512", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetShadowmapSize_512", + "base": "GetShadowmapSize_512", "details": { "name": "512" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShadowmapSize_None.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShadowmapSize_None.names index 58a6bc303f..092d435e9d 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShadowmapSize_None.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShadowmapSize_None.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "ShadowmapSize_None", + "base": "ShadowmapSize_None", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetShadowmapSize_None", + "base": "GetShadowmapSize_None", "details": { "name": "None" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShapeAreaFalloffGradientComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShapeAreaFalloffGradientComponentTypeId.names index f37ce58bed..ca7dc09c50 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShapeAreaFalloffGradientComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShapeAreaFalloffGradientComponentTypeId.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "ShapeAreaFalloffGradientComponentTypeId", + "base": "ShapeAreaFalloffGradientComponentTypeId", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetShapeAreaFalloffGradientComponentTypeId", + "base": "GetShapeAreaFalloffGradientComponentTypeId", "details": { "name": "Get Shape Area Falloff Gradient Component Type Id" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShapeChangeReasons_ShapeChanged.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShapeChangeReasons_ShapeChanged.names index ebe7eb050b..310ae3155b 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShapeChangeReasons_ShapeChanged.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShapeChangeReasons_ShapeChanged.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "ShapeChangeReasons_ShapeChanged", + "base": "ShapeChangeReasons_ShapeChanged", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetShapeChangeReasons_ShapeChanged", + "base": "GetShapeChangeReasons_ShapeChanged", "details": { "name": "Get Shape Change Reasons_ Shape Changed" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShapeChangeReasons_TransformChanged.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShapeChangeReasons_TransformChanged.names index fa38216c96..864d389080 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShapeChangeReasons_TransformChanged.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShapeChangeReasons_TransformChanged.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "ShapeChangeReasons_TransformChanged", + "base": "ShapeChangeReasons_TransformChanged", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetShapeChangeReasons_TransformChanged", + "base": "GetShapeChangeReasons_TransformChanged", "details": { "name": "Get Shape Change Reasons_ Transform Changed" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShapeIntersectionFilterComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShapeIntersectionFilterComponentTypeId.names index 681b7c550b..8c5ef12adf 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShapeIntersectionFilterComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShapeIntersectionFilterComponentTypeId.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "ShapeIntersectionFilterComponentTypeId", + "base": "ShapeIntersectionFilterComponentTypeId", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetShapeIntersectionFilterComponentTypeId", + "base": "GetShapeIntersectionFilterComponentTypeId", "details": { "name": "Get Shape Intersection Filter Component Type Id" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShapeType_Box.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShapeType_Box.names index 1cb9b145a3..233bc2c76f 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShapeType_Box.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShapeType_Box.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "ShapeType_Box", + "base": "ShapeType_Box", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "ShapeType_Box", + "base": "ShapeType_Box", "details": { "name": "Get Shape Type: Box", "subtitle": "Shape Type" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShapeType_Cylinder.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShapeType_Cylinder.names index a86b0ef92f..a4e02a53da 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShapeType_Cylinder.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShapeType_Cylinder.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "ShapeType_Cylinder", + "base": "ShapeType_Cylinder", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "ShapeType_Cylinder", + "base": "ShapeType_Cylinder", "details": { "name": "Get Shape Type: Cylinder", "subtitle": "Shape Type" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShapeType_Heightfield.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShapeType_Heightfield.names index 51c2b8eb0a..8ede2d9b87 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShapeType_Heightfield.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShapeType_Heightfield.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "ShapeType_Heightfield", + "base": "ShapeType_Heightfield", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetShapeType_Heightfield", + "base": "GetShapeType_Heightfield", "details": { "name": "Get Shape Type: Heightfield", "subtitle": "Shape Type" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShapeType_PhysicsAsset.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShapeType_PhysicsAsset.names index ad0eb63c86..9ac02b4f53 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShapeType_PhysicsAsset.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShapeType_PhysicsAsset.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "ShapeType_PhysicsAsset", + "base": "ShapeType_PhysicsAsset", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "ShapeType_PhysicsAsset", + "base": "ShapeType_PhysicsAsset", "details": { "name": "Get Shape Type: Physics Asset", "subtitle": "Shape Type" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShapeType_Sphere.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShapeType_Sphere.names index f66c73f0b2..f2441aacee 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShapeType_Sphere.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShapeType_Sphere.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "ShapeType_Sphere", + "base": "ShapeType_Sphere", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "ShapeType_Sphere", + "base": "ShapeType_Sphere", "details": { "name": "SGet Shape Type: Sphere", "subtitle": "Shape Type" diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShapeWeightModifierComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShapeWeightModifierComponentTypeId.names index 063249f099..bd0f817dfd 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShapeWeightModifierComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ShapeWeightModifierComponentTypeId.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "ShapeWeightModifierComponentTypeId", + "base": "ShapeWeightModifierComponentTypeId", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetShapeWeightModifierComponentTypeId", + "base": "GetShapeWeightModifierComponentTypeId", "details": { "name": "Get Shape Weight Modifier Component Type Id" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SlopeAlignmentModifierComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SlopeAlignmentModifierComponentTypeId.names index 6888e86823..219f05a14b 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SlopeAlignmentModifierComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SlopeAlignmentModifierComponentTypeId.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "SlopeAlignmentModifierComponentTypeId", + "base": "SlopeAlignmentModifierComponentTypeId", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetSlopeAlignmentModifierComponentTypeId", + "base": "GetSlopeAlignmentModifierComponentTypeId", "details": { "name": "Get Slope Alignment Modifier Component Type Id" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SmoothStepGradientComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SmoothStepGradientComponentTypeId.names index fafba6ee97..b9cf0e8631 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SmoothStepGradientComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SmoothStepGradientComponentTypeId.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "SmoothStepGradientComponentTypeId", + "base": "SmoothStepGradientComponentTypeId", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetSmoothStepGradientComponentTypeId", + "base": "GetSmoothStepGradientComponentTypeId", "details": { "name": "Get Smooth Step Gradient Component Type Id" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SpawnerComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SpawnerComponentTypeId.names index 246a3f7355..6cab8d6b00 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SpawnerComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SpawnerComponentTypeId.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "SpawnerComponentTypeId", + "base": "SpawnerComponentTypeId", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetSpawnerComponentTypeId", + "base": "GetSpawnerComponentTypeId", "details": { "name": "Get Spawner Component Type Id" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SphereShapeComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SphereShapeComponentTypeId.names index 1b551366f7..52f9ed8c57 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SphereShapeComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SphereShapeComponentTypeId.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "SphereShapeComponentTypeId", + "base": "SphereShapeComponentTypeId", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetSphereShapeComponentTypeId", + "base": "GetSphereShapeComponentTypeId", "details": { "name": "Get Sphere Shape Component Type Id" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SsaoComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SsaoComponentTypeId.names index 3c4cb0c86a..bce10c89ca 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SsaoComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SsaoComponentTypeId.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "SsaoComponentTypeId", + "base": "SsaoComponentTypeId", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetSsaoComponentTypeId", + "base": "GetSsaoComponentTypeId", "details": { "name": "Get Ssao Component Type Id" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/StencilOp_Decrement.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/StencilOp_Decrement.names index 0a0c624384..83cd8924db 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/StencilOp_Decrement.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/StencilOp_Decrement.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "StencilOp_Decrement", + "base": "StencilOp_Decrement", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetStencilOp_Decrement", + "base": "GetStencilOp_Decrement", "details": { "name": "Decrement" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/StencilOp_DecrementSaturate.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/StencilOp_DecrementSaturate.names index 2731512d65..8bbc398180 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/StencilOp_DecrementSaturate.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/StencilOp_DecrementSaturate.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "StencilOp_DecrementSaturate", + "base": "StencilOp_DecrementSaturate", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetStencilOp_DecrementSaturate", + "base": "GetStencilOp_DecrementSaturate", "details": { "name": "Decrement Saturate" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/StencilOp_Increment.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/StencilOp_Increment.names index 5db4556355..7b034e8a45 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/StencilOp_Increment.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/StencilOp_Increment.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "StencilOp_Increment", + "base": "StencilOp_Increment", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetStencilOp_Increment", + "base": "GetStencilOp_Increment", "details": { "name": "Increment" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/StencilOp_IncrementSaturate.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/StencilOp_IncrementSaturate.names index 58fab39678..110e816592 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/StencilOp_IncrementSaturate.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/StencilOp_IncrementSaturate.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "StencilOp_IncrementSaturate", + "base": "StencilOp_IncrementSaturate", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetStencilOp_IncrementSaturate", + "base": "GetStencilOp_IncrementSaturate", "details": { "name": "Increment Saturate" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/StencilOp_Invalid.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/StencilOp_Invalid.names index 88db34395d..e92a5b3526 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/StencilOp_Invalid.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/StencilOp_Invalid.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "StencilOp_Invalid", + "base": "StencilOp_Invalid", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetStencilOp_Invalid", + "base": "GetStencilOp_Invalid", "details": { "name": "Invalid" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/StencilOp_Invert.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/StencilOp_Invert.names index fca3c17879..adfaf23d6a 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/StencilOp_Invert.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/StencilOp_Invert.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "StencilOp_Invert", + "base": "StencilOp_Invert", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetStencilOp_Invert", + "base": "GetStencilOp_Invert", "details": { "name": "Invert" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/StencilOp_Keep.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/StencilOp_Keep.names index f8b7a01331..be2d814bad 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/StencilOp_Keep.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/StencilOp_Keep.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "StencilOp_Keep", + "base": "StencilOp_Keep", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetStencilOp_Keep", + "base": "GetStencilOp_Keep", "details": { "name": "Keep" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/StencilOp_Replace.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/StencilOp_Replace.names index cca0e966da..307677368f 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/StencilOp_Replace.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/StencilOp_Replace.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "StencilOp_Replace", + "base": "StencilOp_Replace", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetStencilOp_Replace", + "base": "GetStencilOp_Replace", "details": { "name": "Replace" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/StencilOp_Zero.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/StencilOp_Zero.names index 097a299965..a4a62b177a 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/StencilOp_Zero.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/StencilOp_Zero.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "StencilOp_Zero", + "base": "StencilOp_Zero", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetStencilOp_Zero", + "base": "GetStencilOp_Zero", "details": { "name": "Zero" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SurfaceAltitudeFilterComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SurfaceAltitudeFilterComponentTypeId.names index 076e6cb4ac..cb55df8149 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SurfaceAltitudeFilterComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SurfaceAltitudeFilterComponentTypeId.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "SurfaceAltitudeFilterComponentTypeId", + "base": "SurfaceAltitudeFilterComponentTypeId", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetSurfaceAltitudeFilterComponentTypeId", + "base": "GetSurfaceAltitudeFilterComponentTypeId", "details": { "name": "Get Surface Altitude Filter Component Type Id" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SurfaceAltitudeGradientComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SurfaceAltitudeGradientComponentTypeId.names index 0ee59615d4..012f58f387 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SurfaceAltitudeGradientComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SurfaceAltitudeGradientComponentTypeId.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "SurfaceAltitudeGradientComponentTypeId", + "base": "SurfaceAltitudeGradientComponentTypeId", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetSurfaceAltitudeGradientComponentTypeId", + "base": "GetSurfaceAltitudeGradientComponentTypeId", "details": { "name": "Get Surface Altitude Gradient Component Type Id" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SurfaceMaskDepthFilterComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SurfaceMaskDepthFilterComponentTypeId.names index d1a59d8734..54af468172 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SurfaceMaskDepthFilterComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SurfaceMaskDepthFilterComponentTypeId.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "SurfaceMaskDepthFilterComponentTypeId", + "base": "SurfaceMaskDepthFilterComponentTypeId", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetSurfaceMaskDepthFilterComponentTypeId", + "base": "GetSurfaceMaskDepthFilterComponentTypeId", "details": { "name": "Get Surface Mask Depth Filter Component Type Id" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SurfaceMaskFilterComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SurfaceMaskFilterComponentTypeId.names index 30f887a203..6c8b21cde1 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SurfaceMaskFilterComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SurfaceMaskFilterComponentTypeId.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "SurfaceMaskFilterComponentTypeId", + "base": "SurfaceMaskFilterComponentTypeId", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetSurfaceMaskFilterComponentTypeId", + "base": "GetSurfaceMaskFilterComponentTypeId", "details": { "name": "Get Surface Mask Filter Component Type Id" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SurfaceMaskGradientComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SurfaceMaskGradientComponentTypeId.names index 7b015e0e05..d8784fe67e 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SurfaceMaskGradientComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SurfaceMaskGradientComponentTypeId.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "SurfaceMaskGradientComponentTypeId", + "base": "SurfaceMaskGradientComponentTypeId", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetSurfaceMaskGradientComponentTypeId", + "base": "GetSurfaceMaskGradientComponentTypeId", "details": { "name": "Get Surface Mask Gradient Component Type Id" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SurfaceSlopeFilterComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SurfaceSlopeFilterComponentTypeId.names index 25861d5f82..d55caa7830 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SurfaceSlopeFilterComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SurfaceSlopeFilterComponentTypeId.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "SurfaceSlopeFilterComponentTypeId", + "base": "SurfaceSlopeFilterComponentTypeId", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetSurfaceSlopeFilterComponentTypeId", + "base": "GetSurfaceSlopeFilterComponentTypeId", "details": { "name": "Get Surface Slope Filter Component Type Id" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SurfaceSlopeGradientComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SurfaceSlopeGradientComponentTypeId.names index 9d245b8937..cf856cfbbf 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SurfaceSlopeGradientComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SurfaceSlopeGradientComponentTypeId.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "SurfaceSlopeGradientComponentTypeId", + "base": "SurfaceSlopeGradientComponentTypeId", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetSurfaceSlopeGradientComponentTypeId", + "base": "GetSurfaceSlopeGradientComponentTypeId", "details": { "name": "Get Surface Slope Gradient Component Type Id" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigPlatform_Android.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigPlatform_Android.names index 92b95f2eaf..48ff4a80d5 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigPlatform_Android.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigPlatform_Android.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "SystemConfigPlatform_Android", + "base": "SystemConfigPlatform_Android", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetSystemConfigPlatform_Android", + "base": "GetSystemConfigPlatform_Android", "details": { "name": "Android" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigPlatform_InvalidPlatform.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigPlatform_InvalidPlatform.names index eef4a9709b..72b62a5d03 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigPlatform_InvalidPlatform.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigPlatform_InvalidPlatform.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "SystemConfigPlatform_InvalidPlatform", + "base": "SystemConfigPlatform_InvalidPlatform", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetSystemConfigPlatform_InvalidPlatform", + "base": "GetSystemConfigPlatform_InvalidPlatform", "details": { "name": "Invalid Platform" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigPlatform_Ios.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigPlatform_Ios.names index 176c31ae50..f8c15e5505 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigPlatform_Ios.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigPlatform_Ios.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "SystemConfigPlatform_Ios", + "base": "SystemConfigPlatform_Ios", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetSystemConfigPlatform_Ios", + "base": "GetSystemConfigPlatform_Ios", "details": { "name": "Ios" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigPlatform_Mac.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigPlatform_Mac.names index 86e2686493..d30dd7446b 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigPlatform_Mac.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigPlatform_Mac.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "SystemConfigPlatform_Mac", + "base": "SystemConfigPlatform_Mac", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetSystemConfigPlatform_Mac", + "base": "GetSystemConfigPlatform_Mac", "details": { "name": "Mac" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigPlatform_OsxMetal.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigPlatform_OsxMetal.names index b65d572c09..8d2bd15940 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigPlatform_OsxMetal.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigPlatform_OsxMetal.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "SystemConfigPlatform_OsxMetal", + "base": "SystemConfigPlatform_OsxMetal", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetSystemConfigPlatform_OsxMetal", + "base": "GetSystemConfigPlatform_OsxMetal", "details": { "name": "Osx Metal" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigPlatform_Pc.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigPlatform_Pc.names index 7653461096..1c0e05387d 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigPlatform_Pc.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigPlatform_Pc.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "SystemConfigPlatform_Pc", + "base": "SystemConfigPlatform_Pc", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetSystemConfigPlatform_Pc", + "base": "GetSystemConfigPlatform_Pc", "details": { "name": "Pc" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigPlatform_Provo.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigPlatform_Provo.names index 62f4f8eda5..84757fb237 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigPlatform_Provo.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigPlatform_Provo.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "SystemConfigPlatform_Provo", + "base": "SystemConfigPlatform_Provo", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetSystemConfigPlatform_Provo", + "base": "GetSystemConfigPlatform_Provo", "details": { "name": "Provo" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigSpec_Auto.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigSpec_Auto.names index 0646ab299a..6362ad592f 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigSpec_Auto.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigSpec_Auto.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "SystemConfigSpec_Auto", + "base": "SystemConfigSpec_Auto", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetSystemConfigSpec_Auto", + "base": "GetSystemConfigSpec_Auto", "details": { "name": "Auto" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigSpec_High.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigSpec_High.names index dfaa1277cf..24ca308d2a 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigSpec_High.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigSpec_High.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "SystemConfigSpec_High", + "base": "SystemConfigSpec_High", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetSystemConfigSpec_High", + "base": "GetSystemConfigSpec_High", "details": { "name": "High" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigSpec_Low.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigSpec_Low.names index af875a7704..17250ade92 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigSpec_Low.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigSpec_Low.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "SystemConfigSpec_Low", + "base": "SystemConfigSpec_Low", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetSystemConfigSpec_Low", + "base": "GetSystemConfigSpec_Low", "details": { "name": "Low" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigSpec_Medium.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigSpec_Medium.names index c4b7c9aefd..dcdae1a975 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigSpec_Medium.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigSpec_Medium.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "SystemConfigSpec_Medium", + "base": "SystemConfigSpec_Medium", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetSystemConfigSpec_Medium", + "base": "GetSystemConfigSpec_Medium", "details": { "name": "Medium" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigSpec_VeryHigh.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigSpec_VeryHigh.names index 169f3fb7ea..44c36f472c 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigSpec_VeryHigh.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemConfigSpec_VeryHigh.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "SystemConfigSpec_VeryHigh", + "base": "SystemConfigSpec_VeryHigh", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetSystemConfigSpec_VeryHigh", + "base": "GetSystemConfigSpec_VeryHigh", "details": { "name": "Very High" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemEntityId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemEntityId.names index 79a659cdf7..fecc69eb1c 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemEntityId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/SystemEntityId.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "SystemEntityId", + "base": "SystemEntityId", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetSystemEntityId", + "base": "GetSystemEntityId", "details": { "name": "Get System Entity Id" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TETRAHEDRON.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TETRAHEDRON.names index 4a6e78add2..8506904701 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TETRAHEDRON.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TETRAHEDRON.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "TETRAHEDRON", + "base": "TETRAHEDRON", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetTETRAHEDRON", + "base": "GetTETRAHEDRON", "details": { "name": "Tetrahedron" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ThresholdGradientComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ThresholdGradientComponentTypeId.names index 616332678e..be9c791c63 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ThresholdGradientComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/ThresholdGradientComponentTypeId.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "ThresholdGradientComponentTypeId", + "base": "ThresholdGradientComponentTypeId", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetThresholdGradientComponentTypeId", + "base": "GetThresholdGradientComponentTypeId", "details": { "name": "Get Threshold Gradient Component Type Id" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TransformComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TransformComponentTypeId.names index 29d57c5b38..b1039ce129 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TransformComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TransformComponentTypeId.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "TransformComponentTypeId", + "base": "TransformComponentTypeId", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetTransformComponentTypeId", + "base": "GetTransformComponentTypeId", "details": { "name": "Get Transform Component Type Id" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TransformMode_Rotation.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TransformMode_Rotation.names index 3b70a204a8..3a9f17cf87 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TransformMode_Rotation.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TransformMode_Rotation.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "TransformMode_Rotation", + "base": "TransformMode_Rotation", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetTransformMode_Rotation", + "base": "GetTransformMode_Rotation", "details": { "name": "Rotation" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TransformMode_Scale.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TransformMode_Scale.names index 5e425db9b1..45c665434a 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TransformMode_Scale.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TransformMode_Scale.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "TransformMode_Scale", + "base": "TransformMode_Scale", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetTransformMode_Scale", + "base": "GetTransformMode_Scale", "details": { "name": "Scale" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TransformMode_Translation.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TransformMode_Translation.names index 23eca9bd48..fbcf88a7da 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TransformMode_Translation.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TransformMode_Translation.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "TransformMode_Translation", + "base": "TransformMode_Translation", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetTransformMode_Translation", + "base": "GetTransformMode_Translation", "details": { "name": "Translation" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TransformPivot_Center.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TransformPivot_Center.names index a4d5f859b0..0c88ae1d0b 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TransformPivot_Center.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TransformPivot_Center.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "TransformPivot_Center", + "base": "TransformPivot_Center", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetTransformPivot_Center", + "base": "GetTransformPivot_Center", "details": { "name": "Center" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TransformPivot_Object.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TransformPivot_Object.names index 3c4f11fb3a..340bc2dd33 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TransformPivot_Object.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TransformPivot_Object.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "TransformPivot_Object", + "base": "TransformPivot_Object", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetTransformPivot_Object", + "base": "GetTransformPivot_Object", "details": { "name": "Object" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TransformRefreshType_All.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TransformRefreshType_All.names index 844376c960..0d024e0bbc 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TransformRefreshType_All.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TransformRefreshType_All.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "TransformRefreshType_All", + "base": "TransformRefreshType_All", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetTransformRefreshType_All", + "base": "GetTransformRefreshType_All", "details": { "name": "All" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TransformRefreshType_Orientation.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TransformRefreshType_Orientation.names index 37ee133fb6..e80e1fc12d 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TransformRefreshType_Orientation.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TransformRefreshType_Orientation.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "TransformRefreshType_Orientation", + "base": "TransformRefreshType_Orientation", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetTransformRefreshType_Orientation", + "base": "GetTransformRefreshType_Orientation", "details": { "name": "Orientation" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TransformRefreshType_Translation.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TransformRefreshType_Translation.names index 11c492d799..a4ce9607e3 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TransformRefreshType_Translation.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TransformRefreshType_Translation.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "TransformRefreshType_Translation", + "base": "TransformRefreshType_Translation", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetTransformRefreshType_Translation", + "base": "GetTransformRefreshType_Translation", "details": { "name": "Translation" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TubeShapeComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TubeShapeComponentTypeId.names index 0f674980a7..d0c4f47888 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TubeShapeComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/TubeShapeComponentTypeId.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "TubeShapeComponentTypeId", + "base": "TubeShapeComponentTypeId", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetTubeShapeComponentTypeId", + "base": "GetTubeShapeComponentTypeId", "details": { "name": "Get Tube Shape Component Type Id" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/UiLayoutCellUnspecifiedSize.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/UiLayoutCellUnspecifiedSize.names index 21292a03d5..63d58ba29a 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/UiLayoutCellUnspecifiedSize.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/UiLayoutCellUnspecifiedSize.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "UiLayoutCellUnspecifiedSize", + "base": "UiLayoutCellUnspecifiedSize", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetUiLayoutCellUnspecifiedSize", + "base": "GetUiLayoutCellUnspecifiedSize", "details": { "name": "Layout Cell Unspecified Size" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/VegetationSpawnerComponentTypeId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/VegetationSpawnerComponentTypeId.names index cc405ebb88..5b9e9394bd 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/VegetationSpawnerComponentTypeId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/VegetationSpawnerComponentTypeId.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "VegetationSpawnerComponentTypeId", + "base": "VegetationSpawnerComponentTypeId", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GetVegetationSpawnerComponentTypeId", + "base": "GetVegetationSpawnerComponentTypeId", "details": { "name": "Get Vegetation Spawner Component Type Id" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eSSB_GotoEndTime.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eSSB_GotoEndTime.names index 0f52fd70a6..4a5990bb0d 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eSSB_GotoEndTime.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eSSB_GotoEndTime.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "eSSB_GotoEndTime", + "base": "eSSB_GotoEndTime", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GeteSSB_GotoEndTime", + "base": "GeteSSB_GotoEndTime", "details": { "name": "Goto End Time" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eSSB_GotoStartTime.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eSSB_GotoStartTime.names index f5ff272c4a..d962801a59 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eSSB_GotoStartTime.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eSSB_GotoStartTime.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "eSSB_GotoStartTime", + "base": "eSSB_GotoStartTime", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GeteSSB_GotoStartTime", + "base": "GeteSSB_GotoStartTime", "details": { "name": "Goto Start Time" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eSSB_LeaveTime.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eSSB_LeaveTime.names index a018009749..e78c9df425 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eSSB_LeaveTime.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eSSB_LeaveTime.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "eSSB_LeaveTime", + "base": "eSSB_LeaveTime", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GeteSSB_LeaveTime", + "base": "GeteSSB_LeaveTime", "details": { "name": "Leave Time" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiAnimationEvent_Aborted.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiAnimationEvent_Aborted.names index 9db98c8f4f..81d6b94038 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiAnimationEvent_Aborted.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiAnimationEvent_Aborted.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "eUiAnimationEvent_Aborted", + "base": "eUiAnimationEvent_Aborted", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GeteUiAnimationEvent_Aborted", + "base": "GeteUiAnimationEvent_Aborted", "details": { "name": "Aborted" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiAnimationEvent_Started.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiAnimationEvent_Started.names index eed0cb1509..85684e5627 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiAnimationEvent_Started.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiAnimationEvent_Started.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "eUiAnimationEvent_Started", + "base": "eUiAnimationEvent_Started", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GeteUiAnimationEvent_Started", + "base": "GeteUiAnimationEvent_Started", "details": { "name": "Get Started" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiAnimationEvent_Stopped.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiAnimationEvent_Stopped.names index 16adfb71b6..9a8c843449 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiAnimationEvent_Stopped.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiAnimationEvent_Stopped.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "eUiAnimationEvent_Stopped", + "base": "eUiAnimationEvent_Stopped", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GeteUiAnimationEvent_Stopped", + "base": "GeteUiAnimationEvent_Stopped", "details": { "name": "Stopped" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiAnimationEvent_Updated.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiAnimationEvent_Updated.names index a4005325dd..8cce3444ad 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiAnimationEvent_Updated.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiAnimationEvent_Updated.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "eUiAnimationEvent_Updated", + "base": "eUiAnimationEvent_Updated", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GeteUiAnimationEvent_Updated", + "base": "GeteUiAnimationEvent_Updated", "details": { "name": "Updated" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiDragState_Invalid.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiDragState_Invalid.names index b7391f4ac1..bfb9de3855 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiDragState_Invalid.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiDragState_Invalid.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "eUiDragState_Invalid", + "base": "eUiDragState_Invalid", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GeteUiDragState_Invalid", + "base": "GeteUiDragState_Invalid", "details": { "name": "Invalid" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiDragState_Normal.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiDragState_Normal.names index 08cf051848..b1d31d25de 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiDragState_Normal.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiDragState_Normal.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "eUiDragState_Normal", + "base": "eUiDragState_Normal", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GeteUiDragState_Normal", + "base": "GeteUiDragState_Normal", "details": { "name": "Normal" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiDragState_Valid.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiDragState_Valid.names index c8daad2e03..f58ad69a9a 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiDragState_Valid.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiDragState_Valid.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "eUiDragState_Valid", + "base": "eUiDragState_Valid", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GeteUiDragState_Valid", + "base": "GeteUiDragState_Valid", "details": { "name": "Valid" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiDropState_Invalid.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiDropState_Invalid.names index 1c36980fda..26f2d83294 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiDropState_Invalid.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiDropState_Invalid.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "eUiDropState_Invalid", + "base": "eUiDropState_Invalid", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GeteUiDropState_Invalid", + "base": "GeteUiDropState_Invalid", "details": { "name": "Invalid" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiDropState_Normal.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiDropState_Normal.names index 11b6cc6366..076dd2d7fe 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiDropState_Normal.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiDropState_Normal.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "eUiDropState_Normal", + "base": "eUiDropState_Normal", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GeteUiDropState_Normal", + "base": "GeteUiDropState_Normal", "details": { "name": "Normal" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiDropState_Valid.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiDropState_Valid.names index 8438d8f5ad..3a8db2c23c 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiDropState_Valid.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiDropState_Valid.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "eUiDropState_Valid", + "base": "eUiDropState_Valid", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GeteUiDropState_Valid", + "base": "GeteUiDropState_Valid", "details": { "name": "Valid" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiDynamicContentDBColorType_Free.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiDynamicContentDBColorType_Free.names index 77cf8713fd..e420f6ad42 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiDynamicContentDBColorType_Free.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiDynamicContentDBColorType_Free.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "eUiDynamicContentDBColorType_Free", + "base": "eUiDynamicContentDBColorType_Free", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GeteUiDynamicContentDBColorType_Free", + "base": "GeteUiDynamicContentDBColorType_Free", "details": { "name": "Color Type Free" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiDynamicContentDBColorType_Paid.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiDynamicContentDBColorType_Paid.names index 209601c715..98f6c71f48 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiDynamicContentDBColorType_Paid.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiDynamicContentDBColorType_Paid.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "eUiDynamicContentDBColorType_Paid", + "base": "eUiDynamicContentDBColorType_Paid", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GeteUiDynamicContentDBColorType_Paid", + "base": "GeteUiDynamicContentDBColorType_Paid", "details": { "name": "Color Type Paid" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiEmitShape_Circle.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiEmitShape_Circle.names index 69925bb220..4b9f83c1f8 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiEmitShape_Circle.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiEmitShape_Circle.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "eUiEmitShape_Circle", + "base": "eUiEmitShape_Circle", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GeteUiEmitShape_Circle", + "base": "GeteUiEmitShape_Circle", "details": { "name": "Circle" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiEmitShape_Point.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiEmitShape_Point.names index 2ccc0456a7..965d9445dd 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiEmitShape_Point.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiEmitShape_Point.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "eUiEmitShape_Point", + "base": "eUiEmitShape_Point", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GeteUiEmitShape_Point", + "base": "GeteUiEmitShape_Point", "details": { "name": "Point" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiEmitShape_Quad.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiEmitShape_Quad.names index 017f799b17..76c7c7d9f1 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiEmitShape_Quad.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiEmitShape_Quad.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "eUiEmitShape_Quad", + "base": "eUiEmitShape_Quad", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GeteUiEmitShape_Quad", + "base": "GeteUiEmitShape_Quad", "details": { "name": "Quad" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFillCornerOrigin_BottomLeft.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFillCornerOrigin_BottomLeft.names index 41ed31a1a0..8911478f3c 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFillCornerOrigin_BottomLeft.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFillCornerOrigin_BottomLeft.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "eUiFillCornerOrigin_BottomLeft", + "base": "eUiFillCornerOrigin_BottomLeft", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GeteUiFillCornerOrigin_BottomLeft", + "base": "GeteUiFillCornerOrigin_BottomLeft", "details": { "name": "Bottom Left" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFillCornerOrigin_BottomRight.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFillCornerOrigin_BottomRight.names index fa80def3d8..da3225dd0b 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFillCornerOrigin_BottomRight.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFillCornerOrigin_BottomRight.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "eUiFillCornerOrigin_BottomRight", + "base": "eUiFillCornerOrigin_BottomRight", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GeteUiFillCornerOrigin_BottomRight", + "base": "GeteUiFillCornerOrigin_BottomRight", "details": { "name": "Bottom Right" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFillCornerOrigin_TopLeft.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFillCornerOrigin_TopLeft.names index 527b84e8b6..63fa743485 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFillCornerOrigin_TopLeft.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFillCornerOrigin_TopLeft.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "eUiFillCornerOrigin_TopLeft", + "base": "eUiFillCornerOrigin_TopLeft", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GeteUiFillCornerOrigin_TopLeft", + "base": "GeteUiFillCornerOrigin_TopLeft", "details": { "name": "Top Left" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFillCornerOrigin_TopRight.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFillCornerOrigin_TopRight.names index 918cd98730..7b1c1204d4 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFillCornerOrigin_TopRight.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFillCornerOrigin_TopRight.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "eUiFillCornerOrigin_TopRight", + "base": "eUiFillCornerOrigin_TopRight", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GeteUiFillCornerOrigin_TopRight", + "base": "GeteUiFillCornerOrigin_TopRight", "details": { "name": "Top Right" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFillEdgeOrigin_Bottom.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFillEdgeOrigin_Bottom.names index 767449a8bb..430943dba2 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFillEdgeOrigin_Bottom.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFillEdgeOrigin_Bottom.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "eUiFillEdgeOrigin_Bottom", + "base": "eUiFillEdgeOrigin_Bottom", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GeteUiFillEdgeOrigin_Bottom", + "base": "GeteUiFillEdgeOrigin_Bottom", "details": { "name": "Bottom" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFillEdgeOrigin_Left.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFillEdgeOrigin_Left.names index c03e600494..f28601e4f4 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFillEdgeOrigin_Left.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFillEdgeOrigin_Left.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "eUiFillEdgeOrigin_Left", + "base": "eUiFillEdgeOrigin_Left", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GeteUiFillEdgeOrigin_Left", + "base": "GeteUiFillEdgeOrigin_Left", "details": { "name": "Left" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFillEdgeOrigin_Right.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFillEdgeOrigin_Right.names index 5f2b9c3b94..cd75d8a15f 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFillEdgeOrigin_Right.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFillEdgeOrigin_Right.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "eUiFillEdgeOrigin_Right", + "base": "eUiFillEdgeOrigin_Right", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GeteUiFillEdgeOrigin_Right", + "base": "GeteUiFillEdgeOrigin_Right", "details": { "name": "Right" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFillEdgeOrigin_Top.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFillEdgeOrigin_Top.names index c301c1fd8f..648f9cc379 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFillEdgeOrigin_Top.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFillEdgeOrigin_Top.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "eUiFillEdgeOrigin_Top", + "base": "eUiFillEdgeOrigin_Top", "context": "Constant", "variant": "", "details": { @@ -11,7 +11,7 @@ }, "methods": [ { - "key": "GeteUiFillEdgeOrigin_Top", + "base": "GeteUiFillEdgeOrigin_Top", "details": { "name": "Top" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFillType_Linear.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFillType_Linear.names index 4e5e6a8efd..64cf4df11b 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFillType_Linear.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFillType_Linear.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "eUiFillType_Linear", + "base": "eUiFillType_Linear", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GeteUiFillType_Linear", + "base": "GeteUiFillType_Linear", "details": { "name": "Linear" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFillType_None.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFillType_None.names index e417d91494..31746bdda5 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFillType_None.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFillType_None.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "eUiFillType_None", + "base": "eUiFillType_None", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GeteUiFillType_None", + "base": "GeteUiFillType_None", "details": { "name": "None" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFillType_Radial.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFillType_Radial.names index 861dcc8fa4..3a92aafdd7 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFillType_Radial.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFillType_Radial.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "eUiFillType_Radial", + "base": "eUiFillType_Radial", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GeteUiFillType_Radial", + "base": "GeteUiFillType_Radial", "details": { "name": "Radial" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFillType_RadialCorner.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFillType_RadialCorner.names index c301567d43..25ec95691c 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFillType_RadialCorner.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFillType_RadialCorner.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "eUiFillType_RadialCorner", + "base": "eUiFillType_RadialCorner", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GeteUiFillType_RadialCorner", + "base": "GeteUiFillType_RadialCorner", "details": { "name": "Radial Corner" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFillType_RadialEdge.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFillType_RadialEdge.names index bc738c6054..99a7798bed 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFillType_RadialEdge.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFillType_RadialEdge.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "eUiFillType_RadialEdge", + "base": "eUiFillType_RadialEdge", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GeteUiFillType_RadialEdge", + "base": "GeteUiFillType_RadialEdge", "details": { "name": "Radial Edge" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFlipbookAnimationFramerateUnits_FPS.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFlipbookAnimationFramerateUnits_FPS.names index 248e0da6aa..ffab126757 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFlipbookAnimationFramerateUnits_FPS.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFlipbookAnimationFramerateUnits_FPS.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "eUiFlipbookAnimationFramerateUnits_FPS", + "base": "eUiFlipbookAnimationFramerateUnits_FPS", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GeteUiFlipbookAnimationFramerateUnits_FPS", + "base": "GeteUiFlipbookAnimationFramerateUnits_FPS", "details": { "name": "Frames Per Second" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFlipbookAnimationFramerateUnits_SecondsPerFrame.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFlipbookAnimationFramerateUnits_SecondsPerFrame.names index a1d309e3b2..273d36c382 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFlipbookAnimationFramerateUnits_SecondsPerFrame.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFlipbookAnimationFramerateUnits_SecondsPerFrame.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "eUiFlipbookAnimationFramerateUnits_SecondsPerFrame", + "base": "eUiFlipbookAnimationFramerateUnits_SecondsPerFrame", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GeteUiFlipbookAnimationFramerateUnits_SecondsPerFrame", + "base": "GeteUiFlipbookAnimationFramerateUnits_SecondsPerFrame", "details": { "name": "Seconds Per Frame" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFlipbookAnimationLoopType_Linear.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFlipbookAnimationLoopType_Linear.names index 6877841a85..72dc9a0a98 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFlipbookAnimationLoopType_Linear.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFlipbookAnimationLoopType_Linear.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "eUiFlipbookAnimationLoopType_Linear", + "base": "eUiFlipbookAnimationLoopType_Linear", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GeteUiFlipbookAnimationLoopType_Linear", + "base": "GeteUiFlipbookAnimationLoopType_Linear", "details": { "name": "Linear" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFlipbookAnimationLoopType_None.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFlipbookAnimationLoopType_None.names index 8f905a8cd5..c59df78329 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFlipbookAnimationLoopType_None.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFlipbookAnimationLoopType_None.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "eUiFlipbookAnimationLoopType_None", + "base": "eUiFlipbookAnimationLoopType_None", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GeteUiFlipbookAnimationLoopType_None", + "base": "GeteUiFlipbookAnimationLoopType_None", "details": { "name": "None" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFlipbookAnimationLoopType_PingPong.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFlipbookAnimationLoopType_PingPong.names index 454498eec7..39d2672941 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFlipbookAnimationLoopType_PingPong.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiFlipbookAnimationLoopType_PingPong.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "eUiFlipbookAnimationLoopType_PingPong", + "base": "eUiFlipbookAnimationLoopType_PingPong", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GeteUiFlipbookAnimationLoopType_PingPong", + "base": "GeteUiFlipbookAnimationLoopType_PingPong", "details": { "name": "Ping Pong" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiHAlign_Center.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiHAlign_Center.names index b32ed9461e..0e724f97a5 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiHAlign_Center.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiHAlign_Center.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "eUiHAlign_Center", + "base": "eUiHAlign_Center", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GeteUiHAlign_Center", + "base": "GeteUiHAlign_Center", "details": { "name": "Horizontal Align: Center" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiHAlign_Left.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiHAlign_Left.names index 19cb732c31..f5291df8a4 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiHAlign_Left.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiHAlign_Left.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "eUiHAlign_Left", + "base": "eUiHAlign_Left", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GeteUiHAlign_Left", + "base": "GeteUiHAlign_Left", "details": { "name": "Horizontal Align: Left" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiHAlign_Right.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiHAlign_Right.names index 4573fef1ea..f198f249f6 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiHAlign_Right.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiHAlign_Right.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "eUiHAlign_Right", + "base": "eUiHAlign_Right", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GeteUiHAlign_Right", + "base": "GeteUiHAlign_Right", "details": { "name": "Horizontal Align: Right" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiHorizontalOrder_LeftToRight.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiHorizontalOrder_LeftToRight.names index d800e93dd2..ffd3607db8 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiHorizontalOrder_LeftToRight.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiHorizontalOrder_LeftToRight.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "eUiHorizontalOrder_LeftToRight", + "base": "eUiHorizontalOrder_LeftToRight", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GeteUiHorizontalOrder_LeftToRight", + "base": "GeteUiHorizontalOrder_LeftToRight", "details": { "name": "Left To Right" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiHorizontalOrder_RightToLeft.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiHorizontalOrder_RightToLeft.names index 37e58d0133..816220904a 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiHorizontalOrder_RightToLeft.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiHorizontalOrder_RightToLeft.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "eUiHorizontalOrder_RightToLeft", + "base": "eUiHorizontalOrder_RightToLeft", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GeteUiHorizontalOrder_RightToLeft", + "base": "GeteUiHorizontalOrder_RightToLeft", "details": { "name": "Right To Left" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiImageSequenceImageType_Fixed.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiImageSequenceImageType_Fixed.names index ed0463cc65..303fb21025 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiImageSequenceImageType_Fixed.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiImageSequenceImageType_Fixed.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "eUiImageSequenceImageType_Fixed", + "base": "eUiImageSequenceImageType_Fixed", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GeteUiImageSequenceImageType_Fixed", + "base": "GeteUiImageSequenceImageType_Fixed", "details": { "name": "Image Type: Fixed" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiImageSequenceImageType_Stretched.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiImageSequenceImageType_Stretched.names index 337d22613d..2aaca0318f 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiImageSequenceImageType_Stretched.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiImageSequenceImageType_Stretched.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "eUiImageSequenceImageType_Stretched", + "base": "eUiImageSequenceImageType_Stretched", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GeteUiImageSequenceImageType_Stretched", + "base": "GeteUiImageSequenceImageType_Stretched", "details": { "name": "Image Type: Stretched" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiImageSequenceImageType_StretchedToFill.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiImageSequenceImageType_StretchedToFill.names index d696007a94..4213ec205a 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiImageSequenceImageType_StretchedToFill.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiImageSequenceImageType_StretchedToFill.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "eUiImageSequenceImageType_StretchedToFill", + "base": "eUiImageSequenceImageType_StretchedToFill", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GeteUiImageSequenceImageType_StretchedToFill", + "base": "GeteUiImageSequenceImageType_StretchedToFill", "details": { "name": "Image Type: Stretched To Fill" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiImageSequenceImageType_StretchedToFit.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiImageSequenceImageType_StretchedToFit.names index b6964caf7a..acc64fa708 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiImageSequenceImageType_StretchedToFit.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiImageSequenceImageType_StretchedToFit.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "eUiImageSequenceImageType_StretchedToFit", + "base": "eUiImageSequenceImageType_StretchedToFit", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GeteUiImageSequenceImageType_StretchedToFit", + "base": "GeteUiImageSequenceImageType_StretchedToFit", "details": { "name": "Image Type: Stretched To Fit" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiImageType_Fixed.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiImageType_Fixed.names index 4679be61eb..73d2ff7381 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiImageType_Fixed.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiImageType_Fixed.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "eUiImageType_Fixed", + "base": "eUiImageType_Fixed", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GeteUiImageType_Fixed", + "base": "GeteUiImageType_Fixed", "details": { "name": "Fixed" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiImageType_Sliced.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiImageType_Sliced.names index b0cb0e83f2..6f3158e08e 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiImageType_Sliced.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiImageType_Sliced.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "eUiImageType_Sliced", + "base": "eUiImageType_Sliced", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GeteUiImageType_Sliced", + "base": "GeteUiImageType_Sliced", "details": { "name": "Sliced" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiImageType_Stretched.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiImageType_Stretched.names index 3b2cc5cc71..65a02f354d 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiImageType_Stretched.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiImageType_Stretched.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "eUiImageType_Stretched", + "base": "eUiImageType_Stretched", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GeteUiImageType_Stretched", + "base": "GeteUiImageType_Stretched", "details": { "name": "Stretched" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiImageType_StretchedToFill.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiImageType_StretchedToFill.names index d3caf1df5f..b61130487a 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiImageType_StretchedToFill.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiImageType_StretchedToFill.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "eUiImageType_StretchedToFill", + "base": "eUiImageType_StretchedToFill", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GeteUiImageType_StretchedToFill", + "base": "GeteUiImageType_StretchedToFill", "details": { "name": "Stretched To Fill" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiImageType_StretchedToFit.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiImageType_StretchedToFit.names index f0921a21f0..1223714053 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiImageType_StretchedToFit.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiImageType_StretchedToFit.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "eUiImageType_StretchedToFit", + "base": "eUiImageType_StretchedToFit", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GeteUiImageType_StretchedToFit", + "base": "GeteUiImageType_StretchedToFit", "details": { "name": "Stretched To Fit" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiImageType_Tiled.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiImageType_Tiled.names index 0bb880e96c..ea65a0911e 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiImageType_Tiled.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiImageType_Tiled.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "eUiImageType_Tiled", + "base": "eUiImageType_Tiled", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GeteUiImageType_Tiled", + "base": "GeteUiImageType_Tiled", "details": { "name": "Tiled" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiInteractableState_Disabled.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiInteractableState_Disabled.names index e5c4b554d4..014fa172d7 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiInteractableState_Disabled.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiInteractableState_Disabled.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "eUiInteractableState_Disabled", + "base": "eUiInteractableState_Disabled", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GeteUiInteractableState_Disabled", + "base": "GeteUiInteractableState_Disabled", "details": { "name": "Disabled" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiInteractableState_Hover.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiInteractableState_Hover.names index db241dba54..978dd826d6 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiInteractableState_Hover.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiInteractableState_Hover.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "eUiInteractableState_Hover", + "base": "eUiInteractableState_Hover", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GeteUiInteractableState_Hover", + "base": "GeteUiInteractableState_Hover", "details": { "name": "Hover" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiInteractableState_Normal.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiInteractableState_Normal.names index 5e77a58173..9ab36fba53 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiInteractableState_Normal.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiInteractableState_Normal.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "eUiInteractableState_Normal", + "base": "eUiInteractableState_Normal", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GeteUiInteractableState_Normal", + "base": "GeteUiInteractableState_Normal", "details": { "name": "Normal" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiInteractableState_Pressed.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiInteractableState_Pressed.names index 075983878d..295c75a89b 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiInteractableState_Pressed.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiInteractableState_Pressed.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "eUiInteractableState_Pressed", + "base": "eUiInteractableState_Pressed", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GeteUiInteractableState_Pressed", + "base": "GeteUiInteractableState_Pressed", "details": { "name": "Pressed" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiLayoutGridStartingDirection_HorizontalOrder.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiLayoutGridStartingDirection_HorizontalOrder.names index d90f8355f9..c4a6d39865 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiLayoutGridStartingDirection_HorizontalOrder.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiLayoutGridStartingDirection_HorizontalOrder.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "eUiLayoutGridStartingDirection_HorizontalOrder", + "base": "eUiLayoutGridStartingDirection_HorizontalOrder", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GeteUiLayoutGridStartingDirection_HorizontalOrder", + "base": "GeteUiLayoutGridStartingDirection_HorizontalOrder", "details": { "name": "Horizontal Order" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiLayoutGridStartingDirection_VerticalOrder.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiLayoutGridStartingDirection_VerticalOrder.names index 5146e150ad..33d50cf441 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiLayoutGridStartingDirection_VerticalOrder.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiLayoutGridStartingDirection_VerticalOrder.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "eUiLayoutGridStartingDirection_VerticalOrder", + "base": "eUiLayoutGridStartingDirection_VerticalOrder", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GeteUiLayoutGridStartingDirection_VerticalOrder", + "base": "GeteUiLayoutGridStartingDirection_VerticalOrder", "details": { "name": "Vertical Order" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiNavigationMode_Automatic.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiNavigationMode_Automatic.names index 8b5ee13097..e3c9a9ecd7 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiNavigationMode_Automatic.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiNavigationMode_Automatic.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "eUiNavigationMode_Automatic", + "base": "eUiNavigationMode_Automatic", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GeteUiNavigationMode_Automatic", + "base": "GeteUiNavigationMode_Automatic", "details": { "name": "Automatic" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiNavigationMode_Custom.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiNavigationMode_Custom.names index 3fa1e4ae0d..6a1beeb293 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiNavigationMode_Custom.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiNavigationMode_Custom.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "eUiNavigationMode_Custom", + "base": "eUiNavigationMode_Custom", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GeteUiNavigationMode_Custom", + "base": "GeteUiNavigationMode_Custom", "details": { "name": "Custom" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiNavigationMode_None.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiNavigationMode_None.names index a8486f60c4..19e02a0412 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiNavigationMode_None.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiNavigationMode_None.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "eUiNavigationMode_None", + "base": "eUiNavigationMode_None", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GeteUiNavigationMode_None", + "base": "GeteUiNavigationMode_None", "details": { "name": "None" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiParticleCoordinateType_Cartesian.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiParticleCoordinateType_Cartesian.names index de73959a50..00e0aaece8 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiParticleCoordinateType_Cartesian.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiParticleCoordinateType_Cartesian.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "eUiParticleCoordinateType_Cartesian", + "base": "eUiParticleCoordinateType_Cartesian", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GeteUiParticleCoordinateType_Cartesian", + "base": "GeteUiParticleCoordinateType_Cartesian", "details": { "name": "Cartesian" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiParticleCoordinateType_Polar.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiParticleCoordinateType_Polar.names index e7cbd628b4..c0014a0a48 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiParticleCoordinateType_Polar.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiParticleCoordinateType_Polar.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "eUiParticleCoordinateType_Polar", + "base": "eUiParticleCoordinateType_Polar", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GeteUiParticleCoordinateType_Polar", + "base": "GeteUiParticleCoordinateType_Polar", "details": { "name": "Polar" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiParticleInitialDirectionType_RelativeToEmitAngle.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiParticleInitialDirectionType_RelativeToEmitAngle.names index c285810dab..000c00bcb2 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiParticleInitialDirectionType_RelativeToEmitAngle.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiParticleInitialDirectionType_RelativeToEmitAngle.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "eUiParticleInitialDirectionType_RelativeToEmitAngle", + "base": "eUiParticleInitialDirectionType_RelativeToEmitAngle", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GeteUiParticleInitialDirectionType_RelativeToEmitAngle", + "base": "GeteUiParticleInitialDirectionType_RelativeToEmitAngle", "details": { "name": "Relative To Emit Angle" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiParticleInitialDirectionType_RelativeToEmitterCenter.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiParticleInitialDirectionType_RelativeToEmitterCenter.names index c63cd92dc1..2a3d5ce1a2 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiParticleInitialDirectionType_RelativeToEmitterCenter.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiParticleInitialDirectionType_RelativeToEmitterCenter.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "eUiParticleInitialDirectionType_RelativeToEmitterCenter", + "base": "eUiParticleInitialDirectionType_RelativeToEmitterCenter", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GeteUiParticleInitialDirectionType_RelativeToEmitterCenter", + "base": "GeteUiParticleInitialDirectionType_RelativeToEmitterCenter", "details": { "name": "Relative To Emitter Center" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScaleToDeviceMode_NonUniformScale.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScaleToDeviceMode_NonUniformScale.names index 321d718ef9..839a22e304 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScaleToDeviceMode_NonUniformScale.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScaleToDeviceMode_NonUniformScale.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "eUiScaleToDeviceMode_NonUniformScale", + "base": "eUiScaleToDeviceMode_NonUniformScale", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GeteUiScaleToDeviceMode_NonUniformScale", + "base": "GeteUiScaleToDeviceMode_NonUniformScale", "details": { "name": "Non Uniform Scale" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScaleToDeviceMode_None.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScaleToDeviceMode_None.names index e682613ba4..1739b984d2 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScaleToDeviceMode_None.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScaleToDeviceMode_None.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "eUiScaleToDeviceMode_None", + "base": "eUiScaleToDeviceMode_None", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GeteUiScaleToDeviceMode_None", + "base": "GeteUiScaleToDeviceMode_None", "details": { "name": "None" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScaleToDeviceMode_ScaleXOnly.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScaleToDeviceMode_ScaleXOnly.names index 452396fec6..883068240f 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScaleToDeviceMode_ScaleXOnly.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScaleToDeviceMode_ScaleXOnly.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "eUiScaleToDeviceMode_ScaleXOnly", + "base": "eUiScaleToDeviceMode_ScaleXOnly", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GeteUiScaleToDeviceMode_ScaleXOnly", + "base": "GeteUiScaleToDeviceMode_ScaleXOnly", "details": { "name": "Scale X Only" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScaleToDeviceMode_ScaleYOnly.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScaleToDeviceMode_ScaleYOnly.names index 258af26dab..3589e6b7cf 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScaleToDeviceMode_ScaleYOnly.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScaleToDeviceMode_ScaleYOnly.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "eUiScaleToDeviceMode_ScaleYOnly", + "base": "eUiScaleToDeviceMode_ScaleYOnly", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GeteUiScaleToDeviceMode_ScaleYOnly", + "base": "GeteUiScaleToDeviceMode_ScaleYOnly", "details": { "name": "Scale Y Only" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScaleToDeviceMode_UniformScaleToFill.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScaleToDeviceMode_UniformScaleToFill.names index d72089664d..e6e0a8c72d 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScaleToDeviceMode_UniformScaleToFill.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScaleToDeviceMode_UniformScaleToFill.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "eUiScaleToDeviceMode_UniformScaleToFill", + "base": "eUiScaleToDeviceMode_UniformScaleToFill", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GeteUiScaleToDeviceMode_UniformScaleToFill", + "base": "GeteUiScaleToDeviceMode_UniformScaleToFill", "details": { "name": "Uniform Scale To Fill" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScaleToDeviceMode_UniformScaleToFit.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScaleToDeviceMode_UniformScaleToFit.names index 2428ebb6c3..8f2e3c80ee 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScaleToDeviceMode_UniformScaleToFit.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScaleToDeviceMode_UniformScaleToFit.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "eUiScaleToDeviceMode_UniformScaleToFit", + "base": "eUiScaleToDeviceMode_UniformScaleToFit", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GeteUiScaleToDeviceMode_UniformScaleToFit", + "base": "GeteUiScaleToDeviceMode_UniformScaleToFit", "details": { "name": "Uniform Scale To Fit" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScaleToDeviceMode_UniformScaleToFitX.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScaleToDeviceMode_UniformScaleToFitX.names index ea892546f4..dd07d3e4c3 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScaleToDeviceMode_UniformScaleToFitX.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScaleToDeviceMode_UniformScaleToFitX.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "eUiScaleToDeviceMode_UniformScaleToFitX", + "base": "eUiScaleToDeviceMode_UniformScaleToFitX", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GeteUiScaleToDeviceMode_UniformScaleToFitX", + "base": "GeteUiScaleToDeviceMode_UniformScaleToFitX", "details": { "name": "Uniform Scale To Fit X" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScaleToDeviceMode_UniformScaleToFitY.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScaleToDeviceMode_UniformScaleToFitY.names index 69a7da174f..5519e48332 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScaleToDeviceMode_UniformScaleToFitY.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScaleToDeviceMode_UniformScaleToFitY.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "eUiScaleToDeviceMode_UniformScaleToFitY", + "base": "eUiScaleToDeviceMode_UniformScaleToFitY", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GeteUiScaleToDeviceMode_UniformScaleToFitY", + "base": "GeteUiScaleToDeviceMode_UniformScaleToFitY", "details": { "name": "Uniform Scale To Fit Y" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScrollBoxScrollBarVisibility_AlwaysShow.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScrollBoxScrollBarVisibility_AlwaysShow.names index fcbfa1ac3b..8db8786d20 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScrollBoxScrollBarVisibility_AlwaysShow.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScrollBoxScrollBarVisibility_AlwaysShow.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "eUiScrollBoxScrollBarVisibility_AlwaysShow", + "base": "eUiScrollBoxScrollBarVisibility_AlwaysShow", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GeteUiScrollBoxScrollBarVisibility_AlwaysShow", + "base": "GeteUiScrollBoxScrollBarVisibility_AlwaysShow", "details": { "name": "Always Show" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScrollBoxScrollBarVisibility_AutoHide.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScrollBoxScrollBarVisibility_AutoHide.names index 14cc2bc099..df81d761aa 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScrollBoxScrollBarVisibility_AutoHide.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScrollBoxScrollBarVisibility_AutoHide.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "eUiScrollBoxScrollBarVisibility_AutoHide", + "base": "eUiScrollBoxScrollBarVisibility_AutoHide", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GeteUiScrollBoxScrollBarVisibility_AutoHide", + "base": "GeteUiScrollBoxScrollBarVisibility_AutoHide", "details": { "name": "Auto Hide" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScrollBoxScrollBarVisibility_AutoHideAndResizeViewport.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScrollBoxScrollBarVisibility_AutoHideAndResizeViewport.names index e8d4412664..c65f31e223 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScrollBoxScrollBarVisibility_AutoHideAndResizeViewport.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScrollBoxScrollBarVisibility_AutoHideAndResizeViewport.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "eUiScrollBoxScrollBarVisibility_AutoHideAndResizeViewport", + "base": "eUiScrollBoxScrollBarVisibility_AutoHideAndResizeViewport", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GeteUiScrollBoxScrollBarVisibility_AutoHideAndResizeViewport", + "base": "GeteUiScrollBoxScrollBarVisibility_AutoHideAndResizeViewport", "details": { "name": "Auto Hide And Resize Viewport" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScrollBoxSnapMode_Children.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScrollBoxSnapMode_Children.names index 4015cd6d34..2552d2d348 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScrollBoxSnapMode_Children.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScrollBoxSnapMode_Children.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "eUiScrollBoxSnapMode_Children", + "base": "eUiScrollBoxSnapMode_Children", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GeteUiScrollBoxSnapMode_Children", + "base": "GeteUiScrollBoxSnapMode_Children", "details": { "name": "Children" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScrollBoxSnapMode_Grid.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScrollBoxSnapMode_Grid.names index ff071ef16b..3369cb4df1 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScrollBoxSnapMode_Grid.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScrollBoxSnapMode_Grid.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "eUiScrollBoxSnapMode_Grid", + "base": "eUiScrollBoxSnapMode_Grid", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GeteUiScrollBoxSnapMode_Grid", + "base": "GeteUiScrollBoxSnapMode_Grid", "details": { "name": "Grid" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScrollBoxSnapMode_None.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScrollBoxSnapMode_None.names index 0057833d49..e806ef8347 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScrollBoxSnapMode_None.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScrollBoxSnapMode_None.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "eUiScrollBoxSnapMode_None", + "base": "eUiScrollBoxSnapMode_None", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GeteUiScrollBoxSnapMode_None", + "base": "GeteUiScrollBoxSnapMode_None", "details": { "name": "None" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScrollerOrientation_Horizontal.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScrollerOrientation_Horizontal.names index 7f50d532ad..89b4e75151 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScrollerOrientation_Horizontal.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScrollerOrientation_Horizontal.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "eUiScrollerOrientation_Horizontal", + "base": "eUiScrollerOrientation_Horizontal", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GeteUiScrollerOrientation_Horizontal", + "base": "GeteUiScrollerOrientation_Horizontal", "details": { "name": "Horizontal" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScrollerOrientation_Vertical.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScrollerOrientation_Vertical.names index f781abf3ae..7823992830 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScrollerOrientation_Vertical.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiScrollerOrientation_Vertical.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "eUiScrollerOrientation_Vertical", + "base": "eUiScrollerOrientation_Vertical", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GeteUiScrollerOrientation_Vertical", + "base": "GeteUiScrollerOrientation_Vertical", "details": { "name": "Vertical" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiSpriteType_RenderTarget.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiSpriteType_RenderTarget.names index fcde09686e..94056daa38 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiSpriteType_RenderTarget.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiSpriteType_RenderTarget.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "eUiSpriteType_RenderTarget", + "base": "eUiSpriteType_RenderTarget", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GeteUiSpriteType_RenderTarget", + "base": "GeteUiSpriteType_RenderTarget", "details": { "name": "Render Target" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiSpriteType_SpriteAsset.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiSpriteType_SpriteAsset.names index 90e11c7daf..c47a3c4192 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiSpriteType_SpriteAsset.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiSpriteType_SpriteAsset.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "eUiSpriteType_SpriteAsset", + "base": "eUiSpriteType_SpriteAsset", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GeteUiSpriteType_SpriteAsset", + "base": "GeteUiSpriteType_SpriteAsset", "details": { "name": "Sprite Asset" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTextOverflowMode_ClipText.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTextOverflowMode_ClipText.names index 972ae6cfc2..9aa0a64317 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTextOverflowMode_ClipText.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTextOverflowMode_ClipText.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "eUiTextOverflowMode_ClipText", + "base": "eUiTextOverflowMode_ClipText", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GeteUiTextOverflowMode_ClipText", + "base": "GeteUiTextOverflowMode_ClipText", "details": { "name": "Clip Text" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTextOverflowMode_Ellipsis.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTextOverflowMode_Ellipsis.names index ab13c84f66..b930c80c95 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTextOverflowMode_Ellipsis.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTextOverflowMode_Ellipsis.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "eUiTextOverflowMode_Ellipsis", + "base": "eUiTextOverflowMode_Ellipsis", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GeteUiTextOverflowMode_Ellipsis", + "base": "GeteUiTextOverflowMode_Ellipsis", "details": { "name": "Ellipsis" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTextOverflowMode_OverflowText.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTextOverflowMode_OverflowText.names index e291cf2f0e..51271d943f 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTextOverflowMode_OverflowText.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTextOverflowMode_OverflowText.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "eUiTextOverflowMode_OverflowText", + "base": "eUiTextOverflowMode_OverflowText", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GeteUiTextOverflowMode_OverflowText", + "base": "GeteUiTextOverflowMode_OverflowText", "details": { "name": "Overflow Text" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTextShrinkToFit_None.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTextShrinkToFit_None.names index e82d2af4eb..614c337c6b 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTextShrinkToFit_None.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTextShrinkToFit_None.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "eUiTextShrinkToFit_None", + "base": "eUiTextShrinkToFit_None", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GeteUiTextShrinkToFit_None", + "base": "GeteUiTextShrinkToFit_None", "details": { "name": "None" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTextShrinkToFit_Uniform.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTextShrinkToFit_Uniform.names index d499a68e0d..72c29c8b5a 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTextShrinkToFit_Uniform.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTextShrinkToFit_Uniform.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "eUiTextShrinkToFit_Uniform", + "base": "eUiTextShrinkToFit_Uniform", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GeteUiTextShrinkToFit_Uniform", + "base": "GeteUiTextShrinkToFit_Uniform", "details": { "name": "Uniform" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTextShrinkToFit_WidthOnly.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTextShrinkToFit_WidthOnly.names index 739888fd70..67524f593f 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTextShrinkToFit_WidthOnly.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTextShrinkToFit_WidthOnly.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "eUiTextShrinkToFit_WidthOnly", + "base": "eUiTextShrinkToFit_WidthOnly", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GeteUiTextShrinkToFit_WidthOnly", + "base": "GeteUiTextShrinkToFit_WidthOnly", "details": { "name": "Width Only" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTextWrapTextSetting_NoWrap.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTextWrapTextSetting_NoWrap.names index b71d8cbb8b..dfb70ab7ba 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTextWrapTextSetting_NoWrap.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTextWrapTextSetting_NoWrap.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "eUiTextWrapTextSetting_NoWrap", + "base": "eUiTextWrapTextSetting_NoWrap", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GeteUiTextWrapTextSetting_NoWrap", + "base": "GeteUiTextWrapTextSetting_NoWrap", "details": { "name": "No Wrap" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTextWrapTextSetting_Wrap.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTextWrapTextSetting_Wrap.names index 39c2250114..96c98744d1 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTextWrapTextSetting_Wrap.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTextWrapTextSetting_Wrap.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "eUiTextWrapTextSetting_Wrap", + "base": "eUiTextWrapTextSetting_Wrap", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GeteUiTextWrapTextSetting_Wrap", + "base": "GeteUiTextWrapTextSetting_Wrap", "details": { "name": "Wrap" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTooltipDisplayAutoPositionMode_OffsetFromElement.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTooltipDisplayAutoPositionMode_OffsetFromElement.names index 88c75ee730..c0fb71abc1 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTooltipDisplayAutoPositionMode_OffsetFromElement.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTooltipDisplayAutoPositionMode_OffsetFromElement.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "eUiTooltipDisplayAutoPositionMode_OffsetFromElement", + "base": "eUiTooltipDisplayAutoPositionMode_OffsetFromElement", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GeteUiTooltipDisplayAutoPositionMode_OffsetFromElement", + "base": "GeteUiTooltipDisplayAutoPositionMode_OffsetFromElement", "details": { "name": "Offset From Element" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTooltipDisplayAutoPositionMode_OffsetFromMouse.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTooltipDisplayAutoPositionMode_OffsetFromMouse.names index c22716abbb..5c12e0a60e 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTooltipDisplayAutoPositionMode_OffsetFromMouse.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTooltipDisplayAutoPositionMode_OffsetFromMouse.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "eUiTooltipDisplayAutoPositionMode_OffsetFromMouse", + "base": "eUiTooltipDisplayAutoPositionMode_OffsetFromMouse", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GeteUiTooltipDisplayAutoPositionMode_OffsetFromMouse", + "base": "GeteUiTooltipDisplayAutoPositionMode_OffsetFromMouse", "details": { "name": "Offset From Mouse" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTooltipDisplayTriggerMode_OnClick.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTooltipDisplayTriggerMode_OnClick.names index af10e96af1..deb5b1696b 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTooltipDisplayTriggerMode_OnClick.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTooltipDisplayTriggerMode_OnClick.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "eUiTooltipDisplayTriggerMode_OnClick", + "base": "eUiTooltipDisplayTriggerMode_OnClick", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GeteUiTooltipDisplayTriggerMode_OnClick", + "base": "GeteUiTooltipDisplayTriggerMode_OnClick", "details": { "name": "On Click" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTooltipDisplayTriggerMode_OnHover.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTooltipDisplayTriggerMode_OnHover.names index 3cd2343053..e118eeafbc 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTooltipDisplayTriggerMode_OnHover.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTooltipDisplayTriggerMode_OnHover.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "eUiTooltipDisplayTriggerMode_OnHover", + "base": "eUiTooltipDisplayTriggerMode_OnHover", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GeteUiTooltipDisplayTriggerMode_OnHover", + "base": "GeteUiTooltipDisplayTriggerMode_OnHover", "details": { "name": "On Hover" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTooltipDisplayTriggerMode_OnPress.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTooltipDisplayTriggerMode_OnPress.names index 6fcfc3d88d..f570902180 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTooltipDisplayTriggerMode_OnPress.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiTooltipDisplayTriggerMode_OnPress.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "eUiTooltipDisplayTriggerMode_OnPress", + "base": "eUiTooltipDisplayTriggerMode_OnPress", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GeteUiTooltipDisplayTriggerMode_OnPress", + "base": "GeteUiTooltipDisplayTriggerMode_OnPress", "details": { "name": "On Press" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiVAlign_Bottom.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiVAlign_Bottom.names index 1ca5e4426e..b5c89b6b6c 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiVAlign_Bottom.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiVAlign_Bottom.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "eUiVAlign_Bottom", + "base": "eUiVAlign_Bottom", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GeteUiVAlign_Bottom", + "base": "GeteUiVAlign_Bottom", "details": { "name": "Vertical Align: Bottom" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiVAlign_Center.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiVAlign_Center.names index bd9b68a692..ecdb75bda9 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiVAlign_Center.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiVAlign_Center.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "eUiVAlign_Center", + "base": "eUiVAlign_Center", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GeteUiVAlign_Center", + "base": "GeteUiVAlign_Center", "details": { "name": "Vertical Align: Center" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiVAlign_Top.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiVAlign_Top.names index 6bbf6778b9..f35d9ff698 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiVAlign_Top.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiVAlign_Top.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "eUiVAlign_Top", + "base": "eUiVAlign_Top", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GeteUiVAlign_Top", + "base": "GeteUiVAlign_Top", "details": { "name": "Vertical Align: Top" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiVerticalOrder_BottomToTop.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiVerticalOrder_BottomToTop.names index 3e9b9f61d3..06edfefaef 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiVerticalOrder_BottomToTop.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiVerticalOrder_BottomToTop.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "eUiVerticalOrder_BottomToTop", + "base": "eUiVerticalOrder_BottomToTop", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GeteUiVerticalOrder_BottomToTop", + "base": "GeteUiVerticalOrder_BottomToTop", "details": { "name": "Bottom To Top" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiVerticalOrder_TopToBottom.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiVerticalOrder_TopToBottom.names index 3488c07a31..ff4d7ec7ec 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiVerticalOrder_TopToBottom.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/eUiVerticalOrder_TopToBottom.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "eUiVerticalOrder_TopToBottom", + "base": "eUiVerticalOrder_TopToBottom", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "GeteUiVerticalOrder_TopToBottom", + "base": "GeteUiVerticalOrder_TopToBottom", "details": { "name": "Top To Bottom" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/g_ProfilerSystem.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/g_ProfilerSystem.names index 6e1de3a3f9..679cd307c8 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/g_ProfilerSystem.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/g_ProfilerSystem.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "g_ProfilerSystem", + "base": "g_ProfilerSystem", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "Getg_ProfilerSystem", + "base": "Getg_ProfilerSystem", "details": { "name": "Profiler System" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/g_SettingsRegistry.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/g_SettingsRegistry.names index 79ebec28d0..5d7a8dfba7 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/g_SettingsRegistry.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Properties/g_SettingsRegistry.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "g_SettingsRegistry", + "base": "g_SettingsRegistry", "context": "Constant", "variant": "", "details": { @@ -10,7 +10,7 @@ }, "methods": [ { - "key": "Getg_SettingsRegistry", + "base": "Getg_SettingsRegistry", "details": { "name": "Settings Registry" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Types/OnDemandReflectedTypes.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Types/OnDemandReflectedTypes.names index bf62ef5e72..fcd616b9ed 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Types/OnDemandReflectedTypes.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Types/OnDemandReflectedTypes.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "{E65D74A8-908B-51B4-94CC-7226AC363DD5}", + "base": "{E65D74A8-908B-51B4-94CC-7226AC363DD5}", "context": "OnDemandReflected", "variant": "", "details": { @@ -11,7 +11,7 @@ }, "methods": [ { - "key": "Front", + "base": "Front", "context": "{E65D74A8-908B-51B4-94CC-7226AC363DD5}", "entry": { "name": "In", @@ -42,7 +42,7 @@ ] }, { - "key": "Fill", + "base": "Fill", "context": "{E65D74A8-908B-51B4-94CC-7226AC363DD5}", "entry": { "name": "In", @@ -71,7 +71,7 @@ ] }, { - "key": "Replace", + "base": "Replace", "context": "{E65D74A8-908B-51B4-94CC-7226AC363DD5}", "entry": { "name": "In", @@ -114,7 +114,7 @@ ] }, { - "key": "Size", + "base": "Size", "context": "{E65D74A8-908B-51B4-94CC-7226AC363DD5}", "entry": { "name": "In", @@ -145,7 +145,7 @@ ] }, { - "key": "size", + "base": "size", "context": "{E65D74A8-908B-51B4-94CC-7226AC363DD5}", "entry": { "name": "In", @@ -176,7 +176,7 @@ ] }, { - "key": "At", + "base": "At", "context": "{E65D74A8-908B-51B4-94CC-7226AC363DD5}", "entry": { "name": "In", @@ -213,7 +213,7 @@ ] }, { - "key": "Swap", + "base": "Swap", "context": "{E65D74A8-908B-51B4-94CC-7226AC363DD5}", "entry": { "name": "In", @@ -242,7 +242,7 @@ ] }, { - "key": "at", + "base": "at", "context": "{E65D74A8-908B-51B4-94CC-7226AC363DD5}", "entry": { "name": "In", @@ -279,7 +279,7 @@ ] }, { - "key": "Back", + "base": "Back", "context": "{E65D74A8-908B-51B4-94CC-7226AC363DD5}", "entry": { "name": "In", @@ -312,7 +312,7 @@ ] }, { - "key": "{232F1AE7-4411-5D69-B59C-71D7036FC5E4}", + "base": "{232F1AE7-4411-5D69-B59C-71D7036FC5E4}", "context": "OnDemandReflected", "variant": "", "details": { @@ -322,7 +322,7 @@ }, "methods": [ { - "key": "contains", + "base": "contains", "context": "{232F1AE7-4411-5D69-B59C-71D7036FC5E4}", "entry": { "name": "In", @@ -359,7 +359,7 @@ ] }, { - "key": "Insert", + "base": "Insert", "context": "{232F1AE7-4411-5D69-B59C-71D7036FC5E4}", "entry": { "name": "In", @@ -402,7 +402,7 @@ ] }, { - "key": "Reserve", + "base": "Reserve", "context": "{232F1AE7-4411-5D69-B59C-71D7036FC5E4}", "entry": { "name": "In", @@ -431,7 +431,7 @@ ] }, { - "key": "GetSize", + "base": "GetSize", "context": "{232F1AE7-4411-5D69-B59C-71D7036FC5E4}", "entry": { "name": "In", @@ -462,7 +462,7 @@ ] }, { - "key": "Iterate_VM", + "base": "Iterate_VM", "context": "{232F1AE7-4411-5D69-B59C-71D7036FC5E4}", "entry": { "name": "In", @@ -493,7 +493,7 @@ ] }, { - "key": "GetKeys", + "base": "GetKeys", "context": "{232F1AE7-4411-5D69-B59C-71D7036FC5E4}", "entry": { "name": "In", @@ -524,7 +524,7 @@ ] }, { - "key": "Size", + "base": "Size", "context": "{232F1AE7-4411-5D69-B59C-71D7036FC5E4}", "entry": { "name": "In", @@ -555,7 +555,7 @@ ] }, { - "key": "Erase", + "base": "Erase", "context": "{232F1AE7-4411-5D69-B59C-71D7036FC5E4}", "entry": { "name": "In", @@ -592,7 +592,7 @@ ] }, { - "key": "EraseCheck_VM", + "base": "EraseCheck_VM", "context": "{232F1AE7-4411-5D69-B59C-71D7036FC5E4}", "entry": { "name": "In", @@ -629,7 +629,7 @@ ] }, { - "key": "Clear", + "base": "Clear", "context": "{232F1AE7-4411-5D69-B59C-71D7036FC5E4}", "entry": { "name": "In", @@ -660,7 +660,7 @@ ] }, { - "key": "At", + "base": "At", "context": "{232F1AE7-4411-5D69-B59C-71D7036FC5E4}", "entry": { "name": "In", @@ -697,7 +697,7 @@ ] }, { - "key": "BucketCount", + "base": "BucketCount", "context": "{232F1AE7-4411-5D69-B59C-71D7036FC5E4}", "entry": { "name": "In", @@ -728,7 +728,7 @@ ] }, { - "key": "Empty", + "base": "Empty", "context": "{232F1AE7-4411-5D69-B59C-71D7036FC5E4}", "entry": { "name": "In", @@ -759,7 +759,7 @@ ] }, { - "key": "Swap", + "base": "Swap", "context": "{232F1AE7-4411-5D69-B59C-71D7036FC5E4}", "entry": { "name": "In", @@ -790,7 +790,7 @@ ] }, { - "key": "{53A388FF-F69B-5F31-94CC-441F9D7F3ACC}", + "base": "{53A388FF-F69B-5F31-94CC-441F9D7F3ACC}", "context": "OnDemandReflected", "variant": "", "details": { @@ -800,7 +800,7 @@ }, "methods": [ { - "key": "contains", + "base": "contains", "context": "{53A388FF-F69B-5F31-94CC-441F9D7F3ACC}", "entry": { "name": "In", @@ -837,7 +837,7 @@ ] }, { - "key": "Insert", + "base": "Insert", "context": "{53A388FF-F69B-5F31-94CC-441F9D7F3ACC}", "entry": { "name": "In", @@ -880,7 +880,7 @@ ] }, { - "key": "Reserve", + "base": "Reserve", "context": "{53A388FF-F69B-5F31-94CC-441F9D7F3ACC}", "entry": { "name": "In", @@ -909,7 +909,7 @@ ] }, { - "key": "GetSize", + "base": "GetSize", "context": "{53A388FF-F69B-5F31-94CC-441F9D7F3ACC}", "entry": { "name": "In", @@ -940,7 +940,7 @@ ] }, { - "key": "Iterate_VM", + "base": "Iterate_VM", "context": "{53A388FF-F69B-5F31-94CC-441F9D7F3ACC}", "entry": { "name": "In", @@ -971,7 +971,7 @@ ] }, { - "key": "GetKeys", + "base": "GetKeys", "context": "{53A388FF-F69B-5F31-94CC-441F9D7F3ACC}", "entry": { "name": "In", @@ -1002,7 +1002,7 @@ ] }, { - "key": "Size", + "base": "Size", "context": "{53A388FF-F69B-5F31-94CC-441F9D7F3ACC}", "entry": { "name": "In", @@ -1033,7 +1033,7 @@ ] }, { - "key": "Erase", + "base": "Erase", "context": "{53A388FF-F69B-5F31-94CC-441F9D7F3ACC}", "entry": { "name": "In", @@ -1070,7 +1070,7 @@ ] }, { - "key": "EraseCheck_VM", + "base": "EraseCheck_VM", "context": "{53A388FF-F69B-5F31-94CC-441F9D7F3ACC}", "entry": { "name": "In", @@ -1107,7 +1107,7 @@ ] }, { - "key": "Clear", + "base": "Clear", "context": "{53A388FF-F69B-5F31-94CC-441F9D7F3ACC}", "entry": { "name": "In", @@ -1138,7 +1138,7 @@ ] }, { - "key": "At", + "base": "At", "context": "{53A388FF-F69B-5F31-94CC-441F9D7F3ACC}", "entry": { "name": "In", @@ -1175,7 +1175,7 @@ ] }, { - "key": "BucketCount", + "base": "BucketCount", "context": "{53A388FF-F69B-5F31-94CC-441F9D7F3ACC}", "entry": { "name": "In", @@ -1206,7 +1206,7 @@ ] }, { - "key": "Empty", + "base": "Empty", "context": "{53A388FF-F69B-5F31-94CC-441F9D7F3ACC}", "entry": { "name": "In", @@ -1237,7 +1237,7 @@ ] }, { - "key": "Swap", + "base": "Swap", "context": "{53A388FF-F69B-5F31-94CC-441F9D7F3ACC}", "entry": { "name": "In", @@ -1268,7 +1268,7 @@ ] }, { - "key": "{7AB203ED-4DE1-5DB6-AE1F-23E8D6104EE5}", + "base": "{7AB203ED-4DE1-5DB6-AE1F-23E8D6104EE5}", "context": "OnDemandReflected", "variant": "", "details": { @@ -1278,7 +1278,7 @@ }, "methods": [ { - "key": "contains", + "base": "contains", "context": "{7AB203ED-4DE1-5DB6-AE1F-23E8D6104EE5}", "entry": { "name": "In", @@ -1315,7 +1315,7 @@ ] }, { - "key": "Insert", + "base": "Insert", "context": "{7AB203ED-4DE1-5DB6-AE1F-23E8D6104EE5}", "entry": { "name": "In", @@ -1358,7 +1358,7 @@ ] }, { - "key": "Reserve", + "base": "Reserve", "context": "{7AB203ED-4DE1-5DB6-AE1F-23E8D6104EE5}", "entry": { "name": "In", @@ -1387,7 +1387,7 @@ ] }, { - "key": "GetSize", + "base": "GetSize", "context": "{7AB203ED-4DE1-5DB6-AE1F-23E8D6104EE5}", "entry": { "name": "In", @@ -1418,7 +1418,7 @@ ] }, { - "key": "Iterate_VM", + "base": "Iterate_VM", "context": "{7AB203ED-4DE1-5DB6-AE1F-23E8D6104EE5}", "entry": { "name": "In", @@ -1449,7 +1449,7 @@ ] }, { - "key": "GetKeys", + "base": "GetKeys", "context": "{7AB203ED-4DE1-5DB6-AE1F-23E8D6104EE5}", "entry": { "name": "In", @@ -1480,7 +1480,7 @@ ] }, { - "key": "Size", + "base": "Size", "context": "{7AB203ED-4DE1-5DB6-AE1F-23E8D6104EE5}", "entry": { "name": "In", @@ -1511,7 +1511,7 @@ ] }, { - "key": "Erase", + "base": "Erase", "context": "{7AB203ED-4DE1-5DB6-AE1F-23E8D6104EE5}", "entry": { "name": "In", @@ -1548,7 +1548,7 @@ ] }, { - "key": "EraseCheck_VM", + "base": "EraseCheck_VM", "context": "{7AB203ED-4DE1-5DB6-AE1F-23E8D6104EE5}", "entry": { "name": "In", @@ -1585,7 +1585,7 @@ ] }, { - "key": "Clear", + "base": "Clear", "context": "{7AB203ED-4DE1-5DB6-AE1F-23E8D6104EE5}", "entry": { "name": "In", @@ -1616,7 +1616,7 @@ ] }, { - "key": "At", + "base": "At", "context": "{7AB203ED-4DE1-5DB6-AE1F-23E8D6104EE5}", "entry": { "name": "In", @@ -1653,7 +1653,7 @@ ] }, { - "key": "BucketCount", + "base": "BucketCount", "context": "{7AB203ED-4DE1-5DB6-AE1F-23E8D6104EE5}", "entry": { "name": "In", @@ -1684,7 +1684,7 @@ ] }, { - "key": "Empty", + "base": "Empty", "context": "{7AB203ED-4DE1-5DB6-AE1F-23E8D6104EE5}", "entry": { "name": "In", @@ -1715,7 +1715,7 @@ ] }, { - "key": "Swap", + "base": "Swap", "context": "{7AB203ED-4DE1-5DB6-AE1F-23E8D6104EE5}", "entry": { "name": "In", @@ -1746,7 +1746,7 @@ ] }, { - "key": "{E3FCF041-81CA-5782-9530-CC7793B53765}", + "base": "{E3FCF041-81CA-5782-9530-CC7793B53765}", "context": "OnDemandReflected", "variant": "", "details": { @@ -1756,7 +1756,7 @@ }, "methods": [ { - "key": "contains", + "base": "contains", "context": "{E3FCF041-81CA-5782-9530-CC7793B53765}", "entry": { "name": "In", @@ -1793,7 +1793,7 @@ ] }, { - "key": "Insert", + "base": "Insert", "context": "{E3FCF041-81CA-5782-9530-CC7793B53765}", "entry": { "name": "In", @@ -1836,7 +1836,7 @@ ] }, { - "key": "Reserve", + "base": "Reserve", "context": "{E3FCF041-81CA-5782-9530-CC7793B53765}", "entry": { "name": "In", @@ -1865,7 +1865,7 @@ ] }, { - "key": "GetSize", + "base": "GetSize", "context": "{E3FCF041-81CA-5782-9530-CC7793B53765}", "entry": { "name": "In", @@ -1896,7 +1896,7 @@ ] }, { - "key": "Iterate_VM", + "base": "Iterate_VM", "context": "{E3FCF041-81CA-5782-9530-CC7793B53765}", "entry": { "name": "In", @@ -1927,7 +1927,7 @@ ] }, { - "key": "GetKeys", + "base": "GetKeys", "context": "{E3FCF041-81CA-5782-9530-CC7793B53765}", "entry": { "name": "In", @@ -1958,7 +1958,7 @@ ] }, { - "key": "Size", + "base": "Size", "context": "{E3FCF041-81CA-5782-9530-CC7793B53765}", "entry": { "name": "In", @@ -1989,7 +1989,7 @@ ] }, { - "key": "Erase", + "base": "Erase", "context": "{E3FCF041-81CA-5782-9530-CC7793B53765}", "entry": { "name": "In", @@ -2026,7 +2026,7 @@ ] }, { - "key": "EraseCheck_VM", + "base": "EraseCheck_VM", "context": "{E3FCF041-81CA-5782-9530-CC7793B53765}", "entry": { "name": "In", @@ -2063,7 +2063,7 @@ ] }, { - "key": "Clear", + "base": "Clear", "context": "{E3FCF041-81CA-5782-9530-CC7793B53765}", "entry": { "name": "In", @@ -2094,7 +2094,7 @@ ] }, { - "key": "At", + "base": "At", "context": "{E3FCF041-81CA-5782-9530-CC7793B53765}", "entry": { "name": "In", @@ -2131,7 +2131,7 @@ ] }, { - "key": "BucketCount", + "base": "BucketCount", "context": "{E3FCF041-81CA-5782-9530-CC7793B53765}", "entry": { "name": "In", @@ -2162,7 +2162,7 @@ ] }, { - "key": "Empty", + "base": "Empty", "context": "{E3FCF041-81CA-5782-9530-CC7793B53765}", "entry": { "name": "In", @@ -2193,7 +2193,7 @@ ] }, { - "key": "Swap", + "base": "Swap", "context": "{E3FCF041-81CA-5782-9530-CC7793B53765}", "entry": { "name": "In", @@ -2224,7 +2224,7 @@ ] }, { - "key": "{DA54CF57-7BE3-59DF-A5B0-F4CA6D9CC01A}", + "base": "{DA54CF57-7BE3-59DF-A5B0-F4CA6D9CC01A}", "context": "OnDemandReflected", "variant": "", "details": { @@ -2234,7 +2234,7 @@ }, "methods": [ { - "key": "contains", + "base": "contains", "context": "{DA54CF57-7BE3-59DF-A5B0-F4CA6D9CC01A}", "entry": { "name": "In", @@ -2271,7 +2271,7 @@ ] }, { - "key": "Insert", + "base": "Insert", "context": "{DA54CF57-7BE3-59DF-A5B0-F4CA6D9CC01A}", "entry": { "name": "In", @@ -2314,7 +2314,7 @@ ] }, { - "key": "Reserve", + "base": "Reserve", "context": "{DA54CF57-7BE3-59DF-A5B0-F4CA6D9CC01A}", "entry": { "name": "In", @@ -2343,7 +2343,7 @@ ] }, { - "key": "GetSize", + "base": "GetSize", "context": "{DA54CF57-7BE3-59DF-A5B0-F4CA6D9CC01A}", "entry": { "name": "In", @@ -2374,7 +2374,7 @@ ] }, { - "key": "Iterate_VM", + "base": "Iterate_VM", "context": "{DA54CF57-7BE3-59DF-A5B0-F4CA6D9CC01A}", "entry": { "name": "In", @@ -2405,7 +2405,7 @@ ] }, { - "key": "GetKeys", + "base": "GetKeys", "context": "{DA54CF57-7BE3-59DF-A5B0-F4CA6D9CC01A}", "entry": { "name": "In", @@ -2436,7 +2436,7 @@ ] }, { - "key": "Size", + "base": "Size", "context": "{DA54CF57-7BE3-59DF-A5B0-F4CA6D9CC01A}", "entry": { "name": "In", @@ -2467,7 +2467,7 @@ ] }, { - "key": "Erase", + "base": "Erase", "context": "{DA54CF57-7BE3-59DF-A5B0-F4CA6D9CC01A}", "entry": { "name": "In", @@ -2504,7 +2504,7 @@ ] }, { - "key": "EraseCheck_VM", + "base": "EraseCheck_VM", "context": "{DA54CF57-7BE3-59DF-A5B0-F4CA6D9CC01A}", "entry": { "name": "In", @@ -2541,7 +2541,7 @@ ] }, { - "key": "Clear", + "base": "Clear", "context": "{DA54CF57-7BE3-59DF-A5B0-F4CA6D9CC01A}", "entry": { "name": "In", @@ -2572,7 +2572,7 @@ ] }, { - "key": "At", + "base": "At", "context": "{DA54CF57-7BE3-59DF-A5B0-F4CA6D9CC01A}", "entry": { "name": "In", @@ -2609,7 +2609,7 @@ ] }, { - "key": "BucketCount", + "base": "BucketCount", "context": "{DA54CF57-7BE3-59DF-A5B0-F4CA6D9CC01A}", "entry": { "name": "In", @@ -2640,7 +2640,7 @@ ] }, { - "key": "Empty", + "base": "Empty", "context": "{DA54CF57-7BE3-59DF-A5B0-F4CA6D9CC01A}", "entry": { "name": "In", @@ -2671,7 +2671,7 @@ ] }, { - "key": "Swap", + "base": "Swap", "context": "{DA54CF57-7BE3-59DF-A5B0-F4CA6D9CC01A}", "entry": { "name": "In", @@ -2702,7 +2702,7 @@ ] }, { - "key": "{246A60D1-4DC3-57A5-BABA-214581F3B4FE}", + "base": "{246A60D1-4DC3-57A5-BABA-214581F3B4FE}", "context": "OnDemandReflected", "variant": "", "details": { @@ -2712,7 +2712,7 @@ }, "methods": [ { - "key": "contains", + "base": "contains", "context": "{246A60D1-4DC3-57A5-BABA-214581F3B4FE}", "entry": { "name": "In", @@ -2749,7 +2749,7 @@ ] }, { - "key": "Insert", + "base": "Insert", "context": "{246A60D1-4DC3-57A5-BABA-214581F3B4FE}", "entry": { "name": "In", @@ -2792,7 +2792,7 @@ ] }, { - "key": "Reserve", + "base": "Reserve", "context": "{246A60D1-4DC3-57A5-BABA-214581F3B4FE}", "entry": { "name": "In", @@ -2821,7 +2821,7 @@ ] }, { - "key": "GetSize", + "base": "GetSize", "context": "{246A60D1-4DC3-57A5-BABA-214581F3B4FE}", "entry": { "name": "In", @@ -2852,7 +2852,7 @@ ] }, { - "key": "Iterate_VM", + "base": "Iterate_VM", "context": "{246A60D1-4DC3-57A5-BABA-214581F3B4FE}", "entry": { "name": "In", @@ -2883,7 +2883,7 @@ ] }, { - "key": "GetKeys", + "base": "GetKeys", "context": "{246A60D1-4DC3-57A5-BABA-214581F3B4FE}", "entry": { "name": "In", @@ -2914,7 +2914,7 @@ ] }, { - "key": "Size", + "base": "Size", "context": "{246A60D1-4DC3-57A5-BABA-214581F3B4FE}", "entry": { "name": "In", @@ -2945,7 +2945,7 @@ ] }, { - "key": "Erase", + "base": "Erase", "context": "{246A60D1-4DC3-57A5-BABA-214581F3B4FE}", "entry": { "name": "In", @@ -2982,7 +2982,7 @@ ] }, { - "key": "EraseCheck_VM", + "base": "EraseCheck_VM", "context": "{246A60D1-4DC3-57A5-BABA-214581F3B4FE}", "entry": { "name": "In", @@ -3019,7 +3019,7 @@ ] }, { - "key": "Clear", + "base": "Clear", "context": "{246A60D1-4DC3-57A5-BABA-214581F3B4FE}", "entry": { "name": "In", @@ -3050,7 +3050,7 @@ ] }, { - "key": "At", + "base": "At", "context": "{246A60D1-4DC3-57A5-BABA-214581F3B4FE}", "entry": { "name": "In", @@ -3087,7 +3087,7 @@ ] }, { - "key": "BucketCount", + "base": "BucketCount", "context": "{246A60D1-4DC3-57A5-BABA-214581F3B4FE}", "entry": { "name": "In", @@ -3118,7 +3118,7 @@ ] }, { - "key": "Empty", + "base": "Empty", "context": "{246A60D1-4DC3-57A5-BABA-214581F3B4FE}", "entry": { "name": "In", @@ -3149,7 +3149,7 @@ ] }, { - "key": "Swap", + "base": "Swap", "context": "{246A60D1-4DC3-57A5-BABA-214581F3B4FE}", "entry": { "name": "In", @@ -3180,7 +3180,7 @@ ] }, { - "key": "{73383C40-9632-58AB-9CFE-E90C89E1C612}", + "base": "{73383C40-9632-58AB-9CFE-E90C89E1C612}", "context": "OnDemandReflected", "variant": "", "details": { @@ -3190,7 +3190,7 @@ }, "methods": [ { - "key": "contains", + "base": "contains", "context": "{73383C40-9632-58AB-9CFE-E90C89E1C612}", "entry": { "name": "In", @@ -3227,7 +3227,7 @@ ] }, { - "key": "Insert", + "base": "Insert", "context": "{73383C40-9632-58AB-9CFE-E90C89E1C612}", "entry": { "name": "In", @@ -3270,7 +3270,7 @@ ] }, { - "key": "Reserve", + "base": "Reserve", "context": "{73383C40-9632-58AB-9CFE-E90C89E1C612}", "entry": { "name": "In", @@ -3299,7 +3299,7 @@ ] }, { - "key": "GetSize", + "base": "GetSize", "context": "{73383C40-9632-58AB-9CFE-E90C89E1C612}", "entry": { "name": "In", @@ -3330,7 +3330,7 @@ ] }, { - "key": "Iterate_VM", + "base": "Iterate_VM", "context": "{73383C40-9632-58AB-9CFE-E90C89E1C612}", "entry": { "name": "In", @@ -3361,7 +3361,7 @@ ] }, { - "key": "GetKeys", + "base": "GetKeys", "context": "{73383C40-9632-58AB-9CFE-E90C89E1C612}", "entry": { "name": "In", @@ -3392,7 +3392,7 @@ ] }, { - "key": "Size", + "base": "Size", "context": "{73383C40-9632-58AB-9CFE-E90C89E1C612}", "entry": { "name": "In", @@ -3423,7 +3423,7 @@ ] }, { - "key": "Erase", + "base": "Erase", "context": "{73383C40-9632-58AB-9CFE-E90C89E1C612}", "entry": { "name": "In", @@ -3460,7 +3460,7 @@ ] }, { - "key": "EraseCheck_VM", + "base": "EraseCheck_VM", "context": "{73383C40-9632-58AB-9CFE-E90C89E1C612}", "entry": { "name": "In", @@ -3497,7 +3497,7 @@ ] }, { - "key": "Clear", + "base": "Clear", "context": "{73383C40-9632-58AB-9CFE-E90C89E1C612}", "entry": { "name": "In", @@ -3528,7 +3528,7 @@ ] }, { - "key": "At", + "base": "At", "context": "{73383C40-9632-58AB-9CFE-E90C89E1C612}", "entry": { "name": "In", @@ -3565,7 +3565,7 @@ ] }, { - "key": "BucketCount", + "base": "BucketCount", "context": "{73383C40-9632-58AB-9CFE-E90C89E1C612}", "entry": { "name": "In", @@ -3596,7 +3596,7 @@ ] }, { - "key": "Empty", + "base": "Empty", "context": "{73383C40-9632-58AB-9CFE-E90C89E1C612}", "entry": { "name": "In", @@ -3627,7 +3627,7 @@ ] }, { - "key": "Swap", + "base": "Swap", "context": "{73383C40-9632-58AB-9CFE-E90C89E1C612}", "entry": { "name": "In", @@ -3658,7 +3658,7 @@ ] }, { - "key": "{F9AFBC85-749B-5A76-8E09-6B734D234C90}", + "base": "{F9AFBC85-749B-5A76-8E09-6B734D234C90}", "context": "OnDemandReflected", "variant": "", "details": { @@ -3668,7 +3668,7 @@ }, "methods": [ { - "key": "contains", + "base": "contains", "context": "{F9AFBC85-749B-5A76-8E09-6B734D234C90}", "entry": { "name": "In", @@ -3706,7 +3706,7 @@ ] }, { - "key": "Insert", + "base": "Insert", "context": "{F9AFBC85-749B-5A76-8E09-6B734D234C90}", "entry": { "name": "In", @@ -3750,7 +3750,7 @@ ] }, { - "key": "Reserve", + "base": "Reserve", "context": "{F9AFBC85-749B-5A76-8E09-6B734D234C90}", "entry": { "name": "In", @@ -3779,7 +3779,7 @@ ] }, { - "key": "GetSize", + "base": "GetSize", "context": "{F9AFBC85-749B-5A76-8E09-6B734D234C90}", "entry": { "name": "In", @@ -3810,7 +3810,7 @@ ] }, { - "key": "Iterate_VM", + "base": "Iterate_VM", "context": "{F9AFBC85-749B-5A76-8E09-6B734D234C90}", "entry": { "name": "In", @@ -3841,7 +3841,7 @@ ] }, { - "key": "GetKeys", + "base": "GetKeys", "context": "{F9AFBC85-749B-5A76-8E09-6B734D234C90}", "entry": { "name": "In", @@ -3872,7 +3872,7 @@ ] }, { - "key": "Size", + "base": "Size", "context": "{F9AFBC85-749B-5A76-8E09-6B734D234C90}", "entry": { "name": "In", @@ -3903,7 +3903,7 @@ ] }, { - "key": "Erase", + "base": "Erase", "context": "{F9AFBC85-749B-5A76-8E09-6B734D234C90}", "entry": { "name": "In", @@ -3941,7 +3941,7 @@ ] }, { - "key": "EraseCheck_VM", + "base": "EraseCheck_VM", "context": "{F9AFBC85-749B-5A76-8E09-6B734D234C90}", "entry": { "name": "In", @@ -3979,7 +3979,7 @@ ] }, { - "key": "Clear", + "base": "Clear", "context": "{F9AFBC85-749B-5A76-8E09-6B734D234C90}", "entry": { "name": "In", @@ -4010,7 +4010,7 @@ ] }, { - "key": "At", + "base": "At", "context": "{F9AFBC85-749B-5A76-8E09-6B734D234C90}", "entry": { "name": "In", @@ -4048,7 +4048,7 @@ ] }, { - "key": "BucketCount", + "base": "BucketCount", "context": "{F9AFBC85-749B-5A76-8E09-6B734D234C90}", "entry": { "name": "In", @@ -4079,7 +4079,7 @@ ] }, { - "key": "Empty", + "base": "Empty", "context": "{F9AFBC85-749B-5A76-8E09-6B734D234C90}", "entry": { "name": "In", @@ -4110,7 +4110,7 @@ ] }, { - "key": "Swap", + "base": "Swap", "context": "{F9AFBC85-749B-5A76-8E09-6B734D234C90}", "entry": { "name": "In", @@ -4141,7 +4141,7 @@ ] }, { - "key": "{72FD3E42-33B1-5C20-92BE-20031CE205AC}", + "base": "{72FD3E42-33B1-5C20-92BE-20031CE205AC}", "context": "OnDemandReflected", "variant": "", "details": { @@ -4151,7 +4151,7 @@ }, "methods": [ { - "key": "contains", + "base": "contains", "context": "{72FD3E42-33B1-5C20-92BE-20031CE205AC}", "entry": { "name": "In", @@ -4189,7 +4189,7 @@ ] }, { - "key": "Insert", + "base": "Insert", "context": "{72FD3E42-33B1-5C20-92BE-20031CE205AC}", "entry": { "name": "In", @@ -4233,7 +4233,7 @@ ] }, { - "key": "Reserve", + "base": "Reserve", "context": "{72FD3E42-33B1-5C20-92BE-20031CE205AC}", "entry": { "name": "In", @@ -4262,7 +4262,7 @@ ] }, { - "key": "GetSize", + "base": "GetSize", "context": "{72FD3E42-33B1-5C20-92BE-20031CE205AC}", "entry": { "name": "In", @@ -4293,7 +4293,7 @@ ] }, { - "key": "Iterate_VM", + "base": "Iterate_VM", "context": "{72FD3E42-33B1-5C20-92BE-20031CE205AC}", "entry": { "name": "In", @@ -4324,7 +4324,7 @@ ] }, { - "key": "GetKeys", + "base": "GetKeys", "context": "{72FD3E42-33B1-5C20-92BE-20031CE205AC}", "entry": { "name": "In", @@ -4355,7 +4355,7 @@ ] }, { - "key": "Size", + "base": "Size", "context": "{72FD3E42-33B1-5C20-92BE-20031CE205AC}", "entry": { "name": "In", @@ -4386,7 +4386,7 @@ ] }, { - "key": "Erase", + "base": "Erase", "context": "{72FD3E42-33B1-5C20-92BE-20031CE205AC}", "entry": { "name": "In", @@ -4424,7 +4424,7 @@ ] }, { - "key": "EraseCheck_VM", + "base": "EraseCheck_VM", "context": "{72FD3E42-33B1-5C20-92BE-20031CE205AC}", "entry": { "name": "In", @@ -4462,7 +4462,7 @@ ] }, { - "key": "Clear", + "base": "Clear", "context": "{72FD3E42-33B1-5C20-92BE-20031CE205AC}", "entry": { "name": "In", @@ -4493,7 +4493,7 @@ ] }, { - "key": "At", + "base": "At", "context": "{72FD3E42-33B1-5C20-92BE-20031CE205AC}", "entry": { "name": "In", @@ -4531,7 +4531,7 @@ ] }, { - "key": "BucketCount", + "base": "BucketCount", "context": "{72FD3E42-33B1-5C20-92BE-20031CE205AC}", "entry": { "name": "In", @@ -4562,7 +4562,7 @@ ] }, { - "key": "Empty", + "base": "Empty", "context": "{72FD3E42-33B1-5C20-92BE-20031CE205AC}", "entry": { "name": "In", @@ -4593,7 +4593,7 @@ ] }, { - "key": "Swap", + "base": "Swap", "context": "{72FD3E42-33B1-5C20-92BE-20031CE205AC}", "entry": { "name": "In", @@ -4624,7 +4624,7 @@ ] }, { - "key": "{20F3C1D8-E0E1-5211-BE7E-61EF5BD7F5FB}", + "base": "{20F3C1D8-E0E1-5211-BE7E-61EF5BD7F5FB}", "context": "OnDemandReflected", "variant": "", "details": { @@ -4634,7 +4634,7 @@ }, "methods": [ { - "key": "contains", + "base": "contains", "context": "{20F3C1D8-E0E1-5211-BE7E-61EF5BD7F5FB}", "entry": { "name": "In", @@ -4672,7 +4672,7 @@ ] }, { - "key": "Insert", + "base": "Insert", "context": "{20F3C1D8-E0E1-5211-BE7E-61EF5BD7F5FB}", "entry": { "name": "In", @@ -4716,7 +4716,7 @@ ] }, { - "key": "Reserve", + "base": "Reserve", "context": "{20F3C1D8-E0E1-5211-BE7E-61EF5BD7F5FB}", "entry": { "name": "In", @@ -4745,7 +4745,7 @@ ] }, { - "key": "GetSize", + "base": "GetSize", "context": "{20F3C1D8-E0E1-5211-BE7E-61EF5BD7F5FB}", "entry": { "name": "In", @@ -4776,7 +4776,7 @@ ] }, { - "key": "Iterate_VM", + "base": "Iterate_VM", "context": "{20F3C1D8-E0E1-5211-BE7E-61EF5BD7F5FB}", "entry": { "name": "In", @@ -4807,7 +4807,7 @@ ] }, { - "key": "GetKeys", + "base": "GetKeys", "context": "{20F3C1D8-E0E1-5211-BE7E-61EF5BD7F5FB}", "entry": { "name": "In", @@ -4838,7 +4838,7 @@ ] }, { - "key": "Size", + "base": "Size", "context": "{20F3C1D8-E0E1-5211-BE7E-61EF5BD7F5FB}", "entry": { "name": "In", @@ -4869,7 +4869,7 @@ ] }, { - "key": "Erase", + "base": "Erase", "context": "{20F3C1D8-E0E1-5211-BE7E-61EF5BD7F5FB}", "entry": { "name": "In", @@ -4907,7 +4907,7 @@ ] }, { - "key": "EraseCheck_VM", + "base": "EraseCheck_VM", "context": "{20F3C1D8-E0E1-5211-BE7E-61EF5BD7F5FB}", "entry": { "name": "In", @@ -4945,7 +4945,7 @@ ] }, { - "key": "Clear", + "base": "Clear", "context": "{20F3C1D8-E0E1-5211-BE7E-61EF5BD7F5FB}", "entry": { "name": "In", @@ -4976,7 +4976,7 @@ ] }, { - "key": "At", + "base": "At", "context": "{20F3C1D8-E0E1-5211-BE7E-61EF5BD7F5FB}", "entry": { "name": "In", @@ -5014,7 +5014,7 @@ ] }, { - "key": "BucketCount", + "base": "BucketCount", "context": "{20F3C1D8-E0E1-5211-BE7E-61EF5BD7F5FB}", "entry": { "name": "In", @@ -5045,7 +5045,7 @@ ] }, { - "key": "Empty", + "base": "Empty", "context": "{20F3C1D8-E0E1-5211-BE7E-61EF5BD7F5FB}", "entry": { "name": "In", @@ -5076,7 +5076,7 @@ ] }, { - "key": "Swap", + "base": "Swap", "context": "{20F3C1D8-E0E1-5211-BE7E-61EF5BD7F5FB}", "entry": { "name": "In", @@ -5107,7 +5107,7 @@ ] }, { - "key": "{70470FDA-2C2E-549A-A67A-6FA7388FB823}", + "base": "{70470FDA-2C2E-549A-A67A-6FA7388FB823}", "context": "OnDemandReflected", "variant": "", "details": { @@ -5117,7 +5117,7 @@ }, "methods": [ { - "key": "contains", + "base": "contains", "context": "{70470FDA-2C2E-549A-A67A-6FA7388FB823}", "entry": { "name": "In", @@ -5155,7 +5155,7 @@ ] }, { - "key": "Insert", + "base": "Insert", "context": "{70470FDA-2C2E-549A-A67A-6FA7388FB823}", "entry": { "name": "In", @@ -5199,7 +5199,7 @@ ] }, { - "key": "Reserve", + "base": "Reserve", "context": "{70470FDA-2C2E-549A-A67A-6FA7388FB823}", "entry": { "name": "In", @@ -5228,7 +5228,7 @@ ] }, { - "key": "GetSize", + "base": "GetSize", "context": "{70470FDA-2C2E-549A-A67A-6FA7388FB823}", "entry": { "name": "In", @@ -5259,7 +5259,7 @@ ] }, { - "key": "Iterate_VM", + "base": "Iterate_VM", "context": "{70470FDA-2C2E-549A-A67A-6FA7388FB823}", "entry": { "name": "In", @@ -5290,7 +5290,7 @@ ] }, { - "key": "GetKeys", + "base": "GetKeys", "context": "{70470FDA-2C2E-549A-A67A-6FA7388FB823}", "entry": { "name": "In", @@ -5321,7 +5321,7 @@ ] }, { - "key": "Size", + "base": "Size", "context": "{70470FDA-2C2E-549A-A67A-6FA7388FB823}", "entry": { "name": "In", @@ -5352,7 +5352,7 @@ ] }, { - "key": "Erase", + "base": "Erase", "context": "{70470FDA-2C2E-549A-A67A-6FA7388FB823}", "entry": { "name": "In", @@ -5390,7 +5390,7 @@ ] }, { - "key": "EraseCheck_VM", + "base": "EraseCheck_VM", "context": "{70470FDA-2C2E-549A-A67A-6FA7388FB823}", "entry": { "name": "In", @@ -5428,7 +5428,7 @@ ] }, { - "key": "Clear", + "base": "Clear", "context": "{70470FDA-2C2E-549A-A67A-6FA7388FB823}", "entry": { "name": "In", @@ -5459,7 +5459,7 @@ ] }, { - "key": "At", + "base": "At", "context": "{70470FDA-2C2E-549A-A67A-6FA7388FB823}", "entry": { "name": "In", @@ -5497,7 +5497,7 @@ ] }, { - "key": "BucketCount", + "base": "BucketCount", "context": "{70470FDA-2C2E-549A-A67A-6FA7388FB823}", "entry": { "name": "In", @@ -5528,7 +5528,7 @@ ] }, { - "key": "Empty", + "base": "Empty", "context": "{70470FDA-2C2E-549A-A67A-6FA7388FB823}", "entry": { "name": "In", @@ -5559,7 +5559,7 @@ ] }, { - "key": "Swap", + "base": "Swap", "context": "{70470FDA-2C2E-549A-A67A-6FA7388FB823}", "entry": { "name": "In", @@ -5590,7 +5590,7 @@ ] }, { - "key": "{6018488A-73E5-5AE2-ACE7-62DAC3DBECB8}", + "base": "{6018488A-73E5-5AE2-ACE7-62DAC3DBECB8}", "context": "OnDemandReflected", "variant": "", "details": { @@ -5600,7 +5600,7 @@ }, "methods": [ { - "key": "contains", + "base": "contains", "context": "{6018488A-73E5-5AE2-ACE7-62DAC3DBECB8}", "entry": { "name": "In", @@ -5637,7 +5637,7 @@ ] }, { - "key": "Insert", + "base": "Insert", "context": "{6018488A-73E5-5AE2-ACE7-62DAC3DBECB8}", "entry": { "name": "In", @@ -5680,7 +5680,7 @@ ] }, { - "key": "Reserve", + "base": "Reserve", "context": "{6018488A-73E5-5AE2-ACE7-62DAC3DBECB8}", "entry": { "name": "In", @@ -5709,7 +5709,7 @@ ] }, { - "key": "GetSize", + "base": "GetSize", "context": "{6018488A-73E5-5AE2-ACE7-62DAC3DBECB8}", "entry": { "name": "In", @@ -5740,7 +5740,7 @@ ] }, { - "key": "Iterate_VM", + "base": "Iterate_VM", "context": "{6018488A-73E5-5AE2-ACE7-62DAC3DBECB8}", "entry": { "name": "In", @@ -5771,7 +5771,7 @@ ] }, { - "key": "GetKeys", + "base": "GetKeys", "context": "{6018488A-73E5-5AE2-ACE7-62DAC3DBECB8}", "entry": { "name": "In", @@ -5802,7 +5802,7 @@ ] }, { - "key": "Size", + "base": "Size", "context": "{6018488A-73E5-5AE2-ACE7-62DAC3DBECB8}", "entry": { "name": "In", @@ -5833,7 +5833,7 @@ ] }, { - "key": "Erase", + "base": "Erase", "context": "{6018488A-73E5-5AE2-ACE7-62DAC3DBECB8}", "entry": { "name": "In", @@ -5870,7 +5870,7 @@ ] }, { - "key": "EraseCheck_VM", + "base": "EraseCheck_VM", "context": "{6018488A-73E5-5AE2-ACE7-62DAC3DBECB8}", "entry": { "name": "In", @@ -5907,7 +5907,7 @@ ] }, { - "key": "Clear", + "base": "Clear", "context": "{6018488A-73E5-5AE2-ACE7-62DAC3DBECB8}", "entry": { "name": "In", @@ -5938,7 +5938,7 @@ ] }, { - "key": "At", + "base": "At", "context": "{6018488A-73E5-5AE2-ACE7-62DAC3DBECB8}", "entry": { "name": "In", @@ -5975,7 +5975,7 @@ ] }, { - "key": "BucketCount", + "base": "BucketCount", "context": "{6018488A-73E5-5AE2-ACE7-62DAC3DBECB8}", "entry": { "name": "In", @@ -6006,7 +6006,7 @@ ] }, { - "key": "Empty", + "base": "Empty", "context": "{6018488A-73E5-5AE2-ACE7-62DAC3DBECB8}", "entry": { "name": "In", @@ -6037,7 +6037,7 @@ ] }, { - "key": "Swap", + "base": "Swap", "context": "{6018488A-73E5-5AE2-ACE7-62DAC3DBECB8}", "entry": { "name": "In", @@ -6068,7 +6068,7 @@ ] }, { - "key": "{C73A5FA9-295B-57F8-97D0-947B74603D96}", + "base": "{C73A5FA9-295B-57F8-97D0-947B74603D96}", "context": "OnDemandReflected", "variant": "", "details": { @@ -6076,7 +6076,7 @@ }, "methods": [ { - "key": "IsLoading", + "base": "IsLoading", "context": "{C73A5FA9-295B-57F8-97D0-947B74603D96}", "entry": { "name": "In", @@ -6107,7 +6107,7 @@ ] }, { - "key": "GetType", + "base": "GetType", "context": "{C73A5FA9-295B-57F8-97D0-947B74603D96}", "entry": { "name": "In", @@ -6138,7 +6138,7 @@ ] }, { - "key": "IsError", + "base": "IsError", "context": "{C73A5FA9-295B-57F8-97D0-947B74603D96}", "entry": { "name": "In", @@ -6169,7 +6169,7 @@ ] }, { - "key": "GetHint", + "base": "GetHint", "context": "{C73A5FA9-295B-57F8-97D0-947B74603D96}", "entry": { "name": "In", @@ -6200,7 +6200,7 @@ ] }, { - "key": "GetData", + "base": "GetData", "context": "{C73A5FA9-295B-57F8-97D0-947B74603D96}", "entry": { "name": "In", @@ -6231,7 +6231,7 @@ ] }, { - "key": "IsReady", + "base": "IsReady", "context": "{C73A5FA9-295B-57F8-97D0-947B74603D96}", "entry": { "name": "In", @@ -6262,7 +6262,7 @@ ] }, { - "key": "GetStatus", + "base": "GetStatus", "context": "{C73A5FA9-295B-57F8-97D0-947B74603D96}", "entry": { "name": "In", @@ -6293,7 +6293,7 @@ ] }, { - "key": "GetId", + "base": "GetId", "context": "{C73A5FA9-295B-57F8-97D0-947B74603D96}", "entry": { "name": "In", @@ -6326,7 +6326,7 @@ ] }, { - "key": "{EEE66112-B216-51A2-B10A-62F805C1C6F4}", + "base": "{EEE66112-B216-51A2-B10A-62F805C1C6F4}", "context": "OnDemandReflected", "variant": "", "details": { @@ -6336,7 +6336,7 @@ }, "methods": [ { - "key": "contains", + "base": "contains", "context": "{EEE66112-B216-51A2-B10A-62F805C1C6F4}", "entry": { "name": "In", @@ -6373,7 +6373,7 @@ ] }, { - "key": "Insert", + "base": "Insert", "context": "{EEE66112-B216-51A2-B10A-62F805C1C6F4}", "entry": { "name": "In", @@ -6416,7 +6416,7 @@ ] }, { - "key": "Reserve", + "base": "Reserve", "context": "{EEE66112-B216-51A2-B10A-62F805C1C6F4}", "entry": { "name": "In", @@ -6445,7 +6445,7 @@ ] }, { - "key": "GetSize", + "base": "GetSize", "context": "{EEE66112-B216-51A2-B10A-62F805C1C6F4}", "entry": { "name": "In", @@ -6476,7 +6476,7 @@ ] }, { - "key": "Iterate_VM", + "base": "Iterate_VM", "context": "{EEE66112-B216-51A2-B10A-62F805C1C6F4}", "entry": { "name": "In", @@ -6507,7 +6507,7 @@ ] }, { - "key": "GetKeys", + "base": "GetKeys", "context": "{EEE66112-B216-51A2-B10A-62F805C1C6F4}", "entry": { "name": "In", @@ -6538,7 +6538,7 @@ ] }, { - "key": "Size", + "base": "Size", "context": "{EEE66112-B216-51A2-B10A-62F805C1C6F4}", "entry": { "name": "In", @@ -6569,7 +6569,7 @@ ] }, { - "key": "Erase", + "base": "Erase", "context": "{EEE66112-B216-51A2-B10A-62F805C1C6F4}", "entry": { "name": "In", @@ -6606,7 +6606,7 @@ ] }, { - "key": "EraseCheck_VM", + "base": "EraseCheck_VM", "context": "{EEE66112-B216-51A2-B10A-62F805C1C6F4}", "entry": { "name": "In", @@ -6643,7 +6643,7 @@ ] }, { - "key": "Clear", + "base": "Clear", "context": "{EEE66112-B216-51A2-B10A-62F805C1C6F4}", "entry": { "name": "In", @@ -6674,7 +6674,7 @@ ] }, { - "key": "At", + "base": "At", "context": "{EEE66112-B216-51A2-B10A-62F805C1C6F4}", "entry": { "name": "In", @@ -6711,7 +6711,7 @@ ] }, { - "key": "BucketCount", + "base": "BucketCount", "context": "{EEE66112-B216-51A2-B10A-62F805C1C6F4}", "entry": { "name": "In", @@ -6742,7 +6742,7 @@ ] }, { - "key": "Empty", + "base": "Empty", "context": "{EEE66112-B216-51A2-B10A-62F805C1C6F4}", "entry": { "name": "In", @@ -6773,7 +6773,7 @@ ] }, { - "key": "Swap", + "base": "Swap", "context": "{EEE66112-B216-51A2-B10A-62F805C1C6F4}", "entry": { "name": "In", @@ -6804,7 +6804,7 @@ ] }, { - "key": "{428274AA-6C0B-5535-A5BD-E987696ED8E0}", + "base": "{428274AA-6C0B-5535-A5BD-E987696ED8E0}", "context": "OnDemandReflected", "variant": "", "details": { @@ -6812,7 +6812,7 @@ }, "methods": [ { - "key": "Failure", + "base": "Failure", "context": "{428274AA-6C0B-5535-A5BD-E987696ED8E0}", "entry": { "name": "In", @@ -6835,7 +6835,7 @@ ] }, { - "key": "Success", + "base": "Success", "context": "{428274AA-6C0B-5535-A5BD-E987696ED8E0}", "entry": { "name": "In", @@ -6858,7 +6858,7 @@ ] }, { - "key": "IsSuccess", + "base": "IsSuccess", "context": "{428274AA-6C0B-5535-A5BD-E987696ED8E0}", "entry": { "name": "In", @@ -6891,7 +6891,7 @@ ] }, { - "key": "{BFA7A8BD-787E-56C2-96C1-115A572EB249}", + "base": "{BFA7A8BD-787E-56C2-96C1-115A572EB249}", "context": "OnDemandReflected", "variant": "", "details": { @@ -6899,7 +6899,7 @@ }, "methods": [ { - "key": "Get0", + "base": "Get0", "context": "{BFA7A8BD-787E-56C2-96C1-115A572EB249}", "entry": { "name": "In", @@ -6931,7 +6931,7 @@ ] }, { - "key": "Get1", + "base": "Get1", "context": "{BFA7A8BD-787E-56C2-96C1-115A572EB249}", "entry": { "name": "In", @@ -6962,7 +6962,7 @@ ] }, { - "key": "GetSize", + "base": "GetSize", "context": "{BFA7A8BD-787E-56C2-96C1-115A572EB249}", "entry": { "name": "In", @@ -6987,7 +6987,7 @@ ] }, { - "key": "{961EE5AE-685E-5B9E-B3AC-604C5F2F4C1A}", + "base": "{961EE5AE-685E-5B9E-B3AC-604C5F2F4C1A}", "context": "OnDemandReflected", "variant": "", "details": { @@ -6997,7 +6997,7 @@ }, "methods": [ { - "key": "contains", + "base": "contains", "context": "{961EE5AE-685E-5B9E-B3AC-604C5F2F4C1A}", "entry": { "name": "In", @@ -7034,7 +7034,7 @@ ] }, { - "key": "Insert", + "base": "Insert", "context": "{961EE5AE-685E-5B9E-B3AC-604C5F2F4C1A}", "entry": { "name": "In", @@ -7077,7 +7077,7 @@ ] }, { - "key": "Reserve", + "base": "Reserve", "context": "{961EE5AE-685E-5B9E-B3AC-604C5F2F4C1A}", "entry": { "name": "In", @@ -7106,7 +7106,7 @@ ] }, { - "key": "GetSize", + "base": "GetSize", "context": "{961EE5AE-685E-5B9E-B3AC-604C5F2F4C1A}", "entry": { "name": "In", @@ -7137,7 +7137,7 @@ ] }, { - "key": "Iterate_VM", + "base": "Iterate_VM", "context": "{961EE5AE-685E-5B9E-B3AC-604C5F2F4C1A}", "entry": { "name": "In", @@ -7168,7 +7168,7 @@ ] }, { - "key": "GetKeys", + "base": "GetKeys", "context": "{961EE5AE-685E-5B9E-B3AC-604C5F2F4C1A}", "entry": { "name": "In", @@ -7199,7 +7199,7 @@ ] }, { - "key": "Size", + "base": "Size", "context": "{961EE5AE-685E-5B9E-B3AC-604C5F2F4C1A}", "entry": { "name": "In", @@ -7230,7 +7230,7 @@ ] }, { - "key": "Erase", + "base": "Erase", "context": "{961EE5AE-685E-5B9E-B3AC-604C5F2F4C1A}", "entry": { "name": "In", @@ -7267,7 +7267,7 @@ ] }, { - "key": "EraseCheck_VM", + "base": "EraseCheck_VM", "context": "{961EE5AE-685E-5B9E-B3AC-604C5F2F4C1A}", "entry": { "name": "In", @@ -7304,7 +7304,7 @@ ] }, { - "key": "Clear", + "base": "Clear", "context": "{961EE5AE-685E-5B9E-B3AC-604C5F2F4C1A}", "entry": { "name": "In", @@ -7335,7 +7335,7 @@ ] }, { - "key": "At", + "base": "At", "context": "{961EE5AE-685E-5B9E-B3AC-604C5F2F4C1A}", "entry": { "name": "In", @@ -7372,7 +7372,7 @@ ] }, { - "key": "BucketCount", + "base": "BucketCount", "context": "{961EE5AE-685E-5B9E-B3AC-604C5F2F4C1A}", "entry": { "name": "In", @@ -7403,7 +7403,7 @@ ] }, { - "key": "Empty", + "base": "Empty", "context": "{961EE5AE-685E-5B9E-B3AC-604C5F2F4C1A}", "entry": { "name": "In", @@ -7434,7 +7434,7 @@ ] }, { - "key": "Swap", + "base": "Swap", "context": "{961EE5AE-685E-5B9E-B3AC-604C5F2F4C1A}", "entry": { "name": "In", @@ -7465,7 +7465,7 @@ ] }, { - "key": "{87073E82-1470-5DBD-92EB-ED294F351AB6}", + "base": "{87073E82-1470-5DBD-92EB-ED294F351AB6}", "context": "OnDemandReflected", "variant": "", "details": { @@ -7475,7 +7475,7 @@ }, "methods": [ { - "key": "contains", + "base": "contains", "context": "{87073E82-1470-5DBD-92EB-ED294F351AB6}", "entry": { "name": "In", @@ -7513,7 +7513,7 @@ ] }, { - "key": "Insert", + "base": "Insert", "context": "{87073E82-1470-5DBD-92EB-ED294F351AB6}", "entry": { "name": "In", @@ -7557,7 +7557,7 @@ ] }, { - "key": "Reserve", + "base": "Reserve", "context": "{87073E82-1470-5DBD-92EB-ED294F351AB6}", "entry": { "name": "In", @@ -7586,7 +7586,7 @@ ] }, { - "key": "GetSize", + "base": "GetSize", "context": "{87073E82-1470-5DBD-92EB-ED294F351AB6}", "entry": { "name": "In", @@ -7617,7 +7617,7 @@ ] }, { - "key": "Iterate_VM", + "base": "Iterate_VM", "context": "{87073E82-1470-5DBD-92EB-ED294F351AB6}", "entry": { "name": "In", @@ -7648,7 +7648,7 @@ ] }, { - "key": "GetKeys", + "base": "GetKeys", "context": "{87073E82-1470-5DBD-92EB-ED294F351AB6}", "entry": { "name": "In", @@ -7679,7 +7679,7 @@ ] }, { - "key": "Size", + "base": "Size", "context": "{87073E82-1470-5DBD-92EB-ED294F351AB6}", "entry": { "name": "In", @@ -7710,7 +7710,7 @@ ] }, { - "key": "Erase", + "base": "Erase", "context": "{87073E82-1470-5DBD-92EB-ED294F351AB6}", "entry": { "name": "In", @@ -7748,7 +7748,7 @@ ] }, { - "key": "EraseCheck_VM", + "base": "EraseCheck_VM", "context": "{87073E82-1470-5DBD-92EB-ED294F351AB6}", "entry": { "name": "In", @@ -7786,7 +7786,7 @@ ] }, { - "key": "Clear", + "base": "Clear", "context": "{87073E82-1470-5DBD-92EB-ED294F351AB6}", "entry": { "name": "In", @@ -7817,7 +7817,7 @@ ] }, { - "key": "At", + "base": "At", "context": "{87073E82-1470-5DBD-92EB-ED294F351AB6}", "entry": { "name": "In", @@ -7855,7 +7855,7 @@ ] }, { - "key": "BucketCount", + "base": "BucketCount", "context": "{87073E82-1470-5DBD-92EB-ED294F351AB6}", "entry": { "name": "In", @@ -7886,7 +7886,7 @@ ] }, { - "key": "Empty", + "base": "Empty", "context": "{87073E82-1470-5DBD-92EB-ED294F351AB6}", "entry": { "name": "In", @@ -7917,7 +7917,7 @@ ] }, { - "key": "Swap", + "base": "Swap", "context": "{87073E82-1470-5DBD-92EB-ED294F351AB6}", "entry": { "name": "In", @@ -7948,7 +7948,7 @@ ] }, { - "key": "{C8E55ED7-2D57-586D-B8A4-BC3CF9A0883C}", + "base": "{C8E55ED7-2D57-586D-B8A4-BC3CF9A0883C}", "context": "OnDemandReflected", "variant": "", "details": { @@ -7958,7 +7958,7 @@ }, "methods": [ { - "key": "contains", + "base": "contains", "context": "{C8E55ED7-2D57-586D-B8A4-BC3CF9A0883C}", "entry": { "name": "In", @@ -7995,7 +7995,7 @@ ] }, { - "key": "Insert", + "base": "Insert", "context": "{C8E55ED7-2D57-586D-B8A4-BC3CF9A0883C}", "entry": { "name": "In", @@ -8038,7 +8038,7 @@ ] }, { - "key": "Reserve", + "base": "Reserve", "context": "{C8E55ED7-2D57-586D-B8A4-BC3CF9A0883C}", "entry": { "name": "In", @@ -8067,7 +8067,7 @@ ] }, { - "key": "GetSize", + "base": "GetSize", "context": "{C8E55ED7-2D57-586D-B8A4-BC3CF9A0883C}", "entry": { "name": "In", @@ -8098,7 +8098,7 @@ ] }, { - "key": "Iterate_VM", + "base": "Iterate_VM", "context": "{C8E55ED7-2D57-586D-B8A4-BC3CF9A0883C}", "entry": { "name": "In", @@ -8129,7 +8129,7 @@ ] }, { - "key": "GetKeys", + "base": "GetKeys", "context": "{C8E55ED7-2D57-586D-B8A4-BC3CF9A0883C}", "entry": { "name": "In", @@ -8160,7 +8160,7 @@ ] }, { - "key": "Size", + "base": "Size", "context": "{C8E55ED7-2D57-586D-B8A4-BC3CF9A0883C}", "entry": { "name": "In", @@ -8191,7 +8191,7 @@ ] }, { - "key": "Erase", + "base": "Erase", "context": "{C8E55ED7-2D57-586D-B8A4-BC3CF9A0883C}", "entry": { "name": "In", @@ -8228,7 +8228,7 @@ ] }, { - "key": "EraseCheck_VM", + "base": "EraseCheck_VM", "context": "{C8E55ED7-2D57-586D-B8A4-BC3CF9A0883C}", "entry": { "name": "In", @@ -8265,7 +8265,7 @@ ] }, { - "key": "Clear", + "base": "Clear", "context": "{C8E55ED7-2D57-586D-B8A4-BC3CF9A0883C}", "entry": { "name": "In", @@ -8296,7 +8296,7 @@ ] }, { - "key": "At", + "base": "At", "context": "{C8E55ED7-2D57-586D-B8A4-BC3CF9A0883C}", "entry": { "name": "In", @@ -8333,7 +8333,7 @@ ] }, { - "key": "BucketCount", + "base": "BucketCount", "context": "{C8E55ED7-2D57-586D-B8A4-BC3CF9A0883C}", "entry": { "name": "In", @@ -8364,7 +8364,7 @@ ] }, { - "key": "Empty", + "base": "Empty", "context": "{C8E55ED7-2D57-586D-B8A4-BC3CF9A0883C}", "entry": { "name": "In", @@ -8395,7 +8395,7 @@ ] }, { - "key": "Swap", + "base": "Swap", "context": "{C8E55ED7-2D57-586D-B8A4-BC3CF9A0883C}", "entry": { "name": "In", @@ -8426,7 +8426,7 @@ ] }, { - "key": "{52BC39A3-063A-5CD4-99D4-4F018D7784D6}", + "base": "{52BC39A3-063A-5CD4-99D4-4F018D7784D6}", "context": "OnDemandReflected", "variant": "", "details": { @@ -8436,7 +8436,7 @@ }, "methods": [ { - "key": "contains", + "base": "contains", "context": "{52BC39A3-063A-5CD4-99D4-4F018D7784D6}", "entry": { "name": "In", @@ -8473,7 +8473,7 @@ ] }, { - "key": "Insert", + "base": "Insert", "context": "{52BC39A3-063A-5CD4-99D4-4F018D7784D6}", "entry": { "name": "In", @@ -8516,7 +8516,7 @@ ] }, { - "key": "Reserve", + "base": "Reserve", "context": "{52BC39A3-063A-5CD4-99D4-4F018D7784D6}", "entry": { "name": "In", @@ -8545,7 +8545,7 @@ ] }, { - "key": "GetSize", + "base": "GetSize", "context": "{52BC39A3-063A-5CD4-99D4-4F018D7784D6}", "entry": { "name": "In", @@ -8576,7 +8576,7 @@ ] }, { - "key": "Iterate_VM", + "base": "Iterate_VM", "context": "{52BC39A3-063A-5CD4-99D4-4F018D7784D6}", "entry": { "name": "In", @@ -8607,7 +8607,7 @@ ] }, { - "key": "GetKeys", + "base": "GetKeys", "context": "{52BC39A3-063A-5CD4-99D4-4F018D7784D6}", "entry": { "name": "In", @@ -8638,7 +8638,7 @@ ] }, { - "key": "Size", + "base": "Size", "context": "{52BC39A3-063A-5CD4-99D4-4F018D7784D6}", "entry": { "name": "In", @@ -8669,7 +8669,7 @@ ] }, { - "key": "Erase", + "base": "Erase", "context": "{52BC39A3-063A-5CD4-99D4-4F018D7784D6}", "entry": { "name": "In", @@ -8706,7 +8706,7 @@ ] }, { - "key": "EraseCheck_VM", + "base": "EraseCheck_VM", "context": "{52BC39A3-063A-5CD4-99D4-4F018D7784D6}", "entry": { "name": "In", @@ -8743,7 +8743,7 @@ ] }, { - "key": "Clear", + "base": "Clear", "context": "{52BC39A3-063A-5CD4-99D4-4F018D7784D6}", "entry": { "name": "In", @@ -8774,7 +8774,7 @@ ] }, { - "key": "At", + "base": "At", "context": "{52BC39A3-063A-5CD4-99D4-4F018D7784D6}", "entry": { "name": "In", @@ -8811,7 +8811,7 @@ ] }, { - "key": "BucketCount", + "base": "BucketCount", "context": "{52BC39A3-063A-5CD4-99D4-4F018D7784D6}", "entry": { "name": "In", @@ -8842,7 +8842,7 @@ ] }, { - "key": "Empty", + "base": "Empty", "context": "{52BC39A3-063A-5CD4-99D4-4F018D7784D6}", "entry": { "name": "In", @@ -8873,7 +8873,7 @@ ] }, { - "key": "Swap", + "base": "Swap", "context": "{52BC39A3-063A-5CD4-99D4-4F018D7784D6}", "entry": { "name": "In", @@ -8904,7 +8904,7 @@ ] }, { - "key": "{C5BB1B1A-9721-598B-8746-FAAA76B87464}", + "base": "{C5BB1B1A-9721-598B-8746-FAAA76B87464}", "context": "OnDemandReflected", "variant": "", "details": { @@ -8914,7 +8914,7 @@ }, "methods": [ { - "key": "contains", + "base": "contains", "context": "{C5BB1B1A-9721-598B-8746-FAAA76B87464}", "entry": { "name": "In", @@ -8951,7 +8951,7 @@ ] }, { - "key": "Insert", + "base": "Insert", "context": "{C5BB1B1A-9721-598B-8746-FAAA76B87464}", "entry": { "name": "In", @@ -8994,7 +8994,7 @@ ] }, { - "key": "Reserve", + "base": "Reserve", "context": "{C5BB1B1A-9721-598B-8746-FAAA76B87464}", "entry": { "name": "In", @@ -9023,7 +9023,7 @@ ] }, { - "key": "GetSize", + "base": "GetSize", "context": "{C5BB1B1A-9721-598B-8746-FAAA76B87464}", "entry": { "name": "In", @@ -9054,7 +9054,7 @@ ] }, { - "key": "Iterate_VM", + "base": "Iterate_VM", "context": "{C5BB1B1A-9721-598B-8746-FAAA76B87464}", "entry": { "name": "In", @@ -9085,7 +9085,7 @@ ] }, { - "key": "GetKeys", + "base": "GetKeys", "context": "{C5BB1B1A-9721-598B-8746-FAAA76B87464}", "entry": { "name": "In", @@ -9116,7 +9116,7 @@ ] }, { - "key": "Size", + "base": "Size", "context": "{C5BB1B1A-9721-598B-8746-FAAA76B87464}", "entry": { "name": "In", @@ -9147,7 +9147,7 @@ ] }, { - "key": "Erase", + "base": "Erase", "context": "{C5BB1B1A-9721-598B-8746-FAAA76B87464}", "entry": { "name": "In", @@ -9184,7 +9184,7 @@ ] }, { - "key": "EraseCheck_VM", + "base": "EraseCheck_VM", "context": "{C5BB1B1A-9721-598B-8746-FAAA76B87464}", "entry": { "name": "In", @@ -9221,7 +9221,7 @@ ] }, { - "key": "Clear", + "base": "Clear", "context": "{C5BB1B1A-9721-598B-8746-FAAA76B87464}", "entry": { "name": "In", @@ -9252,7 +9252,7 @@ ] }, { - "key": "At", + "base": "At", "context": "{C5BB1B1A-9721-598B-8746-FAAA76B87464}", "entry": { "name": "In", @@ -9289,7 +9289,7 @@ ] }, { - "key": "BucketCount", + "base": "BucketCount", "context": "{C5BB1B1A-9721-598B-8746-FAAA76B87464}", "entry": { "name": "In", @@ -9320,7 +9320,7 @@ ] }, { - "key": "Empty", + "base": "Empty", "context": "{C5BB1B1A-9721-598B-8746-FAAA76B87464}", "entry": { "name": "In", @@ -9351,7 +9351,7 @@ ] }, { - "key": "Swap", + "base": "Swap", "context": "{C5BB1B1A-9721-598B-8746-FAAA76B87464}", "entry": { "name": "In", @@ -9382,7 +9382,7 @@ ] }, { - "key": "{E13859C4-1F24-5C44-A133-F17B4B050D7C}", + "base": "{E13859C4-1F24-5C44-A133-F17B4B050D7C}", "context": "OnDemandReflected", "variant": "", "details": { @@ -9392,7 +9392,7 @@ }, "methods": [ { - "key": "get", + "base": "get", "context": "{E13859C4-1F24-5C44-A133-F17B4B050D7C}", "entry": { "name": "In", @@ -9426,7 +9426,7 @@ ] }, { - "key": "{DC13DC44-BB50-5CCB-985E-C611AE891575}", + "base": "{DC13DC44-BB50-5CCB-985E-C611AE891575}", "context": "OnDemandReflected", "variant": "", "details": { @@ -9436,7 +9436,7 @@ }, "methods": [ { - "key": "contains", + "base": "contains", "context": "{DC13DC44-BB50-5CCB-985E-C611AE891575}", "entry": { "name": "In", @@ -9473,7 +9473,7 @@ ] }, { - "key": "Insert", + "base": "Insert", "context": "{DC13DC44-BB50-5CCB-985E-C611AE891575}", "entry": { "name": "In", @@ -9516,7 +9516,7 @@ ] }, { - "key": "Reserve", + "base": "Reserve", "context": "{DC13DC44-BB50-5CCB-985E-C611AE891575}", "entry": { "name": "In", @@ -9545,7 +9545,7 @@ ] }, { - "key": "GetSize", + "base": "GetSize", "context": "{DC13DC44-BB50-5CCB-985E-C611AE891575}", "entry": { "name": "In", @@ -9576,7 +9576,7 @@ ] }, { - "key": "Iterate_VM", + "base": "Iterate_VM", "context": "{DC13DC44-BB50-5CCB-985E-C611AE891575}", "entry": { "name": "In", @@ -9607,7 +9607,7 @@ ] }, { - "key": "GetKeys", + "base": "GetKeys", "context": "{DC13DC44-BB50-5CCB-985E-C611AE891575}", "entry": { "name": "In", @@ -9638,7 +9638,7 @@ ] }, { - "key": "Size", + "base": "Size", "context": "{DC13DC44-BB50-5CCB-985E-C611AE891575}", "entry": { "name": "In", @@ -9669,7 +9669,7 @@ ] }, { - "key": "Erase", + "base": "Erase", "context": "{DC13DC44-BB50-5CCB-985E-C611AE891575}", "entry": { "name": "In", @@ -9706,7 +9706,7 @@ ] }, { - "key": "EraseCheck_VM", + "base": "EraseCheck_VM", "context": "{DC13DC44-BB50-5CCB-985E-C611AE891575}", "entry": { "name": "In", @@ -9743,7 +9743,7 @@ ] }, { - "key": "Clear", + "base": "Clear", "context": "{DC13DC44-BB50-5CCB-985E-C611AE891575}", "entry": { "name": "In", @@ -9774,7 +9774,7 @@ ] }, { - "key": "At", + "base": "At", "context": "{DC13DC44-BB50-5CCB-985E-C611AE891575}", "entry": { "name": "In", @@ -9811,7 +9811,7 @@ ] }, { - "key": "BucketCount", + "base": "BucketCount", "context": "{DC13DC44-BB50-5CCB-985E-C611AE891575}", "entry": { "name": "In", @@ -9842,7 +9842,7 @@ ] }, { - "key": "Empty", + "base": "Empty", "context": "{DC13DC44-BB50-5CCB-985E-C611AE891575}", "entry": { "name": "In", @@ -9873,7 +9873,7 @@ ] }, { - "key": "Swap", + "base": "Swap", "context": "{DC13DC44-BB50-5CCB-985E-C611AE891575}", "entry": { "name": "In", @@ -9904,7 +9904,7 @@ ] }, { - "key": "{805FA2E4-1874-5919-A853-4EF984E5A82A}", + "base": "{805FA2E4-1874-5919-A853-4EF984E5A82A}", "context": "OnDemandReflected", "variant": "", "details": { @@ -9914,7 +9914,7 @@ }, "methods": [ { - "key": "contains", + "base": "contains", "context": "{805FA2E4-1874-5919-A853-4EF984E5A82A}", "entry": { "name": "In", @@ -9951,7 +9951,7 @@ ] }, { - "key": "Insert", + "base": "Insert", "context": "{805FA2E4-1874-5919-A853-4EF984E5A82A}", "entry": { "name": "In", @@ -9995,7 +9995,7 @@ ] }, { - "key": "Reserve", + "base": "Reserve", "context": "{805FA2E4-1874-5919-A853-4EF984E5A82A}", "entry": { "name": "In", @@ -10024,7 +10024,7 @@ ] }, { - "key": "GetSize", + "base": "GetSize", "context": "{805FA2E4-1874-5919-A853-4EF984E5A82A}", "entry": { "name": "In", @@ -10055,7 +10055,7 @@ ] }, { - "key": "Iterate_VM", + "base": "Iterate_VM", "context": "{805FA2E4-1874-5919-A853-4EF984E5A82A}", "entry": { "name": "In", @@ -10086,7 +10086,7 @@ ] }, { - "key": "GetKeys", + "base": "GetKeys", "context": "{805FA2E4-1874-5919-A853-4EF984E5A82A}", "entry": { "name": "In", @@ -10117,7 +10117,7 @@ ] }, { - "key": "Size", + "base": "Size", "context": "{805FA2E4-1874-5919-A853-4EF984E5A82A}", "entry": { "name": "In", @@ -10148,7 +10148,7 @@ ] }, { - "key": "Erase", + "base": "Erase", "context": "{805FA2E4-1874-5919-A853-4EF984E5A82A}", "entry": { "name": "In", @@ -10185,7 +10185,7 @@ ] }, { - "key": "EraseCheck_VM", + "base": "EraseCheck_VM", "context": "{805FA2E4-1874-5919-A853-4EF984E5A82A}", "entry": { "name": "In", @@ -10222,7 +10222,7 @@ ] }, { - "key": "Clear", + "base": "Clear", "context": "{805FA2E4-1874-5919-A853-4EF984E5A82A}", "entry": { "name": "In", @@ -10253,7 +10253,7 @@ ] }, { - "key": "At", + "base": "At", "context": "{805FA2E4-1874-5919-A853-4EF984E5A82A}", "entry": { "name": "In", @@ -10291,7 +10291,7 @@ ] }, { - "key": "BucketCount", + "base": "BucketCount", "context": "{805FA2E4-1874-5919-A853-4EF984E5A82A}", "entry": { "name": "In", @@ -10322,7 +10322,7 @@ ] }, { - "key": "Empty", + "base": "Empty", "context": "{805FA2E4-1874-5919-A853-4EF984E5A82A}", "entry": { "name": "In", @@ -10353,7 +10353,7 @@ ] }, { - "key": "Swap", + "base": "Swap", "context": "{805FA2E4-1874-5919-A853-4EF984E5A82A}", "entry": { "name": "In", @@ -10384,7 +10384,7 @@ ] }, { - "key": "{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}", + "base": "{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}", "context": "OnDemandReflected", "variant": "", "details": { @@ -10392,7 +10392,7 @@ } }, { - "key": "{C7790D21-4BE7-5C18-A60D-01FCFE4E7E7A}", + "base": "{C7790D21-4BE7-5C18-A60D-01FCFE4E7E7A}", "context": "OnDemandReflected", "variant": "", "details": { @@ -10402,7 +10402,7 @@ }, "methods": [ { - "key": "contains", + "base": "contains", "context": "{C7790D21-4BE7-5C18-A60D-01FCFE4E7E7A}", "entry": { "name": "In", @@ -10439,7 +10439,7 @@ ] }, { - "key": "Insert", + "base": "Insert", "context": "{C7790D21-4BE7-5C18-A60D-01FCFE4E7E7A}", "entry": { "name": "In", @@ -10482,7 +10482,7 @@ ] }, { - "key": "Reserve", + "base": "Reserve", "context": "{C7790D21-4BE7-5C18-A60D-01FCFE4E7E7A}", "entry": { "name": "In", @@ -10511,7 +10511,7 @@ ] }, { - "key": "GetSize", + "base": "GetSize", "context": "{C7790D21-4BE7-5C18-A60D-01FCFE4E7E7A}", "entry": { "name": "In", @@ -10542,7 +10542,7 @@ ] }, { - "key": "Iterate_VM", + "base": "Iterate_VM", "context": "{C7790D21-4BE7-5C18-A60D-01FCFE4E7E7A}", "entry": { "name": "In", @@ -10573,7 +10573,7 @@ ] }, { - "key": "GetKeys", + "base": "GetKeys", "context": "{C7790D21-4BE7-5C18-A60D-01FCFE4E7E7A}", "entry": { "name": "In", @@ -10604,7 +10604,7 @@ ] }, { - "key": "Size", + "base": "Size", "context": "{C7790D21-4BE7-5C18-A60D-01FCFE4E7E7A}", "entry": { "name": "In", @@ -10635,7 +10635,7 @@ ] }, { - "key": "Erase", + "base": "Erase", "context": "{C7790D21-4BE7-5C18-A60D-01FCFE4E7E7A}", "entry": { "name": "In", @@ -10672,7 +10672,7 @@ ] }, { - "key": "EraseCheck_VM", + "base": "EraseCheck_VM", "context": "{C7790D21-4BE7-5C18-A60D-01FCFE4E7E7A}", "entry": { "name": "In", @@ -10709,7 +10709,7 @@ ] }, { - "key": "Clear", + "base": "Clear", "context": "{C7790D21-4BE7-5C18-A60D-01FCFE4E7E7A}", "entry": { "name": "In", @@ -10740,7 +10740,7 @@ ] }, { - "key": "At", + "base": "At", "context": "{C7790D21-4BE7-5C18-A60D-01FCFE4E7E7A}", "entry": { "name": "In", @@ -10777,7 +10777,7 @@ ] }, { - "key": "BucketCount", + "base": "BucketCount", "context": "{C7790D21-4BE7-5C18-A60D-01FCFE4E7E7A}", "entry": { "name": "In", @@ -10808,7 +10808,7 @@ ] }, { - "key": "Empty", + "base": "Empty", "context": "{C7790D21-4BE7-5C18-A60D-01FCFE4E7E7A}", "entry": { "name": "In", @@ -10839,7 +10839,7 @@ ] }, { - "key": "Swap", + "base": "Swap", "context": "{C7790D21-4BE7-5C18-A60D-01FCFE4E7E7A}", "entry": { "name": "In", @@ -10870,7 +10870,7 @@ ] }, { - "key": "{1945B931-EBAA-5765-9C6C-265596AF68D5}", + "base": "{1945B931-EBAA-5765-9C6C-265596AF68D5}", "context": "OnDemandReflected", "variant": "", "details": { @@ -10880,7 +10880,7 @@ }, "methods": [ { - "key": "Size", + "base": "Size", "context": "{1945B931-EBAA-5765-9C6C-265596AF68D5}", "entry": { "name": "In", @@ -10911,7 +10911,7 @@ ] }, { - "key": "Front", + "base": "Front", "context": "{1945B931-EBAA-5765-9C6C-265596AF68D5}", "entry": { "name": "In", @@ -10942,7 +10942,7 @@ ] }, { - "key": "HasKey", + "base": "HasKey", "context": "{1945B931-EBAA-5765-9C6C-265596AF68D5}", "entry": { "name": "In", @@ -10979,7 +10979,7 @@ ] }, { - "key": "Resize", + "base": "Resize", "context": "{1945B931-EBAA-5765-9C6C-265596AF68D5}", "entry": { "name": "In", @@ -11008,7 +11008,7 @@ ] }, { - "key": "at", + "base": "at", "context": "{1945B931-EBAA-5765-9C6C-265596AF68D5}", "entry": { "name": "In", @@ -11045,7 +11045,7 @@ ] }, { - "key": "Back", + "base": "Back", "context": "{1945B931-EBAA-5765-9C6C-265596AF68D5}", "entry": { "name": "In", @@ -11076,7 +11076,7 @@ ] }, { - "key": "pop_back", + "base": "pop_back", "context": "{1945B931-EBAA-5765-9C6C-265596AF68D5}", "entry": { "name": "In", @@ -11099,7 +11099,7 @@ ] }, { - "key": "size", + "base": "size", "context": "{1945B931-EBAA-5765-9C6C-265596AF68D5}", "entry": { "name": "In", @@ -11130,7 +11130,7 @@ ] }, { - "key": "At", + "base": "At", "context": "{1945B931-EBAA-5765-9C6C-265596AF68D5}", "entry": { "name": "In", @@ -11167,7 +11167,7 @@ ] }, { - "key": "Empty", + "base": "Empty", "context": "{1945B931-EBAA-5765-9C6C-265596AF68D5}", "entry": { "name": "In", @@ -11198,7 +11198,7 @@ ] }, { - "key": "Swap", + "base": "Swap", "context": "{1945B931-EBAA-5765-9C6C-265596AF68D5}", "entry": { "name": "In", @@ -11227,7 +11227,7 @@ ] }, { - "key": "push_back", + "base": "push_back", "context": "{1945B931-EBAA-5765-9C6C-265596AF68D5}", "entry": { "name": "In", @@ -11256,7 +11256,7 @@ ] }, { - "key": "PushBack_VM", + "base": "PushBack_VM", "context": "{1945B931-EBAA-5765-9C6C-265596AF68D5}", "entry": { "name": "In", @@ -11293,7 +11293,7 @@ ] }, { - "key": "AtUnchecked", + "base": "AtUnchecked", "context": "{1945B931-EBAA-5765-9C6C-265596AF68D5}", "entry": { "name": "In", @@ -11330,7 +11330,7 @@ ] }, { - "key": "clear", + "base": "clear", "context": "{1945B931-EBAA-5765-9C6C-265596AF68D5}", "entry": { "name": "In", @@ -11353,7 +11353,7 @@ ] }, { - "key": "NotEmpty", + "base": "NotEmpty", "context": "{1945B931-EBAA-5765-9C6C-265596AF68D5}", "entry": { "name": "In", @@ -11384,7 +11384,7 @@ ] }, { - "key": "Erase_VM", + "base": "Erase_VM", "context": "{1945B931-EBAA-5765-9C6C-265596AF68D5}", "entry": { "name": "In", @@ -11421,7 +11421,7 @@ ] }, { - "key": "EraseCheck_VM", + "base": "EraseCheck_VM", "context": "{1945B931-EBAA-5765-9C6C-265596AF68D5}", "entry": { "name": "In", @@ -11458,7 +11458,7 @@ ] }, { - "key": "Capacity", + "base": "Capacity", "context": "{1945B931-EBAA-5765-9C6C-265596AF68D5}", "entry": { "name": "In", @@ -11489,7 +11489,7 @@ ] }, { - "key": "Clear", + "base": "Clear", "context": "{1945B931-EBAA-5765-9C6C-265596AF68D5}", "entry": { "name": "In", @@ -11520,7 +11520,7 @@ ] }, { - "key": "AssignAt", + "base": "AssignAt", "context": "{1945B931-EBAA-5765-9C6C-265596AF68D5}", "entry": { "name": "In", @@ -11555,7 +11555,7 @@ ] }, { - "key": "GetSize", + "base": "GetSize", "context": "{1945B931-EBAA-5765-9C6C-265596AF68D5}", "entry": { "name": "In", @@ -11586,7 +11586,7 @@ ] }, { - "key": "Insert", + "base": "Insert", "context": "{1945B931-EBAA-5765-9C6C-265596AF68D5}", "entry": { "name": "In", @@ -11629,7 +11629,7 @@ ] }, { - "key": "PushBack", + "base": "PushBack", "context": "{1945B931-EBAA-5765-9C6C-265596AF68D5}", "entry": { "name": "In", @@ -11658,7 +11658,7 @@ ] }, { - "key": "Reserve", + "base": "Reserve", "context": "{1945B931-EBAA-5765-9C6C-265596AF68D5}", "entry": { "name": "In", @@ -11687,7 +11687,7 @@ ] }, { - "key": "Iterate_VM", + "base": "Iterate_VM", "context": "{1945B931-EBAA-5765-9C6C-265596AF68D5}", "entry": { "name": "In", @@ -11720,7 +11720,7 @@ ] }, { - "key": "{877C4A33-39B5-51D7-948D-F97DB81372A1}", + "base": "{877C4A33-39B5-51D7-948D-F97DB81372A1}", "context": "OnDemandReflected", "variant": "", "details": { @@ -11730,7 +11730,7 @@ }, "methods": [ { - "key": "Size", + "base": "Size", "context": "{877C4A33-39B5-51D7-948D-F97DB81372A1}", "entry": { "name": "In", @@ -11761,7 +11761,7 @@ ] }, { - "key": "Front", + "base": "Front", "context": "{877C4A33-39B5-51D7-948D-F97DB81372A1}", "entry": { "name": "In", @@ -11792,7 +11792,7 @@ ] }, { - "key": "HasKey", + "base": "HasKey", "context": "{877C4A33-39B5-51D7-948D-F97DB81372A1}", "entry": { "name": "In", @@ -11829,7 +11829,7 @@ ] }, { - "key": "Resize", + "base": "Resize", "context": "{877C4A33-39B5-51D7-948D-F97DB81372A1}", "entry": { "name": "In", @@ -11858,7 +11858,7 @@ ] }, { - "key": "at", + "base": "at", "context": "{877C4A33-39B5-51D7-948D-F97DB81372A1}", "entry": { "name": "In", @@ -11895,7 +11895,7 @@ ] }, { - "key": "Back", + "base": "Back", "context": "{877C4A33-39B5-51D7-948D-F97DB81372A1}", "entry": { "name": "In", @@ -11926,7 +11926,7 @@ ] }, { - "key": "pop_back", + "base": "pop_back", "context": "{877C4A33-39B5-51D7-948D-F97DB81372A1}", "entry": { "name": "In", @@ -11949,7 +11949,7 @@ ] }, { - "key": "size", + "base": "size", "context": "{877C4A33-39B5-51D7-948D-F97DB81372A1}", "entry": { "name": "In", @@ -11980,7 +11980,7 @@ ] }, { - "key": "At", + "base": "At", "context": "{877C4A33-39B5-51D7-948D-F97DB81372A1}", "entry": { "name": "In", @@ -12017,7 +12017,7 @@ ] }, { - "key": "Empty", + "base": "Empty", "context": "{877C4A33-39B5-51D7-948D-F97DB81372A1}", "entry": { "name": "In", @@ -12048,7 +12048,7 @@ ] }, { - "key": "Swap", + "base": "Swap", "context": "{877C4A33-39B5-51D7-948D-F97DB81372A1}", "entry": { "name": "In", @@ -12077,7 +12077,7 @@ ] }, { - "key": "push_back", + "base": "push_back", "context": "{877C4A33-39B5-51D7-948D-F97DB81372A1}", "entry": { "name": "In", @@ -12106,7 +12106,7 @@ ] }, { - "key": "PushBack_VM", + "base": "PushBack_VM", "context": "{877C4A33-39B5-51D7-948D-F97DB81372A1}", "entry": { "name": "In", @@ -12143,7 +12143,7 @@ ] }, { - "key": "AtUnchecked", + "base": "AtUnchecked", "context": "{877C4A33-39B5-51D7-948D-F97DB81372A1}", "entry": { "name": "In", @@ -12180,7 +12180,7 @@ ] }, { - "key": "clear", + "base": "clear", "context": "{877C4A33-39B5-51D7-948D-F97DB81372A1}", "entry": { "name": "In", @@ -12203,7 +12203,7 @@ ] }, { - "key": "NotEmpty", + "base": "NotEmpty", "context": "{877C4A33-39B5-51D7-948D-F97DB81372A1}", "entry": { "name": "In", @@ -12234,7 +12234,7 @@ ] }, { - "key": "Erase_VM", + "base": "Erase_VM", "context": "{877C4A33-39B5-51D7-948D-F97DB81372A1}", "entry": { "name": "In", @@ -12271,7 +12271,7 @@ ] }, { - "key": "EraseCheck_VM", + "base": "EraseCheck_VM", "context": "{877C4A33-39B5-51D7-948D-F97DB81372A1}", "entry": { "name": "In", @@ -12308,7 +12308,7 @@ ] }, { - "key": "Capacity", + "base": "Capacity", "context": "{877C4A33-39B5-51D7-948D-F97DB81372A1}", "entry": { "name": "In", @@ -12339,7 +12339,7 @@ ] }, { - "key": "Clear", + "base": "Clear", "context": "{877C4A33-39B5-51D7-948D-F97DB81372A1}", "entry": { "name": "In", @@ -12370,7 +12370,7 @@ ] }, { - "key": "AssignAt", + "base": "AssignAt", "context": "{877C4A33-39B5-51D7-948D-F97DB81372A1}", "entry": { "name": "In", @@ -12405,7 +12405,7 @@ ] }, { - "key": "GetSize", + "base": "GetSize", "context": "{877C4A33-39B5-51D7-948D-F97DB81372A1}", "entry": { "name": "In", @@ -12436,7 +12436,7 @@ ] }, { - "key": "Insert", + "base": "Insert", "context": "{877C4A33-39B5-51D7-948D-F97DB81372A1}", "entry": { "name": "In", @@ -12479,7 +12479,7 @@ ] }, { - "key": "PushBack", + "base": "PushBack", "context": "{877C4A33-39B5-51D7-948D-F97DB81372A1}", "entry": { "name": "In", @@ -12508,7 +12508,7 @@ ] }, { - "key": "Reserve", + "base": "Reserve", "context": "{877C4A33-39B5-51D7-948D-F97DB81372A1}", "entry": { "name": "In", @@ -12537,7 +12537,7 @@ ] }, { - "key": "Iterate_VM", + "base": "Iterate_VM", "context": "{877C4A33-39B5-51D7-948D-F97DB81372A1}", "entry": { "name": "In", @@ -12570,7 +12570,7 @@ ] }, { - "key": "{E7E44B3A-15C3-5420-A930-EB9ED7F0D7D9}", + "base": "{E7E44B3A-15C3-5420-A930-EB9ED7F0D7D9}", "context": "OnDemandReflected", "variant": "", "details": { @@ -12580,7 +12580,7 @@ }, "methods": [ { - "key": "Size", + "base": "Size", "context": "{E7E44B3A-15C3-5420-A930-EB9ED7F0D7D9}", "entry": { "name": "In", @@ -12611,7 +12611,7 @@ ] }, { - "key": "Front", + "base": "Front", "context": "{E7E44B3A-15C3-5420-A930-EB9ED7F0D7D9}", "entry": { "name": "In", @@ -12642,7 +12642,7 @@ ] }, { - "key": "HasKey", + "base": "HasKey", "context": "{E7E44B3A-15C3-5420-A930-EB9ED7F0D7D9}", "entry": { "name": "In", @@ -12679,7 +12679,7 @@ ] }, { - "key": "Resize", + "base": "Resize", "context": "{E7E44B3A-15C3-5420-A930-EB9ED7F0D7D9}", "entry": { "name": "In", @@ -12708,7 +12708,7 @@ ] }, { - "key": "at", + "base": "at", "context": "{E7E44B3A-15C3-5420-A930-EB9ED7F0D7D9}", "entry": { "name": "In", @@ -12745,7 +12745,7 @@ ] }, { - "key": "Back", + "base": "Back", "context": "{E7E44B3A-15C3-5420-A930-EB9ED7F0D7D9}", "entry": { "name": "In", @@ -12776,7 +12776,7 @@ ] }, { - "key": "pop_back", + "base": "pop_back", "context": "{E7E44B3A-15C3-5420-A930-EB9ED7F0D7D9}", "entry": { "name": "In", @@ -12799,7 +12799,7 @@ ] }, { - "key": "size", + "base": "size", "context": "{E7E44B3A-15C3-5420-A930-EB9ED7F0D7D9}", "entry": { "name": "In", @@ -12830,7 +12830,7 @@ ] }, { - "key": "At", + "base": "At", "context": "{E7E44B3A-15C3-5420-A930-EB9ED7F0D7D9}", "entry": { "name": "In", @@ -12867,7 +12867,7 @@ ] }, { - "key": "Empty", + "base": "Empty", "context": "{E7E44B3A-15C3-5420-A930-EB9ED7F0D7D9}", "entry": { "name": "In", @@ -12898,7 +12898,7 @@ ] }, { - "key": "Swap", + "base": "Swap", "context": "{E7E44B3A-15C3-5420-A930-EB9ED7F0D7D9}", "entry": { "name": "In", @@ -12927,7 +12927,7 @@ ] }, { - "key": "push_back", + "base": "push_back", "context": "{E7E44B3A-15C3-5420-A930-EB9ED7F0D7D9}", "entry": { "name": "In", @@ -12956,7 +12956,7 @@ ] }, { - "key": "PushBack_VM", + "base": "PushBack_VM", "context": "{E7E44B3A-15C3-5420-A930-EB9ED7F0D7D9}", "entry": { "name": "In", @@ -12993,7 +12993,7 @@ ] }, { - "key": "AtUnchecked", + "base": "AtUnchecked", "context": "{E7E44B3A-15C3-5420-A930-EB9ED7F0D7D9}", "entry": { "name": "In", @@ -13030,7 +13030,7 @@ ] }, { - "key": "clear", + "base": "clear", "context": "{E7E44B3A-15C3-5420-A930-EB9ED7F0D7D9}", "entry": { "name": "In", @@ -13053,7 +13053,7 @@ ] }, { - "key": "NotEmpty", + "base": "NotEmpty", "context": "{E7E44B3A-15C3-5420-A930-EB9ED7F0D7D9}", "entry": { "name": "In", @@ -13084,7 +13084,7 @@ ] }, { - "key": "Erase_VM", + "base": "Erase_VM", "context": "{E7E44B3A-15C3-5420-A930-EB9ED7F0D7D9}", "entry": { "name": "In", @@ -13121,7 +13121,7 @@ ] }, { - "key": "EraseCheck_VM", + "base": "EraseCheck_VM", "context": "{E7E44B3A-15C3-5420-A930-EB9ED7F0D7D9}", "entry": { "name": "In", @@ -13158,7 +13158,7 @@ ] }, { - "key": "Capacity", + "base": "Capacity", "context": "{E7E44B3A-15C3-5420-A930-EB9ED7F0D7D9}", "entry": { "name": "In", @@ -13189,7 +13189,7 @@ ] }, { - "key": "Clear", + "base": "Clear", "context": "{E7E44B3A-15C3-5420-A930-EB9ED7F0D7D9}", "entry": { "name": "In", @@ -13220,7 +13220,7 @@ ] }, { - "key": "AssignAt", + "base": "AssignAt", "context": "{E7E44B3A-15C3-5420-A930-EB9ED7F0D7D9}", "entry": { "name": "In", @@ -13255,7 +13255,7 @@ ] }, { - "key": "GetSize", + "base": "GetSize", "context": "{E7E44B3A-15C3-5420-A930-EB9ED7F0D7D9}", "entry": { "name": "In", @@ -13286,7 +13286,7 @@ ] }, { - "key": "Insert", + "base": "Insert", "context": "{E7E44B3A-15C3-5420-A930-EB9ED7F0D7D9}", "entry": { "name": "In", @@ -13329,7 +13329,7 @@ ] }, { - "key": "PushBack", + "base": "PushBack", "context": "{E7E44B3A-15C3-5420-A930-EB9ED7F0D7D9}", "entry": { "name": "In", @@ -13358,7 +13358,7 @@ ] }, { - "key": "Reserve", + "base": "Reserve", "context": "{E7E44B3A-15C3-5420-A930-EB9ED7F0D7D9}", "entry": { "name": "In", @@ -13387,7 +13387,7 @@ ] }, { - "key": "Iterate_VM", + "base": "Iterate_VM", "context": "{E7E44B3A-15C3-5420-A930-EB9ED7F0D7D9}", "entry": { "name": "In", @@ -13420,7 +13420,7 @@ ] }, { - "key": "{9CA976B9-C166-5C5A-B544-746A06B9F534}", + "base": "{9CA976B9-C166-5C5A-B544-746A06B9F534}", "context": "OnDemandReflected", "variant": "", "details": { @@ -13430,7 +13430,7 @@ }, "methods": [ { - "key": "contains", + "base": "contains", "context": "{9CA976B9-C166-5C5A-B544-746A06B9F534}", "entry": { "name": "In", @@ -13467,7 +13467,7 @@ ] }, { - "key": "Insert", + "base": "Insert", "context": "{9CA976B9-C166-5C5A-B544-746A06B9F534}", "entry": { "name": "In", @@ -13510,7 +13510,7 @@ ] }, { - "key": "Reserve", + "base": "Reserve", "context": "{9CA976B9-C166-5C5A-B544-746A06B9F534}", "entry": { "name": "In", @@ -13539,7 +13539,7 @@ ] }, { - "key": "GetSize", + "base": "GetSize", "context": "{9CA976B9-C166-5C5A-B544-746A06B9F534}", "entry": { "name": "In", @@ -13570,7 +13570,7 @@ ] }, { - "key": "Iterate_VM", + "base": "Iterate_VM", "context": "{9CA976B9-C166-5C5A-B544-746A06B9F534}", "entry": { "name": "In", @@ -13601,7 +13601,7 @@ ] }, { - "key": "GetKeys", + "base": "GetKeys", "context": "{9CA976B9-C166-5C5A-B544-746A06B9F534}", "entry": { "name": "In", @@ -13632,7 +13632,7 @@ ] }, { - "key": "Size", + "base": "Size", "context": "{9CA976B9-C166-5C5A-B544-746A06B9F534}", "entry": { "name": "In", @@ -13663,7 +13663,7 @@ ] }, { - "key": "Erase", + "base": "Erase", "context": "{9CA976B9-C166-5C5A-B544-746A06B9F534}", "entry": { "name": "In", @@ -13700,7 +13700,7 @@ ] }, { - "key": "EraseCheck_VM", + "base": "EraseCheck_VM", "context": "{9CA976B9-C166-5C5A-B544-746A06B9F534}", "entry": { "name": "In", @@ -13737,7 +13737,7 @@ ] }, { - "key": "Clear", + "base": "Clear", "context": "{9CA976B9-C166-5C5A-B544-746A06B9F534}", "entry": { "name": "In", @@ -13768,7 +13768,7 @@ ] }, { - "key": "At", + "base": "At", "context": "{9CA976B9-C166-5C5A-B544-746A06B9F534}", "entry": { "name": "In", @@ -13805,7 +13805,7 @@ ] }, { - "key": "BucketCount", + "base": "BucketCount", "context": "{9CA976B9-C166-5C5A-B544-746A06B9F534}", "entry": { "name": "In", @@ -13836,7 +13836,7 @@ ] }, { - "key": "Empty", + "base": "Empty", "context": "{9CA976B9-C166-5C5A-B544-746A06B9F534}", "entry": { "name": "In", @@ -13867,7 +13867,7 @@ ] }, { - "key": "Swap", + "base": "Swap", "context": "{9CA976B9-C166-5C5A-B544-746A06B9F534}", "entry": { "name": "In", @@ -13898,7 +13898,7 @@ ] }, { - "key": "{B7CEA1B1-C931-5566-AECA-B8AF02138CAA}", + "base": "{B7CEA1B1-C931-5566-AECA-B8AF02138CAA}", "context": "OnDemandReflected", "variant": "", "details": { @@ -13908,7 +13908,7 @@ }, "methods": [ { - "key": "contains", + "base": "contains", "context": "{B7CEA1B1-C931-5566-AECA-B8AF02138CAA}", "entry": { "name": "In", @@ -13945,7 +13945,7 @@ ] }, { - "key": "Insert", + "base": "Insert", "context": "{B7CEA1B1-C931-5566-AECA-B8AF02138CAA}", "entry": { "name": "In", @@ -13989,7 +13989,7 @@ ] }, { - "key": "Reserve", + "base": "Reserve", "context": "{B7CEA1B1-C931-5566-AECA-B8AF02138CAA}", "entry": { "name": "In", @@ -14018,7 +14018,7 @@ ] }, { - "key": "GetSize", + "base": "GetSize", "context": "{B7CEA1B1-C931-5566-AECA-B8AF02138CAA}", "entry": { "name": "In", @@ -14049,7 +14049,7 @@ ] }, { - "key": "Iterate_VM", + "base": "Iterate_VM", "context": "{B7CEA1B1-C931-5566-AECA-B8AF02138CAA}", "entry": { "name": "In", @@ -14080,7 +14080,7 @@ ] }, { - "key": "GetKeys", + "base": "GetKeys", "context": "{B7CEA1B1-C931-5566-AECA-B8AF02138CAA}", "entry": { "name": "In", @@ -14111,7 +14111,7 @@ ] }, { - "key": "Size", + "base": "Size", "context": "{B7CEA1B1-C931-5566-AECA-B8AF02138CAA}", "entry": { "name": "In", @@ -14142,7 +14142,7 @@ ] }, { - "key": "Erase", + "base": "Erase", "context": "{B7CEA1B1-C931-5566-AECA-B8AF02138CAA}", "entry": { "name": "In", @@ -14179,7 +14179,7 @@ ] }, { - "key": "EraseCheck_VM", + "base": "EraseCheck_VM", "context": "{B7CEA1B1-C931-5566-AECA-B8AF02138CAA}", "entry": { "name": "In", @@ -14216,7 +14216,7 @@ ] }, { - "key": "Clear", + "base": "Clear", "context": "{B7CEA1B1-C931-5566-AECA-B8AF02138CAA}", "entry": { "name": "In", @@ -14247,7 +14247,7 @@ ] }, { - "key": "At", + "base": "At", "context": "{B7CEA1B1-C931-5566-AECA-B8AF02138CAA}", "entry": { "name": "In", @@ -14285,7 +14285,7 @@ ] }, { - "key": "BucketCount", + "base": "BucketCount", "context": "{B7CEA1B1-C931-5566-AECA-B8AF02138CAA}", "entry": { "name": "In", @@ -14316,7 +14316,7 @@ ] }, { - "key": "Empty", + "base": "Empty", "context": "{B7CEA1B1-C931-5566-AECA-B8AF02138CAA}", "entry": { "name": "In", @@ -14347,7 +14347,7 @@ ] }, { - "key": "Swap", + "base": "Swap", "context": "{B7CEA1B1-C931-5566-AECA-B8AF02138CAA}", "entry": { "name": "In", @@ -14378,7 +14378,7 @@ ] }, { - "key": "{D9866B79-D11A-58E6-B974-0B45783F53A4}", + "base": "{D9866B79-D11A-58E6-B974-0B45783F53A4}", "context": "OnDemandReflected", "variant": "", "details": { @@ -14388,7 +14388,7 @@ }, "methods": [ { - "key": "Size", + "base": "Size", "context": "{D9866B79-D11A-58E6-B974-0B45783F53A4}", "entry": { "name": "In", @@ -14419,7 +14419,7 @@ ] }, { - "key": "Front", + "base": "Front", "context": "{D9866B79-D11A-58E6-B974-0B45783F53A4}", "entry": { "name": "In", @@ -14451,7 +14451,7 @@ ] }, { - "key": "HasKey", + "base": "HasKey", "context": "{D9866B79-D11A-58E6-B974-0B45783F53A4}", "entry": { "name": "In", @@ -14488,7 +14488,7 @@ ] }, { - "key": "Resize", + "base": "Resize", "context": "{D9866B79-D11A-58E6-B974-0B45783F53A4}", "entry": { "name": "In", @@ -14517,7 +14517,7 @@ ] }, { - "key": "at", + "base": "at", "context": "{D9866B79-D11A-58E6-B974-0B45783F53A4}", "entry": { "name": "In", @@ -14555,7 +14555,7 @@ ] }, { - "key": "Back", + "base": "Back", "context": "{D9866B79-D11A-58E6-B974-0B45783F53A4}", "entry": { "name": "In", @@ -14587,7 +14587,7 @@ ] }, { - "key": "pop_back", + "base": "pop_back", "context": "{D9866B79-D11A-58E6-B974-0B45783F53A4}", "entry": { "name": "In", @@ -14610,7 +14610,7 @@ ] }, { - "key": "size", + "base": "size", "context": "{D9866B79-D11A-58E6-B974-0B45783F53A4}", "entry": { "name": "In", @@ -14641,7 +14641,7 @@ ] }, { - "key": "At", + "base": "At", "context": "{D9866B79-D11A-58E6-B974-0B45783F53A4}", "entry": { "name": "In", @@ -14679,7 +14679,7 @@ ] }, { - "key": "Empty", + "base": "Empty", "context": "{D9866B79-D11A-58E6-B974-0B45783F53A4}", "entry": { "name": "In", @@ -14710,7 +14710,7 @@ ] }, { - "key": "Swap", + "base": "Swap", "context": "{D9866B79-D11A-58E6-B974-0B45783F53A4}", "entry": { "name": "In", @@ -14739,7 +14739,7 @@ ] }, { - "key": "push_back", + "base": "push_back", "context": "{D9866B79-D11A-58E6-B974-0B45783F53A4}", "entry": { "name": "In", @@ -14769,7 +14769,7 @@ ] }, { - "key": "PushBack_VM", + "base": "PushBack_VM", "context": "{D9866B79-D11A-58E6-B974-0B45783F53A4}", "entry": { "name": "In", @@ -14807,7 +14807,7 @@ ] }, { - "key": "AtUnchecked", + "base": "AtUnchecked", "context": "{D9866B79-D11A-58E6-B974-0B45783F53A4}", "entry": { "name": "In", @@ -14845,7 +14845,7 @@ ] }, { - "key": "clear", + "base": "clear", "context": "{D9866B79-D11A-58E6-B974-0B45783F53A4}", "entry": { "name": "In", @@ -14868,7 +14868,7 @@ ] }, { - "key": "NotEmpty", + "base": "NotEmpty", "context": "{D9866B79-D11A-58E6-B974-0B45783F53A4}", "entry": { "name": "In", @@ -14899,7 +14899,7 @@ ] }, { - "key": "Erase_VM", + "base": "Erase_VM", "context": "{D9866B79-D11A-58E6-B974-0B45783F53A4}", "entry": { "name": "In", @@ -14936,7 +14936,7 @@ ] }, { - "key": "EraseCheck_VM", + "base": "EraseCheck_VM", "context": "{D9866B79-D11A-58E6-B974-0B45783F53A4}", "entry": { "name": "In", @@ -14973,7 +14973,7 @@ ] }, { - "key": "Capacity", + "base": "Capacity", "context": "{D9866B79-D11A-58E6-B974-0B45783F53A4}", "entry": { "name": "In", @@ -15004,7 +15004,7 @@ ] }, { - "key": "Clear", + "base": "Clear", "context": "{D9866B79-D11A-58E6-B974-0B45783F53A4}", "entry": { "name": "In", @@ -15035,7 +15035,7 @@ ] }, { - "key": "AssignAt", + "base": "AssignAt", "context": "{D9866B79-D11A-58E6-B974-0B45783F53A4}", "entry": { "name": "In", @@ -15071,7 +15071,7 @@ ] }, { - "key": "GetSize", + "base": "GetSize", "context": "{D9866B79-D11A-58E6-B974-0B45783F53A4}", "entry": { "name": "In", @@ -15102,7 +15102,7 @@ ] }, { - "key": "Insert", + "base": "Insert", "context": "{D9866B79-D11A-58E6-B974-0B45783F53A4}", "entry": { "name": "In", @@ -15146,7 +15146,7 @@ ] }, { - "key": "PushBack", + "base": "PushBack", "context": "{D9866B79-D11A-58E6-B974-0B45783F53A4}", "entry": { "name": "In", @@ -15176,7 +15176,7 @@ ] }, { - "key": "Reserve", + "base": "Reserve", "context": "{D9866B79-D11A-58E6-B974-0B45783F53A4}", "entry": { "name": "In", @@ -15205,7 +15205,7 @@ ] }, { - "key": "Iterate_VM", + "base": "Iterate_VM", "context": "{D9866B79-D11A-58E6-B974-0B45783F53A4}", "entry": { "name": "In", @@ -15238,7 +15238,7 @@ ] }, { - "key": "{6C8F8E52-AB4A-5C1F-8E56-9AC390290B94}", + "base": "{6C8F8E52-AB4A-5C1F-8E56-9AC390290B94}", "context": "OnDemandReflected", "variant": "", "details": { @@ -15248,7 +15248,7 @@ }, "methods": [ { - "key": "Size", + "base": "Size", "context": "{6C8F8E52-AB4A-5C1F-8E56-9AC390290B94}", "entry": { "name": "In", @@ -15279,7 +15279,7 @@ ] }, { - "key": "GetKeys", + "base": "GetKeys", "context": "{6C8F8E52-AB4A-5C1F-8E56-9AC390290B94}", "entry": { "name": "In", @@ -15310,7 +15310,7 @@ ] }, { - "key": "contains", + "base": "contains", "context": "{6C8F8E52-AB4A-5C1F-8E56-9AC390290B94}", "entry": { "name": "In", @@ -15348,7 +15348,7 @@ ] }, { - "key": "Insert", + "base": "Insert", "context": "{6C8F8E52-AB4A-5C1F-8E56-9AC390290B94}", "entry": { "name": "In", @@ -15386,7 +15386,7 @@ ] }, { - "key": "GetSize", + "base": "GetSize", "context": "{6C8F8E52-AB4A-5C1F-8E56-9AC390290B94}", "entry": { "name": "In", @@ -15417,7 +15417,7 @@ ] }, { - "key": "Reserve", + "base": "Reserve", "context": "{6C8F8E52-AB4A-5C1F-8E56-9AC390290B94}", "entry": { "name": "In", @@ -15446,7 +15446,7 @@ ] }, { - "key": "Iterate_VM", + "base": "Iterate_VM", "context": "{6C8F8E52-AB4A-5C1F-8E56-9AC390290B94}", "entry": { "name": "In", @@ -15477,7 +15477,7 @@ ] }, { - "key": "EraseCheck_VM", + "base": "EraseCheck_VM", "context": "{6C8F8E52-AB4A-5C1F-8E56-9AC390290B94}", "entry": { "name": "In", @@ -15515,7 +15515,7 @@ ] }, { - "key": "Erase", + "base": "Erase", "context": "{6C8F8E52-AB4A-5C1F-8E56-9AC390290B94}", "entry": { "name": "In", @@ -15553,7 +15553,7 @@ ] }, { - "key": "Clear", + "base": "Clear", "context": "{6C8F8E52-AB4A-5C1F-8E56-9AC390290B94}", "entry": { "name": "In", @@ -15584,7 +15584,7 @@ ] }, { - "key": "BucketCount", + "base": "BucketCount", "context": "{6C8F8E52-AB4A-5C1F-8E56-9AC390290B94}", "entry": { "name": "In", @@ -15615,7 +15615,7 @@ ] }, { - "key": "Empty", + "base": "Empty", "context": "{6C8F8E52-AB4A-5C1F-8E56-9AC390290B94}", "entry": { "name": "In", @@ -15646,7 +15646,7 @@ ] }, { - "key": "Swap", + "base": "Swap", "context": "{6C8F8E52-AB4A-5C1F-8E56-9AC390290B94}", "entry": { "name": "In", @@ -15677,7 +15677,7 @@ ] }, { - "key": "{4F67EE42-D330-55A1-85DC-E030EABC0407}", + "base": "{4F67EE42-D330-55A1-85DC-E030EABC0407}", "context": "OnDemandReflected", "variant": "", "details": { @@ -15687,7 +15687,7 @@ }, "methods": [ { - "key": "contains", + "base": "contains", "context": "{4F67EE42-D330-55A1-85DC-E030EABC0407}", "entry": { "name": "In", @@ -15724,7 +15724,7 @@ ] }, { - "key": "Insert", + "base": "Insert", "context": "{4F67EE42-D330-55A1-85DC-E030EABC0407}", "entry": { "name": "In", @@ -15767,7 +15767,7 @@ ] }, { - "key": "Reserve", + "base": "Reserve", "context": "{4F67EE42-D330-55A1-85DC-E030EABC0407}", "entry": { "name": "In", @@ -15796,7 +15796,7 @@ ] }, { - "key": "GetSize", + "base": "GetSize", "context": "{4F67EE42-D330-55A1-85DC-E030EABC0407}", "entry": { "name": "In", @@ -15827,7 +15827,7 @@ ] }, { - "key": "Iterate_VM", + "base": "Iterate_VM", "context": "{4F67EE42-D330-55A1-85DC-E030EABC0407}", "entry": { "name": "In", @@ -15858,7 +15858,7 @@ ] }, { - "key": "GetKeys", + "base": "GetKeys", "context": "{4F67EE42-D330-55A1-85DC-E030EABC0407}", "entry": { "name": "In", @@ -15889,7 +15889,7 @@ ] }, { - "key": "Size", + "base": "Size", "context": "{4F67EE42-D330-55A1-85DC-E030EABC0407}", "entry": { "name": "In", @@ -15920,7 +15920,7 @@ ] }, { - "key": "Erase", + "base": "Erase", "context": "{4F67EE42-D330-55A1-85DC-E030EABC0407}", "entry": { "name": "In", @@ -15957,7 +15957,7 @@ ] }, { - "key": "EraseCheck_VM", + "base": "EraseCheck_VM", "context": "{4F67EE42-D330-55A1-85DC-E030EABC0407}", "entry": { "name": "In", @@ -15994,7 +15994,7 @@ ] }, { - "key": "Clear", + "base": "Clear", "context": "{4F67EE42-D330-55A1-85DC-E030EABC0407}", "entry": { "name": "In", @@ -16025,7 +16025,7 @@ ] }, { - "key": "At", + "base": "At", "context": "{4F67EE42-D330-55A1-85DC-E030EABC0407}", "entry": { "name": "In", @@ -16062,7 +16062,7 @@ ] }, { - "key": "BucketCount", + "base": "BucketCount", "context": "{4F67EE42-D330-55A1-85DC-E030EABC0407}", "entry": { "name": "In", @@ -16093,7 +16093,7 @@ ] }, { - "key": "Empty", + "base": "Empty", "context": "{4F67EE42-D330-55A1-85DC-E030EABC0407}", "entry": { "name": "In", @@ -16124,7 +16124,7 @@ ] }, { - "key": "Swap", + "base": "Swap", "context": "{4F67EE42-D330-55A1-85DC-E030EABC0407}", "entry": { "name": "In", @@ -16155,7 +16155,7 @@ ] }, { - "key": "{E3B6686C-306E-5C7F-9274-196CC18E1284}", + "base": "{E3B6686C-306E-5C7F-9274-196CC18E1284}", "context": "OnDemandReflected", "variant": "", "details": { @@ -16165,7 +16165,7 @@ }, "methods": [ { - "key": "Size", + "base": "Size", "context": "{E3B6686C-306E-5C7F-9274-196CC18E1284}", "entry": { "name": "In", @@ -16196,7 +16196,7 @@ ] }, { - "key": "Front", + "base": "Front", "context": "{E3B6686C-306E-5C7F-9274-196CC18E1284}", "entry": { "name": "In", @@ -16227,7 +16227,7 @@ ] }, { - "key": "HasKey", + "base": "HasKey", "context": "{E3B6686C-306E-5C7F-9274-196CC18E1284}", "entry": { "name": "In", @@ -16264,7 +16264,7 @@ ] }, { - "key": "Resize", + "base": "Resize", "context": "{E3B6686C-306E-5C7F-9274-196CC18E1284}", "entry": { "name": "In", @@ -16293,7 +16293,7 @@ ] }, { - "key": "at", + "base": "at", "context": "{E3B6686C-306E-5C7F-9274-196CC18E1284}", "entry": { "name": "In", @@ -16330,7 +16330,7 @@ ] }, { - "key": "Back", + "base": "Back", "context": "{E3B6686C-306E-5C7F-9274-196CC18E1284}", "entry": { "name": "In", @@ -16361,7 +16361,7 @@ ] }, { - "key": "pop_back", + "base": "pop_back", "context": "{E3B6686C-306E-5C7F-9274-196CC18E1284}", "entry": { "name": "In", @@ -16384,7 +16384,7 @@ ] }, { - "key": "size", + "base": "size", "context": "{E3B6686C-306E-5C7F-9274-196CC18E1284}", "entry": { "name": "In", @@ -16415,7 +16415,7 @@ ] }, { - "key": "At", + "base": "At", "context": "{E3B6686C-306E-5C7F-9274-196CC18E1284}", "entry": { "name": "In", @@ -16452,7 +16452,7 @@ ] }, { - "key": "Empty", + "base": "Empty", "context": "{E3B6686C-306E-5C7F-9274-196CC18E1284}", "entry": { "name": "In", @@ -16483,7 +16483,7 @@ ] }, { - "key": "Swap", + "base": "Swap", "context": "{E3B6686C-306E-5C7F-9274-196CC18E1284}", "entry": { "name": "In", @@ -16512,7 +16512,7 @@ ] }, { - "key": "push_back", + "base": "push_back", "context": "{E3B6686C-306E-5C7F-9274-196CC18E1284}", "entry": { "name": "In", @@ -16541,7 +16541,7 @@ ] }, { - "key": "PushBack_VM", + "base": "PushBack_VM", "context": "{E3B6686C-306E-5C7F-9274-196CC18E1284}", "entry": { "name": "In", @@ -16578,7 +16578,7 @@ ] }, { - "key": "AtUnchecked", + "base": "AtUnchecked", "context": "{E3B6686C-306E-5C7F-9274-196CC18E1284}", "entry": { "name": "In", @@ -16615,7 +16615,7 @@ ] }, { - "key": "clear", + "base": "clear", "context": "{E3B6686C-306E-5C7F-9274-196CC18E1284}", "entry": { "name": "In", @@ -16638,7 +16638,7 @@ ] }, { - "key": "NotEmpty", + "base": "NotEmpty", "context": "{E3B6686C-306E-5C7F-9274-196CC18E1284}", "entry": { "name": "In", @@ -16669,7 +16669,7 @@ ] }, { - "key": "Erase_VM", + "base": "Erase_VM", "context": "{E3B6686C-306E-5C7F-9274-196CC18E1284}", "entry": { "name": "In", @@ -16706,7 +16706,7 @@ ] }, { - "key": "EraseCheck_VM", + "base": "EraseCheck_VM", "context": "{E3B6686C-306E-5C7F-9274-196CC18E1284}", "entry": { "name": "In", @@ -16743,7 +16743,7 @@ ] }, { - "key": "Capacity", + "base": "Capacity", "context": "{E3B6686C-306E-5C7F-9274-196CC18E1284}", "entry": { "name": "In", @@ -16774,7 +16774,7 @@ ] }, { - "key": "Clear", + "base": "Clear", "context": "{E3B6686C-306E-5C7F-9274-196CC18E1284}", "entry": { "name": "In", @@ -16805,7 +16805,7 @@ ] }, { - "key": "AssignAt", + "base": "AssignAt", "context": "{E3B6686C-306E-5C7F-9274-196CC18E1284}", "entry": { "name": "In", @@ -16840,7 +16840,7 @@ ] }, { - "key": "GetSize", + "base": "GetSize", "context": "{E3B6686C-306E-5C7F-9274-196CC18E1284}", "entry": { "name": "In", @@ -16871,7 +16871,7 @@ ] }, { - "key": "Insert", + "base": "Insert", "context": "{E3B6686C-306E-5C7F-9274-196CC18E1284}", "entry": { "name": "In", @@ -16914,7 +16914,7 @@ ] }, { - "key": "PushBack", + "base": "PushBack", "context": "{E3B6686C-306E-5C7F-9274-196CC18E1284}", "entry": { "name": "In", @@ -16943,7 +16943,7 @@ ] }, { - "key": "Reserve", + "base": "Reserve", "context": "{E3B6686C-306E-5C7F-9274-196CC18E1284}", "entry": { "name": "In", @@ -16972,7 +16972,7 @@ ] }, { - "key": "Iterate_VM", + "base": "Iterate_VM", "context": "{E3B6686C-306E-5C7F-9274-196CC18E1284}", "entry": { "name": "In", @@ -17005,7 +17005,7 @@ ] }, { - "key": "{0521985E-FC3D-5123-922A-E4011E605660}", + "base": "{0521985E-FC3D-5123-922A-E4011E605660}", "context": "OnDemandReflected", "variant": "", "details": { @@ -17015,7 +17015,7 @@ }, "methods": [ { - "key": "contains", + "base": "contains", "context": "{0521985E-FC3D-5123-922A-E4011E605660}", "entry": { "name": "In", @@ -17052,7 +17052,7 @@ ] }, { - "key": "Insert", + "base": "Insert", "context": "{0521985E-FC3D-5123-922A-E4011E605660}", "entry": { "name": "In", @@ -17095,7 +17095,7 @@ ] }, { - "key": "Reserve", + "base": "Reserve", "context": "{0521985E-FC3D-5123-922A-E4011E605660}", "entry": { "name": "In", @@ -17124,7 +17124,7 @@ ] }, { - "key": "GetSize", + "base": "GetSize", "context": "{0521985E-FC3D-5123-922A-E4011E605660}", "entry": { "name": "In", @@ -17155,7 +17155,7 @@ ] }, { - "key": "Iterate_VM", + "base": "Iterate_VM", "context": "{0521985E-FC3D-5123-922A-E4011E605660}", "entry": { "name": "In", @@ -17186,7 +17186,7 @@ ] }, { - "key": "GetKeys", + "base": "GetKeys", "context": "{0521985E-FC3D-5123-922A-E4011E605660}", "entry": { "name": "In", @@ -17217,7 +17217,7 @@ ] }, { - "key": "Size", + "base": "Size", "context": "{0521985E-FC3D-5123-922A-E4011E605660}", "entry": { "name": "In", @@ -17248,7 +17248,7 @@ ] }, { - "key": "Erase", + "base": "Erase", "context": "{0521985E-FC3D-5123-922A-E4011E605660}", "entry": { "name": "In", @@ -17285,7 +17285,7 @@ ] }, { - "key": "EraseCheck_VM", + "base": "EraseCheck_VM", "context": "{0521985E-FC3D-5123-922A-E4011E605660}", "entry": { "name": "In", @@ -17322,7 +17322,7 @@ ] }, { - "key": "Clear", + "base": "Clear", "context": "{0521985E-FC3D-5123-922A-E4011E605660}", "entry": { "name": "In", @@ -17353,7 +17353,7 @@ ] }, { - "key": "At", + "base": "At", "context": "{0521985E-FC3D-5123-922A-E4011E605660}", "entry": { "name": "In", @@ -17390,7 +17390,7 @@ ] }, { - "key": "BucketCount", + "base": "BucketCount", "context": "{0521985E-FC3D-5123-922A-E4011E605660}", "entry": { "name": "In", @@ -17421,7 +17421,7 @@ ] }, { - "key": "Empty", + "base": "Empty", "context": "{0521985E-FC3D-5123-922A-E4011E605660}", "entry": { "name": "In", @@ -17452,7 +17452,7 @@ ] }, { - "key": "Swap", + "base": "Swap", "context": "{0521985E-FC3D-5123-922A-E4011E605660}", "entry": { "name": "In", @@ -17483,7 +17483,7 @@ ] }, { - "key": "{2A1A28D5-E14E-5F25-B2EE-48722008285A}", + "base": "{2A1A28D5-E14E-5F25-B2EE-48722008285A}", "context": "OnDemandReflected", "variant": "", "details": { @@ -17493,7 +17493,7 @@ }, "methods": [ { - "key": "contains", + "base": "contains", "context": "{2A1A28D5-E14E-5F25-B2EE-48722008285A}", "entry": { "name": "In", @@ -17530,7 +17530,7 @@ ] }, { - "key": "Insert", + "base": "Insert", "context": "{2A1A28D5-E14E-5F25-B2EE-48722008285A}", "entry": { "name": "In", @@ -17573,7 +17573,7 @@ ] }, { - "key": "Reserve", + "base": "Reserve", "context": "{2A1A28D5-E14E-5F25-B2EE-48722008285A}", "entry": { "name": "In", @@ -17602,7 +17602,7 @@ ] }, { - "key": "GetSize", + "base": "GetSize", "context": "{2A1A28D5-E14E-5F25-B2EE-48722008285A}", "entry": { "name": "In", @@ -17633,7 +17633,7 @@ ] }, { - "key": "Iterate_VM", + "base": "Iterate_VM", "context": "{2A1A28D5-E14E-5F25-B2EE-48722008285A}", "entry": { "name": "In", @@ -17664,7 +17664,7 @@ ] }, { - "key": "GetKeys", + "base": "GetKeys", "context": "{2A1A28D5-E14E-5F25-B2EE-48722008285A}", "entry": { "name": "In", @@ -17695,7 +17695,7 @@ ] }, { - "key": "Size", + "base": "Size", "context": "{2A1A28D5-E14E-5F25-B2EE-48722008285A}", "entry": { "name": "In", @@ -17726,7 +17726,7 @@ ] }, { - "key": "Erase", + "base": "Erase", "context": "{2A1A28D5-E14E-5F25-B2EE-48722008285A}", "entry": { "name": "In", @@ -17763,7 +17763,7 @@ ] }, { - "key": "EraseCheck_VM", + "base": "EraseCheck_VM", "context": "{2A1A28D5-E14E-5F25-B2EE-48722008285A}", "entry": { "name": "In", @@ -17800,7 +17800,7 @@ ] }, { - "key": "Clear", + "base": "Clear", "context": "{2A1A28D5-E14E-5F25-B2EE-48722008285A}", "entry": { "name": "In", @@ -17831,7 +17831,7 @@ ] }, { - "key": "At", + "base": "At", "context": "{2A1A28D5-E14E-5F25-B2EE-48722008285A}", "entry": { "name": "In", @@ -17868,7 +17868,7 @@ ] }, { - "key": "BucketCount", + "base": "BucketCount", "context": "{2A1A28D5-E14E-5F25-B2EE-48722008285A}", "entry": { "name": "In", @@ -17899,7 +17899,7 @@ ] }, { - "key": "Empty", + "base": "Empty", "context": "{2A1A28D5-E14E-5F25-B2EE-48722008285A}", "entry": { "name": "In", @@ -17930,7 +17930,7 @@ ] }, { - "key": "Swap", + "base": "Swap", "context": "{2A1A28D5-E14E-5F25-B2EE-48722008285A}", "entry": { "name": "In", @@ -17961,7 +17961,7 @@ ] }, { - "key": "{6576DA9C-8949-513E-BA75-1DFFF648EDAF}", + "base": "{6576DA9C-8949-513E-BA75-1DFFF648EDAF}", "context": "OnDemandReflected", "variant": "", "details": { @@ -17971,7 +17971,7 @@ }, "methods": [ { - "key": "contains", + "base": "contains", "context": "{6576DA9C-8949-513E-BA75-1DFFF648EDAF}", "entry": { "name": "In", @@ -18008,7 +18008,7 @@ ] }, { - "key": "Insert", + "base": "Insert", "context": "{6576DA9C-8949-513E-BA75-1DFFF648EDAF}", "entry": { "name": "In", @@ -18051,7 +18051,7 @@ ] }, { - "key": "Reserve", + "base": "Reserve", "context": "{6576DA9C-8949-513E-BA75-1DFFF648EDAF}", "entry": { "name": "In", @@ -18080,7 +18080,7 @@ ] }, { - "key": "GetSize", + "base": "GetSize", "context": "{6576DA9C-8949-513E-BA75-1DFFF648EDAF}", "entry": { "name": "In", @@ -18111,7 +18111,7 @@ ] }, { - "key": "Iterate_VM", + "base": "Iterate_VM", "context": "{6576DA9C-8949-513E-BA75-1DFFF648EDAF}", "entry": { "name": "In", @@ -18142,7 +18142,7 @@ ] }, { - "key": "GetKeys", + "base": "GetKeys", "context": "{6576DA9C-8949-513E-BA75-1DFFF648EDAF}", "entry": { "name": "In", @@ -18173,7 +18173,7 @@ ] }, { - "key": "Size", + "base": "Size", "context": "{6576DA9C-8949-513E-BA75-1DFFF648EDAF}", "entry": { "name": "In", @@ -18204,7 +18204,7 @@ ] }, { - "key": "Erase", + "base": "Erase", "context": "{6576DA9C-8949-513E-BA75-1DFFF648EDAF}", "entry": { "name": "In", @@ -18241,7 +18241,7 @@ ] }, { - "key": "EraseCheck_VM", + "base": "EraseCheck_VM", "context": "{6576DA9C-8949-513E-BA75-1DFFF648EDAF}", "entry": { "name": "In", @@ -18278,7 +18278,7 @@ ] }, { - "key": "Clear", + "base": "Clear", "context": "{6576DA9C-8949-513E-BA75-1DFFF648EDAF}", "entry": { "name": "In", @@ -18309,7 +18309,7 @@ ] }, { - "key": "At", + "base": "At", "context": "{6576DA9C-8949-513E-BA75-1DFFF648EDAF}", "entry": { "name": "In", @@ -18346,7 +18346,7 @@ ] }, { - "key": "BucketCount", + "base": "BucketCount", "context": "{6576DA9C-8949-513E-BA75-1DFFF648EDAF}", "entry": { "name": "In", @@ -18377,7 +18377,7 @@ ] }, { - "key": "Empty", + "base": "Empty", "context": "{6576DA9C-8949-513E-BA75-1DFFF648EDAF}", "entry": { "name": "In", @@ -18408,7 +18408,7 @@ ] }, { - "key": "Swap", + "base": "Swap", "context": "{6576DA9C-8949-513E-BA75-1DFFF648EDAF}", "entry": { "name": "In", @@ -18439,7 +18439,7 @@ ] }, { - "key": "{92FC6941-F5F5-5141-97A4-1965FC8B09CD}", + "base": "{92FC6941-F5F5-5141-97A4-1965FC8B09CD}", "context": "OnDemandReflected", "variant": "", "details": { @@ -18447,7 +18447,7 @@ }, "methods": [ { - "key": "Failure", + "base": "Failure", "context": "{92FC6941-F5F5-5141-97A4-1965FC8B09CD}", "entry": { "name": "In", @@ -18470,7 +18470,7 @@ ] }, { - "key": "Success", + "base": "Success", "context": "{92FC6941-F5F5-5141-97A4-1965FC8B09CD}", "entry": { "name": "In", @@ -18501,7 +18501,7 @@ ] }, { - "key": "GetValue", + "base": "GetValue", "context": "{92FC6941-F5F5-5141-97A4-1965FC8B09CD}", "entry": { "name": "In", @@ -18532,7 +18532,7 @@ ] }, { - "key": "IsSuccess", + "base": "IsSuccess", "context": "{92FC6941-F5F5-5141-97A4-1965FC8B09CD}", "entry": { "name": "In", @@ -18565,7 +18565,7 @@ ] }, { - "key": "{230FE638-B7E6-5E7B-8D2F-B05D9313AC9F}", + "base": "{230FE638-B7E6-5E7B-8D2F-B05D9313AC9F}", "context": "OnDemandReflected", "variant": "", "details": { @@ -18575,7 +18575,7 @@ }, "methods": [ { - "key": "contains", + "base": "contains", "context": "{230FE638-B7E6-5E7B-8D2F-B05D9313AC9F}", "entry": { "name": "In", @@ -18612,7 +18612,7 @@ ] }, { - "key": "Insert", + "base": "Insert", "context": "{230FE638-B7E6-5E7B-8D2F-B05D9313AC9F}", "entry": { "name": "In", @@ -18655,7 +18655,7 @@ ] }, { - "key": "Reserve", + "base": "Reserve", "context": "{230FE638-B7E6-5E7B-8D2F-B05D9313AC9F}", "entry": { "name": "In", @@ -18684,7 +18684,7 @@ ] }, { - "key": "GetSize", + "base": "GetSize", "context": "{230FE638-B7E6-5E7B-8D2F-B05D9313AC9F}", "entry": { "name": "In", @@ -18715,7 +18715,7 @@ ] }, { - "key": "Iterate_VM", + "base": "Iterate_VM", "context": "{230FE638-B7E6-5E7B-8D2F-B05D9313AC9F}", "entry": { "name": "In", @@ -18746,7 +18746,7 @@ ] }, { - "key": "GetKeys", + "base": "GetKeys", "context": "{230FE638-B7E6-5E7B-8D2F-B05D9313AC9F}", "entry": { "name": "In", @@ -18777,7 +18777,7 @@ ] }, { - "key": "Size", + "base": "Size", "context": "{230FE638-B7E6-5E7B-8D2F-B05D9313AC9F}", "entry": { "name": "In", @@ -18808,7 +18808,7 @@ ] }, { - "key": "Erase", + "base": "Erase", "context": "{230FE638-B7E6-5E7B-8D2F-B05D9313AC9F}", "entry": { "name": "In", @@ -18845,7 +18845,7 @@ ] }, { - "key": "EraseCheck_VM", + "base": "EraseCheck_VM", "context": "{230FE638-B7E6-5E7B-8D2F-B05D9313AC9F}", "entry": { "name": "In", @@ -18882,7 +18882,7 @@ ] }, { - "key": "Clear", + "base": "Clear", "context": "{230FE638-B7E6-5E7B-8D2F-B05D9313AC9F}", "entry": { "name": "In", @@ -18913,7 +18913,7 @@ ] }, { - "key": "At", + "base": "At", "context": "{230FE638-B7E6-5E7B-8D2F-B05D9313AC9F}", "entry": { "name": "In", @@ -18950,7 +18950,7 @@ ] }, { - "key": "BucketCount", + "base": "BucketCount", "context": "{230FE638-B7E6-5E7B-8D2F-B05D9313AC9F}", "entry": { "name": "In", @@ -18981,7 +18981,7 @@ ] }, { - "key": "Empty", + "base": "Empty", "context": "{230FE638-B7E6-5E7B-8D2F-B05D9313AC9F}", "entry": { "name": "In", @@ -19012,7 +19012,7 @@ ] }, { - "key": "Swap", + "base": "Swap", "context": "{230FE638-B7E6-5E7B-8D2F-B05D9313AC9F}", "entry": { "name": "In", @@ -19043,7 +19043,7 @@ ] }, { - "key": "{BC52AD94-A35B-5837-A8D8-A99B2AF7D4B4}", + "base": "{BC52AD94-A35B-5837-A8D8-A99B2AF7D4B4}", "context": "OnDemandReflected", "variant": "", "details": { @@ -19053,7 +19053,7 @@ }, "methods": [ { - "key": "contains", + "base": "contains", "context": "{BC52AD94-A35B-5837-A8D8-A99B2AF7D4B4}", "entry": { "name": "In", @@ -19090,7 +19090,7 @@ ] }, { - "key": "Insert", + "base": "Insert", "context": "{BC52AD94-A35B-5837-A8D8-A99B2AF7D4B4}", "entry": { "name": "In", @@ -19133,7 +19133,7 @@ ] }, { - "key": "Reserve", + "base": "Reserve", "context": "{BC52AD94-A35B-5837-A8D8-A99B2AF7D4B4}", "entry": { "name": "In", @@ -19162,7 +19162,7 @@ ] }, { - "key": "GetSize", + "base": "GetSize", "context": "{BC52AD94-A35B-5837-A8D8-A99B2AF7D4B4}", "entry": { "name": "In", @@ -19193,7 +19193,7 @@ ] }, { - "key": "Iterate_VM", + "base": "Iterate_VM", "context": "{BC52AD94-A35B-5837-A8D8-A99B2AF7D4B4}", "entry": { "name": "In", @@ -19224,7 +19224,7 @@ ] }, { - "key": "GetKeys", + "base": "GetKeys", "context": "{BC52AD94-A35B-5837-A8D8-A99B2AF7D4B4}", "entry": { "name": "In", @@ -19255,7 +19255,7 @@ ] }, { - "key": "Size", + "base": "Size", "context": "{BC52AD94-A35B-5837-A8D8-A99B2AF7D4B4}", "entry": { "name": "In", @@ -19286,7 +19286,7 @@ ] }, { - "key": "Erase", + "base": "Erase", "context": "{BC52AD94-A35B-5837-A8D8-A99B2AF7D4B4}", "entry": { "name": "In", @@ -19323,7 +19323,7 @@ ] }, { - "key": "EraseCheck_VM", + "base": "EraseCheck_VM", "context": "{BC52AD94-A35B-5837-A8D8-A99B2AF7D4B4}", "entry": { "name": "In", @@ -19360,7 +19360,7 @@ ] }, { - "key": "Clear", + "base": "Clear", "context": "{BC52AD94-A35B-5837-A8D8-A99B2AF7D4B4}", "entry": { "name": "In", @@ -19391,7 +19391,7 @@ ] }, { - "key": "At", + "base": "At", "context": "{BC52AD94-A35B-5837-A8D8-A99B2AF7D4B4}", "entry": { "name": "In", @@ -19428,7 +19428,7 @@ ] }, { - "key": "BucketCount", + "base": "BucketCount", "context": "{BC52AD94-A35B-5837-A8D8-A99B2AF7D4B4}", "entry": { "name": "In", @@ -19459,7 +19459,7 @@ ] }, { - "key": "Empty", + "base": "Empty", "context": "{BC52AD94-A35B-5837-A8D8-A99B2AF7D4B4}", "entry": { "name": "In", @@ -19490,7 +19490,7 @@ ] }, { - "key": "Swap", + "base": "Swap", "context": "{BC52AD94-A35B-5837-A8D8-A99B2AF7D4B4}", "entry": { "name": "In", @@ -19521,7 +19521,7 @@ ] }, { - "key": "{BEB6AE51-5283-5019-A320-294202035F80}", + "base": "{BEB6AE51-5283-5019-A320-294202035F80}", "context": "OnDemandReflected", "variant": "", "details": { @@ -19531,7 +19531,7 @@ }, "methods": [ { - "key": "contains", + "base": "contains", "context": "{BEB6AE51-5283-5019-A320-294202035F80}", "entry": { "name": "In", @@ -19568,7 +19568,7 @@ ] }, { - "key": "Insert", + "base": "Insert", "context": "{BEB6AE51-5283-5019-A320-294202035F80}", "entry": { "name": "In", @@ -19611,7 +19611,7 @@ ] }, { - "key": "Reserve", + "base": "Reserve", "context": "{BEB6AE51-5283-5019-A320-294202035F80}", "entry": { "name": "In", @@ -19640,7 +19640,7 @@ ] }, { - "key": "GetSize", + "base": "GetSize", "context": "{BEB6AE51-5283-5019-A320-294202035F80}", "entry": { "name": "In", @@ -19671,7 +19671,7 @@ ] }, { - "key": "Iterate_VM", + "base": "Iterate_VM", "context": "{BEB6AE51-5283-5019-A320-294202035F80}", "entry": { "name": "In", @@ -19702,7 +19702,7 @@ ] }, { - "key": "GetKeys", + "base": "GetKeys", "context": "{BEB6AE51-5283-5019-A320-294202035F80}", "entry": { "name": "In", @@ -19733,7 +19733,7 @@ ] }, { - "key": "Size", + "base": "Size", "context": "{BEB6AE51-5283-5019-A320-294202035F80}", "entry": { "name": "In", @@ -19764,7 +19764,7 @@ ] }, { - "key": "Erase", + "base": "Erase", "context": "{BEB6AE51-5283-5019-A320-294202035F80}", "entry": { "name": "In", @@ -19801,7 +19801,7 @@ ] }, { - "key": "EraseCheck_VM", + "base": "EraseCheck_VM", "context": "{BEB6AE51-5283-5019-A320-294202035F80}", "entry": { "name": "In", @@ -19838,7 +19838,7 @@ ] }, { - "key": "Clear", + "base": "Clear", "context": "{BEB6AE51-5283-5019-A320-294202035F80}", "entry": { "name": "In", @@ -19869,7 +19869,7 @@ ] }, { - "key": "At", + "base": "At", "context": "{BEB6AE51-5283-5019-A320-294202035F80}", "entry": { "name": "In", @@ -19906,7 +19906,7 @@ ] }, { - "key": "BucketCount", + "base": "BucketCount", "context": "{BEB6AE51-5283-5019-A320-294202035F80}", "entry": { "name": "In", @@ -19937,7 +19937,7 @@ ] }, { - "key": "Empty", + "base": "Empty", "context": "{BEB6AE51-5283-5019-A320-294202035F80}", "entry": { "name": "In", @@ -19968,7 +19968,7 @@ ] }, { - "key": "Swap", + "base": "Swap", "context": "{BEB6AE51-5283-5019-A320-294202035F80}", "entry": { "name": "In", @@ -19999,7 +19999,7 @@ ] }, { - "key": "{2E879A16-9143-5862-A5B3-EDED931C60BC}", + "base": "{2E879A16-9143-5862-A5B3-EDED931C60BC}", "context": "OnDemandReflected", "variant": "", "details": { @@ -20009,7 +20009,7 @@ }, "methods": [ { - "key": "get", + "base": "get", "context": "{2E879A16-9143-5862-A5B3-EDED931C60BC}", "entry": { "name": "In", @@ -20043,7 +20043,7 @@ ] }, { - "key": "{6CC7B2F9-F551-4CB8-A713-4149959AE337}", + "base": "{6CC7B2F9-F551-4CB8-A713-4149959AE337}", "context": "OnDemandReflected", "variant": "", "details": { @@ -20051,7 +20051,7 @@ }, "methods": [ { - "key": "One", + "base": "One", "context": "{6CC7B2F9-F551-4CB8-A713-4149959AE337}", "entry": { "name": "In", @@ -20074,7 +20074,7 @@ ] }, { - "key": "LinearToGamma", + "base": "LinearToGamma", "context": "{6CC7B2F9-F551-4CB8-A713-4149959AE337}", "entry": { "name": "In", @@ -20105,7 +20105,7 @@ ] }, { - "key": "FromVector3", + "base": "FromVector3", "context": "{6CC7B2F9-F551-4CB8-A713-4149959AE337}", "entry": { "name": "In", @@ -20136,7 +20136,7 @@ ] }, { - "key": "MultiplyByNumber", + "base": "MultiplyByNumber", "context": "{6CC7B2F9-F551-4CB8-A713-4149959AE337}", "entry": { "name": "In", @@ -20173,7 +20173,7 @@ ] }, { - "key": "Negate", + "base": "Negate", "context": "{6CC7B2F9-F551-4CB8-A713-4149959AE337}", "entry": { "name": "In", @@ -20204,7 +20204,7 @@ ] }, { - "key": "Dot3", + "base": "Dot3", "context": "{6CC7B2F9-F551-4CB8-A713-4149959AE337}", "entry": { "name": "In", @@ -20241,7 +20241,7 @@ ] }, { - "key": "Dot", + "base": "Dot", "context": "{6CC7B2F9-F551-4CB8-A713-4149959AE337}", "entry": { "name": "In", @@ -20278,7 +20278,7 @@ ] }, { - "key": "FromValues", + "base": "FromValues", "context": "{6CC7B2F9-F551-4CB8-A713-4149959AE337}", "entry": { "name": "In", @@ -20327,7 +20327,7 @@ ] }, { - "key": "DivideByNumber", + "base": "DivideByNumber", "context": "{6CC7B2F9-F551-4CB8-A713-4149959AE337}", "entry": { "name": "In", @@ -20364,7 +20364,7 @@ ] }, { - "key": "FromVector3AndNumber", + "base": "FromVector3AndNumber", "context": "{6CC7B2F9-F551-4CB8-A713-4149959AE337}", "entry": { "name": "In", @@ -20401,7 +20401,7 @@ ] }, { - "key": "GammaToLinear", + "base": "GammaToLinear", "context": "{6CC7B2F9-F551-4CB8-A713-4149959AE337}", "entry": { "name": "In", @@ -20432,7 +20432,7 @@ ] }, { - "key": "IsClose", + "base": "IsClose", "context": "{6CC7B2F9-F551-4CB8-A713-4149959AE337}", "entry": { "name": "In", @@ -20475,7 +20475,7 @@ ] }, { - "key": "IsZero", + "base": "IsZero", "context": "{6CC7B2F9-F551-4CB8-A713-4149959AE337}", "entry": { "name": "In", @@ -20512,7 +20512,7 @@ ] }, { - "key": "MultiplyByColor", + "base": "MultiplyByColor", "context": "{6CC7B2F9-F551-4CB8-A713-4149959AE337}", "entry": { "name": "In", @@ -20549,7 +20549,7 @@ ] }, { - "key": "Add", + "base": "Add", "context": "{6CC7B2F9-F551-4CB8-A713-4149959AE337}", "entry": { "name": "In", @@ -20586,7 +20586,7 @@ ] }, { - "key": "Subtract", + "base": "Subtract", "context": "{6CC7B2F9-F551-4CB8-A713-4149959AE337}", "entry": { "name": "In", @@ -20625,7 +20625,7 @@ ] }, { - "key": "{50F6716F-698B-5A6C-AACD-940597FDEC24}", + "base": "{50F6716F-698B-5A6C-AACD-940597FDEC24}", "context": "OnDemandReflected", "variant": "", "details": { @@ -20635,7 +20635,7 @@ }, "methods": [ { - "key": "contains", + "base": "contains", "context": "{50F6716F-698B-5A6C-AACD-940597FDEC24}", "entry": { "name": "In", @@ -20672,7 +20672,7 @@ ] }, { - "key": "Insert", + "base": "Insert", "context": "{50F6716F-698B-5A6C-AACD-940597FDEC24}", "entry": { "name": "In", @@ -20715,7 +20715,7 @@ ] }, { - "key": "Reserve", + "base": "Reserve", "context": "{50F6716F-698B-5A6C-AACD-940597FDEC24}", "entry": { "name": "In", @@ -20744,7 +20744,7 @@ ] }, { - "key": "GetSize", + "base": "GetSize", "context": "{50F6716F-698B-5A6C-AACD-940597FDEC24}", "entry": { "name": "In", @@ -20775,7 +20775,7 @@ ] }, { - "key": "Iterate_VM", + "base": "Iterate_VM", "context": "{50F6716F-698B-5A6C-AACD-940597FDEC24}", "entry": { "name": "In", @@ -20806,7 +20806,7 @@ ] }, { - "key": "GetKeys", + "base": "GetKeys", "context": "{50F6716F-698B-5A6C-AACD-940597FDEC24}", "entry": { "name": "In", @@ -20837,7 +20837,7 @@ ] }, { - "key": "Size", + "base": "Size", "context": "{50F6716F-698B-5A6C-AACD-940597FDEC24}", "entry": { "name": "In", @@ -20868,7 +20868,7 @@ ] }, { - "key": "Erase", + "base": "Erase", "context": "{50F6716F-698B-5A6C-AACD-940597FDEC24}", "entry": { "name": "In", @@ -20905,7 +20905,7 @@ ] }, { - "key": "EraseCheck_VM", + "base": "EraseCheck_VM", "context": "{50F6716F-698B-5A6C-AACD-940597FDEC24}", "entry": { "name": "In", @@ -20942,7 +20942,7 @@ ] }, { - "key": "Clear", + "base": "Clear", "context": "{50F6716F-698B-5A6C-AACD-940597FDEC24}", "entry": { "name": "In", @@ -20973,7 +20973,7 @@ ] }, { - "key": "At", + "base": "At", "context": "{50F6716F-698B-5A6C-AACD-940597FDEC24}", "entry": { "name": "In", @@ -21010,7 +21010,7 @@ ] }, { - "key": "BucketCount", + "base": "BucketCount", "context": "{50F6716F-698B-5A6C-AACD-940597FDEC24}", "entry": { "name": "In", @@ -21041,7 +21041,7 @@ ] }, { - "key": "Empty", + "base": "Empty", "context": "{50F6716F-698B-5A6C-AACD-940597FDEC24}", "entry": { "name": "In", @@ -21072,7 +21072,7 @@ ] }, { - "key": "Swap", + "base": "Swap", "context": "{50F6716F-698B-5A6C-AACD-940597FDEC24}", "entry": { "name": "In", @@ -21103,7 +21103,7 @@ ] }, { - "key": "{B7B3058C-1E07-528C-A40D-F5C598CBF4EE}", + "base": "{B7B3058C-1E07-528C-A40D-F5C598CBF4EE}", "context": "OnDemandReflected", "variant": "", "details": { @@ -21113,7 +21113,7 @@ }, "methods": [ { - "key": "contains", + "base": "contains", "context": "{B7B3058C-1E07-528C-A40D-F5C598CBF4EE}", "entry": { "name": "In", @@ -21150,7 +21150,7 @@ ] }, { - "key": "Insert", + "base": "Insert", "context": "{B7B3058C-1E07-528C-A40D-F5C598CBF4EE}", "entry": { "name": "In", @@ -21193,7 +21193,7 @@ ] }, { - "key": "Reserve", + "base": "Reserve", "context": "{B7B3058C-1E07-528C-A40D-F5C598CBF4EE}", "entry": { "name": "In", @@ -21222,7 +21222,7 @@ ] }, { - "key": "GetSize", + "base": "GetSize", "context": "{B7B3058C-1E07-528C-A40D-F5C598CBF4EE}", "entry": { "name": "In", @@ -21253,7 +21253,7 @@ ] }, { - "key": "Iterate_VM", + "base": "Iterate_VM", "context": "{B7B3058C-1E07-528C-A40D-F5C598CBF4EE}", "entry": { "name": "In", @@ -21284,7 +21284,7 @@ ] }, { - "key": "GetKeys", + "base": "GetKeys", "context": "{B7B3058C-1E07-528C-A40D-F5C598CBF4EE}", "entry": { "name": "In", @@ -21315,7 +21315,7 @@ ] }, { - "key": "Size", + "base": "Size", "context": "{B7B3058C-1E07-528C-A40D-F5C598CBF4EE}", "entry": { "name": "In", @@ -21346,7 +21346,7 @@ ] }, { - "key": "Erase", + "base": "Erase", "context": "{B7B3058C-1E07-528C-A40D-F5C598CBF4EE}", "entry": { "name": "In", @@ -21383,7 +21383,7 @@ ] }, { - "key": "EraseCheck_VM", + "base": "EraseCheck_VM", "context": "{B7B3058C-1E07-528C-A40D-F5C598CBF4EE}", "entry": { "name": "In", @@ -21420,7 +21420,7 @@ ] }, { - "key": "Clear", + "base": "Clear", "context": "{B7B3058C-1E07-528C-A40D-F5C598CBF4EE}", "entry": { "name": "In", @@ -21451,7 +21451,7 @@ ] }, { - "key": "At", + "base": "At", "context": "{B7B3058C-1E07-528C-A40D-F5C598CBF4EE}", "entry": { "name": "In", @@ -21488,7 +21488,7 @@ ] }, { - "key": "BucketCount", + "base": "BucketCount", "context": "{B7B3058C-1E07-528C-A40D-F5C598CBF4EE}", "entry": { "name": "In", @@ -21519,7 +21519,7 @@ ] }, { - "key": "Empty", + "base": "Empty", "context": "{B7B3058C-1E07-528C-A40D-F5C598CBF4EE}", "entry": { "name": "In", @@ -21550,7 +21550,7 @@ ] }, { - "key": "Swap", + "base": "Swap", "context": "{B7B3058C-1E07-528C-A40D-F5C598CBF4EE}", "entry": { "name": "In", @@ -21581,7 +21581,7 @@ ] }, { - "key": "{FDE6FB0D-D37B-58F4-9941-97F58D111A1B}", + "base": "{FDE6FB0D-D37B-58F4-9941-97F58D111A1B}", "context": "OnDemandReflected", "variant": "", "details": { @@ -21591,7 +21591,7 @@ }, "methods": [ { - "key": "contains", + "base": "contains", "context": "{FDE6FB0D-D37B-58F4-9941-97F58D111A1B}", "entry": { "name": "In", @@ -21628,7 +21628,7 @@ ] }, { - "key": "Insert", + "base": "Insert", "context": "{FDE6FB0D-D37B-58F4-9941-97F58D111A1B}", "entry": { "name": "In", @@ -21671,7 +21671,7 @@ ] }, { - "key": "Reserve", + "base": "Reserve", "context": "{FDE6FB0D-D37B-58F4-9941-97F58D111A1B}", "entry": { "name": "In", @@ -21700,7 +21700,7 @@ ] }, { - "key": "GetSize", + "base": "GetSize", "context": "{FDE6FB0D-D37B-58F4-9941-97F58D111A1B}", "entry": { "name": "In", @@ -21731,7 +21731,7 @@ ] }, { - "key": "Iterate_VM", + "base": "Iterate_VM", "context": "{FDE6FB0D-D37B-58F4-9941-97F58D111A1B}", "entry": { "name": "In", @@ -21762,7 +21762,7 @@ ] }, { - "key": "GetKeys", + "base": "GetKeys", "context": "{FDE6FB0D-D37B-58F4-9941-97F58D111A1B}", "entry": { "name": "In", @@ -21793,7 +21793,7 @@ ] }, { - "key": "Size", + "base": "Size", "context": "{FDE6FB0D-D37B-58F4-9941-97F58D111A1B}", "entry": { "name": "In", @@ -21824,7 +21824,7 @@ ] }, { - "key": "Erase", + "base": "Erase", "context": "{FDE6FB0D-D37B-58F4-9941-97F58D111A1B}", "entry": { "name": "In", @@ -21861,7 +21861,7 @@ ] }, { - "key": "EraseCheck_VM", + "base": "EraseCheck_VM", "context": "{FDE6FB0D-D37B-58F4-9941-97F58D111A1B}", "entry": { "name": "In", @@ -21898,7 +21898,7 @@ ] }, { - "key": "Clear", + "base": "Clear", "context": "{FDE6FB0D-D37B-58F4-9941-97F58D111A1B}", "entry": { "name": "In", @@ -21929,7 +21929,7 @@ ] }, { - "key": "At", + "base": "At", "context": "{FDE6FB0D-D37B-58F4-9941-97F58D111A1B}", "entry": { "name": "In", @@ -21966,7 +21966,7 @@ ] }, { - "key": "BucketCount", + "base": "BucketCount", "context": "{FDE6FB0D-D37B-58F4-9941-97F58D111A1B}", "entry": { "name": "In", @@ -21997,7 +21997,7 @@ ] }, { - "key": "Empty", + "base": "Empty", "context": "{FDE6FB0D-D37B-58F4-9941-97F58D111A1B}", "entry": { "name": "In", @@ -22028,7 +22028,7 @@ ] }, { - "key": "Swap", + "base": "Swap", "context": "{FDE6FB0D-D37B-58F4-9941-97F58D111A1B}", "entry": { "name": "In", @@ -22059,7 +22059,7 @@ ] }, { - "key": "{8CBDA3B7-9DCD-4A04-A12C-123C322CA63A}", + "base": "{8CBDA3B7-9DCD-4A04-A12C-123C322CA63A}", "context": "OnDemandReflected", "variant": "", "details": { @@ -22067,7 +22067,7 @@ }, "methods": [ { - "key": "GetPosition", + "base": "GetPosition", "context": "{8CBDA3B7-9DCD-4A04-A12C-123C322CA63A}", "entry": { "name": "In", @@ -22098,7 +22098,7 @@ ] }, { - "key": "GetAxisY", + "base": "GetAxisY", "context": "{8CBDA3B7-9DCD-4A04-A12C-123C322CA63A}", "entry": { "name": "In", @@ -22129,7 +22129,7 @@ ] }, { - "key": "GetAxisX", + "base": "GetAxisX", "context": "{8CBDA3B7-9DCD-4A04-A12C-123C322CA63A}", "entry": { "name": "In", @@ -22160,7 +22160,7 @@ ] }, { - "key": "FromAabb", + "base": "FromAabb", "context": "{8CBDA3B7-9DCD-4A04-A12C-123C322CA63A}", "entry": { "name": "In", @@ -22191,7 +22191,7 @@ ] }, { - "key": "FromPositionRotationAndHalfLengths", + "base": "FromPositionRotationAndHalfLengths", "context": "{8CBDA3B7-9DCD-4A04-A12C-123C322CA63A}", "entry": { "name": "In", @@ -22234,7 +22234,7 @@ ] }, { - "key": "GetAxisZ", + "base": "GetAxisZ", "context": "{8CBDA3B7-9DCD-4A04-A12C-123C322CA63A}", "entry": { "name": "In", @@ -22265,7 +22265,7 @@ ] }, { - "key": "IsFinite", + "base": "IsFinite", "context": "{8CBDA3B7-9DCD-4A04-A12C-123C322CA63A}", "entry": { "name": "In", @@ -22298,7 +22298,7 @@ ] }, { - "key": "{781AD4B3-F61B-5C95-9447-F90AB07AB480}", + "base": "{781AD4B3-F61B-5C95-9447-F90AB07AB480}", "context": "OnDemandReflected", "variant": "", "details": { @@ -22308,7 +22308,7 @@ }, "methods": [ { - "key": "get", + "base": "get", "context": "{781AD4B3-F61B-5C95-9447-F90AB07AB480}", "entry": { "name": "In", @@ -22341,7 +22341,7 @@ ] }, { - "key": "{33844DCE-75B0-5734-A1B7-7C44199D1D5E}", + "base": "{33844DCE-75B0-5734-A1B7-7C44199D1D5E}", "context": "OnDemandReflected", "variant": "", "details": { @@ -22349,7 +22349,7 @@ }, "methods": [ { - "key": "Get0", + "base": "Get0", "context": "{33844DCE-75B0-5734-A1B7-7C44199D1D5E}", "entry": { "name": "In", @@ -22380,7 +22380,7 @@ ] }, { - "key": "Get1", + "base": "Get1", "context": "{33844DCE-75B0-5734-A1B7-7C44199D1D5E}", "entry": { "name": "In", @@ -22411,7 +22411,7 @@ ] }, { - "key": "GetSize", + "base": "GetSize", "context": "{33844DCE-75B0-5734-A1B7-7C44199D1D5E}", "entry": { "name": "In", @@ -22436,7 +22436,7 @@ ] }, { - "key": "{009022A1-16A5-50B0-958F-F69C729985A3}", + "base": "{009022A1-16A5-50B0-958F-F69C729985A3}", "context": "OnDemandReflected", "variant": "", "details": { @@ -22446,7 +22446,7 @@ }, "methods": [ { - "key": "Size", + "base": "Size", "context": "{009022A1-16A5-50B0-958F-F69C729985A3}", "entry": { "name": "In", @@ -22477,7 +22477,7 @@ ] }, { - "key": "Front", + "base": "Front", "context": "{009022A1-16A5-50B0-958F-F69C729985A3}", "entry": { "name": "In", @@ -22508,7 +22508,7 @@ ] }, { - "key": "HasKey", + "base": "HasKey", "context": "{009022A1-16A5-50B0-958F-F69C729985A3}", "entry": { "name": "In", @@ -22545,7 +22545,7 @@ ] }, { - "key": "Resize", + "base": "Resize", "context": "{009022A1-16A5-50B0-958F-F69C729985A3}", "entry": { "name": "In", @@ -22574,7 +22574,7 @@ ] }, { - "key": "at", + "base": "at", "context": "{009022A1-16A5-50B0-958F-F69C729985A3}", "entry": { "name": "In", @@ -22611,7 +22611,7 @@ ] }, { - "key": "Back", + "base": "Back", "context": "{009022A1-16A5-50B0-958F-F69C729985A3}", "entry": { "name": "In", @@ -22642,7 +22642,7 @@ ] }, { - "key": "pop_back", + "base": "pop_back", "context": "{009022A1-16A5-50B0-958F-F69C729985A3}", "entry": { "name": "In", @@ -22665,7 +22665,7 @@ ] }, { - "key": "size", + "base": "size", "context": "{009022A1-16A5-50B0-958F-F69C729985A3}", "entry": { "name": "In", @@ -22696,7 +22696,7 @@ ] }, { - "key": "At", + "base": "At", "context": "{009022A1-16A5-50B0-958F-F69C729985A3}", "entry": { "name": "In", @@ -22733,7 +22733,7 @@ ] }, { - "key": "Empty", + "base": "Empty", "context": "{009022A1-16A5-50B0-958F-F69C729985A3}", "entry": { "name": "In", @@ -22764,7 +22764,7 @@ ] }, { - "key": "Swap", + "base": "Swap", "context": "{009022A1-16A5-50B0-958F-F69C729985A3}", "entry": { "name": "In", @@ -22793,7 +22793,7 @@ ] }, { - "key": "push_back", + "base": "push_back", "context": "{009022A1-16A5-50B0-958F-F69C729985A3}", "entry": { "name": "In", @@ -22822,7 +22822,7 @@ ] }, { - "key": "PushBack_VM", + "base": "PushBack_VM", "context": "{009022A1-16A5-50B0-958F-F69C729985A3}", "entry": { "name": "In", @@ -22859,7 +22859,7 @@ ] }, { - "key": "AtUnchecked", + "base": "AtUnchecked", "context": "{009022A1-16A5-50B0-958F-F69C729985A3}", "entry": { "name": "In", @@ -22896,7 +22896,7 @@ ] }, { - "key": "clear", + "base": "clear", "context": "{009022A1-16A5-50B0-958F-F69C729985A3}", "entry": { "name": "In", @@ -22919,7 +22919,7 @@ ] }, { - "key": "NotEmpty", + "base": "NotEmpty", "context": "{009022A1-16A5-50B0-958F-F69C729985A3}", "entry": { "name": "In", @@ -22950,7 +22950,7 @@ ] }, { - "key": "Erase_VM", + "base": "Erase_VM", "context": "{009022A1-16A5-50B0-958F-F69C729985A3}", "entry": { "name": "In", @@ -22987,7 +22987,7 @@ ] }, { - "key": "EraseCheck_VM", + "base": "EraseCheck_VM", "context": "{009022A1-16A5-50B0-958F-F69C729985A3}", "entry": { "name": "In", @@ -23024,7 +23024,7 @@ ] }, { - "key": "Capacity", + "base": "Capacity", "context": "{009022A1-16A5-50B0-958F-F69C729985A3}", "entry": { "name": "In", @@ -23055,7 +23055,7 @@ ] }, { - "key": "Clear", + "base": "Clear", "context": "{009022A1-16A5-50B0-958F-F69C729985A3}", "entry": { "name": "In", @@ -23086,7 +23086,7 @@ ] }, { - "key": "AssignAt", + "base": "AssignAt", "context": "{009022A1-16A5-50B0-958F-F69C729985A3}", "entry": { "name": "In", @@ -23121,7 +23121,7 @@ ] }, { - "key": "GetSize", + "base": "GetSize", "context": "{009022A1-16A5-50B0-958F-F69C729985A3}", "entry": { "name": "In", @@ -23152,7 +23152,7 @@ ] }, { - "key": "Insert", + "base": "Insert", "context": "{009022A1-16A5-50B0-958F-F69C729985A3}", "entry": { "name": "In", @@ -23195,7 +23195,7 @@ ] }, { - "key": "PushBack", + "base": "PushBack", "context": "{009022A1-16A5-50B0-958F-F69C729985A3}", "entry": { "name": "In", @@ -23224,7 +23224,7 @@ ] }, { - "key": "Reserve", + "base": "Reserve", "context": "{009022A1-16A5-50B0-958F-F69C729985A3}", "entry": { "name": "In", @@ -23253,7 +23253,7 @@ ] }, { - "key": "Iterate_VM", + "base": "Iterate_VM", "context": "{009022A1-16A5-50B0-958F-F69C729985A3}", "entry": { "name": "In", @@ -23286,7 +23286,7 @@ ] }, { - "key": "{F8A7460C-2CC2-5755-AFDA-49B1109A751E}", + "base": "{F8A7460C-2CC2-5755-AFDA-49B1109A751E}", "context": "OnDemandReflected", "variant": "", "details": { @@ -23296,7 +23296,7 @@ }, "methods": [ { - "key": "contains", + "base": "contains", "context": "{F8A7460C-2CC2-5755-AFDA-49B1109A751E}", "entry": { "name": "In", @@ -23333,7 +23333,7 @@ ] }, { - "key": "Insert", + "base": "Insert", "context": "{F8A7460C-2CC2-5755-AFDA-49B1109A751E}", "entry": { "name": "In", @@ -23376,7 +23376,7 @@ ] }, { - "key": "Reserve", + "base": "Reserve", "context": "{F8A7460C-2CC2-5755-AFDA-49B1109A751E}", "entry": { "name": "In", @@ -23405,7 +23405,7 @@ ] }, { - "key": "GetSize", + "base": "GetSize", "context": "{F8A7460C-2CC2-5755-AFDA-49B1109A751E}", "entry": { "name": "In", @@ -23436,7 +23436,7 @@ ] }, { - "key": "Iterate_VM", + "base": "Iterate_VM", "context": "{F8A7460C-2CC2-5755-AFDA-49B1109A751E}", "entry": { "name": "In", @@ -23467,7 +23467,7 @@ ] }, { - "key": "GetKeys", + "base": "GetKeys", "context": "{F8A7460C-2CC2-5755-AFDA-49B1109A751E}", "entry": { "name": "In", @@ -23498,7 +23498,7 @@ ] }, { - "key": "Size", + "base": "Size", "context": "{F8A7460C-2CC2-5755-AFDA-49B1109A751E}", "entry": { "name": "In", @@ -23529,7 +23529,7 @@ ] }, { - "key": "Erase", + "base": "Erase", "context": "{F8A7460C-2CC2-5755-AFDA-49B1109A751E}", "entry": { "name": "In", @@ -23566,7 +23566,7 @@ ] }, { - "key": "EraseCheck_VM", + "base": "EraseCheck_VM", "context": "{F8A7460C-2CC2-5755-AFDA-49B1109A751E}", "entry": { "name": "In", @@ -23603,7 +23603,7 @@ ] }, { - "key": "Clear", + "base": "Clear", "context": "{F8A7460C-2CC2-5755-AFDA-49B1109A751E}", "entry": { "name": "In", @@ -23634,7 +23634,7 @@ ] }, { - "key": "At", + "base": "At", "context": "{F8A7460C-2CC2-5755-AFDA-49B1109A751E}", "entry": { "name": "In", @@ -23671,7 +23671,7 @@ ] }, { - "key": "BucketCount", + "base": "BucketCount", "context": "{F8A7460C-2CC2-5755-AFDA-49B1109A751E}", "entry": { "name": "In", @@ -23702,7 +23702,7 @@ ] }, { - "key": "Empty", + "base": "Empty", "context": "{F8A7460C-2CC2-5755-AFDA-49B1109A751E}", "entry": { "name": "In", @@ -23733,7 +23733,7 @@ ] }, { - "key": "Swap", + "base": "Swap", "context": "{F8A7460C-2CC2-5755-AFDA-49B1109A751E}", "entry": { "name": "In", @@ -23764,7 +23764,7 @@ ] }, { - "key": "{65F4A570-CBE4-5E03-A397-7F0BD8DE3831}", + "base": "{65F4A570-CBE4-5E03-A397-7F0BD8DE3831}", "context": "OnDemandReflected", "variant": "", "details": { @@ -23774,7 +23774,7 @@ }, "methods": [ { - "key": "contains", + "base": "contains", "context": "{65F4A570-CBE4-5E03-A397-7F0BD8DE3831}", "entry": { "name": "In", @@ -23811,7 +23811,7 @@ ] }, { - "key": "Insert", + "base": "Insert", "context": "{65F4A570-CBE4-5E03-A397-7F0BD8DE3831}", "entry": { "name": "In", @@ -23854,7 +23854,7 @@ ] }, { - "key": "Reserve", + "base": "Reserve", "context": "{65F4A570-CBE4-5E03-A397-7F0BD8DE3831}", "entry": { "name": "In", @@ -23883,7 +23883,7 @@ ] }, { - "key": "GetSize", + "base": "GetSize", "context": "{65F4A570-CBE4-5E03-A397-7F0BD8DE3831}", "entry": { "name": "In", @@ -23914,7 +23914,7 @@ ] }, { - "key": "Iterate_VM", + "base": "Iterate_VM", "context": "{65F4A570-CBE4-5E03-A397-7F0BD8DE3831}", "entry": { "name": "In", @@ -23945,7 +23945,7 @@ ] }, { - "key": "GetKeys", + "base": "GetKeys", "context": "{65F4A570-CBE4-5E03-A397-7F0BD8DE3831}", "entry": { "name": "In", @@ -23976,7 +23976,7 @@ ] }, { - "key": "Size", + "base": "Size", "context": "{65F4A570-CBE4-5E03-A397-7F0BD8DE3831}", "entry": { "name": "In", @@ -24007,7 +24007,7 @@ ] }, { - "key": "Erase", + "base": "Erase", "context": "{65F4A570-CBE4-5E03-A397-7F0BD8DE3831}", "entry": { "name": "In", @@ -24044,7 +24044,7 @@ ] }, { - "key": "EraseCheck_VM", + "base": "EraseCheck_VM", "context": "{65F4A570-CBE4-5E03-A397-7F0BD8DE3831}", "entry": { "name": "In", @@ -24081,7 +24081,7 @@ ] }, { - "key": "Clear", + "base": "Clear", "context": "{65F4A570-CBE4-5E03-A397-7F0BD8DE3831}", "entry": { "name": "In", @@ -24112,7 +24112,7 @@ ] }, { - "key": "At", + "base": "At", "context": "{65F4A570-CBE4-5E03-A397-7F0BD8DE3831}", "entry": { "name": "In", @@ -24149,7 +24149,7 @@ ] }, { - "key": "BucketCount", + "base": "BucketCount", "context": "{65F4A570-CBE4-5E03-A397-7F0BD8DE3831}", "entry": { "name": "In", @@ -24180,7 +24180,7 @@ ] }, { - "key": "Empty", + "base": "Empty", "context": "{65F4A570-CBE4-5E03-A397-7F0BD8DE3831}", "entry": { "name": "In", @@ -24211,7 +24211,7 @@ ] }, { - "key": "Swap", + "base": "Swap", "context": "{65F4A570-CBE4-5E03-A397-7F0BD8DE3831}", "entry": { "name": "In", @@ -24242,7 +24242,7 @@ ] }, { - "key": "{B505B05D-57BF-5A45-9113-B3A2784E2CD7}", + "base": "{B505B05D-57BF-5A45-9113-B3A2784E2CD7}", "context": "OnDemandReflected", "variant": "", "details": { @@ -24252,7 +24252,7 @@ }, "methods": [ { - "key": "Size", + "base": "Size", "context": "{B505B05D-57BF-5A45-9113-B3A2784E2CD7}", "entry": { "name": "In", @@ -24283,7 +24283,7 @@ ] }, { - "key": "Front", + "base": "Front", "context": "{B505B05D-57BF-5A45-9113-B3A2784E2CD7}", "entry": { "name": "In", @@ -24314,7 +24314,7 @@ ] }, { - "key": "HasKey", + "base": "HasKey", "context": "{B505B05D-57BF-5A45-9113-B3A2784E2CD7}", "entry": { "name": "In", @@ -24351,7 +24351,7 @@ ] }, { - "key": "Resize", + "base": "Resize", "context": "{B505B05D-57BF-5A45-9113-B3A2784E2CD7}", "entry": { "name": "In", @@ -24380,7 +24380,7 @@ ] }, { - "key": "at", + "base": "at", "context": "{B505B05D-57BF-5A45-9113-B3A2784E2CD7}", "entry": { "name": "In", @@ -24417,7 +24417,7 @@ ] }, { - "key": "Back", + "base": "Back", "context": "{B505B05D-57BF-5A45-9113-B3A2784E2CD7}", "entry": { "name": "In", @@ -24448,7 +24448,7 @@ ] }, { - "key": "pop_back", + "base": "pop_back", "context": "{B505B05D-57BF-5A45-9113-B3A2784E2CD7}", "entry": { "name": "In", @@ -24471,7 +24471,7 @@ ] }, { - "key": "size", + "base": "size", "context": "{B505B05D-57BF-5A45-9113-B3A2784E2CD7}", "entry": { "name": "In", @@ -24502,7 +24502,7 @@ ] }, { - "key": "At", + "base": "At", "context": "{B505B05D-57BF-5A45-9113-B3A2784E2CD7}", "entry": { "name": "In", @@ -24539,7 +24539,7 @@ ] }, { - "key": "Empty", + "base": "Empty", "context": "{B505B05D-57BF-5A45-9113-B3A2784E2CD7}", "entry": { "name": "In", @@ -24570,7 +24570,7 @@ ] }, { - "key": "Swap", + "base": "Swap", "context": "{B505B05D-57BF-5A45-9113-B3A2784E2CD7}", "entry": { "name": "In", @@ -24599,7 +24599,7 @@ ] }, { - "key": "push_back", + "base": "push_back", "context": "{B505B05D-57BF-5A45-9113-B3A2784E2CD7}", "entry": { "name": "In", @@ -24628,7 +24628,7 @@ ] }, { - "key": "PushBack_VM", + "base": "PushBack_VM", "context": "{B505B05D-57BF-5A45-9113-B3A2784E2CD7}", "entry": { "name": "In", @@ -24665,7 +24665,7 @@ ] }, { - "key": "AtUnchecked", + "base": "AtUnchecked", "context": "{B505B05D-57BF-5A45-9113-B3A2784E2CD7}", "entry": { "name": "In", @@ -24702,7 +24702,7 @@ ] }, { - "key": "clear", + "base": "clear", "context": "{B505B05D-57BF-5A45-9113-B3A2784E2CD7}", "entry": { "name": "In", @@ -24725,7 +24725,7 @@ ] }, { - "key": "NotEmpty", + "base": "NotEmpty", "context": "{B505B05D-57BF-5A45-9113-B3A2784E2CD7}", "entry": { "name": "In", @@ -24756,7 +24756,7 @@ ] }, { - "key": "Erase_VM", + "base": "Erase_VM", "context": "{B505B05D-57BF-5A45-9113-B3A2784E2CD7}", "entry": { "name": "In", @@ -24793,7 +24793,7 @@ ] }, { - "key": "EraseCheck_VM", + "base": "EraseCheck_VM", "context": "{B505B05D-57BF-5A45-9113-B3A2784E2CD7}", "entry": { "name": "In", @@ -24830,7 +24830,7 @@ ] }, { - "key": "Capacity", + "base": "Capacity", "context": "{B505B05D-57BF-5A45-9113-B3A2784E2CD7}", "entry": { "name": "In", @@ -24861,7 +24861,7 @@ ] }, { - "key": "Clear", + "base": "Clear", "context": "{B505B05D-57BF-5A45-9113-B3A2784E2CD7}", "entry": { "name": "In", @@ -24892,7 +24892,7 @@ ] }, { - "key": "AssignAt", + "base": "AssignAt", "context": "{B505B05D-57BF-5A45-9113-B3A2784E2CD7}", "entry": { "name": "In", @@ -24927,7 +24927,7 @@ ] }, { - "key": "GetSize", + "base": "GetSize", "context": "{B505B05D-57BF-5A45-9113-B3A2784E2CD7}", "entry": { "name": "In", @@ -24958,7 +24958,7 @@ ] }, { - "key": "Insert", + "base": "Insert", "context": "{B505B05D-57BF-5A45-9113-B3A2784E2CD7}", "entry": { "name": "In", @@ -25001,7 +25001,7 @@ ] }, { - "key": "PushBack", + "base": "PushBack", "context": "{B505B05D-57BF-5A45-9113-B3A2784E2CD7}", "entry": { "name": "In", @@ -25030,7 +25030,7 @@ ] }, { - "key": "Reserve", + "base": "Reserve", "context": "{B505B05D-57BF-5A45-9113-B3A2784E2CD7}", "entry": { "name": "In", @@ -25059,7 +25059,7 @@ ] }, { - "key": "Iterate_VM", + "base": "Iterate_VM", "context": "{B505B05D-57BF-5A45-9113-B3A2784E2CD7}", "entry": { "name": "In", @@ -25092,7 +25092,7 @@ ] }, { - "key": "{5600E444-1E66-5CB4-81A9-053AD1F4453E}", + "base": "{5600E444-1E66-5CB4-81A9-053AD1F4453E}", "context": "OnDemandReflected", "variant": "", "details": { @@ -25102,7 +25102,7 @@ }, "methods": [ { - "key": "Size", + "base": "Size", "context": "{5600E444-1E66-5CB4-81A9-053AD1F4453E}", "entry": { "name": "In", @@ -25133,7 +25133,7 @@ ] }, { - "key": "Front", + "base": "Front", "context": "{5600E444-1E66-5CB4-81A9-053AD1F4453E}", "entry": { "name": "In", @@ -25164,7 +25164,7 @@ ] }, { - "key": "HasKey", + "base": "HasKey", "context": "{5600E444-1E66-5CB4-81A9-053AD1F4453E}", "entry": { "name": "In", @@ -25201,7 +25201,7 @@ ] }, { - "key": "Resize", + "base": "Resize", "context": "{5600E444-1E66-5CB4-81A9-053AD1F4453E}", "entry": { "name": "In", @@ -25230,7 +25230,7 @@ ] }, { - "key": "at", + "base": "at", "context": "{5600E444-1E66-5CB4-81A9-053AD1F4453E}", "entry": { "name": "In", @@ -25267,7 +25267,7 @@ ] }, { - "key": "Back", + "base": "Back", "context": "{5600E444-1E66-5CB4-81A9-053AD1F4453E}", "entry": { "name": "In", @@ -25298,7 +25298,7 @@ ] }, { - "key": "pop_back", + "base": "pop_back", "context": "{5600E444-1E66-5CB4-81A9-053AD1F4453E}", "entry": { "name": "In", @@ -25321,7 +25321,7 @@ ] }, { - "key": "size", + "base": "size", "context": "{5600E444-1E66-5CB4-81A9-053AD1F4453E}", "entry": { "name": "In", @@ -25352,7 +25352,7 @@ ] }, { - "key": "At", + "base": "At", "context": "{5600E444-1E66-5CB4-81A9-053AD1F4453E}", "entry": { "name": "In", @@ -25389,7 +25389,7 @@ ] }, { - "key": "Empty", + "base": "Empty", "context": "{5600E444-1E66-5CB4-81A9-053AD1F4453E}", "entry": { "name": "In", @@ -25420,7 +25420,7 @@ ] }, { - "key": "Swap", + "base": "Swap", "context": "{5600E444-1E66-5CB4-81A9-053AD1F4453E}", "entry": { "name": "In", @@ -25449,7 +25449,7 @@ ] }, { - "key": "push_back", + "base": "push_back", "context": "{5600E444-1E66-5CB4-81A9-053AD1F4453E}", "entry": { "name": "In", @@ -25478,7 +25478,7 @@ ] }, { - "key": "PushBack_VM", + "base": "PushBack_VM", "context": "{5600E444-1E66-5CB4-81A9-053AD1F4453E}", "entry": { "name": "In", @@ -25515,7 +25515,7 @@ ] }, { - "key": "AtUnchecked", + "base": "AtUnchecked", "context": "{5600E444-1E66-5CB4-81A9-053AD1F4453E}", "entry": { "name": "In", @@ -25552,7 +25552,7 @@ ] }, { - "key": "clear", + "base": "clear", "context": "{5600E444-1E66-5CB4-81A9-053AD1F4453E}", "entry": { "name": "In", @@ -25575,7 +25575,7 @@ ] }, { - "key": "NotEmpty", + "base": "NotEmpty", "context": "{5600E444-1E66-5CB4-81A9-053AD1F4453E}", "entry": { "name": "In", @@ -25606,7 +25606,7 @@ ] }, { - "key": "Erase_VM", + "base": "Erase_VM", "context": "{5600E444-1E66-5CB4-81A9-053AD1F4453E}", "entry": { "name": "In", @@ -25643,7 +25643,7 @@ ] }, { - "key": "EraseCheck_VM", + "base": "EraseCheck_VM", "context": "{5600E444-1E66-5CB4-81A9-053AD1F4453E}", "entry": { "name": "In", @@ -25680,7 +25680,7 @@ ] }, { - "key": "Capacity", + "base": "Capacity", "context": "{5600E444-1E66-5CB4-81A9-053AD1F4453E}", "entry": { "name": "In", @@ -25711,7 +25711,7 @@ ] }, { - "key": "Clear", + "base": "Clear", "context": "{5600E444-1E66-5CB4-81A9-053AD1F4453E}", "entry": { "name": "In", @@ -25742,7 +25742,7 @@ ] }, { - "key": "AssignAt", + "base": "AssignAt", "context": "{5600E444-1E66-5CB4-81A9-053AD1F4453E}", "entry": { "name": "In", @@ -25777,7 +25777,7 @@ ] }, { - "key": "GetSize", + "base": "GetSize", "context": "{5600E444-1E66-5CB4-81A9-053AD1F4453E}", "entry": { "name": "In", @@ -25808,7 +25808,7 @@ ] }, { - "key": "Insert", + "base": "Insert", "context": "{5600E444-1E66-5CB4-81A9-053AD1F4453E}", "entry": { "name": "In", @@ -25851,7 +25851,7 @@ ] }, { - "key": "PushBack", + "base": "PushBack", "context": "{5600E444-1E66-5CB4-81A9-053AD1F4453E}", "entry": { "name": "In", @@ -25880,7 +25880,7 @@ ] }, { - "key": "Reserve", + "base": "Reserve", "context": "{5600E444-1E66-5CB4-81A9-053AD1F4453E}", "entry": { "name": "In", @@ -25909,7 +25909,7 @@ ] }, { - "key": "Iterate_VM", + "base": "Iterate_VM", "context": "{5600E444-1E66-5CB4-81A9-053AD1F4453E}", "entry": { "name": "In", @@ -25942,7 +25942,7 @@ ] }, { - "key": "{8B173592-95EA-56B6-AE88-33A58FDAF93E}", + "base": "{8B173592-95EA-56B6-AE88-33A58FDAF93E}", "context": "OnDemandReflected", "variant": "", "details": { @@ -25952,7 +25952,7 @@ }, "methods": [ { - "key": "contains", + "base": "contains", "context": "{8B173592-95EA-56B6-AE88-33A58FDAF93E}", "entry": { "name": "In", @@ -25989,7 +25989,7 @@ ] }, { - "key": "Insert", + "base": "Insert", "context": "{8B173592-95EA-56B6-AE88-33A58FDAF93E}", "entry": { "name": "In", @@ -26032,7 +26032,7 @@ ] }, { - "key": "Reserve", + "base": "Reserve", "context": "{8B173592-95EA-56B6-AE88-33A58FDAF93E}", "entry": { "name": "In", @@ -26061,7 +26061,7 @@ ] }, { - "key": "GetSize", + "base": "GetSize", "context": "{8B173592-95EA-56B6-AE88-33A58FDAF93E}", "entry": { "name": "In", @@ -26092,7 +26092,7 @@ ] }, { - "key": "Iterate_VM", + "base": "Iterate_VM", "context": "{8B173592-95EA-56B6-AE88-33A58FDAF93E}", "entry": { "name": "In", @@ -26123,7 +26123,7 @@ ] }, { - "key": "GetKeys", + "base": "GetKeys", "context": "{8B173592-95EA-56B6-AE88-33A58FDAF93E}", "entry": { "name": "In", @@ -26154,7 +26154,7 @@ ] }, { - "key": "Size", + "base": "Size", "context": "{8B173592-95EA-56B6-AE88-33A58FDAF93E}", "entry": { "name": "In", @@ -26185,7 +26185,7 @@ ] }, { - "key": "Erase", + "base": "Erase", "context": "{8B173592-95EA-56B6-AE88-33A58FDAF93E}", "entry": { "name": "In", @@ -26222,7 +26222,7 @@ ] }, { - "key": "EraseCheck_VM", + "base": "EraseCheck_VM", "context": "{8B173592-95EA-56B6-AE88-33A58FDAF93E}", "entry": { "name": "In", @@ -26259,7 +26259,7 @@ ] }, { - "key": "Clear", + "base": "Clear", "context": "{8B173592-95EA-56B6-AE88-33A58FDAF93E}", "entry": { "name": "In", @@ -26290,7 +26290,7 @@ ] }, { - "key": "At", + "base": "At", "context": "{8B173592-95EA-56B6-AE88-33A58FDAF93E}", "entry": { "name": "In", @@ -26327,7 +26327,7 @@ ] }, { - "key": "BucketCount", + "base": "BucketCount", "context": "{8B173592-95EA-56B6-AE88-33A58FDAF93E}", "entry": { "name": "In", @@ -26358,7 +26358,7 @@ ] }, { - "key": "Empty", + "base": "Empty", "context": "{8B173592-95EA-56B6-AE88-33A58FDAF93E}", "entry": { "name": "In", @@ -26389,7 +26389,7 @@ ] }, { - "key": "Swap", + "base": "Swap", "context": "{8B173592-95EA-56B6-AE88-33A58FDAF93E}", "entry": { "name": "In", @@ -26420,7 +26420,7 @@ ] }, { - "key": "{E8EDFF6E-951E-584D-9D47-33F43F77D859}", + "base": "{E8EDFF6E-951E-584D-9D47-33F43F77D859}", "context": "OnDemandReflected", "variant": "", "details": { @@ -26430,7 +26430,7 @@ }, "methods": [ { - "key": "Size", + "base": "Size", "context": "{E8EDFF6E-951E-584D-9D47-33F43F77D859}", "entry": { "name": "In", @@ -26461,7 +26461,7 @@ ] }, { - "key": "Front", + "base": "Front", "context": "{E8EDFF6E-951E-584D-9D47-33F43F77D859}", "entry": { "name": "In", @@ -26492,7 +26492,7 @@ ] }, { - "key": "HasKey", + "base": "HasKey", "context": "{E8EDFF6E-951E-584D-9D47-33F43F77D859}", "entry": { "name": "In", @@ -26529,7 +26529,7 @@ ] }, { - "key": "Resize", + "base": "Resize", "context": "{E8EDFF6E-951E-584D-9D47-33F43F77D859}", "entry": { "name": "In", @@ -26558,7 +26558,7 @@ ] }, { - "key": "at", + "base": "at", "context": "{E8EDFF6E-951E-584D-9D47-33F43F77D859}", "entry": { "name": "In", @@ -26595,7 +26595,7 @@ ] }, { - "key": "Back", + "base": "Back", "context": "{E8EDFF6E-951E-584D-9D47-33F43F77D859}", "entry": { "name": "In", @@ -26626,7 +26626,7 @@ ] }, { - "key": "pop_back", + "base": "pop_back", "context": "{E8EDFF6E-951E-584D-9D47-33F43F77D859}", "entry": { "name": "In", @@ -26649,7 +26649,7 @@ ] }, { - "key": "size", + "base": "size", "context": "{E8EDFF6E-951E-584D-9D47-33F43F77D859}", "entry": { "name": "In", @@ -26680,7 +26680,7 @@ ] }, { - "key": "At", + "base": "At", "context": "{E8EDFF6E-951E-584D-9D47-33F43F77D859}", "entry": { "name": "In", @@ -26717,7 +26717,7 @@ ] }, { - "key": "Empty", + "base": "Empty", "context": "{E8EDFF6E-951E-584D-9D47-33F43F77D859}", "entry": { "name": "In", @@ -26748,7 +26748,7 @@ ] }, { - "key": "Swap", + "base": "Swap", "context": "{E8EDFF6E-951E-584D-9D47-33F43F77D859}", "entry": { "name": "In", @@ -26777,7 +26777,7 @@ ] }, { - "key": "push_back", + "base": "push_back", "context": "{E8EDFF6E-951E-584D-9D47-33F43F77D859}", "entry": { "name": "In", @@ -26806,7 +26806,7 @@ ] }, { - "key": "PushBack_VM", + "base": "PushBack_VM", "context": "{E8EDFF6E-951E-584D-9D47-33F43F77D859}", "entry": { "name": "In", @@ -26843,7 +26843,7 @@ ] }, { - "key": "AtUnchecked", + "base": "AtUnchecked", "context": "{E8EDFF6E-951E-584D-9D47-33F43F77D859}", "entry": { "name": "In", @@ -26880,7 +26880,7 @@ ] }, { - "key": "clear", + "base": "clear", "context": "{E8EDFF6E-951E-584D-9D47-33F43F77D859}", "entry": { "name": "In", @@ -26903,7 +26903,7 @@ ] }, { - "key": "NotEmpty", + "base": "NotEmpty", "context": "{E8EDFF6E-951E-584D-9D47-33F43F77D859}", "entry": { "name": "In", @@ -26934,7 +26934,7 @@ ] }, { - "key": "Erase_VM", + "base": "Erase_VM", "context": "{E8EDFF6E-951E-584D-9D47-33F43F77D859}", "entry": { "name": "In", @@ -26971,7 +26971,7 @@ ] }, { - "key": "EraseCheck_VM", + "base": "EraseCheck_VM", "context": "{E8EDFF6E-951E-584D-9D47-33F43F77D859}", "entry": { "name": "In", @@ -27008,7 +27008,7 @@ ] }, { - "key": "Capacity", + "base": "Capacity", "context": "{E8EDFF6E-951E-584D-9D47-33F43F77D859}", "entry": { "name": "In", @@ -27039,7 +27039,7 @@ ] }, { - "key": "Clear", + "base": "Clear", "context": "{E8EDFF6E-951E-584D-9D47-33F43F77D859}", "entry": { "name": "In", @@ -27070,7 +27070,7 @@ ] }, { - "key": "AssignAt", + "base": "AssignAt", "context": "{E8EDFF6E-951E-584D-9D47-33F43F77D859}", "entry": { "name": "In", @@ -27105,7 +27105,7 @@ ] }, { - "key": "GetSize", + "base": "GetSize", "context": "{E8EDFF6E-951E-584D-9D47-33F43F77D859}", "entry": { "name": "In", @@ -27136,7 +27136,7 @@ ] }, { - "key": "Insert", + "base": "Insert", "context": "{E8EDFF6E-951E-584D-9D47-33F43F77D859}", "entry": { "name": "In", @@ -27179,7 +27179,7 @@ ] }, { - "key": "PushBack", + "base": "PushBack", "context": "{E8EDFF6E-951E-584D-9D47-33F43F77D859}", "entry": { "name": "In", @@ -27208,7 +27208,7 @@ ] }, { - "key": "Reserve", + "base": "Reserve", "context": "{E8EDFF6E-951E-584D-9D47-33F43F77D859}", "entry": { "name": "In", @@ -27237,7 +27237,7 @@ ] }, { - "key": "Iterate_VM", + "base": "Iterate_VM", "context": "{E8EDFF6E-951E-584D-9D47-33F43F77D859}", "entry": { "name": "In", @@ -27270,7 +27270,7 @@ ] }, { - "key": "{82AC1A71-2EA7-5FBC-9B3B-72B1CCFDD292}", + "base": "{82AC1A71-2EA7-5FBC-9B3B-72B1CCFDD292}", "context": "OnDemandReflected", "variant": "", "details": { @@ -27280,7 +27280,7 @@ }, "methods": [ { - "key": "Size", + "base": "Size", "context": "{82AC1A71-2EA7-5FBC-9B3B-72B1CCFDD292}", "entry": { "name": "In", @@ -27311,7 +27311,7 @@ ] }, { - "key": "Front", + "base": "Front", "context": "{82AC1A71-2EA7-5FBC-9B3B-72B1CCFDD292}", "entry": { "name": "In", @@ -27342,7 +27342,7 @@ ] }, { - "key": "HasKey", + "base": "HasKey", "context": "{82AC1A71-2EA7-5FBC-9B3B-72B1CCFDD292}", "entry": { "name": "In", @@ -27379,7 +27379,7 @@ ] }, { - "key": "Resize", + "base": "Resize", "context": "{82AC1A71-2EA7-5FBC-9B3B-72B1CCFDD292}", "entry": { "name": "In", @@ -27408,7 +27408,7 @@ ] }, { - "key": "at", + "base": "at", "context": "{82AC1A71-2EA7-5FBC-9B3B-72B1CCFDD292}", "entry": { "name": "In", @@ -27445,7 +27445,7 @@ ] }, { - "key": "Back", + "base": "Back", "context": "{82AC1A71-2EA7-5FBC-9B3B-72B1CCFDD292}", "entry": { "name": "In", @@ -27476,7 +27476,7 @@ ] }, { - "key": "pop_back", + "base": "pop_back", "context": "{82AC1A71-2EA7-5FBC-9B3B-72B1CCFDD292}", "entry": { "name": "In", @@ -27499,7 +27499,7 @@ ] }, { - "key": "size", + "base": "size", "context": "{82AC1A71-2EA7-5FBC-9B3B-72B1CCFDD292}", "entry": { "name": "In", @@ -27530,7 +27530,7 @@ ] }, { - "key": "At", + "base": "At", "context": "{82AC1A71-2EA7-5FBC-9B3B-72B1CCFDD292}", "entry": { "name": "In", @@ -27567,7 +27567,7 @@ ] }, { - "key": "Empty", + "base": "Empty", "context": "{82AC1A71-2EA7-5FBC-9B3B-72B1CCFDD292}", "entry": { "name": "In", @@ -27598,7 +27598,7 @@ ] }, { - "key": "Swap", + "base": "Swap", "context": "{82AC1A71-2EA7-5FBC-9B3B-72B1CCFDD292}", "entry": { "name": "In", @@ -27627,7 +27627,7 @@ ] }, { - "key": "push_back", + "base": "push_back", "context": "{82AC1A71-2EA7-5FBC-9B3B-72B1CCFDD292}", "entry": { "name": "In", @@ -27656,7 +27656,7 @@ ] }, { - "key": "PushBack_VM", + "base": "PushBack_VM", "context": "{82AC1A71-2EA7-5FBC-9B3B-72B1CCFDD292}", "entry": { "name": "In", @@ -27693,7 +27693,7 @@ ] }, { - "key": "AtUnchecked", + "base": "AtUnchecked", "context": "{82AC1A71-2EA7-5FBC-9B3B-72B1CCFDD292}", "entry": { "name": "In", @@ -27730,7 +27730,7 @@ ] }, { - "key": "clear", + "base": "clear", "context": "{82AC1A71-2EA7-5FBC-9B3B-72B1CCFDD292}", "entry": { "name": "In", @@ -27753,7 +27753,7 @@ ] }, { - "key": "NotEmpty", + "base": "NotEmpty", "context": "{82AC1A71-2EA7-5FBC-9B3B-72B1CCFDD292}", "entry": { "name": "In", @@ -27784,7 +27784,7 @@ ] }, { - "key": "Erase_VM", + "base": "Erase_VM", "context": "{82AC1A71-2EA7-5FBC-9B3B-72B1CCFDD292}", "entry": { "name": "In", @@ -27821,7 +27821,7 @@ ] }, { - "key": "EraseCheck_VM", + "base": "EraseCheck_VM", "context": "{82AC1A71-2EA7-5FBC-9B3B-72B1CCFDD292}", "entry": { "name": "In", @@ -27858,7 +27858,7 @@ ] }, { - "key": "Capacity", + "base": "Capacity", "context": "{82AC1A71-2EA7-5FBC-9B3B-72B1CCFDD292}", "entry": { "name": "In", @@ -27889,7 +27889,7 @@ ] }, { - "key": "Clear", + "base": "Clear", "context": "{82AC1A71-2EA7-5FBC-9B3B-72B1CCFDD292}", "entry": { "name": "In", @@ -27920,7 +27920,7 @@ ] }, { - "key": "AssignAt", + "base": "AssignAt", "context": "{82AC1A71-2EA7-5FBC-9B3B-72B1CCFDD292}", "entry": { "name": "In", @@ -27955,7 +27955,7 @@ ] }, { - "key": "GetSize", + "base": "GetSize", "context": "{82AC1A71-2EA7-5FBC-9B3B-72B1CCFDD292}", "entry": { "name": "In", @@ -27986,7 +27986,7 @@ ] }, { - "key": "Insert", + "base": "Insert", "context": "{82AC1A71-2EA7-5FBC-9B3B-72B1CCFDD292}", "entry": { "name": "In", @@ -28029,7 +28029,7 @@ ] }, { - "key": "PushBack", + "base": "PushBack", "context": "{82AC1A71-2EA7-5FBC-9B3B-72B1CCFDD292}", "entry": { "name": "In", @@ -28058,7 +28058,7 @@ ] }, { - "key": "Reserve", + "base": "Reserve", "context": "{82AC1A71-2EA7-5FBC-9B3B-72B1CCFDD292}", "entry": { "name": "In", @@ -28087,7 +28087,7 @@ ] }, { - "key": "Iterate_VM", + "base": "Iterate_VM", "context": "{82AC1A71-2EA7-5FBC-9B3B-72B1CCFDD292}", "entry": { "name": "In", @@ -28120,7 +28120,7 @@ ] }, { - "key": "{0D5A4347-BCEC-58D6-A2D5-259F78FA0BF0}", + "base": "{0D5A4347-BCEC-58D6-A2D5-259F78FA0BF0}", "context": "OnDemandReflected", "variant": "", "details": { @@ -28128,7 +28128,7 @@ }, "methods": [ { - "key": "Failure", + "base": "Failure", "context": "{0D5A4347-BCEC-58D6-A2D5-259F78FA0BF0}", "entry": { "name": "In", @@ -28159,7 +28159,7 @@ ] }, { - "key": "Success", + "base": "Success", "context": "{0D5A4347-BCEC-58D6-A2D5-259F78FA0BF0}", "entry": { "name": "In", @@ -28182,7 +28182,7 @@ ] }, { - "key": "GetError", + "base": "GetError", "context": "{0D5A4347-BCEC-58D6-A2D5-259F78FA0BF0}", "entry": { "name": "In", @@ -28213,7 +28213,7 @@ ] }, { - "key": "IsSuccess", + "base": "IsSuccess", "context": "{0D5A4347-BCEC-58D6-A2D5-259F78FA0BF0}", "entry": { "name": "In", @@ -28246,7 +28246,7 @@ ] }, { - "key": "{E77BCFE0-1C44-57B3-9651-CA647A4F4980}", + "base": "{E77BCFE0-1C44-57B3-9651-CA647A4F4980}", "context": "OnDemandReflected", "variant": "", "details": { @@ -28256,7 +28256,7 @@ }, "methods": [ { - "key": "contains", + "base": "contains", "context": "{E77BCFE0-1C44-57B3-9651-CA647A4F4980}", "entry": { "name": "In", @@ -28294,7 +28294,7 @@ ] }, { - "key": "Insert", + "base": "Insert", "context": "{E77BCFE0-1C44-57B3-9651-CA647A4F4980}", "entry": { "name": "In", @@ -28338,7 +28338,7 @@ ] }, { - "key": "Reserve", + "base": "Reserve", "context": "{E77BCFE0-1C44-57B3-9651-CA647A4F4980}", "entry": { "name": "In", @@ -28367,7 +28367,7 @@ ] }, { - "key": "GetSize", + "base": "GetSize", "context": "{E77BCFE0-1C44-57B3-9651-CA647A4F4980}", "entry": { "name": "In", @@ -28398,7 +28398,7 @@ ] }, { - "key": "Iterate_VM", + "base": "Iterate_VM", "context": "{E77BCFE0-1C44-57B3-9651-CA647A4F4980}", "entry": { "name": "In", @@ -28429,7 +28429,7 @@ ] }, { - "key": "GetKeys", + "base": "GetKeys", "context": "{E77BCFE0-1C44-57B3-9651-CA647A4F4980}", "entry": { "name": "In", @@ -28460,7 +28460,7 @@ ] }, { - "key": "Size", + "base": "Size", "context": "{E77BCFE0-1C44-57B3-9651-CA647A4F4980}", "entry": { "name": "In", @@ -28491,7 +28491,7 @@ ] }, { - "key": "Erase", + "base": "Erase", "context": "{E77BCFE0-1C44-57B3-9651-CA647A4F4980}", "entry": { "name": "In", @@ -28529,7 +28529,7 @@ ] }, { - "key": "EraseCheck_VM", + "base": "EraseCheck_VM", "context": "{E77BCFE0-1C44-57B3-9651-CA647A4F4980}", "entry": { "name": "In", @@ -28567,7 +28567,7 @@ ] }, { - "key": "Clear", + "base": "Clear", "context": "{E77BCFE0-1C44-57B3-9651-CA647A4F4980}", "entry": { "name": "In", @@ -28598,7 +28598,7 @@ ] }, { - "key": "At", + "base": "At", "context": "{E77BCFE0-1C44-57B3-9651-CA647A4F4980}", "entry": { "name": "In", @@ -28636,7 +28636,7 @@ ] }, { - "key": "BucketCount", + "base": "BucketCount", "context": "{E77BCFE0-1C44-57B3-9651-CA647A4F4980}", "entry": { "name": "In", @@ -28667,7 +28667,7 @@ ] }, { - "key": "Empty", + "base": "Empty", "context": "{E77BCFE0-1C44-57B3-9651-CA647A4F4980}", "entry": { "name": "In", @@ -28698,7 +28698,7 @@ ] }, { - "key": "Swap", + "base": "Swap", "context": "{E77BCFE0-1C44-57B3-9651-CA647A4F4980}", "entry": { "name": "In", @@ -28729,7 +28729,7 @@ ] }, { - "key": "{36AD4D04-5A5D-52DC-A864-7027D563EFA2}", + "base": "{36AD4D04-5A5D-52DC-A864-7027D563EFA2}", "context": "OnDemandReflected", "variant": "", "details": { @@ -28737,7 +28737,7 @@ }, "methods": [ { - "key": "HasHandlerConnected", + "base": "HasHandlerConnected", "context": "{36AD4D04-5A5D-52DC-A864-7027D563EFA2}", "entry": { "name": "In", @@ -28770,7 +28770,7 @@ ] }, { - "key": "{D1FEE25B-F252-5625-863C-1312E1F822A0}", + "base": "{D1FEE25B-F252-5625-863C-1312E1F822A0}", "context": "OnDemandReflected", "variant": "", "details": { @@ -28778,7 +28778,7 @@ }, "methods": [ { - "key": "Failure", + "base": "Failure", "context": "{D1FEE25B-F252-5625-863C-1312E1F822A0}", "entry": { "name": "In", @@ -28801,7 +28801,7 @@ ] }, { - "key": "Success", + "base": "Success", "context": "{D1FEE25B-F252-5625-863C-1312E1F822A0}", "entry": { "name": "In", @@ -28832,7 +28832,7 @@ ] }, { - "key": "GetValue", + "base": "GetValue", "context": "{D1FEE25B-F252-5625-863C-1312E1F822A0}", "entry": { "name": "In", @@ -28863,7 +28863,7 @@ ] }, { - "key": "IsSuccess", + "base": "IsSuccess", "context": "{D1FEE25B-F252-5625-863C-1312E1F822A0}", "entry": { "name": "In", @@ -28896,7 +28896,7 @@ ] }, { - "key": "{33492660-D9A8-5E84-9CFB-03CBCD87919F}", + "base": "{33492660-D9A8-5E84-9CFB-03CBCD87919F}", "context": "OnDemandReflected", "variant": "", "details": { @@ -28906,7 +28906,7 @@ }, "methods": [ { - "key": "Size", + "base": "Size", "context": "{33492660-D9A8-5E84-9CFB-03CBCD87919F}", "entry": { "name": "In", @@ -28937,7 +28937,7 @@ ] }, { - "key": "Front", + "base": "Front", "context": "{33492660-D9A8-5E84-9CFB-03CBCD87919F}", "entry": { "name": "In", @@ -28968,7 +28968,7 @@ ] }, { - "key": "HasKey", + "base": "HasKey", "context": "{33492660-D9A8-5E84-9CFB-03CBCD87919F}", "entry": { "name": "In", @@ -29005,7 +29005,7 @@ ] }, { - "key": "Resize", + "base": "Resize", "context": "{33492660-D9A8-5E84-9CFB-03CBCD87919F}", "entry": { "name": "In", @@ -29034,7 +29034,7 @@ ] }, { - "key": "at", + "base": "at", "context": "{33492660-D9A8-5E84-9CFB-03CBCD87919F}", "entry": { "name": "In", @@ -29071,7 +29071,7 @@ ] }, { - "key": "Back", + "base": "Back", "context": "{33492660-D9A8-5E84-9CFB-03CBCD87919F}", "entry": { "name": "In", @@ -29102,7 +29102,7 @@ ] }, { - "key": "pop_back", + "base": "pop_back", "context": "{33492660-D9A8-5E84-9CFB-03CBCD87919F}", "entry": { "name": "In", @@ -29125,7 +29125,7 @@ ] }, { - "key": "size", + "base": "size", "context": "{33492660-D9A8-5E84-9CFB-03CBCD87919F}", "entry": { "name": "In", @@ -29156,7 +29156,7 @@ ] }, { - "key": "At", + "base": "At", "context": "{33492660-D9A8-5E84-9CFB-03CBCD87919F}", "entry": { "name": "In", @@ -29193,7 +29193,7 @@ ] }, { - "key": "Empty", + "base": "Empty", "context": "{33492660-D9A8-5E84-9CFB-03CBCD87919F}", "entry": { "name": "In", @@ -29224,7 +29224,7 @@ ] }, { - "key": "Swap", + "base": "Swap", "context": "{33492660-D9A8-5E84-9CFB-03CBCD87919F}", "entry": { "name": "In", @@ -29253,7 +29253,7 @@ ] }, { - "key": "push_back", + "base": "push_back", "context": "{33492660-D9A8-5E84-9CFB-03CBCD87919F}", "entry": { "name": "In", @@ -29282,7 +29282,7 @@ ] }, { - "key": "PushBack_VM", + "base": "PushBack_VM", "context": "{33492660-D9A8-5E84-9CFB-03CBCD87919F}", "entry": { "name": "In", @@ -29319,7 +29319,7 @@ ] }, { - "key": "AtUnchecked", + "base": "AtUnchecked", "context": "{33492660-D9A8-5E84-9CFB-03CBCD87919F}", "entry": { "name": "In", @@ -29356,7 +29356,7 @@ ] }, { - "key": "clear", + "base": "clear", "context": "{33492660-D9A8-5E84-9CFB-03CBCD87919F}", "entry": { "name": "In", @@ -29379,7 +29379,7 @@ ] }, { - "key": "NotEmpty", + "base": "NotEmpty", "context": "{33492660-D9A8-5E84-9CFB-03CBCD87919F}", "entry": { "name": "In", @@ -29410,7 +29410,7 @@ ] }, { - "key": "Erase_VM", + "base": "Erase_VM", "context": "{33492660-D9A8-5E84-9CFB-03CBCD87919F}", "entry": { "name": "In", @@ -29447,7 +29447,7 @@ ] }, { - "key": "EraseCheck_VM", + "base": "EraseCheck_VM", "context": "{33492660-D9A8-5E84-9CFB-03CBCD87919F}", "entry": { "name": "In", @@ -29484,7 +29484,7 @@ ] }, { - "key": "Capacity", + "base": "Capacity", "context": "{33492660-D9A8-5E84-9CFB-03CBCD87919F}", "entry": { "name": "In", @@ -29515,7 +29515,7 @@ ] }, { - "key": "Clear", + "base": "Clear", "context": "{33492660-D9A8-5E84-9CFB-03CBCD87919F}", "entry": { "name": "In", @@ -29546,7 +29546,7 @@ ] }, { - "key": "AssignAt", + "base": "AssignAt", "context": "{33492660-D9A8-5E84-9CFB-03CBCD87919F}", "entry": { "name": "In", @@ -29581,7 +29581,7 @@ ] }, { - "key": "GetSize", + "base": "GetSize", "context": "{33492660-D9A8-5E84-9CFB-03CBCD87919F}", "entry": { "name": "In", @@ -29612,7 +29612,7 @@ ] }, { - "key": "Insert", + "base": "Insert", "context": "{33492660-D9A8-5E84-9CFB-03CBCD87919F}", "entry": { "name": "In", @@ -29655,7 +29655,7 @@ ] }, { - "key": "PushBack", + "base": "PushBack", "context": "{33492660-D9A8-5E84-9CFB-03CBCD87919F}", "entry": { "name": "In", @@ -29684,7 +29684,7 @@ ] }, { - "key": "Reserve", + "base": "Reserve", "context": "{33492660-D9A8-5E84-9CFB-03CBCD87919F}", "entry": { "name": "In", @@ -29713,7 +29713,7 @@ ] }, { - "key": "Iterate_VM", + "base": "Iterate_VM", "context": "{33492660-D9A8-5E84-9CFB-03CBCD87919F}", "entry": { "name": "In", @@ -29746,7 +29746,7 @@ ] }, { - "key": "{6E6962E1-04C9-56F9-89C4-361031CC1384}", + "base": "{6E6962E1-04C9-56F9-89C4-361031CC1384}", "context": "OnDemandReflected", "variant": "", "details": { @@ -29756,7 +29756,7 @@ }, "methods": [ { - "key": "contains", + "base": "contains", "context": "{6E6962E1-04C9-56F9-89C4-361031CC1384}", "entry": { "name": "In", @@ -29793,7 +29793,7 @@ ] }, { - "key": "Insert", + "base": "Insert", "context": "{6E6962E1-04C9-56F9-89C4-361031CC1384}", "entry": { "name": "In", @@ -29836,7 +29836,7 @@ ] }, { - "key": "Reserve", + "base": "Reserve", "context": "{6E6962E1-04C9-56F9-89C4-361031CC1384}", "entry": { "name": "In", @@ -29865,7 +29865,7 @@ ] }, { - "key": "GetSize", + "base": "GetSize", "context": "{6E6962E1-04C9-56F9-89C4-361031CC1384}", "entry": { "name": "In", @@ -29896,7 +29896,7 @@ ] }, { - "key": "Iterate_VM", + "base": "Iterate_VM", "context": "{6E6962E1-04C9-56F9-89C4-361031CC1384}", "entry": { "name": "In", @@ -29927,7 +29927,7 @@ ] }, { - "key": "GetKeys", + "base": "GetKeys", "context": "{6E6962E1-04C9-56F9-89C4-361031CC1384}", "entry": { "name": "In", @@ -29958,7 +29958,7 @@ ] }, { - "key": "Size", + "base": "Size", "context": "{6E6962E1-04C9-56F9-89C4-361031CC1384}", "entry": { "name": "In", @@ -29989,7 +29989,7 @@ ] }, { - "key": "Erase", + "base": "Erase", "context": "{6E6962E1-04C9-56F9-89C4-361031CC1384}", "entry": { "name": "In", @@ -30026,7 +30026,7 @@ ] }, { - "key": "EraseCheck_VM", + "base": "EraseCheck_VM", "context": "{6E6962E1-04C9-56F9-89C4-361031CC1384}", "entry": { "name": "In", @@ -30063,7 +30063,7 @@ ] }, { - "key": "Clear", + "base": "Clear", "context": "{6E6962E1-04C9-56F9-89C4-361031CC1384}", "entry": { "name": "In", @@ -30094,7 +30094,7 @@ ] }, { - "key": "At", + "base": "At", "context": "{6E6962E1-04C9-56F9-89C4-361031CC1384}", "entry": { "name": "In", @@ -30131,7 +30131,7 @@ ] }, { - "key": "BucketCount", + "base": "BucketCount", "context": "{6E6962E1-04C9-56F9-89C4-361031CC1384}", "entry": { "name": "In", @@ -30162,7 +30162,7 @@ ] }, { - "key": "Empty", + "base": "Empty", "context": "{6E6962E1-04C9-56F9-89C4-361031CC1384}", "entry": { "name": "In", @@ -30193,7 +30193,7 @@ ] }, { - "key": "Swap", + "base": "Swap", "context": "{6E6962E1-04C9-56F9-89C4-361031CC1384}", "entry": { "name": "In", @@ -30224,7 +30224,7 @@ ] }, { - "key": "{8A408689-0904-5A87-B6C4-FAB519089D8B}", + "base": "{8A408689-0904-5A87-B6C4-FAB519089D8B}", "context": "OnDemandReflected", "variant": "", "details": { @@ -30234,7 +30234,7 @@ }, "methods": [ { - "key": "Size", + "base": "Size", "context": "{8A408689-0904-5A87-B6C4-FAB519089D8B}", "entry": { "name": "In", @@ -30265,7 +30265,7 @@ ] }, { - "key": "GetKeys", + "base": "GetKeys", "context": "{8A408689-0904-5A87-B6C4-FAB519089D8B}", "entry": { "name": "In", @@ -30296,7 +30296,7 @@ ] }, { - "key": "contains", + "base": "contains", "context": "{8A408689-0904-5A87-B6C4-FAB519089D8B}", "entry": { "name": "In", @@ -30333,7 +30333,7 @@ ] }, { - "key": "Insert", + "base": "Insert", "context": "{8A408689-0904-5A87-B6C4-FAB519089D8B}", "entry": { "name": "In", @@ -30370,7 +30370,7 @@ ] }, { - "key": "GetSize", + "base": "GetSize", "context": "{8A408689-0904-5A87-B6C4-FAB519089D8B}", "entry": { "name": "In", @@ -30401,7 +30401,7 @@ ] }, { - "key": "Reserve", + "base": "Reserve", "context": "{8A408689-0904-5A87-B6C4-FAB519089D8B}", "entry": { "name": "In", @@ -30430,7 +30430,7 @@ ] }, { - "key": "Iterate_VM", + "base": "Iterate_VM", "context": "{8A408689-0904-5A87-B6C4-FAB519089D8B}", "entry": { "name": "In", @@ -30461,7 +30461,7 @@ ] }, { - "key": "EraseCheck_VM", + "base": "EraseCheck_VM", "context": "{8A408689-0904-5A87-B6C4-FAB519089D8B}", "entry": { "name": "In", @@ -30498,7 +30498,7 @@ ] }, { - "key": "Erase", + "base": "Erase", "context": "{8A408689-0904-5A87-B6C4-FAB519089D8B}", "entry": { "name": "In", @@ -30535,7 +30535,7 @@ ] }, { - "key": "Clear", + "base": "Clear", "context": "{8A408689-0904-5A87-B6C4-FAB519089D8B}", "entry": { "name": "In", @@ -30566,7 +30566,7 @@ ] }, { - "key": "BucketCount", + "base": "BucketCount", "context": "{8A408689-0904-5A87-B6C4-FAB519089D8B}", "entry": { "name": "In", @@ -30597,7 +30597,7 @@ ] }, { - "key": "Empty", + "base": "Empty", "context": "{8A408689-0904-5A87-B6C4-FAB519089D8B}", "entry": { "name": "In", @@ -30628,7 +30628,7 @@ ] }, { - "key": "Swap", + "base": "Swap", "context": "{8A408689-0904-5A87-B6C4-FAB519089D8B}", "entry": { "name": "In", @@ -30659,7 +30659,7 @@ ] }, { - "key": "{C0311D23-97F1-556C-B6A4-ECD726543686}", + "base": "{C0311D23-97F1-556C-B6A4-ECD726543686}", "context": "OnDemandReflected", "variant": "", "details": { @@ -30669,7 +30669,7 @@ }, "methods": [ { - "key": "get", + "base": "get", "context": "{C0311D23-97F1-556C-B6A4-ECD726543686}", "entry": { "name": "In", @@ -30702,7 +30702,7 @@ ] }, { - "key": "{41599134-C1BF-51A5-B66A-7351FFD5EF42}", + "base": "{41599134-C1BF-51A5-B66A-7351FFD5EF42}", "context": "OnDemandReflected", "variant": "", "details": { @@ -30712,7 +30712,7 @@ }, "methods": [ { - "key": "contains", + "base": "contains", "context": "{41599134-C1BF-51A5-B66A-7351FFD5EF42}", "entry": { "name": "In", @@ -30749,7 +30749,7 @@ ] }, { - "key": "Insert", + "base": "Insert", "context": "{41599134-C1BF-51A5-B66A-7351FFD5EF42}", "entry": { "name": "In", @@ -30792,7 +30792,7 @@ ] }, { - "key": "Reserve", + "base": "Reserve", "context": "{41599134-C1BF-51A5-B66A-7351FFD5EF42}", "entry": { "name": "In", @@ -30821,7 +30821,7 @@ ] }, { - "key": "GetSize", + "base": "GetSize", "context": "{41599134-C1BF-51A5-B66A-7351FFD5EF42}", "entry": { "name": "In", @@ -30852,7 +30852,7 @@ ] }, { - "key": "Iterate_VM", + "base": "Iterate_VM", "context": "{41599134-C1BF-51A5-B66A-7351FFD5EF42}", "entry": { "name": "In", @@ -30883,7 +30883,7 @@ ] }, { - "key": "GetKeys", + "base": "GetKeys", "context": "{41599134-C1BF-51A5-B66A-7351FFD5EF42}", "entry": { "name": "In", @@ -30914,7 +30914,7 @@ ] }, { - "key": "Size", + "base": "Size", "context": "{41599134-C1BF-51A5-B66A-7351FFD5EF42}", "entry": { "name": "In", @@ -30945,7 +30945,7 @@ ] }, { - "key": "Erase", + "base": "Erase", "context": "{41599134-C1BF-51A5-B66A-7351FFD5EF42}", "entry": { "name": "In", @@ -30982,7 +30982,7 @@ ] }, { - "key": "EraseCheck_VM", + "base": "EraseCheck_VM", "context": "{41599134-C1BF-51A5-B66A-7351FFD5EF42}", "entry": { "name": "In", @@ -31019,7 +31019,7 @@ ] }, { - "key": "Clear", + "base": "Clear", "context": "{41599134-C1BF-51A5-B66A-7351FFD5EF42}", "entry": { "name": "In", @@ -31050,7 +31050,7 @@ ] }, { - "key": "At", + "base": "At", "context": "{41599134-C1BF-51A5-B66A-7351FFD5EF42}", "entry": { "name": "In", @@ -31087,7 +31087,7 @@ ] }, { - "key": "BucketCount", + "base": "BucketCount", "context": "{41599134-C1BF-51A5-B66A-7351FFD5EF42}", "entry": { "name": "In", @@ -31118,7 +31118,7 @@ ] }, { - "key": "Empty", + "base": "Empty", "context": "{41599134-C1BF-51A5-B66A-7351FFD5EF42}", "entry": { "name": "In", @@ -31149,7 +31149,7 @@ ] }, { - "key": "Swap", + "base": "Swap", "context": "{41599134-C1BF-51A5-B66A-7351FFD5EF42}", "entry": { "name": "In", @@ -31180,7 +31180,7 @@ ] }, { - "key": "{EEB1809B-78BA-5073-AEF8-8CC85F43DB4A}", + "base": "{EEB1809B-78BA-5073-AEF8-8CC85F43DB4A}", "context": "OnDemandReflected", "variant": "", "details": { @@ -31190,7 +31190,7 @@ }, "methods": [ { - "key": "contains", + "base": "contains", "context": "{EEB1809B-78BA-5073-AEF8-8CC85F43DB4A}", "entry": { "name": "In", @@ -31227,7 +31227,7 @@ ] }, { - "key": "Insert", + "base": "Insert", "context": "{EEB1809B-78BA-5073-AEF8-8CC85F43DB4A}", "entry": { "name": "In", @@ -31270,7 +31270,7 @@ ] }, { - "key": "Reserve", + "base": "Reserve", "context": "{EEB1809B-78BA-5073-AEF8-8CC85F43DB4A}", "entry": { "name": "In", @@ -31299,7 +31299,7 @@ ] }, { - "key": "GetSize", + "base": "GetSize", "context": "{EEB1809B-78BA-5073-AEF8-8CC85F43DB4A}", "entry": { "name": "In", @@ -31330,7 +31330,7 @@ ] }, { - "key": "Iterate_VM", + "base": "Iterate_VM", "context": "{EEB1809B-78BA-5073-AEF8-8CC85F43DB4A}", "entry": { "name": "In", @@ -31361,7 +31361,7 @@ ] }, { - "key": "GetKeys", + "base": "GetKeys", "context": "{EEB1809B-78BA-5073-AEF8-8CC85F43DB4A}", "entry": { "name": "In", @@ -31392,7 +31392,7 @@ ] }, { - "key": "Size", + "base": "Size", "context": "{EEB1809B-78BA-5073-AEF8-8CC85F43DB4A}", "entry": { "name": "In", @@ -31423,7 +31423,7 @@ ] }, { - "key": "Erase", + "base": "Erase", "context": "{EEB1809B-78BA-5073-AEF8-8CC85F43DB4A}", "entry": { "name": "In", @@ -31460,7 +31460,7 @@ ] }, { - "key": "EraseCheck_VM", + "base": "EraseCheck_VM", "context": "{EEB1809B-78BA-5073-AEF8-8CC85F43DB4A}", "entry": { "name": "In", @@ -31497,7 +31497,7 @@ ] }, { - "key": "Clear", + "base": "Clear", "context": "{EEB1809B-78BA-5073-AEF8-8CC85F43DB4A}", "entry": { "name": "In", @@ -31528,7 +31528,7 @@ ] }, { - "key": "At", + "base": "At", "context": "{EEB1809B-78BA-5073-AEF8-8CC85F43DB4A}", "entry": { "name": "In", @@ -31565,7 +31565,7 @@ ] }, { - "key": "BucketCount", + "base": "BucketCount", "context": "{EEB1809B-78BA-5073-AEF8-8CC85F43DB4A}", "entry": { "name": "In", @@ -31596,7 +31596,7 @@ ] }, { - "key": "Empty", + "base": "Empty", "context": "{EEB1809B-78BA-5073-AEF8-8CC85F43DB4A}", "entry": { "name": "In", @@ -31627,7 +31627,7 @@ ] }, { - "key": "Swap", + "base": "Swap", "context": "{EEB1809B-78BA-5073-AEF8-8CC85F43DB4A}", "entry": { "name": "In", @@ -31658,7 +31658,7 @@ ] }, { - "key": "{7114E998-A8B4-519B-9342-A86D1587B4F7}", + "base": "{7114E998-A8B4-519B-9342-A86D1587B4F7}", "context": "OnDemandReflected", "variant": "", "details": { @@ -31666,7 +31666,7 @@ }, "methods": [ { - "key": "remove_prefix", + "base": "remove_prefix", "context": "{7114E998-A8B4-519B-9342-A86D1587B4F7}", "entry": { "name": "In", @@ -31695,7 +31695,7 @@ ] }, { - "key": "substr", + "base": "substr", "context": "{7114E998-A8B4-519B-9342-A86D1587B4F7}", "entry": { "name": "In", @@ -31738,7 +31738,7 @@ ] }, { - "key": "find", + "base": "find", "context": "{7114E998-A8B4-519B-9342-A86D1587B4F7}", "entry": { "name": "In", @@ -31781,7 +31781,7 @@ ] }, { - "key": "length", + "base": "length", "context": "{7114E998-A8B4-519B-9342-A86D1587B4F7}", "entry": { "name": "In", @@ -31812,7 +31812,7 @@ ] }, { - "key": "data", + "base": "data", "context": "{7114E998-A8B4-519B-9342-A86D1587B4F7}", "entry": { "name": "In", @@ -31843,7 +31843,7 @@ ] }, { - "key": "ToString", + "base": "ToString", "context": "{7114E998-A8B4-519B-9342-A86D1587B4F7}", "entry": { "name": "In", @@ -31874,7 +31874,7 @@ ] }, { - "key": "size", + "base": "size", "context": "{7114E998-A8B4-519B-9342-A86D1587B4F7}", "entry": { "name": "In", @@ -31905,7 +31905,7 @@ ] }, { - "key": "remove_suffix", + "base": "remove_suffix", "context": "{7114E998-A8B4-519B-9342-A86D1587B4F7}", "entry": { "name": "In", @@ -31936,7 +31936,7 @@ ] }, { - "key": "{F17D3A96-7E22-5A6A-87D1-B0FB6E3A6C32}", + "base": "{F17D3A96-7E22-5A6A-87D1-B0FB6E3A6C32}", "context": "OnDemandReflected", "variant": "", "details": { @@ -31946,7 +31946,7 @@ }, "methods": [ { - "key": "contains", + "base": "contains", "context": "{F17D3A96-7E22-5A6A-87D1-B0FB6E3A6C32}", "entry": { "name": "In", @@ -31983,7 +31983,7 @@ ] }, { - "key": "Insert", + "base": "Insert", "context": "{F17D3A96-7E22-5A6A-87D1-B0FB6E3A6C32}", "entry": { "name": "In", @@ -32026,7 +32026,7 @@ ] }, { - "key": "Reserve", + "base": "Reserve", "context": "{F17D3A96-7E22-5A6A-87D1-B0FB6E3A6C32}", "entry": { "name": "In", @@ -32055,7 +32055,7 @@ ] }, { - "key": "GetSize", + "base": "GetSize", "context": "{F17D3A96-7E22-5A6A-87D1-B0FB6E3A6C32}", "entry": { "name": "In", @@ -32086,7 +32086,7 @@ ] }, { - "key": "Iterate_VM", + "base": "Iterate_VM", "context": "{F17D3A96-7E22-5A6A-87D1-B0FB6E3A6C32}", "entry": { "name": "In", @@ -32117,7 +32117,7 @@ ] }, { - "key": "GetKeys", + "base": "GetKeys", "context": "{F17D3A96-7E22-5A6A-87D1-B0FB6E3A6C32}", "entry": { "name": "In", @@ -32148,7 +32148,7 @@ ] }, { - "key": "Size", + "base": "Size", "context": "{F17D3A96-7E22-5A6A-87D1-B0FB6E3A6C32}", "entry": { "name": "In", @@ -32179,7 +32179,7 @@ ] }, { - "key": "Erase", + "base": "Erase", "context": "{F17D3A96-7E22-5A6A-87D1-B0FB6E3A6C32}", "entry": { "name": "In", @@ -32216,7 +32216,7 @@ ] }, { - "key": "EraseCheck_VM", + "base": "EraseCheck_VM", "context": "{F17D3A96-7E22-5A6A-87D1-B0FB6E3A6C32}", "entry": { "name": "In", @@ -32253,7 +32253,7 @@ ] }, { - "key": "Clear", + "base": "Clear", "context": "{F17D3A96-7E22-5A6A-87D1-B0FB6E3A6C32}", "entry": { "name": "In", @@ -32284,7 +32284,7 @@ ] }, { - "key": "At", + "base": "At", "context": "{F17D3A96-7E22-5A6A-87D1-B0FB6E3A6C32}", "entry": { "name": "In", @@ -32321,7 +32321,7 @@ ] }, { - "key": "BucketCount", + "base": "BucketCount", "context": "{F17D3A96-7E22-5A6A-87D1-B0FB6E3A6C32}", "entry": { "name": "In", @@ -32352,7 +32352,7 @@ ] }, { - "key": "Empty", + "base": "Empty", "context": "{F17D3A96-7E22-5A6A-87D1-B0FB6E3A6C32}", "entry": { "name": "In", @@ -32383,7 +32383,7 @@ ] }, { - "key": "Swap", + "base": "Swap", "context": "{F17D3A96-7E22-5A6A-87D1-B0FB6E3A6C32}", "entry": { "name": "In", @@ -32414,7 +32414,7 @@ ] }, { - "key": "{4BA06517-EDEC-59DC-B5FE-2FDE64BBEF6E}", + "base": "{4BA06517-EDEC-59DC-B5FE-2FDE64BBEF6E}", "context": "OnDemandReflected", "variant": "", "details": { @@ -32422,7 +32422,7 @@ }, "methods": [ { - "key": "IsLoading", + "base": "IsLoading", "context": "{4BA06517-EDEC-59DC-B5FE-2FDE64BBEF6E}", "entry": { "name": "In", @@ -32453,7 +32453,7 @@ ] }, { - "key": "GetType", + "base": "GetType", "context": "{4BA06517-EDEC-59DC-B5FE-2FDE64BBEF6E}", "entry": { "name": "In", @@ -32484,7 +32484,7 @@ ] }, { - "key": "IsError", + "base": "IsError", "context": "{4BA06517-EDEC-59DC-B5FE-2FDE64BBEF6E}", "entry": { "name": "In", @@ -32515,7 +32515,7 @@ ] }, { - "key": "GetHint", + "base": "GetHint", "context": "{4BA06517-EDEC-59DC-B5FE-2FDE64BBEF6E}", "entry": { "name": "In", @@ -32546,7 +32546,7 @@ ] }, { - "key": "GetData", + "base": "GetData", "context": "{4BA06517-EDEC-59DC-B5FE-2FDE64BBEF6E}", "entry": { "name": "In", @@ -32577,7 +32577,7 @@ ] }, { - "key": "IsReady", + "base": "IsReady", "context": "{4BA06517-EDEC-59DC-B5FE-2FDE64BBEF6E}", "entry": { "name": "In", @@ -32608,7 +32608,7 @@ ] }, { - "key": "GetStatus", + "base": "GetStatus", "context": "{4BA06517-EDEC-59DC-B5FE-2FDE64BBEF6E}", "entry": { "name": "In", @@ -32639,7 +32639,7 @@ ] }, { - "key": "GetId", + "base": "GetId", "context": "{4BA06517-EDEC-59DC-B5FE-2FDE64BBEF6E}", "entry": { "name": "In", @@ -32672,7 +32672,7 @@ ] }, { - "key": "{549C99B0-35FE-515D-9066-DFA9A1131500}", + "base": "{549C99B0-35FE-515D-9066-DFA9A1131500}", "context": "OnDemandReflected", "variant": "", "details": { @@ -32682,7 +32682,7 @@ }, "methods": [ { - "key": "contains", + "base": "contains", "context": "{549C99B0-35FE-515D-9066-DFA9A1131500}", "entry": { "name": "In", @@ -32719,7 +32719,7 @@ ] }, { - "key": "Insert", + "base": "Insert", "context": "{549C99B0-35FE-515D-9066-DFA9A1131500}", "entry": { "name": "In", @@ -32762,7 +32762,7 @@ ] }, { - "key": "Reserve", + "base": "Reserve", "context": "{549C99B0-35FE-515D-9066-DFA9A1131500}", "entry": { "name": "In", @@ -32791,7 +32791,7 @@ ] }, { - "key": "GetSize", + "base": "GetSize", "context": "{549C99B0-35FE-515D-9066-DFA9A1131500}", "entry": { "name": "In", @@ -32822,7 +32822,7 @@ ] }, { - "key": "Iterate_VM", + "base": "Iterate_VM", "context": "{549C99B0-35FE-515D-9066-DFA9A1131500}", "entry": { "name": "In", @@ -32853,7 +32853,7 @@ ] }, { - "key": "GetKeys", + "base": "GetKeys", "context": "{549C99B0-35FE-515D-9066-DFA9A1131500}", "entry": { "name": "In", @@ -32884,7 +32884,7 @@ ] }, { - "key": "Size", + "base": "Size", "context": "{549C99B0-35FE-515D-9066-DFA9A1131500}", "entry": { "name": "In", @@ -32915,7 +32915,7 @@ ] }, { - "key": "Erase", + "base": "Erase", "context": "{549C99B0-35FE-515D-9066-DFA9A1131500}", "entry": { "name": "In", @@ -32952,7 +32952,7 @@ ] }, { - "key": "EraseCheck_VM", + "base": "EraseCheck_VM", "context": "{549C99B0-35FE-515D-9066-DFA9A1131500}", "entry": { "name": "In", @@ -32989,7 +32989,7 @@ ] }, { - "key": "Clear", + "base": "Clear", "context": "{549C99B0-35FE-515D-9066-DFA9A1131500}", "entry": { "name": "In", @@ -33020,7 +33020,7 @@ ] }, { - "key": "At", + "base": "At", "context": "{549C99B0-35FE-515D-9066-DFA9A1131500}", "entry": { "name": "In", @@ -33057,7 +33057,7 @@ ] }, { - "key": "BucketCount", + "base": "BucketCount", "context": "{549C99B0-35FE-515D-9066-DFA9A1131500}", "entry": { "name": "In", @@ -33088,7 +33088,7 @@ ] }, { - "key": "Empty", + "base": "Empty", "context": "{549C99B0-35FE-515D-9066-DFA9A1131500}", "entry": { "name": "In", @@ -33119,7 +33119,7 @@ ] }, { - "key": "Swap", + "base": "Swap", "context": "{549C99B0-35FE-515D-9066-DFA9A1131500}", "entry": { "name": "In", @@ -33150,7 +33150,7 @@ ] }, { - "key": "{D8B65A5B-38FF-4B41-9FA4-FCA080D75625}", + "base": "{D8B65A5B-38FF-4B41-9FA4-FCA080D75625}", "context": "OnDemandReflected", "variant": "", "details": { @@ -33158,7 +33158,7 @@ }, "methods": [ { - "key": "FromString", + "base": "FromString", "context": "{D8B65A5B-38FF-4B41-9FA4-FCA080D75625}", "entry": { "name": "In", @@ -33191,7 +33191,7 @@ ] }, { - "key": "{66027D7A-FCD1-4592-93E5-EB4B7F4BD671}", + "base": "{66027D7A-FCD1-4592-93E5-EB4B7F4BD671}", "context": "OnDemandReflected", "variant": "", "details": { @@ -33199,7 +33199,7 @@ }, "methods": [ { - "key": "SetW", + "base": "SetW", "context": "{66027D7A-FCD1-4592-93E5-EB4B7F4BD671}", "entry": { "name": "In", @@ -33236,7 +33236,7 @@ ] }, { - "key": "SetX", + "base": "SetX", "context": "{66027D7A-FCD1-4592-93E5-EB4B7F4BD671}", "entry": { "name": "In", @@ -33273,7 +33273,7 @@ ] }, { - "key": "IsNormalized", + "base": "IsNormalized", "context": "{66027D7A-FCD1-4592-93E5-EB4B7F4BD671}", "entry": { "name": "In", @@ -33310,7 +33310,7 @@ ] }, { - "key": "LengthSquared", + "base": "LengthSquared", "context": "{66027D7A-FCD1-4592-93E5-EB4B7F4BD671}", "entry": { "name": "In", @@ -33341,7 +33341,7 @@ ] }, { - "key": "MultiplyByNumber", + "base": "MultiplyByNumber", "context": "{66027D7A-FCD1-4592-93E5-EB4B7F4BD671}", "entry": { "name": "In", @@ -33378,7 +33378,7 @@ ] }, { - "key": "Negate", + "base": "Negate", "context": "{66027D7A-FCD1-4592-93E5-EB4B7F4BD671}", "entry": { "name": "In", @@ -33409,7 +33409,7 @@ ] }, { - "key": "Dot", + "base": "Dot", "context": "{66027D7A-FCD1-4592-93E5-EB4B7F4BD671}", "entry": { "name": "In", @@ -33446,7 +33446,7 @@ ] }, { - "key": "FromValues", + "base": "FromValues", "context": "{66027D7A-FCD1-4592-93E5-EB4B7F4BD671}", "entry": { "name": "In", @@ -33495,7 +33495,7 @@ ] }, { - "key": "IsFinite", + "base": "IsFinite", "context": "{66027D7A-FCD1-4592-93E5-EB4B7F4BD671}", "entry": { "name": "In", @@ -33526,7 +33526,7 @@ ] }, { - "key": "Length", + "base": "Length", "context": "{66027D7A-FCD1-4592-93E5-EB4B7F4BD671}", "entry": { "name": "In", @@ -33557,7 +33557,7 @@ ] }, { - "key": "MultiplyByVector", + "base": "MultiplyByVector", "context": "{66027D7A-FCD1-4592-93E5-EB4B7F4BD671}", "entry": { "name": "In", @@ -33594,7 +33594,7 @@ ] }, { - "key": "DirectionTo", + "base": "DirectionTo", "context": "{66027D7A-FCD1-4592-93E5-EB4B7F4BD671}", "entry": { "name": "In", @@ -33637,7 +33637,7 @@ ] }, { - "key": "DivideByVector", + "base": "DivideByVector", "context": "{66027D7A-FCD1-4592-93E5-EB4B7F4BD671}", "entry": { "name": "In", @@ -33674,7 +33674,7 @@ ] }, { - "key": "LengthReciprocal", + "base": "LengthReciprocal", "context": "{66027D7A-FCD1-4592-93E5-EB4B7F4BD671}", "entry": { "name": "In", @@ -33705,7 +33705,7 @@ ] }, { - "key": "SetZ", + "base": "SetZ", "context": "{66027D7A-FCD1-4592-93E5-EB4B7F4BD671}", "entry": { "name": "In", @@ -33742,7 +33742,7 @@ ] }, { - "key": "Normalize", + "base": "Normalize", "context": "{66027D7A-FCD1-4592-93E5-EB4B7F4BD671}", "entry": { "name": "In", @@ -33773,7 +33773,7 @@ ] }, { - "key": "DivideByNumber", + "base": "DivideByNumber", "context": "{66027D7A-FCD1-4592-93E5-EB4B7F4BD671}", "entry": { "name": "In", @@ -33810,7 +33810,7 @@ ] }, { - "key": "IsClose", + "base": "IsClose", "context": "{66027D7A-FCD1-4592-93E5-EB4B7F4BD671}", "entry": { "name": "In", @@ -33853,7 +33853,7 @@ ] }, { - "key": "IsZero", + "base": "IsZero", "context": "{66027D7A-FCD1-4592-93E5-EB4B7F4BD671}", "entry": { "name": "In", @@ -33890,7 +33890,7 @@ ] }, { - "key": "Add", + "base": "Add", "context": "{66027D7A-FCD1-4592-93E5-EB4B7F4BD671}", "entry": { "name": "In", @@ -33927,7 +33927,7 @@ ] }, { - "key": "GetElement", + "base": "GetElement", "context": "{66027D7A-FCD1-4592-93E5-EB4B7F4BD671}", "entry": { "name": "In", @@ -33964,7 +33964,7 @@ ] }, { - "key": "Reciprocal", + "base": "Reciprocal", "context": "{66027D7A-FCD1-4592-93E5-EB4B7F4BD671}", "entry": { "name": "In", @@ -33995,7 +33995,7 @@ ] }, { - "key": "Subtract", + "base": "Subtract", "context": "{66027D7A-FCD1-4592-93E5-EB4B7F4BD671}", "entry": { "name": "In", @@ -34032,7 +34032,7 @@ ] }, { - "key": "Absolute", + "base": "Absolute", "context": "{66027D7A-FCD1-4592-93E5-EB4B7F4BD671}", "entry": { "name": "In", @@ -34063,7 +34063,7 @@ ] }, { - "key": "SetY", + "base": "SetY", "context": "{66027D7A-FCD1-4592-93E5-EB4B7F4BD671}", "entry": { "name": "In", @@ -34102,7 +34102,7 @@ ] }, { - "key": "{36669095-4036-5479-B116-41A32E4E16EA}", + "base": "{36669095-4036-5479-B116-41A32E4E16EA}", "context": "OnDemandReflected", "variant": "", "details": { @@ -34110,7 +34110,7 @@ }, "methods": [ { - "key": "Get0", + "base": "Get0", "context": "{36669095-4036-5479-B116-41A32E4E16EA}", "entry": { "name": "In", @@ -34141,7 +34141,7 @@ ] }, { - "key": "Get1", + "base": "Get1", "context": "{36669095-4036-5479-B116-41A32E4E16EA}", "entry": { "name": "In", @@ -34172,7 +34172,7 @@ ] }, { - "key": "GetSize", + "base": "GetSize", "context": "{36669095-4036-5479-B116-41A32E4E16EA}", "entry": { "name": "In", @@ -34197,7 +34197,7 @@ ] }, { - "key": "{87C2A8D1-7954-5AF0-8E1A-B0BB94A6A291}", + "base": "{87C2A8D1-7954-5AF0-8E1A-B0BB94A6A291}", "context": "OnDemandReflected", "variant": "", "details": { @@ -34207,7 +34207,7 @@ }, "methods": [ { - "key": "contains", + "base": "contains", "context": "{87C2A8D1-7954-5AF0-8E1A-B0BB94A6A291}", "entry": { "name": "In", @@ -34244,7 +34244,7 @@ ] }, { - "key": "Insert", + "base": "Insert", "context": "{87C2A8D1-7954-5AF0-8E1A-B0BB94A6A291}", "entry": { "name": "In", @@ -34287,7 +34287,7 @@ ] }, { - "key": "Reserve", + "base": "Reserve", "context": "{87C2A8D1-7954-5AF0-8E1A-B0BB94A6A291}", "entry": { "name": "In", @@ -34316,7 +34316,7 @@ ] }, { - "key": "GetSize", + "base": "GetSize", "context": "{87C2A8D1-7954-5AF0-8E1A-B0BB94A6A291}", "entry": { "name": "In", @@ -34347,7 +34347,7 @@ ] }, { - "key": "Iterate_VM", + "base": "Iterate_VM", "context": "{87C2A8D1-7954-5AF0-8E1A-B0BB94A6A291}", "entry": { "name": "In", @@ -34378,7 +34378,7 @@ ] }, { - "key": "GetKeys", + "base": "GetKeys", "context": "{87C2A8D1-7954-5AF0-8E1A-B0BB94A6A291}", "entry": { "name": "In", @@ -34409,7 +34409,7 @@ ] }, { - "key": "Size", + "base": "Size", "context": "{87C2A8D1-7954-5AF0-8E1A-B0BB94A6A291}", "entry": { "name": "In", @@ -34440,7 +34440,7 @@ ] }, { - "key": "Erase", + "base": "Erase", "context": "{87C2A8D1-7954-5AF0-8E1A-B0BB94A6A291}", "entry": { "name": "In", @@ -34477,7 +34477,7 @@ ] }, { - "key": "EraseCheck_VM", + "base": "EraseCheck_VM", "context": "{87C2A8D1-7954-5AF0-8E1A-B0BB94A6A291}", "entry": { "name": "In", @@ -34514,7 +34514,7 @@ ] }, { - "key": "Clear", + "base": "Clear", "context": "{87C2A8D1-7954-5AF0-8E1A-B0BB94A6A291}", "entry": { "name": "In", @@ -34545,7 +34545,7 @@ ] }, { - "key": "At", + "base": "At", "context": "{87C2A8D1-7954-5AF0-8E1A-B0BB94A6A291}", "entry": { "name": "In", @@ -34582,7 +34582,7 @@ ] }, { - "key": "BucketCount", + "base": "BucketCount", "context": "{87C2A8D1-7954-5AF0-8E1A-B0BB94A6A291}", "entry": { "name": "In", @@ -34613,7 +34613,7 @@ ] }, { - "key": "Empty", + "base": "Empty", "context": "{87C2A8D1-7954-5AF0-8E1A-B0BB94A6A291}", "entry": { "name": "In", @@ -34644,7 +34644,7 @@ ] }, { - "key": "Swap", + "base": "Swap", "context": "{87C2A8D1-7954-5AF0-8E1A-B0BB94A6A291}", "entry": { "name": "In", @@ -34675,7 +34675,7 @@ ] }, { - "key": "{F31F64EA-E384-5536-ACD6-8F01849730FC}", + "base": "{F31F64EA-E384-5536-ACD6-8F01849730FC}", "context": "OnDemandReflected", "variant": "", "details": { @@ -34685,7 +34685,7 @@ }, "methods": [ { - "key": "Size", + "base": "Size", "context": "{F31F64EA-E384-5536-ACD6-8F01849730FC}", "entry": { "name": "In", @@ -34716,7 +34716,7 @@ ] }, { - "key": "Front", + "base": "Front", "context": "{F31F64EA-E384-5536-ACD6-8F01849730FC}", "entry": { "name": "In", @@ -34747,7 +34747,7 @@ ] }, { - "key": "HasKey", + "base": "HasKey", "context": "{F31F64EA-E384-5536-ACD6-8F01849730FC}", "entry": { "name": "In", @@ -34784,7 +34784,7 @@ ] }, { - "key": "Resize", + "base": "Resize", "context": "{F31F64EA-E384-5536-ACD6-8F01849730FC}", "entry": { "name": "In", @@ -34813,7 +34813,7 @@ ] }, { - "key": "at", + "base": "at", "context": "{F31F64EA-E384-5536-ACD6-8F01849730FC}", "entry": { "name": "In", @@ -34850,7 +34850,7 @@ ] }, { - "key": "Back", + "base": "Back", "context": "{F31F64EA-E384-5536-ACD6-8F01849730FC}", "entry": { "name": "In", @@ -34881,7 +34881,7 @@ ] }, { - "key": "pop_back", + "base": "pop_back", "context": "{F31F64EA-E384-5536-ACD6-8F01849730FC}", "entry": { "name": "In", @@ -34904,7 +34904,7 @@ ] }, { - "key": "size", + "base": "size", "context": "{F31F64EA-E384-5536-ACD6-8F01849730FC}", "entry": { "name": "In", @@ -34935,7 +34935,7 @@ ] }, { - "key": "At", + "base": "At", "context": "{F31F64EA-E384-5536-ACD6-8F01849730FC}", "entry": { "name": "In", @@ -34972,7 +34972,7 @@ ] }, { - "key": "Empty", + "base": "Empty", "context": "{F31F64EA-E384-5536-ACD6-8F01849730FC}", "entry": { "name": "In", @@ -35003,7 +35003,7 @@ ] }, { - "key": "Swap", + "base": "Swap", "context": "{F31F64EA-E384-5536-ACD6-8F01849730FC}", "entry": { "name": "In", @@ -35032,7 +35032,7 @@ ] }, { - "key": "push_back", + "base": "push_back", "context": "{F31F64EA-E384-5536-ACD6-8F01849730FC}", "entry": { "name": "In", @@ -35061,7 +35061,7 @@ ] }, { - "key": "PushBack_VM", + "base": "PushBack_VM", "context": "{F31F64EA-E384-5536-ACD6-8F01849730FC}", "entry": { "name": "In", @@ -35098,7 +35098,7 @@ ] }, { - "key": "AtUnchecked", + "base": "AtUnchecked", "context": "{F31F64EA-E384-5536-ACD6-8F01849730FC}", "entry": { "name": "In", @@ -35135,7 +35135,7 @@ ] }, { - "key": "clear", + "base": "clear", "context": "{F31F64EA-E384-5536-ACD6-8F01849730FC}", "entry": { "name": "In", @@ -35158,7 +35158,7 @@ ] }, { - "key": "NotEmpty", + "base": "NotEmpty", "context": "{F31F64EA-E384-5536-ACD6-8F01849730FC}", "entry": { "name": "In", @@ -35189,7 +35189,7 @@ ] }, { - "key": "Erase_VM", + "base": "Erase_VM", "context": "{F31F64EA-E384-5536-ACD6-8F01849730FC}", "entry": { "name": "In", @@ -35226,7 +35226,7 @@ ] }, { - "key": "EraseCheck_VM", + "base": "EraseCheck_VM", "context": "{F31F64EA-E384-5536-ACD6-8F01849730FC}", "entry": { "name": "In", @@ -35263,7 +35263,7 @@ ] }, { - "key": "Capacity", + "base": "Capacity", "context": "{F31F64EA-E384-5536-ACD6-8F01849730FC}", "entry": { "name": "In", @@ -35294,7 +35294,7 @@ ] }, { - "key": "Clear", + "base": "Clear", "context": "{F31F64EA-E384-5536-ACD6-8F01849730FC}", "entry": { "name": "In", @@ -35325,7 +35325,7 @@ ] }, { - "key": "AssignAt", + "base": "AssignAt", "context": "{F31F64EA-E384-5536-ACD6-8F01849730FC}", "entry": { "name": "In", @@ -35360,7 +35360,7 @@ ] }, { - "key": "GetSize", + "base": "GetSize", "context": "{F31F64EA-E384-5536-ACD6-8F01849730FC}", "entry": { "name": "In", @@ -35391,7 +35391,7 @@ ] }, { - "key": "Insert", + "base": "Insert", "context": "{F31F64EA-E384-5536-ACD6-8F01849730FC}", "entry": { "name": "In", @@ -35434,7 +35434,7 @@ ] }, { - "key": "PushBack", + "base": "PushBack", "context": "{F31F64EA-E384-5536-ACD6-8F01849730FC}", "entry": { "name": "In", @@ -35463,7 +35463,7 @@ ] }, { - "key": "Reserve", + "base": "Reserve", "context": "{F31F64EA-E384-5536-ACD6-8F01849730FC}", "entry": { "name": "In", @@ -35492,7 +35492,7 @@ ] }, { - "key": "Iterate_VM", + "base": "Iterate_VM", "context": "{F31F64EA-E384-5536-ACD6-8F01849730FC}", "entry": { "name": "In", @@ -35525,7 +35525,7 @@ ] }, { - "key": "{99DAD0BC-740E-5E82-826B-8FC7968CC02C}", + "base": "{99DAD0BC-740E-5E82-826B-8FC7968CC02C}", "context": "OnDemandReflected", "variant": "", "details": { @@ -35535,7 +35535,7 @@ }, "methods": [ { - "key": "Size", + "base": "Size", "context": "{99DAD0BC-740E-5E82-826B-8FC7968CC02C}", "entry": { "name": "In", @@ -35566,7 +35566,7 @@ ] }, { - "key": "Front", + "base": "Front", "context": "{99DAD0BC-740E-5E82-826B-8FC7968CC02C}", "entry": { "name": "In", @@ -35597,7 +35597,7 @@ ] }, { - "key": "HasKey", + "base": "HasKey", "context": "{99DAD0BC-740E-5E82-826B-8FC7968CC02C}", "entry": { "name": "In", @@ -35634,7 +35634,7 @@ ] }, { - "key": "Resize", + "base": "Resize", "context": "{99DAD0BC-740E-5E82-826B-8FC7968CC02C}", "entry": { "name": "In", @@ -35663,7 +35663,7 @@ ] }, { - "key": "at", + "base": "at", "context": "{99DAD0BC-740E-5E82-826B-8FC7968CC02C}", "entry": { "name": "In", @@ -35700,7 +35700,7 @@ ] }, { - "key": "Back", + "base": "Back", "context": "{99DAD0BC-740E-5E82-826B-8FC7968CC02C}", "entry": { "name": "In", @@ -35731,7 +35731,7 @@ ] }, { - "key": "pop_back", + "base": "pop_back", "context": "{99DAD0BC-740E-5E82-826B-8FC7968CC02C}", "entry": { "name": "In", @@ -35754,7 +35754,7 @@ ] }, { - "key": "size", + "base": "size", "context": "{99DAD0BC-740E-5E82-826B-8FC7968CC02C}", "entry": { "name": "In", @@ -35785,7 +35785,7 @@ ] }, { - "key": "At", + "base": "At", "context": "{99DAD0BC-740E-5E82-826B-8FC7968CC02C}", "entry": { "name": "In", @@ -35822,7 +35822,7 @@ ] }, { - "key": "Empty", + "base": "Empty", "context": "{99DAD0BC-740E-5E82-826B-8FC7968CC02C}", "entry": { "name": "In", @@ -35853,7 +35853,7 @@ ] }, { - "key": "Swap", + "base": "Swap", "context": "{99DAD0BC-740E-5E82-826B-8FC7968CC02C}", "entry": { "name": "In", @@ -35882,7 +35882,7 @@ ] }, { - "key": "push_back", + "base": "push_back", "context": "{99DAD0BC-740E-5E82-826B-8FC7968CC02C}", "entry": { "name": "In", @@ -35911,7 +35911,7 @@ ] }, { - "key": "PushBack_VM", + "base": "PushBack_VM", "context": "{99DAD0BC-740E-5E82-826B-8FC7968CC02C}", "entry": { "name": "In", @@ -35948,7 +35948,7 @@ ] }, { - "key": "AtUnchecked", + "base": "AtUnchecked", "context": "{99DAD0BC-740E-5E82-826B-8FC7968CC02C}", "entry": { "name": "In", @@ -35985,7 +35985,7 @@ ] }, { - "key": "clear", + "base": "clear", "context": "{99DAD0BC-740E-5E82-826B-8FC7968CC02C}", "entry": { "name": "In", @@ -36008,7 +36008,7 @@ ] }, { - "key": "NotEmpty", + "base": "NotEmpty", "context": "{99DAD0BC-740E-5E82-826B-8FC7968CC02C}", "entry": { "name": "In", @@ -36039,7 +36039,7 @@ ] }, { - "key": "Erase_VM", + "base": "Erase_VM", "context": "{99DAD0BC-740E-5E82-826B-8FC7968CC02C}", "entry": { "name": "In", @@ -36076,7 +36076,7 @@ ] }, { - "key": "EraseCheck_VM", + "base": "EraseCheck_VM", "context": "{99DAD0BC-740E-5E82-826B-8FC7968CC02C}", "entry": { "name": "In", @@ -36113,7 +36113,7 @@ ] }, { - "key": "Capacity", + "base": "Capacity", "context": "{99DAD0BC-740E-5E82-826B-8FC7968CC02C}", "entry": { "name": "In", @@ -36144,7 +36144,7 @@ ] }, { - "key": "Clear", + "base": "Clear", "context": "{99DAD0BC-740E-5E82-826B-8FC7968CC02C}", "entry": { "name": "In", @@ -36175,7 +36175,7 @@ ] }, { - "key": "AssignAt", + "base": "AssignAt", "context": "{99DAD0BC-740E-5E82-826B-8FC7968CC02C}", "entry": { "name": "In", @@ -36210,7 +36210,7 @@ ] }, { - "key": "GetSize", + "base": "GetSize", "context": "{99DAD0BC-740E-5E82-826B-8FC7968CC02C}", "entry": { "name": "In", @@ -36241,7 +36241,7 @@ ] }, { - "key": "Insert", + "base": "Insert", "context": "{99DAD0BC-740E-5E82-826B-8FC7968CC02C}", "entry": { "name": "In", @@ -36284,7 +36284,7 @@ ] }, { - "key": "PushBack", + "base": "PushBack", "context": "{99DAD0BC-740E-5E82-826B-8FC7968CC02C}", "entry": { "name": "In", @@ -36313,7 +36313,7 @@ ] }, { - "key": "Reserve", + "base": "Reserve", "context": "{99DAD0BC-740E-5E82-826B-8FC7968CC02C}", "entry": { "name": "In", @@ -36342,7 +36342,7 @@ ] }, { - "key": "Iterate_VM", + "base": "Iterate_VM", "context": "{99DAD0BC-740E-5E82-826B-8FC7968CC02C}", "entry": { "name": "In", @@ -36375,7 +36375,7 @@ ] }, { - "key": "{537AB179-E23C-492D-8EF7-53845A2DB163}", + "base": "{537AB179-E23C-492D-8EF7-53845A2DB163}", "context": "OnDemandReflected", "variant": "", "details": { @@ -36383,7 +36383,7 @@ }, "methods": [ { - "key": "GetRow", + "base": "GetRow", "context": "{537AB179-E23C-492D-8EF7-53845A2DB163}", "entry": { "name": "In", @@ -36420,7 +36420,7 @@ ] }, { - "key": "FromRotationXDegrees", + "base": "FromRotationXDegrees", "context": "{537AB179-E23C-492D-8EF7-53845A2DB163}", "entry": { "name": "In", @@ -36451,7 +36451,7 @@ ] }, { - "key": "FromRotationZDegrees", + "base": "FromRotationZDegrees", "context": "{537AB179-E23C-492D-8EF7-53845A2DB163}", "entry": { "name": "In", @@ -36482,7 +36482,7 @@ ] }, { - "key": "FromRows", + "base": "FromRows", "context": "{537AB179-E23C-492D-8EF7-53845A2DB163}", "entry": { "name": "In", @@ -36531,7 +36531,7 @@ ] }, { - "key": "ToScale", + "base": "ToScale", "context": "{537AB179-E23C-492D-8EF7-53845A2DB163}", "entry": { "name": "In", @@ -36562,7 +36562,7 @@ ] }, { - "key": "FromQuaternion", + "base": "FromQuaternion", "context": "{537AB179-E23C-492D-8EF7-53845A2DB163}", "entry": { "name": "In", @@ -36593,7 +36593,7 @@ ] }, { - "key": "FromScale", + "base": "FromScale", "context": "{537AB179-E23C-492D-8EF7-53845A2DB163}", "entry": { "name": "In", @@ -36624,7 +36624,7 @@ ] }, { - "key": "FromTransform", + "base": "FromTransform", "context": "{537AB179-E23C-492D-8EF7-53845A2DB163}", "entry": { "name": "In", @@ -36655,7 +36655,7 @@ ] }, { - "key": "GetTranslation", + "base": "GetTranslation", "context": "{537AB179-E23C-492D-8EF7-53845A2DB163}", "entry": { "name": "In", @@ -36686,7 +36686,7 @@ ] }, { - "key": "FromQuaternionAndTranslation", + "base": "FromQuaternionAndTranslation", "context": "{537AB179-E23C-492D-8EF7-53845A2DB163}", "entry": { "name": "In", @@ -36723,7 +36723,7 @@ ] }, { - "key": "GetColumn", + "base": "GetColumn", "context": "{537AB179-E23C-492D-8EF7-53845A2DB163}", "entry": { "name": "In", @@ -36760,7 +36760,7 @@ ] }, { - "key": "GetDiagonal", + "base": "GetDiagonal", "context": "{537AB179-E23C-492D-8EF7-53845A2DB163}", "entry": { "name": "In", @@ -36791,7 +36791,7 @@ ] }, { - "key": "Invert", + "base": "Invert", "context": "{537AB179-E23C-492D-8EF7-53845A2DB163}", "entry": { "name": "In", @@ -36822,7 +36822,7 @@ ] }, { - "key": "IsClose", + "base": "IsClose", "context": "{537AB179-E23C-492D-8EF7-53845A2DB163}", "entry": { "name": "In", @@ -36865,7 +36865,7 @@ ] }, { - "key": "FromMatrix3x3", + "base": "FromMatrix3x3", "context": "{537AB179-E23C-492D-8EF7-53845A2DB163}", "entry": { "name": "In", @@ -36896,7 +36896,7 @@ ] }, { - "key": "GetColumns", + "base": "GetColumns", "context": "{537AB179-E23C-492D-8EF7-53845A2DB163}", "entry": { "name": "In", @@ -36927,7 +36927,7 @@ ] }, { - "key": "GetRows", + "base": "GetRows", "context": "{537AB179-E23C-492D-8EF7-53845A2DB163}", "entry": { "name": "In", @@ -36958,7 +36958,7 @@ ] }, { - "key": "MultiplyByMatrix", + "base": "MultiplyByMatrix", "context": "{537AB179-E23C-492D-8EF7-53845A2DB163}", "entry": { "name": "In", @@ -36995,7 +36995,7 @@ ] }, { - "key": "FromDiagonal", + "base": "FromDiagonal", "context": "{537AB179-E23C-492D-8EF7-53845A2DB163}", "entry": { "name": "In", @@ -37026,7 +37026,7 @@ ] }, { - "key": "FromRotationYDegrees", + "base": "FromRotationYDegrees", "context": "{537AB179-E23C-492D-8EF7-53845A2DB163}", "entry": { "name": "In", @@ -37057,7 +37057,7 @@ ] }, { - "key": "GetElement", + "base": "GetElement", "context": "{537AB179-E23C-492D-8EF7-53845A2DB163}", "entry": { "name": "In", @@ -37100,7 +37100,7 @@ ] }, { - "key": "Transpose", + "base": "Transpose", "context": "{537AB179-E23C-492D-8EF7-53845A2DB163}", "entry": { "name": "In", @@ -37131,7 +37131,7 @@ ] }, { - "key": "FromColumns", + "base": "FromColumns", "context": "{537AB179-E23C-492D-8EF7-53845A2DB163}", "entry": { "name": "In", @@ -37180,7 +37180,7 @@ ] }, { - "key": "FromTranslation", + "base": "FromTranslation", "context": "{537AB179-E23C-492D-8EF7-53845A2DB163}", "entry": { "name": "In", @@ -37211,7 +37211,7 @@ ] }, { - "key": "IsFinite", + "base": "IsFinite", "context": "{537AB179-E23C-492D-8EF7-53845A2DB163}", "entry": { "name": "In", @@ -37242,7 +37242,7 @@ ] }, { - "key": "MultiplyByVector", + "base": "MultiplyByVector", "context": "{537AB179-E23C-492D-8EF7-53845A2DB163}", "entry": { "name": "In", @@ -37279,7 +37279,7 @@ ] }, { - "key": "Zero", + "base": "Zero", "context": "{537AB179-E23C-492D-8EF7-53845A2DB163}", "entry": { "name": "In", @@ -37304,7 +37304,7 @@ ] }, { - "key": "{C338C806-EBD9-5471-AB22-66F7584A5890}", + "base": "{C338C806-EBD9-5471-AB22-66F7584A5890}", "context": "OnDemandReflected", "variant": "", "details": { @@ -37314,7 +37314,7 @@ }, "methods": [ { - "key": "contains", + "base": "contains", "context": "{C338C806-EBD9-5471-AB22-66F7584A5890}", "entry": { "name": "In", @@ -37351,7 +37351,7 @@ ] }, { - "key": "Insert", + "base": "Insert", "context": "{C338C806-EBD9-5471-AB22-66F7584A5890}", "entry": { "name": "In", @@ -37394,7 +37394,7 @@ ] }, { - "key": "Reserve", + "base": "Reserve", "context": "{C338C806-EBD9-5471-AB22-66F7584A5890}", "entry": { "name": "In", @@ -37423,7 +37423,7 @@ ] }, { - "key": "GetSize", + "base": "GetSize", "context": "{C338C806-EBD9-5471-AB22-66F7584A5890}", "entry": { "name": "In", @@ -37454,7 +37454,7 @@ ] }, { - "key": "Iterate_VM", + "base": "Iterate_VM", "context": "{C338C806-EBD9-5471-AB22-66F7584A5890}", "entry": { "name": "In", @@ -37485,7 +37485,7 @@ ] }, { - "key": "GetKeys", + "base": "GetKeys", "context": "{C338C806-EBD9-5471-AB22-66F7584A5890}", "entry": { "name": "In", @@ -37516,7 +37516,7 @@ ] }, { - "key": "Size", + "base": "Size", "context": "{C338C806-EBD9-5471-AB22-66F7584A5890}", "entry": { "name": "In", @@ -37547,7 +37547,7 @@ ] }, { - "key": "Erase", + "base": "Erase", "context": "{C338C806-EBD9-5471-AB22-66F7584A5890}", "entry": { "name": "In", @@ -37584,7 +37584,7 @@ ] }, { - "key": "EraseCheck_VM", + "base": "EraseCheck_VM", "context": "{C338C806-EBD9-5471-AB22-66F7584A5890}", "entry": { "name": "In", @@ -37621,7 +37621,7 @@ ] }, { - "key": "Clear", + "base": "Clear", "context": "{C338C806-EBD9-5471-AB22-66F7584A5890}", "entry": { "name": "In", @@ -37652,7 +37652,7 @@ ] }, { - "key": "At", + "base": "At", "context": "{C338C806-EBD9-5471-AB22-66F7584A5890}", "entry": { "name": "In", @@ -37689,7 +37689,7 @@ ] }, { - "key": "BucketCount", + "base": "BucketCount", "context": "{C338C806-EBD9-5471-AB22-66F7584A5890}", "entry": { "name": "In", @@ -37720,7 +37720,7 @@ ] }, { - "key": "Empty", + "base": "Empty", "context": "{C338C806-EBD9-5471-AB22-66F7584A5890}", "entry": { "name": "In", @@ -37751,7 +37751,7 @@ ] }, { - "key": "Swap", + "base": "Swap", "context": "{C338C806-EBD9-5471-AB22-66F7584A5890}", "entry": { "name": "In", @@ -37782,7 +37782,7 @@ ] }, { - "key": "{097C0043-AC31-5230-B07E-330022B002DB}", + "base": "{097C0043-AC31-5230-B07E-330022B002DB}", "context": "OnDemandReflected", "variant": "", "details": { @@ -37792,7 +37792,7 @@ }, "methods": [ { - "key": "contains", + "base": "contains", "context": "{097C0043-AC31-5230-B07E-330022B002DB}", "entry": { "name": "In", @@ -37829,7 +37829,7 @@ ] }, { - "key": "Insert", + "base": "Insert", "context": "{097C0043-AC31-5230-B07E-330022B002DB}", "entry": { "name": "In", @@ -37872,7 +37872,7 @@ ] }, { - "key": "Reserve", + "base": "Reserve", "context": "{097C0043-AC31-5230-B07E-330022B002DB}", "entry": { "name": "In", @@ -37901,7 +37901,7 @@ ] }, { - "key": "GetSize", + "base": "GetSize", "context": "{097C0043-AC31-5230-B07E-330022B002DB}", "entry": { "name": "In", @@ -37932,7 +37932,7 @@ ] }, { - "key": "Iterate_VM", + "base": "Iterate_VM", "context": "{097C0043-AC31-5230-B07E-330022B002DB}", "entry": { "name": "In", @@ -37963,7 +37963,7 @@ ] }, { - "key": "GetKeys", + "base": "GetKeys", "context": "{097C0043-AC31-5230-B07E-330022B002DB}", "entry": { "name": "In", @@ -37994,7 +37994,7 @@ ] }, { - "key": "Size", + "base": "Size", "context": "{097C0043-AC31-5230-B07E-330022B002DB}", "entry": { "name": "In", @@ -38025,7 +38025,7 @@ ] }, { - "key": "Erase", + "base": "Erase", "context": "{097C0043-AC31-5230-B07E-330022B002DB}", "entry": { "name": "In", @@ -38062,7 +38062,7 @@ ] }, { - "key": "EraseCheck_VM", + "base": "EraseCheck_VM", "context": "{097C0043-AC31-5230-B07E-330022B002DB}", "entry": { "name": "In", @@ -38099,7 +38099,7 @@ ] }, { - "key": "Clear", + "base": "Clear", "context": "{097C0043-AC31-5230-B07E-330022B002DB}", "entry": { "name": "In", @@ -38130,7 +38130,7 @@ ] }, { - "key": "At", + "base": "At", "context": "{097C0043-AC31-5230-B07E-330022B002DB}", "entry": { "name": "In", @@ -38167,7 +38167,7 @@ ] }, { - "key": "BucketCount", + "base": "BucketCount", "context": "{097C0043-AC31-5230-B07E-330022B002DB}", "entry": { "name": "In", @@ -38198,7 +38198,7 @@ ] }, { - "key": "Empty", + "base": "Empty", "context": "{097C0043-AC31-5230-B07E-330022B002DB}", "entry": { "name": "In", @@ -38229,7 +38229,7 @@ ] }, { - "key": "Swap", + "base": "Swap", "context": "{097C0043-AC31-5230-B07E-330022B002DB}", "entry": { "name": "In", @@ -38260,7 +38260,7 @@ ] }, { - "key": "{240FCAC2-0B29-5CD9-9AFE-9E7A135428BB}", + "base": "{240FCAC2-0B29-5CD9-9AFE-9E7A135428BB}", "context": "OnDemandReflected", "variant": "", "details": { @@ -38270,7 +38270,7 @@ }, "methods": [ { - "key": "Size", + "base": "Size", "context": "{240FCAC2-0B29-5CD9-9AFE-9E7A135428BB}", "entry": { "name": "In", @@ -38301,7 +38301,7 @@ ] }, { - "key": "Front", + "base": "Front", "context": "{240FCAC2-0B29-5CD9-9AFE-9E7A135428BB}", "entry": { "name": "In", @@ -38332,7 +38332,7 @@ ] }, { - "key": "HasKey", + "base": "HasKey", "context": "{240FCAC2-0B29-5CD9-9AFE-9E7A135428BB}", "entry": { "name": "In", @@ -38369,7 +38369,7 @@ ] }, { - "key": "Resize", + "base": "Resize", "context": "{240FCAC2-0B29-5CD9-9AFE-9E7A135428BB}", "entry": { "name": "In", @@ -38398,7 +38398,7 @@ ] }, { - "key": "at", + "base": "at", "context": "{240FCAC2-0B29-5CD9-9AFE-9E7A135428BB}", "entry": { "name": "In", @@ -38435,7 +38435,7 @@ ] }, { - "key": "Back", + "base": "Back", "context": "{240FCAC2-0B29-5CD9-9AFE-9E7A135428BB}", "entry": { "name": "In", @@ -38466,7 +38466,7 @@ ] }, { - "key": "pop_back", + "base": "pop_back", "context": "{240FCAC2-0B29-5CD9-9AFE-9E7A135428BB}", "entry": { "name": "In", @@ -38489,7 +38489,7 @@ ] }, { - "key": "size", + "base": "size", "context": "{240FCAC2-0B29-5CD9-9AFE-9E7A135428BB}", "entry": { "name": "In", @@ -38520,7 +38520,7 @@ ] }, { - "key": "At", + "base": "At", "context": "{240FCAC2-0B29-5CD9-9AFE-9E7A135428BB}", "entry": { "name": "In", @@ -38557,7 +38557,7 @@ ] }, { - "key": "Empty", + "base": "Empty", "context": "{240FCAC2-0B29-5CD9-9AFE-9E7A135428BB}", "entry": { "name": "In", @@ -38588,7 +38588,7 @@ ] }, { - "key": "Swap", + "base": "Swap", "context": "{240FCAC2-0B29-5CD9-9AFE-9E7A135428BB}", "entry": { "name": "In", @@ -38617,7 +38617,7 @@ ] }, { - "key": "push_back", + "base": "push_back", "context": "{240FCAC2-0B29-5CD9-9AFE-9E7A135428BB}", "entry": { "name": "In", @@ -38646,7 +38646,7 @@ ] }, { - "key": "PushBack_VM", + "base": "PushBack_VM", "context": "{240FCAC2-0B29-5CD9-9AFE-9E7A135428BB}", "entry": { "name": "In", @@ -38683,7 +38683,7 @@ ] }, { - "key": "AtUnchecked", + "base": "AtUnchecked", "context": "{240FCAC2-0B29-5CD9-9AFE-9E7A135428BB}", "entry": { "name": "In", @@ -38720,7 +38720,7 @@ ] }, { - "key": "clear", + "base": "clear", "context": "{240FCAC2-0B29-5CD9-9AFE-9E7A135428BB}", "entry": { "name": "In", @@ -38743,7 +38743,7 @@ ] }, { - "key": "NotEmpty", + "base": "NotEmpty", "context": "{240FCAC2-0B29-5CD9-9AFE-9E7A135428BB}", "entry": { "name": "In", @@ -38774,7 +38774,7 @@ ] }, { - "key": "Erase_VM", + "base": "Erase_VM", "context": "{240FCAC2-0B29-5CD9-9AFE-9E7A135428BB}", "entry": { "name": "In", @@ -38811,7 +38811,7 @@ ] }, { - "key": "EraseCheck_VM", + "base": "EraseCheck_VM", "context": "{240FCAC2-0B29-5CD9-9AFE-9E7A135428BB}", "entry": { "name": "In", @@ -38848,7 +38848,7 @@ ] }, { - "key": "Capacity", + "base": "Capacity", "context": "{240FCAC2-0B29-5CD9-9AFE-9E7A135428BB}", "entry": { "name": "In", @@ -38879,7 +38879,7 @@ ] }, { - "key": "Clear", + "base": "Clear", "context": "{240FCAC2-0B29-5CD9-9AFE-9E7A135428BB}", "entry": { "name": "In", @@ -38910,7 +38910,7 @@ ] }, { - "key": "AssignAt", + "base": "AssignAt", "context": "{240FCAC2-0B29-5CD9-9AFE-9E7A135428BB}", "entry": { "name": "In", @@ -38945,7 +38945,7 @@ ] }, { - "key": "GetSize", + "base": "GetSize", "context": "{240FCAC2-0B29-5CD9-9AFE-9E7A135428BB}", "entry": { "name": "In", @@ -38976,7 +38976,7 @@ ] }, { - "key": "Insert", + "base": "Insert", "context": "{240FCAC2-0B29-5CD9-9AFE-9E7A135428BB}", "entry": { "name": "In", @@ -39019,7 +39019,7 @@ ] }, { - "key": "PushBack", + "base": "PushBack", "context": "{240FCAC2-0B29-5CD9-9AFE-9E7A135428BB}", "entry": { "name": "In", @@ -39048,7 +39048,7 @@ ] }, { - "key": "Reserve", + "base": "Reserve", "context": "{240FCAC2-0B29-5CD9-9AFE-9E7A135428BB}", "entry": { "name": "In", @@ -39077,7 +39077,7 @@ ] }, { - "key": "Iterate_VM", + "base": "Iterate_VM", "context": "{240FCAC2-0B29-5CD9-9AFE-9E7A135428BB}", "entry": { "name": "In", @@ -39110,7 +39110,7 @@ ] }, { - "key": "{D9DF1385-6C5C-4E41-94CA-8B10E9D8FAAF}", + "base": "{D9DF1385-6C5C-4E41-94CA-8B10E9D8FAAF}", "context": "OnDemandReflected", "variant": "", "details": { @@ -39118,7 +39118,7 @@ }, "methods": [ { - "key": "RandomPointOnSphere", + "base": "RandomPointOnSphere", "context": "{D9DF1385-6C5C-4E41-94CA-8B10E9D8FAAF}", "entry": { "name": "In", @@ -39149,7 +39149,7 @@ ] }, { - "key": "RandomPointInCircle", + "base": "RandomPointInCircle", "context": "{D9DF1385-6C5C-4E41-94CA-8B10E9D8FAAF}", "entry": { "name": "In", @@ -39180,7 +39180,7 @@ ] }, { - "key": "RandomPointInSquare", + "base": "RandomPointInSquare", "context": "{D9DF1385-6C5C-4E41-94CA-8B10E9D8FAAF}", "entry": { "name": "In", @@ -39211,7 +39211,7 @@ ] }, { - "key": "RandomUnitVector2", + "base": "RandomUnitVector2", "context": "{D9DF1385-6C5C-4E41-94CA-8B10E9D8FAAF}", "entry": { "name": "In", @@ -39234,7 +39234,7 @@ ] }, { - "key": "RandomVector2", + "base": "RandomVector2", "context": "{D9DF1385-6C5C-4E41-94CA-8B10E9D8FAAF}", "entry": { "name": "In", @@ -39271,7 +39271,7 @@ ] }, { - "key": "RandomPointInCylinder", + "base": "RandomPointInCylinder", "context": "{D9DF1385-6C5C-4E41-94CA-8B10E9D8FAAF}", "entry": { "name": "In", @@ -39308,7 +39308,7 @@ ] }, { - "key": "RandomQuaternion", + "base": "RandomQuaternion", "context": "{D9DF1385-6C5C-4E41-94CA-8B10E9D8FAAF}", "entry": { "name": "In", @@ -39345,7 +39345,7 @@ ] }, { - "key": "RandomVector4", + "base": "RandomVector4", "context": "{D9DF1385-6C5C-4E41-94CA-8B10E9D8FAAF}", "entry": { "name": "In", @@ -39382,7 +39382,7 @@ ] }, { - "key": "RandomPointInBox", + "base": "RandomPointInBox", "context": "{D9DF1385-6C5C-4E41-94CA-8B10E9D8FAAF}", "entry": { "name": "In", @@ -39413,7 +39413,7 @@ ] }, { - "key": "RandomPointOnCircle", + "base": "RandomPointOnCircle", "context": "{D9DF1385-6C5C-4E41-94CA-8B10E9D8FAAF}", "entry": { "name": "In", @@ -39444,7 +39444,7 @@ ] }, { - "key": "RandomPointInEllipsoid", + "base": "RandomPointInEllipsoid", "context": "{D9DF1385-6C5C-4E41-94CA-8B10E9D8FAAF}", "entry": { "name": "In", @@ -39475,7 +39475,7 @@ ] }, { - "key": "RandomInteger", + "base": "RandomInteger", "context": "{D9DF1385-6C5C-4E41-94CA-8B10E9D8FAAF}", "entry": { "name": "In", @@ -39512,7 +39512,7 @@ ] }, { - "key": "RandomPointInWedge", + "base": "RandomPointInWedge", "context": "{D9DF1385-6C5C-4E41-94CA-8B10E9D8FAAF}", "entry": { "name": "In", @@ -39573,7 +39573,7 @@ ] }, { - "key": "RandomGrayscale", + "base": "RandomGrayscale", "context": "{D9DF1385-6C5C-4E41-94CA-8B10E9D8FAAF}", "entry": { "name": "In", @@ -39610,7 +39610,7 @@ ] }, { - "key": "RandomPointInCone", + "base": "RandomPointInCone", "context": "{D9DF1385-6C5C-4E41-94CA-8B10E9D8FAAF}", "entry": { "name": "In", @@ -39647,7 +39647,7 @@ ] }, { - "key": "RandomColor", + "base": "RandomColor", "context": "{D9DF1385-6C5C-4E41-94CA-8B10E9D8FAAF}", "entry": { "name": "In", @@ -39684,7 +39684,7 @@ ] }, { - "key": "RandomNumber", + "base": "RandomNumber", "context": "{D9DF1385-6C5C-4E41-94CA-8B10E9D8FAAF}", "entry": { "name": "In", @@ -39721,7 +39721,7 @@ ] }, { - "key": "RandomPointInSphere", + "base": "RandomPointInSphere", "context": "{D9DF1385-6C5C-4E41-94CA-8B10E9D8FAAF}", "entry": { "name": "In", @@ -39752,7 +39752,7 @@ ] }, { - "key": "RandomUnitVector3", + "base": "RandomUnitVector3", "context": "{D9DF1385-6C5C-4E41-94CA-8B10E9D8FAAF}", "entry": { "name": "In", @@ -39775,7 +39775,7 @@ ] }, { - "key": "RandomVector3", + "base": "RandomVector3", "context": "{D9DF1385-6C5C-4E41-94CA-8B10E9D8FAAF}", "entry": { "name": "In", @@ -39812,7 +39812,7 @@ ] }, { - "key": "RandomPointInArc", + "base": "RandomPointInArc", "context": "{D9DF1385-6C5C-4E41-94CA-8B10E9D8FAAF}", "entry": { "name": "In", @@ -39869,7 +39869,7 @@ ] }, { - "key": "{7352CD6D-91DA-536F-BFCC-BC513FB48B2D}", + "base": "{7352CD6D-91DA-536F-BFCC-BC513FB48B2D}", "context": "OnDemandReflected", "variant": "", "details": { @@ -39877,7 +39877,7 @@ }, "methods": [ { - "key": "GetSize", + "base": "GetSize", "context": "{7352CD6D-91DA-536F-BFCC-BC513FB48B2D}", "entry": { "name": "In", @@ -39900,7 +39900,7 @@ ] }, { - "key": "Get3", + "base": "Get3", "context": "{7352CD6D-91DA-536F-BFCC-BC513FB48B2D}", "entry": { "name": "In", @@ -39931,7 +39931,7 @@ ] }, { - "key": "Get2", + "base": "Get2", "context": "{7352CD6D-91DA-536F-BFCC-BC513FB48B2D}", "entry": { "name": "In", @@ -39962,7 +39962,7 @@ ] }, { - "key": "Get1", + "base": "Get1", "context": "{7352CD6D-91DA-536F-BFCC-BC513FB48B2D}", "entry": { "name": "In", @@ -39993,7 +39993,7 @@ ] }, { - "key": "Get0", + "base": "Get0", "context": "{7352CD6D-91DA-536F-BFCC-BC513FB48B2D}", "entry": { "name": "In", @@ -40026,7 +40026,7 @@ ] }, { - "key": "{34333904-F6D2-5090-9D5D-B52D135144EA}", + "base": "{34333904-F6D2-5090-9D5D-B52D135144EA}", "context": "OnDemandReflected", "variant": "", "details": { @@ -40036,7 +40036,7 @@ }, "methods": [ { - "key": "contains", + "base": "contains", "context": "{34333904-F6D2-5090-9D5D-B52D135144EA}", "entry": { "name": "In", @@ -40073,7 +40073,7 @@ ] }, { - "key": "Insert", + "base": "Insert", "context": "{34333904-F6D2-5090-9D5D-B52D135144EA}", "entry": { "name": "In", @@ -40116,7 +40116,7 @@ ] }, { - "key": "Reserve", + "base": "Reserve", "context": "{34333904-F6D2-5090-9D5D-B52D135144EA}", "entry": { "name": "In", @@ -40145,7 +40145,7 @@ ] }, { - "key": "GetSize", + "base": "GetSize", "context": "{34333904-F6D2-5090-9D5D-B52D135144EA}", "entry": { "name": "In", @@ -40176,7 +40176,7 @@ ] }, { - "key": "Iterate_VM", + "base": "Iterate_VM", "context": "{34333904-F6D2-5090-9D5D-B52D135144EA}", "entry": { "name": "In", @@ -40207,7 +40207,7 @@ ] }, { - "key": "GetKeys", + "base": "GetKeys", "context": "{34333904-F6D2-5090-9D5D-B52D135144EA}", "entry": { "name": "In", @@ -40238,7 +40238,7 @@ ] }, { - "key": "Size", + "base": "Size", "context": "{34333904-F6D2-5090-9D5D-B52D135144EA}", "entry": { "name": "In", @@ -40269,7 +40269,7 @@ ] }, { - "key": "Erase", + "base": "Erase", "context": "{34333904-F6D2-5090-9D5D-B52D135144EA}", "entry": { "name": "In", @@ -40306,7 +40306,7 @@ ] }, { - "key": "EraseCheck_VM", + "base": "EraseCheck_VM", "context": "{34333904-F6D2-5090-9D5D-B52D135144EA}", "entry": { "name": "In", @@ -40343,7 +40343,7 @@ ] }, { - "key": "Clear", + "base": "Clear", "context": "{34333904-F6D2-5090-9D5D-B52D135144EA}", "entry": { "name": "In", @@ -40374,7 +40374,7 @@ ] }, { - "key": "At", + "base": "At", "context": "{34333904-F6D2-5090-9D5D-B52D135144EA}", "entry": { "name": "In", @@ -40411,7 +40411,7 @@ ] }, { - "key": "BucketCount", + "base": "BucketCount", "context": "{34333904-F6D2-5090-9D5D-B52D135144EA}", "entry": { "name": "In", @@ -40442,7 +40442,7 @@ ] }, { - "key": "Empty", + "base": "Empty", "context": "{34333904-F6D2-5090-9D5D-B52D135144EA}", "entry": { "name": "In", @@ -40473,7 +40473,7 @@ ] }, { - "key": "Swap", + "base": "Swap", "context": "{34333904-F6D2-5090-9D5D-B52D135144EA}", "entry": { "name": "In", @@ -40504,7 +40504,7 @@ ] }, { - "key": "{E51F56F8-D4E9-5C9F-AE6F-3F9C5D28F4C6}", + "base": "{E51F56F8-D4E9-5C9F-AE6F-3F9C5D28F4C6}", "context": "OnDemandReflected", "variant": "", "details": { @@ -40514,7 +40514,7 @@ }, "methods": [ { - "key": "get", + "base": "get", "context": "{E51F56F8-D4E9-5C9F-AE6F-3F9C5D28F4C6}", "entry": { "name": "In", @@ -40547,7 +40547,7 @@ ] }, { - "key": "{CD6328B1-6CC4-54CE-97F4-9D91F5A242F4}", + "base": "{CD6328B1-6CC4-54CE-97F4-9D91F5A242F4}", "context": "OnDemandReflected", "variant": "", "details": { @@ -40555,7 +40555,7 @@ }, "methods": [ { - "key": "Get0", + "base": "Get0", "context": "{CD6328B1-6CC4-54CE-97F4-9D91F5A242F4}", "entry": { "name": "In", @@ -40586,7 +40586,7 @@ ] }, { - "key": "Get1", + "base": "Get1", "context": "{CD6328B1-6CC4-54CE-97F4-9D91F5A242F4}", "entry": { "name": "In", @@ -40617,7 +40617,7 @@ ] }, { - "key": "GetSize", + "base": "GetSize", "context": "{CD6328B1-6CC4-54CE-97F4-9D91F5A242F4}", "entry": { "name": "In", @@ -40642,7 +40642,7 @@ ] }, { - "key": "{4A885DC2-5C26-52F0-BA83-61EEC0FB5E4E}", + "base": "{4A885DC2-5C26-52F0-BA83-61EEC0FB5E4E}", "context": "OnDemandReflected", "variant": "", "details": { @@ -40652,7 +40652,7 @@ }, "methods": [ { - "key": "contains", + "base": "contains", "context": "{4A885DC2-5C26-52F0-BA83-61EEC0FB5E4E}", "entry": { "name": "In", @@ -40690,7 +40690,7 @@ ] }, { - "key": "Insert", + "base": "Insert", "context": "{4A885DC2-5C26-52F0-BA83-61EEC0FB5E4E}", "entry": { "name": "In", @@ -40734,7 +40734,7 @@ ] }, { - "key": "Reserve", + "base": "Reserve", "context": "{4A885DC2-5C26-52F0-BA83-61EEC0FB5E4E}", "entry": { "name": "In", @@ -40763,7 +40763,7 @@ ] }, { - "key": "GetSize", + "base": "GetSize", "context": "{4A885DC2-5C26-52F0-BA83-61EEC0FB5E4E}", "entry": { "name": "In", @@ -40794,7 +40794,7 @@ ] }, { - "key": "Iterate_VM", + "base": "Iterate_VM", "context": "{4A885DC2-5C26-52F0-BA83-61EEC0FB5E4E}", "entry": { "name": "In", @@ -40825,7 +40825,7 @@ ] }, { - "key": "GetKeys", + "base": "GetKeys", "context": "{4A885DC2-5C26-52F0-BA83-61EEC0FB5E4E}", "entry": { "name": "In", @@ -40856,7 +40856,7 @@ ] }, { - "key": "Size", + "base": "Size", "context": "{4A885DC2-5C26-52F0-BA83-61EEC0FB5E4E}", "entry": { "name": "In", @@ -40887,7 +40887,7 @@ ] }, { - "key": "Erase", + "base": "Erase", "context": "{4A885DC2-5C26-52F0-BA83-61EEC0FB5E4E}", "entry": { "name": "In", @@ -40925,7 +40925,7 @@ ] }, { - "key": "EraseCheck_VM", + "base": "EraseCheck_VM", "context": "{4A885DC2-5C26-52F0-BA83-61EEC0FB5E4E}", "entry": { "name": "In", @@ -40963,7 +40963,7 @@ ] }, { - "key": "Clear", + "base": "Clear", "context": "{4A885DC2-5C26-52F0-BA83-61EEC0FB5E4E}", "entry": { "name": "In", @@ -40994,7 +40994,7 @@ ] }, { - "key": "At", + "base": "At", "context": "{4A885DC2-5C26-52F0-BA83-61EEC0FB5E4E}", "entry": { "name": "In", @@ -41032,7 +41032,7 @@ ] }, { - "key": "BucketCount", + "base": "BucketCount", "context": "{4A885DC2-5C26-52F0-BA83-61EEC0FB5E4E}", "entry": { "name": "In", @@ -41063,7 +41063,7 @@ ] }, { - "key": "Empty", + "base": "Empty", "context": "{4A885DC2-5C26-52F0-BA83-61EEC0FB5E4E}", "entry": { "name": "In", @@ -41094,7 +41094,7 @@ ] }, { - "key": "Swap", + "base": "Swap", "context": "{4A885DC2-5C26-52F0-BA83-61EEC0FB5E4E}", "entry": { "name": "In", @@ -41125,7 +41125,7 @@ ] }, { - "key": "{D0A15826-BEFB-5FBD-BEB4-609E7F2B67AD}", + "base": "{D0A15826-BEFB-5FBD-BEB4-609E7F2B67AD}", "context": "OnDemandReflected", "variant": "", "details": { @@ -41135,7 +41135,7 @@ }, "methods": [ { - "key": "contains", + "base": "contains", "context": "{D0A15826-BEFB-5FBD-BEB4-609E7F2B67AD}", "entry": { "name": "In", @@ -41172,7 +41172,7 @@ ] }, { - "key": "Insert", + "base": "Insert", "context": "{D0A15826-BEFB-5FBD-BEB4-609E7F2B67AD}", "entry": { "name": "In", @@ -41215,7 +41215,7 @@ ] }, { - "key": "Reserve", + "base": "Reserve", "context": "{D0A15826-BEFB-5FBD-BEB4-609E7F2B67AD}", "entry": { "name": "In", @@ -41244,7 +41244,7 @@ ] }, { - "key": "GetSize", + "base": "GetSize", "context": "{D0A15826-BEFB-5FBD-BEB4-609E7F2B67AD}", "entry": { "name": "In", @@ -41275,7 +41275,7 @@ ] }, { - "key": "Iterate_VM", + "base": "Iterate_VM", "context": "{D0A15826-BEFB-5FBD-BEB4-609E7F2B67AD}", "entry": { "name": "In", @@ -41306,7 +41306,7 @@ ] }, { - "key": "GetKeys", + "base": "GetKeys", "context": "{D0A15826-BEFB-5FBD-BEB4-609E7F2B67AD}", "entry": { "name": "In", @@ -41337,7 +41337,7 @@ ] }, { - "key": "Size", + "base": "Size", "context": "{D0A15826-BEFB-5FBD-BEB4-609E7F2B67AD}", "entry": { "name": "In", @@ -41368,7 +41368,7 @@ ] }, { - "key": "Erase", + "base": "Erase", "context": "{D0A15826-BEFB-5FBD-BEB4-609E7F2B67AD}", "entry": { "name": "In", @@ -41405,7 +41405,7 @@ ] }, { - "key": "EraseCheck_VM", + "base": "EraseCheck_VM", "context": "{D0A15826-BEFB-5FBD-BEB4-609E7F2B67AD}", "entry": { "name": "In", @@ -41442,7 +41442,7 @@ ] }, { - "key": "Clear", + "base": "Clear", "context": "{D0A15826-BEFB-5FBD-BEB4-609E7F2B67AD}", "entry": { "name": "In", @@ -41473,7 +41473,7 @@ ] }, { - "key": "At", + "base": "At", "context": "{D0A15826-BEFB-5FBD-BEB4-609E7F2B67AD}", "entry": { "name": "In", @@ -41510,7 +41510,7 @@ ] }, { - "key": "BucketCount", + "base": "BucketCount", "context": "{D0A15826-BEFB-5FBD-BEB4-609E7F2B67AD}", "entry": { "name": "In", @@ -41541,7 +41541,7 @@ ] }, { - "key": "Empty", + "base": "Empty", "context": "{D0A15826-BEFB-5FBD-BEB4-609E7F2B67AD}", "entry": { "name": "In", @@ -41572,7 +41572,7 @@ ] }, { - "key": "Swap", + "base": "Swap", "context": "{D0A15826-BEFB-5FBD-BEB4-609E7F2B67AD}", "entry": { "name": "In", @@ -41603,7 +41603,7 @@ ] }, { - "key": "{BC094BE5-5849-5E61-82B9-FB3B434F6BAD}", + "base": "{BC094BE5-5849-5E61-82B9-FB3B434F6BAD}", "context": "OnDemandReflected", "variant": "", "details": { @@ -41611,7 +41611,7 @@ }, "methods": [ { - "key": "GetError", + "base": "GetError", "context": "{BC094BE5-5849-5E61-82B9-FB3B434F6BAD}", "entry": { "name": "In", @@ -41642,7 +41642,7 @@ ] }, { - "key": "IsSuccess", + "base": "IsSuccess", "context": "{BC094BE5-5849-5E61-82B9-FB3B434F6BAD}", "entry": { "name": "In", @@ -41673,7 +41673,7 @@ ] }, { - "key": "Success", + "base": "Success", "context": "{BC094BE5-5849-5E61-82B9-FB3B434F6BAD}", "entry": { "name": "In", @@ -41704,7 +41704,7 @@ ] }, { - "key": "GetValue", + "base": "GetValue", "context": "{BC094BE5-5849-5E61-82B9-FB3B434F6BAD}", "entry": { "name": "In", @@ -41735,7 +41735,7 @@ ] }, { - "key": "Failure", + "base": "Failure", "context": "{BC094BE5-5849-5E61-82B9-FB3B434F6BAD}", "entry": { "name": "In", @@ -41768,7 +41768,7 @@ ] }, { - "key": "{D33569A9-EFFC-566C-8CCC-74D6E086A1B0}", + "base": "{D33569A9-EFFC-566C-8CCC-74D6E086A1B0}", "context": "OnDemandReflected", "variant": "", "details": { @@ -41778,7 +41778,7 @@ }, "methods": [ { - "key": "contains", + "base": "contains", "context": "{D33569A9-EFFC-566C-8CCC-74D6E086A1B0}", "entry": { "name": "In", @@ -41816,7 +41816,7 @@ ] }, { - "key": "Insert", + "base": "Insert", "context": "{D33569A9-EFFC-566C-8CCC-74D6E086A1B0}", "entry": { "name": "In", @@ -41861,7 +41861,7 @@ ] }, { - "key": "Reserve", + "base": "Reserve", "context": "{D33569A9-EFFC-566C-8CCC-74D6E086A1B0}", "entry": { "name": "In", @@ -41890,7 +41890,7 @@ ] }, { - "key": "GetSize", + "base": "GetSize", "context": "{D33569A9-EFFC-566C-8CCC-74D6E086A1B0}", "entry": { "name": "In", @@ -41921,7 +41921,7 @@ ] }, { - "key": "Iterate_VM", + "base": "Iterate_VM", "context": "{D33569A9-EFFC-566C-8CCC-74D6E086A1B0}", "entry": { "name": "In", @@ -41952,7 +41952,7 @@ ] }, { - "key": "GetKeys", + "base": "GetKeys", "context": "{D33569A9-EFFC-566C-8CCC-74D6E086A1B0}", "entry": { "name": "In", @@ -41983,7 +41983,7 @@ ] }, { - "key": "Size", + "base": "Size", "context": "{D33569A9-EFFC-566C-8CCC-74D6E086A1B0}", "entry": { "name": "In", @@ -42014,7 +42014,7 @@ ] }, { - "key": "Erase", + "base": "Erase", "context": "{D33569A9-EFFC-566C-8CCC-74D6E086A1B0}", "entry": { "name": "In", @@ -42052,7 +42052,7 @@ ] }, { - "key": "EraseCheck_VM", + "base": "EraseCheck_VM", "context": "{D33569A9-EFFC-566C-8CCC-74D6E086A1B0}", "entry": { "name": "In", @@ -42090,7 +42090,7 @@ ] }, { - "key": "Clear", + "base": "Clear", "context": "{D33569A9-EFFC-566C-8CCC-74D6E086A1B0}", "entry": { "name": "In", @@ -42121,7 +42121,7 @@ ] }, { - "key": "At", + "base": "At", "context": "{D33569A9-EFFC-566C-8CCC-74D6E086A1B0}", "entry": { "name": "In", @@ -42160,7 +42160,7 @@ ] }, { - "key": "BucketCount", + "base": "BucketCount", "context": "{D33569A9-EFFC-566C-8CCC-74D6E086A1B0}", "entry": { "name": "In", @@ -42191,7 +42191,7 @@ ] }, { - "key": "Empty", + "base": "Empty", "context": "{D33569A9-EFFC-566C-8CCC-74D6E086A1B0}", "entry": { "name": "In", @@ -42222,7 +42222,7 @@ ] }, { - "key": "Swap", + "base": "Swap", "context": "{D33569A9-EFFC-566C-8CCC-74D6E086A1B0}", "entry": { "name": "In", @@ -42253,7 +42253,7 @@ ] }, { - "key": "{E32B8C9D-F84C-54FF-91DA-84C99FBBB0B6}", + "base": "{E32B8C9D-F84C-54FF-91DA-84C99FBBB0B6}", "context": "OnDemandReflected", "variant": "", "details": { @@ -42263,7 +42263,7 @@ }, "methods": [ { - "key": "contains", + "base": "contains", "context": "{E32B8C9D-F84C-54FF-91DA-84C99FBBB0B6}", "entry": { "name": "In", @@ -42300,7 +42300,7 @@ ] }, { - "key": "Insert", + "base": "Insert", "context": "{E32B8C9D-F84C-54FF-91DA-84C99FBBB0B6}", "entry": { "name": "In", @@ -42343,7 +42343,7 @@ ] }, { - "key": "Reserve", + "base": "Reserve", "context": "{E32B8C9D-F84C-54FF-91DA-84C99FBBB0B6}", "entry": { "name": "In", @@ -42372,7 +42372,7 @@ ] }, { - "key": "GetSize", + "base": "GetSize", "context": "{E32B8C9D-F84C-54FF-91DA-84C99FBBB0B6}", "entry": { "name": "In", @@ -42403,7 +42403,7 @@ ] }, { - "key": "Iterate_VM", + "base": "Iterate_VM", "context": "{E32B8C9D-F84C-54FF-91DA-84C99FBBB0B6}", "entry": { "name": "In", @@ -42434,7 +42434,7 @@ ] }, { - "key": "GetKeys", + "base": "GetKeys", "context": "{E32B8C9D-F84C-54FF-91DA-84C99FBBB0B6}", "entry": { "name": "In", @@ -42465,7 +42465,7 @@ ] }, { - "key": "Size", + "base": "Size", "context": "{E32B8C9D-F84C-54FF-91DA-84C99FBBB0B6}", "entry": { "name": "In", @@ -42496,7 +42496,7 @@ ] }, { - "key": "Erase", + "base": "Erase", "context": "{E32B8C9D-F84C-54FF-91DA-84C99FBBB0B6}", "entry": { "name": "In", @@ -42533,7 +42533,7 @@ ] }, { - "key": "EraseCheck_VM", + "base": "EraseCheck_VM", "context": "{E32B8C9D-F84C-54FF-91DA-84C99FBBB0B6}", "entry": { "name": "In", @@ -42570,7 +42570,7 @@ ] }, { - "key": "Clear", + "base": "Clear", "context": "{E32B8C9D-F84C-54FF-91DA-84C99FBBB0B6}", "entry": { "name": "In", @@ -42601,7 +42601,7 @@ ] }, { - "key": "At", + "base": "At", "context": "{E32B8C9D-F84C-54FF-91DA-84C99FBBB0B6}", "entry": { "name": "In", @@ -42638,7 +42638,7 @@ ] }, { - "key": "BucketCount", + "base": "BucketCount", "context": "{E32B8C9D-F84C-54FF-91DA-84C99FBBB0B6}", "entry": { "name": "In", @@ -42669,7 +42669,7 @@ ] }, { - "key": "Empty", + "base": "Empty", "context": "{E32B8C9D-F84C-54FF-91DA-84C99FBBB0B6}", "entry": { "name": "In", @@ -42700,7 +42700,7 @@ ] }, { - "key": "Swap", + "base": "Swap", "context": "{E32B8C9D-F84C-54FF-91DA-84C99FBBB0B6}", "entry": { "name": "In", @@ -42731,7 +42731,7 @@ ] }, { - "key": "{1F24C807-BE2F-54C7-8F2B-498727236DF5}", + "base": "{1F24C807-BE2F-54C7-8F2B-498727236DF5}", "context": "OnDemandReflected", "variant": "", "details": { @@ -42739,7 +42739,7 @@ }, "methods": [ { - "key": "Get0", + "base": "Get0", "context": "{1F24C807-BE2F-54C7-8F2B-498727236DF5}", "entry": { "name": "In", @@ -42770,7 +42770,7 @@ ] }, { - "key": "Get1", + "base": "Get1", "context": "{1F24C807-BE2F-54C7-8F2B-498727236DF5}", "entry": { "name": "In", @@ -42801,7 +42801,7 @@ ] }, { - "key": "GetSize", + "base": "GetSize", "context": "{1F24C807-BE2F-54C7-8F2B-498727236DF5}", "entry": { "name": "In", @@ -42826,7 +42826,7 @@ ] }, { - "key": "{5B700838-21A2-4579-9303-F4A4822AFEF4}", + "base": "{5B700838-21A2-4579-9303-F4A4822AFEF4}", "context": "OnDemandReflected", "variant": "", "details": { @@ -42834,7 +42834,7 @@ }, "methods": [ { - "key": "ToLower", + "base": "ToLower", "context": "{5B700838-21A2-4579-9303-F4A4822AFEF4}", "entry": { "name": "In", @@ -42865,7 +42865,7 @@ ] }, { - "key": "ToUpper", + "base": "ToUpper", "context": "{5B700838-21A2-4579-9303-F4A4822AFEF4}", "entry": { "name": "In", @@ -42896,7 +42896,7 @@ ] }, { - "key": "Substring", + "base": "Substring", "context": "{5B700838-21A2-4579-9303-F4A4822AFEF4}", "entry": { "name": "In", @@ -42941,7 +42941,7 @@ ] }, { - "key": "{79F6FAE7-FB1D-5030-91D5-766E5861D7D5}", + "base": "{79F6FAE7-FB1D-5030-91D5-766E5861D7D5}", "context": "OnDemandReflected", "variant": "", "details": { @@ -42951,7 +42951,7 @@ }, "methods": [ { - "key": "contains", + "base": "contains", "context": "{79F6FAE7-FB1D-5030-91D5-766E5861D7D5}", "entry": { "name": "In", @@ -42988,7 +42988,7 @@ ] }, { - "key": "Insert", + "base": "Insert", "context": "{79F6FAE7-FB1D-5030-91D5-766E5861D7D5}", "entry": { "name": "In", @@ -43031,7 +43031,7 @@ ] }, { - "key": "Reserve", + "base": "Reserve", "context": "{79F6FAE7-FB1D-5030-91D5-766E5861D7D5}", "entry": { "name": "In", @@ -43060,7 +43060,7 @@ ] }, { - "key": "GetSize", + "base": "GetSize", "context": "{79F6FAE7-FB1D-5030-91D5-766E5861D7D5}", "entry": { "name": "In", @@ -43091,7 +43091,7 @@ ] }, { - "key": "Iterate_VM", + "base": "Iterate_VM", "context": "{79F6FAE7-FB1D-5030-91D5-766E5861D7D5}", "entry": { "name": "In", @@ -43122,7 +43122,7 @@ ] }, { - "key": "GetKeys", + "base": "GetKeys", "context": "{79F6FAE7-FB1D-5030-91D5-766E5861D7D5}", "entry": { "name": "In", @@ -43153,7 +43153,7 @@ ] }, { - "key": "Size", + "base": "Size", "context": "{79F6FAE7-FB1D-5030-91D5-766E5861D7D5}", "entry": { "name": "In", @@ -43184,7 +43184,7 @@ ] }, { - "key": "Erase", + "base": "Erase", "context": "{79F6FAE7-FB1D-5030-91D5-766E5861D7D5}", "entry": { "name": "In", @@ -43221,7 +43221,7 @@ ] }, { - "key": "EraseCheck_VM", + "base": "EraseCheck_VM", "context": "{79F6FAE7-FB1D-5030-91D5-766E5861D7D5}", "entry": { "name": "In", @@ -43258,7 +43258,7 @@ ] }, { - "key": "Clear", + "base": "Clear", "context": "{79F6FAE7-FB1D-5030-91D5-766E5861D7D5}", "entry": { "name": "In", @@ -43289,7 +43289,7 @@ ] }, { - "key": "At", + "base": "At", "context": "{79F6FAE7-FB1D-5030-91D5-766E5861D7D5}", "entry": { "name": "In", @@ -43326,7 +43326,7 @@ ] }, { - "key": "BucketCount", + "base": "BucketCount", "context": "{79F6FAE7-FB1D-5030-91D5-766E5861D7D5}", "entry": { "name": "In", @@ -43357,7 +43357,7 @@ ] }, { - "key": "Empty", + "base": "Empty", "context": "{79F6FAE7-FB1D-5030-91D5-766E5861D7D5}", "entry": { "name": "In", @@ -43388,7 +43388,7 @@ ] }, { - "key": "Swap", + "base": "Swap", "context": "{79F6FAE7-FB1D-5030-91D5-766E5861D7D5}", "entry": { "name": "In", @@ -43419,7 +43419,7 @@ ] }, { - "key": "{AB0C2753-680E-47AD-8277-66B3AC01C659}", + "base": "{AB0C2753-680E-47AD-8277-66B3AC01C659}", "context": "OnDemandReflected", "variant": "", "details": { @@ -43427,7 +43427,7 @@ }, "methods": [ { - "key": "Overlaps", + "base": "Overlaps", "context": "{AB0C2753-680E-47AD-8277-66B3AC01C659}", "entry": { "name": "In", @@ -43464,7 +43464,7 @@ ] }, { - "key": "SurfaceArea", + "base": "SurfaceArea", "context": "{AB0C2753-680E-47AD-8277-66B3AC01C659}", "entry": { "name": "In", @@ -43495,7 +43495,7 @@ ] }, { - "key": "ToSphere", + "base": "ToSphere", "context": "{AB0C2753-680E-47AD-8277-66B3AC01C659}", "entry": { "name": "In", @@ -43526,7 +43526,7 @@ ] }, { - "key": "FromOBB", + "base": "FromOBB", "context": "{AB0C2753-680E-47AD-8277-66B3AC01C659}", "entry": { "name": "In", @@ -43557,7 +43557,7 @@ ] }, { - "key": "Translate", + "base": "Translate", "context": "{AB0C2753-680E-47AD-8277-66B3AC01C659}", "entry": { "name": "In", @@ -43594,7 +43594,7 @@ ] }, { - "key": "ContainsVector3", + "base": "ContainsVector3", "context": "{AB0C2753-680E-47AD-8277-66B3AC01C659}", "entry": { "name": "In", @@ -43631,7 +43631,7 @@ ] }, { - "key": "Distance", + "base": "Distance", "context": "{AB0C2753-680E-47AD-8277-66B3AC01C659}", "entry": { "name": "In", @@ -43668,7 +43668,7 @@ ] }, { - "key": "FromPoint", + "base": "FromPoint", "context": "{AB0C2753-680E-47AD-8277-66B3AC01C659}", "entry": { "name": "In", @@ -43699,7 +43699,7 @@ ] }, { - "key": "Null", + "base": "Null", "context": "{AB0C2753-680E-47AD-8277-66B3AC01C659}", "entry": { "name": "In", @@ -43722,7 +43722,7 @@ ] }, { - "key": "YExtent", + "base": "YExtent", "context": "{AB0C2753-680E-47AD-8277-66B3AC01C659}", "entry": { "name": "In", @@ -43753,7 +43753,7 @@ ] }, { - "key": "Clamp", + "base": "Clamp", "context": "{AB0C2753-680E-47AD-8277-66B3AC01C659}", "entry": { "name": "In", @@ -43790,7 +43790,7 @@ ] }, { - "key": "ContainsAABB", + "base": "ContainsAABB", "context": "{AB0C2753-680E-47AD-8277-66B3AC01C659}", "entry": { "name": "In", @@ -43827,7 +43827,7 @@ ] }, { - "key": "Expand", + "base": "Expand", "context": "{AB0C2753-680E-47AD-8277-66B3AC01C659}", "entry": { "name": "In", @@ -43864,7 +43864,7 @@ ] }, { - "key": "Extents", + "base": "Extents", "context": "{AB0C2753-680E-47AD-8277-66B3AC01C659}", "entry": { "name": "In", @@ -43895,7 +43895,7 @@ ] }, { - "key": "FromCenterHalfExtents", + "base": "FromCenterHalfExtents", "context": "{AB0C2753-680E-47AD-8277-66B3AC01C659}", "entry": { "name": "In", @@ -43932,7 +43932,7 @@ ] }, { - "key": "GetMin", + "base": "GetMin", "context": "{AB0C2753-680E-47AD-8277-66B3AC01C659}", "entry": { "name": "In", @@ -43963,7 +43963,7 @@ ] }, { - "key": "ApplyTransform", + "base": "ApplyTransform", "context": "{AB0C2753-680E-47AD-8277-66B3AC01C659}", "entry": { "name": "In", @@ -44000,7 +44000,7 @@ ] }, { - "key": "Center", + "base": "Center", "context": "{AB0C2753-680E-47AD-8277-66B3AC01C659}", "entry": { "name": "In", @@ -44031,7 +44031,7 @@ ] }, { - "key": "FromMinMax", + "base": "FromMinMax", "context": "{AB0C2753-680E-47AD-8277-66B3AC01C659}", "entry": { "name": "In", @@ -44068,7 +44068,7 @@ ] }, { - "key": "IsFinite", + "base": "IsFinite", "context": "{AB0C2753-680E-47AD-8277-66B3AC01C659}", "entry": { "name": "In", @@ -44099,7 +44099,7 @@ ] }, { - "key": "IsValid", + "base": "IsValid", "context": "{AB0C2753-680E-47AD-8277-66B3AC01C659}", "entry": { "name": "In", @@ -44130,7 +44130,7 @@ ] }, { - "key": "GetMax", + "base": "GetMax", "context": "{AB0C2753-680E-47AD-8277-66B3AC01C659}", "entry": { "name": "In", @@ -44161,7 +44161,7 @@ ] }, { - "key": "XExtent", + "base": "XExtent", "context": "{AB0C2753-680E-47AD-8277-66B3AC01C659}", "entry": { "name": "In", @@ -44192,7 +44192,7 @@ ] }, { - "key": "AddPoint", + "base": "AddPoint", "context": "{AB0C2753-680E-47AD-8277-66B3AC01C659}", "entry": { "name": "In", @@ -44229,7 +44229,7 @@ ] }, { - "key": "AddAABB", + "base": "AddAABB", "context": "{AB0C2753-680E-47AD-8277-66B3AC01C659}", "entry": { "name": "In", @@ -44266,7 +44266,7 @@ ] }, { - "key": "FromCenterRadius", + "base": "FromCenterRadius", "context": "{AB0C2753-680E-47AD-8277-66B3AC01C659}", "entry": { "name": "In", @@ -44303,7 +44303,7 @@ ] }, { - "key": "ZExtent", + "base": "ZExtent", "context": "{AB0C2753-680E-47AD-8277-66B3AC01C659}", "entry": { "name": "In", @@ -44336,7 +44336,7 @@ ] }, { - "key": "{9BE75E2E-AA07-4767-9BF3-905C289EB38A}", + "base": "{9BE75E2E-AA07-4767-9BF3-905C289EB38A}", "context": "OnDemandReflected", "variant": "", "details": { @@ -44344,7 +44344,7 @@ }, "methods": [ { - "key": "Subtract", + "base": "Subtract", "context": "{9BE75E2E-AA07-4767-9BF3-905C289EB38A}", "entry": { "name": "In", @@ -44381,7 +44381,7 @@ ] }, { - "key": "RotationYDegrees", + "base": "RotationYDegrees", "context": "{9BE75E2E-AA07-4767-9BF3-905C289EB38A}", "entry": { "name": "In", @@ -44412,7 +44412,7 @@ ] }, { - "key": "Normalize", + "base": "Normalize", "context": "{9BE75E2E-AA07-4767-9BF3-905C289EB38A}", "entry": { "name": "In", @@ -44443,7 +44443,7 @@ ] }, { - "key": "LengthReciprocal", + "base": "LengthReciprocal", "context": "{9BE75E2E-AA07-4767-9BF3-905C289EB38A}", "entry": { "name": "In", @@ -44474,7 +44474,7 @@ ] }, { - "key": "CreateFromEulerAngles", + "base": "CreateFromEulerAngles", "context": "{9BE75E2E-AA07-4767-9BF3-905C289EB38A}", "entry": { "name": "In", @@ -44517,7 +44517,7 @@ ] }, { - "key": "IsIdentity", + "base": "IsIdentity", "context": "{9BE75E2E-AA07-4767-9BF3-905C289EB38A}", "entry": { "name": "In", @@ -44554,7 +44554,7 @@ ] }, { - "key": "FromTransform", + "base": "FromTransform", "context": "{9BE75E2E-AA07-4767-9BF3-905C289EB38A}", "entry": { "name": "In", @@ -44585,7 +44585,7 @@ ] }, { - "key": "Lerp", + "base": "Lerp", "context": "{9BE75E2E-AA07-4767-9BF3-905C289EB38A}", "entry": { "name": "In", @@ -44628,7 +44628,7 @@ ] }, { - "key": "RotationZDegrees", + "base": "RotationZDegrees", "context": "{9BE75E2E-AA07-4767-9BF3-905C289EB38A}", "entry": { "name": "In", @@ -44659,7 +44659,7 @@ ] }, { - "key": "ConvertTransformToRotation", + "base": "ConvertTransformToRotation", "context": "{9BE75E2E-AA07-4767-9BF3-905C289EB38A}", "entry": { "name": "In", @@ -44690,7 +44690,7 @@ ] }, { - "key": "ShortestArc", + "base": "ShortestArc", "context": "{9BE75E2E-AA07-4767-9BF3-905C289EB38A}", "entry": { "name": "In", @@ -44727,7 +44727,7 @@ ] }, { - "key": "RotationXDegrees", + "base": "RotationXDegrees", "context": "{9BE75E2E-AA07-4767-9BF3-905C289EB38A}", "entry": { "name": "In", @@ -44758,7 +44758,7 @@ ] }, { - "key": "IsZero", + "base": "IsZero", "context": "{9BE75E2E-AA07-4767-9BF3-905C289EB38A}", "entry": { "name": "In", @@ -44795,7 +44795,7 @@ ] }, { - "key": "IsClose", + "base": "IsClose", "context": "{9BE75E2E-AA07-4767-9BF3-905C289EB38A}", "entry": { "name": "In", @@ -44838,7 +44838,7 @@ ] }, { - "key": "Length", + "base": "Length", "context": "{9BE75E2E-AA07-4767-9BF3-905C289EB38A}", "entry": { "name": "In", @@ -44869,7 +44869,7 @@ ] }, { - "key": "Conjugate", + "base": "Conjugate", "context": "{9BE75E2E-AA07-4767-9BF3-905C289EB38A}", "entry": { "name": "In", @@ -44900,7 +44900,7 @@ ] }, { - "key": "ToAngleDegrees", + "base": "ToAngleDegrees", "context": "{9BE75E2E-AA07-4767-9BF3-905C289EB38A}", "entry": { "name": "In", @@ -44931,7 +44931,7 @@ ] }, { - "key": "Dot", + "base": "Dot", "context": "{9BE75E2E-AA07-4767-9BF3-905C289EB38A}", "entry": { "name": "In", @@ -44968,7 +44968,7 @@ ] }, { - "key": "Negate", + "base": "Negate", "context": "{9BE75E2E-AA07-4767-9BF3-905C289EB38A}", "entry": { "name": "In", @@ -44999,7 +44999,7 @@ ] }, { - "key": "Add", + "base": "Add", "context": "{9BE75E2E-AA07-4767-9BF3-905C289EB38A}", "entry": { "name": "In", @@ -45036,7 +45036,7 @@ ] }, { - "key": "MultiplyByNumber", + "base": "MultiplyByNumber", "context": "{9BE75E2E-AA07-4767-9BF3-905C289EB38A}", "entry": { "name": "In", @@ -45073,7 +45073,7 @@ ] }, { - "key": "Slerp", + "base": "Slerp", "context": "{9BE75E2E-AA07-4767-9BF3-905C289EB38A}", "entry": { "name": "In", @@ -45116,7 +45116,7 @@ ] }, { - "key": "InvertFull", + "base": "InvertFull", "context": "{9BE75E2E-AA07-4767-9BF3-905C289EB38A}", "entry": { "name": "In", @@ -45147,7 +45147,7 @@ ] }, { - "key": "FromMatrix4x4", + "base": "FromMatrix4x4", "context": "{9BE75E2E-AA07-4767-9BF3-905C289EB38A}", "entry": { "name": "In", @@ -45178,7 +45178,7 @@ ] }, { - "key": "RotateVector3", + "base": "RotateVector3", "context": "{9BE75E2E-AA07-4767-9BF3-905C289EB38A}", "entry": { "name": "In", @@ -45215,7 +45215,7 @@ ] }, { - "key": "FromMatrix3x3", + "base": "FromMatrix3x3", "context": "{9BE75E2E-AA07-4767-9BF3-905C289EB38A}", "entry": { "name": "In", @@ -45246,7 +45246,7 @@ ] }, { - "key": "Squad", + "base": "Squad", "context": "{9BE75E2E-AA07-4767-9BF3-905C289EB38A}", "entry": { "name": "In", @@ -45301,7 +45301,7 @@ ] }, { - "key": "FromAxisAngleDegrees", + "base": "FromAxisAngleDegrees", "context": "{9BE75E2E-AA07-4767-9BF3-905C289EB38A}", "entry": { "name": "In", @@ -45338,7 +45338,7 @@ ] }, { - "key": "LengthSquared", + "base": "LengthSquared", "context": "{9BE75E2E-AA07-4767-9BF3-905C289EB38A}", "entry": { "name": "In", @@ -45369,7 +45369,7 @@ ] }, { - "key": "IsFinite", + "base": "IsFinite", "context": "{9BE75E2E-AA07-4767-9BF3-905C289EB38A}", "entry": { "name": "In", @@ -45400,7 +45400,7 @@ ] }, { - "key": "DivideByNumber", + "base": "DivideByNumber", "context": "{9BE75E2E-AA07-4767-9BF3-905C289EB38A}", "entry": { "name": "In", @@ -45437,7 +45437,7 @@ ] }, { - "key": "MultiplyByRotation", + "base": "MultiplyByRotation", "context": "{9BE75E2E-AA07-4767-9BF3-905C289EB38A}", "entry": { "name": "In", @@ -45476,7 +45476,7 @@ ] }, { - "key": "{287CEE87-6FF3-52FC-9D32-38255E2C7FE9}", + "base": "{287CEE87-6FF3-52FC-9D32-38255E2C7FE9}", "context": "OnDemandReflected", "variant": "", "details": { @@ -45486,7 +45486,7 @@ }, "methods": [ { - "key": "Size", + "base": "Size", "context": "{287CEE87-6FF3-52FC-9D32-38255E2C7FE9}", "entry": { "name": "In", @@ -45517,7 +45517,7 @@ ] }, { - "key": "Front", + "base": "Front", "context": "{287CEE87-6FF3-52FC-9D32-38255E2C7FE9}", "entry": { "name": "In", @@ -45548,7 +45548,7 @@ ] }, { - "key": "HasKey", + "base": "HasKey", "context": "{287CEE87-6FF3-52FC-9D32-38255E2C7FE9}", "entry": { "name": "In", @@ -45585,7 +45585,7 @@ ] }, { - "key": "Resize", + "base": "Resize", "context": "{287CEE87-6FF3-52FC-9D32-38255E2C7FE9}", "entry": { "name": "In", @@ -45614,7 +45614,7 @@ ] }, { - "key": "at", + "base": "at", "context": "{287CEE87-6FF3-52FC-9D32-38255E2C7FE9}", "entry": { "name": "In", @@ -45651,7 +45651,7 @@ ] }, { - "key": "Back", + "base": "Back", "context": "{287CEE87-6FF3-52FC-9D32-38255E2C7FE9}", "entry": { "name": "In", @@ -45682,7 +45682,7 @@ ] }, { - "key": "pop_back", + "base": "pop_back", "context": "{287CEE87-6FF3-52FC-9D32-38255E2C7FE9}", "entry": { "name": "In", @@ -45705,7 +45705,7 @@ ] }, { - "key": "size", + "base": "size", "context": "{287CEE87-6FF3-52FC-9D32-38255E2C7FE9}", "entry": { "name": "In", @@ -45736,7 +45736,7 @@ ] }, { - "key": "At", + "base": "At", "context": "{287CEE87-6FF3-52FC-9D32-38255E2C7FE9}", "entry": { "name": "In", @@ -45773,7 +45773,7 @@ ] }, { - "key": "Empty", + "base": "Empty", "context": "{287CEE87-6FF3-52FC-9D32-38255E2C7FE9}", "entry": { "name": "In", @@ -45804,7 +45804,7 @@ ] }, { - "key": "Swap", + "base": "Swap", "context": "{287CEE87-6FF3-52FC-9D32-38255E2C7FE9}", "entry": { "name": "In", @@ -45833,7 +45833,7 @@ ] }, { - "key": "push_back", + "base": "push_back", "context": "{287CEE87-6FF3-52FC-9D32-38255E2C7FE9}", "entry": { "name": "In", @@ -45862,7 +45862,7 @@ ] }, { - "key": "PushBack_VM", + "base": "PushBack_VM", "context": "{287CEE87-6FF3-52FC-9D32-38255E2C7FE9}", "entry": { "name": "In", @@ -45899,7 +45899,7 @@ ] }, { - "key": "AtUnchecked", + "base": "AtUnchecked", "context": "{287CEE87-6FF3-52FC-9D32-38255E2C7FE9}", "entry": { "name": "In", @@ -45936,7 +45936,7 @@ ] }, { - "key": "clear", + "base": "clear", "context": "{287CEE87-6FF3-52FC-9D32-38255E2C7FE9}", "entry": { "name": "In", @@ -45959,7 +45959,7 @@ ] }, { - "key": "NotEmpty", + "base": "NotEmpty", "context": "{287CEE87-6FF3-52FC-9D32-38255E2C7FE9}", "entry": { "name": "In", @@ -45990,7 +45990,7 @@ ] }, { - "key": "Erase_VM", + "base": "Erase_VM", "context": "{287CEE87-6FF3-52FC-9D32-38255E2C7FE9}", "entry": { "name": "In", @@ -46027,7 +46027,7 @@ ] }, { - "key": "EraseCheck_VM", + "base": "EraseCheck_VM", "context": "{287CEE87-6FF3-52FC-9D32-38255E2C7FE9}", "entry": { "name": "In", @@ -46064,7 +46064,7 @@ ] }, { - "key": "Capacity", + "base": "Capacity", "context": "{287CEE87-6FF3-52FC-9D32-38255E2C7FE9}", "entry": { "name": "In", @@ -46095,7 +46095,7 @@ ] }, { - "key": "Clear", + "base": "Clear", "context": "{287CEE87-6FF3-52FC-9D32-38255E2C7FE9}", "entry": { "name": "In", @@ -46126,7 +46126,7 @@ ] }, { - "key": "AssignAt", + "base": "AssignAt", "context": "{287CEE87-6FF3-52FC-9D32-38255E2C7FE9}", "entry": { "name": "In", @@ -46161,7 +46161,7 @@ ] }, { - "key": "GetSize", + "base": "GetSize", "context": "{287CEE87-6FF3-52FC-9D32-38255E2C7FE9}", "entry": { "name": "In", @@ -46192,7 +46192,7 @@ ] }, { - "key": "Insert", + "base": "Insert", "context": "{287CEE87-6FF3-52FC-9D32-38255E2C7FE9}", "entry": { "name": "In", @@ -46235,7 +46235,7 @@ ] }, { - "key": "PushBack", + "base": "PushBack", "context": "{287CEE87-6FF3-52FC-9D32-38255E2C7FE9}", "entry": { "name": "In", @@ -46264,7 +46264,7 @@ ] }, { - "key": "Reserve", + "base": "Reserve", "context": "{287CEE87-6FF3-52FC-9D32-38255E2C7FE9}", "entry": { "name": "In", @@ -46293,7 +46293,7 @@ ] }, { - "key": "Iterate_VM", + "base": "Iterate_VM", "context": "{287CEE87-6FF3-52FC-9D32-38255E2C7FE9}", "entry": { "name": "In", @@ -46326,7 +46326,7 @@ ] }, { - "key": "{33D5748B-90F1-569F-8C3F-EF32C9747919}", + "base": "{33D5748B-90F1-569F-8C3F-EF32C9747919}", "context": "OnDemandReflected", "variant": "", "details": { @@ -46336,7 +46336,7 @@ }, "methods": [ { - "key": "Size", + "base": "Size", "context": "{33D5748B-90F1-569F-8C3F-EF32C9747919}", "entry": { "name": "In", @@ -46367,7 +46367,7 @@ ] }, { - "key": "Front", + "base": "Front", "context": "{33D5748B-90F1-569F-8C3F-EF32C9747919}", "entry": { "name": "In", @@ -46398,7 +46398,7 @@ ] }, { - "key": "HasKey", + "base": "HasKey", "context": "{33D5748B-90F1-569F-8C3F-EF32C9747919}", "entry": { "name": "In", @@ -46435,7 +46435,7 @@ ] }, { - "key": "Resize", + "base": "Resize", "context": "{33D5748B-90F1-569F-8C3F-EF32C9747919}", "entry": { "name": "In", @@ -46464,7 +46464,7 @@ ] }, { - "key": "at", + "base": "at", "context": "{33D5748B-90F1-569F-8C3F-EF32C9747919}", "entry": { "name": "In", @@ -46501,7 +46501,7 @@ ] }, { - "key": "Back", + "base": "Back", "context": "{33D5748B-90F1-569F-8C3F-EF32C9747919}", "entry": { "name": "In", @@ -46532,7 +46532,7 @@ ] }, { - "key": "pop_back", + "base": "pop_back", "context": "{33D5748B-90F1-569F-8C3F-EF32C9747919}", "entry": { "name": "In", @@ -46555,7 +46555,7 @@ ] }, { - "key": "size", + "base": "size", "context": "{33D5748B-90F1-569F-8C3F-EF32C9747919}", "entry": { "name": "In", @@ -46586,7 +46586,7 @@ ] }, { - "key": "At", + "base": "At", "context": "{33D5748B-90F1-569F-8C3F-EF32C9747919}", "entry": { "name": "In", @@ -46623,7 +46623,7 @@ ] }, { - "key": "Empty", + "base": "Empty", "context": "{33D5748B-90F1-569F-8C3F-EF32C9747919}", "entry": { "name": "In", @@ -46654,7 +46654,7 @@ ] }, { - "key": "Swap", + "base": "Swap", "context": "{33D5748B-90F1-569F-8C3F-EF32C9747919}", "entry": { "name": "In", @@ -46683,7 +46683,7 @@ ] }, { - "key": "push_back", + "base": "push_back", "context": "{33D5748B-90F1-569F-8C3F-EF32C9747919}", "entry": { "name": "In", @@ -46712,7 +46712,7 @@ ] }, { - "key": "PushBack_VM", + "base": "PushBack_VM", "context": "{33D5748B-90F1-569F-8C3F-EF32C9747919}", "entry": { "name": "In", @@ -46749,7 +46749,7 @@ ] }, { - "key": "AtUnchecked", + "base": "AtUnchecked", "context": "{33D5748B-90F1-569F-8C3F-EF32C9747919}", "entry": { "name": "In", @@ -46786,7 +46786,7 @@ ] }, { - "key": "clear", + "base": "clear", "context": "{33D5748B-90F1-569F-8C3F-EF32C9747919}", "entry": { "name": "In", @@ -46809,7 +46809,7 @@ ] }, { - "key": "NotEmpty", + "base": "NotEmpty", "context": "{33D5748B-90F1-569F-8C3F-EF32C9747919}", "entry": { "name": "In", @@ -46840,7 +46840,7 @@ ] }, { - "key": "Erase_VM", + "base": "Erase_VM", "context": "{33D5748B-90F1-569F-8C3F-EF32C9747919}", "entry": { "name": "In", @@ -46877,7 +46877,7 @@ ] }, { - "key": "EraseCheck_VM", + "base": "EraseCheck_VM", "context": "{33D5748B-90F1-569F-8C3F-EF32C9747919}", "entry": { "name": "In", @@ -46914,7 +46914,7 @@ ] }, { - "key": "Capacity", + "base": "Capacity", "context": "{33D5748B-90F1-569F-8C3F-EF32C9747919}", "entry": { "name": "In", @@ -46945,7 +46945,7 @@ ] }, { - "key": "Clear", + "base": "Clear", "context": "{33D5748B-90F1-569F-8C3F-EF32C9747919}", "entry": { "name": "In", @@ -46976,7 +46976,7 @@ ] }, { - "key": "AssignAt", + "base": "AssignAt", "context": "{33D5748B-90F1-569F-8C3F-EF32C9747919}", "entry": { "name": "In", @@ -47011,7 +47011,7 @@ ] }, { - "key": "GetSize", + "base": "GetSize", "context": "{33D5748B-90F1-569F-8C3F-EF32C9747919}", "entry": { "name": "In", @@ -47042,7 +47042,7 @@ ] }, { - "key": "Insert", + "base": "Insert", "context": "{33D5748B-90F1-569F-8C3F-EF32C9747919}", "entry": { "name": "In", @@ -47085,7 +47085,7 @@ ] }, { - "key": "PushBack", + "base": "PushBack", "context": "{33D5748B-90F1-569F-8C3F-EF32C9747919}", "entry": { "name": "In", @@ -47114,7 +47114,7 @@ ] }, { - "key": "Reserve", + "base": "Reserve", "context": "{33D5748B-90F1-569F-8C3F-EF32C9747919}", "entry": { "name": "In", @@ -47143,7 +47143,7 @@ ] }, { - "key": "Iterate_VM", + "base": "Iterate_VM", "context": "{33D5748B-90F1-569F-8C3F-EF32C9747919}", "entry": { "name": "In", @@ -47176,7 +47176,7 @@ ] }, { - "key": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", + "base": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", "context": "OnDemandReflected", "variant": "", "details": { @@ -47184,7 +47184,7 @@ }, "methods": [ { - "key": "Split", + "base": "Split", "context": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", "entry": { "name": "In", @@ -47221,7 +47221,7 @@ ] }, { - "key": "Join", + "base": "Join", "context": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", "entry": { "name": "In", @@ -47258,7 +47258,7 @@ ] }, { - "key": "Add", + "base": "Add", "context": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", "entry": { "name": "In", @@ -47295,7 +47295,7 @@ ] }, { - "key": "ToLower", + "base": "ToLower", "context": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", "entry": { "name": "In", @@ -47326,7 +47326,7 @@ ] }, { - "key": "Replace", + "base": "Replace", "context": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", "entry": { "name": "In", @@ -47369,7 +47369,7 @@ ] }, { - "key": "TrimRight", + "base": "TrimRight", "context": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", "entry": { "name": "In", @@ -47400,7 +47400,7 @@ ] }, { - "key": "Equal", + "base": "Equal", "context": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", "entry": { "name": "In", @@ -47437,7 +47437,7 @@ ] }, { - "key": "Find", + "base": "Find", "context": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", "entry": { "name": "In", @@ -47480,7 +47480,7 @@ ] }, { - "key": "Substring", + "base": "Substring", "context": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", "entry": { "name": "In", @@ -47523,7 +47523,7 @@ ] }, { - "key": "Length", + "base": "Length", "context": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", "entry": { "name": "In", @@ -47554,7 +47554,7 @@ ] }, { - "key": "ReplaceByIndex", + "base": "ReplaceByIndex", "context": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", "entry": { "name": "In", @@ -47603,7 +47603,7 @@ ] }, { - "key": "c_str", + "base": "c_str", "context": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", "entry": { "name": "In", @@ -47634,7 +47634,7 @@ ] }, { - "key": "TrimLeft", + "base": "TrimLeft", "context": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", "entry": { "name": "In", @@ -47665,7 +47665,7 @@ ] }, { - "key": "ToUpper", + "base": "ToUpper", "context": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", "entry": { "name": "In", @@ -47698,7 +47698,7 @@ ] }, { - "key": "{F0A3166F-115C-5C3E-8D65-28FBA4420028}", + "base": "{F0A3166F-115C-5C3E-8D65-28FBA4420028}", "context": "OnDemandReflected", "variant": "", "details": { @@ -47706,7 +47706,7 @@ }, "methods": [ { - "key": "HasHandlerConnected", + "base": "HasHandlerConnected", "context": "{F0A3166F-115C-5C3E-8D65-28FBA4420028}", "entry": { "name": "In", @@ -47739,7 +47739,7 @@ ] }, { - "key": "{93BBB90E-EBB4-507D-89B6-E4921FE44AFF}", + "base": "{93BBB90E-EBB4-507D-89B6-E4921FE44AFF}", "context": "OnDemandReflected", "variant": "", "details": { @@ -47749,7 +47749,7 @@ }, "methods": [ { - "key": "Size", + "base": "Size", "context": "{93BBB90E-EBB4-507D-89B6-E4921FE44AFF}", "entry": { "name": "In", @@ -47780,7 +47780,7 @@ ] }, { - "key": "GetKeys", + "base": "GetKeys", "context": "{93BBB90E-EBB4-507D-89B6-E4921FE44AFF}", "entry": { "name": "In", @@ -47811,7 +47811,7 @@ ] }, { - "key": "contains", + "base": "contains", "context": "{93BBB90E-EBB4-507D-89B6-E4921FE44AFF}", "entry": { "name": "In", @@ -47848,7 +47848,7 @@ ] }, { - "key": "Insert", + "base": "Insert", "context": "{93BBB90E-EBB4-507D-89B6-E4921FE44AFF}", "entry": { "name": "In", @@ -47885,7 +47885,7 @@ ] }, { - "key": "GetSize", + "base": "GetSize", "context": "{93BBB90E-EBB4-507D-89B6-E4921FE44AFF}", "entry": { "name": "In", @@ -47916,7 +47916,7 @@ ] }, { - "key": "Reserve", + "base": "Reserve", "context": "{93BBB90E-EBB4-507D-89B6-E4921FE44AFF}", "entry": { "name": "In", @@ -47945,7 +47945,7 @@ ] }, { - "key": "Iterate_VM", + "base": "Iterate_VM", "context": "{93BBB90E-EBB4-507D-89B6-E4921FE44AFF}", "entry": { "name": "In", @@ -47976,7 +47976,7 @@ ] }, { - "key": "EraseCheck_VM", + "base": "EraseCheck_VM", "context": "{93BBB90E-EBB4-507D-89B6-E4921FE44AFF}", "entry": { "name": "In", @@ -48013,7 +48013,7 @@ ] }, { - "key": "Erase", + "base": "Erase", "context": "{93BBB90E-EBB4-507D-89B6-E4921FE44AFF}", "entry": { "name": "In", @@ -48050,7 +48050,7 @@ ] }, { - "key": "Clear", + "base": "Clear", "context": "{93BBB90E-EBB4-507D-89B6-E4921FE44AFF}", "entry": { "name": "In", @@ -48081,7 +48081,7 @@ ] }, { - "key": "BucketCount", + "base": "BucketCount", "context": "{93BBB90E-EBB4-507D-89B6-E4921FE44AFF}", "entry": { "name": "In", @@ -48112,7 +48112,7 @@ ] }, { - "key": "Empty", + "base": "Empty", "context": "{93BBB90E-EBB4-507D-89B6-E4921FE44AFF}", "entry": { "name": "In", @@ -48143,7 +48143,7 @@ ] }, { - "key": "Swap", + "base": "Swap", "context": "{93BBB90E-EBB4-507D-89B6-E4921FE44AFF}", "entry": { "name": "In", @@ -48174,7 +48174,7 @@ ] }, { - "key": "{60CBD665-AE12-50ED-A0CF-D94E77C6292C}", + "base": "{60CBD665-AE12-50ED-A0CF-D94E77C6292C}", "context": "OnDemandReflected", "variant": "", "details": { @@ -48184,7 +48184,7 @@ }, "methods": [ { - "key": "contains", + "base": "contains", "context": "{60CBD665-AE12-50ED-A0CF-D94E77C6292C}", "entry": { "name": "In", @@ -48221,7 +48221,7 @@ ] }, { - "key": "Insert", + "base": "Insert", "context": "{60CBD665-AE12-50ED-A0CF-D94E77C6292C}", "entry": { "name": "In", @@ -48264,7 +48264,7 @@ ] }, { - "key": "Reserve", + "base": "Reserve", "context": "{60CBD665-AE12-50ED-A0CF-D94E77C6292C}", "entry": { "name": "In", @@ -48293,7 +48293,7 @@ ] }, { - "key": "GetSize", + "base": "GetSize", "context": "{60CBD665-AE12-50ED-A0CF-D94E77C6292C}", "entry": { "name": "In", @@ -48324,7 +48324,7 @@ ] }, { - "key": "Iterate_VM", + "base": "Iterate_VM", "context": "{60CBD665-AE12-50ED-A0CF-D94E77C6292C}", "entry": { "name": "In", @@ -48355,7 +48355,7 @@ ] }, { - "key": "GetKeys", + "base": "GetKeys", "context": "{60CBD665-AE12-50ED-A0CF-D94E77C6292C}", "entry": { "name": "In", @@ -48386,7 +48386,7 @@ ] }, { - "key": "Size", + "base": "Size", "context": "{60CBD665-AE12-50ED-A0CF-D94E77C6292C}", "entry": { "name": "In", @@ -48417,7 +48417,7 @@ ] }, { - "key": "Erase", + "base": "Erase", "context": "{60CBD665-AE12-50ED-A0CF-D94E77C6292C}", "entry": { "name": "In", @@ -48454,7 +48454,7 @@ ] }, { - "key": "EraseCheck_VM", + "base": "EraseCheck_VM", "context": "{60CBD665-AE12-50ED-A0CF-D94E77C6292C}", "entry": { "name": "In", @@ -48491,7 +48491,7 @@ ] }, { - "key": "Clear", + "base": "Clear", "context": "{60CBD665-AE12-50ED-A0CF-D94E77C6292C}", "entry": { "name": "In", @@ -48522,7 +48522,7 @@ ] }, { - "key": "At", + "base": "At", "context": "{60CBD665-AE12-50ED-A0CF-D94E77C6292C}", "entry": { "name": "In", @@ -48559,7 +48559,7 @@ ] }, { - "key": "BucketCount", + "base": "BucketCount", "context": "{60CBD665-AE12-50ED-A0CF-D94E77C6292C}", "entry": { "name": "In", @@ -48590,7 +48590,7 @@ ] }, { - "key": "Empty", + "base": "Empty", "context": "{60CBD665-AE12-50ED-A0CF-D94E77C6292C}", "entry": { "name": "In", @@ -48621,7 +48621,7 @@ ] }, { - "key": "Swap", + "base": "Swap", "context": "{60CBD665-AE12-50ED-A0CF-D94E77C6292C}", "entry": { "name": "In", @@ -48652,7 +48652,7 @@ ] }, { - "key": "{403A7CFE-B218-5D57-8540-BD58E734BCFE}", + "base": "{403A7CFE-B218-5D57-8540-BD58E734BCFE}", "context": "OnDemandReflected", "variant": "", "details": { @@ -48660,7 +48660,7 @@ }, "methods": [ { - "key": "IsLoading", + "base": "IsLoading", "context": "{403A7CFE-B218-5D57-8540-BD58E734BCFE}", "entry": { "name": "In", @@ -48691,7 +48691,7 @@ ] }, { - "key": "GetType", + "base": "GetType", "context": "{403A7CFE-B218-5D57-8540-BD58E734BCFE}", "entry": { "name": "In", @@ -48722,7 +48722,7 @@ ] }, { - "key": "IsError", + "base": "IsError", "context": "{403A7CFE-B218-5D57-8540-BD58E734BCFE}", "entry": { "name": "In", @@ -48753,7 +48753,7 @@ ] }, { - "key": "GetHint", + "base": "GetHint", "context": "{403A7CFE-B218-5D57-8540-BD58E734BCFE}", "entry": { "name": "In", @@ -48784,7 +48784,7 @@ ] }, { - "key": "GetData", + "base": "GetData", "context": "{403A7CFE-B218-5D57-8540-BD58E734BCFE}", "entry": { "name": "In", @@ -48815,7 +48815,7 @@ ] }, { - "key": "IsReady", + "base": "IsReady", "context": "{403A7CFE-B218-5D57-8540-BD58E734BCFE}", "entry": { "name": "In", @@ -48846,7 +48846,7 @@ ] }, { - "key": "GetStatus", + "base": "GetStatus", "context": "{403A7CFE-B218-5D57-8540-BD58E734BCFE}", "entry": { "name": "In", @@ -48877,7 +48877,7 @@ ] }, { - "key": "GetId", + "base": "GetId", "context": "{403A7CFE-B218-5D57-8540-BD58E734BCFE}", "entry": { "name": "In", @@ -48910,7 +48910,7 @@ ] }, { - "key": "{2D49E44A-E561-5108-B585-5392D40F9949}", + "base": "{2D49E44A-E561-5108-B585-5392D40F9949}", "context": "OnDemandReflected", "variant": "", "details": { @@ -48920,7 +48920,7 @@ }, "methods": [ { - "key": "contains", + "base": "contains", "context": "{2D49E44A-E561-5108-B585-5392D40F9949}", "entry": { "name": "In", @@ -48958,7 +48958,7 @@ ] }, { - "key": "Insert", + "base": "Insert", "context": "{2D49E44A-E561-5108-B585-5392D40F9949}", "entry": { "name": "In", @@ -49002,7 +49002,7 @@ ] }, { - "key": "Reserve", + "base": "Reserve", "context": "{2D49E44A-E561-5108-B585-5392D40F9949}", "entry": { "name": "In", @@ -49031,7 +49031,7 @@ ] }, { - "key": "GetSize", + "base": "GetSize", "context": "{2D49E44A-E561-5108-B585-5392D40F9949}", "entry": { "name": "In", @@ -49062,7 +49062,7 @@ ] }, { - "key": "Iterate_VM", + "base": "Iterate_VM", "context": "{2D49E44A-E561-5108-B585-5392D40F9949}", "entry": { "name": "In", @@ -49093,7 +49093,7 @@ ] }, { - "key": "GetKeys", + "base": "GetKeys", "context": "{2D49E44A-E561-5108-B585-5392D40F9949}", "entry": { "name": "In", @@ -49124,7 +49124,7 @@ ] }, { - "key": "Size", + "base": "Size", "context": "{2D49E44A-E561-5108-B585-5392D40F9949}", "entry": { "name": "In", @@ -49155,7 +49155,7 @@ ] }, { - "key": "Erase", + "base": "Erase", "context": "{2D49E44A-E561-5108-B585-5392D40F9949}", "entry": { "name": "In", @@ -49193,7 +49193,7 @@ ] }, { - "key": "EraseCheck_VM", + "base": "EraseCheck_VM", "context": "{2D49E44A-E561-5108-B585-5392D40F9949}", "entry": { "name": "In", @@ -49231,7 +49231,7 @@ ] }, { - "key": "Clear", + "base": "Clear", "context": "{2D49E44A-E561-5108-B585-5392D40F9949}", "entry": { "name": "In", @@ -49262,7 +49262,7 @@ ] }, { - "key": "At", + "base": "At", "context": "{2D49E44A-E561-5108-B585-5392D40F9949}", "entry": { "name": "In", @@ -49300,7 +49300,7 @@ ] }, { - "key": "BucketCount", + "base": "BucketCount", "context": "{2D49E44A-E561-5108-B585-5392D40F9949}", "entry": { "name": "In", @@ -49331,7 +49331,7 @@ ] }, { - "key": "Empty", + "base": "Empty", "context": "{2D49E44A-E561-5108-B585-5392D40F9949}", "entry": { "name": "In", @@ -49362,7 +49362,7 @@ ] }, { - "key": "Swap", + "base": "Swap", "context": "{2D49E44A-E561-5108-B585-5392D40F9949}", "entry": { "name": "In", @@ -49393,7 +49393,7 @@ ] }, { - "key": "{32EC831B-8AE7-5715-998B-C0C723CB61DA}", + "base": "{32EC831B-8AE7-5715-998B-C0C723CB61DA}", "context": "OnDemandReflected", "variant": "", "details": { @@ -49403,7 +49403,7 @@ }, "methods": [ { - "key": "Size", + "base": "Size", "context": "{32EC831B-8AE7-5715-998B-C0C723CB61DA}", "entry": { "name": "In", @@ -49434,7 +49434,7 @@ ] }, { - "key": "GetKeys", + "base": "GetKeys", "context": "{32EC831B-8AE7-5715-998B-C0C723CB61DA}", "entry": { "name": "In", @@ -49465,7 +49465,7 @@ ] }, { - "key": "contains", + "base": "contains", "context": "{32EC831B-8AE7-5715-998B-C0C723CB61DA}", "entry": { "name": "In", @@ -49502,7 +49502,7 @@ ] }, { - "key": "Insert", + "base": "Insert", "context": "{32EC831B-8AE7-5715-998B-C0C723CB61DA}", "entry": { "name": "In", @@ -49539,7 +49539,7 @@ ] }, { - "key": "GetSize", + "base": "GetSize", "context": "{32EC831B-8AE7-5715-998B-C0C723CB61DA}", "entry": { "name": "In", @@ -49570,7 +49570,7 @@ ] }, { - "key": "Reserve", + "base": "Reserve", "context": "{32EC831B-8AE7-5715-998B-C0C723CB61DA}", "entry": { "name": "In", @@ -49599,7 +49599,7 @@ ] }, { - "key": "Iterate_VM", + "base": "Iterate_VM", "context": "{32EC831B-8AE7-5715-998B-C0C723CB61DA}", "entry": { "name": "In", @@ -49630,7 +49630,7 @@ ] }, { - "key": "EraseCheck_VM", + "base": "EraseCheck_VM", "context": "{32EC831B-8AE7-5715-998B-C0C723CB61DA}", "entry": { "name": "In", @@ -49667,7 +49667,7 @@ ] }, { - "key": "Erase", + "base": "Erase", "context": "{32EC831B-8AE7-5715-998B-C0C723CB61DA}", "entry": { "name": "In", @@ -49704,7 +49704,7 @@ ] }, { - "key": "Clear", + "base": "Clear", "context": "{32EC831B-8AE7-5715-998B-C0C723CB61DA}", "entry": { "name": "In", @@ -49735,7 +49735,7 @@ ] }, { - "key": "BucketCount", + "base": "BucketCount", "context": "{32EC831B-8AE7-5715-998B-C0C723CB61DA}", "entry": { "name": "In", @@ -49766,7 +49766,7 @@ ] }, { - "key": "Empty", + "base": "Empty", "context": "{32EC831B-8AE7-5715-998B-C0C723CB61DA}", "entry": { "name": "In", @@ -49797,7 +49797,7 @@ ] }, { - "key": "Swap", + "base": "Swap", "context": "{32EC831B-8AE7-5715-998B-C0C723CB61DA}", "entry": { "name": "In", @@ -49828,7 +49828,7 @@ ] }, { - "key": "{AD341397-E3C6-5C5F-92D6-EEAAA134FF68}", + "base": "{AD341397-E3C6-5C5F-92D6-EEAAA134FF68}", "context": "OnDemandReflected", "variant": "", "details": { @@ -49838,7 +49838,7 @@ }, "methods": [ { - "key": "contains", + "base": "contains", "context": "{AD341397-E3C6-5C5F-92D6-EEAAA134FF68}", "entry": { "name": "In", @@ -49875,7 +49875,7 @@ ] }, { - "key": "Insert", + "base": "Insert", "context": "{AD341397-E3C6-5C5F-92D6-EEAAA134FF68}", "entry": { "name": "In", @@ -49918,7 +49918,7 @@ ] }, { - "key": "Reserve", + "base": "Reserve", "context": "{AD341397-E3C6-5C5F-92D6-EEAAA134FF68}", "entry": { "name": "In", @@ -49947,7 +49947,7 @@ ] }, { - "key": "GetSize", + "base": "GetSize", "context": "{AD341397-E3C6-5C5F-92D6-EEAAA134FF68}", "entry": { "name": "In", @@ -49978,7 +49978,7 @@ ] }, { - "key": "Iterate_VM", + "base": "Iterate_VM", "context": "{AD341397-E3C6-5C5F-92D6-EEAAA134FF68}", "entry": { "name": "In", @@ -50009,7 +50009,7 @@ ] }, { - "key": "GetKeys", + "base": "GetKeys", "context": "{AD341397-E3C6-5C5F-92D6-EEAAA134FF68}", "entry": { "name": "In", @@ -50040,7 +50040,7 @@ ] }, { - "key": "Size", + "base": "Size", "context": "{AD341397-E3C6-5C5F-92D6-EEAAA134FF68}", "entry": { "name": "In", @@ -50071,7 +50071,7 @@ ] }, { - "key": "Erase", + "base": "Erase", "context": "{AD341397-E3C6-5C5F-92D6-EEAAA134FF68}", "entry": { "name": "In", @@ -50108,7 +50108,7 @@ ] }, { - "key": "EraseCheck_VM", + "base": "EraseCheck_VM", "context": "{AD341397-E3C6-5C5F-92D6-EEAAA134FF68}", "entry": { "name": "In", @@ -50145,7 +50145,7 @@ ] }, { - "key": "Clear", + "base": "Clear", "context": "{AD341397-E3C6-5C5F-92D6-EEAAA134FF68}", "entry": { "name": "In", @@ -50176,7 +50176,7 @@ ] }, { - "key": "At", + "base": "At", "context": "{AD341397-E3C6-5C5F-92D6-EEAAA134FF68}", "entry": { "name": "In", @@ -50213,7 +50213,7 @@ ] }, { - "key": "BucketCount", + "base": "BucketCount", "context": "{AD341397-E3C6-5C5F-92D6-EEAAA134FF68}", "entry": { "name": "In", @@ -50244,7 +50244,7 @@ ] }, { - "key": "Empty", + "base": "Empty", "context": "{AD341397-E3C6-5C5F-92D6-EEAAA134FF68}", "entry": { "name": "In", @@ -50275,7 +50275,7 @@ ] }, { - "key": "Swap", + "base": "Swap", "context": "{AD341397-E3C6-5C5F-92D6-EEAAA134FF68}", "entry": { "name": "In", @@ -50306,7 +50306,7 @@ ] }, { - "key": "{43147344-44F8-597D-9F8C-B97DFC20C337}", + "base": "{43147344-44F8-597D-9F8C-B97DFC20C337}", "context": "OnDemandReflected", "variant": "", "details": { @@ -50316,7 +50316,7 @@ }, "methods": [ { - "key": "Size", + "base": "Size", "context": "{43147344-44F8-597D-9F8C-B97DFC20C337}", "entry": { "name": "In", @@ -50347,7 +50347,7 @@ ] }, { - "key": "Front", + "base": "Front", "context": "{43147344-44F8-597D-9F8C-B97DFC20C337}", "entry": { "name": "In", @@ -50378,7 +50378,7 @@ ] }, { - "key": "HasKey", + "base": "HasKey", "context": "{43147344-44F8-597D-9F8C-B97DFC20C337}", "entry": { "name": "In", @@ -50415,7 +50415,7 @@ ] }, { - "key": "Resize", + "base": "Resize", "context": "{43147344-44F8-597D-9F8C-B97DFC20C337}", "entry": { "name": "In", @@ -50444,7 +50444,7 @@ ] }, { - "key": "at", + "base": "at", "context": "{43147344-44F8-597D-9F8C-B97DFC20C337}", "entry": { "name": "In", @@ -50481,7 +50481,7 @@ ] }, { - "key": "Back", + "base": "Back", "context": "{43147344-44F8-597D-9F8C-B97DFC20C337}", "entry": { "name": "In", @@ -50512,7 +50512,7 @@ ] }, { - "key": "pop_back", + "base": "pop_back", "context": "{43147344-44F8-597D-9F8C-B97DFC20C337}", "entry": { "name": "In", @@ -50535,7 +50535,7 @@ ] }, { - "key": "size", + "base": "size", "context": "{43147344-44F8-597D-9F8C-B97DFC20C337}", "entry": { "name": "In", @@ -50566,7 +50566,7 @@ ] }, { - "key": "At", + "base": "At", "context": "{43147344-44F8-597D-9F8C-B97DFC20C337}", "entry": { "name": "In", @@ -50603,7 +50603,7 @@ ] }, { - "key": "Empty", + "base": "Empty", "context": "{43147344-44F8-597D-9F8C-B97DFC20C337}", "entry": { "name": "In", @@ -50634,7 +50634,7 @@ ] }, { - "key": "Swap", + "base": "Swap", "context": "{43147344-44F8-597D-9F8C-B97DFC20C337}", "entry": { "name": "In", @@ -50663,7 +50663,7 @@ ] }, { - "key": "push_back", + "base": "push_back", "context": "{43147344-44F8-597D-9F8C-B97DFC20C337}", "entry": { "name": "In", @@ -50692,7 +50692,7 @@ ] }, { - "key": "PushBack_VM", + "base": "PushBack_VM", "context": "{43147344-44F8-597D-9F8C-B97DFC20C337}", "entry": { "name": "In", @@ -50729,7 +50729,7 @@ ] }, { - "key": "AtUnchecked", + "base": "AtUnchecked", "context": "{43147344-44F8-597D-9F8C-B97DFC20C337}", "entry": { "name": "In", @@ -50766,7 +50766,7 @@ ] }, { - "key": "clear", + "base": "clear", "context": "{43147344-44F8-597D-9F8C-B97DFC20C337}", "entry": { "name": "In", @@ -50789,7 +50789,7 @@ ] }, { - "key": "NotEmpty", + "base": "NotEmpty", "context": "{43147344-44F8-597D-9F8C-B97DFC20C337}", "entry": { "name": "In", @@ -50820,7 +50820,7 @@ ] }, { - "key": "Erase_VM", + "base": "Erase_VM", "context": "{43147344-44F8-597D-9F8C-B97DFC20C337}", "entry": { "name": "In", @@ -50857,7 +50857,7 @@ ] }, { - "key": "EraseCheck_VM", + "base": "EraseCheck_VM", "context": "{43147344-44F8-597D-9F8C-B97DFC20C337}", "entry": { "name": "In", @@ -50894,7 +50894,7 @@ ] }, { - "key": "Capacity", + "base": "Capacity", "context": "{43147344-44F8-597D-9F8C-B97DFC20C337}", "entry": { "name": "In", @@ -50925,7 +50925,7 @@ ] }, { - "key": "Clear", + "base": "Clear", "context": "{43147344-44F8-597D-9F8C-B97DFC20C337}", "entry": { "name": "In", @@ -50956,7 +50956,7 @@ ] }, { - "key": "AssignAt", + "base": "AssignAt", "context": "{43147344-44F8-597D-9F8C-B97DFC20C337}", "entry": { "name": "In", @@ -50991,7 +50991,7 @@ ] }, { - "key": "GetSize", + "base": "GetSize", "context": "{43147344-44F8-597D-9F8C-B97DFC20C337}", "entry": { "name": "In", @@ -51022,7 +51022,7 @@ ] }, { - "key": "Insert", + "base": "Insert", "context": "{43147344-44F8-597D-9F8C-B97DFC20C337}", "entry": { "name": "In", @@ -51065,7 +51065,7 @@ ] }, { - "key": "PushBack", + "base": "PushBack", "context": "{43147344-44F8-597D-9F8C-B97DFC20C337}", "entry": { "name": "In", @@ -51094,7 +51094,7 @@ ] }, { - "key": "Reserve", + "base": "Reserve", "context": "{43147344-44F8-597D-9F8C-B97DFC20C337}", "entry": { "name": "In", @@ -51123,7 +51123,7 @@ ] }, { - "key": "Iterate_VM", + "base": "Iterate_VM", "context": "{43147344-44F8-597D-9F8C-B97DFC20C337}", "entry": { "name": "In", @@ -51156,7 +51156,7 @@ ] }, { - "key": "{5BAFAD11-D6AF-5946-B09B-6E0B72E1209C}", + "base": "{5BAFAD11-D6AF-5946-B09B-6E0B72E1209C}", "context": "OnDemandReflected", "variant": "", "details": { @@ -51164,7 +51164,7 @@ }, "methods": [ { - "key": "Get0", + "base": "Get0", "context": "{5BAFAD11-D6AF-5946-B09B-6E0B72E1209C}", "entry": { "name": "In", @@ -51195,7 +51195,7 @@ ] }, { - "key": "Get1", + "base": "Get1", "context": "{5BAFAD11-D6AF-5946-B09B-6E0B72E1209C}", "entry": { "name": "In", @@ -51226,7 +51226,7 @@ ] }, { - "key": "Get2", + "base": "Get2", "context": "{5BAFAD11-D6AF-5946-B09B-6E0B72E1209C}", "entry": { "name": "In", @@ -51257,7 +51257,7 @@ ] }, { - "key": "GetSize", + "base": "GetSize", "context": "{5BAFAD11-D6AF-5946-B09B-6E0B72E1209C}", "entry": { "name": "In", @@ -51282,7 +51282,7 @@ ] }, { - "key": "{FD1BFADF-BA1F-4AFC-819B-ABA1F22AE6E6}", + "base": "{FD1BFADF-BA1F-4AFC-819B-ABA1F22AE6E6}", "context": "OnDemandReflected", "variant": "", "details": { @@ -51290,7 +51290,7 @@ }, "methods": [ { - "key": "DirectionTo", + "base": "DirectionTo", "context": "{FD1BFADF-BA1F-4AFC-819B-ABA1F22AE6E6}", "entry": { "name": "In", @@ -51333,7 +51333,7 @@ ] }, { - "key": "Subtract", + "base": "Subtract", "context": "{FD1BFADF-BA1F-4AFC-819B-ABA1F22AE6E6}", "entry": { "name": "In", @@ -51370,7 +51370,7 @@ ] }, { - "key": "Project", + "base": "Project", "context": "{FD1BFADF-BA1F-4AFC-819B-ABA1F22AE6E6}", "entry": { "name": "In", @@ -51407,7 +51407,7 @@ ] }, { - "key": "Distance", + "base": "Distance", "context": "{FD1BFADF-BA1F-4AFC-819B-ABA1F22AE6E6}", "entry": { "name": "In", @@ -51444,7 +51444,7 @@ ] }, { - "key": "FromValues", + "base": "FromValues", "context": "{FD1BFADF-BA1F-4AFC-819B-ABA1F22AE6E6}", "entry": { "name": "In", @@ -51481,7 +51481,7 @@ ] }, { - "key": "Dot", + "base": "Dot", "context": "{FD1BFADF-BA1F-4AFC-819B-ABA1F22AE6E6}", "entry": { "name": "In", @@ -51518,7 +51518,7 @@ ] }, { - "key": "Angle", + "base": "Angle", "context": "{FD1BFADF-BA1F-4AFC-819B-ABA1F22AE6E6}", "entry": { "name": "In", @@ -51549,7 +51549,7 @@ ] }, { - "key": "Negate", + "base": "Negate", "context": "{FD1BFADF-BA1F-4AFC-819B-ABA1F22AE6E6}", "entry": { "name": "In", @@ -51580,7 +51580,7 @@ ] }, { - "key": "MultiplyByVector", + "base": "MultiplyByVector", "context": "{FD1BFADF-BA1F-4AFC-819B-ABA1F22AE6E6}", "entry": { "name": "In", @@ -51617,7 +51617,7 @@ ] }, { - "key": "Add", + "base": "Add", "context": "{FD1BFADF-BA1F-4AFC-819B-ABA1F22AE6E6}", "entry": { "name": "In", @@ -51654,7 +51654,7 @@ ] }, { - "key": "Clamp", + "base": "Clamp", "context": "{FD1BFADF-BA1F-4AFC-819B-ABA1F22AE6E6}", "entry": { "name": "In", @@ -51697,7 +51697,7 @@ ] }, { - "key": "MultiplyByNumber", + "base": "MultiplyByNumber", "context": "{FD1BFADF-BA1F-4AFC-819B-ABA1F22AE6E6}", "entry": { "name": "In", @@ -51734,7 +51734,7 @@ ] }, { - "key": "Slerp", + "base": "Slerp", "context": "{FD1BFADF-BA1F-4AFC-819B-ABA1F22AE6E6}", "entry": { "name": "In", @@ -51777,7 +51777,7 @@ ] }, { - "key": "IsZero", + "base": "IsZero", "context": "{FD1BFADF-BA1F-4AFC-819B-ABA1F22AE6E6}", "entry": { "name": "In", @@ -51814,7 +51814,7 @@ ] }, { - "key": "SetY", + "base": "SetY", "context": "{FD1BFADF-BA1F-4AFC-819B-ABA1F22AE6E6}", "entry": { "name": "In", @@ -51851,7 +51851,7 @@ ] }, { - "key": "IsClose", + "base": "IsClose", "context": "{FD1BFADF-BA1F-4AFC-819B-ABA1F22AE6E6}", "entry": { "name": "In", @@ -51894,7 +51894,7 @@ ] }, { - "key": "DivideByNumber", + "base": "DivideByNumber", "context": "{FD1BFADF-BA1F-4AFC-819B-ABA1F22AE6E6}", "entry": { "name": "In", @@ -51931,7 +51931,7 @@ ] }, { - "key": "IsNormalized", + "base": "IsNormalized", "context": "{FD1BFADF-BA1F-4AFC-819B-ABA1F22AE6E6}", "entry": { "name": "In", @@ -51968,7 +51968,7 @@ ] }, { - "key": "LengthSquared", + "base": "LengthSquared", "context": "{FD1BFADF-BA1F-4AFC-819B-ABA1F22AE6E6}", "entry": { "name": "In", @@ -51999,7 +51999,7 @@ ] }, { - "key": "IsFinite", + "base": "IsFinite", "context": "{FD1BFADF-BA1F-4AFC-819B-ABA1F22AE6E6}", "entry": { "name": "In", @@ -52030,7 +52030,7 @@ ] }, { - "key": "ToPerpendicular", + "base": "ToPerpendicular", "context": "{FD1BFADF-BA1F-4AFC-819B-ABA1F22AE6E6}", "entry": { "name": "In", @@ -52061,7 +52061,7 @@ ] }, { - "key": "Normalize", + "base": "Normalize", "context": "{FD1BFADF-BA1F-4AFC-819B-ABA1F22AE6E6}", "entry": { "name": "In", @@ -52092,7 +52092,7 @@ ] }, { - "key": "Max", + "base": "Max", "context": "{FD1BFADF-BA1F-4AFC-819B-ABA1F22AE6E6}", "entry": { "name": "In", @@ -52129,7 +52129,7 @@ ] }, { - "key": "GetElement", + "base": "GetElement", "context": "{FD1BFADF-BA1F-4AFC-819B-ABA1F22AE6E6}", "entry": { "name": "In", @@ -52166,7 +52166,7 @@ ] }, { - "key": "Absolute", + "base": "Absolute", "context": "{FD1BFADF-BA1F-4AFC-819B-ABA1F22AE6E6}", "entry": { "name": "In", @@ -52197,7 +52197,7 @@ ] }, { - "key": "SetX", + "base": "SetX", "context": "{FD1BFADF-BA1F-4AFC-819B-ABA1F22AE6E6}", "entry": { "name": "In", @@ -52234,7 +52234,7 @@ ] }, { - "key": "Min", + "base": "Min", "context": "{FD1BFADF-BA1F-4AFC-819B-ABA1F22AE6E6}", "entry": { "name": "In", @@ -52271,7 +52271,7 @@ ] }, { - "key": "DivideByVector", + "base": "DivideByVector", "context": "{FD1BFADF-BA1F-4AFC-819B-ABA1F22AE6E6}", "entry": { "name": "In", @@ -52308,7 +52308,7 @@ ] }, { - "key": "DistanceSquared", + "base": "DistanceSquared", "context": "{FD1BFADF-BA1F-4AFC-819B-ABA1F22AE6E6}", "entry": { "name": "In", @@ -52345,7 +52345,7 @@ ] }, { - "key": "Length", + "base": "Length", "context": "{FD1BFADF-BA1F-4AFC-819B-ABA1F22AE6E6}", "entry": { "name": "In", @@ -52376,7 +52376,7 @@ ] }, { - "key": "Lerp", + "base": "Lerp", "context": "{FD1BFADF-BA1F-4AFC-819B-ABA1F22AE6E6}", "entry": { "name": "In", @@ -52421,7 +52421,7 @@ ] }, { - "key": "{544C0867-6EF4-593D-97BD-A51F6EB8164E}", + "base": "{544C0867-6EF4-593D-97BD-A51F6EB8164E}", "context": "OnDemandReflected", "variant": "", "details": { @@ -52431,7 +52431,7 @@ }, "methods": [ { - "key": "contains", + "base": "contains", "context": "{544C0867-6EF4-593D-97BD-A51F6EB8164E}", "entry": { "name": "In", @@ -52469,7 +52469,7 @@ ] }, { - "key": "Insert", + "base": "Insert", "context": "{544C0867-6EF4-593D-97BD-A51F6EB8164E}", "entry": { "name": "In", @@ -52513,7 +52513,7 @@ ] }, { - "key": "Reserve", + "base": "Reserve", "context": "{544C0867-6EF4-593D-97BD-A51F6EB8164E}", "entry": { "name": "In", @@ -52542,7 +52542,7 @@ ] }, { - "key": "GetSize", + "base": "GetSize", "context": "{544C0867-6EF4-593D-97BD-A51F6EB8164E}", "entry": { "name": "In", @@ -52573,7 +52573,7 @@ ] }, { - "key": "Iterate_VM", + "base": "Iterate_VM", "context": "{544C0867-6EF4-593D-97BD-A51F6EB8164E}", "entry": { "name": "In", @@ -52604,7 +52604,7 @@ ] }, { - "key": "GetKeys", + "base": "GetKeys", "context": "{544C0867-6EF4-593D-97BD-A51F6EB8164E}", "entry": { "name": "In", @@ -52635,7 +52635,7 @@ ] }, { - "key": "Size", + "base": "Size", "context": "{544C0867-6EF4-593D-97BD-A51F6EB8164E}", "entry": { "name": "In", @@ -52666,7 +52666,7 @@ ] }, { - "key": "Erase", + "base": "Erase", "context": "{544C0867-6EF4-593D-97BD-A51F6EB8164E}", "entry": { "name": "In", @@ -52704,7 +52704,7 @@ ] }, { - "key": "EraseCheck_VM", + "base": "EraseCheck_VM", "context": "{544C0867-6EF4-593D-97BD-A51F6EB8164E}", "entry": { "name": "In", @@ -52742,7 +52742,7 @@ ] }, { - "key": "Clear", + "base": "Clear", "context": "{544C0867-6EF4-593D-97BD-A51F6EB8164E}", "entry": { "name": "In", @@ -52773,7 +52773,7 @@ ] }, { - "key": "At", + "base": "At", "context": "{544C0867-6EF4-593D-97BD-A51F6EB8164E}", "entry": { "name": "In", @@ -52811,7 +52811,7 @@ ] }, { - "key": "BucketCount", + "base": "BucketCount", "context": "{544C0867-6EF4-593D-97BD-A51F6EB8164E}", "entry": { "name": "In", @@ -52842,7 +52842,7 @@ ] }, { - "key": "Empty", + "base": "Empty", "context": "{544C0867-6EF4-593D-97BD-A51F6EB8164E}", "entry": { "name": "In", @@ -52873,7 +52873,7 @@ ] }, { - "key": "Swap", + "base": "Swap", "context": "{544C0867-6EF4-593D-97BD-A51F6EB8164E}", "entry": { "name": "In", @@ -52904,7 +52904,7 @@ ] }, { - "key": "{873120A5-6F9A-543A-BE16-6ED846A8655C}", + "base": "{873120A5-6F9A-543A-BE16-6ED846A8655C}", "context": "OnDemandReflected", "variant": "", "details": { @@ -52914,7 +52914,7 @@ }, "methods": [ { - "key": "contains", + "base": "contains", "context": "{873120A5-6F9A-543A-BE16-6ED846A8655C}", "entry": { "name": "In", @@ -52951,7 +52951,7 @@ ] }, { - "key": "Insert", + "base": "Insert", "context": "{873120A5-6F9A-543A-BE16-6ED846A8655C}", "entry": { "name": "In", @@ -52994,7 +52994,7 @@ ] }, { - "key": "Reserve", + "base": "Reserve", "context": "{873120A5-6F9A-543A-BE16-6ED846A8655C}", "entry": { "name": "In", @@ -53023,7 +53023,7 @@ ] }, { - "key": "GetSize", + "base": "GetSize", "context": "{873120A5-6F9A-543A-BE16-6ED846A8655C}", "entry": { "name": "In", @@ -53054,7 +53054,7 @@ ] }, { - "key": "Iterate_VM", + "base": "Iterate_VM", "context": "{873120A5-6F9A-543A-BE16-6ED846A8655C}", "entry": { "name": "In", @@ -53085,7 +53085,7 @@ ] }, { - "key": "GetKeys", + "base": "GetKeys", "context": "{873120A5-6F9A-543A-BE16-6ED846A8655C}", "entry": { "name": "In", @@ -53116,7 +53116,7 @@ ] }, { - "key": "Size", + "base": "Size", "context": "{873120A5-6F9A-543A-BE16-6ED846A8655C}", "entry": { "name": "In", @@ -53147,7 +53147,7 @@ ] }, { - "key": "Erase", + "base": "Erase", "context": "{873120A5-6F9A-543A-BE16-6ED846A8655C}", "entry": { "name": "In", @@ -53184,7 +53184,7 @@ ] }, { - "key": "EraseCheck_VM", + "base": "EraseCheck_VM", "context": "{873120A5-6F9A-543A-BE16-6ED846A8655C}", "entry": { "name": "In", @@ -53221,7 +53221,7 @@ ] }, { - "key": "Clear", + "base": "Clear", "context": "{873120A5-6F9A-543A-BE16-6ED846A8655C}", "entry": { "name": "In", @@ -53252,7 +53252,7 @@ ] }, { - "key": "At", + "base": "At", "context": "{873120A5-6F9A-543A-BE16-6ED846A8655C}", "entry": { "name": "In", @@ -53289,7 +53289,7 @@ ] }, { - "key": "BucketCount", + "base": "BucketCount", "context": "{873120A5-6F9A-543A-BE16-6ED846A8655C}", "entry": { "name": "In", @@ -53320,7 +53320,7 @@ ] }, { - "key": "Empty", + "base": "Empty", "context": "{873120A5-6F9A-543A-BE16-6ED846A8655C}", "entry": { "name": "In", @@ -53351,7 +53351,7 @@ ] }, { - "key": "Swap", + "base": "Swap", "context": "{873120A5-6F9A-543A-BE16-6ED846A8655C}", "entry": { "name": "In", @@ -53382,7 +53382,7 @@ ] }, { - "key": "{D653CC1C-3625-5EE4-9F96-A1D20E576E8D}", + "base": "{D653CC1C-3625-5EE4-9F96-A1D20E576E8D}", "context": "OnDemandReflected", "variant": "", "details": { @@ -53392,7 +53392,7 @@ }, "methods": [ { - "key": "contains", + "base": "contains", "context": "{D653CC1C-3625-5EE4-9F96-A1D20E576E8D}", "entry": { "name": "In", @@ -53429,7 +53429,7 @@ ] }, { - "key": "Insert", + "base": "Insert", "context": "{D653CC1C-3625-5EE4-9F96-A1D20E576E8D}", "entry": { "name": "In", @@ -53472,7 +53472,7 @@ ] }, { - "key": "Reserve", + "base": "Reserve", "context": "{D653CC1C-3625-5EE4-9F96-A1D20E576E8D}", "entry": { "name": "In", @@ -53501,7 +53501,7 @@ ] }, { - "key": "GetSize", + "base": "GetSize", "context": "{D653CC1C-3625-5EE4-9F96-A1D20E576E8D}", "entry": { "name": "In", @@ -53532,7 +53532,7 @@ ] }, { - "key": "Iterate_VM", + "base": "Iterate_VM", "context": "{D653CC1C-3625-5EE4-9F96-A1D20E576E8D}", "entry": { "name": "In", @@ -53563,7 +53563,7 @@ ] }, { - "key": "GetKeys", + "base": "GetKeys", "context": "{D653CC1C-3625-5EE4-9F96-A1D20E576E8D}", "entry": { "name": "In", @@ -53594,7 +53594,7 @@ ] }, { - "key": "Size", + "base": "Size", "context": "{D653CC1C-3625-5EE4-9F96-A1D20E576E8D}", "entry": { "name": "In", @@ -53625,7 +53625,7 @@ ] }, { - "key": "Erase", + "base": "Erase", "context": "{D653CC1C-3625-5EE4-9F96-A1D20E576E8D}", "entry": { "name": "In", @@ -53662,7 +53662,7 @@ ] }, { - "key": "EraseCheck_VM", + "base": "EraseCheck_VM", "context": "{D653CC1C-3625-5EE4-9F96-A1D20E576E8D}", "entry": { "name": "In", @@ -53699,7 +53699,7 @@ ] }, { - "key": "Clear", + "base": "Clear", "context": "{D653CC1C-3625-5EE4-9F96-A1D20E576E8D}", "entry": { "name": "In", @@ -53730,7 +53730,7 @@ ] }, { - "key": "At", + "base": "At", "context": "{D653CC1C-3625-5EE4-9F96-A1D20E576E8D}", "entry": { "name": "In", @@ -53767,7 +53767,7 @@ ] }, { - "key": "BucketCount", + "base": "BucketCount", "context": "{D653CC1C-3625-5EE4-9F96-A1D20E576E8D}", "entry": { "name": "In", @@ -53798,7 +53798,7 @@ ] }, { - "key": "Empty", + "base": "Empty", "context": "{D653CC1C-3625-5EE4-9F96-A1D20E576E8D}", "entry": { "name": "In", @@ -53829,7 +53829,7 @@ ] }, { - "key": "Swap", + "base": "Swap", "context": "{D653CC1C-3625-5EE4-9F96-A1D20E576E8D}", "entry": { "name": "In", @@ -53860,7 +53860,7 @@ ] }, { - "key": "{F429F985-AF00-529B-8449-16E56694E5F9}", + "base": "{F429F985-AF00-529B-8449-16E56694E5F9}", "context": "OnDemandReflected", "variant": "", "details": { @@ -53868,7 +53868,7 @@ }, "methods": [ { - "key": "HasHandlerConnected", + "base": "HasHandlerConnected", "context": "{F429F985-AF00-529B-8449-16E56694E5F9}", "entry": { "name": "In", @@ -53901,7 +53901,7 @@ ] }, { - "key": "{C408B3CC-9C42-5306-93BC-FAB670B2F860}", + "base": "{C408B3CC-9C42-5306-93BC-FAB670B2F860}", "context": "OnDemandReflected", "variant": "", "details": { @@ -53911,7 +53911,7 @@ }, "methods": [ { - "key": "contains", + "base": "contains", "context": "{C408B3CC-9C42-5306-93BC-FAB670B2F860}", "entry": { "name": "In", @@ -53948,7 +53948,7 @@ ] }, { - "key": "Insert", + "base": "Insert", "context": "{C408B3CC-9C42-5306-93BC-FAB670B2F860}", "entry": { "name": "In", @@ -53991,7 +53991,7 @@ ] }, { - "key": "Reserve", + "base": "Reserve", "context": "{C408B3CC-9C42-5306-93BC-FAB670B2F860}", "entry": { "name": "In", @@ -54020,7 +54020,7 @@ ] }, { - "key": "GetSize", + "base": "GetSize", "context": "{C408B3CC-9C42-5306-93BC-FAB670B2F860}", "entry": { "name": "In", @@ -54051,7 +54051,7 @@ ] }, { - "key": "Iterate_VM", + "base": "Iterate_VM", "context": "{C408B3CC-9C42-5306-93BC-FAB670B2F860}", "entry": { "name": "In", @@ -54082,7 +54082,7 @@ ] }, { - "key": "GetKeys", + "base": "GetKeys", "context": "{C408B3CC-9C42-5306-93BC-FAB670B2F860}", "entry": { "name": "In", @@ -54113,7 +54113,7 @@ ] }, { - "key": "Size", + "base": "Size", "context": "{C408B3CC-9C42-5306-93BC-FAB670B2F860}", "entry": { "name": "In", @@ -54144,7 +54144,7 @@ ] }, { - "key": "Erase", + "base": "Erase", "context": "{C408B3CC-9C42-5306-93BC-FAB670B2F860}", "entry": { "name": "In", @@ -54181,7 +54181,7 @@ ] }, { - "key": "EraseCheck_VM", + "base": "EraseCheck_VM", "context": "{C408B3CC-9C42-5306-93BC-FAB670B2F860}", "entry": { "name": "In", @@ -54218,7 +54218,7 @@ ] }, { - "key": "Clear", + "base": "Clear", "context": "{C408B3CC-9C42-5306-93BC-FAB670B2F860}", "entry": { "name": "In", @@ -54249,7 +54249,7 @@ ] }, { - "key": "At", + "base": "At", "context": "{C408B3CC-9C42-5306-93BC-FAB670B2F860}", "entry": { "name": "In", @@ -54286,7 +54286,7 @@ ] }, { - "key": "BucketCount", + "base": "BucketCount", "context": "{C408B3CC-9C42-5306-93BC-FAB670B2F860}", "entry": { "name": "In", @@ -54317,7 +54317,7 @@ ] }, { - "key": "Empty", + "base": "Empty", "context": "{C408B3CC-9C42-5306-93BC-FAB670B2F860}", "entry": { "name": "In", @@ -54348,7 +54348,7 @@ ] }, { - "key": "Swap", + "base": "Swap", "context": "{C408B3CC-9C42-5306-93BC-FAB670B2F860}", "entry": { "name": "In", @@ -54379,7 +54379,7 @@ ] }, { - "key": "{C00D2478-E0F3-57A3-AB60-A04DFC515016}", + "base": "{C00D2478-E0F3-57A3-AB60-A04DFC515016}", "context": "OnDemandReflected", "variant": "", "details": { @@ -54387,7 +54387,7 @@ }, "methods": [ { - "key": "HasHandlerConnected", + "base": "HasHandlerConnected", "context": "{C00D2478-E0F3-57A3-AB60-A04DFC515016}", "entry": { "name": "In", @@ -54420,7 +54420,7 @@ ] }, { - "key": "{9A6CD726-97FC-54C4-A34B-5996F6948697}", + "base": "{9A6CD726-97FC-54C4-A34B-5996F6948697}", "context": "OnDemandReflected", "variant": "", "details": { @@ -54430,7 +54430,7 @@ }, "methods": [ { - "key": "get", + "base": "get", "context": "{9A6CD726-97FC-54C4-A34B-5996F6948697}", "entry": { "name": "In", @@ -54463,7 +54463,7 @@ ] }, { - "key": "{DCAD95EA-9447-5B13-AACC-6C7223E1C04D}", + "base": "{DCAD95EA-9447-5B13-AACC-6C7223E1C04D}", "context": "OnDemandReflected", "variant": "", "details": { @@ -54473,7 +54473,7 @@ }, "methods": [ { - "key": "Size", + "base": "Size", "context": "{DCAD95EA-9447-5B13-AACC-6C7223E1C04D}", "entry": { "name": "In", @@ -54504,7 +54504,7 @@ ] }, { - "key": "Front", + "base": "Front", "context": "{DCAD95EA-9447-5B13-AACC-6C7223E1C04D}", "entry": { "name": "In", @@ -54535,7 +54535,7 @@ ] }, { - "key": "HasKey", + "base": "HasKey", "context": "{DCAD95EA-9447-5B13-AACC-6C7223E1C04D}", "entry": { "name": "In", @@ -54572,7 +54572,7 @@ ] }, { - "key": "Resize", + "base": "Resize", "context": "{DCAD95EA-9447-5B13-AACC-6C7223E1C04D}", "entry": { "name": "In", @@ -54601,7 +54601,7 @@ ] }, { - "key": "at", + "base": "at", "context": "{DCAD95EA-9447-5B13-AACC-6C7223E1C04D}", "entry": { "name": "In", @@ -54638,7 +54638,7 @@ ] }, { - "key": "Back", + "base": "Back", "context": "{DCAD95EA-9447-5B13-AACC-6C7223E1C04D}", "entry": { "name": "In", @@ -54669,7 +54669,7 @@ ] }, { - "key": "pop_back", + "base": "pop_back", "context": "{DCAD95EA-9447-5B13-AACC-6C7223E1C04D}", "entry": { "name": "In", @@ -54692,7 +54692,7 @@ ] }, { - "key": "size", + "base": "size", "context": "{DCAD95EA-9447-5B13-AACC-6C7223E1C04D}", "entry": { "name": "In", @@ -54723,7 +54723,7 @@ ] }, { - "key": "At", + "base": "At", "context": "{DCAD95EA-9447-5B13-AACC-6C7223E1C04D}", "entry": { "name": "In", @@ -54760,7 +54760,7 @@ ] }, { - "key": "Empty", + "base": "Empty", "context": "{DCAD95EA-9447-5B13-AACC-6C7223E1C04D}", "entry": { "name": "In", @@ -54791,7 +54791,7 @@ ] }, { - "key": "Swap", + "base": "Swap", "context": "{DCAD95EA-9447-5B13-AACC-6C7223E1C04D}", "entry": { "name": "In", @@ -54820,7 +54820,7 @@ ] }, { - "key": "push_back", + "base": "push_back", "context": "{DCAD95EA-9447-5B13-AACC-6C7223E1C04D}", "entry": { "name": "In", @@ -54849,7 +54849,7 @@ ] }, { - "key": "PushBack_VM", + "base": "PushBack_VM", "context": "{DCAD95EA-9447-5B13-AACC-6C7223E1C04D}", "entry": { "name": "In", @@ -54886,7 +54886,7 @@ ] }, { - "key": "AtUnchecked", + "base": "AtUnchecked", "context": "{DCAD95EA-9447-5B13-AACC-6C7223E1C04D}", "entry": { "name": "In", @@ -54923,7 +54923,7 @@ ] }, { - "key": "clear", + "base": "clear", "context": "{DCAD95EA-9447-5B13-AACC-6C7223E1C04D}", "entry": { "name": "In", @@ -54946,7 +54946,7 @@ ] }, { - "key": "NotEmpty", + "base": "NotEmpty", "context": "{DCAD95EA-9447-5B13-AACC-6C7223E1C04D}", "entry": { "name": "In", @@ -54977,7 +54977,7 @@ ] }, { - "key": "Erase_VM", + "base": "Erase_VM", "context": "{DCAD95EA-9447-5B13-AACC-6C7223E1C04D}", "entry": { "name": "In", @@ -55014,7 +55014,7 @@ ] }, { - "key": "EraseCheck_VM", + "base": "EraseCheck_VM", "context": "{DCAD95EA-9447-5B13-AACC-6C7223E1C04D}", "entry": { "name": "In", @@ -55051,7 +55051,7 @@ ] }, { - "key": "Capacity", + "base": "Capacity", "context": "{DCAD95EA-9447-5B13-AACC-6C7223E1C04D}", "entry": { "name": "In", @@ -55082,7 +55082,7 @@ ] }, { - "key": "Clear", + "base": "Clear", "context": "{DCAD95EA-9447-5B13-AACC-6C7223E1C04D}", "entry": { "name": "In", @@ -55113,7 +55113,7 @@ ] }, { - "key": "AssignAt", + "base": "AssignAt", "context": "{DCAD95EA-9447-5B13-AACC-6C7223E1C04D}", "entry": { "name": "In", @@ -55148,7 +55148,7 @@ ] }, { - "key": "GetSize", + "base": "GetSize", "context": "{DCAD95EA-9447-5B13-AACC-6C7223E1C04D}", "entry": { "name": "In", @@ -55179,7 +55179,7 @@ ] }, { - "key": "Insert", + "base": "Insert", "context": "{DCAD95EA-9447-5B13-AACC-6C7223E1C04D}", "entry": { "name": "In", @@ -55222,7 +55222,7 @@ ] }, { - "key": "PushBack", + "base": "PushBack", "context": "{DCAD95EA-9447-5B13-AACC-6C7223E1C04D}", "entry": { "name": "In", @@ -55251,7 +55251,7 @@ ] }, { - "key": "Reserve", + "base": "Reserve", "context": "{DCAD95EA-9447-5B13-AACC-6C7223E1C04D}", "entry": { "name": "In", @@ -55280,7 +55280,7 @@ ] }, { - "key": "Iterate_VM", + "base": "Iterate_VM", "context": "{DCAD95EA-9447-5B13-AACC-6C7223E1C04D}", "entry": { "name": "In", @@ -55313,7 +55313,7 @@ ] }, { - "key": "{0D5E2C44-B2DE-57D6-B4B9-3F37C5D9B245}", + "base": "{0D5E2C44-B2DE-57D6-B4B9-3F37C5D9B245}", "context": "OnDemandReflected", "variant": "", "details": { @@ -55323,7 +55323,7 @@ }, "methods": [ { - "key": "Size", + "base": "Size", "context": "{0D5E2C44-B2DE-57D6-B4B9-3F37C5D9B245}", "entry": { "name": "In", @@ -55354,7 +55354,7 @@ ] }, { - "key": "GetKeys", + "base": "GetKeys", "context": "{0D5E2C44-B2DE-57D6-B4B9-3F37C5D9B245}", "entry": { "name": "In", @@ -55385,7 +55385,7 @@ ] }, { - "key": "contains", + "base": "contains", "context": "{0D5E2C44-B2DE-57D6-B4B9-3F37C5D9B245}", "entry": { "name": "In", @@ -55422,7 +55422,7 @@ ] }, { - "key": "Insert", + "base": "Insert", "context": "{0D5E2C44-B2DE-57D6-B4B9-3F37C5D9B245}", "entry": { "name": "In", @@ -55459,7 +55459,7 @@ ] }, { - "key": "GetSize", + "base": "GetSize", "context": "{0D5E2C44-B2DE-57D6-B4B9-3F37C5D9B245}", "entry": { "name": "In", @@ -55490,7 +55490,7 @@ ] }, { - "key": "Reserve", + "base": "Reserve", "context": "{0D5E2C44-B2DE-57D6-B4B9-3F37C5D9B245}", "entry": { "name": "In", @@ -55519,7 +55519,7 @@ ] }, { - "key": "Iterate_VM", + "base": "Iterate_VM", "context": "{0D5E2C44-B2DE-57D6-B4B9-3F37C5D9B245}", "entry": { "name": "In", @@ -55550,7 +55550,7 @@ ] }, { - "key": "EraseCheck_VM", + "base": "EraseCheck_VM", "context": "{0D5E2C44-B2DE-57D6-B4B9-3F37C5D9B245}", "entry": { "name": "In", @@ -55587,7 +55587,7 @@ ] }, { - "key": "Erase", + "base": "Erase", "context": "{0D5E2C44-B2DE-57D6-B4B9-3F37C5D9B245}", "entry": { "name": "In", @@ -55624,7 +55624,7 @@ ] }, { - "key": "Clear", + "base": "Clear", "context": "{0D5E2C44-B2DE-57D6-B4B9-3F37C5D9B245}", "entry": { "name": "In", @@ -55655,7 +55655,7 @@ ] }, { - "key": "BucketCount", + "base": "BucketCount", "context": "{0D5E2C44-B2DE-57D6-B4B9-3F37C5D9B245}", "entry": { "name": "In", @@ -55686,7 +55686,7 @@ ] }, { - "key": "Empty", + "base": "Empty", "context": "{0D5E2C44-B2DE-57D6-B4B9-3F37C5D9B245}", "entry": { "name": "In", @@ -55717,7 +55717,7 @@ ] }, { - "key": "Swap", + "base": "Swap", "context": "{0D5E2C44-B2DE-57D6-B4B9-3F37C5D9B245}", "entry": { "name": "In", @@ -55748,7 +55748,7 @@ ] }, { - "key": "{F0D71473-2358-53A0-A1B3-16A564B9A0BD}", + "base": "{F0D71473-2358-53A0-A1B3-16A564B9A0BD}", "context": "OnDemandReflected", "variant": "", "details": { @@ -55758,7 +55758,7 @@ }, "methods": [ { - "key": "contains", + "base": "contains", "context": "{F0D71473-2358-53A0-A1B3-16A564B9A0BD}", "entry": { "name": "In", @@ -55795,7 +55795,7 @@ ] }, { - "key": "Insert", + "base": "Insert", "context": "{F0D71473-2358-53A0-A1B3-16A564B9A0BD}", "entry": { "name": "In", @@ -55838,7 +55838,7 @@ ] }, { - "key": "Reserve", + "base": "Reserve", "context": "{F0D71473-2358-53A0-A1B3-16A564B9A0BD}", "entry": { "name": "In", @@ -55867,7 +55867,7 @@ ] }, { - "key": "GetSize", + "base": "GetSize", "context": "{F0D71473-2358-53A0-A1B3-16A564B9A0BD}", "entry": { "name": "In", @@ -55898,7 +55898,7 @@ ] }, { - "key": "Iterate_VM", + "base": "Iterate_VM", "context": "{F0D71473-2358-53A0-A1B3-16A564B9A0BD}", "entry": { "name": "In", @@ -55929,7 +55929,7 @@ ] }, { - "key": "GetKeys", + "base": "GetKeys", "context": "{F0D71473-2358-53A0-A1B3-16A564B9A0BD}", "entry": { "name": "In", @@ -55960,7 +55960,7 @@ ] }, { - "key": "Size", + "base": "Size", "context": "{F0D71473-2358-53A0-A1B3-16A564B9A0BD}", "entry": { "name": "In", @@ -55991,7 +55991,7 @@ ] }, { - "key": "Erase", + "base": "Erase", "context": "{F0D71473-2358-53A0-A1B3-16A564B9A0BD}", "entry": { "name": "In", @@ -56028,7 +56028,7 @@ ] }, { - "key": "EraseCheck_VM", + "base": "EraseCheck_VM", "context": "{F0D71473-2358-53A0-A1B3-16A564B9A0BD}", "entry": { "name": "In", @@ -56065,7 +56065,7 @@ ] }, { - "key": "Clear", + "base": "Clear", "context": "{F0D71473-2358-53A0-A1B3-16A564B9A0BD}", "entry": { "name": "In", @@ -56096,7 +56096,7 @@ ] }, { - "key": "At", + "base": "At", "context": "{F0D71473-2358-53A0-A1B3-16A564B9A0BD}", "entry": { "name": "In", @@ -56133,7 +56133,7 @@ ] }, { - "key": "BucketCount", + "base": "BucketCount", "context": "{F0D71473-2358-53A0-A1B3-16A564B9A0BD}", "entry": { "name": "In", @@ -56164,7 +56164,7 @@ ] }, { - "key": "Empty", + "base": "Empty", "context": "{F0D71473-2358-53A0-A1B3-16A564B9A0BD}", "entry": { "name": "In", @@ -56195,7 +56195,7 @@ ] }, { - "key": "Swap", + "base": "Swap", "context": "{F0D71473-2358-53A0-A1B3-16A564B9A0BD}", "entry": { "name": "In", @@ -56226,7 +56226,7 @@ ] }, { - "key": "{84290CFC-1335-5341-AD8B-0A3FE9FE46D0}", + "base": "{84290CFC-1335-5341-AD8B-0A3FE9FE46D0}", "context": "OnDemandReflected", "variant": "", "details": { @@ -56234,7 +56234,7 @@ }, "methods": [ { - "key": "HasHandlerConnected", + "base": "HasHandlerConnected", "context": "{84290CFC-1335-5341-AD8B-0A3FE9FE46D0}", "entry": { "name": "In", @@ -56267,7 +56267,7 @@ ] }, { - "key": "{444B2C18-8D7E-5B43-9524-0C9F6C351542}", + "base": "{444B2C18-8D7E-5B43-9524-0C9F6C351542}", "context": "OnDemandReflected", "variant": "", "details": { @@ -56277,7 +56277,7 @@ }, "methods": [ { - "key": "get", + "base": "get", "context": "{444B2C18-8D7E-5B43-9524-0C9F6C351542}", "entry": { "name": "In", @@ -56310,7 +56310,7 @@ ] }, { - "key": "{56026B1A-B142-5C80-B6F4-A0827B393370}", + "base": "{56026B1A-B142-5C80-B6F4-A0827B393370}", "context": "OnDemandReflected", "variant": "", "details": { @@ -56320,7 +56320,7 @@ }, "methods": [ { - "key": "contains", + "base": "contains", "context": "{56026B1A-B142-5C80-B6F4-A0827B393370}", "entry": { "name": "In", @@ -56357,7 +56357,7 @@ ] }, { - "key": "Insert", + "base": "Insert", "context": "{56026B1A-B142-5C80-B6F4-A0827B393370}", "entry": { "name": "In", @@ -56400,7 +56400,7 @@ ] }, { - "key": "Reserve", + "base": "Reserve", "context": "{56026B1A-B142-5C80-B6F4-A0827B393370}", "entry": { "name": "In", @@ -56429,7 +56429,7 @@ ] }, { - "key": "GetSize", + "base": "GetSize", "context": "{56026B1A-B142-5C80-B6F4-A0827B393370}", "entry": { "name": "In", @@ -56460,7 +56460,7 @@ ] }, { - "key": "Iterate_VM", + "base": "Iterate_VM", "context": "{56026B1A-B142-5C80-B6F4-A0827B393370}", "entry": { "name": "In", @@ -56491,7 +56491,7 @@ ] }, { - "key": "GetKeys", + "base": "GetKeys", "context": "{56026B1A-B142-5C80-B6F4-A0827B393370}", "entry": { "name": "In", @@ -56522,7 +56522,7 @@ ] }, { - "key": "Size", + "base": "Size", "context": "{56026B1A-B142-5C80-B6F4-A0827B393370}", "entry": { "name": "In", @@ -56553,7 +56553,7 @@ ] }, { - "key": "Erase", + "base": "Erase", "context": "{56026B1A-B142-5C80-B6F4-A0827B393370}", "entry": { "name": "In", @@ -56590,7 +56590,7 @@ ] }, { - "key": "EraseCheck_VM", + "base": "EraseCheck_VM", "context": "{56026B1A-B142-5C80-B6F4-A0827B393370}", "entry": { "name": "In", @@ -56627,7 +56627,7 @@ ] }, { - "key": "Clear", + "base": "Clear", "context": "{56026B1A-B142-5C80-B6F4-A0827B393370}", "entry": { "name": "In", @@ -56658,7 +56658,7 @@ ] }, { - "key": "At", + "base": "At", "context": "{56026B1A-B142-5C80-B6F4-A0827B393370}", "entry": { "name": "In", @@ -56695,7 +56695,7 @@ ] }, { - "key": "BucketCount", + "base": "BucketCount", "context": "{56026B1A-B142-5C80-B6F4-A0827B393370}", "entry": { "name": "In", @@ -56726,7 +56726,7 @@ ] }, { - "key": "Empty", + "base": "Empty", "context": "{56026B1A-B142-5C80-B6F4-A0827B393370}", "entry": { "name": "In", @@ -56757,7 +56757,7 @@ ] }, { - "key": "Swap", + "base": "Swap", "context": "{56026B1A-B142-5C80-B6F4-A0827B393370}", "entry": { "name": "In", @@ -56788,7 +56788,7 @@ ] }, { - "key": "{B51CFD94-318D-5E30-BE18-6ACC6CFCC2EC}", + "base": "{B51CFD94-318D-5E30-BE18-6ACC6CFCC2EC}", "context": "OnDemandReflected", "variant": "", "details": { @@ -56798,7 +56798,7 @@ }, "methods": [ { - "key": "get", + "base": "get", "context": "{B51CFD94-318D-5E30-BE18-6ACC6CFCC2EC}", "entry": { "name": "In", @@ -56831,7 +56831,7 @@ ] }, { - "key": "{D2AE76E7-D7AC-58C9-82C3-EE5F0BDCFACD}", + "base": "{D2AE76E7-D7AC-58C9-82C3-EE5F0BDCFACD}", "context": "OnDemandReflected", "variant": "", "details": { @@ -56841,7 +56841,7 @@ }, "methods": [ { - "key": "Size", + "base": "Size", "context": "{D2AE76E7-D7AC-58C9-82C3-EE5F0BDCFACD}", "entry": { "name": "In", @@ -56872,7 +56872,7 @@ ] }, { - "key": "Front", + "base": "Front", "context": "{D2AE76E7-D7AC-58C9-82C3-EE5F0BDCFACD}", "entry": { "name": "In", @@ -56903,7 +56903,7 @@ ] }, { - "key": "HasKey", + "base": "HasKey", "context": "{D2AE76E7-D7AC-58C9-82C3-EE5F0BDCFACD}", "entry": { "name": "In", @@ -56940,7 +56940,7 @@ ] }, { - "key": "Resize", + "base": "Resize", "context": "{D2AE76E7-D7AC-58C9-82C3-EE5F0BDCFACD}", "entry": { "name": "In", @@ -56969,7 +56969,7 @@ ] }, { - "key": "at", + "base": "at", "context": "{D2AE76E7-D7AC-58C9-82C3-EE5F0BDCFACD}", "entry": { "name": "In", @@ -57006,7 +57006,7 @@ ] }, { - "key": "Back", + "base": "Back", "context": "{D2AE76E7-D7AC-58C9-82C3-EE5F0BDCFACD}", "entry": { "name": "In", @@ -57037,7 +57037,7 @@ ] }, { - "key": "pop_back", + "base": "pop_back", "context": "{D2AE76E7-D7AC-58C9-82C3-EE5F0BDCFACD}", "entry": { "name": "In", @@ -57060,7 +57060,7 @@ ] }, { - "key": "size", + "base": "size", "context": "{D2AE76E7-D7AC-58C9-82C3-EE5F0BDCFACD}", "entry": { "name": "In", @@ -57091,7 +57091,7 @@ ] }, { - "key": "At", + "base": "At", "context": "{D2AE76E7-D7AC-58C9-82C3-EE5F0BDCFACD}", "entry": { "name": "In", @@ -57128,7 +57128,7 @@ ] }, { - "key": "Empty", + "base": "Empty", "context": "{D2AE76E7-D7AC-58C9-82C3-EE5F0BDCFACD}", "entry": { "name": "In", @@ -57159,7 +57159,7 @@ ] }, { - "key": "Swap", + "base": "Swap", "context": "{D2AE76E7-D7AC-58C9-82C3-EE5F0BDCFACD}", "entry": { "name": "In", @@ -57188,7 +57188,7 @@ ] }, { - "key": "push_back", + "base": "push_back", "context": "{D2AE76E7-D7AC-58C9-82C3-EE5F0BDCFACD}", "entry": { "name": "In", @@ -57217,7 +57217,7 @@ ] }, { - "key": "PushBack_VM", + "base": "PushBack_VM", "context": "{D2AE76E7-D7AC-58C9-82C3-EE5F0BDCFACD}", "entry": { "name": "In", @@ -57254,7 +57254,7 @@ ] }, { - "key": "AtUnchecked", + "base": "AtUnchecked", "context": "{D2AE76E7-D7AC-58C9-82C3-EE5F0BDCFACD}", "entry": { "name": "In", @@ -57291,7 +57291,7 @@ ] }, { - "key": "clear", + "base": "clear", "context": "{D2AE76E7-D7AC-58C9-82C3-EE5F0BDCFACD}", "entry": { "name": "In", @@ -57314,7 +57314,7 @@ ] }, { - "key": "NotEmpty", + "base": "NotEmpty", "context": "{D2AE76E7-D7AC-58C9-82C3-EE5F0BDCFACD}", "entry": { "name": "In", @@ -57345,7 +57345,7 @@ ] }, { - "key": "Erase_VM", + "base": "Erase_VM", "context": "{D2AE76E7-D7AC-58C9-82C3-EE5F0BDCFACD}", "entry": { "name": "In", @@ -57382,7 +57382,7 @@ ] }, { - "key": "EraseCheck_VM", + "base": "EraseCheck_VM", "context": "{D2AE76E7-D7AC-58C9-82C3-EE5F0BDCFACD}", "entry": { "name": "In", @@ -57419,7 +57419,7 @@ ] }, { - "key": "Capacity", + "base": "Capacity", "context": "{D2AE76E7-D7AC-58C9-82C3-EE5F0BDCFACD}", "entry": { "name": "In", @@ -57450,7 +57450,7 @@ ] }, { - "key": "Clear", + "base": "Clear", "context": "{D2AE76E7-D7AC-58C9-82C3-EE5F0BDCFACD}", "entry": { "name": "In", @@ -57481,7 +57481,7 @@ ] }, { - "key": "AssignAt", + "base": "AssignAt", "context": "{D2AE76E7-D7AC-58C9-82C3-EE5F0BDCFACD}", "entry": { "name": "In", @@ -57516,7 +57516,7 @@ ] }, { - "key": "GetSize", + "base": "GetSize", "context": "{D2AE76E7-D7AC-58C9-82C3-EE5F0BDCFACD}", "entry": { "name": "In", @@ -57547,7 +57547,7 @@ ] }, { - "key": "Insert", + "base": "Insert", "context": "{D2AE76E7-D7AC-58C9-82C3-EE5F0BDCFACD}", "entry": { "name": "In", @@ -57590,7 +57590,7 @@ ] }, { - "key": "PushBack", + "base": "PushBack", "context": "{D2AE76E7-D7AC-58C9-82C3-EE5F0BDCFACD}", "entry": { "name": "In", @@ -57619,7 +57619,7 @@ ] }, { - "key": "Reserve", + "base": "Reserve", "context": "{D2AE76E7-D7AC-58C9-82C3-EE5F0BDCFACD}", "entry": { "name": "In", @@ -57648,7 +57648,7 @@ ] }, { - "key": "Iterate_VM", + "base": "Iterate_VM", "context": "{D2AE76E7-D7AC-58C9-82C3-EE5F0BDCFACD}", "entry": { "name": "In", @@ -57681,7 +57681,7 @@ ] }, { - "key": "{9F35DB06-62AD-55E0-9CDD-DF452612430C}", + "base": "{9F35DB06-62AD-55E0-9CDD-DF452612430C}", "context": "OnDemandReflected", "variant": "", "details": { @@ -57691,7 +57691,7 @@ }, "methods": [ { - "key": "contains", + "base": "contains", "context": "{9F35DB06-62AD-55E0-9CDD-DF452612430C}", "entry": { "name": "In", @@ -57728,7 +57728,7 @@ ] }, { - "key": "Insert", + "base": "Insert", "context": "{9F35DB06-62AD-55E0-9CDD-DF452612430C}", "entry": { "name": "In", @@ -57771,7 +57771,7 @@ ] }, { - "key": "Reserve", + "base": "Reserve", "context": "{9F35DB06-62AD-55E0-9CDD-DF452612430C}", "entry": { "name": "In", @@ -57800,7 +57800,7 @@ ] }, { - "key": "GetSize", + "base": "GetSize", "context": "{9F35DB06-62AD-55E0-9CDD-DF452612430C}", "entry": { "name": "In", @@ -57831,7 +57831,7 @@ ] }, { - "key": "Iterate_VM", + "base": "Iterate_VM", "context": "{9F35DB06-62AD-55E0-9CDD-DF452612430C}", "entry": { "name": "In", @@ -57862,7 +57862,7 @@ ] }, { - "key": "GetKeys", + "base": "GetKeys", "context": "{9F35DB06-62AD-55E0-9CDD-DF452612430C}", "entry": { "name": "In", @@ -57893,7 +57893,7 @@ ] }, { - "key": "Size", + "base": "Size", "context": "{9F35DB06-62AD-55E0-9CDD-DF452612430C}", "entry": { "name": "In", @@ -57924,7 +57924,7 @@ ] }, { - "key": "Erase", + "base": "Erase", "context": "{9F35DB06-62AD-55E0-9CDD-DF452612430C}", "entry": { "name": "In", @@ -57961,7 +57961,7 @@ ] }, { - "key": "EraseCheck_VM", + "base": "EraseCheck_VM", "context": "{9F35DB06-62AD-55E0-9CDD-DF452612430C}", "entry": { "name": "In", @@ -57998,7 +57998,7 @@ ] }, { - "key": "Clear", + "base": "Clear", "context": "{9F35DB06-62AD-55E0-9CDD-DF452612430C}", "entry": { "name": "In", @@ -58029,7 +58029,7 @@ ] }, { - "key": "At", + "base": "At", "context": "{9F35DB06-62AD-55E0-9CDD-DF452612430C}", "entry": { "name": "In", @@ -58066,7 +58066,7 @@ ] }, { - "key": "BucketCount", + "base": "BucketCount", "context": "{9F35DB06-62AD-55E0-9CDD-DF452612430C}", "entry": { "name": "In", @@ -58097,7 +58097,7 @@ ] }, { - "key": "Empty", + "base": "Empty", "context": "{9F35DB06-62AD-55E0-9CDD-DF452612430C}", "entry": { "name": "In", @@ -58128,7 +58128,7 @@ ] }, { - "key": "Swap", + "base": "Swap", "context": "{9F35DB06-62AD-55E0-9CDD-DF452612430C}", "entry": { "name": "In", @@ -58159,7 +58159,7 @@ ] }, { - "key": "{E9F4752C-BFCD-5F51-AA18-F47BDF358BFD}", + "base": "{E9F4752C-BFCD-5F51-AA18-F47BDF358BFD}", "context": "OnDemandReflected", "variant": "", "details": { @@ -58167,7 +58167,7 @@ }, "methods": [ { - "key": "GetError", + "base": "GetError", "context": "{E9F4752C-BFCD-5F51-AA18-F47BDF358BFD}", "entry": { "name": "In", @@ -58198,7 +58198,7 @@ ] }, { - "key": "IsSuccess", + "base": "IsSuccess", "context": "{E9F4752C-BFCD-5F51-AA18-F47BDF358BFD}", "entry": { "name": "In", @@ -58229,7 +58229,7 @@ ] }, { - "key": "Success", + "base": "Success", "context": "{E9F4752C-BFCD-5F51-AA18-F47BDF358BFD}", "entry": { "name": "In", @@ -58260,7 +58260,7 @@ ] }, { - "key": "GetValue", + "base": "GetValue", "context": "{E9F4752C-BFCD-5F51-AA18-F47BDF358BFD}", "entry": { "name": "In", @@ -58291,7 +58291,7 @@ ] }, { - "key": "Failure", + "base": "Failure", "context": "{E9F4752C-BFCD-5F51-AA18-F47BDF358BFD}", "entry": { "name": "In", @@ -58324,7 +58324,7 @@ ] }, { - "key": "{4599647A-45DD-585B-AFC0-4BAD29EB49A7}", + "base": "{4599647A-45DD-585B-AFC0-4BAD29EB49A7}", "context": "OnDemandReflected", "variant": "", "details": { @@ -58334,7 +58334,7 @@ }, "methods": [ { - "key": "Size", + "base": "Size", "context": "{4599647A-45DD-585B-AFC0-4BAD29EB49A7}", "entry": { "name": "In", @@ -58365,7 +58365,7 @@ ] }, { - "key": "Front", + "base": "Front", "context": "{4599647A-45DD-585B-AFC0-4BAD29EB49A7}", "entry": { "name": "In", @@ -58396,7 +58396,7 @@ ] }, { - "key": "HasKey", + "base": "HasKey", "context": "{4599647A-45DD-585B-AFC0-4BAD29EB49A7}", "entry": { "name": "In", @@ -58433,7 +58433,7 @@ ] }, { - "key": "Resize", + "base": "Resize", "context": "{4599647A-45DD-585B-AFC0-4BAD29EB49A7}", "entry": { "name": "In", @@ -58462,7 +58462,7 @@ ] }, { - "key": "at", + "base": "at", "context": "{4599647A-45DD-585B-AFC0-4BAD29EB49A7}", "entry": { "name": "In", @@ -58499,7 +58499,7 @@ ] }, { - "key": "Back", + "base": "Back", "context": "{4599647A-45DD-585B-AFC0-4BAD29EB49A7}", "entry": { "name": "In", @@ -58530,7 +58530,7 @@ ] }, { - "key": "pop_back", + "base": "pop_back", "context": "{4599647A-45DD-585B-AFC0-4BAD29EB49A7}", "entry": { "name": "In", @@ -58553,7 +58553,7 @@ ] }, { - "key": "size", + "base": "size", "context": "{4599647A-45DD-585B-AFC0-4BAD29EB49A7}", "entry": { "name": "In", @@ -58584,7 +58584,7 @@ ] }, { - "key": "At", + "base": "At", "context": "{4599647A-45DD-585B-AFC0-4BAD29EB49A7}", "entry": { "name": "In", @@ -58621,7 +58621,7 @@ ] }, { - "key": "Empty", + "base": "Empty", "context": "{4599647A-45DD-585B-AFC0-4BAD29EB49A7}", "entry": { "name": "In", @@ -58652,7 +58652,7 @@ ] }, { - "key": "Swap", + "base": "Swap", "context": "{4599647A-45DD-585B-AFC0-4BAD29EB49A7}", "entry": { "name": "In", @@ -58681,7 +58681,7 @@ ] }, { - "key": "push_back", + "base": "push_back", "context": "{4599647A-45DD-585B-AFC0-4BAD29EB49A7}", "entry": { "name": "In", @@ -58710,7 +58710,7 @@ ] }, { - "key": "PushBack_VM", + "base": "PushBack_VM", "context": "{4599647A-45DD-585B-AFC0-4BAD29EB49A7}", "entry": { "name": "In", @@ -58747,7 +58747,7 @@ ] }, { - "key": "AtUnchecked", + "base": "AtUnchecked", "context": "{4599647A-45DD-585B-AFC0-4BAD29EB49A7}", "entry": { "name": "In", @@ -58784,7 +58784,7 @@ ] }, { - "key": "clear", + "base": "clear", "context": "{4599647A-45DD-585B-AFC0-4BAD29EB49A7}", "entry": { "name": "In", @@ -58807,7 +58807,7 @@ ] }, { - "key": "NotEmpty", + "base": "NotEmpty", "context": "{4599647A-45DD-585B-AFC0-4BAD29EB49A7}", "entry": { "name": "In", @@ -58838,7 +58838,7 @@ ] }, { - "key": "Erase_VM", + "base": "Erase_VM", "context": "{4599647A-45DD-585B-AFC0-4BAD29EB49A7}", "entry": { "name": "In", @@ -58875,7 +58875,7 @@ ] }, { - "key": "EraseCheck_VM", + "base": "EraseCheck_VM", "context": "{4599647A-45DD-585B-AFC0-4BAD29EB49A7}", "entry": { "name": "In", @@ -58912,7 +58912,7 @@ ] }, { - "key": "Capacity", + "base": "Capacity", "context": "{4599647A-45DD-585B-AFC0-4BAD29EB49A7}", "entry": { "name": "In", @@ -58943,7 +58943,7 @@ ] }, { - "key": "Clear", + "base": "Clear", "context": "{4599647A-45DD-585B-AFC0-4BAD29EB49A7}", "entry": { "name": "In", @@ -58974,7 +58974,7 @@ ] }, { - "key": "AssignAt", + "base": "AssignAt", "context": "{4599647A-45DD-585B-AFC0-4BAD29EB49A7}", "entry": { "name": "In", @@ -59009,7 +59009,7 @@ ] }, { - "key": "GetSize", + "base": "GetSize", "context": "{4599647A-45DD-585B-AFC0-4BAD29EB49A7}", "entry": { "name": "In", @@ -59040,7 +59040,7 @@ ] }, { - "key": "Insert", + "base": "Insert", "context": "{4599647A-45DD-585B-AFC0-4BAD29EB49A7}", "entry": { "name": "In", @@ -59083,7 +59083,7 @@ ] }, { - "key": "PushBack", + "base": "PushBack", "context": "{4599647A-45DD-585B-AFC0-4BAD29EB49A7}", "entry": { "name": "In", @@ -59112,7 +59112,7 @@ ] }, { - "key": "Reserve", + "base": "Reserve", "context": "{4599647A-45DD-585B-AFC0-4BAD29EB49A7}", "entry": { "name": "In", @@ -59141,7 +59141,7 @@ ] }, { - "key": "Iterate_VM", + "base": "Iterate_VM", "context": "{4599647A-45DD-585B-AFC0-4BAD29EB49A7}", "entry": { "name": "In", @@ -59174,7 +59174,7 @@ ] }, { - "key": "{4039D1BB-DA00-5C6B-AC80-6B892003D35F}", + "base": "{4039D1BB-DA00-5C6B-AC80-6B892003D35F}", "context": "OnDemandReflected", "variant": "", "details": { @@ -59184,7 +59184,7 @@ }, "methods": [ { - "key": "contains", + "base": "contains", "context": "{4039D1BB-DA00-5C6B-AC80-6B892003D35F}", "entry": { "name": "In", @@ -59221,7 +59221,7 @@ ] }, { - "key": "Insert", + "base": "Insert", "context": "{4039D1BB-DA00-5C6B-AC80-6B892003D35F}", "entry": { "name": "In", @@ -59264,7 +59264,7 @@ ] }, { - "key": "Reserve", + "base": "Reserve", "context": "{4039D1BB-DA00-5C6B-AC80-6B892003D35F}", "entry": { "name": "In", @@ -59293,7 +59293,7 @@ ] }, { - "key": "GetSize", + "base": "GetSize", "context": "{4039D1BB-DA00-5C6B-AC80-6B892003D35F}", "entry": { "name": "In", @@ -59324,7 +59324,7 @@ ] }, { - "key": "Iterate_VM", + "base": "Iterate_VM", "context": "{4039D1BB-DA00-5C6B-AC80-6B892003D35F}", "entry": { "name": "In", @@ -59355,7 +59355,7 @@ ] }, { - "key": "GetKeys", + "base": "GetKeys", "context": "{4039D1BB-DA00-5C6B-AC80-6B892003D35F}", "entry": { "name": "In", @@ -59386,7 +59386,7 @@ ] }, { - "key": "Size", + "base": "Size", "context": "{4039D1BB-DA00-5C6B-AC80-6B892003D35F}", "entry": { "name": "In", @@ -59417,7 +59417,7 @@ ] }, { - "key": "Erase", + "base": "Erase", "context": "{4039D1BB-DA00-5C6B-AC80-6B892003D35F}", "entry": { "name": "In", @@ -59454,7 +59454,7 @@ ] }, { - "key": "EraseCheck_VM", + "base": "EraseCheck_VM", "context": "{4039D1BB-DA00-5C6B-AC80-6B892003D35F}", "entry": { "name": "In", @@ -59491,7 +59491,7 @@ ] }, { - "key": "Clear", + "base": "Clear", "context": "{4039D1BB-DA00-5C6B-AC80-6B892003D35F}", "entry": { "name": "In", @@ -59522,7 +59522,7 @@ ] }, { - "key": "At", + "base": "At", "context": "{4039D1BB-DA00-5C6B-AC80-6B892003D35F}", "entry": { "name": "In", @@ -59559,7 +59559,7 @@ ] }, { - "key": "BucketCount", + "base": "BucketCount", "context": "{4039D1BB-DA00-5C6B-AC80-6B892003D35F}", "entry": { "name": "In", @@ -59590,7 +59590,7 @@ ] }, { - "key": "Empty", + "base": "Empty", "context": "{4039D1BB-DA00-5C6B-AC80-6B892003D35F}", "entry": { "name": "In", @@ -59621,7 +59621,7 @@ ] }, { - "key": "Swap", + "base": "Swap", "context": "{4039D1BB-DA00-5C6B-AC80-6B892003D35F}", "entry": { "name": "In", @@ -59652,7 +59652,7 @@ ] }, { - "key": "{033C4408-7E4A-5382-81D8-102FC8336005}", + "base": "{033C4408-7E4A-5382-81D8-102FC8336005}", "context": "OnDemandReflected", "variant": "", "details": { @@ -59662,7 +59662,7 @@ }, "methods": [ { - "key": "contains", + "base": "contains", "context": "{033C4408-7E4A-5382-81D8-102FC8336005}", "entry": { "name": "In", @@ -59700,7 +59700,7 @@ ] }, { - "key": "Insert", + "base": "Insert", "context": "{033C4408-7E4A-5382-81D8-102FC8336005}", "entry": { "name": "In", @@ -59744,7 +59744,7 @@ ] }, { - "key": "Reserve", + "base": "Reserve", "context": "{033C4408-7E4A-5382-81D8-102FC8336005}", "entry": { "name": "In", @@ -59773,7 +59773,7 @@ ] }, { - "key": "GetSize", + "base": "GetSize", "context": "{033C4408-7E4A-5382-81D8-102FC8336005}", "entry": { "name": "In", @@ -59804,7 +59804,7 @@ ] }, { - "key": "Iterate_VM", + "base": "Iterate_VM", "context": "{033C4408-7E4A-5382-81D8-102FC8336005}", "entry": { "name": "In", @@ -59835,7 +59835,7 @@ ] }, { - "key": "GetKeys", + "base": "GetKeys", "context": "{033C4408-7E4A-5382-81D8-102FC8336005}", "entry": { "name": "In", @@ -59866,7 +59866,7 @@ ] }, { - "key": "Size", + "base": "Size", "context": "{033C4408-7E4A-5382-81D8-102FC8336005}", "entry": { "name": "In", @@ -59897,7 +59897,7 @@ ] }, { - "key": "Erase", + "base": "Erase", "context": "{033C4408-7E4A-5382-81D8-102FC8336005}", "entry": { "name": "In", @@ -59935,7 +59935,7 @@ ] }, { - "key": "EraseCheck_VM", + "base": "EraseCheck_VM", "context": "{033C4408-7E4A-5382-81D8-102FC8336005}", "entry": { "name": "In", @@ -59973,7 +59973,7 @@ ] }, { - "key": "Clear", + "base": "Clear", "context": "{033C4408-7E4A-5382-81D8-102FC8336005}", "entry": { "name": "In", @@ -60004,7 +60004,7 @@ ] }, { - "key": "At", + "base": "At", "context": "{033C4408-7E4A-5382-81D8-102FC8336005}", "entry": { "name": "In", @@ -60042,7 +60042,7 @@ ] }, { - "key": "BucketCount", + "base": "BucketCount", "context": "{033C4408-7E4A-5382-81D8-102FC8336005}", "entry": { "name": "In", @@ -60073,7 +60073,7 @@ ] }, { - "key": "Empty", + "base": "Empty", "context": "{033C4408-7E4A-5382-81D8-102FC8336005}", "entry": { "name": "In", @@ -60104,7 +60104,7 @@ ] }, { - "key": "Swap", + "base": "Swap", "context": "{033C4408-7E4A-5382-81D8-102FC8336005}", "entry": { "name": "In", @@ -60135,7 +60135,7 @@ ] }, { - "key": "{3750867E-BD2D-52A2-B93B-51032E86C4D4}", + "base": "{3750867E-BD2D-52A2-B93B-51032E86C4D4}", "context": "OnDemandReflected", "variant": "", "details": { @@ -60143,7 +60143,7 @@ }, "methods": [ { - "key": "GetSize", + "base": "GetSize", "context": "{3750867E-BD2D-52A2-B93B-51032E86C4D4}", "entry": { "name": "In", @@ -60166,7 +60166,7 @@ ] }, { - "key": "Get3", + "base": "Get3", "context": "{3750867E-BD2D-52A2-B93B-51032E86C4D4}", "entry": { "name": "In", @@ -60197,7 +60197,7 @@ ] }, { - "key": "Get2", + "base": "Get2", "context": "{3750867E-BD2D-52A2-B93B-51032E86C4D4}", "entry": { "name": "In", @@ -60228,7 +60228,7 @@ ] }, { - "key": "Get1", + "base": "Get1", "context": "{3750867E-BD2D-52A2-B93B-51032E86C4D4}", "entry": { "name": "In", @@ -60259,7 +60259,7 @@ ] }, { - "key": "Get0", + "base": "Get0", "context": "{3750867E-BD2D-52A2-B93B-51032E86C4D4}", "entry": { "name": "In", @@ -60292,7 +60292,7 @@ ] }, { - "key": "{C9789111-6A18-4C6E-81A7-87D057D59D2C}", + "base": "{C9789111-6A18-4C6E-81A7-87D057D59D2C}", "context": "OnDemandReflected", "variant": "", "details": { @@ -60300,7 +60300,7 @@ }, "methods": [ { - "key": "ToString", + "base": "ToString", "context": "{C9789111-6A18-4C6E-81A7-87D057D59D2C}", "entry": { "name": "In", @@ -60332,7 +60332,7 @@ ] }, { - "key": "IsValid", + "base": "IsValid", "context": "{C9789111-6A18-4C6E-81A7-87D057D59D2C}", "entry": { "name": "In", @@ -60364,7 +60364,7 @@ ] }, { - "key": "GetEntityForward", + "base": "GetEntityForward", "context": "{C9789111-6A18-4C6E-81A7-87D057D59D2C}", "entry": { "name": "In", @@ -60402,7 +60402,7 @@ ] }, { - "key": "IsActive", + "base": "IsActive", "context": "{C9789111-6A18-4C6E-81A7-87D057D59D2C}", "entry": { "name": "In", @@ -60434,7 +60434,7 @@ ] }, { - "key": "GetEntityRight", + "base": "GetEntityRight", "context": "{C9789111-6A18-4C6E-81A7-87D057D59D2C}", "entry": { "name": "In", @@ -60472,7 +60472,7 @@ ] }, { - "key": "GetEntityUp", + "base": "GetEntityUp", "context": "{C9789111-6A18-4C6E-81A7-87D057D59D2C}", "entry": { "name": "In", @@ -60512,7 +60512,7 @@ ] }, { - "key": "{CC6E9A58-8CB0-540D-A06D-4337A8C4FE91}", + "base": "{CC6E9A58-8CB0-540D-A06D-4337A8C4FE91}", "context": "OnDemandReflected", "variant": "", "details": { @@ -60522,7 +60522,7 @@ }, "methods": [ { - "key": "contains", + "base": "contains", "context": "{CC6E9A58-8CB0-540D-A06D-4337A8C4FE91}", "entry": { "name": "In", @@ -60559,7 +60559,7 @@ ] }, { - "key": "Insert", + "base": "Insert", "context": "{CC6E9A58-8CB0-540D-A06D-4337A8C4FE91}", "entry": { "name": "In", @@ -60602,7 +60602,7 @@ ] }, { - "key": "Reserve", + "base": "Reserve", "context": "{CC6E9A58-8CB0-540D-A06D-4337A8C4FE91}", "entry": { "name": "In", @@ -60631,7 +60631,7 @@ ] }, { - "key": "GetSize", + "base": "GetSize", "context": "{CC6E9A58-8CB0-540D-A06D-4337A8C4FE91}", "entry": { "name": "In", @@ -60662,7 +60662,7 @@ ] }, { - "key": "Iterate_VM", + "base": "Iterate_VM", "context": "{CC6E9A58-8CB0-540D-A06D-4337A8C4FE91}", "entry": { "name": "In", @@ -60693,7 +60693,7 @@ ] }, { - "key": "GetKeys", + "base": "GetKeys", "context": "{CC6E9A58-8CB0-540D-A06D-4337A8C4FE91}", "entry": { "name": "In", @@ -60724,7 +60724,7 @@ ] }, { - "key": "Size", + "base": "Size", "context": "{CC6E9A58-8CB0-540D-A06D-4337A8C4FE91}", "entry": { "name": "In", @@ -60755,7 +60755,7 @@ ] }, { - "key": "Erase", + "base": "Erase", "context": "{CC6E9A58-8CB0-540D-A06D-4337A8C4FE91}", "entry": { "name": "In", @@ -60792,7 +60792,7 @@ ] }, { - "key": "EraseCheck_VM", + "base": "EraseCheck_VM", "context": "{CC6E9A58-8CB0-540D-A06D-4337A8C4FE91}", "entry": { "name": "In", @@ -60829,7 +60829,7 @@ ] }, { - "key": "Clear", + "base": "Clear", "context": "{CC6E9A58-8CB0-540D-A06D-4337A8C4FE91}", "entry": { "name": "In", @@ -60860,7 +60860,7 @@ ] }, { - "key": "At", + "base": "At", "context": "{CC6E9A58-8CB0-540D-A06D-4337A8C4FE91}", "entry": { "name": "In", @@ -60897,7 +60897,7 @@ ] }, { - "key": "BucketCount", + "base": "BucketCount", "context": "{CC6E9A58-8CB0-540D-A06D-4337A8C4FE91}", "entry": { "name": "In", @@ -60928,7 +60928,7 @@ ] }, { - "key": "Empty", + "base": "Empty", "context": "{CC6E9A58-8CB0-540D-A06D-4337A8C4FE91}", "entry": { "name": "In", @@ -60959,7 +60959,7 @@ ] }, { - "key": "Swap", + "base": "Swap", "context": "{CC6E9A58-8CB0-540D-A06D-4337A8C4FE91}", "entry": { "name": "In", @@ -60990,7 +60990,7 @@ ] }, { - "key": "{3E047B85-9AA0-5540-9744-373DBD4AD4CA}", + "base": "{3E047B85-9AA0-5540-9744-373DBD4AD4CA}", "context": "OnDemandReflected", "variant": "", "details": { @@ -61000,7 +61000,7 @@ }, "methods": [ { - "key": "contains", + "base": "contains", "context": "{3E047B85-9AA0-5540-9744-373DBD4AD4CA}", "entry": { "name": "In", @@ -61037,7 +61037,7 @@ ] }, { - "key": "Insert", + "base": "Insert", "context": "{3E047B85-9AA0-5540-9744-373DBD4AD4CA}", "entry": { "name": "In", @@ -61080,7 +61080,7 @@ ] }, { - "key": "Reserve", + "base": "Reserve", "context": "{3E047B85-9AA0-5540-9744-373DBD4AD4CA}", "entry": { "name": "In", @@ -61109,7 +61109,7 @@ ] }, { - "key": "GetSize", + "base": "GetSize", "context": "{3E047B85-9AA0-5540-9744-373DBD4AD4CA}", "entry": { "name": "In", @@ -61140,7 +61140,7 @@ ] }, { - "key": "Iterate_VM", + "base": "Iterate_VM", "context": "{3E047B85-9AA0-5540-9744-373DBD4AD4CA}", "entry": { "name": "In", @@ -61171,7 +61171,7 @@ ] }, { - "key": "GetKeys", + "base": "GetKeys", "context": "{3E047B85-9AA0-5540-9744-373DBD4AD4CA}", "entry": { "name": "In", @@ -61202,7 +61202,7 @@ ] }, { - "key": "Size", + "base": "Size", "context": "{3E047B85-9AA0-5540-9744-373DBD4AD4CA}", "entry": { "name": "In", @@ -61233,7 +61233,7 @@ ] }, { - "key": "Erase", + "base": "Erase", "context": "{3E047B85-9AA0-5540-9744-373DBD4AD4CA}", "entry": { "name": "In", @@ -61270,7 +61270,7 @@ ] }, { - "key": "EraseCheck_VM", + "base": "EraseCheck_VM", "context": "{3E047B85-9AA0-5540-9744-373DBD4AD4CA}", "entry": { "name": "In", @@ -61307,7 +61307,7 @@ ] }, { - "key": "Clear", + "base": "Clear", "context": "{3E047B85-9AA0-5540-9744-373DBD4AD4CA}", "entry": { "name": "In", @@ -61338,7 +61338,7 @@ ] }, { - "key": "At", + "base": "At", "context": "{3E047B85-9AA0-5540-9744-373DBD4AD4CA}", "entry": { "name": "In", @@ -61375,7 +61375,7 @@ ] }, { - "key": "BucketCount", + "base": "BucketCount", "context": "{3E047B85-9AA0-5540-9744-373DBD4AD4CA}", "entry": { "name": "In", @@ -61406,7 +61406,7 @@ ] }, { - "key": "Empty", + "base": "Empty", "context": "{3E047B85-9AA0-5540-9744-373DBD4AD4CA}", "entry": { "name": "In", @@ -61437,7 +61437,7 @@ ] }, { - "key": "Swap", + "base": "Swap", "context": "{3E047B85-9AA0-5540-9744-373DBD4AD4CA}", "entry": { "name": "In", @@ -61468,7 +61468,7 @@ ] }, { - "key": "{A2ED5341-A86D-5564-99AF-8BCDED62C751}", + "base": "{A2ED5341-A86D-5564-99AF-8BCDED62C751}", "context": "OnDemandReflected", "variant": "", "details": { @@ -61478,7 +61478,7 @@ }, "methods": [ { - "key": "contains", + "base": "contains", "context": "{A2ED5341-A86D-5564-99AF-8BCDED62C751}", "entry": { "name": "In", @@ -61515,7 +61515,7 @@ ] }, { - "key": "Insert", + "base": "Insert", "context": "{A2ED5341-A86D-5564-99AF-8BCDED62C751}", "entry": { "name": "In", @@ -61558,7 +61558,7 @@ ] }, { - "key": "Reserve", + "base": "Reserve", "context": "{A2ED5341-A86D-5564-99AF-8BCDED62C751}", "entry": { "name": "In", @@ -61587,7 +61587,7 @@ ] }, { - "key": "GetSize", + "base": "GetSize", "context": "{A2ED5341-A86D-5564-99AF-8BCDED62C751}", "entry": { "name": "In", @@ -61618,7 +61618,7 @@ ] }, { - "key": "Iterate_VM", + "base": "Iterate_VM", "context": "{A2ED5341-A86D-5564-99AF-8BCDED62C751}", "entry": { "name": "In", @@ -61649,7 +61649,7 @@ ] }, { - "key": "GetKeys", + "base": "GetKeys", "context": "{A2ED5341-A86D-5564-99AF-8BCDED62C751}", "entry": { "name": "In", @@ -61680,7 +61680,7 @@ ] }, { - "key": "Size", + "base": "Size", "context": "{A2ED5341-A86D-5564-99AF-8BCDED62C751}", "entry": { "name": "In", @@ -61711,7 +61711,7 @@ ] }, { - "key": "Erase", + "base": "Erase", "context": "{A2ED5341-A86D-5564-99AF-8BCDED62C751}", "entry": { "name": "In", @@ -61748,7 +61748,7 @@ ] }, { - "key": "EraseCheck_VM", + "base": "EraseCheck_VM", "context": "{A2ED5341-A86D-5564-99AF-8BCDED62C751}", "entry": { "name": "In", @@ -61785,7 +61785,7 @@ ] }, { - "key": "Clear", + "base": "Clear", "context": "{A2ED5341-A86D-5564-99AF-8BCDED62C751}", "entry": { "name": "In", @@ -61816,7 +61816,7 @@ ] }, { - "key": "At", + "base": "At", "context": "{A2ED5341-A86D-5564-99AF-8BCDED62C751}", "entry": { "name": "In", @@ -61853,7 +61853,7 @@ ] }, { - "key": "BucketCount", + "base": "BucketCount", "context": "{A2ED5341-A86D-5564-99AF-8BCDED62C751}", "entry": { "name": "In", @@ -61884,7 +61884,7 @@ ] }, { - "key": "Empty", + "base": "Empty", "context": "{A2ED5341-A86D-5564-99AF-8BCDED62C751}", "entry": { "name": "In", @@ -61915,7 +61915,7 @@ ] }, { - "key": "Swap", + "base": "Swap", "context": "{A2ED5341-A86D-5564-99AF-8BCDED62C751}", "entry": { "name": "In", @@ -61946,7 +61946,7 @@ ] }, { - "key": "{EB781DCB-CD92-51EF-B490-3628FE48E880}", + "base": "{EB781DCB-CD92-51EF-B490-3628FE48E880}", "context": "OnDemandReflected", "variant": "", "details": { @@ -61956,7 +61956,7 @@ }, "methods": [ { - "key": "contains", + "base": "contains", "context": "{EB781DCB-CD92-51EF-B490-3628FE48E880}", "entry": { "name": "In", @@ -61993,7 +61993,7 @@ ] }, { - "key": "Insert", + "base": "Insert", "context": "{EB781DCB-CD92-51EF-B490-3628FE48E880}", "entry": { "name": "In", @@ -62036,7 +62036,7 @@ ] }, { - "key": "Reserve", + "base": "Reserve", "context": "{EB781DCB-CD92-51EF-B490-3628FE48E880}", "entry": { "name": "In", @@ -62065,7 +62065,7 @@ ] }, { - "key": "GetSize", + "base": "GetSize", "context": "{EB781DCB-CD92-51EF-B490-3628FE48E880}", "entry": { "name": "In", @@ -62096,7 +62096,7 @@ ] }, { - "key": "Iterate_VM", + "base": "Iterate_VM", "context": "{EB781DCB-CD92-51EF-B490-3628FE48E880}", "entry": { "name": "In", @@ -62127,7 +62127,7 @@ ] }, { - "key": "GetKeys", + "base": "GetKeys", "context": "{EB781DCB-CD92-51EF-B490-3628FE48E880}", "entry": { "name": "In", @@ -62158,7 +62158,7 @@ ] }, { - "key": "Size", + "base": "Size", "context": "{EB781DCB-CD92-51EF-B490-3628FE48E880}", "entry": { "name": "In", @@ -62189,7 +62189,7 @@ ] }, { - "key": "Erase", + "base": "Erase", "context": "{EB781DCB-CD92-51EF-B490-3628FE48E880}", "entry": { "name": "In", @@ -62226,7 +62226,7 @@ ] }, { - "key": "EraseCheck_VM", + "base": "EraseCheck_VM", "context": "{EB781DCB-CD92-51EF-B490-3628FE48E880}", "entry": { "name": "In", @@ -62263,7 +62263,7 @@ ] }, { - "key": "Clear", + "base": "Clear", "context": "{EB781DCB-CD92-51EF-B490-3628FE48E880}", "entry": { "name": "In", @@ -62294,7 +62294,7 @@ ] }, { - "key": "At", + "base": "At", "context": "{EB781DCB-CD92-51EF-B490-3628FE48E880}", "entry": { "name": "In", @@ -62331,7 +62331,7 @@ ] }, { - "key": "BucketCount", + "base": "BucketCount", "context": "{EB781DCB-CD92-51EF-B490-3628FE48E880}", "entry": { "name": "In", @@ -62362,7 +62362,7 @@ ] }, { - "key": "Empty", + "base": "Empty", "context": "{EB781DCB-CD92-51EF-B490-3628FE48E880}", "entry": { "name": "In", @@ -62393,7 +62393,7 @@ ] }, { - "key": "Swap", + "base": "Swap", "context": "{EB781DCB-CD92-51EF-B490-3628FE48E880}", "entry": { "name": "In", @@ -62424,7 +62424,7 @@ ] }, { - "key": "{6ACECB77-D489-52CF-8473-9116466ABC59}", + "base": "{6ACECB77-D489-52CF-8473-9116466ABC59}", "context": "OnDemandReflected", "variant": "", "details": { @@ -62432,7 +62432,7 @@ }, "methods": [ { - "key": "HasHandlerConnected", + "base": "HasHandlerConnected", "context": "{6ACECB77-D489-52CF-8473-9116466ABC59}", "entry": { "name": "In", @@ -62465,7 +62465,7 @@ ] }, { - "key": "{858A22B8-1B5E-5016-BF33-B2469DD9CAD3}", + "base": "{858A22B8-1B5E-5016-BF33-B2469DD9CAD3}", "context": "OnDemandReflected", "variant": "", "details": { @@ -62473,7 +62473,7 @@ }, "methods": [ { - "key": "has_value", + "base": "has_value", "context": "{858A22B8-1B5E-5016-BF33-B2469DD9CAD3}", "entry": { "name": "In", @@ -62504,7 +62504,7 @@ ] }, { - "key": "__bool__", + "base": "__bool__", "context": "{858A22B8-1B5E-5016-BF33-B2469DD9CAD3}", "entry": { "name": "In", @@ -62535,7 +62535,7 @@ ] }, { - "key": "value", + "base": "value", "context": "{858A22B8-1B5E-5016-BF33-B2469DD9CAD3}", "entry": { "name": "In", @@ -62566,7 +62566,7 @@ ] }, { - "key": "value_or", + "base": "value_or", "context": "{858A22B8-1B5E-5016-BF33-B2469DD9CAD3}", "entry": { "name": "In", @@ -62605,7 +62605,7 @@ ] }, { - "key": "{C985C516-C64B-5821-9A82-06DBAE6734CA}", + "base": "{C985C516-C64B-5821-9A82-06DBAE6734CA}", "context": "OnDemandReflected", "variant": "", "details": { @@ -62615,7 +62615,7 @@ }, "methods": [ { - "key": "contains", + "base": "contains", "context": "{C985C516-C64B-5821-9A82-06DBAE6734CA}", "entry": { "name": "In", @@ -62652,7 +62652,7 @@ ] }, { - "key": "Insert", + "base": "Insert", "context": "{C985C516-C64B-5821-9A82-06DBAE6734CA}", "entry": { "name": "In", @@ -62695,7 +62695,7 @@ ] }, { - "key": "Reserve", + "base": "Reserve", "context": "{C985C516-C64B-5821-9A82-06DBAE6734CA}", "entry": { "name": "In", @@ -62724,7 +62724,7 @@ ] }, { - "key": "GetSize", + "base": "GetSize", "context": "{C985C516-C64B-5821-9A82-06DBAE6734CA}", "entry": { "name": "In", @@ -62755,7 +62755,7 @@ ] }, { - "key": "Iterate_VM", + "base": "Iterate_VM", "context": "{C985C516-C64B-5821-9A82-06DBAE6734CA}", "entry": { "name": "In", @@ -62786,7 +62786,7 @@ ] }, { - "key": "GetKeys", + "base": "GetKeys", "context": "{C985C516-C64B-5821-9A82-06DBAE6734CA}", "entry": { "name": "In", @@ -62817,7 +62817,7 @@ ] }, { - "key": "Size", + "base": "Size", "context": "{C985C516-C64B-5821-9A82-06DBAE6734CA}", "entry": { "name": "In", @@ -62848,7 +62848,7 @@ ] }, { - "key": "Erase", + "base": "Erase", "context": "{C985C516-C64B-5821-9A82-06DBAE6734CA}", "entry": { "name": "In", @@ -62885,7 +62885,7 @@ ] }, { - "key": "EraseCheck_VM", + "base": "EraseCheck_VM", "context": "{C985C516-C64B-5821-9A82-06DBAE6734CA}", "entry": { "name": "In", @@ -62922,7 +62922,7 @@ ] }, { - "key": "Clear", + "base": "Clear", "context": "{C985C516-C64B-5821-9A82-06DBAE6734CA}", "entry": { "name": "In", @@ -62953,7 +62953,7 @@ ] }, { - "key": "At", + "base": "At", "context": "{C985C516-C64B-5821-9A82-06DBAE6734CA}", "entry": { "name": "In", @@ -62990,7 +62990,7 @@ ] }, { - "key": "BucketCount", + "base": "BucketCount", "context": "{C985C516-C64B-5821-9A82-06DBAE6734CA}", "entry": { "name": "In", @@ -63021,7 +63021,7 @@ ] }, { - "key": "Empty", + "base": "Empty", "context": "{C985C516-C64B-5821-9A82-06DBAE6734CA}", "entry": { "name": "In", @@ -63052,7 +63052,7 @@ ] }, { - "key": "Swap", + "base": "Swap", "context": "{C985C516-C64B-5821-9A82-06DBAE6734CA}", "entry": { "name": "In", @@ -63083,7 +63083,7 @@ ] }, { - "key": "{6BBF646F-D689-5D24-9596-05ED6A785D2F}", + "base": "{6BBF646F-D689-5D24-9596-05ED6A785D2F}", "context": "OnDemandReflected", "variant": "", "details": { @@ -63093,7 +63093,7 @@ }, "methods": [ { - "key": "contains", + "base": "contains", "context": "{6BBF646F-D689-5D24-9596-05ED6A785D2F}", "entry": { "name": "In", @@ -63130,7 +63130,7 @@ ] }, { - "key": "Insert", + "base": "Insert", "context": "{6BBF646F-D689-5D24-9596-05ED6A785D2F}", "entry": { "name": "In", @@ -63173,7 +63173,7 @@ ] }, { - "key": "Reserve", + "base": "Reserve", "context": "{6BBF646F-D689-5D24-9596-05ED6A785D2F}", "entry": { "name": "In", @@ -63202,7 +63202,7 @@ ] }, { - "key": "GetSize", + "base": "GetSize", "context": "{6BBF646F-D689-5D24-9596-05ED6A785D2F}", "entry": { "name": "In", @@ -63233,7 +63233,7 @@ ] }, { - "key": "Iterate_VM", + "base": "Iterate_VM", "context": "{6BBF646F-D689-5D24-9596-05ED6A785D2F}", "entry": { "name": "In", @@ -63264,7 +63264,7 @@ ] }, { - "key": "GetKeys", + "base": "GetKeys", "context": "{6BBF646F-D689-5D24-9596-05ED6A785D2F}", "entry": { "name": "In", @@ -63295,7 +63295,7 @@ ] }, { - "key": "Size", + "base": "Size", "context": "{6BBF646F-D689-5D24-9596-05ED6A785D2F}", "entry": { "name": "In", @@ -63326,7 +63326,7 @@ ] }, { - "key": "Erase", + "base": "Erase", "context": "{6BBF646F-D689-5D24-9596-05ED6A785D2F}", "entry": { "name": "In", @@ -63363,7 +63363,7 @@ ] }, { - "key": "EraseCheck_VM", + "base": "EraseCheck_VM", "context": "{6BBF646F-D689-5D24-9596-05ED6A785D2F}", "entry": { "name": "In", @@ -63400,7 +63400,7 @@ ] }, { - "key": "Clear", + "base": "Clear", "context": "{6BBF646F-D689-5D24-9596-05ED6A785D2F}", "entry": { "name": "In", @@ -63431,7 +63431,7 @@ ] }, { - "key": "At", + "base": "At", "context": "{6BBF646F-D689-5D24-9596-05ED6A785D2F}", "entry": { "name": "In", @@ -63468,7 +63468,7 @@ ] }, { - "key": "BucketCount", + "base": "BucketCount", "context": "{6BBF646F-D689-5D24-9596-05ED6A785D2F}", "entry": { "name": "In", @@ -63499,7 +63499,7 @@ ] }, { - "key": "Empty", + "base": "Empty", "context": "{6BBF646F-D689-5D24-9596-05ED6A785D2F}", "entry": { "name": "In", @@ -63530,7 +63530,7 @@ ] }, { - "key": "Swap", + "base": "Swap", "context": "{6BBF646F-D689-5D24-9596-05ED6A785D2F}", "entry": { "name": "In", @@ -63561,7 +63561,7 @@ ] }, { - "key": "{A16BD88A-8457-5717-B84E-977B1D176AE2}", + "base": "{A16BD88A-8457-5717-B84E-977B1D176AE2}", "context": "OnDemandReflected", "variant": "", "details": { @@ -63571,7 +63571,7 @@ }, "methods": [ { - "key": "Size", + "base": "Size", "context": "{A16BD88A-8457-5717-B84E-977B1D176AE2}", "entry": { "name": "In", @@ -63602,7 +63602,7 @@ ] }, { - "key": "Front", + "base": "Front", "context": "{A16BD88A-8457-5717-B84E-977B1D176AE2}", "entry": { "name": "In", @@ -63633,7 +63633,7 @@ ] }, { - "key": "HasKey", + "base": "HasKey", "context": "{A16BD88A-8457-5717-B84E-977B1D176AE2}", "entry": { "name": "In", @@ -63670,7 +63670,7 @@ ] }, { - "key": "Resize", + "base": "Resize", "context": "{A16BD88A-8457-5717-B84E-977B1D176AE2}", "entry": { "name": "In", @@ -63699,7 +63699,7 @@ ] }, { - "key": "at", + "base": "at", "context": "{A16BD88A-8457-5717-B84E-977B1D176AE2}", "entry": { "name": "In", @@ -63736,7 +63736,7 @@ ] }, { - "key": "Back", + "base": "Back", "context": "{A16BD88A-8457-5717-B84E-977B1D176AE2}", "entry": { "name": "In", @@ -63767,7 +63767,7 @@ ] }, { - "key": "pop_back", + "base": "pop_back", "context": "{A16BD88A-8457-5717-B84E-977B1D176AE2}", "entry": { "name": "In", @@ -63790,7 +63790,7 @@ ] }, { - "key": "size", + "base": "size", "context": "{A16BD88A-8457-5717-B84E-977B1D176AE2}", "entry": { "name": "In", @@ -63821,7 +63821,7 @@ ] }, { - "key": "At", + "base": "At", "context": "{A16BD88A-8457-5717-B84E-977B1D176AE2}", "entry": { "name": "In", @@ -63858,7 +63858,7 @@ ] }, { - "key": "Empty", + "base": "Empty", "context": "{A16BD88A-8457-5717-B84E-977B1D176AE2}", "entry": { "name": "In", @@ -63889,7 +63889,7 @@ ] }, { - "key": "Swap", + "base": "Swap", "context": "{A16BD88A-8457-5717-B84E-977B1D176AE2}", "entry": { "name": "In", @@ -63918,7 +63918,7 @@ ] }, { - "key": "push_back", + "base": "push_back", "context": "{A16BD88A-8457-5717-B84E-977B1D176AE2}", "entry": { "name": "In", @@ -63947,7 +63947,7 @@ ] }, { - "key": "PushBack_VM", + "base": "PushBack_VM", "context": "{A16BD88A-8457-5717-B84E-977B1D176AE2}", "entry": { "name": "In", @@ -63984,7 +63984,7 @@ ] }, { - "key": "AtUnchecked", + "base": "AtUnchecked", "context": "{A16BD88A-8457-5717-B84E-977B1D176AE2}", "entry": { "name": "In", @@ -64021,7 +64021,7 @@ ] }, { - "key": "clear", + "base": "clear", "context": "{A16BD88A-8457-5717-B84E-977B1D176AE2}", "entry": { "name": "In", @@ -64044,7 +64044,7 @@ ] }, { - "key": "NotEmpty", + "base": "NotEmpty", "context": "{A16BD88A-8457-5717-B84E-977B1D176AE2}", "entry": { "name": "In", @@ -64075,7 +64075,7 @@ ] }, { - "key": "Erase_VM", + "base": "Erase_VM", "context": "{A16BD88A-8457-5717-B84E-977B1D176AE2}", "entry": { "name": "In", @@ -64112,7 +64112,7 @@ ] }, { - "key": "EraseCheck_VM", + "base": "EraseCheck_VM", "context": "{A16BD88A-8457-5717-B84E-977B1D176AE2}", "entry": { "name": "In", @@ -64149,7 +64149,7 @@ ] }, { - "key": "Capacity", + "base": "Capacity", "context": "{A16BD88A-8457-5717-B84E-977B1D176AE2}", "entry": { "name": "In", @@ -64180,7 +64180,7 @@ ] }, { - "key": "Clear", + "base": "Clear", "context": "{A16BD88A-8457-5717-B84E-977B1D176AE2}", "entry": { "name": "In", @@ -64211,7 +64211,7 @@ ] }, { - "key": "AssignAt", + "base": "AssignAt", "context": "{A16BD88A-8457-5717-B84E-977B1D176AE2}", "entry": { "name": "In", @@ -64246,7 +64246,7 @@ ] }, { - "key": "GetSize", + "base": "GetSize", "context": "{A16BD88A-8457-5717-B84E-977B1D176AE2}", "entry": { "name": "In", @@ -64277,7 +64277,7 @@ ] }, { - "key": "Insert", + "base": "Insert", "context": "{A16BD88A-8457-5717-B84E-977B1D176AE2}", "entry": { "name": "In", @@ -64320,7 +64320,7 @@ ] }, { - "key": "PushBack", + "base": "PushBack", "context": "{A16BD88A-8457-5717-B84E-977B1D176AE2}", "entry": { "name": "In", @@ -64349,7 +64349,7 @@ ] }, { - "key": "Reserve", + "base": "Reserve", "context": "{A16BD88A-8457-5717-B84E-977B1D176AE2}", "entry": { "name": "In", @@ -64378,7 +64378,7 @@ ] }, { - "key": "Iterate_VM", + "base": "Iterate_VM", "context": "{A16BD88A-8457-5717-B84E-977B1D176AE2}", "entry": { "name": "In", @@ -64411,7 +64411,7 @@ ] }, { - "key": "{834DC049-5EC3-5C29-B621-5F0046864DC4}", + "base": "{834DC049-5EC3-5C29-B621-5F0046864DC4}", "context": "OnDemandReflected", "variant": "", "details": { @@ -64419,7 +64419,7 @@ }, "methods": [ { - "key": "IsLoading", + "base": "IsLoading", "context": "{834DC049-5EC3-5C29-B621-5F0046864DC4}", "entry": { "name": "In", @@ -64450,7 +64450,7 @@ ] }, { - "key": "GetType", + "base": "GetType", "context": "{834DC049-5EC3-5C29-B621-5F0046864DC4}", "entry": { "name": "In", @@ -64481,7 +64481,7 @@ ] }, { - "key": "IsError", + "base": "IsError", "context": "{834DC049-5EC3-5C29-B621-5F0046864DC4}", "entry": { "name": "In", @@ -64512,7 +64512,7 @@ ] }, { - "key": "GetHint", + "base": "GetHint", "context": "{834DC049-5EC3-5C29-B621-5F0046864DC4}", "entry": { "name": "In", @@ -64543,7 +64543,7 @@ ] }, { - "key": "GetData", + "base": "GetData", "context": "{834DC049-5EC3-5C29-B621-5F0046864DC4}", "entry": { "name": "In", @@ -64574,7 +64574,7 @@ ] }, { - "key": "IsReady", + "base": "IsReady", "context": "{834DC049-5EC3-5C29-B621-5F0046864DC4}", "entry": { "name": "In", @@ -64605,7 +64605,7 @@ ] }, { - "key": "GetStatus", + "base": "GetStatus", "context": "{834DC049-5EC3-5C29-B621-5F0046864DC4}", "entry": { "name": "In", @@ -64636,7 +64636,7 @@ ] }, { - "key": "GetId", + "base": "GetId", "context": "{834DC049-5EC3-5C29-B621-5F0046864DC4}", "entry": { "name": "In", @@ -64669,7 +64669,7 @@ ] }, { - "key": "{B57176AF-63A1-5531-B77E-BD7337E66127}", + "base": "{B57176AF-63A1-5531-B77E-BD7337E66127}", "context": "OnDemandReflected", "variant": "", "details": { @@ -64677,7 +64677,7 @@ }, "methods": [ { - "key": "GetError", + "base": "GetError", "context": "{B57176AF-63A1-5531-B77E-BD7337E66127}", "entry": { "name": "In", @@ -64708,7 +64708,7 @@ ] }, { - "key": "IsSuccess", + "base": "IsSuccess", "context": "{B57176AF-63A1-5531-B77E-BD7337E66127}", "entry": { "name": "In", @@ -64739,7 +64739,7 @@ ] }, { - "key": "Success", + "base": "Success", "context": "{B57176AF-63A1-5531-B77E-BD7337E66127}", "entry": { "name": "In", @@ -64770,7 +64770,7 @@ ] }, { - "key": "GetValue", + "base": "GetValue", "context": "{B57176AF-63A1-5531-B77E-BD7337E66127}", "entry": { "name": "In", @@ -64801,7 +64801,7 @@ ] }, { - "key": "Failure", + "base": "Failure", "context": "{B57176AF-63A1-5531-B77E-BD7337E66127}", "entry": { "name": "In", @@ -64834,7 +64834,7 @@ ] }, { - "key": "{4C19E257-F929-524E-80E3-C910C5F3E2D9}", + "base": "{4C19E257-F929-524E-80E3-C910C5F3E2D9}", "context": "OnDemandReflected", "variant": "", "details": { @@ -64842,7 +64842,7 @@ }, "methods": [ { - "key": "HasHandlerConnected", + "base": "HasHandlerConnected", "context": "{4C19E257-F929-524E-80E3-C910C5F3E2D9}", "entry": { "name": "In", @@ -64875,7 +64875,7 @@ ] }, { - "key": "{BE75E564-1859-566D-821F-3343675C4977}", + "base": "{BE75E564-1859-566D-821F-3343675C4977}", "context": "OnDemandReflected", "variant": "", "details": { @@ -64885,7 +64885,7 @@ }, "methods": [ { - "key": "contains", + "base": "contains", "context": "{BE75E564-1859-566D-821F-3343675C4977}", "entry": { "name": "In", @@ -64922,7 +64922,7 @@ ] }, { - "key": "Insert", + "base": "Insert", "context": "{BE75E564-1859-566D-821F-3343675C4977}", "entry": { "name": "In", @@ -64965,7 +64965,7 @@ ] }, { - "key": "Reserve", + "base": "Reserve", "context": "{BE75E564-1859-566D-821F-3343675C4977}", "entry": { "name": "In", @@ -64994,7 +64994,7 @@ ] }, { - "key": "GetSize", + "base": "GetSize", "context": "{BE75E564-1859-566D-821F-3343675C4977}", "entry": { "name": "In", @@ -65025,7 +65025,7 @@ ] }, { - "key": "Iterate_VM", + "base": "Iterate_VM", "context": "{BE75E564-1859-566D-821F-3343675C4977}", "entry": { "name": "In", @@ -65056,7 +65056,7 @@ ] }, { - "key": "GetKeys", + "base": "GetKeys", "context": "{BE75E564-1859-566D-821F-3343675C4977}", "entry": { "name": "In", @@ -65087,7 +65087,7 @@ ] }, { - "key": "Size", + "base": "Size", "context": "{BE75E564-1859-566D-821F-3343675C4977}", "entry": { "name": "In", @@ -65118,7 +65118,7 @@ ] }, { - "key": "Erase", + "base": "Erase", "context": "{BE75E564-1859-566D-821F-3343675C4977}", "entry": { "name": "In", @@ -65155,7 +65155,7 @@ ] }, { - "key": "EraseCheck_VM", + "base": "EraseCheck_VM", "context": "{BE75E564-1859-566D-821F-3343675C4977}", "entry": { "name": "In", @@ -65192,7 +65192,7 @@ ] }, { - "key": "Clear", + "base": "Clear", "context": "{BE75E564-1859-566D-821F-3343675C4977}", "entry": { "name": "In", @@ -65223,7 +65223,7 @@ ] }, { - "key": "At", + "base": "At", "context": "{BE75E564-1859-566D-821F-3343675C4977}", "entry": { "name": "In", @@ -65260,7 +65260,7 @@ ] }, { - "key": "BucketCount", + "base": "BucketCount", "context": "{BE75E564-1859-566D-821F-3343675C4977}", "entry": { "name": "In", @@ -65291,7 +65291,7 @@ ] }, { - "key": "Empty", + "base": "Empty", "context": "{BE75E564-1859-566D-821F-3343675C4977}", "entry": { "name": "In", @@ -65322,7 +65322,7 @@ ] }, { - "key": "Swap", + "base": "Swap", "context": "{BE75E564-1859-566D-821F-3343675C4977}", "entry": { "name": "In", @@ -65353,7 +65353,7 @@ ] }, { - "key": "{93942742-473F-5EE3-8420-D8F22C612221}", + "base": "{93942742-473F-5EE3-8420-D8F22C612221}", "context": "OnDemandReflected", "variant": "", "details": { @@ -65361,7 +65361,7 @@ }, "methods": [ { - "key": "Get0", + "base": "Get0", "context": "{93942742-473F-5EE3-8420-D8F22C612221}", "entry": { "name": "In", @@ -65392,7 +65392,7 @@ ] }, { - "key": "Get1", + "base": "Get1", "context": "{93942742-473F-5EE3-8420-D8F22C612221}", "entry": { "name": "In", @@ -65423,7 +65423,7 @@ ] }, { - "key": "Get2", + "base": "Get2", "context": "{93942742-473F-5EE3-8420-D8F22C612221}", "entry": { "name": "In", @@ -65454,7 +65454,7 @@ ] }, { - "key": "GetSize", + "base": "GetSize", "context": "{93942742-473F-5EE3-8420-D8F22C612221}", "entry": { "name": "In", @@ -65479,7 +65479,7 @@ ] }, { - "key": "{4A5210BF-A837-53B7-BB8C-1E74AF26D98B}", + "base": "{4A5210BF-A837-53B7-BB8C-1E74AF26D98B}", "context": "OnDemandReflected", "variant": "", "details": { @@ -65489,7 +65489,7 @@ }, "methods": [ { - "key": "contains", + "base": "contains", "context": "{4A5210BF-A837-53B7-BB8C-1E74AF26D98B}", "entry": { "name": "In", @@ -65526,7 +65526,7 @@ ] }, { - "key": "Insert", + "base": "Insert", "context": "{4A5210BF-A837-53B7-BB8C-1E74AF26D98B}", "entry": { "name": "In", @@ -65570,7 +65570,7 @@ ] }, { - "key": "Reserve", + "base": "Reserve", "context": "{4A5210BF-A837-53B7-BB8C-1E74AF26D98B}", "entry": { "name": "In", @@ -65599,7 +65599,7 @@ ] }, { - "key": "GetSize", + "base": "GetSize", "context": "{4A5210BF-A837-53B7-BB8C-1E74AF26D98B}", "entry": { "name": "In", @@ -65630,7 +65630,7 @@ ] }, { - "key": "Iterate_VM", + "base": "Iterate_VM", "context": "{4A5210BF-A837-53B7-BB8C-1E74AF26D98B}", "entry": { "name": "In", @@ -65661,7 +65661,7 @@ ] }, { - "key": "GetKeys", + "base": "GetKeys", "context": "{4A5210BF-A837-53B7-BB8C-1E74AF26D98B}", "entry": { "name": "In", @@ -65692,7 +65692,7 @@ ] }, { - "key": "Size", + "base": "Size", "context": "{4A5210BF-A837-53B7-BB8C-1E74AF26D98B}", "entry": { "name": "In", @@ -65723,7 +65723,7 @@ ] }, { - "key": "Erase", + "base": "Erase", "context": "{4A5210BF-A837-53B7-BB8C-1E74AF26D98B}", "entry": { "name": "In", @@ -65760,7 +65760,7 @@ ] }, { - "key": "EraseCheck_VM", + "base": "EraseCheck_VM", "context": "{4A5210BF-A837-53B7-BB8C-1E74AF26D98B}", "entry": { "name": "In", @@ -65797,7 +65797,7 @@ ] }, { - "key": "Clear", + "base": "Clear", "context": "{4A5210BF-A837-53B7-BB8C-1E74AF26D98B}", "entry": { "name": "In", @@ -65828,7 +65828,7 @@ ] }, { - "key": "At", + "base": "At", "context": "{4A5210BF-A837-53B7-BB8C-1E74AF26D98B}", "entry": { "name": "In", @@ -65866,7 +65866,7 @@ ] }, { - "key": "BucketCount", + "base": "BucketCount", "context": "{4A5210BF-A837-53B7-BB8C-1E74AF26D98B}", "entry": { "name": "In", @@ -65897,7 +65897,7 @@ ] }, { - "key": "Empty", + "base": "Empty", "context": "{4A5210BF-A837-53B7-BB8C-1E74AF26D98B}", "entry": { "name": "In", @@ -65928,7 +65928,7 @@ ] }, { - "key": "Swap", + "base": "Swap", "context": "{4A5210BF-A837-53B7-BB8C-1E74AF26D98B}", "entry": { "name": "In", @@ -65959,7 +65959,7 @@ ] }, { - "key": "{895CEA57-551B-5B79-A32B-B2DA0A912C87}", + "base": "{895CEA57-551B-5B79-A32B-B2DA0A912C87}", "context": "OnDemandReflected", "variant": "", "details": { @@ -65967,7 +65967,7 @@ }, "methods": [ { - "key": "IsLoading", + "base": "IsLoading", "context": "{895CEA57-551B-5B79-A32B-B2DA0A912C87}", "entry": { "name": "In", @@ -65998,7 +65998,7 @@ ] }, { - "key": "GetType", + "base": "GetType", "context": "{895CEA57-551B-5B79-A32B-B2DA0A912C87}", "entry": { "name": "In", @@ -66029,7 +66029,7 @@ ] }, { - "key": "IsError", + "base": "IsError", "context": "{895CEA57-551B-5B79-A32B-B2DA0A912C87}", "entry": { "name": "In", @@ -66060,7 +66060,7 @@ ] }, { - "key": "GetHint", + "base": "GetHint", "context": "{895CEA57-551B-5B79-A32B-B2DA0A912C87}", "entry": { "name": "In", @@ -66091,7 +66091,7 @@ ] }, { - "key": "GetData", + "base": "GetData", "context": "{895CEA57-551B-5B79-A32B-B2DA0A912C87}", "entry": { "name": "In", @@ -66122,7 +66122,7 @@ ] }, { - "key": "IsReady", + "base": "IsReady", "context": "{895CEA57-551B-5B79-A32B-B2DA0A912C87}", "entry": { "name": "In", @@ -66153,7 +66153,7 @@ ] }, { - "key": "GetStatus", + "base": "GetStatus", "context": "{895CEA57-551B-5B79-A32B-B2DA0A912C87}", "entry": { "name": "In", @@ -66184,7 +66184,7 @@ ] }, { - "key": "GetId", + "base": "GetId", "context": "{895CEA57-551B-5B79-A32B-B2DA0A912C87}", "entry": { "name": "In", @@ -66217,7 +66217,7 @@ ] }, { - "key": "{9D83FE2E-68F4-5FDC-92AE-52C395FB5BFB}", + "base": "{9D83FE2E-68F4-5FDC-92AE-52C395FB5BFB}", "context": "OnDemandReflected", "variant": "", "details": { @@ -66227,7 +66227,7 @@ }, "methods": [ { - "key": "contains", + "base": "contains", "context": "{9D83FE2E-68F4-5FDC-92AE-52C395FB5BFB}", "entry": { "name": "In", @@ -66264,7 +66264,7 @@ ] }, { - "key": "Insert", + "base": "Insert", "context": "{9D83FE2E-68F4-5FDC-92AE-52C395FB5BFB}", "entry": { "name": "In", @@ -66307,7 +66307,7 @@ ] }, { - "key": "Reserve", + "base": "Reserve", "context": "{9D83FE2E-68F4-5FDC-92AE-52C395FB5BFB}", "entry": { "name": "In", @@ -66336,7 +66336,7 @@ ] }, { - "key": "GetSize", + "base": "GetSize", "context": "{9D83FE2E-68F4-5FDC-92AE-52C395FB5BFB}", "entry": { "name": "In", @@ -66367,7 +66367,7 @@ ] }, { - "key": "Iterate_VM", + "base": "Iterate_VM", "context": "{9D83FE2E-68F4-5FDC-92AE-52C395FB5BFB}", "entry": { "name": "In", @@ -66398,7 +66398,7 @@ ] }, { - "key": "GetKeys", + "base": "GetKeys", "context": "{9D83FE2E-68F4-5FDC-92AE-52C395FB5BFB}", "entry": { "name": "In", @@ -66429,7 +66429,7 @@ ] }, { - "key": "Size", + "base": "Size", "context": "{9D83FE2E-68F4-5FDC-92AE-52C395FB5BFB}", "entry": { "name": "In", @@ -66460,7 +66460,7 @@ ] }, { - "key": "Erase", + "base": "Erase", "context": "{9D83FE2E-68F4-5FDC-92AE-52C395FB5BFB}", "entry": { "name": "In", @@ -66497,7 +66497,7 @@ ] }, { - "key": "EraseCheck_VM", + "base": "EraseCheck_VM", "context": "{9D83FE2E-68F4-5FDC-92AE-52C395FB5BFB}", "entry": { "name": "In", @@ -66534,7 +66534,7 @@ ] }, { - "key": "Clear", + "base": "Clear", "context": "{9D83FE2E-68F4-5FDC-92AE-52C395FB5BFB}", "entry": { "name": "In", @@ -66565,7 +66565,7 @@ ] }, { - "key": "At", + "base": "At", "context": "{9D83FE2E-68F4-5FDC-92AE-52C395FB5BFB}", "entry": { "name": "In", @@ -66602,7 +66602,7 @@ ] }, { - "key": "BucketCount", + "base": "BucketCount", "context": "{9D83FE2E-68F4-5FDC-92AE-52C395FB5BFB}", "entry": { "name": "In", @@ -66633,7 +66633,7 @@ ] }, { - "key": "Empty", + "base": "Empty", "context": "{9D83FE2E-68F4-5FDC-92AE-52C395FB5BFB}", "entry": { "name": "In", @@ -66664,7 +66664,7 @@ ] }, { - "key": "Swap", + "base": "Swap", "context": "{9D83FE2E-68F4-5FDC-92AE-52C395FB5BFB}", "entry": { "name": "In", @@ -66695,7 +66695,7 @@ ] }, { - "key": "{FA8DBA11-EE9F-503E-99EA-C12757E5DCF4}", + "base": "{FA8DBA11-EE9F-503E-99EA-C12757E5DCF4}", "context": "OnDemandReflected", "variant": "", "details": { @@ -66705,7 +66705,7 @@ }, "methods": [ { - "key": "contains", + "base": "contains", "context": "{FA8DBA11-EE9F-503E-99EA-C12757E5DCF4}", "entry": { "name": "In", @@ -66743,7 +66743,7 @@ ] }, { - "key": "Insert", + "base": "Insert", "context": "{FA8DBA11-EE9F-503E-99EA-C12757E5DCF4}", "entry": { "name": "In", @@ -66787,7 +66787,7 @@ ] }, { - "key": "Reserve", + "base": "Reserve", "context": "{FA8DBA11-EE9F-503E-99EA-C12757E5DCF4}", "entry": { "name": "In", @@ -66816,7 +66816,7 @@ ] }, { - "key": "GetSize", + "base": "GetSize", "context": "{FA8DBA11-EE9F-503E-99EA-C12757E5DCF4}", "entry": { "name": "In", @@ -66847,7 +66847,7 @@ ] }, { - "key": "Iterate_VM", + "base": "Iterate_VM", "context": "{FA8DBA11-EE9F-503E-99EA-C12757E5DCF4}", "entry": { "name": "In", @@ -66878,7 +66878,7 @@ ] }, { - "key": "GetKeys", + "base": "GetKeys", "context": "{FA8DBA11-EE9F-503E-99EA-C12757E5DCF4}", "entry": { "name": "In", @@ -66909,7 +66909,7 @@ ] }, { - "key": "Size", + "base": "Size", "context": "{FA8DBA11-EE9F-503E-99EA-C12757E5DCF4}", "entry": { "name": "In", @@ -66940,7 +66940,7 @@ ] }, { - "key": "Erase", + "base": "Erase", "context": "{FA8DBA11-EE9F-503E-99EA-C12757E5DCF4}", "entry": { "name": "In", @@ -66978,7 +66978,7 @@ ] }, { - "key": "EraseCheck_VM", + "base": "EraseCheck_VM", "context": "{FA8DBA11-EE9F-503E-99EA-C12757E5DCF4}", "entry": { "name": "In", @@ -67016,7 +67016,7 @@ ] }, { - "key": "Clear", + "base": "Clear", "context": "{FA8DBA11-EE9F-503E-99EA-C12757E5DCF4}", "entry": { "name": "In", @@ -67047,7 +67047,7 @@ ] }, { - "key": "At", + "base": "At", "context": "{FA8DBA11-EE9F-503E-99EA-C12757E5DCF4}", "entry": { "name": "In", @@ -67085,7 +67085,7 @@ ] }, { - "key": "BucketCount", + "base": "BucketCount", "context": "{FA8DBA11-EE9F-503E-99EA-C12757E5DCF4}", "entry": { "name": "In", @@ -67116,7 +67116,7 @@ ] }, { - "key": "Empty", + "base": "Empty", "context": "{FA8DBA11-EE9F-503E-99EA-C12757E5DCF4}", "entry": { "name": "In", @@ -67147,7 +67147,7 @@ ] }, { - "key": "Swap", + "base": "Swap", "context": "{FA8DBA11-EE9F-503E-99EA-C12757E5DCF4}", "entry": { "name": "In", @@ -67178,7 +67178,7 @@ ] }, { - "key": "{E9D62A8D-0092-5956-9DF4-22A087322834}", + "base": "{E9D62A8D-0092-5956-9DF4-22A087322834}", "context": "OnDemandReflected", "variant": "", "details": { @@ -67188,7 +67188,7 @@ }, "methods": [ { - "key": "contains", + "base": "contains", "context": "{E9D62A8D-0092-5956-9DF4-22A087322834}", "entry": { "name": "In", @@ -67225,7 +67225,7 @@ ] }, { - "key": "Insert", + "base": "Insert", "context": "{E9D62A8D-0092-5956-9DF4-22A087322834}", "entry": { "name": "In", @@ -67268,7 +67268,7 @@ ] }, { - "key": "Reserve", + "base": "Reserve", "context": "{E9D62A8D-0092-5956-9DF4-22A087322834}", "entry": { "name": "In", @@ -67297,7 +67297,7 @@ ] }, { - "key": "GetSize", + "base": "GetSize", "context": "{E9D62A8D-0092-5956-9DF4-22A087322834}", "entry": { "name": "In", @@ -67328,7 +67328,7 @@ ] }, { - "key": "Iterate_VM", + "base": "Iterate_VM", "context": "{E9D62A8D-0092-5956-9DF4-22A087322834}", "entry": { "name": "In", @@ -67359,7 +67359,7 @@ ] }, { - "key": "GetKeys", + "base": "GetKeys", "context": "{E9D62A8D-0092-5956-9DF4-22A087322834}", "entry": { "name": "In", @@ -67390,7 +67390,7 @@ ] }, { - "key": "Size", + "base": "Size", "context": "{E9D62A8D-0092-5956-9DF4-22A087322834}", "entry": { "name": "In", @@ -67421,7 +67421,7 @@ ] }, { - "key": "Erase", + "base": "Erase", "context": "{E9D62A8D-0092-5956-9DF4-22A087322834}", "entry": { "name": "In", @@ -67458,7 +67458,7 @@ ] }, { - "key": "EraseCheck_VM", + "base": "EraseCheck_VM", "context": "{E9D62A8D-0092-5956-9DF4-22A087322834}", "entry": { "name": "In", @@ -67495,7 +67495,7 @@ ] }, { - "key": "Clear", + "base": "Clear", "context": "{E9D62A8D-0092-5956-9DF4-22A087322834}", "entry": { "name": "In", @@ -67526,7 +67526,7 @@ ] }, { - "key": "At", + "base": "At", "context": "{E9D62A8D-0092-5956-9DF4-22A087322834}", "entry": { "name": "In", @@ -67563,7 +67563,7 @@ ] }, { - "key": "BucketCount", + "base": "BucketCount", "context": "{E9D62A8D-0092-5956-9DF4-22A087322834}", "entry": { "name": "In", @@ -67594,7 +67594,7 @@ ] }, { - "key": "Empty", + "base": "Empty", "context": "{E9D62A8D-0092-5956-9DF4-22A087322834}", "entry": { "name": "In", @@ -67625,7 +67625,7 @@ ] }, { - "key": "Swap", + "base": "Swap", "context": "{E9D62A8D-0092-5956-9DF4-22A087322834}", "entry": { "name": "In", @@ -67656,7 +67656,7 @@ ] }, { - "key": "{A1F6761B-B5CA-59E6-89FF-EB0ABDF6BD68}", + "base": "{A1F6761B-B5CA-59E6-89FF-EB0ABDF6BD68}", "context": "OnDemandReflected", "variant": "", "details": { @@ -67664,7 +67664,7 @@ }, "methods": [ { - "key": "IsLoading", + "base": "IsLoading", "context": "{A1F6761B-B5CA-59E6-89FF-EB0ABDF6BD68}", "entry": { "name": "In", @@ -67695,7 +67695,7 @@ ] }, { - "key": "GetType", + "base": "GetType", "context": "{A1F6761B-B5CA-59E6-89FF-EB0ABDF6BD68}", "entry": { "name": "In", @@ -67726,7 +67726,7 @@ ] }, { - "key": "IsError", + "base": "IsError", "context": "{A1F6761B-B5CA-59E6-89FF-EB0ABDF6BD68}", "entry": { "name": "In", @@ -67757,7 +67757,7 @@ ] }, { - "key": "GetHint", + "base": "GetHint", "context": "{A1F6761B-B5CA-59E6-89FF-EB0ABDF6BD68}", "entry": { "name": "In", @@ -67788,7 +67788,7 @@ ] }, { - "key": "GetData", + "base": "GetData", "context": "{A1F6761B-B5CA-59E6-89FF-EB0ABDF6BD68}", "entry": { "name": "In", @@ -67819,7 +67819,7 @@ ] }, { - "key": "IsReady", + "base": "IsReady", "context": "{A1F6761B-B5CA-59E6-89FF-EB0ABDF6BD68}", "entry": { "name": "In", @@ -67850,7 +67850,7 @@ ] }, { - "key": "GetStatus", + "base": "GetStatus", "context": "{A1F6761B-B5CA-59E6-89FF-EB0ABDF6BD68}", "entry": { "name": "In", @@ -67881,7 +67881,7 @@ ] }, { - "key": "GetId", + "base": "GetId", "context": "{A1F6761B-B5CA-59E6-89FF-EB0ABDF6BD68}", "entry": { "name": "In", @@ -67914,7 +67914,7 @@ ] }, { - "key": "{7DCCB2BE-9664-504E-8585-ED46CD3FE97F}", + "base": "{7DCCB2BE-9664-504E-8585-ED46CD3FE97F}", "context": "OnDemandReflected", "variant": "", "details": { @@ -67924,7 +67924,7 @@ }, "methods": [ { - "key": "contains", + "base": "contains", "context": "{7DCCB2BE-9664-504E-8585-ED46CD3FE97F}", "entry": { "name": "In", @@ -67962,7 +67962,7 @@ ] }, { - "key": "Insert", + "base": "Insert", "context": "{7DCCB2BE-9664-504E-8585-ED46CD3FE97F}", "entry": { "name": "In", @@ -68006,7 +68006,7 @@ ] }, { - "key": "Reserve", + "base": "Reserve", "context": "{7DCCB2BE-9664-504E-8585-ED46CD3FE97F}", "entry": { "name": "In", @@ -68035,7 +68035,7 @@ ] }, { - "key": "GetSize", + "base": "GetSize", "context": "{7DCCB2BE-9664-504E-8585-ED46CD3FE97F}", "entry": { "name": "In", @@ -68066,7 +68066,7 @@ ] }, { - "key": "Iterate_VM", + "base": "Iterate_VM", "context": "{7DCCB2BE-9664-504E-8585-ED46CD3FE97F}", "entry": { "name": "In", @@ -68097,7 +68097,7 @@ ] }, { - "key": "GetKeys", + "base": "GetKeys", "context": "{7DCCB2BE-9664-504E-8585-ED46CD3FE97F}", "entry": { "name": "In", @@ -68128,7 +68128,7 @@ ] }, { - "key": "Size", + "base": "Size", "context": "{7DCCB2BE-9664-504E-8585-ED46CD3FE97F}", "entry": { "name": "In", @@ -68159,7 +68159,7 @@ ] }, { - "key": "Erase", + "base": "Erase", "context": "{7DCCB2BE-9664-504E-8585-ED46CD3FE97F}", "entry": { "name": "In", @@ -68197,7 +68197,7 @@ ] }, { - "key": "EraseCheck_VM", + "base": "EraseCheck_VM", "context": "{7DCCB2BE-9664-504E-8585-ED46CD3FE97F}", "entry": { "name": "In", @@ -68235,7 +68235,7 @@ ] }, { - "key": "Clear", + "base": "Clear", "context": "{7DCCB2BE-9664-504E-8585-ED46CD3FE97F}", "entry": { "name": "In", @@ -68266,7 +68266,7 @@ ] }, { - "key": "At", + "base": "At", "context": "{7DCCB2BE-9664-504E-8585-ED46CD3FE97F}", "entry": { "name": "In", @@ -68304,7 +68304,7 @@ ] }, { - "key": "BucketCount", + "base": "BucketCount", "context": "{7DCCB2BE-9664-504E-8585-ED46CD3FE97F}", "entry": { "name": "In", @@ -68335,7 +68335,7 @@ ] }, { - "key": "Empty", + "base": "Empty", "context": "{7DCCB2BE-9664-504E-8585-ED46CD3FE97F}", "entry": { "name": "In", @@ -68366,7 +68366,7 @@ ] }, { - "key": "Swap", + "base": "Swap", "context": "{7DCCB2BE-9664-504E-8585-ED46CD3FE97F}", "entry": { "name": "In", @@ -68397,7 +68397,7 @@ ] }, { - "key": "{681B589F-DB42-5D86-B6FC-C4B62EBC5F19}", + "base": "{681B589F-DB42-5D86-B6FC-C4B62EBC5F19}", "context": "OnDemandReflected", "variant": "", "details": { @@ -68407,7 +68407,7 @@ }, "methods": [ { - "key": "contains", + "base": "contains", "context": "{681B589F-DB42-5D86-B6FC-C4B62EBC5F19}", "entry": { "name": "In", @@ -68444,7 +68444,7 @@ ] }, { - "key": "Insert", + "base": "Insert", "context": "{681B589F-DB42-5D86-B6FC-C4B62EBC5F19}", "entry": { "name": "In", @@ -68487,7 +68487,7 @@ ] }, { - "key": "Reserve", + "base": "Reserve", "context": "{681B589F-DB42-5D86-B6FC-C4B62EBC5F19}", "entry": { "name": "In", @@ -68516,7 +68516,7 @@ ] }, { - "key": "GetSize", + "base": "GetSize", "context": "{681B589F-DB42-5D86-B6FC-C4B62EBC5F19}", "entry": { "name": "In", @@ -68547,7 +68547,7 @@ ] }, { - "key": "Iterate_VM", + "base": "Iterate_VM", "context": "{681B589F-DB42-5D86-B6FC-C4B62EBC5F19}", "entry": { "name": "In", @@ -68578,7 +68578,7 @@ ] }, { - "key": "GetKeys", + "base": "GetKeys", "context": "{681B589F-DB42-5D86-B6FC-C4B62EBC5F19}", "entry": { "name": "In", @@ -68609,7 +68609,7 @@ ] }, { - "key": "Size", + "base": "Size", "context": "{681B589F-DB42-5D86-B6FC-C4B62EBC5F19}", "entry": { "name": "In", @@ -68640,7 +68640,7 @@ ] }, { - "key": "Erase", + "base": "Erase", "context": "{681B589F-DB42-5D86-B6FC-C4B62EBC5F19}", "entry": { "name": "In", @@ -68677,7 +68677,7 @@ ] }, { - "key": "EraseCheck_VM", + "base": "EraseCheck_VM", "context": "{681B589F-DB42-5D86-B6FC-C4B62EBC5F19}", "entry": { "name": "In", @@ -68714,7 +68714,7 @@ ] }, { - "key": "Clear", + "base": "Clear", "context": "{681B589F-DB42-5D86-B6FC-C4B62EBC5F19}", "entry": { "name": "In", @@ -68745,7 +68745,7 @@ ] }, { - "key": "At", + "base": "At", "context": "{681B589F-DB42-5D86-B6FC-C4B62EBC5F19}", "entry": { "name": "In", @@ -68782,7 +68782,7 @@ ] }, { - "key": "BucketCount", + "base": "BucketCount", "context": "{681B589F-DB42-5D86-B6FC-C4B62EBC5F19}", "entry": { "name": "In", @@ -68813,7 +68813,7 @@ ] }, { - "key": "Empty", + "base": "Empty", "context": "{681B589F-DB42-5D86-B6FC-C4B62EBC5F19}", "entry": { "name": "In", @@ -68844,7 +68844,7 @@ ] }, { - "key": "Swap", + "base": "Swap", "context": "{681B589F-DB42-5D86-B6FC-C4B62EBC5F19}", "entry": { "name": "In", @@ -68875,7 +68875,7 @@ ] }, { - "key": "{1F0C2998-C47A-546C-A9A5-23155075A403}", + "base": "{1F0C2998-C47A-546C-A9A5-23155075A403}", "context": "OnDemandReflected", "variant": "", "details": { @@ -68885,7 +68885,7 @@ }, "methods": [ { - "key": "contains", + "base": "contains", "context": "{1F0C2998-C47A-546C-A9A5-23155075A403}", "entry": { "name": "In", @@ -68922,7 +68922,7 @@ ] }, { - "key": "Insert", + "base": "Insert", "context": "{1F0C2998-C47A-546C-A9A5-23155075A403}", "entry": { "name": "In", @@ -68965,7 +68965,7 @@ ] }, { - "key": "Reserve", + "base": "Reserve", "context": "{1F0C2998-C47A-546C-A9A5-23155075A403}", "entry": { "name": "In", @@ -68994,7 +68994,7 @@ ] }, { - "key": "GetSize", + "base": "GetSize", "context": "{1F0C2998-C47A-546C-A9A5-23155075A403}", "entry": { "name": "In", @@ -69025,7 +69025,7 @@ ] }, { - "key": "Iterate_VM", + "base": "Iterate_VM", "context": "{1F0C2998-C47A-546C-A9A5-23155075A403}", "entry": { "name": "In", @@ -69056,7 +69056,7 @@ ] }, { - "key": "GetKeys", + "base": "GetKeys", "context": "{1F0C2998-C47A-546C-A9A5-23155075A403}", "entry": { "name": "In", @@ -69087,7 +69087,7 @@ ] }, { - "key": "Size", + "base": "Size", "context": "{1F0C2998-C47A-546C-A9A5-23155075A403}", "entry": { "name": "In", @@ -69118,7 +69118,7 @@ ] }, { - "key": "Erase", + "base": "Erase", "context": "{1F0C2998-C47A-546C-A9A5-23155075A403}", "entry": { "name": "In", @@ -69155,7 +69155,7 @@ ] }, { - "key": "EraseCheck_VM", + "base": "EraseCheck_VM", "context": "{1F0C2998-C47A-546C-A9A5-23155075A403}", "entry": { "name": "In", @@ -69192,7 +69192,7 @@ ] }, { - "key": "Clear", + "base": "Clear", "context": "{1F0C2998-C47A-546C-A9A5-23155075A403}", "entry": { "name": "In", @@ -69223,7 +69223,7 @@ ] }, { - "key": "At", + "base": "At", "context": "{1F0C2998-C47A-546C-A9A5-23155075A403}", "entry": { "name": "In", @@ -69260,7 +69260,7 @@ ] }, { - "key": "BucketCount", + "base": "BucketCount", "context": "{1F0C2998-C47A-546C-A9A5-23155075A403}", "entry": { "name": "In", @@ -69291,7 +69291,7 @@ ] }, { - "key": "Empty", + "base": "Empty", "context": "{1F0C2998-C47A-546C-A9A5-23155075A403}", "entry": { "name": "In", @@ -69322,7 +69322,7 @@ ] }, { - "key": "Swap", + "base": "Swap", "context": "{1F0C2998-C47A-546C-A9A5-23155075A403}", "entry": { "name": "In", @@ -69353,7 +69353,7 @@ ] }, { - "key": "{76898795-2B30-4645-B6D4-67568ECC889F}", + "base": "{76898795-2B30-4645-B6D4-67568ECC889F}", "context": "OnDemandReflected", "variant": "", "details": { @@ -69361,7 +69361,7 @@ }, "methods": [ { - "key": "ThreeGeneric", + "base": "ThreeGeneric", "context": "{76898795-2B30-4645-B6D4-67568ECC889F}", "entry": { "name": "In", @@ -69404,7 +69404,7 @@ ] }, { - "key": "MultiplyAndAdd", + "base": "MultiplyAndAdd", "context": "{76898795-2B30-4645-B6D4-67568ECC889F}", "entry": { "name": "In", @@ -69447,7 +69447,7 @@ ] }, { - "key": "StringToNumber", + "base": "StringToNumber", "context": "{76898795-2B30-4645-B6D4-67568ECC889F}", "entry": { "name": "In", @@ -69480,7 +69480,7 @@ ] }, { - "key": "{59E0EF87-352C-4CFB-A810-5B8752BDD1EF}", + "base": "{59E0EF87-352C-4CFB-A810-5B8752BDD1EF}", "context": "OnDemandReflected", "variant": "", "details": { @@ -69488,7 +69488,7 @@ }, "methods": [ { - "key": "RotationZDegrees", + "base": "RotationZDegrees", "context": "{59E0EF87-352C-4CFB-A810-5B8752BDD1EF}", "entry": { "name": "In", @@ -69519,7 +69519,7 @@ ] }, { - "key": "GetUp", + "base": "GetUp", "context": "{59E0EF87-352C-4CFB-A810-5B8752BDD1EF}", "entry": { "name": "In", @@ -69556,7 +69556,7 @@ ] }, { - "key": "GetForward", + "base": "GetForward", "context": "{59E0EF87-352C-4CFB-A810-5B8752BDD1EF}", "entry": { "name": "In", @@ -69593,7 +69593,7 @@ ] }, { - "key": "IsClose", + "base": "IsClose", "context": "{59E0EF87-352C-4CFB-A810-5B8752BDD1EF}", "entry": { "name": "In", @@ -69636,7 +69636,7 @@ ] }, { - "key": "RotationXDegrees", + "base": "RotationXDegrees", "context": "{59E0EF87-352C-4CFB-A810-5B8752BDD1EF}", "entry": { "name": "In", @@ -69667,7 +69667,7 @@ ] }, { - "key": "FromTranslation", + "base": "FromTranslation", "context": "{59E0EF87-352C-4CFB-A810-5B8752BDD1EF}", "entry": { "name": "In", @@ -69698,7 +69698,7 @@ ] }, { - "key": "IsFinite", + "base": "IsFinite", "context": "{59E0EF87-352C-4CFB-A810-5B8752BDD1EF}", "entry": { "name": "In", @@ -69729,7 +69729,7 @@ ] }, { - "key": "MultiplyByUniformScale", + "base": "MultiplyByUniformScale", "context": "{59E0EF87-352C-4CFB-A810-5B8752BDD1EF}", "entry": { "name": "In", @@ -69766,7 +69766,7 @@ ] }, { - "key": "MultiplyByTransform", + "base": "MultiplyByTransform", "context": "{59E0EF87-352C-4CFB-A810-5B8752BDD1EF}", "entry": { "name": "In", @@ -69803,7 +69803,7 @@ ] }, { - "key": "FromRotation", + "base": "FromRotation", "context": "{59E0EF87-352C-4CFB-A810-5B8752BDD1EF}", "entry": { "name": "In", @@ -69834,7 +69834,7 @@ ] }, { - "key": "RotationYDegrees", + "base": "RotationYDegrees", "context": "{59E0EF87-352C-4CFB-A810-5B8752BDD1EF}", "entry": { "name": "In", @@ -69865,7 +69865,7 @@ ] }, { - "key": "FromRotationAndTranslation", + "base": "FromRotationAndTranslation", "context": "{59E0EF87-352C-4CFB-A810-5B8752BDD1EF}", "entry": { "name": "In", @@ -69902,7 +69902,7 @@ ] }, { - "key": "MultiplyByVector3", + "base": "MultiplyByVector3", "context": "{59E0EF87-352C-4CFB-A810-5B8752BDD1EF}", "entry": { "name": "In", @@ -69939,7 +69939,7 @@ ] }, { - "key": "MultiplyByVector4", + "base": "MultiplyByVector4", "context": "{59E0EF87-352C-4CFB-A810-5B8752BDD1EF}", "entry": { "name": "In", @@ -69976,7 +69976,7 @@ ] }, { - "key": "ToScale", + "base": "ToScale", "context": "{59E0EF87-352C-4CFB-A810-5B8752BDD1EF}", "entry": { "name": "In", @@ -70007,7 +70007,7 @@ ] }, { - "key": "FromMatrix3x3", + "base": "FromMatrix3x3", "context": "{59E0EF87-352C-4CFB-A810-5B8752BDD1EF}", "entry": { "name": "In", @@ -70038,7 +70038,7 @@ ] }, { - "key": "GetRight", + "base": "GetRight", "context": "{59E0EF87-352C-4CFB-A810-5B8752BDD1EF}", "entry": { "name": "In", @@ -70075,7 +70075,7 @@ ] }, { - "key": "IsOrthogonal", + "base": "IsOrthogonal", "context": "{59E0EF87-352C-4CFB-A810-5B8752BDD1EF}", "entry": { "name": "In", @@ -70112,7 +70112,7 @@ ] }, { - "key": "Orthogonalize", + "base": "Orthogonalize", "context": "{59E0EF87-352C-4CFB-A810-5B8752BDD1EF}", "entry": { "name": "In", @@ -70143,7 +70143,7 @@ ] }, { - "key": "FromMatrix3x3AndTranslation", + "base": "FromMatrix3x3AndTranslation", "context": "{59E0EF87-352C-4CFB-A810-5B8752BDD1EF}", "entry": { "name": "In", @@ -70180,7 +70180,7 @@ ] }, { - "key": "FromScale", + "base": "FromScale", "context": "{59E0EF87-352C-4CFB-A810-5B8752BDD1EF}", "entry": { "name": "In", @@ -70211,7 +70211,7 @@ ] }, { - "key": "GetTranslation", + "base": "GetTranslation", "context": "{59E0EF87-352C-4CFB-A810-5B8752BDD1EF}", "entry": { "name": "In", @@ -70244,7 +70244,7 @@ ] }, { - "key": "{F48E1596-F805-51F0-8BC4-E093F8517935}", + "base": "{F48E1596-F805-51F0-8BC4-E093F8517935}", "context": "OnDemandReflected", "variant": "", "details": { @@ -70254,7 +70254,7 @@ }, "methods": [ { - "key": "contains", + "base": "contains", "context": "{F48E1596-F805-51F0-8BC4-E093F8517935}", "entry": { "name": "In", @@ -70291,7 +70291,7 @@ ] }, { - "key": "Insert", + "base": "Insert", "context": "{F48E1596-F805-51F0-8BC4-E093F8517935}", "entry": { "name": "In", @@ -70334,7 +70334,7 @@ ] }, { - "key": "Reserve", + "base": "Reserve", "context": "{F48E1596-F805-51F0-8BC4-E093F8517935}", "entry": { "name": "In", @@ -70363,7 +70363,7 @@ ] }, { - "key": "GetSize", + "base": "GetSize", "context": "{F48E1596-F805-51F0-8BC4-E093F8517935}", "entry": { "name": "In", @@ -70394,7 +70394,7 @@ ] }, { - "key": "Iterate_VM", + "base": "Iterate_VM", "context": "{F48E1596-F805-51F0-8BC4-E093F8517935}", "entry": { "name": "In", @@ -70425,7 +70425,7 @@ ] }, { - "key": "GetKeys", + "base": "GetKeys", "context": "{F48E1596-F805-51F0-8BC4-E093F8517935}", "entry": { "name": "In", @@ -70456,7 +70456,7 @@ ] }, { - "key": "Size", + "base": "Size", "context": "{F48E1596-F805-51F0-8BC4-E093F8517935}", "entry": { "name": "In", @@ -70487,7 +70487,7 @@ ] }, { - "key": "Erase", + "base": "Erase", "context": "{F48E1596-F805-51F0-8BC4-E093F8517935}", "entry": { "name": "In", @@ -70524,7 +70524,7 @@ ] }, { - "key": "EraseCheck_VM", + "base": "EraseCheck_VM", "context": "{F48E1596-F805-51F0-8BC4-E093F8517935}", "entry": { "name": "In", @@ -70561,7 +70561,7 @@ ] }, { - "key": "Clear", + "base": "Clear", "context": "{F48E1596-F805-51F0-8BC4-E093F8517935}", "entry": { "name": "In", @@ -70592,7 +70592,7 @@ ] }, { - "key": "At", + "base": "At", "context": "{F48E1596-F805-51F0-8BC4-E093F8517935}", "entry": { "name": "In", @@ -70629,7 +70629,7 @@ ] }, { - "key": "BucketCount", + "base": "BucketCount", "context": "{F48E1596-F805-51F0-8BC4-E093F8517935}", "entry": { "name": "In", @@ -70660,7 +70660,7 @@ ] }, { - "key": "Empty", + "base": "Empty", "context": "{F48E1596-F805-51F0-8BC4-E093F8517935}", "entry": { "name": "In", @@ -70691,7 +70691,7 @@ ] }, { - "key": "Swap", + "base": "Swap", "context": "{F48E1596-F805-51F0-8BC4-E093F8517935}", "entry": { "name": "In", @@ -70722,7 +70722,7 @@ ] }, { - "key": "{8C5F6959-C2C4-46D9-9FCD-4DC234E7732D}", + "base": "{8C5F6959-C2C4-46D9-9FCD-4DC234E7732D}", "context": "OnDemandReflected", "variant": "", "details": { @@ -70730,7 +70730,7 @@ }, "methods": [ { - "key": "Transpose", + "base": "Transpose", "context": "{8C5F6959-C2C4-46D9-9FCD-4DC234E7732D}", "entry": { "name": "In", @@ -70761,7 +70761,7 @@ ] }, { - "key": "Zero", + "base": "Zero", "context": "{8C5F6959-C2C4-46D9-9FCD-4DC234E7732D}", "entry": { "name": "In", @@ -70784,7 +70784,7 @@ ] }, { - "key": "Subtract", + "base": "Subtract", "context": "{8C5F6959-C2C4-46D9-9FCD-4DC234E7732D}", "entry": { "name": "In", @@ -70821,7 +70821,7 @@ ] }, { - "key": "GetElement", + "base": "GetElement", "context": "{8C5F6959-C2C4-46D9-9FCD-4DC234E7732D}", "entry": { "name": "In", @@ -70864,7 +70864,7 @@ ] }, { - "key": "Invert", + "base": "Invert", "context": "{8C5F6959-C2C4-46D9-9FCD-4DC234E7732D}", "entry": { "name": "In", @@ -70895,7 +70895,7 @@ ] }, { - "key": "GetDiagonal", + "base": "GetDiagonal", "context": "{8C5F6959-C2C4-46D9-9FCD-4DC234E7732D}", "entry": { "name": "In", @@ -70926,7 +70926,7 @@ ] }, { - "key": "GetColumn", + "base": "GetColumn", "context": "{8C5F6959-C2C4-46D9-9FCD-4DC234E7732D}", "entry": { "name": "In", @@ -70963,7 +70963,7 @@ ] }, { - "key": "MultiplyByVector", + "base": "MultiplyByVector", "context": "{8C5F6959-C2C4-46D9-9FCD-4DC234E7732D}", "entry": { "name": "In", @@ -71000,7 +71000,7 @@ ] }, { - "key": "Add", + "base": "Add", "context": "{8C5F6959-C2C4-46D9-9FCD-4DC234E7732D}", "entry": { "name": "In", @@ -71037,7 +71037,7 @@ ] }, { - "key": "IsFinite", + "base": "IsFinite", "context": "{8C5F6959-C2C4-46D9-9FCD-4DC234E7732D}", "entry": { "name": "In", @@ -71068,7 +71068,7 @@ ] }, { - "key": "DivideByNumber", + "base": "DivideByNumber", "context": "{8C5F6959-C2C4-46D9-9FCD-4DC234E7732D}", "entry": { "name": "In", @@ -71105,7 +71105,7 @@ ] }, { - "key": "ToAdjugate", + "base": "ToAdjugate", "context": "{8C5F6959-C2C4-46D9-9FCD-4DC234E7732D}", "entry": { "name": "In", @@ -71136,7 +71136,7 @@ ] }, { - "key": "IsClose", + "base": "IsClose", "context": "{8C5F6959-C2C4-46D9-9FCD-4DC234E7732D}", "entry": { "name": "In", @@ -71179,7 +71179,7 @@ ] }, { - "key": "MultiplyByMatrix", + "base": "MultiplyByMatrix", "context": "{8C5F6959-C2C4-46D9-9FCD-4DC234E7732D}", "entry": { "name": "In", @@ -71216,7 +71216,7 @@ ] }, { - "key": "IsOrthogonal", + "base": "IsOrthogonal", "context": "{8C5F6959-C2C4-46D9-9FCD-4DC234E7732D}", "entry": { "name": "In", @@ -71247,7 +71247,7 @@ ] }, { - "key": "Orthogonalize", + "base": "Orthogonalize", "context": "{8C5F6959-C2C4-46D9-9FCD-4DC234E7732D}", "entry": { "name": "In", @@ -71278,7 +71278,7 @@ ] }, { - "key": "GetRows", + "base": "GetRows", "context": "{8C5F6959-C2C4-46D9-9FCD-4DC234E7732D}", "entry": { "name": "In", @@ -71309,7 +71309,7 @@ ] }, { - "key": "FromCrossProduct", + "base": "FromCrossProduct", "context": "{8C5F6959-C2C4-46D9-9FCD-4DC234E7732D}", "entry": { "name": "In", @@ -71340,7 +71340,7 @@ ] }, { - "key": "GetColumns", + "base": "GetColumns", "context": "{8C5F6959-C2C4-46D9-9FCD-4DC234E7732D}", "entry": { "name": "In", @@ -71371,7 +71371,7 @@ ] }, { - "key": "FromTransform", + "base": "FromTransform", "context": "{8C5F6959-C2C4-46D9-9FCD-4DC234E7732D}", "entry": { "name": "In", @@ -71402,7 +71402,7 @@ ] }, { - "key": "FromScale", + "base": "FromScale", "context": "{8C5F6959-C2C4-46D9-9FCD-4DC234E7732D}", "entry": { "name": "In", @@ -71433,7 +71433,7 @@ ] }, { - "key": "ToScale", + "base": "ToScale", "context": "{8C5F6959-C2C4-46D9-9FCD-4DC234E7732D}", "entry": { "name": "In", @@ -71464,7 +71464,7 @@ ] }, { - "key": "FromQuaternion", + "base": "FromQuaternion", "context": "{8C5F6959-C2C4-46D9-9FCD-4DC234E7732D}", "entry": { "name": "In", @@ -71495,7 +71495,7 @@ ] }, { - "key": "MultiplyByNumber", + "base": "MultiplyByNumber", "context": "{8C5F6959-C2C4-46D9-9FCD-4DC234E7732D}", "entry": { "name": "In", @@ -71532,7 +71532,7 @@ ] }, { - "key": "GetRow", + "base": "GetRow", "context": "{8C5F6959-C2C4-46D9-9FCD-4DC234E7732D}", "entry": { "name": "In", @@ -71569,7 +71569,7 @@ ] }, { - "key": "FromRotationYDegrees", + "base": "FromRotationYDegrees", "context": "{8C5F6959-C2C4-46D9-9FCD-4DC234E7732D}", "entry": { "name": "In", @@ -71600,7 +71600,7 @@ ] }, { - "key": "FromRows", + "base": "FromRows", "context": "{8C5F6959-C2C4-46D9-9FCD-4DC234E7732D}", "entry": { "name": "In", @@ -71643,7 +71643,7 @@ ] }, { - "key": "FromDiagonal", + "base": "FromDiagonal", "context": "{8C5F6959-C2C4-46D9-9FCD-4DC234E7732D}", "entry": { "name": "In", @@ -71674,7 +71674,7 @@ ] }, { - "key": "FromRotationZDegrees", + "base": "FromRotationZDegrees", "context": "{8C5F6959-C2C4-46D9-9FCD-4DC234E7732D}", "entry": { "name": "In", @@ -71705,7 +71705,7 @@ ] }, { - "key": "FromMatrix4x4", + "base": "FromMatrix4x4", "context": "{8C5F6959-C2C4-46D9-9FCD-4DC234E7732D}", "entry": { "name": "In", @@ -71736,7 +71736,7 @@ ] }, { - "key": "FromColumns", + "base": "FromColumns", "context": "{8C5F6959-C2C4-46D9-9FCD-4DC234E7732D}", "entry": { "name": "In", @@ -71779,7 +71779,7 @@ ] }, { - "key": "FromRotationXDegrees", + "base": "FromRotationXDegrees", "context": "{8C5F6959-C2C4-46D9-9FCD-4DC234E7732D}", "entry": { "name": "In", @@ -71810,7 +71810,7 @@ ] }, { - "key": "ToDeterminant", + "base": "ToDeterminant", "context": "{8C5F6959-C2C4-46D9-9FCD-4DC234E7732D}", "entry": { "name": "In", @@ -71843,7 +71843,7 @@ ] }, { - "key": "{B7141BE7-3946-56D1-8B31-CAD10C7C7D9C}", + "base": "{B7141BE7-3946-56D1-8B31-CAD10C7C7D9C}", "context": "OnDemandReflected", "variant": "", "details": { @@ -71853,7 +71853,7 @@ }, "methods": [ { - "key": "contains", + "base": "contains", "context": "{B7141BE7-3946-56D1-8B31-CAD10C7C7D9C}", "entry": { "name": "In", @@ -71890,7 +71890,7 @@ ] }, { - "key": "Insert", + "base": "Insert", "context": "{B7141BE7-3946-56D1-8B31-CAD10C7C7D9C}", "entry": { "name": "In", @@ -71933,7 +71933,7 @@ ] }, { - "key": "Reserve", + "base": "Reserve", "context": "{B7141BE7-3946-56D1-8B31-CAD10C7C7D9C}", "entry": { "name": "In", @@ -71962,7 +71962,7 @@ ] }, { - "key": "GetSize", + "base": "GetSize", "context": "{B7141BE7-3946-56D1-8B31-CAD10C7C7D9C}", "entry": { "name": "In", @@ -71993,7 +71993,7 @@ ] }, { - "key": "Iterate_VM", + "base": "Iterate_VM", "context": "{B7141BE7-3946-56D1-8B31-CAD10C7C7D9C}", "entry": { "name": "In", @@ -72024,7 +72024,7 @@ ] }, { - "key": "GetKeys", + "base": "GetKeys", "context": "{B7141BE7-3946-56D1-8B31-CAD10C7C7D9C}", "entry": { "name": "In", @@ -72055,7 +72055,7 @@ ] }, { - "key": "Size", + "base": "Size", "context": "{B7141BE7-3946-56D1-8B31-CAD10C7C7D9C}", "entry": { "name": "In", @@ -72086,7 +72086,7 @@ ] }, { - "key": "Erase", + "base": "Erase", "context": "{B7141BE7-3946-56D1-8B31-CAD10C7C7D9C}", "entry": { "name": "In", @@ -72123,7 +72123,7 @@ ] }, { - "key": "EraseCheck_VM", + "base": "EraseCheck_VM", "context": "{B7141BE7-3946-56D1-8B31-CAD10C7C7D9C}", "entry": { "name": "In", @@ -72160,7 +72160,7 @@ ] }, { - "key": "Clear", + "base": "Clear", "context": "{B7141BE7-3946-56D1-8B31-CAD10C7C7D9C}", "entry": { "name": "In", @@ -72191,7 +72191,7 @@ ] }, { - "key": "At", + "base": "At", "context": "{B7141BE7-3946-56D1-8B31-CAD10C7C7D9C}", "entry": { "name": "In", @@ -72228,7 +72228,7 @@ ] }, { - "key": "BucketCount", + "base": "BucketCount", "context": "{B7141BE7-3946-56D1-8B31-CAD10C7C7D9C}", "entry": { "name": "In", @@ -72259,7 +72259,7 @@ ] }, { - "key": "Empty", + "base": "Empty", "context": "{B7141BE7-3946-56D1-8B31-CAD10C7C7D9C}", "entry": { "name": "In", @@ -72290,7 +72290,7 @@ ] }, { - "key": "Swap", + "base": "Swap", "context": "{B7141BE7-3946-56D1-8B31-CAD10C7C7D9C}", "entry": { "name": "In", @@ -72321,7 +72321,7 @@ ] }, { - "key": "{8EA123A3-72BE-5B00-A22E-BEF0AFB0B68B}", + "base": "{8EA123A3-72BE-5B00-A22E-BEF0AFB0B68B}", "context": "OnDemandReflected", "variant": "", "details": { @@ -72331,7 +72331,7 @@ }, "methods": [ { - "key": "contains", + "base": "contains", "context": "{8EA123A3-72BE-5B00-A22E-BEF0AFB0B68B}", "entry": { "name": "In", @@ -72368,7 +72368,7 @@ ] }, { - "key": "Insert", + "base": "Insert", "context": "{8EA123A3-72BE-5B00-A22E-BEF0AFB0B68B}", "entry": { "name": "In", @@ -72411,7 +72411,7 @@ ] }, { - "key": "Reserve", + "base": "Reserve", "context": "{8EA123A3-72BE-5B00-A22E-BEF0AFB0B68B}", "entry": { "name": "In", @@ -72440,7 +72440,7 @@ ] }, { - "key": "GetSize", + "base": "GetSize", "context": "{8EA123A3-72BE-5B00-A22E-BEF0AFB0B68B}", "entry": { "name": "In", @@ -72471,7 +72471,7 @@ ] }, { - "key": "Iterate_VM", + "base": "Iterate_VM", "context": "{8EA123A3-72BE-5B00-A22E-BEF0AFB0B68B}", "entry": { "name": "In", @@ -72502,7 +72502,7 @@ ] }, { - "key": "GetKeys", + "base": "GetKeys", "context": "{8EA123A3-72BE-5B00-A22E-BEF0AFB0B68B}", "entry": { "name": "In", @@ -72533,7 +72533,7 @@ ] }, { - "key": "Size", + "base": "Size", "context": "{8EA123A3-72BE-5B00-A22E-BEF0AFB0B68B}", "entry": { "name": "In", @@ -72564,7 +72564,7 @@ ] }, { - "key": "Erase", + "base": "Erase", "context": "{8EA123A3-72BE-5B00-A22E-BEF0AFB0B68B}", "entry": { "name": "In", @@ -72601,7 +72601,7 @@ ] }, { - "key": "EraseCheck_VM", + "base": "EraseCheck_VM", "context": "{8EA123A3-72BE-5B00-A22E-BEF0AFB0B68B}", "entry": { "name": "In", @@ -72638,7 +72638,7 @@ ] }, { - "key": "Clear", + "base": "Clear", "context": "{8EA123A3-72BE-5B00-A22E-BEF0AFB0B68B}", "entry": { "name": "In", @@ -72669,7 +72669,7 @@ ] }, { - "key": "At", + "base": "At", "context": "{8EA123A3-72BE-5B00-A22E-BEF0AFB0B68B}", "entry": { "name": "In", @@ -72706,7 +72706,7 @@ ] }, { - "key": "BucketCount", + "base": "BucketCount", "context": "{8EA123A3-72BE-5B00-A22E-BEF0AFB0B68B}", "entry": { "name": "In", @@ -72737,7 +72737,7 @@ ] }, { - "key": "Empty", + "base": "Empty", "context": "{8EA123A3-72BE-5B00-A22E-BEF0AFB0B68B}", "entry": { "name": "In", @@ -72768,7 +72768,7 @@ ] }, { - "key": "Swap", + "base": "Swap", "context": "{8EA123A3-72BE-5B00-A22E-BEF0AFB0B68B}", "entry": { "name": "In", @@ -72799,7 +72799,7 @@ ] }, { - "key": "{0E9C062F-96E1-58E9-BCE0-AB93C4C425A1}", + "base": "{0E9C062F-96E1-58E9-BCE0-AB93C4C425A1}", "context": "OnDemandReflected", "variant": "", "details": { @@ -72807,7 +72807,7 @@ }, "methods": [ { - "key": "GetError", + "base": "GetError", "context": "{0E9C062F-96E1-58E9-BCE0-AB93C4C425A1}", "entry": { "name": "In", @@ -72838,7 +72838,7 @@ ] }, { - "key": "IsSuccess", + "base": "IsSuccess", "context": "{0E9C062F-96E1-58E9-BCE0-AB93C4C425A1}", "entry": { "name": "In", @@ -72869,7 +72869,7 @@ ] }, { - "key": "Success", + "base": "Success", "context": "{0E9C062F-96E1-58E9-BCE0-AB93C4C425A1}", "entry": { "name": "In", @@ -72901,7 +72901,7 @@ ] }, { - "key": "GetValue", + "base": "GetValue", "context": "{0E9C062F-96E1-58E9-BCE0-AB93C4C425A1}", "entry": { "name": "In", @@ -72933,7 +72933,7 @@ ] }, { - "key": "Failure", + "base": "Failure", "context": "{0E9C062F-96E1-58E9-BCE0-AB93C4C425A1}", "entry": { "name": "In", @@ -72966,7 +72966,7 @@ ] }, { - "key": "{7FF36F26-644E-5051-84BB-AE54534C84D4}", + "base": "{7FF36F26-644E-5051-84BB-AE54534C84D4}", "context": "OnDemandReflected", "variant": "", "details": { @@ -72976,7 +72976,7 @@ }, "methods": [ { - "key": "Size", + "base": "Size", "context": "{7FF36F26-644E-5051-84BB-AE54534C84D4}", "entry": { "name": "In", @@ -73007,7 +73007,7 @@ ] }, { - "key": "Front", + "base": "Front", "context": "{7FF36F26-644E-5051-84BB-AE54534C84D4}", "entry": { "name": "In", @@ -73038,7 +73038,7 @@ ] }, { - "key": "HasKey", + "base": "HasKey", "context": "{7FF36F26-644E-5051-84BB-AE54534C84D4}", "entry": { "name": "In", @@ -73075,7 +73075,7 @@ ] }, { - "key": "Resize", + "base": "Resize", "context": "{7FF36F26-644E-5051-84BB-AE54534C84D4}", "entry": { "name": "In", @@ -73104,7 +73104,7 @@ ] }, { - "key": "at", + "base": "at", "context": "{7FF36F26-644E-5051-84BB-AE54534C84D4}", "entry": { "name": "In", @@ -73141,7 +73141,7 @@ ] }, { - "key": "Back", + "base": "Back", "context": "{7FF36F26-644E-5051-84BB-AE54534C84D4}", "entry": { "name": "In", @@ -73172,7 +73172,7 @@ ] }, { - "key": "pop_back", + "base": "pop_back", "context": "{7FF36F26-644E-5051-84BB-AE54534C84D4}", "entry": { "name": "In", @@ -73195,7 +73195,7 @@ ] }, { - "key": "size", + "base": "size", "context": "{7FF36F26-644E-5051-84BB-AE54534C84D4}", "entry": { "name": "In", @@ -73226,7 +73226,7 @@ ] }, { - "key": "At", + "base": "At", "context": "{7FF36F26-644E-5051-84BB-AE54534C84D4}", "entry": { "name": "In", @@ -73263,7 +73263,7 @@ ] }, { - "key": "Empty", + "base": "Empty", "context": "{7FF36F26-644E-5051-84BB-AE54534C84D4}", "entry": { "name": "In", @@ -73294,7 +73294,7 @@ ] }, { - "key": "Swap", + "base": "Swap", "context": "{7FF36F26-644E-5051-84BB-AE54534C84D4}", "entry": { "name": "In", @@ -73323,7 +73323,7 @@ ] }, { - "key": "push_back", + "base": "push_back", "context": "{7FF36F26-644E-5051-84BB-AE54534C84D4}", "entry": { "name": "In", @@ -73352,7 +73352,7 @@ ] }, { - "key": "PushBack_VM", + "base": "PushBack_VM", "context": "{7FF36F26-644E-5051-84BB-AE54534C84D4}", "entry": { "name": "In", @@ -73389,7 +73389,7 @@ ] }, { - "key": "AtUnchecked", + "base": "AtUnchecked", "context": "{7FF36F26-644E-5051-84BB-AE54534C84D4}", "entry": { "name": "In", @@ -73426,7 +73426,7 @@ ] }, { - "key": "clear", + "base": "clear", "context": "{7FF36F26-644E-5051-84BB-AE54534C84D4}", "entry": { "name": "In", @@ -73449,7 +73449,7 @@ ] }, { - "key": "NotEmpty", + "base": "NotEmpty", "context": "{7FF36F26-644E-5051-84BB-AE54534C84D4}", "entry": { "name": "In", @@ -73480,7 +73480,7 @@ ] }, { - "key": "Erase_VM", + "base": "Erase_VM", "context": "{7FF36F26-644E-5051-84BB-AE54534C84D4}", "entry": { "name": "In", @@ -73517,7 +73517,7 @@ ] }, { - "key": "EraseCheck_VM", + "base": "EraseCheck_VM", "context": "{7FF36F26-644E-5051-84BB-AE54534C84D4}", "entry": { "name": "In", @@ -73554,7 +73554,7 @@ ] }, { - "key": "Capacity", + "base": "Capacity", "context": "{7FF36F26-644E-5051-84BB-AE54534C84D4}", "entry": { "name": "In", @@ -73585,7 +73585,7 @@ ] }, { - "key": "Clear", + "base": "Clear", "context": "{7FF36F26-644E-5051-84BB-AE54534C84D4}", "entry": { "name": "In", @@ -73616,7 +73616,7 @@ ] }, { - "key": "AssignAt", + "base": "AssignAt", "context": "{7FF36F26-644E-5051-84BB-AE54534C84D4}", "entry": { "name": "In", @@ -73651,7 +73651,7 @@ ] }, { - "key": "GetSize", + "base": "GetSize", "context": "{7FF36F26-644E-5051-84BB-AE54534C84D4}", "entry": { "name": "In", @@ -73682,7 +73682,7 @@ ] }, { - "key": "Insert", + "base": "Insert", "context": "{7FF36F26-644E-5051-84BB-AE54534C84D4}", "entry": { "name": "In", @@ -73725,7 +73725,7 @@ ] }, { - "key": "PushBack", + "base": "PushBack", "context": "{7FF36F26-644E-5051-84BB-AE54534C84D4}", "entry": { "name": "In", @@ -73754,7 +73754,7 @@ ] }, { - "key": "Reserve", + "base": "Reserve", "context": "{7FF36F26-644E-5051-84BB-AE54534C84D4}", "entry": { "name": "In", @@ -73783,7 +73783,7 @@ ] }, { - "key": "Iterate_VM", + "base": "Iterate_VM", "context": "{7FF36F26-644E-5051-84BB-AE54534C84D4}", "entry": { "name": "In", @@ -73816,7 +73816,7 @@ ] }, { - "key": "{BFBA17B6-CDE2-5239-AEE0-58DF7FA14E3C}", + "base": "{BFBA17B6-CDE2-5239-AEE0-58DF7FA14E3C}", "context": "OnDemandReflected", "variant": "", "details": { @@ -73826,7 +73826,7 @@ }, "methods": [ { - "key": "Size", + "base": "Size", "context": "{BFBA17B6-CDE2-5239-AEE0-58DF7FA14E3C}", "entry": { "name": "In", @@ -73857,7 +73857,7 @@ ] }, { - "key": "Front", + "base": "Front", "context": "{BFBA17B6-CDE2-5239-AEE0-58DF7FA14E3C}", "entry": { "name": "In", @@ -73888,7 +73888,7 @@ ] }, { - "key": "HasKey", + "base": "HasKey", "context": "{BFBA17B6-CDE2-5239-AEE0-58DF7FA14E3C}", "entry": { "name": "In", @@ -73925,7 +73925,7 @@ ] }, { - "key": "Resize", + "base": "Resize", "context": "{BFBA17B6-CDE2-5239-AEE0-58DF7FA14E3C}", "entry": { "name": "In", @@ -73954,7 +73954,7 @@ ] }, { - "key": "at", + "base": "at", "context": "{BFBA17B6-CDE2-5239-AEE0-58DF7FA14E3C}", "entry": { "name": "In", @@ -73991,7 +73991,7 @@ ] }, { - "key": "Back", + "base": "Back", "context": "{BFBA17B6-CDE2-5239-AEE0-58DF7FA14E3C}", "entry": { "name": "In", @@ -74022,7 +74022,7 @@ ] }, { - "key": "pop_back", + "base": "pop_back", "context": "{BFBA17B6-CDE2-5239-AEE0-58DF7FA14E3C}", "entry": { "name": "In", @@ -74045,7 +74045,7 @@ ] }, { - "key": "size", + "base": "size", "context": "{BFBA17B6-CDE2-5239-AEE0-58DF7FA14E3C}", "entry": { "name": "In", @@ -74076,7 +74076,7 @@ ] }, { - "key": "At", + "base": "At", "context": "{BFBA17B6-CDE2-5239-AEE0-58DF7FA14E3C}", "entry": { "name": "In", @@ -74113,7 +74113,7 @@ ] }, { - "key": "Empty", + "base": "Empty", "context": "{BFBA17B6-CDE2-5239-AEE0-58DF7FA14E3C}", "entry": { "name": "In", @@ -74144,7 +74144,7 @@ ] }, { - "key": "Swap", + "base": "Swap", "context": "{BFBA17B6-CDE2-5239-AEE0-58DF7FA14E3C}", "entry": { "name": "In", @@ -74173,7 +74173,7 @@ ] }, { - "key": "push_back", + "base": "push_back", "context": "{BFBA17B6-CDE2-5239-AEE0-58DF7FA14E3C}", "entry": { "name": "In", @@ -74202,7 +74202,7 @@ ] }, { - "key": "PushBack_VM", + "base": "PushBack_VM", "context": "{BFBA17B6-CDE2-5239-AEE0-58DF7FA14E3C}", "entry": { "name": "In", @@ -74239,7 +74239,7 @@ ] }, { - "key": "AtUnchecked", + "base": "AtUnchecked", "context": "{BFBA17B6-CDE2-5239-AEE0-58DF7FA14E3C}", "entry": { "name": "In", @@ -74276,7 +74276,7 @@ ] }, { - "key": "clear", + "base": "clear", "context": "{BFBA17B6-CDE2-5239-AEE0-58DF7FA14E3C}", "entry": { "name": "In", @@ -74299,7 +74299,7 @@ ] }, { - "key": "NotEmpty", + "base": "NotEmpty", "context": "{BFBA17B6-CDE2-5239-AEE0-58DF7FA14E3C}", "entry": { "name": "In", @@ -74330,7 +74330,7 @@ ] }, { - "key": "Erase_VM", + "base": "Erase_VM", "context": "{BFBA17B6-CDE2-5239-AEE0-58DF7FA14E3C}", "entry": { "name": "In", @@ -74367,7 +74367,7 @@ ] }, { - "key": "EraseCheck_VM", + "base": "EraseCheck_VM", "context": "{BFBA17B6-CDE2-5239-AEE0-58DF7FA14E3C}", "entry": { "name": "In", @@ -74404,7 +74404,7 @@ ] }, { - "key": "Capacity", + "base": "Capacity", "context": "{BFBA17B6-CDE2-5239-AEE0-58DF7FA14E3C}", "entry": { "name": "In", @@ -74435,7 +74435,7 @@ ] }, { - "key": "Clear", + "base": "Clear", "context": "{BFBA17B6-CDE2-5239-AEE0-58DF7FA14E3C}", "entry": { "name": "In", @@ -74466,7 +74466,7 @@ ] }, { - "key": "AssignAt", + "base": "AssignAt", "context": "{BFBA17B6-CDE2-5239-AEE0-58DF7FA14E3C}", "entry": { "name": "In", @@ -74501,7 +74501,7 @@ ] }, { - "key": "GetSize", + "base": "GetSize", "context": "{BFBA17B6-CDE2-5239-AEE0-58DF7FA14E3C}", "entry": { "name": "In", @@ -74532,7 +74532,7 @@ ] }, { - "key": "Insert", + "base": "Insert", "context": "{BFBA17B6-CDE2-5239-AEE0-58DF7FA14E3C}", "entry": { "name": "In", @@ -74575,7 +74575,7 @@ ] }, { - "key": "PushBack", + "base": "PushBack", "context": "{BFBA17B6-CDE2-5239-AEE0-58DF7FA14E3C}", "entry": { "name": "In", @@ -74604,7 +74604,7 @@ ] }, { - "key": "Reserve", + "base": "Reserve", "context": "{BFBA17B6-CDE2-5239-AEE0-58DF7FA14E3C}", "entry": { "name": "In", @@ -74633,7 +74633,7 @@ ] }, { - "key": "Iterate_VM", + "base": "Iterate_VM", "context": "{BFBA17B6-CDE2-5239-AEE0-58DF7FA14E3C}", "entry": { "name": "In", @@ -74666,7 +74666,7 @@ ] }, { - "key": "{5AEF7C62-0529-57B0-859D-97C69E910729}", + "base": "{5AEF7C62-0529-57B0-859D-97C69E910729}", "context": "OnDemandReflected", "variant": "", "details": { @@ -74676,7 +74676,7 @@ }, "methods": [ { - "key": "contains", + "base": "contains", "context": "{5AEF7C62-0529-57B0-859D-97C69E910729}", "entry": { "name": "In", @@ -74713,7 +74713,7 @@ ] }, { - "key": "Insert", + "base": "Insert", "context": "{5AEF7C62-0529-57B0-859D-97C69E910729}", "entry": { "name": "In", @@ -74756,7 +74756,7 @@ ] }, { - "key": "Reserve", + "base": "Reserve", "context": "{5AEF7C62-0529-57B0-859D-97C69E910729}", "entry": { "name": "In", @@ -74785,7 +74785,7 @@ ] }, { - "key": "GetSize", + "base": "GetSize", "context": "{5AEF7C62-0529-57B0-859D-97C69E910729}", "entry": { "name": "In", @@ -74816,7 +74816,7 @@ ] }, { - "key": "Iterate_VM", + "base": "Iterate_VM", "context": "{5AEF7C62-0529-57B0-859D-97C69E910729}", "entry": { "name": "In", @@ -74847,7 +74847,7 @@ ] }, { - "key": "GetKeys", + "base": "GetKeys", "context": "{5AEF7C62-0529-57B0-859D-97C69E910729}", "entry": { "name": "In", @@ -74878,7 +74878,7 @@ ] }, { - "key": "Size", + "base": "Size", "context": "{5AEF7C62-0529-57B0-859D-97C69E910729}", "entry": { "name": "In", @@ -74909,7 +74909,7 @@ ] }, { - "key": "Erase", + "base": "Erase", "context": "{5AEF7C62-0529-57B0-859D-97C69E910729}", "entry": { "name": "In", @@ -74946,7 +74946,7 @@ ] }, { - "key": "EraseCheck_VM", + "base": "EraseCheck_VM", "context": "{5AEF7C62-0529-57B0-859D-97C69E910729}", "entry": { "name": "In", @@ -74983,7 +74983,7 @@ ] }, { - "key": "Clear", + "base": "Clear", "context": "{5AEF7C62-0529-57B0-859D-97C69E910729}", "entry": { "name": "In", @@ -75014,7 +75014,7 @@ ] }, { - "key": "At", + "base": "At", "context": "{5AEF7C62-0529-57B0-859D-97C69E910729}", "entry": { "name": "In", @@ -75051,7 +75051,7 @@ ] }, { - "key": "BucketCount", + "base": "BucketCount", "context": "{5AEF7C62-0529-57B0-859D-97C69E910729}", "entry": { "name": "In", @@ -75082,7 +75082,7 @@ ] }, { - "key": "Empty", + "base": "Empty", "context": "{5AEF7C62-0529-57B0-859D-97C69E910729}", "entry": { "name": "In", @@ -75113,7 +75113,7 @@ ] }, { - "key": "Swap", + "base": "Swap", "context": "{5AEF7C62-0529-57B0-859D-97C69E910729}", "entry": { "name": "In", @@ -75144,7 +75144,7 @@ ] }, { - "key": "{7770AD3E-BABE-5F1C-B322-DE5DEAE94974}", + "base": "{7770AD3E-BABE-5F1C-B322-DE5DEAE94974}", "context": "OnDemandReflected", "variant": "", "details": { @@ -75154,7 +75154,7 @@ }, "methods": [ { - "key": "Size", + "base": "Size", "context": "{7770AD3E-BABE-5F1C-B322-DE5DEAE94974}", "entry": { "name": "In", @@ -75185,7 +75185,7 @@ ] }, { - "key": "Front", + "base": "Front", "context": "{7770AD3E-BABE-5F1C-B322-DE5DEAE94974}", "entry": { "name": "In", @@ -75216,7 +75216,7 @@ ] }, { - "key": "HasKey", + "base": "HasKey", "context": "{7770AD3E-BABE-5F1C-B322-DE5DEAE94974}", "entry": { "name": "In", @@ -75253,7 +75253,7 @@ ] }, { - "key": "Resize", + "base": "Resize", "context": "{7770AD3E-BABE-5F1C-B322-DE5DEAE94974}", "entry": { "name": "In", @@ -75282,7 +75282,7 @@ ] }, { - "key": "at", + "base": "at", "context": "{7770AD3E-BABE-5F1C-B322-DE5DEAE94974}", "entry": { "name": "In", @@ -75319,7 +75319,7 @@ ] }, { - "key": "Back", + "base": "Back", "context": "{7770AD3E-BABE-5F1C-B322-DE5DEAE94974}", "entry": { "name": "In", @@ -75350,7 +75350,7 @@ ] }, { - "key": "pop_back", + "base": "pop_back", "context": "{7770AD3E-BABE-5F1C-B322-DE5DEAE94974}", "entry": { "name": "In", @@ -75373,7 +75373,7 @@ ] }, { - "key": "size", + "base": "size", "context": "{7770AD3E-BABE-5F1C-B322-DE5DEAE94974}", "entry": { "name": "In", @@ -75404,7 +75404,7 @@ ] }, { - "key": "At", + "base": "At", "context": "{7770AD3E-BABE-5F1C-B322-DE5DEAE94974}", "entry": { "name": "In", @@ -75441,7 +75441,7 @@ ] }, { - "key": "Empty", + "base": "Empty", "context": "{7770AD3E-BABE-5F1C-B322-DE5DEAE94974}", "entry": { "name": "In", @@ -75472,7 +75472,7 @@ ] }, { - "key": "Swap", + "base": "Swap", "context": "{7770AD3E-BABE-5F1C-B322-DE5DEAE94974}", "entry": { "name": "In", @@ -75501,7 +75501,7 @@ ] }, { - "key": "push_back", + "base": "push_back", "context": "{7770AD3E-BABE-5F1C-B322-DE5DEAE94974}", "entry": { "name": "In", @@ -75530,7 +75530,7 @@ ] }, { - "key": "PushBack_VM", + "base": "PushBack_VM", "context": "{7770AD3E-BABE-5F1C-B322-DE5DEAE94974}", "entry": { "name": "In", @@ -75567,7 +75567,7 @@ ] }, { - "key": "AtUnchecked", + "base": "AtUnchecked", "context": "{7770AD3E-BABE-5F1C-B322-DE5DEAE94974}", "entry": { "name": "In", @@ -75604,7 +75604,7 @@ ] }, { - "key": "clear", + "base": "clear", "context": "{7770AD3E-BABE-5F1C-B322-DE5DEAE94974}", "entry": { "name": "In", @@ -75627,7 +75627,7 @@ ] }, { - "key": "NotEmpty", + "base": "NotEmpty", "context": "{7770AD3E-BABE-5F1C-B322-DE5DEAE94974}", "entry": { "name": "In", @@ -75658,7 +75658,7 @@ ] }, { - "key": "Erase_VM", + "base": "Erase_VM", "context": "{7770AD3E-BABE-5F1C-B322-DE5DEAE94974}", "entry": { "name": "In", @@ -75695,7 +75695,7 @@ ] }, { - "key": "EraseCheck_VM", + "base": "EraseCheck_VM", "context": "{7770AD3E-BABE-5F1C-B322-DE5DEAE94974}", "entry": { "name": "In", @@ -75732,7 +75732,7 @@ ] }, { - "key": "Capacity", + "base": "Capacity", "context": "{7770AD3E-BABE-5F1C-B322-DE5DEAE94974}", "entry": { "name": "In", @@ -75763,7 +75763,7 @@ ] }, { - "key": "Clear", + "base": "Clear", "context": "{7770AD3E-BABE-5F1C-B322-DE5DEAE94974}", "entry": { "name": "In", @@ -75794,7 +75794,7 @@ ] }, { - "key": "AssignAt", + "base": "AssignAt", "context": "{7770AD3E-BABE-5F1C-B322-DE5DEAE94974}", "entry": { "name": "In", @@ -75829,7 +75829,7 @@ ] }, { - "key": "GetSize", + "base": "GetSize", "context": "{7770AD3E-BABE-5F1C-B322-DE5DEAE94974}", "entry": { "name": "In", @@ -75860,7 +75860,7 @@ ] }, { - "key": "Insert", + "base": "Insert", "context": "{7770AD3E-BABE-5F1C-B322-DE5DEAE94974}", "entry": { "name": "In", @@ -75903,7 +75903,7 @@ ] }, { - "key": "PushBack", + "base": "PushBack", "context": "{7770AD3E-BABE-5F1C-B322-DE5DEAE94974}", "entry": { "name": "In", @@ -75932,7 +75932,7 @@ ] }, { - "key": "Reserve", + "base": "Reserve", "context": "{7770AD3E-BABE-5F1C-B322-DE5DEAE94974}", "entry": { "name": "In", @@ -75961,7 +75961,7 @@ ] }, { - "key": "Iterate_VM", + "base": "Iterate_VM", "context": "{7770AD3E-BABE-5F1C-B322-DE5DEAE94974}", "entry": { "name": "In", @@ -75994,7 +75994,7 @@ ] }, { - "key": "{B0D91084-263A-54B9-A4F3-7C5F4240E248}", + "base": "{B0D91084-263A-54B9-A4F3-7C5F4240E248}", "context": "OnDemandReflected", "variant": "", "details": { @@ -76002,7 +76002,7 @@ }, "methods": [ { - "key": "has_value", + "base": "has_value", "context": "{B0D91084-263A-54B9-A4F3-7C5F4240E248}", "entry": { "name": "In", @@ -76033,7 +76033,7 @@ ] }, { - "key": "__bool__", + "base": "__bool__", "context": "{B0D91084-263A-54B9-A4F3-7C5F4240E248}", "entry": { "name": "In", @@ -76064,7 +76064,7 @@ ] }, { - "key": "value", + "base": "value", "context": "{B0D91084-263A-54B9-A4F3-7C5F4240E248}", "entry": { "name": "In", @@ -76095,7 +76095,7 @@ ] }, { - "key": "value_or", + "base": "value_or", "context": "{B0D91084-263A-54B9-A4F3-7C5F4240E248}", "entry": { "name": "In", @@ -76134,7 +76134,7 @@ ] }, { - "key": "{3A98C3C6-91C4-5B49-8559-1C4C9EA9BCB8}", + "base": "{3A98C3C6-91C4-5B49-8559-1C4C9EA9BCB8}", "context": "OnDemandReflected", "variant": "", "details": { @@ -76142,7 +76142,7 @@ }, "methods": [ { - "key": "Get0", + "base": "Get0", "context": "{3A98C3C6-91C4-5B49-8559-1C4C9EA9BCB8}", "entry": { "name": "In", @@ -76173,7 +76173,7 @@ ] }, { - "key": "Get1", + "base": "Get1", "context": "{3A98C3C6-91C4-5B49-8559-1C4C9EA9BCB8}", "entry": { "name": "In", @@ -76204,7 +76204,7 @@ ] }, { - "key": "GetSize", + "base": "GetSize", "context": "{3A98C3C6-91C4-5B49-8559-1C4C9EA9BCB8}", "entry": { "name": "In", @@ -76229,7 +76229,7 @@ ] }, { - "key": "{AE62FC16-F824-5FD2-90BE-1ECF60E08A7F}", + "base": "{AE62FC16-F824-5FD2-90BE-1ECF60E08A7F}", "context": "OnDemandReflected", "variant": "", "details": { @@ -76237,7 +76237,7 @@ }, "methods": [ { - "key": "GetError", + "base": "GetError", "context": "{AE62FC16-F824-5FD2-90BE-1ECF60E08A7F}", "entry": { "name": "In", @@ -76268,7 +76268,7 @@ ] }, { - "key": "IsSuccess", + "base": "IsSuccess", "context": "{AE62FC16-F824-5FD2-90BE-1ECF60E08A7F}", "entry": { "name": "In", @@ -76299,7 +76299,7 @@ ] }, { - "key": "Success", + "base": "Success", "context": "{AE62FC16-F824-5FD2-90BE-1ECF60E08A7F}", "entry": { "name": "In", @@ -76330,7 +76330,7 @@ ] }, { - "key": "GetValue", + "base": "GetValue", "context": "{AE62FC16-F824-5FD2-90BE-1ECF60E08A7F}", "entry": { "name": "In", @@ -76361,7 +76361,7 @@ ] }, { - "key": "Failure", + "base": "Failure", "context": "{AE62FC16-F824-5FD2-90BE-1ECF60E08A7F}", "entry": { "name": "In", @@ -76394,7 +76394,7 @@ ] }, { - "key": "{4B687295-2381-5741-AA96-F7441F09267B}", + "base": "{4B687295-2381-5741-AA96-F7441F09267B}", "context": "OnDemandReflected", "variant": "", "details": { @@ -76402,7 +76402,7 @@ }, "methods": [ { - "key": "GetError", + "base": "GetError", "context": "{4B687295-2381-5741-AA96-F7441F09267B}", "entry": { "name": "In", @@ -76433,7 +76433,7 @@ ] }, { - "key": "IsSuccess", + "base": "IsSuccess", "context": "{4B687295-2381-5741-AA96-F7441F09267B}", "entry": { "name": "In", @@ -76464,7 +76464,7 @@ ] }, { - "key": "Success", + "base": "Success", "context": "{4B687295-2381-5741-AA96-F7441F09267B}", "entry": { "name": "In", @@ -76495,7 +76495,7 @@ ] }, { - "key": "GetValue", + "base": "GetValue", "context": "{4B687295-2381-5741-AA96-F7441F09267B}", "entry": { "name": "In", @@ -76526,7 +76526,7 @@ ] }, { - "key": "Failure", + "base": "Failure", "context": "{4B687295-2381-5741-AA96-F7441F09267B}", "entry": { "name": "In", @@ -76559,7 +76559,7 @@ ] }, { - "key": "{BCE9535C-B250-56FE-97DF-36D4E06C6172}", + "base": "{BCE9535C-B250-56FE-97DF-36D4E06C6172}", "context": "OnDemandReflected", "variant": "", "details": { @@ -76569,7 +76569,7 @@ }, "methods": [ { - "key": "contains", + "base": "contains", "context": "{BCE9535C-B250-56FE-97DF-36D4E06C6172}", "entry": { "name": "In", @@ -76606,7 +76606,7 @@ ] }, { - "key": "Insert", + "base": "Insert", "context": "{BCE9535C-B250-56FE-97DF-36D4E06C6172}", "entry": { "name": "In", @@ -76649,7 +76649,7 @@ ] }, { - "key": "Reserve", + "base": "Reserve", "context": "{BCE9535C-B250-56FE-97DF-36D4E06C6172}", "entry": { "name": "In", @@ -76678,7 +76678,7 @@ ] }, { - "key": "GetSize", + "base": "GetSize", "context": "{BCE9535C-B250-56FE-97DF-36D4E06C6172}", "entry": { "name": "In", @@ -76709,7 +76709,7 @@ ] }, { - "key": "Iterate_VM", + "base": "Iterate_VM", "context": "{BCE9535C-B250-56FE-97DF-36D4E06C6172}", "entry": { "name": "In", @@ -76740,7 +76740,7 @@ ] }, { - "key": "GetKeys", + "base": "GetKeys", "context": "{BCE9535C-B250-56FE-97DF-36D4E06C6172}", "entry": { "name": "In", @@ -76771,7 +76771,7 @@ ] }, { - "key": "Size", + "base": "Size", "context": "{BCE9535C-B250-56FE-97DF-36D4E06C6172}", "entry": { "name": "In", @@ -76802,7 +76802,7 @@ ] }, { - "key": "Erase", + "base": "Erase", "context": "{BCE9535C-B250-56FE-97DF-36D4E06C6172}", "entry": { "name": "In", @@ -76839,7 +76839,7 @@ ] }, { - "key": "EraseCheck_VM", + "base": "EraseCheck_VM", "context": "{BCE9535C-B250-56FE-97DF-36D4E06C6172}", "entry": { "name": "In", @@ -76876,7 +76876,7 @@ ] }, { - "key": "Clear", + "base": "Clear", "context": "{BCE9535C-B250-56FE-97DF-36D4E06C6172}", "entry": { "name": "In", @@ -76907,7 +76907,7 @@ ] }, { - "key": "At", + "base": "At", "context": "{BCE9535C-B250-56FE-97DF-36D4E06C6172}", "entry": { "name": "In", @@ -76944,7 +76944,7 @@ ] }, { - "key": "BucketCount", + "base": "BucketCount", "context": "{BCE9535C-B250-56FE-97DF-36D4E06C6172}", "entry": { "name": "In", @@ -76975,7 +76975,7 @@ ] }, { - "key": "Empty", + "base": "Empty", "context": "{BCE9535C-B250-56FE-97DF-36D4E06C6172}", "entry": { "name": "In", @@ -77006,7 +77006,7 @@ ] }, { - "key": "Swap", + "base": "Swap", "context": "{BCE9535C-B250-56FE-97DF-36D4E06C6172}", "entry": { "name": "In", @@ -77037,7 +77037,7 @@ ] }, { - "key": "{401CAC93-74F8-5025-81EF-63F124BC87AF}", + "base": "{401CAC93-74F8-5025-81EF-63F124BC87AF}", "context": "OnDemandReflected", "variant": "", "details": { @@ -77047,7 +77047,7 @@ }, "methods": [ { - "key": "contains", + "base": "contains", "context": "{401CAC93-74F8-5025-81EF-63F124BC87AF}", "entry": { "name": "In", @@ -77084,7 +77084,7 @@ ] }, { - "key": "Insert", + "base": "Insert", "context": "{401CAC93-74F8-5025-81EF-63F124BC87AF}", "entry": { "name": "In", @@ -77127,7 +77127,7 @@ ] }, { - "key": "Reserve", + "base": "Reserve", "context": "{401CAC93-74F8-5025-81EF-63F124BC87AF}", "entry": { "name": "In", @@ -77156,7 +77156,7 @@ ] }, { - "key": "GetSize", + "base": "GetSize", "context": "{401CAC93-74F8-5025-81EF-63F124BC87AF}", "entry": { "name": "In", @@ -77187,7 +77187,7 @@ ] }, { - "key": "Iterate_VM", + "base": "Iterate_VM", "context": "{401CAC93-74F8-5025-81EF-63F124BC87AF}", "entry": { "name": "In", @@ -77218,7 +77218,7 @@ ] }, { - "key": "GetKeys", + "base": "GetKeys", "context": "{401CAC93-74F8-5025-81EF-63F124BC87AF}", "entry": { "name": "In", @@ -77249,7 +77249,7 @@ ] }, { - "key": "Size", + "base": "Size", "context": "{401CAC93-74F8-5025-81EF-63F124BC87AF}", "entry": { "name": "In", @@ -77280,7 +77280,7 @@ ] }, { - "key": "Erase", + "base": "Erase", "context": "{401CAC93-74F8-5025-81EF-63F124BC87AF}", "entry": { "name": "In", @@ -77317,7 +77317,7 @@ ] }, { - "key": "EraseCheck_VM", + "base": "EraseCheck_VM", "context": "{401CAC93-74F8-5025-81EF-63F124BC87AF}", "entry": { "name": "In", @@ -77354,7 +77354,7 @@ ] }, { - "key": "Clear", + "base": "Clear", "context": "{401CAC93-74F8-5025-81EF-63F124BC87AF}", "entry": { "name": "In", @@ -77385,7 +77385,7 @@ ] }, { - "key": "At", + "base": "At", "context": "{401CAC93-74F8-5025-81EF-63F124BC87AF}", "entry": { "name": "In", @@ -77422,7 +77422,7 @@ ] }, { - "key": "BucketCount", + "base": "BucketCount", "context": "{401CAC93-74F8-5025-81EF-63F124BC87AF}", "entry": { "name": "In", @@ -77453,7 +77453,7 @@ ] }, { - "key": "Empty", + "base": "Empty", "context": "{401CAC93-74F8-5025-81EF-63F124BC87AF}", "entry": { "name": "In", @@ -77484,7 +77484,7 @@ ] }, { - "key": "Swap", + "base": "Swap", "context": "{401CAC93-74F8-5025-81EF-63F124BC87AF}", "entry": { "name": "In", @@ -77515,7 +77515,7 @@ ] }, { - "key": "{16DCF0FE-97AD-54FE-8796-74CE2156240B}", + "base": "{16DCF0FE-97AD-54FE-8796-74CE2156240B}", "context": "OnDemandReflected", "variant": "", "details": { @@ -77525,7 +77525,7 @@ }, "methods": [ { - "key": "Size", + "base": "Size", "context": "{16DCF0FE-97AD-54FE-8796-74CE2156240B}", "entry": { "name": "In", @@ -77556,7 +77556,7 @@ ] }, { - "key": "Front", + "base": "Front", "context": "{16DCF0FE-97AD-54FE-8796-74CE2156240B}", "entry": { "name": "In", @@ -77587,7 +77587,7 @@ ] }, { - "key": "HasKey", + "base": "HasKey", "context": "{16DCF0FE-97AD-54FE-8796-74CE2156240B}", "entry": { "name": "In", @@ -77624,7 +77624,7 @@ ] }, { - "key": "Resize", + "base": "Resize", "context": "{16DCF0FE-97AD-54FE-8796-74CE2156240B}", "entry": { "name": "In", @@ -77653,7 +77653,7 @@ ] }, { - "key": "at", + "base": "at", "context": "{16DCF0FE-97AD-54FE-8796-74CE2156240B}", "entry": { "name": "In", @@ -77690,7 +77690,7 @@ ] }, { - "key": "Back", + "base": "Back", "context": "{16DCF0FE-97AD-54FE-8796-74CE2156240B}", "entry": { "name": "In", @@ -77721,7 +77721,7 @@ ] }, { - "key": "pop_back", + "base": "pop_back", "context": "{16DCF0FE-97AD-54FE-8796-74CE2156240B}", "entry": { "name": "In", @@ -77744,7 +77744,7 @@ ] }, { - "key": "size", + "base": "size", "context": "{16DCF0FE-97AD-54FE-8796-74CE2156240B}", "entry": { "name": "In", @@ -77775,7 +77775,7 @@ ] }, { - "key": "At", + "base": "At", "context": "{16DCF0FE-97AD-54FE-8796-74CE2156240B}", "entry": { "name": "In", @@ -77812,7 +77812,7 @@ ] }, { - "key": "Empty", + "base": "Empty", "context": "{16DCF0FE-97AD-54FE-8796-74CE2156240B}", "entry": { "name": "In", @@ -77843,7 +77843,7 @@ ] }, { - "key": "Swap", + "base": "Swap", "context": "{16DCF0FE-97AD-54FE-8796-74CE2156240B}", "entry": { "name": "In", @@ -77872,7 +77872,7 @@ ] }, { - "key": "push_back", + "base": "push_back", "context": "{16DCF0FE-97AD-54FE-8796-74CE2156240B}", "entry": { "name": "In", @@ -77901,7 +77901,7 @@ ] }, { - "key": "PushBack_VM", + "base": "PushBack_VM", "context": "{16DCF0FE-97AD-54FE-8796-74CE2156240B}", "entry": { "name": "In", @@ -77938,7 +77938,7 @@ ] }, { - "key": "AtUnchecked", + "base": "AtUnchecked", "context": "{16DCF0FE-97AD-54FE-8796-74CE2156240B}", "entry": { "name": "In", @@ -77975,7 +77975,7 @@ ] }, { - "key": "clear", + "base": "clear", "context": "{16DCF0FE-97AD-54FE-8796-74CE2156240B}", "entry": { "name": "In", @@ -77998,7 +77998,7 @@ ] }, { - "key": "NotEmpty", + "base": "NotEmpty", "context": "{16DCF0FE-97AD-54FE-8796-74CE2156240B}", "entry": { "name": "In", @@ -78029,7 +78029,7 @@ ] }, { - "key": "Erase_VM", + "base": "Erase_VM", "context": "{16DCF0FE-97AD-54FE-8796-74CE2156240B}", "entry": { "name": "In", @@ -78066,7 +78066,7 @@ ] }, { - "key": "EraseCheck_VM", + "base": "EraseCheck_VM", "context": "{16DCF0FE-97AD-54FE-8796-74CE2156240B}", "entry": { "name": "In", @@ -78103,7 +78103,7 @@ ] }, { - "key": "Capacity", + "base": "Capacity", "context": "{16DCF0FE-97AD-54FE-8796-74CE2156240B}", "entry": { "name": "In", @@ -78134,7 +78134,7 @@ ] }, { - "key": "Clear", + "base": "Clear", "context": "{16DCF0FE-97AD-54FE-8796-74CE2156240B}", "entry": { "name": "In", @@ -78165,7 +78165,7 @@ ] }, { - "key": "AssignAt", + "base": "AssignAt", "context": "{16DCF0FE-97AD-54FE-8796-74CE2156240B}", "entry": { "name": "In", @@ -78200,7 +78200,7 @@ ] }, { - "key": "GetSize", + "base": "GetSize", "context": "{16DCF0FE-97AD-54FE-8796-74CE2156240B}", "entry": { "name": "In", @@ -78231,7 +78231,7 @@ ] }, { - "key": "Insert", + "base": "Insert", "context": "{16DCF0FE-97AD-54FE-8796-74CE2156240B}", "entry": { "name": "In", @@ -78274,7 +78274,7 @@ ] }, { - "key": "PushBack", + "base": "PushBack", "context": "{16DCF0FE-97AD-54FE-8796-74CE2156240B}", "entry": { "name": "In", @@ -78303,7 +78303,7 @@ ] }, { - "key": "Reserve", + "base": "Reserve", "context": "{16DCF0FE-97AD-54FE-8796-74CE2156240B}", "entry": { "name": "In", @@ -78332,7 +78332,7 @@ ] }, { - "key": "Iterate_VM", + "base": "Iterate_VM", "context": "{16DCF0FE-97AD-54FE-8796-74CE2156240B}", "entry": { "name": "In", @@ -78365,7 +78365,7 @@ ] }, { - "key": "{4841CFF0-7A5C-519C-BD16-D3625E99605E}", + "base": "{4841CFF0-7A5C-519C-BD16-D3625E99605E}", "context": "OnDemandReflected", "variant": "", "details": { @@ -78375,7 +78375,7 @@ }, "methods": [ { - "key": "Size", + "base": "Size", "context": "{4841CFF0-7A5C-519C-BD16-D3625E99605E}", "entry": { "name": "In", @@ -78406,7 +78406,7 @@ ] }, { - "key": "Front", + "base": "Front", "context": "{4841CFF0-7A5C-519C-BD16-D3625E99605E}", "entry": { "name": "In", @@ -78438,7 +78438,7 @@ ] }, { - "key": "HasKey", + "base": "HasKey", "context": "{4841CFF0-7A5C-519C-BD16-D3625E99605E}", "entry": { "name": "In", @@ -78475,7 +78475,7 @@ ] }, { - "key": "Resize", + "base": "Resize", "context": "{4841CFF0-7A5C-519C-BD16-D3625E99605E}", "entry": { "name": "In", @@ -78504,7 +78504,7 @@ ] }, { - "key": "at", + "base": "at", "context": "{4841CFF0-7A5C-519C-BD16-D3625E99605E}", "entry": { "name": "In", @@ -78542,7 +78542,7 @@ ] }, { - "key": "Back", + "base": "Back", "context": "{4841CFF0-7A5C-519C-BD16-D3625E99605E}", "entry": { "name": "In", @@ -78574,7 +78574,7 @@ ] }, { - "key": "pop_back", + "base": "pop_back", "context": "{4841CFF0-7A5C-519C-BD16-D3625E99605E}", "entry": { "name": "In", @@ -78597,7 +78597,7 @@ ] }, { - "key": "size", + "base": "size", "context": "{4841CFF0-7A5C-519C-BD16-D3625E99605E}", "entry": { "name": "In", @@ -78628,7 +78628,7 @@ ] }, { - "key": "At", + "base": "At", "context": "{4841CFF0-7A5C-519C-BD16-D3625E99605E}", "entry": { "name": "In", @@ -78666,7 +78666,7 @@ ] }, { - "key": "Empty", + "base": "Empty", "context": "{4841CFF0-7A5C-519C-BD16-D3625E99605E}", "entry": { "name": "In", @@ -78697,7 +78697,7 @@ ] }, { - "key": "Swap", + "base": "Swap", "context": "{4841CFF0-7A5C-519C-BD16-D3625E99605E}", "entry": { "name": "In", @@ -78726,7 +78726,7 @@ ] }, { - "key": "push_back", + "base": "push_back", "context": "{4841CFF0-7A5C-519C-BD16-D3625E99605E}", "entry": { "name": "In", @@ -78756,7 +78756,7 @@ ] }, { - "key": "PushBack_VM", + "base": "PushBack_VM", "context": "{4841CFF0-7A5C-519C-BD16-D3625E99605E}", "entry": { "name": "In", @@ -78794,7 +78794,7 @@ ] }, { - "key": "AtUnchecked", + "base": "AtUnchecked", "context": "{4841CFF0-7A5C-519C-BD16-D3625E99605E}", "entry": { "name": "In", @@ -78832,7 +78832,7 @@ ] }, { - "key": "clear", + "base": "clear", "context": "{4841CFF0-7A5C-519C-BD16-D3625E99605E}", "entry": { "name": "In", @@ -78855,7 +78855,7 @@ ] }, { - "key": "NotEmpty", + "base": "NotEmpty", "context": "{4841CFF0-7A5C-519C-BD16-D3625E99605E}", "entry": { "name": "In", @@ -78886,7 +78886,7 @@ ] }, { - "key": "Erase_VM", + "base": "Erase_VM", "context": "{4841CFF0-7A5C-519C-BD16-D3625E99605E}", "entry": { "name": "In", @@ -78923,7 +78923,7 @@ ] }, { - "key": "EraseCheck_VM", + "base": "EraseCheck_VM", "context": "{4841CFF0-7A5C-519C-BD16-D3625E99605E}", "entry": { "name": "In", @@ -78960,7 +78960,7 @@ ] }, { - "key": "Capacity", + "base": "Capacity", "context": "{4841CFF0-7A5C-519C-BD16-D3625E99605E}", "entry": { "name": "In", @@ -78991,7 +78991,7 @@ ] }, { - "key": "Clear", + "base": "Clear", "context": "{4841CFF0-7A5C-519C-BD16-D3625E99605E}", "entry": { "name": "In", @@ -79022,7 +79022,7 @@ ] }, { - "key": "AssignAt", + "base": "AssignAt", "context": "{4841CFF0-7A5C-519C-BD16-D3625E99605E}", "entry": { "name": "In", @@ -79058,7 +79058,7 @@ ] }, { - "key": "GetSize", + "base": "GetSize", "context": "{4841CFF0-7A5C-519C-BD16-D3625E99605E}", "entry": { "name": "In", @@ -79089,7 +79089,7 @@ ] }, { - "key": "Insert", + "base": "Insert", "context": "{4841CFF0-7A5C-519C-BD16-D3625E99605E}", "entry": { "name": "In", @@ -79133,7 +79133,7 @@ ] }, { - "key": "PushBack", + "base": "PushBack", "context": "{4841CFF0-7A5C-519C-BD16-D3625E99605E}", "entry": { "name": "In", @@ -79163,7 +79163,7 @@ ] }, { - "key": "Reserve", + "base": "Reserve", "context": "{4841CFF0-7A5C-519C-BD16-D3625E99605E}", "entry": { "name": "In", @@ -79192,7 +79192,7 @@ ] }, { - "key": "Iterate_VM", + "base": "Iterate_VM", "context": "{4841CFF0-7A5C-519C-BD16-D3625E99605E}", "entry": { "name": "In", @@ -79225,7 +79225,7 @@ ] }, { - "key": "{5CBE5640-DF5C-5A49-9195-D790881A0747}", + "base": "{5CBE5640-DF5C-5A49-9195-D790881A0747}", "context": "OnDemandReflected", "variant": "", "details": { @@ -79235,7 +79235,7 @@ }, "methods": [ { - "key": "Size", + "base": "Size", "context": "{5CBE5640-DF5C-5A49-9195-D790881A0747}", "entry": { "name": "In", @@ -79266,7 +79266,7 @@ ] }, { - "key": "Front", + "base": "Front", "context": "{5CBE5640-DF5C-5A49-9195-D790881A0747}", "entry": { "name": "In", @@ -79297,7 +79297,7 @@ ] }, { - "key": "HasKey", + "base": "HasKey", "context": "{5CBE5640-DF5C-5A49-9195-D790881A0747}", "entry": { "name": "In", @@ -79334,7 +79334,7 @@ ] }, { - "key": "Resize", + "base": "Resize", "context": "{5CBE5640-DF5C-5A49-9195-D790881A0747}", "entry": { "name": "In", @@ -79363,7 +79363,7 @@ ] }, { - "key": "at", + "base": "at", "context": "{5CBE5640-DF5C-5A49-9195-D790881A0747}", "entry": { "name": "In", @@ -79400,7 +79400,7 @@ ] }, { - "key": "Back", + "base": "Back", "context": "{5CBE5640-DF5C-5A49-9195-D790881A0747}", "entry": { "name": "In", @@ -79431,7 +79431,7 @@ ] }, { - "key": "pop_back", + "base": "pop_back", "context": "{5CBE5640-DF5C-5A49-9195-D790881A0747}", "entry": { "name": "In", @@ -79454,7 +79454,7 @@ ] }, { - "key": "size", + "base": "size", "context": "{5CBE5640-DF5C-5A49-9195-D790881A0747}", "entry": { "name": "In", @@ -79485,7 +79485,7 @@ ] }, { - "key": "At", + "base": "At", "context": "{5CBE5640-DF5C-5A49-9195-D790881A0747}", "entry": { "name": "In", @@ -79522,7 +79522,7 @@ ] }, { - "key": "Empty", + "base": "Empty", "context": "{5CBE5640-DF5C-5A49-9195-D790881A0747}", "entry": { "name": "In", @@ -79553,7 +79553,7 @@ ] }, { - "key": "Swap", + "base": "Swap", "context": "{5CBE5640-DF5C-5A49-9195-D790881A0747}", "entry": { "name": "In", @@ -79582,7 +79582,7 @@ ] }, { - "key": "push_back", + "base": "push_back", "context": "{5CBE5640-DF5C-5A49-9195-D790881A0747}", "entry": { "name": "In", @@ -79611,7 +79611,7 @@ ] }, { - "key": "PushBack_VM", + "base": "PushBack_VM", "context": "{5CBE5640-DF5C-5A49-9195-D790881A0747}", "entry": { "name": "In", @@ -79648,7 +79648,7 @@ ] }, { - "key": "AtUnchecked", + "base": "AtUnchecked", "context": "{5CBE5640-DF5C-5A49-9195-D790881A0747}", "entry": { "name": "In", @@ -79685,7 +79685,7 @@ ] }, { - "key": "clear", + "base": "clear", "context": "{5CBE5640-DF5C-5A49-9195-D790881A0747}", "entry": { "name": "In", @@ -79708,7 +79708,7 @@ ] }, { - "key": "NotEmpty", + "base": "NotEmpty", "context": "{5CBE5640-DF5C-5A49-9195-D790881A0747}", "entry": { "name": "In", @@ -79739,7 +79739,7 @@ ] }, { - "key": "Erase_VM", + "base": "Erase_VM", "context": "{5CBE5640-DF5C-5A49-9195-D790881A0747}", "entry": { "name": "In", @@ -79776,7 +79776,7 @@ ] }, { - "key": "EraseCheck_VM", + "base": "EraseCheck_VM", "context": "{5CBE5640-DF5C-5A49-9195-D790881A0747}", "entry": { "name": "In", @@ -79813,7 +79813,7 @@ ] }, { - "key": "Capacity", + "base": "Capacity", "context": "{5CBE5640-DF5C-5A49-9195-D790881A0747}", "entry": { "name": "In", @@ -79844,7 +79844,7 @@ ] }, { - "key": "Clear", + "base": "Clear", "context": "{5CBE5640-DF5C-5A49-9195-D790881A0747}", "entry": { "name": "In", @@ -79875,7 +79875,7 @@ ] }, { - "key": "AssignAt", + "base": "AssignAt", "context": "{5CBE5640-DF5C-5A49-9195-D790881A0747}", "entry": { "name": "In", @@ -79910,7 +79910,7 @@ ] }, { - "key": "GetSize", + "base": "GetSize", "context": "{5CBE5640-DF5C-5A49-9195-D790881A0747}", "entry": { "name": "In", @@ -79941,7 +79941,7 @@ ] }, { - "key": "Insert", + "base": "Insert", "context": "{5CBE5640-DF5C-5A49-9195-D790881A0747}", "entry": { "name": "In", @@ -79984,7 +79984,7 @@ ] }, { - "key": "PushBack", + "base": "PushBack", "context": "{5CBE5640-DF5C-5A49-9195-D790881A0747}", "entry": { "name": "In", @@ -80013,7 +80013,7 @@ ] }, { - "key": "Reserve", + "base": "Reserve", "context": "{5CBE5640-DF5C-5A49-9195-D790881A0747}", "entry": { "name": "In", @@ -80042,7 +80042,7 @@ ] }, { - "key": "Iterate_VM", + "base": "Iterate_VM", "context": "{5CBE5640-DF5C-5A49-9195-D790881A0747}", "entry": { "name": "In", @@ -80075,7 +80075,7 @@ ] }, { - "key": "{8293031B-ABC3-5CD2-A1CB-1DB6792ADD5C}", + "base": "{8293031B-ABC3-5CD2-A1CB-1DB6792ADD5C}", "context": "OnDemandReflected", "variant": "", "details": { @@ -80085,7 +80085,7 @@ }, "methods": [ { - "key": "Size", + "base": "Size", "context": "{8293031B-ABC3-5CD2-A1CB-1DB6792ADD5C}", "entry": { "name": "In", @@ -80116,7 +80116,7 @@ ] }, { - "key": "Front", + "base": "Front", "context": "{8293031B-ABC3-5CD2-A1CB-1DB6792ADD5C}", "entry": { "name": "In", @@ -80147,7 +80147,7 @@ ] }, { - "key": "HasKey", + "base": "HasKey", "context": "{8293031B-ABC3-5CD2-A1CB-1DB6792ADD5C}", "entry": { "name": "In", @@ -80184,7 +80184,7 @@ ] }, { - "key": "Resize", + "base": "Resize", "context": "{8293031B-ABC3-5CD2-A1CB-1DB6792ADD5C}", "entry": { "name": "In", @@ -80213,7 +80213,7 @@ ] }, { - "key": "at", + "base": "at", "context": "{8293031B-ABC3-5CD2-A1CB-1DB6792ADD5C}", "entry": { "name": "In", @@ -80250,7 +80250,7 @@ ] }, { - "key": "Back", + "base": "Back", "context": "{8293031B-ABC3-5CD2-A1CB-1DB6792ADD5C}", "entry": { "name": "In", @@ -80281,7 +80281,7 @@ ] }, { - "key": "pop_back", + "base": "pop_back", "context": "{8293031B-ABC3-5CD2-A1CB-1DB6792ADD5C}", "entry": { "name": "In", @@ -80304,7 +80304,7 @@ ] }, { - "key": "size", + "base": "size", "context": "{8293031B-ABC3-5CD2-A1CB-1DB6792ADD5C}", "entry": { "name": "In", @@ -80335,7 +80335,7 @@ ] }, { - "key": "At", + "base": "At", "context": "{8293031B-ABC3-5CD2-A1CB-1DB6792ADD5C}", "entry": { "name": "In", @@ -80372,7 +80372,7 @@ ] }, { - "key": "Empty", + "base": "Empty", "context": "{8293031B-ABC3-5CD2-A1CB-1DB6792ADD5C}", "entry": { "name": "In", @@ -80403,7 +80403,7 @@ ] }, { - "key": "Swap", + "base": "Swap", "context": "{8293031B-ABC3-5CD2-A1CB-1DB6792ADD5C}", "entry": { "name": "In", @@ -80432,7 +80432,7 @@ ] }, { - "key": "push_back", + "base": "push_back", "context": "{8293031B-ABC3-5CD2-A1CB-1DB6792ADD5C}", "entry": { "name": "In", @@ -80461,7 +80461,7 @@ ] }, { - "key": "PushBack_VM", + "base": "PushBack_VM", "context": "{8293031B-ABC3-5CD2-A1CB-1DB6792ADD5C}", "entry": { "name": "In", @@ -80498,7 +80498,7 @@ ] }, { - "key": "AtUnchecked", + "base": "AtUnchecked", "context": "{8293031B-ABC3-5CD2-A1CB-1DB6792ADD5C}", "entry": { "name": "In", @@ -80535,7 +80535,7 @@ ] }, { - "key": "clear", + "base": "clear", "context": "{8293031B-ABC3-5CD2-A1CB-1DB6792ADD5C}", "entry": { "name": "In", @@ -80558,7 +80558,7 @@ ] }, { - "key": "NotEmpty", + "base": "NotEmpty", "context": "{8293031B-ABC3-5CD2-A1CB-1DB6792ADD5C}", "entry": { "name": "In", @@ -80589,7 +80589,7 @@ ] }, { - "key": "Erase_VM", + "base": "Erase_VM", "context": "{8293031B-ABC3-5CD2-A1CB-1DB6792ADD5C}", "entry": { "name": "In", @@ -80626,7 +80626,7 @@ ] }, { - "key": "EraseCheck_VM", + "base": "EraseCheck_VM", "context": "{8293031B-ABC3-5CD2-A1CB-1DB6792ADD5C}", "entry": { "name": "In", @@ -80663,7 +80663,7 @@ ] }, { - "key": "Capacity", + "base": "Capacity", "context": "{8293031B-ABC3-5CD2-A1CB-1DB6792ADD5C}", "entry": { "name": "In", @@ -80694,7 +80694,7 @@ ] }, { - "key": "Clear", + "base": "Clear", "context": "{8293031B-ABC3-5CD2-A1CB-1DB6792ADD5C}", "entry": { "name": "In", @@ -80725,7 +80725,7 @@ ] }, { - "key": "AssignAt", + "base": "AssignAt", "context": "{8293031B-ABC3-5CD2-A1CB-1DB6792ADD5C}", "entry": { "name": "In", @@ -80760,7 +80760,7 @@ ] }, { - "key": "GetSize", + "base": "GetSize", "context": "{8293031B-ABC3-5CD2-A1CB-1DB6792ADD5C}", "entry": { "name": "In", @@ -80791,7 +80791,7 @@ ] }, { - "key": "Insert", + "base": "Insert", "context": "{8293031B-ABC3-5CD2-A1CB-1DB6792ADD5C}", "entry": { "name": "In", @@ -80834,7 +80834,7 @@ ] }, { - "key": "PushBack", + "base": "PushBack", "context": "{8293031B-ABC3-5CD2-A1CB-1DB6792ADD5C}", "entry": { "name": "In", @@ -80863,7 +80863,7 @@ ] }, { - "key": "Reserve", + "base": "Reserve", "context": "{8293031B-ABC3-5CD2-A1CB-1DB6792ADD5C}", "entry": { "name": "In", @@ -80892,7 +80892,7 @@ ] }, { - "key": "Iterate_VM", + "base": "Iterate_VM", "context": "{8293031B-ABC3-5CD2-A1CB-1DB6792ADD5C}", "entry": { "name": "In", @@ -80925,7 +80925,7 @@ ] }, { - "key": "{A9AF6811-A281-5484-9A1B-4D036F173054}", + "base": "{A9AF6811-A281-5484-9A1B-4D036F173054}", "context": "OnDemandReflected", "variant": "", "details": { @@ -80935,7 +80935,7 @@ }, "methods": [ { - "key": "contains", + "base": "contains", "context": "{A9AF6811-A281-5484-9A1B-4D036F173054}", "entry": { "name": "In", @@ -80973,7 +80973,7 @@ ] }, { - "key": "Insert", + "base": "Insert", "context": "{A9AF6811-A281-5484-9A1B-4D036F173054}", "entry": { "name": "In", @@ -81017,7 +81017,7 @@ ] }, { - "key": "Reserve", + "base": "Reserve", "context": "{A9AF6811-A281-5484-9A1B-4D036F173054}", "entry": { "name": "In", @@ -81046,7 +81046,7 @@ ] }, { - "key": "GetSize", + "base": "GetSize", "context": "{A9AF6811-A281-5484-9A1B-4D036F173054}", "entry": { "name": "In", @@ -81077,7 +81077,7 @@ ] }, { - "key": "Iterate_VM", + "base": "Iterate_VM", "context": "{A9AF6811-A281-5484-9A1B-4D036F173054}", "entry": { "name": "In", @@ -81108,7 +81108,7 @@ ] }, { - "key": "GetKeys", + "base": "GetKeys", "context": "{A9AF6811-A281-5484-9A1B-4D036F173054}", "entry": { "name": "In", @@ -81139,7 +81139,7 @@ ] }, { - "key": "Size", + "base": "Size", "context": "{A9AF6811-A281-5484-9A1B-4D036F173054}", "entry": { "name": "In", @@ -81170,7 +81170,7 @@ ] }, { - "key": "Erase", + "base": "Erase", "context": "{A9AF6811-A281-5484-9A1B-4D036F173054}", "entry": { "name": "In", @@ -81208,7 +81208,7 @@ ] }, { - "key": "EraseCheck_VM", + "base": "EraseCheck_VM", "context": "{A9AF6811-A281-5484-9A1B-4D036F173054}", "entry": { "name": "In", @@ -81246,7 +81246,7 @@ ] }, { - "key": "Clear", + "base": "Clear", "context": "{A9AF6811-A281-5484-9A1B-4D036F173054}", "entry": { "name": "In", @@ -81277,7 +81277,7 @@ ] }, { - "key": "At", + "base": "At", "context": "{A9AF6811-A281-5484-9A1B-4D036F173054}", "entry": { "name": "In", @@ -81315,7 +81315,7 @@ ] }, { - "key": "BucketCount", + "base": "BucketCount", "context": "{A9AF6811-A281-5484-9A1B-4D036F173054}", "entry": { "name": "In", @@ -81346,7 +81346,7 @@ ] }, { - "key": "Empty", + "base": "Empty", "context": "{A9AF6811-A281-5484-9A1B-4D036F173054}", "entry": { "name": "In", @@ -81377,7 +81377,7 @@ ] }, { - "key": "Swap", + "base": "Swap", "context": "{A9AF6811-A281-5484-9A1B-4D036F173054}", "entry": { "name": "In", @@ -81408,7 +81408,7 @@ ] }, { - "key": "{3349AACD-BE04-50BC-9478-528BF2ACFD55}", + "base": "{3349AACD-BE04-50BC-9478-528BF2ACFD55}", "context": "OnDemandReflected", "variant": "", "details": { @@ -81418,7 +81418,7 @@ }, "methods": [ { - "key": "Size", + "base": "Size", "context": "{3349AACD-BE04-50BC-9478-528BF2ACFD55}", "entry": { "name": "In", @@ -81449,7 +81449,7 @@ ] }, { - "key": "Front", + "base": "Front", "context": "{3349AACD-BE04-50BC-9478-528BF2ACFD55}", "entry": { "name": "In", @@ -81480,7 +81480,7 @@ ] }, { - "key": "HasKey", + "base": "HasKey", "context": "{3349AACD-BE04-50BC-9478-528BF2ACFD55}", "entry": { "name": "In", @@ -81517,7 +81517,7 @@ ] }, { - "key": "Resize", + "base": "Resize", "context": "{3349AACD-BE04-50BC-9478-528BF2ACFD55}", "entry": { "name": "In", @@ -81546,7 +81546,7 @@ ] }, { - "key": "at", + "base": "at", "context": "{3349AACD-BE04-50BC-9478-528BF2ACFD55}", "entry": { "name": "In", @@ -81583,7 +81583,7 @@ ] }, { - "key": "Back", + "base": "Back", "context": "{3349AACD-BE04-50BC-9478-528BF2ACFD55}", "entry": { "name": "In", @@ -81614,7 +81614,7 @@ ] }, { - "key": "pop_back", + "base": "pop_back", "context": "{3349AACD-BE04-50BC-9478-528BF2ACFD55}", "entry": { "name": "In", @@ -81637,7 +81637,7 @@ ] }, { - "key": "size", + "base": "size", "context": "{3349AACD-BE04-50BC-9478-528BF2ACFD55}", "entry": { "name": "In", @@ -81668,7 +81668,7 @@ ] }, { - "key": "At", + "base": "At", "context": "{3349AACD-BE04-50BC-9478-528BF2ACFD55}", "entry": { "name": "In", @@ -81705,7 +81705,7 @@ ] }, { - "key": "Empty", + "base": "Empty", "context": "{3349AACD-BE04-50BC-9478-528BF2ACFD55}", "entry": { "name": "In", @@ -81736,7 +81736,7 @@ ] }, { - "key": "Swap", + "base": "Swap", "context": "{3349AACD-BE04-50BC-9478-528BF2ACFD55}", "entry": { "name": "In", @@ -81765,7 +81765,7 @@ ] }, { - "key": "push_back", + "base": "push_back", "context": "{3349AACD-BE04-50BC-9478-528BF2ACFD55}", "entry": { "name": "In", @@ -81794,7 +81794,7 @@ ] }, { - "key": "PushBack_VM", + "base": "PushBack_VM", "context": "{3349AACD-BE04-50BC-9478-528BF2ACFD55}", "entry": { "name": "In", @@ -81831,7 +81831,7 @@ ] }, { - "key": "AtUnchecked", + "base": "AtUnchecked", "context": "{3349AACD-BE04-50BC-9478-528BF2ACFD55}", "entry": { "name": "In", @@ -81868,7 +81868,7 @@ ] }, { - "key": "clear", + "base": "clear", "context": "{3349AACD-BE04-50BC-9478-528BF2ACFD55}", "entry": { "name": "In", @@ -81891,7 +81891,7 @@ ] }, { - "key": "NotEmpty", + "base": "NotEmpty", "context": "{3349AACD-BE04-50BC-9478-528BF2ACFD55}", "entry": { "name": "In", @@ -81922,7 +81922,7 @@ ] }, { - "key": "Erase_VM", + "base": "Erase_VM", "context": "{3349AACD-BE04-50BC-9478-528BF2ACFD55}", "entry": { "name": "In", @@ -81959,7 +81959,7 @@ ] }, { - "key": "EraseCheck_VM", + "base": "EraseCheck_VM", "context": "{3349AACD-BE04-50BC-9478-528BF2ACFD55}", "entry": { "name": "In", @@ -81996,7 +81996,7 @@ ] }, { - "key": "Capacity", + "base": "Capacity", "context": "{3349AACD-BE04-50BC-9478-528BF2ACFD55}", "entry": { "name": "In", @@ -82027,7 +82027,7 @@ ] }, { - "key": "Clear", + "base": "Clear", "context": "{3349AACD-BE04-50BC-9478-528BF2ACFD55}", "entry": { "name": "In", @@ -82058,7 +82058,7 @@ ] }, { - "key": "AssignAt", + "base": "AssignAt", "context": "{3349AACD-BE04-50BC-9478-528BF2ACFD55}", "entry": { "name": "In", @@ -82093,7 +82093,7 @@ ] }, { - "key": "GetSize", + "base": "GetSize", "context": "{3349AACD-BE04-50BC-9478-528BF2ACFD55}", "entry": { "name": "In", @@ -82124,7 +82124,7 @@ ] }, { - "key": "Insert", + "base": "Insert", "context": "{3349AACD-BE04-50BC-9478-528BF2ACFD55}", "entry": { "name": "In", @@ -82167,7 +82167,7 @@ ] }, { - "key": "PushBack", + "base": "PushBack", "context": "{3349AACD-BE04-50BC-9478-528BF2ACFD55}", "entry": { "name": "In", @@ -82196,7 +82196,7 @@ ] }, { - "key": "Reserve", + "base": "Reserve", "context": "{3349AACD-BE04-50BC-9478-528BF2ACFD55}", "entry": { "name": "In", @@ -82225,7 +82225,7 @@ ] }, { - "key": "Iterate_VM", + "base": "Iterate_VM", "context": "{3349AACD-BE04-50BC-9478-528BF2ACFD55}", "entry": { "name": "In", @@ -82258,7 +82258,7 @@ ] }, { - "key": "{C6B5A66B-6C0C-5D91-9CEE-88A5AEE507DC}", + "base": "{C6B5A66B-6C0C-5D91-9CEE-88A5AEE507DC}", "context": "OnDemandReflected", "variant": "", "details": { @@ -82268,7 +82268,7 @@ }, "methods": [ { - "key": "contains", + "base": "contains", "context": "{C6B5A66B-6C0C-5D91-9CEE-88A5AEE507DC}", "entry": { "name": "In", @@ -82305,7 +82305,7 @@ ] }, { - "key": "Insert", + "base": "Insert", "context": "{C6B5A66B-6C0C-5D91-9CEE-88A5AEE507DC}", "entry": { "name": "In", @@ -82348,7 +82348,7 @@ ] }, { - "key": "Reserve", + "base": "Reserve", "context": "{C6B5A66B-6C0C-5D91-9CEE-88A5AEE507DC}", "entry": { "name": "In", @@ -82377,7 +82377,7 @@ ] }, { - "key": "GetSize", + "base": "GetSize", "context": "{C6B5A66B-6C0C-5D91-9CEE-88A5AEE507DC}", "entry": { "name": "In", @@ -82408,7 +82408,7 @@ ] }, { - "key": "Iterate_VM", + "base": "Iterate_VM", "context": "{C6B5A66B-6C0C-5D91-9CEE-88A5AEE507DC}", "entry": { "name": "In", @@ -82439,7 +82439,7 @@ ] }, { - "key": "GetKeys", + "base": "GetKeys", "context": "{C6B5A66B-6C0C-5D91-9CEE-88A5AEE507DC}", "entry": { "name": "In", @@ -82470,7 +82470,7 @@ ] }, { - "key": "Size", + "base": "Size", "context": "{C6B5A66B-6C0C-5D91-9CEE-88A5AEE507DC}", "entry": { "name": "In", @@ -82501,7 +82501,7 @@ ] }, { - "key": "Erase", + "base": "Erase", "context": "{C6B5A66B-6C0C-5D91-9CEE-88A5AEE507DC}", "entry": { "name": "In", @@ -82538,7 +82538,7 @@ ] }, { - "key": "EraseCheck_VM", + "base": "EraseCheck_VM", "context": "{C6B5A66B-6C0C-5D91-9CEE-88A5AEE507DC}", "entry": { "name": "In", @@ -82575,7 +82575,7 @@ ] }, { - "key": "Clear", + "base": "Clear", "context": "{C6B5A66B-6C0C-5D91-9CEE-88A5AEE507DC}", "entry": { "name": "In", @@ -82606,7 +82606,7 @@ ] }, { - "key": "At", + "base": "At", "context": "{C6B5A66B-6C0C-5D91-9CEE-88A5AEE507DC}", "entry": { "name": "In", @@ -82643,7 +82643,7 @@ ] }, { - "key": "BucketCount", + "base": "BucketCount", "context": "{C6B5A66B-6C0C-5D91-9CEE-88A5AEE507DC}", "entry": { "name": "In", @@ -82674,7 +82674,7 @@ ] }, { - "key": "Empty", + "base": "Empty", "context": "{C6B5A66B-6C0C-5D91-9CEE-88A5AEE507DC}", "entry": { "name": "In", @@ -82705,7 +82705,7 @@ ] }, { - "key": "Swap", + "base": "Swap", "context": "{C6B5A66B-6C0C-5D91-9CEE-88A5AEE507DC}", "entry": { "name": "In", @@ -82736,7 +82736,7 @@ ] }, { - "key": "{2B02AB33-C406-5E1C-9416-740FD3BD03A1}", + "base": "{2B02AB33-C406-5E1C-9416-740FD3BD03A1}", "context": "OnDemandReflected", "variant": "", "details": { @@ -82746,7 +82746,7 @@ }, "methods": [ { - "key": "contains", + "base": "contains", "context": "{2B02AB33-C406-5E1C-9416-740FD3BD03A1}", "entry": { "name": "In", @@ -82783,7 +82783,7 @@ ] }, { - "key": "Insert", + "base": "Insert", "context": "{2B02AB33-C406-5E1C-9416-740FD3BD03A1}", "entry": { "name": "In", @@ -82827,7 +82827,7 @@ ] }, { - "key": "Reserve", + "base": "Reserve", "context": "{2B02AB33-C406-5E1C-9416-740FD3BD03A1}", "entry": { "name": "In", @@ -82856,7 +82856,7 @@ ] }, { - "key": "GetSize", + "base": "GetSize", "context": "{2B02AB33-C406-5E1C-9416-740FD3BD03A1}", "entry": { "name": "In", @@ -82887,7 +82887,7 @@ ] }, { - "key": "Iterate_VM", + "base": "Iterate_VM", "context": "{2B02AB33-C406-5E1C-9416-740FD3BD03A1}", "entry": { "name": "In", @@ -82918,7 +82918,7 @@ ] }, { - "key": "GetKeys", + "base": "GetKeys", "context": "{2B02AB33-C406-5E1C-9416-740FD3BD03A1}", "entry": { "name": "In", @@ -82949,7 +82949,7 @@ ] }, { - "key": "Size", + "base": "Size", "context": "{2B02AB33-C406-5E1C-9416-740FD3BD03A1}", "entry": { "name": "In", @@ -82980,7 +82980,7 @@ ] }, { - "key": "Erase", + "base": "Erase", "context": "{2B02AB33-C406-5E1C-9416-740FD3BD03A1}", "entry": { "name": "In", @@ -83017,7 +83017,7 @@ ] }, { - "key": "EraseCheck_VM", + "base": "EraseCheck_VM", "context": "{2B02AB33-C406-5E1C-9416-740FD3BD03A1}", "entry": { "name": "In", @@ -83054,7 +83054,7 @@ ] }, { - "key": "Clear", + "base": "Clear", "context": "{2B02AB33-C406-5E1C-9416-740FD3BD03A1}", "entry": { "name": "In", @@ -83085,7 +83085,7 @@ ] }, { - "key": "At", + "base": "At", "context": "{2B02AB33-C406-5E1C-9416-740FD3BD03A1}", "entry": { "name": "In", @@ -83123,7 +83123,7 @@ ] }, { - "key": "BucketCount", + "base": "BucketCount", "context": "{2B02AB33-C406-5E1C-9416-740FD3BD03A1}", "entry": { "name": "In", @@ -83154,7 +83154,7 @@ ] }, { - "key": "Empty", + "base": "Empty", "context": "{2B02AB33-C406-5E1C-9416-740FD3BD03A1}", "entry": { "name": "In", @@ -83185,7 +83185,7 @@ ] }, { - "key": "Swap", + "base": "Swap", "context": "{2B02AB33-C406-5E1C-9416-740FD3BD03A1}", "entry": { "name": "In", @@ -83216,7 +83216,7 @@ ] }, { - "key": "{53C0CD3E-D0FC-5D90-9E9B-EF364D430B08}", + "base": "{53C0CD3E-D0FC-5D90-9E9B-EF364D430B08}", "context": "OnDemandReflected", "variant": "", "details": { @@ -83224,7 +83224,7 @@ }, "methods": [ { - "key": "Get0", + "base": "Get0", "context": "{53C0CD3E-D0FC-5D90-9E9B-EF364D430B08}", "entry": { "name": "In", @@ -83255,7 +83255,7 @@ ] }, { - "key": "Get1", + "base": "Get1", "context": "{53C0CD3E-D0FC-5D90-9E9B-EF364D430B08}", "entry": { "name": "In", @@ -83286,7 +83286,7 @@ ] }, { - "key": "GetSize", + "base": "GetSize", "context": "{53C0CD3E-D0FC-5D90-9E9B-EF364D430B08}", "entry": { "name": "In", @@ -83311,7 +83311,7 @@ ] }, { - "key": "{F2C799DF-2CC1-4DD8-91DC-18C2D517BAB0}", + "base": "{F2C799DF-2CC1-4DD8-91DC-18C2D517BAB0}", "context": "OnDemandReflected", "variant": "", "details": { @@ -83319,7 +83319,7 @@ }, "methods": [ { - "key": "GetPlaneEquationCoefficients", + "base": "GetPlaneEquationCoefficients", "context": "{F2C799DF-2CC1-4DD8-91DC-18C2D517BAB0}", "entry": { "name": "In", @@ -83350,7 +83350,7 @@ ] }, { - "key": "GetDistance", + "base": "GetDistance", "context": "{F2C799DF-2CC1-4DD8-91DC-18C2D517BAB0}", "entry": { "name": "In", @@ -83381,7 +83381,7 @@ ] }, { - "key": "Project", + "base": "Project", "context": "{F2C799DF-2CC1-4DD8-91DC-18C2D517BAB0}", "entry": { "name": "In", @@ -83418,7 +83418,7 @@ ] }, { - "key": "FromNormalAndPoint", + "base": "FromNormalAndPoint", "context": "{F2C799DF-2CC1-4DD8-91DC-18C2D517BAB0}", "entry": { "name": "In", @@ -83455,7 +83455,7 @@ ] }, { - "key": "IsFinite", + "base": "IsFinite", "context": "{F2C799DF-2CC1-4DD8-91DC-18C2D517BAB0}", "entry": { "name": "In", @@ -83486,7 +83486,7 @@ ] }, { - "key": "Transform", + "base": "Transform", "context": "{F2C799DF-2CC1-4DD8-91DC-18C2D517BAB0}", "entry": { "name": "In", @@ -83523,7 +83523,7 @@ ] }, { - "key": "DistanceToPoint", + "base": "DistanceToPoint", "context": "{F2C799DF-2CC1-4DD8-91DC-18C2D517BAB0}", "entry": { "name": "In", @@ -83560,7 +83560,7 @@ ] }, { - "key": "FromCoefficients", + "base": "FromCoefficients", "context": "{F2C799DF-2CC1-4DD8-91DC-18C2D517BAB0}", "entry": { "name": "In", @@ -83609,7 +83609,7 @@ ] }, { - "key": "FromNormalAndDistance", + "base": "FromNormalAndDistance", "context": "{F2C799DF-2CC1-4DD8-91DC-18C2D517BAB0}", "entry": { "name": "In", @@ -83646,7 +83646,7 @@ ] }, { - "key": "GetNormal", + "base": "GetNormal", "context": "{F2C799DF-2CC1-4DD8-91DC-18C2D517BAB0}", "entry": { "name": "In", @@ -83679,7 +83679,7 @@ ] }, { - "key": "{24BA43F8-220C-589A-AA28-EAF5949C48F3}", + "base": "{24BA43F8-220C-589A-AA28-EAF5949C48F3}", "context": "OnDemandReflected", "variant": "", "details": { @@ -83689,7 +83689,7 @@ }, "methods": [ { - "key": "contains", + "base": "contains", "context": "{24BA43F8-220C-589A-AA28-EAF5949C48F3}", "entry": { "name": "In", @@ -83726,7 +83726,7 @@ ] }, { - "key": "Insert", + "base": "Insert", "context": "{24BA43F8-220C-589A-AA28-EAF5949C48F3}", "entry": { "name": "In", @@ -83769,7 +83769,7 @@ ] }, { - "key": "Reserve", + "base": "Reserve", "context": "{24BA43F8-220C-589A-AA28-EAF5949C48F3}", "entry": { "name": "In", @@ -83798,7 +83798,7 @@ ] }, { - "key": "GetSize", + "base": "GetSize", "context": "{24BA43F8-220C-589A-AA28-EAF5949C48F3}", "entry": { "name": "In", @@ -83829,7 +83829,7 @@ ] }, { - "key": "Iterate_VM", + "base": "Iterate_VM", "context": "{24BA43F8-220C-589A-AA28-EAF5949C48F3}", "entry": { "name": "In", @@ -83860,7 +83860,7 @@ ] }, { - "key": "GetKeys", + "base": "GetKeys", "context": "{24BA43F8-220C-589A-AA28-EAF5949C48F3}", "entry": { "name": "In", @@ -83891,7 +83891,7 @@ ] }, { - "key": "Size", + "base": "Size", "context": "{24BA43F8-220C-589A-AA28-EAF5949C48F3}", "entry": { "name": "In", @@ -83922,7 +83922,7 @@ ] }, { - "key": "Erase", + "base": "Erase", "context": "{24BA43F8-220C-589A-AA28-EAF5949C48F3}", "entry": { "name": "In", @@ -83959,7 +83959,7 @@ ] }, { - "key": "EraseCheck_VM", + "base": "EraseCheck_VM", "context": "{24BA43F8-220C-589A-AA28-EAF5949C48F3}", "entry": { "name": "In", @@ -83996,7 +83996,7 @@ ] }, { - "key": "Clear", + "base": "Clear", "context": "{24BA43F8-220C-589A-AA28-EAF5949C48F3}", "entry": { "name": "In", @@ -84027,7 +84027,7 @@ ] }, { - "key": "At", + "base": "At", "context": "{24BA43F8-220C-589A-AA28-EAF5949C48F3}", "entry": { "name": "In", @@ -84064,7 +84064,7 @@ ] }, { - "key": "BucketCount", + "base": "BucketCount", "context": "{24BA43F8-220C-589A-AA28-EAF5949C48F3}", "entry": { "name": "In", @@ -84095,7 +84095,7 @@ ] }, { - "key": "Empty", + "base": "Empty", "context": "{24BA43F8-220C-589A-AA28-EAF5949C48F3}", "entry": { "name": "In", @@ -84126,7 +84126,7 @@ ] }, { - "key": "Swap", + "base": "Swap", "context": "{24BA43F8-220C-589A-AA28-EAF5949C48F3}", "entry": { "name": "In", @@ -84157,7 +84157,7 @@ ] }, { - "key": "{13D041F6-75FA-5093-AD85-827A2CEA1646}", + "base": "{13D041F6-75FA-5093-AD85-827A2CEA1646}", "context": "OnDemandReflected", "variant": "", "details": { @@ -84167,7 +84167,7 @@ }, "methods": [ { - "key": "Size", + "base": "Size", "context": "{13D041F6-75FA-5093-AD85-827A2CEA1646}", "entry": { "name": "In", @@ -84198,7 +84198,7 @@ ] }, { - "key": "Front", + "base": "Front", "context": "{13D041F6-75FA-5093-AD85-827A2CEA1646}", "entry": { "name": "In", @@ -84229,7 +84229,7 @@ ] }, { - "key": "HasKey", + "base": "HasKey", "context": "{13D041F6-75FA-5093-AD85-827A2CEA1646}", "entry": { "name": "In", @@ -84266,7 +84266,7 @@ ] }, { - "key": "Resize", + "base": "Resize", "context": "{13D041F6-75FA-5093-AD85-827A2CEA1646}", "entry": { "name": "In", @@ -84295,7 +84295,7 @@ ] }, { - "key": "at", + "base": "at", "context": "{13D041F6-75FA-5093-AD85-827A2CEA1646}", "entry": { "name": "In", @@ -84332,7 +84332,7 @@ ] }, { - "key": "Back", + "base": "Back", "context": "{13D041F6-75FA-5093-AD85-827A2CEA1646}", "entry": { "name": "In", @@ -84363,7 +84363,7 @@ ] }, { - "key": "pop_back", + "base": "pop_back", "context": "{13D041F6-75FA-5093-AD85-827A2CEA1646}", "entry": { "name": "In", @@ -84386,7 +84386,7 @@ ] }, { - "key": "size", + "base": "size", "context": "{13D041F6-75FA-5093-AD85-827A2CEA1646}", "entry": { "name": "In", @@ -84417,7 +84417,7 @@ ] }, { - "key": "At", + "base": "At", "context": "{13D041F6-75FA-5093-AD85-827A2CEA1646}", "entry": { "name": "In", @@ -84454,7 +84454,7 @@ ] }, { - "key": "Empty", + "base": "Empty", "context": "{13D041F6-75FA-5093-AD85-827A2CEA1646}", "entry": { "name": "In", @@ -84485,7 +84485,7 @@ ] }, { - "key": "Swap", + "base": "Swap", "context": "{13D041F6-75FA-5093-AD85-827A2CEA1646}", "entry": { "name": "In", @@ -84514,7 +84514,7 @@ ] }, { - "key": "push_back", + "base": "push_back", "context": "{13D041F6-75FA-5093-AD85-827A2CEA1646}", "entry": { "name": "In", @@ -84543,7 +84543,7 @@ ] }, { - "key": "PushBack_VM", + "base": "PushBack_VM", "context": "{13D041F6-75FA-5093-AD85-827A2CEA1646}", "entry": { "name": "In", @@ -84580,7 +84580,7 @@ ] }, { - "key": "AtUnchecked", + "base": "AtUnchecked", "context": "{13D041F6-75FA-5093-AD85-827A2CEA1646}", "entry": { "name": "In", @@ -84617,7 +84617,7 @@ ] }, { - "key": "clear", + "base": "clear", "context": "{13D041F6-75FA-5093-AD85-827A2CEA1646}", "entry": { "name": "In", @@ -84640,7 +84640,7 @@ ] }, { - "key": "NotEmpty", + "base": "NotEmpty", "context": "{13D041F6-75FA-5093-AD85-827A2CEA1646}", "entry": { "name": "In", @@ -84671,7 +84671,7 @@ ] }, { - "key": "Erase_VM", + "base": "Erase_VM", "context": "{13D041F6-75FA-5093-AD85-827A2CEA1646}", "entry": { "name": "In", @@ -84708,7 +84708,7 @@ ] }, { - "key": "EraseCheck_VM", + "base": "EraseCheck_VM", "context": "{13D041F6-75FA-5093-AD85-827A2CEA1646}", "entry": { "name": "In", @@ -84745,7 +84745,7 @@ ] }, { - "key": "Capacity", + "base": "Capacity", "context": "{13D041F6-75FA-5093-AD85-827A2CEA1646}", "entry": { "name": "In", @@ -84776,7 +84776,7 @@ ] }, { - "key": "Clear", + "base": "Clear", "context": "{13D041F6-75FA-5093-AD85-827A2CEA1646}", "entry": { "name": "In", @@ -84807,7 +84807,7 @@ ] }, { - "key": "AssignAt", + "base": "AssignAt", "context": "{13D041F6-75FA-5093-AD85-827A2CEA1646}", "entry": { "name": "In", @@ -84842,7 +84842,7 @@ ] }, { - "key": "GetSize", + "base": "GetSize", "context": "{13D041F6-75FA-5093-AD85-827A2CEA1646}", "entry": { "name": "In", @@ -84873,7 +84873,7 @@ ] }, { - "key": "Insert", + "base": "Insert", "context": "{13D041F6-75FA-5093-AD85-827A2CEA1646}", "entry": { "name": "In", @@ -84916,7 +84916,7 @@ ] }, { - "key": "PushBack", + "base": "PushBack", "context": "{13D041F6-75FA-5093-AD85-827A2CEA1646}", "entry": { "name": "In", @@ -84945,7 +84945,7 @@ ] }, { - "key": "Reserve", + "base": "Reserve", "context": "{13D041F6-75FA-5093-AD85-827A2CEA1646}", "entry": { "name": "In", @@ -84974,7 +84974,7 @@ ] }, { - "key": "Iterate_VM", + "base": "Iterate_VM", "context": "{13D041F6-75FA-5093-AD85-827A2CEA1646}", "entry": { "name": "In", @@ -85007,7 +85007,7 @@ ] }, { - "key": "{3127F618-4C25-512D-97E2-888640B6303D}", + "base": "{3127F618-4C25-512D-97E2-888640B6303D}", "context": "OnDemandReflected", "variant": "", "details": { @@ -85017,7 +85017,7 @@ }, "methods": [ { - "key": "contains", + "base": "contains", "context": "{3127F618-4C25-512D-97E2-888640B6303D}", "entry": { "name": "In", @@ -85054,7 +85054,7 @@ ] }, { - "key": "Insert", + "base": "Insert", "context": "{3127F618-4C25-512D-97E2-888640B6303D}", "entry": { "name": "In", @@ -85098,7 +85098,7 @@ ] }, { - "key": "Reserve", + "base": "Reserve", "context": "{3127F618-4C25-512D-97E2-888640B6303D}", "entry": { "name": "In", @@ -85127,7 +85127,7 @@ ] }, { - "key": "GetSize", + "base": "GetSize", "context": "{3127F618-4C25-512D-97E2-888640B6303D}", "entry": { "name": "In", @@ -85158,7 +85158,7 @@ ] }, { - "key": "Iterate_VM", + "base": "Iterate_VM", "context": "{3127F618-4C25-512D-97E2-888640B6303D}", "entry": { "name": "In", @@ -85189,7 +85189,7 @@ ] }, { - "key": "GetKeys", + "base": "GetKeys", "context": "{3127F618-4C25-512D-97E2-888640B6303D}", "entry": { "name": "In", @@ -85220,7 +85220,7 @@ ] }, { - "key": "Size", + "base": "Size", "context": "{3127F618-4C25-512D-97E2-888640B6303D}", "entry": { "name": "In", @@ -85251,7 +85251,7 @@ ] }, { - "key": "Erase", + "base": "Erase", "context": "{3127F618-4C25-512D-97E2-888640B6303D}", "entry": { "name": "In", @@ -85288,7 +85288,7 @@ ] }, { - "key": "EraseCheck_VM", + "base": "EraseCheck_VM", "context": "{3127F618-4C25-512D-97E2-888640B6303D}", "entry": { "name": "In", @@ -85325,7 +85325,7 @@ ] }, { - "key": "Clear", + "base": "Clear", "context": "{3127F618-4C25-512D-97E2-888640B6303D}", "entry": { "name": "In", @@ -85356,7 +85356,7 @@ ] }, { - "key": "At", + "base": "At", "context": "{3127F618-4C25-512D-97E2-888640B6303D}", "entry": { "name": "In", @@ -85394,7 +85394,7 @@ ] }, { - "key": "BucketCount", + "base": "BucketCount", "context": "{3127F618-4C25-512D-97E2-888640B6303D}", "entry": { "name": "In", @@ -85425,7 +85425,7 @@ ] }, { - "key": "Empty", + "base": "Empty", "context": "{3127F618-4C25-512D-97E2-888640B6303D}", "entry": { "name": "In", @@ -85456,7 +85456,7 @@ ] }, { - "key": "Swap", + "base": "Swap", "context": "{3127F618-4C25-512D-97E2-888640B6303D}", "entry": { "name": "In", @@ -85487,7 +85487,7 @@ ] }, { - "key": "{EC31903C-334D-5991-99E1-6B9A94A31423}", + "base": "{EC31903C-334D-5991-99E1-6B9A94A31423}", "context": "OnDemandReflected", "variant": "", "details": { @@ -85497,7 +85497,7 @@ }, "methods": [ { - "key": "contains", + "base": "contains", "context": "{EC31903C-334D-5991-99E1-6B9A94A31423}", "entry": { "name": "In", @@ -85534,7 +85534,7 @@ ] }, { - "key": "Insert", + "base": "Insert", "context": "{EC31903C-334D-5991-99E1-6B9A94A31423}", "entry": { "name": "In", @@ -85577,7 +85577,7 @@ ] }, { - "key": "Reserve", + "base": "Reserve", "context": "{EC31903C-334D-5991-99E1-6B9A94A31423}", "entry": { "name": "In", @@ -85606,7 +85606,7 @@ ] }, { - "key": "GetSize", + "base": "GetSize", "context": "{EC31903C-334D-5991-99E1-6B9A94A31423}", "entry": { "name": "In", @@ -85637,7 +85637,7 @@ ] }, { - "key": "Iterate_VM", + "base": "Iterate_VM", "context": "{EC31903C-334D-5991-99E1-6B9A94A31423}", "entry": { "name": "In", @@ -85668,7 +85668,7 @@ ] }, { - "key": "GetKeys", + "base": "GetKeys", "context": "{EC31903C-334D-5991-99E1-6B9A94A31423}", "entry": { "name": "In", @@ -85699,7 +85699,7 @@ ] }, { - "key": "Size", + "base": "Size", "context": "{EC31903C-334D-5991-99E1-6B9A94A31423}", "entry": { "name": "In", @@ -85730,7 +85730,7 @@ ] }, { - "key": "Erase", + "base": "Erase", "context": "{EC31903C-334D-5991-99E1-6B9A94A31423}", "entry": { "name": "In", @@ -85767,7 +85767,7 @@ ] }, { - "key": "EraseCheck_VM", + "base": "EraseCheck_VM", "context": "{EC31903C-334D-5991-99E1-6B9A94A31423}", "entry": { "name": "In", @@ -85804,7 +85804,7 @@ ] }, { - "key": "Clear", + "base": "Clear", "context": "{EC31903C-334D-5991-99E1-6B9A94A31423}", "entry": { "name": "In", @@ -85835,7 +85835,7 @@ ] }, { - "key": "At", + "base": "At", "context": "{EC31903C-334D-5991-99E1-6B9A94A31423}", "entry": { "name": "In", @@ -85872,7 +85872,7 @@ ] }, { - "key": "BucketCount", + "base": "BucketCount", "context": "{EC31903C-334D-5991-99E1-6B9A94A31423}", "entry": { "name": "In", @@ -85903,7 +85903,7 @@ ] }, { - "key": "Empty", + "base": "Empty", "context": "{EC31903C-334D-5991-99E1-6B9A94A31423}", "entry": { "name": "In", @@ -85934,7 +85934,7 @@ ] }, { - "key": "Swap", + "base": "Swap", "context": "{EC31903C-334D-5991-99E1-6B9A94A31423}", "entry": { "name": "In", @@ -85965,7 +85965,7 @@ ] }, { - "key": "{F31AA4C4-5A73-510B-BFD3-20ACE0D9CE67}", + "base": "{F31AA4C4-5A73-510B-BFD3-20ACE0D9CE67}", "context": "OnDemandReflected", "variant": "", "details": { @@ -85973,7 +85973,7 @@ }, "methods": [ { - "key": "Get0", + "base": "Get0", "context": "{F31AA4C4-5A73-510B-BFD3-20ACE0D9CE67}", "entry": { "name": "In", @@ -86004,7 +86004,7 @@ ] }, { - "key": "Get1", + "base": "Get1", "context": "{F31AA4C4-5A73-510B-BFD3-20ACE0D9CE67}", "entry": { "name": "In", @@ -86035,7 +86035,7 @@ ] }, { - "key": "GetSize", + "base": "GetSize", "context": "{F31AA4C4-5A73-510B-BFD3-20ACE0D9CE67}", "entry": { "name": "In", @@ -86060,7 +86060,7 @@ ] }, { - "key": "{5FF88453-CF6E-5859-BF56-4F29CCBD73D4}", + "base": "{5FF88453-CF6E-5859-BF56-4F29CCBD73D4}", "context": "OnDemandReflected", "variant": "", "details": { @@ -86070,7 +86070,7 @@ }, "methods": [ { - "key": "contains", + "base": "contains", "context": "{5FF88453-CF6E-5859-BF56-4F29CCBD73D4}", "entry": { "name": "In", @@ -86107,7 +86107,7 @@ ] }, { - "key": "Insert", + "base": "Insert", "context": "{5FF88453-CF6E-5859-BF56-4F29CCBD73D4}", "entry": { "name": "In", @@ -86150,7 +86150,7 @@ ] }, { - "key": "Reserve", + "base": "Reserve", "context": "{5FF88453-CF6E-5859-BF56-4F29CCBD73D4}", "entry": { "name": "In", @@ -86179,7 +86179,7 @@ ] }, { - "key": "GetSize", + "base": "GetSize", "context": "{5FF88453-CF6E-5859-BF56-4F29CCBD73D4}", "entry": { "name": "In", @@ -86210,7 +86210,7 @@ ] }, { - "key": "Iterate_VM", + "base": "Iterate_VM", "context": "{5FF88453-CF6E-5859-BF56-4F29CCBD73D4}", "entry": { "name": "In", @@ -86241,7 +86241,7 @@ ] }, { - "key": "GetKeys", + "base": "GetKeys", "context": "{5FF88453-CF6E-5859-BF56-4F29CCBD73D4}", "entry": { "name": "In", @@ -86272,7 +86272,7 @@ ] }, { - "key": "Size", + "base": "Size", "context": "{5FF88453-CF6E-5859-BF56-4F29CCBD73D4}", "entry": { "name": "In", @@ -86303,7 +86303,7 @@ ] }, { - "key": "Erase", + "base": "Erase", "context": "{5FF88453-CF6E-5859-BF56-4F29CCBD73D4}", "entry": { "name": "In", @@ -86340,7 +86340,7 @@ ] }, { - "key": "EraseCheck_VM", + "base": "EraseCheck_VM", "context": "{5FF88453-CF6E-5859-BF56-4F29CCBD73D4}", "entry": { "name": "In", @@ -86377,7 +86377,7 @@ ] }, { - "key": "Clear", + "base": "Clear", "context": "{5FF88453-CF6E-5859-BF56-4F29CCBD73D4}", "entry": { "name": "In", @@ -86408,7 +86408,7 @@ ] }, { - "key": "At", + "base": "At", "context": "{5FF88453-CF6E-5859-BF56-4F29CCBD73D4}", "entry": { "name": "In", @@ -86445,7 +86445,7 @@ ] }, { - "key": "BucketCount", + "base": "BucketCount", "context": "{5FF88453-CF6E-5859-BF56-4F29CCBD73D4}", "entry": { "name": "In", @@ -86476,7 +86476,7 @@ ] }, { - "key": "Empty", + "base": "Empty", "context": "{5FF88453-CF6E-5859-BF56-4F29CCBD73D4}", "entry": { "name": "In", @@ -86507,7 +86507,7 @@ ] }, { - "key": "Swap", + "base": "Swap", "context": "{5FF88453-CF6E-5859-BF56-4F29CCBD73D4}", "entry": { "name": "In", @@ -86538,7 +86538,7 @@ ] }, { - "key": "{E1CD6BDA-AB0E-5B5A-8DDA-AFEF7A94FD06}", + "base": "{E1CD6BDA-AB0E-5B5A-8DDA-AFEF7A94FD06}", "context": "OnDemandReflected", "variant": "", "details": { @@ -86548,7 +86548,7 @@ }, "methods": [ { - "key": "contains", + "base": "contains", "context": "{E1CD6BDA-AB0E-5B5A-8DDA-AFEF7A94FD06}", "entry": { "name": "In", @@ -86585,7 +86585,7 @@ ] }, { - "key": "Insert", + "base": "Insert", "context": "{E1CD6BDA-AB0E-5B5A-8DDA-AFEF7A94FD06}", "entry": { "name": "In", @@ -86628,7 +86628,7 @@ ] }, { - "key": "Reserve", + "base": "Reserve", "context": "{E1CD6BDA-AB0E-5B5A-8DDA-AFEF7A94FD06}", "entry": { "name": "In", @@ -86657,7 +86657,7 @@ ] }, { - "key": "GetSize", + "base": "GetSize", "context": "{E1CD6BDA-AB0E-5B5A-8DDA-AFEF7A94FD06}", "entry": { "name": "In", @@ -86688,7 +86688,7 @@ ] }, { - "key": "Iterate_VM", + "base": "Iterate_VM", "context": "{E1CD6BDA-AB0E-5B5A-8DDA-AFEF7A94FD06}", "entry": { "name": "In", @@ -86719,7 +86719,7 @@ ] }, { - "key": "GetKeys", + "base": "GetKeys", "context": "{E1CD6BDA-AB0E-5B5A-8DDA-AFEF7A94FD06}", "entry": { "name": "In", @@ -86750,7 +86750,7 @@ ] }, { - "key": "Size", + "base": "Size", "context": "{E1CD6BDA-AB0E-5B5A-8DDA-AFEF7A94FD06}", "entry": { "name": "In", @@ -86781,7 +86781,7 @@ ] }, { - "key": "Erase", + "base": "Erase", "context": "{E1CD6BDA-AB0E-5B5A-8DDA-AFEF7A94FD06}", "entry": { "name": "In", @@ -86818,7 +86818,7 @@ ] }, { - "key": "EraseCheck_VM", + "base": "EraseCheck_VM", "context": "{E1CD6BDA-AB0E-5B5A-8DDA-AFEF7A94FD06}", "entry": { "name": "In", @@ -86855,7 +86855,7 @@ ] }, { - "key": "Clear", + "base": "Clear", "context": "{E1CD6BDA-AB0E-5B5A-8DDA-AFEF7A94FD06}", "entry": { "name": "In", @@ -86886,7 +86886,7 @@ ] }, { - "key": "At", + "base": "At", "context": "{E1CD6BDA-AB0E-5B5A-8DDA-AFEF7A94FD06}", "entry": { "name": "In", @@ -86923,7 +86923,7 @@ ] }, { - "key": "BucketCount", + "base": "BucketCount", "context": "{E1CD6BDA-AB0E-5B5A-8DDA-AFEF7A94FD06}", "entry": { "name": "In", @@ -86954,7 +86954,7 @@ ] }, { - "key": "Empty", + "base": "Empty", "context": "{E1CD6BDA-AB0E-5B5A-8DDA-AFEF7A94FD06}", "entry": { "name": "In", @@ -86985,7 +86985,7 @@ ] }, { - "key": "Swap", + "base": "Swap", "context": "{E1CD6BDA-AB0E-5B5A-8DDA-AFEF7A94FD06}", "entry": { "name": "In", @@ -87016,7 +87016,7 @@ ] }, { - "key": "{C3B16018-28FB-5CFE-B871-25B6E2F0B110}", + "base": "{C3B16018-28FB-5CFE-B871-25B6E2F0B110}", "context": "OnDemandReflected", "variant": "", "details": { @@ -87024,7 +87024,7 @@ }, "methods": [ { - "key": "IsLoading", + "base": "IsLoading", "context": "{C3B16018-28FB-5CFE-B871-25B6E2F0B110}", "entry": { "name": "In", @@ -87055,7 +87055,7 @@ ] }, { - "key": "GetType", + "base": "GetType", "context": "{C3B16018-28FB-5CFE-B871-25B6E2F0B110}", "entry": { "name": "In", @@ -87086,7 +87086,7 @@ ] }, { - "key": "IsError", + "base": "IsError", "context": "{C3B16018-28FB-5CFE-B871-25B6E2F0B110}", "entry": { "name": "In", @@ -87117,7 +87117,7 @@ ] }, { - "key": "GetHint", + "base": "GetHint", "context": "{C3B16018-28FB-5CFE-B871-25B6E2F0B110}", "entry": { "name": "In", @@ -87148,7 +87148,7 @@ ] }, { - "key": "GetData", + "base": "GetData", "context": "{C3B16018-28FB-5CFE-B871-25B6E2F0B110}", "entry": { "name": "In", @@ -87179,7 +87179,7 @@ ] }, { - "key": "IsReady", + "base": "IsReady", "context": "{C3B16018-28FB-5CFE-B871-25B6E2F0B110}", "entry": { "name": "In", @@ -87210,7 +87210,7 @@ ] }, { - "key": "GetStatus", + "base": "GetStatus", "context": "{C3B16018-28FB-5CFE-B871-25B6E2F0B110}", "entry": { "name": "In", @@ -87241,7 +87241,7 @@ ] }, { - "key": "GetId", + "base": "GetId", "context": "{C3B16018-28FB-5CFE-B871-25B6E2F0B110}", "entry": { "name": "In", @@ -87274,7 +87274,7 @@ ] }, { - "key": "{D96F5CA8-E7CE-5786-8C89-9D779A263909}", + "base": "{D96F5CA8-E7CE-5786-8C89-9D779A263909}", "context": "OnDemandReflected", "variant": "", "details": { @@ -87284,7 +87284,7 @@ }, "methods": [ { - "key": "contains", + "base": "contains", "context": "{D96F5CA8-E7CE-5786-8C89-9D779A263909}", "entry": { "name": "In", @@ -87321,7 +87321,7 @@ ] }, { - "key": "Insert", + "base": "Insert", "context": "{D96F5CA8-E7CE-5786-8C89-9D779A263909}", "entry": { "name": "In", @@ -87364,7 +87364,7 @@ ] }, { - "key": "Reserve", + "base": "Reserve", "context": "{D96F5CA8-E7CE-5786-8C89-9D779A263909}", "entry": { "name": "In", @@ -87393,7 +87393,7 @@ ] }, { - "key": "GetSize", + "base": "GetSize", "context": "{D96F5CA8-E7CE-5786-8C89-9D779A263909}", "entry": { "name": "In", @@ -87424,7 +87424,7 @@ ] }, { - "key": "Iterate_VM", + "base": "Iterate_VM", "context": "{D96F5CA8-E7CE-5786-8C89-9D779A263909}", "entry": { "name": "In", @@ -87455,7 +87455,7 @@ ] }, { - "key": "GetKeys", + "base": "GetKeys", "context": "{D96F5CA8-E7CE-5786-8C89-9D779A263909}", "entry": { "name": "In", @@ -87486,7 +87486,7 @@ ] }, { - "key": "Size", + "base": "Size", "context": "{D96F5CA8-E7CE-5786-8C89-9D779A263909}", "entry": { "name": "In", @@ -87517,7 +87517,7 @@ ] }, { - "key": "Erase", + "base": "Erase", "context": "{D96F5CA8-E7CE-5786-8C89-9D779A263909}", "entry": { "name": "In", @@ -87554,7 +87554,7 @@ ] }, { - "key": "EraseCheck_VM", + "base": "EraseCheck_VM", "context": "{D96F5CA8-E7CE-5786-8C89-9D779A263909}", "entry": { "name": "In", @@ -87591,7 +87591,7 @@ ] }, { - "key": "Clear", + "base": "Clear", "context": "{D96F5CA8-E7CE-5786-8C89-9D779A263909}", "entry": { "name": "In", @@ -87622,7 +87622,7 @@ ] }, { - "key": "At", + "base": "At", "context": "{D96F5CA8-E7CE-5786-8C89-9D779A263909}", "entry": { "name": "In", @@ -87659,7 +87659,7 @@ ] }, { - "key": "BucketCount", + "base": "BucketCount", "context": "{D96F5CA8-E7CE-5786-8C89-9D779A263909}", "entry": { "name": "In", @@ -87690,7 +87690,7 @@ ] }, { - "key": "Empty", + "base": "Empty", "context": "{D96F5CA8-E7CE-5786-8C89-9D779A263909}", "entry": { "name": "In", @@ -87721,7 +87721,7 @@ ] }, { - "key": "Swap", + "base": "Swap", "context": "{D96F5CA8-E7CE-5786-8C89-9D779A263909}", "entry": { "name": "In", @@ -87752,7 +87752,7 @@ ] }, { - "key": "{9EB5F5B2-ED76-5142-A631-4FF058C1B1F9}", + "base": "{9EB5F5B2-ED76-5142-A631-4FF058C1B1F9}", "context": "OnDemandReflected", "variant": "", "details": { @@ -87762,7 +87762,7 @@ }, "methods": [ { - "key": "contains", + "base": "contains", "context": "{9EB5F5B2-ED76-5142-A631-4FF058C1B1F9}", "entry": { "name": "In", @@ -87799,7 +87799,7 @@ ] }, { - "key": "Insert", + "base": "Insert", "context": "{9EB5F5B2-ED76-5142-A631-4FF058C1B1F9}", "entry": { "name": "In", @@ -87842,7 +87842,7 @@ ] }, { - "key": "Reserve", + "base": "Reserve", "context": "{9EB5F5B2-ED76-5142-A631-4FF058C1B1F9}", "entry": { "name": "In", @@ -87871,7 +87871,7 @@ ] }, { - "key": "GetSize", + "base": "GetSize", "context": "{9EB5F5B2-ED76-5142-A631-4FF058C1B1F9}", "entry": { "name": "In", @@ -87902,7 +87902,7 @@ ] }, { - "key": "Iterate_VM", + "base": "Iterate_VM", "context": "{9EB5F5B2-ED76-5142-A631-4FF058C1B1F9}", "entry": { "name": "In", @@ -87933,7 +87933,7 @@ ] }, { - "key": "GetKeys", + "base": "GetKeys", "context": "{9EB5F5B2-ED76-5142-A631-4FF058C1B1F9}", "entry": { "name": "In", @@ -87964,7 +87964,7 @@ ] }, { - "key": "Size", + "base": "Size", "context": "{9EB5F5B2-ED76-5142-A631-4FF058C1B1F9}", "entry": { "name": "In", @@ -87995,7 +87995,7 @@ ] }, { - "key": "Erase", + "base": "Erase", "context": "{9EB5F5B2-ED76-5142-A631-4FF058C1B1F9}", "entry": { "name": "In", @@ -88032,7 +88032,7 @@ ] }, { - "key": "EraseCheck_VM", + "base": "EraseCheck_VM", "context": "{9EB5F5B2-ED76-5142-A631-4FF058C1B1F9}", "entry": { "name": "In", @@ -88069,7 +88069,7 @@ ] }, { - "key": "Clear", + "base": "Clear", "context": "{9EB5F5B2-ED76-5142-A631-4FF058C1B1F9}", "entry": { "name": "In", @@ -88100,7 +88100,7 @@ ] }, { - "key": "At", + "base": "At", "context": "{9EB5F5B2-ED76-5142-A631-4FF058C1B1F9}", "entry": { "name": "In", @@ -88137,7 +88137,7 @@ ] }, { - "key": "BucketCount", + "base": "BucketCount", "context": "{9EB5F5B2-ED76-5142-A631-4FF058C1B1F9}", "entry": { "name": "In", @@ -88168,7 +88168,7 @@ ] }, { - "key": "Empty", + "base": "Empty", "context": "{9EB5F5B2-ED76-5142-A631-4FF058C1B1F9}", "entry": { "name": "In", @@ -88199,7 +88199,7 @@ ] }, { - "key": "Swap", + "base": "Swap", "context": "{9EB5F5B2-ED76-5142-A631-4FF058C1B1F9}", "entry": { "name": "In", @@ -88230,7 +88230,7 @@ ] }, { - "key": "{53EA7604-E3AE-4E88-BE0E-66CBC488A7DB}", + "base": "{53EA7604-E3AE-4E88-BE0E-66CBC488A7DB}", "context": "OnDemandReflected", "variant": "", "details": { @@ -88238,7 +88238,7 @@ }, "methods": [ { - "key": "Reciprocal", + "base": "Reciprocal", "context": "{53EA7604-E3AE-4E88-BE0E-66CBC488A7DB}", "entry": { "name": "In", @@ -88269,7 +88269,7 @@ ] }, { - "key": "Subtract", + "base": "Subtract", "context": "{53EA7604-E3AE-4E88-BE0E-66CBC488A7DB}", "entry": { "name": "In", @@ -88306,7 +88306,7 @@ ] }, { - "key": "Project", + "base": "Project", "context": "{53EA7604-E3AE-4E88-BE0E-66CBC488A7DB}", "entry": { "name": "In", @@ -88343,7 +88343,7 @@ ] }, { - "key": "Normalize", + "base": "Normalize", "context": "{53EA7604-E3AE-4E88-BE0E-66CBC488A7DB}", "entry": { "name": "In", @@ -88374,7 +88374,7 @@ ] }, { - "key": "Distance", + "base": "Distance", "context": "{53EA7604-E3AE-4E88-BE0E-66CBC488A7DB}", "entry": { "name": "In", @@ -88411,7 +88411,7 @@ ] }, { - "key": "SetZ", + "base": "SetZ", "context": "{53EA7604-E3AE-4E88-BE0E-66CBC488A7DB}", "entry": { "name": "In", @@ -88448,7 +88448,7 @@ ] }, { - "key": "Max", + "base": "Max", "context": "{53EA7604-E3AE-4E88-BE0E-66CBC488A7DB}", "entry": { "name": "In", @@ -88485,7 +88485,7 @@ ] }, { - "key": "GetElement", + "base": "GetElement", "context": "{53EA7604-E3AE-4E88-BE0E-66CBC488A7DB}", "entry": { "name": "In", @@ -88522,7 +88522,7 @@ ] }, { - "key": "Absolute", + "base": "Absolute", "context": "{53EA7604-E3AE-4E88-BE0E-66CBC488A7DB}", "entry": { "name": "In", @@ -88553,7 +88553,7 @@ ] }, { - "key": "BuildTangentBasis", + "base": "BuildTangentBasis", "context": "{53EA7604-E3AE-4E88-BE0E-66CBC488A7DB}", "entry": { "name": "In", @@ -88584,7 +88584,7 @@ ] }, { - "key": "Clamp", + "base": "Clamp", "context": "{53EA7604-E3AE-4E88-BE0E-66CBC488A7DB}", "entry": { "name": "In", @@ -88627,7 +88627,7 @@ ] }, { - "key": "MultiplyByNumber", + "base": "MultiplyByNumber", "context": "{53EA7604-E3AE-4E88-BE0E-66CBC488A7DB}", "entry": { "name": "In", @@ -88664,7 +88664,7 @@ ] }, { - "key": "Slerp", + "base": "Slerp", "context": "{53EA7604-E3AE-4E88-BE0E-66CBC488A7DB}", "entry": { "name": "In", @@ -88707,7 +88707,7 @@ ] }, { - "key": "IsZero", + "base": "IsZero", "context": "{53EA7604-E3AE-4E88-BE0E-66CBC488A7DB}", "entry": { "name": "In", @@ -88744,7 +88744,7 @@ ] }, { - "key": "SetY", + "base": "SetY", "context": "{53EA7604-E3AE-4E88-BE0E-66CBC488A7DB}", "entry": { "name": "In", @@ -88781,7 +88781,7 @@ ] }, { - "key": "IsClose", + "base": "IsClose", "context": "{53EA7604-E3AE-4E88-BE0E-66CBC488A7DB}", "entry": { "name": "In", @@ -88824,7 +88824,7 @@ ] }, { - "key": "Cross", + "base": "Cross", "context": "{53EA7604-E3AE-4E88-BE0E-66CBC488A7DB}", "entry": { "name": "In", @@ -88861,7 +88861,7 @@ ] }, { - "key": "DirectionTo", + "base": "DirectionTo", "context": "{53EA7604-E3AE-4E88-BE0E-66CBC488A7DB}", "entry": { "name": "In", @@ -88904,7 +88904,7 @@ ] }, { - "key": "MultiplyByVector", + "base": "MultiplyByVector", "context": "{53EA7604-E3AE-4E88-BE0E-66CBC488A7DB}", "entry": { "name": "In", @@ -88941,7 +88941,7 @@ ] }, { - "key": "Negate", + "base": "Negate", "context": "{53EA7604-E3AE-4E88-BE0E-66CBC488A7DB}", "entry": { "name": "In", @@ -88972,7 +88972,7 @@ ] }, { - "key": "Add", + "base": "Add", "context": "{53EA7604-E3AE-4E88-BE0E-66CBC488A7DB}", "entry": { "name": "In", @@ -89009,7 +89009,7 @@ ] }, { - "key": "IsPerpendicular", + "base": "IsPerpendicular", "context": "{53EA7604-E3AE-4E88-BE0E-66CBC488A7DB}", "entry": { "name": "In", @@ -89052,7 +89052,7 @@ ] }, { - "key": "IsFinite", + "base": "IsFinite", "context": "{53EA7604-E3AE-4E88-BE0E-66CBC488A7DB}", "entry": { "name": "In", @@ -89083,7 +89083,7 @@ ] }, { - "key": "DivideByNumber", + "base": "DivideByNumber", "context": "{53EA7604-E3AE-4E88-BE0E-66CBC488A7DB}", "entry": { "name": "In", @@ -89120,7 +89120,7 @@ ] }, { - "key": "IsNormalized", + "base": "IsNormalized", "context": "{53EA7604-E3AE-4E88-BE0E-66CBC488A7DB}", "entry": { "name": "In", @@ -89157,7 +89157,7 @@ ] }, { - "key": "LengthSquared", + "base": "LengthSquared", "context": "{53EA7604-E3AE-4E88-BE0E-66CBC488A7DB}", "entry": { "name": "In", @@ -89188,7 +89188,7 @@ ] }, { - "key": "FromValues", + "base": "FromValues", "context": "{53EA7604-E3AE-4E88-BE0E-66CBC488A7DB}", "entry": { "name": "In", @@ -89231,7 +89231,7 @@ ] }, { - "key": "Dot", + "base": "Dot", "context": "{53EA7604-E3AE-4E88-BE0E-66CBC488A7DB}", "entry": { "name": "In", @@ -89268,7 +89268,7 @@ ] }, { - "key": "SetX", + "base": "SetX", "context": "{53EA7604-E3AE-4E88-BE0E-66CBC488A7DB}", "entry": { "name": "In", @@ -89305,7 +89305,7 @@ ] }, { - "key": "LengthReciprocal", + "base": "LengthReciprocal", "context": "{53EA7604-E3AE-4E88-BE0E-66CBC488A7DB}", "entry": { "name": "In", @@ -89336,7 +89336,7 @@ ] }, { - "key": "Min", + "base": "Min", "context": "{53EA7604-E3AE-4E88-BE0E-66CBC488A7DB}", "entry": { "name": "In", @@ -89373,7 +89373,7 @@ ] }, { - "key": "DistanceSquared", + "base": "DistanceSquared", "context": "{53EA7604-E3AE-4E88-BE0E-66CBC488A7DB}", "entry": { "name": "In", @@ -89410,7 +89410,7 @@ ] }, { - "key": "Length", + "base": "Length", "context": "{53EA7604-E3AE-4E88-BE0E-66CBC488A7DB}", "entry": { "name": "In", @@ -89441,7 +89441,7 @@ ] }, { - "key": "DivideByVector", + "base": "DivideByVector", "context": "{53EA7604-E3AE-4E88-BE0E-66CBC488A7DB}", "entry": { "name": "In", @@ -89478,7 +89478,7 @@ ] }, { - "key": "Lerp", + "base": "Lerp", "context": "{53EA7604-E3AE-4E88-BE0E-66CBC488A7DB}", "entry": { "name": "In", @@ -89523,7 +89523,7 @@ ] }, { - "key": "{4985DFB0-7CD9-5B28-980B-BA2C701BE3D6}", + "base": "{4985DFB0-7CD9-5B28-980B-BA2C701BE3D6}", "context": "OnDemandReflected", "variant": "", "details": { @@ -89531,7 +89531,7 @@ }, "methods": [ { - "key": "HasHandlerConnected", + "base": "HasHandlerConnected", "context": "{4985DFB0-7CD9-5B28-980B-BA2C701BE3D6}", "entry": { "name": "In", @@ -89564,7 +89564,7 @@ ] }, { - "key": "{2F556390-49B3-5F20-8206-21D323D977E6}", + "base": "{2F556390-49B3-5F20-8206-21D323D977E6}", "context": "OnDemandReflected", "variant": "", "details": { @@ -89574,7 +89574,7 @@ }, "methods": [ { - "key": "contains", + "base": "contains", "context": "{2F556390-49B3-5F20-8206-21D323D977E6}", "entry": { "name": "In", @@ -89611,7 +89611,7 @@ ] }, { - "key": "Insert", + "base": "Insert", "context": "{2F556390-49B3-5F20-8206-21D323D977E6}", "entry": { "name": "In", @@ -89654,7 +89654,7 @@ ] }, { - "key": "Reserve", + "base": "Reserve", "context": "{2F556390-49B3-5F20-8206-21D323D977E6}", "entry": { "name": "In", @@ -89683,7 +89683,7 @@ ] }, { - "key": "GetSize", + "base": "GetSize", "context": "{2F556390-49B3-5F20-8206-21D323D977E6}", "entry": { "name": "In", @@ -89714,7 +89714,7 @@ ] }, { - "key": "Iterate_VM", + "base": "Iterate_VM", "context": "{2F556390-49B3-5F20-8206-21D323D977E6}", "entry": { "name": "In", @@ -89745,7 +89745,7 @@ ] }, { - "key": "GetKeys", + "base": "GetKeys", "context": "{2F556390-49B3-5F20-8206-21D323D977E6}", "entry": { "name": "In", @@ -89776,7 +89776,7 @@ ] }, { - "key": "Size", + "base": "Size", "context": "{2F556390-49B3-5F20-8206-21D323D977E6}", "entry": { "name": "In", @@ -89807,7 +89807,7 @@ ] }, { - "key": "Erase", + "base": "Erase", "context": "{2F556390-49B3-5F20-8206-21D323D977E6}", "entry": { "name": "In", @@ -89844,7 +89844,7 @@ ] }, { - "key": "EraseCheck_VM", + "base": "EraseCheck_VM", "context": "{2F556390-49B3-5F20-8206-21D323D977E6}", "entry": { "name": "In", @@ -89881,7 +89881,7 @@ ] }, { - "key": "Clear", + "base": "Clear", "context": "{2F556390-49B3-5F20-8206-21D323D977E6}", "entry": { "name": "In", @@ -89912,7 +89912,7 @@ ] }, { - "key": "At", + "base": "At", "context": "{2F556390-49B3-5F20-8206-21D323D977E6}", "entry": { "name": "In", @@ -89949,7 +89949,7 @@ ] }, { - "key": "BucketCount", + "base": "BucketCount", "context": "{2F556390-49B3-5F20-8206-21D323D977E6}", "entry": { "name": "In", @@ -89980,7 +89980,7 @@ ] }, { - "key": "Empty", + "base": "Empty", "context": "{2F556390-49B3-5F20-8206-21D323D977E6}", "entry": { "name": "In", @@ -90011,7 +90011,7 @@ ] }, { - "key": "Swap", + "base": "Swap", "context": "{2F556390-49B3-5F20-8206-21D323D977E6}", "entry": { "name": "In", @@ -90042,7 +90042,7 @@ ] }, { - "key": "{180562CD-DF5B-5AC3-B867-9FBFB3A2539A}", + "base": "{180562CD-DF5B-5AC3-B867-9FBFB3A2539A}", "context": "OnDemandReflected", "variant": "", "details": { @@ -90052,7 +90052,7 @@ }, "methods": [ { - "key": "contains", + "base": "contains", "context": "{180562CD-DF5B-5AC3-B867-9FBFB3A2539A}", "entry": { "name": "In", @@ -90089,7 +90089,7 @@ ] }, { - "key": "Insert", + "base": "Insert", "context": "{180562CD-DF5B-5AC3-B867-9FBFB3A2539A}", "entry": { "name": "In", @@ -90132,7 +90132,7 @@ ] }, { - "key": "Reserve", + "base": "Reserve", "context": "{180562CD-DF5B-5AC3-B867-9FBFB3A2539A}", "entry": { "name": "In", @@ -90161,7 +90161,7 @@ ] }, { - "key": "GetSize", + "base": "GetSize", "context": "{180562CD-DF5B-5AC3-B867-9FBFB3A2539A}", "entry": { "name": "In", @@ -90192,7 +90192,7 @@ ] }, { - "key": "Iterate_VM", + "base": "Iterate_VM", "context": "{180562CD-DF5B-5AC3-B867-9FBFB3A2539A}", "entry": { "name": "In", @@ -90223,7 +90223,7 @@ ] }, { - "key": "GetKeys", + "base": "GetKeys", "context": "{180562CD-DF5B-5AC3-B867-9FBFB3A2539A}", "entry": { "name": "In", @@ -90254,7 +90254,7 @@ ] }, { - "key": "Size", + "base": "Size", "context": "{180562CD-DF5B-5AC3-B867-9FBFB3A2539A}", "entry": { "name": "In", @@ -90285,7 +90285,7 @@ ] }, { - "key": "Erase", + "base": "Erase", "context": "{180562CD-DF5B-5AC3-B867-9FBFB3A2539A}", "entry": { "name": "In", @@ -90322,7 +90322,7 @@ ] }, { - "key": "EraseCheck_VM", + "base": "EraseCheck_VM", "context": "{180562CD-DF5B-5AC3-B867-9FBFB3A2539A}", "entry": { "name": "In", @@ -90359,7 +90359,7 @@ ] }, { - "key": "Clear", + "base": "Clear", "context": "{180562CD-DF5B-5AC3-B867-9FBFB3A2539A}", "entry": { "name": "In", @@ -90390,7 +90390,7 @@ ] }, { - "key": "At", + "base": "At", "context": "{180562CD-DF5B-5AC3-B867-9FBFB3A2539A}", "entry": { "name": "In", @@ -90427,7 +90427,7 @@ ] }, { - "key": "BucketCount", + "base": "BucketCount", "context": "{180562CD-DF5B-5AC3-B867-9FBFB3A2539A}", "entry": { "name": "In", @@ -90458,7 +90458,7 @@ ] }, { - "key": "Empty", + "base": "Empty", "context": "{180562CD-DF5B-5AC3-B867-9FBFB3A2539A}", "entry": { "name": "In", @@ -90489,7 +90489,7 @@ ] }, { - "key": "Swap", + "base": "Swap", "context": "{180562CD-DF5B-5AC3-B867-9FBFB3A2539A}", "entry": { "name": "In", @@ -90520,7 +90520,7 @@ ] }, { - "key": "{9F4210F0-9A8E-5536-A6FD-F3F55D854C0A}", + "base": "{9F4210F0-9A8E-5536-A6FD-F3F55D854C0A}", "context": "OnDemandReflected", "variant": "", "details": { @@ -90530,7 +90530,7 @@ }, "methods": [ { - "key": "contains", + "base": "contains", "context": "{9F4210F0-9A8E-5536-A6FD-F3F55D854C0A}", "entry": { "name": "In", @@ -90567,7 +90567,7 @@ ] }, { - "key": "Insert", + "base": "Insert", "context": "{9F4210F0-9A8E-5536-A6FD-F3F55D854C0A}", "entry": { "name": "In", @@ -90610,7 +90610,7 @@ ] }, { - "key": "Reserve", + "base": "Reserve", "context": "{9F4210F0-9A8E-5536-A6FD-F3F55D854C0A}", "entry": { "name": "In", @@ -90639,7 +90639,7 @@ ] }, { - "key": "GetSize", + "base": "GetSize", "context": "{9F4210F0-9A8E-5536-A6FD-F3F55D854C0A}", "entry": { "name": "In", @@ -90670,7 +90670,7 @@ ] }, { - "key": "Iterate_VM", + "base": "Iterate_VM", "context": "{9F4210F0-9A8E-5536-A6FD-F3F55D854C0A}", "entry": { "name": "In", @@ -90701,7 +90701,7 @@ ] }, { - "key": "GetKeys", + "base": "GetKeys", "context": "{9F4210F0-9A8E-5536-A6FD-F3F55D854C0A}", "entry": { "name": "In", @@ -90732,7 +90732,7 @@ ] }, { - "key": "Size", + "base": "Size", "context": "{9F4210F0-9A8E-5536-A6FD-F3F55D854C0A}", "entry": { "name": "In", @@ -90763,7 +90763,7 @@ ] }, { - "key": "Erase", + "base": "Erase", "context": "{9F4210F0-9A8E-5536-A6FD-F3F55D854C0A}", "entry": { "name": "In", @@ -90800,7 +90800,7 @@ ] }, { - "key": "EraseCheck_VM", + "base": "EraseCheck_VM", "context": "{9F4210F0-9A8E-5536-A6FD-F3F55D854C0A}", "entry": { "name": "In", @@ -90837,7 +90837,7 @@ ] }, { - "key": "Clear", + "base": "Clear", "context": "{9F4210F0-9A8E-5536-A6FD-F3F55D854C0A}", "entry": { "name": "In", @@ -90868,7 +90868,7 @@ ] }, { - "key": "At", + "base": "At", "context": "{9F4210F0-9A8E-5536-A6FD-F3F55D854C0A}", "entry": { "name": "In", @@ -90905,7 +90905,7 @@ ] }, { - "key": "BucketCount", + "base": "BucketCount", "context": "{9F4210F0-9A8E-5536-A6FD-F3F55D854C0A}", "entry": { "name": "In", @@ -90936,7 +90936,7 @@ ] }, { - "key": "Empty", + "base": "Empty", "context": "{9F4210F0-9A8E-5536-A6FD-F3F55D854C0A}", "entry": { "name": "In", @@ -90967,7 +90967,7 @@ ] }, { - "key": "Swap", + "base": "Swap", "context": "{9F4210F0-9A8E-5536-A6FD-F3F55D854C0A}", "entry": { "name": "In", @@ -90998,7 +90998,7 @@ ] }, { - "key": "{0764BFDD-6E1D-5F12-B746-219C67028B25}", + "base": "{0764BFDD-6E1D-5F12-B746-219C67028B25}", "context": "OnDemandReflected", "variant": "", "details": { @@ -91008,7 +91008,7 @@ }, "methods": [ { - "key": "contains", + "base": "contains", "context": "{0764BFDD-6E1D-5F12-B746-219C67028B25}", "entry": { "name": "In", @@ -91045,7 +91045,7 @@ ] }, { - "key": "Insert", + "base": "Insert", "context": "{0764BFDD-6E1D-5F12-B746-219C67028B25}", "entry": { "name": "In", @@ -91088,7 +91088,7 @@ ] }, { - "key": "Reserve", + "base": "Reserve", "context": "{0764BFDD-6E1D-5F12-B746-219C67028B25}", "entry": { "name": "In", @@ -91117,7 +91117,7 @@ ] }, { - "key": "GetSize", + "base": "GetSize", "context": "{0764BFDD-6E1D-5F12-B746-219C67028B25}", "entry": { "name": "In", @@ -91148,7 +91148,7 @@ ] }, { - "key": "Iterate_VM", + "base": "Iterate_VM", "context": "{0764BFDD-6E1D-5F12-B746-219C67028B25}", "entry": { "name": "In", @@ -91179,7 +91179,7 @@ ] }, { - "key": "GetKeys", + "base": "GetKeys", "context": "{0764BFDD-6E1D-5F12-B746-219C67028B25}", "entry": { "name": "In", @@ -91210,7 +91210,7 @@ ] }, { - "key": "Size", + "base": "Size", "context": "{0764BFDD-6E1D-5F12-B746-219C67028B25}", "entry": { "name": "In", @@ -91241,7 +91241,7 @@ ] }, { - "key": "Erase", + "base": "Erase", "context": "{0764BFDD-6E1D-5F12-B746-219C67028B25}", "entry": { "name": "In", @@ -91278,7 +91278,7 @@ ] }, { - "key": "EraseCheck_VM", + "base": "EraseCheck_VM", "context": "{0764BFDD-6E1D-5F12-B746-219C67028B25}", "entry": { "name": "In", @@ -91315,7 +91315,7 @@ ] }, { - "key": "Clear", + "base": "Clear", "context": "{0764BFDD-6E1D-5F12-B746-219C67028B25}", "entry": { "name": "In", @@ -91346,7 +91346,7 @@ ] }, { - "key": "At", + "base": "At", "context": "{0764BFDD-6E1D-5F12-B746-219C67028B25}", "entry": { "name": "In", @@ -91383,7 +91383,7 @@ ] }, { - "key": "BucketCount", + "base": "BucketCount", "context": "{0764BFDD-6E1D-5F12-B746-219C67028B25}", "entry": { "name": "In", @@ -91414,7 +91414,7 @@ ] }, { - "key": "Empty", + "base": "Empty", "context": "{0764BFDD-6E1D-5F12-B746-219C67028B25}", "entry": { "name": "In", @@ -91445,7 +91445,7 @@ ] }, { - "key": "Swap", + "base": "Swap", "context": "{0764BFDD-6E1D-5F12-B746-219C67028B25}", "entry": { "name": "In", @@ -91476,7 +91476,7 @@ ] }, { - "key": "{0D825FF8-6E54-5ADD-93B0-93496090CEFA}", + "base": "{0D825FF8-6E54-5ADD-93B0-93496090CEFA}", "context": "OnDemandReflected", "variant": "", "details": { @@ -91486,7 +91486,7 @@ }, "methods": [ { - "key": "contains", + "base": "contains", "context": "{0D825FF8-6E54-5ADD-93B0-93496090CEFA}", "entry": { "name": "In", @@ -91524,7 +91524,7 @@ ] }, { - "key": "Insert", + "base": "Insert", "context": "{0D825FF8-6E54-5ADD-93B0-93496090CEFA}", "entry": { "name": "In", @@ -91568,7 +91568,7 @@ ] }, { - "key": "Reserve", + "base": "Reserve", "context": "{0D825FF8-6E54-5ADD-93B0-93496090CEFA}", "entry": { "name": "In", @@ -91597,7 +91597,7 @@ ] }, { - "key": "GetSize", + "base": "GetSize", "context": "{0D825FF8-6E54-5ADD-93B0-93496090CEFA}", "entry": { "name": "In", @@ -91628,7 +91628,7 @@ ] }, { - "key": "Iterate_VM", + "base": "Iterate_VM", "context": "{0D825FF8-6E54-5ADD-93B0-93496090CEFA}", "entry": { "name": "In", @@ -91659,7 +91659,7 @@ ] }, { - "key": "GetKeys", + "base": "GetKeys", "context": "{0D825FF8-6E54-5ADD-93B0-93496090CEFA}", "entry": { "name": "In", @@ -91690,7 +91690,7 @@ ] }, { - "key": "Size", + "base": "Size", "context": "{0D825FF8-6E54-5ADD-93B0-93496090CEFA}", "entry": { "name": "In", @@ -91721,7 +91721,7 @@ ] }, { - "key": "Erase", + "base": "Erase", "context": "{0D825FF8-6E54-5ADD-93B0-93496090CEFA}", "entry": { "name": "In", @@ -91759,7 +91759,7 @@ ] }, { - "key": "EraseCheck_VM", + "base": "EraseCheck_VM", "context": "{0D825FF8-6E54-5ADD-93B0-93496090CEFA}", "entry": { "name": "In", @@ -91797,7 +91797,7 @@ ] }, { - "key": "Clear", + "base": "Clear", "context": "{0D825FF8-6E54-5ADD-93B0-93496090CEFA}", "entry": { "name": "In", @@ -91828,7 +91828,7 @@ ] }, { - "key": "At", + "base": "At", "context": "{0D825FF8-6E54-5ADD-93B0-93496090CEFA}", "entry": { "name": "In", @@ -91866,7 +91866,7 @@ ] }, { - "key": "BucketCount", + "base": "BucketCount", "context": "{0D825FF8-6E54-5ADD-93B0-93496090CEFA}", "entry": { "name": "In", @@ -91897,7 +91897,7 @@ ] }, { - "key": "Empty", + "base": "Empty", "context": "{0D825FF8-6E54-5ADD-93B0-93496090CEFA}", "entry": { "name": "In", @@ -91928,7 +91928,7 @@ ] }, { - "key": "Swap", + "base": "Swap", "context": "{0D825FF8-6E54-5ADD-93B0-93496090CEFA}", "entry": { "name": "In", @@ -91959,7 +91959,7 @@ ] }, { - "key": "{FA815A11-0F6B-5BB9-8C9F-71669EB6D4B0}", + "base": "{FA815A11-0F6B-5BB9-8C9F-71669EB6D4B0}", "context": "OnDemandReflected", "variant": "", "details": { @@ -91969,7 +91969,7 @@ }, "methods": [ { - "key": "Size", + "base": "Size", "context": "{FA815A11-0F6B-5BB9-8C9F-71669EB6D4B0}", "entry": { "name": "In", @@ -92000,7 +92000,7 @@ ] }, { - "key": "Front", + "base": "Front", "context": "{FA815A11-0F6B-5BB9-8C9F-71669EB6D4B0}", "entry": { "name": "In", @@ -92031,7 +92031,7 @@ ] }, { - "key": "HasKey", + "base": "HasKey", "context": "{FA815A11-0F6B-5BB9-8C9F-71669EB6D4B0}", "entry": { "name": "In", @@ -92068,7 +92068,7 @@ ] }, { - "key": "Resize", + "base": "Resize", "context": "{FA815A11-0F6B-5BB9-8C9F-71669EB6D4B0}", "entry": { "name": "In", @@ -92097,7 +92097,7 @@ ] }, { - "key": "at", + "base": "at", "context": "{FA815A11-0F6B-5BB9-8C9F-71669EB6D4B0}", "entry": { "name": "In", @@ -92134,7 +92134,7 @@ ] }, { - "key": "Back", + "base": "Back", "context": "{FA815A11-0F6B-5BB9-8C9F-71669EB6D4B0}", "entry": { "name": "In", @@ -92165,7 +92165,7 @@ ] }, { - "key": "pop_back", + "base": "pop_back", "context": "{FA815A11-0F6B-5BB9-8C9F-71669EB6D4B0}", "entry": { "name": "In", @@ -92188,7 +92188,7 @@ ] }, { - "key": "size", + "base": "size", "context": "{FA815A11-0F6B-5BB9-8C9F-71669EB6D4B0}", "entry": { "name": "In", @@ -92219,7 +92219,7 @@ ] }, { - "key": "At", + "base": "At", "context": "{FA815A11-0F6B-5BB9-8C9F-71669EB6D4B0}", "entry": { "name": "In", @@ -92256,7 +92256,7 @@ ] }, { - "key": "Empty", + "base": "Empty", "context": "{FA815A11-0F6B-5BB9-8C9F-71669EB6D4B0}", "entry": { "name": "In", @@ -92287,7 +92287,7 @@ ] }, { - "key": "Swap", + "base": "Swap", "context": "{FA815A11-0F6B-5BB9-8C9F-71669EB6D4B0}", "entry": { "name": "In", @@ -92316,7 +92316,7 @@ ] }, { - "key": "push_back", + "base": "push_back", "context": "{FA815A11-0F6B-5BB9-8C9F-71669EB6D4B0}", "entry": { "name": "In", @@ -92345,7 +92345,7 @@ ] }, { - "key": "PushBack_VM", + "base": "PushBack_VM", "context": "{FA815A11-0F6B-5BB9-8C9F-71669EB6D4B0}", "entry": { "name": "In", @@ -92382,7 +92382,7 @@ ] }, { - "key": "AtUnchecked", + "base": "AtUnchecked", "context": "{FA815A11-0F6B-5BB9-8C9F-71669EB6D4B0}", "entry": { "name": "In", @@ -92419,7 +92419,7 @@ ] }, { - "key": "clear", + "base": "clear", "context": "{FA815A11-0F6B-5BB9-8C9F-71669EB6D4B0}", "entry": { "name": "In", @@ -92442,7 +92442,7 @@ ] }, { - "key": "NotEmpty", + "base": "NotEmpty", "context": "{FA815A11-0F6B-5BB9-8C9F-71669EB6D4B0}", "entry": { "name": "In", @@ -92473,7 +92473,7 @@ ] }, { - "key": "Erase_VM", + "base": "Erase_VM", "context": "{FA815A11-0F6B-5BB9-8C9F-71669EB6D4B0}", "entry": { "name": "In", @@ -92510,7 +92510,7 @@ ] }, { - "key": "EraseCheck_VM", + "base": "EraseCheck_VM", "context": "{FA815A11-0F6B-5BB9-8C9F-71669EB6D4B0}", "entry": { "name": "In", @@ -92547,7 +92547,7 @@ ] }, { - "key": "Capacity", + "base": "Capacity", "context": "{FA815A11-0F6B-5BB9-8C9F-71669EB6D4B0}", "entry": { "name": "In", @@ -92578,7 +92578,7 @@ ] }, { - "key": "Clear", + "base": "Clear", "context": "{FA815A11-0F6B-5BB9-8C9F-71669EB6D4B0}", "entry": { "name": "In", @@ -92609,7 +92609,7 @@ ] }, { - "key": "AssignAt", + "base": "AssignAt", "context": "{FA815A11-0F6B-5BB9-8C9F-71669EB6D4B0}", "entry": { "name": "In", @@ -92644,7 +92644,7 @@ ] }, { - "key": "GetSize", + "base": "GetSize", "context": "{FA815A11-0F6B-5BB9-8C9F-71669EB6D4B0}", "entry": { "name": "In", @@ -92675,7 +92675,7 @@ ] }, { - "key": "Insert", + "base": "Insert", "context": "{FA815A11-0F6B-5BB9-8C9F-71669EB6D4B0}", "entry": { "name": "In", @@ -92718,7 +92718,7 @@ ] }, { - "key": "PushBack", + "base": "PushBack", "context": "{FA815A11-0F6B-5BB9-8C9F-71669EB6D4B0}", "entry": { "name": "In", @@ -92747,7 +92747,7 @@ ] }, { - "key": "Reserve", + "base": "Reserve", "context": "{FA815A11-0F6B-5BB9-8C9F-71669EB6D4B0}", "entry": { "name": "In", @@ -92776,7 +92776,7 @@ ] }, { - "key": "Iterate_VM", + "base": "Iterate_VM", "context": "{FA815A11-0F6B-5BB9-8C9F-71669EB6D4B0}", "entry": { "name": "In", @@ -92809,7 +92809,7 @@ ] }, { - "key": "{2B7F6107-B177-5C17-9408-823396E6D8B8}", + "base": "{2B7F6107-B177-5C17-9408-823396E6D8B8}", "context": "OnDemandReflected", "variant": "", "details": { @@ -92819,7 +92819,7 @@ }, "methods": [ { - "key": "get", + "base": "get", "context": "{2B7F6107-B177-5C17-9408-823396E6D8B8}", "entry": { "name": "In", @@ -92852,7 +92852,7 @@ ] }, { - "key": "{6ED13EA7-791B-57A8-A4F1-560B5F35B472}", + "base": "{6ED13EA7-791B-57A8-A4F1-560B5F35B472}", "context": "OnDemandReflected", "variant": "", "details": { @@ -92862,7 +92862,7 @@ }, "methods": [ { - "key": "Size", + "base": "Size", "context": "{6ED13EA7-791B-57A8-A4F1-560B5F35B472}", "entry": { "name": "In", @@ -92893,7 +92893,7 @@ ] }, { - "key": "Front", + "base": "Front", "context": "{6ED13EA7-791B-57A8-A4F1-560B5F35B472}", "entry": { "name": "In", @@ -92925,7 +92925,7 @@ ] }, { - "key": "HasKey", + "base": "HasKey", "context": "{6ED13EA7-791B-57A8-A4F1-560B5F35B472}", "entry": { "name": "In", @@ -92962,7 +92962,7 @@ ] }, { - "key": "Resize", + "base": "Resize", "context": "{6ED13EA7-791B-57A8-A4F1-560B5F35B472}", "entry": { "name": "In", @@ -92991,7 +92991,7 @@ ] }, { - "key": "at", + "base": "at", "context": "{6ED13EA7-791B-57A8-A4F1-560B5F35B472}", "entry": { "name": "In", @@ -93029,7 +93029,7 @@ ] }, { - "key": "Back", + "base": "Back", "context": "{6ED13EA7-791B-57A8-A4F1-560B5F35B472}", "entry": { "name": "In", @@ -93061,7 +93061,7 @@ ] }, { - "key": "pop_back", + "base": "pop_back", "context": "{6ED13EA7-791B-57A8-A4F1-560B5F35B472}", "entry": { "name": "In", @@ -93084,7 +93084,7 @@ ] }, { - "key": "size", + "base": "size", "context": "{6ED13EA7-791B-57A8-A4F1-560B5F35B472}", "entry": { "name": "In", @@ -93115,7 +93115,7 @@ ] }, { - "key": "At", + "base": "At", "context": "{6ED13EA7-791B-57A8-A4F1-560B5F35B472}", "entry": { "name": "In", @@ -93153,7 +93153,7 @@ ] }, { - "key": "Empty", + "base": "Empty", "context": "{6ED13EA7-791B-57A8-A4F1-560B5F35B472}", "entry": { "name": "In", @@ -93184,7 +93184,7 @@ ] }, { - "key": "Swap", + "base": "Swap", "context": "{6ED13EA7-791B-57A8-A4F1-560B5F35B472}", "entry": { "name": "In", @@ -93213,7 +93213,7 @@ ] }, { - "key": "push_back", + "base": "push_back", "context": "{6ED13EA7-791B-57A8-A4F1-560B5F35B472}", "entry": { "name": "In", @@ -93243,7 +93243,7 @@ ] }, { - "key": "PushBack_VM", + "base": "PushBack_VM", "context": "{6ED13EA7-791B-57A8-A4F1-560B5F35B472}", "entry": { "name": "In", @@ -93281,7 +93281,7 @@ ] }, { - "key": "AtUnchecked", + "base": "AtUnchecked", "context": "{6ED13EA7-791B-57A8-A4F1-560B5F35B472}", "entry": { "name": "In", @@ -93319,7 +93319,7 @@ ] }, { - "key": "clear", + "base": "clear", "context": "{6ED13EA7-791B-57A8-A4F1-560B5F35B472}", "entry": { "name": "In", @@ -93342,7 +93342,7 @@ ] }, { - "key": "NotEmpty", + "base": "NotEmpty", "context": "{6ED13EA7-791B-57A8-A4F1-560B5F35B472}", "entry": { "name": "In", @@ -93373,7 +93373,7 @@ ] }, { - "key": "Erase_VM", + "base": "Erase_VM", "context": "{6ED13EA7-791B-57A8-A4F1-560B5F35B472}", "entry": { "name": "In", @@ -93410,7 +93410,7 @@ ] }, { - "key": "EraseCheck_VM", + "base": "EraseCheck_VM", "context": "{6ED13EA7-791B-57A8-A4F1-560B5F35B472}", "entry": { "name": "In", @@ -93447,7 +93447,7 @@ ] }, { - "key": "Capacity", + "base": "Capacity", "context": "{6ED13EA7-791B-57A8-A4F1-560B5F35B472}", "entry": { "name": "In", @@ -93478,7 +93478,7 @@ ] }, { - "key": "Clear", + "base": "Clear", "context": "{6ED13EA7-791B-57A8-A4F1-560B5F35B472}", "entry": { "name": "In", @@ -93509,7 +93509,7 @@ ] }, { - "key": "AssignAt", + "base": "AssignAt", "context": "{6ED13EA7-791B-57A8-A4F1-560B5F35B472}", "entry": { "name": "In", @@ -93545,7 +93545,7 @@ ] }, { - "key": "GetSize", + "base": "GetSize", "context": "{6ED13EA7-791B-57A8-A4F1-560B5F35B472}", "entry": { "name": "In", @@ -93576,7 +93576,7 @@ ] }, { - "key": "Insert", + "base": "Insert", "context": "{6ED13EA7-791B-57A8-A4F1-560B5F35B472}", "entry": { "name": "In", @@ -93620,7 +93620,7 @@ ] }, { - "key": "PushBack", + "base": "PushBack", "context": "{6ED13EA7-791B-57A8-A4F1-560B5F35B472}", "entry": { "name": "In", @@ -93650,7 +93650,7 @@ ] }, { - "key": "Reserve", + "base": "Reserve", "context": "{6ED13EA7-791B-57A8-A4F1-560B5F35B472}", "entry": { "name": "In", @@ -93679,7 +93679,7 @@ ] }, { - "key": "Iterate_VM", + "base": "Iterate_VM", "context": "{6ED13EA7-791B-57A8-A4F1-560B5F35B472}", "entry": { "name": "In", @@ -93712,7 +93712,7 @@ ] }, { - "key": "{9ABF5933-C8FC-53CD-A518-B6AF433CF496}", + "base": "{9ABF5933-C8FC-53CD-A518-B6AF433CF496}", "context": "OnDemandReflected", "variant": "", "details": { @@ -93722,7 +93722,7 @@ }, "methods": [ { - "key": "contains", + "base": "contains", "context": "{9ABF5933-C8FC-53CD-A518-B6AF433CF496}", "entry": { "name": "In", @@ -93759,7 +93759,7 @@ ] }, { - "key": "Insert", + "base": "Insert", "context": "{9ABF5933-C8FC-53CD-A518-B6AF433CF496}", "entry": { "name": "In", @@ -93802,7 +93802,7 @@ ] }, { - "key": "Reserve", + "base": "Reserve", "context": "{9ABF5933-C8FC-53CD-A518-B6AF433CF496}", "entry": { "name": "In", @@ -93831,7 +93831,7 @@ ] }, { - "key": "GetSize", + "base": "GetSize", "context": "{9ABF5933-C8FC-53CD-A518-B6AF433CF496}", "entry": { "name": "In", @@ -93862,7 +93862,7 @@ ] }, { - "key": "Iterate_VM", + "base": "Iterate_VM", "context": "{9ABF5933-C8FC-53CD-A518-B6AF433CF496}", "entry": { "name": "In", @@ -93893,7 +93893,7 @@ ] }, { - "key": "GetKeys", + "base": "GetKeys", "context": "{9ABF5933-C8FC-53CD-A518-B6AF433CF496}", "entry": { "name": "In", @@ -93924,7 +93924,7 @@ ] }, { - "key": "Size", + "base": "Size", "context": "{9ABF5933-C8FC-53CD-A518-B6AF433CF496}", "entry": { "name": "In", @@ -93955,7 +93955,7 @@ ] }, { - "key": "Erase", + "base": "Erase", "context": "{9ABF5933-C8FC-53CD-A518-B6AF433CF496}", "entry": { "name": "In", @@ -93992,7 +93992,7 @@ ] }, { - "key": "EraseCheck_VM", + "base": "EraseCheck_VM", "context": "{9ABF5933-C8FC-53CD-A518-B6AF433CF496}", "entry": { "name": "In", @@ -94029,7 +94029,7 @@ ] }, { - "key": "Clear", + "base": "Clear", "context": "{9ABF5933-C8FC-53CD-A518-B6AF433CF496}", "entry": { "name": "In", @@ -94060,7 +94060,7 @@ ] }, { - "key": "At", + "base": "At", "context": "{9ABF5933-C8FC-53CD-A518-B6AF433CF496}", "entry": { "name": "In", @@ -94097,7 +94097,7 @@ ] }, { - "key": "BucketCount", + "base": "BucketCount", "context": "{9ABF5933-C8FC-53CD-A518-B6AF433CF496}", "entry": { "name": "In", @@ -94128,7 +94128,7 @@ ] }, { - "key": "Empty", + "base": "Empty", "context": "{9ABF5933-C8FC-53CD-A518-B6AF433CF496}", "entry": { "name": "In", @@ -94159,7 +94159,7 @@ ] }, { - "key": "Swap", + "base": "Swap", "context": "{9ABF5933-C8FC-53CD-A518-B6AF433CF496}", "entry": { "name": "In", @@ -94190,7 +94190,7 @@ ] }, { - "key": "{D9EF6EA6-B182-5A36-A7FF-E376FD0C05C7}", + "base": "{D9EF6EA6-B182-5A36-A7FF-E376FD0C05C7}", "context": "OnDemandReflected", "variant": "", "details": { @@ -94200,7 +94200,7 @@ }, "methods": [ { - "key": "contains", + "base": "contains", "context": "{D9EF6EA6-B182-5A36-A7FF-E376FD0C05C7}", "entry": { "name": "In", @@ -94237,7 +94237,7 @@ ] }, { - "key": "Insert", + "base": "Insert", "context": "{D9EF6EA6-B182-5A36-A7FF-E376FD0C05C7}", "entry": { "name": "In", @@ -94280,7 +94280,7 @@ ] }, { - "key": "Reserve", + "base": "Reserve", "context": "{D9EF6EA6-B182-5A36-A7FF-E376FD0C05C7}", "entry": { "name": "In", @@ -94309,7 +94309,7 @@ ] }, { - "key": "GetSize", + "base": "GetSize", "context": "{D9EF6EA6-B182-5A36-A7FF-E376FD0C05C7}", "entry": { "name": "In", @@ -94340,7 +94340,7 @@ ] }, { - "key": "Iterate_VM", + "base": "Iterate_VM", "context": "{D9EF6EA6-B182-5A36-A7FF-E376FD0C05C7}", "entry": { "name": "In", @@ -94371,7 +94371,7 @@ ] }, { - "key": "GetKeys", + "base": "GetKeys", "context": "{D9EF6EA6-B182-5A36-A7FF-E376FD0C05C7}", "entry": { "name": "In", @@ -94402,7 +94402,7 @@ ] }, { - "key": "Size", + "base": "Size", "context": "{D9EF6EA6-B182-5A36-A7FF-E376FD0C05C7}", "entry": { "name": "In", @@ -94433,7 +94433,7 @@ ] }, { - "key": "Erase", + "base": "Erase", "context": "{D9EF6EA6-B182-5A36-A7FF-E376FD0C05C7}", "entry": { "name": "In", @@ -94470,7 +94470,7 @@ ] }, { - "key": "EraseCheck_VM", + "base": "EraseCheck_VM", "context": "{D9EF6EA6-B182-5A36-A7FF-E376FD0C05C7}", "entry": { "name": "In", @@ -94507,7 +94507,7 @@ ] }, { - "key": "Clear", + "base": "Clear", "context": "{D9EF6EA6-B182-5A36-A7FF-E376FD0C05C7}", "entry": { "name": "In", @@ -94538,7 +94538,7 @@ ] }, { - "key": "At", + "base": "At", "context": "{D9EF6EA6-B182-5A36-A7FF-E376FD0C05C7}", "entry": { "name": "In", @@ -94575,7 +94575,7 @@ ] }, { - "key": "BucketCount", + "base": "BucketCount", "context": "{D9EF6EA6-B182-5A36-A7FF-E376FD0C05C7}", "entry": { "name": "In", @@ -94606,7 +94606,7 @@ ] }, { - "key": "Empty", + "base": "Empty", "context": "{D9EF6EA6-B182-5A36-A7FF-E376FD0C05C7}", "entry": { "name": "In", @@ -94637,7 +94637,7 @@ ] }, { - "key": "Swap", + "base": "Swap", "context": "{D9EF6EA6-B182-5A36-A7FF-E376FD0C05C7}", "entry": { "name": "In", @@ -94668,7 +94668,7 @@ ] }, { - "key": "{AF6D8DD5-0386-5E48-86B0-86131BC0D2D6}", + "base": "{AF6D8DD5-0386-5E48-86B0-86131BC0D2D6}", "context": "OnDemandReflected", "variant": "", "details": { @@ -94678,7 +94678,7 @@ }, "methods": [ { - "key": "contains", + "base": "contains", "context": "{AF6D8DD5-0386-5E48-86B0-86131BC0D2D6}", "entry": { "name": "In", @@ -94715,7 +94715,7 @@ ] }, { - "key": "Insert", + "base": "Insert", "context": "{AF6D8DD5-0386-5E48-86B0-86131BC0D2D6}", "entry": { "name": "In", @@ -94758,7 +94758,7 @@ ] }, { - "key": "Reserve", + "base": "Reserve", "context": "{AF6D8DD5-0386-5E48-86B0-86131BC0D2D6}", "entry": { "name": "In", @@ -94787,7 +94787,7 @@ ] }, { - "key": "GetSize", + "base": "GetSize", "context": "{AF6D8DD5-0386-5E48-86B0-86131BC0D2D6}", "entry": { "name": "In", @@ -94818,7 +94818,7 @@ ] }, { - "key": "Iterate_VM", + "base": "Iterate_VM", "context": "{AF6D8DD5-0386-5E48-86B0-86131BC0D2D6}", "entry": { "name": "In", @@ -94849,7 +94849,7 @@ ] }, { - "key": "GetKeys", + "base": "GetKeys", "context": "{AF6D8DD5-0386-5E48-86B0-86131BC0D2D6}", "entry": { "name": "In", @@ -94880,7 +94880,7 @@ ] }, { - "key": "Size", + "base": "Size", "context": "{AF6D8DD5-0386-5E48-86B0-86131BC0D2D6}", "entry": { "name": "In", @@ -94911,7 +94911,7 @@ ] }, { - "key": "Erase", + "base": "Erase", "context": "{AF6D8DD5-0386-5E48-86B0-86131BC0D2D6}", "entry": { "name": "In", @@ -94948,7 +94948,7 @@ ] }, { - "key": "EraseCheck_VM", + "base": "EraseCheck_VM", "context": "{AF6D8DD5-0386-5E48-86B0-86131BC0D2D6}", "entry": { "name": "In", @@ -94985,7 +94985,7 @@ ] }, { - "key": "Clear", + "base": "Clear", "context": "{AF6D8DD5-0386-5E48-86B0-86131BC0D2D6}", "entry": { "name": "In", @@ -95016,7 +95016,7 @@ ] }, { - "key": "At", + "base": "At", "context": "{AF6D8DD5-0386-5E48-86B0-86131BC0D2D6}", "entry": { "name": "In", @@ -95053,7 +95053,7 @@ ] }, { - "key": "BucketCount", + "base": "BucketCount", "context": "{AF6D8DD5-0386-5E48-86B0-86131BC0D2D6}", "entry": { "name": "In", @@ -95084,7 +95084,7 @@ ] }, { - "key": "Empty", + "base": "Empty", "context": "{AF6D8DD5-0386-5E48-86B0-86131BC0D2D6}", "entry": { "name": "In", @@ -95115,7 +95115,7 @@ ] }, { - "key": "Swap", + "base": "Swap", "context": "{AF6D8DD5-0386-5E48-86B0-86131BC0D2D6}", "entry": { "name": "In", @@ -95146,7 +95146,7 @@ ] }, { - "key": "{24A1B3FF-51E3-5699-9ED7-49D835DE1DED}", + "base": "{24A1B3FF-51E3-5699-9ED7-49D835DE1DED}", "context": "OnDemandReflected", "variant": "", "details": { @@ -95156,7 +95156,7 @@ }, "methods": [ { - "key": "Size", + "base": "Size", "context": "{24A1B3FF-51E3-5699-9ED7-49D835DE1DED}", "entry": { "name": "In", @@ -95187,7 +95187,7 @@ ] }, { - "key": "Front", + "base": "Front", "context": "{24A1B3FF-51E3-5699-9ED7-49D835DE1DED}", "entry": { "name": "In", @@ -95218,7 +95218,7 @@ ] }, { - "key": "HasKey", + "base": "HasKey", "context": "{24A1B3FF-51E3-5699-9ED7-49D835DE1DED}", "entry": { "name": "In", @@ -95255,7 +95255,7 @@ ] }, { - "key": "Resize", + "base": "Resize", "context": "{24A1B3FF-51E3-5699-9ED7-49D835DE1DED}", "entry": { "name": "In", @@ -95284,7 +95284,7 @@ ] }, { - "key": "at", + "base": "at", "context": "{24A1B3FF-51E3-5699-9ED7-49D835DE1DED}", "entry": { "name": "In", @@ -95321,7 +95321,7 @@ ] }, { - "key": "Back", + "base": "Back", "context": "{24A1B3FF-51E3-5699-9ED7-49D835DE1DED}", "entry": { "name": "In", @@ -95352,7 +95352,7 @@ ] }, { - "key": "pop_back", + "base": "pop_back", "context": "{24A1B3FF-51E3-5699-9ED7-49D835DE1DED}", "entry": { "name": "In", @@ -95375,7 +95375,7 @@ ] }, { - "key": "size", + "base": "size", "context": "{24A1B3FF-51E3-5699-9ED7-49D835DE1DED}", "entry": { "name": "In", @@ -95406,7 +95406,7 @@ ] }, { - "key": "At", + "base": "At", "context": "{24A1B3FF-51E3-5699-9ED7-49D835DE1DED}", "entry": { "name": "In", @@ -95443,7 +95443,7 @@ ] }, { - "key": "Empty", + "base": "Empty", "context": "{24A1B3FF-51E3-5699-9ED7-49D835DE1DED}", "entry": { "name": "In", @@ -95474,7 +95474,7 @@ ] }, { - "key": "Swap", + "base": "Swap", "context": "{24A1B3FF-51E3-5699-9ED7-49D835DE1DED}", "entry": { "name": "In", @@ -95503,7 +95503,7 @@ ] }, { - "key": "push_back", + "base": "push_back", "context": "{24A1B3FF-51E3-5699-9ED7-49D835DE1DED}", "entry": { "name": "In", @@ -95532,7 +95532,7 @@ ] }, { - "key": "PushBack_VM", + "base": "PushBack_VM", "context": "{24A1B3FF-51E3-5699-9ED7-49D835DE1DED}", "entry": { "name": "In", @@ -95569,7 +95569,7 @@ ] }, { - "key": "AtUnchecked", + "base": "AtUnchecked", "context": "{24A1B3FF-51E3-5699-9ED7-49D835DE1DED}", "entry": { "name": "In", @@ -95606,7 +95606,7 @@ ] }, { - "key": "clear", + "base": "clear", "context": "{24A1B3FF-51E3-5699-9ED7-49D835DE1DED}", "entry": { "name": "In", @@ -95629,7 +95629,7 @@ ] }, { - "key": "NotEmpty", + "base": "NotEmpty", "context": "{24A1B3FF-51E3-5699-9ED7-49D835DE1DED}", "entry": { "name": "In", @@ -95660,7 +95660,7 @@ ] }, { - "key": "Erase_VM", + "base": "Erase_VM", "context": "{24A1B3FF-51E3-5699-9ED7-49D835DE1DED}", "entry": { "name": "In", @@ -95697,7 +95697,7 @@ ] }, { - "key": "EraseCheck_VM", + "base": "EraseCheck_VM", "context": "{24A1B3FF-51E3-5699-9ED7-49D835DE1DED}", "entry": { "name": "In", @@ -95734,7 +95734,7 @@ ] }, { - "key": "Capacity", + "base": "Capacity", "context": "{24A1B3FF-51E3-5699-9ED7-49D835DE1DED}", "entry": { "name": "In", @@ -95765,7 +95765,7 @@ ] }, { - "key": "Clear", + "base": "Clear", "context": "{24A1B3FF-51E3-5699-9ED7-49D835DE1DED}", "entry": { "name": "In", @@ -95796,7 +95796,7 @@ ] }, { - "key": "AssignAt", + "base": "AssignAt", "context": "{24A1B3FF-51E3-5699-9ED7-49D835DE1DED}", "entry": { "name": "In", @@ -95831,7 +95831,7 @@ ] }, { - "key": "GetSize", + "base": "GetSize", "context": "{24A1B3FF-51E3-5699-9ED7-49D835DE1DED}", "entry": { "name": "In", @@ -95862,7 +95862,7 @@ ] }, { - "key": "Insert", + "base": "Insert", "context": "{24A1B3FF-51E3-5699-9ED7-49D835DE1DED}", "entry": { "name": "In", @@ -95905,7 +95905,7 @@ ] }, { - "key": "PushBack", + "base": "PushBack", "context": "{24A1B3FF-51E3-5699-9ED7-49D835DE1DED}", "entry": { "name": "In", @@ -95934,7 +95934,7 @@ ] }, { - "key": "Reserve", + "base": "Reserve", "context": "{24A1B3FF-51E3-5699-9ED7-49D835DE1DED}", "entry": { "name": "In", @@ -95963,7 +95963,7 @@ ] }, { - "key": "Iterate_VM", + "base": "Iterate_VM", "context": "{24A1B3FF-51E3-5699-9ED7-49D835DE1DED}", "entry": { "name": "In", @@ -95996,7 +95996,7 @@ ] }, { - "key": "{6965E71B-A623-5D36-98D9-3758EF2E8045}", + "base": "{6965E71B-A623-5D36-98D9-3758EF2E8045}", "context": "OnDemandReflected", "variant": "", "details": { @@ -96006,7 +96006,7 @@ }, "methods": [ { - "key": "contains", + "base": "contains", "context": "{6965E71B-A623-5D36-98D9-3758EF2E8045}", "entry": { "name": "In", @@ -96044,7 +96044,7 @@ ] }, { - "key": "Insert", + "base": "Insert", "context": "{6965E71B-A623-5D36-98D9-3758EF2E8045}", "entry": { "name": "In", @@ -96088,7 +96088,7 @@ ] }, { - "key": "Reserve", + "base": "Reserve", "context": "{6965E71B-A623-5D36-98D9-3758EF2E8045}", "entry": { "name": "In", @@ -96117,7 +96117,7 @@ ] }, { - "key": "GetSize", + "base": "GetSize", "context": "{6965E71B-A623-5D36-98D9-3758EF2E8045}", "entry": { "name": "In", @@ -96148,7 +96148,7 @@ ] }, { - "key": "Iterate_VM", + "base": "Iterate_VM", "context": "{6965E71B-A623-5D36-98D9-3758EF2E8045}", "entry": { "name": "In", @@ -96179,7 +96179,7 @@ ] }, { - "key": "GetKeys", + "base": "GetKeys", "context": "{6965E71B-A623-5D36-98D9-3758EF2E8045}", "entry": { "name": "In", @@ -96210,7 +96210,7 @@ ] }, { - "key": "Size", + "base": "Size", "context": "{6965E71B-A623-5D36-98D9-3758EF2E8045}", "entry": { "name": "In", @@ -96241,7 +96241,7 @@ ] }, { - "key": "Erase", + "base": "Erase", "context": "{6965E71B-A623-5D36-98D9-3758EF2E8045}", "entry": { "name": "In", @@ -96279,7 +96279,7 @@ ] }, { - "key": "EraseCheck_VM", + "base": "EraseCheck_VM", "context": "{6965E71B-A623-5D36-98D9-3758EF2E8045}", "entry": { "name": "In", @@ -96317,7 +96317,7 @@ ] }, { - "key": "Clear", + "base": "Clear", "context": "{6965E71B-A623-5D36-98D9-3758EF2E8045}", "entry": { "name": "In", @@ -96348,7 +96348,7 @@ ] }, { - "key": "At", + "base": "At", "context": "{6965E71B-A623-5D36-98D9-3758EF2E8045}", "entry": { "name": "In", @@ -96386,7 +96386,7 @@ ] }, { - "key": "BucketCount", + "base": "BucketCount", "context": "{6965E71B-A623-5D36-98D9-3758EF2E8045}", "entry": { "name": "In", @@ -96417,7 +96417,7 @@ ] }, { - "key": "Empty", + "base": "Empty", "context": "{6965E71B-A623-5D36-98D9-3758EF2E8045}", "entry": { "name": "In", @@ -96448,7 +96448,7 @@ ] }, { - "key": "Swap", + "base": "Swap", "context": "{6965E71B-A623-5D36-98D9-3758EF2E8045}", "entry": { "name": "In", @@ -96479,7 +96479,7 @@ ] }, { - "key": "{641B736D-7467-5446-9083-EC81DC8E6E5B}", + "base": "{641B736D-7467-5446-9083-EC81DC8E6E5B}", "context": "OnDemandReflected", "variant": "", "details": { @@ -96489,7 +96489,7 @@ }, "methods": [ { - "key": "contains", + "base": "contains", "context": "{641B736D-7467-5446-9083-EC81DC8E6E5B}", "entry": { "name": "In", @@ -96527,7 +96527,7 @@ ] }, { - "key": "Insert", + "base": "Insert", "context": "{641B736D-7467-5446-9083-EC81DC8E6E5B}", "entry": { "name": "In", @@ -96571,7 +96571,7 @@ ] }, { - "key": "Reserve", + "base": "Reserve", "context": "{641B736D-7467-5446-9083-EC81DC8E6E5B}", "entry": { "name": "In", @@ -96600,7 +96600,7 @@ ] }, { - "key": "GetSize", + "base": "GetSize", "context": "{641B736D-7467-5446-9083-EC81DC8E6E5B}", "entry": { "name": "In", @@ -96631,7 +96631,7 @@ ] }, { - "key": "Iterate_VM", + "base": "Iterate_VM", "context": "{641B736D-7467-5446-9083-EC81DC8E6E5B}", "entry": { "name": "In", @@ -96662,7 +96662,7 @@ ] }, { - "key": "GetKeys", + "base": "GetKeys", "context": "{641B736D-7467-5446-9083-EC81DC8E6E5B}", "entry": { "name": "In", @@ -96693,7 +96693,7 @@ ] }, { - "key": "Size", + "base": "Size", "context": "{641B736D-7467-5446-9083-EC81DC8E6E5B}", "entry": { "name": "In", @@ -96724,7 +96724,7 @@ ] }, { - "key": "Erase", + "base": "Erase", "context": "{641B736D-7467-5446-9083-EC81DC8E6E5B}", "entry": { "name": "In", @@ -96762,7 +96762,7 @@ ] }, { - "key": "EraseCheck_VM", + "base": "EraseCheck_VM", "context": "{641B736D-7467-5446-9083-EC81DC8E6E5B}", "entry": { "name": "In", @@ -96800,7 +96800,7 @@ ] }, { - "key": "Clear", + "base": "Clear", "context": "{641B736D-7467-5446-9083-EC81DC8E6E5B}", "entry": { "name": "In", @@ -96831,7 +96831,7 @@ ] }, { - "key": "At", + "base": "At", "context": "{641B736D-7467-5446-9083-EC81DC8E6E5B}", "entry": { "name": "In", @@ -96869,7 +96869,7 @@ ] }, { - "key": "BucketCount", + "base": "BucketCount", "context": "{641B736D-7467-5446-9083-EC81DC8E6E5B}", "entry": { "name": "In", @@ -96900,7 +96900,7 @@ ] }, { - "key": "Empty", + "base": "Empty", "context": "{641B736D-7467-5446-9083-EC81DC8E6E5B}", "entry": { "name": "In", @@ -96931,7 +96931,7 @@ ] }, { - "key": "Swap", + "base": "Swap", "context": "{641B736D-7467-5446-9083-EC81DC8E6E5B}", "entry": { "name": "In", @@ -96962,7 +96962,7 @@ ] }, { - "key": "{12AE825D-565E-5717-A7A2-6C8AADABE08F}", + "base": "{12AE825D-565E-5717-A7A2-6C8AADABE08F}", "context": "OnDemandReflected", "variant": "", "details": { @@ -96972,7 +96972,7 @@ }, "methods": [ { - "key": "contains", + "base": "contains", "context": "{12AE825D-565E-5717-A7A2-6C8AADABE08F}", "entry": { "name": "In", @@ -97009,7 +97009,7 @@ ] }, { - "key": "Insert", + "base": "Insert", "context": "{12AE825D-565E-5717-A7A2-6C8AADABE08F}", "entry": { "name": "In", @@ -97052,7 +97052,7 @@ ] }, { - "key": "Reserve", + "base": "Reserve", "context": "{12AE825D-565E-5717-A7A2-6C8AADABE08F}", "entry": { "name": "In", @@ -97081,7 +97081,7 @@ ] }, { - "key": "GetSize", + "base": "GetSize", "context": "{12AE825D-565E-5717-A7A2-6C8AADABE08F}", "entry": { "name": "In", @@ -97112,7 +97112,7 @@ ] }, { - "key": "Iterate_VM", + "base": "Iterate_VM", "context": "{12AE825D-565E-5717-A7A2-6C8AADABE08F}", "entry": { "name": "In", @@ -97143,7 +97143,7 @@ ] }, { - "key": "GetKeys", + "base": "GetKeys", "context": "{12AE825D-565E-5717-A7A2-6C8AADABE08F}", "entry": { "name": "In", @@ -97174,7 +97174,7 @@ ] }, { - "key": "Size", + "base": "Size", "context": "{12AE825D-565E-5717-A7A2-6C8AADABE08F}", "entry": { "name": "In", @@ -97205,7 +97205,7 @@ ] }, { - "key": "Erase", + "base": "Erase", "context": "{12AE825D-565E-5717-A7A2-6C8AADABE08F}", "entry": { "name": "In", @@ -97242,7 +97242,7 @@ ] }, { - "key": "EraseCheck_VM", + "base": "EraseCheck_VM", "context": "{12AE825D-565E-5717-A7A2-6C8AADABE08F}", "entry": { "name": "In", @@ -97279,7 +97279,7 @@ ] }, { - "key": "Clear", + "base": "Clear", "context": "{12AE825D-565E-5717-A7A2-6C8AADABE08F}", "entry": { "name": "In", @@ -97310,7 +97310,7 @@ ] }, { - "key": "At", + "base": "At", "context": "{12AE825D-565E-5717-A7A2-6C8AADABE08F}", "entry": { "name": "In", @@ -97347,7 +97347,7 @@ ] }, { - "key": "BucketCount", + "base": "BucketCount", "context": "{12AE825D-565E-5717-A7A2-6C8AADABE08F}", "entry": { "name": "In", @@ -97378,7 +97378,7 @@ ] }, { - "key": "Empty", + "base": "Empty", "context": "{12AE825D-565E-5717-A7A2-6C8AADABE08F}", "entry": { "name": "In", @@ -97409,7 +97409,7 @@ ] }, { - "key": "Swap", + "base": "Swap", "context": "{12AE825D-565E-5717-A7A2-6C8AADABE08F}", "entry": { "name": "In", @@ -97440,7 +97440,7 @@ ] }, { - "key": "{8FE8A00F-5FE8-54A1-A314-346843AD21B6}", + "base": "{8FE8A00F-5FE8-54A1-A314-346843AD21B6}", "context": "OnDemandReflected", "variant": "", "details": { @@ -97448,7 +97448,7 @@ }, "methods": [ { - "key": "has_value", + "base": "has_value", "context": "{8FE8A00F-5FE8-54A1-A314-346843AD21B6}", "entry": { "name": "In", @@ -97479,7 +97479,7 @@ ] }, { - "key": "__bool__", + "base": "__bool__", "context": "{8FE8A00F-5FE8-54A1-A314-346843AD21B6}", "entry": { "name": "In", @@ -97510,7 +97510,7 @@ ] }, { - "key": "value", + "base": "value", "context": "{8FE8A00F-5FE8-54A1-A314-346843AD21B6}", "entry": { "name": "In", @@ -97541,7 +97541,7 @@ ] }, { - "key": "value_or", + "base": "value_or", "context": "{8FE8A00F-5FE8-54A1-A314-346843AD21B6}", "entry": { "name": "In", @@ -97580,7 +97580,7 @@ ] }, { - "key": "{D03054C0-295C-5B7A-9997-5B2EE7B1B2B9}", + "base": "{D03054C0-295C-5B7A-9997-5B2EE7B1B2B9}", "context": "OnDemandReflected", "variant": "", "details": { @@ -97590,7 +97590,7 @@ }, "methods": [ { - "key": "contains", + "base": "contains", "context": "{D03054C0-295C-5B7A-9997-5B2EE7B1B2B9}", "entry": { "name": "In", @@ -97627,7 +97627,7 @@ ] }, { - "key": "Insert", + "base": "Insert", "context": "{D03054C0-295C-5B7A-9997-5B2EE7B1B2B9}", "entry": { "name": "In", @@ -97670,7 +97670,7 @@ ] }, { - "key": "Reserve", + "base": "Reserve", "context": "{D03054C0-295C-5B7A-9997-5B2EE7B1B2B9}", "entry": { "name": "In", @@ -97699,7 +97699,7 @@ ] }, { - "key": "GetSize", + "base": "GetSize", "context": "{D03054C0-295C-5B7A-9997-5B2EE7B1B2B9}", "entry": { "name": "In", @@ -97730,7 +97730,7 @@ ] }, { - "key": "Iterate_VM", + "base": "Iterate_VM", "context": "{D03054C0-295C-5B7A-9997-5B2EE7B1B2B9}", "entry": { "name": "In", @@ -97761,7 +97761,7 @@ ] }, { - "key": "GetKeys", + "base": "GetKeys", "context": "{D03054C0-295C-5B7A-9997-5B2EE7B1B2B9}", "entry": { "name": "In", @@ -97792,7 +97792,7 @@ ] }, { - "key": "Size", + "base": "Size", "context": "{D03054C0-295C-5B7A-9997-5B2EE7B1B2B9}", "entry": { "name": "In", @@ -97823,7 +97823,7 @@ ] }, { - "key": "Erase", + "base": "Erase", "context": "{D03054C0-295C-5B7A-9997-5B2EE7B1B2B9}", "entry": { "name": "In", @@ -97860,7 +97860,7 @@ ] }, { - "key": "EraseCheck_VM", + "base": "EraseCheck_VM", "context": "{D03054C0-295C-5B7A-9997-5B2EE7B1B2B9}", "entry": { "name": "In", @@ -97897,7 +97897,7 @@ ] }, { - "key": "Clear", + "base": "Clear", "context": "{D03054C0-295C-5B7A-9997-5B2EE7B1B2B9}", "entry": { "name": "In", @@ -97928,7 +97928,7 @@ ] }, { - "key": "At", + "base": "At", "context": "{D03054C0-295C-5B7A-9997-5B2EE7B1B2B9}", "entry": { "name": "In", @@ -97965,7 +97965,7 @@ ] }, { - "key": "BucketCount", + "base": "BucketCount", "context": "{D03054C0-295C-5B7A-9997-5B2EE7B1B2B9}", "entry": { "name": "In", @@ -97996,7 +97996,7 @@ ] }, { - "key": "Empty", + "base": "Empty", "context": "{D03054C0-295C-5B7A-9997-5B2EE7B1B2B9}", "entry": { "name": "In", @@ -98027,7 +98027,7 @@ ] }, { - "key": "Swap", + "base": "Swap", "context": "{D03054C0-295C-5B7A-9997-5B2EE7B1B2B9}", "entry": { "name": "In", @@ -98058,7 +98058,7 @@ ] }, { - "key": "{8E0A7AC1-C649-56B4-99CF-8BE08EEFC47B}", + "base": "{8E0A7AC1-C649-56B4-99CF-8BE08EEFC47B}", "context": "OnDemandReflected", "variant": "", "details": { @@ -98066,7 +98066,7 @@ }, "methods": [ { - "key": "has_value", + "base": "has_value", "context": "{8E0A7AC1-C649-56B4-99CF-8BE08EEFC47B}", "entry": { "name": "In", @@ -98097,7 +98097,7 @@ ] }, { - "key": "__bool__", + "base": "__bool__", "context": "{8E0A7AC1-C649-56B4-99CF-8BE08EEFC47B}", "entry": { "name": "In", @@ -98128,7 +98128,7 @@ ] }, { - "key": "value", + "base": "value", "context": "{8E0A7AC1-C649-56B4-99CF-8BE08EEFC47B}", "entry": { "name": "In", @@ -98159,7 +98159,7 @@ ] }, { - "key": "value_or", + "base": "value_or", "context": "{8E0A7AC1-C649-56B4-99CF-8BE08EEFC47B}", "entry": { "name": "In", @@ -98198,7 +98198,7 @@ ] }, { - "key": "{0170062C-2E7E-5CEB-BAB8-F7663BEF7B3E}", + "base": "{0170062C-2E7E-5CEB-BAB8-F7663BEF7B3E}", "context": "OnDemandReflected", "variant": "", "details": { @@ -98206,7 +98206,7 @@ }, "methods": [ { - "key": "has_value", + "base": "has_value", "context": "{0170062C-2E7E-5CEB-BAB8-F7663BEF7B3E}", "entry": { "name": "In", @@ -98237,7 +98237,7 @@ ] }, { - "key": "__bool__", + "base": "__bool__", "context": "{0170062C-2E7E-5CEB-BAB8-F7663BEF7B3E}", "entry": { "name": "In", @@ -98268,7 +98268,7 @@ ] }, { - "key": "value", + "base": "value", "context": "{0170062C-2E7E-5CEB-BAB8-F7663BEF7B3E}", "entry": { "name": "In", @@ -98299,7 +98299,7 @@ ] }, { - "key": "value_or", + "base": "value_or", "context": "{0170062C-2E7E-5CEB-BAB8-F7663BEF7B3E}", "entry": { "name": "In", @@ -98338,7 +98338,7 @@ ] }, { - "key": "{9E069E13-E1B2-5178-9219-52C9F0BFC0AB}", + "base": "{9E069E13-E1B2-5178-9219-52C9F0BFC0AB}", "context": "OnDemandReflected", "variant": "", "details": { @@ -98348,7 +98348,7 @@ }, "methods": [ { - "key": "contains", + "base": "contains", "context": "{9E069E13-E1B2-5178-9219-52C9F0BFC0AB}", "entry": { "name": "In", @@ -98385,7 +98385,7 @@ ] }, { - "key": "Insert", + "base": "Insert", "context": "{9E069E13-E1B2-5178-9219-52C9F0BFC0AB}", "entry": { "name": "In", @@ -98428,7 +98428,7 @@ ] }, { - "key": "Reserve", + "base": "Reserve", "context": "{9E069E13-E1B2-5178-9219-52C9F0BFC0AB}", "entry": { "name": "In", @@ -98457,7 +98457,7 @@ ] }, { - "key": "GetSize", + "base": "GetSize", "context": "{9E069E13-E1B2-5178-9219-52C9F0BFC0AB}", "entry": { "name": "In", @@ -98488,7 +98488,7 @@ ] }, { - "key": "Iterate_VM", + "base": "Iterate_VM", "context": "{9E069E13-E1B2-5178-9219-52C9F0BFC0AB}", "entry": { "name": "In", @@ -98519,7 +98519,7 @@ ] }, { - "key": "GetKeys", + "base": "GetKeys", "context": "{9E069E13-E1B2-5178-9219-52C9F0BFC0AB}", "entry": { "name": "In", @@ -98550,7 +98550,7 @@ ] }, { - "key": "Size", + "base": "Size", "context": "{9E069E13-E1B2-5178-9219-52C9F0BFC0AB}", "entry": { "name": "In", @@ -98581,7 +98581,7 @@ ] }, { - "key": "Erase", + "base": "Erase", "context": "{9E069E13-E1B2-5178-9219-52C9F0BFC0AB}", "entry": { "name": "In", @@ -98618,7 +98618,7 @@ ] }, { - "key": "EraseCheck_VM", + "base": "EraseCheck_VM", "context": "{9E069E13-E1B2-5178-9219-52C9F0BFC0AB}", "entry": { "name": "In", @@ -98655,7 +98655,7 @@ ] }, { - "key": "Clear", + "base": "Clear", "context": "{9E069E13-E1B2-5178-9219-52C9F0BFC0AB}", "entry": { "name": "In", @@ -98686,7 +98686,7 @@ ] }, { - "key": "At", + "base": "At", "context": "{9E069E13-E1B2-5178-9219-52C9F0BFC0AB}", "entry": { "name": "In", @@ -98723,7 +98723,7 @@ ] }, { - "key": "BucketCount", + "base": "BucketCount", "context": "{9E069E13-E1B2-5178-9219-52C9F0BFC0AB}", "entry": { "name": "In", @@ -98754,7 +98754,7 @@ ] }, { - "key": "Empty", + "base": "Empty", "context": "{9E069E13-E1B2-5178-9219-52C9F0BFC0AB}", "entry": { "name": "In", @@ -98785,7 +98785,7 @@ ] }, { - "key": "Swap", + "base": "Swap", "context": "{9E069E13-E1B2-5178-9219-52C9F0BFC0AB}", "entry": { "name": "In", @@ -98816,7 +98816,7 @@ ] }, { - "key": "{14E8FE40-1072-5691-9F23-E3600A9C4614}", + "base": "{14E8FE40-1072-5691-9F23-E3600A9C4614}", "context": "OnDemandReflected", "variant": "", "details": { @@ -98826,7 +98826,7 @@ }, "methods": [ { - "key": "Size", + "base": "Size", "context": "{14E8FE40-1072-5691-9F23-E3600A9C4614}", "entry": { "name": "In", @@ -98857,7 +98857,7 @@ ] }, { - "key": "Front", + "base": "Front", "context": "{14E8FE40-1072-5691-9F23-E3600A9C4614}", "entry": { "name": "In", @@ -98888,7 +98888,7 @@ ] }, { - "key": "HasKey", + "base": "HasKey", "context": "{14E8FE40-1072-5691-9F23-E3600A9C4614}", "entry": { "name": "In", @@ -98925,7 +98925,7 @@ ] }, { - "key": "Resize", + "base": "Resize", "context": "{14E8FE40-1072-5691-9F23-E3600A9C4614}", "entry": { "name": "In", @@ -98954,7 +98954,7 @@ ] }, { - "key": "at", + "base": "at", "context": "{14E8FE40-1072-5691-9F23-E3600A9C4614}", "entry": { "name": "In", @@ -98991,7 +98991,7 @@ ] }, { - "key": "Back", + "base": "Back", "context": "{14E8FE40-1072-5691-9F23-E3600A9C4614}", "entry": { "name": "In", @@ -99022,7 +99022,7 @@ ] }, { - "key": "pop_back", + "base": "pop_back", "context": "{14E8FE40-1072-5691-9F23-E3600A9C4614}", "entry": { "name": "In", @@ -99045,7 +99045,7 @@ ] }, { - "key": "size", + "base": "size", "context": "{14E8FE40-1072-5691-9F23-E3600A9C4614}", "entry": { "name": "In", @@ -99076,7 +99076,7 @@ ] }, { - "key": "At", + "base": "At", "context": "{14E8FE40-1072-5691-9F23-E3600A9C4614}", "entry": { "name": "In", @@ -99113,7 +99113,7 @@ ] }, { - "key": "Empty", + "base": "Empty", "context": "{14E8FE40-1072-5691-9F23-E3600A9C4614}", "entry": { "name": "In", @@ -99144,7 +99144,7 @@ ] }, { - "key": "Swap", + "base": "Swap", "context": "{14E8FE40-1072-5691-9F23-E3600A9C4614}", "entry": { "name": "In", @@ -99173,7 +99173,7 @@ ] }, { - "key": "push_back", + "base": "push_back", "context": "{14E8FE40-1072-5691-9F23-E3600A9C4614}", "entry": { "name": "In", @@ -99202,7 +99202,7 @@ ] }, { - "key": "PushBack_VM", + "base": "PushBack_VM", "context": "{14E8FE40-1072-5691-9F23-E3600A9C4614}", "entry": { "name": "In", @@ -99239,7 +99239,7 @@ ] }, { - "key": "AtUnchecked", + "base": "AtUnchecked", "context": "{14E8FE40-1072-5691-9F23-E3600A9C4614}", "entry": { "name": "In", @@ -99276,7 +99276,7 @@ ] }, { - "key": "clear", + "base": "clear", "context": "{14E8FE40-1072-5691-9F23-E3600A9C4614}", "entry": { "name": "In", @@ -99299,7 +99299,7 @@ ] }, { - "key": "NotEmpty", + "base": "NotEmpty", "context": "{14E8FE40-1072-5691-9F23-E3600A9C4614}", "entry": { "name": "In", @@ -99330,7 +99330,7 @@ ] }, { - "key": "Erase_VM", + "base": "Erase_VM", "context": "{14E8FE40-1072-5691-9F23-E3600A9C4614}", "entry": { "name": "In", @@ -99367,7 +99367,7 @@ ] }, { - "key": "EraseCheck_VM", + "base": "EraseCheck_VM", "context": "{14E8FE40-1072-5691-9F23-E3600A9C4614}", "entry": { "name": "In", @@ -99404,7 +99404,7 @@ ] }, { - "key": "Capacity", + "base": "Capacity", "context": "{14E8FE40-1072-5691-9F23-E3600A9C4614}", "entry": { "name": "In", @@ -99435,7 +99435,7 @@ ] }, { - "key": "Clear", + "base": "Clear", "context": "{14E8FE40-1072-5691-9F23-E3600A9C4614}", "entry": { "name": "In", @@ -99466,7 +99466,7 @@ ] }, { - "key": "AssignAt", + "base": "AssignAt", "context": "{14E8FE40-1072-5691-9F23-E3600A9C4614}", "entry": { "name": "In", @@ -99501,7 +99501,7 @@ ] }, { - "key": "GetSize", + "base": "GetSize", "context": "{14E8FE40-1072-5691-9F23-E3600A9C4614}", "entry": { "name": "In", @@ -99532,7 +99532,7 @@ ] }, { - "key": "Insert", + "base": "Insert", "context": "{14E8FE40-1072-5691-9F23-E3600A9C4614}", "entry": { "name": "In", @@ -99575,7 +99575,7 @@ ] }, { - "key": "PushBack", + "base": "PushBack", "context": "{14E8FE40-1072-5691-9F23-E3600A9C4614}", "entry": { "name": "In", @@ -99604,7 +99604,7 @@ ] }, { - "key": "Reserve", + "base": "Reserve", "context": "{14E8FE40-1072-5691-9F23-E3600A9C4614}", "entry": { "name": "In", @@ -99633,7 +99633,7 @@ ] }, { - "key": "Iterate_VM", + "base": "Iterate_VM", "context": "{14E8FE40-1072-5691-9F23-E3600A9C4614}", "entry": { "name": "In", @@ -99666,7 +99666,7 @@ ] }, { - "key": "{DB1EB3E5-F953-53A7-B8F9-9121E6A77F85}", + "base": "{DB1EB3E5-F953-53A7-B8F9-9121E6A77F85}", "context": "OnDemandReflected", "variant": "", "details": { @@ -99676,7 +99676,7 @@ }, "methods": [ { - "key": "Size", + "base": "Size", "context": "{DB1EB3E5-F953-53A7-B8F9-9121E6A77F85}", "entry": { "name": "In", @@ -99707,7 +99707,7 @@ ] }, { - "key": "GetKeys", + "base": "GetKeys", "context": "{DB1EB3E5-F953-53A7-B8F9-9121E6A77F85}", "entry": { "name": "In", @@ -99738,7 +99738,7 @@ ] }, { - "key": "contains", + "base": "contains", "context": "{DB1EB3E5-F953-53A7-B8F9-9121E6A77F85}", "entry": { "name": "In", @@ -99775,7 +99775,7 @@ ] }, { - "key": "Insert", + "base": "Insert", "context": "{DB1EB3E5-F953-53A7-B8F9-9121E6A77F85}", "entry": { "name": "In", @@ -99812,7 +99812,7 @@ ] }, { - "key": "GetSize", + "base": "GetSize", "context": "{DB1EB3E5-F953-53A7-B8F9-9121E6A77F85}", "entry": { "name": "In", @@ -99843,7 +99843,7 @@ ] }, { - "key": "Reserve", + "base": "Reserve", "context": "{DB1EB3E5-F953-53A7-B8F9-9121E6A77F85}", "entry": { "name": "In", @@ -99872,7 +99872,7 @@ ] }, { - "key": "Iterate_VM", + "base": "Iterate_VM", "context": "{DB1EB3E5-F953-53A7-B8F9-9121E6A77F85}", "entry": { "name": "In", @@ -99903,7 +99903,7 @@ ] }, { - "key": "EraseCheck_VM", + "base": "EraseCheck_VM", "context": "{DB1EB3E5-F953-53A7-B8F9-9121E6A77F85}", "entry": { "name": "In", @@ -99940,7 +99940,7 @@ ] }, { - "key": "Erase", + "base": "Erase", "context": "{DB1EB3E5-F953-53A7-B8F9-9121E6A77F85}", "entry": { "name": "In", @@ -99977,7 +99977,7 @@ ] }, { - "key": "Clear", + "base": "Clear", "context": "{DB1EB3E5-F953-53A7-B8F9-9121E6A77F85}", "entry": { "name": "In", @@ -100008,7 +100008,7 @@ ] }, { - "key": "BucketCount", + "base": "BucketCount", "context": "{DB1EB3E5-F953-53A7-B8F9-9121E6A77F85}", "entry": { "name": "In", @@ -100039,7 +100039,7 @@ ] }, { - "key": "Empty", + "base": "Empty", "context": "{DB1EB3E5-F953-53A7-B8F9-9121E6A77F85}", "entry": { "name": "In", @@ -100070,7 +100070,7 @@ ] }, { - "key": "Swap", + "base": "Swap", "context": "{DB1EB3E5-F953-53A7-B8F9-9121E6A77F85}", "entry": { "name": "In", @@ -100101,7 +100101,7 @@ ] }, { - "key": "{8E8D109E-EB62-5F13-8C2C-1D857EEE4FB4}", + "base": "{8E8D109E-EB62-5F13-8C2C-1D857EEE4FB4}", "context": "OnDemandReflected", "variant": "", "details": { @@ -100111,7 +100111,7 @@ }, "methods": [ { - "key": "Size", + "base": "Size", "context": "{8E8D109E-EB62-5F13-8C2C-1D857EEE4FB4}", "entry": { "name": "In", @@ -100142,7 +100142,7 @@ ] }, { - "key": "Front", + "base": "Front", "context": "{8E8D109E-EB62-5F13-8C2C-1D857EEE4FB4}", "entry": { "name": "In", @@ -100173,7 +100173,7 @@ ] }, { - "key": "HasKey", + "base": "HasKey", "context": "{8E8D109E-EB62-5F13-8C2C-1D857EEE4FB4}", "entry": { "name": "In", @@ -100210,7 +100210,7 @@ ] }, { - "key": "Resize", + "base": "Resize", "context": "{8E8D109E-EB62-5F13-8C2C-1D857EEE4FB4}", "entry": { "name": "In", @@ -100239,7 +100239,7 @@ ] }, { - "key": "at", + "base": "at", "context": "{8E8D109E-EB62-5F13-8C2C-1D857EEE4FB4}", "entry": { "name": "In", @@ -100276,7 +100276,7 @@ ] }, { - "key": "Back", + "base": "Back", "context": "{8E8D109E-EB62-5F13-8C2C-1D857EEE4FB4}", "entry": { "name": "In", @@ -100307,7 +100307,7 @@ ] }, { - "key": "pop_back", + "base": "pop_back", "context": "{8E8D109E-EB62-5F13-8C2C-1D857EEE4FB4}", "entry": { "name": "In", @@ -100330,7 +100330,7 @@ ] }, { - "key": "size", + "base": "size", "context": "{8E8D109E-EB62-5F13-8C2C-1D857EEE4FB4}", "entry": { "name": "In", @@ -100361,7 +100361,7 @@ ] }, { - "key": "At", + "base": "At", "context": "{8E8D109E-EB62-5F13-8C2C-1D857EEE4FB4}", "entry": { "name": "In", @@ -100398,7 +100398,7 @@ ] }, { - "key": "Empty", + "base": "Empty", "context": "{8E8D109E-EB62-5F13-8C2C-1D857EEE4FB4}", "entry": { "name": "In", @@ -100429,7 +100429,7 @@ ] }, { - "key": "Swap", + "base": "Swap", "context": "{8E8D109E-EB62-5F13-8C2C-1D857EEE4FB4}", "entry": { "name": "In", @@ -100458,7 +100458,7 @@ ] }, { - "key": "push_back", + "base": "push_back", "context": "{8E8D109E-EB62-5F13-8C2C-1D857EEE4FB4}", "entry": { "name": "In", @@ -100487,7 +100487,7 @@ ] }, { - "key": "PushBack_VM", + "base": "PushBack_VM", "context": "{8E8D109E-EB62-5F13-8C2C-1D857EEE4FB4}", "entry": { "name": "In", @@ -100524,7 +100524,7 @@ ] }, { - "key": "AtUnchecked", + "base": "AtUnchecked", "context": "{8E8D109E-EB62-5F13-8C2C-1D857EEE4FB4}", "entry": { "name": "In", @@ -100561,7 +100561,7 @@ ] }, { - "key": "clear", + "base": "clear", "context": "{8E8D109E-EB62-5F13-8C2C-1D857EEE4FB4}", "entry": { "name": "In", @@ -100584,7 +100584,7 @@ ] }, { - "key": "NotEmpty", + "base": "NotEmpty", "context": "{8E8D109E-EB62-5F13-8C2C-1D857EEE4FB4}", "entry": { "name": "In", @@ -100615,7 +100615,7 @@ ] }, { - "key": "Erase_VM", + "base": "Erase_VM", "context": "{8E8D109E-EB62-5F13-8C2C-1D857EEE4FB4}", "entry": { "name": "In", @@ -100652,7 +100652,7 @@ ] }, { - "key": "EraseCheck_VM", + "base": "EraseCheck_VM", "context": "{8E8D109E-EB62-5F13-8C2C-1D857EEE4FB4}", "entry": { "name": "In", @@ -100689,7 +100689,7 @@ ] }, { - "key": "Capacity", + "base": "Capacity", "context": "{8E8D109E-EB62-5F13-8C2C-1D857EEE4FB4}", "entry": { "name": "In", @@ -100720,7 +100720,7 @@ ] }, { - "key": "Clear", + "base": "Clear", "context": "{8E8D109E-EB62-5F13-8C2C-1D857EEE4FB4}", "entry": { "name": "In", @@ -100751,7 +100751,7 @@ ] }, { - "key": "AssignAt", + "base": "AssignAt", "context": "{8E8D109E-EB62-5F13-8C2C-1D857EEE4FB4}", "entry": { "name": "In", @@ -100786,7 +100786,7 @@ ] }, { - "key": "GetSize", + "base": "GetSize", "context": "{8E8D109E-EB62-5F13-8C2C-1D857EEE4FB4}", "entry": { "name": "In", @@ -100817,7 +100817,7 @@ ] }, { - "key": "Insert", + "base": "Insert", "context": "{8E8D109E-EB62-5F13-8C2C-1D857EEE4FB4}", "entry": { "name": "In", @@ -100860,7 +100860,7 @@ ] }, { - "key": "PushBack", + "base": "PushBack", "context": "{8E8D109E-EB62-5F13-8C2C-1D857EEE4FB4}", "entry": { "name": "In", @@ -100889,7 +100889,7 @@ ] }, { - "key": "Reserve", + "base": "Reserve", "context": "{8E8D109E-EB62-5F13-8C2C-1D857EEE4FB4}", "entry": { "name": "In", @@ -100918,7 +100918,7 @@ ] }, { - "key": "Iterate_VM", + "base": "Iterate_VM", "context": "{8E8D109E-EB62-5F13-8C2C-1D857EEE4FB4}", "entry": { "name": "In", @@ -100951,7 +100951,7 @@ ] }, { - "key": "{3A9E52F9-1A46-5FC6-822A-249BBFB50C90}", + "base": "{3A9E52F9-1A46-5FC6-822A-249BBFB50C90}", "context": "OnDemandReflected", "variant": "", "details": { @@ -100961,7 +100961,7 @@ }, "methods": [ { - "key": "Size", + "base": "Size", "context": "{3A9E52F9-1A46-5FC6-822A-249BBFB50C90}", "entry": { "name": "In", @@ -100992,7 +100992,7 @@ ] }, { - "key": "Front", + "base": "Front", "context": "{3A9E52F9-1A46-5FC6-822A-249BBFB50C90}", "entry": { "name": "In", @@ -101023,7 +101023,7 @@ ] }, { - "key": "HasKey", + "base": "HasKey", "context": "{3A9E52F9-1A46-5FC6-822A-249BBFB50C90}", "entry": { "name": "In", @@ -101060,7 +101060,7 @@ ] }, { - "key": "Resize", + "base": "Resize", "context": "{3A9E52F9-1A46-5FC6-822A-249BBFB50C90}", "entry": { "name": "In", @@ -101089,7 +101089,7 @@ ] }, { - "key": "at", + "base": "at", "context": "{3A9E52F9-1A46-5FC6-822A-249BBFB50C90}", "entry": { "name": "In", @@ -101126,7 +101126,7 @@ ] }, { - "key": "Back", + "base": "Back", "context": "{3A9E52F9-1A46-5FC6-822A-249BBFB50C90}", "entry": { "name": "In", @@ -101157,7 +101157,7 @@ ] }, { - "key": "pop_back", + "base": "pop_back", "context": "{3A9E52F9-1A46-5FC6-822A-249BBFB50C90}", "entry": { "name": "In", @@ -101180,7 +101180,7 @@ ] }, { - "key": "size", + "base": "size", "context": "{3A9E52F9-1A46-5FC6-822A-249BBFB50C90}", "entry": { "name": "In", @@ -101211,7 +101211,7 @@ ] }, { - "key": "At", + "base": "At", "context": "{3A9E52F9-1A46-5FC6-822A-249BBFB50C90}", "entry": { "name": "In", @@ -101248,7 +101248,7 @@ ] }, { - "key": "Empty", + "base": "Empty", "context": "{3A9E52F9-1A46-5FC6-822A-249BBFB50C90}", "entry": { "name": "In", @@ -101279,7 +101279,7 @@ ] }, { - "key": "Swap", + "base": "Swap", "context": "{3A9E52F9-1A46-5FC6-822A-249BBFB50C90}", "entry": { "name": "In", @@ -101308,7 +101308,7 @@ ] }, { - "key": "push_back", + "base": "push_back", "context": "{3A9E52F9-1A46-5FC6-822A-249BBFB50C90}", "entry": { "name": "In", @@ -101337,7 +101337,7 @@ ] }, { - "key": "PushBack_VM", + "base": "PushBack_VM", "context": "{3A9E52F9-1A46-5FC6-822A-249BBFB50C90}", "entry": { "name": "In", @@ -101374,7 +101374,7 @@ ] }, { - "key": "AtUnchecked", + "base": "AtUnchecked", "context": "{3A9E52F9-1A46-5FC6-822A-249BBFB50C90}", "entry": { "name": "In", @@ -101411,7 +101411,7 @@ ] }, { - "key": "clear", + "base": "clear", "context": "{3A9E52F9-1A46-5FC6-822A-249BBFB50C90}", "entry": { "name": "In", @@ -101434,7 +101434,7 @@ ] }, { - "key": "NotEmpty", + "base": "NotEmpty", "context": "{3A9E52F9-1A46-5FC6-822A-249BBFB50C90}", "entry": { "name": "In", @@ -101465,7 +101465,7 @@ ] }, { - "key": "Erase_VM", + "base": "Erase_VM", "context": "{3A9E52F9-1A46-5FC6-822A-249BBFB50C90}", "entry": { "name": "In", @@ -101502,7 +101502,7 @@ ] }, { - "key": "EraseCheck_VM", + "base": "EraseCheck_VM", "context": "{3A9E52F9-1A46-5FC6-822A-249BBFB50C90}", "entry": { "name": "In", @@ -101539,7 +101539,7 @@ ] }, { - "key": "Capacity", + "base": "Capacity", "context": "{3A9E52F9-1A46-5FC6-822A-249BBFB50C90}", "entry": { "name": "In", @@ -101570,7 +101570,7 @@ ] }, { - "key": "Clear", + "base": "Clear", "context": "{3A9E52F9-1A46-5FC6-822A-249BBFB50C90}", "entry": { "name": "In", @@ -101601,7 +101601,7 @@ ] }, { - "key": "AssignAt", + "base": "AssignAt", "context": "{3A9E52F9-1A46-5FC6-822A-249BBFB50C90}", "entry": { "name": "In", @@ -101636,7 +101636,7 @@ ] }, { - "key": "GetSize", + "base": "GetSize", "context": "{3A9E52F9-1A46-5FC6-822A-249BBFB50C90}", "entry": { "name": "In", @@ -101667,7 +101667,7 @@ ] }, { - "key": "Insert", + "base": "Insert", "context": "{3A9E52F9-1A46-5FC6-822A-249BBFB50C90}", "entry": { "name": "In", @@ -101710,7 +101710,7 @@ ] }, { - "key": "PushBack", + "base": "PushBack", "context": "{3A9E52F9-1A46-5FC6-822A-249BBFB50C90}", "entry": { "name": "In", @@ -101739,7 +101739,7 @@ ] }, { - "key": "Reserve", + "base": "Reserve", "context": "{3A9E52F9-1A46-5FC6-822A-249BBFB50C90}", "entry": { "name": "In", @@ -101768,7 +101768,7 @@ ] }, { - "key": "Iterate_VM", + "base": "Iterate_VM", "context": "{3A9E52F9-1A46-5FC6-822A-249BBFB50C90}", "entry": { "name": "In", From 423e2e8da86ae358287e16b05055ac39d2811aa8 Mon Sep 17 00:00:00 2001 From: Vincent Liu <5900509+onecent1101@users.noreply.github.com> Date: Tue, 23 Nov 2021 12:06:39 -0800 Subject: [PATCH 220/345] Unify resource mapping json schema across cpp and python usage (#5799) * Unify resource mapping json schema across cpp and python usage Signed-off-by: onecent1101 * Update based on feedback Signed-off-by: onecent1101 * Add empty line at end of file Signed-off-by: onecent1101 --- Gems/AWSCore/Code/CMakeLists.txt | 19 +++++ .../AWSResourceMappingConstants.h | 61 +--------------- .../AWSResourceMappingManager.cpp | 9 ++- .../AWSResourceMappingManagerTest.cpp | 4 +- .../Code/Tests/TestFramework/AWSCoreFixture.h | 34 +++++++-- .../resource_mapping_schema.json | 56 +++++++++++++++ .../resource_mapping_tool.py | 10 +++ .../tests/unit/utils/test_file_utils.py | 59 +++++++++++++++- .../tests/unit/utils/test_json_utils.py | 5 ++ .../ResourceMappingTool/utils/file_utils.py | 25 ++++++- .../ResourceMappingTool/utils/json_utils.py | 69 ++++++++++++++----- 11 files changed, 260 insertions(+), 91 deletions(-) create mode 100644 Gems/AWSCore/Code/Tools/ResourceMappingTool/resource_mapping_schema.json diff --git a/Gems/AWSCore/Code/CMakeLists.txt b/Gems/AWSCore/Code/CMakeLists.txt index 7559f4720b..624f61d88a 100644 --- a/Gems/AWSCore/Code/CMakeLists.txt +++ b/Gems/AWSCore/Code/CMakeLists.txt @@ -154,10 +154,20 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED) AZ::AWSNativeSDKInit Gem::AWSCore.Static ) + ly_add_googletest( NAME Gem::AWSCore.Tests ) + ly_add_target_files( + TARGETS + AWSCore.Tests + FILES + ${CMAKE_CURRENT_SOURCE_DIR}/Tools/ResourceMappingTool/resource_mapping_schema.json + OUTPUT_SUBDIRECTORY + Gems/AWSCore + ) + if (PAL_TRAIT_BUILD_HOST_TOOLS) ly_add_target( NAME AWSCore.Editor.Tests ${PAL_TRAIT_TEST_TARGET_TYPE} @@ -189,4 +199,13 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED) endif() endif() +ly_add_target_files( + TARGETS + AWSCore + FILES + ${CMAKE_CURRENT_SOURCE_DIR}/Tools/ResourceMappingTool/resource_mapping_schema.json + OUTPUT_SUBDIRECTORY + Gems/AWSCore +) + ly_install_directory(DIRECTORIES Tools/ResourceMappingTool) diff --git a/Gems/AWSCore/Code/Include/Private/ResourceMapping/AWSResourceMappingConstants.h b/Gems/AWSCore/Code/Include/Private/ResourceMapping/AWSResourceMappingConstants.h index a3d18c1ea1..e9d063eb5f 100644 --- a/Gems/AWSCore/Code/Include/Private/ResourceMapping/AWSResourceMappingConstants.h +++ b/Gems/AWSCore/Code/Include/Private/ResourceMapping/AWSResourceMappingConstants.h @@ -22,63 +22,6 @@ namespace AWSCore static constexpr const char ResourceMappingTypeKeyName[] = "Type"; static constexpr const char ResourceMappingVersionKeyName[] = "Version"; - // TODO: move this into an independent file under AWSCore gem, if resource mapping tool can reuse it - static constexpr const char ResourceMappingJsonSchema[] = - R"({ - "$schema": "http://json-schema.org/draft-04/schema", - "type": "object", - "title": "The AWS Resource Mapping Root schema", - "required": ["AWSResourceMappings", "AccountId", "Region", "Version"], - "properties": { - "AWSResourceMappings": { - "type": "object", - "title": "The AWSResourceMappings schema", - "patternProperties": { - "^.+$": { - "type": "object", - "title": "The AWS Resource Entry schema", - "required": ["Type", "Name/ID"], - "properties": { - "Type": { - "$ref": "#/NonEmptyString" - }, - "Name/ID": { - "$ref": "#/NonEmptyString" - }, - "AccountId": { - "$ref": "#/AccountIdString" - }, - "Region": { - "$ref": "#/RegionString" - } - } - } - }, - "additionalProperties": false - }, - "AccountId": { - "$ref": "#/AccountIdString" - }, - "Region": { - "$ref": "#/RegionString" - }, - "Version": { - "pattern": "^[0-9]{1}.[0-9]{1}.[0-9]{1}$" - } - }, - "AccountIdString": { - "type": "string", - "pattern": "^[0-9]{12}$|EMPTY|^$" - }, - "NonEmptyString": { - "type": "string", - "minLength": 1 - }, - "RegionString": { - "type": "string", - "pattern": "^[a-z]{2}-[a-z]{4,9}-[0-9]{1}$" - }, - "additionalProperties": false -})"; - + static constexpr const char ResourceMapppingJsonSchemaFilePath[] = + "Gems/AWSCore/resource_mapping_schema.json"; } // namespace AWSCore diff --git a/Gems/AWSCore/Code/Source/ResourceMapping/AWSResourceMappingManager.cpp b/Gems/AWSCore/Code/Source/ResourceMapping/AWSResourceMappingManager.cpp index faec07b19e..d6a3912523 100644 --- a/Gems/AWSCore/Code/Source/ResourceMapping/AWSResourceMappingManager.cpp +++ b/Gems/AWSCore/Code/Source/ResourceMapping/AWSResourceMappingManager.cpp @@ -12,6 +12,7 @@ #include #include #include +#include #include #include @@ -244,14 +245,16 @@ namespace AWSCore bool AWSResourceMappingManager::ValidateJsonDocumentAgainstSchema(const rapidjson::Document& jsonDocument) { - rapidjson::Document jsonSchemaDocument; - if (jsonSchemaDocument.Parse(ResourceMappingJsonSchema).HasParseError()) + AZ::IO::Path executablePath = AZ::IO::PathView(AZ::Utils::GetExecutableDirectory()); + AZ::IO::Path jsonSchemaPath = (executablePath / ResourceMapppingJsonSchemaFilePath).LexicallyNormal(); + AZ::Outcome readJsonOutcome = AZ::JsonSerializationUtils::ReadJsonFile(jsonSchemaPath.c_str()); + if (!readJsonOutcome.IsSuccess() || readJsonOutcome.TakeValue().ObjectEmpty()) { AZ_Error(AWSResourceMappingManagerName, false, ResourceMappingFileInvalidSchemaErrorMessage); return false; } - auto jsonSchema = rapidjson::SchemaDocument(jsonSchemaDocument); + auto jsonSchema = rapidjson::SchemaDocument(readJsonOutcome.TakeValue()); rapidjson::SchemaValidator validator(jsonSchema); if (!jsonDocument.Accept(validator)) diff --git a/Gems/AWSCore/Code/Tests/ResourceMapping/AWSResourceMappingManagerTest.cpp b/Gems/AWSCore/Code/Tests/ResourceMapping/AWSResourceMappingManagerTest.cpp index 81ea166848..fd37e6e228 100644 --- a/Gems/AWSCore/Code/Tests/ResourceMapping/AWSResourceMappingManagerTest.cpp +++ b/Gems/AWSCore/Code/Tests/ResourceMapping/AWSResourceMappingManagerTest.cpp @@ -121,7 +121,7 @@ public: void SetUp() override { - AWSCoreFixture::SetUp(); + AWSCoreFixture::SetUpFixture(false); m_normalizedSourceProjectFolder = AZStd::string::format("%s/%s%s/", AZ::Test::GetCurrentExecutablePath().c_str(), "AWSResourceMappingManager", AZ::Uuid::CreateRandom().ToString(false, false).c_str()); @@ -142,7 +142,7 @@ public: m_resourceMappingManager->DeactivateManager(); m_resourceMappingManager.reset(); - AWSCoreFixture::TearDown(); + AWSCoreFixture::TearDownFixture(false); } // AWSCoreInternalRequestBus interface implementation diff --git a/Gems/AWSCore/Code/Tests/TestFramework/AWSCoreFixture.h b/Gems/AWSCore/Code/Tests/TestFramework/AWSCoreFixture.h index 1d14484387..65e609b490 100644 --- a/Gems/AWSCore/Code/Tests/TestFramework/AWSCoreFixture.h +++ b/Gems/AWSCore/Code/Tests/TestFramework/AWSCoreFixture.h @@ -8,6 +8,7 @@ #pragma once +#include #include #include #include @@ -111,6 +112,11 @@ public: ~AWSCoreFixture() override = default; void SetUp() override + { + SetUpFixture(); + } + + void SetUpFixture(bool mockSettingsRegistry = true) { AZ::AllocatorInstance::Create(); AZ::AllocatorInstance::Create(); @@ -120,14 +126,33 @@ public: AZ::IO::FileIOBase::SetInstance(nullptr); AZ::IO::FileIOBase::SetInstance(m_localFileIO); - m_settingsRegistry = AZStd::make_unique(); - AZ::SettingsRegistry::Register(m_settingsRegistry.get()); + if (mockSettingsRegistry) + { + m_settingsRegistry = AZStd::make_unique(); + AZ::SettingsRegistry::Register(m_settingsRegistry.get()); + } + else + { + m_app = AZStd::make_unique(); + } } void TearDown() override { - AZ::SettingsRegistry::Unregister(m_settingsRegistry.get()); - m_settingsRegistry.reset(); + TearDownFixture(); + } + + void TearDownFixture(bool mockSettingsRegistry = true) + { + if (mockSettingsRegistry) + { + AZ::SettingsRegistry::Unregister(m_settingsRegistry.get()); + m_settingsRegistry.reset(); + } + else + { + m_app.reset(); + } AZ::IO::FileIOBase::SetInstance(nullptr); @@ -173,4 +198,5 @@ private: protected: AZStd::unique_ptr m_settingsRegistry; + AZStd::unique_ptr m_app; }; diff --git a/Gems/AWSCore/Code/Tools/ResourceMappingTool/resource_mapping_schema.json b/Gems/AWSCore/Code/Tools/ResourceMappingTool/resource_mapping_schema.json new file mode 100644 index 0000000000..21bc3334ce --- /dev/null +++ b/Gems/AWSCore/Code/Tools/ResourceMappingTool/resource_mapping_schema.json @@ -0,0 +1,56 @@ +{ + "$schema": "http://json-schema.org/draft-04/schema", + "type": "object", + "title": "O3DE AWS Resource mapping file schema", + "required": ["AWSResourceMappings", "AccountId", "Region", "Version"], + "properties": { + "AWSResourceMappings": { + "type": "object", + "title": "AWS resource mappings schema", + "patternProperties": { + "^.+$": { + "type": "object", + "title": "AWS resource entry schema", + "required": ["Type", "Name/ID"], + "properties": { + "Type": { + "$ref": "#/NonEmptyString" + }, + "Name/ID": { + "$ref": "#/NonEmptyString" + }, + "AccountId": { + "$ref": "#/AccountIdString" + }, + "Region": { + "$ref": "#/RegionString" + } + } + } + }, + "additionalProperties": false + }, + "AccountId": { + "$ref": "#/AccountIdString" + }, + "Region": { + "$ref": "#/RegionString" + }, + "Version": { + "pattern": "^[0-9]{1}.[0-9]{1}.[0-9]{1}$" + } + }, + "AccountIdString": { + "type": "string", + "pattern": "^[0-9]{12}$|EMPTY|^$" + }, + "NonEmptyString": { + "type": "string", + "minLength": 1 + }, + "RegionString": { + "type": "string", + "pattern": "^[a-z]{2}-[a-z]{4,9}-[0-9]{1}$" + }, + "additionalProperties": false +} diff --git a/Gems/AWSCore/Code/Tools/ResourceMappingTool/resource_mapping_tool.py b/Gems/AWSCore/Code/Tools/ResourceMappingTool/resource_mapping_tool.py index 2351fd001b..7424854d2a 100755 --- a/Gems/AWSCore/Code/Tools/ResourceMappingTool/resource_mapping_tool.py +++ b/Gems/AWSCore/Code/Tools/ResourceMappingTool/resource_mapping_tool.py @@ -10,6 +10,7 @@ import logging import sys from utils import environment_utils +from utils import json_utils from utils import file_utils # arguments setup @@ -74,6 +75,15 @@ if __name__ == "__main__": except FileNotFoundError: logger.warning("Failed to load style sheet for resource mapping tool") + try: + schema_path: str = file_utils.join_path(file_utils.get_parent_directory_path(__file__), + 'resource_mapping_schema.json') + json_utils.load_resource_mapping_json_schema(schema_path) + except (FileNotFoundError, ValueError, KeyError) as e: + logger.error(f"Failed to load schema file {e}") + environment_utils.cleanup_qt_environment() + exit(-1) + logger.info("Initializing configuration manager ...") configuration_manager: ConfigurationManager = ConfigurationManager() configuration_error: bool = not configuration_manager.setup(arguments.profile, arguments.config_path) diff --git a/Gems/AWSCore/Code/Tools/ResourceMappingTool/tests/unit/utils/test_file_utils.py b/Gems/AWSCore/Code/Tools/ResourceMappingTool/tests/unit/utils/test_file_utils.py index fe0f1754f3..e74771f1ef 100755 --- a/Gems/AWSCore/Code/Tools/ResourceMappingTool/tests/unit/utils/test_file_utils.py +++ b/Gems/AWSCore/Code/Tools/ResourceMappingTool/tests/unit/utils/test_file_utils.py @@ -68,12 +68,65 @@ class TestFileUtils(TestCase): self._mock_path.cwd.assert_called_once() assert actual_path_name == TestFileUtils._expected_path_name - def test_get_parent_directory_path_return_expected_path_name(self) -> None: - self._mock_path.return_value.parent = TestFileUtils._expected_path_name + def test_get_parent_directory_path_return_empty_when_invalid_input(self) -> None: + mocked_path: MagicMock = self._mock_path.return_value + mocked_path.exists.return_value = False actual_path_name: str = file_utils.get_parent_directory_path("dummy") self._mock_path.assert_called_once() - assert actual_path_name == TestFileUtils._expected_path_name + assert actual_path_name == "" + + def test_get_parent_directory_path_return_empty_when_parent_invalid(self) -> None: + mocked_path: MagicMock = self._mock_path.return_value + mocked_path.exists.return_value = True + mocked_parent_path: MagicMock = MagicMock() + mocked_path.parent = mocked_parent_path + mocked_parent_path.exists.return_value = False + + actual_path_name: str = file_utils.get_parent_directory_path("dummy") + self._mock_path.assert_called() + assert actual_path_name == "" + + def test_get_parent_directory_path_return_expected_path_when_parent_valid(self) -> None: + mocked_path: MagicMock = self._mock_path.return_value + mocked_path.exists.return_value = True + mocked_parent_path: MagicMock = MagicMock() + mocked_path.parent = mocked_parent_path + mocked_parent_path.exists.return_value = True + mocked_parent_path.resolve.return_value = TestFileUtils._expected_file_name + + actual_path_name: str = file_utils.get_parent_directory_path("dummy") + self._mock_path.assert_called() + assert actual_path_name == TestFileUtils._expected_file_name + + def test_get_parent_directory_path_return_empty_when_level_two_parent_invalid(self) -> None: + mocked_path: MagicMock = self._mock_path.return_value + mocked_path.exists.return_value = True + mocked_parent_path1: MagicMock = MagicMock() + mocked_path.parent = mocked_parent_path1 + mocked_parent_path1.exists.return_value = True + mocked_parent_path2: MagicMock = MagicMock() + mocked_parent_path1.parent = mocked_parent_path2 + mocked_parent_path2.exists.return_value = False + + actual_path_name: str = file_utils.get_parent_directory_path("dummy", 2) + self._mock_path.assert_called() + assert actual_path_name == "" + + def test_get_parent_directory_path_return_expected_path_when_level_two_parent_valid(self) -> None: + mocked_path: MagicMock = self._mock_path.return_value + mocked_path.exists.return_value = True + mocked_parent_path1: MagicMock = MagicMock() + mocked_path.parent = mocked_parent_path1 + mocked_parent_path1.exists.return_value = True + mocked_parent_path2: MagicMock = MagicMock() + mocked_parent_path1.parent = mocked_parent_path2 + mocked_parent_path2.exists.return_value = True + mocked_parent_path2.resolve.return_value = TestFileUtils._expected_file_name + + actual_path_name: str = file_utils.get_parent_directory_path("dummy", 2) + self._mock_path.assert_called() + assert actual_path_name == TestFileUtils._expected_file_name def test_find_files_with_suffix_under_directory_return_expected_file_name(self) -> None: mocked_path: MagicMock = self._mock_path.return_value diff --git a/Gems/AWSCore/Code/Tools/ResourceMappingTool/tests/unit/utils/test_json_utils.py b/Gems/AWSCore/Code/Tools/ResourceMappingTool/tests/unit/utils/test_json_utils.py index 9fe99461ba..819bfb72fc 100755 --- a/Gems/AWSCore/Code/Tools/ResourceMappingTool/tests/unit/utils/test_json_utils.py +++ b/Gems/AWSCore/Code/Tools/ResourceMappingTool/tests/unit/utils/test_json_utils.py @@ -10,6 +10,7 @@ from typing import (Dict, List) from unittest import TestCase from unittest.mock import (MagicMock, mock_open, patch) +from utils import file_utils from utils import json_utils from model import constants from model.resource_mapping_attributes import (ResourceMappingAttributes, ResourceMappingAttributesBuilder, @@ -49,6 +50,10 @@ class TestJsonUtils(TestCase): } def setUp(self) -> None: + schema_path: str = file_utils.join_path(file_utils.get_parent_directory_path(__file__, 4), + 'resource_mapping_schema.json') + json_utils.load_resource_mapping_json_schema(schema_path) + self._mock_open = mock_open() open_patcher: patch = patch("utils.json_utils.open", self._mock_open) self.addCleanup(open_patcher.stop) diff --git a/Gems/AWSCore/Code/Tools/ResourceMappingTool/utils/file_utils.py b/Gems/AWSCore/Code/Tools/ResourceMappingTool/utils/file_utils.py index 9e5dd9617b..9899c5dbb2 100755 --- a/Gems/AWSCore/Code/Tools/ResourceMappingTool/utils/file_utils.py +++ b/Gems/AWSCore/Code/Tools/ResourceMappingTool/utils/file_utils.py @@ -33,8 +33,29 @@ def get_current_directory_path() -> str: return str(pathlib.Path.cwd()) -def get_parent_directory_path(file_path: str) -> str: - return pathlib.Path(file_path).parent +def get_parent_directory_path(file_path: str, level: int = 1) -> str: + """ + Get parent directory path based on requested file path + :param file_path: The requested file path + :param level: The level of parent directory, default value is 1 + :return The string value of parent directory path if exist; otherwise empty string + """ + if not pathlib.Path(file_path).exists(): + return "" + + result: pathlib.Path = pathlib.Path(file_path).parent + current_level: int = 1 + while current_level < level: + current_level += 1 + if result.exists(): + result = result.parent + else: + return "" + + if not result.exists(): + return "" + else: + return result.resolve() def find_files_with_suffix_under_directory(dir_path: str, suffix: str) -> List[str]: diff --git a/Gems/AWSCore/Code/Tools/ResourceMappingTool/utils/json_utils.py b/Gems/AWSCore/Code/Tools/ResourceMappingTool/utils/json_utils.py index 8c094a895c..3af9b9ff4a 100755 --- a/Gems/AWSCore/Code/Tools/ResourceMappingTool/utils/json_utils.py +++ b/Gems/AWSCore/Code/Tools/ResourceMappingTool/utils/json_utils.py @@ -19,18 +19,29 @@ Json Utils provide related functions to read/write/serialize/deserialize json fo """ logger = logging.getLogger(__name__) +# resource mapping json content constants _RESOURCE_MAPPING_JSON_KEY_NAME: str = "AWSResourceMappings" _RESOURCE_MAPPING_TYPE_JSON_KEY_NAME: str = "Type" _RESOURCE_MAPPING_NAMEID_JSON_KEY_NAME: str = "Name/ID" _RESOURCE_MAPPING_REGION_JSON_KEY_NAME: str = "Region" _RESOURCE_MAPPING_VERSION_JSON_KEY_NAME: str = "Version" _RESOURCE_MAPPING_JSON_FORMAT_VERSION: str = "1.1.0" - RESOURCE_MAPPING_ACCOUNTID_JSON_KEY_NAME: str = "AccountId" RESOURCE_MAPPING_ACCOUNTID_TEMPLATE_VALUE: str = "EMPTY" -_RESOURCE_MAPPING_ACCOUNTID_PATTERN: str = f"^[0-9]{{12}}$|{RESOURCE_MAPPING_ACCOUNTID_TEMPLATE_VALUE}|^$" -_RESOURCE_MAPPING_REGION_PATTERN: str = "^[a-z]{2}-[a-z]{4,9}-[0-9]{1}$" -_RESOURCE_MAPPING_VERSION_PATTERN: str = "^[0-9]{1}.[0-9]{1}.[0-9]{1}$" + +# resource mapping json schema constants +_RESOURCE_MAPPING_SCHEMA_ACCOUNTID_KEY_NAME: str = "AccountIdString" +_RESOURCE_MAPPING_SCHEMA_REGION_KEY_NAME: str = "RegionString" +_RESOURCE_MAPPING_SCHEMA_REQUIRED_PROPERTIES_KEY_NAME: str = "required" +_RESOURCE_MAPPING_SCHEMA_PROPERTIES_KEY_NAME: str = "properties" +_RESOURCE_MAPPING_SCHEMA_PATTERN_PROPERTIES_KEY_NAME: str = "patternProperties" +_RESOURCE_MAPPING_SCHEMA_PROPERTY_PATTERN_KEY_NAME: str = "pattern" +_RESOURCE_MAPPING_SCHEMA: Dict[str, any] = {} +_RESOURCE_MAPPING_SCHEMA_REQUIRED_ROOT_PROPERTIES: List[str] = [] +_RESOURCE_MAPPING_SCHEMA_REQUIRED_RESOURCE_PROPERTIES: List[str] = [] +_RESOURCE_MAPPING_SCHEMA_ACCOUNTID_PATTERN: str = "" +_RESOURCE_MAPPING_SCHEMA_REGION_PATTERN: str = "" +_RESOURCE_MAPPING_SCHEMA_VERSION_PATTERN: str = "" def _add_validation_error_message(errors: Dict[int, List[str]], row: int, error_message: str) -> None: if row in errors.keys(): @@ -119,6 +130,26 @@ def convert_json_dict_to_resources(json_dict: Dict[str, any]) -> List[ResourceMa return resources +def load_resource_mapping_json_schema(schema_path: str) -> None: + global _RESOURCE_MAPPING_SCHEMA, _RESOURCE_MAPPING_SCHEMA_REQUIRED_ROOT_PROPERTIES, _RESOURCE_MAPPING_SCHEMA_REQUIRED_RESOURCE_PROPERTIES,\ + _RESOURCE_MAPPING_SCHEMA_ACCOUNTID_PATTERN, _RESOURCE_MAPPING_SCHEMA_REGION_PATTERN, _RESOURCE_MAPPING_SCHEMA_VERSION_PATTERN + + if not _RESOURCE_MAPPING_SCHEMA: + # assume schema should be in correct format, and manually load expected pattern; tool will log error if schema is invalid + _RESOURCE_MAPPING_SCHEMA = read_from_json_file(schema_path) + _RESOURCE_MAPPING_SCHEMA_REQUIRED_ROOT_PROPERTIES = _RESOURCE_MAPPING_SCHEMA[_RESOURCE_MAPPING_SCHEMA_REQUIRED_PROPERTIES_KEY_NAME] + schema_properties: Dict[str, any] = _RESOURCE_MAPPING_SCHEMA[_RESOURCE_MAPPING_SCHEMA_PROPERTIES_KEY_NAME] + schema_pattern_properties: Dict[str, any] = \ + schema_properties[_RESOURCE_MAPPING_JSON_KEY_NAME][_RESOURCE_MAPPING_SCHEMA_PATTERN_PROPERTIES_KEY_NAME] + _RESOURCE_MAPPING_SCHEMA_REQUIRED_RESOURCE_PROPERTIES = list(schema_pattern_properties.values())[0][_RESOURCE_MAPPING_SCHEMA_REQUIRED_PROPERTIES_KEY_NAME] + _RESOURCE_MAPPING_SCHEMA_ACCOUNTID_PATTERN = \ + _RESOURCE_MAPPING_SCHEMA[_RESOURCE_MAPPING_SCHEMA_ACCOUNTID_KEY_NAME][_RESOURCE_MAPPING_SCHEMA_PROPERTY_PATTERN_KEY_NAME] + _RESOURCE_MAPPING_SCHEMA_REGION_PATTERN = \ + _RESOURCE_MAPPING_SCHEMA[_RESOURCE_MAPPING_SCHEMA_REGION_KEY_NAME][_RESOURCE_MAPPING_SCHEMA_PROPERTY_PATTERN_KEY_NAME] + _RESOURCE_MAPPING_SCHEMA_VERSION_PATTERN = \ + schema_properties[_RESOURCE_MAPPING_VERSION_JSON_KEY_NAME][_RESOURCE_MAPPING_SCHEMA_PROPERTY_PATTERN_KEY_NAME] + + def read_from_json_file(file_name: str) -> Dict[str, any]: try: json_dict: Dict[str, any] = {} @@ -166,20 +197,20 @@ def validate_resources_according_to_json_schema(resources: List[ResourceMappingA invalid_resources, row_count, error_messages.INVALID_FORMAT_DUPLICATED_KEY_ERROR_MESSAGE.format(resource.key_name)) - if not re.match(_RESOURCE_MAPPING_ACCOUNTID_PATTERN, resource.account_id): + if not re.match(_RESOURCE_MAPPING_SCHEMA_ACCOUNTID_PATTERN, resource.account_id): _add_validation_error_message( invalid_resources, row_count, error_messages.INVALID_FORMAT_UNEXPECTED_VALUE_IN_TABLE_ERROR_MESSAGE.format( resource.account_id, RESOURCE_MAPPING_ACCOUNTID_JSON_KEY_NAME, - _RESOURCE_MAPPING_ACCOUNTID_PATTERN)) + _RESOURCE_MAPPING_SCHEMA_ACCOUNTID_PATTERN)) - if not re.match(_RESOURCE_MAPPING_REGION_PATTERN, resource.region): + if not re.match(_RESOURCE_MAPPING_SCHEMA_REGION_PATTERN, resource.region): _add_validation_error_message( invalid_resources, row_count, error_messages.INVALID_FORMAT_UNEXPECTED_VALUE_IN_TABLE_ERROR_MESSAGE.format( resource.region, _RESOURCE_MAPPING_REGION_JSON_KEY_NAME, - _RESOURCE_MAPPING_REGION_PATTERN)) + _RESOURCE_MAPPING_SCHEMA_REGION_PATTERN)) row_count += 1 @@ -187,30 +218,32 @@ def validate_resources_according_to_json_schema(resources: List[ResourceMappingA def validate_json_dict_according_to_json_schema(json_dict: Dict[str, any]) -> None: - _validate_required_key_in_json_dict(json_dict, "root", _RESOURCE_MAPPING_VERSION_JSON_KEY_NAME) - _validate_required_key_in_json_dict(json_dict, "root", _RESOURCE_MAPPING_JSON_KEY_NAME) + # The reason we keep this manual json schema validation is python missing supportive feature in default libs + # When it is ready, we should be able to replace this with straightforward lib function call + root_property: str + for root_property in _RESOURCE_MAPPING_SCHEMA_REQUIRED_ROOT_PROPERTIES: + _validate_required_key_in_json_dict(json_dict, "root", root_property) - _validate_required_key_in_json_dict(json_dict, "root", RESOURCE_MAPPING_ACCOUNTID_JSON_KEY_NAME) - if not re.match(_RESOURCE_MAPPING_ACCOUNTID_PATTERN, json_dict[RESOURCE_MAPPING_ACCOUNTID_JSON_KEY_NAME]): + if not re.match(_RESOURCE_MAPPING_SCHEMA_ACCOUNTID_PATTERN, json_dict[RESOURCE_MAPPING_ACCOUNTID_JSON_KEY_NAME]): raise ValueError(error_messages.INVALID_FORMAT_UNEXPECTED_VALUE_IN_FILE_ERROR_MESSAGE.format( json_dict[RESOURCE_MAPPING_ACCOUNTID_JSON_KEY_NAME], f"root/{RESOURCE_MAPPING_ACCOUNTID_JSON_KEY_NAME}", - _RESOURCE_MAPPING_ACCOUNTID_PATTERN)) + _RESOURCE_MAPPING_SCHEMA_ACCOUNTID_PATTERN)) - _validate_required_key_in_json_dict(json_dict, "root", _RESOURCE_MAPPING_REGION_JSON_KEY_NAME) - if not re.match(_RESOURCE_MAPPING_REGION_PATTERN, json_dict[_RESOURCE_MAPPING_REGION_JSON_KEY_NAME]): + if not re.match(_RESOURCE_MAPPING_SCHEMA_REGION_PATTERN, json_dict[_RESOURCE_MAPPING_REGION_JSON_KEY_NAME]): raise ValueError(error_messages.INVALID_FORMAT_UNEXPECTED_VALUE_IN_FILE_ERROR_MESSAGE.format( json_dict[_RESOURCE_MAPPING_REGION_JSON_KEY_NAME], f"root/{_RESOURCE_MAPPING_REGION_JSON_KEY_NAME}", - _RESOURCE_MAPPING_REGION_PATTERN)) + _RESOURCE_MAPPING_SCHEMA_REGION_PATTERN)) json_resources: Dict[str, any] = json_dict[_RESOURCE_MAPPING_JSON_KEY_NAME] if json_resources: resource_key: str resource_value: Dict[str, str] for resource_key, resource_value in json_resources.items(): - _validate_required_key_in_json_dict(resource_value, resource_key, _RESOURCE_MAPPING_TYPE_JSON_KEY_NAME) - _validate_required_key_in_json_dict(resource_value, resource_key, _RESOURCE_MAPPING_NAMEID_JSON_KEY_NAME) + resource_property: str + for resource_property in _RESOURCE_MAPPING_SCHEMA_REQUIRED_RESOURCE_PROPERTIES: + _validate_required_key_in_json_dict(resource_value, resource_key, resource_property) def write_into_json_file(file_name: str, json_dict: Dict[str, any]) -> None: From 91076dbf7955fffc7fb7c71307cd4702eb4b3ad7 Mon Sep 17 00:00:00 2001 From: lsemp3d <58790905+lsemp3d@users.noreply.github.com> Date: Tue, 23 Nov 2021 12:07:52 -0800 Subject: [PATCH 221/345] Removed temporary migration code to replace 'key' entry in names files Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com> --- .../Source/Translation/TranslationSerializer.cpp | 14 ++------------ .../Source/Translation/TranslationSerializer.h | 10 ++++------ 2 files changed, 6 insertions(+), 18 deletions(-) diff --git a/Gems/GraphCanvas/Code/Source/Translation/TranslationSerializer.cpp b/Gems/GraphCanvas/Code/Source/Translation/TranslationSerializer.cpp index 1f76b53b27..80e488f3dc 100644 --- a/Gems/GraphCanvas/Code/Source/Translation/TranslationSerializer.cpp +++ b/Gems/GraphCanvas/Code/Source/Translation/TranslationSerializer.cpp @@ -68,12 +68,7 @@ namespace GraphCanvas // if there is a "base" member within the object, then use it, otherwise use the index if (array[i].IsObject()) { - if (array[i].HasMember(Schema::Field::deprecated_key)) - { - AZStd::string innerKey = array[i].FindMember(Schema::Field::deprecated_key)->value.GetString(); - itemKey.append(AZStd::string::format(".%s", innerKey.c_str())); - } - else if (array[i].HasMember(Schema::Field::key)) + if (array[i].HasMember(Schema::Field::key)) { AZStd::string innerKey = array[i].FindMember(Schema::Field::key)->value.GetString(); itemKey.append(AZStd::string::format(".%s", innerKey.c_str())); @@ -126,12 +121,7 @@ namespace GraphCanvas AZStd::string keyStr; rapidjson::Value::ConstMemberIterator keyValue; - if (entry.HasMember(Schema::Field::deprecated_key)) - { - keyValue = entry.FindMember(Schema::Field::deprecated_key); - keyStr = keyValue->value.GetString(); - } - else if (entry.HasMember(Schema::Field::key)) + if (entry.HasMember(Schema::Field::key)) { keyValue = entry.FindMember(Schema::Field::key); keyStr = keyValue->value.GetString(); diff --git a/Gems/GraphCanvas/Code/Source/Translation/TranslationSerializer.h b/Gems/GraphCanvas/Code/Source/Translation/TranslationSerializer.h index 605e06a76b..edf3b9013b 100644 --- a/Gems/GraphCanvas/Code/Source/Translation/TranslationSerializer.h +++ b/Gems/GraphCanvas/Code/Source/Translation/TranslationSerializer.h @@ -28,12 +28,10 @@ namespace GraphCanvas { namespace Field { - // Moved away from "key" due to some strict filtering on secrets - static constexpr char deprecated_key[] = "key"; - static constexpr char key[] = "base"; - static constexpr char context[] = "context"; - static constexpr char variant[] = "variant"; - static constexpr char entries[] = "entries"; + inline constexpr char key[] = "base"; + inline constexpr char context[] = "context"; + inline constexpr char variant[] = "variant"; + inline constexpr char entries[] = "entries"; } } } From 3b9d5a725071c88e7cf0678eed05cd408c85d824 Mon Sep 17 00:00:00 2001 From: lsemp3d <58790905+lsemp3d@users.noreply.github.com> Date: Tue, 23 Nov 2021 12:56:29 -0800 Subject: [PATCH 222/345] More updates and a fix for parameter and result name generation Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com> --- .../Classes/AcesParameterOverrides.names | 56 ++-- .../Classes/MaterialAssignment.names | 26 +- .../Classes/MaterialAssignmentId.names | 36 +-- .../Classes/ShaderSemantic.names | 29 +-- .../TranslationAssets/Classes/UiOffsets.names | 242 ++++++++++++++---- .../TranslationAssets/Classes/UiPadding.names | 242 ++++++++++++++---- .../UiRadioButtonGroupNotificationBus.names | 9 +- .../UiRadioButtonNotificationBus.names | 8 +- .../AssetCollectionAsyncLoaderTestBus.names | 2 +- .../EBus/Senders/AssetEditorRequestBus.names | 2 +- .../BoxShapeComponentRequestsBus.names | 2 +- .../CapsuleShapeComponentRequestsBus.names | 2 +- .../ComponentModeSystemRequestBus.names | 2 +- .../Senders/ConstantGradientRequestBus.names | 2 +- .../CylinderShapeComponentRequestsBus.names | 2 +- .../DiskShapeComponentRequestsBus.names | 2 +- .../Senders/DitherGradientRequestBus.names | 2 +- .../Senders/EditorCameraViewRequestBus.names | 2 +- .../EBus/Senders/EditorEntityAPIBus.names | 2 +- .../EditorEntityContextRequestBus.names | 2 +- .../Senders/EditorEntityInfoRequestBus.names | 2 +- .../EditorLayerComponentRequestBus.names | 2 +- .../EditorLayerTrackViewRequestBus.names | 2 +- .../Senders/EditorReflectionProbeBus.names | 2 +- .../EBus/Senders/EditorRequestBus.names | 2 +- .../EditorToolsApplicationRequestBus.names | 2 +- .../Senders/ExposureControlRequestBus.names | 2 +- .../EBus/Senders/FrameCaptureRequestBus.names | 2 +- .../EBus/Senders/GradientRequestBus.names | 2 +- .../GradientSurfaceDataRequestBus.names | 2 +- .../GradientTransformModifierRequestBus.names | 2 +- .../Senders/GraphControllerRequestBus.names | 2 +- .../EBus/Senders/GraphManagerRequestBus.names | 2 +- .../Senders/GridComponentRequestBus.names | 2 +- .../Senders/HDRColorGradingRequestBus.names | 2 +- .../EBus/Senders/HDRiSkyboxRequestBus.names | 2 +- .../ImageBasedLightComponentRequestBus.names | 2 +- .../Senders/ImageGradientRequestBus.names | 2 +- .../Senders/InvertGradientRequestBus.names | 2 +- .../Senders/LevelsGradientRequestBus.names | 2 +- .../Senders/LookModificationRequestBus.names | 2 +- .../Senders/MixedGradientRequestBus.names | 2 +- .../Senders/PerformanceStatisticsEBus.names | 2 +- .../Senders/PerlinGradientRequestBus.names | 2 +- .../EBus/Senders/PostFxLayerRequestBus.names | 2 +- .../Senders/PosterizeGradientRequestBus.names | 2 +- .../EBus/Senders/PrefabPublicRequestBus.names | 2 +- .../Senders/ProfilingCaptureRequestBus.names | 2 +- .../EBus/Senders/PythonEditorBus.names | 2 +- .../QuadShapeComponentRequestsBus.names | 2 +- .../Senders/RandomGradientRequestBus.names | 2 +- .../RandomTimedSpawnerRequestBus.names | 2 +- .../Senders/ReferenceGradientRequestBus.names | 2 +- .../RenderMeshComponentRequestBus.names | 2 +- .../EBus/Senders/SceneRequestBus.names | 2 +- .../ShapeAreaFalloffGradientRequestBus.names | 2 +- .../Senders/ShapeComponentRequestsBus.names | 2 +- .../EBus/Senders/SliceRequestBus.names | 2 +- .../SmoothStepGradientRequestBus.names | 2 +- .../EBus/Senders/SmoothStepRequestBus.names | 2 +- .../SphereShapeComponentRequestsBus.names | 2 +- .../Senders/SplineComponentRequestBus.names | 2 +- .../EBus/Senders/SsaoRequestBus.names | 2 +- .../SurfaceAltitudeGradientRequestBus.names | 2 +- .../SurfaceMaskGradientRequestBus.names | 2 +- .../SurfaceSlopeGradientRequestBus.names | 2 +- .../Senders/ThresholdGradientRequestBus.names | 2 +- .../Senders/ToolsApplicationRequestBus.names | 2 +- .../TubeShapeComponentRequestsBus.names | 2 +- .../EBus/Senders/UiAnimationBus.names | 2 +- .../EBus/Senders/UiButtonBus.names | 4 +- .../EBus/Senders/UiCanvasAssetRefBus.names | 2 +- .../EBus/Senders/UiCanvasBus.names | 2 +- .../EBus/Senders/UiCanvasManagerBus.names | 2 +- .../EBus/Senders/UiCanvasProxyRefBus.names | 2 +- .../EBus/Senders/UiCanvasRefBus.names | 2 +- .../EBus/Senders/UiCheckboxBus.names | 2 +- .../EBus/Senders/UiClickableTextBus.names | 2 +- .../EBus/Senders/UiCursorBus.names | 2 +- .../EBus/Senders/UiCustomImageBus.names | 2 +- .../EBus/Senders/UiDraggableBus.names | 2 +- .../EBus/Senders/UiDropTargetBus.names | 2 +- .../EBus/Senders/UiDropdownBus.names | 2 +- .../EBus/Senders/UiDropdownOptionBus.names | 2 +- .../Senders/UiDynamicContentDatabaseBus.names | 2 +- .../EBus/Senders/UiDynamicLayoutBus.names | 2 +- .../EBus/Senders/UiDynamicScrollBoxBus.names | 2 +- .../EBus/Senders/UiElementBus.names | 2 +- .../EBus/Senders/UiFaderBus.names | 2 +- .../EBus/Senders/UiFlipbookAnimationBus.names | 2 +- .../EBus/Senders/UiImageBus.names | 2 +- .../EBus/Senders/UiImageSequenceBus.names | 2 +- .../EBus/Senders/UiIndexableImageBus.names | 2 +- .../Senders/UiInteractableActionsBus.names | 2 +- .../EBus/Senders/UiInteractableBus.names | 2 +- .../Senders/UiInteractableStatesBus.names | 2 +- .../EBus/Senders/UiLayoutBus.names | 2 +- .../EBus/Senders/UiLayoutCellBus.names | 2 +- .../EBus/Senders/UiLayoutColumnBus.names | 2 +- .../EBus/Senders/UiLayoutFitterBus.names | 2 +- .../EBus/Senders/UiLayoutGridBus.names | 2 +- .../EBus/Senders/UiLayoutRowBus.names | 2 +- .../EBus/Senders/UiMarkupButtonBus.names | 2 +- .../EBus/Senders/UiMaskBus.names | 2 +- .../EBus/Senders/UiNavigationBus.names | 2 +- .../EBus/Senders/UiParticleEmitterBus.names | 2 +- .../EBus/Senders/UiRadioButtonBus.names | 2 +- .../EBus/Senders/UiRadioButtonGroupBus.names | 2 +- .../EBus/Senders/UiScrollBarBus.names | 2 +- .../EBus/Senders/UiScrollBoxBus.names | 2 +- .../EBus/Senders/UiScrollerBus.names | 2 +- .../EBus/Senders/UiSliderBus.names | 2 +- .../EBus/Senders/UiSpawnerBus.names | 2 +- .../EBus/Senders/UiTextBus.names | 2 +- .../EBus/Senders/UiTextInputBus.names | 2 +- .../EBus/Senders/UiTooltipBus.names | 2 +- .../EBus/Senders/UiTooltipDisplayBus.names | 2 +- .../EBus/Senders/UiTransform2dBus.names | 2 +- .../Code/Tools/TranslationGeneration.cpp | 8 +- 119 files changed, 587 insertions(+), 291 deletions(-) diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AcesParameterOverrides.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AcesParameterOverrides.names index d1c7a70e04..370d185ab1 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AcesParameterOverrides.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AcesParameterOverrides.names @@ -35,7 +35,7 @@ { "base": "GetOutputDeviceTransformType_4000Nits", "details": { - "name": "Get Output Device Transform Type_ 4000 Nits" + "name": "Get Output Device Transform Type 4000 Nits" }, "results": [ { @@ -49,7 +49,7 @@ { "base": "GetOutputDeviceTransformType_2000Nits", "details": { - "name": "Get Output Device Transform Type_ 2000 Nits" + "name": "Get Output Device Transform Type 2000 Nits" }, "results": [ { @@ -63,13 +63,13 @@ { "base": "GetapplyCATD60toD65", "details": { - "name": "GetapplyCATD 60toD 65" + "name": "Get Apply CATD 60 to D65" }, "params": [ { "typeid": "{3EE8C0D4-3792-46C0-B91C-B89A81C36B91}", "details": { - "name": "" + "name": "Aces Parameter Overrides" } } ], @@ -77,7 +77,7 @@ { "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", "details": { - "name": "" + "name": "Result" } } ] @@ -85,19 +85,19 @@ { "base": "SetapplyCATD60toD65", "details": { - "name": "SetapplyCATD 60toD 65" + "name": "Set Apply CATD 60 to D65" }, "params": [ { "typeid": "{3EE8C0D4-3792-46C0-B91C-B89A81C36B91}", "details": { - "name": "" + "name": "Aces Parameter Overrides" } }, { "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", "details": { - "name": "" + "name": "Result" } } ] @@ -105,7 +105,7 @@ { "base": "GetOutputDeviceTransformType_48Nits", "details": { - "name": "Get Output Device Transform Type_ 48 Nits" + "name": "Get Output Device Transform Type 48 Nits" }, "results": [ { @@ -119,7 +119,7 @@ { "base": "GetOutputDeviceTransformType_NumOutputDeviceTransformTypes", "details": { - "name": "Get Output Device Transform Type_ Num Output Device Transform Types" + "name": "Get Output Device Transform Type Num Output Device Transform Types" }, "results": [ { @@ -133,7 +133,7 @@ { "base": "GetOutputDeviceTransformType_1000Nits", "details": { - "name": "Get Output Device Transform Type_ 1000 Nits" + "name": "Get Output Device Transform Type 1000 Nits" }, "results": [ { @@ -147,13 +147,13 @@ { "base": "GetapplyDesaturation", "details": { - "name": "Getapply Desaturation" + "name": "Get Apply Desaturation" }, "params": [ { "typeid": "{3EE8C0D4-3792-46C0-B91C-B89A81C36B91}", "details": { - "name": "" + "name": "Aces Parameter Overrides" } } ], @@ -161,7 +161,7 @@ { "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", "details": { - "name": "" + "name": "Result" } } ] @@ -175,13 +175,13 @@ { "typeid": "{3EE8C0D4-3792-46C0-B91C-B89A81C36B91}", "details": { - "name": "" + "name": "Aces Parameter Overrides" } }, { "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", "details": { - "name": "" + "name": "Result" } } ] @@ -195,7 +195,7 @@ { "typeid": "{3EE8C0D4-3792-46C0-B91C-B89A81C36B91}", "details": { - "name": "" + "name": "Aces Parameter Overrides" } } ], @@ -203,7 +203,7 @@ { "typeid": "{B94085B7-C0D4-466A-A791-188A4559EC8D}", "details": { - "name": "" + "name": "Result" } } ] @@ -217,13 +217,13 @@ { "typeid": "{3EE8C0D4-3792-46C0-B91C-B89A81C36B91}", "details": { - "name": "" + "name": "Aces Parameter Overrides" } }, { "typeid": "{B94085B7-C0D4-466A-A791-188A4559EC8D}", "details": { - "name": "" + "name": "Result" } } ] @@ -237,7 +237,7 @@ { "typeid": "{3EE8C0D4-3792-46C0-B91C-B89A81C36B91}", "details": { - "name": "" + "name": "Aces Parameter Overrides" } } ], @@ -245,7 +245,7 @@ { "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", "details": { - "name": "" + "name": "Result" } } ] @@ -259,13 +259,13 @@ { "typeid": "{3EE8C0D4-3792-46C0-B91C-B89A81C36B91}", "details": { - "name": "" + "name": "Aces Parameter Overrides" } }, { "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", "details": { - "name": "" + "name": "Result" } } ] @@ -279,7 +279,7 @@ { "typeid": "{3EE8C0D4-3792-46C0-B91C-B89A81C36B91}", "details": { - "name": "" + "name": "Aces Parameter Overrides" } } ], @@ -287,7 +287,7 @@ { "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", "details": { - "name": "" + "name": "Result" } } ] @@ -301,13 +301,13 @@ { "typeid": "{3EE8C0D4-3792-46C0-B91C-B89A81C36B91}", "details": { - "name": "" + "name": "Aces Parameter Overrides" } }, { "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", "details": { - "name": "" + "name": "Result" } } ] diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MaterialAssignment.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MaterialAssignment.names index eee8e79088..99a0fa5f78 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MaterialAssignment.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MaterialAssignment.names @@ -27,7 +27,7 @@ { "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", "details": { - "name": "AZ Std::basic_string, allocator>" + "name": "String" } } ] @@ -35,13 +35,13 @@ { "base": "GetmaterialAsset", "details": { - "name": "Getmaterial Asset" + "name": "Get Material Asset" }, "params": [ { "typeid": "{C66E5214-A24B-4722-B7F0-5991E6F8F163}", "details": { - "name": "" + "name": "Material Assignment" } } ], @@ -49,7 +49,7 @@ { "typeid": "{834DC049-5EC3-5C29-B621-5F0046864DC4}", "details": { - "name": "" + "name": "Material Asset" } } ] @@ -57,19 +57,19 @@ { "base": "SetmaterialAsset", "details": { - "name": "Setmaterial Asset" + "name": "Set Material Asset" }, "params": [ { "typeid": "{C66E5214-A24B-4722-B7F0-5991E6F8F163}", "details": { - "name": "" + "name": "Material Assignment" } }, { "typeid": "{834DC049-5EC3-5C29-B621-5F0046864DC4}", "details": { - "name": "" + "name": "Material Asset" } } ] @@ -77,13 +77,13 @@ { "base": "GetpropertyOverrides", "details": { - "name": "Getproperty Overrides" + "name": "Get Property Overrides" }, "params": [ { "typeid": "{C66E5214-A24B-4722-B7F0-5991E6F8F163}", "details": { - "name": "" + "name": "Material Assignment" } } ], @@ -91,7 +91,7 @@ { "typeid": "{6E6962E1-04C9-56F9-89C4-361031CC1384}", "details": { - "name": "" + "name": "Override" } } ] @@ -99,19 +99,19 @@ { "base": "SetpropertyOverrides", "details": { - "name": "Setproperty Overrides" + "name": "Set Property Overrides" }, "params": [ { "typeid": "{C66E5214-A24B-4722-B7F0-5991E6F8F163}", "details": { - "name": "" + "name": "Material Assignment" } }, { "typeid": "{6E6962E1-04C9-56F9-89C4-361031CC1384}", "details": { - "name": "" + "name": "Override" } } ] diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MaterialAssignmentId.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MaterialAssignmentId.names index 4f8e8299ff..47dc8122a1 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MaterialAssignmentId.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MaterialAssignmentId.names @@ -27,7 +27,7 @@ { "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", "details": { - "name": "AZ Std::basic_string, allocator>" + "name": "String" } } ] @@ -50,7 +50,7 @@ { "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", "details": { - "name": "bool" + "name": "Is Asset Only" } } ] @@ -73,7 +73,7 @@ { "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", "details": { - "name": "bool" + "name": "Is Slot Id Only" } } ] @@ -96,7 +96,7 @@ { "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", "details": { - "name": "bool" + "name": "Is Lod And Slot Id" } } ] @@ -119,7 +119,7 @@ { "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", "details": { - "name": "bool" + "name": "Is Default" } } ] @@ -142,7 +142,7 @@ { "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", "details": { - "name": "bool" + "name": "Is Lod And Asset" } } ] @@ -150,13 +150,13 @@ { "base": "GetlodIndex", "details": { - "name": "Getlod Index" + "name": "Get LOD Index" }, "params": [ { "typeid": "{EB603581-4654-4C17-B6DE-AE61E79EDA97}", "details": { - "name": "" + "name": "Material Assignment Id" } } ], @@ -164,7 +164,7 @@ { "typeid": "{D6597933-47CD-4FC8-B911-63F3E2B0993A}", "details": { - "name": "" + "name": "Value" } } ] @@ -172,19 +172,19 @@ { "base": "SetlodIndex", "details": { - "name": "Setlod Index" + "name": "Set LOD Index" }, "params": [ { "typeid": "{EB603581-4654-4C17-B6DE-AE61E79EDA97}", "details": { - "name": "" + "name": "Material Assignment Id" } }, { "typeid": "{D6597933-47CD-4FC8-B911-63F3E2B0993A}", "details": { - "name": "" + "name": "Value" } } ] @@ -192,13 +192,13 @@ { "base": "GetmaterialSlotStableId", "details": { - "name": "Getmaterial Slot Stable Id" + "name": "Get Material Slot Stable Id" }, "params": [ { "typeid": "{EB603581-4654-4C17-B6DE-AE61E79EDA97}", "details": { - "name": "" + "name": "Material Assignment Id" } } ], @@ -206,7 +206,7 @@ { "typeid": "{43DA906B-7DEF-4CA8-9790-854106D3F983}", "details": { - "name": "" + "name": "Value" } } ] @@ -214,19 +214,19 @@ { "base": "SetmaterialSlotStableId", "details": { - "name": "Setmaterial Slot Stable Id" + "name": "Set Material Slot Stable Id" }, "params": [ { "typeid": "{EB603581-4654-4C17-B6DE-AE61E79EDA97}", "details": { - "name": "" + "name": "Material Assignment Id" } }, { "typeid": "{43DA906B-7DEF-4CA8-9790-854106D3F983}", "details": { - "name": "" + "name": "Value" } } ] diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ShaderSemantic.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ShaderSemantic.names index 372a9a7e79..f5890fe28f 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ShaderSemantic.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ShaderSemantic.names @@ -5,8 +5,7 @@ "context": "BehaviorClass", "variant": "", "details": { - "name": "Shader Semantic", - "category": "Rendering" + "name": "Shader Semantic" }, "methods": [ { @@ -27,7 +26,7 @@ { "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", "details": { - "name": "AZ Std::basic_string, allocator>" + "name": "String" } } ] @@ -35,13 +34,13 @@ { "base": "Getname", "details": { - "name": "Getname" + "name": "Get Name" }, "params": [ { "typeid": "{C6FFF25F-FE52-4D08-8D96-D04C14048816}", "details": { - "name": "" + "name": "Shader Semantic" } } ], @@ -49,7 +48,7 @@ { "typeid": "{3D2B920C-9EFD-40D5-AAE0-DF131C3D4931}", "details": { - "name": "" + "name": "Name" } } ] @@ -57,19 +56,19 @@ { "base": "Setname", "details": { - "name": "Setname" + "name": "Set Name" }, "params": [ { "typeid": "{C6FFF25F-FE52-4D08-8D96-D04C14048816}", "details": { - "name": "" + "name": "Shader Semantic" } }, { "typeid": "{3D2B920C-9EFD-40D5-AAE0-DF131C3D4931}", "details": { - "name": "" + "name": "Name" } } ] @@ -77,13 +76,13 @@ { "base": "Getindex", "details": { - "name": "Getindex" + "name": "Get Index" }, "params": [ { "typeid": "{C6FFF25F-FE52-4D08-8D96-D04C14048816}", "details": { - "name": "" + "name": "Shader Semantic" } } ], @@ -91,7 +90,7 @@ { "typeid": "{43DA906B-7DEF-4CA8-9790-854106D3F983}", "details": { - "name": "" + "name": "Index" } } ] @@ -99,19 +98,19 @@ { "base": "Setindex", "details": { - "name": "Setindex" + "name": "Set Index" }, "params": [ { "typeid": "{C6FFF25F-FE52-4D08-8D96-D04C14048816}", "details": { - "name": "" + "name": "Shader Semantic" } }, { "typeid": "{43DA906B-7DEF-4CA8-9790-854106D3F983}", "details": { - "name": "" + "name": "Index" } } ] diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/UiOffsets.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/UiOffsets.names index 6b7aa8422a..8115b68587 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/UiOffsets.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/UiOffsets.names @@ -14,29 +14,26 @@ "context": "UiOffsets", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetBottom" + "tooltip": "When signaled, this will invoke Set Bottom" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetBottom is invoked" + "tooltip": "Signaled after Set Bottom is invoked" }, "details": { - "name": "UiOffsets::SetBottom", - "category": "UI" + "name": "Set Bottom" }, "params": [ { "typeid": "{F681BA9D-245C-4630-B20E-05DD752FAD57}", "details": { - "name": "Offsets", - "tooltip": "The Offsets for which to set the bottom offset" + "name": "Offsets" } }, { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", "details": { - "name": "Bottom", - "tooltip": "The offset from the anchors to the bottom edge of the element" + "name": "Value" } } ] @@ -46,29 +43,26 @@ "context": "UiOffsets", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetRight" + "tooltip": "When signaled, this will invoke Set Right" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetRight is invoked" + "tooltip": "Signaled after Set Right is invoked" }, "details": { - "name": "UiOffsets::SetRight", - "category": "UI" + "name": "Set Right" }, "params": [ { "typeid": "{F681BA9D-245C-4630-B20E-05DD752FAD57}", "details": { - "name": "Offsets", - "tooltip": "The offsets for which to set the right offset" + "name": "Offsets" } }, { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", "details": { - "name": "Right", - "tooltip": "The offset from the anchors to the right edge of the element" + "name": "Value" } } ] @@ -78,50 +72,44 @@ "context": "UiOffsets", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetOffsets" + "tooltip": "When signaled, this will invoke Set Offsets" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetOffsets is invoked" + "tooltip": "Signaled after Set Offsets is invoked" }, "details": { - "name": "UiOffsets::SetOffsets", - "category": "UI" + "name": "Set Offsets" }, "params": [ { "typeid": "{F681BA9D-245C-4630-B20E-05DD752FAD57}", "details": { - "name": "Offsets", - "tooltip": "The offsets to set" + "name": "Offsets" } }, { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", "details": { - "name": "Left", - "tooltip": "The offset from the anchors to the left edge of the element" + "name": "Left" } }, { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", "details": { - "name": "Top", - "tooltip": "The offset from the anchors to the top edge of the element" + "name": "Top" } }, { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", "details": { - "name": "Right", - "tooltip": "The offset from the anchors to the right edge of the element" + "name": "Right" } }, { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", "details": { - "name": "Bottom", - "tooltip": "The offset from the anchors to the bottom edge of the element" + "name": "Bottom" } } ] @@ -131,29 +119,26 @@ "context": "UiOffsets", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetTop" + "tooltip": "When signaled, this will invoke Set Top" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetTop is invoked" + "tooltip": "Signaled after Set Top is invoked" }, "details": { - "name": "UiOffsets::SetTop", - "category": "UI" + "name": "Set Top" }, "params": [ { "typeid": "{F681BA9D-245C-4630-B20E-05DD752FAD57}", "details": { - "name": "Offsets", - "tooltip": "The offsets for which to set the top offset" + "name": "Offsets" } }, { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", "details": { - "name": "Top", - "tooltip": "The offset from the anchors to the top edge of the element" + "name": "Value" } } ] @@ -163,29 +148,194 @@ "context": "UiOffsets", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetLeft" + "tooltip": "When signaled, this will invoke Set Left" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetLeft is invoked" + "tooltip": "Signaled after Set Left is invoked" }, "details": { - "name": "UiOffsets::SetLeft", - "category": "UI" + "name": "Set Left" }, "params": [ { "typeid": "{F681BA9D-245C-4630-B20E-05DD752FAD57}", "details": { - "name": "Offsets", - "tooltip": "The offsets for which to set the left offset" + "name": "Offsets" } }, { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", "details": { - "name": "Left", - "tooltip": "The offset from the anchors to the left edge of the element" + "name": "Value" + } + } + ] + }, + { + "base": "Getleft", + "details": { + "name": "Get Left" + }, + "params": [ + { + "typeid": "{F681BA9D-245C-4630-B20E-05DD752FAD57}", + "details": { + "name": "Offsets" + } + } + ], + "results": [ + { + "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", + "details": { + "name": "Value" + } + } + ] + }, + { + "base": "Setleft", + "details": { + "name": "Set Left" + }, + "params": [ + { + "typeid": "{F681BA9D-245C-4630-B20E-05DD752FAD57}", + "details": { + "name": "Offsets" + } + }, + { + "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", + "details": { + "name": "Value" + } + } + ] + }, + { + "base": "Gettop", + "details": { + "name": "Get Top" + }, + "params": [ + { + "typeid": "{F681BA9D-245C-4630-B20E-05DD752FAD57}", + "details": { + "name": "Offsets" + } + } + ], + "results": [ + { + "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", + "details": { + "name": "Value" + } + } + ] + }, + { + "base": "Settop", + "details": { + "name": "Set Top" + }, + "params": [ + { + "typeid": "{F681BA9D-245C-4630-B20E-05DD752FAD57}", + "details": { + "name": "Offsets" + } + }, + { + "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", + "details": { + "name": "Value" + } + } + ] + }, + { + "base": "Getright", + "details": { + "name": "Get Right" + }, + "params": [ + { + "typeid": "{F681BA9D-245C-4630-B20E-05DD752FAD57}", + "details": { + "name": "Offsets" + } + } + ], + "results": [ + { + "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", + "details": { + "name": "Value" + } + } + ] + }, + { + "base": "Setright", + "details": { + "name": "Set Right" + }, + "params": [ + { + "typeid": "{F681BA9D-245C-4630-B20E-05DD752FAD57}", + "details": { + "name": "Offsets" + } + }, + { + "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", + "details": { + "name": "Value" + } + } + ] + }, + { + "base": "Getbottom", + "details": { + "name": "Get Bottom" + }, + "params": [ + { + "typeid": "{F681BA9D-245C-4630-B20E-05DD752FAD57}", + "details": { + "name": "Offsets" + } + } + ], + "results": [ + { + "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", + "details": { + "name": "Value" + } + } + ] + }, + { + "base": "Setbottom", + "details": { + "name": "Set Bottom" + }, + "params": [ + { + "typeid": "{F681BA9D-245C-4630-B20E-05DD752FAD57}", + "details": { + "name": "Offsets" + } + }, + { + "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", + "details": { + "name": "Value" } } ] diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/UiPadding.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/UiPadding.names index 5b1e4d4f93..4249172ac9 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/UiPadding.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/UiPadding.names @@ -14,50 +14,44 @@ "context": "UiPadding", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetPadding" + "tooltip": "When signaled, this will invoke Set Padding" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetPadding is invoked" + "tooltip": "Signaled after Set Padding is invoked" }, "details": { - "name": "UiPadding::SetPadding", - "category": "UI" + "name": "Set Padding" }, "params": [ { "typeid": "{DE5C18B0-4214-4A37-B590-8D45CC450A96}", "details": { - "name": "Padding", - "tooltip": "The padding to set" + "name": "Padding" } }, { "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", "details": { - "name": "Left", - "tooltip": "The padding inside the left edge of the element" + "name": "int" } }, { "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", "details": { - "name": "Top", - "tooltip": "The padding inside the top edge of the element" + "name": "int" } }, { "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", "details": { - "name": "Right", - "tooltip": "The padding inside the right edge of the element" + "name": "int" } }, { "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", "details": { - "name": "Bottom", - "tooltip": "The padding inside the bottom edge of the element" + "name": "int" } } ] @@ -67,29 +61,26 @@ "context": "UiPadding", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetBottom" + "tooltip": "When signaled, this will invoke Set Bottom" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetBottom is invoked" + "tooltip": "Signaled after Set Bottom is invoked" }, "details": { - "name": "UiPadding::SetBottom", - "category": "UI" + "name": "Set Bottom" }, "params": [ { "typeid": "{DE5C18B0-4214-4A37-B590-8D45CC450A96}", "details": { - "name": "Padding", - "tooltip": "The padding for which to set the bottom padding" + "name": "Padding" } }, { "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", "details": { - "name": "Bottom", - "tooltip": "The padding inside the bottom edge of the element" + "name": "int" } } ] @@ -99,29 +90,26 @@ "context": "UiPadding", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetRight" + "tooltip": "When signaled, this will invoke Set Right" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetRight is invoked" + "tooltip": "Signaled after Set Right is invoked" }, "details": { - "name": "UiPadding::SetRight", - "category": "UI" + "name": "Set Right" }, "params": [ { "typeid": "{DE5C18B0-4214-4A37-B590-8D45CC450A96}", "details": { - "name": "Padding", - "tooltip": "The padding for which to set the right padding" + "name": "Padding" } }, { "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", "details": { - "name": "Right", - "tooltip": "The padding inside the right edge of the element" + "name": "int" } } ] @@ -131,29 +119,26 @@ "context": "UiPadding", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetTop" + "tooltip": "When signaled, this will invoke Set Top" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetTop is invoked" + "tooltip": "Signaled after Set Top is invoked" }, "details": { - "name": "UiPadding::SetTop", - "category": "UI" + "name": "Set Top" }, "params": [ { "typeid": "{DE5C18B0-4214-4A37-B590-8D45CC450A96}", "details": { - "name": "Padding", - "tooltip": "The padding for which to set the top padding" + "name": "Padding" } }, { "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", "details": { - "name": "Top", - "tooltip": "The padding inside the top edge of the element" + "name": "int" } } ] @@ -163,29 +148,194 @@ "context": "UiPadding", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetLeft" + "tooltip": "When signaled, this will invoke Set Left" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetLeft is invoked" + "tooltip": "Signaled after Set Left is invoked" }, "details": { - "name": "UiPadding::SetLeft", - "category": "UI" + "name": "Set Left" }, "params": [ { "typeid": "{DE5C18B0-4214-4A37-B590-8D45CC450A96}", "details": { - "name": "Padding", - "tooltip": "The padding for which to set the left padding" + "name": "Padding" } }, { "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", "details": { - "name": "Left", - "tooltip": "The padding inside the left edge of the element" + "name": "int" + } + } + ] + }, + { + "base": "Getleft", + "details": { + "name": "Getleft" + }, + "params": [ + { + "typeid": "{DE5C18B0-4214-4A37-B590-8D45CC450A96}", + "details": { + "name": "Padding" + } + } + ], + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + }, + { + "base": "Setleft", + "details": { + "name": "Setleft" + }, + "params": [ + { + "typeid": "{DE5C18B0-4214-4A37-B590-8D45CC450A96}", + "details": { + "name": "Padding" + } + }, + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + }, + { + "base": "Getright", + "details": { + "name": "Getright" + }, + "params": [ + { + "typeid": "{DE5C18B0-4214-4A37-B590-8D45CC450A96}", + "details": { + "name": "Padding" + } + } + ], + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + }, + { + "base": "Setright", + "details": { + "name": "Setright" + }, + "params": [ + { + "typeid": "{DE5C18B0-4214-4A37-B590-8D45CC450A96}", + "details": { + "name": "Padding" + } + }, + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + }, + { + "base": "Gettop", + "details": { + "name": "Gettop" + }, + "params": [ + { + "typeid": "{DE5C18B0-4214-4A37-B590-8D45CC450A96}", + "details": { + "name": "Padding" + } + } + ], + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + }, + { + "base": "Settop", + "details": { + "name": "Settop" + }, + "params": [ + { + "typeid": "{DE5C18B0-4214-4A37-B590-8D45CC450A96}", + "details": { + "name": "Padding" + } + }, + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + }, + { + "base": "Getbottom", + "details": { + "name": "Getbottom" + }, + "params": [ + { + "typeid": "{DE5C18B0-4214-4A37-B590-8D45CC450A96}", + "details": { + "name": "Padding" + } + } + ], + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + }, + { + "base": "Setbottom", + "details": { + "name": "Setbottom" + }, + "params": [ + { + "typeid": "{DE5C18B0-4214-4A37-B590-8D45CC450A96}", + "details": { + "name": "Padding" + } + }, + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" } } ] diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiRadioButtonGroupNotificationBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiRadioButtonGroupNotificationBus.names index d21eb84512..7104cc3079 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiRadioButtonGroupNotificationBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiRadioButtonGroupNotificationBus.names @@ -5,22 +5,21 @@ "context": "EBusHandler", "variant": "", "details": { - "name": "UI Radio Button Group", + "name": "Ui Radio Button Group", "category": "UI" }, "methods": [ { "base": "OnRadioButtonGroupStateChange", "details": { - "name": "On Radio Button Group State Change", - "tooltip": "Executes when the radio button group state has changed" + "name": "On Radio Button Group State Change" }, "params": [ { "typeid": "{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}", "details": { - "name": "Radio Button EntityID", - "tooltip": "The radio button that is checked" + "name": "Entity Id", + "tooltip": "Entity Unique Id" } } ] diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiRadioButtonNotificationBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiRadioButtonNotificationBus.names index 7219cce771..df18c13d58 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiRadioButtonNotificationBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/UiRadioButtonNotificationBus.names @@ -5,22 +5,20 @@ "context": "EBusHandler", "variant": "", "details": { - "name": "UI Radio Button", + "name": "Ui Radio Button", "category": "UI" }, "methods": [ { "base": "OnRadioButtonStateChange", "details": { - "name": "On RadioButton State Change", - "tooltip": "Executes when the radio button state has changed" + "name": "On Radio Button State Change" }, "params": [ { "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", "details": { - "name": "Checked", - "tooltip": "Indicates whether the radio button is checked" + "name": "Checked" } } ] diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AssetCollectionAsyncLoaderTestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AssetCollectionAsyncLoaderTestBus.names index 98a242a478..6195542299 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AssetCollectionAsyncLoaderTestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AssetCollectionAsyncLoaderTestBus.names @@ -5,7 +5,7 @@ "context": "EBusSender", "variant": "", "details": { - "name": "AssetCollectionAsyncLoaderTestBus" + "name": "Asset Collection Async Loader Test" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AssetEditorRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AssetEditorRequestBus.names index 5c93fe893d..d3a7087a65 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AssetEditorRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AssetEditorRequestBus.names @@ -5,7 +5,7 @@ "context": "EBusSender", "variant": "", "details": { - "name": "AssetEditorRequestBus" + "name": "Asset Editor" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/BoxShapeComponentRequestsBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/BoxShapeComponentRequestsBus.names index 16fbe8c4bd..fa5d79c19d 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/BoxShapeComponentRequestsBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/BoxShapeComponentRequestsBus.names @@ -5,7 +5,7 @@ "context": "EBusSender", "variant": "", "details": { - "name": "BoxShapeComponentRequestsBus", + "name": "Box Shape Component", "category": "Shape" }, "methods": [ diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/CapsuleShapeComponentRequestsBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/CapsuleShapeComponentRequestsBus.names index d8d9222b09..e6d8a64a2e 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/CapsuleShapeComponentRequestsBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/CapsuleShapeComponentRequestsBus.names @@ -5,7 +5,7 @@ "context": "EBusSender", "variant": "", "details": { - "name": "CapsuleShapeComponentRequestsBus", + "name": "Capsule Shape Component", "category": "Shape" }, "methods": [ diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ComponentModeSystemRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ComponentModeSystemRequestBus.names index d657a8218a..e8297fc8d0 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ComponentModeSystemRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ComponentModeSystemRequestBus.names @@ -5,7 +5,7 @@ "context": "EBusSender", "variant": "", "details": { - "name": "ComponentModeSystemRequestBus" + "name": "Component Mode System" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ConstantGradientRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ConstantGradientRequestBus.names index a7313a9ffd..fb39e2431c 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ConstantGradientRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ConstantGradientRequestBus.names @@ -5,7 +5,7 @@ "context": "EBusSender", "variant": "", "details": { - "name": "ConstantGradientRequestBus" + "name": "Constant Gradient" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/CylinderShapeComponentRequestsBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/CylinderShapeComponentRequestsBus.names index b4de59a887..f576047ecb 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/CylinderShapeComponentRequestsBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/CylinderShapeComponentRequestsBus.names @@ -5,7 +5,7 @@ "context": "EBusSender", "variant": "", "details": { - "name": "CylinderShapeComponentRequestsBus", + "name": "Cylinder Shape Component", "category": "Shape" }, "methods": [ diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/DiskShapeComponentRequestsBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/DiskShapeComponentRequestsBus.names index 8ba928cf1a..128a77fcc1 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/DiskShapeComponentRequestsBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/DiskShapeComponentRequestsBus.names @@ -5,7 +5,7 @@ "context": "EBusSender", "variant": "", "details": { - "name": "DiskShapeComponentRequestsBus" + "name": "Disk Shape Component" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/DitherGradientRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/DitherGradientRequestBus.names index 3eb019767f..8179539db3 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/DitherGradientRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/DitherGradientRequestBus.names @@ -5,7 +5,7 @@ "context": "EBusSender", "variant": "", "details": { - "name": "DitherGradientRequestBus" + "name": "Dither Gradient" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/EditorCameraViewRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/EditorCameraViewRequestBus.names index 1fd0dafc6e..8fa5f016fe 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/EditorCameraViewRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/EditorCameraViewRequestBus.names @@ -5,7 +5,7 @@ "context": "EBusSender", "variant": "", "details": { - "name": "EditorCameraViewRequestBus" + "name": "Editor Camera View" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/EditorEntityAPIBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/EditorEntityAPIBus.names index 2e11a4e4ee..cfe5aa0540 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/EditorEntityAPIBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/EditorEntityAPIBus.names @@ -5,7 +5,7 @@ "context": "EBusSender", "variant": "", "details": { - "name": "EditorEntityAPIBus" + "name": "Editor Entity API" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/EditorEntityContextRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/EditorEntityContextRequestBus.names index f87678c0fa..6411ef233e 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/EditorEntityContextRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/EditorEntityContextRequestBus.names @@ -5,7 +5,7 @@ "context": "EBusSender", "variant": "", "details": { - "name": "EditorEntityContextRequestBus" + "name": "Editor Entity Context" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/EditorEntityInfoRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/EditorEntityInfoRequestBus.names index c8c2085ede..b817a475c0 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/EditorEntityInfoRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/EditorEntityInfoRequestBus.names @@ -5,7 +5,7 @@ "context": "EBusSender", "variant": "", "details": { - "name": "EditorEntityInfoRequestBus" + "name": "Editor Entity Info" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/EditorLayerComponentRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/EditorLayerComponentRequestBus.names index f280f11360..a65a960fa4 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/EditorLayerComponentRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/EditorLayerComponentRequestBus.names @@ -5,7 +5,7 @@ "context": "EBusSender", "variant": "", "details": { - "name": "EditorLayerComponentRequestBus" + "name": "Editor Layer Component" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/EditorLayerTrackViewRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/EditorLayerTrackViewRequestBus.names index 58712e28bd..18f70bbc55 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/EditorLayerTrackViewRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/EditorLayerTrackViewRequestBus.names @@ -5,7 +5,7 @@ "context": "EBusSender", "variant": "", "details": { - "name": "EditorLayerTrackViewRequestBus" + "name": "Editor Layer TrackView" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/EditorReflectionProbeBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/EditorReflectionProbeBus.names index 9893d61dad..ad66aa3650 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/EditorReflectionProbeBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/EditorReflectionProbeBus.names @@ -5,7 +5,7 @@ "context": "EBusSender", "variant": "", "details": { - "name": "EditorReflectionProbeBus" + "name": "Editor Reflection Probe" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/EditorRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/EditorRequestBus.names index 55ee11ab52..a2dae6e173 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/EditorRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/EditorRequestBus.names @@ -5,7 +5,7 @@ "context": "EBusSender", "variant": "", "details": { - "name": "EditorRequestBus" + "name": "Editor" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/EditorToolsApplicationRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/EditorToolsApplicationRequestBus.names index 1fd4ea025a..bcb75ef940 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/EditorToolsApplicationRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/EditorToolsApplicationRequestBus.names @@ -5,7 +5,7 @@ "context": "EBusSender", "variant": "", "details": { - "name": "EditorToolsApplicationRequestBus" + "name": "Editor Tools Application" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ExposureControlRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ExposureControlRequestBus.names index 35662639a7..8c0ef018d5 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ExposureControlRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ExposureControlRequestBus.names @@ -5,7 +5,7 @@ "context": "EBusSender", "variant": "", "details": { - "name": "ExposureControlRequestBus" + "name": "Exposure Control" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/FrameCaptureRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/FrameCaptureRequestBus.names index 6730264044..e62d9335ab 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/FrameCaptureRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/FrameCaptureRequestBus.names @@ -5,7 +5,7 @@ "context": "EBusSender", "variant": "", "details": { - "name": "FrameCaptureRequestBus" + "name": "Frame Capture" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/GradientRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/GradientRequestBus.names index 0837fb2d27..6751b81944 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/GradientRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/GradientRequestBus.names @@ -5,7 +5,7 @@ "context": "EBusSender", "variant": "", "details": { - "name": "GradientRequestBus" + "name": "Gradient" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/GradientSurfaceDataRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/GradientSurfaceDataRequestBus.names index 7e7b9260b5..da7eee15d3 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/GradientSurfaceDataRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/GradientSurfaceDataRequestBus.names @@ -5,7 +5,7 @@ "context": "EBusSender", "variant": "", "details": { - "name": "GradientSurfaceDataRequestBus" + "name": "Gradient Surface Data" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/GradientTransformModifierRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/GradientTransformModifierRequestBus.names index 8628947f96..39d89b89cf 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/GradientTransformModifierRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/GradientTransformModifierRequestBus.names @@ -5,7 +5,7 @@ "context": "EBusSender", "variant": "", "details": { - "name": "GradientTransformModifierRequestBus" + "name": "Gradient TransformModifier" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/GraphControllerRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/GraphControllerRequestBus.names index 73d3e8ea01..88c29db6dc 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/GraphControllerRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/GraphControllerRequestBus.names @@ -5,7 +5,7 @@ "context": "EBusSender", "variant": "", "details": { - "name": "GraphControllerRequestBus" + "name": "Graph Controller" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/GraphManagerRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/GraphManagerRequestBus.names index 09dc3e9b12..36ece545e5 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/GraphManagerRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/GraphManagerRequestBus.names @@ -5,7 +5,7 @@ "context": "EBusSender", "variant": "", "details": { - "name": "GraphManagerRequestBus" + "name": "Graph Manager" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/GridComponentRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/GridComponentRequestBus.names index 8e5415a449..85993ff1db 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/GridComponentRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/GridComponentRequestBus.names @@ -5,7 +5,7 @@ "context": "EBusSender", "variant": "", "details": { - "name": "GridComponentRequestBus" + "name": "Grid Component" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/HDRColorGradingRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/HDRColorGradingRequestBus.names index 9327231516..3bf191d24a 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/HDRColorGradingRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/HDRColorGradingRequestBus.names @@ -5,7 +5,7 @@ "context": "EBusSender", "variant": "", "details": { - "name": "HDRColorGradingRequestBus" + "name": "HDR Color Grading" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/HDRiSkyboxRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/HDRiSkyboxRequestBus.names index e93be00413..84e56d7f0b 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/HDRiSkyboxRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/HDRiSkyboxRequestBus.names @@ -5,7 +5,7 @@ "context": "EBusSender", "variant": "", "details": { - "name": "HDRiSkyboxRequestBus" + "name": "HDRi Skybox" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ImageBasedLightComponentRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ImageBasedLightComponentRequestBus.names index 92b7f6375b..8d2c8b6c9a 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ImageBasedLightComponentRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ImageBasedLightComponentRequestBus.names @@ -5,7 +5,7 @@ "context": "EBusSender", "variant": "", "details": { - "name": "ImageBasedLightComponentRequestBus" + "name": "Image Based Light Component" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ImageGradientRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ImageGradientRequestBus.names index 12aefcefaf..390c21325d 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ImageGradientRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ImageGradientRequestBus.names @@ -5,7 +5,7 @@ "context": "EBusSender", "variant": "", "details": { - "name": "ImageGradientRequestBus" + "name": "Image Gradient" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/InvertGradientRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/InvertGradientRequestBus.names index 2fb486c743..ad15c077a2 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/InvertGradientRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/InvertGradientRequestBus.names @@ -5,7 +5,7 @@ "context": "EBusSender", "variant": "", "details": { - "name": "InvertGradientRequestBus" + "name": "Invert Gradient" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/LevelsGradientRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/LevelsGradientRequestBus.names index 565c85bdbc..24d7087be4 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/LevelsGradientRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/LevelsGradientRequestBus.names @@ -5,7 +5,7 @@ "context": "EBusSender", "variant": "", "details": { - "name": "LevelsGradientRequestBus" + "name": "Levels Gradient" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/LookModificationRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/LookModificationRequestBus.names index 27cdb67ed7..9b6a6374af 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/LookModificationRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/LookModificationRequestBus.names @@ -5,7 +5,7 @@ "context": "EBusSender", "variant": "", "details": { - "name": "LookModificationRequestBus" + "name": "Look Modification" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/MixedGradientRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/MixedGradientRequestBus.names index 5c5910b2ad..f20f3359af 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/MixedGradientRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/MixedGradientRequestBus.names @@ -5,7 +5,7 @@ "context": "EBusSender", "variant": "", "details": { - "name": "MixedGradientRequestBus" + "name": "Mixed Gradient" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/PerformanceStatisticsEBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/PerformanceStatisticsEBus.names index a09063b01e..d4d98c8d57 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/PerformanceStatisticsEBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/PerformanceStatisticsEBus.names @@ -5,7 +5,7 @@ "context": "EBusSender", "variant": "", "details": { - "name": "PerformanceStatisticsEBus" + "name": "Performance Statistics EBus" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/PerlinGradientRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/PerlinGradientRequestBus.names index 60ac349b37..ab568ed21d 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/PerlinGradientRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/PerlinGradientRequestBus.names @@ -5,7 +5,7 @@ "context": "EBusSender", "variant": "", "details": { - "name": "PerlinGradientRequestBus" + "name": "Perlin Gradient" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/PostFxLayerRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/PostFxLayerRequestBus.names index 7491c77700..d702aa43c9 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/PostFxLayerRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/PostFxLayerRequestBus.names @@ -5,7 +5,7 @@ "context": "EBusSender", "variant": "", "details": { - "name": "PostFxLayerRequestBus" + "name": "Post Fx Layer" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/PosterizeGradientRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/PosterizeGradientRequestBus.names index 846c1589bd..5bc37563f4 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/PosterizeGradientRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/PosterizeGradientRequestBus.names @@ -5,7 +5,7 @@ "context": "EBusSender", "variant": "", "details": { - "name": "PosterizeGradientRequestBus" + "name": "Posterize Gradient" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/PrefabPublicRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/PrefabPublicRequestBus.names index 772497d00e..8b0d5008aa 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/PrefabPublicRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/PrefabPublicRequestBus.names @@ -5,7 +5,7 @@ "context": "EBusSender", "variant": "", "details": { - "name": "PrefabPublicRequestBus" + "name": "Prefab Public" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ProfilingCaptureRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ProfilingCaptureRequestBus.names index 12c0139b45..d4096662ad 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ProfilingCaptureRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ProfilingCaptureRequestBus.names @@ -5,7 +5,7 @@ "context": "EBusSender", "variant": "", "details": { - "name": "ProfilingCaptureRequestBus" + "name": "Profiling Capture" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/PythonEditorBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/PythonEditorBus.names index 9cc731f39f..978b3e128f 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/PythonEditorBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/PythonEditorBus.names @@ -5,7 +5,7 @@ "context": "EBusSender", "variant": "", "details": { - "name": "PythonEditorBus" + "name": "Python Editor" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/QuadShapeComponentRequestsBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/QuadShapeComponentRequestsBus.names index 41779ee90d..ebbad06bca 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/QuadShapeComponentRequestsBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/QuadShapeComponentRequestsBus.names @@ -5,7 +5,7 @@ "context": "EBusSender", "variant": "", "details": { - "name": "QuadShapeComponentRequestsBus" + "name": "Quad Shape Component" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/RandomGradientRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/RandomGradientRequestBus.names index e0632ebf07..d2680911dc 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/RandomGradientRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/RandomGradientRequestBus.names @@ -5,7 +5,7 @@ "context": "EBusSender", "variant": "", "details": { - "name": "RandomGradientRequestBus" + "name": "Random Gradient" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/RandomTimedSpawnerRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/RandomTimedSpawnerRequestBus.names index f1afd0e575..73cae1f51a 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/RandomTimedSpawnerRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/RandomTimedSpawnerRequestBus.names @@ -5,7 +5,7 @@ "context": "EBusSender", "variant": "", "details": { - "name": "RandomTimedSpawnerRequestBus" + "name": "Random Timed Spawner" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ReferenceGradientRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ReferenceGradientRequestBus.names index 59e8d9a1ee..83c07428fe 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ReferenceGradientRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ReferenceGradientRequestBus.names @@ -5,7 +5,7 @@ "context": "EBusSender", "variant": "", "details": { - "name": "ReferenceGradientRequestBus" + "name": "Reference Gradient" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/RenderMeshComponentRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/RenderMeshComponentRequestBus.names index f31b4c9ace..b7d5c9ebe1 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/RenderMeshComponentRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/RenderMeshComponentRequestBus.names @@ -5,7 +5,7 @@ "context": "EBusSender", "variant": "", "details": { - "name": "RenderMeshComponentRequestBus" + "name": "Render Mesh Component" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/SceneRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/SceneRequestBus.names index 475200cf08..0e32488786 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/SceneRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/SceneRequestBus.names @@ -5,7 +5,7 @@ "context": "EBusSender", "variant": "", "details": { - "name": "SceneRequestBus" + "name": "Scene" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ShapeAreaFalloffGradientRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ShapeAreaFalloffGradientRequestBus.names index 7e786744b9..0071164355 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ShapeAreaFalloffGradientRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ShapeAreaFalloffGradientRequestBus.names @@ -5,7 +5,7 @@ "context": "EBusSender", "variant": "", "details": { - "name": "ShapeAreaFalloffGradientRequestBus" + "name": "Shape Area Falloff Gradient" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ShapeComponentRequestsBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ShapeComponentRequestsBus.names index c3bc56c418..f52f102e5f 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ShapeComponentRequestsBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ShapeComponentRequestsBus.names @@ -5,7 +5,7 @@ "context": "EBusSender", "variant": "", "details": { - "name": "ShapeComponentRequestsBus", + "name": "Shape Component", "category": "Shape" }, "methods": [ diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/SliceRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/SliceRequestBus.names index 309ad9b20c..e8eca764e7 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/SliceRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/SliceRequestBus.names @@ -5,7 +5,7 @@ "context": "EBusSender", "variant": "", "details": { - "name": "SliceRequestBus" + "name": "Slice" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/SmoothStepGradientRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/SmoothStepGradientRequestBus.names index 8d3bbb5337..27de9cad35 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/SmoothStepGradientRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/SmoothStepGradientRequestBus.names @@ -5,7 +5,7 @@ "context": "EBusSender", "variant": "", "details": { - "name": "SmoothStepGradientRequestBus" + "name": "Smooth Step Gradient" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/SmoothStepRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/SmoothStepRequestBus.names index 28b91a0a34..7d4f344644 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/SmoothStepRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/SmoothStepRequestBus.names @@ -5,7 +5,7 @@ "context": "EBusSender", "variant": "", "details": { - "name": "SmoothStepRequestBus" + "name": "Smooth Step" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/SphereShapeComponentRequestsBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/SphereShapeComponentRequestsBus.names index 170c490510..c19e21564e 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/SphereShapeComponentRequestsBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/SphereShapeComponentRequestsBus.names @@ -5,7 +5,7 @@ "context": "EBusSender", "variant": "", "details": { - "name": "SphereShapeComponentRequestsBus", + "name": "Sphere Shape Component", "category": "Shape" }, "methods": [ diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/SplineComponentRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/SplineComponentRequestBus.names index 7f4e164a01..ea1d84e847 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/SplineComponentRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/SplineComponentRequestBus.names @@ -5,7 +5,7 @@ "context": "EBusSender", "variant": "", "details": { - "name": "SplineComponentRequestBus", + "name": "Spline Component", "category": "Shape" }, "methods": [ diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/SsaoRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/SsaoRequestBus.names index 1d58037a04..a8bb6f244e 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/SsaoRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/SsaoRequestBus.names @@ -5,7 +5,7 @@ "context": "EBusSender", "variant": "", "details": { - "name": "SsaoRequestBus" + "name": "SSAO" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/SurfaceAltitudeGradientRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/SurfaceAltitudeGradientRequestBus.names index ff2d814e8b..9ef0487372 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/SurfaceAltitudeGradientRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/SurfaceAltitudeGradientRequestBus.names @@ -5,7 +5,7 @@ "context": "EBusSender", "variant": "", "details": { - "name": "SurfaceAltitudeGradientRequestBus" + "name": "Surface Altitude Gradient" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/SurfaceMaskGradientRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/SurfaceMaskGradientRequestBus.names index 13ea976480..5fa94d9dc8 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/SurfaceMaskGradientRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/SurfaceMaskGradientRequestBus.names @@ -5,7 +5,7 @@ "context": "EBusSender", "variant": "", "details": { - "name": "SurfaceMaskGradientRequestBus" + "name": "Surface Mask Gradient" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/SurfaceSlopeGradientRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/SurfaceSlopeGradientRequestBus.names index 8db09b1773..ac699f5fc5 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/SurfaceSlopeGradientRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/SurfaceSlopeGradientRequestBus.names @@ -5,7 +5,7 @@ "context": "EBusSender", "variant": "", "details": { - "name": "SurfaceSlopeGradientRequestBus" + "name": "Surface Slope Gradient" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ThresholdGradientRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ThresholdGradientRequestBus.names index b5eceff545..8ffeee9ab3 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ThresholdGradientRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ThresholdGradientRequestBus.names @@ -5,7 +5,7 @@ "context": "EBusSender", "variant": "", "details": { - "name": "ThresholdGradientRequestBus" + "name": "Threshold Gradient" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ToolsApplicationRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ToolsApplicationRequestBus.names index 148c96005b..a3c9841952 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ToolsApplicationRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ToolsApplicationRequestBus.names @@ -5,7 +5,7 @@ "context": "EBusSender", "variant": "", "details": { - "name": "ToolsApplicationRequestBus" + "name": "Tools Application" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/TubeShapeComponentRequestsBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/TubeShapeComponentRequestsBus.names index 87b0584dbf..93c77fc3e2 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/TubeShapeComponentRequestsBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/TubeShapeComponentRequestsBus.names @@ -5,7 +5,7 @@ "context": "EBusSender", "variant": "", "details": { - "name": "TubeShapeComponentRequestsBus" + "name": "Tube Shape Component" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiAnimationBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiAnimationBus.names index 8681104e2c..07a619288a 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiAnimationBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiAnimationBus.names @@ -5,7 +5,7 @@ "context": "EBusSender", "variant": "", "details": { - "name": "UiAnimationBus", + "name": "UI Animation", "category": "UI" }, "methods": [ diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiButtonBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiButtonBus.names index b3228e764f..f5b4c62fd1 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiButtonBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiButtonBus.names @@ -5,7 +5,7 @@ "context": "EBusSender", "variant": "", "details": { - "name": "UiButtonBus", + "name": "UI Button", "category": "UI" }, "methods": [ @@ -27,7 +27,7 @@ { "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", "details": { - "name": "AZStd::string" + "name": "Name" } } ] diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiCanvasAssetRefBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiCanvasAssetRefBus.names index 74538a9aed..1cb8e93a10 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiCanvasAssetRefBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiCanvasAssetRefBus.names @@ -5,7 +5,7 @@ "context": "EBusSender", "variant": "", "details": { - "name": "UiCanvasAssetRefBus", + "name": "UI Canvas Asset Ref", "category": "UI" }, "methods": [ diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiCanvasBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiCanvasBus.names index 9403cf7cfb..434023c071 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiCanvasBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiCanvasBus.names @@ -5,7 +5,7 @@ "context": "EBusSender", "variant": "", "details": { - "name": "UiCanvasBus", + "name": "UI Canvas", "category": "UI" }, "methods": [ diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiCanvasManagerBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiCanvasManagerBus.names index 2776264467..ba03658aa7 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiCanvasManagerBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiCanvasManagerBus.names @@ -5,7 +5,7 @@ "context": "EBusSender", "variant": "", "details": { - "name": "UiCanvasManagerBus", + "name": "UI Canvas Manager", "category": "UI" }, "methods": [ diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiCanvasProxyRefBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiCanvasProxyRefBus.names index bcd50ded75..7c582146cc 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiCanvasProxyRefBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiCanvasProxyRefBus.names @@ -5,7 +5,7 @@ "context": "EBusSender", "variant": "", "details": { - "name": "UiCanvasProxyRefBus", + "name": "UI Canvas Proxy Ref", "category": "UI" }, "methods": [ diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiCanvasRefBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiCanvasRefBus.names index 9d2758982d..19b74b1ddb 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiCanvasRefBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiCanvasRefBus.names @@ -5,7 +5,7 @@ "context": "EBusSender", "variant": "", "details": { - "name": "UiCanvasRefBus", + "name": "UI Canvas Ref", "category": "UI" }, "methods": [ diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiCheckboxBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiCheckboxBus.names index 4a41b40fa6..0e0182b9c1 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiCheckboxBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiCheckboxBus.names @@ -5,7 +5,7 @@ "context": "EBusSender", "variant": "", "details": { - "name": "UiCheckboxBus", + "name": "UI Checkbox", "category": "UI" }, "methods": [ diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiClickableTextBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiClickableTextBus.names index a822472301..96f80aff68 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiClickableTextBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiClickableTextBus.names @@ -5,7 +5,7 @@ "context": "EBusSender", "variant": "", "details": { - "name": "UiClickableTextBus", + "name": "UI Clickable Text", "category": "UI" }, "methods": [ diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiCursorBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiCursorBus.names index 488021ff3b..6da1ec95a1 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiCursorBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiCursorBus.names @@ -5,7 +5,7 @@ "context": "EBusSender", "variant": "", "details": { - "name": "UiCursorBus", + "name": "UI Cursor", "category": "UI" }, "methods": [ diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiCustomImageBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiCustomImageBus.names index 1662986211..1f492b34ec 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiCustomImageBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiCustomImageBus.names @@ -5,7 +5,7 @@ "context": "EBusSender", "variant": "", "details": { - "name": "UiCustomImageBus", + "name": "UI Custom Image", "category": "UI/LyShine Examples" }, "methods": [ diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiDraggableBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiDraggableBus.names index 7a47d5fd04..d44fbcc422 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiDraggableBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiDraggableBus.names @@ -5,7 +5,7 @@ "context": "EBusSender", "variant": "", "details": { - "name": "UiDraggableBus", + "name": "UI Draggable", "category": "UI" }, "methods": [ diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiDropTargetBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiDropTargetBus.names index a6c382dd26..5601160a98 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiDropTargetBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiDropTargetBus.names @@ -5,7 +5,7 @@ "context": "EBusSender", "variant": "", "details": { - "name": "UiDropTargetBus", + "name": "UI Drop Target", "category": "UI" }, "methods": [ diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiDropdownBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiDropdownBus.names index 88bb28acc3..ec68dc2a3e 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiDropdownBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiDropdownBus.names @@ -5,7 +5,7 @@ "context": "EBusSender", "variant": "", "details": { - "name": "UiDropdownBus", + "name": "UI Dropdown", "category": "UI" }, "methods": [ diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiDropdownOptionBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiDropdownOptionBus.names index 3535c5ccd5..0491203755 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiDropdownOptionBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiDropdownOptionBus.names @@ -5,7 +5,7 @@ "context": "EBusSender", "variant": "", "details": { - "name": "UiDropdownOptionBus", + "name": "UI Dropdown Option", "category": "UI" }, "methods": [ diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiDynamicContentDatabaseBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiDynamicContentDatabaseBus.names index 09642e35f2..8bc978d30f 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiDynamicContentDatabaseBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiDynamicContentDatabaseBus.names @@ -5,7 +5,7 @@ "context": "EBusSender", "variant": "", "details": { - "name": "UiDynamicContentDatabaseBus", + "name": "UI Dynamic Content Database", "category": "UI/LyShine Examples" }, "methods": [ diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiDynamicLayoutBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiDynamicLayoutBus.names index 1f3cc89f60..3107acf0cc 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiDynamicLayoutBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiDynamicLayoutBus.names @@ -5,7 +5,7 @@ "context": "EBusSender", "variant": "", "details": { - "name": "UiDynamicLayoutBus", + "name": "UI Dynamic Layout", "category": "UI" }, "methods": [ diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiDynamicScrollBoxBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiDynamicScrollBoxBus.names index 9f8b4acd23..579c2c61dc 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiDynamicScrollBoxBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiDynamicScrollBoxBus.names @@ -5,7 +5,7 @@ "context": "EBusSender", "variant": "", "details": { - "name": "UiDynamicScrollBoxBus", + "name": "UI Dynamic Scroll Box", "category": "UI" }, "methods": [ diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiElementBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiElementBus.names index e55be9b55d..481223a96e 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiElementBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiElementBus.names @@ -5,7 +5,7 @@ "context": "EBusSender", "variant": "", "details": { - "name": "UiElementBus", + "name": "UI Element", "category": "UI" }, "methods": [ diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiFaderBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiFaderBus.names index 7a00e412d7..154918a041 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiFaderBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiFaderBus.names @@ -5,7 +5,7 @@ "context": "EBusSender", "variant": "", "details": { - "name": "UiFaderBus", + "name": "UI Fader", "category": "UI" }, "methods": [ diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiFlipbookAnimationBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiFlipbookAnimationBus.names index 16feca1593..c0f62a816b 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiFlipbookAnimationBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiFlipbookAnimationBus.names @@ -5,7 +5,7 @@ "context": "EBusSender", "variant": "", "details": { - "name": "UiFlipbookAnimationBus", + "name": "UI Flipbook Animation", "category": "UI" }, "methods": [ diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiImageBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiImageBus.names index cef46a7fea..fdaf5e3252 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiImageBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiImageBus.names @@ -5,7 +5,7 @@ "context": "EBusSender", "variant": "", "details": { - "name": "UiImageBus", + "name": "UI Image", "category": "UI" }, "methods": [ diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiImageSequenceBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiImageSequenceBus.names index 8b8f44c08a..ff048262e0 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiImageSequenceBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiImageSequenceBus.names @@ -5,7 +5,7 @@ "context": "EBusSender", "variant": "", "details": { - "name": "UiImageSequenceBus", + "name": "UI Image Sequence", "category": "UI" }, "methods": [ diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiIndexableImageBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiIndexableImageBus.names index 82b63fa0ec..7e8e1c11d8 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiIndexableImageBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiIndexableImageBus.names @@ -5,7 +5,7 @@ "context": "EBusSender", "variant": "", "details": { - "name": "UiIndexableImageBus", + "name": "UI Indexable Image", "category": "UI" }, "methods": [ diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiInteractableActionsBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiInteractableActionsBus.names index 715cc06063..6d061bec5d 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiInteractableActionsBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiInteractableActionsBus.names @@ -5,7 +5,7 @@ "context": "EBusSender", "variant": "", "details": { - "name": "UiInteractableActionsBus", + "name": "UI Interactable Actions", "category": "UI" }, "methods": [ diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiInteractableBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiInteractableBus.names index 139822292a..f45fd09b4f 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiInteractableBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiInteractableBus.names @@ -5,7 +5,7 @@ "context": "EBusSender", "variant": "", "details": { - "name": "UiInteractableBus", + "name": "UI Interactable", "category": "UI" }, "methods": [ diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiInteractableStatesBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiInteractableStatesBus.names index 93f51786c7..f6948637e9 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiInteractableStatesBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiInteractableStatesBus.names @@ -5,7 +5,7 @@ "context": "EBusSender", "variant": "", "details": { - "name": "UiInteractableStatesBus", + "name": "UI Interactable States", "category": "UI" }, "methods": [ diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiLayoutBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiLayoutBus.names index 72760e1a72..fa1b209aa6 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiLayoutBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiLayoutBus.names @@ -5,7 +5,7 @@ "context": "EBusSender", "variant": "", "details": { - "name": "UiLayoutBus", + "name": "UI Layout", "category": "UI" }, "methods": [ diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiLayoutCellBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiLayoutCellBus.names index 8e95d005db..1a8001adaf 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiLayoutCellBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiLayoutCellBus.names @@ -5,7 +5,7 @@ "context": "EBusSender", "variant": "", "details": { - "name": "UiLayoutCellBus", + "name": "UI Layout Cell", "category": "UI" }, "methods": [ diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiLayoutColumnBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiLayoutColumnBus.names index 8cba866475..d0f4e7d3e4 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiLayoutColumnBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiLayoutColumnBus.names @@ -5,7 +5,7 @@ "context": "EBusSender", "variant": "", "details": { - "name": "UiLayoutColumnBus", + "name": "UI Layout Column", "category": "UI" }, "methods": [ diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiLayoutFitterBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiLayoutFitterBus.names index 2c2a32bd85..672db1bd4e 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiLayoutFitterBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiLayoutFitterBus.names @@ -5,7 +5,7 @@ "context": "EBusSender", "variant": "", "details": { - "name": "UiLayoutFitterBus", + "name": "UI Layout Fitter", "category": "UI" }, "methods": [ diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiLayoutGridBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiLayoutGridBus.names index 0ac2f4eba0..9ee462316e 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiLayoutGridBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiLayoutGridBus.names @@ -5,7 +5,7 @@ "context": "EBusSender", "variant": "", "details": { - "name": "UiLayoutGridBus", + "name": "UI Layout Grid", "category": "UI" }, "methods": [ diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiLayoutRowBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiLayoutRowBus.names index ca27e01284..ba3e4fc81b 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiLayoutRowBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiLayoutRowBus.names @@ -5,7 +5,7 @@ "context": "EBusSender", "variant": "", "details": { - "name": "UiLayoutRowBus", + "name": "UI Layout Row", "category": "UI" }, "methods": [ diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiMarkupButtonBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiMarkupButtonBus.names index 0e5de7b07c..a877e8a6bb 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiMarkupButtonBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiMarkupButtonBus.names @@ -5,7 +5,7 @@ "context": "EBusSender", "variant": "", "details": { - "name": "UiMarkupButtonBus", + "name": "UI Markup Button", "category": "UI" }, "methods": [ diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiMaskBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiMaskBus.names index 178235f2a1..dca599e33c 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiMaskBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiMaskBus.names @@ -5,7 +5,7 @@ "context": "EBusSender", "variant": "", "details": { - "name": "UiMaskBus", + "name": "UI Mask", "category": "UI" }, "methods": [ diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiNavigationBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiNavigationBus.names index 0ca8dd3b8b..9dc985f263 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiNavigationBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiNavigationBus.names @@ -5,7 +5,7 @@ "context": "EBusSender", "variant": "", "details": { - "name": "UiNavigationBus", + "name": "UI Navigation", "category": "UI" }, "methods": [ diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiParticleEmitterBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiParticleEmitterBus.names index c408434db4..87d6e0ee6d 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiParticleEmitterBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiParticleEmitterBus.names @@ -5,7 +5,7 @@ "context": "EBusSender", "variant": "", "details": { - "name": "UiParticleEmitterBus", + "name": "UI Particle Emitter", "category": "UI" }, "methods": [ diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiRadioButtonBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiRadioButtonBus.names index 292353e770..891d2eb945 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiRadioButtonBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiRadioButtonBus.names @@ -5,7 +5,7 @@ "context": "EBusSender", "variant": "", "details": { - "name": "UiRadioButtonBus", + "name": "UI Radio Button", "category": "UI" }, "methods": [ diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiRadioButtonGroupBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiRadioButtonGroupBus.names index f0a4172a6f..0eec1b3599 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiRadioButtonGroupBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiRadioButtonGroupBus.names @@ -5,7 +5,7 @@ "context": "EBusSender", "variant": "", "details": { - "name": "UiRadioButtonGroupBus", + "name": "UI Radio Button Group", "category": "UI" }, "methods": [ diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiScrollBarBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiScrollBarBus.names index 9f77750c89..26a03d0a85 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiScrollBarBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiScrollBarBus.names @@ -5,7 +5,7 @@ "context": "EBusSender", "variant": "", "details": { - "name": "UiScrollBarBus", + "name": "UI Scroll Bar", "category": "UI" }, "methods": [ diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiScrollBoxBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiScrollBoxBus.names index 0b5c2ef252..d8dee354dd 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiScrollBoxBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiScrollBoxBus.names @@ -5,7 +5,7 @@ "context": "EBusSender", "variant": "", "details": { - "name": "UiScrollBoxBus", + "name": "UI Scroll Box", "category": "UI" }, "methods": [ diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiScrollerBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiScrollerBus.names index 4bb1ea334d..da05529331 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiScrollerBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiScrollerBus.names @@ -5,7 +5,7 @@ "context": "EBusSender", "variant": "", "details": { - "name": "UiScrollerBus", + "name": "UI Scroller Bus", "category": "UI" }, "methods": [ diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiSliderBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiSliderBus.names index e9d5e49722..0cecbe20f0 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiSliderBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiSliderBus.names @@ -5,7 +5,7 @@ "context": "EBusSender", "variant": "", "details": { - "name": "UiSliderBus", + "name": "UI Slider", "category": "UI" }, "methods": [ diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiSpawnerBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiSpawnerBus.names index cc1ed40f00..707f8903ec 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiSpawnerBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiSpawnerBus.names @@ -5,7 +5,7 @@ "context": "EBusSender", "variant": "", "details": { - "name": "UiSpawnerBus", + "name": "UI Spawner", "category": "UI" }, "methods": [ diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiTextBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiTextBus.names index 26fd061c0c..7b14419e16 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiTextBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiTextBus.names @@ -5,7 +5,7 @@ "context": "EBusSender", "variant": "", "details": { - "name": "UiTextBus", + "name": "UI Text", "category": "UI" }, "methods": [ diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiTextInputBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiTextInputBus.names index cff4ff2e7f..4ccb34553c 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiTextInputBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiTextInputBus.names @@ -5,7 +5,7 @@ "context": "EBusSender", "variant": "", "details": { - "name": "UiTextInputBus", + "name": "UI Text Input", "category": "UI" }, "methods": [ diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiTooltipBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiTooltipBus.names index f782d63f36..596b456cd0 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiTooltipBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiTooltipBus.names @@ -5,7 +5,7 @@ "context": "EBusSender", "variant": "", "details": { - "name": "UiTooltipBus", + "name": "UI Tooltip", "category": "UI" }, "methods": [ diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiTooltipDisplayBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiTooltipDisplayBus.names index 7ec2d0a089..33ec35863e 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiTooltipDisplayBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiTooltipDisplayBus.names @@ -5,7 +5,7 @@ "context": "EBusSender", "variant": "", "details": { - "name": "UiTooltipDisplayBus", + "name": "UI Tooltip Display", "category": "UI" }, "methods": [ diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiTransform2dBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiTransform2dBus.names index 3c7570072b..c75e4dad79 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiTransform2dBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiTransform2dBus.names @@ -5,7 +5,7 @@ "context": "EBusSender", "variant": "", "details": { - "name": "UiTransform2dBus", + "name": "UI Transform 2D", "category": "UI" }, "methods": [ diff --git a/Gems/ScriptCanvas/Code/Tools/TranslationGeneration.cpp b/Gems/ScriptCanvas/Code/Tools/TranslationGeneration.cpp index 4fcc904752..844401d141 100644 --- a/Gems/ScriptCanvas/Code/Tools/TranslationGeneration.cpp +++ b/Gems/ScriptCanvas/Code/Tools/TranslationGeneration.cpp @@ -845,13 +845,13 @@ namespace ScriptCanvasEditorTools AZStd::string argumentKey = parameter->m_typeId.ToString(); AZStd::string argumentName = parameter->m_name; - AZStd::string argumentDescription = ""; + AZStd::string argumentDescription; Helpers::GetTypeNameAndDescription(parameter->m_typeId, argumentName, argumentDescription); const AZStd::string* argName = behaviorMethod->GetArgumentName(argIndex); argument.m_typeId = argumentKey; - argument.m_details.m_name = argName ? *argName : argumentName; + argument.m_details.m_name = (argName && !argName->empty()) ? *argName : argumentName; argument.m_details.m_category = ""; argument.m_details.m_tooltip = argumentDescription; @@ -869,13 +869,13 @@ namespace ScriptCanvasEditorTools AZStd::string resultKey = resultParameter->m_typeId.ToString(); AZStd::string resultName = resultParameter->m_name; - AZStd::string resultDescription = ""; + AZStd::string resultDescription; Helpers::GetTypeNameAndDescription(resultParameter->m_typeId, resultName, resultDescription); const AZStd::string* resName = behaviorMethod->GetArgumentName(0); result.m_typeId = resultKey; - result.m_details.m_name = resName ? *resName : resultName; + result.m_details.m_name = (resName && !resName->empty()) ? *resName : resultName; result.m_details.m_tooltip = resultDescription; SplitCamelCase(result.m_details.m_name); From a05fb749c4394633eb69687ae024b5697954a709 Mon Sep 17 00:00:00 2001 From: lsemp3d <58790905+lsemp3d@users.noreply.github.com> Date: Tue, 23 Nov 2021 13:04:01 -0800 Subject: [PATCH 223/345] Updated input node names Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com> --- .../Classes/InputDeviceGamepad.names | 441 ++++- .../Classes/InputDeviceGestures.names | 113 ++ .../Classes/InputDeviceKeyboard.names | 1589 ++++++++++++++++- .../Classes/InputDeviceMotion.names | 147 +- .../Classes/InputDeviceMouse.names | 133 +- .../Classes/InputDeviceTouch.names | 161 +- .../Classes/InputDeviceVirtualKeyboard.names | 63 +- .../Senders/InAppPurchasesRequestBus.names | 178 ++ .../InAppPurchasesResponseAccessorBus.names | 534 ++++++ 9 files changed, 3347 insertions(+), 12 deletions(-) create mode 100644 Gems/ScriptCanvas/Assets/TranslationAssets/Classes/InputDeviceGestures.names create mode 100644 Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/InAppPurchasesRequestBus.names create mode 100644 Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/InAppPurchasesResponseAccessorBus.names diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/InputDeviceGamepad.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/InputDeviceGamepad.names index 462cc30656..868a2eba61 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/InputDeviceGamepad.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/InputDeviceGamepad.names @@ -5,8 +5,445 @@ "context": "BehaviorClass", "variant": "", "details": { - "name": "InputDeviceGamepad" - } + "name": "Input Device Gamepad", + "category": "Input" + }, + "methods": [ + { + "base": "gamepad_button_l3", + "details": { + "name": "gamepad_button_l3" + }, + "results": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + } + ] + }, + { + "base": "gamepad_thumbstick_r_x", + "details": { + "name": "gamepad_thumbstick_r_x" + }, + "results": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + } + ] + }, + { + "base": "gamepad_thumbstick_l_up", + "details": { + "name": "gamepad_thumbstick_l_up" + }, + "results": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + } + ] + }, + { + "base": "gamepad_trigger_l2", + "details": { + "name": "gamepad_trigger_l2" + }, + "results": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + } + ] + }, + { + "base": "gamepad_button_r3", + "details": { + "name": "gamepad_button_r3" + }, + "results": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + } + ] + }, + { + "base": "gamepad_thumbstick_r_left", + "details": { + "name": "gamepad_thumbstick_r_left" + }, + "results": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + } + ] + }, + { + "base": "gamepad_button_r1", + "details": { + "name": "gamepad_button_r1" + }, + "results": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + } + ] + }, + { + "base": "gamepad_button_b", + "details": { + "name": "gamepad_button_b" + }, + "results": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + } + ] + }, + { + "base": "gamepad_thumbstick_l", + "details": { + "name": "gamepad_thumbstick_l" + }, + "results": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + } + ] + }, + { + "base": "gamepad_button_d_right", + "details": { + "name": "gamepad_button_d_right" + }, + "results": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + } + ] + }, + { + "base": "gamepad_thumbstick_r_up", + "details": { + "name": "gamepad_thumbstick_r_up" + }, + "results": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + } + ] + }, + { + "base": "gamepad_thumbstick_r_y", + "details": { + "name": "gamepad_thumbstick_r_y" + }, + "results": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + } + ] + }, + { + "base": "gamepad_thumbstick_l_left", + "details": { + "name": "gamepad_thumbstick_l_left" + }, + "results": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + } + ] + }, + { + "base": "gamepad_thumbstick_r", + "details": { + "name": "gamepad_thumbstick_r" + }, + "results": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + } + ] + }, + { + "base": "gamepad_thumbstick_r_right", + "details": { + "name": "gamepad_thumbstick_r_right" + }, + "results": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + } + ] + }, + { + "base": "gamepad_button_d_up", + "details": { + "name": "gamepad_button_d_up" + }, + "results": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + } + ] + }, + { + "base": "gamepad_thumbstick_l_x", + "details": { + "name": "gamepad_thumbstick_l_x" + }, + "results": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + } + ] + }, + { + "base": "gamepad_button_d_down", + "details": { + "name": "gamepad_button_d_down" + }, + "results": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + } + ] + }, + { + "base": "gamepad_button_select", + "details": { + "name": "gamepad_button_select" + }, + "results": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + } + ] + }, + { + "base": "gamepad_button_y", + "details": { + "name": "gamepad_button_y" + }, + "results": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + } + ] + }, + { + "base": "gamepad_thumbstick_l_right", + "details": { + "name": "gamepad_thumbstick_l_right" + }, + "results": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + } + ] + }, + { + "base": "gamepad_button_l1", + "details": { + "name": "gamepad_button_l1" + }, + "results": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + } + ] + }, + { + "base": "gamepad_thumbstick_l_down", + "details": { + "name": "gamepad_thumbstick_l_down" + }, + "results": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + } + ] + }, + { + "base": "Getname", + "details": { + "name": "Get Name" + }, + "results": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "Name" + } + } + ] + }, + { + "base": "gamepad_button_start", + "details": { + "name": "gamepad_button_start" + }, + "results": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + } + ] + }, + { + "base": "gamepad_button_x", + "details": { + "name": "gamepad_button_x" + }, + "results": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + } + ] + }, + { + "base": "gamepad_button_d_left", + "details": { + "name": "gamepad_button_d_left" + }, + "results": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + } + ] + }, + { + "base": "gamepad_trigger_r2", + "details": { + "name": "gamepad_trigger_r2" + }, + "results": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + } + ] + }, + { + "base": "gamepad_button_a", + "details": { + "name": "gamepad_button_a" + }, + "results": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + } + ] + }, + { + "base": "gamepad_thumbstick_r_down", + "details": { + "name": "gamepad_thumbstick_r_down" + }, + "results": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + } + ] + }, + { + "base": "gamepad_thumbstick_l_y", + "details": { + "name": "gamepad_thumbstick_l_y" + }, + "results": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/InputDeviceGestures.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/InputDeviceGestures.names new file mode 100644 index 0000000000..4cd51e56c9 --- /dev/null +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/InputDeviceGestures.names @@ -0,0 +1,113 @@ +{ + "entries": [ + { + "base": "InputDeviceGestures", + "context": "BehaviorClass", + "variant": "", + "details": { + "name": "Input Device Gestures", + "category": "Input" + }, + "methods": [ + { + "base": "gesture_swipe", + "details": { + "name": "gesture_swipe" + }, + "results": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + } + ] + }, + { + "base": "gesture_rotate", + "details": { + "name": "gesture_rotate" + }, + "results": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + } + ] + }, + { + "base": "gesture_hold", + "details": { + "name": "gesture_hold" + }, + "results": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + } + ] + }, + { + "base": "gesture_pinch", + "details": { + "name": "gesture_pinch" + }, + "results": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + } + ] + }, + { + "base": "gesture_double_press", + "details": { + "name": "gesture_double_press" + }, + "results": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + } + ] + }, + { + "base": "gesture_drag", + "details": { + "name": "gesture_drag" + }, + "results": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + } + ] + }, + { + "base": "Getname", + "details": { + "name": "Get Name" + }, + "results": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "Name" + } + } + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/InputDeviceKeyboard.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/InputDeviceKeyboard.names index f9b49b0fc9..2df09ea536 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/InputDeviceKeyboard.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/InputDeviceKeyboard.names @@ -5,8 +5,1593 @@ "context": "BehaviorClass", "variant": "", "details": { - "name": "InputDeviceKeyboard" - } + "name": "Input Device Keyboard", + "category": "Input" + }, + "methods": [ + { + "base": "keyboard_key_windows_system_scroll_lock", + "details": { + "name": "keyboard_key_windows_system_scroll_lock" + }, + "results": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + } + ] + }, + { + "base": "keyboard_key_punctuation_semicolon", + "details": { + "name": "keyboard_key_punctuation_semicolon" + }, + "results": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + } + ] + }, + { + "base": "keyboard_key_alphanumeric_7", + "details": { + "name": "keyboard_key_alphanumeric_ 7" + }, + "results": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + } + ] + }, + { + "base": "keyboard_key_function_F11", + "details": { + "name": "keyboard_key_function_F 11" + }, + "results": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + } + ] + }, + { + "base": "keyboard_key_alphanumeric_B", + "details": { + "name": "keyboard_key_alphanumeric_B" + }, + "results": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + } + ] + }, + { + "base": "keyboard_key_alphanumeric_R", + "details": { + "name": "keyboard_key_alphanumeric_R" + }, + "results": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + } + ] + }, + { + "base": "keyboard_key_function_F10", + "details": { + "name": "keyboard_key_function_F 10" + }, + "results": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + } + ] + }, + { + "base": "keyboard_key_punctuation_backslash", + "details": { + "name": "keyboard_key_punctuation_backslash" + }, + "results": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + } + ] + }, + { + "base": "keyboard_key_punctuation_bracket_r", + "details": { + "name": "keyboard_key_punctuation_bracket_r" + }, + "results": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + } + ] + }, + { + "base": "keyboard_key_function_F16", + "details": { + "name": "keyboard_key_function_F 16" + }, + "results": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + } + ] + }, + { + "base": "keyboard_key_alphanumeric_5", + "details": { + "name": "keyboard_key_alphanumeric_ 5" + }, + "results": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + } + ] + }, + { + "base": "keyboard_key_function_F01", + "details": { + "name": "keyboard_key_function_F 01" + }, + "results": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + } + ] + }, + { + "base": "keyboard_key_alphanumeric_A", + "details": { + "name": "keyboard_key_alphanumeric_A" + }, + "results": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + } + ] + }, + { + "base": "keyboard_key_punctuation_hyphen", + "details": { + "name": "keyboard_key_punctuation_hyphen" + }, + "results": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + } + ] + }, + { + "base": "keyboard_key_numpad_4", + "details": { + "name": "keyboard_key_numpad_ 4" + }, + "results": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + } + ] + }, + { + "base": "keyboard_key_alphanumeric_O", + "details": { + "name": "keyboard_key_alphanumeric_O" + }, + "results": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + } + ] + }, + { + "base": "keyboard_key_alphanumeric_E", + "details": { + "name": "keyboard_key_alphanumeric_E" + }, + "results": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + } + ] + }, + { + "base": "keyboard_key_windows_system_pause", + "details": { + "name": "keyboard_key_windows_system_pause" + }, + "results": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + } + ] + }, + { + "base": "keyboard_key_alphanumeric_F", + "details": { + "name": "keyboard_key_alphanumeric_F" + }, + "results": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + } + ] + }, + { + "base": "keyboard_key_windows_system_print", + "details": { + "name": "keyboard_key_windows_system_print" + }, + "results": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + } + ] + }, + { + "base": "keyboard_key_function_F14", + "details": { + "name": "keyboard_key_function_F 14" + }, + "results": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + } + ] + }, + { + "base": "keyboard_key_modifier_alt_l", + "details": { + "name": "keyboard_key_modifier_alt_l" + }, + "results": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + } + ] + }, + { + "base": "keyboard_key_edit_space", + "details": { + "name": "keyboard_key_edit_space" + }, + "results": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + } + ] + }, + { + "base": "keyboard_key_numpad_1", + "details": { + "name": "keyboard_key_numpad_ 1" + }, + "results": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + } + ] + }, + { + "base": "keyboard_key_function_F02", + "details": { + "name": "keyboard_key_function_F 02" + }, + "results": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + } + ] + }, + { + "base": "keyboard_key_numpad_enter", + "details": { + "name": "keyboard_key_numpad_enter" + }, + "results": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + } + ] + }, + { + "base": "keyboard_key_alphanumeric_1", + "details": { + "name": "keyboard_key_alphanumeric_ 1" + }, + "results": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + } + ] + }, + { + "base": "keyboard_key_modifier_ctrl_r", + "details": { + "name": "keyboard_key_modifier_ctrl_r" + }, + "results": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + } + ] + }, + { + "base": "keyboard_key_alphanumeric_D", + "details": { + "name": "keyboard_key_alphanumeric_D" + }, + "results": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + } + ] + }, + { + "base": "keyboard_key_num_lock", + "details": { + "name": "keyboard_key_num_lock" + }, + "results": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + } + ] + }, + { + "base": "keyboard_key_numpad_decimal", + "details": { + "name": "keyboard_key_numpad_decimal" + }, + "results": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + } + ] + }, + { + "base": "keyboard_key_alphanumeric_8", + "details": { + "name": "keyboard_key_alphanumeric_ 8" + }, + "results": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + } + ] + }, + { + "base": "keyboard_key_alphanumeric_V", + "details": { + "name": "keyboard_key_alphanumeric_V" + }, + "results": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + } + ] + }, + { + "base": "keyboard_key_navigation_home", + "details": { + "name": "keyboard_key_navigation_home" + }, + "results": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + } + ] + }, + { + "base": "Getname", + "details": { + "name": "Get Name" + }, + "results": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "Name" + } + } + ] + }, + { + "base": "keyboard_key_numpad_5", + "details": { + "name": "keyboard_key_numpad_ 5" + }, + "results": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + } + ] + }, + { + "base": "keyboard_key_alphanumeric_H", + "details": { + "name": "keyboard_key_alphanumeric_H" + }, + "results": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + } + ] + }, + { + "base": "keyboard_key_punctuation_tilde", + "details": { + "name": "keyboard_key_punctuation_tilde" + }, + "results": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + } + ] + }, + { + "base": "keyboard_key_navigation_end", + "details": { + "name": "keyboard_key_navigation_end" + }, + "results": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + } + ] + }, + { + "base": "keyboard_key_punctuation_equals", + "details": { + "name": "keyboard_key_punctuation_equals" + }, + "results": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + } + ] + }, + { + "base": "keyboard_key_alphanumeric_0", + "details": { + "name": "keyboard_key_alphanumeric_ 0" + }, + "results": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + } + ] + }, + { + "base": "keyboard_key_function_F13", + "details": { + "name": "keyboard_key_function_F 13" + }, + "results": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + } + ] + }, + { + "base": "keyboard_key_punctuation_period", + "details": { + "name": "keyboard_key_punctuation_period" + }, + "results": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + } + ] + }, + { + "base": "keyboard_key_alphanumeric_U", + "details": { + "name": "keyboard_key_alphanumeric_U" + }, + "results": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + } + ] + }, + { + "base": "keyboard_key_navigation_page_down", + "details": { + "name": "keyboard_key_navigation_page_down" + }, + "results": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + } + ] + }, + { + "base": "keyboard_key_alphanumeric_T", + "details": { + "name": "keyboard_key_alphanumeric_T" + }, + "results": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + } + ] + }, + { + "base": "keyboard_key_modifier_super_r", + "details": { + "name": "keyboard_key_modifier_super_r" + }, + "results": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + } + ] + }, + { + "base": "keyboard_key_alphanumeric_3", + "details": { + "name": "keyboard_key_alphanumeric_ 3" + }, + "results": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + } + ] + }, + { + "base": "keyboard_key_numpad_2", + "details": { + "name": "keyboard_key_numpad_ 2" + }, + "results": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + } + ] + }, + { + "base": "keyboard_key_alphanumeric_I", + "details": { + "name": "keyboard_key_alphanumeric_I" + }, + "results": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + } + ] + }, + { + "base": "keyboard_key_numpad_divide", + "details": { + "name": "keyboard_key_numpad_divide" + }, + "results": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + } + ] + }, + { + "base": "keyboard_key_navigation_arrow_left", + "details": { + "name": "keyboard_key_navigation_arrow_left" + }, + "results": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + } + ] + }, + { + "base": "keyboard_key_edit_capslock", + "details": { + "name": "keyboard_key_edit_capslock" + }, + "results": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + } + ] + }, + { + "base": "keyboard_key_alphanumeric_S", + "details": { + "name": "keyboard_key_alphanumeric_S" + }, + "results": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + } + ] + }, + { + "base": "keyboard_key_alphanumeric_G", + "details": { + "name": "keyboard_key_alphanumeric_G" + }, + "results": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + } + ] + }, + { + "base": "keyboard_key_function_F03", + "details": { + "name": "keyboard_key_function_F 03" + }, + "results": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + } + ] + }, + { + "base": "keyboard_key_escape", + "details": { + "name": "keyboard_key_escape" + }, + "results": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + } + ] + }, + { + "base": "keyboard_key_function_F15", + "details": { + "name": "keyboard_key_function_F 15" + }, + "results": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + } + ] + }, + { + "base": "keyboard_key_modifier_super_l", + "details": { + "name": "keyboard_key_modifier_super_l" + }, + "results": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + } + ] + }, + { + "base": "keyboard_key_alphanumeric_4", + "details": { + "name": "keyboard_key_alphanumeric_ 4" + }, + "results": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + } + ] + }, + { + "base": "keyboard_key_navigation_arrow_up", + "details": { + "name": "keyboard_key_navigation_arrow_up" + }, + "results": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + } + ] + }, + { + "base": "keyboard_key_function_F17", + "details": { + "name": "keyboard_key_function_F 17" + }, + "results": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + } + ] + }, + { + "base": "keyboard_key_alphanumeric_6", + "details": { + "name": "keyboard_key_alphanumeric_ 6" + }, + "results": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + } + ] + }, + { + "base": "keyboard_key_modifier_alt_r", + "details": { + "name": "keyboard_key_modifier_alt_r" + }, + "results": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + } + ] + }, + { + "base": "keyboard_key_alphanumeric_Q", + "details": { + "name": "keyboard_key_alphanumeric_Q" + }, + "results": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + } + ] + }, + { + "base": "keyboard_key_numpad_subtract", + "details": { + "name": "keyboard_key_numpad_subtract" + }, + "results": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + } + ] + }, + { + "base": "keyboard_key_alphanumeric_X", + "details": { + "name": "keyboard_key_alphanumeric_X" + }, + "results": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + } + ] + }, + { + "base": "keyboard_key_navigation_delete", + "details": { + "name": "keyboard_key_navigation_delete" + }, + "results": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + } + ] + }, + { + "base": "keyboard_key_punctuation_bracket_l", + "details": { + "name": "keyboard_key_punctuation_bracket_l" + }, + "results": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + } + ] + }, + { + "base": "keyboard_key_numpad_8", + "details": { + "name": "keyboard_key_numpad_ 8" + }, + "results": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + } + ] + }, + { + "base": "keyboard_key_function_F07", + "details": { + "name": "keyboard_key_function_F 07" + }, + "results": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + } + ] + }, + { + "base": "keyboard_key_alphanumeric_C", + "details": { + "name": "keyboard_key_alphanumeric_C" + }, + "results": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + } + ] + }, + { + "base": "keyboard_key_function_F20", + "details": { + "name": "keyboard_key_function_F 20" + }, + "results": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + } + ] + }, + { + "base": "keyboard_key_navigation_insert", + "details": { + "name": "keyboard_key_navigation_insert" + }, + "results": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + } + ] + }, + { + "base": "keyboard_key_navigation_page_up", + "details": { + "name": "keyboard_key_navigation_page_up" + }, + "results": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + } + ] + }, + { + "base": "keyboard_key_alphanumeric_2", + "details": { + "name": "keyboard_key_alphanumeric_ 2" + }, + "results": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + } + ] + }, + { + "base": "keyboard_key_modifier_shift_l", + "details": { + "name": "keyboard_key_modifier_shift_l" + }, + "results": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + } + ] + }, + { + "base": "keyboard_key_alphanumeric_P", + "details": { + "name": "keyboard_key_alphanumeric_P" + }, + "results": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + } + ] + }, + { + "base": "keyboard_key_punctuation_apostrophe", + "details": { + "name": "keyboard_key_punctuation_apostrophe" + }, + "results": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + } + ] + }, + { + "base": "keyboard_key_alphanumeric_Y", + "details": { + "name": "keyboard_key_alphanumeric_Y" + }, + "results": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + } + ] + }, + { + "base": "keyboard_key_function_F09", + "details": { + "name": "keyboard_key_function_F 09" + }, + "results": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + } + ] + }, + { + "base": "keyboard_key_numpad_9", + "details": { + "name": "keyboard_key_numpad_ 9" + }, + "results": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + } + ] + }, + { + "base": "keyboard_key_function_F06", + "details": { + "name": "keyboard_key_function_F 06" + }, + "results": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + } + ] + }, + { + "base": "keyboard_key_alphanumeric_L", + "details": { + "name": "keyboard_key_alphanumeric_L" + }, + "results": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + } + ] + }, + { + "base": "keyboard_key_punctuation_slash", + "details": { + "name": "keyboard_key_punctuation_slash" + }, + "results": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + } + ] + }, + { + "base": "keyboard_key_function_F19", + "details": { + "name": "keyboard_key_function_F 19" + }, + "results": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + } + ] + }, + { + "base": "keyboard_key_alphanumeric_K", + "details": { + "name": "keyboard_key_alphanumeric_K" + }, + "results": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + } + ] + }, + { + "base": "keyboard_key_numpad_0", + "details": { + "name": "keyboard_key_numpad_ 0" + }, + "results": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + } + ] + }, + { + "base": "keyboard_key_edit_enter", + "details": { + "name": "keyboard_key_edit_enter" + }, + "results": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + } + ] + }, + { + "base": "keyboard_key_numpad_multiply", + "details": { + "name": "keyboard_key_numpad_multiply" + }, + "results": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + } + ] + }, + { + "base": "keyboard_key_alphanumeric_Z", + "details": { + "name": "keyboard_key_alphanumeric_Z" + }, + "results": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + } + ] + }, + { + "base": "keyboard_key_function_F08", + "details": { + "name": "keyboard_key_function_F 08" + }, + "results": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + } + ] + }, + { + "base": "keyboard_key_numpad_3", + "details": { + "name": "keyboard_key_numpad_ 3" + }, + "results": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + } + ] + }, + { + "base": "keyboard_key_edit_tab", + "details": { + "name": "keyboard_key_edit_tab" + }, + "results": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + } + ] + }, + { + "base": "keyboard_key_function_F18", + "details": { + "name": "keyboard_key_function_F 18" + }, + "results": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + } + ] + }, + { + "base": "keyboard_key_modifier_shift_r", + "details": { + "name": "keyboard_key_modifier_shift_r" + }, + "results": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + } + ] + }, + { + "base": "keyboard_key_alphanumeric_J", + "details": { + "name": "keyboard_key_alphanumeric_J" + }, + "results": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + } + ] + }, + { + "base": "keyboard_key_punctuation_comma", + "details": { + "name": "keyboard_key_punctuation_comma" + }, + "results": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + } + ] + }, + { + "base": "keyboard_key_supplementary_iso", + "details": { + "name": "keyboard_key_supplementary_iso" + }, + "results": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + } + ] + }, + { + "base": "keyboard_key_navigation_arrow_right", + "details": { + "name": "keyboard_key_navigation_arrow_right" + }, + "results": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + } + ] + }, + { + "base": "keyboard_key_edit_backspace", + "details": { + "name": "keyboard_key_edit_backspace" + }, + "results": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + } + ] + }, + { + "base": "keyboard_key_function_F12", + "details": { + "name": "keyboard_key_function_F 12" + }, + "results": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + } + ] + }, + { + "base": "keyboard_key_navigation_arrow_down", + "details": { + "name": "keyboard_key_navigation_arrow_down" + }, + "results": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + } + ] + }, + { + "base": "keyboard_key_numpad_add", + "details": { + "name": "keyboard_key_numpad_add" + }, + "results": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + } + ] + }, + { + "base": "keyboard_key_numpad_6", + "details": { + "name": "keyboard_key_numpad_ 6" + }, + "results": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + } + ] + }, + { + "base": "keyboard_key_function_F05", + "details": { + "name": "keyboard_key_function_F 05" + }, + "results": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + } + ] + }, + { + "base": "keyboard_key_alphanumeric_M", + "details": { + "name": "keyboard_key_alphanumeric_M" + }, + "results": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + } + ] + }, + { + "base": "keyboard_key_modifier_ctrl_l", + "details": { + "name": "keyboard_key_modifier_ctrl_l" + }, + "results": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + } + ] + }, + { + "base": "keyboard_key_alphanumeric_W", + "details": { + "name": "keyboard_key_alphanumeric_W" + }, + "results": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + } + ] + }, + { + "base": "keyboard_key_alphanumeric_9", + "details": { + "name": "keyboard_key_alphanumeric_ 9" + }, + "results": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + } + ] + }, + { + "base": "keyboard_key_function_F04", + "details": { + "name": "keyboard_key_function_F 04" + }, + "results": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + } + ] + }, + { + "base": "keyboard_key_alphanumeric_N", + "details": { + "name": "keyboard_key_alphanumeric_N" + }, + "results": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + } + ] + }, + { + "base": "keyboard_key_numpad_7", + "details": { + "name": "keyboard_key_numpad_ 7" + }, + "results": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/InputDeviceMotion.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/InputDeviceMotion.names index 994989916f..e265506eef 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/InputDeviceMotion.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/InputDeviceMotion.names @@ -5,8 +5,151 @@ "context": "BehaviorClass", "variant": "", "details": { - "name": "InputDeviceMotion" - } + "name": "Input Device Motion", + "category": "Input" + }, + "methods": [ + { + "base": "motion_orientation_current", + "details": { + "name": "motion_orientation_current" + }, + "results": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + } + ] + }, + { + "base": "motion_rotation_rate_unbiased", + "details": { + "name": "motion_rotation_rate_unbiased" + }, + "results": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + } + ] + }, + { + "base": "motion_rotation_rate_raw", + "details": { + "name": "motion_rotation_rate_raw" + }, + "results": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + } + ] + }, + { + "base": "motion_magnetic_field_north", + "details": { + "name": "motion_magnetic_field_north" + }, + "results": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + } + ] + }, + { + "base": "motion_acceleration_gravity", + "details": { + "name": "motion_acceleration_gravity" + }, + "results": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + } + ] + }, + { + "base": "Getname", + "details": { + "name": "Get Name" + }, + "results": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "Name" + } + } + ] + }, + { + "base": "motion_acceleration_raw", + "details": { + "name": "motion_acceleration_raw" + }, + "results": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + } + ] + }, + { + "base": "motion_acceleration_user", + "details": { + "name": "motion_acceleration_user" + }, + "results": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + } + ] + }, + { + "base": "motion_magnetic_field_raw", + "details": { + "name": "motion_magnetic_field_raw" + }, + "results": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + } + ] + }, + { + "base": "motion_magnetic_field_unbiased", + "details": { + "name": "motion_magnetic_field_unbiased" + }, + "results": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/InputDeviceMouse.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/InputDeviceMouse.names index dd47cb6405..c4f7f76a77 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/InputDeviceMouse.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/InputDeviceMouse.names @@ -5,8 +5,137 @@ "context": "BehaviorClass", "variant": "", "details": { - "name": "InputDeviceMouse" - } + "name": "Input Device Mouse", + "category": "Input" + }, + "methods": [ + { + "base": "mouse_delta_z", + "details": { + "name": "mouse_delta_z" + }, + "results": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + } + ] + }, + { + "base": "mouse_button_other2", + "details": { + "name": "mouse_button_other 2" + }, + "results": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + } + ] + }, + { + "base": "mouse_delta_x", + "details": { + "name": "mouse_delta_x" + }, + "results": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + } + ] + }, + { + "base": "mouse_button_middle", + "details": { + "name": "mouse_button_middle" + }, + "results": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + } + ] + }, + { + "base": "mouse_delta_y", + "details": { + "name": "mouse_delta_y" + }, + "results": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + } + ] + }, + { + "base": "mouse_button_right", + "details": { + "name": "mouse_button_right" + }, + "results": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + } + ] + }, + { + "base": "mouse_button_left", + "details": { + "name": "mouse_button_left" + }, + "results": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + } + ] + }, + { + "base": "Getname", + "details": { + "name": "Get Name" + }, + "results": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "Name" + } + } + ] + }, + { + "base": "mouse_button_other1", + "details": { + "name": "mouse_button_other 1" + }, + "results": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/InputDeviceTouch.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/InputDeviceTouch.names index b34a2bfe64..aa37285487 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/InputDeviceTouch.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/InputDeviceTouch.names @@ -5,8 +5,165 @@ "context": "BehaviorClass", "variant": "", "details": { - "name": "InputDeviceTouch" - } + "name": "Input Device Touch", + "category": "Input" + }, + "methods": [ + { + "base": "touch_index_7", + "details": { + "name": "touch_index_ 7" + }, + "results": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + } + ] + }, + { + "base": "touch_index_8", + "details": { + "name": "touch_index_ 8" + }, + "results": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + } + ] + }, + { + "base": "touch_index_6", + "details": { + "name": "touch_index_ 6" + }, + "results": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + } + ] + }, + { + "base": "touch_index_5", + "details": { + "name": "touch_index_ 5" + }, + "results": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + } + ] + }, + { + "base": "touch_index_3", + "details": { + "name": "touch_index_ 3" + }, + "results": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + } + ] + }, + { + "base": "touch_index_4", + "details": { + "name": "touch_index_ 4" + }, + "results": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + } + ] + }, + { + "base": "touch_index_2", + "details": { + "name": "touch_index_ 2" + }, + "results": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + } + ] + }, + { + "base": "touch_index_0", + "details": { + "name": "touch_index_ 0" + }, + "results": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + } + ] + }, + { + "base": "touch_index_9", + "details": { + "name": "touch_index_ 9" + }, + "results": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + } + ] + }, + { + "base": "Getname", + "details": { + "name": "Get Name" + }, + "results": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "Name" + } + } + ] + }, + { + "base": "touch_index_1", + "details": { + "name": "touch_index_ 1" + }, + "results": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/InputDeviceVirtualKeyboard.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/InputDeviceVirtualKeyboard.names index 6ed1e9058b..71162dbc06 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/InputDeviceVirtualKeyboard.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/InputDeviceVirtualKeyboard.names @@ -5,8 +5,67 @@ "context": "BehaviorClass", "variant": "", "details": { - "name": "InputDeviceVirtualKeyboard" - } + "name": "Input Device Virtual Keyboard", + "category": "Input" + }, + "methods": [ + { + "base": "Getname", + "details": { + "name": "Get Name" + }, + "results": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "Name" + } + } + ] + }, + { + "base": "virtual_keyboard_edit_enter", + "details": { + "name": "virtual_keyboard_edit_enter" + }, + "results": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + } + ] + }, + { + "base": "virtual_keyboard_edit_clear", + "details": { + "name": "virtual_keyboard_edit_clear" + }, + "results": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + } + ] + }, + { + "base": "virtual_keyboard_navigation_back", + "details": { + "name": "virtual_keyboard_navigation_back" + }, + "results": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/InAppPurchasesRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/InAppPurchasesRequestBus.names new file mode 100644 index 0000000000..d444d11b65 --- /dev/null +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/InAppPurchasesRequestBus.names @@ -0,0 +1,178 @@ +{ + "entries": [ + { + "base": "InAppPurchasesRequestBus", + "context": "EBusSender", + "variant": "", + "details": { + "name": "In App Purchases" + }, + "methods": [ + { + "base": "FinishTransaction", + "entry": { + "name": "In", + "tooltip": "When signaled, this will invoke Finish Transaction" + }, + "exit": { + "name": "Out", + "tooltip": "Signaled after Finish Transaction is invoked" + }, + "details": { + "name": "Finish Transaction" + }, + "params": [ + { + "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", + "details": { + "name": "AZ Std::string" + } + }, + { + "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", + "details": { + "name": "bool" + } + } + ] + }, + { + "base": "QueryPurchasedProducts", + "entry": { + "name": "In", + "tooltip": "When signaled, this will invoke Query Purchased Products" + }, + "exit": { + "name": "Out", + "tooltip": "Signaled after Query Purchased Products is invoked" + }, + "details": { + "name": "Query Purchased Products" + } + }, + { + "base": "PurchaseProductWithDeveloperPayload", + "entry": { + "name": "In", + "tooltip": "When signaled, this will invoke Purchase Product With Developer Payload" + }, + "exit": { + "name": "Out", + "tooltip": "Signaled after Purchase Product With Developer Payload is invoked" + }, + "details": { + "name": "Purchase Product With Developer Payload" + }, + "params": [ + { + "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", + "details": { + "name": "AZ Std::string" + } + }, + { + "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", + "details": { + "name": "AZ Std::string" + } + } + ] + }, + { + "base": "QueryProductInfoFromJson", + "entry": { + "name": "In", + "tooltip": "When signaled, this will invoke Query Product Info From Json" + }, + "exit": { + "name": "Out", + "tooltip": "Signaled after Query Product Info From Json is invoked" + }, + "details": { + "name": "Query Product Info From Json" + }, + "params": [ + { + "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", + "details": { + "name": "AZ Std::string" + } + } + ] + }, + { + "base": "PurchaseProduct", + "entry": { + "name": "In", + "tooltip": "When signaled, this will invoke Purchase Product" + }, + "exit": { + "name": "Out", + "tooltip": "Signaled after Purchase Product is invoked" + }, + "details": { + "name": "Purchase Product" + }, + "params": [ + { + "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", + "details": { + "name": "AZ Std::string" + } + } + ] + }, + { + "base": "QueryProductInfo", + "entry": { + "name": "In", + "tooltip": "When signaled, this will invoke Query Product Info" + }, + "exit": { + "name": "Out", + "tooltip": "Signaled after Query Product Info is invoked" + }, + "details": { + "name": "Query Product Info" + } + }, + { + "base": "ConsumePurchase", + "entry": { + "name": "In", + "tooltip": "When signaled, this will invoke Consume Purchase" + }, + "exit": { + "name": "Out", + "tooltip": "Signaled after Consume Purchase is invoked" + }, + "details": { + "name": "Consume Purchase" + }, + "params": [ + { + "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", + "details": { + "name": "AZ Std::string" + } + } + ] + }, + { + "base": "Initialize", + "entry": { + "name": "In", + "tooltip": "When signaled, this will invoke Initialize" + }, + "exit": { + "name": "Out", + "tooltip": "Signaled after Initialize is invoked" + }, + "details": { + "name": "Initialize" + } + } + ] + } + ] +} \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/InAppPurchasesResponseAccessorBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/InAppPurchasesResponseAccessorBus.names new file mode 100644 index 0000000000..2ecfd9ccab --- /dev/null +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/InAppPurchasesResponseAccessorBus.names @@ -0,0 +1,534 @@ +{ + "entries": [ + { + "base": "InAppPurchasesResponseAccessorBus", + "context": "EBusSender", + "variant": "", + "details": { + "name": "In App Purchases Response Accessor" + }, + "methods": [ + { + "base": "RestoredOrderId", + "entry": { + "name": "In", + "tooltip": "When signaled, this will invoke Restored Order Id" + }, + "exit": { + "name": "Out", + "tooltip": "Signaled after Restored Order Id is invoked" + }, + "details": { + "name": "Restored Order Id" + }, + "results": [ + { + "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", + "details": { + "name": "AZ Std::string" + } + } + ] + }, + { + "base": "ProductDescription", + "entry": { + "name": "In", + "tooltip": "When signaled, this will invoke Product Description" + }, + "exit": { + "name": "Out", + "tooltip": "Signaled after Product Description is invoked" + }, + "details": { + "name": "Product Description" + }, + "results": [ + { + "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", + "details": { + "name": "AZ Std::string" + } + } + ] + }, + { + "base": "PurchaseToken", + "entry": { + "name": "In", + "tooltip": "When signaled, this will invoke Purchase Token" + }, + "exit": { + "name": "Out", + "tooltip": "Signaled after Purchase Token is invoked" + }, + "details": { + "name": "Purchase Token" + }, + "results": [ + { + "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", + "details": { + "name": "AZ Std::string" + } + } + ] + }, + { + "base": "ResetIndices", + "entry": { + "name": "In", + "tooltip": "When signaled, this will invoke Reset Indices" + }, + "exit": { + "name": "Out", + "tooltip": "Signaled after Reset Indices is invoked" + }, + "details": { + "name": "Reset Indices" + } + }, + { + "base": "ProductTitle", + "entry": { + "name": "In", + "tooltip": "When signaled, this will invoke Product Title" + }, + "exit": { + "name": "Out", + "tooltip": "Signaled after Product Title is invoked" + }, + "details": { + "name": "Product Title" + }, + "results": [ + { + "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", + "details": { + "name": "AZ Std::string" + } + } + ] + }, + { + "base": "ProductPrice", + "entry": { + "name": "In", + "tooltip": "When signaled, this will invoke Product Price" + }, + "exit": { + "name": "Out", + "tooltip": "Signaled after Product Price is invoked" + }, + "details": { + "name": "Product Price" + }, + "results": [ + { + "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", + "details": { + "name": "AZ Std::string" + } + } + ] + }, + { + "base": "IsAutoRenewing", + "entry": { + "name": "In", + "tooltip": "When signaled, this will invoke Is Auto Renewing" + }, + "exit": { + "name": "Out", + "tooltip": "Signaled after Is Auto Renewing is invoked" + }, + "details": { + "name": "Is Auto Renewing" + }, + "results": [ + { + "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", + "details": { + "name": "bool" + } + } + ] + }, + { + "base": "ProductId", + "entry": { + "name": "In", + "tooltip": "When signaled, this will invoke Product Id" + }, + "exit": { + "name": "Out", + "tooltip": "Signaled after Product Id is invoked" + }, + "details": { + "name": "Product Id" + }, + "results": [ + { + "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", + "details": { + "name": "AZ Std::string" + } + } + ] + }, + { + "base": "ProductPriceMicro", + "entry": { + "name": "In", + "tooltip": "When signaled, this will invoke Product Price Micro" + }, + "exit": { + "name": "Out", + "tooltip": "Signaled after Product Price Micro is invoked" + }, + "details": { + "name": "Product Price Micro" + }, + "results": [ + { + "typeid": "{D6597933-47CD-4FC8-B911-63F3E2B0993A}", + "details": { + "name": "AZ::u 64" + } + } + ] + }, + { + "base": "PurchasedProductId", + "entry": { + "name": "In", + "tooltip": "When signaled, this will invoke Purchased Product Id" + }, + "exit": { + "name": "Out", + "tooltip": "Signaled after Purchased Product Id is invoked" + }, + "details": { + "name": "Purchased Product Id" + }, + "results": [ + { + "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", + "details": { + "name": "AZ Std::string" + } + } + ] + }, + { + "base": "PurchaseTime", + "entry": { + "name": "In", + "tooltip": "When signaled, this will invoke Purchase Time" + }, + "exit": { + "name": "Out", + "tooltip": "Signaled after Purchase Time is invoked" + }, + "details": { + "name": "Purchase Time" + }, + "results": [ + { + "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", + "details": { + "name": "AZ Std::string" + } + } + ] + }, + { + "base": "SubscriptionExpirationTime", + "entry": { + "name": "In", + "tooltip": "When signaled, this will invoke Subscription Expiration Time" + }, + "exit": { + "name": "Out", + "tooltip": "Signaled after Subscription Expiration Time is invoked" + }, + "details": { + "name": "Subscription Expiration Time" + }, + "results": [ + { + "typeid": "{D6597933-47CD-4FC8-B911-63F3E2B0993A}", + "details": { + "name": "AZ::u 64" + } + } + ] + }, + { + "base": "RestoredPurchaseTime", + "entry": { + "name": "In", + "tooltip": "When signaled, this will invoke Restored Purchase Time" + }, + "exit": { + "name": "Out", + "tooltip": "Signaled after Restored Purchase Time is invoked" + }, + "details": { + "name": "Restored Purchase Time" + }, + "results": [ + { + "typeid": "{D6597933-47CD-4FC8-B911-63F3E2B0993A}", + "details": { + "name": "AZ::u 64" + } + } + ] + }, + { + "base": "PreviousPurchasedProduct", + "entry": { + "name": "In", + "tooltip": "When signaled, this will invoke Previous Purchased Product" + }, + "exit": { + "name": "Out", + "tooltip": "Signaled after Previous Purchased Product is invoked" + }, + "details": { + "name": "Previous Purchased Product" + }, + "results": [ + { + "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", + "details": { + "name": "bool" + } + } + ] + }, + { + "base": "DeveloperPayload", + "entry": { + "name": "In", + "tooltip": "When signaled, this will invoke Developer Payload" + }, + "exit": { + "name": "Out", + "tooltip": "Signaled after Developer Payload is invoked" + }, + "details": { + "name": "Developer Payload" + }, + "results": [ + { + "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", + "details": { + "name": "AZ Std::string" + } + } + ] + }, + { + "base": "PackageName", + "entry": { + "name": "In", + "tooltip": "When signaled, this will invoke Package Name" + }, + "exit": { + "name": "Out", + "tooltip": "Signaled after Package Name is invoked" + }, + "details": { + "name": "Package Name" + }, + "results": [ + { + "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", + "details": { + "name": "AZ Std::string" + } + } + ] + }, + { + "base": "PreviousProduct", + "entry": { + "name": "In", + "tooltip": "When signaled, this will invoke Previous Product" + }, + "exit": { + "name": "Out", + "tooltip": "Signaled after Previous Product is invoked" + }, + "details": { + "name": "Previous Product" + }, + "results": [ + { + "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", + "details": { + "name": "bool" + } + } + ] + }, + { + "base": "NextPurchasedProduct", + "entry": { + "name": "In", + "tooltip": "When signaled, this will invoke Next Purchased Product" + }, + "exit": { + "name": "Out", + "tooltip": "Signaled after Next Purchased Product is invoked" + }, + "details": { + "name": "Next Purchased Product" + }, + "results": [ + { + "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", + "details": { + "name": "bool" + } + } + ] + }, + { + "base": "ProductCurrencyCode", + "entry": { + "name": "In", + "tooltip": "When signaled, this will invoke Product Currency Code" + }, + "exit": { + "name": "Out", + "tooltip": "Signaled after Product Currency Code is invoked" + }, + "details": { + "name": "Product Currency Code" + }, + "results": [ + { + "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", + "details": { + "name": "AZ Std::string" + } + } + ] + }, + { + "base": "HasDownloads", + "entry": { + "name": "In", + "tooltip": "When signaled, this will invoke Has Downloads" + }, + "exit": { + "name": "Out", + "tooltip": "Signaled after Has Downloads is invoked" + }, + "details": { + "name": "Has Downloads" + }, + "results": [ + { + "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", + "details": { + "name": "bool" + } + } + ] + }, + { + "base": "NextProduct", + "entry": { + "name": "In", + "tooltip": "When signaled, this will invoke Next Product" + }, + "exit": { + "name": "Out", + "tooltip": "Signaled after Next Product is invoked" + }, + "details": { + "name": "Next Product" + }, + "results": [ + { + "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", + "details": { + "name": "bool" + } + } + ] + }, + { + "base": "OrderId", + "entry": { + "name": "In", + "tooltip": "When signaled, this will invoke Order Id" + }, + "exit": { + "name": "Out", + "tooltip": "Signaled after Order Id is invoked" + }, + "details": { + "name": "Order Id" + }, + "results": [ + { + "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", + "details": { + "name": "AZ Std::string" + } + } + ] + }, + { + "base": "PurchaseSignature", + "entry": { + "name": "In", + "tooltip": "When signaled, this will invoke Purchase Signature" + }, + "exit": { + "name": "Out", + "tooltip": "Signaled after Purchase Signature is invoked" + }, + "details": { + "name": "Purchase Signature" + }, + "results": [ + { + "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", + "details": { + "name": "AZ Std::string" + } + } + ] + }, + { + "base": "IsProductOwned", + "entry": { + "name": "In", + "tooltip": "When signaled, this will invoke Is Product Owned" + }, + "exit": { + "name": "Out", + "tooltip": "Signaled after Is Product Owned is invoked" + }, + "details": { + "name": "Is Product Owned" + }, + "results": [ + { + "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", + "details": { + "name": "bool" + } + } + ] + } + ] + } + ] +} \ No newline at end of file From 4ac8b5dc429b6c87b3bd9e743839c47f7a02c0ce Mon Sep 17 00:00:00 2001 From: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com> Date: Tue, 23 Nov 2021 13:13:21 -0800 Subject: [PATCH 224/345] Display version number correctly in installer builds from branches that properly set the name on Jenkins. (#5856) Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com> --- Code/Editor/CMakeLists.txt | 2 +- Code/Editor/CryEdit.cpp | 8 ++------ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/Code/Editor/CMakeLists.txt b/Code/Editor/CMakeLists.txt index bdfac373eb..e55498203c 100644 --- a/Code/Editor/CMakeLists.txt +++ b/Code/Editor/CMakeLists.txt @@ -131,7 +131,7 @@ ly_add_source_properties( PROPERTY COMPILE_DEFINITIONS VALUES O3DE_COPYRIGHT_YEAR=${LY_VERSION_COPYRIGHT_YEAR} - LY_BUILD=${LY_VERSION_BUILD_NUMBER} + LY_VERSION_BUILD_NUMBER=${LY_VERSION_BUILD_NUMBER} ${LY_PAL_TOOLS_DEFINES} ) ly_add_source_properties( diff --git a/Code/Editor/CryEdit.cpp b/Code/Editor/CryEdit.cpp index 8ef21425c8..dffe222f42 100644 --- a/Code/Editor/CryEdit.cpp +++ b/Code/Editor/CryEdit.cpp @@ -913,13 +913,9 @@ namespace QWidget* g_splashScreen = nullptr; } -QString FormatVersion(const SFileVersion& v) +QString FormatVersion([[maybe_unused]] const SFileVersion& v) { -#if defined(LY_BUILD) - return QObject::tr("Version %1.%2.%3.%4 - Build %5").arg(v[3]).arg(v[2]).arg(v[1]).arg(v[0]).arg(LY_BUILD); -#else - return QObject::tr("Version %1.%2.%3.%4").arg(v[3]).arg(v[2]).arg(v[1]).arg(v[0]); -#endif + return QObject::tr("Version %1").arg(LY_VERSION_BUILD_NUMBER); } QString FormatRichTextCopyrightNotice() From 75bb0f24ad06a16a17e4c13f2dfdb3c54c7c8c51 Mon Sep 17 00:00:00 2001 From: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> Date: Tue, 23 Nov 2021 13:16:04 -0800 Subject: [PATCH 225/345] Msbuild warning fix for jenkins (#5818) --- .../build/Platform/Windows/env_windows.cmd | 28 +++++++++++-------- .../Platform/Windows/installer_windows.cmd | 8 ------ 2 files changed, 16 insertions(+), 20 deletions(-) diff --git a/scripts/build/Platform/Windows/env_windows.cmd b/scripts/build/Platform/Windows/env_windows.cmd index a78946caf6..78b5ca6c1a 100644 --- a/scripts/build/Platform/Windows/env_windows.cmd +++ b/scripts/build/Platform/Windows/env_windows.cmd @@ -8,8 +8,7 @@ REM REM REM To get recursive folder creation -SETLOCAL EnableExtensions -SETLOCAL EnableDelayedExpansion +SETLOCAL EnableExtensions EnableDelayedExpansion where /Q cmake IF NOT %ERRORLEVEL%==0 ( @@ -22,21 +21,26 @@ IF NOT "%COMMAND_CWD%"=="" ( CD %COMMAND_CWD% ) -REM Jenkins reports MSB8029 when TMP/TEMP is not defined, define a dummy folder -IF NOT "%TMP%"=="" ( - IF NOT "%WORKSPACE_TMP%"=="" ( - SET TMP=%WORKSPACE_TMP% - SET TEMP=%WORKSPACE_TMP% +REM Ending the local environment to be able to propagate the TMP/TEMP variables to the calling script +ENDLOCAL + +REM Jenkins does not defined TMP +IF "%TMP%"=="" ( + IF "%WORKSPACE%"=="" ( + SET TMP=%APPDATA%\Local\Temp + SET TEMP=%APPDATA%\Local\Temp ) ELSE ( - SET TMP=%cd%/temp - SET TEMP=%cd%/temp + SET TMP=%WORKSPACE%\Temp + SET TEMP=%WORKSPACE%\Temp + REM This folder may not be created in the workspace + IF NOT EXIST "!TMP!" ( + MKDIR "!TMP!" + ) ) ) -IF NOT EXIST "!TMP!" ( - MKDIR "!TMP!" -) EXIT /b 0 :error +ENDLOCAL EXIT /b 1 \ No newline at end of file diff --git a/scripts/build/Platform/Windows/installer_windows.cmd b/scripts/build/Platform/Windows/installer_windows.cmd index bbde450973..8dc111c256 100644 --- a/scripts/build/Platform/Windows/installer_windows.cmd +++ b/scripts/build/Platform/Windows/installer_windows.cmd @@ -17,14 +17,6 @@ IF NOT EXIST %OUTPUT_DIRECTORY% ( ) PUSHD %OUTPUT_DIRECTORY% -REM Override the temporary directory used by wix to the workspace (if we have a WORKSPACE_TMP) -IF NOT "%WORKSPACE_TMP%"=="" ( - SET "WIX_TEMP=!WORKSPACE_TMP!/wix" - IF NOT EXIST "!WIX_TEMP!" ( - MKDIR "!WIX_TEMP!" - ) -) - REM Make sure we are using the CMake version of CPack and not the one that comes with chocolatey SET CPACK_PATH= IF "%LY_CMAKE_PATH%"=="" ( From 75d7c61ba1070cc167ef9fe01bf73eadcbf3a20f Mon Sep 17 00:00:00 2001 From: greerdv Date: Tue, 23 Nov 2021 21:25:50 +0000 Subject: [PATCH 226/345] fix variable capitalization Signed-off-by: greerdv --- Gems/PhysX/Code/Tests/PhysXColliderComponentModeTests.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gems/PhysX/Code/Tests/PhysXColliderComponentModeTests.cpp b/Gems/PhysX/Code/Tests/PhysXColliderComponentModeTests.cpp index 85168d17d0..c3966daea7 100644 --- a/Gems/PhysX/Code/Tests/PhysXColliderComponentModeTests.cpp +++ b/Gems/PhysX/Code/Tests/PhysXColliderComponentModeTests.cpp @@ -429,11 +429,11 @@ namespace UnitTest ->MousePosition(screenEnd) ->MouseLButtonUp(); - const auto WorldToScreenMultiplier = 1.0f / AzToolsFramework::CalculateScreenToWorldMultiplier(worldStart, m_cameraState); + const auto worldToScreenMultiplier = 1.0f / AzToolsFramework::CalculateScreenToWorldMultiplier(worldStart, m_cameraState); const auto assetScale = colliderEntity->FindComponent()->GetAssetScale(); // need quite a large tolerance because using screen co-ordinates limits precision const float tolerance = 0.01f; - EXPECT_NEAR(assetScale.GetX(), 1.0f + xDelta * WorldToScreenMultiplier, tolerance); + EXPECT_NEAR(assetScale.GetX(), 1.0f + xDelta * worldToScreenMultiplier, tolerance); EXPECT_NEAR(assetScale.GetY(), 1.0f, tolerance); EXPECT_NEAR(assetScale.GetZ(), 1.0f, tolerance); } From 57a6930842cdb52f39d840a21c0039ee8aea62b8 Mon Sep 17 00:00:00 2001 From: lsemp3d <58790905+lsemp3d@users.noreply.github.com> Date: Tue, 23 Nov 2021 13:30:14 -0800 Subject: [PATCH 227/345] Categorized most nodes and improved names Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com> --- .../Classes/BlendShapeData.names | 3 +- .../Classes/BlendShapeDataFace.names | 3 +- .../Classes/BoxShapeConfig.names | 3 +- .../Classes/CapsuleShapeConfig.names | 3 +- .../TranslationAssets/Classes/Contact.names | 19 +- .../Classes/CylinderShapeConfig.names | 3 +- .../Classes/DiskShapeConfig.names | 51 +- ...Tag Helper.names => EntityTransform.names} | 30 +- .../Classes/ExportProduct.names | 217 ++++- .../Classes/ExportProductList.names | 44 +- .../Classes/GradientSampler.names | 555 ++++++++++- .../Classes/IAnimationData.names | 52 +- .../Classes/IBlendShapeAnimationData.names | 65 +- .../Classes/IBlendShapeData.names | 134 +-- .../TranslationAssets/Classes/IMeshData.names | 33 +- .../LmbrCentral__QuadShapeConfig.names | 103 ++ .../Classes/MaterialData.names | 429 ++++----- .../TranslationAssets/Classes/MeshData.names | 162 +--- .../Classes/MeshVertexBitangentData.names | 89 +- .../Classes/MeshVertexColorData.names | 52 +- .../Classes/MeshVertexTangentData.names | 89 +- .../Classes/MeshVertexUVData.names | 48 +- .../Classes/MotionEvent.names | 345 ++++++- .../TranslationAssets/Classes/Name.names | 51 +- .../TranslationAssets/Classes/NodeIndex.names | 71 +- .../Classes/OutputDeviceTransformType.names | 77 +- .../Classes/PositionSplineQueryResult.names | 51 +- .../Classes/PythonBehaviorInfo.names | 72 +- .../Classes/RaySplineQueryResult.names | 73 +- .../Render__DisplayMapperOperationType.names | 99 ++ .../Classes/Render__ShadowmapSize.names | 85 ++ .../Classes/RuntimeData.names | 19 +- .../TranslationAssets/Classes/Scene.names | 240 ++++- .../Classes/SceneManifest.names | 35 +- .../Classes/ScriptTimePoint.names | 27 +- .../Classes/SliceInstantiationTicket.names | 33 +- .../Classes/SmoothStep.names | 139 ++- .../Classes/SpawnerConfig.names | 91 +- .../Classes/SphereShapeConfig.names | 51 +- .../TranslationAssets/Classes/String.names | 132 +-- .../TranslationAssets/Classes/TickOrder.names | 161 +++- .../TranslationAssets/Classes/UiAnchors.names | 35 +- .../Classes/Unit Testing.names | 3 +- .../TranslationAssets/Classes/Uuid.names | 3 +- .../Classes/VertexColor.names | 3 +- .../Handlers/ForceRegionNotificationBus.names | 49 + .../EBus/Senders/BloomRequestBus.names | 3 +- .../EBus/Senders/BoundsRequestBus.names | 3 +- .../DiskShapeComponentRequestsBus.names | 21 +- .../Senders/EditorReflectionProbeBus.names | 9 +- .../Senders/ExposureControlRequestBus.names | 195 ++-- .../EBus/Senders/GradientRequestBus.names | 9 +- .../Senders/GridComponentRequestBus.names | 75 +- .../Senders/HDRColorGradingRequestBus.names | 721 +++++++------- .../EBus/Senders/HDRiSkyboxRequestBus.names | 3 +- .../ImageBasedLightComponentRequestBus.names | 67 +- .../Senders/LookModificationRequestBus.names | 87 +- .../EBus/Senders/MetastreamRequestBus.names | 883 ++++++++++++++++++ .../Senders/NetworkCharacterRequestBus.names | 51 + .../EBus/Senders/PostFxLayerRequestBus.names | 27 +- .../QuadShapeComponentRequestsBus.names | 39 +- .../RandomTimedSpawnerRequestBus.names | 45 +- .../RenderMeshComponentRequestBus.names | 99 +- .../EBus/Senders/SsaoRequestBus.names | 195 ++-- .../EBus/Senders/TickRequestBus.names | 5 +- .../EBus/Senders/UiTransformBus.names | 3 +- 66 files changed, 4781 insertions(+), 1891 deletions(-) rename Gems/ScriptCanvas/Assets/TranslationAssets/Classes/{Tag Helper.names => EntityTransform.names} (50%) create mode 100644 Gems/ScriptCanvas/Assets/TranslationAssets/Classes/LmbrCentral__QuadShapeConfig.names create mode 100644 Gems/ScriptCanvas/Assets/TranslationAssets/Classes/Render__DisplayMapperOperationType.names create mode 100644 Gems/ScriptCanvas/Assets/TranslationAssets/Classes/Render__ShadowmapSize.names create mode 100644 Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/ForceRegionNotificationBus.names create mode 100644 Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/MetastreamRequestBus.names create mode 100644 Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/NetworkCharacterRequestBus.names diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/BlendShapeData.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/BlendShapeData.names index d6a19b9837..b83eb56d2a 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/BlendShapeData.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/BlendShapeData.names @@ -5,7 +5,8 @@ "context": "BehaviorClass", "variant": "", "details": { - "name": "Blend Shape Data" + "name": "Blend Shape Data", + "category": "Rendering" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/BlendShapeDataFace.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/BlendShapeDataFace.names index abbdfd2f2f..b7bee4aee2 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/BlendShapeDataFace.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/BlendShapeDataFace.names @@ -5,7 +5,8 @@ "context": "BehaviorClass", "variant": "", "details": { - "name": "Blend Shape Data Face" + "name": "Blend Shape Data Face", + "category": "Rendering" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/BoxShapeConfig.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/BoxShapeConfig.names index aac06f415c..67818b0d8d 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/BoxShapeConfig.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/BoxShapeConfig.names @@ -5,7 +5,8 @@ "context": "BehaviorClass", "variant": "", "details": { - "name": "Box Shape Config" + "name": "Box Shape Config", + "category": "Rendering/Shapes" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/CapsuleShapeConfig.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/CapsuleShapeConfig.names index 6fe97b25e6..8b96624e57 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/CapsuleShapeConfig.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/CapsuleShapeConfig.names @@ -5,7 +5,8 @@ "context": "BehaviorClass", "variant": "", "details": { - "name": "Capsule Shape Config" + "name": "Capsule Shape Config", + "category": "Rendering/Shapes" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/Contact.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/Contact.names index 547cb70970..515acd65a8 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/Contact.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/Contact.names @@ -5,7 +5,8 @@ "context": "BehaviorClass", "variant": "", "details": { - "name": "Contact" + "name": "Contact", + "category": "Physics" }, "methods": [ { @@ -25,7 +26,7 @@ { "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}", "details": { - "name": "Position" + "name": "Vector 3" } } ] @@ -45,7 +46,7 @@ { "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}", "details": { - "name": "Position" + "name": "Vector 3" } } ] @@ -67,7 +68,7 @@ { "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}", "details": { - "name": "Normal" + "name": "Vector 3" } } ] @@ -87,7 +88,7 @@ { "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}", "details": { - "name": "Normal" + "name": "Vector 3" } } ] @@ -109,7 +110,7 @@ { "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}", "details": { - "name": "Impulse" + "name": "Vector 3" } } ] @@ -129,7 +130,7 @@ { "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}", "details": { - "name": "Impulse" + "name": "Vector 3" } } ] @@ -151,7 +152,7 @@ { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", "details": { - "name": "Separation" + "name": "float" } } ] @@ -171,7 +172,7 @@ { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", "details": { - "name": "Separation" + "name": "float" } } ] diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/CylinderShapeConfig.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/CylinderShapeConfig.names index 89ee21fe7d..47a676caf5 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/CylinderShapeConfig.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/CylinderShapeConfig.names @@ -5,7 +5,8 @@ "context": "BehaviorClass", "variant": "", "details": { - "name": "Cylinder Shape Config" + "name": "Cylinder Shape Config", + "category": "Rendering/Shapes" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/DiskShapeConfig.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/DiskShapeConfig.names index 6f4af06f00..c23fa14503 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/DiskShapeConfig.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/DiskShapeConfig.names @@ -5,8 +5,55 @@ "context": "BehaviorClass", "variant": "", "details": { - "name": "DiskShapeConfig" - } + "name": "Disk Shape Config", + "category": "Rendering/Shapes" + }, + "methods": [ + { + "base": "GetRadius", + "details": { + "name": "Get Radius" + }, + "params": [ + { + "typeid": "{24EC2919-F198-4871-8404-F6DE8A16275E}", + "details": { + "name": "Configuration", + "tooltip": "Disk shape configuration parameters" + } + } + ], + "results": [ + { + "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", + "details": { + "name": "float" + } + } + ] + }, + { + "base": "SetRadius", + "details": { + "name": "Set Radius" + }, + "params": [ + { + "typeid": "{24EC2919-F198-4871-8404-F6DE8A16275E}", + "details": { + "name": "Configuration", + "tooltip": "Disk shape configuration parameters" + } + }, + { + "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", + "details": { + "name": "float" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/Tag Helper.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/EntityTransform.names similarity index 50% rename from Gems/ScriptCanvas/Assets/TranslationAssets/Classes/Tag Helper.names rename to Gems/ScriptCanvas/Assets/TranslationAssets/Classes/EntityTransform.names index 65996b7b3b..d86c656b89 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/Tag Helper.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/EntityTransform.names @@ -1,41 +1,41 @@ { "entries": [ { - "base": "Tag Helper", + "base": "Entity Transform", "context": "BehaviorClass", "variant": "", "details": { - "name": "Tag Helper" + "name": "Entity Transform", + "category": "Entity/Transform" }, "methods": [ { - "base": "GetEntitiesbyTag", - "context": "Tag Helper", + "base": "Rotate", + "context": "Entity Transform", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetEntitiesbyTag" + "tooltip": "When signaled, this will invoke Rotate" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetEntitiesbyTag is invoked" + "tooltip": "Signaled after Rotate is invoked" }, "details": { - "name": "Tag Helper::Get Entities by Tag", - "category": "Gameplay/Tag" + "name": "Rotate" }, "params": [ { - "typeid": "{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}", + "typeid": "{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}", "details": { - "name": "const Crc32&" + "name": "Entity", + "tooltip": "The entity to apply the rotation on." } - } - ], - "results": [ + }, { - "typeid": "{4841CFF0-7A5C-519C-BD16-D3625E99605E}", + "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}", "details": { - "name": "AZStd::vector" + "name": "Euler Angles", + "tooltip": "Euler angles, Pitch/Yaw/Roll." } } ] diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ExportProduct.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ExportProduct.names index b42f87cf63..ed46be444d 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ExportProduct.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ExportProduct.names @@ -5,8 +5,221 @@ "context": "BehaviorClass", "variant": "", "details": { - "name": "ExportProduct" - } + "name": "Export Product", + "category": "Scene" + }, + "methods": [ + { + "base": "GetsubId", + "details": { + "name": "Getsub Id" + }, + "params": [ + { + "typeid": "{6054EDCB-4C04-4D96-BF26-704999FFB725}", + "details": { + "name": "SceneAPI:: Events:: Export Product*" + } + } + ], + "results": [ + { + "typeid": "{43DA906B-7DEF-4CA8-9790-854106D3F983}", + "details": { + "name": "unsigned int" + } + } + ] + }, + { + "base": "SetsubId", + "details": { + "name": "Setsub Id" + }, + "params": [ + { + "typeid": "{6054EDCB-4C04-4D96-BF26-704999FFB725}", + "details": { + "name": "SceneAPI:: Events:: Export Product*" + } + }, + { + "typeid": "{43DA906B-7DEF-4CA8-9790-854106D3F983}", + "details": { + "name": "unsigned int" + } + } + ] + }, + { + "base": "GetproductDependencies", + "details": { + "name": "Getproduct Dependencies" + }, + "params": [ + { + "typeid": "{6054EDCB-4C04-4D96-BF26-704999FFB725}", + "details": { + "name": "SceneAPI:: Events:: Export Product*" + } + } + ], + "results": [ + { + "typeid": "{BFBA17B6-CDE2-5239-AEE0-58DF7FA14E3C}", + "details": { + "name": "AZ Std::vector< SceneAPI:: Events:: Export Product, allocator>&" + } + } + ] + }, + { + "base": "SetproductDependencies", + "details": { + "name": "Setproduct Dependencies" + }, + "params": [ + { + "typeid": "{6054EDCB-4C04-4D96-BF26-704999FFB725}", + "details": { + "name": "SceneAPI:: Events:: Export Product*" + } + }, + { + "typeid": "{BFBA17B6-CDE2-5239-AEE0-58DF7FA14E3C}", + "details": { + "name": "const AZ Std::vector< SceneAPI:: Events:: Export Product, allocator>" + } + } + ] + }, + { + "base": "GetassetType", + "details": { + "name": "Getasset Type" + }, + "params": [ + { + "typeid": "{6054EDCB-4C04-4D96-BF26-704999FFB725}", + "details": { + "name": "SceneAPI:: Events:: Export Product*" + } + } + ], + "results": [ + { + "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}", + "details": { + "name": "AZ:: Uuid" + } + } + ] + }, + { + "base": "SetassetType", + "details": { + "name": "Setasset Type" + }, + "params": [ + { + "typeid": "{6054EDCB-4C04-4D96-BF26-704999FFB725}", + "details": { + "name": "SceneAPI:: Events:: Export Product*" + } + }, + { + "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}", + "details": { + "name": "AZ:: Uuid" + } + } + ] + }, + { + "base": "Getfilename", + "details": { + "name": "Getfilename" + }, + "params": [ + { + "typeid": "{6054EDCB-4C04-4D96-BF26-704999FFB725}", + "details": { + "name": "SceneAPI:: Events:: Export Product*" + } + } + ], + "results": [ + { + "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", + "details": { + "name": "AZ Std::string" + } + } + ] + }, + { + "base": "Setfilename", + "details": { + "name": "Setfilename" + }, + "params": [ + { + "typeid": "{6054EDCB-4C04-4D96-BF26-704999FFB725}", + "details": { + "name": "SceneAPI:: Events:: Export Product*" + } + }, + { + "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", + "details": { + "name": "AZ Std::string" + } + } + ] + }, + { + "base": "GetsourceId", + "details": { + "name": "Getsource Id" + }, + "params": [ + { + "typeid": "{6054EDCB-4C04-4D96-BF26-704999FFB725}", + "details": { + "name": "SceneAPI:: Events:: Export Product*" + } + } + ], + "results": [ + { + "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}", + "details": { + "name": "AZ:: Uuid" + } + } + ] + }, + { + "base": "SetsourceId", + "details": { + "name": "Setsource Id" + }, + "params": [ + { + "typeid": "{6054EDCB-4C04-4D96-BF26-704999FFB725}", + "details": { + "name": "SceneAPI:: Events:: Export Product*" + } + }, + { + "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}", + "details": { + "name": "AZ:: Uuid" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ExportProductList.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ExportProductList.names index c3bbaf92a3..c70e872bf5 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ExportProductList.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ExportProductList.names @@ -5,7 +5,8 @@ "context": "BehaviorClass", "variant": "", "details": { - "name": "ExportProductList" + "name": "Export Product List", + "category": "Rendering" }, "methods": [ { @@ -13,27 +14,26 @@ "context": "ExportProductList", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke AddProduct" + "tooltip": "When signaled, this will invoke Add Product" }, "exit": { "name": "Out", - "tooltip": "Signaled after AddProduct is invoked" + "tooltip": "Signaled after Add Product is invoked" }, "details": { - "name": "ExportProductList::AddProduct", - "category": "Other" + "name": "Add Product" }, "params": [ { "typeid": "{1C76A51F-431B-4987-B653-CFCC940D0D0F}", "details": { - "name": "SceneAPI::Events::ExportProductList&" + "name": "" } }, { "typeid": "{6054EDCB-4C04-4D96-BF26-704999FFB725}", "details": { - "name": "SceneAPI::Events::ExportProduct&" + "name": "" } } ] @@ -43,29 +43,20 @@ "context": "ExportProductList", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetProducts" + "tooltip": "When signaled, this will invoke Get Products" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetProducts is invoked" + "tooltip": "Signaled after Get Products is invoked" }, "details": { - "name": "ExportProductList::GetProducts", - "category": "Other" + "name": "Get Products" }, - "params": [ - { - "typeid": "{1C76A51F-431B-4987-B653-CFCC940D0D0F}", - "details": { - "name": "SceneAPI::Events::ExportProductList*" - } - } - ], "results": [ { "typeid": "{BFBA17B6-CDE2-5239-AEE0-58DF7FA14E3C}", "details": { - "name": "const AZStd::vector" + "name": "const AZ Std::vector< SceneAPI:: Events:: Export Product, allocator>" } } ] @@ -75,33 +66,32 @@ "context": "ExportProductList", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke AddDependencyToProduct" + "tooltip": "When signaled, this will invoke Add Dependency To Product" }, "exit": { "name": "Out", - "tooltip": "Signaled after AddDependencyToProduct is invoked" + "tooltip": "Signaled after Add Dependency To Product is invoked" }, "details": { - "name": "ExportProductList::AddDependencyToProduct", - "category": "Other" + "name": "Add Dependency To Product" }, "params": [ { "typeid": "{1C76A51F-431B-4987-B653-CFCC940D0D0F}", "details": { - "name": "SceneAPI::Events::ExportProductList*" + "name": "" } }, { "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", "details": { - "name": "const AZStd::basic_string, alloc" + "name": "AZ Std::string" } }, { "typeid": "{6054EDCB-4C04-4D96-BF26-704999FFB725}", "details": { - "name": "SceneAPI::Events::ExportProduct&" + "name": "" } } ] diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/GradientSampler.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/GradientSampler.names index 57f65951aa..681731b74a 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/GradientSampler.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/GradientSampler.names @@ -5,8 +5,559 @@ "context": "BehaviorClass", "variant": "", "details": { - "name": "GradientSampler" - } + "name": "Gradient Sampler", + "category": "Rendering" + }, + "methods": [ + { + "base": "Getscale", + "details": { + "name": "Getscale" + }, + "params": [ + { + "typeid": "{3768D3A6-BF70-4ABC-B4EC-73C75A886916}", + "details": { + "name": "Gradient Sampler" + } + } + ], + "results": [ + { + "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}", + "details": { + "name": "Vector 3" + } + } + ] + }, + { + "base": "Setscale", + "details": { + "name": "Setscale" + }, + "params": [ + { + "typeid": "{3768D3A6-BF70-4ABC-B4EC-73C75A886916}", + "details": { + "name": "Gradient Sampler" + } + }, + { + "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}", + "details": { + "name": "Vector 3" + } + } + ] + }, + { + "base": "GetoutputMin", + "details": { + "name": "Getoutput Min" + }, + "params": [ + { + "typeid": "{3768D3A6-BF70-4ABC-B4EC-73C75A886916}", + "details": { + "name": "Gradient Sampler" + } + } + ], + "results": [ + { + "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", + "details": { + "name": "float" + } + } + ] + }, + { + "base": "SetoutputMin", + "details": { + "name": "Setoutput Min" + }, + "params": [ + { + "typeid": "{3768D3A6-BF70-4ABC-B4EC-73C75A886916}", + "details": { + "name": "Gradient Sampler" + } + }, + { + "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", + "details": { + "name": "float" + } + } + ] + }, + { + "base": "Getrotation", + "details": { + "name": "Getrotation" + }, + "params": [ + { + "typeid": "{3768D3A6-BF70-4ABC-B4EC-73C75A886916}", + "details": { + "name": "Gradient Sampler" + } + } + ], + "results": [ + { + "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}", + "details": { + "name": "Vector 3" + } + } + ] + }, + { + "base": "Setrotation", + "details": { + "name": "Setrotation" + }, + "params": [ + { + "typeid": "{3768D3A6-BF70-4ABC-B4EC-73C75A886916}", + "details": { + "name": "Gradient Sampler" + } + }, + { + "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}", + "details": { + "name": "Vector 3" + } + } + ] + }, + { + "base": "GetinputMin", + "details": { + "name": "Getinput Min" + }, + "params": [ + { + "typeid": "{3768D3A6-BF70-4ABC-B4EC-73C75A886916}", + "details": { + "name": "Gradient Sampler" + } + } + ], + "results": [ + { + "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", + "details": { + "name": "float" + } + } + ] + }, + { + "base": "SetinputMin", + "details": { + "name": "Setinput Min" + }, + "params": [ + { + "typeid": "{3768D3A6-BF70-4ABC-B4EC-73C75A886916}", + "details": { + "name": "Gradient Sampler" + } + }, + { + "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", + "details": { + "name": "float" + } + } + ] + }, + { + "base": "GetinvertInput", + "details": { + "name": "Getinvert Input" + }, + "params": [ + { + "typeid": "{3768D3A6-BF70-4ABC-B4EC-73C75A886916}", + "details": { + "name": "Gradient Sampler" + } + } + ], + "results": [ + { + "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", + "details": { + "name": "bool" + } + } + ] + }, + { + "base": "SetinvertInput", + "details": { + "name": "Setinvert Input" + }, + "params": [ + { + "typeid": "{3768D3A6-BF70-4ABC-B4EC-73C75A886916}", + "details": { + "name": "Gradient Sampler" + } + }, + { + "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", + "details": { + "name": "bool" + } + } + ] + }, + { + "base": "GetinputMid", + "details": { + "name": "Getinput Mid" + }, + "params": [ + { + "typeid": "{3768D3A6-BF70-4ABC-B4EC-73C75A886916}", + "details": { + "name": "Gradient Sampler" + } + } + ], + "results": [ + { + "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", + "details": { + "name": "float" + } + } + ] + }, + { + "base": "SetinputMid", + "details": { + "name": "Setinput Mid" + }, + "params": [ + { + "typeid": "{3768D3A6-BF70-4ABC-B4EC-73C75A886916}", + "details": { + "name": "Gradient Sampler" + } + }, + { + "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", + "details": { + "name": "float" + } + } + ] + }, + { + "base": "GetenableTransforms", + "details": { + "name": "Getenable Transforms" + }, + "params": [ + { + "typeid": "{3768D3A6-BF70-4ABC-B4EC-73C75A886916}", + "details": { + "name": "Gradient Sampler" + } + } + ], + "results": [ + { + "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", + "details": { + "name": "bool" + } + } + ] + }, + { + "base": "SetenableTransforms", + "details": { + "name": "Setenable Transforms" + }, + "params": [ + { + "typeid": "{3768D3A6-BF70-4ABC-B4EC-73C75A886916}", + "details": { + "name": "Gradient Sampler" + } + }, + { + "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", + "details": { + "name": "bool" + } + } + ] + }, + { + "base": "Getopacity", + "details": { + "name": "Getopacity" + }, + "params": [ + { + "typeid": "{3768D3A6-BF70-4ABC-B4EC-73C75A886916}", + "details": { + "name": "Gradient Sampler" + } + } + ], + "results": [ + { + "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", + "details": { + "name": "float" + } + } + ] + }, + { + "base": "Setopacity", + "details": { + "name": "Setopacity" + }, + "params": [ + { + "typeid": "{3768D3A6-BF70-4ABC-B4EC-73C75A886916}", + "details": { + "name": "Gradient Sampler" + } + }, + { + "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", + "details": { + "name": "float" + } + } + ] + }, + { + "base": "GetenableLevels", + "details": { + "name": "Getenable Levels" + }, + "params": [ + { + "typeid": "{3768D3A6-BF70-4ABC-B4EC-73C75A886916}", + "details": { + "name": "Gradient Sampler" + } + } + ], + "results": [ + { + "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", + "details": { + "name": "bool" + } + } + ] + }, + { + "base": "SetenableLevels", + "details": { + "name": "Setenable Levels" + }, + "params": [ + { + "typeid": "{3768D3A6-BF70-4ABC-B4EC-73C75A886916}", + "details": { + "name": "Gradient Sampler" + } + }, + { + "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", + "details": { + "name": "bool" + } + } + ] + }, + { + "base": "GetinputMax", + "details": { + "name": "Getinput Max" + }, + "params": [ + { + "typeid": "{3768D3A6-BF70-4ABC-B4EC-73C75A886916}", + "details": { + "name": "Gradient Sampler" + } + } + ], + "results": [ + { + "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", + "details": { + "name": "float" + } + } + ] + }, + { + "base": "SetinputMax", + "details": { + "name": "Setinput Max" + }, + "params": [ + { + "typeid": "{3768D3A6-BF70-4ABC-B4EC-73C75A886916}", + "details": { + "name": "Gradient Sampler" + } + }, + { + "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", + "details": { + "name": "float" + } + } + ] + }, + { + "base": "GetoutputMax", + "details": { + "name": "Getoutput Max" + }, + "params": [ + { + "typeid": "{3768D3A6-BF70-4ABC-B4EC-73C75A886916}", + "details": { + "name": "Gradient Sampler" + } + } + ], + "results": [ + { + "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", + "details": { + "name": "float" + } + } + ] + }, + { + "base": "SetoutputMax", + "details": { + "name": "Setoutput Max" + }, + "params": [ + { + "typeid": "{3768D3A6-BF70-4ABC-B4EC-73C75A886916}", + "details": { + "name": "Gradient Sampler" + } + }, + { + "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", + "details": { + "name": "float" + } + } + ] + }, + { + "base": "Gettranslation", + "details": { + "name": "Gettranslation" + }, + "params": [ + { + "typeid": "{3768D3A6-BF70-4ABC-B4EC-73C75A886916}", + "details": { + "name": "Gradient Sampler" + } + } + ], + "results": [ + { + "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}", + "details": { + "name": "Vector 3" + } + } + ] + }, + { + "base": "Settranslation", + "details": { + "name": "Settranslation" + }, + "params": [ + { + "typeid": "{3768D3A6-BF70-4ABC-B4EC-73C75A886916}", + "details": { + "name": "Gradient Sampler" + } + }, + { + "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}", + "details": { + "name": "Vector 3" + } + } + ] + }, + { + "base": "GetgradientId", + "details": { + "name": "Getgradient Id" + }, + "params": [ + { + "typeid": "{3768D3A6-BF70-4ABC-B4EC-73C75A886916}", + "details": { + "name": "Gradient Sampler" + } + } + ], + "results": [ + { + "typeid": "{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}", + "details": { + "name": "Entity Id", + "tooltip": "Entity Unique Id" + } + } + ] + }, + { + "base": "SetgradientId", + "details": { + "name": "Setgradient Id" + }, + "params": [ + { + "typeid": "{3768D3A6-BF70-4ABC-B4EC-73C75A886916}", + "details": { + "name": "Gradient Sampler" + } + }, + { + "typeid": "{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}", + "details": { + "name": "Entity Id", + "tooltip": "Entity Unique Id" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/IAnimationData.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/IAnimationData.names index c258755cf5..6642870078 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/IAnimationData.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/IAnimationData.names @@ -5,7 +5,8 @@ "context": "BehaviorClass", "variant": "", "details": { - "name": "IAnimationData" + "name": "IAnimation Data", + "category": "Animation" }, "methods": [ { @@ -13,29 +14,20 @@ "context": "IAnimationData", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetKeyFrameCount" + "tooltip": "When signaled, this will invoke Get Key Frame Count" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetKeyFrameCount is invoked" + "tooltip": "Signaled after Get Key Frame Count is invoked" }, "details": { - "name": "IAnimationData::GetKeyFrameCount", - "category": "Other" + "name": "Get Key Frame Count" }, - "params": [ - { - "typeid": "{62B0571C-6EFF-42FA-902A-85AC744E04F2}", - "details": { - "name": "IAnimationData*" - } - } - ], "results": [ { "typeid": "{D6597933-47CD-4FC8-B911-63F3E2B0993A}", "details": { - "name": "AZ::u64" + "name": "AZ::u 64" } } ] @@ -45,27 +37,20 @@ "context": "IAnimationData", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetKeyFrame" + "tooltip": "When signaled, this will invoke Get Key Frame" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetKeyFrame is invoked" + "tooltip": "Signaled after Get Key Frame is invoked" }, "details": { - "name": "IAnimationData::GetKeyFrame", - "category": "Other" + "name": "Get Key Frame" }, "params": [ - { - "typeid": "{62B0571C-6EFF-42FA-902A-85AC744E04F2}", - "details": { - "name": "IAnimationData*" - } - }, { "typeid": "{D6597933-47CD-4FC8-B911-63F3E2B0993A}", "details": { - "name": "AZ::u64" + "name": "AZ::u 64" } } ], @@ -73,7 +58,7 @@ { "typeid": "{1906D8A5-7DEC-4DE3-A606-9E53BB3459E7}", "details": { - "name": "const Matrix3x4&" + "name": "const Matrix 3x 4&" } } ] @@ -83,24 +68,15 @@ "context": "IAnimationData", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetTimeStepBetweenFrames" + "tooltip": "When signaled, this will invoke Get Time Step Between Frames" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetTimeStepBetweenFrames is invoked" + "tooltip": "Signaled after Get Time Step Between Frames is invoked" }, "details": { - "name": "IAnimationData::GetTimeStepBetweenFrames", - "category": "Other" + "name": "Get Time Step Between Frames" }, - "params": [ - { - "typeid": "{62B0571C-6EFF-42FA-902A-85AC744E04F2}", - "details": { - "name": "IAnimationData*" - } - } - ], "results": [ { "typeid": "{110C4B14-11A8-4E9D-8638-5051013A56AC}", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/IBlendShapeAnimationData.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/IBlendShapeAnimationData.names index 1d73f54d56..d07ba28e39 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/IBlendShapeAnimationData.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/IBlendShapeAnimationData.names @@ -5,7 +5,8 @@ "context": "BehaviorClass", "variant": "", "details": { - "name": "IBlendShapeAnimationData" + "name": "IBlend Shape Animation Data", + "category": "Animation" }, "methods": [ { @@ -13,24 +14,15 @@ "context": "IBlendShapeAnimationData", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetBlendShapeName" + "tooltip": "When signaled, this will invoke Get Blend Shape Name" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetBlendShapeName is invoked" + "tooltip": "Signaled after Get Blend Shape Name is invoked" }, "details": { - "name": "IBlendShapeAnimationData::GetBlendShapeName", - "category": "Other" + "name": "Get Blend Shape Name" }, - "params": [ - { - "typeid": "{CD2004EB-8B88-42B2-A539-079A557C98C9}", - "details": { - "name": "IBlendShapeAnimationData*" - } - } - ], "results": [ { "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", @@ -45,29 +37,20 @@ "context": "IBlendShapeAnimationData", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetKeyFrameCount" + "tooltip": "When signaled, this will invoke Get Key Frame Count" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetKeyFrameCount is invoked" + "tooltip": "Signaled after Get Key Frame Count is invoked" }, "details": { - "name": "IBlendShapeAnimationData::GetKeyFrameCount", - "category": "Other" + "name": "Get Key Frame Count" }, - "params": [ - { - "typeid": "{CD2004EB-8B88-42B2-A539-079A557C98C9}", - "details": { - "name": "IBlendShapeAnimationData*" - } - } - ], "results": [ { "typeid": "{D6597933-47CD-4FC8-B911-63F3E2B0993A}", "details": { - "name": "AZ::u64" + "name": "AZ::u 64" } } ] @@ -77,27 +60,20 @@ "context": "IBlendShapeAnimationData", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetKeyFrame" + "tooltip": "When signaled, this will invoke Get Key Frame" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetKeyFrame is invoked" + "tooltip": "Signaled after Get Key Frame is invoked" }, "details": { - "name": "IBlendShapeAnimationData::GetKeyFrame", - "category": "Other" + "name": "Get Key Frame" }, "params": [ - { - "typeid": "{CD2004EB-8B88-42B2-A539-079A557C98C9}", - "details": { - "name": "IBlendShapeAnimationData*" - } - }, { "typeid": "{D6597933-47CD-4FC8-B911-63F3E2B0993A}", "details": { - "name": "AZ::u64" + "name": "AZ::u 64" } } ], @@ -115,24 +91,15 @@ "context": "IBlendShapeAnimationData", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetTimeStepBetweenFrames" + "tooltip": "When signaled, this will invoke Get Time Step Between Frames" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetTimeStepBetweenFrames is invoked" + "tooltip": "Signaled after Get Time Step Between Frames is invoked" }, "details": { - "name": "IBlendShapeAnimationData::GetTimeStepBetweenFrames", - "category": "Other" + "name": "Get Time Step Between Frames" }, - "params": [ - { - "typeid": "{CD2004EB-8B88-42B2-A539-079A557C98C9}", - "details": { - "name": "IBlendShapeAnimationData*" - } - } - ], "results": [ { "typeid": "{110C4B14-11A8-4E9D-8638-5051013A56AC}", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/IBlendShapeData.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/IBlendShapeData.names index 24143c053c..70210664dc 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/IBlendShapeData.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/IBlendShapeData.names @@ -5,7 +5,8 @@ "context": "BehaviorClass", "variant": "", "details": { - "name": "IBlendShapeData" + "name": "IBlend Shape Data", + "category": "Animation" }, "methods": [ { @@ -13,23 +14,16 @@ "context": "IBlendShapeData", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetNormal" + "tooltip": "When signaled, this will invoke Get Normal" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetNormal is invoked" + "tooltip": "Signaled after Get Normal is invoked" }, "details": { - "name": "IBlendShapeData::GetNormal", - "category": "Other" + "name": "Get Normal" }, "params": [ - { - "typeid": "{55E7384D-9333-4C51-BC91-E90CAC2C30E2}", - "details": { - "name": "IBlendShapeData*" - } - }, { "typeid": "{43DA906B-7DEF-4CA8-9790-854106D3F983}", "details": { @@ -41,7 +35,7 @@ { "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}", "details": { - "name": "const Vector3&" + "name": "const Vector 3&" } } ] @@ -51,23 +45,16 @@ "context": "IBlendShapeData", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetFaceVertexIndex" + "tooltip": "When signaled, this will invoke Get Face Vertex Index" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetFaceVertexIndex is invoked" + "tooltip": "Signaled after Get Face Vertex Index is invoked" }, "details": { - "name": "IBlendShapeData::GetFaceVertexIndex", - "category": "Other" + "name": "Get Face Vertex Index" }, "params": [ - { - "typeid": "{55E7384D-9333-4C51-BC91-E90CAC2C30E2}", - "details": { - "name": "IBlendShapeData*" - } - }, { "typeid": "{43DA906B-7DEF-4CA8-9790-854106D3F983}", "details": { @@ -95,23 +82,16 @@ "context": "IBlendShapeData", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetFaceInfo" + "tooltip": "When signaled, this will invoke Get Face Info" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetFaceInfo is invoked" + "tooltip": "Signaled after Get Face Info is invoked" }, "details": { - "name": "IBlendShapeData::GetFaceInfo", - "category": "Other" + "name": "Get Face Info" }, "params": [ - { - "typeid": "{55E7384D-9333-4C51-BC91-E90CAC2C30E2}", - "details": { - "name": "IBlendShapeData*" - } - }, { "typeid": "{43DA906B-7DEF-4CA8-9790-854106D3F983}", "details": { @@ -123,7 +103,7 @@ { "typeid": "{C972EC9A-3A5C-47CD-9A92-ECB4C0C0451C}", "details": { - "name": "const SceneAPI::DataTypes::IBlendShapeData::Face&" + "name": "const SceneAPI:: Data Types::I Blend Shape Data:: Face&" } } ] @@ -133,23 +113,16 @@ "context": "IBlendShapeData", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetPosition" + "tooltip": "When signaled, this will invoke Get Position" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetPosition is invoked" + "tooltip": "Signaled after Get Position is invoked" }, "details": { - "name": "IBlendShapeData::GetPosition", - "category": "Other" + "name": "Get Position" }, "params": [ - { - "typeid": "{55E7384D-9333-4C51-BC91-E90CAC2C30E2}", - "details": { - "name": "IBlendShapeData*" - } - }, { "typeid": "{43DA906B-7DEF-4CA8-9790-854106D3F983}", "details": { @@ -161,7 +134,7 @@ { "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}", "details": { - "name": "const Vector3&" + "name": "const Vector 3&" } } ] @@ -171,23 +144,16 @@ "context": "IBlendShapeData", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetUsedPointIndexForControlPoint" + "tooltip": "When signaled, this will invoke Get Used Point Index For Control Point" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetUsedPointIndexForControlPoint is invoked" + "tooltip": "Signaled after Get Used Point Index For Control Point is invoked" }, "details": { - "name": "IBlendShapeData::GetUsedPointIndexForControlPoint", - "category": "Other" + "name": "Get Used Point Index For Control Point" }, "params": [ - { - "typeid": "{55E7384D-9333-4C51-BC91-E90CAC2C30E2}", - "details": { - "name": "IBlendShapeData*" - } - }, { "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", "details": { @@ -209,24 +175,15 @@ "context": "IBlendShapeData", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetVertexCount" + "tooltip": "When signaled, this will invoke Get Vertex Count" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetVertexCount is invoked" + "tooltip": "Signaled after Get Vertex Count is invoked" }, "details": { - "name": "IBlendShapeData::GetVertexCount", - "category": "Other" + "name": "Get Vertex Count" }, - "params": [ - { - "typeid": "{55E7384D-9333-4C51-BC91-E90CAC2C30E2}", - "details": { - "name": "IBlendShapeData*" - } - } - ], "results": [ { "typeid": "{43DA906B-7DEF-4CA8-9790-854106D3F983}", @@ -241,24 +198,15 @@ "context": "IBlendShapeData", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetFaceCount" + "tooltip": "When signaled, this will invoke Get Face Count" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetFaceCount is invoked" + "tooltip": "Signaled after Get Face Count is invoked" }, "details": { - "name": "IBlendShapeData::GetFaceCount", - "category": "Other" + "name": "Get Face Count" }, - "params": [ - { - "typeid": "{55E7384D-9333-4C51-BC91-E90CAC2C30E2}", - "details": { - "name": "IBlendShapeData*" - } - } - ], "results": [ { "typeid": "{43DA906B-7DEF-4CA8-9790-854106D3F983}", @@ -273,23 +221,16 @@ "context": "IBlendShapeData", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetControlPointIndex" + "tooltip": "When signaled, this will invoke Get Control Point Index" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetControlPointIndex is invoked" + "tooltip": "Signaled after Get Control Point Index is invoked" }, "details": { - "name": "IBlendShapeData::GetControlPointIndex", - "category": "Other" + "name": "Get Control Point Index" }, "params": [ - { - "typeid": "{55E7384D-9333-4C51-BC91-E90CAC2C30E2}", - "details": { - "name": "IBlendShapeData*" - } - }, { "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", "details": { @@ -311,29 +252,20 @@ "context": "IBlendShapeData", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetUsedControlPointCount" + "tooltip": "When signaled, this will invoke Get Used Control Point Count" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetUsedControlPointCount is invoked" + "tooltip": "Signaled after Get Used Control Point Count is invoked" }, "details": { - "name": "IBlendShapeData::GetUsedControlPointCount", - "category": "Other" + "name": "Get Used Control Point Count" }, - "params": [ - { - "typeid": "{55E7384D-9333-4C51-BC91-E90CAC2C30E2}", - "details": { - "name": "IBlendShapeData*" - } - } - ], "results": [ { "typeid": "{D6597933-47CD-4FC8-B911-63F3E2B0993A}", "details": { - "name": "AZ::u64" + "name": "AZ::u 64" } } ] diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/IMeshData.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/IMeshData.names index 2ac54d8ab0..fa7950a47c 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/IMeshData.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/IMeshData.names @@ -5,7 +5,8 @@ "context": "BehaviorClass", "variant": "", "details": { - "name": "IMeshData" + "name": "IMesh Data", + "category": "Rendering" }, "methods": [ { @@ -13,24 +14,15 @@ "context": "IMeshData", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetUnitSizeInMeters" + "tooltip": "When signaled, this will invoke Get Unit Size In Meters" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetUnitSizeInMeters is invoked" + "tooltip": "Signaled after Get Unit Size In Meters is invoked" }, "details": { - "name": "IMeshData::GetUnitSizeInMeters", - "category": "Other" + "name": "Get Unit Size In Meters" }, - "params": [ - { - "typeid": "{B94A59C0-F3A5-40A0-B541-7E36B6576C4A}", - "details": { - "name": "IMeshData*" - } - } - ], "results": [ { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", @@ -45,24 +37,15 @@ "context": "IMeshData", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetOriginalUnitSizeInMeters" + "tooltip": "When signaled, this will invoke Get Original Unit Size In Meters" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetOriginalUnitSizeInMeters is invoked" + "tooltip": "Signaled after Get Original Unit Size In Meters is invoked" }, "details": { - "name": "IMeshData::GetOriginalUnitSizeInMeters", - "category": "Other" + "name": "Get Original Unit Size In Meters" }, - "params": [ - { - "typeid": "{B94A59C0-F3A5-40A0-B541-7E36B6576C4A}", - "details": { - "name": "IMeshData*" - } - } - ], "results": [ { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/LmbrCentral__QuadShapeConfig.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/LmbrCentral__QuadShapeConfig.names new file mode 100644 index 0000000000..1289b55ba3 --- /dev/null +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/LmbrCentral__QuadShapeConfig.names @@ -0,0 +1,103 @@ +{ + "entries": [ + { + "base": "LmbrCentral::QuadShapeConfig", + "context": "BehaviorClass", + "variant": "", + "details": { + "name": "Quad Shape Config", + "category": "Rendering/Shapes" + }, + "methods": [ + { + "base": "GetWidth", + "details": { + "name": "Get Width" + }, + "params": [ + { + "typeid": "{35CA7415-DB12-4630-B0D0-4A140CE1B9A7}", + "details": { + "name": "Configuration", + "tooltip": "Quad shape configuration parameters" + } + } + ], + "results": [ + { + "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", + "details": { + "name": "float" + } + } + ] + }, + { + "base": "SetWidth", + "details": { + "name": "Set Width" + }, + "params": [ + { + "typeid": "{35CA7415-DB12-4630-B0D0-4A140CE1B9A7}", + "details": { + "name": "Configuration", + "tooltip": "Quad shape configuration parameters" + } + }, + { + "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", + "details": { + "name": "float" + } + } + ] + }, + { + "base": "GetHeight", + "details": { + "name": "Get Height" + }, + "params": [ + { + "typeid": "{35CA7415-DB12-4630-B0D0-4A140CE1B9A7}", + "details": { + "name": "Configuration", + "tooltip": "Quad shape configuration parameters" + } + } + ], + "results": [ + { + "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", + "details": { + "name": "float" + } + } + ] + }, + { + "base": "SetHeight", + "details": { + "name": "Set Height" + }, + "params": [ + { + "typeid": "{35CA7415-DB12-4630-B0D0-4A140CE1B9A7}", + "details": { + "name": "Configuration", + "tooltip": "Quad shape configuration parameters" + } + }, + { + "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", + "details": { + "name": "float" + } + } + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MaterialData.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MaterialData.names index a3736cd467..c7e5b5814d 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": "MaterialData" + "name": "Material Data", + "category": "Rendering" }, "methods": [ { @@ -13,30 +14,20 @@ "context": "MaterialData", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetBaseColor" + "tooltip": "When signaled, this will invoke Get Base Color" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetBaseColor is invoked" + "tooltip": "Signaled after Get Base Color is invoked" }, "details": { - "name": "MaterialData::GetBaseColor", - "category": "Other" + "name": "Get Base Color" }, - "params": [ - { - "typeid": "{F2EE1768-183B-483E-9778-CB3D3D0DA68A}", - "details": { - "name": "const MaterialData&", - "tooltip": "Material configuration for the parent." - } - } - ], "results": [ { "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}", "details": { - "name": "Vector3" + "name": "Vector 3" } } ] @@ -46,25 +37,15 @@ "context": "MaterialData", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetUseRoughnessMap" + "tooltip": "When signaled, this will invoke Get Use Roughness Map" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetUseRoughnessMap is invoked" + "tooltip": "Signaled after Get Use Roughness Map is invoked" }, "details": { - "name": "MaterialData::GetUseRoughnessMap", - "category": "Other" + "name": "Get Use Roughness Map" }, - "params": [ - { - "typeid": "{F2EE1768-183B-483E-9778-CB3D3D0DA68A}", - "details": { - "name": "const MaterialData&", - "tooltip": "Material configuration for the parent." - } - } - ], "results": [ { "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", @@ -79,25 +60,15 @@ "context": "MaterialData", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetShininess" + "tooltip": "When signaled, this will invoke Get Shininess" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetShininess is invoked" + "tooltip": "Signaled after Get Shininess is invoked" }, "details": { - "name": "MaterialData::GetShininess", - "category": "Other" + "name": "Get Shininess" }, - "params": [ - { - "typeid": "{F2EE1768-183B-483E-9778-CB3D3D0DA68A}", - "details": { - "name": "MaterialData*", - "tooltip": "Material configuration for the parent." - } - } - ], "results": [ { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", @@ -112,25 +83,15 @@ "context": "MaterialData", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetUseEmissiveMap" + "tooltip": "When signaled, this will invoke Get Use Emissive Map" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetUseEmissiveMap is invoked" + "tooltip": "Signaled after Get Use Emissive Map is invoked" }, "details": { - "name": "MaterialData::GetUseEmissiveMap", - "category": "Other" + "name": "Get Use Emissive Map" }, - "params": [ - { - "typeid": "{F2EE1768-183B-483E-9778-CB3D3D0DA68A}", - "details": { - "name": "const MaterialData&", - "tooltip": "Material configuration for the parent." - } - } - ], "results": [ { "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", @@ -145,30 +106,20 @@ "context": "MaterialData", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetEmissiveColor" + "tooltip": "When signaled, this will invoke Get Emissive Color" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetEmissiveColor is invoked" + "tooltip": "Signaled after Get Emissive Color is invoked" }, "details": { - "name": "MaterialData::GetEmissiveColor", - "category": "Other" + "name": "Get Emissive Color" }, - "params": [ - { - "typeid": "{F2EE1768-183B-483E-9778-CB3D3D0DA68A}", - "details": { - "name": "MaterialData*", - "tooltip": "Material configuration for the parent." - } - } - ], "results": [ { "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}", "details": { - "name": "const Vector3&" + "name": "const Vector 3&" } } ] @@ -178,30 +129,20 @@ "context": "MaterialData", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetSpecularColor" + "tooltip": "When signaled, this will invoke Get Specular Color" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetSpecularColor is invoked" + "tooltip": "Signaled after Get Specular Color is invoked" }, "details": { - "name": "MaterialData::GetSpecularColor", - "category": "Other" + "name": "Get Specular Color" }, - "params": [ - { - "typeid": "{F2EE1768-183B-483E-9778-CB3D3D0DA68A}", - "details": { - "name": "MaterialData*", - "tooltip": "Material configuration for the parent." - } - } - ], "results": [ { "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}", "details": { - "name": "const Vector3&" + "name": "const Vector 3&" } } ] @@ -211,30 +152,20 @@ "context": "MaterialData", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetUniqueId" + "tooltip": "When signaled, this will invoke Get Unique Id" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetUniqueId is invoked" + "tooltip": "Signaled after Get Unique Id is invoked" }, "details": { - "name": "MaterialData::GetUniqueId", - "category": "Other" + "name": "Get Unique Id" }, - "params": [ - { - "typeid": "{F2EE1768-183B-483E-9778-CB3D3D0DA68A}", - "details": { - "name": "MaterialData*", - "tooltip": "Material configuration for the parent." - } - } - ], "results": [ { "typeid": "{D6597933-47CD-4FC8-B911-63F3E2B0993A}", "details": { - "name": "AZ::u64" + "name": "AZ::u 64" } } ] @@ -244,30 +175,20 @@ "context": "MaterialData", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetDiffuseColor" + "tooltip": "When signaled, this will invoke Get Diffuse Color" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetDiffuseColor is invoked" + "tooltip": "Signaled after Get Diffuse Color is invoked" }, "details": { - "name": "MaterialData::GetDiffuseColor", - "category": "Other" + "name": "Get Diffuse Color" }, - "params": [ - { - "typeid": "{F2EE1768-183B-483E-9778-CB3D3D0DA68A}", - "details": { - "name": "MaterialData*", - "tooltip": "Material configuration for the parent." - } - } - ], "results": [ { "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}", "details": { - "name": "const Vector3&" + "name": "const Vector 3&" } } ] @@ -277,25 +198,15 @@ "context": "MaterialData", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetEmissiveIntensity" + "tooltip": "When signaled, this will invoke Get Emissive Intensity" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetEmissiveIntensity is invoked" + "tooltip": "Signaled after Get Emissive Intensity is invoked" }, "details": { - "name": "MaterialData::GetEmissiveIntensity", - "category": "Other" + "name": "Get Emissive Intensity" }, - "params": [ - { - "typeid": "{F2EE1768-183B-483E-9778-CB3D3D0DA68A}", - "details": { - "name": "const MaterialData&", - "tooltip": "Material configuration for the parent." - } - } - ], "results": [ { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", @@ -310,30 +221,20 @@ "context": "MaterialData", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetMaterialName" + "tooltip": "When signaled, this will invoke Get Material Name" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetMaterialName is invoked" + "tooltip": "Signaled after Get Material Name is invoked" }, "details": { - "name": "MaterialData::GetMaterialName", - "category": "Other" + "name": "Get Material Name" }, - "params": [ - { - "typeid": "{F2EE1768-183B-483E-9778-CB3D3D0DA68A}", - "details": { - "name": "MaterialData*", - "tooltip": "Material configuration for the parent." - } - } - ], "results": [ { "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", "details": { - "name": "const AZStd::basic_string, alloc" + "name": "const AZ Std::basic_string, alloc" } } ] @@ -343,25 +244,15 @@ "context": "MaterialData", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetUseMetallicMap" + "tooltip": "When signaled, this will invoke Get Use Metallic Map" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetUseMetallicMap is invoked" + "tooltip": "Signaled after Get Use Metallic Map is invoked" }, "details": { - "name": "MaterialData::GetUseMetallicMap", - "category": "Other" + "name": "Get Use Metallic Map" }, - "params": [ - { - "typeid": "{F2EE1768-183B-483E-9778-CB3D3D0DA68A}", - "details": { - "name": "const MaterialData&", - "tooltip": "Material configuration for the parent." - } - } - ], "results": [ { "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", @@ -376,25 +267,15 @@ "context": "MaterialData", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetMetallicFactor" + "tooltip": "When signaled, this will invoke Get Metallic Factor" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetMetallicFactor is invoked" + "tooltip": "Signaled after Get Metallic Factor is invoked" }, "details": { - "name": "MaterialData::GetMetallicFactor", - "category": "Other" + "name": "Get Metallic Factor" }, - "params": [ - { - "typeid": "{F2EE1768-183B-483E-9778-CB3D3D0DA68A}", - "details": { - "name": "const MaterialData&", - "tooltip": "Material configuration for the parent." - } - } - ], "results": [ { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", @@ -409,25 +290,15 @@ "context": "MaterialData", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetRoughnessFactor" + "tooltip": "When signaled, this will invoke Get Roughness Factor" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetRoughnessFactor is invoked" + "tooltip": "Signaled after Get Roughness Factor is invoked" }, "details": { - "name": "MaterialData::GetRoughnessFactor", - "category": "Other" + "name": "Get Roughness Factor" }, - "params": [ - { - "typeid": "{F2EE1768-183B-483E-9778-CB3D3D0DA68A}", - "details": { - "name": "const MaterialData&", - "tooltip": "Material configuration for the parent." - } - } - ], "results": [ { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", @@ -442,25 +313,15 @@ "context": "MaterialData", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetUseAOMap" + "tooltip": "When signaled, this will invoke Get UseAO Map" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetUseAOMap is invoked" + "tooltip": "Signaled after Get UseAO Map is invoked" }, "details": { - "name": "MaterialData::GetUseAOMap", - "category": "Other" + "name": "Get UseAO Map" }, - "params": [ - { - "typeid": "{F2EE1768-183B-483E-9778-CB3D3D0DA68A}", - "details": { - "name": "const MaterialData&", - "tooltip": "Material configuration for the parent." - } - } - ], "results": [ { "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", @@ -475,24 +336,16 @@ "context": "MaterialData", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetTexture" + "tooltip": "When signaled, this will invoke Get Texture" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetTexture is invoked" + "tooltip": "Signaled after Get Texture is invoked" }, "details": { - "name": "MaterialData::GetTexture", - "category": "Other" + "name": "Get Texture" }, "params": [ - { - "typeid": "{F2EE1768-183B-483E-9778-CB3D3D0DA68A}", - "details": { - "name": "MaterialData*", - "tooltip": "Material configuration for the parent." - } - }, { "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", "details": { @@ -504,7 +357,7 @@ { "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", "details": { - "name": "const AZStd::basic_string, alloc" + "name": "const AZ Std::basic_string, alloc" } } ] @@ -514,25 +367,15 @@ "context": "MaterialData", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke IsNoDraw" + "tooltip": "When signaled, this will invoke Is No Draw" }, "exit": { "name": "Out", - "tooltip": "Signaled after IsNoDraw is invoked" + "tooltip": "Signaled after Is No Draw is invoked" }, "details": { - "name": "MaterialData::IsNoDraw", - "category": "Other" + "name": "Is No Draw" }, - "params": [ - { - "typeid": "{F2EE1768-183B-483E-9778-CB3D3D0DA68A}", - "details": { - "name": "MaterialData*", - "tooltip": "Material configuration for the parent." - } - } - ], "results": [ { "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", @@ -547,25 +390,15 @@ "context": "MaterialData", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetOpacity" + "tooltip": "When signaled, this will invoke Get Opacity" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetOpacity is invoked" + "tooltip": "Signaled after Get Opacity is invoked" }, "details": { - "name": "MaterialData::GetOpacity", - "category": "Other" + "name": "Get Opacity" }, - "params": [ - { - "typeid": "{F2EE1768-183B-483E-9778-CB3D3D0DA68A}", - "details": { - "name": "MaterialData*", - "tooltip": "Material configuration for the parent." - } - } - ], "results": [ { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", @@ -580,25 +413,15 @@ "context": "MaterialData", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetUseColorMap" + "tooltip": "When signaled, this will invoke Get Use Color Map" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetUseColorMap is invoked" + "tooltip": "Signaled after Get Use Color Map is invoked" }, "details": { - "name": "MaterialData::GetUseColorMap", - "category": "Other" + "name": "Get Use Color Map" }, - "params": [ - { - "typeid": "{F2EE1768-183B-483E-9778-CB3D3D0DA68A}", - "details": { - "name": "const MaterialData&", - "tooltip": "Material configuration for the parent." - } - } - ], "results": [ { "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", @@ -607,6 +430,132 @@ } } ] + }, + { + "base": "GetNormal", + "details": { + "name": "Get Normal" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + }, + { + "base": "GetDiffuse", + "details": { + "name": "Get Diffuse" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + }, + { + "base": "GetSpecular", + "details": { + "name": "Get Specular" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + }, + { + "base": "GetBump", + "details": { + "name": "Get Bump" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + }, + { + "base": "GetEmissive", + "details": { + "name": "Get Emissive" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + }, + { + "base": "GetRoughness", + "details": { + "name": "Get Roughness" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + }, + { + "base": "GetBaseColor", + "details": { + "name": "Get Base Color" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + }, + { + "base": "GetAmbientOcclusion", + "details": { + "name": "Get Ambient Occlusion" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + }, + { + "base": "GetMetallic", + "details": { + "name": "Get Metallic" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] } ] } diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MeshData.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MeshData.names index 6e82906a0f..cb88951159 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MeshData.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MeshData.names @@ -5,7 +5,8 @@ "context": "BehaviorClass", "variant": "", "details": { - "name": "MeshData" + "name": "Mesh Data", + "category": "Rendering" }, "methods": [ { @@ -13,23 +14,16 @@ "context": "MeshData", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetVertexIndex" + "tooltip": "When signaled, this will invoke Get Vertex Index" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetVertexIndex is invoked" + "tooltip": "Signaled after Get Vertex Index is invoked" }, "details": { - "name": "MeshData::GetVertexIndex", - "category": "Other" + "name": "Get Vertex Index" }, "params": [ - { - "typeid": "{A2589BD4-42FB-40BA-A38D-CFCD6E9EA169}", - "details": { - "name": "MeshData*" - } - }, { "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", "details": { @@ -57,23 +51,16 @@ "context": "MeshData", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetPosition" + "tooltip": "When signaled, this will invoke Get Position" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetPosition is invoked" + "tooltip": "Signaled after Get Position is invoked" }, "details": { - "name": "MeshData::GetPosition", - "category": "Other" + "name": "Get Position" }, "params": [ - { - "typeid": "{A2589BD4-42FB-40BA-A38D-CFCD6E9EA169}", - "details": { - "name": "MeshData*" - } - }, { "typeid": "{43DA906B-7DEF-4CA8-9790-854106D3F983}", "details": { @@ -85,7 +72,7 @@ { "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}", "details": { - "name": "const Vector3&" + "name": "const Vector 3&" } } ] @@ -95,23 +82,16 @@ "context": "MeshData", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetFaceInfo" + "tooltip": "When signaled, this will invoke Get Face Info" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetFaceInfo is invoked" + "tooltip": "Signaled after Get Face Info is invoked" }, "details": { - "name": "MeshData::GetFaceInfo", - "category": "Other" + "name": "Get Face Info" }, "params": [ - { - "typeid": "{A2589BD4-42FB-40BA-A38D-CFCD6E9EA169}", - "details": { - "name": "MeshData*" - } - }, { "typeid": "{43DA906B-7DEF-4CA8-9790-854106D3F983}", "details": { @@ -123,7 +103,7 @@ { "typeid": "{F9F49C1A-014F-46F5-A46F-B56D8CB46C2B}", "details": { - "name": "const AZ::SceneAPI::DataTypes::IMeshData::Face&" + "name": "const AZ:: SceneAPI:: Data Types::I Mesh Data:: Face&" } } ] @@ -133,24 +113,15 @@ "context": "MeshData", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke HasNormalData" + "tooltip": "When signaled, this will invoke Has Normal Data" }, "exit": { "name": "Out", - "tooltip": "Signaled after HasNormalData is invoked" + "tooltip": "Signaled after Has Normal Data is invoked" }, "details": { - "name": "MeshData::HasNormalData", - "category": "Other" + "name": "Has Normal Data" }, - "params": [ - { - "typeid": "{A2589BD4-42FB-40BA-A38D-CFCD6E9EA169}", - "details": { - "name": "MeshData*" - } - } - ], "results": [ { "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", @@ -165,23 +136,16 @@ "context": "MeshData", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetNormal" + "tooltip": "When signaled, this will invoke Get Normal" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetNormal is invoked" + "tooltip": "Signaled after Get Normal is invoked" }, "details": { - "name": "MeshData::GetNormal", - "category": "Other" + "name": "Get Normal" }, "params": [ - { - "typeid": "{A2589BD4-42FB-40BA-A38D-CFCD6E9EA169}", - "details": { - "name": "MeshData*" - } - }, { "typeid": "{43DA906B-7DEF-4CA8-9790-854106D3F983}", "details": { @@ -193,7 +157,7 @@ { "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}", "details": { - "name": "const Vector3&" + "name": "const Vector 3&" } } ] @@ -203,23 +167,16 @@ "context": "MeshData", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetUsedPointIndexForControlPoint" + "tooltip": "When signaled, this will invoke Get Used Point Index For Control Point" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetUsedPointIndexForControlPoint is invoked" + "tooltip": "Signaled after Get Used Point Index For Control Point is invoked" }, "details": { - "name": "MeshData::GetUsedPointIndexForControlPoint", - "category": "Other" + "name": "Get Used Point Index For Control Point" }, "params": [ - { - "typeid": "{A2589BD4-42FB-40BA-A38D-CFCD6E9EA169}", - "details": { - "name": "MeshData*" - } - }, { "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", "details": { @@ -241,24 +198,15 @@ "context": "MeshData", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetVertexCount" + "tooltip": "When signaled, this will invoke Get Vertex Count" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetVertexCount is invoked" + "tooltip": "Signaled after Get Vertex Count is invoked" }, "details": { - "name": "MeshData::GetVertexCount", - "category": "Other" + "name": "Get Vertex Count" }, - "params": [ - { - "typeid": "{A2589BD4-42FB-40BA-A38D-CFCD6E9EA169}", - "details": { - "name": "MeshData*" - } - } - ], "results": [ { "typeid": "{43DA906B-7DEF-4CA8-9790-854106D3F983}", @@ -273,24 +221,15 @@ "context": "MeshData", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetFaceCount" + "tooltip": "When signaled, this will invoke Get Face Count" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetFaceCount is invoked" + "tooltip": "Signaled after Get Face Count is invoked" }, "details": { - "name": "MeshData::GetFaceCount", - "category": "Other" + "name": "Get Face Count" }, - "params": [ - { - "typeid": "{A2589BD4-42FB-40BA-A38D-CFCD6E9EA169}", - "details": { - "name": "MeshData*" - } - } - ], "results": [ { "typeid": "{43DA906B-7DEF-4CA8-9790-854106D3F983}", @@ -305,29 +244,20 @@ "context": "MeshData", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetUsedControlPointCount" + "tooltip": "When signaled, this will invoke Get Used Control Point Count" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetUsedControlPointCount is invoked" + "tooltip": "Signaled after Get Used Control Point Count is invoked" }, "details": { - "name": "MeshData::GetUsedControlPointCount", - "category": "Other" + "name": "Get Used Control Point Count" }, - "params": [ - { - "typeid": "{A2589BD4-42FB-40BA-A38D-CFCD6E9EA169}", - "details": { - "name": "MeshData*" - } - } - ], "results": [ { "typeid": "{D6597933-47CD-4FC8-B911-63F3E2B0993A}", "details": { - "name": "AZ::u64" + "name": "AZ::u 64" } } ] @@ -337,23 +267,16 @@ "context": "MeshData", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetFaceMaterialId" + "tooltip": "When signaled, this will invoke Get Face Material Id" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetFaceMaterialId is invoked" + "tooltip": "Signaled after Get Face Material Id is invoked" }, "details": { - "name": "MeshData::GetFaceMaterialId", - "category": "Other" + "name": "Get Face Material Id" }, "params": [ - { - "typeid": "{A2589BD4-42FB-40BA-A38D-CFCD6E9EA169}", - "details": { - "name": "MeshData*" - } - }, { "typeid": "{43DA906B-7DEF-4CA8-9790-854106D3F983}", "details": { @@ -375,23 +298,16 @@ "context": "MeshData", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetControlPointIndex" + "tooltip": "When signaled, this will invoke Get Control Point Index" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetControlPointIndex is invoked" + "tooltip": "Signaled after Get Control Point Index is invoked" }, "details": { - "name": "MeshData::GetControlPointIndex", - "category": "Other" + "name": "Get Control Point Index" }, "params": [ - { - "typeid": "{A2589BD4-42FB-40BA-A38D-CFCD6E9EA169}", - "details": { - "name": "MeshData*" - } - }, { "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", "details": { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MeshVertexBitangentData.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MeshVertexBitangentData.names index 71a6080574..94bb07c7bd 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MeshVertexBitangentData.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MeshVertexBitangentData.names @@ -5,7 +5,8 @@ "context": "BehaviorClass", "variant": "", "details": { - "name": "MeshVertexBitangentData" + "name": "Mesh Vertex Bitangent Data", + "category": "Rendering" }, "methods": [ { @@ -13,29 +14,20 @@ "context": "MeshVertexBitangentData", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetCount" + "tooltip": "When signaled, this will invoke Get Count" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetCount is invoked" + "tooltip": "Signaled after Get Count is invoked" }, "details": { - "name": "MeshVertexBitangentData::GetCount", - "category": "Other" + "name": "Get Count" }, - "params": [ - { - "typeid": "{F56FB088-4C92-4453-AFE9-4E820F03FA90}", - "details": { - "name": "MeshVertexBitangentData*" - } - } - ], "results": [ { "typeid": "{D6597933-47CD-4FC8-B911-63F3E2B0993A}", "details": { - "name": "AZ::u64" + "name": "AZ::u 64" } } ] @@ -45,27 +37,20 @@ "context": "MeshVertexBitangentData", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetBitangent" + "tooltip": "When signaled, this will invoke Get Bitangent" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetBitangent is invoked" + "tooltip": "Signaled after Get Bitangent is invoked" }, "details": { - "name": "MeshVertexBitangentData::GetBitangent", - "category": "Other" + "name": "Get Bitangent" }, "params": [ - { - "typeid": "{F56FB088-4C92-4453-AFE9-4E820F03FA90}", - "details": { - "name": "MeshVertexBitangentData*" - } - }, { "typeid": "{D6597933-47CD-4FC8-B911-63F3E2B0993A}", "details": { - "name": "AZ::u64" + "name": "AZ::u 64" } } ], @@ -73,7 +58,7 @@ { "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}", "details": { - "name": "const Vector3&" + "name": "const Vector 3&" } } ] @@ -83,29 +68,20 @@ "context": "MeshVertexBitangentData", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetBitangentSetIndex" + "tooltip": "When signaled, this will invoke Get Bitangent Set Index" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetBitangentSetIndex is invoked" + "tooltip": "Signaled after Get Bitangent Set Index is invoked" }, "details": { - "name": "MeshVertexBitangentData::GetBitangentSetIndex", - "category": "Other" + "name": "Get Bitangent Set Index" }, - "params": [ - { - "typeid": "{F56FB088-4C92-4453-AFE9-4E820F03FA90}", - "details": { - "name": "MeshVertexBitangentData*" - } - } - ], "results": [ { "typeid": "{D6597933-47CD-4FC8-B911-63F3E2B0993A}", "details": { - "name": "AZ::u64" + "name": "AZ::u 64" } } ] @@ -115,24 +91,43 @@ "context": "MeshVertexBitangentData", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetGenerationMethod" + "tooltip": "When signaled, this will invoke Get Generation Method" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetGenerationMethod is invoked" + "tooltip": "Signaled after Get Generation Method is invoked" }, "details": { - "name": "MeshVertexBitangentData::GetGenerationMethod", - "category": "Other" + "name": "Get Generation Method" }, - "params": [ + "results": [ { - "typeid": "{F56FB088-4C92-4453-AFE9-4E820F03FA90}", + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", "details": { - "name": "MeshVertexBitangentData*" + "name": "int" } } - ], + ] + }, + { + "base": "GetFromSourceScene", + "details": { + "name": "Get From Source Scene" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + }, + { + "base": "GetMikkT", + "details": { + "name": "Get MikkT" + }, "results": [ { "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MeshVertexColorData.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MeshVertexColorData.names index a0a7c099c8..ef3d2d6966 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MeshVertexColorData.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MeshVertexColorData.names @@ -5,7 +5,8 @@ "context": "BehaviorClass", "variant": "", "details": { - "name": "MeshVertexColorData" + "name": "Mesh Vertex Color Data", + "category": "Rendering" }, "methods": [ { @@ -13,24 +14,15 @@ "context": "MeshVertexColorData", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetCustomName" + "tooltip": "When signaled, this will invoke Get Custom Name" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetCustomName is invoked" + "tooltip": "Signaled after Get Custom Name is invoked" }, "details": { - "name": "MeshVertexColorData::GetCustomName", - "category": "Other" + "name": "Get Custom Name" }, - "params": [ - { - "typeid": "{17477B86-B163-4574-8FB2-4916BC218B3D}", - "details": { - "name": "const MeshVertexColorData&" - } - } - ], "results": [ { "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", @@ -45,29 +37,20 @@ "context": "MeshVertexColorData", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetCount" + "tooltip": "When signaled, this will invoke Get Count" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetCount is invoked" + "tooltip": "Signaled after Get Count is invoked" }, "details": { - "name": "MeshVertexColorData::GetCount", - "category": "Other" + "name": "Get Count" }, - "params": [ - { - "typeid": "{17477B86-B163-4574-8FB2-4916BC218B3D}", - "details": { - "name": "MeshVertexColorData*" - } - } - ], "results": [ { "typeid": "{D6597933-47CD-4FC8-B911-63F3E2B0993A}", "details": { - "name": "AZ::u64" + "name": "AZ::u 64" } } ] @@ -77,27 +60,20 @@ "context": "MeshVertexColorData", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetColor" + "tooltip": "When signaled, this will invoke Get Color" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetColor is invoked" + "tooltip": "Signaled after Get Color is invoked" }, "details": { - "name": "MeshVertexColorData::GetColor", - "category": "Other" + "name": "Get Color" }, "params": [ - { - "typeid": "{17477B86-B163-4574-8FB2-4916BC218B3D}", - "details": { - "name": "MeshVertexColorData*" - } - }, { "typeid": "{D6597933-47CD-4FC8-B911-63F3E2B0993A}", "details": { - "name": "AZ::u64" + "name": "AZ::u 64" } } ], @@ -105,7 +81,7 @@ { "typeid": "{937E3BF8-5204-4D40-A8DA-C8F083C89F9F}", "details": { - "name": "const SceneAPI::DataTypes::Color&" + "name": "const SceneAPI:: Data Types:: Color&" } } ] diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MeshVertexTangentData.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MeshVertexTangentData.names index 6e67408931..c31e00a38e 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MeshVertexTangentData.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MeshVertexTangentData.names @@ -5,7 +5,8 @@ "context": "BehaviorClass", "variant": "", "details": { - "name": "MeshVertexTangentData" + "name": "Mesh Vertex Tangent Data", + "category": "Rendering" }, "methods": [ { @@ -13,29 +14,20 @@ "context": "MeshVertexTangentData", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetCount" + "tooltip": "When signaled, this will invoke Get Count" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetCount is invoked" + "tooltip": "Signaled after Get Count is invoked" }, "details": { - "name": "MeshVertexTangentData::GetCount", - "category": "Other" + "name": "Get Count" }, - "params": [ - { - "typeid": "{C16F0F38-8F8F-45A2-A33B-F2758922A7C4}", - "details": { - "name": "MeshVertexTangentData*" - } - } - ], "results": [ { "typeid": "{D6597933-47CD-4FC8-B911-63F3E2B0993A}", "details": { - "name": "AZ::u64" + "name": "AZ::u 64" } } ] @@ -45,27 +37,20 @@ "context": "MeshVertexTangentData", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetTangent" + "tooltip": "When signaled, this will invoke Get Tangent" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetTangent is invoked" + "tooltip": "Signaled after Get Tangent is invoked" }, "details": { - "name": "MeshVertexTangentData::GetTangent", - "category": "Other" + "name": "Get Tangent" }, "params": [ - { - "typeid": "{C16F0F38-8F8F-45A2-A33B-F2758922A7C4}", - "details": { - "name": "MeshVertexTangentData*" - } - }, { "typeid": "{D6597933-47CD-4FC8-B911-63F3E2B0993A}", "details": { - "name": "AZ::u64" + "name": "AZ::u 64" } } ], @@ -73,7 +58,7 @@ { "typeid": "{0CE9FA36-1E3A-4C06-9254-B7C73A732053}", "details": { - "name": "const Vector4&" + "name": "const Vector 4&" } } ] @@ -83,29 +68,20 @@ "context": "MeshVertexTangentData", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetTangentSetIndex" + "tooltip": "When signaled, this will invoke Get Tangent Set Index" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetTangentSetIndex is invoked" + "tooltip": "Signaled after Get Tangent Set Index is invoked" }, "details": { - "name": "MeshVertexTangentData::GetTangentSetIndex", - "category": "Other" + "name": "Get Tangent Set Index" }, - "params": [ - { - "typeid": "{C16F0F38-8F8F-45A2-A33B-F2758922A7C4}", - "details": { - "name": "MeshVertexTangentData*" - } - } - ], "results": [ { "typeid": "{D6597933-47CD-4FC8-B911-63F3E2B0993A}", "details": { - "name": "AZ::u64" + "name": "AZ::u 64" } } ] @@ -115,24 +91,43 @@ "context": "MeshVertexTangentData", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetGenerationMethod" + "tooltip": "When signaled, this will invoke Get Generation Method" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetGenerationMethod is invoked" + "tooltip": "Signaled after Get Generation Method is invoked" }, "details": { - "name": "MeshVertexTangentData::GetGenerationMethod", - "category": "Other" + "name": "Get Generation Method" }, - "params": [ + "results": [ { - "typeid": "{C16F0F38-8F8F-45A2-A33B-F2758922A7C4}", + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", "details": { - "name": "MeshVertexTangentData*" + "name": "int" } } - ], + ] + }, + { + "base": "GetFromSourceScene", + "details": { + "name": "Get From Source Scene" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + }, + { + "base": "GetMikkT", + "details": { + "name": "Get MikkT" + }, "results": [ { "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MeshVertexUVData.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MeshVertexUVData.names index 78372ea7ae..b9b2c3252b 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MeshVertexUVData.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MeshVertexUVData.names @@ -5,7 +5,8 @@ "context": "BehaviorClass", "variant": "", "details": { - "name": "MeshVertexUVData" + "name": "Mesh VertexUV Data", + "category": "Rendering" }, "methods": [ { @@ -13,24 +14,15 @@ "context": "MeshVertexUVData", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetCustomName" + "tooltip": "When signaled, this will invoke Get Custom Name" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetCustomName is invoked" + "tooltip": "Signaled after Get Custom Name is invoked" }, "details": { - "name": "MeshVertexUVData::GetCustomName", - "category": "Other" + "name": "Get Custom Name" }, - "params": [ - { - "typeid": "{B435C091-482C-4EB9-B1F4-FA5B480796DA}", - "details": { - "name": "const MeshVertexUVData&" - } - } - ], "results": [ { "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", @@ -45,29 +37,20 @@ "context": "MeshVertexUVData", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetCount" + "tooltip": "When signaled, this will invoke Get Count" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetCount is invoked" + "tooltip": "Signaled after Get Count is invoked" }, "details": { - "name": "MeshVertexUVData::GetCount", - "category": "Other" + "name": "Get Count" }, - "params": [ - { - "typeid": "{B435C091-482C-4EB9-B1F4-FA5B480796DA}", - "details": { - "name": "MeshVertexUVData*" - } - } - ], "results": [ { "typeid": "{D6597933-47CD-4FC8-B911-63F3E2B0993A}", "details": { - "name": "AZ::u64" + "name": "AZ::u 64" } } ] @@ -84,20 +67,13 @@ "tooltip": "Signaled after GetUV is invoked" }, "details": { - "name": "MeshVertexUVData::GetUV", - "category": "Other" + "name": "GetUV" }, "params": [ - { - "typeid": "{B435C091-482C-4EB9-B1F4-FA5B480796DA}", - "details": { - "name": "MeshVertexUVData*" - } - }, { "typeid": "{D6597933-47CD-4FC8-B911-63F3E2B0993A}", "details": { - "name": "AZ::u64" + "name": "AZ::u 64" } } ], @@ -105,7 +81,7 @@ { "typeid": "{3D80F623-C85C-4741-90D0-E4E66164E6BF}", "details": { - "name": "const Vector2&" + "name": "const Vector 2&" } } ] diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MotionEvent.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MotionEvent.names index 320f4e128f..2251df87a6 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MotionEvent.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MotionEvent.names @@ -5,8 +5,349 @@ "context": "BehaviorClass", "variant": "", "details": { - "name": "MotionEvent" - } + "name": "Motion Event", + "category": "Animation" + }, + "methods": [ + { + "base": "GetlocalWeight", + "details": { + "name": "Getlocal Weight" + }, + "params": [ + { + "typeid": "{0C899DAC-6B19-4BDD-AD8C-8A11EF2A6729}", + "details": { + "name": "Motion Event" + } + } + ], + "results": [ + { + "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", + "details": { + "name": "float" + } + } + ] + }, + { + "base": "SetlocalWeight", + "details": { + "name": "Setlocal Weight" + }, + "params": [ + { + "typeid": "{0C899DAC-6B19-4BDD-AD8C-8A11EF2A6729}", + "details": { + "name": "Motion Event" + } + }, + { + "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", + "details": { + "name": "float" + } + } + ] + }, + { + "base": "GetglobalWeight", + "details": { + "name": "Getglobal Weight" + }, + "params": [ + { + "typeid": "{0C899DAC-6B19-4BDD-AD8C-8A11EF2A6729}", + "details": { + "name": "Motion Event" + } + } + ], + "results": [ + { + "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", + "details": { + "name": "float" + } + } + ] + }, + { + "base": "SetglobalWeight", + "details": { + "name": "Setglobal Weight" + }, + "params": [ + { + "typeid": "{0C899DAC-6B19-4BDD-AD8C-8A11EF2A6729}", + "details": { + "name": "Motion Event" + } + }, + { + "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", + "details": { + "name": "float" + } + } + ] + }, + { + "base": "Gettime", + "details": { + "name": "Gettime" + }, + "params": [ + { + "typeid": "{0C899DAC-6B19-4BDD-AD8C-8A11EF2A6729}", + "details": { + "name": "Motion Event" + } + } + ], + "results": [ + { + "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", + "details": { + "name": "float" + } + } + ] + }, + { + "base": "Settime", + "details": { + "name": "Settime" + }, + "params": [ + { + "typeid": "{0C899DAC-6B19-4BDD-AD8C-8A11EF2A6729}", + "details": { + "name": "Motion Event" + } + }, + { + "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", + "details": { + "name": "float" + } + } + ] + }, + { + "base": "GeteventType", + "details": { + "name": "Getevent Type" + }, + "params": [ + { + "typeid": "{0C899DAC-6B19-4BDD-AD8C-8A11EF2A6729}", + "details": { + "name": "Motion Event" + } + } + ], + "results": [ + { + "typeid": "{43DA906B-7DEF-4CA8-9790-854106D3F983}", + "details": { + "name": "unsigned int" + } + } + ] + }, + { + "base": "SeteventType", + "details": { + "name": "Setevent Type" + }, + "params": [ + { + "typeid": "{0C899DAC-6B19-4BDD-AD8C-8A11EF2A6729}", + "details": { + "name": "Motion Event" + } + }, + { + "typeid": "{43DA906B-7DEF-4CA8-9790-854106D3F983}", + "details": { + "name": "unsigned int" + } + } + ] + }, + { + "base": "GeteventTypeName", + "details": { + "name": "Getevent Type Name" + }, + "params": [ + { + "typeid": "{0C899DAC-6B19-4BDD-AD8C-8A11EF2A6729}", + "details": { + "name": "Motion Event" + } + } + ], + "results": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + } + ] + }, + { + "base": "SeteventTypeName", + "details": { + "name": "Setevent Type Name" + }, + "params": [ + { + "typeid": "{0C899DAC-6B19-4BDD-AD8C-8A11EF2A6729}", + "details": { + "name": "Motion Event" + } + }, + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + } + ] + }, + { + "base": "GetisEventStart", + "details": { + "name": "Getis Event Start" + }, + "params": [ + { + "typeid": "{0C899DAC-6B19-4BDD-AD8C-8A11EF2A6729}", + "details": { + "name": "Motion Event" + } + } + ], + "results": [ + { + "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", + "details": { + "name": "bool" + } + } + ] + }, + { + "base": "SetisEventStart", + "details": { + "name": "Setis Event Start" + }, + "params": [ + { + "typeid": "{0C899DAC-6B19-4BDD-AD8C-8A11EF2A6729}", + "details": { + "name": "Motion Event" + } + }, + { + "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", + "details": { + "name": "bool" + } + } + ] + }, + { + "base": "Getparameter", + "details": { + "name": "Getparameter" + }, + "params": [ + { + "typeid": "{0C899DAC-6B19-4BDD-AD8C-8A11EF2A6729}", + "details": { + "name": "Motion Event" + } + } + ], + "results": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + } + ] + }, + { + "base": "Setparameter", + "details": { + "name": "Setparameter" + }, + "params": [ + { + "typeid": "{0C899DAC-6B19-4BDD-AD8C-8A11EF2A6729}", + "details": { + "name": "Motion Event" + } + }, + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + } + ] + }, + { + "base": "GetentityId", + "details": { + "name": "Getentity Id" + }, + "params": [ + { + "typeid": "{0C899DAC-6B19-4BDD-AD8C-8A11EF2A6729}", + "details": { + "name": "Motion Event" + } + } + ], + "results": [ + { + "typeid": "{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}", + "details": { + "name": "Entity Id", + "tooltip": "Entity Unique Id" + } + } + ] + }, + { + "base": "SetentityId", + "details": { + "name": "Setentity Id" + }, + "params": [ + { + "typeid": "{0C899DAC-6B19-4BDD-AD8C-8A11EF2A6729}", + "details": { + "name": "Motion Event" + } + }, + { + "typeid": "{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}", + "details": { + "name": "Entity Id", + "tooltip": "Entity Unique Id" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/Name.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/Name.names index 746c94bf6a..a6625f39d1 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/Name.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/Name.names @@ -5,7 +5,8 @@ "context": "BehaviorClass", "variant": "", "details": { - "name": "Name" + "name": "Name", + "category": "Utilities" }, "methods": [ { @@ -13,24 +14,15 @@ "context": "Name", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke ToString" + "tooltip": "When signaled, this will invoke To String" }, "exit": { "name": "Out", - "tooltip": "Signaled after ToString is invoked" + "tooltip": "Signaled after To String is invoked" }, "details": { - "name": "Name::ToString", - "category": "Other" + "name": "To String" }, - "params": [ - { - "typeid": "{3D2B920C-9EFD-40D5-AAE0-DF131C3D4931}", - "details": { - "name": "Name*" - } - } - ], "results": [ { "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", @@ -52,20 +44,19 @@ "tooltip": "Signaled after Set is invoked" }, "details": { - "name": "Name::Set", - "category": "Other" + "name": "Set" }, "params": [ { "typeid": "{3D2B920C-9EFD-40D5-AAE0-DF131C3D4931}", "details": { - "name": "Name*" + "name": "Name" } }, { "typeid": "{7114E998-A8B4-519B-9342-A86D1587B4F7}", "details": { - "name": "AZStd::basic_string_view>" + "name": "" } } ] @@ -75,24 +66,15 @@ "context": "Name", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke IsEmpty" + "tooltip": "When signaled, this will invoke Is Empty" }, "exit": { "name": "Out", - "tooltip": "Signaled after IsEmpty is invoked" + "tooltip": "Signaled after Is Empty is invoked" }, "details": { - "name": "Name::IsEmpty", - "category": "Other" + "name": "Is Empty" }, - "params": [ - { - "typeid": "{3D2B920C-9EFD-40D5-AAE0-DF131C3D4931}", - "details": { - "name": "Name*" - } - } - ], "results": [ { "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", @@ -114,20 +96,13 @@ "tooltip": "Signaled after Equal is invoked" }, "details": { - "name": "Name::Equal", - "category": "Other" + "name": "Equal" }, "params": [ { "typeid": "{3D2B920C-9EFD-40D5-AAE0-DF131C3D4931}", "details": { - "name": "Name*" - } - }, - { - "typeid": "{3D2B920C-9EFD-40D5-AAE0-DF131C3D4931}", - "details": { - "name": "const Name&" + "name": "Name" } } ], diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/NodeIndex.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/NodeIndex.names index 12170c59ab..1a47f39a19 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/NodeIndex.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/NodeIndex.names @@ -5,7 +5,7 @@ "context": "BehaviorClass", "variant": "", "details": { - "name": "NodeIndex" + "name": "Node Index" }, "methods": [ { @@ -20,20 +20,13 @@ "tooltip": "Signaled after Equal is invoked" }, "details": { - "name": "NodeIndex::Equal", - "category": "Other" + "name": "Equal" }, "params": [ { "typeid": "{4AD18037-E629-480D-8165-997A137327FD}", "details": { - "name": "AZ::SceneAPI::Containers::SceneGraph::NodeIndex*" - } - }, - { - "typeid": "{4AD18037-E629-480D-8165-997A137327FD}", - "details": { - "name": "AZ::SceneAPI::Containers::SceneGraph::NodeIndex" + "name": "" } } ], @@ -51,29 +44,20 @@ "context": "NodeIndex", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke ToString" + "tooltip": "When signaled, this will invoke To String" }, "exit": { "name": "Out", - "tooltip": "Signaled after ToString is invoked" + "tooltip": "Signaled after To String is invoked" }, "details": { - "name": "NodeIndex::ToString", - "category": "Other" + "name": "To String" }, - "params": [ - { - "typeid": "{4AD18037-E629-480D-8165-997A137327FD}", - "details": { - "name": "const AZ::SceneAPI::Containers::SceneGraph::NodeIndex&" - } - } - ], "results": [ { "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", "details": { - "name": "AZStd::basic_string, allocator>" + "name": "AZ Std::basic_string, allocator>" } } ] @@ -83,24 +67,15 @@ "context": "NodeIndex", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke IsValid" + "tooltip": "When signaled, this will invoke Is Valid" }, "exit": { "name": "Out", - "tooltip": "Signaled after IsValid is invoked" + "tooltip": "Signaled after Is Valid is invoked" }, "details": { - "name": "NodeIndex::IsValid", - "category": "Other" + "name": "Is Valid" }, - "params": [ - { - "typeid": "{4AD18037-E629-480D-8165-997A137327FD}", - "details": { - "name": "AZ::SceneAPI::Containers::SceneGraph::NodeIndex*" - } - } - ], "results": [ { "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", @@ -122,20 +97,13 @@ "tooltip": "Signaled after Distance is invoked" }, "details": { - "name": "NodeIndex::Distance", - "category": "Other" + "name": "Distance" }, "params": [ { "typeid": "{4AD18037-E629-480D-8165-997A137327FD}", "details": { - "name": "AZ::SceneAPI::Containers::SceneGraph::NodeIndex*" - } - }, - { - "typeid": "{4AD18037-E629-480D-8165-997A137327FD}", - "details": { - "name": "AZ::SceneAPI::Containers::SceneGraph::NodeIndex" + "name": "" } } ], @@ -153,24 +121,15 @@ "context": "NodeIndex", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke AsNumber" + "tooltip": "When signaled, this will invoke As Number" }, "exit": { "name": "Out", - "tooltip": "Signaled after AsNumber is invoked" + "tooltip": "Signaled after As Number is invoked" }, "details": { - "name": "NodeIndex::AsNumber", - "category": "Other" + "name": "As Number" }, - "params": [ - { - "typeid": "{4AD18037-E629-480D-8165-997A137327FD}", - "details": { - "name": "AZ::SceneAPI::Containers::SceneGraph::NodeIndex*" - } - } - ], "results": [ { "typeid": "{43DA906B-7DEF-4CA8-9790-854106D3F983}", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/OutputDeviceTransformType.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/OutputDeviceTransformType.names index 7ceb39b27b..31eae88454 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/OutputDeviceTransformType.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/OutputDeviceTransformType.names @@ -5,8 +5,81 @@ "context": "BehaviorClass", "variant": "", "details": { - "name": "OutputDeviceTransformType" - } + "name": "Output Device Transform Type", + "category": "Rendering" + }, + "methods": [ + { + "base": "GetOutputDeviceTransformType_NumOutputDeviceTransformTypes", + "details": { + "name": "Get Output Device Transform Type_ Num Output Device Transform Types" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + }, + { + "base": "GetOutputDeviceTransformType_4000Nits", + "details": { + "name": "Get Output Device Transform Type_ 4000 Nits" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + }, + { + "base": "GetOutputDeviceTransformType_2000Nits", + "details": { + "name": "Get Output Device Transform Type_ 2000 Nits" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + }, + { + "base": "GetOutputDeviceTransformType_100Nits", + "details": { + "name": "Get Output Device Transform Type_ 100 Nits" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + }, + { + "base": "GetOutputDeviceTransformType_48Nits", + "details": { + "name": "Get Output Device Transform Type_ 48 Nits" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/PositionSplineQueryResult.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/PositionSplineQueryResult.names index 478a499b8e..45a805a43b 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/PositionSplineQueryResult.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/PositionSplineQueryResult.names @@ -5,8 +5,55 @@ "context": "BehaviorClass", "variant": "", "details": { - "name": "PositionSplineQueryResult" - } + "name": "Position Spline Query Result", + "category": "Physics" + }, + "methods": [ + { + "base": "GetsplineAddress", + "details": { + "name": "Getspline Address" + }, + "params": [ + { + "typeid": "{E35DCF28-1AC3-49E8-A0AB-2F6115348F45}", + "details": { + "name": "Position Spline Query Result" + } + } + ], + "results": [ + { + "typeid": "{865BA2EC-43C5-4E1F-9B6F-2D63F6DC2E70}", + "details": { + "name": "Spline Address" + } + } + ] + }, + { + "base": "GetdistanceSq", + "details": { + "name": "Getdistance Sq" + }, + "params": [ + { + "typeid": "{E35DCF28-1AC3-49E8-A0AB-2F6115348F45}", + "details": { + "name": "Position Spline Query Result" + } + } + ], + "results": [ + { + "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", + "details": { + "name": "float" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/PythonBehaviorInfo.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/PythonBehaviorInfo.names index cbc3f91d4d..3c8442e38f 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/PythonBehaviorInfo.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/PythonBehaviorInfo.names @@ -5,8 +5,76 @@ "context": "BehaviorClass", "variant": "", "details": { - "name": "PythonBehaviorInfo" - } + "name": "Python Behavior Info" + }, + "methods": [ + { + "base": "GetclassName", + "details": { + "name": "Getclass Name" + }, + "params": [ + { + "typeid": "{8055BD03-5B3B-490D-AEC5-1B1E2616D529}", + "details": { + "name": "const Python Behavior Info&" + } + } + ], + "results": [ + { + "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", + "details": { + "name": "AZ Std::string" + } + } + ] + }, + { + "base": "GetclassUuid", + "details": { + "name": "Getclass Uuid" + }, + "params": [ + { + "typeid": "{8055BD03-5B3B-490D-AEC5-1B1E2616D529}", + "details": { + "name": "const Python Behavior Info&" + } + } + ], + "results": [ + { + "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", + "details": { + "name": "AZ Std::string" + } + } + ] + }, + { + "base": "GetmethodList", + "details": { + "name": "Getmethod List" + }, + "params": [ + { + "typeid": "{8055BD03-5B3B-490D-AEC5-1B1E2616D529}", + "details": { + "name": "Python Behavior Info*" + } + } + ], + "results": [ + { + "typeid": "{99DAD0BC-740E-5E82-826B-8FC7968CC02C}", + "details": { + "name": "AZ Std::vector" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/RaySplineQueryResult.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/RaySplineQueryResult.names index 0c143f7bca..9dc7d5c1da 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/RaySplineQueryResult.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/RaySplineQueryResult.names @@ -5,8 +5,77 @@ "context": "BehaviorClass", "variant": "", "details": { - "name": "RaySplineQueryResult" - } + "name": "Ray Spline Query Result", + "category": "Physics" + }, + "methods": [ + { + "base": "GetsplineAddress", + "details": { + "name": "Getspline Address" + }, + "params": [ + { + "typeid": "{FE862126-C838-4999-9B7B-4AEEA5507A49}", + "details": { + "name": "Ray Spline Query Result" + } + } + ], + "results": [ + { + "typeid": "{865BA2EC-43C5-4E1F-9B6F-2D63F6DC2E70}", + "details": { + "name": "Spline Address" + } + } + ] + }, + { + "base": "GetdistanceSq", + "details": { + "name": "Getdistance Sq" + }, + "params": [ + { + "typeid": "{FE862126-C838-4999-9B7B-4AEEA5507A49}", + "details": { + "name": "Ray Spline Query Result" + } + } + ], + "results": [ + { + "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", + "details": { + "name": "float" + } + } + ] + }, + { + "base": "GetrayDistance", + "details": { + "name": "Getray Distance" + }, + "params": [ + { + "typeid": "{FE862126-C838-4999-9B7B-4AEEA5507A49}", + "details": { + "name": "Ray Spline Query Result" + } + } + ], + "results": [ + { + "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", + "details": { + "name": "float" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/Render__DisplayMapperOperationType.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/Render__DisplayMapperOperationType.names new file mode 100644 index 0000000000..5f05143021 --- /dev/null +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/Render__DisplayMapperOperationType.names @@ -0,0 +1,99 @@ +{ + "entries": [ + { + "base": "Render::DisplayMapperOperationType", + "context": "BehaviorClass", + "variant": "", + "details": { + "name": "Display Mapper Operation Type", + "category": "Rendering" + }, + "methods": [ + { + "base": "GetDisplayMapperOperationType_GammaSRGB", + "details": { + "name": "Get Display Mapper Operation Type_ GammaSRGB" + }, + "results": [ + { + "typeid": "{43DA906B-7DEF-4CA8-9790-854106D3F983}", + "details": { + "name": "unsigned int" + } + } + ] + }, + { + "base": "GetDisplayMapperOperationType_Invalid", + "details": { + "name": "Get Display Mapper Operation Type_ Invalid" + }, + "results": [ + { + "typeid": "{43DA906B-7DEF-4CA8-9790-854106D3F983}", + "details": { + "name": "unsigned int" + } + } + ] + }, + { + "base": "GetDisplayMapperOperationType_Passthrough", + "details": { + "name": "Get Display Mapper Operation Type_ Passthrough" + }, + "results": [ + { + "typeid": "{43DA906B-7DEF-4CA8-9790-854106D3F983}", + "details": { + "name": "unsigned int" + } + } + ] + }, + { + "base": "GetDisplayMapperOperationType_Reinhard", + "details": { + "name": "Get Display Mapper Operation Type_ Reinhard" + }, + "results": [ + { + "typeid": "{43DA906B-7DEF-4CA8-9790-854106D3F983}", + "details": { + "name": "unsigned int" + } + } + ] + }, + { + "base": "GetDisplayMapperOperationType_Aces", + "details": { + "name": "Get Display Mapper Operation Type_ Aces" + }, + "results": [ + { + "typeid": "{43DA906B-7DEF-4CA8-9790-854106D3F983}", + "details": { + "name": "unsigned int" + } + } + ] + }, + { + "base": "GetDisplayMapperOperationType_AcesLut", + "details": { + "name": "Get Display Mapper Operation Type_ Aces Lut" + }, + "results": [ + { + "typeid": "{43DA906B-7DEF-4CA8-9790-854106D3F983}", + "details": { + "name": "unsigned int" + } + } + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/Render__ShadowmapSize.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/Render__ShadowmapSize.names new file mode 100644 index 0000000000..bde0892936 --- /dev/null +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/Render__ShadowmapSize.names @@ -0,0 +1,85 @@ +{ + "entries": [ + { + "base": "Render::ShadowmapSize", + "context": "BehaviorClass", + "variant": "", + "details": { + "name": "Shadowmap Size", + "category": "Rendering" + }, + "methods": [ + { + "base": "GetShadowmapSize_512", + "details": { + "name": "Get Shadowmap Size_ 512" + }, + "results": [ + { + "typeid": "{43DA906B-7DEF-4CA8-9790-854106D3F983}", + "details": { + "name": "unsigned int" + } + } + ] + }, + { + "base": "GetShadowmapSize_1024", + "details": { + "name": "Get Shadowmap Size_ 1024" + }, + "results": [ + { + "typeid": "{43DA906B-7DEF-4CA8-9790-854106D3F983}", + "details": { + "name": "unsigned int" + } + } + ] + }, + { + "base": "GetShadowmapSize_2048", + "details": { + "name": "Get Shadowmap Size_ 2048" + }, + "results": [ + { + "typeid": "{43DA906B-7DEF-4CA8-9790-854106D3F983}", + "details": { + "name": "unsigned int" + } + } + ] + }, + { + "base": "GetShadowmapSize_256", + "details": { + "name": "Get Shadowmap Size_ 256" + }, + "results": [ + { + "typeid": "{43DA906B-7DEF-4CA8-9790-854106D3F983}", + "details": { + "name": "unsigned int" + } + } + ] + }, + { + "base": "GetShadowmapSize_None", + "details": { + "name": "Get Shadowmap Size_ None" + }, + "results": [ + { + "typeid": "{43DA906B-7DEF-4CA8-9790-854106D3F983}", + "details": { + "name": "unsigned int" + } + } + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/RuntimeData.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/RuntimeData.names index 9736c7e787..6625e13e6b 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/RuntimeData.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/RuntimeData.names @@ -5,7 +5,7 @@ "context": "BehaviorClass", "variant": "", "details": { - "name": "RuntimeData" + "name": "Runtime Data" }, "methods": [ { @@ -13,29 +13,20 @@ "context": "RuntimeData", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetRequiredAssets" + "tooltip": "When signaled, this will invoke Get Required Assets" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetRequiredAssets is invoked" + "tooltip": "Signaled after Get Required Assets is invoked" }, "details": { - "name": "RuntimeData::GetRequiredAssets", - "category": "Other" + "name": "Get Required Assets" }, - "params": [ - { - "typeid": "{A935EBBC-D167-4C59-927C-5D98C6337B9C}", - "details": { - "name": "const RuntimeData&" - } - } - ], "results": [ { "typeid": "{5600E444-1E66-5CB4-81A9-053AD1F4453E}", "details": { - "name": "AZStd::vector, allocator>" + "name": "AZ Std::vector< Asset< Runtime Asset>, allocator>" } } ] diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/Scene.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/Scene.names index febcc224f1..7a00163d89 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/Scene.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/Scene.names @@ -5,7 +5,8 @@ "context": "BehaviorClass", "variant": "", "details": { - "name": "Scene" + "name": "Scene", + "category": "Scene" }, "methods": [ { @@ -13,15 +14,56 @@ "context": "Scene", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetOriginalSceneOrientation" + "tooltip": "When signaled, this will invoke Get Original Scene Orientation" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetOriginalSceneOrientation is invoked" + "tooltip": "Signaled after Get Original Scene Orientation is invoked" }, "details": { - "name": "Scene::GetOriginalSceneOrientation", - "category": "Other" + "name": "Get Original Scene Orientation" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + }, + { + "base": "GetSceneOrientation_XUp", + "details": { + "name": "Get Scene Orientation_X Up" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + }, + { + "base": "GetSceneOrientation_NegYUp", + "details": { + "name": "Get Scene Orientation_ NegY Up" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + }, + { + "base": "GetwatchFolder", + "details": { + "name": "Getwatch Folder" }, "params": [ { @@ -31,6 +73,194 @@ } } ], + "results": [ + { + "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", + "details": { + "name": "AZ Std::string" + } + } + ] + }, + { + "base": "GetSceneOrientation_NegZUp", + "details": { + "name": "Get Scene Orientation_ NegZ Up" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + }, + { + "base": "Getgraph", + "details": { + "name": "Getgraph" + }, + "params": [ + { + "typeid": "{1F2E6142-B0D8-42C6-A6E5-CD726DAA9EF0}", + "details": { + "name": "Scene*" + } + } + ], + "results": [ + { + "typeid": "{CAC6556D-D5FE-4D0E-BCCD-8940357C1D35}", + "details": { + "name": "AZ:: SceneAPI:: Containers:: Scene Graph&" + } + } + ] + }, + { + "base": "GetsourceGuid", + "details": { + "name": "Getsource Guid" + }, + "params": [ + { + "typeid": "{1F2E6142-B0D8-42C6-A6E5-CD726DAA9EF0}", + "details": { + "name": "Scene*" + } + } + ], + "results": [ + { + "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}", + "details": { + "name": "AZ:: Uuid" + } + } + ] + }, + { + "base": "GetSceneOrientation_YUp", + "details": { + "name": "Get Scene Orientation_Y Up" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + }, + { + "base": "GetsourceFilename", + "details": { + "name": "Getsource Filename" + }, + "params": [ + { + "typeid": "{1F2E6142-B0D8-42C6-A6E5-CD726DAA9EF0}", + "details": { + "name": "Scene*" + } + } + ], + "results": [ + { + "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", + "details": { + "name": "AZ Std::string" + } + } + ] + }, + { + "base": "GetmanifestFilename", + "details": { + "name": "Getmanifest Filename" + }, + "params": [ + { + "typeid": "{1F2E6142-B0D8-42C6-A6E5-CD726DAA9EF0}", + "details": { + "name": "Scene*" + } + } + ], + "results": [ + { + "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", + "details": { + "name": "AZ Std::string" + } + } + ] + }, + { + "base": "GetSceneOrientation_NegXUp", + "details": { + "name": "Get Scene Orientation_ NegX Up" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + }, + { + "base": "Getname", + "details": { + "name": "Getname" + }, + "params": [ + { + "typeid": "{1F2E6142-B0D8-42C6-A6E5-CD726DAA9EF0}", + "details": { + "name": "Scene*" + } + } + ], + "results": [ + { + "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", + "details": { + "name": "AZ Std::string" + } + } + ] + }, + { + "base": "Getmanifest", + "details": { + "name": "Getmanifest" + }, + "params": [ + { + "typeid": "{1F2E6142-B0D8-42C6-A6E5-CD726DAA9EF0}", + "details": { + "name": "Scene*" + } + } + ], + "results": [ + { + "typeid": "{9274AD17-3212-4651-9F3B-7DCCB080E467}", + "details": { + "name": "Scene Manifest" + } + } + ] + }, + { + "base": "GetSceneOrientation_ZUp", + "details": { + "name": "Get Scene Orientation_Z Up" + }, "results": [ { "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SceneManifest.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SceneManifest.names index bc018a3011..151b93f217 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SceneManifest.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SceneManifest.names @@ -5,7 +5,8 @@ "context": "BehaviorClass", "variant": "", "details": { - "name": "SceneManifest" + "name": "Scene Manifest", + "category": "Scene" }, "methods": [ { @@ -13,27 +14,20 @@ "context": "SceneManifest", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke ImportFromJson" + "tooltip": "When signaled, this will invoke Import From Json" }, "exit": { "name": "Out", - "tooltip": "Signaled after ImportFromJson is invoked" + "tooltip": "Signaled after Import From Json is invoked" }, "details": { - "name": "SceneManifest::ImportFromJson", - "category": "Other" + "name": "Import From Json" }, "params": [ - { - "typeid": "{9274AD17-3212-4651-9F3B-7DCCB080E467}", - "details": { - "name": "SceneManifest&" - } - }, { "typeid": "{7114E998-A8B4-519B-9342-A86D1587B4F7}", "details": { - "name": "AZStd::basic_string_view>" + "name": "" } } ], @@ -51,29 +45,20 @@ "context": "SceneManifest", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke ExportToJson" + "tooltip": "When signaled, this will invoke Export To Json" }, "exit": { "name": "Out", - "tooltip": "Signaled after ExportToJson is invoked" + "tooltip": "Signaled after Export To Json is invoked" }, "details": { - "name": "SceneManifest::ExportToJson", - "category": "Other" + "name": "Export To Json" }, - "params": [ - { - "typeid": "{9274AD17-3212-4651-9F3B-7DCCB080E467}", - "details": { - "name": "SceneManifest&" - } - } - ], "results": [ { "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", "details": { - "name": "AZStd::basic_string, allocator>" + "name": "AZ Std::basic_string, allocator>" } } ] diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ScriptTimePoint.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ScriptTimePoint.names index c80e6d466b..1a38873aaa 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ScriptTimePoint.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ScriptTimePoint.names @@ -5,7 +5,8 @@ "context": "BehaviorClass", "variant": "", "details": { - "name": "Script Time Point" + "name": "Script Time Point", + "category": "Timing" }, "methods": [ { @@ -22,14 +23,6 @@ "details": { "name": "To String" }, - "params": [ - { - "typeid": "{4C0F6AD4-0D4F-4354-AD4A-0C01E948245C}", - "details": { - "name": "Script Time Point" - } - } - ], "results": [ { "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", @@ -53,14 +46,6 @@ "details": { "name": "Get Seconds" }, - "params": [ - { - "typeid": "{4C0F6AD4-0D4F-4354-AD4A-0C01E948245C}", - "details": { - "name": "Script Time Point" - } - } - ], "results": [ { "typeid": "{110C4B14-11A8-4E9D-8638-5051013A56AC}", @@ -84,14 +69,6 @@ "details": { "name": "Get Milliseconds" }, - "params": [ - { - "typeid": "{4C0F6AD4-0D4F-4354-AD4A-0C01E948245C}", - "details": { - "name": "Script Time Point" - } - } - ], "results": [ { "typeid": "{110C4B14-11A8-4E9D-8638-5051013A56AC}", diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SliceInstantiationTicket.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SliceInstantiationTicket.names index 325c544763..b914cad636 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SliceInstantiationTicket.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SliceInstantiationTicket.names @@ -5,7 +5,8 @@ "context": "BehaviorClass", "variant": "", "details": { - "name": "Slice Instantiation Ticket" + "name": "Slice Instantiation Ticket", + "category": "Slices" }, "methods": [ { @@ -26,13 +27,7 @@ { "typeid": "{E6E7C0C5-07C9-44BB-A38C-930431948667}", "details": { - "name": "Slice Instantiation Ticket*" - } - }, - { - "typeid": "{E6E7C0C5-07C9-44BB-A38C-930431948667}", - "details": { - "name": "const Slice Instantiation Ticket&" + "name": "Slice Instantiation Ticket" } } ], @@ -40,7 +35,7 @@ { "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", "details": { - "name": "Equal" + "name": "bool" } } ] @@ -59,19 +54,11 @@ "details": { "name": "To String" }, - "params": [ - { - "typeid": "{E6E7C0C5-07C9-44BB-A38C-930431948667}", - "details": { - "name": "Slice Instantiation Ticket*" - } - } - ], "results": [ { "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", "details": { - "name": "String" + "name": "AZ Std::basic_string, allocator>" } } ] @@ -90,19 +77,11 @@ "details": { "name": "Is Valid" }, - "params": [ - { - "typeid": "{E6E7C0C5-07C9-44BB-A38C-930431948667}", - "details": { - "name": "Slice Instantiation Ticket*" - } - } - ], "results": [ { "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", "details": { - "name": "Is Valid" + "name": "bool" } } ] diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SmoothStep.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SmoothStep.names index a95cd5d878..260bfce9a4 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SmoothStep.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SmoothStep.names @@ -5,8 +5,143 @@ "context": "BehaviorClass", "variant": "", "details": { - "name": "SmoothStep" - } + "name": "Smooth Step", + "category": "Rendering" + }, + "methods": [ + { + "base": "GetfalloffMidpoint", + "details": { + "name": "Getfalloff Midpoint" + }, + "params": [ + { + "typeid": "{F392F061-BF40-43C5-89F6-7323D6EF11F4}", + "details": { + "name": "Smooth Step Gradient", + "tooltip": "Smooth Step Gradient" + } + } + ], + "results": [ + { + "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", + "details": { + "name": "float" + } + } + ] + }, + { + "base": "SetfalloffMidpoint", + "details": { + "name": "Setfalloff Midpoint" + }, + "params": [ + { + "typeid": "{F392F061-BF40-43C5-89F6-7323D6EF11F4}", + "details": { + "name": "Smooth Step Gradient", + "tooltip": "Smooth Step Gradient" + } + }, + { + "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", + "details": { + "name": "float" + } + } + ] + }, + { + "base": "GetfalloffRange", + "details": { + "name": "Getfalloff Range" + }, + "params": [ + { + "typeid": "{F392F061-BF40-43C5-89F6-7323D6EF11F4}", + "details": { + "name": "Smooth Step Gradient", + "tooltip": "Smooth Step Gradient" + } + } + ], + "results": [ + { + "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", + "details": { + "name": "float" + } + } + ] + }, + { + "base": "SetfalloffRange", + "details": { + "name": "Setfalloff Range" + }, + "params": [ + { + "typeid": "{F392F061-BF40-43C5-89F6-7323D6EF11F4}", + "details": { + "name": "Smooth Step Gradient", + "tooltip": "Smooth Step Gradient" + } + }, + { + "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", + "details": { + "name": "float" + } + } + ] + }, + { + "base": "GetfalloffStrength", + "details": { + "name": "Getfalloff Strength" + }, + "params": [ + { + "typeid": "{F392F061-BF40-43C5-89F6-7323D6EF11F4}", + "details": { + "name": "Smooth Step Gradient", + "tooltip": "Smooth Step Gradient" + } + } + ], + "results": [ + { + "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", + "details": { + "name": "float" + } + } + ] + }, + { + "base": "SetfalloffStrength", + "details": { + "name": "Setfalloff Strength" + }, + "params": [ + { + "typeid": "{F392F061-BF40-43C5-89F6-7323D6EF11F4}", + "details": { + "name": "Smooth Step Gradient", + "tooltip": "Smooth Step Gradient" + } + }, + { + "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", + "details": { + "name": "float" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SpawnerConfig.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SpawnerConfig.names index fafcb74e0b..4b6c2cba4d 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SpawnerConfig.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SpawnerConfig.names @@ -5,8 +5,95 @@ "context": "BehaviorClass", "variant": "", "details": { - "name": "SpawnerConfig" - } + "name": "Spawner Config", + "category": "Spawner" + }, + "methods": [ + { + "base": "GetspawnOnActivate", + "details": { + "name": "Getspawn On Activate" + }, + "params": [ + { + "typeid": "{D4D68E8E-9031-448F-9D56-B5575CF4833C}", + "details": { + "name": "Spawner Config*" + } + } + ], + "results": [ + { + "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", + "details": { + "name": "bool" + } + } + ] + }, + { + "base": "SetspawnOnActivate", + "details": { + "name": "Setspawn On Activate" + }, + "params": [ + { + "typeid": "{D4D68E8E-9031-448F-9D56-B5575CF4833C}", + "details": { + "name": "Spawner Config*" + } + }, + { + "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", + "details": { + "name": "bool" + } + } + ] + }, + { + "base": "GetdestroyOnDeactivate", + "details": { + "name": "Getdestroy On Deactivate" + }, + "params": [ + { + "typeid": "{D4D68E8E-9031-448F-9D56-B5575CF4833C}", + "details": { + "name": "Spawner Config*" + } + } + ], + "results": [ + { + "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", + "details": { + "name": "bool" + } + } + ] + }, + { + "base": "SetdestroyOnDeactivate", + "details": { + "name": "Setdestroy On Deactivate" + }, + "params": [ + { + "typeid": "{D4D68E8E-9031-448F-9D56-B5575CF4833C}", + "details": { + "name": "Spawner Config*" + } + }, + { + "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", + "details": { + "name": "bool" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SphereShapeConfig.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SphereShapeConfig.names index 889b0dbe55..9fe47a8724 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SphereShapeConfig.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SphereShapeConfig.names @@ -5,8 +5,55 @@ "context": "BehaviorClass", "variant": "", "details": { - "name": "SphereShapeConfig" - } + "name": "Sphere Shape Config", + "category": "Rendering/Shapes" + }, + "methods": [ + { + "base": "GetRadius", + "details": { + "name": "Get Radius" + }, + "params": [ + { + "typeid": "{4AADFD75-48A7-4F31-8F30-FE4505F09E35}", + "details": { + "name": "Configuration", + "tooltip": "Sphere shape configuration parameters" + } + } + ], + "results": [ + { + "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", + "details": { + "name": "float" + } + } + ] + }, + { + "base": "SetRadius", + "details": { + "name": "Set Radius" + }, + "params": [ + { + "typeid": "{4AADFD75-48A7-4F31-8F30-FE4505F09E35}", + "details": { + "name": "Configuration", + "tooltip": "Sphere shape configuration parameters" + } + }, + { + "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", + "details": { + "name": "float" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/String.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/String.names index b8d70936e4..1bc9b2414d 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/String.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/String.names @@ -5,7 +5,8 @@ "context": "BehaviorClass", "variant": "", "details": { - "name": "String" + "name": "Utilities", + "category": "String" }, "methods": [ { @@ -13,39 +14,35 @@ "context": "String", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke ReplaceString" + "tooltip": "When signaled, this will invoke Replace String" }, "exit": { "name": "Out", - "tooltip": "Signaled after ReplaceString is invoked" + "tooltip": "Signaled after Replace String is invoked" }, "details": { - "name": "String::Replace String", - "category": "Other" + "name": "Replace String" }, "params": [ { "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", "details": { - "name": "AZStd::basic_string, allocator>&" + "name": "Replace", + "tooltip": "The substring to search for." } }, { "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", "details": { - "name": "const AZStd::basic_string, alloc" - } - }, - { - "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", - "details": { - "name": "const AZStd::basic_string, alloc" + "name": "With", + "tooltip": "The string to replace the substring with." } }, { "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", "details": { - "name": "bool" + "name": "Case Sensitive", + "tooltip": "Take into account the case of the string when searching." } } ], @@ -53,7 +50,7 @@ { "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", "details": { - "name": "AZStd::basic_string, allocator>" + "name": "AZ Std::basic_string, allocator>" } } ] @@ -70,20 +67,14 @@ "tooltip": "Signaled after Join is invoked" }, "details": { - "name": "String::Join", - "category": "Other" + "name": "Join" }, "params": [ - { - "typeid": "{99DAD0BC-740E-5E82-826B-8FC7968CC02C}", - "details": { - "name": "const AZStd::vector, alloc" + "name": "Separator", + "tooltip": "Will use this string when concatenating the strings from the array." } } ], @@ -91,7 +82,7 @@ { "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", "details": { - "name": "AZStd::basic_string, allocator>" + "name": "AZ Std::basic_string, allocator>" } } ] @@ -101,33 +92,28 @@ "context": "String", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke StartsWith" + "tooltip": "When signaled, this will invoke Starts With" }, "exit": { "name": "Out", - "tooltip": "Signaled after StartsWith is invoked" + "tooltip": "Signaled after Starts With is invoked" }, "details": { - "name": "String::Starts With", - "category": "Other" + "name": "Starts With" }, "params": [ { "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", "details": { - "name": "const AZStd::basic_string, alloc" - } - }, - { - "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", - "details": { - "name": "const AZStd::basic_string, alloc" + "name": "Pattern", + "tooltip": "The substring to search for." } }, { "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", "details": { - "name": "bool" + "name": "Case Sensitive", + "tooltip": "Take into account the case of the string when searching." } } ], @@ -145,39 +131,35 @@ "context": "String", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke ContainsString" + "tooltip": "When signaled, this will invoke Contains String" }, "exit": { "name": "Out", - "tooltip": "Signaled after ContainsString is invoked" + "tooltip": "Signaled after Contains String is invoked" }, "details": { - "name": "String::Contains String", - "category": "Other" + "name": "Contains String" }, "params": [ { "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", "details": { - "name": "const AZStd::basic_string, alloc" - } - }, - { - "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", - "details": { - "name": "const AZStd::basic_string, alloc" + "name": "Pattern", + "tooltip": "The substring to search for." } }, { "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", "details": { - "name": "bool" + "name": "Search From End", + "tooltip": "Start the match checking from the end of a string." } }, { "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", "details": { - "name": "bool" + "name": "Case Sensitive", + "tooltip": "Take into account the case of the string when searching." } } ], @@ -185,7 +167,7 @@ { "typeid": "{D6597933-47CD-4FC8-B911-63F3E2B0993A}", "details": { - "name": "AZ::u64" + "name": "AZ::u 64" } } ] @@ -202,20 +184,14 @@ "tooltip": "Signaled after Split is invoked" }, "details": { - "name": "String::Split", - "category": "Other" + "name": "Split" }, "params": [ { "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", "details": { - "name": "const AZStd::basic_string, alloc" - } - }, - { - "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", - "details": { - "name": "const AZStd::basic_string, alloc" + "name": "Delimiters", + "tooltip": "The characters that can be used as delimiters." } } ], @@ -223,7 +199,7 @@ { "typeid": "{99DAD0BC-740E-5E82-826B-8FC7968CC02C}", "details": { - "name": "AZStd::vector, allocator>, allocator>" + "name": "AZ Std::vector, allocator>, allocator>" } } ] @@ -233,24 +209,15 @@ "context": "String", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke IsValidFindPosition" + "tooltip": "When signaled, this will invoke Is Valid Find Position" }, "exit": { "name": "Out", - "tooltip": "Signaled after IsValidFindPosition is invoked" + "tooltip": "Signaled after Is Valid Find Position is invoked" }, "details": { - "name": "String::Is Valid Find Position", - "category": "Other" + "name": "Is Valid Find Position" }, - "params": [ - { - "typeid": "{D6597933-47CD-4FC8-B911-63F3E2B0993A}", - "details": { - "name": "AZ::u64" - } - } - ], "results": [ { "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", @@ -265,33 +232,28 @@ "context": "String", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke EndsWith" + "tooltip": "When signaled, this will invoke Ends With" }, "exit": { "name": "Out", - "tooltip": "Signaled after EndsWith is invoked" + "tooltip": "Signaled after Ends With is invoked" }, "details": { - "name": "String::Ends With", - "category": "Other" + "name": "Ends With" }, "params": [ { "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", "details": { - "name": "const AZStd::basic_string, alloc" - } - }, - { - "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", - "details": { - "name": "const AZStd::basic_string, alloc" + "name": "Pattern", + "tooltip": "The substring to search for." } }, { "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", "details": { - "name": "bool" + "name": "Case Sensitive", + "tooltip": "Take into account the case of the string when searching." } } ], diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/TickOrder.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/TickOrder.names index a6716ab37e..58d8b41aac 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/TickOrder.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/TickOrder.names @@ -5,8 +5,165 @@ "context": "BehaviorClass", "variant": "", "details": { - "name": "TickOrder" - } + "name": "Tick Order", + "category": "Timing" + }, + "methods": [ + { + "base": "GetPhysics", + "details": { + "name": "Get Physics" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + }, + { + "base": "GetAnimation", + "details": { + "name": "Get Animation" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + }, + { + "base": "GetPreRender", + "details": { + "name": "Get Pre Render" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + }, + { + "base": "GetGame", + "details": { + "name": "Get Game" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + }, + { + "base": "GetInput", + "details": { + "name": "Get Input" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + }, + { + "base": "GetAttachment", + "details": { + "name": "Get Attachment" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + }, + { + "base": "GetPlacement", + "details": { + "name": "Get Placement" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + }, + { + "base": "GetDefault", + "details": { + "name": "Get Default" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + }, + { + "base": "GetFirst", + "details": { + "name": "Get First" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + }, + { + "base": "GetUI", + "details": { + "name": "GetUI" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + }, + { + "base": "GetLast", + "details": { + "name": "Get Last" + }, + "results": [ + { + "typeid": "{72039442-EB38-4D42-A1AD-CB68F7E0EEF6}", + "details": { + "name": "int" + } + } + ] + } + ] } ] } \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/UiAnchors.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/UiAnchors.names index 6f0f08fdb0..69c64e6c7a 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/UiAnchors.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/UiAnchors.names @@ -5,7 +5,8 @@ "context": "BehaviorClass", "variant": "", "details": { - "name": "Ui Anchors" + "name": "UI Anchors", + "category": "UI" }, "methods": [ { @@ -180,7 +181,7 @@ { "typeid": "{65D4346C-FB16-4CB0-9BDC-1185B122C4A9}", "details": { - "name": "" + "name": "Anchors" } } ], @@ -188,7 +189,7 @@ { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", "details": { - "name": "" + "name": "float" } } ] @@ -202,13 +203,13 @@ { "typeid": "{65D4346C-FB16-4CB0-9BDC-1185B122C4A9}", "details": { - "name": "" + "name": "Anchors" } }, { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", "details": { - "name": "" + "name": "float" } } ] @@ -222,7 +223,7 @@ { "typeid": "{65D4346C-FB16-4CB0-9BDC-1185B122C4A9}", "details": { - "name": "" + "name": "Anchors" } } ], @@ -230,7 +231,7 @@ { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", "details": { - "name": "" + "name": "float" } } ] @@ -244,13 +245,13 @@ { "typeid": "{65D4346C-FB16-4CB0-9BDC-1185B122C4A9}", "details": { - "name": "" + "name": "Anchors" } }, { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", "details": { - "name": "" + "name": "float" } } ] @@ -264,7 +265,7 @@ { "typeid": "{65D4346C-FB16-4CB0-9BDC-1185B122C4A9}", "details": { - "name": "" + "name": "Anchors" } } ], @@ -272,7 +273,7 @@ { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", "details": { - "name": "" + "name": "float" } } ] @@ -286,13 +287,13 @@ { "typeid": "{65D4346C-FB16-4CB0-9BDC-1185B122C4A9}", "details": { - "name": "" + "name": "Anchors" } }, { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", "details": { - "name": "" + "name": "float" } } ] @@ -306,7 +307,7 @@ { "typeid": "{65D4346C-FB16-4CB0-9BDC-1185B122C4A9}", "details": { - "name": "" + "name": "Anchors" } } ], @@ -314,7 +315,7 @@ { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", "details": { - "name": "" + "name": "float" } } ] @@ -328,13 +329,13 @@ { "typeid": "{65D4346C-FB16-4CB0-9BDC-1185B122C4A9}", "details": { - "name": "" + "name": "Anchors" } }, { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", "details": { - "name": "" + "name": "float" } } ] diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/Unit Testing.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/Unit Testing.names index 7dcec69b68..160f0563c1 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/Unit Testing.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/Unit Testing.names @@ -5,7 +5,8 @@ "context": "BehaviorClass", "variant": "", "details": { - "name": "Unit Testing" + "name": "Unit Testing", + "category": "Tests" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/Uuid.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/Uuid.names index 26ab64071d..504c64f4b3 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/Uuid.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/Uuid.names @@ -5,7 +5,8 @@ "context": "BehaviorClass", "variant": "", "details": { - "name": "Uuid" + "name": "Uuid", + "category": "Utilities" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/VertexColor.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/VertexColor.names index 19024105d3..a6efefc37e 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/VertexColor.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/VertexColor.names @@ -5,7 +5,8 @@ "context": "BehaviorClass", "variant": "", "details": { - "name": "Vertex Color" + "name": "Vertex Color", + "category": "Rendering" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/ForceRegionNotificationBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/ForceRegionNotificationBus.names new file mode 100644 index 0000000000..e4c43e1d30 --- /dev/null +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Handlers/ForceRegionNotificationBus.names @@ -0,0 +1,49 @@ +{ + "entries": [ + { + "base": "ForceRegionNotificationBus", + "context": "EBusHandler", + "variant": "", + "details": { + "name": "Force Region", + "category": "Physics" + }, + "methods": [ + { + "base": "OnCalculateNetForce", + "details": { + "name": "On Calculate Net Force" + }, + "params": [ + { + "typeid": "{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}", + "details": { + "name": "Entity Id", + "tooltip": "Entity Unique Id" + } + }, + { + "typeid": "{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}", + "details": { + "name": "Entity Id", + "tooltip": "Entity Unique Id" + } + }, + { + "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}", + "details": { + "name": "Vector 3" + } + }, + { + "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", + "details": { + "name": "float" + } + } + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/BloomRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/BloomRequestBus.names index dbbadc1aaf..4e7b53693e 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/BloomRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/BloomRequestBus.names @@ -5,7 +5,8 @@ "context": "EBusSender", "variant": "", "details": { - "name": "Bloom Request Bus" + "name": "Bloom", + "category": "Rendering" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/BoundsRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/BoundsRequestBus.names index 87ea2b079c..a9b4bea946 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/BoundsRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/BoundsRequestBus.names @@ -5,7 +5,8 @@ "context": "EBusSender", "variant": "", "details": { - "name": "Bounds Request Bus" + "name": "Bounds", + "category": "Rendering" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/DiskShapeComponentRequestsBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/DiskShapeComponentRequestsBus.names index 128a77fcc1..05dd1a0e62 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/DiskShapeComponentRequestsBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/DiskShapeComponentRequestsBus.names @@ -5,21 +5,22 @@ "context": "EBusSender", "variant": "", "details": { - "name": "Disk Shape Component" + "name": "Disk Shape Component", + "category": "Rendering/Shapes" }, "methods": [ { "base": "GetDiskConfiguration", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetDiskConfiguration" + "tooltip": "When signaled, this will invoke Get Disk Configuration" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetDiskConfiguration is invoked" + "tooltip": "Signaled after Get Disk Configuration is invoked" }, "details": { - "name": "GetDiskConfiguration" + "name": "Get Disk Configuration" }, "results": [ { @@ -35,14 +36,14 @@ "base": "SetRadius", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetRadius" + "tooltip": "When signaled, this will invoke Set Radius" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetRadius is invoked" + "tooltip": "Signaled after Set Radius is invoked" }, "details": { - "name": "SetRadius" + "name": "Set Radius" }, "params": [ { @@ -57,14 +58,14 @@ "base": "GetRadius", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetRadius" + "tooltip": "When signaled, this will invoke Get Radius" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetRadius is invoked" + "tooltip": "Signaled after Get Radius is invoked" }, "details": { - "name": "GetRadius" + "name": "Get Radius" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/EditorReflectionProbeBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/EditorReflectionProbeBus.names index ad66aa3650..ba03233971 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/EditorReflectionProbeBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/EditorReflectionProbeBus.names @@ -5,21 +5,22 @@ "context": "EBusSender", "variant": "", "details": { - "name": "Editor Reflection Probe" + "name": "Editor Reflection Probe", + "category": "Rendering" }, "methods": [ { "base": "BakeReflectionProbe", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke BakeReflectionProbe" + "tooltip": "When signaled, this will invoke Bake Reflection Probe" }, "exit": { "name": "Out", - "tooltip": "Signaled after BakeReflectionProbe is invoked" + "tooltip": "Signaled after Bake Reflection Probe is invoked" }, "details": { - "name": "BakeReflectionProbe" + "name": "Bake Reflection Probe" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ExposureControlRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ExposureControlRequestBus.names index 8c0ef018d5..7ff05531a5 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ExposureControlRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ExposureControlRequestBus.names @@ -5,21 +5,22 @@ "context": "EBusSender", "variant": "", "details": { - "name": "Exposure Control" + "name": "Exposure Control", + "category": "Rendering" }, "methods": [ { "base": "SetEyeAdaptationSpeedDownOverride", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetEyeAdaptationSpeedDownOverride" + "tooltip": "When signaled, this will invoke Set Eye Adaptation Speed Down Override" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetEyeAdaptationSpeedDownOverride is invoked" + "tooltip": "Signaled after Set Eye Adaptation Speed Down Override is invoked" }, "details": { - "name": "SetEyeAdaptationSpeedDownOverride" + "name": "Set Eye Adaptation Speed Down Override" }, "params": [ { @@ -34,14 +35,14 @@ "base": "GetEnabled", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetEnabled" + "tooltip": "When signaled, this will invoke Get Enabled" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetEnabled is invoked" + "tooltip": "Signaled after Get Enabled is invoked" }, "details": { - "name": "GetEnabled" + "name": "Get Enabled" }, "results": [ { @@ -56,14 +57,14 @@ "base": "SetEnabledOverride", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetEnabledOverride" + "tooltip": "When signaled, this will invoke Set Enabled Override" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetEnabledOverride is invoked" + "tooltip": "Signaled after Set Enabled Override is invoked" }, "details": { - "name": "SetEnabledOverride" + "name": "Set Enabled Override" }, "params": [ { @@ -78,14 +79,14 @@ "base": "SetManualCompensation", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetManualCompensation" + "tooltip": "When signaled, this will invoke Set Manual Compensation" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetManualCompensation is invoked" + "tooltip": "Signaled after Set Manual Compensation is invoked" }, "details": { - "name": "SetManualCompensation" + "name": "Set Manual Compensation" }, "params": [ { @@ -100,14 +101,14 @@ "base": "SetEyeAdaptationSpeedDown", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetEyeAdaptationSpeedDown" + "tooltip": "When signaled, this will invoke Set Eye Adaptation Speed Down" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetEyeAdaptationSpeedDown is invoked" + "tooltip": "Signaled after Set Eye Adaptation Speed Down is invoked" }, "details": { - "name": "SetEyeAdaptationSpeedDown" + "name": "Set Eye Adaptation Speed Down" }, "params": [ { @@ -122,14 +123,14 @@ "base": "GetExposureControlTypeOverride", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetExposureControlTypeOverride" + "tooltip": "When signaled, this will invoke Get Exposure Control Type Override" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetExposureControlTypeOverride is invoked" + "tooltip": "Signaled after Get Exposure Control Type Override is invoked" }, "details": { - "name": "GetExposureControlTypeOverride" + "name": "Get Exposure Control Type Override" }, "results": [ { @@ -144,14 +145,14 @@ "base": "GetHeatmapEnabled", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetHeatmapEnabled" + "tooltip": "When signaled, this will invoke Get Heatmap Enabled" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetHeatmapEnabled is invoked" + "tooltip": "Signaled after Get Heatmap Enabled is invoked" }, "details": { - "name": "GetHeatmapEnabled" + "name": "Get Heatmap Enabled" }, "results": [ { @@ -166,14 +167,14 @@ "base": "SetEyeAdaptationSpeedUpOverride", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetEyeAdaptationSpeedUpOverride" + "tooltip": "When signaled, this will invoke Set Eye Adaptation Speed Up Override" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetEyeAdaptationSpeedUpOverride is invoked" + "tooltip": "Signaled after Set Eye Adaptation Speed Up Override is invoked" }, "details": { - "name": "SetEyeAdaptationSpeedUpOverride" + "name": "Set Eye Adaptation Speed Up Override" }, "params": [ { @@ -188,14 +189,14 @@ "base": "SetExposureControlType", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetExposureControlType" + "tooltip": "When signaled, this will invoke Set Exposure Control Type" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetExposureControlType is invoked" + "tooltip": "Signaled after Set Exposure Control Type is invoked" }, "details": { - "name": "SetExposureControlType" + "name": "Set Exposure Control Type" }, "params": [ { @@ -210,14 +211,14 @@ "base": "SetEnabled", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetEnabled" + "tooltip": "When signaled, this will invoke Set Enabled" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetEnabled is invoked" + "tooltip": "Signaled after Set Enabled is invoked" }, "details": { - "name": "SetEnabled" + "name": "Set Enabled" }, "params": [ { @@ -232,14 +233,14 @@ "base": "GetExposureControlType", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetExposureControlType" + "tooltip": "When signaled, this will invoke Get Exposure Control Type" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetExposureControlType is invoked" + "tooltip": "Signaled after Get Exposure Control Type is invoked" }, "details": { - "name": "GetExposureControlType" + "name": "Get Exposure Control Type" }, "results": [ { @@ -254,14 +255,14 @@ "base": "SetEyeAdaptationExposureMax", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetEyeAdaptationExposureMax" + "tooltip": "When signaled, this will invoke Set Eye Adaptation Exposure Max" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetEyeAdaptationExposureMax is invoked" + "tooltip": "Signaled after Set Eye Adaptation Exposure Max is invoked" }, "details": { - "name": "SetEyeAdaptationExposureMax" + "name": "Set Eye Adaptation Exposure Max" }, "params": [ { @@ -276,14 +277,14 @@ "base": "GetEyeAdaptationSpeedDownOverride", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetEyeAdaptationSpeedDownOverride" + "tooltip": "When signaled, this will invoke Get Eye Adaptation Speed Down Override" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetEyeAdaptationSpeedDownOverride is invoked" + "tooltip": "Signaled after Get Eye Adaptation Speed Down Override is invoked" }, "details": { - "name": "GetEyeAdaptationSpeedDownOverride" + "name": "Get Eye Adaptation Speed Down Override" }, "results": [ { @@ -298,14 +299,14 @@ "base": "GetManualCompensationOverride", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetManualCompensationOverride" + "tooltip": "When signaled, this will invoke Get Manual Compensation Override" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetManualCompensationOverride is invoked" + "tooltip": "Signaled after Get Manual Compensation Override is invoked" }, "details": { - "name": "GetManualCompensationOverride" + "name": "Get Manual Compensation Override" }, "results": [ { @@ -320,14 +321,14 @@ "base": "GetHeatmapEnabledOverride", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetHeatmapEnabledOverride" + "tooltip": "When signaled, this will invoke Get Heatmap Enabled Override" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetHeatmapEnabledOverride is invoked" + "tooltip": "Signaled after Get Heatmap Enabled Override is invoked" }, "details": { - "name": "GetHeatmapEnabledOverride" + "name": "Get Heatmap Enabled Override" }, "results": [ { @@ -342,14 +343,14 @@ "base": "SetEyeAdaptationSpeedUp", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetEyeAdaptationSpeedUp" + "tooltip": "When signaled, this will invoke Set Eye Adaptation Speed Up" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetEyeAdaptationSpeedUp is invoked" + "tooltip": "Signaled after Set Eye Adaptation Speed Up is invoked" }, "details": { - "name": "SetEyeAdaptationSpeedUp" + "name": "Set Eye Adaptation Speed Up" }, "params": [ { @@ -364,14 +365,14 @@ "base": "GetEyeAdaptationSpeedUpOverride", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetEyeAdaptationSpeedUpOverride" + "tooltip": "When signaled, this will invoke Get Eye Adaptation Speed Up Override" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetEyeAdaptationSpeedUpOverride is invoked" + "tooltip": "Signaled after Get Eye Adaptation Speed Up Override is invoked" }, "details": { - "name": "GetEyeAdaptationSpeedUpOverride" + "name": "Get Eye Adaptation Speed Up Override" }, "results": [ { @@ -386,14 +387,14 @@ "base": "GetEyeAdaptationExposureMinOverride", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetEyeAdaptationExposureMinOverride" + "tooltip": "When signaled, this will invoke Get Eye Adaptation Exposure Min Override" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetEyeAdaptationExposureMinOverride is invoked" + "tooltip": "Signaled after Get Eye Adaptation Exposure Min Override is invoked" }, "details": { - "name": "GetEyeAdaptationExposureMinOverride" + "name": "Get Eye Adaptation Exposure Min Override" }, "results": [ { @@ -408,14 +409,14 @@ "base": "GetEyeAdaptationExposureMaxOverride", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetEyeAdaptationExposureMaxOverride" + "tooltip": "When signaled, this will invoke Get Eye Adaptation Exposure Max Override" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetEyeAdaptationExposureMaxOverride is invoked" + "tooltip": "Signaled after Get Eye Adaptation Exposure Max Override is invoked" }, "details": { - "name": "GetEyeAdaptationExposureMaxOverride" + "name": "Get Eye Adaptation Exposure Max Override" }, "results": [ { @@ -430,14 +431,14 @@ "base": "GetEnabledOverride", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetEnabledOverride" + "tooltip": "When signaled, this will invoke Get Enabled Override" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetEnabledOverride is invoked" + "tooltip": "Signaled after Get Enabled Override is invoked" }, "details": { - "name": "GetEnabledOverride" + "name": "Get Enabled Override" }, "results": [ { @@ -452,14 +453,14 @@ "base": "SetExposureControlTypeOverride", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetExposureControlTypeOverride" + "tooltip": "When signaled, this will invoke Set Exposure Control Type Override" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetExposureControlTypeOverride is invoked" + "tooltip": "Signaled after Set Exposure Control Type Override is invoked" }, "details": { - "name": "SetExposureControlTypeOverride" + "name": "Set Exposure Control Type Override" }, "params": [ { @@ -474,14 +475,14 @@ "base": "GetEyeAdaptationExposureMin", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetEyeAdaptationExposureMin" + "tooltip": "When signaled, this will invoke Get Eye Adaptation Exposure Min" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetEyeAdaptationExposureMin is invoked" + "tooltip": "Signaled after Get Eye Adaptation Exposure Min is invoked" }, "details": { - "name": "GetEyeAdaptationExposureMin" + "name": "Get Eye Adaptation Exposure Min" }, "results": [ { @@ -496,14 +497,14 @@ "base": "GetManualCompensation", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetManualCompensation" + "tooltip": "When signaled, this will invoke Get Manual Compensation" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetManualCompensation is invoked" + "tooltip": "Signaled after Get Manual Compensation is invoked" }, "details": { - "name": "GetManualCompensation" + "name": "Get Manual Compensation" }, "results": [ { @@ -518,14 +519,14 @@ "base": "SetEyeAdaptationExposureMinOverride", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetEyeAdaptationExposureMinOverride" + "tooltip": "When signaled, this will invoke Set Eye Adaptation Exposure Min Override" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetEyeAdaptationExposureMinOverride is invoked" + "tooltip": "Signaled after Set Eye Adaptation Exposure Min Override is invoked" }, "details": { - "name": "SetEyeAdaptationExposureMinOverride" + "name": "Set Eye Adaptation Exposure Min Override" }, "params": [ { @@ -540,14 +541,14 @@ "base": "SetManualCompensationOverride", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetManualCompensationOverride" + "tooltip": "When signaled, this will invoke Set Manual Compensation Override" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetManualCompensationOverride is invoked" + "tooltip": "Signaled after Set Manual Compensation Override is invoked" }, "details": { - "name": "SetManualCompensationOverride" + "name": "Set Manual Compensation Override" }, "params": [ { @@ -562,14 +563,14 @@ "base": "GetEyeAdaptationSpeedDown", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetEyeAdaptationSpeedDown" + "tooltip": "When signaled, this will invoke Get Eye Adaptation Speed Down" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetEyeAdaptationSpeedDown is invoked" + "tooltip": "Signaled after Get Eye Adaptation Speed Down is invoked" }, "details": { - "name": "GetEyeAdaptationSpeedDown" + "name": "Get Eye Adaptation Speed Down" }, "results": [ { @@ -584,14 +585,14 @@ "base": "GetEyeAdaptationSpeedUp", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetEyeAdaptationSpeedUp" + "tooltip": "When signaled, this will invoke Get Eye Adaptation Speed Up" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetEyeAdaptationSpeedUp is invoked" + "tooltip": "Signaled after Get Eye Adaptation Speed Up is invoked" }, "details": { - "name": "GetEyeAdaptationSpeedUp" + "name": "Get Eye Adaptation Speed Up" }, "results": [ { @@ -606,14 +607,14 @@ "base": "SetEyeAdaptationExposureMin", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetEyeAdaptationExposureMin" + "tooltip": "When signaled, this will invoke Set Eye Adaptation Exposure Min" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetEyeAdaptationExposureMin is invoked" + "tooltip": "Signaled after Set Eye Adaptation Exposure Min is invoked" }, "details": { - "name": "SetEyeAdaptationExposureMin" + "name": "Set Eye Adaptation Exposure Min" }, "params": [ { @@ -628,14 +629,14 @@ "base": "SetHeatmapEnabled", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetHeatmapEnabled" + "tooltip": "When signaled, this will invoke Set Heatmap Enabled" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetHeatmapEnabled is invoked" + "tooltip": "Signaled after Set Heatmap Enabled is invoked" }, "details": { - "name": "SetHeatmapEnabled" + "name": "Set Heatmap Enabled" }, "params": [ { @@ -650,14 +651,14 @@ "base": "SetEyeAdaptationExposureMaxOverride", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetEyeAdaptationExposureMaxOverride" + "tooltip": "When signaled, this will invoke Set Eye Adaptation Exposure Max Override" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetEyeAdaptationExposureMaxOverride is invoked" + "tooltip": "Signaled after Set Eye Adaptation Exposure Max Override is invoked" }, "details": { - "name": "SetEyeAdaptationExposureMaxOverride" + "name": "Set Eye Adaptation Exposure Max Override" }, "params": [ { @@ -672,14 +673,14 @@ "base": "GetEyeAdaptationExposureMax", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetEyeAdaptationExposureMax" + "tooltip": "When signaled, this will invoke Get Eye Adaptation Exposure Max" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetEyeAdaptationExposureMax is invoked" + "tooltip": "Signaled after Get Eye Adaptation Exposure Max is invoked" }, "details": { - "name": "GetEyeAdaptationExposureMax" + "name": "Get Eye Adaptation Exposure Max" }, "results": [ { @@ -694,14 +695,14 @@ "base": "SetHeatmapEnabledOverride", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetHeatmapEnabledOverride" + "tooltip": "When signaled, this will invoke Set Heatmap Enabled Override" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetHeatmapEnabledOverride is invoked" + "tooltip": "Signaled after Set Heatmap Enabled Override is invoked" }, "details": { - "name": "SetHeatmapEnabledOverride" + "name": "Set Heatmap Enabled Override" }, "params": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/GradientRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/GradientRequestBus.names index 6751b81944..35aa9d5795 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/GradientRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/GradientRequestBus.names @@ -5,21 +5,22 @@ "context": "EBusSender", "variant": "", "details": { - "name": "Gradient" + "name": "Gradient", + "category": "Rendering" }, "methods": [ { "base": "GetValue", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetValue" + "tooltip": "When signaled, this will invoke Get Value" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetValue is invoked" + "tooltip": "Signaled after Get Value is invoked" }, "details": { - "name": "GetValue" + "name": "Get Value" }, "params": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/GridComponentRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/GridComponentRequestBus.names index 85993ff1db..7e810b515b 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/GridComponentRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/GridComponentRequestBus.names @@ -5,21 +5,22 @@ "context": "EBusSender", "variant": "", "details": { - "name": "Grid Component" + "name": "Grid Component", + "category": "Rendering" }, "methods": [ { "base": "SetSecondaryColor", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetSecondaryColor" + "tooltip": "When signaled, this will invoke Set Secondary Color" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetSecondaryColor is invoked" + "tooltip": "Signaled after Set Secondary Color is invoked" }, "details": { - "name": "SetSecondaryColor" + "name": "Set Secondary Color" }, "params": [ { @@ -34,14 +35,14 @@ "base": "GetPrimarySpacing", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetPrimarySpacing" + "tooltip": "When signaled, this will invoke Get Primary Spacing" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetPrimarySpacing is invoked" + "tooltip": "Signaled after Get Primary Spacing is invoked" }, "details": { - "name": "GetPrimarySpacing" + "name": "Get Primary Spacing" }, "results": [ { @@ -56,14 +57,14 @@ "base": "GetSecondaryColor", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetSecondaryColor" + "tooltip": "When signaled, this will invoke Get Secondary Color" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetSecondaryColor is invoked" + "tooltip": "Signaled after Get Secondary Color is invoked" }, "details": { - "name": "GetSecondaryColor" + "name": "Get Secondary Color" }, "results": [ { @@ -78,14 +79,14 @@ "base": "SetAxisColor", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetAxisColor" + "tooltip": "When signaled, this will invoke Set Axis Color" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetAxisColor is invoked" + "tooltip": "Signaled after Set Axis Color is invoked" }, "details": { - "name": "SetAxisColor" + "name": "Set Axis Color" }, "params": [ { @@ -100,14 +101,14 @@ "base": "SetPrimaryColor", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetPrimaryColor" + "tooltip": "When signaled, this will invoke Set Primary Color" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetPrimaryColor is invoked" + "tooltip": "Signaled after Set Primary Color is invoked" }, "details": { - "name": "SetPrimaryColor" + "name": "Set Primary Color" }, "params": [ { @@ -122,14 +123,14 @@ "base": "GetAxisColor", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetAxisColor" + "tooltip": "When signaled, this will invoke Get Axis Color" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetAxisColor is invoked" + "tooltip": "Signaled after Get Axis Color is invoked" }, "details": { - "name": "GetAxisColor" + "name": "Get Axis Color" }, "results": [ { @@ -144,14 +145,14 @@ "base": "SetPrimarySpacing", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetPrimarySpacing" + "tooltip": "When signaled, this will invoke Set Primary Spacing" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetPrimarySpacing is invoked" + "tooltip": "Signaled after Set Primary Spacing is invoked" }, "details": { - "name": "SetPrimarySpacing" + "name": "Set Primary Spacing" }, "params": [ { @@ -166,14 +167,14 @@ "base": "GetSecondarySpacing", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetSecondarySpacing" + "tooltip": "When signaled, this will invoke Get Secondary Spacing" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetSecondarySpacing is invoked" + "tooltip": "Signaled after Get Secondary Spacing is invoked" }, "details": { - "name": "GetSecondarySpacing" + "name": "Get Secondary Spacing" }, "results": [ { @@ -188,14 +189,14 @@ "base": "SetSecondarySpacing", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetSecondarySpacing" + "tooltip": "When signaled, this will invoke Set Secondary Spacing" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetSecondarySpacing is invoked" + "tooltip": "Signaled after Set Secondary Spacing is invoked" }, "details": { - "name": "SetSecondarySpacing" + "name": "Set Secondary Spacing" }, "params": [ { @@ -210,14 +211,14 @@ "base": "SetSize", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetSize" + "tooltip": "When signaled, this will invoke Set Size" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetSize is invoked" + "tooltip": "Signaled after Set Size is invoked" }, "details": { - "name": "SetSize" + "name": "Set Size" }, "params": [ { @@ -232,14 +233,14 @@ "base": "GetSize", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetSize" + "tooltip": "When signaled, this will invoke Get Size" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetSize is invoked" + "tooltip": "Signaled after Get Size is invoked" }, "details": { - "name": "GetSize" + "name": "Get Size" }, "results": [ { @@ -254,14 +255,14 @@ "base": "GetPrimaryColor", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetPrimaryColor" + "tooltip": "When signaled, this will invoke Get Primary Color" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetPrimaryColor is invoked" + "tooltip": "Signaled after Get Primary Color is invoked" }, "details": { - "name": "GetPrimaryColor" + "name": "Get Primary Color" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/HDRColorGradingRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/HDRColorGradingRequestBus.names index 3bf191d24a..febfae7fc5 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/HDRColorGradingRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/HDRColorGradingRequestBus.names @@ -5,71 +5,28 @@ "context": "EBusSender", "variant": "", "details": { - "name": "HDR Color Grading" + "name": "HDR Color Grading", + "category": "Rendering" }, "methods": [ - { - "base": "SetCustomMinExposure", - "entry": { - "name": "In", - "tooltip": "When signaled, this will invoke SetCustomMinExposure" - }, - "exit": { - "name": "Out", - "tooltip": "Signaled after SetCustomMinExposure is invoked" - }, - "details": { - "name": "SetCustomMinExposure" - }, - "params": [ - { - "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", - "details": { - "name": "float" - } - } - ] - }, - { - "base": "GetFinalAdjustmentWeight", - "entry": { - "name": "In", - "tooltip": "When signaled, this will invoke GetFinalAdjustmentWeight" - }, - "exit": { - "name": "Out", - "tooltip": "Signaled after GetFinalAdjustmentWeight is invoked" - }, - "details": { - "name": "GetFinalAdjustmentWeight" - }, - "results": [ - { - "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", - "details": { - "name": "float" - } - } - ] - }, { "base": "SetSmhHighlightsColor", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetSmhHighlightsColor" + "tooltip": "When signaled, this will invoke Set Smh Highlights Color" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetSmhHighlightsColor is invoked" + "tooltip": "Signaled after Set Smh Highlights Color is invoked" }, "details": { - "name": "SetSmhHighlightsColor" + "name": "Set Smh Highlights Color" }, "params": [ { "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}", "details": { - "name": "Vector3" + "name": "Vector 3" } } ] @@ -78,14 +35,14 @@ "base": "SetLutResolution", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetLutResolution" + "tooltip": "When signaled, this will invoke Set Lut Resolution" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetLutResolution is invoked" + "tooltip": "Signaled after Set Lut Resolution is invoked" }, "details": { - "name": "SetLutResolution" + "name": "Set Lut Resolution" }, "params": [ { @@ -100,20 +57,20 @@ "base": "GetSmhMidtonesColor", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetSmhMidtonesColor" + "tooltip": "When signaled, this will invoke Get Smh Midtones Color" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetSmhMidtonesColor is invoked" + "tooltip": "Signaled after Get Smh Midtones Color is invoked" }, "details": { - "name": "GetSmhMidtonesColor" + "name": "Get Smh Midtones Color" }, "results": [ { "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}", "details": { - "name": "Vector3" + "name": "Vector 3" } } ] @@ -122,14 +79,14 @@ "base": "GetSmhHighlightsEnd", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetSmhHighlightsEnd" + "tooltip": "When signaled, this will invoke Get Smh Highlights End" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetSmhHighlightsEnd is invoked" + "tooltip": "Signaled after Get Smh Highlights End is invoked" }, "details": { - "name": "GetSmhHighlightsEnd" + "name": "Get Smh Highlights End" }, "results": [ { @@ -144,14 +101,14 @@ "base": "GetCustomMinExposure", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetCustomMinExposure" + "tooltip": "When signaled, this will invoke Get Custom Min Exposure" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetCustomMinExposure is invoked" + "tooltip": "Signaled after Get Custom Min Exposure is invoked" }, "details": { - "name": "GetCustomMinExposure" + "name": "Get Custom Min Exposure" }, "results": [ { @@ -166,14 +123,14 @@ "base": "SetSmhHighlightsEnd", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetSmhHighlightsEnd" + "tooltip": "When signaled, this will invoke Set Smh Highlights End" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetSmhHighlightsEnd is invoked" + "tooltip": "Signaled after Set Smh Highlights End is invoked" }, "details": { - "name": "SetSmhHighlightsEnd" + "name": "Set Smh Highlights End" }, "params": [ { @@ -188,20 +145,20 @@ "base": "GetChannelMixingGreen", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetChannelMixingGreen" + "tooltip": "When signaled, this will invoke Get Channel Mixing Green" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetChannelMixingGreen is invoked" + "tooltip": "Signaled after Get Channel Mixing Green is invoked" }, "details": { - "name": "GetChannelMixingGreen" + "name": "Get Channel Mixing Green" }, "results": [ { "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}", "details": { - "name": "Vector3" + "name": "Vector 3" } } ] @@ -210,14 +167,14 @@ "base": "SetSmhShadowsEnd", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetSmhShadowsEnd" + "tooltip": "When signaled, this will invoke Set Smh Shadows End" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetSmhShadowsEnd is invoked" + "tooltip": "Signaled after Set Smh Shadows End is invoked" }, "details": { - "name": "SetSmhShadowsEnd" + "name": "Set Smh Shadows End" }, "params": [ { @@ -232,14 +189,14 @@ "base": "SetSmhWeight", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetSmhWeight" + "tooltip": "When signaled, this will invoke Set Smh Weight" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetSmhWeight is invoked" + "tooltip": "Signaled after Set Smh Weight is invoked" }, "details": { - "name": "SetSmhWeight" + "name": "Set Smh Weight" }, "params": [ { @@ -254,14 +211,14 @@ "base": "SetShaperPresetType", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetShaperPresetType" + "tooltip": "When signaled, this will invoke Set Shaper Preset Type" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetShaperPresetType is invoked" + "tooltip": "Signaled after Set Shaper Preset Type is invoked" }, "details": { - "name": "SetShaperPresetType" + "name": "Set Shaper Preset Type" }, "params": [ { @@ -276,14 +233,14 @@ "base": "GetShaperPresetType", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetShaperPresetType" + "tooltip": "When signaled, this will invoke Get Shaper Preset Type" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetShaperPresetType is invoked" + "tooltip": "Signaled after Get Shaper Preset Type is invoked" }, "details": { - "name": "GetShaperPresetType" + "name": "Get Shaper Preset Type" }, "results": [ { @@ -298,14 +255,14 @@ "base": "SetEnabled", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetEnabled" + "tooltip": "When signaled, this will invoke Set Enabled" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetEnabled is invoked" + "tooltip": "Signaled after Set Enabled is invoked" }, "details": { - "name": "SetEnabled" + "name": "Set Enabled" }, "params": [ { @@ -320,20 +277,20 @@ "base": "GetSmhShadowsColor", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetSmhShadowsColor" + "tooltip": "When signaled, this will invoke Get Smh Shadows Color" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetSmhShadowsColor is invoked" + "tooltip": "Signaled after Get Smh Shadows Color is invoked" }, "details": { - "name": "GetSmhShadowsColor" + "name": "Get Smh Shadows Color" }, "results": [ { "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}", "details": { - "name": "Vector3" + "name": "Vector 3" } } ] @@ -342,14 +299,14 @@ "base": "GetColorGradingPreSaturation", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetColorGradingPreSaturation" + "tooltip": "When signaled, this will invoke Get Color Grading Pre Saturation" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetColorGradingPreSaturation is invoked" + "tooltip": "Signaled after Get Color Grading Pre Saturation is invoked" }, "details": { - "name": "GetColorGradingPreSaturation" + "name": "Get Color Grading Pre Saturation" }, "results": [ { @@ -364,20 +321,20 @@ "base": "GetSplitToneHighlightsColor", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetSplitToneHighlightsColor" + "tooltip": "When signaled, this will invoke Get Split Tone Highlights Color" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetSplitToneHighlightsColor is invoked" + "tooltip": "Signaled after Get Split Tone Highlights Color is invoked" }, "details": { - "name": "GetSplitToneHighlightsColor" + "name": "Get Split Tone Highlights Color" }, "results": [ { "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}", "details": { - "name": "Vector3" + "name": "Vector 3" } } ] @@ -386,14 +343,14 @@ "base": "GetColorGradingHueShift", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetColorGradingHueShift" + "tooltip": "When signaled, this will invoke Get Color Grading Hue Shift" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetColorGradingHueShift is invoked" + "tooltip": "Signaled after Get Color Grading Hue Shift is invoked" }, "details": { - "name": "GetColorGradingHueShift" + "name": "Get Color Grading Hue Shift" }, "results": [ { @@ -408,14 +365,14 @@ "base": "SetColorGradingExposure", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetColorGradingExposure" + "tooltip": "When signaled, this will invoke Set Color Grading Exposure" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetColorGradingExposure is invoked" + "tooltip": "Signaled after Set Color Grading Exposure is invoked" }, "details": { - "name": "SetColorGradingExposure" + "name": "Set Color Grading Exposure" }, "params": [ { @@ -430,20 +387,20 @@ "base": "GetColorFilterSwatch", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetColorFilterSwatch" + "tooltip": "When signaled, this will invoke Get Color Filter Swatch" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetColorFilterSwatch is invoked" + "tooltip": "Signaled after Get Color Filter Swatch is invoked" }, "details": { - "name": "GetColorFilterSwatch" + "name": "Get Color Filter Swatch" }, "results": [ { "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}", "details": { - "name": "Vector3" + "name": "Vector 3" } } ] @@ -452,14 +409,14 @@ "base": "GetWhiteBalanceTint", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetWhiteBalanceTint" + "tooltip": "When signaled, this will invoke Get White Balance Tint" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetWhiteBalanceTint is invoked" + "tooltip": "Signaled after Get White Balance Tint is invoked" }, "details": { - "name": "GetWhiteBalanceTint" + "name": "Get White Balance Tint" }, "results": [ { @@ -474,14 +431,14 @@ "base": "GetColorGradingExposure", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetColorGradingExposure" + "tooltip": "When signaled, this will invoke Get Color Grading Exposure" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetColorGradingExposure is invoked" + "tooltip": "Signaled after Get Color Grading Exposure is invoked" }, "details": { - "name": "GetColorGradingExposure" + "name": "Get Color Grading Exposure" }, "results": [ { @@ -496,14 +453,14 @@ "base": "GetSmhWeight", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetSmhWeight" + "tooltip": "When signaled, this will invoke Get Smh Weight" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetSmhWeight is invoked" + "tooltip": "Signaled after Get Smh Weight is invoked" }, "details": { - "name": "GetSmhWeight" + "name": "Get Smh Weight" }, "results": [ { @@ -518,20 +475,20 @@ "base": "SetSmhMidtonesColor", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetSmhMidtonesColor" + "tooltip": "When signaled, this will invoke Set Smh Midtones Color" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetSmhMidtonesColor is invoked" + "tooltip": "Signaled after Set Smh Midtones Color is invoked" }, "details": { - "name": "SetSmhMidtonesColor" + "name": "Set Smh Midtones Color" }, "params": [ { "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}", "details": { - "name": "Vector3" + "name": "Vector 3" } } ] @@ -540,20 +497,20 @@ "base": "SetChannelMixingBlue", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetChannelMixingBlue" + "tooltip": "When signaled, this will invoke Set Channel Mixing Blue" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetChannelMixingBlue is invoked" + "tooltip": "Signaled after Set Channel Mixing Blue is invoked" }, "details": { - "name": "SetChannelMixingBlue" + "name": "Set Channel Mixing Blue" }, "params": [ { "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}", "details": { - "name": "Vector3" + "name": "Vector 3" } } ] @@ -562,14 +519,14 @@ "base": "GetGenerateLut", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetGenerateLut" + "tooltip": "When signaled, this will invoke Get Generate Lut" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetGenerateLut is invoked" + "tooltip": "Signaled after Get Generate Lut is invoked" }, "details": { - "name": "GetGenerateLut" + "name": "Get Generate Lut" }, "results": [ { @@ -584,14 +541,14 @@ "base": "SetSplitToneBalance", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetSplitToneBalance" + "tooltip": "When signaled, this will invoke Set Split Tone Balance" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetSplitToneBalance is invoked" + "tooltip": "Signaled after Set Split Tone Balance is invoked" }, "details": { - "name": "SetSplitToneBalance" + "name": "Set Split Tone Balance" }, "params": [ { @@ -606,14 +563,14 @@ "base": "GetLutResolution", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetLutResolution" + "tooltip": "When signaled, this will invoke Get Lut Resolution" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetLutResolution is invoked" + "tooltip": "Signaled after Get Lut Resolution is invoked" }, "details": { - "name": "GetLutResolution" + "name": "Get Lut Resolution" }, "results": [ { @@ -625,17 +582,83 @@ ] }, { - "base": "SetColorGradingContrast", + "base": "GetWhiteBalanceLuminancePreservation", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetColorGradingContrast" + "tooltip": "When signaled, this will invoke Get White Balance Luminance Preservation" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetColorGradingContrast is invoked" + "tooltip": "Signaled after Get White Balance Luminance Preservation is invoked" }, "details": { - "name": "SetColorGradingContrast" + "name": "Get White Balance Luminance Preservation" + }, + "results": [ + { + "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", + "details": { + "name": "float" + } + } + ] + }, + { + "base": "SetCustomMinExposure", + "entry": { + "name": "In", + "tooltip": "When signaled, this will invoke Set Custom Min Exposure" + }, + "exit": { + "name": "Out", + "tooltip": "Signaled after Set Custom Min Exposure is invoked" + }, + "details": { + "name": "Set Custom Min Exposure" + }, + "params": [ + { + "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", + "details": { + "name": "float" + } + } + ] + }, + { + "base": "GetFinalAdjustmentWeight", + "entry": { + "name": "In", + "tooltip": "When signaled, this will invoke Get Final Adjustment Weight" + }, + "exit": { + "name": "Out", + "tooltip": "Signaled after Get Final Adjustment Weight is invoked" + }, + "details": { + "name": "Get Final Adjustment Weight" + }, + "results": [ + { + "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", + "details": { + "name": "float" + } + } + ] + }, + { + "base": "SetColorGradingContrast", + "entry": { + "name": "In", + "tooltip": "When signaled, this will invoke Set Color Grading Contrast" + }, + "exit": { + "name": "Out", + "tooltip": "Signaled after Set Color Grading Contrast is invoked" + }, + "details": { + "name": "Set Color Grading Contrast" }, "params": [ { @@ -650,14 +673,14 @@ "base": "GetWhiteBalanceKelvin", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetWhiteBalanceKelvin" + "tooltip": "When signaled, this will invoke Get White Balance Kelvin" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetWhiteBalanceKelvin is invoked" + "tooltip": "Signaled after Get White Balance Kelvin is invoked" }, "details": { - "name": "GetWhiteBalanceKelvin" + "name": "Get White Balance Kelvin" }, "results": [ { @@ -672,20 +695,20 @@ "base": "SetSplitToneHighlightsColor", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetSplitToneHighlightsColor" + "tooltip": "When signaled, this will invoke Set Split Tone Highlights Color" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetSplitToneHighlightsColor is invoked" + "tooltip": "Signaled after Set Split Tone Highlights Color is invoked" }, "details": { - "name": "SetSplitToneHighlightsColor" + "name": "Set Split Tone Highlights Color" }, "params": [ { "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}", "details": { - "name": "Vector3" + "name": "Vector 3" } } ] @@ -694,14 +717,14 @@ "base": "GetSmhShadowsEnd", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetSmhShadowsEnd" + "tooltip": "When signaled, this will invoke Get Smh Shadows End" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetSmhShadowsEnd is invoked" + "tooltip": "Signaled after Get Smh Shadows End is invoked" }, "details": { - "name": "GetSmhShadowsEnd" + "name": "Get Smh Shadows End" }, "results": [ { @@ -716,14 +739,14 @@ "base": "SetSmhHighlightsStart", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetSmhHighlightsStart" + "tooltip": "When signaled, this will invoke Set Smh Highlights Start" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetSmhHighlightsStart is invoked" + "tooltip": "Signaled after Set Smh Highlights Start is invoked" }, "details": { - "name": "SetSmhHighlightsStart" + "name": "Set Smh Highlights Start" }, "params": [ { @@ -738,20 +761,20 @@ "base": "SetColorFilterSwatch", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetColorFilterSwatch" + "tooltip": "When signaled, this will invoke Set Color Filter Swatch" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetColorFilterSwatch is invoked" + "tooltip": "Signaled after Set Color Filter Swatch is invoked" }, "details": { - "name": "SetColorFilterSwatch" + "name": "Set Color Filter Swatch" }, "params": [ { "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}", "details": { - "name": "Vector3" + "name": "Vector 3" } } ] @@ -760,14 +783,14 @@ "base": "GetColorGradingFilterIntensity", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetColorGradingFilterIntensity" + "tooltip": "When signaled, this will invoke Get Color Grading Filter Intensity" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetColorGradingFilterIntensity is invoked" + "tooltip": "Signaled after Get Color Grading Filter Intensity is invoked" }, "details": { - "name": "GetColorGradingFilterIntensity" + "name": "Get Color Grading Filter Intensity" }, "results": [ { @@ -782,14 +805,14 @@ "base": "SetWhiteBalanceWeight", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetWhiteBalanceWeight" + "tooltip": "When signaled, this will invoke Set White Balance Weight" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetWhiteBalanceWeight is invoked" + "tooltip": "Signaled after Set White Balance Weight is invoked" }, "details": { - "name": "SetWhiteBalanceWeight" + "name": "Set White Balance Weight" }, "params": [ { @@ -804,14 +827,14 @@ "base": "SetSmhShadowsStart", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetSmhShadowsStart" + "tooltip": "When signaled, this will invoke Set Smh Shadows Start" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetSmhShadowsStart is invoked" + "tooltip": "Signaled after Set Smh Shadows Start is invoked" }, "details": { - "name": "SetSmhShadowsStart" + "name": "Set Smh Shadows Start" }, "params": [ { @@ -826,20 +849,20 @@ "base": "GetChannelMixingRed", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetChannelMixingRed" + "tooltip": "When signaled, this will invoke Get Channel Mixing Red" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetChannelMixingRed is invoked" + "tooltip": "Signaled after Get Channel Mixing Red is invoked" }, "details": { - "name": "GetChannelMixingRed" + "name": "Get Channel Mixing Red" }, "results": [ { "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}", "details": { - "name": "Vector3" + "name": "Vector 3" } } ] @@ -848,14 +871,14 @@ "base": "GetColorGradingFilterMultiply", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetColorGradingFilterMultiply" + "tooltip": "When signaled, this will invoke Get Color Grading Filter Multiply" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetColorGradingFilterMultiply is invoked" + "tooltip": "Signaled after Get Color Grading Filter Multiply is invoked" }, "details": { - "name": "GetColorGradingFilterMultiply" + "name": "Get Color Grading Filter Multiply" }, "results": [ { @@ -870,14 +893,36 @@ "base": "SetColorGradingFilterMultiply", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetColorGradingFilterMultiply" + "tooltip": "When signaled, this will invoke Set Color Grading Filter Multiply" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetColorGradingFilterMultiply is invoked" + "tooltip": "Signaled after Set Color Grading Filter Multiply is invoked" }, "details": { - "name": "SetColorGradingFilterMultiply" + "name": "Set Color Grading Filter Multiply" + }, + "params": [ + { + "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", + "details": { + "name": "float" + } + } + ] + }, + { + "base": "SetSplitToneWeight", + "entry": { + "name": "In", + "tooltip": "When signaled, this will invoke Set Split Tone Weight" + }, + "exit": { + "name": "Out", + "tooltip": "Signaled after Set Split Tone Weight is invoked" + }, + "details": { + "name": "Set Split Tone Weight" }, "params": [ { @@ -892,42 +937,20 @@ "base": "SetSplitToneShadowsColor", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetSplitToneShadowsColor" + "tooltip": "When signaled, this will invoke Set Split Tone Shadows Color" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetSplitToneShadowsColor is invoked" + "tooltip": "Signaled after Set Split Tone Shadows Color is invoked" }, "details": { - "name": "SetSplitToneShadowsColor" + "name": "Set Split Tone Shadows Color" }, "params": [ { "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}", "details": { - "name": "Vector3" - } - } - ] - }, - { - "base": "SetSplitToneWeight", - "entry": { - "name": "In", - "tooltip": "When signaled, this will invoke SetSplitToneWeight" - }, - "exit": { - "name": "Out", - "tooltip": "Signaled after SetSplitToneWeight is invoked" - }, - "details": { - "name": "SetSplitToneWeight" - }, - "params": [ - { - "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", - "details": { - "name": "float" + "name": "Vector 3" } } ] @@ -936,20 +959,20 @@ "base": "GetSplitToneShadowsColor", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetSplitToneShadowsColor" + "tooltip": "When signaled, this will invoke Get Split Tone Shadows Color" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetSplitToneShadowsColor is invoked" + "tooltip": "Signaled after Get Split Tone Shadows Color is invoked" }, "details": { - "name": "GetSplitToneShadowsColor" + "name": "Get Split Tone Shadows Color" }, "results": [ { "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}", "details": { - "name": "Vector3" + "name": "Vector 3" } } ] @@ -958,14 +981,14 @@ "base": "GetSmhHighlightsStart", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetSmhHighlightsStart" + "tooltip": "When signaled, this will invoke Get Smh Highlights Start" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetSmhHighlightsStart is invoked" + "tooltip": "Signaled after Get Smh Highlights Start is invoked" }, "details": { - "name": "GetSmhHighlightsStart" + "name": "Get Smh Highlights Start" }, "results": [ { @@ -980,20 +1003,20 @@ "base": "SetChannelMixingRed", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetChannelMixingRed" + "tooltip": "When signaled, this will invoke Set Channel Mixing Red" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetChannelMixingRed is invoked" + "tooltip": "Signaled after Set Channel Mixing Red is invoked" }, "details": { - "name": "SetChannelMixingRed" + "name": "Set Channel Mixing Red" }, "params": [ { "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}", "details": { - "name": "Vector3" + "name": "Vector 3" } } ] @@ -1002,20 +1025,20 @@ "base": "SetChannelMixingGreen", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetChannelMixingGreen" + "tooltip": "When signaled, this will invoke Set Channel Mixing Green" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetChannelMixingGreen is invoked" + "tooltip": "Signaled after Set Channel Mixing Green is invoked" }, "details": { - "name": "SetChannelMixingGreen" + "name": "Set Channel Mixing Green" }, "params": [ { "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}", "details": { - "name": "Vector3" + "name": "Vector 3" } } ] @@ -1024,14 +1047,14 @@ "base": "SetColorGradingFilterIntensity", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetColorGradingFilterIntensity" + "tooltip": "When signaled, this will invoke Set Color Grading Filter Intensity" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetColorGradingFilterIntensity is invoked" + "tooltip": "Signaled after Set Color Grading Filter Intensity is invoked" }, "details": { - "name": "SetColorGradingFilterIntensity" + "name": "Set Color Grading Filter Intensity" }, "params": [ { @@ -1046,14 +1069,14 @@ "base": "SetGenerateLut", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetGenerateLut" + "tooltip": "When signaled, this will invoke Set Generate Lut" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetGenerateLut is invoked" + "tooltip": "Signaled after Set Generate Lut is invoked" }, "details": { - "name": "SetGenerateLut" + "name": "Set Generate Lut" }, "params": [ { @@ -1068,14 +1091,14 @@ "base": "SetColorAdjustmentWeight", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetColorAdjustmentWeight" + "tooltip": "When signaled, this will invoke Set Color Adjustment Weight" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetColorAdjustmentWeight is invoked" + "tooltip": "Signaled after Set Color Adjustment Weight is invoked" }, "details": { - "name": "SetColorAdjustmentWeight" + "name": "Set Color Adjustment Weight" }, "params": [ { @@ -1090,14 +1113,14 @@ "base": "GetSmhShadowsStart", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetSmhShadowsStart" + "tooltip": "When signaled, this will invoke Get Smh Shadows Start" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetSmhShadowsStart is invoked" + "tooltip": "Signaled after Get Smh Shadows Start is invoked" }, "details": { - "name": "GetSmhShadowsStart" + "name": "Get Smh Shadows Start" }, "results": [ { @@ -1112,20 +1135,20 @@ "base": "SetSmhShadowsColor", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetSmhShadowsColor" + "tooltip": "When signaled, this will invoke Set Smh Shadows Color" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetSmhShadowsColor is invoked" + "tooltip": "Signaled after Set Smh Shadows Color is invoked" }, "details": { - "name": "SetSmhShadowsColor" + "name": "Set Smh Shadows Color" }, "params": [ { "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}", "details": { - "name": "Vector3" + "name": "Vector 3" } } ] @@ -1134,14 +1157,14 @@ "base": "SetFinalAdjustmentWeight", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetFinalAdjustmentWeight" + "tooltip": "When signaled, this will invoke Set Final Adjustment Weight" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetFinalAdjustmentWeight is invoked" + "tooltip": "Signaled after Set Final Adjustment Weight is invoked" }, "details": { - "name": "SetFinalAdjustmentWeight" + "name": "Set Final Adjustment Weight" }, "params": [ { @@ -1156,14 +1179,14 @@ "base": "GetColorGradingPostSaturation", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetColorGradingPostSaturation" + "tooltip": "When signaled, this will invoke Get Color Grading Post Saturation" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetColorGradingPostSaturation is invoked" + "tooltip": "Signaled after Get Color Grading Post Saturation is invoked" }, "details": { - "name": "GetColorGradingPostSaturation" + "name": "Get Color Grading Post Saturation" }, "results": [ { @@ -1178,14 +1201,14 @@ "base": "SetColorGradingPreSaturation", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetColorGradingPreSaturation" + "tooltip": "When signaled, this will invoke Set Color Grading Pre Saturation" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetColorGradingPreSaturation is invoked" + "tooltip": "Signaled after Set Color Grading Pre Saturation is invoked" }, "details": { - "name": "SetColorGradingPreSaturation" + "name": "Set Color Grading Pre Saturation" }, "params": [ { @@ -1200,14 +1223,14 @@ "base": "SetColorGradingHueShift", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetColorGradingHueShift" + "tooltip": "When signaled, this will invoke Set Color Grading Hue Shift" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetColorGradingHueShift is invoked" + "tooltip": "Signaled after Set Color Grading Hue Shift is invoked" }, "details": { - "name": "SetColorGradingHueShift" + "name": "Set Color Grading Hue Shift" }, "params": [ { @@ -1218,84 +1241,18 @@ } ] }, - { - "base": "GetSplitToneBalance", - "entry": { - "name": "In", - "tooltip": "When signaled, this will invoke GetSplitToneBalance" - }, - "exit": { - "name": "Out", - "tooltip": "Signaled after GetSplitToneBalance is invoked" - }, - "details": { - "name": "GetSplitToneBalance" - }, - "results": [ - { - "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", - "details": { - "name": "float" - } - } - ] - }, - { - "base": "GetColorAdjustmentWeight", - "entry": { - "name": "In", - "tooltip": "When signaled, this will invoke GetColorAdjustmentWeight" - }, - "exit": { - "name": "Out", - "tooltip": "Signaled after GetColorAdjustmentWeight is invoked" - }, - "details": { - "name": "GetColorAdjustmentWeight" - }, - "results": [ - { - "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", - "details": { - "name": "float" - } - } - ] - }, - { - "base": "GetSmhHighlightsColor", - "entry": { - "name": "In", - "tooltip": "When signaled, this will invoke GetSmhHighlightsColor" - }, - "exit": { - "name": "Out", - "tooltip": "Signaled after GetSmhHighlightsColor is invoked" - }, - "details": { - "name": "GetSmhHighlightsColor" - }, - "results": [ - { - "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}", - "details": { - "name": "Vector3" - } - } - ] - }, { "base": "GetSplitToneWeight", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetSplitToneWeight" + "tooltip": "When signaled, this will invoke Get Split Tone Weight" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetSplitToneWeight is invoked" + "tooltip": "Signaled after Get Split Tone Weight is invoked" }, "details": { - "name": "GetSplitToneWeight" + "name": "Get Split Tone Weight" }, "results": [ { @@ -1310,14 +1267,14 @@ "base": "SetColorGradingPostSaturation", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetColorGradingPostSaturation" + "tooltip": "When signaled, this will invoke Set Color Grading Post Saturation" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetColorGradingPostSaturation is invoked" + "tooltip": "Signaled after Set Color Grading Post Saturation is invoked" }, "details": { - "name": "SetColorGradingPostSaturation" + "name": "Set Color Grading Post Saturation" }, "params": [ { @@ -1329,17 +1286,105 @@ ] }, { - "base": "SetWhiteBalanceKelvin", + "base": "SetWhiteBalanceLuminancePreservation", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetWhiteBalanceKelvin" + "tooltip": "When signaled, this will invoke Set White Balance Luminance Preservation" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetWhiteBalanceKelvin is invoked" + "tooltip": "Signaled after Set White Balance Luminance Preservation is invoked" }, "details": { - "name": "SetWhiteBalanceKelvin" + "name": "Set White Balance Luminance Preservation" + }, + "params": [ + { + "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", + "details": { + "name": "float" + } + } + ] + }, + { + "base": "GetColorAdjustmentWeight", + "entry": { + "name": "In", + "tooltip": "When signaled, this will invoke Get Color Adjustment Weight" + }, + "exit": { + "name": "Out", + "tooltip": "Signaled after Get Color Adjustment Weight is invoked" + }, + "details": { + "name": "Get Color Adjustment Weight" + }, + "results": [ + { + "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", + "details": { + "name": "float" + } + } + ] + }, + { + "base": "GetSplitToneBalance", + "entry": { + "name": "In", + "tooltip": "When signaled, this will invoke Get Split Tone Balance" + }, + "exit": { + "name": "Out", + "tooltip": "Signaled after Get Split Tone Balance is invoked" + }, + "details": { + "name": "Get Split Tone Balance" + }, + "results": [ + { + "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", + "details": { + "name": "float" + } + } + ] + }, + { + "base": "GetSmhHighlightsColor", + "entry": { + "name": "In", + "tooltip": "When signaled, this will invoke Get Smh Highlights Color" + }, + "exit": { + "name": "Out", + "tooltip": "Signaled after Get Smh Highlights Color is invoked" + }, + "details": { + "name": "Get Smh Highlights Color" + }, + "results": [ + { + "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}", + "details": { + "name": "Vector 3" + } + } + ] + }, + { + "base": "SetWhiteBalanceKelvin", + "entry": { + "name": "In", + "tooltip": "When signaled, this will invoke Set White Balance Kelvin" + }, + "exit": { + "name": "Out", + "tooltip": "Signaled after Set White Balance Kelvin is invoked" + }, + "details": { + "name": "Set White Balance Kelvin" }, "params": [ { @@ -1354,14 +1399,14 @@ "base": "GetWhiteBalanceWeight", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetWhiteBalanceWeight" + "tooltip": "When signaled, this will invoke Get White Balance Weight" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetWhiteBalanceWeight is invoked" + "tooltip": "Signaled after Get White Balance Weight is invoked" }, "details": { - "name": "GetWhiteBalanceWeight" + "name": "Get White Balance Weight" }, "results": [ { @@ -1376,14 +1421,14 @@ "base": "GetColorGradingContrast", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetColorGradingContrast" + "tooltip": "When signaled, this will invoke Get Color Grading Contrast" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetColorGradingContrast is invoked" + "tooltip": "Signaled after Get Color Grading Contrast is invoked" }, "details": { - "name": "GetColorGradingContrast" + "name": "Get Color Grading Contrast" }, "results": [ { @@ -1398,14 +1443,14 @@ "base": "GetEnabled", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetEnabled" + "tooltip": "When signaled, this will invoke Get Enabled" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetEnabled is invoked" + "tooltip": "Signaled after Get Enabled is invoked" }, "details": { - "name": "GetEnabled" + "name": "Get Enabled" }, "results": [ { @@ -1420,14 +1465,14 @@ "base": "GetCustomMaxExposure", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetCustomMaxExposure" + "tooltip": "When signaled, this will invoke Get Custom Max Exposure" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetCustomMaxExposure is invoked" + "tooltip": "Signaled after Get Custom Max Exposure is invoked" }, "details": { - "name": "GetCustomMaxExposure" + "name": "Get Custom Max Exposure" }, "results": [ { @@ -1442,14 +1487,14 @@ "base": "SetWhiteBalanceTint", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetWhiteBalanceTint" + "tooltip": "When signaled, this will invoke Set White Balance Tint" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetWhiteBalanceTint is invoked" + "tooltip": "Signaled after Set White Balance Tint is invoked" }, "details": { - "name": "SetWhiteBalanceTint" + "name": "Set White Balance Tint" }, "params": [ { @@ -1464,20 +1509,20 @@ "base": "GetChannelMixingBlue", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetChannelMixingBlue" + "tooltip": "When signaled, this will invoke Get Channel Mixing Blue" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetChannelMixingBlue is invoked" + "tooltip": "Signaled after Get Channel Mixing Blue is invoked" }, "details": { - "name": "GetChannelMixingBlue" + "name": "Get Channel Mixing Blue" }, "results": [ { "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}", "details": { - "name": "Vector3" + "name": "Vector 3" } } ] @@ -1486,14 +1531,14 @@ "base": "SetCustomMaxExposure", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetCustomMaxExposure" + "tooltip": "When signaled, this will invoke Set Custom Max Exposure" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetCustomMaxExposure is invoked" + "tooltip": "Signaled after Set Custom Max Exposure is invoked" }, "details": { - "name": "SetCustomMaxExposure" + "name": "Set Custom Max Exposure" }, "params": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/HDRiSkyboxRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/HDRiSkyboxRequestBus.names index 84e56d7f0b..588785965f 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/HDRiSkyboxRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/HDRiSkyboxRequestBus.names @@ -5,7 +5,8 @@ "context": "EBusSender", "variant": "", "details": { - "name": "HDRi Skybox" + "name": "HDRi Skybox", + "category": "Rendering" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ImageBasedLightComponentRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ImageBasedLightComponentRequestBus.names index 8d2c8b6c9a..f01c273236 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ImageBasedLightComponentRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/ImageBasedLightComponentRequestBus.names @@ -5,27 +5,28 @@ "context": "EBusSender", "variant": "", "details": { - "name": "Image Based Light Component" + "name": "Image Based Light Component", + "category": "Rendering" }, "methods": [ { "base": "GetDiffuseImageAssetId", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetDiffuseImageAssetId" + "tooltip": "When signaled, this will invoke Get Diffuse Image Asset Id" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetDiffuseImageAssetId is invoked" + "tooltip": "Signaled after Get Diffuse Image Asset Id is invoked" }, "details": { - "name": "GetDiffuseImageAssetId" + "name": "Get Diffuse Image Asset Id" }, "results": [ { "typeid": "{652ED536-3402-439B-AEBE-4A5DBC554085}", "details": { - "name": "AssetId" + "name": "Asset Id" } } ] @@ -34,20 +35,20 @@ "base": "SetDiffuseImageAssetPath", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetDiffuseImageAssetPath" + "tooltip": "When signaled, this will invoke Set Diffuse Image Asset Path" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetDiffuseImageAssetPath is invoked" + "tooltip": "Signaled after Set Diffuse Image Asset Path is invoked" }, "details": { - "name": "SetDiffuseImageAssetPath" + "name": "Set Diffuse Image Asset Path" }, "params": [ { "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", "details": { - "name": "AZStd::string" + "name": "AZ Std::string" } } ] @@ -56,20 +57,20 @@ "base": "SetDiffuseImageAssetId", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetDiffuseImageAssetId" + "tooltip": "When signaled, this will invoke Set Diffuse Image Asset Id" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetDiffuseImageAssetId is invoked" + "tooltip": "Signaled after Set Diffuse Image Asset Id is invoked" }, "details": { - "name": "SetDiffuseImageAssetId" + "name": "Set Diffuse Image Asset Id" }, "params": [ { "typeid": "{652ED536-3402-439B-AEBE-4A5DBC554085}", "details": { - "name": "AssetId" + "name": "Asset Id" } } ] @@ -78,20 +79,20 @@ "base": "GetSpecularImageAssetId", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetSpecularImageAssetId" + "tooltip": "When signaled, this will invoke Get Specular Image Asset Id" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetSpecularImageAssetId is invoked" + "tooltip": "Signaled after Get Specular Image Asset Id is invoked" }, "details": { - "name": "GetSpecularImageAssetId" + "name": "Get Specular Image Asset Id" }, "results": [ { "typeid": "{652ED536-3402-439B-AEBE-4A5DBC554085}", "details": { - "name": "AssetId" + "name": "Asset Id" } } ] @@ -100,20 +101,20 @@ "base": "SetSpecularImageAssetPath", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetSpecularImageAssetPath" + "tooltip": "When signaled, this will invoke Set Specular Image Asset Path" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetSpecularImageAssetPath is invoked" + "tooltip": "Signaled after Set Specular Image Asset Path is invoked" }, "details": { - "name": "SetSpecularImageAssetPath" + "name": "Set Specular Image Asset Path" }, "params": [ { "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", "details": { - "name": "AZStd::string" + "name": "AZ Std::string" } } ] @@ -122,20 +123,20 @@ "base": "GetSpecularImageAssetPath", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetSpecularImageAssetPath" + "tooltip": "When signaled, this will invoke Get Specular Image Asset Path" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetSpecularImageAssetPath is invoked" + "tooltip": "Signaled after Get Specular Image Asset Path is invoked" }, "details": { - "name": "GetSpecularImageAssetPath" + "name": "Get Specular Image Asset Path" }, "results": [ { "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", "details": { - "name": "AZStd::string" + "name": "AZ Std::string" } } ] @@ -144,20 +145,20 @@ "base": "GetDiffuseImageAssetPath", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetDiffuseImageAssetPath" + "tooltip": "When signaled, this will invoke Get Diffuse Image Asset Path" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetDiffuseImageAssetPath is invoked" + "tooltip": "Signaled after Get Diffuse Image Asset Path is invoked" }, "details": { - "name": "GetDiffuseImageAssetPath" + "name": "Get Diffuse Image Asset Path" }, "results": [ { "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", "details": { - "name": "AZStd::string" + "name": "AZ Std::string" } } ] @@ -166,20 +167,20 @@ "base": "SetSpecularImageAssetId", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetSpecularImageAssetId" + "tooltip": "When signaled, this will invoke Set Specular Image Asset Id" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetSpecularImageAssetId is invoked" + "tooltip": "Signaled after Set Specular Image Asset Id is invoked" }, "details": { - "name": "SetSpecularImageAssetId" + "name": "Set Specular Image Asset Id" }, "params": [ { "typeid": "{652ED536-3402-439B-AEBE-4A5DBC554085}", "details": { - "name": "AssetId" + "name": "Asset Id" } } ] diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/LookModificationRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/LookModificationRequestBus.names index 9b6a6374af..736915ef9c 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/LookModificationRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/LookModificationRequestBus.names @@ -5,21 +5,22 @@ "context": "EBusSender", "variant": "", "details": { - "name": "Look Modification" + "name": "Look Modification", + "category": "Rendering" }, "methods": [ { "base": "SetColorGradingLutOverride", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetColorGradingLutOverride" + "tooltip": "When signaled, this will invoke Set Color Grading Lut Override" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetColorGradingLutOverride is invoked" + "tooltip": "Signaled after Set Color Grading Lut Override is invoked" }, "details": { - "name": "SetColorGradingLutOverride" + "name": "Set Color Grading Lut Override" }, "params": [ { @@ -34,14 +35,14 @@ "base": "SetCustomMaxExposure", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetCustomMaxExposure" + "tooltip": "When signaled, this will invoke Set Custom Max Exposure" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetCustomMaxExposure is invoked" + "tooltip": "Signaled after Set Custom Max Exposure is invoked" }, "details": { - "name": "SetCustomMaxExposure" + "name": "Set Custom Max Exposure" }, "params": [ { @@ -56,14 +57,14 @@ "base": "SetCustomMinExposure", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetCustomMinExposure" + "tooltip": "When signaled, this will invoke Set Custom Min Exposure" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetCustomMinExposure is invoked" + "tooltip": "Signaled after Set Custom Min Exposure is invoked" }, "details": { - "name": "SetCustomMinExposure" + "name": "Set Custom Min Exposure" }, "params": [ { @@ -78,14 +79,14 @@ "base": "GetCustomMinExposure", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetCustomMinExposure" + "tooltip": "When signaled, this will invoke Get Custom Min Exposure" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetCustomMinExposure is invoked" + "tooltip": "Signaled after Get Custom Min Exposure is invoked" }, "details": { - "name": "GetCustomMinExposure" + "name": "Get Custom Min Exposure" }, "results": [ { @@ -100,14 +101,14 @@ "base": "GetColorGradingLut", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetColorGradingLut" + "tooltip": "When signaled, this will invoke Get Color Grading Lut" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetColorGradingLut is invoked" + "tooltip": "Signaled after Get Color Grading Lut is invoked" }, "details": { - "name": "GetColorGradingLut" + "name": "Get Color Grading Lut" }, "results": [ { @@ -122,14 +123,14 @@ "base": "GetColorGradingLutIntensity", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetColorGradingLutIntensity" + "tooltip": "When signaled, this will invoke Get Color Grading Lut Intensity" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetColorGradingLutIntensity is invoked" + "tooltip": "Signaled after Get Color Grading Lut Intensity is invoked" }, "details": { - "name": "GetColorGradingLutIntensity" + "name": "Get Color Grading Lut Intensity" }, "results": [ { @@ -144,14 +145,14 @@ "base": "GetColorGradingLutOverride", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetColorGradingLutOverride" + "tooltip": "When signaled, this will invoke Get Color Grading Lut Override" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetColorGradingLutOverride is invoked" + "tooltip": "Signaled after Get Color Grading Lut Override is invoked" }, "details": { - "name": "GetColorGradingLutOverride" + "name": "Get Color Grading Lut Override" }, "results": [ { @@ -166,14 +167,14 @@ "base": "SetColorGradingLut", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetColorGradingLut" + "tooltip": "When signaled, this will invoke Set Color Grading Lut" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetColorGradingLut is invoked" + "tooltip": "Signaled after Set Color Grading Lut is invoked" }, "details": { - "name": "SetColorGradingLut" + "name": "Set Color Grading Lut" }, "params": [ { @@ -188,14 +189,14 @@ "base": "SetColorGradingLutIntensity", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetColorGradingLutIntensity" + "tooltip": "When signaled, this will invoke Set Color Grading Lut Intensity" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetColorGradingLutIntensity is invoked" + "tooltip": "Signaled after Set Color Grading Lut Intensity is invoked" }, "details": { - "name": "SetColorGradingLutIntensity" + "name": "Set Color Grading Lut Intensity" }, "params": [ { @@ -210,14 +211,14 @@ "base": "SetEnabled", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetEnabled" + "tooltip": "When signaled, this will invoke Set Enabled" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetEnabled is invoked" + "tooltip": "Signaled after Set Enabled is invoked" }, "details": { - "name": "SetEnabled" + "name": "Set Enabled" }, "params": [ { @@ -232,14 +233,14 @@ "base": "GetEnabled", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetEnabled" + "tooltip": "When signaled, this will invoke Get Enabled" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetEnabled is invoked" + "tooltip": "Signaled after Get Enabled is invoked" }, "details": { - "name": "GetEnabled" + "name": "Get Enabled" }, "results": [ { @@ -254,14 +255,14 @@ "base": "SetShaperPresetType", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetShaperPresetType" + "tooltip": "When signaled, this will invoke Set Shaper Preset Type" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetShaperPresetType is invoked" + "tooltip": "Signaled after Set Shaper Preset Type is invoked" }, "details": { - "name": "SetShaperPresetType" + "name": "Set Shaper Preset Type" }, "params": [ { @@ -276,14 +277,14 @@ "base": "GetShaperPresetType", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetShaperPresetType" + "tooltip": "When signaled, this will invoke Get Shaper Preset Type" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetShaperPresetType is invoked" + "tooltip": "Signaled after Get Shaper Preset Type is invoked" }, "details": { - "name": "GetShaperPresetType" + "name": "Get Shaper Preset Type" }, "results": [ { @@ -298,14 +299,14 @@ "base": "GetCustomMaxExposure", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetCustomMaxExposure" + "tooltip": "When signaled, this will invoke Get Custom Max Exposure" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetCustomMaxExposure is invoked" + "tooltip": "Signaled after Get Custom Max Exposure is invoked" }, "details": { - "name": "GetCustomMaxExposure" + "name": "Get Custom Max Exposure" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/MetastreamRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/MetastreamRequestBus.names new file mode 100644 index 0000000000..93acae35d7 --- /dev/null +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/MetastreamRequestBus.names @@ -0,0 +1,883 @@ +{ + "entries": [ + { + "base": "MetastreamRequestBus", + "context": "EBusSender", + "variant": "", + "details": { + "name": "Metastream" + }, + "methods": [ + { + "base": "AddDoubleToArray", + "entry": { + "name": "In", + "tooltip": "When signaled, this will invoke Add Double To Array" + }, + "exit": { + "name": "Out", + "tooltip": "Signaled after Add Double To Array is invoked" + }, + "details": { + "name": "Add Double To Array" + }, + "params": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + }, + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + }, + { + "typeid": "{110C4B14-11A8-4E9D-8638-5051013A56AC}", + "details": { + "name": "double" + } + } + ] + }, + { + "base": "AddEntityIdToArray", + "entry": { + "name": "In", + "tooltip": "When signaled, this will invoke Add Entity Id To Array" + }, + "exit": { + "name": "Out", + "tooltip": "Signaled after Add Entity Id To Array is invoked" + }, + "details": { + "name": "Add Entity Id To Array" + }, + "params": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + }, + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + }, + { + "typeid": "{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}", + "details": { + "name": "Entity Id", + "tooltip": "Entity Unique Id" + } + } + ] + }, + { + "base": "AddStringToArray", + "entry": { + "name": "In", + "tooltip": "When signaled, this will invoke Add String To Array" + }, + "exit": { + "name": "Out", + "tooltip": "Signaled after Add String To Array is invoked" + }, + "details": { + "name": "Add String To Array" + }, + "params": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + }, + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + }, + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + } + ] + }, + { + "base": "AddStringToObject", + "entry": { + "name": "In", + "tooltip": "When signaled, this will invoke Add String To Object" + }, + "exit": { + "name": "Out", + "tooltip": "Signaled after Add String To Object is invoked" + }, + "details": { + "name": "Add String To Object" + }, + "params": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + }, + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + }, + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + }, + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + } + ] + }, + { + "base": "AddSigned64ToCache", + "entry": { + "name": "In", + "tooltip": "When signaled, this will invoke Add Signed 64 To Cache" + }, + "exit": { + "name": "Out", + "tooltip": "Signaled after Add Signed 64 To Cache is invoked" + }, + "details": { + "name": "Add Signed 64 To Cache" + }, + "params": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + }, + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + }, + { + "typeid": "{70D8A282-A1EA-462D-9D04-51EDE81FAC2F}", + "details": { + "name": "AZ::s 64" + } + } + ] + }, + { + "base": "AddUnsigned64ToArray", + "entry": { + "name": "In", + "tooltip": "When signaled, this will invoke Add Unsigned 64 To Array" + }, + "exit": { + "name": "Out", + "tooltip": "Signaled after Add Unsigned 64 To Array is invoked" + }, + "details": { + "name": "Add Unsigned 64 To Array" + }, + "params": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + }, + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + }, + { + "typeid": "{D6597933-47CD-4FC8-B911-63F3E2B0993A}", + "details": { + "name": "AZ::u 64" + } + } + ] + }, + { + "base": "AddSigned64ToObject", + "entry": { + "name": "In", + "tooltip": "When signaled, this will invoke Add Signed 64 To Object" + }, + "exit": { + "name": "Out", + "tooltip": "Signaled after Add Signed 64 To Object is invoked" + }, + "details": { + "name": "Add Signed 64 To Object" + }, + "params": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + }, + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + }, + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + }, + { + "typeid": "{70D8A282-A1EA-462D-9D04-51EDE81FAC2F}", + "details": { + "name": "AZ::s 64" + } + } + ] + }, + { + "base": "AddUnsigned64ToCache", + "entry": { + "name": "In", + "tooltip": "When signaled, this will invoke Add Unsigned 64 To Cache" + }, + "exit": { + "name": "Out", + "tooltip": "Signaled after Add Unsigned 64 To Cache is invoked" + }, + "details": { + "name": "Add Unsigned 64 To Cache" + }, + "params": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + }, + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + }, + { + "typeid": "{D6597933-47CD-4FC8-B911-63F3E2B0993A}", + "details": { + "name": "AZ::u 64" + } + } + ] + }, + { + "base": "AddStringToCache", + "entry": { + "name": "In", + "tooltip": "When signaled, this will invoke Add String To Cache" + }, + "exit": { + "name": "Out", + "tooltip": "Signaled after Add String To Cache is invoked" + }, + "details": { + "name": "Add String To Cache" + }, + "params": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + }, + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + }, + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + } + ] + }, + { + "base": "AddBoolToCache", + "entry": { + "name": "In", + "tooltip": "When signaled, this will invoke Add Bool To Cache" + }, + "exit": { + "name": "Out", + "tooltip": "Signaled after Add Bool To Cache is invoked" + }, + "details": { + "name": "Add Bool To Cache" + }, + "params": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + }, + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + }, + { + "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", + "details": { + "name": "bool" + } + } + ] + }, + { + "base": "AddDoubleToCache", + "entry": { + "name": "In", + "tooltip": "When signaled, this will invoke Add Double To Cache" + }, + "exit": { + "name": "Out", + "tooltip": "Signaled after Add Double To Cache is invoked" + }, + "details": { + "name": "Add Double To Cache" + }, + "params": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + }, + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + }, + { + "typeid": "{110C4B14-11A8-4E9D-8638-5051013A56AC}", + "details": { + "name": "double" + } + } + ] + }, + { + "base": "AddArrayToObject", + "entry": { + "name": "In", + "tooltip": "When signaled, this will invoke Add Array To Object" + }, + "exit": { + "name": "Out", + "tooltip": "Signaled after Add Array To Object is invoked" + }, + "details": { + "name": "Add Array To Object" + }, + "params": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + }, + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + }, + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + }, + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + } + ] + }, + { + "base": "AddObjectToObject", + "entry": { + "name": "In", + "tooltip": "When signaled, this will invoke Add Object To Object" + }, + "exit": { + "name": "Out", + "tooltip": "Signaled after Add Object To Object is invoked" + }, + "details": { + "name": "Add Object To Object" + }, + "params": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + }, + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + }, + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + }, + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + } + ] + }, + { + "base": "AddBoolToArray", + "entry": { + "name": "In", + "tooltip": "When signaled, this will invoke Add Bool To Array" + }, + "exit": { + "name": "Out", + "tooltip": "Signaled after Add Bool To Array is invoked" + }, + "details": { + "name": "Add Bool To Array" + }, + "params": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + }, + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + }, + { + "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", + "details": { + "name": "bool" + } + } + ] + }, + { + "base": "AddBoolToObject", + "entry": { + "name": "In", + "tooltip": "When signaled, this will invoke Add Bool To Object" + }, + "exit": { + "name": "Out", + "tooltip": "Signaled after Add Bool To Object is invoked" + }, + "details": { + "name": "Add Bool To Object" + }, + "params": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + }, + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + }, + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + }, + { + "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", + "details": { + "name": "bool" + } + } + ] + }, + { + "base": "AddEntityIdToObject", + "entry": { + "name": "In", + "tooltip": "When signaled, this will invoke Add Entity Id To Object" + }, + "exit": { + "name": "Out", + "tooltip": "Signaled after Add Entity Id To Object is invoked" + }, + "details": { + "name": "Add Entity Id To Object" + }, + "params": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + }, + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + }, + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + }, + { + "typeid": "{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}", + "details": { + "name": "Entity Id", + "tooltip": "Entity Unique Id" + } + } + ] + }, + { + "base": "StopHTTPServer", + "entry": { + "name": "In", + "tooltip": "When signaled, this will invoke StopHTTP Server" + }, + "exit": { + "name": "Out", + "tooltip": "Signaled after StopHTTP Server is invoked" + }, + "details": { + "name": "StopHTTP Server" + } + }, + { + "base": "AddEntityIdToCache", + "entry": { + "name": "In", + "tooltip": "When signaled, this will invoke Add Entity Id To Cache" + }, + "exit": { + "name": "Out", + "tooltip": "Signaled after Add Entity Id To Cache is invoked" + }, + "details": { + "name": "Add Entity Id To Cache" + }, + "params": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + }, + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + }, + { + "typeid": "{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}", + "details": { + "name": "Entity Id", + "tooltip": "Entity Unique Id" + } + } + ] + }, + { + "base": "AddArrayToCache", + "entry": { + "name": "In", + "tooltip": "When signaled, this will invoke Add Array To Cache" + }, + "exit": { + "name": "Out", + "tooltip": "Signaled after Add Array To Cache is invoked" + }, + "details": { + "name": "Add Array To Cache" + }, + "params": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + }, + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + }, + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + } + ] + }, + { + "base": "AddObjectToCache", + "entry": { + "name": "In", + "tooltip": "When signaled, this will invoke Add Object To Cache" + }, + "exit": { + "name": "Out", + "tooltip": "Signaled after Add Object To Cache is invoked" + }, + "details": { + "name": "Add Object To Cache" + }, + "params": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + }, + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + }, + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + } + ] + }, + { + "base": "AddUnsigned64ToObject", + "entry": { + "name": "In", + "tooltip": "When signaled, this will invoke Add Unsigned 64 To Object" + }, + "exit": { + "name": "Out", + "tooltip": "Signaled after Add Unsigned 64 To Object is invoked" + }, + "details": { + "name": "Add Unsigned 64 To Object" + }, + "params": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + }, + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + }, + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + }, + { + "typeid": "{D6597933-47CD-4FC8-B911-63F3E2B0993A}", + "details": { + "name": "AZ::u 64" + } + } + ] + }, + { + "base": "StartHTTPServer", + "entry": { + "name": "In", + "tooltip": "When signaled, this will invoke StartHTTP Server" + }, + "exit": { + "name": "Out", + "tooltip": "Signaled after StartHTTP Server is invoked" + }, + "details": { + "name": "StartHTTP Server" + }, + "results": [ + { + "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", + "details": { + "name": "bool" + } + } + ] + }, + { + "base": "AddObjectToArray", + "entry": { + "name": "In", + "tooltip": "When signaled, this will invoke Add Object To Array" + }, + "exit": { + "name": "Out", + "tooltip": "Signaled after Add Object To Array is invoked" + }, + "details": { + "name": "Add Object To Array" + }, + "params": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + }, + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + }, + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + } + ] + }, + { + "base": "AddSigned64ToArray", + "entry": { + "name": "In", + "tooltip": "When signaled, this will invoke Add Signed 64 To Array" + }, + "exit": { + "name": "Out", + "tooltip": "Signaled after Add Signed 64 To Array is invoked" + }, + "details": { + "name": "Add Signed 64 To Array" + }, + "params": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + }, + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + }, + { + "typeid": "{70D8A282-A1EA-462D-9D04-51EDE81FAC2F}", + "details": { + "name": "AZ::s 64" + } + } + ] + }, + { + "base": "AddDoubleToObject", + "entry": { + "name": "In", + "tooltip": "When signaled, this will invoke Add Double To Object" + }, + "exit": { + "name": "Out", + "tooltip": "Signaled after Add Double To Object is invoked" + }, + "details": { + "name": "Add Double To Object" + }, + "params": [ + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + }, + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + }, + { + "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", + "details": { + "name": "char" + } + }, + { + "typeid": "{110C4B14-11A8-4E9D-8638-5051013A56AC}", + "details": { + "name": "double" + } + } + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/NetworkCharacterRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/NetworkCharacterRequestBus.names new file mode 100644 index 0000000000..83f7c105c2 --- /dev/null +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/NetworkCharacterRequestBus.names @@ -0,0 +1,51 @@ +{ + "entries": [ + { + "base": "NetworkCharacterRequestBus", + "context": "EBusSender", + "variant": "", + "details": { + "name": "Network Character", + "category": "Multiplayer" + }, + "methods": [ + { + "base": "TryMoveWithVelocity", + "entry": { + "name": "In", + "tooltip": "When signaled, this will invoke Try Move With Velocity" + }, + "exit": { + "name": "Out", + "tooltip": "Signaled after Try Move With Velocity is invoked" + }, + "details": { + "name": "Try Move With Velocity" + }, + "params": [ + { + "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}", + "details": { + "name": "Velocity" + } + }, + { + "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", + "details": { + "name": "Delta Time" + } + } + ], + "results": [ + { + "typeid": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}", + "details": { + "name": "Position" + } + } + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/PostFxLayerRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/PostFxLayerRequestBus.names index d702aa43c9..d58a8a419c 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/PostFxLayerRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/PostFxLayerRequestBus.names @@ -5,21 +5,22 @@ "context": "EBusSender", "variant": "", "details": { - "name": "Post Fx Layer" + "name": "Post Fx Layer", + "category": "Rendering" }, "methods": [ { "base": "SetPriority", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetPriority" + "tooltip": "When signaled, this will invoke Set Priority" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetPriority is invoked" + "tooltip": "Signaled after Set Priority is invoked" }, "details": { - "name": "SetPriority" + "name": "Set Priority" }, "params": [ { @@ -34,14 +35,14 @@ "base": "GetPriority", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetPriority" + "tooltip": "When signaled, this will invoke Get Priority" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetPriority is invoked" + "tooltip": "Signaled after Get Priority is invoked" }, "details": { - "name": "GetPriority" + "name": "Get Priority" }, "results": [ { @@ -56,14 +57,14 @@ "base": "SetOverrideFactor", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetOverrideFactor" + "tooltip": "When signaled, this will invoke Set Override Factor" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetOverrideFactor is invoked" + "tooltip": "Signaled after Set Override Factor is invoked" }, "details": { - "name": "SetOverrideFactor" + "name": "Set Override Factor" }, "params": [ { @@ -78,14 +79,14 @@ "base": "GetOverrideFactor", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetOverrideFactor" + "tooltip": "When signaled, this will invoke Get Override Factor" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetOverrideFactor is invoked" + "tooltip": "Signaled after Get Override Factor is invoked" }, "details": { - "name": "GetOverrideFactor" + "name": "Get Override Factor" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/QuadShapeComponentRequestsBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/QuadShapeComponentRequestsBus.names index ebbad06bca..2365e05ec1 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/QuadShapeComponentRequestsBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/QuadShapeComponentRequestsBus.names @@ -5,21 +5,22 @@ "context": "EBusSender", "variant": "", "details": { - "name": "Quad Shape Component" + "name": "Quad Shape Component", + "category": "Rendering/Shapes" }, "methods": [ { "base": "SetQuadHeight", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetQuadHeight" + "tooltip": "When signaled, this will invoke Set Quad Height" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetQuadHeight is invoked" + "tooltip": "Signaled after Set Quad Height is invoked" }, "details": { - "name": "SetQuadHeight" + "name": "Set Quad Height" }, "params": [ { @@ -34,14 +35,14 @@ "base": "GetQuadWidth", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetQuadWidth" + "tooltip": "When signaled, this will invoke Get Quad Width" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetQuadWidth is invoked" + "tooltip": "Signaled after Get Quad Width is invoked" }, "details": { - "name": "GetQuadWidth" + "name": "Get Quad Width" }, "results": [ { @@ -56,14 +57,14 @@ "base": "GetQuadHeight", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetQuadHeight" + "tooltip": "When signaled, this will invoke Get Quad Height" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetQuadHeight is invoked" + "tooltip": "Signaled after Get Quad Height is invoked" }, "details": { - "name": "GetQuadHeight" + "name": "Get Quad Height" }, "results": [ { @@ -78,14 +79,14 @@ "base": "GetQuadConfiguration", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetQuadConfiguration" + "tooltip": "When signaled, this will invoke Get Quad Configuration" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetQuadConfiguration is invoked" + "tooltip": "Signaled after Get Quad Configuration is invoked" }, "details": { - "name": "GetQuadConfiguration" + "name": "Get Quad Configuration" }, "results": [ { @@ -101,14 +102,14 @@ "base": "SetQuadWidth", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetQuadWidth" + "tooltip": "When signaled, this will invoke Set Quad Width" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetQuadWidth is invoked" + "tooltip": "Signaled after Set Quad Width is invoked" }, "details": { - "name": "SetQuadWidth" + "name": "Set Quad Width" }, "params": [ { @@ -123,14 +124,14 @@ "base": "GetQuadOrientation", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetQuadOrientation" + "tooltip": "When signaled, this will invoke Get Quad Orientation" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetQuadOrientation is invoked" + "tooltip": "Signaled after Get Quad Orientation is invoked" }, "details": { - "name": "GetQuadOrientation" + "name": "Get Quad Orientation" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/RandomTimedSpawnerRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/RandomTimedSpawnerRequestBus.names index 73cae1f51a..0938151e90 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/RandomTimedSpawnerRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/RandomTimedSpawnerRequestBus.names @@ -5,21 +5,22 @@ "context": "EBusSender", "variant": "", "details": { - "name": "Random Timed Spawner" + "name": "Random Timed Spawner", + "category": "Spawner" }, "methods": [ { "base": "SetSpawnDelay", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetSpawnDelay" + "tooltip": "When signaled, this will invoke Set Spawn Delay" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetSpawnDelay is invoked" + "tooltip": "Signaled after Set Spawn Delay is invoked" }, "details": { - "name": "SetSpawnDelay" + "name": "Set Spawn Delay" }, "params": [ { @@ -34,14 +35,14 @@ "base": "GetSpawnDelay", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetSpawnDelay" + "tooltip": "When signaled, this will invoke Get Spawn Delay" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetSpawnDelay is invoked" + "tooltip": "Signaled after Get Spawn Delay is invoked" }, "details": { - "name": "GetSpawnDelay" + "name": "Get Spawn Delay" }, "results": [ { @@ -56,14 +57,14 @@ "base": "SetSpawnDelayVariation", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetSpawnDelayVariation" + "tooltip": "When signaled, this will invoke Set Spawn Delay Variation" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetSpawnDelayVariation is invoked" + "tooltip": "Signaled after Set Spawn Delay Variation is invoked" }, "details": { - "name": "SetSpawnDelayVariation" + "name": "Set Spawn Delay Variation" }, "params": [ { @@ -78,14 +79,14 @@ "base": "SetRandomDistribution", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetRandomDistribution" + "tooltip": "When signaled, this will invoke Set Random Distribution" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetRandomDistribution is invoked" + "tooltip": "Signaled after Set Random Distribution is invoked" }, "details": { - "name": "SetRandomDistribution" + "name": "Set Random Distribution" }, "params": [ { @@ -100,14 +101,14 @@ "base": "IsEnabled", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke IsEnabled" + "tooltip": "When signaled, this will invoke Is Enabled" }, "exit": { "name": "Out", - "tooltip": "Signaled after IsEnabled is invoked" + "tooltip": "Signaled after Is Enabled is invoked" }, "details": { - "name": "IsEnabled" + "name": "Is Enabled" }, "results": [ { @@ -150,14 +151,14 @@ "base": "GetRandomDistribution", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetRandomDistribution" + "tooltip": "When signaled, this will invoke Get Random Distribution" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetRandomDistribution is invoked" + "tooltip": "Signaled after Get Random Distribution is invoked" }, "details": { - "name": "GetRandomDistribution" + "name": "Get Random Distribution" }, "results": [ { @@ -186,14 +187,14 @@ "base": "GetSpawnDelayVariation", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetSpawnDelayVariation" + "tooltip": "When signaled, this will invoke Get Spawn Delay Variation" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetSpawnDelayVariation is invoked" + "tooltip": "Signaled after Get Spawn Delay Variation is invoked" }, "details": { - "name": "GetSpawnDelayVariation" + "name": "Get Spawn Delay Variation" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/RenderMeshComponentRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/RenderMeshComponentRequestBus.names index b7d5c9ebe1..33337df200 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/RenderMeshComponentRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/RenderMeshComponentRequestBus.names @@ -5,21 +5,22 @@ "context": "EBusSender", "variant": "", "details": { - "name": "Render Mesh Component" + "name": "Render Mesh Component", + "category": "Rendering" }, "methods": [ { "base": "GetLodOverride", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetLodOverride" + "tooltip": "When signaled, this will invoke Get Lod Override" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetLodOverride is invoked" + "tooltip": "Signaled after Get Lod Override is invoked" }, "details": { - "name": "GetLodOverride" + "name": "Get Lod Override" }, "results": [ { @@ -34,20 +35,20 @@ "base": "GetSortKey", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetSortKey" + "tooltip": "When signaled, this will invoke Get Sort Key" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetSortKey is invoked" + "tooltip": "Signaled after Get Sort Key is invoked" }, "details": { - "name": "GetSortKey" + "name": "Get Sort Key" }, "results": [ { "typeid": "{70D8A282-A1EA-462D-9D04-51EDE81FAC2F}", "details": { - "name": "AZ::s64" + "name": "AZ::s 64" } } ] @@ -56,14 +57,14 @@ "base": "SetQualityDecayRate", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetQualityDecayRate" + "tooltip": "When signaled, this will invoke Set Quality Decay Rate" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetQualityDecayRate is invoked" + "tooltip": "Signaled after Set Quality Decay Rate is invoked" }, "details": { - "name": "SetQualityDecayRate" + "name": "Set Quality Decay Rate" }, "params": [ { @@ -78,20 +79,20 @@ "base": "SetSortKey", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetSortKey" + "tooltip": "When signaled, this will invoke Set Sort Key" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetSortKey is invoked" + "tooltip": "Signaled after Set Sort Key is invoked" }, "details": { - "name": "SetSortKey" + "name": "Set Sort Key" }, "params": [ { "typeid": "{70D8A282-A1EA-462D-9D04-51EDE81FAC2F}", "details": { - "name": "AZ::s64" + "name": "AZ::s 64" } } ] @@ -100,20 +101,20 @@ "base": "GetModelAssetPath", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetModelAssetPath" + "tooltip": "When signaled, this will invoke Get Model Asset Path" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetModelAssetPath is invoked" + "tooltip": "Signaled after Get Model Asset Path is invoked" }, "details": { - "name": "GetModelAssetPath" + "name": "Get Model Asset Path" }, "results": [ { "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", "details": { - "name": "AZStd::string" + "name": "AZ Std::string" } } ] @@ -122,14 +123,14 @@ "base": "SetLodType", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetLodType" + "tooltip": "When signaled, this will invoke Set Lod Type" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetLodType is invoked" + "tooltip": "Signaled after Set Lod Type is invoked" }, "details": { - "name": "SetLodType" + "name": "Set Lod Type" }, "params": [ { @@ -144,14 +145,14 @@ "base": "SetLodOverride", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetLodOverride" + "tooltip": "When signaled, this will invoke Set Lod Override" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetLodOverride is invoked" + "tooltip": "Signaled after Set Lod Override is invoked" }, "details": { - "name": "SetLodOverride" + "name": "Set Lod Override" }, "params": [ { @@ -166,14 +167,14 @@ "base": "SetMinimumScreenCoverage", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetMinimumScreenCoverage" + "tooltip": "When signaled, this will invoke Set Minimum Screen Coverage" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetMinimumScreenCoverage is invoked" + "tooltip": "Signaled after Set Minimum Screen Coverage is invoked" }, "details": { - "name": "SetMinimumScreenCoverage" + "name": "Set Minimum Screen Coverage" }, "params": [ { @@ -188,20 +189,20 @@ "base": "SetModelAssetId", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetModelAssetId" + "tooltip": "When signaled, this will invoke Set Model Asset Id" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetModelAssetId is invoked" + "tooltip": "Signaled after Set Model Asset Id is invoked" }, "details": { - "name": "SetModelAssetId" + "name": "Set Model Asset Id" }, "params": [ { "typeid": "{652ED536-3402-439B-AEBE-4A5DBC554085}", "details": { - "name": "AssetId" + "name": "Asset Id" } } ] @@ -210,14 +211,14 @@ "base": "GetLodType", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetLodType" + "tooltip": "When signaled, this will invoke Get Lod Type" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetLodType is invoked" + "tooltip": "Signaled after Get Lod Type is invoked" }, "details": { - "name": "GetLodType" + "name": "Get Lod Type" }, "results": [ { @@ -232,14 +233,14 @@ "base": "GetMinimumScreenCoverage", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetMinimumScreenCoverage" + "tooltip": "When signaled, this will invoke Get Minimum Screen Coverage" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetMinimumScreenCoverage is invoked" + "tooltip": "Signaled after Get Minimum Screen Coverage is invoked" }, "details": { - "name": "GetMinimumScreenCoverage" + "name": "Get Minimum Screen Coverage" }, "results": [ { @@ -254,20 +255,20 @@ "base": "GetModelAssetId", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetModelAssetId" + "tooltip": "When signaled, this will invoke Get Model Asset Id" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetModelAssetId is invoked" + "tooltip": "Signaled after Get Model Asset Id is invoked" }, "details": { - "name": "GetModelAssetId" + "name": "Get Model Asset Id" }, "results": [ { "typeid": "{652ED536-3402-439B-AEBE-4A5DBC554085}", "details": { - "name": "AssetId" + "name": "Asset Id" } } ] @@ -276,20 +277,20 @@ "base": "SetModelAssetPath", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetModelAssetPath" + "tooltip": "When signaled, this will invoke Set Model Asset Path" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetModelAssetPath is invoked" + "tooltip": "Signaled after Set Model Asset Path is invoked" }, "details": { - "name": "SetModelAssetPath" + "name": "Set Model Asset Path" }, "params": [ { "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", "details": { - "name": "AZStd::string" + "name": "AZ Std::string" } } ] @@ -298,14 +299,14 @@ "base": "GetQualityDecayRate", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetQualityDecayRate" + "tooltip": "When signaled, this will invoke Get Quality Decay Rate" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetQualityDecayRate is invoked" + "tooltip": "Signaled after Get Quality Decay Rate is invoked" }, "details": { - "name": "GetQualityDecayRate" + "name": "Get Quality Decay Rate" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/SsaoRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/SsaoRequestBus.names index a8bb6f244e..9c3265fa01 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/SsaoRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/SsaoRequestBus.names @@ -5,21 +5,22 @@ "context": "EBusSender", "variant": "", "details": { - "name": "SSAO" + "name": "SSAO", + "category": "Rendering" }, "methods": [ { "base": "SetBlurDepthFalloffStrength", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetBlurDepthFalloffStrength" + "tooltip": "When signaled, this will invoke Set Blur Depth Falloff Strength" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetBlurDepthFalloffStrength is invoked" + "tooltip": "Signaled after Set Blur Depth Falloff Strength is invoked" }, "details": { - "name": "SetBlurDepthFalloffStrength" + "name": "Set Blur Depth Falloff Strength" }, "params": [ { @@ -34,14 +35,14 @@ "base": "SetBlurDepthFalloffThreshold", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetBlurDepthFalloffThreshold" + "tooltip": "When signaled, this will invoke Set Blur Depth Falloff Threshold" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetBlurDepthFalloffThreshold is invoked" + "tooltip": "Signaled after Set Blur Depth Falloff Threshold is invoked" }, "details": { - "name": "SetBlurDepthFalloffThreshold" + "name": "Set Blur Depth Falloff Threshold" }, "params": [ { @@ -56,14 +57,14 @@ "base": "SetEnableDownsampleOverride", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetEnableDownsampleOverride" + "tooltip": "When signaled, this will invoke Set Enable Downsample Override" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetEnableDownsampleOverride is invoked" + "tooltip": "Signaled after Set Enable Downsample Override is invoked" }, "details": { - "name": "SetEnableDownsampleOverride" + "name": "Set Enable Downsample Override" }, "params": [ { @@ -78,14 +79,14 @@ "base": "SetEnableBlurOverride", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetEnableBlurOverride" + "tooltip": "When signaled, this will invoke Set Enable Blur Override" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetEnableBlurOverride is invoked" + "tooltip": "Signaled after Set Enable Blur Override is invoked" }, "details": { - "name": "SetEnableBlurOverride" + "name": "Set Enable Blur Override" }, "params": [ { @@ -100,14 +101,14 @@ "base": "GetEnabledOverride", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetEnabledOverride" + "tooltip": "When signaled, this will invoke Get Enabled Override" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetEnabledOverride is invoked" + "tooltip": "Signaled after Get Enabled Override is invoked" }, "details": { - "name": "GetEnabledOverride" + "name": "Get Enabled Override" }, "results": [ { @@ -122,14 +123,14 @@ "base": "GetSamplingRadius", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetSamplingRadius" + "tooltip": "When signaled, this will invoke Get Sampling Radius" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetSamplingRadius is invoked" + "tooltip": "Signaled after Get Sampling Radius is invoked" }, "details": { - "name": "GetSamplingRadius" + "name": "Get Sampling Radius" }, "results": [ { @@ -144,14 +145,14 @@ "base": "SetBlurDepthFalloffStrengthOverride", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetBlurDepthFalloffStrengthOverride" + "tooltip": "When signaled, this will invoke Set Blur Depth Falloff Strength Override" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetBlurDepthFalloffStrengthOverride is invoked" + "tooltip": "Signaled after Set Blur Depth Falloff Strength Override is invoked" }, "details": { - "name": "SetBlurDepthFalloffStrengthOverride" + "name": "Set Blur Depth Falloff Strength Override" }, "params": [ { @@ -166,14 +167,14 @@ "base": "GetBlurDepthFalloffThresholdOverride", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetBlurDepthFalloffThresholdOverride" + "tooltip": "When signaled, this will invoke Get Blur Depth Falloff Threshold Override" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetBlurDepthFalloffThresholdOverride is invoked" + "tooltip": "Signaled after Get Blur Depth Falloff Threshold Override is invoked" }, "details": { - "name": "GetBlurDepthFalloffThresholdOverride" + "name": "Get Blur Depth Falloff Threshold Override" }, "results": [ { @@ -188,14 +189,14 @@ "base": "GetBlurDepthFalloffThreshold", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetBlurDepthFalloffThreshold" + "tooltip": "When signaled, this will invoke Get Blur Depth Falloff Threshold" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetBlurDepthFalloffThreshold is invoked" + "tooltip": "Signaled after Get Blur Depth Falloff Threshold is invoked" }, "details": { - "name": "GetBlurDepthFalloffThreshold" + "name": "Get Blur Depth Falloff Threshold" }, "results": [ { @@ -210,14 +211,14 @@ "base": "GetSamplingRadiusOverride", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetSamplingRadiusOverride" + "tooltip": "When signaled, this will invoke Get Sampling Radius Override" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetSamplingRadiusOverride is invoked" + "tooltip": "Signaled after Get Sampling Radius Override is invoked" }, "details": { - "name": "GetSamplingRadiusOverride" + "name": "Get Sampling Radius Override" }, "results": [ { @@ -232,14 +233,14 @@ "base": "SetStrengthOverride", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetStrengthOverride" + "tooltip": "When signaled, this will invoke Set Strength Override" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetStrengthOverride is invoked" + "tooltip": "Signaled after Set Strength Override is invoked" }, "details": { - "name": "SetStrengthOverride" + "name": "Set Strength Override" }, "params": [ { @@ -254,14 +255,14 @@ "base": "GetStrength", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetStrength" + "tooltip": "When signaled, this will invoke Get Strength" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetStrength is invoked" + "tooltip": "Signaled after Get Strength is invoked" }, "details": { - "name": "GetStrength" + "name": "Get Strength" }, "results": [ { @@ -276,14 +277,14 @@ "base": "GetEnabled", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetEnabled" + "tooltip": "When signaled, this will invoke Get Enabled" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetEnabled is invoked" + "tooltip": "Signaled after Get Enabled is invoked" }, "details": { - "name": "GetEnabled" + "name": "Get Enabled" }, "results": [ { @@ -298,14 +299,14 @@ "base": "GetEnableDownsample", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetEnableDownsample" + "tooltip": "When signaled, this will invoke Get Enable Downsample" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetEnableDownsample is invoked" + "tooltip": "Signaled after Get Enable Downsample is invoked" }, "details": { - "name": "GetEnableDownsample" + "name": "Get Enable Downsample" }, "results": [ { @@ -320,14 +321,14 @@ "base": "GetBlurDepthFalloffStrength", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetBlurDepthFalloffStrength" + "tooltip": "When signaled, this will invoke Get Blur Depth Falloff Strength" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetBlurDepthFalloffStrength is invoked" + "tooltip": "Signaled after Get Blur Depth Falloff Strength is invoked" }, "details": { - "name": "GetBlurDepthFalloffStrength" + "name": "Get Blur Depth Falloff Strength" }, "results": [ { @@ -342,14 +343,14 @@ "base": "SetBlurConstFalloff", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetBlurConstFalloff" + "tooltip": "When signaled, this will invoke Set Blur Const Falloff" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetBlurConstFalloff is invoked" + "tooltip": "Signaled after Set Blur Const Falloff is invoked" }, "details": { - "name": "SetBlurConstFalloff" + "name": "Set Blur Const Falloff" }, "params": [ { @@ -364,14 +365,14 @@ "base": "GetEnableDownsampleOverride", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetEnableDownsampleOverride" + "tooltip": "When signaled, this will invoke Get Enable Downsample Override" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetEnableDownsampleOverride is invoked" + "tooltip": "Signaled after Get Enable Downsample Override is invoked" }, "details": { - "name": "GetEnableDownsampleOverride" + "name": "Get Enable Downsample Override" }, "results": [ { @@ -386,14 +387,14 @@ "base": "GetEnableBlurOverride", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetEnableBlurOverride" + "tooltip": "When signaled, this will invoke Get Enable Blur Override" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetEnableBlurOverride is invoked" + "tooltip": "Signaled after Get Enable Blur Override is invoked" }, "details": { - "name": "GetEnableBlurOverride" + "name": "Get Enable Blur Override" }, "results": [ { @@ -408,14 +409,14 @@ "base": "SetSamplingRadiusOverride", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetSamplingRadiusOverride" + "tooltip": "When signaled, this will invoke Set Sampling Radius Override" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetSamplingRadiusOverride is invoked" + "tooltip": "Signaled after Set Sampling Radius Override is invoked" }, "details": { - "name": "SetSamplingRadiusOverride" + "name": "Set Sampling Radius Override" }, "params": [ { @@ -430,14 +431,14 @@ "base": "SetSamplingRadius", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetSamplingRadius" + "tooltip": "When signaled, this will invoke Set Sampling Radius" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetSamplingRadius is invoked" + "tooltip": "Signaled after Set Sampling Radius is invoked" }, "details": { - "name": "SetSamplingRadius" + "name": "Set Sampling Radius" }, "params": [ { @@ -452,14 +453,14 @@ "base": "SetStrength", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetStrength" + "tooltip": "When signaled, this will invoke Set Strength" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetStrength is invoked" + "tooltip": "Signaled after Set Strength is invoked" }, "details": { - "name": "SetStrength" + "name": "Set Strength" }, "params": [ { @@ -474,14 +475,14 @@ "base": "SetEnabled", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetEnabled" + "tooltip": "When signaled, this will invoke Set Enabled" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetEnabled is invoked" + "tooltip": "Signaled after Set Enabled is invoked" }, "details": { - "name": "SetEnabled" + "name": "Set Enabled" }, "params": [ { @@ -496,14 +497,14 @@ "base": "GetStrengthOverride", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetStrengthOverride" + "tooltip": "When signaled, this will invoke Get Strength Override" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetStrengthOverride is invoked" + "tooltip": "Signaled after Get Strength Override is invoked" }, "details": { - "name": "GetStrengthOverride" + "name": "Get Strength Override" }, "results": [ { @@ -518,14 +519,14 @@ "base": "GetEnableBlur", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetEnableBlur" + "tooltip": "When signaled, this will invoke Get Enable Blur" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetEnableBlur is invoked" + "tooltip": "Signaled after Get Enable Blur is invoked" }, "details": { - "name": "GetEnableBlur" + "name": "Get Enable Blur" }, "results": [ { @@ -540,14 +541,14 @@ "base": "SetEnableDownsample", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetEnableDownsample" + "tooltip": "When signaled, this will invoke Set Enable Downsample" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetEnableDownsample is invoked" + "tooltip": "Signaled after Set Enable Downsample is invoked" }, "details": { - "name": "SetEnableDownsample" + "name": "Set Enable Downsample" }, "params": [ { @@ -562,14 +563,14 @@ "base": "SetBlurDepthFalloffThresholdOverride", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetBlurDepthFalloffThresholdOverride" + "tooltip": "When signaled, this will invoke Set Blur Depth Falloff Threshold Override" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetBlurDepthFalloffThresholdOverride is invoked" + "tooltip": "Signaled after Set Blur Depth Falloff Threshold Override is invoked" }, "details": { - "name": "SetBlurDepthFalloffThresholdOverride" + "name": "Set Blur Depth Falloff Threshold Override" }, "params": [ { @@ -584,14 +585,14 @@ "base": "SetBlurConstFalloffOverride", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetBlurConstFalloffOverride" + "tooltip": "When signaled, this will invoke Set Blur Const Falloff Override" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetBlurConstFalloffOverride is invoked" + "tooltip": "Signaled after Set Blur Const Falloff Override is invoked" }, "details": { - "name": "SetBlurConstFalloffOverride" + "name": "Set Blur Const Falloff Override" }, "params": [ { @@ -606,14 +607,14 @@ "base": "GetBlurConstFalloff", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetBlurConstFalloff" + "tooltip": "When signaled, this will invoke Get Blur Const Falloff" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetBlurConstFalloff is invoked" + "tooltip": "Signaled after Get Blur Const Falloff is invoked" }, "details": { - "name": "GetBlurConstFalloff" + "name": "Get Blur Const Falloff" }, "results": [ { @@ -628,14 +629,14 @@ "base": "SetEnabledOverride", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetEnabledOverride" + "tooltip": "When signaled, this will invoke Set Enabled Override" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetEnabledOverride is invoked" + "tooltip": "Signaled after Set Enabled Override is invoked" }, "details": { - "name": "SetEnabledOverride" + "name": "Set Enabled Override" }, "params": [ { @@ -650,14 +651,14 @@ "base": "SetEnableBlur", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke SetEnableBlur" + "tooltip": "When signaled, this will invoke Set Enable Blur" }, "exit": { "name": "Out", - "tooltip": "Signaled after SetEnableBlur is invoked" + "tooltip": "Signaled after Set Enable Blur is invoked" }, "details": { - "name": "SetEnableBlur" + "name": "Set Enable Blur" }, "params": [ { @@ -672,14 +673,14 @@ "base": "GetBlurConstFalloffOverride", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetBlurConstFalloffOverride" + "tooltip": "When signaled, this will invoke Get Blur Const Falloff Override" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetBlurConstFalloffOverride is invoked" + "tooltip": "Signaled after Get Blur Const Falloff Override is invoked" }, "details": { - "name": "GetBlurConstFalloffOverride" + "name": "Get Blur Const Falloff Override" }, "results": [ { @@ -694,14 +695,14 @@ "base": "GetBlurDepthFalloffStrengthOverride", "entry": { "name": "In", - "tooltip": "When signaled, this will invoke GetBlurDepthFalloffStrengthOverride" + "tooltip": "When signaled, this will invoke Get Blur Depth Falloff Strength Override" }, "exit": { "name": "Out", - "tooltip": "Signaled after GetBlurDepthFalloffStrengthOverride is invoked" + "tooltip": "Signaled after Get Blur Depth Falloff Strength Override is invoked" }, "details": { - "name": "GetBlurDepthFalloffStrengthOverride" + "name": "Get Blur Depth Falloff Strength Override" }, "results": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/TickRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/TickRequestBus.names index 6c8e29af70..f3589b8d78 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/TickRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/TickRequestBus.names @@ -5,7 +5,8 @@ "context": "EBusSender", "variant": "", "details": { - "name": "Tick" + "name": "Tick", + "category": "Timing" }, "methods": [ { @@ -25,7 +26,7 @@ { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", "details": { - "name": "Delta Time" + "name": "float" } } ] diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiTransformBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiTransformBus.names index 92a8ea1989..d432305852 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiTransformBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/UiTransformBus.names @@ -5,7 +5,8 @@ "context": "EBusSender", "variant": "", "details": { - "name": "Ui Transform Bus" + "name": "UI Transform", + "category": "UI" }, "methods": [ { From 02e4950fde852bc647afd93dd8e671c13ebcbdfe Mon Sep 17 00:00:00 2001 From: lsemp3d <58790905+lsemp3d@users.noreply.github.com> Date: Tue, 23 Nov 2021 13:32:34 -0800 Subject: [PATCH 228/345] Few category fixes Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com> --- .../Classes/ShaderSemantic.names | 3 ++- .../Classes/SpawnerConfig.names | 18 +++++++++--------- .../Senders/RandomTimedSpawnerRequestBus.names | 2 +- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ShaderSemantic.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ShaderSemantic.names index f5890fe28f..f89b6017a6 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ShaderSemantic.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/ShaderSemantic.names @@ -5,7 +5,8 @@ "context": "BehaviorClass", "variant": "", "details": { - "name": "Shader Semantic" + "name": "Shader Semantic", + "category": "Rendering" }, "methods": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SpawnerConfig.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SpawnerConfig.names index 4b6c2cba4d..0956b4294c 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SpawnerConfig.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SpawnerConfig.names @@ -6,19 +6,19 @@ "variant": "", "details": { "name": "Spawner Config", - "category": "Spawner" + "category": "Gameplay/Spawner" }, "methods": [ { "base": "GetspawnOnActivate", "details": { - "name": "Getspawn On Activate" + "name": "Get Spawn On Activate" }, "params": [ { "typeid": "{D4D68E8E-9031-448F-9D56-B5575CF4833C}", "details": { - "name": "Spawner Config*" + "name": "Spawner Config" } } ], @@ -34,13 +34,13 @@ { "base": "SetspawnOnActivate", "details": { - "name": "Setspawn On Activate" + "name": "Set Spawn On Activate" }, "params": [ { "typeid": "{D4D68E8E-9031-448F-9D56-B5575CF4833C}", "details": { - "name": "Spawner Config*" + "name": "Spawner Config" } }, { @@ -54,13 +54,13 @@ { "base": "GetdestroyOnDeactivate", "details": { - "name": "Getdestroy On Deactivate" + "name": "Get Destroy On Deactivate" }, "params": [ { "typeid": "{D4D68E8E-9031-448F-9D56-B5575CF4833C}", "details": { - "name": "Spawner Config*" + "name": "Spawner Config" } } ], @@ -76,13 +76,13 @@ { "base": "SetdestroyOnDeactivate", "details": { - "name": "Setdestroy On Deactivate" + "name": "Set Destroy On Deactivate" }, "params": [ { "typeid": "{D4D68E8E-9031-448F-9D56-B5575CF4833C}", "details": { - "name": "Spawner Config*" + "name": "Spawner Config" } }, { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/RandomTimedSpawnerRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/RandomTimedSpawnerRequestBus.names index 0938151e90..bef8a10b5f 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/RandomTimedSpawnerRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/RandomTimedSpawnerRequestBus.names @@ -6,7 +6,7 @@ "variant": "", "details": { "name": "Random Timed Spawner", - "category": "Spawner" + "category": "Gameplay/Spawner" }, "methods": [ { From 28e2681b65fde3a7e63a7fe5acc685ab0192f603 Mon Sep 17 00:00:00 2001 From: Mike Chang Date: Tue, 23 Nov 2021 13:41:55 -0800 Subject: [PATCH 229/345] Add signer script and new gpg signing cert (#5847) * Add signer script and new gpg signing cert Signed-off-by: Mike Chang --- .../signer/Platform/Linux/o3de-releases.gpg | Bin 3228 -> 3980 bytes scripts/signer/Platform/Linux/signer.sh | 27 ++++++++++++++++++ 2 files changed, 27 insertions(+) create mode 100644 scripts/signer/Platform/Linux/signer.sh diff --git a/scripts/signer/Platform/Linux/o3de-releases.gpg b/scripts/signer/Platform/Linux/o3de-releases.gpg index 602d822673321c002c4abf2cce48431685dc2733..b5fbb00392ce60d63a1d519022901cc16390e745 100644 GIT binary patch literal 3980 zcmaLZWmFRk-^cMWMoJDOq((QQG)!PLZYUy%fOK~Zq`Mgn5=u@Qh0)~*k(?qW4Hu21 zgdiY{$Lo5|b?)apFYdR$^FRNWpYzQHQi3eAvN#E706W`l#jtk2+4R)q1>Su7`rCL^ z^w5gqMbA6C+ZUeo*!N{hmAAPQp=0JS80StY>ZK;uRUc~Zyu9iWLP8s& zYS9^YssDP%UWz$^^*&|hTyFx!y|QlMm{#}jPEcQ9yxaV;4~iCc{>(w>=Lh|>ch}Nl zFi2v3`6x@QHaNJ>_d1i@dvakoT1VcfYcoz4qoNWrhMwUIe%(P%k>CFhMT8slYqLUs(IBFYM&X6+5#9q-UZ~umStvC7Q`Q*MYH!-fAX3kX6_#8=U&}aoK#3US=R<6a$Y{5g zYwlr1!Ue^ncw|~0j38ZkkEyxUWl)LnLi(d$c2~@USmMKSCihnkCSG`q+c>3wsmomr zF?)w=-*uF~1}Qgj@&>ly!F);~-+sBaRP!PHM3O0jsx!2LK8k5?XMhX^lPD&&XJ>A` zlaOX|Q*}*tmV3J0p|J-Ih!GF4Dv=3{nq>QddlHK_za-WEf_Yf zh#`6f4(})IcUf(Q&WzqKPY292=8cB~XbAuWjVA6AHnvudZkAq-wn#B|FMEi0YMBvLINN=0gy3_ffHml3w%|b-7;ge{CiAmW`t(dsG@`j zXqm(E8$eD*^Y0REL48FklEXaScUjboZ-iFReuRH3C>VRn5RT)^rrqU=+YaMey%)_H z=J#8+?lYE4+QuX@cNZc796g$_^RrM((|B!{F}{h#oh(fbOYqtY%VtonD&`zBg`QB) zrH(3|1~GNX8B}V(w=onDS0ZVhK6p+og39 zW$q`O*-tE`kJ()yh$jK0f#nlbbJI_BKw6d-3gPZJQiuv1$-sn{f!DV!3$q@8&t ztK@GLE@%bh61PcuVa%T7dd;*o2ZV+8b4WTlb+42D6LmwgXyaqKtWBD>$ctnPv*yRm(K)BuMO=vtz3PmQJPrwj$y9x&k1xg9hxe-kCn-r z$0npS^OZxC;QrNXI}YE{W7pP}4I1{iN*88=Cr~|UO$U?2jG)mJ8P`zUG5M_d|P@9}Q9^z%+s-}XlHXI_?<~T2h#QJDD7;)ayGXJo z6&@yb=Z9|7-z%JXB`>01+V>T%2AFRJ$x?d%SVJ&{c!z7GFn)f(2h4wnTn6ik`9E zZXCOEiFI1>l6DjQ88cd5c>vRWPh5WSTid{ zl}OLtBQKWloHPpoGV-D&69D-oqjC9N_2Vj zyDGForR$QA&%Tpi-+^*O;b36~>eQJ^Ps&;#q^|X|QDS3fP_XsehUA3Z9BP?n(X{KY zTJn1|m=woPttX6`F~vp{>Q{qGH6k<~JcxI&>2)`ht;0)sr2~4{(u1F&KB`}U1s7!f zr*Xb3M}rx@!pFL1V%MT%L<|*W8Um$IL;u+6yIbOVGcyq<)D^efTmn4Ci(7`mBUe@r z>9~|uCU}ml_x7zUnX%%HSe|nrsO6_faN#@o@Ao;yfY~30TR&s3@Kj2)Tapvz)(=yA zXbn;YeF`MNno#BSp>bO^oaaECfrECrth$Rav%f;mjRh5jk?Qn{9y~P>!lQc;SOyGc z(R#L>T!woIDzO-K@VV~3j*Wa(kWj5@lIaScvUXZi)b~ek+4|ehu~&+^ymE^CRxW*i z18~ZdG31phUl9N1)Fo!{X5J4F?Kid6SVG(`ThsGCnZ2hkpOij#FbSwCVEyjm^oYcm zz2&~=l!Vg+tBOd?X6lDQKJ5@)b0vO{V&iBo{S#>1Btb{^gS}q$_=PVC9gzLG)fwuP z#TZIl-B`@Wf--ichAS*s{jO(&z6dm{kCwJ@97s?zM6I$y?(VGS0+ z^Y!dzPm@lvvcLk3Al+51;9pYZ~(8d)7$75TfOUZ zsDg-ldBK$C91r!21}IhLl!0Fs(;DkHGzIxHSbi~GR5xivu1}fpK<6|fq*BoZA6o^r z4e4V2U9fYoCO5=IQ20{P*+LS#pJM=(Nc0&6*^Q1`ZqKo28^Wb*T@0kvYK*YI%I{{0 zoWADfuX#g=CLiRWu&k<&F@KgmK0XP@Q$2b!og|<1zzeItBKzk%70kJih2gHlKQzF6;I~XT={pvPs+N* zEv_}k+n(Dn>O0B3hy#DBI*ow?%N|EFczYp`(~B!r_=vMy}6M;CPNrNa*8Ldv})7Rd+SVYGAwBs+P}$s@8^+Sc=q)t~u?K4s%Z>Uk{wNk znBQqnorJf%ZiYBfhA}yL{*yuRAg_NQ;RCV&{~ILQL}Y}0l7c%Ggs~S+SVNb~GsLs0MW+_PKYepShEXr#zNU?c-cA5IIowK<4i5?j)BmZ|a(x=@=b|u?T zwei!b4ywJZ={l|G%p)tdRUKp&w|kH#&$+VZ{D?n5`pm1*`&i6NCTf*LUOIHFqS0|v zNp{cf+Fx7sAf{!KH`{)305EOlnB2Ne{65EwK_~p)H!o9ppQo|QN>UNMlBe`{ zVuHzT@gN2K^QUU;A#E>S%vjjR^Diyy(>+j4v^rpBPk}c5X??G&QSz}q5ng}P+>r#U z^$c+Yhi)7iQSrg?z1*FUlRHH*?!!=-{AnDEP%h1$hG3dWos41ohxw&+gI%n=x8W4Y z7CVHE0ZMEi@3lhuSNkyWb2Fj4uMa94S{@@;=u1uRA4q4e0} zUEu(snNaHQT=3KHTcYPVdw}PB3 zjW_aOV1Nm_u;X6j+V$D4x7b__$7MzYkIAHGkO%-G&urRwK<*3 z!`V(eclJ&@Ki>@_wU_z|Uflp>jH(WyZD>er{@q zNmg@bg{bhPOXl;s{CZMRvkSSLG&@}A;ASDYvOPqoG@!!??B1kdc4gih2@PKW0@{m> z>Anr3z+8(z(ekH>4x^7iKHneAj! zh;4q~9du{WJ$e1CjBm90FC1@oYlf1lmGIgNQgP=aaE(BwJ=EL5(y?p1a2qGw+cMD0 b>GPn-c46$Z!rlJ!x3Pn1@O(oLmD>LS-Kb&Fn`u|1$0f5m}El!r>p%poi6;?7I8#iBYG}T?)I)^DPZ>b`U z<~=o8HE|y~iNKe99~nA2WFG-4e$sHnaIUYcOY%iM3i(FDRb`;iz7^aOSi~CRZwWRj zQHoZ5%pDnNpEZ5Lv~A8C5Yiw!@!2%9oYnCR&v6;#%!q1ZD#w-B5JLrz#(HIpD`eJ( zv08#t)%#u;HgDkG2dZ4cpw!h1D|p{?WZAWQA!#nEGd0P3Zg_?cEf8&ej!oCcz6`Iv z?OnvmsoQh_mIox4&d?Jm_>P~^4Q&xwPL<(drb8eyZob^>bD(ZQ&QK~ZeIQ?ul6TTt##4>vS$wuDBe zrWoDh58uo7M-QON%&3Z&tV-OSqsx$B z-ed5b8Hnbh3fJ#)dbl$Eq;k||G10uoVR+xf@gCn`>uMpuaVE#tEGV_2`18fg<#9!^-~H;sb|K$yfq4O*Lt5z{J%Y}(ov@hC$S7NoN8Vw48k?9N48 z=c;&YL~gLCvg$pIneUw0W8k>Uq_VqyDvOlbs=1_;sZYer;p!YBq<$jLU=o5H=S{Xq z=bHqlDsqcJQC-m4gal{?-a}WgtJBQ7y*9>b^}!uysWVHx0$LlrL*}7+D}@Rh$m_-z z%2()8+;ke8Z&U{Sk93Ko_%QzMM{mqYmDXoUUfgD@S=lEdJkNo`V~Lx~ghsa36io%s zn^^KiDvb{YJU^ko`TBK5GUvZAZhp@W?HiIqJl6cyn^vaEmm427q$0EYp;zbP@k|68 z^7{V%G7uo4cqvfFGhcHQDFVN1H?{_rv2VmCk;fPcZ;~;S>fwJ(r9#w2#XB(T!%Yq( zn(PM%3J_YRK;3XQG2z8cPzREWPA%j(+PycjZ9=;h-4nV;YFawaG*hn+ngs7(URZMk zkl5Rzccxf!4@+)_UT@^vEND~a1vx~E;e>FahknAz?HyA1po*&&noK?o#wEqI0Sv!# z{vza7=&0$ZiF%s6JW5ot7~?(=an~)}j^C_d$gY@`B8Feu6SH=pasH@NDpf7P*07kQS**IE%jyeK@O6xQnD`}%tv!8e#piNBHuO=`c1<)X zun}W~c4mKRz+tqZdVL^SuSlFyVriZb7y%0!zRN4XN2v%H8O03}_~~lX%4j>^(&PE% zr(P+@4g{hbM{zL6xe4rnWtXSPsW6o0Z+-Z7dw#CF(FvvLF#vq=sl0#ELN8#Hi#}(e z!lVj*$uGibZ1&7zV!p?-InFXhgsR$CoS`sLReh*gRvKqm{D=l3F?l5{jl)w_DHno7xRx2;qq$rpXuWu(i$5|vwl zlv{nuX;qZ~)vsaySd7+FP9N>% zVKz5=ZrrsnrbFJV`!?+@DhI4_uB5d9LmXUyys(`p>Zx`upG|tBGCOBI`SGzoYMC}Y z$JEez2S4Hgx@>xw&6 zozmA*mOGP~wPF5#daWXiZ3hs~D3rktoRvx~moz1g;_Q~xW44V0)=S@wsOhYScdKDc zA-KLH*frrU)KL+-A6^FZSrs590l%*xY+8G$ioTbSy_j`Jt z1AU6@qNWi+uRpt!Ym-E99cdwMPxE-enRl?yy991Tb#it4fTa-JUItmD>*r2?uz=g{ z?IH3kg4J2GFkAJW;6Of&arH>~)?>w5u$8K{$%&)goNHi#jCPSRhLf>SnGr}F@ApgnfIdlPieFE#1n7iYo>ulGi(K}j zOV*1+aZC}uaUTtm zUFv)>m{OY|y{ss_DMET#3G)@8pJyn_1P!yT>CLX|f-!&rO1b^vNHk*+hsqk7W`t;k zFlIF5)bawaAB&qEfI^9rRS1i&N34fbwEXca-M8}*Su7Y@ znc!O`+e`+KfN2O;YKRoWBuKWwz~pOauB#91&Y@>Wv0yy!V?!fVql3urs|C-0{{{X< QcjN&6ZWf{?{ExNcKd8DEw*UYD diff --git a/scripts/signer/Platform/Linux/signer.sh b/scripts/signer/Platform/Linux/signer.sh new file mode 100644 index 0000000000..b090012c5a --- /dev/null +++ b/scripts/signer/Platform/Linux/signer.sh @@ -0,0 +1,27 @@ +#!/bin/bash + +# +# 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 +# +# + +set +x + +export GPG_TTY=$(tty) # Required to pass valid tty during ssh sessions +file=$1 + +# dpkg-sig depends on a valid and trusted GPG private key. This also assumes a private key password has already been cached via gpg-agent +# If you do need to pass a password, a gpg argument can be added to the command: +# dpkg-sig -k $fingerprint -g "--pinentry-mode loopback --passphrase $pass" --sign builder + +fingerprint=$(gpg --list-keys --with-colons | awk -F: '/fpr:/ {print $10}' | tail -n1) #Get the last certificate in the list, which is the signing cert +if [ -z $fingerprint ]; then + echo "No valid certs found. Exiting with 1" + exit 1 +fi +echo "Signing with $fingerprint" +dpkg-sig -k $fingerprint --sign builder $file +dpkg-sig --verify $file && echo "Signing $file complete!" From bbdf871a134fd5986b3b493d3164d635f9b4f81c Mon Sep 17 00:00:00 2001 From: Ken Pruiksma Date: Tue, 23 Nov 2021 17:07:29 -0600 Subject: [PATCH 230/345] Terrain detail material blending (#5714) * Added buffer for material properties of detail mateirals, storing them in a multi-indexed data vector. Updated shader with relevant struct and buffer, but the buffer will need to be moved out of the mateiral SRG to work. Signed-off-by: Ken Pruiksma * Added buffer for material properties of detail mateirals, storing them in a multi-indexed data vector. Updated shader with relevant struct and buffer, but the buffer will need to be moved out of the mateiral SRG to work. Signed-off-by: Ken Pruiksma * Added buffer for material properties of detail mateirals, storing them in a multi-indexed data vector. Updated shader with relevant struct and buffer, but the buffer will need to be moved out of the mateiral SRG to work. Signed-off-by: Ken Pruiksma * - Moved settings related to the detail material to a partial view srg owned by the terrain gem. - Added support for base color in detail materials. - Hooked up basic base color rendering of detail materials. - Corrected the way the material data was stored. - Added ref counting for detail materials so they can be released when no longer used. Signed-off-by: Ken Pruiksma * Added buffer for material properties of detail mateirals, storing them in a multi-indexed data vector. Updated shader with relevant struct and buffer, but the buffer will need to be moved out of the mateiral SRG to work. Signed-off-by: Ken Pruiksma * - Moved settings related to the detail material to a partial view srg owned by the terrain gem. - Added support for base color in detail materials. - Hooked up basic base color rendering of detail materials. - Corrected the way the material data was stored. - Added ref counting for detail materials so they can be released when no longer used. Signed-off-by: Ken Pruiksma * Detail materials now put textures into bindless array that's accessed in the shader. Shader now pulls all the detail materal information for a single mateiral but does no blending. Signed-off-by: Ken Pruiksma * Correcting rebase merge problem. Signed-off-by: Ken Pruiksma * Fix detail roughness fade out with distance. Signed-off-by: Ken Pruiksma * Adding tests for new MultiIndexedDataVector functions Signed-off-by: Ken Pruiksma * Updates to move bindless array to separate SRG - Exposed BindSrg() in renderpass so it's possible to add additional SRGs to a pass - Created a TerrainSrg for use by the terrain forward shader - Moved the bindless array out of the partial view SRG to the TerrainSrg Signed-off-by: Ken Pruiksma * Moved more properties out of the view srg to the terrain srg. Signed-off-by: Ken Pruiksma * Spelling fixes Signed-off-by: Ken Pruiksma * Fixing bug where the roughness min/max value were inverted. Also fixed bug where bad data would show for areas where there was no macro material. Signed-off-by: Ken Pruiksma * Detail material blending WIP. Mostly working, but small seams between each materila id pixel. Signed-off-by: Ken Pruiksma * Switching to using Load() for the detail material IDs and calculating the positions manually since Gather()'s precsion leaves seams along the edges. Signed-off-by: Ken Pruiksma * Updates from PR review Signed-off-by: Ken Pruiksma * Fixing case issues and updating function name due to a recent fix. Signed-off-by: Ken Pruiksma * Switching to using SampleGrad() instead of Sample() for detail textures to fix a bug where the incorrect mip level was chosen around the seams of the detail material id texture. Signed-off-by: Ken Pruiksma * Remove unneeded sampler and some debug settings in the shader. Condensing some duplicate code Signed-off-by: Ken Pruiksma * Updates from PR review and some minor improvements Signed-off-by: Ken Pruiksma * Updated with PR feedback. Fixed a fairly significant bug with blending. Also contains a few minor fixes, simplifications, and comments for clarity. Signed-off-by: Ken Pruiksma * Update weight adjustment equation to trust the compiler less Signed-off-by: Ken Pruiksma * fix bug Signed-off-by: Ken Pruiksma * Fixing bug in terrain normal factor. Adjusting normal calculation to avoid the need for an identity transform. Signed-off-by: Ken Pruiksma * Removing unused fields from the material SRG. Adding basecolor back in in the material type. Updating the default terrain material to not use fields that no longer exist. Signed-off-by: Ken Pruiksma --- .../Terrain/DefaultPbrTerrain.material | 7 +- .../Materials/Terrain/PbrTerrain.materialtype | 13 ++ .../Shaders/Terrain/TerrainCommon.azsli | 23 +-- .../Terrain/TerrainDetailHelpers.azsli | 173 +++++++++++++++--- .../Terrain/TerrainPBR_ForwardPass.azsl | 9 +- .../Terrain/TerrainPBR_ForwardPass.shader | 6 + .../Assets/Shaders/Terrain/TerrainSrg.azsli | 10 - 7 files changed, 178 insertions(+), 63 deletions(-) diff --git a/Gems/Terrain/Assets/Materials/Terrain/DefaultPbrTerrain.material b/Gems/Terrain/Assets/Materials/Terrain/DefaultPbrTerrain.material index 7cf249a10d..53f6fd5b9e 100644 --- a/Gems/Terrain/Assets/Materials/Terrain/DefaultPbrTerrain.material +++ b/Gems/Terrain/Assets/Materials/Terrain/DefaultPbrTerrain.material @@ -2,5 +2,10 @@ "description": "", "materialType": "PbrTerrain.materialtype", "parentMaterial": "", - "propertyLayoutVersion": 1 + "propertyLayoutVersion": 1, + "properties": { + "baseColor": { + "color": [ 0.18, 0.18, 0.18 ] + } + } } diff --git a/Gems/Terrain/Assets/Materials/Terrain/PbrTerrain.materialtype b/Gems/Terrain/Assets/Materials/Terrain/PbrTerrain.materialtype index a20ac23e17..1e7305cc11 100644 --- a/Gems/Terrain/Assets/Materials/Terrain/PbrTerrain.materialtype +++ b/Gems/Terrain/Assets/Materials/Terrain/PbrTerrain.materialtype @@ -88,6 +88,19 @@ } } ], + "baseColor": [ + { + "name": "color", + "displayName": "Color", + "description": "Color is displayed as sRGB but the values are stored as linear color.", + "type": "Color", + "defaultValue": [ 1.0, 1.0, 1.0 ], + "connection": { + "type": "ShaderInput", + "name": "m_baseColor" + } + } + ], "settings": [ { "id": "detailTextureMultiplier", diff --git a/Gems/Terrain/Assets/Shaders/Terrain/TerrainCommon.azsli b/Gems/Terrain/Assets/Shaders/Terrain/TerrainCommon.azsli index f5af598435..770f877ea8 100644 --- a/Gems/Terrain/Assets/Shaders/Terrain/TerrainCommon.azsli +++ b/Gems/Terrain/Assets/Shaders/Terrain/TerrainCommon.azsli @@ -93,10 +93,6 @@ ShaderResourceGroup ObjectSrg : SRG_PerObject ShaderResourceGroup TerrainMaterialSrg : SRG_PerMaterial { - float m_detailTextureMultiplier; - float m_detailFadeDistance; - float m_detailFadeLength; - Sampler m_sampler { AddressU = Wrap; @@ -109,22 +105,11 @@ ShaderResourceGroup TerrainMaterialSrg : SRG_PerMaterial // Base Color float3 m_baseColor; - float m_baseColorFactor; - Texture2D m_baseColorMap; - // Normal - Texture2D m_normalMap; - bool m_flipNormalX; - bool m_flipNormalY; - float m_normalFactor; - - // Roughness - Texture2D m_roughnessMap; - float m_roughnessFactor; - - // Specular - Texture2D m_specularF0Map; - float m_specularF0Factor; + // Detail Material Properties + float m_detailTextureMultiplier; + float m_detailFadeDistance; + float m_detailFadeLength; } option bool o_useTerrainSmoothing = false; diff --git a/Gems/Terrain/Assets/Shaders/Terrain/TerrainDetailHelpers.azsli b/Gems/Terrain/Assets/Shaders/Terrain/TerrainDetailHelpers.azsli index e5d5ff688d..33c817c0f9 100644 --- a/Gems/Terrain/Assets/Shaders/Terrain/TerrainDetailHelpers.azsli +++ b/Gems/Terrain/Assets/Shaders/Terrain/TerrainDetailHelpers.azsli @@ -57,7 +57,30 @@ DetailSurface GetDefaultDetailSurface() return surface; } +void WeightDetailSurface(inout DetailSurface surface, in float weight) +{ + surface.m_color *= weight; + surface.m_normal *= weight; + surface.m_roughness *= weight; + surface.m_specularF0 *= weight; + surface.m_metalness *= weight; + surface.m_occlusion *= weight; + surface.m_height *= weight; +} + +void AddDetailSurface(inout DetailSurface surface, in DetailSurface surfaceToAdd) +{ + surface.m_color += surfaceToAdd.m_color; + surface.m_normal += surfaceToAdd.m_normal; + surface.m_roughness += surfaceToAdd.m_roughness; + surface.m_specularF0 += surfaceToAdd.m_specularF0; + surface.m_metalness += surfaceToAdd.m_metalness; + surface.m_occlusion += surfaceToAdd.m_occlusion; + surface.m_height += surfaceToAdd.m_height; +} + // Detail material index getters + uint GetDetailColorIndex(TerrainSrg::DetailMaterialData materialData) { return materialData.m_colorNormalImageIndices & 0x0000FFFF; @@ -95,22 +118,22 @@ uint GetDetailHeightIndex(TerrainSrg::DetailMaterialData materialData) // Detail material value getters -float3 GetDetailColor(TerrainSrg::DetailMaterialData materialData, float2 uv) +float3 GetDetailColor(TerrainSrg::DetailMaterialData materialData, float2 uv, float2 ddx, float2 ddy) { float3 color = materialData.m_baseColor; if ((materialData.m_flags & DetailTextureFlags::UseTextureBaseColor) > 0) { - color = TerrainSrg::m_detailTextures[GetDetailColorIndex(materialData)].Sample(TerrainMaterialSrg::m_sampler, uv).rgb; + color = TerrainSrg::m_detailTextures[GetDetailColorIndex(materialData)].SampleGrad(TerrainMaterialSrg::m_sampler, uv, ddx, ddy).rgb; } return color * materialData.m_baseColorFactor; } -float3 GetDetailNormal(TerrainSrg::DetailMaterialData materialData, float2 uv) +float3 GetDetailNormal(TerrainSrg::DetailMaterialData materialData, float2 uv, float2 ddx, float2 ddy) { float2 normal = float2(0.0, 0.0); if ((materialData.m_flags & DetailTextureFlags::UseTextureNormal) > 0) { - normal = TerrainSrg::m_detailTextures[GetDetailNormalIndex(materialData)].Sample(TerrainMaterialSrg::m_sampler, uv).rg; + normal = TerrainSrg::m_detailTextures[GetDetailNormalIndex(materialData)].SampleGrad(TerrainMaterialSrg::m_sampler, uv, ddx, ddy).rg; } // X and Y are inverted here to be consistent with SampleNormalXY in NormalInput.azsli. @@ -125,53 +148,53 @@ float3 GetDetailNormal(TerrainSrg::DetailMaterialData materialData, float2 uv) return GetTangentSpaceNormal(normal, materialData.m_normalFactor); } -float GetDetailRoughness(TerrainSrg::DetailMaterialData materialData, float2 uv) +float GetDetailRoughness(TerrainSrg::DetailMaterialData materialData, float2 uv, float2 ddx, float2 ddy) { float roughness = materialData.m_roughnessScale; if ((materialData.m_flags & DetailTextureFlags::UseTextureRoughness) > 0) { - roughness = TerrainSrg::m_detailTextures[GetDetailRoughnessIndex(materialData)].Sample(TerrainMaterialSrg::m_sampler, uv).r; + roughness = TerrainSrg::m_detailTextures[GetDetailRoughnessIndex(materialData)].SampleGrad(TerrainMaterialSrg::m_sampler, uv, ddx, ddy).r; roughness = materialData.m_roughnessBias + roughness * materialData.m_roughnessScale; } return roughness; } -float GetDetailMetalness(TerrainSrg::DetailMaterialData materialData, float2 uv) +float GetDetailMetalness(TerrainSrg::DetailMaterialData materialData, float2 uv, float2 ddx, float2 ddy) { float metalness = 1.0; if ((materialData.m_flags & DetailTextureFlags::UseTextureMetallic) > 0) { - metalness = TerrainSrg::m_detailTextures[GetDetailMetalnessIndex(materialData)].Sample(TerrainMaterialSrg::m_sampler, uv).r; + metalness = TerrainSrg::m_detailTextures[GetDetailMetalnessIndex(materialData)].SampleGrad(TerrainMaterialSrg::m_sampler, uv, ddx, ddy).r; } return metalness * materialData.m_metalFactor; } -float GetDetailSpecularF0(TerrainSrg::DetailMaterialData materialData, float2 uv) +float GetDetailSpecularF0(TerrainSrg::DetailMaterialData materialData, float2 uv, float2 ddx, float2 ddy) { float specularF0 = 1.0; if ((materialData.m_flags & DetailTextureFlags::UseTextureSpecularF0) > 0) { - specularF0 = TerrainSrg::m_detailTextures[GetDetailSpecularF0Index(materialData)].Sample(TerrainMaterialSrg::m_sampler, uv).r; + specularF0 = TerrainSrg::m_detailTextures[GetDetailSpecularF0Index(materialData)].SampleGrad(TerrainMaterialSrg::m_sampler, uv, ddx, ddy).r; } return specularF0 * materialData.m_specularF0Factor; } -float GetDetailOcclusion(TerrainSrg::DetailMaterialData materialData, float2 uv) +float GetDetailOcclusion(TerrainSrg::DetailMaterialData materialData, float2 uv, float2 ddx, float2 ddy) { float occlusion = 1.0; if ((materialData.m_flags & DetailTextureFlags::UseTextureOcclusion) > 0) { - occlusion = TerrainSrg::m_detailTextures[GetDetailOcclusionIndex(materialData)].Sample(TerrainMaterialSrg::m_sampler, uv).r; + occlusion = TerrainSrg::m_detailTextures[GetDetailOcclusionIndex(materialData)].SampleGrad(TerrainMaterialSrg::m_sampler, uv, ddx, ddy).r; } return occlusion * materialData.m_occlusionFactor; } -float GetDetailHeight(TerrainSrg::DetailMaterialData materialData, float2 uv) +float GetDetailHeight(TerrainSrg::DetailMaterialData materialData, float2 uv, float2 ddx, float2 ddy) { float height = materialData.m_heightFactor; if ((materialData.m_flags & DetailTextureFlags::UseTextureHeight) > 0) { - height = TerrainSrg::m_detailTextures[GetDetailHeightIndex(materialData)].Sample(TerrainMaterialSrg::m_sampler, uv).r; + height = TerrainSrg::m_detailTextures[GetDetailHeightIndex(materialData)].SampleGrad(TerrainMaterialSrg::m_sampler, uv, ddx, ddy).r; height = materialData.m_heightOffset + height * materialData.m_heightFactor; } return height; @@ -181,15 +204,19 @@ void GetDetailSurfaceForMaterial(inout DetailSurface surface, uint materialId, f { TerrainSrg::DetailMaterialData detailMaterialData = TerrainSrg::m_detailMaterialData[materialId]; - surface.m_color = GetDetailColor(detailMaterialData, uv); - surface.m_normal = GetDetailNormal(detailMaterialData, uv); - surface.m_roughness = GetDetailRoughness(detailMaterialData, uv); - surface.m_specularF0 = GetDetailSpecularF0(detailMaterialData, uv); - surface.m_metalness = GetDetailMetalness(detailMaterialData, uv); - surface.m_occlusion = GetDetailOcclusion(detailMaterialData, uv); - surface.m_height = GetDetailHeight(detailMaterialData, uv); + float2 uvDdx = ddx(uv); + float2 uvDdy = ddy(uv); + + surface.m_color = GetDetailColor(detailMaterialData, uv, uvDdx, uvDdy); + surface.m_normal = GetDetailNormal(detailMaterialData, uv, uvDdx, uvDdy); + surface.m_roughness = GetDetailRoughness(detailMaterialData, uv, uvDdx, uvDdy); + surface.m_specularF0 = GetDetailSpecularF0(detailMaterialData, uv, uvDdx, uvDdy); + surface.m_metalness = GetDetailMetalness(detailMaterialData, uv, uvDdx, uvDdy); + surface.m_occlusion = GetDetailOcclusion(detailMaterialData, uv, uvDdx, uvDdy); + surface.m_height = GetDetailHeight(detailMaterialData, uv, uvDdx, uvDdy); } +// Debugs the detail material by choosing a random color per material ID and rendering it without blending. void GetDebugDetailSurface(inout DetailSurface surface, uint material1, uint material2, float blend, float2 idUv) { float3 material1Color = float3(0.1, 0.1, 0.1); @@ -210,7 +237,7 @@ void GetDebugDetailSurface(inout DetailSurface surface, uint material1, uint mat surface.m_color = lerp(material1Color, material2Color, blend); float seamBlend = 0.0; const float halfLineWidth = 1.0 / 2048.0; - if (any(abs(idUv) % 1.0 < halfLineWidth) || any(abs(idUv) % 1.0 > 1.0 - halfLineWidth)) + if (any(frac(abs(idUv)) < halfLineWidth) || any(frac(abs(idUv)) > 1.0 - halfLineWidth)) { seamBlend = 1.0; } @@ -225,26 +252,114 @@ void GetDebugDetailSurface(inout DetailSurface surface, uint material1, uint mat surface.m_height = 0.5; } -bool GetDetailSurface(inout DetailSurface surface, float2 idUv, float2 uv) +//Blend a single detail material sample (with two possible material ids) onto a DetailSurface. +void BlendDetailMaterial(inout DetailSurface surface, uint material1, uint material2, float blend, float2 detailUv, float weight) { - uint4 material1 = TerrainSrg::m_detailMaterialIdImage.GatherRed(TerrainSrg::DetailSampler, idUv, 0).xyzw; - uint4 material2 = TerrainSrg::m_detailMaterialIdImage.GatherGreen(TerrainSrg::DetailSampler, idUv, 0).xyzw; + DetailSurface tempSurface; + GetDetailSurfaceForMaterial(tempSurface, material1, detailUv); + WeightDetailSurface(tempSurface, weight * (1.0 - blend)); + AddDetailSurface(surface, tempSurface); + if (material2 != 0xFF) + { + GetDetailSurfaceForMaterial(tempSurface, material2, detailUv); + WeightDetailSurface(tempSurface, weight * blend); + AddDetailSurface(surface, tempSurface); + } +} - const float maxBlendAmount = 0xFF; +/* +Populates a DetailSurface with material data gathered form the 4 nearest samples to detailMaterialIdUv. The weight +of each detail material's contribution is calculated based on the distance to the center point for that sample (for +instance, if detailMaterialIdUv falls perfectly in-between all 4 samples, then each sample will be weighed at 25%). +Each sample can have two different detail materials defined with a blend value to determine their relative contribution. +The detailUv is used for sampling the textures of each detail material. +*/ +bool GetDetailSurface(inout DetailSurface surface, float2 detailMaterialIdUv, float2 detailUv) +{ + float2 textureSize; + TerrainSrg::m_detailMaterialIdImage.GetDimensions(textureSize.x, textureSize.y); + + float2 detailMaterialIdCoord = detailMaterialIdUv * textureSize; // uv -> pixel coordinate + + // detailMaterialIdCoord could be negative, so add textureSize to ensure it is positive + detailMaterialIdCoord += textureSize; + + // The detail material id texture wraps since the "center" point can be anywhere in the texture, so mod by texturesize + int2 detailMaterailIdTopLeft = int2(detailMaterialIdCoord) % textureSize; + int2 detailMaterailIdBottomRight = (int2(detailMaterialIdCoord) + 1) % textureSize; + + // Using Load() to gather the nearest 4 samples (Gather4() isn't used because of precision issues with uvs). + uint4 s1 = TerrainSrg::m_detailMaterialIdImage.Load(int3(detailMaterailIdTopLeft.x, detailMaterailIdBottomRight.y, 0)); + uint4 s2 = TerrainSrg::m_detailMaterialIdImage.Load(int3(detailMaterailIdBottomRight, 0)); + uint4 s3 = TerrainSrg::m_detailMaterialIdImage.Load(int3(detailMaterailIdBottomRight.x, detailMaterailIdTopLeft.y, 0)); + uint4 s4 = TerrainSrg::m_detailMaterialIdImage.Load(int3(detailMaterailIdTopLeft, 0)); + + uint4 material1 = uint4(s1.x, s2.x, s3.x, s4.x); + uint4 material2 = uint4(s1.y, s2.y, s3.y, s4.y); + // convert integer of 0-255 to float of 0-1. - float4 blends = float4(TerrainSrg::m_detailMaterialIdImage.GatherBlue(TerrainSrg::DetailSampler, idUv, 0).xyzw) / maxBlendAmount; + const float maxBlendAmount = 0xFF; + float4 blends = float4(s1.z, s2.z, s3.z, s4.z) / maxBlendAmount; + + // Calculate weight based on proximity to detail material samples + float2 gatherWeight = frac(detailMaterialIdCoord); + // Adjust the gather weight for better interpolation by (3x^2 - 2x^3). This helps avoid diamond-shaped artifacts in binlinear filtering. + gatherWeight = gatherWeight * gatherWeight * (3.0 - 2.0 * gatherWeight); if (o_debugDetailMaterialIds) { + float2 idUv = (detailMaterialIdCoord + gatherWeight - 0.5) / textureSize; GetDebugDetailSurface(surface, material1.x, material2.x, blends.x, idUv); return true; } - if (material1.x == 0xFF) + // If any sample has no materials, give up. + if (any(material1 == 0xFF)) { return false; } - GetDetailSurfaceForMaterial(surface, material1.x, uv); + if (all(material1.x == material1.yzw) && all(material2.x == material2.yzw)) + { + // Fast path for same material ids + GetDetailSurfaceForMaterial(surface, material1.x, detailUv); + if (material2.x != 0xFF) + { + float4 material2Blends = 1.0 - blends; + DetailSurface tempSurface; + float weight = + ((1.0 - gatherWeight.x) * gatherWeight.y * material2Blends.x) + + (gatherWeight.x * gatherWeight.y * material2Blends.y) + + (gatherWeight.x * (1.0 - gatherWeight.y) * material2Blends.z) + + ((1.0 - gatherWeight.x) * (1.0 - gatherWeight.y) * material2Blends.w); + WeightDetailSurface(surface, weight); + GetDetailSurfaceForMaterial(tempSurface, material2.x, detailUv); + WeightDetailSurface(tempSurface, 1.0 - weight); + AddDetailSurface(surface, tempSurface); + } + } + else + { + surface = (DetailSurface)0; + + // X + float weight = (1.0 - gatherWeight.x) * gatherWeight.y; + BlendDetailMaterial(surface, material1.x, material2.x, blends.x, detailUv, weight); + + // Y + weight = gatherWeight.x * gatherWeight.y; + BlendDetailMaterial(surface, material1.y, material2.y, blends.y, detailUv, weight); + + // Z + weight = gatherWeight.x * (1.0 - gatherWeight.y); + BlendDetailMaterial(surface, material1.z, material2.z, blends.z, detailUv, weight); + + // W + weight = (1.0 - gatherWeight.x) * (1.0 - gatherWeight.y); + BlendDetailMaterial(surface, material1.w, material2.w, blends.w, detailUv, weight); + } + + surface.m_normal = normalize(surface.m_normal); + return true; } diff --git a/Gems/Terrain/Assets/Shaders/Terrain/TerrainPBR_ForwardPass.azsl b/Gems/Terrain/Assets/Shaders/Terrain/TerrainPBR_ForwardPass.azsl index 6b68336a3f..ab9064e740 100644 --- a/Gems/Terrain/Assets/Shaders/Terrain/TerrainPBR_ForwardPass.azsl +++ b/Gems/Terrain/Assets/Shaders/Terrain/TerrainPBR_ForwardPass.azsl @@ -109,9 +109,10 @@ ForwardPassOutput TerrainPBR_MainPassPS(VSOutput IN) { bool flipX = ObjectSrg::m_macroMaterialData[i].m_flipNormalX; bool flipY = ObjectSrg::m_macroMaterialData[i].m_flipNormalY; - bool factor = ObjectSrg::m_macroMaterialData[i].m_normalFactor; - macroNormal = GetNormalInputTS(ObjectSrg::m_macroNormalMap[i], TerrainMaterialSrg::m_sampler, - macroUv, flipX, flipY, CreateIdentity3x3(), true, factor); + float factor = ObjectSrg::m_macroMaterialData[i].m_normalFactor; + + float2 sampledValue = SampleNormalXY(ObjectSrg::m_macroNormalMap[i], TerrainMaterialSrg::m_sampler, macroUv, flipX, flipY); + macroNormal = normalize(GetTangentSpaceNormal_Unnormalized(sampledValue.xy, factor)); } break; } @@ -129,7 +130,7 @@ ForwardPassOutput TerrainPBR_MainPassPS(VSOutput IN) // Check to make sure we're inside the detail texture's bounds and within where detail textures should be drawn. if (detailFactor < 1.0 && all(detailRegionUv > TerrainSrg::m_detailHalfPixelUv) && all(detailRegionUv < 1.0 - TerrainSrg::m_detailHalfPixelUv)) { - detailRegionUv += TerrainSrg::m_detailMaterialIdImageCenter - (0.5); + detailRegionUv += TerrainSrg::m_detailMaterialIdImageCenter - 0.5; hasDetailSurface = GetDetailSurface(detailSurface, detailRegionUv, detailUv); } diff --git a/Gems/Terrain/Assets/Shaders/Terrain/TerrainPBR_ForwardPass.shader b/Gems/Terrain/Assets/Shaders/Terrain/TerrainPBR_ForwardPass.shader index 0e6f0beb1d..66072567ec 100644 --- a/Gems/Terrain/Assets/Shaders/Terrain/TerrainPBR_ForwardPass.shader +++ b/Gems/Terrain/Assets/Shaders/Terrain/TerrainPBR_ForwardPass.shader @@ -1,6 +1,12 @@ { "Source" : "./TerrainPBR_ForwardPass.azsl", + "CompilerHints" : + { + "DisableOptimizations" : false, + "GenerateDebugInfo" : false + }, + "DepthStencilState" : { "Depth" : diff --git a/Gems/Terrain/Assets/Shaders/Terrain/TerrainSrg.azsli b/Gems/Terrain/Assets/Shaders/Terrain/TerrainSrg.azsli index c8ab04a5bc..f980e02b9d 100644 --- a/Gems/Terrain/Assets/Shaders/Terrain/TerrainSrg.azsli +++ b/Gems/Terrain/Assets/Shaders/Terrain/TerrainSrg.azsli @@ -17,16 +17,6 @@ ShaderResourceGroupSemantic SRG_Terrain ShaderResourceGroup TerrainSrg : SRG_Terrain { - - Sampler DetailSampler - { - AddressU = Wrap; - AddressV = Wrap; - MinFilter = Point; - MagFilter = Point; - MipFilter = Point; - }; - struct DetailMaterialData { // Uv From 99d0c39273fed3742acffa0fafd07038e5ef4b25 Mon Sep 17 00:00:00 2001 From: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com> Date: Tue, 23 Nov 2021 18:25:00 -0600 Subject: [PATCH 231/345] O3DE.exe Project-Centric "Open Editor" fix (#5852) * The O3DE.exe Open Editor button now attempts to open the Editor in the build directory of the project being opened. If their is no Editor within the build directory of the Project, it uses the Editor.exe in the current O3DE.exe executable directory if it exists Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com> * Engine .gitignore now ignores the build directory if placed in the AutomatedTesting project Previously it was just ignoring a `[Bb]uild` directory if it was directly within the engine root. This change matches the behavior of the project templates. Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com> * Renamed the ProjectUtils GetEditorDirectory function to GetEditorExecutablePath Added a platform specific implementation for retrieving the path to the Editor executable in the GetEditorExectuablePath function. It first attempts to locate the Editor via checking the project build directory for an Editor executable before falling back to checking the binary directory of the currently running O3DE executable. Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com> * Correct the MacOS GetEditorExecutablePath to return the Editor path Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com> --- .gitignore | 2 +- .../Platform/Linux/ProjectUtils_linux.cpp | 56 +++++++++++-- .../Platform/Mac/ProjectUtils_mac.cpp | 79 +++++++++++++++---- .../Platform/Windows/ProjectUtils_windows.cpp | 60 ++++++++++++-- .../Source/ProjectButtonWidget.cpp | 4 +- .../ProjectManager/Source/ProjectUtils.h | 22 +++++- .../ProjectManager/Source/ProjectsScreen.cpp | 17 ++-- 7 files changed, 201 insertions(+), 39 deletions(-) diff --git a/.gitignore b/.gitignore index 3a9b8f6f8e..9fd70a927f 100644 --- a/.gitignore +++ b/.gitignore @@ -3,7 +3,7 @@ .vscode/ __pycache__ AssetProcessorTemp/** -[Bb]uild/** +[Bb]uild/ [Oo]ut/** CMakeUserPresets.json [Cc]ache/ diff --git a/Code/Tools/ProjectManager/Platform/Linux/ProjectUtils_linux.cpp b/Code/Tools/ProjectManager/Platform/Linux/ProjectUtils_linux.cpp index cb8ea843e5..f0603dc23f 100644 --- a/Code/Tools/ProjectManager/Platform/Linux/ProjectUtils_linux.cpp +++ b/Code/Tools/ProjectManager/Platform/Linux/ProjectUtils_linux.cpp @@ -1,6 +1,6 @@ /* * 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 * */ @@ -10,6 +10,8 @@ #include #include +#include +#include #include namespace O3DE::ProjectManager @@ -68,7 +70,7 @@ namespace O3DE::ProjectManager QProcess process; - // if the project build path is relative, it should be relative to the project path + // if the project build path is relative, it should be relative to the project path process.setWorkingDirectory(projectPath); process.setProgram("cmake-gui"); @@ -80,7 +82,7 @@ namespace O3DE::ProjectManager return AZ::Success(); } - + AZ::Outcome RunGetPythonScript(const QString& engineRoot) { return ExecuteCommandResultModalDialog( @@ -89,9 +91,53 @@ namespace O3DE::ProjectManager QObject::tr("Running get_python script...")); } - AZ::IO::FixedMaxPath GetEditorDirectory() + AZ::IO::FixedMaxPath GetEditorExecutablePath(const AZ::IO::PathView& projectPath) { - return AZ::Utils::GetExecutableDirectory(); + AZ::IO::FixedMaxPath editorPath; + AZ::IO::FixedMaxPath fixedProjectPath{ projectPath }; + // First attempt to launch the Editor.exe within the project build directory if it exists + AZ::IO::FixedMaxPath buildPathSetregPath = fixedProjectPath + / AZ::SettingsRegistryInterface::DevUserRegistryFolder + / "Platform" / AZ_TRAIT_OS_PLATFORM_CODENAME / "build_path.setreg"; + if (AZ::IO::SystemFile::Exists(buildPathSetregPath.c_str())) + { + AZ::SettingsRegistryImpl settingsRegistry; + // Merge the build_path.setreg into the local SettingsRegistry instance + if (AZ::IO::FixedMaxPath projectBuildPath; + settingsRegistry.MergeSettingsFile(buildPathSetregPath.Native(), + AZ::SettingsRegistryInterface::Format::JsonMergePatch) + && settingsRegistry.Get(projectBuildPath.Native(), AZ::SettingsRegistryMergeUtils::ProjectBuildPath)) + { + // local Settings Registry will be used to merge the build_path.setreg for the supplied projectPath + AZ::IO::FixedMaxPath buildConfigurationPath = (fixedProjectPath / projectBuildPath).LexicallyNormal(); + + // First try /bin/$ and if that path doesn't exist + // try /bin/$/$ + buildConfigurationPath /= "bin"; + if (editorPath = (buildConfigurationPath / AZ_BUILD_CONFIGURATION_TYPE / "Editor"). + ReplaceExtension(AZ_TRAIT_OS_EXECUTABLE_EXTENSION); + AZ::IO::SystemFile::Exists(editorPath.c_str())) + { + return editorPath; + } + else if (editorPath = (buildConfigurationPath / AZ_TRAIT_OS_PLATFORM_CODENAME + / AZ_BUILD_CONFIGURATION_TYPE / "Editor"). + ReplaceExtension(AZ_TRAIT_OS_EXECUTABLE_EXTENSION); + AZ::IO::SystemFile::Exists(editorPath.c_str())) + { + return editorPath; + } + } + } + + // Fall back to checking if an Editor exists in O3DE executable directory + editorPath = AZ::IO::FixedMaxPath(AZ::Utils::GetExecutableDirectory()) / "Editor"; + editorPath.ReplaceExtension(AZ_TRAIT_OS_EXECUTABLE_EXTENSION); + if (AZ::IO::SystemFile::Exists(editorPath.c_str())) + { + return editorPath; + } + return {}; } AZ::Outcome CreateDesktopShortcut([[maybe_unused]] const QString& filename, [[maybe_unused]] const QString& targetPath, [[maybe_unused]] const QStringList& arguments) diff --git a/Code/Tools/ProjectManager/Platform/Mac/ProjectUtils_mac.cpp b/Code/Tools/ProjectManager/Platform/Mac/ProjectUtils_mac.cpp index 07b08924f1..2b5556fa88 100644 --- a/Code/Tools/ProjectManager/Platform/Mac/ProjectUtils_mac.cpp +++ b/Code/Tools/ProjectManager/Platform/Mac/ProjectUtils_mac.cpp @@ -1,6 +1,6 @@ /* * 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 * */ @@ -11,8 +11,9 @@ #include #include -#include +#include #include +#include namespace O3DE::ProjectManager { @@ -21,7 +22,7 @@ namespace O3DE::ProjectManager AZ::Outcome SetupCommandLineProcessEnvironment() { // For CMake on Mac, if its installed through home-brew, then it will be installed - // under /usr/local/bin, which may not be in the system PATH environment. + // under /usr/local/bin, which may not be in the system PATH environment. // Add that path for the command line process so that it will be able to locate // a home-brew installed version of CMake QString pathEnv = qEnvironmentVariable("PATH"); @@ -73,11 +74,11 @@ namespace O3DE::ProjectManager return AZ::Success(xcodeBuilderVersionNumber); - } + } AZ::Outcome OpenCMakeGUI(const QString& projectPath) { - const QString cmakeHelp = QObject::tr("Please verify you've installed CMake.app from " + const QString cmakeHelp = QObject::tr("Please verify you've installed CMake.app from " "cmake.org or, if using HomeBrew, " "have installed it with 
brew install --cask cmake
"); QString cmakeAppPath = QStandardPaths::locate(QStandardPaths::ApplicationsLocation, "CMake.app", QStandardPaths::LocateDirectory); @@ -95,7 +96,7 @@ namespace O3DE::ProjectManager QProcess process; - // if the project build path is relative, it should be relative to the project path + // if the project build path is relative, it should be relative to the project path process.setWorkingDirectory(projectPath); process.setProgram("open"); process.setArguments({"-a", "CMake", "--args", "-S", projectPath, "-B", projectBuildPath}); @@ -106,7 +107,7 @@ namespace O3DE::ProjectManager return AZ::Success(); } - + AZ::Outcome RunGetPythonScript(const QString& engineRoot) { return ExecuteCommandResultModalDialog( @@ -115,30 +116,74 @@ namespace O3DE::ProjectManager QObject::tr("Running get_python script...")); } - AZ::IO::FixedMaxPath GetEditorDirectory() + AZ::IO::FixedMaxPath GetEditorExecutablePath(const AZ::IO::PathView& projectPath) { - AZ::IO::FixedMaxPath executableDirectory = AZ::Utils::GetExecutableDirectory(); - AZ::IO::FixedMaxPath editorPath{ executableDirectory }; - editorPath /= "../../../Editor.app/Contents/MacOS"; - editorPath = editorPath.LexicallyNormal(); - if (!AZ::IO::SystemFile::IsDirectory(editorPath.c_str())) + AZ::IO::FixedMaxPath editorPath; + AZ::IO::FixedMaxPath fixedProjectPath{ projectPath }; + + // First attempt to launch the Editor.exe within the project build directory if it exists + AZ::IO::FixedMaxPath buildPathSetregPath = fixedProjectPath + / AZ::SettingsRegistryInterface::DevUserRegistryFolder + / "Platform" / AZ_TRAIT_OS_PLATFORM_CODENAME / "build_path.setreg"; + if (AZ::IO::SystemFile::Exists(buildPathSetregPath.c_str())) { + AZ::SettingsRegistryImpl localRegistry; + // Merge the build_path.setreg into the local SettingsRegistry instance + if (AZ::IO::FixedMaxPath projectBuildPath; + localRegistry.MergeSettingsFile(buildPathSetregPath.Native(), + AZ::SettingsRegistryInterface::Format::JsonMergePatch) + && localRegistry.Get(projectBuildPath.Native(), AZ::SettingsRegistryMergeUtils::ProjectBuildPath)) + { + // local Settings Registry will be used to merge the build_path.setreg for the supplied projectPath + AZ::IO::FixedMaxPath buildConfigurationPath = (fixedProjectPath / projectBuildPath).LexicallyNormal(); + + // First try "/bin/$/Editor.app/Contents/MacOS" + // Followed by "/bin/$/$/Editor.app/Contents/MacOS" + // Directory existence is checked in this case + buildConfigurationPath /= "bin"; + if (editorPath = (buildConfigurationPath + / AZ_BUILD_CONFIGURATION_TYPE / "Editor.app/Contents/MacOS/Editor"); + AZ::IO::SystemFile::Exists(editorPath.c_str())) + { + return editorPath; + } + else if (editorPath = (buildConfigurationPath / AZ_TRAIT_OS_PLATFORM_CODENAME + / AZ_BUILD_CONFIGURATION_TYPE / "Editor.app/Contents/MacOS/Editor"); + AZ::IO::SystemFile::Exists(editorPath.c_str())) + { + return editorPath; + } + } + } + + // Fall back to locating the Editor.app bundle which should exists + // outside of the current O3DE.app bundle + editorPath = (AZ::IO::FixedMaxPath(AZ::Utils::GetExecutableDirectory()) / + "../../../Editor.app/Contents/MacOS/Editor").LexicallyNormal(); + + if (!AZ::IO::SystemFile::Exists(editorPath.c_str())) + { + // Attempt to search the O3DE.app global settings registry for an InstalledBinaryFolder + // key which indicates the relative path to an SDK binary directory on MacOS if (auto settingsRegistry = AZ::SettingsRegistry::Get(); settingsRegistry != nullptr) { if (AZ::IO::FixedMaxPath installedBinariesPath; - settingsRegistry->Get(installedBinariesPath.Native(), AZ::SettingsRegistryMergeUtils::FilePathKey_InstalledBinaryFolder)) + settingsRegistry->Get(installedBinariesPath.Native(), + AZ::SettingsRegistryMergeUtils::FilePathKey_InstalledBinaryFolder)) { if (AZ::IO::FixedMaxPath engineRootFolder; - settingsRegistry->Get(engineRootFolder.Native(), AZ::SettingsRegistryMergeUtils::FilePathKey_EngineRootFolder)) + settingsRegistry->Get(engineRootFolder.Native(), + AZ::SettingsRegistryMergeUtils::FilePathKey_EngineRootFolder)) { - editorPath = engineRootFolder / installedBinariesPath / "Editor.app/Contents/MacOS"; + editorPath = engineRootFolder / installedBinariesPath / "Editor.app/Contents/MacOS/Editor"; } } } - if (!AZ::IO::SystemFile::IsDirectory(editorPath.c_str())) + if (!AZ::IO::SystemFile::Exists(editorPath.c_str())) { AZ_Error("ProjectManager", false, "Unable to find the Editor app bundle!"); + return {}; } } diff --git a/Code/Tools/ProjectManager/Platform/Windows/ProjectUtils_windows.cpp b/Code/Tools/ProjectManager/Platform/Windows/ProjectUtils_windows.cpp index b8cfe65b1e..38bb867244 100644 --- a/Code/Tools/ProjectManager/Platform/Windows/ProjectUtils_windows.cpp +++ b/Code/Tools/ProjectManager/Platform/Windows/ProjectUtils_windows.cpp @@ -1,6 +1,6 @@ /* * 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 * */ @@ -15,6 +15,8 @@ #include #include +#include +#include #include namespace O3DE::ProjectManager @@ -27,7 +29,7 @@ namespace O3DE::ProjectManager auto engineInfoResult = PythonBindingsInterface::Get()->GetEngineInfo(); if (!engineInfoResult.IsSuccess()) { - return AZ::Failure(QObject::tr("Failed to get engine info")); + return AZ::Failure(QObject::tr("Failed to get engine info")); } auto engineInfo = engineInfoResult.GetValue(); @@ -52,7 +54,7 @@ namespace O3DE::ProjectManager AZ::Outcome FindSupportedCompilerForPlatform() { - // Validate that cmake is installed + // Validate that cmake is installed auto cmakeProcessEnvResult = SetupCommandLineProcessEnvironment(); if (!cmakeProcessEnvResult.IsSuccess()) { @@ -109,7 +111,7 @@ namespace O3DE::ProjectManager " or update to a newer version before proceeding to the next step." " While installing configure Visual Studio with these workloads.")); } - + AZ::Outcome OpenCMakeGUI(const QString& projectPath) { AZ::Outcome processEnvResult = SetupCommandLineProcessEnvironment(); @@ -127,7 +129,7 @@ namespace O3DE::ProjectManager QProcess process; - // if the project build path is relative, it should be relative to the project path + // if the project build path is relative, it should be relative to the project path process.setWorkingDirectory(projectPath); process.setProgram("cmake-gui"); @@ -149,9 +151,53 @@ namespace O3DE::ProjectManager QObject::tr("Running get_python script...")); } - AZ::IO::FixedMaxPath GetEditorDirectory() + AZ::IO::FixedMaxPath GetEditorExecutablePath(const AZ::IO::PathView& projectPath) { - return AZ::Utils::GetExecutableDirectory(); + AZ::IO::FixedMaxPath editorPath; + AZ::IO::FixedMaxPath fixedProjectPath{ projectPath }; + // First attempt to launch the Editor.exe within the project build directory if it exists + AZ::IO::FixedMaxPath buildPathSetregPath = fixedProjectPath + / AZ::SettingsRegistryInterface::DevUserRegistryFolder + / "Platform" / AZ_TRAIT_OS_PLATFORM_CODENAME / "build_path.setreg"; + if (AZ::IO::SystemFile::Exists(buildPathSetregPath.c_str())) + { + AZ::SettingsRegistryImpl settingsRegistry; + // Merge the build_path.setreg into the local SettingsRegistry instance + if (AZ::IO::FixedMaxPath projectBuildPath; + settingsRegistry.MergeSettingsFile(buildPathSetregPath.Native(), + AZ::SettingsRegistryInterface::Format::JsonMergePatch) + && settingsRegistry.Get(projectBuildPath.Native(), AZ::SettingsRegistryMergeUtils::ProjectBuildPath)) + { + // local Settings Registry will be used to merge the build_path.setreg for the supplied projectPath + AZ::IO::FixedMaxPath buildConfigurationPath = (fixedProjectPath / projectBuildPath).LexicallyNormal(); + + // First try /bin/$ and if that path doesn't exist + // try /bin/$/$ + buildConfigurationPath /= "bin"; + if (editorPath = (buildConfigurationPath / AZ_BUILD_CONFIGURATION_TYPE / "Editor"). + ReplaceExtension(AZ_TRAIT_OS_EXECUTABLE_EXTENSION); + AZ::IO::SystemFile::Exists(editorPath.c_str())) + { + return editorPath; + } + else if (editorPath = (buildConfigurationPath / AZ_TRAIT_OS_PLATFORM_CODENAME + / AZ_BUILD_CONFIGURATION_TYPE / "Editor"). + ReplaceExtension(AZ_TRAIT_OS_EXECUTABLE_EXTENSION); + AZ::IO::SystemFile::Exists(editorPath.c_str())) + { + return editorPath; + } + } + } + + // Fall back to checking if an Editor exists in O3DE executable directory + editorPath = AZ::IO::FixedMaxPath(AZ::Utils::GetExecutableDirectory()) / "Editor"; + editorPath.ReplaceExtension(AZ_TRAIT_OS_EXECUTABLE_EXTENSION); + if (AZ::IO::SystemFile::Exists(editorPath.c_str())) + { + return editorPath; + } + return {}; } AZ::Outcome CreateDesktopShortcut(const QString& filename, const QString& targetPath, const QStringList& arguments) diff --git a/Code/Tools/ProjectManager/Source/ProjectButtonWidget.cpp b/Code/Tools/ProjectManager/Source/ProjectButtonWidget.cpp index 2f4fe901bb..3225c14266 100644 --- a/Code/Tools/ProjectManager/Source/ProjectButtonWidget.cpp +++ b/Code/Tools/ProjectManager/Source/ProjectButtonWidget.cpp @@ -215,9 +215,7 @@ namespace O3DE::ProjectManager #if AZ_TRAIT_PROJECT_MANAGER_CREATE_DESKTOP_SHORTCUT menu->addAction(tr("Create Editor desktop shortcut..."), this, [this]() { - AZ::IO::FixedMaxPath executableDirectory = ProjectUtils::GetEditorDirectory(); - AZStd::string executableFilename = "Editor"; - AZ::IO::FixedMaxPath editorExecutablePath = executableDirectory / (executableFilename + AZ_TRAIT_OS_EXECUTABLE_EXTENSION); + AZ::IO::FixedMaxPath editorExecutablePath = ProjectUtils::GetEditorExecutablePath(m_projectInfo.m_path.toUtf8().constData()); const QString shortcutName = QString("%1 Editor").arg(m_projectInfo.m_displayName); const QString arg = QString("--regset=\"/Amazon/AzCore/Bootstrap/project_path=%1\"").arg(m_projectInfo.m_path); diff --git a/Code/Tools/ProjectManager/Source/ProjectUtils.h b/Code/Tools/ProjectManager/Source/ProjectUtils.h index d84b367d5b..713803c20b 100644 --- a/Code/Tools/ProjectManager/Source/ProjectUtils.h +++ b/Code/Tools/ProjectManager/Source/ProjectUtils.h @@ -76,7 +76,27 @@ namespace O3DE::ProjectManager */ AZ::Outcome CreateDesktopShortcut(const QString& filename, const QString& targetPath, const QStringList& arguments); - AZ::IO::FixedMaxPath GetEditorDirectory(); + /** + * Lookup the location of an Editor executable executable that can be used with the + * supplied project path + * First the method attempts to locate a build directory with the project path + * via querying the /user/Registry/Platform//build_path.setreg + * Once that is done a path is formed to locate the Editor executable within the that build + * directory. + * Two paths will checked for the existence of an Editor + * - "/bin/$/Editor" + * - "/bin//$/Editor" + * Where is the current platform the O3DE executable is running on and $ is the + * current build configuration the O3DE executable + * + * If neiether of the above paths contain an Editor application, then a path to the Editor + * is formed by combinding the O3DE executable directory with the filename of Editor + * - "/Editor" + * + * @param projectPath Path to the root of the project + * @return path of the Editor Executable if found or an empty path if not + */ + AZ::IO::FixedMaxPath GetEditorExecutablePath(const AZ::IO::PathView& projectPath); } // namespace ProjectUtils } // namespace O3DE::ProjectManager diff --git a/Code/Tools/ProjectManager/Source/ProjectsScreen.cpp b/Code/Tools/ProjectManager/Source/ProjectsScreen.cpp index 4a82783949..acd753a1cb 100644 --- a/Code/Tools/ProjectManager/Source/ProjectsScreen.cpp +++ b/Code/Tools/ProjectManager/Source/ProjectsScreen.cpp @@ -23,7 +23,6 @@ #include #include #include -#include #include #include @@ -408,18 +407,26 @@ namespace O3DE::ProjectManager emit ChangeScreenRequest(ProjectManagerScreen::Projects); } } + void ProjectsScreen::HandleOpenProject(const QString& projectPath) { if (!projectPath.isEmpty()) { if (!WarnIfInBuildQueue(projectPath)) { - AZ::IO::FixedMaxPath executableDirectory = ProjectUtils::GetEditorDirectory(); - AZStd::string executableFilename = "Editor"; - AZ::IO::FixedMaxPath editorExecutablePath = executableDirectory / (executableFilename + AZ_TRAIT_OS_EXECUTABLE_EXTENSION); + AZ::IO::FixedMaxPath fixedProjectPath = projectPath.toUtf8().constData(); + AZ::IO::FixedMaxPath editorExecutablePath = ProjectUtils::GetEditorExecutablePath(fixedProjectPath); + if (editorExecutablePath.empty()) + { + AZ_Error("ProjectManager", false, "Failed to locate editor"); + QMessageBox::critical( + this, tr("Error"), tr("Failed to locate the Editor, please verify that it is built.")); + return; + } + auto cmdPath = AZ::IO::FixedMaxPathString::format( "%s --regset=\"/Amazon/AzCore/Bootstrap/project_path=%s\"", editorExecutablePath.c_str(), - projectPath.toStdString().c_str()); + fixedProjectPath.c_str()); AzFramework::ProcessLauncher::ProcessLaunchInfo processLaunchInfo; processLaunchInfo.m_commandlineParameters = cmdPath; From b196473465c4fbde131da125364a2da1aa9b9834 Mon Sep 17 00:00:00 2001 From: moraaar Date: Wed, 24 Nov 2021 08:15:52 +0000 Subject: [PATCH 232/345] O3DE using new 3rdParty PhysX SDK package rev 5 (#5829) PR with changes to PhysX SDK package: o3de/3p-package-source#71 This fixes O3DE building monolithically on linux and windows. Signed-off-by: moraaar moraaar@amazon.com --- cmake/3rdParty/Platform/Android/BuiltInPackages_android.cmake | 2 +- cmake/3rdParty/Platform/Linux/BuiltInPackages_linux.cmake | 2 +- cmake/3rdParty/Platform/Mac/BuiltInPackages_mac.cmake | 2 +- cmake/3rdParty/Platform/Windows/BuiltInPackages_windows.cmake | 2 +- cmake/3rdParty/Platform/iOS/BuiltInPackages_ios.cmake | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/cmake/3rdParty/Platform/Android/BuiltInPackages_android.cmake b/cmake/3rdParty/Platform/Android/BuiltInPackages_android.cmake index 16478b2f35..6bd50861c7 100644 --- a/cmake/3rdParty/Platform/Android/BuiltInPackages_android.cmake +++ b/cmake/3rdParty/Platform/Android/BuiltInPackages_android.cmake @@ -20,7 +20,7 @@ ly_associate_package(PACKAGE_NAME tiff-4.2.0.15-rev4-android TARGETS TIF ly_associate_package(PACKAGE_NAME freetype-2.10.4.16-android TARGETS freetype PACKAGE_HASH df9e4d559ea0f03b0666b48c79813b1cd4d9624429148a249865de9f5c2c11cd) ly_associate_package(PACKAGE_NAME AWSNativeSDK-1.9.50-rev1-android TARGETS AWSNativeSDK PACKAGE_HASH 33771499f9080cbaab613459927e52911e68f94fa356397885e85005efbd1490) ly_associate_package(PACKAGE_NAME Lua-5.3.5-rev5-android TARGETS Lua PACKAGE_HASH 1f638e94a17a87fe9e588ea456d5893876094b4db191234380e4c4eb9e06c300) -ly_associate_package(PACKAGE_NAME PhysX-4.1.2.29882248-rev4-android TARGETS PhysX PACKAGE_HASH 60777cbd5279a45dd9d9ee65525f662ce32253b88359162e54e4bb8581a4a262) +ly_associate_package(PACKAGE_NAME PhysX-4.1.2.29882248-rev5-android TARGETS PhysX PACKAGE_HASH b346e8f9bc55f367a97d781d94c8a5c3bff8059478b8a7007e5fd17708dc1d07) ly_associate_package(PACKAGE_NAME mikkelsen-1.0.0.4-android TARGETS mikkelsen PACKAGE_HASH 075e8e4940884971063b5a9963014e2e517246fa269c07c7dc55b8cf2cd99705) ly_associate_package(PACKAGE_NAME googletest-1.8.1-rev4-android TARGETS googletest PACKAGE_HASH 95671be75287a61c9533452835c3647e9c1b30f81b34b43bcb0ec1997cc23894) ly_associate_package(PACKAGE_NAME googlebenchmark-1.5.0-rev2-android TARGETS GoogleBenchmark PACKAGE_HASH 20b46e572211a69d7d94ddad1c89ec37bb958711d6ad4025368ac89ea83078fb) diff --git a/cmake/3rdParty/Platform/Linux/BuiltInPackages_linux.cmake b/cmake/3rdParty/Platform/Linux/BuiltInPackages_linux.cmake index 3ad49c6d7a..5c84fc3198 100644 --- a/cmake/3rdParty/Platform/Linux/BuiltInPackages_linux.cmake +++ b/cmake/3rdParty/Platform/Linux/BuiltInPackages_linux.cmake @@ -27,7 +27,7 @@ ly_associate_package(PACKAGE_NAME tiff-4.2.0.15-rev3-linux ly_associate_package(PACKAGE_NAME freetype-2.10.4.16-linux TARGETS freetype PACKAGE_HASH 3f10c703d9001ecd2bb51a3bd003d3237c02d8f947ad0161c0252fdc54cbcf97) ly_associate_package(PACKAGE_NAME AWSNativeSDK-1.7.167-rev6-linux TARGETS AWSNativeSDK PACKAGE_HASH 490291e4c8057975c3ab86feb971b8a38871c58bac5e5d86abdd1aeb7141eec4) ly_associate_package(PACKAGE_NAME Lua-5.3.5-rev5-linux TARGETS Lua PACKAGE_HASH 1adc812abe3dd0dbb2ca9756f81d8f0e0ba45779ac85bf1d8455b25c531a38b0) -ly_associate_package(PACKAGE_NAME PhysX-4.1.2.29882248-rev4-linux TARGETS PhysX PACKAGE_HASH a5cba1c7e1f3df37869008ef18d99bdd15f8e9a44cbe259cf79374696f2b6515) +ly_associate_package(PACKAGE_NAME PhysX-4.1.2.29882248-rev5-linux TARGETS PhysX PACKAGE_HASH fa72365df409376aef02d1763194dc91d255bdfcb4e8febcfbb64d23a3e50b96) ly_associate_package(PACKAGE_NAME mcpp-2.7.2_az.2-rev1-linux TARGETS mcpp PACKAGE_HASH df7a998d0bc3fedf44b5bdebaf69ddad6033355b71a590e8642445ec77bc6c41) ly_associate_package(PACKAGE_NAME mikkelsen-1.0.0.4-linux TARGETS mikkelsen PACKAGE_HASH 5973b1e71a64633588eecdb5b5c06ca0081f7be97230f6ef64365cbda315b9c8) ly_associate_package(PACKAGE_NAME googletest-1.8.1-rev4-linux TARGETS googletest PACKAGE_HASH 7b7ad330f369450c316a4c4592d17fbb4c14c731c95bd8f37757203e8c2bbc1b) diff --git a/cmake/3rdParty/Platform/Mac/BuiltInPackages_mac.cmake b/cmake/3rdParty/Platform/Mac/BuiltInPackages_mac.cmake index c10cc3e461..3f2dc8cedf 100644 --- a/cmake/3rdParty/Platform/Mac/BuiltInPackages_mac.cmake +++ b/cmake/3rdParty/Platform/Mac/BuiltInPackages_mac.cmake @@ -28,7 +28,7 @@ ly_associate_package(PACKAGE_NAME tiff-4.2.0.15-rev3-mac ly_associate_package(PACKAGE_NAME freetype-2.10.4.16-mac TARGETS freetype PACKAGE_HASH f159b346ac3251fb29cb8dd5f805c99b0015ed7fdb3887f656945ca701a61d0d) ly_associate_package(PACKAGE_NAME AWSNativeSDK-1.7.167-rev5-mac TARGETS AWSNativeSDK PACKAGE_HASH ffb890bd9cf23afb429b9214ad9bac1bf04696f07a0ebb93c42058c482ab2f01) ly_associate_package(PACKAGE_NAME Lua-5.3.5-rev6-mac TARGETS Lua PACKAGE_HASH b9079fd35634774c9269028447562c6b712dbc83b9c64975c095fd423ff04c08) -ly_associate_package(PACKAGE_NAME PhysX-4.1.2.29882248-rev4-mac TARGETS PhysX PACKAGE_HASH 5f65e798059ea945b53e8f308c0594f195118a64e3ce873f2fff971f4e207b4d) +ly_associate_package(PACKAGE_NAME PhysX-4.1.2.29882248-rev5-mac TARGETS PhysX PACKAGE_HASH 83940b3876115db82cd8ffcb9e902278e75846d6ad94a41e135b155cee1ee186) ly_associate_package(PACKAGE_NAME mcpp-2.7.2_az.2-rev1-mac TARGETS mcpp PACKAGE_HASH be9558905c9c49179ef3d7d84f0a5472415acdf7fe2d76eb060d9431723ddf2e) ly_associate_package(PACKAGE_NAME mikkelsen-1.0.0.4-mac TARGETS mikkelsen PACKAGE_HASH 83af99ca8bee123684ad254263add556f0cf49486c0b3e32e6d303535714e505) ly_associate_package(PACKAGE_NAME googletest-1.8.1-rev4-mac TARGETS googletest PACKAGE_HASH cbf020d5ef976c5db8b6e894c6c63151ade85ed98e7c502729dd20172acae5a8) diff --git a/cmake/3rdParty/Platform/Windows/BuiltInPackages_windows.cmake b/cmake/3rdParty/Platform/Windows/BuiltInPackages_windows.cmake index 23892c6d7d..6e2d2a92e2 100644 --- a/cmake/3rdParty/Platform/Windows/BuiltInPackages_windows.cmake +++ b/cmake/3rdParty/Platform/Windows/BuiltInPackages_windows.cmake @@ -29,7 +29,7 @@ ly_associate_package(PACKAGE_NAME tiff-4.2.0.15-rev3-windows ly_associate_package(PACKAGE_NAME freetype-2.10.4.16-windows TARGETS freetype PACKAGE_HASH 9809255f1c59b07875097aa8d8c6c21c97c47a31fb35e30f2bb93188e99a85ff) ly_associate_package(PACKAGE_NAME AWSNativeSDK-1.7.167-rev4-windows TARGETS AWSNativeSDK PACKAGE_HASH a900e80f7259e43aed5c847afee2599ada37f29db70505481397675bcbb6c76c) ly_associate_package(PACKAGE_NAME Lua-5.3.5-rev5-windows TARGETS Lua PACKAGE_HASH 136faccf1f73891e3fa3b95f908523187792e56f5b92c63c6a6d7e72d1158d40) -ly_associate_package(PACKAGE_NAME PhysX-4.1.2.29882248-rev4-windows TARGETS PhysX PACKAGE_HASH 4591647debc80f9fd1db003206b25aeef0f0036fc4dba05b494558dcf045021b) +ly_associate_package(PACKAGE_NAME PhysX-4.1.2.29882248-rev5-windows TARGETS PhysX PACKAGE_HASH 4e31a3e1f5bf3952d8af8e28d1a29f04167995a6362fc3a7c20c25f74bf01e23) ly_associate_package(PACKAGE_NAME mcpp-2.7.2_az.2-rev1-windows TARGETS mcpp PACKAGE_HASH 794789aba639bfe2f4e8fcb4424d679933dd6290e523084aa0a4e287ac44acb2) ly_associate_package(PACKAGE_NAME mikkelsen-1.0.0.4-windows TARGETS mikkelsen PACKAGE_HASH 872c4d245a1c86139aa929f2b465b63ea4ea55b04ced50309135dd4597457a4e) ly_associate_package(PACKAGE_NAME googletest-1.8.1-rev4-windows TARGETS googletest PACKAGE_HASH 7e8f03ae8a01563124e3daa06386f25a2b311c10bb95bff05cae6c41eff83837) diff --git a/cmake/3rdParty/Platform/iOS/BuiltInPackages_ios.cmake b/cmake/3rdParty/Platform/iOS/BuiltInPackages_ios.cmake index 978f26d1f8..1eea5082da 100644 --- a/cmake/3rdParty/Platform/iOS/BuiltInPackages_ios.cmake +++ b/cmake/3rdParty/Platform/iOS/BuiltInPackages_ios.cmake @@ -21,7 +21,7 @@ ly_associate_package(PACKAGE_NAME tiff-4.2.0.15-rev3-ios TARGETS TIFF ly_associate_package(PACKAGE_NAME freetype-2.10.4.16-ios TARGETS freetype PACKAGE_HASH 3ac3c35e056ae4baec2e40caa023d76a7a3320895ef172b6655e9261b0dc2e29) ly_associate_package(PACKAGE_NAME AWSNativeSDK-1.7.167-rev4-ios TARGETS AWSNativeSDK PACKAGE_HASH d10e7496ca705577032821011beaf9f2507689f23817bfa0ed4d2a2758afcd02) ly_associate_package(PACKAGE_NAME Lua-5.3.5-rev5-ios TARGETS Lua PACKAGE_HASH c2d3c4e67046c293049292317a7d60fdb8f23effeea7136aefaef667163e5ffe) -ly_associate_package(PACKAGE_NAME PhysX-4.1.2.29882248-rev4-ios TARGETS PhysX PACKAGE_HASH fb2295974eccd7a05b62efd774c5c4b1ce2b7e45ba65c0b9c1f59c0dab0d34f9) +ly_associate_package(PACKAGE_NAME PhysX-4.1.2.29882248-rev5-ios TARGETS PhysX PACKAGE_HASH 4a5e38b385837248590018eb133444b4e440190414e6756191200a10c8fa5615) ly_associate_package(PACKAGE_NAME mikkelsen-1.0.0.4-ios TARGETS mikkelsen PACKAGE_HASH 976aaa3ccd8582346132a10af253822ccc5d5bcc9ea5ba44d27848f65ee88a8a) ly_associate_package(PACKAGE_NAME googletest-1.8.1-rev4-ios TARGETS googletest PACKAGE_HASH 2f121ad9784c0ab73dfaa58e1fee05440a82a07cc556bec162eeb407688111a7) ly_associate_package(PACKAGE_NAME googlebenchmark-1.5.0-rev2-ios TARGETS GoogleBenchmark PACKAGE_HASH c2ffaed2b658892b1bcf81dee4b44cd1cb09fc78d55584ef5cb8ab87f2d8d1ae) From 5bd751531dad3613c12453c44960b273d61326de Mon Sep 17 00:00:00 2001 From: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com> Date: Wed, 24 Nov 2021 09:17:43 +0000 Subject: [PATCH 233/345] Update return type for viewport screen functions (#5803) * update return type for viewport screen functions Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com> * add tests for AZ::Matrix3x4::CreateFromMatrix4x4 and add TransformPoint to Matrix3x4 Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com> * update NDC -> Ndc Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com> * updates following review feedback Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com> * updates and improvements following PR feedback Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com> * add forward declaration of Matrix3x4 type Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com> * update where forward declarations are defined for Matrix3x4 Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com> --- .../AzCore/AzCore/Math/Matrix3x4.cpp | 3 +- Code/Framework/AzCore/AzCore/Math/Matrix3x4.h | 8 +++- .../AzCore/AzCore/Math/Matrix3x4.inl | 16 +++++++ .../AzCore/Tests/Math/MathTestData.h | 9 ++++ .../AzCore/Tests/Math/Matrix3x4Tests.cpp | 27 ++++++++++++ .../AzFramework/Viewport/ViewportBus.h | 3 ++ .../AzFramework/Viewport/ViewportScreen.cpp | 42 +++++++++---------- .../AzFramework/Viewport/ViewportScreen.h | 19 +++++---- .../EditorTransformComponentSelection.cpp | 2 +- .../RPI/Code/Include/Atom/RPI.Public/Base.h | 5 +++ .../RPI/Code/Include/Atom/RPI.Public/View.h | 4 +- .../Include/Atom/RPI.Public/ViewportContext.h | 9 +--- Gems/Atom/RPI/Code/Source/RPI.Public/View.cpp | 14 ++++++- .../Source/RPI.Public/ViewportContext.cpp | 9 +++- .../ModularViewportCameraController.h | 10 ++--- .../ModularViewportCameraController.cpp | 10 ++--- .../Tests/ViewportInteractionImplTests.cpp | 4 +- .../AtomFont/Code/Source/FFont.cpp | 18 ++++---- ...tomViewportDisplayIconsSystemComponent.cpp | 6 +-- .../Source/CameraEditorSystemComponent.cpp | 2 +- 20 files changed, 146 insertions(+), 74 deletions(-) diff --git a/Code/Framework/AzCore/AzCore/Math/Matrix3x4.cpp b/Code/Framework/AzCore/AzCore/Math/Matrix3x4.cpp index 6d79c4c068..78da9e76d2 100644 --- a/Code/Framework/AzCore/AzCore/Math/Matrix3x4.cpp +++ b/Code/Framework/AzCore/AzCore/Math/Matrix3x4.cpp @@ -351,7 +351,8 @@ namespace AZ ->Method("CreateFromMatrix3x3AndTranslation", &Matrix3x4::CreateFromMatrix3x3AndTranslation) ->Method("CreateScale", &Matrix3x4::CreateScale) ->Method("CreateDiagonal", &Matrix3x4::CreateDiagonal) - ->Method("CreateTranslation", &Matrix3x4::CreateTranslation); + ->Method("CreateTranslation", &Matrix3x4::CreateTranslation) + ->Method("UnsafeCreateFromMatrix4x4", &Matrix3x4::UnsafeCreateFromMatrix4x4); } } diff --git a/Code/Framework/AzCore/AzCore/Math/Matrix3x4.h b/Code/Framework/AzCore/AzCore/Math/Matrix3x4.h index 60a88df686..25653627ea 100644 --- a/Code/Framework/AzCore/AzCore/Math/Matrix3x4.h +++ b/Code/Framework/AzCore/AzCore/Math/Matrix3x4.h @@ -90,6 +90,9 @@ namespace AZ //! Constructs from a Matrix3x3 and a translation. static Matrix3x4 CreateFromMatrix3x3AndTranslation(const Matrix3x3& matrix3x3, const Vector3& translation); + //! Constructs from a Matrix4x4. + static Matrix3x4 UnsafeCreateFromMatrix4x4(const Matrix4x4& matrix4x4); + //! Constructs from a Transform. static Matrix3x4 CreateFromTransform(const Transform& transform); @@ -227,7 +230,7 @@ namespace AZ Matrix3x4& operator+=(const Matrix3x4& rhs); //! @} - //! Operator for matrix-matrix substraction. + //! Operator for matrix-matrix subtraction. //! @{ [[nodiscard]] Matrix3x4 operator-(const Matrix3x4& rhs) const; Matrix3x4& operator-=(const Matrix3x4& rhs); @@ -266,6 +269,9 @@ namespace AZ //! Post-multiplies the matrix by a vector, using only the 3x3 part of the matrix. [[nodiscard]] Vector3 TransformVector(const Vector3& rhs) const; + //! Post-multiplies the matrix by a point, using the rotation and translation part of the matrix. + [[nodiscard]] Vector3 TransformPoint(const Vector3& rhs) const; + //! Gets the result of transposing the 3x3 part of the matrix, setting the translation part to zero. [[nodiscard]] Matrix3x4 GetTranspose() const; diff --git a/Code/Framework/AzCore/AzCore/Math/Matrix3x4.inl b/Code/Framework/AzCore/AzCore/Math/Matrix3x4.inl index 2f127221ab..d1367cd26c 100644 --- a/Code/Framework/AzCore/AzCore/Math/Matrix3x4.inl +++ b/Code/Framework/AzCore/AzCore/Math/Matrix3x4.inl @@ -203,6 +203,16 @@ namespace AZ } + AZ_MATH_INLINE Matrix3x4 Matrix3x4::UnsafeCreateFromMatrix4x4(const Matrix4x4& matrix4x4) + { + Matrix3x4 result; + result.SetRow(0, matrix4x4.GetRow(0)); + result.SetRow(1, matrix4x4.GetRow(1)); + result.SetRow(2, matrix4x4.GetRow(2)); + return result; + } + + AZ_MATH_INLINE Matrix3x4 Matrix3x4::CreateScale(const Vector3& scale) { return CreateDiagonal(scale); @@ -609,6 +619,12 @@ namespace AZ } + AZ_MATH_INLINE Vector3 Matrix3x4::TransformPoint(const Vector3& rhs) const + { + return Multiply3x3(rhs) + GetTranslation(); + } + + AZ_MATH_INLINE Matrix3x4 Matrix3x4::GetTranspose() const { Matrix3x4 result; diff --git a/Code/Framework/AzCore/Tests/Math/MathTestData.h b/Code/Framework/AzCore/Tests/Math/MathTestData.h index f87ab8f448..72a98e835d 100644 --- a/Code/Framework/AzCore/Tests/Math/MathTestData.h +++ b/Code/Framework/AzCore/Tests/Math/MathTestData.h @@ -33,6 +33,15 @@ namespace MathTestData AZ::Matrix3x3::CreateScale(AZ::Vector3(0.7f, 1.3f, 0.9f)) }; + static const AZ::Matrix4x4 Matrix4x4s[] = { + AZ::Matrix4x4::CreateIdentity(), + AZ::Matrix4x4::CreateFromQuaternionAndTranslation(AZ::Quaternion(-0.46f, 0.26f, -0.22f, 0.82f), AZ::Vector3(1.0f, 5.0f, 10.0f)), + AZ::Matrix4x4::CreateFromTransform(AZ::Transform::CreateFromMatrix3x3AndTranslation( + AZ::Matrix3x3::CreateScale(AZ::Vector3(1.0f, 2.0f, 3.0f)), AZ::Vector3(2.0f, 4.0f, 6.0f))), + AZ::Matrix4x4::CreateScale(AZ::Vector3(5.0f, 10.0f, 15.0f)), + AZ::Matrix4x4::CreateRotationZ(AZ::DegToRad(45.0f)) + }; + using AxisPair = AZStd::pair; static const AxisPair Axes[] = { { AZ::Constants::Axis::XPositive, AZ::Vector3::CreateAxisX(1.0f) }, diff --git a/Code/Framework/AzCore/Tests/Math/Matrix3x4Tests.cpp b/Code/Framework/AzCore/Tests/Math/Matrix3x4Tests.cpp index 8f8f8ca1e9..20d1107757 100644 --- a/Code/Framework/AzCore/Tests/Math/Matrix3x4Tests.cpp +++ b/Code/Framework/AzCore/Tests/Math/Matrix3x4Tests.cpp @@ -10,6 +10,7 @@ #include #include #include +#include #include #include "MathTestData.h" @@ -392,6 +393,32 @@ namespace UnitTest INSTANTIATE_TEST_CASE_P(MATH_Matrix3x4, Matrix3x4CreateFromMatrix3x3Fixture, ::testing::ValuesIn(MathTestData::Matrix3x3s)); + using Matrix3x4CreateFromMatrix4x4Fixture = ::testing::TestWithParam; + + TEST_P(Matrix3x4CreateFromMatrix4x4Fixture, UnsafeCreateFromMatrix4x4) + { + const AZ::Matrix4x4 matrix4x4 = GetParam(); + const AZ::Matrix3x4 matrix3x4 = AZ::Matrix3x4::UnsafeCreateFromMatrix4x4(matrix4x4); + EXPECT_THAT(matrix3x4.GetTranslation(), IsClose(matrix4x4.GetTranslation())); + const AZ::Vector3 vector(2.3f, -0.6, 1.8f); + EXPECT_THAT(matrix3x4.TransformVector(vector), IsClose((matrix4x4 * AZ::Vector3ToVector4(vector, 0.0f)).GetAsVector3())); + const AZ::Vector3 point(12.3f, -5.6, 7.3f); + EXPECT_THAT(matrix3x4.TransformPoint(point), IsClose((matrix4x4 * AZ::Vector3ToVector4(point, 1.0f)).GetAsVector3())); + } + + INSTANTIATE_TEST_CASE_P(MATH_Matrix3x4, Matrix3x4CreateFromMatrix4x4Fixture, ::testing::ValuesIn(MathTestData::Matrix4x4s)); + + TEST(MATH_Matrix3x4, TransformPoint) + { + const AZ::Matrix3x4 matrix3x4 = AZ::Matrix3x4::CreateFromMatrix3x3AndTranslation( + AZ::Matrix3x3::CreateRotationY(AZ::DegToRad(90.0f)), AZ::Vector3(5.0f, 0.0f, 0.0f)); + + const AZ::Vector3 result = matrix3x4.TransformPoint(AZ::Vector3(1.0f, 0.0f, 0.0f)); + const AZ::Vector3 expected = AZ::Vector3(5.0f, 0.0f, -1.0f); + + EXPECT_THAT(result, expected); + } + TEST(MATH_Matrix3x4, CreateScale) { const AZ::Vector3 scale(1.7f, 0.3f, 2.4f); diff --git a/Code/Framework/AzFramework/AzFramework/Viewport/ViewportBus.h b/Code/Framework/AzFramework/AzFramework/Viewport/ViewportBus.h index 131ecc0c57..f53b84a63f 100644 --- a/Code/Framework/AzFramework/AzFramework/Viewport/ViewportBus.h +++ b/Code/Framework/AzFramework/AzFramework/Viewport/ViewportBus.h @@ -15,6 +15,7 @@ namespace AZ { class Matrix4x4; + class Matrix3x4; class Transform; class ReflectContext; } // namespace AZ @@ -32,6 +33,8 @@ namespace AzFramework //! Gets the current camera's world to view matrix. virtual const AZ::Matrix4x4& GetCameraViewMatrix() const = 0; + //! Gets the current camera's world to view matrix as a Matrix3x4. + virtual AZ::Matrix3x4 GetCameraViewMatrixAsMatrix3x4() const = 0; //! Sets the current camera's world to view matrix. virtual void SetCameraViewMatrix(const AZ::Matrix4x4& matrix) = 0; //! Gets the current camera's projection (view to clip) matrix. diff --git a/Code/Framework/AzFramework/AzFramework/Viewport/ViewportScreen.cpp b/Code/Framework/AzFramework/AzFramework/Viewport/ViewportScreen.cpp index 87eee53fbd..a23b306546 100644 --- a/Code/Framework/AzFramework/AzFramework/Viewport/ViewportScreen.cpp +++ b/Code/Framework/AzFramework/AzFramework/Viewport/ViewportScreen.cpp @@ -31,34 +31,31 @@ namespace AzFramework // multiplication which must be used (see CameraTransformFromCameraView and CameraViewFromCameraTransform) // note: coordinate system convention is right handed // see Matrix4x4::CreateProjection for more details - static AZ::Matrix4x4 ZYCoordinateSystemConversion() + static AZ::Matrix3x4 ZYCoordinateSystemConversion() { // note: the below matrix is the result of these combined transformations // pitch = AZ::Matrix4x4::CreateRotationX(AZ::DegToRad(-90.0f)); // yaw = AZ::Matrix4x4::CreateRotationZ(AZ::DegToRad(180.0f)); // conversion = pitch * yaw - return AZ::Matrix4x4::CreateFromColumns( - AZ::Vector4(-1.0f, 0.0f, 0.0f, 0.0f), AZ::Vector4(0.0f, 0.0f, 1.0f, 0.0f), AZ::Vector4(0.0f, 1.0f, 0.0f, 0.0f), - AZ::Vector4(0.0f, 0.0f, 0.0f, 1.0f)); + return AZ::Matrix3x4::CreateFromColumns( + AZ::Vector3(-1.0f, 0.0f, 0.0f), AZ::Vector3(0.0f, 0.0f, 1.0f), AZ::Vector3(0.0f, 1.0f, 0.0f), AZ::Vector3(0.0f, 0.0f, 0.0f)); } - AZ::Matrix4x4 CameraTransform(const CameraState& cameraState) + AZ::Matrix3x4 CameraTransform(const CameraState& cameraState) { - return AZ::Matrix4x4::CreateFromColumns( - AZ::Vector3ToVector4(cameraState.m_side), AZ::Vector3ToVector4(cameraState.m_forward), AZ::Vector3ToVector4(cameraState.m_up), - AZ::Vector3ToVector4(cameraState.m_position, 1.0f)); + return AZ::Matrix3x4::CreateFromColumns(cameraState.m_side, cameraState.m_forward, cameraState.m_up, cameraState.m_position); } - AZ::Matrix4x4 CameraView(const CameraState& cameraState) + AZ::Matrix3x4 CameraView(const CameraState& cameraState) { // ensure the camera is looking down positive z with the x axis pointing left - return ZYCoordinateSystemConversion() * CameraTransform(cameraState).GetInverseTransform(); + return ZYCoordinateSystemConversion() * CameraTransform(cameraState).GetInverseFast(); } - AZ::Matrix4x4 InverseCameraView(const CameraState& cameraState) + AZ::Matrix3x4 InverseCameraView(const CameraState& cameraState) { // ensure the camera is looking down positive z with the x axis pointing left - return CameraView(cameraState).GetInverseTransform(); + return CameraView(cameraState).GetInverseFast(); } AZ::Matrix4x4 CameraProjection(const CameraState& cameraState) @@ -72,14 +69,14 @@ namespace AzFramework return CameraProjection(cameraState).GetInverseFull(); } - AZ::Matrix4x4 CameraTransformFromCameraView(const AZ::Matrix4x4& cameraView) + AZ::Matrix3x4 CameraTransformFromCameraView(const AZ::Matrix3x4& cameraView) { - return (ZYCoordinateSystemConversion() * cameraView).GetInverseTransform(); + return (ZYCoordinateSystemConversion() * cameraView).GetInverseFast(); } - AZ::Matrix4x4 CameraViewFromCameraTransform(const AZ::Matrix4x4& cameraTransform) + AZ::Matrix3x4 CameraViewFromCameraTransform(const AZ::Matrix3x4& cameraTransform) { - return ZYCoordinateSystemConversion() * cameraTransform.GetInverseTransform(); + return ZYCoordinateSystemConversion() * cameraTransform.GetInverseFast(); } AZ::Frustum FrustumFromCameraState(const CameraState& cameraState) @@ -91,16 +88,17 @@ namespace AzFramework { const auto worldFromView = AzFramework::CameraTransform(cameraState); const auto cameraWorldTransform = AZ::Transform::CreateFromMatrix3x3AndTranslation( - AZ::Matrix3x3::CreateFromMatrix4x4(worldFromView), worldFromView.GetTranslation()); + AZ::Matrix3x3::CreateFromMatrix3x4(worldFromView), worldFromView.GetTranslation()); return AZ::ViewFrustumAttributes( cameraWorldTransform, AspectRatio(cameraState.m_viewportSize), cameraState.m_fovOrZoom, cameraState.m_nearClip, cameraState.m_farClip); } - AZ::Vector3 WorldToScreenNdc(const AZ::Vector3& worldPosition, const AZ::Matrix4x4& cameraView, const AZ::Matrix4x4& cameraProjection) + AZ::Vector3 WorldToScreenNdc(const AZ::Vector3& worldPosition, const AZ::Matrix3x4& cameraView, const AZ::Matrix4x4& cameraProjection) { // transform the world space position to clip space - const auto clipSpacePosition = cameraProjection * cameraView * AZ::Vector3ToVector4(worldPosition, 1.0f); + const auto clipSpacePosition = + cameraProjection * AZ::Vector3ToVector4(cameraView.TransformPoint(worldPosition), 1.0f); // transform the clip space position to ndc space (perspective divide) const auto ndcPosition = clipSpacePosition / clipSpacePosition.GetW(); // transform ndc space from <-1,1> to <0, 1> range @@ -109,7 +107,7 @@ namespace AzFramework ScreenPoint WorldToScreen( const AZ::Vector3& worldPosition, - const AZ::Matrix4x4& cameraView, + const AZ::Matrix3x4& cameraView, const AZ::Matrix4x4& cameraProjection, const AZ::Vector2& viewportSize) { @@ -123,7 +121,7 @@ namespace AzFramework } AZ::Vector3 ScreenNdcToWorld( - const AZ::Vector2& normalizedScreenPosition, const AZ::Matrix4x4& inverseCameraView, const AZ::Matrix4x4& inverseCameraProjection) + const AZ::Vector2& normalizedScreenPosition, const AZ::Matrix3x4& inverseCameraView, const AZ::Matrix4x4& inverseCameraProjection) { // convert screen space coordinates from <0, 1> to <-1,1> range const auto ndcPosition = normalizedScreenPosition * 2.0f - AZ::Vector2::CreateOne(); @@ -140,7 +138,7 @@ namespace AzFramework AZ::Vector3 ScreenToWorld( const ScreenPoint& screenPosition, - const AZ::Matrix4x4& inverseCameraView, + const AZ::Matrix3x4& inverseCameraView, const AZ::Matrix4x4& inverseCameraProjection, const AZ::Vector2& viewportSize) { diff --git a/Code/Framework/AzFramework/AzFramework/Viewport/ViewportScreen.h b/Code/Framework/AzFramework/AzFramework/Viewport/ViewportScreen.h index 8a6c0249b2..9cd88e1c0c 100644 --- a/Code/Framework/AzFramework/AzFramework/Viewport/ViewportScreen.h +++ b/Code/Framework/AzFramework/AzFramework/Viewport/ViewportScreen.h @@ -16,6 +16,7 @@ namespace AZ { class Frustum; + class Matrix3x4; class Matrix4x4; struct ViewFrustumAttributes; } // namespace AZ @@ -43,7 +44,7 @@ namespace AzFramework } //! Projects a position in world space to screen space normalized device coordinates for the given camera. - AZ::Vector3 WorldToScreenNdc(const AZ::Vector3& worldPosition, const AZ::Matrix4x4& cameraView, const AZ::Matrix4x4& cameraProjection); + AZ::Vector3 WorldToScreenNdc(const AZ::Vector3& worldPosition, const AZ::Matrix3x4& cameraView, const AZ::Matrix4x4& cameraProjection); //! Projects a position in world space to screen space for the given camera. ScreenPoint WorldToScreen(const AZ::Vector3& worldPosition, const CameraState& cameraState); @@ -52,7 +53,7 @@ namespace AzFramework //! is called many times in a loop. ScreenPoint WorldToScreen( const AZ::Vector3& worldPosition, - const AZ::Matrix4x4& cameraView, + const AZ::Matrix3x4& cameraView, const AZ::Matrix4x4& cameraProjection, const AZ::Vector2& viewportSize); @@ -64,14 +65,14 @@ namespace AzFramework //! is called many times in a loop. AZ::Vector3 ScreenToWorld( const ScreenPoint& screenPosition, - const AZ::Matrix4x4& inverseCameraView, + const AZ::Matrix3x4& inverseCameraView, const AZ::Matrix4x4& inverseCameraProjection, const AZ::Vector2& viewportSize); //! Unprojects a position in screen space normalized device coordinates to world space. //! Note: The position returned will be on the near clip plane of the camera in world space. AZ::Vector3 ScreenNdcToWorld( - const AZ::Vector2& ndcPosition, const AZ::Matrix4x4& inverseCameraView, const AZ::Matrix4x4& inverseCameraProjection); + const AZ::Vector2& ndcPosition, const AZ::Matrix3x4& inverseCameraView, const AZ::Matrix4x4& inverseCameraProjection); //! Returns the camera projection for the current camera state. AZ::Matrix4x4 CameraProjection(const CameraState& cameraState); @@ -81,27 +82,27 @@ namespace AzFramework //! Returns the camera view for the current camera state. //! @note This is the 'v' in the MVP transform going from world space to view space (viewFromWorld). - AZ::Matrix4x4 CameraView(const CameraState& cameraState); + AZ::Matrix3x4 CameraView(const CameraState& cameraState); //! Returns the inverse of the camera view for the current camera state. //! @note This is the same as the CameraTransform but corrected for Z up. - AZ::Matrix4x4 InverseCameraView(const CameraState& cameraState); + AZ::Matrix3x4 InverseCameraView(const CameraState& cameraState); //! Returns the camera transform for the current camera state. //! @note This is the inverse of 'v' in the MVP transform going from view space to world space (worldFromView). - AZ::Matrix4x4 CameraTransform(const CameraState& cameraState); + AZ::Matrix3x4 CameraTransform(const CameraState& cameraState); //! Takes a camera view (the world to camera space transform) and returns the //! corresponding camera transform (the world position and orientation of the camera). //! @note The parameter is the viewFromWorld transform (the 'v' in MVP) going from world space //! to view space. The return value is worldFromView transform going from view space to world space. - AZ::Matrix4x4 CameraTransformFromCameraView(const AZ::Matrix4x4& cameraView); + AZ::Matrix3x4 CameraTransformFromCameraView(const AZ::Matrix3x4& cameraView); //! Takes a camera transform (the world position and orientation of the camera) and //! returns the corresponding camera view (to be used to transform from world to camera space). //! @note The parameter is the worldFromView transform going from view space to world space. The //! return value is viewFromWorld transform (the 'v' in MVP) going from view space to world space. - AZ::Matrix4x4 CameraViewFromCameraTransform(const AZ::Matrix4x4& cameraTransform); + AZ::Matrix3x4 CameraViewFromCameraTransform(const AZ::Matrix3x4& cameraTransform); //! Returns a frustum representing the camera transform and view volume in world space. AZ::Frustum FrustumFromCameraState(const CameraState& cameraState); diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorTransformComponentSelection.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorTransformComponentSelection.cpp index d0318ee181..d3540f8c09 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorTransformComponentSelection.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorTransformComponentSelection.cpp @@ -3497,7 +3497,7 @@ namespace AzToolsFramework // get the editor cameras current orientation const int viewportId = viewportInfo.m_viewportId; const AzFramework::CameraState editorCameraState = GetCameraState(viewportId); - const AZ::Matrix3x3& editorCameraOrientation = AZ::Matrix3x3::CreateFromMatrix4x4(AzFramework::CameraTransform(editorCameraState)); + const AZ::Matrix3x3& editorCameraOrientation = AZ::Matrix3x3::CreateFromMatrix3x4(AzFramework::CameraTransform(editorCameraState)); // create a gizmo camera transform about the origin matching the orientation of the editor camera // (10 units back in the y axis to produce an orbit effect) diff --git a/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Base.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Base.h index a88c640c19..6f93b0d247 100644 --- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Base.h +++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Base.h @@ -15,6 +15,7 @@ #include #include #include +#include #include #include #include @@ -24,6 +25,8 @@ AZ_DECLARE_BUDGET(RPI); namespace AZ { + class Matrix4x4; + namespace RHI { class ShaderResourceGroup; @@ -52,6 +55,8 @@ namespace AZ using ViewportContextPtr = AZStd::shared_ptr; using ConstViewportContextPtr = AZStd::shared_ptr; + using MatrixChangedEvent = Event; + //! The name used to identify a View within in a Scene. //! Note that the same View could have different tags in different RenderPipelines. using PipelineViewTag = AZ::Name; diff --git a/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/View.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/View.h index eb3592944d..92b9ad695a 100644 --- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/View.h +++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/View.h @@ -94,6 +94,9 @@ namespace AZ const AZ::Matrix4x4& GetWorldToClipMatrix() const; const AZ::Matrix4x4& GetClipToWorldMatrix() const; + AZ::Matrix3x4 GetWorldToViewMatrixAsMatrix3x4() const; + AZ::Matrix3x4 GetViewToWorldMatrixAsMatrix3x4() const; + //! Get the camera's world transform, converted from the viewToWorld matrix's native y-up to z-up AZ::Transform GetCameraTransform() const; @@ -120,7 +123,6 @@ namespace AZ //! Update View's SRG values and compile. This should only be called once per frame before execute command lists. void UpdateSrg(); - using MatrixChangedEvent = AZ::Event; //! Notifies consumers when the world to view matrix has changed. void ConnectWorldToViewMatrixChangedHandler(MatrixChangedEvent::Handler& handler); //! Notifies consumers when the world to clip matrix has changed. diff --git a/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/ViewportContext.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/ViewportContext.h index 966e6b3016..92cfc720da 100644 --- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/ViewportContext.h +++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/ViewportContext.h @@ -13,7 +13,6 @@ #include #include #include -#include namespace AZ { @@ -98,7 +97,6 @@ namespace AZ //! Alternatively, connect to ViewportContextNotificationsBus and listen to ViewportContextNotifications::OnViewportDpiScalingChanged. void ConnectDpiScalingFactorChangedHandler(ScalarChangedEvent::Handler& handler); - using MatrixChangedEvent = AZ::Event; //! Notifies consumers when the view matrix has changed. void ConnectViewMatrixChangedHandler(MatrixChangedEvent::Handler& handler); //! Notifies consumers when the projection matrix has changed. @@ -121,17 +119,12 @@ namespace AZ void ConnectAboutToBeDestroyedHandler(ViewportIdEvent::Handler& handler); // ViewportRequestBus interface overrides... - //! Gets the current camera's view matrix. const AZ::Matrix4x4& GetCameraViewMatrix() const override; - //! Sets the current camera's view matrix. + AZ::Matrix3x4 GetCameraViewMatrixAsMatrix3x4() const override; void SetCameraViewMatrix(const AZ::Matrix4x4& matrix) override; - //! Gets the current camera's projection matrix. const AZ::Matrix4x4& GetCameraProjectionMatrix() const override; - //! Sets the current camera's projection matrix. void SetCameraProjectionMatrix(const AZ::Matrix4x4& matrix) override; - //! Convenience method, gets the AZ::Transform corresponding to this camera's view matrix. AZ::Transform GetCameraTransform() const override; - //! Convenience method, sets the camera's view matrix from this AZ::Transform. void SetCameraTransform(const AZ::Transform& transform) override; private: diff --git a/Gems/Atom/RPI/Code/Source/RPI.Public/View.cpp b/Gems/Atom/RPI/Code/Source/RPI.Public/View.cpp index 4ad8dae41c..a5c67b6210 100644 --- a/Gems/Atom/RPI/Code/Source/RPI.Public/View.cpp +++ b/Gems/Atom/RPI/Code/Source/RPI.Public/View.cpp @@ -216,6 +216,16 @@ namespace AZ return m_viewToWorldMatrix; } + AZ::Matrix3x4 View::GetWorldToViewMatrixAsMatrix3x4() const + { + return AZ::Matrix3x4::UnsafeCreateFromMatrix4x4(m_worldToViewMatrix); + } + + AZ::Matrix3x4 View::GetViewToWorldMatrixAsMatrix3x4() const + { + return AZ::Matrix3x4::UnsafeCreateFromMatrix4x4(m_viewToWorldMatrix); + } + const AZ::Matrix4x4& View::GetViewToClipMatrix() const { return m_viewToClipMatrix; @@ -267,12 +277,12 @@ namespace AZ passWithDrawListTag->SortDrawList(drawList); } - void View::ConnectWorldToViewMatrixChangedHandler(View::MatrixChangedEvent::Handler& handler) + void View::ConnectWorldToViewMatrixChangedHandler(MatrixChangedEvent::Handler& handler) { handler.Connect(m_onWorldToViewMatrixChange); } - void View::ConnectWorldToClipMatrixChangedHandler(View::MatrixChangedEvent::Handler& handler) + void View::ConnectWorldToClipMatrixChangedHandler(MatrixChangedEvent::Handler& handler) { handler.Connect(m_onWorldToClipMatrixChange); } diff --git a/Gems/Atom/RPI/Code/Source/RPI.Public/ViewportContext.cpp b/Gems/Atom/RPI/Code/Source/RPI.Public/ViewportContext.cpp index 77114e5cf5..1013d35285 100644 --- a/Gems/Atom/RPI/Code/Source/RPI.Public/ViewportContext.cpp +++ b/Gems/Atom/RPI/Code/Source/RPI.Public/ViewportContext.cpp @@ -36,12 +36,12 @@ namespace AZ AzFramework::WindowNotificationBus::Handler::BusConnect(nativeWindow); AzFramework::ViewportRequestBus::Handler::BusConnect(id); - m_onProjectionMatrixChangedHandler = ViewportContext::MatrixChangedEvent::Handler([this](const AZ::Matrix4x4& matrix) + m_onProjectionMatrixChangedHandler = MatrixChangedEvent::Handler([this](const AZ::Matrix4x4& matrix) { m_projectionMatrixChangedEvent.Signal(matrix); }); - m_onViewMatrixChangedHandler = ViewportContext::MatrixChangedEvent::Handler([this](const AZ::Matrix4x4& matrix) + m_onViewMatrixChangedHandler = MatrixChangedEvent::Handler([this](const AZ::Matrix4x4& matrix) { m_viewMatrixChangedEvent.Signal(matrix); }); @@ -203,6 +203,11 @@ namespace AZ return GetDefaultView()->GetWorldToViewMatrix(); } + AZ::Matrix3x4 ViewportContext::GetCameraViewMatrixAsMatrix3x4() const + { + return GetDefaultView()->GetWorldToViewMatrixAsMatrix3x4(); + } + void ViewportContext::SetCameraViewMatrix(const AZ::Matrix4x4& matrix) { GetDefaultView()->SetWorldToViewMatrix(matrix); diff --git a/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Viewport/ModularViewportCameraController.h b/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Viewport/ModularViewportCameraController.h index 45c5394fd8..c54ffc812b 100644 --- a/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Viewport/ModularViewportCameraController.h +++ b/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Viewport/ModularViewportCameraController.h @@ -26,7 +26,7 @@ namespace AtomToolsFramework virtual AZ::Transform GetCameraTransform() const = 0; virtual void SetCameraTransform(const AZ::Transform& transform) = 0; - virtual void ConnectViewMatrixChangedHandler(AZ::RPI::ViewportContext::MatrixChangedEvent::Handler& handler) = 0; + virtual void ConnectViewMatrixChangedHandler(AZ::RPI::MatrixChangedEvent::Handler& handler) = 0; }; //! A function object to represent returning a camera controller priority. @@ -91,7 +91,7 @@ namespace AtomToolsFramework // ModularCameraViewportContext overrides ... AZ::Transform GetCameraTransform() const override; void SetCameraTransform(const AZ::Transform& transform) override; - void ConnectViewMatrixChangedHandler(AZ::RPI::ViewportContext::MatrixChangedEvent::Handler& handler) override; + void ConnectViewMatrixChangedHandler(AZ::RPI::MatrixChangedEvent::Handler& handler) override; private: AzFramework::ViewportId m_viewportId; @@ -152,7 +152,7 @@ namespace AtomToolsFramework float m_roll = 0.0f; //!< The current amount of roll to be applied to the camera. float m_targetRoll = 0.0f; //!< The target amount of roll to be applied to the camera (current will move towards this). //! Listen for camera view changes outside of the camera controller. - AZ::RPI::ViewportContext::MatrixChangedEvent::Handler m_cameraViewMatrixChangeHandler; + AZ::RPI::MatrixChangedEvent::Handler m_cameraViewMatrixChangeHandler; //! The current instance of the modular camera viewport context. AZStd::unique_ptr m_modularCameraViewportContext; //! Flag to prevent circular updates of the camera transform (while the viewport transform is being updated internally). @@ -165,10 +165,10 @@ namespace AtomToolsFramework public: AZ::Transform GetCameraTransform() const override; void SetCameraTransform(const AZ::Transform& transform) override; - void ConnectViewMatrixChangedHandler(AZ::RPI::ViewportContext::MatrixChangedEvent::Handler& handler) override; + void ConnectViewMatrixChangedHandler(AZ::RPI::MatrixChangedEvent::Handler& handler) override; private: AZ::Transform m_cameraTransform = AZ::Transform::CreateIdentity(); - AZ::RPI::ViewportContext::MatrixChangedEvent m_viewMatrixChangedEvent; + AZ::RPI::MatrixChangedEvent m_viewMatrixChangedEvent; }; } // namespace AtomToolsFramework diff --git a/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Viewport/ModularViewportCameraController.cpp b/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Viewport/ModularViewportCameraController.cpp index 179ccd9fd8..12e16c3dfa 100644 --- a/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Viewport/ModularViewportCameraController.cpp +++ b/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Viewport/ModularViewportCameraController.cpp @@ -86,7 +86,7 @@ namespace AtomToolsFramework } } - void ModularCameraViewportContextImpl::ConnectViewMatrixChangedHandler(AZ::RPI::ViewportContext::MatrixChangedEvent::Handler& handler) + void ModularCameraViewportContextImpl::ConnectViewMatrixChangedHandler(AZ::RPI::MatrixChangedEvent::Handler& handler) { if (auto viewportContext = RetrieveViewportContext(m_viewportId)) { @@ -185,7 +185,7 @@ namespace AtomToolsFramework } }; - m_cameraViewMatrixChangeHandler = AZ::RPI::ViewportContext::MatrixChangedEvent::Handler(handleCameraChange); + m_cameraViewMatrixChangeHandler = AZ::RPI::MatrixChangedEvent::Handler(handleCameraChange); m_modularCameraViewportContext->ConnectViewMatrixChangedHandler(m_cameraViewMatrixChangeHandler); ModularViewportCameraControllerRequestBus::Handler::BusConnect(viewportId); @@ -323,11 +323,11 @@ namespace AtomToolsFramework void PlaceholderModularCameraViewportContextImpl::SetCameraTransform(const AZ::Transform& transform) { m_cameraTransform = transform; - m_viewMatrixChangedEvent.Signal(AzFramework::CameraViewFromCameraTransform(Matrix4x4FromTransform(transform))); + m_viewMatrixChangedEvent.Signal( + AZ::Matrix4x4::CreateFromMatrix3x4(AzFramework::CameraViewFromCameraTransform(AZ::Matrix3x4::CreateFromTransform(transform)))); } - void PlaceholderModularCameraViewportContextImpl::ConnectViewMatrixChangedHandler( - AZ::RPI::ViewportContext::MatrixChangedEvent::Handler& handler) + void PlaceholderModularCameraViewportContextImpl::ConnectViewMatrixChangedHandler(AZ::RPI::MatrixChangedEvent::Handler& handler) { handler.Connect(m_viewMatrixChangedEvent); } diff --git a/Gems/Atom/Tools/AtomToolsFramework/Code/Tests/ViewportInteractionImplTests.cpp b/Gems/Atom/Tools/AtomToolsFramework/Code/Tests/ViewportInteractionImplTests.cpp index 2dfe4f7c29..19c55d7473 100644 --- a/Gems/Atom/Tools/AtomToolsFramework/Code/Tests/ViewportInteractionImplTests.cpp +++ b/Gems/Atom/Tools/AtomToolsFramework/Code/Tests/ViewportInteractionImplTests.cpp @@ -198,9 +198,7 @@ namespace UnitTest AzToolsFramework::ViewportInteraction::ViewportInteractionRequestBus::EventResult( cameraState, TestViewportId, &AzToolsFramework::ViewportInteraction::ViewportInteractionRequestBus::Events::GetCameraState); - const auto cameraMatrix = AzFramework::CameraTransform(cameraState); - const auto cameraTransform = AZ::Matrix3x4::CreateFromMatrix3x3AndTranslation( - AZ::Matrix3x3::CreateFromMatrix4x4(cameraMatrix), cameraMatrix.GetTranslation()); + const auto cameraTransform = AzFramework::CameraTransform(cameraState); // Then // camera transform matches that of the secondary view diff --git a/Gems/AtomLyIntegration/AtomFont/Code/Source/FFont.cpp b/Gems/AtomLyIntegration/AtomFont/Code/Source/FFont.cpp index 86b3011836..67df30fa7b 100644 --- a/Gems/AtomLyIntegration/AtomFont/Code/Source/FFont.cpp +++ b/Gems/AtomLyIntegration/AtomFont/Code/Source/FFont.cpp @@ -1726,15 +1726,13 @@ void AZ::FFont::DrawScreenAlignedText3d( { return; } - AZ::Vector3 positionNDC = AzFramework::WorldToScreenNdc( - params.m_position, - currentView->GetWorldToViewMatrix(), - currentView->GetViewToClipMatrix() - ); - // Text behind the camera shouldn't get rendered. WorldToScreenNDC returns values in the range 0 - 1, so Z < 0.5 is behind the screen + const AZ::Vector3 positionNdc = AzFramework::WorldToScreenNdc( + params.m_position, currentView->GetWorldToViewMatrixAsMatrix3x4(), currentView->GetViewToClipMatrix()); + + // Text behind the camera shouldn't get rendered. WorldToScreenNdc returns values in the range 0 - 1, so Z < 0.5 is behind the screen // and >= 0.5 is in front of the screen. - if (positionNDC.GetZ() < 0.5f) + if (positionNdc.GetZ() < 0.5f) { return; } @@ -1744,9 +1742,9 @@ void AZ::FFont::DrawScreenAlignedText3d( DrawStringUInternal( *internalParams.m_viewport, internalParams.m_viewportContext, - positionNDC.GetX() * internalParams.m_viewport->GetWidth(), - (1.0f - positionNDC.GetY()) * internalParams.m_viewport->GetHeight(), - positionNDC.GetZ(), // Z + positionNdc.GetX() * internalParams.m_viewport->GetWidth(), + (1.0f - positionNdc.GetY()) * internalParams.m_viewport->GetHeight(), + positionNdc.GetZ(), // Z text.data(), params.m_multiline, internalParams.m_ctx diff --git a/Gems/AtomLyIntegration/AtomViewportDisplayIcons/Code/Source/AtomViewportDisplayIconsSystemComponent.cpp b/Gems/AtomLyIntegration/AtomViewportDisplayIcons/Code/Source/AtomViewportDisplayIconsSystemComponent.cpp index c0ca2fe993..38679432ea 100644 --- a/Gems/AtomLyIntegration/AtomViewportDisplayIcons/Code/Source/AtomViewportDisplayIconsSystemComponent.cpp +++ b/Gems/AtomLyIntegration/AtomViewportDisplayIcons/Code/Source/AtomViewportDisplayIconsSystemComponent.cpp @@ -174,9 +174,9 @@ namespace AZ::Render { // Calculate our screen space position using the viewport size // We want this instead of RenderViewportWidget::WorldToScreen which works in QWidget virtual coordinate space - AzFramework::ScreenPoint position = AzFramework::WorldToScreen( - drawParameters.m_position, viewportContext->GetCameraViewMatrix(), viewportContext->GetCameraProjectionMatrix(), - viewportSize); + const AzFramework::ScreenPoint position = AzFramework::WorldToScreen( + drawParameters.m_position, viewportContext->GetCameraViewMatrixAsMatrix3x4(), + viewportContext->GetCameraProjectionMatrix(), viewportSize); screenPosition.SetX(aznumeric_cast(position.m_x)); screenPosition.SetY(aznumeric_cast(position.m_y)); } diff --git a/Gems/Camera/Code/Source/CameraEditorSystemComponent.cpp b/Gems/Camera/Code/Source/CameraEditorSystemComponent.cpp index fe49d1737a..d2f7469c58 100644 --- a/Gems/Camera/Code/Source/CameraEditorSystemComponent.cpp +++ b/Gems/Camera/Code/Source/CameraEditorSystemComponent.cpp @@ -113,7 +113,7 @@ namespace Camera // Set transform to that of the viewport, otherwise default to Identity matrix and 60 degree FOV const auto worldFromView = AzFramework::CameraTransform(cameraState); const auto cameraTransform = AZ::Transform::CreateFromMatrix3x3AndTranslation( - AZ::Matrix3x3::CreateFromMatrix4x4(worldFromView), worldFromView.GetTranslation()); + AZ::Matrix3x3::CreateFromMatrix3x4(worldFromView), worldFromView.GetTranslation()); AZ::TransformBus::Event(newEntityId, &AZ::TransformInterface::SetWorldTM, cameraTransform); CameraRequestBus::Event(newEntityId, &CameraComponentRequests::SetFov, AZ::RadToDeg(cameraState.m_fovOrZoom)); undoBatch.MarkEntityDirty(newEntityId); From 1649d86568aad1535ba613ec650b11117ccb4aca Mon Sep 17 00:00:00 2001 From: Michael Pollind Date: Wed, 24 Nov 2021 01:17:54 -0800 Subject: [PATCH 234/345] chore: update static const declerations in AzQtComponent (#5826) * chore: update static const declerations in AzQtComponent Signed-off-by: Michael Pollind * chore: update static const Signed-off-by: Michael Pollind --- .../AzQtComponents/Components/FancyDocking.cpp | 14 +++++++------- .../Components/FancyDockingDropZoneWidget.cpp | 2 +- .../Components/Widgets/BrowseEdit.cpp | 6 +++--- .../Widgets/Internal/OverlayWidgetLayer.cpp | 6 +++--- .../Widgets/Internal/OverlayWidgetLayer.h | 2 -- 5 files changed, 14 insertions(+), 16 deletions(-) diff --git a/Code/Framework/AzQtComponents/AzQtComponents/Components/FancyDocking.cpp b/Code/Framework/AzQtComponents/AzQtComponents/Components/FancyDocking.cpp index b6acd14a83..af902f97a0 100644 --- a/Code/Framework/AzQtComponents/AzQtComponents/Components/FancyDocking.cpp +++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/FancyDocking.cpp @@ -53,14 +53,14 @@ static void OptimizedSetParent(QWidget* widget, QWidget* parent) namespace AzQtComponents { - static FancyDockingDropZoneConstants g_FancyDockingConstants; + static const FancyDockingDropZoneConstants g_FancyDockingConstants; // Constant for the threshold in pixels for snapping to edges while dragging for docking static const int g_snapThresholdInPixels = 15; - static QString g_minimizeButtonObjectName = "minimizeButton"; - static QString g_maximizeButtonObjectName = "maximizeButton"; - static QString g_closeButtonObjectName = "closeButton"; + static const QString MinimizeButtonObjectName = QStringLiteral("minimizeButton"); + static const QString MaximizeButtonObjectName = QStringLiteral("maximizeButton"); + static const QString CloseButtonObjectName = QStringLiteral("closeButton"); static Qt::Orientation orientation(Qt::DockWidgetArea area) { @@ -460,7 +460,7 @@ namespace AzQtComponents // Minimize Icon QAction* minimizeAction = new QAction(tr("Minimize")); - minimizeAction->setObjectName(g_minimizeButtonObjectName); + minimizeAction->setObjectName(MinimizeButtonObjectName); connect(minimizeAction, &QAction::triggered, this, [titleBar]() { titleBar->handleMinimize(); @@ -470,7 +470,7 @@ namespace AzQtComponents // Maximize Icon QAction* maximizeAction = new QAction(tr("Maximize")); - maximizeAction->setObjectName(g_maximizeButtonObjectName); + maximizeAction->setObjectName(MaximizeButtonObjectName); connect(maximizeAction, &QAction::triggered, this, [titleBar]() { titleBar->handleMaximize(); @@ -480,7 +480,7 @@ namespace AzQtComponents // Close Icon QAction* closeAction = new QAction(tr("Close")); - closeAction->setObjectName(g_closeButtonObjectName); + closeAction->setObjectName(CloseButtonObjectName); connect(closeAction, &QAction::triggered, this, [titleBar]() { titleBar->handleClose(); diff --git a/Code/Framework/AzQtComponents/AzQtComponents/Components/FancyDockingDropZoneWidget.cpp b/Code/Framework/AzQtComponents/AzQtComponents/Components/FancyDockingDropZoneWidget.cpp index d729929d7b..1451094ea1 100644 --- a/Code/Framework/AzQtComponents/AzQtComponents/Components/FancyDockingDropZoneWidget.cpp +++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/FancyDockingDropZoneWidget.cpp @@ -19,7 +19,7 @@ namespace AzQtComponents { - static FancyDockingDropZoneConstants g_Constants; + static const FancyDockingDropZoneConstants g_Constants; FancyDockingDropZoneConstants::FancyDockingDropZoneConstants() { diff --git a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/BrowseEdit.cpp b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/BrowseEdit.cpp index 03d2c13f64..7e18843d65 100644 --- a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/BrowseEdit.cpp +++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/BrowseEdit.cpp @@ -27,7 +27,7 @@ AZ_POP_DISABLE_WARNING namespace AzQtComponents { - static const char clearButtonActionNameC[] = "_q_qlineeditclearaction"; + static const QString ClearButtonActionNameC = QStringLiteral("_q_qlineeditclearaction"); struct BrowseEdit::InternalData { @@ -263,7 +263,7 @@ namespace AzQtComponents auto lineEdit = browseEdit->m_data->m_lineEdit; LineEdit::polish(style, lineEdit, lineEditConfig); - QAction* action = lineEdit->findChild(clearButtonActionNameC); + QAction* action = lineEdit->findChild(ClearButtonActionNameC); if (action) { QStyleOptionFrame option; @@ -284,7 +284,7 @@ namespace AzQtComponents auto lineEdit = browseEdit->m_data->m_lineEdit; LineEdit::unpolish(style, lineEdit, lineEditConfig); - QAction* action = lineEdit->findChild(clearButtonActionNameC); + QAction* action = lineEdit->findChild(ClearButtonActionNameC); if (action) { QStyleOptionFrame option; diff --git a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/Internal/OverlayWidgetLayer.cpp b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/Internal/OverlayWidgetLayer.cpp index f6417d3470..21f2500822 100644 --- a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/Internal/OverlayWidgetLayer.cpp +++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/Internal/OverlayWidgetLayer.cpp @@ -32,7 +32,7 @@ namespace AzQtComponents namespace Internal { - const char* OverlayWidgetLayer::s_layerStyle = "background-color:rgba(0, 0, 0, 179)"; + static const QString LayerStyle = QStringLiteral("background-color:rgba(0, 0, 0, 179)"); OverlayWidgetLayer::OverlayWidgetLayer(OverlayWidget* parent, QWidget* centerWidget, QWidget* breakoutWidget, const char* title, const OverlayWidgetButtonList& buttons) @@ -66,7 +66,7 @@ namespace AzQtComponents if (breakoutWidget) { - setStyleSheet(s_layerStyle); + setStyleSheet(LayerStyle); setLayout(new QHBoxLayout()); // close the overlay if either dependent widget is destroyed @@ -100,7 +100,7 @@ namespace AzQtComponents } else { - setStyleSheet(s_layerStyle); + setStyleSheet(LayerStyle); } AddButtons(*m_ui.data(), buttons, parent == nullptr); } diff --git a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/Internal/OverlayWidgetLayer.h b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/Internal/OverlayWidgetLayer.h index 1ad3cb5071..cba61cb67d 100644 --- a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/Internal/OverlayWidgetLayer.h +++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/Internal/OverlayWidgetLayer.h @@ -59,8 +59,6 @@ namespace AzQtComponents bool eventFilter(QObject* object, QEvent* event) override; - static const char* s_layerStyle; - QVector