Merge branch 'development' of https://github.com/o3de/o3de into jckand/PrefabTestOptimization

Signed-off-by: jckand-amzn <82226555+jckand-amzn@users.noreply.github.com>
2021-12-02 11:55:45 -06:00
parent b1c0d1e12b bce5e36b53
commit 444fb8cfa0
241 changed files with 5130 additions and 1115 deletions
@@ -393,7 +393,7 @@ class AtomComponentProperties:
            'name': 'PostFX Shape Weight Modifier',
            'requires': [AtomComponentProperties.postfx_layer()],
            'shapes': ['Axis Aligned Box Shape', 'Box Shape', 'Capsule Shape', 'Compound Shape', 'Cylinder Shape',
-                       'Disk Shape', 'Polygon Prism Shape', 'Quad Shape', 'Sphere Shape', 'Vegetation Reference Shape'],
+                       'Disk Shape', 'Polygon Prism Shape', 'Quad Shape', 'Sphere Shape', 'Shape Reference'],
        }
        return properties[property]

@@ -72,7 +72,7 @@ def Terrain_SupportsPhysics():

    # 2) Create 2 test entities, one parent at 512.0, 512.0, 50.0 and one child at the default position and add the required components
    entity1_components_to_add = ["Axis Aligned Box Shape", "Terrain Layer Spawner", "Terrain Height Gradient List", "Terrain Physics Heightfield Collider", "PhysX Heightfield Collider"]
-    entity2_components_to_add = ["Vegetation Reference Shape", "Gradient Transform Modifier", "FastNoise Gradient"]
+    entity2_components_to_add = ["Shape Reference", "Gradient Transform Modifier", "FastNoise Gradient"]
    ball_components_to_add = ["Sphere Shape", "PhysX Collider", "PhysX Rigid Body"]
    terrain_spawner_entity = hydra.Entity("TestEntity1")
    terrain_spawner_entity.create_entity(azmath.Vector3(512.0, 512.0, 50.0), entity1_components_to_add)
@@ -78,7 +78,7 @@ def LayerSpawner_InheritBehaviorFlag():
    # Create Vegetation area and assign a valid asset
    veg_1 = hydra.Entity("veg_1")
    veg_1.create_entity(
-        position, ["Vegetation Layer Spawner", "Vegetation Reference Shape", "Vegetation Asset List"]
+        position, ["Vegetation Layer Spawner", "Shape Reference", "Vegetation Asset List"]
    )
    set_dynamic_slice_asset(veg_1, 2, os.path.join("Slices", "PinkFlower.dynamicslice"))
    veg_1.get_set_test(1, "Configuration|Shape Entity Id", blender_entity.id)
@@ -86,7 +86,7 @@ def LayerSpawner_InheritBehaviorFlag():
    # Create second vegetation area and assign a valid asset
    veg_2 = hydra.Entity("veg_2")
    veg_2.create_entity(
-        position, ["Vegetation Layer Spawner", "Vegetation Reference Shape", "Vegetation Asset List"]
+        position, ["Vegetation Layer Spawner", "Shape Reference", "Vegetation Asset List"]
    )
    set_dynamic_slice_asset(veg_2, 2, os.path.join("Slices", "PurpleFlower.dynamicslice"))
    veg_2.get_set_test(1, "Configuration|Shape Entity Id", blender_entity.id)
@@ -9,7 +9,7 @@ SPDX-License-Identifier: Apache-2.0 OR MIT
 def LayerSpawner_InstancesPlantInAllSupportedShapes():
    """
    Summary:
-    The level is loaded and vegetation area is created. Then the Vegetation Reference Shape
+    The level is loaded and vegetation area is created. Then the Shape Reference
    component of vegetation area is pinned with entities of different shape components to check
    if the vegetation plants in different shaped areas.

@@ -67,7 +67,7 @@ def LayerSpawner_InstancesPlantInAllSupportedShapes():
                                               10.0, 10.0, 10.0,
                                               asset_path)
    vegetation.remove_component("Box Shape")
-    vegetation.add_component("Vegetation Reference Shape")
+    vegetation.add_component("Shape Reference")

    # Create surface for planting on
    dynveg.create_surface_entity("Surface Entity", entity_position, 60.0, 60.0, 1.0)
@@ -96,7 +96,7 @@ def AreaNodes_DependentComponentsAdded():
        'SpawnerAreaNode': [
            'Vegetation Layer Spawner',
            'Vegetation Asset List',
-            'Vegetation Reference Shape'
+            'Shape Reference'
        ],
        'MeshBlockerAreaNode': [
            'Vegetation Layer Blocker (Mesh)',
@@ -104,7 +104,7 @@ def AreaNodes_DependentComponentsAdded():
        ],
        'BlockerAreaNode': [
            'Vegetation Layer Blocker',
-            'Vegetation Reference Shape'
+            'Shape Reference'
        ]
    }

@@ -82,7 +82,7 @@ def Edit_DisabledNodeDuplication():
    nodes = {
        'SpawnerAreaNode': 'Vegetation Asset List',
        'MeshBlockerAreaNode': 'Mesh',
-        'BlockerAreaNode': 'Vegetation Reference Shape',
+        'BlockerAreaNode': 'Shape Reference',
        'FastNoiseGradientNode': 'Gradient Transform Modifier',
        'ImageGradientNode': 'Gradient Transform Modifier',
        'PerlinNoiseGradientNode': 'Gradient Transform Modifier',
@@ -104,7 +104,7 @@ def GradientNodes_DependentComponentsAdded():
    # we will be checking for
    commonComponents = [
        'Gradient Transform Modifier',
-        'Vegetation Reference Shape'
+        'Shape Reference'
    ]
    componentNames = []
    for name in gradients:
@@ -114,7 +114,7 @@ def GradientNodes_DependentComponentsAdded():

    # Create nodes for the gradients that have additional required dependencies and check if
    # the Entity created by adding the node has the appropriate Component and required
-    # Gradient Transform Modifier and Vegetation Reference Shape components added automatically to it
+    # Gradient Transform Modifier and Shape Reference components added automatically to it
    newGraph = graph.GraphManagerRequestBus(bus.Broadcast, 'GetGraph', newGraphId)
    x = 10.0
    y = 10.0