diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/DynVegUtils_TempPrefabCreationWorks.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/DynVegUtils_TempPrefabCreationWorks.py index 16a6c2eda6..8d7f02425d 100644 --- a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/DynVegUtils_TempPrefabCreationWorks.py +++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/DynVegUtils_TempPrefabCreationWorks.py @@ -35,6 +35,7 @@ def DynVegUtils_TempPrefabCreationWorks(): import azlmbr.bus as bus import azlmbr.math as math + from Prefab.tests import PrefabTestUtils as prefab_test_utils from largeworlds.large_worlds_utils import editor_dynveg_test_helper as dynveg from editor_python_test_tools.utils import Report, Tracer from editor_python_test_tools.utils import TestHelper as helper @@ -51,8 +52,7 @@ def DynVegUtils_TempPrefabCreationWorks(): } # 1) Open an existing simple level - helper.init_idle() - helper.open_level("Prefab", "Base") + prefab_test_utils.open_base_tests_level() # 2) Create each of the Mesh asset prefabs and validate that the prefab created successfully for prefab_filename, asset_path in mesh_prefabs.items(): diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/large_worlds_utils/editor_dynveg_test_helper.py b/AutomatedTesting/Gem/PythonTests/largeworlds/large_worlds_utils/editor_dynveg_test_helper.py index d840628abc..d7d5842518 100755 --- a/AutomatedTesting/Gem/PythonTests/largeworlds/large_worlds_utils/editor_dynveg_test_helper.py +++ b/AutomatedTesting/Gem/PythonTests/largeworlds/large_worlds_utils/editor_dynveg_test_helper.py @@ -91,23 +91,6 @@ def create_mesh_surface_entity_with_slopes(name, center_point, uniform_scale): return surface_entity -def create_empty_spawner(name, center_point, box_size_x, box_size_y, box_size_z): - # Create a vegetation area entity to use as our test vegetation spawner - spawner_entity = EditorEntity.create_editor_entity_at(center_point, name=name) - spawner_entity.add_components(["Vegetation Layer Spawner", "Box Shape", "Vegetation Asset List"]) - if spawner_entity.id.IsValid(): - print(f"'{spawner_entity.get_name()}' created") - spawner_entity.components[1].set_component_property_value("Box Shape|Box Configuration|Dimensions", - math.Vector3(box_size_x, box_size_y, box_size_z)) - - # Set the vegetation area to an empty spawner - empty_spawner = vegetation.EmptyInstanceSpawner() - descriptor = spawner_entity.components[2].get_component_property_value("Configuration|Embedded Assets|[0]") - descriptor.spawner = empty_spawner - spawner_entity.components[2].set_component_property_value("Configuration|Embedded Assets|[0]", descriptor) - return spawner_entity - - def create_vegetation_area(name, center_point, box_size_x, box_size_y, box_size_z, dynamic_slice_asset_path): # Create a vegetation area entity to use as our test vegetation spawner spawner_entity = hydra.Entity(name)