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 01/58] 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 02/58] 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 03/58] 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 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 04/58] 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 05/58] 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 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 06/58] 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 7b9038e750c57b7f7ca6b07cabae8d03d365a585 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 24 Nov 2021 10:40:53 +0000 Subject: [PATCH 07/58] Fix warning as error. Signed-off-by: John --- Code/Framework/AzToolsFramework/Tests/InstanceDataHierarchy.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Code/Framework/AzToolsFramework/Tests/InstanceDataHierarchy.cpp b/Code/Framework/AzToolsFramework/Tests/InstanceDataHierarchy.cpp index 4d144d0d1b..88966ef994 100644 --- a/Code/Framework/AzToolsFramework/Tests/InstanceDataHierarchy.cpp +++ b/Code/Framework/AzToolsFramework/Tests/InstanceDataHierarchy.cpp @@ -710,7 +710,7 @@ namespace UnitTest auto getEnumData = [&ec](const AzToolsFramework::InstanceDataNode& node) -> Uuid { - Uuid id; + Uuid id = Uuid::CreateNull(); auto attribute = node.GetElementMetadata()->FindAttribute(AZ_CRC("EnumType")); auto attributeData = azrtti_cast*>(attribute); if (attributeData) From d75b6f9d6421de4f40acbac1c9b3e9ebe07b9073 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 24 Nov 2021 10:41:48 +0000 Subject: [PATCH 08/58] Add call to ViewportEditorModeNotifications::Reflect Signed-off-by: John --- .../AzToolsFramework/Application/ToolsApplication.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Application/ToolsApplication.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Application/ToolsApplication.cpp index e4057b31e7..afabbb233b 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/Application/ToolsApplication.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Application/ToolsApplication.cpp @@ -54,6 +54,7 @@ #include #include #include +#include #include #include #include @@ -385,6 +386,7 @@ namespace AzToolsFramework ComponentModeFramework::ComponentModeDelegate::Reflect(context); ViewportInteraction::ViewportInteractionReflect(context); + ViewportEditorModeNotifications::Reflect(context); Camera::EditorCameraRequests::Reflect(context); AzToolsFramework::EditorTransformComponentSelectionRequests::Reflect(context); From 67d38a5beab64986147c0b9e42edf4b55b17ad09 Mon Sep 17 00:00:00 2001 From: lsemp3d <58790905+lsemp3d@users.noreply.github.com> Date: Wed, 24 Nov 2021 09:18:03 -0800 Subject: [PATCH 09/58] A few more updtes and a fallback category for items in the Other field Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com> --- .../TranslationAssets/Classes/AssetInfo.names | 12 ++-- .../Classes/MotionEvent.names | 60 +++++++++---------- .../Classes/SimpleAssetReferenceBase.names | 24 ++++---- .../EBus/Senders/AreaSystemRequestBus.names | 1 - .../Nodes/MathCrc32_FromString.names | 4 +- .../Widgets/NodePalette/NodePaletteModel.cpp | 6 +- 6 files changed, 54 insertions(+), 53 deletions(-) diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AssetInfo.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AssetInfo.names index 39abff351c..db6fe2d2e3 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AssetInfo.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AssetInfo.names @@ -9,7 +9,7 @@ }, "methods": [ { - "base": "assetId", + "base": "GetassetId", "details": { "name": "Get Asset Id" }, @@ -31,7 +31,7 @@ ] }, { - "base": "assetType", + "base": "GetassetType", "details": { "name": "Get Asset Type" }, @@ -53,9 +53,9 @@ ] }, { - "base": "sizeBytes", + "base": "GetsizeBytes", "details": { - "name": "Get Size (Bytes)" + "name": "Get Size Bytes" }, "params": [ { @@ -69,13 +69,13 @@ { "typeid": "{D6597933-47CD-4FC8-B911-63F3E2B0993A}", "details": { - "name": "Size (Bytes)" + "name": "Size" } } ] }, { - "base": "relativePath", + "base": "GetrelativePath", "details": { "name": "Get Relative Path" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MotionEvent.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MotionEvent.names index 2251df87a6..fccd0720b5 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MotionEvent.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MotionEvent.names @@ -12,7 +12,7 @@ { "base": "GetlocalWeight", "details": { - "name": "Getlocal Weight" + "name": "Get Local Weight" }, "params": [ { @@ -26,7 +26,7 @@ { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", "details": { - "name": "float" + "name": "Local Weight" } } ] @@ -34,7 +34,7 @@ { "base": "SetlocalWeight", "details": { - "name": "Setlocal Weight" + "name": "Set Local Weight" }, "params": [ { @@ -46,7 +46,7 @@ { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", "details": { - "name": "float" + "name": "Local Weight" } } ] @@ -54,7 +54,7 @@ { "base": "GetglobalWeight", "details": { - "name": "Getglobal Weight" + "name": "Get Global Weight" }, "params": [ { @@ -68,7 +68,7 @@ { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", "details": { - "name": "float" + "name": "Global Weight" } } ] @@ -76,7 +76,7 @@ { "base": "SetglobalWeight", "details": { - "name": "Setglobal Weight" + "name": "Set Global Weight" }, "params": [ { @@ -88,7 +88,7 @@ { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", "details": { - "name": "float" + "name": "Global Weight" } } ] @@ -96,7 +96,7 @@ { "base": "Gettime", "details": { - "name": "Gettime" + "name": "Get Time" }, "params": [ { @@ -110,7 +110,7 @@ { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", "details": { - "name": "float" + "name": "Time" } } ] @@ -118,7 +118,7 @@ { "base": "Settime", "details": { - "name": "Settime" + "name": "Set Time" }, "params": [ { @@ -130,7 +130,7 @@ { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", "details": { - "name": "float" + "name": "Time" } } ] @@ -138,7 +138,7 @@ { "base": "GeteventType", "details": { - "name": "Getevent Type" + "name": "Get Event Type" }, "params": [ { @@ -152,7 +152,7 @@ { "typeid": "{43DA906B-7DEF-4CA8-9790-854106D3F983}", "details": { - "name": "unsigned int" + "name": "Event Type" } } ] @@ -160,7 +160,7 @@ { "base": "SeteventType", "details": { - "name": "Setevent Type" + "name": "Set Event Type" }, "params": [ { @@ -172,7 +172,7 @@ { "typeid": "{43DA906B-7DEF-4CA8-9790-854106D3F983}", "details": { - "name": "unsigned int" + "name": "Event Type" } } ] @@ -180,7 +180,7 @@ { "base": "GeteventTypeName", "details": { - "name": "Getevent Type Name" + "name": "Get Event Type Name" }, "params": [ { @@ -194,7 +194,7 @@ { "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", "details": { - "name": "char" + "name": "Event Type Name" } } ] @@ -202,7 +202,7 @@ { "base": "SeteventTypeName", "details": { - "name": "Setevent Type Name" + "name": "Set Event Type Name" }, "params": [ { @@ -214,7 +214,7 @@ { "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", "details": { - "name": "char" + "name": "Event Type Name" } } ] @@ -222,7 +222,7 @@ { "base": "GetisEventStart", "details": { - "name": "Getis Event Start" + "name": "Get Is Event Start" }, "params": [ { @@ -236,7 +236,7 @@ { "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", "details": { - "name": "bool" + "name": "Is Event Start" } } ] @@ -244,7 +244,7 @@ { "base": "SetisEventStart", "details": { - "name": "Setis Event Start" + "name": "Set Is Event Start" }, "params": [ { @@ -256,7 +256,7 @@ { "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", "details": { - "name": "bool" + "name": "Is Event Start" } } ] @@ -264,7 +264,7 @@ { "base": "Getparameter", "details": { - "name": "Getparameter" + "name": "Get Parameter" }, "params": [ { @@ -278,7 +278,7 @@ { "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", "details": { - "name": "char" + "name": "Parameter" } } ] @@ -286,7 +286,7 @@ { "base": "Setparameter", "details": { - "name": "Setparameter" + "name": "Set Parameter" }, "params": [ { @@ -298,7 +298,7 @@ { "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", "details": { - "name": "char" + "name": "Parameter" } } ] @@ -306,7 +306,7 @@ { "base": "GetentityId", "details": { - "name": "Getentity Id" + "name": "Get Entity Id" }, "params": [ { @@ -329,7 +329,7 @@ { "base": "SetentityId", "details": { - "name": "Setentity Id" + "name": "Set Entity Id" }, "params": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SimpleAssetReferenceBase.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SimpleAssetReferenceBase.names index 083e61fc8a..b4da62d2e8 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SimpleAssetReferenceBase.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SimpleAssetReferenceBase.names @@ -5,7 +5,7 @@ "context": "BehaviorClass", "variant": "", "details": { - "name": "Asset Reference" + "name": "Simple Asset Reference" }, "methods": [ { @@ -26,20 +26,20 @@ { "typeid": "{E16CA6C5-5C78-4AD9-8E9B-F8C1FB4D1DB8}", "details": { - "name": "Asset Reference", + "name": "Asset path", "tooltip": "Asset reference as a project-relative path" } }, { "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", "details": { - "name": "Path" + "name": "char" } } ] }, { - "base": "assetPath", + "base": "GetassetPath", "details": { "name": "Get Asset Path" }, @@ -47,7 +47,7 @@ { "typeid": "{E16CA6C5-5C78-4AD9-8E9B-F8C1FB4D1DB8}", "details": { - "name": "Asset Reference", + "name": "Asset path", "tooltip": "Asset reference as a project-relative path" } } @@ -56,13 +56,13 @@ { "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", "details": { - "name": "Path" + "name": "AZ Std::string" } } ] }, { - "base": "assetType", + "base": "GetassetType", "details": { "name": "Get Asset Type" }, @@ -70,7 +70,7 @@ { "typeid": "{E16CA6C5-5C78-4AD9-8E9B-F8C1FB4D1DB8}", "details": { - "name": "Asset Reference", + "name": "Asset path", "tooltip": "Asset reference as a project-relative path" } } @@ -79,13 +79,13 @@ { "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}", "details": { - "name": "Type" + "name": "AZ:: Uuid" } } ] }, { - "base": "fileFilter", + "base": "GetfileFilter", "details": { "name": "Get File Filter" }, @@ -93,7 +93,7 @@ { "typeid": "{E16CA6C5-5C78-4AD9-8E9B-F8C1FB4D1DB8}", "details": { - "name": "Asset Reference", + "name": "Asset path", "tooltip": "Asset reference as a project-relative path" } } @@ -102,7 +102,7 @@ { "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", "details": { - "name": "Filter" + "name": "char" } } ] diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AreaSystemRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AreaSystemRequestBus.names index fd994b7663..57f718450a 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AreaSystemRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AreaSystemRequestBus.names @@ -5,7 +5,6 @@ "context": "EBusSender", "variant": "", "details": { - "name": "Area System", "category": "Area System" }, "methods": [ diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathCrc32_FromString.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathCrc32_FromString.names index 5ab5075de1..a3682b3751 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathCrc32_FromString.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathCrc32_FromString.names @@ -6,8 +6,8 @@ "variant": "", "details": { "name": "From String", - "category": "Math/Crc32", - "tooltip": "Returns a Crc32 from the string" + "category": "Math/Tag", + "tooltip": "Returns a Tag from the string" }, "slots": [ { diff --git a/Gems/ScriptCanvas/Code/Editor/View/Widgets/NodePalette/NodePaletteModel.cpp b/Gems/ScriptCanvas/Code/Editor/View/Widgets/NodePalette/NodePaletteModel.cpp index f128537e1a..dc221deec0 100644 --- a/Gems/ScriptCanvas/Code/Editor/View/Widgets/NodePalette/NodePaletteModel.cpp +++ b/Gems/ScriptCanvas/Code/Editor/View/Widgets/NodePalette/NodePaletteModel.cpp @@ -611,8 +611,9 @@ namespace { categoryPath.append(details.m_name.c_str()); } - else + else if (categoryPath.contains("Other")) { + // Use the BehaviorEBus name to categorize within the 'Other' category categoryPath.append(behaviorEbus.m_name.c_str()); } } @@ -657,8 +658,9 @@ namespace { categoryPath.append(details.m_name.c_str()); } - else + else if (categoryPath.contains("Other")) { + // Use the behavior EBus name to categorize within the 'Other' category categoryPath.append(behaviorEbus.m_name.c_str()); } From 357648a42431acfbef39d5402c99c6ab424ba752 Mon Sep 17 00:00:00 2001 From: Guthrie Adams Date: Tue, 23 Nov 2021 20:52:41 -0600 Subject: [PATCH 10/58] =?UTF-8?q?Fixed=20a=20bug=20with=20model=20previews?= =?UTF-8?q?=20and=20thumbnails.=20A=20source=20model=20asset=20can=20have?= =?UTF-8?q?=20multiple=20products=20including=20models=20and=20materials.?= =?UTF-8?q?=20It=E2=80=99s=20not=20guaranteed=20that=20the=20first=20entry?= =?UTF-8?q?=20in=20the=20list=20of=20products=20for=20a=20model=20asset=20?= =?UTF-8?q?will=20be=20a=20model.=20In=20this=20case=20the=20first=20produ?= =?UTF-8?q?ct=20was=20the=20default=20material=20asset.=20This=20caused=20?= =?UTF-8?q?some=20model=20previews=20to=20render=20a=20gray=20sphere=20dep?= =?UTF-8?q?icting=20the=20default=20material.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Guthrie Adams --- .../Source/SharedPreview/SharedPreviewUtils.cpp | 17 +++++++++++------ .../Source/SharedPreview/SharedPreviewUtils.h | 2 +- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/SharedPreview/SharedPreviewUtils.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/SharedPreview/SharedPreviewUtils.cpp index d0e288d239..7fbe374286 100644 --- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/SharedPreview/SharedPreviewUtils.cpp +++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/SharedPreview/SharedPreviewUtils.cpp @@ -22,9 +22,9 @@ namespace AZ { namespace SharedPreviewUtils { - AZStd::unordered_set GetSupportedAssetTypes() + AZStd::vector GetSupportedAssetTypes() { - return { RPI::AnyAsset::RTTI_Type(), RPI::MaterialAsset::RTTI_Type(), RPI::ModelAsset::RTTI_Type() }; + return { RPI::ModelAsset::RTTI_Type(), RPI::MaterialAsset::RTTI_Type(), RPI::AnyAsset::RTTI_Type() }; } bool IsSupportedAssetType(AzToolsFramework::Thumbnailer::SharedThumbnailKey key) @@ -46,11 +46,15 @@ namespace AZ foundIt, &AzToolsFramework::AssetSystemRequestBus::Events::GetAssetsProducedBySourceUUID, sourceKey->GetSourceUuid(), productsAssetInfo); - for (const auto& assetInfo : productsAssetInfo) + // Search the product assets for a matching asset type ID in the order of the supported type IDs, which are organized by priority + for (const auto& typeId : supportedTypeIds) { - if (supportedTypeIds.find(assetInfo.m_assetType) != supportedTypeIds.end()) + for (const auto& assetInfo : productsAssetInfo) { - return assetInfo; + if (assetInfo.m_assetType == typeId) + { + return assetInfo; + } } } return AZ::Data::AssetInfo(); @@ -59,7 +63,8 @@ namespace AZ // if it's a product thumbnail key just return its assetId AZ::Data::AssetInfo assetInfo; auto productKey = azrtti_cast(key.data()); - if (productKey && supportedTypeIds.find(productKey->GetAssetType()) != supportedTypeIds.end()) + if (productKey && + AZStd::find(supportedTypeIds.begin(), supportedTypeIds.end(), productKey->GetAssetType()) != supportedTypeIds.end()) { AZ::Data::AssetCatalogRequestBus::BroadcastResult( assetInfo, &AZ::Data::AssetCatalogRequestBus::Events::GetAssetInfoById, productKey->GetAssetId()); diff --git a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/SharedPreview/SharedPreviewUtils.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/SharedPreview/SharedPreviewUtils.h index 28c9809d6d..d215271936 100644 --- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/SharedPreview/SharedPreviewUtils.h +++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/SharedPreview/SharedPreviewUtils.h @@ -21,7 +21,7 @@ namespace AZ namespace SharedPreviewUtils { //! Get the set of all asset types supported by the shared preview - AZStd::unordered_set GetSupportedAssetTypes(); + AZStd::vector GetSupportedAssetTypes(); //! Determine if a thumbnail key has an asset supported by the shared preview bool IsSupportedAssetType(AzToolsFramework::Thumbnailer::SharedThumbnailKey key); From 34542337b9345786ef79afd61756ad42f143ca49 Mon Sep 17 00:00:00 2001 From: amzn-sj Date: Wed, 24 Nov 2021 22:34:04 -0800 Subject: [PATCH 11/58] Remove dependency of ScriptCanvasPhysics on ScriptCanvas gem to fix runtime dependency conflict Signed-off-by: amzn-sj --- Gems/ScriptCanvas/Code/CMakeLists.txt | 16 + .../Code/scriptcanvasgem_headers.cmake | 378 ++++++++++++++++++ Gems/ScriptCanvasPhysics/Code/CMakeLists.txt | 2 +- 3 files changed, 395 insertions(+), 1 deletion(-) create mode 100644 Gems/ScriptCanvas/Code/scriptcanvasgem_headers.cmake diff --git a/Gems/ScriptCanvas/Code/CMakeLists.txt b/Gems/ScriptCanvas/Code/CMakeLists.txt index c126d343ed..25b0099e88 100644 --- a/Gems/ScriptCanvas/Code/CMakeLists.txt +++ b/Gems/ScriptCanvas/Code/CMakeLists.txt @@ -89,6 +89,22 @@ ly_add_target( Gem::ScriptCanvasDebugger ) +ly_add_target( + NAME ScriptCanvasAPI HEADERONLY + NAMESPACE Gem + FILES_CMAKE + scriptcanvasgem_headers.cmake + COMPILE_DEFINITIONS + INTERFACE + SCRIPTCANVAS_ERRORS_ENABLED + ${SCRIPT_CANVAS_COMMON_DEFINES} + INCLUDE_DIRECTORIES + INTERFACE + . + Include + Include/ScriptCanvas +) + ly_add_target( NAME ScriptCanvas ${PAL_TRAIT_MONOLITHIC_DRIVEN_MODULE_TYPE} NAMESPACE Gem diff --git a/Gems/ScriptCanvas/Code/scriptcanvasgem_headers.cmake b/Gems/ScriptCanvas/Code/scriptcanvasgem_headers.cmake new file mode 100644 index 0000000000..7dfe9653b6 --- /dev/null +++ b/Gems/ScriptCanvas/Code/scriptcanvasgem_headers.cmake @@ -0,0 +1,378 @@ +# +# 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 + Include/ScriptCanvas/SystemComponent.h + Include/ScriptCanvas/ScriptCanvasGem.h + Include/ScriptCanvas/Asset/AssetDescription.h + Include/ScriptCanvas/Asset/AssetRegistry.h + Include/ScriptCanvas/Asset/AssetRegistryBus.h + Include/ScriptCanvas/Asset/ExecutionLogAsset.h + Include/ScriptCanvas/Asset/ExecutionLogAssetBus.h + Include/ScriptCanvas/Asset/RuntimeAsset.h + Include/ScriptCanvas/Asset/RuntimeAssetHandler.h + Include/ScriptCanvas/Asset/ScriptCanvasAssetBase.h + Include/ScriptCanvas/Asset/ScriptCanvasAssetData.h + Include/ScriptCanvas/Asset/SubgraphInterfaceAssetHandler.h + Include/ScriptCanvas/Core/ScriptCanvasBus.h + Include/ScriptCanvas/Core/ExecutionNotificationsBus.h + Include/ScriptCanvas/Core/GraphBus.h + Include/ScriptCanvas/Core/NodeBus.h + Include/ScriptCanvas/Core/EBusNodeBus.h + Include/ScriptCanvas/Core/NodelingBus.h + Include/ScriptCanvas/Core/ContractBus.h + Include/ScriptCanvas/Core/Attributes.h + Include/ScriptCanvas/Core/Connection.h + Include/ScriptCanvas/Core/ConnectionBus.h + Include/ScriptCanvas/Core/Contract.h + Include/ScriptCanvas/Core/Contracts.h + Include/ScriptCanvas/Core/Contracts/MethodOverloadContract.h + Include/ScriptCanvas/Core/Contracts/RestrictedNodeContract.h + Include/ScriptCanvas/Core/Core.h + Include/ScriptCanvas/Core/Datum.h + Include/ScriptCanvas/Core/DatumBus.h + Include/ScriptCanvas/Core/EBusHandler.h + Include/ScriptCanvas/Core/Endpoint.h + Include/ScriptCanvas/Core/Graph.h + Include/ScriptCanvas/Core/GraphData.h + Include/ScriptCanvas/Core/GraphScopedTypes.h + Include/ScriptCanvas/Core/MethodConfiguration.h + Include/ScriptCanvas/Core/ModifiableDatumView.h + Include/ScriptCanvas/Core/Node.h + Include/ScriptCanvas/Core/Nodeable.h + Include/ScriptCanvas/Core/NodeableNode.h + Include/ScriptCanvas/Core/NodeableNodeOverloaded.h + Include/ScriptCanvas/Core/NodeFunctionGeneric.h + Include/ScriptCanvas/Core/SerializationListener.h + Include/ScriptCanvas/Core/Slot.h + Include/ScriptCanvas/Core/SlotConfigurationDefaults.h + Include/ScriptCanvas/Core/SlotConfigurations.h + Include/ScriptCanvas/Core/SlotExecutionMap.h + Include/ScriptCanvas/Core/SlotMetadata.h + Include/ScriptCanvas/Core/SlotNames.h + Include/ScriptCanvas/Core/SubgraphInterface.h + Include/ScriptCanvas/Core/SubgraphInterfaceUtility.h + Include/ScriptCanvas/Translation/AbstractModelTranslator.h + Include/ScriptCanvas/Translation/Configuration.h + Include/ScriptCanvas/Translation/GraphToCPlusPlus.h + Include/ScriptCanvas/Translation/GraphToLua.h + Include/ScriptCanvas/Translation/GraphToLuaUtility.h + Include/ScriptCanvas/Translation/GraphToX.h + Include/ScriptCanvas/Translation/Translation.h + Include/ScriptCanvas/Translation/TranslationContext.h + Include/ScriptCanvas/Translation/TranslationResult.h + Include/ScriptCanvas/Translation/TranslationUtilities.h + Include/ScriptCanvas/PerformanceStatistician.h + Include/ScriptCanvas/PerformanceStatisticsBus.h + Include/ScriptCanvas/PerformanceTracker.h + Include/ScriptCanvas/AutoGen/ScriptCanvas_Macros.jinja + Include/ScriptCanvas/AutoGen/ScriptCanvas_Nodeable_Macros.jinja + Include/ScriptCanvas/AutoGen/ScriptCanvasGrammar_Header.jinja + Include/ScriptCanvas/AutoGen/ScriptCanvasGrammar_Source.jinja + Include/ScriptCanvas/AutoGen/ScriptCanvasNodeable_Header.jinja + Include/ScriptCanvas/AutoGen/ScriptCanvasNodeable_Source.jinja + Include/ScriptCanvas/CodeGen/NodeableCodegen.h + Include/ScriptCanvas/Core/Contracts/ConnectionLimitContract.h + Include/ScriptCanvas/Core/Contracts/ContractRTTI.h + Include/ScriptCanvas/Core/Contracts/DisallowReentrantExecutionContract.h + Include/ScriptCanvas/Core/Contracts/DisplayGroupConnectedSlotLimitContract.h + Include/ScriptCanvas/Core/Contracts/DynamicTypeContract.h + Include/ScriptCanvas/Core/Contracts/IsReferenceTypeContract.h + Include/ScriptCanvas/Core/Contracts/MathOperatorContract.h + Include/ScriptCanvas/Core/Contracts/SlotTypeContract.h + Include/ScriptCanvas/Core/Contracts/SupportsMethodContract.h + Include/ScriptCanvas/Core/Contracts/TypeContract.h + Include/ScriptCanvas/Data/BehaviorContextObject.h + Include/ScriptCanvas/Data/BehaviorContextObjectPtr.h + Include/ScriptCanvas/Data/Data.h + Include/ScriptCanvas/Data/DataMacros.h + Include/ScriptCanvas/Data/DataRegistry.h + Include/ScriptCanvas/Data/NumericData.h + Include/ScriptCanvas/Deprecated/VariableDatumBase.h + Include/ScriptCanvas/Deprecated/VariableDatum.h + Include/ScriptCanvas/Deprecated/VariableHelpers.h + Include/ScriptCanvas/Execution/ErrorBus.h + Include/ScriptCanvas/Execution/ExecutionBus.h + Include/ScriptCanvas/Execution/ExecutionContext.h + Include/ScriptCanvas/Execution/ExecutionObjectCloning.h + Include/ScriptCanvas/Execution/ExecutionPerformanceTimer.h + Include/ScriptCanvas/Execution/ExecutionState.h + Include/ScriptCanvas/Execution/ExecutionStateDeclarations.h + Include/ScriptCanvas/Execution/NativeHostDeclarations.h + Include/ScriptCanvas/Execution/NativeHostDefinitions.h + Include/ScriptCanvas/Execution/RuntimeComponent.h + Include/ScriptCanvas/Execution/Interpreted/ExecutionInterpretedAPI.h + Include/ScriptCanvas/Execution/Interpreted/ExecutionInterpretedCloningAPI.h + Include/ScriptCanvas/Execution/Interpreted/ExecutionInterpretedDebugAPI.h + Include/ScriptCanvas/Execution/Interpreted/ExecutionInterpretedEBusAPI.h + Include/ScriptCanvas/Execution/Interpreted/ExecutionInterpretedOut.h + Include/ScriptCanvas/Execution/Interpreted/ExecutionStateInterpreted.h + Include/ScriptCanvas/Execution/Interpreted/ExecutionStateInterpretedPerActivation.h + Include/ScriptCanvas/Execution/Interpreted/ExecutionStateInterpretedPure.h + Include/ScriptCanvas/Execution/Interpreted/ExecutionStateInterpretedSingleton.h + Include/ScriptCanvas/Execution/Interpreted/ExecutionStateInterpretedUtility.h + Include/ScriptCanvas/Execution/NodeableOut/NodeableOutNative.h + Include/ScriptCanvas/Grammar/AbstractCodeModel.h + Include/ScriptCanvas/Grammar/DebugMap.h + Include/ScriptCanvas/Grammar/ExecutionTraversalListeners.h + Include/ScriptCanvas/Grammar/ParsingMetaData.h + Include/ScriptCanvas/Grammar/ParsingUtilities.h + Include/ScriptCanvas/Grammar/Primitives.h + Include/ScriptCanvas/Grammar/PrimitivesDeclarations.h + Include/ScriptCanvas/Grammar/PrimitivesExecution.h + Include/ScriptCanvas/Grammar/SymbolNames.h + Include/ScriptCanvas/Execution/ErrorBus.h + Include/ScriptCanvas/Execution/ExecutionContext.h + Include/ScriptCanvas/Execution/ExecutionBus.h + Include/ScriptCanvas/Execution/NativeHostDeclarations.h + Include/ScriptCanvas/Execution/NativeHostDefinitions.h + Include/ScriptCanvas/Execution/RuntimeComponent.h + Include/ScriptCanvas/Internal/Nodeables/BaseTimer.h + Include/ScriptCanvas/Internal/Nodeables/BaseTimer.ScriptCanvasNodeable.xml + Include/ScriptCanvas/Internal/Nodes/BaseTimerNode.h + Include/ScriptCanvas/Internal/Nodes/BaseTimerNode.ScriptCanvasGrammar.xml + Include/ScriptCanvas/Internal/Nodes/ExpressionNodeBase.h + Include/ScriptCanvas/Internal/Nodes/ExpressionNodeBase.ScriptCanvasGrammar.xml + Include/ScriptCanvas/Internal/Nodes/StringFormatted.h + Include/ScriptCanvas/Internal/Nodes/StringFormatted.ScriptCanvasGrammar.xml + Include/ScriptCanvas/Grammar/AbstractCodeModel.h + Include/ScriptCanvas/Libraries/Libraries.h + Include/ScriptCanvas/Libraries/Core/AzEventHandler.h + Include/ScriptCanvas/Libraries/Core/AzEventHandler.ScriptCanvasGrammar.xml + Include/ScriptCanvas/Libraries/Core/BinaryOperator.h + Include/ScriptCanvas/Libraries/Core/CoreNodes.h + Include/ScriptCanvas/Libraries/Core/ContainerTypeReflection.h + Include/ScriptCanvas/Libraries/Core/EBusEventHandler.h + Include/ScriptCanvas/Libraries/Core/EBusEventHandler.ScriptCanvasGrammar.xml + Include/ScriptCanvas/Libraries/Core/ExtractProperty.h + Include/ScriptCanvas/Libraries/Core/ExtractProperty.ScriptCanvasGrammar.xml + Include/ScriptCanvas/Libraries/Core/EventHandlerTranslationUtility.h + Include/ScriptCanvas/Libraries/Core/ForEach.h + Include/ScriptCanvas/Libraries/Core/ForEach.ScriptCanvasGrammar.xml + Include/ScriptCanvas/Libraries/Core/FunctionBus.h + Include/ScriptCanvas/Libraries/Core/FunctionCallNode.h + Include/ScriptCanvas/Libraries/Core/FunctionCallNode.ScriptCanvasGrammar.xml + Include/ScriptCanvas/Libraries/Core/FunctionCallNodeIsOutOfDate.h + Include/ScriptCanvas/Libraries/Core/FunctionDefinitionNode.h + Include/ScriptCanvas/Libraries/Core/FunctionDefinitionNode.ScriptCanvasGrammar.xml + Include/ScriptCanvas/Libraries/Core/GetVariable.h + Include/ScriptCanvas/Libraries/Core/GetVariable.ScriptCanvasGrammar.xml + Include/ScriptCanvas/Libraries/Core/Method.h + Include/ScriptCanvas/Libraries/Core/MethodOverloaded.h + Include/ScriptCanvas/Libraries/Core/MethodUtility.h + Include/ScriptCanvas/Libraries/Core/Nodeling.h + Include/ScriptCanvas/Libraries/Core/Nodeling.ScriptCanvasGrammar.xml + Include/ScriptCanvas/Libraries/Core/ReceiveScriptEvent.h + Include/ScriptCanvas/Libraries/Core/ReceiveScriptEvent.ScriptCanvasGrammar.xml + Include/ScriptCanvas/Libraries/Core/Repeater.h + Include/ScriptCanvas/Libraries/Core/Repeater.ScriptCanvasGrammar.xml + Include/ScriptCanvas/Libraries/Core/RepeaterNodeable.h + Include/ScriptCanvas/Libraries/Core/RepeaterNodeable.ScriptCanvasNodeable.xml + Include/ScriptCanvas/Libraries/Core/ScriptEventBase.h + Include/ScriptCanvas/Libraries/Core/ScriptEventBase.ScriptCanvasGrammar.xml + Include/ScriptCanvas/Libraries/Core/SendScriptEvent.h + Include/ScriptCanvas/Libraries/Core/SendScriptEvent.ScriptCanvasGrammar.xml + Include/ScriptCanvas/Libraries/Core/SetVariable.h + Include/ScriptCanvas/Libraries/Core/SetVariable.ScriptCanvasGrammar.xml + Include/ScriptCanvas/Libraries/Core/Start.h + Include/ScriptCanvas/Libraries/Core/Start.ScriptCanvasGrammar.xml + Include/ScriptCanvas/Libraries/Core/UnaryOperator.h + Include/ScriptCanvas/Libraries/Entity/Entity.h + Include/ScriptCanvas/Libraries/Entity/EntityNodes.h + Include/ScriptCanvas/Libraries/Entity/RotateMethod.h + Include/ScriptCanvas/Libraries/Logic/And.h + Include/ScriptCanvas/Libraries/Logic/Any.h + Include/ScriptCanvas/Libraries/Logic/Any.ScriptCanvasGrammar.xml + Include/ScriptCanvas/Libraries/Logic/Break.h + Include/ScriptCanvas/Libraries/Logic/Break.ScriptCanvasGrammar.xml + Include/ScriptCanvas/Libraries/Logic/Cycle.h + Include/ScriptCanvas/Libraries/Logic/Cycle.ScriptCanvasGrammar.xml + Include/ScriptCanvas/Libraries/Logic/Gate.h + Include/ScriptCanvas/Libraries/Logic/Gate.ScriptCanvasGrammar.xml + Include/ScriptCanvas/Libraries/Logic/Indexer.h + Include/ScriptCanvas/Libraries/Logic/Indexer.ScriptCanvasGrammar.xml + Include/ScriptCanvas/Libraries/Logic/IsNull.h + Include/ScriptCanvas/Libraries/Logic/IsNull.ScriptCanvasGrammar.xml + Include/ScriptCanvas/Libraries/Logic/Logic.h + Include/ScriptCanvas/Libraries/Logic/Multiplexer.h + Include/ScriptCanvas/Libraries/Logic/Multiplexer.ScriptCanvasGrammar.xml + Include/ScriptCanvas/Libraries/Logic/Not.h + Include/ScriptCanvas/Libraries/Logic/Once.h + Include/ScriptCanvas/Libraries/Logic/Once.ScriptCanvasGrammar.xml + Include/ScriptCanvas/Libraries/Logic/Or.h + Include/ScriptCanvas/Libraries/Logic/OrderedSequencer.h + Include/ScriptCanvas/Libraries/Logic/OrderedSequencer.ScriptCanvasGrammar.xml + Include/ScriptCanvas/Libraries/Logic/Sequencer.h + Include/ScriptCanvas/Libraries/Logic/Sequencer.ScriptCanvasGrammar.xml + Include/ScriptCanvas/Libraries/Logic/TargetedSequencer.h + Include/ScriptCanvas/Libraries/Logic/TargetedSequencer.ScriptCanvasGrammar.xml + Include/ScriptCanvas/Libraries/Logic/WeightedRandomSequencer.h + Include/ScriptCanvas/Libraries/Logic/WeightedRandomSequencer.ScriptCanvasGrammar.xml + Include/ScriptCanvas/Libraries/Logic/While.h + Include/ScriptCanvas/Libraries/Logic/While.ScriptCanvasGrammar.xml + Include/ScriptCanvas/Libraries/Math/AABBNodes.h + Include/ScriptCanvas/Libraries/Math/ColorNodes.h + Include/ScriptCanvas/Libraries/Math/CRCNodes.h + Include/ScriptCanvas/Libraries/Math/Divide.h + Include/ScriptCanvas/Libraries/Math/Math.h + Include/ScriptCanvas/Libraries/Math/MathExpression.h + Include/ScriptCanvas/Libraries/Math/MathExpression.ScriptCanvasGrammar.xml + Include/ScriptCanvas/Libraries/Math/MathNodeUtilities.h + Include/ScriptCanvas/Libraries/Math/MathGenerics.h + Include/ScriptCanvas/Libraries/Math/MathRandom.h + Include/ScriptCanvas/Libraries/Math/Matrix3x3Nodes.h + Include/ScriptCanvas/Libraries/Math/Matrix4x4Nodes.h + Include/ScriptCanvas/Libraries/Math/Multiply.h + Include/ScriptCanvas/Libraries/Math/OBBNodes.h + Include/ScriptCanvas/Libraries/Math/PlaneNodes.h + Include/ScriptCanvas/Libraries/Math/RotationNodes.h + Include/ScriptCanvas/Libraries/Math/Subtract.h + Include/ScriptCanvas/Libraries/Math/Sum.h + Include/ScriptCanvas/Libraries/Math/TransformNodes.h + Include/ScriptCanvas/Libraries/Math/Vector2Nodes.h + Include/ScriptCanvas/Libraries/Math/Vector3Nodes.h + Include/ScriptCanvas/Libraries/Math/Vector4Nodes.h + Include/ScriptCanvas/Libraries/Comparison/Comparison.h + Include/ScriptCanvas/Libraries/Comparison/ComparisonFunctions.h + Include/ScriptCanvas/Libraries/Comparison/EqualTo.h + Include/ScriptCanvas/Libraries/Comparison/NotEqualTo.h + Include/ScriptCanvas/Libraries/Comparison/Less.h + Include/ScriptCanvas/Libraries/Comparison/Greater.h + Include/ScriptCanvas/Libraries/Comparison/LessEqual.h + Include/ScriptCanvas/Libraries/Comparison/GreaterEqual.h + Include/ScriptCanvas/Libraries/Time/Time.h + Include/ScriptCanvas/Libraries/Time/Countdown.h + Include/ScriptCanvas/Libraries/Time/Countdown.ScriptCanvasGrammar.xml + Include/ScriptCanvas/Libraries/Time/DelayNodeable.h + Include/ScriptCanvas/Libraries/Time/DelayNodeable.ScriptCanvasNodeable.xml + Include/ScriptCanvas/Libraries/Time/Duration.h + Include/ScriptCanvas/Libraries/Time/Duration.ScriptCanvasGrammar.xml + Include/ScriptCanvas/Libraries/Time/HeartBeat.h + Include/ScriptCanvas/Libraries/Time/HeartBeat.ScriptCanvasGrammar.xml + Include/ScriptCanvas/Libraries/Time/Timer.h + Include/ScriptCanvas/Libraries/Time/Timer.ScriptCanvasGrammar.xml + Include/ScriptCanvas/Libraries/Time/TimeDelayNodeable.h + Include/ScriptCanvas/Libraries/Time/TimeDelayNodeable.ScriptCanvasNodeable.xml + Include/ScriptCanvas/Libraries/Time/DurationNodeable.h + Include/ScriptCanvas/Libraries/Time/DurationNodeable.ScriptCanvasNodeable.xml + Include/ScriptCanvas/Libraries/Time/HeartBeatNodeable.h + Include/ScriptCanvas/Libraries/Time/HeartBeatNodeable.ScriptCanvasNodeable.xml + Include/ScriptCanvas/Libraries/Time/TimerNodeable.h + Include/ScriptCanvas/Libraries/Time/TimerNodeable.ScriptCanvasNodeable.xml + Include/ScriptCanvas/Libraries/Spawning/Spawning.h + Include/ScriptCanvas/Libraries/Spawning/SpawnNodeable.h + Include/ScriptCanvas/Libraries/Spawning/SpawnNodeable.ScriptCanvasNodeable.xml + Include/ScriptCanvas/Libraries/String/Contains.h + Include/ScriptCanvas/Libraries/String/Contains.ScriptCanvasGrammar.xml + Include/ScriptCanvas/Libraries/String/Format.h + Include/ScriptCanvas/Libraries/String/Format.ScriptCanvasGrammar.xml + Include/ScriptCanvas/Libraries/String/Print.h + Include/ScriptCanvas/Libraries/String/Print.ScriptCanvasGrammar.xml + Include/ScriptCanvas/Libraries/String/Replace.h + Include/ScriptCanvas/Libraries/String/Replace.ScriptCanvasGrammar.xml + Include/ScriptCanvas/Libraries/String/String.h + Include/ScriptCanvas/Libraries/String/StringMethods.h + Include/ScriptCanvas/Libraries/String/StringGenerics.h + Include/ScriptCanvas/Libraries/String/Utilities.h + Include/ScriptCanvas/Libraries/String/Utilities.ScriptCanvasGrammar.xml + Include/ScriptCanvas/Libraries/UnitTesting/AddFailure.h + Include/ScriptCanvas/Libraries/UnitTesting/AddFailure.ScriptCanvasGrammar.xml + Include/ScriptCanvas/Libraries/UnitTesting/AddSuccess.h + Include/ScriptCanvas/Libraries/UnitTesting/AddSuccess.ScriptCanvasGrammar.xml + Include/ScriptCanvas/Libraries/UnitTesting/Checkpoint.h + Include/ScriptCanvas/Libraries/UnitTesting/Checkpoint.ScriptCanvasGrammar.xml + Include/ScriptCanvas/Libraries/UnitTesting/ExpectEqual.h + Include/ScriptCanvas/Libraries/UnitTesting/ExpectEqual.ScriptCanvasGrammar.xml + Include/ScriptCanvas/Libraries/UnitTesting/ExpectFalse.h + Include/ScriptCanvas/Libraries/UnitTesting/ExpectFalse.ScriptCanvasGrammar.xml + Include/ScriptCanvas/Libraries/UnitTesting/ExpectGreaterThan.h + Include/ScriptCanvas/Libraries/UnitTesting/ExpectGreaterThan.ScriptCanvasGrammar.xml + Include/ScriptCanvas/Libraries/UnitTesting/ExpectGreaterThanEqual.h + Include/ScriptCanvas/Libraries/UnitTesting/ExpectGreaterThanEqual.ScriptCanvasGrammar.xml + Include/ScriptCanvas/Libraries/UnitTesting/ExpectLessThan.h + Include/ScriptCanvas/Libraries/UnitTesting/ExpectLessThan.ScriptCanvasGrammar.xml + Include/ScriptCanvas/Libraries/UnitTesting/ExpectLessThanEqual.h + Include/ScriptCanvas/Libraries/UnitTesting/ExpectLessThanEqual.ScriptCanvasGrammar.xml + Include/ScriptCanvas/Libraries/UnitTesting/ExpectNotEqual.h + Include/ScriptCanvas/Libraries/UnitTesting/ExpectNotEqual.ScriptCanvasGrammar.xml + Include/ScriptCanvas/Libraries/UnitTesting/ExpectTrue.h + Include/ScriptCanvas/Libraries/UnitTesting/ExpectTrue.ScriptCanvasGrammar.xml + Include/ScriptCanvas/Libraries/UnitTesting/MarkComplete.h + Include/ScriptCanvas/Libraries/UnitTesting/MarkComplete.ScriptCanvasGrammar.xml + Include/ScriptCanvas/Libraries/UnitTesting/UnitTestBus.h + Include/ScriptCanvas/Libraries/UnitTesting/UnitTestBusMacros.h + Include/ScriptCanvas/Libraries/UnitTesting/UnitTesting.h + Include/ScriptCanvas/Libraries/UnitTesting/UnitTestingLibrary.h + Include/ScriptCanvas/Libraries/UnitTesting/Auxiliary/Auxiliary.h + Include/ScriptCanvas/Libraries/UnitTesting/Auxiliary/AuxiliaryGenerics.h + Include/ScriptCanvas/Libraries/UnitTesting/UnitTestBusSender.h + Include/ScriptCanvas/Libraries/UnitTesting/UnitTestBusSenderMacros.h + Include/ScriptCanvas/Libraries/Operators/Operators.h + Include/ScriptCanvas/Libraries/Operators/Operator.h + Include/ScriptCanvas/Libraries/Operators/Operator.ScriptCanvasGrammar.xml + Include/ScriptCanvas/Libraries/Operators/Containers/OperatorAt.h + Include/ScriptCanvas/Libraries/Operators/Containers/OperatorAt.ScriptCanvasGrammar.xml + Include/ScriptCanvas/Libraries/Operators/Containers/OperatorBack.h + Include/ScriptCanvas/Libraries/Operators/Containers/OperatorBack.ScriptCanvasGrammar.xml + Include/ScriptCanvas/Libraries/Operators/Containers/OperatorClear.h + Include/ScriptCanvas/Libraries/Operators/Containers/OperatorClear.ScriptCanvasGrammar.xml + Include/ScriptCanvas/Libraries/Operators/Containers/OperatorEmpty.h + Include/ScriptCanvas/Libraries/Operators/Containers/OperatorEmpty.ScriptCanvasGrammar.xml + Include/ScriptCanvas/Libraries/Operators/Containers/OperatorErase.h + Include/ScriptCanvas/Libraries/Operators/Containers/OperatorErase.ScriptCanvasGrammar.xml + Include/ScriptCanvas/Libraries/Operators/Containers/OperatorFront.h + Include/ScriptCanvas/Libraries/Operators/Containers/OperatorFront.ScriptCanvasGrammar.xml + Include/ScriptCanvas/Libraries/Operators/Containers/OperatorInsert.h + Include/ScriptCanvas/Libraries/Operators/Containers/OperatorInsert.ScriptCanvasGrammar.xml + Include/ScriptCanvas/Libraries/Operators/Containers/OperatorPushBack.h + Include/ScriptCanvas/Libraries/Operators/Containers/OperatorPushBack.ScriptCanvasGrammar.xml + Include/ScriptCanvas/Libraries/Operators/Containers/OperatorSize.h + Include/ScriptCanvas/Libraries/Operators/Containers/OperatorSize.ScriptCanvasGrammar.xml + Include/ScriptCanvas/Libraries/Operators/Math/OperatorAdd.h + Include/ScriptCanvas/Libraries/Operators/Math/OperatorAdd.ScriptCanvasGrammar.xml + Include/ScriptCanvas/Libraries/Operators/Math/OperatorArithmetic.h + Include/ScriptCanvas/Libraries/Operators/Math/OperatorArithmetic.ScriptCanvasGrammar.xml + Include/ScriptCanvas/Libraries/Operators/Math/OperatorDiv.h + Include/ScriptCanvas/Libraries/Operators/Math/OperatorDiv.ScriptCanvasGrammar.xml + Include/ScriptCanvas/Libraries/Operators/Math/OperatorDivideByNumber.h + Include/ScriptCanvas/Libraries/Operators/Math/OperatorDivideByNumber.ScriptCanvasGrammar.xml + Include/ScriptCanvas/Libraries/Operators/Math/OperatorLength.h + Include/ScriptCanvas/Libraries/Operators/Math/OperatorLength.ScriptCanvasGrammar.xml + Include/ScriptCanvas/Libraries/Operators/Math/OperatorLerp.h + Include/ScriptCanvas/Libraries/Operators/Math/OperatorLerp.ScriptCanvasGrammar.xml + Include/ScriptCanvas/Libraries/Operators/Math/OperatorMul.h + Include/ScriptCanvas/Libraries/Operators/Math/OperatorMul.ScriptCanvasGrammar.xml + Include/ScriptCanvas/Libraries/Operators/Math/OperatorSub.h + Include/ScriptCanvas/Libraries/Operators/Math/OperatorSub.ScriptCanvasGrammar.xml + Include/ScriptCanvas/Libraries/Operators/Math/OperatorLerpNodeable.h + Include/ScriptCanvas/Libraries/Operators/Math/OperatorLerpNodeableNode.h + Include/ScriptCanvas/Profiler/Driller.h + Include/ScriptCanvas/Profiler/Aggregator.h + Include/ScriptCanvas/Profiler/DrillerEvents.h + Include/ScriptCanvas/Serialization/BehaviorContextObjectSerializer.h + Include/ScriptCanvas/Serialization/DatumSerializer.h + Include/ScriptCanvas/Serialization/RuntimeVariableSerializer.h + Include/ScriptCanvas/Data/DataTrait.h + Include/ScriptCanvas/Data/PropertyTraits.h + Include/ScriptCanvas/Data/Traits.h + Include/ScriptCanvas/Variable/VariableBus.h + Include/ScriptCanvas/Variable/GraphVariable.h + Include/ScriptCanvas/Variable/GraphVariableManagerComponent.h + Include/ScriptCanvas/Variable/VariableCore.h + Include/ScriptCanvas/Variable/VariableData.h + Include/ScriptCanvas/Utils/DataUtils.h + Include/ScriptCanvas/Utils/NodeUtils.h + Include/ScriptCanvas/Utils/SerializationUtils.h + Include/ScriptCanvas/Utils/VersionConverters.h + Include/ScriptCanvas/Utils/BehaviorContextUtils.h +) + +set(SKIP_UNITY_BUILD_INCLUSION_FILES + Include/ScriptCanvas/Libraries/Core/FunctionCallNode.h + Include/ScriptCanvas/Libraries/Core/FunctionCallNodeIsOutOfDate.h +) diff --git a/Gems/ScriptCanvasPhysics/Code/CMakeLists.txt b/Gems/ScriptCanvasPhysics/Code/CMakeLists.txt index ac25c7275b..2addf3e8ca 100644 --- a/Gems/ScriptCanvasPhysics/Code/CMakeLists.txt +++ b/Gems/ScriptCanvasPhysics/Code/CMakeLists.txt @@ -32,7 +32,7 @@ ly_add_target( PRIVATE Legacy::CryCommon Gem::ScriptCanvasPhysics.Static - Gem::ScriptCanvas + Gem::ScriptCanvasAPI ) # By default, the above module is used by all application types, however, the module depends at runtime to ScriptCanvas From eca2e366871da00c7c300495f8a1f4603d5247d8 Mon Sep 17 00:00:00 2001 From: Artur K <96597+nemerle@users.noreply.github.com> Date: Thu, 25 Nov 2021 10:24:39 +0100 Subject: [PATCH 12/58] Fix clang 13 compilation problems (#5791) * Fix clang 13 compilation problems Re-instated ShowPlayedSequencesDebug logic by introducing no-op lambda which replaces missing `Draw2dLabel` functionality ( added TODO marker there ) Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com> * apply review suggestions Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com> * Fix type in assert message Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com> --- Code/Editor/BaseLibraryManager.cpp | 2 - Code/Editor/LayoutWnd.cpp | 3 - Code/Editor/Objects/AxisGizmo.cpp | 2 - Code/Editor/Objects/ObjectManager.cpp | 11 -- .../SandboxIntegration.cpp | 4 - Code/Editor/TrackView/SoundKeyUIControls.cpp | 3 - .../TrackView/TrackViewDopeSheetBase.cpp | 12 +- .../TrackView/TrackViewKeyPropertiesDlg.cpp | 7 - Code/Editor/Util/ImageGif.cpp | 10 -- .../Components/Widgets/TableView.cpp | 2 - .../LegacyFramework/MainWindowSavedState.cpp | 2 - .../UI/Slice/SlicePushWidget.cpp | 3 - Code/Legacy/CryCommon/Linux_Win32Wrapper.h | 2 +- Code/Legacy/CryCommon/WinBase.cpp | 23 +--- .../CrySystem/LocalizedStringManager.cpp | 51 +------ .../native/AssetDatabase/AssetDatabase.cpp | 7 - .../AssetManager/assetProcessorManager.cpp | 3 - .../resourcecompiler/rcjoblistmodel.cpp | 2 - .../unittests/RCcontrollerUnitTests.cpp | 2 - .../Source/Converters/ConvertPixelFormat.cpp | 3 +- .../Code/Source/ImageLoader/TIFFLoader.cpp | 5 - .../External/CubeMapGen/CCubeMapProcessor.cpp | 3 - .../AtomFont/Code/Source/FFont.cpp | 2 - .../EditorMaterialModelUvNameMapInspector.cpp | 24 ++-- .../EMotionFXAtom/Code/Source/ActorAsset.cpp | 2 - .../Editor/ATLControlsResourceDialog.cpp | 2 - .../Code/Source/Editor/QConnectionsWidget.cpp | 24 +--- .../Code/Source/Editor/QConnectionsWidget.h | 1 - .../Code/Source/Engine/FileCacheManager.cpp | 11 -- .../EMotionFX/Source/AnimGraphMotionNode.cpp | 8 -- .../AnimGraph/AnimGraphActionManager.cpp | 2 - .../Source/SceneManager/ActorsWindow.cpp | 10 -- .../Source/TimeView/TrackDataWidget.cpp | 7 - .../General/GeneralNodeTitleComponent.cpp | 12 +- .../General/GeneralSlotLayoutComponent.cpp | 8 +- .../Animation/Controls/UiSplineCtrlEx.cpp | 12 -- .../Animation/UiAnimViewDopeSheetBase.cpp | 19 +-- .../Source/Animation/UiAnimationSystem.cpp | 17 ++- .../Tests/internal/test_UiTextComponent.cpp | 12 +- .../Code/Source/UiCanvasFileObject.cpp | 4 - Gems/LyShine/Code/Source/UiTextComponent.cpp | 4 - .../Code/Source/Cinematics/AnimSequence.cpp | 36 ++--- .../Code/Source/Cinematics/LayerNode.cpp | 4 - Gems/Maestro/Code/Source/Cinematics/Movie.cpp | 129 ++++++++++-------- .../Code/Source/Cinematics/SceneNode.cpp | 70 +++++----- Gems/NvCloth/Code/Tests/NvClothTest.cpp | 5 +- Gems/PhysX/Code/Source/Scene/PhysXScene.cpp | 3 +- .../Code/Source/TwitchSystemComponent.cpp | 3 - 48 files changed, 180 insertions(+), 413 deletions(-) diff --git a/Code/Editor/BaseLibraryManager.cpp b/Code/Editor/BaseLibraryManager.cpp index 7346ffaf8c..3370165ddb 100644 --- a/Code/Editor/BaseLibraryManager.cpp +++ b/Code/Editor/BaseLibraryManager.cpp @@ -606,11 +606,9 @@ void CBaseLibraryManager::RegisterItem(CBaseLibraryItem* pItem, REFGUID newGuid) if (m_bUniqGuidMap) { - bool bNewItem = true; REFGUID oldGuid = pItem->GetGUID(); if (!GuidUtil::IsEmpty(oldGuid)) { - bNewItem = false; m_itemsGuidMap.erase(oldGuid); } if (GuidUtil::IsEmpty(newGuid)) diff --git a/Code/Editor/LayoutWnd.cpp b/Code/Editor/LayoutWnd.cpp index aa2a008844..ea125ca3d4 100644 --- a/Code/Editor/LayoutWnd.cpp +++ b/Code/Editor/LayoutWnd.cpp @@ -487,7 +487,6 @@ bool CLayoutWnd::LoadConfig() CreateLayout((EViewLayout)layout, false); - bool bRebindViewports = false; if (m_splitWnd) { const QString str = settings.value("Viewports").toString(); @@ -498,14 +497,12 @@ bool CLayoutWnd::LoadConfig() { break; } - bRebindViewports = true; if (!resToken.isEmpty()) { m_viewType[nIndex] = resToken; } nIndex++; } - ; } BindViewports(); diff --git a/Code/Editor/Objects/AxisGizmo.cpp b/Code/Editor/Objects/AxisGizmo.cpp index a603b2615d..7215853854 100644 --- a/Code/Editor/Objects/AxisGizmo.cpp +++ b/Code/Editor/Objects/AxisGizmo.cpp @@ -329,7 +329,6 @@ bool CAxisGizmo::MouseCallback(CViewport* view, EMouseEvent event, QPoint& point hc.b2DViewport = view->GetType() != ET_ViewportCamera; hc.point2d = point; view->ViewToWorldRay(point, hc.raySrc, hc.rayDir); - bool bHit = false; if (HitTest(hc)) { switch (hc.manipulatorMode) @@ -344,7 +343,6 @@ bool CAxisGizmo::MouseCallback(CViewport* view, EMouseEvent event, QPoint& point view->SetCurrentCursor(STD_CURSOR_SCALE); break; } - bHit = true; } } } diff --git a/Code/Editor/Objects/ObjectManager.cpp b/Code/Editor/Objects/ObjectManager.cpp index df3371a31c..fb5b2b68c2 100644 --- a/Code/Editor/Objects/ObjectManager.cpp +++ b/Code/Editor/Objects/ObjectManager.cpp @@ -186,17 +186,6 @@ CBaseObject* CObjectManager::NewObject(CObjectClassDesc* cls, CBaseObject* prev, if (obj->GetType() != OBJTYPE_AZENTITY) { GetIEditor()->RecordUndo(new CUndoBaseObjectNew(obj)); - - // check for script entities - const char* scriptClassName = ""; - CEntityObject* entityObj = qobject_cast(obj); - QByteArray entityClass; // Leave it outside of the if. Otherwise buffer is deleted. - if (entityObj) - { - entityClass = entityObj->GetEntityClass().toUtf8(); - scriptClassName = entityClass.data(); - } - } } diff --git a/Code/Editor/Plugins/ComponentEntityEditorPlugin/SandboxIntegration.cpp b/Code/Editor/Plugins/ComponentEntityEditorPlugin/SandboxIntegration.cpp index 64bd943d63..4961e7004d 100644 --- a/Code/Editor/Plugins/ComponentEntityEditorPlugin/SandboxIntegration.cpp +++ b/Code/Editor/Plugins/ComponentEntityEditorPlugin/SandboxIntegration.cpp @@ -498,13 +498,11 @@ void SandboxIntegrationManager::EntityParentChanged( // before finally being saved, it will result in all of those layers saving, too. AZ::EntityId oldAncestor = oldParentId; - bool wasNotInLayer = false; AZ::EntityId oldLayer; do { if (!oldAncestor.IsValid()) { - wasNotInLayer = true; break; } @@ -530,13 +528,11 @@ void SandboxIntegrationManager::EntityParentChanged( AZ::EntityId newAncestor = newParentId; - bool isGoingToRootScene = false; AZ::EntityId newLayer; do { if (!newAncestor.IsValid()) { - isGoingToRootScene = true; break; } diff --git a/Code/Editor/TrackView/SoundKeyUIControls.cpp b/Code/Editor/TrackView/SoundKeyUIControls.cpp index 8c18b58aed..f001937e82 100644 --- a/Code/Editor/TrackView/SoundKeyUIControls.cpp +++ b/Code/Editor/TrackView/SoundKeyUIControls.cpp @@ -108,18 +108,15 @@ void CSoundKeyUIControls::OnUIChange(IVariable* pVar, CTrackViewKeyBundle& selec { ISoundKey soundKey; keyHandle.GetKey(&soundKey); - bool bChangedSoundFile = false; if (pVar == mv_startTrigger.GetVar()) { QString sFilename = mv_startTrigger; - bChangedSoundFile = sFilename != soundKey.sStartTrigger.c_str(); soundKey.sStartTrigger = sFilename.toUtf8().data(); } else if (pVar == mv_stopTrigger.GetVar()) { QString sFilename = mv_stopTrigger; - bChangedSoundFile = sFilename != soundKey.sStopTrigger.c_str(); soundKey.sStopTrigger = sFilename.toUtf8().data(); } diff --git a/Code/Editor/TrackView/TrackViewDopeSheetBase.cpp b/Code/Editor/TrackView/TrackViewDopeSheetBase.cpp index a14da0ae09..2907bebdb4 100644 --- a/Code/Editor/TrackView/TrackViewDopeSheetBase.cpp +++ b/Code/Editor/TrackView/TrackViewDopeSheetBase.cpp @@ -2233,7 +2233,6 @@ void CTrackViewDopeSheetBase::AddKeys(const QPoint& point, const bool bTryAddKey if (pTrack && inRange) { - bool keyCreated = false; if (bTryAddKeysInGroup && pNode->GetParentNode()) // Add keys in group { CTrackViewTrackBundle tracksInGroup = pNode->GetTracksByParam(pTrack->GetParameterType()); @@ -2248,8 +2247,6 @@ void CTrackViewDopeSheetBase::AddKeys(const QPoint& point, const bool bTryAddKey AzToolsFramework::ScopedUndoBatch undoBatch("Create Key"); pCurrTrack->CreateKey(keyTime); undoBatch.MarkEntityDirty(sequence->GetSequenceComponentEntityId()); - - keyCreated = true; } } else // A compound track @@ -2262,8 +2259,6 @@ void CTrackViewDopeSheetBase::AddKeys(const QPoint& point, const bool bTryAddKey AzToolsFramework::ScopedUndoBatch undoBatch("Create Key"); pSubTrack->CreateKey(keyTime); undoBatch.MarkEntityDirty(sequence->GetSequenceComponentEntityId()); - - keyCreated = true; } } } @@ -2276,15 +2271,13 @@ void CTrackViewDopeSheetBase::AddKeys(const QPoint& point, const bool bTryAddKey AzToolsFramework::ScopedUndoBatch undoBatch("Create Key"); pTrack->CreateKey(keyTime); undoBatch.MarkEntityDirty(sequence->GetSequenceComponentEntityId()); - - keyCreated = true; } } else // A compound track { if (pTrack->GetValueType() == AnimValueType::RGB) { - keyCreated = CreateColorKey(pTrack, keyTime); + CreateColorKey(pTrack, keyTime); } else { @@ -2295,7 +2288,6 @@ void CTrackViewDopeSheetBase::AddKeys(const QPoint& point, const bool bTryAddKey if (IsOkToAddKeyHere(pSubTrack, keyTime)) { pSubTrack->CreateKey(keyTime); - keyCreated = true; } } undoBatch.MarkEntityDirty(sequence->GetSequenceComponentEntityId()); @@ -2617,7 +2609,6 @@ void CTrackViewDopeSheetBase::DrawSelectTrack(const Range& timeRange, QPainter* void CTrackViewDopeSheetBase::DrawBoolTrack(const Range& timeRange, QPainter* painter, CTrackViewTrack* pTrack, const QRect& rc) { int x0 = TimeToClient(timeRange.start); - float t0 = timeRange.start; const QBrush prevBrush = painter->brush(); painter->setBrush(m_visibilityBrush); @@ -2648,7 +2639,6 @@ void CTrackViewDopeSheetBase::DrawBoolTrack(const Range& timeRange, QPainter* pa painter->fillRect(QRect(QPoint(x0, rc.top() + 4), QPoint(x, rc.bottom() - 4)), gradient); } - t0 = time; x0 = x; } int x = TimeToClient(timeRange.end); diff --git a/Code/Editor/TrackView/TrackViewKeyPropertiesDlg.cpp b/Code/Editor/TrackView/TrackViewKeyPropertiesDlg.cpp index 2fd46b0fc5..a17d92ac0a 100644 --- a/Code/Editor/TrackView/TrackViewKeyPropertiesDlg.cpp +++ b/Code/Editor/TrackView/TrackViewKeyPropertiesDlg.cpp @@ -198,7 +198,6 @@ void CTrackViewKeyPropertiesDlg::OnKeySelectionChanged(CTrackViewSequence* seque m_wndProps->setEnabled(false); m_wndTrackProps->setEnabled(false); - bool bAssigned = false; if (selectedKeys.GetKeyCount() > 0 && selectedKeys.AreAllKeysOfSameType()) { CTrackViewTrack* pTrack = selectedKeys.GetKey(0).GetTrack(); @@ -215,12 +214,6 @@ void CTrackViewKeyPropertiesDlg::OnKeySelectionChanged(CTrackViewSequence* seque { AddVars(m_keyControls[i]); } - - if (m_keyControls[i]->OnKeySelectionChange(selectedKeys)) - { - bAssigned = true; - } - break; } } diff --git a/Code/Editor/Util/ImageGif.cpp b/Code/Editor/Util/ImageGif.cpp index 67c5911344..336584b959 100644 --- a/Code/Editor/Util/ImageGif.cpp +++ b/Code/Editor/Util/ImageGif.cpp @@ -197,11 +197,9 @@ bool CImageGif::Load(const QString& fileName, CImageEx& outImage) return false; } - int numcols; unsigned char ch, ch1; uint8* ptr1; int i; - short transparency = -1; TImage outImageIndex; @@ -246,7 +244,6 @@ bool CImageGif::Load(const QString& fileName, CImageEx& outImage) HasColormap = ((ch & COLORMAPMASK) ? true : false); BitsPerPixel = (ch & 7) + 1; - numcols = ColorMapSize = 1 << BitsPerPixel; BitMask = ColorMapSize - 1; Background = NEXTBYTE; /* background color... not used. */ @@ -290,10 +287,6 @@ bool CImageGif::Load(const QString& fileName, CImageEx& outImage) { case GRAPHIC_EXT: ch = NEXTBYTE; - if (ptr[0] & 0x1) - { - transparency = ptr[3]; /* transparent color index */ - } ptr += ch; break; case PLAINTEXT_EXT: @@ -317,9 +310,6 @@ bool CImageGif::Load(const QString& fileName, CImageEx& outImage) } } - //if (transparency >= 0) - //mfSet_transparency(transparency); - /* Now read in values from the image descriptor */ ch = NEXTBYTE; diff --git a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/TableView.cpp b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/TableView.cpp index 725349cb50..f5cb90ae1a 100644 --- a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/TableView.cpp +++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/TableView.cpp @@ -213,12 +213,10 @@ namespace AzQtComponents // rectangle drawing. if (qTableView || qListView) { - int hHdr = 0; int vHdr = 0; if (qTableView) { - hHdr = qTableView->horizontalHeader()->isVisible() ? qTableView->horizontalHeader()->height() : 0; vHdr = qTableView->verticalHeader()->isVisible() ? qTableView->verticalHeader()->width() : 0; } diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/LegacyFramework/MainWindowSavedState.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/LegacyFramework/MainWindowSavedState.cpp index a9af59f3a8..138f99dc6e 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/LegacyFramework/MainWindowSavedState.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/LegacyFramework/MainWindowSavedState.cpp @@ -23,7 +23,6 @@ namespace AzToolsFramework // save 2k at a time :( need a better way to do this. AZStd::size_t pos = 0; AZStd::size_t remaining = m_windowState.size(); - AZ::u8* charData = (AZ::u8*)windowState.begin(); while (remaining > 0) { @@ -31,7 +30,6 @@ namespace AzToolsFramework m_serializableWindowState.push_back(); m_serializableWindowState.back().assign((AZ::u8*)windowState.begin() + pos, (AZ::u8*)windowState.begin() + pos + bytes_this_gulp); pos += bytes_this_gulp; - charData += bytes_this_gulp; remaining -= bytes_this_gulp; } } diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Slice/SlicePushWidget.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Slice/SlicePushWidget.cpp index 76f91b438e..ce6ee7ead7 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Slice/SlicePushWidget.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Slice/SlicePushWidget.cpp @@ -1201,8 +1201,6 @@ namespace AzToolsFramework .arg((item->parent() == nullptr) ? item->m_entity->GetName().c_str() : GetNodeDisplayName(*item->m_node).c_str())); } - SliceTargetTreeItem* parent = nullptr; - AZStd::vector validSliceAssets = GetValidTargetAssetsForField(*item); // For the selected item populate the tree of all valid slice targets. @@ -1274,7 +1272,6 @@ namespace AzToolsFramework selectButton->setChecked(true); } - parent = sliceItem; ++level; } } diff --git a/Code/Legacy/CryCommon/Linux_Win32Wrapper.h b/Code/Legacy/CryCommon/Linux_Win32Wrapper.h index 7157bc4a78..26938cade3 100644 --- a/Code/Legacy/CryCommon/Linux_Win32Wrapper.h +++ b/Code/Legacy/CryCommon/Linux_Win32Wrapper.h @@ -375,7 +375,7 @@ extern intptr_t _findfirst64(const char* pFileName, __finddata64_t* pFindData); extern DWORD GetFileAttributesW(LPCWSTR lpFileName); -extern const bool GetFilenameNoCase(const char* file, char*, const bool cCreateNew = false); +extern const bool GetFilenameNoCase(const char* file, char*); extern BOOL GetUserName(LPSTR lpBuffer, LPDWORD nSize); diff --git a/Code/Legacy/CryCommon/WinBase.cpp b/Code/Legacy/CryCommon/WinBase.cpp index cb1b2aadfd..4436f24281 100644 --- a/Code/Legacy/CryCommon/WinBase.cpp +++ b/Code/Legacy/CryCommon/WinBase.cpp @@ -1263,8 +1263,7 @@ ILINE void FS_CLOSEDIR_NOERR(FS_DIR_TYPE pDir) const bool GetFilenameNoCase ( const char* file, - char* pAdjustedFilename, - const bool cCreateNew + char* pAdjustedFilename ) { assert(file); @@ -1281,29 +1280,19 @@ const bool GetFilenameNoCase } } - char* slash; - const char* dirname; - char* name; - if ((pAdjustedFilename) == (char*)-1) { return false; } - slash = strrchr(pAdjustedFilename, '/'); +#if !defined(LINUX) && !defined(APPLE) && !defined(DEFINE_SKIP_WILDCARD_CHECK) // fix the parent path anyhow. + char* slash = strrchr(pAdjustedFilename, '/'); + char* name = pAdjustedFilename; if (slash) { - dirname = pAdjustedFilename; name = slash + 1; *slash = 0; } - else - { - dirname = "."; - name = pAdjustedFilename; - } - -#if !defined(LINUX) && !defined(APPLE) && !defined(DEFINE_SKIP_WILDCARD_CHECK) // fix the parent path anyhow. // Check for wildcards. We'll always return true if the specified filename is // a wildcard pattern. if (strchr(name, '*') || strchr(name, '?')) @@ -1314,13 +1303,13 @@ const bool GetFilenameNoCase } return true; } -#endif - // Scan for the file. if (slash) { *slash = '/'; } +#endif + #if FIX_FILENAME_CASE char* path = pAdjustedFilename; diff --git a/Code/Legacy/CrySystem/LocalizedStringManager.cpp b/Code/Legacy/CrySystem/LocalizedStringManager.cpp index 2d43f5b4ee..c48baa95a7 100644 --- a/Code/Legacy/CrySystem/LocalizedStringManager.cpp +++ b/Code/Legacy/CrySystem/LocalizedStringManager.cpp @@ -1027,8 +1027,6 @@ bool CLocalizedStringsManager::DoLoadExcelXmlSpreadsheet(const char* sFileName, // key CRC uint32 keyCRC; - size_t nMemSize = 0; - for (;; ) { int nRowIndex = -1; @@ -1509,30 +1507,6 @@ bool CLocalizedStringsManager::DoLoadExcelXmlSpreadsheet(const char* sFileName, pEntry->flags |= SLocalizedStringEntry::IS_INTERCEPTED; } - nMemSize += sizeof(*pEntry) + pEntry->sCharacterName.length() * sizeof(char); - if (m_cvarLocalizationEncode == 0) - { - //Note that this isn't accurate if we're using encoding/compression to shrink the string as the encoding step hasn't happened yet - if (pEntry->TranslatedText.psUtf8Uncompressed) - { - nMemSize += pEntry->TranslatedText.psUtf8Uncompressed->length() * sizeof(char); - } - } - if (pEntry->pEditorExtension != NULL) - { - nMemSize += pEntry->pEditorExtension->sKey.length() - + pEntry->pEditorExtension->sOriginalActorLine.length() - + pEntry->pEditorExtension->sUtf8TranslatedActorLine.length() * sizeof(char) - + pEntry->pEditorExtension->sOriginalText.length() - + pEntry->pEditorExtension->sOriginalCharacterName.length(); - } - - - // Compression Preparation - //unsigned int nSourceSize = pEntry->swTranslatedText.length()*sizeof(wchar_t); - //if (nSourceSize) - // int zResult = Compress(pDest, nDestLen, pEntry->swTranslatedText.c_str(), nSourceSize); - AddLocalizedString(m_pLanguage, pEntry, keyCRC); } @@ -1540,10 +1514,7 @@ bool CLocalizedStringsManager::DoLoadExcelXmlSpreadsheet(const char* sFileName, { pEncoder->Finalize(); - { uint8 compressionBuffer[COMPRESSION_FIXED_BUFFER_LENGTH]; - //uint8 decompressionBuffer[COMPRESSION_FIXED_BUFFER_LENGTH]; - size_t uncompressedTotal = 0, compressedTotal = 0; for (size_t stringToCompress = startOfStringsToCompress; stringToCompress < m_pLanguage->m_vLocalizedStrings.size(); stringToCompress++) { SLocalizedStringEntry* pStringToCompress = m_pLanguage->m_vLocalizedStrings[stringToCompress]; @@ -1551,30 +1522,19 @@ bool CLocalizedStringsManager::DoLoadExcelXmlSpreadsheet(const char* sFileName, { size_t compBufSize = COMPRESSION_FIXED_BUFFER_LENGTH; memset(compressionBuffer, 0, COMPRESSION_FIXED_BUFFER_LENGTH); - //CryLogAlways("%u Compressing %s (%p)", stringToCompress, pStringToCompress->szCompressedTranslatedText, pStringToCompress->szCompressedTranslatedText); size_t inputStringLength = strlen((const char*)(pStringToCompress->TranslatedText.szCompressed)); pEncoder->CompressInput(pStringToCompress->TranslatedText.szCompressed, inputStringLength, compressionBuffer, &compBufSize); compressionBuffer[compBufSize] = 0; pStringToCompress->huffmanTreeIndex = iEncoder; pEncoder->AddRef(); - //CryLogAlways("Compressed %s (%u) to %s (%u)", pStringToCompress->szCompressedTranslatedText, strlen((const char*)pStringToCompress->szCompressedTranslatedText), compressionBuffer, compBufSize); - uncompressedTotal += inputStringLength; - compressedTotal += compBufSize; uint8* szCompressedString = new uint8[compBufSize]; SAFE_DELETE_ARRAY(pStringToCompress->TranslatedText.szCompressed); memcpy(szCompressedString, compressionBuffer, compBufSize); pStringToCompress->TranslatedText.szCompressed = szCompressedString; - - //Testing code - //memset( decompressionBuffer, 0, COMPRESSION_FIXED_BUFFER_LENGTH ); - //size_t decompBufSize = pEncoder->UncompressInput(compressionBuffer, COMPRESSION_FIXED_BUFFER_LENGTH, decompressionBuffer, COMPRESSION_FIXED_BUFFER_LENGTH); - //CryLogAlways("Decompressed %s (%u) to %s (%u)", compressionBuffer, compBufSize, decompressionBuffer, decompBufSize); } } - //CryLogAlways("[LOC PROFILING] %s, %u, Uncompressed %u, Compressed %u", sFileName, m_pLanguage->m_vLocalizedStrings.size() - startOfStringsToCompress, uncompressedTotal, compressedTotal); - } } pXmlTableReader->Release(); @@ -1584,11 +1544,7 @@ bool CLocalizedStringsManager::DoLoadExcelXmlSpreadsheet(const char* sFileName, bool CLocalizedStringsManager::DoLoadAGSXmlDocument(const char* sFileName, uint8 nTagID, bool bReload) { - if (!sFileName) - { - return false; - } - if (!m_pLanguage) + if (!sFileName|| !m_pLanguage) { return false; } @@ -1731,7 +1687,6 @@ bool CLocalizedStringsManager::DoLoadAGSXmlDocument(const char* sFileName, uint8 } { uint8 compressionBuffer[COMPRESSION_FIXED_BUFFER_LENGTH] = {}; - size_t uncompressedTotal = 0, compressedTotal = 0; for (size_t stringToCompress = startOfStringsToCompress; stringToCompress < m_pLanguage->m_vLocalizedStrings.size(); stringToCompress++) { SLocalizedStringEntry* pStringToCompress = m_pLanguage->m_vLocalizedStrings[stringToCompress]; @@ -1744,8 +1699,6 @@ bool CLocalizedStringsManager::DoLoadAGSXmlDocument(const char* sFileName, uint8 compressionBuffer[compBufSize] = 0; pStringToCompress->huffmanTreeIndex = iEncoder; pEncoder->AddRef(); - uncompressedTotal += inputStringLength; - compressedTotal += compBufSize; uint8* szCompressedString = new uint8[compBufSize]; SAFE_DELETE_ARRAY(pStringToCompress->TranslatedText.szCompressed); memcpy(szCompressedString, compressionBuffer, compBufSize); @@ -1810,7 +1763,7 @@ bool CLocalizedStringsManager::LocalizeString_s(const AZStd::string& sString, AZ bool CLocalizedStringsManager::LocalizeStringInternal(const char* pStr, size_t len, AZStd::string& outLocalizedString, bool bEnglish) { assert (m_pLanguage); - if (m_pLanguage == 0) + if (m_pLanguage == nullptr) { CryWarning(VALIDATOR_MODULE_SYSTEM, VALIDATOR_WARNING, "LocalizeString: No language set."); outLocalizedString.assign(pStr, pStr + len); diff --git a/Code/Tools/AssetProcessor/native/AssetDatabase/AssetDatabase.cpp b/Code/Tools/AssetProcessor/native/AssetDatabase/AssetDatabase.cpp index 9be991eb0b..cf33e559ac 100644 --- a/Code/Tools/AssetProcessor/native/AssetDatabase/AssetDatabase.cpp +++ b/Code/Tools/AssetProcessor/native/AssetDatabase/AssetDatabase.cpp @@ -2610,15 +2610,8 @@ namespace AssetProcessor { ScopedTransaction transaction(m_databaseConnection); - const char* statementName = INSERT_NEW_LEGACYSUBID; - bool creatingNew = entry.m_subIDsEntryID == InvalidEntryId; - if (!creatingNew) - { - statementName = OVERWRITE_EXISTING_LEGACYSUBID; - } - if (creatingNew) { if (!s_InsertNewLegacysubidQuery.BindAndStep(*m_databaseConnection, entry.m_productPK, entry.m_subID)) diff --git a/Code/Tools/AssetProcessor/native/AssetManager/assetProcessorManager.cpp b/Code/Tools/AssetProcessor/native/AssetManager/assetProcessorManager.cpp index de0f919a14..8867f2379f 100644 --- a/Code/Tools/AssetProcessor/native/AssetManager/assetProcessorManager.cpp +++ b/Code/Tools/AssetProcessor/native/AssetManager/assetProcessorManager.cpp @@ -274,11 +274,9 @@ namespace AssetProcessor } //look for the job in flight first - bool found = false; auto foundElement = m_jobRunKeyToJobInfoMap.find(request.m_jobRunKey); if (foundElement != m_jobRunKeyToJobInfoMap.end()) { - found = true; jobInfo = foundElement->second; } else @@ -296,7 +294,6 @@ namespace AssetProcessor AZ_Assert(jobInfos.size() == 1, "Should only have found one jobInfo!!!"); jobInfo = AZStd::move(jobInfos[0]); - found = true; } if (jobInfo.m_status == JobStatus::Failed_InvalidSourceNameExceedsMaxLimit) diff --git a/Code/Tools/AssetProcessor/native/resourcecompiler/rcjoblistmodel.cpp b/Code/Tools/AssetProcessor/native/resourcecompiler/rcjoblistmodel.cpp index a64e3bf5b9..1fddf15547 100644 --- a/Code/Tools/AssetProcessor/native/resourcecompiler/rcjoblistmodel.cpp +++ b/Code/Tools/AssetProcessor/native/resourcecompiler/rcjoblistmodel.cpp @@ -177,11 +177,9 @@ namespace AssetProcessor AZ_TracePrintf(AssetProcessor::DebugChannel, "JobTrace AddNewJob(%i %s,%s,%s)\n", rcJob, rcJob->GetInputFileAbsolutePath().toUtf8().constData(), rcJob->GetPlatformInfo().m_identifier.c_str(), rcJob->GetJobKey().toUtf8().constData()); #endif - bool isPending = false; if (rcJob->GetState() == RCJob::pending) { m_jobsInQueueLookup.insert(rcJob->GetElementID(), rcJob); - isPending = true; } endInsertRows(); } diff --git a/Code/Tools/AssetProcessor/native/unittests/RCcontrollerUnitTests.cpp b/Code/Tools/AssetProcessor/native/unittests/RCcontrollerUnitTests.cpp index a8bc714698..ce531a4796 100644 --- a/Code/Tools/AssetProcessor/native/unittests/RCcontrollerUnitTests.cpp +++ b/Code/Tools/AssetProcessor/native/unittests/RCcontrollerUnitTests.cpp @@ -152,7 +152,6 @@ void RCcontrollerUnitTests::RunRCControllerTests() } QModelIndex rcJobIndex; - int rcJobJobIndex; QString rcJobCommand; QString rcJobState; @@ -172,7 +171,6 @@ void RCcontrollerUnitTests::RunRCControllerTests() return; } - rcJobJobIndex = rcJobListModel->data(rcJobIndex, RCJobListModel::jobIndexRole).toInt(); rcJobCommand = rcJobListModel->data(rcJobIndex, RCJobListModel::displayNameRole).toString(); rcJobState = rcJobListModel->data(rcJobIndex, RCJobListModel::stateRole).toString(); } diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Converters/ConvertPixelFormat.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Converters/ConvertPixelFormat.cpp index b0f78d60a3..3219bef582 100644 --- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Converters/ConvertPixelFormat.cpp +++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Converters/ConvertPixelFormat.cpp @@ -32,10 +32,9 @@ namespace ImageProcessingAtom return; } - uint32 dwWidth, dwHeight, dwMips; + uint32 dwWidth, dwHeight; dwWidth = Get()->GetWidth(0); dwHeight = Get()->GetHeight(0); - dwMips = Get()->GetMipCount(); //if the output image size doesn't work the desired pixel format. set to fallback format const PixelFormatInfo* dstFmtInfo = CPixelFormats::GetInstance().GetPixelFormatInfo(fmtDst); diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/ImageLoader/TIFFLoader.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/ImageLoader/TIFFLoader.cpp index 057605a089..9bd6bcbdf3 100644 --- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/ImageLoader/TIFFLoader.cpp +++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/ImageLoader/TIFFLoader.cpp @@ -99,11 +99,9 @@ namespace ImageProcessingAtom return pRet; } - const char* pFormatText; if (dwBitsPerChannel == 8) { // R8, GR8, BGR8, BGRA8 - pFormatText = "8-bit"; pRet = Load8BitImageFromTIFF(tif); } else if (dwBitsPerChannel == 16) @@ -111,19 +109,16 @@ namespace ImageProcessingAtom // A/L/R16, R16F, GR16, GR16f, ARGB16, ARGB16f if (dwFormat == SAMPLEFORMAT_IEEEFP) { - pFormatText = "16-bit float"; pRet = Load16BitHDRImageFromTIFF(tif); } else { - pFormatText = "16-bit int"; pRet = Load16BitImageFromTIFF(tif); } } else if (dwBitsPerChannel == 32 && dwFormat == SAMPLEFORMAT_IEEEFP) { // A/L/R32f, GR32f, ARGB32f - pFormatText = "32-bit float"; pRet = Load32BitHDRImageFromTIFF(tif); } else diff --git a/Gems/Atom/Asset/ImageProcessingAtom/External/CubeMapGen/CCubeMapProcessor.cpp b/Gems/Atom/Asset/ImageProcessingAtom/External/CubeMapGen/CCubeMapProcessor.cpp index dc8af67877..6ba119943e 100644 --- a/Gems/Atom/Asset/ImageProcessingAtom/External/CubeMapGen/CCubeMapProcessor.cpp +++ b/Gems/Atom/Asset/ImageProcessingAtom/External/CubeMapGen/CCubeMapProcessor.cpp @@ -1438,15 +1438,12 @@ namespace ImageProcessingAtom int32 a_Channel2Src, int32 a_Channel3Src ) { int32 iFace, iMipLevel, u, v, k; - int32 size; CP_ITYPE texelData[4]; int32 channelSrcArray[4]; //since output is being modified, terminate any active filtering threads TerminateActiveThreads(); - size = m_OutputSize; - channelSrcArray[0] = a_Channel0Src; channelSrcArray[1] = a_Channel1Src; channelSrcArray[2] = a_Channel2Src; diff --git a/Gems/AtomLyIntegration/AtomFont/Code/Source/FFont.cpp b/Gems/AtomLyIntegration/AtomFont/Code/Source/FFont.cpp index 67df30fa7b..83453f4ff1 100644 --- a/Gems/AtomLyIntegration/AtomFont/Code/Source/FFont.cpp +++ b/Gems/AtomLyIntegration/AtomFont/Code/Source/FFont.cpp @@ -561,12 +561,10 @@ uint32_t AZ::FFont::GetNumQuadsForText(const char* str, const bool asciiMultiLin ++numQuads; } - uint32_t nextCh = 0; const wchar_t* pChar = strW.c_str(); while (uint32_t ch = *pChar) { ++pChar; - nextCh = *pChar; switch (ch) { diff --git a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/EditorMaterialModelUvNameMapInspector.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/EditorMaterialModelUvNameMapInspector.cpp index 64bc54bae8..0cf6410fc5 100644 --- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/EditorMaterialModelUvNameMapInspector.cpp +++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/EditorMaterialModelUvNameMapInspector.cpp @@ -290,14 +290,22 @@ namespace AZ menuButton->setAutoRaise(true); menuButton->setIcon(QIcon(":/Cards/img/UI20/Cards/menu_ico.svg")); menuButton->setVisible(true); - QObject::connect(menuButton, &QToolButton::clicked, &dialog, [&]() { - QAction* action = nullptr; - - QMenu menu(&dialog); - action = menu.addAction("Clear", [&] { inspector->SetUvNameMap(RPI::MaterialModelUvOverrideMap()); }); - action = menu.addAction("Revert", [&] { inspector->SetUvNameMap(matModUvOverrides);; }); - menu.exec(QCursor::pos()); - }); + QObject::connect( + menuButton, &QToolButton::clicked, &dialog, [&]() + { + QMenu menu(&dialog); + menu.addAction( + "Clear", [&] + { + inspector->SetUvNameMap(RPI::MaterialModelUvOverrideMap()); + }); + menu.addAction( + "Revert", [&] + { + inspector->SetUvNameMap(matModUvOverrides); + }); + menu.exec(QCursor::pos()); + }); QDialogButtonBox* buttonBox = new QDialogButtonBox(&dialog); buttonBox->setStandardButtons(QDialogButtonBox::Cancel | QDialogButtonBox::Ok); diff --git a/Gems/AtomLyIntegration/EMotionFXAtom/Code/Source/ActorAsset.cpp b/Gems/AtomLyIntegration/EMotionFXAtom/Code/Source/ActorAsset.cpp index 284e1ed35d..b1c5cf299b 100644 --- a/Gems/AtomLyIntegration/EMotionFXAtom/Code/Source/ActorAsset.cpp +++ b/Gems/AtomLyIntegration/EMotionFXAtom/Code/Source/ActorAsset.cpp @@ -194,7 +194,6 @@ namespace AZ const uint32_t originalVertex = sourceOriginalVertex[vertexIndex + vertexStart]; const uint32_t influenceCount = AZStd::GetMin(MaxSupportedSkinInfluences, static_cast(sourceSkinningInfo->GetNumInfluences(originalVertex))); uint32_t influenceIndex = 0; - float weightError = 1.0f; AZStd::vector localIndices; for (; influenceIndex < influenceCount; ++influenceIndex) @@ -202,7 +201,6 @@ namespace AZ EMotionFX::SkinInfluence* influence = sourceSkinningInfo->GetInfluence(originalVertex, influenceIndex); localIndices.push_back(static_cast(influence->GetNodeNr())); blendWeightBufferData[atomVertexBufferOffset + vertexIndex][influenceIndex] = influence->GetWeight(); - weightError -= blendWeightBufferData[atomVertexBufferOffset + vertexIndex][influenceIndex]; } // Zero out any unused ids/weights diff --git a/Gems/AudioSystem/Code/Source/Editor/ATLControlsResourceDialog.cpp b/Gems/AudioSystem/Code/Source/Editor/ATLControlsResourceDialog.cpp index d3121f6245..e58db78538 100644 --- a/Gems/AudioSystem/Code/Source/Editor/ATLControlsResourceDialog.cpp +++ b/Gems/AudioSystem/Code/Source/Editor/ATLControlsResourceDialog.cpp @@ -169,11 +169,9 @@ namespace AudioControls if (parent.isValid()) { bool bChildValid = false; - bool bHasChildren = false; QModelIndex child = parent.model()->index(0, 0, parent); for (int i = 1; child.isValid(); ++i) { - bHasChildren = true; if (ApplyFilter(child)) { bChildValid = true; diff --git a/Gems/AudioSystem/Code/Source/Editor/QConnectionsWidget.cpp b/Gems/AudioSystem/Code/Source/Editor/QConnectionsWidget.cpp index cdd7d937e3..25981d2abd 100644 --- a/Gems/AudioSystem/Code/Source/Editor/QConnectionsWidget.cpp +++ b/Gems/AudioSystem/Code/Source/Editor/QConnectionsWidget.cpp @@ -27,9 +27,9 @@ namespace AudioControls //-------------------------------------------------------------------------------------------// QConnectionsWidget::QConnectionsWidget(QWidget* parent) : QWidget(parent) + , m_control(nullptr) , m_notFoundColor(QColor(0xf3, 0x81, 0x1d)) , m_localizedColor(QColor(0x42, 0x85, 0xf4)) - , m_control(nullptr) { setupUi(this); @@ -37,7 +37,6 @@ namespace AudioControls m_connectionList->installEventFilter(this); connect(m_connectionList, SIGNAL(customContextMenuRequested(const QPoint&)), SLOT(ShowConnectionContextMenu(const QPoint&))); - connect(m_connectionList, SIGNAL(itemSelectionChanged()), this, SLOT(SelectedConnectionChanged())); } //-------------------------------------------------------------------------------------------// @@ -101,27 +100,6 @@ namespace AudioControls contextMenu.exec(m_connectionList->mapToGlobal(pos)); } - //-------------------------------------------------------------------------------------------// - void QConnectionsWidget::SelectedConnectionChanged() - { - TConnectionPtr connection; - EACEControlType controlType = AudioControls::eACET_NUM_TYPES; - if (m_control) - { - QList selected = m_connectionList->selectedItems(); - if (selected.length() == 1) - { - QListWidgetItem* currentItem = selected[0]; - if (currentItem) - { - const CID externalId = currentItem->data(eMDR_ID).toInt(); - connection = m_control->GetConnection(externalId); - controlType = m_control->GetType(); - } - } - } - } - //-------------------------------------------------------------------------------------------// void QConnectionsWidget::MakeConnectionTo(IAudioSystemControl* middlewareControl) { diff --git a/Gems/AudioSystem/Code/Source/Editor/QConnectionsWidget.h b/Gems/AudioSystem/Code/Source/Editor/QConnectionsWidget.h index 8107a37432..2adb7c592d 100644 --- a/Gems/AudioSystem/Code/Source/Editor/QConnectionsWidget.h +++ b/Gems/AudioSystem/Code/Source/Editor/QConnectionsWidget.h @@ -38,7 +38,6 @@ namespace AudioControls private slots: void ShowConnectionContextMenu(const QPoint& pos); - void SelectedConnectionChanged(); void CurrentConnectionModified(); void RemoveSelectedConnection(); diff --git a/Gems/AudioSystem/Code/Source/Engine/FileCacheManager.cpp b/Gems/AudioSystem/Code/Source/Engine/FileCacheManager.cpp index b7ed9229d8..9efbd1d881 100644 --- a/Gems/AudioSystem/Code/Source/Engine/FileCacheManager.cpp +++ b/Gems/AudioSystem/Code/Source/Engine/FileCacheManager.cpp @@ -343,17 +343,6 @@ namespace Audio { if (CVars::s_debugDrawOptions.AreAllFlagsActive(DebugDraw::Options::FileCacheInfo)) { - EATLDataScope dataScope = eADS_ALL; - - if (CVars::s_fcmDrawOptions.AreAllFlagsActive(FileCacheManagerDebugDraw::Options::Global)) - { - dataScope = eADS_GLOBAL; - } - else if (CVars::s_fcmDrawOptions.AreAllFlagsActive(FileCacheManagerDebugDraw::Options::LevelSpecific)) - { - dataScope = eADS_LEVEL_SPECIFIC; - } - const auto frameTime = AZStd::chrono::system_clock::now(); const float entryDrawSize = 1.5f; diff --git a/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphMotionNode.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphMotionNode.cpp index a0a811eff0..ad2b75cca1 100644 --- a/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphMotionNode.cpp +++ b/Gems/EMotionFX/Code/EMotionFX/Source/AnimGraphMotionNode.cpp @@ -552,14 +552,6 @@ namespace EMotionFX motionNode->CreateMotionInstance(animGraphInstance->GetActorInstance(), this); } - // get the id of the currently used the motion set - MotionSet* motionSet = animGraphInstance->GetMotionSet(); - uint32 motionSetID = MCORE_INVALIDINDEX32; - if (motionSet) - { - motionSetID = motionSet->GetID(); - } - // update the internally stored playback info motionNode->UpdatePlayBackInfo(animGraphInstance); diff --git a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/AnimGraphActionManager.cpp b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/AnimGraphActionManager.cpp index 5e33659056..2c7532005e 100644 --- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/AnimGraphActionManager.cpp +++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/AnimGraphActionManager.cpp @@ -412,11 +412,9 @@ namespace EMStudio if (!nodesByAnimGraph.empty()) { MCore::CommandGroup commandGroup("Delete anim graph nodes"); - AZ::u32 numNodes = 0; for (const AZStd::pair>& animGraphAndNodes : nodesByAnimGraph) { - numNodes += static_cast(animGraphAndNodes.second.size()); CommandSystem::DeleteNodes(&commandGroup, animGraphAndNodes.first, animGraphAndNodes.second, true); } diff --git a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/SceneManager/ActorsWindow.cpp b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/SceneManager/ActorsWindow.cpp index c1e35967ec..1fd72067f0 100644 --- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/SceneManager/ActorsWindow.cpp +++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/SceneManager/ActorsWindow.cpp @@ -482,16 +482,6 @@ namespace EMStudio QMenu menu(this); menu.setToolTipsVisible(true); - bool actorSelected = false; - for (const QTreeWidgetItem* item : items) - { - if (item->parent() == nullptr) - { - actorSelected = true; - break; - } - } - bool instanceSelected = false; const int selectedItemCount = items.count(); for (int i = 0; i < selectedItemCount; ++i) diff --git a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/TimeView/TrackDataWidget.cpp b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/TimeView/TrackDataWidget.cpp index 6c2ab60010..02dbb297b3 100644 --- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/TimeView/TrackDataWidget.cpp +++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/TimeView/TrackDataWidget.cpp @@ -2152,13 +2152,6 @@ namespace EMStudio float startTime = copyElement.m_startTime + offset; float endTime = copyElement.m_endTime + offset; - // calculate the duration of the motion event - float duration = 0.0f; - if (MCore::Compare::CheckIfIsClose(startTime, endTime, MCore::Math::epsilon) == false) - { - duration = endTime - startTime; - } - CommandSystem::CommandHelperAddMotionEvent(trackName.c_str(), startTime, endTime, copyElement.m_eventDatas, &commandGroup); } diff --git a/Gems/GraphCanvas/Code/Source/Components/Nodes/General/GeneralNodeTitleComponent.cpp b/Gems/GraphCanvas/Code/Source/Components/Nodes/General/GeneralNodeTitleComponent.cpp index dc512be8f1..1e0fab857f 100644 --- a/Gems/GraphCanvas/Code/Source/Components/Nodes/General/GeneralNodeTitleComponent.cpp +++ b/Gems/GraphCanvas/Code/Source/Components/Nodes/General/GeneralNodeTitleComponent.cpp @@ -276,6 +276,11 @@ namespace GraphCanvas m_subTitleWidget->SetLabel(subtitle); updateLayout = true; } + + if (updateLayout) + { + UpdateLayout(); + } } void GeneralNodeTitleGraphicsWidget::SetTitle(const AZStd::string& title) @@ -463,13 +468,6 @@ namespace GraphCanvas { GRAPH_CANVAS_DETAILED_PROFILE_FUNCTION(); - Styling::PaletteStyle style = m_styleHelper.GetAttribute(Styling::Attribute::PaletteStyle, Styling::PaletteStyle::Solid); - - if (m_paletteOverride) - { - style = m_paletteOverride->GetAttribute(Styling::Attribute::PaletteStyle, Styling::PaletteStyle::Solid); - } - // Background QRectF bounds = boundingRect(); diff --git a/Gems/GraphCanvas/Code/Source/Components/Nodes/General/GeneralSlotLayoutComponent.cpp b/Gems/GraphCanvas/Code/Source/Components/Nodes/General/GeneralSlotLayoutComponent.cpp index ddb5f11714..9c3fc16c50 100644 --- a/Gems/GraphCanvas/Code/Source/Components/Nodes/General/GeneralSlotLayoutComponent.cpp +++ b/Gems/GraphCanvas/Code/Source/Components/Nodes/General/GeneralSlotLayoutComponent.cpp @@ -188,9 +188,7 @@ namespace GraphCanvas void GeneralSlotLayoutGraphicsWidget::LinearSlotGroupWidget::DisplaySlot(const AZ::EntityId& slotId) { ConnectionType connectionType = ConnectionType::CT_Invalid; - SlotRequestBus::EventResult(connectionType, slotId, &SlotRequests::GetConnectionType); - - int layoutOrder = 0; + SlotRequestBus::EventResult(connectionType, slotId, &SlotRequests::GetConnectionType); SlotLayoutInfo slotInfo(slotId); @@ -199,14 +197,14 @@ namespace GraphCanvas SlotUINotificationBus::MultiHandler::BusConnect(slotId); m_inputSlotSet.insert(slotId); - layoutOrder = LayoutSlot(m_inputs, m_inputSlots, slotInfo); + LayoutSlot(m_inputs, m_inputSlots, slotInfo); } else if (connectionType == CT_Output) { SlotUINotificationBus::MultiHandler::BusConnect(slotId); m_outputSlotSet.insert(slotId); - LayoutSlot(m_outputs, m_outputSlots, slotInfo); + LayoutSlot(m_outputs, m_outputSlots, slotInfo); } else { diff --git a/Gems/LyShine/Code/Editor/Animation/Controls/UiSplineCtrlEx.cpp b/Gems/LyShine/Code/Editor/Animation/Controls/UiSplineCtrlEx.cpp index 60109fc49c..9dc44d3046 100644 --- a/Gems/LyShine/Code/Editor/Animation/Controls/UiSplineCtrlEx.cpp +++ b/Gems/LyShine/Code/Editor/Animation/Controls/UiSplineCtrlEx.cpp @@ -2182,18 +2182,6 @@ void AbstractSplineWidget::MoveSelectedKeys(Vec2 offset, bool copyKeys) } } - int rangeMin = aznumeric_cast(TimeToXOfs(affectedRangeMin)); - int rangeMax = aznumeric_cast(TimeToXOfs(affectedRangeMax)); - - if (m_timeRange.start == affectedRangeMin) - { - rangeMin = m_rcSpline.left(); - } - if (m_timeRange.end == affectedRangeMax) - { - rangeMax = m_rcSpline.right(); - } - if (m_pTimelineCtrl) { m_pTimelineCtrl->update(); diff --git a/Gems/LyShine/Code/Editor/Animation/UiAnimViewDopeSheetBase.cpp b/Gems/LyShine/Code/Editor/Animation/UiAnimViewDopeSheetBase.cpp index 9f67503b73..33df1b9624 100644 --- a/Gems/LyShine/Code/Editor/Animation/UiAnimViewDopeSheetBase.cpp +++ b/Gems/LyShine/Code/Editor/Animation/UiAnimViewDopeSheetBase.cpp @@ -1866,24 +1866,22 @@ void CUiAnimViewDopeSheetBase::AddKeys(const QPoint& point, const bool bTryAddKe if (pTrack && inRange) { - bool keyCreated = false; - if (bTryAddKeysInGroup && pNode->GetParentNode()) // Add keys in group + if (bTryAddKeysInGroup && pNode->GetParentNode()) // Add keys in group { CUiAnimViewTrackBundle tracksInGroup = pNode->GetTracksByParam(pTrack->GetParameterType()); for (int i = 0; i < (int)tracksInGroup.GetCount(); ++i) { CUiAnimViewTrack* pCurrTrack = tracksInGroup.GetTrack(i); - if (pCurrTrack->GetChildCount() == 0) // A simple track + if (pCurrTrack->GetChildCount() == 0) // A simple track { if (IsOkToAddKeyHere(pCurrTrack, keyTime)) { RecordTrackUndo(pCurrTrack); pCurrTrack->CreateKey(keyTime); - keyCreated = true; } } - else // A compound track + else // A compound track { for (unsigned int k = 0; k < pCurrTrack->GetChildCount(); ++k) { @@ -1892,26 +1890,24 @@ void CUiAnimViewDopeSheetBase::AddKeys(const QPoint& point, const bool bTryAddKe { RecordTrackUndo(pSubTrack); pSubTrack->CreateKey(keyTime); - keyCreated = true; } } } } } - else if (pTrack->GetChildCount() == 0) // A simple track + else if (pTrack->GetChildCount() == 0) // A simple track { if (IsOkToAddKeyHere(pTrack, keyTime)) { RecordTrackUndo(pTrack); pTrack->CreateKey(keyTime); - keyCreated = true; } } - else // A compound track + else // A compound track { if (pTrack->GetValueType() == eUiAnimValue_RGB) { - keyCreated = CreateColorKey(pTrack, keyTime); + CreateColorKey(pTrack, keyTime); } else { @@ -1922,7 +1918,6 @@ void CUiAnimViewDopeSheetBase::AddKeys(const QPoint& point, const bool bTryAddKe if (IsOkToAddKeyHere(pSubTrack, keyTime)) { pSubTrack->CreateKey(keyTime); - keyCreated = true; } } } @@ -2236,7 +2231,6 @@ void CUiAnimViewDopeSheetBase::DrawSelectTrack(const Range& timeRange, QPainter* void CUiAnimViewDopeSheetBase::DrawBoolTrack(const Range& timeRange, QPainter* painter, CUiAnimViewTrack* pTrack, const QRect& rc) { int x0 = TimeToClient(timeRange.start); - float t0 = timeRange.start; const QBrush prevBrush = painter->brush(); painter->setBrush(m_visibilityBrush); @@ -2267,7 +2261,6 @@ void CUiAnimViewDopeSheetBase::DrawBoolTrack(const Range& timeRange, QPainter* p painter->fillRect(QRect(QPoint(x0, rc.top() + 4), QPoint(x, rc.bottom() - 4)), gradient); } - t0 = time; x0 = x; } int x = TimeToClient(timeRange.end); diff --git a/Gems/LyShine/Code/Source/Animation/UiAnimationSystem.cpp b/Gems/LyShine/Code/Source/Animation/UiAnimationSystem.cpp index d904be02b1..13a4ddb425 100644 --- a/Gems/LyShine/Code/Source/Animation/UiAnimationSystem.cpp +++ b/Gems/LyShine/Code/Source/Animation/UiAnimationSystem.cpp @@ -726,24 +726,27 @@ void UiAnimationSystem::StillUpdate() ////////////////////////////////////////////////////////////////////////// void UiAnimationSystem::ShowPlayedSequencesDebug() { - //f32 green[4] = {0, 1, 0, 1}; - //f32 purple[4] = {1, 0, 1, 1}; - //f32 white[4] = {1, 1, 1, 1}; + constexpr f32 green[4] = {0, 1, 0, 1}; + constexpr f32 purple[4] = {1, 0, 1, 1}; + constexpr f32 white[4] = {1, 1, 1, 1}; float y = 10.0f; AZStd::vector names; + //TODO: needs an implementation + auto Draw2dLabel = [](float /*x*/,float /*y*/,float /*depth*/,const f32* /*color*/,bool /*center*/, const char* /*fmt*/, ...) {}; + for (PlayingSequences::iterator it = m_playingSequences.begin(); it != m_playingSequences.end(); ++it) { PlayingUIAnimSequence& playingSequence = *it; - if (playingSequence.sequence == NULL) + if (playingSequence.sequence == nullptr) { continue; } AZ_Assert(false,"gEnv->pRenderer is always null so it can't be used here"); - //const char* fullname = playingSequence.sequence->GetName(); - //gEnv->pRenderer->Draw2dLabel(1.0f, y, 1.3f, green, false, "Sequence %s : %f (x %f)", fullname, playingSequence.currentTime, playingSequence.currentSpeed); +const char* fullname = playingSequence.sequence->GetName(); +Draw2dLabel(1.0f, y, 1.3f, green, false, "Sequence %s : %f (x %f)", fullname, playingSequence.currentTime, playingSequence.currentSpeed); y += 16.0f; @@ -762,7 +765,7 @@ void UiAnimationSystem::ShowPlayedSequencesDebug() names.push_back(name); } - //gEnv->pRenderer->Draw2dLabel((21.0f + 100.0f * i), ((i % 2) ? (y + 8.0f) : y), 1.0f, alreadyThere ? white : purple, false, "%s", name.c_str()); +Draw2dLabel((21.0f + 100.0f * i), ((i % 2) ? (y + 8.0f) : y), 1.0f, alreadyThere ? white : purple, false, "%s", name.c_str()); } y += 32.0f; diff --git a/Gems/LyShine/Code/Source/Tests/internal/test_UiTextComponent.cpp b/Gems/LyShine/Code/Source/Tests/internal/test_UiTextComponent.cpp index 33c2738e54..5447d4ea97 100644 --- a/Gems/LyShine/Code/Source/Tests/internal/test_UiTextComponent.cpp +++ b/Gems/LyShine/Code/Source/Tests/internal/test_UiTextComponent.cpp @@ -3510,17 +3510,9 @@ void UiTextComponent::UnitTestLocalization(CLyShine* lyshine, IConsoleCmdArgs* / AZStd::string localizationXml("libs/localization/localization.xml"); - bool initLocSuccess = false; - - if (pLocMan) + if (!pLocMan || !pLocMan->InitLocalizationData(localizationXml.c_str()) || !pLocMan->LoadLocalizationDataByTag("init")) { - if (pLocMan->InitLocalizationData(localizationXml.c_str())) - { - if (pLocMan->LoadLocalizationDataByTag("init")) - { - initLocSuccess = true; - } - } + AZ_Assert(false, "Failed to load localization"); } ComponentGetSetTextTestsLoc(lyshine); diff --git a/Gems/LyShine/Code/Source/UiCanvasFileObject.cpp b/Gems/LyShine/Code/Source/UiCanvasFileObject.cpp index 2edaf26909..700de3e8a1 100644 --- a/Gems/LyShine/Code/Source/UiCanvasFileObject.cpp +++ b/Gems/LyShine/Code/Source/UiCanvasFileObject.cpp @@ -206,19 +206,16 @@ UiCanvasFileObject* UiCanvasFileObject::LoadCanvasEntitiesFromOldFormatFile(cons // Do a sanity check that the buffer does start with the prefix that we will remove // Also, determine how newlines are represented in the file. - bool useCarriageReturnNewline = false; const char* suffixToRemove = nullptr; size_t prefixToRemoveLen = 0; if (strncmp(buffer, prefixToRemove1, strlen(prefixToRemove1)) == 0) { - useCarriageReturnNewline = false; prefixToRemoveLen = strlen(prefixToRemove1); suffixToRemove = suffixToRemove1; } else if (strncmp(buffer, prefixToRemove2, strlen(prefixToRemove2)) == 0) { - useCarriageReturnNewline = true; prefixToRemoveLen = strlen(prefixToRemove2); suffixToRemove = suffixToRemove2; } @@ -257,7 +254,6 @@ UiCanvasFileObject* UiCanvasFileObject::LoadCanvasEntitiesFromOldFormatFile(cons { ++p; suffixToRemove = suffixToRemove2; - useCarriageReturnNewline = true; } if (*p == '\n') { diff --git a/Gems/LyShine/Code/Source/UiTextComponent.cpp b/Gems/LyShine/Code/Source/UiTextComponent.cpp index 698dcc2b5e..ec17e93529 100644 --- a/Gems/LyShine/Code/Source/UiTextComponent.cpp +++ b/Gems/LyShine/Code/Source/UiTextComponent.cpp @@ -598,7 +598,6 @@ namespace int curChar = 0; float curLineWidth = 0.0f; float biggestLineWidth = 0.0f; - float widthSum = 0.0f; // When iterating over batches, we need to know the previous // character, which we can only obtain if we keep track of the last @@ -690,7 +689,6 @@ namespace { // Reset the current line width to account for newline curLineWidth = curCharWidth; - widthSum += curLineWidth; } else if ((lastSpace > 0) && ((curChar - lastSpace) < 16) && (curChar - lastSpace >= 0)) // 16 is the default threshold { @@ -703,7 +701,6 @@ namespace } curLineWidth = curLineWidth - lastSpaceWidth + curCharWidth; - widthSum += curLineWidth; } else { @@ -723,7 +720,6 @@ namespace biggestLineWidth = curLineWidth; } - widthSum += curLineWidth; curLineWidth = curCharWidth; } diff --git a/Gems/Maestro/Code/Source/Cinematics/AnimSequence.cpp b/Gems/Maestro/Code/Source/Cinematics/AnimSequence.cpp index 6caa918227..49c319e780 100644 --- a/Gems/Maestro/Code/Source/Cinematics/AnimSequence.cpp +++ b/Gems/Maestro/Code/Source/Cinematics/AnimSequence.cpp @@ -40,12 +40,12 @@ CAnimSequence::CAnimSequence(IMovieSystem* pMovieSystem, uint32 id, SequenceType m_nextGenId = 1; m_pMovieSystem = pMovieSystem; m_flags = 0; - m_pParentSequence = NULL; + m_pParentSequence = nullptr; m_timeRange.Set(0, 10); m_bPaused = false; m_bActive = false; m_legacySequenceObject = nullptr; - m_activeDirector = NULL; + m_activeDirector = nullptr; m_activeDirectorNodeId = -1; m_precached = false; m_bResetting = false; @@ -271,7 +271,7 @@ IAnimNode* CAnimSequence::CreateNodeInternal(AnimNodeType nodeType, uint32 nNode return nullptr; // should never happen, null pointer guard } - CAnimNode* animNode = NULL; + CAnimNode* animNode = nullptr; if (nNodeId == -1) { @@ -331,7 +331,7 @@ IAnimNode* CAnimSequence::CreateNodeInternal(AnimNodeType nodeType, uint32 nNode if (AddNode(animNode)) { // If there isn't an active director, set it now. - if (m_activeDirector == NULL && animNode->GetType() == AnimNodeType::Director) + if (m_activeDirector == nullptr && animNode->GetType() == AnimNodeType::Director) { SetActiveDirector(animNode); } @@ -352,7 +352,7 @@ IAnimNode* CAnimSequence::CreateNode(XmlNodeRef node) { if (!GetMovieSystem()) { - return 0; // should never happen, null pointer guard + return nullptr; // should never happen, null pointer guard } AnimNodeType type; @@ -361,13 +361,13 @@ IAnimNode* CAnimSequence::CreateNode(XmlNodeRef node) XmlString name; if (!node->getAttr("Name", name)) { - return 0; + return nullptr; } IAnimNode* pNewNode = CreateNode(type); if (!pNewNode) { - return 0; + return nullptr; } pNewNode->SetName(name); @@ -377,7 +377,7 @@ IAnimNode* CAnimSequence::CreateNode(XmlNodeRef node) // Make sure de-serializing this node didn't just create an id conflict. This can happen sometimes // when copy/pasting nodes from a different sequence to this one. - for (auto curNode : m_nodes) + for (const auto& curNode : m_nodes) { CAnimNode* animNode = static_cast(curNode.get()); if (animNode->GetId() == newAnimNode->GetId() && animNode != newAnimNode) @@ -413,7 +413,7 @@ void CAnimSequence::RemoveNode(IAnimNode* node, bool removeChildRelationships) } if (removeChildRelationships && m_nodes[i]->GetParent() == node) { - m_nodes[i]->SetParent(0); + m_nodes[i]->SetParent(nullptr); } i++; @@ -423,7 +423,7 @@ void CAnimSequence::RemoveNode(IAnimNode* node, bool removeChildRelationships) if (m_activeDirector == node) { // Clear the active one. - m_activeDirector = NULL; + m_activeDirector = nullptr; m_activeDirectorNodeId = -1; // If there is another director node, set it as active. @@ -445,7 +445,7 @@ void CAnimSequence::RemoveAll() stl::free_container(m_nodes); stl::free_container(m_events); stl::free_container(m_nodesNeedToRender); - m_activeDirector = NULL; + m_activeDirector = nullptr; m_activeDirectorNodeId = -1; } @@ -462,9 +462,9 @@ void CAnimSequence::Reset(bool bSeekToStart) if (!bSeekToStart) { - for (AnimNodes::iterator it = m_nodes.begin(); it != m_nodes.end(); ++it) + for (const auto& it :m_nodes) { - IAnimNode* animNode = it->get(); + IAnimNode* animNode = it.get(); static_cast(animNode)->OnReset(); } m_bResetting = false; @@ -1091,7 +1091,7 @@ int CAnimSequence::GetTrackEventsCount() const ////////////////////////////////////////////////////////////////////////// char const* CAnimSequence::GetTrackEvent(int iIndex) const { - char const* szResult = NULL; + char const* szResult = nullptr; const bool bValid = (iIndex >= 0 && iIndex < GetTrackEventsCount()); CRY_ASSERT(bValid); @@ -1153,7 +1153,7 @@ IAnimNode* CAnimSequence::FindNodeById(int nNodeId) return animNode; } } - return 0; + return nullptr; } ////////////////////////////////////////////////////////////////////////// @@ -1172,7 +1172,7 @@ IAnimNode* CAnimSequence::FindNodeByName(const char* sNodeName, const IAnimNode* } } } - return 0; + return nullptr; } ////////////////////////////////////////////////////////////////////////// @@ -1352,9 +1352,9 @@ bool CAnimSequence::IsAncestorOf(const IAnimSequence* sequence) const return false; // should never happen, null pointer guard } - for (AnimNodes::const_iterator it = m_nodes.begin(); it != m_nodes.end(); ++it) + for (const auto& it :m_nodes) { - IAnimNode* pNode = it->get(); + IAnimNode* pNode = it.get(); if (pNode->GetType() == AnimNodeType::Director) { IAnimTrack* pSequenceTrack = pNode->GetTrackForParameter(AnimParamType::Sequence); diff --git a/Gems/Maestro/Code/Source/Cinematics/LayerNode.cpp b/Gems/Maestro/Code/Source/Cinematics/LayerNode.cpp index e2a9e816c6..546ec9bbe0 100644 --- a/Gems/Maestro/Code/Source/Cinematics/LayerNode.cpp +++ b/Gems/Maestro/Code/Source/Cinematics/LayerNode.cpp @@ -57,8 +57,6 @@ void CLayerNode::Initialize() //----------------------------------------------------------------------------- void CLayerNode::Animate(SAnimContext& ec) { - bool bVisibilityModified = false; - int trackCount = NumTracks(); for (int paramIndex = 0; paramIndex < trackCount; paramIndex++) { @@ -93,14 +91,12 @@ void CLayerNode::Animate(SAnimContext& ec) if (visible != m_bPreVisibility) { m_bPreVisibility = visible; - bVisibilityModified = true; } } else { m_bInit = true; m_bPreVisibility = visible; - bVisibilityModified = true; } } break; diff --git a/Gems/Maestro/Code/Source/Cinematics/Movie.cpp b/Gems/Maestro/Code/Source/Cinematics/Movie.cpp index 9663d3cf56..dc0782f982 100644 --- a/Gems/Maestro/Code/Source/Cinematics/Movie.cpp +++ b/Gems/Maestro/Code/Source/Cinematics/Movie.cpp @@ -785,60 +785,60 @@ bool CMovieSystem::InternalStopSequence(IAnimSequence* sequence, bool bAbort, bo { assert(sequence != 0); - bool bRet = false; PlayingSequences::iterator it; - if (FindSequence(sequence, it)) + if (!FindSequence(sequence, it)) { - if (bAnimate && sequence->IsActivated()) - { - if (m_sequenceStopBehavior == eSSB_GotoEndTime) - { - SAnimContext ac; - ac.singleFrame = true; - ac.time = sequence->GetTimeRange().end; - sequence->Animate(ac); - } - else if (m_sequenceStopBehavior == eSSB_GotoStartTime) - { - SAnimContext ac; - ac.singleFrame = true; - ac.time = sequence->GetTimeRange().start; - sequence->Animate(ac); - } - - sequence->Deactivate(); - } - - // If this sequence is cut scene end it. - if (sequence->GetFlags() & IAnimSequence::eSeqFlags_CutScene) - { - if (!gEnv->IsEditing() || !m_bCutscenesPausedInEditor) - { - if (m_pUser) - { - m_pUser->EndCutScene(sequence, sequence->GetCutSceneFlags(true)); - } - } - - sequence->SetParentSequence(NULL); - } - - // tell all interested listeners - NotifyListeners(sequence, bAbort ? IMovieListener::eMovieEvent_Aborted : IMovieListener::eMovieEvent_Stopped); - - // erase the sequence after notifying listeners so if they choose to they can get the ending time of this sequence - if (FindSequence(sequence, it)) - { - m_playingSequences.erase(it); - } - - sequence->Resume(); - static_cast(sequence)->OnStop(); - bRet = true; + return false; } - return bRet; + if (bAnimate && sequence->IsActivated()) + { + if (m_sequenceStopBehavior == eSSB_GotoEndTime) + { + SAnimContext ac; + ac.singleFrame = true; + ac.time = sequence->GetTimeRange().end; + sequence->Animate(ac); + } + else if (m_sequenceStopBehavior == eSSB_GotoStartTime) + { + SAnimContext ac; + ac.singleFrame = true; + ac.time = sequence->GetTimeRange().start; + sequence->Animate(ac); + } + + sequence->Deactivate(); + } + + // If this sequence is cut scene end it. + if (sequence->GetFlags() & IAnimSequence::eSeqFlags_CutScene) + { + if (!gEnv->IsEditing() || !m_bCutscenesPausedInEditor) + { + if (m_pUser) + { + m_pUser->EndCutScene(sequence, sequence->GetCutSceneFlags(true)); + } + } + + sequence->SetParentSequence(NULL); + } + + // tell all interested listeners + NotifyListeners(sequence, bAbort ? IMovieListener::eMovieEvent_Aborted : IMovieListener::eMovieEvent_Stopped); + + // erase the sequence after notifying listeners so if they choose to they can get the ending time of this sequence + if (FindSequence(sequence, it)) + { + m_playingSequences.erase(it); + } + + sequence->Resume(); + static_cast(sequence)->OnStop(); + + return true; } ////////////////////////////////////////////////////////////////////////// @@ -906,7 +906,7 @@ void CMovieSystem::Reset(bool bPlayOnReset, bool bSeekToStart) InternalStopAllSequences(true, false); // Reset all sequences. - for (Sequences::iterator iter = m_sequences.begin(); iter != m_sequences.end(); ++iter) + for (Sequences::const_iterator iter = m_sequences.cbegin(); iter != m_sequences.cend(); ++iter) { IAnimSequence* pCurrentSequence = iter->get(); NotifyListeners(pCurrentSequence, IMovieListener::eMovieEvent_Started); @@ -940,7 +940,7 @@ void CMovieSystem::Reset(bool bPlayOnReset, bool bSeekToStart) ////////////////////////////////////////////////////////////////////////// void CMovieSystem::PlayOnLoadSequences() { - for (Sequences::iterator sit = m_sequences.begin(); sit != m_sequences.end(); ++sit) + for (Sequences::const_iterator sit = m_sequences.cbegin(); sit != m_sequences.cend(); ++sit) { IAnimSequence* sequence = sit->get(); if (sequence->GetFlags() & IAnimSequence::eSeqFlags_PlayOnReset) @@ -984,16 +984,27 @@ void CMovieSystem::ShowPlayedSequencesDebug() { float y = 10.0f; std::vector names; + std::vector rows; + constexpr f32 green[4] = {0, 1, 0, 1}; + constexpr f32 purple[4] = {1, 0, 1, 1}; + constexpr f32 white[4] = {1, 1, 1, 1}; + + //TODO: needs an implementation + auto Draw2dLabel = [](float /*x*/,float /*y*/,float /*depth*/,const f32* /*color*/,bool /*center*/, const char* /*fmt*/, ...) {}; for (PlayingSequences::iterator it = m_playingSequences.begin(); it != m_playingSequences.end(); ++it) { PlayingSequence& playingSequence = *it; - if (playingSequence.sequence == NULL) + if (playingSequence.sequence == nullptr) { continue; } + const char* fullname = playingSequence.sequence->GetName(); + + Draw2dLabel(1.0f, y, 1.3f, green, false, "Sequence %s : %f (x %f)", fullname, playingSequence.currentTime, playingSequence.currentSpeed); + y += 16.0f; for (int i = 0; i < playingSequence.sequence->GetNodeCount(); ++i) @@ -1014,9 +1025,10 @@ void CMovieSystem::ShowPlayedSequencesDebug() if (alreadyThere == false) { names.push_back(name); - } - } + } + Draw2dLabel((21.0f + 100.0f * i), ((i % 2) ? (y + 8.0f) : y), 1.0f, alreadyThere ? white : purple, false, "%s", name); + } y += 32.0f; } } @@ -1088,7 +1100,8 @@ void CMovieSystem::UpdateInternal(const float deltaTime, const bool bPreUpdate) // Skip sequence if current update does not apply const bool bSequenceEarlyUpdate = (playingSequence.sequence->GetFlags() & IAnimSequence::eSeqFlags_EarlyMovieUpdate) != 0; - if (bPreUpdate && !bSequenceEarlyUpdate || !bPreUpdate && bSequenceEarlyUpdate) + if ((bPreUpdate && !bSequenceEarlyUpdate ) || (!bPreUpdate && bSequenceEarlyUpdate) +) { continue; } @@ -1263,7 +1276,7 @@ void CMovieSystem::PauseCutScenes() { m_bCutscenesPausedInEditor = true; - if (m_pUser != NULL) + if (m_pUser != nullptr) { for (PlayingSequences::iterator it = m_playingSequences.begin(); it != m_playingSequences.end(); ++it) { @@ -1285,7 +1298,7 @@ void CMovieSystem::ResumeCutScenes() m_bCutscenesPausedInEditor = false; - if (m_pUser != NULL) + if (m_pUser != nullptr) { for (PlayingSequences::iterator it = m_playingSequences.begin(); it != m_playingSequences.end(); ++it) { @@ -1475,7 +1488,7 @@ void CMovieSystem::ListSequencesCmd([[maybe_unused]] IConsoleCmdArgs* pArgs) void CMovieSystem::PlaySequencesCmd(IConsoleCmdArgs* pArgs) { const char* sequenceName = pArgs->GetArg(1); - gEnv->pMovieSystem->PlaySequence(sequenceName, NULL, false, false); + gEnv->pMovieSystem->PlaySequence(sequenceName, nullptr, false, false); } #endif //#if !defined(_RELEASE) diff --git a/Gems/Maestro/Code/Source/Cinematics/SceneNode.cpp b/Gems/Maestro/Code/Source/Cinematics/SceneNode.cpp index 33c08b0960..8e6ebb9fe9 100644 --- a/Gems/Maestro/Code/Source/Cinematics/SceneNode.cpp +++ b/Gems/Maestro/Code/Source/Cinematics/SceneNode.cpp @@ -197,8 +197,8 @@ CAnimSceneNode::CAnimSceneNode(const int id) m_lastCaptureKey = -1; m_bLastCapturingEnded = true; m_captureFrameCount = 0; - m_pCamNodeOnHoldForInterp = 0; - m_CurrentSelectTrack = 0; + m_pCamNodeOnHoldForInterp = nullptr; + m_CurrentSelectTrack = nullptr; m_CurrentSelectTrackKeyNumber = 0; m_lastPrecachePoint = -1.f; SetName("Scene"); @@ -335,12 +335,12 @@ void CAnimSceneNode::Animate(SAnimContext& ec) return; } - CSelectTrack* cameraTrack = NULL; - CEventTrack* pEventTrack = NULL; - CSequenceTrack* pSequenceTrack = NULL; - CConsoleTrack* pConsoleTrack = NULL; - CGotoTrack* pGotoTrack = NULL; - CCaptureTrack* pCaptureTrack = NULL; + CSelectTrack* cameraTrack = nullptr; + CEventTrack* pEventTrack = nullptr; + CSequenceTrack* pSequenceTrack = nullptr; + CConsoleTrack* pConsoleTrack = nullptr; + CGotoTrack* pGotoTrack = nullptr; + CCaptureTrack* pCaptureTrack = nullptr; /* bool bTimeJump = false; if (ec.time < m_time) @@ -449,7 +449,7 @@ void CAnimSceneNode::Animate(SAnimContext& ec) // Check if a camera override is set by CVar const char* overrideCamName = gEnv->pMovieSystem->GetOverrideCamName(); AZ::EntityId overrideCamId; - if (overrideCamName != 0 && strlen(overrideCamName) > 0) + if (overrideCamName != nullptr && strlen(overrideCamName) > 0) { // overriding with a Camera Component entity is done by entityId (as names are not unique among AZ::Entities) - try to convert string to u64 to see if it's an id AZ::u64 u64Id = strtoull(overrideCamName, nullptr, /*base (radix)*/ 10); @@ -784,7 +784,7 @@ void CAnimSceneNode::ApplyCameraKey(ISelectKey& key, SAnimContext& ec) if (!bInterpolateCamera && m_pCamNodeOnHoldForInterp) { m_pCamNodeOnHoldForInterp->SetSkipInterpolatedCameraNode(false); - m_pCamNodeOnHoldForInterp = 0; + m_pCamNodeOnHoldForInterp = nullptr; } SCameraParams cameraParams; @@ -861,9 +861,9 @@ void CAnimSceneNode::ApplyCameraKey(ISelectKey& key, SAnimContext& ec) } IAnimNode* prevCameraAnimNode = m_pSequence->FindNodeByName(prevKey.szSelection.c_str(), this); - if (prevCameraAnimNode == NULL) + if (prevCameraAnimNode == nullptr) { - prevCameraAnimNode = m_pSequence->FindNodeByName(prevKey.szSelection.c_str(), NULL); + prevCameraAnimNode = m_pSequence->FindNodeByName(prevKey.szSelection.c_str(), nullptr); } if (prevCameraAnimNode && prevCameraAnimNode->GetType() == AnimNodeType::Camera && prevCameraAnimNode->GetTrackForParameter(AnimParamType::FOV)) @@ -930,35 +930,33 @@ void CAnimSceneNode::ApplyAudioKey(char const* const sTriggerName, bool const bP ////////////////////////////////////////////////////////////////////////// void CAnimSceneNode::ApplySequenceKey(IAnimTrack* pTrack, [[maybe_unused]] int nPrevKey, int nCurrKey, ISequenceKey& key, SAnimContext& ec) { - if (nCurrKey >= 0) + if (nCurrKey < 0) { - IAnimSequence* pSequence = GetSequenceFromSequenceKey(key); - if (pSequence) - { - float startTime = -FLT_MAX; - float endTime = -FLT_MAX; + return; + } + IAnimSequence* pSequence = GetSequenceFromSequenceKey(key); + if (!pSequence) + { + return; + } - if (key.bOverrideTimes) - { - key.fDuration = (key.fEndTime - key.fStartTime) > 0.0f ? (key.fEndTime - key.fStartTime) : 0.0f; - startTime = key.fStartTime; - endTime = key.fEndTime; - } - else - { - key.fDuration = pSequence->GetTimeRange().Length(); - } + if (key.bOverrideTimes) + { + key.fDuration = (key.fEndTime - key.fStartTime) > 0.0f ? (key.fEndTime - key.fStartTime) : 0.0f; + } + else + { + key.fDuration = pSequence->GetTimeRange().Length(); + } - pTrack->SetKey(nCurrKey, &key); + pTrack->SetKey(nCurrKey, &key); - SAnimContext newAnimContext = ec; - newAnimContext.time = std::min(ec.time - key.time + key.fStartTime, key.fDuration + key.fStartTime); + SAnimContext newAnimContext = ec; + newAnimContext.time = std::min(ec.time - key.time + key.fStartTime, key.fDuration + key.fStartTime); - if (static_cast(pSequence)->GetTime() != newAnimContext.time) - { - pSequence->Animate(newAnimContext); - } - } + if (static_cast(pSequence)->GetTime() != newAnimContext.time) + { + pSequence->Animate(newAnimContext); } } diff --git a/Gems/NvCloth/Code/Tests/NvClothTest.cpp b/Gems/NvCloth/Code/Tests/NvClothTest.cpp index e5b0b8fee8..bc1868a5b1 100644 --- a/Gems/NvCloth/Code/Tests/NvClothTest.cpp +++ b/Gems/NvCloth/Code/Tests/NvClothTest.cpp @@ -144,10 +144,7 @@ namespace UnitTest { m_cloth->GetClothConfigurator()->SetTransform(m_clothTransform); - static float time = 0.0f; - static float velocity = 1.0f; - - time += deltaTime; + constexpr float velocity = 1.0f; for (auto& sphere : m_sphereColliders) { diff --git a/Gems/PhysX/Code/Source/Scene/PhysXScene.cpp b/Gems/PhysX/Code/Source/Scene/PhysXScene.cpp index 0ae09d704b..7d54a813c0 100644 --- a/Gems/PhysX/Code/Source/Scene/PhysXScene.cpp +++ b/Gems/PhysX/Code/Source/Scene/PhysXScene.cpp @@ -1225,10 +1225,10 @@ namespace PhysX AZ_PROFILE_DATAPOINT(Physics, stats.getNbBroadPhaseRemoves(), RootCategory, BroadphaseSubCategory, "BroadPhaseRemoves"); // Compute pair stats for all geometry types +#if AZ_PROFILE_DATAPOINT AZ::u32 ccdPairs = 0; AZ::u32 modifiedPairs = 0; AZ::u32 triggerPairs = 0; - for (AZ::u32 i = 0; i < PxGeometryType::eGEOMETRY_COUNT; i++) { // stat[i][j] = stat[j][i], hence, discarding the symmetric entries @@ -1241,6 +1241,7 @@ namespace PhysX triggerPairs += stats.getRbPairStats(physx::PxSimulationStatistics::eTRIGGER_PAIRS, firstGeom, secondGeom); } } +#endif [[maybe_unused]] const char* CollisionsSubCategory = "Collisions"; AZ_PROFILE_DATAPOINT(Physics, ccdPairs, RootCategory, CollisionsSubCategory, "CCDPairs"); diff --git a/Gems/Twitch/Code/Source/TwitchSystemComponent.cpp b/Gems/Twitch/Code/Source/TwitchSystemComponent.cpp index 77890bf32b..73c13f4fea 100644 --- a/Gems/Twitch/Code/Source/TwitchSystemComponent.cpp +++ b/Gems/Twitch/Code/Source/TwitchSystemComponent.cpp @@ -51,8 +51,6 @@ namespace Twitch void TwitchSystemComponent::SetApplicationID(const AZStd::string& twitchApplicationID) { - bool success = false; - /* ** THIS CAN ONLY BE SET ONCE!!!!!! */ @@ -62,7 +60,6 @@ namespace Twitch if (IsValidTwitchAppID(twitchApplicationID)) { m_applicationID = twitchApplicationID; - success = true; } else { From b0c522be5196a7166cb6f13d3ddf8dae75ef06c1 Mon Sep 17 00:00:00 2001 From: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com> Date: Thu, 25 Nov 2021 09:43:57 +0000 Subject: [PATCH 13/58] Rename QtEventToAzInputManager.h/cpp to QtEventToAzInputMapper.h/cpp (#5905) * rename QtEventToAzInputManager.h/cpp to QtEventToAzInputMapper.h/cpp to match type name Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com> * update #includes to refer to QtEventToAzInputMapper.h Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com> --- .../Editor/Lib/Tests/test_ModularViewportCameraController.cpp | 2 +- Code/Editor/Lib/Tests/test_ViewportManipulatorController.cpp | 2 +- ...QtEventToAzInputManager.cpp => QtEventToAzInputMapper.cpp} | 2 +- .../{QtEventToAzInputManager.h => QtEventToAzInputMapper.h} | 0 .../AzToolsFramework/aztoolsframework_files.cmake | 4 ++-- .../AtomToolsFramework/Viewport/RenderViewportWidget.h | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) rename Code/Framework/AzToolsFramework/AzToolsFramework/Input/{QtEventToAzInputManager.cpp => QtEventToAzInputMapper.cpp} (99%) rename Code/Framework/AzToolsFramework/AzToolsFramework/Input/{QtEventToAzInputManager.h => QtEventToAzInputMapper.h} (100%) diff --git a/Code/Editor/Lib/Tests/test_ModularViewportCameraController.cpp b/Code/Editor/Lib/Tests/test_ModularViewportCameraController.cpp index 656440f16e..67d89ad967 100644 --- a/Code/Editor/Lib/Tests/test_ModularViewportCameraController.cpp +++ b/Code/Editor/Lib/Tests/test_ModularViewportCameraController.cpp @@ -9,7 +9,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/Code/Editor/Lib/Tests/test_ViewportManipulatorController.cpp b/Code/Editor/Lib/Tests/test_ViewportManipulatorController.cpp index 81dcae9129..473ddd81f7 100644 --- a/Code/Editor/Lib/Tests/test_ViewportManipulatorController.cpp +++ b/Code/Editor/Lib/Tests/test_ViewportManipulatorController.cpp @@ -8,7 +8,7 @@ #include #include -#include +#include #include #include #include diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Input/QtEventToAzInputManager.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Input/QtEventToAzInputMapper.cpp similarity index 99% rename from Code/Framework/AzToolsFramework/AzToolsFramework/Input/QtEventToAzInputManager.cpp rename to Code/Framework/AzToolsFramework/AzToolsFramework/Input/QtEventToAzInputMapper.cpp index 7ee20997f9..07891188fd 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/Input/QtEventToAzInputManager.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Input/QtEventToAzInputMapper.cpp @@ -6,7 +6,7 @@ * */ -#include +#include #include diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Input/QtEventToAzInputManager.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Input/QtEventToAzInputMapper.h similarity index 100% rename from Code/Framework/AzToolsFramework/AzToolsFramework/Input/QtEventToAzInputManager.h rename to Code/Framework/AzToolsFramework/AzToolsFramework/Input/QtEventToAzInputMapper.h diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/aztoolsframework_files.cmake b/Code/Framework/AzToolsFramework/AzToolsFramework/aztoolsframework_files.cmake index c730df393a..bdf6abe141 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/aztoolsframework_files.cmake +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/aztoolsframework_files.cmake @@ -771,8 +771,8 @@ set(FILES PythonTerminal/ScriptTermDialog.cpp PythonTerminal/ScriptTermDialog.h PythonTerminal/ScriptTermDialog.ui - Input/QtEventToAzInputManager.h - Input/QtEventToAzInputManager.cpp + Input/QtEventToAzInputMapper.h + Input/QtEventToAzInputMapper.cpp Script/LuaSymbolsReporterBus.h Script/LuaSymbolsReporterSystemComponent.h Script/LuaSymbolsReporterSystemComponent.cpp 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 5216f511cb..45838a5378 100644 --- a/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Viewport/RenderViewportWidget.h +++ b/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Viewport/RenderViewportWidget.h @@ -12,7 +12,7 @@ #include #include #include -#include +#include #include #include #include From 97106f9e6023ce03f2130b20f8e8454f21f3cf77 Mon Sep 17 00:00:00 2001 From: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com> Date: Fri, 26 Nov 2021 11:31:13 -0600 Subject: [PATCH 14/58] Adding missing C++20 std::erase implementations (#5735) There were already implementations for std::erase_if. This adds the counterpart AZStd::erase versions resolves #5734 Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com> --- .../AzCore/AzCore/std/containers/deque.h | 8 ++++ .../AzCore/std/containers/fixed_vector.h | 18 +++++++ .../AzCore/std/containers/forward_list.h | 5 ++ .../AzCore/AzCore/std/containers/list.h | 5 ++ .../AzCore/AzCore/std/containers/vector.h | 8 ++++ .../AzCore/AzCore/std/string/fixed_string.h | 9 ++++ .../AzCore/AzCore/std/string/fixed_string.inl | 22 ++++++++- .../AzCore/AzCore/std/string/string.h | 10 ++++ Code/Framework/AzCore/Tests/AZStd/String.cpp | 47 ++++++++++++++++--- .../AzCore/Tests/AZStd/VectorAndArray.cpp | 31 ++++++++++++ 10 files changed, 156 insertions(+), 7 deletions(-) diff --git a/Code/Framework/AzCore/AzCore/std/containers/deque.h b/Code/Framework/AzCore/AzCore/std/containers/deque.h index db585e0ec9..9eed66aeb3 100644 --- a/Code/Framework/AzCore/AzCore/std/containers/deque.h +++ b/Code/Framework/AzCore/AzCore/std/containers/deque.h @@ -1233,6 +1233,14 @@ namespace AZStd right.swap(AZStd::forward(left)); } + template + decltype(auto) erase(deque& container, const U& value) + { + auto iter = AZStd::remove(container.begin(), container.end(), value); + auto removedCount = AZStd::distance(iter, container.end()); + container.erase(iter, container.end()); + return removedCount; + } template decltype(auto) erase_if(deque& container, Predicate predicate) { diff --git a/Code/Framework/AzCore/AzCore/std/containers/fixed_vector.h b/Code/Framework/AzCore/AzCore/std/containers/fixed_vector.h index 5a54c2a589..82faaab2d8 100644 --- a/Code/Framework/AzCore/AzCore/std/containers/fixed_vector.h +++ b/Code/Framework/AzCore/AzCore/std/containers/fixed_vector.h @@ -974,4 +974,22 @@ namespace AZStd { return !operator<(a, b); } + + // C++20 erase free functions + template + constexpr decltype(auto) erase(fixed_vector& container, const U& value) + { + auto iter = AZStd::remove(container.begin(), container.end(), value); + auto removedCount = AZStd::distance(iter, container.end()); + container.erase(iter, container.end()); + return removedCount; + } + template + constexpr decltype(auto) erase_if(fixed_vector& container, Predicate predicate) + { + auto iter = AZStd::remove_if(container.begin(), container.end(), predicate); + auto removedCount = AZStd::distance(iter, container.end()); + container.erase(iter, container.end()); + return removedCount; + } } diff --git a/Code/Framework/AzCore/AzCore/std/containers/forward_list.h b/Code/Framework/AzCore/AzCore/std/containers/forward_list.h index 407d65ffa9..9d7eebbe0e 100644 --- a/Code/Framework/AzCore/AzCore/std/containers/forward_list.h +++ b/Code/Framework/AzCore/AzCore/std/containers/forward_list.h @@ -1275,6 +1275,11 @@ namespace AZStd return !(left == right); } + template + decltype(auto) erase(forward_list& container, const U& value) + { + return container.remove(value); + } template decltype(auto) erase_if(forward_list& container, Predicate predicate) { diff --git a/Code/Framework/AzCore/AzCore/std/containers/list.h b/Code/Framework/AzCore/AzCore/std/containers/list.h index 60d2977749..51bc62f444 100644 --- a/Code/Framework/AzCore/AzCore/std/containers/list.h +++ b/Code/Framework/AzCore/AzCore/std/containers/list.h @@ -1340,6 +1340,11 @@ namespace AZStd return !(left == right); } + template + decltype(auto) erase(list& container, const U& value) + { + return container.remove(value); + } template decltype(auto) erase_if(list& container, Predicate predicate) { diff --git a/Code/Framework/AzCore/AzCore/std/containers/vector.h b/Code/Framework/AzCore/AzCore/std/containers/vector.h index 48de12a5b4..255e1c4de4 100644 --- a/Code/Framework/AzCore/AzCore/std/containers/vector.h +++ b/Code/Framework/AzCore/AzCore/std/containers/vector.h @@ -1387,6 +1387,14 @@ namespace AZStd } //#pragma endregion + template + decltype(auto) erase(vector& container, const U& value) + { + auto iter = AZStd::remove(container.begin(), container.end(), value); + auto removedCount = AZStd::distance(iter, container.end()); + container.erase(iter, container.end()); + return removedCount; + } template decltype(auto) erase_if(vector& container, Predicate predicate) { diff --git a/Code/Framework/AzCore/AzCore/std/string/fixed_string.h b/Code/Framework/AzCore/AzCore/std/string/fixed_string.h index b68f21784b..a8e0f96988 100644 --- a/Code/Framework/AzCore/AzCore/std/string/fixed_string.h +++ b/Code/Framework/AzCore/AzCore/std/string/fixed_string.h @@ -465,6 +465,15 @@ namespace AZStd template constexpr bool operator>=(const Element* lhs, const basic_fixed_string& rhs); + // C++20 erase helpers + template + constexpr auto erase(basic_fixed_string& container, const U& element) + -> typename basic_fixed_string::size_type; + + template + constexpr auto erase_if(basic_fixed_string& container, Predicate predicate) + -> typename basic_fixed_string::size_type; + template struct hash; diff --git a/Code/Framework/AzCore/AzCore/std/string/fixed_string.inl b/Code/Framework/AzCore/AzCore/std/string/fixed_string.inl index 9a7e38aca0..8b973d3b2c 100644 --- a/Code/Framework/AzCore/AzCore/std/string/fixed_string.inl +++ b/Code/Framework/AzCore/AzCore/std/string/fixed_string.inl @@ -11,7 +11,7 @@ #include #include -#include +#include #include @@ -1680,6 +1680,26 @@ namespace AZStd return !operator<(lhs, rhs); } + template + inline constexpr auto erase(basic_fixed_string& container, const U& element) + -> typename basic_fixed_string::size_type + { + auto iter = AZStd::remove(container.begin(), container.end(), element); + auto removedCount = AZStd::distance(iter, container.end()); + container.erase(iter, container.end()); + return removedCount; + } + + template + inline constexpr auto erase_if(basic_fixed_string& container, Predicate predicate) + -> typename basic_fixed_string::size_type + { + auto iter = AZStd::remove_if(container.begin(), container.end(), predicate); + auto removedCount = AZStd::distance(iter, container.end()); + container.erase(iter, container.end()); + return removedCount; + } + template struct hash> { diff --git a/Code/Framework/AzCore/AzCore/std/string/string.h b/Code/Framework/AzCore/AzCore/std/string/string.h index 9ef7ea3086..e107c4657d 100644 --- a/Code/Framework/AzCore/AzCore/std/string/string.h +++ b/Code/Framework/AzCore/AzCore/std/string/string.h @@ -1955,6 +1955,16 @@ namespace AZStd { return basic_string(lhs).compare(rhs) >= 0; } + + template + decltype(auto) erase(basic_string& container, const U& element) + { + auto iter = AZStd::remove(container.begin(), container.end(), element); + auto removedCount = AZStd::distance(iter, container.end()); + container.erase(iter, container.end()); + return removedCount; + } + template decltype(auto) erase_if(basic_string& container, Predicate predicate) { diff --git a/Code/Framework/AzCore/Tests/AZStd/String.cpp b/Code/Framework/AzCore/Tests/AZStd/String.cpp index 68bdd311d5..356310a94d 100644 --- a/Code/Framework/AzCore/Tests/AZStd/String.cpp +++ b/Code/Framework/AzCore/Tests/AZStd/String.cpp @@ -2376,17 +2376,52 @@ namespace UnitTest static_assert(AZStd::wildcard_match_case(filter1, blahValue)); } - TEST_F(String, StringEraseIf_Succeeds) + TEST_F(String, StringCXX20Erase_Succeeds) { - AZStd::string eraseIfTest = "ABC CBA"; - auto eraseCount = AZStd::erase_if(eraseIfTest, [](AZStd::string::value_type ch) - { - return ch == 'C'; - }); + auto erasePredicate = [](AZStd::string::value_type ch) + { + return ch == 'C'; + }; + auto eraseCount = AZStd::erase_if(eraseIfTest, erasePredicate); EXPECT_EQ(2, eraseCount); EXPECT_EQ(5, eraseIfTest.size()); EXPECT_STREQ("AB BA", eraseIfTest.c_str()); + + // Now erase the letter 'A'; + eraseCount = AZStd::erase(eraseIfTest, 'A'); + EXPECT_EQ(2, eraseCount); + EXPECT_EQ(3, eraseIfTest.size()); + EXPECT_EQ("B B", eraseIfTest); + } + + TEST_F(String, FixedStringCXX20Erase_Succeeds) + { + // Erase 'l' from the phrase "Hello" World" + constexpr auto eraseTest = [](const char* testString) constexpr + { + AZStd::fixed_string<16> testResult{ testString }; + AZStd::erase(testResult, 'l'); + return testResult; + }("HelloWorld"); + + static_assert(eraseTest == "HeoWord"); + EXPECT_EQ("HeoWord", eraseTest); + + // Use erase_if to erase both 'H' and 'e' from the remaining eraseTest string + constexpr auto eraseIfTest = [](AZStd::string_view testString) constexpr + { + AZStd::fixed_string<16> testResult{ testString }; + auto erasePredicate = [](char ch) + { + return ch == 'H' || ch == 'e'; + }; + AZStd::erase_if(testResult, erasePredicate); + return testResult; + }(eraseTest); + + static_assert(eraseIfTest == "oWord"); + EXPECT_EQ("oWord", eraseIfTest); } template diff --git a/Code/Framework/AzCore/Tests/AZStd/VectorAndArray.cpp b/Code/Framework/AzCore/Tests/AZStd/VectorAndArray.cpp index b3eab244c4..d802b3461b 100644 --- a/Code/Framework/AzCore/Tests/AZStd/VectorAndArray.cpp +++ b/Code/Framework/AzCore/Tests/AZStd/VectorAndArray.cpp @@ -796,6 +796,37 @@ namespace UnitTest EXPECT_GT(greaterVectorDifferentSize, lessVector); } + TEST_F(Arrays, FixedVectorCXX20Erase_Succeeds) + { + // Erase 'l' from the phrase "Hello" World" + auto eraseTest = [](AZStd::initializer_list testInit) constexpr + { + AZStd::fixed_vector testResult{ testInit }; + AZStd::erase(testResult, 'l'); + return testResult; + }({ 'H', 'e', 'l', 'l', 'o', 'W', 'o', 'r', 'l', 'd' }); + + constexpr AZStd::string_view expectedEraseString = "HeoWord"; + AZStd::string_view testEraseString{ eraseTest.begin(), eraseTest.end() }; + EXPECT_EQ(expectedEraseString, testEraseString); + + // Use erase_if to erase both 'H' and 'e' from the remaining eraseTest string + auto eraseIfTest = [](const AZStd::fixed_vector& testVector) constexpr + { + AZStd::fixed_vector testResult{ testVector }; + auto erasePredicate = [](char ch) + { + return ch == 'H' || ch == 'e'; + }; + AZStd::erase_if(testResult, erasePredicate); + return testResult; + }(testEraseString); + + constexpr AZStd::string_view expectedEraseIfString = "oWord"; + AZStd::string_view testEraseIfString{ eraseIfTest.begin(), eraseIfTest.end() }; + EXPECT_EQ(expectedEraseIfString, testEraseIfString); + } + TEST_F(Arrays, VectorSwap) { vector vec1(42, nullptr); From 5794fa6c9dc3c847be568e0f04f9feea0d48f4bf Mon Sep 17 00:00:00 2001 From: carlitosan <82187351+carlitosan@users.noreply.github.com> Date: Fri, 26 Nov 2021 10:17:14 -0800 Subject: [PATCH 15/58] non-handler static initialization for runtime assets is made recursive on dependencies Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com> --- .../Interpreted/ExecutionInterpretedAPI.cpp | 70 +++++++++++-------- .../Interpreted/ExecutionInterpretedAPI.h | 2 +- .../Interpreted/ExecutionStateInterpreted.cpp | 6 +- 3 files changed, 42 insertions(+), 36 deletions(-) diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/Interpreted/ExecutionInterpretedAPI.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/Interpreted/ExecutionInterpretedAPI.cpp index bba56847ce..bbd16dfb96 100644 --- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/Interpreted/ExecutionInterpretedAPI.cpp +++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/Interpreted/ExecutionInterpretedAPI.cpp @@ -501,43 +501,53 @@ namespace ScriptCanvas return lua_gettop(lua); } - void InitializeInterpretedStatics(const RuntimeData& runtimeData) + void InitializeInterpretedStatics(RuntimeData& runtimeData) { -#if defined(AZ_PROFILE_BUILD) || defined(AZ_DEBUG_BUILD) - Execution::InitializeFromLuaStackFunctions(const_cast(runtimeData.m_debugMap)); -#endif - AZ_WarningOnce("ScriptCanvas", !runtimeData.m_areStaticsInitialized, "ScriptCanvas runtime data already initalized"); - - if (runtimeData.RequiresStaticInitialization()) + if (!runtimeData.m_areStaticsInitialized) { - AZ::ScriptLoadResult result{}; - AZ::ScriptSystemRequestBus::BroadcastResult(result, &AZ::ScriptSystemRequests::LoadAndGetNativeContext, runtimeData.m_script, AZ::k_scriptLoadBinary, AZ::ScriptContextIds::DefaultScriptContextId); - AZ_Assert(result.status == AZ::ScriptLoadResult::Status::Initial, "ExecutionStateInterpreted script asset was valid but failed to load."); - AZ_Assert(result.lua, "Must have a default script context and a lua_State"); - AZ_Assert(lua_istable(result.lua, -1), "No run-time execution was available for this script"); + runtimeData.m_areStaticsInitialized = true; - auto lua = result.lua; - // Lua: table - lua_getfield(lua, -1, Grammar::k_InitializeStaticsName); - // Lua: table, ? - if (lua_isfunction(lua, -1)) + for (auto& dependency : runtimeData.m_requiredAssets) { - // Lua: table, function - lua_pushvalue(lua, -2); - // Lua: table, function, table - for (auto& clonerSource : runtimeData.m_cloneSources) - { - lua_pushlightuserdata(lua, const_cast(reinterpret_cast(&clonerSource))); - } - // Lua: table, function, table, cloners... - AZ::Internal::LuaSafeCall(lua, aznumeric_caster(runtimeData.m_cloneSources.size() + 1), 0); - // Lua: table - lua_pop(lua, 1); + InitializeInterpretedStatics(dependency.Get()->GetData()); } - else + +#if defined(AZ_PROFILE_BUILD) || defined(AZ_DEBUG_BUILD) + Execution::InitializeFromLuaStackFunctions(const_cast(runtimeData.m_debugMap)); +#endif + AZ_WarningOnce("ScriptCanvas", !runtimeData.m_areStaticsInitialized, "ScriptCanvas runtime data already initalized"); + + if (runtimeData.RequiresStaticInitialization()) { + AZ::ScriptLoadResult result{}; + AZ::ScriptSystemRequestBus::BroadcastResult(result, &AZ::ScriptSystemRequests::LoadAndGetNativeContext, runtimeData.m_script, AZ::k_scriptLoadBinary, AZ::ScriptContextIds::DefaultScriptContextId); + AZ_Assert(result.status == AZ::ScriptLoadResult::Status::Initial, "ExecutionStateInterpreted script asset was valid but failed to load."); + AZ_Assert(result.lua, "Must have a default script context and a lua_State"); + AZ_Assert(lua_istable(result.lua, -1), "No run-time execution was available for this script"); + + auto lua = result.lua; + // Lua: table + lua_getfield(lua, -1, Grammar::k_InitializeStaticsName); // Lua: table, ? - lua_pop(lua, 2); + if (lua_isfunction(lua, -1)) + { + // Lua: table, function + lua_pushvalue(lua, -2); + // Lua: table, function, table + for (auto& clonerSource : runtimeData.m_cloneSources) + { + lua_pushlightuserdata(lua, const_cast(reinterpret_cast(&clonerSource))); + } + // Lua: table, function, table, cloners... + AZ::Internal::LuaSafeCall(lua, aznumeric_caster(runtimeData.m_cloneSources.size() + 1), 0); + // Lua: table + lua_pop(lua, 1); + } + else + { + // Lua: table, ? + lua_pop(lua, 2); + } } } } diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/Interpreted/ExecutionInterpretedAPI.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/Interpreted/ExecutionInterpretedAPI.h index c86327bc8d..db8473a468 100644 --- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/Interpreted/ExecutionInterpretedAPI.h +++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/Interpreted/ExecutionInterpretedAPI.h @@ -43,7 +43,7 @@ namespace ScriptCanvas void InterpretedUnloadData(RuntimeData& runtimeData); - void InitializeInterpretedStatics(const RuntimeData& runtimeData); + void InitializeInterpretedStatics(RuntimeData& runtimeData); int InitializeNodeableOutKeys(lua_State* lua); diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/Interpreted/ExecutionStateInterpreted.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/Interpreted/ExecutionStateInterpreted.cpp index a92c13ac63..0f090574b5 100644 --- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/Interpreted/ExecutionStateInterpreted.cpp +++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/Interpreted/ExecutionStateInterpreted.cpp @@ -49,11 +49,7 @@ namespace ScriptCanvas , config.asset.GetId().ToString().data()); #endif - if (!runtimeAsset->GetData().m_areStaticsInitialized) - { - runtimeAsset->GetData().m_areStaticsInitialized = true; - Execution::InitializeInterpretedStatics(runtimeAsset->GetData()); - } + Execution::InitializeInterpretedStatics(runtimeAsset->GetData()); } void ExecutionStateInterpreted::ClearLuaRegistryIndex() From b882eddca8a5465c138174c4e251069d5549c374 Mon Sep 17 00:00:00 2001 From: amzn-sean <75276488+amzn-sean@users.noreply.github.com> Date: Mon, 29 Nov 2021 14:05:03 +0000 Subject: [PATCH 16/58] fix dev break. AZStd::fixed_vector cannot be constexp error (#5995) Signed-off-by: amzn-sean <75276488+amzn-sean@users.noreply.github.com> --- Code/Framework/AzCore/Tests/AZStd/VectorAndArray.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Code/Framework/AzCore/Tests/AZStd/VectorAndArray.cpp b/Code/Framework/AzCore/Tests/AZStd/VectorAndArray.cpp index d802b3461b..851a7a8609 100644 --- a/Code/Framework/AzCore/Tests/AZStd/VectorAndArray.cpp +++ b/Code/Framework/AzCore/Tests/AZStd/VectorAndArray.cpp @@ -799,7 +799,7 @@ namespace UnitTest TEST_F(Arrays, FixedVectorCXX20Erase_Succeeds) { // Erase 'l' from the phrase "Hello" World" - auto eraseTest = [](AZStd::initializer_list testInit) constexpr + auto eraseTest = [](AZStd::initializer_list testInit) { AZStd::fixed_vector testResult{ testInit }; AZStd::erase(testResult, 'l'); @@ -811,7 +811,7 @@ namespace UnitTest EXPECT_EQ(expectedEraseString, testEraseString); // Use erase_if to erase both 'H' and 'e' from the remaining eraseTest string - auto eraseIfTest = [](const AZStd::fixed_vector& testVector) constexpr + auto eraseIfTest = [](const AZStd::fixed_vector& testVector) { AZStd::fixed_vector testResult{ testVector }; auto erasePredicate = [](char ch) From cbb5179b4c1af71d3abeedb2972060cd335b4fef Mon Sep 17 00:00:00 2001 From: bosnichd Date: Mon, 29 Nov 2021 08:21:55 -0700 Subject: [PATCH 17/58] Add a missing #include and [[maybe_unused]] (#5960) Signed-off-by: bosnichd --- Code/Legacy/CryCommon/Cry_Math.h | 1 + Gems/Atom/RPI/Code/Source/RPI.Public/Culling.cpp | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Code/Legacy/CryCommon/Cry_Math.h b/Code/Legacy/CryCommon/Cry_Math.h index a96b83a1bf..b09e29ce90 100644 --- a/Code/Legacy/CryCommon/Cry_Math.h +++ b/Code/Legacy/CryCommon/Cry_Math.h @@ -17,6 +17,7 @@ #include // eLittleEndian #include #include +#include /////////////////////////////////////////////////////////////////////////////// // Forward declarations // /////////////////////////////////////////////////////////////////////////////// diff --git a/Gems/Atom/RPI/Code/Source/RPI.Public/Culling.cpp b/Gems/Atom/RPI/Code/Source/RPI.Public/Culling.cpp index 07a62eba1f..9dd4cf99b1 100644 --- a/Gems/Atom/RPI/Code/Source/RPI.Public/Culling.cpp +++ b/Gems/Atom/RPI/Code/Source/RPI.Public/Culling.cpp @@ -283,7 +283,7 @@ namespace AZ const Scene& scene, View& view, Frustum& frustum, - void* maskedOcclusionCulling) + [[maybe_unused]]void* maskedOcclusionCulling) { AZStd::shared_ptr worklistData = AZStd::make_shared(); worklistData->m_debugCtx = &debugCtx; @@ -516,7 +516,7 @@ namespace AZ } #endif - void CullingScene::ProcessCullablesCommon(const Scene& scene, View& view, AZ::Frustum& frustum, void*& maskedOcclusionCulling) + void CullingScene::ProcessCullablesCommon(const Scene& scene, View& view, AZ::Frustum& frustum, [[maybe_unused]]void*& maskedOcclusionCulling) { AZ_PROFILE_SCOPE(RPI, "CullingScene::ProcessCullablesCommon() - %s", view.GetName().GetCStr()); From c59f973900c228c181cea62cfabf5d1e445cfa91 Mon Sep 17 00:00:00 2001 From: Roman <69218254+amzn-rhhong@users.noreply.github.com> Date: Mon, 29 Nov 2021 08:39:43 -0800 Subject: [PATCH 18/58] Add joint selection visual support (#5860) * Render joint orientation Signed-off-by: rhhong * joint selection will affect rendering result in emfx atom debug draw Signed-off-by: rhhong * Render line skeleton with joint selection Signed-off-by: rhhong * bug fix Signed-off-by: rhhong * fix build error Signed-off-by: rhhong * CR feedback - checking the actor instances for joint selection Signed-off-by: rhhong --- .../Code/Source/AtomActorDebugDraw.cpp | 65 +++++++++++++++++-- .../Code/Source/AtomActorDebugDraw.h | 1 + .../Code/EMotionFX/Source/JointSelectionBus.h | 23 +++++++ .../EMStudioSDK/Source/EMStudioManager.cpp | 2 + .../EMStudioSDK/Source/EMStudioManager.h | 12 ++++ .../Code/EMotionFX/emotionfx_files.cmake | 1 + 6 files changed, 98 insertions(+), 6 deletions(-) create mode 100644 Gems/EMotionFX/Code/EMotionFX/Source/JointSelectionBus.h diff --git a/Gems/AtomLyIntegration/EMotionFXAtom/Code/Source/AtomActorDebugDraw.cpp b/Gems/AtomLyIntegration/EMotionFXAtom/Code/Source/AtomActorDebugDraw.cpp index a6dc818fc5..82ee19b6a5 100644 --- a/Gems/AtomLyIntegration/EMotionFXAtom/Code/Source/AtomActorDebugDraw.cpp +++ b/Gems/AtomLyIntegration/EMotionFXAtom/Code/Source/AtomActorDebugDraw.cpp @@ -23,6 +23,7 @@ #include #include #include +#include namespace AZ::Render { @@ -212,6 +213,13 @@ namespace AZ::Render m_auxVertices.clear(); m_auxVertices.reserve(numJoints * 2); + m_auxColors.clear(); + m_auxColors.reserve(numJoints * 2); + AZ::Color renderColor; + + const AZStd::unordered_set* cachedSelectedJointIndices; + EMotionFX::JointSelectionRequestBus::BroadcastResult( + cachedSelectedJointIndices, &EMotionFX::JointSelectionRequests::FindSelectedJointIndices, instance); for (size_t jointIndex = 0; jointIndex < numJoints; ++jointIndex) { @@ -227,18 +235,29 @@ namespace AZ::Render continue; } + if (cachedSelectedJointIndices && cachedSelectedJointIndices->find(jointIndex) != cachedSelectedJointIndices->end()) + { + renderColor = SelectedColor; + } + else + { + renderColor = skeletonColor; + } + const AZ::Vector3 parentPos = pose->GetWorldSpaceTransform(parentIndex).m_position; m_auxVertices.emplace_back(parentPos); + m_auxColors.emplace_back(renderColor); const AZ::Vector3 bonePos = pose->GetWorldSpaceTransform(jointIndex).m_position; m_auxVertices.emplace_back(bonePos); + m_auxColors.emplace_back(renderColor); } RPI::AuxGeomDraw::AuxGeomDynamicDrawArguments lineArgs; lineArgs.m_verts = m_auxVertices.data(); lineArgs.m_vertCount = static_cast(m_auxVertices.size()); - lineArgs.m_colors = &skeletonColor; - lineArgs.m_colorCount = 1; + lineArgs.m_colors = m_auxColors.data(); + lineArgs.m_colorCount = lineArgs.m_vertCount; lineArgs.m_depthTest = RPI::AuxGeomDraw::DepthTest::Off; auxGeom->DrawLines(lineArgs); } @@ -251,6 +270,12 @@ namespace AZ::Render const EMotionFX::Skeleton* skeleton = instance->GetActor()->GetSkeleton(); const EMotionFX::Pose* pose = transformData->GetCurrentPose(); const size_t numEnabled = instance->GetNumEnabledNodes(); + + AZ::Color renderColor = skeletonColor; + const AZStd::unordered_set* cachedSelectedJointIndices; + EMotionFX::JointSelectionRequestBus::BroadcastResult( + cachedSelectedJointIndices, &EMotionFX::JointSelectionRequests::FindSelectedJointIndices, instance); + for (size_t i = 0; i < numEnabled; ++i) { EMotionFX::Node* joint = skeleton->GetNode(instance->GetEnabledNode(i)); @@ -273,9 +298,17 @@ namespace AZ::Render const float parentBoneScale = CalculateBoneScale(instance, skeleton->GetNode(parentIndex)); const float cylinderSize = boneLength - boneScale - parentBoneScale; + if (cachedSelectedJointIndices && cachedSelectedJointIndices->find(jointIndex) != cachedSelectedJointIndices->end()) + { + renderColor = SelectedColor; + } + else + { + renderColor = skeletonColor; + } // Render the bone cylinder, the cylinder will be directed towards the node's parent and must fit between the spheres - auxGeom->DrawCylinder(centerWorldPos, boneDirection, boneScale, cylinderSize, skeletonColor); - auxGeom->DrawSphere(nodeWorldPos, boneScale, skeletonColor); + auxGeom->DrawCylinder(centerWorldPos, boneDirection, boneScale, cylinderSize, renderColor); + auxGeom->DrawSphere(nodeWorldPos, boneScale, renderColor); } } @@ -597,6 +630,10 @@ namespace AZ::Render return; } + const AZStd::unordered_set* cachedSelectedJointIndices; + EMotionFX::JointSelectionRequestBus::BroadcastResult( + cachedSelectedJointIndices, &EMotionFX::JointSelectionRequests::FindSelectedJointIndices, actorInstance); + const EMotionFX::Actor* actor = actorInstance->GetActor(); const EMotionFX::Skeleton* skeleton = actor->GetSkeleton(); const EMotionFX::TransformData* transformData = actorInstance->GetTransformData(); @@ -607,7 +644,6 @@ namespace AZ::Render AzFramework::WindowSize viewportSize = viewportContext->GetViewportSize(); m_drawParams.m_position = AZ::Vector3(static_cast(viewportSize.m_width), 0.0f, 1.0f) + TopRightBorderPadding * viewportContext->GetDpiScalingFactor(); - m_drawParams.m_color = jointNameColor; m_drawParams.m_scale = AZ::Vector2(BaseFontSize); m_drawParams.m_hAlign = AzFramework::TextHorizontalAlignment::Right; m_drawParams.m_monospace = false; @@ -624,6 +660,14 @@ namespace AZ::Render const AZ::Vector3 worldPos = pose->GetWorldSpaceTransform(jointIndex).m_position; m_drawParams.m_position = worldPos; + if (cachedSelectedJointIndices && cachedSelectedJointIndices->find(jointIndex) != cachedSelectedJointIndices->end()) + { + m_drawParams.m_color = SelectedColor; + } + else + { + m_drawParams.m_color = jointNameColor; + } m_fontDrawInterface->DrawScreenAlignedText3d(m_drawParams, joint->GetName()); } } @@ -640,6 +684,10 @@ namespace AZ::Render const EMotionFX::Pose* pose = transformData->GetCurrentPose(); const float constPreScale = scale * unitScale * 3.0f; + const AZStd::unordered_set* cachedSelectedJointIndices; + EMotionFX::JointSelectionRequestBus::BroadcastResult( + cachedSelectedJointIndices, &EMotionFX::JointSelectionRequests::FindSelectedJointIndices, actorInstance); + const size_t numEnabled = actorInstance->GetNumEnabledNodes(); for (size_t i = 0; i < numEnabled; ++i) { @@ -649,7 +697,12 @@ namespace AZ::Render 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*/); + bool selected = false; + if (cachedSelectedJointIndices && cachedSelectedJointIndices->find(jointIndex) != cachedSelectedJointIndices->end()) + { + selected = true; + } + RenderLineAxis(debugDisplay, worldTM, size, selected); } } diff --git a/Gems/AtomLyIntegration/EMotionFXAtom/Code/Source/AtomActorDebugDraw.h b/Gems/AtomLyIntegration/EMotionFXAtom/Code/Source/AtomActorDebugDraw.h index d3a6bc44f3..3c0258cfef 100644 --- a/Gems/AtomLyIntegration/EMotionFXAtom/Code/Source/AtomActorDebugDraw.h +++ b/Gems/AtomLyIntegration/EMotionFXAtom/Code/Source/AtomActorDebugDraw.h @@ -84,6 +84,7 @@ namespace AZ::Render static constexpr float BaseFontSize = 0.7f; const Vector3 TopRightBorderPadding = AZ::Vector3(-40.0f, 22.0f, 0.0f); + const AZ::Color SelectedColor = AZ::Color{ 1.0f, 0.67f, 0.0f, 1.0f }; RPI::AuxGeomFeatureProcessorInterface* m_auxGeomFeatureProcessor = nullptr; AZStd::vector m_auxVertices; diff --git a/Gems/EMotionFX/Code/EMotionFX/Source/JointSelectionBus.h b/Gems/EMotionFX/Code/EMotionFX/Source/JointSelectionBus.h new file mode 100644 index 0000000000..634456c82f --- /dev/null +++ b/Gems/EMotionFX/Code/EMotionFX/Source/JointSelectionBus.h @@ -0,0 +1,23 @@ +/* + * 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 EMotionFX +{ + class JointSelectionRequests + : public AZ::EBusTraits + { + public: + virtual const AZStd::unordered_set* FindSelectedJointIndices(EMotionFX::ActorInstance* instance) const = 0; + }; + using JointSelectionRequestBus = AZ::EBus; +} diff --git a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/EMStudioManager.cpp b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/EMStudioManager.cpp index b385de62be..6881e49429 100644 --- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/EMStudioManager.cpp +++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/EMStudioManager.cpp @@ -97,6 +97,7 @@ namespace EMStudio m_compileDate = AZStd::string::format("%s", MCORE_DATE); EMotionFX::SkeletonOutlinerNotificationBus::Handler::BusConnect(); + EMotionFX::JointSelectionRequestBus::Handler::BusConnect(); // log some information LogInfo(); @@ -107,6 +108,7 @@ namespace EMStudio // destructor EMStudioManager::~EMStudioManager() { + EMotionFX::JointSelectionRequestBus::Handler::BusDisconnect(); EMotionFX::SkeletonOutlinerNotificationBus::Handler::BusDisconnect(); if (m_eventProcessingCallback) diff --git a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/EMStudioManager.h b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/EMStudioManager.h index 4c3139b77a..1d60773e1f 100644 --- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/EMStudioManager.h +++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/EMStudioManager.h @@ -19,6 +19,8 @@ // include the gizmos #include +#include + // include the EMStudio Config #include "EMStudioConfig.h" #include @@ -52,6 +54,7 @@ namespace EMStudio */ class EMSTUDIO_API EMStudioManager : private EMotionFX::SkeletonOutlinerNotificationBus::Handler + , private EMotionFX::JointSelectionRequestBus::Handler { public: AZ_RTTI(EMStudio::EMStudioManager, "{D45E95CF-0C7B-44F1-A9D4-99A1E12A5AB5}") @@ -103,6 +106,15 @@ namespace EMStudio void SetSelectedJointIndices(const AZStd::unordered_set& selectedJointIndices); const AZStd::unordered_set& GetSelectedJointIndices() const { return m_selectedJointIndices; } + const AZStd::unordered_set* FindSelectedJointIndices(EMotionFX::ActorInstance* instance) const + { + if (instance == m_commandManager->GetCurrentSelection().GetSingleActorInstance()) + { + return &m_selectedJointIndices; + } + return nullptr; + } + Workspace* GetWorkspace() { return &m_workspace; } // functions for adding/removing gizmos diff --git a/Gems/EMotionFX/Code/EMotionFX/emotionfx_files.cmake b/Gems/EMotionFX/Code/EMotionFX/emotionfx_files.cmake index 9947850471..f0443ade44 100644 --- a/Gems/EMotionFX/Code/EMotionFX/emotionfx_files.cmake +++ b/Gems/EMotionFX/Code/EMotionFX/emotionfx_files.cmake @@ -42,6 +42,7 @@ set(FILES Source/EMotionFXManager.h Source/EMotionFXAllocatorInitializer.cpp Source/EMotionFXAllocatorInitializer.h + Source/JointSelectionBus.h Source/KeyFrame.h Source/KeyFrame.inl Source/KeyFrameFinder.h From ddddd7a49dc83994dd30bf3b4b0db05743e2101e Mon Sep 17 00:00:00 2001 From: lsemp3d <58790905+lsemp3d@users.noreply.github.com> Date: Mon, 29 Nov 2021 08:54:52 -0800 Subject: [PATCH 19/58] Removed legacy scripts, closes #2549 Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com> --- .../Scripts/export_all_project_levels.py | 78 --- Assets/Editor/Scripts/generatelod.py | 40 -- Assets/Editor/Scripts/lua_symbols.py | 116 ---- Assets/Editor/Scripts/rename_cgf.py | 14 - .../Scripts/select_story_anim_objects.py | 14 - Assets/Editor/Scripts/tools_shelf_actions.py | 508 ------------------ 6 files changed, 770 deletions(-) delete mode 100755 Assets/Editor/Scripts/export_all_project_levels.py delete mode 100755 Assets/Editor/Scripts/generatelod.py delete mode 100644 Assets/Editor/Scripts/lua_symbols.py delete mode 100755 Assets/Editor/Scripts/rename_cgf.py delete mode 100755 Assets/Editor/Scripts/select_story_anim_objects.py delete mode 100755 Assets/Editor/Scripts/tools_shelf_actions.py diff --git a/Assets/Editor/Scripts/export_all_project_levels.py b/Assets/Editor/Scripts/export_all_project_levels.py deleted file mode 100755 index ba900b37a8..0000000000 --- a/Assets/Editor/Scripts/export_all_project_levels.py +++ /dev/null @@ -1,78 +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 -# -# -""" -This script loads every level in a game project and exports them. You will be prompted with the standard -Check-Out/Overwrite/Cancel dialog for each level. -This is useful when there is a version update to a file that requires re-exporting. -""" -import sys, os -import azlmbr.legacy.general as general -import azlmbr.legacy.checkout_dialog as checkout_dialog - - -class CheckOutDialogEnableAll: - """ - Helper class to wrap enabling the "Apply to all" checkbox in the CheckOutDialog. - Guarantees that the old setting will be restored. - To use, do: - - with CheckOutDialogEnableAll(): - # your code here - """ - - def __init__(self): - self.old_setting = False - - def __enter__(self): - self.old_setting = checkout_dialog.enable_for_all(True) - print(self.old_setting) - - def __exit__(self, type, value, traceback): - checkout_dialog.enable_for_all(self.old_setting) - - -level_list = [] - - -def is_in_special_folder(file_full_path): - if file_full_path.find("_savebackup") >= 0: - return True - if file_full_path.find("_autobackup") >= 0: - return True - if file_full_path.find("_hold") >= 0: - return True - if file_full_path.find("_tmpresize") >= 0: - return True - - return False - - -game_folder = general.get_game_folder() - - -# Recursively search every directory in the game project for files ending with .cry and .ly -for root, dirs, files in os.walk(game_folder): - for file in files: - if file.endswith(".cry") or file.endswith(".ly"): - # The engine expects the full path of the .cry file - file_full_path = os.path.abspath(os.path.join(root, file)) - # Exclude files in special directories - if not is_in_special_folder(file_full_path): - level_list.append(file_full_path) - -# make the checkout dialog enable the 'Apply to all' checkbox -with CheckOutDialogEnableAll(): - - # For each valid .cry file found, open it in the editor and export it - for level in level_list: - if not isinstance(level, str): - # general.open_level_no_prompt expects the file path in utf8 format - level = level.encode("utf-8") - - general.open_level_no_prompt(level) - general.export_to_engine() diff --git a/Assets/Editor/Scripts/generatelod.py b/Assets/Editor/Scripts/generatelod.py deleted file mode 100755 index 618827c5b4..0000000000 --- a/Assets/Editor/Scripts/generatelod.py +++ /dev/null @@ -1,40 +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 -# -# -''' -Generates a 50% lod for the selected model - -@argument name="Lod Percentage", type="string", default="50.0f" -''' - -import sys -import time - -percentage = float(sys.argv[1]) - -selectedcgf = lodtools.getselected() -selectedmaterial = lodtools.getselectedmaterial() - -loadedmodel = lodtools.loadcgf(selectedcgf) -loadedmaterial = lodtools.loadmaterial(selectedmaterial) - -if loadedmodel == True and loadedmaterial == True: - lodtools.generatelodchain() - finished = 0.0 - while finished >= 0.0: - finished = lodtools.generatetick() - print 'Lod Chain Generation progress: ' + str(finished) - time.sleep(1) - if finished == 1.0: - break - - lodtools.createlod(1,percentage) - lodtools.generatematerials(1,512,512) - lodtools.savetextures(1) - lodtools.savesettings() - lodtools.reloadmodel() - diff --git a/Assets/Editor/Scripts/lua_symbols.py b/Assets/Editor/Scripts/lua_symbols.py deleted file mode 100644 index b21edb41d0..0000000000 --- a/Assets/Editor/Scripts/lua_symbols.py +++ /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 -# -# - - -# This script shows basic usage of LuaSymbolsReporterBus, -# Which can be used to report all symbols available for -# game scripting with Lua. - -import sys -import os - -import azlmbr.bus as azbus -import azlmbr.script as azscript -import azlmbr.legacy.general as azgeneral - - -def _dump_class_symbol(class_symbol: azlmbr.script.LuaClassSymbol): - print(f"** {class_symbol}") - print("Properties:") - for property_symbol in class_symbol.properties: - print(f" - {property_symbol}") - print("Methods:") - for method_symbol in class_symbol.methods: - print(f" - {method_symbol}") - - -def _dump_lua_classes(): - class_symbols = azscript.LuaSymbolsReporterBus(azbus.Broadcast, - "GetListOfClasses") - print("======== Classes ==========") - sorted_classes_by_named = sorted(class_symbols, key=lambda class_symbol: class_symbol.name) - for class_symbol in sorted_classes_by_named: - _dump_class_symbol(class_symbol) - print("\n\n") - - -def _dump_lua_globals(): - global_properties = azscript.LuaSymbolsReporterBus(azbus.Broadcast, - "GetListOfGlobalProperties") - print("======== Global Properties ==========") - sorted_properties_by_name = sorted(global_properties, key=lambda symbol: symbol.name) - for property_symbol in sorted_properties_by_name: - print(f"- {property_symbol}") - print("\n\n") - global_functions = azscript.LuaSymbolsReporterBus(azbus.Broadcast, - "GetListOfGlobalFunctions") - print("======== Global Functions ==========") - sorted_functions_by_name = sorted(global_functions, key=lambda symbol: symbol.name) - for function_symbol in sorted_functions_by_name: - print(f"- {function_symbol}") - print("\n\n") - - -def _dump_lua_ebus(ebus_symbol: azlmbr.script.LuaEBusSymbol): - print(f">> {ebus_symbol}") - sorted_senders = sorted(ebus_symbol.senders, key=lambda symbol: symbol.name) - for sender in sorted_senders: - print(f" - {sender}") - print("\n") - - -def _dump_lua_ebuses(): - ebuses = azscript.LuaSymbolsReporterBus(azbus.Broadcast, - "GetListOfEBuses") - print("======== Ebus List ==========") - sorted_ebuses_by_name = sorted(ebuses, key=lambda symbol: symbol.name) - for ebus_symbol in sorted_ebuses_by_name: - _dump_lua_ebus(ebus_symbol) - print("\n\n") - - -class WhatToDo: - DumpClasses = "c" - DumpGlobals = "g" - DumpEBuses = "e" - -if __name__ == "__main__": - redirecting_stdout = False - orig_stdout = sys.stdout - if len(sys.argv) > 1: - output_file_name = sys.argv[1] - if not os.path.isabs(output_file_name): - game_root_path = os.path.normpath(azgeneral.get_game_folder()) - output_file_name = os.path.join(game_root_path, output_file_name) - try: - file_obj = open(output_file_name, 'wt') - sys.stdout = file_obj - redirecting_stdout = True - except Exception as e: - print(f"Failed to open {output_file_name}: {e}") - sys.exit(-1) - - what_to_do = [action.lower() for action in sys.argv[2:]] - - # If the user did not specify what to do, then let's dump - # all the symbols. - if len(what_to_do) < 1: - what_to_do = [WhatToDo.DumpClasses, WhatToDo.DumpGlobals, WhatToDo.DumpEBuses] - - for action in what_to_do: - if action == WhatToDo.DumpClasses: - _dump_lua_classes() - elif action == WhatToDo.DumpGlobals: - _dump_lua_globals() - elif action == WhatToDo.DumpEBuses: - _dump_lua_ebuses() - - if redirecting_stdout: - sys.stdout.close() - sys.stdout = orig_stdout - print(f" Lua Symbols Are available in: {output_file_name}") diff --git a/Assets/Editor/Scripts/rename_cgf.py b/Assets/Editor/Scripts/rename_cgf.py deleted file mode 100755 index 1196c4c6a2..0000000000 --- a/Assets/Editor/Scripts/rename_cgf.py +++ /dev/null @@ -1,14 +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 -# -# -objects = general.get_all_objects("", "") # Get the name list of all objects in the level. -# If there is any object with the geometry file of "objects\\default\\primitive_box.cgf", -# change it to "objects\\default\\primitive_cube.cgf". -for obj in objects: - geometry_file = general.get_entity_geometry_file(obj) - if geometry_file == "objects\\default\\primitive_box.cgf": - general.set_entity_geometry_file(obj, "objects\\default\\primitive_cube.cgf") diff --git a/Assets/Editor/Scripts/select_story_anim_objects.py b/Assets/Editor/Scripts/select_story_anim_objects.py deleted file mode 100755 index 93021baac4..0000000000 --- a/Assets/Editor/Scripts/select_story_anim_objects.py +++ /dev/null @@ -1,14 +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 -# -# -objects = general.get_all_objects("AnimObject", "") # Get the name list of all anim objects in the level. -general.clear_selection() -# If there is any object with the geometry file whose name contains "\\story\\", select it -for obj in objects: - geometry_file = general.get_entity_geometry_file(obj) - if geometry_file.find("\\story\\") != -1: - general.select_object(obj) diff --git a/Assets/Editor/Scripts/tools_shelf_actions.py b/Assets/Editor/Scripts/tools_shelf_actions.py deleted file mode 100755 index 8b99d76e1f..0000000000 --- a/Assets/Editor/Scripts/tools_shelf_actions.py +++ /dev/null @@ -1,508 +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 -# -# -import __future__ -import time, re, os, sys, itertools, ast -import azlmbr.legacy.general as general - -global ctrlFile -ctrlFile = 'setState.txt' -global logfile -logfile = 'Editor.log' - -global HIDDEN_MASK_PREFIX -HIDDEN_MASK_PREFIX= 'hidden_mask_for_' -global HIDDEN_MASK_PREFIX_LENGTH -HIDDEN_MASK_PREFIX_LENGTH = len(HIDDEN_MASK_PREFIX) - -def getLogList(logfile): - logList = [x for x in open(logfile, 'r')] - return logList - -def getCheckList(ctrlFile): - try: - with open(ctrlFile): - stateList = open(ctrlFile, 'r') - - except: - open(ctrlFile, 'w').close() - stateList = open(ctrlFile, 'r') - - checkList = [x for x in stateList] - return checkList - -#Store/Restore CVars default values -----------------------------------------------------------------# -if 'CVARS' not in globals(): - CVARS = {} - -def saveDefaultValue(cVars, value): - if cVars not in CVARS: - CVARS[cVars] = value - -def restoreDefaultValue(cVars): - if cVars not in CVARS: - return - - defaultValue = CVARS[cVars] - del CVARS[cVars] - if cVars.startswith(HIDDEN_MASK_PREFIX): - type = cVars[HIDDEN_MASK_PREFIX_LENGTH:] - general.set_hidemask(type, defaultValue) - else: - general.set_cvar(cVars, defaultValue) - -#toggle CVars--------------------------------------------------------------------# - -def updateCvars(cVars, value): - saveDefaultValue(cVars, value) - general.set_cvar(cVars, value) - -def toggleCvarsRestartCheck(log, state, mode, cVars, onValue, offValue, ctrlFile): - if log in state: - toggleCvarsV(mode, cVars, onValue, offValue, ctrlFile) - else: - stateList = open(ctrlFile, 'w') - stateList.write(log) - stateList = open(ctrlFile, 'r') - toggleCvarsV(mode, cVars, onValue, offValue, ctrlFile) - -def toggleCvarsV(mode, cVars, onValue, offValue, ctrlFile): - stateList = open(ctrlFile, 'r') - setState = [x for x in enumerate(stateList)] - blankCheck = [x for x in setState] - getList = [x for x in stateList] - - if blankCheck == []: - stateList = open(ctrlFile, 'w') - stateList.write(''.join(str("%s,{'%s': %s}" % (mode, cVars, offValue))+'\n')) - general.set_cvar(cVars, offValue) - else: - stateList = open(ctrlFile, 'r') - checkFor = str([x for x in stateList]) - - if mode not in str(checkFor): - stateList = open(ctrlFile, 'r') - getList = [x for x in stateList] - getList.insert(1, str("%s,{'%s': %s}\n" % (mode, cVars , offValue))) - print (str("{'%s': %s}\n" % (cVars , offValue))) - stateList = open(ctrlFile, 'w') - stateList.write(''.join(getList)) - general.set_cvar(cVars, offValue) - - else: - stateList = open(ctrlFile, 'r') - for d in enumerate(stateList): - values = d[1].split(',') - stateList = open(ctrlFile, 'r') - getList = [x for x in stateList] - - if mode in values[0]: - getDict = ast.literal_eval(values[1]) - getState = getDict.get(cVars) - - if getState == offValue: - getDict[cVars] = onValue - joinStr = [mode,",",str(getDict), '\n'] - newLine = ''.join(joinStr) - print (getDict) - getList[d[0]] = newLine - stateList = open(ctrlFile, 'w') - stateList.write(''.join(str(''.join(getList)))) - general.set_cvar(cVars, onValue) - else: - getDict[cVars] = offValue - joinStr = [mode,",",str(getDict), '\n'] - newLine = ''.join(joinStr) - print (getDict) - getList[d[0]] = newLine - stateList = open(ctrlFile, 'w') - stateList.write(''.join(str(''.join(getList)))) - general.set_cvar(cVars, offValue) - -def toggleCvarsValue(mode, cVars, onValue, offValue): - currentValue = general.get_cvar(cVars) - - if type(onValue) is str: - saveDefaultValue(cVars, currentValue) - elif type(onValue) is int: - saveDefaultValue(cVars, int(currentValue)) - elif type(onValue) is float: - saveDefaultValue(cVars, float(currentValue)) - else: - general.log('Failed to store default value for {0}'.format(cVars)) - - if currentValue == str(onValue): - general.set_cvar(cVars, offValue) - else: - general.set_cvar(cVars, onValue) - -#toggleConsol--------------------------------------------------------------------# - -def toggleConsolRestartCheck(log,state, mode, onValue, offValue, ctrlFile): - if log in state: - toggleConsolV(mode, onValue, offValue, ctrlFile) - else: - stateList = open(ctrlFile, 'w') - stateList.write(log) - stateList = open(ctrlFile, 'r') - toggleConsolV(mode, onValue, offValue, ctrlFile) - -def toggleConsolV(mode, onValue, offValue): - stateList = open(ctrlFile, 'r') - setState = [x for x in enumerate(stateList)] - blankCheck = [x for x in setState] - getList = [x for x in stateList] - onOffList = [onValue, offValue] - - if blankCheck == []: - stateList = open(ctrlFile, 'w') - stateList.write(''.join(str("%s,'%s'" % (mode, offValue))+'\n')) - general.run_console(offValue) - else: - stateList = open(ctrlFile, 'r') - checkFor = str([x for x in stateList]) - - if mode not in str(checkFor): - stateList = open(ctrlFile, 'r') - getList = [x for x in stateList] - getList.insert(1, str("%s,'%s'\n" % (mode, offValue))) - print (str("{'%s': %s}\n" % (cVars , offValue))) - stateList = open(ctrlFile, 'w') - stateList.write(''.join(getList)) - general.run_console(onValue) - - else: - stateList = open(ctrlFile, 'r') - for d in enumerate(stateList): - - values = d[1].split(',') - - stateList = open(ctrlFile, 'r') - getList = [x for x in stateList] - - if mode in values[0]: - getDict = values[1] - off = ["'",str(offValue),"'", '\n'] - joinoff = ''.join(off) - - if values[1] == joinoff: - getDict = onValue - joinStr = [mode,",","'",getDict,"'", '\n'] - newLine = ''.join(joinStr) - print (getDict) - getList[d[0]] = str(newLine) - stateList = open(ctrlFile, 'w') - stateList.write(''.join(str(''.join(getList)))) - general.run_console(onValue) - else: - getDict = offValue - joinStr = [mode,",","'",getDict,"'", '\n'] - newLine = ''.join(joinStr) - print (getDict) - getList[d[0]] = str(newLine) - stateList = open(ctrlFile, 'w') - stateList.write(''.join(str(''.join(getList)))) - general.run_console(offValue) - -def toggleConsolValue(log, state, mode, onValue, offValue): - logList = getLogList(logfile) - checkList = getCheckList(ctrlFile) - toggleConsolRestartCheck(logList[1],checkList, mode, onValue, offValue, ctrlFile) - -#cycleCvars----------------------------------------------------------------------# - -def cycleCvarsRestartCheck(log, state, mode, cVars, cycleList, ctrlFile): - if log in state: - cycleCvarsV(mode, cVars, cycleList, ctrlFile) - else: - stateList = open(ctrlFile, 'w') - stateList.write(log) - stateList = open(ctrlFile, 'r') - cycleCvarsV(mode, cVars, cycleList, ctrlFile) - -def cycleCvarsV(mode, cVars, cycleList, ctrlFile): - stateList = open(ctrlFile, 'r') - setState = [x for x in enumerate(stateList)] - blankCheck = [x for x in setState] - getList = [x for x in stateList] - - if blankCheck == []: - stateList = open(ctrlFile, 'w') - stateList.write(''.join(str("%s,{'%s': %s}" % (mode, cVars, cycleList[1]))+'\n')) - general.set_cvar(cVars, cycleList[1]) - else: - stateList = open(ctrlFile, 'r') - checkFor = str([x for x in stateList]) - - if mode not in str(checkFor): - stateList = open(ctrlFile, 'r') - getList = [x for x in stateList] - getList.insert(1, str("%s,{'%s': %s}\n" % (mode, cVars , cycleList[1]))) - stateList = open(ctrlFile, 'w') - stateList.write(''.join(getList)) - general.set_cvar(cVars, cycleList[1]) - - else: - stateList = open(ctrlFile, 'r') - - for d in enumerate(stateList): - stateList = open(ctrlFile, 'r') - getList = [x for x in stateList] - values = d[1].split(',') - - if mode in values[0]: - getDict = ast.literal_eval(values[1]) - getState = getDict.get(cVars) - - cycleL = [x for x in enumerate(cycleList)] - - for x in cycleL: - if getState == x[1]: - number = [n[1] for n in cycleL] - getMax = max(number) - nextNum = x[0]+1 - - if nextNum > getMax: - getDict[cVars] = cycleList[0] - joinStr = [mode,",",str(getDict), '\n'] - newLine = ''.join(joinStr) - getList[d[0]] = newLine - print (getDict) - stateList = open(ctrlFile, 'w') - stateList.write(''.join(str(''.join(getList)))) - general.set_cvar(cVars, cycleList[0]) - else: - getDict[cVars] = cycleList[x[0]+1] - joinStr = [mode,",",str(getDict), '\n'] - newLine = ''.join(joinStr) - getList[d[0]] = newLine - print (getDict) - stateList = open(ctrlFile, 'w') - stateList.write(''.join(str(''.join(getList)))) - general.set_cvar(cVars, cycleList[x[0]+1]) - -def cycleCvarsValue(log, state, mode, cVars, cycleList): - logList = getLogList(logfile) - checkList = getCheckList(ctrlFile) - cycleCvarsRestartCheck(logList[1],checkList, mode, cVars, cycleList, ctrlFile) - -def cycleCvarsFloatValue(cVars, cycleList): - currentValueAsString = general.get_cvar(cVars) - try: - currentValue = float(currentValueAsString) - except: - currentValue = -1.0 - - saveDefaultValue(cVars, currentValue) - - # make sure we sort the list in ascending fashion - cycleList = sorted(cycleList) - - # find out what the next closest index is - newIndex = 0 - for x in cycleList: - if (currentValue < x): - break - newIndex = newIndex + 1 - - # loop around, if we need to - if newIndex >= len(cycleList): - newIndex = 0 - - general.set_cvar(cVars, cycleList[newIndex]) - - -def cycleCvarsIntValue(cVars, cycleList): - currentValueAsString = general.get_cvar(cVars) - try: - currentValue = int(currentValueAsString) - except: - currentValue = 0 - - saveDefaultValue(cVars, currentValue) - - # find out what index we're on already - # default to -1 so that when we increment to the next, we'll be at 0 - newIndex = -1 - for x in cycleList: - if (currentValue == x): - break - newIndex = newIndex + 1 - - # move to the next item - newIndex = newIndex + 1 - - # validate - if newIndex >= len(cycleList): - newIndex = 0 - - general.set_cvar(cVars, cycleList[newIndex]) - -#cycleConsol----------------------------------------------------------------------# - -def cycleConsolRestartCheck(log, state, mode, cycleList, ctrlFile): - if log in state: - cycleConsolV(mode, cycleList, ctrlFile) - else: - stateList = open(ctrlFile, 'w') - stateList.write(log) - stateList = open(ctrlFile, 'r') - cycleConsolV(mode, cycleList, ctrlFile) - -def cycleConsolV(mode, cycleList, ctrlFile): - stateList = open(ctrlFile, 'r') - setState = [x for x in enumerate(stateList)] - blankCheck = [x for x in setState] - getList = [x for x in stateList] - - if blankCheck == []: - stateList = open(ctrlFile, 'w') - stateList.write(''.join(str("%s,'%s'" % (mode, cycleList[0]))+'\n')) - general.run_console(cycleList[0]) - else: - stateList = open(ctrlFile, 'r') - checkFor = str([x for x in stateList]) - - if mode not in str(checkFor): - stateList = open(ctrlFile, 'r') - getList = [x for x in stateList] - getList.insert(1, str("%s,'%s'\n" % (mode, cycleList[0]))) - stateList = open(ctrlFile, 'w') - stateList.write(''.join(getList)) - general.run_console(cycleList[0]) - - else: - stateList = open(ctrlFile, 'r') - for d in enumerate(stateList): - stateList = open(ctrlFile, 'r') - getList = [x for x in stateList] - values = d[1].split(',') - - if mode in values[0]: - newValue = ''.join(values[1].split('\n')) - cycleL = [e for e in enumerate(cycleList)] - getDict = ''.join(values[1].split('\n')) - - for x in cycleL: - - if newValue in "'%s'" % x[1]: - number = [n[0] for n in cycleL] - getMax = max(number) - nextNum = x[0]+1 - - if nextNum > getMax: - getDict = '%s' % cycleList[0] - joinStr = [mode,",","'",getDict,"'", '\n'] - newLine = ''.join(joinStr) - getList[d[0]] = newLine - print (getDict) - stateList = open(ctrlFile, 'w') - stateList.write(''.join(str(''.join(getList)))) - general.run_console(getDict) - else: - getDict = '%s' % cycleList[x[0]+1] - joinStr = [mode,",","'",getDict,"'", '\n'] - newLine = ''.join(joinStr) - getList[d[0]] = newLine - print (getDict) - stateList = open(ctrlFile, 'w') - stateList.write(''.join(str(''.join(getList)))) - general.run_console(getDict) - -def cycleConsolValue(mode, cycleList): - logList = getLogList(logfile) - checkList = getCheckList(ctrlFile) - cycleConsolRestartCheck(logList[1],checkList, mode, cycleList, ctrlFile) - -def toggleHideMaskValues(type): - cVars = "%s%s" % (HIDDEN_MASK_PREFIX, type) - currentValue = general.get_hidemask(type) - saveDefaultValue(cVars, int(currentValue)) - if (currentValue): - general.set_hidemask(type, 0) - else: - general.set_hidemask(type, 1) - -#toggleHide------------------------------------------------------------------------# - -def toggleHideRestartCheck(log, state, mode, type, onValue, offValue, ctrlFile): - if log in state: - toggleHideByT(mode, type, onValue, offValue, ctrlFile) - else: - stateList = open(ctrlFile, 'w') - stateList.write(log) - stateList = open(ctrlFile, 'r') - toggleHideByT(mode, type, onValue, offValue, ctrlFile) - -def toggleHideByType(mode, type, onValue, offValue): - logList = getLogList(logfile) - checkList = getCheckList(ctrlFile) - toggleHideRestartCheck(logList[1],checkList, mode, type, onValue, offValue, ctrlFile) - -def toggleHideByT(mode, type, onValue, offValue, ctrlFile): - stateList = open(ctrlFile, 'r') - setState = [x for x in enumerate(stateList)] - blankCheck = [x for x in setState] - getList = [x for x in stateList] - - if blankCheck == []: - stateList = open(ctrlFile, 'w') - stateList.write(''.join(str("%s,{'%s': %s}" % (mode, type, offValue))+'\n')) - - hideByType(type) - else: - stateList = open(ctrlFile, 'r') - checkFor = str([x for x in stateList]) - - if mode not in str(checkFor): - stateList = open(ctrlFile, 'r') - getList = [x for x in stateList] - getList.insert(1, str("%s,{'%s': %s}\n" % (mode, type , offValue))) - print (str("{'%s': %s}\n" % (type , offValue))) - stateList = open(ctrlFile, 'w') - stateList.write(''.join(getList)) - hideByType(type) - - else: - stateList = open(ctrlFile, 'r') - for d in enumerate(stateList): - values = d[1].split(',') - stateList = open(ctrlFile, 'r') - getList = [x for x in stateList] - - if mode in values[0]: - getDict = ast.literal_eval(values[1]) - getState = getDict.get(type) - - if getState == offValue: - getDict[type] = onValue - joinStr = [mode,",",str(getDict), '\n'] - newLine = ''.join(joinStr) - print (getDict) - getList[d[0]] = newLine - stateList = open(ctrlFile, 'w') - stateList.write(''.join(str(''.join(getList)))) - unHideByType(type) - else: - getDict[type] = offValue - joinStr = [mode,",",str(getDict), '\n'] - newLine = ''.join(joinStr) - print (getDict) - getList[d[0]] = newLine - stateList = open(ctrlFile, 'w') - stateList.write(''.join(str(''.join(getList)))) - hideByType(type) - -def hideByType(type): - typeList = general.get_all_objects(str(type), "") - for x in typeList: - general.hide_object(x) - -def unHideByType(type): - typeList = general.get_all_objects(str(type), "") - for x in typeList: - general.unhide_object(x) From aac540c02282bb17a27a3088eaead2dfed6133d3 Mon Sep 17 00:00:00 2001 From: AMZN-AlexOteiza <82234181+AMZN-AlexOteiza@users.noreply.github.com> Date: Mon, 29 Nov 2021 17:00:48 +0000 Subject: [PATCH 20/58] Re-enabled prefab tests (#5867) * Re-enabled prefab tests * Added missing lib for linux --- .../Code/Source/Platform/Linux/InitializeEmbeddedPyside2.h | 4 ++++ scripts/build/Platform/Linux/build_config.json | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Gems/QtForPython/Code/Source/Platform/Linux/InitializeEmbeddedPyside2.h b/Gems/QtForPython/Code/Source/Platform/Linux/InitializeEmbeddedPyside2.h index 094a4f8548..dfdf2a66dc 100644 --- a/Gems/QtForPython/Code/Source/Platform/Linux/InitializeEmbeddedPyside2.h +++ b/Gems/QtForPython/Code/Source/Platform/Linux/InitializeEmbeddedPyside2.h @@ -15,6 +15,7 @@ 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"; + const char* s_libQt5TestLibraryFile = "libQt5Test.so.5"; class InitializeEmbeddedPyside2 { @@ -24,9 +25,11 @@ namespace QtForPython m_libPythonLibraryFile = InitializeEmbeddedPyside2::LoadModule(s_libPythonLibraryFile); m_libPyside2LibraryFile = InitializeEmbeddedPyside2::LoadModule(s_libPyside2LibraryFile); m_libShibokenLibraryFile = InitializeEmbeddedPyside2::LoadModule(s_libShibokenLibraryFile); + m_libQt5TestLibraryFile = InitializeEmbeddedPyside2::LoadModule(s_libQt5TestLibraryFile); } virtual ~InitializeEmbeddedPyside2() { + InitializeEmbeddedPyside2::UnloadModule(m_libQt5TestLibraryFile); InitializeEmbeddedPyside2::UnloadModule(m_libShibokenLibraryFile); InitializeEmbeddedPyside2::UnloadModule(m_libPyside2LibraryFile); InitializeEmbeddedPyside2::UnloadModule(m_libPythonLibraryFile); @@ -56,5 +59,6 @@ namespace QtForPython void* m_libPythonLibraryFile; void* m_libPyside2LibraryFile; void* m_libShibokenLibraryFile; + void* m_libQt5TestLibraryFile; }; } // namespace QtForPython diff --git a/scripts/build/Platform/Linux/build_config.json b/scripts/build/Platform/Linux/build_config.json index 84d1726d47..db9e2e7b8a 100644 --- a/scripts/build/Platform/Linux/build_config.json +++ b/scripts/build/Platform/Linux/build_config.json @@ -83,7 +83,7 @@ "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", + "CTEST_OPTIONS": "-E (AutomatedTesting::Atom_TestSuite_Main|AutomatedTesting::TerrainTests_Main|Gem::EMotionFX.Editor.Tests) -L (SUITE_smoke|SUITE_main) -LE (REQUIRES_gpu) --no-tests=error", "TEST_RESULTS": "True" } }, @@ -96,7 +96,7 @@ "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", + "CTEST_OPTIONS": "-E (AutomatedTesting::Atom_TestSuite_Main|AutomatedTesting::TerrainTests_Main|Gem::EMotionFX.Editor.Tests) -L (SUITE_smoke|SUITE_main) -LE (REQUIRES_gpu) --no-tests=error", "TEST_RESULTS": "True" } }, From a3835d8545978baeaf24ea1c0bdf5cc8904f2231 Mon Sep 17 00:00:00 2001 From: AMZN-stankowi <4838196+AMZN-stankowi@users.noreply.github.com> Date: Mon, 29 Nov 2021 09:47:28 -0800 Subject: [PATCH 21/58] updated missing dependency tests to use assets that aren't deprecated (#5916) * Updated missing dependency test to use assets that will have their builders change less often: other missing dependency test assets. Signed-off-by: AMZN-stankowi <4838196+AMZN-stankowi@users.noreply.github.com> * Updated missing dependency tests to use assets that aren't deprecated or removed. Signed-off-by: AMZN-stankowi <4838196+AMZN-stankowi@users.noreply.github.com> --- .../ap_missing_dependency_fixture.py | 13 +-- .../missing_dependency_tests.py | 84 ++++++++++--------- .../RelativeProductPathsNotDependencies.txt | 24 +++--- .../RelativeSourcePathsNotDependencies.txt | 4 +- .../TestAssets/ValidAssetIdNotDependency.txt | 4 +- .../TestAssets/ValidUUIDsNotDependency.txt | 25 +++--- 6 files changed, 81 insertions(+), 73 deletions(-) diff --git a/AutomatedTesting/Gem/PythonTests/assetpipeline/ap_fixtures/ap_missing_dependency_fixture.py b/AutomatedTesting/Gem/PythonTests/assetpipeline/ap_fixtures/ap_missing_dependency_fixture.py index 857d91bb12..7f7f420fd0 100755 --- a/AutomatedTesting/Gem/PythonTests/assetpipeline/ap_fixtures/ap_missing_dependency_fixture.py +++ b/AutomatedTesting/Gem/PythonTests/assetpipeline/ap_fixtures/ap_missing_dependency_fixture.py @@ -183,23 +183,26 @@ def ap_missing_dependency_fixture(request, workspace, ap_setup_fixture) -> Any: :return: None """ logger.info(f"Searching output for expected dependencies for product {product}") + sorted_expected = sorted(expected_dependencies) # Check dependencies found either in the log or console output for product_name, missing_deps in self.extract_missing_dependencies_from_output(log_output).items(): if product in product_name: + sorted_missing = sorted(missing_deps) # fmt:off - assert sorted(missing_deps) == sorted(expected_dependencies), \ + assert sorted_expected == sorted_missing, \ f"Missing dependencies for '{product_name}' did not match expected. Expected: " \ - f"{expected_dependencies}, Actual: {missing_deps}" + f"{sorted_expected}, Actual: {sorted_missing}" # fmt:on # Check dependencies found in Database for product_name, missing_deps in self.extract_missing_dependencies_from_database(product, platforms).items(): if product.replace("\\", "/") in product_name: + sorted_missing = sorted(missing_deps) # fmt:off - assert sorted(expected_dependencies) == sorted(missing_deps), \ - f"Product '{product_name}' expected missing dependencies: {expected_dependencies}; " \ - f"actual missing dependencies {missing_deps}" + assert sorted_expected == sorted_missing, \ + f"Product '{product_name}' expected missing dependencies: {sorted_expected}; " \ + f"actual missing dependencies {sorted_missing}" # fmt:on def __getitem__(self, item: str) -> object: diff --git a/AutomatedTesting/Gem/PythonTests/assetpipeline/asset_processor_tests/missing_dependency_tests.py b/AutomatedTesting/Gem/PythonTests/assetpipeline/asset_processor_tests/missing_dependency_tests.py index 7159b2e83f..52321fceea 100755 --- a/AutomatedTesting/Gem/PythonTests/assetpipeline/asset_processor_tests/missing_dependency_tests.py +++ b/AutomatedTesting/Gem/PythonTests/assetpipeline/asset_processor_tests/missing_dependency_tests.py @@ -120,31 +120,29 @@ class TestsMissingDependencies_WindowsAndMac(object): # Relative path to the txt file with missing dependencies expected_product = f"testassets\\validuuidsnotdependency.txt" - self._asset_processor.add_source_folder_assets(f"{self._workspace.project}\\Objects\\LumberTank") - self._asset_processor.add_source_folder_assets(f"{self._workspace.project}\\Objects\\Characters\\Jack") # Expected missing dependencies expected_dependencies = [ # String Asset # - ('1CB10C43F3245B93A294C602ADEF95F9:[0', '{1CB10C43-F324-5B93-A294-C602ADEF95F9}:0'), + # InvalidAssetIdNoReport.txt + ('E68A85B0-131D-5A82-B2D5-BC58EE4062AE', '{E68A85B0-131D-5A82-B2D5-BC58EE4062AE}:0'), + # InvalidRelativePathsNoReport.txt + ('B3EF12DD306C520EB0A8A6B0D031A195', '{B3EF12DD-306C-520E-B0A8-A6B0D031A195}:0'), + # SelfReferenceUUID.txt ('33bcee02F3225688ABEE534F6058593F', '{33BCEE02-F322-5688-ABEE-534F6058593F}:0'), - ('345E5C660D6254FF8D0F7C8EE66A2249', '{345E5C66-0D62-54FF-8D0F-7C8EE66A2249}:3e8'), - ('345E5C660D6254FF8D0F7C8EE66A2249', '{345E5C66-0D62-54FF-8D0F-7C8EE66A2249}:3ea'), - ('345E5C660D6254FF8D0F7C8EE66A2249', '{345E5C66-0D62-54FF-8D0F-7C8EE66A2249}:3eb'), - ('37108522F50459499CD6C8D47A960CF1', '{37108522-F504-5949-9CD6-C8D47A960CF1}:3e8'), - ('37108522F50459499CD6C8D47A960CF1', '{37108522-F504-5949-9CD6-C8D47A960CF1}:3ea'), - ('37108522F50459499CD6C8D47A960CF1', '{37108522-F504-5949-9CD6-C8D47A960CF1}:3eb'), - ('6BDE282B49C957F7B0714B26579BCA9A', '{6BDE282B-49C9-57F7-B071-4B26579BCA9A}:0'), - ('747D31D71E62553592226173C49CF97E', '{747D31D7-1E62-5535-9222-6173C49CF97E}:1'), - ('747D31D71E62553592226173C49CF97E', '{747D31D7-1E62-5535-9222-6173C49CF97E}:2'), - ('A26C73D1837E5AE59E68F916FA7C3699', '{A26C73D1-837E-5AE5-9E68-F916FA7C3699}:3e8'), - ('A26C73D1837E5AE59E68F916FA7C3699', '{A26C73D1-837E-5AE5-9E68-F916FA7C3699}:3ea'), - ('A26C73D1837E5AE59E68F916FA7C3699', '{A26C73D1-837E-5AE5-9E68-F916FA7C3699}:3eb'), - ('B076CDDC-14DF-50F4-A5E9-7518ABB3E851', '{B076CDDC-14DF-50F4-A5E9-7518ABB3E851}:0'), - ('C67BEA9F-09FF-59AA-A7F0-A52B8F987508', '{C67BEA9F-09FF-59AA-A7F0-A52B8F987508}:3e8'), - ('C67BEA9F-09FF-59AA-A7F0-A52B8F987508', '{C67BEA9F-09FF-59AA-A7F0-A52B8F987508}:3ea'), - ('C67BEA9F-09FF-59AA-A7F0-A52B8F987508', '{C67BEA9F-09FF-59AA-A7F0-A52B8F987508}:3eb'), - ('C67BEA9F-09FF-59AA-A7F0-A52B8F987508', '{C67BEA9F-09FF-59AA-A7F0-A52B8F987508}:3ec'), - ('D92C4661C8985E19BD3597CB2318CFA6:[0', '{D92C4661-C898-5E19-BD35-97CB2318CFA6}:0'), + # SelfReferencePath.txt + ('DD587FBE-16C8-5B98-AE3C-A9F8750B2692', '{DD587FBE-16C8-5B98-AE3C-A9F8750B2692}:0'), + # InvalidUUIDNoReport.txt + ('837412DF-D05F-576D-81AA-ACF360463749', '{837412DF-D05F-576D-81AA-ACF360463749}:0'), + # MaxIteration31Deep.txt + ('3F642A0FDC825696A70A1DA5709744DF', '{3F642A0F-DC82-5696-A70A-1DA5709744DF}:0'), + # OnlyMatchesCorrectLengthUUIDs.txt + ('2545AD8B-1B9B-5F93-859D-D8DC1DC2B480', '{2545AD8B-1B9B-5F93-859D-D8DC1DC2B480}:0'), + # WildcardScanTest1.txt + ('1CB10C43F3245B93A294C602ADEF95F9:[0', '{1CB10C43-F324-5B93-A294-C602ADEF95F9}:0'), + # RelativeProductPathsNotDependencies.txt + ('B772953CA08A5D209491530E87D11504:[0', '{B772953C-A08A-5D20-9491-530E87D11504}:0'), + # WildcardScanTest2.txt + ('D92C4661C8985E19BD3597CB2318CFA6', '{D92C4661-C898-5E19-BD35-97CB2318CFA6}:0'), ] self.do_missing_dependency_test(expected_product, expected_dependencies, "%ValidUUIDsNotDependency.txt") @@ -187,8 +185,11 @@ class TestsMissingDependencies_WindowsAndMac(object): # Expected missing dependencies expected_dependencies = [ # String Asset # - ('2ef92b8D044E5C278E2BB1AC0374A4E7:1003', '{2EF92B8D-044E-5C27-8E2B-B1AC0374A4E7}:3eb'), + # _dev_Red.tif + ('2ef92b8D044E5C278E2BB1AC0374A4E7:1000', '{2EF92B8D-044E-5C27-8E2B-B1AC0374A4E7}:3e8'), + # _dev_Purple.tif ('A2482826-053D-5634-A27B-084B1326AAE5}:[1002', '{A2482826-053D-5634-A27B-084B1326AAE5}:3ea'), + # _dev_White.tif ('D83B36F1-61A6-5001-B191-4D0CE282E236}-1002', '{D83B36F1-61A6-5001-B191-4D0CE282E236}:3ea'), ] @@ -237,11 +238,10 @@ class TestsMissingDependencies_WindowsAndMac(object): expected_dependencies = [ # String Asset # ('TestAssets\\WildcardScanTest1.txt', '{1CB10C43-F324-5B93-A294-C602ADEF95F9}:0'), - ('libs/particles/milestone2PARTICLES.XML', '{6BDE282B-49C9-57F7-B071-4B26579BCA9A}:0'), + ('TESTASSETS/ReportONEmISSINGdEPENDENCY.tXT', '{BE5E2373-245E-59E4-B4C6-7370EEAA2EFD}:0'), ('textures/_dev_Purple.tif', '{A2482826-053D-5634-A27B-084B1326AAE5}:3e8'), ('textures/_dev_Purple.tif', '{A2482826-053D-5634-A27B-084B1326AAE5}:3ea'), - ('textures/_dev_Purple.tif', '{A2482826-053D-5634-A27B-084B1326AAE5}:3eb'), - ('project.json', '{B076CDDC-14DF-50F4-A5E9-7518ABB3E851}:0'), + ('TestAssets/InvalidAssetIdNoReport.txt', '{E68A85B0-131D-5A82-B2D5-BC58EE4062AE}:0'), ('TestAssets/RelativeProductPathsNotDependencies.txt', '{B772953C-A08A-5D20-9491-530E87D11504}:0'), ] @@ -282,29 +282,31 @@ class TestsMissingDependencies_WindowsAndMac(object): 2. Set the expected missing dependencies 3. Execute test """ - - self._asset_processor.add_source_folder_assets(f"Gems\\LyShineExamples\\Assets\\UI\\Fonts\\LyShineExamples") - self._asset_processor.add_scan_folder(f"Gems\\LyShineExamples\\Assets") # Relative path to the txt file with missing dependencies as product paths expected_product = f"testassets\\relativeproductpathsnotdependencies.txt" expected_dependencies = [ # String Asset # - ('materials/floor_tile.mtl', '{0EFF5E4A-F544-5D87-8696-6DDFA62D6063}:0'), - ('materials/am_grass1.mtl', '{1151F14D-38A6-5579-888A-BE3139882E68}:0'), - ('2ef92b8D044E5C278E2BB1AC0374A4E7:1002', '{2EF92B8D-044E-5C27-8E2B-B1AC0374A4E7}:3ea'), - ('textures/milestone2/ama_grey_02.tif.streamingimage', '{3EE80AAD-EB9C-56BD-9E9C-65410578998C}:3e8'), - ('ui/milestone2menu.uicanvas', '{445D9AF3-6CA5-5281-82A9-5C570BCD1DB8}:0'), - ('libs/particles/milestone2particles.xml', '{6BDE282B-49C9-57F7-B071-4B26579BCA9A}:0'), - ('textures/_dev_yellow_light.tif.1002.imagemipchain', '{6C40868F-3FC1-5115-96EA-DD0A9E33DEE4}:3ea'), - ('textures\\\\_dev_tan.tif.streamingimage', '{8F2BCEF5-C8CE-5B80-8103-8C1D694D012C}:3e8'), - ('materials/am_rockground.mtl', '{A1DA3D05-A020-5BB5-A608-C4812B7BD733}:0'), ('textures/_dev_purple.tif.streamingimage', '{A2482826-053D-5634-A27B-084B1326AAE5}:3e8'), - ('A2482826-053D-5634-A27B-084B1326AAE5}:[1002', '{A2482826-053D-5634-A27B-084B1326AAE5}:3ea'), - ('project.json', '{B076CDDC-14DF-50F4-A5E9-7518ABB3E851}:0'), - ('CEAA362B4E505BCEB827CB92EF40A50E', '{CEAA362B-4E50-5BCE-B827-CB92EF40A50E}:1'), - ('CEAA362B4E505BCEB827CB92EF40A50E', '{CEAA362B-4E50-5BCE-B827-CB92EF40A50E}:2'), + ('textures\\_dev_stucco.tif.streamingimage', '{70114D85-D712-5AEB-A816-8FE3A37087AF}:3e8'), + ('textures\\\\_dev_tan.tif.streamingimage', '{8F2BCEF5-C8CE-5B80-8103-8C1D694D012C}:3e8'), ('TEXTURES/_DEV_WHITE.tif.streamingimage', '{D83B36F1-61A6-5001-B191-4D0CE282E236}:3e8'), + ('textures/_dev_yellow_light.tif.1002.imagemipchain', '{6C40868F-3FC1-5115-96EA-DD0A9E33DEE4}:3ea'), + ('textures/_dev_woodland.tif.1002.imagemipchain', '{F3DD193C-5845-569C-A974-AA338B30CF86}:3ea'), ('textures/_dev_woodland.tif.streamingimage', '{F3DD193C-5845-569C-A974-AA338B30CF86}:3e8'), + ('textures/_dev_yellow_light.tif.streamingimage', '{6C40868F-3FC1-5115-96EA-DD0A9E33DEE4}:3e8'), + ('textures/_dev_yellow_med.tif.1002.imagemipchain', '{BB4DFF57-52BD-525B-9628-68232E31802C}:3ea'), + ('textures/lights/flare01.tif.streamingimage', '{D8E49CC4-C743-5F31-A1EC-4AA89163B8F5}:3e8'), + # SelfReferenceUUID.txt + ('33BCEE02-F322-5688-ABEE-534F6058593F', '{33BCEE02-F322-5688-ABEE-534F6058593F}:0'), + ('textures/test_texture_sequence/test_texture_sequence000.png.streamingimage', '{6CC90BEE-0A9F-57A8-9013-7C1D643C0E8E}:3e8'), + # _dev_red.tif.streamingimage + ('2ef92b8D044E5C278E2BB1AC0374A4E7:1002', '{2EF92B8D-044E-5C27-8E2B-B1AC0374A4E7}:3ea'), + # SelfReferenceAssetID.txt + ('785A05D2-483E-5B43-A2B9-92ACDAE6E938', '{785A05D2-483E-5B43-A2B9-92ACDAE6E938}:0'), + ('textures/test_texture_sequence/test_texture_sequence001.png.streamingimage', '{8A8A37DD-01B9-5D70-92E4-925E2C0FE826}:3e8'), + # _dev_purple.tif.1002.imagemipchain + ('A2482826-053D-5634-A27B-084B1326AAE5}:[1002', '{A2482826-053D-5634-A27B-084B1326AAE5}:3ea'), + ('textures/_dev_purple_glass.tif.1002.imagemipchain', '{2FCDD831-77D1-5BE1-A4C8-CA47E4F89F19}:3ea'), ] self.do_missing_dependency_test(expected_product, expected_dependencies, diff --git a/AutomatedTesting/TestAssets/RelativeProductPathsNotDependencies.txt b/AutomatedTesting/TestAssets/RelativeProductPathsNotDependencies.txt index d3975ced7c..8084defe84 100644 --- a/AutomatedTesting/TestAssets/RelativeProductPathsNotDependencies.txt +++ b/AutomatedTesting/TestAssets/RelativeProductPathsNotDependencies.txt @@ -2,24 +2,24 @@ These tests are mostly done with files that have a different extension between s The source scan is done first, and will catch files in the source path. Product path searching is resolved using "endsWith" logic. textures/_dev_purple.tif.streamingimage -Back slashes, and project name in the path -pc/textures/_dev_stucco.tif.streamingimage +Back slashes +textures\_dev_stucco.tif.streamingimage Double back slashes textures\\_dev_tan.tif.streamingimage Casing doesn't match TEXTURES/_DEV_WHITE.tif.streamingimage Some files have multiple extensions, this verifies that won't trip up the scanner. textures/_dev_yellow_light.tif.1002.imagemipchain -Path inline textures/milestone2/ama_grey_02.tif.streamingimage test +Path inline textures/_dev_woodland.tif.1002.imagemipchain test Path after=textures/_dev_woodland.tif.streamingimage equal sign Multiple paths on one line -Multiple materials/am_grass1.mtl paths materials/am_rockground.mtl on one line -Path before a UUID -Path materials/floor_tile.mtl before B92667DC-9F5B-5D72-A29D-99219DD9B691 a UUID -Path before an asset ID -Path ui/milestone2menu.uicanvas before an 2ef92b8D044E5C278E2BB1AC0374A4E7:1002 asset ID -Path after a UUID -Path after CEAA362B4E505BCEB827CB92EF40A50E a project.json UUID -Path after an asset ID -Path after {A2482826-053D-5634-A27B-084B1326AAE5}:[1002] an libs/particles/milestone2particles.xml asset ID +Multiple textures/_dev_yellow_light.tif.streamingimage paths textures/_dev_yellow_med.tif.1002.imagemipchain on one line +Path before a UUID for SelfReferenceUUID text file +Path textures/lights/flare01.tif.streamingimage before 33BCEE02-F322-5688-ABEE-534F6058593F a UUID +Path before an asset ID for _dev_red image +Path textures/test_texture_sequence/test_texture_sequence000.png.streamingimage before an 2ef92b8D044E5C278E2BB1AC0374A4E7:1002 asset ID +Path after a UUID for SelfReferenceAssetID text file +Path after 785A05D2-483E-5B43-A2B9-92ACDAE6E938 a textures/test_texture_sequence/test_texture_sequence001.png.streamingimage UUID +Path after an asset ID for _dev_purple image file +Path after {A2482826-053D-5634-A27B-084B1326AAE5}:[1002] an textures/_dev_purple_glass.tif.1002.imagemipchain asset ID diff --git a/AutomatedTesting/TestAssets/RelativeSourcePathsNotDependencies.txt b/AutomatedTesting/TestAssets/RelativeSourcePathsNotDependencies.txt index a5ae046b11..df3bcc896e 100644 --- a/AutomatedTesting/TestAssets/RelativeSourcePathsNotDependencies.txt +++ b/AutomatedTesting/TestAssets/RelativeSourcePathsNotDependencies.txt @@ -3,6 +3,6 @@ TestAssets/RelativeProductPathsNotDependencies.txt Back slashes TestAssets\WildcardScanTest1.txt Casing doesn't match -libs/particles/milestone2PARTICLES.XML -Path inline project.json test +TESTASSETS/ReportONEmISSINGdEPENDENCY.tXT +Path inline TestAssets/InvalidAssetIdNoReport.txt test Path after=textures/_dev_Purple.tif equal sign diff --git a/AutomatedTesting/TestAssets/ValidAssetIdNotDependency.txt b/AutomatedTesting/TestAssets/ValidAssetIdNotDependency.txt index 4cda459232..0b9df7c99d 100644 --- a/AutomatedTesting/TestAssets/ValidAssetIdNotDependency.txt +++ b/AutomatedTesting/TestAssets/ValidAssetIdNotDependency.txt @@ -1,5 +1,7 @@ +File extensions are separated from file names, so the missing dependency scanner doesn't find when scanning, and only finds the asset IDs in this file. + /textures /_dev_Purple . tif, the product ID is for one of the mips. {A2482826-053D-5634-A27B-084B1326AAE5}:[1002] _dev_Red . tif, another mip, different formatting. -2ef92b8D044E5C278E2BB1AC0374A4E7:1003 +2ef92b8D044E5C278E2BB1AC0374A4E7:1000 _dev_White.tif, {D83B36F1-61A6-5001-B191-4D0CE282E236}-1002 asset ID inline. diff --git a/AutomatedTesting/TestAssets/ValidUUIDsNotDependency.txt b/AutomatedTesting/TestAssets/ValidUUIDsNotDependency.txt index 436d6fb628..91c518ef2f 100644 --- a/AutomatedTesting/TestAssets/ValidUUIDsNotDependency.txt +++ b/AutomatedTesting/TestAssets/ValidUUIDsNotDependency.txt @@ -1,18 +1,19 @@ Paths are broken up to avoid having them show up as relative path results. +All references are to other text files in this folder, extensions are omitted to make sure only UUID scanning finds these references. -This is the UUID for Materials / Default / AM_UV_v1_1K_source . png -C67BEA9F-09FF-59AA-A7F0-A52B8F987508 -This is the UUID for libs / particles / milestone2particles . xml. This tests UUIDs without separators. -6BDE282B49C957F7B0714B26579BCA9A -This is the UUID for SelfReferenceUUID.txt. This tests UUIDs with mixed casing. +This is the UUID for InvalidAssetIdNoReport +E68A85B0-131D-5A82-B2D5-BC58EE4062AE +This is the UUID for InvalidRelativePathsNoReport. This tests UUIDs without separators. +B3EF12DD306C520EB0A8A6B0D031A195 +This is the UUID for SelfReferenceUUID. This tests UUIDs with mixed casing. 33bcee02F3225688ABEE534F6058593F -This is a UUID mid-line B076CDDC-14DF-50F4-A5E9-7518ABB3E851, for project . json +This is a UUID mid-line DD587FBE-16C8-5B98-AE3C-A9F8750B2692, for SelfReferencePath -Two UUIDs on the same line -Two UUIDs 345E5C660D6254FF8D0F7C8EE66A2249 mixed on A26C73D1837E5AE59E68F916FA7C3699 the same line +InvalidUUIDNoReport and MaxIteration31Deep +Two UUIDs 837412DF-D05F-576D-81AA-ACF360463749 mixed on 3F642A0FDC825696A70A1DA5709744DF the same line Test UUIDs and Asset IDs mixed on the same line. Relative paths are handled in the relative path tests. -UUID: slices / MuzzleFlash . slice, AssetID: TestsAssets / WildcardScanTest1 . txt -This 747D31D71E62553592226173C49CF97E uuid is on the line with 1CB10C43F3245B93A294C602ADEF95F9:[0] a valid asset ID -UUID: Objects / Lumbertank_turret . cgf, AssetID: TestsAssets / WildcardScanTest2 . txt -This D92C4661C8985E19BD3597CB2318CFA6:[0] uuid is on the line with 37108522F50459499CD6C8D47A960CF1 a valid asset ID +OnlyMatchesCorrectLengthUUIDs and WildcardScanTest1 +This 2545AD8B-1B9B-5F93-859D-D8DC1DC2B480 uuid is on the line with 1CB10C43F3245B93A294C602ADEF95F9:[0] a valid asset ID +RelativeProductPathsNotDependencies and WildcardScanTest2 +This B772953CA08A5D209491530E87D11504:[0] uuid is on the line with D92C4661C8985E19BD3597CB2318CFA6 a valid asset ID From 56904d17991d866d818ec0c773e392c541634b04 Mon Sep 17 00:00:00 2001 From: Artur K <96597+nemerle@users.noreply.github.com> Date: Mon, 29 Nov 2021 19:21:06 +0100 Subject: [PATCH 22/58] Cry Legacy: the Lessening (#5961) * Generic Cleanup Removals: * Unused cvars,member variables and defines * Windows media center edition support routines * CSystem - removed debug_GetCallStackRaw/GetRootWindowMessageHandler/ UnloadDLL/ShutdownModuleLibraries Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com> * Fix CryMessageBox return values in Windows build Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com> * Remove named selection group and a few smaller unused functionalities Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com> * Remove ObjectManager export functionality + 2 deprecated functions Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com> * Remove object legacy freeze/hide support from ObjectManager Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com> * Remove ObjectManager duplicate name dection, as well as object renaming Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com> * Remove ObjectManager serialization and selection callbacks Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com> * ObjectManager - remove MoveObjects/HitTestObject/EndEditParams and related members/functions Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com> * Remove a bunch of unused clone related functionality + misc Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com> * ObjectManager - misc removals Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com> * ObjectManager - more removals Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com> * Remove unused object selection/retrieval in ObjectManager and LoadObjects in ObjectLoader Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com> * CBaseObject - remove unused material layers mask support Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com> * More CBaseObject cleanups. Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com> * CBaseObject - remove SubObj functions and IMouseCreateCallback Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com> * Remove unused procedural floor management, helper scale and tags. Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com> * CBaseObject - remove more unused methods. Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com> * Removals in multiple places. CBaseObject - unused `OBJTYPE_DUMMY` flag removed, member `IsSameClass` CObjectArchive removed unused methods/members CObjectManager removed unused `Update` method Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com> * More removals IDisplayViewport - HitTestLine/GetGridStep/setHitcontext/ GetConstructionPlane Unused Cry_Matrix44 template specializations. Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com> * 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> Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com> * Adding missing C++20 std::erase implementations (#5735) There were already implementations for std::erase_if. This adds the counterpart AZStd::erase versions resolves #5734 Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com> Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com> * More removals and refactors `ShowMessage` and `CryMessageBox` return void now Simplify code in `CSystem::WarningV` Remove unused `CryGetTicksPerSec` Remove unused WinBase functionality Replace `nanosleep` call in WinBase with `std::this_thread::sleep_for` Remove unused Win32Wrapper routines Remove unused IFunctorBase.h and IEntityObjectListener.h Fix VectorAndArray.cpp compilation Use QMessageBox instead of CryMessageBox in the editor. Remove empty ArchiveVars platform specific files Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com> * Fix test code. Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com> * Remove an unused function Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com> * CBaseObject and undo description removals. Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com> * A bunch of removals * Remove IRenderNode * Remove editor's KDTree * Remove StatObjBus, InstanceStatObjEventBus::ReleaseData is redundant ( same functionality in the only available handler is triggered by `OnCryEditorCloseScene`) * Remove CExportManager::AddStatObj/AddMeshes/AddMesh, IExportManager::ExportSingleStatObj * Remove CIconManager/IIconManager::GetObject * Remove CBaseObject::IntersectRayMesh * Remove IIndexedMesh and related structs. * Unused IUndoObject::GetDescription and all derived implementations. * Unused CUndoBaseLibrary/CUndoBaseLibraryManager * Unused Matrix34_tpl typedefs * Legacy Xml classes cleanup Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com> * Remove unused `Vec3ToVector3D` helper Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com> * fix - remove unused static variable Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com> Co-authored-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com> --- .../ObjectManagerCommands_test_case.py | 24 - Code/Editor/BaseLibrary.cpp | 60 - Code/Editor/BaseLibraryItem.cpp | 12 - Code/Editor/BaseLibraryManager.cpp | 114 -- Code/Editor/Controls/SplineCtrlEx.cpp | 1 - Code/Editor/CryEdit.cpp | 3 +- Code/Editor/CryEditDoc.cpp | 22 - Code/Editor/CryEditDoc.h | 4 - Code/Editor/EditorViewportWidget.cpp | 3 - Code/Editor/Export/ExportManager.cpp | 232 +-- Code/Editor/Export/ExportManager.h | 7 - Code/Editor/GameEngine.cpp | 8 +- Code/Editor/GameEngine.h | 8 - Code/Editor/GameExporter.cpp | 10 +- Code/Editor/IEditor.h | 2 - Code/Editor/IEditorImpl.cpp | 12 - Code/Editor/IEditorImpl.h | 1 - Code/Editor/IconManager.cpp | 17 +- Code/Editor/IconManager.h | 12 +- Code/Editor/Include/IDisplayViewport.h | 9 - Code/Editor/Include/IExportManager.h | 13 - Code/Editor/Include/IIconManager.h | 7 - Code/Editor/Include/IObjectManager.h | 152 -- Code/Editor/Include/ObjectEvent.h | 1 - .../test_ObjectManagerPythonBindings.cpp | 10 - Code/Editor/MainWindow.cpp | 1 - Code/Editor/Objects/BaseObject.cpp | 439 +----- Code/Editor/Objects/BaseObject.h | 157 +- Code/Editor/Objects/DisplayContext.h | 38 +- Code/Editor/Objects/DisplayContextShared.inl | 6 + Code/Editor/Objects/EntityObject.cpp | 213 +-- Code/Editor/Objects/EntityObject.h | 33 - Code/Editor/Objects/IEntityObjectListener.h | 20 - Code/Editor/Objects/ObjectLoader.cpp | 160 +-- Code/Editor/Objects/ObjectLoader.h | 59 +- Code/Editor/Objects/ObjectManager.cpp | 1266 +---------------- Code/Editor/Objects/ObjectManager.h | 192 +-- Code/Editor/Objects/ObjectManagerLegacyUndo.h | 33 +- Code/Editor/Objects/SelectionGroup.cpp | 66 +- Code/Editor/Objects/SelectionGroup.h | 6 - Code/Editor/Plugin.cpp | 5 +- .../Objects/ComponentEntityObject.cpp | 109 +- .../Objects/ComponentEntityObject.h | 14 +- .../SandboxIntegration.cpp | 2 +- .../SandboxIntegration.h | 10 +- Code/Editor/TrackView/TrackViewSplineCtrl.cpp | 1 - Code/Editor/TrackView/TrackViewUndo.h | 12 +- Code/Editor/Undo/IUndoObject.h | 17 +- Code/Editor/Util/KDTree.cpp | 572 -------- Code/Editor/Util/KDTree.h | 57 - Code/Editor/Util/XmlArchive.cpp | 96 -- Code/Editor/Util/XmlArchive.h | 3 - Code/Editor/Viewport.cpp | 37 +- Code/Editor/Viewport.h | 10 +- Code/Editor/editor_lib_files.cmake | 3 - .../Android/AzCore/AzCore_Traits_Android.h | 2 - .../Linux/AzCore/AzCore_Traits_Linux.h | 2 - .../Platform/Mac/AzCore/AzCore_Traits_Mac.h | 2 - .../Windows/AzCore/AzCore_Traits_Windows.h | 2 - .../Platform/iOS/AzCore/AzCore_Traits_iOS.h | 2 - .../AzFramework/Archive/Archive.cpp | 5 - .../AzFramework/Archive/ArchiveVars.h | 17 - .../AzFramework/Archive/ArchiveVars_Android.h | 11 - .../Archive/ArchiveVars_Platform.h | 10 - .../Android/platform_android_files.cmake | 2 - .../AzFramework/Archive/ArchiveVars_Linux.h | 11 - .../Archive/ArchiveVars_Platform.h | 10 - .../Platform/Linux/platform_linux_files.cmake | 2 - .../Mac/AzFramework/Archive/ArchiveVars_Mac.h | 11 - .../Archive/ArchiveVars_Platform.h | 10 - .../Platform/Mac/platform_mac_files.cmake | 2 - .../Archive/ArchiveVars_Platform.h | 10 - .../AzFramework/Archive/ArchiveVars_Windows.h | 11 - .../Windows/platform_windows_files.cmake | 2 - .../Archive/ArchiveVars_Platform.h | 10 - .../iOS/AzFramework/Archive/ArchiveVars_iOS.h | 11 - .../Platform/iOS/platform_ios_files.cmake | 2 - .../API/EditorVegetationRequestsBus.h | 1 + Code/Legacy/CryCommon/AppleSpecific.h | 21 - Code/Legacy/CryCommon/Cry_Matrix34.h | 5 - Code/Legacy/CryCommon/Cry_Matrix44.h | 31 - Code/Legacy/CryCommon/IEntityRenderState.h | 26 - Code/Legacy/CryCommon/IFunctorBase.h | 54 - Code/Legacy/CryCommon/IIndexedMesh.h | 117 -- Code/Legacy/CryCommon/IStatObj.h | 110 -- Code/Legacy/CryCommon/ISystem.h | 47 +- Code/Legacy/CryCommon/IXml.h | 86 +- Code/Legacy/CryCommon/LinuxSpecific.h | 12 - Code/Legacy/CryCommon/Linux_Win32Wrapper.h | 60 - Code/Legacy/CryCommon/Mocks/ISystemMock.h | 24 +- Code/Legacy/CryCommon/StatObjBus.h | 36 - Code/Legacy/CryCommon/WinBase.cpp | 524 +------ Code/Legacy/CryCommon/crycommon_files.cmake | 4 - Code/Legacy/CryCommon/platform.h | 2 +- Code/Legacy/CryCommon/platform_impl.cpp | 14 +- Code/Legacy/CrySystem/System.cpp | 171 +-- Code/Legacy/CrySystem/System.h | 153 +- Code/Legacy/CrySystem/SystemInit.cpp | 152 -- Code/Legacy/CrySystem/SystemWin32.cpp | 39 - Code/Legacy/CrySystem/XML/XMLBinaryNode.cpp | 26 +- Code/Legacy/CrySystem/XML/XMLBinaryNode.h | 35 +- Code/Legacy/CrySystem/XML/XmlUtils.cpp | 37 +- Code/Legacy/CrySystem/XML/xml.cpp | 118 +- Code/Legacy/CrySystem/XML/xml.h | 139 +- Gems/Atom/Utils/Code/Tests/PngFileTests.cpp | 3 +- .../Source/Editor/AudioControlsEditorUndo.h | 6 - .../LYCommonMenu/ImGuiLYAssetExplorer.cpp | 31 +- .../include/LmbrCentral/Rendering/MeshAsset.h | 6 - .../LmbrCentral/Rendering/RenderNodeBus.h | 45 - Gems/LmbrCentral/Code/lmbrcentral_files.cmake | 1 - .../Source/World/UiCanvasOnMeshComponent.cpp | 3 - .../Code/Source/AreaSystemComponent.cpp | 2 - .../Code/Source/AreaSystemComponent.h | 6 +- Gems/Vegetation/Code/Tests/VegetationMocks.h | 1 - RETIRED_CODE.md | 33 + 115 files changed, 355 insertions(+), 6354 deletions(-) delete mode 100644 Code/Editor/Objects/IEntityObjectListener.h delete mode 100644 Code/Editor/Util/KDTree.cpp delete mode 100644 Code/Editor/Util/KDTree.h delete mode 100644 Code/Framework/AzFramework/Platform/Android/AzFramework/Archive/ArchiveVars_Android.h delete mode 100644 Code/Framework/AzFramework/Platform/Android/AzFramework/Archive/ArchiveVars_Platform.h delete mode 100644 Code/Framework/AzFramework/Platform/Linux/AzFramework/Archive/ArchiveVars_Linux.h delete mode 100644 Code/Framework/AzFramework/Platform/Linux/AzFramework/Archive/ArchiveVars_Platform.h delete mode 100644 Code/Framework/AzFramework/Platform/Mac/AzFramework/Archive/ArchiveVars_Mac.h delete mode 100644 Code/Framework/AzFramework/Platform/Mac/AzFramework/Archive/ArchiveVars_Platform.h delete mode 100644 Code/Framework/AzFramework/Platform/Windows/AzFramework/Archive/ArchiveVars_Platform.h delete mode 100644 Code/Framework/AzFramework/Platform/Windows/AzFramework/Archive/ArchiveVars_Windows.h delete mode 100644 Code/Framework/AzFramework/Platform/iOS/AzFramework/Archive/ArchiveVars_Platform.h delete mode 100644 Code/Framework/AzFramework/Platform/iOS/AzFramework/Archive/ArchiveVars_iOS.h delete mode 100644 Code/Legacy/CryCommon/IEntityRenderState.h delete mode 100644 Code/Legacy/CryCommon/IFunctorBase.h delete mode 100644 Code/Legacy/CryCommon/IStatObj.h delete mode 100644 Code/Legacy/CryCommon/StatObjBus.h delete mode 100644 Gems/LmbrCentral/Code/include/LmbrCentral/Rendering/RenderNodeBus.h create mode 100644 RETIRED_CODE.md diff --git a/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/ObjectManagerCommands_test_case.py b/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/ObjectManagerCommands_test_case.py index 9a308ab9c1..28b49bb4cb 100755 --- a/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/ObjectManagerCommands_test_case.py +++ b/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/ObjectManagerCommands_test_case.py @@ -67,30 +67,6 @@ if (editor.EditorToolsApplicationRequestBus(bus.Broadcast, 'GetCurrentLevelName' if(general.get_num_selected() == 0): print("clear_selection works") - general.hide_all_objects() - - if(general.is_object_hidden(objs_list[1])): - print("hide_all_objects works") - - general.unhide_object(objs_list[1]) - - if not(general.is_object_hidden(objs_list[1])): - print("unhide_object works") - - general.hide_object(objs_list[1]) - - if(general.is_object_hidden(objs_list[1])): - print("hide_object works") - - general.unhide_all_objects() - - general.freeze_object(objs_list[1]) - - if(general.is_object_frozen(objs_list[1])): - print("freeze_object works") - - general.unfreeze_object(objs_list[1]) - position = general.get_position(objs_list[1]) px1, py1, pz1 = fetch_vector3_parts(position) general.set_position(objs_list[1], px1 + 10, py1 - 4, pz1 + 3) diff --git a/Code/Editor/BaseLibrary.cpp b/Code/Editor/BaseLibrary.cpp index 9f26630c2c..15742bd254 100644 --- a/Code/Editor/BaseLibrary.cpp +++ b/Code/Editor/BaseLibrary.cpp @@ -14,66 +14,6 @@ #include "Include/IBaseLibraryManager.h" #include #include -#include "Undo/IUndoObject.h" - -////////////////////////////////////////////////////////////////////////// -// Undo functionality for libraries. -////////////////////////////////////////////////////////////////////////// - -class CUndoBaseLibrary - : public IUndoObject -{ -public: - CUndoBaseLibrary(CBaseLibrary* pLib, const QString& description, const QString& selectedItem = QString()) - : m_pLib(pLib) - , m_description(description) - , m_redo(nullptr) - , m_selectedItem(selectedItem) - { - assert(m_pLib); - - m_undo = GetIEditor()->GetSystem()->CreateXmlNode("Undo"); - m_pLib->Serialize(m_undo, false); - } - - QString GetEditorObjectName() override - { - return m_selectedItem; - } - -protected: - int GetSize() override { return sizeof(CUndoBaseLibrary); } - QString GetDescription() override { return m_description; }; - - void Undo(bool bUndo) override - { - if (bUndo) - { - m_redo = GetIEditor()->GetSystem()->CreateXmlNode("Redo"); - m_pLib->Serialize(m_redo, false); - } - m_pLib->Serialize(m_undo, true); - m_pLib->SetModified(); - GetIEditor()->Notify(eNotify_OnDataBaseUpdate); - } - - void Redo() override - { - m_pLib->Serialize(m_redo, true); - m_pLib->SetModified(); - GetIEditor()->Notify(eNotify_OnDataBaseUpdate); - } - -private: - QString m_description; - QString m_selectedItem; - _smart_ptr m_pLib; - XmlNodeRef m_undo; - XmlNodeRef m_redo; -}; - - - ////////////////////////////////////////////////////////////////////////// // CBaseLibrary implementation. diff --git a/Code/Editor/BaseLibraryItem.cpp b/Code/Editor/BaseLibraryItem.cpp index b1fba91fad..e3788bc3e4 100644 --- a/Code/Editor/BaseLibraryItem.cpp +++ b/Code/Editor/BaseLibraryItem.cpp @@ -29,7 +29,6 @@ public: assert(libMgr); m_itemPath = libItem->GetFullName(); - m_description = "Lib item changed: " + m_itemPath; //serialize the lib item to undo m_undoCtx.node = GetIEditor()->GetSystem()->CreateXmlNode("Undo"); @@ -45,13 +44,8 @@ public: m_size = sizeof(CUndoBaseLibraryItem); m_size += static_cast(xmlStr.GetAllocatedMemory()); m_size += m_itemPath.length(); - m_size += m_description.length(); } - QString GetEditorObjectName() override - { - return m_itemPath; - } protected: int GetSize() override @@ -59,11 +53,6 @@ protected: return m_size; } - QString GetDescription() override - { - return m_description; - } - void Undo(bool bUndo) override { //find the libItem @@ -111,7 +100,6 @@ protected: } private: - QString m_description; QString m_itemPath; IDataBaseItem::SerializeContext m_undoCtx; //saved before operation IDataBaseItem::SerializeContext m_redoCtx; //saved after operation so used for redo diff --git a/Code/Editor/BaseLibraryManager.cpp b/Code/Editor/BaseLibraryManager.cpp index 3370165ddb..0e51a5238c 100644 --- a/Code/Editor/BaseLibraryManager.cpp +++ b/Code/Editor/BaseLibraryManager.cpp @@ -17,120 +17,6 @@ #include "ErrorReport.h" #include "Undo/IUndoObject.h" - -/////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -// Undo functionality for Managers, including add library, remove library, and rename library -- Vera, Confetti -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////// - -class CUndoBaseLibraryManager - : public IUndoObject -{ -public: - CUndoBaseLibraryManager(CBaseLibraryManager* pMngr, const QString& description, const QString& modifiedManager = nullptr) - : m_pMngr(pMngr) - , m_description(description) - , m_editorObject(modifiedManager) - { - assert(m_pMngr); - SerializeTo(m_undos); - } - - QString GetEditorObjectName() override - { - return m_editorObject; - } - -protected: - int GetSize() override { return sizeof(CUndoBaseLibraryManager); } - QString GetDescription() override { return m_description; }; - - void Undo(bool bUndo) override - { - if (bUndo) - { - SerializeTo(m_redos); - } - m_pMngr->ClearAll(); - UnserializeFrom(m_undos); - GetIEditor()->Notify(eNotify_OnDataBaseUpdate); - } - - void Redo() override - { - m_pMngr->ClearAll(); - UnserializeFrom(m_redos); - GetIEditor()->Notify(eNotify_OnDataBaseUpdate); - } - -private: - struct LibUndoNode - : public _i_reference_target_t - { - LibUndoNode() - { - node = nullptr; - fileName = ""; - } - XmlNodeRef node; - QString fileName; - }; - - static const char* const LIBRARY_TAG; - static const char* const LEVEL_LIBRARY_TAG; - - void SerializeTo(std::vector<_smart_ptr >& undos) // Save Library Undo - { - undos.clear(); - for (int i = 0; i < m_pMngr->GetLibraryCount(); i++) - { - IDataBaseLibrary* library = m_pMngr->GetLibrary(i); - - const char* tag = library->IsLevelLibrary() ? LEVEL_LIBRARY_TAG : LIBRARY_TAG; - XmlNodeRef node = GetIEditor()->GetSystem()->CreateXmlNode(tag); - QString file = library->GetFilename().isEmpty() ? library->GetFilename() : library->GetName(); - library->Serialize(node, false); - if (node && !file.isEmpty()) - { - _smart_ptr undo = new LibUndoNode(); - undo->fileName = file; - undo->node = node; - undos.push_back(undo); - } - } - } - - void UnserializeFrom(std::vector<_smart_ptr >& undos) // Load Library Undo - { - for (int i = 0; i < undos.size(); i++) - { - _smart_ptr undo = undos[i]; - if (undo->node && !undo->fileName.isEmpty()) - { - //AddLibrary adds a .xml to the end of the library path, this will remove the extra for compatibility - undo->fileName.replace(m_pMngr->GetLibsPath().toLower(), ""); - undo->fileName.replace(".xml", ""); - - const bool isLevelLibrary = (strcmp(undo->node->getTag(), LEVEL_LIBRARY_TAG) == 0); - - IDataBaseLibrary* library = m_pMngr->AddLibrary(undo->fileName, isLevelLibrary); - library->Serialize(undo->node, true); - } - } - } - - - QString m_description; - QString m_editorObject; - CBaseLibraryManager* m_pMngr; - std::vector<_smart_ptr > m_undos; - std::vector<_smart_ptr > m_redos; -}; - -const char* const CUndoBaseLibraryManager::LIBRARY_TAG = "UndoLibrary"; -const char* const CUndoBaseLibraryManager::LEVEL_LIBRARY_TAG = "UndoLevelLibrary"; - - - ////////////////////////////////////////////////////////////////////////// // CBaseLibraryManager implementation. ////////////////////////////////////////////////////////////////////////// diff --git a/Code/Editor/Controls/SplineCtrlEx.cpp b/Code/Editor/Controls/SplineCtrlEx.cpp index 1dc2ff19e1..bff75af169 100644 --- a/Code/Editor/Controls/SplineCtrlEx.cpp +++ b/Code/Editor/Controls/SplineCtrlEx.cpp @@ -82,7 +82,6 @@ protected: } int GetSize() override { return sizeof(*this); } - QString GetDescription() override { return "UndoSplineCtrlEx"; }; void Undo(bool bUndo) override { diff --git a/Code/Editor/CryEdit.cpp b/Code/Editor/CryEdit.cpp index 4b725ac3d7..d5f2305dfb 100644 --- a/Code/Editor/CryEdit.cpp +++ b/Code/Editor/CryEdit.cpp @@ -33,6 +33,7 @@ AZ_POP_DISABLE_WARNING #include #include #include +#include #include // Aws Native SDK @@ -4016,7 +4017,7 @@ void CCryEditApp::OnError(AzFramework::AssetSystem::AssetSystemErrors error) break; } - CryMessageBox(errorMessage.c_str(), "Error", MB_OK | MB_ICONERROR | MB_SETFOREGROUND); + QMessageBox::critical(nullptr,"Error",errorMessage.c_str()); } void CCryEditApp::OnOpenProceduralMaterialEditor() diff --git a/Code/Editor/CryEditDoc.cpp b/Code/Editor/CryEditDoc.cpp index 9c6c257ac0..3bcba4d5e0 100644 --- a/Code/Editor/CryEditDoc.cpp +++ b/Code/Editor/CryEditDoc.cpp @@ -51,7 +51,6 @@ #include "GameExporter.h" #include "MainWindow.h" #include "LevelFileDialog.h" -#include "StatObjBus.h" #include "Undo/Undo.h" #include @@ -246,9 +245,6 @@ void CCryEditDoc::DeleteContents() EBUS_EVENT(AzToolsFramework::EditorEntityContextRequestBus, ResetEditorContext); - // [LY-90904] move this to the EditorVegetationManager component - InstanceStatObjEventBus::Broadcast(&InstanceStatObjEventBus::Events::ReleaseData); - ////////////////////////////////////////////////////////////////////////// // Clear all undo info. ////////////////////////////////////////////////////////////////////////// @@ -308,8 +304,6 @@ void CCryEditDoc::Save(TDocMultiArchive& arrXmlAr) // Fog settings /////////////////////////////////////////////////////// SerializeFogSettings((*arrXmlAr[DMAS_GENERAL])); - - SerializeNameSelection((*arrXmlAr[DMAS_GENERAL])); } } AfterSave(); @@ -455,12 +449,6 @@ void CCryEditDoc::Load(TDocMultiArchive& arrXmlAr, const QString& szFilename) } } - if (!isPrefabEnabled) - { - // Name Selection groups - SerializeNameSelection((*arrXmlAr[DMAS_GENERAL])); - } - { CAutoLogTime logtime("Post Load"); @@ -595,16 +583,6 @@ void CCryEditDoc::SerializeFogSettings(CXmlArchive& xmlAr) } } -void CCryEditDoc::SerializeNameSelection(CXmlArchive& xmlAr) -{ - IObjectManager* pObjManager = GetIEditor()->GetObjectManager(); - - if (pObjManager) - { - pObjManager->SerializeNameSelection(xmlAr.root, xmlAr.bLoading); - } -} - void CCryEditDoc::SetModifiedModules(EModifiedModule eModifiedModule, bool boSet) { if (!boSet) diff --git a/Code/Editor/CryEditDoc.h b/Code/Editor/CryEditDoc.h index e64bdb1308..f7e97d308e 100644 --- a/Code/Editor/CryEditDoc.h +++ b/Code/Editor/CryEditDoc.h @@ -24,7 +24,6 @@ #include #endif -class CClouds; struct LightingSettings; struct IVariable; struct ICVar; @@ -124,7 +123,6 @@ public: // Create from serialization only const char* GetTemporaryLevelName() const; void DeleteTemporaryLevel(); - CClouds* GetClouds() { return m_pClouds; } void SetWaterColor(const QColor& col) { m_waterColor = col; } QColor GetWaterColor() const { return m_waterColor; } XmlNodeRef& GetFogTemplate() { return m_fogTemplate; } @@ -163,7 +161,6 @@ protected: bool LoadEntitiesFromSlice(const QString& sliceFile); void SerializeFogSettings(CXmlArchive& xmlAr); virtual void SerializeViewSettings(CXmlArchive& xmlAr); - void SerializeNameSelection(CXmlArchive& xmlAr); void LogLoadTime(int time) const; struct TSaveDocContext @@ -195,7 +192,6 @@ protected: QColor m_waterColor = QColor(0, 0, 255); XmlNodeRef m_fogTemplate; XmlNodeRef m_environmentTemplate; - CClouds* m_pClouds; std::list m_listeners; bool m_bDocumentReady = false; ICVar* doc_validate_surface_types = nullptr; diff --git a/Code/Editor/EditorViewportWidget.cpp b/Code/Editor/EditorViewportWidget.cpp index 132729466c..60e4bf6d47 100644 --- a/Code/Editor/EditorViewportWidget.cpp +++ b/Code/Editor/EditorViewportWidget.cpp @@ -97,9 +97,6 @@ #include -#include -#include - AZ_CVAR( bool, ed_visibility_logTiming, false, nullptr, AZ::ConsoleFunctorFlags::Null, "Output the timing of the new IVisibilitySystem query"); diff --git a/Code/Editor/Export/ExportManager.cpp b/Code/Editor/Export/ExportManager.cpp index 5527aa6ce6..b27b7e0387 100644 --- a/Code/Editor/Export/ExportManager.cpp +++ b/Code/Editor/Export/ExportManager.cpp @@ -35,20 +35,8 @@ #include "Resource.h" #include "Plugins/ComponentEntityEditorPlugin/Objects/ComponentEntityObject.h" -#include -#include - namespace { - inline Export::Vector3D Vec3ToVector3D(const Vec3& vec) - { - Export::Vector3D ret; - ret.x = vec.x; - ret.y = vec.y; - ret.z = vec.z; - return ret; - } - const float kTangentDelta = 0.01f; const float kAspectRatio = 1.777778f; const int kReserveCount = 7; // x,y,z,rot_x,rot_y,rot_z,fov @@ -106,22 +94,22 @@ void Export::CData::Clear() // CExportManager CExportManager::CExportManager() : m_isPrecaching(false) - , m_pBaseObj(nullptr) - , m_FBXBakedExportFPS(0.0f) , m_fScale(100.0f) + , m_bAnimationExport(false) + , m_pBaseObj(nullptr) , // this scale is used by CryEngine RC - m_bAnimationExport(false) + m_FBXBakedExportFPS(0.0f) , m_bExportLocalCoords(false) + , m_bExportOnlyPrimaryCamera(false) , m_numberOfExportFrames(0) , m_pivotEntityObject(nullptr) , m_bBakedKeysSequenceExport(true) , m_animTimeExportPrimarySequenceCurrentTime(0.0f) , m_animKeyTimeExport(true) , m_soundKeyTimeExport(true) - , m_bExportOnlyPrimaryCamera(false) { - RegisterExporter(new COBJExporter()); - RegisterExporter(new COCMExporter()); + CExportManager::RegisterExporter(new COBJExporter()); + CExportManager::RegisterExporter(new COCMExporter()); } @@ -313,203 +301,6 @@ void CExportManager::AddEntityAnimationData(AZ::EntityId entityId) ProcessEntityAnimationTrack(entityId, pObj, AnimParamType::Rotation); } - -void CExportManager::AddMesh(Export::CObject* pObj, const IIndexedMesh* pIndMesh, Matrix34A* pTm) -{ - if (m_isPrecaching || !pObj) - { - return; - } - - pObj->m_MeshHash = reinterpret_cast(pIndMesh); - IIndexedMesh::SMeshDescription meshDesc; - pIndMesh->GetMeshDescription(meshDesc); - - // if we have subset of meshes we need to duplicate vertices, - // keep transformation of submesh, - // and store new offset for indices - int newOffsetIndex = pObj->GetVertexCount(); - - if (meshDesc.m_nVertCount) - { - pObj->m_vertices.reserve(meshDesc.m_nVertCount + newOffsetIndex); - pObj->m_normals.reserve(meshDesc.m_nVertCount + newOffsetIndex); - } - - for (int v = 0; v < meshDesc.m_nVertCount; ++v) - { - Vec3 n = meshDesc.m_pNorms[v].GetN(); - Vec3 tmp = (meshDesc.m_pVerts ? meshDesc.m_pVerts[v] : meshDesc.m_pVertsF16[v].ToVec3()); - if (pTm) - { - tmp = pTm->TransformPoint(tmp); - } - - pObj->m_vertices.push_back(Vec3ToVector3D(tmp * m_fScale)); - pObj->m_normals.push_back(Vec3ToVector3D(n)); - } - - if (meshDesc.m_nCoorCount) - { - pObj->m_texCoords.reserve(meshDesc.m_nCoorCount + newOffsetIndex); - } - - for (int v = 0; v < meshDesc.m_nCoorCount; ++v) - { - Vec2 uv = meshDesc.m_pTexCoord[v].GetUV(); - uv.y = 1.0f - uv.y; - pObj->m_texCoords.push_back({uv.x,uv.y}); - } - - if (pIndMesh->GetSubSetCount() && !(pIndMesh->GetSubSetCount() == 1 && pIndMesh->GetSubSet(0).nNumIndices == 0)) - { - for (int i = 0; i < pIndMesh->GetSubSetCount(); ++i) - { - Export::CMesh* pMesh = new Export::CMesh(); - - const SMeshSubset& sms = pIndMesh->GetSubSet(i); - const vtx_idx* pIndices = &meshDesc.m_pIndices[sms.nFirstIndexId]; - int nTris = sms.nNumIndices / 3; - pMesh->m_faces.reserve(nTris); - for (int f = 0; f < nTris; ++f) - { - Export::Face face; - face.idx[0] = *(pIndices++) + newOffsetIndex; - face.idx[1] = *(pIndices++) + newOffsetIndex; - face.idx[2] = *(pIndices++) + newOffsetIndex; - pMesh->m_faces.push_back(face); - } - - pObj->m_meshes.push_back(pMesh); - } - } - else - { - Export::CMesh* pMesh = new Export::CMesh(); - if (meshDesc.m_nFaceCount == 0 && meshDesc.m_nIndexCount != 0 && meshDesc.m_pIndices != nullptr) - { - const vtx_idx* pIndices = &meshDesc.m_pIndices[0]; - int nTris = meshDesc.m_nIndexCount / 3; - pMesh->m_faces.reserve(nTris); - for (int f = 0; f < nTris; ++f) - { - Export::Face face; - face.idx[0] = *(pIndices++) + newOffsetIndex; - face.idx[1] = *(pIndices++) + newOffsetIndex; - face.idx[2] = *(pIndices++) + newOffsetIndex; - pMesh->m_faces.push_back(face); - } - } - else - { - pMesh->m_faces.reserve(meshDesc.m_nFaceCount); - for (int f = 0; f < meshDesc.m_nFaceCount; ++f) - { - Export::Face face; - face.idx[0] = meshDesc.m_pFaces[f].v[0]; - face.idx[1] = meshDesc.m_pFaces[f].v[1]; - face.idx[2] = meshDesc.m_pFaces[f].v[2]; - pMesh->m_faces.push_back(face); - } - } - - pObj->m_meshes.push_back(pMesh); - } -} - - -bool CExportManager::AddStatObj(Export::CObject* pObj, IStatObj* pStatObj, Matrix34A* pTm) -{ - IIndexedMesh* pIndMesh = nullptr; - - if (pStatObj->GetSubObjectCount()) - { - for (int i = 0; i < pStatObj->GetSubObjectCount(); i++) - { - IStatObj::SSubObject* pSubObj = pStatObj->GetSubObject(i); - if (pSubObj && pSubObj->nType == STATIC_SUB_OBJECT_MESH && pSubObj->pStatObj) - { - pIndMesh = nullptr; - if (m_isOccluder) - { - if (pSubObj->pStatObj->GetLodObject(2)) - { - pIndMesh = pSubObj->pStatObj->GetLodObject(2)->GetIndexedMesh(true); - } - if (!pIndMesh && pSubObj->pStatObj->GetLodObject(1)) - { - pIndMesh = pSubObj->pStatObj->GetLodObject(1)->GetIndexedMesh(true); - } - } - if (!pIndMesh) - { - pIndMesh = pSubObj->pStatObj->GetIndexedMesh(true); - } - if (pIndMesh) - { - AddMesh(pObj, pIndMesh, pTm); - } - } - } - } - - if (!pIndMesh) - { - if (m_isOccluder) - { - if (pStatObj->GetLodObject(2)) - { - pIndMesh = pStatObj->GetLodObject(2)->GetIndexedMesh(true); - } - if (!pIndMesh && pStatObj->GetLodObject(1)) - { - pIndMesh = pStatObj->GetLodObject(1)->GetIndexedMesh(true); - } - } - if (!pIndMesh) - { - pIndMesh = pStatObj->GetIndexedMesh(true); - } - if (pIndMesh) - { - AddMesh(pObj, pIndMesh, pTm); - } - } - - return true; -} - -bool CExportManager::AddMeshes(Export::CObject* pObj) -{ - if (m_pBaseObj->GetType() == OBJTYPE_AZENTITY) - { - CEntityObject* pEntityObject = (CEntityObject*)m_pBaseObj; - IRenderNode* pEngineNode = pEntityObject->GetEngineNode(); - - if (pEngineNode) - { - if (!m_isPrecaching) - { - for (int i = 0; i < pEngineNode->GetSlotCount(); ++i) - { - Matrix34A tm; - IStatObj* pStatObj = pEngineNode->GetEntityStatObj(i, 0, &tm); - if (pStatObj) - { - Matrix34A objTM = m_pBaseObj->GetWorldTM(); - objTM.Invert(); - tm = objTM * tm; - AddStatObj(pObj, pStatObj, &tm); - } - } - } - } - } - - return true; -} - - bool CExportManager::AddObject(CBaseObject* pBaseObj) { if (m_isOccluder) @@ -531,7 +322,6 @@ bool CExportManager::AddObject(CBaseObject* pBaseObj) if (m_isPrecaching) { - AddMeshes(nullptr); return true; } @@ -542,7 +332,6 @@ bool CExportManager::AddObject(CBaseObject* pBaseObj) m_objectMap[pBaseObj] = int(m_data.m_objects.size() - 1); - AddMeshes(pObj); m_pBaseObj = nullptr; return true; @@ -1227,15 +1016,6 @@ bool CExportManager::ImportFromFile(const char* filename) return bRet; } -bool CExportManager::ExportSingleStatObj(IStatObj* pStatObj, const char* filename) -{ - Export::CObject* pObj = new Export::CObject(Path::GetFileName(filename).toUtf8().data()); - AddStatObj(pObj, pStatObj); - m_data.m_objects.push_back(pObj); - ExportToFile(filename, true); - return true; -} - void CExportManager::SaveNodeKeysTimeToXML() { CTrackViewSequence* pSequence = GetIEditor()->GetAnimation()->GetSequence(); diff --git a/Code/Editor/Export/ExportManager.h b/Code/Editor/Export/ExportManager.h index 14318be957..6908bcf0f7 100644 --- a/Code/Editor/Export/ExportManager.h +++ b/Code/Editor/Export/ExportManager.h @@ -139,18 +139,11 @@ public: bool ImportFromFile(const char* filename); const Export::CData& GetData() const {return m_data; }; - //! Exports the stat obj to the obj file specified - //! returns true if succeeded, otherwise false - bool ExportSingleStatObj(IStatObj* pStatObj, const char* filename) override; - void SetBakedKeysSequenceExport(bool bBaked){m_bBakedKeysSequenceExport = bBaked; }; void SaveNodeKeysTimeToXML(); private: - void AddMesh(Export::CObject* pObj, const IIndexedMesh* pIndMesh, Matrix34A* pTm = nullptr); - bool AddStatObj(Export::CObject* pObj, IStatObj* pStatObj, Matrix34A* pTm = nullptr); - bool AddMeshes(Export::CObject* pObj); bool AddObject(CBaseObject* pBaseObj); void SolveHierarchy(); diff --git a/Code/Editor/GameEngine.cpp b/Code/Editor/GameEngine.cpp index 6f434eda98..ed8f30af93 100644 --- a/Code/Editor/GameEngine.cpp +++ b/Code/Editor/GameEngine.cpp @@ -157,20 +157,20 @@ struct SSystemUserCallback } } - int ShowMessage(const char* text, const char* caption, unsigned int uType) override + void ShowMessage(const char* text, const char* caption, unsigned int uType) override { if (CCryEditApp::instance()->IsInAutotestMode()) { - return IDOK; + return; } const UINT kMessageBoxButtonMask = 0x000f; if (!GetIEditor()->IsInGameMode() && (uType == 0 || uType == MB_OK || !(uType & kMessageBoxButtonMask))) { static_cast(GetIEditor())->AddErrorMessage(text, caption); - return IDOK; + return; } - return CryMessageBox(text, caption, uType); + CryMessageBox(text, caption, uType); } void OnSplashScreenDone() diff --git a/Code/Editor/GameEngine.h b/Code/Editor/GameEngine.h index 4104e9aeac..5a77fc2fb1 100644 --- a/Code/Editor/GameEngine.h +++ b/Code/Editor/GameEngine.h @@ -8,17 +8,11 @@ // Description : The game engine for editor - - -#ifndef CRYINCLUDE_EDITOR_GAMEENGINE_H -#define CRYINCLUDE_EDITOR_GAMEENGINE_H - #pragma once #if !defined(Q_MOC_RUN) #include #include "LogFile.h" -#include "CryListenerSet.h" #include "Util/ModalWindowDismisser.h" #endif @@ -159,5 +153,3 @@ private: AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING }; - -#endif // CRYINCLUDE_EDITOR_GAMEENGINE_H diff --git a/Code/Editor/GameExporter.cpp b/Code/Editor/GameExporter.cpp index ae1095b03a..a768861b90 100644 --- a/Code/Editor/GameExporter.cpp +++ b/Code/Editor/GameExporter.cpp @@ -146,13 +146,11 @@ bool CGameExporter::Export(unsigned int flags, [[maybe_unused]] EEndian eExportE exportSuccessful = false; } - if (exportSuccessful) + if (exportSuccessful && m_bAutoExportMode) { - if (m_bAutoExportMode) - { - // Remove read-only flags. - CrySetFileAttributes(m_levelPak.m_sPath.toUtf8().data(), FILE_ATTRIBUTE_NORMAL); - } + // Remove read-only flags. + auto perms = QFile::permissions(m_levelPak.m_sPath) | QFile::Permission::WriteOwner; + QFile::setPermissions(m_levelPak.m_sPath, perms); } ////////////////////////////////////////////////////////////////////////// diff --git a/Code/Editor/IEditor.h b/Code/Editor/IEditor.h index 7c49819d83..48c8392f32 100644 --- a/Code/Editor/IEditor.h +++ b/Code/Editor/IEditor.h @@ -508,8 +508,6 @@ struct IEditor virtual CBaseObject* NewObject(const char* typeName, const char* fileName = "", const char* name = "", float x = 0.0f, float y = 0.0f, float z = 0.0f, bool modifyDoc = true) = 0; //! Delete object virtual void DeleteObject(CBaseObject* obj) = 0; - //! Clone object - virtual CBaseObject* CloneObject(CBaseObject* obj) = 0; //! Get current selection group virtual CSelectionGroup* GetSelection() = 0; virtual CBaseObject* GetSelectedObject() = 0; diff --git a/Code/Editor/IEditorImpl.cpp b/Code/Editor/IEditorImpl.cpp index 66c64d5bef..e5df6be58e 100644 --- a/Code/Editor/IEditorImpl.cpp +++ b/Code/Editor/IEditorImpl.cpp @@ -397,11 +397,6 @@ void CEditorImpl::Update() // Make sure this is not called recursively m_bUpdates = false; - //@FIXME: Restore this latter. - //if (GetGameEngine() && GetGameEngine()->IsLevelLoaded()) - { - m_pObjectManager->Update(); - } if (IsInPreviewMode()) { SetModifiedFlag(false); @@ -687,13 +682,6 @@ void CEditorImpl::DeleteObject(CBaseObject* obj) GetObjectManager()->DeleteObject(obj); } -CBaseObject* CEditorImpl::CloneObject(CBaseObject* obj) -{ - SetModifiedFlag(); - GetIEditor()->SetModifiedModule(eModifiedBrushes); - return GetObjectManager()->CloneObject(obj); -} - CBaseObject* CEditorImpl::GetSelectedObject() { if (m_pObjectManager->GetSelection()->GetCount() != 1) diff --git a/Code/Editor/IEditorImpl.h b/Code/Editor/IEditorImpl.h index 26701edec2..4976c0c1ca 100644 --- a/Code/Editor/IEditorImpl.h +++ b/Code/Editor/IEditorImpl.h @@ -141,7 +141,6 @@ public: const SGizmoParameters& GetGlobalGizmoParameters() override; CBaseObject* NewObject(const char* typeName, const char* fileName = "", const char* name = "", float x = 0.0f, float y = 0.0f, float z = 0.0f, bool modifyDoc = true) override; void DeleteObject(CBaseObject* obj) override; - CBaseObject* CloneObject(CBaseObject* obj) override; IObjectManager* GetObjectManager() override; // This will return a null pointer if CrySystem is not loaded before // Global Sandbox Settings are loaded from the registry before CrySystem diff --git a/Code/Editor/IconManager.cpp b/Code/Editor/IconManager.cpp index 820213bbd9..a9d31aef7b 100644 --- a/Code/Editor/IconManager.cpp +++ b/Code/Editor/IconManager.cpp @@ -21,8 +21,6 @@ #include "Util/Image.h" #include "Util/ImageUtil.h" -#include - #define HELPER_MATERIAL "Objects/Helper" namespace @@ -38,7 +36,6 @@ namespace CIconManager::CIconManager() { ZeroStruct(m_icons); - ZeroStruct(m_objects); } ////////////////////////////////////////////////////////////////////////// @@ -61,13 +58,7 @@ void CIconManager::Done() void CIconManager::Reset() { // Do not unload objects. but clears them. - int i; - for (i = 0; i < sizeof(m_objects) / sizeof(m_objects[0]); i++) - { - delete m_objects[i]; - m_objects[i] = nullptr; - } - for (i = 0; i < eIcon_COUNT; i++) + for (int i = 0; i < eIcon_COUNT; i++) { m_icons[i] = 0; } @@ -110,12 +101,6 @@ int CIconManager::GetIconTexture(EIcon icon) return m_icons[icon]; } -////////////////////////////////////////////////////////////////////////// -IStatObj* CIconManager::GetObject(EStatObject) -{ - return nullptr; -} - ////////////////////////////////////////////////////////////////////////// QImage* CIconManager::GetIconBitmap(const char* filename, bool& bHaveAlpha, uint32 effects /*=0*/) { diff --git a/Code/Editor/IconManager.h b/Code/Editor/IconManager.h index 7183f036ed..7e9be63665 100644 --- a/Code/Editor/IconManager.h +++ b/Code/Editor/IconManager.h @@ -8,11 +8,6 @@ // Description : Manages Textures used by Icon. - - -#ifndef CRYINCLUDE_EDITOR_ICONMANAGER_H -#define CRYINCLUDE_EDITOR_ICONMANAGER_H - #pragma once #include "Include/IIconManager.h" // for IIconManager @@ -31,7 +26,7 @@ class CIconManager public: // Construction CIconManager(); - ~CIconManager(); + ~CIconManager() override; void Init(); void Done(); @@ -41,8 +36,6 @@ public: // Operations virtual int GetIconTexture(EIcon icon); - - virtual IStatObj* GetObject(EStatObject object); virtual int GetIconTexture(const char* iconName); ////////////////////////////////////////////////////////////////////////// @@ -61,7 +54,6 @@ public: private: StdMap m_textures; - IStatObj* m_objects[eStatObject_COUNT]; int m_icons[eIcon_COUNT]; ////////////////////////////////////////////////////////////////////////// @@ -70,5 +62,3 @@ private: typedef std::map IconsMap; IconsMap m_iconBitmapsMap; }; - -#endif // CRYINCLUDE_EDITOR_ICONMANAGER_H diff --git a/Code/Editor/Include/IDisplayViewport.h b/Code/Editor/Include/IDisplayViewport.h index 132c62804c..2dab2802c7 100644 --- a/Code/Editor/Include/IDisplayViewport.h +++ b/Code/Editor/Include/IDisplayViewport.h @@ -6,9 +6,6 @@ * */ - -#ifndef CRYINCLUDE_EDITOR_INCLUDE_IDISPLAYVIEWPORT_H -#define CRYINCLUDE_EDITOR_INCLUDE_IDISPLAYVIEWPORT_H #pragma once struct DisplayContext; @@ -22,7 +19,6 @@ struct IDisplayViewport { virtual void Update() = 0; virtual float GetScreenScaleFactor(const Vec3& position) const = 0; - virtual bool HitTestLine(const Vec3& lineP1, const Vec3& lineP2, const QPoint& hitpoint, int pixelRadius, float* pToCameraDistance = 0) const = 0; /** * Gets the distance of the point on screen to the line defined by the two points, converted to screenspace. @@ -48,12 +44,9 @@ struct IDisplayViewport 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; - virtual float GetGridStep() const = 0; virtual void setRay(QPoint& vp, Vec3& raySrc, Vec3& rayDir) = 0; - virtual void setHitcontext(QPoint& vp, Vec3& raySrc, Vec3& rayDir) = 0; virtual float GetAspectRatio() const = 0; - virtual const ::Plane* GetConstructionPlane() const = 0; virtual bool IsBoundsVisible(const AABB& box) const = 0; @@ -62,5 +55,3 @@ struct IDisplayViewport virtual CViewport *asCViewport() { return nullptr; } }; - -#endif // CRYINCLUDE_EDITOR_INCLUDE_IDISPLAYVIEWPORT_H diff --git a/Code/Editor/Include/IExportManager.h b/Code/Editor/Include/IExportManager.h index ea802134b6..ce79e52e15 100644 --- a/Code/Editor/Include/IExportManager.h +++ b/Code/Editor/Include/IExportManager.h @@ -8,14 +8,9 @@ // Description : Export geometry interfaces - - -#ifndef CRYINCLUDE_EDITOR_INCLUDE_IEXPORTMANAGER_H -#define CRYINCLUDE_EDITOR_INCLUDE_IEXPORTMANAGER_H #pragma once #define EXP_NAMESIZE 32 -struct IStatObj; enum class AnimParamType; namespace Export @@ -178,18 +173,10 @@ struct IExporter virtual void Release() = 0; }; - - // IExportManager: interface to export manager struct IExportManager { //! Register exporter //! return true if succeed, otherwise false virtual bool RegisterExporter(IExporter* pExporter) = 0; - - virtual bool ExportSingleStatObj(IStatObj* pStatObj, const char* filename) = 0; }; - - - -#endif // CRYINCLUDE_EDITOR_INCLUDE_IEXPORTMANAGER_H diff --git a/Code/Editor/Include/IIconManager.h b/Code/Editor/Include/IIconManager.h index 4925e47ae8..2407ea31bd 100644 --- a/Code/Editor/Include/IIconManager.h +++ b/Code/Editor/Include/IIconManager.h @@ -6,12 +6,8 @@ * */ - -#ifndef CRYINCLUDE_EDITOR_INCLUDE_IICONMANAGER_H -#define CRYINCLUDE_EDITOR_INCLUDE_IICONMANAGER_H #pragma once -struct IStatObj; struct IMaterial; class CBitmap; @@ -56,12 +52,9 @@ enum EIconEffect struct IIconManager { virtual ~IIconManager() = default; - virtual IStatObj* GetObject(EStatObject object) = 0; virtual int GetIconTexture(EIcon icon) = 0; virtual int GetIconTexture(const char* iconName) = 0; virtual QImage* GetIconBitmap(const char* filename, bool& haveAlpha, uint32 effects = 0) = 0; // Register an Icon for the specific command virtual void RegisterCommandIcon([[maybe_unused]] const char* filename, [[maybe_unused]] int nCommandId) {} }; - -#endif // CRYINCLUDE_EDITOR_INCLUDE_IICONMANAGER_H diff --git a/Code/Editor/Include/IObjectManager.h b/Code/Editor/Include/IObjectManager.h index 0a7bc8dcca..b612bcb80c 100644 --- a/Code/Editor/Include/IObjectManager.h +++ b/Code/Editor/Include/IObjectManager.h @@ -5,10 +5,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ - - -#ifndef CRYINCLUDE_EDITOR_INCLUDE_IOBJECTMANAGER_H -#define CRYINCLUDE_EDITOR_INCLUDE_IOBJECTMANAGER_H #pragma once #include @@ -29,32 +25,15 @@ class CObjectArchive; class CViewport; struct HitContext; enum class ImageRotationDegrees; -struct IStatObj; class CBaseObject; class XmlNodeRef; #include "ObjectEvent.h" -enum SerializeFlags -{ - SERIALIZE_ALL = 0, - SERIALIZE_ONLY_SHARED = 1, - SERIALIZE_ONLY_NOTSHARED = 2, -}; - ////////////////////////////////////////////////////////////////////////// typedef std::vector CBaseObjectsArray; typedef std::pair< bool(CALLBACK*)(CBaseObject const&, void*), void* > BaseObjectFilterFunctor; -struct IObjectSelectCallback -{ - //! Called when object is selected. - //! Return true if selection should proceed, or false to abort object selection. - virtual bool OnSelectObject(CBaseObject* obj) = 0; - //! Return true if object can be selected. - virtual bool CanSelectObject(CBaseObject* obj) = 0; -}; - ////////////////////////////////////////////////////////////////////////// // // Interface to access editor objects scene graph. @@ -78,10 +57,6 @@ public: virtual void DeleteObject(CBaseObject* obj) = 0; virtual void DeleteSelection(CSelectionGroup* pSelection) = 0; virtual void DeleteAllObjects() = 0; - virtual CBaseObject* CloneObject(CBaseObject* obj) = 0; - - virtual void BeginEditParams(CBaseObject* obj, int flags) = 0; - virtual void EndEditParams(int flags = 0) = 0; //! Get number of objects manager by ObjectManager (not contain sub objects of groups). virtual int GetObjectCount() const = 0; @@ -90,27 +65,9 @@ public: //! @param layer if 0 get objects for all layers, or layer to get objects from. virtual void GetObjects(CBaseObjectsArray& objects) const = 0; - //! Get array of objects that pass the filter. - //! @param filter The filter functor, return true if you want to get the certain obj, return false if want to skip it. - virtual void GetObjects(CBaseObjectsArray& objects, BaseObjectFilterFunctor const& filter) const = 0; - //! Display objects on specified display context. virtual void Display(DisplayContext& dc) = 0; - //! Called when selecting without selection helpers - this is needed since - //! the visible object cache is normally not updated when not displaying helpers. - virtual void ForceUpdateVisibleObjectCache(DisplayContext& dc) = 0; - - //! Check intersection with objects. - //! Find intersection with nearest to ray origin object hit by ray. - //! If distance tollerance is specified certain relaxation applied on collision test. - //! @return true if hit any object, and fills hitInfo structure. - virtual bool HitTest(HitContext& hitInfo) = 0; - - //! Check intersection with an object. - //! @return true if hit, and fills hitInfo structure. - virtual bool HitTestObject(CBaseObject* obj, HitContext& hc) = 0; - //! Gets a radius to be used for hit tests on the axis helpers, like the transform gizmo. //! @return the axis helper hit radius. virtual int GetAxisHelperHitRadius() const = 0; @@ -137,59 +94,18 @@ public: //! Find objects which intersect with a given AABB. virtual void FindObjectsInAABB(const AABB& aabb, std::vector& result) const = 0; - ////////////////////////////////////////////////////////////////////////// - // Operations on objects. - ////////////////////////////////////////////////////////////////////////// - //! Makes object visible or invisible. - virtual void HideObject(CBaseObject* obj, bool hide) = 0; - //! Shows the last hidden object based on hidden ID - virtual void ShowLastHiddenObject() = 0; - //! Freeze object, making it unselectable. - virtual void FreezeObject(CBaseObject* obj, bool freeze) = 0; - //! Unhide all hidden objects. - virtual void UnhideAll() = 0; - //! Unfreeze all frozen objects. - virtual void UnfreezeAll() = 0; - ////////////////////////////////////////////////////////////////////////// // Object Selection. ////////////////////////////////////////////////////////////////////////// virtual bool SelectObject(CBaseObject* obj, bool bUseMask = true) = 0; virtual void UnselectObject(CBaseObject* obj) = 0; - //! Select objects within specified distance from given position. - //! Return number of selected objects. - virtual int SelectObjects(const AABB& box, bool bUnselect = false) = 0; - - virtual void SelectEntities(std::set& s) = 0; - - virtual int MoveObjects(const AABB& box, const Vec3& offset, ImageRotationDegrees rotation, bool bIsCopy = false) = 0; - - //! Selects/Unselects all objects within 2d rectangle in given viewport. - virtual void SelectObjectsInRect(CViewport* view, const QRect& rect, bool bSelect) = 0; - virtual void FindObjectsInRect(CViewport* view, const QRect& rect, std::vector& guids) = 0; - //! Clear default selection set. //! @Return number of objects removed from selection. virtual int ClearSelection() = 0; - //! Deselect all current selected objects and selects object that were unselected. - //! @Return number of selected objects. - virtual int InvertSelection() = 0; - //! Get current selection. virtual CSelectionGroup* GetSelection() const = 0; - //! Get named selection. - virtual CSelectionGroup* GetSelection(const QString& name) const = 0; - // Get selection group names - virtual void GetNameSelectionStrings(QStringList& names) = 0; - //! Change name of current selection group. - //! And store it in list. - virtual void NameSelection(const QString& name) = 0; - //! Set one of name selections as current selection. - virtual void SetSelection(const QString& name) = 0; - //! Removes one of named selections. - virtual void RemoveSelection(const QString& name) = 0; //! Delete all objects in current selection group. virtual void DeleteSelection() = 0; @@ -198,54 +114,11 @@ public: virtual QString GenerateUniqueObjectName(const QString& typeName) = 0; //! Register object name in object manager, needed for generating uniq names. virtual void RegisterObjectName(const QString& name) = 0; - //! Enable/Disable generating of unique object names (Enabled by default). - //! Return previous value. - virtual bool EnableUniqObjectNames(bool bEnable) = 0; //! Find object class by name. virtual CObjectClassDesc* FindClass(const QString& className) = 0; - virtual void GetClassCategories(QStringList& categories) = 0; - virtual void GetClassCategoryToolClassNamePairs(std::vector< std::pair >& categoryToolClassNamePairs) = 0; - virtual void GetClassTypes(const QString& category, QStringList& types) = 0; - - //! Export objects to xml. - //! When onlyShared is true ony objects with shared flags exported, overwise only not shared object exported. - virtual void Export(const QString& levelPath, XmlNodeRef& rootNode, bool onlyShared) = 0; - //! Export only entities to xml. - virtual void ExportEntities(XmlNodeRef& rootNode) = 0; - - //! Serialize Objects in manager to specified XML Node. - //! @param flags Can be one of SerializeFlags. - virtual void Serialize(XmlNodeRef& rootNode, bool bLoading, int flags = SERIALIZE_ALL) = 0; - virtual void SerializeNameSelection(XmlNodeRef& rootNode, bool bLoading) = 0; - - //! Load objects from object archive. - //! @param bSelect if set newly loaded object will be selected. - virtual void LoadObjects(CObjectArchive& ar, bool bSelect) = 0; virtual void ChangeObjectId(REFGUID oldId, REFGUID newId) = 0; - virtual bool IsDuplicateObjectName(const QString& newName) const = 0; - virtual void ShowDuplicationMsgWarning(CBaseObject* obj, const QString& newName, bool bShowMsgBox) const = 0; - virtual void ChangeObjectName(CBaseObject* obj, const QString& newName) = 0; - - //! while loading PreFabs we need to force this IDs - //! to force always the same IDs, on each load. - //! needed for RAM-maps assignments - virtual uint32 ForceID() const = 0; - virtual void ForceID(uint32 FID) = 0; - - //! Convert object of one type to object of another type. - //! Original object is deleted. - virtual bool ConvertToType(CBaseObject* pObject, const QString& typeName) = 0; - - //! Set new selection callback. - //! @return previous selection callback. - virtual IObjectSelectCallback* SetSelectCallback(IObjectSelectCallback* callback) = 0; - - // Enables/Disables creating of game objects. - virtual void SetCreateGameObject(bool enable) = 0; - //! Return true if objects loaded from xml should immidiatly create game objects associated with them. - virtual bool IsCreateGameObjects() const = 0; virtual IGizmoManager* GetGizmoManager() = 0; @@ -253,34 +126,9 @@ public: //! Invalidate visibily settings of objects. virtual void InvalidateVisibleList() = 0; - ////////////////////////////////////////////////////////////////////////// - // ObjectManager notification Callbacks. - ////////////////////////////////////////////////////////////////////////// - virtual void AddObjectEventListener(EventListener* listener) = 0; - virtual void RemoveObjectEventListener(EventListener* listener) = 0; - - ////////////////////////////////////////////////////////////////////////// - // Used to indicate starting and ending of objects loading. - ////////////////////////////////////////////////////////////////////////// - virtual void StartObjectsLoading(int numObjects) = 0; - virtual void EndObjectsLoading() = 0; - ////////////////////////////////////////////////////////////////////////// // Gathers all resources used by all objects. virtual void GatherUsedResources(CUsedResources& resources) = 0; virtual bool IsLightClass(CBaseObject* pObject) = 0; - - virtual void FindAndRenameProperty2(const char* property2Name, const QString& oldValue, const QString& newValue) = 0; - virtual void FindAndRenameProperty2If(const char* property2Name, const QString& oldValue, const QString& newValue, const char* otherProperty2Name, const QString& otherValue) = 0; - - virtual bool IsReloading() const = 0; - - // Set bSkipUpdate to true if you want to skip update objects on the idle loop. - virtual void SetSkipUpdate(bool bSkipUpdate) = 0; - - virtual void SetExportingLevel(bool bExporting) = 0; - virtual bool IsExportingLevelInprogress() const = 0; }; - -#endif // CRYINCLUDE_EDITOR_INCLUDE_IOBJECTMANAGER_H diff --git a/Code/Editor/Include/ObjectEvent.h b/Code/Editor/Include/ObjectEvent.h index e59bca6111..a117a8f8f1 100644 --- a/Code/Editor/Include/ObjectEvent.h +++ b/Code/Editor/Include/ObjectEvent.h @@ -14,7 +14,6 @@ //! Standart objects types. enum ObjectType { - OBJTYPE_DUMMY = 1 << 20, OBJTYPE_AZENTITY = 1 << 21, }; diff --git a/Code/Editor/Lib/Tests/test_ObjectManagerPythonBindings.cpp b/Code/Editor/Lib/Tests/test_ObjectManagerPythonBindings.cpp index 39a89670ef..64b7d36d30 100644 --- a/Code/Editor/Lib/Tests/test_ObjectManagerPythonBindings.cpp +++ b/Code/Editor/Lib/Tests/test_ObjectManagerPythonBindings.cpp @@ -63,16 +63,6 @@ namespace ObjectManagerPythonBindingsUnitTests EXPECT_TRUE(behaviorContext->m_methods.find("get_selection_center") != behaviorContext->m_methods.end()); EXPECT_TRUE(behaviorContext->m_methods.find("get_selection_aabb") != behaviorContext->m_methods.end()); - EXPECT_TRUE(behaviorContext->m_methods.find("hide_object") != behaviorContext->m_methods.end()); - EXPECT_TRUE(behaviorContext->m_methods.find("is_object_hidden") != behaviorContext->m_methods.end()); - EXPECT_TRUE(behaviorContext->m_methods.find("unhide_object") != behaviorContext->m_methods.end()); - EXPECT_TRUE(behaviorContext->m_methods.find("hide_all_objects") != behaviorContext->m_methods.end()); - EXPECT_TRUE(behaviorContext->m_methods.find("unhide_all_objects") != behaviorContext->m_methods.end()); - - EXPECT_TRUE(behaviorContext->m_methods.find("freeze_object") != behaviorContext->m_methods.end()); - EXPECT_TRUE(behaviorContext->m_methods.find("is_object_frozen") != behaviorContext->m_methods.end()); - EXPECT_TRUE(behaviorContext->m_methods.find("unfreeze_object") != behaviorContext->m_methods.end()); - EXPECT_TRUE(behaviorContext->m_methods.find("delete_object") != behaviorContext->m_methods.end()); EXPECT_TRUE(behaviorContext->m_methods.find("delete_selected") != behaviorContext->m_methods.end()); diff --git a/Code/Editor/MainWindow.cpp b/Code/Editor/MainWindow.cpp index f6744ec2d2..38e433c3a3 100644 --- a/Code/Editor/MainWindow.cpp +++ b/Code/Editor/MainWindow.cpp @@ -576,7 +576,6 @@ void MainWindow::closeEvent(QCloseEvent* event) } // Close all edit panels. GetIEditor()->ClearSelection(); - GetIEditor()->GetObjectManager()->EndEditParams(); // force clean up of all deferred deletes, so that we don't have any issues with windows from plugins not being deleted yet qApp->sendPostedEvents(nullptr, QEvent::DeferredDelete); diff --git a/Code/Editor/Objects/BaseObject.cpp b/Code/Editor/Objects/BaseObject.cpp index b721dba56b..86840789dd 100644 --- a/Code/Editor/Objects/BaseObject.cpp +++ b/Code/Editor/Objects/BaseObject.cpp @@ -33,8 +33,6 @@ #include "ViewManager.h" #include "IEditorImpl.h" #include "GameEngine.h" -#include -#include // To use the Andrew's algorithm in order to make convex hull from the points, this header is needed. #include "Util/GeometryUtil.h" @@ -53,18 +51,16 @@ class CUndoBaseObject : public IUndoObject { public: - CUndoBaseObject(CBaseObject* pObj, const char* undoDescription); + CUndoBaseObject(CBaseObject* pObj); protected: int GetSize() override { return sizeof(*this); } - QString GetDescription() override { return m_undoDescription; }; QString GetObjectName() override; void Undo(bool bUndo) override; void Redo() override; protected: - QString m_undoDescription; GUID m_guid; XmlNodeRef m_undo; XmlNodeRef m_redo; @@ -77,11 +73,10 @@ class CUndoBaseObjectMinimal : public IUndoObject { public: - CUndoBaseObjectMinimal(CBaseObject* obj, const char* undoDescription, int flags); + CUndoBaseObjectMinimal(CBaseObject* obj, int flags); protected: int GetSize() override { return sizeof(*this); } - QString GetDescription() override { return m_undoDescription; }; QString GetObjectName() override; void Undo(bool bUndo) override; @@ -101,7 +96,6 @@ private: void SetTransformsFromState(CBaseObject* pObject, const StateStruct& state, bool bUndo); GUID m_guid; - QString m_undoDescription; StateStruct m_undoState; StateStruct m_redoState; }; @@ -167,7 +161,6 @@ private: } int GetSize() override { return sizeof(CUndoAttachBaseObject); } - QString GetDescription() override { return "Attachment Changed"; } GUID m_attachedObjectGUID; GUID m_parentObjectGUID; @@ -176,11 +169,10 @@ private: }; ////////////////////////////////////////////////////////////////////////// -CUndoBaseObject::CUndoBaseObject(CBaseObject* obj, const char* undoDescription) +CUndoBaseObject::CUndoBaseObject(CBaseObject* obj) { // Stores the current state of this object. assert(obj != 0); - m_undoDescription = undoDescription; m_guid = obj->GetId(); m_redo = nullptr; @@ -254,11 +246,10 @@ void CUndoBaseObject::Redo() } ////////////////////////////////////////////////////////////////////////// -CUndoBaseObjectMinimal::CUndoBaseObjectMinimal(CBaseObject* pObj, const char* undoDescription, [[maybe_unused]] int flags) +CUndoBaseObjectMinimal::CUndoBaseObjectMinimal(CBaseObject* pObj, [[maybe_unused]] int flags) { // Stores the current state of this object. assert(pObj != nullptr); - m_undoDescription = undoDescription; m_guid = pObj->GetId(); ZeroStruct(m_redoState); @@ -287,7 +278,7 @@ QString CUndoBaseObjectMinimal::GetObjectName() void CUndoBaseObjectMinimal::Undo(bool bUndo) { CBaseObject* pObject = GetIEditor()->GetObjectManager()->FindObject(m_guid); - if (!pObject || pObject->GetType() == OBJTYPE_DUMMY) + if (!pObject) { return; } @@ -316,7 +307,7 @@ void CUndoBaseObjectMinimal::Undo(bool bUndo) void CUndoBaseObjectMinimal::Redo() { CBaseObject* pObject = GetIEditor()->GetObjectManager()->FindObject(m_guid); - if (!pObject || pObject->GetType() == OBJTYPE_DUMMY) + if (!pObject) { return; } @@ -382,7 +373,6 @@ CBaseObject::CBaseObject() , m_rotate(IDENTITY) , m_scale(1, 1, 1) , m_guid(GUID_NULL) - , m_floorNumber(-1) , m_flags(0) , m_nTextureIcon(0) , m_color(QColor(255, 255, 255)) @@ -398,11 +388,9 @@ CBaseObject::CBaseObject() , m_bMatrixInWorldSpace(false) , m_bMatrixValid(false) , m_bWorldBoxValid(false) - , m_nMaterialLayersMask(0) , m_nMinSpec(0) , m_vDrawIconPos(0, 0, 0) , m_nIconFlags(0) - , m_hideOrder(CBaseObject::s_invalidHiddenID) { m_worldBounds.min.Set(0, 0, 0); m_worldBounds.max.Set(0, 0, 0); @@ -431,7 +419,6 @@ bool CBaseObject::Init([[maybe_unused]] IEditor* ie, CBaseObject* prev, [[maybe_ SetLocalTM(prev->GetPos(), prev->GetRotation(), prev->GetScale()); SetArea(prev->GetArea()); SetColor(prev->GetColor()); - m_nMaterialLayersMask = prev->m_nMaterialLayersMask; SetMinSpec(prev->GetMinSpec(), false); // Copy all basic variables. @@ -488,7 +475,7 @@ void CBaseObject::SetName(const QString& name) return; } - StoreUndo("Name"); + StoreUndo(); // Notification is expensive and not required if this is during construction. bool notify = (!m_name.isEmpty()); @@ -500,7 +487,6 @@ void CBaseObject::SetName(const QString& name) if (notify) { NotifyListeners(ON_RENAME); - static_cast(GetIEditor()->GetObjectManager())->NotifyObjectListeners(this, ON_RENAME); } } @@ -529,47 +515,6 @@ const QString& CBaseObject::GetName() const return m_name; } -////////////////////////////////////////////////////////////////////////// -QString CBaseObject::GetWarningsText() const -{ - QString warnings; - - if (gSettings.viewports.bShowScaleWarnings) - { - const EScaleWarningLevel scaleWarningLevel = GetScaleWarningLevel(); - if (scaleWarningLevel == eScaleWarningLevel_Rescaled) - { - warnings += "\\n Warning: Object Scale is not 100%."; - } - else if (scaleWarningLevel == eScaleWarningLevel_RescaledNonUniform) - { - warnings += "\\n Warning: Object has non-uniform scale."; - } - } - - if (gSettings.viewports.bShowRotationWarnings) - { - const ERotationWarningLevel rotationWarningLevel = GetRotationWarningLevel(); - - if (rotationWarningLevel == eRotationWarningLevel_Rotated) - { - warnings += "\\n Warning: Object is rotated."; - } - else if (rotationWarningLevel == eRotationWarningLevel_RotatedNonRectangular) - { - warnings += "\\n Warning: Object is rotated non-orthogonally."; - } - } - - return warnings; -} - -////////////////////////////////////////////////////////////////////////// -bool CBaseObject::IsSameClass(CBaseObject* obj) -{ - return GetClassDesc() == obj->GetClassDesc(); -} - ////////////////////////////////////////////////////////////////////////// bool CBaseObject::SetPos(const Vec3& pos, int flags) { @@ -615,7 +560,7 @@ bool CBaseObject::SetPos(const Vec3& pos, int flags) ////////////////////////////////////////////////////////////////////////// if (!bPositionDelegated && (flags & eObjectUpdateFlags_RestoreUndo) == 0 && (flags & eObjectUpdateFlags_Animated) == 0) { - StoreUndo("Position", true, flags); + StoreUndo(true, flags); } if (!bPositionDelegated) @@ -659,7 +604,7 @@ bool CBaseObject::SetRotation(const Quat& rotate, int flags) if (!bRotationDelegated && (flags & eObjectUpdateFlags_RestoreUndo) == 0 && (flags & eObjectUpdateFlags_Animated) == 0) { - StoreUndo("Rotate", true, flags); + StoreUndo(true, flags); } if (!bRotationDelegated) @@ -704,7 +649,7 @@ bool CBaseObject::SetScale(const Vec3& scale, int flags) if (!bScaleDelegated && (flags & eObjectUpdateFlags_RestoreUndo) == 0 && (flags & eObjectUpdateFlags_Animated) == 0) { - StoreUndo("Scale", true, flags); + StoreUndo(true, flags); } if (!bScaleDelegated) @@ -763,7 +708,7 @@ void CBaseObject::ChangeColor(const QColor& color) return; } - StoreUndo("Color", true); + StoreUndo(true); SetColor(color); SetModified(false); @@ -783,7 +728,7 @@ void CBaseObject::SetArea(float area) return; } - StoreUndo("Area", true); + StoreUndo(true); m_flattenArea = area; SetModified(false); @@ -1183,47 +1128,6 @@ bool CBaseObject::CanBeDrawn(const DisplayContext& dc, bool& outDisplaySelection return bResult; } -////////////////////////////////////////////////////////////////////////// -int CBaseObject::MouseCreateCallback(CViewport* view, EMouseEvent event, QPoint& point, int flags) -{ - AZ_PROFILE_FUNCTION(Editor); - - if (event == eMouseMove || event == eMouseLDown) - { - Vec3 pos; - if (GetIEditor()->GetAxisConstrains() != AXIS_TERRAIN) - { - pos = view->MapViewToCP(point); - } - else - { - // Snap to terrain. - bool hitTerrain; - pos = view->ViewToWorld(point, &hitTerrain); - if (hitTerrain) - { - pos.z = GetIEditor()->GetTerrainElevation(pos.x, pos.y) + 1.0f; - } - pos = view->SnapToGrid(pos); - } - SetPos(pos); - - if (event == eMouseLDown) - { - return MOUSECREATE_OK; - } - } - - if (event == eMouseWheel) - { - float angle = 1; - Quat rot = GetRotation(); - rot.SetRotationXYZ(Ang3(0.f, 0.f, rot.GetRotZ() + DEG2RAD(flags > 0 ? angle * (-1) : angle))); - SetRotation(rot); - } - return MOUSECREATE_CONTINUE; -} - ////////////////////////////////////////////////////////////////////////// void CBaseObject::OnEvent(ObjectEvent event) { @@ -1237,18 +1141,13 @@ void CBaseObject::OnEvent(ObjectEvent event) ////////////////////////////////////////////////////////////////////////// -void CBaseObject::SetShared([[maybe_unused]] bool bShared) -{ -} - -////////////////////////////////////////////////////////////////////////// -void CBaseObject::SetHidden(bool bHidden, uint64 hiddenID, bool bAnimated) +void CBaseObject::SetHidden(bool bHidden, bool bAnimated) { if (CheckFlags(OBJFLAG_HIDDEN) != bHidden) { if (!bAnimated) { - StoreUndo("Hide Object"); + StoreUndo(); } if (bHidden) @@ -1260,7 +1159,6 @@ void CBaseObject::SetHidden(bool bHidden, uint64 hiddenID, bool bAnimated) ClearFlags(OBJFLAG_HIDDEN); } - m_hideOrder = hiddenID; UpdateVisibility(!IsHidden()); } } @@ -1270,7 +1168,7 @@ void CBaseObject::SetFrozen(bool bFrozen) { if (CheckFlags(OBJFLAG_FROZEN) != bFrozen) { - StoreUndo("Freeze Object"); + StoreUndo(); if (bFrozen) { SetFlags(OBJFLAG_FROZEN); @@ -1356,14 +1254,6 @@ void CBaseObject::Serialize(CObjectArchive& ar) if (ar.bLoading) { // Loading. - if (ar.ShouldResetInternalMembers()) - { - m_flags = 0; - m_flattenArea = 0.0f; - m_nMinSpec = 0; - m_scale.Set(1.0f, 1.0f, 1.0f); - } - int flags = 0; int oldFlags = m_flags; @@ -1403,7 +1293,6 @@ void CBaseObject::Serialize(CObjectArchive& ar) xmlNode->getAttr("LookAt", lookatId); xmlNode->getAttr("Material", mtlName); xmlNode->getAttr("MinSpec", nMinSpec); - xmlNode->getAttr("FloorNumber", m_floorNumber); if (nMinSpec <= CONFIG_VERYHIGH_SPEC) // Ignore invalid values. { @@ -1467,18 +1356,6 @@ void CBaseObject::Serialize(CObjectArchive& ar) SetModified(false); ////////////////////////////////////////////////////////////////////////// - - if (ar.bUndo) - { - // If we are selected update UI Panel. - xmlNode->getAttr("HideOrder", m_hideOrder); - } - - // We reseted the min spec and deserialized it so set it internally - if (ar.ShouldResetInternalMembers()) - { - SetMinSpec(m_nMinSpec); - } } else { @@ -1490,7 +1367,6 @@ void CBaseObject::Serialize(CObjectArchive& ar) xmlNode->setAttr("Id", m_guid); xmlNode->setAttr("Name", GetName().toUtf8().data()); - xmlNode->setAttr("HideOrder", m_hideOrder); if (m_parent) { @@ -1507,8 +1383,6 @@ void CBaseObject::Serialize(CObjectArchive& ar) xmlNode->setAttr("Pos", GetPos()); } - xmlNode->setAttr("FloorNumber", m_floorNumber); - xmlNode->setAttr("Rotate", m_rotate); if (!IsEquivalent(GetScale(), Vec3(1, 1, 1), 0)) @@ -1601,13 +1475,8 @@ CBaseObject* CBaseObject::FindObject(REFGUID id) const } ////////////////////////////////////////////////////////////////////////// -void CBaseObject::StoreUndo(const char* UndoDescription, bool minimal, int flags) +void CBaseObject::StoreUndo(bool minimal, int flags) { - if (m_objType == OBJTYPE_DUMMY) - { - return; - } - // Don't use Sandbox undo for AZ entities, except for the move & scale tools, which rely on it. const bool isGizmoTool = 0 != (flags & (eObjectUpdateFlags_MoveTool | eObjectUpdateFlags_ScaleTool | eObjectUpdateFlags_UserInput)); if (!isGizmoTool && 0 != (m_flags & OBJFLAG_DONT_SAVE)) @@ -1619,28 +1488,18 @@ void CBaseObject::StoreUndo(const char* UndoDescription, bool minimal, int flags { if (minimal) { - CUndo::Record(new CUndoBaseObjectMinimal(this, UndoDescription, flags)); + CUndo::Record(new CUndoBaseObjectMinimal(this, flags)); } else { - CUndo::Record(new CUndoBaseObject(this, UndoDescription)); + CUndo::Record(new CUndoBaseObject(this)); } } } -////////////////////////////////////////////////////////////////////////// -bool CBaseObject::IsCreateGameObjects() const -{ - return GetObjectManager()->IsCreateGameObjects(); -} - ////////////////////////////////////////////////////////////////////////// QString CBaseObject::GetTypeName() const { - if (m_objType == OBJTYPE_DUMMY) - { - return ""; - } QString className = m_classDesc->ClassName(); QString subClassName = strstr(className.toUtf8().data(), "::"); if (subClassName.isEmpty()) @@ -1901,85 +1760,6 @@ bool CBaseObject::HitTestRect(HitContext& hc) return bHit; } -////////////////////////////////////////////////////////////////////////// -bool CBaseObject::HitHelperTest(HitContext& hc) -{ - return HitHelperAtTest(hc, GetWorldPos()); -} - -////////////////////////////////////////////////////////////////////////// -bool CBaseObject::HitHelperAtTest(HitContext& hc, const Vec3& pos) -{ - AZ_PROFILE_FUNCTION(Editor); - - bool bResult = false; - - if (m_nTextureIcon && (gSettings.viewports.bShowIcons || gSettings.viewports.bShowSizeBasedIcons) && !hc.bUseSelectionHelpers) - { - int iconSizeX = OBJECT_TEXTURE_ICON_SIZEX; - int iconSizeY = OBJECT_TEXTURE_ICON_SIZEY; - - if (gSettings.viewports.bDistanceScaleIcons) - { - float fScreenScale = hc.view->GetScreenScaleFactor(pos); - - iconSizeX = static_cast(static_cast(iconSizeX) * OBJECT_TEXTURE_ICON_SCALE / fScreenScale); - iconSizeY = static_cast(static_cast(iconSizeY) * OBJECT_TEXTURE_ICON_SCALE / fScreenScale); - } - - // Hit Test icon of this object. - Vec3 testPos = pos; - int y0 = -(iconSizeY / 2); - int y1 = +(iconSizeY / 2); - if (CheckFlags(OBJFLAG_SHOW_ICONONTOP)) - { - Vec3 objectPos = GetWorldPos(); - - AABB box; - GetBoundBox(box); - testPos.z = (pos.z - objectPos.z) + box.max.z; - y0 = -(iconSizeY); - y1 = 0; - } - QPoint pnt = hc.view->WorldToView(testPos); - - if (hc.point2d.x() >= pnt.x() - (iconSizeX / 2) && hc.point2d.x() <= pnt.x() + (iconSizeX / 2) && - hc.point2d.y() >= pnt.y() + y0 && hc.point2d.y() <= pnt.y() + y1) - { - hc.dist = hc.raySrc.GetDistance(testPos) - 0.2f; - hc.iconHit = true; - bResult = true; - } - } - else if (hc.bUseSelectionHelpers) - { - // Check potentially children first - bResult = HitHelperTestForChildObjects(hc); - - // If no hit check this object - if (!bResult) - { - // Hit test helper. - Vec3 w = pos - hc.raySrc; - w = hc.rayDir.Cross(w); - float d = w.GetLengthSquared(); - - static const float screenScaleToRadiusFactor = 0.008f; - const float radius = hc.view->GetScreenScaleFactor(pos) * screenScaleToRadiusFactor; - const float pickDistance = hc.raySrc.GetDistance(pos); - if (d < radius * radius + hc.distanceTolerance && hc.dist >= pickDistance) - { - hc.dist = pickDistance; - hc.object = this; - bResult = true; - } - } - } - - - return bResult; -} - ////////////////////////////////////////////////////////////////////////// CBaseObject* CBaseObject::GetChild(size_t const i) const { @@ -1987,47 +1767,6 @@ CBaseObject* CBaseObject::GetChild(size_t const i) const return m_childs[i]; } -////////////////////////////////////////////////////////////////////////// -bool CBaseObject::IsChildOf(CBaseObject* node) -{ - CBaseObject* p = m_parent; - while (p && p != node) - { - p = p->m_parent; - } - if (p == node) - { - return true; - } - return false; -} - -////////////////////////////////////////////////////////////////////////// - - -////////////////////////////////////////////////////////////////////////// -void CBaseObject::CloneChildren(CBaseObject* pFromObject) -{ - if (pFromObject == nullptr) - { - return; - } - - for (size_t i = 0, nChildCount(pFromObject->GetChildCount()); i < nChildCount; ++i) - { - CBaseObject* pFromChildObject = pFromObject->GetChild(i); - - CBaseObject* pChildClone = GetObjectManager()->CloneObject(pFromChildObject); - if (pChildClone == nullptr) - { - continue; - } - - pChildClone->CloneChildren(pFromChildObject); - AddMember(pChildClone, false); - } -} - ////////////////////////////////////////////////////////////////////////// void CBaseObject::AttachChild(CBaseObject* child, bool bKeepPos) { @@ -2044,7 +1783,6 @@ void CBaseObject::AttachChild(CBaseObject* child, bool bKeepPos) return; } - static_cast(GetObjectManager())->NotifyObjectListeners(child, ON_PREATTACHED); child->NotifyListeners(bKeepPos ? ON_PREATTACHEDKEEPXFORM : ON_PREATTACHED); pTransformDelegate = m_pTransformDelegate; @@ -2089,7 +1827,6 @@ void CBaseObject::AttachChild(CBaseObject* child, bool bKeepPos) m_pTransformDelegate = pTransformDelegate; child->m_pTransformDelegate = pChildTransformDelegate; - static_cast(GetObjectManager())->NotifyObjectListeners(child, ON_ATTACHED); child->NotifyListeners(ON_ATTACHED); NotifyListeners(ON_CHILDATTACHED); @@ -2127,7 +1864,6 @@ void CBaseObject::DetachThis(bool bKeepPos) { CScopedSuspendUndo suspendUndo; - static_cast(GetObjectManager())->NotifyObjectListeners(this, ON_PREDETACHED); NotifyListeners(bKeepPos ? ON_PREDETACHEDKEEPXFORM : ON_PREDETACHED); pTransformDelegate = m_pTransformDelegate; @@ -2158,7 +1894,6 @@ void CBaseObject::DetachThis(bool bKeepPos) SetTransformDelegate(pTransformDelegate); - static_cast(GetObjectManager())->NotifyObjectListeners(this, ON_DETACHED); NotifyListeners(ON_DETACHED); } } @@ -2262,12 +1997,6 @@ Matrix34 CBaseObject::GetParentAttachPointWorldTM() const return Matrix34(IDENTITY); } -////////////////////////////////////////////////////////////////////////// -bool CBaseObject::IsParentAttachmentValid() const -{ - return true; -} - ////////////////////////////////////////////////////////////////////////// void CBaseObject::InvalidateTM([[maybe_unused]] int flags) { @@ -2418,7 +2147,7 @@ void CBaseObject::SetLookAt(CBaseObject* target) return; } - StoreUndo("Change LookAt"); + StoreUndo(); if (m_lookat) { @@ -2543,63 +2272,6 @@ void CBaseObject::Validate(IErrorReport* report) ////////////////////////////////////////////////////////////////////////// }; -////////////////////////////////////////////////////////////////////////// -Ang3 CBaseObject::GetWorldAngles() const -{ - if (m_scale == Vec3(1, 1, 1)) - { - Quat q = Quat(GetWorldTM()); - Ang3 angles = RAD2DEG(Ang3::GetAnglesXYZ(Matrix33(q))); - return angles; - } - else - { - Matrix34 tm = GetWorldTM(); - tm.OrthonormalizeFast(); - Quat q = Quat(tm); - Ang3 angles = RAD2DEG(Ang3::GetAnglesXYZ(Matrix33(q))); - return angles; - } -}; - -////////////////////////////////////////////////////////////////////////// -void CBaseObject::PostClone(CBaseObject* pFromObject, CObjectCloneContext& ctx) -{ - CBaseObject* pFromParent = pFromObject->GetParent(); - if (pFromParent) - { - SetFloorNumber(pFromObject->GetFloorNumber()); - - CBaseObject* pFromParentInContext = ctx.FindClone(pFromParent); - if (pFromParentInContext) - { - pFromParentInContext->AddMember(this, false); - } - else - { - pFromParent->AddMember(this, false); - } - } - if (pFromObject->ShouldCloneChildren()) - { - for (int i = 0; i < pFromObject->GetChildCount(); i++) - { - CBaseObject* pChildObject = pFromObject->GetChild(i); - CBaseObject* pClonedChild = GetObjectManager()->CloneObject(pChildObject); - ctx.AddClone(pChildObject, pClonedChild); - } - for (int i = 0; i < pFromObject->GetChildCount(); i++) - { - CBaseObject* pChildObject = pFromObject->GetChild(i); - CBaseObject* pClonedChild = ctx.FindClone(pChildObject); - if (pClonedChild) - { - pClonedChild->PostClone(pChildObject, ctx); - } - } - } -} - ////////////////////////////////////////////////////////////////////////// void CBaseObject::GatherUsedResources(CUsedResources& resources) { @@ -2635,79 +2307,6 @@ void CBaseObject::SetMinSpec(uint32 nSpec, bool bSetChildren) } } -////////////////////////////////////////////////////////////////////////// -void CBaseObject::OnPropertyChanged(IVariable*) -{ -} - -////////////////////////////////////////////////////////////////////////// -void CBaseObject::OnMultiSelPropertyChanged(IVariable*) -{ -} - -////////////////////////////////////////////////////////////////////////// -void CBaseObject::OnMenuShowInAssetBrowser() -{ - if (!IsSelected()) - { - CUndo undo("Select Object"); - GetIEditor()->GetObjectManager()->ClearSelection(); - GetIEditor()->SelectObject(this); - } - - GetIEditor()->ExecuteCommand("asset_browser.show_viewport_selection"); -} - -////////////////////////////////////////////////////////////////////////// -void CBaseObject::OnContextMenu(QMenu* menu) -{ - if (!menu->isEmpty()) - { - menu->addSeparator(); - } - CUsedResources resources; - GatherUsedResources(resources); - - static_cast(GetIEditor())->OnObjectContextMenuOpened(menu, this); -} - -////////////////////////////////////////////////////////////////////////// -bool CBaseObject::IntersectRayMesh(const Vec3& raySrc, const Vec3& rayDir, SRayHitInfo& outHitInfo) const -{ - const float fRenderMeshTestDistance = 0.2f; - IRenderNode* pRenderNode = GetEngineNode(); - if (!pRenderNode) - { - return false; - } - - Matrix34 worldTM; - IStatObj* pStatObj = pRenderNode->GetEntityStatObj(0, 0, &worldTM); - if (!pStatObj) - { - return false; - } - - // transform decal into object space - Matrix34 worldTM_Inverted = worldTM.GetInverted(); - Matrix33 worldRot(worldTM_Inverted); - worldRot.Transpose(); - // put hit direction into the object space - Vec3 vRayDir = rayDir.GetNormalized() * worldRot; - // put hit position into the object space - Vec3 vHitPos = worldTM_Inverted.TransformPoint(raySrc); - Vec3 vLineP1 = vHitPos - vRayDir * fRenderMeshTestDistance; - - memset(&outHitInfo, 0, sizeof(outHitInfo)); - outHitInfo.inReferencePoint = vHitPos; - outHitInfo.inRay.origin = vLineP1; - outHitInfo.inRay.direction = vRayDir; - outHitInfo.bInFirstHit = false; - outHitInfo.bUseCache = false; - - return pStatObj->RayIntersection(outHitInfo, nullptr); -} - ////////////////////////////////////////////////////////////////////////// EScaleWarningLevel CBaseObject::GetScaleWarningLevel() const { diff --git a/Code/Editor/Objects/BaseObject.h b/Code/Editor/Objects/BaseObject.h index ab14437659..f78755e81d 100644 --- a/Code/Editor/Objects/BaseObject.h +++ b/Code/Editor/Objects/BaseObject.h @@ -35,8 +35,6 @@ struct SSubObjSelectionModifyContext; struct SRayHitInfo; class CPopupMenuItem; class QMenu; -struct IRenderNode; -struct IStatObj; ////////////////////////////////////////////////////////////////////////// typedef _smart_ptr CBaseObjectPtr; @@ -119,15 +117,6 @@ enum ObjectFlags #define ERF_GET_WRITABLE(flags) (flags) -////////////////////////////////////////////////////////////////////////// -//! This flags passed to CBaseObject::BeginEditParams method. -enum ObjectEditFlags -{ - OBJECT_CREATE = 0x001, - OBJECT_EDIT = 0x002, - OBJECT_COLLAPSE_OBJECTPANEL = 0x004 -}; - ////////////////////////////////////////////////////////////////////////// //! Return values from CBaseObject::MouseCreateCallback method. enum MouseCreateResult @@ -137,19 +126,6 @@ enum MouseCreateResult MOUSECREATE_OK, //!< Accept this object. }; -////////////////////////////////////////////////////////////////////////// -// Interface to the object create with the mouse callback. -////////////////////////////////////////////////////////////////////////// -struct IMouseCreateCallback -{ - virtual void Release() = 0; - virtual MouseCreateResult OnMouseEvent(CViewport* view, EMouseEvent event, QPoint& point, int flags) = 0; - // Some process of creation need to be able to be displayed such as creation for custom solid. - virtual void Display([[maybe_unused]] DisplayContext& dc){} - // Called after accepting an object to see if new object creation mode should be continued. - virtual bool ContinueCreation() = 0; -}; - // Flags used for object interaction enum EObjectUpdateFlags { @@ -261,22 +237,11 @@ public: /** Check if both object are of same class. */ - virtual bool IsSameClass(CBaseObject* obj); - virtual void SetDefaultType() { m_objType = OBJTYPE_DUMMY; }; virtual ObjectType GetType() const { - if (m_objType == OBJTYPE_DUMMY) - { - return m_objType; - } - else - { - return m_classDesc->GetObjectType(); - } + return m_classDesc->GetObjectType(); }; - // const char* GetTypeName() const { return m_classDesc->ClassName(); }; QString GetTypeName() const; - virtual QString GetTypeDescription() const { return m_classDesc->ClassName(); }; ////////////////////////////////////////////////////////////////////////// // Flags. @@ -289,8 +254,6 @@ public: // Hidden ID ////////////////////////////////////////////////////////////////////////// static const uint64 s_invalidHiddenID = 0; - uint64 GetHideOrder() const { return m_hideOrder; } - void SetHideOrder(uint64 newID) { m_hideOrder = newID; } //! Returns true if object hidden. bool IsHidden() const; @@ -307,26 +270,19 @@ public: virtual bool IsSelectable() const; // Return texture icon. - bool HaveTextureIcon() const { return m_nTextureIcon != 0; }; int GetTextureIcon() const { return m_nTextureIcon; } void SetTextureIcon(int nTexIcon) { m_nTextureIcon = nTexIcon; } - //! Set shared between missions flag. - virtual void SetShared(bool bShared); //! Set object hidden status. - virtual void SetHidden(bool bHidden, uint64 hiddenId = CBaseObject::s_invalidHiddenID, bool bAnimated = false); + virtual void SetHidden(bool bHidden, bool bAnimated = false); //! Set object frozen status. virtual void SetFrozen(bool bFrozen); //! Set object selected status. virtual void SetSelected(bool bSelect); - //! Return associated 3DEngine render node - virtual IRenderNode* GetEngineNode() const { return nullptr; }; //! Set object highlighted (Note: not selected) virtual void SetHighlight(bool bHighlight); //! Check if object is highlighted. bool IsHighlighted() const { return CheckFlags(OBJFLAG_HIGHLIGHT); } - //! Check if object can have measurement axises. - virtual bool HasMeasurementAxis() const { return true; } //! Check if the object is isolated when the editor is in Isolation Mode virtual bool IsIsolated() const { return false; } @@ -345,8 +301,6 @@ public: ////////////////////////////////////////////////////////////////////////// //! Get name of object. const QString& GetName() const; - virtual QString GetComment() const { return QString(); } - virtual QString GetWarningsText() const; //! Change name of object. virtual void SetName(const QString& name); @@ -376,10 +330,6 @@ public: //! Get object scale. const Vec3 GetScale() const; - virtual bool StartScaling() { return false; } - virtual bool GetUntransformedScale([[maybe_unused]] Vec3& scale) const { return false; } - virtual bool TransformScale([[maybe_unused]] const Vec3& scale) { return false; } - //! Set flatten area. void SetArea(float area); float GetArea() const { return m_flattenArea; }; @@ -397,8 +347,6 @@ public: // CHILDS ////////////////////////////////////////////////////////////////////////// - //! Return true if node have childs. - bool HaveChilds() const { return !m_childs.empty(); } //! Return true if have attached childs. size_t GetChildCount() const { return m_childs.size(); } @@ -406,10 +354,6 @@ public: CBaseObject* GetChild(size_t const i) const; //! Return parent node if exist. CBaseObject* GetParent() const { return m_parent; }; - //! Scans hierarchy up to determine if we child of specified node. - virtual bool IsChildOf(CBaseObject* node); - //! Clone Children - void CloneChildren(CBaseObject* pFromObject); //! Attach new child node. //! @param bKeepPos if true Child node will keep its world space position. virtual void AttachChild(CBaseObject* child, bool bKeepPos = true); @@ -422,8 +366,6 @@ public: virtual void DetachAll(bool bKeepPos = true); // Detach this node from parent. virtual void DetachThis(bool bKeepPos = true); - // Returns the link parent. - virtual CBaseObject* GetLinkParent() const { return GetParent(); } ////////////////////////////////////////////////////////////////////////// // MATRIX @@ -437,15 +379,11 @@ public: // Gets matrix of parent attachment point virtual Matrix34 GetParentAttachPointWorldTM() const; - // Checks if the attachment point is valid - virtual bool IsParentAttachmentValid() const; - //! Set position in world space. virtual void SetWorldPos(const Vec3& pos, int flags = 0); //! Get position in world space. Vec3 GetWorldPos() const { return GetWorldTM().GetTranslation(); }; - Ang3 GetWorldAngles() const; //! Set xform of object given in world space. virtual void SetWorldTM(const Matrix34& tm, int flags = 0); @@ -460,12 +398,6 @@ public: // Interface to be implemented in plugins. ////////////////////////////////////////////////////////////////////////// - //! Called when object is being created (use GetMouseCreateCallback for more advanced mouse creation callback). - virtual int MouseCreateCallback(CViewport* view, EMouseEvent event, QPoint& point, int flags); - // Return pointer to the callback object used when creating object by the mouse. - // If this function return nullptr MouseCreateCallback method will be used instead. - virtual IMouseCreateCallback* GetMouseCreateCallback() { return nullptr; }; - //! Draw object to specified viewport. virtual void Display([[maybe_unused]] DisplayContext& disp) {} @@ -477,10 +409,6 @@ public: //! Return true if was hit. virtual bool HitTestRect(HitContext& hc); - //! Perform intersection testing of this object based on its icon helper. - //! Return true if was hit. - virtual bool HitHelperTest(HitContext& hc); - //! Get bounding box of object in world coordinate space. virtual void GetBoundBox(AABB& box); @@ -500,8 +428,6 @@ public: //! @param bUndo true if loading or saving data for Undo/Redo purposes. virtual void Serialize(CObjectArchive& ar); - //// Pre load called before serialize after all objects where completly loaded. - //virtual void PreLoad( CObjectArchive &ar ) {}; // Post load called after all objects where completely loaded. virtual void PostLoad([[maybe_unused]] CObjectArchive& ar) {}; @@ -513,9 +439,6 @@ public: //! Override in derived classes, to handle specific events. virtual void OnEvent(ObjectEvent event); - //! Generate dynamic context menu for the object - virtual void OnContextMenu(QMenu* menu); - ////////////////////////////////////////////////////////////////////////// // LookAt Target. ////////////////////////////////////////////////////////////////////////// @@ -523,13 +446,11 @@ public: CBaseObject* GetLookAt() const { return m_lookat; }; //! Returns true if this object is a look-at target. bool IsLookAtTarget() const; - CBaseObject* GetLookAtSource() const { return m_lookatSource; }; - IObjectManager* GetObjectManager() const; //! Store undo information for this object. - void StoreUndo(const char* undoDescription, bool minimal = false, int flags = 0); + void StoreUndo(bool minimal = false, int flags = 0); //! Add event listener callback. void AddEventListener(EventListener* listener); @@ -548,52 +469,21 @@ public: //! Check if specified object is very similar to this one. virtual bool IsSimilarObject(CBaseObject* pObject); - ////////////////////////////////////////////////////////////////////////// - // Material Layers Mask. - ////////////////////////////////////////////////////////////////////////// - virtual void SetMaterialLayersMask(uint32 nLayersMask) { m_nMaterialLayersMask = nLayersMask; } - uint32 GetMaterialLayersMask() const { return m_nMaterialLayersMask; }; - ////////////////////////////////////////////////////////////////////////// // Object minimal usage spec (All/Low/Medium/High) ////////////////////////////////////////////////////////////////////////// uint32 GetMinSpec() const { return m_nMinSpec; } virtual void SetMinSpec(uint32 nSpec, bool bSetChildren = true); - ////////////////////////////////////////////////////////////////////////// - // SubObj selection. - ////////////////////////////////////////////////////////////////////////// - // Return true if object support selecting of this sub object element type. - virtual bool StartSubObjSelection([[maybe_unused]] int elemType) { return false; }; - virtual void EndSubObjectSelection() {}; - virtual void ModifySubObjSelection([[maybe_unused]] SSubObjSelectionModifyContext& modCtx) {}; - virtual void AcceptSubObjectModify() {}; - //! In This function variables of the object must be initialized. virtual void InitVariables() {}; - ////////////////////////////////////////////////////////////////////////// - // Procedural Floor Management. - ////////////////////////////////////////////////////////////////////////// - int GetFloorNumber() const { return m_floorNumber; }; - void SetFloorNumber(int floorNumber) { m_floorNumber = floorNumber; }; - - virtual void OnPropertyChanged(IVariable*); - virtual void OnMultiSelPropertyChanged(IVariable*); - //! Draw a reddish highlight indicating its budget usage. virtual void DrawBudgetUsage(DisplayContext& dc, const QColor& color); - bool IntersectRayMesh(const Vec3& raySrc, const Vec3& rayDir, SRayHitInfo& outHitInfo) const; - - virtual void EditTags([[maybe_unused]] bool alwaysTag) {} - virtual bool SupportsEditTags() const { return false; } - bool CanBeHightlighted() const; bool IsSkipSelectionHelper() const; - virtual IStatObj* GetIStatObj() { return nullptr; } - // Invalidates cached transformation matrix. // nWhyFlags - Flags that indicate the reason for matrix invalidation. virtual void InvalidateTM(int nWhyFlags); @@ -612,26 +502,14 @@ protected: //! Optional file parameter specify initial object or script for this object. virtual bool Init(IEditor* ie, CBaseObject* prev, const QString& file); - ////////////////////////////////////////////////////////////////////////// - //! Must be called after cloning the object on clone of object. - //! This will make sure object references are cloned correctly. - virtual void PostClone(CBaseObject* pFromObject, CObjectCloneContext& ctx); - //! Must be implemented by derived class to create game related objects. virtual bool CreateGameObject() { return true; }; - //! If true, all attached chilren will be cloned when the parent object is cloned. - virtual bool ShouldCloneChildren() const { return true; } - /** Called when object is about to be deleted. - All Game resources should be freed in this function. + All Game resources should be freed in this function. */ virtual void Done(); - /** Change current id of object. - */ - //virtual void SetId( uint32 objectId ) { m_id = objectId; }; - //! Call this to delete an object. virtual void DeleteThis() = 0; @@ -682,17 +560,11 @@ protected: // Function can be used by derived classes. bool HitTestRectBounds(HitContext& hc, const AABB& box); - // Do helper hit testing as specific location. - bool HitHelperAtTest(HitContext& hc, const Vec3& pos); - // Do helper hit testing taking child objects into account (e.g. opened prefab) virtual bool HitHelperTestForChildObjects([[maybe_unused]] HitContext& hc) { return false; } CBaseObject* FindObject(REFGUID id) const; - // Returns true if game objects should be created. - bool IsCreateGameObjects() const; - // Helper gizmo functions. void AddGizmo(CGizmo* gizmo); void RemoveGizmo(CGizmo* gizmo); @@ -703,14 +575,6 @@ protected: //! Only used by ObjectManager. bool IsPotentiallyVisible() const; - ////////////////////////////////////////////////////////////////////////// - // May be overridden in derived classes to handle helpers scaling. - ////////////////////////////////////////////////////////////////////////// - virtual void SetHelperScale([[maybe_unused]] float scale) {}; - virtual float GetHelperScale() { return 1.0f; }; - - void SetNameInternal(const QString& name) { m_name = name; } - void SetDrawTextureIconProperties(DisplayContext& dc, const Vec3& pos, float alpha = 1.0f, int texIconFlags = 0); const Vec3& GetTextureIconDrawPos(){ return m_vDrawIconPos; }; int GetTextureIconFlags(){ return m_nIconFlags; }; @@ -732,8 +596,6 @@ private: friend class CObjectArchive; friend class CSelectionGroup; - void OnMenuShowInAssetBrowser(); - //! Set class description for this object, //! Only called once after creation by ObjectManager. void SetClassDesc(CObjectClassDesc* classDesc); @@ -741,9 +603,6 @@ private: EScaleWarningLevel GetScaleWarningLevel() const; ERotationWarningLevel GetRotationWarningLevel() const; - // auto resolving - void OnMtlResolved(uint32 id, bool success, const char* orgName, const char* newName); - bool IsInSelectionBox() const { return m_bInSelectionBox; } void SetId(REFGUID guid) { m_guid = guid; } @@ -766,13 +625,10 @@ private: //! Unique object Id. GUID m_guid; - // floor number of object if procedural object flag is set - int m_floorNumber; - //! Flags of this object. int m_flags; - // Id of the texture icon for this object. + //! Id of the texture icon for this object. int m_nTextureIcon; //! Display color. @@ -823,13 +679,10 @@ private: mutable uint32 m_bMatrixValid : 1; mutable uint32 m_bWorldBoxValid : 1; uint32 m_bInSelectionBox : 1; - uint32 m_nMaterialLayersMask : 8; uint32 m_nMinSpec : 8; Vec3 m_vDrawIconPos; AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING - - uint64 m_hideOrder; }; Q_DECLARE_METATYPE(CBaseObject*) diff --git a/Code/Editor/Objects/DisplayContext.h b/Code/Editor/Objects/DisplayContext.h index f4df4f95c6..8f54be78fe 100644 --- a/Code/Editor/Objects/DisplayContext.h +++ b/Code/Editor/Objects/DisplayContext.h @@ -81,11 +81,38 @@ struct SANDBOX_API DisplayContext // Draw functions ////////////////////////////////////////////////////////////////////////// //! Set current materialc color. - void SetColor(float r, float g, float b, float a = 1) { m_color4b = ColorB(static_cast(r * 255.0f), static_cast(g * 255.0f), static_cast(b * 255.0f), static_cast(a * 255.0f)); }; - void SetColor(const Vec3& color, float a = 1) { m_color4b = ColorB(static_cast(color.x * 255.0f), static_cast(color.y * 255.0f), static_cast(color.z * 255.0f), static_cast(a * 255.0f)); }; - void SetColor(const QColor& rgb, float a) { m_color4b = ColorB(static_cast(rgb.red()), static_cast(rgb.green()), static_cast(rgb.blue()), static_cast(a * 255.0f)); }; - void SetColor(const QColor& color) { m_color4b = ColorB(static_cast(color.red()), static_cast(color.green()), static_cast(color.blue()), static_cast(color.alpha())); }; - void SetColor(const ColorB& color) { m_color4b = color; }; + void SetColor(float r, float g, float b, float a = 1) + { + m_color4b = ColorB( + static_cast(r * 255.0f), static_cast(g * 255.0f), static_cast(b * 255.0f), static_cast(a * 255.0f)); + }; + void SetColor(const Vec3& color, float a = 1) + { + m_color4b = ColorB( + static_cast(color.x * 255.0f), static_cast(color.y * 255.0f), static_cast(color.z * 255.0f), + static_cast(a * 255.0f)); + }; + void SetColor(const AZ::Vector3& color, float a = 1) + { + m_color4b = ColorB( + static_cast(color.GetX() * 255.0f), static_cast(color.GetY() * 255.0f), static_cast(color.GetZ() * 255.0f), + static_cast(a * 255.0f)); + }; + void SetColor(const QColor& rgb, float a) + { + m_color4b = ColorB( + static_cast(rgb.red()), static_cast(rgb.green()), static_cast(rgb.blue()), static_cast(a * 255.0f)); + }; + void SetColor(const QColor& color) + { + m_color4b = ColorB( + static_cast(color.red()), static_cast(color.green()), static_cast(color.blue()), + static_cast(color.alpha())); + }; + void SetColor(const ColorB& color) + { + m_color4b = color; + }; void SetAlpha(float a = 1) { m_color4b.a = static_cast(a * 255.0f); }; ColorB GetColor() const { return m_color4b; } @@ -108,6 +135,7 @@ struct SANDBOX_API DisplayContext void DrawTrianglesIndexed(const AZStd::vector& vertices, const AZStd::vector& indices, const ColorB& color); // Draw wireframe box. void DrawWireBox(const Vec3& min, const Vec3& max); + void DrawWireBox(const AZ::Vector3& min, const AZ::Vector3& max); // Draw filled box void DrawSolidBox(const Vec3& min, const Vec3& max); void DrawSolidOBB(const Vec3& center, const Vec3& axisX, const Vec3& axisY, const Vec3& axisZ, const Vec3& halfExtents); diff --git a/Code/Editor/Objects/DisplayContextShared.inl b/Code/Editor/Objects/DisplayContextShared.inl index e884f874e0..1fbd2ef7b6 100644 --- a/Code/Editor/Objects/DisplayContextShared.inl +++ b/Code/Editor/Objects/DisplayContextShared.inl @@ -225,6 +225,12 @@ void DisplayContext::DrawWireBox(const Vec3& min, const Vec3& max) pRenderAuxGeom->DrawAABB(AABB(min, max), m_matrixStack[m_currentMatrix], false, m_color4b, eBBD_Faceted); } +void DisplayContext::DrawWireBox(const AZ::Vector3& min, const AZ::Vector3& max) +{ + pRenderAuxGeom->DrawAABB( + AABB(Vec3(min.GetX(), min.GetY(), min.GetZ()), Vec3(max.GetX(), max.GetY(), max.GetZ())), + m_matrixStack[m_currentMatrix], false, m_color4b, eBBD_Faceted); +} ////////////////////////////////////////////////////////////////////////// void DisplayContext::DrawSolidBox(const Vec3& min, const Vec3& max) { diff --git a/Code/Editor/Objects/EntityObject.cpp b/Code/Editor/Objects/EntityObject.cpp index ae847da160..86512377c6 100644 --- a/Code/Editor/Objects/EntityObject.cpp +++ b/Code/Editor/Objects/EntityObject.cpp @@ -28,8 +28,7 @@ #include "HitContext.h" #include "Objects/SelectionGroup.h" -#include -#include +static constexpr int VIEW_DISTANCE_MULTIPLIER_MAX = 100; ////////////////////////////////////////////////////////////////////////// //! Undo Entity Link @@ -58,7 +57,6 @@ public: protected: void Release() override { delete this; }; int GetSize() override { return sizeof(*this); }; // Return size of xml state. - QString GetDescription() override { return "Entity Link"; }; QString GetObjectName() override{ return ""; }; void Undo([[maybe_unused]] bool bUndo) override @@ -139,7 +137,6 @@ private: } int GetSize() override { return sizeof(CUndoAttachEntity); } - QString GetDescription() override { return "Attachment Changed"; } GUID m_attachedEntityGUID; CEntityObject::EAttachmentType m_attachmentType; @@ -151,8 +148,6 @@ private: // CBase implementation. ////////////////////////////////////////////////////////////////////////// -float CEntityObject::m_helperScale = 1; - namespace { CEntityObject* s_pPropertyPanelEntityObject = nullptr; @@ -163,12 +158,9 @@ namespace ////////////////////////////////////////////////////////////////////////// CEntityObject::CEntityObject() - : m_listeners(1) { m_bLoadFailed = false; - m_visualObject = nullptr; - m_box.min.Set(0, 0, 0); m_box.max.Set(0, 0, 0); @@ -223,7 +215,7 @@ CEntityObject::CEntityObject() mv_ratioLOD = 100; mv_viewDistanceMultiplier = 1.0f; mv_ratioLOD.SetLimits(0, 255); - mv_viewDistanceMultiplier.SetLimits(0.0f, IRenderNode::VIEW_DISTANCE_MULTIPLIER_MAX); + mv_viewDistanceMultiplier.SetLimits(0.0f, VIEW_DISTANCE_MULTIPLIER_MAX); m_physicsState = nullptr; @@ -247,7 +239,6 @@ CEntityObject::CEntityObject() m_onSetCallbacksCache.emplace_back([this](IVariable* var) { OnProjectInAllDirsChange(var); }); m_onSetCallbacksCache.emplace_back([this](IVariable* var) { OnProjectorFOVChange(var); }); m_onSetCallbacksCache.emplace_back([this](IVariable* var) { OnProjectorTextureChange(var); }); - m_onSetCallbacksCache.emplace_back([this](IVariable* var) { OnPropertyChange(var); }); m_onSetCallbacksCache.emplace_back([this](IVariable* var) { OnRadiusChange(var); }); } @@ -295,11 +286,6 @@ void CEntityObject::Done() ReleaseEventTargets(); RemoveAllEntityLinks(); - for (CListenerSet::Notifier notifier(m_listeners); notifier.IsValid(); notifier.Next()) - { - notifier->OnDone(); - } - CBaseObject::Done(); } @@ -365,12 +351,6 @@ void CEntityObject::SetTransformDelegate(ITransformDelegate* pTransformDelegate) ResetCallbacks(); } -////////////////////////////////////////////////////////////////////////// -bool CEntityObject::IsSameClass(CBaseObject* obj) -{ - return (GetClassDesc() == obj->GetClassDesc()); -} - ////////////////////////////////////////////////////////////////////////// bool CEntityObject::ConvertFromObject(CBaseObject* object) { @@ -458,33 +438,10 @@ bool CEntityObject::HitTest(HitContext& hc) return false; } -////////////////////////////////////////////////////////////////////////// -bool CEntityObject::HitHelperTest(HitContext& hc) -{ - bool bResult = CBaseObject::HitHelperTest(hc); - if (bResult) - { - hc.object = this; - } - - return bResult; -} - ////////////////////////////////////////////////////////////////////////// bool CEntityObject::HitTestRect(HitContext& hc) { - bool bResult = false; - - if (m_visualObject && !gSettings.viewports.bShowIcons && !gSettings.viewports.bShowSizeBasedIcons) - { - AABB box; - box.SetTransformedAABB(GetWorldTM(), m_visualObject->GetAABB()); - bResult = HitTestRectBounds(hc, box); - } - else - { - bResult = CBaseObject::HitTestRect(hc); - } + bool bResult = CBaseObject::HitTestRect(hc); if (bResult) { @@ -494,42 +451,6 @@ bool CEntityObject::HitTestRect(HitContext& hc) return bResult; } -////////////////////////////////////////////////////////////////////////// -int CEntityObject::MouseCreateCallback(CViewport* view, EMouseEvent event, QPoint& point, int flags) -{ - AZ_PROFILE_FUNCTION(Entity); - - if (event == eMouseMove || event == eMouseLDown) - { - Vec3 pos; - // Rise Entity above ground on Bounding box amount. - if (GetIEditor()->GetAxisConstrains() != AXIS_TERRAIN) - { - pos = view->MapViewToCP(point); - } - else - { - // Snap to terrain. - bool hitTerrain; - pos = view->ViewToWorld(point, &hitTerrain); - if (hitTerrain) - { - pos.z = GetIEditor()->GetTerrainElevation(pos.x, pos.y); - pos.z = pos.z - m_box.min.z; - } - pos = view->SnapToGrid(pos); - } - SetPos(pos); - - if (event == eMouseLDown) - { - return MOUSECREATE_OK; - } - return MOUSECREATE_CONTINUE; - } - return CBaseObject::MouseCreateCallback(view, event, point, flags); -} - ////////////////////////////////////////////////////////////////////////// IVariable* CEntityObject::FindVariableInSubBlock(CVarBlockPtr& properties, IVariable* pSubBlockVar, const char* pVarName) { @@ -680,11 +601,6 @@ void CEntityObject::SetName(const QString& name) CBaseObject::SetName(name); - CListenerSet listeners = m_listeners; - for (CListenerSet::Notifier notifier(listeners); notifier.IsValid(); notifier.Next()) - { - notifier->OnNameChanged(name.toUtf8().data()); - } } ////////////////////////////////////////////////////////////////////////// @@ -697,19 +613,6 @@ void CEntityObject::SetSelected(bool bSelect) UpdateLightProperty(); } - for (CListenerSet::Notifier notifier(m_listeners); notifier.IsValid(); notifier.Next()) - { - notifier->OnSelectionChanged(bSelect); - } -} - -////////////////////////////////////////////////////////////////////////// -void CEntityObject::OnPropertyChange([[maybe_unused]] IVariable* var) -{ - if (s_ignorePropertiesUpdate) - { - return; - } } template @@ -941,11 +844,9 @@ void CEntityObject::Serialize(CObjectArchive& ar) m_eventTargets.emplace_back(AZStd::move(et)); if (targetId != GUID_NULL) { - using namespace AZStd::placeholders; ar.SetResolveCallback( this, targetId, - [this](CBaseObject* object, unsigned int index) { ResolveEventTarget(object, index); }, - i); + [this,i](CBaseObject* object) { ResolveEventTarget(object, i); }); } } } @@ -1154,12 +1055,6 @@ XmlNodeRef CEntityObject::Export([[maybe_unused]] const QString& levelPath, XmlN objNode->setAttr("MinSpec", ( uint32 )GetMinSpec()); } - uint32 nMtlLayersMask = GetMaterialLayersMask(); - if (nMtlLayersMask != 0) - { - objNode->setAttr("MatLayersMask", nMtlLayersMask); - } - if (mv_hiddenInGame) { objNode->setAttr("HiddenInGame", true); @@ -1256,11 +1151,6 @@ void CEntityObject::OnEvent(ObjectEvent event) case EVENT_CONFIG_SPEC_CHANGE: { - IObjectManager* objMan = GetIEditor()->GetObjectManager(); - if (objMan && objMan->IsLightClass(this)) - { - OnPropertyChange(nullptr); - } break; } default: @@ -1350,56 +1240,6 @@ QString CEntityObject::GetLightAnimation() const return ""; } -////////////////////////////////////////////////////////////////////////// -void CEntityObject::PostClone(CBaseObject* pFromObject, CObjectCloneContext& ctx) -{ - CBaseObject::PostClone(pFromObject, ctx); - - CEntityObject* pFromEntity = ( CEntityObject* )pFromObject; - // Clone event targets. - if (!pFromEntity->m_eventTargets.empty()) - { - size_t numTargets = pFromEntity->m_eventTargets.size(); - for (size_t i = 0; i < numTargets; i++) - { - CEntityEventTarget& et = pFromEntity->m_eventTargets[i]; - CBaseObject* pClonedTarget = ctx.FindClone(et.target); - if (!pClonedTarget) - { - pClonedTarget = et.target; // If target not cloned, link to original target. - } - - // Add cloned event. - AddEventTarget(pClonedTarget, et.event, et.sourceEvent, true); - } - } - - // Clone links. - if (!pFromEntity->m_links.empty()) - { - int numTargets = static_cast(pFromEntity->m_links.size()); - for (int i = 0; i < numTargets; i++) - { - CEntityLink& et = pFromEntity->m_links[i]; - CBaseObject* pClonedTarget = ctx.FindClone(et.target); - if (!pClonedTarget) - { - pClonedTarget = et.target; // If target not cloned, link to original target. - } - - // Add cloned event. - if (pClonedTarget) - { - AddEntityLink(et.name, pClonedTarget->GetId()); - } - else - { - AddEntityLink(et.name, GUID_NULL); - } - } - } -} - ////////////////////////////////////////////////////////////////////////// void CEntityObject::ResolveEventTarget(CBaseObject* object, unsigned int index) { @@ -1554,7 +1394,7 @@ void CEntityObject::OnObjectEvent(CBaseObject* target, int event) ////////////////////////////////////////////////////////////////////////// int CEntityObject::AddEventTarget(CBaseObject* target, const QString& event, const QString& sourceEvent, [[maybe_unused]] bool bUpdateScript) { - StoreUndo("Add EventTarget"); + StoreUndo(); CEntityEventTarget et; et.target = target; et.event = event; @@ -1588,7 +1428,7 @@ void CEntityObject::RemoveEventTarget(int index, [[maybe_unused]] bool bUpdateSc { if (index >= 0 && index < m_eventTargets.size()) { - StoreUndo("Remove EventTarget"); + StoreUndo(); if (m_eventTargets[index].pLineGizmo) { @@ -1624,7 +1464,7 @@ int CEntityObject::AddEntityLink(const QString& name, GUID targetEntityId) } } - StoreUndo("Add EntityLink"); + StoreUndo(); CLineGizmo* pLineGizmo = nullptr; @@ -1672,7 +1512,7 @@ void CEntityObject::RemoveEntityLink(int index) if (index >= 0 && index < m_links.size()) { CEntityLink& link = m_links[index]; - StoreUndo("Remove EntityLink"); + StoreUndo(); if (link.pLineGizmo) { @@ -1695,7 +1535,7 @@ void CEntityObject::RenameEntityLink(int index, const QString& newName) { if (index >= 0 && index < m_links.size()) { - StoreUndo("Rename EntityLink"); + StoreUndo(); if (m_links[index].pLineGizmo) { @@ -1842,18 +1682,6 @@ void CEntityObject::OnLoadFailed() GetIEditor()->GetErrorReport()->ReportError(err); } -////////////////////////////////////////////////////////////////////////// -void CEntityObject::SetHelperScale(float scale) -{ - m_helperScale = scale; -} - -////////////////////////////////////////////////////////////////////////// -float CEntityObject::GetHelperScale() -{ - return m_helperScale; -} - ////////////////////////////////////////////////////////////////////////// //! Analyze errors for this object. void CEntityObject::Validate(IErrorReport* report) @@ -1901,19 +1729,6 @@ bool CEntityObject::IsSimilarObject(CBaseObject* pObject) return false; } -////////////////////////////////////////////////////////////////////////// -void CEntityObject::OnContextMenu(QMenu* pMenu) -{ - if (!pMenu->isEmpty()) - { - pMenu->addSeparator(); - } - - // Events - - CBaseObject::OnContextMenu(pMenu); -} - ////////////////////////////////////////////////////////////////////////// void CEntityObject::PreInitLightProperty() { @@ -2171,16 +1986,6 @@ void CEntityObject::StoreUndoEntityLink(CSelectionGroup* pGroup) } } -void CEntityObject::RegisterListener(IEntityObjectListener* pListener) -{ - m_listeners.Add(pListener); -} - -void CEntityObject::UnregisterListener(IEntityObjectListener* pListener) -{ - m_listeners.Remove(pListener); -} - template T CEntityObject::GetEntityProperty(const char* pName, T defaultvalue) const { diff --git a/Code/Editor/Objects/EntityObject.h b/Code/Editor/Objects/EntityObject.h index a4f4752b75..c3e379bccc 100644 --- a/Code/Editor/Objects/EntityObject.h +++ b/Code/Editor/Objects/EntityObject.h @@ -16,10 +16,7 @@ #include "BaseObject.h" #include "IMovieSystem.h" -#include "IEntityObjectListener.h" #include "Gizmo.h" -#include "CryListenerSet.h" -#include "StatObjBus.h" #include #endif @@ -81,11 +78,6 @@ public: ////////////////////////////////////////////////////////////////////////// // Overrides from CBaseObject. ////////////////////////////////////////////////////////////////////////// - //! Return type name of Entity. - QString GetTypeDescription() const override { return GetEntityClass(); }; - - ////////////////////////////////////////////////////////////////////////// - bool IsSameClass(CBaseObject* obj) override; bool Init(IEditor* ie, CBaseObject* prev, const QString& file) override; void InitVariables() override; @@ -102,16 +94,12 @@ public: void SetEntityPropertyFloat(const char* name, float value); void SetEntityPropertyString(const char* name, const QString& value); - int MouseCreateCallback(CViewport* view, EMouseEvent event, QPoint& point, int flags) override; - void OnContextMenu(QMenu* menu) override; - void SetName(const QString& name) override; void SetSelected(bool bSelect) override; void GetLocalBounds(AABB& box) override; bool HitTest(HitContext& hc) override; - bool HitHelperTest(HitContext& hc) override; bool HitTestRect(HitContext& hc) override; void UpdateVisibility(bool bVisible) override; bool ConvertFromObject(CBaseObject* object) override; @@ -139,14 +127,9 @@ public: EAttachmentType GetAttachType() const { return m_attachmentType; } QString GetAttachTarget() const { return m_attachmentTarget; } - void SetHelperScale(float scale) override; - float GetHelperScale() override; - void GatherUsedResources(CUsedResources& resources) override; bool IsSimilarObject(CBaseObject* pObject) override; - bool HasMeasurementAxis() const override { return false; } - bool IsIsolated() const override { return false; } ////////////////////////////////////////////////////////////////////////// @@ -220,20 +203,12 @@ public: static void StoreUndoEntityLink(CSelectionGroup* pGroup); - void RegisterListener(IEntityObjectListener* pListener); - void UnregisterListener(IEntityObjectListener* pListener); - protected: template void SetEntityProperty(const char* name, T value); template T GetEntityProperty(const char* name, T defaultvalue) const; - ////////////////////////////////////////////////////////////////////////// - //! Must be called after cloning the object on clone of object. - //! This will make sure object references are cloned correctly. - void PostClone(CBaseObject* pFromObject, CObjectCloneContext& ctx) override; - //! Draw default object items. void DrawProjectorPyramid(DisplayContext& dc, float dist); void DrawProjectorFrustum(DisplayContext& dc, Vec2 size, float dist); @@ -242,10 +217,6 @@ protected: CVarBlock* CloneProperties(CVarBlock* srcProperties); - ////////////////////////////////////////////////////////////////////////// - //! Callback called when one of entity properties have been modified. - void OnPropertyChange(IVariable* var); - ////////////////////////////////////////////////////////////////////////// void OnObjectEvent(CBaseObject* target, int event) override; void ResolveEventTarget(CBaseObject* object, unsigned int index); @@ -327,7 +298,6 @@ protected: // Used for light entities float m_projectorFOV; - IStatObj* m_visualObject; AABB m_box; ////////////////////////////////////////////////////////////////////////// @@ -388,8 +358,6 @@ protected: XmlNodeRef m_physicsState; AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING - static float m_helperScale; - EAttachmentType m_attachmentType; bool m_bEnableReload; @@ -433,7 +401,6 @@ private: void ForceVariableUpdate(); AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING - CListenerSet m_listeners; std::vector< std::pair > m_callbacks; AZStd::fixed_vector< IVariable::OnSetCallback, VariableCallbackIndex::Count > m_onSetCallbacksCache; AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING diff --git a/Code/Editor/Objects/IEntityObjectListener.h b/Code/Editor/Objects/IEntityObjectListener.h deleted file mode 100644 index 9072a837d0..0000000000 --- a/Code/Editor/Objects/IEntityObjectListener.h +++ /dev/null @@ -1,20 +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 - -class IEntityObjectListener -{ -public: - virtual ~IEntityObjectListener() = default; - - virtual void OnNameChanged(const char* pName) = 0; - virtual void OnSelectionChanged(const bool bSelected) = 0; - virtual void OnDone() = 0; -}; - diff --git a/Code/Editor/Objects/ObjectLoader.cpp b/Code/Editor/Objects/ObjectLoader.cpp index 9596265bb9..63ac4c93af 100644 --- a/Code/Editor/Objects/ObjectLoader.cpp +++ b/Code/Editor/Objects/ObjectLoader.cpp @@ -28,19 +28,12 @@ CObjectArchive::CObjectArchive(IObjectManager* objMan, XmlNodeRef xmlRoot, bool m_nFlags = 0; node = xmlRoot; m_pCurrentErrorReport = GetIEditor()->GetErrorReport(); - m_pGeometryPak = nullptr; - m_pCurrentObject = nullptr; m_bNeedResolveObjects = false; - m_bProgressBarEnabled = true; } ////////////////////////////////////////////////////////////////////////// CObjectArchive::~CObjectArchive() { - if (m_pGeometryPak) - { - delete m_pGeometryPak; - } // Always make sure objects are resolved when loading from archive. if (bLoading && m_bNeedResolveObjects) { @@ -74,31 +67,6 @@ void CObjectArchive::SetResolveCallback(CBaseObject* fromObject, REFGUID objectI } } -////////////////////////////////////////////////////////////////////////// -void CObjectArchive::SetResolveCallback(CBaseObject* fromObject, REFGUID objectId, ResolveObjRefFunctor2 func, uint32 userData) -{ - if (objectId == GUID_NULL) - { - func(0, userData); - return; - } - - CBaseObject* object = m_objectManager->FindObject(objectId); - if (object && !(m_nFlags & eObjectLoader_MakeNewIDs)) - { - // Object is already resolved. immidiatly call callback. - func(object, userData); - } - else - { - Callback cb; - cb.fromObject = fromObject; - cb.func2 = func; - cb.userData = userData; - m_resolveCallbacks.insert(Callbacks::value_type(objectId, cb)); - } -} - ////////////////////////////////////////////////////////////////////////// GUID CObjectArchive::ResolveID(REFGUID id) { @@ -117,10 +85,7 @@ void CObjectArchive::ResolveObjects() { CWaitProgress wait("Loading Objects", false); - if (m_bProgressBarEnabled) - { - wait.Start(); - } + wait.Start(); GetIEditor()->SuspendUndo(); ////////////////////////////////////////////////////////////////////////// @@ -129,10 +94,7 @@ void CObjectArchive::ResolveObjects() int numObj = static_cast(m_loadedObjects.size()); for (i = 0; i < numObj; i++) { - if (m_bProgressBarEnabled) - { - wait.Step((i * 100) / numObj); - } + wait.Step((i * 100) / numObj); SLoadedObjectInfo& obj = m_loadedObjects[i]; m_pCurrentErrorReport->SetCurrentValidatorObject(obj.pObject); @@ -204,30 +166,20 @@ void CObjectArchive::ResolveObjects() { (cb.func1)(object); } - if (cb.func2) - { - (cb.func2)(object, cb.userData); - } } m_resolveCallbacks.clear(); ////////////////////////////////////////////////////////////////////////// { CWaitProgress wait("Creating Objects", false); - if (m_bProgressBarEnabled) - { - wait.Start(); - } + wait.Start(); ////////////////////////////////////////////////////////////////////////// // Serialize All Objects from XML. ////////////////////////////////////////////////////////////////////////// int numObj = static_cast(m_loadedObjects.size()); for (i = 0; i < numObj; i++) { - if (m_bProgressBarEnabled) - { - wait.Step((i * 100) / numObj); - } + wait.Step((i * 100) / numObj); SLoadedObjectInfo& obj = m_loadedObjects[i]; m_pCurrentErrorReport->SetCurrentValidatorObject(obj.pObject); @@ -258,8 +210,6 @@ void CObjectArchive::ResolveObjects() m_bNeedResolveObjects = false; m_pCurrentErrorReport->SetCurrentValidatorObject(nullptr); - m_sequenceIdRemap.clear(); - m_pendingIds.clear(); } ////////////////////////////////////////////////////////////////////////// @@ -272,7 +222,6 @@ void CObjectArchive::SaveObject(CBaseObject* pObject) if (m_savedObjects.find(pObject) == m_savedObjects.end()) { - m_pCurrentObject = pObject; m_savedObjects.insert(pObject); // If this object was not saved before. XmlNodeRef objNode = node->newChild("Object"); @@ -307,45 +256,6 @@ CBaseObject* CObjectArchive::LoadObject(const XmlNodeRef& objNode, CBaseObject* return pObject; } -////////////////////////////////////////////////////////////////////////// -void CObjectArchive::LoadObjects(XmlNodeRef& rootObjectsNode) -{ - int numObjects = rootObjectsNode->getChildCount(); - for (int i = 0; i < numObjects; i++) - { - XmlNodeRef objNode = rootObjectsNode->getChild(i); - LoadObject(objNode, nullptr); - } -} - -////////////////////////////////////////////////////////////////////////// -void CObjectArchive::ReportError(CErrorRecord& err) -{ - if (m_pCurrentErrorReport) - { - m_pCurrentErrorReport->ReportError(err); - } -} - -////////////////////////////////////////////////////////////////////////// -void CObjectArchive::SetErrorReport(CErrorReport* errReport) -{ - if (errReport) - { - m_pCurrentErrorReport = errReport; - } - else - { - m_pCurrentErrorReport = GetIEditor()->GetErrorReport(); - } -} - -////////////////////////////////////////////////////////////////////////// -void CObjectArchive::ShowErrors() -{ - GetIEditor()->GetErrorReport()->Display(); -} - ////////////////////////////////////////////////////////////////////////// void CObjectArchive::MakeNewIds(bool bEnable) { @@ -359,70 +269,8 @@ void CObjectArchive::MakeNewIds(bool bEnable) } } -////////////////////////////////////////////////////////////////////////// -void CObjectArchive::SetShouldResetInternalMembers(bool reset) -{ - if (reset) - { - m_nFlags |= eObjectLoader_ResetInternalMembers; - } - else - { - m_nFlags &= ~(eObjectLoader_ResetInternalMembers); - } -} - ////////////////////////////////////////////////////////////////////////// void CObjectArchive::RemapID(REFGUID oldId, REFGUID newId) { m_IdRemap[oldId] = newId; } - -////////////////////////////////////////////////////////////////////////// -CPakFile* CObjectArchive::GetGeometryPak(const char* sFilename) -{ - if (m_pGeometryPak) - { - return m_pGeometryPak; - } - m_pGeometryPak = new CPakFile; - m_pGeometryPak->Open(sFilename); - return m_pGeometryPak; -} - -////////////////////////////////////////////////////////////////////////// -CBaseObject* CObjectArchive::GetCurrentObject() -{ - return m_pCurrentObject; -} - -////////////////////////////////////////////////////////////////////////// -void CObjectArchive::AddSequenceIdMapping(uint32 oldId, uint32 newId) -{ - assert(oldId != newId); - assert(GetIEditor()->GetMovieSystem()->FindSequenceById(oldId) || stl::find(m_pendingIds, oldId)); - assert(GetIEditor()->GetMovieSystem()->FindSequenceById(newId) == nullptr); - assert(stl::find(m_pendingIds, newId) == false); - m_sequenceIdRemap[oldId] = newId; - m_pendingIds.push_back(newId); -} - -////////////////////////////////////////////////////////////////////////// -uint32 CObjectArchive::RemapSequenceId(uint32 id) const -{ - std::map::const_iterator itr = m_sequenceIdRemap.find(id); - if (itr == m_sequenceIdRemap.end()) - { - return id; - } - else - { - return itr->second; - } -} - -////////////////////////////////////////////////////////////////////////// -bool CObjectArchive::IsAmongPendingIds(uint32 id) const -{ - return stl::find(m_pendingIds, id); -} diff --git a/Code/Editor/Objects/ObjectLoader.h b/Code/Editor/Objects/ObjectLoader.h index a491e50da0..fc1014ad03 100644 --- a/Code/Editor/Objects/ObjectLoader.h +++ b/Code/Editor/Objects/ObjectLoader.h @@ -6,18 +6,13 @@ * */ - -#ifndef CRYINCLUDE_EDITOR_OBJECTS_OBJECTLOADER_H -#define CRYINCLUDE_EDITOR_OBJECTS_OBJECTLOADER_H #pragma once #include "Util/GuidUtil.h" #include "ErrorReport.h" +#include -#include - -class CPakFile; class CErrorRecord; struct IObjectManager; @@ -43,63 +38,27 @@ AZ_POP_DISABLE_DLL_EXPORT_BASECLASS_WARNING //! Resolve callback with only one parameter of CBaseObject. typedef AZStd::function ResolveObjRefFunctor1; - //! Resolve callback with two parameters one is pointer to CBaseObject and second use data integer. - typedef AZStd::function ResolveObjRefFunctor2; - - /** Register Object id. - @param objectId Original object id from the file. - @param realObjectId Changed object id. - */ - //void RegisterObjectId( int objectId,int realObjectId ); // Return object ID remapped after loading. GUID ResolveID(REFGUID id); //! Set object resolve callback, it will be called once object with specified Id is loaded. void SetResolveCallback(CBaseObject* fromObject, REFGUID objectId, ResolveObjRefFunctor1 func); - //! Set object resolve callback, it will be called once object with specified Id is loaded. - void SetResolveCallback(CBaseObject* fromObject, REFGUID objectId, ResolveObjRefFunctor2 func, uint32 userData); //! Resolve all object ids and call callbacks on resolved objects. void ResolveObjects(); // Save object to archive. void SaveObject(CBaseObject* pObject); - //! Load multiple objects from archive. - void LoadObjects(XmlNodeRef& rootObjectsNode); - //! Load one object from archive. CBaseObject* LoadObject(const XmlNodeRef& objNode, CBaseObject* pPrevObject = nullptr); - ////////////////////////////////////////////////////////////////////////// - int GetLoadedObjectsCount() { return static_cast(m_loadedObjects.size()); } - CBaseObject* GetLoadedObject(int nIndex) const { return m_loadedObjects[nIndex].pObject; } - //! If true new loaded objects will be assigned new GUIDs. void MakeNewIds(bool bEnable); //! Remap object ids. void RemapID(REFGUID oldId, REFGUID newId); - //! Report error during loading. - void ReportError(CErrorRecord& err); - //! Assigner different error report class. - void SetErrorReport(CErrorReport* errReport); - //! Display collected error reports. - void ShowErrors(); - - void EnableProgressBar(bool bEnable) { m_bProgressBarEnabled = bEnable; }; - - CPakFile* GetGeometryPak(const char* sFilename); - CBaseObject* GetCurrentObject(); - - void AddSequenceIdMapping(uint32 oldId, uint32 newId); - uint32 RemapSequenceId(uint32 id) const; - bool IsAmongPendingIds(uint32 id) const; - - void SetShouldResetInternalMembers(bool reset); - bool ShouldResetInternalMembers() const { return m_nFlags & eObjectLoader_ResetInternalMembers; } - private: struct SLoadedObjectInfo { @@ -110,22 +69,19 @@ private: bool operator <(const SLoadedObjectInfo& oi) const { return nSortOrder < oi.nSortOrder; } }; - IObjectManager* m_objectManager; struct Callback { ResolveObjRefFunctor1 func1; - ResolveObjRefFunctor2 func2; - uint32 userData; _smart_ptr fromObject; - Callback() { func1 = 0; func2 = 0; userData = 0; }; + Callback() { func1 = 0; } }; typedef std::multimap Callbacks; AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING Callbacks m_resolveCallbacks; // Set of all saved objects to this archive. - typedef std::set<_smart_ptr > ObjectsSet; + typedef AZStd::set<_smart_ptr > ObjectsSet; ObjectsSet m_savedObjects; //typedef std::multimap > OrderedObjects; @@ -138,20 +94,11 @@ private: enum EObjectLoaderFlags { eObjectLoader_MakeNewIDs = 0x0001, // If true new loaded objects will be assigned new GUIDs. - eObjectLoader_ResetInternalMembers = 0x0004, // In case we are deserializing and we would like to wipe all previous state }; int m_nFlags; IErrorReport* m_pCurrentErrorReport; - CPakFile* m_pGeometryPak; - CBaseObject* m_pCurrentObject; bool m_bNeedResolveObjects; - bool m_bProgressBarEnabled; - // This table is used when there is any collision of ids while importing TrackView sequences. - std::map m_sequenceIdRemap; - std::vector m_pendingIds; AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING }; - -#endif // CRYINCLUDE_EDITOR_OBJECTS_OBJECTLOADER_H diff --git a/Code/Editor/Objects/ObjectManager.cpp b/Code/Editor/Objects/ObjectManager.cpp index fb5b2b68c2..1dea6ece7f 100644 --- a/Code/Editor/Objects/ObjectManager.cpp +++ b/Code/Editor/Objects/ObjectManager.cpp @@ -50,7 +50,7 @@ public: GUID guid; public: - virtual ~CXMLObjectClassDesc() = default; + virtual ~CXMLObjectClassDesc() = default; REFGUID ClassID() override { return guid; @@ -81,60 +81,27 @@ CObjectManager* g_pObjectManager = nullptr; ////////////////////////////////////////////////////////////////////////// CObjectManager::CObjectManager() - : m_lastHideMask(0) - , m_maxObjectViewDistRatio(0.00001f) - , m_currSelection(&m_defaultSelection) - , m_nLastSelCount(0) + : m_currSelection(&m_defaultSelection) , m_bSelectionChanged(false) - , m_selectCallback(nullptr) - , m_currEditObject(nullptr) - , m_bSingleSelection(false) - , m_createGameObjects(true) - , m_bGenUniqObjectNames(true) , m_gizmoManager(new CGizmoManager()) - , m_pLoadProgress(nullptr) - , m_loadedObjects(0) - , m_totalObjectsToLoad(0) , m_bExiting(false) , m_isUpdateVisibilityList(false) , m_currentHideCount(CBaseObject::s_invalidHiddenID) - , m_bInReloading(false) - , m_bSkipObjectUpdate(false) - , m_bLevelExporting(false) { g_pObjectManager = this; - RegisterObjectClasses(); - m_objectsByName.reserve(1024); - LoadRegistry(); } ////////////////////////////////////////////////////////////////////////// CObjectManager::~CObjectManager() { m_bExiting = true; - SaveRegistry(); DeleteAllObjects(); delete m_gizmoManager; } -////////////////////////////////////////////////////////////////////////// -void CObjectManager::RegisterObjectClasses() -{ - LoadRegistry(); -} - -////////////////////////////////////////////////////////////////////////// -void CObjectManager::SaveRegistry() -{ -} - -void CObjectManager::LoadRegistry() -{ -} - ////////////////////////////////////////////////////////////////////////// CBaseObject* CObjectManager::NewObject(CObjectClassDesc* cls, CBaseObject* prev, const QString& file, const char* newObjectName) { @@ -307,12 +274,6 @@ CBaseObject* CObjectManager::NewObject(CObjectArchive& ar, CBaseObject* pUndoObj } } - m_loadedObjects++; - if (m_pLoadProgress && m_totalObjectsToLoad > 0) - { - m_pLoadProgress->Step((m_loadedObjects * 100) / m_totalObjectsToLoad); - } - return pObject; } @@ -340,10 +301,6 @@ CBaseObject* CObjectManager::NewObject(const QString& typeName, CBaseObject* pre void CObjectManager::DeleteObject(CBaseObject* obj) { AZ_PROFILE_FUNCTION(Editor); - if (m_currEditObject == obj) - { - EndEditParams(); - } if (!obj) { @@ -356,7 +313,6 @@ void CObjectManager::DeleteObject(CBaseObject* obj) return; } - NotifyObjectListeners(obj, CBaseObject::ON_PREDELETE); obj->NotifyListeners(CBaseObject::ON_PREDELETE); // Must be after object DetachAll to support restoring Parent/Child relations. @@ -366,7 +322,7 @@ void CObjectManager::DeleteObject(CBaseObject* obj) // Store undo for all child objects. for (int i = 0; i < obj->GetChildCount(); i++) { - obj->GetChild(i)->StoreUndo("DeleteParent"); + obj->GetChild(i)->StoreUndo(); } CUndo::Record(new CUndoBaseObjectDelete(obj)); } @@ -377,8 +333,6 @@ void CObjectManager::DeleteObject(CBaseObject* obj) obj->Done(); - NotifyObjectListeners(obj, CBaseObject::ON_DELETE); - RemoveObject(obj); } @@ -451,22 +405,10 @@ void CObjectManager::DeleteAllObjects() { AZ_PROFILE_FUNCTION(Editor); - EndEditParams(); - ClearSelection(); - int i; InvalidateVisibleList(); - // Delete all selection groups. - std::vector sel; - stl::map_to_vector(m_selections, sel); - for (i = 0; i < sel.size(); i++) - { - delete sel[i]; - } - m_selections.clear(); - TBaseObjects objectsHolder; GetAllObjects(objectsHolder); @@ -474,7 +416,7 @@ void CObjectManager::DeleteAllObjects() m_objects.clear(); m_objectsByName.clear(); - for (i = 0; i < objectsHolder.size(); i++) + for (int i = 0; i < objectsHolder.size(); i++) { objectsHolder[i]->Done(); } @@ -488,17 +430,6 @@ void CObjectManager::DeleteAllObjects() m_animatedAttachedEntities.clear(); } -CBaseObject* CObjectManager::CloneObject(CBaseObject* obj) -{ - AZ_PROFILE_FUNCTION(Editor); - assert(obj); - //CRuntimeClass *cls = obj->GetRuntimeClass(); - //CBaseObject *clone = (CBaseObject*)cls->CreateObject(); - //clone->CloneCopy( obj ); - CBaseObject* clone = NewObject(obj->GetClassDesc(), obj); - return clone; -} - ////////////////////////////////////////////////////////////////////////// CBaseObject* CObjectManager::FindObject(REFGUID guid) const { @@ -609,7 +540,6 @@ bool CObjectManager::AddObject(CBaseObject* obj) RegisterObjectName(obj->GetName()); InvalidateVisibleList(); - NotifyObjectListeners(obj, CBaseObject::ON_ADD); return true; } @@ -630,12 +560,6 @@ void CObjectManager::RemoveObject(CBaseObject* obj) // Remove this object from selection groups. m_currSelection->RemoveObject(obj); - std::vector sel; - stl::map_to_vector(m_selections, sel); - for (int i = 0; i < sel.size(); i++) - { - sel[i]->RemoveObject(obj); - } m_objectsByName.erase(AZ::Crc32(obj->GetName().toUtf8().data(), obj->GetName().toUtf8().count(), true)); @@ -663,54 +587,7 @@ void CObjectManager::ChangeObjectId(REFGUID oldGuid, REFGUID newGuid) CBaseObjectPtr pRemappedObject = (*it).second; pRemappedObject->SetId(newGuid); m_objects.erase(it); - m_objects.insert(std::make_pair(newGuid, pRemappedObject)); - } -} - -////////////////////////////////////////////////////////////////////////// -void CObjectManager::ShowDuplicationMsgWarning(CBaseObject* obj, const QString& newName, bool bShowMsgBox) const -{ - CBaseObject* pExisting = FindObject(newName); - if (pExisting) - { - QString sRenameWarning = QObject::tr("%1 \"%2\" was NOT renamed to \"%3\" because %4 with the same name already exists.") - .arg(obj->GetClassDesc()->ClassName()) - .arg(obj->GetName()) - .arg(newName) - .arg(pExisting->GetClassDesc()->ClassName() - ); - - // If id is taken. - CryWarning(VALIDATOR_MODULE_EDITOR, VALIDATOR_WARNING, "%s", sRenameWarning.toUtf8().data()); - - if (bShowMsgBox) - { - QMessageBox::critical(QApplication::activeWindow(), QString(), sRenameWarning); - } - } -} - -////////////////////////////////////////////////////////////////////////// -void CObjectManager::ChangeObjectName(CBaseObject* obj, const QString& newName) -{ - assert(obj); - - if (newName != obj->GetName()) - { - if (IsDuplicateObjectName(newName)) - { - return; - } - - // Remove previous name from map - const AZ::Crc32 oldNameCrc(obj->GetName().toUtf8().data(), obj->GetName().count(), true); - m_objectsByName.erase(oldNameCrc); - - obj->SetName(newName); - - // Add new name to map - const AZ::Crc32 nameCrc(newName.toUtf8().data(), newName.count(), true); - m_objectsByName[nameCrc] = obj; + m_objects.insert(AZStd::make_pair(newGuid, pRemappedObject)); } } @@ -731,28 +608,9 @@ void CObjectManager::GetObjects(CBaseObjectsArray& objects) const } } -void CObjectManager::GetObjects(CBaseObjectsArray& objects, BaseObjectFilterFunctor const& filter) const -{ - objects.clear(); - objects.reserve(m_objects.size()); - for (Objects::const_iterator it = m_objects.begin(); it != m_objects.end(); ++it) - { - assert(it->second); - if (filter.first(*it->second, filter.second)) - { - objects.push_back(it->second); - } - } -} - ////////////////////////////////////////////////////////////////////////// void CObjectManager::SendEvent(ObjectEvent event) { - if (event == EVENT_RELOAD_ENTITY) - { - m_bInReloading = true; - } - for (Objects::iterator it = m_objects.begin(); it != m_objects.end(); ++it) { CBaseObject* obj = it->second; @@ -761,7 +619,6 @@ void CObjectManager::SendEvent(ObjectEvent event) if (event == EVENT_RELOAD_ENTITY) { - m_bInReloading = false; GetIEditor()->Notify(eNotify_OnReloadTrackView); } } @@ -781,93 +638,6 @@ void CObjectManager::SendEvent(ObjectEvent event, const AABB& bounds) } } -////////////////////////////////////////////////////////////////////////// -void CObjectManager::Update() -{ - if (m_bSkipObjectUpdate) - { - return; - } - - QWidget* prevActiveWindow = QApplication::activeWindow(); - - // Restore focus if it changed. - if (prevActiveWindow && QApplication::activeWindow() != prevActiveWindow) - { - prevActiveWindow->setFocus(); - } -} - -////////////////////////////////////////////////////////////////////////// -void CObjectManager::HideObject(CBaseObject* obj, bool hide) -{ - assert(obj != 0); - if (hide) - { - obj->SetHidden(hide, ++m_currentHideCount); - } - else - { - obj->SetHidden(false); - } - InvalidateVisibleList(); -} - -void CObjectManager::ShowLastHiddenObject() -{ - uint64 mostRecentID = CBaseObject::s_invalidHiddenID; - CBaseObject* mostRecentObject = nullptr; - for (const auto& it : m_objects) - { - CBaseObject* obj = it.second; - - uint64 hiddenID = obj->GetHideOrder(); - - if (hiddenID > mostRecentID) - { - mostRecentID = hiddenID; - mostRecentObject = obj; - } - } - - if (mostRecentObject != nullptr) - { - mostRecentObject->SetHidden(false); - } -} - -////////////////////////////////////////////////////////////////////////// -void CObjectManager::UnhideAll() -{ - for (Objects::iterator it = m_objects.begin(); it != m_objects.end(); ++it) - { - CBaseObject* obj = it->second; - obj->SetHidden(false); - } - - InvalidateVisibleList(); -} - -////////////////////////////////////////////////////////////////////////// -void CObjectManager::FreezeObject(CBaseObject* obj, bool freeze) -{ - assert(obj != 0); - // Remove object from main object set and put it to hidden set. - obj->SetFrozen(freeze); - InvalidateVisibleList(); -} - -////////////////////////////////////////////////////////////////////////// -void CObjectManager::UnfreezeAll() -{ - for (Objects::iterator it = m_objects.begin(); it != m_objects.end(); ++it) - { - CBaseObject* obj = it->second; - obj->SetFrozen(false); - } - InvalidateVisibleList(); -} - ////////////////////////////////////////////////////////////////////////// bool CObjectManager::SelectObject(CBaseObject* obj, bool bUseMask) { @@ -883,14 +653,6 @@ bool CObjectManager::SelectObject(CBaseObject* obj, bool bUseMask) return false; } - if (m_selectCallback) - { - if (!m_selectCallback->OnSelectObject(obj)) - { - return true; - } - } - m_currSelection->AddObject(obj); // while in ComponentMode we never explicitly change selection (the entity will always be selected). @@ -910,14 +672,6 @@ bool CObjectManager::SelectObject(CBaseObject* obj, bool bUseMask) return true; } -void CObjectManager::SelectEntities(std::set& s) -{ - for (std::set::iterator it = s.begin(), end = s.end(); it != end; ++it) - { - SelectObject(*it); - } -} - void CObjectManager::UnselectObject(CBaseObject* obj) { // while in ComponentMode we never explicitly change selection (the entity will always be selected). @@ -936,139 +690,6 @@ void CObjectManager::UnselectObject(CBaseObject* obj) m_currSelection->RemoveObject(obj); } -CSelectionGroup* CObjectManager::GetSelection(const QString& name) const -{ - CSelectionGroup* selection = stl::find_in_map(m_selections, name, (CSelectionGroup*)nullptr); - return selection; -} - -void CObjectManager::GetNameSelectionStrings(QStringList& names) -{ - for (TNameSelectionMap::iterator it = m_selections.begin(); it != m_selections.end(); ++it) - { - names.push_back(it->first); - } -} - -void CObjectManager::NameSelection(const QString& name) -{ - if (m_currSelection->IsEmpty()) - { - return; - } - - CSelectionGroup* selection = stl::find_in_map(m_selections, name, (CSelectionGroup*)nullptr); - if (selection) - { - assert(selection != 0); - // Check if trying to rename itself to the same name. - if (selection == m_currSelection) - { - return; - } - m_selections.erase(name); - delete selection; - } - selection = new CSelectionGroup; - selection->Copy(*m_currSelection); - selection->SetName(name); - m_selections[name] = selection; - m_currSelection = selection; - m_defaultSelection.RemoveAll(); -} - -void CObjectManager::SerializeNameSelection(XmlNodeRef& rootNode, bool bLoading) -{ - if (!rootNode) - { - return; - } - - _smart_ptr tmpGroup(nullptr); - - QString selRootStr("NameSelection"); - QString selNodeStr("NameSelectionNode"); - QString selNodeNameStr("name"); - QString idStr("id"); - QString objAttrStr("obj"); - - XmlNodeRef startNode = rootNode->findChild(selRootStr.toUtf8().data()); - - if (bLoading) - { - m_selections.erase(m_selections.begin(), m_selections.end()); - - if (startNode) - { - for (int selNodeNo = 0; selNodeNo < startNode->getChildCount(); ++selNodeNo) - { - XmlNodeRef selNode = startNode->getChild(selNodeNo); - tmpGroup = new CSelectionGroup; - - for (int objIDNodeNo = 0; objIDNodeNo < selNode->getChildCount(); ++objIDNodeNo) - { - GUID curID = GUID_NULL; - XmlNodeRef idNode = selNode->getChild(objIDNodeNo); - if (!idNode->getAttr(idStr.toUtf8().data(), curID)) - { - continue; - } - - if (curID != GUID_NULL) - { - if (GetIEditor()->GetObjectManager()->FindObject(curID)) - { - tmpGroup->AddObject(GetIEditor()->GetObjectManager()->FindObject(curID)); - } - } - } - - if (tmpGroup->GetCount() > 0) - { - QString nameStr; - if (!selNode->getAttr(selNodeNameStr.toUtf8().data(), nameStr)) - { - continue; - } - tmpGroup->SetName(nameStr); - m_selections[nameStr] = tmpGroup; - } - } - } - } - else - { - startNode = rootNode->newChild(selRootStr.toUtf8().data()); - CSelectionGroup* objSelection = nullptr; - - for (TNameSelectionMap::iterator it = m_selections.begin(); it != m_selections.end(); ++it) - { - XmlNodeRef selectionNameNode = startNode->newChild(selNodeStr.toUtf8().data()); - selectionNameNode->setAttr(selNodeNameStr.toUtf8().data(), it->first.toUtf8().data()); - objSelection = it->second; - - if (!objSelection) - { - continue; - } - - if (objSelection->GetCount() == 0) - { - continue; - } - - for (int i = 0; i < objSelection->GetCount(); ++i) - { - if (objSelection->GetObject(i)) - { - XmlNodeRef objNode = selectionNameNode->newChild(objAttrStr.toUtf8().data()); - objNode->setAttr(idStr.toUtf8().data(), GuidUtil::ToString(objSelection->GetObject(i)->GetId())); - } - } - } - } -} - ////////////////////////////////////////////////////////////////////////// int CObjectManager::ClearSelection() { @@ -1122,63 +743,6 @@ int CObjectManager::ClearSelection() return numSel; } -////////////////////////////////////////////////////////////////////////// -int CObjectManager::InvertSelection() -{ - AZ_PROFILE_FUNCTION(Editor); - - int selCount = 0; - // iterate all objects. - for (Objects::const_iterator it = m_objects.begin(); it != m_objects.end(); ++it) - { - CBaseObject* pObj = it->second; - if (pObj->IsSelected()) - { - UnselectObject(pObj); - } - else - { - if (SelectObject(pObj)) - { - selCount++; - } - } - } - return selCount; -} - -void CObjectManager::SetSelection(const QString& name) -{ - AZ_PROFILE_FUNCTION(Editor); - CSelectionGroup* selection = stl::find_in_map(m_selections, name, (CSelectionGroup*)nullptr); - if (selection) - { - UnselectCurrent(); - assert(selection != 0); - m_currSelection = selection; - SelectCurrent(); - } -} - -void CObjectManager::RemoveSelection(const QString& name) -{ - AZ_PROFILE_FUNCTION(Editor); - - QString selName = name; - CSelectionGroup* selection = stl::find_in_map(m_selections, name, (CSelectionGroup*)nullptr); - if (selection) - { - if (selection == m_currSelection) - { - UnselectCurrent(); - m_currSelection = &m_defaultSelection; - m_defaultSelection.RemoveAll(); - } - delete selection; - m_selections.erase(selName); - } -} - void CObjectManager::SelectCurrent() { AZ_PROFILE_FUNCTION(Editor); @@ -1250,157 +814,7 @@ void CObjectManager::Display(DisplayContext& dc) } } -void CObjectManager::ForceUpdateVisibleObjectCache([[maybe_unused]] DisplayContext& dc) -{ - AZ_Assert(false, "CObjectManager::ForceUpdateVisibleObjectCache is legacy/deprecated and should not be used."); -} - -void CObjectManager::FindDisplayableObjects([[maybe_unused]] DisplayContext& dc, [[maybe_unused]] bool bDisplay) -{ - AZ_Assert(false, "CObjectManager::FindDisplayableObjects is legacy/deprecated and should not be used."); -} - -void CObjectManager::BeginEditParams(CBaseObject* obj, int flags) -{ - assert(obj != 0); - if (obj == m_currEditObject) - { - return; - } - - if (GetSelection()->GetCount() > 1) - { - return; - } - - QWidget* prevActiveWindow = QApplication::activeWindow(); - - if (m_currEditObject) - { - //if (obj->GetClassDesc() != m_currEditObject->GetClassDesc()) - if (!obj->IsSameClass(m_currEditObject)) - { - EndEditParams(flags); - } - } - - m_currEditObject = obj; - - if (flags & OBJECT_CREATE) - { - // Unselect all other objects. - ClearSelection(); - // Select this object. - SelectObject(obj, false); - } - - m_bSingleSelection = true; - - // Restore focus if it changed. - // OBJECT_EDIT is used by the EntityOutliner when items are selected. Using it here to prevent shifting focus to the EntityInspector on select. - if (!(flags & OBJECT_EDIT) && prevActiveWindow && QApplication::activeWindow() != prevActiveWindow) - { - prevActiveWindow->setFocus(); - } -} - -void CObjectManager::EndEditParams([[maybe_unused]] int flags) -{ - m_bSingleSelection = false; - m_currEditObject = nullptr; - //m_bSelectionChanged = false; // don't need to clear for ungroup -} - -//! Select objects within specified distance from given position. -int CObjectManager::SelectObjects(const AABB& box, bool bUnselect) -{ - AZ_PROFILE_FUNCTION(Editor); - int numSel = 0; - - AABB objBounds; - for (Objects::iterator it = m_objects.begin(); it != m_objects.end(); ++it) - { - CBaseObject* obj = it->second; - - if (obj->IsHidden()) - { - continue; - } - - obj->GetBoundBox(objBounds); - if (box.IsIntersectBox(objBounds)) - { - numSel++; - if (!bUnselect) - { - SelectObject(obj); - } - else - { - UnselectObject(obj); - } - } - } - return numSel; -} - ////////////////////////////////////////////////////////////////////////// -int CObjectManager::MoveObjects(const AABB& box, const Vec3& offset, ImageRotationDegrees rotation, [[maybe_unused]] bool bIsCopy) -{ - AABB objBounds; - - Vec3 src = (box.min + box.max) / 2; - Vec3 dst = src + offset; - float alpha = 0.0f; - switch (rotation) - { - case ImageRotationDegrees::Rotate90: - alpha = gf_halfPI; - break; - case ImageRotationDegrees::Rotate180: - alpha = gf_PI; - break; - case ImageRotationDegrees::Rotate270: - alpha = gf_PI + gf_halfPI; - break; - default: - break; - } - - float cosa = cos(alpha); - float sina = sin(alpha); - - for (Objects::iterator it = m_objects.begin(); it != m_objects.end(); ++it) - { - CBaseObject* obj = it->second; - - if (obj->GetParent()) - { - continue; - } - - obj->GetBoundBox(objBounds); - if (box.IsIntersectBox(objBounds)) - { - if (rotation == ImageRotationDegrees::Rotate0) - { - obj->SetPos(obj->GetPos() - src + dst); - } - else - { - Vec3 pos = obj->GetPos() - src; - Vec3 newPos(pos); - newPos.x = cosa * pos.x - sina * pos.y; - newPos.y = sina * pos.x + cosa * pos.y; - obj->SetPos(newPos + dst); - Quat q; - obj->SetRotation(q.CreateRotationZ(alpha) * obj->GetRotation()); - } - } - } - return 0; -} - bool CObjectManager::IsObjectDeletionAllowed(CBaseObject* pObject) { if (!pObject) @@ -1431,95 +845,12 @@ void CObjectManager::DeleteSelection() objects.AddObject(m_currSelection->GetObject(i)); } - RemoveSelection(m_currSelection->GetName()); m_currSelection = &m_defaultSelection; m_defaultSelection.RemoveAll(); DeleteSelection(&objects); } -////////////////////////////////////////////////////////////////////////// -bool CObjectManager::HitTestObject(CBaseObject* obj, HitContext& hc) -{ - AZ_PROFILE_FUNCTION(Editor); - - if (obj->IsFrozen()) - { - return false; - } - - if (obj->IsHidden()) - { - return false; - } - - // This object is rejected by deep selection. - if (obj->CheckFlags(OBJFLAG_NO_HITTEST)) - { - return false; - } - - ObjectType objType = obj->GetType(); - - // Check if this object type is masked for selection. - if (!(objType & gSettings.objectSelectMask)) - { - return false; - } - - const bool bSelectionHelperHit = obj->HitHelperTest(hc); - - if (hc.bUseSelectionHelpers && !bSelectionHelperHit) - { - return false; - } - - if (!bSelectionHelperHit) - { - // Fast checking. - if (hc.bounds && !obj->IntersectRectBounds(*hc.bounds)) - { - return false; - } - - // Do 2D space testing. - if (hc.nSubObjFlags == 0) - { - Ray ray(hc.raySrc, hc.rayDir); - if (!obj->IntersectRayBounds(ray)) - { - return false; - } - } - else if (!obj->HitTestRect(hc)) - { - return false; - } - } - - return (bSelectionHelperHit || obj->HitTest(hc)); -} - -////////////////////////////////////////////////////////////////////////// -bool CObjectManager::HitTest([[maybe_unused]] HitContext& hitInfo) -{ - AZ_Assert(false, "CObjectManager::HitTest is legacy/deprecated and should not be used."); - return false; -} - -void CObjectManager::FindObjectsInRect( - [[maybe_unused]] CViewport* view, [[maybe_unused]] const QRect& rect, [[maybe_unused]] std::vector& guids) -{ - AZ_Assert(false, "CObjectManager::FindObjectsInRect is legacy/deprecated and should not be used."); -} - -////////////////////////////////////////////////////////////////////////// -void CObjectManager::SelectObjectsInRect( - [[maybe_unused]] CViewport* view, [[maybe_unused]] const QRect& rect, [[maybe_unused]] bool bSelect) -{ - AZ_Assert(false, "CObjectManager::SelectObjectsInRect is legacy/deprecated and should not be used."); -} - ////////////////////////////////////////////////////////////////////////// uint16 FindPossibleObjectNameNumber(std::set& numberSet) { @@ -1570,50 +901,9 @@ void CObjectManager::RegisterObjectName(const QString& name) } } -////////////////////////////////////////////////////////////////////////// -void CObjectManager::UpdateRegisterObjectName(const QString& name) -{ - // Remove all numbers from the end of typename. - QString typeName = name; - int nameLen = typeName.length(); - int len = nameLen; - - while (len > 0 && typeName[len - 1].isDigit()) - { - len--; - } - - typeName = typeName.left(len); - - uint16 num = 1; - if (len < nameLen) - { - num = (uint16)atoi((const char*)name.toUtf8().data() + len) + 0; - } - - NameNumbersMap::iterator it = m_nameNumbersMap.find(typeName); - - if (it != m_nameNumbersMap.end()) - { - if (it->second.end() != it->second.find(num)) - { - it->second.erase(num); - if (it->second.empty()) - { - m_nameNumbersMap.erase(it); - } - } - } -} - ////////////////////////////////////////////////////////////////////////// QString CObjectManager::GenerateUniqueObjectName(const QString& theTypeName) { - if (!m_bGenUniqObjectNames) - { - return theTypeName; - } - QString typeName = theTypeName; const int subIndex = theTypeName.indexOf("::"); if (subIndex != -1 && subIndex > typeName.length() - 2) @@ -1648,14 +938,6 @@ QString CObjectManager::GenerateUniqueObjectName(const QString& theTypeName) return str; } -////////////////////////////////////////////////////////////////////////// -bool CObjectManager::EnableUniqObjectNames(bool bEnable) -{ - bool bPrev = m_bGenUniqObjectNames; - m_bGenUniqObjectNames = bEnable; - return bPrev; -} - ////////////////////////////////////////////////////////////////////////// CObjectClassDesc* CObjectManager::FindClass(const QString& className) { @@ -1667,64 +949,6 @@ CObjectClassDesc* CObjectManager::FindClass(const QString& className) return nullptr; } -////////////////////////////////////////////////////////////////////////// -void CObjectManager::GetClassCategories(QStringList& categories) -{ - std::vector classes; - CClassFactory::Instance()->GetClassesBySystemID(ESYSTEM_CLASS_OBJECT, classes); - std::set cset; - for (int i = 0; i < classes.size(); i++) - { - QString category = classes[i]->Category(); - if (!category.isEmpty()) - { - cset.insert(category); - } - } - categories.clear(); - categories.reserve(static_cast(cset.size())); - for (std::set::iterator cit = cset.begin(); cit != cset.end(); ++cit) - { - categories.push_back(*cit); - } -} - -void CObjectManager::GetClassCategoryToolClassNamePairs(std::vector< std::pair >& categoryToolClassNamePairs) -{ - std::vector classes; - CClassFactory::Instance()->GetClassesBySystemID(ESYSTEM_CLASS_OBJECT, classes); - std::set< std::pair > cset; - for (int i = 0; i < classes.size(); i++) - { - QString category = classes[i]->Category(); - QString toolClassName = ((CObjectClassDesc*)classes[i])->GetToolClassName(); - if (!category.isEmpty()) - { - cset.insert(std::pair(category, toolClassName)); - } - } - categoryToolClassNamePairs.clear(); - categoryToolClassNamePairs.reserve(cset.size()); - for (std::set< std::pair >::iterator cit = cset.begin(); cit != cset.end(); ++cit) - { - categoryToolClassNamePairs.push_back(*cit); - } -} - -void CObjectManager::GetClassTypes(const QString& category, QStringList& types) -{ - std::vector classes; - CClassFactory::Instance()->GetClassesBySystemID(ESYSTEM_CLASS_OBJECT, classes); - for (int i = 0; i < classes.size(); i++) - { - QString cat = classes[i]->Category(); - if (QString::compare(cat, category, Qt::CaseInsensitive) == 0 && classes[i]->IsEnabled()) - { - types.push_back(classes[i]->ClassName()); - } - } -} - ////////////////////////////////////////////////////////////////////////// void CObjectManager::RegisterClassTemplate(const XmlNodeRef& templ) { @@ -1789,181 +1013,6 @@ void CObjectManager::RegisterCVars() "Adjust the hit radius used for axis helpers, like the transform gizmo."); } -////////////////////////////////////////////////////////////////////////// -void CObjectManager::Serialize(XmlNodeRef& xmlNode, bool bLoading, int flags) -{ - if (!xmlNode) - { - return; - } - - if (bLoading) - { - m_loadedObjects = 0; - - if (flags == SERIALIZE_ONLY_NOTSHARED) - { - DeleteNotSharedObjects(); - } - else if (flags == SERIALIZE_ONLY_SHARED) - { - DeleteSharedObjects(); - } - else - { - DeleteAllObjects(); - } - - - XmlNodeRef root = xmlNode->findChild("Objects"); - - int totalObjects = 0; - - if (root) - { - root->getAttr("NumObjects", totalObjects); - } - - - StartObjectsLoading(totalObjects); - - CObjectArchive ar(this, xmlNode, true); - - // Loading. - if (root) - { - ar.node = root; - LoadObjects(ar, false); - } - EndObjectsLoading(); - } - else - { - // Saving. - XmlNodeRef root = xmlNode->newChild("Objects"); - - CObjectArchive ar(this, root, false); - - // Save all objects to XML. - for (Objects::iterator it = m_objects.begin(); it != m_objects.end(); ++it) - { - CBaseObject* obj = it->second; - - if (obj->CheckFlags(OBJFLAG_DONT_SAVE)) - { - continue; - } - - if ((flags == SERIALIZE_ONLY_SHARED) && !obj->CheckFlags(OBJFLAG_SHARED)) - { - continue; - } - else if ((flags == SERIALIZE_ONLY_NOTSHARED) && obj->CheckFlags(OBJFLAG_SHARED)) - { - continue; - } - - XmlNodeRef objNode = root->newChild("Object"); - ar.node = objNode; - obj->Serialize(ar); - } - } -} - -////////////////////////////////////////////////////////////////////////// -void CObjectManager::LoadObjects(CObjectArchive& objectArchive, bool bSelect) -{ - m_bLoadingObjects = true; - - XmlNodeRef objectsNode = objectArchive.node; - int numObjects = objectsNode->getChildCount(); - for (int i = 0; i < numObjects; i++) - { - objectArchive.node = objectsNode->getChild(i); - CBaseObject* obj = objectArchive.LoadObject(objectsNode->getChild(i)); - if (obj && bSelect) - { - SelectObject(obj); - } - } - EndObjectsLoading(); // End progress bar, here, Resolve objects have his own. - objectArchive.ResolveObjects(); - - InvalidateVisibleList(); - - m_bLoadingObjects = false; -} - -////////////////////////////////////////////////////////////////////////// -void CObjectManager::Export(const QString& levelPath, XmlNodeRef& rootNode, bool onlyShared) -{ - // Clear export files. - QFile::remove(QStringLiteral("%1TagPoints.ini").arg(levelPath)); - QFile::remove(QStringLiteral("%1Volumes.ini").arg(levelPath)); - - // Save all objects to XML. - for (Objects::iterator it = m_objects.begin(); it != m_objects.end(); ++it) - { - CBaseObject* obj = it->second; - // Export Only shared objects. - if ((obj->CheckFlags(OBJFLAG_SHARED) && onlyShared) || - (!obj->CheckFlags(OBJFLAG_SHARED) && !onlyShared)) - { - obj->Export(levelPath, rootNode); - } - } -} - -////////////////////////////////////////////////////////////////////////// -void CObjectManager::ExportEntities(XmlNodeRef& rootNode) -{ - // Save all objects to XML. - for (Objects::iterator it = m_objects.begin(); it != m_objects.end(); ++it) - { - CBaseObject* obj = it->second; - if (qobject_cast(obj)) - { - obj->Export("", rootNode); - } - } -} - -void CObjectManager::DeleteNotSharedObjects() -{ - TBaseObjects objects; - GetAllObjects(objects); - for (int i = 0; i < objects.size(); i++) - { - CBaseObject* obj = objects[i]; - if (!obj->CheckFlags(OBJFLAG_SHARED)) - { - DeleteObject(obj); - } - } -} - -void CObjectManager::DeleteSharedObjects() -{ - TBaseObjects objects; - GetAllObjects(objects); - for (int i = 0; i < objects.size(); i++) - { - CBaseObject* obj = objects[i]; - if (obj->CheckFlags(OBJFLAG_SHARED)) - { - DeleteObject(obj); - } - } -} - -////////////////////////////////////////////////////////////////////////// -IObjectSelectCallback* CObjectManager::SetSelectCallback(IObjectSelectCallback* callback) -{ - IObjectSelectCallback* prev = m_selectCallback; - m_selectCallback = callback; - return prev; -} - ////////////////////////////////////////////////////////////////////////// void CObjectManager::InvalidateVisibleList() { @@ -2005,27 +1054,6 @@ void CObjectManager::UpdateVisibilityList() m_isUpdateVisibilityList = false; } -////////////////////////////////////////////////////////////////////////// -bool CObjectManager::ConvertToType(CBaseObject* pObject, const QString& typeName) -{ - QString message = QString("Convert ") + pObject->GetName() + " to " + typeName; - CUndo undo(message.toUtf8().data()); - - CBaseObjectPtr pNewObject = GetIEditor()->NewObject(typeName.toUtf8().data()); - if (pNewObject) - { - if (pNewObject->ConvertFromObject(pObject)) - { - DeleteObject(pObject); - return true; - } - DeleteObject(pNewObject); - } - - Log((message + " is failed.").toUtf8().data()); - return false; -} - ////////////////////////////////////////////////////////////////////////// void CObjectManager::SetObjectSelected(CBaseObject* pObject, bool bSelect) { @@ -2054,69 +1082,6 @@ void CObjectManager::SetObjectSelected(CBaseObject* pObject, bool bSelect) m_gizmoManager->AddGizmo(new CAxisGizmo(pObject)); } } - - if (bSelect) - { - NotifyObjectListeners(pObject, CBaseObject::ON_SELECT); - } - else - { - NotifyObjectListeners(pObject, CBaseObject::ON_UNSELECT); - } -} - -////////////////////////////////////////////////////////////////////////// -void CObjectManager::HideTransformManipulators() -{ - m_gizmoManager->DeleteAllTransformManipulators(); -} - -////////////////////////////////////////////////////////////////////////// -////////////////////////////////////////////////////////////////////////// -void CObjectManager::AddObjectEventListener(EventListener* listener) -{ - stl::push_back_unique(m_objectEventListeners, listener); -} - -////////////////////////////////////////////////////////////////////////// -void CObjectManager::RemoveObjectEventListener(EventListener* listener) -{ - stl::find_and_erase(m_objectEventListeners, listener); -} - -////////////////////////////////////////////////////////////////////////// -void CObjectManager::NotifyObjectListeners(CBaseObject* pObject, CBaseObject::EObjectListenerEvent event) -{ - std::list::iterator next; - for (std::list::iterator it = m_objectEventListeners.begin(); it != m_objectEventListeners.end(); it = next) - { - next = it; - ++next; - // Call listener callback. - (*it)->OnObjectEvent(pObject, event); - } -} - -////////////////////////////////////////////////////////////////////////// -void CObjectManager::StartObjectsLoading(int numObjects) -{ - if (m_pLoadProgress) - { - return; - } - m_pLoadProgress = new CWaitProgress("Loading Objects"); - m_totalObjectsToLoad = numObjects; - m_loadedObjects = 0; -} - -////////////////////////////////////////////////////////////////////////// -void CObjectManager::EndObjectsLoading() -{ - if (m_pLoadProgress) - { - delete m_pLoadProgress; - } - m_pLoadProgress = nullptr; } ////////////////////////////////////////////////////////////////////////// @@ -2164,130 +1129,6 @@ bool CObjectManager::IsLightClass(CBaseObject* pObject) return false; } -void CObjectManager::FindAndRenameProperty2(const char* property2Name, const QString& oldValue, const QString& newValue) -{ - CBaseObjectsArray objects; - GetObjects(objects); - - for (size_t i = 0, n = objects.size(); i < n; ++i) - { - CBaseObject* pObject = objects[i]; - if (qobject_cast(pObject)) - { - CEntityObject* pEntity = static_cast(pObject); - CVarBlock* pProperties2 = pEntity->GetProperties2(); - if (pProperties2) - { - IVariable* pVariable = pProperties2->FindVariable(property2Name); - if (pVariable) - { - QString sValue; - pVariable->Get(sValue); - if (sValue == oldValue) - { - pEntity->StoreUndo("Rename Property2"); - - pVariable->Set(newValue); - } - } - } - } - } -} - -void CObjectManager::FindAndRenameProperty2If(const char* property2Name, const QString& oldValue, const QString& newValue, const char* otherProperty2Name, const QString& otherValue) -{ - CBaseObjectsArray objects; - GetObjects(objects); - - for (size_t i = 0, n = objects.size(); i < n; ++i) - { - CBaseObject* pObject = objects[i]; - if (qobject_cast(pObject)) - { - CEntityObject* pEntity = static_cast(pObject); - CVarBlock* pProperties2 = pEntity->GetProperties2(); - if (pProperties2) - { - IVariable* pVariable = pProperties2->FindVariable(property2Name); - IVariable* pOtherVariable = pProperties2->FindVariable(otherProperty2Name); - if (pVariable && pOtherVariable) - { - QString sValue; - pVariable->Get(sValue); - - QString sOtherValue; - pOtherVariable->Get(sOtherValue); - - if ((sValue == oldValue) && (sOtherValue == otherValue)) - { - pEntity->StoreUndo("Rename Property2 If"); - - pVariable->Set(newValue); - } - } - } - } - } -} - -////////////////////////////////////////////////////////////////////////// -void CObjectManager::HitTestObjectAgainstRect(CBaseObject* pObj, CViewport* view, HitContext hc, std::vector& guids) -{ - if (!pObj->IsSelectable()) - { - return; - } - - AABB box; - - // Retrieve world space bound box. - pObj->GetBoundBox(box); - - // Check if object visible in viewport. - if (!view->IsBoundsVisible(box)) - { - return; - } - - if (pObj->HitTestRect(hc)) - { - stl::push_back_unique(guids, pObj->GetId()); - } -} - -////////////////////////////////////////////////////////////////////////// -void CObjectManager::SelectObjectInRect(CBaseObject* pObj, CViewport* view, HitContext hc, bool bSelect) -{ - if (!pObj->IsSelectable()) - { - return; - } - - AABB box; - - // Retrieve world space bound box. - pObj->GetBoundBox(box); - - // Check if object visible in viewport. - if (!view->IsBoundsVisible(box)) - { - return; - } - - if (pObj->HitTestRect(hc)) - { - if (bSelect) - { - SelectObject(pObj); - } - else - { - UnselectObject(pObj); - } - } -} - ////////////////////////////////////////////////////////////////////////// namespace { @@ -2367,93 +1208,6 @@ namespace } } - bool PyIsObjectHidden(const char* objName) - { - CBaseObject* pObject = GetIEditor()->GetObjectManager()->FindObject(objName); - if (!pObject) - { - throw std::logic_error((QString("\"") + objName + "\" is an invalid object name.").toUtf8().data()); - } - return pObject->IsHidden(); - } - - void PyHideAllObjects() - { - CBaseObjectsArray baseObjects; - GetIEditor()->GetObjectManager()->GetObjects(baseObjects); - - if (baseObjects.size() <= 0) - { - throw std::logic_error("Objects not found."); - } - - CUndo undo("Hide All Objects"); - for (int i = 0; i < baseObjects.size(); i++) - { - GetIEditor()->GetObjectManager()->HideObject(baseObjects[i], true); - } - } - - void PyUnHideAllObjects() - { - CUndo undo("Unhide All Objects"); - GetIEditor()->GetObjectManager()->UnhideAll(); - } - - void PyHideObject(const char* objName) - { - CUndo undo("Hide Object"); - - CBaseObject* pObject = GetIEditor()->GetObjectManager()->FindObject(objName); - if (pObject) - { - GetIEditor()->GetObjectManager()->HideObject(pObject, true); - } - } - - void PyUnhideObject(const char* objName) - { - CUndo undo("Unhide Object"); - - CBaseObject* pObject = GetIEditor()->GetObjectManager()->FindObject(objName); - if (pObject) - { - GetIEditor()->GetObjectManager()->HideObject(pObject, false); - } - } - - void PyFreezeObject(const char* objName) - { - CUndo undo("Freeze Object"); - - CBaseObject* pObject = GetIEditor()->GetObjectManager()->FindObject(objName); - if (pObject) - { - GetIEditor()->GetObjectManager()->FreezeObject(pObject, true); - } - } - - void PyUnfreezeObject(const char* objName) - { - CUndo undo("Unfreeze Object"); - - CBaseObject* pObject = GetIEditor()->GetObjectManager()->FindObject(objName); - if (pObject) - { - GetIEditor()->GetObjectManager()->FreezeObject(pObject, false); - } - } - - bool PyIsObjectFrozen(const char* objName) - { - CBaseObject* pObject = GetIEditor()->GetObjectManager()->FindObject(objName); - if (!pObject) - { - throw std::logic_error((QString("\"") + objName + "\" is an invalid object name.").toUtf8().data()); - } - return pObject->IsFrozen(); - } - void PyDeleteObject(const char* objName) { CUndo undo("Delete Object"); @@ -2641,16 +1395,6 @@ namespace AzToolsFramework addLegacyGeneral(behaviorContext->Method("get_selection_center", PyGetSelectionCenter, nullptr, "Returns the center point of the selection group.")); addLegacyGeneral(behaviorContext->Method("get_selection_aabb", PyGetSelectionAABB, nullptr, "Returns the aabb of the selection group.")); - addLegacyGeneral(behaviorContext->Method("hide_object", PyHideObject, nullptr, "Hides a specified object.")); - addLegacyGeneral(behaviorContext->Method("is_object_hidden", PyIsObjectHidden, nullptr, "Checks if object is hidden and returns a bool value.")); - addLegacyGeneral(behaviorContext->Method("unhide_object", PyUnhideObject, nullptr, "Unhides a specified object.")); - addLegacyGeneral(behaviorContext->Method("hide_all_objects", PyHideAllObjects, nullptr, "Hides all objects.")); - addLegacyGeneral(behaviorContext->Method("unhide_all_objects", PyUnHideAllObjects, nullptr, "Unhides all objects.")); - - addLegacyGeneral(behaviorContext->Method("freeze_object", PyFreezeObject, nullptr, "Freezes a specified object.")); - addLegacyGeneral(behaviorContext->Method("is_object_frozen", PyIsObjectFrozen, nullptr, "Checks if object is frozen and returns a bool value.")); - addLegacyGeneral(behaviorContext->Method("unfreeze_object", PyUnfreezeObject, nullptr, "Unfreezes a specified object.")); - addLegacyGeneral(behaviorContext->Method("delete_object", PyDeleteObject, nullptr, "Deletes a specified object.")); addLegacyGeneral(behaviorContext->Method("delete_selected", PyDeleteSelected, nullptr, "Deletes selected object(s).")); diff --git a/Code/Editor/Objects/ObjectManager.h b/Code/Editor/Objects/ObjectManager.h index 7389dfa6a1..fb16c2fec3 100644 --- a/Code/Editor/Objects/ObjectManager.h +++ b/Code/Editor/Objects/ObjectManager.h @@ -8,10 +8,6 @@ // Description : ObjectManager definition. - - -#ifndef CRYINCLUDE_EDITOR_OBJECTS_OBJECTMANAGER_H -#define CRYINCLUDE_EDITOR_OBJECTS_OBJECTMANAGER_H #pragma once #include "IObjectManager.h" @@ -42,12 +38,10 @@ public: CObjectManagerLevelIsExporting() { AZ::ObjectManagerEventBus::Broadcast(&AZ::ObjectManagerEventBus::Events::OnExportingStarting); - GetIEditor()->GetObjectManager()->SetExportingLevel(true); } ~CObjectManagerLevelIsExporting() { - GetIEditor()->GetObjectManager()->SetExportingLevel(false); AZ::ObjectManagerEventBus::Broadcast(&AZ::ObjectManagerEventBus::Events::OnExportingFinished); } }; @@ -66,20 +60,12 @@ public: CObjectManager(); ~CObjectManager(); - void RegisterObjectClasses(); - CBaseObject* NewObject(CObjectClassDesc* cls, CBaseObject* prev = 0, const QString& file = "", const char* newObjectName = nullptr) override; CBaseObject* NewObject(const QString& typeName, CBaseObject* prev = 0, const QString& file = "", const char* newEntityName = nullptr) override; void DeleteObject(CBaseObject* obj) override; void DeleteSelection(CSelectionGroup* pSelection) override; void DeleteAllObjects() override; - CBaseObject* CloneObject(CBaseObject* obj) override; - - void BeginEditParams(CBaseObject* obj, int flags) override; - void EndEditParams(int flags = 0) override; - // Hides all transform manipulators. - void HideTransformManipulators(); //! Get number of objects manager by ObjectManager (not contain sub objects of groups). int GetObjectCount() const override; @@ -88,30 +74,9 @@ public: //! @param layer if 0 get objects for all layers, or layer to get objects from. void GetObjects(CBaseObjectsArray& objects) const override; - //! Get array of objects that pass the filter. - //! @param filter The filter functor, return true if you want to get the certain obj, return false if want to skip it. - void GetObjects(CBaseObjectsArray& objects, BaseObjectFilterFunctor const& filter) const override; - - //! Update objects. - void Update(); - //! Display objects on display context. void Display(DisplayContext& dc) override; - //! Called when selecting without selection helpers - this is needed since - //! the visible object cache is normally not updated when not displaying helpers. - void ForceUpdateVisibleObjectCache(DisplayContext& dc) override; - - //! Check intersection with objects. - //! Find intersection with nearest to ray origin object hit by ray. - //! If distance tollerance is specified certain relaxation applied on collision test. - //! @return true if hit any object, and fills hitInfo structure. - bool HitTest(HitContext& hitInfo) override; - - //! Check intersection with an object. - //! @return true if hit, and fills hitInfo structure. - bool HitTestObject(CBaseObject* obj, HitContext& hc) override; - //! Send event to all objects. //! Will cause OnEvent handler to be called on all objects. void SendEvent(ObjectEvent event) override; @@ -134,76 +99,28 @@ public: //! Find objects which intersect with a given AABB. void FindObjectsInAABB(const AABB& aabb, std::vector& result) const override; - ////////////////////////////////////////////////////////////////////////// - // Operations on objects. - ////////////////////////////////////////////////////////////////////////// - //! Makes object visible or invisible. - void HideObject(CBaseObject* obj, bool hide) override; - //! Shows the last hidden object based on hidden ID - void ShowLastHiddenObject() override; - //! Freeze object, making it unselectable. - void FreezeObject(CBaseObject* obj, bool freeze) override; - //! Unhide all hidden objects. - void UnhideAll() override; - //! Unfreeze all frozen objects. - void UnfreezeAll() override; - ////////////////////////////////////////////////////////////////////////// // Object Selection. ////////////////////////////////////////////////////////////////////////// bool SelectObject(CBaseObject* obj, bool bUseMask = true) override; void UnselectObject(CBaseObject* obj) override; - //! Select objects within specified distance from given position. - //! Return number of selected objects. - int SelectObjects(const AABB& box, bool bUnselect = false) override; - - void SelectEntities(std::set& s) override; - - int MoveObjects(const AABB& box, const Vec3& offset, ImageRotationDegrees rotation, bool bIsCopy = false) override; - - //! Selects/Unselects all objects within 2d rectangle in given viewport. - void SelectObjectsInRect(CViewport* view, const QRect& rect, bool bSelect) override; - void FindObjectsInRect(CViewport* view, const QRect& rect, std::vector& guids) override; - //! Clear default selection set. //! @Return number of objects removed from selection. int ClearSelection() override; - //! Deselect all current selected objects and selects object that were unselected. - //! @Return number of selected objects. - int InvertSelection() override; - //! Get current selection. CSelectionGroup* GetSelection() const override { return m_currSelection; }; - //! Get named selection. - CSelectionGroup* GetSelection(const QString& name) const override; - // Get selection group names - void GetNameSelectionStrings(QStringList& names) override; - //! Change name of current selection group. - //! And store it in list. - void NameSelection(const QString& name) override; - //! Set one of name selections as current selection. - void SetSelection(const QString& name) override; - void RemoveSelection(const QString& name) override; bool IsObjectDeletionAllowed(CBaseObject* pObject); //! Delete all objects in selection group. void DeleteSelection() override; - uint32 ForceID() const override{return m_ForceID; } - void ForceID(uint32 FID) override{m_ForceID = FID; } - //! Generates uniq name base on type name of object. QString GenerateUniqueObjectName(const QString& typeName) override; //! Register object name in object manager, needed for generating uniq names. void RegisterObjectName(const QString& name) override; - //! Decrease name number and remove if it was last in object manager, needed for generating uniq names. - void UpdateRegisterObjectName(const QString& name); - //! Enable/Disable generating of unique object names (Enabled by default). - //! Return previous value. - bool EnableUniqObjectNames(bool bEnable) override; //! Register XML template of runtime class. void RegisterClassTemplate(const XmlNodeRef& templ); @@ -215,52 +132,10 @@ public: //! Find object class by name. CObjectClassDesc* FindClass(const QString& className) override; - void GetClassCategories(QStringList& categories) override; - void GetClassCategoryToolClassNamePairs(std::vector< std::pair >& categoryToolClassNamePairs) override; - void GetClassTypes(const QString& category, QStringList& types) override; - - //! Export objects to xml. - //! When onlyShared is true ony objects with shared flags exported, overwise only not shared object exported. - void Export(const QString& levelPath, XmlNodeRef& rootNode, bool onlyShared) override; - void ExportEntities(XmlNodeRef& rootNode) override; - - //! Serialize Objects in manager to specified XML Node. - //! @param flags Can be one of SerializeFlags. - void Serialize(XmlNodeRef& rootNode, bool bLoading, int flags = SERIALIZE_ALL) override; - - void SerializeNameSelection(XmlNodeRef& rootNode, bool bLoading) override; - - //! Load objects from object archive. - //! @param bSelect if set newly loaded object will be selected. - void LoadObjects(CObjectArchive& ar, bool bSelect) override; - - //! Delete from Object manager all objects without SHARED flag. - void DeleteNotSharedObjects(); - //! Delete from Object manager all objects with SHARED flag. - void DeleteSharedObjects(); bool AddObject(CBaseObject* obj); void RemoveObject(CBaseObject* obj); void ChangeObjectId(REFGUID oldId, REFGUID newId) override; - bool IsDuplicateObjectName(const QString& newName) const override - { - return FindObject(newName) ? true : false; - } - void ShowDuplicationMsgWarning(CBaseObject* obj, const QString& newName, bool bShowMsgBox) const override; - void ChangeObjectName(CBaseObject* obj, const QString& newName) override; - - //! Convert object of one type to object of another type. - //! Original object is deleted. - bool ConvertToType(CBaseObject* pObject, const QString& typeName) override; - - //! Set new selection callback. - //! @return previous selection callback. - IObjectSelectCallback* SetSelectCallback(IObjectSelectCallback* callback) override; - - // Enables/Disables creating of game objects. - void SetCreateGameObject(bool enable) override { m_createGameObjects = enable; }; - //! Return true if objects loaded from xml should immidiatly create game objects associated with them. - bool IsCreateGameObjects() const override { return m_createGameObjects; }; ////////////////////////////////////////////////////////////////////////// //! Get access to gizmo manager. @@ -270,33 +145,12 @@ public: //! Invalidate visibily settings of objects. void InvalidateVisibleList() override; - ////////////////////////////////////////////////////////////////////////// - // ObjectManager notification Callbacks. - ////////////////////////////////////////////////////////////////////////// - void AddObjectEventListener(EventListener* listener) override; - void RemoveObjectEventListener(EventListener* listener) override; - - ////////////////////////////////////////////////////////////////////////// - // Used to indicate starting and ending of objects loading. - ////////////////////////////////////////////////////////////////////////// - void StartObjectsLoading(int numObjects) override; - void EndObjectsLoading() override; - ////////////////////////////////////////////////////////////////////////// // Gathers all resources used by all objects. void GatherUsedResources(CUsedResources& resources) override; bool IsLightClass(CBaseObject* pObject) override; - virtual void FindAndRenameProperty2(const char* property2Name, const QString& oldValue, const QString& newValue) override; - virtual void FindAndRenameProperty2If(const char* property2Name, const QString& oldValue, const QString& newValue, const char* otherProperty2Name, const QString& otherValue) override; - - bool IsReloading() const override { return m_bInReloading; } - void SetSkipUpdate(bool bSkipUpdate) override { m_bSkipObjectUpdate = bSkipUpdate; } - - void SetExportingLevel(bool bExporting) override { m_bLevelExporting = bExporting; } - bool IsExportingLevelInprogress() const override { return m_bLevelExporting; } - int GetAxisHelperHitRadius() const override { return m_axisHelperHitRadius; } private: @@ -317,29 +171,12 @@ private: void SelectCurrent(); void SetObjectSelected(CBaseObject* pObject, bool bSelect); - // Recursive functions potentially taking into child objects into account - void SelectObjectInRect(CBaseObject* pObj, CViewport* view, HitContext hc, bool bSelect); - void HitTestObjectAgainstRect(CBaseObject* pObj, CViewport* view, HitContext hc, std::vector& guids); - - void SaveRegistry(); - void LoadRegistry(); - - void NotifyObjectListeners(CBaseObject* pObject, CBaseObject::EObjectListenerEvent event); - - void FindDisplayableObjects(DisplayContext& dc, bool bDisplay); - private: - typedef std::map Objects; + typedef AZStd::map Objects; Objects m_objects; - typedef std::unordered_map ObjectsByNameCrc; + typedef AZStd::unordered_map ObjectsByNameCrc; ObjectsByNameCrc m_objectsByName; - typedef std::map TNameSelectionMap; - TNameSelectionMap m_selections; - - //! Used for forcing IDs of "GetEditorObjectID" of PreFabs, as they used to have random IDs on each load - uint32 m_ForceID; - //! Array of currently visible objects. TBaseObjects m_visibleObjects; @@ -349,16 +186,11 @@ private: unsigned int m_lastComputedVisibility = 0; // when the object manager itself last updated visibility (since it also has a cache) int m_lastHideMask = 0; - float m_maxObjectViewDistRatio; - ////////////////////////////////////////////////////////////////////////// // Selection. //! Current selection group. CSelectionGroup* m_currSelection; - int m_nLastSelCount; bool m_bSelectionChanged; - IObjectSelectCallback* m_selectCallback; - bool m_bLoadingObjects; // True while performing a select or deselect operation on more than one object. // Prevents individual undo/redo commands for every object, allowing bulk undo/redo @@ -367,20 +199,9 @@ private: //! Default selection. CSelectionGroup m_defaultSelection; - CBaseObjectPtr m_currEditObject; - bool m_bSingleSelection; - - bool m_createGameObjects; - bool m_bGenUniqObjectNames; - // Object manager also handles Gizmo manager. CGizmoManager* m_gizmoManager; - ////////////////////////////////////////////////////////////////////////// - // Loading progress. - CWaitProgress* m_pLoadProgress; - int m_loadedObjects; - int m_totalObjectsToLoad; ////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////// @@ -389,10 +210,6 @@ private: typedef std::map, stl::less_stricmp > NameNumbersMap; NameNumbersMap m_nameNumbersMap; - ////////////////////////////////////////////////////////////////////////// - // Listeners. - std::list m_objectEventListeners; - bool m_bExiting; std::unordered_set m_animatedAttachedEntities; @@ -401,10 +218,6 @@ private: uint64 m_currentHideCount; - bool m_bInReloading; - bool m_bSkipObjectUpdate; - bool m_bLevelExporting; - int m_axisHelperHitRadius = 20; }; @@ -426,4 +239,3 @@ namespace AzToolsFramework } // namespace AzToolsFramework -#endif // CRYINCLUDE_EDITOR_OBJECTS_OBJECTMANAGER_H diff --git a/Code/Editor/Objects/ObjectManagerLegacyUndo.h b/Code/Editor/Objects/ObjectManagerLegacyUndo.h index 721d188171..29dc2aa4ae 100644 --- a/Code/Editor/Objects/ObjectManagerLegacyUndo.h +++ b/Code/Editor/Objects/ObjectManagerLegacyUndo.h @@ -24,12 +24,11 @@ public: CUndoBaseObjectNew(CBaseObject* object); protected: - virtual int GetSize() override { return sizeof(*this); }; // Return size of xml state. - virtual QString GetDescription() override { return "New BaseObject"; }; - virtual QString GetObjectName() override { return m_object->GetName(); }; + int GetSize() override { return sizeof(*this); } // Return size of xml state. + QString GetObjectName() override { return m_object->GetName(); } - virtual void Undo(bool bUndo) override; - virtual void Redo() override; + void Undo(bool bUndo) override; + void Redo() override; private: CBaseObjectPtr m_object; @@ -47,12 +46,11 @@ public: CUndoBaseObjectDelete(CBaseObject* object); protected: - virtual int GetSize() override { return sizeof(*this); }; // Return size of xml state. - virtual QString GetDescription() override { return "Delete BaseObject"; }; - virtual QString GetObjectName() override { return m_object->GetName(); }; + int GetSize() override { return sizeof(*this); } // Return size of xml state. + QString GetObjectName() override { return m_object->GetName(); } - virtual void Undo(bool bUndo) override; - virtual void Redo() override; + void Undo(bool bUndo) override; + void Redo() override; private: CBaseObjectPtr m_object; @@ -73,20 +71,19 @@ public: * This Undo command can be used for either Legacy or Component Entities, though for * performance reasons Component Entities are typically undone using CUndoBaseObjectBulkSelect * - * @param pObj The object to perform the undo/redo operation on. + * @param object The object to perform the undo/redo operation on. * @param isSelect This is true if you are trying to undo a select operation, and false if * trying to undo a deselect operation */ CUndoBaseObjectSelect(CBaseObject* object, bool isSelect); protected: - virtual void Release() override { delete this; }; - virtual int GetSize() override { return sizeof(*this); }; // Return size of xml state. - virtual QString GetDescription() override { return "Select Object"; }; - virtual QString GetObjectName() override; + void Release() override { delete this; } + int GetSize() override { return sizeof(*this); } // Return size of xml state. + QString GetObjectName() override; - virtual void Undo(bool bUndo) override; - virtual void Redo() override; + void Undo(bool bUndo) override; + void Redo() override; private: GUID m_guid; @@ -116,7 +113,6 @@ public: protected: int GetSize() override { return sizeof(*this); } // Return size of xml state. - QString GetDescription() override { return QObject::tr("Select Objects"); } /* * Deselects the objects @@ -153,7 +149,6 @@ public: protected: int GetSize() override { return sizeof(*this); } // Return size of xml state. - QString GetDescription() override { return QObject::tr("Select Objects"); } void Undo(bool bUndo) override; diff --git a/Code/Editor/Objects/SelectionGroup.cpp b/Code/Editor/Objects/SelectionGroup.cpp index 06d881d607..95a3cc7b14 100644 --- a/Code/Editor/Objects/SelectionGroup.cpp +++ b/Code/Editor/Objects/SelectionGroup.cpp @@ -18,8 +18,6 @@ #include "ViewManager.h" #include "Include/IObjectManager.h" -#include - ////////////////////////////////////////////////////////////////////////// CSelectionGroup::CSelectionGroup() : m_ref(1) @@ -226,7 +224,6 @@ void CSelectionGroup::Move(const Vec3& offset, EMoveSelectionFlag moveFlag, [[ma m_bVertexSnapped = false; FilterParents(); - Vec3 newPos; bool bValidFollowGeometryMode(true); if (point.x() == -1 || point.y() == -1) @@ -234,8 +231,6 @@ void CSelectionGroup::Move(const Vec3& offset, EMoveSelectionFlag moveFlag, [[ma bValidFollowGeometryMode = false; } - SRayHitInfo pickedInfo; - if (moveFlag == eMS_FollowGeometryPosNorm) { if (m_LastestMoveSelectionFlag != eMS_FollowGeometryPosNorm) @@ -249,6 +244,8 @@ void CSelectionGroup::Move(const Vec3& offset, EMoveSelectionFlag moveFlag, [[ma } m_LastestMoveSelectionFlag = moveFlag; + Vec3 zeroPickedInfo_vHitNormal; + Vec3 zeroPickedInfo_vHitPos; for (int i = 0; i < GetFilteredCount(); i++) { @@ -264,16 +261,15 @@ void CSelectionGroup::Move(const Vec3& offset, EMoveSelectionFlag moveFlag, [[ma Vec3 zaxis = m_LastestMovedObjectRot * Vec3(0, 0, 1); zaxis.Normalize(); Quat nq; - nq.SetRotationV0V1(zaxis, pickedInfo.vHitNormal); - obj->SetPos(pickedInfo.vHitPos); + nq.SetRotationV0V1(zaxis, zeroPickedInfo_vHitNormal); + obj->SetPos(zeroPickedInfo_vHitPos); obj->SetRotation(nq * m_LastestMovedObjectRot); continue; } - Matrix34 wtm = obj->GetWorldTM(); + const Matrix34 &wtm = obj->GetWorldTM(); Vec3 wp = wtm.GetTranslation(); - - newPos = wp + offset; + Vec3 newPos = wp + offset; if (moveFlag == eMS_FollowTerrain) { // Make sure object keeps it height. @@ -465,17 +461,6 @@ void CSelectionGroup::SetScale(const Vec3& scale, int referenceCoordSys) Scale(relScale, referenceCoordSys); } - -void CSelectionGroup::StartScaling() -{ - for (int i = 0; i < GetFilteredCount(); i++) - { - CBaseObject* obj = GetFilteredObject(i); - obj->StartScaling(); - } -} - - ////////////////////////////////////////////////////////////////////////// void CSelectionGroup::Align() { @@ -533,45 +518,6 @@ void CSelectionGroup::ResetTransformation() } } -////////////////////////////////////////////////////////////////////////// -void CSelectionGroup::Clone(CSelectionGroup& newGroup) -{ - IObjectManager* pObjMan = GetIEditor()->GetObjectManager(); - assert(pObjMan); - - int i; - CObjectCloneContext cloneContext; - - FilterParents(); - - ////////////////////////////////////////////////////////////////////////// - // Clone every object. - for (i = 0; i < GetFilteredCount(); i++) - { - CBaseObject* pFromObject = GetFilteredObject(i); - CBaseObject* newObj = pObjMan->CloneObject(pFromObject); - if (!newObj) // can be null, e.g. sequence can't be cloned - { - continue; - } - - cloneContext.AddClone(pFromObject, newObj); - newGroup.AddObject(newObj); - } - - ////////////////////////////////////////////////////////////////////////// - // Only after everything was cloned, call PostClone on all cloned objects. - for (i = 0; i < newGroup.GetCount(); ++i) - { - CBaseObject* pFromObject = GetFilteredObject(i); - CBaseObject* pClonedObject = newGroup.GetObject(i); - if (pClonedObject) - { - pClonedObject->PostClone(pFromObject, cloneContext); - } - } -} - ////////////////////////////////////////////////////////////////////////// void CSelectionGroup::SendEvent(ObjectEvent event) { diff --git a/Code/Editor/Objects/SelectionGroup.h b/Code/Editor/Objects/SelectionGroup.h index 600bce5f26..8d979d23be 100644 --- a/Code/Editor/Objects/SelectionGroup.h +++ b/Code/Editor/Objects/SelectionGroup.h @@ -98,7 +98,6 @@ public: //! Resets rotation and scale to identity and (1.0f, 1.0f, 1.0f) void ResetTransformation(); //! Scale objects in selection by given scale. - void StartScaling(); void Scale(const Vec3& scale, int referenceCoordSys); void SetScale(const Vec3& scale, int referenceCoordSys); //! Align objects in selection to surface normal @@ -106,11 +105,6 @@ public: //! Very special method to move contents of a voxel. void MoveContent(const Vec3& offset); - ////////////////////////////////////////////////////////////////////////// - //! Clone objects in this group and add cloned objects to new selection group. - //! Only topmost parent objects will be added to this selection group. - void Clone(CSelectionGroup& newGroup); - // Send event to all objects in selection group. void SendEvent(ObjectEvent event); diff --git a/Code/Editor/Plugin.cpp b/Code/Editor/Plugin.cpp index 4f6fe0279d..68f8d8833b 100644 --- a/Code/Editor/Plugin.cpp +++ b/Code/Editor/Plugin.cpp @@ -14,6 +14,7 @@ // Editor #include "Include/IViewPane.h" +#include CClassFactory* CClassFactory::s_pInstance = nullptr; CAutoRegisterClassHelper* CAutoRegisterClassHelper::s_pFirst = nullptr; @@ -79,7 +80,7 @@ void CClassFactory::RegisterClass(IClassDesc* pClassDesc) existingUUIDString, findByGuid->second->ClassName().toUtf8().data()); - CryMessageBox(errorMessageBuffer, "Invalid class registration - Duplicate UUID", MB_OK); + QMessageBox::critical(nullptr,"Invalid class registration - Duplicate UUID",QString::fromLatin1(errorMessageBuffer)); return; } @@ -107,7 +108,7 @@ void CClassFactory::RegisterClass(IClassDesc* pClassDesc) newUUIDString, existingUUIDString); - CryMessageBox(errorMessageBuffer, "Invalid class registration - Duplicate Class Name", MB_OK); + QMessageBox::critical(nullptr, "Invalid class registration - Duplicate Class Name", QString::fromLatin1(errorMessageBuffer)); return; } diff --git a/Code/Editor/Plugins/ComponentEntityEditorPlugin/Objects/ComponentEntityObject.cpp b/Code/Editor/Plugins/ComponentEntityEditorPlugin/Objects/ComponentEntityObject.cpp index 8957b6ced6..fbb700723b 100644 --- a/Code/Editor/Plugins/ComponentEntityEditorPlugin/Objects/ComponentEntityObject.cpp +++ b/Code/Editor/Plugins/ComponentEntityEditorPlugin/Objects/ComponentEntityObject.cpp @@ -36,7 +36,6 @@ #include #include #include -#include #include #include @@ -48,14 +47,12 @@ /** * Scalars for icon drawing behavior. */ -static const int s_kIconSize = 36; /// Icon display size (in pixels) - CComponentEntityObject::CComponentEntityObject() - : m_hasIcon(false) + : m_accentType(AzToolsFramework::EntityAccentType::None) + , m_hasIcon(false) , m_entityIconVisible(false) , m_iconOnlyHitTest(false) , m_drawAccents(true) - , m_accentType(AzToolsFramework::EntityAccentType::None) , m_isIsolated(false) , m_iconTexture(nullptr) { @@ -243,7 +240,7 @@ void CComponentEntityObject::SetSelected(bool bSelect) } bool anySelected = false; - + AzToolsFramework::ToolsApplicationRequestBus::BroadcastResult(anySelected, &AzToolsFramework::ToolsApplicationRequests::AreAnyEntitiesSelected); if (!anySelected) @@ -266,18 +263,6 @@ void CComponentEntityObject::SetHighlight(bool bHighlight) } } -IRenderNode* CComponentEntityObject::GetEngineNode() const -{ - // It's possible for AZ::Entities to have multiple IRenderNodes. - // However, the editor currently expects a single IRenderNode per "editor object". - // Therefore, return the highest priority handler. - if (auto* renderNodeHandler = LmbrCentral::RenderNodeRequestBus::FindFirstHandler(m_entityId)) - { - return renderNodeHandler->GetRenderNode(); - } - return nullptr; -} - void CComponentEntityObject::OnEntityNameChanged(const AZStd::string& name) { if (m_nameReentryGuard) @@ -331,14 +316,6 @@ void CComponentEntityObject::DetachThis(bool /*bKeepPos*/) } } -CBaseObject* CComponentEntityObject::GetLinkParent() const -{ - AZ::EntityId parentId; - EBUS_EVENT_ID_RESULT(parentId, m_entityId, AZ::TransformBus, GetParentId); - - return CComponentEntityObject::FindObjectForEntity(parentId); -} - bool CComponentEntityObject::IsFrozen() const { return CheckFlags(OBJFLAG_FROZEN); @@ -358,16 +335,6 @@ void CComponentEntityObject::OnEntityLockChanged(bool locked) CEntityObject::SetFrozen(locked); } -void CComponentEntityObject::SetHidden( - bool bHidden, [[maybe_unused]] uint64 hiddenId /*=CBaseObject::s_invalidHiddenID*/, [[maybe_unused]] bool bAnimated /*=false*/) -{ - if (m_visibilityFlagReentryGuard) - { - EditorActionScope flagChange(m_visibilityFlagReentryGuard); - AzToolsFramework::SetEntityVisibility(m_entityId, !bHidden); - } -} - void CComponentEntityObject::OnEntityVisibilityChanged(bool visible) { CEntityObject::SetHidden(!visible); @@ -612,66 +579,6 @@ void CComponentEntityObject::OnTransformChanged([[maybe_unused]] const AZ::Trans } } -int CComponentEntityObject::MouseCreateCallback(CViewport* view, EMouseEvent event, QPoint& point, int flags) -{ - if (event == eMouseMove || event == eMouseLDown) - { - Vec3 pos; - if (GetIEditor()->GetAxisConstrains() != AXIS_TERRAIN) - { - pos = view->MapViewToCP(point); - } - else - { - // Snap to terrain. - bool hitTerrain; - pos = view->ViewToWorld(point, &hitTerrain); - if (hitTerrain) - { - pos.z = GetIEditor()->GetTerrainElevation(pos.x, pos.y); - } - pos = view->SnapToGrid(pos); - } - - pos = view->SnapToGrid(pos); - SetPos(pos); - - if (event == eMouseLDown) - { - return MOUSECREATE_OK; - } - - return MOUSECREATE_CONTINUE; - } - - return CBaseObject::MouseCreateCallback(view, event, point, flags); -} - -bool CComponentEntityObject::HitHelperTest(HitContext& hc) -{ - bool hit = CEntityObject::HitHelperTest(hc); - if (!hit && m_entityId.IsValid()) - { - // Pick against icon in screen space. - if (IsEntityIconVisible()) - { - const QPoint entityScreenPos = hc.view->WorldToView(GetWorldPos()); - const float screenPosX = static_cast(entityScreenPos.x()); - const float screenPosY = static_cast(entityScreenPos.y()); - const float iconRange = static_cast(s_kIconSize / 2); - - if ((hc.point2d.x() >= screenPosX - iconRange && hc.point2d.x() <= screenPosX + iconRange) - && (hc.point2d.y() >= screenPosY - iconRange && hc.point2d.y() <= screenPosY + iconRange)) - { - hc.dist = hc.raySrc.GetDistance(GetWorldPos()); - hc.iconHit = true; - return true; - } - } - } - return hit; -} - bool CComponentEntityObject::HitTest(HitContext& hc) { AZ_PROFILE_FUNCTION(Entity); @@ -907,11 +814,6 @@ void CComponentEntityObject::DrawDefault(DisplayContext& dc, const QColor& label DrawAccent(dc); } -IStatObj* CComponentEntityObject::GetIStatObj() -{ - return nullptr; -} - bool CComponentEntityObject::IsIsolated() const { return m_isIsolated; @@ -952,11 +854,6 @@ void CComponentEntityObject::SetWorldPos(const Vec3& pos, int flags) CEntityObject::SetWorldPos(pos, flags); } -void CComponentEntityObject::OnContextMenu(QMenu* /*pMenu*/) -{ - // Deliberately bypass the base class implementation (CEntityObject::OnContextMenu()). -} - void CComponentEntityObject::SetupEntityIcon() { bool hideIconInViewport = false; diff --git a/Code/Editor/Plugins/ComponentEntityEditorPlugin/Objects/ComponentEntityObject.h b/Code/Editor/Plugins/ComponentEntityEditorPlugin/Objects/ComponentEntityObject.h index bb19f4d77e..7ccea8da84 100644 --- a/Code/Editor/Plugins/ComponentEntityEditorPlugin/Objects/ComponentEntityObject.h +++ b/Code/Editor/Plugins/ComponentEntityEditorPlugin/Objects/ComponentEntityObject.h @@ -56,27 +56,21 @@ public: bool SetScale(const Vec3& scale, int flags) override; void InvalidateTM(int nWhyFlags) override; void Display(DisplayContext& disp) override; - void OnContextMenu(QMenu* pMenu) override; - int MouseCreateCallback(CViewport* view, EMouseEvent event, QPoint& point, int flags) override; - bool HitHelperTest(HitContext& hc) override; bool HitTest(HitContext& hc) override; void GetLocalBounds(AABB& box) override; void GetBoundBox(AABB& box) override; void SetName(const QString& name) override; bool IsFrozen() const override; void SetFrozen(bool bFrozen) override; - void SetHidden(bool bHidden, uint64 hiddenId = CBaseObject::s_invalidHiddenID, bool bAnimated = false) override; void SetSelected(bool bSelect) override; void SetHighlight(bool bHighlight) override; - IRenderNode* GetEngineNode() const override; void AttachChild(CBaseObject* child, bool bKeepPos = true) override; void DetachAll(bool bKeepPos = true) override; void DetachThis(bool bKeepPos = true) override; - CBaseObject* GetLinkParent() const override; XmlNodeRef Export(const QString& levelPath, XmlNodeRef& xmlNode) override; void DeleteEntity() override; void DrawDefault(DisplayContext& dc, const QColor& labelColor = QColor(255, 255, 255)) override; - IStatObj* GetIStatObj() override; + bool IsIsolated() const override; bool IsSelected() const override; bool IsSelectable() const override; @@ -88,12 +82,6 @@ public: // Component entity highlighting (accenting) is taken care of elsewhere void DrawHighlight(DisplayContext& /*dc*/) override {}; - // Don't auto-clone children. Cloning happens in groups with reference fixups, - // and individually selected objercts should be cloned as individuals. - bool ShouldCloneChildren() const override { return false; } - - - ////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////// diff --git a/Code/Editor/Plugins/ComponentEntityEditorPlugin/SandboxIntegration.cpp b/Code/Editor/Plugins/ComponentEntityEditorPlugin/SandboxIntegration.cpp index 4961e7004d..5a1b4dc503 100644 --- a/Code/Editor/Plugins/ComponentEntityEditorPlugin/SandboxIntegration.cpp +++ b/Code/Editor/Plugins/ComponentEntityEditorPlugin/SandboxIntegration.cpp @@ -447,7 +447,7 @@ void SandboxIntegrationManager::OnEndUndo(const char* label, bool changed) // Add the undo only after we know it's got a legit change, we can't remove undos from the cry undo system so we do it here instead of OnBeginUndo if (changed && CUndo::IsRecording()) { - CUndo::Record(new CToolsApplicationUndoLink(label)); + CUndo::Record(new CToolsApplicationUndoLink()); } if (m_startedUndoRecordingNestingLevel) { diff --git a/Code/Editor/Plugins/ComponentEntityEditorPlugin/SandboxIntegration.h b/Code/Editor/Plugins/ComponentEntityEditorPlugin/SandboxIntegration.h index 9afa944438..7fe2881b92 100644 --- a/Code/Editor/Plugins/ComponentEntityEditorPlugin/SandboxIntegration.h +++ b/Code/Editor/Plugins/ComponentEntityEditorPlugin/SandboxIntegration.h @@ -306,8 +306,7 @@ class CToolsApplicationUndoLink { public: - CToolsApplicationUndoLink(const char* description) - : m_description(description) + CToolsApplicationUndoLink() { } @@ -316,11 +315,6 @@ public: return 0; } - QString GetDescription() override - { - return m_description.c_str(); - } - void Undo(bool bUndo = true) override { // Always run the undo even if the flag was set to false, that just means that undo wasn't expressly desired, but can be used in cases of canceling the current super undo. @@ -354,8 +348,6 @@ public: w->setFocus(Qt::OtherFocusReason); } } - - AZStd::string m_description; }; #endif // CRYINCLUDE_COMPONENTENTITYEDITORPLUGIN_SANDBOXINTEGRATION_H diff --git a/Code/Editor/TrackView/TrackViewSplineCtrl.cpp b/Code/Editor/TrackView/TrackViewSplineCtrl.cpp index 352f2f3699..b80818db0d 100644 --- a/Code/Editor/TrackView/TrackViewSplineCtrl.cpp +++ b/Code/Editor/TrackView/TrackViewSplineCtrl.cpp @@ -57,7 +57,6 @@ protected: } int GetSize() override { return sizeof(*this); } - QString GetDescription() override { return "UndoTrackViewSplineCtrl"; }; void Undo(bool bUndo) override { diff --git a/Code/Editor/TrackView/TrackViewUndo.h b/Code/Editor/TrackView/TrackViewUndo.h index ff5964ec7f..7f3b4737a1 100644 --- a/Code/Editor/TrackView/TrackViewUndo.h +++ b/Code/Editor/TrackView/TrackViewUndo.h @@ -6,9 +6,6 @@ * */ - -#ifndef CRYINCLUDE_EDITOR_TRACKVIEW_TRACKVIEWUNDO_H -#define CRYINCLUDE_EDITOR_TRACKVIEW_TRACKVIEWUNDO_H #pragma once #include "TrackViewTrack.h" @@ -27,11 +24,10 @@ public: CUndoComponentEntityTrackObject(CTrackViewTrack* track); protected: - virtual int GetSize() override { return sizeof(*this); } - virtual QString GetDescription() override { return "Undo Component Entity Track Modify"; }; + int GetSize() override { return sizeof(*this); } - virtual void Undo(bool bUndo) override; - virtual void Redo() override; + void Undo(bool bUndo) override; + void Redo() override; private: @@ -50,5 +46,3 @@ private: CTrackViewTrackMemento m_undo; CTrackViewTrackMemento m_redo; }; - -#endif // CRYINCLUDE_EDITOR_TRACKVIEW_TRACKVIEWUNDO_H diff --git a/Code/Editor/Undo/IUndoObject.h b/Code/Editor/Undo/IUndoObject.h index 47d853dd9a..3791b76d48 100644 --- a/Code/Editor/Undo/IUndoObject.h +++ b/Code/Editor/Undo/IUndoObject.h @@ -8,10 +8,6 @@ // Description : Interface for implementation of IUndo objects. - - -#ifndef CRYINCLUDE_EDITOR_UNDO_IUNDOOBJECT_H -#define CRYINCLUDE_EDITOR_UNDO_IUNDOOBJECT_H #pragma once #include @@ -26,8 +22,6 @@ struct IUndoObject virtual void Release() { delete this; }; //! Return size of this Undo object. virtual int GetSize() = 0; - //! Return description of this Undo object. - virtual QString GetDescription() = 0; //! Undo this object. //! @param bUndo If true this operation called in response to Undo operation. @@ -37,14 +31,5 @@ struct IUndoObject virtual void Redo() = 0; // Returns the name of undo object - virtual QString GetObjectName(){ return QString(); }; - - // Returns the name of related editor object. - // Ex: For a undo action which would modify value for var "Emitter Strength" of emitter "Level.example", - // this function will return emitter name "Level.example" - Vera, Confetti - virtual QString GetEditorObjectName() { return QString(); }; - - virtual bool IsChanged([[maybe_unused]] unsigned int& compareValue) const { return false; } + virtual QString GetObjectName(){ return QString(); } }; - -#endif // CRYINCLUDE_EDITOR_UNDO_IUNDOOBJECT_H diff --git a/Code/Editor/Util/KDTree.cpp b/Code/Editor/Util/KDTree.cpp deleted file mode 100644 index af06a58c9f..0000000000 --- a/Code/Editor/Util/KDTree.cpp +++ /dev/null @@ -1,572 +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 "EditorDefs.h" - -#include "KDTree.h" - -#include - -class KDTreeNode -{ -public: - KDTreeNode() - { - pChildren[0] = nullptr; - pChildren[1] = nullptr; - pVertexIndices = nullptr; - } - ~KDTreeNode() - { - if (!IsLeaf()) - { - if (pChildren[0]) - { - delete pChildren[0]; - } - if (pChildren[1]) - { - delete pChildren[1]; - } - } - else if (GetVertexBufferSize() > 1) - { - if (pVertexIndices) - { - delete [] pVertexIndices; - } - } - } - uint32 GetVertexBufferSize() const - { - return nVertexIndexBufferSize; - } - float GetSplitPos() const - { - return splitPos; - } - void SetSplitPos(float pos) - { - splitPos = pos; - } - CKDTree::ESplitAxis GetSplitAxis() const - { - if (splitAxis == 0) - { - return CKDTree::eSA_X; - } - if (splitAxis == 1) - { - return CKDTree::eSA_Y; - } - if (splitAxis == 2) - { - return CKDTree::eSA_Z; - } - return CKDTree::eSA_Invalid; - } - void SetSplitAxis(const CKDTree::ESplitAxis& axis) - { - splitAxis = axis; - } - bool IsLeaf() const - { - return pChildren[0] == nullptr && pChildren[1] == nullptr; - } - KDTreeNode* GetChild(uint32 nIndex) const - { - if (nIndex > 1) - { - return nullptr; - } - return pChildren[nIndex]; - } - void SetChild(uint32 nIndex, KDTreeNode* pNode) - { - if (nIndex > 1) - { - return; - } - if (pChildren[nIndex]) - { - delete pChildren[nIndex]; - } - pChildren[nIndex] = pNode; - } - const AABB& GetBoundBox() - { - return boundbox; - } - void SetBoundBox(const AABB& aabb) - { - boundbox = aabb; - } - void SetVertexIndexBuffer(std::vector& vertexInfos) - { - nVertexIndexBufferSize = (uint32)vertexInfos.size(); - if (nVertexIndexBufferSize == 0) - { - return; - } - if (nVertexIndexBufferSize == 1) - { - oneIndex = vertexInfos[0]; - } - else - { - pVertexIndices = new uint32[nVertexIndexBufferSize]; - memcpy(pVertexIndices, &vertexInfos[0], sizeof(uint32) * nVertexIndexBufferSize); - } - } - uint32 GetVertexIndex(uint32 nIndex) const - { - if (GetVertexBufferSize() == 1) - { - return oneIndex & 0x00FFFFFF; - } - - return pVertexIndices[nIndex] & 0x00FFFFFF; - } - uint32 GetObjIndex(uint32 nIndex) const - { - if (GetVertexBufferSize() == 1) - { - return (oneIndex & 0xFF000000) >> 24; - } - - return (pVertexIndices[nIndex] & 0xFF000000) >> 24; - } - -private: - union - { - float splitPos; // Interior - uint32 oneIndex; // Leaf - uint32* pVertexIndices; // Leaf : high 8bits - object index, low 24bits - vertex index - }; - union - { - uint32 splitAxis; // Interior - uint32 nVertexIndexBufferSize; // Leaf - }; - AABB boundbox; // Both - KDTreeNode* pChildren[2]; // Interior -}; - -CKDTree::ESplitAxis SearchForBestSplitAxis(const AABB& aabb) -{ - float xsize = aabb.max.x - aabb.min.x; - float ysize = aabb.max.y - aabb.min.y; - float zsize = aabb.max.z - aabb.min.z; - - CKDTree::ESplitAxis axis; - if (xsize > ysize && xsize > zsize) - { - axis = CKDTree::eSA_X; - } - else if (ysize > zsize && ysize > xsize) - { - axis = CKDTree::eSA_Y; - } - else - { - axis = CKDTree::eSA_Z; - } - - return axis; -} - -bool SearchForBestSplitPos(CKDTree::ESplitAxis axis, const std::vector& statObjList, std::vector& indices, float& outBestSplitPos) -{ - if (axis != CKDTree::eSA_X && axis != CKDTree::eSA_Y && axis != CKDTree::eSA_Z) - { - return false; - } - - outBestSplitPos = 0; - - int nSizeOfIndices = static_cast(indices.size()); - - for (int i = 0; i < nSizeOfIndices; ++i) - { - int nObjIndex = (indices[i] & 0xFF000000) >> 24; - int nVertexIndex = (indices[i] & 0xFFFFFF); - - const CKDTree::SStatObj* pObj = &statObjList[nObjIndex]; - - const IIndexedMesh* pMesh = pObj->pStatObj->GetIndexedMesh(); - if (pMesh == nullptr) - { - continue; - } - - IIndexedMesh::SMeshDescription meshDesc; - pMesh->GetMeshDescription(meshDesc); - - if (meshDesc.m_pVerts) - { - outBestSplitPos += pObj->tm.TransformPoint(meshDesc.m_pVerts[nVertexIndex])[axis]; - } - else if (meshDesc.m_pVertsF16) - { - outBestSplitPos += pObj->tm.TransformPoint(meshDesc.m_pVertsF16[nVertexIndex].ToVec3())[axis]; - } - } - - outBestSplitPos /= nSizeOfIndices; - - return true; -} - -struct SSplitInfo -{ - AABB aboveBoundbox; - std::vector aboveIndices; - AABB belowBoundbox; - std::vector belowIndices; -}; - -bool SplitNode(const std::vector& statObjList, const AABB& boundbox, const std::vector& indices, CKDTree::ESplitAxis splitAxis, float splitPos, SSplitInfo& outInfo) -{ - if (splitAxis != CKDTree::eSA_X && splitAxis != CKDTree::eSA_Y && splitAxis != CKDTree::eSA_Z) - { - return false; - } - - outInfo.aboveBoundbox = boundbox; - outInfo.belowBoundbox = boundbox; - - outInfo.aboveBoundbox.max[splitAxis] = splitPos; - outInfo.belowBoundbox.min[splitAxis] = splitPos; - - uint32 iIndexSize = (uint32)indices.size(); - outInfo.aboveIndices.reserve(iIndexSize); - outInfo.belowIndices.reserve(iIndexSize); - - for (uint32 i = 0; i < iIndexSize; ++i) - { - int nObjIndex = (indices[i] & 0xFF000000) >> 24; - int nVertexIndex = indices[i] & 0xFFFFFF; - - const CKDTree::SStatObj* pObj = &statObjList[nObjIndex]; - - const IIndexedMesh* pMesh = pObj->pStatObj->GetIndexedMesh(); - if (pMesh == nullptr) - { - return false; - } - - IIndexedMesh::SMeshDescription meshDesc; - pMesh->GetMeshDescription(meshDesc); - - Vec3 vPos; - if (meshDesc.m_pVerts) - { - vPos = pObj->tm.TransformPoint(meshDesc.m_pVerts[nVertexIndex]); - } - else if (meshDesc.m_pVertsF16) - { - vPos = pObj->tm.TransformPoint(meshDesc.m_pVertsF16[nVertexIndex].ToVec3()); - } - else - { - continue; - } - - if (vPos[splitAxis] < splitPos) - { - outInfo.aboveIndices.push_back(indices[i]); - assert(outInfo.aboveBoundbox.IsContainPoint(vPos)); - } - else - { - outInfo.belowIndices.push_back(indices[i]); - assert(outInfo.belowBoundbox.IsContainPoint(vPos)); - } - } - - return true; -} - -CKDTree::CKDTree() -{ - m_pRootNode = nullptr; -} - -CKDTree::~CKDTree() -{ - if (m_pRootNode) - { - delete m_pRootNode; - } -} - -bool CKDTree::Build(IStatObj* pStatObj) -{ - if (pStatObj == nullptr) - { - return false; - } - - m_StatObjectList.clear(); - - if (pStatObj->GetIndexedMesh(true)) - { - SStatObj rootObj; - rootObj.tm.SetIdentity(); - rootObj.pStatObj = pStatObj; - m_StatObjectList.push_back(rootObj); - } - - ConstructStatObjList(pStatObj, Matrix34::CreateIdentity()); - - AABB entireBoundBox; - entireBoundBox.Reset(); - - std::vector indices; - for (int i = 0, iStatObjSize = static_cast(m_StatObjectList.size()); i < iStatObjSize; ++i) - { - IIndexedMesh* pMesh = m_StatObjectList[i].pStatObj->GetIndexedMesh(true); - if (pMesh == nullptr) - { - continue; - } - - IIndexedMesh::SMeshDescription meshDesc; - pMesh->GetMeshDescription(meshDesc); - - for (int k = 0; k < meshDesc.m_nVertCount; ++k) - { - entireBoundBox.Add(m_StatObjectList[i].tm.TransformPoint(meshDesc.m_pVerts[k])); - indices.push_back((i << 24) | k); - } - } - - if (m_pRootNode) - { - delete m_pRootNode; - } - - m_pRootNode = new KDTreeNode; - BuildRecursively(m_pRootNode, entireBoundBox, indices); - - return true; -} - -void CKDTree::BuildRecursively(KDTreeNode* pNode, const AABB& boundbox, std::vector& indices) const -{ - pNode->SetBoundBox(boundbox); - - if (indices.size() <= s_MinimumVertexSizeInLeafNode) - { - pNode->SetVertexIndexBuffer(indices); - return; - } - - ESplitAxis splitAxis = SearchForBestSplitAxis(boundbox); - float splitPos(0); - SearchForBestSplitPos(splitAxis, m_StatObjectList, indices, splitPos); - pNode->SetSplitAxis(splitAxis); - pNode->SetSplitPos(splitPos); - - SSplitInfo splitInfo; - if (!SplitNode(m_StatObjectList, boundbox, indices, splitAxis, splitPos, splitInfo)) - { - return; - } - - if (splitInfo.aboveIndices.empty() || splitInfo.belowIndices.empty()) - { - pNode->SetVertexIndexBuffer(indices); - return; - } - - KDTreeNode* pChild0 = new KDTreeNode; - KDTreeNode* pChild1 = new KDTreeNode; - - pNode->SetChild(0, pChild0); - pNode->SetChild(1, pChild1); - - BuildRecursively(pChild0, splitInfo.aboveBoundbox, splitInfo.aboveIndices); - BuildRecursively(pChild1, splitInfo.belowBoundbox, splitInfo.belowIndices); -} - -void CKDTree::ConstructStatObjList(IStatObj* pStatObj, const Matrix34& matParent) -{ - if (pStatObj == nullptr) - { - return; - } - for (int i = 0, nChildObjSize(pStatObj->GetSubObjectCount()); i < nChildObjSize; ++i) - { - IStatObj::SSubObject* pSubObj = pStatObj->GetSubObject(i); - SStatObj s; - s.tm = matParent * pSubObj->localTM; - if (pSubObj->pStatObj && pSubObj->pStatObj->GetIndexedMesh(true)) - { - s.pStatObj = pSubObj->pStatObj; - m_StatObjectList.push_back(s); - } - ConstructStatObjList(pSubObj->pStatObj, s.tm); - } -} - -bool CKDTree::FindNearestVertex(const Vec3& raySrc, const Vec3& rayDir, float vVertexBoxSize, const Vec3& localCameraPos, Vec3& outPos, Vec3& vOutHitPosOnCube) const -{ - return FindNearestVertexRecursively(m_pRootNode, raySrc, rayDir, vVertexBoxSize, localCameraPos, outPos, vOutHitPosOnCube); -} - -AABB GetNodeBoundBox(KDTreeNode* pNode, float vVertexBoxSize, const Vec3& localCameraPos) -{ - AABB nodeAABB = pNode->GetBoundBox(); - float fScreenFactorMin = localCameraPos.GetDistance(nodeAABB.min); - Vec3 vBoundBoxMin(fScreenFactorMin * vVertexBoxSize, fScreenFactorMin * vVertexBoxSize, fScreenFactorMin * vVertexBoxSize); - float fScreenFactorMax = localCameraPos.GetDistance(nodeAABB.max); - Vec3 vBoundBoxMax(fScreenFactorMax * vVertexBoxSize, fScreenFactorMax * vVertexBoxSize, fScreenFactorMax * vVertexBoxSize); - nodeAABB.min -= vBoundBoxMin; - nodeAABB.max += vBoundBoxMax; - return nodeAABB; -} - -bool CKDTree::FindNearestVertexRecursively(KDTreeNode* pNode, const Vec3& raySrc, const Vec3& rayDir, float vVertexBoxSize, const Vec3& localCameraPos, Vec3& outPos, Vec3& vOutHitPosOnCube) const -{ - if (!pNode) - { - return false; - } - - Vec3 vHitPos; - AABB nodeAABB = GetNodeBoundBox(pNode, vVertexBoxSize, localCameraPos); - if (!pNode->GetBoundBox().IsContainPoint(raySrc) && !Intersect::Ray_AABB(raySrc, rayDir, nodeAABB, vHitPos)) - { - return false; - } - - if (pNode->IsLeaf()) - { - if (m_StatObjectList.empty()) - { - return false; - } - - uint32 nVBuffSize = pNode->GetVertexBufferSize(); - if (nVBuffSize == 0) - { - return false; - } - - float fNearestDist = 3e10f; - - for (uint32 i = 0; i < nVBuffSize; ++i) - { - uint32 nVertexIndex = pNode->GetVertexIndex(i); - uint32 nObjIndex = pNode->GetObjIndex(i); - - assert(nObjIndex < m_StatObjectList.size()); - - const SStatObj* pStatObjInfo = &(m_StatObjectList[nObjIndex]); - - IIndexedMesh* pMesh = m_StatObjectList[nObjIndex].pStatObj->GetIndexedMesh(); - if (pMesh == nullptr) - { - continue; - } - - IIndexedMesh::SMeshDescription meshDesc; - pMesh->GetMeshDescription(meshDesc); - - Vec3 vCandidatePos(0, 0, 0); - if (meshDesc.m_pVerts) - { - vCandidatePos = pStatObjInfo->tm.TransformPoint(meshDesc.m_pVerts[nVertexIndex]); - } - else if (meshDesc.m_pVertsF16) - { - vCandidatePos = pStatObjInfo->tm.TransformPoint(meshDesc.m_pVertsF16[nVertexIndex].ToVec3()); - } - else - { - continue; - } - - float fScreenFactor = localCameraPos.GetDistance(vCandidatePos); - Vec3 vBoundBox(fScreenFactor * vVertexBoxSize, fScreenFactor * vVertexBoxSize, fScreenFactor * vVertexBoxSize); - - Vec3 vHitPosOnCube; - if (Intersect::Ray_AABB(raySrc, rayDir, AABB(vCandidatePos - vBoundBox, vCandidatePos + vBoundBox), vHitPosOnCube)) - { - float fDist = vHitPosOnCube.GetDistance(raySrc); - if (fDist < fNearestDist) - { - fNearestDist = fDist; - outPos = vCandidatePos; - vOutHitPosOnCube = vHitPosOnCube; - } - } - } - - if (fNearestDist < 3e10f) - { - return true; - } - - return false; - } - - Vec3 vNearestPos0, vNearestPos0OnCube; - Vec3 vNearestPos1, vNearestPos1OnCube; - bool bFoundChild0 = FindNearestVertexRecursively(pNode->GetChild(0), raySrc, rayDir, vVertexBoxSize, localCameraPos, vNearestPos0, vNearestPos0OnCube); - bool bFoundChild1 = FindNearestVertexRecursively(pNode->GetChild(1), raySrc, rayDir, vVertexBoxSize, localCameraPos, vNearestPos1, vNearestPos1OnCube); - - if (bFoundChild0 && bFoundChild1) - { - float fDist0 = raySrc.GetDistance(vNearestPos0OnCube); - float fDist1 = raySrc.GetDistance(vNearestPos1OnCube); - if (fDist0 < fDist1) - { - outPos = vNearestPos0; - vOutHitPosOnCube = vNearestPos0OnCube; - } - else - { - outPos = vNearestPos1; - vOutHitPosOnCube = vNearestPos1OnCube; - } - } - else if (bFoundChild0 && !bFoundChild1) - { - outPos = vNearestPos0; - vOutHitPosOnCube = vNearestPos0OnCube; - } - else if (!bFoundChild0 && bFoundChild1) - { - outPos = vNearestPos1; - vOutHitPosOnCube = vNearestPos1OnCube; - } - - return bFoundChild0 || bFoundChild1; -} - -void CKDTree::GetPenetratedBoxes(const Vec3& raySrc, const Vec3& rayDir, std::vector& outBoxes) -{ - GetPenetratedBoxesRecursively(m_pRootNode, raySrc, rayDir, outBoxes); -} - -void CKDTree::GetPenetratedBoxesRecursively(KDTreeNode* pNode, const Vec3& raySrc, const Vec3& rayDir, std::vector& outBoxes) -{ - Vec3 vHitPos; - if (!pNode || (!pNode->GetBoundBox().IsContainPoint(raySrc) && !Intersect::Ray_AABB(raySrc, rayDir, pNode->GetBoundBox(), vHitPos))) - { - return; - } - - outBoxes.push_back(pNode->GetBoundBox()); - - GetPenetratedBoxesRecursively(pNode->GetChild(0), raySrc, rayDir, outBoxes); - GetPenetratedBoxesRecursively(pNode->GetChild(1), raySrc, rayDir, outBoxes); -} diff --git a/Code/Editor/Util/KDTree.h b/Code/Editor/Util/KDTree.h deleted file mode 100644 index df25a9ded7..0000000000 --- a/Code/Editor/Util/KDTree.h +++ /dev/null @@ -1,57 +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 - * - */ - - -#ifndef CRYINCLUDE_EDITOR_UTIL_KDTREE_H -#define CRYINCLUDE_EDITOR_UTIL_KDTREE_H -#pragma once - -struct IStatObj; - -class KDTreeNode; - -class CKDTree -{ -public: - - CKDTree(); - ~CKDTree(); - - bool Build(IStatObj* pStatObj); - bool FindNearestVertex(const Vec3& raySrc, const Vec3& rayDir, float vVertexBoxSize, const Vec3& localCameraPos, Vec3& outPos, Vec3& vOutHitPosOnCube) const; - void GetPenetratedBoxes(const Vec3& raySrc, const Vec3& rayDir, std::vector& outBoxes); - - enum ESplitAxis - { - eSA_X = 0, - eSA_Y, - eSA_Z, - eSA_Invalid - }; - - struct SStatObj - { - Matrix34 tm; - IStatObj* pStatObj; - }; - -private: - - void BuildRecursively(KDTreeNode* pNode, const AABB& boundbox, std::vector& indices) const; - bool FindNearestVertexRecursively(KDTreeNode* pNode, const Vec3& raySrc, const Vec3& rayDir, float vVertexBoxSize, const Vec3& localCameraPos, Vec3& outPos, Vec3& vOutHitPosOnCube) const; - void GetPenetratedBoxesRecursively(KDTreeNode* pNode, const Vec3& raySrc, const Vec3& rayDir, std::vector& outBoxes); - void ConstructStatObjList(IStatObj* pStatObj, const Matrix34& matParent); - - static const int s_MinimumVertexSizeInLeafNode = 4; - -private: - - KDTreeNode* m_pRootNode; - std::vector m_StatObjectList; -}; -#endif // CRYINCLUDE_EDITOR_UTIL_KDTREE_H diff --git a/Code/Editor/Util/XmlArchive.cpp b/Code/Editor/Util/XmlArchive.cpp index 3a965fb239..72999efdf4 100644 --- a/Code/Editor/Util/XmlArchive.cpp +++ b/Code/Editor/Util/XmlArchive.cpp @@ -16,102 +16,6 @@ ////////////////////////////////////////////////////////////////////////// // CXmlArchive -bool CXmlArchive::Load(const QString& file) -{ - bLoading = true; - - char filename[AZ_MAX_PATH_LEN] = { 0 }; - AZ::IO::FileIOBase::GetInstance()->ResolvePath(file.toUtf8().data(), filename, AZ_MAX_PATH_LEN); - - QFile cFile(filename); - if (!cFile.open(QFile::ReadOnly)) - { - CLogFile::FormatLine("Warning: Loading of %s failed", filename); - return false; - } - CArchive ar(&cFile, CArchive::load); - - QString str; - ar >> str; - - root = XmlHelpers::LoadXmlFromBuffer(str.toUtf8().data(), str.toUtf8().length()); - if (!root) - { - // If we didn't extract valid XML, attempt to check the header to see if we're dealing with an improperly serialized archive - // When deserializing QStrings, we use readStringLength in EditorUtils, which mimics MFC's decoding. - // In this encoding, the length is first read as an unsigned 8-bit value, if that is 0xFF then the next two bytes are read - // If the 16 bit uint is 0xFFFF, then the next four bytes are read, etc. up to a final 64 bit value. - - // In 1.09, there was a bug in which we'd serialize out the 32-bit length improperly like so: - // 0xFF 0xFF 0x00 <4 byte proper length> - - // Note that the header could also historically start with 0xFF 0xFF 0xFE to indicate wide strings prior to the length data - // but we don't have to deal with that here as the broken version of the code never prepended this - cFile.seek(0); - quint8 len8; - ar >> len8; - - quint16 len16; - ar >> len16; - - // Possible bad header, attempt to read 32 bit length. - if (len8 == 0xff && len16 == 0xff) - { - // This version of operator<< only serialized out UTF8 strings up to 32 bits of length, no need to 64-bit check or do wchar. - quint32 len32; - ar >> len32; - - str = QString::fromUtf8(cFile.read(len32)); - root = XmlHelpers::LoadXmlFromBuffer(str.toUtf8().data(), str.toUtf8().length()); - } - - if (!root) - { - CLogFile::FormatLine("Warning: Loading of %s failed", filename); - return false; - } - } - - const bool loaded = pNamedData->Serialize(ar); - if (!loaded) - { - CLogFile::FormatLine("Error: Can't load xml file: '%s'! File corrupted. Binary file possibly was corrupted by Source Control if it was marked like text format.", filename); - return false; - } - - return true; -} - -////////////////////////////////////////////////////////////////////////// -void CXmlArchive::Save(const QString& file) -{ - char filename[AZ_MAX_PATH_LEN] = { 0 }; - AZ::IO::FileIOBase::GetInstance()->ResolvePath(file.toUtf8().data(), filename, AZ_MAX_PATH_LEN); - - bLoading = false; - if (!root) - { - return; - } - - QFile cFile(filename); - // Open the file for writing, create it if needed - if (!cFile.open(QFile::WriteOnly)) - { - CLogFile::FormatLine("Warning: Saving of %s failed", filename); - return; - } - // Create the archive object - CArchive ar(&cFile, CArchive::store); - - _smart_ptr pXmlStrData = root->getXMLData(5000000); - - // Need convert to QString for CArchive::operator<< - QString str = pXmlStrData->GetString(); - ar << str; - - pNamedData->Serialize(ar); -} ////////////////////////////////////////////////////////////////////////// bool CXmlArchive::SaveToPak([[maybe_unused]] const QString& levelPath, CPakFile& pakFile) diff --git a/Code/Editor/Util/XmlArchive.h b/Code/Editor/Util/XmlArchive.h index 3d45a7a2e6..e7de4c5be8 100644 --- a/Code/Editor/Util/XmlArchive.h +++ b/Code/Editor/Util/XmlArchive.h @@ -60,9 +60,6 @@ public: return *this; } - bool Load(const QString& file); - void Save(const QString& file); - //! Save XML Archive to pak file. //! @return true if saved. bool SaveToPak(const QString& levelPath, CPakFile& pakFile); diff --git a/Code/Editor/Viewport.cpp b/Code/Editor/Viewport.cpp index 5a64982350..613dc0c4e7 100644 --- a/Code/Editor/Viewport.cpp +++ b/Code/Editor/Viewport.cpp @@ -1062,11 +1062,6 @@ Vec3 QtViewport::SnapToGrid(const Vec3& vec) return vec; } -float QtViewport::GetGridStep() const -{ - return 0.0f; -} - ////////////////////////////////////////////////////////////////////////// void QtViewport::BeginUndo() { @@ -1121,30 +1116,6 @@ bool QtViewport::IsBoundsVisible([[maybe_unused]] const AABB& box) const return true; } -////////////////////////////////////////////////////////////////////////// -bool QtViewport::HitTestLine(const Vec3& lineP1, const Vec3& lineP2, const QPoint& hitpoint, int pixelRadius, float* pToCameraDistance) const -{ - float dist = GetDistanceToLine(lineP1, lineP2, hitpoint); - if (dist <= pixelRadius) - { - if (pToCameraDistance) - { - Vec3 raySrc, rayDir; - ViewToWorldRay(hitpoint, raySrc, rayDir); - Vec3 rayTrg = raySrc + rayDir * 10000.0f; - - Vec3 pa, pb; - float mua, mub; - LineLineIntersect(lineP1, lineP2, raySrc, rayTrg, pa, pb, mua, mub); - *pToCameraDistance = mub; - } - - return true; - } - - return false; -} - ////////////////////////////////////////////////////////////////////////// float QtViewport::GetDistanceToLine(const Vec3& lineP1, const Vec3& lineP2, const QPoint& point) const { @@ -1349,6 +1320,7 @@ float QtViewport::GetFOV() const { return gSettings.viewports.fDefaultFov; } + ////////////////////////////////////////////////////////////////////////// void QtViewport::setRay(QPoint& vp, Vec3& raySrc, Vec3& rayDir) { @@ -1356,12 +1328,5 @@ void QtViewport::setRay(QPoint& vp, Vec3& raySrc, Vec3& rayDir) m_raySrc = raySrc; m_rayDir = rayDir; } -//////////////////////////////////////////////////////////////////////// -void QtViewport::setHitcontext(QPoint& vp, Vec3& raySrc, Vec3& rayDir) -{ - vp = m_vp; - raySrc = m_raySrc; - rayDir = m_rayDir; -} #include diff --git a/Code/Editor/Viewport.h b/Code/Editor/Viewport.h index bf44b914aa..b8c55c7431 100644 --- a/Code/Editor/Viewport.h +++ b/Code/Editor/Viewport.h @@ -397,7 +397,6 @@ public: //! Snap any given 3D world position to grid lines if snap is enabled. Vec3 SnapToGrid(const Vec3& vec) override; - float GetGridStep() const override; //! Returns the screen scale factor for a point given in world coordinates. //! This factor gives the width in world-space units at the point's distance of the viewport. @@ -434,19 +433,12 @@ public: //! Performs hit testing of 2d point in view to find which object hit. bool HitTest(const QPoint& point, HitContext& hitInfo) 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. - bool HitTestLine(const Vec3& lineP1, const Vec3& lineP2, const QPoint& hitpoint, int pixelRadius, float* pToCameraDistance = 0) const override; - float GetDistanceToLine(const Vec3& lineP1, const Vec3& lineP2, const QPoint& point) const override; // Access to the member m_bAdvancedSelectMode so interested modules can know its value. bool GetAdvancedSelectModeFlag() override; void GetPerpendicularAxis(EAxis* pAxis, bool* pIs2D) const override; - const ::Plane* GetConstructionPlane() const override { return &m_constructionPlane; } - - ////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////// //! Set construction plane from given position construction matrix refrence coord system and axis settings. @@ -502,7 +494,7 @@ public: void ReleaseMouse() override { m_mouseCaptured = false; QWidget::releaseMouse(); } void setRay(QPoint& vp, Vec3& raySrc, Vec3& rayDir) override; - void setHitcontext(QPoint& vp, Vec3& raySrc, Vec3& rayDir) override; + QPoint m_vp; AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING Vec3 m_raySrc; diff --git a/Code/Editor/editor_lib_files.cmake b/Code/Editor/editor_lib_files.cmake index 47b69765ba..fa627176d8 100644 --- a/Code/Editor/editor_lib_files.cmake +++ b/Code/Editor/editor_lib_files.cmake @@ -488,7 +488,6 @@ set(FILES UndoViewPosition.h UndoViewRotation.h Util/GeometryUtil.h - Util/KDTree.h WipFeaturesDlg.h WipFeaturesDlg.ui WipFeaturesDlg.qrc @@ -499,7 +498,6 @@ set(FILES Objects/ClassDesc.cpp Objects/ClassDesc.h Objects/DisplayContextShared.inl - Objects/IEntityObjectListener.h Objects/SelectionGroup.cpp Objects/SelectionGroup.h Objects/SubObjSelection.cpp @@ -710,7 +708,6 @@ set(FILES Util/GuidUtil.cpp Util/GuidUtil.h Util/IObservable.h - Util/KDTree.cpp Util/Mailer.h Util/NamedData.cpp Util/NamedData.h diff --git a/Code/Framework/AzCore/Platform/Android/AzCore/AzCore_Traits_Android.h b/Code/Framework/AzCore/Platform/Android/AzCore/AzCore_Traits_Android.h index e05e000a4e..e8efce1133 100644 --- a/Code/Framework/AzCore/Platform/Android/AzCore/AzCore_Traits_Android.h +++ b/Code/Framework/AzCore/Platform/Android/AzCore/AzCore_Traits_Android.h @@ -53,10 +53,8 @@ // Compiler traits ... #define AZ_TRAIT_COMPILER_DEFINE_AZSWNPRINTF_AS_SWPRINTF 1 #define AZ_TRAIT_COMPILER_DEFINE_FS_ERRNO_TYPE 1 -#define AZ_TRAIT_COMPILER_DEFINE_FS_STAT_TYPE 0 #define AZ_TRAIT_COMPILER_DEFINE_GETCURRENTPROCESSID 1 #define AZ_TRAIT_COMPILER_DEFINE_REFGUID 0 -#define AZ_TRAIT_COMPILER_DEFINE_SASSERTDATA_TYPE 1 #define AZ_TRAIT_COMPILER_DEFINE_WCSICMP 1 #define AZ_TRAIT_COMPILER_INT64_T_IS_LONG 1 #define AZ_TRAIT_COMPILER_OPTIMIZE_MISSING_DEFAULT_SWITCH_CASE 0 diff --git a/Code/Framework/AzCore/Platform/Linux/AzCore/AzCore_Traits_Linux.h b/Code/Framework/AzCore/Platform/Linux/AzCore/AzCore_Traits_Linux.h index 2c0d554078..59d5f3c5ed 100644 --- a/Code/Framework/AzCore/Platform/Linux/AzCore/AzCore_Traits_Linux.h +++ b/Code/Framework/AzCore/Platform/Linux/AzCore/AzCore_Traits_Linux.h @@ -53,10 +53,8 @@ // Compiler traits ... #define AZ_TRAIT_COMPILER_DEFINE_AZSWNPRINTF_AS_SWPRINTF 1 #define AZ_TRAIT_COMPILER_DEFINE_FS_ERRNO_TYPE 1 -#define AZ_TRAIT_COMPILER_DEFINE_FS_STAT_TYPE 0 #define AZ_TRAIT_COMPILER_DEFINE_GETCURRENTPROCESSID 1 #define AZ_TRAIT_COMPILER_DEFINE_REFGUID 1 -#define AZ_TRAIT_COMPILER_DEFINE_SASSERTDATA_TYPE 1 #define AZ_TRAIT_COMPILER_DEFINE_WCSICMP 0 #define AZ_TRAIT_COMPILER_INT64_T_IS_LONG 1 #define AZ_TRAIT_COMPILER_OPTIMIZE_MISSING_DEFAULT_SWITCH_CASE 1 diff --git a/Code/Framework/AzCore/Platform/Mac/AzCore/AzCore_Traits_Mac.h b/Code/Framework/AzCore/Platform/Mac/AzCore/AzCore_Traits_Mac.h index 816a28b728..1a3d0663e1 100644 --- a/Code/Framework/AzCore/Platform/Mac/AzCore/AzCore_Traits_Mac.h +++ b/Code/Framework/AzCore/Platform/Mac/AzCore/AzCore_Traits_Mac.h @@ -53,10 +53,8 @@ // Compiler traits ... #define AZ_TRAIT_COMPILER_DEFINE_AZSWNPRINTF_AS_SWPRINTF 1 #define AZ_TRAIT_COMPILER_DEFINE_FS_ERRNO_TYPE 1 -#define AZ_TRAIT_COMPILER_DEFINE_FS_STAT_TYPE 1 #define AZ_TRAIT_COMPILER_DEFINE_GETCURRENTPROCESSID 1 #define AZ_TRAIT_COMPILER_DEFINE_REFGUID 1 -#define AZ_TRAIT_COMPILER_DEFINE_SASSERTDATA_TYPE 1 #define AZ_TRAIT_COMPILER_DEFINE_WCSICMP 0 #define AZ_TRAIT_COMPILER_INT64_T_IS_LONG 0 #define AZ_TRAIT_COMPILER_OPTIMIZE_MISSING_DEFAULT_SWITCH_CASE 1 diff --git a/Code/Framework/AzCore/Platform/Windows/AzCore/AzCore_Traits_Windows.h b/Code/Framework/AzCore/Platform/Windows/AzCore/AzCore_Traits_Windows.h index 83cff9b54f..1a83aba267 100644 --- a/Code/Framework/AzCore/Platform/Windows/AzCore/AzCore_Traits_Windows.h +++ b/Code/Framework/AzCore/Platform/Windows/AzCore/AzCore_Traits_Windows.h @@ -53,10 +53,8 @@ // Compiler traits ... #define AZ_TRAIT_COMPILER_DEFINE_AZSWNPRINTF_AS_SWPRINTF 0 #define AZ_TRAIT_COMPILER_DEFINE_FS_ERRNO_TYPE 0 -#define AZ_TRAIT_COMPILER_DEFINE_FS_STAT_TYPE 0 #define AZ_TRAIT_COMPILER_DEFINE_GETCURRENTPROCESSID 0 #define AZ_TRAIT_COMPILER_DEFINE_REFGUID 0 -#define AZ_TRAIT_COMPILER_DEFINE_SASSERTDATA_TYPE 0 #define AZ_TRAIT_COMPILER_DEFINE_WCSICMP 0 #define AZ_TRAIT_COMPILER_INT64_T_IS_LONG 0 #define AZ_TRAIT_COMPILER_OPTIMIZE_MISSING_DEFAULT_SWITCH_CASE 1 diff --git a/Code/Framework/AzCore/Platform/iOS/AzCore/AzCore_Traits_iOS.h b/Code/Framework/AzCore/Platform/iOS/AzCore/AzCore_Traits_iOS.h index b0832c54f6..7a75af71fb 100644 --- a/Code/Framework/AzCore/Platform/iOS/AzCore/AzCore_Traits_iOS.h +++ b/Code/Framework/AzCore/Platform/iOS/AzCore/AzCore_Traits_iOS.h @@ -53,10 +53,8 @@ // Compiler traits ... #define AZ_TRAIT_COMPILER_DEFINE_AZSWNPRINTF_AS_SWPRINTF 1 #define AZ_TRAIT_COMPILER_DEFINE_FS_ERRNO_TYPE 1 -#define AZ_TRAIT_COMPILER_DEFINE_FS_STAT_TYPE 1 #define AZ_TRAIT_COMPILER_DEFINE_GETCURRENTPROCESSID 1 #define AZ_TRAIT_COMPILER_DEFINE_REFGUID 1 -#define AZ_TRAIT_COMPILER_DEFINE_SASSERTDATA_TYPE 1 #define AZ_TRAIT_COMPILER_DEFINE_WCSICMP 0 #define AZ_TRAIT_COMPILER_INT64_T_IS_LONG 0 #define AZ_TRAIT_COMPILER_OPTIMIZE_MISSING_DEFAULT_SWITCH_CASE 1 diff --git a/Code/Framework/AzFramework/AzFramework/Archive/Archive.cpp b/Code/Framework/AzFramework/AzFramework/Archive/Archive.cpp index a60a657d87..04802a8d0e 100644 --- a/Code/Framework/AzFramework/AzFramework/Archive/Archive.cpp +++ b/Code/Framework/AzFramework/AzFramework/Archive/Archive.cpp @@ -46,11 +46,6 @@ namespace AZ::IO "If set to 0, tells Archive to try to open the file on the file system first othewise check mounted paks.\n" "If set to 1, tells Archive to try to open the file in pak first, then go to file system.\n" "If set to 2, tells the Archive to only open files from the pak"); - AZ_CVAR(int, sys_PakMessageInvalidFileAccess, ArchiveVars{}.nMessageInvalidFileAccess, nullptr, AZ::ConsoleFunctorFlags::Null, - "Message Box synchronous file access when in game"); - - AZ_CVAR(int, sys_PakWarnOnPakAccessFailures, ArchiveVars{}.nWarnOnPakAccessFails, nullptr, AZ::ConsoleFunctorFlags::Null, - "If 1, access failure for Paks is treated as a warning, if zero it is only a log message."); AZ_CVAR(int, sys_report_files_not_found_in_paks, 0, nullptr, AZ::ConsoleFunctorFlags::Null, "Reports when files are searched for in paks and not found. 1 = log, 2 = warning, 3 = error"); AZ_CVAR(int32_t, az_archive_verbosity, 0, nullptr, AZ::ConsoleFunctorFlags::Null, diff --git a/Code/Framework/AzFramework/AzFramework/Archive/ArchiveVars.h b/Code/Framework/AzFramework/AzFramework/Archive/ArchiveVars.h index 253e3b0c5b..2c2ec33544 100644 --- a/Code/Framework/AzFramework/AzFramework/Archive/ArchiveVars.h +++ b/Code/Framework/AzFramework/AzFramework/Archive/ArchiveVars.h @@ -9,8 +9,6 @@ #pragma once -#include - namespace AZ::IO { enum class FileSearchPriority @@ -39,25 +37,10 @@ namespace AZ::IO #else inline static constexpr bool IsReleaseConfig{}; #endif - int nReadSlice{}; - int nSaveTotalResourceList{}; - int nSaveFastloadResourceList{}; - int nSaveMenuCommonResourceList{}; int nSaveLevelResourceList{}; - int nValidateFileHashes{ IsReleaseConfig ? 0 : 1 }; - int nUncachedStreamReads{ 1 }; - int nInMemoryPerPakSizeLimit{ 6 }; // Limits in MB - int nTotalInMemoryPakSizeLimit{ 30 }; - int nLoadCache{}; - int nLoadModePaks{}; - int nStreamCache{ STREAM_CACHE_DEFAULT }; FileSearchPriority m_fileSearchPriority{ GetDefaultFileSearchPriority()}; int nMessageInvalidFileAccess{}; int nLogInvalidFileAccess{ IsReleaseConfig ? 0 : 1 }; - int nDisableNonLevelRelatedPaks{ 1 }; - int nWarnOnPakAccessFails{ 1 }; // Whether to treat failed pak access as a warning or log message - int nSetLogLevel{ 3 }; - int nLogAllFileAccess{}; }; } diff --git a/Code/Framework/AzFramework/Platform/Android/AzFramework/Archive/ArchiveVars_Android.h b/Code/Framework/AzFramework/Platform/Android/AzFramework/Archive/ArchiveVars_Android.h deleted file mode 100644 index 5a80afe271..0000000000 --- a/Code/Framework/AzFramework/Platform/Android/AzFramework/Archive/ArchiveVars_Android.h +++ /dev/null @@ -1,11 +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 - -#define STREAM_CACHE_DEFAULT 0 diff --git a/Code/Framework/AzFramework/Platform/Android/AzFramework/Archive/ArchiveVars_Platform.h b/Code/Framework/AzFramework/Platform/Android/AzFramework/Archive/ArchiveVars_Platform.h deleted file mode 100644 index 42a2a43006..0000000000 --- a/Code/Framework/AzFramework/Platform/Android/AzFramework/Archive/ArchiveVars_Platform.h +++ /dev/null @@ -1,10 +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 diff --git a/Code/Framework/AzFramework/Platform/Android/platform_android_files.cmake b/Code/Framework/AzFramework/Platform/Android/platform_android_files.cmake index c220bc1154..9eddc4964a 100644 --- a/Code/Framework/AzFramework/Platform/Android/platform_android_files.cmake +++ b/Code/Framework/AzFramework/Platform/Android/platform_android_files.cmake @@ -27,8 +27,6 @@ set(FILES AzFramework/Input/User/LocalUserId_Platform.h ../Common/Default/AzFramework/Input/User/LocalUserId_Default.h AzFramework/Input/Devices/VirtualKeyboard/InputDeviceVirtualKeyboard_Android.cpp - AzFramework/Archive/ArchiveVars_Platform.h - AzFramework/Archive/ArchiveVars_Android.h AzFramework/Process/ProcessCommon.h AzFramework/Process/ProcessWatcher_Android.cpp AzFramework/Process/ProcessCommunicator_Android.cpp diff --git a/Code/Framework/AzFramework/Platform/Linux/AzFramework/Archive/ArchiveVars_Linux.h b/Code/Framework/AzFramework/Platform/Linux/AzFramework/Archive/ArchiveVars_Linux.h deleted file mode 100644 index 5a80afe271..0000000000 --- a/Code/Framework/AzFramework/Platform/Linux/AzFramework/Archive/ArchiveVars_Linux.h +++ /dev/null @@ -1,11 +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 - -#define STREAM_CACHE_DEFAULT 0 diff --git a/Code/Framework/AzFramework/Platform/Linux/AzFramework/Archive/ArchiveVars_Platform.h b/Code/Framework/AzFramework/Platform/Linux/AzFramework/Archive/ArchiveVars_Platform.h deleted file mode 100644 index 1a0b774b97..0000000000 --- a/Code/Framework/AzFramework/Platform/Linux/AzFramework/Archive/ArchiveVars_Platform.h +++ /dev/null @@ -1,10 +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 diff --git a/Code/Framework/AzFramework/Platform/Linux/platform_linux_files.cmake b/Code/Framework/AzFramework/Platform/Linux/platform_linux_files.cmake index 206563fdda..da1ce54a15 100644 --- a/Code/Framework/AzFramework/Platform/Linux/platform_linux_files.cmake +++ b/Code/Framework/AzFramework/Platform/Linux/platform_linux_files.cmake @@ -28,6 +28,4 @@ set(FILES AzFramework/Input/User/LocalUserId_Platform.h ../Common/Default/AzFramework/Input/User/LocalUserId_Default.h ../Common/Unimplemented/AzFramework/Input/Devices/VirtualKeyboard/InputDeviceVirtualKeyboard_Unimplemented.cpp - AzFramework/Archive/ArchiveVars_Platform.h - AzFramework/Archive/ArchiveVars_Linux.h ) diff --git a/Code/Framework/AzFramework/Platform/Mac/AzFramework/Archive/ArchiveVars_Mac.h b/Code/Framework/AzFramework/Platform/Mac/AzFramework/Archive/ArchiveVars_Mac.h deleted file mode 100644 index 5a80afe271..0000000000 --- a/Code/Framework/AzFramework/Platform/Mac/AzFramework/Archive/ArchiveVars_Mac.h +++ /dev/null @@ -1,11 +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 - -#define STREAM_CACHE_DEFAULT 0 diff --git a/Code/Framework/AzFramework/Platform/Mac/AzFramework/Archive/ArchiveVars_Platform.h b/Code/Framework/AzFramework/Platform/Mac/AzFramework/Archive/ArchiveVars_Platform.h deleted file mode 100644 index 5311c78de6..0000000000 --- a/Code/Framework/AzFramework/Platform/Mac/AzFramework/Archive/ArchiveVars_Platform.h +++ /dev/null @@ -1,10 +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 diff --git a/Code/Framework/AzFramework/Platform/Mac/platform_mac_files.cmake b/Code/Framework/AzFramework/Platform/Mac/platform_mac_files.cmake index 78f11a65da..319f8f7a46 100644 --- a/Code/Framework/AzFramework/Platform/Mac/platform_mac_files.cmake +++ b/Code/Framework/AzFramework/Platform/Mac/platform_mac_files.cmake @@ -30,8 +30,6 @@ set(FILES AzFramework/Input/User/LocalUserId_Platform.h ../Common/Default/AzFramework/Input/User/LocalUserId_Default.h ../Common/Unimplemented/AzFramework/Input/Devices/VirtualKeyboard/InputDeviceVirtualKeyboard_Unimplemented.cpp - AzFramework/Archive/ArchiveVars_Platform.h - AzFramework/Archive/ArchiveVars_Mac.h ../Common/Apple/AzFramework/Utils/SystemUtilsApple.h ../Common/Apple/AzFramework/Utils/SystemUtilsApple.mm ) diff --git a/Code/Framework/AzFramework/Platform/Windows/AzFramework/Archive/ArchiveVars_Platform.h b/Code/Framework/AzFramework/Platform/Windows/AzFramework/Archive/ArchiveVars_Platform.h deleted file mode 100644 index 771c25c998..0000000000 --- a/Code/Framework/AzFramework/Platform/Windows/AzFramework/Archive/ArchiveVars_Platform.h +++ /dev/null @@ -1,10 +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 diff --git a/Code/Framework/AzFramework/Platform/Windows/AzFramework/Archive/ArchiveVars_Windows.h b/Code/Framework/AzFramework/Platform/Windows/AzFramework/Archive/ArchiveVars_Windows.h deleted file mode 100644 index 5a80afe271..0000000000 --- a/Code/Framework/AzFramework/Platform/Windows/AzFramework/Archive/ArchiveVars_Windows.h +++ /dev/null @@ -1,11 +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 - -#define STREAM_CACHE_DEFAULT 0 diff --git a/Code/Framework/AzFramework/Platform/Windows/platform_windows_files.cmake b/Code/Framework/AzFramework/Platform/Windows/platform_windows_files.cmake index b8f5b5f841..021ecd3298 100644 --- a/Code/Framework/AzFramework/Platform/Windows/platform_windows_files.cmake +++ b/Code/Framework/AzFramework/Platform/Windows/platform_windows_files.cmake @@ -32,6 +32,4 @@ set(FILES AzFramework/Input/User/LocalUserId_Platform.h ../Common/Default/AzFramework/Input/User/LocalUserId_Default.h ../Common/Unimplemented/AzFramework/Input/Devices/VirtualKeyboard/InputDeviceVirtualKeyboard_Unimplemented.cpp - AzFramework/Archive/ArchiveVars_Platform.h - AzFramework/Archive/ArchiveVars_Windows.h ) diff --git a/Code/Framework/AzFramework/Platform/iOS/AzFramework/Archive/ArchiveVars_Platform.h b/Code/Framework/AzFramework/Platform/iOS/AzFramework/Archive/ArchiveVars_Platform.h deleted file mode 100644 index 6ebbe5aade..0000000000 --- a/Code/Framework/AzFramework/Platform/iOS/AzFramework/Archive/ArchiveVars_Platform.h +++ /dev/null @@ -1,10 +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 diff --git a/Code/Framework/AzFramework/Platform/iOS/AzFramework/Archive/ArchiveVars_iOS.h b/Code/Framework/AzFramework/Platform/iOS/AzFramework/Archive/ArchiveVars_iOS.h deleted file mode 100644 index 5a80afe271..0000000000 --- a/Code/Framework/AzFramework/Platform/iOS/AzFramework/Archive/ArchiveVars_iOS.h +++ /dev/null @@ -1,11 +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 - -#define STREAM_CACHE_DEFAULT 0 diff --git a/Code/Framework/AzFramework/Platform/iOS/platform_ios_files.cmake b/Code/Framework/AzFramework/Platform/iOS/platform_ios_files.cmake index 7745f43ec9..e784e4f6df 100644 --- a/Code/Framework/AzFramework/Platform/iOS/platform_ios_files.cmake +++ b/Code/Framework/AzFramework/Platform/iOS/platform_ios_files.cmake @@ -27,8 +27,6 @@ set(FILES AzFramework/Input/User/LocalUserId_Platform.h ../Common/Default/AzFramework/Input/User/LocalUserId_Default.h ../Common/Apple/AzFramework/Input/Devices/VirtualKeyboard/InputDeviceVirtualKeyboard_Apple.mm - AzFramework/Archive/ArchiveVars_Platform.h - AzFramework/Archive/ArchiveVars_iOS.h AzFramework/Process/ProcessCommon.h AzFramework/Process/ProcessWatcher_iOS.cpp AzFramework/Process/ProcessCommunicator_iOS.cpp diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/API/EditorVegetationRequestsBus.h b/Code/Framework/AzToolsFramework/AzToolsFramework/API/EditorVegetationRequestsBus.h index d8d4c37f01..7bfc891476 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/API/EditorVegetationRequestsBus.h +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/API/EditorVegetationRequestsBus.h @@ -10,6 +10,7 @@ #include #include +#include class CVegetationMap; struct CVegetationInstance; diff --git a/Code/Legacy/CryCommon/AppleSpecific.h b/Code/Legacy/CryCommon/AppleSpecific.h index e4c4fadb89..2645ec2270 100644 --- a/Code/Legacy/CryCommon/AppleSpecific.h +++ b/Code/Legacy/CryCommon/AppleSpecific.h @@ -141,11 +141,6 @@ typedef uint8 byte; #endif -#ifndef SAFE_RELEASE_FORCE -#define SAFE_RELEASE_FORCE(p) { if (p) { (p)->ReleaseForce(); (p) = NULL; } \ -} -#endif - #define MAKEWORD(a, b) ((WORD)(((BYTE)((DWORD_PTR)(a) & 0xff)) | ((WORD)((BYTE)((DWORD_PTR)(b) & 0xff))) << 8)) #define MAKELONG(a, b) ((LONG)(((WORD)((DWORD_PTR)(a) & 0xffff)) | ((DWORD)((WORD)((DWORD_PTR)(b) & 0xffff))) << 16)) #define LOWORD(l) ((WORD)((DWORD_PTR)(l) & 0xffff)) @@ -472,22 +467,6 @@ inline int64 CryGetTicks() return counter.QuadPart; } -inline int64 CryGetTicksPerSec() -{ - LARGE_INTEGER li; - QueryPerformanceFrequency(&li); - return li.QuadPart; -} -/* - inline uint32 GetTickCount() - { - LARGE_INTEGER count, freq; - QueryPerformanceCounter(&count); - QueryPerformanceFrequency(&freq); - return uint32(count.QuadPart * 1000 / freq.QuadPart); - } - */ - #ifdef _RELEASE #define __debugbreak() #else diff --git a/Code/Legacy/CryCommon/Cry_Matrix34.h b/Code/Legacy/CryCommon/Cry_Matrix34.h index eb9c22086b..747d0c7db9 100644 --- a/Code/Legacy/CryCommon/Cry_Matrix34.h +++ b/Code/Legacy/CryCommon/Cry_Matrix34.h @@ -799,11 +799,6 @@ struct Matrix34_tpl /////////////////////////////////////////////////////////////////////////////// typedef Matrix34_tpl Matrix34; //always 32 bit -#if AZ_COMPILER_MSVC - typedef __declspec(align(16)) Matrix34_tpl Matrix34A; -#elif AZ_COMPILER_CLANG - typedef Matrix34_tpl __attribute__((aligned(16))) Matrix34A; -#endif //---------------------------------------------------------------------------------- //---------------------------------------------------------------------------------- diff --git a/Code/Legacy/CryCommon/Cry_Matrix44.h b/Code/Legacy/CryCommon/Cry_Matrix44.h index 4da8475260..de721b4e1f 100644 --- a/Code/Legacy/CryCommon/Cry_Matrix44.h +++ b/Code/Legacy/CryCommon/Cry_Matrix44.h @@ -276,30 +276,6 @@ struct Matrix44_tpl m32 = m.m32; m33 = m.m33; } - //CONSTRUCTOR for identical types which converts between double/float - //Matrix44 m=m44r; - //Matrix44r m=m44; - template - ILINE Matrix44_tpl(const Matrix44_tpl&m) - { - assert(m.IsValid()); - m00 = F(m.m00); - m01 = F(m.m01); - m02 = F(m.m02); - m03 = F(m.m03); - m10 = F(m.m10); - m11 = F(m.m11); - m12 = F(m.m12); - m13 = F(m.m13); - m20 = F(m.m20); - m21 = F(m.m21); - m22 = F(m.m22); - m23 = F(m.m23); - m30 = F(m.m30); - m31 = F(m.m31); - m32 = F(m.m32); - m33 = F(m.m33); - } //--------------------------------------------------------------------- @@ -662,13 +638,6 @@ struct Matrix44_tpl /////////////////////////////////////////////////////////////////////////////// typedef Matrix44_tpl Matrix44; //always 32 bit -typedef Matrix44_tpl Matrix44d; //always 64 bit -typedef Matrix44_tpl Matrix44r; //variable float precision. depending on the target system it can be between 32, 64 or 80 bit -#if AZ_COMPILER_MSVC - typedef __declspec(align(16)) Matrix44_tpl Matrix44A; -#elif AZ_COMPILER_CLANG - typedef Matrix44_tpl __attribute__((aligned(16))) Matrix44A; -#endif //---------------------------------------------------------------------------------- //---------------------------------------------------------------------------------- diff --git a/Code/Legacy/CryCommon/IEntityRenderState.h b/Code/Legacy/CryCommon/IEntityRenderState.h deleted file mode 100644 index 42e485cd1e..0000000000 --- a/Code/Legacy/CryCommon/IEntityRenderState.h +++ /dev/null @@ -1,26 +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 - -struct IStatObj; - -struct IRenderNode -{ - // Gives access to object components. - IStatObj* GetEntityStatObj(unsigned int = 0, unsigned int = 0, Matrix34* = nullptr, bool = false) { - return nullptr; - } - - int GetSlotCount() const { return 1; } - - // Max view distance settings. - static constexpr int VIEW_DISTANCE_MULTIPLIER_MAX = 100; - -}; diff --git a/Code/Legacy/CryCommon/IFunctorBase.h b/Code/Legacy/CryCommon/IFunctorBase.h deleted file mode 100644 index 6fb3a5d981..0000000000 --- a/Code/Legacy/CryCommon/IFunctorBase.h +++ /dev/null @@ -1,54 +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 - * - */ - - -// Description : Base header for multi DLL functors. - - -#ifndef CRYINCLUDE_CRYCOMMON_IFUNCTORBASE_H -#define CRYINCLUDE_CRYCOMMON_IFUNCTORBASE_H -#pragma once - -#include - -// Base class for functor storage. -// Not intended for direct usage. -class IFunctorBase -{ -public: - IFunctorBase() - : m_nReferences(0){} - virtual ~IFunctorBase(){}; - virtual void Call() = 0; - - void AddRef() - { - m_nReferences.fetch_add(1, AZStd::memory_order_acq_rel); - } - - void Release() - { - if (m_nReferences.fetch_sub(1, AZStd::memory_order_acq_rel) == 1) - { - delete this; - } - } - -protected: - AZStd::atomic_int m_nReferences; -}; - -// Base Template for specialization. -// Not intended for direct usage. -template -class TFunctor - : public IFunctorBase -{ -}; - -#endif // CRYINCLUDE_CRYCOMMON_IFUNCTORBASE_H diff --git a/Code/Legacy/CryCommon/IIndexedMesh.h b/Code/Legacy/CryCommon/IIndexedMesh.h index 8d3ee64c71..eaa47473f0 100644 --- a/Code/Legacy/CryCommon/IIndexedMesh.h +++ b/Code/Legacy/CryCommon/IIndexedMesh.h @@ -10,7 +10,6 @@ #pragma once #include "Cry_Color.h" -#include #include // Description: @@ -53,119 +52,3 @@ public: a = othera; } }; - - -// Description: -// Defines a single triangle face in the CMesh topology. -struct SMeshFace -{ - int v[3]; // indices to vertex, normals and optionally tangent basis arrays - unsigned char nSubset; // index to mesh subsets array. -}; - -// Description: -// 3D Normal Vector used by CMesh. -struct SMeshNormal -{ - SMeshNormal() {} - -private: - Vec3 Normal; - -public: - explicit SMeshNormal(const Vec3& othern) - { - Normal = othern; - } - - Vec3 GetN() const { return Normal; } - -}; - -// Subset of mesh is a continuous range of vertices and indices that share same material. -struct SMeshSubset -{ - Vec3 vCenter; - float fRadius; - float fTexelDensity; - - int nFirstIndexId; - int nNumIndices; - - int nFirstVertId; - int nNumVerts; - - int nMatID; // Material Sub-object id. - int nMatFlags; // Special Material flags. - int nPhysicalizeType; // Type of physicalization for this subset. - - AZ::Vertex::Format vertexFormat; - - SMeshSubset() - : vCenter(0, 0, 0) - , fRadius(0) - , fTexelDensity(0) - , nFirstIndexId(0) - , nNumIndices(0) - , nFirstVertId(0) - , nNumVerts(0) - , nMatID(0) - , nMatFlags(0) - , nPhysicalizeType(0x1000) - , vertexFormat(eVF_P3S_C4B_T2S) - { - } - -}; - -// Description: -// Editable mesh interface. -// IndexedMesh can be created directly or loaded from CGF file, before rendering it is converted into IRenderMesh. -// IStatObj is used to host IIndexedMesh, and corresponding IRenderMesh. -struct IIndexedMesh -{ - /*! Structure used for read-only access to mesh data. Used by GetMesh() function */ - struct SMeshDescription - { - const SMeshFace* m_pFaces; // pointer to array of faces - const Vec3* m_pVerts; // pointer to array of vertices in f32 format - const Vec3f16* m_pVertsF16; // pointer to array of vertices in f16 format - const SMeshNormal* m_pNorms; // pointer to array of normals - const SMeshColor* m_pColor; // pointer to array of vertex colors - const SMeshTexCoord* m_pTexCoord; // pointer to array of texture coordinates - const vtx_idx* m_pIndices; // pointer to array of indices - int m_nFaceCount; // number of elements m_pFaces array - int m_nVertCount; // number of elements in m_pVerts, m_pNorms and m_pColor arrays - int m_nCoorCount; // number of elements in m_pTexCoord array - int m_nIndexCount; // number of elements in m_pIndices array - }; - - virtual ~IIndexedMesh() {} - - // Release indexed mesh. - virtual void Release() = 0; - - //! Gives read-only access to mesh data - virtual void GetMeshDescription(SMeshDescription& meshDesc) const = 0; - - //! Return number of allocated faces - virtual int GetFaceCount() const = 0; - - //! Return number of allocated vertices, normals and colors - virtual int GetVertexCount() const = 0; - - /*! Reallocates vertices, normals and colors. Calling this function invalidates SMeshDescription pointers */ - virtual void SetVertexCount(int nNewCount) = 0; - - //! Return number of allocated texture coordinates - virtual int GetTexCoordCount() const = 0; - - // Get number of indices in the mesh. - virtual int GetIndexCount() const = 0; - - ////////////////////////////////////////////////////////////////////////// - // Subset access. - ////////////////////////////////////////////////////////////////////////// - virtual int GetSubSetCount() const = 0; - virtual const SMeshSubset& GetSubSet(int nIndex) const = 0; -}; diff --git a/Code/Legacy/CryCommon/IStatObj.h b/Code/Legacy/CryCommon/IStatObj.h deleted file mode 100644 index a809064bcc..0000000000 --- a/Code/Legacy/CryCommon/IStatObj.h +++ /dev/null @@ -1,110 +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 "Cry_Math.h" -#include "Cry_Geo.h" -#include "IMaterial.h" - -// General forward declaration. -struct SRenderingPassInfo; - -////////////////////////////////////////////////////////////////////////// -// Type of static sub object. -////////////////////////////////////////////////////////////////////////// -enum EStaticSubObjectType -{ - STATIC_SUB_OBJECT_MESH, // This simple geometry part of the multi-sub object geometry. - STATIC_SUB_OBJECT_HELPER_MESH, // Special helper mesh, not rendered usually, used for broken pieces. -}; - -// used for on-CPU voxelization -struct SRayHitInfo -{ - SRayHitInfo() - { - memset(this, 0, sizeof(*this)); - } - ////////////////////////////////////////////////////////////////////////// - // Input parameters. - Vec3 inReferencePoint; - Ray inRay; - - ////////////////////////////////////////////////////////////////////////// - // Output parameters. - Vec3 vHitPos; - Vec3 vHitNormal; - - // More inputs - bool bInFirstHit; - bool bUseCache; -}; - -// Summary: -// Interface to hold static object data -struct IStatObj -{ - ////////////////////////////////////////////////////////////////////////// - // SubObject - ////////////////////////////////////////////////////////////////////////// - struct SSubObject - { - EStaticSubObjectType nType; - Matrix34 localTM; // Local transformation matrix, relative to parent. - IStatObj* pStatObj; // Static object for sub part of CGF. - }; - ////////////////////////////////////////////////////////////////////////// - - virtual ~IStatObj() {} - // Description: - // Provide access to the faces, vertices, texture coordinates, normals and - // colors of the object used later for CRenderMesh construction. - // Return Value: - // - // Summary: - // Get the object source geometry - virtual struct IIndexedMesh* GetIndexedMesh(bool bCreateIfNone = false) = 0; - - // Summary: - // Get the bounding box - // Arguments: - // Mins - Position of the bottom left close corner of the bounding box - // Maxs - Position of the top right far corner of the bounding box - virtual AABB GetAABB() = 0; - - // Description: - // Returns the LOD object, if present. - // Arguments: - // nLodLevel - Level of the LOD - // bReturnNearest - if true will return nearest available LOD to nLodLevel. - // Return Value: - // A static object with the desired LOD. The value NULL will be return if there isn't any LOD object for the level requested. - // Summary: - // Get the LOD object - virtual IStatObj* GetLodObject(int nLodLevel, bool bReturnNearest = false) = 0; - - // Summary: - // Returns a pointer to the object - // Return Value: - // A pointer to the current object, which is simply done like this "return this;" - virtual struct IStatObj* GetIStatObj() { return this; } - - ////////////////////////////////////////////////////////////////////////// - // Interface to the Sub Objects. - ////////////////////////////////////////////////////////////////////////// - // Summary: - // Retrieve number of sub-objects. - virtual int GetSubObjectCount() const = 0; - // Summary: - // Retrieve sub object by index, where 0 <= nIndex < GetSubObjectCount() - virtual SSubObject* GetSubObject(int nIndex) = 0; - - // Intersect ray with static object. - // Ray must be in object local space. - virtual bool RayIntersection(SRayHitInfo& hitInfo, IMaterial* pCustomMtl = nullptr) = 0; -}; diff --git a/Code/Legacy/CryCommon/ISystem.h b/Code/Legacy/CryCommon/ISystem.h index d97c800763..6fdc8b52fe 100644 --- a/Code/Legacy/CryCommon/ISystem.h +++ b/Code/Legacy/CryCommon/ISystem.h @@ -427,7 +427,7 @@ struct ISystemUserCallback // Description: // Show message by provider. - virtual int ShowMessage(const char* text, const char* caption, unsigned int uType) { return CryMessageBox(text, caption, uType); } + virtual void ShowMessage(const char* text, const char* caption, unsigned int uType) { CryMessageBox(text, caption, uType); } // @@ -811,14 +811,13 @@ struct ISystem // Description: // Report message by provider or by using CryMessageBox. // Doesn't terminate the execution. - virtual int ShowMessage(const char* text, const char* caption, unsigned int uType) = 0; + virtual void ShowMessage(const char* text, const char* caption, unsigned int uType) = 0; // Summary: // Compare specified verbosity level to the one currently set. virtual bool CheckLogVerbosity(int verbosity) = 0; // return the related subsystem interface - virtual ILevelSystem* GetILevelSystem() = 0; virtual ICmdLine* GetICmdLine() = 0; virtual ILog* GetILog() = 0; @@ -829,13 +828,6 @@ struct ISystem virtual IRemoteConsole* GetIRemoteConsole() = 0; virtual ISystemEventDispatcher* GetISystemEventDispatcher() = 0; - // Arguments: - // bValue - Set to true when running on a cheat protected server or a client that is connected to it (not used in singleplayer). - virtual void SetForceNonDevMode(bool bValue) = 0; - // Return Value: - // True when running on a cheat protected server or a client that is connected to it (not used in singleplayer). - virtual bool GetForceNonDevMode() const = 0; - virtual bool WasInDevMode() const = 0; virtual bool IsDevMode() const = 0; ////////////////////////////////////////////////////////////////////////// @@ -860,18 +852,6 @@ struct ISystem // When ignore update sets to true, system will ignore and updates and render calls. virtual void IgnoreUpdates(bool bIgnore) = 0; - // Summary: - // Sets the active process - // Arguments: - // process - A pointer to a class that implement the IProcess interface. - virtual void SetIProcess(IProcess* process) = 0; - - // Summary: - // Gets the active process. - // Return Value: - // A pointer to the current active process. - virtual IProcess* GetIProcess() = 0; - // Return Value: // True if system running in Test mode. virtual bool IsTestMode() const = 0; @@ -911,8 +891,6 @@ struct ISystem // pCallback - 0 means normal LoadConfigVar behaviour is used virtual void LoadConfiguration(const char* sFilename, ILoadConfigurationEntrySink* pSink = 0, bool warnIfMissing = true) = 0; - virtual ESystemConfigSpec GetMaxConfigSpec() const = 0; - ////////////////////////////////////////////////////////////////////////// // Summary: @@ -937,10 +915,6 @@ struct ISystem // Retrieves the perlin noise singleton instance. virtual CPNoise3* GetNoiseGen() = 0; - // Summary: - // Retrieves system update counter. - virtual uint64 GetUpdateCounter() = 0; - ////////////////////////////////////////////////////////////////////////// // Error callback handling @@ -973,13 +947,6 @@ struct ISystem virtual void SetAssertVisible(bool bAssertVisble) = 0; ////////////////////////////////////////////////////////////////////////// - // Summary: - // Enable/Disable drawing the console - virtual void SetConsoleDrawEnabled(bool enabled) = 0; - - // Enable/Disable drawing the UI - virtual void SetUIDrawEnabled(bool enabled) = 0; - // Summary: // Get the index of the currently running O3DE application. (0 = first instance, 1 = second instance, etc) virtual int GetApplicationInstance() = 0; @@ -1027,12 +994,6 @@ struct ISystem virtual bool IsSavingResourceList() const = 0; #endif - // Summary: - // Gets the root window message handler function - // The returned pointer is platform-specific: - // For Windows OS, the pointer is of type WNDPROC - virtual void* GetRootWindowMessageHandler() = 0; - // Summary: // Register a IWindowMessageHandler that will be informed about window messages // The delivered messages are platform-specific @@ -1042,10 +1003,6 @@ struct ISystem // Unregister an IWindowMessageHandler that was previously registered using RegisterWindowMessageHandler virtual void UnregisterWindowMessageHandler(IWindowMessageHandler* pHandler) = 0; - // Create an instance of a Local File IO object (which reads directly off the local filesystem, instead of, - // for example, reading from the network or a pack or USB or such. - virtual std::shared_ptr CreateLocalFileIO() = 0; - //////////////////////////////////////////////////////////////////////////////////////////////// // EBus interface used to listen for cry system notifications class CrySystemNotifications : public AZ::EBusTraits diff --git a/Code/Legacy/CryCommon/IXml.h b/Code/Legacy/CryCommon/IXml.h index be2bdcd5ab..6c30789efd 100644 --- a/Code/Legacy/CryCommon/IXml.h +++ b/Code/Legacy/CryCommon/IXml.h @@ -87,7 +87,7 @@ class XmlString public: XmlString() {}; XmlString(const char* str) - : AZStd::string(str) {}; + : AZStd::string(str) {} size_t GetAllocatedMemory() const { @@ -243,15 +243,6 @@ public: // Removes child node. virtual void removeChild(const XmlNodeRef& node) = 0; - // Summary: - // Inserts child node. - virtual void insertChild(int nIndex, const XmlNodeRef& node) = 0; - - // Summary: - // Replaces a specified child with the passed one - // Not supported by all node implementations - virtual void replaceChild(int nIndex, const XmlNodeRef& fromNode) = 0; - // Summary: // Removes all child nodes. virtual void removeAllChilds() = 0; @@ -283,13 +274,6 @@ public: // Sets content of this node. virtual void setContent(const char* str) = 0; - // Summary: - // Deep clone of this and all child xml nodes. - virtual XmlNodeRef clone() = 0; - - // Summary: - // Returns line number for XML tag. - virtual int getLine() const = 0; // Summary: // Set line number in xml. virtual void setLine(int line) = 0; @@ -385,20 +369,6 @@ public: } #endif - // Summary: - // Copies children to this node from a given node. - // Children are reference copied (shallow copy) and the children's parent is NOT set to this - // node, but left with its original parent (which is still the parent) - virtual void shareChildren(const XmlNodeRef& fromNode) = 0; - - // Summary: - // Removes child node at known position. - virtual void deleteChildAt(int nIndex) = 0; - - // Summary: - // Returns XML of this node and sub nodes into tmpBuffer without XML checks (much faster) - virtual XmlString getXMLUnsafe(int level, [[maybe_unused]] char* tmpBuffer, [[maybe_unused]] uint32 sizeOfTmpBuffer) const { return getXML(level); } - // Notes: // Save in small memory chunks. virtual bool saveToFile(const char* fileName, size_t chunkSizeBytes, AZ::IO::HandleType fileHandle = AZ::IO::InvalidHandle) = 0; @@ -413,28 +383,22 @@ public: bool getAttr(const char* key, long& value) const { int v; - if (getAttr(key, v)) - { - value = static_cast(v); - return true; - } - else + if (!getAttr(key, v)) { return false; } + value = static_cast(v); + return true; } bool getAttr(const char* key, unsigned long& value) const { int v; - if (getAttr(key, v)) - { - value = static_cast(v); - return true; - } - else + if (!getAttr(key, v)) { return false; } + value = static_cast(v); + return true; } void setAttr(const char* key, unsigned long value) { setAttr(key, (unsigned int)value); }; void setAttr(const char* key, long value) { setAttr(key, (int)value); }; @@ -442,54 +406,42 @@ public: bool getAttr(const char* key, unsigned short& value) const { int v; - if (getAttr(key, v)) - { - value = static_cast(v); - return true; - } - else + if (!getAttr(key, v)) { return false; } + value = static_cast(v); + return true; } bool getAttr(const char* key, unsigned char& value) const { int v; - if (getAttr(key, v)) - { - value = static_cast(v); - return true; - } - else + if (!getAttr(key, v)) { return false; } + value = static_cast(v); + return true; } bool getAttr(const char* key, short& value) const { int v; - if (getAttr(key, v)) - { - value = static_cast(v); - return true; - } - else + if (!getAttr(key, v)) { return false; } + value = static_cast(v); + return true; } bool getAttr(const char* key, char& value) const { int v; - if (getAttr(key, v)) - { - value = static_cast(v); - return true; - } - else + if (!getAttr(key, v)) { return false; } + value = static_cast(v); + return true; } //##@} diff --git a/Code/Legacy/CryCommon/LinuxSpecific.h b/Code/Legacy/CryCommon/LinuxSpecific.h index b3e75476c9..0062119a30 100644 --- a/Code/Legacy/CryCommon/LinuxSpecific.h +++ b/Code/Legacy/CryCommon/LinuxSpecific.h @@ -102,11 +102,6 @@ typedef float FLOAT; #endif -#ifndef SAFE_RELEASE_FORCE -#define SAFE_RELEASE_FORCE(p) { if (p) { (p)->ReleaseForce(); (p) = NULL; } \ -} -#endif - #define MAKEWORD(a, b) ((WORD)(((BYTE)((DWORD_PTR)(a) & 0xff)) | ((WORD)((BYTE)((DWORD_PTR)(b) & 0xff))) << 8)) #define MAKELONG(a, b) ((LONG)(((WORD)((DWORD_PTR)(a) & 0xffff)) | ((DWORD)((WORD)((DWORD_PTR)(b) & 0xffff))) << 16)) #define LOWORD(l) ((WORD)((DWORD_PTR)(l) & 0xffff)) @@ -462,13 +457,6 @@ inline int64 CryGetTicks() return counter.QuadPart; } -inline int64 CryGetTicksPerSec() -{ - LARGE_INTEGER li; - QueryPerformanceFrequency(&li); - return li.QuadPart; -} - #endif //__cplusplus inline int _CrtCheckMemory() { return 1; }; diff --git a/Code/Legacy/CryCommon/Linux_Win32Wrapper.h b/Code/Legacy/CryCommon/Linux_Win32Wrapper.h index 26938cade3..0e3ce80bfe 100644 --- a/Code/Legacy/CryCommon/Linux_Win32Wrapper.h +++ b/Code/Legacy/CryCommon/Linux_Win32Wrapper.h @@ -5,10 +5,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ - - -#ifndef CRYINCLUDE_CRYCOMMON_LINUX_WIN32WRAPPER_H -#define CRYINCLUDE_CRYCOMMON_LINUX_WIN32WRAPPER_H #pragma once #include @@ -326,57 +322,6 @@ inline uint32 GetTickCount() #define _strlwr_s(BUF, SIZE) strlwr(BUF) #define _strups strupr -typedef struct __finddata64_t -{ - //!< atributes set by find request - unsigned int attrib; //!< attributes, only directory and readonly flag actually set - int64 time_create; //!< creation time, cannot parse under linux, last modification time is used instead (game does nowhere makes decision based on this values) - int64 time_access; //!< last access time - int64 time_write; //!< last modification time - int64 size; //!< file size (for a directory it will be the block size) - char name[256]; //!< file/directory name - -private: - int m_LastIndex; //!< last index for findnext - char m_DirectoryName[260]; //!< directory name, needed when getting file attributes on the fly - char m_ToMatch[260]; //!< pattern to match with - DIR* m_Dir; //!< directory handle - std::vector m_Entries; //!< all file entries in the current directories -public: - - inline __finddata64_t() - : attrib(0) - , time_create(0) - , time_access(0) - , time_write(0) - , size(0) - , m_LastIndex(-1) - , m_Dir(NULL) - { - memset(name, '0', 256); - } - ~__finddata64_t(); - - //!< copies and retrieves the data for an actual match (to not waste any effort retrioeving data for unused files) - void CopyFoundData(const char* rMatchedFileName); - -public: - //!< global _findfirst64 function using struct above, can't be a member function due to required semantic match - friend intptr_t _findfirst64(const char* pFileName, __finddata64_t* pFindData); - //!< global _findnext64 function using struct above, can't be a member function due to required semantic match - friend int _findnext64(intptr_t last, __finddata64_t* pFindData); -}__finddata64_t; - -typedef struct _finddata_t - : public __finddata64_t -{}_finddata_t;//!< need inheritance since in many places it get used as struct _finddata_t -extern int _findnext64(intptr_t last, __finddata64_t* pFindData); -extern intptr_t _findfirst64(const char* pFileName, __finddata64_t* pFindData); - -extern DWORD GetFileAttributesW(LPCWSTR lpFileName); - -extern const bool GetFilenameNoCase(const char* file, char*); - extern BOOL GetUserName(LPSTR lpBuffer, LPDWORD nSize); //error code stuff @@ -646,8 +591,3 @@ inline unsigned long long _byteswap_uint64(unsigned long long input) ((input & 0x000000000000ff00ull) << 40) | ((input & 0x00000000000000ffull) << 56)); } - -#endif // CRYINCLUDE_CRYCOMMON_LINUX_WIN32WRAPPER_H - -// vim:ts=2 - diff --git a/Code/Legacy/CryCommon/Mocks/ISystemMock.h b/Code/Legacy/CryCommon/Mocks/ISystemMock.h index 4b6669614b..e1c0e0d206 100644 --- a/Code/Legacy/CryCommon/Mocks/ISystemMock.h +++ b/Code/Legacy/CryCommon/Mocks/ISystemMock.h @@ -52,7 +52,7 @@ public: void Warning([[maybe_unused]] EValidatorModule module, [[maybe_unused]] EValidatorSeverity severity, [[maybe_unused]] int flags, [[maybe_unused]] const char* file, [[maybe_unused]] const char* format, ...) override {} MOCK_METHOD3(ShowMessage, - int(const char* text, const char* caption, unsigned int uType)); + void(const char* text, const char* caption, unsigned int uType)); MOCK_METHOD1(CheckLogVerbosity, bool(int verbosity)); MOCK_METHOD0(GetILevelSystem, @@ -75,12 +75,6 @@ public: IRemoteConsole * ()); MOCK_METHOD0(GetISystemEventDispatcher, ISystemEventDispatcher * ()); - MOCK_METHOD1(SetForceNonDevMode, - void(bool bValue)); - MOCK_CONST_METHOD0(GetForceNonDevMode, - bool()); - MOCK_CONST_METHOD0(WasInDevMode, - bool()); MOCK_CONST_METHOD0(IsDevMode, bool()); MOCK_METHOD3(CreateXmlNode, @@ -93,10 +87,6 @@ public: IXmlUtils * ()); MOCK_METHOD1(IgnoreUpdates, void(bool bIgnore)); - MOCK_METHOD1(SetIProcess, - void(IProcess * process)); - MOCK_METHOD0(GetIProcess, - IProcess * ()); MOCK_CONST_METHOD0(IsTestMode, bool()); MOCK_METHOD3(SetFrameProfiler, @@ -115,8 +105,6 @@ public: MOCK_METHOD3(LoadConfiguration, void(const char*, ILoadConfigurationEntrySink*, bool)); - MOCK_CONST_METHOD0(GetMaxConfigSpec, - ESystemConfigSpec()); MOCK_CONST_METHOD0(GetConfigPlatform, ESystemConfigPlatform()); MOCK_METHOD1(SetConfigPlatform, @@ -127,8 +115,6 @@ public: ILocalizationManager * ()); MOCK_METHOD0(GetNoiseGen, CPNoise3 * ()); - MOCK_METHOD0(GetUpdateCounter, - uint64()); MOCK_METHOD1(RegisterErrorObserver, bool(IErrorObserver * errorObserver)); MOCK_METHOD1(UnregisterErrorObserver, @@ -139,10 +125,6 @@ public: bool()); MOCK_METHOD1(SetAssertVisible, void(bool bAssertVisble)); - MOCK_METHOD1(SetConsoleDrawEnabled, - void(bool enabled)); - MOCK_METHOD1(SetUIDrawEnabled, - void(bool enabled)); MOCK_METHOD0(GetApplicationInstance, int()); MOCK_METHOD1(GetApplicationLogInstance, @@ -167,14 +149,10 @@ public: bool()); #endif - MOCK_METHOD0(GetRootWindowMessageHandler, - void*()); MOCK_METHOD1(RegisterWindowMessageHandler, void(IWindowMessageHandler * pHandler)); MOCK_METHOD1(UnregisterWindowMessageHandler, void(IWindowMessageHandler * pHandler)); - MOCK_METHOD0(CreateLocalFileIO, - std::shared_ptr()); MOCK_METHOD2(ForceMaxFps, void(bool, int)); }; diff --git a/Code/Legacy/CryCommon/StatObjBus.h b/Code/Legacy/CryCommon/StatObjBus.h deleted file mode 100644 index 5a05440cb0..0000000000 --- a/Code/Legacy/CryCommon/StatObjBus.h +++ /dev/null @@ -1,36 +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 - -////////////////////////////////////////////////////////////////////////// -// -// EBUS support for triggering necessary updates when IStatObj instances -// caches should be updated when 3D Engine events happen during level loads, -// shutting down the application, and so forth -// -////////////////////////////////////////////////////////////////////////// -class InstanceStatObjEvents - : public AZ::EBusTraits -{ -public: - virtual ~InstanceStatObjEvents() = default; - - // AZ::EBusTraits - static const AZ::EBusAddressPolicy AddressPolicy = AZ::EBusAddressPolicy::Single; - static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Multiple; - using MutexType = AZStd::recursive_mutex; - - virtual void ReleaseData() - { - } -}; - -using InstanceStatObjEventBus = AZ::EBus; diff --git a/Code/Legacy/CryCommon/WinBase.cpp b/Code/Legacy/CryCommon/WinBase.cpp index 4436f24281..3445637d28 100644 --- a/Code/Legacy/CryCommon/WinBase.cpp +++ b/Code/Legacy/CryCommon/WinBase.cpp @@ -53,21 +53,8 @@ #include #endif -#if defined(ANDROID) -#define FIX_FILENAME_CASE 0 // everything is lower case on android -#elif defined(LINUX) || defined(APPLE) -#define FIX_FILENAME_CASE 1 -#endif - #include - - -#if !defined(_RELEASE) || defined(_DEBUG) -#include -unsigned int g_EnableMultipleAssert = 0;//set to something else than 0 if to enable already reported asserts -#endif - #if defined(LINUX) || defined(APPLE) #include #include @@ -81,106 +68,11 @@ unsigned int g_EnableMultipleAssert = 0;//set to something else than 0 if to ena #if AZ_TRAIT_COMPILER_DEFINE_FS_ERRNO_TYPE typedef int FS_ERRNO_TYPE; -#if AZ_TRAIT_COMPILER_DEFINE_FS_STAT_TYPE -typedef struct stat FS_STAT_TYPE; -#else -typedef struct stat64 FS_STAT_TYPE; -#endif #include -#elif AZ_TRAIT_COMPILER_DEFINE_FS_STAT_TYPE -#error cannot request AZ_TRAIT_COMPILER_DEFINE_FS_STAT_TYPE if AZ_TRAIT_COMPILER_DEFINE_FS_ERRNO_TYPE is zero #endif -#if AZ_TRAIT_COMPILER_DEFINE_SASSERTDATA_TYPE && (!defined(_RELEASE) || defined(_DEBUG)) -struct SAssertData -{ - int line; - char fileName[256 - sizeof(int)]; - const bool operator==(const SAssertData& crArg) const - { - return crArg.line == line && (strcmp(fileName, crArg.fileName) == 0); - } - - const bool operator<(const SAssertData& crArg) const - { - if (line == crArg.line) - { - return strcmp(fileName, crArg.fileName) < 0; - } - else - { - return line < crArg.line; - } - } - - SAssertData() - : line(-1){} - SAssertData(const int cLine, const char* cpFile) - : line(cLine) - { - azstrcpy(fileName, AZ_ARRAY_SIZE(fileName), cpFile); - } - - SAssertData(const SAssertData& crAssertData) - { - memcpy((void*)this, &crAssertData, sizeof(SAssertData)); - } - - void operator=(const SAssertData& crAssertData) - { - memcpy((void*)this, &crAssertData, sizeof(SAssertData)); - } -}; - - -//#define OUTPUT_ASSERT_TO_FILE - -void HandleAssert(const char* cpMessage, const char* cpFunc, const char* cpFile, const int cLine) -{ -#if defined(OUTPUT_ASSERT_TO_FILE) - static FILE* pAssertLogFile = nullptr; - if (!pAssertLogFile) - { - azfopen(&pAssertLogFile, "Assert.log", "w+"); - } -#endif - bool report = true; - static std::set assertSet; - SAssertData assertData(cLine, cpFile); - if (!g_EnableMultipleAssert) - { - std::set::const_iterator it = assertSet.find(assertData); - if (it != assertSet.end()) - { - report = false; - } - else - { - assertSet.insert(assertData); - } - } - else - { - assertSet.insert(assertData); - } - if (report) - { - //added function to be able to place a breakpoint here or to print out to other consoles - printf("ASSERT: %s in %s (%s : %d)\n", cpMessage, cpFunc, cpFile, cLine); -#if defined(OUTPUT_ASSERT_TO_FILE) - if (pAssertLogFile) - { - fprintf(pAssertLogFile, "ASSERT: %s in %s (%s : %d)\n", cpMessage, cpFunc, cpFile, cLine); - fflush(pAssertLogFile); - } -#endif - } -} -#endif - - bool IsBadReadPtr(void* ptr, unsigned int size) { //too complicated to really support it @@ -232,9 +124,9 @@ char* strupr (char* str) char* ltoa (long i, char* a, int radix) { - if (a == NULL) + if (a == nullptr) { - return NULL; + return nullptr; } strcpy (a, "0"); if (i && radix > 1 && radix < 37) @@ -369,9 +261,9 @@ void _makepath(char* path, const char* drive, const char* dir, const char* filen char* _ui64toa(unsigned long long value, char* str, int radix) { - if (str == 0) + if (str == nullptr) { - return 0; + return nullptr; } char buffer[65]; @@ -401,7 +293,7 @@ char* _ui64toa(unsigned long long value, char* str, int radix) long long _atoi64(const char* str) { - if (str == 0) + if (str == nullptr) { return -1; } @@ -550,22 +442,6 @@ void _splitpath(const char* inpath, char* drv, char* dir, char* fname, char* ext } } -////////////////////////////////////////////////////////////////////////// -int memicmp(LPCSTR s1, LPCSTR s2, DWORD len) -{ - int ret = 0; - while (len--) - { - if ((ret = tolower(*s1) - tolower(*s2))) - { - break; - } - s1++; - s2++; - } - return ret; -} - //-----------------------------------------other stuff------------------------------------------------------------------- void GlobalMemoryStatus(LPMEMORYSTATUS lpmem) @@ -697,7 +573,7 @@ static void NormalizeTimeFields(short* FieldToNormalize, short* CarryField, int *CarryField = (short) (*CarryField + 1); } -bool TimeFieldsToTime(PTIME_FIELDS tfTimeFields, PLARGE_INTEGER Time) +static bool TimeFieldsToTime(PTIME_FIELDS tfTimeFields, PLARGE_INTEGER Time) { #define SECSPERMIN 60 #define MINSPERHOUR 60 @@ -775,119 +651,6 @@ BOOL SystemTimeToFileTime(const SYSTEMTIME* syst, LPFILETIME ft) return TRUE; } -void adaptFilenameToLinux(AZStd::string& rAdjustedFilename) -{ - //first replace all \\ by / - AZStd::string::size_type loc = 0; - while ((loc = rAdjustedFilename.find("\\", loc)) != AZStd::string::npos) - { - rAdjustedFilename.replace(loc, 1, "/"); - } - loc = 0; - //remove /./ - while ((loc = rAdjustedFilename.find("/./", loc)) != AZStd::string::npos) - { - rAdjustedFilename.replace(loc, 3, "/"); - } -} - -void replaceDoublePathFilename(char* szFileName) -{ - //replace "\.\" by "\" - AZStd::string s(szFileName); - AZStd::string::size_type loc = 0; - //remove /./ - while ((loc = s.find("/./", loc)) != AZStd::string::npos) - { - s.replace(loc, 3, "/"); - } - loc = 0; - //remove "\.\" - while ((loc = s.find("\\.\\", loc)) != AZStd::string::npos) - { - s.replace(loc, 3, "\\"); - } - azstrcpy((char*)szFileName, AZ_MAX_PATH_LEN, s.c_str()); -} - -#if FIX_FILENAME_CASE -static bool FixOnePathElement(char* path) -{ - if (*path == '\0') - { - return true; - } - - if ((path[0] == '/') && (path[1] == '\0')) - { - return true; // root dir always exists. - } - if (strchr(path, '*') || strchr(path, '?')) - { - return true; // wildcard...stop correcting path. - } - struct stat statbuf; - if (stat(path, &statbuf) != -1) // current case exists. - { - return true; - } - - char* name = path; - char* ptr = strrchr(path, '/'); - if (ptr) - { - name = ptr + 1; - *ptr = '\0'; - } - - if (*name == '\0') // trailing '/' ? - { - *ptr = '/'; - return true; - } - - const char* parent; - if (ptr == path) - { - parent = "/"; - } - else if (ptr == NULL) - { - parent = "."; - } - else - { - parent = path; - } - - DIR* dirp = opendir(parent); - if (ptr) - { - *ptr = '/'; - } - - if (dirp == NULL) - { - return false; - } - - struct dirent* dent; - bool found = false; - while ((dent = readdir(dirp)) != NULL) - { - if (strcasecmp(dent->d_name, name) == 0) - { - azstrcpy(name, AZ_MAX_PATH_LEN, dent->d_name); - found = true; - break; - } - } - - closedir(dirp); - return found; -} -#endif - #define Int32x32To64(a, b) ((uint64)((uint64)(a)) * (uint64)((uint64)(b))) ////////////////////////////////////////////////////////////////////////// @@ -904,24 +667,14 @@ threadID GetCurrentThreadId() } #endif +#include +#include + ////////////////////////////////////////////////////////////////////////// DWORD Sleep(DWORD dwMilliseconds) { #if defined(LINUX) || defined(APPLE) - timespec req; - timespec rem; - - memset(&req, 0, sizeof(req)); - memset(&rem, 0, sizeof(rem)); - - time_t sec = (int)(dwMilliseconds / 1000); - req.tv_sec = sec; - req.tv_nsec = (dwMilliseconds - (sec * 1000)) * 1000000L; - if (nanosleep(&req, &rem) == -1) - { - nanosleep(&rem, 0); - } - + std::this_thread::sleep_for(std::chrono::milliseconds(dwMilliseconds)); return 0; #define AZ_RESTRICTED_SECTION_IMPLEMENTED #elif defined(AZ_RESTRICTED_PLATFORM) @@ -960,7 +713,7 @@ DWORD Sleep(DWORD dwMilliseconds) } ////////////////////////////////////////////////////////////////////////// -DWORD SleepEx(DWORD dwMilliseconds, BOOL bAlertable) +DWORD SleepEx(DWORD dwMilliseconds, BOOL /*bAlertable*/) { //TODO: implement // CRY_ASSERT_MESSAGE(0, "SleepEx not implemented yet"); @@ -1006,7 +759,7 @@ void CrySleep(unsigned int dwMilliseconds) ////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////// -int CryMessageBox(const char* lpText, const char* lpCaption, unsigned int uType) +void CryMessageBox(const char* lpText, const char* lpCaption, [[maybe_unused]] unsigned int uType) { #ifdef WIN32 # error WIN32 is defined in WinBase.cpp (it is a non-Windows file) @@ -1087,63 +840,8 @@ int CryMessageBox(const char* lpText, const char* lpCaption, unsigned int uType) CFRelease(strText); } - if (kResult == kCFUserNotificationDefaultResponse) - { - switch (uType & 0xf) - { - case MB_OK: - case MB_OKCANCEL: - default: - return IDOK; - case MB_ABORTRETRYIGNORE: - return IDABORT; - case MB_YESNOCANCEL: - case MB_YESNO: - return IDYES; - case MB_RETRYCANCEL: - return IDRETRY; - case MB_CANCELTRYCONTINUE: - return IDCANCEL; - } - } - else if (kResult == kCFUserNotificationAlternateResponse) - { - switch (uType & 0xf) - { - case MB_OKCANCEL: - case MB_RETRYCANCEL: - return IDCANCEL; - case MB_ABORTRETRYIGNORE: - return IDRETRY; - case MB_YESNOCANCEL: - case MB_YESNO: - return IDNO; - case MB_CANCELTRYCONTINUE: - return IDTRYAGAIN; - default: - assert(false); - return IDCANCEL; - } - } - else if (kResult == kCFUserNotificationOtherResponse) - { - switch (uType & 0xf) - { - case MB_ABORTRETRYIGNORE: - return IDIGNORE; - case MB_YESNOCANCEL: - return IDCANCEL; - case MB_CANCELTRYCONTINUE: - return IDCONTINUE; - default: - assert(false); - return IDCANCEL; - } - } - return 0; #else printf("Messagebox: cap: %s text:%s\n", lpCaption ? lpCaption : " ", lpText ? lpText : " "); - return 0; #endif } @@ -1171,21 +869,6 @@ DLL_EXPORT void OutputDebugString(const char* outputString) // This code does not have a long life span and will be replaced soon #if defined(APPLE) || defined(LINUX) || defined(DEFINE_LEGACY_CRY_FILE_OPERATIONS) -typedef DIR* FS_DIR_TYPE; -typedef dirent FS_DIRENT_TYPE; -static const FS_ERRNO_TYPE FS_ENOENT = ENOENT; -static const FS_DIR_TYPE FS_DIR_NULL = NULL; - -typedef int FS_ERRNO_TYPE; - -#if defined(APPLE) -typedef struct stat FS_STAT_TYPE; -#else -typedef struct stat64 FS_STAT_TYPE; -#endif - -#include - bool CrySetFileAttributes(const char* lpFileName, uint32 dwFileAttributes) { //TODO: implement @@ -1194,190 +877,7 @@ bool CrySetFileAttributes(const char* lpFileName, uint32 dwFileAttributes) } -ILINE void FS_OPEN(const char* szFileName, int iFlags, int& iFileDesc, mode_t uMode, FS_ERRNO_TYPE& rErr) -{ - rErr = ((iFileDesc = open(szFileName, iFlags, uMode)) != -1) ? 0 : errno; -} -ILINE void FS_CLOSE(int iFileDesc, FS_ERRNO_TYPE& rErr) -{ - rErr = close(iFileDesc) != -1 ? 0 : errno; -} - -ILINE void FS_CLOSE_NOERR(int iFileDesc) -{ - close(iFileDesc); -} - -ILINE void FS_OPENDIR(const char* szDirName, FS_DIR_TYPE& pDir, FS_ERRNO_TYPE& rErr) -{ - rErr = (pDir = opendir(szDirName)) != NULL ? 0 : errno; -} - -ILINE void FS_READDIR(FS_DIR_TYPE pDir, FS_DIRENT_TYPE& kEnt, uint64_t& uEntSize, FS_ERRNO_TYPE& rErr) -{ - errno = 0; // errno is used to determine if readdir succeeds after - FS_DIRENT_TYPE* pDirent(readdir(pDir)); - if (pDirent == NULL) - { - uEntSize = 0; - rErr = (errno == FS_ENOENT) ? 0 : errno; - } - else - { - kEnt = *pDirent; - uEntSize = static_cast(sizeof(FS_DIRENT_TYPE)); - rErr = 0; - } -} - -ILINE void FS_STAT(const char* szFileName, FS_STAT_TYPE& kStat, FS_ERRNO_TYPE& rErr) -{ -#if defined(APPLE) - rErr = stat(szFileName, &kStat) != -1 ? 0 : errno; -#else - rErr = stat64(szFileName, &kStat) != -1 ? 0 : errno; -#endif -} - -ILINE void FS_FSTAT(int iFileDesc, FS_STAT_TYPE& kStat, FS_ERRNO_TYPE& rErr) -{ -#if defined(APPLE) - rErr = fstat(iFileDesc, &kStat) != -1 ? 0 : errno; -#else - rErr = fstat64(iFileDesc, &kStat) != -1 ? 0 : errno; -#endif -} - -ILINE void FS_CLOSEDIR(FS_DIR_TYPE pDir, FS_ERRNO_TYPE& rErr) -{ - errno = 0; - rErr = closedir(pDir) == 0 ? 0 : errno; -} - -ILINE void FS_CLOSEDIR_NOERR(FS_DIR_TYPE pDir) -{ - closedir(pDir); -} - -const bool GetFilenameNoCase -( - const char* file, - char* pAdjustedFilename -) -{ - assert(file); - assert(pAdjustedFilename); - azstrcpy(pAdjustedFilename, AZ_MAX_PATH_LEN, file); - - // Fix the dirname case. - const int cLen = strlen(file); - for (int i = 0; i < cLen; ++i) - { - if (pAdjustedFilename[i] == '\\') - { - pAdjustedFilename[i] = '/'; - } - } - - if ((pAdjustedFilename) == (char*)-1) - { - return false; - } - -#if !defined(LINUX) && !defined(APPLE) && !defined(DEFINE_SKIP_WILDCARD_CHECK) // fix the parent path anyhow. - char* slash = strrchr(pAdjustedFilename, '/'); - char* name = pAdjustedFilename; - if (slash) - { - name = slash + 1; - *slash = 0; - } - // Check for wildcards. We'll always return true if the specified filename is - // a wildcard pattern. - if (strchr(name, '*') || strchr(name, '?')) - { - if (slash) - { - *slash = '/'; - } - return true; - } - // Scan for the file. - if (slash) - { - *slash = '/'; - } -#endif - - -#if FIX_FILENAME_CASE - char* path = pAdjustedFilename; - char* sep; - while ((sep = strchr(path, '/')) != NULL) - { - *sep = '\0'; - const bool exists = FixOnePathElement(pAdjustedFilename); - *sep = '/'; - if (!exists) - { - return false; - } - - path = sep + 1; - } - if (!FixOnePathElement(pAdjustedFilename)) // catch last filename. - { - return false; - } - -#else - for (char* c = pAdjustedFilename; *c; ++c) - { - *c = tolower(*c); - } -#endif - - return true; -} - -DWORD GetFileAttributes(LPCWSTR lpFileNameW) -{ - AZStd::string lpFileName; - AZStd::to_string(lpFileName, lpFileNameW); - struct stat fileStats; - const int success = stat(lpFileName.c_str(), &fileStats); - if (success == -1) - { - char adjustedFilename[MAX_PATH]; - GetFilenameNoCase(lpFileName.c_str(), adjustedFilename); - if (stat(adjustedFilename, &fileStats) == -1) - { - return (DWORD)INVALID_FILE_ATTRIBUTES; - } - } - DWORD ret = 0; - - const int acc = (fileStats.st_mode & S_IWRITE); - - if (acc != 0) - { - if (S_ISDIR(fileStats.st_mode) != 0) - { - ret |= FILE_ATTRIBUTE_DIRECTORY; - } - } - return (ret == 0) ? FILE_ATTRIBUTE_NORMAL : ret;//return file attribute normal as the default value, must only be set if no other attributes have been found -} - -__finddata64_t::~__finddata64_t() -{ - if (m_Dir != FS_DIR_NULL) - { - FS_CLOSEDIR_NOERR(m_Dir); - m_Dir = FS_DIR_NULL; - } -} #endif //defined(APPLE) || defined(LINUX) #endif // AZ_TRAIT_LEGACY_CRYCOMMON_USE_WINDOWS_STUBS diff --git a/Code/Legacy/CryCommon/crycommon_files.cmake b/Code/Legacy/CryCommon/crycommon_files.cmake index d3e13525d7..68cf579ca8 100644 --- a/Code/Legacy/CryCommon/crycommon_files.cmake +++ b/Code/Legacy/CryCommon/crycommon_files.cmake @@ -11,9 +11,7 @@ set(FILES IAudioSystem.h ICmdLine.h IConsole.h - IEntityRenderState.h IFont.h - IFunctorBase.h IGem.h IIndexedMesh.h ILevelSystem.h @@ -30,8 +28,6 @@ set(FILES ISerialize.h IShader.h ISplines.h - IStatObj.h - StatObjBus.h ISystem.h ITexture.h IValidator.h diff --git a/Code/Legacy/CryCommon/platform.h b/Code/Legacy/CryCommon/platform.h index 2baddaafd5..d67c0b902c 100644 --- a/Code/Legacy/CryCommon/platform.h +++ b/Code/Legacy/CryCommon/platform.h @@ -249,7 +249,7 @@ ILINE DestinationType alias_cast(SourceType pPtr) // Mostly used only for debugging! ////////////////////////////////////////////////////////////////////////// void CrySleep(unsigned int dwMilliseconds); -int CryMessageBox(const char* lpText, const char* lpCaption, unsigned int uType); +void CryMessageBox(const char* lpText, const char* lpCaption, unsigned int uType); //--------------------------------------------------------------------------- // Useful function to clean the structure. diff --git a/Code/Legacy/CryCommon/platform_impl.cpp b/Code/Legacy/CryCommon/platform_impl.cpp index 6e61e64c4b..64aa7ce1ca 100644 --- a/Code/Legacy/CryCommon/platform_impl.cpp +++ b/Code/Legacy/CryCommon/platform_impl.cpp @@ -178,21 +178,21 @@ void CrySleep(unsigned int dwMilliseconds) } ////////////////////////////////////////////////////////////////////////// -int CryMessageBox([[maybe_unused]] const char* lpText, [[maybe_unused]] const char* lpCaption, [[maybe_unused]] unsigned int uType) +void CryMessageBox([[maybe_unused]] const char* lpText, [[maybe_unused]] const char* lpCaption, [[maybe_unused]] unsigned int uType) { #ifdef WIN32 ICVar* const pCVar = gEnv && gEnv->pConsole ? gEnv->pConsole->GetCVar("sys_no_crash_dialog") : NULL; if ((pCVar && pCVar->GetIVal() != 0) || (gEnv && gEnv->bNoAssertDialog)) { - return 0; + return; } AZStd::wstring lpTextW; AZStd::to_wstring(lpTextW, lpText); AZStd::wstring lpCaptionW; AZStd::to_wstring(lpCaptionW, lpCaption); - return MessageBoxW(NULL, lpTextW.c_str(), lpCaptionW.c_str(), uType); + MessageBoxW(NULL, lpTextW.c_str(), lpCaptionW.c_str(), uType); #else - return 0; + return; #endif } @@ -281,12 +281,6 @@ int64 CryGetTicks() return li.QuadPart; } -int64 CryGetTicksPerSec() -{ - LARGE_INTEGER li; - QueryPerformanceFrequency(&li); - return li.QuadPart; -} #endif diff --git a/Code/Legacy/CrySystem/System.cpp b/Code/Legacy/CrySystem/System.cpp index bb48e69cec..6b985a3f6f 100644 --- a/Code/Legacy/CrySystem/System.cpp +++ b/Code/Legacy/CrySystem/System.cpp @@ -209,20 +209,7 @@ CSystem::CSystem(SharedEnvironmentInstance* pSharedEnvironment) m_env.pSharedEnvironment = pSharedEnvironment; ////////////////////////////////////////////////////////////////////////// - m_pIFont = NULL; - m_pIFontUi = NULL; - m_rWidth = NULL; - m_rHeight = NULL; - m_rWidthAndHeightAsFractionOfScreenSize = NULL; - m_rMaxWidth = NULL; - m_rMaxHeight = NULL; - m_rColorBits = NULL; - m_rDepthBits = NULL; - m_cvSSInfo = NULL; - m_rStencilBits = NULL; - m_rFullscreen = NULL; m_sysNoUpdate = NULL; - m_pProcess = NULL; m_pCmdLine = NULL; m_pLevelSystem = NULL; m_pLocalizationManager = NULL; @@ -230,18 +217,9 @@ CSystem::CSystem(SharedEnvironmentInstance* pSharedEnvironment) #define AZ_RESTRICTED_SECTION SYSTEM_CPP_SECTION_2 #include AZ_RESTRICTED_FILE(System_cpp) #endif - m_sys_min_step = 0; - m_sys_max_step = 0; - - m_cvAIUpdate = NULL; m_pUserCallback = NULL; - m_sys_memory_debug = NULL; - m_sysWarnings = NULL; - m_sysKeyboard = NULL; m_sys_firstlaunch = NULL; - m_sys_enable_budgetmonitoring = NULL; - m_sys_preload = NULL; // m_sys_filecache = NULL; m_gpu_particle_physics = NULL; @@ -256,22 +234,11 @@ CSystem::CSystem(SharedEnvironmentInstance* pSharedEnvironment) m_bNoCrashDialog = false; m_bNoErrorReportWindow = false; - m_pCVarQuit = NULL; - - m_bForceNonDevMode = false; - m_bWasInDevMode = false; m_bInDevMode = false; m_bGameFolderWritable = false; - m_bDrawConsole = true; - m_bDrawUI = true; - - m_nServerConfigSpec = CONFIG_VERYHIGH_SPEC; - m_nMaxConfigSpec = CONFIG_VERYHIGH_SPEC; - m_bPaused = false; m_bNoUpdate = false; - m_nUpdateCounter = 0; m_iApplicationInstance = -1; @@ -293,7 +260,6 @@ CSystem::CSystem(SharedEnvironmentInstance* pSharedEnvironment) m_bHasRenderedErrorMessage = false; - m_pDataProbe = nullptr; #if AZ_LEGACY_CRYSYSTEM_TRAIT_USE_MESSAGE_HANDLER RegisterWindowMessageHandler(this); #endif @@ -339,48 +305,15 @@ void CSystem::Release() delete this; } -////////////////////////////////////////////////////////////////////////// -void CSystem::FreeLib(AZStd::unique_ptr& hLibModule) -{ - if (hLibModule) - { - if (hLibModule->IsLoaded()) - { - hLibModule->Unload(); - } - hLibModule.release(); - } -} - ////////////////////////////////////////////////////////////////////////// IRemoteConsole* CSystem::GetIRemoteConsole() { return CRemoteConsole::GetInst(); } -////////////////////////////////////////////////////////////////////////// -void CSystem::SetForceNonDevMode(const bool bValue) -{ - m_bForceNonDevMode = bValue; - if (bValue) - { - SetDevMode(false); - } -} - -////////////////////////////////////////////////////////////////////////// -bool CSystem::GetForceNonDevMode() const -{ - return m_bForceNonDevMode; -} - ////////////////////////////////////////////////////////////////////////// void CSystem::SetDevMode(bool bEnable) { - if (bEnable) - { - m_bWasInDevMode = true; - } m_bInDevMode = bEnable; } @@ -464,31 +397,13 @@ void CSystem::ShutDown() // Release console variables. - SAFE_RELEASE(m_pCVarQuit); - SAFE_RELEASE(m_rWidth); - SAFE_RELEASE(m_rHeight); - SAFE_RELEASE(m_rWidthAndHeightAsFractionOfScreenSize); - SAFE_RELEASE(m_rMaxWidth); - SAFE_RELEASE(m_rMaxHeight); - SAFE_RELEASE(m_rColorBits); - SAFE_RELEASE(m_rDepthBits); - SAFE_RELEASE(m_cvSSInfo); - SAFE_RELEASE(m_rStencilBits); - SAFE_RELEASE(m_rFullscreen); - - SAFE_RELEASE(m_sysWarnings); - SAFE_RELEASE(m_sysKeyboard); SAFE_RELEASE(m_sys_firstlaunch); - SAFE_RELEASE(m_sys_enable_budgetmonitoring); #if defined(AZ_RESTRICTED_PLATFORM) #define AZ_RESTRICTED_SECTION SYSTEM_CPP_SECTION_3 #include AZ_RESTRICTED_FILE(System_cpp) #endif - SAFE_RELEASE(m_sys_min_step); - SAFE_RELEASE(m_sys_max_step); - SAFE_DELETE(m_pLocalizationManager); delete m_pCmdLine; @@ -556,14 +471,6 @@ bool CSystem::IsQuitting() const return wasExitMainLoopRequested; } -////////////////////////////////////////////////////////////////////////// -void CSystem::SetIProcess(IProcess* process) -{ - m_pProcess = process; - //if (m_pProcess) - //m_pProcess->SetPMessage(""); -} - ////////////////////////////////////////////////////////////////////////// ISystem* CSystem::GetCrySystem() { @@ -659,7 +566,6 @@ bool CSystem::UpdatePreTickBus(int updateFlags, int nPauseMode) AZ_TRACE_METHOD(); - m_nUpdateCounter++; #ifndef EXCLUDE_UPDATE_ON_CONSOLE if (m_pUserCallback) { @@ -952,13 +858,16 @@ void CSystem::Warning(EValidatorModule module, EValidatorSeverity severity, int } ////////////////////////////////////////////////////////////////////////// -int CSystem::ShowMessage(const char* text, const char* caption, unsigned int uType) +void CSystem::ShowMessage(const char* text, const char* caption, unsigned int uType) { if (m_pUserCallback) { - return m_pUserCallback->ShowMessage(text, caption, uType); + m_pUserCallback->ShowMessage(text, caption, uType); + } + else + { + CryMessageBox(text, caption, uType); } - return CryMessageBox(text, caption, uType); } inline const char* ValidatorModuleToString(EValidatorModule module) @@ -1035,22 +944,18 @@ void CSystem::WarningV(EValidatorModule module, EValidatorSeverity severity, int default: break; } - char szBuffer[MAX_WARNING_LENGTH]; - vsnprintf_s(szBuffer, sizeof(szBuffer), sizeof(szBuffer) - 1, format, args); + + AZStd::fixed_string fmt; + vsnprintf_s(fmt.data(), MAX_WARNING_LENGTH, MAX_WARNING_LENGTH - 1, format, args); if (file && *file) { - AZStd::fixed_string fmt = szBuffer; fmt += " [File="; fmt += file; fmt += "]"; - m_env.pLog->LogWithType(ltype, flags | VALIDATOR_FLAG_SKIP_VALIDATOR, "%s", fmt.c_str()); - } - else - { - m_env.pLog->LogWithType(ltype, flags | VALIDATOR_FLAG_SKIP_VALIDATOR, "%s", szBuffer); } + m_env.pLog->LogWithType(ltype, flags | VALIDATOR_FLAG_SKIP_VALIDATOR, "%s", fmt.c_str()); if (bDbgBreak && g_cvars.sys_error_debugbreak) { @@ -1135,34 +1040,6 @@ ILocalizationManager* CSystem::GetLocalizationManager() return m_pLocalizationManager; } -////////////////////////////////////////////////////////////////////////// -void CSystem::debug_GetCallStackRaw(void** callstack, uint32& callstackLength) -{ - memset(callstack, 0, sizeof(void*) * callstackLength); - -#if !defined(ANDROID) - callstackLength = 0; -#endif - -#if AZ_LEGACY_CRYSYSTEM_TRAIT_CAPTURESTACK - uint32 nNumStackFramesToSkip = 1; - uint32 callstackCapacity = callstackLength; - if (callstackCapacity > 0x40) - { - callstackCapacity = 0x40; - } - callstackLength = RtlCaptureStackBackTrace(nNumStackFramesToSkip, callstackCapacity, callstack, NULL); -#elif defined(AZ_RESTRICTED_PLATFORM) -#define AZ_RESTRICTED_SECTION SYSTEM_CPP_SECTION_7 -#include AZ_RESTRICTED_FILE(System_cpp) -#endif - - if (callstackLength > 0) - { - std::reverse(callstack, callstack + callstackLength); - } -} - ////////////////////////////////////////////////////////////////////////// void CSystem::ExecuteCommandLine(bool deferred) { @@ -1201,12 +1078,6 @@ void CSystem::ExecuteCommandLine(bool deferred) //gEnv->pConsole->ExecuteString("sys_RestoreSpec test*"); // to get useful debugging information about current spec settings to the log file } -////////////////////////////////////////////////////////////////////////// -ESystemConfigSpec CSystem::GetMaxConfigSpec() const -{ - return m_nMaxConfigSpec; -} - ////////////////////////////////////////////////////////////////////////// void CSystem::SetConfigPlatform(const ESystemConfigPlatform platform) { @@ -1401,23 +1272,6 @@ void CSystem::SetSystemGlobalState(const ESystemGlobalState systemGlobalState) #endif // if AZ_LOADSCREENCOMPONENT_ENABLED } -////////////////////////////////////////////////////////////////////////// -void* CSystem::GetRootWindowMessageHandler() -{ -#if defined(AZ_RESTRICTED_PLATFORM) - #define AZ_RESTRICTED_SECTION SYSTEM_CPP_SECTION_9 - #include AZ_RESTRICTED_FILE(System_cpp) -#endif -#if defined(AZ_RESTRICTED_SECTION_IMPLEMENTED) -#undef AZ_RESTRICTED_SECTION_IMPLEMENTED -#elif defined(WIN32) - return reinterpret_cast(&WndProc); -#else - CRY_ASSERT(false && "This platform does not support window message handlers"); - return NULL; -#endif -} - ////////////////////////////////////////////////////////////////////////// void CSystem::RegisterWindowMessageHandler(IWindowMessageHandler* pHandler) { @@ -1601,11 +1455,6 @@ bool CSystem::HandleMessage([[maybe_unused]] HWND hWnd, UINT uMsg, WPARAM wParam #endif -std::shared_ptr CSystem::CreateLocalFileIO() -{ - return std::make_shared(); -} - ILevelSystem* CSystem::GetILevelSystem() { return m_pLevelSystem; diff --git a/Code/Legacy/CrySystem/System.h b/Code/Legacy/CrySystem/System.h index d48b1797d3..664f5385fa 100644 --- a/Code/Legacy/CrySystem/System.h +++ b/Code/Legacy/CrySystem/System.h @@ -78,9 +78,6 @@ class CWatchdogThread; #if defined(WIN32) #define AZ_LEGACY_CRYSYSTEM_TRAIT_USE_MESSAGE_HANDLER 1 #endif -#if defined(WIN64) || defined(WIN32) -#define AZ_LEGACY_CRYSYSTEM_TRAIT_CAPTURESTACK 1 -#endif ////////////////////////////////////////////////////////////////////////// @@ -98,30 +95,12 @@ namespace Audio struct IAudioSystem; struct IMusicSystem; } // namespace Audio -struct IDataProbe; #define PHSYICS_OBJECT_ENTITY 0 -#define MAX_STREAMING_POOL_INDEX 6 -#define MAX_THREAD_POOL_INDEX 6 - struct SSystemCVars { - int sys_streaming_requests_grouping_time_period; - int sys_streaming_sleep; - int sys_streaming_memory_budget; - int sys_streaming_max_finalize_per_frame; - float sys_streaming_max_bandwidth; - int sys_streaming_cpu; - int sys_streaming_cpu_worker; - int sys_streaming_debug; - int sys_streaming_resetstats; - int sys_streaming_debug_filter; - float sys_streaming_debug_filter_min_time; - int sys_streaming_use_optical_drive_thread; - ICVar* sys_streaming_debug_filter_file_name; ICVar* sys_localization_folder; - int sys_streaming_in_blocks; int sys_float_exceptions; int sys_no_crash_dialog; @@ -129,33 +108,16 @@ struct SSystemCVars int sys_dump_aux_threads; int sys_WER; int sys_dump_type; - int sys_ai; - int sys_entitysystem; int sys_trackview; float sys_update_profile_time; - int sys_limit_phys_thread_count; int sys_MaxFPS; float sys_maxTimeStepForMovieSystem; - int sys_force_installtohdd_mode; int sys_report_files_not_found_in_paks = 0; -#ifdef USE_HTTP_WEBSOCKETS - int sys_simple_http_base_port; -#endif - int sys_asserts; int sys_error_debugbreak; - int sys_FilesystemCaseSensitivity; - AZ::IO::ArchiveVars archiveVars; - -#if defined(WIN32) - int sys_display_threads; -#elif defined(AZ_RESTRICTED_PLATFORM) -#define AZ_RESTRICTED_SECTION SYSTEM_H_SECTION_2 -#include AZ_RESTRICTED_FILE(System_h) -#endif }; extern SSystemCVars g_cvars; @@ -239,9 +201,8 @@ public: ////////////////////////////////////////////////////////////////////////// // retrieves the perlin noise singleton instance CPNoise3* GetNoiseGen() override; - uint64 GetUpdateCounter() override { return m_nUpdateCounter; }; - void DetectGameFolderAccessRights(); + void DetectGameFolderAccessRights(); void ExecuteCommandLine(bool deferred=true) override; @@ -256,9 +217,6 @@ public: void IgnoreUpdates(bool bIgnore) override { m_bIgnoreUpdates = bIgnore; }; - void SetIProcess(IProcess* process) override; - IProcess* GetIProcess() override{ return m_pProcess; } - bool IsTestMode() const override { return m_bTestMode; } //@} @@ -269,7 +227,7 @@ public: // Validator Warning. void WarningV(EValidatorModule module, EValidatorSeverity severity, int flags, const char* file, const char* format, va_list args) override; void Warning(EValidatorModule module, EValidatorSeverity severity, int flags, const char* file, const char* format, ...) override; - int ShowMessage(const char* text, const char* caption, unsigned int uType) override; + void ShowMessage(const char* text, const char* caption, unsigned int uType) override; bool CheckLogVerbosity(int verbosity) override; //! Return pointer to user defined callback. @@ -278,7 +236,6 @@ public: ////////////////////////////////////////////////////////////////////////// void SaveConfiguration() override; void LoadConfiguration(const char* sFilename, ILoadConfigurationEntrySink* pSink = nullptr, bool warnIfMissing = true) override; - ESystemConfigSpec GetMaxConfigSpec() const override; ESystemConfigPlatform GetConfigPlatform() const override; void SetConfigPlatform(ESystemConfigPlatform platform) override; ////////////////////////////////////////////////////////////////////////// @@ -288,9 +245,6 @@ public: ILocalizationManager* GetLocalizationManager() override; void debug_GetCallStack(const char** pFunctions, int& nCount) override; void debug_LogCallStack(int nMaxFuncs = 32, int nFlags = 0) override; - // Get the current callstack in raw address form (more lightweight than the above functions) - // static as memReplay needs it before CSystem has been setup - expose a ISystem interface to this function if you need it outside CrySystem - static void debug_GetCallStackRaw(void** callstack, uint32& callstackLength); public: #if !defined(RELEASE) @@ -300,7 +254,6 @@ public: #if defined(WIN32) friend LRESULT WINAPI WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam); #endif - void* GetRootWindowMessageHandler() override; void RegisterWindowMessageHandler(IWindowMessageHandler* pHandler) override; void UnregisterWindowMessageHandler(IWindowMessageHandler* pHandler) override; @@ -330,8 +283,6 @@ private: void CreateSystemVars(); void CreateAudioVars(); - void FreeLib(AZStd::unique_ptr& hLibModule); - void QueryVersionInfo(); void LogVersion(); void LogBuildInfo(); @@ -341,7 +292,6 @@ private: static void SystemVersionChanged(ICVar* pCVar); #endif // #ifndef _RELEASE - bool ReLaunchMediaCenter(); void UpdateAudioSystems(); void AddCVarGroupDirectory(const AZStd::string& sPath) override; @@ -357,14 +307,7 @@ public: void EnableFloatExceptions(int type); // interface ISystem ------------------------------------------- - virtual IDataProbe* GetIDataProbe() { return m_pDataProbe; }; - void SetForceNonDevMode(bool bValue) override; - bool GetForceNonDevMode() const override; - bool WasInDevMode() const override { return m_bWasInDevMode; }; - bool IsDevMode() const override { return m_bInDevMode && !GetForceNonDevMode(); } - - void SetConsoleDrawEnabled(bool enabled) override { m_bDrawConsole = enabled; } - void SetUIDrawEnabled(bool enabled) override { m_bDrawUI = enabled; } + bool IsDevMode() const override { return m_bInDevMode; } // ------------------------------------------------------------- @@ -373,47 +316,30 @@ public: ICVar* attachVariable (const char* szVarName, int* pContainer, const char* szComment, int dwFlags = 0); const CTimeValue& GetLastTickTime() const { return m_lastTickTime; } - const ICVar* GetDedicatedMaxRate() const { return m_svDedicatedMaxRate; } - - std::shared_ptr CreateLocalFileIO() override; private: // ------------------------------------------------------ // System environment. SSystemGlobalEnvironment m_env; - bool m_bInitializedSuccessfully; //!< true if the system completed all initialization steps - bool m_bRelaunch; //!< relaunching the app or not (true beforerelaunch) - int m_iLoadingMode; //!< Game is loading w/o changing context (0 not, 1 quickloading, 2 full loading) - bool m_bTestMode; //!< If running in testing mode. - bool m_bEditor; //!< If running in Editor. - bool m_bNoCrashDialog; - bool m_bNoErrorReportWindow; - bool m_bPreviewMode; //!< If running in Preview mode. - bool m_bDedicatedServer; //!< If running as Dedicated server. - bool m_bIgnoreUpdates; //!< When set to true will ignore Update and Render calls, - bool m_bForceNonDevMode; //!< true when running on a cheat protected server or a client that is connected to it (not used in singlplayer) - bool m_bWasInDevMode; //!< Set to true if was in dev mode. - bool m_bInDevMode; //!< Set to true if was in dev mode. - bool m_bGameFolderWritable;//!< True when verified that current game folder have write access. - int m_ttMemStatSS; //!< Time to memstat screenshot - bool m_bDrawConsole; //!< Set to true if OK to draw the console. - bool m_bDrawUI; //!< Set to true if OK to draw UI. - - //! current active process - IProcess* m_pProcess; + bool m_bInitializedSuccessfully; //!< true if the system completed all initialization steps + bool m_bRelaunch; //!< relaunching the app or not (true beforerelaunch) + int m_iLoadingMode; //!< Game is loading w/o changing context (0 not, 1 quickloading, 2 full loading) + bool m_bTestMode; //!< If running in testing mode. + bool m_bEditor; //!< If running in Editor. + bool m_bNoCrashDialog; + bool m_bNoErrorReportWindow; + bool m_bPreviewMode; //!< If running in Preview mode. + bool m_bDedicatedServer; //!< If running as Dedicated server. + bool m_bIgnoreUpdates; //!< When set to true will ignore Update and Render calls, + bool m_bInDevMode; //!< Set to true if was in dev mode. + bool m_bGameFolderWritable; //!< True when verified that current game folder have write access. CTimeValue m_lastTickTime; //! system event dispatcher ISystemEventDispatcher* m_pSystemEventDispatcher; - //! The default mono-spaced font for internal usage (profiling, debug info, etc.) - IFFont* m_pIFont; - - //! The default font for end-user UI interfaces - IFFont* m_pIFontUi; - //! System to manage levels. ILevelSystem* m_pLevelSystem; @@ -432,12 +358,6 @@ private: // ------------------------------------------------------ // System console variables. ////////////////////////////////////////////////////////////////////////// - // DLL names - ICVar* m_sys_dll_response_system; -#if !defined(_RELEASE) - ICVar* m_sys_resource_cache_folder; -#endif - #if AZ_LOADSCREENCOMPONENT_ENABLED ICVar* m_game_load_screen_uicanvas_path; ICVar* m_level_load_screen_uicanvas_path; @@ -451,37 +371,9 @@ private: // ------------------------------------------------------ ICVar* m_level_load_screen_minimum_time{}; #endif // if AZ_LOADSCREENCOMPONENT_ENABLED - ICVar* m_sys_initpreloadpacks; - ICVar* m_sys_menupreloadpacks; - - ICVar* m_cvAIUpdate; - ICVar* m_rWidth; - ICVar* m_rHeight; - ICVar* m_rWidthAndHeightAsFractionOfScreenSize; - ICVar* m_rTabletWidthAndHeightAsFractionOfScreenSize; - ICVar* m_rHDRDolby; - ICVar* m_rMaxWidth; - ICVar* m_rMaxHeight; - ICVar* m_rColorBits; - ICVar* m_rDepthBits; - ICVar* m_rStencilBits; - ICVar* m_rFullscreen; - ICVar* m_rFullscreenWindow; - ICVar* m_rFullscreenNativeRes; - ICVar* m_rDisplayInfo; - ICVar* m_rOverscanBordersDrawDebugView; ICVar* m_sysNoUpdate; - ICVar* m_cvEntitySuppressionLevel; - ICVar* m_pCVarQuit; - ICVar* m_cvMemStats; - ICVar* m_cvMemStatsThreshold; - ICVar* m_cvMemStatsMaxDepth; - ICVar* m_sysKeyboard; - ICVar* m_sysWarnings; //!< might be 0, "sys_warnings" - Treat warning as errors. - ICVar* m_cvSSInfo; //!< might be 0, "sys_SSInfo" 0/1 - get file sourcesafe info ICVar* m_svDedicatedMaxRate; ICVar* m_sys_firstlaunch; - ICVar* m_sys_asset_processor; ICVar* m_sys_load_files_to_memory; #if defined(AZ_RESTRICTED_PLATFORM) @@ -491,13 +383,6 @@ private: // ------------------------------------------------------ ICVar* m_sys_audio_disable; - ICVar* m_sys_min_step; - ICVar* m_sys_max_step; - ICVar* m_sys_enable_budgetmonitoring; - ICVar* m_sys_memory_debug; - ICVar* m_sys_preload; - - // ICVar *m_sys_filecache; ICVar* m_gpu_particle_physics; AZStd::string m_sSavedRDriver; //!< to restore the driver when quitting the dedicated server @@ -509,28 +394,20 @@ private: // ------------------------------------------------------ SFileVersion m_fileVersion; SFileVersion m_productVersion; SFileVersion m_buildVersion; - IDataProbe* m_pDataProbe; class CLocalizedStringsManager* m_pLocalizationManager; - ESystemConfigSpec m_nServerConfigSpec; - ESystemConfigSpec m_nMaxConfigSpec; ESystemConfigPlatform m_ConfigPlatform; // Pause mode. bool m_bPaused; bool m_bNoUpdate; - uint64 m_nUpdateCounter; - bool m_executedCommandLine = false; AZStd::unique_ptr m_missingAssetLogger; public: - ICVar* m_sys_main_CPU; - ICVar* m_sys_streaming_CPU; - ICVar* m_sys_TaskThread_CPU[MAX_THREAD_POOL_INDEX]; ////////////////////////////////////////////////////////////////////////// // File version. diff --git a/Code/Legacy/CrySystem/SystemInit.cpp b/Code/Legacy/CrySystem/SystemInit.cpp index c5039f57e9..ad29ea102f 100644 --- a/Code/Legacy/CrySystem/SystemInit.cpp +++ b/Code/Legacy/CrySystem/SystemInit.cpp @@ -1193,18 +1193,6 @@ void CSystem::CreateSystemVars() assert(gEnv); assert(gEnv->pConsole); - // Register DLL names as cvars before we load them - // - EVarFlags dllFlags = (EVarFlags)0; - m_sys_dll_response_system = REGISTER_STRING("sys_dll_response_system", 0, dllFlags, "Specifies the DLL to load for the dynamic response system"); - - m_sys_initpreloadpacks = REGISTER_STRING("sys_initpreloadpacks", "", 0, "Specifies the paks for an engine initialization"); - m_sys_menupreloadpacks = REGISTER_STRING("sys_menupreloadpacks", 0, 0, "Specifies the paks for a main menu loading"); - -#ifndef _RELEASE - m_sys_resource_cache_folder = REGISTER_STRING("sys_resource_cache_folder", "Editor\\ResourceCache", 0, "Folder for resource compiled locally. Managed by Sandbox."); -#endif - #if AZ_LOADSCREENCOMPONENT_ENABLED m_game_load_screen_uicanvas_path = REGISTER_STRING("game_load_screen_uicanvas_path", "", 0, "Game load screen UiCanvas path."); m_level_load_screen_uicanvas_path = REGISTER_STRING("level_load_screen_uicanvas_path", "", 0, "Level load screen UiCanvas path."); @@ -1220,8 +1208,6 @@ void CSystem::CreateSystemVars() REGISTER_INT("cvDoVerboseWindowTitle", 0, VF_NULL, ""); - m_pCVarQuit = REGISTER_INT("ExitOnQuit", 1, VF_NULL, ""); - // Register an AZ Console command to quit the engine. // The command is available even in Release builds. static AZ::ConsoleFunctor s_functorQuit @@ -1242,52 +1228,14 @@ void CSystem::CreateSystemVars() REGISTER_STRING_CB("sys_version", "", VF_CHEAT, "Override system file/product version", SystemVersionChanged); #endif // #ifndef _RELEASE - m_cvAIUpdate = REGISTER_INT("ai_NoUpdate", 0, VF_CHEAT, "Disables AI system update when 1"); - - m_cvMemStats = REGISTER_INT("MemStats", 0, 0, - "0/x=refresh rate in milliseconds\n" - "Use 1000 to switch on and 0 to switch off\n" - "Usage: MemStats [0..]"); - m_cvMemStatsThreshold = REGISTER_INT ("MemStatsThreshold", 32000, VF_NULL, ""); - m_cvMemStatsMaxDepth = REGISTER_INT("MemStatsMaxDepth", 4, VF_NULL, ""); - - attachVariable("sys_PakReadSlice", &g_cvars.archiveVars.nReadSlice, "If non-0, means number of kilobytes to use to read files in portions. Should only be used on Win9x kernels"); - - attachVariable("sys_PakInMemorySizeLimit", &g_cvars.archiveVars.nInMemoryPerPakSizeLimit, "Individual pak size limit for being loaded into memory (MB)"); - attachVariable("sys_PakTotalInMemorySizeLimit", &g_cvars.archiveVars.nTotalInMemoryPakSizeLimit, "Total limit (in MB) for all in memory paks"); - attachVariable("sys_PakLoadCache", &g_cvars.archiveVars.nLoadCache, "Load in memory paks from _LoadCache folder"); - attachVariable("sys_PakLoadModePaks", &g_cvars.archiveVars.nLoadModePaks, "Load mode switching paks from modes folder"); - attachVariable("sys_PakStreamCache", &g_cvars.archiveVars.nStreamCache, "Load in memory paks for faster streaming (cgf_cache.pak,dds_cache.pak)"); - attachVariable("sys_PakSaveTotalResourceList", &g_cvars.archiveVars.nSaveTotalResourceList, "Save resource list"); attachVariable("sys_PakSaveLevelResourceList", &g_cvars.archiveVars.nSaveLevelResourceList, "Save resource list when loading level"); - attachVariable("sys_PakSaveFastLoadResourceList", &g_cvars.archiveVars.nSaveFastloadResourceList, "Save resource list during initial loading"); - attachVariable("sys_PakSaveMenuCommonResourceList", &g_cvars.archiveVars.nSaveMenuCommonResourceList, "Save resource list during front end menu flow"); - attachVariable("sys_PakMessageInvalidFileAccess", &g_cvars.archiveVars.nMessageInvalidFileAccess, "Message Box synchronous file access when in game"); attachVariable("sys_PakLogInvalidFileAccess", &g_cvars.archiveVars.nLogInvalidFileAccess, "Log synchronous file access when in game"); -#ifndef _RELEASE - attachVariable("sys_PakLogAllFileAccess", &g_cvars.archiveVars.nLogAllFileAccess, "Log all file access allowing you to easily see whether a file has been loaded directly, or which pak file."); -#endif - attachVariable("sys_PakValidateFileHash", &g_cvars.archiveVars.nValidateFileHashes, "Validate file hashes in pak files for collisions"); - attachVariable("sys_UncachedStreamReads", &g_cvars.archiveVars.nUncachedStreamReads, "Enable stream reads via an uncached file handle"); - attachVariable("sys_PakDisableNonLevelRelatedPaks", &g_cvars.archiveVars.nDisableNonLevelRelatedPaks, "Disables all paks that are not required by specific level; This is used with per level splitted assets."); - attachVariable("sys_PakWarnOnPakAccessFailures", &g_cvars.archiveVars.nWarnOnPakAccessFails, "If 1, access failure for Paks is treated as a warning, if zero it is only a log message."); - - static const int fileSystemCaseSensitivityDefault = 0; - REGISTER_CVAR2("sys_FilesystemCaseSensitivity", &g_cvars.sys_FilesystemCaseSensitivity, fileSystemCaseSensitivityDefault, VF_NULL, - "0 - CryPak lowercases all input file names\n" - "1 - CryPak preserves file name casing\n" - "Default is 1"); m_sysNoUpdate = REGISTER_INT("sys_noupdate", 0, VF_CHEAT, "Toggles updating of system with sys_script_debugger.\n" "Usage: sys_noupdate [0/1]\n" "Default is 0 (system updates during debug)."); - m_sysWarnings = REGISTER_INT("sys_warnings", 0, 0, - "Toggles printing system warnings.\n" - "Usage: sys_warnings [0/1]\n" - "Default is 0 (off)."); - #if defined(_RELEASE) && defined(CONSOLE) && !defined(ENABLE_LW_PROFILERS) enum { @@ -1299,10 +1247,6 @@ void CSystem::CreateSystemVars() e_sysKeyboardDefault = 1 }; #endif - m_sysKeyboard = REGISTER_INT("sys_keyboard", e_sysKeyboardDefault, 0, - "Enables keyboard.\n" - "Usage: sys_keyboard [0/1]\n" - "Default is 1 (on)."); m_svDedicatedMaxRate = REGISTER_FLOAT("sv_DedicatedMaxRate", 30.0f, 0, "Sets the maximum update rate when running as a dedicated server.\n" @@ -1318,55 +1262,14 @@ void CSystem::CreateSystemVars() "Usage: sv_DedicatedCPUVariance [5..50]\n" "Default is 10."); - m_cvSSInfo = REGISTER_INT("sys_SSInfo", 0, 0, - "Show SourceSafe information (Name,Comment,Date) for file errors." - "Usage: sys_SSInfo [0/1]\n" - "Default is 0 (off)"); - - m_cvEntitySuppressionLevel = REGISTER_INT("e_EntitySuppressionLevel", 0, 0, - "Defines the level at which entities are spawned.\n" - "Entities marked with lower level will not be spawned - 0 means no level.\n" - "Usage: e_EntitySuppressionLevel [0-infinity]\n" - "Default is 0 (off)"); - m_sys_firstlaunch = REGISTER_INT("sys_firstlaunch", 0, 0, "Indicates that the game was run for the first time."); - m_sys_main_CPU = REGISTER_INT("sys_main_CPU", 0, 0, - "Specifies the physical CPU index main will run on"); - - m_sys_TaskThread_CPU[0] = REGISTER_INT("sys_TaskThread0_CPU", 3, 0, - "Specifies the physical CPU index taskthread0 will run on"); - - m_sys_TaskThread_CPU[1] = REGISTER_INT("sys_TaskThread1_CPU", 5, 0, - "Specifies the physical CPU index taskthread1 will run on"); - - m_sys_TaskThread_CPU[2] = REGISTER_INT("sys_TaskThread2_CPU", 4, 0, - "Specifies the physical CPU index taskthread2 will run on"); - - m_sys_TaskThread_CPU[3] = REGISTER_INT("sys_TaskThread3_CPU", 3, 0, - "Specifies the physical CPU index taskthread3 will run on"); - - m_sys_TaskThread_CPU[4] = REGISTER_INT("sys_TaskThread4_CPU", 2, 0, - "Specifies the physical CPU index taskthread4 will run on"); - - m_sys_TaskThread_CPU[5] = REGISTER_INT("sys_TaskThread5_CPU", 1, 0, - "Specifies the physical CPU index taskthread5 will run on"); - #if defined(AZ_RESTRICTED_PLATFORM) #define AZ_RESTRICTED_SECTION SYSTEMINIT_CPP_SECTION_12 #include AZ_RESTRICTED_FILE(SystemInit_cpp) #endif - m_sys_min_step = REGISTER_FLOAT("sys_min_step", 0.01f, 0, - "Specifies the minimum physics step in a separate thread"); - m_sys_max_step = REGISTER_FLOAT("sys_max_step", 0.05f, 0, - "Specifies the maximum physics step in a separate thread"); - - // used in define MEMORY_DEBUG_POINT() - m_sys_memory_debug = REGISTER_INT("sys_memory_debug", 0, VF_CHEAT, - "Enables to activate low memory situation is specific places in the code (argument defines which place), 0=off"); - #if defined(AZ_RESTRICTED_PLATFORM) #define AZ_RESTRICTED_SECTION SYSTEMINIT_CPP_SECTION_17 #include AZ_RESTRICTED_FILE(SystemInit_cpp) @@ -1377,40 +1280,7 @@ void CSystem::CreateSystemVars() # define SYS_STREAMING_CPU_DEFAULT_VALUE 1 # define SYS_STREAMING_CPU_WORKER_DEFAULT_VALUE 5 #endif - REGISTER_CVAR2("sys_streaming_CPU", &g_cvars.sys_streaming_cpu, SYS_STREAMING_CPU_DEFAULT_VALUE, VF_NULL, "Specifies the physical CPU file IO thread run on"); - REGISTER_CVAR2("sys_streaming_CPU_worker", &g_cvars.sys_streaming_cpu_worker, SYS_STREAMING_CPU_WORKER_DEFAULT_VALUE, VF_NULL, "Specifies the physical CPU file IO worker thread/s run on"); - REGISTER_CVAR2("sys_streaming_memory_budget", &g_cvars.sys_streaming_memory_budget, 10 * 1024, VF_NULL, "Temp memory streaming system can use in KB"); - REGISTER_CVAR2("sys_streaming_max_finalize_per_frame", &g_cvars.sys_streaming_max_finalize_per_frame, 0, VF_NULL, - "Maximum stream finalizing calls per frame to reduce the CPU impact on main thread (0 to disable)"); - REGISTER_CVAR2("sys_streaming_max_bandwidth", &g_cvars.sys_streaming_max_bandwidth, 0, VF_NULL, "Enables capping of max streaming bandwidth in MB/s"); - REGISTER_CVAR2("sys_streaming_debug", &g_cvars.sys_streaming_debug, 0, VF_NULL, "Enable streaming debug information\n" - "0=off\n" - "1=Streaming Stats\n" - "2=File IO\n" - "3=Request Order\n" - "4=Write to Log\n" - "5=Stats per extension\n" - ); - REGISTER_CVAR2("sys_streaming_requests_grouping_time_period", &g_cvars.sys_streaming_requests_grouping_time_period, 2, VF_NULL, // Vlad: 2 works better than 4 visually, should be be re-tested when streaming pak's activated - "Streaming requests are grouped by request time and then sorted by disk offset"); - REGISTER_CVAR2("sys_streaming_debug_filter", &g_cvars.sys_streaming_debug_filter, 0, VF_NULL, "Set streaming debug information filter.\n" - "0=all\n" - "1=Texture\n" - "2=Geometry\n" - "3=Terrain\n" - "4=Animation\n" - "5=Music\n" - "6=Sound\n" - "7=Shader\n" - ); - g_cvars.sys_streaming_debug_filter_file_name = REGISTER_STRING("sys_streaming_debug_filter_file_name", "", VF_CHEAT, - "Set streaming debug information filter"); - REGISTER_CVAR2("sys_streaming_debug_filter_min_time", &g_cvars.sys_streaming_debug_filter_min_time, 0.f, VF_NULL, "Show only slow items."); - REGISTER_CVAR2("sys_streaming_resetstats", &g_cvars.sys_streaming_resetstats, 0, VF_NULL, - "Reset all the streaming stats"); #define DEFAULT_USE_OPTICAL_DRIVE_THREAD (gEnv->IsDedicated() ? 0 : 1) - REGISTER_CVAR2("sys_streaming_use_optical_drive_thread", &g_cvars.sys_streaming_use_optical_drive_thread, DEFAULT_USE_OPTICAL_DRIVE_THREAD, VF_NULL, - "Allow usage of an extra optical drive thread for faster streaming from 2 medias"); const char* localizeFolder = "Localization"; g_cvars.sys_localization_folder = REGISTER_STRING_CB("sys_localization_folder", localizeFolder, VF_NULL, @@ -1420,9 +1290,6 @@ void CSystem::CreateSystemVars() "Default: Localization\n", CSystem::OnLocalizationFolderCVarChanged); - REGISTER_CVAR2("sys_streaming_in_blocks", &g_cvars.sys_streaming_in_blocks, 1, VF_NULL, - "Streaming of large files happens in blocks"); - #if (defined(WIN32) || defined(WIN64)) && defined(_DEBUG) REGISTER_CVAR2("sys_float_exceptions", &g_cvars.sys_float_exceptions, 2, 0, "Use or not use floating point exceptions."); #else // Float exceptions by default disabled for console builds. @@ -1441,11 +1308,6 @@ void CSystem::CreateSystemVars() REGISTER_CVAR2("sys_WER", &g_cvars.sys_WER, 0, 0, "Enables Windows Error Reporting"); #endif -#ifdef USE_HTTP_WEBSOCKETS - REGISTER_CVAR2("sys_simple_http_base_port", &g_cvars.sys_simple_http_base_port, 1880, VF_REQUIRE_APP_RESTART, - "sets the base port for the simple http server to run on, defaults to 1880"); -#endif - const int DEFAULT_DUMP_TYPE = 2; REGISTER_CVAR2("sys_dump_type", &g_cvars.sys_dump_type, DEFAULT_DUMP_TYPE, VF_NULL, @@ -1457,8 +1319,6 @@ void CSystem::CreateSystemVars() ); REGISTER_CVAR2("sys_dump_aux_threads", &g_cvars.sys_dump_aux_threads, 1, VF_NULL, "Dumps callstacks of other threads in case of a crash"); - REGISTER_CVAR2("sys_limit_phys_thread_count", &g_cvars.sys_limit_phys_thread_count, 1, VF_NULL, "Limits p_num_threads to physical CPU count - 1"); - #if (defined(WIN32) || defined(WIN64)) && defined(_RELEASE) const int DEFAULT_SYS_MAX_FPS = 0; #else @@ -1470,11 +1330,8 @@ void CSystem::CreateSystemVars() REGISTER_CVAR2("sys_maxTimeStepForMovieSystem", &g_cvars.sys_maxTimeStepForMovieSystem, 0.1f, VF_NULL, "Caps the time step for the movie system so that a cut-scene won't be jumped in the case of an extreme stall."); - REGISTER_CVAR2("sys_force_installtohdd_mode", &g_cvars.sys_force_installtohdd_mode, 0, VF_NULL, "Forces install to HDD mode even when doing DVD emulation"); - REGISTER_CVAR2("sys_report_files_not_found_in_paks", &g_cvars.sys_report_files_not_found_in_paks, 0, VF_NULL, "Reports when files are searched for in paks and not found. 1 = log, 2 = warning, 3 = error"); - m_sys_preload = REGISTER_INT("sys_preload", 0, 0, "Preload Game Resources"); REGISTER_COMMAND("sys_crashtest", CmdCrashTest, VF_CHEAT, "Make the game crash\n" "0=off\n" "1=null pointer exception\n" @@ -1513,20 +1370,11 @@ void CSystem::CreateSystemVars() "To speed up loading from non HD media\n" "0=off / 1=enabled"); */ - REGISTER_CVAR2("sys_AI", &g_cvars.sys_ai, 1, 0, "Enables AI Update"); - REGISTER_CVAR2("sys_entities", &g_cvars.sys_entitysystem, 1, 0, "Enables Entities Update"); REGISTER_CVAR2("sys_trackview", &g_cvars.sys_trackview, 1, 0, "Enables TrackView Update"); //Defines selected language. REGISTER_STRING_CB("g_language", "", VF_NULL, "Defines which language pak is loaded", CSystem::OnLanguageCVarChanged); -#if defined(WIN32) - REGISTER_CVAR2("sys_display_threads", &g_cvars.sys_display_threads, 0, 0, "Displays Thread info"); -#elif defined(AZ_RESTRICTED_PLATFORM) -#define AZ_RESTRICTED_SECTION SYSTEMINIT_CPP_SECTION_13 -#include AZ_RESTRICTED_FILE(SystemInit_cpp) -#endif - // adding CVAR to toggle assert verbosity level const int defaultAssertValue = 1; REGISTER_CVAR2_CB("sys_asserts", &g_cvars.sys_asserts, defaultAssertValue, VF_CHEAT, diff --git a/Code/Legacy/CrySystem/SystemWin32.cpp b/Code/Legacy/CrySystem/SystemWin32.cpp index 2303ff286e..270cbbcb9f 100644 --- a/Code/Legacy/CrySystem/SystemWin32.cpp +++ b/Code/Legacy/CrySystem/SystemWin32.cpp @@ -383,45 +383,6 @@ void CSystem::debug_LogCallStack(int nMaxFuncs, [[maybe_unused]] int nFlags) } } -////////////////////////////////////////////////////////////////////////// -// Support relaunching for windows media center edition. -////////////////////////////////////////////////////////////////////////// -#if defined(WIN32) -#if (_WIN32_WINNT < 0x0501) -#define SM_MEDIACENTER 87 -#endif -bool CSystem::ReLaunchMediaCenter() -{ - // Skip if not running on a Media Center - if (GetSystemMetrics(SM_MEDIACENTER) == 0) - { - return false; - } - - // Get the path to Media Center - wchar_t szExpandedPath[AZ_MAX_PATH_LEN]; - if (!ExpandEnvironmentStringsW(L"%SystemRoot%\\ehome\\ehshell.exe", szExpandedPath, AZ_MAX_PATH_LEN)) - { - return false; - } - - // Skip if ehshell.exe doesn't exist - if (GetFileAttributesW(szExpandedPath) == 0xFFFFFFFF) - { - return false; - } - - // Launch ehshell.exe - INT_PTR result = (INT_PTR)ShellExecuteW(NULL, TEXT("open"), szExpandedPath, NULL, NULL, SW_SHOWNORMAL); - return (result > 32); -} -#else -bool CSystem::ReLaunchMediaCenter() -{ - return false; -} -#endif //defined(WIN32) - #if (defined(WIN32) || defined(WIN64)) ////////////////////////////////////////////////////////////////////////// bool CSystem::GetWinGameFolder(char* szMyDocumentsPath, int maxPathSize) diff --git a/Code/Legacy/CrySystem/XML/XMLBinaryNode.cpp b/Code/Legacy/CrySystem/XML/XMLBinaryNode.cpp index a13759e82b..14ca936472 100644 --- a/Code/Legacy/CrySystem/XML/XMLBinaryNode.cpp +++ b/Code/Legacy/CrySystem/XML/XMLBinaryNode.cpp @@ -11,20 +11,6 @@ #include "Cry_Color.h" #include "XMLBinaryNode.h" -////////////////////////////////////////////////////////////////////////// -CBinaryXmlData::CBinaryXmlData() - : pNodes(0) - , pAttributes(0) - , pChildIndices(0) - , pStringData(0) - , pFileContents(0) - , nFileSize(0) - , bOwnsFileContentsMemory(true) - , pBinaryNodes(0) - , nRefCount(0) -{ -} - ////////////////////////////////////////////////////////////////////////// CBinaryXmlData::~CBinaryXmlData() { @@ -32,10 +18,10 @@ CBinaryXmlData::~CBinaryXmlData() { delete [] pFileContents; } - pFileContents = 0; + pFileContents = nullptr; delete [] pBinaryNodes; - pBinaryNodes = 0; + pBinaryNodes = nullptr; } ////////////////////////////////////////////////////////////////////////// @@ -56,7 +42,7 @@ XmlNodeRef CBinaryXmlNode::getParent() const XmlNodeRef CBinaryXmlNode::createNode([[maybe_unused]] const char* tag) { assert(0); - return 0; + return nullptr; } ////////////////////////////////////////////////////////////////////////// @@ -93,7 +79,7 @@ bool CBinaryXmlNode::getAttr(const char* key, const char** value) const bool CBinaryXmlNode::haveAttr(const char* key) const { - return (GetValue(key) != 0); + return (GetValue(key) != nullptr); } ////////////////////////////////////////////////////////////////////////// @@ -113,7 +99,7 @@ bool CBinaryXmlNode::getAttr(const char* key, unsigned int& value) const const char* svalue = GetValue(key); if (svalue) { - value = strtoul(svalue, NULL, 10); + value = strtoul(svalue, nullptr, 10); return true; } return false; @@ -290,7 +276,7 @@ XmlNodeRef CBinaryXmlNode::findChild(const char* tag) const return m_pData->pBinaryNodes + m_pData->pChildIndices[i]; } } - return 0; + return nullptr; } //! Get XML Node child nodes. diff --git a/Code/Legacy/CrySystem/XML/XMLBinaryNode.h b/Code/Legacy/CrySystem/XML/XMLBinaryNode.h index b4706f1b85..09126b92f9 100644 --- a/Code/Legacy/CrySystem/XML/XMLBinaryNode.h +++ b/Code/Legacy/CrySystem/XML/XMLBinaryNode.h @@ -6,13 +6,8 @@ * */ - -#ifndef CRYINCLUDE_CRYSYSTEM_XML_XMLBINARYNODE_H -#define CRYINCLUDE_CRYSYSTEM_XML_XMLBINARYNODE_H #pragma once - -#include #include "IXml.h" #include "XMLBinaryHeaders.h" @@ -26,20 +21,20 @@ class CBinaryXmlNode; class CBinaryXmlData { public: - const XMLBinary::Node* pNodes; - const XMLBinary::Attribute* pAttributes; - const XMLBinary::NodeIndex* pChildIndices; - const char* pStringData; + const XMLBinary::Node* pNodes = nullptr; + const XMLBinary::Attribute* pAttributes = nullptr; + const XMLBinary::NodeIndex* pChildIndices = nullptr; + const char* pStringData = nullptr; - const char* pFileContents; - size_t nFileSize; - bool bOwnsFileContentsMemory; + const char* pFileContents = nullptr; + size_t nFileSize = 0; + bool bOwnsFileContentsMemory = true; - CBinaryXmlNode* pBinaryNodes; + CBinaryXmlNode* pBinaryNodes = nullptr; - int nRefCount; + int nRefCount = 0; - CBinaryXmlData(); + CBinaryXmlData() = default; ~CBinaryXmlData(); }; @@ -96,7 +91,6 @@ public: virtual bool getAttributeByIndex(int index, XmlString& key, XmlString& value); - void shareChildren([[maybe_unused]] const XmlNodeRef& fromNode) override { assert(0); }; void copyAttributes(XmlNodeRef fromNode) override { assert(0); }; //! Get XML Node attribute for specified key. @@ -110,8 +104,6 @@ public: bool haveAttr(const char* key) const override; XmlNodeRef newChild([[maybe_unused]] const char* tagName) override { assert(0); return 0; }; - void replaceChild([[maybe_unused]] int inChild, [[maybe_unused]] const XmlNodeRef& node) override { assert(0); }; - void insertChild([[maybe_unused]] int inChild, [[maybe_unused]] const XmlNodeRef& node) override { assert(0); }; void addChild([[maybe_unused]] const XmlNodeRef& node) override { assert(0); }; void removeChild([[maybe_unused]] const XmlNodeRef& node) override { assert(0); }; @@ -127,7 +119,6 @@ public: //! Find node with specified tag. XmlNodeRef findChild(const char* tag) const override; void deleteChild([[maybe_unused]] const char* tag) { assert(0); }; - void deleteChildAt([[maybe_unused]] int nIndex) override { assert(0); }; //! Get parent XML node. XmlNodeRef getParent() const override; @@ -136,10 +127,6 @@ public: const char* getContent() const override { return _string(_node()->nContentStringOffset); }; void setContent([[maybe_unused]] const char* str) override { assert(0); }; - XmlNodeRef clone() override { assert(0); return 0; }; - - //! Returns line number for XML tag. - int getLine() const override { return 0; }; //! Set line number in xml. void setLine([[maybe_unused]] int line) override { assert(0); }; @@ -225,5 +212,3 @@ private: friend class XMLBinary::XMLBinaryReader; }; - -#endif // CRYINCLUDE_CRYSYSTEM_XML_XMLBINARYNODE_H diff --git a/Code/Legacy/CrySystem/XML/XmlUtils.cpp b/Code/Legacy/CrySystem/XML/XmlUtils.cpp index 3e6a49f266..26d6f2336b 100644 --- a/Code/Legacy/CrySystem/XML/XmlUtils.cpp +++ b/Code/Legacy/CrySystem/XML/XmlUtils.cpp @@ -79,22 +79,16 @@ void GetMD5(const char* pSrcBuffer, int nSrcSize, char signatureMD5[16]) } ////////////////////////////////////////////////////////////////////////// -class CXmlSerializer - : public IXmlSerializer +class CXmlSerializer final : public IXmlSerializer { public: - CXmlSerializer() - : m_nRefCount(0) - , m_pReaderImpl(nullptr) - , m_pReaderSer(nullptr) - , m_pWriterSer(nullptr) - , m_pWriterImpl(nullptr) - { - } + CXmlSerializer() = default; + ~CXmlSerializer() { ClearAll(); } + void ClearAll() { SAFE_DELETE(m_pReaderSer); @@ -104,7 +98,11 @@ public: } ////////////////////////////////////////////////////////////////////////// - void AddRef() override { ++m_nRefCount; } + void AddRef() override + { + ++m_nRefCount; + } + void Release() override { if (--m_nRefCount <= 0) @@ -120,6 +118,7 @@ public: m_pWriterSer = new CSimpleSerializeWithDefaults(*m_pWriterImpl); return m_pWriterSer; } + ISerialize* GetReader(XmlNodeRef& node) override { ClearAll(); @@ -130,12 +129,12 @@ public: ////////////////////////////////////////////////////////////////////////// private: - int m_nRefCount; - CSerializeXMLReaderImpl* m_pReaderImpl; - CSimpleSerializeWithDefaults* m_pReaderSer; + int m_nRefCount = 0; + CSerializeXMLReaderImpl* m_pReaderImpl = nullptr; + CSimpleSerializeWithDefaults* m_pReaderSer = nullptr; - CSerializeXMLWriterImpl* m_pWriterImpl; - CSimpleSerializeWithDefaults* m_pWriterSer; + CSerializeXMLWriterImpl* m_pWriterImpl = nullptr; + CSimpleSerializeWithDefaults* m_pWriterSer = nullptr; }; ////////////////////////////////////////////////////////////////////////// @@ -145,8 +144,7 @@ IXmlSerializer* CXmlUtils::CreateXmlSerializer() } ////////////////////////////////////////////////////////////////////////// -class CXmlBinaryDataWriterFile - : public XMLBinary::IDataWriter +class CXmlBinaryDataWriterFile final : public XMLBinary::IDataWriter { public: CXmlBinaryDataWriterFile(const char* file) @@ -177,8 +175,7 @@ private: }; ////////////////////////////////////////////////////////////////////////// -class CXmlTableReader - : public IXmlTableReader +class CXmlTableReader final : public IXmlTableReader { public: CXmlTableReader(); diff --git a/Code/Legacy/CrySystem/XML/xml.cpp b/Code/Legacy/CrySystem/XML/xml.cpp index 65a2cb6ffd..95755d78fe 100644 --- a/Code/Legacy/CrySystem/XML/xml.cpp +++ b/Code/Legacy/CrySystem/XML/xml.cpp @@ -626,20 +626,6 @@ void CXmlNode::deleteChild(const char* tag) } } -////////////////////////////////////////////////////////////////////////// -void CXmlNode::deleteChildAt(int nIndex) -{ - if (m_pChilds) - { - XmlNodes& childs = *m_pChilds; - if (nIndex >= 0 && nIndex < (int)childs.size()) - { - ReleaseChild(childs[nIndex]); - childs.erase(childs.begin() + nIndex); - } - } -} - //! Adds new child node. void CXmlNode::addChild(const XmlNodeRef& node) { @@ -655,74 +641,12 @@ void CXmlNode::addChild(const XmlNodeRef& node) pNode->setParent(this); }; -void CXmlNode::shareChildren(const XmlNodeRef& inFromMe) -{ - int numChildren = inFromMe->getChildCount(); - - removeAllChilds(); - - if (numChildren > 0) - { - XmlNodeRef child; - - m_pChilds = new XmlNodes; - m_pChilds->reserve(numChildren); - for (int i = 0; i < numChildren; i++) - { - child = inFromMe->getChild(i); - - child->AddRef(); - // not overwriting parent assignment of child, we share the node but do not exclusively own it - m_pChilds->push_back(child); - } - } -} - void CXmlNode::setParent(const XmlNodeRef& inNewParent) { // note, parent ptrs are not ref counted m_parent = inNewParent; } -void CXmlNode::insertChild(int inIndex, const XmlNodeRef& inNewChild) -{ - assert(inIndex >= 0 && inIndex <= getChildCount()); - assert(inNewChild != 0); - if (inIndex >= 0 && inIndex <= getChildCount() && inNewChild) - { - if (getChildCount() == 0) - { - addChild(inNewChild); - } - else - { - IXmlNode* pNode = ((IXmlNode*)inNewChild); - pNode->AddRef(); - m_pChilds->insert(m_pChilds->begin() + inIndex, pNode); - pNode->setParent(this); - } - } -} - -void CXmlNode::replaceChild(int inIndex, const XmlNodeRef& inNewChild) -{ - assert(inIndex >= 0 && inIndex < getChildCount()); - assert(inNewChild != 0); - if (inIndex >= 0 && inIndex < getChildCount() && inNewChild) - { - IXmlNode* wasChild = (*m_pChilds)[inIndex]; - - if (wasChild->getParent() == this) - { - wasChild->setParent(XmlNodeRef()); // child is orphaned, will be freed by Release() below if this parent is last holding a reference to it - } - wasChild->Release(); - inNewChild->AddRef(); - (*m_pChilds)[inIndex] = inNewChild; - inNewChild->setParent(this); - } -} - XmlNodeRef CXmlNode::newChild(const char* tagName) { XmlNodeRef node = createNode(tagName); @@ -817,34 +741,6 @@ bool CXmlNode::getAttributeByIndex(int index, XmlString& key, XmlString& value) } return false; } -////////////////////////////////////////////////////////////////////////// -XmlNodeRef CXmlNode::clone() -{ - CXmlNode* node = new CXmlNode; - XmlNodeRef result(node); - node->m_pStringPool = m_pStringPool; - m_pStringPool->AddRef(); - node->m_tag = m_tag; - node->m_content = m_content; - // Clone attributes. - CXmlNode* n = (CXmlNode*)(IXmlNode*)node; - n->copyAttributes(this); - // Clone sub nodes. - - if (m_pChilds) - { - const XmlNodes& childs = *m_pChilds; - - node->m_pChilds = new XmlNodes; - node->m_pChilds->reserve(childs.size()); - for (int i = 0, num = static_cast(childs.size()); i < num; ++i) - { - node->addChild(childs[i]->clone()); - } - } - - return result; -} ////////////////////////////////////////////////////////////////////////// static void AddTabsToString(XmlString& xml, int level) @@ -1206,16 +1102,6 @@ XmlString CXmlNode::getXML(int level) const return xml; } -XmlString CXmlNode::getXMLUnsafe(int level, char* tmpBuffer, uint32 sizeOfTmpBuffer) const -{ - char* endPtr = tmpBuffer + sizeOfTmpBuffer - 1; - char* endOfBuffer = AddToXmlStringUnsafe(tmpBuffer, level, endPtr); - endOfBuffer[0] = '\0'; - XmlString ret(tmpBuffer); - return ret; -} - - // TODO: those 2 saving functions are a bit messy. should probably make a separate one for the use of PlatformAPI bool CXmlNode::saveToFile(const char* fileName) { @@ -1247,9 +1133,7 @@ bool CXmlNode::saveToFile(const char* fileName) bool CXmlNode::saveToFile([[maybe_unused]] const char* fileName, size_t chunkSize, AZ::IO::HandleType fileHandle) { -#ifdef WIN32 - CrySetFileAttributes(fileName, 0x00000080); // FILE_ATTRIBUTE_NORMAL -#endif //WIN32 + CrySetFileAttributes(fileName, FILE_ATTRIBUTE_NORMAL); if (chunkSize < 256 * 1024) // make at least 256k { diff --git a/Code/Legacy/CrySystem/XML/xml.h b/Code/Legacy/CrySystem/XML/xml.h index 0605142b9f..039ca0b92f 100644 --- a/Code/Legacy/CrySystem/XML/xml.h +++ b/Code/Legacy/CrySystem/XML/xml.h @@ -46,14 +46,14 @@ class XmlParser { public: explicit XmlParser(bool bReuseStrings); - ~XmlParser(); + ~XmlParser() override; - void AddRef() + void AddRef() override { ++m_nRefCount; } - void Release() + void Release() override { if (--m_nRefCount <= 0) { @@ -61,9 +61,9 @@ public: } } - virtual XmlNodeRef ParseFile(const char* filename, bool bCleanPools); + XmlNodeRef ParseFile(const char* filename, bool bCleanPools) override; - virtual XmlNodeRef ParseBuffer(const char* buffer, int nBufLen, bool bCleanPools, bool bSuppressWarnings = false); + XmlNodeRef ParseBuffer(const char* buffer, int nBufLen, bool bCleanPools, bool bSuppressWarnings = false) override; const char* getErrorString() const { return m_errorString; } @@ -112,7 +112,7 @@ public: CXmlNode(); CXmlNode(const char* tag, bool bReuseStrings, bool bIsProcessingInstruction = false); //! Destructor. - ~CXmlNode(); + ~CXmlNode() override; ////////////////////////////////////////////////////////////////////////// // Custom new/delete with pool allocator. @@ -120,125 +120,118 @@ public: //void* operator new( size_t nSize ); //void operator delete( void *ptr ); - virtual void DeleteThis(); + void DeleteThis() override; //! Create new XML node. - XmlNodeRef createNode(const char* tag); + XmlNodeRef createNode(const char* tag) override; //! Get XML node tag. - const char* getTag() const { return m_tag; }; - void setTag(const char* tag); + const char* getTag() const override + { return m_tag; }; + void setTag(const char* tag) override; //! Return true if given tag equal to node tag. - bool isTag(const char* tag) const; + bool isTag(const char* tag) const override; //! Get XML Node attributes. - virtual int getNumAttributes() const { return m_pAttributes ? (int)m_pAttributes->size() : 0; }; + int getNumAttributes() const override + { return m_pAttributes ? (int)m_pAttributes->size() : 0; }; //! Return attribute key and value by attribute index. - virtual bool getAttributeByIndex(int index, const char** key, const char** value); + bool getAttributeByIndex(int index, const char** key, const char** value) override; //! Return attribute key and value by attribute index, string version. virtual bool getAttributeByIndex(int index, XmlString& key, XmlString& value); - - virtual void copyAttributes(XmlNodeRef fromNode); - virtual void shareChildren(const XmlNodeRef& fromNode); + void copyAttributes(XmlNodeRef fromNode) override; //! Get XML Node attribute for specified key. - const char* getAttr(const char* key) const; + const char* getAttr(const char* key) const override; //! Get XML Node attribute for specified key. // Returns true if the attribute existes, alse otherwise. - bool getAttr(const char* key, const char** value) const; + bool getAttr(const char* key, const char** value) const override; //! Check if attributes with specified key exist. - bool haveAttr(const char* key) const; + bool haveAttr(const char* key) const override; //! Creates new xml node and add it to childs list. - XmlNodeRef newChild(const char* tagName); + XmlNodeRef newChild(const char* tagName) override; //! Adds new child node. - void addChild(const XmlNodeRef& node); + void addChild(const XmlNodeRef& node) override; //! Remove child node. - void removeChild(const XmlNodeRef& node); - - void insertChild(int nIndex, const XmlNodeRef& node); - void replaceChild(int nIndex, const XmlNodeRef& node); + void removeChild(const XmlNodeRef& node) override; //! Remove all child nodes. - void removeAllChilds(); + void removeAllChilds() override; //! Get number of child XML nodes. - int getChildCount() const { return m_pChilds ? (int)m_pChilds->size() : 0; }; + int getChildCount() const override { return m_pChilds ? (int)m_pChilds->size() : 0; } //! Get XML Node child nodes. - XmlNodeRef getChild(int i) const; + XmlNodeRef getChild(int i) const override; //! Find node with specified tag. - XmlNodeRef findChild(const char* tag) const; + XmlNodeRef findChild(const char* tag) const override; void deleteChild(const char* tag); - void deleteChildAt(int nIndex); //! Get parent XML node. - XmlNodeRef getParent() const { return m_parent; } - void setParent(const XmlNodeRef& inRef); + XmlNodeRef getParent() const override { return m_parent; } + void setParent(const XmlNodeRef& inRef) override; //! Returns content of this node. - const char* getContent() const { return m_content; }; - void setContent(const char* str); + const char* getContent() const override + { return m_content; }; + void setContent(const char* str) override; - XmlNodeRef clone(); - - //! Returns line number for XML tag. - int getLine() const { return m_line; }; //! Set line number in xml. - void setLine(int line) { m_line = line; }; + void setLine(int line) override { m_line = line; } //! Returns XML of this node and sub nodes. - virtual IXmlStringData* getXMLData(int nReserveMem = 0) const; - XmlString getXML(int level = 0) const; - XmlString getXMLUnsafe(int level, char* tmpBuffer, uint32 sizeOfTmpBuffer) const; - bool saveToFile(const char* fileName); // saves in one huge chunk - bool saveToFile(const char* fileName, size_t chunkSizeBytes, AZ::IO::HandleType fileHandle = AZ::IO::InvalidHandle); // save in small memory chunks + IXmlStringData* getXMLData(int nReserveMem = 0) const override; + XmlString getXML(int level = 0) const override; + bool saveToFile(const char* fileName) override; // saves in one huge chunk + bool saveToFile(const char* fileName, size_t chunkSizeBytes, AZ::IO::HandleType fileHandle = AZ::IO::InvalidHandle) override; // save in small memory chunks //! Set new XML Node attribute (or override attribute with same key). using IXmlNode::setAttr; - void setAttr(const char* key, const char* value); - void setAttr(const char* key, int value); - void setAttr(const char* key, unsigned int value); - void setAttr(const char* key, int64 value); - void setAttr(const char* key, uint64 value, bool useHexFormat = true); - void setAttr(const char* key, float value); - void setAttr(const char* key, double value); - void setAttr(const char* key, const Vec2& value); - void setAttr(const char* key, const Ang3& value); - void setAttr(const char* key, const Vec3& value); - void setAttr(const char* key, const Vec4& value); - void setAttr(const char* key, const Quat& value); + void setAttr(const char* key, const char* value) override; + void setAttr(const char* key, int value) override; + void setAttr(const char* key, unsigned int value) override; + void setAttr(const char* key, int64 value) override; + void setAttr(const char* key, uint64 value, bool useHexFormat = true) override; + void setAttr(const char* key, float value) override; + void setAttr(const char* key, double value) override; + void setAttr(const char* key, const Vec2& value) override; + void setAttr(const char* key, const Ang3& value) override; + void setAttr(const char* key, const Vec3& value) override; + void setAttr(const char* key, const Vec4& value) override; + void setAttr(const char* key, const Quat& value) override; //! Delete attrbute. - void delAttr(const char* key); + void delAttr(const char* key) override; //! Remove all node attributes. - void removeAllAttributes(); + void removeAllAttributes() override; //! Get attribute value of node. - bool getAttr(const char* key, int& value) const; - bool getAttr(const char* key, unsigned int& value) const; - bool getAttr(const char* key, int64& value) const; - bool getAttr(const char* key, uint64& value, bool useHexFormat = true /*ignored*/) const; - bool getAttr(const char* key, float& value) const; - bool getAttr(const char* key, double& value) const; - bool getAttr(const char* key, bool& value) const; + bool getAttr(const char* key, int& value) const override; + bool getAttr(const char* key, unsigned int& value) const override; + bool getAttr(const char* key, int64& value) const override; + bool getAttr(const char* key, uint64& value, bool useHexFormat = true /*ignored*/) const override; + bool getAttr(const char* key, float& value) const override; + bool getAttr(const char* key, double& value) const override; + bool getAttr(const char* key, bool& value) const override; - bool getAttr(const char* key, XmlString& value) const {const char* v(NULL); bool boHasAttribute(getAttr(key, &v)); value = v; return boHasAttribute; } + bool getAttr(const char* key, XmlString& value) const override + {const char* v(NULL); bool boHasAttribute(getAttr(key, &v)); value = v; return boHasAttribute; } - bool getAttr(const char* key, Vec2& value) const; - bool getAttr(const char* key, Ang3& value) const; - bool getAttr(const char* key, Vec3& value) const; - bool getAttr(const char* key, Vec4& value) const; - bool getAttr(const char* key, Quat& value) const; - bool getAttr(const char* key, ColorB& value) const; + bool getAttr(const char* key, Vec2& value) const override; + bool getAttr(const char* key, Ang3& value) const override; + bool getAttr(const char* key, Vec3& value) const override; + bool getAttr(const char* key, Vec4& value) const override; + bool getAttr(const char* key, Quat& value) const override; + bool getAttr(const char* key, ColorB& value) const override; protected: @@ -356,7 +349,7 @@ class CXmlNodeReuse { public: CXmlNodeReuse(const char* tag, CXmlNodePool* pPool); - virtual void Release(); + void Release() override; protected: CXmlNodePool* m_pPool; diff --git a/Gems/Atom/Utils/Code/Tests/PngFileTests.cpp b/Gems/Atom/Utils/Code/Tests/PngFileTests.cpp index 1c5b844204..b60939b39b 100644 --- a/Gems/Atom/Utils/Code/Tests/PngFileTests.cpp +++ b/Gems/Atom/Utils/Code/Tests/PngFileTests.cpp @@ -31,7 +31,8 @@ namespace UnitTest { AllocatorsFixture::SetUp(); - m_testImageFolder = AZ::IO::Path(AZ::Test::GetEngineRootPath()) / AZ::IO::Path("Gems/Atom/Utils/Code/Tests/PngTestImages", '/'); + m_testImageFolder = + AZ::IO::Path(AZ::Test::GetEngineRootPath(), '/') / AZ::IO::Path("Gems/Atom/Utils/Code/Tests/PngTestImages"); m_tempPngFilePath = m_testImageFolder / "temp.png"; diff --git a/Gems/AudioSystem/Code/Source/Editor/AudioControlsEditorUndo.h b/Gems/AudioSystem/Code/Source/Editor/AudioControlsEditorUndo.h index 86ea2f1807..dc64a392a5 100644 --- a/Gems/AudioSystem/Code/Source/Editor/AudioControlsEditorUndo.h +++ b/Gems/AudioSystem/Code/Source/Editor/AudioControlsEditorUndo.h @@ -49,7 +49,6 @@ namespace AudioControls explicit CUndoControlAdd(CID id); protected: int GetSize() override { return sizeof(*this); } - QString GetDescription() override { return "Undo ATL Control Add"; } void Undo(bool bUndo) override; void Redo() override; @@ -63,7 +62,6 @@ namespace AudioControls explicit CUndoControlRemove(AZStd::shared_ptr& pControl); protected: int GetSize() override { return sizeof(*this); } - QString GetDescription() override { return "Undo ATL Control Remove"; } void Undo(bool bUndo) override; void Redo() override; @@ -90,7 +88,6 @@ namespace AudioControls explicit CUndoFolderRemove(QStandardItem* pItem); protected: int GetSize() override { return sizeof(*this); } - QString GetDescription() override { return "Undo ATL Folder Remove"; } void Undo(bool bUndo) override; void Redo() override; @@ -104,7 +101,6 @@ namespace AudioControls explicit CUndoFolderAdd(QStandardItem* pItem); protected: int GetSize() override { return sizeof(*this); } - QString GetDescription() override { return "Undo ATL Folder Add"; } void Undo(bool bUndo) override; void Redo() override; @@ -118,7 +114,6 @@ namespace AudioControls explicit CUndoControlModified(CID id); protected: int GetSize() override { return sizeof(*this); } - QString GetDescription() override { return "Undo ATL Control Modify"; } void SwapData(); void Undo(bool bUndo) override; @@ -140,7 +135,6 @@ namespace AudioControls protected: int GetSize() override { return sizeof(*this); } - QString GetDescription() override { return "Undo ATL Control Move"; } void Undo(bool bUndo) override; void Redo() override; diff --git a/Gems/ImGui/Code/Source/LYCommonMenu/ImGuiLYAssetExplorer.cpp b/Gems/ImGui/Code/Source/LYCommonMenu/ImGuiLYAssetExplorer.cpp index 6a4d4bc6f9..0d8a3e0edd 100644 --- a/Gems/ImGui/Code/Source/LYCommonMenu/ImGuiLYAssetExplorer.cpp +++ b/Gems/ImGui/Code/Source/LYCommonMenu/ImGuiLYAssetExplorer.cpp @@ -15,7 +15,6 @@ #include #include #include -#include #include #include @@ -137,7 +136,7 @@ namespace ImGui void ImGuiLYAssetExplorer::MeshInstanceList_CheckEntityFilter() { - // Iterate through All Meshes.. + // Iterate through All Meshes.. for (MeshInstanceDisplayList& meshInstanceList : m_meshInstanceDisplayList) { // .. reset this flag to see if any child instances pass the name filter @@ -159,7 +158,7 @@ namespace ImGui // Primary on / off Switch ImGui::Checkbox("Mesh Debug Enabled", &m_meshDebugEnabled); ImGui::SameLine(); - + // Lod Debug Switch, check for changes so we can do things once at change time bool lodDebug = m_lodDebugEnabled; ImGui::Checkbox("LOD Debug", &lodDebug); @@ -176,12 +175,12 @@ namespace ImGui } } - // If the Lod Debug is Enabled. Draw a small legend that + // If the Lod Debug is Enabled. Draw a small legend that if (m_lodDebugEnabled) { ImGui::BeginChild("lodDebugLegend", ImVec2(0.0f, 57.0f), true); - // Text for legend. + // Text for legend. ImGui::TextColored(ImGui::Colors::s_NiceLabelColor, "Lod Color Legend:"); ImGui::SameLine(); ImGui::TextColored(s_lodColor_0, "0 "); @@ -195,7 +194,7 @@ namespace ImGui ImGui::TextColored(s_lodColor_4, "4 "); ImGui::SameLine(); ImGui::TextColored(s_lodColor_5, "5 "); - + // Small boxes of each color to help with the legend static float s_boxSize = 21.0f; ImVec2 graphUpLeft(ImGui::GetWindowPos().x + 127.5f, ImGui::GetWindowPos().y + 26.0f); @@ -228,7 +227,7 @@ namespace ImGui ImVec2(graphUpLeft.x + (5 * s_boxSize), graphUpLeft.y), ImVec2(graphUpLeft.x + (6 * s_boxSize), graphUpLeft.y + s_boxSize), ImGui::ColorConvertFloat4ToU32(s_lodColor_5), 2.0f); - + ImGui::EndChild(); } @@ -381,7 +380,7 @@ namespace ImGui ImGui::TextColored(ImGui::Colors::s_NiceLabelColor, " * Mesh Selection overrides Entity Selection."); ImGui::EndTooltip(); } - + ImGui::TextColored(ImGui::IsWindowHovered() ? ImGui::Colors::s_NiceLabelColor : ImGui::Colors::s_PlainLabelColor, "Mouse Over For Legend and Tips"); ImGui::EndChild(); // MouseHover Child ImGui::NextColumn(); @@ -404,7 +403,7 @@ namespace ImGui // Before we draw all these meshes, lets mark this frame as no Mouse Over being drawn.. if any are drawn, they will set this flag m_anyMousedOverForDraw = false; - + if (m_selectionFilter) { ImGui::Columns(2); @@ -443,8 +442,8 @@ namespace ImGui // Keep Count of our Mesh instances and loop through them drawing them! int instanceCount = 0; for (auto& meshInstance : meshInstanceList.m_instanceOptionMap) - { - // See if we should + { + // See if we should bool displayEntity = true; if (m_entityNameFilter) { @@ -471,11 +470,11 @@ namespace ImGui ImGui::SameLine(); ImGui::TextColored(ImGui::Colors::s_PlainLabelColor, "(% .02f, % .02f, % .02f)", (float)worldPos.GetX(), (float)worldPos.GetY(), (float)worldPos.GetZ()); ImGui::EndGroup(); - + // Check for and Draw Entity Instance Mouse Over meshInstance.second.m_mousedOverForDraw = false; ImGuiUpdate_DrawEntityInstanceMouseOver(meshInstanceList, meshInstance.first, entityName, meshInstance.second); - + if (m_selectionFilter) { @@ -489,7 +488,7 @@ namespace ImGui ImGui::TreePop(); // End Mesh Tree } - else + else { ImGuiUpdate_DrawMeshMouseOver(meshInstanceList); @@ -558,7 +557,7 @@ namespace ImGui ImGui::TextColored(ImGui::Colors::s_NiceLabelColor, "Entity: "); ImGui::SameLine(); ImGui::TextColored(ImGui::Colors::s_PlainLabelColor, "%s %s", entityInstance.ToString().c_str(), entityName.c_str()); - + ImGui::TextColored(ImGui::Colors::s_NiceLabelColor, "Mesh: "); ImGui::SameLine(); ImGui::TextColored(ImGui::Colors::s_PlainLabelColor, "%s", meshDisplayList.m_meshPath.c_str()); @@ -589,7 +588,7 @@ namespace ImGui } } - // Not found, so create a new entry.. + // Not found, so create a new entry.. MeshInstanceDisplayList meshList; meshList.m_meshPath = meshName; meshList.m_passesFilter = true; diff --git a/Gems/LmbrCentral/Code/include/LmbrCentral/Rendering/MeshAsset.h b/Gems/LmbrCentral/Code/include/LmbrCentral/Rendering/MeshAsset.h index 66e992890e..b4cefa8502 100644 --- a/Gems/LmbrCentral/Code/include/LmbrCentral/Rendering/MeshAsset.h +++ b/Gems/LmbrCentral/Code/include/LmbrCentral/Rendering/MeshAsset.h @@ -10,7 +10,6 @@ #include #include -#include namespace LmbrCentral { @@ -18,13 +17,8 @@ namespace LmbrCentral : public AZ::Data::AssetData { public: - using MeshPtr = IStatObj*; - AZ_RTTI(MeshAsset, "{C2869E3B-DDA0-4E01-8FE3-6770D788866B}", AZ::Data::AssetData); AZ_CLASS_ALLOCATOR(MeshAsset, AZ::SystemAllocator, 0); - - /// The assigned static mesh instance. - MeshPtr m_statObj = nullptr; }; // for "character definition files" diff --git a/Gems/LmbrCentral/Code/include/LmbrCentral/Rendering/RenderNodeBus.h b/Gems/LmbrCentral/Code/include/LmbrCentral/Rendering/RenderNodeBus.h deleted file mode 100644 index 0b8ec56a0f..0000000000 --- a/Gems/LmbrCentral/Code/include/LmbrCentral/Rendering/RenderNodeBus.h +++ /dev/null @@ -1,45 +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 - -struct IRenderNode; - -namespace LmbrCentral -{ - /*! - * Messages services by anything that adds an IRenderNode to an Entity. - */ - class RenderNodeRequests - : public AZ::EBusTraits - { - public: - ////////////////////////////////////////////////////////////////////////// - // EBusTraits overrides - // Any number of handlers per EntityId, called in order. - using BusIdType = AZ::EntityId; - static const AZ::EBusAddressPolicy AddressPolicy = AZ::EBusAddressPolicy::ById; - static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::MultipleAndOrdered; - bool Compare(const RenderNodeRequests* rhs) const - { - return GetRenderNodeRequestBusOrder() < rhs->GetRenderNodeRequestBusOrder(); - } - ////////////////////////////////////////////////////////////////////////// - - virtual IRenderNode* GetRenderNode() = 0; - - //! Order in which each bus handler is invoked, lower numbers are first. - //! In situations where only one render node is expected, - //! the first bus handler is used. - virtual float GetRenderNodeRequestBusOrder() const = 0; - }; - - using RenderNodeRequestBus = AZ::EBus; -} // namespace LmbrCentral diff --git a/Gems/LmbrCentral/Code/lmbrcentral_files.cmake b/Gems/LmbrCentral/Code/lmbrcentral_files.cmake index 20a366b5f7..9d551f5e1f 100644 --- a/Gems/LmbrCentral/Code/lmbrcentral_files.cmake +++ b/Gems/LmbrCentral/Code/lmbrcentral_files.cmake @@ -36,7 +36,6 @@ set(FILES include/LmbrCentral/Rendering/MaterialHandle.h include/LmbrCentral/Rendering/MeshAsset.h include/LmbrCentral/Rendering/MeshModificationBus.h - include/LmbrCentral/Rendering/RenderNodeBus.h include/LmbrCentral/Rendering/GiRegistrationBus.h include/LmbrCentral/Rendering/RenderBoundsBus.h include/LmbrCentral/Scripting/EditorTagComponentBus.h diff --git a/Gems/LyShine/Code/Source/World/UiCanvasOnMeshComponent.cpp b/Gems/LyShine/Code/Source/World/UiCanvasOnMeshComponent.cpp index 395e0dfc32..bde9a9ec8c 100644 --- a/Gems/LyShine/Code/Source/World/UiCanvasOnMeshComponent.cpp +++ b/Gems/LyShine/Code/Source/World/UiCanvasOnMeshComponent.cpp @@ -9,14 +9,11 @@ #include #include #include -#include #include #include #include #include -#include -#include #if !defined(_RELEASE) #include diff --git a/Gems/Vegetation/Code/Source/AreaSystemComponent.cpp b/Gems/Vegetation/Code/Source/AreaSystemComponent.cpp index 6684aef913..e497fcec12 100644 --- a/Gems/Vegetation/Code/Source/AreaSystemComponent.cpp +++ b/Gems/Vegetation/Code/Source/AreaSystemComponent.cpp @@ -356,7 +356,6 @@ namespace Vegetation AreaSystemRequestBus::Handler::BusConnect(); GradientSignal::SectorDataRequestBus::Handler::BusConnect(); SystemConfigurationRequestBus::Handler::BusConnect(); - InstanceStatObjEventBus::Handler::BusConnect(); CrySystemEventBus::Handler::BusConnect(); AzFramework::Terrain::TerrainDataNotificationBus::Handler::BusConnect(); SurfaceData::SurfaceDataSystemNotificationBus::Handler::BusConnect(); @@ -378,7 +377,6 @@ namespace Vegetation AreaSystemRequestBus::Handler::BusDisconnect(); GradientSignal::SectorDataRequestBus::Handler::BusDisconnect(); SystemConfigurationRequestBus::Handler::BusDisconnect(); - InstanceStatObjEventBus::Handler::BusDisconnect(); CrySystemEventBus::Handler::BusDisconnect(); AzFramework::Terrain::TerrainDataNotificationBus::Handler::BusDisconnect(); SurfaceData::SurfaceDataSystemNotificationBus::Handler::BusDisconnect(); diff --git a/Gems/Vegetation/Code/Source/AreaSystemComponent.h b/Gems/Vegetation/Code/Source/AreaSystemComponent.h index 703a44c70a..c45bdac887 100644 --- a/Gems/Vegetation/Code/Source/AreaSystemComponent.h +++ b/Gems/Vegetation/Code/Source/AreaSystemComponent.h @@ -18,7 +18,6 @@ #include #include #include -#include #include #include @@ -81,7 +80,6 @@ namespace Vegetation , private AreaSystemRequestBus::Handler , private GradientSignal::SectorDataRequestBus::Handler , private SystemConfigurationRequestBus::Handler - , private InstanceStatObjEventBus::Handler , private CrySystemEventBus::Handler , private ISystemEventListener , private SurfaceData::SurfaceDataSystemNotificationBus::Handler @@ -138,9 +136,6 @@ namespace Vegetation // SurfaceData::SurfaceDataSystemNotificationBus void OnSurfaceChanged(const AZ::EntityId& entityId, const AZ::Aabb& oldBounds, const AZ::Aabb& newBounds) override; - ////////////////////////////////////////////////////////////////////////// - // InstanceStatObjEventBus - void ReleaseData() override; //////////////////////////////////////////////////////////////////////////// // CrySystemEvents @@ -460,6 +455,7 @@ namespace Vegetation bool ApplyPendingConfigChanges(); + void ReleaseData(); void ReleaseAllClaims(); void ReleaseWithoutCleanup(); diff --git a/Gems/Vegetation/Code/Tests/VegetationMocks.h b/Gems/Vegetation/Code/Tests/VegetationMocks.h index ec3760057c..4c526447d3 100644 --- a/Gems/Vegetation/Code/Tests/VegetationMocks.h +++ b/Gems/Vegetation/Code/Tests/VegetationMocks.h @@ -31,7 +31,6 @@ #include #include #include -#include ////////////////////////////////////////////////////////////////////////// // mock event bus classes for testing vegetation diff --git a/RETIRED_CODE.md b/RETIRED_CODE.md new file mode 100644 index 0000000000..56a9df4fd1 --- /dev/null +++ b/RETIRED_CODE.md @@ -0,0 +1,33 @@ +## This is a list of functionality that was removed at some point. + +The main goal of this list, is to enable future developers to find old code that might be useful when implementing new,or re-implementing missing features. + +|Date | Commit hash | Short description of removed functionality| +|--|--|--| +| 2021-11-25 | | ObjectManager - parameter begin/end editing callbacks| +| 2021-11-25 | | ObjectManager - `InvertSelection()`| +| 2021-11-25 | | ObjectManager - unused named selection group support| +| 2021-11-25 | | ObjectManager - unused xml export functionality| +| 2021-11-25 | | ObjectManager - unused object hiding and freezing functionality| +| 2021-11-25 | | ObjectManager - unused object renaming and duplicate name detection| +| 2021-11-25 | | ObjectManager - unused selection callbacks and serialization| +| 2021-11-26 | | ObjectManager - unused selection support, MoveObjects/HitTestObject/EndEditParams| +| 2021-11-26 | | Unused code - CloneObject,SelectEntities,EnableUniqueObjectNames,NotifyObjectListeners,CloneChildren, PostClone| +| 2021-11-26 | | Unused code - GetClassCategories/SetCreateGameObject/FindAndRenameProperty2/IsExporting/IsReloading/StartObjectLoading| +| 2021-11-26 | | ObjectManager - unused code - ForceID/ConvertToType/SetSkipUpdate/LoadRegistry/UpdateRegisterObjectName/HitTestObjectAgainstRect/SelectObjectInRect| +| 2021-11-26 | | ObjectManager - unused GetObjects/SelectObjects, ObjectLoader - LoadObjects| +| 2021-11-26 | | CBaseObject - unused material layers mask support| +| 2021-11-26 | | CBaseObject - GetWarningsText/HideOrder, unused scaling functions,IsChildOf and GetLinkParent| +| 2021-11-26 | | CBaseObject - SubObj selection, IsParentAttachmentValid, IMouseCreateCallback,GetWorldAngles| +| 2021-11-26 | | CBaseObject - procedural floor management, EditTags, HelperScale| +| 2021-11-26 | | CBaseObject - PropertyChanged,SetNameInternal,OnMenuShowInAssetBrowser| +| 2021-11-26 | | CObjectArchive - unused sequence remapping, loaded object access | +| 2021-11-26 | | IDisplayViewport - unused interface `HitTestLine/GetGridStep/setHitcontext`| +| 2021-11-27 | | CBaseObject and children - unused HitHelperTest/MouseCreateCallback| +| 2021-11-28 | | CBaseObject - unused OnContextMenu and unused undo description strings. | +| 2021-11-28 | | Editor KDTree implementation | +| 2021-11-28 | | CExportManager - unused AddStatObj/AddMeshes/AddMesh| +| 2021-11-28 | | unused CUndoBaseLibraryManager and CUndoBaseLibrary| +| 2021-11-28 | | IXmlNode - unused shareChildren/deleteChildAt/clone/insertChild/replaceChild functionality| +| 2021-11-28 | | CXmlArchive - unused Load/Save methods| + From 13361b220e8a3499ee91377753f27cd1394fae13 Mon Sep 17 00:00:00 2001 From: lsemp3d <58790905+lsemp3d@users.noreply.github.com> Date: Mon, 29 Nov 2021 10:40:07 -0800 Subject: [PATCH 23/58] Updated GameLift names, improved Getter/Setter generation Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com> --- .../AWSGameLiftAcceptMatchRequest.names | 147 ++++++++ ...SGameLiftCreateSessionOnQueueRequest.names | 275 +++++++++++++++ .../AWSGameLiftCreateSessionRequest.names | 317 ++++++++++++++++++ .../AWSGameLiftJoinSessionRequest.names | 147 ++++++++ .../Classes/AWSGameLiftPlayer.names | 183 ++++++++++ .../AWSGameLiftSearchSessionsRequest.names | 317 ++++++++++++++++++ .../AWSGameLiftStartMatchmakingRequest.names | 143 ++++++++ .../AWSGameLiftStopMatchmakingRequest.names | 59 ++++ .../GeneralNodePaletteTreeItemTypes.h | 8 +- .../ScriptCanvasNodePaletteDockWidget.cpp | 2 +- .../Code/Tools/TranslationGeneration.cpp | 10 + 11 files changed, 1604 insertions(+), 4 deletions(-) create mode 100644 Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AWSGameLiftAcceptMatchRequest.names create mode 100644 Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AWSGameLiftCreateSessionOnQueueRequest.names create mode 100644 Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AWSGameLiftCreateSessionRequest.names create mode 100644 Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AWSGameLiftJoinSessionRequest.names create mode 100644 Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AWSGameLiftPlayer.names create mode 100644 Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AWSGameLiftSearchSessionsRequest.names create mode 100644 Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AWSGameLiftStartMatchmakingRequest.names create mode 100644 Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AWSGameLiftStopMatchmakingRequest.names diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AWSGameLiftAcceptMatchRequest.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AWSGameLiftAcceptMatchRequest.names new file mode 100644 index 0000000000..fbcc3c69c0 --- /dev/null +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AWSGameLiftAcceptMatchRequest.names @@ -0,0 +1,147 @@ +{ + "entries": [ + { + "base": "AWSGameLiftAcceptMatchRequest", + "context": "BehaviorClass", + "variant": "", + "details": { + "name": "Accept Match Request", + "category": "AWS Game Lift" + }, + "methods": [ + { + "base": "GetAcceptMatch", + "details": { + "name": "Get Accept Match" + }, + "params": [ + { + "typeid": "{AD289D76-CEE2-424F-847E-E62AA83B7D79}", + "details": { + "name": "Accept Match Request", + "tooltip": "The container for AcceptMatch request parameters" + } + } + ], + "results": [ + { + "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", + "details": { + "name": "Accept Match" + } + } + ] + }, + { + "base": "SetAcceptMatch", + "details": { + "name": "Set Accept Match" + }, + "params": [ + { + "typeid": "{AD289D76-CEE2-424F-847E-E62AA83B7D79}", + "details": { + "name": "Accept Match Request", + "tooltip": "The container for AcceptMatch request parameters" + } + }, + { + "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", + "details": { + "name": "Accept Match" + } + } + ] + }, + { + "base": "GetPlayerIds", + "details": { + "name": "Get Player Ids" + }, + "params": [ + { + "typeid": "{AD289D76-CEE2-424F-847E-E62AA83B7D79}", + "details": { + "name": "Accept Match Request", + "tooltip": "The container for AcceptMatch request parameters" + } + } + ], + "results": [ + { + "typeid": "{99DAD0BC-740E-5E82-826B-8FC7968CC02C}", + "details": { + "name": "Player Ids" + } + } + ] + }, + { + "base": "SetPlayerIds", + "details": { + "name": "Set Player Ids" + }, + "params": [ + { + "typeid": "{AD289D76-CEE2-424F-847E-E62AA83B7D79}", + "details": { + "name": "Accept Match Request", + "tooltip": "The container for AcceptMatch request parameters" + } + }, + { + "typeid": "{99DAD0BC-740E-5E82-826B-8FC7968CC02C}", + "details": { + "name": "Player Ids" + } + } + ] + }, + { + "base": "GetTicketId", + "details": { + "name": "Get Ticket Id" + }, + "params": [ + { + "typeid": "{AD289D76-CEE2-424F-847E-E62AA83B7D79}", + "details": { + "name": "Accept Match Request", + "tooltip": "The container for AcceptMatch request parameters" + } + } + ], + "results": [ + { + "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", + "details": { + "name": "Ticket Id" + } + } + ] + }, + { + "base": "SetTicketId", + "details": { + "name": "Set Ticket Id" + }, + "params": [ + { + "typeid": "{AD289D76-CEE2-424F-847E-E62AA83B7D79}", + "details": { + "name": "Accept Match Request", + "tooltip": "The container for AcceptMatch request parameters" + } + }, + { + "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", + "details": { + "name": "Ticket Id" + } + } + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AWSGameLiftCreateSessionOnQueueRequest.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AWSGameLiftCreateSessionOnQueueRequest.names new file mode 100644 index 0000000000..38de95185f --- /dev/null +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AWSGameLiftCreateSessionOnQueueRequest.names @@ -0,0 +1,275 @@ +{ + "entries": [ + { + "base": "AWSGameLiftCreateSessionOnQueueRequest", + "context": "BehaviorClass", + "variant": "", + "details": { + "name": "Create Session On Queue Request", + "category": "AWS Game Lift" + }, + "methods": [ + { + "base": "GetPlacementId", + "details": { + "name": "Get Placement Id" + }, + "params": [ + { + "typeid": "{2B99E594-CE81-4EB0-8888-74EF4242B59F}", + "details": { + "name": "AWS Game Lift Create Session On Queue Request" + } + } + ], + "results": [ + { + "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", + "details": { + "name": "Placement Id" + } + } + ] + }, + { + "base": "SetPlacementId", + "details": { + "name": "Set Placement Id" + }, + "params": [ + { + "typeid": "{2B99E594-CE81-4EB0-8888-74EF4242B59F}", + "details": { + "name": "AWS Game Lift Create Session On Queue Request" + } + }, + { + "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", + "details": { + "name": "Placement Id" + } + } + ] + }, + { + "base": "GetQueueName", + "details": { + "name": "Get Queue Name" + }, + "params": [ + { + "typeid": "{2B99E594-CE81-4EB0-8888-74EF4242B59F}", + "details": { + "name": "AWS Game Lift Create Session On Queue Request" + } + } + ], + "results": [ + { + "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", + "details": { + "name": "Queue Name" + } + } + ] + }, + { + "base": "SetQueueName", + "details": { + "name": "Set Queue Name" + }, + "params": [ + { + "typeid": "{2B99E594-CE81-4EB0-8888-74EF4242B59F}", + "details": { + "name": "AWS Game Lift Create Session On Queue Request" + } + }, + { + "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", + "details": { + "name": "Queue Name" + } + } + ] + }, + { + "base": "GetSessionName", + "details": { + "name": "Get Session Name" + }, + "params": [ + { + "typeid": "{E39C2A45-89C9-4CFB-B337-9734DC798930}", + "details": { + "name": "Create Session Request", + "tooltip": "The container for CreateSession request parameters" + } + } + ], + "results": [ + { + "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", + "details": { + "name": "Session Name" + } + } + ] + }, + { + "base": "SetSessionName", + "details": { + "name": "Set Session Name" + }, + "params": [ + { + "typeid": "{E39C2A45-89C9-4CFB-B337-9734DC798930}", + "details": { + "name": "Create Session Request", + "tooltip": "The container for CreateSession request parameters" + } + }, + { + "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", + "details": { + "name": "Session Name" + } + } + ] + }, + { + "base": "GetMaxPlayer", + "details": { + "name": "Get Max Player" + }, + "params": [ + { + "typeid": "{E39C2A45-89C9-4CFB-B337-9734DC798930}", + "details": { + "name": "Create Session Request", + "tooltip": "The container for CreateSession request parameters" + } + } + ], + "results": [ + { + "typeid": "{D6597933-47CD-4FC8-B911-63F3E2B0993A}", + "details": { + "name": "Max Player" + } + } + ] + }, + { + "base": "SetMaxPlayer", + "details": { + "name": "Set Max Player" + }, + "params": [ + { + "typeid": "{E39C2A45-89C9-4CFB-B337-9734DC798930}", + "details": { + "name": "Create Session Request", + "tooltip": "The container for CreateSession request parameters" + } + }, + { + "typeid": "{D6597933-47CD-4FC8-B911-63F3E2B0993A}", + "details": { + "name": "Max Player" + } + } + ] + }, + { + "base": "GetSessionProperties", + "details": { + "name": "Get Session Properties" + }, + "params": [ + { + "typeid": "{E39C2A45-89C9-4CFB-B337-9734DC798930}", + "details": { + "name": "Create Session Request", + "tooltip": "The container for CreateSession request parameters" + } + } + ], + "results": [ + { + "typeid": "{F8A7460C-2CC2-5755-AFDA-49B1109A751E}", + "details": { + "name": "Session Properties" + } + } + ] + }, + { + "base": "SetSessionProperties", + "details": { + "name": "Set Session Properties" + }, + "params": [ + { + "typeid": "{E39C2A45-89C9-4CFB-B337-9734DC798930}", + "details": { + "name": "Create Session Request", + "tooltip": "The container for CreateSession request parameters" + } + }, + { + "typeid": "{F8A7460C-2CC2-5755-AFDA-49B1109A751E}", + "details": { + "name": "Session Properties" + } + } + ] + }, + { + "base": "GetCreatorId", + "details": { + "name": "Get Creator Id" + }, + "params": [ + { + "typeid": "{E39C2A45-89C9-4CFB-B337-9734DC798930}", + "details": { + "name": "Create Session Request", + "tooltip": "The container for CreateSession request parameters" + } + } + ], + "results": [ + { + "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", + "details": { + "name": "Creator Id" + } + } + ] + }, + { + "base": "SetCreatorId", + "details": { + "name": "Set Creator Id" + }, + "params": [ + { + "typeid": "{E39C2A45-89C9-4CFB-B337-9734DC798930}", + "details": { + "name": "Create Session Request", + "tooltip": "The container for CreateSession request parameters" + } + }, + { + "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", + "details": { + "name": "Creator Id" + } + } + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AWSGameLiftCreateSessionRequest.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AWSGameLiftCreateSessionRequest.names new file mode 100644 index 0000000000..3924b7164d --- /dev/null +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AWSGameLiftCreateSessionRequest.names @@ -0,0 +1,317 @@ +{ + "entries": [ + { + "base": "AWSGameLiftCreateSessionRequest", + "context": "BehaviorClass", + "variant": "", + "details": { + "name": "Create Session Request", + "category": "AWS Game Lift" + }, + "methods": [ + { + "base": "GetIdempotencyToken", + "details": { + "name": "Get Idempotency Token" + }, + "params": [ + { + "typeid": "{69612D5D-F899-4DEB-AD63-4C497ABC5C0D}", + "details": { + "name": "AWS Game Lift Create Session Request" + } + } + ], + "results": [ + { + "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", + "details": { + "name": "Idempotency Token" + } + } + ] + }, + { + "base": "SetIdempotencyToken", + "details": { + "name": "Set Idempotency Token" + }, + "params": [ + { + "typeid": "{69612D5D-F899-4DEB-AD63-4C497ABC5C0D}", + "details": { + "name": "AWS Game Lift Create Session Request" + } + }, + { + "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", + "details": { + "name": "Idempotency Token" + } + } + ] + }, + { + "base": "GetAliasId", + "details": { + "name": "Get Alias Id" + }, + "params": [ + { + "typeid": "{69612D5D-F899-4DEB-AD63-4C497ABC5C0D}", + "details": { + "name": "AWS Game Lift Create Session Request" + } + } + ], + "results": [ + { + "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", + "details": { + "name": "Alias Id" + } + } + ] + }, + { + "base": "SetAliasId", + "details": { + "name": "Set Alias Id" + }, + "params": [ + { + "typeid": "{69612D5D-F899-4DEB-AD63-4C497ABC5C0D}", + "details": { + "name": "AWS Game Lift Create Session Request" + } + }, + { + "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", + "details": { + "name": "Alias Id" + } + } + ] + }, + { + "base": "GetSessionName", + "details": { + "name": "Get Session Name" + }, + "params": [ + { + "typeid": "{E39C2A45-89C9-4CFB-B337-9734DC798930}", + "details": { + "name": "Create Session Request", + "tooltip": "The container for CreateSession request parameters" + } + } + ], + "results": [ + { + "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", + "details": { + "name": "Session Name" + } + } + ] + }, + { + "base": "SetSessionName", + "details": { + "name": "Set Session Name" + }, + "params": [ + { + "typeid": "{E39C2A45-89C9-4CFB-B337-9734DC798930}", + "details": { + "name": "Create Session Request", + "tooltip": "The container for CreateSession request parameters" + } + }, + { + "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", + "details": { + "name": "Session Name" + } + } + ] + }, + { + "base": "GetMaxPlayer", + "details": { + "name": "Get Max Player" + }, + "params": [ + { + "typeid": "{E39C2A45-89C9-4CFB-B337-9734DC798930}", + "details": { + "name": "Create Session Request", + "tooltip": "The container for CreateSession request parameters" + } + } + ], + "results": [ + { + "typeid": "{D6597933-47CD-4FC8-B911-63F3E2B0993A}", + "details": { + "name": "Max Player" + } + } + ] + }, + { + "base": "SetMaxPlayer", + "details": { + "name": "Set Max Player" + }, + "params": [ + { + "typeid": "{E39C2A45-89C9-4CFB-B337-9734DC798930}", + "details": { + "name": "Create Session Request", + "tooltip": "The container for CreateSession request parameters" + } + }, + { + "typeid": "{D6597933-47CD-4FC8-B911-63F3E2B0993A}", + "details": { + "name": "Max Player" + } + } + ] + }, + { + "base": "GetSessionProperties", + "details": { + "name": "Get Session Properties" + }, + "params": [ + { + "typeid": "{E39C2A45-89C9-4CFB-B337-9734DC798930}", + "details": { + "name": "Create Session Request", + "tooltip": "The container for CreateSession request parameters" + } + } + ], + "results": [ + { + "typeid": "{F8A7460C-2CC2-5755-AFDA-49B1109A751E}", + "details": { + "name": "Session Properties" + } + } + ] + }, + { + "base": "SetSessionProperties", + "details": { + "name": "Set Session Properties" + }, + "params": [ + { + "typeid": "{E39C2A45-89C9-4CFB-B337-9734DC798930}", + "details": { + "name": "Create Session Request", + "tooltip": "The container for CreateSession request parameters" + } + }, + { + "typeid": "{F8A7460C-2CC2-5755-AFDA-49B1109A751E}", + "details": { + "name": "Session Properties" + } + } + ] + }, + { + "base": "GetFleetId", + "details": { + "name": "Get Fleet Id" + }, + "params": [ + { + "typeid": "{69612D5D-F899-4DEB-AD63-4C497ABC5C0D}", + "details": { + "name": "AWS Game Lift Create Session Request" + } + } + ], + "results": [ + { + "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", + "details": { + "name": "Fleet Id" + } + } + ] + }, + { + "base": "SetFleetId", + "details": { + "name": "Set Fleet Id" + }, + "params": [ + { + "typeid": "{69612D5D-F899-4DEB-AD63-4C497ABC5C0D}", + "details": { + "name": "AWS Game Lift Create Session Request" + } + }, + { + "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", + "details": { + "name": "Fleet Id" + } + } + ] + }, + { + "base": "GetCreatorId", + "details": { + "name": "Get Creator Id" + }, + "params": [ + { + "typeid": "{E39C2A45-89C9-4CFB-B337-9734DC798930}", + "details": { + "name": "Create Session Request", + "tooltip": "The container for CreateSession request parameters" + } + } + ], + "results": [ + { + "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", + "details": { + "name": "Creator Id" + } + } + ] + }, + { + "base": "SetCreatorId", + "details": { + "name": "Set Creator Id" + }, + "params": [ + { + "typeid": "{E39C2A45-89C9-4CFB-B337-9734DC798930}", + "details": { + "name": "Create Session Request", + "tooltip": "The container for CreateSession request parameters" + } + }, + { + "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", + "details": { + "name": "Creator Id" + } + } + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AWSGameLiftJoinSessionRequest.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AWSGameLiftJoinSessionRequest.names new file mode 100644 index 0000000000..c4a8a515de --- /dev/null +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AWSGameLiftJoinSessionRequest.names @@ -0,0 +1,147 @@ +{ + "entries": [ + { + "base": "AWSGameLiftJoinSessionRequest", + "context": "BehaviorClass", + "variant": "", + "details": { + "name": "Join Session Request", + "category": "AWS Game Lift" + }, + "methods": [ + { + "base": "GetPlayerData", + "details": { + "name": "Get Player Data" + }, + "params": [ + { + "typeid": "{519769E8-3CDE-4385-A0D7-24DBB3685657}", + "details": { + "name": "Join Session Request", + "tooltip": "The container for JoinSession request parameters" + } + } + ], + "results": [ + { + "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", + "details": { + "name": "Player Data" + } + } + ] + }, + { + "base": "SetPlayerData", + "details": { + "name": "Set Player Data" + }, + "params": [ + { + "typeid": "{519769E8-3CDE-4385-A0D7-24DBB3685657}", + "details": { + "name": "Join Session Request", + "tooltip": "The container for JoinSession request parameters" + } + }, + { + "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", + "details": { + "name": "Player Data" + } + } + ] + }, + { + "base": "GetPlayerId", + "details": { + "name": "Get Player Id" + }, + "params": [ + { + "typeid": "{519769E8-3CDE-4385-A0D7-24DBB3685657}", + "details": { + "name": "Join Session Request", + "tooltip": "The container for JoinSession request parameters" + } + } + ], + "results": [ + { + "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", + "details": { + "name": "Player Id" + } + } + ] + }, + { + "base": "SetPlayerId", + "details": { + "name": "Set Player Id" + }, + "params": [ + { + "typeid": "{519769E8-3CDE-4385-A0D7-24DBB3685657}", + "details": { + "name": "Join Session Request", + "tooltip": "The container for JoinSession request parameters" + } + }, + { + "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", + "details": { + "name": "Player Id" + } + } + ] + }, + { + "base": "GetSessionId", + "details": { + "name": "Get Session Id" + }, + "params": [ + { + "typeid": "{519769E8-3CDE-4385-A0D7-24DBB3685657}", + "details": { + "name": "Join Session Request", + "tooltip": "The container for JoinSession request parameters" + } + } + ], + "results": [ + { + "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", + "details": { + "name": "Session Id" + } + } + ] + }, + { + "base": "SetSessionId", + "details": { + "name": "Set Session Id" + }, + "params": [ + { + "typeid": "{519769E8-3CDE-4385-A0D7-24DBB3685657}", + "details": { + "name": "Join Session Request", + "tooltip": "The container for JoinSession request parameters" + } + }, + { + "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", + "details": { + "name": "Session Id" + } + } + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AWSGameLiftPlayer.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AWSGameLiftPlayer.names new file mode 100644 index 0000000000..372cbdb019 --- /dev/null +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AWSGameLiftPlayer.names @@ -0,0 +1,183 @@ +{ + "entries": [ + { + "base": "AWSGameLiftPlayer", + "context": "BehaviorClass", + "variant": "", + "details": { + "name": "Player", + "category": "AWS Game Lift" + }, + "methods": [ + { + "base": "GetLatencyInMs", + "details": { + "name": "Get Latency In Ms" + }, + "params": [ + { + "typeid": "{B62C118E-C55D-4903-8ECB-E58E8CA613C4}", + "details": { + "name": "AWS Game Lift Player" + } + } + ], + "results": [ + { + "typeid": "{3F80885A-9011-5172-8D94-87108B31D950}", + "details": { + "name": "Latency In Ms" + } + } + ] + }, + { + "base": "SetLatencyInMs", + "details": { + "name": "Set Latency In Ms" + }, + "params": [ + { + "typeid": "{B62C118E-C55D-4903-8ECB-E58E8CA613C4}", + "details": { + "name": "AWS Game Lift Player" + } + }, + { + "typeid": "{3F80885A-9011-5172-8D94-87108B31D950}", + "details": { + "name": "Latency In Ms" + } + } + ] + }, + { + "base": "GetPlayerAttributes", + "details": { + "name": "Get Player Attributes" + }, + "params": [ + { + "typeid": "{B62C118E-C55D-4903-8ECB-E58E8CA613C4}", + "details": { + "name": "AWS Game Lift Player" + } + } + ], + "results": [ + { + "typeid": "{F8A7460C-2CC2-5755-AFDA-49B1109A751E}", + "details": { + "name": "Player Attributes" + } + } + ] + }, + { + "base": "SetPlayerAttributes", + "details": { + "name": "Set Player Attributes" + }, + "params": [ + { + "typeid": "{B62C118E-C55D-4903-8ECB-E58E8CA613C4}", + "details": { + "name": "AWS Game Lift Player" + } + }, + { + "typeid": "{F8A7460C-2CC2-5755-AFDA-49B1109A751E}", + "details": { + "name": "Player Attributes" + } + } + ] + }, + { + "base": "GetPlayerId", + "details": { + "name": "Get Player Id" + }, + "params": [ + { + "typeid": "{B62C118E-C55D-4903-8ECB-E58E8CA613C4}", + "details": { + "name": "AWS Game Lift Player" + } + } + ], + "results": [ + { + "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", + "details": { + "name": "Player Id" + } + } + ] + }, + { + "base": "SetPlayerId", + "details": { + "name": "Set Player Id" + }, + "params": [ + { + "typeid": "{B62C118E-C55D-4903-8ECB-E58E8CA613C4}", + "details": { + "name": "AWS Game Lift Player" + } + }, + { + "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", + "details": { + "name": "Player Id" + } + } + ] + }, + { + "base": "GetTeam", + "details": { + "name": "Get Team" + }, + "params": [ + { + "typeid": "{B62C118E-C55D-4903-8ECB-E58E8CA613C4}", + "details": { + "name": "AWS Game Lift Player" + } + } + ], + "results": [ + { + "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", + "details": { + "name": "Team" + } + } + ] + }, + { + "base": "SetTeam", + "details": { + "name": "Set Team" + }, + "params": [ + { + "typeid": "{B62C118E-C55D-4903-8ECB-E58E8CA613C4}", + "details": { + "name": "AWS Game Lift Player" + } + }, + { + "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", + "details": { + "name": "Team" + } + } + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AWSGameLiftSearchSessionsRequest.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AWSGameLiftSearchSessionsRequest.names new file mode 100644 index 0000000000..c2300b23bc --- /dev/null +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AWSGameLiftSearchSessionsRequest.names @@ -0,0 +1,317 @@ +{ + "entries": [ + { + "base": "AWSGameLiftSearchSessionsRequest", + "context": "BehaviorClass", + "variant": "", + "details": { + "name": "Search Sessions Request", + "category": "AWS Game Lift" + }, + "methods": [ + { + "base": "GetLocation", + "details": { + "name": "Get Location" + }, + "params": [ + { + "typeid": "{864C91C0-CA53-4585-BF07-066C0DF3E198}", + "details": { + "name": "AWS Game Lift Search Sessions Request" + } + } + ], + "results": [ + { + "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", + "details": { + "name": "Location" + } + } + ] + }, + { + "base": "SetLocation", + "details": { + "name": "Set Location" + }, + "params": [ + { + "typeid": "{864C91C0-CA53-4585-BF07-066C0DF3E198}", + "details": { + "name": "AWS Game Lift Search Sessions Request" + } + }, + { + "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", + "details": { + "name": "Location" + } + } + ] + }, + { + "base": "GetFleetId", + "details": { + "name": "Get Fleet Id" + }, + "params": [ + { + "typeid": "{864C91C0-CA53-4585-BF07-066C0DF3E198}", + "details": { + "name": "AWS Game Lift Search Sessions Request" + } + } + ], + "results": [ + { + "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", + "details": { + "name": "Fleet Id" + } + } + ] + }, + { + "base": "SetFleetId", + "details": { + "name": "Set Fleet Id" + }, + "params": [ + { + "typeid": "{864C91C0-CA53-4585-BF07-066C0DF3E198}", + "details": { + "name": "AWS Game Lift Search Sessions Request" + } + }, + { + "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", + "details": { + "name": "Fleet Id" + } + } + ] + }, + { + "base": "GetNextToken", + "details": { + "name": "Get Next Token" + }, + "params": [ + { + "typeid": "{B49207A8-8549-4ADB-B7D9-D7A4932F9B4B}", + "details": { + "name": "Search Sessions Request", + "tooltip": "The container for SearchSessions request parameters" + } + } + ], + "results": [ + { + "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", + "details": { + "name": "Next Token" + } + } + ] + }, + { + "base": "SetNextToken", + "details": { + "name": "Set Next Token" + }, + "params": [ + { + "typeid": "{B49207A8-8549-4ADB-B7D9-D7A4932F9B4B}", + "details": { + "name": "Search Sessions Request", + "tooltip": "The container for SearchSessions request parameters" + } + }, + { + "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", + "details": { + "name": "Next Token" + } + } + ] + }, + { + "base": "GetSortExpression", + "details": { + "name": "Get Sort Expression" + }, + "params": [ + { + "typeid": "{B49207A8-8549-4ADB-B7D9-D7A4932F9B4B}", + "details": { + "name": "Search Sessions Request", + "tooltip": "The container for SearchSessions request parameters" + } + } + ], + "results": [ + { + "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", + "details": { + "name": "Sort Expression" + } + } + ] + }, + { + "base": "SetSortExpression", + "details": { + "name": "Set Sort Expression" + }, + "params": [ + { + "typeid": "{B49207A8-8549-4ADB-B7D9-D7A4932F9B4B}", + "details": { + "name": "Search Sessions Request", + "tooltip": "The container for SearchSessions request parameters" + } + }, + { + "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", + "details": { + "name": "Sort Expression" + } + } + ] + }, + { + "base": "GetAliasId", + "details": { + "name": "Get Alias Id" + }, + "params": [ + { + "typeid": "{864C91C0-CA53-4585-BF07-066C0DF3E198}", + "details": { + "name": "AWS Game Lift Search Sessions Request" + } + } + ], + "results": [ + { + "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", + "details": { + "name": "Alias Id" + } + } + ] + }, + { + "base": "SetAliasId", + "details": { + "name": "Set Alias Id" + }, + "params": [ + { + "typeid": "{864C91C0-CA53-4585-BF07-066C0DF3E198}", + "details": { + "name": "AWS Game Lift Search Sessions Request" + } + }, + { + "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", + "details": { + "name": "Alias Id" + } + } + ] + }, + { + "base": "GetFilterExpression", + "details": { + "name": "Get Filter Expression" + }, + "params": [ + { + "typeid": "{B49207A8-8549-4ADB-B7D9-D7A4932F9B4B}", + "details": { + "name": "Search Sessions Request", + "tooltip": "The container for SearchSessions request parameters" + } + } + ], + "results": [ + { + "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", + "details": { + "name": "Filter Expression" + } + } + ] + }, + { + "base": "SetFilterExpression", + "details": { + "name": "Set Filter Expression" + }, + "params": [ + { + "typeid": "{B49207A8-8549-4ADB-B7D9-D7A4932F9B4B}", + "details": { + "name": "Search Sessions Request", + "tooltip": "The container for SearchSessions request parameters" + } + }, + { + "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", + "details": { + "name": "Filter Expression" + } + } + ] + }, + { + "base": "GetMaxResult", + "details": { + "name": "Get Max Result" + }, + "params": [ + { + "typeid": "{B49207A8-8549-4ADB-B7D9-D7A4932F9B4B}", + "details": { + "name": "Search Sessions Request", + "tooltip": "The container for SearchSessions request parameters" + } + } + ], + "results": [ + { + "typeid": "{72B9409A-7D1A-4831-9CFE-FCB3FADD3426}", + "details": { + "name": "Max Result" + } + } + ] + }, + { + "base": "SetMaxResult", + "details": { + "name": "Set Max Result" + }, + "params": [ + { + "typeid": "{B49207A8-8549-4ADB-B7D9-D7A4932F9B4B}", + "details": { + "name": "Search Sessions Request", + "tooltip": "The container for SearchSessions request parameters" + } + }, + { + "typeid": "{72B9409A-7D1A-4831-9CFE-FCB3FADD3426}", + "details": { + "name": "Max Result" + } + } + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AWSGameLiftStartMatchmakingRequest.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AWSGameLiftStartMatchmakingRequest.names new file mode 100644 index 0000000000..735f6d77f6 --- /dev/null +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AWSGameLiftStartMatchmakingRequest.names @@ -0,0 +1,143 @@ +{ + "entries": [ + { + "base": "AWSGameLiftStartMatchmakingRequest", + "context": "BehaviorClass", + "variant": "", + "details": { + "name": "Start Matchmaking Request", + "category": "AWS Game Lift" + }, + "methods": [ + { + "base": "GetTicketId", + "details": { + "name": "Get Ticket Id" + }, + "params": [ + { + "typeid": "{70B47776-E8E7-4993-BEC3-5CAEC3D48E47}", + "details": { + "name": "Start Matchmaking Request", + "tooltip": "The container for StartMatchmaking request parameters" + } + } + ], + "results": [ + { + "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", + "details": { + "name": "Ticket Id" + } + } + ] + }, + { + "base": "SetTicketId", + "details": { + "name": "Set Ticket Id" + }, + "params": [ + { + "typeid": "{70B47776-E8E7-4993-BEC3-5CAEC3D48E47}", + "details": { + "name": "Start Matchmaking Request", + "tooltip": "The container for StartMatchmaking request parameters" + } + }, + { + "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", + "details": { + "name": "Ticket Id" + } + } + ] + }, + { + "base": "GetConfigurationName", + "details": { + "name": "Get Configuration Name" + }, + "params": [ + { + "typeid": "{D273DF71-9C55-48C1-95F9-8D7B66B9CF3E}", + "details": { + "name": "AWS Game Lift Start Matchmaking Request" + } + } + ], + "results": [ + { + "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", + "details": { + "name": "Configuration Name" + } + } + ] + }, + { + "base": "SetConfigurationName", + "details": { + "name": "Set Configuration Name" + }, + "params": [ + { + "typeid": "{D273DF71-9C55-48C1-95F9-8D7B66B9CF3E}", + "details": { + "name": "AWS Game Lift Start Matchmaking Request" + } + }, + { + "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", + "details": { + "name": "Configuration Name" + } + } + ] + }, + { + "base": "GetPlayers", + "details": { + "name": "Get Players" + }, + "params": [ + { + "typeid": "{D273DF71-9C55-48C1-95F9-8D7B66B9CF3E}", + "details": { + "name": "AWS Game Lift Start Matchmaking Request" + } + } + ], + "results": [ + { + "typeid": "{EE12B610-77DD-56DD-AB5A-16A537F2CE5E}", + "details": { + "name": "Players" + } + } + ] + }, + { + "base": "SetPlayers", + "details": { + "name": "Set Players" + }, + "params": [ + { + "typeid": "{D273DF71-9C55-48C1-95F9-8D7B66B9CF3E}", + "details": { + "name": "AWS Game Lift Start Matchmaking Request" + } + }, + { + "typeid": "{EE12B610-77DD-56DD-AB5A-16A537F2CE5E}", + "details": { + "name": "Players" + } + } + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AWSGameLiftStopMatchmakingRequest.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AWSGameLiftStopMatchmakingRequest.names new file mode 100644 index 0000000000..fa9c71dae6 --- /dev/null +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AWSGameLiftStopMatchmakingRequest.names @@ -0,0 +1,59 @@ +{ + "entries": [ + { + "base": "AWSGameLiftStopMatchmakingRequest", + "context": "BehaviorClass", + "variant": "", + "details": { + "name": "Stop Matchmaking Request", + "category": "AWS Game Lift" + }, + "methods": [ + { + "base": "GetTicketId", + "details": { + "name": "Get Ticket Id" + }, + "params": [ + { + "typeid": "{6132E293-65EF-4DC2-A8A0-00269697229D}", + "details": { + "name": "Stop Matchmaking Request", + "tooltip": "The container for StopMatchmaking request parameters" + } + } + ], + "results": [ + { + "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", + "details": { + "name": "Ticket Id" + } + } + ] + }, + { + "base": "SetTicketId", + "details": { + "name": "Set Ticket Id" + }, + "params": [ + { + "typeid": "{6132E293-65EF-4DC2-A8A0-00269697229D}", + "details": { + "name": "Stop Matchmaking Request", + "tooltip": "The container for StopMatchmaking request parameters" + } + }, + { + "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", + "details": { + "name": "Ticket Id" + } + } + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/Gems/ScriptCanvas/Code/Editor/View/Widgets/NodePalette/GeneralNodePaletteTreeItemTypes.h b/Gems/ScriptCanvas/Code/Editor/View/Widgets/NodePalette/GeneralNodePaletteTreeItemTypes.h index 65a5e10cf7..57035e224d 100644 --- a/Gems/ScriptCanvas/Code/Editor/View/Widgets/NodePalette/GeneralNodePaletteTreeItemTypes.h +++ b/Gems/ScriptCanvas/Code/Editor/View/Widgets/NodePalette/GeneralNodePaletteTreeItemTypes.h @@ -71,9 +71,11 @@ namespace ScriptCanvasEditor const char* className = m_className.toUtf8().data(); auto behaviorClass = behaviorContext->m_classes.find(className); - - ScriptCanvasEditorTools::TranslationGeneration translation; - translation.TranslateBehaviorClass(behaviorClass->second); + if (behaviorClass != behaviorContext->m_classes.end()) + { + ScriptCanvasEditorTools::TranslationGeneration translation; + translation.TranslateBehaviorClass(behaviorClass->second); + } } private: diff --git a/Gems/ScriptCanvas/Code/Editor/View/Widgets/ScriptCanvasNodePaletteDockWidget.cpp b/Gems/ScriptCanvas/Code/Editor/View/Widgets/ScriptCanvasNodePaletteDockWidget.cpp index 7ea4af9032..45316778fe 100644 --- a/Gems/ScriptCanvas/Code/Editor/View/Widgets/ScriptCanvasNodePaletteDockWidget.cpp +++ b/Gems/ScriptCanvas/Code/Editor/View/Widgets/ScriptCanvasNodePaletteDockWidget.cpp @@ -639,7 +639,7 @@ namespace ScriptCanvasEditor m_mimeType = NodePaletteDockWidget::GetMimeType(); m_isInContextMenu = isInContextMenu; m_allowArrowKeyNavigation = isInContextMenu; - m_saveIdentifier = m_isInContextMenu ? "ScriptCanvas" : "ScriptCnavas_ContextMenu"; + m_saveIdentifier = m_isInContextMenu ? "ScriptCanvas" : "ScriptCanvas_ContextMenu"; m_rootTreeItem = Widget::NodePaletteWidget::ExternalCreateNodePaletteRoot(nodePaletteModel, assetModel); } diff --git a/Gems/ScriptCanvas/Code/Tools/TranslationGeneration.cpp b/Gems/ScriptCanvas/Code/Tools/TranslationGeneration.cpp index 844401d141..dd1f8074b1 100644 --- a/Gems/ScriptCanvas/Code/Tools/TranslationGeneration.cpp +++ b/Gems/ScriptCanvas/Code/Tools/TranslationGeneration.cpp @@ -922,6 +922,11 @@ namespace ScriptCanvasEditorTools TranslateMethod(behaviorProperty->m_getter, method); + // We know this is a getter, so there will only be one parameter, we will use the method name as a best + // guess for the argument name + SplitCamelCase(cleanName); + method.m_arguments[1].m_details.m_name = cleanName; + entry->m_methods.push_back(method); } @@ -944,6 +949,11 @@ namespace ScriptCanvasEditorTools TranslateMethod(behaviorProperty->m_setter, method); + // We know this is a setter, so there will only be one parameter, we will use the method name as a best + // guess for the argument name + SplitCamelCase(cleanName); + method.m_arguments[1].m_details.m_name = cleanName; + entry->m_methods.push_back(method); } From ca94e58399e08c99120477320d8db54862007b10 Mon Sep 17 00:00:00 2001 From: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com> Date: Mon, 29 Nov 2021 13:50:39 -0600 Subject: [PATCH 24/58] Added SerializeContext Reflection of FixedMaxPath class (#4453) * Added SerializeContext Reflection of FixedMaxPath class Added UnitTest for validating path clas reflection Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com> * Updated the paths loaded during the serialization to use test path separator Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com> --- .../AzCore/Component/ComponentApplication.cpp | 3 +- Code/Framework/AzCore/AzCore/IO/Path/Path.cpp | 9 -- Code/Framework/AzCore/AzCore/IO/Path/Path.h | 2 +- .../AzCore/AzCore/IO/Path/PathReflect.cpp | 77 +++++++++++++++ .../AzCore/AzCore/IO/Path/PathReflect.h | 19 ++++ .../AzCore/AzCore/IO/Path/Path_fwd.h | 5 - .../AzCore/AzCore/azcore_files.cmake | 2 + Code/Framework/AzCore/Tests/Serialization.cpp | 94 +++++++++++++++++++ 8 files changed, 195 insertions(+), 16 deletions(-) create mode 100644 Code/Framework/AzCore/AzCore/IO/Path/PathReflect.cpp create mode 100644 Code/Framework/AzCore/AzCore/IO/Path/PathReflect.h diff --git a/Code/Framework/AzCore/AzCore/Component/ComponentApplication.cpp b/Code/Framework/AzCore/AzCore/Component/ComponentApplication.cpp index cf23d2b4d7..fb0e4b82b8 100644 --- a/Code/Framework/AzCore/AzCore/Component/ComponentApplication.cpp +++ b/Code/Framework/AzCore/AzCore/Component/ComponentApplication.cpp @@ -45,6 +45,7 @@ #include #include +#include #include #include @@ -1547,7 +1548,7 @@ namespace AZ // reflect name dictionary. Name::Reflect(context); // reflect path - IO::PathReflection::Reflect(context); + IO::PathReflect(context); // reflect the SettingsRegistryInterface, SettignsRegistryImpl and the global Settings Registry // instance (AZ::SettingsRegistry::Get()) into the Behavior Context diff --git a/Code/Framework/AzCore/AzCore/IO/Path/Path.cpp b/Code/Framework/AzCore/AzCore/IO/Path/Path.cpp index 637945db35..6e4dfdaa63 100644 --- a/Code/Framework/AzCore/AzCore/IO/Path/Path.cpp +++ b/Code/Framework/AzCore/AzCore/IO/Path/Path.cpp @@ -50,13 +50,4 @@ namespace AZ::IO const PathIterator& rhs); template bool operator!=(const PathIterator& lhs, const PathIterator& rhs); - - void PathReflection::Reflect(AZ::ReflectContext* context) - { - if (auto* serializeContext = azrtti_cast(context)) - { - serializeContext->Class() - ->Field("m_path", &AZ::IO::Path::m_path); - } - } } diff --git a/Code/Framework/AzCore/AzCore/IO/Path/Path.h b/Code/Framework/AzCore/AzCore/IO/Path/Path.h index 3b5c224957..355d9ddedb 100644 --- a/Code/Framework/AzCore/AzCore/IO/Path/Path.h +++ b/Code/Framework/AzCore/AzCore/IO/Path/Path.h @@ -321,7 +321,6 @@ namespace AZ::IO using const_iterator = const PathIterator; using iterator = const_iterator; friend PathIterator; - friend struct PathReflection; // constructors and destructor constexpr BasicPath() = default; @@ -665,6 +664,7 @@ namespace AZ::IO namespace AZ { AZ_TYPE_INFO_SPECIALIZE(AZ::IO::Path, "{88E0A40F-3085-4CAB-8B11-EF5A2659C71A}"); + AZ_TYPE_INFO_SPECIALIZE(AZ::IO::FixedMaxPath, "{FA6CA49F-376A-417C-9767-DD50744DF203}"); } namespace AZ::IO diff --git a/Code/Framework/AzCore/AzCore/IO/Path/PathReflect.cpp b/Code/Framework/AzCore/AzCore/IO/Path/PathReflect.cpp new file mode 100644 index 0000000000..55a991f19f --- /dev/null +++ b/Code/Framework/AzCore/AzCore/IO/Path/PathReflect.cpp @@ -0,0 +1,77 @@ +/* + * 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 AZ::IO +{ + template + struct PathSerializer + : public SerializeContext::IDataSerializer + { + public: + /// Convert binary data to text + size_t DataToText(IO::GenericStream& in, IO::GenericStream& out, bool) override + { + PathType outPath; + outPath.Native().resize_no_construct(in.GetLength()); + in.Read(outPath.Native().size(), outPath.Native().data()); + + return static_cast(out.Write(outPath.Native().size(), outPath.Native().c_str())); + } + + size_t TextToData(const char* text, unsigned int, IO::GenericStream& stream, bool) override + { + return static_cast(stream.Write(strlen(text), reinterpret_cast(text))); + } + + size_t Save(const void* classPtr, IO::GenericStream& stream, bool) override + { + /// Save paths out using the PosixPathSeparator + PathType path(reinterpret_cast(classPtr)->Native(), AZ::IO::PosixPathSeparator); + path.MakePreferred(); + + return static_cast(stream.Write(path.Native().size(), path.c_str())); + } + + bool Load(void* classPtr, IO::GenericStream& stream, unsigned int, bool) override + { + // Normalize the path load + auto path = reinterpret_cast(classPtr); + + path->Native().resize_no_construct(stream.GetLength()); + stream.Read(path->Native().size(), path->Native().data()); + *path = path->LexicallyNormal(); + + return true; + } + + bool CompareValueData(const void* lhs, const void* rhs) override + { + return SerializeContext::EqualityCompareHelper::CompareValues(lhs, rhs); + } + }; + + void PathReflect(AZ::ReflectContext* context) + { + if (auto serializeContext = azrtti_cast(context); serializeContext != nullptr) + { + serializeContext->Class() + ->Serializer(AZ::SerializeContext::IDataSerializerPtr{ new PathSerializer{}, + AZ::SerializeContext::IDataSerializer::CreateDefaultDeleteDeleter() }) + ; + + serializeContext->Class() + ->Serializer(AZ::SerializeContext::IDataSerializerPtr{ new PathSerializer{}, + AZ::SerializeContext::IDataSerializer::CreateDefaultDeleteDeleter() }) + ; + } + } +} diff --git a/Code/Framework/AzCore/AzCore/IO/Path/PathReflect.h b/Code/Framework/AzCore/AzCore/IO/Path/PathReflect.h new file mode 100644 index 0000000000..3076895026 --- /dev/null +++ b/Code/Framework/AzCore/AzCore/IO/Path/PathReflect.h @@ -0,0 +1,19 @@ +/* + * 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 AZ +{ + class ReflectContext; +} + +namespace AZ::IO +{ + void PathReflect(AZ::ReflectContext* context); +} diff --git a/Code/Framework/AzCore/AzCore/IO/Path/Path_fwd.h b/Code/Framework/AzCore/AzCore/IO/Path/Path_fwd.h index cb61bd5887..c4fce5e1b7 100644 --- a/Code/Framework/AzCore/AzCore/IO/Path/Path_fwd.h +++ b/Code/Framework/AzCore/AzCore/IO/Path/Path_fwd.h @@ -57,11 +57,6 @@ namespace AZ::IO // It depends on the path type template class PathIterator; - - struct PathReflection - { - static void Reflect(AZ::ReflectContext* context); - }; } namespace AZStd diff --git a/Code/Framework/AzCore/AzCore/azcore_files.cmake b/Code/Framework/AzCore/AzCore/azcore_files.cmake index 30662f37c4..0c381c9850 100644 --- a/Code/Framework/AzCore/AzCore/azcore_files.cmake +++ b/Code/Framework/AzCore/AzCore/azcore_files.cmake @@ -187,6 +187,8 @@ set(FILES IO/Path/Path.inl IO/Path/PathIterable.inl IO/Path/PathParser.inl + IO/Path/PathReflect.cpp + IO/Path/PathReflect.h IO/Path/Path_fwd.h IO/SystemFile.cpp IO/SystemFile.h diff --git a/Code/Framework/AzCore/Tests/Serialization.cpp b/Code/Framework/AzCore/Tests/Serialization.cpp index 219744a480..1666913317 100644 --- a/Code/Framework/AzCore/Tests/Serialization.cpp +++ b/Code/Framework/AzCore/Tests/Serialization.cpp @@ -59,6 +59,7 @@ #include #include #include +#include #include #include @@ -8151,5 +8152,98 @@ namespace UnitTest m_serializeContext->Class(); m_serializeContext->DisableRemoveReflection(); } + + template + class PathSerializationParamFixture + : public ScopedAllocatorSetupFixture + , public ::testing::WithParamInterface + { + public: + PathSerializationParamFixture() + : ScopedAllocatorSetupFixture( + []() { AZ::SystemAllocator::Descriptor desc; desc.m_stackRecordLevels = 30; return desc; }() + ) + {} + + // We must expose the class for serialization first. + void SetUp() override + { + m_serializeContext = AZStd::make_unique(); + AZ::IO::PathReflect(m_serializeContext.get()); + + } + + void TearDown() override + { + m_serializeContext->EnableRemoveReflection(); + AZ::IO::PathReflect(m_serializeContext.get()); + m_serializeContext->DisableRemoveReflection(); + + m_serializeContext.reset(); + } + + protected: + AZStd::unique_ptr m_serializeContext; + }; + + struct PathSerializationParams + { + const char m_preferredSeparator{}; + const char* m_testPath{}; + }; + using PathSerializationFixture = PathSerializationParamFixture; + + TEST_P(PathSerializationFixture, PathSerializer_SerializesStringBackedPath_Succeeds) + { + const auto& testParams = GetParam(); + { + // Path serialization + AZ::IO::Path testPath{ testParams.m_testPath, testParams.m_preferredSeparator }; + + AZStd::vector byteBuffer; + AZ::IO::ByteContainerStream byteStream(&byteBuffer); + auto objStream = AZ::ObjectStream::Create(&byteStream, *m_serializeContext, AZ::ObjectStream::ST_XML); + objStream->WriteClass(&testPath); + objStream->Finalize(); + + byteStream.Seek(0, AZ::IO::GenericStream::ST_SEEK_BEGIN); + + AZ::IO::Path loadPath{ testParams.m_preferredSeparator }; + EXPECT_TRUE(AZ::Utils::LoadObjectFromStreamInPlace(byteStream, loadPath, m_serializeContext.get())); + EXPECT_EQ(testPath.LexicallyNormal(), loadPath); + } + + { + // FixedMaxPath serialization + AZ::IO::FixedMaxPath testFixedMaxPath{ testParams.m_testPath, testParams.m_preferredSeparator }; + + AZStd::vector byteBuffer; + AZ::IO::ByteContainerStream byteStream(&byteBuffer); + auto objStream = AZ::ObjectStream::Create(&byteStream, *m_serializeContext, AZ::ObjectStream::ST_XML); + objStream->WriteClass(&testFixedMaxPath); + objStream->Finalize(); + + byteStream.Seek(0, AZ::IO::GenericStream::ST_SEEK_BEGIN); + + AZ::IO::FixedMaxPath loadPath{ testParams.m_preferredSeparator }; + EXPECT_TRUE(AZ::Utils::LoadObjectFromStreamInPlace(byteStream, loadPath, m_serializeContext.get())); + EXPECT_EQ(testFixedMaxPath.LexicallyNormal(), loadPath); + } + } + + INSTANTIATE_TEST_CASE_P( + PathSerialization, + PathSerializationFixture, + ::testing::Values( + PathSerializationParams{ AZ::IO::PosixPathSeparator, "" }, + PathSerializationParams{ AZ::IO::PosixPathSeparator, "test" }, + PathSerializationParams{ AZ::IO::PosixPathSeparator, "/test" }, + PathSerializationParams{ AZ::IO::WindowsPathSeparator, "test" }, + PathSerializationParams{ AZ::IO::WindowsPathSeparator, "/test" }, + PathSerializationParams{ AZ::IO::WindowsPathSeparator, "D:test" }, + PathSerializationParams{ AZ::IO::WindowsPathSeparator, "D:/test" }, + PathSerializationParams{ AZ::IO::WindowsPathSeparator, "test/foo/../bar" } + ) + ); } From c0fb80fd993a09e4928444d9925badf73f598e3e Mon Sep 17 00:00:00 2001 From: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com> Date: Mon, 29 Nov 2021 14:38:10 -0600 Subject: [PATCH 25/58] Workaround for Editor freeze. (#6004) GHI bug https://github.com/o3de/o3de/issues/5866 describes a scenario in which the Editor freezes on 6-thread CPUs. This occurs because the Job Manager ends up with only 2 threads. The freeze occurs when the main thread spawns a culling job and blocks on it, a Mesh Feature Processor job spawns processing jobs and blocks on them, and a Material/ShaderVariant load queues an asset load and blocks on it. No new jobs can get started, and the main thread can't continue to process the asset load, so it freezes. This workaround boosts the minimum number of threads from 2 to 3 by default, which fixes this specific scenario. The longer-term fix would be to fix any jobs that block on other jobs to no longer block, so that even 1 job thread would work correctly. Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com> --- Code/Framework/AzCore/AzCore/Jobs/JobManagerComponent.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Code/Framework/AzCore/AzCore/Jobs/JobManagerComponent.cpp b/Code/Framework/AzCore/AzCore/Jobs/JobManagerComponent.cpp index acf24e8d42..009b6b19dc 100644 --- a/Code/Framework/AzCore/AzCore/Jobs/JobManagerComponent.cpp +++ b/Code/Framework/AzCore/AzCore/Jobs/JobManagerComponent.cpp @@ -24,7 +24,7 @@ AZ_CVAR(float, cl_jobThreadsConcurrencyRatio, 0.6f, nullptr, AZ::ConsoleFunctorFlags::Null, "Legacy Job system multiplier on the number of hw threads the machine creates at initialization"); AZ_CVAR(uint32_t, cl_jobThreadsNumReserved, 2, nullptr, AZ::ConsoleFunctorFlags::Null, "Legacy Job system number of hardware threads that are reserved for O3DE system threads"); -AZ_CVAR(uint32_t, cl_jobThreadsMinNumber, 2, nullptr, AZ::ConsoleFunctorFlags::Null, "Legacy Job system minimum number of worker threads to create after scaling the number of hw threads"); +AZ_CVAR(uint32_t, cl_jobThreadsMinNumber, 3, nullptr, AZ::ConsoleFunctorFlags::Null, "Legacy Job system minimum number of worker threads to create after scaling the number of hw threads"); namespace AZ { From ba732480d07dd0f58138e449c6765c8636fcd814 Mon Sep 17 00:00:00 2001 From: amzn-sj Date: Mon, 29 Nov 2021 12:41:33 -0800 Subject: [PATCH 26/58] Remove LyShineExample Gem's dependency on LmbrCentral and address feedback from previous PR with similar fix for ScriptCanvas Signed-off-by: amzn-sj --- Gems/LmbrCentral/Code/CMakeLists.txt | 11 + Gems/LmbrCentral/Code/lmbrcentral_files.cmake | 53 --- .../Code/lmbrcentral_headers_files.cmake | 63 +++ Gems/LyShineExamples/Code/CMakeLists.txt | 2 +- Gems/ScriptCanvas/Code/CMakeLists.txt | 5 +- .../Code/scriptcanvasgem_common_files.cmake | 365 ------------------ Gems/ScriptCanvasPhysics/Code/CMakeLists.txt | 2 +- 7 files changed, 79 insertions(+), 422 deletions(-) create mode 100644 Gems/LmbrCentral/Code/lmbrcentral_headers_files.cmake diff --git a/Gems/LmbrCentral/Code/CMakeLists.txt b/Gems/LmbrCentral/Code/CMakeLists.txt index b047a9f65e..2df0bd0632 100644 --- a/Gems/LmbrCentral/Code/CMakeLists.txt +++ b/Gems/LmbrCentral/Code/CMakeLists.txt @@ -13,6 +13,7 @@ ly_add_target( NAME LmbrCentral.Static STATIC NAMESPACE Gem FILES_CMAKE + lmbrcentral_headers_files.cmake lmbrcentral_files.cmake ${pal_dir}/platform_${PAL_PLATFORM_NAME_LOWERCASE}_files.cmake INCLUDE_DIRECTORIES @@ -27,6 +28,16 @@ ly_add_target( AZ::AzFramework ) +ly_add_target( + NAME LmbrCentral.API HEADERONLY + NAMESPACE Gem + FILES_CMAKE + lmbrcentral_headers_files.cmake + INCLUDE_DIRECTORIES + INTERFACE + include +) + ly_add_target( NAME LmbrCentral ${PAL_TRAIT_MONOLITHIC_DRIVEN_MODULE_TYPE} NAMESPACE Gem diff --git a/Gems/LmbrCentral/Code/lmbrcentral_files.cmake b/Gems/LmbrCentral/Code/lmbrcentral_files.cmake index 20a366b5f7..10c9029777 100644 --- a/Gems/LmbrCentral/Code/lmbrcentral_files.cmake +++ b/Gems/LmbrCentral/Code/lmbrcentral_files.cmake @@ -7,59 +7,6 @@ # set(FILES - include/LmbrCentral/Ai/NavigationComponentBus.h - include/LmbrCentral/Ai/NavigationAreaBus.h - include/LmbrCentral/Ai/NavigationSystemBus.h - include/LmbrCentral/Ai/NavigationSeedBus.h - include/LmbrCentral/Animation/AttachmentComponentBus.h - include/LmbrCentral/Animation/SkeletalHierarchyRequestBus.h - include/LmbrCentral/Audio/AudioEnvironmentComponentBus.h - include/LmbrCentral/Audio/AudioListenerComponentBus.h - include/LmbrCentral/Audio/AudioMultiPositionComponentBus.h - include/LmbrCentral/Audio/AudioPreloadComponentBus.h - include/LmbrCentral/Audio/AudioProxyComponentBus.h - include/LmbrCentral/Audio/AudioRtpcComponentBus.h - include/LmbrCentral/Audio/AudioSwitchComponentBus.h - include/LmbrCentral/Audio/AudioSystemComponentBus.h - include/LmbrCentral/Audio/AudioTriggerComponentBus.h - include/LmbrCentral/Bundling/BundlingSystemComponentBus.h - include/LmbrCentral/Geometry/GeometrySystemComponentBus.h - include/LmbrCentral/Dependency/DependencyMonitor.h - include/LmbrCentral/Dependency/DependencyMonitor.inl - include/LmbrCentral/Dependency/DependencyNotificationBus.h - include/LmbrCentral/Physics/WindVolumeRequestBus.h - include/LmbrCentral/Physics/ForceVolumeRequestBus.h - include/LmbrCentral/Physics/WaterNotificationBus.h - include/LmbrCentral/Rendering/DecalComponentBus.h - include/LmbrCentral/Rendering/LightComponentBus.h - include/LmbrCentral/Rendering/MaterialAsset.h - include/LmbrCentral/Rendering/MaterialHandle.h - include/LmbrCentral/Rendering/MeshAsset.h - include/LmbrCentral/Rendering/MeshModificationBus.h - include/LmbrCentral/Rendering/RenderNodeBus.h - include/LmbrCentral/Rendering/GiRegistrationBus.h - include/LmbrCentral/Rendering/RenderBoundsBus.h - include/LmbrCentral/Scripting/EditorTagComponentBus.h - include/LmbrCentral/Scripting/GameplayNotificationBus.h - include/LmbrCentral/Scripting/SimpleStateComponentBus.h - include/LmbrCentral/Scripting/SpawnerComponentBus.h - include/LmbrCentral/Scripting/RandomTimedSpawnerComponentBus.h - include/LmbrCentral/Scripting/TagComponentBus.h - include/LmbrCentral/Shape/EditorShapeComponentBus.h - include/LmbrCentral/Shape/ShapeComponentBus.h - include/LmbrCentral/Shape/SphereShapeComponentBus.h - include/LmbrCentral/Shape/BoxShapeComponentBus.h - include/LmbrCentral/Shape/CylinderShapeComponentBus.h - include/LmbrCentral/Shape/CapsuleShapeComponentBus.h - include/LmbrCentral/Shape/DiskShapeComponentBus.h - include/LmbrCentral/Shape/CompoundShapeComponentBus.h - include/LmbrCentral/Shape/QuadShapeComponentBus.h - include/LmbrCentral/Shape/SplineComponentBus.h - include/LmbrCentral/Shape/PolygonPrismShapeComponentBus.h - include/LmbrCentral/Shape/TubeShapeComponentBus.h - include/LmbrCentral/Shape/SplineAttribute.h - include/LmbrCentral/Shape/SplineAttribute.inl - include/LmbrCentral/Terrain/TerrainSystemRequestBus.h Source/Ai/NavigationSystemComponent.h Source/Ai/NavigationSystemComponent.cpp Source/Audio/AudioAreaEnvironmentComponent.h diff --git a/Gems/LmbrCentral/Code/lmbrcentral_headers_files.cmake b/Gems/LmbrCentral/Code/lmbrcentral_headers_files.cmake new file mode 100644 index 0000000000..76b5412c58 --- /dev/null +++ b/Gems/LmbrCentral/Code/lmbrcentral_headers_files.cmake @@ -0,0 +1,63 @@ +# +# 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 + include/LmbrCentral/Ai/NavigationComponentBus.h + include/LmbrCentral/Ai/NavigationAreaBus.h + include/LmbrCentral/Ai/NavigationSystemBus.h + include/LmbrCentral/Ai/NavigationSeedBus.h + include/LmbrCentral/Animation/AttachmentComponentBus.h + include/LmbrCentral/Animation/SkeletalHierarchyRequestBus.h + include/LmbrCentral/Audio/AudioEnvironmentComponentBus.h + include/LmbrCentral/Audio/AudioListenerComponentBus.h + include/LmbrCentral/Audio/AudioMultiPositionComponentBus.h + include/LmbrCentral/Audio/AudioPreloadComponentBus.h + include/LmbrCentral/Audio/AudioProxyComponentBus.h + include/LmbrCentral/Audio/AudioRtpcComponentBus.h + include/LmbrCentral/Audio/AudioSwitchComponentBus.h + include/LmbrCentral/Audio/AudioSystemComponentBus.h + include/LmbrCentral/Audio/AudioTriggerComponentBus.h + include/LmbrCentral/Bundling/BundlingSystemComponentBus.h + include/LmbrCentral/Geometry/GeometrySystemComponentBus.h + include/LmbrCentral/Dependency/DependencyMonitor.h + include/LmbrCentral/Dependency/DependencyMonitor.inl + include/LmbrCentral/Dependency/DependencyNotificationBus.h + include/LmbrCentral/Physics/WindVolumeRequestBus.h + include/LmbrCentral/Physics/ForceVolumeRequestBus.h + include/LmbrCentral/Physics/WaterNotificationBus.h + include/LmbrCentral/Rendering/DecalComponentBus.h + include/LmbrCentral/Rendering/LightComponentBus.h + include/LmbrCentral/Rendering/MaterialAsset.h + include/LmbrCentral/Rendering/MaterialHandle.h + include/LmbrCentral/Rendering/MeshAsset.h + include/LmbrCentral/Rendering/MeshModificationBus.h + include/LmbrCentral/Rendering/RenderNodeBus.h + include/LmbrCentral/Rendering/GiRegistrationBus.h + include/LmbrCentral/Rendering/RenderBoundsBus.h + include/LmbrCentral/Scripting/EditorTagComponentBus.h + include/LmbrCentral/Scripting/GameplayNotificationBus.h + include/LmbrCentral/Scripting/SimpleStateComponentBus.h + include/LmbrCentral/Scripting/SpawnerComponentBus.h + include/LmbrCentral/Scripting/RandomTimedSpawnerComponentBus.h + include/LmbrCentral/Scripting/TagComponentBus.h + include/LmbrCentral/Shape/EditorShapeComponentBus.h + include/LmbrCentral/Shape/ShapeComponentBus.h + include/LmbrCentral/Shape/SphereShapeComponentBus.h + include/LmbrCentral/Shape/BoxShapeComponentBus.h + include/LmbrCentral/Shape/CylinderShapeComponentBus.h + include/LmbrCentral/Shape/CapsuleShapeComponentBus.h + include/LmbrCentral/Shape/DiskShapeComponentBus.h + include/LmbrCentral/Shape/CompoundShapeComponentBus.h + include/LmbrCentral/Shape/QuadShapeComponentBus.h + include/LmbrCentral/Shape/SplineComponentBus.h + include/LmbrCentral/Shape/PolygonPrismShapeComponentBus.h + include/LmbrCentral/Shape/TubeShapeComponentBus.h + include/LmbrCentral/Shape/SplineAttribute.h + include/LmbrCentral/Shape/SplineAttribute.inl + include/LmbrCentral/Terrain/TerrainSystemRequestBus.h +) \ No newline at end of file diff --git a/Gems/LyShineExamples/Code/CMakeLists.txt b/Gems/LyShineExamples/Code/CMakeLists.txt index 5cd023db02..6e8f53d5cd 100644 --- a/Gems/LyShineExamples/Code/CMakeLists.txt +++ b/Gems/LyShineExamples/Code/CMakeLists.txt @@ -37,7 +37,7 @@ ly_add_target( BUILD_DEPENDENCIES PRIVATE Gem::LyShineExamples.Static - Gem::LmbrCentral + Gem::LmbrCentral.API ) # if enabled, LyShineExamples is used by all kinds of applications, however, the dependency to LmbrCentral is different diff --git a/Gems/ScriptCanvas/Code/CMakeLists.txt b/Gems/ScriptCanvas/Code/CMakeLists.txt index 25b0099e88..f83f0d3593 100644 --- a/Gems/ScriptCanvas/Code/CMakeLists.txt +++ b/Gems/ScriptCanvas/Code/CMakeLists.txt @@ -57,6 +57,7 @@ ly_add_target( NAME ScriptCanvas.Static STATIC NAMESPACE Gem FILES_CMAKE + scriptcanvasgem_headers.cmake scriptcanvasgem_common_files.cmake scriptcanvasgem_runtime_asset_files.cmake INCLUDE_DIRECTORIES @@ -90,7 +91,7 @@ ly_add_target( ) ly_add_target( - NAME ScriptCanvasAPI HEADERONLY + NAME ScriptCanvas.API HEADERONLY NAMESPACE Gem FILES_CMAKE scriptcanvasgem_headers.cmake @@ -102,7 +103,7 @@ ly_add_target( INTERFACE . Include - Include/ScriptCanvas + ${SCRIPT_CANVAS_AUTOGEN_BUILD_DIR} ) ly_add_target( diff --git a/Gems/ScriptCanvas/Code/scriptcanvasgem_common_files.cmake b/Gems/ScriptCanvas/Code/scriptcanvasgem_common_files.cmake index 7984340b7a..eb50f5cb51 100644 --- a/Gems/ScriptCanvas/Code/scriptcanvasgem_common_files.cmake +++ b/Gems/ScriptCanvas/Code/scriptcanvasgem_common_files.cmake @@ -7,575 +7,210 @@ # set(FILES - Include/ScriptCanvas/SystemComponent.h Source/SystemComponent.cpp Source/ScriptCanvasCommonGem.cpp Source/PerformanceStatistician.cpp Source/PerformanceTracker.cpp - Include/ScriptCanvas/ScriptCanvasGem.h - Include/ScriptCanvas/Asset/AssetDescription.h Include/ScriptCanvas/Asset/AssetRegistry.cpp - Include/ScriptCanvas/Asset/AssetRegistry.h - Include/ScriptCanvas/Asset/AssetRegistryBus.h Include/ScriptCanvas/Asset/ExecutionLogAsset.cpp - Include/ScriptCanvas/Asset/ExecutionLogAsset.h - Include/ScriptCanvas/Asset/ExecutionLogAssetBus.h Include/ScriptCanvas/Asset/RuntimeAsset.cpp - Include/ScriptCanvas/Asset/RuntimeAsset.h Include/ScriptCanvas/Asset/RuntimeAssetHandler.cpp - Include/ScriptCanvas/Asset/RuntimeAssetHandler.h - Include/ScriptCanvas/Asset/ScriptCanvasAssetBase.h - Include/ScriptCanvas/Asset/ScriptCanvasAssetData.h Include/ScriptCanvas/Asset/SubgraphInterfaceAssetHandler.cpp - Include/ScriptCanvas/Asset/SubgraphInterfaceAssetHandler.h - Include/ScriptCanvas/Core/ScriptCanvasBus.h Include/ScriptCanvas/Core/ExecutionNotificationsBus.cpp - Include/ScriptCanvas/Core/ExecutionNotificationsBus.h - Include/ScriptCanvas/Core/GraphBus.h - Include/ScriptCanvas/Core/NodeBus.h - Include/ScriptCanvas/Core/EBusNodeBus.h - Include/ScriptCanvas/Core/NodelingBus.h - Include/ScriptCanvas/Core/ContractBus.h - Include/ScriptCanvas/Core/Attributes.h Include/ScriptCanvas/Core/Connection.cpp - Include/ScriptCanvas/Core/Connection.h - Include/ScriptCanvas/Core/ConnectionBus.h Include/ScriptCanvas/Core/Contract.cpp - Include/ScriptCanvas/Core/Contract.h - Include/ScriptCanvas/Core/Contracts.h - Include/ScriptCanvas/Core/Contracts/MethodOverloadContract.h Include/ScriptCanvas/Core/Contracts/MethodOverloadContract.cpp - Include/ScriptCanvas/Core/Contracts/RestrictedNodeContract.h Include/ScriptCanvas/Core/Contracts/RestrictedNodeContract.cpp Include/ScriptCanvas/Core/Core.cpp - Include/ScriptCanvas/Core/Core.h Include/ScriptCanvas/Core/Datum.cpp - Include/ScriptCanvas/Core/Datum.h - Include/ScriptCanvas/Core/DatumBus.h - Include/ScriptCanvas/Core/EBusHandler.h Include/ScriptCanvas/Core/EBusHandler.cpp Include/ScriptCanvas/Core/Endpoint.cpp - Include/ScriptCanvas/Core/Endpoint.h Include/ScriptCanvas/Core/Graph.cpp - Include/ScriptCanvas/Core/Graph.h - Include/ScriptCanvas/Core/GraphData.h Include/ScriptCanvas/Core/GraphData.cpp - Include/ScriptCanvas/Core/GraphScopedTypes.h - Include/ScriptCanvas/Core/MethodConfiguration.h Include/ScriptCanvas/Core/MethodConfiguration.cpp Include/ScriptCanvas/Core/ModifiableDatumView.cpp - Include/ScriptCanvas/Core/ModifiableDatumView.h Include/ScriptCanvas/Core/Node.cpp - Include/ScriptCanvas/Core/Node.h Include/ScriptCanvas/Core/Nodeable.cpp - Include/ScriptCanvas/Core/Nodeable.h Include/ScriptCanvas/Core/NodeableNode.cpp - Include/ScriptCanvas/Core/NodeableNode.h Include/ScriptCanvas/Core/NodeableNodeOverloaded.cpp - Include/ScriptCanvas/Core/NodeableNodeOverloaded.h - Include/ScriptCanvas/Core/NodeFunctionGeneric.h - Include/ScriptCanvas/Core/SerializationListener.h Include/ScriptCanvas/Core/Slot.cpp - Include/ScriptCanvas/Core/Slot.h - Include/ScriptCanvas/Core/SlotConfigurationDefaults.h Include/ScriptCanvas/Core/SlotConfigurations.cpp - Include/ScriptCanvas/Core/SlotConfigurations.h Include/ScriptCanvas/Core/SlotExecutionMap.cpp - Include/ScriptCanvas/Core/SlotExecutionMap.h Include/ScriptCanvas/Core/SlotMetadata.cpp - Include/ScriptCanvas/Core/SlotMetadata.h - Include/ScriptCanvas/Core/SlotNames.h - Include/ScriptCanvas/Core/SubgraphInterface.h Include/ScriptCanvas/Core/SubgraphInterface.cpp - Include/ScriptCanvas/Core/SubgraphInterfaceUtility.h Include/ScriptCanvas/Core/SubgraphInterfaceUtility.cpp - Include/ScriptCanvas/Translation/AbstractModelTranslator.h - Include/ScriptCanvas/Translation/Configuration.h Include/ScriptCanvas/Translation/GraphToCPlusPlus.cpp - Include/ScriptCanvas/Translation/GraphToCPlusPlus.h - Include/ScriptCanvas/Translation/GraphToLua.h Include/ScriptCanvas/Translation/GraphToLua.cpp - Include/ScriptCanvas/Translation/GraphToLuaUtility.h Include/ScriptCanvas/Translation/GraphToLuaUtility.cpp - Include/ScriptCanvas/Translation/GraphToX.h Include/ScriptCanvas/Translation/GraphToX.cpp - Include/ScriptCanvas/Translation/Translation.h Include/ScriptCanvas/Translation/Translation.cpp - Include/ScriptCanvas/Translation/TranslationContext.h Include/ScriptCanvas/Translation/TranslationContext.cpp - Include/ScriptCanvas/Translation/TranslationResult.h Include/ScriptCanvas/Translation/TranslationResult.cpp - Include/ScriptCanvas/Translation/TranslationUtilities.h Include/ScriptCanvas/Translation/TranslationUtilities.cpp - Include/ScriptCanvas/PerformanceStatistician.h - Include/ScriptCanvas/PerformanceStatisticsBus.h - Include/ScriptCanvas/PerformanceTracker.h - Include/ScriptCanvas/AutoGen/ScriptCanvas_Macros.jinja - Include/ScriptCanvas/AutoGen/ScriptCanvas_Nodeable_Macros.jinja - Include/ScriptCanvas/AutoGen/ScriptCanvasGrammar_Header.jinja - Include/ScriptCanvas/AutoGen/ScriptCanvasGrammar_Source.jinja - Include/ScriptCanvas/AutoGen/ScriptCanvasNodeable_Header.jinja - Include/ScriptCanvas/AutoGen/ScriptCanvasNodeable_Source.jinja - Include/ScriptCanvas/CodeGen/NodeableCodegen.h Include/ScriptCanvas/Core/Contracts/ConnectionLimitContract.cpp - Include/ScriptCanvas/Core/Contracts/ConnectionLimitContract.h Include/ScriptCanvas/Core/Contracts/ContractRTTI.cpp - Include/ScriptCanvas/Core/Contracts/ContractRTTI.h Include/ScriptCanvas/Core/Contracts/DisallowReentrantExecutionContract.cpp - Include/ScriptCanvas/Core/Contracts/DisallowReentrantExecutionContract.h Include/ScriptCanvas/Core/Contracts/DisplayGroupConnectedSlotLimitContract.cpp - Include/ScriptCanvas/Core/Contracts/DisplayGroupConnectedSlotLimitContract.h Include/ScriptCanvas/Core/Contracts/DynamicTypeContract.cpp - Include/ScriptCanvas/Core/Contracts/DynamicTypeContract.h Include/ScriptCanvas/Core/Contracts/IsReferenceTypeContract.cpp - Include/ScriptCanvas/Core/Contracts/IsReferenceTypeContract.h Include/ScriptCanvas/Core/Contracts/MathOperatorContract.cpp - Include/ScriptCanvas/Core/Contracts/MathOperatorContract.h Include/ScriptCanvas/Core/Contracts/SlotTypeContract.cpp - Include/ScriptCanvas/Core/Contracts/SlotTypeContract.h Include/ScriptCanvas/Core/Contracts/SupportsMethodContract.cpp - Include/ScriptCanvas/Core/Contracts/SupportsMethodContract.h Include/ScriptCanvas/Core/Contracts/TypeContract.cpp - Include/ScriptCanvas/Core/Contracts/TypeContract.h Include/ScriptCanvas/Data/BehaviorContextObject.cpp - Include/ScriptCanvas/Data/BehaviorContextObject.h Include/ScriptCanvas/Data/BehaviorContextObjectPtr.cpp - Include/ScriptCanvas/Data/BehaviorContextObjectPtr.h Include/ScriptCanvas/Data/Data.cpp - Include/ScriptCanvas/Data/Data.h - Include/ScriptCanvas/Data/DataMacros.h Include/ScriptCanvas/Data/DataRegistry.cpp - Include/ScriptCanvas/Data/DataRegistry.h - Include/ScriptCanvas/Data/NumericData.h - Include/ScriptCanvas/Deprecated/VariableDatumBase.h Include/ScriptCanvas/Deprecated/VariableDatumBase.cpp - Include/ScriptCanvas/Deprecated/VariableDatum.h Include/ScriptCanvas/Deprecated/VariableDatum.cpp - Include/ScriptCanvas/Deprecated/VariableHelpers.h Include/ScriptCanvas/Deprecated/VariableHelpers.cpp - Include/ScriptCanvas/Execution/ErrorBus.h - Include/ScriptCanvas/Execution/ExecutionBus.h - Include/ScriptCanvas/Execution/ExecutionContext.h Include/ScriptCanvas/Execution/ExecutionContext.cpp - Include/ScriptCanvas/Execution/ExecutionObjectCloning.h Include/ScriptCanvas/Execution/ExecutionObjectCloning.cpp - Include/ScriptCanvas/Execution/ExecutionPerformanceTimer.h Include/ScriptCanvas/Execution/ExecutionPerformanceTimer.cpp - Include/ScriptCanvas/Execution/ExecutionState.h Include/ScriptCanvas/Execution/ExecutionState.cpp - Include/ScriptCanvas/Execution/ExecutionStateDeclarations.h - Include/ScriptCanvas/Execution/NativeHostDeclarations.h Include/ScriptCanvas/Execution/NativeHostDeclarations.cpp - Include/ScriptCanvas/Execution/NativeHostDefinitions.h Include/ScriptCanvas/Execution/NativeHostDefinitions.cpp - Include/ScriptCanvas/Execution/RuntimeComponent.h Include/ScriptCanvas/Execution/RuntimeComponent.cpp - Include/ScriptCanvas/Execution/Interpreted/ExecutionInterpretedAPI.h Include/ScriptCanvas/Execution/Interpreted/ExecutionInterpretedAPI.cpp - Include/ScriptCanvas/Execution/Interpreted/ExecutionInterpretedCloningAPI.h Include/ScriptCanvas/Execution/Interpreted/ExecutionInterpretedCloningAPI.cpp - Include/ScriptCanvas/Execution/Interpreted/ExecutionInterpretedDebugAPI.h Include/ScriptCanvas/Execution/Interpreted/ExecutionInterpretedDebugAPI.cpp - Include/ScriptCanvas/Execution/Interpreted/ExecutionInterpretedEBusAPI.h Include/ScriptCanvas/Execution/Interpreted/ExecutionInterpretedEBusAPI.cpp - Include/ScriptCanvas/Execution/Interpreted/ExecutionInterpretedOut.h Include/ScriptCanvas/Execution/Interpreted/ExecutionInterpretedOut.cpp - Include/ScriptCanvas/Execution/Interpreted/ExecutionStateInterpreted.h Include/ScriptCanvas/Execution/Interpreted/ExecutionStateInterpreted.cpp - Include/ScriptCanvas/Execution/Interpreted/ExecutionStateInterpretedPerActivation.h Include/ScriptCanvas/Execution/Interpreted/ExecutionStateInterpretedPerActivation.cpp - Include/ScriptCanvas/Execution/Interpreted/ExecutionStateInterpretedPure.h Include/ScriptCanvas/Execution/Interpreted/ExecutionStateInterpretedPure.cpp - Include/ScriptCanvas/Execution/Interpreted/ExecutionStateInterpretedSingleton.h Include/ScriptCanvas/Execution/Interpreted/ExecutionStateInterpretedSingleton.cpp - Include/ScriptCanvas/Execution/Interpreted/ExecutionStateInterpretedUtility.h Include/ScriptCanvas/Execution/Interpreted/ExecutionStateInterpretedUtility.cpp - Include/ScriptCanvas/Execution/NodeableOut/NodeableOutNative.h - Include/ScriptCanvas/Grammar/AbstractCodeModel.h Include/ScriptCanvas/Grammar/AbstractCodeModel.cpp - Include/ScriptCanvas/Grammar/DebugMap.h Include/ScriptCanvas/Grammar/DebugMap.cpp - Include/ScriptCanvas/Grammar/ExecutionTraversalListeners.h Include/ScriptCanvas/Grammar/ExecutionTraversalListeners.cpp - Include/ScriptCanvas/Grammar/ParsingMetaData.h Include/ScriptCanvas/Grammar/ParsingMetaData.cpp - Include/ScriptCanvas/Grammar/ParsingUtilities.h Include/ScriptCanvas/Grammar/ParsingUtilities.cpp - Include/ScriptCanvas/Grammar/Primitives.h Include/ScriptCanvas/Grammar/Primitives.cpp - Include/ScriptCanvas/Grammar/PrimitivesDeclarations.h Include/ScriptCanvas/Grammar/PrimitivesDeclarations.cpp Include/ScriptCanvas/Grammar/PrimitivesExecution.cpp - Include/ScriptCanvas/Grammar/PrimitivesExecution.h - Include/ScriptCanvas/Grammar/SymbolNames.h - Include/ScriptCanvas/Execution/ErrorBus.h Include/ScriptCanvas/Execution/ExecutionContext.cpp - Include/ScriptCanvas/Execution/ExecutionContext.h - Include/ScriptCanvas/Execution/ExecutionBus.h Include/ScriptCanvas/Execution/NativeHostDeclarations.cpp - Include/ScriptCanvas/Execution/NativeHostDeclarations.h Include/ScriptCanvas/Execution/NativeHostDefinitions.cpp - Include/ScriptCanvas/Execution/NativeHostDefinitions.h Include/ScriptCanvas/Execution/RuntimeComponent.cpp - Include/ScriptCanvas/Execution/RuntimeComponent.h Include/ScriptCanvas/Internal/Nodeables/BaseTimer.cpp - Include/ScriptCanvas/Internal/Nodeables/BaseTimer.h - Include/ScriptCanvas/Internal/Nodeables/BaseTimer.ScriptCanvasNodeable.xml Include/ScriptCanvas/Internal/Nodes/BaseTimerNode.cpp - Include/ScriptCanvas/Internal/Nodes/BaseTimerNode.h - Include/ScriptCanvas/Internal/Nodes/BaseTimerNode.ScriptCanvasGrammar.xml Include/ScriptCanvas/Internal/Nodes/ExpressionNodeBase.cpp - Include/ScriptCanvas/Internal/Nodes/ExpressionNodeBase.h - Include/ScriptCanvas/Internal/Nodes/ExpressionNodeBase.ScriptCanvasGrammar.xml Include/ScriptCanvas/Internal/Nodes/StringFormatted.cpp - Include/ScriptCanvas/Internal/Nodes/StringFormatted.h - Include/ScriptCanvas/Internal/Nodes/StringFormatted.ScriptCanvasGrammar.xml Include/ScriptCanvas/Grammar/AbstractCodeModel.cpp - Include/ScriptCanvas/Grammar/AbstractCodeModel.h - Include/ScriptCanvas/Libraries/Libraries.h Include/ScriptCanvas/Libraries/Libraries.cpp Include/ScriptCanvas/Libraries/Core/AzEventHandler.cpp - Include/ScriptCanvas/Libraries/Core/AzEventHandler.h - Include/ScriptCanvas/Libraries/Core/AzEventHandler.ScriptCanvasGrammar.xml Include/ScriptCanvas/Libraries/Core/BinaryOperator.cpp - Include/ScriptCanvas/Libraries/Core/BinaryOperator.h Include/ScriptCanvas/Libraries/Core/CoreNodes.cpp - Include/ScriptCanvas/Libraries/Core/CoreNodes.h - Include/ScriptCanvas/Libraries/Core/ContainerTypeReflection.h Include/ScriptCanvas/Libraries/Core/EBusEventHandler.cpp - Include/ScriptCanvas/Libraries/Core/EBusEventHandler.h - Include/ScriptCanvas/Libraries/Core/EBusEventHandler.ScriptCanvasGrammar.xml Include/ScriptCanvas/Libraries/Core/ExtractProperty.cpp - Include/ScriptCanvas/Libraries/Core/ExtractProperty.h - Include/ScriptCanvas/Libraries/Core/ExtractProperty.ScriptCanvasGrammar.xml - Include/ScriptCanvas/Libraries/Core/EventHandlerTranslationUtility.h Include/ScriptCanvas/Libraries/Core/EventHandlerTranslationUtility.cpp Include/ScriptCanvas/Libraries/Core/ForEach.cpp - Include/ScriptCanvas/Libraries/Core/ForEach.h - Include/ScriptCanvas/Libraries/Core/ForEach.ScriptCanvasGrammar.xml - Include/ScriptCanvas/Libraries/Core/FunctionBus.h Include/ScriptCanvas/Libraries/Core/FunctionCallNode.cpp - Include/ScriptCanvas/Libraries/Core/FunctionCallNode.h - Include/ScriptCanvas/Libraries/Core/FunctionCallNode.ScriptCanvasGrammar.xml - Include/ScriptCanvas/Libraries/Core/FunctionCallNodeIsOutOfDate.h Include/ScriptCanvas/Libraries/Core/FunctionCallNodeIsOutOfDate.cpp Include/ScriptCanvas/Libraries/Core/FunctionDefinitionNode.cpp - Include/ScriptCanvas/Libraries/Core/FunctionDefinitionNode.h - Include/ScriptCanvas/Libraries/Core/FunctionDefinitionNode.ScriptCanvasGrammar.xml Include/ScriptCanvas/Libraries/Core/GetVariable.cpp - Include/ScriptCanvas/Libraries/Core/GetVariable.h - Include/ScriptCanvas/Libraries/Core/GetVariable.ScriptCanvasGrammar.xml Include/ScriptCanvas/Libraries/Core/Method.cpp - Include/ScriptCanvas/Libraries/Core/Method.h Include/ScriptCanvas/Libraries/Core/MethodOverloaded.cpp - Include/ScriptCanvas/Libraries/Core/MethodOverloaded.h Include/ScriptCanvas/Libraries/Core/MethodUtility.cpp - Include/ScriptCanvas/Libraries/Core/MethodUtility.h Include/ScriptCanvas/Libraries/Core/Nodeling.cpp - Include/ScriptCanvas/Libraries/Core/Nodeling.h - Include/ScriptCanvas/Libraries/Core/Nodeling.ScriptCanvasGrammar.xml Include/ScriptCanvas/Libraries/Core/ReceiveScriptEvent.cpp - Include/ScriptCanvas/Libraries/Core/ReceiveScriptEvent.h - Include/ScriptCanvas/Libraries/Core/ReceiveScriptEvent.ScriptCanvasGrammar.xml Include/ScriptCanvas/Libraries/Core/Repeater.cpp - Include/ScriptCanvas/Libraries/Core/Repeater.h - Include/ScriptCanvas/Libraries/Core/Repeater.ScriptCanvasGrammar.xml - Include/ScriptCanvas/Libraries/Core/RepeaterNodeable.h Include/ScriptCanvas/Libraries/Core/RepeaterNodeable.cpp - Include/ScriptCanvas/Libraries/Core/RepeaterNodeable.ScriptCanvasNodeable.xml Include/ScriptCanvas/Libraries/Core/ScriptEventBase.cpp - Include/ScriptCanvas/Libraries/Core/ScriptEventBase.h - Include/ScriptCanvas/Libraries/Core/ScriptEventBase.ScriptCanvasGrammar.xml Include/ScriptCanvas/Libraries/Core/SendScriptEvent.cpp - Include/ScriptCanvas/Libraries/Core/SendScriptEvent.h - Include/ScriptCanvas/Libraries/Core/SendScriptEvent.ScriptCanvasGrammar.xml Include/ScriptCanvas/Libraries/Core/SetVariable.cpp - Include/ScriptCanvas/Libraries/Core/SetVariable.h - Include/ScriptCanvas/Libraries/Core/SetVariable.ScriptCanvasGrammar.xml - Include/ScriptCanvas/Libraries/Core/Start.h - Include/ScriptCanvas/Libraries/Core/Start.ScriptCanvasGrammar.xml Include/ScriptCanvas/Libraries/Core/UnaryOperator.cpp - Include/ScriptCanvas/Libraries/Core/UnaryOperator.h Include/ScriptCanvas/Libraries/Entity/Entity.cpp - Include/ScriptCanvas/Libraries/Entity/Entity.h - Include/ScriptCanvas/Libraries/Entity/EntityNodes.h Include/ScriptCanvas/Libraries/Entity/RotateMethod.cpp - Include/ScriptCanvas/Libraries/Entity/RotateMethod.h - Include/ScriptCanvas/Libraries/Logic/And.h Include/ScriptCanvas/Libraries/Logic/Any.cpp - Include/ScriptCanvas/Libraries/Logic/Any.h - Include/ScriptCanvas/Libraries/Logic/Any.ScriptCanvasGrammar.xml - Include/ScriptCanvas/Libraries/Logic/Break.h Include/ScriptCanvas/Libraries/Logic/Break.cpp - Include/ScriptCanvas/Libraries/Logic/Break.ScriptCanvasGrammar.xml Include/ScriptCanvas/Libraries/Logic/Cycle.cpp - Include/ScriptCanvas/Libraries/Logic/Cycle.h - Include/ScriptCanvas/Libraries/Logic/Cycle.ScriptCanvasGrammar.xml Include/ScriptCanvas/Libraries/Logic/Gate.cpp - Include/ScriptCanvas/Libraries/Logic/Gate.h - Include/ScriptCanvas/Libraries/Logic/Gate.ScriptCanvasGrammar.xml - Include/ScriptCanvas/Libraries/Logic/Indexer.h - Include/ScriptCanvas/Libraries/Logic/Indexer.ScriptCanvasGrammar.xml Include/ScriptCanvas/Libraries/Logic/IsNull.cpp - Include/ScriptCanvas/Libraries/Logic/IsNull.h - Include/ScriptCanvas/Libraries/Logic/IsNull.ScriptCanvasGrammar.xml Include/ScriptCanvas/Libraries/Logic/Logic.cpp - Include/ScriptCanvas/Libraries/Logic/Logic.h - Include/ScriptCanvas/Libraries/Logic/Multiplexer.h - Include/ScriptCanvas/Libraries/Logic/Multiplexer.ScriptCanvasGrammar.xml - Include/ScriptCanvas/Libraries/Logic/Not.h Include/ScriptCanvas/Libraries/Logic/Once.cpp - Include/ScriptCanvas/Libraries/Logic/Once.h - Include/ScriptCanvas/Libraries/Logic/Once.ScriptCanvasGrammar.xml - Include/ScriptCanvas/Libraries/Logic/Or.h Include/ScriptCanvas/Libraries/Logic/OrderedSequencer.cpp - Include/ScriptCanvas/Libraries/Logic/OrderedSequencer.h - Include/ScriptCanvas/Libraries/Logic/OrderedSequencer.ScriptCanvasGrammar.xml Include/ScriptCanvas/Libraries/Logic/Sequencer.cpp - Include/ScriptCanvas/Libraries/Logic/Sequencer.h - Include/ScriptCanvas/Libraries/Logic/Sequencer.ScriptCanvasGrammar.xml Include/ScriptCanvas/Libraries/Logic/TargetedSequencer.cpp - Include/ScriptCanvas/Libraries/Logic/TargetedSequencer.h - Include/ScriptCanvas/Libraries/Logic/TargetedSequencer.ScriptCanvasGrammar.xml Include/ScriptCanvas/Libraries/Logic/WeightedRandomSequencer.cpp - Include/ScriptCanvas/Libraries/Logic/WeightedRandomSequencer.h - Include/ScriptCanvas/Libraries/Logic/WeightedRandomSequencer.ScriptCanvasGrammar.xml Include/ScriptCanvas/Libraries/Logic/While.cpp - Include/ScriptCanvas/Libraries/Logic/While.h - Include/ScriptCanvas/Libraries/Logic/While.ScriptCanvasGrammar.xml - Include/ScriptCanvas/Libraries/Math/AABBNodes.h - Include/ScriptCanvas/Libraries/Math/ColorNodes.h - Include/ScriptCanvas/Libraries/Math/CRCNodes.h - Include/ScriptCanvas/Libraries/Math/Divide.h Include/ScriptCanvas/Libraries/Math/Math.cpp - Include/ScriptCanvas/Libraries/Math/Math.h Include/ScriptCanvas/Libraries/Math/MathExpression.cpp - Include/ScriptCanvas/Libraries/Math/MathExpression.h - Include/ScriptCanvas/Libraries/Math/MathExpression.ScriptCanvasGrammar.xml Include/ScriptCanvas/Libraries/Math/MathNodeUtilities.cpp - Include/ScriptCanvas/Libraries/Math/MathNodeUtilities.h - Include/ScriptCanvas/Libraries/Math/MathGenerics.h - Include/ScriptCanvas/Libraries/Math/MathRandom.h - Include/ScriptCanvas/Libraries/Math/Matrix3x3Nodes.h - Include/ScriptCanvas/Libraries/Math/Matrix4x4Nodes.h - Include/ScriptCanvas/Libraries/Math/Multiply.h - Include/ScriptCanvas/Libraries/Math/OBBNodes.h - Include/ScriptCanvas/Libraries/Math/PlaneNodes.h - Include/ScriptCanvas/Libraries/Math/RotationNodes.h - Include/ScriptCanvas/Libraries/Math/Subtract.h - Include/ScriptCanvas/Libraries/Math/Sum.h - Include/ScriptCanvas/Libraries/Math/TransformNodes.h - Include/ScriptCanvas/Libraries/Math/Vector2Nodes.h - Include/ScriptCanvas/Libraries/Math/Vector3Nodes.h - Include/ScriptCanvas/Libraries/Math/Vector4Nodes.h - Include/ScriptCanvas/Libraries/Comparison/Comparison.h Include/ScriptCanvas/Libraries/Comparison/Comparison.cpp - Include/ScriptCanvas/Libraries/Comparison/ComparisonFunctions.h - Include/ScriptCanvas/Libraries/Comparison/EqualTo.h - Include/ScriptCanvas/Libraries/Comparison/NotEqualTo.h - Include/ScriptCanvas/Libraries/Comparison/Less.h - Include/ScriptCanvas/Libraries/Comparison/Greater.h - Include/ScriptCanvas/Libraries/Comparison/LessEqual.h - Include/ScriptCanvas/Libraries/Comparison/GreaterEqual.h - Include/ScriptCanvas/Libraries/Time/Time.h Include/ScriptCanvas/Libraries/Time/Time.cpp Include/ScriptCanvas/Libraries/Time/Countdown.cpp - Include/ScriptCanvas/Libraries/Time/Countdown.h - Include/ScriptCanvas/Libraries/Time/Countdown.ScriptCanvasGrammar.xml - Include/ScriptCanvas/Libraries/Time/DelayNodeable.h Include/ScriptCanvas/Libraries/Time/DelayNodeable.cpp - Include/ScriptCanvas/Libraries/Time/DelayNodeable.ScriptCanvasNodeable.xml Include/ScriptCanvas/Libraries/Time/Duration.cpp - Include/ScriptCanvas/Libraries/Time/Duration.h - Include/ScriptCanvas/Libraries/Time/Duration.ScriptCanvasGrammar.xml Include/ScriptCanvas/Libraries/Time/HeartBeat.cpp - Include/ScriptCanvas/Libraries/Time/HeartBeat.h - Include/ScriptCanvas/Libraries/Time/HeartBeat.ScriptCanvasGrammar.xml Include/ScriptCanvas/Libraries/Time/Timer.cpp - Include/ScriptCanvas/Libraries/Time/Timer.h - Include/ScriptCanvas/Libraries/Time/Timer.ScriptCanvasGrammar.xml - Include/ScriptCanvas/Libraries/Time/TimeDelayNodeable.h Include/ScriptCanvas/Libraries/Time/TimeDelayNodeable.cpp - Include/ScriptCanvas/Libraries/Time/TimeDelayNodeable.ScriptCanvasNodeable.xml - Include/ScriptCanvas/Libraries/Time/DurationNodeable.h Include/ScriptCanvas/Libraries/Time/DurationNodeable.cpp - Include/ScriptCanvas/Libraries/Time/DurationNodeable.ScriptCanvasNodeable.xml - Include/ScriptCanvas/Libraries/Time/HeartBeatNodeable.h Include/ScriptCanvas/Libraries/Time/HeartBeatNodeable.cpp - Include/ScriptCanvas/Libraries/Time/HeartBeatNodeable.ScriptCanvasNodeable.xml - Include/ScriptCanvas/Libraries/Time/TimerNodeable.h Include/ScriptCanvas/Libraries/Time/TimerNodeable.cpp - Include/ScriptCanvas/Libraries/Time/TimerNodeable.ScriptCanvasNodeable.xml Include/ScriptCanvas/Libraries/Spawning/Spawning.cpp - Include/ScriptCanvas/Libraries/Spawning/Spawning.h Include/ScriptCanvas/Libraries/Spawning/SpawnNodeable.cpp - Include/ScriptCanvas/Libraries/Spawning/SpawnNodeable.h - Include/ScriptCanvas/Libraries/Spawning/SpawnNodeable.ScriptCanvasNodeable.xml Include/ScriptCanvas/Libraries/String/Contains.cpp - Include/ScriptCanvas/Libraries/String/Contains.h - Include/ScriptCanvas/Libraries/String/Contains.ScriptCanvasGrammar.xml Include/ScriptCanvas/Libraries/String/Format.cpp - Include/ScriptCanvas/Libraries/String/Format.h - Include/ScriptCanvas/Libraries/String/Format.ScriptCanvasGrammar.xml - Include/ScriptCanvas/Libraries/String/Print.h - Include/ScriptCanvas/Libraries/String/Print.ScriptCanvasGrammar.xml Include/ScriptCanvas/Libraries/String/Replace.cpp - Include/ScriptCanvas/Libraries/String/Replace.h - Include/ScriptCanvas/Libraries/String/Replace.ScriptCanvasGrammar.xml - Include/ScriptCanvas/Libraries/String/String.h Include/ScriptCanvas/Libraries/String/String.cpp - Include/ScriptCanvas/Libraries/String/StringMethods.h Include/ScriptCanvas/Libraries/String/StringMethods.cpp - Include/ScriptCanvas/Libraries/String/StringGenerics.h Include/ScriptCanvas/Libraries/String/Utilities.cpp - Include/ScriptCanvas/Libraries/String/Utilities.h - Include/ScriptCanvas/Libraries/String/Utilities.ScriptCanvasGrammar.xml Include/ScriptCanvas/Libraries/UnitTesting/AddFailure.cpp - Include/ScriptCanvas/Libraries/UnitTesting/AddFailure.h - Include/ScriptCanvas/Libraries/UnitTesting/AddFailure.ScriptCanvasGrammar.xml - Include/ScriptCanvas/Libraries/UnitTesting/AddSuccess.h - Include/ScriptCanvas/Libraries/UnitTesting/AddSuccess.ScriptCanvasGrammar.xml - Include/ScriptCanvas/Libraries/UnitTesting/Checkpoint.h - Include/ScriptCanvas/Libraries/UnitTesting/Checkpoint.ScriptCanvasGrammar.xml Include/ScriptCanvas/Libraries/UnitTesting/ExpectEqual.cpp - Include/ScriptCanvas/Libraries/UnitTesting/ExpectEqual.h - Include/ScriptCanvas/Libraries/UnitTesting/ExpectEqual.ScriptCanvasGrammar.xml Include/ScriptCanvas/Libraries/UnitTesting/ExpectFalse.cpp - Include/ScriptCanvas/Libraries/UnitTesting/ExpectFalse.h - Include/ScriptCanvas/Libraries/UnitTesting/ExpectFalse.ScriptCanvasGrammar.xml Include/ScriptCanvas/Libraries/UnitTesting/ExpectGreaterThan.cpp - Include/ScriptCanvas/Libraries/UnitTesting/ExpectGreaterThan.h - Include/ScriptCanvas/Libraries/UnitTesting/ExpectGreaterThan.ScriptCanvasGrammar.xml Include/ScriptCanvas/Libraries/UnitTesting/ExpectGreaterThanEqual.cpp - Include/ScriptCanvas/Libraries/UnitTesting/ExpectGreaterThanEqual.h - Include/ScriptCanvas/Libraries/UnitTesting/ExpectGreaterThanEqual.ScriptCanvasGrammar.xml Include/ScriptCanvas/Libraries/UnitTesting/ExpectLessThan.cpp - Include/ScriptCanvas/Libraries/UnitTesting/ExpectLessThan.h - Include/ScriptCanvas/Libraries/UnitTesting/ExpectLessThan.ScriptCanvasGrammar.xml Include/ScriptCanvas/Libraries/UnitTesting/ExpectLessThanEqual.cpp - Include/ScriptCanvas/Libraries/UnitTesting/ExpectLessThanEqual.h - Include/ScriptCanvas/Libraries/UnitTesting/ExpectLessThanEqual.ScriptCanvasGrammar.xml Include/ScriptCanvas/Libraries/UnitTesting/ExpectNotEqual.cpp - Include/ScriptCanvas/Libraries/UnitTesting/ExpectNotEqual.h - Include/ScriptCanvas/Libraries/UnitTesting/ExpectNotEqual.ScriptCanvasGrammar.xml Include/ScriptCanvas/Libraries/UnitTesting/ExpectTrue.cpp - Include/ScriptCanvas/Libraries/UnitTesting/ExpectTrue.h - Include/ScriptCanvas/Libraries/UnitTesting/ExpectTrue.ScriptCanvasGrammar.xml - Include/ScriptCanvas/Libraries/UnitTesting/MarkComplete.h - Include/ScriptCanvas/Libraries/UnitTesting/MarkComplete.ScriptCanvasGrammar.xml - Include/ScriptCanvas/Libraries/UnitTesting/UnitTestBus.h - Include/ScriptCanvas/Libraries/UnitTesting/UnitTestBusMacros.h Include/ScriptCanvas/Libraries/UnitTesting/UnitTesting.cpp - Include/ScriptCanvas/Libraries/UnitTesting/UnitTesting.h Include/ScriptCanvas/Libraries/UnitTesting/UnitTestingLibrary.cpp - Include/ScriptCanvas/Libraries/UnitTesting/UnitTestingLibrary.h Include/ScriptCanvas/Libraries/UnitTesting/Auxiliary/Auxiliary.cpp - Include/ScriptCanvas/Libraries/UnitTesting/Auxiliary/Auxiliary.h - Include/ScriptCanvas/Libraries/UnitTesting/Auxiliary/AuxiliaryGenerics.h - Include/ScriptCanvas/Libraries/UnitTesting/UnitTestBusSender.h Include/ScriptCanvas/Libraries/UnitTesting/UnitTestBusSender.cpp - Include/ScriptCanvas/Libraries/UnitTesting/UnitTestBusSenderMacros.h Include/ScriptCanvas/Libraries/Operators/Operators.cpp - Include/ScriptCanvas/Libraries/Operators/Operators.h Include/ScriptCanvas/Libraries/Operators/Operator.cpp - Include/ScriptCanvas/Libraries/Operators/Operator.h - Include/ScriptCanvas/Libraries/Operators/Operator.ScriptCanvasGrammar.xml Include/ScriptCanvas/Libraries/Operators/Containers/OperatorAt.cpp - Include/ScriptCanvas/Libraries/Operators/Containers/OperatorAt.h - Include/ScriptCanvas/Libraries/Operators/Containers/OperatorAt.ScriptCanvasGrammar.xml Include/ScriptCanvas/Libraries/Operators/Containers/OperatorBack.cpp - Include/ScriptCanvas/Libraries/Operators/Containers/OperatorBack.h - Include/ScriptCanvas/Libraries/Operators/Containers/OperatorBack.ScriptCanvasGrammar.xml Include/ScriptCanvas/Libraries/Operators/Containers/OperatorClear.cpp - Include/ScriptCanvas/Libraries/Operators/Containers/OperatorClear.h - Include/ScriptCanvas/Libraries/Operators/Containers/OperatorClear.ScriptCanvasGrammar.xml Include/ScriptCanvas/Libraries/Operators/Containers/OperatorEmpty.cpp - Include/ScriptCanvas/Libraries/Operators/Containers/OperatorEmpty.h - Include/ScriptCanvas/Libraries/Operators/Containers/OperatorEmpty.ScriptCanvasGrammar.xml Include/ScriptCanvas/Libraries/Operators/Containers/OperatorErase.cpp - Include/ScriptCanvas/Libraries/Operators/Containers/OperatorErase.h - Include/ScriptCanvas/Libraries/Operators/Containers/OperatorErase.ScriptCanvasGrammar.xml Include/ScriptCanvas/Libraries/Operators/Containers/OperatorFront.cpp - Include/ScriptCanvas/Libraries/Operators/Containers/OperatorFront.h - Include/ScriptCanvas/Libraries/Operators/Containers/OperatorFront.ScriptCanvasGrammar.xml Include/ScriptCanvas/Libraries/Operators/Containers/OperatorInsert.cpp - Include/ScriptCanvas/Libraries/Operators/Containers/OperatorInsert.h - Include/ScriptCanvas/Libraries/Operators/Containers/OperatorInsert.ScriptCanvasGrammar.xml Include/ScriptCanvas/Libraries/Operators/Containers/OperatorPushBack.cpp - Include/ScriptCanvas/Libraries/Operators/Containers/OperatorPushBack.h - Include/ScriptCanvas/Libraries/Operators/Containers/OperatorPushBack.ScriptCanvasGrammar.xml Include/ScriptCanvas/Libraries/Operators/Containers/OperatorSize.cpp - Include/ScriptCanvas/Libraries/Operators/Containers/OperatorSize.h - Include/ScriptCanvas/Libraries/Operators/Containers/OperatorSize.ScriptCanvasGrammar.xml Include/ScriptCanvas/Libraries/Operators/Math/OperatorAdd.cpp - Include/ScriptCanvas/Libraries/Operators/Math/OperatorAdd.h - Include/ScriptCanvas/Libraries/Operators/Math/OperatorAdd.ScriptCanvasGrammar.xml Include/ScriptCanvas/Libraries/Operators/Math/OperatorArithmetic.cpp - Include/ScriptCanvas/Libraries/Operators/Math/OperatorArithmetic.h - Include/ScriptCanvas/Libraries/Operators/Math/OperatorArithmetic.ScriptCanvasGrammar.xml Include/ScriptCanvas/Libraries/Operators/Math/OperatorDiv.cpp - Include/ScriptCanvas/Libraries/Operators/Math/OperatorDiv.h - Include/ScriptCanvas/Libraries/Operators/Math/OperatorDiv.ScriptCanvasGrammar.xml Include/ScriptCanvas/Libraries/Operators/Math/OperatorDivideByNumber.cpp - Include/ScriptCanvas/Libraries/Operators/Math/OperatorDivideByNumber.h - Include/ScriptCanvas/Libraries/Operators/Math/OperatorDivideByNumber.ScriptCanvasGrammar.xml Include/ScriptCanvas/Libraries/Operators/Math/OperatorLength.cpp - Include/ScriptCanvas/Libraries/Operators/Math/OperatorLength.h - Include/ScriptCanvas/Libraries/Operators/Math/OperatorLength.ScriptCanvasGrammar.xml Include/ScriptCanvas/Libraries/Operators/Math/OperatorLerp.cpp - Include/ScriptCanvas/Libraries/Operators/Math/OperatorLerp.h - Include/ScriptCanvas/Libraries/Operators/Math/OperatorLerp.ScriptCanvasGrammar.xml Include/ScriptCanvas/Libraries/Operators/Math/OperatorMul.cpp - Include/ScriptCanvas/Libraries/Operators/Math/OperatorMul.h - Include/ScriptCanvas/Libraries/Operators/Math/OperatorMul.ScriptCanvasGrammar.xml Include/ScriptCanvas/Libraries/Operators/Math/OperatorSub.cpp - Include/ScriptCanvas/Libraries/Operators/Math/OperatorSub.h - Include/ScriptCanvas/Libraries/Operators/Math/OperatorSub.ScriptCanvasGrammar.xml - Include/ScriptCanvas/Libraries/Operators/Math/OperatorLerpNodeable.h Include/ScriptCanvas/Libraries/Operators/Math/OperatorLerpNodeable.cpp - Include/ScriptCanvas/Libraries/Operators/Math/OperatorLerpNodeableNode.h Include/ScriptCanvas/Libraries/Operators/Math/OperatorLerpNodeableNode.cpp - Include/ScriptCanvas/Profiler/Driller.h - Include/ScriptCanvas/Profiler/Aggregator.h Include/ScriptCanvas/Profiler/Aggregator.cpp - Include/ScriptCanvas/Profiler/DrillerEvents.h Include/ScriptCanvas/Profiler/DrillerEvents.cpp - Include/ScriptCanvas/Serialization/BehaviorContextObjectSerializer.h Include/ScriptCanvas/Serialization/BehaviorContextObjectSerializer.cpp - Include/ScriptCanvas/Serialization/DatumSerializer.h Include/ScriptCanvas/Serialization/DatumSerializer.cpp - Include/ScriptCanvas/Serialization/RuntimeVariableSerializer.h Include/ScriptCanvas/Serialization/RuntimeVariableSerializer.cpp Include/ScriptCanvas/Data/DataTrait.cpp - Include/ScriptCanvas/Data/DataTrait.h Include/ScriptCanvas/Data/PropertyTraits.cpp - Include/ScriptCanvas/Data/PropertyTraits.h - Include/ScriptCanvas/Data/Traits.h - Include/ScriptCanvas/Variable/VariableBus.h - Include/ScriptCanvas/Variable/GraphVariable.h Include/ScriptCanvas/Variable/GraphVariable.cpp - Include/ScriptCanvas/Variable/GraphVariableManagerComponent.h Include/ScriptCanvas/Variable/GraphVariableManagerComponent.cpp - Include/ScriptCanvas/Variable/VariableCore.h Include/ScriptCanvas/Variable/VariableCore.cpp - Include/ScriptCanvas/Variable/VariableData.h Include/ScriptCanvas/Variable/VariableData.cpp - Include/ScriptCanvas/Utils/DataUtils.h Include/ScriptCanvas/Utils/DataUtils.cpp - Include/ScriptCanvas/Utils/NodeUtils.h Include/ScriptCanvas/Utils/NodeUtils.cpp - Include/ScriptCanvas/Utils/SerializationUtils.h - Include/ScriptCanvas/Utils/VersionConverters.h Include/ScriptCanvas/Utils/VersionConverters.cpp Include/ScriptCanvas/Utils/VersioningUtils.cpp Include/ScriptCanvas/Utils/VersioningUtils.cpp - Include/ScriptCanvas/Utils/BehaviorContextUtils.h Include/ScriptCanvas/Utils/BehaviorContextUtils.cpp ) set(SKIP_UNITY_BUILD_INCLUSION_FILES Include/ScriptCanvas/Libraries/Core/FunctionCallNode.cpp - Include/ScriptCanvas/Libraries/Core/FunctionCallNode.h - Include/ScriptCanvas/Libraries/Core/FunctionCallNodeIsOutOfDate.h Include/ScriptCanvas/Libraries/Core/FunctionCallNodeIsOutOfDate.cpp ) diff --git a/Gems/ScriptCanvasPhysics/Code/CMakeLists.txt b/Gems/ScriptCanvasPhysics/Code/CMakeLists.txt index 2addf3e8ca..0d25959066 100644 --- a/Gems/ScriptCanvasPhysics/Code/CMakeLists.txt +++ b/Gems/ScriptCanvasPhysics/Code/CMakeLists.txt @@ -32,7 +32,7 @@ ly_add_target( PRIVATE Legacy::CryCommon Gem::ScriptCanvasPhysics.Static - Gem::ScriptCanvasAPI + Gem::ScriptCanvas.API ) # By default, the above module is used by all application types, however, the module depends at runtime to ScriptCanvas From 1294cd0d7f2f6e7b3992a234d94906206cd2d423 Mon Sep 17 00:00:00 2001 From: moudgils <47460854+moudgils@users.noreply.github.com> Date: Mon, 29 Nov 2021 13:33:48 -0800 Subject: [PATCH 27/58] Various Vulkan fixes (#5880) * Various Vulkan fixes - Swapchain related fix for UI editor - Object of type VkQueue is simultaneously used in the main thread and the queue thread. Pushed the swapchain invalidation to the presentation queue thread - Added padding for DepthOfFieldData to ensure it is 16 byte aligned - Added aspect flag for SMAAEdgeDetectionTemplate pass - Reduced MaxUnboundedArrayDescriptors so that it is under the maxDescriptorSetSampledImages limit - Added CopyRead flag for ReflectionScreenSpaceBlurPass related transient resources. Signed-off-by: moudgils <47460854+moudgils@users.noreply.github.com> * Missed file Signed-off-by: moudgils <47460854+moudgils@users.noreply.github.com> --- .../Assets/Passes/SMAAEdgeDetection.pass | 7 ++++++- .../PostProcessing/ViewSrg.azsli | 3 ++- .../ReflectionScreenSpaceBlurPass.cpp | 2 +- .../Code/Source/RHI/DescriptorSetLayout.h | 2 +- .../RHI/Vulkan/Code/Source/RHI/SwapChain.cpp | 18 ++++++++++++------ 5 files changed, 22 insertions(+), 10 deletions(-) diff --git a/Gems/Atom/Feature/Common/Assets/Passes/SMAAEdgeDetection.pass b/Gems/Atom/Feature/Common/Assets/Passes/SMAAEdgeDetection.pass index ab03ea01ef..674acdd3a0 100644 --- a/Gems/Atom/Feature/Common/Assets/Passes/SMAAEdgeDetection.pass +++ b/Gems/Atom/Feature/Common/Assets/Passes/SMAAEdgeDetection.pass @@ -15,7 +15,12 @@ { "Name": "InputDepth", "SlotType": "Input", - "ScopeAttachmentUsage": "Shader" + "ScopeAttachmentUsage": "Shader", + "ImageViewDesc": { + "AspectFlags": [ + "Depth" + ] + } }, { "Name": "OutputEdgeDetectionResult", diff --git a/Gems/Atom/Feature/Common/Assets/ShaderResourceGroups/PostProcessing/ViewSrg.azsli b/Gems/Atom/Feature/Common/Assets/ShaderResourceGroups/PostProcessing/ViewSrg.azsli index 10906ac09b..e8501a4a2d 100644 --- a/Gems/Atom/Feature/Common/Assets/ShaderResourceGroups/PostProcessing/ViewSrg.azsli +++ b/Gems/Atom/Feature/Common/Assets/ShaderResourceGroups/PostProcessing/ViewSrg.azsli @@ -26,8 +26,9 @@ partial ShaderResourceGroup ViewSrg // circle of confusion to screen ratio; float m_cocToScreenRatio; + [[pad_to(16)]] }; - + DepthOfFieldData m_dof; struct ExposureControlParameters diff --git a/Gems/Atom/Feature/Common/Code/Source/ReflectionScreenSpace/ReflectionScreenSpaceBlurPass.cpp b/Gems/Atom/Feature/Common/Code/Source/ReflectionScreenSpace/ReflectionScreenSpaceBlurPass.cpp index c0b25697a3..298aefe8df 100644 --- a/Gems/Atom/Feature/Common/Code/Source/ReflectionScreenSpace/ReflectionScreenSpaceBlurPass.cpp +++ b/Gems/Atom/Feature/Common/Code/Source/ReflectionScreenSpace/ReflectionScreenSpaceBlurPass.cpp @@ -127,7 +127,7 @@ namespace AZ { RHI::Size mipSize = imageSize.GetReducedMip(mip); - RHI::ImageBindFlags imageBindFlags = RHI::ImageBindFlags::Color | RHI::ImageBindFlags::ShaderReadWrite; + RHI::ImageBindFlags imageBindFlags = RHI::ImageBindFlags::Color | RHI::ImageBindFlags::ShaderReadWrite | RHI::ImageBindFlags::CopyRead; auto transientImageDesc = RHI::ImageDescriptor::Create2D(imageBindFlags, mipSize.m_width, mipSize.m_height, RHI::Format::R16G16B16A16_FLOAT); RPI::PassAttachment* transientPassAttachment = aznew RPI::PassAttachment(); diff --git a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/DescriptorSetLayout.h b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/DescriptorSetLayout.h index 50132d62ec..2d40d21ed5 100644 --- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/DescriptorSetLayout.h +++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/DescriptorSetLayout.h @@ -76,7 +76,7 @@ namespace AZ const AZStd::vector& GetNativeBindingFlags() const; const RHI::ShaderResourceGroupLayout* GetShaderResourceGroupLayout() const; - static const uint32_t MaxUnboundedArrayDescriptors = (1024 * 1024 * 2); // 2M + static const uint32_t MaxUnboundedArrayDescriptors = 900000; //Using this number as it needs to be less than maxDescriptorSetSampledImages limit of 1048576 bool GetHasUnboundedArray() const { return m_hasUnboundedArray; } private: diff --git a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/SwapChain.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/SwapChain.cpp index 47c92d97fb..67f4834524 100644 --- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/SwapChain.cpp +++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/SwapChain.cpp @@ -483,12 +483,18 @@ namespace AZ void SwapChain::InvalidateNativeSwapChain() { auto& device = static_cast(GetDevice()); - vkDeviceWaitIdle(device.GetNativeDevice()); - if (m_nativeSwapChain != VK_NULL_HANDLE) + auto presentCommand = [this, &device]([[maybe_unused]] void* queue) { - vkDestroySwapchainKHR(device.GetNativeDevice(), m_nativeSwapChain, nullptr); - m_nativeSwapChain = VK_NULL_HANDLE; - } + vkDeviceWaitIdle(device.GetNativeDevice()); + if (m_nativeSwapChain != VK_NULL_HANDLE) + { + vkDestroySwapchainKHR(device.GetNativeDevice(), m_nativeSwapChain, nullptr); + m_nativeSwapChain = VK_NULL_HANDLE; + } + }; + + m_presentationQueue->QueueCommand(AZStd::move(presentCommand)); + m_presentationQueue->FlushCommands(); } RHI::ResultCode SwapChain::CreateSwapchain() @@ -496,7 +502,7 @@ namespace AZ auto& device = static_cast(GetDevice()); m_surfaceCapabilities = GetSurfaceCapabilities(); - m_surfaceFormat = GetSupportedSurfaceFormat(GetDescriptor().m_dimensions.m_imageFormat); + m_surfaceFormat = GetSupportedSurfaceFormat(m_dimensions.m_imageFormat); m_presentMode = GetSupportedPresentMode(GetDescriptor().m_verticalSyncInterval); m_compositeAlphaFlagBits = GetSupportedCompositeAlpha(); From 637c12836db22d77e8470e5dda344f3cfd8e92a2 Mon Sep 17 00:00:00 2001 From: lsemp3d <58790905+lsemp3d@users.noreply.github.com> Date: Mon, 29 Nov 2021 14:14:11 -0800 Subject: [PATCH 28/58] Removed code that lead to double asset handler registration Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com> --- .../Code/Source/Translation/TranslationBuilder.cpp | 7 ------- 1 file changed, 7 deletions(-) diff --git a/Gems/GraphCanvas/Code/Source/Translation/TranslationBuilder.cpp b/Gems/GraphCanvas/Code/Source/Translation/TranslationBuilder.cpp index 1b01f7885d..6ae2253fd8 100644 --- a/Gems/GraphCanvas/Code/Source/Translation/TranslationBuilder.cpp +++ b/Gems/GraphCanvas/Code/Source/Translation/TranslationBuilder.cpp @@ -31,15 +31,8 @@ namespace GraphCanvas { // Use AssetCatalog service to register ScriptCanvas asset type and extension AZ::Data::AssetType assetType(azrtti_typeid()); - AZ::Data::AssetCatalogRequestBus::Broadcast(&AZ::Data::AssetCatalogRequests::AddAssetType, assetType); - AZ::Data::AssetCatalogRequestBus::Broadcast(&AZ::Data::AssetCatalogRequests::EnableCatalogForAsset, assetType); - AZ::Data::AssetCatalogRequestBus::Broadcast(&AZ::Data::AssetCatalogRequests::AddExtension, TranslationAsset::GetFileFilter()); m_assetHandler = AZStd::make_unique(); - if (!AZ::Data::AssetManager::Instance().GetHandler(assetType)) - { - AZ::Data::AssetManager::Instance().RegisterHandler(m_assetHandler.get(), assetType); - } AssetBuilderSDK::AssetBuilderCommandBus::Handler::BusConnect(GetUUID()); } From 612ca4f66ac85b3c43702eb4e1cb6d782516d039 Mon Sep 17 00:00:00 2001 From: lsemp3d <58790905+lsemp3d@users.noreply.github.com> Date: Mon, 29 Nov 2021 14:18:37 -0800 Subject: [PATCH 29/58] PR feedback Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com> --- .../Widgets/NodePalette/GeneralNodePaletteTreeItemTypes.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Gems/ScriptCanvas/Code/Editor/View/Widgets/NodePalette/GeneralNodePaletteTreeItemTypes.h b/Gems/ScriptCanvas/Code/Editor/View/Widgets/NodePalette/GeneralNodePaletteTreeItemTypes.h index 57035e224d..c14d6c62ae 100644 --- a/Gems/ScriptCanvas/Code/Editor/View/Widgets/NodePalette/GeneralNodePaletteTreeItemTypes.h +++ b/Gems/ScriptCanvas/Code/Editor/View/Widgets/NodePalette/GeneralNodePaletteTreeItemTypes.h @@ -70,9 +70,10 @@ namespace ScriptCanvasEditor AZ::ComponentApplicationBus::BroadcastResult(behaviorContext, &AZ::ComponentApplicationRequests::GetBehaviorContext); const char* className = m_className.toUtf8().data(); - auto behaviorClass = behaviorContext->m_classes.find(className); - if (behaviorClass != behaviorContext->m_classes.end()) + if (behaviorContext->m_classes.contains(className)) { + auto behaviorClass = behaviorContext->m_classes.find(className); + ScriptCanvasEditorTools::TranslationGeneration translation; translation.TranslateBehaviorClass(behaviorClass->second); } From 64139b7636fb6e7a5c8197b09e816d728cdb2e5f Mon Sep 17 00:00:00 2001 From: amzn-sj Date: Mon, 29 Nov 2021 14:30:15 -0800 Subject: [PATCH 30/58] Add new-line to end of file Signed-off-by: amzn-sj --- Gems/LmbrCentral/Code/lmbrcentral_headers_files.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gems/LmbrCentral/Code/lmbrcentral_headers_files.cmake b/Gems/LmbrCentral/Code/lmbrcentral_headers_files.cmake index 76b5412c58..67f526cf21 100644 --- a/Gems/LmbrCentral/Code/lmbrcentral_headers_files.cmake +++ b/Gems/LmbrCentral/Code/lmbrcentral_headers_files.cmake @@ -60,4 +60,4 @@ set(FILES include/LmbrCentral/Shape/SplineAttribute.h include/LmbrCentral/Shape/SplineAttribute.inl include/LmbrCentral/Terrain/TerrainSystemRequestBus.h -) \ No newline at end of file +) From d2595272dc8f59afe4c2c388cee5b0cb6dff3d80 Mon Sep 17 00:00:00 2001 From: lsemp3d <58790905+lsemp3d@users.noreply.github.com> Date: Mon, 29 Nov 2021 15:46:19 -0800 Subject: [PATCH 31/58] Removed unused variable Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com> --- Gems/GraphCanvas/Code/Source/Translation/TranslationBuilder.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/Gems/GraphCanvas/Code/Source/Translation/TranslationBuilder.cpp b/Gems/GraphCanvas/Code/Source/Translation/TranslationBuilder.cpp index 6ae2253fd8..01a661684a 100644 --- a/Gems/GraphCanvas/Code/Source/Translation/TranslationBuilder.cpp +++ b/Gems/GraphCanvas/Code/Source/Translation/TranslationBuilder.cpp @@ -30,8 +30,6 @@ namespace GraphCanvas void TranslationAssetWorker::Activate() { // Use AssetCatalog service to register ScriptCanvas asset type and extension - AZ::Data::AssetType assetType(azrtti_typeid()); - m_assetHandler = AZStd::make_unique(); AssetBuilderSDK::AssetBuilderCommandBus::Handler::BusConnect(GetUUID()); From 8e472a030b65935c8175f663b21ddfe268f2a143 Mon Sep 17 00:00:00 2001 From: lsemp3d <58790905+lsemp3d@users.noreply.github.com> Date: Mon, 29 Nov 2021 18:22:53 -0800 Subject: [PATCH 32/58] Added support for translating variables types in the variable manager Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com> --- .../EBus/Senders/AWSGameLiftRequestBus.names | 81 + .../Types/BehaviorTypes.names | 1428 +++++++++++++++++ .../Editor/Translation/TranslationHelper.h | 456 +----- .../DataTypePalette/DataTypePaletteModel.cpp | 11 +- .../ScriptCanvasNodePaletteDockWidget.cpp | 9 +- .../Include/ScriptCanvas/Data/DataTrait.h | 4 +- .../Code/Tools/TranslationGeneration.cpp | 28 + .../Code/Tools/TranslationGeneration.h | 3 + 8 files changed, 1577 insertions(+), 443 deletions(-) create mode 100644 Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AWSGameLiftRequestBus.names create mode 100644 Gems/ScriptCanvas/Assets/TranslationAssets/Types/BehaviorTypes.names diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AWSGameLiftRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AWSGameLiftRequestBus.names new file mode 100644 index 0000000000..3e32cecee8 --- /dev/null +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AWSGameLiftRequestBus.names @@ -0,0 +1,81 @@ +{ + "entries": [ + { + "base": "AWSGameLiftRequestBus", + "context": "EBusSender", + "variant": "", + "details": { + "name": "Requests", + "category": "AWS Game Lift" + }, + "methods": [ + { + "base": "ConfigureGameLiftClient", + "entry": { + "name": "In", + "tooltip": "When signaled, this will invoke Configure Game Lift Client" + }, + "exit": { + "name": "Out", + "tooltip": "Signaled after Configure Game Lift Client is invoked" + }, + "details": { + "name": "Configure Game Lift Client" + }, + "params": [ + { + "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", + "details": { + "name": "Region" + } + } + ], + "results": [ + { + "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", + "details": { + "name": "Result" + } + } + ] + }, + { + "base": "CreatePlayerId", + "entry": { + "name": "In", + "tooltip": "When signaled, this will invoke Create Player Id" + }, + "exit": { + "name": "Out", + "tooltip": "Signaled after Create Player Id is invoked" + }, + "details": { + "name": "Create Player Id" + }, + "params": [ + { + "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", + "details": { + "name": "Include Brackets" + } + }, + { + "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", + "details": { + "name": "Include Dashes" + } + } + ], + "results": [ + { + "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", + "details": { + "name": "Player Id" + } + } + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Types/BehaviorTypes.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Types/BehaviorTypes.names new file mode 100644 index 0000000000..598d058767 --- /dev/null +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Types/BehaviorTypes.names @@ -0,0 +1,1428 @@ +{ + "entries": [ + { + "base": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}", + "context": "BehaviorType", + "variant": "", + "details": { + "name": "Uuid" + } + }, + { + "base": "{831C1F11-5898-4FBF-B4CF-92B757A907A8}", + "context": "BehaviorType", + "variant": "", + "details": { + "name": "FastNoiseGradientConfig" + } + }, + { + "base": "{1D00F234-8134-4A42-A357-ADAC865CF63A}", + "context": "BehaviorType", + "variant": "", + "details": { + "name": "Mesh Blocker Config" + } + }, + { + "base": "{40403A44-31FE-4D1D-941C-6593759CCCBD}", + "context": "BehaviorType", + "variant": "", + "details": { + "name": "MixedGradientConfig" + } + }, + { + "base": "{0B5D866D-C7F5-5B12-81A5-74521A8230D5}", + "context": "BehaviorType", + "variant": "", + "details": { + "name": "AZ::RHI::Handle" + } + }, + { + "base": "{4AADFD75-48A7-4F31-8F30-FE4505F09E35}", + "context": "BehaviorType", + "variant": "", + "details": { + "name": "SphereShapeConfig" + } + }, + { + "base": "{01F6E6C5-707E-42EC-91BB-F674B9F51A40}", + "context": "BehaviorType", + "variant": "", + "details": { + "name": "BlockerConfig" + } + }, + { + "base": "{5574DD27-89D8-5A40-B7C4-FA04C68B8A0D}", + "context": "BehaviorType", + "variant": "", + "details": { + "name": "AZ::RHI::Handle" + } + }, + { + "base": "{FE862126-C838-4999-9B7B-4AEEA5507A49}", + "context": "BehaviorType", + "variant": "", + "details": { + "name": "RaySplineQueryResult" + } + }, + { + "base": "{ED57731E-2821-4AA6-9BD6-9203ED0B6AB0}", + "context": "BehaviorType", + "variant": "", + "details": { + "name": "AreaBlenderConfig" + } + }, + { + "base": "{0CE9FA36-1E3A-4C06-9254-B7C73A732053}", + "context": "BehaviorType", + "variant": "", + "details": { + "name": "Vector4" + } + }, + { + "base": "{A62E9C87-093C-4534-AB48-DEF8EC80C190}", + "context": "BehaviorType", + "variant": "", + "details": { + "name": "DescriptorListCombinerConfig" + } + }, + { + "base": "{73BA7B92-1061-4DDB-AA5B-A0D87303CBC8}", + "context": "BehaviorType", + "variant": "", + "details": { + "name": "SlopeAlignmentModifierConfig" + } + }, + { + "base": "{C0E1DF8C-D1BE-4AF4-8100-5D71788399BA}", + "context": "BehaviorType", + "variant": "", + "details": { + "name": "ShaderVariantInfo" + } + }, + { + "base": "{15A4332F-7C3F-4A58-AC35-50E1CE53FB9C}", + "context": "BehaviorType", + "variant": "", + "details": { + "name": "Matrix3x3" + } + }, + { + "base": "{12A1776B-61F6-4E5F-356A-AD718A62051F}", + "context": "BehaviorType", + "variant": "", + "details": { + "name": "NetworkTestPlayerComponentNetworkInput" + } + }, + { + "base": "{157193C7-B673-4A2B-8B43-5681DCC3DEC3}", + "context": "BehaviorType", + "variant": "", + "details": { + "name": "Matrix4x4" + } + }, + { + "base": "{331A3D0E-BB1D-47BF-96A2-249FAA0D720D}", + "context": "BehaviorType", + "variant": "", + "details": { + "name": "AzFramework::SurfaceData::SurfacePoint" + } + }, + { + "base": "{6483F481-0C18-4171-8B59-A44F2F28EAE5}", + "context": "BehaviorType", + "variant": "", + "details": { + "name": "AWSMetrics_MetricsAttribute" + } + }, + { + "base": "{708A5B3C-E377-40CE-9572-BEB64C849D40}", + "context": "BehaviorType", + "variant": "", + "details": { + "name": "VertexHandle" + } + }, + { + "base": "{C81CC1CA-6841-5F6A-B1C7-E544590B481F}", + "context": "BehaviorType", + "variant": "", + "details": { + "name": "AZ::RHI::Handle" + } + }, + { + "base": "{E8C6654F-0000-5496-8A61-9DAE9CA30493}", + "context": "BehaviorType", + "variant": "", + "details": { + "name": "AZ::RHI::Handle" + } + }, + { + "base": "{C16F0F38-8F8F-45A2-A33B-F2758922A7C4}", + "context": "BehaviorType", + "variant": "", + "details": { + "name": "MeshVertexTangentData" + } + }, + { + "base": "{F56FB088-4C92-4453-AFE9-4E820F03FA90}", + "context": "BehaviorType", + "variant": "", + "details": { + "name": "MeshVertexBitangentData" + } + }, + { + "base": "{A7E568EC-5873-5C8A-A43E-A7228B613A21}", + "context": "BehaviorType", + "variant": "", + "details": { + "name": "AZ::RHI::Handle" + } + }, + { + "base": "{00931AEB-2AD8-42CE-B1DC-FA4332F51501}", + "context": "BehaviorType", + "variant": "", + "details": { + "name": "CapsuleShapeConfig" + } + }, + { + "base": "{004ABD25-CF14-4EB3-BD41-022C247C07FA}", + "context": "BehaviorType", + "variant": "", + "details": { + "name": "OBB" + } + }, + { + "base": "{4AFDFD7F-384A-41DF-900C-9B25A4AA8D1E}", + "context": "BehaviorType", + "variant": "", + "details": { + "name": "PosterizeGradientConfig" + } + }, + { + "base": "{02FB32C4-B94E-4084-9049-3DF32F87BD76}", + "context": "BehaviorType", + "variant": "", + "details": { + "name": "ClientAuthAWSCredentials" + } + }, + { + "base": "{F6B9150B-CC89-48A2-AB89-D18740CC6FA2}", + "context": "BehaviorType", + "variant": "", + "details": { + "name": "FaceVertHandles" + } + }, + { + "base": "{4BC6D515-214A-4DCE-8FCB-A6389B66A1B9}", + "context": "BehaviorType", + "variant": "", + "details": { + "name": "Entity Transform" + } + }, + { + "base": "{F681BA9D-245C-4630-B20E-05DD752FAD57}", + "context": "BehaviorType", + "variant": "", + "details": { + "name": "UiOffsets" + } + }, + { + "base": "{EBEDA5EC-29D3-4F23-ABCC-C7C4EE48FA36}", + "context": "BehaviorType", + "variant": "", + "details": { + "name": "DisplaySettingsState" + } + }, + { + "base": "{344066EB-7C3D-4E92-B53D-3C9EBD546488}", + "context": "BehaviorType", + "variant": "", + "details": { + "name": "EditorMaterialComponentSlot" + } + }, + { + "base": "{3D2B920C-9EFD-40D5-AAE0-DF131C3D4931}", + "context": "BehaviorType", + "variant": "", + "details": { + "name": "Name" + } + }, + { + "base": "{F965D1B2-9DE3-4900-B44B-E58D9F083ACB}", + "context": "BehaviorType", + "variant": "", + "details": { + "name": "AuthenticationTokens" + } + }, + { + "base": "{1BDB5DA4-A4A8-452B-BE6D-6BD451D4E7CD}", + "context": "BehaviorType", + "variant": "", + "details": { + "name": "ImageGradientConfig" + } + }, + { + "base": "{DCFE9FBF-39BF-5B3C-AD28-D61ADBAF1711}", + "context": "BehaviorType", + "variant": "", + "details": { + "name": "AZ::RHI::Handle" + } + }, + { + "base": "{8FB7C786-D8A7-41C4-A703-020020EB4A4F}", + "context": "BehaviorType", + "variant": "", + "details": { + "name": "ShapeAreaFalloffGradientConfig" + } + }, + { + "base": "{D24130B9-89C4-4EAA-9A5D-3469B05C5065}", + "context": "BehaviorType", + "variant": "", + "details": { + "name": "GraphModelSlotId" + } + }, + { + "base": "{7894072A-9050-4F0F-901B-34B1A0D29417}", + "context": "BehaviorType", + "variant": "", + "details": { + "name": "Color" + } + }, + { + "base": "{F2EE1768-183B-483E-9778-CB3D3D0DA68A}", + "context": "BehaviorType", + "variant": "", + "details": { + "name": "MaterialData" + } + }, + { + "base": "{FF8B1DED-C1A8-4322-86D2-C8432E4B0526}", + "context": "BehaviorType", + "variant": "", + "details": { + "name": "RotationModifierConfig" + } + }, + { + "base": "{902F6253-A8FA-4350-B9F1-C176F3E2D305}", + "context": "BehaviorType", + "variant": "", + "details": { + "name": "DescriptorListConfig" + } + }, + { + "base": "{34516BA4-2B13-4A84-A46B-01E1980CA778}", + "context": "BehaviorType", + "variant": "", + "details": { + "name": "GradientSurfaceDataConfig" + } + }, + { + "base": "{8AF3B382-F187-4323-9014-B380638767E3}", + "context": "BehaviorType", + "variant": "", + "details": { + "name": "Multiplayer::NetComponentId" + } + }, + { + "base": "{EBB1C475-FA03-4111-8C84-985377434B9B}", + "context": "BehaviorType", + "variant": "", + "details": { + "name": "Multiplayer::RpcIndex" + } + }, + { + "base": "{E134EAE8-52A1-4E43-847B-09E546CC5B95}", + "context": "BehaviorType", + "variant": "", + "details": { + "name": "UVCoords" + } + }, + { + "base": "{28529C97-543C-5690-9FA4-9781271E6661}", + "context": "BehaviorType", + "variant": "", + "details": { + "name": "AZ::RHI::Handle" + } + }, + { + "base": "{B94085B7-C0D4-466A-A791-188A4559EC8D}", + "context": "BehaviorType", + "variant": "", + "details": { + "name": "OutputDeviceTransformType" + } + }, + { + "base": "{3EC1CE83-483D-41FD-9909-D22B03E56F4E}", + "context": "BehaviorType", + "variant": "", + "details": { + "name": "Render::ShadowmapSize" + } + }, + { + "base": "{9E71534D-34B3-4723-B180-2552513DDA3D}", + "context": "BehaviorType", + "variant": "", + "details": { + "name": "AWSScriptBehaviorLambda" + } + }, + { + "base": "{8CD110EE-95FA-4B26-B10E-95079BE4CB11}", + "context": "BehaviorType", + "variant": "", + "details": { + "name": "DistanceBetweenFilterConfig" + } + }, + { + "base": "{A54C2B36-D5B8-46A1-A529-4EBDBD2450E7}", + "context": "BehaviorType", + "variant": "", + "details": { + "name": "AABB" + } + }, + { + "base": "{C845E5EC-5580-4E12-A9B2-9AE7E5B7826F}", + "context": "BehaviorType", + "variant": "", + "details": { + "name": "EntityComponentIdPair" + } + }, + { + "base": "{E6DA080B-7ED1-4135-A78C-A6A5E495A43E}", + "context": "BehaviorType", + "variant": "", + "details": { + "name": "CollisionGroup" + } + }, + { + "base": "{F01C8BDD-6F24-4344-8945-521A8750B30B}", + "context": "BehaviorType", + "variant": "", + "details": { + "name": "PolygonPrism" + } + }, + { + "base": "{67C8C6ED-F32A-443E-A777-1CAE48B22CD7}", + "context": "BehaviorType", + "variant": "", + "details": { + "name": "SurfaceTag" + } + }, + { + "base": "{48A94382-72BE-457B-BB43-0E6C245824D2}", + "context": "BehaviorType", + "variant": "", + "details": { + "name": "SearchFilter" + } + }, + { + "base": "{4C0F6AD4-0D4F-4354-AD4A-0C01E948245C}", + "context": "BehaviorType", + "variant": "", + "details": { + "name": "ScriptTimePoint" + } + }, + { + "base": "{05E4C08B-3A1B-4390-8144-3767D8E56A81}", + "context": "BehaviorType", + "variant": "", + "details": { + "name": "Multiplayer::NetEntityId" + } + }, + { + "base": "{65D4346C-FB16-4CB0-9BDC-1185B122C4A9}", + "context": "BehaviorType", + "variant": "", + "details": { + "name": "UiAnchors" + } + }, + { + "base": "{691E0F23-37E9-434F-A1D1-E8DE5B4A3405}", + "context": "BehaviorType", + "variant": "", + "details": { + "name": "SurfaceSlopeGradientConfig" + } + }, + { + "base": "{4E74B13E-6B4E-59D1-90E1-5E5C7EEE40D6}", + "context": "BehaviorType", + "variant": "", + "details": { + "name": "AZ::RHI::Handle" + } + }, + { + "base": "{7602AA36-792C-4BDC-BDF8-AA16792151A3}", + "context": "BehaviorType", + "variant": "", + "details": { + "name": "CollisionEvent" + } + }, + { + "base": "{02644F52-9483-47A8-9028-37671695C34E}", + "context": "BehaviorType", + "variant": "", + "details": { + "name": "LightConfig" + } + }, + { + "base": "{6383F1D3-BB27-4E6B-A49A-6409B2059EAA}", + "context": "BehaviorType", + "variant": "", + "details": { + "name": "EntityId" + } + }, + { + "base": "{1906D8A5-7DEC-4DE3-A606-9E53BB3459E7}", + "context": "BehaviorType", + "variant": "", + "details": { + "name": "Matrix3x4" + } + }, + { + "base": "{17477B86-B163-4574-8FB2-4916BC218B3D}", + "context": "BehaviorType", + "variant": "", + "details": { + "name": "MeshVertexColorData" + } + }, + { + "base": "{A504D6DA-2825-4A0E-A65E-3FC76FC8AFAC}", + "context": "BehaviorType", + "variant": "", + "details": { + "name": "AreaDebugConfig" + } + }, + { + "base": "{794F7DE4-188C-4031-8B00-C2BA0C351A1E}", + "context": "BehaviorType", + "variant": "", + "details": { + "name": "LevelSettingsConfig" + } + }, + { + "base": "{B88C9D87-8609-4EAB-82D6-92DFEF006629}", + "context": "BehaviorType", + "variant": "", + "details": { + "name": "ShapeIntersectionFilterConfig" + } + }, + { + "base": "{3D80F623-C85C-4741-90D0-E4E66164E6BF}", + "context": "BehaviorType", + "variant": "", + "details": { + "name": "Vector2" + } + }, + { + "base": "{5B085DA7-CDC9-47C7-B2DB-BA5DD5AA2FB5}", + "context": "BehaviorType", + "variant": "", + "details": { + "name": "SurfaceMaskFilterConfig" + } + }, + { + "base": "{847DD984-9DBF-4789-8E25-E0334402E8AD}", + "context": "BehaviorType", + "variant": "", + "details": { + "name": "Plane" + } + }, + { + "base": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", + "context": "BehaviorType", + "variant": "", + "details": { + "name": "String" + } + }, + { + "base": "{63984856-F883-4F8C-9049-5A8F26477B76}", + "context": "BehaviorType", + "variant": "", + "details": { + "name": "InstanceSystemConfig" + } + }, + { + "base": "{3768D3A6-BF70-4ABC-B4EC-73C75A886916}", + "context": "BehaviorType", + "variant": "", + "details": { + "name": "GradientSampler" + } + }, + { + "base": "{B435C091-482C-4EB9-B1F4-FA5B480796DA}", + "context": "BehaviorType", + "variant": "", + "details": { + "name": "MeshVertexUVData" + } + }, + { + "base": "{EA14018E-E853-4BF5-8E13-D83BB99A54CC}", + "context": "BehaviorType", + "variant": "", + "details": { + "name": "SurfaceTagWeight" + } + }, + { + "base": "{3CB05FC9-6E0F-435E-B420-F027B6716804}", + "context": "BehaviorType", + "variant": "", + "details": { + "name": "SurfaceAltitudeGradientConfig" + } + }, + { + "base": "{C6FD75F7-58BA-46CE-8FBA-2D64CB4ECFF9}", + "context": "BehaviorType", + "variant": "", + "details": { + "name": "ExposureControlConfig" + } + }, + { + "base": "{27B1FEC2-8C8A-47D7-A034-6609FA092B34}", + "context": "BehaviorType", + "variant": "", + "details": { + "name": "ShaderVariantId" + } + }, + { + "base": "{41CC88A4-FE07-48E6-943D-998DE68AFF5C}", + "context": "BehaviorType", + "variant": "", + "details": { + "name": "Entity" + } + }, + { + "base": "{6B17F9C6-DB72-52CA-80ED-EFDFDF2DF9ED}", + "context": "BehaviorType", + "variant": "", + "details": { + "name": "AZ::RHI::Handle" + } + }, + { + "base": "{F27E64FB-A7FF-47F2-80DB-7E1371B014DD}", + "context": "BehaviorType", + "variant": "", + "details": { + "name": "PythonBuilderWorker" + } + }, + { + "base": "{41CA80B1-9E0D-41FB-A235-9638D2A905A5}", + "context": "BehaviorType", + "variant": "", + "details": { + "name": "Render::DisplayMapperOperationType" + } + }, + { + "base": "{4FA91FA7-CF3C-51BF-8159-6496DC7D526C}", + "context": "BehaviorType", + "variant": "", + "details": { + "name": "AZ::RHI::Handle" + } + }, + { + "base": "{3EE8C0D4-3792-46C0-B91C-B89A81C36B91}", + "context": "BehaviorType", + "variant": "", + "details": { + "name": "AcesParameterOverrides" + } + }, + { + "base": "{5F0CD700-EC2B-468D-B708-F6EEA7782C46}", + "context": "BehaviorType", + "variant": "", + "details": { + "name": "SurfaceMaskDepthFilterConfig" + } + }, + { + "base": "{569E74F6-1268-4199-9653-A3B603FC9F4F}", + "context": "BehaviorType", + "variant": "", + "details": { + "name": "AWSScriptBehaviorDynamoDB" + } + }, + { + "base": "{7E304208-5FDF-4384-BC28-E7CDD2A15BEC}", + "context": "BehaviorType", + "variant": "", + "details": { + "name": "DistributionFilterConfig" + } + }, + { + "base": "{7A0851A3-2CBD-4A03-85D5-1C40221E7F61}", + "context": "BehaviorType", + "variant": "", + "details": { + "name": "TriggerEvent" + } + }, + { + "base": "{C66E5214-A24B-4722-B7F0-5991E6F8F163}", + "context": "BehaviorType", + "variant": "", + "details": { + "name": "MaterialAssignment" + } + }, + { + "base": "{110C4B14-11A8-4E9D-8638-5051013A56AC}", + "context": "BehaviorType", + "variant": "", + "details": { + "name": "Number" + } + }, + { + "base": "{E35DCF28-1AC3-49E8-A0AB-2F6115348F45}", + "context": "BehaviorType", + "variant": "", + "details": { + "name": "PositionSplineQueryResult" + } + }, + { + "base": "{98A6B0CE-FAD0-4108-B019-6B01931E649F}", + "context": "BehaviorType", + "variant": "", + "details": { + "name": "VegetationSpawnerConfig" + } + }, + { + "base": "{1811456D-0C3D-58C8-ACE8-FD47F4E80E25}", + "context": "BehaviorType", + "variant": "", + "details": { + "name": "AZ::RHI::Handle" + } + }, + { + "base": "{5D9958E9-9F1E-4985-B532-FFFDE75FEDFD}", + "context": "BehaviorType", + "variant": "", + "details": { + "name": "Transform" + } + }, + { + "base": "{6CEBAF3A-2A5C-4508-A351-9613E32CF63F}", + "context": "BehaviorType", + "variant": "", + "details": { + "name": "SurfaceSlopeFilterConfig" + } + }, + { + "base": "{DA5C6354-AA81-504B-88BF-8EF5811ABA61}", + "context": "BehaviorType", + "variant": "", + "details": { + "name": "AZ::RHI::Handle" + } + }, + { + "base": "{24EC2919-F198-4871-8404-F6DE8A16275E}", + "context": "BehaviorType", + "variant": "", + "details": { + "name": "DiskShapeConfig" + } + }, + { + "base": "{B1106C14-D22B-482F-B33E-B6E154A53798}", + "context": "BehaviorType", + "variant": "", + "details": { + "name": "AWSMetrics_AttributesSubmissionList" + } + }, + { + "base": "{FF875C22-2E4F-4CE3-BA49-09BF78C70A09}", + "context": "BehaviorType", + "variant": "", + "details": { + "name": "BlendShapeData" + } + }, + { + "base": "{07B9E2F7-5408-49E9-904D-CC1A9C33230E}", + "context": "BehaviorType", + "variant": "", + "details": { + "name": "AZ::RPI::ShaderOptionDescriptor" + } + }, + { + "base": "{9274AD17-3212-4651-9F3B-7DCCB080E467}", + "context": "BehaviorType", + "variant": "", + "details": { + "name": "SceneManifest" + } + }, + { + "base": "{F392F061-BF40-43C5-89F6-7323D6EF11F4}", + "context": "BehaviorType", + "variant": "", + "details": { + "name": "SmoothStep" + } + }, + { + "base": "{F034FBA2-AC2F-4E66-8152-14DFB90D6283}", + "context": "BehaviorType", + "variant": "", + "details": { + "name": "BoxShapeConfig" + } + }, + { + "base": "{950009BC-8991-4749-9D5C-08C62AF34E7B}", + "context": "BehaviorType", + "variant": "", + "details": { + "name": "FaceHandle" + } + }, + { + "base": "{B0216514-46B5-4A57-9D9D-8D9EC94C3702}", + "context": "BehaviorType", + "variant": "", + "details": { + "name": "ConstantGradientConfig" + } + }, + { + "base": "{F4460210-024D-4B3B-A10A-04B669C34230}", + "context": "BehaviorType", + "variant": "", + "details": { + "name": "Multiplayer::PropertyIndex" + } + }, + { + "base": "{6EEACBC0-2D97-414C-8E87-088E7BA231A9}", + "context": "BehaviorType", + "variant": "", + "details": { + "name": "LightingPreset" + } + }, + { + "base": "{9E0F0801-348B-4FF9-AF9B-858D59404968}", + "context": "BehaviorType", + "variant": "", + "details": { + "name": "InputEventNotificationId" + } + }, + { + "base": "{0C899DAC-6B19-4BDD-AD8C-8A11EF2A6729}", + "context": "BehaviorType", + "variant": "", + "details": { + "name": "MotionEvent" + } + }, + { + "base": "{73103120-3DD3-4873-BAB3-9713FA2804FB}", + "context": "BehaviorType", + "variant": "", + "details": { + "name": "Quaternion" + } + }, + { + "base": "{23C40FD4-A55F-4BD3-BE5B-DC5423F217C2}", + "context": "BehaviorType", + "variant": "", + "details": { + "name": "EmptyInstanceSpawner" + } + }, + { + "base": "{3E49974D-2EE0-4AF9-92B9-229A22B515C3}", + "context": "BehaviorType", + "variant": "", + "details": { + "name": "ReferenceShapeConfig" + } + }, + { + "base": "{E59D0A4C-BA3D-4288-B409-A00B7D5566AA}", + "context": "BehaviorType", + "variant": "", + "details": { + "name": "SurfaceMaskGradientConfig" + } + }, + { + "base": "{14CCBE43-52DD-4F56-92A8-2BB011A0F7A2}", + "context": "BehaviorType", + "variant": "", + "details": { + "name": "AreaSystemConfig" + } + }, + { + "base": "{E6D8372B-8419-4287-B478-1353709A972F}", + "context": "BehaviorType", + "variant": "", + "details": { + "name": "AssetInfo" + } + }, + { + "base": "{5C8C0729-5D41-5299-80F1-395F79B02D70}", + "context": "BehaviorType", + "variant": "", + "details": { + "name": "AZ::RHI::Handle" + } + }, + { + "base": "{F8679938-6D3F-47CC-A078-3D6EC0011366}", + "context": "BehaviorType", + "variant": "", + "details": { + "name": "ShaderVariantListSourceData" + } + }, + { + "base": "{8F519317-4E83-4CF0-BEC9-C5F3F3198F20}", + "context": "BehaviorType", + "variant": "", + "details": { + "name": "DitherGradientConfig" + } + }, + { + "base": "{1106FD53-8B3A-4F97-8051-E34AD70199A5}", + "context": "BehaviorType", + "variant": "", + "details": { + "name": "GradientTransformConfig" + } + }, + { + "base": "{A23453D5-79A8-49C8-B9F0-9CC35D711DD4}", + "context": "BehaviorType", + "variant": "", + "details": { + "name": "BlastActorData" + } + }, + { + "base": "{E9E2D5B3-66F1-494D-91D2-1E83D36A1AC1}", + "context": "BehaviorType", + "variant": "", + "details": { + "name": "ThresholdGradientConfig" + } + }, + { + "base": "{64C7F381-3313-46E8-B23B-D7AA9A915F35}", + "context": "BehaviorType", + "variant": "", + "details": { + "name": "ShaderCollectionItem" + } + }, + { + "base": "{A746CFD0-7288-42F4-837D-1CDE2EAA6923}", + "context": "BehaviorType", + "variant": "", + "details": { + "name": "PerlinGradientConfig" + } + }, + { + "base": "{3F860893-1F57-5615-92CA-389B49687A9C}", + "context": "BehaviorType", + "variant": "", + "details": { + "name": "AZ::RHI::Handle" + } + }, + { + "base": "{61599E53-2B6A-40AC-B5B8-FC1C3F87275E}", + "context": "BehaviorType", + "variant": "", + "details": { + "name": "AreaConfig" + } + }, + { + "base": "{BBA5CC1E-B4CA-4792-89F7-93711E98FBD1}", + "context": "BehaviorType", + "variant": "", + "details": { + "name": "DynamicSliceInstanceSpawner" + } + }, + { + "base": "{4A70FD56-10A8-460E-B822-3EF03F1EF7A0}", + "context": "BehaviorType", + "variant": "", + "details": { + "name": "String" + } + }, + { + "base": "{B980EF45-C893-56C2-9B54-44B8B14F3436}", + "context": "BehaviorType", + "variant": "", + "details": { + "name": "AZ::RHI::Handle" + } + }, + { + "base": "{BB3C3018-66B1-4BAD-AD27-F385BA015C69}", + "context": "BehaviorType", + "variant": "", + "details": { + "name": "SurfaceAltitudeFilterConfig" + } + }, + { + "base": "{7F4E956C-7463-4236-B320-C992D36A9C6E}", + "context": "BehaviorType", + "variant": "", + "details": { + "name": "AWSScriptBehaviorS3" + } + }, + { + "base": "{957264F7-A169-4D47-B94C-659B078026D4}", + "context": "BehaviorType", + "variant": "", + "details": { + "name": "MixedGradientLayer" + } + }, + { + "base": "{35BF3504-CEC9-4406-A275-C633A17FBEFB}", + "context": "BehaviorType", + "variant": "", + "details": { + "name": "Multiplayer::ClientInputId" + } + }, + { + "base": "{5B169E40-E02B-5012-A085-BE7E6CA55CEA}", + "context": "BehaviorType", + "variant": "", + "details": { + "name": "AZ::RHI::Handle" + } + }, + { + "base": "{DE5C18B0-4214-4A37-B590-8D45CC450A96}", + "context": "BehaviorType", + "variant": "", + "details": { + "name": "UiPadding" + } + }, + { + "base": "{121A6DAB-26C1-46B7-83AE-BE750FDABC04}", + "context": "BehaviorType", + "variant": "", + "details": { + "name": "ReferenceGradientConfig" + } + }, + { + "base": "{DF17F6F3-48C6-4B4A-BBD9-37DA03162864}", + "context": "BehaviorType", + "variant": "", + "details": { + "name": "Multiplayer::HostFrameId" + } + }, + { + "base": "{B7A0A88D-4FDF-487F-A0E6-5BE04C82862A}", + "context": "BehaviorType", + "variant": "", + "details": { + "name": "PositionModifierConfig" + } + }, + { + "base": "{A7304AE2-EC26-44A4-8C00-89D9731CCB13}", + "context": "BehaviorType", + "variant": "", + "details": { + "name": "ModelPreset" + } + }, + { + "base": "{3366C279-32AE-48F6-839B-7700AE117A54}", + "context": "BehaviorType", + "variant": "", + "details": { + "name": "MaterialComponentConfig" + } + }, + { + "base": "{C10E7B12-BCB6-5872-810D-D597F123DB61}", + "context": "BehaviorType", + "variant": "", + "details": { + "name": "AZ::RHI::Handle" + } + }, + { + "base": "{744CCE6C-9F69-4E2F-B950-DAB8514F870B}", + "context": "BehaviorType", + "variant": "", + "details": { + "name": "Physics::MaterialId" + } + }, + { + "base": "{60A9A069-9C3D-465A-B7AD-0D6CC803990A}", + "context": "BehaviorType", + "variant": "", + "details": { + "name": "ComponentId" + } + }, + { + "base": "{02F01CCC-CA6F-462F-BDEC-9A7EAC730D33}", + "context": "BehaviorType", + "variant": "", + "details": { + "name": "LevelsGradientConfig" + } + }, + { + "base": "{571E9CC8-AE35-5EBA-9A82-4012B60E7581}", + "context": "BehaviorType", + "variant": "", + "details": { + "name": "AZ::RHI::Handle" + } + }, + { + "base": "{9E576D4F-A74A-4326-9135-C07284D0A3B9}", + "context": "BehaviorType", + "variant": "", + "details": { + "name": "AtomToolsDocumentSystemSettings" + } + }, + { + "base": "{D350732E-4727-41C8-95E0-FBAF5F2AC074}", + "context": "BehaviorType", + "variant": "", + "details": { + "name": "AnimationData" + } + }, + { + "base": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", + "context": "BehaviorType", + "variant": "", + "details": { + "name": "Boolean" + } + }, + { + "base": "{A5A5E7F7-FC36-4BD1-8A93-21362574B9DA}", + "context": "BehaviorType", + "variant": "", + "details": { + "name": "Descriptor" + } + }, + { + "base": "{742F8581-B03E-42C2-A332-2A47C588BD1F}", + "context": "BehaviorType", + "variant": "", + "details": { + "name": "TypeExposition" + } + }, + { + "base": "{8F19B652-17A5-5646-9001-120CE0D5BF02}", + "context": "BehaviorType", + "variant": "", + "details": { + "name": "AZ::RHI::Handle" + } + }, + { + "base": "{1CD41DA9-91CA-4A57-A169-B42FC25FC4C3}", + "context": "BehaviorType", + "variant": "", + "details": { + "name": "ScaleModifierConfig" + } + }, + { + "base": "{1DD3D37D-0855-44F9-94F8-76F0128491A1}", + "context": "BehaviorType", + "variant": "", + "details": { + "name": "InstanceData" + } + }, + { + "base": "{D7439508-ED10-4395-9D48-1FC3D7815361}", + "context": "BehaviorType", + "variant": "", + "details": { + "name": "Contact" + } + }, + { + "base": "{382116B1-5843-42A3-915B-A3BFC3CFAB78}", + "context": "BehaviorType", + "variant": "", + "details": { + "name": "DescriptorWeightSelectorConfig" + } + }, + { + "base": "{D9C0BF74-6FE8-536F-9432-C964B82700BE}", + "context": "BehaviorType", + "variant": "", + "details": { + "name": "AZ::RHI::Handle" + } + }, + { + "base": "{02766CCF-BDA7-46B6-9BB1-58A90C1AD6AA}", + "context": "BehaviorType", + "variant": "", + "details": { + "name": "BlendShapeAnimationData" + } + }, + { + "base": "{2AB6096D-C7C0-4C5E-AA84-7CA804A9680C}", + "context": "BehaviorType", + "variant": "", + "details": { + "name": "SurfaceTagDistance" + } + }, + { + "base": "{EB603581-4654-4C17-B6DE-AE61E79EDA97}", + "context": "BehaviorType", + "variant": "", + "details": { + "name": "MaterialAssignmentId" + } + }, + { + "base": "{515CF4CF-4992-4139-BDE5-42A887432B45}", + "context": "BehaviorType", + "variant": "", + "details": { + "name": "CryRange" + } + }, + { + "base": "{9F4E062E-06A0-46D4-85DF-E0DA96467D3A}", + "context": "BehaviorType", + "variant": "", + "details": { + "name": "Tag" + } + }, + { + "base": "{A435F06D-A148-4B5F-897D-39996495B6F4}", + "context": "BehaviorType", + "variant": "", + "details": { + "name": "RandomGradientConfig" + } + }, + { + "base": "{B7463F12-C981-4A0B-ACEF-4B26D431D797}", + "context": "BehaviorType", + "variant": "", + "details": { + "name": "Unit Testing" + } + }, + { + "base": "{53254779-82F1-441E-9116-81E1FACFECF4}", + "context": "BehaviorType", + "variant": "", + "details": { + "name": "CylinderShapeConfig" + } + }, + { + "base": "{A53D2A38-FFE1-4828-B91E-4D5A8B712BB2}", + "context": "BehaviorType", + "variant": "", + "details": { + "name": "SmoothStepGradientConfig" + } + }, + { + "base": "{D435DDB9-C513-4A2E-B0AC-9933E9360857}", + "context": "BehaviorType", + "variant": "", + "details": { + "name": "SurfaceDataColliderConfig" + } + }, + { + "base": "{74BEEDB5-81CF-409F-B375-0D93D81EF2E3}", + "context": "BehaviorType", + "variant": "", + "details": { + "name": "PrefabInstanceSpawner" + } + }, + { + "base": "{C6FFF25F-FE52-4D08-8D96-D04C14048816}", + "context": "BehaviorType", + "variant": "", + "details": { + "name": "ShaderSemantic" + } + }, + { + "base": "{35CA7415-DB12-4630-B0D0-4A140CE1B9A7}", + "context": "BehaviorType", + "variant": "", + "details": { + "name": "LmbrCentral::QuadShapeConfig" + } + }, + { + "base": "{1A4C0EF2-BF98-4EB3-B134-A6EF7B31B62E}", + "context": "BehaviorType", + "variant": "", + "details": { + "name": "InvertGradientConfig" + } + }, + { + "base": "{A935EBBC-D167-4C59-927C-5D98C6337B9C}", + "context": "BehaviorType", + "variant": "", + "details": { + "name": "RuntimeData" + } + }, + { + "base": "{8379EB7D-01FA-4538-B64B-A6543B4BE73D}", + "context": "BehaviorType", + "variant": "", + "details": { + "name": "Vector3" + } + }, + { + "base": "{A2589BD4-42FB-40BA-A38D-CFCD6E9EA169}", + "context": "BehaviorType", + "variant": "", + "details": { + "name": "MeshData" + } + }, + { + "base": "{E6E7C0C5-07C9-44BB-A38C-930431948667}", + "context": "BehaviorType", + "variant": "", + "details": { + "name": "SliceInstantiationTicket" + } + } + ] +} \ No newline at end of file diff --git a/Gems/ScriptCanvas/Code/Editor/Translation/TranslationHelper.h b/Gems/ScriptCanvas/Code/Editor/Translation/TranslationHelper.h index bd37ab0e2f..4d7eed7075 100644 --- a/Gems/ScriptCanvas/Code/Editor/Translation/TranslationHelper.h +++ b/Gems/ScriptCanvas/Code/Editor/Translation/TranslationHelper.h @@ -8,15 +8,8 @@ #pragma once -#include - -#include -#include - -#include #include -#include -#include +#include namespace Translation { @@ -27,447 +20,32 @@ namespace Translation static constexpr const char* MissingFunctionKey = "Globals.MissingFunction"; static constexpr const char* EBusHandlerOutSlot = "Globals.EBusHandler.OutSlot"; } - - static inline bool GetValue(const AZStd::string key, AZStd::string& value) - { - GraphCanvas::TranslationKey tkey; - tkey = key; - - bool result = false; - GraphCanvas::TranslationRequestBus::BroadcastResult(result, &GraphCanvas::TranslationRequests::Get, key, value); - return result; - } -} - - -namespace GraphCanvasAttributeHelper -{ - template - AZStd::string GetStringAttribute(const T* source, const AZ::Crc32& attribute) - { - AZStd::string attributeValue = ""; - if (auto attributeItem = azrtti_cast*>(AZ::FindAttribute(attribute, source->m_attributes))) - { - attributeValue = attributeItem->Get(nullptr); - } - return attributeValue; - } - - inline AZStd::string ReadStringAttribute(const AZ::AttributeArray& attributes, const AZ::Crc32& attribute) - { - AZStd::string attributeValue = ""; - if (auto attributeItem = azrtti_cast*>(AZ::FindAttribute(attribute, attributes))) - { - attributeValue = attributeItem->Get(nullptr); - return attributeValue; - } - - if (auto attributeItem = azrtti_cast*>(AZ::FindAttribute(attribute, attributes))) - { - attributeValue = attributeItem->Get(nullptr); - return attributeValue; - } - - return {}; - } } namespace ScriptCanvasEditor { - enum class TranslationContextGroup : AZ::u32 + namespace TranslationHelper { - EbusSender, - EbusHandler, - ClassMethod, - GlobalMethod, - Invalid - }; - - enum class TranslationItemType : AZ::u32 - { - Node, - Wrapper, - ExecutionInSlot, - ExecutionOutSlot, - ParamDataSlot, - ReturnDataSlot, - BusIdSlot, - Invalid - }; - - enum class TranslationKeyId : AZ::u32 - { - Name, - Tooltip, - Category, - Invalid - }; - - - namespace TranslationKeyParts - { - const char* const handler = "HANDLER_"; - const char* const name = "NAME"; - const char* const tooltip = "TOOLTIP"; - const char* const category = "CATEGORY"; - const char* const in = "IN"; - const char* const out = "OUT"; - const char* const param = "PARAM"; - const char* const output = "OUTPUT"; - const char* const busid = "BUSID"; - } - - namespace TranslationContextGroupParts - { - const char* const ebusSender = "EBus"; - const char* const ebusHandler = "Handler"; - const char* const classMethod = "Method"; - constexpr const char* const globalMethod = "GlobalMethod"; - }; - - // The context name and keys generated by TranslationHelper should match the keys - // being exported by the TSGenerateAction.cpp in the ScriptCanvasDeveloper Gem. - class TranslationHelper - { - public: - static AZStd::string GetContextName(TranslationContextGroup group, AZStd::string_view keyBase) - { - if (group == TranslationContextGroup::Invalid || keyBase.empty()) - { - // Missing information - return AZStd::string(); - } - - const char* groupPart; - - switch (group) - { - case TranslationContextGroup::EbusSender: - groupPart = TranslationContextGroupParts::ebusSender; - break; - case TranslationContextGroup::EbusHandler: - groupPart = TranslationContextGroupParts::ebusHandler; - break; - case TranslationContextGroup::ClassMethod: - groupPart = TranslationContextGroupParts::classMethod; - break; - case TranslationContextGroup::GlobalMethod: - groupPart = TranslationContextGroupParts::globalMethod; - break; - default: - AZ_Warning("TranslationComponent", false, "Invalid translation group ID."); - groupPart = ""; - } - - AZStd::string fullKey = AZStd::string::format("%s: %.*s", groupPart, - aznumeric_cast(keyBase.size()), keyBase.data()); - - return fullKey; - } - - // UserDefined - static AZStd::string GetUserDefinedNodeKey(AZStd::string_view contextName, AZStd::string_view nodeName, TranslationKeyId keyId) - { - return GetKey(TranslationContextGroup::ClassMethod, contextName, nodeName, TranslationItemType::Node, keyId); - } - //// - - static AZStd::string GetKey(TranslationContextGroup group, AZStd::string_view keyBase, AZStd::string_view keyName, TranslationItemType type, TranslationKeyId keyId, int paramIndex = 0) - { - if (group == TranslationContextGroup::Invalid || keyBase.empty() - || type == TranslationItemType::Invalid || keyId == TranslationKeyId::Invalid) - { - // Missing information - return AZStd::string(); - } - - if (type != TranslationItemType::Wrapper && keyName.empty()) - { - // Missing information - return AZStd::string(); - } - - AZStd::string fullKey; - - const char* prefix = ""; - if (group == TranslationContextGroup::EbusHandler) - { - prefix = TranslationKeyParts::handler; - } - - const char* keyPart = GetKeyPart(keyId); - - switch (type) - { - case TranslationItemType::Node: - fullKey = AZStd::string::format("%s%.*s_%.*s_%s", - prefix, - aznumeric_cast(keyBase.size()), - keyBase.data(), - aznumeric_cast(keyName.size()), - keyName.data(), - keyPart - ); - break; - case TranslationItemType::Wrapper: - fullKey = GetClassKey(group, keyBase, keyId); - break; - case TranslationItemType::ExecutionInSlot: - fullKey = AZStd::string::format("%s%.*s_%.*s_%s_%s", - prefix, - aznumeric_cast(keyBase.size()), - keyBase.data(), - aznumeric_cast(keyName.size()), - keyName.data(), - TranslationKeyParts::in, - keyPart - ); - break; - case TranslationItemType::ExecutionOutSlot: - fullKey = AZStd::string::format("%s%.*s_%.*s_%s_%s", - prefix, - aznumeric_cast(keyBase.size()), - keyBase.data(), - aznumeric_cast(keyName.size()), - keyName.data(), - TranslationKeyParts::out, - keyPart - ); - break; - case TranslationItemType::ParamDataSlot: - fullKey = AZStd::string::format("%s%.*s_%.*s_%s%d_%s", - prefix, - aznumeric_cast(keyBase.size()), - keyBase.data(), - aznumeric_cast(keyName.size()), - keyName.data(), - TranslationKeyParts::param, - paramIndex, - keyPart - ); - break; - case TranslationItemType::ReturnDataSlot: - fullKey = AZStd::string::format("%s%.*s_%.*s_%s%d_%s", - prefix, - aznumeric_cast(keyBase.size()), - keyBase.data(), - aznumeric_cast(keyName.size()), - keyName.data(), - TranslationKeyParts::output, - paramIndex, - keyPart - ); - break; - case TranslationItemType::BusIdSlot: - fullKey = AZStd::string::format("%s%.*s_%.*s_%s_%s", - prefix, - aznumeric_cast(keyBase.size()), - keyBase.data(), - aznumeric_cast(keyName.size()), - keyName.data(), - TranslationKeyParts::busid, - keyPart - ); - break; - default: - AZ_Warning("ScriptCanvas TranslationHelper", false, "Invalid translation item type."); - } - - AZStd::to_upper(fullKey.begin(), fullKey.end()); - - return fullKey; - } - - static AZStd::string GetClassKey(TranslationContextGroup group, AZStd::string_view keyBase, TranslationKeyId keyId) - { - const char* prefix = ""; - if (group == TranslationContextGroup::EbusHandler) - { - prefix = TranslationKeyParts::handler; - } - - const char* keyPart = GetKeyPart(keyId); - - AZStd::string fullKey = AZStd::string::format("%s%.*s_%s", - prefix, - aznumeric_cast(keyBase.size()), - keyBase.data(), - keyPart - ); - - AZStd::to_upper(fullKey.begin(), fullKey.end()); - - return fullKey; - } - - static AZStd::string GetGlobalMethodKey(AZStd::string_view keyName, TranslationItemType keyType, - TranslationKeyId keyId, int paramIndex = 0) - { - const char* keyPart = GetKeyPart(keyId); - - AZStd::string fullKey; - switch (keyType) - { - case TranslationItemType::Node: - fullKey = AZStd::string::format("%.*s_%s", - aznumeric_cast(keyName.size()), - keyName.data(), - keyPart - ); - break; - case TranslationItemType::ExecutionInSlot: - fullKey = AZStd::string::format("%.*s_%s_%s", - aznumeric_cast(keyName.size()), - keyName.data(), - TranslationKeyParts::in, - keyPart - ); - break; - case TranslationItemType::ExecutionOutSlot: - fullKey = AZStd::string::format("%.*s_%s_%s", - aznumeric_cast(keyName.size()), - keyName.data(), - TranslationKeyParts::out, - keyPart - ); - break; - case TranslationItemType::ParamDataSlot: - fullKey = AZStd::string::format("%.*s_%s%d_%s", - aznumeric_cast(keyName.size()), - keyName.data(), - TranslationKeyParts::param, - paramIndex, - keyPart - ); - break; - case TranslationItemType::ReturnDataSlot: - fullKey = AZStd::string::format("%.*s_%s%d_%s", - aznumeric_cast(keyName.size()), - keyName.data(), - TranslationKeyParts::output, - paramIndex, - keyPart - ); - break; - default: - AZ_Warning("ScriptCanvas TranslationHelper", false, "Invalid translation item type."); - } - - AZStd::to_upper(fullKey.begin(), fullKey.end()); - - return fullKey; - } - - static const char* GetKeyPart(TranslationKeyId keyId) - { - const char* keyPart = ""; - - switch (keyId) - { - case TranslationKeyId::Name: - keyPart = TranslationKeyParts::name; - break; - case TranslationKeyId::Tooltip: - keyPart = TranslationKeyParts::tooltip; - break; - case TranslationKeyId::Category: - keyPart = TranslationKeyParts::category; - break; - - - default: - AZ_Warning("ScriptCanvas TranslationHelper", false, "Invalid translation key ID."); - } - - return keyPart; - } - - static TranslationItemType GetItemType(ScriptCanvas::SlotDescriptor slotDescriptor) - { - if (slotDescriptor == ScriptCanvas::SlotDescriptors::ExecutionIn()) - { - return TranslationItemType::ExecutionInSlot; - } - else if (slotDescriptor == ScriptCanvas::SlotDescriptors::ExecutionOut()) - { - return TranslationItemType::ExecutionOutSlot; - } - else if (slotDescriptor == ScriptCanvas::SlotDescriptors::DataIn()) - { - return TranslationItemType::ParamDataSlot; - } - else if (slotDescriptor == ScriptCanvas::SlotDescriptors::DataOut()) - { - return TranslationItemType::ReturnDataSlot; - } - - return TranslationItemType::Invalid; - } - - static AZStd::string GetSafeTypeName(ScriptCanvas::Data::Type dataType) + inline AZStd::string GetSafeTypeName(ScriptCanvas::Data::Type dataType) { if (!dataType.IsValid()) { return ""; } - return ScriptCanvas::Data::GetName(dataType); + AZStd::string azType = dataType.GetAZType().ToString(); + + GraphCanvas::TranslationKey key; + key << "BehaviorType" << azType << "details"; + + GraphCanvas::TranslationRequests::Details details; + + details.m_name = ScriptCanvas::Data::GetName(dataType); + + GraphCanvas::TranslationRequestBus::BroadcastResult(details, &GraphCanvas::TranslationRequests::GetDetails, key, details); + + return details.m_name; } - - static AZStd::string GetKeyTranslation(TranslationContextGroup group, AZStd::string_view keyBase, AZStd::string_view keyName, TranslationItemType type, TranslationKeyId keyId, int paramIndex = 0) - { - AZStd::string translationContext = TranslationHelper::GetContextName(group, keyBase); - AZStd::string translationKey = TranslationHelper::GetKey(group, keyBase, keyName, type, keyId, paramIndex); - AZStd::string translated = QCoreApplication::translate(translationContext.c_str(), translationKey.c_str()).toUtf8().data(); - - if (translated == translationKey) - { - return AZStd::string(); - } - - return translated; - } - - static AZStd::string GetClassKeyTranslation(TranslationContextGroup group, AZStd::string_view keyBase, TranslationKeyId keyId) - { - AZStd::string translationContext = TranslationHelper::GetContextName(group, keyBase); - AZStd::string translationKey = TranslationHelper::GetClassKey(group, keyBase, keyId); - AZStd::string translated = QCoreApplication::translate(translationContext.c_str(), translationKey.c_str()).toUtf8().data(); - - if (translated == translationKey) - { - return AZStd::string(); - } - - return translated; - } - - static AZStd::string GetGlobalMethodKeyTranslation(AZStd::string_view keyName, - TranslationItemType keyType, TranslationKeyId keyId, int paramIndex = 0) - { - AZStd::string translationKey = TranslationHelper::GetGlobalMethodKey(keyName, keyType, keyId, paramIndex); - AZStd::string translated = QCoreApplication::translate(TranslationContextGroupParts::globalMethod, translationKey.c_str()).toUtf8().data(); - - if (translated == translationKey) - { - return AZStd::string(); - } - - return translated; - } - - // Use the StackedString to index the translation keys as a Json Pointer - static AZ::StackedString GetAzEventHandlerRootPointer(AZStd::string_view eventName) - { - AZ::StackedString path(AZ::StackedString::Format::JsonPointer); - path.Push(eventName); - - return path; - } - - - - }; - - + } } + diff --git a/Gems/ScriptCanvas/Code/Editor/View/Widgets/DataTypePalette/DataTypePaletteModel.cpp b/Gems/ScriptCanvas/Code/Editor/View/Widgets/DataTypePalette/DataTypePaletteModel.cpp index a31444921b..6e8550b1f8 100644 --- a/Gems/ScriptCanvas/Code/Editor/View/Widgets/DataTypePalette/DataTypePaletteModel.cpp +++ b/Gems/ScriptCanvas/Code/Editor/View/Widgets/DataTypePalette/DataTypePaletteModel.cpp @@ -243,7 +243,16 @@ namespace ScriptCanvasEditor AZStd::string DataTypePaletteModel::FindTypeNameForTypeId(const AZ::TypeId& typeId) const { - return TranslationHelper::GetSafeTypeName(ScriptCanvas::Data::FromAZType(typeId)); + GraphCanvas::TranslationKey key; + key << "BehaviorType" << typeId.ToString() << "details"; + + GraphCanvas::TranslationRequests::Details details; + + details.m_name = TranslationHelper::GetSafeTypeName(ScriptCanvas::Data::FromAZType(typeId)); + + GraphCanvas::TranslationRequestBus::BroadcastResult(details, &GraphCanvas::TranslationRequests::GetDetails, key, details); + + return details.m_name; } void DataTypePaletteModel::TogglePendingPinChange(const AZ::Uuid& azVarType) diff --git a/Gems/ScriptCanvas/Code/Editor/View/Widgets/ScriptCanvasNodePaletteDockWidget.cpp b/Gems/ScriptCanvas/Code/Editor/View/Widgets/ScriptCanvasNodePaletteDockWidget.cpp index 45316778fe..0bc54a493b 100644 --- a/Gems/ScriptCanvas/Code/Editor/View/Widgets/ScriptCanvasNodePaletteDockWidget.cpp +++ b/Gems/ScriptCanvas/Code/Editor/View/Widgets/ScriptCanvasNodePaletteDockWidget.cpp @@ -26,12 +26,18 @@ #include #include #include + #include +#include + #include #include #include #include #include + +#include + #include #include #include @@ -50,9 +56,11 @@ #include #include #include + #include #include #include + #include #include #include @@ -63,7 +71,6 @@ #include #include #include -#include "AzQtComponents/Utilities/DesktopUtilities.h" namespace ScriptCanvasEditor { diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Data/DataTrait.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Data/DataTrait.h index 6a3c95d1e1..ca25013d35 100644 --- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Data/DataTrait.h +++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Data/DataTrait.h @@ -182,7 +182,7 @@ namespace ScriptCanvas static AZ::Uuid GetAZType(const Data::Type& = {}) { return azrtti_typeid(); } static Data::Type GetSCType(const AZ::TypeId& = AZ::TypeId::CreateNull()) { return Data::Type::CRC(); } - static AZStd::string GetName(const Data::Type& = {}) { return "CRC"; } + static AZStd::string GetName(const Data::Type& = {}) { return "Tag"; } static Type GetDefault(const Data::Type& = {}) { return CRCType(); } static bool IsDefault(const Type& value, const Data::Type& = {}) { return value == GetDefault(); } }; @@ -198,7 +198,7 @@ namespace ScriptCanvas static AZ::Uuid GetAZType(const Data::Type& = {}) { return azrtti_typeid(); } static Data::Type GetSCType(const AZ::TypeId& = AZ::TypeId::CreateNull()) { return Data::Type::EntityID(); } - static AZStd::string GetName(const Data::Type& = {}) { return "EntityID"; } + static AZStd::string GetName(const Data::Type& = {}) { return "EntityId"; } static Type GetDefault(const Data::Type& = {}) { return GraphOwnerId; } static bool IsDefault(const Type& value, const Data::Type& = {}) { return value == GetDefault(); } }; diff --git a/Gems/ScriptCanvas/Code/Tools/TranslationGeneration.cpp b/Gems/ScriptCanvas/Code/Tools/TranslationGeneration.cpp index dd1f8074b1..a0f26bcec9 100644 --- a/Gems/ScriptCanvas/Code/Tools/TranslationGeneration.cpp +++ b/Gems/ScriptCanvas/Code/Tools/TranslationGeneration.cpp @@ -34,6 +34,7 @@ #include #include #include +#include "Data/DataRegistry.h" namespace ScriptCanvasEditorTools { @@ -832,6 +833,33 @@ namespace ScriptCanvasEditorTools SaveJSONData(fileName, translationRoot); } + void TranslationGeneration::TranslateDataTypes() + { + TranslationFormat translationRoot; + + auto dataRegistry = ScriptCanvas::GetDataRegistry(); + + for (auto& typePair : dataRegistry->m_creatableTypes) + { + if (ScriptCanvas::Data::IsContainerType(typePair.first)) + { + continue; + } + + const AZStd::string typeIDStr = typePair.first.GetAZType().ToString(); + AZStd::string typeName = ScriptCanvas::Data::GetName(typePair.first); + + Entry entry; + entry.m_key = typeIDStr; + entry.m_context = "BehaviorType"; + entry.m_details.m_name = typeName; + + translationRoot.m_entries.emplace_back(entry); + } + + SaveJSONData("Types/BehaviorTypes", translationRoot); + } + void TranslationGeneration::TranslateMethod(AZ::BehaviorMethod* behaviorMethod, Method& methodEntry) { // Arguments (Input Slots) diff --git a/Gems/ScriptCanvas/Code/Tools/TranslationGeneration.h b/Gems/ScriptCanvas/Code/Tools/TranslationGeneration.h index 0f84c48b22..c6d482e115 100644 --- a/Gems/ScriptCanvas/Code/Tools/TranslationGeneration.h +++ b/Gems/ScriptCanvas/Code/Tools/TranslationGeneration.h @@ -131,6 +131,9 @@ namespace ScriptCanvasEditorTools //! Generates the translation data for the specified property in the BehaviorContext void TranslateBehaviorProperty(const AZ::BehaviorProperty* behaviorProperty, const AZStd::string& className, const AZStd::string& context, Entry* entry = nullptr); + //! Generates a type map from reflected types that are suitable for BehaviorContext objects used by ScriptCanvas + void TranslateDataTypes(); + private: //! Utility to populate a BehaviorMethod's translation data From b56c6cce8949bee6c65ac8858c5e186f0f0c3dfb Mon Sep 17 00:00:00 2001 From: dmcdiarmid-ly <63674186+dmcdiarmid-ly@users.noreply.github.com> Date: Mon, 29 Nov 2021 19:47:17 -0700 Subject: [PATCH 33/58] Updated DiffuseProbeGridRender precompiled shader Signed-off-by: dmcdiarmid-ly <63674186+dmcdiarmid-ly@users.noreply.github.com> --- .../diffuseprobegridrender.azshader | Bin 218052 -> 240486 bytes ...fuseprobegridrender_dx12_0.azshadervariant | Bin 30631 -> 32739 bytes ...fuseprobegridrender_null_0.azshadervariant | Bin 589 -> 589 bytes ...seprobegridrender_vulkan_0.azshadervariant | Bin 22565 -> 23141 bytes 4 files changed, 0 insertions(+), 0 deletions(-) diff --git a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridrender.azshader b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridrender.azshader index 56009d56abb497027e6d3aea639d3d232d0799b2..e7f4577c9acb92aa91ea989e7bba8ef99c4f20ca 100644 GIT binary patch delta 7474 zcmeHMdr*{B6zAOC<&`ck5f%Z##1N2O#78!2>}V4!g5U$SQP@v+6%u6CT{WEs)U?u4 z#iGU^UOq7Yc?8R)G%ngy~R%dLIor6`&M_cu;$ha}-nIguq_@{)M@Dt@#)V zh3S|%Hjkn#%m*h1#)O32-KD|Q>V)>8N_y>Mi0@jXPstesjWO zle~gy>kOvsBo zl}hG87-N~ZL93zgWsuq>sC6$>g@S3B`SZ;MxA%3J!m>4hm%TI@zz zy&DFg^XKgQ2IH)uTFNN}t-Q_cv&O1z2CA(G1Fo}aDWw*I(SNY9<8*P6HHk*72CZ1% z#Mb(>OGX~Y?=9XoRDj_OEVxS%;@$Mapi>tYCJdu2wIZqF7iRL__`%A=#^w68^t=h) z_cUaWo0~R^ssj`ejyl8J-t7#*9%gQgpati6o28C*p^ImE z>0Ub7u*V>=2=?0@*8%=l)uhVAC%KSr8w;Yrr};2f*9GCuT3f)~{AWffz;59T6tiy! z`tNxYjlH7C@4Phpcosl$jXZkGGBw3EaZ^bQXfXYt4V^(zxb`bsTXtV~6Z&KQo>Vlh zS5tQ<53}_2qmP>)jpwq{tFw#UU2dEfIi*vn5A>GTz^?)35$7vkI&p@FW`4OMv;#Jl zQFbT^~YRJDCK5K`5b%rJ{@tdEZhP5*nkM>Cr_dm_jmEO5o zA1)jb4q;wES`E^B}>k$3P{PZZbhQ zo{oPV!bv|5bW}Z`1>(*RM#|Pc(zC>uN~f@FS3UADbR+Fl#@i{&0Bc-k?JF#tjNeOU z-dP{|WCToh6{}A|09)W$>*tmgQRd7X}zanSR2sOi(Fnl3aHCaiHVEYYEM_2$R)7Y z1o4uCv4_1Px?%5$m7(3R=Z3w1SJ;05?6pdX66R<4DfEv?QG`fL+TG{x=!q}#KeTwr zKd35(waT6ksV>U5R4#!&dTnv;Ul7q1m3UpP_(N-y=*Xt?Hrub;zc_WXmlz$(#s^UO H7=`Y4imktX delta 2850 zcmeHJZ){Ul6yH7Xv9;Z3`!;7cNXJ97x(&8fkN_&M0Wx&_X*3xwMrdXPni)bQ&xw3M z287Y!T6eM?G#aV~7j&4C$MT}$3Sq&GFgA=8B`GU$Zpuc}#6@I6^sR5D)enXbet^ig zbI<*qd(XM&ch5OP-x<5wruvI`UO3%Ig(qTlo{y)vRq~$X65E$@2@N5z|l&MjBkKJS^O@%HAV6Jzyl<{%xxiY z7Uxl%W9)Y$l^%!HEC-KW&udMEB_yW7(-hswrjgSGIau2Fs%-5)sF%e{%Ym)LQ=CP& zuBU#^(uG^V7aV3;q%HC4{kmCGDkYFs4D0joS38A-zv>px6Z z;%MX{MU8BDmh5iKx%-3E#e>9|p$|xXM=RdEDq(b_5d%N(rmdTph(o_f_@+LKyw7qK z(JDkO&Qf(1%7t9WI}7jrUCWHjyxQ{T&KFgqfa*B zi$6-#U&S?%y+XAMg(PzBRo%8-Q`LRUh`u2S?Xro!nhBNkk`2B|&X1Zj*^sP=C+so1 z&a?ly;POY?x)rgAeV=u&^K*%^!NY2Gld&o)V{Nn1-8h|uE_Um#5AJ`)%UH5{(&UT3 zbwg6dw%PTMbUr@6qkh5C6lLHYZk?bEZUadxD_HC8WI4)}?a-tD&r2wY2S87*F}72a z3ZH=j%($3|ffK7@8vNnOe2N|hr?y}HF&wz9$3wvxxT7-(=r7?mYe3g0P(WoFV8r(V z2|)A0*EMU`q5=$@teM1)u>$J6!Peb2t=FU@K$LElZQ%`HhQEofziEXMb z?$ZR%?9m+WQ2Y(VcLe9LHc| z{Jwnhe*rcMFh~NZs!SZ{(OxQcv1($V@Kc_=ZOckm&%?4fuXde*_IOz!bx}UiuPlJx!#eT>nQfvl3(DCG zfJLz~ai3@EPq@!Bbv*hT&vbE~sguJ7X2D&d@;jIxnyphXJX(0~Ob?!a{vCr3^F!qr x9k#R*OT~HDThJWQE8b1qITjx*{_R)2U8uNQxYfLFue-r|w)d6SCJOsL;V(9*QL6v| diff --git a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridrender_dx12_0.azshadervariant b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridrender_dx12_0.azshadervariant index e9893c96dacf7ba371df65d3b895f19b56b0a071..2565261d622427ed4e3e9c88d063b55d3d292200 100644 GIT binary patch delta 13780 zcmb`O2~<<(_UKOrl0Xs&gOCu0Ac!D{VK5*lCIOKlwBUfKs9_MLf+DDG9hwOc6)bR| zf=CVGfQpu>Dk?1rNPz;yNNvE#9~8ON3l^=H>ebu6eV{76|K8rW-g;e&68Yx6_qX>x z`*(8gC)~r|aMeLLN^i}_%aI7Zf1>Z=gU#hN0P}E#=Hp_6|7Fh74l^9A1eX1L2p$MoF0@L>#SS2Cod%M?WR$+li7B zUXK~1y=NcJ_Y4^`i&SU8>WGui_5ei&!;$Cl$sWB$=kgtuCA(XG%K6 zR$4o&5wy_HSrS}s)oN#@RT)KykB1nx%BXcaz*jbIr=uJ|?*9h%3-{`s0T7$D08L}9)vmGqAiijxwk@jEb zTl^mU-tLKQ>L>iqgvbc;!ax#C3ZGx5+Qvf>`+D^W?<3M z>6N+uZOwj_0gG}7O9}~#I`O_4ghe--v314G6yeU#y_OYnUoH?vgHhSmiUJGq#!U=U z-96K94YbHb{0Vo}=REBWp-AMEGHF zAjR~7SJMg*VGWtrt?;yc^-~Ebj~qU*o1qKSDP4G}oiYfEI|G(f2Q2!1VOUT6;mq~s>Cv$DgxGor z$1E`vGXuBm%)JzH+B+=>e&Ws0!pbcw+Bs+Ahs6wm69e(AL1kpFh1#z=!2d+E-?bSU z|HShQv^k(Q8!bsn4tFIx2Ni6Xg|as;z!{)n8@(lXbu95z@uB~4Q)EVCaGzv00|J{D zN*i6Qjb_M7S8mmYqiIyue|=e;>3@D%{y1gWf1DH1Z+Va@o2eIfTw5I8)Yz^`gEN&n zkf!_==x53a%99-zVfGuMx5A0MmvV5I_+S);yw{2Raqz)ZF?j`irhqN0p7!u(DD9`c zR)-E#x|7bftzE&vGvj8@*0-LTu`N-Erc$leq>B%J2t&mLu9UE}hp?phVCwYce4)3u zjr@@l*~~1l|Ig1^J}YsiS3$t5=p&D;a88|G#vD$$#?Lg*SvU*`}92l22e=CF)Kc{%!y%Ug*7apoKjM@>Oyg(@jQ$l>xP^gDX6 zl}9<()WEAe!qmX0e8M0?89^}cRaO%WmM8}a=x6?J5?(nc5iy8S_UIYxRC34$yOfI$ zS2z%|eF*#_p_9T`TA=)fh6oZ7Cl3PuC<|H9iA2Paqzq3a;W$othlZ3x(?SCO0t;E! zg)p{}r0YD9VQBh+hNz&4N8s17kW*bqPYOwz>WLJV;yCwd$ao@>?M>h}ZeStLplt_9 zD)mInPT)90G=#nd8RZiAw^)crH`23{B+Y|i(DaCg%-@1IL6ek)e9(>LrIVzedm_X# zoN|eeEMRyrF;hn6|&y76Ix?|-Ld|Hnq zWm&x}*sZgeQ!HCl_sGZshYLpk#jvzI-9l0^GU+O(WCm@8mj6O!n;~=-F?tYd)ZLg( zsx~wwE{s4|7^jnz){d0qCiGk5ePqRl#hhz0KQ!EA9hGC_NYP`87=wsSU9Cwdj?~#q zj5Qoa@n(0Zf+ZrxVXtD24z~myG#i!>%d-{qAfbsiNh+|)OL{fi#q^?|XB^e9w3K6( zR;>zNL0C!WW-IiC?qqh(ur2p4qVVDLPHr}L{N?-4Mxwlbc@$;t=q+#>6)WxL<6YzJoynJTwkz^8$a~1J z#pM34Mtan31Cl2Ny0(r9M@pu3GPmGqQyYQyK-_$a9LJ@8SdBk5I~OS)f00POmytPju3fL-TH^s4CCwyjbJZ6oJUIY*ts;Ur_^JtR0uO#fFsYHjCbP1`7Ba3K=$6*zrU z#rQ?T>29ydXR&UuO{`m9ho-v++h(>n1(TBG{CLHhwGQ639yjShn%UU-tw6lSs&0g)20LlPCsMKb4Hilm1dET2nI)VI`O;)& z_n=W|tek7WaThQ$C2%p+!7z;K*~Bq)q?}e#*+jx}9&u5vfV(S!Fhuq?G4S&cIO*jV zbCkjmuxr0!&Ix=7h>hFF$Y_UKgwmToO^8>Y9lzLpG}Ns#rF$&=a!RwbTwRR|>B!)k zc1jQhcTh7q$DFr@_q=t|5v;9;s334DgrJm7ak1%}19l|uNDGRM-?bx+of8<2iG!=W zGx=!J@dxwPL^EE{FW49@@eVeIm$E5k^RC$BH~m|}xm2238gcKKZvB1M@%4Q=U2imV zeILnQW-4+3y}yvuA82p2bE&E>Si94k+>zV6Utkh2D>ZkpDP5x8(RFm0qn6|4vI#`a7uB(LE`ePiyph4`}< zuQkg1*yPA(z2-z2&>iX8)vpAtEUDwCl&|kWKC9^EXa$`a1 zh7w&&AIU*AE6$dC18h;uiat|xKfJx{z?TR5;FF-e@qAJ4Z7_^E4ShxJT}2BsZ?~Tr z0{d91l{#F94P0@74VV!w*4N%}Zm9d>%7Ty^^|gLZ4c=eYx?ivN_I7IUxN(;2+u(JR z9;|U`@fRC|eJps}{fiski+CQDR~x*b^HqJ}Q!Fg3;ilr?UZ88k7D@~vzz`qEbEzAPXR-ac=ZxLWRg6`X|k^#*;Ru>p9Q7;ZWY=WH&D+T%Uv!^!U_mqqc+TY1l;{uTt0 zB`{WzucUtF2HL#&MsEFIjcT+VM~5|SQ;yG(a?1(KX}3zNCjoOh`Bs8I#H?dmt!MSF zKhCyZ+0U}P-?P4qeVRvsdoQL}Ko~p& zVeo+-Y5~TV7?rg7!IKnX!`4woxU>`{hl;p{RQ^mbI)z00q3GWVNnjxPB7pp_;Od#z?$Pjh64=rf8&n+w}IH9I482bIpaDbXnv!KWF|S*Yoqos*)=^b1#b^ z(6rE6v4lbQP7H0}Ei~FZ2vthWM2Ggm7>K|H4p^evN&*o`3TK>|4Vuqjiz&joD+a*lCy_RC_M@*)!IY zXPU8!s}CVbviYOb9qGH%Hisu|7wy>M!Om$(<`Q6h{tI$X|U5UQ`$dU%|=>UR~wG;bD9Ug!_R^IvYH!wZYPmkwxtJfAeU}8h{Y~RUel5>cam=#8@@t;7GaLWWvsflxR!oa${dMW$6pW4dXI> zp-WW@acI`MI5|Rfa~C+p#VW)ny0ehokW@ZSW=0GJt=b}=c#W@_>yEj%DTnvP6-Z2Y z7p`6eM^+0y&NriEDrfupKlO3&zTwf(09~K?N}z8lmN<=vh#*KzM~%OSi)hX{T{-7F z$8!u*Ftau^HwCjE`@E&MqjePX^Zj3``&%>}y3ym0wWFFrt)^p`$7~-HpTOm$ihLYXi8pTW zo>m~_sean2JoW9|rE)4eEZq+}4=K)LN}ub~;N@LYdzQQSeD&f}_29y<)_}@A{G-{} zBCItg#FV+Kj)82a$UL^{48>i)VUrOG7)FAwFvf+4cZn7f3-pJ7eq&+-1 zJkZinFg&bo)2MZ=9fx(T18o{z_fd6!znZ7dY=0%512Mb_wOlb*@>Efdr9JN0njYt_ zUvXH3rR#7Wj|(0*J+45?Cksr4`h4woAplW|w$u+y78pBEsQj zUG;9b!sV6MSHqyRrNv=zNJb3=f74JZ*6pR@7PgZ8)Jhk*4fWVXkyLU$is5WawOD?| zRbY|>1)+N@rY>4V0X4nUb04}5a)y5ej1j;97^K3n0qx`dj^hJk9sOWPmCpttJY>4U zP5Vv7r_dr~CXg*e_w^R**z9{~NnZ@>K4fLZnA;a>DY7?5F*RVX_moiKAVN?;z`l5U z*yNmyJ_FdK=adT0dU@M7czgTSRo8gD(Xzf!K!rG;!8OA}!i=*B3i@nh55%$$AeL1! zt_Wd&frIKcOx|&@tNE}ib9D>_vi*QWi<=Mq2JQWapPuMS&Jda=cqGIXm zhfD1Og^qW_9)u1?FNorT5M% zlhqpZ4$0vqmoO_CTS37md3y=R?pVXl$$hbjjH5?U1@E3>Gh|jU$52c zVOeX|W@<`|@2s`H+irbd1_kkQOLe(bzn#sqa((=qWQ0cxk}xxGXYq4*Gy*gCHZj&b zE-oM<$m_UTqpLdWNGVz%VqDm$WiU-M4qNajOlER4jV-M3T2bL;dABXtp4ZQ)zfCOf z&(s(0gl8h!QJ!lSt^Bs-`P*#zj)c>ZRwt<8f$=|mAD8rR2R?yfIKDm+iwcO2bX zT+^6&yGsI*AV!=&!dvbQ309h{HKxDMg3ZcpsIP;^H#)`UQNGQ%v2E;u41?8L?O1<| zrVUK)EKxAaW3dJ148i3)<8EirzPsg?(*>bCRNQOVoL&+@wRb_c?X`y+V&bs5Z6ap4 zV`Sj*FeLnEi7V&8*z1e0)pESA3V-)H4bF0-+(>I|QbwO(ocNW;<>NYxjk8^CHOhXZO{2!r675x1T6mh}>6q$=k z9n+zF_1y6oG0Qk(2*nYZk_Z{SId8)>lb9}Ce|MSlH!ls*3vGGNc#df6jmv+(ewli4 zo}5F8V^ZM%!f&%4*G_SQKk^AZ_Rd8SWpiAm4lilkWo?fvju1q@jz4so$TBAVDISRp z%%mF*a%s(6MhjPLfinykLEW9K@i{-C5l;5#SF}UuNwE=X;2eirjHWoVagWhM&IveS z-4o|LJ<95YFFtwyLh>#kNG$Z^g84pShcJqiKXM!wg05fQMy*>Pv5nb=l`#*6AqWY6 z`@l~y{M5nEIQ-~?#8xk;BXWPhIR?(hq=+Dq)IUnm75@H4iow(=wDi>!TGG}vdbr|K zxN<}{Hyi}@>k)=InRonR_Gc)79sNhv?$YJIq#a6-jJWT6KvWeGVz0IeR+yU ziO3PvKNCSA;$=XHuwT+Mc&C`jDTMGw6L*4U=^2*~3X9SA7tWIO(Clfd*r_`Ght^JC zbqn1Cmj~mEuTv_B24)Bu&VWeyu&@Ykg(y!oxKGh8Te^v`82Ccptl<+u$EAq{TIW+4 z`m9pA9%EFO^=~XHWmP1@*kJK<7S2hK9k`4_%=TI?H6y_GL^xl`EPFHffP{7#6E{=z zqFSyeU3;y+kJ7$LKWPd*t%42krJ`SG$Ckz#*}b&up;2Y>HIXs6XbyHj+~NCPF~4Rk z$r%2S65wU>z{_MdUdC54>JV3cy$6CvYG)BKrU$1;%>?d(XlBiZaoHciM+swZ}5m~IMihLiB$eKQ5sfVHYb;JjDWAaM9Vi?n?oIXJkM}~YxK4V z-6Y!bzq;86I|csq?*wWEIq9s4`%!&kGenPTYJ~x)C2s)~!S!Z+;`bQm>%*gcMWvY77^xaFijO2)KZSQ_FJw1pqp%F@gt( zBi6jf&Z=$5`U!@5tb-WxpHG8Dwo8oFarO^?%iBErlvy^CRh&(+mZgA3ki@+hw-IqO zcZsLCgETWW4`{)`H08mxJU|aPZ+*uQs7fS_foPHVYU`kIW_!XRVf54Gh`5M)U@oXYB1KMhHfR@`Shu zq!2bn=`6&Iz?Ey9^T!cxOCms;a2cETVOwv-t%hl>gf=AgC))CEG!rC_Z7YOS#T@N!H>_5y?H0_y2Sdza+Sh83DR|t!e{5J}J$YzQet~5V$ z_Tce|e}hM6?@it1um8?}y4(D)U6e4bGMMAAicjJkT4qnjqx%(IEeT{}-A>>Zll{ckC+HIr-!He+NjEi{zc>f1o59RG0-J z2IaI+xs@mKycox6qan)@kv70g$5@COFjFE)>I*EX1gHFthR70;N_PT32WIF*@_;~@ zcp@3aIAt>pVL=l>p$rxx+1rgUc9Eo~JP`+=LO;@w$Sp{vFM)rTg(-H#zN5EasBqm9|;MkI^u~0p2R8t8BG#c(Wc_x6nx5^hEKmNwZg@qX8gIhB6Km|3U9m= zUB`bPSBzfZTN~YM&brmZYi3f8KKxu?j-q$@9)tvr3Z)8M@OebkN8pavn}co>%r`+y zO*5o4rZRiIfX5Y>XG6S|1h7JiW zaB=8Mp%ob)E@C9cI-*tqX{6*hc?5MKS{U##DK$=>O7%uf1J_aY%8EHeDBZSYo~ZjM zFbGG+zb|5Z6gwBawd}Tmzq^3)Tr5Wnm!Qg^L5YZgkAy0Q|LqL2trS;sWkIb+&2>-v zE7f&SPvk;9F=4Ugvq1tEW;_iwuC!C`M*avvn6fD`Hf>W%()Qiyo3?L`O*73v9$f2Qlw+tScKw+_mTPC((^DBO8M)?6|EZO;6$WGD^j zmMaYQBY;*CY>%%VBy3USzX*6}uzxV`gI6XO<4qNNOT(~I%i99|tJ^JjTc0<$3ZqpL z3|FbJvf!^s(A}9o; z(A`p?8+q*z0WE8#SiS4dI*Ba zbwGy#)`A4w`xrR@g*YfZz`0jYGLiJ^cm)-$a7nWdOS5-rhLyHxUgK<~V9-D22bsNS z>JvMR^)wM|eb|Rrj1s&;Oc$1LDw`#1lbL~b7N5k*k@05Y(CvfzLchvezh43{x+;Yq zEVihR(FuzwQ99ABrQNN!ohY-`#K|WNlfjrHV&#K|+iC>d=LrGTbJ;}2`#jpmE64}_ z9aQyXHv_2pH3KQa?pN5oW6|1}K1mM{7+^uhMTxUsG{yG5gI8PL;Hcm;PmTOjN9zwX zG`4@4Su>4@pw_rDX{*f0>fb39arN;q_Oxi6ZA?o7`4CF;Yhktm+`+(L5+ z#$uw+ywvwkg^DIr7IVL^$!uq-m{TAMR#}tOA~&*vV&#tb_~hN`@F+jc!%QLphw@;rG1Y42+t6^< z<2sjzeK-v+1f!PqHMQVLsxdOL#&XjTOv{`qp-vxEqFVfhz0LVDv#e-NL;jiEBCH;q zniL~9Y65a+v2HD}h7E7{7;AuNC&ub9Ze7+857PS& ze5#5XX-c0DSFP)9T^=J{)BI{dJN5v7IhjyU58c8)hiTq*qe9v34=_y5kX%!f96q)< zm8%~6R`kE`akm1bALnIy;>;EmRlCJ?+ z^&Aeha>4$=2--V5FsA8P_Cz^6fYnts13Kk!$JlZ8=&)vj$7ye5EWBNbv-Oz)iJlA$ zYul6q;4h%FBL#<5%l0Qd&or_^FR~U&?6N^C>ILCngJ|ACz>D4Vx2H}S?MgZ7)(KQx z&S(Sj@$wic;YE|(pOY#|B3M|q$kPKXY{n-3ja1>V;#fhFD9cFF^xsL9T_tQ$?h)Pr zhBLzu{+v`1uRy$uIvdM^c=uPNs%7)>KDaGw{tKz1Y=`qSiA+8B4^F&;WTEMGr9!Ix zz8l-93hJqNYH4Zc9hXuL@fxh1c($D7pNjghXH(@dVB@?yI-0E%-OP5TF-Adr?Il55 zz)PdY*=(wO19Vt?=Q-A)iET@5!U~LAEUV$Zp^w>Y8f7mg&2Ud1NE0=-vXRIZfZ%GA zI49=ycz^W_TbV{lU>+UA8nw2dZHhl9{=TAH3&0$=ml~#?HPZfP0?-s924;-**Wb&otbAgQ`}8 zKf0L|2<{$udHjy}RXbM3r)}Q6eMKzPR^d&C9hNcR^Z!7dhDsg1u%K5cysrx%7{kcR zVEKG_*Pv)f)!6mDq`he2nFja9vUW%XdXi}Vsc)O0C3EQamfJ}!u&86oru5X!n-f;2 zg4eeKum7XhnPx2h&qPjXzF4Z!d};h5&FD$W<@YXk&da%UIeGLF9eW!EBk+)YoPN(9 za)O=@UPq4DPRZN%2UDBwg@h({H`r@5I{8Z2`$%Oqw3cxwT@U4jVt*r2^y5nn_ zft$azGxJMTO%Y_T+N3}T+czOC$^&+^xW1Vbt1P3d$9lU-s_HTb)x*LuT{lsXdPHAc z1H5TtWf@&wrq4<^ zAI%nw&45D}$8)Q4avzUB4nLX;KK6tWZXT9#{dd?@;7_c?k{iP>r@5458eVz3yJI$b z*5j(DZ#^J~TK}$fAjBs#mUO8KcfACJ_59IXH~P`}moU;=|NcW42&4O^DAF`UnwLH$ z!cb4oi={4pq5WcqpYB{E+S00KVyh{rf^l}9gc0)E>*Ly?2*UG7+sU1_FY-_73oT5% z28K1=8Xcr!|MDW)`s~*|?mw-5Hlpkp1~=W(0hH@sUXmvA1AgF>+&4NMejn2*<4;J_ zt2>2|>z$Zd^|*QhX3EyU>s5ercoJsFZ(fxk58Ek9Vc+0YTaML(K?cv3cFmiR`BYC$ z_y*Lts1^ItUDB}((ysRf8MZbxYu>XFZ~z@68ps~oDGTdi!v8>?RtUS`#qNMNfHO9XzOD|nA+SlF+^WRvL(XY=r@yep1(Xl*ZG|(RXG=E zU*ur0us*`nWk1KTerk6o9{0aFaAgPZZ)}s)g_~6%zgy$sm*?k%JI%))BU&P`tY{`@ z^6bSjp`58%s?^}|TC^QXb(=&CnxQXD0h61eJ05`U&QDk0z2`M>uP&+sd_@mV3kVGN za)VBDZg^k0ex>%T_l;V36Ug@h)a&7)3jCnMK}+iggq=#_++Q4{cnckWX>FZMNaU>v z0)jwk16Mr}aVOyIIWp9(cRSUs9hH(Ekaf?1whazqv~U74zrTV^5!gaGmhKM-2gxx^ z*4pFuz_)V`!V8K);jE{!0HRw?j%(MrYoeTSqM2mBsDhLW9xG3k^{>HCf1UXBH)$Rv zKTp3r&!8rcs>-9?&ZA3)dJJDOn7R3^Gq;HXn?d>V=~tMnikvSlxWH|w^YAUE2djf} z?F>^|;6XxQrrRp#8tqhV?s!c7{pGAo0+ebW zhH=5tg4%w*!|q;Y#*_-)Xi;+ZbQO=$ZoTkK({k6``CXS>Mce09(T~EVB;*fA22c~G zx_{o;Inn_SG>mqeg>fo940a|TcFVb(485L5)|s<&u2kDE*4X<$tI!t~n83>>hL#GW zmRJSHu-r?~^eeEhLP2~oqf=VwNco@OWKMzC)*QOr@`OZ_mC7CF8;v!YZ^u~yhw6;A z?iSdL;A}^64nnm(SBCPx&E*LFWra`bCbE_&f}Rwa&Yw$&wcFXo`7XYKY}F zBXI!}p;H`82^=g@YGg|EympW-a~E(4``~>*!IEUg@xkvliJnyDY==G*&{-3!=*hX0b&E20t;yVVwP(sdqphEPjxJb~!fa|kA%(E9 z6`pm=cxD&O!v1DP{xL961aB77E+rq$V%=NM1n6oPK{ij?p1v#HG(#-14nEy*yDOZ5 z-=lOtwrBEIP*A+v_}I3iM=2Xv0~RoVWqjS^<^rI|JoDY~Mo~KZ^zJn6`7+&)WrNP2 z4<9O?yHh!LXXRY==b`7&FXMyph#_j^Fv}<6e9_~)p$09y^ED?w{C4K;qHz6<=M7n( zhn29)Vr;N?Q10srIc3+OQ%>Xe4Y%QCuyFk`{W`yd2wdHk=qkLUtJO62p+eng<~NGW z;P1lUzfpuIW7r38j6=&jICcM6Z%H7=GX>n~Zxk(6sF0g~@r|O9pI`3xKl#&Kln!4k zY7$Rge-s>THr!u z(*^~K6)lSkSnW#y6)+$mS~e+EMB1koE%n(-+uvNQO8ffyzQ2D+$eo#U=A1KU=6=pR z_zm^x_o#Xfity@od)Lz$RRSE2;+Q)NgChfju(p|owU^4CI@Yk)3~pS%H;& zI|z~^A5@o2{ni-k2irI2rmE`hM=)q)ckAX3(@F1>a@#OPk*HN~=z1VGJ zm#v>2LuEr`xF*-Y_MiV^J=<%1l;Ia>pc)7fQ7b8QhzfLoAR{7}8eafGy4UlvJVT0@ zKkdk;w6=3@+&)i#4y@$6Rg-4h(obJ)OlQkf75pL)&%-p zzy#C>`D)MsS24@$1N|y6e!WsFrFd`Yyk}hlBNJoi&PY8s9HHKnk1=%9@BK6j2LOf~7+67(#3jlppBV5#+1DEU#+wZw~UQ$2eBC`6@BXHE2H> z#`kL5@|P%La?S$XzGf7zUwp%jA&2M?K?{QTCGe}2OOV)d$};K~THecA)IVX~n`H?i ztYu_DNInv;I%Rz7jWgg^+8&;YKp$0GzyQX-=#5w)Eq$T1&)2K?h%^}@4GI+2cp@?2 zD37eoNue)r!ff(FC+s!Wq?8%BeWuHs7mK|99RV_ugOzv$U<@ zlkqfXB06Vbn#ug?0e53?O1MWzPa#@gMKRP5od#ZjSZpstGX?DEz0@?za#|fA3-VV1 z_1j!~gI1`5e3eS(9WVGF-ZWS8;~DY+XNnpw^+<2*nMAsq{`po*6qxw)z->NeeL9^h6CU~nUfv7c83Cf zpRA3d!wKXqHd}z%+$~G!ruw{mg|_Xg8`vNRV>+GQN`MxvRuVYS(Mme}h|JaXsAL%u zmsN@liJwDS@I;V{Co%UJnE_RUfan{fh_J^iWh6bX< z;>3$RprR5Ky`2PE#6ulS46DWz^6Q2uJ8|Om9#B;oN_m$AHN-=;%P_3-pciK-V64^I5C2h?7HQcjT|-O2fzlx*MgmQ`oSMjXlQN* zTt~4(=bFIxC>}=bLJ6Nm>a`_=T*%_OXiDfMY@a3zeG`-gJx4pRFNs;GkN$10&_UQfQA#04YAAY;G+hqILN}5keC8v3^VbVy(RQ!wjV4v z+@d1}KWkBWlyQMY(|3leQMl$dtdKkm`z^Yog9_kLj(V2RN7eo?)p$~bvu0@5p`d9&@l5l9P^xR1>Q6uhA0ENMv|th!uOpz~Xo^V_ z<}ygi9PfJ(cLQj6S2@WP?)N_oMx`%791ibWG)l%sxw0-JBL^6=Dlb#{neyTEuS z+dKWV_rV9=t_4B@I10NT+_=AQVe^%R9hGee%ve_O%}^eG%;I5P4pR8 zE+4~~f3wYea+_ov|ANV$mSzAUKQ=JxKLRqXXt?DaGt$rzllMwZE!LHd;;j4h9+SXK znlBuxlsA-atuE-R1mb^HC8EIWSB-48FrRPsOpm7vngKPDW{l$M6P1XX6!kD-rS&7n zM@vPKg|w}uh@nnyFuM2_Sb2O1UK;NLhBI*6qG~u4KkmT6VH@{iOHP!8iV%T|48p zr6uf24il#BN!U-zmvM3r%^Q0CA6ve8-i|zvU9LoA-M&KLi^d6A-45p-C$E0``0Nv%@TXzt5*02_y3g4w!d-NC zN%*5`oXwDaj1|)oC1nbzk=4cb!#YnKx_C(4dF@PbUSIXKmSyt3&gzLJEknhf-Ni{P z11rW0RFe*fhmW)VpoT@!X!({QDhSN?fGQ%OOVqq#W7tX+&Fqe5rApy9GHDs9 z<)?L0PnU!7GQoKFu-lOF7PufbZksSMXxHB4G((w0&x?AbT(Ap`+pW6w)~?4~^3FZx zy5v1}$WxG$B>Y(r4o3`m;UX2C{4(mTNxQ2rsvC;u*OVI)vAWmpw)BNjh$}%DrAh8; zQ`=F?&t7Q!!oH>H^Glz%T=4R_)M(%A?N@Wb!}ChzWk2sL+JVpTAY+6x13+RE#1}`T zdoS7d;_eHre}6p1xmlE+&GDX%c*FrYWEOi%hq)yev*%qXrS1^M?%J0mOkt-b3R5>E zWW*WD&_-ZAd?Gjm+@iYuc0P{X-N{5}#p5UEok=daA37%{JA{3nDB;Uman?T>k~V@c zhdcq$y%I zF(ZKX@VZSjk{wSdEodgbZ~(~|-oMFGblo20*hqD(7U>&t-rMLh87c>1&64W|2RcTc zOYA5!Ytgs(w!li?(B0Q?S%RTYsiA)-y!;u=XB2N(R~(U59Mw>)EkTishQGYgI@~qc zs%)JEpVM8FQ(n~2^8y@IhPrmiwb}i0gXg6hrq5^YR~s&S`?`xhyIgtM?F_T=!j%?X zPNO5$6a-H12d^ZKskAlQJ|IdxGH7SZr5S5dPoH*Zqh)5o)@O$WHrM8J0IK@Z=M9(L zKD&Izt)BG8h#^OZxJG_(9H?Dzq(ZCi#vJS4DrD5*pPo#9KL`!+YaH##(H2NnQZ zPDV4+z`7mpf3Xa|IfBEPO@9P3@qm^!283{O())4yQ+B29-4hofOxzn6v@0nkE;&_* zq#TgJw$^)q46eNUV$;W)jf0JGt4uh@MK7izCXH=xL~y_`qgp?_-i8YCgHd9(c_M2- z9IaWh^Q&EAu6D-D~eKCUY% zaHSDezQkno9oKHPdkj*n5i3T@B))89Gw0$k6L=BJ^*47mQ!Xl@ix3!4c%-_x zrEl5YhQ4ZbLv?W{*nc;H@b{G7B>~r6Ug~zS(e29Xwe5bH>2}Hel&442m6pcSRl1x# z9@OPxwMz6|C=Vp)ciFlQNh^t%f=SZH*0c|&<6`3D6LH(q;w9sg=sfS13r(IN#QHr- zP+%;TB^NB7=pktkG4Iap=n(vt1+dA6Q z)_ea=zGE2s}U?MuM#d;FtF_w zx@fnw7zxbsb5M^T0G8+trm;u00KsJ8iw_S7TAQS#1e z`4O-W$P3iqWcN>XJkr{9UdG1AlLNG^$QDW~jxHIg7%Gn*!P%fJ!2X-tPzzaq5Gpe~UIW{ z#QMQYKb7|~PTUE#xOc!}sFYqG7@AVr__O5qEgqZ# ztm2h{Pmugc=~1QI63z(>f|Vz03Tq2bR(R1nb4+XV=LLwc?!70p(ckFMa%F0TZr~k% zL+lO{FN(IzlqMq_^cs+?J78utn`K|o>QEo(bOG%$DRG^a_*P*2mC^uB(29Yeu)+55 z(e^F%^5|xHq6U}T%Q;YTGo#|>!QNGe2UZ;^={QW!NRZ3*X748WjA@I#Z(ZRhqwqn{p{+%C$uk{+7g9>iZs%YNBlC6Mrm9XPe> z6W!}CYj6L;|0$?V@x)n?jJ(pIk9l79z0#r`$ky?k>hJk-uw#d&`UE)dC$V1ShKP&X0LxoEcK4?@?KKnP%zQb`%qo1)zWgUPmY`@yTkNbZyx*( z85A6jmK216pNqq^dp`w(ttq9Qh_)PfuZ(tow1_Uc0vaiha}tmqrp*HEwdt_kU6ic~ zd_!m~6ELNPG`1G}{)WabMFSeU6jnN6KPnC2IB54OnB-}OW;-_7d42^5wLM}J z2;u?4yU-?7@cSE^1QF*6_5OK6-QG0e<%AX;T7aeZwR>3Xc*baVPg7y(5@1{x(gO7L zhD3+Pdyrm|9VBa#NX?W$=C%m$JN#AFH~(@n3QCjNh|e5ju2!;8iC{v2JOYZ` zWmAuWd`fAUc{JKbXULA^DL&cC?n$W9-eG&>#NyQ@`IUWqD61#wPel879fCg57aPd9 z8)YmpHxTOjy?RSp0Qoy`}7)Rkx7`lLQ5f37(HHNggO5W;q(-A?(* z@CBvN3f)~#vD?4s`XaH`{EU@@VQmlB4hC@#=P-k<8R6E9#S{XT=%%AW2RmZu5dA$i z2-NvmY$mWEh`yBp`ib{@>mFYz)MNZ4a%7xqpR~T5cNCb9V07K&&A9Iiqft~)RRD&C z#FACNHy`CJa&-IYdXhD84n%Y#0Vx4Ho9DDM37wC;K8rlkxhk2a4?MvqY=exI+w2k9 ztj-t}x`rhPxs@d*5zLn?V5_SLx+;kQ5m*|FMm^%i!9U<#$yI#v0}A=^INol5j}0FF z+}qffLVON5ZNA?BA8;dR(h%Ub>i^PPEDM}n@h9xPcyE5ZgZ_gO3LC|TJk$v34R}kv zRjvM2Qvcos$hBr6e7?O{(?ogvV4l0X+d)Jzy5w7UZlw)^czuM%{goEuSr%PF@F!?yUs@zt*CvbalIrZ7d%$QrR+LgtNMM0}31D*Srw8k7t}*0NfKMZDdS+41%f| zaRvbSn*$e=z7ejwVsgS_V7`9Pm1Q1}0@Vofu?Yk-4+*ghpS5KmkmpPoPG0W6>P6Wu zUY$h{n&XBMJBegd9*r$gsm702Dt378GK|j;|NV z>-vGe&0?AMZZm;BFytVHYOb^FAK#l$K%&fI0kt~GZ)z$bfP1qoL0M&*VKJr#YFR`w zEP7BD(?a83hIz+?#Z$E&A6mg%pdh)R2*K0#MvxXu8-m0tUIG$8j#c^OAL_|<`Q%4p z@+=4=%GdMj`}c|nKEU821%dg9Ti}M39-cy@R+QybrR89y`R_7;DAqzzhl|nKh$sdk z3dKizR3pLQ(jK@R;Qepo%7CL|N}fqq-k>#f!3;&; zkTt;4HsaVTAfrIjBJ47Np4~94k4zzn2I2!M?cf2$mZFrmNRSYqXAcbPq$%_>0Md&5qU^zPMg))iF|1)z=$jshzYix?0V;hGMSn(u^0q^{0T|XpFyd{f_W(}Z3+Om_^dkv6 zw;kdFIxaSacHV~aGjZZE4+v{@i=O)cSPMbb_dwn@!|-7Doy*`2A?7GPoD#AWRS1`a zn4|la!jeZAMKjY|0N!AWgN5bVxz#|U1j z;O!ho^c)5*;<%whY~Y(5XM=hJLz$RFRRXZ>w?m=b>R8)^TV;kqZGjnFGxYUPcsbX^ zCNf4sxr)-g!1Q*%1m0fU$$4tLpq@>^?3CPhY8Pc58&cs zBq=)X@UGA;I`Xm-I(9dc-Jw<1G!V)`;akIal>KU3n6ajh=n;pk&mr#lT*(sHCmcLXDjaOuU(2h$Q#3et@-X&hOKR@R{ z)y)hZ<%V#nE#VubAq^{PTkeJZzJbjg-`2*`*-NpC9saVTf9hTpc**(>5SY$`o--v&ss34>}`v}MK&R`!jPY{LTm|-W(*CnsWV4(CC?Vq z(9|J1)vZyel>6oD+a|rA7#E)woUjML7>?OGAZN{p$rft)&?YlL8F1DO1vpTy2FBTh zUsYram|jYiJutADCb@VDsB!LX*<~;Ykps9SBcI1DIa6s%#T*pR{0b)g7yY z5RPWBWm=kETR`h9u=rNrs+3+86v?CXqMQI@DM=)>$4Ui?&g@E~@5H>9zn1_OwG<%b zgb845kAz=ANP+Un4A+`?a2y0#`i}7|y$anB`&o6VGPI0G8DKkkkxq&7b^gg@*FVoX z`4-_JoO%Huehr3kHoFZ^*_ui9%opHRgpI!;-q`TmvK>3X^pf9U%y-X!$2NwtaU(DK zkqXMPK8?1O&p=&2{DHZd2<4E-D)eLQJk?;hB87^3H$cjt!24VJgIx=x34k_#3$_<< zZ3b7a%RRL;ILtG%6;HmddJ9l*xt!xXMkvf{+OE6$yypCC;*Ket)m~?qXEu}7_KqL_ z>uK1Bd8F@>T=D>#Pm)k-5zY$ZHojCt~*4TJeJa4zVfCK#8d0>`gBr5$S(J zYze{!&i7v>f?V=HAvOe%flY*2)C7k4w-9?rb*b(O2($TrKy11(fb!=&F9RQ}e8hXv-M2NX~TWZUzlf-qjGybfo2Hw>fTG?H_cSmT?vo5a`%TNIjz3 z&13}xAG0zSjRU>3uXuio*m*$_=4qbu_m8{t?4OYGlIJ0sgffoU`gr!%mk??2T?wY( zT4@+X5cR1aH2V$1KAl0!put4zHD{4#Klaa| ztbAsNzZ~xxz0p5d);g{jyYbzWa;$%J8sM=TV`GyYpMfNP&GVEBPyS2jUFfRoG9$`r zswC)UG?*Mj$giJ5>-441-2<90xA?U*)_8i?T=pmh?9vtNg5-rym;tY!Ja^6W0js3y z$p_@~b&5J-vV<}X%%ok)i3M5lkHni>^Al!8O7q1-#S`jl-FG_yWNWx9D%QPrQC-~9 zJzFY@Av2IED%0xT#l$vl6RuRYr4K zv7DONaND?z@e*bgHm{`~Daz;u_q*rW@hIX(P|bApU<>eRgLINx6I*Or3NpM$QW2C)0?oDiFN<1b@r)AvT*MrUE#YpO9?byoF99>Qz9ytpz*@SeV zR4}K>h7v(S9!vyf+wJY~5@-lO^D{ZxlCSjshIQxp0MhS zDJCH8K0>Kg#C1R>`gW)DWuMo4j;J!!3j(?@nmAG!ccj3DzcDcIU(vfxZZNB_b#)~}Z~ zSQV9b>d;oX7Ur7RZ4sY?g}7-O1H@)A=un zHQN>Bt*;UUIeP8?omdx~sBwD9G6%$Z0k9rU=mjobjBKod2|}d0pI&wm97pu$ne?WT z=q)8w(R-#Fsiqphyie3Pzf=ivOaE;fVY}$#r9W~&-RQ*>XNk#_*Y+2-UtL0lrsdQg zxv>OnUVnwF2?qfeo(aF>5B&9)v|5eK_>0;K4kPuW&0QgT)Df`aOn6W4hZ z^lq@|zq?bXXXQh4A5_t{vgl)2++kbX6Twn_74kD!R zFjQ1@7q__Y6L4tGt!}7pDVBGJ$&s3JCwTGrHDN~<328p``dY{+Zt=5EI8Mzfr06hD zSdn`-l%4ltqRZ?5+tC&<}qAPjola&mlovf zIi6n-wEY5uby~NLTCL9nyG4>zP}i4zO1^`e2g=;Jxt*ZCQd!*H$J~~wgIq+wK2$C4 zPWlkwdP)iAh^IGr8x;knkpGD5^(!6QUd3dB$PV0`{qKih>D@Tx(v6hlCOJJc^*Zy; zKJ&hH7W(NnAk2Tm}L-zoaFPL6m zxVPA6t;-?Zjw3rO>UihB&8t%+t(`mM2OMueZZNpFwAiyP0g`N5`~Dop)((&{ z1X&XSJ6VXVDd6`v$Qp%5kTsfug4JGDO-`{i4C=w_OV!UjsDI1y53cy+_M;zuiETvg zR#QpySF9n|zq(XSu@RCx{^C+KB}YG7NM$qs>QZ&$;4bU^7rVe=%u3Hre)xIJ7ItQ4>`o>Yy#xYej>?T%s;nr#bDB{-m! Y6R^R~36!E~cIUJaUcaq(7?|+?0aB^9X#fBK diff --git a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridrender_null_0.azshadervariant b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridrender_null_0.azshadervariant index d195b08c349f26e3e47b822c29d8eec1317b211b..a1db8345e447583ab7ffcee115776b0ea9a1d948 100644 GIT binary patch delta 15 WcmX@ha+YO-8xwn8lX*4+0|NjmMg%kf delta 15 WcmX@ha+YO-8xybJL{%)73RebDPz$RjD>>HyvfTcANb-u@>gWUNpLu3A65VO<@wf|mvgqaS^DV@OX~W22pS)%lY3N?A&&7IjEQT3Gp9!t>1z zr5aRF9i2X&9zF4JdM3Mgx|my7nlGkvg_-Pft}t7E&6@L<0;*a0#W^DVcrJVHXmK_@ zC+16;T>in#Qnr}O`p@=kl;7y^*&+Tc zBP%GsE^S+}nJuDwJI-6t@=C|Yb-@ol`})Ichn{;xQWn+EM(*|vf2yxX?&u>otIgIOeZ;43RT%!Qz&xlNM zqWizaiO+v2PVA&Ey3K{%%CA^kpY$h4jl#LdG?xPsZQe@miqEAvqzLW^?V5 zo{(zL>w%uGfNB)|R_SZf7rHwgDr!2jxL7%Ph56!KCND^42&xvn)}63g^`nVSt4;e7 z$!K`Xxq_-)A4oXm#l)ChY7mp#rBj;Y5*Tui^mtWnk|%m@5A?|BX~+a*>XFfV_ANDf zWc1bb231?tKpyUd$mRm=HTrgacISMFU8HeHX&h!4%fblLV=M(@W{+`-VRE`Q7+HZ) zK-iIR8jNPJl6#se6Z$s{xp+JyFOZQM#wj%YurvL6LH8Fc{r)?k!1>=%P^(qO+DjJkpSZZJw3_QyZ0B==?oQpjE~T=f|G4MwhEL4$ED zVNC|3%wcT?+g4>A2BTn;O7=fuK)ypb#|^f<%61rxYZJTO2BX?x-Y3z!4q@IWv3m8n zb|=Mm+%KQOU^#H-Y1@v{yC-X5s^mp<=sEZKOLp^S685RSOuB6sS%ndQy(;B-i^|rA+sta zKtpCdQcXi<&qy=PlO@IFn*#&B5HBz4LbZQ2f4S!EM0U}ec?@K2@Wa{#U^!9RKf5fRTT-x`TNPh#~ CKtzoI delta 2109 zcmZXVU1(fI6oBX6yLbP(-R#Ds`0QO|dGZ=I|IXYQQuoHKLo z%$a+C+OXccY2BQ&qPLHZzW>GEcc0a#thwTzgkx7DN?A&&q&g-&Ev;;b_m$NSxvq*S zSHCh|)px^htzVD0Rz|;*c*%Qc_m{T!Sn8HjD5`Jp$oO@C{ITCpxmc4WW_#1cda*?R ztv|l)kEg;Je;XrgqZQHj!sF5pMQYOD9jDKi3%*BGuSF__uxzFyHkOmk&rp>uw*y?A-4({5f8F0;DU6!bdu+t~xE#><7)51~)b7Tw~=`$*n2BQ%hFy`pRhVC=2 zRNxb=IjdB62OJE<(G28$S@5bzFd1wx4ray$$!{8Qu!yX`BU7Lm$OUIXP9j(kHnIoB4E8{ujTnsL#4l?w zzT>blgYD_FvR(KuLoO?h)8aU<92NFvYUkV{{{wcnCNge_{14>wTdHUDzWRwA9{d@O z$W!9|vd_tfFQ%{8t9xgK(AfRF*x5+Dj{>Ek Date: Tue, 30 Nov 2021 10:39:07 +0100 Subject: [PATCH 34/58] Camera locking when its transform is locked (#5996) * Locking the camera when its entity transform is locked Signed-off-by: AMZN-Igarri <82394219+AMZN-Igarri@users.noreply.github.com> * Added function to unposses camera when transform locks Signed-off-by: AMZN-Igarri <82394219+AMZN-Igarri@users.noreply.github.com> * Basic camera behaviour Signed-off-by: AMZN-Igarri <82394219+AMZN-Igarri@users.noreply.github.com> * Addressed codereview suggestions Signed-off-by: AMZN-Igarri <82394219+AMZN-Igarri@users.noreply.github.com> --- Gems/Camera/Code/Source/CameraComponentController.cpp | 10 ++++++++-- Gems/Camera/Code/Source/CameraComponentController.h | 4 ++++ Gems/Camera/Code/Source/EditorCameraComponent.cpp | 11 +++++++++++ 3 files changed, 23 insertions(+), 2 deletions(-) diff --git a/Gems/Camera/Code/Source/CameraComponentController.cpp b/Gems/Camera/Code/Source/CameraComponentController.cpp index b8e5738145..5b2e26b897 100644 --- a/Gems/Camera/Code/Source/CameraComponentController.cpp +++ b/Gems/Camera/Code/Source/CameraComponentController.cpp @@ -151,7 +151,12 @@ namespace Camera void CameraComponentController::SetShouldActivateFunction(AZStd::function shouldActivateFunction) { - m_shouldActivateFn = shouldActivateFunction; + m_shouldActivateFn = AZStd::move(shouldActivateFunction); + } + + void CameraComponentController::SetIsLockedFunction(AZStd::function isLockedFunction) + { + m_isLockedFn = AZStd::move(isLockedFunction); } void CameraComponentController::Reflect(AZ::ReflectContext* context) @@ -195,10 +200,11 @@ namespace Camera { m_onViewMatrixChanged = AZ::Event::Handler([this](const AZ::Matrix4x4&) { - if (!m_updatingTransformFromEntity) + if (!m_updatingTransformFromEntity && !m_isLockedFn()) { AZ::TransformBus::Event(m_entityId, &AZ::TransformInterface::SetWorldTM, m_atomCamera->GetCameraTransform()); } + }); } diff --git a/Gems/Camera/Code/Source/CameraComponentController.h b/Gems/Camera/Code/Source/CameraComponentController.h index 5eca6b1711..09af7529dc 100644 --- a/Gems/Camera/Code/Source/CameraComponentController.h +++ b/Gems/Camera/Code/Source/CameraComponentController.h @@ -70,6 +70,9 @@ namespace Camera //! Used by the Editor to disable undesirable camera changes in edit mode. void SetShouldActivateFunction(AZStd::function shouldActivateFunction); + //! Defines a callback for determining whether this camera is currently locked by its transform. + void SetIsLockedFunction(AZStd::function isLockedFunction); + // Controller interface static void Reflect(AZ::ReflectContext* context); static void GetRequiredServices(AZ::ComponentDescriptor::DependencyArrayType& required); @@ -136,5 +139,6 @@ namespace Camera bool m_isActiveView = false; AZStd::function m_shouldActivateFn; + AZStd::function m_isLockedFn = []{ return false; }; }; } // namespace Camera diff --git a/Gems/Camera/Code/Source/EditorCameraComponent.cpp b/Gems/Camera/Code/Source/EditorCameraComponent.cpp index cf32fdedff..4f97f27eba 100644 --- a/Gems/Camera/Code/Source/EditorCameraComponent.cpp +++ b/Gems/Camera/Code/Source/EditorCameraComponent.cpp @@ -18,6 +18,7 @@ #include #include +#include namespace Camera { @@ -41,6 +42,16 @@ namespace Camera return isInGameMode; }); + // Only allow our camera to move when the transform is not locked. + m_controller.SetIsLockedFunction([this]() + { + bool locked = false; + AzToolsFramework::Components::TransformComponentMessages::Bus::EventResult( + locked, GetEntityId(), &AzToolsFramework::Components::TransformComponentMessages::IsTransformLocked); + + return locked; + }); + // Call base class activate, which in turn calls Activate on our controller. EditorCameraComponentBase::Activate(); From abf3e69b970d5c0d0f68a572e2b73d6d4cb6afbe Mon Sep 17 00:00:00 2001 From: Benjamin Jillich <43751992+amzn-jillich@users.noreply.github.com> Date: Tue, 30 Nov 2021 11:25:05 +0100 Subject: [PATCH 35/58] EMotion FX: Saving Anim Graph with CTRL+S displays unsaved changes prompt when no changes were made (#5936) Saving an anim graph did not adjust the dirty flag and thus the saved changes dialog kept showing anim graphs that already saved the latest changes. Signed-off-by: Benjamin Jillich --- .../Tools/EMotionStudio/EMStudioSDK/Source/Commands.cpp | 5 +++++ Gems/EMotionFX/Code/Tests/UI/CanUseFileMenu.cpp | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/Commands.cpp b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/Commands.cpp index b46fa645d1..e2e2224c67 100644 --- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/Commands.cpp +++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/Commands.cpp @@ -581,6 +581,11 @@ namespace EMStudio animGraph->SetFileName(filename.c_str()); } + if (parameters.GetValueAsBool("updateDirtyFlag", this)) + { + animGraph->SetDirtyFlag(false); + } + GetMainWindow()->GetFileManager()->SourceAssetChanged(filename); // Add file in case it did not exist before (when saving it the first time). diff --git a/Gems/EMotionFX/Code/Tests/UI/CanUseFileMenu.cpp b/Gems/EMotionFX/Code/Tests/UI/CanUseFileMenu.cpp index 2af3329203..f61c4992a6 100644 --- a/Gems/EMotionFX/Code/Tests/UI/CanUseFileMenu.cpp +++ b/Gems/EMotionFX/Code/Tests/UI/CanUseFileMenu.cpp @@ -330,6 +330,10 @@ namespace EMotionFX const QString animGraphFilename = GenerateTempAnimGraphFilename(); SaveCurrentAnimGraph(animGraphFilename); + // Pretend editing the anim graph + EMotionFX::AnimGraph* animGraph = m_animGraphPlugin->GetActiveAnimGraph(); + animGraph->SetDirtyFlag(true); + // Prepare a watcher to press the ok button when the SaveDirtySettingsWindow appears. ModalPopupHandler saveDirtyPopupHandler; From 21cae1603adabf9baaa8a9a58e4be6eb94f435a6 Mon Sep 17 00:00:00 2001 From: Benjamin Jillich <43751992+amzn-jillich@users.noreply.github.com> Date: Tue, 30 Nov 2021 11:25:25 +0100 Subject: [PATCH 36/58] EMotion FX: Added helper to sample a pose from a motion without an motion instance (#6005) Signed-off-by: Benjamin Jillich --- .../Code/EMotionFX/Source/Motion.cpp | 13 ++++++--- Gems/EMotionFX/Code/EMotionFX/Source/Motion.h | 9 ++++--- .../EMotionFX/Source/MotionData/MotionData.h | 25 +++++------------ .../MotionData/MotionDataSampleSettings.h | 27 +++++++++++++++++++ .../MotionData/NonUniformMotionData.cpp | 4 +-- .../Source/MotionData/NonUniformMotionData.h | 4 +-- .../Source/MotionData/UniformMotionData.cpp | 4 +-- .../Source/MotionData/UniformMotionData.h | 4 +-- .../Code/EMotionFX/emotionfx_files.cmake | 1 + 9 files changed, 57 insertions(+), 34 deletions(-) create mode 100644 Gems/EMotionFX/Code/EMotionFX/Source/MotionData/MotionDataSampleSettings.h diff --git a/Gems/EMotionFX/Code/EMotionFX/Source/Motion.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/Motion.cpp index 9ad55b1c40..caf2acbaa2 100644 --- a/Gems/EMotionFX/Code/EMotionFX/Source/Motion.cpp +++ b/Gems/EMotionFX/Code/EMotionFX/Source/Motion.cpp @@ -6,7 +6,6 @@ * */ -// include the required headers #include "EMotionFXConfig.h" #include "Motion.h" #include @@ -19,9 +18,9 @@ #include "EventHandler.h" #include "MotionEventTable.h" #include -#include #include #include +#include namespace EMotionFX { @@ -286,7 +285,7 @@ namespace EMotionFX { AZ_Assert(m_motionData, "Expecting motion data"); - MotionData::SampleSettings sampleSettings; + MotionDataSampleSettings sampleSettings; sampleSettings.m_actorInstance = instance->GetActorInstance(); sampleSettings.m_inPlace = instance->GetIsInPlace(); sampleSettings.m_mirror = instance->GetMirrorMotion(); @@ -301,7 +300,7 @@ namespace EMotionFX { AZ_Assert(m_motionData, "Expecting motion data"); - MotionData::SampleSettings sampleSettings; + MotionDataSampleSettings sampleSettings; sampleSettings.m_actorInstance = instance->GetActorInstance(); sampleSettings.m_inPlace = instance->GetIsInPlace(); sampleSettings.m_mirror = instance->GetMirrorMotion(); @@ -312,6 +311,12 @@ namespace EMotionFX m_motionData->SamplePose(sampleSettings, outputPose); } + void Motion::SamplePose(Pose* outputPose, const MotionDataSampleSettings& sampleSettings) + { + AZ_Assert(m_motionData, "Expecting motion data"); + m_motionData->SamplePose(sampleSettings, outputPose); + } + const MotionData* Motion::GetMotionData() const { return m_motionData; diff --git a/Gems/EMotionFX/Code/EMotionFX/Source/Motion.h b/Gems/EMotionFX/Code/EMotionFX/Source/Motion.h index e6ec99835b..3873924b7c 100644 --- a/Gems/EMotionFX/Code/EMotionFX/Source/Motion.h +++ b/Gems/EMotionFX/Code/EMotionFX/Source/Motion.h @@ -9,14 +9,13 @@ #pragma once #include +#include +#include #include "EMotionFXConfig.h" #include "EMotionFXManager.h" #include "PlayBackInfo.h" #include "BaseObject.h" - -#include -#include - +#include namespace EMotionFX { @@ -138,6 +137,8 @@ namespace EMotionFX */ void Update(const Pose* inputPose, Pose* outputPose, MotionInstance* instance); + void SamplePose(Pose* outputPose, const MotionDataSampleSettings& sampleSettings); + /** * Specify the actor to use as retargeting source. * This would be the actor from which the motion was originally exported. diff --git a/Gems/EMotionFX/Code/EMotionFX/Source/MotionData/MotionData.h b/Gems/EMotionFX/Code/EMotionFX/Source/MotionData/MotionData.h index fe831f1df0..3950d99de0 100644 --- a/Gems/EMotionFX/Code/EMotionFX/Source/MotionData/MotionData.h +++ b/Gems/EMotionFX/Code/EMotionFX/Source/MotionData/MotionData.h @@ -9,18 +9,17 @@ #pragma once #include -#include -#include -#include -#include - #include #include #include #include #include - #include +#include +#include +#include +#include +#include namespace MCore { @@ -109,16 +108,6 @@ namespace EMotionFX using QuaternionKey = Key; using FloatKey = Key; - struct EMFX_API SampleSettings - { - const ActorInstance* m_actorInstance = nullptr; - const Pose* m_inputPose = nullptr; - float m_sampleTime = 0.0f; - bool m_mirror = false; - bool m_retarget = false; - bool m_inPlace = false; - }; - struct EMFX_API OptimizeSettings { AZStd::vector m_jointIgnoreList; // The joint data indices to skip optimization for. @@ -162,8 +151,8 @@ namespace EMotionFX virtual const char* GetSceneSettingsName() const = 0; // Sampling - virtual Transform SampleJointTransform(const SampleSettings& settings, size_t jointSkeletonIndex) const = 0; - virtual void SamplePose(const SampleSettings& settings, Pose* outputPose) const = 0; + virtual Transform SampleJointTransform(const MotionDataSampleSettings& settings, size_t jointSkeletonIndex) const = 0; + virtual void SamplePose(const MotionDataSampleSettings& settings, Pose* outputPose) const = 0; virtual float SampleMorph(float sampleTime, size_t morphDataIndex) const = 0; virtual float SampleFloat(float sampleTime, size_t morphDataIndex) const = 0; diff --git a/Gems/EMotionFX/Code/EMotionFX/Source/MotionData/MotionDataSampleSettings.h b/Gems/EMotionFX/Code/EMotionFX/Source/MotionData/MotionDataSampleSettings.h new file mode 100644 index 0000000000..ea3f766c56 --- /dev/null +++ b/Gems/EMotionFX/Code/EMotionFX/Source/MotionData/MotionDataSampleSettings.h @@ -0,0 +1,27 @@ +/* + * 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 + +namespace EMotionFX +{ + class ActorInstance; + class Pose; + + struct EMFX_API MotionDataSampleSettings + { + const ActorInstance* m_actorInstance = nullptr; + const Pose* m_inputPose = nullptr; + float m_sampleTime = 0.0f; + bool m_mirror = false; + bool m_retarget = false; + bool m_inPlace = false; + }; +} // namespace EMotionFX diff --git a/Gems/EMotionFX/Code/EMotionFX/Source/MotionData/NonUniformMotionData.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/MotionData/NonUniformMotionData.cpp index 50f3a1f73f..3078978d2c 100644 --- a/Gems/EMotionFX/Code/EMotionFX/Source/MotionData/NonUniformMotionData.cpp +++ b/Gems/EMotionFX/Code/EMotionFX/Source/MotionData/NonUniformMotionData.cpp @@ -74,7 +74,7 @@ namespace EMotionFX return values[indexA].ToQuaternion().NLerp(values[indexB].ToQuaternion(), t); } - Transform NonUniformMotionData::SampleJointTransform(const SampleSettings& settings, size_t jointSkeletonIndex) const + Transform NonUniformMotionData::SampleJointTransform(const MotionDataSampleSettings& settings, size_t jointSkeletonIndex) const { const Actor* actor = settings.m_actorInstance->GetActor(); const MotionLinkData* motionLinkData = FindMotionLinkData(actor); @@ -131,7 +131,7 @@ namespace EMotionFX return result; } - void NonUniformMotionData::SamplePose(const SampleSettings& settings, Pose* outputPose) const + void NonUniformMotionData::SamplePose(const MotionDataSampleSettings& settings, Pose* outputPose) const { AZ_Assert(settings.m_actorInstance, "Expecting a valid actor instance."); const Actor* actor = settings.m_actorInstance->GetActor(); diff --git a/Gems/EMotionFX/Code/EMotionFX/Source/MotionData/NonUniformMotionData.h b/Gems/EMotionFX/Code/EMotionFX/Source/MotionData/NonUniformMotionData.h index b5d8a05c44..16b9842479 100644 --- a/Gems/EMotionFX/Code/EMotionFX/Source/MotionData/NonUniformMotionData.h +++ b/Gems/EMotionFX/Code/EMotionFX/Source/MotionData/NonUniformMotionData.h @@ -55,8 +55,8 @@ namespace EMotionFX AZ::u32 GetStreamSaveVersion() const override; const char* GetSceneSettingsName() const override; - Transform SampleJointTransform(const SampleSettings& settings, size_t jointSkeletonIndex) const override; - void SamplePose(const SampleSettings& settings, Pose* outputPose) const override; + Transform SampleJointTransform(const MotionDataSampleSettings& settings, size_t jointSkeletonIndex) const override; + void SamplePose(const MotionDataSampleSettings& settings, Pose* outputPose) const override; Transform SampleJointTransform(float sampleTime, size_t jointDataIndex) const override; AZ::Vector3 SampleJointPosition(float sampleTime, size_t jointDataIndex) const override; diff --git a/Gems/EMotionFX/Code/EMotionFX/Source/MotionData/UniformMotionData.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/MotionData/UniformMotionData.cpp index 881604c7ff..0f096e7a8b 100644 --- a/Gems/EMotionFX/Code/EMotionFX/Source/MotionData/UniformMotionData.cpp +++ b/Gems/EMotionFX/Code/EMotionFX/Source/MotionData/UniformMotionData.cpp @@ -130,7 +130,7 @@ namespace EMotionFX } } - Transform UniformMotionData::SampleJointTransform(const SampleSettings& settings, size_t jointSkeletonIndex) const + Transform UniformMotionData::SampleJointTransform(const MotionDataSampleSettings& settings, size_t jointSkeletonIndex) const { const Actor* actor = settings.m_actorInstance->GetActor(); const MotionLinkData* motionLinkData = FindMotionLinkData(actor); @@ -195,7 +195,7 @@ namespace EMotionFX return result; } - void UniformMotionData::SamplePose(const SampleSettings& settings, Pose* outputPose) const + void UniformMotionData::SamplePose(const MotionDataSampleSettings& settings, Pose* outputPose) const { AZ_Assert(settings.m_actorInstance, "Expecting a valid actor instance."); const Actor* actor = settings.m_actorInstance->GetActor(); diff --git a/Gems/EMotionFX/Code/EMotionFX/Source/MotionData/UniformMotionData.h b/Gems/EMotionFX/Code/EMotionFX/Source/MotionData/UniformMotionData.h index 40674cf2d1..d51f51ffd9 100644 --- a/Gems/EMotionFX/Code/EMotionFX/Source/MotionData/UniformMotionData.h +++ b/Gems/EMotionFX/Code/EMotionFX/Source/MotionData/UniformMotionData.h @@ -53,8 +53,8 @@ namespace EMotionFX const char* GetSceneSettingsName() const override; // Overloaded. - Transform SampleJointTransform(const SampleSettings& settings, size_t jointSkeletonIndex) const override; - void SamplePose(const SampleSettings& settings, Pose* outputPose) const override; + Transform SampleJointTransform(const MotionDataSampleSettings& settings, size_t jointSkeletonIndex) const override; + void SamplePose(const MotionDataSampleSettings& settings, Pose* outputPose) const override; float SampleMorph(float sampleTime, size_t morphDataIndex) const override; float SampleFloat(float sampleTime, size_t floatDataIndex) const override; Transform SampleJointTransform(float sampleTime, size_t jointDataIndex) const override; diff --git a/Gems/EMotionFX/Code/EMotionFX/emotionfx_files.cmake b/Gems/EMotionFX/Code/EMotionFX/emotionfx_files.cmake index f0443ade44..8135f14f12 100644 --- a/Gems/EMotionFX/Code/EMotionFX/emotionfx_files.cmake +++ b/Gems/EMotionFX/Code/EMotionFX/emotionfx_files.cmake @@ -350,6 +350,7 @@ set(FILES Source/MotionData/MotionData.h Source/MotionData/MotionDataFactory.cpp Source/MotionData/MotionDataFactory.h + Source/MotionData/MotionDataSampleSettings.h Source/MotionData/NonUniformMotionData.cpp Source/MotionData/NonUniformMotionData.h Source/MotionData/UniformMotionData.cpp From 4424b4d51ec71a66be41a74accb743ea3460b4e5 Mon Sep 17 00:00:00 2001 From: amzn-sean <75276488+amzn-sean@users.noreply.github.com> Date: Tue, 30 Nov 2021 10:49:53 +0000 Subject: [PATCH 37/58] Fix Integer Spin Controller not sending PropertyEditorGUIMessages::Bus::Handler::OnEditingFinished (#5942) * IntWidgetHandler::CreateUI now registers and sends editingFinished event * add tests for int spin control valueChanged and editingFinished signals Signed-off-by: amzn-sean <75276488+amzn-sean@users.noreply.github.com> --- .../UI/PropertyEditor/PropertyIntCtrlCommon.h | 4 ++ .../Tests/PropertyIntCtrlCommonTests.cpp | 4 +- .../Tests/PropertyIntCtrlCommonTests.h | 10 +++ .../Tests/PropertyIntSpinCtrlTests.cpp | 67 +++++++++++++++++++ .../Tests/aztoolsframeworktests_files.cmake | 1 + 5 files changed, 85 insertions(+), 1 deletion(-) diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyIntCtrlCommon.h b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyIntCtrlCommon.h index 01675e0044..bb7d03367b 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyIntCtrlCommon.h +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyIntCtrlCommon.h @@ -169,6 +169,10 @@ namespace AzToolsFramework { AzToolsFramework::PropertyEditorGUIMessages::Bus::Broadcast(&PropertyEditorGUIMessages::Bus::Events::RequestWrite, newCtrl); }); + this->connect(newCtrl, &PropertyControl::editingFinished, this, [newCtrl]() + { + AzToolsFramework::PropertyEditorGUIMessages::Bus::Broadcast(&PropertyEditorGUIMessages::Bus::Handler::OnEditingFinished, newCtrl); + }); // note: Qt automatically disconnects objects from each other when either end is destroyed, no need to worry about delete. // Set the value range to that of ValueType as clamped to the range of QtWidgetValueType diff --git a/Code/Framework/AzToolsFramework/Tests/PropertyIntCtrlCommonTests.cpp b/Code/Framework/AzToolsFramework/Tests/PropertyIntCtrlCommonTests.cpp index 67f764d1b3..d95451441f 100644 --- a/Code/Framework/AzToolsFramework/Tests/PropertyIntCtrlCommonTests.cpp +++ b/Code/Framework/AzToolsFramework/Tests/PropertyIntCtrlCommonTests.cpp @@ -6,7 +6,9 @@ * */ -#include "IntegerPrimtitiveTestConfig.h" +#include +#include +#include namespace UnitTest { diff --git a/Code/Framework/AzToolsFramework/Tests/PropertyIntCtrlCommonTests.h b/Code/Framework/AzToolsFramework/Tests/PropertyIntCtrlCommonTests.h index 10aed57ebd..712eeb99b7 100644 --- a/Code/Framework/AzToolsFramework/Tests/PropertyIntCtrlCommonTests.h +++ b/Code/Framework/AzToolsFramework/Tests/PropertyIntCtrlCommonTests.h @@ -156,6 +156,16 @@ namespace UnitTest EXPECT_STREQ(tooltip.toStdString().c_str(), expected.str().c_str()); } + void EmitWidgetValueChanged() + { + emit m_widget->valueChanged(ValueType(0)); + } + + void EmitWidgetEditingFinished() + { + emit m_widget->editingFinished(); + } + AZStd::unique_ptr m_dummyWidget; AZStd::unique_ptr m_handler; WidgetType* m_widget; diff --git a/Code/Framework/AzToolsFramework/Tests/PropertyIntSpinCtrlTests.cpp b/Code/Framework/AzToolsFramework/Tests/PropertyIntSpinCtrlTests.cpp index 01f314bcc2..d7616e6bb8 100644 --- a/Code/Framework/AzToolsFramework/Tests/PropertyIntSpinCtrlTests.cpp +++ b/Code/Framework/AzToolsFramework/Tests/PropertyIntSpinCtrlTests.cpp @@ -47,4 +47,71 @@ namespace UnitTest { this->HandlerMinMaxLessLimit_ModifyHandler_ExpectSuccessAndValidLessLimitToolTipString(); } + + struct PropertyEditorHandler + : public AzToolsFramework::PropertyEditorGUIMessages::Bus::Handler + { + PropertyEditorHandler() + { + AzToolsFramework::PropertyEditorGUIMessages::Bus::Handler::BusConnect(); + } + + ~PropertyEditorHandler() + { + AzToolsFramework::PropertyEditorGUIMessages::Bus::Handler::BusDisconnect(); + } + + // AzToolsFramework::PropertyEditorGUIMessages::Bus overrides ... + void RequestWrite([[maybe_unused]] QWidget* editorGUI) override + { + m_requestWriteCallCount++; + } + + void RequestRefresh([[maybe_unused]] PropertyModificationRefreshLevel level) override + { + } + + void AddElementsToParentContainer( + [[maybe_unused]] QWidget* editorGUI, + [[maybe_unused]] size_t numElements, + [[maybe_unused]] const InstanceDataNode::FillDataClassCallback& fillDataCallback) override + { + } + + void RequestPropertyNotify([[maybe_unused]] QWidget* editorGUI) override + { + } + + void OnEditingFinished([[maybe_unused]]QWidget* editorGUI) override + { + m_onEditingFinishedCallCount++; + } + + int m_requestWriteCallCount = 0; + int m_onEditingFinishedCallCount = 0; + }; + + TYPED_TEST(PropertySpinCtrlFixture, SpinBoxWidgetValueChangedInvokesPropertyEditorGUIMessages) + { + // setup the event handler + PropertyEditorHandler eventHandler; + + // trigger the QT signal + this->EmitWidgetValueChanged(); + + // there should be at least 1 call to RequestWrite. + EXPECT_GT(eventHandler.m_requestWriteCallCount, 0); + } + + TYPED_TEST(PropertySpinCtrlFixture, SpinBoxWidgetEditingFinishedInvokesPropertyEditorGUIMessages) + { + // setup the event handler + PropertyEditorHandler eventHandler; + + // trigger the QT signal + this->EmitWidgetEditingFinished(); + + // there should be at least 1 call to OnEditingFinished. + EXPECT_GT(eventHandler.m_onEditingFinishedCallCount, 0); + } } // namespace UnitTest diff --git a/Code/Framework/AzToolsFramework/Tests/aztoolsframeworktests_files.cmake b/Code/Framework/AzToolsFramework/Tests/aztoolsframeworktests_files.cmake index 99a998abb8..9e052de983 100644 --- a/Code/Framework/AzToolsFramework/Tests/aztoolsframeworktests_files.cmake +++ b/Code/Framework/AzToolsFramework/Tests/aztoolsframeworktests_files.cmake @@ -100,6 +100,7 @@ set(FILES Prefab/SpawnableSortEntitiesTests.cpp Prefab/PrefabScriptingTests.cpp Prefab/ProceduralPrefabAssetTests.cpp + PropertyIntCtrlCommonTests.cpp PropertyIntCtrlCommonTests.h PropertyIntSliderCtrlTests.cpp PropertyIntSpinCtrlTests.cpp From 8ce3dc846c9acc1023f1fa1ae59f044df8621976 Mon Sep 17 00:00:00 2001 From: lsemp3d <58790905+lsemp3d@users.noreply.github.com> Date: Tue, 30 Nov 2021 06:34:41 -0800 Subject: [PATCH 38/58] Missing include Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com> --- .../Code/Editor/GraphCanvas/Components/DynamicSlotComponent.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/DynamicSlotComponent.cpp b/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/DynamicSlotComponent.cpp index bdd0ddf2ac..715489280d 100644 --- a/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/DynamicSlotComponent.cpp +++ b/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/DynamicSlotComponent.cpp @@ -11,6 +11,7 @@ #include +#include #include #include From 066178d7b9ff6fb785bd40c2bdc84af6207e442a Mon Sep 17 00:00:00 2001 From: lsemp3d <58790905+lsemp3d@users.noreply.github.com> Date: Tue, 30 Nov 2021 06:35:44 -0800 Subject: [PATCH 39/58] PR feedback Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com> --- .../Editor/View/Widgets/ScriptCanvasNodePaletteDockWidget.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gems/ScriptCanvas/Code/Editor/View/Widgets/ScriptCanvasNodePaletteDockWidget.cpp b/Gems/ScriptCanvas/Code/Editor/View/Widgets/ScriptCanvasNodePaletteDockWidget.cpp index 0bc54a493b..bf8482f0ca 100644 --- a/Gems/ScriptCanvas/Code/Editor/View/Widgets/ScriptCanvasNodePaletteDockWidget.cpp +++ b/Gems/ScriptCanvas/Code/Editor/View/Widgets/ScriptCanvasNodePaletteDockWidget.cpp @@ -27,8 +27,8 @@ #include #include -#include #include +#include #include #include From 75d6cb2527cc41d631a371fa6dcd686345fcebfc Mon Sep 17 00:00:00 2001 From: AMZN-Igarri <82394219+AMZN-Igarri@users.noreply.github.com> Date: Tue, 30 Nov 2021 15:54:01 +0100 Subject: [PATCH 40/58] Connected filterChanged signal to Update the table Model (#5901) Signed-off-by: AMZN-Igarri <82394219+AMZN-Igarri@users.noreply.github.com> --- .../AzToolsFramework/AssetBrowser/AssetBrowserTableModel.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/AssetBrowserTableModel.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/AssetBrowserTableModel.cpp index 14c5e719b4..775462f63f 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/AssetBrowserTableModel.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/AssetBrowserTableModel.cpp @@ -30,6 +30,7 @@ namespace AzToolsFramework connect(m_filterModel, &QAbstractItemModel::rowsRemoved, this, &AssetBrowserTableModel::UpdateTableModelMaps); connect(m_filterModel, &QAbstractItemModel::layoutChanged, this, &AssetBrowserTableModel::UpdateTableModelMaps); connect(m_filterModel, &AssetBrowserFilterModel::filterChanged, this, &AssetBrowserTableModel::beginResetModel); + connect(m_filterModel, &AssetBrowserFilterModel::filterChanged, this, &AssetBrowserTableModel::UpdateTableModelMaps); connect(m_filterModel, &QAbstractItemModel::dataChanged, this, &AssetBrowserTableModel::SourceDataChanged); } From 6908a3e94555c4e190c9fc0a598e5afefcc32ff4 Mon Sep 17 00:00:00 2001 From: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com> Date: Tue, 30 Nov 2021 15:07:40 +0000 Subject: [PATCH 41/58] Update intersect behavior for positioning entities in the viewport (#5906) * update intersect behavior for positioning entities in the viewport and restore SurfaceManipulator Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com> * tests for surface manipulator from EditorTransformComponentSelection Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com> * update comments in tests and remove #pragma optimize('', off)@ Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com> * add new file for FindClosestPickIntersection tests Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com> * add remaining tests for surface manipulator and snap fixes Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com> * some small updates and polish before PR Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com> * small updates following PR feedback Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com> --- Code/Editor/EditorViewportWidget.cpp | 26 +- Code/Editor/EditorViewportWidget.h | 5 - .../SandboxIntegration.cpp | 2 +- Code/Editor/Viewport.cpp | 20 +- Code/Editor/Viewport.h | 3 - .../ActionDispatcher.h | 22 ++ .../AzManipulatorTestFramework.h | 3 +- .../DirectManipulatorViewportInteraction.h | 4 +- .../ImmediateModeActionDispatcher.h | 8 +- .../ViewportInteraction.h | 5 +- .../Source/ImmediateModeActionDispatcher.cpp | 48 ++-- .../Source/ViewportInteraction.cpp | 6 +- .../Manipulators/EditorVertexSelection.cpp | 24 +- .../Manipulators/EditorVertexSelection.h | 2 +- .../Manipulators/ManipulatorSnapping.cpp | 24 -- .../Manipulators/ManipulatorSnapping.h | 5 - .../Manipulators/SurfaceManipulator.cpp | 104 ++++--- .../Manipulators/SurfaceManipulator.h | 6 + .../Viewport/ViewportMessages.cpp | 42 ++- .../Viewport/ViewportMessages.h | 41 ++- .../ViewportSelection/EditorSelectionUtil.cpp | 14 + .../ViewportSelection/EditorSelectionUtil.h | 3 + .../EditorTransformComponentSelection.cpp | 96 ++++--- .../EditorTransformComponentSelection.h | 2 +- .../Tests/BoundsTestComponent.cpp | 49 ++++ .../Tests/BoundsTestComponent.h | 18 ++ ...EditorTransformComponentSelectionTests.cpp | 174 +++++++++++- .../Tests/EditorVertexSelectionTests.cpp | 253 +++++++++++++++--- .../Viewport/ViewportInteractionTests.cpp | 76 ++++++ .../Tests/aztoolsframeworktests_files.cmake | 1 + .../Viewport/ViewportInteractionImpl.cpp | 5 +- 31 files changed, 811 insertions(+), 280 deletions(-) create mode 100644 Code/Framework/AzToolsFramework/Tests/Viewport/ViewportInteractionTests.cpp diff --git a/Code/Editor/EditorViewportWidget.cpp b/Code/Editor/EditorViewportWidget.cpp index 60e4bf6d47..7323da9e95 100644 --- a/Code/Editor/EditorViewportWidget.cpp +++ b/Code/Editor/EditorViewportWidget.cpp @@ -472,7 +472,7 @@ void EditorViewportWidget::Update() { auto start = std::chrono::steady_clock::now(); - m_entityVisibilityQuery.UpdateVisibility(GetCameraState()); + m_entityVisibilityQuery.UpdateVisibility(m_renderViewport->GetCameraState()); if (ed_visibility_logTiming) { @@ -714,7 +714,7 @@ void EditorViewportWidget::RenderAll() m_debugDisplay->DepthTestOff(); m_manipulatorManager->DrawManipulators( - *m_debugDisplay, GetCameraState(), + *m_debugDisplay, m_renderViewport->GetCameraState(), BuildMouseInteractionInternal( AztfVi::MouseButtons(AztfVi::TranslateMouseButtons(QGuiApplication::mouseButtons())), keyboardModifiers, BuildMousePick(WidgetToViewport(mapFromGlobal(QCursor::pos()))))); @@ -878,31 +878,11 @@ void EditorViewportWidget::OnMenuSelectCurrentCamera() } } -AzFramework::CameraState EditorViewportWidget::GetCameraState() -{ - return m_renderViewport->GetCameraState(); -} - -AZ::Vector3 EditorViewportWidget::PickTerrain(const AzFramework::ScreenPoint& point) -{ - return LYVec3ToAZVec3(ViewToWorld(AzToolsFramework::ViewportInteraction::QPointFromScreenPoint(point), nullptr, true)); -} - -float EditorViewportWidget::TerrainHeight(const AZ::Vector2& position) -{ - return GetIEditor()->GetTerrainElevation(position.GetX(), position.GetY()); -} - void EditorViewportWidget::FindVisibleEntities(AZStd::vector& visibleEntitiesOut) { visibleEntitiesOut.assign(m_entityVisibilityQuery.Begin(), m_entityVisibilityQuery.End()); } -AzFramework::ScreenPoint EditorViewportWidget::ViewportWorldToScreen(const AZ::Vector3& worldPosition) -{ - return m_renderViewport->ViewportWorldToScreen(worldPosition); -} - QWidget* EditorViewportWidget::GetWidgetForViewportContextMenu() { return this; @@ -2132,7 +2112,7 @@ bool EditorViewportWidget::GetActiveCameraState(AzFramework::CameraState& camera { if (m_pPrimaryViewport == this) { - cameraState = GetCameraState(); + cameraState = m_renderViewport->GetCameraState(); return true; } diff --git a/Code/Editor/EditorViewportWidget.h b/Code/Editor/EditorViewportWidget.h index 0101f2ffef..3d52b2416d 100644 --- a/Code/Editor/EditorViewportWidget.h +++ b/Code/Editor/EditorViewportWidget.h @@ -205,8 +205,6 @@ private: void* GetSystemCursorConstraintWindow() const override; // AzToolsFramework::MainEditorViewportInteractionRequestBus overrides ... - AZ::Vector3 PickTerrain(const AzFramework::ScreenPoint& point) override; - float TerrainHeight(const AZ::Vector2& position) override; bool ShowingWorldSpace() override; QWidget* GetWidgetForViewportContextMenu() override; @@ -293,9 +291,6 @@ private: // This switches the active camera to the next one in the list of (default, all custom cams). void CycleCamera(); - AzFramework::CameraState GetCameraState(); - AzFramework::ScreenPoint ViewportWorldToScreen(const AZ::Vector3& worldPosition); - QPoint WidgetToViewport(const QPoint& point) const; QPoint ViewportToWidget(const QPoint& point) const; QSize WidgetToViewport(const QSize& size) const; diff --git a/Code/Editor/Plugins/ComponentEntityEditorPlugin/SandboxIntegration.cpp b/Code/Editor/Plugins/ComponentEntityEditorPlugin/SandboxIntegration.cpp index 5a1b4dc503..9342c17a37 100644 --- a/Code/Editor/Plugins/ComponentEntityEditorPlugin/SandboxIntegration.cpp +++ b/Code/Editor/Plugins/ComponentEntityEditorPlugin/SandboxIntegration.cpp @@ -1396,7 +1396,7 @@ void SandboxIntegrationManager::ContextMenu_NewEntity() { worldPosition = AzToolsFramework::FindClosestPickIntersection( view->GetViewportId(), AzFramework::ScreenPointFromVector2(m_contextMenuViewPoint), AzToolsFramework::EditorPickRayLength, - GetDefaultEntityPlacementDistance()); + AzToolsFramework::GetDefaultEntityPlacementDistance()); } CreateNewEntityAtPosition(worldPosition); diff --git a/Code/Editor/Viewport.cpp b/Code/Editor/Viewport.cpp index 613dc0c4e7..437dcead3b 100644 --- a/Code/Editor/Viewport.cpp +++ b/Code/Editor/Viewport.cpp @@ -14,14 +14,11 @@ // Qt #include -// AzCore -#include - // AzQtComponents #include +// AzToolsFramework #include -#include #include #include @@ -41,19 +38,6 @@ #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 ////////////////////////////////////////////////////////////////////// @@ -63,7 +47,7 @@ void QtViewport::BuildDragDropContext( { context.m_hitLocation = AzToolsFramework::FindClosestPickIntersection( viewportId, AzToolsFramework::ViewportInteraction::ScreenPointFromQPoint(point), AzToolsFramework::EditorPickRayLength, - GetDefaultEntityPlacementDistance()); + AzToolsFramework::GetDefaultEntityPlacementDistance()); } void QtViewport::dragEnterEvent(QDragEnterEvent* event) diff --git a/Code/Editor/Viewport.h b/Code/Editor/Viewport.h index b8c55c7431..a71df6a9cd 100644 --- a/Code/Editor/Viewport.h +++ b/Code/Editor/Viewport.h @@ -87,9 +87,6 @@ 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 diff --git a/Code/Framework/AzManipulatorTestFramework/Include/AzManipulatorTestFramework/ActionDispatcher.h b/Code/Framework/AzManipulatorTestFramework/Include/AzManipulatorTestFramework/ActionDispatcher.h index 06db67a05f..99f11c37da 100644 --- a/Code/Framework/AzManipulatorTestFramework/Include/AzManipulatorTestFramework/ActionDispatcher.h +++ b/Code/Framework/AzManipulatorTestFramework/Include/AzManipulatorTestFramework/ActionDispatcher.h @@ -39,6 +39,10 @@ namespace AzManipulatorTestFramework DerivedDispatcherT* MouseLButtonDown(); //! Set the left mouse button up. DerivedDispatcherT* MouseLButtonUp(); + //! Set the middle mouse button down. + DerivedDispatcherT* MouseMButtonDown(); + //! Set the middle mouse button up. + DerivedDispatcherT* MouseMButtonUp(); //! Send a double click event. DerivedDispatcherT* MouseLButtonDoubleClick(); //! Set the keyboard modifier button down. @@ -73,6 +77,8 @@ namespace AzManipulatorTestFramework virtual void CameraStateImpl(const AzFramework::CameraState& cameraState) = 0; virtual void MouseLButtonDownImpl() = 0; virtual void MouseLButtonUpImpl() = 0; + virtual void MouseMButtonDownImpl() = 0; + virtual void MouseMButtonUpImpl() = 0; virtual void MouseLButtonDoubleClickImpl() = 0; virtual void MousePositionImpl(const AzFramework::ScreenPoint& position) = 0; virtual void KeyboardModifierDownImpl(const AzToolsFramework::ViewportInteraction::KeyboardModifier& keyModifier) = 0; @@ -183,6 +189,22 @@ namespace AzManipulatorTestFramework return static_cast(this); } + template + DerivedDispatcherT* ActionDispatcher::MouseMButtonDown() + { + Log("Mouse middle button down"); + MouseMButtonDownImpl(); + return static_cast(this); + } + + template + DerivedDispatcherT* ActionDispatcher::MouseMButtonUp() + { + Log("Mouse middle button up"); + MouseMButtonUpImpl(); + return static_cast(this); + } + template DerivedDispatcherT* ActionDispatcher::MouseLButtonDoubleClick() { diff --git a/Code/Framework/AzManipulatorTestFramework/Include/AzManipulatorTestFramework/AzManipulatorTestFramework.h b/Code/Framework/AzManipulatorTestFramework/Include/AzManipulatorTestFramework/AzManipulatorTestFramework.h index 5f0179d6ad..66227c692b 100644 --- a/Code/Framework/AzManipulatorTestFramework/Include/AzManipulatorTestFramework/AzManipulatorTestFramework.h +++ b/Code/Framework/AzManipulatorTestFramework/Include/AzManipulatorTestFramework/AzManipulatorTestFramework.h @@ -8,6 +8,7 @@ #pragma once +#include #include #include #include @@ -40,7 +41,7 @@ namespace AzManipulatorTestFramework //! Set the angular step. virtual void SetAngularStep(float step) = 0; //! Get the viewport id. - virtual int GetViewportId() const = 0; + virtual AzFramework::ViewportId GetViewportId() const = 0; //! Updates the visibility state. //! Updates which entities are currently visible given the current camera state. virtual void UpdateVisibility() = 0; diff --git a/Code/Framework/AzManipulatorTestFramework/Include/AzManipulatorTestFramework/DirectManipulatorViewportInteraction.h b/Code/Framework/AzManipulatorTestFramework/Include/AzManipulatorTestFramework/DirectManipulatorViewportInteraction.h index 3421116b96..7cef7b635d 100644 --- a/Code/Framework/AzManipulatorTestFramework/Include/AzManipulatorTestFramework/DirectManipulatorViewportInteraction.h +++ b/Code/Framework/AzManipulatorTestFramework/Include/AzManipulatorTestFramework/DirectManipulatorViewportInteraction.h @@ -30,7 +30,7 @@ namespace AzManipulatorTestFramework private: AZStd::shared_ptr m_customManager; - std::unique_ptr m_viewportInteraction; - std::unique_ptr m_manipulatorManager; + AZStd::unique_ptr m_viewportInteraction; + AZStd::unique_ptr m_manipulatorManager; }; } // namespace AzManipulatorTestFramework diff --git a/Code/Framework/AzManipulatorTestFramework/Include/AzManipulatorTestFramework/ImmediateModeActionDispatcher.h b/Code/Framework/AzManipulatorTestFramework/Include/AzManipulatorTestFramework/ImmediateModeActionDispatcher.h index 5d1f606e8c..8a05a15fd9 100644 --- a/Code/Framework/AzManipulatorTestFramework/Include/AzManipulatorTestFramework/ImmediateModeActionDispatcher.h +++ b/Code/Framework/AzManipulatorTestFramework/Include/AzManipulatorTestFramework/ImmediateModeActionDispatcher.h @@ -25,7 +25,7 @@ namespace AzManipulatorTestFramework using MouseInteractionEvent = AzToolsFramework::ViewportInteraction::MouseInteractionEvent; public: - explicit ImmediateModeActionDispatcher(ManipulatorViewportInteraction& viewportManipulatorInteraction); + explicit ImmediateModeActionDispatcher(ManipulatorViewportInteraction& manipulatorViewportInteraction); ~ImmediateModeActionDispatcher(); //! Clear the current event state. @@ -55,13 +55,15 @@ namespace AzManipulatorTestFramework AZStd::chrono::milliseconds EditorViewportInputTimeNow() override; protected: - // ActionDispatcher ... + // ActionDispatcher overrides ... void SetSnapToGridImpl(bool enabled) override; void SetStickySelectImpl(bool enabled) override; void GridSizeImpl(float size) override; void CameraStateImpl(const AzFramework::CameraState& cameraState) override; void MouseLButtonDownImpl() override; void MouseLButtonUpImpl() override; + void MouseMButtonDownImpl() override; + void MouseMButtonUpImpl() override; void MouseLButtonDoubleClickImpl() override; void MousePositionImpl(const AzFramework::ScreenPoint& position) override; void KeyboardModifierDownImpl(const KeyboardModifier& keyModifier) override; @@ -82,7 +84,7 @@ namespace AzManipulatorTestFramework const MouseInteractionEvent* GetMouseInteractionEvent() const; mutable AZStd::unique_ptr m_event; - ManipulatorViewportInteraction& m_viewportManipulatorInteraction; + ManipulatorViewportInteraction& m_manipulatorViewportInteraction; //! Current time that ticks up after each call to EditorViewportInputTimeNow. AZStd::chrono::milliseconds m_timeNow = AZStd::chrono::milliseconds(0); diff --git a/Code/Framework/AzManipulatorTestFramework/Include/AzManipulatorTestFramework/ViewportInteraction.h b/Code/Framework/AzManipulatorTestFramework/Include/AzManipulatorTestFramework/ViewportInteraction.h index 3c41b28851..a353140d4c 100644 --- a/Code/Framework/AzManipulatorTestFramework/Include/AzManipulatorTestFramework/ViewportInteraction.h +++ b/Code/Framework/AzManipulatorTestFramework/Include/AzManipulatorTestFramework/ViewportInteraction.h @@ -33,7 +33,7 @@ namespace AzManipulatorTestFramework void SetAngularSnapping(bool enabled) override; void SetGridSize(float size) override; void SetAngularStep(float step) override; - int GetViewportId() const override; + AzFramework::ViewportId GetViewportId() const override; void UpdateVisibility() override; void SetStickySelect(bool enabled) override; AZ::Vector3 DefaultEditorCameraPosition() const override; @@ -60,9 +60,10 @@ namespace AzManipulatorTestFramework void FindVisibleEntities(AZStd::vector& visibleEntities) override; private: + static constexpr AzFramework::ViewportId m_viewportId = 1234; //!< Arbitrary viewport id for manipulator tests. + AzFramework::EntityVisibilityQuery m_entityVisibilityQuery; AZStd::unique_ptr m_nullDebugDisplayRequests; - const int m_viewportId = 1234; // Arbitrary viewport id for manipulator tests AzFramework::CameraState m_cameraState; bool m_gridSnapping = false; bool m_angularSnapping = false; diff --git a/Code/Framework/AzManipulatorTestFramework/Source/ImmediateModeActionDispatcher.cpp b/Code/Framework/AzManipulatorTestFramework/Source/ImmediateModeActionDispatcher.cpp index 5bfe63bd99..aea93ca342 100644 --- a/Code/Framework/AzManipulatorTestFramework/Source/ImmediateModeActionDispatcher.cpp +++ b/Code/Framework/AzManipulatorTestFramework/Source/ImmediateModeActionDispatcher.cpp @@ -29,8 +29,8 @@ namespace AzManipulatorTestFramework using KeyboardModifier = AzToolsFramework::ViewportInteraction::KeyboardModifier; using MouseInteractionEvent = AzToolsFramework::ViewportInteraction::MouseInteractionEvent; - ImmediateModeActionDispatcher::ImmediateModeActionDispatcher(ManipulatorViewportInteraction& viewportManipulatorInteraction) - : m_viewportManipulatorInteraction(viewportManipulatorInteraction) + ImmediateModeActionDispatcher::ImmediateModeActionDispatcher(ManipulatorViewportInteraction& manipulatorViewportInteraction) + : m_manipulatorViewportInteraction(manipulatorViewportInteraction) { AzToolsFramework::ViewportInteraction::EditorModifierKeyRequestBus::Handler::BusConnect(); AzToolsFramework::ViewportInteraction::EditorViewportInputTimeNowRequestBus::Handler::BusConnect(); @@ -48,34 +48,34 @@ namespace AzManipulatorTestFramework // mouse down and mouse up event, to match the editor behavior we insert this event // to ensure the tests are simulating the same environment as the editor GetMouseInteractionEvent()->m_mouseEvent = AzToolsFramework::ViewportInteraction::MouseEvent::Move; - m_viewportManipulatorInteraction.GetManipulatorManager().ConsumeMouseInteractionEvent(*m_event); + m_manipulatorViewportInteraction.GetManipulatorManager().ConsumeMouseInteractionEvent(*m_event); } void ImmediateModeActionDispatcher::SetSnapToGridImpl(const bool enabled) { - m_viewportManipulatorInteraction.GetViewportInteraction().SetGridSnapping(enabled); + m_manipulatorViewportInteraction.GetViewportInteraction().SetGridSnapping(enabled); } void ImmediateModeActionDispatcher::SetStickySelectImpl(const bool enabled) { - m_viewportManipulatorInteraction.GetViewportInteraction().SetStickySelect(enabled); + m_manipulatorViewportInteraction.GetViewportInteraction().SetStickySelect(enabled); } void ImmediateModeActionDispatcher::GridSizeImpl(const float size) { - m_viewportManipulatorInteraction.GetViewportInteraction().SetGridSize(size); + m_manipulatorViewportInteraction.GetViewportInteraction().SetGridSize(size); } void ImmediateModeActionDispatcher::CameraStateImpl(const AzFramework::CameraState& cameraState) { - m_viewportManipulatorInteraction.GetViewportInteraction().SetCameraState(cameraState); + m_manipulatorViewportInteraction.GetViewportInteraction().SetCameraState(cameraState); } void ImmediateModeActionDispatcher::MouseLButtonDownImpl() { ToggleOn(GetMouseInteractionEvent()->m_mouseInteraction.m_mouseButtons.m_mouseButtons, MouseButton::Left); GetMouseInteractionEvent()->m_mouseEvent = AzToolsFramework::ViewportInteraction::MouseEvent::Down; - m_viewportManipulatorInteraction.GetManipulatorManager().ConsumeMouseInteractionEvent(*m_event); + m_manipulatorViewportInteraction.GetManipulatorManager().ConsumeMouseInteractionEvent(*m_event); // the mouse position will be the same as the previous event, thus the delta will be 0 MouseMoveAfterButton(); } @@ -83,17 +83,35 @@ namespace AzManipulatorTestFramework void ImmediateModeActionDispatcher::MouseLButtonUpImpl() { GetMouseInteractionEvent()->m_mouseEvent = AzToolsFramework::ViewportInteraction::MouseEvent::Up; - m_viewportManipulatorInteraction.GetManipulatorManager().ConsumeMouseInteractionEvent(*m_event); + m_manipulatorViewportInteraction.GetManipulatorManager().ConsumeMouseInteractionEvent(*m_event); ToggleOff(GetMouseInteractionEvent()->m_mouseInteraction.m_mouseButtons.m_mouseButtons, MouseButton::Left); // the mouse position will be the same as the previous event, thus the delta will be 0 MouseMoveAfterButton(); } + void ImmediateModeActionDispatcher::MouseMButtonDownImpl() + { + ToggleOn(GetMouseInteractionEvent()->m_mouseInteraction.m_mouseButtons.m_mouseButtons, MouseButton::Middle); + GetMouseInteractionEvent()->m_mouseEvent = AzToolsFramework::ViewportInteraction::MouseEvent::Down; + m_manipulatorViewportInteraction.GetManipulatorManager().ConsumeMouseInteractionEvent(*m_event); + // the mouse position will be the same as the previous event, thus the delta will be 0 + MouseMoveAfterButton(); + } + + void ImmediateModeActionDispatcher::MouseMButtonUpImpl() + { + GetMouseInteractionEvent()->m_mouseEvent = AzToolsFramework::ViewportInteraction::MouseEvent::Up; + m_manipulatorViewportInteraction.GetManipulatorManager().ConsumeMouseInteractionEvent(*m_event); + ToggleOff(GetMouseInteractionEvent()->m_mouseInteraction.m_mouseButtons.m_mouseButtons, MouseButton::Middle); + // the mouse position will be the same as the previous event, thus the delta will be 0 + MouseMoveAfterButton(); + } + void ImmediateModeActionDispatcher::MouseLButtonDoubleClickImpl() { GetMouseInteractionEvent()->m_mouseEvent = AzToolsFramework::ViewportInteraction::MouseEvent::DoubleClick; ToggleOn(GetMouseInteractionEvent()->m_mouseInteraction.m_mouseButtons.m_mouseButtons, MouseButton::Left); - m_viewportManipulatorInteraction.GetManipulatorManager().ConsumeMouseInteractionEvent(*m_event); + m_manipulatorViewportInteraction.GetManipulatorManager().ConsumeMouseInteractionEvent(*m_event); ToggleOff(GetMouseInteractionEvent()->m_mouseInteraction.m_mouseButtons.m_mouseButtons, MouseButton::Left); // the mouse position will be the same as the previous event, thus the delta will be 0 MouseMoveAfterButton(); @@ -101,10 +119,10 @@ namespace AzManipulatorTestFramework void ImmediateModeActionDispatcher::MousePositionImpl(const AzFramework::ScreenPoint& position) { - const auto cameraState = m_viewportManipulatorInteraction.GetViewportInteraction().GetCameraState(); + const auto cameraState = m_manipulatorViewportInteraction.GetViewportInteraction().GetCameraState(); GetMouseInteractionEvent()->m_mouseInteraction.m_mousePick = BuildMousePick(position, cameraState); GetMouseInteractionEvent()->m_mouseEvent = AzToolsFramework::ViewportInteraction::MouseEvent::Move; - m_viewportManipulatorInteraction.GetManipulatorManager().ConsumeMouseInteractionEvent(*m_event); + m_manipulatorViewportInteraction.GetManipulatorManager().ConsumeMouseInteractionEvent(*m_event); } void ImmediateModeActionDispatcher::KeyboardModifierDownImpl(const KeyboardModifier& keyModifier) @@ -144,7 +162,7 @@ namespace AzManipulatorTestFramework { m_event = AZStd::unique_ptr(AZStd::make_unique()); m_event->m_mouseInteraction.m_interactionId.m_viewportId = - m_viewportManipulatorInteraction.GetViewportInteraction().GetViewportId(); + m_manipulatorViewportInteraction.GetViewportInteraction().GetViewportId(); } return m_event.get(); @@ -178,12 +196,12 @@ namespace AzManipulatorTestFramework void ImmediateModeActionDispatcher::ExpectManipulatorBeingInteractedImpl() { - EXPECT_TRUE(m_viewportManipulatorInteraction.GetManipulatorManager().ManipulatorBeingInteracted()); + EXPECT_TRUE(m_manipulatorViewportInteraction.GetManipulatorManager().ManipulatorBeingInteracted()); } void ImmediateModeActionDispatcher::ExpectManipulatorNotBeingInteractedImpl() { - EXPECT_FALSE(m_viewportManipulatorInteraction.GetManipulatorManager().ManipulatorBeingInteracted()); + EXPECT_FALSE(m_manipulatorViewportInteraction.GetManipulatorManager().ManipulatorBeingInteracted()); } ImmediateModeActionDispatcher* ImmediateModeActionDispatcher::ResetEvent() diff --git a/Code/Framework/AzManipulatorTestFramework/Source/ViewportInteraction.cpp b/Code/Framework/AzManipulatorTestFramework/Source/ViewportInteraction.cpp index 08cae0c738..e56f7d6d72 100644 --- a/Code/Framework/AzManipulatorTestFramework/Source/ViewportInteraction.cpp +++ b/Code/Framework/AzManipulatorTestFramework/Source/ViewportInteraction.cpp @@ -135,20 +135,20 @@ namespace AzManipulatorTestFramework m_angularStep = step; } - int ViewportInteraction::GetViewportId() const + AzFramework::ViewportId ViewportInteraction::GetViewportId() const { return m_viewportId; } AZ::Vector3 ViewportInteraction::ViewportScreenToWorld([[maybe_unused]] const AzFramework::ScreenPoint& screenPosition) { - return AZ::Vector3::CreateZero(); + return AzFramework::ScreenToWorld(screenPosition, m_cameraState); } AzToolsFramework::ViewportInteraction::ProjectedViewportRay ViewportInteraction::ViewportScreenToWorldRay( [[maybe_unused]] const AzFramework::ScreenPoint& screenPosition) { - return {}; + return AzToolsFramework::ViewportInteraction::ViewportScreenToWorldRay(m_cameraState, screenPosition); } float ViewportInteraction::DeviceScalingFactor() diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/EditorVertexSelection.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/EditorVertexSelection.cpp index 00f5b1ac47..0c3638412c 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/EditorVertexSelection.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/EditorVertexSelection.cpp @@ -84,12 +84,12 @@ namespace AzToolsFramework break; case State::Translating: { - if (mouseInteraction.m_mouseInteraction.m_mouseButtons.Left() && + if (mouseInteraction.m_mouseInteraction.m_mouseButtons.Middle() && mouseInteraction.m_mouseEvent == ViewportInteraction::MouseEvent::Down && mouseInteraction.m_mouseInteraction.m_keyboardModifiers.Shift() && mouseInteraction.m_mouseInteraction.m_keyboardModifiers.Ctrl()) { - SnapVerticesToTerrain(mouseInteraction); + SnapVerticesToSurface(mouseInteraction); return true; } @@ -109,29 +109,23 @@ namespace AzToolsFramework } template - void EditorVertexSelectionBase::SnapVerticesToTerrain(const ViewportInteraction::MouseInteractionEvent& mouseInteraction) + void EditorVertexSelectionBase::SnapVerticesToSurface(const ViewportInteraction::MouseInteractionEvent& mouseInteraction) { ScopedUndoBatch surfaceSnapUndo("Snap to Surface"); ScopedUndoBatch::MarkEntityDirty(GetEntityId()); const int viewportId = mouseInteraction.m_mouseInteraction.m_interactionId.m_viewportId; - // get unsnapped terrain position (world space) - AZ::Vector3 worldSurfacePosition = AZ::Vector3::CreateZero(); - ; - ViewportInteraction::MainEditorViewportInteractionRequestBus::EventResult( - worldSurfacePosition, viewportId, &ViewportInteraction::MainEditorViewportInteractionRequestBus::Events::PickTerrain, - mouseInteraction.m_mouseInteraction.m_mousePick.m_screenCoordinates); + // get unsnapped surface position (world space) + const AZ::Vector3 worldSurfacePosition = FindClosestPickIntersection( + viewportId, mouseInteraction.m_mouseInteraction.m_mousePick.m_screenCoordinates, EditorPickRayLength, + GetDefaultEntityPlacementDistance()); AZ::Transform worldFromLocal; AZ::TransformBus::EventResult(worldFromLocal, GetEntityId(), &AZ::TransformBus::Events::GetWorldTM); const AZ::Transform localFromWorld = worldFromLocal.GetInverse(); - // convert to local space - snap if enabled - const GridSnapParameters gridSnapParams = GridSnapSettings(viewportId); - const AZ::Vector3 localFinalSurfacePosition = gridSnapParams.m_gridSnap - ? CalculateSnappedTerrainPosition(worldSurfacePosition, worldFromLocal, viewportId, gridSnapParams.m_gridSize) - : localFromWorld.TransformPoint(worldSurfacePosition); - + // convert to local space + const AZ::Vector3 localFinalSurfacePosition = localFromWorld.TransformPoint(worldSurfacePosition); SetSelectedPosition(localFinalSurfacePosition); OnEntityComponentPropertyChanged(GetEntityComponentIdPair()); diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/EditorVertexSelection.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/EditorVertexSelection.h index 4894a00df6..7e5523f62a 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/EditorVertexSelection.h +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/EditorVertexSelection.h @@ -171,7 +171,7 @@ namespace AzToolsFramework //! Snap the selected vertices to the terrain. //! Note: With a multi-selection the manipulator will be translated to the picked //! terrain position with all vertices moved relative to it. - void SnapVerticesToTerrain(const ViewportInteraction::MouseInteractionEvent& mouseInteraction); + void SnapVerticesToSurface(const ViewportInteraction::MouseInteractionEvent& mouseInteraction); //! The Actions provided by the EditorVertexSelection while it is active. //! e.g. Vertex deletion, duplication etc. diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/ManipulatorSnapping.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/ManipulatorSnapping.cpp index e4f6b3b1ea..5bea383630 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/ManipulatorSnapping.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/ManipulatorSnapping.cpp @@ -110,30 +110,6 @@ namespace AzToolsFramework return unsnappedPosition + CalculateSnappedOffset(unsnappedPosition, snapAxes, snapAxesCount, size); } - AZ::Vector3 CalculateSnappedTerrainPosition( - const AZ::Vector3& worldSurfacePosition, const AZ::Transform& worldFromLocal, const int viewportId, const float size) - { - const AZ::Transform localFromWorld = worldFromLocal.GetInverse(); - const AZ::Vector3 localSurfacePosition = localFromWorld.TransformPoint(worldSurfacePosition); - - // snap in xy plane - AZ::Vector3 localSnappedSurfacePosition = localSurfacePosition + - CalculateSnappedOffset(localSurfacePosition, AZ::Vector3::CreateAxisX(), size) + - CalculateSnappedOffset(localSurfacePosition, AZ::Vector3::CreateAxisY(), size); - - // find terrain height at xy snapped location - float terrainHeight = 0.0f; - ViewportInteraction::MainEditorViewportInteractionRequestBus::EventResult( - terrainHeight, viewportId, &ViewportInteraction::MainEditorViewportInteractionRequestBus::Events::TerrainHeight, - Vector3ToVector2(worldFromLocal.TransformPoint(localSnappedSurfacePosition))); - - // set snapped z value to terrain height - AZ::Vector3 localTerrainHeight = localFromWorld.TransformPoint(AZ::Vector3(0.0f, 0.0f, terrainHeight)); - localSnappedSurfacePosition.SetZ(localTerrainHeight.GetZ()); - - return localSnappedSurfacePosition; - } - bool GridSnapping(const int viewportId) { bool snapping = false; diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/ManipulatorSnapping.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/ManipulatorSnapping.h index 660d38ac89..96f49d5276 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/ManipulatorSnapping.h +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/ManipulatorSnapping.h @@ -63,11 +63,6 @@ namespace AzToolsFramework AZ::Vector3 CalculateSnappedPosition( const AZ::Vector3& unsnappedPosition, const AZ::Vector3* snapAxes, size_t snapAxesCount, float size); - //! For a given point on the terrain, calculate the closest xy position snapped to the grid - //! (z position is aligned to terrain height, not snapped to z grid) - AZ::Vector3 CalculateSnappedTerrainPosition( - const AZ::Vector3& worldSurfacePosition, const AZ::Transform& worldFromLocal, int viewportId, float size); - //! Wrapper for grid snapping and grid size bus calls. GridSnapParameters GridSnapSettings(int viewportId); diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/SurfaceManipulator.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/SurfaceManipulator.cpp index dd565eb0a8..01b8635406 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/SurfaceManipulator.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/SurfaceManipulator.cpp @@ -10,6 +10,7 @@ #include #include +#include namespace AzToolsFramework { @@ -17,28 +18,16 @@ namespace AzToolsFramework const AZ::Transform& worldFromLocal, const AZ::Vector3& worldSurfacePosition, const AZ::Vector3& localStartPosition, - const bool snapping, - const float gridSize, - const int viewportId) + [[maybe_unused]] const bool snapping, + [[maybe_unused]] const float gridSize, + [[maybe_unused]] const int viewportId) { - const AZ::Transform worldFromLocalUniform = AzToolsFramework::TransformUniformScale(worldFromLocal); - const AZ::Transform localFromWorldUniform = worldFromLocalUniform.GetInverse(); - - const AZ::Vector3 localFinalSurfacePosition = snapping - // note: gridSize is not scaled by scaleRecip here as localStartPosition is - // unscaled itself so the position returned by CalculateSnappedTerrainPosition - // must be in the same space (if localStartPosition were also scaled, gridSize - // would need to be multiplied by scaleRecip) - ? CalculateSnappedTerrainPosition(worldSurfacePosition, worldFromLocalUniform, viewportId, gridSize) - : localFromWorldUniform.TransformPoint(worldSurfacePosition); - - // delta/offset between initial vertex position and terrain pick position - const AZ::Vector3 localSurfaceOffset = localFinalSurfacePosition - localStartPosition; + const AZ::Transform localFromWorld = worldFromLocal.GetInverse(); StartInternal startInternal; - startInternal.m_snapOffset = localSurfaceOffset; - startInternal.m_localPosition = localStartPosition + localSurfaceOffset; - startInternal.m_localHitPosition = localFromWorldUniform.TransformVector(worldSurfacePosition); + startInternal.m_snapOffset = AZ::Vector3::CreateZero(); + startInternal.m_localPosition = localStartPosition; + startInternal.m_localHitPosition = localFromWorld.TransformPoint(worldSurfacePosition); return startInternal; } @@ -46,26 +35,19 @@ namespace AzToolsFramework const StartInternal& startInternal, const AZ::Transform& worldFromLocal, const AZ::Vector3& worldSurfacePosition, - const bool snapping, - const float gridSize, + [[maybe_unused]] const bool snapping, + [[maybe_unused]] const float gridSize, const ViewportInteraction::KeyboardModifiers keyboardModifiers, - const int viewportId) + [[maybe_unused]] const int viewportId) { - const AZ::Transform worldFromLocalUniform = AzToolsFramework::TransformUniformScale(worldFromLocal); - const AZ::Transform localFromWorldUniform = worldFromLocalUniform.GetInverse(); - - const float scaleRecip = ScaleReciprocal(worldFromLocalUniform); - - const AZ::Vector3 localFinalSurfacePosition = snapping - ? CalculateSnappedTerrainPosition(worldSurfacePosition, worldFromLocalUniform, viewportId, gridSize * scaleRecip) - : localFromWorldUniform.TransformPoint(worldSurfacePosition); + const AZ::Transform localFromWorld = worldFromLocal.GetInverse(); + const AZ::Vector3 localFinalSurfacePosition = localFromWorld.TransformPoint(worldSurfacePosition); Action action; action.m_start.m_localPosition = startInternal.m_localPosition; - action.m_start.m_snapOffset = startInternal.m_snapOffset; + action.m_start.m_snapOffset = AZ::Vector3::CreateZero(); action.m_current.m_localOffset = localFinalSurfacePosition - startInternal.m_localPosition; - // record what modifier keys are held during this action - action.m_modifiers = keyboardModifiers; + action.m_modifiers = keyboardModifiers; // record what modifier keys are held during this action return action; } @@ -78,12 +60,16 @@ namespace AzToolsFramework { SetSpace(worldFromLocal); AttachLeftMouseDownImpl(); + + // only cast rays against objects (entities/meshes etc.) we can actually see + m_rayRequest.m_onlyVisible = true; } void SurfaceManipulator::InstallLeftMouseDownCallback(const MouseActionCallback& onMouseDownCallback) { m_onLeftMouseDownCallback = onMouseDownCallback; } + void SurfaceManipulator::InstallLeftMouseUpCallback(const MouseActionCallback& onMouseUpCallback) { m_onLeftMouseUpCallback = onMouseUpCallback; @@ -95,17 +81,30 @@ namespace AzToolsFramework } void SurfaceManipulator::OnLeftMouseDownImpl( - const ViewportInteraction::MouseInteraction& interaction, float /*rayIntersectionDistance*/) + const ViewportInteraction::MouseInteraction& interaction, [[maybe_unused]] float rayIntersectionDistance) { const AZ::Transform worldFromLocalUniformScale = TransformUniformScale(GetSpace()); - const GridSnapParameters gridSnapParams = GridSnapSettings(interaction.m_interactionId.m_viewportId); + const AzFramework::ViewportId viewportId = interaction.m_interactionId.m_viewportId; - AZ::Vector3 worldSurfacePosition; - ViewportInteraction::MainEditorViewportInteractionRequestBus::EventResult( - worldSurfacePosition, interaction.m_interactionId.m_viewportId, - &ViewportInteraction::MainEditorViewportInteractionRequestBus::Events::PickTerrain, - interaction.m_mousePick.m_screenCoordinates); + const auto& entityComponentIdPairs = EntityComponentIdPairs(); + m_rayRequest.m_entityFilter.m_ignoreEntities.clear(); + m_rayRequest.m_entityFilter.m_ignoreEntities.reserve(entityComponentIdPairs.size()); + AZStd::transform( + entityComponentIdPairs.begin(), entityComponentIdPairs.end(), + AZStd::inserter(m_rayRequest.m_entityFilter.m_ignoreEntities, m_rayRequest.m_entityFilter.m_ignoreEntities.begin()), + [](const AZ::EntityComponentIdPair& entityComponentIdPair) + { + return entityComponentIdPair.GetEntityId(); + }); + + // calculate the start and end of the ray + RefreshRayRequest( + m_rayRequest, ViewportInteraction::ViewportScreenToWorldRay(viewportId, interaction.m_mousePick.m_screenCoordinates), + EditorPickRayLength); + + const GridSnapParameters gridSnapParams = GridSnapSettings(viewportId); + const AZ::Vector3 worldSurfacePosition = FindClosestPickIntersection(m_rayRequest, GetDefaultEntityPlacementDistance()); m_startInternal = CalculateManipulationDataStart( worldFromLocalUniformScale, worldSurfacePosition, GetLocalPosition(), gridSnapParams.m_gridSnap, gridSnapParams.m_gridSize, @@ -123,17 +122,14 @@ namespace AzToolsFramework { if (m_onLeftMouseUpCallback) { - AZ::Vector3 worldSurfacePosition = AZ::Vector3::CreateZero(); - ViewportInteraction::MainEditorViewportInteractionRequestBus::EventResult( - worldSurfacePosition, interaction.m_interactionId.m_viewportId, - &ViewportInteraction::MainEditorViewportInteractionRequestBus::Events::PickTerrain, - interaction.m_mousePick.m_screenCoordinates); + const AzFramework::ViewportId viewportId = interaction.m_interactionId.m_viewportId; - const GridSnapParameters gridSnapParams = GridSnapSettings(interaction.m_interactionId.m_viewportId); + const GridSnapParameters gridSnapParams = GridSnapSettings(viewportId); + const AZ::Vector3 worldSurfacePosition = FindClosestPickIntersection(m_rayRequest, GetDefaultEntityPlacementDistance()); m_onLeftMouseUpCallback(CalculateManipulationDataAction( m_startInternal, TransformUniformScale(GetSpace()), worldSurfacePosition, gridSnapParams.m_gridSnap, - gridSnapParams.m_gridSize, interaction.m_keyboardModifiers, interaction.m_interactionId.m_viewportId)); + gridSnapParams.m_gridSize, interaction.m_keyboardModifiers, viewportId)); } } @@ -141,13 +137,15 @@ namespace AzToolsFramework { if (m_onMouseMoveCallback) { - AZ::Vector3 worldSurfacePosition = AZ::Vector3::CreateZero(); - ViewportInteraction::MainEditorViewportInteractionRequestBus::EventResult( - worldSurfacePosition, interaction.m_interactionId.m_viewportId, - &ViewportInteraction::MainEditorViewportInteractionRequestBus::Events::PickTerrain, - interaction.m_mousePick.m_screenCoordinates); + const AzFramework::ViewportId viewportId = interaction.m_interactionId.m_viewportId; - const GridSnapParameters gridSnapParams = GridSnapSettings(interaction.m_interactionId.m_viewportId); + // update the start and end of the ray + RefreshRayRequest( + m_rayRequest, ViewportInteraction::ViewportScreenToWorldRay(viewportId, interaction.m_mousePick.m_screenCoordinates), + EditorPickRayLength); + + const GridSnapParameters gridSnapParams = GridSnapSettings(viewportId); + const AZ::Vector3 worldSurfacePosition = FindClosestPickIntersection(m_rayRequest, GetDefaultEntityPlacementDistance()); m_onMouseMoveCallback(CalculateManipulationDataAction( m_startInternal, TransformUniformScale(GetSpace()), worldSurfacePosition, gridSnapParams.m_gridSnap, diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/SurfaceManipulator.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/SurfaceManipulator.h index c9121c49cc..091a71d8da 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/SurfaceManipulator.h +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/SurfaceManipulator.h @@ -11,6 +11,7 @@ #include "BaseManipulator.h" #include +#include #include namespace AzToolsFramework @@ -58,10 +59,12 @@ namespace AzToolsFramework Start m_start; Current m_current; ViewportInteraction::KeyboardModifiers m_modifiers; + AZ::Vector3 LocalPosition() const { return m_start.m_localPosition + m_current.m_localOffset; } + AZ::Vector3 LocalPositionOffset() const { return m_current.m_localOffset; @@ -106,6 +109,9 @@ namespace AzToolsFramework MouseActionCallback m_onLeftMouseUpCallback = nullptr; MouseActionCallback m_onMouseMoveCallback = nullptr; + //! Cached ray request initialized at mouse down and updated during mouse move. + AzFramework::RenderGeometry::RayRequest m_rayRequest; + static StartInternal CalculateManipulationDataStart( const AZ::Transform& worldFromLocal, const AZ::Vector3& worldSurfacePosition, diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Viewport/ViewportMessages.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Viewport/ViewportMessages.cpp index 8f8bd3e3f9..df96836bde 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/Viewport/ViewportMessages.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Viewport/ViewportMessages.cpp @@ -64,23 +64,12 @@ namespace AzToolsFramework return circleBoundWidth; } - AZ::Vector3 FindClosestPickIntersection( - AzFramework::ViewportId viewportId, const AzFramework::ScreenPoint& screenPoint, const float rayLength, const float defaultDistance) + AZ::Vector3 FindClosestPickIntersection(const AzFramework::RenderGeometry::RayRequest& rayRequest, 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); + &AzFramework::RenderGeometry::IntersectorBus::Events::RayIntersect, rayRequest); // attempt a ray intersection with any visible mesh and return the intersection position if successful if (renderGeometryIntersectionResult) @@ -89,7 +78,32 @@ namespace AzToolsFramework } else { - return viewportRay.origin + viewportRay.direction * defaultDistance; + const AZ::Vector3 rayDirection = (rayRequest.m_endWorldPosition - rayRequest.m_startWorldPosition).GetNormalized(); + return rayRequest.m_startWorldPosition + rayDirection * defaultDistance; } } + + void RefreshRayRequest( + AzFramework::RenderGeometry::RayRequest& rayRequest, + const ViewportInteraction::ProjectedViewportRay& viewportRay, + const float rayLength) + { + AZ_Assert(rayLength > 0.0f, "Invalid ray length passed to RefreshRayRequest"); + rayRequest.m_startWorldPosition = viewportRay.origin; + rayRequest.m_endWorldPosition = viewportRay.origin + viewportRay.direction * rayLength; + } + + AZ::Vector3 FindClosestPickIntersection( + const AzFramework::ViewportId viewportId, + const AzFramework::ScreenPoint& screenPoint, + const float rayLength, + const float defaultDistance) + { + AzFramework::RenderGeometry::RayRequest ray; + ray.m_onlyVisible = true; // only consider visible objects + + RefreshRayRequest(ray, ViewportInteraction::ViewportScreenToWorldRay(viewportId, screenPoint), rayLength); + + return FindClosestPickIntersection(ray, defaultDistance); + } } // namespace AzToolsFramework diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Viewport/ViewportMessages.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Viewport/ViewportMessages.h index aa97eb361e..aec2d3fbca 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/Viewport/ViewportMessages.h +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Viewport/ViewportMessages.h @@ -15,13 +15,19 @@ #include #include #include +#include #include #include namespace AzFramework { struct ScreenPoint; -} + + namespace RenderGeometry + { + struct RayRequest; + } +} // namespace AzFramework namespace AzToolsFramework { @@ -177,6 +183,26 @@ namespace AzToolsFramework //! Type to inherit to implement ViewportInteractionRequests. using ViewportInteractionRequestBus = AZ::EBus; + //! Utility function to return a viewport ray. + inline ProjectedViewportRay ViewportScreenToWorldRay( + const AzFramework::CameraState& cameraState, const AzFramework::ScreenPoint& screenPoint) + { + const AZ::Vector3 rayOrigin = AzFramework::ScreenToWorld(screenPoint, cameraState); + const AZ::Vector3 rayDirection = (rayOrigin - cameraState.m_position).GetNormalized(); + return AzToolsFramework::ViewportInteraction::ProjectedViewportRay{ rayOrigin, rayDirection }; + } + + //! Utility function to return a viewport ray using the ViewportInteractionRequestBus. + inline ProjectedViewportRay ViewportScreenToWorldRay( + const AzFramework::ViewportId viewportId, const AzFramework::ScreenPoint& screenPoint) + { + ProjectedViewportRay viewportRay{}; + ViewportInteractionRequestBus::EventResult( + viewportRay, viewportId, &ViewportInteractionRequestBus::Events::ViewportScreenToWorldRay, screenPoint); + + return viewportRay; + } + //! Interface to return only viewport specific settings (e.g. snapping). class ViewportSettingsRequests { @@ -228,10 +254,6 @@ namespace AzToolsFramework class MainEditorViewportInteractionRequests { public: - //! 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). - virtual float TerrainHeight(const AZ::Vector2& position) = 0; //! Is the user holding a modifier key to move the manipulator space from local to world. virtual bool ShowingWorldSpace() = 0; //! Return the widget to use as the parent for the viewport context menu. @@ -337,9 +359,18 @@ namespace AzToolsFramework //! 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. + //! @note The intersection will only consider visible objects. AZ::Vector3 FindClosestPickIntersection( AzFramework::ViewportId viewportId, const AzFramework::ScreenPoint& screenPoint, float rayLength, float defaultDistance); + //! Overload of FindClosestPickIntersection taking a RenderGeometry::RayRequest directly. + //! @note rayRequest must contain a valid ray/line segment (start/endWorldPosition must not be at the same position). + AZ::Vector3 FindClosestPickIntersection(const AzFramework::RenderGeometry::RayRequest& rayRequest, float defaultDistance); + + //! Update the in/out parameter rayRequest based on the latest viewport ray. + void RefreshRayRequest( + AzFramework::RenderGeometry::RayRequest& rayRequest, const ViewportInteraction::ProjectedViewportRay& viewportRay, float rayLength); + //! 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 0a7bed6b18..31ea0c3985 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorSelectionUtil.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorSelectionUtil.cpp @@ -9,6 +9,7 @@ #include "EditorSelectionUtil.h" #include +#include #include #include #include @@ -16,8 +17,21 @@ #include #include +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"); + namespace AzToolsFramework { + float GetDefaultEntityPlacementDistance() + { + return ed_defaultEntityPlacementDistance; + } + 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 5c9f47fdd3..b3a6c6afd4 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorSelectionUtil.h +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorSelectionUtil.h @@ -60,6 +60,9 @@ namespace AzToolsFramework //! Wrapper for EBus call to return the DPI scaling for a given viewport. float GetScreenDisplayScaling(int viewportId); + //! The default distance an entity is placed from the camera if there is no intersection. + float GetDefaultEntityPlacementDistance(); + //! A utility to return the center of several points. //! Take several positions and store the min and max of each in //! turn - when all points have been added return the center/midpoint. diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorTransformComponentSelection.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorTransformComponentSelection.cpp index d3540f8c09..d3cfed4665 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorTransformComponentSelection.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorTransformComponentSelection.cpp @@ -231,8 +231,8 @@ namespace AzToolsFramework { return mouseInteraction.m_mouseInteraction.m_mouseButtons.Middle() && mouseInteraction.m_mouseEvent == ViewportInteraction::MouseEvent::Down && - mouseInteraction.m_mouseInteraction.m_keyboardModifiers.Ctrl() && - !mouseInteraction.m_mouseInteraction.m_keyboardModifiers.Alt(); + !mouseInteraction.m_mouseInteraction.m_keyboardModifiers.Alt() && + mouseInteraction.m_mouseInteraction.m_keyboardModifiers.Ctrl(); } static bool IndividualDitto(const ViewportInteraction::MouseInteractionEvent& mouseInteraction) @@ -243,12 +243,12 @@ namespace AzToolsFramework mouseInteraction.m_mouseInteraction.m_keyboardModifiers.Ctrl(); } - static bool SnapTerrain(const ViewportInteraction::MouseInteractionEvent& mouseInteraction) + static bool SnapSurface(const ViewportInteraction::MouseInteractionEvent& mouseInteraction) { return mouseInteraction.m_mouseInteraction.m_mouseButtons.Middle() && mouseInteraction.m_mouseEvent == ViewportInteraction::MouseEvent::Down && - (mouseInteraction.m_mouseInteraction.m_keyboardModifiers.Alt() || - mouseInteraction.m_mouseInteraction.m_keyboardModifiers.Ctrl()); + mouseInteraction.m_mouseInteraction.m_keyboardModifiers.Shift() && + mouseInteraction.m_mouseInteraction.m_keyboardModifiers.Ctrl(); } static bool ManipulatorDitto( @@ -923,26 +923,6 @@ namespace AzToolsFramework } } - static AZ::Vector3 PickTerrainPosition(const ViewportInteraction::MouseInteraction& mouseInteraction) - { - AZ_PROFILE_FUNCTION(AzToolsFramework); - - const int viewportId = mouseInteraction.m_interactionId.m_viewportId; - // get unsnapped terrain position (world space) - AZ::Vector3 worldSurfacePosition; - ViewportInteraction::MainEditorViewportInteractionRequestBus::EventResult( - worldSurfacePosition, viewportId, &ViewportInteraction::MainEditorViewportInteractionRequestBus::Events::PickTerrain, - mouseInteraction.m_mousePick.m_screenCoordinates); - - // convert to local space - snap if enabled - const GridSnapParameters gridSnapParams = GridSnapSettings(viewportId); - const AZ::Vector3 finalSurfacePosition = gridSnapParams.m_gridSnap - ? CalculateSnappedTerrainPosition(worldSurfacePosition, AZ::Transform::CreateIdentity(), viewportId, gridSnapParams.m_gridSize) - : worldSurfacePosition; - - return finalSurfacePosition; - } - // is the passed entity id contained with in the entity id list template static bool IsEntitySelectedInternal(AZ::EntityId entityId, const EntityIdContainer& selectedEntityIds) @@ -1286,7 +1266,7 @@ namespace AzToolsFramework m_axisPreview.m_translation = m_entityIdManipulators.m_manipulators->GetLocalTransform().GetTranslation(); m_axisPreview.m_orientation = QuaternionFromTransformNoScaling(m_entityIdManipulators.m_manipulators->GetLocalTransform()); - // [ref 1.] + // see comment [ref 1.] above BeginRecordManipulatorCommand(); }); @@ -1321,7 +1301,7 @@ namespace AzToolsFramework m_axisPreview.m_translation = m_entityIdManipulators.m_manipulators->GetLocalTransform().GetTranslation(); m_axisPreview.m_orientation = QuaternionFromTransformNoScaling(m_entityIdManipulators.m_manipulators->GetLocalTransform()); - // [ref 1.] + // see comment [ref 1.] above BeginRecordManipulatorCommand(); }); @@ -1343,6 +1323,39 @@ namespace AzToolsFramework EndRecordManipulatorCommand(); }); + // surface + translationManipulators->InstallSurfaceManipulatorMouseDownCallback( + [this, manipulatorEntityIds]([[maybe_unused]] const SurfaceManipulator::Action& action) + { + BuildSortedEntityIdVectorFromEntityIdMap(m_entityIdManipulators.m_lookups, manipulatorEntityIds->m_entityIds); + + InitializeTranslationLookup(m_entityIdManipulators); + + m_axisPreview.m_translation = m_entityIdManipulators.m_manipulators->GetLocalTransform().GetTranslation(); + m_axisPreview.m_orientation = QuaternionFromTransformNoScaling(m_entityIdManipulators.m_manipulators->GetLocalTransform()); + + // see comment [ref 1.] above + BeginRecordManipulatorCommand(); + }); + + translationManipulators->InstallSurfaceManipulatorMouseMoveCallback( + [this, prevModifiers, manipulatorEntityIds](const SurfaceManipulator::Action& action) mutable + { + UpdateTranslationManipulator( + action, manipulatorEntityIds->m_entityIds, m_entityIdManipulators, m_pivotOverrideFrame, prevModifiers, + m_transformChangedInternally, m_spaceCluster.m_spaceLock); + }); + + translationManipulators->InstallSurfaceManipulatorMouseUpCallback( + [this, manipulatorEntityIds]([[maybe_unused]] const SurfaceManipulator::Action& action) + { + AzToolsFramework::EditorTransformChangeNotificationBus::Broadcast( + &AzToolsFramework::EditorTransformChangeNotificationBus::Events::OnEntityTransformChanged, + manipulatorEntityIds->m_entityIds); + + EndRecordManipulatorCommand(); + }); + // transfer ownership m_entityIdManipulators.m_manipulators = AZStd::move(translationManipulators); } @@ -1395,7 +1408,7 @@ namespace AzToolsFramework m_axisPreview.m_translation = m_entityIdManipulators.m_manipulators->GetLocalTransform().GetTranslation(); m_axisPreview.m_orientation = QuaternionFromTransformNoScaling(m_entityIdManipulators.m_manipulators->GetLocalTransform()); - // [ref 1.] + // see comment [ref 1.] above BeginRecordManipulatorCommand(); }); @@ -1867,6 +1880,13 @@ namespace AzToolsFramework if (!m_selectedEntityIds.empty()) { + // try snapping to a surface (mesh) if in Translation mode + if (Input::SnapSurface(mouseInteraction)) + { + PerformSnapToSurface(mouseInteraction); + return false; + } + // group copying/alignment to specific entity - 'ditto' position/orientation for group if (Input::GroupDitto(mouseInteraction) && PerformGroupDitto(entityIdUnderCursor)) { @@ -1879,13 +1899,6 @@ namespace AzToolsFramework return false; } - // try snapping to the terrain (if in Translation mode) and entity wasn't picked - if (Input::SnapTerrain(mouseInteraction)) - { - PerformSnapToTerrain(mouseInteraction); - return false; - } - // set manipulator pivot override translation or orientation (update manipulators) if (Input::ManipulatorDitto(clickOutcome, mouseInteraction)) { @@ -1973,25 +1986,28 @@ namespace AzToolsFramework return false; } - void EditorTransformComponentSelection::PerformSnapToTerrain(const ViewportInteraction::MouseInteractionEvent& mouseInteraction) + void EditorTransformComponentSelection::PerformSnapToSurface(const ViewportInteraction::MouseInteractionEvent& mouseInteraction) { - for (AZ::EntityId entityId : m_selectedEntityIds) + for (const AZ::EntityId& entityId : m_selectedEntityIds) { ScopedUndoBatch::MarkEntityDirty(entityId); } if (m_mode == Mode::Translation) { - const AZ::Vector3 finalSurfacePosition = PickTerrainPosition(mouseInteraction.m_mouseInteraction); + const AZ::Vector3 worldPosition = FindClosestPickIntersection( + mouseInteraction.m_mouseInteraction.m_interactionId.m_viewportId, + mouseInteraction.m_mouseInteraction.m_mousePick.m_screenCoordinates, AzToolsFramework::EditorPickRayLength, + GetDefaultEntityPlacementDistance()); // handle modifier alternatives if (Input::IndividualDitto(mouseInteraction)) { - CopyTranslationToSelectedEntitiesIndividual(finalSurfacePosition); + CopyTranslationToSelectedEntitiesIndividual(worldPosition); } else if (Input::GroupDitto(mouseInteraction)) { - CopyTranslationToSelectedEntitiesGroup(finalSurfacePosition); + CopyTranslationToSelectedEntitiesGroup(worldPosition); } } else if (m_mode == Mode::Rotation) diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorTransformComponentSelection.h b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorTransformComponentSelection.h index 10f83db739..afc290380b 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorTransformComponentSelection.h +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorTransformComponentSelection.h @@ -308,7 +308,7 @@ namespace AzToolsFramework bool PerformGroupDitto(AZ::EntityId entityId); bool PerformIndividualDitto(AZ::EntityId entityId); void PerformManipulatorDitto(AZ::EntityId entityId); - void PerformSnapToTerrain(const ViewportInteraction::MouseInteractionEvent& mouseInteraction); + void PerformSnapToSurface(const ViewportInteraction::MouseInteractionEvent& mouseInteraction); //! Responsible for keeping the space cluster in sync with the current reference frame. void UpdateSpaceCluster(ReferenceFrame referenceFrame); diff --git a/Code/Framework/AzToolsFramework/Tests/BoundsTestComponent.cpp b/Code/Framework/AzToolsFramework/Tests/BoundsTestComponent.cpp index fa5a6b344a..0b3c574e16 100644 --- a/Code/Framework/AzToolsFramework/Tests/BoundsTestComponent.cpp +++ b/Code/Framework/AzToolsFramework/Tests/BoundsTestComponent.cpp @@ -8,6 +8,8 @@ #include +#include +#include #include namespace UnitTest @@ -62,4 +64,51 @@ namespace UnitTest { return m_localBounds; } + + void RenderGeometryIntersectionTestComponent::Reflect(AZ::ReflectContext* context) + { + if (auto serializeContext = azrtti_cast(context)) + { + serializeContext->Class()->Version(1); + } + } + + void RenderGeometryIntersectionTestComponent::Activate() + { + BoundsTestComponent::Activate(); + + const AZ::EntityId entityId = GetEntityId(); + AzFramework::EntityContextId contextId = AzFramework::EntityContextId::CreateNull(); + AzFramework::EntityIdContextQueryBus::EventResult(contextId, entityId, &AzFramework::EntityIdContextQueries::GetOwningContextId); + AzFramework::RenderGeometry::IntersectionRequestBus::Handler::BusConnect({entityId, contextId}); + } + + void RenderGeometryIntersectionTestComponent::Deactivate() + { + AzFramework::RenderGeometry::IntersectionRequestBus::Handler::BusDisconnect(); + BoundsTestComponent::Deactivate(); + } + + AzFramework::RenderGeometry::RayResult RenderGeometryIntersectionTestComponent::RenderGeometryIntersect( + const AzFramework::RenderGeometry::RayRequest& ray) + { + AZ::Transform worldFromLocal = AZ::Transform::CreateIdentity(); + AZ::TransformBus::EventResult(worldFromLocal, GetEntityId(), &AZ::TransformBus::Events::GetWorldTM); + + AzFramework::RenderGeometry::RayResult rayResult; + + float t = 0.0f; + const AZ::Obb obb = GetLocalBounds().GetTransformedObb(worldFromLocal); + const AZ::Vector3 rayDirection = ray.m_endWorldPosition - ray.m_startWorldPosition; + if (AZ::Intersect::IntersectRayObb(ray.m_startWorldPosition, rayDirection, obb, t)) + { + rayResult.m_worldPosition = ray.m_startWorldPosition + rayDirection * t; + rayResult.m_entityAndComponent = AZ::EntityComponentIdPair(GetEntityId(), GetId()); + rayResult.m_distance = t; + rayResult.m_uv = AZ::Vector2::CreateZero(); + rayResult.m_worldNormal = AZ::Vector3::CreateZero(); + } + + return rayResult; + } } // namespace UnitTest diff --git a/Code/Framework/AzToolsFramework/Tests/BoundsTestComponent.h b/Code/Framework/AzToolsFramework/Tests/BoundsTestComponent.h index 358a9f810a..2eee3c0a66 100644 --- a/Code/Framework/AzToolsFramework/Tests/BoundsTestComponent.h +++ b/Code/Framework/AzToolsFramework/Tests/BoundsTestComponent.h @@ -8,6 +8,7 @@ #pragma once +#include #include #include #include @@ -44,4 +45,21 @@ namespace UnitTest AZ::Aabb m_localBounds; //!< Local bounds that can be modified for certain tests (defaults to unit cube). }; + + class RenderGeometryIntersectionTestComponent + : public BoundsTestComponent + , public AzFramework::RenderGeometry::IntersectionRequestBus::Handler + { + public: + AZ_EDITOR_COMPONENT(RenderGeometryIntersectionTestComponent, "{6F46B5BF-60DF-4BDD-9BA7-9658E85B99C2}", BoundsTestComponent); + + static void Reflect(AZ::ReflectContext* context); + + // AZ::Component overrides ... + void Activate() override; + void Deactivate() override; + + // IntersectionRequestBus overrides ... + AzFramework::RenderGeometry::RayResult RenderGeometryIntersect(const AzFramework::RenderGeometry::RayRequest& ray) override; + }; } // namespace UnitTest diff --git a/Code/Framework/AzToolsFramework/Tests/EditorTransformComponentSelectionTests.cpp b/Code/Framework/AzToolsFramework/Tests/EditorTransformComponentSelectionTests.cpp index f4077e992b..859cc67c41 100644 --- a/Code/Framework/AzToolsFramework/Tests/EditorTransformComponentSelectionTests.cpp +++ b/Code/Framework/AzToolsFramework/Tests/EditorTransformComponentSelectionTests.cpp @@ -1663,7 +1663,7 @@ namespace UnitTest const AZ::Transform finalEntityTransform = AzToolsFramework::GetWorldTransform(m_entityId1); // ensure final world positions match - EXPECT_TRUE(finalEntityTransform.IsClose(finalTransformWorld, 0.01f)); + EXPECT_THAT(finalEntityTransform, IsCloseTolerance(finalTransformWorld, 0.01f)); } TEST_F(EditorTransformComponentSelectionManipulatorTestFixture, TranslatingEntityWithLinearManipulatorNotifiesOnEntityTransformChanged) @@ -2973,4 +2973,176 @@ namespace UnitTest EXPECT_THAT(hoveredEntityIdAccentRemoved, IsTrue()); EXPECT_THAT(hoveredEntityEntityId, Eq(AZ::EntityId(12345))); } + + class EditorTransformComponentSelectionRenderGeometryIntersectionFixture : public ToolsApplicationFixture + { + public: + void SetUpEditorFixtureImpl() override + { + auto* app = GetApplication(); + // register a simple component implementing BoundsRequestBus and EditorComponentSelectionRequestsBus + app->RegisterComponentDescriptor(BoundsTestComponent::CreateDescriptor()); + // register a component implementing RenderGeometry::IntersectionRequestBus + app->RegisterComponentDescriptor(RenderGeometryIntersectionTestComponent::CreateDescriptor()); + + auto createEntityWithGeometryIntersectionFn = [](const char* entityName) + { + AZ::Entity* entity = nullptr; + AZ::EntityId entityId = CreateDefaultEditorEntity(entityName, &entity); + + entity->Deactivate(); + entity->CreateComponent(); + entity->Activate(); + + return entityId; + }; + + m_entityIdGround = createEntityWithGeometryIntersectionFn("Entity1"); + m_entityIdBox = createEntityWithGeometryIntersectionFn("Entity2"); + + if (auto* ground = AzToolsFramework::GetEntityById(m_entityIdGround)->FindComponent()) + { + ground->m_localBounds = AZ::Aabb::CreateFromMinMax(AZ::Vector3(-10.0f, -10.0f, -0.5f), AZ::Vector3(10.0f, 10.0f, 0.5f)); + } + + AzToolsFramework::SetWorldTransform(m_entityIdGround, AZ::Transform::CreateTranslation(AZ::Vector3(0.0f, 10.0f, 5.0f))); + + if (auto* box = AzToolsFramework::GetEntityById(m_entityIdBox)->FindComponent()) + { + box->m_localBounds = AZ::Aabb::CreateFromMinMax(AZ::Vector3(-0.5f), AZ::Vector3(0.5f)); + } + + AzToolsFramework::SetWorldTransform( + m_entityIdBox, + AZ::Transform::CreateFromMatrix3x3AndTranslation( + AZ::Matrix3x3::CreateRotationZ(AZ::DegToRad(45.0f)), AZ::Vector3(0.0f, 10.0f, 7.0f))); + } + + AZ::EntityId m_entityIdGround; + AZ::EntityId m_entityIdBox; + }; + + using EditorTransformComponentSelectionRenderGeometryIntersectionManipulatorFixture = + IndirectCallManipulatorViewportInteractionFixtureMixin; + + TEST_F( + EditorTransformComponentSelectionRenderGeometryIntersectionManipulatorFixture, BoxCanBePlacedOnMeshSurfaceUsingSurfaceManipulator) + { + // camera (go to position format) - 0.00, 20.00, 12.00, -35.00, -180.00 + m_cameraState.m_viewportSize = AZ::Vector2(1280.0f, 720.0f); + AzFramework::SetCameraTransform( + m_cameraState, + AZ::Transform::CreateFromMatrix3x3AndTranslation( + AZ::Matrix3x3::CreateRotationZ(AZ::DegToRad(-180.0f)) * AZ::Matrix3x3::CreateRotationX(AZ::DegToRad(-35.0f)), + AZ::Vector3(0.0f, 20.0f, 12.0f))); + + // the initial starting position of the entity + const auto initialTransformWorld = AzToolsFramework::GetWorldTransform(m_entityIdBox); + // where the entity should end up (snapped to the larger ground surface) + const auto finalTransformWorld = + AZ::Transform::CreateFromQuaternionAndTranslation(initialTransformWorld.GetRotation(), AZ::Vector3(2.5f, 12.5f, 5.5f)); + + // calculate the position in screen space of the initial position of the entity + const auto initialPositionScreen = AzFramework::WorldToScreen(initialTransformWorld.GetTranslation(), m_cameraState); + // calculate the position in screen space of the final position of the entity + const auto finalPositionScreen = AzFramework::WorldToScreen(finalTransformWorld.GetTranslation(), m_cameraState); + + // select the entity (this will cause the manipulators to appear in EditorTransformComponentSelection) + AzToolsFramework::SelectEntity(m_entityIdBox); + + // press and drag the mouse (starting where the surface manipulator is) + m_actionDispatcher->CameraState(m_cameraState) + ->MousePosition(initialPositionScreen) + ->MouseLButtonDown() + ->MousePosition(finalPositionScreen) + ->MouseLButtonUp(); + + // read back the position of the entity now + const AZ::Transform finalEntityTransform = AzToolsFramework::GetWorldTransform(m_entityIdBox); + + // ensure final world positions match + EXPECT_THAT(finalEntityTransform, IsCloseTolerance(finalTransformWorld, 0.01f)); + } + + TEST_F( + EditorTransformComponentSelectionRenderGeometryIntersectionManipulatorFixture, + SurfaceManipulatorFollowsMouseAtDefaultEditorDistanceFromCameraWhenNoMeshIntersection) + { + // camera (go to position format) - 0.00, 25.00, 12.00, 0.00, -180.00 + m_cameraState.m_viewportSize = AZ::Vector2(1280.0f, 720.0f); + AzFramework::SetCameraTransform( + m_cameraState, + AZ::Transform::CreateFromMatrix3x3AndTranslation( + AZ::Matrix3x3::CreateRotationZ(AZ::DegToRad(-180.0f)), AZ::Vector3(0.0f, 25.0f, 12.0f))); + + // the initial starting position of the entity + const auto initialTransformWorld = AzToolsFramework::GetWorldTransform(m_entityIdBox); + // where the entity should end up (default distance away from the camera/near clip under where the mouse is) + const auto finalTransformWorld = + AZ::Transform::CreateFromQuaternionAndTranslation(initialTransformWorld.GetRotation(), AZ::Vector3(0.0f, 14.9f, 12.0f)); + + // calculate the position in screen space of the initial position of the entity + const auto initialPositionScreen = AzFramework::WorldToScreen(initialTransformWorld.GetTranslation(), m_cameraState); + // calculate the position in screen space of the final position of the entity + const auto finalPositionScreen = AzFramework::WorldToScreen(finalTransformWorld.GetTranslation(), m_cameraState); + + // select the entity (this will cause the manipulators to appear in EditorTransformComponentSelection) + AzToolsFramework::SelectEntity(m_entityIdBox); + + // press and drag the mouse (starting where the surface manipulator is) + m_actionDispatcher->CameraState(m_cameraState) + ->MousePosition(initialPositionScreen) + ->MouseLButtonDown() + ->MousePosition(finalPositionScreen) + ->MouseLButtonUp(); + + // read back the position of the entity now + const AZ::Transform finalEntityTransform = AzToolsFramework::GetWorldTransform(m_entityIdBox); + + const auto viewportRay = AzToolsFramework::ViewportInteraction::ViewportScreenToWorldRay(m_cameraState, initialPositionScreen); + const auto distanceAway = (finalEntityTransform.GetTranslation() - viewportRay.origin).GetLength(); + + // ensure final world positions match + EXPECT_THAT(finalEntityTransform, IsCloseTolerance(finalTransformWorld, 0.01f)); + // ensure distance away is what we expect + EXPECT_NEAR(distanceAway, AzToolsFramework::GetDefaultEntityPlacementDistance(), 0.001f); + } + + TEST_F( + EditorTransformComponentSelectionRenderGeometryIntersectionManipulatorFixture, + MiddleMouseButtonWithShiftAndCtrlHeldOnMeshSurfaceWillSnapSelectedEntityToIntersectionPoint) + { + // camera (go to position format) - 21.00, 8.00, 11.00, -22.00, 150.00 + m_cameraState.m_viewportSize = AZ::Vector2(1280.0f, 720.0f); + AzFramework::SetCameraTransform( + m_cameraState, + AZ::Transform::CreateFromMatrix3x3AndTranslation( + AZ::Matrix3x3::CreateRotationZ(AZ::DegToRad(150.0f)) * AZ::Matrix3x3::CreateRotationX(AZ::DegToRad(-22.0f)), + AZ::Vector3(21.0f, 8.0f, 11.0f))); + + // position the ground entity + AzToolsFramework::SetWorldTransform( + m_entityIdGround, + AZ::Transform::CreateFromMatrix3x3AndTranslation( + AZ::Matrix3x3::CreateRotationY(AZ::DegToRad(40.0f)) * AZ::Matrix3x3::CreateRotationZ(AZ::DegToRad(60.0f)), + AZ::Vector3(14.0f, -6.0f, 5.0f))); + + // select the other entity (a 1x1x1 box) + AzToolsFramework::SelectEntity(m_entityIdBox); + + // expected world position (value taken from editor scenario) + const auto expectedWorldPosition = AZ::Vector3(13.606657f, -2.6753534f, 5.9827675f); + const auto screenPosition = AzFramework::WorldToScreen(expectedWorldPosition, m_cameraState); + + // perform snap action + m_actionDispatcher->CameraState(m_cameraState) + ->MousePosition(screenPosition) + ->KeyboardModifierDown(AzToolsFramework::ViewportInteraction::KeyboardModifier::Control) + ->KeyboardModifierDown(AzToolsFramework::ViewportInteraction::KeyboardModifier::Shift) + ->MouseMButtonDown(); + + // read back the current entity transform after placement + const AZ::Transform finalEntityTransform = AzToolsFramework::GetWorldTransform(m_entityIdBox); + EXPECT_THAT(finalEntityTransform.GetTranslation(), IsCloseTolerance(expectedWorldPosition, 0.01f)); + } } // namespace UnitTest diff --git a/Code/Framework/AzToolsFramework/Tests/EditorVertexSelectionTests.cpp b/Code/Framework/AzToolsFramework/Tests/EditorVertexSelectionTests.cpp index 93010aa63d..228dea6b7c 100644 --- a/Code/Framework/AzToolsFramework/Tests/EditorVertexSelectionTests.cpp +++ b/Code/Framework/AzToolsFramework/Tests/EditorVertexSelectionTests.cpp @@ -10,22 +10,23 @@ #include #include #include +#include +#include +#include +#include +#include #include #include +#include #include #include #include #include #include #include -#include -#include -#include -#include -#include #include -using namespace AzToolsFramework; +#include namespace UnitTest { @@ -42,20 +43,65 @@ namespace UnitTest void Disconnect(); // FixedVerticesRequestBus/VariableVerticesRequestBus ... - bool GetVertex(size_t index, AZ::Vector3& vertex) const override { return m_vertexContainer.GetVertex(index, vertex); } - bool UpdateVertex(size_t index, const AZ::Vector3& vertex) override { return m_vertexContainer.UpdateVertex(index, vertex); }; - void AddVertex(const AZ::Vector3& vertex) override { m_vertexContainer.AddVertex(vertex); } - bool InsertVertex(size_t index, const AZ::Vector3& vertex) override { return m_vertexContainer.InsertVertex(index, vertex); } - bool RemoveVertex(size_t index) override { return m_vertexContainer.RemoveVertex(index); } - void SetVertices(const AZStd::vector& vertices) override { m_vertexContainer.SetVertices(vertices); }; - void ClearVertices() override { m_vertexContainer.Clear(); } - size_t Size() const override { return m_vertexContainer.Size(); } - bool Empty() const override { return m_vertexContainer.Empty(); } + bool GetVertex(size_t index, AZ::Vector3& vertex) const override; + bool UpdateVertex(size_t index, const AZ::Vector3& vertex) override; + void AddVertex(const AZ::Vector3& vertex) override; + bool InsertVertex(size_t index, const AZ::Vector3& vertex) override; + bool RemoveVertex(size_t index) override; + void SetVertices(const AZStd::vector& vertices) override; + void ClearVertices() override; + size_t Size() const override; + bool Empty() const override; private: AZ::VertexContainer m_vertexContainer; }; + bool TestVariableVerticesVertexContainer::GetVertex(size_t index, AZ::Vector3& vertex) const + { + return m_vertexContainer.GetVertex(index, vertex); + } + + bool TestVariableVerticesVertexContainer::UpdateVertex(size_t index, const AZ::Vector3& vertex) + { + return m_vertexContainer.UpdateVertex(index, vertex); + } + + void TestVariableVerticesVertexContainer::AddVertex(const AZ::Vector3& vertex) + { + m_vertexContainer.AddVertex(vertex); + } + + bool TestVariableVerticesVertexContainer::InsertVertex(size_t index, const AZ::Vector3& vertex) + { + return m_vertexContainer.InsertVertex(index, vertex); + } + + bool TestVariableVerticesVertexContainer::RemoveVertex(size_t index) + { + return m_vertexContainer.RemoveVertex(index); + } + + void TestVariableVerticesVertexContainer::SetVertices(const AZStd::vector& vertices) + { + m_vertexContainer.SetVertices(vertices); + } + + void TestVariableVerticesVertexContainer::ClearVertices() + { + m_vertexContainer.Clear(); + } + + size_t TestVariableVerticesVertexContainer::Size() const + { + return m_vertexContainer.Size(); + } + + bool TestVariableVerticesVertexContainer::Empty() const + { + return m_vertexContainer.Empty(); + } + void TestVariableVerticesVertexContainer::Connect(const AZ::EntityId entityId) { AZ::VariableVerticesRequestBus::Handler::BusConnect(entityId); @@ -68,17 +114,18 @@ namespace UnitTest AZ::VariableVerticesRequestBus::Handler::BusDisconnect(); } - class TestEditorVertexSelectionVariable - : public EditorVertexSelectionVariable + class TestEditorVertexSelectionVariable : public AzToolsFramework::EditorVertexSelectionVariable { public: AZ_CLASS_ALLOCATOR(TestEditorVertexSelectionVariable, AZ::SystemAllocator, 0) - void ShowVertexDeletionWarning() override { /*noop*/ } + void ShowVertexDeletionWarning() override + { + // noop + } }; - class EditorVertexSelectionFixture - : public ToolsApplicationFixture + class EditorVertexSelectionFixture : public ToolsApplicationFixture { public: void SetUpEditorFixtureImpl() override @@ -112,26 +159,25 @@ namespace UnitTest void EditorVertexSelectionFixture::RecreateVertexSelection() { + namespace aztf = AzToolsFramework; m_vertexSelection.Create( - AZ::EntityComponentIdPair(m_entityId, TestComponentId), - g_mainManipulatorManagerId, AZStd::make_unique(), - TranslationManipulators::Dimensions::Three, ConfigureTranslationManipulatorAppearance3d); + AZ::EntityComponentIdPair(m_entityId, TestComponentId), aztf::g_mainManipulatorManagerId, + AZStd::make_unique(), aztf::TranslationManipulators::Dimensions::Three, + aztf::ConfigureTranslationManipulatorAppearance3d); } void EditorVertexSelectionFixture::PopulateVertices() { for (size_t vertIndex = 0; vertIndex < EditorVertexSelectionFixture::VertexCount; ++vertIndex) { - InsertVertexAfter( - AZ::EntityComponentIdPair(m_entityId, TestComponentId), 0, AZ::Vector3::CreateZero()); + AzToolsFramework::InsertVertexAfter(AZ::EntityComponentIdPair(m_entityId, TestComponentId), 0, AZ::Vector3::CreateZero()); } } void EditorVertexSelectionFixture::ClearVertices() { for (size_t vertIndex = 0; vertIndex < EditorVertexSelectionFixture::VertexCount; ++vertIndex) { - SafeRemoveVertex( - AZ::EntityComponentIdPair(m_entityId, TestComponentId), 0); + AzToolsFramework::SafeRemoveVertex(AZ::EntityComponentIdPair(m_entityId, TestComponentId), 0); } } @@ -188,7 +234,7 @@ namespace UnitTest /////////////////////////////////////////////////////////////////////////////////////////////////////////////// // When // just provide a placeholder mouse interaction event in this case - m_vertexSelection.SnapVerticesToTerrain(ViewportInteraction::MouseInteractionEvent{}); + m_vertexSelection.SnapVerticesToSurface(AzToolsFramework::ViewportInteraction::MouseInteractionEvent{}); /////////////////////////////////////////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////////////////////////////////////// @@ -197,8 +243,7 @@ namespace UnitTest /////////////////////////////////////////////////////////////////////////////////////////////////////////////// } - using EditorVertexSelectionManipulatorFixture = - IndirectCallManipulatorViewportInteractionFixtureMixin; + using EditorVertexSelectionManipulatorFixture = IndirectCallManipulatorViewportInteractionFixtureMixin; TEST_F(EditorVertexSelectionManipulatorFixture, CannotDeleteAllVertices) { @@ -206,25 +251,23 @@ namespace UnitTest const auto entityComponentIdPair = AZ::EntityComponentIdPair(m_entityId, TestComponentId); - const float horizontalPositions[] = {-1.5f, -0.5f, 0.5f, 1.5f}; - for (size_t vertIndex = 0; vertIndex < std::size(horizontalPositions); ++vertIndex) + const float horizontalPositions[] = { -1.5f, -0.5f, 0.5f, 1.5f }; + for (size_t vertIndex = 0; vertIndex < AZStd::size(horizontalPositions); ++vertIndex) { - InsertVertexAfter( - entityComponentIdPair, vertIndex, AZ::Vector3(horizontalPositions[vertIndex], 5.0f, 0.0f)); + AzToolsFramework::InsertVertexAfter(entityComponentIdPair, vertIndex, AZ::Vector3(horizontalPositions[vertIndex], 5.0f, 0.0f)); } - // rebuild the vertex selection after adding the new verts + // rebuild the vertex selection after adding the new vertices RecreateVertexSelection(); // build a vector of the vertex positions in screen space AZStd::vector vertexScreenPositions; - for (size_t vertIndex = 0; vertIndex < std::size(horizontalPositions); ++vertIndex) + for (size_t vertIndex = 0; vertIndex < AZStd::size(horizontalPositions); ++vertIndex) { - AZ::Vector3 localVertex; + AZ::Vector3 localVertex = AZ::Vector3::CreateZero(); bool found = false; AZ::FixedVerticesRequestBus::EventResult( - found, m_entityId, &AZ::FixedVerticesRequestBus::Handler::GetVertex, - vertIndex, localVertex); + found, m_entityId, &AZ::FixedVerticesRequestBus::Handler::GetVertex, vertIndex, localVertex); if (found) { @@ -267,9 +310,9 @@ namespace UnitTest const auto entityComponentIdPair = AZ::EntityComponentIdPair(m_entityId, TestComponentId); // add a single vertex (in front of the camera) - InsertVertexAfter(entityComponentIdPair, 0, AZ::Vector3::CreateAxisY(5.0f)); + AzToolsFramework::InsertVertexAfter(entityComponentIdPair, 0, AZ::Vector3::CreateAxisY(5.0f)); - // rebuild the vertex selection after adding the new verts + // rebuild the vertex selection after adding the new vertices RecreateVertexSelection(); AzFramework::ScreenPoint vertexScreenPosition; @@ -300,4 +343,132 @@ namespace UnitTest // deleting the last vertex through a manipulator is disallowed - size should remain the same EXPECT_THAT(vertexCountAfter, Eq(1)); } + + static AZ::EntityId CreateEntityForVertexIntersectionPlacement(EditorVertexSelectionManipulatorFixture& fixture) + { + auto* app = fixture.GetApplication(); + app->RegisterComponentDescriptor(BoundsTestComponent::CreateDescriptor()); + app->RegisterComponentDescriptor(RenderGeometryIntersectionTestComponent::CreateDescriptor()); + + AZ::Entity* entityGround = nullptr; + AZ::EntityId entityIdGround = CreateDefaultEditorEntity("EntityGround", &entityGround); + + entityGround->Deactivate(); + auto ground = entityGround->CreateComponent(); + entityGround->Activate(); + + ground->m_localBounds = AZ::Aabb::CreateFromMinMax(AZ::Vector3(-10.0f, -10.0f, -0.5f), AZ::Vector3(10.0f, 10.0f, 0.5f)); + + return entityIdGround; + } + + static AZStd::vector SetupVertices( + const AZ::EntityId entityId, EditorVertexSelectionManipulatorFixture& fixture) + { + const auto entityComponentIdPair = AZ::EntityComponentIdPair(entityId, TestComponentId); + const float horizontalPositions[] = { -3.0f, -1.0f, 1.0f, 3.0f }; + for (size_t vertIndex = 0; vertIndex < AZStd::size(horizontalPositions); ++vertIndex) + { + AzToolsFramework::InsertVertexAfter(entityComponentIdPair, vertIndex, AZ::Vector3(horizontalPositions[vertIndex], 0.0f, 0.0f)); + } + + // rebuild the vertex selection after adding the new vertices + fixture.RecreateVertexSelection(); + + // build a vector of the vertex positions in screen space + AZStd::vector vertexScreenPositions; + for (size_t vertIndex = 0; vertIndex < AZStd::size(horizontalPositions); ++vertIndex) + { + AZ::Vector3 localVertex; + bool found = false; + AZ::FixedVerticesRequestBus::EventResult( + found, entityId, &AZ::FixedVerticesRequestBus::Handler::GetVertex, vertIndex, localVertex); + + if (found) + { + const AZ::Vector3 worldVertex = AzToolsFramework::GetWorldTransform(entityId).TransformPoint(localVertex); + vertexScreenPositions.push_back(AzFramework::WorldToScreen(worldVertex, fixture.m_cameraState)); + } + } + + return vertexScreenPositions; + } + + AzToolsFramework::ViewportInteraction::MouseInteractionEvent BuildMiddleMouseDownEvent( + const AzFramework::ScreenPoint& screenPosition, const AzFramework::ViewportId viewportId) + { + AzToolsFramework::ViewportInteraction::MousePick mousePick; + mousePick.m_screenCoordinates = screenPosition; + + AzToolsFramework::ViewportInteraction::MouseInteraction mouseInteraction; + mouseInteraction.m_interactionId.m_cameraId = AZ::EntityId(); + mouseInteraction.m_interactionId.m_viewportId = viewportId; + mouseInteraction.m_mouseButtons = + AzToolsFramework::ViewportInteraction::MouseButtonsFromButton(AzToolsFramework::ViewportInteraction::MouseButton::Middle); + mouseInteraction.m_mousePick = mousePick; + mouseInteraction.m_keyboardModifiers = AzToolsFramework::ViewportInteraction::KeyboardModifiers( + static_cast(AzToolsFramework::ViewportInteraction::KeyboardModifier::Shift) | + static_cast(AzToolsFramework::ViewportInteraction::KeyboardModifier::Ctrl)); + + return AzToolsFramework::ViewportInteraction::MouseInteractionEvent( + mouseInteraction, AzToolsFramework::ViewportInteraction::MouseEvent::Down, /*captured=*/false); + } + + TEST_F(EditorVertexSelectionManipulatorFixture, VertexPlacedWhereIntersectionPointIsFoundWithCustomReferenceSpace) + { + const AZ::EntityId entityIdGround = CreateEntityForVertexIntersectionPlacement(*this); + + // position ground + AzToolsFramework::SetWorldTransform( + entityIdGround, + AZ::Transform::CreateFromMatrix3x3AndTranslation( + AZ::Matrix3x3::CreateRotationX(AZ::DegToRad(-20.0f)) * AZ::Matrix3x3::CreateRotationY(AZ::DegToRad(-40.0f)) * + AZ::Matrix3x3::CreateRotationZ(AZ::DegToRad(60.0f)), + AZ::Vector3(14.0f, -6.0f, 5.0f))); + + // camera (go to position format) - 12.00, 18.00, 16.00, -38.00, -175.00 + m_cameraState.m_viewportSize = AZ::Vector2(1280.0f, 720.0f); + AzFramework::SetCameraTransform( + m_cameraState, + AZ::Transform::CreateFromMatrix3x3AndTranslation( + AZ::Matrix3x3::CreateRotationZ(AZ::DegToRad(-175.0f)) * AZ::Matrix3x3::CreateRotationX(AZ::DegToRad(-38.0f)), + AZ::Vector3(12.0f, 18.0f, 16.0f))); + + // create orientated and scaled transform for vertex selection entity transform + auto vertexSelectionTransform = AZ::Transform::CreateFromMatrix3x3AndTranslation( + AZ::Matrix3x3::CreateRotationZ(AZ::DegToRad(45.0f)), AZ::Vector3(14.0f, 7.0f, 5.0f)); + vertexSelectionTransform.MultiplyByUniformScale(3.0f); + + // set the initial starting position of the vertex selection + AzToolsFramework::SetWorldTransform(m_entityId, vertexSelectionTransform); + + auto vertexScreenPositions = SetupVertices(m_entityId, *this); + + // press and drag the mouse (starting where the surface manipulator is) + // select each vertex (by holding ctrl) + m_actionDispatcher->CameraState(m_cameraState)->MousePosition(vertexScreenPositions[0])->MouseLButtonDown()->MouseLButtonUp(); + + const auto finalPositionWorld = AZ::Vector3(14.3573294f, -8.94695091f, 7.08627319f); + // calculate the position in screen space of the final position of the entity + const auto finalPositionScreen = AzFramework::WorldToScreen(finalPositionWorld, m_cameraState); + + auto middleMouseDownEvent = + BuildMiddleMouseDownEvent(finalPositionScreen, m_viewportManipulatorInteraction->GetViewportInteraction().GetViewportId()); + + // explicitly handle mouse event in vertex selection instance + m_vertexSelection.HandleMouse(middleMouseDownEvent); + + // read back the position of the vertex now + AZ::Vector3 localVertex = AZ::Vector3::CreateZero(); + bool found = false; + AZ::FixedVerticesRequestBus::EventResult( + found, m_entityId, &AZ::FixedVerticesRequestBus::Handler::GetVertex, 0, localVertex); + + // transform to world space + const AZ::Vector3 worldVertex = vertexSelectionTransform.TransformPoint(localVertex); + + EXPECT_THAT(found, ::testing::IsTrue()); + // ensure final world positions match + EXPECT_THAT(worldVertex, IsCloseTolerance(finalPositionWorld, 0.01f)); + } } // namespace UnitTest diff --git a/Code/Framework/AzToolsFramework/Tests/Viewport/ViewportInteractionTests.cpp b/Code/Framework/AzToolsFramework/Tests/Viewport/ViewportInteractionTests.cpp new file mode 100644 index 0000000000..fdcc8553f2 --- /dev/null +++ b/Code/Framework/AzToolsFramework/Tests/Viewport/ViewportInteractionTests.cpp @@ -0,0 +1,76 @@ +/* + * 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 + +namespace UnitTest +{ + class IndirectCallViewportInteractionIntersectionFixture : public ToolsApplicationFixture + { + public: + void SetUpEditorFixtureImpl() override + { + auto* app = GetApplication(); + // register a simple component implementing BoundsRequestBus and EditorComponentSelectionRequestsBus + app->RegisterComponentDescriptor(BoundsTestComponent::CreateDescriptor()); + // register a component implementing RenderGeometry::IntersectionRequestBus + app->RegisterComponentDescriptor(RenderGeometryIntersectionTestComponent::CreateDescriptor()); + + AZ::Entity* entityGround = nullptr; + m_entityIdGround = CreateDefaultEditorEntity("EntityGround", &entityGround); + + entityGround->Deactivate(); + auto ground = entityGround->CreateComponent(); + entityGround->Activate(); + + ground->m_localBounds = AZ::Aabb::CreateFromMinMax(AZ::Vector3(-10.0f, -10.0f, -0.5f), AZ::Vector3(10.0f, 10.0f, 0.5f)); + } + + AZ::EntityId m_entityIdGround; + }; + + using IndirectCallManipulatorViewportInteractionIntersectionFixture = + IndirectCallManipulatorViewportInteractionFixtureMixin; + + TEST_F(IndirectCallManipulatorViewportInteractionIntersectionFixture, FindClosestPickIntersectionReturnsExpectedSurfacePoint) + { + // camera - 21.00, 8.00, 11.00, -22.00, 150.00 + m_cameraState.m_viewportSize = AZ::Vector2(1280.0f, 720.0f); + AzFramework::SetCameraTransform( + m_cameraState, + AZ::Transform::CreateFromMatrix3x3AndTranslation( + AZ::Matrix3x3::CreateRotationZ(AZ::DegToRad(150.0f)) * AZ::Matrix3x3::CreateRotationX(AZ::DegToRad(-22.0f)), + AZ::Vector3(21.0f, 8.0f, 11.0f))); + + m_actionDispatcher->CameraState(m_cameraState); + + AzToolsFramework::SetWorldTransform( + m_entityIdGround, + AZ::Transform::CreateFromMatrix3x3AndTranslation( + AZ::Matrix3x3::CreateRotationY(AZ::DegToRad(40.0f)) * AZ::Matrix3x3::CreateRotationZ(AZ::DegToRad(60.0f)), + AZ::Vector3(14.0f, -6.0f, 5.0f))); + + // expected world position (value taken from editor scenario) + const auto expectedWorldPosition = AZ::Vector3(13.606657f, -2.6753534f, 5.9827675f); + const auto screenPosition = AzFramework::WorldToScreen(expectedWorldPosition, m_cameraState); + + // perform ray intersection against mesh + const auto worldIntersectionPoint = AzToolsFramework::FindClosestPickIntersection( + m_viewportManipulatorInteraction->GetViewportInteraction().GetViewportId(), screenPosition, + AzToolsFramework::EditorPickRayLength, AzToolsFramework::GetDefaultEntityPlacementDistance()); + + EXPECT_THAT(worldIntersectionPoint, IsCloseTolerance(expectedWorldPosition, 0.01f)); + } +} // namespace UnitTest diff --git a/Code/Framework/AzToolsFramework/Tests/aztoolsframeworktests_files.cmake b/Code/Framework/AzToolsFramework/Tests/aztoolsframeworktests_files.cmake index 9e052de983..8e0297fb1f 100644 --- a/Code/Framework/AzToolsFramework/Tests/aztoolsframeworktests_files.cmake +++ b/Code/Framework/AzToolsFramework/Tests/aztoolsframeworktests_files.cmake @@ -136,5 +136,6 @@ set(FILES Viewport/ViewportUiDisplayTests.cpp Viewport/ViewportUiManagerTests.cpp Viewport/ViewportUiWidgetManagerTests.cpp + Viewport/ViewportInteractionTests.cpp Visibility/EditorVisibilityTests.cpp ) diff --git a/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Viewport/ViewportInteractionImpl.cpp b/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Viewport/ViewportInteractionImpl.cpp index 1a015c167c..7ae3175e03 100644 --- a/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Viewport/ViewportInteractionImpl.cpp +++ b/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Viewport/ViewportInteractionImpl.cpp @@ -50,10 +50,7 @@ namespace AtomToolsFramework 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 }; + return AzToolsFramework::ViewportInteraction::ViewportScreenToWorldRay(GetCameraState(), screenPosition); } float ViewportInteractionImpl::DeviceScalingFactor() From 768a196b63c45b1d09fc2c43a6b1068ab22212f6 Mon Sep 17 00:00:00 2001 From: rgba16f <82187279+rgba16f@users.noreply.github.com> Date: Tue, 30 Nov 2021 10:11:26 -0600 Subject: [PATCH 42/58] Add a way to set the vsync_interval CVar from code (#5813) * Add a way to set the render vsync from code Signed-off-by: rgba16f <82187279+rgba16f@users.noreply.github.com> * Update change with PR feedback. Missing whitespace plus a comment on why the assignment is outside the value changed check Signed-off-by: rgba16f <82187279+rgba16f@users.noreply.github.com> --- .../AzCore/AzCore/Console/ConsoleDataWrapper.inl | 9 +++++++++ .../AzFramework/AzFramework/Windowing/NativeWindow.cpp | 7 +++++++ .../AzFramework/AzFramework/Windowing/NativeWindow.h | 1 + .../AzFramework/AzFramework/Windowing/WindowBus.h | 4 ++++ .../AzFramework/Tests/Mocks/MockWindowRequests.h | 1 + .../AtomToolsFramework/Viewport/RenderViewportWidget.h | 1 + .../Code/Source/Viewport/RenderViewportWidget.cpp | 7 +++++++ 7 files changed, 30 insertions(+) diff --git a/Code/Framework/AzCore/AzCore/Console/ConsoleDataWrapper.inl b/Code/Framework/AzCore/AzCore/Console/ConsoleDataWrapper.inl index 46774f23b2..b3a59d287d 100644 --- a/Code/Framework/AzCore/AzCore/Console/ConsoleDataWrapper.inl +++ b/Code/Framework/AzCore/AzCore/Console/ConsoleDataWrapper.inl @@ -32,7 +32,16 @@ namespace AZ template inline void ConsoleDataWrapper::operator =(const BASE_TYPE& rhs) { + const BASE_TYPE currentValue = this->m_value; + // Do the value assignment outside new value check. + // Client code can supply a type for m_value that overrides the operator= function and trigger side effects + // in the operator= function body. Doing the assignment outside the value change check avoids those side + // effects not being triggered because AzCore believes the value wouldn't change. this->m_value = rhs; + if (currentValue != rhs) + { + InvokeCallback(); + } } template diff --git a/Code/Framework/AzFramework/AzFramework/Windowing/NativeWindow.cpp b/Code/Framework/AzFramework/AzFramework/Windowing/NativeWindow.cpp index c89d12a8ae..bb3c5e4388 100644 --- a/Code/Framework/AzFramework/AzFramework/Windowing/NativeWindow.cpp +++ b/Code/Framework/AzFramework/AzFramework/Windowing/NativeWindow.cpp @@ -143,6 +143,13 @@ namespace AzFramework return vsync_interval; } + bool NativeWindow::SetSyncInterval(uint32_t newSyncInterval) + { + vsync_interval = newSyncInterval; + return true; + } + + /*static*/ bool NativeWindow::GetFullScreenStateOfDefaultWindow() { NativeWindowHandle defaultWindowHandle = nullptr; diff --git a/Code/Framework/AzFramework/AzFramework/Windowing/NativeWindow.h b/Code/Framework/AzFramework/AzFramework/Windowing/NativeWindow.h index 0eb699475f..9c844034cb 100644 --- a/Code/Framework/AzFramework/AzFramework/Windowing/NativeWindow.h +++ b/Code/Framework/AzFramework/AzFramework/Windowing/NativeWindow.h @@ -132,6 +132,7 @@ namespace AzFramework void ToggleFullScreenState() override; float GetDpiScaleFactor() const override; uint32_t GetSyncInterval() const override; + bool SetSyncInterval(uint32_t newSyncInterval) override; uint32_t GetDisplayRefreshRate() const override; //! Get the full screen state of the default window. diff --git a/Code/Framework/AzFramework/AzFramework/Windowing/WindowBus.h b/Code/Framework/AzFramework/AzFramework/Windowing/WindowBus.h index d3bd0ce82c..faae925580 100644 --- a/Code/Framework/AzFramework/AzFramework/Windowing/WindowBus.h +++ b/Code/Framework/AzFramework/AzFramework/Windowing/WindowBus.h @@ -78,6 +78,10 @@ namespace AzFramework //! Returns the sync interval which tells the drivers the number of v-blanks to synchronize with virtual uint32_t GetSyncInterval() const = 0; + //! Sets the sync interval which tells the drivers the number of v-blanks to synchronize with + //! Returns if the sync interval was succesfully set + virtual bool SetSyncInterval(uint32_t newSyncInterval) = 0; + //! Returns the refresh rate of the main display virtual uint32_t GetDisplayRefreshRate() const = 0; }; diff --git a/Code/Framework/AzFramework/Tests/Mocks/MockWindowRequests.h b/Code/Framework/AzFramework/Tests/Mocks/MockWindowRequests.h index 63f73d0b28..a166df19b4 100644 --- a/Code/Framework/AzFramework/Tests/Mocks/MockWindowRequests.h +++ b/Code/Framework/AzFramework/Tests/Mocks/MockWindowRequests.h @@ -36,6 +36,7 @@ namespace UnitTest MOCK_METHOD0(ToggleFullScreenState, void()); MOCK_CONST_METHOD0(GetDpiScaleFactor, float()); MOCK_CONST_METHOD0(GetSyncInterval, uint32_t()); + MOCK_METHOD1(SetSyncInterval, bool(uint32_t)); MOCK_CONST_METHOD0(GetDisplayRefreshRate, uint32_t()); }; } // namespace UnitTest 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 45838a5378..3393897936 100644 --- a/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Viewport/RenderViewportWidget.h +++ b/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Viewport/RenderViewportWidget.h @@ -116,6 +116,7 @@ namespace AtomToolsFramework void ToggleFullScreenState() override; float GetDpiScaleFactor() const override; uint32_t GetSyncInterval() const override; + bool SetSyncInterval(uint32_t newSyncInterval) override; uint32_t GetDisplayRefreshRate() const override; protected: diff --git a/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Viewport/RenderViewportWidget.cpp b/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Viewport/RenderViewportWidget.cpp index 759f939382..f6efdc57b8 100644 --- a/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Viewport/RenderViewportWidget.cpp +++ b/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Viewport/RenderViewportWidget.cpp @@ -395,4 +395,11 @@ namespace AtomToolsFramework { return 1; } + + // Editor ignores requests to change the sync interval + bool RenderViewportWidget::SetSyncInterval(uint32_t /*ignored*/) + { + return false; + } + } //namespace AtomToolsFramework From 4dd9e94bc34c3108bad5b8203eebae8ec181b94a Mon Sep 17 00:00:00 2001 From: srikappa-amzn <82230713+srikappa-amzn@users.noreply.github.com> Date: Tue, 30 Nov 2021 21:50:25 +0530 Subject: [PATCH 43/58] Add tests for deleting an entity from the level and from another prefab (#5839) * Added tests for deleting entity under level and other prefabs Signed-off-by: srikappa-amzn <82230713+srikappa-amzn@users.noreply.github.com> * Added class comments and improved variable names Signed-off-by: srikappa-amzn <82230713+srikappa-amzn@users.noreply.github.com> * Called the reflect function of PrefabFocusHandler from PrefabSystemComponent Signed-off-by: srikappa-amzn <82230713+srikappa-amzn@users.noreply.github.com> * Added function comments and made an if statement to be one line Signed-off-by: srikappa-amzn <82230713+srikappa-amzn@users.noreply.github.com> --- .../editor_entity_utils.py | 11 ++++ .../Gem/PythonTests/Prefab/TestSuite_Main.py | 8 +++ .../DeleteEntity_UnderAnotherPrefab.py | 52 +++++++++++++++++++ .../DeleteEntity_UnderLevelPrefab.py | 37 +++++++++++++ .../Prefab/PrefabFocusHandler.cpp | 14 +++++ .../Prefab/PrefabFocusHandler.h | 8 +-- .../Prefab/PrefabFocusPublicInterface.h | 14 +++++ .../Prefab/PrefabSystemComponent.cpp | 1 + 8 files changed, 142 insertions(+), 3 deletions(-) create mode 100644 AutomatedTesting/Gem/PythonTests/Prefab/tests/delete_entity/DeleteEntity_UnderAnotherPrefab.py create mode 100644 AutomatedTesting/Gem/PythonTests/Prefab/tests/delete_entity/DeleteEntity_UnderLevelPrefab.py diff --git a/AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/editor_python_test_tools/editor_entity_utils.py b/AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/editor_python_test_tools/editor_entity_utils.py index 59e454479c..309601b0ba 100644 --- a/AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/editor_python_test_tools/editor_entity_utils.py +++ b/AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/editor_python_test_tools/editor_entity_utils.py @@ -459,3 +459,14 @@ class EditorEntity: """ new_translation = convert_to_azvector3(new_translation) azlmbr.components.TransformBus(azlmbr.bus.Event, "SetLocalTranslation", self.id, new_translation) + + # Use this only when prefab system is enabled as it will fail otherwise. + def focus_on_owning_prefab(self) -> None: + """ + Focuses on the owning prefab instance of the given entity. + :param entity: The entity used to fetch the owning prefab to focus on. + """ + + assert self.id.isValid(), "A valid entity id is required to focus on its owning prefab." + focus_prefab_result = azlmbr.prefab.PrefabFocusPublicRequestBus(bus.Broadcast, "FocusOnOwningPrefab", self.id) + assert focus_prefab_result.IsSuccess(), f"Prefab operation 'FocusOnOwningPrefab' failed. Error: {focus_prefab_result.GetError()}" diff --git a/AutomatedTesting/Gem/PythonTests/Prefab/TestSuite_Main.py b/AutomatedTesting/Gem/PythonTests/Prefab/TestSuite_Main.py index c1d4836342..6e1f94d358 100644 --- a/AutomatedTesting/Gem/PythonTests/Prefab/TestSuite_Main.py +++ b/AutomatedTesting/Gem/PythonTests/Prefab/TestSuite_Main.py @@ -61,3 +61,11 @@ class TestAutomation(TestAutomationBase): def test_CreatePrefab_UnderAnotherPrefab(self, request, workspace, editor, launcher_platform): from Prefab.tests.create_prefab import CreatePrefab_UnderAnotherPrefab as test_module self._run_prefab_test(request, workspace, editor, test_module, autotest_mode=False) + + def test_DeleteEntity_UnderAnotherPrefab(self, request, workspace, editor, launcher_platform): + from Prefab.tests.delete_entity import DeleteEntity_UnderAnotherPrefab as test_module + self._run_prefab_test(request, workspace, editor, test_module, autotest_mode=False) + + def test_DeleteEntity_UnderLevelPrefab(self, request, workspace, editor, launcher_platform): + from Prefab.tests.delete_entity import DeleteEntity_UnderLevelPrefab as test_module + self._run_prefab_test(request, workspace, editor, test_module, autotest_mode=False) diff --git a/AutomatedTesting/Gem/PythonTests/Prefab/tests/delete_entity/DeleteEntity_UnderAnotherPrefab.py b/AutomatedTesting/Gem/PythonTests/Prefab/tests/delete_entity/DeleteEntity_UnderAnotherPrefab.py new file mode 100644 index 0000000000..deaaaedf30 --- /dev/null +++ b/AutomatedTesting/Gem/PythonTests/Prefab/tests/delete_entity/DeleteEntity_UnderAnotherPrefab.py @@ -0,0 +1,52 @@ +""" +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 +""" + +def DeleteEntity_UnderAnotherPrefab(): + """ + Test description: + - Creates an entity. + - Creates a prefab out of the above entity. + - Focuses on the created prefab and destroys the entity within. + Checks that the entity is correctly destroyed. + """ + + from editor_python_test_tools.editor_entity_utils import EditorEntity + from editor_python_test_tools.prefab_utils import Prefab + + import Prefab.tests.PrefabTestUtils as prefab_test_utils + + prefab_test_utils.open_base_tests_level() + + PREFAB_FILE_NAME = 'some_prefab' + + # Creates a new entity at the root level + entity = EditorEntity.create_editor_entity() + assert entity.id.IsValid(), "Couldn't create entity." + + # Asserts if prefab creation doesn't succeed + child_prefab, child_instance = Prefab.create_prefab([entity], PREFAB_FILE_NAME) + child_entity_ids_inside_prefab = child_instance.get_direct_child_entities() + assert len( + child_entity_ids_inside_prefab) == 1, f"{len(child_entity_ids_inside_prefab)} entities found inside prefab" \ + f" when there should have been just 1 entity" + + child_entity_inside_prefab = child_entity_ids_inside_prefab[0] + child_entity_inside_prefab.focus_on_owning_prefab() + + child_entity_inside_prefab.delete() + + # Wait till prefab propagation finishes before validating entity deletion. + azlmbr.legacy.general.idle_wait_frames(1) + + child_entity_ids_inside_prefab = child_instance.get_direct_child_entities() + assert len( + child_entity_ids_inside_prefab) == 0, f"{len(child_entity_ids_inside_prefab)} entities found inside prefab" \ + f" when there should have been 0 entities" + +if __name__ == "__main__": + from editor_python_test_tools.utils import Report + Report.start_test(DeleteEntity_UnderAnotherPrefab) diff --git a/AutomatedTesting/Gem/PythonTests/Prefab/tests/delete_entity/DeleteEntity_UnderLevelPrefab.py b/AutomatedTesting/Gem/PythonTests/Prefab/tests/delete_entity/DeleteEntity_UnderLevelPrefab.py new file mode 100644 index 0000000000..807427718c --- /dev/null +++ b/AutomatedTesting/Gem/PythonTests/Prefab/tests/delete_entity/DeleteEntity_UnderLevelPrefab.py @@ -0,0 +1,37 @@ +""" +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 +""" + +def DeleteEntity_UnderLevelPrefab(): + """ + Test description: + - Creates an entity. + - Destroys the created entity. + Checks that the entity is correctly destroyed. + """ + + from editor_python_test_tools.editor_entity_utils import EditorEntity + import Prefab.tests.PrefabTestUtils as prefab_test_utils + + prefab_test_utils.open_base_tests_level() + + # Creates a new Entity at the root level + # Asserts if creation didn't succeed + entity = EditorEntity.create_editor_entity_at((100.0, 100.0, 100.0), name = "TestEntity") + assert entity.id.IsValid(), "Couldn't create entity" + + level_container_entity = EditorEntity(entity.get_parent_id()) + entity.delete() + + # Wait till prefab propagation finishes before validating entity deletion. + azlmbr.legacy.general.idle_wait_frames(1) + level_container_child_entities_count = len(level_container_entity.get_children_ids()) + assert level_container_child_entities_count == 0, f"The level still has {level_container_child_entities_count}" \ + f" children when it should have 0." + +if __name__ == "__main__": + from editor_python_test_tools.utils import Report + Report.start_test(DeleteEntity_UnderLevelPrefab) diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabFocusHandler.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabFocusHandler.cpp index f20c11a1d8..2ab68bfc10 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabFocusHandler.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabFocusHandler.cpp @@ -34,10 +34,12 @@ namespace AzToolsFramework::Prefab PrefabPublicNotificationBus::Handler::BusConnect(); AZ::Interface::Register(this); AZ::Interface::Register(this); + PrefabFocusPublicRequestBus::Handler::BusConnect(); } PrefabFocusHandler::~PrefabFocusHandler() { + PrefabFocusPublicRequestBus::Handler::BusDisconnect(); AZ::Interface::Unregister(this); AZ::Interface::Unregister(this); PrefabPublicNotificationBus::Handler::BusDisconnect(); @@ -45,6 +47,18 @@ namespace AzToolsFramework::Prefab EditorEntityInfoNotificationBus::Handler::BusDisconnect(); } + void PrefabFocusHandler::Reflect(AZ::ReflectContext* context) + { + if (AZ::BehaviorContext* behaviorContext = azrtti_cast(context); behaviorContext) + { + behaviorContext->EBus("PrefabFocusPublicRequestBus") + ->Attribute(AZ::Script::Attributes::Scope, AZ::Script::Attributes::ScopeFlags::Automation) + ->Attribute(AZ::Script::Attributes::Category, "Prefab") + ->Attribute(AZ::Script::Attributes::Module, "prefab") + ->Event("FocusOnOwningPrefab", &PrefabFocusPublicInterface::FocusOnOwningPrefab); + } + } + void PrefabFocusHandler::InitializeEditorInterfaces() { m_containerEntityInterface = AZ::Interface::Get(); diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabFocusHandler.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabFocusHandler.h index 2e23059a01..b02106d69d 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabFocusHandler.h +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabFocusHandler.h @@ -30,8 +30,8 @@ namespace AzToolsFramework::Prefab //! Handles Prefab Focus mode, determining which prefab file entity changes will target. class PrefabFocusHandler final - : private PrefabFocusInterface - , private PrefabFocusPublicInterface + : public PrefabFocusPublicRequestBus::Handler + , private PrefabFocusInterface , private PrefabPublicNotificationBus::Handler , private EditorEntityContextNotificationBus::Handler , private EditorEntityInfoNotificationBus::Handler @@ -42,13 +42,15 @@ namespace AzToolsFramework::Prefab PrefabFocusHandler(); ~PrefabFocusHandler(); + static void Reflect(AZ::ReflectContext* context); + // PrefabFocusInterface overrides ... void InitializeEditorInterfaces() override; PrefabFocusOperationResult FocusOnPrefabInstanceOwningEntityId(AZ::EntityId entityId) override; TemplateId GetFocusedPrefabTemplateId(AzFramework::EntityContextId entityContextId) const override; InstanceOptionalReference GetFocusedPrefabInstance(AzFramework::EntityContextId entityContextId) const override; - // PrefabFocusPublicInterface overrides ... + // PrefabFocusPublicInterface and PrefabFocusPublicRequestBus overrides ... PrefabFocusOperationResult FocusOnOwningPrefab(AZ::EntityId entityId) override; PrefabFocusOperationResult FocusOnParentOfFocusedPrefab(AzFramework::EntityContextId entityContextId) override; PrefabFocusOperationResult FocusOnPathIndex(AzFramework::EntityContextId entityContextId, int index) override; diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabFocusPublicInterface.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabFocusPublicInterface.h index 2fc9ef6b9a..2c0e95f1cc 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabFocusPublicInterface.h +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabFocusPublicInterface.h @@ -58,4 +58,18 @@ namespace AzToolsFramework::Prefab virtual const int GetPrefabFocusPathLength(AzFramework::EntityContextId entityContextId) const = 0; }; + /** + * The primary purpose of this bus is to facilitate writing automated tests for prefab focus mode. + * If you would like to integrate prefabs focus mode into your system, please call PrefabFocusPublicInterface + * for better performance. + */ + class PrefabFocusPublicRequests + : public AZ::EBusTraits + { + public: + static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Single; + }; + + using PrefabFocusPublicRequestBus = AZ::EBus; + } // namespace AzToolsFramework::Prefab diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabSystemComponent.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabSystemComponent.cpp index 62d7a6ac1d..ed16606413 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabSystemComponent.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabSystemComponent.cpp @@ -60,6 +60,7 @@ namespace AzToolsFramework AzToolsFramework::Prefab::PrefabConversionUtils::PrefabCatchmentProcessor::Reflect(context); AzToolsFramework::Prefab::PrefabConversionUtils::EditorInfoRemover::Reflect(context); PrefabPublicRequestHandler::Reflect(context); + PrefabFocusHandler::Reflect(context); PrefabLoader::Reflect(context); PrefabSystemScriptingHandler::Reflect(context); From 12efc846325422137e3dce89b396842912a0f6b6 Mon Sep 17 00:00:00 2001 From: Scott Romero <24445312+AMZN-ScottR@users.noreply.github.com> Date: Tue, 30 Nov 2021 08:27:27 -0800 Subject: [PATCH 44/58] [development] minor Profiler gem fixes (#5473) Fixed incorrect frame boundary guess when loading a profile capture Added some missing default initializers Removed implicit dependency on Atom timing marker constants Fixed issue with small visualizer viewport bounds when loading a saved capture Signed-off-by: AMZN-ScottR 24445312+AMZN-ScottR@users.noreply.github.com --- .../Statistics/StatisticalProfilerProxy.h | 16 ++++++++ .../AzCore/Statistics/StatisticsManager.h | 14 ++++++- Gems/Profiler/Code/Source/CpuProfilerImpl.h | 2 +- .../Profiler/Code/Source/ImGuiCpuProfiler.cpp | 41 +++++++++++-------- Gems/Profiler/Code/Source/ImGuiCpuProfiler.h | 7 ++-- 5 files changed, 57 insertions(+), 23 deletions(-) diff --git a/Code/Framework/AzCore/AzCore/Statistics/StatisticalProfilerProxy.h b/Code/Framework/AzCore/AzCore/Statistics/StatisticalProfilerProxy.h index 278b2ecc98..7fae0ca354 100644 --- a/Code/Framework/AzCore/AzCore/Statistics/StatisticalProfilerProxy.h +++ b/Code/Framework/AzCore/AzCore/Statistics/StatisticalProfilerProxy.h @@ -157,6 +157,22 @@ namespace AZ::Statistics } } + void GetAllStatistics(AZStd::vector& stats) + { + for (auto& iter : m_profilers) + { + iter.second.m_profiler.GetStatsManager().GetAllStatistics(stats); + } + } + + void GetAllStatisticsOfUnits(AZStd::vector& stats, const char* units) + { + for (auto& iter : m_profilers) + { + iter.second.m_profiler.GetStatsManager().GetAllStatisticsOfUnits(stats, units); + } + } + private: struct ProfilerInfo { diff --git a/Code/Framework/AzCore/AzCore/Statistics/StatisticsManager.h b/Code/Framework/AzCore/AzCore/Statistics/StatisticsManager.h index 5984701f4e..dc97de40c1 100644 --- a/Code/Framework/AzCore/AzCore/Statistics/StatisticsManager.h +++ b/Code/Framework/AzCore/AzCore/Statistics/StatisticsManager.h @@ -56,13 +56,25 @@ namespace AZ void GetAllStatistics(AZStd::vector& vector) { - for (auto const& it : m_statistics) + for (const auto& it : m_statistics) { NamedRunningStatistic* stat = it.second; vector.push_back(stat); } } + void GetAllStatisticsOfUnits(AZStd::vector& vector, const char* units) + { + for (const auto& it : m_statistics) + { + NamedRunningStatistic* stat = it.second; + if (stat->GetUnits() == units) + { + vector.push_back(stat); + } + } + } + //! Helper method to apply units to statistics with empty units string. AZ::u32 ApplyUnits(const AZStd::string& units) { diff --git a/Gems/Profiler/Code/Source/CpuProfilerImpl.h b/Gems/Profiler/Code/Source/CpuProfilerImpl.h index 6611fbd1e5..c97e45e69c 100644 --- a/Gems/Profiler/Code/Source/CpuProfilerImpl.h +++ b/Gems/Profiler/Code/Source/CpuProfilerImpl.h @@ -150,7 +150,7 @@ namespace Profiler AZStd::mutex m_continuousCaptureEndingMutex; - AZStd::atomic_bool m_continuousCaptureInProgress; + AZStd::atomic_bool m_continuousCaptureInProgress = false; // Stores multiple frames of profiling data, size is controlled by MaxFramesToSave. Flushed when EndContinuousCapture is called. // Ring buffer so that we can have fast append of new data + removal of old profiling data with good cache locality. diff --git a/Gems/Profiler/Code/Source/ImGuiCpuProfiler.cpp b/Gems/Profiler/Code/Source/ImGuiCpuProfiler.cpp index 26c2f9f974..1cb13fe4ac 100644 --- a/Gems/Profiler/Code/Source/ImGuiCpuProfiler.cpp +++ b/Gems/Profiler/Code/Source/ImGuiCpuProfiler.cpp @@ -23,9 +23,13 @@ #include #include #include +#include namespace Profiler { + constexpr AZStd::sys_time_t ProfilerViewEdgePadding = 5000; + constexpr size_t InitialCpuTimingStatsAllocation = 8; + namespace CpuProfilerImGuiHelper { float TicksToMs(double ticks) @@ -435,6 +439,11 @@ namespace Profiler m_tableData.clear(); m_groupRegionMap.clear(); + // Since we don't serialize the frame boundaries, we will use "Component application simulation tick" from + // ComponentApplication::Tick as a heuristic. + static const AZ::Name::Hash frameBoundaryHash = AZ::Name("Component application simulation tick").GetHash(); + + AZStd::sys_time_t frameTime = 0; for (const auto& entry : deserializedData) { const auto [groupNameItr, wasGroupNameInserted] = m_deserializedStringPool.emplace(entry.m_groupName.GetCStr()); @@ -445,10 +454,12 @@ namespace Profiler const CachedTimeRegion newRegion(*groupRegionNameItr, entry.m_stackDepth, entry.m_startTick, entry.m_endTick); m_savedData[entry.m_threadId].push_back(newRegion); - // Since we don't serialize the frame boundaries, we need to use the RPI's OnSystemTick event as a heuristic. - const static AZ::Name frameBoundaryName = AZ::Name("RPISystem: OnSystemTick"); - if (entry.m_regionName == frameBoundaryName) + if (entry.m_regionName.GetHash() == frameBoundaryHash) { + if (!m_frameEndTicks.empty()) + { + frameTime = entry.m_endTick - m_frameEndTicks.back(); + } m_frameEndTicks.push_back(entry.m_endTick); } @@ -462,9 +473,9 @@ namespace Profiler m_groupRegionMap[*groupNameItr][*regionNameItr].RecordRegion(newRegion, entry.m_threadId); } - // Update viewport bounds with some added UX fudge factor - m_viewportStartTick = deserializedData.back().m_startTick - 1000; - m_viewportEndTick = deserializedData.back().m_endTick + 1000; + // Update viewport bounds to the estimated final frame time with some padding + m_viewportStartTick = m_frameEndTicks.back() - frameTime - ProfilerViewEdgePadding; + m_viewportEndTick = m_frameEndTicks.back() + ProfilerViewEdgePadding; // Invariant: each vector in m_savedData must be sorted so that we can efficiently cull region data. for (auto& [threadId, singleThreadData] : m_savedData) @@ -642,21 +653,13 @@ namespace Profiler m_cpuTimingStatisticsWhenPause.clear(); if (auto statsProfiler = AZ::Interface::Get(); statsProfiler) { - auto& rhiMetrics = statsProfiler->GetProfiler(AZ_CRC_CE("RHI")); - - const NamedRunningStatistic* frameTimeMetric = rhiMetrics.GetStatistic(AZ_CRC_CE("Frame to Frame Time")); - if (frameTimeMetric) - { - m_frameToFrameTime = static_cast(frameTimeMetric->GetMostRecentSample()); - } - AZStd::vector statistics; - rhiMetrics.GetStatsManager().GetAllStatistics(statistics); + statistics.reserve(InitialCpuTimingStatsAllocation); + statsProfiler->GetAllStatisticsOfUnits(statistics, "clocks"); for (NamedRunningStatistic* stat : statistics) { m_cpuTimingStatisticsWhenPause.push_back({ stat->GetName(), stat->GetMostRecentSample() }); - stat->Reset(); } } } @@ -731,7 +734,11 @@ namespace Profiler void ImGuiCpuProfiler::CullFrameData() { - const AZStd::sys_time_t deleteBeforeTick = AZStd::GetTimeNowTicks() - m_frameToFrameTime * m_framesToCollect; + const AZ::TimeUs delta = AZ::GetRealTickDeltaTimeUs(); + const float deltaTimeInSeconds = AZ::TimeUsToSeconds(delta); + const AZStd::sys_time_t frameToFrameTime = static_cast(deltaTimeInSeconds * AZStd::GetTimeTicksPerSecond()); + + const AZStd::sys_time_t deleteBeforeTick = AZStd::GetTimeNowTicks() - frameToFrameTime * m_framesToCollect; // Remove old frame boundary data auto firstBoundaryToKeepItr = AZStd::upper_bound(m_frameEndTicks.begin(), m_frameEndTicks.end(), deleteBeforeTick); diff --git a/Gems/Profiler/Code/Source/ImGuiCpuProfiler.h b/Gems/Profiler/Code/Source/ImGuiCpuProfiler.h index 2e01b8fd6b..d5d27632f8 100644 --- a/Gems/Profiler/Code/Source/ImGuiCpuProfiler.h +++ b/Gems/Profiler/Code/Source/ImGuiCpuProfiler.h @@ -89,7 +89,7 @@ namespace Profiler struct CpuTimingEntry { const AZStd::string& m_name; - double m_executeDuration; + double m_executeDuration = 0; }; ImGuiCpuProfiler() = default; @@ -175,8 +175,8 @@ namespace Profiler AZ::u64 m_savedRegionCount = 0; // Viewport tick bounds, these are used to convert tick space -> screen space and cull so we only draw onscreen objects - AZStd::sys_time_t m_viewportStartTick; - AZStd::sys_time_t m_viewportEndTick; + AZStd::sys_time_t m_viewportStartTick = 0; + AZStd::sys_time_t m_viewportEndTick = 0; // Map to store each thread's TimeRegions, individual vectors are sorted by start tick // note: we use size_t as a proxy for thread_id because native_thread_id_type differs differs from @@ -215,7 +215,6 @@ namespace Profiler // Last captured CPU timing statistics AZStd::vector m_cpuTimingStatisticsWhenPause; - AZStd::sys_time_t m_frameToFrameTime{}; AZ::IO::FixedMaxPath m_lastCapturedFilePath; From 6cb53891edcac615074ce495762e2a77957dd385 Mon Sep 17 00:00:00 2001 From: Roman <69218254+amzn-rhhong@users.noreply.github.com> Date: Tue, 30 Nov 2021 08:32:11 -0800 Subject: [PATCH 45/58] Store camera settings (#6013) * load and save camera options Signed-off-by: rhhong * CR feedback Signed-off-by: rhhong --- .../Tools/EMStudio/AnimViewportToolBar.cpp | 28 +++++++++++++++++++ .../Code/Tools/EMStudio/AnimViewportToolBar.h | 4 ++- 2 files changed, 31 insertions(+), 1 deletion(-) diff --git a/Gems/AtomLyIntegration/EMotionFXAtom/Code/Tools/EMStudio/AnimViewportToolBar.cpp b/Gems/AtomLyIntegration/EMotionFXAtom/Code/Tools/EMStudio/AnimViewportToolBar.cpp index 7bb8d49418..0cf6dd70b3 100644 --- a/Gems/AtomLyIntegration/EMotionFXAtom/Code/Tools/EMStudio/AnimViewportToolBar.cpp +++ b/Gems/AtomLyIntegration/EMotionFXAtom/Code/Tools/EMStudio/AnimViewportToolBar.cpp @@ -8,8 +8,10 @@ #include #include +#include #include #include +#include #include #include @@ -109,6 +111,13 @@ namespace EMStudio cameraButton->setIcon(QIcon(":/EMotionFXAtom/Camera_category.svg")); addWidget(cameraButton); } + + LoadSettings(); + } + + AnimViewportToolBar::~AnimViewportToolBar() + { + SaveSettings(); } void AnimViewportToolBar::CreateViewOptionEntry( @@ -144,4 +153,23 @@ namespace EMStudio } } } + + void AnimViewportToolBar::LoadSettings() + { + AZStd::string renderFlagsFilename(EMStudioManager::GetInstance()->GetAppDataFolder()); + renderFlagsFilename += "AnimViewportRenderFlags.cfg"; + QSettings settings(renderFlagsFilename.c_str(), QSettings::IniFormat, this); + + const bool isChecked = settings.value("CameraFollowUp", false).toBool(); + m_followCharacterAction->setChecked(isChecked); + } + + void AnimViewportToolBar::SaveSettings() + { + AZStd::string renderFlagsFilename(EMStudioManager::GetInstance()->GetAppDataFolder()); + renderFlagsFilename += "AnimViewportRenderFlags.cfg"; + QSettings settings(renderFlagsFilename.c_str(), QSettings::IniFormat, this); + + settings.setValue("CameraFollowUp", m_followCharacterAction->isChecked()); + } } // namespace EMStudio diff --git a/Gems/AtomLyIntegration/EMotionFXAtom/Code/Tools/EMStudio/AnimViewportToolBar.h b/Gems/AtomLyIntegration/EMotionFXAtom/Code/Tools/EMStudio/AnimViewportToolBar.h index 1443c54ee9..98b07f07dd 100644 --- a/Gems/AtomLyIntegration/EMotionFXAtom/Code/Tools/EMStudio/AnimViewportToolBar.h +++ b/Gems/AtomLyIntegration/EMotionFXAtom/Code/Tools/EMStudio/AnimViewportToolBar.h @@ -22,9 +22,11 @@ namespace EMStudio { public: AnimViewportToolBar(QWidget* parent = nullptr); - ~AnimViewportToolBar() = default; + ~AnimViewportToolBar(); void SetRenderFlags(EMotionFX::ActorRenderFlagBitset renderFlags); + void LoadSettings(); + void SaveSettings(); private: void CreateViewOptionEntry( From aab6e33d3032531b18acd68407c627c34a66057f Mon Sep 17 00:00:00 2001 From: lsemp3d <58790905+lsemp3d@users.noreply.github.com> Date: Tue, 30 Nov 2021 08:41:27 -0800 Subject: [PATCH 46/58] Non unity build fix Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com> --- Gems/ScriptCanvas/Code/Editor/Nodes/NodeUtils.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/Gems/ScriptCanvas/Code/Editor/Nodes/NodeUtils.cpp b/Gems/ScriptCanvas/Code/Editor/Nodes/NodeUtils.cpp index 262ea8c061..7ebbd4bc6d 100644 --- a/Gems/ScriptCanvas/Code/Editor/Nodes/NodeUtils.cpp +++ b/Gems/ScriptCanvas/Code/Editor/Nodes/NodeUtils.cpp @@ -12,6 +12,7 @@ #include #include +#include #include namespace ScriptCanvasEditor::Nodes From 3a1e6744fbcd69d16a7314a51248f540b0efa3ad Mon Sep 17 00:00:00 2001 From: Steve Pham <82231385+spham-amzn@users.noreply.github.com> Date: Tue, 30 Nov 2021 08:47:21 -0800 Subject: [PATCH 47/58] Save Data linux support (#6014) Implementation of SaveData for Linux Signed-off-by: Steve Pham <82231385+spham-amzn@users.noreply.github.com> --- .../Platform/Linux/AzTest_Traits_Linux.h | 2 - .../Linux/SaveData_SystemComponent_Linux.cpp | 173 ++++++++++++++++++ .../Platform/Linux/platform_linux_files.cmake | 2 +- 3 files changed, 174 insertions(+), 3 deletions(-) create mode 100644 Gems/SaveData/Code/Source/Platform/Linux/SaveData_SystemComponent_Linux.cpp diff --git a/Code/Framework/AzTest/AzTest/Platform/Linux/AzTest_Traits_Linux.h b/Code/Framework/AzTest/AzTest/Platform/Linux/AzTest_Traits_Linux.h index d9b48b7835..755888e1d9 100644 --- a/Code/Framework/AzTest/AzTest/Platform/Linux/AzTest_Traits_Linux.h +++ b/Code/Framework/AzTest/AzTest/Platform/Linux/AzTest_Traits_Linux.h @@ -13,8 +13,6 @@ #define AZ_TRAIT_UNIT_TEST_ENTITY_ID_GEN_TEST_COUNT 10000 #define AZ_TRAIT_UNIT_TEST_DILLER_TRIGGER_EVENT_COUNT 100000 -#define AZ_TRAIT_DISABLE_ALL_SAVE_DATA_TESTS true - #define AZ_TRAIT_DISABLE_FAILED_AP_CONNECTION_TESTS true #define AZ_TRAIT_DISABLE_FAILED_ASSET_LOAD_TESTS true diff --git a/Gems/SaveData/Code/Source/Platform/Linux/SaveData_SystemComponent_Linux.cpp b/Gems/SaveData/Code/Source/Platform/Linux/SaveData_SystemComponent_Linux.cpp new file mode 100644 index 0000000000..caa9e9bf54 --- /dev/null +++ b/Gems/SaveData/Code/Source/Platform/Linux/SaveData_SystemComponent_Linux.cpp @@ -0,0 +1,173 @@ +/* + * 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 SaveData +{ + //////////////////////////////////////////////////////////////////////////////////////////////// + //! Platform specific implementation for the save data system component on Linux + class SaveDataSystemComponentLinux : public SaveDataSystemComponent::Implementation + { + public: + //////////////////////////////////////////////////////////////////////////////////////////// + static constexpr const char* DefaultSaveDataDirectoryName = "SaveData"; + + //////////////////////////////////////////////////////////////////////////////////////////// + // Allocator + AZ_CLASS_ALLOCATOR(SaveDataSystemComponentLinux, AZ::SystemAllocator, 0); + + //////////////////////////////////////////////////////////////////////////////////////////// + //! Constructor + //! \param[in] saveDataSystemComponent Reference to the parent being implemented + SaveDataSystemComponentLinux(SaveDataSystemComponent& saveDataSystemComponent); + + //////////////////////////////////////////////////////////////////////////////////////////// + //! Destructor + ~SaveDataSystemComponentLinux() override; + + protected: + //////////////////////////////////////////////////////////////////////////////////////////// + //! \ref SaveData::SaveDataSystemComponent::Implementation::SaveDataBuffer + void SaveDataBuffer(const SaveDataRequests::SaveDataBufferParams& saveDataBufferParams) override; + + //////////////////////////////////////////////////////////////////////////////////////////// + //! \ref SaveData::SaveDataSystemComponent::Implementation::LoadDataBuffer + void LoadDataBuffer(const SaveDataRequests::LoadDataBufferParams& loadDataBufferParams) override; + + //////////////////////////////////////////////////////////////////////////////////////////// + //! \ref SaveData::SaveDataSystemComponent::Implementation::SetSaveDataDirectoryPath + void SetSaveDataDirectoryPath(const char* saveDataDirectoryPath) override; + + private: + //////////////////////////////////////////////////////////////////////////////////////////// + //! Convenience function to construct the full save data file path. + //! \param[in] dataBufferName The name of the save data buffer. + //! \param[in] localUserId The local user id the save data buffer is associated with. + AZ::IO::Path GetSaveDataFilePath(const AZStd::string& dataBufferName, + AzFramework::LocalUserId localUserId); + + //////////////////////////////////////////////////////////////////////////////////////////// + //! The absolute path to the application's save data dircetory. + AZ::IO::Path m_saveDataDirectoryPathAbsolute; + }; + + //////////////////////////////////////////////////////////////////////////////////////////////// + AZ::IO::Path GetDefaultLinuxUserSaveDataPath() + { + // First priority for the home directory is the 'HOME' environment variable + const char* homeDir = getenv("HOME"); + if (homeDir == nullptr) + { + // If the 'HOME' environment variable is not set, then retrieve it from the 'getpwuid' + // system call + auto uid = getuid(); + auto pwuid = getpwuid(uid); + homeDir = pwuid->pw_dir; + } + + AZ_Assert(homeDir, "Unable to determine home directory for current Linux user"); + if (homeDir == nullptr) + { + homeDir = "/tmp"; + } + + AZ::IO::Path homePath {homeDir}; + + // $HOME/.local/share is the standard directory where user data is stored on Ubuntu + return homePath / ".local" / "share"; + } + + //////////////////////////////////////////////////////////////////////////////////////////////// + AZStd::string GetExecutableName() + { + char moduleFileName[AZ_MAX_PATH_LEN]; + AZ::Utils::GetExecutablePath(moduleFileName, AZ_MAX_PATH_LEN); + + AZ::IO::Path executableFullPath {moduleFileName}; + AZStd::string moduleFileNameString {executableFullPath.Filename().Native()}; + return moduleFileNameString; + } + + //////////////////////////////////////////////////////////////////////////////////////////////// + SaveDataSystemComponent::Implementation* SaveDataSystemComponent::Implementation::Create(SaveDataSystemComponent& saveDataSystemComponent) + { + return aznew SaveDataSystemComponentLinux(saveDataSystemComponent); + } + + //////////////////////////////////////////////////////////////////////////////////////////////// + SaveDataSystemComponentLinux::SaveDataSystemComponentLinux(SaveDataSystemComponent& saveDataSystemComponent) + : SaveDataSystemComponent::Implementation(saveDataSystemComponent) + , m_saveDataDirectoryPathAbsolute(GetDefaultLinuxUserSaveDataPath() / + GetExecutableName().c_str() / + DefaultSaveDataDirectoryName) + { + } + + //////////////////////////////////////////////////////////////////////////////////////////////// + SaveDataSystemComponentLinux::~SaveDataSystemComponentLinux() + { + } + + //////////////////////////////////////////////////////////////////////////////////////////////// + void SaveDataSystemComponentLinux::SaveDataBuffer(const SaveDataRequests::SaveDataBufferParams& saveDataBufferParams) + { + const AZStd::string absoluteFilePath = GetSaveDataFilePath(saveDataBufferParams.dataBufferName, + saveDataBufferParams.localUserId).c_str(); + SaveDataBufferToFileSystem(saveDataBufferParams, absoluteFilePath); + } + + //////////////////////////////////////////////////////////////////////////////////////////////// + void SaveDataSystemComponentLinux::LoadDataBuffer(const SaveDataRequests::LoadDataBufferParams& loadDataBufferParams) + { + const AZStd::string absoluteFilePath = GetSaveDataFilePath(loadDataBufferParams.dataBufferName, + loadDataBufferParams.localUserId).c_str(); + LoadDataBufferFromFileSystem(loadDataBufferParams, absoluteFilePath); + } + + //////////////////////////////////////////////////////////////////////////////////////////////// + void SaveDataSystemComponentLinux::SetSaveDataDirectoryPath(const char* saveDataDirectoryPath) + { + AZ::IO::Path saveDataDirectoryBasicPath { saveDataDirectoryPath }; + + if (saveDataDirectoryBasicPath.IsAbsolute()) + { + m_saveDataDirectoryPathAbsolute = saveDataDirectoryBasicPath; + } + else + { + m_saveDataDirectoryPathAbsolute = GetDefaultLinuxUserSaveDataPath() / saveDataDirectoryBasicPath; + } + + AZ_Assert(!m_saveDataDirectoryPathAbsolute.empty(), "Cannot set an empty save data directory path."); + } + + //////////////////////////////////////////////////////////////////////////////////////////////// + AZ::IO::Path SaveDataSystemComponentLinux::GetSaveDataFilePath(const AZStd::string& dataBufferName, + AzFramework::LocalUserId localUserId) + { + AZ::IO::Path saveDataFilePath = m_saveDataDirectoryPathAbsolute; + if (localUserId != AzFramework::LocalUserIdNone) + { + saveDataFilePath /= AZStd::string::format("User_%u", localUserId); + } + saveDataFilePath /= dataBufferName; + return saveDataFilePath; + } +} // namespace SaveData diff --git a/Gems/SaveData/Code/Source/Platform/Linux/platform_linux_files.cmake b/Gems/SaveData/Code/Source/Platform/Linux/platform_linux_files.cmake index 2ef4de6b91..42209a111c 100644 --- a/Gems/SaveData/Code/Source/Platform/Linux/platform_linux_files.cmake +++ b/Gems/SaveData/Code/Source/Platform/Linux/platform_linux_files.cmake @@ -7,7 +7,7 @@ # set(FILES - ../Common/Unimplemented/SaveData_SystemComponent_Unimplemented.cpp + SaveData_SystemComponent_Linux.cpp SaveData_Traits_Platform.h SaveData_Traits_Linux.h ) From 1f13a5bbf244517ceebafd476e80bac75ed3b625 Mon Sep 17 00:00:00 2001 From: Chris Galvan Date: Tue, 30 Nov 2021 10:48:39 -0600 Subject: [PATCH 48/58] Removed include/LmbrCentral/Rendering/RenderNodeBus.h that was red-coded. Signed-off-by: Chris Galvan --- Gems/LmbrCentral/Code/lmbrcentral_headers_files.cmake | 1 - 1 file changed, 1 deletion(-) diff --git a/Gems/LmbrCentral/Code/lmbrcentral_headers_files.cmake b/Gems/LmbrCentral/Code/lmbrcentral_headers_files.cmake index 67f526cf21..a3bc87a620 100644 --- a/Gems/LmbrCentral/Code/lmbrcentral_headers_files.cmake +++ b/Gems/LmbrCentral/Code/lmbrcentral_headers_files.cmake @@ -36,7 +36,6 @@ set(FILES include/LmbrCentral/Rendering/MaterialHandle.h include/LmbrCentral/Rendering/MeshAsset.h include/LmbrCentral/Rendering/MeshModificationBus.h - include/LmbrCentral/Rendering/RenderNodeBus.h include/LmbrCentral/Rendering/GiRegistrationBus.h include/LmbrCentral/Rendering/RenderBoundsBus.h include/LmbrCentral/Scripting/EditorTagComponentBus.h From dc3c1266624dab7871f7c09b9118139e659c4a3a Mon Sep 17 00:00:00 2001 From: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com> Date: Tue, 30 Nov 2021 11:30:00 -0600 Subject: [PATCH 49/58] GetSurfacePoint - expose to BehaviorContext (#6017) * Fix GetSurfacePoint exposure to BehaviorContext. The previous way of exposing it made it unusable from ScriptCanvas, since the public API uses an "out" parameter. This introduces a private variation of the API that returns the value instead, so that it functions correctly in Script Canvas. Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com> * Added descriptive comment. Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com> * Addressed PR feedback. Fixed comment spacing and renamed private methods to remove the need for the typecast. Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com> --- .../Terrain/TerrainDataRequestBus.cpp | 5 ++- .../Terrain/TerrainDataRequestBus.h | 41 ++++++++++++++----- 2 files changed, 34 insertions(+), 12 deletions(-) diff --git a/Code/Framework/AzFramework/AzFramework/Terrain/TerrainDataRequestBus.cpp b/Code/Framework/AzFramework/AzFramework/Terrain/TerrainDataRequestBus.cpp index 561408db20..f803e73462 100644 --- a/Code/Framework/AzFramework/AzFramework/Terrain/TerrainDataRequestBus.cpp +++ b/Code/Framework/AzFramework/AzFramework/Terrain/TerrainDataRequestBus.cpp @@ -26,10 +26,11 @@ namespace AzFramework::Terrain ->Event("GetSurfaceWeights", &AzFramework::Terrain::TerrainDataRequestBus::Events::GetSurfaceWeights) ->Event("GetSurfaceWeightsFromVector2", &AzFramework::Terrain::TerrainDataRequestBus::Events::GetSurfaceWeightsFromVector2) + ->Event("GetIsHole", &AzFramework::Terrain::TerrainDataRequestBus::Events::GetIsHole) ->Event("GetIsHoleFromFloats", &AzFramework::Terrain::TerrainDataRequestBus::Events::GetIsHoleFromFloats) - ->Event("GetSurfacePoint", &AzFramework::Terrain::TerrainDataRequestBus::Events::GetSurfacePoint) + ->Event("GetSurfacePoint", &AzFramework::Terrain::TerrainDataRequestBus::Events::BehaviorContextGetSurfacePoint) ->Event("GetSurfacePointFromVector2", - &AzFramework::Terrain::TerrainDataRequestBus::Events::GetSurfacePointFromVector2) + &AzFramework::Terrain::TerrainDataRequestBus::Events::BehaviorContextGetSurfacePointFromVector2) ->Event("GetTerrainAabb", &AzFramework::Terrain::TerrainDataRequestBus::Events::GetTerrainAabb) ->Event("GetTerrainHeightQueryResolution", &AzFramework::Terrain::TerrainDataRequestBus::Events::GetTerrainHeightQueryResolution) diff --git a/Code/Framework/AzFramework/AzFramework/Terrain/TerrainDataRequestBus.h b/Code/Framework/AzFramework/AzFramework/Terrain/TerrainDataRequestBus.h index 30a2f8e044..4c73ddd770 100644 --- a/Code/Framework/AzFramework/AzFramework/Terrain/TerrainDataRequestBus.h +++ b/Code/Framework/AzFramework/AzFramework/Terrain/TerrainDataRequestBus.h @@ -52,8 +52,8 @@ namespace AzFramework virtual void SetTerrainAabb(const AZ::Aabb& worldBounds) = 0; //! Returns terrains height in meters at location x,y. - //! @terrainExistsPtr: Can be nullptr. If != nullptr then, if there's no terrain at location x,y or location x,y is inside a terrain HOLE then *terrainExistsPtr will become false, - //! otherwise *terrainExistsPtr will become true. + //! @terrainExistsPtr: Can be nullptr. If != nullptr then, if there's no terrain at location x,y or location x,y is inside + //! a terrain HOLE then *terrainExistsPtr will become false, otherwise *terrainExistsPtr will become true. virtual float GetHeight(const AZ::Vector3& position, Sampler sampler = Sampler::BILINEAR, bool* terrainExistsPtr = nullptr) const = 0; virtual float GetHeightFromVector2( const AZ::Vector2& position, Sampler sampler = Sampler::BILINEAR, bool* terrainExistsPtr = nullptr) const = 0; @@ -68,8 +68,7 @@ namespace AzFramework // Given an XY coordinate, return the surface normal. //! @terrainExists: Can be nullptr. If != nullptr then, if there's no terrain at location x,y or location x,y is inside a - //! terrain HOLE then *terrainExistsPtr will be set to false, - //! otherwise *terrainExistsPtr will be set to true. + //! terrain HOLE then *terrainExistsPtr will be set to false, otherwise *terrainExistsPtr will be set to true. virtual AZ::Vector3 GetNormal( const AZ::Vector3& position, Sampler sampleFilter = Sampler::BILINEAR, bool* terrainExistsPtr = nullptr) const = 0; virtual AZ::Vector3 GetNormalFromVector2( @@ -78,8 +77,8 @@ namespace AzFramework float x, float y, Sampler sampleFilter = Sampler::BILINEAR, bool* terrainExistsPtr = nullptr) const = 0; //! Given an XY coordinate, return the max surface type and weight. - //! @terrainExists: Can be nullptr. If != nullptr then, if there's no terrain at location x,y or location x,y is inside a terrain HOLE then *terrainExistsPtr will be set to false, - //! otherwise *terrainExistsPtr will be set to true. + //! @terrainExists: Can be nullptr. If != nullptr then, if there's no terrain at location x,y or location x,y is inside + //! a terrain HOLE then *terrainExistsPtr will be set to false, otherwise *terrainExistsPtr will be set to true. virtual SurfaceData::SurfaceTagWeight GetMaxSurfaceWeight( const AZ::Vector3& position, Sampler sampleFilter = Sampler::BILINEAR, bool* terrainExistsPtr = nullptr) const = 0; virtual SurfaceData::SurfaceTagWeight GetMaxSurfaceWeightFromVector2( @@ -87,8 +86,8 @@ namespace AzFramework virtual SurfaceData::SurfaceTagWeight GetMaxSurfaceWeightFromFloats( float x, float y, Sampler sampleFilter = Sampler::BILINEAR, bool* terrainExistsPtr = nullptr) const = 0; - //! Given an XY coordinate, return the set of surface types and weights. The Vector3 input position version is defined to ignore - //! the input Z value. + //! Given an XY coordinate, return the set of surface types and weights. The Vector3 input position version is defined to + //! ignore the input Z value. virtual void GetSurfaceWeights( const AZ::Vector3& inPosition, SurfaceData::SurfaceTagWeightList& outSurfaceWeights, @@ -106,13 +105,14 @@ namespace AzFramework Sampler sampleFilter = Sampler::DEFAULT, bool* terrainExistsPtr = nullptr) const = 0; - //! Convenience function for low level systems that can't do a reverse lookup from Crc to string. Everyone else should use GetMaxSurfaceWeight or GetMaxSurfaceWeightFromFloats. + //! Convenience function for low level systems that can't do a reverse lookup from Crc to string. Everyone else should use + //! GetMaxSurfaceWeight or GetMaxSurfaceWeightFromFloats. //! Not available in the behavior context. //! Returns nullptr if the position is inside a hole or outside of the terrain boundaries. virtual const char* GetMaxSurfaceName( const AZ::Vector3& position, Sampler sampleFilter = Sampler::BILINEAR, bool* terrainExistsPtr = nullptr) const = 0; - //! Given an XY coordinate, return all terrain information at that location. The Vector3 input position version is defined + //! Given an XY coordinate, return all terrain information at that location. The Vector3 input position version is defined //! to ignore the input Z value. virtual void GetSurfacePoint( const AZ::Vector3& inPosition, @@ -130,6 +130,27 @@ namespace AzFramework SurfaceData::SurfacePoint& outSurfacePoint, Sampler sampleFilter = Sampler::DEFAULT, bool* terrainExistsPtr = nullptr) const = 0; + + private: + // Private variations of the GetSurfacePoint API exposed to BehaviorContext that returns a value instead of + // using an "out" parameter. The "out" parameter is useful for reusing memory allocated in SurfacePoint when + // using the public API, but can't easily be used from Script Canvas. + SurfaceData::SurfacePoint BehaviorContextGetSurfacePoint( + const AZ::Vector3& inPosition, + Sampler sampleFilter = Sampler::DEFAULT) const + { + SurfaceData::SurfacePoint result; + GetSurfacePoint(inPosition, result, sampleFilter); + return result; + } + SurfaceData::SurfacePoint BehaviorContextGetSurfacePointFromVector2( + const AZ::Vector2& inPosition, + Sampler sampleFilter = Sampler::DEFAULT) const + { + SurfaceData::SurfacePoint result; + GetSurfacePointFromVector2(inPosition, result, sampleFilter); + return result; + } }; using TerrainDataRequestBus = AZ::EBus; From 879012b1ae67714e028cf00454844bf552278c11 Mon Sep 17 00:00:00 2001 From: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com> Date: Tue, 30 Nov 2021 13:03:46 -0600 Subject: [PATCH 50/58] Added the --regset-file option for setreg file loading (#5768) The SettingsRegistryMergeUtils.cpp now supports specifying a path to a JSON Merge Patch formated settings registry file via the --regset-file option. The option supports specify an anchor key to merge the settings underneath that is separated from the filepath via "::" Ex. `--regset-file="Registry/custom.setreg::/Custom/Anchor"` An AZ::Console command of "sr_regset-file" has also been added to allow merging of a setting registry file as well. closes #5767 Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com> --- Code/Framework/AzCore/AzCore/IO/Path/Path.h | 3 +- Code/Framework/AzCore/AzCore/IO/Path/Path.inl | 6 ++- .../Settings/SettingsRegistryConsoleUtils.cpp | 40 +++++++++++++++++-- .../Settings/SettingsRegistryConsoleUtils.h | 11 +++-- .../Settings/SettingsRegistryMergeUtils.cpp | 35 +++++++++++++--- .../SettingsRegistryMergeUtilsTests.cpp | 16 ++++++++ 6 files changed, 96 insertions(+), 15 deletions(-) diff --git a/Code/Framework/AzCore/AzCore/IO/Path/Path.h b/Code/Framework/AzCore/AzCore/IO/Path/Path.h index 355d9ddedb..094dee16f2 100644 --- a/Code/Framework/AzCore/AzCore/IO/Path/Path.h +++ b/Code/Framework/AzCore/AzCore/IO/Path/Path.h @@ -78,7 +78,8 @@ namespace AZ::IO // native format observers //! Returns string_view stored within the PathView - constexpr AZStd::string_view Native() const noexcept; + constexpr const AZStd::string_view& Native() const noexcept; + constexpr AZStd::string_view& Native() noexcept; //! Conversion operator to retrieve string_view stored within the PathView constexpr explicit operator AZStd::string_view() const noexcept; diff --git a/Code/Framework/AzCore/AzCore/IO/Path/Path.inl b/Code/Framework/AzCore/AzCore/IO/Path/Path.inl index 1d654c1502..5ac15fc728 100644 --- a/Code/Framework/AzCore/AzCore/IO/Path/Path.inl +++ b/Code/Framework/AzCore/AzCore/IO/Path/Path.inl @@ -101,7 +101,11 @@ namespace AZ::IO } // native format observers - constexpr auto PathView::Native() const noexcept -> AZStd::string_view + constexpr auto PathView::Native() const noexcept -> const AZStd::string_view& + { + return m_path; + } + constexpr auto PathView::Native() noexcept -> AZStd::string_view& { return m_path; } diff --git a/Code/Framework/AzCore/AzCore/Settings/SettingsRegistryConsoleUtils.cpp b/Code/Framework/AzCore/AzCore/Settings/SettingsRegistryConsoleUtils.cpp index 7a8ab85ce3..e5f87f4e7f 100644 --- a/Code/Framework/AzCore/AzCore/Settings/SettingsRegistryConsoleUtils.cpp +++ b/Code/Framework/AzCore/AzCore/Settings/SettingsRegistryConsoleUtils.cpp @@ -9,6 +9,7 @@ #include #include #include +#include #include #include #include @@ -36,7 +37,7 @@ namespace AZ::SettingsRegistryConsoleUtils combinedKeyValueCommand.c_str()); AZ::Debug::Trace::Output("SettingsRegistry", setOutput.c_str()); } - }; + } static void ConsoleRemoveSettingsRegistryValue(SettingsRegistryInterface& settingsRegistry, const ConsoleCommandContainer& commandArgs) { @@ -57,7 +58,7 @@ namespace AZ::SettingsRegistryConsoleUtils AZ::Debug::Trace::Output("SettingsRegistry", removeOutput.c_str()); } } - }; + } static void ConsoleDumpSettingsRegistryValue(SettingsRegistryInterface& settingsRegistry, const ConsoleCommandContainer& commandArgs) { @@ -88,13 +89,39 @@ namespace AZ::SettingsRegistryConsoleUtils } AZ::Debug::Trace::Output("SettingsRegistry", outputString.c_str()); - }; + } static void ConsoleDumpAllSettingsRegistryValues(SettingsRegistryInterface& settingsRegistry, [[maybe_unused]] const ConsoleCommandContainer& commandArgs) { ConsoleDumpSettingsRegistryValue(settingsRegistry, { "" }); - }; + } + + static void ConsoleMergeFileToSettingsRegistry(SettingsRegistryInterface& settingsRegistry, const ConsoleCommandContainer& commandArgs) + { + if (commandArgs.empty()) + { + AZ_Error("SettingsRegistryConsoleUtils", false, "Command %s requires a argument to locate json file to merge", + SettingsRegistryMergeFile); + return; + } + + auto commandArgumentsIter = commandArgs.begin(); + // Extract the JSON pointer path from the argument list + AZStd::string_view filePath{ *commandArgumentsIter++ }; + AZ::SettingsRegistryInterface::FixedValueString jsonAnchorPath; + AZ::StringFunc::Join(jsonAnchorPath, commandArgumentsIter, commandArgs.end(), ' '); + + const auto mergeFormat = AZ::IO::PathView(filePath).Extension() != ".setregpatch" ? AZ::SettingsRegistryInterface::Format::JsonMergePatch : AZ::SettingsRegistryInterface::Format::JsonPatch; + if (settingsRegistry.MergeSettingsFile(filePath, mergeFormat, jsonAnchorPath)) + { + const auto mergeFileOutput = AZ::SettingsRegistryInterface::FixedValueString::format( + R"(Merged json file "%*.s" anchored to json path "%s" into the global settings registry)" "\n", + AZ_STRING_ARG(filePath), jsonAnchorPath.c_str()); + AZ::Debug::Trace::Output("SettingsRegistry", mergeFileOutput.c_str()); + } + } + [[nodiscard]] ConsoleFunctorHandle RegisterAzConsoleCommands(SettingsRegistryInterface& registry, AZ::IConsole& azConsole) { @@ -115,6 +142,11 @@ namespace AZ::SettingsRegistryConsoleUtils resultHandle.m_consoleFunctors.emplace_back(azConsole, SettingsRegistryDumpAll, R"(Dumps all values from the global settings registry)" "\n", ConsoleFunctorFlags::Null, AZ::TypeId::CreateNull(), registry, &ConsoleDumpAllSettingsRegistryValues); + resultHandle.m_consoleFunctors.emplace_back(azConsole, SettingsRegistryMergeFile, + R"(Merges File into the global settings registry)" "\n" + R"(@param file-path - path to JSON formatted file to merge)" "\n" + R"(@param anchor-path - JSON path to anchor merge operation. Defaults to "")" "\n", + ConsoleFunctorFlags::Null, AZ::TypeId::CreateNull(), registry, &ConsoleMergeFileToSettingsRegistry); return resultHandle; } diff --git a/Code/Framework/AzCore/AzCore/Settings/SettingsRegistryConsoleUtils.h b/Code/Framework/AzCore/AzCore/Settings/SettingsRegistryConsoleUtils.h index ba0d552dde..1807a27604 100644 --- a/Code/Framework/AzCore/AzCore/Settings/SettingsRegistryConsoleUtils.h +++ b/Code/Framework/AzCore/AzCore/Settings/SettingsRegistryConsoleUtils.h @@ -14,15 +14,16 @@ namespace AZ::SettingsRegistryConsoleUtils { - //! Only 4 console command are registered for the settings registry - //! "regset", "regremove", "regdump", "regdumpall" + //! The following console command are registered for the settings registry + //! "regset", "regremove", "regdump", "regdumpall", "regset-file" //! The value should be increased if more commands are needed - inline constexpr size_t MaxSettingsRegistryConsoleFunctors = 4; + inline constexpr size_t MaxSettingsRegistryConsoleFunctors = 5; inline constexpr const char* SettingsRegistrySet = "sr_regset"; inline constexpr const char* SettingsRegistryRemove = "sr_regremove"; inline constexpr const char* SettingsRegistryDump = "sr_regdump"; inline constexpr const char* SettingsRegistryDumpAll = "sr_regdumpall"; + inline constexpr const char* SettingsRegistryMergeFile = "sr_regset-file"; // RAII structure which owns the instances of the Settings Registry Console commands // registered with an AZ Console @@ -51,6 +52,10 @@ namespace AZ::SettingsRegistryConsoleUtils //! //! "sr_regdumpall" accepts 0 arguments and dumps the entire settings registry //! NOTE: this might result in a large amount of output to the console + //! + //! "sr_regset-file" accepts 1 or 2 arguments - [] + //! Merges the json formatted file into the settings registry underneath the root anchor "" + //! or if supplied [[nodiscard]] ConsoleFunctorHandle RegisterAzConsoleCommands(SettingsRegistryInterface& registry, AZ::IConsole& azConsole); } diff --git a/Code/Framework/AzCore/AzCore/Settings/SettingsRegistryMergeUtils.cpp b/Code/Framework/AzCore/AzCore/Settings/SettingsRegistryMergeUtils.cpp index 975217a131..eed0112ad1 100644 --- a/Code/Framework/AzCore/AzCore/Settings/SettingsRegistryMergeUtils.cpp +++ b/Code/Framework/AzCore/AzCore/Settings/SettingsRegistryMergeUtils.cpp @@ -19,9 +19,6 @@ #include #include #include -#include -#include -#include #include #include @@ -983,7 +980,7 @@ namespace AZ::SettingsRegistryMergeUtils // code in the loop makes calls that mutates the `commandLine` instance, invalidating the iterators. Making a copy // ensures that the iterators remain valid. // NOLINTNEXTLINE(performance-unnecessary-value-param) - void MergeSettingsToRegistry_CommandLine(SettingsRegistryInterface& registry, AZ::CommandLine commandLine, bool executeCommands) + void MergeSettingsToRegistry_CommandLine(SettingsRegistryInterface& registry, AZ::CommandLine commandLine, bool executeRegdumpCommands) { // Iterate over all the command line options in order to parse the --regset and --regremove // arguments in the order they were supplied @@ -998,18 +995,44 @@ namespace AZ::SettingsRegistryMergeUtils continue; } } + else if (commandArgument.m_option == "regset-file") + { + AZStd::string_view fileArg(commandArgument.m_value); + AZStd::string_view jsonAnchorPath; + // double colons is treated as the separator for an anchor path + // single colon cannot be used as it is used in Windows paths + if (auto anchorPathIndex = AZ::StringFunc::Find(fileArg, "::"); + anchorPathIndex != AZStd::string_view::npos) + { + jsonAnchorPath = fileArg.substr(anchorPathIndex + 2); + fileArg = fileArg.substr(0, anchorPathIndex); + } + if (!fileArg.empty()) + { + AZ::IO::PathView filePath(fileArg); + const auto mergeFormat = filePath.Extension() != ".setregpatch" + ? AZ::SettingsRegistryInterface::Format::JsonMergePatch + : AZ::SettingsRegistryInterface::Format::JsonPatch; + if (!registry.MergeSettingsFile(filePath.Native(), mergeFormat, jsonAnchorPath)) + { + AZ_Warning("SettingsRegistryMergeUtils", false, R"(Merging of file "%.*s" to the Settings Registry has failed at anchor "%.*s".)", + AZ_STRING_ARG(filePath.Native()), AZ_STRING_ARG(jsonAnchorPath)); + continue; + } + } + } else if (commandArgument.m_option == "regremove") { if (!registry.Remove(commandArgument.m_value)) { AZ_Warning("SettingsRegistryMergeUtils", false, "Unable to remove value at JSON Pointer %s for --regremove.", - commandArgument.m_value.data()); + commandArgument.m_value.c_str()); continue; } } } - if (executeCommands) + if (executeRegdumpCommands) { constexpr bool prettifyOutput = true; const size_t regdumpSwitchValues = commandLine.GetNumSwitchValues("regdump"); diff --git a/Code/Framework/AzCore/Tests/Settings/SettingsRegistryMergeUtilsTests.cpp b/Code/Framework/AzCore/Tests/Settings/SettingsRegistryMergeUtilsTests.cpp index 00a18f7682..485593a699 100644 --- a/Code/Framework/AzCore/Tests/Settings/SettingsRegistryMergeUtilsTests.cpp +++ b/Code/Framework/AzCore/Tests/Settings/SettingsRegistryMergeUtilsTests.cpp @@ -539,6 +539,22 @@ tags=tools,renderer,metal)" EXPECT_STREQ("Bat", commandLine.GetMiscValue(2).c_str()); } + TEST_F(SettingsRegistryMergeUtilsCommandLineFixture, RegsetFileArgument_DoesNotMergeNUL) + { + AZStd::string regsetFile = AZ::IO::SystemFile::GetNullFilename(); + AZ::CommandLine commandLine; + commandLine.Parse({ "--regset-file", regsetFile }); + + AZ::SettingsRegistryMergeUtils::MergeSettingsToRegistry_CommandLine(*m_registry, commandLine, false); + + // Add a settings path to anchor loaded settings underneath + regsetFile = AZStd::string::format("%s::/AnchorPath/Of/Settings", AZ::IO::SystemFile::GetNullFilename()); + commandLine.Parse({ "--regset-file", regsetFile }); + + AZ::SettingsRegistryMergeUtils::MergeSettingsToRegistry_CommandLine(*m_registry, commandLine, false); + EXPECT_EQ(AZ::SettingsRegistryInterface::Type::NoType, m_registry->GetType("/AnchorPath/Of/Settings")); + } + using SettingsRegistryAncestorDescendantOrEqualPathFixture = SettingsRegistryMergeUtilsCommandLineFixture; TEST_F(SettingsRegistryAncestorDescendantOrEqualPathFixture, ValidateThatAncestorOrDescendantOrPathWithTheSameValue_Succeeds) From 7c30adb66caee3be16b8d80a48e0576212e9949e Mon Sep 17 00:00:00 2001 From: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> Date: Tue, 30 Nov 2021 11:10:02 -0800 Subject: [PATCH 51/58] Removes _vs2019 from jenkins jobs and documentation (#5855) Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> --- .../EditorPythonTestTools/README.txt | 4 +- .../ap_fixtures/ap_setup_fixture.py | 2 +- .../ap_fixtures/asset_processor_fixture.py | 2 +- .../Windows/ProjectManagerDefs_windows.cpp | 2 +- .../azpy/synthetic_env.py | 2 +- .../DccScriptingInterface/config.py | 2 +- .../Code/Tests/run_EMotionFX_tests.py | 94 ---------------- README.md | 4 +- Tools/LyTestTools/README.txt | 4 +- .../managers/abstract_resource_locator.py | 6 +- .../_internal/managers/workspace.py | 2 +- .../ly_remote_console/README.txt | 3 +- .../build/Platform/Android/build_config.json | 2 +- .../build/Platform/Windows/build_config.json | 102 +++++++++--------- .../Windows/package_build_config.json | 4 +- .../package/Platform/Windows/package_env.json | 2 +- scripts/o3de/README.txt | 2 +- 17 files changed, 72 insertions(+), 167 deletions(-) delete mode 100755 Gems/EMotionFX/Code/Tests/run_EMotionFX_tests.py diff --git a/AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/README.txt b/AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/README.txt index 642d7279a4..bd9740f60f 100644 --- a/AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/README.txt +++ b/AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/README.txt @@ -26,8 +26,8 @@ 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/ - mkdir windows_vs2019 - cd windows_vs2019 + mkdir windows + cd windows cmake .. -G "Visual Studio 16 2019" -DLY_PROJECTS=AutomatedTesting To manually install the project in development mode using your own installed Python interpreter: diff --git a/AutomatedTesting/Gem/PythonTests/assetpipeline/ap_fixtures/ap_setup_fixture.py b/AutomatedTesting/Gem/PythonTests/assetpipeline/ap_fixtures/ap_setup_fixture.py index 244ecfb516..c5b02e4f28 100755 --- a/AutomatedTesting/Gem/PythonTests/assetpipeline/ap_fixtures/ap_setup_fixture.py +++ b/AutomatedTesting/Gem/PythonTests/assetpipeline/ap_fixtures/ap_setup_fixture.py @@ -4,7 +4,7 @@ For complete copyright and license terms please see the LICENSE at the root of t SPDX-License-Identifier: Apache-2.0 OR MIT -A fixture for Setting Up Asset Processor Batch workspace for tests in lmbr_test +A fixture for Setting Up Asset Processor Batch workspace for tests """ # Import builtin libraries diff --git a/AutomatedTesting/Gem/PythonTests/assetpipeline/ap_fixtures/asset_processor_fixture.py b/AutomatedTesting/Gem/PythonTests/assetpipeline/ap_fixtures/asset_processor_fixture.py index eea6cb9224..674862443e 100755 --- a/AutomatedTesting/Gem/PythonTests/assetpipeline/ap_fixtures/asset_processor_fixture.py +++ b/AutomatedTesting/Gem/PythonTests/assetpipeline/ap_fixtures/asset_processor_fixture.py @@ -4,7 +4,7 @@ For complete copyright and license terms please see the LICENSE at the root of t SPDX-License-Identifier: Apache-2.0 OR MIT -A fixture for using the Asset Processor in lmbr_test, this will stop the asset processor after every test via +A fixture for using the Asset Processor, this will stop the asset processor after every test via the teardown. Using the fixture at class level will stop the asset processor after the suite completes. Using the fixture at test level will stop asset processor after the test completes. Calling this fixture as a test argument will still run the teardown to stop the Asset Processor. """ diff --git a/Code/Tools/ProjectManager/Platform/Windows/ProjectManagerDefs_windows.cpp b/Code/Tools/ProjectManager/Platform/Windows/ProjectManagerDefs_windows.cpp index 6b58458ccd..9fa9321cce 100644 --- a/Code/Tools/ProjectManager/Platform/Windows/ProjectManagerDefs_windows.cpp +++ b/Code/Tools/ProjectManager/Platform/Windows/ProjectManagerDefs_windows.cpp @@ -9,7 +9,7 @@ namespace O3DE::ProjectManager { - const QString ProjectBuildPathPostfix = ProjectBuildDirectoryName + "/windows_vs2019"; + const QString ProjectBuildPathPostfix = ProjectBuildDirectoryName + "/windows"; const QString GetPythonScriptPath = "python/get_python.bat"; } // namespace O3DE::ProjectManager diff --git a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/synthetic_env.py b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/synthetic_env.py index 33ac6c6814..2d0685b67d 100644 --- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/synthetic_env.py +++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/synthetic_env.py @@ -508,7 +508,7 @@ def init_ly_pyside(env_dict=_SYNTH_ENV_DICT): site.addsitedir(str(QTFORPYTHON_PATH)) O3DE_BIN_PATH = Path.joinpath(O3DE_DEV, - 'windows_vs2019', + 'windows', 'bin', 'profile').resolve() os.environ["DYNACONF_O3DE_BIN_PATH"] = str(O3DE_BIN_PATH) diff --git a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/config.py b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/config.py index 5578bcd577..a9cf5e8ee5 100755 --- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/config.py +++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/config.py @@ -532,7 +532,7 @@ if __name__ == '__main__': parser.add_argument('-bf', '--build-folder', type=str, required=False, - help='The name (tag) of the o3de build folder, example build or windows_vs2019.') + help='The name (tag) of the o3de build folder, example build or windows.') parser.add_argument('-pp', '--project-path', type=pathlib.Path, required=False, diff --git a/Gems/EMotionFX/Code/Tests/run_EMotionFX_tests.py b/Gems/EMotionFX/Code/Tests/run_EMotionFX_tests.py deleted file mode 100755 index e3b930e43b..0000000000 --- a/Gems/EMotionFX/Code/Tests/run_EMotionFX_tests.py +++ /dev/null @@ -1,94 +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 - -python run_EMotionFX_tests.py --config --vsVersion - -Example: -python run_EMotionFX_tests.py --config profile --vsVersion vs2017 -python run_EMotionFX_tests.py --config debug --vsVersion vs2019 - - -Requirements: - -- Provide a single script that executes all your team's automated BAT/Regression tests - -- The script should run the tests successfully if killed in the middle and restarted - -- Provide any documentation needed along with the script so that other feature teams wanting to execute your tests can execute them locally - -- The documentation should also cover where the test results are reported and how to find failing tests and their logs - - -""" - -import argparse -import os -import subprocess - - -#Setup Parser -def parser_setup(): - parser = argparse.ArgumentParser(description='Sets up for and runs the specified EMotionFX tests') - - # Configuration - parser.add_argument('--config', choices=['profile','debug'] , help='The Conrfiguration you have pre-build and want to run the tests on. Options[profile,debug]') - - #Visual Studio Version - parser.add_argument('--vsVersion', choices=['vs2017','vs2019'], help='The version of Visual Studio you used to build your branch. Options[vs2017, vs2019]') - - - - return parser - - - -#Main Program -def main(): - # Set up CLI arguments for CLI argument parser - parser = parser_setup() - - # Capture arguments and their values - args = parser.parse_args() - - - # Change directory to branch root - dev_path = os.path.join(os.path.dirname(__file__), '..', '..','..','..') - os.chdir(dev_path) - dirpath = os.getcwd() - - - vsVersion = args.vsVersion - config = args.config - - if vsVersion == 'vs2017': - if config == 'profile': - #lmbr_test.cmd scan --dir Bin64vc141.Test --only Gem\.EMotionFX\..*\.dll - subprocess.run('lmbr_test.cmd scan --dir Bin64vc141.Test --only Gem\.EMotionFX\..*\.dll', check=True) - - elif config == 'debug': - #lmbr_test.cmd scan --dir Bin64vc141.Debug.Test --only Gem\.EMotionFX\..*\.dll - subprocess.run('lmbr_test.cmd scan --dir Bin64vc141.Debug.Test --only Gem\.EMotionFX\..*\.dll', check=True) - - else: - print('INVALID ARGUMENT(s)... Ending') - elif vsVersion == 'vs2019': - if config == 'profile': - #lmbr_test.cmd scan --dir Bin64vc142.Test --only Gem\.EMotionFX\..*\.dll - subprocess.run('lmbr_test.cmd scan --dir Bin64vc142.Test --only Gem\.EMotionFX\..*\.dll', check=True) - - elif config == 'debug': - #lmbr_test.cmd scan --dir Bin64vc142.Debug.Test --only Gem\.EMotionFX\..*\.dll - subprocess.run('lmbr_test.cmd scan --dir Bin64vc141.Debug.Test --only Gem\.EMotionFX\..*\.dll', check=True) - - else: - print('INVALID ARGUMENT(s)... Ending') - else: - print('INVALID ARGUMENT(s)... Ending') - - - -if __name__ == '__main__': - main() diff --git a/README.md b/README.md index 11fec028bc..063a59de74 100644 --- a/README.md +++ b/README.md @@ -66,7 +66,7 @@ To set up a project-centric source engine, complete the following steps. For oth Example: ``` - cmake -B C:\o3de\build\windows_vs2019 -S C:\o3de -G "Visual Studio 16" -DLY_3RDPARTY_PATH=C:\o3de-packages + cmake -B C:\o3de\build\windows -S C:\o3de -G "Visual Studio 16" -DLY_3RDPARTY_PATH=C:\o3de-packages ``` > Note: Do not use trailing slashes for the <3rdParty package path>. @@ -107,7 +107,7 @@ For more details on the steps above, refer to [Setting up O3DE from GitHub](http Example: ``` - cmake -B C:\my-project\build\windows_vs2019 -S C:\my-project -G "Visual Studio 16" + cmake -B C:\my-project\build\windows -S C:\my-project -G "Visual Studio 16" ``` > Note: Do not use trailing slashes for the <3rdParty cache path>. diff --git a/Tools/LyTestTools/README.txt b/Tools/LyTestTools/README.txt index 61ad507dc4..4372bc5201 100644 --- a/Tools/LyTestTools/README.txt +++ b/Tools/LyTestTools/README.txt @@ -35,8 +35,8 @@ INSTALL It is recommended to set up these these tools with Lumberyard's CMake build commands. Assuming CMake is already setup on your operating system, below are some sample build commands: cd /path/to/lumberyard/dev/ - mkdir windows_vs2019 - cd windows_vs2019 + mkdir windows + cd windows cmake -E time cmake --build . --target ALL_BUILD --config profile To manually install the project in development mode using your own installed Python interpreter: diff --git a/Tools/LyTestTools/ly_test_tools/_internal/managers/abstract_resource_locator.py b/Tools/LyTestTools/ly_test_tools/_internal/managers/abstract_resource_locator.py index 4ff71a5b31..d11980658d 100755 --- a/Tools/LyTestTools/ly_test_tools/_internal/managers/abstract_resource_locator.py +++ b/Tools/LyTestTools/ly_test_tools/_internal/managers/abstract_resource_locator.py @@ -277,7 +277,7 @@ class AbstractResourceLocator(object): def get_shader_compiler_path(self): """ Return path to shader compiler executable - ex. engine_root/dev/windows_vs2019/bin/profile/CrySCompileServer + ex. engine_root/dev/windows/bin/profile/CrySCompileServer :return: path to CrySCompileServer executable """ return os.path.join(self.build_directory(), 'CrySCompileServer') @@ -313,7 +313,7 @@ class AbstractResourceLocator(object): def shader_compiler_config_file(self): """ Return path to the Shader Compiler config file - ex. engine_root/dev/windows_vs2019/bin/profile/config.ini + ex. engine_root/dev/windows/bin/profile/config.ini :return: path to the Shader Compiler config file """ return os.path.join(self.build_directory(), 'config.ini') @@ -321,7 +321,7 @@ class AbstractResourceLocator(object): def shader_cache(self): """ Return path to the shader cache for the current build - ex. engine_root/dev/windows_vs2019/bin/profile/Cache + ex. engine_root/dev/windows/bin/profile/Cache :return: path to the shader cache for the current build """ return os.path.join(self.build_directory(), 'Cache') diff --git a/Tools/LyTestTools/ly_test_tools/_internal/managers/workspace.py b/Tools/LyTestTools/ly_test_tools/_internal/managers/workspace.py index ac412acf84..801729f008 100755 --- a/Tools/LyTestTools/ly_test_tools/_internal/managers/workspace.py +++ b/Tools/LyTestTools/ly_test_tools/_internal/managers/workspace.py @@ -119,7 +119,7 @@ class AbstractWorkspaceManager: def clear_bin(self): """ - Clears the relative Bin folder (i.e. engine_root/dev/windows_vs2019/bin/profile/) + Clears the relative Bin folder (i.e. engine_root/dev/windows/bin/profile/) :return: None """ if os.path.exists(self.paths.build_directory()): diff --git a/Tools/RemoteConsole/ly_remote_console/README.txt b/Tools/RemoteConsole/ly_remote_console/README.txt index 497179ac15..0c5d8c67af 100644 --- a/Tools/RemoteConsole/ly_remote_console/README.txt +++ b/Tools/RemoteConsole/ly_remote_console/README.txt @@ -22,8 +22,7 @@ installed on your system. INSTALL ----------- -It is recommended to set up these these tools with the lmbr_test tool Lumberyard's root directory: - lmbr_test pysetup install +Installation of these tools happen automatically when get_python and cmake is run. To manually install the project in development mode: python -m pip install -e . diff --git a/scripts/build/Platform/Android/build_config.json b/scripts/build/Platform/Android/build_config.json index dbdafcf97d..06fa1ffb5f 100644 --- a/scripts/build/Platform/Android/build_config.json +++ b/scripts/build/Platform/Android/build_config.json @@ -92,7 +92,7 @@ "COMMAND":"../Windows/build_asset_windows.cmd", "PARAMETERS": { "CONFIGURATION":"profile", - "OUTPUT_DIRECTORY":"build\\windows_vs2019", + "OUTPUT_DIRECTORY":"build\\windows", "CMAKE_OPTIONS":"-G \"Visual Studio 16 2019\" -DCMAKE_SYSTEM_VERSION=10.0", "CMAKE_LY_PROJECTS":"AutomatedTesting", "CMAKE_TARGET":"AssetProcessorBatch", diff --git a/scripts/build/Platform/Windows/build_config.json b/scripts/build/Platform/Windows/build_config.json index 6f1aaa1570..c591ca0eac 100644 --- a/scripts/build/Platform/Windows/build_config.json +++ b/scripts/build/Platform/Windows/build_config.json @@ -15,24 +15,24 @@ "validation" ] }, - "debug_vs2019_pipe": { + "debug_pipe": { "TAGS": [ "nightly-incremental", "nightly-clean" ], "steps": [ - "debug_vs2019", - "test_debug_vs2019" + "debug", + "test_debug" ] }, - "profile_vs2019_pipe": { + "profile_pipe": { "TAGS": [ "default" ], "steps": [ - "profile_vs2019", - "asset_profile_vs2019", - "test_cpu_profile_vs2019" + "profile", + "asset_profile", + "test_cpu_profile" ] }, "scrubbing": { @@ -79,40 +79,40 @@ "SCRIPT_PARAMETERS": "--platform 3rdParty --type 3rdParty_all" } }, - "test_impact_analysis_profile_vs2019": { + "test_impact_analysis_profile": { "TAGS": [ ], "COMMAND": "python_windows.cmd", "PARAMETERS": { - "OUTPUT_DIRECTORY": "build/windows_vs2019", + "OUTPUT_DIRECTORY": "build/windows", "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" } }, - "debug_vs2019": { + "debug": { "TAGS": [ "weekly-build-metrics" ], "COMMAND": "build_windows.cmd", "PARAMETERS": { "CONFIGURATION": "debug", - "OUTPUT_DIRECTORY": "build\\windows_vs2019", + "OUTPUT_DIRECTORY": "build\\windows", "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" } }, - "test_debug_vs2019": { + "test_debug": { "TAGS": [ "weekly-build-metrics" ], "COMMAND": "build_test_windows.cmd", "PARAMETERS": { "CONFIGURATION": "debug", - "OUTPUT_DIRECTORY": "build\\windows_vs2019", + "OUTPUT_DIRECTORY": "build\\windows", "CMAKE_OPTIONS": "-G \"Visual Studio 16 2019\" -DCMAKE_SYSTEM_VERSION=10.0", "CMAKE_LY_PROJECTS": "AutomatedTesting", "CMAKE_TARGET": "TEST_SUITE_smoke TEST_SUITE_main", @@ -122,7 +122,7 @@ "TEST_RESULTS": "True" } }, - "profile_vs2019": { + "profile": { "TAGS": [ "daily-pipeline-metrics", "weekly-build-metrics" @@ -130,14 +130,14 @@ "COMMAND": "build_windows.cmd", "PARAMETERS": { "CONFIGURATION": "profile", - "OUTPUT_DIRECTORY": "build\\windows_vs2019", + "OUTPUT_DIRECTORY": "build\\windows", "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" } }, - "profile_vs2019_nounity": { + "profile_nounity": { "TAGS": [ "nightly-incremental", "nightly-clean", @@ -146,14 +146,14 @@ "COMMAND": "build_windows.cmd", "PARAMETERS": { "CONFIGURATION": "profile", - "OUTPUT_DIRECTORY": "build\\windows_vs2019", + "OUTPUT_DIRECTORY": "build\\windows", "CMAKE_OPTIONS": "-G \"Visual Studio 16 2019\" -DCMAKE_SYSTEM_VERSION=10.0 -DLY_UNITY_BUILD=FALSE", "CMAKE_LY_PROJECTS": "AutomatedTesting", "CMAKE_TARGET": "ALL_BUILD", "CMAKE_NATIVE_BUILD_ARGS": "/m /nologo" } }, - "test_cpu_profile_vs2019": { + "test_cpu_profile": { "TAGS": [ "daily-pipeline-metrics", "weekly-build-metrics" @@ -161,7 +161,7 @@ "COMMAND": "build_test_windows.cmd", "PARAMETERS": { "CONFIGURATION": "profile", - "OUTPUT_DIRECTORY": "build\\windows_vs2019", + "OUTPUT_DIRECTORY": "build\\windows", "CMAKE_OPTIONS": "-G \"Visual Studio 16 2019\" -DCMAKE_SYSTEM_VERSION=10.0", "CMAKE_LY_PROJECTS": "AutomatedTesting", "CMAKE_TARGET": "TEST_SUITE_smoke TEST_SUITE_main", @@ -171,7 +171,7 @@ "TEST_RESULTS": "True" } }, - "test_gpu_profile_vs2019": { + "test_gpu_profile": { "TAGS":[ "nightly-incremental", "nightly-clean" @@ -182,7 +182,7 @@ "COMMAND": "build_test_windows.cmd", "PARAMETERS": { "CONFIGURATION": "profile", - "OUTPUT_DIRECTORY": "build\\windows_vs2019", + "OUTPUT_DIRECTORY": "build\\windows", "CMAKE_OPTIONS": "-G \"Visual Studio 16 2019\" -DCMAKE_SYSTEM_VERSION=10.0", "CMAKE_LY_PROJECTS": "AutomatedTesting", "CMAKE_TARGET": "TEST_SUITE_smoke TEST_SUITE_main", @@ -193,7 +193,7 @@ "TEST_SCREENSHOTS": "True" } }, - "asset_profile_vs2019": { + "asset_profile": { "TAGS": [ "weekly-build-metrics", "nightly-incremental", @@ -202,7 +202,7 @@ "COMMAND": "build_asset_windows.cmd", "PARAMETERS": { "CONFIGURATION": "profile", - "OUTPUT_DIRECTORY": "build\\windows_vs2019", + "OUTPUT_DIRECTORY": "build\\windows", "CMAKE_OPTIONS": "-G \"Visual Studio 16 2019\" -DCMAKE_SYSTEM_VERSION=10.0", "CMAKE_LY_PROJECTS": "AutomatedTesting", "CMAKE_TARGET": "AssetProcessorBatch", @@ -212,18 +212,18 @@ "ASSET_PROCESSOR_PLATFORMS": "pc,server" } }, - "awsi_test_profile_vs2019_pipe": { + "awsi_test_profile_pipe": { "TAGS": [ "nightly-incremental", "nightly-clean" ], "steps": [ "awsi_deployment", - "awsi_test_profile_vs2019", + "awsi_test_profile", "awsi_destruction" ] }, - "awsi_test_profile_vs2019": { + "awsi_test_profile": { "TAGS": [ "weekly-build-metrics" ], @@ -233,7 +233,7 @@ "COMMAND": "build_test_windows.cmd", "PARAMETERS": { "CONFIGURATION": "profile", - "OUTPUT_DIRECTORY": "build\\windows_vs2019", + "OUTPUT_DIRECTORY": "build\\windows", "CMAKE_OPTIONS": "-G \"Visual Studio 16 2019\" -DCMAKE_SYSTEM_VERSION=10.0", "CMAKE_LY_PROJECTS": "AutomatedTesting", "CMAKE_TARGET": "TEST_SUITE_awsi", @@ -243,7 +243,7 @@ "TEST_RESULTS": "True" } }, - "periodic_test_profile_vs2019": { + "periodic_test_profile": { "TAGS": [ "nightly-incremental", "nightly-clean", @@ -252,7 +252,7 @@ "COMMAND": "build_test_windows.cmd", "PARAMETERS": { "CONFIGURATION": "profile", - "OUTPUT_DIRECTORY": "build\\windows_vs2019", + "OUTPUT_DIRECTORY": "build\\windows", "CMAKE_OPTIONS": "-G \"Visual Studio 16 2019\" -DCMAKE_SYSTEM_VERSION=10.0", "CMAKE_LY_PROJECTS": "AutomatedTesting", "CMAKE_TARGET": "TEST_SUITE_periodic", @@ -262,7 +262,7 @@ "TEST_RESULTS": "True" } }, - "sandbox_test_profile_vs2019": { + "sandbox_test_profile": { "TAGS": [ "nightly-incremental", "nightly-clean", @@ -274,7 +274,7 @@ "COMMAND": "build_test_windows.cmd", "PARAMETERS": { "CONFIGURATION": "profile", - "OUTPUT_DIRECTORY": "build\\windows_vs2019", + "OUTPUT_DIRECTORY": "build\\windows", "CMAKE_OPTIONS": "-G \"Visual Studio 16 2019\" -DCMAKE_SYSTEM_VERSION=10.0", "CMAKE_LY_PROJECTS": "AutomatedTesting", "CMAKE_TARGET": "TEST_SUITE_sandbox", @@ -284,7 +284,7 @@ "TEST_RESULTS": "True" } }, - "benchmark_test_profile_vs2019": { + "benchmark_test_profile": { "TAGS": [ "nightly-incremental", "nightly-clean", @@ -293,7 +293,7 @@ "COMMAND": "build_test_windows.cmd", "PARAMETERS": { "CONFIGURATION": "profile", - "OUTPUT_DIRECTORY": "build\\windows_vs2019", + "OUTPUT_DIRECTORY": "build\\windows", "CMAKE_OPTIONS": "-G \"Visual Studio 16 2019\" -DCMAKE_SYSTEM_VERSION=10.0", "CMAKE_LY_PROJECTS": "AutomatedTesting", "CMAKE_TARGET": "TEST_SUITE_benchmark", @@ -303,7 +303,7 @@ "TEST_RESULTS": "True" } }, - "release_vs2019": { + "release": { "TAGS": [ "default", "nightly-incremental", @@ -313,14 +313,14 @@ "COMMAND": "build_windows.cmd", "PARAMETERS": { "CONFIGURATION": "release", - "OUTPUT_DIRECTORY": "build\\windows_vs2019", + "OUTPUT_DIRECTORY": "build\\windows", "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" } }, - "monolithic_release_vs2019": { + "monolithic_release": { "TAGS": [ "nightly-incremental", "nightly-clean", @@ -329,25 +329,25 @@ "COMMAND": "build_windows.cmd", "PARAMETERS": { "CONFIGURATION": "release", - "OUTPUT_DIRECTORY": "build\\mono_windows_vs2019", + "OUTPUT_DIRECTORY": "build\\mono_windows", "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": { + "install_profile": { "TAGS": [], "COMMAND": "build_windows.cmd", "PARAMETERS": { "CONFIGURATION": "profile", - "OUTPUT_DIRECTORY": "build\\windows_vs2019", + "OUTPUT_DIRECTORY": "build\\windows", "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" } }, - "installer_vs2019": { + "installer": { "TAGS": [ "nightly-clean", "nightly-installer" @@ -358,7 +358,7 @@ "COMMAND": "build_installer_windows.cmd", "PARAMETERS": { "CONFIGURATION": "profile", - "OUTPUT_DIRECTORY": "build\\windows_vs2019", + "OUTPUT_DIRECTORY": "build\\windows", "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", @@ -366,7 +366,7 @@ "CMAKE_NATIVE_BUILD_ARGS": "/m /nologo" } }, - "install_profile_vs2019_pipe": { + "install_profile_pipe": { "TAGS": [ "nightly-incremental", "nightly-clean" @@ -375,9 +375,9 @@ "PROJECT_REPOSITORY_NAME": "TestProject" }, "steps": [ - "install_profile_vs2019", + "install_profile", "project_generate", - "project_engineinstall_profile_vs2019" + "project_engineinstall_profile" ] }, "project_generate": { @@ -388,7 +388,7 @@ "SCRIPT_PARAMETERS": "create-project -pp %WORKSPACE%\\%PROJECT_REPOSITORY_NAME% --force" } }, - "project_enginesource_profile_vs2019": { + "project_enginesource_profile": { "TAGS": [ "project" ], @@ -398,13 +398,13 @@ "COMMAND": "build_windows.cmd", "PARAMETERS": { "CONFIGURATION": "profile", - "OUTPUT_DIRECTORY": "build\\windows_vs2019", + "OUTPUT_DIRECTORY": "build\\windows", "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" } }, - "project_engineinstall_profile_vs2019": { + "project_engineinstall_profile": { "TAGS": [], "PIPELINE_ENV": { "EXECUTE_FROM_PROJECT": "1" @@ -413,19 +413,19 @@ "PARAMETERS": { "COMMAND_CWD": "%WORKSPACE%\\%PROJECT_REPOSITORY_NAME%", "CONFIGURATION": "profile", - "OUTPUT_DIRECTORY": "build\\windows_vs2019", + "OUTPUT_DIRECTORY": "build\\windows", "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" } }, - "project_engineinstall_profile_vs2019_pipe": { + "project_engineinstall_profile_pipe": { "TAGS": [ "project" ], "steps": [ - "install_profile_vs2019", - "project_engineinstall_profile_vs2019" + "install_profile", + "project_engineinstall_profile" ] }, "awsi_deployment": { diff --git a/scripts/build/Platform/Windows/package_build_config.json b/scripts/build/Platform/Windows/package_build_config.json index 5eb96f1e38..1a94fb802a 100644 --- a/scripts/build/Platform/Windows/package_build_config.json +++ b/scripts/build/Platform/Windows/package_build_config.json @@ -1,9 +1,9 @@ { - "profile_vs2019_atom": { + "profile_atom": { "COMMAND":"build_windows.cmd", "PARAMETERS": { "CONFIGURATION":"profile", - "OUTPUT_DIRECTORY":"windows_vs2019", + "OUTPUT_DIRECTORY":"windows", "CMAKE_OPTIONS":"-G \"Visual Studio 16 2019\" -DCMAKE_SYSTEM_VERSION=10.0", "CMAKE_LY_PROJECTS":"AtomTest;AtomSampleViewer", "CMAKE_TARGET":"ALL_BUILD", diff --git a/scripts/build/package/Platform/Windows/package_env.json b/scripts/build/package/Platform/Windows/package_env.json index 970361bacc..bfe526bc16 100644 --- a/scripts/build/package/Platform/Windows/package_env.json +++ b/scripts/build/package/Platform/Windows/package_env.json @@ -27,7 +27,7 @@ { "BUILD_CONFIG_FILENAME": "build_config.json", "PLATFORM": "Windows", - "TYPE": "profile_vs2019" + "TYPE": "profile" } ] } diff --git a/scripts/o3de/README.txt b/scripts/o3de/README.txt index ded52bb264..39817c2df7 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" + cmake -B windows -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 f05b63bcbaab605e07adad8ce66077ec79db141d Mon Sep 17 00:00:00 2001 From: jckand-amzn <82226555+jckand-amzn@users.noreply.github.com> Date: Tue, 30 Nov 2021 13:18:41 -0600 Subject: [PATCH 52/58] Enabling only optimized test runners for Editor/DynVeg/GradSignal (#5873) Signed-off-by: jckand-amzn <82226555+jckand-amzn@users.noreply.github.com> --- .../Gem/PythonTests/editor/CMakeLists.txt | 54 ------------------- .../editor/TestSuite_Main_Optimized.py | 1 - .../PythonTests/largeworlds/CMakeLists.txt | 33 +----------- .../dyn_veg/TestSuite_Main_Optimized.py | 1 - 4 files changed, 2 insertions(+), 87 deletions(-) diff --git a/AutomatedTesting/Gem/PythonTests/editor/CMakeLists.txt b/AutomatedTesting/Gem/PythonTests/editor/CMakeLists.txt index bf42579970..1fc71da972 100644 --- a/AutomatedTesting/Gem/PythonTests/editor/CMakeLists.txt +++ b/AutomatedTesting/Gem/PythonTests/editor/CMakeLists.txt @@ -7,60 +7,6 @@ # if(PAL_TRAIT_BUILD_TESTS_SUPPORTED AND PAL_TRAIT_BUILD_HOST_TOOLS AND PAL_TRAIT_FOUNDATION_TEST_SUPPORTED) - ly_add_pytest( - NAME AutomatedTesting::EditorTests_Main - TEST_SUITE main - TEST_SERIAL - PATH ${CMAKE_CURRENT_LIST_DIR}/TestSuite_Main.py - PYTEST_MARKS "not REQUIRES_gpu" - RUNTIME_DEPENDENCIES - Legacy::Editor - AZ::AssetProcessor - AutomatedTesting.Assets - COMPONENT - Editor - ) - - ly_add_pytest( - NAME AutomatedTesting::EditorTests_Main_GPU - TEST_SUITE main - TEST_SERIAL - TEST_REQUIRES gpu - PATH ${CMAKE_CURRENT_LIST_DIR}/TestSuite_Main.py - PYTEST_MARKS "REQUIRES_gpu" - RUNTIME_DEPENDENCIES - Legacy::Editor - AZ::AssetProcessor - AutomatedTesting.Assets - COMPONENT - Editor - ) - - ly_add_pytest( - NAME AutomatedTesting::EditorTests_Periodic - TEST_SUITE periodic - TEST_SERIAL - PATH ${CMAKE_CURRENT_LIST_DIR}/TestSuite_Periodic.py - RUNTIME_DEPENDENCIES - Legacy::Editor - AZ::AssetProcessor - AutomatedTesting.Assets - COMPONENT - Editor - ) - - ly_add_pytest( - NAME AutomatedTesting::EditorTests_Sandbox - TEST_SUITE sandbox - TEST_SERIAL - PATH ${CMAKE_CURRENT_LIST_DIR}/TestSuite_Sandbox.py - RUNTIME_DEPENDENCIES - Legacy::Editor - AZ::AssetProcessor - AutomatedTesting.Assets - COMPONENT - Editor - ) ly_add_pytest( NAME AutomatedTesting::EditorTests_Main_Optimized diff --git a/AutomatedTesting/Gem/PythonTests/editor/TestSuite_Main_Optimized.py b/AutomatedTesting/Gem/PythonTests/editor/TestSuite_Main_Optimized.py index ccc4ee9737..d87fd8625b 100644 --- a/AutomatedTesting/Gem/PythonTests/editor/TestSuite_Main_Optimized.py +++ b/AutomatedTesting/Gem/PythonTests/editor/TestSuite_Main_Optimized.py @@ -49,7 +49,6 @@ class TestAutomationNoAutoTestMode(EditorTestSuite): from .EditorScripts import AssetPicker_UI_UX as test_module -@pytest.mark.xfail(reason="Optimized tests are experimental, we will enable xfail and monitor them temporarily.") @pytest.mark.SUITE_main @pytest.mark.parametrize("launcher_platform", ['windows_editor']) @pytest.mark.parametrize("project", ["AutomatedTesting"]) diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/CMakeLists.txt b/AutomatedTesting/Gem/PythonTests/largeworlds/CMakeLists.txt index 98801b49d6..ba607ede32 100644 --- a/AutomatedTesting/Gem/PythonTests/largeworlds/CMakeLists.txt +++ b/AutomatedTesting/Gem/PythonTests/largeworlds/CMakeLists.txt @@ -11,24 +11,10 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED AND PAL_TRAIT_BUILD_HOST_TOOLS AND PAL_TRAIT_ ## DynVeg ## ly_add_pytest( - NAME AutomatedTesting::DynamicVegetationTests_Main + NAME AutomatedTesting::DynamicVegetationTests_Main_Optimized TEST_SERIAL TEST_SUITE main - PATH ${CMAKE_CURRENT_LIST_DIR}/dyn_veg/TestSuite_Main.py - RUNTIME_DEPENDENCIES - AZ::AssetProcessor - Legacy::Editor - AutomatedTesting.GameLauncher - AutomatedTesting.Assets - COMPONENT - LargeWorlds - ) - - ly_add_pytest( - NAME AutomatedTesting::DynamicVegetationTests_Periodic - TEST_SERIAL - TEST_SUITE periodic - PATH ${CMAKE_CURRENT_LIST_DIR}/dyn_veg/TestSuite_Periodic.py + PATH ${CMAKE_CURRENT_LIST_DIR}/dyn_veg/TestSuite_Main_Optimized.py RUNTIME_DEPENDENCIES AZ::AssetProcessor Legacy::Editor @@ -37,7 +23,6 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED AND PAL_TRAIT_BUILD_HOST_TOOLS AND PAL_TRAIT_ COMPONENT LargeWorlds ) - ly_add_pytest( NAME AutomatedTesting::DynamicVegetationTests_Periodic_Optimized TEST_SERIAL @@ -52,20 +37,6 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED AND PAL_TRAIT_BUILD_HOST_TOOLS AND PAL_TRAIT_ LargeWorlds ) - ly_add_pytest( - NAME AutomatedTesting::DynamicVegetationTests_Main_Optimized - TEST_SERIAL - TEST_SUITE main - PATH ${CMAKE_CURRENT_LIST_DIR}/dyn_veg/TestSuite_Main_Optimized.py - RUNTIME_DEPENDENCIES - AZ::AssetProcessor - Legacy::Editor - AutomatedTesting.Assets - AutomatedTesting.GameLauncher - COMPONENT - LargeWorlds - ) - ## LandscapeCanvas ## ly_add_pytest( 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 ed23af51ad..d83f88cad2 100644 --- a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/TestSuite_Main_Optimized.py +++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/TestSuite_Main_Optimized.py @@ -12,7 +12,6 @@ import ly_test_tools.environment.file_system as file_system from ly_test_tools.o3de.editor_test import EditorSingleTest, EditorSharedTest, EditorParallelTest, EditorTestSuite -@pytest.mark.xfail(reason="Optimized tests are experimental, we will enable xfail and monitor them temporarily.") @pytest.mark.SUITE_main @pytest.mark.parametrize("launcher_platform", ['windows_editor']) @pytest.mark.parametrize("project", ["AutomatedTesting"]) From b63064f604a5a2f66a6de8e7b7cc910012b694cb Mon Sep 17 00:00:00 2001 From: AMZN-stankowi <4838196+AMZN-stankowi@users.noreply.github.com> Date: Tue, 30 Nov 2021 11:34:54 -0800 Subject: [PATCH 53/58] Automated test for bundle mode that creates and mounts a bundle with a level.pak file in it, and verifies that occurs. (#5805) This is a regression test for bundle mode causing the editor to crash if you mount a bundle containing a level.pak file. Signed-off-by: AMZN-stankowi <4838196+AMZN-stankowi@users.noreply.github.com> --- .../asset_processor_tests/CMakeLists.txt | 13 +++ .../bundle_mode_in_editor_tests.py | 20 ++++ .../bundle_mode_tests.py | 93 +++++++++++++++++++ .../ly_test_tools/launchers/platforms/base.py | 2 +- 4 files changed, 127 insertions(+), 1 deletion(-) create mode 100644 AutomatedTesting/Gem/PythonTests/assetpipeline/asset_processor_tests/bundle_mode_in_editor_tests.py create mode 100644 AutomatedTesting/Gem/PythonTests/assetpipeline/asset_processor_tests/bundle_mode_tests.py diff --git a/AutomatedTesting/Gem/PythonTests/assetpipeline/asset_processor_tests/CMakeLists.txt b/AutomatedTesting/Gem/PythonTests/assetpipeline/asset_processor_tests/CMakeLists.txt index 5a5809595e..e37a5ed99b 100644 --- a/AutomatedTesting/Gem/PythonTests/assetpipeline/asset_processor_tests/CMakeLists.txt +++ b/AutomatedTesting/Gem/PythonTests/assetpipeline/asset_processor_tests/CMakeLists.txt @@ -103,6 +103,19 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED AND PAL_TRAIT_BUILD_HOST_TOOLS) AZ::AssetBundlerBatch ) + ly_add_pytest( + NAME AssetPipelineTests.BundleMode + PATH ${CMAKE_CURRENT_LIST_DIR}/bundle_mode_tests.py + EXCLUDE_TEST_RUN_TARGET_FROM_IDE + TEST_SERIAL + TEST_SUITE periodic + RUNTIME_DEPENDENCIES + AZ::AssetProcessor + AZ::AssetBundlerBatch + Legacy::Editor + AutomatedTesting.Assets + ) + ly_add_pytest( NAME AssetPipelineTests.AssetBuilder PATH ${CMAKE_CURRENT_LIST_DIR}/asset_builder_tests.py diff --git a/AutomatedTesting/Gem/PythonTests/assetpipeline/asset_processor_tests/bundle_mode_in_editor_tests.py b/AutomatedTesting/Gem/PythonTests/assetpipeline/asset_processor_tests/bundle_mode_in_editor_tests.py new file mode 100644 index 0000000000..33a55d6601 --- /dev/null +++ b/AutomatedTesting/Gem/PythonTests/assetpipeline/asset_processor_tests/bundle_mode_in_editor_tests.py @@ -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 +""" +import azlmbr.bus +import azlmbr.editor +import azlmbr.legacy.general +import sys + +# Print out the passed in bundle_path, so the outer test can verify this was sent in correctly +bundle_path = sys.argv[1] +print('Bundle mode test running with path {}'.format(sys.argv[1])) + +# Turn on bundle mode. This will trigger some printouts that the outer test logic will validate. +azlmbr.legacy.general.set_cvar_integer("sys_report_files_not_found_in_paks", 1) +azlmbr.legacy.general.run_console(f"loadbundles {bundle_path}") + +azlmbr.editor.EditorToolsApplicationRequestBus(azlmbr.bus.Broadcast, 'ExitNoPrompt') diff --git a/AutomatedTesting/Gem/PythonTests/assetpipeline/asset_processor_tests/bundle_mode_tests.py b/AutomatedTesting/Gem/PythonTests/assetpipeline/asset_processor_tests/bundle_mode_tests.py new file mode 100644 index 0000000000..af92bb1773 --- /dev/null +++ b/AutomatedTesting/Gem/PythonTests/assetpipeline/asset_processor_tests/bundle_mode_tests.py @@ -0,0 +1,93 @@ +""" +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 os +import pytest +import logging +import sys +import time +pytest.importorskip('ly_test_tools') + +import ly_test_tools.environment.file_system as fs +import ly_test_tools.environment.waiter as waiter +import ly_test_tools.log.log_monitor + +from ..ap_fixtures.asset_processor_fixture import asset_processor as asset_processor +from ..ap_fixtures.bundler_batch_setup_fixture import bundler_batch_setup_fixture as bundler_batch_helper +from ..ap_fixtures.timeout_option_fixture import timeout_option_fixture as timeout + +@pytest.mark.SUITE_periodic +@pytest.mark.parametrize('launcher_platform', ['windows_editor']) +@pytest.mark.parametrize('project', ['AutomatedTesting']) +@pytest.mark.parametrize('level', ['auto_test']) +class TestBundleMode(object): + def test_bundle_mode_with_levels_mounts_bundles_correctly(self, request, editor, level, launcher_platform, + asset_processor, workspace, bundler_batch_helper): + level_pak = os.path.join("levels", level, "level.pak") + + bundles_folder = os.path.join(workspace.paths.project(), "Bundles") + bundle_request_path = os.path.join(bundles_folder, "bundle.pak") + bundle_result_path = os.path.join(bundles_folder, + bundler_batch_helper.platform_file_name( + "bundle.pak", workspace.asset_processor_platform)) + + # Create target 'Bundles' folder if it doesn't exist + if not os.path.exists(bundles_folder): + os.mkdir(bundles_folder) + # Delete target bundle file if it already exists + if os.path.exists(bundle_result_path): + fs.delete([bundle_result_path], True, False) + + # Make asset list file to use in the bundle + bundler_batch_helper.call_assetLists( + addSeed=level_pak, + assetListFile=bundler_batch_helper["asset_info_file_request"], + ) + + # Make bundle in /Bundles + bundler_batch_helper.call_bundles( + assetListFile=bundler_batch_helper["asset_info_file_result"], + outputBundlePath=bundle_request_path, + maxSize="2048", + ) + + # Ensure the bundle was created + assert os.path.exists(bundle_result_path), f"Bundle was not created at location: {bundle_result_path}" + + # The editor flips the slash direction in some of the printouts + bundle_result_path_editor_separator = bundle_result_path.replace('\\', '/') + + expected_lines = [ + # A beginning of test printout can help debug where failures occur, if this line is missing + # then the Editor didn't launch, didn't run the Python test, or didn't pass in the right parameter + f'Bundle mode test running with path {bundles_folder}', + # These printouts happen in response to the loadbundles call, and verify this bundle is actually loaded + f"[CONSOLE] Executing console command 'loadbundles {bundles_folder}'", + f'(BundlingSystem) - Loading bundles from {bundles_folder} of type .pak', + f'(Archive) - Opening archive file {bundle_result_path_editor_separator}', + ] + unexpected_lines = [] + + timeout = 180 + halt_on_unexpected = False + test_directory = os.path.join(os.path.dirname(__file__)) + test_file = os.path.join(test_directory, 'bundle_mode_in_editor_tests.py') + editor.args.extend(['-NullRenderer', '-rhi=Null', "--skipWelcomeScreenDialog", + "--autotest_mode", "--runpythontest", test_file, "--runpythonargs", bundles_folder]) + + with editor.start(launch_ap=True): + editor_log_file = os.path.join(editor.workspace.paths.project_log(), 'Editor.log') + log_monitor = ly_test_tools.log.log_monitor.LogMonitor(editor, editor_log_file) + waiter.wait_for( + lambda: editor.is_alive(), + timeout, + exc=("Log file '{}' was never opened by another process.".format(editor_log_file)), + interval=1) + log_monitor.monitor_log_for_lines(expected_lines, unexpected_lines, halt_on_unexpected, timeout) + + # Delete the bundle created and used in this test + fs.delete([bundle_result_path], True, False) diff --git a/Tools/LyTestTools/ly_test_tools/launchers/platforms/base.py b/Tools/LyTestTools/ly_test_tools/launchers/platforms/base.py index d32be10562..c9458899b4 100755 --- a/Tools/LyTestTools/ly_test_tools/launchers/platforms/base.py +++ b/Tools/LyTestTools/ly_test_tools/launchers/platforms/base.py @@ -91,7 +91,7 @@ class Launcher(object): open(os.path.join(self.workspace.paths.project_log(), artifact), 'w').close() # clear it log.info(f"Clearing pre-existing artifact {artifact} from calling Launcher.setup()") except PermissionError: - log.warn(f'Unable to remove artifact: {artifact}, skipping.') + log.warning(f'Unable to remove artifact: {artifact}, skipping.') pass # In case this is the first run, we will create default logs to prevent the logmonitor from not finding the file From b3bf02a4d5e03f11b4bec5417d2c8c606fff7475 Mon Sep 17 00:00:00 2001 From: AMZN-nggieber <52797929+AMZN-nggieber@users.noreply.github.com> Date: Tue, 30 Nov 2021 13:13:42 -0800 Subject: [PATCH 54/58] Adds Warning Dialog When Following an External Link in Project Manager (#6003) Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com> --- .../Resources/ProjectManager.qss | 10 +- .../Source/ExternalLinkDialog.cpp | 98 +++++++++++++++++++ .../Source/ExternalLinkDialog.h | 28 ++++++ .../Source/GemCatalog/GemUninstallDialog.cpp | 2 +- .../Source/GemCatalog/GemUpdateDialog.cpp | 2 +- .../ProjectManager/Source/LinkWidget.cpp | 29 +++++- .../Source/ProjectManagerSettings.cpp | 7 +- .../Source/ProjectManagerSettings.h | 1 + .../project_manager_files.cmake | 2 + 9 files changed, 170 insertions(+), 9 deletions(-) create mode 100644 Code/Tools/ProjectManager/Source/ExternalLinkDialog.cpp create mode 100644 Code/Tools/ProjectManager/Source/ExternalLinkDialog.h diff --git a/Code/Tools/ProjectManager/Resources/ProjectManager.qss b/Code/Tools/ProjectManager/Resources/ProjectManager.qss index 426f409581..1fc808b72c 100644 --- a/Code/Tools/ProjectManager/Resources/ProjectManager.qss +++ b/Code/Tools/ProjectManager/Resources/ProjectManager.qss @@ -232,6 +232,11 @@ QTabBar::tab:focus { stop: 0 #555555, stop: 1.0 #777777); } +#dialogSubTitle { + font-size:14px; + font-weight:600; +} + #horizontalSeparatingLine { color: #666666; } @@ -604,11 +609,6 @@ QProgressBar::chunk { stop: 0 #951D1F, stop: 1.0 #C92724); } -#gemCatalogDialogSubTitle { - font-size:14px; - font-weight:600; -} - /************** Filter Tag widget **************/ #FilterTagWidgetTextLabel { diff --git a/Code/Tools/ProjectManager/Source/ExternalLinkDialog.cpp b/Code/Tools/ProjectManager/Source/ExternalLinkDialog.cpp new file mode 100644 index 0000000000..122a5cbf5a --- /dev/null +++ b/Code/Tools/ProjectManager/Source/ExternalLinkDialog.cpp @@ -0,0 +1,98 @@ +/* + * 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 + +namespace O3DE::ProjectManager +{ + ExternalLinkDialog::ExternalLinkDialog(const QUrl& url, QWidget* parent) + : QDialog(parent) + { + setWindowTitle(tr("Leaving O3DE")); + setObjectName("ExternalLinkDialog"); + setAttribute(Qt::WA_DeleteOnClose); + setModal(true); + + QHBoxLayout* hLayout = new QHBoxLayout(); + hLayout->setMargin(30); + hLayout->setAlignment(Qt::AlignTop); + setLayout(hLayout); + + QVBoxLayout* warningLayout = new QVBoxLayout(); + warningLayout->setMargin(0); + warningLayout->setAlignment(Qt::AlignTop); + hLayout->addLayout(warningLayout); + + QLabel* warningIcon = new QLabel(this); + warningIcon->setPixmap(QIcon(":/Warning.svg").pixmap(32, 32)); + warningLayout->addWidget(warningIcon); + + warningLayout->addStretch(); + + QVBoxLayout* layout = new QVBoxLayout(); + layout->setMargin(0); + layout->setAlignment(Qt::AlignTop); + hLayout->addLayout(layout); + + // Body + QLabel* subTitleLabel = new QLabel(tr("You are about to leave O3DE Project Manager to visit an external link.")); + subTitleLabel->setObjectName("dialogSubTitle"); + layout->addWidget(subTitleLabel); + + layout->addSpacing(10); + + QLabel* bodyLabel = new QLabel(tr("If you trust this source, you can proceed to this link, or click \"Cancel\" to return.")); + layout->addWidget(bodyLabel); + + // Don't actually set linkUrl we are just using LinkLabel superficially here + LinkLabel* linkLabel = new LinkLabel(url.toString(), {}, 12); + layout->addWidget(linkLabel); + + layout->addSpacing(40); + + QCheckBox* skipDialogCheckbox = new QCheckBox(tr("Do not show this again")); + layout->addWidget(skipDialogCheckbox); + connect(skipDialogCheckbox, &QCheckBox::stateChanged, this, &ExternalLinkDialog::SetSkipDialogSetting); + + // Buttons + QDialogButtonBox* dialogButtons = new QDialogButtonBox(); + dialogButtons->setObjectName("footer"); + layout->addWidget(dialogButtons); + + QPushButton* cancelButton = dialogButtons->addButton(tr("Cancel"), QDialogButtonBox::RejectRole); + cancelButton->setProperty("secondary", true); + QPushButton* acceptButton = dialogButtons->addButton(tr("Proceed"), QDialogButtonBox::ApplyRole); + + connect(cancelButton, &QPushButton::clicked, this, &QDialog::reject); + connect(acceptButton, &QPushButton::clicked, this, &QDialog::accept); + } + + void ExternalLinkDialog::SetSkipDialogSetting(bool state) + { + auto settingsRegistry = AZ::SettingsRegistry::Get(); + if (settingsRegistry) + { + QString settingsKey = GetExternalLinkWarningKey(); + settingsRegistry->Set(settingsKey.toStdString().c_str(), state); + SaveProjectManagerSettings(); + } + } +} // namespace O3DE::ProjectManager diff --git a/Code/Tools/ProjectManager/Source/ExternalLinkDialog.h b/Code/Tools/ProjectManager/Source/ExternalLinkDialog.h new file mode 100644 index 0000000000..45d391e64e --- /dev/null +++ b/Code/Tools/ProjectManager/Source/ExternalLinkDialog.h @@ -0,0 +1,28 @@ +/* + * 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 + +#if !defined(Q_MOC_RUN) +#include +#endif + +namespace O3DE::ProjectManager +{ + class ExternalLinkDialog + : public QDialog + { + Q_OBJECT // AUTOMOC + public: + explicit ExternalLinkDialog(const QUrl& url, QWidget* parent = nullptr); + ~ExternalLinkDialog() = default; + + private slots: + void SetSkipDialogSetting(bool state); + }; +} // namespace O3DE::ProjectManager diff --git a/Code/Tools/ProjectManager/Source/GemCatalog/GemUninstallDialog.cpp b/Code/Tools/ProjectManager/Source/GemCatalog/GemUninstallDialog.cpp index 1408e29b6d..679d9c576f 100644 --- a/Code/Tools/ProjectManager/Source/GemCatalog/GemUninstallDialog.cpp +++ b/Code/Tools/ProjectManager/Source/GemCatalog/GemUninstallDialog.cpp @@ -31,7 +31,7 @@ namespace O3DE::ProjectManager // Body QLabel* subTitleLabel = new QLabel(tr("Are you sure you want to uninstall %1?").arg(gemName)); - subTitleLabel->setObjectName("gemCatalogDialogSubTitle"); + subTitleLabel->setObjectName("dialogSubTitle"); layout->addWidget(subTitleLabel); layout->addSpacing(10); diff --git a/Code/Tools/ProjectManager/Source/GemCatalog/GemUpdateDialog.cpp b/Code/Tools/ProjectManager/Source/GemCatalog/GemUpdateDialog.cpp index 82d205aab5..d973dd3749 100644 --- a/Code/Tools/ProjectManager/Source/GemCatalog/GemUpdateDialog.cpp +++ b/Code/Tools/ProjectManager/Source/GemCatalog/GemUpdateDialog.cpp @@ -32,7 +32,7 @@ namespace O3DE::ProjectManager // Body QLabel* subTitleLabel = new QLabel(tr("%1 to the latest version of %2?").arg( updateAvaliable ? tr("Update") : tr("Force update"), gemName)); - subTitleLabel->setObjectName("gemCatalogDialogSubTitle"); + subTitleLabel->setObjectName("dialogSubTitle"); layout->addWidget(subTitleLabel); layout->addSpacing(10); diff --git a/Code/Tools/ProjectManager/Source/LinkWidget.cpp b/Code/Tools/ProjectManager/Source/LinkWidget.cpp index 9c8c78ed37..f25e38db67 100644 --- a/Code/Tools/ProjectManager/Source/LinkWidget.cpp +++ b/Code/Tools/ProjectManager/Source/LinkWidget.cpp @@ -7,6 +7,11 @@ */ #include +#include +#include + +#include + #include #include #include @@ -26,7 +31,29 @@ namespace O3DE::ProjectManager { if (m_url.isValid()) { - QDesktopServices::openUrl(m_url); + // Check if user request not to be shown external link warning dialog + bool skipDialog = false; + auto settingsRegistry = AZ::SettingsRegistry::Get(); + + if (settingsRegistry) + { + QString settingsKey = GetExternalLinkWarningKey(); + settingsRegistry->Get(skipDialog, settingsKey.toStdString().c_str()); + } + + if (!skipDialog) + { + // Style does not apply if LinkLabel is parent so use parentWidget as parent instead + ExternalLinkDialog* linkDialog = new ExternalLinkDialog(m_url.toString(), parentWidget()); + if (linkDialog->exec() == QDialog::Accepted) + { + QDesktopServices::openUrl(m_url); + } + } + else + { + QDesktopServices::openUrl(m_url); + } } emit clicked(); diff --git a/Code/Tools/ProjectManager/Source/ProjectManagerSettings.cpp b/Code/Tools/ProjectManager/Source/ProjectManagerSettings.cpp index 3049a6d70c..66480aab3e 100644 --- a/Code/Tools/ProjectManager/Source/ProjectManagerSettings.cpp +++ b/Code/Tools/ProjectManager/Source/ProjectManagerSettings.cpp @@ -6,7 +6,7 @@ * */ -#include "ProjectManagerSettings.h" +#include #include #include @@ -51,4 +51,9 @@ namespace O3DE::ProjectManager { return QString("%1/Projects/%2/BuiltSuccessfully").arg(ProjectManagerKeyPrefix).arg(projectName); } + + QString GetExternalLinkWarningKey() + { + return QString("%1/SkipExternalLinkWarning").arg(ProjectManagerKeyPrefix); + } } diff --git a/Code/Tools/ProjectManager/Source/ProjectManagerSettings.h b/Code/Tools/ProjectManager/Source/ProjectManagerSettings.h index 3454909062..93cfbc5ceb 100644 --- a/Code/Tools/ProjectManager/Source/ProjectManagerSettings.h +++ b/Code/Tools/ProjectManager/Source/ProjectManagerSettings.h @@ -18,4 +18,5 @@ namespace O3DE::ProjectManager void SaveProjectManagerSettings(); QString GetProjectBuiltSuccessfullyKey(const QString& projectName); + QString GetExternalLinkWarningKey(); } diff --git a/Code/Tools/ProjectManager/project_manager_files.cmake b/Code/Tools/ProjectManager/project_manager_files.cmake index 43c11edacc..468e8dcbc5 100644 --- a/Code/Tools/ProjectManager/project_manager_files.cmake +++ b/Code/Tools/ProjectManager/project_manager_files.cmake @@ -78,6 +78,8 @@ set(FILES Source/TagWidget.cpp Source/TemplateButtonWidget.h Source/TemplateButtonWidget.cpp + Source/ExternalLinkDialog.h + Source/ExternalLinkDialog.cpp Source/GemCatalog/GemCatalogHeaderWidget.h Source/GemCatalog/GemCatalogHeaderWidget.cpp Source/GemCatalog/GemCatalogScreen.h From b7f051fb9aea28ed973eab3fdd9a60f18d2d4581 Mon Sep 17 00:00:00 2001 From: amzn-mike <80125227+amzn-mike@users.noreply.github.com> Date: Tue, 30 Nov 2021 15:44:20 -0600 Subject: [PATCH 55/58] Procedural Prefabs - Add mesh modifier support (#5894) * Clean up error output Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com> * Add mesh modifiers to scene_data.py Add example usage of modifiers to scene_mesh_to_prefab.py Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com> * Add type hints, cleanup dict creation, fix variable naming Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com> * Add documentation Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com> * Rename DefaultOrValue to __default_or_value Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com> --- .../Editor/Scripts/scene_mesh_to_prefab.py | 14 +- .../Editor/Scripts/scene_api/scene_data.py | 174 ++++++++++++++++-- 2 files changed, 164 insertions(+), 24 deletions(-) diff --git a/AutomatedTesting/Editor/Scripts/scene_mesh_to_prefab.py b/AutomatedTesting/Editor/Scripts/scene_mesh_to_prefab.py index e832b1f82b..7b9349e270 100644 --- a/AutomatedTesting/Editor/Scripts/scene_mesh_to_prefab.py +++ b/AutomatedTesting/Editor/Scripts/scene_mesh_to_prefab.py @@ -5,7 +5,7 @@ # SPDX-License-Identifier: Apache-2.0 OR MIT # # -import os, traceback, binascii, sys, json, pathlib +import os, traceback, binascii, sys, json, pathlib, logging import azlmbr.math import azlmbr.bus @@ -15,9 +15,9 @@ import azlmbr.bus def log_exception_traceback(): - exc_type, exc_value, exc_tb = sys.exc_info() - data = traceback.format_exception(exc_type, exc_value, exc_tb) - print(str(data)) + data = traceback.format_exc() + logger = logging.getLogger('python') + logger.error(data) def get_mesh_node_names(sceneGraph): import azlmbr.scene as sceneApi @@ -114,12 +114,18 @@ def update_manifest(scene): mesh_group['id'] = '{' + str(uuid.uuid5(uuid.NAMESPACE_DNS, source_filename_only + mesh_path)) + '}' # Set our current node as the only node that is included in this MeshGroup scene_manifest.mesh_group_select_node(mesh_group, mesh_path) + scene_manifest.mesh_group_add_comment(mesh_group, "Hello World") # Explicitly remove all other nodes to prevent implicit inclusions for node in all_node_paths: if node != mesh_path: scene_manifest.mesh_group_unselect_node(mesh_group, node) + scene_manifest.mesh_group_add_cloth_rule(mesh_group, mesh_path, "Col0", 1, "Col0", 2, "Col0", 2, 3) + scene_manifest.mesh_group_add_advanced_mesh_rule(mesh_group, True, False, True, "Col0") + scene_manifest.mesh_group_add_skin_rule(mesh_group, 3, 0.002) + scene_manifest.mesh_group_add_tangent_rule(mesh_group, 1, 0) + # Create an editor entity entity_id = azlmbr.entity.EntityUtilityBus(azlmbr.bus.Broadcast, "CreateEditorReadyEntity", mesh_group_name) # Add an EditorMeshComponent to the entity diff --git a/Gems/PythonAssetBuilder/Editor/Scripts/scene_api/scene_data.py b/Gems/PythonAssetBuilder/Editor/Scripts/scene_api/scene_data.py index 2578efeae2..d105ecdb43 100755 --- a/Gems/PythonAssetBuilder/Editor/Scripts/scene_api/scene_data.py +++ b/Gems/PythonAssetBuilder/Editor/Scripts/scene_api/scene_data.py @@ -95,7 +95,7 @@ class SceneManifest(): def __init__(self): self.manifest = {'values': []} - def add_mesh_group(self, name) -> dict: + def add_mesh_group(self, name: str) -> dict: meshGroup = {} meshGroup['$type'] = '{07B356B7-3635-40B5-878A-FAC4EFD5AD86} MeshGroup' meshGroup['name'] = name @@ -104,7 +104,7 @@ class SceneManifest(): self.manifest['values'].append(meshGroup) return meshGroup - def add_prefab_group(self, name, id, json) -> dict: + def add_prefab_group(self, name: str, id: str, json: dict) -> dict: prefabGroup = {} prefabGroup['$type'] = '{99FE3C6F-5B55-4D8B-8013-2708010EC715} PrefabGroup' prefabGroup['name'] = name @@ -113,30 +113,164 @@ class SceneManifest(): self.manifest['values'].append(prefabGroup) return prefabGroup - def mesh_group_select_node(self, meshGroup, nodeName): - meshGroup['nodeSelectionList']['selectedNodes'].append(nodeName) + def mesh_group_select_node(self, mesh_group: dict, node_name: str) -> None: + mesh_group['nodeSelectionList']['selectedNodes'].append(node_name) - def mesh_group_unselect_node(self, meshGroup, nodeName): - meshGroup['nodeSelectionList']['unselectedNodes'].append(nodeName) + def mesh_group_unselect_node(self, mesh_group: dict, node_name: str) -> None: + mesh_group['nodeSelectionList']['unselectedNodes'].append(node_name) - def mesh_group_add_advanced_coordinate_system(self, meshGroup, originNodeName, translation, rotation, scale): - originRule = {} - originRule['$type'] = 'CoordinateSystemRule' - originRule['useAdvancedData'] = True - originRule['originNodeName'] = '' if originNodeName is None else originNodeName + def mesh_group_add_advanced_coordinate_system(self, mesh_group: dict, origin_node_name: str, translation: object, + rotation: object, scale: float) -> None: + origin_rule = { + '$type': 'CoordinateSystemRule', + 'useAdvancedData': True, + 'originNodeName': '' if origin_node_name is None else origin_node_name + } if translation is not None: - originRule['translation'] = translation + origin_rule['translation'] = translation if rotation is not None: - originRule['rotation'] = rotation + origin_rule['rotation'] = rotation if scale != 1.0: - originRule['scale'] = scale - meshGroup['rules']['rules'].append(originRule) + origin_rule['scale'] = scale + mesh_group['rules']['rules'].append(origin_rule) - def mesh_group_add_comment(self, meshGroup, comment): - commentRule = {} - commentRule['$type'] = 'CommentRule' - commentRule['comment'] = comment - meshGroup['rules']['rules'].append(commentRule) + def mesh_group_add_comment(self, mesh_group: dict, comment: str) -> None: + commentRule = { + '$type': 'CommentRule', + 'comment': comment + } + mesh_group['rules']['rules'].append(commentRule) + + def __default_or_value(self, val, default): + return default if val is None else val + + def mesh_group_add_cloth_rule(self, mesh_group: dict, cloth_node_name: str, + inverse_masses_stream_name: str, inverse_masses_channel: int, + motion_constraints_stream_name: str, motion_constraints_channel: int, + backstop_stream_name: str, backstop_offset_channel: int, + backstop_radius_channel: int) -> None: + """ + Adds a Cloth rule. 0 = Red, 1 = Green, 2 = Blue, 3 = Alpha + :param mesh_group: Mesh Group to add the cloth rule to + :param cloth_node_name: Name of the node that the rule applies to + :param inverse_masses_stream_name: Name of the color stream to use for inverse masses + :param inverse_masses_channel: Color channel (index) for inverse masses + :param motion_constraints_stream_name: Name of the color stream to use for motion constraints + :param motion_constraints_channel: Color channel (index) for motion constraints + :param backstop_stream_name: Name of the color stream to use for backstop + :param backstop_offset_channel: Color channel (index) for backstop offset value + :param backstop_radius_channel: Color chnanel (index) for backstop radius value + """ + cloth_rule = { + '$type': 'ClothRule', + 'meshNodeName': cloth_node_name, + 'inverseMassesStreamName': self.__default_or_value(inverse_masses_stream_name, 'Default: 1.0') + } + + if inverse_masses_channel is not None: + cloth_rule['inverseMassesChannel'] = inverse_masses_channel + cloth_rule['motionConstraintsStreamName'] = self.__default_or_value(motion_constraints_stream_name, 'Default: 1.0') + if motion_constraints_channel is not None: + cloth_rule['motionConstraintsChannel'] = motion_constraints_channel + cloth_rule['backstopStreamName'] = self.__default_or_value(backstop_stream_name, 'None') + if backstop_offset_channel is not None: + cloth_rule['backstopOffsetChannel'] = backstop_offset_channel + if backstop_radius_channel is not None: + cloth_rule['backstopRadiusChannel'] = backstop_radius_channel + mesh_group['rules']['rules'].append(cloth_rule) + + def mesh_group_add_lod_rule(self, mesh_group: dict) -> dict: + """ + Adds an LOD rule + :param mesh_group: Mesh Group to add the rule to + :return: LOD rule + """ + lod_rule = { + '$type': '{6E796AC8-1484-4909-860A-6D3F22A7346F} LodRule', + 'nodeSelectionList': [] + } + + mesh_group['rules']['rules'].append(lod_rule) + return lod_rule + + def lod_rule_add_lod(self, lod_rule: dict) -> dict: + """ + Adds an LOD level to the LOD rule. Nodes are added in order. The first node added represents LOD1, 2nd LOD2, etc + :param lod_rule: LOD rule to add the LOD level to + :return: LOD level + """ + lod = {'selectedNodes': [], 'unselectedNodes': []} + lod_rule['nodeSelectionList'].append(lod) + return lod + + def lod_select_node(self, lod: dict, selected_node: str) -> None: + """ + Adds a node as a selected node + :param lod: LOD level to add the node to + :param selected_node: Path of the node + """ + lod['selectedNodes'].append(selected_node) + + def lod_unselect_node(self, lod: dict, unselected_node: str) -> None: + """ + Adds a node as an unselected node + :param lod: LOD rule to add the node to + :param unselected_node: Path of the node + """ + lod['unselectedNodes'].append(unselected_node) + + def mesh_group_add_advanced_mesh_rule(self, mesh_group: dict, use_32bit_vertices: bool, merge_meshes: bool, + use_custom_normals: bool, + vertex_color_stream: str) -> None: + """ + Adds an Advanced Mesh rule + :param mesh_group: Mesh Group to add the rule to + :param use_32bit_vertices: False = 16bit vertex position precision. True = 32bit vertex position precision + :param merge_meshes: Merge all meshes into a single mesh + :param use_custom_normals: True = use normals from DCC tool. False = average normals + :param vertex_color_stream: Color stream name to use for Vertex Coloring + """ + rule = { + '$type': 'StaticMeshAdvancedRule', + 'use32bitVertices': self.__default_or_value(use_32bit_vertices, False), + 'mergeMeshes': self.__default_or_value(merge_meshes, True), + 'useCustomNormals': self.__default_or_value(use_custom_normals, True) + } + + if vertex_color_stream is not None: + rule['vertexColorStreamName'] = vertex_color_stream + + mesh_group['rules']['rules'].append(rule) + + def mesh_group_add_skin_rule(self, mesh_group: dict, max_weights_per_vertex: int, weight_threshold: float) -> None: + """ + Adds a Skin rule + :param mesh_group: Mesh Group to add the rule to + :param max_weights_per_vertex: Max number of joints that can influence a vertex + :param weight_threshold: Weight values below this value will be treated as 0 + """ + rule = { + '$type': 'SkinRule', + 'maxWeightsPerVertex': self.__default_or_value(max_weights_per_vertex, 4), + 'weightThreshold': self.__default_or_value(weight_threshold, 0.001) + } + + mesh_group['rules']['rules'].append(rule) + + def mesh_group_add_tangent_rule(self, mesh_group: dict, tangent_space: int, tspace_method: int) -> None: + """ + Adds a Tangent rule to control tangent space generation + :param mesh_group: Mesh Group to add the rule to + :param tangent_space: Tangent space source. 0 = Scene, 1 = MikkT Tangent Generation + :param tspace_method: MikkT Generation method. 0 = TSpace, 1 = TSpaceBasic + """ + rule = { + '$type': 'TangentsRule', + 'tangentSpace': self.__default_or_value(tangent_space, 1), + 'tSpaceMethod': self.__default_or_value(tspace_method, 0) + } + + mesh_group['rules']['rules'].append(rule) def export(self): return json.dumps(self.manifest) From 858885dca932e6bda964616dab852cfe358e87ee Mon Sep 17 00:00:00 2001 From: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> Date: Tue, 30 Nov 2021 13:46:53 -0800 Subject: [PATCH 56/58] Removes all files from linux install (#6019) Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> --- cmake/Platform/Linux/Packaging/postrm.in | 5 ----- cmake/Platform/Linux/Packaging/prerm.in | 3 ++- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/cmake/Platform/Linux/Packaging/postrm.in b/cmake/Platform/Linux/Packaging/postrm.in index acda38bf1e..cd6f37abe4 100644 --- a/cmake/Platform/Linux/Packaging/postrm.in +++ b/cmake/Platform/Linux/Packaging/postrm.in @@ -8,8 +8,3 @@ # 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 index 5595d7010f..843f21da24 100644 --- a/cmake/Platform/Linux/Packaging/prerm.in +++ b/cmake/Platform/Linux/Packaging/prerm.in @@ -19,5 +19,6 @@ set -o errexit # exit on the first failure encountered pushd @CPACK_PACKAGING_INSTALL_PREFIX@ # delete python downloads rm -rf python/downloaded_packages python/runtime - popd + find . -type d -name *.egg-info -prune -exec rm -rf {} \; + popd } &> /dev/null # hide output From fb6e6e339fe8777bc0304b33d60098ac87f11534 Mon Sep 17 00:00:00 2001 From: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> Date: Tue, 30 Nov 2021 15:07:57 -0800 Subject: [PATCH 57/58] Add CRC validator (#5857) * Adds crc validation checks Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> * Fixes invalid CRCs Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> * Changes test to smoke suite Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> * excludes some test data from the validator Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> * uses pathlib instead of os.path Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> * fixes wrong path to test scripts Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> * Escape not needed Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> --- Code/Framework/AzCore/AzCore/Math/Crc.h | 4 +- .../AzToolsFramework/Viewport/ActionBus.h | 10 ++-- .../Code/Source/AtomBridgeSystemComponent.cpp | 4 +- .../AssetCollectionAsyncLoaderTestComponent.h | 4 +- ...tomViewportDisplayIconsSystemComponent.cpp | 2 +- ...clusionCullingPlaneComponentController.cpp | 4 +- .../Source/Editor/EditorSystemComponent.h | 4 +- .../NodePalette/InputOutputNodePaletteItem.h | 2 +- .../NodePalette/ModuleNodePaletteItem.h | 2 +- .../NodePalette/StandardNodePaletteItem.h | 2 +- .../Shape/EditorTubeShapeComponentMode.cpp | 2 +- .../PropertyHandlerUiParticleColorKeyframe.h | 2 +- .../PropertyHandlerUiParticleFloatKeyframe.h | 2 +- .../LyShine/Code/Source/LyShineLoadScreen.cpp | 4 +- .../Code/Editor/ColliderComponentMode.cpp | 8 ++-- .../Code/Source/EditorSystemComponent.h | 2 +- .../EditorWhiteBoxDefaultMode.cpp | 4 +- scripts/commit_validation/CMakeLists.txt | 6 +-- .../commit_validation/commit_validation.py | 2 + .../tests/validators/test_crc_validator.py | 47 ++++++++++++++++++ .../validators/crc_validator.py | 48 +++++++++++++++++++ 21 files changed, 130 insertions(+), 35 deletions(-) create mode 100644 scripts/commit_validation/commit_validation/tests/validators/test_crc_validator.py create mode 100644 scripts/commit_validation/commit_validation/validators/crc_validator.py diff --git a/Code/Framework/AzCore/AzCore/Math/Crc.h b/Code/Framework/AzCore/AzCore/Math/Crc.h index 9ba2a83139..c71339e92e 100644 --- a/Code/Framework/AzCore/AzCore/Math/Crc.h +++ b/Code/Framework/AzCore/AzCore/Math/Crc.h @@ -16,7 +16,7 @@ // // When AZ_CRC("My string") is used by default it will map to AZ::Crc32("My string"). // We do have a pro-processor program which will precompute the crc for you and -// transform that macro to AZ_CRC("My string",0xabcdef00) this will expand to just 0xabcdef00. +// transform that macro to AZ_CRC("My string", 0x18fbd270) this will expand to just 0x18fbd270. // This will remove completely the "My string" from your executable, it will add it to a database and so on. // WHen you want to update the string, just change the string. // If you don't run the precompile step the code should still run fine, except it will be slower, @@ -24,7 +24,7 @@ // a constant expression. // For example // switch(id) { -// case AZ_CRC("My string",0xabcdef00): {} break; // this will compile fine +// case AZ_CRC("My string",0x18fbd270): {} break; // this will compile fine // case AZ_CRC("My string"): {} break; // this will cause "error C2051: case expression not constant" // } // So it's you choice what you do, depending on your needs. diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Viewport/ActionBus.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Viewport/ActionBus.h index 4dde676511..c0562025b6 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/Viewport/ActionBus.h +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Viewport/ActionBus.h @@ -23,11 +23,11 @@ namespace AzToolsFramework /// @name Reverse URLs. /// Used to identify common actions and override them when necessary. //@{ - static const AZ::Crc32 s_backAction = AZ_CRC("com.o3de.action.common.back", 0xd772a2af); - static const AZ::Crc32 s_deleteAction = AZ_CRC("com.o3de.action.common.delete", 0x5731f6cb); - static const AZ::Crc32 s_duplicateAction = AZ_CRC("com.o3de.action.common.duplicate", 0x08ccf461); - static const AZ::Crc32 s_nextComponentMode = AZ_CRC("com.o3de.action.common.nextComponentMode", 0xcc26094f); - static const AZ::Crc32 s_previousComponentMode = AZ_CRC("com.o3de.action.common.previousComponentMode", 0x0d18ff39); + static const AZ::Crc32 s_backAction = AZ_CRC("com.o3de.action.common.back", 0x80c3030f); + static const AZ::Crc32 s_deleteAction = AZ_CRC("com.o3de.action.common.delete", 0x58e78eed); + static const AZ::Crc32 s_duplicateAction = AZ_CRC("com.o3de.action.common.duplicate", 0xbc5a4a23); + static const AZ::Crc32 s_nextComponentMode = AZ_CRC("com.o3de.action.common.nextComponentMode", 0xf9aca3a8); + static const AZ::Crc32 s_previousComponentMode = AZ_CRC("com.o3de.action.common.previousComponentMode", 0x0580eaec); //@} /// Specific Action properties to be sent to a type implementing diff --git a/Gems/AtomLyIntegration/AtomBridge/Code/Source/AtomBridgeSystemComponent.cpp b/Gems/AtomLyIntegration/AtomBridge/Code/Source/AtomBridgeSystemComponent.cpp index d822b16486..7a980f9824 100644 --- a/Gems/AtomLyIntegration/AtomBridge/Code/Source/AtomBridgeSystemComponent.cpp +++ b/Gems/AtomLyIntegration/AtomBridge/Code/Source/AtomBridgeSystemComponent.cpp @@ -67,12 +67,12 @@ namespace AZ void AtomBridgeSystemComponent::GetProvidedServices(ComponentDescriptor::DependencyArrayType& provided) { - provided.push_back(AZ_CRC("AtomBridgeService", 0xdb816a99)); + provided.push_back(AZ_CRC("AtomBridgeService", 0x92d990b5)); } void AtomBridgeSystemComponent::GetIncompatibleServices(ComponentDescriptor::DependencyArrayType& incompatible) { - incompatible.push_back(AZ_CRC("AtomBridgeService", 0xdb816a99)); + incompatible.push_back(AZ_CRC("AtomBridgeService", 0x92d990b5)); } void AtomBridgeSystemComponent::GetRequiredServices(ComponentDescriptor::DependencyArrayType& required) diff --git a/Gems/AtomLyIntegration/AtomBridge/Code/Source/Editor/AssetCollectionAsyncLoaderTestComponent.h b/Gems/AtomLyIntegration/AtomBridge/Code/Source/Editor/AssetCollectionAsyncLoaderTestComponent.h index 9ab25741af..3af1ad8907 100644 --- a/Gems/AtomLyIntegration/AtomBridge/Code/Source/Editor/AssetCollectionAsyncLoaderTestComponent.h +++ b/Gems/AtomLyIntegration/AtomBridge/Code/Source/Editor/AssetCollectionAsyncLoaderTestComponent.h @@ -109,12 +109,12 @@ namespace AZ static void GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& services) { - services.push_back(AZ_CRC("AssetCollectionAsyncLoaderTest", 0xdd5ab934)); + services.push_back(AZ_CRC("AssetCollectionAsyncLoaderTest", 0x66d04369)); } static void GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& services) { - services.push_back(AZ_CRC("AssetCollectionAsyncLoaderTest", 0xdd5ab934)); + services.push_back(AZ_CRC("AssetCollectionAsyncLoaderTest", 0x66d04369)); } static void Reflect(AZ::ReflectContext* context); diff --git a/Gems/AtomLyIntegration/AtomViewportDisplayIcons/Code/Source/AtomViewportDisplayIconsSystemComponent.cpp b/Gems/AtomLyIntegration/AtomViewportDisplayIcons/Code/Source/AtomViewportDisplayIconsSystemComponent.cpp index 38679432ea..fa7a0cf2bf 100644 --- a/Gems/AtomLyIntegration/AtomViewportDisplayIcons/Code/Source/AtomViewportDisplayIconsSystemComponent.cpp +++ b/Gems/AtomLyIntegration/AtomViewportDisplayIcons/Code/Source/AtomViewportDisplayIconsSystemComponent.cpp @@ -73,7 +73,7 @@ namespace AZ::Render void AtomViewportDisplayIconsSystemComponent::GetRequiredServices(AZ::ComponentDescriptor::DependencyArrayType& required) { required.push_back(AZ_CRC("RPISystem", 0xf2add773)); - required.push_back(AZ_CRC("AtomBridgeService", 0xdb816a99)); + required.push_back(AZ_CRC("AtomBridgeService", 0x92d990b5)); } void AtomViewportDisplayIconsSystemComponent::GetDependentServices([[maybe_unused]] AZ::ComponentDescriptor::DependencyArrayType& dependent) diff --git a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/OcclusionCullingPlane/OcclusionCullingPlaneComponentController.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/OcclusionCullingPlane/OcclusionCullingPlaneComponentController.cpp index 4c78a0afd7..4addbde3ef 100644 --- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/OcclusionCullingPlane/OcclusionCullingPlaneComponentController.cpp +++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/OcclusionCullingPlane/OcclusionCullingPlaneComponentController.cpp @@ -59,12 +59,12 @@ namespace AZ void OcclusionCullingPlaneComponentController::GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& provided) { - provided.push_back(AZ_CRC("OcclusionCullingPlaneService", 0x9123f33d)); + provided.push_back(AZ_CRC("OcclusionCullingPlaneService", 0x7d036c2e)); } void OcclusionCullingPlaneComponentController::GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible) { - incompatible.push_back(AZ_CRC("OcclusionCullingPlaneService", 0x9123f33d)); + incompatible.push_back(AZ_CRC("OcclusionCullingPlaneService", 0x7d036c2e)); } void OcclusionCullingPlaneComponentController::GetRequiredServices(AZ::ComponentDescriptor::DependencyArrayType& required) diff --git a/Gems/Blast/Code/Source/Editor/EditorSystemComponent.h b/Gems/Blast/Code/Source/Editor/EditorSystemComponent.h index 31daae1a18..fe17bfaac0 100644 --- a/Gems/Blast/Code/Source/Editor/EditorSystemComponent.h +++ b/Gems/Blast/Code/Source/Editor/EditorSystemComponent.h @@ -31,12 +31,12 @@ namespace Blast private: static void GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& provided) { - provided.push_back(AZ_CRC("BlastEditorService", 0x0a61cda5)); + provided.push_back(AZ_CRC("BlastEditorService", 0xeddfed0d)); } static void GetRequiredServices(AZ::ComponentDescriptor::DependencyArrayType& required) { - required.push_back(AZ_CRC("BlastService", 0x75beae2d)); + required.push_back(AZ_CRC("BlastService", 0x46927a9f)); } AZStd::unique_ptr m_editorBlastChunksAssetHandler; diff --git a/Gems/GraphModel/Code/Include/GraphModel/Integration/NodePalette/InputOutputNodePaletteItem.h b/Gems/GraphModel/Code/Include/GraphModel/Integration/NodePalette/InputOutputNodePaletteItem.h index 15f308c4d2..99a32d965b 100644 --- a/Gems/GraphModel/Code/Include/GraphModel/Integration/NodePalette/InputOutputNodePaletteItem.h +++ b/Gems/GraphModel/Code/Include/GraphModel/Integration/NodePalette/InputOutputNodePaletteItem.h @@ -33,7 +33,7 @@ namespace GraphModelIntegration //! Constructor //! \param nodeName Name of the node that will show up in the Palette - //! \param editorId Unique name of the client system editor (ex: AZ_CRC("ShaderCanvas", 0xa6d1a85a)) + //! \param editorId Unique name of the client system editor (ex: AZ_CRC("ShaderCanvas", 0x0a1dff96)) //! \param dataType The type of data that the InputGraphNode or OutputGraphNode will represent InputOutputNodePaletteItem(AZStd::string_view nodeName, GraphCanvas::EditorId editorId, GraphModel::DataTypePtr dataType) : DraggableNodePaletteTreeItem(nodeName, editorId) diff --git a/Gems/GraphModel/Code/Include/GraphModel/Integration/NodePalette/ModuleNodePaletteItem.h b/Gems/GraphModel/Code/Include/GraphModel/Integration/NodePalette/ModuleNodePaletteItem.h index a0121ac035..51e1fca55b 100644 --- a/Gems/GraphModel/Code/Include/GraphModel/Integration/NodePalette/ModuleNodePaletteItem.h +++ b/Gems/GraphModel/Code/Include/GraphModel/Integration/NodePalette/ModuleNodePaletteItem.h @@ -95,7 +95,7 @@ namespace GraphModelIntegration AZ_CLASS_ALLOCATOR(ModuleNodePaletteItem, AZ::SystemAllocator, 0); //! Constructor - //! \param editorId Unique name of the client system editor (ex: AZ_CRC("ShaderCanvas", 0xa6d1a85a)) + //! \param editorId Unique name of the client system editor (ex: AZ_CRC("ShaderCanvas", 0x0a1dff96)) //! \param sourceFileId The unique id for the module node graph source file. //! \param sourceFilePath The path to the module node graph source file. This will be used for node naming and debug output. ModuleNodePaletteItem(GraphCanvas::EditorId editorId, AZ::Uuid sourceFileId, AZStd::string_view sourceFilePath) diff --git a/Gems/GraphModel/Code/Include/GraphModel/Integration/NodePalette/StandardNodePaletteItem.h b/Gems/GraphModel/Code/Include/GraphModel/Integration/NodePalette/StandardNodePaletteItem.h index 5d2914d7ad..e38e3b7478 100644 --- a/Gems/GraphModel/Code/Include/GraphModel/Integration/NodePalette/StandardNodePaletteItem.h +++ b/Gems/GraphModel/Code/Include/GraphModel/Integration/NodePalette/StandardNodePaletteItem.h @@ -34,7 +34,7 @@ namespace GraphModelIntegration //! Constructor //! \param nodeName Name of the node that will show up in the Palette - //! \param editorId Unique name of the client system editor (ex: AZ_CRC("ShaderCanvas", 0xa6d1a85a)) + //! \param editorId Unique name of the client system editor (ex: AZ_CRC("ShaderCanvas", 0x0a1dff96)) StandardNodePaletteItem(AZStd::string_view nodeName, GraphCanvas::EditorId editorId) : DraggableNodePaletteTreeItem(nodeName, editorId) { diff --git a/Gems/LmbrCentral/Code/Source/Shape/EditorTubeShapeComponentMode.cpp b/Gems/LmbrCentral/Code/Source/Shape/EditorTubeShapeComponentMode.cpp index 340752251d..fd91c84c12 100644 --- a/Gems/LmbrCentral/Code/Source/Shape/EditorTubeShapeComponentMode.cpp +++ b/Gems/LmbrCentral/Code/Source/Shape/EditorTubeShapeComponentMode.cpp @@ -22,7 +22,7 @@ namespace LmbrCentral { AZ_CLASS_ALLOCATOR_IMPL(EditorTubeShapeComponentMode, AZ::SystemAllocator, 0) - static const AZ::Crc32 s_resetVariableRadii = AZ_CRC("com.o3de.action.tubeshape.reset_radii", 0x0f2ef8e2); + static const AZ::Crc32 s_resetVariableRadii = AZ_CRC("com.o3de.action.tubeshape.reset_radii", 0xa987659c); static const char* const s_resetRadiiTitle = "Reset Radii"; static const char* const s_resetRadiiDesc = "Reset all variable radius values to the default"; diff --git a/Gems/LyShine/Code/Editor/PropertyHandlerUiParticleColorKeyframe.h b/Gems/LyShine/Code/Editor/PropertyHandlerUiParticleColorKeyframe.h index 9fdc8e61c4..639d042b34 100644 --- a/Gems/LyShine/Code/Editor/PropertyHandlerUiParticleColorKeyframe.h +++ b/Gems/LyShine/Code/Editor/PropertyHandlerUiParticleColorKeyframe.h @@ -50,7 +50,7 @@ class PropertyHandlerUiParticleColorKeyframe public: AZ_CLASS_ALLOCATOR(PropertyHandlerUiParticleColorKeyframe, AZ::SystemAllocator, 0); - AZ::u32 GetHandlerName(void) const override { return AZ_CRC("UiParticleColorKeyframeCtrl", 0x8cb3a9f1); } + AZ::u32 GetHandlerName(void) const override { return AZ_CRC("UiParticleColorKeyframeCtrl", 0xe3ef28b6); } bool IsDefaultHandler() const override { return true; } QWidget* CreateGUI(QWidget* pParent) override; void ConsumeAttribute(PropertyUiParticleColorKeyframeCtrl* GUI, AZ::u32 attrib, AzToolsFramework::PropertyAttributeReader* attrValue, const char* debugName) override; diff --git a/Gems/LyShine/Code/Editor/PropertyHandlerUiParticleFloatKeyframe.h b/Gems/LyShine/Code/Editor/PropertyHandlerUiParticleFloatKeyframe.h index 39e5dd27c2..df3983dc3e 100644 --- a/Gems/LyShine/Code/Editor/PropertyHandlerUiParticleFloatKeyframe.h +++ b/Gems/LyShine/Code/Editor/PropertyHandlerUiParticleFloatKeyframe.h @@ -50,7 +50,7 @@ class PropertyHandlerUiParticleFloatKeyframe public: AZ_CLASS_ALLOCATOR(PropertyHandlerUiParticleFloatKeyframe, AZ::SystemAllocator, 0); - AZ::u32 GetHandlerName(void) const override { return AZ_CRC("UiParticleFloatKeyframeCtrl", 0xba9359a2); } + AZ::u32 GetHandlerName(void) const override { return AZ_CRC("UiParticleFloatKeyframeCtrl", 0x448a90ec); } bool IsDefaultHandler() const override { return true; } QWidget* CreateGUI(QWidget* pParent) override; void ConsumeAttribute(PropertyUiParticleFloatKeyframeCtrl* GUI, AZ::u32 attrib, AzToolsFramework::PropertyAttributeReader* attrValue, const char* debugName) override; diff --git a/Gems/LyShine/Code/Source/LyShineLoadScreen.cpp b/Gems/LyShine/Code/Source/LyShineLoadScreen.cpp index 279c0527bd..831bdb048a 100644 --- a/Gems/LyShine/Code/Source/LyShineLoadScreen.cpp +++ b/Gems/LyShine/Code/Source/LyShineLoadScreen.cpp @@ -31,12 +31,12 @@ namespace LyShine void LyShineLoadScreenComponent::GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& provided) { - provided.emplace_back(AZ_CRC("LyShineLoadScreenService", 0xBB5EAB17)); + provided.emplace_back(AZ_CRC("LyShineLoadScreenService", 0xbb5eab17)); } void LyShineLoadScreenComponent::GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible) { - incompatible.emplace_back(AZ_CRC("LyShineLoadScreenService", 0xBB5EAB17)); + incompatible.emplace_back(AZ_CRC("LyShineLoadScreenService", 0xbb5eab17)); } void LyShineLoadScreenComponent::Init() diff --git a/Gems/PhysX/Code/Editor/ColliderComponentMode.cpp b/Gems/PhysX/Code/Editor/ColliderComponentMode.cpp index e5e75d88a3..b91b3e5bb9 100644 --- a/Gems/PhysX/Code/Editor/ColliderComponentMode.cpp +++ b/Gems/PhysX/Code/Editor/ColliderComponentMode.cpp @@ -27,10 +27,10 @@ namespace PhysX namespace { //! Uri's for shortcut actions. - const AZ::Crc32 SetDimensionsSubModeActionUri = AZ_CRC("com.o3de.action.physx.setdimensionssubmode", 0x77b70dd6); - 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); + const AZ::Crc32 SetDimensionsSubModeActionUri = AZ_CRC("com.o3de.action.physx.setdimensionssubmode", 0x508b1781); + const AZ::Crc32 SetOffsetSubModeActionUri = AZ_CRC("com.o3de.action.physx.setoffsetsubmode", 0x777ac743); + const AZ::Crc32 SetRotationSubModeActionUri = AZ_CRC("com.o3de.action.physx.setrotationsubmode", 0xf1a8f3ff); + const AZ::Crc32 ResetSubModeActionUri = AZ_CRC("com.o3de.action.physx.resetsubmode", 0x599d1594); } // namespace AZ_CLASS_ALLOCATOR_IMPL(ColliderComponentMode, AZ::SystemAllocator, 0); diff --git a/Gems/PhysXDebug/Code/Source/EditorSystemComponent.h b/Gems/PhysXDebug/Code/Source/EditorSystemComponent.h index 14f37ef01e..fc0d60640c 100644 --- a/Gems/PhysXDebug/Code/Source/EditorSystemComponent.h +++ b/Gems/PhysXDebug/Code/Source/EditorSystemComponent.h @@ -32,7 +32,7 @@ namespace PhysXDebug static void GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& provided) { - provided.push_back(AZ_CRC("PhysXDebugEditorService", 0xe3dde7d8)); + provided.push_back(AZ_CRC("PhysXDebugEditorService", 0xf8611967)); } static void GetRequiredServices(AZ::ComponentDescriptor::DependencyArrayType& required) diff --git a/Gems/WhiteBox/Code/Source/SubComponentModes/EditorWhiteBoxDefaultMode.cpp b/Gems/WhiteBox/Code/Source/SubComponentModes/EditorWhiteBoxDefaultMode.cpp index 3d6d9a4c0a..608605be62 100644 --- a/Gems/WhiteBox/Code/Source/SubComponentModes/EditorWhiteBoxDefaultMode.cpp +++ b/Gems/WhiteBox/Code/Source/SubComponentModes/EditorWhiteBoxDefaultMode.cpp @@ -33,8 +33,8 @@ namespace WhiteBox AZ::Color, cl_whiteBoxVertexIndicatorColor, AZ::Color::CreateFromRgba(0, 0, 0, 102), nullptr, AZ::ConsoleFunctorFlags::Null, "The color of the vertex indicator"); - static const AZ::Crc32 HideEdge = AZ_CRC("com.o3de.action.whitebox.hide_edge", 0x6a60ae23); - static const AZ::Crc32 HideVertex = AZ_CRC("com.o3de.action.whitebox.hide_vertex", 0x4a4bd092); + static const AZ::Crc32 HideEdge = AZ_CRC("com.o3de.action.whitebox.hide_edge", 0x84f6a9b9); + static const AZ::Crc32 HideVertex = AZ_CRC("com.o3de.action.whitebox.hide_vertex", 0x5f81c937); static const char* const HideEdgeTitle = "Hide Edge"; static const char* const HideEdgeDesc = "Hide the selected edge to merge the two connected polygons"; diff --git a/scripts/commit_validation/CMakeLists.txt b/scripts/commit_validation/CMakeLists.txt index 6079515eb8..00e8506ef1 100644 --- a/scripts/commit_validation/CMakeLists.txt +++ b/scripts/commit_validation/CMakeLists.txt @@ -6,10 +6,8 @@ # # -# this ctest makes sure that the commit validation function -# also runs its tests during commit validation! ly_add_pytest( NAME test_commit_validation - PATH ${CMAKE_CURRENT_LIST_DIR} + PATH ${CMAKE_CURRENT_LIST_DIR}/commit_validation/tests + TEST_SUITE smoke ) - diff --git a/scripts/commit_validation/commit_validation/commit_validation.py b/scripts/commit_validation/commit_validation/commit_validation.py index 513244a735..be8fc4ce1e 100755 --- a/scripts/commit_validation/commit_validation/commit_validation.py +++ b/scripts/commit_validation/commit_validation/commit_validation.py @@ -181,4 +181,6 @@ EXCLUDED_VALIDATION_PATTERNS = [ 'restricted/*/Tools/*RemoteControl', '*/user/Cache/*', '*/user/log/*', + '*/user/log_test_1/*', + '*/user/log_test_2/*', ] diff --git a/scripts/commit_validation/commit_validation/tests/validators/test_crc_validator.py b/scripts/commit_validation/commit_validation/tests/validators/test_crc_validator.py new file mode 100644 index 0000000000..6fbe86ab29 --- /dev/null +++ b/scripts/commit_validation/commit_validation/tests/validators/test_crc_validator.py @@ -0,0 +1,47 @@ +# +# 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 unittest +from unittest.mock import patch, mock_open + +from commit_validation.tests.mocks.mock_commit import MockCommit +from commit_validation.validators.crc_validator import CrcValidator + + +class CrcValidatorTests(unittest.TestCase): + + @patch('builtins.open', mock_open(read_data='This file does not contain an AZ_CRC macro')) + def test_fileWithNoCrc_passes(self): + commit = MockCommit(files=['/someCppFile.cpp']) + error_list = [] + self.assertTrue(CrcValidator().run(commit, error_list)) + self.assertEqual(len(error_list), 0, f"Unexpected errors: {error_list}") + + @patch('builtins.open', mock_open(read_data='This file contains an invalid CRC macro AZ_CRC("My string", 0xabcdef00)')) + def test_fileWithInvalidCrc_fails(self): + commit = MockCommit(files=['/someCppFile.cpp']) + error_list = [] + self.assertFalse(CrcValidator().run(commit, error_list)) + self.assertNotEqual(len(error_list), 0, f"Errors were expected but none were returned.") + + @patch('builtins.open', mock_open(read_data='This file contains a valid CRC macro AZ_CRC("My string", 0x18fbd270)')) + def test_fileWithValidCrc_fails(self): + commit = MockCommit(files=['/someCppFile.cpp']) + error_list = [] + self.assertTrue(CrcValidator().run(commit, error_list)) + self.assertEqual(len(error_list), 0, f"Unexpected errors: {error_list}") + + @patch('builtins.open', mock_open(read_data='This file contains an invalid CRC macro AZ_CRC("My string", 0xabcdef00)')) + def test_fileExtensionIgnored_passes(self): + commit = MockCommit(files=['/someCppFile.somerandomextension']) + error_list = [] + self.assertTrue(CrcValidator().run(commit, error_list)) + self.assertEqual(len(error_list), 0, f"Unexpected errors: {error_list}") + +if __name__ == '__main__': + unittest.main() diff --git a/scripts/commit_validation/commit_validation/validators/crc_validator.py b/scripts/commit_validation/commit_validation/validators/crc_validator.py new file mode 100644 index 0000000000..db99d7b50b --- /dev/null +++ b/scripts/commit_validation/commit_validation/validators/crc_validator.py @@ -0,0 +1,48 @@ +# +# 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 binascii +import fnmatch +import pathlib +import re +from typing import Type, List + +from commit_validation.commit_validation import Commit, CommitValidator, SOURCE_FILE_EXTENSIONS, EXCLUDED_VALIDATION_PATTERNS, VERBOSE + +class CrcValidator(CommitValidator): + """A file-level validator that makes sure a file does not contain an invalid CRC""" + + def run(self, commit: Commit, errors: List[str]) -> bool: + for file_name in commit.get_files(): + for pattern in EXCLUDED_VALIDATION_PATTERNS: + if fnmatch.fnmatch(file_name, pattern): + if VERBOSE: print(f'{file_name}::{self.__class__.__name__} SKIPPED - Validation pattern excluded on path.') + break + else: + if pathlib.Path(file_name).suffix.lower() not in SOURCE_FILE_EXTENSIONS: + if VERBOSE: print(f'{file_name}::{self.__class__.__name__} SKIPPED - File excluded based on extension.') + continue + + with open(file_name, mode='r', encoding='utf8') as fh: + fileContents = fh.read() + matchesFound = re.findall(r'AZ_CRC\("([^"]+)",([^)]*)\)', fileContents) + for element in matchesFound: + stringInCode = element[0] + valueInCode = element[1].strip() + expectedValue = "{0:#0{1}x}".format(binascii.crc32(stringInCode.lower().encode('utf8')), 10) + if expectedValue != valueInCode: + error_message = str(f'{file_name}::{self.__class__.__name__} FAILED - Source file contains a CRC mismatch!\n' + f' AZ_CRC("{stringInCode}", {valueInCode}), expected value {expectedValue}') + if VERBOSE: print(error_message) + errors.append(error_message) + return (not errors) + + +def get_validator() -> Type[CrcValidator]: + """Returns the validator class for this module""" + return CrcValidator From 93ec5de5525ad573b203ae33ea671fe23b82c047 Mon Sep 17 00:00:00 2001 From: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> Date: Tue, 30 Nov 2021 15:09:20 -0800 Subject: [PATCH 58/58] Enables monolithic for ServerLauncher (#5883) Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> --- cmake/Monolithic.cmake | 1 - 1 file changed, 1 deletion(-) diff --git a/cmake/Monolithic.cmake b/cmake/Monolithic.cmake index 1e121c2b20..2310d8d0d7 100644 --- a/cmake/Monolithic.cmake +++ b/cmake/Monolithic.cmake @@ -16,7 +16,6 @@ if(LY_MONOLITHIC_GAME) ly_set(PAL_TRAIT_BUILD_HOST_TOOLS FALSE) ly_set(PAL_TRAIT_BUILD_HOST_GUI_TOOLS FALSE) ly_set(PAL_TRAIT_BUILD_TESTS_SUPPORTED FALSE) - ly_set(PAL_TRAIT_BUILD_SERVER_SUPPORTED FALSE) else() ly_set(PAL_TRAIT_MONOLITHIC_DRIVEN_LIBRARY_TYPE SHARED) ly_set(PAL_TRAIT_MONOLITHIC_DRIVEN_MODULE_TYPE GEM_MODULE)