Преглед на файлове

fix DepthOfField naming (#16633)

* make UI element deferment stack-based to prevent path ambiguity

Signed-off-by: Alex Montgomery <[email protected]>

* fix assert

Signed-off-by: Alex Montgomery <[email protected]>

* reset lastElement name when starting/ending groups; skip UI elements
(groups!) when searching parents for child UI elements to create

Signed-off-by: Alex Montgomery <[email protected]>

* tolerate a null instance pointer

Signed-off-by: Alex Montgomery <[email protected]>

* fix Depth of Field name

Signed-off-by: Alex Montgomery <[email protected]>

* fixed DepthOfField naming for automated tests

Signed-off-by: Alex Montgomery <[email protected]>

---------

Signed-off-by: Alex Montgomery <[email protected]>
Alex Montgomery преди 2 години
родител
ревизия
85891e13e7

+ 1 - 1
AutomatedTesting/Gem/PythonTests/Atom/atom_utils/atom_constants.py

@@ -452,7 +452,7 @@ class AtomComponentProperties:
         :return: Full property path OR component name if no property specified.
         :return: Full property path OR component name if no property specified.
         """
         """
         properties = {
         properties = {
-            'name': 'DepthOfField',
+            'name': 'Depth Of Field',
             'requires': [AtomComponentProperties.postfx_layer()],
             'requires': [AtomComponentProperties.postfx_layer()],
             'Camera Entity': 'Controller|Configuration|Camera Entity',
             'Camera Entity': 'Controller|Configuration|Camera Entity',
             'CameraEntityId Override': 'Controller|Configuration|Overrides|CameraEntityId Override',
             'CameraEntityId Override': 'Controller|Configuration|Overrides|CameraEntityId Override',

+ 1 - 1
AutomatedTesting/Gem/PythonTests/editor/EditorScripts/DPE_AllComponentsAddedRemoved.py

@@ -120,7 +120,7 @@ other_components = [
 postfx_components = [
 postfx_components = [
     "Bloom",
     "Bloom",
     "Chromatic Aberration",
     "Chromatic Aberration",
-    "DepthOfField",
+    "Depth Of Field",
     "Display Mapper",
     "Display Mapper",
     "Exposure Control",
     "Exposure Control",
     "HDR Color Grading",
     "HDR Color Grading",

+ 1 - 1
Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/DepthOfField/EditorDepthOfFieldComponent.cpp

@@ -25,7 +25,7 @@ namespace AZ
                 if (AZ::EditContext* editContext = serializeContext->GetEditContext())
                 if (AZ::EditContext* editContext = serializeContext->GetEditContext())
                 {
                 {
                     editContext->Class<EditorDepthOfFieldComponent>(
                     editContext->Class<EditorDepthOfFieldComponent>(
-                        "DepthOfField", "Controls the Depth of Field.")
+                        "Depth Of Field", "Controls the Depth of Field.")
                         ->ClassElement(Edit::ClassElements::EditorData, "")
                         ->ClassElement(Edit::ClassElements::EditorData, "")
                         ->Attribute(Edit::Attributes::Category, "Graphics/PostFX")
                         ->Attribute(Edit::Attributes::Category, "Graphics/PostFX")
                         ->Attribute(AZ::Edit::Attributes::Icon, "Icons/Components/Component_Placeholder.svg") // [GFX TODO ATOM-2672][PostFX] need to create icons for PostProcessing.
                         ->Attribute(AZ::Edit::Attributes::Icon, "Icons/Components/Component_Placeholder.svg") // [GFX TODO ATOM-2672][PostFX] need to create icons for PostProcessing.