diff --git a/.gitignore b/.gitignore index c28f6ab123..3a9b8f6f8e 100644 --- a/.gitignore +++ b/.gitignore @@ -7,7 +7,7 @@ AssetProcessorTemp/** [Oo]ut/** CMakeUserPresets.json [Cc]ache/ -/install/ +/[Ii]nstall/ Editor/EditorEventLog.xml Editor/EditorLayout.xml **/*egg-info/** diff --git a/Assets/Engine/Config/performance.cfg b/Assets/Engine/Config/performance.cfg deleted file mode 100644 index 153209c20d..0000000000 --- a/Assets/Engine/Config/performance.cfg +++ /dev/null @@ -1,6 +0,0 @@ -e_StatoscopeScreenshotCapturePeriod = 1 - -e_StatoscopeDataGroups = Oulm -sys_pakLogInvalidFileAccess = 1 -e_StatoscopeWriteTimeout = 10 -e_StatoscopeConnectTimeout = 10 \ No newline at end of file diff --git a/AutomatedTesting/Assets/C4044695_PhysXCollider_AddMultipleSurfaceFbx/test.fbx b/AutomatedTesting/Assets/Physics/Collider_MultipleSurfaceSlots/test.fbx similarity index 100% rename from AutomatedTesting/Assets/C4044695_PhysXCollider_AddMultipleSurfaceFbx/test.fbx rename to AutomatedTesting/Assets/Physics/Collider_MultipleSurfaceSlots/test.fbx diff --git a/AutomatedTesting/Assets/C4044695_PhysXCollider_AddMultipleSurfaceFbx/test.fbx.assetinfo b/AutomatedTesting/Assets/Physics/Collider_MultipleSurfaceSlots/test.fbx.assetinfo similarity index 100% rename from AutomatedTesting/Assets/C4044695_PhysXCollider_AddMultipleSurfaceFbx/test.fbx.assetinfo rename to AutomatedTesting/Assets/Physics/Collider_MultipleSurfaceSlots/test.fbx.assetinfo diff --git a/AutomatedTesting/Assets/C4044695_PhysXCollider_AddMultipleSurfaceFbx/test.mtl b/AutomatedTesting/Assets/Physics/Collider_MultipleSurfaceSlots/test.mtl similarity index 100% rename from AutomatedTesting/Assets/C4044695_PhysXCollider_AddMultipleSurfaceFbx/test.mtl rename to AutomatedTesting/Assets/Physics/Collider_MultipleSurfaceSlots/test.mtl diff --git a/AutomatedTesting/Assets/C4044695_PhysXCollider_AddMultipleSurfaceFbx/test.physmaterial b/AutomatedTesting/Assets/Physics/Collider_MultipleSurfaceSlots/test.physmaterial similarity index 100% rename from AutomatedTesting/Assets/C4044695_PhysXCollider_AddMultipleSurfaceFbx/test.physmaterial rename to AutomatedTesting/Assets/Physics/Collider_MultipleSurfaceSlots/test.physmaterial diff --git a/AutomatedTesting/Assets/C14861501_PhysXCollider_RenderMeshAutoAssigned/SphereBot/R0-B_Body.fbx b/AutomatedTesting/Assets/Physics/Collider_PxMeshAutoAssigned/SphereBot/R0-B_Body.fbx similarity index 100% rename from AutomatedTesting/Assets/C14861501_PhysXCollider_RenderMeshAutoAssigned/SphereBot/R0-B_Body.fbx rename to AutomatedTesting/Assets/Physics/Collider_PxMeshAutoAssigned/SphereBot/R0-B_Body.fbx diff --git a/AutomatedTesting/Assets/C14861501_PhysXCollider_RenderMeshAutoAssigned/SphereBot/r0-b_body.fbx.assetinfo b/AutomatedTesting/Assets/Physics/Collider_PxMeshAutoAssigned/SphereBot/r0-b_body.fbx.assetinfo similarity index 100% rename from AutomatedTesting/Assets/C14861501_PhysXCollider_RenderMeshAutoAssigned/SphereBot/r0-b_body.fbx.assetinfo rename to AutomatedTesting/Assets/Physics/Collider_PxMeshAutoAssigned/SphereBot/r0-b_body.fbx.assetinfo diff --git a/AutomatedTesting/Assets/C14861501_PhysXCollider_RenderMeshAutoAssigned/SphereBot/r0-b_body.mtl b/AutomatedTesting/Assets/Physics/Collider_PxMeshAutoAssigned/SphereBot/r0-b_body.mtl similarity index 100% rename from AutomatedTesting/Assets/C14861501_PhysXCollider_RenderMeshAutoAssigned/SphereBot/r0-b_body.mtl rename to AutomatedTesting/Assets/Physics/Collider_PxMeshAutoAssigned/SphereBot/r0-b_body.mtl diff --git a/AutomatedTesting/Assets/C4982803_Enable_PxMesh_Option/SphereBot/R0-B_Body.fbx b/AutomatedTesting/Assets/Physics/Collider_PxMeshConvexMeshCollides/SphereBot/R0-B_Body.fbx similarity index 100% rename from AutomatedTesting/Assets/C4982803_Enable_PxMesh_Option/SphereBot/R0-B_Body.fbx rename to AutomatedTesting/Assets/Physics/Collider_PxMeshConvexMeshCollides/SphereBot/R0-B_Body.fbx diff --git a/AutomatedTesting/Assets/C4982803_Enable_PxMesh_Option/SphereBot/r0-b_body.fbx.assetinfo b/AutomatedTesting/Assets/Physics/Collider_PxMeshConvexMeshCollides/SphereBot/r0-b_body.fbx.assetinfo similarity index 100% rename from AutomatedTesting/Assets/C4982803_Enable_PxMesh_Option/SphereBot/r0-b_body.fbx.assetinfo rename to AutomatedTesting/Assets/Physics/Collider_PxMeshConvexMeshCollides/SphereBot/r0-b_body.fbx.assetinfo diff --git a/AutomatedTesting/Assets/C4982803_Enable_PxMesh_Option/SphereBot/r0-b_body.mtl b/AutomatedTesting/Assets/Physics/Collider_PxMeshConvexMeshCollides/SphereBot/r0-b_body.mtl similarity index 100% rename from AutomatedTesting/Assets/C4982803_Enable_PxMesh_Option/SphereBot/r0-b_body.mtl rename to AutomatedTesting/Assets/Physics/Collider_PxMeshConvexMeshCollides/SphereBot/r0-b_body.mtl diff --git a/AutomatedTesting/Assets/C14861504_RenderMeshAsset_WithNoPxAsset/test_asset.fbx b/AutomatedTesting/Assets/Physics/Collider_PxMeshNotAutoAssignedWhenNoPhysicsFbx/test_asset.fbx similarity index 100% rename from AutomatedTesting/Assets/C14861504_RenderMeshAsset_WithNoPxAsset/test_asset.fbx rename to AutomatedTesting/Assets/Physics/Collider_PxMeshNotAutoAssignedWhenNoPhysicsFbx/test_asset.fbx diff --git a/AutomatedTesting/Assets/C14861504_RenderMeshAsset_WithNoPxAsset/test_asset.fbx.assetinfo b/AutomatedTesting/Assets/Physics/Collider_PxMeshNotAutoAssignedWhenNoPhysicsFbx/test_asset.fbx.assetinfo similarity index 100% rename from AutomatedTesting/Assets/C14861504_RenderMeshAsset_WithNoPxAsset/test_asset.fbx.assetinfo rename to AutomatedTesting/Assets/Physics/Collider_PxMeshNotAutoAssignedWhenNoPhysicsFbx/test_asset.fbx.assetinfo diff --git a/AutomatedTesting/Assets/C14861504_RenderMeshAsset_WithNoPxAsset/test_asset.mtl b/AutomatedTesting/Assets/Physics/Collider_PxMeshNotAutoAssignedWhenNoPhysicsFbx/test_asset.mtl similarity index 100% rename from AutomatedTesting/Assets/C14861504_RenderMeshAsset_WithNoPxAsset/test_asset.mtl rename to AutomatedTesting/Assets/Physics/Collider_PxMeshNotAutoAssignedWhenNoPhysicsFbx/test_asset.mtl diff --git a/AutomatedTesting/Gem/PythonTests/Blast/CMakeLists.txt b/AutomatedTesting/Gem/PythonTests/Blast/CMakeLists.txt index 172eded09a..cb83fe5344 100644 --- a/AutomatedTesting/Gem/PythonTests/Blast/CMakeLists.txt +++ b/AutomatedTesting/Gem/PythonTests/Blast/CMakeLists.txt @@ -8,10 +8,10 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED AND PAL_TRAIT_BUILD_HOST_TOOLS) ly_add_pytest( - NAME AutomatedTesting::BlastTests + NAME AutomatedTesting::BlastTests_Main TEST_SUITE main TEST_SERIAL TRUE - PATH ${CMAKE_CURRENT_LIST_DIR}/TestSuite_Active.py + PATH ${CMAKE_CURRENT_LIST_DIR}/TestSuite_Main.py RUNTIME_DEPENDENCIES Legacy::Editor AZ::AssetProcessor diff --git a/AutomatedTesting/Gem/PythonTests/Blast/ImportPathHelper.py b/AutomatedTesting/Gem/PythonTests/Blast/ImportPathHelper.py deleted file mode 100755 index 0e395664ad..0000000000 --- a/AutomatedTesting/Gem/PythonTests/Blast/ImportPathHelper.py +++ /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 -""" - -def init(): - import os - import sys - sys.path.append(os.path.dirname(os.path.abspath(__file__)) + '/../automatedtesting_shared') diff --git a/AutomatedTesting/Gem/PythonTests/Blast/TestSuite_Active.py b/AutomatedTesting/Gem/PythonTests/Blast/TestSuite_Main.py old mode 100755 new mode 100644 similarity index 76% rename from AutomatedTesting/Gem/PythonTests/Blast/TestSuite_Active.py rename to AutomatedTesting/Gem/PythonTests/Blast/TestSuite_Main.py index 111f6d62e6..dbc4a1a456 --- a/AutomatedTesting/Gem/PythonTests/Blast/TestSuite_Active.py +++ b/AutomatedTesting/Gem/PythonTests/Blast/TestSuite_Main.py @@ -22,29 +22,29 @@ from base import TestAutomationBase @pytest.mark.parametrize("project", ["AutomatedTesting"]) class TestAutomation(TestAutomationBase): def test_ActorSplitsAfterCollision(self, request, workspace, editor, launcher_platform): - from . import ActorSplitsAfterCollision as test_module + from .tests import Blast_ActorSplitsAfterCollision as test_module self._run_test(request, workspace, editor, test_module) def test_ActorSplitsAfterRadialDamage(self, request, workspace, editor, launcher_platform): - from . import ActorSplitsAfterRadialDamage as test_module + from .tests import Blast_ActorSplitsAfterRadialDamage as test_module self._run_test(request, workspace, editor, test_module) def test_ActorSplitsAfterCapsuleDamage(self, request, workspace, editor, launcher_platform): - from . import ActorSplitsAfterCapsuleDamage as test_module + from .tests import Blast_ActorSplitsAfterCapsuleDamage as test_module self._run_test(request, workspace, editor, test_module) def test_ActorSplitsAfterImpactSpreadDamage(self, request, workspace, editor, launcher_platform): - from . import ActorSplitsAfterImpactSpreadDamage as test_module + from .tests import Blast_ActorSplitsAfterImpactSpreadDamage as test_module self._run_test(request, workspace, editor, test_module) def test_ActorSplitsAfterShearDamage(self, request, workspace, editor, launcher_platform): - from . import ActorSplitsAfterShearDamage as test_module + from .tests import Blast_ActorSplitsAfterShearDamage as test_module self._run_test(request, workspace, editor, test_module) def test_ActorSplitsAfterTriangleDamage(self, request, workspace, editor, launcher_platform): - from . import ActorSplitsAfterTriangleDamage as test_module + from .tests import Blast_ActorSplitsAfterTriangleDamage as test_module self._run_test(request, workspace, editor, test_module) def test_ActorSplitsAfterStressDamage(self, request, workspace, editor, launcher_platform): - from . import ActorSplitsAfterStressDamage as test_module + from .tests import Blast_ActorSplitsAfterStressDamage as test_module self._run_test(request, workspace, editor, test_module) diff --git a/AutomatedTesting/Gem/PythonTests/Blast/ActorSplitsAfterDamage.py b/AutomatedTesting/Gem/PythonTests/Blast/tests/BaseDamageTest.py old mode 100755 new mode 100644 similarity index 98% rename from AutomatedTesting/Gem/PythonTests/Blast/ActorSplitsAfterDamage.py rename to AutomatedTesting/Gem/PythonTests/Blast/tests/BaseDamageTest.py index 109dbf13f3..87340ebb26 --- a/AutomatedTesting/Gem/PythonTests/Blast/ActorSplitsAfterDamage.py +++ b/AutomatedTesting/Gem/PythonTests/Blast/tests/BaseDamageTest.py @@ -41,11 +41,7 @@ def base_run(damage_func): :return: None """ - - import ImportPathHelper as imports - - imports.init() - + from editor_python_test_tools.utils import Report from editor_python_test_tools.utils import TestHelper as helper diff --git a/AutomatedTesting/Gem/PythonTests/Blast/BlastUtils.py b/AutomatedTesting/Gem/PythonTests/Blast/tests/BlastUtils.py similarity index 100% rename from AutomatedTesting/Gem/PythonTests/Blast/BlastUtils.py rename to AutomatedTesting/Gem/PythonTests/Blast/tests/BlastUtils.py diff --git a/AutomatedTesting/Gem/PythonTests/Blast/ActorSplitsAfterCapsuleDamage.py b/AutomatedTesting/Gem/PythonTests/Blast/tests/Blast_ActorSplitsAfterCapsuleDamage.py old mode 100755 new mode 100644 similarity index 79% rename from AutomatedTesting/Gem/PythonTests/Blast/ActorSplitsAfterCapsuleDamage.py rename to AutomatedTesting/Gem/PythonTests/Blast/tests/Blast_ActorSplitsAfterCapsuleDamage.py index 96087569b3..11b395d927 --- a/AutomatedTesting/Gem/PythonTests/Blast/ActorSplitsAfterCapsuleDamage.py +++ b/AutomatedTesting/Gem/PythonTests/Blast/tests/Blast_ActorSplitsAfterCapsuleDamage.py @@ -9,10 +9,8 @@ import os import sys sys.path.append(os.path.dirname(os.path.abspath(__file__))) -from ActorSplitsAfterDamage import Tests - -def ActorSplitsAfterCapsuleDamage(): - from ActorSplitsAfterDamage import base_run as internal_run +def Blast_ActorSplitsAfterCapsuleDamage(): + from BaseDamageTest import base_run as internal_run from BlastUtils import Constants def CapsuleDamage(target_id, position0): @@ -26,8 +24,5 @@ def ActorSplitsAfterCapsuleDamage(): if __name__ == "__main__": - import ImportPathHelper as imports - imports.init() - from editor_python_test_tools.utils import Report - Report.start_test(ActorSplitsAfterCapsuleDamage) + Report.start_test(Blast_ActorSplitsAfterCapsuleDamage) diff --git a/AutomatedTesting/Gem/PythonTests/Blast/ActorSplitsAfterCollision.py b/AutomatedTesting/Gem/PythonTests/Blast/tests/Blast_ActorSplitsAfterCollision.py old mode 100755 new mode 100644 similarity index 95% rename from AutomatedTesting/Gem/PythonTests/Blast/ActorSplitsAfterCollision.py rename to AutomatedTesting/Gem/PythonTests/Blast/tests/Blast_ActorSplitsAfterCollision.py index af6bc62f71..815db78ddc --- a/AutomatedTesting/Gem/PythonTests/Blast/ActorSplitsAfterCollision.py +++ b/AutomatedTesting/Gem/PythonTests/Blast/tests/Blast_ActorSplitsAfterCollision.py @@ -18,7 +18,7 @@ class Tests(): # fmt: on -def ActorSplitsAfterCollision(): +def Blast_ActorSplitsAfterCollision(): """ Summary: @@ -46,10 +46,6 @@ def ActorSplitsAfterCollision(): :return: None """ - import ImportPathHelper as imports - - imports.init() - from editor_python_test_tools.utils import Report from editor_python_test_tools.utils import TestHelper as helper @@ -103,8 +99,5 @@ def ActorSplitsAfterCollision(): if __name__ == "__main__": - import ImportPathHelper as imports - imports.init() - from editor_python_test_tools.utils import Report - Report.start_test(ActorSplitsAfterCollision) + Report.start_test(Blast_ActorSplitsAfterCollision) diff --git a/AutomatedTesting/Gem/PythonTests/Blast/ActorSplitsAfterImpactSpreadDamage.py b/AutomatedTesting/Gem/PythonTests/Blast/tests/Blast_ActorSplitsAfterImpactSpreadDamage.py old mode 100755 new mode 100644 similarity index 75% rename from AutomatedTesting/Gem/PythonTests/Blast/ActorSplitsAfterImpactSpreadDamage.py rename to AutomatedTesting/Gem/PythonTests/Blast/tests/Blast_ActorSplitsAfterImpactSpreadDamage.py index e98c7108ba..6cea44af17 --- a/AutomatedTesting/Gem/PythonTests/Blast/ActorSplitsAfterImpactSpreadDamage.py +++ b/AutomatedTesting/Gem/PythonTests/Blast/tests/Blast_ActorSplitsAfterImpactSpreadDamage.py @@ -9,10 +9,8 @@ import os import sys sys.path.append(os.path.dirname(os.path.abspath(__file__))) -from ActorSplitsAfterDamage import Tests - -def ActorSplitsAfterImpactSpreadDamage(): - from ActorSplitsAfterDamage import base_run as internal_run +def Blast_ActorSplitsAfterImpactSpreadDamage(): + from BaseDamageTest import base_run as internal_run from BlastUtils import Constants def ImpactSpreadDamage(target_id, position): @@ -24,8 +22,5 @@ def ActorSplitsAfterImpactSpreadDamage(): if __name__ == "__main__": - import ImportPathHelper as imports - imports.init() - from editor_python_test_tools.utils import Report - Report.start_test(ActorSplitsAfterImpactSpreadDamage) + Report.start_test(Blast_ActorSplitsAfterImpactSpreadDamage) diff --git a/AutomatedTesting/Gem/PythonTests/Blast/ActorSplitsAfterRadialDamage.py b/AutomatedTesting/Gem/PythonTests/Blast/tests/Blast_ActorSplitsAfterRadialDamage.py old mode 100755 new mode 100644 similarity index 75% rename from AutomatedTesting/Gem/PythonTests/Blast/ActorSplitsAfterRadialDamage.py rename to AutomatedTesting/Gem/PythonTests/Blast/tests/Blast_ActorSplitsAfterRadialDamage.py index 9f5f37752c..b3ddc9143c --- a/AutomatedTesting/Gem/PythonTests/Blast/ActorSplitsAfterRadialDamage.py +++ b/AutomatedTesting/Gem/PythonTests/Blast/tests/Blast_ActorSplitsAfterRadialDamage.py @@ -9,10 +9,8 @@ import os import sys sys.path.append(os.path.dirname(os.path.abspath(__file__))) -from ActorSplitsAfterDamage import Tests - -def ActorSplitsAfterRadialDamage(): - from ActorSplitsAfterDamage import base_run as internal_run +def Blast_ActorSplitsAfterRadialDamage(): + from BaseDamageTest import base_run as internal_run from BlastUtils import Constants def RadialDamage(target_id, position): @@ -24,8 +22,5 @@ def ActorSplitsAfterRadialDamage(): if __name__ == "__main__": - import ImportPathHelper as imports - imports.init() - from editor_python_test_tools.utils import Report - Report.start_test(ActorSplitsAfterRadialDamage) \ No newline at end of file + Report.start_test(Blast_ActorSplitsAfterRadialDamage) \ No newline at end of file diff --git a/AutomatedTesting/Gem/PythonTests/Blast/ActorSplitsAfterShearDamage.py b/AutomatedTesting/Gem/PythonTests/Blast/tests/Blast_ActorSplitsAfterShearDamage.py old mode 100755 new mode 100644 similarity index 77% rename from AutomatedTesting/Gem/PythonTests/Blast/ActorSplitsAfterShearDamage.py rename to AutomatedTesting/Gem/PythonTests/Blast/tests/Blast_ActorSplitsAfterShearDamage.py index 16abcbceea..8d14898fe6 --- a/AutomatedTesting/Gem/PythonTests/Blast/ActorSplitsAfterShearDamage.py +++ b/AutomatedTesting/Gem/PythonTests/Blast/tests/Blast_ActorSplitsAfterShearDamage.py @@ -9,10 +9,8 @@ import os import sys sys.path.append(os.path.dirname(os.path.abspath(__file__))) -from ActorSplitsAfterDamage import Tests - -def ActorSplitsAfterShearDamage(): - from ActorSplitsAfterDamage import base_run as internal_run +def Blast_ActorSplitsAfterShearDamage(): + from BaseDamageTest import base_run as internal_run from BlastUtils import Constants def ShearDamage(target_id, position): @@ -25,8 +23,5 @@ def ActorSplitsAfterShearDamage(): if __name__ == "__main__": - import ImportPathHelper as imports - imports.init() - from editor_python_test_tools.utils import Report - Report.start_test(ActorSplitsAfterShearDamage) \ No newline at end of file + Report.start_test(Blast_ActorSplitsAfterShearDamage) \ No newline at end of file diff --git a/AutomatedTesting/Gem/PythonTests/Blast/ActorSplitsAfterStressDamage.py b/AutomatedTesting/Gem/PythonTests/Blast/tests/Blast_ActorSplitsAfterStressDamage.py old mode 100755 new mode 100644 similarity index 75% rename from AutomatedTesting/Gem/PythonTests/Blast/ActorSplitsAfterStressDamage.py rename to AutomatedTesting/Gem/PythonTests/Blast/tests/Blast_ActorSplitsAfterStressDamage.py index a66efc5159..538d62929f --- a/AutomatedTesting/Gem/PythonTests/Blast/ActorSplitsAfterStressDamage.py +++ b/AutomatedTesting/Gem/PythonTests/Blast/tests/Blast_ActorSplitsAfterStressDamage.py @@ -9,10 +9,8 @@ import os import sys sys.path.append(os.path.dirname(os.path.abspath(__file__))) -from ActorSplitsAfterDamage import Tests - -def ActorSplitsAfterStressDamage(): - from ActorSplitsAfterDamage import base_run as internal_run +def Blast_ActorSplitsAfterStressDamage(): + from BaseDamageTest import base_run as internal_run from BlastUtils import Constants def StressDamage(target_id, position): @@ -24,8 +22,5 @@ def ActorSplitsAfterStressDamage(): if __name__ == "__main__": - import ImportPathHelper as imports - imports.init() - from editor_python_test_tools.utils import Report - Report.start_test(ActorSplitsAfterStressDamage) + Report.start_test(Blast_ActorSplitsAfterStressDamage) diff --git a/AutomatedTesting/Gem/PythonTests/Blast/ActorSplitsAfterTriangleDamage.py b/AutomatedTesting/Gem/PythonTests/Blast/tests/Blast_ActorSplitsAfterTriangleDamage.py old mode 100755 new mode 100644 similarity index 81% rename from AutomatedTesting/Gem/PythonTests/Blast/ActorSplitsAfterTriangleDamage.py rename to AutomatedTesting/Gem/PythonTests/Blast/tests/Blast_ActorSplitsAfterTriangleDamage.py index 0dcd6d5354..31a7dc083e --- a/AutomatedTesting/Gem/PythonTests/Blast/ActorSplitsAfterTriangleDamage.py +++ b/AutomatedTesting/Gem/PythonTests/Blast/tests/Blast_ActorSplitsAfterTriangleDamage.py @@ -9,10 +9,8 @@ import os import sys sys.path.append(os.path.dirname(os.path.abspath(__file__))) -from ActorSplitsAfterDamage import Tests - -def ActorSplitsAfterTriangleDamage(): - from ActorSplitsAfterDamage import base_run as internal_run +def Blast_ActorSplitsAfterTriangleDamage(): + from BaseDamageTest import base_run as internal_run from BlastUtils import Constants def TriangleDamage(target_id, position): @@ -28,8 +26,5 @@ def ActorSplitsAfterTriangleDamage(): if __name__ == "__main__": - import ImportPathHelper as imports - imports.init() - from editor_python_test_tools.utils import Report - Report.start_test(ActorSplitsAfterTriangleDamage) \ No newline at end of file + Report.start_test(Blast_ActorSplitsAfterTriangleDamage) \ No newline at end of file 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 0b4cf47961..fec9d9880b 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 @@ -214,6 +214,12 @@ class EditorEntity: """ return editor.EditorEntityInfoRequestBus(bus.Event, "GetParent", self.id) + def get_children_ids(self) -> List[azlmbr.entity.EntityId]: + """ + :return: Entity ids of children. Type: [entity.EntityId()] + """ + return editor.EditorEntityInfoRequestBus(bus.Event, "GetChildren", self.id) + def add_component(self, component_name: str) -> EditorComponent: """ Used to add new component to Entity. diff --git a/AutomatedTesting/Gem/PythonTests/NvCloth/TestSuite_Main.py b/AutomatedTesting/Gem/PythonTests/NvCloth/TestSuite_Main.py index 2ddcc58f12..49a776a48c 100644 --- a/AutomatedTesting/Gem/PythonTests/NvCloth/TestSuite_Main.py +++ b/AutomatedTesting/Gem/PythonTests/NvCloth/TestSuite_Main.py @@ -23,10 +23,10 @@ class TestAutomation(TestAutomationBase): use_null_renderer = False # Use default renderer (needs gpu) - def test_C18977329_NvCloth_AddClothSimulationToMesh(self, request, workspace, editor, launcher_platform): - from . import C18977329_NvCloth_AddClothSimulationToMesh as test_module + def test_NvCloth_AddClothSimulationToMesh(self, request, workspace, editor, launcher_platform): + from .tests import NvCloth_AddClothSimulationToMesh as test_module self._run_test(request, workspace, editor, test_module, use_null_renderer = self.use_null_renderer) - def test_C18977330_NvCloth_AddClothSimulationToActor(self, request, workspace, editor, launcher_platform): - from . import C18977330_NvCloth_AddClothSimulationToActor as test_module + def test_NvCloth_AddClothSimulationToActor(self, request, workspace, editor, launcher_platform): + from .tests import NvCloth_AddClothSimulationToActor as test_module self._run_test(request, workspace, editor, test_module, use_null_renderer = self.use_null_renderer) diff --git a/AutomatedTesting/Gem/PythonTests/NvCloth/C18977330_NvCloth_AddClothSimulationToActor.py b/AutomatedTesting/Gem/PythonTests/NvCloth/tests/NvCloth_AddClothSimulationToActor.py old mode 100755 new mode 100644 similarity index 93% rename from AutomatedTesting/Gem/PythonTests/NvCloth/C18977330_NvCloth_AddClothSimulationToActor.py rename to AutomatedTesting/Gem/PythonTests/NvCloth/tests/NvCloth_AddClothSimulationToActor.py index 4d84a33dd2..357067b176 --- a/AutomatedTesting/Gem/PythonTests/NvCloth/C18977330_NvCloth_AddClothSimulationToActor.py +++ b/AutomatedTesting/Gem/PythonTests/NvCloth/tests/NvCloth_AddClothSimulationToActor.py @@ -15,7 +15,7 @@ class Tests: exit_game_mode = ("Exited game mode", "Failed to exit game mode") # fmt: on -def C18977330_NvCloth_AddClothSimulationToActor(): +def NvCloth_AddClothSimulationToActor(): """ Summary: Load level with Entity having Actor and Cloth components already setup. Verify that editor remains stable in Game mode. @@ -53,7 +53,7 @@ def C18977330_NvCloth_AddClothSimulationToActor(): helper.init_idle() # 1) Load the level - helper.open_level("NvCloth", "C18977330_NvCloth_AddClothSimulationToActor") + helper.open_level("NvCloth", "NvCloth_AddClothSimulationToActor") # 2) Start the Tracer to catch any errors and warnings with Tracer() as section_tracer: @@ -81,4 +81,4 @@ def C18977330_NvCloth_AddClothSimulationToActor(): if __name__ == "__main__": from editor_python_test_tools.utils import Report - Report.start_test(C18977330_NvCloth_AddClothSimulationToActor) + Report.start_test(NvCloth_AddClothSimulationToActor) diff --git a/AutomatedTesting/Gem/PythonTests/NvCloth/C18977329_NvCloth_AddClothSimulationToMesh.py b/AutomatedTesting/Gem/PythonTests/NvCloth/tests/NvCloth_AddClothSimulationToMesh.py old mode 100755 new mode 100644 similarity index 93% rename from AutomatedTesting/Gem/PythonTests/NvCloth/C18977329_NvCloth_AddClothSimulationToMesh.py rename to AutomatedTesting/Gem/PythonTests/NvCloth/tests/NvCloth_AddClothSimulationToMesh.py index 0ed9da1405..0f9d8448f7 --- a/AutomatedTesting/Gem/PythonTests/NvCloth/C18977329_NvCloth_AddClothSimulationToMesh.py +++ b/AutomatedTesting/Gem/PythonTests/NvCloth/tests/NvCloth_AddClothSimulationToMesh.py @@ -15,7 +15,7 @@ class Tests: exit_game_mode = ("Exited game mode", "Failed to exit game mode") # fmt: on -def C18977329_NvCloth_AddClothSimulationToMesh(): +def NvCloth_AddClothSimulationToMesh(): """ Summary: Load level with Entity having Mesh and Cloth components already setup. Verify that editor remains stable in Game mode. @@ -53,7 +53,7 @@ def C18977329_NvCloth_AddClothSimulationToMesh(): helper.init_idle() # 1) Load the level - helper.open_level("NvCloth", "C18977329_NvCloth_AddClothSimulationToMesh") + helper.open_level("NvCloth", "NvCloth_AddClothSimulationToMesh") # 2) Start the Tracer to catch any errors and warnings with Tracer() as section_tracer: @@ -81,4 +81,4 @@ def C18977329_NvCloth_AddClothSimulationToMesh(): if __name__ == "__main__": from editor_python_test_tools.utils import Report - Report.start_test(C18977329_NvCloth_AddClothSimulationToMesh) + Report.start_test(NvCloth_AddClothSimulationToMesh) diff --git a/AutomatedTesting/Gem/PythonTests/WhiteBox/CMakeLists.txt b/AutomatedTesting/Gem/PythonTests/WhiteBox/CMakeLists.txt index 1c7a02862d..10cf949c25 100644 --- a/AutomatedTesting/Gem/PythonTests/WhiteBox/CMakeLists.txt +++ b/AutomatedTesting/Gem/PythonTests/WhiteBox/CMakeLists.txt @@ -11,7 +11,7 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED AND PAL_TRAIT_BUILD_HOST_TOOLS) NAME AutomatedTesting::WhiteBoxTests TEST_SUITE main TEST_SERIAL - PATH ${CMAKE_CURRENT_LIST_DIR}/TestSuite_Active.py + PATH ${CMAKE_CURRENT_LIST_DIR}/TestSuite_Main.py RUNTIME_DEPENDENCIES Legacy::Editor AZ::AssetProcessor diff --git a/AutomatedTesting/Gem/PythonTests/WhiteBox/FileManagement.py b/AutomatedTesting/Gem/PythonTests/WhiteBox/FileManagement.py deleted file mode 100755 index 89b7559dd1..0000000000 --- a/AutomatedTesting/Gem/PythonTests/WhiteBox/FileManagement.py +++ /dev/null @@ -1,350 +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 - -""" - -# Imports -import os -import shutil -import json -import logging -import ly_test_tools.environment.file_system as fs - - -class FileManagement: - """ - File Management static class: Handles file backup and restoration. - Organizes backing up files into a single directory and - mapping the back up files to their original files. - - Features accessible via the exposed decorator functions. - """ - - # Static variables - MAX_BACKUPS = 10000 # Arbitrary number to cap same-file-name name generating - backup_folder_name = ".backup" - backup_folder_path = os.path.join(os.path.split(__file__)[0], backup_folder_name) # CWD plus backup folder name - file_map_name = "_filebackup_map.json" # JSON file to store original to back up file mappings - - @staticmethod - def _load_file_map(): - # type: () -> {str: str} - """ - Loads the FileManagement's json file map. - The returned dictionary has key: value sets such that: - keys: full path to an original file currently being backed up - values: name of the original file's backup file. Uses a numbering system for - storing multiple file names that are identical but located in different directories. - If there is no current json file or the file cannot be parsed, an empty dictionary is returned. - :return: Dictionary to map original file's to their back up file names. - """ - json_file_path = os.path.join(FileManagement.backup_folder_path, FileManagement.file_map_name) - if os.path.exists(json_file_path): - try: - with open(json_file_path, "r") as f: - return json.load(f) - except ValueError: - logging.info("Decoding JSON file {} failed. Empty dictionary used".format(json_file_path)) - return {} - - @staticmethod - def _save_file_map(file_map): - # type: ({str: str}) -> None - """ - Saves the [file_map] dictionary as a json file. - If [file_map] is empty, deletes the json file. - :param file_map: A dictionary mapping original file paths to their back up file names. - :return: None - """ - file_path = os.path.join(FileManagement.backup_folder_path, FileManagement.file_map_name) - if os.path.exists(file_path): - fs.unlock_file(file_path) - if len(file_map) > 0: - with open(file_path, "w") as f: - json.dump(file_map, f) - fs.lock_file(file_path) - else: - fs.delete([file_path], True, False) - - @staticmethod - def _next_available_name(file_name, file_map): - # type: (str, {str: str}) -> str or None - """ - Generates the next available backup file name using a FILE_NAME_x.ext naming convention - where x is a number. Returns None if we've maxed out the numbering system. - :param file_name: The base file to generate a back up file name for. - :param file_map: The file_map for the FileManagement system - :return: str - """ - suffix, extension = file_name.split(".", 1) - for i in range(FileManagement.MAX_BACKUPS): - potential_name = suffix + "_" + str(i) + "." + extension - if potential_name not in file_map.values(): - return potential_name - return None - - @staticmethod - def _backup_file(file_name, file_path): - # type: (str, str) -> None - """ - Backs up the [file_name] located at [file_path] into the FileManagement's backup folder. - Leaves the backup file locked from writing privileges. - :param file_name: The file's name that will be backed up - :param file_path: The path to the file to back up - :return: None - """ - file_map = FileManagement._load_file_map() - backup_path = FileManagement.backup_folder_path - backup_file_name = "{}.bak".format(file_name) - backup_file = os.path.join(backup_path, backup_file_name) - # If backup directory DNE, make one - if not os.path.exists(backup_path): - os.mkdir(backup_path) - # If "traditional" backup file exists, delete it (myFile.txt.bak) - if os.path.exists(backup_file): - fs.delete([backup_file], True, False) - # Find my next storage name (myFile_1.txt.bak) - backup_storage_file_name = FileManagement._next_available_name(backup_file_name, file_map) - if backup_storage_file_name is None: - # If _next_available_name returns None, we have backed up MAX_BACKUPS of files name [file_name] - raise Exception( - "FileManagement class ran out of backups per name. Max: {}".format(FileManagement.MAX_BACKUPS) - ) - backup_storage_file = os.path.join(backup_path, backup_storage_file_name) - if os.path.exists(backup_storage_file): - # This file should not exists, but if it does it's about to get clobbered! - fs.unlock_file(backup_storage_file) - # Create "traditional" backup file (myFile.txt.bak) - fs.create_backup(os.path.join(file_path, file_name), backup_path) - # Copy "traditional" backup file into storage backup (myFile_1.txt.bak) - FileManagement._copy_file(backup_file_name, backup_path, backup_storage_file_name, backup_path) - fs.lock_file(backup_storage_file) - # Delete "traditional" back up file - fs.unlock_file(backup_file) - fs.delete([backup_file], True, False) - # Update file map with new file - file_map[os.path.join(file_path, file_name)] = backup_storage_file_name - FileManagement._save_file_map(file_map) - # Unlock original file to get it ready to be edited by the test - fs.unlock_file(os.path.join(file_path, file_name)) - - @staticmethod - def _restore_file(file_name, file_path): - # type: (str, str) -> None - """ - Restores the [file_name] located at [file_path] which is backed up in FileManagement's backup folder. - Locks [file_name] from writing privileges when done restoring. - :param file_name: The Original file that was backed up, and now restored - :param file_path: The location of the original file that was backed up - :return: None - """ - file_map = FileManagement._load_file_map() - backup_path = FileManagement.backup_folder_path - src_file = os.path.join(file_path, file_name) - if src_file in file_map: - backup_file = os.path.join(backup_path, file_map[src_file]) - if os.path.exists(backup_file): - fs.unlock_file(backup_file) - fs.unlock_file(src_file) - # Make temporary copy of backed up file to restore from - temp_file = "{}.bak".format(file_name) - FileManagement._copy_file(file_map[src_file], backup_path, temp_file, backup_path) - fs.restore_backup(src_file, backup_path) - fs.lock_file(src_file) - # Delete backup file - fs.delete([os.path.join(backup_path, temp_file)], True, False) - fs.delete([backup_file], True, False) - # Remove from file map - del file_map[src_file] - FileManagement._save_file_map(file_map) - if not os.listdir(backup_path): - # Delete backup folder if it's empty now - os.rmdir(backup_path) - - @staticmethod - def _find_files(file_names, root_dir, search_subdirs=False): - # type: ([str], str, bool) -> {str:str} - """ - Searches the [root_dir] directory tree for each of the file names in [file_names]. Returns a dictionary - where keys = the entries in file_names, and their values are the paths they were found at. - Raises a runtime warning if not exactly one copy of each file is found. - :param file_names: A list of file_names to look for - :param root_dir: The root directory to begin the search - collect all file paths matching that file_name - :param search_subdirs: Optional boolean flag for searching sub-directories of [parent_path] - :return: A dictionary where keys are file names, and values are the file's path. - """ - file_list = {} - found_count = 0 - for file_name in file_names: - file_list[file_name] = None - if search_subdirs: - # Search parent path for all file name arguments - for dir_path, _, dir_files in os.walk(root_dir): - for dir_file in dir_files: - if dir_file in file_list.keys(): - if file_list[dir_file] is None: - file_list[dir_file] = dir_path - found_count += 1 - else: - # Found multiple files with same name. Raise warning. - raise RuntimeWarning("Found multiple files with the name {}.".format(dir_file)) - else: - for dir_file in os.listdir(root_dir): - if os.path.isfile(os.path.join(root_dir, dir_file)) and dir_file in file_names: - file_list[dir_file] = root_dir - not_found = [file_name for file_name in file_names if file_list[file_name] is None] - if not_found: - raise RuntimeWarning("Could not find the following files: {}".format(not_found)) - - return file_list - - @staticmethod - def _copy_file(src_file, src_path, target_file, target_path): - # type: (str, str, str, str) -> None - """ - Copies the [src_file] at located in [src_path] to the [target_file] located at [target_path]. - Leaves the [target_file] unlocked for reading and writing privileges - :param src_file: The source file to copy (file name) - :param src_path: The source file's path - :param target_file: The target file to copy into (file name) - :param target_path: The target file's path - :return: None - """ - target_file_path = os.path.join(target_path, target_file) - src_file_path = os.path.join(src_path, src_file) - if os.path.exists(target_file_path): - fs.unlock_file(target_file_path) - shutil.copyfile(src_file_path, target_file_path) - - @staticmethod - def file_revert(file_name, parent_path=None, search_subdirs=False): - # type: (str, str, bool) -> function - """ - Function decorator: - Convenience version of file_revert_list for passing a single file - Calls file_revert_list on a list one [file_name] - :param file_name: The name of a file to backup (not path) - :param parent_path: The root directory to search for the [file_names] (relative to the dev folder). - Defaults to the project folder described by the inner function's workspace fixture - :param search_subdirs: A boolean option for searching sub-directories for the files in [file_names] - :return: function as per the function decorator pattern - """ - return FileManagement.file_revert_list([file_name], parent_path, search_subdirs) - - @staticmethod - def file_revert_list(file_names, parent_path=None, search_subdirs=False): - # type: ([str], str, bool) -> function - """ - Function decorator: - Collects file names specified in [file_names] in the [parent_path] directory. - Backs up these files before executing the parameter to the "wrap" function. - If the search_subdirs flag is True, searches all subdirectories of [parent_path] for files. - :param file_names: A list of file names (not paths) - :param parent_path: The root directory to search for the [file_names] (relative to the dev folder). - Defaults to the project folder described by the inner function's workspace fixture - :param search_subdirs: A boolean option for searching sub-directories for the files in [file_names] - :return: function as per the function decorator pattern - """ - - def wrap(func): - # type: (function) -> function - def inner(self, request, workspace, editor, launcher_platform): - # type: (...) -> None - """ - Inner function to wrap around decorated function. Function being decorated must match this - functions parameter order. - """ - root_path = parent_path - if root_path is not None: - root_path = os.path.join(workspace.paths.engine_root(), root_path) - else: - # Default to project folder (AutomatedTesting) - root_path = workspace.paths.project() - - # Try to locate files - try: - file_list = FileManagement._find_files(file_names, root_path, search_subdirs) - except RuntimeWarning as w: - assert False, ( - w.message - + " Please check use of search_subdirs; make sure you are using the correct parent directory." - ) - - # Restore from backups - for file_name, file_path in file_list.items(): - FileManagement._restore_file(file_name, file_path) - - # Create backups for each discovered path for each specified filename - for file_name, file_path in file_list.items(): - FileManagement._backup_file(file_name, file_path) - - try: - # Run the test - func(self, request, workspace, editor, launcher_platform) - finally: - # Restore backups for each discovered path for each specified filename if they exist - for file_name, file_path in file_list.items(): - FileManagement._restore_file(file_name, file_path) - - return inner - - return wrap - - @staticmethod - def file_override(target_file, src_file, parent_path=None, search_subdirs=False): - # type: (str, str, str, bool) -> function - """ - Function decorator: - Searches for [target_file] and [src_file] in [parent_path](relative to the project dev folder) - and performs backup and file swapping. [target_file] is backed up and replaced with [src_file] before the - decorated function executes. - After the decorated function is executed [target_file] is restored to the state before being swapped. - If [parent_path] is not specified, the project folder described by the current workspace will be used. - If the search_subdirs flag is True, searches all subdirectories of [parent_path] for files. - :param target_file: The name of the file being backed up and swapped into - :param src_file: The name of the file to swap into [target_file] - :param parent_path: The root directory to search for the [file_names] (relative to the dev folder). - Defaults to the project folder described by the inner function's workspace fixture - :param search_subdirs: A boolean option for searching sub-directories for the files in [file_names] - :return: The decorated function - """ - - def wrap(func): - def inner(self, request, workspace, editor, launcher_platform): - """ - Inner function to wrap around decorated function. Function being decorated must match this - functions parameter order. - """ - root_path = parent_path - if root_path is not None: - root_path = os.path.join(workspace.paths.engine_root(), root_path) - else: - # Default to project folder (AutomatedTesting) - root_path = workspace.paths.project() - - # Try to locate both target and source files - try: - file_list = FileManagement._find_files([target_file, src_file], root_path, search_subdirs) - except RuntimeWarning as w: - assert False, ( - w.message - + " Please check use of search_subdirs; make sure you are using the correct parent directory." - ) - - FileManagement._restore_file(target_file, file_list[target_file]) - FileManagement._backup_file(target_file, file_list[target_file]) - FileManagement._copy_file(src_file, file_list[src_file], target_file, file_list[target_file]) - - try: - # Run Test - func(self, request, workspace, editor, launcher_platform) - finally: - FileManagement._restore_file(target_file, file_list[target_file]) - - return inner - - return wrap diff --git a/AutomatedTesting/Gem/PythonTests/WhiteBox/ImportPathHelper.py b/AutomatedTesting/Gem/PythonTests/WhiteBox/ImportPathHelper.py deleted file mode 100755 index 0e395664ad..0000000000 --- a/AutomatedTesting/Gem/PythonTests/WhiteBox/ImportPathHelper.py +++ /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 -""" - -def init(): - import os - import sys - sys.path.append(os.path.dirname(os.path.abspath(__file__)) + '/../automatedtesting_shared') diff --git a/AutomatedTesting/Gem/PythonTests/WhiteBox/TestSuite_Active.py b/AutomatedTesting/Gem/PythonTests/WhiteBox/TestSuite_Main.py old mode 100755 new mode 100644 similarity index 61% rename from AutomatedTesting/Gem/PythonTests/WhiteBox/TestSuite_Active.py rename to AutomatedTesting/Gem/PythonTests/WhiteBox/TestSuite_Main.py index c4a08f5667..fa6c81c98a --- a/AutomatedTesting/Gem/PythonTests/WhiteBox/TestSuite_Active.py +++ b/AutomatedTesting/Gem/PythonTests/WhiteBox/TestSuite_Main.py @@ -12,7 +12,6 @@ import pytest import sys import os -from .FileManagement import FileManagement as fm from ly_test_tools import LAUNCHERS sys.path.append(os.path.dirname(os.path.abspath(__file__)) + '/../automatedtesting_shared') @@ -23,14 +22,14 @@ from base import TestAutomationBase @pytest.mark.parametrize("launcher_platform", ['windows_editor']) @pytest.mark.parametrize("project", ["AutomatedTesting"]) class TestAutomation(TestAutomationBase): - def test_C28798177_WhiteBox_AddComponentToEntity(self, request, workspace, editor, launcher_platform): - from . import C28798177_WhiteBox_AddComponentToEntity as test_module + def test_WhiteBox_AddComponentToEntity(self, request, workspace, editor, launcher_platform): + from .tests import WhiteBox_AddComponentToEntity as test_module self._run_test(request, workspace, editor, test_module) - def test_C29279329_WhiteBox_SetDefaultShape(self, request, workspace, editor, launcher_platform): - from . import C29279329_WhiteBox_SetDefaultShape as test_module + def test_WhiteBox_SetDefaultShape(self, request, workspace, editor, launcher_platform): + from .tests import WhiteBox_SetDefaultShape as test_module self._run_test(request, workspace, editor, test_module) - def test_C28798205_WhiteBox_SetInvisible(self, request, workspace, editor, launcher_platform): - from . import C28798205_WhiteBox_SetInvisible as test_module + def test_WhiteBox_SetInvisible(self, request, workspace, editor, launcher_platform): + from .tests import WhiteBox_SetInvisible as test_module self._run_test(request, workspace, editor, test_module) diff --git a/AutomatedTesting/Gem/PythonTests/WhiteBox/C28798177_WhiteBox_AddComponentToEntity.py b/AutomatedTesting/Gem/PythonTests/WhiteBox/tests/WhiteBox_AddComponentToEntity.py old mode 100755 new mode 100644 similarity index 93% rename from AutomatedTesting/Gem/PythonTests/WhiteBox/C28798177_WhiteBox_AddComponentToEntity.py rename to AutomatedTesting/Gem/PythonTests/WhiteBox/tests/WhiteBox_AddComponentToEntity.py index bd65555951..7e250e304f --- a/AutomatedTesting/Gem/PythonTests/WhiteBox/C28798177_WhiteBox_AddComponentToEntity.py +++ b/AutomatedTesting/Gem/PythonTests/WhiteBox/tests/WhiteBox_AddComponentToEntity.py @@ -21,8 +21,6 @@ def C28798177_WhiteBox_AddComponentToEntity(): import os import sys from Gems.WhiteBox.Editor.Scripts import WhiteBoxInit as init - import ImportPathHelper as imports - imports.init() import azlmbr.bus as bus import azlmbr.editor as editor @@ -53,8 +51,5 @@ def C28798177_WhiteBox_AddComponentToEntity(): if __name__ == "__main__": - import ImportPathHelper as imports - imports.init() - from editor_python_test_tools.utils import Report Report.start_test(C28798177_WhiteBox_AddComponentToEntity) diff --git a/AutomatedTesting/Gem/PythonTests/WhiteBox/C29279329_WhiteBox_SetDefaultShape.py b/AutomatedTesting/Gem/PythonTests/WhiteBox/tests/WhiteBox_SetDefaultShape.py old mode 100755 new mode 100644 similarity index 97% rename from AutomatedTesting/Gem/PythonTests/WhiteBox/C29279329_WhiteBox_SetDefaultShape.py rename to AutomatedTesting/Gem/PythonTests/WhiteBox/tests/WhiteBox_SetDefaultShape.py index 060a648389..417561a3bd --- a/AutomatedTesting/Gem/PythonTests/WhiteBox/C29279329_WhiteBox_SetDefaultShape.py +++ b/AutomatedTesting/Gem/PythonTests/WhiteBox/tests/WhiteBox_SetDefaultShape.py @@ -25,8 +25,6 @@ def C29279329_WhiteBox_SetDefaultShape(): import os import sys from Gems.WhiteBox.Editor.Scripts import WhiteBoxInit as init - import ImportPathHelper as imports - imports.init() import azlmbr.whitebox.api as api import azlmbr.bus as bus @@ -102,8 +100,5 @@ def C29279329_WhiteBox_SetDefaultShape(): if __name__ == "__main__": - import ImportPathHelper as imports - imports.init() - from editor_python_test_tools.utils import Report Report.start_test(C29279329_WhiteBox_SetDefaultShape) diff --git a/AutomatedTesting/Gem/PythonTests/WhiteBox/C28798205_WhiteBox_SetInvisible.py b/AutomatedTesting/Gem/PythonTests/WhiteBox/tests/WhiteBox_SetInvisible.py old mode 100755 new mode 100644 similarity index 95% rename from AutomatedTesting/Gem/PythonTests/WhiteBox/C28798205_WhiteBox_SetInvisible.py rename to AutomatedTesting/Gem/PythonTests/WhiteBox/tests/WhiteBox_SetInvisible.py index 3cbfd4ea08..9642835e8f --- a/AutomatedTesting/Gem/PythonTests/WhiteBox/C28798205_WhiteBox_SetInvisible.py +++ b/AutomatedTesting/Gem/PythonTests/WhiteBox/tests/WhiteBox_SetInvisible.py @@ -24,9 +24,7 @@ def C28798205_WhiteBox_SetInvisible(): import os import sys from Gems.WhiteBox.Editor.Scripts import WhiteBoxInit as init - import ImportPathHelper as imports import editor_python_test_tools.hydra_editor_utils as hydra - imports.init() import azlmbr.whitebox.api as api import azlmbr.whitebox @@ -63,8 +61,5 @@ def C28798205_WhiteBox_SetInvisible(): if __name__ == "__main__": - import ImportPathHelper as imports - imports.init() - from editor_python_test_tools.utils import Report Report.start_test(C28798205_WhiteBox_SetInvisible) diff --git a/AutomatedTesting/Gem/PythonTests/editor/TestSuite_Sandbox_Optimized.py b/AutomatedTesting/Gem/PythonTests/editor/TestSuite_Sandbox_Optimized.py index d49e9e1c9b..4a472095ae 100644 --- a/AutomatedTesting/Gem/PythonTests/editor/TestSuite_Sandbox_Optimized.py +++ b/AutomatedTesting/Gem/PythonTests/editor/TestSuite_Sandbox_Optimized.py @@ -11,7 +11,6 @@ import pytest 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_sandbox @pytest.mark.parametrize("launcher_platform", ['windows_editor']) @pytest.mark.parametrize("project", ["AutomatedTesting"]) diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/PhysXColliderSurfaceTagEmitter_E2E_Editor.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/PhysXColliderSurfaceTagEmitter_E2E_Editor.py index 2052c59a94..361dbdaea9 100755 --- a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/PhysXColliderSurfaceTagEmitter_E2E_Editor.py +++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/PhysXColliderSurfaceTagEmitter_E2E_Editor.py @@ -156,7 +156,7 @@ class TestPhysXColliderSurfaceTagEmitter(EditorTestHelper): # Setup collider entity with a PhysX Mesh test_physx_mesh_asset_id = asset.AssetCatalogRequestBus( bus.Broadcast, "GetAssetIdByPath", os.path.join("levels", "physics", - "c4044697_material_perfacematerialvalidation", + "Material_PerFaceMaterialGetsCorrectMaterial", "test.pxmesh"), math.Uuid(), False) # Remove/re-add component due to LYN-5496 diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/gradient_signal/TestSuite_Periodic_Optimized.py b/AutomatedTesting/Gem/PythonTests/largeworlds/gradient_signal/TestSuite_Periodic_Optimized.py index 514504d324..f996a1f8c3 100644 --- a/AutomatedTesting/Gem/PythonTests/largeworlds/gradient_signal/TestSuite_Periodic_Optimized.py +++ b/AutomatedTesting/Gem/PythonTests/largeworlds/gradient_signal/TestSuite_Periodic_Optimized.py @@ -10,6 +10,7 @@ import pytest 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_periodic @pytest.mark.parametrize("launcher_platform", ['windows_editor']) @pytest.mark.parametrize("project", ["AutomatedTesting"]) diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/TestSuite_Main_Optimized.py b/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/TestSuite_Main_Optimized.py index 8c662a9b45..9cc572ad69 100644 --- a/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/TestSuite_Main_Optimized.py +++ b/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/TestSuite_Main_Optimized.py @@ -12,6 +12,7 @@ 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_periodic @pytest.mark.parametrize("launcher_platform", ['windows_editor']) @pytest.mark.parametrize("project", ["AutomatedTesting"]) @@ -58,11 +59,11 @@ class TestAutomation(EditorTestSuite): from .EditorScripts import GraphClosed_TabbedGraph as test_module class test_LandscapeCanvas_Slice_CreateInstantiate(EditorSingleTest): + from .EditorScripts import Slice_CreateInstantiate as test_module # Custom teardown to remove slice asset created during test def teardown(self, request, workspace, editor, editor_test_results, launcher_platform): file_system.delete([os.path.join(workspace.paths.engine_root(), "AutomatedTesting", "slices", "TestSlice.slice")], True, True) - from .EditorScripts import Slice_CreateInstantiate as test_module class test_LandscapeCanvas_GradientModifierNodes_EntityCreatedOnNodeAdd(EditorSharedTest): from .EditorScripts import GradientModifierNodes_EntityCreatedOnNodeAdd as test_module diff --git a/AutomatedTesting/Gem/PythonTests/physics/TestSuite_InDevelopment.py b/AutomatedTesting/Gem/PythonTests/physics/TestSuite_InDevelopment.py index dad37297cc..9e3a9cb4ff 100755 --- a/AutomatedTesting/Gem/PythonTests/physics/TestSuite_InDevelopment.py +++ b/AutomatedTesting/Gem/PythonTests/physics/TestSuite_InDevelopment.py @@ -20,368 +20,164 @@ sys.path.append(os.path.dirname(os.path.abspath(__file__)) + '/../automatedtesti from base import TestAutomationBase @pytest.mark.parametrize("project", ["AutomatedTesting"]) +@pytest.mark.parametrize("launcher_platform", ['windows_editor']) class TestAutomation(TestAutomationBase): @fm.file_revert("ragdollbones.physmaterial", - r"AutomatedTesting\Levels\Physics\C4925582_Material_AddModifyDeleteOnRagdollBones") - def test_C4925582_Material_AddModifyDeleteOnRagdollBones(self, request, workspace, editor): - from .material import C4925582_Material_AddModifyDeleteOnRagdollBones as test_module + r"AutomatedTesting\Levels\Physics\Material_LibraryCrudOperationsReflectOnRagdollBones") + def test_Material_LibraryCrudOperationsReflectOnRagdollBones(self, request, workspace, editor, launcher_platform): + from .tests.material import Material_LibraryCrudOperationsReflectOnRagdollBones as test_module + self._run_test(request, workspace, editor, test_module) - expected_lines = [] - unexpected_lines = ["Assert"] - self._run_test(request, workspace, editor, test_module, expected_lines, unexpected_lines) - - def test_C4925580_Material_RagdollBonesMaterial(self, request, workspace, editor): - from .material import C4925580_Material_RagdollBonesMaterial as test_module - - expected_lines = [] - unexpected_lines = ["Assert"] - self._run_test(request, workspace, editor, test_module, expected_lines, unexpected_lines) + def test_Material_RagdollBones(self, request, workspace, editor, launcher_platform): + from .tests.material import Material_RagdollBones as test_module + self._run_test(request, workspace, editor, test_module) @fm.file_revert("c15308221_material_componentsinsyncwithlibrary.physmaterial", - r"AutomatedTesting\Levels\Physics\C15308221_Material_ComponentsInSyncWithLibrary") - def test_C15308221_Material_ComponentsInSyncWithLibrary(self, request, workspace, editor): - from .material import C15308221_Material_ComponentsInSyncWithLibrary as test_module - - expected_lines = [] - unexpected_lines = ["Assert"] - self._run_test(request, workspace, editor, test_module, expected_lines, unexpected_lines) + r"AutomatedTesting\Levels\Physics\Material_ComponentsInSyncWithLibrary") + def test_Material_ComponentsInSyncWithLibrary(self, request, workspace, editor, launcher_platform): + from .tests.material import Material_ComponentsInSyncWithLibrary as test_module + self._run_test(request, workspace, editor, test_module) # BUG: LY-107723") - def test_C14976308_ScriptCanvas_SetKinematicTargetTransform(self, request, workspace, editor): - from .script_canvas import C14976308_ScriptCanvas_SetKinematicTargetTransform as test_module - - expected_lines = [] - unexpected_lines = ["Assert"] - self._run_test(request, workspace, editor, test_module, expected_lines, unexpected_lines) + def test_ScriptCanvas_SetKinematicTargetTransform(self, request, workspace, editor, launcher_platform): + from .tests.script_canvas import ScriptCanvas_SetKinematicTargetTransform as test_module + self._run_test(request, workspace, editor, test_module) # Failing, PhysXTerrain @fm.file_revert("c4925579_material_addmodifydeleteonterrain.physmaterial", - r"AutomatedTesting\Levels\Physics\C4925579_Material_AddModifyDeleteOnTerrain") - def test_C4925579_Material_AddModifyDeleteOnTerrain(self, request, workspace, editor): - from .material import C4925579_Material_AddModifyDeleteOnTerrain as test_module - - expected_lines = [] - unexpected_lines = ["Assert"] - self._run_test(request, workspace, editor, test_module, expected_lines, unexpected_lines) + r"AutomatedTesting\Levels\Physics\Material_LibraryCrudOperationsReflectOnTerrain") + def test_Material_LibraryCrudOperationsReflectOnTerrain(self, request, workspace, editor, launcher_platform): + from .tests.material import Material_LibraryCrudOperationsReflectOnTerrain as test_module + self._run_test(request, workspace, editor, test_module) # Failing, PhysXTerrain - def test_C13508019_Terrain_TerrainTexturePainterWorks(self, request, workspace, editor): - from .terrain import C13508019_Terrain_TerrainTexturePainterWorks as test_module - - expected_lines = [] - unexpected_lines = ["Assert"] - self._run_test(request, workspace, editor, test_module, expected_lines, unexpected_lines) + def test_Terrain_TerrainTexturePainterWorks(self, request, workspace, editor, launcher_platform): + from .tests.terrain import Terrain_TerrainTexturePainterWorks as test_module + self._run_test(request, workspace, editor, test_module) # Failing, PhysXTerrain - def test_C4925577_Materials_MaterialAssignedToTerrain(self, request, workspace, editor): - from .material import C4925577_Materials_MaterialAssignedToTerrain as test_module - - expected_lines = [] - unexpected_lines = ["Assert"] - self._run_test(request, workspace, editor, test_module, expected_lines, unexpected_lines) + def test_Material_CanBeAssignedToTerrain(self, request, workspace, editor, launcher_platform): + from .tests.material import Material_CanBeAssignedToTerrain as test_module + self._run_test(request, workspace, editor, test_module) # Failing, PhysXTerrain - def test_C15096735_Materials_DefaultLibraryConsistency(self, request, workspace, editor): - from .material import C15096735_Materials_DefaultLibraryConsistency as test_module - - expected_lines = [] - unexpected_lines = ["Assert"] - self._run_test(request, workspace, editor, test_module, expected_lines, unexpected_lines) + def test_Material_DefaultLibraryConsistentOnAllFeatures(self, request, workspace, editor, launcher_platform): + from .tests.material import Material_DefaultLibraryConsistentOnAllFeatures as test_module + self._run_test(request, workspace, editor, test_module) # Failing, PhysXTerrain - @fm.file_revert("all_ones_1.physmaterial", r"AutomatedTesting\Levels\Physics\C15096737_Materials_DefaultMaterialLibraryChanges") - @fm.file_override("default.physxconfiguration", "C15096737_Materials_DefaultMaterialLibraryChanges.physxconfiguration", "AutomatedTesting") - def test_C15096737_Materials_DefaultMaterialLibraryChanges(self, request, workspace, editor): - from .material import C15096737_Materials_DefaultMaterialLibraryChanges as test_module - expected_lines = [] - unexpected_lines = ["Assert"] - self._run_test(request, workspace, editor, test_module, expected_lines, unexpected_lines) + @fm.file_revert("all_ones_1.physmaterial", r"AutomatedTesting\Levels\Physics\Material_DefaultMaterialLibraryChangesWork") + @fm.file_override("default.physxconfiguration", "Material_DefaultMaterialLibraryChangesWork.physxconfiguration", "AutomatedTesting") + def test_Material_DefaultMaterialLibraryChangesWork(self, request, workspace, editor, launcher_platform): + from .tests.material import Material_DefaultMaterialLibraryChangesWork as test_module + self._run_test(request, workspace, editor, test_module) - def test_C4976242_Collision_SameCollisionlayerSameCollisiongroup(self, request, workspace, editor): - from .collider import C4976242_Collision_SameCollisionlayerSameCollisiongroup as test_module + def test_Collider_SameCollisionGroupSameLayerCollide(self, request, workspace, editor, launcher_platform): + from .tests.collider import Collider_SameCollisionGroupSameLayerCollide as test_module + self._run_test(request, workspace, editor, test_module) - expected_lines = [] - unexpected_lines = ["Assert"] - self._run_test(request, workspace, editor, test_module, expected_lines, unexpected_lines) + def test_Ragdoll_OldRagdollSerializationNoErrors(self, request, workspace, editor, launcher_platform): + from .tests.ragdoll import Ragdoll_OldRagdollSerializationNoErrors as test_module + self._run_test(request, workspace, editor, test_module) - def test_C15096732_Material_DefaultLibraryUpdatedAcrossLevels(self, request, workspace, editor): - @fm.file_override("default.physxconfiguration", - "Material_DefaultLibraryUpdatedAcrossLevels_before.physxconfiguration", "AutomatedTesting", - search_subdirs=True) - def test_levels_before(self, request, workspace, editor): - from .material import C15096732_Material_DefaultLibraryUpdatedAcrossLevels_before as test_module_0 - expected_lines = [] - unexpected_lines = ["Assert"] - self._run_test(request, workspace, editor, test_module_0, expected_lines, unexpected_lines) + @fm.file_override("default.physxconfiguration", "ScriptCanvas_OverlapNode.physxconfiguration") + def test_ScriptCanvas_OverlapNode(self, request, workspace, editor, launcher_platform): + from .tests.script_canvas import ScriptCanvas_OverlapNode as test_module + self._run_test(request, workspace, editor, test_module) - # File override replaces the previous physxconfiguration file with another where the only difference is the default material library - @fm.file_override("default.physxconfiguration", - "Material_DefaultLibraryUpdatedAcrossLevels_after.physxconfiguration", "AutomatedTesting", - search_subdirs=True) - def test_levels_after(self, request, workspace, editor): - from .material import C15096732_Material_DefaultLibraryUpdatedAcrossLevels_after as test_module_1 - expected_lines = [] - unexpected_lines = ["Assert"] - self._run_test(request, workspace, editor, test_module_1, expected_lines, unexpected_lines) - - test_levels_before(self, request, workspace, editor) - test_levels_after(self, request, workspace, editor) - - def test_C14654882_Ragdoll_ragdollAPTest(self, request, workspace, editor): - from .ragdoll import C14654882_Ragdoll_ragdollAPTest as test_module - - expected_lines = [] - unexpected_lines = test_module.UnexpectedLines.lines - self._run_test(request, workspace, editor, test_module, expected_lines, unexpected_lines) - - @fm.file_override("default.physxconfiguration", "C12712454_ScriptCanvas_OverlapNodeVerification.physxconfiguration") - def test_C12712454_ScriptCanvas_OverlapNodeVerification(self, request, workspace, editor): - from .script_canvas import C12712454_ScriptCanvas_OverlapNodeVerification as test_module - - expected_lines = [] - unexpected_lines = ["Assert"] - self._run_test(request, workspace, editor, test_module, expected_lines, unexpected_lines) - - def test_C4044460_Material_StaticFriction(self, request, workspace, editor): - from .material import C4044460_Material_StaticFriction as test_module - - expected_lines = [] - unexpected_lines = ["Assert"] - self._run_test(request, workspace, editor, test_module, expected_lines, unexpected_lines) - - + def test_Material_StaticFriction(self, request, workspace, editor, launcher_platform): + from .tests.material import Material_StaticFriction as test_module + self._run_test(request, workspace, editor, test_module) @fm.file_revert("c4888315_material_addmodifydeleteoncollider.physmaterial", - r"AutomatedTesting\Levels\Physics\C4888315_Material_AddModifyDeleteOnCollider") - def test_C4888315_Material_AddModifyDeleteOnCollider(self, request, workspace, editor): - from .material import C4888315_Material_AddModifyDeleteOnCollider as test_module - - expected_lines = [] - unexpected_lines = ["Assert"] - - self._run_test(request, workspace, editor, test_module, expected_lines, unexpected_lines) + r"AutomatedTesting\Levels\Physics\Material_LibraryCrudOperationsReflectOnCollider") + def test_Material_LibraryCrudOperationsReflectOnCollider(self, request, workspace, editor, launcher_platform): + from .tests.material import Material_LibraryCrudOperationsReflectOnCollider as test_module + self._run_test(request, workspace, editor, test_module) @fm.file_revert("c15563573_material_addmodifydeleteoncharactercontroller.physmaterial", - r"AutomatedTesting\Levels\Physics\C15563573_Material_AddModifyDeleteOnCharacterController") - def test_C15563573_Material_AddModifyDeleteOnCharacterController(self, request, workspace, editor): - from .material import C15563573_Material_AddModifyDeleteOnCharacterController as test_module - - expected_lines = [] - unexpected_lines = ["Assert"] - self._run_test(request, workspace, editor, test_module, expected_lines, unexpected_lines) + r"AutomatedTesting\Levels\Physics\Material_LibraryCrudOperationsReflectOnCharacterController") + def test_Material_LibraryCrudOperationsReflectOnCharacterController(self, request, workspace, editor, launcher_platform): + from .tests.material import Material_LibraryCrudOperationsReflectOnCharacterController as test_module + self._run_test(request, workspace, editor, test_module) @fm.file_revert("c4888315_material_addmodifydeleteoncollider.physmaterial", - r"AutomatedTesting\Levels\Physics\C4888315_Material_AddModifyDeleteOnCollider") - def test_C4888315_Material_AddModifyDeleteOnCollider(self, request, workspace, editor): - from .material import C4888315_Material_AddModifyDeleteOnCollider as test_module - - expected_lines = [] - unexpected_lines = ["Assert"] - - self._run_test(request, workspace, editor, test_module, expected_lines, unexpected_lines) - + r"AutomatedTesting\Levels\Physics\Material_LibraryCrudOperationsReflectOnCollider") + def test_Material_LibraryCrudOperationsReflectOnCollider(self, request, workspace, editor, launcher_platform): + from .tests.material import Material_LibraryCrudOperationsReflectOnCollider as test_module + self._run_test(request, workspace, editor, test_module) @fm.file_revert("c15563573_material_addmodifydeleteoncharactercontroller.physmaterial", - r"AutomatedTesting\Levels\Physics\C15563573_Material_AddModifyDeleteOnCharacterController") - def test_C15563573_Material_AddModifyDeleteOnCharacterController(self, request, workspace, editor): - from .material import C15563573_Material_AddModifyDeleteOnCharacterController as test_module - - expected_lines = [] - unexpected_lines = ["Assert"] - self._run_test(request, workspace, editor, test_module, expected_lines, unexpected_lines) + r"AutomatedTesting\Levels\Physics\Material_LibraryCrudOperationsReflectOnCharacterController") + def test_Material_LibraryCrudOperationsReflectOnCharacterController(self, request, workspace, editor, launcher_platform): + from .tests.material import Material_LibraryCrudOperationsReflectOnCharacterController as test_module + self._run_test(request, workspace, editor, test_module) @fm.file_revert("c4044455_material_librarychangesinstantly.physmaterial", r"AutomatedTesting\Levels\Physics\C4044455_Material_LibraryChangesInstantly") - def test_C4044455_Material_libraryChangesInstantly(self, request, workspace, editor): - from .material import C4044455_Material_libraryChangesInstantly as test_module + def test_Material_LibraryChangesReflectInstantly(self, request, workspace, editor, launcher_platform): + from .tests.material import Material_LibraryChangesReflectInstantly as test_module + self._run_test(request, workspace, editor, test_module) - expected_lines = [] - unexpected_lines = ["Assert"] - self._run_test(request, workspace, editor, test_module, expected_lines, unexpected_lines) - - - @fm.file_revert("C15425935_Material_LibraryUpdatedAcrossLevels.physmaterial", - r"AutomatedTesting\Levels\Physics\C15425935_Material_LibraryUpdatedAcrossLevels") - def test_C15425935_Material_LibraryUpdatedAcrossLevels(self, request, workspace, editor): - from .material import C15425935_Material_LibraryUpdatedAcrossLevels as test_module - - expected_lines = [] - unexpected_lines = ["Assert"] - self._run_test(request, workspace, editor, test_module, expected_lines, unexpected_lines) + @fm.file_revert("Material_LibraryUpdatedAcrossLevels.physmaterial", + r"AutomatedTesting\Levels\Physics\Material_LibraryUpdatedAcrossLevels") + def test_Material_LibraryUpdatedAcrossLevels(self, request, workspace, editor, launcher_platform): + from .tests.material import Material_LibraryUpdatedAcrossLevels as test_module + self._run_test(request, workspace, editor, test_module) - def test_C4976199_RigidBodies_LinearDampingObjectMotion(self, request, workspace, editor): - from .rigid_body import C4976199_RigidBodies_LinearDampingObjectMotion as test_module + def test_RigidBody_LinearDampingAffectsMotion(self, request, workspace, editor, launcher_platform): + from .tests.rigid_body import RigidBody_LinearDampingAffectsMotion as test_module + self._run_test(request, workspace, editor, test_module) - expected_lines = [] - unexpected_lines = ["Assert"] - self._run_test(request, workspace, editor, test_module, expected_lines, unexpected_lines) + def test_Terrain_CollisionAgainstRigidBody(self, request, workspace, editor, launcher_platform): + from .tests.terrain import Terrain_CollisionAgainstRigidBody as test_module + self._run_test(request, workspace, editor, test_module) - def test_C5689518_PhysXTerrain_CollidesWithPhysXTerrain(self, request, workspace, editor): - from .terrain import C5689518_PhysXTerrain_CollidesWithPhysXTerrain as test_module + def test_ShapeCollider_CylinderShapeCollides(self, request, workspace, editor, launcher_platform): + from .tests.collider import ShapeCollider_CylinderShapeCollides as test_module + self._run_test(request, workspace, editor, test_module) - expected_lines = [] - unexpected_lines = ["Assert"] - self._run_test(request, workspace, editor, test_module, expected_lines, unexpected_lines) + def test_Physics_WorldBodyBusWorksOnEditorComponents(self, request, workspace, editor, launcher_platform): + from .tests import Physics_WorldBodyBusWorksOnEditorComponents as test_module + self._run_test(request, workspace, editor, test_module) - def test_C24308873_CylinderShapeCollider_CollidesWithPhysXTerrain(self, request, workspace, editor): - from .collider import C24308873_CylinderShapeCollider_CollidesWithPhysXTerrain as test_module + def test_Collider_PxMeshErrorIfNoMesh(self, request, workspace, editor, launcher_platform): + from .tests.collider import Collider_PxMeshErrorIfNoMesh as test_module + self._run_test(request, workspace, editor, test_module) - expected_lines = [] - unexpected_lines = ["Assert"] - self._run_test(request, workspace, editor, test_module, expected_lines, unexpected_lines) + def test_ForceRegion_ImpulsesBoxShapedRigidBody(self, request, workspace, editor, launcher_platform): + from .tests.force_region import ForceRegion_ImpulsesBoxShapedRigidBody as test_module + self._run_test(request, workspace, editor, test_module) - def test_C29032500_EditorComponents_WorldBodyBusWorks(self, request, workspace, editor): - from .general import C29032500_EditorComponents_WorldBodyBusWorks as test_module + def test_Terrain_SpawnSecondTerrainComponentWarning(self, request, workspace, editor, launcher_platform): + from .tests.terrain import Terrain_SpawnSecondTerrainComponentWarning as test_module + self._run_test(request, workspace, editor, test_module) - expected_lines = [] - unexpected_lines = ["Assert"] - self._run_test(request, workspace, editor, test_module, expected_lines, unexpected_lines) + def test_Terrain_AddPhysTerrainComponent(self, request, workspace, editor, launcher_platform): + from .tests.terrain import Terrain_AddPhysTerrainComponent as test_module + self._run_test(request, workspace, editor, test_module) - def test_C14861498_ConfirmError_NoPxMesh(self, request, workspace, editor, launcher_platform): - from .collider import C14861498_ConfirmError_NoPxMesh as test_module + def test_Terrain_CanAddMultipleTerrainComponents(self, request, workspace, editor, launcher_platform): + from .tests.terrain import Terrain_CanAddMultipleTerrainComponents as test_module + self._run_test(request, workspace, editor, test_module) - expected_lines = [] - unexpected_lines = ["Assert"] - self._run_test(request, workspace, editor, test_module, expected_lines, unexpected_lines) + def test_Terrain_MultipleTerrainComponentsWarning(self, request, workspace, editor, launcher_platform): + from .tests.terrain import Terrain_MultipleTerrainComponentsWarning as test_module + self._run_test(request, workspace, editor, test_module) - def test_C5959763_ForceRegion_ForceRegionImpulsesCube(self, request, workspace, editor, launcher_platform): - from .force_region import C5959763_ForceRegion_ForceRegionImpulsesCube as test_module + def test_Terrain_MultipleTerrainComponentsWarning(self, request, workspace, editor, launcher_platform): + from .tests.terrain import Terrain_MultipleTerrainComponentsWarning as test_module + self._run_test(request, workspace, editor, test_module) - expected_lines = [] - unexpected_lines = ["Assert"] - self._run_test(request, workspace, editor, test_module, expected_lines, unexpected_lines) + def test_ForceRegion_HighValuesDirectionAxesWorkWithNoError(self, request, workspace, editor, launcher_platform): + from .tests.force_region import ForceRegion_HighValuesDirectionAxesWorkWithNoError as test_module + self._run_test(request, workspace, editor, test_module) - def test_C5689531_Warning_TerrainSliceTerrainComponent(self, request, workspace, editor, launcher_platform): - from .terrain import C5689531_Warning_TerrainSliceTerrainComponent as test_module - expected_lines = [] - unexpected_lines = ["Assert"] - self._run_test(request, workspace, editor, test_module, expected_lines, unexpected_lines) + def test_Terrain_MultipleResolutionsValid(self, request, workspace, editor, launcher_platform): + from .tests.terrain import Terrain_MultipleResolutionsValid as test_module + self._run_test(request, workspace, editor, test_module) - def test_C5689522_Physxterrain_AddPhysxterrainNoEditorCrash(self, request, workspace, editor, launcher_platform): - from .terrain import C5689522_Physxterrain_AddPhysxterrainNoEditorCrash as test_module - - expected_lines = [] - unexpected_lines = ["Assert"] - self._run_test(request, workspace, editor, test_module, expected_lines, unexpected_lines) - - def test_C5689524_MultipleTerrains_CheckWarningInConsole(self, request, workspace, editor, launcher_platform): - from .terrain import C5689524_MultipleTerrains_CheckWarningInConsole as test_module - - expected_lines = [] - unexpected_lines = ["Assert"] - self._run_test(request, workspace, editor, test_module, expected_lines, unexpected_lines) - - def test_C5689528_Terrain_MultipleTerrainComponents(self, request, workspace, editor, launcher_platform): - from .terrain import C5689528_Terrain_MultipleTerrainComponents as test_module - expected_lines = [] - unexpected_lines = ["Assert"] - self._run_test(request, workspace, editor, test_module, expected_lines, unexpected_lines) - - def test_C5689528_Terrain_MultipleTerrainComponents(self, request, workspace, editor, launcher_platform): - from .terrain import C5689528_Terrain_MultipleTerrainComponents as test_module - - expected_lines = [] - unexpected_lines = ["Assert"] - self._run_test(request, workspace, editor, test_module, expected_lines, unexpected_lines) - - def test_C6321601_Force_HighValuesDirectionAxes(self, request, workspace, editor, launcher_platform): - from .force_region import C6321601_Force_HighValuesDirectionAxes as test_module - - expected_lines = [] - unexpected_lines = ["Assert"] - self._run_test(request, workspace, editor, test_module, expected_lines, unexpected_lines) - - def test_C6032082_Terrain_MultipleResolutionsValid(self, request, workspace, editor, launcher_platform): - from .terrain import C6032082_Terrain_MultipleResolutionsValid as test_module - - expected_lines = [] - unexpected_lines = ["Assert"] - self._run_test(request, workspace, editor, test_module, expected_lines, unexpected_lines) - - def test_C12905527_ForceRegion_MagnitudeDeviation(self, request, workspace, editor, launcher_platform): - from .force_region import C12905527_ForceRegion_MagnitudeDeviation as test_module - - expected_lines = [] - unexpected_lines = ["Assert"] - self._run_test(request, workspace, editor, test_module, expected_lines, unexpected_lines) - - # Removed from active suite to meet 60 minutes limit in AR job - def test_C18243580_Joints_Fixed2BodiesConstrained(self, request, workspace, editor, launcher_platform): - from .joints import C18243580_Joints_Fixed2BodiesConstrained as test_module - - expected_lines = [] - unexpected_lines = ["Assert"] - self._run_test(request, workspace, editor, test_module, expected_lines, unexpected_lines) - - # Removed from active suite to meet 60 minutes limit in AR job - def test_C18243583_Joints_Hinge2BodiesConstrained(self, request, workspace, editor, launcher_platform): - from .joints import C18243583_Joints_Hinge2BodiesConstrained as test_module - - expected_lines = [] - unexpected_lines = ["Assert"] - self._run_test(request, workspace, editor, test_module, expected_lines, unexpected_lines) - - # Removed from active suite to meet 60 minutes limit in AR job - def test_C18243588_Joints_Ball2BodiesConstrained(self, request, workspace, editor, launcher_platform): - from .joints import C18243588_Joints_Ball2BodiesConstrained as test_module - - expected_lines = [] - unexpected_lines = ["Assert"] - self._run_test(request, workspace, editor, test_module, expected_lines, unexpected_lines) - - # Removed from active suite to meet 60 minutes limit in AR job - def test_C18243581_Joints_FixedBreakable(self, request, workspace, editor, launcher_platform): - from .joints import C18243581_Joints_FixedBreakable as test_module - - expected_lines = [] - unexpected_lines = ["Assert"] - self._run_test(request, workspace, editor, test_module, expected_lines, unexpected_lines) - - # Removed from active suite to meet 60 minutes limit in AR job - def test_C18243587_Joints_HingeBreakable(self, request, workspace, editor, launcher_platform): - from .joints import C18243587_Joints_HingeBreakable as test_module - - expected_lines = [] - unexpected_lines = ["Assert"] - self._run_test(request, workspace, editor, test_module, expected_lines, unexpected_lines) - - # Removed from active suite to meet 60 minutes limit in AR job - def test_C18243592_Joints_BallBreakable(self, request, workspace, editor, launcher_platform): - from .joints import C18243592_Joints_BallBreakable as test_module - - expected_lines = [] - unexpected_lines = ["Assert"] - self._run_test(request, workspace, editor, test_module, expected_lines, unexpected_lines) - - # Removed from active suite to meet 60 minutes limit in AR job - def test_C18243585_Joints_HingeNoLimitsConstrained(self, request, workspace, editor, launcher_platform): - from .joints import C18243585_Joints_HingeNoLimitsConstrained as test_module - - expected_lines = [] - unexpected_lines = ["Assert"] - self._run_test(request, workspace, editor, test_module, expected_lines, unexpected_lines) - - # Removed from active suite to meet 60 minutes limit in AR job - def test_C18243590_Joints_BallNoLimitsConstrained(self, request, workspace, editor, launcher_platform): - from .joints import C18243590_Joints_BallNoLimitsConstrained as test_module - - expected_lines = [] - unexpected_lines = ["Assert"] - self._run_test(request, workspace, editor, test_module, expected_lines, unexpected_lines) - - # Removed from active suite to meet 60 minutes limit in AR job - def test_C18243582_Joints_FixedLeadFollowerCollide(self, request, workspace, editor, launcher_platform): - from .joints import C18243582_Joints_FixedLeadFollowerCollide as test_module - - expected_lines = [] - unexpected_lines = ["Assert"] - self._run_test(request, workspace, editor, test_module, expected_lines, unexpected_lines) - - # Removed from active suite to meet 60 minutes limit in AR job - def test_C18243593_Joints_GlobalFrameConstrained(self, request, workspace, editor, launcher_platform): - from .joints import C18243593_Joints_GlobalFrameConstrained as test_module - - expected_lines = [] - unexpected_lines = ["Assert"] - self._run_test(request, workspace, editor, test_module, expected_lines, unexpected_lines) + def test_ForceRegion_SmallMagnitudeDeviationOnLargeForces(self, request, workspace, editor, launcher_platform): + from .tests.force_region import ForceRegion_SmallMagnitudeDeviationOnLargeForces as test_module + self._run_test(request, workspace, editor, test_module) diff --git a/AutomatedTesting/Gem/PythonTests/physics/TestSuite_Main.py b/AutomatedTesting/Gem/PythonTests/physics/TestSuite_Main.py index c3f41b158f..b64fbb5656 100644 --- a/AutomatedTesting/Gem/PythonTests/physics/TestSuite_Main.py +++ b/AutomatedTesting/Gem/PythonTests/physics/TestSuite_Main.py @@ -28,64 +28,67 @@ revert_physics_config = fm.file_revert_list(['physxdebugconfiguration.setreg', ' @pytest.mark.parametrize("project", ["AutomatedTesting"]) class TestAutomation(TestAutomationBase): - def test_C111111_RigidBody_EnablingGravityWorksUsingNotificationsPoC(self, request, workspace, editor, launcher_platform): - from .collider import C111111_RigidBody_EnablingGravityWorksUsingNotificationsPoC as test_module + def test_RigidBody_EnablingGravityWorksUsingNotificationsPoC(self, request, workspace, editor, launcher_platform): + from .tests.rigid_body import RigidBody_EnablingGravityWorksUsingNotificationsPoC as test_module self._run_test(request, workspace, editor, test_module) @revert_physics_config - def test_C5932041_PhysXForceRegion_LocalSpaceForceOnRigidBodies(self, request, workspace, editor, launcher_platform): - from .force_region import C5932041_PhysXForceRegion_LocalSpaceForceOnRigidBodies as test_module + def test_ForceRegion_LocalSpaceForceOnRigidBodies(self, request, workspace, editor, launcher_platform): + from .tests.force_region import ForceRegion_LocalSpaceForceOnRigidBodies as test_module self._run_test(request, workspace, editor, test_module) @revert_physics_config - @fm.file_override('physxsystemconfiguration.setreg','C4044459_Material_DynamicFriction.setreg_override', 'AutomatedTesting/Registry') - def test_C4044459_Material_DynamicFriction(self, request, workspace, editor, launcher_platform): - from .material import C4044459_Material_DynamicFriction as test_module + @fm.file_override('physxsystemconfiguration.setreg','Material_DynamicFriction.setreg_override', + 'AutomatedTesting/Registry', search_subdirs=True) + def test_Material_DynamicFriction(self, request, workspace, editor, launcher_platform): + from .tests.material import Material_DynamicFriction as test_module self._run_test(request, workspace, editor, test_module) @revert_physics_config - def test_C4976243_Collision_SameCollisionGroupDiffCollisionLayers(self, request, workspace, editor, - launcher_platform): - from .collider import C4976243_Collision_SameCollisionGroupDiffCollisionLayers as test_module + def test_Collider_SameCollisionGroupDiffLayersCollide(self, request, workspace, editor, launcher_platform): + from .tests.collider import Collider_SameCollisionGroupDiffLayersCollide as test_module self._run_test(request, workspace, editor, test_module) @revert_physics_config - def test_C14654881_CharacterController_SwitchLevels(self, request, workspace, editor, launcher_platform): - from .character_controller import C14654881_CharacterController_SwitchLevels as test_module + def test_CharacterController_SwitchLevels(self, request, workspace, editor, launcher_platform): + from .tests.character_controller import CharacterController_SwitchLevels as test_module self._run_test(request, workspace, editor, test_module) - def test_C17411467_AddPhysxRagdollComponent(self, request, workspace, editor, launcher_platform): - from .ragdoll import C17411467_AddPhysxRagdollComponent as test_module + def test_Ragdoll_AddPhysxRagdollComponentWorks(self, request, workspace, editor, launcher_platform): + from .tests.ragdoll import Ragdoll_AddPhysxRagdollComponentWorks as test_module self._run_test(request, workspace, editor, test_module) @revert_physics_config - def test_C12712453_ScriptCanvas_MultipleRaycastNode(self, request, workspace, editor, launcher_platform): - from .script_canvas import C12712453_ScriptCanvas_MultipleRaycastNode as test_module - # Fixme: unexpected_lines = ["Assert"] + test_module.Lines.unexpected + def test_ScriptCanvas_MultipleRaycastNode(self, request, workspace, editor, launcher_platform): + from .tests.script_canvas import ScriptCanvas_MultipleRaycastNode as test_module + # Fixme: This test previously relied on unexpected lines log reading with is now not supported. + # Now the log reading must be done inside the test, preferably with the Tracer() utility + # unexpected_lines = ["Assert"] + test_module.Lines.unexpected self._run_test(request, workspace, editor, test_module) @revert_physics_config - @fm.file_override('physxsystemconfiguration.setreg','C4982593_PhysXCollider_CollisionLayer.setreg_override', 'AutomatedTesting/Registry') - def test_C4982593_PhysXCollider_CollisionLayerTest(self, request, workspace, editor, launcher_platform): - from .collider import C4982593_PhysXCollider_CollisionLayerTest as test_module + @fm.file_override('physxsystemconfiguration.setreg','Collider_DiffCollisionGroupDiffCollidingLayersNotCollide.setreg_override', + 'AutomatedTesting/Registry', search_subdirs=True) + def test_Collider_DiffCollisionGroupDiffCollidingLayersNotCollide(self, request, workspace, editor, launcher_platform): + from .tests.collider import Collider_DiffCollisionGroupDiffCollidingLayersNotCollide as test_module self._run_test(request, workspace, editor, test_module) @revert_physics_config - def test_C18243586_Joints_HingeLeadFollowerCollide(self, request, workspace, editor, launcher_platform): - from .joints import C18243586_Joints_HingeLeadFollowerCollide as test_module + def test_Joints_HingeLeadFollowerCollide(self, request, workspace, editor, launcher_platform): + from .tests.joints import Joints_HingeLeadFollowerCollide as test_module self._run_test(request, workspace, editor, test_module) @revert_physics_config - def test_C4982803_Enable_PxMesh_Option(self, request, workspace, editor, launcher_platform): - from .collider import C4982803_Enable_PxMesh_Option as test_module + def test_Collider_PxMeshConvexMeshCollides(self, request, workspace, editor, launcher_platform): + from .tests.collider import Collider_PxMeshConvexMeshCollides as test_module self._run_test(request, workspace, editor, test_module) @revert_physics_config - def test_C24308873_CylinderShapeCollider_CollidesWithPhysXTerrain(self, request, workspace, editor, launcher_platform): - from .collider import C24308873_CylinderShapeCollider_CollidesWithPhysXTerrain as test_module + def test_ShapeCollider_CylinderShapeCollides(self, request, workspace, editor, launcher_platform): + from .tests.shape_collider import ShapeCollider_CylinderShapeCollides as test_module self._run_test(request, workspace, editor, test_module) @revert_physics_config def test_C15425929_Undo_Redo(self, request, workspace, editor, launcher_platform): - from .general import C15425929_Undo_Redo as test_module + from .tests import Physics_UndoRedoWorksOnEntityWithPhysComponents as test_module self._run_test(request, workspace, editor, test_module) \ No newline at end of file diff --git a/AutomatedTesting/Gem/PythonTests/physics/TestSuite_Main_Optimized.py b/AutomatedTesting/Gem/PythonTests/physics/TestSuite_Main_Optimized.py index ce68bb10b5..63d3b58249 100644 --- a/AutomatedTesting/Gem/PythonTests/physics/TestSuite_Main_Optimized.py +++ b/AutomatedTesting/Gem/PythonTests/physics/TestSuite_Main_Optimized.py @@ -21,7 +21,7 @@ class EditorSingleTest_WithFileOverrides(EditorSingleTest): # Base directory of the files (Default path is {ProjectName}) base_dir = None # True will will search sub-directories for the files in base - search_subdirs = False + search_subdirs = True @classmethod def wrap_run(cls, instance, request, workspace, editor, editor_test_results, launcher_platform): @@ -47,13 +47,14 @@ class EditorSingleTest_WithFileOverrides(EditorSingleTest): fm._backup_file(f, file_list[f]) for original, override in cls.files_to_override: - fm._copy_file(override, file_list[override], original, file_list[override]) + fm._copy_file(override, file_list[override], original, file_list[original]) yield # Run Test for f in original_file_list: fm._restore_file(f, file_list[f]) +@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"]) @@ -66,283 +67,280 @@ class TestAutomation(EditorTestSuite): ######################################### # Non-atomic tests: These need to be run in a single editor because they have custom setup and teardown class C4044459_Material_DynamicFriction(EditorSingleTest_WithFileOverrides): - from .material import C4044459_Material_DynamicFriction as test_module + from .tests.material import Material_DynamicFriction as test_module files_to_override = [ - ('physxsystemconfiguration.setreg', 'C4044459_Material_DynamicFriction.setreg_override') + ('physxsystemconfiguration.setreg', 'Material_DynamicFriction.setreg_override') ] base_dir = "AutomatedTesting/Registry" class C4982593_PhysXCollider_CollisionLayerTest(EditorSingleTest_WithFileOverrides): - from .collider import C4982593_PhysXCollider_CollisionLayerTest as test_module + from .tests.collider import Collider_DiffCollisionGroupDiffCollidingLayersNotCollide as test_module files_to_override = [ - ('physxsystemconfiguration.setreg', 'C4982593_PhysXCollider_CollisionLayer.setreg_override') + ('physxsystemconfiguration.setreg', 'Collider_DiffCollisionGroupDiffCollidingLayersNotCollide.setreg_override') ] base_dir = "AutomatedTesting/Registry" ######################################### class C111111_RigidBody_EnablingGravityWorksUsingNotificationsPoC(EditorSharedTest): - from .collider import C111111_RigidBody_EnablingGravityWorksUsingNotificationsPoC as test_module + from .tests.rigid_body import RigidBody_EnablingGravityWorksUsingNotificationsPoC as test_module class C5932041_PhysXForceRegion_LocalSpaceForceOnRigidBodies(EditorSharedTest): - from .force_region import C5932041_PhysXForceRegion_LocalSpaceForceOnRigidBodies as test_module + from .tests.force_region import ForceRegion_LocalSpaceForceOnRigidBodies as test_module class C15425929_Undo_Redo(EditorSharedTest): - from .general import C15425929_Undo_Redo as test_module + from .tests import Physics_UndoRedoWorksOnEntityWithPhysComponents as test_module class C4976243_Collision_SameCollisionGroupDiffCollisionLayers(EditorSharedTest): - from .collider import C4976243_Collision_SameCollisionGroupDiffCollisionLayers as test_module + from .tests.collider import Collider_SameCollisionGroupDiffLayersCollide as test_module class C14654881_CharacterController_SwitchLevels(EditorSharedTest): - from .character_controller import C14654881_CharacterController_SwitchLevels as test_module + from .tests.character_controller import CharacterController_SwitchLevels as test_module class C17411467_AddPhysxRagdollComponent(EditorSharedTest): - from .ragdoll import C17411467_AddPhysxRagdollComponent as test_module + from .tests.ragdoll import Ragdoll_AddPhysxRagdollComponentWorks as test_module class C12712453_ScriptCanvas_MultipleRaycastNode(EditorSharedTest): - from .script_canvas import C12712453_ScriptCanvas_MultipleRaycastNode as test_module + from .tests.script_canvas import ScriptCanvas_MultipleRaycastNode as test_module class C18243586_Joints_HingeLeadFollowerCollide(EditorSharedTest): - from .joints import C18243586_Joints_HingeLeadFollowerCollide as test_module + from .tests.joints import Joints_HingeLeadFollowerCollide as test_module class C4982803_Enable_PxMesh_Option(EditorSharedTest): - from .collider import C4982803_Enable_PxMesh_Option as test_module + from .tests.collider import Collider_PxMeshConvexMeshCollides as test_module class C24308873_CylinderShapeCollider_CollidesWithPhysXTerrain(EditorSharedTest): - from .collider import C24308873_CylinderShapeCollider_CollidesWithPhysXTerrain as test_module + from .tests.shape_collider import ShapeCollider_CylinderShapeCollides as test_module class C3510642_Terrain_NotCollideWithTerrain(EditorSharedTest): - from .terrain import C3510642_Terrain_NotCollideWithTerrain as test_module + from .tests.terrain import Terrain_NoPhysTerrainComponentNoCollision as test_module class C4976195_RigidBodies_InitialLinearVelocity(EditorSharedTest): - from .rigid_body import C4976195_RigidBodies_InitialLinearVelocity as test_module + from .tests.rigid_body import RigidBody_InitialLinearVelocity as test_module class C4976206_RigidBodies_GravityEnabledActive(EditorSharedTest): - from .rigid_body import C4976206_RigidBodies_GravityEnabledActive as test_module + from .tests.rigid_body import RigidBody_StartGravityEnabledWorks as test_module class C4976207_PhysXRigidBodies_KinematicBehavior(EditorSharedTest): - from .rigid_body import C4976207_PhysXRigidBodies_KinematicBehavior as test_module + from .tests.rigid_body import RigidBody_KinematicModeWorks as test_module class C5932042_PhysXForceRegion_LinearDamping(EditorSharedTest): - from .force_region import C5932042_PhysXForceRegion_LinearDamping as test_module + from .tests.force_region import ForceRegion_LinearDampingForceOnRigidBodies as test_module class C5932043_ForceRegion_SimpleDragOnRigidBodies(EditorSharedTest): - from .force_region import C5932043_ForceRegion_SimpleDragOnRigidBodies as test_module + from .tests.force_region import ForceRegion_SimpleDragForceOnRigidBodies as test_module class C5959760_PhysXForceRegion_PointForceExertion(EditorSharedTest): - from .force_region import C5959760_PhysXForceRegion_PointForceExertion as test_module + from .tests.force_region import ForceRegion_CapsuleShapedForce as test_module class C5959764_ForceRegion_ForceRegionImpulsesCapsule(EditorSharedTest): - from .force_region import C5959764_ForceRegion_ForceRegionImpulsesCapsule as test_module + from .tests.force_region import ForceRegion_ImpulsesCapsuleShapedRigidBody as test_module class C5340400_RigidBody_ManualMomentOfInertia(EditorSharedTest): - from .rigid_body import C5340400_RigidBody_ManualMomentOfInertia as test_module + from .tests.rigid_body import RigidBody_MomentOfInertiaManualSetting as test_module class C4976210_COM_ManualSetting(EditorSharedTest): - from .rigid_body import C4976210_COM_ManualSetting as test_module + from .tests.rigid_body import RigidBody_COM_ManualSettingWorks as test_module class C4976194_RigidBody_PhysXComponentIsValid(EditorSharedTest): - from .rigid_body import C4976194_RigidBody_PhysXComponentIsValid as test_module + from .tests.rigid_body import RigidBody_AddRigidBodyComponent as test_module class C5932045_ForceRegion_Spline(EditorSharedTest): - from .force_region import C5932045_ForceRegion_Spline as test_module + from .tests.force_region import ForceRegion_SplineForceOnRigidBodies as test_module class C4982797_Collider_ColliderOffset(EditorSharedTest): - from .collider import C4982797_Collider_ColliderOffset as test_module + from .tests.collider import Collider_ColliderPositionOffset as test_module class C4976200_RigidBody_AngularDampingObjectRotation(EditorSharedTest): - from .rigid_body import C4976200_RigidBody_AngularDampingObjectRotation as test_module + from .tests.rigid_body import RigidBody_AngularDampingAffectsRotation as test_module class C5689529_Verify_Terrain_RigidBody_Collider_Mesh(EditorSharedTest): - from .general import C5689529_Verify_Terrain_RigidBody_Collider_Mesh as test_module + from .tests import Physics_VerifyColliderRigidBodyMeshAndTerrainWorkTogether as test_module class C5959810_ForceRegion_ForceRegionCombinesForces(EditorSharedTest): - from .force_region import C5959810_ForceRegion_ForceRegionCombinesForces as test_module + from .tests.force_region import ForceRegion_MultipleForcesInSameComponentCombineForces as test_module class C5959765_ForceRegion_AssetGetsImpulsed(EditorSharedTest): - from .force_region import C5959765_ForceRegion_AssetGetsImpulsed as test_module + from .tests.force_region import ForceRegion_ImpulsesPxMeshShapedRigidBody as test_module class C6274125_ScriptCanvas_TriggerEvents(EditorSharedTest): - from .script_canvas import C6274125_ScriptCanvas_TriggerEvents as test_module + from .tests.script_canvas import ScriptCanvas_TriggerEvents as test_module # needs to be updated to log for unexpected lines # expected_lines = test_module.LogLines.expected_lines class C6090554_ForceRegion_PointForceNegative(EditorSharedTest): - from .force_region import C6090554_ForceRegion_PointForceNegative as test_module + from .tests.force_region import ForceRegion_ZeroPointForceDoesNothing as test_module class C6090550_ForceRegion_WorldSpaceForceNegative(EditorSharedTest): - from .force_region import C6090550_ForceRegion_WorldSpaceForceNegative as test_module + from .tests.force_region import ForceRegion_ZeroWorldSpaceForceDoesNothing as test_module class C6090552_ForceRegion_LinearDampingNegative(EditorSharedTest): - from .force_region import C6090552_ForceRegion_LinearDampingNegative as test_module + from .tests.force_region import ForceRegion_ZeroLinearDampingDoesNothing as test_module class C5968760_ForceRegion_CheckNetForceChange(EditorSharedTest): - from .force_region import C5968760_ForceRegion_CheckNetForceChange as test_module + from .tests.force_region import ForceRegion_MovingForceRegionChangesNetForce as test_module + @pytest.mark.xfail(reason="Ongoing issue in Script Canvas, AZ::Event fail to compile on Script Canvas") class C12712452_ScriptCanvas_CollisionEvents(EditorSharedTest): - from .script_canvas import C12712452_ScriptCanvas_CollisionEvents as test_module + from .tests.script_canvas import ScriptCanvas_CollisionEvents as test_module class C12868578_ForceRegion_DirectionHasNoAffectOnMagnitude(EditorSharedTest): - from .force_region import C12868578_ForceRegion_DirectionHasNoAffectOnMagnitude as test_module + from .tests.force_region import ForceRegion_DirectionHasNoAffectOnTotalForce as test_module class C4976204_Verify_Start_Asleep_Condition(EditorSharedTest): - from .rigid_body import C4976204_Verify_Start_Asleep_Condition as test_module + from .tests.rigid_body import RigidBody_StartAsleepWorks as test_module class C6090546_ForceRegion_SliceFileInstantiates(EditorSharedTest): - from .force_region import C6090546_ForceRegion_SliceFileInstantiates as test_module + from .tests.force_region import ForceRegion_SliceFileInstantiates as test_module class C6090551_ForceRegion_LocalSpaceForceNegative(EditorSharedTest): - from .force_region import C6090551_ForceRegion_LocalSpaceForceNegative as test_module + from .tests.force_region import ForceRegion_ZeroLocalSpaceForceDoesNothing as test_module class C6090553_ForceRegion_SimpleDragForceOnRigidBodies(EditorSharedTest): - from .force_region import C6090553_ForceRegion_SimpleDragForceOnRigidBodies as test_module + from .tests.force_region import ForceRegion_ZeroSimpleDragForceDoesNothing as test_module class C4976209_RigidBody_ComputesCOM(EditorSharedTest): - from .rigid_body import C4976209_RigidBody_ComputesCOM as test_module + from .tests.rigid_body import RigidBody_COM_ComputingWorks as test_module class C4976201_RigidBody_MassIsAssigned(EditorSharedTest): - from .rigid_body import C4976201_RigidBody_MassIsAssigned as test_module + from .tests.rigid_body import RigidBody_MassDifferentValuesWorks as test_module class C12868580_ForceRegion_SplineModifiedTransform(EditorSharedTest): - from .force_region import C12868580_ForceRegion_SplineModifiedTransform as test_module + from .tests.force_region import ForceRegion_SplineRegionWithModifiedTransform as test_module class C12712455_ScriptCanvas_ShapeCastVerification(EditorSharedTest): - from .script_canvas import C12712455_ScriptCanvas_ShapeCastVerification as test_module + from .tests.script_canvas import ScriptCanvas_ShapeCast as test_module class C4976197_RigidBodies_InitialAngularVelocity(EditorSharedTest): - from .rigid_body import C4976197_RigidBodies_InitialAngularVelocity as test_module + from .tests.rigid_body import RigidBody_InitialAngularVelocity as test_module class C6090555_ForceRegion_SplineFollowOnRigidBodies(EditorSharedTest): - from .force_region import C6090555_ForceRegion_SplineFollowOnRigidBodies as test_module + from .tests.force_region import ForceRegion_ZeroSplineForceDoesNothing as test_module class C6131473_StaticSlice_OnDynamicSliceSpawn(EditorSharedTest): - from .general import C6131473_StaticSlice_OnDynamicSliceSpawn as test_module + from .tests import Physics_DynamicSliceWithPhysNotSpawnsStaticSlice as test_module class C5959808_ForceRegion_PositionOffset(EditorSharedTest): - from .force_region import C5959808_ForceRegion_PositionOffset as test_module + from .tests.force_region import ForceRegion_PositionOffset as test_module @pytest.mark.xfail(reason="Something with the CryRenderer disabling is causing this test to fail now.") class C13895144_Ragdoll_ChangeLevel(EditorSharedTest): - from .ragdoll import C13895144_Ragdoll_ChangeLevel as test_module + from .tests.ragdoll import Ragdoll_LevelSwitchDoesNotCrash as test_module class C5968759_ForceRegion_ExertsSeveralForcesOnRigidBody(EditorSharedTest): - from .force_region import C5968759_ForceRegion_ExertsSeveralForcesOnRigidBody as test_module + from .tests.force_region import ForceRegion_MultipleComponentsCombineForces as test_module @pytest.mark.xfail(reason="This test will sometimes fail as the ball will continue to roll before the timeout is reached.") class C4976202_RigidBody_StopsWhenBelowKineticThreshold(EditorSharedTest): - from .rigid_body import C4976202_RigidBody_StopsWhenBelowKineticThreshold as test_module + from .tests.rigid_body import RigidBody_SleepWhenBelowKineticThreshold as test_module class C13351703_COM_NotIncludeTriggerShapes(EditorSharedTest): - from .rigid_body import C13351703_COM_NotIncludeTriggerShapes as test_module + from .tests.rigid_body import RigidBody_COM_NotIncludesTriggerShapes as test_module class C5296614_PhysXMaterial_ColliderShape(EditorSharedTest): - from .material import C5296614_PhysXMaterial_ColliderShape as test_module + from .tests.material import Material_NoEffectIfNoColliderShape as test_module class C4982595_Collider_TriggerDisablesCollision(EditorSharedTest): - from .collider import C4982595_Collider_TriggerDisablesCollision as test_module + from .tests.collider import Collider_TriggerPassThrough as test_module class C14976307_Gravity_SetGravityWorks(EditorSharedTest): - from .general import C14976307_Gravity_SetGravityWorks as test_module + from .tests.rigid_body import RigidBody_SetGravityWorks as test_module class C4044694_Material_EmptyLibraryUsesDefault(EditorSharedTest): - from .material import C4044694_Material_EmptyLibraryUsesDefault as test_module + from .tests.material import Material_EmptyLibraryUsesDefault as test_module class C15845879_ForceRegion_HighLinearDampingForce(EditorSharedTest): - from .force_region import C15845879_ForceRegion_HighLinearDampingForce as test_module + from .tests.force_region import ForceRegion_NoQuiverOnHighLinearDampingForce as test_module class C4976218_RigidBodies_InertiaObjectsNotComputed(EditorSharedTest): - from .rigid_body import C4976218_RigidBodies_InertiaObjectsNotComputed as test_module + from .tests.rigid_body import RigidBody_ComputeInertiaWorks as test_module class C14902098_ScriptCanvas_PostPhysicsUpdate(EditorSharedTest): - from .script_canvas import C14902098_ScriptCanvas_PostPhysicsUpdate as test_module + from .tests.script_canvas import ScriptCanvas_PostPhysicsUpdate as test_module # Note: Test needs to be updated to log for unexpected lines # unexpected_lines = ["Assert"] + test_module.Lines.unexpected class C5959761_ForceRegion_PhysAssetExertsPointForce(EditorSharedTest): - from .force_region import C5959761_ForceRegion_PhysAssetExertsPointForce as test_module + from .tests.force_region import ForceRegion_PxMeshShapedForce as test_module # Marking the Test as expected to fail using the xfail decorator due to sporadic failure on Automated Review: SPEC-3146 # The test still runs, but a failure of the test doesn't result in the test run failing @pytest.mark.xfail(reason="Test Sporadically fails with message [ NOT FOUND ] Success: Bar1 : Expected angular velocity") class C13352089_RigidBodies_MaxAngularVelocity(EditorSharedTest): - from .rigid_body import C13352089_RigidBodies_MaxAngularVelocity as test_module + from .tests.rigid_body import RigidBody_MaxAngularVelocityWorks as test_module class C18243584_Joints_HingeSoftLimitsConstrained(EditorSharedTest): - from .joints import C18243584_Joints_HingeSoftLimitsConstrained as test_module + from .tests.joints import Joints_HingeSoftLimitsConstrained as test_module class C18243589_Joints_BallSoftLimitsConstrained(EditorSharedTest): - from .joints import C18243589_Joints_BallSoftLimitsConstrained as test_module + from .tests.joints import Joints_BallSoftLimitsConstrained as test_module class C18243591_Joints_BallLeadFollowerCollide(EditorSharedTest): - from .joints import C18243591_Joints_BallLeadFollowerCollide as test_module + from .tests.joints import Joints_BallLeadFollowerCollide as test_module class C19578018_ShapeColliderWithNoShapeComponent(EditorSharedTest): - from .collider import C19578018_ShapeColliderWithNoShapeComponent as test_module + from .tests.shape_collider import ShapeCollider_InactiveWhenNoShapeComponent as test_module class C14861500_DefaultSetting_ColliderShape(EditorSharedTest): - from .collider import C14861500_DefaultSetting_ColliderShape as test_module + from .tests.collider import Collider_CheckDefaultShapeSettingIsPxMesh as test_module class C19723164_ShapeCollider_WontCrashEditor(EditorSharedTest): - from .collider import C19723164_ShapeColliders_WontCrashEditor as test_module + from .tests.shape_collider import ShapeCollider_LargeNumberOfShapeCollidersWontCrashEditor as test_module class C4982800_PhysXColliderShape_CanBeSelected(EditorSharedTest): - from .collider import C4982800_PhysXColliderShape_CanBeSelected as test_module + from .tests.collider import Collider_SphereShapeEditting as test_module class C4982801_PhysXColliderShape_CanBeSelected(EditorSharedTest): - from .collider import C4982801_PhysXColliderShape_CanBeSelected as test_module + from .tests.collider import Collider_BoxShapeEditting as test_module class C4982802_PhysXColliderShape_CanBeSelected(EditorSharedTest): - from .collider import C4982802_PhysXColliderShape_CanBeSelected as test_module + from .tests.collider import Collider_CapsuleShapeEditting as test_module class C12905528_ForceRegion_WithNonTriggerCollider(EditorSharedTest): - from .force_region import C12905528_ForceRegion_WithNonTriggerCollider as test_module + from .tests.force_region import ForceRegion_WithNonTriggerColliderWarning as test_module # Fixme: expected_lines = ["[Warning] (PhysX Force Region) - Please ensure collider component marked as trigger exists in entity"] class C5932040_ForceRegion_CubeExertsWorldForce(EditorSharedTest): - from .force_region import C5932040_ForceRegion_CubeExertsWorldForce as test_module + from .tests.force_region import ForceRegion_WorldSpaceForceOnRigidBodies as test_module class C5932044_ForceRegion_PointForceOnRigidBody(EditorSharedTest): - from .force_region import C5932044_ForceRegion_PointForceOnRigidBody as test_module + from .tests.force_region import ForceRegion_PointForceOnRigidBodies as test_module class C5959759_RigidBody_ForceRegionSpherePointForce(EditorSharedTest): - from .force_region import C5959759_RigidBody_ForceRegionSpherePointForce as test_module + from .tests.force_region import ForceRegion_SphereShapedForce as test_module class C5959809_ForceRegion_RotationalOffset(EditorSharedTest): - from .force_region import C5959809_ForceRegion_RotationalOffset as test_module + from .tests.force_region import ForceRegion_RotationalOffset as test_module class C15096740_Material_LibraryUpdatedCorrectly(EditorSharedTest): - from .material import C15096740_Material_LibraryUpdatedCorrectly as test_module + from .tests.material import Material_LibraryClearingAssignsDefault as test_module class C4976236_AddPhysxColliderComponent(EditorSharedTest): - from .collider import C4976236_AddPhysxColliderComponent as test_module - + from .tests.collider import Collider_AddColliderComponent as test_module @pytest.mark.xfail(reason="This will fail due to this issue ATOM-15487.") class C14861502_PhysXCollider_AssetAutoAssigned(EditorSharedTest): - from .collider import C14861502_PhysXCollider_AssetAutoAssigned as test_module + from .tests.collider import Collider_PxMeshAutoAssignedWhenModifyingRenderMeshComponent as test_module class C14861501_PhysXCollider_RenderMeshAutoAssigned(EditorSharedTest): - from .collider import C14861501_PhysXCollider_RenderMeshAutoAssigned as test_module + from .tests.collider import Collider_PxMeshAutoAssignedWhenAddingRenderMeshComponent as test_module class C4044695_PhysXCollider_AddMultipleSurfaceFbx(EditorSharedTest): - from .collider import C4044695_PhysXCollider_AddMultipleSurfaceFbx as test_module + from .tests.collider import Collider_MultipleSurfaceSlots as test_module class C14861504_RenderMeshAsset_WithNoPxAsset(EditorSharedTest): - from .collider import C14861504_RenderMeshAsset_WithNoPxAsset as test_module + from .tests.collider import Collider_PxMeshNotAutoAssignedWhenNoPhysicsFbx as test_module class C100000_RigidBody_EnablingGravityWorksPoC(EditorSharedTest): - from .collider import C100000_RigidBody_EnablingGravityWorksPoC as test_module + from .tests.rigid_body import RigidBody_EnablingGravityWorksPoC as test_module class C4982798_Collider_ColliderRotationOffset(EditorSharedTest): - from .collider import C4982798_Collider_ColliderRotationOffset as test_module - - class C15308217_NoCrash_LevelSwitch(EditorSharedTest): - from .terrain import C15308217_NoCrash_LevelSwitch as test_module + from .tests.collider import Collider_ColliderRotationOffset as test_module class C6090547_ForceRegion_ParentChildForceRegions(EditorSharedTest): - from .force_region import C6090547_ForceRegion_ParentChildForceRegions as test_module + from .tests.force_region import ForceRegion_ParentChildForcesCombineForces as test_module class C19578021_ShapeCollider_CanBeAdded(EditorSharedTest): - from .collider import C19578021_ShapeCollider_CanBeAdded as test_module + from .tests.shape_collider import ShapeCollider_CanBeAddedWitNoWarnings as test_module class C15425929_Undo_Redo(EditorSharedTest): - from .general import C15425929_Undo_Redo as test_module + from .tests import Physics_UndoRedoWorksOnEntityWithPhysComponents as test_module diff --git a/AutomatedTesting/Gem/PythonTests/physics/TestSuite_Periodic.py b/AutomatedTesting/Gem/PythonTests/physics/TestSuite_Periodic.py index fca7e0e3af..da89316993 100755 --- a/AutomatedTesting/Gem/PythonTests/physics/TestSuite_Periodic.py +++ b/AutomatedTesting/Gem/PythonTests/physics/TestSuite_Periodic.py @@ -29,220 +29,224 @@ revert_physics_config = fm.file_revert_list(['physxdebugconfiguration.setreg', ' class TestAutomation(TestAutomationBase): @revert_physics_config - def test_C3510642_Terrain_NotCollideWithTerrain(self, request, workspace, editor, launcher_platform): - from .terrain import C3510642_Terrain_NotCollideWithTerrain as test_module + def test_Terrain_NoPhysTerrainComponentNoCollision(self, request, workspace, editor, launcher_platform): + from .tests.terrain import Terrain_NoPhysTerrainComponentNoCollision as test_module self._run_test(request, workspace, editor, test_module) @revert_physics_config - def test_C4976195_RigidBodies_InitialLinearVelocity(self, request, workspace, editor, launcher_platform): - from .rigid_body import C4976195_RigidBodies_InitialLinearVelocity as test_module + def test_RigidBody_InitialLinearVelocity(self, request, workspace, editor, launcher_platform): + from .tests.rigid_body import RigidBody_InitialLinearVelocity as test_module self._run_test(request, workspace, editor, test_module) @revert_physics_config - def test_C4976206_RigidBodies_GravityEnabledActive(self, request, workspace, editor, launcher_platform): - from .rigid_body import C4976206_RigidBodies_GravityEnabledActive as test_module + def test_RigidBody_StartGravityEnabledWorks(self, request, workspace, editor, launcher_platform): + from .tests.rigid_body import RigidBody_StartGravityEnabledWorks as test_module self._run_test(request, workspace, editor, test_module) @revert_physics_config - def test_C4976207_PhysXRigidBodies_KinematicBehavior(self, request, workspace, editor, launcher_platform): - from .rigid_body import C4976207_PhysXRigidBodies_KinematicBehavior as test_module + def test_RigidBody_KinematicModeWorks(self, request, workspace, editor, launcher_platform): + from .tests.rigid_body import RigidBody_KinematicModeWorks as test_module self._run_test(request, workspace, editor, test_module) @revert_physics_config - def test_C5932042_PhysXForceRegion_LinearDamping(self, request, workspace, editor, launcher_platform): - from .force_region import C5932042_PhysXForceRegion_LinearDamping as test_module + def test_ForceRegion_LinearDampingForceOnRigidBodies(self, request, workspace, editor, launcher_platform): + from .tests.force_region import ForceRegion_LinearDampingForceOnRigidBodies as test_module self._run_test(request, workspace, editor, test_module) @revert_physics_config - def test_C5932043_ForceRegion_SimpleDragOnRigidBodies(self, request, workspace, editor, launcher_platform): - from .force_region import C5932043_ForceRegion_SimpleDragOnRigidBodies as test_module + def test_ForceRegion_SimpleDragForceOnRigidBodies(self, request, workspace, editor, launcher_platform): + from .tests.force_region import ForceRegion_SimpleDragForceOnRigidBodies as test_module self._run_test(request, workspace, editor, test_module) @revert_physics_config - def test_C5959760_PhysXForceRegion_PointForceExertion(self, request, workspace, editor, launcher_platform): - from .force_region import C5959760_PhysXForceRegion_PointForceExertion as test_module + def test_ForceRegion_CapsuleShapedForce(self, request, workspace, editor, launcher_platform): + from .tests.force_region import ForceRegion_CapsuleShapedForce as test_module self._run_test(request, workspace, editor, test_module) @revert_physics_config - def test_C5959764_ForceRegion_ForceRegionImpulsesCapsule(self, request, workspace, editor, launcher_platform): - from .force_region import C5959764_ForceRegion_ForceRegionImpulsesCapsule as test_module + def test_ForceRegion_ImpulsesCapsuleShapedRigidBody(self, request, workspace, editor, launcher_platform): + from .tests.force_region import ForceRegion_ImpulsesCapsuleShapedRigidBody as test_module self._run_test(request, workspace, editor, test_module) @revert_physics_config - def test_C5340400_RigidBody_ManualMomentOfInertia(self, request, workspace, editor, launcher_platform): - from .rigid_body import C5340400_RigidBody_ManualMomentOfInertia as test_module + def test_RigidBody_MomentOfInertiaManualSetting(self, request, workspace, editor, launcher_platform): + from .tests.rigid_body import RigidBody_MomentOfInertiaManualSetting as test_module self._run_test(request, workspace, editor, test_module) @revert_physics_config - def test_C4976210_COM_ManualSetting(self, request, workspace, editor, launcher_platform): - from .rigid_body import C4976210_COM_ManualSetting as test_module + def test_RigidBody_COM_ManualSettingWorks(self, request, workspace, editor, launcher_platform): + from .tests.rigid_body import RigidBody_COM_ManualSettingWorks as test_module self._run_test(request, workspace, editor, test_module) @revert_physics_config - def test_C4976194_RigidBody_PhysXComponentIsValid(self, request, workspace, editor, launcher_platform): - from .rigid_body import C4976194_RigidBody_PhysXComponentIsValid as test_module + def test_RigidBody_AddRigidBodyComponent(self, request, workspace, editor, launcher_platform): + from .tests.rigid_body import RigidBody_AddRigidBodyComponent as test_module self._run_test(request, workspace, editor, test_module) @revert_physics_config - def test_C5932045_ForceRegion_Spline(self, request, workspace, editor, launcher_platform): - from .force_region import C5932045_ForceRegion_Spline as test_module + def test_ForceRegion_SplineForceOnRigidBodies(self, request, workspace, editor, launcher_platform): + from .tests.force_region import ForceRegion_SplineForceOnRigidBodies as test_module self._run_test(request, workspace, editor, test_module) @revert_physics_config - @fm.file_override('physxsystemconfiguration.setreg','C4044457_Material_RestitutionCombine.setreg_override', 'AutomatedTesting/Registry') - def test_C4044457_Material_RestitutionCombine(self, request, workspace, editor, launcher_platform): - from .material import C4044457_Material_RestitutionCombine as test_module + @fm.file_override('physxsystemconfiguration.setreg','Material_RestitutionCombine.setreg_override', + 'AutomatedTesting/Registry', search_subdirs=True) + def test_Material_RestitutionCombine(self, request, workspace, editor, launcher_platform): + from .tests.material import Material_RestitutionCombine as test_module self._run_test(request, workspace, editor, test_module) @revert_physics_config - @fm.file_override('physxsystemconfiguration.setreg','C4044456_Material_FrictionCombine.setreg_override', 'AutomatedTesting/Registry') - def test_C4044456_Material_FrictionCombine(self, request, workspace, editor, launcher_platform): - from .material import C4044456_Material_FrictionCombine as test_module + @fm.file_override('physxsystemconfiguration.setreg','Material_FrictionCombine.setreg_override', + 'AutomatedTesting/Registry', search_subdirs=True) + def test_Material_FrictionCombine(self, request, workspace, editor, launcher_platform): + from .tests.material import Material_FrictionCombine as test_module self._run_test(request, workspace, editor, test_module) @revert_physics_config - def test_C4982797_Collider_ColliderOffset(self, request, workspace, editor, launcher_platform): - from .collider import C4982797_Collider_ColliderOffset as test_module + def test_Collider_ColliderPositionOffset(self, request, workspace, editor, launcher_platform): + from .tests.collider import Collider_ColliderPositionOffset as test_module self._run_test(request, workspace, editor, test_module) @revert_physics_config - def test_C4976200_RigidBody_AngularDampingObjectRotation(self, request, workspace, editor, launcher_platform): - from .rigid_body import C4976200_RigidBody_AngularDampingObjectRotation as test_module + def test_RigidBody_AngularDampingAffectsRotation(self, request, workspace, editor, launcher_platform): + from .tests.rigid_body import RigidBody_AngularDampingAffectsRotation as test_module self._run_test(request, workspace, editor, test_module) @revert_physics_config - def test_C5689529_Verify_Terrain_RigidBody_Collider_Mesh(self, request, workspace, editor, launcher_platform): - from .general import C5689529_Verify_Terrain_RigidBody_Collider_Mesh as test_module + def test_Physics_VerifyColliderRigidBodyMeshAndTerrainWorkTogether(self, request, workspace, editor, launcher_platform): + from .tests import Physics_VerifyColliderRigidBodyMeshAndTerrainWorkTogether as test_module self._run_test(request, workspace, editor, test_module) @revert_physics_config - def test_C5959810_ForceRegion_ForceRegionCombinesForces(self, request, workspace, editor, launcher_platform): - from .force_region import C5959810_ForceRegion_ForceRegionCombinesForces as test_module + def test_ForceRegion_MultipleForcesInSameComponentCombineForces(self, request, workspace, editor, launcher_platform): + from .tests.force_region import ForceRegion_MultipleForcesInSameComponentCombineForces as test_module self._run_test(request, workspace, editor, test_module) @revert_physics_config - def test_C5959765_ForceRegion_AssetGetsImpulsed(self, request, workspace, editor, launcher_platform): - from .force_region import C5959765_ForceRegion_AssetGetsImpulsed as test_module + def test_ForceRegion_ImpulsesPxMeshShapedRigidBody(self, request, workspace, editor, launcher_platform): + from .tests.force_region import ForceRegion_ImpulsesPxMeshShapedRigidBody as test_module self._run_test(request, workspace, editor, test_module) @revert_physics_config - def test_C6274125_ScriptCanvas_TriggerEvents(self, request, workspace, editor, launcher_platform): - from .script_canvas import C6274125_ScriptCanvas_TriggerEvents as test_module + def test_ScriptCanvas_TriggerEvents(self, request, workspace, editor, launcher_platform): + from .tests.script_canvas import ScriptCanvas_TriggerEvents as test_module # FIXME: expected_lines = test_module.LogLines.expected_lines self._run_test(request, workspace, editor, test_module) @revert_physics_config - def test_C6090554_ForceRegion_PointForceNegative(self, request, workspace, editor, launcher_platform): - from .force_region import C6090554_ForceRegion_PointForceNegative as test_module + def test_ForceRegion_ZeroPointForceDoesNothing(self, request, workspace, editor, launcher_platform): + from .tests.force_region import ForceRegion_ZeroPointForceDoesNothing as test_module self._run_test(request, workspace, editor, test_module) @revert_physics_config - def test_C6090550_ForceRegion_WorldSpaceForceNegative(self, request, workspace, editor, launcher_platform): - from .force_region import C6090550_ForceRegion_WorldSpaceForceNegative as test_module + def test_ForceRegion_ZeroWorldSpaceForceDoesNothing(self, request, workspace, editor, launcher_platform): + from .tests.force_region import ForceRegion_ZeroWorldSpaceForceDoesNothing as test_module self._run_test(request, workspace, editor, test_module) @revert_physics_config - def test_C6090552_ForceRegion_LinearDampingNegative(self, request, workspace, editor, launcher_platform): - from .force_region import C6090552_ForceRegion_LinearDampingNegative as test_module + def test_ForceRegion_ZeroLinearDampingDoesNothing(self, request, workspace, editor, launcher_platform): + from .tests.force_region import ForceRegion_ZeroLinearDampingDoesNothing as test_module self._run_test(request, workspace, editor, test_module) @revert_physics_config - def test_C5968760_ForceRegion_CheckNetForceChange(self, request, workspace, editor, launcher_platform): - from .force_region import C5968760_ForceRegion_CheckNetForceChange as test_module + def test_ForceRegion_MovingForceRegionChangesNetForce(self, request, workspace, editor, launcher_platform): + from .tests.force_region import ForceRegion_MovingForceRegionChangesNetForce as test_module self._run_test(request, workspace, editor, test_module) @revert_physics_config - def test_C12712452_ScriptCanvas_CollisionEvents(self, request, workspace, editor, launcher_platform): - from .script_canvas import C12712452_ScriptCanvas_CollisionEvents as test_module + def test_ScriptCanvas_CollisionEvents(self, request, workspace, editor, launcher_platform): + from .tests.script_canvas import ScriptCanvas_CollisionEvents as test_module self._run_test(request, workspace, editor, test_module) @revert_physics_config - def test_C12868578_ForceRegion_DirectionHasNoAffectOnMagnitude(self, request, workspace, editor, launcher_platform): - from .force_region import C12868578_ForceRegion_DirectionHasNoAffectOnMagnitude as test_module + def test_ForceRegion_DirectionHasNoAffectOnTotalForce(self, request, workspace, editor, launcher_platform): + from .tests.force_region import ForceRegion_DirectionHasNoAffectOnTotalForce as test_module self._run_test(request, workspace, editor, test_module) @revert_physics_config - def test_C4976204_Verify_Start_Asleep_Condition(self, request, workspace, editor, launcher_platform): - from .rigid_body import C4976204_Verify_Start_Asleep_Condition as test_module + def test_RigidBody_StartAsleepWorks(self, request, workspace, editor, launcher_platform): + from .tests.rigid_body import RigidBody_StartAsleepWorks as test_module self._run_test(request, workspace, editor, test_module) @revert_physics_config - def test_C6090546_ForceRegion_SliceFileInstantiates(self, request, workspace, editor, launcher_platform): - from .force_region import C6090546_ForceRegion_SliceFileInstantiates as test_module + def test_ForceRegion_SliceFileInstantiates(self, request, workspace, editor, launcher_platform): + from .tests.force_region import ForceRegion_SliceFileInstantiates as test_module self._run_test(request, workspace, editor, test_module) @revert_physics_config - def test_C6090551_ForceRegion_LocalSpaceForceNegative(self, request, workspace, editor, launcher_platform): - from .force_region import C6090551_ForceRegion_LocalSpaceForceNegative as test_module + def test_ForceRegion_ZeroLocalSpaceForceDoesNothing(self, request, workspace, editor, launcher_platform): + from .tests.force_region import ForceRegion_ZeroLocalSpaceForceDoesNothing as test_module self._run_test(request, workspace, editor, test_module) @revert_physics_config - def test_C6090553_ForceRegion_SimpleDragForceOnRigidBodies(self, request, workspace, editor, launcher_platform): - from .force_region import C6090553_ForceRegion_SimpleDragForceOnRigidBodies as test_module + def test_ForceRegion_ZeroSimpleDragForceDoesNothing(self, request, workspace, editor, launcher_platform): + from .tests.force_region import ForceRegion_ZeroSimpleDragForceDoesNothing as test_module self._run_test(request, workspace, editor, test_module) @revert_physics_config - def test_C4976209_RigidBody_ComputesCOM(self, request, workspace, editor, launcher_platform): - from .rigid_body import C4976209_RigidBody_ComputesCOM as test_module + def test_RigidBody_COM_ComputingWorks(self, request, workspace, editor, launcher_platform): + from .tests.rigid_body import RigidBody_COM_ComputingWorks as test_module self._run_test(request, workspace, editor, test_module) @revert_physics_config - def test_C4976201_RigidBody_MassIsAssigned(self, request, workspace, editor, launcher_platform): - from .rigid_body import C4976201_RigidBody_MassIsAssigned as test_module + def test_RigidBody_MassDifferentValuesWorks(self, request, workspace, editor, launcher_platform): + from .tests.rigid_body import RigidBody_MassDifferentValuesWorks as test_module self._run_test(request, workspace, editor, test_module) @revert_physics_config - @fm.file_override('physxsystemconfiguration.setreg','C18981526_Material_RestitutionCombinePriority.setreg_override', 'AutomatedTesting/Registry') - def test_C18981526_Material_RestitutionCombinePriority(self, request, workspace, editor, launcher_platform): - from .material import C18981526_Material_RestitutionCombinePriority as test_module + @fm.file_override('physxsystemconfiguration.setreg','Material_RestitutionCombinePriorityOrder.setreg_override', + 'AutomatedTesting/Registry', search_subdirs=True) + def test_Material_RestitutionCombinePriorityOrder(self, request, workspace, editor, launcher_platform): + from .tests.material import Material_RestitutionCombinePriorityOrder as test_module self._run_test(request, workspace, editor, test_module) @revert_physics_config - def test_C12868580_ForceRegion_SplineModifiedTransform(self, request, workspace, editor, launcher_platform): - from .force_region import C12868580_ForceRegion_SplineModifiedTransform as test_module + def test_ForceRegion_SplineRegionWithModifiedTransform(self, request, workspace, editor, launcher_platform): + from .tests.force_region import ForceRegion_SplineRegionWithModifiedTransform as test_module self._run_test(request, workspace, editor, test_module) @revert_physics_config - def test_C12712455_ScriptCanvas_ShapeCastVerification(self, request, workspace, editor, launcher_platform): - from .script_canvas import C12712455_ScriptCanvas_ShapeCastVerification as test_module + def test_ScriptCanvas_ShapeCast(self, request, workspace, editor, launcher_platform): + from .tests.script_canvas import ScriptCanvas_ShapeCast as test_module self._run_test(request, workspace, editor, test_module) @revert_physics_config - def test_C4976197_RigidBodies_InitialAngularVelocity(self, request, workspace, editor, launcher_platform): - from .rigid_body import C4976197_RigidBodies_InitialAngularVelocity as test_module + def test_RigidBody_InitialAngularVelocity(self, request, workspace, editor, launcher_platform): + from .tests.rigid_body import RigidBody_InitialAngularVelocity as test_module self._run_test(request, workspace, editor, test_module) @revert_physics_config - def test_C6090555_ForceRegion_SplineFollowOnRigidBodies(self, request, workspace, editor, launcher_platform): - from .force_region import C6090555_ForceRegion_SplineFollowOnRigidBodies as test_module + def test_ForceRegion_ZeroSplineForceDoesNothing(self, request, workspace, editor, launcher_platform): + from .tests.force_region import ForceRegion_ZeroSplineForceDoesNothing as test_module self._run_test(request, workspace, editor, test_module) @revert_physics_config - def test_C6131473_StaticSlice_OnDynamicSliceSpawn(self, request, workspace, editor, launcher_platform): - from .general import C6131473_StaticSlice_OnDynamicSliceSpawn as test_module + def test_Physics_DynamicSliceWithPhysNotSpawnsStaticSlice(self, request, workspace, editor, launcher_platform): + from .tests import Physics_DynamicSliceWithPhysNotSpawnsStaticSlice as test_module self._run_test(request, workspace, editor, test_module) @revert_physics_config - def test_C5959808_ForceRegion_PositionOffset(self, request, workspace, editor, launcher_platform): - from .force_region import C5959808_ForceRegion_PositionOffset as test_module + def test_ForceRegion_PositionOffset(self, request, workspace, editor, launcher_platform): + from .tests.force_region import ForceRegion_PositionOffset as test_module self._run_test(request, workspace, editor, test_module) @revert_physics_config - @fm.file_override('physxsystemconfiguration.setreg','C18977601_Material_FrictionCombinePriority.setreg_override', 'AutomatedTesting/Registry') - def test_C18977601_Material_FrictionCombinePriority(self, request, workspace, editor, launcher_platform): - from .material import C18977601_Material_FrictionCombinePriority as test_module + @fm.file_override('physxsystemconfiguration.setreg','Material_FrictionCombinePriorityOrder.setreg_override', + 'AutomatedTesting/Registry', search_subdirs=True) + def test_Material_FrictionCombinePriorityOrder(self, request, workspace, editor, launcher_platform): + from .tests.material import Material_FrictionCombinePriorityOrder as test_module self._run_test(request, workspace, editor, test_module) @pytest.mark.xfail( reason="Something with the CryRenderer disabling is causing this test to fail now.") @revert_physics_config - def test_C13895144_Ragdoll_ChangeLevel(self, request, workspace, editor, launcher_platform): - from .ragdoll import C13895144_Ragdoll_ChangeLevel as test_module + def test_Ragdoll_LevelSwitchDoesNotCrash(self, request, workspace, editor, launcher_platform): + from .tests.ragdoll import Ragdoll_LevelSwitchDoesNotCrash as test_module self._run_test(request, workspace, editor, test_module) @revert_physics_config - def test_C5968759_ForceRegion_ExertsSeveralForcesOnRigidBody(self, request, workspace, editor, launcher_platform): - from .force_region import C5968759_ForceRegion_ExertsSeveralForcesOnRigidBody as test_module + def test_ForceRegion_MultipleComponentsCombineForces(self, request, workspace, editor, launcher_platform): + from .tests.force_region import ForceRegion_MultipleComponentsCombineForces as test_module self._run_test(request, workspace, editor, test_module) # Marking the test as an expected failure due to sporadic failure on Automated Review: LYN-2580 @@ -250,237 +254,303 @@ class TestAutomation(TestAutomationBase): @pytest.mark.xfail( reason="This test needs new physics asset with multiple materials to be more stable.") @revert_physics_config - @fm.file_override('physxsystemconfiguration.setreg','C4044697_Material_PerfaceMaterialValidation.setreg_override', 'AutomatedTesting/Registry') - def test_C4044697_Material_PerfaceMaterialValidation(self, request, workspace, editor, launcher_platform): - from .material import C4044697_Material_PerfaceMaterialValidation as test_module + @fm.file_override('physxsystemconfiguration.setreg', 'Material_PerFaceMaterialGetsCorrectMaterial.setreg_override', + 'AutomatedTesting/Registry', search_subdirs=True) + def test_Material_PerFaceMaterialGetsCorrectMaterial(self, request, workspace, editor, launcher_platform): + from .tests.material import Material_PerFaceMaterialGetsCorrectMaterial as test_module self._run_test(request, workspace, editor, test_module) @pytest.mark.xfail( reason="This test will sometimes fail as the ball will continue to roll before the timeout is reached.") @revert_physics_config - def test_C4976202_RigidBody_StopsWhenBelowKineticThreshold(self, request, workspace, editor, launcher_platform): - from .rigid_body import C4976202_RigidBody_StopsWhenBelowKineticThreshold as test_module + def test_RigidBody_SleepWhenBelowKineticThreshold(self, request, workspace, editor, launcher_platform): + from .tests.rigid_body import RigidBody_SleepWhenBelowKineticThreshold as test_module self._run_test(request, workspace, editor, test_module) @revert_physics_config - def test_C13351703_COM_NotIncludeTriggerShapes(self, request, workspace, editor, launcher_platform): - from .rigid_body import C13351703_COM_NotIncludeTriggerShapes as test_module + def test_RigidBody_COM_NotIncludesTriggerShapes(self, request, workspace, editor, launcher_platform): + from .tests.rigid_body import RigidBody_COM_NotIncludesTriggerShapes as test_module self._run_test(request, workspace, editor, test_module) @revert_physics_config - def test_C5296614_PhysXMaterial_ColliderShape(self, request, workspace, editor, launcher_platform): - from .material import C5296614_PhysXMaterial_ColliderShape as test_module + def test_Material_NoEffectIfNoColliderShape(self, request, workspace, editor, launcher_platform): + from .tests.material import Material_NoEffectIfNoColliderShape as test_module self._run_test(request, workspace, editor, test_module) @revert_physics_config - def test_C4982595_Collider_TriggerDisablesCollision(self, request, workspace, editor, launcher_platform): - from .collider import C4982595_Collider_TriggerDisablesCollision as test_module + def test_Collider_TriggerPassThrough(self, request, workspace, editor, launcher_platform): + from .tests.collider import Collider_TriggerPassThrough as test_module self._run_test(request, workspace, editor, test_module) @revert_physics_config - def test_C14976307_Gravity_SetGravityWorks(self, request, workspace, editor, launcher_platform): - from .general import C14976307_Gravity_SetGravityWorks as test_module + def test_RigidBody_SetGravityWorks(self, request, workspace, editor, launcher_platform): + from .tests.rigid_body import RigidBody_SetGravityWorks as test_module self._run_test(request, workspace, editor, test_module) @revert_physics_config - @fm.file_override('physxsystemconfiguration.setreg','C15556261_PhysXMaterials_CharacterControllerMaterialAssignment.setreg_override', 'AutomatedTesting/Registry') - def test_C15556261_PhysXMaterials_CharacterControllerMaterialAssignment(self, request, workspace, editor, launcher_platform): - from .material import C15556261_PhysXMaterials_CharacterControllerMaterialAssignment as test_module + @fm.file_override('physxsystemconfiguration.setreg','Material_CharacterController.setreg_override', + 'AutomatedTesting/Registry', search_subdirs=True) + def test_Material_CharacterController(self, request, workspace, editor, launcher_platform): + from .tests.material import Material_CharacterController as test_module self._run_test(request, workspace, editor, test_module) @revert_physics_config - def test_C4044694_Material_EmptyLibraryUsesDefault(self, request, workspace, editor, launcher_platform): - from .material import C4044694_Material_EmptyLibraryUsesDefault as test_module + def test_Material_EmptyLibraryUsesDefault(self, request, workspace, editor, launcher_platform): + from .tests.material import Material_EmptyLibraryUsesDefault as test_module self._run_test(request, workspace, editor, test_module) @revert_physics_config - def test_C15845879_ForceRegion_HighLinearDampingForce(self, request, workspace, editor, launcher_platform): - from .force_region import C15845879_ForceRegion_HighLinearDampingForce as test_module + def test_ForceRegion_NoQuiverOnHighLinearDampingForce(self, request, workspace, editor, launcher_platform): + from .tests.force_region import ForceRegion_NoQuiverOnHighLinearDampingForce as test_module self._run_test(request, workspace, editor, test_module) @revert_physics_config - def test_C4976218_RigidBodies_InertiaObjectsNotComputed(self, request, workspace, editor, launcher_platform): - from .rigid_body import C4976218_RigidBodies_InertiaObjectsNotComputed as test_module + def test_RigidBody_ComputeInertiaWorks(self, request, workspace, editor, launcher_platform): + from .tests.rigid_body import RigidBody_ComputeInertiaWorks as test_module self._run_test(request, workspace, editor, test_module) @revert_physics_config - def test_C14902098_ScriptCanvas_PostPhysicsUpdate(self, request, workspace, editor, launcher_platform): - from .script_canvas import C14902098_ScriptCanvas_PostPhysicsUpdate as test_module + def test_ScriptCanvas_PostPhysicsUpdate(self, request, workspace, editor, launcher_platform): + from .tests.script_canvas import ScriptCanvas_PostPhysicsUpdate as test_module # Fixme: unexpected_lines = ["Assert"] + test_module.Lines.unexpected self._run_test(request, workspace, editor, test_module) @revert_physics_config - @fm.file_override('physxsystemconfiguration.setreg','C4976245_PhysXCollider_CollisionLayerTest.setreg_override', 'AutomatedTesting/Registry') - def test_C4976245_PhysXCollider_CollisionLayerTest(self, request, workspace, editor, launcher_platform): - from .collider import C4976245_PhysXCollider_CollisionLayerTest as test_module + @fm.file_override('physxsystemconfiguration.setreg','Collider_NoneCollisionGroupSameLayerNotCollide.setreg_override', + 'AutomatedTesting/Registry', search_subdirs=True) + def test_Collider_NoneCollisionGroupSameLayerNotCollide(self, request, workspace, editor, launcher_platform): + from .tests.collider import Collider_NoneCollisionGroupSameLayerNotCollide as test_module self._run_test(request, workspace, editor, test_module) @revert_physics_config - @fm.file_override('physxsystemconfiguration.setreg','C4976244_Collider_SameGroupSameLayerCollision.setreg_override', 'AutomatedTesting/Registry') - def test_C4976244_Collider_SameGroupSameLayerCollision(self, request, workspace, editor, launcher_platform): - from .collider import C4976244_Collider_SameGroupSameLayerCollision as test_module + @fm.file_override('physxsystemconfiguration.setreg','Collider_SameCollisionGroupSameCustomLayerCollide.setreg_override', + 'AutomatedTesting/Registry', search_subdirs=True) + def test_Collider_SameCollisionGroupSameCustomLayerCollide(self, request, workspace, editor, launcher_platform): + from .tests.collider import Collider_SameCollisionGroupSameCustomLayerCollide as test_module self._run_test(request, workspace, editor, test_module) @revert_physics_config - @fm.file_override('physxdefaultsceneconfiguration.setreg','C14195074_ScriptCanvas_PostUpdateEvent.setreg_override', 'AutomatedTesting/Registry') - def test_C14195074_ScriptCanvas_PostUpdateEvent(self, request, workspace, editor, launcher_platform): - from .script_canvas import C14195074_ScriptCanvas_PostUpdateEvent as test_module + @fm.file_override('physxdefaultsceneconfiguration.setreg','ScriptCanvas_PostUpdateEvent.setreg_override', + 'AutomatedTesting/Registry', search_subdirs=True) + def test_ScriptCanvas_PostUpdateEvent(self, request, workspace, editor, launcher_platform): + from .tests.script_canvas import ScriptCanvas_PostUpdateEvent as test_module self._run_test(request, workspace, editor, test_module) @revert_physics_config - @fm.file_override('physxsystemconfiguration.setreg','C4044461_Material_Restitution.setreg_override', 'AutomatedTesting/Registry') - def test_C4044461_Material_Restitution(self, request, workspace, editor, launcher_platform): - from .material import C4044461_Material_Restitution as test_module + @fm.file_override('physxsystemconfiguration.setreg','Material_Restitution.setreg_override', + 'AutomatedTesting/Registry', search_subdirs=True) + def test_Material_Restitution(self, request, workspace, editor, launcher_platform): + from .tests.material import Material_Restitution as test_module self._run_test(request, workspace, editor, test_module) @revert_physics_config - @fm.file_override('physxdefaultsceneconfiguration.setreg','C14902097_ScriptCanvas_PreUpdateEvent.setreg_override', 'AutomatedTesting/Registry') - def test_C14902097_ScriptCanvas_PreUpdateEvent(self, request, workspace, editor, launcher_platform): - from .script_canvas import C14902097_ScriptCanvas_PreUpdateEvent as test_module + @fm.file_override('physxdefaultsceneconfiguration.setreg', 'ScriptCanvas_PreUpdateEvent.setreg_override', + 'AutomatedTesting/Registry', search_subdirs=True) + def test_ScriptCanvas_PreUpdateEvent(self, request, workspace, editor, launcher_platform): + from .tests.script_canvas import ScriptCanvas_PreUpdateEvent as test_module self._run_test(request, workspace, editor, test_module) @revert_physics_config - def test_C5959761_ForceRegion_PhysAssetExertsPointForce(self, request, workspace, editor, launcher_platform): - from .force_region import C5959761_ForceRegion_PhysAssetExertsPointForce as test_module + def test_ForceRegion_PxMeshShapedForce(self, request, workspace, editor, launcher_platform): + from .tests.force_region import ForceRegion_PxMeshShapedForce as test_module self._run_test(request, workspace, editor, test_module) # Marking the Test as expected to fail using the xfail decorator due to sporadic failure on Automated Review: SPEC-3146 # The test still runs, but a failure of the test doesn't result in the test run failing @pytest.mark.xfail(reason="Test Sporadically fails with message [ NOT FOUND ] Success: Bar1 : Expected angular velocity") @revert_physics_config - def test_C13352089_RigidBodies_MaxAngularVelocity(self, request, workspace, editor, launcher_platform): - from .rigid_body import C13352089_RigidBodies_MaxAngularVelocity as test_module + def test_RigidBody_MaxAngularVelocityWorks(self, request, workspace, editor, launcher_platform): + from .tests.rigid_body import RigidBody_MaxAngularVelocityWorks as test_module self._run_test(request, workspace, editor, test_module) @revert_physics_config - def test_C18243584_Joints_HingeSoftLimitsConstrained(self, request, workspace, editor, launcher_platform): - from .joints import C18243584_Joints_HingeSoftLimitsConstrained as test_module + def test_Joints_HingeSoftLimitsConstrained(self, request, workspace, editor, launcher_platform): + from .tests.joints import Joints_HingeSoftLimitsConstrained as test_module self._run_test(request, workspace, editor, test_module) @revert_physics_config - def test_C18243589_Joints_BallSoftLimitsConstrained(self, request, workspace, editor, launcher_platform): - from .joints import C18243589_Joints_BallSoftLimitsConstrained as test_module + def test_Joints_BallSoftLimitsConstrained(self, request, workspace, editor, launcher_platform): + from .tests.joints import Joints_BallSoftLimitsConstrained as test_module self._run_test(request, workspace, editor, test_module) @revert_physics_config - def test_C18243591_Joints_BallLeadFollowerCollide(self, request, workspace, editor, launcher_platform): - from .joints import C18243591_Joints_BallLeadFollowerCollide as test_module + def test_Joints_BallLeadFollowerCollide(self, request, workspace, editor, launcher_platform): + from .tests.joints import Joints_BallLeadFollowerCollide as test_module self._run_test(request, workspace, editor, test_module) @revert_physics_config - @fm.file_override('physxsystemconfiguration.setreg','C4976227_Collider_NewGroup.setreg_override', 'AutomatedTesting/Registry') - def test_C4976227_Collider_NewGroup(self, request, workspace, editor, launcher_platform): - from .collider import C4976227_Collider_NewGroup as test_module + @fm.file_override('physxsystemconfiguration.setreg','Collider_AddingNewGroupWorks.setreg_override', + 'AutomatedTesting/Registry', search_subdirs=True) + def test_Collider_AddingNewGroupWorks(self, request, workspace, editor, launcher_platform): + from .tests.collider import Collider_AddingNewGroupWorks as test_module self._run_test(request, workspace, editor, test_module) @revert_physics_config - def test_C19578018_ShapeColliderWithNoShapeComponent(self, request, workspace, editor, launcher_platform): - from .collider import C19578018_ShapeColliderWithNoShapeComponent as test_module + def test_ShapeCollider_InactiveWhenNoShapeComponent(self, request, workspace, editor, launcher_platform): + from .tests.shape_collider import ShapeCollider_InactiveWhenNoShapeComponent as test_module self._run_test(request, workspace, editor, test_module) @revert_physics_config - def test_C14861500_DefaultSetting_ColliderShape(self, request, workspace, editor, launcher_platform): - from .collider import C14861500_DefaultSetting_ColliderShape as test_module + def test_Collider_CheckDefaultShapeSettingIsPxMesh(self, request, workspace, editor, launcher_platform): + from .tests.collider import Collider_CheckDefaultShapeSettingIsPxMesh as test_module self._run_test(request, workspace, editor, test_module) @revert_physics_config - def test_C19723164_ShapeCollider_WontCrashEditor(self, request, workspace, editor, launcher_platform): - from .collider import C19723164_ShapeColliders_WontCrashEditor as test_module + def test_ShapeCollider_LargeNumberOfShapeCollidersWontCrashEditor(self, request, workspace, editor, launcher_platform): + from .tests.shape_collider import ShapeCollider_LargeNumberOfShapeCollidersWontCrashEditor as test_module self._run_test(request, workspace, editor, test_module) @revert_physics_config - def test_C4982800_PhysXColliderShape_CanBeSelected(self, request, workspace, editor, launcher_platform): - from .collider import C4982800_PhysXColliderShape_CanBeSelected as test_module + def test_Collider_SphereShapeEditting(self, request, workspace, editor, launcher_platform): + from .tests.collider import Collider_SphereShapeEditting as test_module self._run_test(request, workspace, editor, test_module) @revert_physics_config - def test_C4982801_PhysXColliderShape_CanBeSelected(self, request, workspace, editor, launcher_platform): - from .collider import C4982801_PhysXColliderShape_CanBeSelected as test_module + def test_Collider_BoxShapeEditting(self, request, workspace, editor, launcher_platform): + from .tests.collider import Collider_BoxShapeEditting as test_module self._run_test(request, workspace, editor, test_module) @revert_physics_config - def test_C4982802_PhysXColliderShape_CanBeSelected(self, request, workspace, editor, launcher_platform): - from .collider import C4982802_PhysXColliderShape_CanBeSelected as test_module + def test_Collider_CapsuleShapeEditting(self, request, workspace, editor, launcher_platform): + from .tests.collider import Collider_CapsuleShapeEditting as test_module self._run_test(request, workspace, editor, test_module) - def test_C12905528_ForceRegion_WithNonTriggerCollider(self, request, workspace, editor, launcher_platform): - from .force_region import C12905528_ForceRegion_WithNonTriggerCollider as test_module + def test_ForceRegion_WithNonTriggerColliderWarning(self, request, workspace, editor, launcher_platform): + from .tests.force_region import ForceRegion_WithNonTriggerColliderWarning as test_module # Fixme: expected_lines = ["[Warning] (PhysX Force Region) - Please ensure collider component marked as trigger exists in entity"] self._run_test(request, workspace, editor, test_module) - def test_C5932040_ForceRegion_CubeExertsWorldForce(self, request, workspace, editor, launcher_platform): - from .force_region import C5932040_ForceRegion_CubeExertsWorldForce as test_module + def test_ForceRegion_WorldSpaceForceOnRigidBodies(self, request, workspace, editor, launcher_platform): + from .tests.force_region import ForceRegion_WorldSpaceForceOnRigidBodies as test_module self._run_test(request, workspace, editor, test_module) - def test_C5932044_ForceRegion_PointForceOnRigidBody(self, request, workspace, editor, launcher_platform): - from .force_region import C5932044_ForceRegion_PointForceOnRigidBody as test_module + def test_ForceRegion_PointForceOnRigidBodies(self, request, workspace, editor, launcher_platform): + from .tests.force_region import ForceRegion_PointForceOnRigidBodies as test_module self._run_test(request, workspace, editor, test_module) - def test_C5959759_RigidBody_ForceRegionSpherePointForce(self, request, workspace, editor, launcher_platform): - from .force_region import C5959759_RigidBody_ForceRegionSpherePointForce as test_module + def test_ForceRegion_SphereShapedForce(self, request, workspace, editor, launcher_platform): + from .tests.force_region import ForceRegion_SphereShapedForce as test_module self._run_test(request, workspace, editor, test_module) - def test_C5959809_ForceRegion_RotationalOffset(self, request, workspace, editor, launcher_platform): - from .force_region import C5959809_ForceRegion_RotationalOffset as test_module + def test_ForceRegion_RotationalOffset(self, request, workspace, editor, launcher_platform): + from .tests.force_region import ForceRegion_RotationalOffset as test_module self._run_test(request, workspace, editor, test_module) - def test_C15096740_Material_LibraryUpdatedCorrectly(self, request, workspace, editor, launcher_platform): - from .material import C15096740_Material_LibraryUpdatedCorrectly as test_module + def test_Material_LibraryClearingAssignsDefault(self, request, workspace, editor, launcher_platform): + from .tests.material import Material_LibraryClearingAssignsDefault as test_module self._run_test(request, workspace, editor, test_module) - def test_C4976236_AddPhysxColliderComponent(self, request, workspace, editor, launcher_platform): - from .collider import C4976236_AddPhysxColliderComponent as test_module + def test_Collider_AddColliderComponent(self, request, workspace, editor, launcher_platform): + from .tests.collider import Collider_AddColliderComponent as test_module self._run_test(request, workspace, editor, test_module) @pytest.mark.xfail( reason="This will fail due to this issue ATOM-15487.") - def test_C14861502_PhysXCollider_AssetAutoAssigned(self, request, workspace, editor, launcher_platform): - from .collider import C14861502_PhysXCollider_AssetAutoAssigned as test_module + def test_Collider_PxMeshAutoAssignedWhenModifyingRenderMeshComponent(self, request, workspace, editor, launcher_platform): + from .tests.collider import Collider_PxMeshAutoAssignedWhenModifyingRenderMeshComponent as test_module self._run_test(request, workspace, editor, test_module) - def test_C14861501_PhysXCollider_RenderMeshAutoAssigned(self, request, workspace, editor, launcher_platform): - from .collider import C14861501_PhysXCollider_RenderMeshAutoAssigned as test_module + def test_Collider_PxMeshAutoAssignedWhenAddingRenderMeshComponent(self, request, workspace, editor, launcher_platform): + from .tests.collider import Collider_PxMeshAutoAssignedWhenAddingRenderMeshComponent as test_module self._run_test(request, workspace, editor, test_module) - def test_C4044695_PhysXCollider_AddMultipleSurfaceFbx(self, request, workspace, editor, launcher_platform): - from .collider import C4044695_PhysXCollider_AddMultipleSurfaceFbx as test_module + def test_Collider_MultipleSurfaceSlots(self, request, workspace, editor, launcher_platform): + from .tests.collider import Collider_MultipleSurfaceSlots as test_module self._run_test(request, workspace, editor, test_module) - def test_C14861504_RenderMeshAsset_WithNoPxAsset(self, request, workspace, editor, launcher_platform): - from .collider import C14861504_RenderMeshAsset_WithNoPxAsset as test_module + def test_Collider_PxMeshNotAutoAssignedWhenNoPhysicsFbx(self, request, workspace, editor, launcher_platform): + from .tests.collider import Collider_PxMeshNotAutoAssignedWhenNoPhysicsFbx as test_module self._run_test(request, workspace, editor, test_module) - def test_C100000_RigidBody_EnablingGravityWorksPoC(self, request, workspace, editor, launcher_platform): - from .collider import C100000_RigidBody_EnablingGravityWorksPoC as test_module + def test_RigidBody_EnablingGravityWorksPoC(self, request, workspace, editor, launcher_platform): + from .tests.rigid_body import RigidBody_EnablingGravityWorksPoC as test_module self._run_test(request, workspace, editor, test_module) @revert_physics_config - @fm.file_override('physxsystemconfiguration.setreg','C3510644_Collider_CollisionGroups.setreg_override', 'AutomatedTesting/Registry') - def test_C3510644_Collider_CollisionGroups(self, request, workspace, editor, launcher_platform): - from .collider import C3510644_Collider_CollisionGroups as test_module + @fm.file_override('physxsystemconfiguration.setreg','Collider_CollisionGroupsWorkflow.setreg_override', + 'AutomatedTesting/Registry', search_subdirs=True) + def test_Collider_CollisionGroupsWorkflow(self, request, workspace, editor, launcher_platform): + from .tests.collider import Collider_CollisionGroupsWorkflow as test_module self._run_test(request, workspace, editor, test_module) @revert_physics_config - def test_C4982798_Collider_ColliderRotationOffset(self, request, workspace, editor, launcher_platform): - from .collider import C4982798_Collider_ColliderRotationOffset as test_module + def test_Collider_ColliderRotationOffset(self, request, workspace, editor, launcher_platform): + from .tests.collider import Collider_ColliderRotationOffset as test_module self._run_test(request, workspace, editor, test_module) @revert_physics_config - def test_C15308217_NoCrash_LevelSwitch(self, request, workspace, editor, launcher_platform): - from .terrain import C15308217_NoCrash_LevelSwitch as test_module - self._run_test(request, workspace, editor, test_module) - - @revert_physics_config - def test_C6090547_ForceRegion_ParentChildForceRegions(self, request, workspace, editor, launcher_platform): - from .force_region import C6090547_ForceRegion_ParentChildForceRegions as test_module + def test_ForceRegion_ParentChildForcesCombineForces(self, request, workspace, editor, launcher_platform): + from .tests.force_region import ForceRegion_ParentChildForcesCombineForces as test_module self._run_test(request, workspace, editor, test_module) @revert_physics_config - def test_C19578021_ShapeCollider_CanBeAdded(self, request, workspace, editor, launcher_platform): - from .collider import C19578021_ShapeCollider_CanBeAdded as test_module + def test_ShapeCollider_CanBeAddedWitNoWarnings(self, request, workspace, editor, launcher_platform): + from .tests.shape_collider import ShapeCollider_CanBeAddedWitNoWarnings as test_module self._run_test(request, workspace, editor, test_module) @revert_physics_config - def test_C15425929_Undo_Redo(self, request, workspace, editor, launcher_platform): - from .general import C15425929_Undo_Redo as test_module + def test_Physics_UndoRedoWorksOnEntityWithPhysComponents(self, request, workspace, editor, launcher_platform): + from .tests import Physics_UndoRedoWorksOnEntityWithPhysComponents as test_module self._run_test(request, workspace, editor, test_module) + + def test_Joints_Fixed2BodiesConstrained(self, request, workspace, editor, launcher_platform): + from .tests.joints import Joints_Fixed2BodiesConstrained as test_module + self._run_test(request, workspace, editor, test_module) + + def test_Joints_Hinge2BodiesConstrained(self, request, workspace, editor, launcher_platform): + from .tests.joints import Joints_Hinge2BodiesConstrained as test_module + self._run_test(request, workspace, editor, test_module) + + def test_Joints_Ball2BodiesConstrained(self, request, workspace, editor, launcher_platform): + from .tests.joints import Joints_Ball2BodiesConstrained as test_module + self._run_test(request, workspace, editor, test_module) + + def test_Joints_FixedBreakable(self, request, workspace, editor, launcher_platform): + from .tests.joints import Joints_FixedBreakable as test_module + self._run_test(request, workspace, editor, test_module) + + def test_Joints_HingeBreakable(self, request, workspace, editor, launcher_platform): + from .tests.joints import Joints_HingeBreakable as test_module + self._run_test(request, workspace, editor, test_module) + + def test_Joints_BallBreakable(self, request, workspace, editor, launcher_platform): + from .tests.joints import Joints_BallBreakable as test_module + self._run_test(request, workspace, editor, test_module) + + def test_Joints_HingeNoLimitsConstrained(self, request, workspace, editor, launcher_platform): + from .tests.joints import Joints_HingeNoLimitsConstrained as test_module + self._run_test(request, workspace, editor, test_module) + + def test_Joints_BallNoLimitsConstrained(self, request, workspace, editor, launcher_platform): + from .tests.joints import Joints_BallNoLimitsConstrained as test_module + self._run_test(request, workspace, editor, test_module) + + def test_Joints_FixedLeadFollowerCollide(self, request, workspace, editor, launcher_platform): + from .tests.joints import Joints_FixedLeadFollowerCollide as test_module + self._run_test(request, workspace, editor, test_module) + + def test_Joints_GlobalFrameConstrained(self, request, workspace, editor, launcher_platform): + from .tests.joints import Joints_GlobalFrameConstrained as test_module + self._run_test(request, workspace, editor, test_module) + + @revert_physics_config + def test_Material_DefaultLibraryUpdatedAcrossLevels(self, request, workspace, editor, launcher_platform): + @fm.file_override("physxsystemconfiguration.setreg", + "Material_DefaultLibraryUpdatedAcrossLevels_before.setreg", + "AutomatedTesting", + search_subdirs=True) + def levels_before(self, request, workspace, editor, launcher_platform): + from .tests.material import Material_DefaultLibraryUpdatedAcrossLevels_before as test_module_0 + self._run_test(request, workspace, editor, test_module_0) + + # File override replaces the previous physxconfiguration file with another where the only difference is the default material library + @fm.file_override("physxsystemconfiguration.setreg", + "Material_DefaultLibraryUpdatedAcrossLevels_after.setreg", + "AutomatedTesting", + search_subdirs=True) + def levels_after(self, request, workspace, editor, launcher_platform): + from .tests.material import Material_DefaultLibraryUpdatedAcrossLevels_after as test_module_1 + self._run_test(request, workspace, editor, test_module_1) + + levels_before(self, request, workspace, editor, launcher_platform) + levels_after(self, request, workspace, editor, launcher_platform) \ No newline at end of file diff --git a/AutomatedTesting/Gem/PythonTests/physics/TestSuite_Sandbox.py b/AutomatedTesting/Gem/PythonTests/physics/TestSuite_Sandbox.py old mode 100755 new mode 100644 index 1d26e2e40c..81fdc747d5 --- a/AutomatedTesting/Gem/PythonTests/physics/TestSuite_Sandbox.py +++ b/AutomatedTesting/Gem/PythonTests/physics/TestSuite_Sandbox.py @@ -29,14 +29,14 @@ revert_physics_config = fm.file_revert_list(['physxdebugconfiguration.setreg', ' class TestAutomation(TestAutomationBase): ## Seems to be flaky, need to investigate - def test_C19536274_GetCollisionName_PrintsName(self, request, workspace, editor, launcher_platform): - from .general import C19536274_GetCollisionName_PrintsName as test_module + def test_ScriptCanvas_GetCollisionNameReturnsName(self, request, workspace, editor, launcher_platform): + from .tests.script_canvas import ScriptCanvas_GetCollisionNameReturnsName as test_module # Fixme: expected_lines=["Layer Name: Right"] self._run_test(request, workspace, editor, test_module) ## Seems to be flaky, need to investigate - def test_C19536277_GetCollisionName_PrintsNothing(self, request, workspace, editor, launcher_platform): - from .general import C19536277_GetCollisionName_PrintsNothing as test_module + def test_ScriptCanvas_GetCollisionNameReturnsNothingWhenHasToggledLayer(self, request, workspace, editor, launcher_platform): + from .tests.script_canvas import ScriptCanvas_GetCollisionNameReturnsNothingWhenHasToggledLayer as test_module # All groups present in the PhysX Collider that could show up in test # Fixme: collision_groups = ["All", "None", "All_NoTouchBend", "All_3", "None_1", "All_NoTouchBend_1", "All_2", "None_1_1", "All_NoTouchBend_1_1", "All_1", "None_1_1_1", "All_NoTouchBend_1_1_1", "All_4", "None_1_1_1_1", "All_NoTouchBend_1_1_1_1", "GroupLeft", "GroupRight"] # Fixme: for group in collision_groups: diff --git a/AutomatedTesting/Gem/PythonTests/physics/terrain/C15308217_NoCrash_LevelSwitch.py b/AutomatedTesting/Gem/PythonTests/physics/terrain/C15308217_NoCrash_LevelSwitch.py deleted file mode 100644 index f3641b12bc..0000000000 --- a/AutomatedTesting/Gem/PythonTests/physics/terrain/C15308217_NoCrash_LevelSwitch.py +++ /dev/null @@ -1,105 +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 -""" - - -# Test case ID : C15308217 -# Test Case Title : Verify that the Terrain texture layer doesn't crash when changing -# from on a level with a terrain component to another level without a terrain component - - - -# fmt: off -class Tests(): - enter_game_mode_1 = ("Entered game mode for level1", "Failed to enter game mode for level1") - enter_game_mode_2 = ("Entered game mode for level2", "Failed to enter game mode for level2") - find_terrain = ("Terrain found", "Terrain not found") - exit_game_mode_1 = ("Exited game mode for level1", "Couldn't exit game mode for level1") - exit_game_mode_2 = ("Exited game mode for level2", "Couldn't exit game mode for level2") -# fmt: on - - -def C15308217_NoCrash_LevelSwitch(): - - """ - Summary: - Verify that the Terrain texture layer doesn't crash when changing from on a level with a - terrain component to another level without a terrain component - - Level Description: - Level C15308217_NoCrash_LevelSwitchWithOutTerrain: - No entities - Level C15308217_NoCrash_LevelSwitchWithTerrain: - Terrain (entity) - PhysX Terrain entity is created in the level - - Expected Behavior: - Editior should not crash. - We are switching the levels and validating the entities and checking any crash is happening while - switching between levels - - Test Steps: - 1) Open level with PhysX Terrain component - 2) Enter game mode - 3) Retrieve and validate entities - 4) Exit game mode - 5) Open level which doesn't have a PhysX Terrain component - 6) Enter game mode - 7) Wait for WAIT_TIME to check if any crash happens - 8) Exit game mode - 9) Close the editor - - - Note: - - This test file must be called from the Open 3D Engine Editor command terminal - - Any passed and failed tests are written to the Editor.log file. - Parsing the file or running a log_monitor are required to observe the test results. - - :return: None - """ - - import os - import sys - from editor_python_test_tools.utils import Report - from editor_python_test_tools.utils import TestHelper as helper - - import azlmbr.legacy.general as general - import azlmbr.bus - - # Constants - WAIT_TIME = 1.0 - - helper.init_idle() - - # 1) Open level with PhysX Terrain component - helper.open_level("Physics", "C15308217_NoCrash_LevelSwitchWithTerrain") - - # 2) Enter game mode - helper.enter_game_mode(Tests.enter_game_mode_1) - - # 3) Retrieve and validate entities - terrain_id = general.find_game_entity("Terrain") - Report.critical_result(Tests.find_terrain, terrain_id.IsValid()) - - # 4) Exit game mode - helper.exit_game_mode(Tests.exit_game_mode_1) - - # 5) Open level which doesn't have a PhysX Terrain component - helper.open_level("Physics", "C15308217_NoCrash_LevelSwitchWithOutTerrain") - - # 6) Enter game mode - helper.enter_game_mode(Tests.enter_game_mode_2) - - # 7) Wait for WAIT_TIME to check if any crash happens - general.idle_wait(WAIT_TIME) - - # 8) Exit game mode - helper.exit_game_mode(Tests.exit_game_mode_2) - - - -if __name__ == "__main__": - from editor_python_test_tools.utils import Report - Report.start_test(C15308217_NoCrash_LevelSwitch) diff --git a/AutomatedTesting/Gem/PythonTests/physics/general/C6131473_StaticSlice_OnDynamicSliceSpawn.py b/AutomatedTesting/Gem/PythonTests/physics/tests/Physics_DynamicSliceWithPhysNotSpawnsStaticSlice.py similarity index 94% rename from AutomatedTesting/Gem/PythonTests/physics/general/C6131473_StaticSlice_OnDynamicSliceSpawn.py rename to AutomatedTesting/Gem/PythonTests/physics/tests/Physics_DynamicSliceWithPhysNotSpawnsStaticSlice.py index e28893dee3..03674fbb17 100644 --- a/AutomatedTesting/Gem/PythonTests/physics/general/C6131473_StaticSlice_OnDynamicSliceSpawn.py +++ b/AutomatedTesting/Gem/PythonTests/physics/tests/Physics_DynamicSliceWithPhysNotSpawnsStaticSlice.py @@ -21,7 +21,7 @@ class Tests(): # fmt: on -def C6131473_StaticSlice_OnDynamicSliceSpawn(): +def Physics_DynamicSliceWithPhysNotSpawnsStaticSlice(): """ Summary: @@ -71,7 +71,7 @@ def C6131473_StaticSlice_OnDynamicSliceSpawn(): helper.init_idle() # 1) Open level - helper.open_level("Physics", "C6131473_StaticSlice_OnDynamicSliceSpawn") + helper.open_level("Physics", "Physics_DynamicSliceWithPhysNotSpawnsStaticSlice") # 2) Enter game mode helper.enter_game_mode(Tests.enter_game_mode) @@ -99,4 +99,4 @@ def C6131473_StaticSlice_OnDynamicSliceSpawn(): if __name__ == "__main__": from editor_python_test_tools.utils import Report - Report.start_test(C6131473_StaticSlice_OnDynamicSliceSpawn) + Report.start_test(Physics_DynamicSliceWithPhysNotSpawnsStaticSlice) diff --git a/AutomatedTesting/Gem/PythonTests/physics/general/C15425929_Undo_Redo.py b/AutomatedTesting/Gem/PythonTests/physics/tests/Physics_UndoRedoWorksOnEntityWithPhysComponents.py similarity index 93% rename from AutomatedTesting/Gem/PythonTests/physics/general/C15425929_Undo_Redo.py rename to AutomatedTesting/Gem/PythonTests/physics/tests/Physics_UndoRedoWorksOnEntityWithPhysComponents.py index f74c1d10cb..f114eeaa1f 100644 --- a/AutomatedTesting/Gem/PythonTests/physics/general/C15425929_Undo_Redo.py +++ b/AutomatedTesting/Gem/PythonTests/physics/tests/Physics_UndoRedoWorksOnEntityWithPhysComponents.py @@ -20,7 +20,7 @@ class Tests: # fmt: off -def C15425929_Undo_Redo(): +def Physics_UndoRedoWorksOnEntityWithPhysComponents(): """ Summary: Tests that no error messages arise when using the undo and redo functions in the editor. @@ -53,7 +53,7 @@ def C15425929_Undo_Redo(): helper.init_idle() # 1) Load the level - helper.open_level("Physics", "C15425929_Undo_Redo") + helper.open_level("Physics", "Physics_UndoRedoWorksOnEntityWithPhysComponents") with Tracer() as error_tracer: # Entity to delete and undo and re-delete @@ -87,4 +87,4 @@ def C15425929_Undo_Redo(): if __name__ == "__main__": from editor_python_test_tools.utils import Report - Report.start_test(C15425929_Undo_Redo) + Report.start_test(Physics_UndoRedoWorksOnEntityWithPhysComponents) diff --git a/AutomatedTesting/Gem/PythonTests/physics/general/C5689529_Verify_Terrain_RigidBody_Collider_Mesh.py b/AutomatedTesting/Gem/PythonTests/physics/tests/Physics_VerifyColliderRigidBodyMeshAndTerrainWorkTogether.py similarity index 93% rename from AutomatedTesting/Gem/PythonTests/physics/general/C5689529_Verify_Terrain_RigidBody_Collider_Mesh.py rename to AutomatedTesting/Gem/PythonTests/physics/tests/Physics_VerifyColliderRigidBodyMeshAndTerrainWorkTogether.py index f011e65972..f82eed5895 100644 --- a/AutomatedTesting/Gem/PythonTests/physics/general/C5689529_Verify_Terrain_RigidBody_Collider_Mesh.py +++ b/AutomatedTesting/Gem/PythonTests/physics/tests/Physics_VerifyColliderRigidBodyMeshAndTerrainWorkTogether.py @@ -23,7 +23,7 @@ class Tests(): # fmt: on -def C5689529_Verify_Terrain_RigidBody_Collider_Mesh(): +def Physics_VerifyColliderRigidBodyMeshAndTerrainWorkTogether(): """ Summary: @@ -71,7 +71,7 @@ def C5689529_Verify_Terrain_RigidBody_Collider_Mesh(): helper.init_idle() # 1) Open level - helper.open_level("Physics", "C5689529_Verify_Terrain_RigidBody_Collider_Mesh") + helper.open_level("Physics", "Physics_VerifyColliderRigidBodyMeshAndTerrainWorkTogether") # 2) Enter game mode helper.enter_game_mode(Tests.enter_game_mode) @@ -102,4 +102,4 @@ def C5689529_Verify_Terrain_RigidBody_Collider_Mesh(): if __name__ == "__main__": from editor_python_test_tools.utils import Report - Report.start_test(C5689529_Verify_Terrain_RigidBody_Collider_Mesh) + Report.start_test(Physics_VerifyColliderRigidBodyMeshAndTerrainWorkTogether) diff --git a/AutomatedTesting/Gem/PythonTests/physics/general/C29032500_EditorComponents_WorldBodyBusWorks.py b/AutomatedTesting/Gem/PythonTests/physics/tests/Physics_WorldBodyBusWorksOnEditorComponents.py similarity index 97% rename from AutomatedTesting/Gem/PythonTests/physics/general/C29032500_EditorComponents_WorldBodyBusWorks.py rename to AutomatedTesting/Gem/PythonTests/physics/tests/Physics_WorldBodyBusWorksOnEditorComponents.py index 0f7f91dafb..ba3f2088cb 100644 --- a/AutomatedTesting/Gem/PythonTests/physics/general/C29032500_EditorComponents_WorldBodyBusWorks.py +++ b/AutomatedTesting/Gem/PythonTests/physics/tests/Physics_WorldBodyBusWorksOnEditorComponents.py @@ -48,7 +48,7 @@ class Tests(): # fmt: on -def C29032500_EditorComponents_WorldBodyBusWorks(): +def Physics_WorldBodyBusWorksOnEditorComponents(): r""" Summary: Runs a test to make sure that a WorldBodyBus works property for components @@ -92,7 +92,7 @@ def C29032500_EditorComponents_WorldBodyBusWorks(): AABB_THRESHOLD = 0.01 # Entities won't move in the simulation helper.init_idle() - helper.open_level("Physics", "C29032500_EditorComponents_WorldBodyBusWorks") + helper.open_level("Physics", "Physics_WorldBodyBusWorksOnEditorComponents") def create_aabb(aabb_min_tuple, aabb_max_tuple): return azlmbr.math.Aabb_CreateFromMinMax(azlmbr.math.Vector3(aabb_min_tuple[0], aabb_min_tuple[1], aabb_min_tuple[2]), @@ -150,4 +150,4 @@ def C29032500_EditorComponents_WorldBodyBusWorks(): if __name__ == "__main__": from editor_python_test_tools.utils import Report - Report.start_test(C29032500_EditorComponents_WorldBodyBusWorks) + Report.start_test(Physics_WorldBodyBusWorksOnEditorComponents) diff --git a/AutomatedTesting/Gem/PythonTests/physics/character_controller/C14654881_CharacterController_SwitchLevels.py b/AutomatedTesting/Gem/PythonTests/physics/tests/character_controller/CharacterController_SwitchLevels.py similarity index 90% rename from AutomatedTesting/Gem/PythonTests/physics/character_controller/C14654881_CharacterController_SwitchLevels.py rename to AutomatedTesting/Gem/PythonTests/physics/tests/character_controller/CharacterController_SwitchLevels.py index 3976bcf25c..564a2a1020 100644 --- a/AutomatedTesting/Gem/PythonTests/physics/character_controller/C14654881_CharacterController_SwitchLevels.py +++ b/AutomatedTesting/Gem/PythonTests/physics/tests/character_controller/CharacterController_SwitchLevels.py @@ -23,7 +23,7 @@ class Tests: # fmt: on -def C14654881_CharacterController_SwitchLevels(): +def CharacterController_SwitchLevels(): """ Summary: Runs an automated test to verify that switching levels from a level containing a character controller component @@ -64,7 +64,7 @@ def C14654881_CharacterController_SwitchLevels(): helper.init_idle() # 1.1) Load level 1 (with character controller) - helper.open_level("Physics", "C14654881_CharacterController_SwitchLevels") + helper.open_level("Physics", "CharacterController_SwitchLevels") # 1.2) Enter game mode helper.enter_game_mode(Tests.level1_enter_game_mode) @@ -77,7 +77,7 @@ def C14654881_CharacterController_SwitchLevels(): helper.exit_game_mode(Tests.level1_exit_game_mode) # 2.1) Load level 2 (empty level) - helper.open_level("Physics", "C14654881_CharacterController_SwitchLevelsEmpty") + helper.open_level("Physics", "Base") # 2.2) Enter game mode helper.enter_game_mode(Tests.level2_enter_game_mode) @@ -89,4 +89,4 @@ def C14654881_CharacterController_SwitchLevels(): if __name__ == "__main__": from editor_python_test_tools.utils import Report - Report.start_test(C14654881_CharacterController_SwitchLevels) + Report.start_test(CharacterController_SwitchLevels) diff --git a/AutomatedTesting/Gem/PythonTests/physics/collider/C4976236_AddPhysxColliderComponent.py b/AutomatedTesting/Gem/PythonTests/physics/tests/collider/Collider_AddColliderComponent.py similarity index 97% rename from AutomatedTesting/Gem/PythonTests/physics/collider/C4976236_AddPhysxColliderComponent.py rename to AutomatedTesting/Gem/PythonTests/physics/tests/collider/Collider_AddColliderComponent.py index e4341bb148..4172e66962 100644 --- a/AutomatedTesting/Gem/PythonTests/physics/collider/C4976236_AddPhysxColliderComponent.py +++ b/AutomatedTesting/Gem/PythonTests/physics/tests/collider/Collider_AddColliderComponent.py @@ -20,7 +20,7 @@ class Tests(): # fmt: on -def C4976236_AddPhysxColliderComponent(): +def Collider_AddColliderComponent(): """ Summary: Opens an empty level and creates an Entity with PhysX Collider. Verify that editor remains stable in Game mode. @@ -83,4 +83,4 @@ def C4976236_AddPhysxColliderComponent(): if __name__ == "__main__": from editor_python_test_tools.utils import Report - Report.start_test(C4976236_AddPhysxColliderComponent) + Report.start_test(Collider_AddColliderComponent) diff --git a/AutomatedTesting/Gem/PythonTests/physics/collider/C4976227_Collider_NewGroup.py b/AutomatedTesting/Gem/PythonTests/physics/tests/collider/Collider_AddingNewGroupWorks.py similarity index 94% rename from AutomatedTesting/Gem/PythonTests/physics/collider/C4976227_Collider_NewGroup.py rename to AutomatedTesting/Gem/PythonTests/physics/tests/collider/Collider_AddingNewGroupWorks.py index e9704d6be5..acb5ae6bee 100644 --- a/AutomatedTesting/Gem/PythonTests/physics/collider/C4976227_Collider_NewGroup.py +++ b/AutomatedTesting/Gem/PythonTests/physics/tests/collider/Collider_AddingNewGroupWorks.py @@ -20,7 +20,7 @@ class Tests: # fmt: on -def C4976227_Collider_NewGroup(): +def Collider_AddingNewGroupWorks(): """ Summary: Runs an automated test to ensure that a collision group can be added. @@ -59,7 +59,7 @@ def C4976227_Collider_NewGroup(): helper.init_idle() # 1) Open Level - helper.open_level("Physics", "C4976227_Collider_NewGroup") + helper.open_level("Physics", "Collider_AddingNewGroupWorks") # 2) Enter game mode helper.enter_game_mode(Tests.enter_game_mode) @@ -80,4 +80,4 @@ def C4976227_Collider_NewGroup(): if __name__ == "__main__": from editor_python_test_tools.utils import Report - Report.start_test(C4976227_Collider_NewGroup) + Report.start_test(Collider_AddingNewGroupWorks) diff --git a/AutomatedTesting/Gem/PythonTests/physics/collider/C4982801_PhysXColliderShape_CanBeSelected.py b/AutomatedTesting/Gem/PythonTests/physics/tests/collider/Collider_BoxShapeEditting.py similarity index 97% rename from AutomatedTesting/Gem/PythonTests/physics/collider/C4982801_PhysXColliderShape_CanBeSelected.py rename to AutomatedTesting/Gem/PythonTests/physics/tests/collider/Collider_BoxShapeEditting.py index 33b7dc0b48..68ff0b4edc 100644 --- a/AutomatedTesting/Gem/PythonTests/physics/collider/C4982801_PhysXColliderShape_CanBeSelected.py +++ b/AutomatedTesting/Gem/PythonTests/physics/tests/collider/Collider_BoxShapeEditting.py @@ -19,7 +19,7 @@ class Tests(): # fmt: on -def C4982801_PhysXColliderShape_CanBeSelected(): +def Collider_BoxShapeEditting(): """ Summary: Adding PhysX Collider and Shape components to test entity, then attempting to modify the shape's dimensions @@ -102,4 +102,4 @@ def C4982801_PhysXColliderShape_CanBeSelected(): if __name__ == "__main__": from editor_python_test_tools.utils import Report - Report.start_test(C4982801_PhysXColliderShape_CanBeSelected) + Report.start_test(Collider_BoxShapeEditting) diff --git a/AutomatedTesting/Gem/PythonTests/physics/collider/C4982802_PhysXColliderShape_CanBeSelected.py b/AutomatedTesting/Gem/PythonTests/physics/tests/collider/Collider_CapsuleShapeEditting.py similarity index 97% rename from AutomatedTesting/Gem/PythonTests/physics/collider/C4982802_PhysXColliderShape_CanBeSelected.py rename to AutomatedTesting/Gem/PythonTests/physics/tests/collider/Collider_CapsuleShapeEditting.py index 4881c5b9a0..7df12c68f0 100644 --- a/AutomatedTesting/Gem/PythonTests/physics/collider/C4982802_PhysXColliderShape_CanBeSelected.py +++ b/AutomatedTesting/Gem/PythonTests/physics/tests/collider/Collider_CapsuleShapeEditting.py @@ -19,7 +19,7 @@ class Tests(): # fmt: on -def C4982802_PhysXColliderShape_CanBeSelected(): +def Collider_CapsuleShapeEditting(): """ Summary: Adding PhysX Collider and Shape components to test entity, then attempting to modify the shape's dimensions @@ -102,4 +102,4 @@ def C4982802_PhysXColliderShape_CanBeSelected(): if __name__ == "__main__": from editor_python_test_tools.utils import Report - Report.start_test(C4982802_PhysXColliderShape_CanBeSelected) + Report.start_test(Collider_CapsuleShapeEditting) diff --git a/AutomatedTesting/Gem/PythonTests/physics/collider/C14861500_DefaultSetting_ColliderShape.py b/AutomatedTesting/Gem/PythonTests/physics/tests/collider/Collider_CheckDefaultShapeSettingIsPxMesh.py similarity index 95% rename from AutomatedTesting/Gem/PythonTests/physics/collider/C14861500_DefaultSetting_ColliderShape.py rename to AutomatedTesting/Gem/PythonTests/physics/tests/collider/Collider_CheckDefaultShapeSettingIsPxMesh.py index aed856f530..cf8bd740c9 100644 --- a/AutomatedTesting/Gem/PythonTests/physics/collider/C14861500_DefaultSetting_ColliderShape.py +++ b/AutomatedTesting/Gem/PythonTests/physics/tests/collider/Collider_CheckDefaultShapeSettingIsPxMesh.py @@ -18,7 +18,7 @@ class Tests(): # fmt: on -def C14861500_DefaultSetting_ColliderShape(): +def Collider_CheckDefaultShapeSettingIsPxMesh(): """ Summary: Check the default for Shape on the PhysX Collider component @@ -69,4 +69,4 @@ def C14861500_DefaultSetting_ColliderShape(): if __name__ == "__main__": from editor_python_test_tools.utils import Report - Report.start_test(C14861500_DefaultSetting_ColliderShape) + Report.start_test(Collider_CheckDefaultShapeSettingIsPxMesh) diff --git a/AutomatedTesting/Gem/PythonTests/physics/collider/C4982797_Collider_ColliderOffset.py b/AutomatedTesting/Gem/PythonTests/physics/tests/collider/Collider_ColliderPositionOffset.py similarity index 98% rename from AutomatedTesting/Gem/PythonTests/physics/collider/C4982797_Collider_ColliderOffset.py rename to AutomatedTesting/Gem/PythonTests/physics/tests/collider/Collider_ColliderPositionOffset.py index d4d8ab15fd..a784d10684 100644 --- a/AutomatedTesting/Gem/PythonTests/physics/collider/C4982797_Collider_ColliderOffset.py +++ b/AutomatedTesting/Gem/PythonTests/physics/tests/collider/Collider_ColliderPositionOffset.py @@ -25,7 +25,7 @@ class Tests: # fmt: on -def C4982797_Collider_ColliderOffset(): +def Collider_ColliderPositionOffset(): # type: () -> None """ Summary: @@ -287,7 +287,7 @@ def C4982797_Collider_ColliderOffset(): helper.init_idle() # 1) Open level - helper.open_level("Physics", "C4982797_Collider_ColliderOffset") + helper.open_level("Physics", "Collider_ColliderPositionOffset") # 2) Enter game mode helper.enter_game_mode(Tests.enter_game_mode) @@ -331,4 +331,4 @@ def C4982797_Collider_ColliderOffset(): if __name__ == "__main__": from editor_python_test_tools.utils import Report - Report.start_test(C4982797_Collider_ColliderOffset) + Report.start_test(Collider_ColliderPositionOffset) diff --git a/AutomatedTesting/Gem/PythonTests/physics/collider/C4982798_Collider_ColliderRotationOffset.py b/AutomatedTesting/Gem/PythonTests/physics/tests/collider/Collider_ColliderRotationOffset.py similarity index 98% rename from AutomatedTesting/Gem/PythonTests/physics/collider/C4982798_Collider_ColliderRotationOffset.py rename to AutomatedTesting/Gem/PythonTests/physics/tests/collider/Collider_ColliderRotationOffset.py index 8368b9a66f..8b3ccfe5c7 100644 --- a/AutomatedTesting/Gem/PythonTests/physics/collider/C4982798_Collider_ColliderRotationOffset.py +++ b/AutomatedTesting/Gem/PythonTests/physics/tests/collider/Collider_ColliderRotationOffset.py @@ -29,7 +29,7 @@ class Tests: # fmt: on -def C4982798_Collider_ColliderRotationOffset(): +def Collider_ColliderRotationOffset(): # type: () -> None """ Summary: @@ -255,7 +255,7 @@ def C4982798_Collider_ColliderRotationOffset(): helper.init_idle() # 1) Open level - helper.open_level("Physics", "C4982798_Collider_ColliderRotationOffset") + helper.open_level("Physics", "Collider_ColliderRotationOffset") # 2) Enter game mode helper.enter_game_mode(Tests.enter_game_mode) @@ -299,4 +299,4 @@ def C4982798_Collider_ColliderRotationOffset(): if __name__ == "__main__": from editor_python_test_tools.utils import Report - Report.start_test(C4982798_Collider_ColliderRotationOffset) + Report.start_test(Collider_ColliderRotationOffset) diff --git a/AutomatedTesting/Gem/PythonTests/physics/collider/C3510644_Collider_CollisionGroups.py b/AutomatedTesting/Gem/PythonTests/physics/tests/collider/Collider_CollisionGroupsWorkflow.py similarity index 99% rename from AutomatedTesting/Gem/PythonTests/physics/collider/C3510644_Collider_CollisionGroups.py rename to AutomatedTesting/Gem/PythonTests/physics/tests/collider/Collider_CollisionGroupsWorkflow.py index 28638cc2a6..0440645df8 100644 --- a/AutomatedTesting/Gem/PythonTests/physics/collider/C3510644_Collider_CollisionGroups.py +++ b/AutomatedTesting/Gem/PythonTests/physics/tests/collider/Collider_CollisionGroupsWorkflow.py @@ -38,7 +38,7 @@ class Tests: # fmt: on -def C3510644_Collider_CollisionGroups(): +def Collider_CollisionGroupsWorkflow(): # type: () -> None """ Summary: @@ -261,7 +261,7 @@ def C3510644_Collider_CollisionGroups(): # 1) Open level helper.init_idle() - helper.open_level("Physics", "C3510644_Collider_CollisionGroups") + helper.open_level("Physics", "Collider_CollisionGroupsWorkflow") # 2) Enter game mode helper.enter_game_mode(Tests.enter_game_mode) @@ -358,4 +358,4 @@ def C3510644_Collider_CollisionGroups(): if __name__ == "__main__": from editor_python_test_tools.utils import Report - Report.start_test(C3510644_Collider_CollisionGroups) + Report.start_test(Collider_CollisionGroupsWorkflow) diff --git a/AutomatedTesting/Gem/PythonTests/physics/collider/C4982593_PhysXCollider_CollisionLayerTest.py b/AutomatedTesting/Gem/PythonTests/physics/tests/collider/Collider_DiffCollisionGroupDiffCollidingLayersNotCollide.py similarity index 97% rename from AutomatedTesting/Gem/PythonTests/physics/collider/C4982593_PhysXCollider_CollisionLayerTest.py rename to AutomatedTesting/Gem/PythonTests/physics/tests/collider/Collider_DiffCollisionGroupDiffCollidingLayersNotCollide.py index 3fdb9d3403..efcbf5c83a 100644 --- a/AutomatedTesting/Gem/PythonTests/physics/collider/C4982593_PhysXCollider_CollisionLayerTest.py +++ b/AutomatedTesting/Gem/PythonTests/physics/tests/collider/Collider_DiffCollisionGroupDiffCollidingLayersNotCollide.py @@ -30,7 +30,7 @@ class Tests: # fmt: on -def C4982593_PhysXCollider_CollisionLayerTest(): +def Collider_DiffCollisionGroupDiffCollidingLayersNotCollide(): # type: () -> None """ Summary: @@ -96,7 +96,7 @@ def C4982593_PhysXCollider_CollisionLayerTest(): # 1) Open level / Enter game mode helper.init_idle() - helper.open_level("Physics", "C4982593_PhysxCollider_CollisionLayerTest") + helper.open_level("Physics", "Collider_DiffCollisionGroupDiffCollidingLayersNotCollide") helper.enter_game_mode(Tests.enter_game_mode) # 2) Retrieve/validate entities @@ -227,4 +227,4 @@ def C4982593_PhysXCollider_CollisionLayerTest(): if __name__ == "__main__": from editor_python_test_tools.utils import Report - Report.start_test(C4982593_PhysXCollider_CollisionLayerTest) + Report.start_test(Collider_DiffCollisionGroupDiffCollidingLayersNotCollide) diff --git a/AutomatedTesting/Gem/PythonTests/physics/collider/C4044695_PhysXCollider_AddMultipleSurfaceFbx.py b/AutomatedTesting/Gem/PythonTests/physics/tests/collider/Collider_MultipleSurfaceSlots.py similarity index 92% rename from AutomatedTesting/Gem/PythonTests/physics/collider/C4044695_PhysXCollider_AddMultipleSurfaceFbx.py rename to AutomatedTesting/Gem/PythonTests/physics/tests/collider/Collider_MultipleSurfaceSlots.py index cfe6f3962c..2eabc6ab09 100644 --- a/AutomatedTesting/Gem/PythonTests/physics/collider/C4044695_PhysXCollider_AddMultipleSurfaceFbx.py +++ b/AutomatedTesting/Gem/PythonTests/physics/tests/collider/Collider_MultipleSurfaceSlots.py @@ -23,7 +23,7 @@ class Tests(): # fmt: on -def C4044695_PhysXCollider_AddMultipleSurfaceFbx(): +def Collider_MultipleSurfaceSlots(): """ Summary: Create entity with Mesh and PhysX Collider components and assign a fbx file in both the components. @@ -59,8 +59,8 @@ def C4044695_PhysXCollider_AddMultipleSurfaceFbx(): SURFACE_TAG_COUNT = 4 # Number of surface tags included in used asset # Asset paths - STATIC_MESH = os.path.join("assets", "c4044695_physxcollider_addmultiplesurfacefbx", "test.azmodel") - PHYSX_MESH = os.path.join("assets", "c4044695_physxcollider_addmultiplesurfacefbx", "test.pxmesh") + STATIC_MESH = os.path.join("assets", "Physics", "Collider_MultipleSurfaceSlots", "test.azmodel") + PHYSX_MESH = os.path.join("assets", "Physics","Collider_MultipleSurfaceSlots", "test.pxmesh") helper.init_idle() # 1) Load the empty level @@ -86,12 +86,12 @@ def C4044695_PhysXCollider_AddMultipleSurfaceFbx(): px_asset = Asset.find_asset_by_path(PHYSX_MESH) collider_component.set_component_property_value("Shape Configuration|Asset|PhysX Mesh", px_asset.id) px_asset.id = collider_component.get_component_property_value("Shape Configuration|Asset|PhysX Mesh") - Report.result(Tests.assign_px_mesh_asset, px_asset.get_path() == PHYSX_MESH.replace(os.sep, "/")) + Report.result(Tests.assign_px_mesh_asset, px_asset.get_path().lower() == PHYSX_MESH.replace(os.sep, "/").lower()) mesh_asset = Asset.find_asset_by_path(STATIC_MESH) mesh_component.set_component_property_value("Controller|Configuration|Mesh Asset", mesh_asset.id) mesh_asset.id = mesh_component.get_component_property_value("Controller|Configuration|Mesh Asset") - Report.result(Tests.assign_mesh_asset, mesh_asset.get_path() == STATIC_MESH.replace(os.sep, "/")) + Report.result(Tests.assign_mesh_asset, mesh_asset.get_path().lower() == STATIC_MESH.replace(os.sep, "/").lower()) # 6) Check if multiple material slots show up under Materials section in the PhysX Collider component pte = collider_component.get_property_tree() @@ -106,4 +106,4 @@ def C4044695_PhysXCollider_AddMultipleSurfaceFbx(): if __name__ == "__main__": from editor_python_test_tools.utils import Report - Report.start_test(C4044695_PhysXCollider_AddMultipleSurfaceFbx) + Report.start_test(Collider_MultipleSurfaceSlots) diff --git a/AutomatedTesting/Gem/PythonTests/physics/collider/C4976245_PhysXCollider_CollisionLayerTest.py b/AutomatedTesting/Gem/PythonTests/physics/tests/collider/Collider_NoneCollisionGroupSameLayerNotCollide.py similarity index 97% rename from AutomatedTesting/Gem/PythonTests/physics/collider/C4976245_PhysXCollider_CollisionLayerTest.py rename to AutomatedTesting/Gem/PythonTests/physics/tests/collider/Collider_NoneCollisionGroupSameLayerNotCollide.py index a7c9152744..f52a5683a6 100644 --- a/AutomatedTesting/Gem/PythonTests/physics/collider/C4976245_PhysXCollider_CollisionLayerTest.py +++ b/AutomatedTesting/Gem/PythonTests/physics/tests/collider/Collider_NoneCollisionGroupSameLayerNotCollide.py @@ -30,7 +30,7 @@ class Tests: # fmt: on -def C4976245_PhysXCollider_CollisionLayerTest(): +def Collider_NoneCollisionGroupSameLayerNotCollide(): # type: () -> None """ Summary: @@ -105,7 +105,7 @@ def C4976245_PhysXCollider_CollisionLayerTest(): # 1) Open level / Enter game mode helper.init_idle() - helper.open_level("Physics", "C4976245_PhysxCollider_CollisionLayerTest") + helper.open_level("Physics", "Collider_NoneCollisionGroupSameLayerNotCollide") helper.enter_game_mode(Tests.enter_game_mode) # 2) Retrieve/validate entities @@ -219,4 +219,4 @@ def C4976245_PhysXCollider_CollisionLayerTest(): if __name__ == "__main__": from editor_python_test_tools.utils import Report - Report.start_test(C4976245_PhysXCollider_CollisionLayerTest) + Report.start_test(Collider_NoneCollisionGroupSameLayerNotCollide) diff --git a/AutomatedTesting/Gem/PythonTests/physics/collider/C14861501_PhysXCollider_RenderMeshAutoAssigned.py b/AutomatedTesting/Gem/PythonTests/physics/tests/collider/Collider_PxMeshAutoAssignedWhenAddingRenderMeshComponent.py similarity index 88% rename from AutomatedTesting/Gem/PythonTests/physics/collider/C14861501_PhysXCollider_RenderMeshAutoAssigned.py rename to AutomatedTesting/Gem/PythonTests/physics/tests/collider/Collider_PxMeshAutoAssignedWhenAddingRenderMeshComponent.py index 73c94a2dfb..f229842d2f 100644 --- a/AutomatedTesting/Gem/PythonTests/physics/collider/C14861501_PhysXCollider_RenderMeshAutoAssigned.py +++ b/AutomatedTesting/Gem/PythonTests/physics/tests/collider/Collider_PxMeshAutoAssignedWhenAddingRenderMeshComponent.py @@ -20,7 +20,7 @@ class Tests(): # fmt: on -def C14861501_PhysXCollider_RenderMeshAutoAssigned(): +def Collider_PxMeshAutoAssignedWhenAddingRenderMeshComponent(): """ Summary: Create entity with Mesh component and assign a render mesh to the Mesh component. Add Physics Collider component @@ -55,9 +55,9 @@ def C14861501_PhysXCollider_RenderMeshAutoAssigned(): from editor_python_test_tools.asset_utils import Asset # Asset paths - STATIC_MESH = os.path.join("assets", "c14861501_physxcollider_rendermeshautoassigned", "spherebot", "r0-b_body.azmodel") + STATIC_MESH = os.path.join("assets", "Physics", "Collider_PxMeshAutoAssigned", "spherebot", "r0-b_body.azmodel") PHYSX_MESH = os.path.join( - "assets", "c14861501_physxcollider_rendermeshautoassigned", "spherebot", "r0-b_body.pxmesh" + "assets", "Physics", "Collider_PxMeshAutoAssigned", "spherebot", "r0-b_body.pxmesh" ) helper.init_idle() @@ -76,7 +76,7 @@ def C14861501_PhysXCollider_RenderMeshAutoAssigned(): mesh_asset = Asset.find_asset_by_path(STATIC_MESH) mesh_component.set_component_property_value("Controller|Configuration|Mesh Asset", mesh_asset.id) mesh_asset.id = mesh_component.get_component_property_value("Controller|Configuration|Mesh Asset") - Report.result(Tests.assign_mesh_asset, mesh_asset.get_path() == STATIC_MESH.replace(os.sep, "/")) + Report.result(Tests.assign_mesh_asset, mesh_asset.get_path().lower() == STATIC_MESH.replace(os.sep, "/").lower()) # 5) Add PhysX Collider component test_component = test_entity.add_component("PhysX Collider") @@ -85,9 +85,9 @@ def C14861501_PhysXCollider_RenderMeshAutoAssigned(): # 6) The physics asset in PhysX Collider component is auto-assigned. asset_id = test_component.get_component_property_value("Shape Configuration|Asset|PhysX Mesh") test_asset = Asset(asset_id) - Report.result(Tests.automatic_shape_change, test_asset.get_path() == PHYSX_MESH.replace(os.sep, "/")) + Report.result(Tests.automatic_shape_change, test_asset.get_path().lower() == PHYSX_MESH.replace(os.sep, "/").lower()) if __name__ == "__main__": from editor_python_test_tools.utils import Report - Report.start_test(C14861501_PhysXCollider_RenderMeshAutoAssigned) + Report.start_test(Collider_PxMeshAutoAssignedWhenAddingRenderMeshComponent) diff --git a/AutomatedTesting/Gem/PythonTests/physics/collider/C14861502_PhysXCollider_AssetAutoAssigned.py b/AutomatedTesting/Gem/PythonTests/physics/tests/collider/Collider_PxMeshAutoAssignedWhenModifyingRenderMeshComponent.py similarity index 96% rename from AutomatedTesting/Gem/PythonTests/physics/collider/C14861502_PhysXCollider_AssetAutoAssigned.py rename to AutomatedTesting/Gem/PythonTests/physics/tests/collider/Collider_PxMeshAutoAssignedWhenModifyingRenderMeshComponent.py index b8c0e4a529..8b08aae49d 100644 --- a/AutomatedTesting/Gem/PythonTests/physics/collider/C14861502_PhysXCollider_AssetAutoAssigned.py +++ b/AutomatedTesting/Gem/PythonTests/physics/tests/collider/Collider_PxMeshAutoAssignedWhenModifyingRenderMeshComponent.py @@ -20,7 +20,7 @@ class Tests(): # fmt: on -def C14861502_PhysXCollider_AssetAutoAssigned(): +def Collider_PxMeshAutoAssignedWhenModifyingRenderMeshComponent(): """ Summary: Create entity with Mesh and PhysX Collider components, then assign a render mesh to the Mesh component @@ -92,4 +92,4 @@ def C14861502_PhysXCollider_AssetAutoAssigned(): if __name__ == "__main__": from editor_python_test_tools.utils import Report - Report.start_test(C14861502_PhysXCollider_AssetAutoAssigned) + Report.start_test(Collider_PxMeshAutoAssignedWhenModifyingRenderMeshComponent) diff --git a/AutomatedTesting/Gem/PythonTests/physics/collider/C4982803_Enable_PxMesh_Option.py b/AutomatedTesting/Gem/PythonTests/physics/tests/collider/Collider_PxMeshConvexMeshCollides.py similarity index 94% rename from AutomatedTesting/Gem/PythonTests/physics/collider/C4982803_Enable_PxMesh_Option.py rename to AutomatedTesting/Gem/PythonTests/physics/tests/collider/Collider_PxMeshConvexMeshCollides.py index 7497ae8253..7d8f421d6b 100644 --- a/AutomatedTesting/Gem/PythonTests/physics/collider/C4982803_Enable_PxMesh_Option.py +++ b/AutomatedTesting/Gem/PythonTests/physics/tests/collider/Collider_PxMeshConvexMeshCollides.py @@ -27,7 +27,7 @@ class Tests(): # fmt: on -def C4982803_Enable_PxMesh_Option(): +def Collider_PxMeshConvexMeshCollides(): """ Summary: Load level with Entity above ground having PhysX Collider, PhysX Rigid Body and Mesh components. @@ -70,7 +70,7 @@ def C4982803_Enable_PxMesh_Option(): # Constants PHYSICS_ASSET_INDEX = 7 # Hardcoded enum index value for Shape property - MESH_ASSET_PATH = os.path.join("assets", "c4982803_enable_pxmesh_option", "spherebot", "r0-b_body.pxmesh") + MESH_ASSET_PATH = os.path.join("assets", "Physics", "Collider_PxMeshConvexMeshCollides", "spherebot", "r0-b_body.pxmesh") TIMEOUT = 2.0 helper.init_idle() @@ -99,7 +99,7 @@ def C4982803_Enable_PxMesh_Option(): mesh_asset = Asset.find_asset_by_path(MESH_ASSET_PATH) collider_component.set_component_property_value("Shape Configuration|Asset|PhysX Mesh", mesh_asset.id) mesh_asset.id = collider_component.get_component_property_value("Shape Configuration|Asset|PhysX Mesh") - Report.result(Tests.assign_fbx_mesh, mesh_asset.get_path() == MESH_ASSET_PATH.replace(os.sep, "/")) + Report.result(Tests.assign_fbx_mesh, mesh_asset.get_path().lower() == MESH_ASSET_PATH.replace(os.sep, "/").lower()) # 5) Create terrain entity with physx terrain terrain = EditorEntity.create_editor_entity_at([512.0, 512.0, 31.0], "Terrain") @@ -140,4 +140,4 @@ def C4982803_Enable_PxMesh_Option(): if __name__ == "__main__": from editor_python_test_tools.utils import Report - Report.start_test(C4982803_Enable_PxMesh_Option) + Report.start_test(Collider_PxMeshConvexMeshCollides) diff --git a/AutomatedTesting/Gem/PythonTests/physics/collider/C14861498_ConfirmError_NoPxMesh.py b/AutomatedTesting/Gem/PythonTests/physics/tests/collider/Collider_PxMeshErrorIfNoMesh.py similarity index 94% rename from AutomatedTesting/Gem/PythonTests/physics/collider/C14861498_ConfirmError_NoPxMesh.py rename to AutomatedTesting/Gem/PythonTests/physics/tests/collider/Collider_PxMeshErrorIfNoMesh.py index 731f114b8c..fcf1810801 100644 --- a/AutomatedTesting/Gem/PythonTests/physics/collider/C14861498_ConfirmError_NoPxMesh.py +++ b/AutomatedTesting/Gem/PythonTests/physics/tests/collider/Collider_PxMeshErrorIfNoMesh.py @@ -21,7 +21,7 @@ class Tests(): # fmt:on -def C14861498_ConfirmError_NoPxMesh(): +def Collider_PxMeshErrorIfNoMesh(): """ Summary: This test looks for the presence of an error when an entity with a PhysXCollider has no physics mesh, but has its @@ -63,7 +63,7 @@ def C14861498_ConfirmError_NoPxMesh(): 'EditorColliderComponent' in warningInfo.message for warningInfo in warning_tracer.warnings) # 1) Load level / enter game mode - helper.open_level("Physics", "C14861498_ConfirmError_NoPxMesh") + helper.open_level("Physics", "Collider_PxMeshErrorIfNoMesh") helper.enter_game_mode(Tests.enter_game_mode) # 2) Find game entity @@ -81,4 +81,4 @@ def C14861498_ConfirmError_NoPxMesh(): if __name__ == "__main__": from editor_python_test_tools.utils import Report - Report.start_test(C14861498_ConfirmError_NoPxMesh) + Report.start_test(Collider_PxMeshErrorIfNoMesh) diff --git a/AutomatedTesting/Gem/PythonTests/physics/collider/C14861504_RenderMeshAsset_WithNoPxAsset.py b/AutomatedTesting/Gem/PythonTests/physics/tests/collider/Collider_PxMeshNotAutoAssignedWhenNoPhysicsFbx.py similarity index 93% rename from AutomatedTesting/Gem/PythonTests/physics/collider/C14861504_RenderMeshAsset_WithNoPxAsset.py rename to AutomatedTesting/Gem/PythonTests/physics/tests/collider/Collider_PxMeshNotAutoAssignedWhenNoPhysicsFbx.py index 1a63f478fd..780c5439dd 100644 --- a/AutomatedTesting/Gem/PythonTests/physics/collider/C14861504_RenderMeshAsset_WithNoPxAsset.py +++ b/AutomatedTesting/Gem/PythonTests/physics/tests/collider/Collider_PxMeshNotAutoAssignedWhenNoPhysicsFbx.py @@ -22,7 +22,7 @@ class Tests(): # fmt: on -def C14861504_RenderMeshAsset_WithNoPxAsset(): +def Collider_PxMeshNotAutoAssignedWhenNoPhysicsFbx(): """ Summary: Create entity with Mesh component and assign a render mesh that has no physics asset to the Mesh component. @@ -63,7 +63,7 @@ def C14861504_RenderMeshAsset_WithNoPxAsset(): import azlmbr.asset as azasset # Asset paths - STATIC_MESH = os.path.join("assets", "c14861504_rendermeshasset_withnopxasset", "test_asset.azmodel") + STATIC_MESH = os.path.join("assets", "Physics", "Collider_PxMeshNotAutoAssignedWhenNoPhysicsFbx", "test_asset.azmodel") helper.init_idle() # 1) Load the empty level @@ -81,7 +81,7 @@ def C14861504_RenderMeshAsset_WithNoPxAsset(): mesh_asset = Asset.find_asset_by_path(STATIC_MESH) mesh_component.set_component_property_value("Controller|Configuration|Mesh Asset", mesh_asset.id) mesh_asset.id = mesh_component.get_component_property_value("Controller|Configuration|Mesh Asset") - Report.result(Tests.assign_mesh_asset, mesh_asset.get_path() == STATIC_MESH.replace(os.sep, "/")) + Report.result(Tests.assign_mesh_asset, mesh_asset.get_path().lower() == STATIC_MESH.replace(os.sep, "/").lower()) # 5) Add PhysX Collider component test_component = test_entity.add_component("PhysX Collider") @@ -101,4 +101,4 @@ def C14861504_RenderMeshAsset_WithNoPxAsset(): if __name__ == "__main__": from editor_python_test_tools.utils import Report - Report.start_test(C14861504_RenderMeshAsset_WithNoPxAsset) + Report.start_test(Collider_PxMeshNotAutoAssignedWhenNoPhysicsFbx) diff --git a/AutomatedTesting/Gem/PythonTests/physics/collider/C4976243_Collision_SameCollisionGroupDiffCollisionLayers.py b/AutomatedTesting/Gem/PythonTests/physics/tests/collider/Collider_SameCollisionGroupDiffLayersCollide.py similarity index 95% rename from AutomatedTesting/Gem/PythonTests/physics/collider/C4976243_Collision_SameCollisionGroupDiffCollisionLayers.py rename to AutomatedTesting/Gem/PythonTests/physics/tests/collider/Collider_SameCollisionGroupDiffLayersCollide.py index 893d0d06f6..03636ac279 100644 --- a/AutomatedTesting/Gem/PythonTests/physics/collider/C4976243_Collision_SameCollisionGroupDiffCollisionLayers.py +++ b/AutomatedTesting/Gem/PythonTests/physics/tests/collider/Collider_SameCollisionGroupDiffLayersCollide.py @@ -25,7 +25,7 @@ class Tests(): # fmt: on -def C4976243_Collision_SameCollisionGroupDiffCollisionLayers(): +def Collider_SameCollisionGroupDiffLayersCollide(): """ Summary: @@ -78,7 +78,7 @@ def C4976243_Collision_SameCollisionGroupDiffCollisionLayers(): helper.init_idle() # 1) Open level - helper.open_level("Physics", "C4976243_Collision_SameCollisionGroupDiffCollisionLayers") + helper.open_level("Physics", "Collider_SameCollisionGroupDiffLayersCollide") # 2) Enter game mode helper.enter_game_mode(Tests.enter_game_mode) @@ -123,4 +123,4 @@ def C4976243_Collision_SameCollisionGroupDiffCollisionLayers(): if __name__ == "__main__": from editor_python_test_tools.utils import Report - Report.start_test(C4976243_Collision_SameCollisionGroupDiffCollisionLayers) + Report.start_test(Collider_SameCollisionGroupDiffLayersCollide) diff --git a/AutomatedTesting/Gem/PythonTests/physics/collider/C4976244_Collider_SameGroupSameLayerCollision.py b/AutomatedTesting/Gem/PythonTests/physics/tests/collider/Collider_SameCollisionGroupSameCustomLayerCollide.py similarity index 97% rename from AutomatedTesting/Gem/PythonTests/physics/collider/C4976244_Collider_SameGroupSameLayerCollision.py rename to AutomatedTesting/Gem/PythonTests/physics/tests/collider/Collider_SameCollisionGroupSameCustomLayerCollide.py index 44ea29de76..2e40c0b557 100644 --- a/AutomatedTesting/Gem/PythonTests/physics/collider/C4976244_Collider_SameGroupSameLayerCollision.py +++ b/AutomatedTesting/Gem/PythonTests/physics/tests/collider/Collider_SameCollisionGroupSameCustomLayerCollide.py @@ -26,7 +26,7 @@ class Tests: # fmt: on -def C4976244_Collider_SameGroupSameLayerCollision(): +def Collider_SameCollisionGroupSameCustomLayerCollide(): # type: () -> None """ Summary: @@ -127,7 +127,7 @@ def C4976244_Collider_SameGroupSameLayerCollision(): # Main Script # 1) Load the level helper.init_idle() - helper.open_level("physics", "C4976244_Collider_SameGroupSameLayerCollision") + helper.open_level("physics", "Collider_SameCollisionGroupSameCustomLayerCollide") # 2) Enter Game Mode helper.enter_game_mode(Tests.enter_game_mode) @@ -181,4 +181,4 @@ def C4976244_Collider_SameGroupSameLayerCollision(): if __name__ == "__main__": from editor_python_test_tools.utils import Report - Report.start_test(C4976244_Collider_SameGroupSameLayerCollision) + Report.start_test(Collider_SameCollisionGroupSameCustomLayerCollide) diff --git a/AutomatedTesting/Gem/PythonTests/physics/collider/C4976242_Collision_SameCollisionlayerSameCollisiongroup.py b/AutomatedTesting/Gem/PythonTests/physics/tests/collider/Collider_SameCollisionGroupSameLayerCollide.py similarity index 97% rename from AutomatedTesting/Gem/PythonTests/physics/collider/C4976242_Collision_SameCollisionlayerSameCollisiongroup.py rename to AutomatedTesting/Gem/PythonTests/physics/tests/collider/Collider_SameCollisionGroupSameLayerCollide.py index 86ef5b6ed4..34a7309fb5 100644 --- a/AutomatedTesting/Gem/PythonTests/physics/collider/C4976242_Collision_SameCollisionlayerSameCollisiongroup.py +++ b/AutomatedTesting/Gem/PythonTests/physics/tests/collider/Collider_SameCollisionGroupSameLayerCollide.py @@ -26,7 +26,7 @@ class Tests(): # fmt: on -def C4976242_Collision_SameCollisionlayerSameCollisiongroup(): +def Collider_SameCollisionGroupSameLayerCollide(): """ Summary: @@ -77,7 +77,7 @@ def C4976242_Collision_SameCollisionlayerSameCollisiongroup(): helper.init_idle() # 1) Open level and Enter game mode - helper.open_level("Physics", "C4976242_Collision_SameCollisionlayerSameCollisiongroup") + helper.open_level("Physics", "Collider_SameCollisionGroupSameLayerCollide") helper.enter_game_mode(Tests.enter_game_mode) # 2) Retrieve and validate Entities @@ -184,4 +184,4 @@ def C4976242_Collision_SameCollisionlayerSameCollisiongroup(): if __name__ == "__main__": from editor_python_test_tools.utils import Report - Report.start_test(C4976242_Collision_SameCollisionlayerSameCollisiongroup) + Report.start_test(Collider_SameCollisionGroupSameLayerCollide) diff --git a/AutomatedTesting/Gem/PythonTests/physics/collider/C4982800_PhysXColliderShape_CanBeSelected.py b/AutomatedTesting/Gem/PythonTests/physics/tests/collider/Collider_SphereShapeEditting.py similarity index 96% rename from AutomatedTesting/Gem/PythonTests/physics/collider/C4982800_PhysXColliderShape_CanBeSelected.py rename to AutomatedTesting/Gem/PythonTests/physics/tests/collider/Collider_SphereShapeEditting.py index 0f1b9c6070..bffd041d92 100644 --- a/AutomatedTesting/Gem/PythonTests/physics/collider/C4982800_PhysXColliderShape_CanBeSelected.py +++ b/AutomatedTesting/Gem/PythonTests/physics/tests/collider/Collider_SphereShapeEditting.py @@ -19,7 +19,7 @@ class Tests(): # fmt: on -def C4982800_PhysXColliderShape_CanBeSelected(): +def Collider_SphereShapeEditting(): """ Summary: Adding PhysX Collider and Shape components to test entity, then attempting to modify the shape's dimensions @@ -90,4 +90,4 @@ def C4982800_PhysXColliderShape_CanBeSelected(): if __name__ == "__main__": from editor_python_test_tools.utils import Report - Report.start_test(C4982800_PhysXColliderShape_CanBeSelected) + Report.start_test(Collider_SphereShapeEditting) diff --git a/AutomatedTesting/Gem/PythonTests/physics/collider/C4982595_Collider_TriggerDisablesCollision.py b/AutomatedTesting/Gem/PythonTests/physics/tests/collider/Collider_TriggerPassThrough.py similarity index 98% rename from AutomatedTesting/Gem/PythonTests/physics/collider/C4982595_Collider_TriggerDisablesCollision.py rename to AutomatedTesting/Gem/PythonTests/physics/tests/collider/Collider_TriggerPassThrough.py index d3b0faa6d4..3953db6d34 100644 --- a/AutomatedTesting/Gem/PythonTests/physics/collider/C4982595_Collider_TriggerDisablesCollision.py +++ b/AutomatedTesting/Gem/PythonTests/physics/tests/collider/Collider_TriggerPassThrough.py @@ -30,7 +30,7 @@ class Tests: # fmt: on -def C4982595_Collider_TriggerDisablesCollision(): +def Collider_TriggerPassThrough(): """ Summary: This script runs an automated test to verify that when an entity's PhysX collider is set as a trigger, the entity no @@ -184,7 +184,7 @@ def C4982595_Collider_TriggerDisablesCollision(): # 1) Open level and enter game mode helper.init_idle() - helper.open_level("Physics", "C4982595_Collider_TriggerDisablesCollision") + helper.open_level("Physics", "Collider_TriggerPassThrough") helper.enter_game_mode(Tests.enter_game_mode) # 2) Retrieve and validate entities @@ -230,4 +230,4 @@ def C4982595_Collider_TriggerDisablesCollision(): if __name__ == "__main__": from editor_python_test_tools.utils import Report - Report.start_test(C4982595_Collider_TriggerDisablesCollision) + Report.start_test(Collider_TriggerPassThrough) diff --git a/AutomatedTesting/Gem/PythonTests/physics/force_region/C5959760_PhysXForceRegion_PointForceExertion.py b/AutomatedTesting/Gem/PythonTests/physics/tests/force_region/ForceRegion_CapsuleShapedForce.py similarity index 97% rename from AutomatedTesting/Gem/PythonTests/physics/force_region/C5959760_PhysXForceRegion_PointForceExertion.py rename to AutomatedTesting/Gem/PythonTests/physics/tests/force_region/ForceRegion_CapsuleShapedForce.py index 6648b41d31..a69a019a1c 100644 --- a/AutomatedTesting/Gem/PythonTests/physics/force_region/C5959760_PhysXForceRegion_PointForceExertion.py +++ b/AutomatedTesting/Gem/PythonTests/physics/tests/force_region/ForceRegion_CapsuleShapedForce.py @@ -30,7 +30,7 @@ class Tests: # fmt: on -def C5959760_PhysXForceRegion_PointForceExertion(): +def ForceRegion_CapsuleShapedForce(): # type: () -> None """ Summary: @@ -121,7 +121,7 @@ def C5959760_PhysXForceRegion_PointForceExertion(): # 1) Open level / Enter game mode helper.init_idle() - helper.open_level("Physics", "C5959760_PhysXForceRegion_PointForceExertion") + helper.open_level("Physics", "ForceRegion_CapsuleShapedForce") helper.enter_game_mode(Tests.enter_game_mode) # 2) Retrieve entities @@ -219,4 +219,4 @@ def C5959760_PhysXForceRegion_PointForceExertion(): if __name__ == "__main__": from editor_python_test_tools.utils import Report - Report.start_test(C5959760_PhysXForceRegion_PointForceExertion) + Report.start_test(ForceRegion_CapsuleShapedForce) diff --git a/AutomatedTesting/Gem/PythonTests/physics/force_region/C12868578_ForceRegion_DirectionHasNoAffectOnMagnitude.py b/AutomatedTesting/Gem/PythonTests/physics/tests/force_region/ForceRegion_DirectionHasNoAffectOnTotalForce.py similarity index 98% rename from AutomatedTesting/Gem/PythonTests/physics/force_region/C12868578_ForceRegion_DirectionHasNoAffectOnMagnitude.py rename to AutomatedTesting/Gem/PythonTests/physics/tests/force_region/ForceRegion_DirectionHasNoAffectOnTotalForce.py index 11488b14c2..e1a694ca8c 100644 --- a/AutomatedTesting/Gem/PythonTests/physics/force_region/C12868578_ForceRegion_DirectionHasNoAffectOnMagnitude.py +++ b/AutomatedTesting/Gem/PythonTests/physics/tests/force_region/ForceRegion_DirectionHasNoAffectOnTotalForce.py @@ -50,7 +50,7 @@ class Tests: # fmt: on -def C12868578_ForceRegion_DirectionHasNoAffectOnMagnitude(): +def ForceRegion_DirectionHasNoAffectOnTotalForce(): """ Summary: Check that world and local space force direction should not affect magnitude of force exerted on entity. @@ -219,7 +219,7 @@ def C12868578_ForceRegion_DirectionHasNoAffectOnMagnitude(): # Main Script helper.init_idle() # 1) Open Level - helper.open_level("Physics", "C12868578_ForceRegion_DirectionHasNoAffectOnMagnitude") + helper.open_level("Physics", "ForceRegion_DirectionHasNoAffectOnTotalForce") # 2) Enter Game Mode helper.enter_game_mode(Tests.enter_game_mode) @@ -279,4 +279,4 @@ def C12868578_ForceRegion_DirectionHasNoAffectOnMagnitude(): if __name__ == "__main__": from editor_python_test_tools.utils import Report - Report.start_test(C12868578_ForceRegion_DirectionHasNoAffectOnMagnitude) + Report.start_test(ForceRegion_DirectionHasNoAffectOnTotalForce) diff --git a/AutomatedTesting/Gem/PythonTests/physics/force_region/C6321601_Force_HighValuesDirectionAxes.py b/AutomatedTesting/Gem/PythonTests/physics/tests/force_region/ForceRegion_HighValuesDirectionAxesWorkWithNoError.py similarity index 98% rename from AutomatedTesting/Gem/PythonTests/physics/force_region/C6321601_Force_HighValuesDirectionAxes.py rename to AutomatedTesting/Gem/PythonTests/physics/tests/force_region/ForceRegion_HighValuesDirectionAxesWorkWithNoError.py index 47cc085479..11e091cba0 100644 --- a/AutomatedTesting/Gem/PythonTests/physics/force_region/C6321601_Force_HighValuesDirectionAxes.py +++ b/AutomatedTesting/Gem/PythonTests/physics/tests/force_region/ForceRegion_HighValuesDirectionAxesWorkWithNoError.py @@ -37,7 +37,7 @@ class Tests(): # fmt: on -def C6321601_Force_HighValuesDirectionAxes(): +def ForceRegion_HighValuesDirectionAxesWorkWithNoError(): """ Summary: @@ -204,7 +204,7 @@ def C6321601_Force_HighValuesDirectionAxes(): return entity_error_tracer.has_errors # 1) Open level - helper.open_level("Physics", "C6321601_Force_HighValuesDirectionAxes") + helper.open_level("Physics", "ForceRegion_HighValuesDirectionAxesWorkWithNoError") # 2) Enter game mode helper.enter_game_mode(Tests.enter_game_mode) @@ -243,4 +243,4 @@ def C6321601_Force_HighValuesDirectionAxes(): if __name__ == "__main__": from editor_python_test_tools.utils import Report - Report.start_test(C6321601_Force_HighValuesDirectionAxes) + Report.start_test(ForceRegion_HighValuesDirectionAxesWorkWithNoError) diff --git a/AutomatedTesting/Gem/PythonTests/physics/force_region/C5959763_ForceRegion_ForceRegionImpulsesCube.py b/AutomatedTesting/Gem/PythonTests/physics/tests/force_region/ForceRegion_ImpulsesBoxShapedRigidBody.py similarity index 96% rename from AutomatedTesting/Gem/PythonTests/physics/force_region/C5959763_ForceRegion_ForceRegionImpulsesCube.py rename to AutomatedTesting/Gem/PythonTests/physics/tests/force_region/ForceRegion_ImpulsesBoxShapedRigidBody.py index 8bea169a82..24cb2bbc1c 100644 --- a/AutomatedTesting/Gem/PythonTests/physics/force_region/C5959763_ForceRegion_ForceRegionImpulsesCube.py +++ b/AutomatedTesting/Gem/PythonTests/physics/tests/force_region/ForceRegion_ImpulsesBoxShapedRigidBody.py @@ -24,7 +24,7 @@ class Tests: # fmt: on -def C5959763_ForceRegion_ForceRegionImpulsesCube(): +def ForceRegion_ImpulsesBoxShapedRigidBody(): """ This run() function will open a a level and validate that a Cube gets impulsed by a force region. It does this by: @@ -42,8 +42,6 @@ def C5959763_ForceRegion_ForceRegionImpulsesCube(): # Setup path import os, sys - - from editor_python_test_tools.utils import Report from editor_python_test_tools.utils import TestHelper as helper import azlmbr.legacy.general as general @@ -80,7 +78,7 @@ def C5959763_ForceRegion_ForceRegionImpulsesCube(): UPWARD_Z_VECTOR = 1.0 # Open level - helper.open_level("Physics", "C5959763_ForceRegion_ForceRegionImpulsesCube") + helper.open_level("Physics", "ForceRegion_ImpulsesBoxShapedRigidBody") # Enter game mode helper.enter_game_mode(Tests.enter_game_mode) @@ -164,4 +162,4 @@ def C5959763_ForceRegion_ForceRegionImpulsesCube(): if __name__ == "__main__": from editor_python_test_tools.utils import Report - Report.start_test(C5959763_ForceRegion_ForceRegionImpulsesCube) + Report.start_test(ForceRegion_ImpulsesBoxShapedRigidBody) diff --git a/AutomatedTesting/Gem/PythonTests/physics/force_region/C5959764_ForceRegion_ForceRegionImpulsesCapsule.py b/AutomatedTesting/Gem/PythonTests/physics/tests/force_region/ForceRegion_ImpulsesCapsuleShapedRigidBody.py similarity index 96% rename from AutomatedTesting/Gem/PythonTests/physics/force_region/C5959764_ForceRegion_ForceRegionImpulsesCapsule.py rename to AutomatedTesting/Gem/PythonTests/physics/tests/force_region/ForceRegion_ImpulsesCapsuleShapedRigidBody.py index 4ce345a5eb..d9f586c647 100644 --- a/AutomatedTesting/Gem/PythonTests/physics/force_region/C5959764_ForceRegion_ForceRegionImpulsesCapsule.py +++ b/AutomatedTesting/Gem/PythonTests/physics/tests/force_region/ForceRegion_ImpulsesCapsuleShapedRigidBody.py @@ -24,7 +24,7 @@ class Tests: # fmt: on -def C5959764_ForceRegion_ForceRegionImpulsesCapsule(): +def ForceRegion_ImpulsesCapsuleShapedRigidBody(): """ This run() function will open a a level and validate that a Capsule gets impulsed by a force region. It does this by: @@ -80,7 +80,7 @@ def C5959764_ForceRegion_ForceRegionImpulsesCapsule(): UPWARD_Z_VECTOR = 1.0 # Open level - helper.open_level("Physics", "C5959764_ForceRegion_ForceRegionImpulsesCapsule") + helper.open_level("Physics", "ForceRegion_ImpulsesCapsuleShapedRigidBody") # Enter game mode helper.enter_game_mode(Tests.enter_game_mode) @@ -166,4 +166,4 @@ def C5959764_ForceRegion_ForceRegionImpulsesCapsule(): if __name__ == "__main__": from editor_python_test_tools.utils import Report - Report.start_test(C5959764_ForceRegion_ForceRegionImpulsesCapsule) + Report.start_test(ForceRegion_ImpulsesCapsuleShapedRigidBody) diff --git a/AutomatedTesting/Gem/PythonTests/physics/force_region/C5959765_ForceRegion_AssetGetsImpulsed.py b/AutomatedTesting/Gem/PythonTests/physics/tests/force_region/ForceRegion_ImpulsesPxMeshShapedRigidBody.py similarity index 97% rename from AutomatedTesting/Gem/PythonTests/physics/force_region/C5959765_ForceRegion_AssetGetsImpulsed.py rename to AutomatedTesting/Gem/PythonTests/physics/tests/force_region/ForceRegion_ImpulsesPxMeshShapedRigidBody.py index 36ecddb3ca..4bd953cdf3 100644 --- a/AutomatedTesting/Gem/PythonTests/physics/force_region/C5959765_ForceRegion_AssetGetsImpulsed.py +++ b/AutomatedTesting/Gem/PythonTests/physics/tests/force_region/ForceRegion_ImpulsesPxMeshShapedRigidBody.py @@ -23,7 +23,7 @@ class Tests: tests_completed = ("Tests completed", "Tests did not complete") # fmt: on -def C5959765_ForceRegion_AssetGetsImpulsed(): +def ForceRegion_ImpulsesPxMeshShapedRigidBody(): """ # This run() function will open a a level and validate that a asset gets impulsed by a force region. # It does this by: @@ -83,7 +83,7 @@ def C5959765_ForceRegion_AssetGetsImpulsed(): UPWARD_Z_VECTOR = 1.0 # 1) Open level - helper.open_level("Physics", "C5959765_ForceRegion_AssetGetsImpulsed") + helper.open_level("Physics", "ForceRegion_ImpulsesPxMeshShapedRigidBody") # 2) Enters Game mode helper.enter_game_mode(Tests.enter_game_mode) @@ -168,4 +168,4 @@ def C5959765_ForceRegion_AssetGetsImpulsed(): if __name__ == "__main__": from editor_python_test_tools.utils import Report - Report.start_test(C5959765_ForceRegion_AssetGetsImpulsed) + Report.start_test(ForceRegion_ImpulsesPxMeshShapedRigidBody) diff --git a/AutomatedTesting/Gem/PythonTests/physics/force_region/C5932042_PhysXForceRegion_LinearDamping.py b/AutomatedTesting/Gem/PythonTests/physics/tests/force_region/ForceRegion_LinearDampingForceOnRigidBodies.py similarity index 98% rename from AutomatedTesting/Gem/PythonTests/physics/force_region/C5932042_PhysXForceRegion_LinearDamping.py rename to AutomatedTesting/Gem/PythonTests/physics/tests/force_region/ForceRegion_LinearDampingForceOnRigidBodies.py index 5112729cc2..4e3cc4e43d 100644 --- a/AutomatedTesting/Gem/PythonTests/physics/force_region/C5932042_PhysXForceRegion_LinearDamping.py +++ b/AutomatedTesting/Gem/PythonTests/physics/tests/force_region/ForceRegion_LinearDampingForceOnRigidBodies.py @@ -34,7 +34,7 @@ class Tests: # fmt: on -def C5932042_PhysXForceRegion_LinearDamping(): +def ForceRegion_LinearDampingForceOnRigidBodies(): # type: () -> None """ Summary: @@ -131,7 +131,7 @@ def C5932042_PhysXForceRegion_LinearDamping(): # 1) Open level / Enter game mode helper.init_idle() - helper.open_level("Physics", "C5932042_PhysXForceRegion_LinearDamping") + helper.open_level("Physics", "ForceRegion_LinearDampingForceOnRigidBodies") helper.enter_game_mode(Tests.enter_game_mode) # 2) Retrieve and validate entities @@ -265,4 +265,4 @@ def C5932042_PhysXForceRegion_LinearDamping(): if __name__ == "__main__": from editor_python_test_tools.utils import Report - Report.start_test(C5932042_PhysXForceRegion_LinearDamping) + Report.start_test(ForceRegion_LinearDampingForceOnRigidBodies) diff --git a/AutomatedTesting/Gem/PythonTests/physics/force_region/C5932041_PhysXForceRegion_LocalSpaceForceOnRigidBodies.py b/AutomatedTesting/Gem/PythonTests/physics/tests/force_region/ForceRegion_LocalSpaceForceOnRigidBodies.py similarity index 96% rename from AutomatedTesting/Gem/PythonTests/physics/force_region/C5932041_PhysXForceRegion_LocalSpaceForceOnRigidBodies.py rename to AutomatedTesting/Gem/PythonTests/physics/tests/force_region/ForceRegion_LocalSpaceForceOnRigidBodies.py index 15c77ba17e..66605a033d 100644 --- a/AutomatedTesting/Gem/PythonTests/physics/force_region/C5932041_PhysXForceRegion_LocalSpaceForceOnRigidBodies.py +++ b/AutomatedTesting/Gem/PythonTests/physics/tests/force_region/ForceRegion_LocalSpaceForceOnRigidBodies.py @@ -30,7 +30,7 @@ class Tests: # fmt: on -def C5932041_PhysXForceRegion_LocalSpaceForceOnRigidBodies(): +def ForceRegion_LocalSpaceForceOnRigidBodies(): """ Summary: Runs an automated test to ensure that when a rigid body enters a force region a local space force is exerted. @@ -80,7 +80,7 @@ def C5932041_PhysXForceRegion_LocalSpaceForceOnRigidBodies(): helper.init_idle() # 1) Open level - helper.open_level("Physics", "C5932041_PhysXForceRegion_LocalSpaceForceOnRigidBodies") + helper.open_level("Physics", "ForceRegion_LocalSpaceForceOnRigidBodies") # 2) Enter game mode helper.enter_game_mode(Tests.enter_game_mode) @@ -157,4 +157,4 @@ def C5932041_PhysXForceRegion_LocalSpaceForceOnRigidBodies(): if __name__ == "__main__": from editor_python_test_tools.utils import Report - Report.start_test(C5932041_PhysXForceRegion_LocalSpaceForceOnRigidBodies) + Report.start_test(ForceRegion_LocalSpaceForceOnRigidBodies) diff --git a/AutomatedTesting/Gem/PythonTests/physics/force_region/C5968760_ForceRegion_CheckNetForceChange.py b/AutomatedTesting/Gem/PythonTests/physics/tests/force_region/ForceRegion_MovingForceRegionChangesNetForce.py similarity index 96% rename from AutomatedTesting/Gem/PythonTests/physics/force_region/C5968760_ForceRegion_CheckNetForceChange.py rename to AutomatedTesting/Gem/PythonTests/physics/tests/force_region/ForceRegion_MovingForceRegionChangesNetForce.py index d64a0564f4..9eefa61d90 100644 --- a/AutomatedTesting/Gem/PythonTests/physics/force_region/C5968760_ForceRegion_CheckNetForceChange.py +++ b/AutomatedTesting/Gem/PythonTests/physics/tests/force_region/ForceRegion_MovingForceRegionChangesNetForce.py @@ -22,7 +22,7 @@ class Tests(): # fmt: on -def C5968760_ForceRegion_CheckNetForceChange(): +def ForceRegion_MovingForceRegionChangesNetForce(): """ Summary: @@ -96,7 +96,7 @@ def C5968760_ForceRegion_CheckNetForceChange(): helper.init_idle() # 1) Open level - helper.open_level("Physics", "C5968760_ForceRegion_CheckNetForceChange") + helper.open_level("Physics", "ForceRegion_MovingForceRegionChangesNetForce") # 2) Enter game mode helper.enter_game_mode(Tests.enter_game_mode) @@ -159,4 +159,4 @@ def C5968760_ForceRegion_CheckNetForceChange(): if __name__ == "__main__": from editor_python_test_tools.utils import Report - Report.start_test(C5968760_ForceRegion_CheckNetForceChange) + Report.start_test(ForceRegion_MovingForceRegionChangesNetForce) diff --git a/AutomatedTesting/Gem/PythonTests/physics/force_region/C5968759_ForceRegion_ExertsSeveralForcesOnRigidBody.py b/AutomatedTesting/Gem/PythonTests/physics/tests/force_region/ForceRegion_MultipleComponentsCombineForces.py similarity index 97% rename from AutomatedTesting/Gem/PythonTests/physics/force_region/C5968759_ForceRegion_ExertsSeveralForcesOnRigidBody.py rename to AutomatedTesting/Gem/PythonTests/physics/tests/force_region/ForceRegion_MultipleComponentsCombineForces.py index b1f8d27900..4f1af460d4 100644 --- a/AutomatedTesting/Gem/PythonTests/physics/force_region/C5968759_ForceRegion_ExertsSeveralForcesOnRigidBody.py +++ b/AutomatedTesting/Gem/PythonTests/physics/tests/force_region/ForceRegion_MultipleComponentsCombineForces.py @@ -32,7 +32,7 @@ class Tests: import os, sys -def C5968759_ForceRegion_ExertsSeveralForcesOnRigidBody(): +def ForceRegion_MultipleComponentsCombineForces(): """ Run() will open a a level and validate that the spheres are affected by the force regions as expected. @@ -92,7 +92,7 @@ def C5968759_ForceRegion_ExertsSeveralForcesOnRigidBody(): # 1) Opens level with spheres above a force region helper.init_idle() - helper.open_level("Physics", "C5968759_ForceRegion_ExertsSeveralForcesOnRigidBody") + helper.open_level("Physics", "ForceRegion_MultipleComponentsCombineForces") helper.enter_game_mode(Tests.enter_game_mode) # 2) Finds the entities in the scene @@ -174,4 +174,4 @@ def C5968759_ForceRegion_ExertsSeveralForcesOnRigidBody(): if __name__ == "__main__": from editor_python_test_tools.utils import Report - Report.start_test(C5968759_ForceRegion_ExertsSeveralForcesOnRigidBody) + Report.start_test(ForceRegion_MultipleComponentsCombineForces) diff --git a/AutomatedTesting/Gem/PythonTests/physics/force_region/C5959810_ForceRegion_ForceRegionCombinesForces.py b/AutomatedTesting/Gem/PythonTests/physics/tests/force_region/ForceRegion_MultipleForcesInSameComponentCombineForces.py similarity index 97% rename from AutomatedTesting/Gem/PythonTests/physics/force_region/C5959810_ForceRegion_ForceRegionCombinesForces.py rename to AutomatedTesting/Gem/PythonTests/physics/tests/force_region/ForceRegion_MultipleForcesInSameComponentCombineForces.py index b7660926d5..7307f3a2fb 100644 --- a/AutomatedTesting/Gem/PythonTests/physics/force_region/C5959810_ForceRegion_ForceRegionCombinesForces.py +++ b/AutomatedTesting/Gem/PythonTests/physics/tests/force_region/ForceRegion_MultipleForcesInSameComponentCombineForces.py @@ -31,7 +31,7 @@ class Tests: # fmt: on -def C5959810_ForceRegion_ForceRegionCombinesForces(): +def ForceRegion_MultipleForcesInSameComponentCombineForces(): # type: () -> None """ Summary: Runs an automated test to ensure that separate forces in a force region add correctly @@ -162,7 +162,7 @@ def C5959810_ForceRegion_ForceRegionCombinesForces(): helper.init_idle() # 1) Load Level - helper.open_level("physics", "C5959810_ForceRegion_ForceRegionCombinesForces") + helper.open_level("physics", "ForceRegion_MultipleForcesInSameComponentCombineForces") # 2) Enter Game Mode helper.enter_game_mode(Tests.enter_game_mode) @@ -230,4 +230,4 @@ def C5959810_ForceRegion_ForceRegionCombinesForces(): if __name__ == "__main__": from editor_python_test_tools.utils import Report - Report.start_test(C5959810_ForceRegion_ForceRegionCombinesForces) + Report.start_test(ForceRegion_MultipleForcesInSameComponentCombineForces) diff --git a/AutomatedTesting/Gem/PythonTests/physics/force_region/C15845879_ForceRegion_HighLinearDampingForce.py b/AutomatedTesting/Gem/PythonTests/physics/tests/force_region/ForceRegion_NoQuiverOnHighLinearDampingForce.py similarity index 97% rename from AutomatedTesting/Gem/PythonTests/physics/force_region/C15845879_ForceRegion_HighLinearDampingForce.py rename to AutomatedTesting/Gem/PythonTests/physics/tests/force_region/ForceRegion_NoQuiverOnHighLinearDampingForce.py index d4807476c2..4cf7f0f8e7 100644 --- a/AutomatedTesting/Gem/PythonTests/physics/force_region/C15845879_ForceRegion_HighLinearDampingForce.py +++ b/AutomatedTesting/Gem/PythonTests/physics/tests/force_region/ForceRegion_NoQuiverOnHighLinearDampingForce.py @@ -24,7 +24,7 @@ class Tests: # fmt: on -def C15845879_ForceRegion_HighLinearDampingForce(): +def ForceRegion_NoQuiverOnHighLinearDampingForce(): """ Summary: Check that linear damping with high values do not make the object to quiver @@ -126,7 +126,7 @@ def C15845879_ForceRegion_HighLinearDampingForce(): # Main Script helper.init_idle() # 1) Open Level - helper.open_level("Physics", "C15845879_ForceRegion_HighLinearDampingForce") + helper.open_level("Physics", "ForceRegion_NoQuiverOnHighLinearDampingForce") # 2) Enter Game Mode helper.enter_game_mode(Tests.enter_game_mode) @@ -165,4 +165,4 @@ def C15845879_ForceRegion_HighLinearDampingForce(): if __name__ == "__main__": from editor_python_test_tools.utils import Report - Report.start_test(C15845879_ForceRegion_HighLinearDampingForce) + Report.start_test(ForceRegion_NoQuiverOnHighLinearDampingForce) diff --git a/AutomatedTesting/Gem/PythonTests/physics/force_region/C6090547_ForceRegion_ParentChildForceRegions.py b/AutomatedTesting/Gem/PythonTests/physics/tests/force_region/ForceRegion_ParentChildForcesCombineForces.py similarity index 97% rename from AutomatedTesting/Gem/PythonTests/physics/force_region/C6090547_ForceRegion_ParentChildForceRegions.py rename to AutomatedTesting/Gem/PythonTests/physics/tests/force_region/ForceRegion_ParentChildForcesCombineForces.py index f466680e0c..41b07fe471 100644 --- a/AutomatedTesting/Gem/PythonTests/physics/force_region/C6090547_ForceRegion_ParentChildForceRegions.py +++ b/AutomatedTesting/Gem/PythonTests/physics/tests/force_region/ForceRegion_ParentChildForcesCombineForces.py @@ -29,7 +29,7 @@ class Tests(): # fmt: on -def C6090547_ForceRegion_ParentChildForceRegions(): +def ForceRegion_ParentChildForcesCombineForces(): """ Summary: Runs an automated test to ensure that force regions in parent and child entities work together. @@ -89,7 +89,7 @@ def C6090547_ForceRegion_ParentChildForceRegions(): helper.init_idle() # 1) Open level - helper.open_level("Physics", "C6090547_ForceRegion_ParentChildForceRegions") + helper.open_level("Physics", "ForceRegion_ParentChildForcesCombineForces") # 2) Enter game mode helper.enter_game_mode(Tests.enter_game_mode) @@ -195,4 +195,4 @@ def C6090547_ForceRegion_ParentChildForceRegions(): if __name__ == "__main__": from editor_python_test_tools.utils import Report - Report.start_test(C6090547_ForceRegion_ParentChildForceRegions) + Report.start_test(ForceRegion_ParentChildForcesCombineForces) diff --git a/AutomatedTesting/Gem/PythonTests/physics/force_region/C5932044_ForceRegion_PointForceOnRigidBody.py b/AutomatedTesting/Gem/PythonTests/physics/tests/force_region/ForceRegion_PointForceOnRigidBodies.py similarity index 97% rename from AutomatedTesting/Gem/PythonTests/physics/force_region/C5932044_ForceRegion_PointForceOnRigidBody.py rename to AutomatedTesting/Gem/PythonTests/physics/tests/force_region/ForceRegion_PointForceOnRigidBodies.py index 23760909db..d8fbcdb563 100644 --- a/AutomatedTesting/Gem/PythonTests/physics/force_region/C5932044_ForceRegion_PointForceOnRigidBody.py +++ b/AutomatedTesting/Gem/PythonTests/physics/tests/force_region/ForceRegion_PointForceOnRigidBodies.py @@ -27,7 +27,7 @@ class Tests(): # fmt: on -def C5932044_ForceRegion_PointForceOnRigidBody(): +def ForceRegion_PointForceOnRigidBodies(): """ Summary: Runs an automated test to ensure that that a force region exerts point force on rigid bodies @@ -83,7 +83,7 @@ def C5932044_ForceRegion_PointForceOnRigidBody(): helper.init_idle() # 1) Open level - helper.open_level("Physics", "C5932044_PhysX_ForceRegion_PointForceOnRigidBodies") + helper.open_level("Physics", "ForceRegion_PointForceOnRigidBodies") # 2) Enter game mode helper.enter_game_mode(Tests.enter_game_mode) @@ -185,4 +185,4 @@ def C5932044_ForceRegion_PointForceOnRigidBody(): if __name__ == "__main__": from editor_python_test_tools.utils import Report - Report.start_test(C5932044_ForceRegion_PointForceOnRigidBody) + Report.start_test(ForceRegion_PointForceOnRigidBodies) diff --git a/AutomatedTesting/Gem/PythonTests/physics/force_region/C5959808_ForceRegion_PositionOffset.py b/AutomatedTesting/Gem/PythonTests/physics/tests/force_region/ForceRegion_PositionOffset.py similarity index 99% rename from AutomatedTesting/Gem/PythonTests/physics/force_region/C5959808_ForceRegion_PositionOffset.py rename to AutomatedTesting/Gem/PythonTests/physics/tests/force_region/ForceRegion_PositionOffset.py index 480869457c..bc785ecc0a 100644 --- a/AutomatedTesting/Gem/PythonTests/physics/force_region/C5959808_ForceRegion_PositionOffset.py +++ b/AutomatedTesting/Gem/PythonTests/physics/tests/force_region/ForceRegion_PositionOffset.py @@ -88,7 +88,7 @@ class Tests: else: return None -def C5959808_ForceRegion_PositionOffset(): +def ForceRegion_PositionOffset(): """ Summary: Force Region positional offset is tested for each of the 3 axises (X, Y, and Z). Each axis's test has one @@ -363,7 +363,7 @@ def C5959808_ForceRegion_PositionOffset(): # 1) Open level helper.init_idle() - helper.open_level("Physics", "C5959808_ForceRegion_PositionOffset") + helper.open_level("Physics", "ForceRegion_PositionOffset") helper.enter_game_mode(Tests.enter_game_mode) # 2) Variable set up @@ -401,4 +401,4 @@ def C5959808_ForceRegion_PositionOffset(): if __name__ == "__main__": from editor_python_test_tools.utils import Report - Report.start_test(C5959808_ForceRegion_PositionOffset) + Report.start_test(ForceRegion_PositionOffset) diff --git a/AutomatedTesting/Gem/PythonTests/physics/force_region/C5959761_ForceRegion_PhysAssetExertsPointForce.py b/AutomatedTesting/Gem/PythonTests/physics/tests/force_region/ForceRegion_PxMeshShapedForce.py similarity index 95% rename from AutomatedTesting/Gem/PythonTests/physics/force_region/C5959761_ForceRegion_PhysAssetExertsPointForce.py rename to AutomatedTesting/Gem/PythonTests/physics/tests/force_region/ForceRegion_PxMeshShapedForce.py index c77fc39a77..12ef218027 100644 --- a/AutomatedTesting/Gem/PythonTests/physics/force_region/C5959761_ForceRegion_PhysAssetExertsPointForce.py +++ b/AutomatedTesting/Gem/PythonTests/physics/tests/force_region/ForceRegion_PxMeshShapedForce.py @@ -25,7 +25,7 @@ class Tests(): # fmt: on -def C5959761_ForceRegion_PhysAssetExertsPointForce(): +def ForceRegion_PxMeshShapedForce(): """ Summary: Runs an automated test to ensure that PhysX force regions with physics assets exert point force on rigid bodies @@ -85,7 +85,7 @@ def C5959761_ForceRegion_PhysAssetExertsPointForce(): helper.init_idle() # 1) Open level - helper.open_level("Physics", "C5959761_ForceRegion_ExertsPointForce_Sedan") + helper.open_level("Physics", "ForceRegion_PxMeshShapedForce") # 2) Enter game mode helper.enter_game_mode(Tests.enter_game_mode) @@ -135,4 +135,4 @@ def C5959761_ForceRegion_PhysAssetExertsPointForce(): if __name__ == "__main__": from editor_python_test_tools.utils import Report - Report.start_test(C5959761_ForceRegion_PhysAssetExertsPointForce) + Report.start_test(ForceRegion_PxMeshShapedForce) diff --git a/AutomatedTesting/Gem/PythonTests/physics/force_region/C5959809_ForceRegion_RotationalOffset.py b/AutomatedTesting/Gem/PythonTests/physics/tests/force_region/ForceRegion_RotationalOffset.py similarity index 99% rename from AutomatedTesting/Gem/PythonTests/physics/force_region/C5959809_ForceRegion_RotationalOffset.py rename to AutomatedTesting/Gem/PythonTests/physics/tests/force_region/ForceRegion_RotationalOffset.py index d26aebab8d..8c1bbcc8e4 100644 --- a/AutomatedTesting/Gem/PythonTests/physics/force_region/C5959809_ForceRegion_RotationalOffset.py +++ b/AutomatedTesting/Gem/PythonTests/physics/tests/force_region/ForceRegion_RotationalOffset.py @@ -89,7 +89,7 @@ class Tests: return None -def C5959809_ForceRegion_RotationalOffset(): +def ForceRegion_RotationalOffset(): """ Summary: Force Region rotational offset is tested for each of the 3 axises (X, Y, and Z). Each axis's test has one @@ -367,7 +367,7 @@ def C5959809_ForceRegion_RotationalOffset(): # 1) Open level helper.init_idle() - helper.open_level("Physics", "C5959809_ForceRegion_RotationalOffset") + helper.open_level("Physics", "ForceRegion_RotationalOffset") helper.enter_game_mode(Tests.enter_game_mode) # 2) Variable set up @@ -401,4 +401,4 @@ def C5959809_ForceRegion_RotationalOffset(): if __name__ == "__main__": from editor_python_test_tools.utils import Report - Report.start_test(C5959809_ForceRegion_RotationalOffset) + Report.start_test(ForceRegion_RotationalOffset) diff --git a/AutomatedTesting/Gem/PythonTests/physics/force_region/C5932043_ForceRegion_SimpleDragOnRigidBodies.py b/AutomatedTesting/Gem/PythonTests/physics/tests/force_region/ForceRegion_SimpleDragForceOnRigidBodies.py similarity index 96% rename from AutomatedTesting/Gem/PythonTests/physics/force_region/C5932043_ForceRegion_SimpleDragOnRigidBodies.py rename to AutomatedTesting/Gem/PythonTests/physics/tests/force_region/ForceRegion_SimpleDragForceOnRigidBodies.py index cd81315e73..d7ceaa0c6e 100644 --- a/AutomatedTesting/Gem/PythonTests/physics/force_region/C5932043_ForceRegion_SimpleDragOnRigidBodies.py +++ b/AutomatedTesting/Gem/PythonTests/physics/tests/force_region/ForceRegion_SimpleDragForceOnRigidBodies.py @@ -26,7 +26,7 @@ class Tests: # fmt: on -def C5932043_ForceRegion_SimpleDragOnRigidBodies(): +def ForceRegion_SimpleDragForceOnRigidBodies(): # This run() function will open a a level and validate that the force region slows down a spheres fall. # It does this by: # 1) Opens level with sphere above a force region @@ -64,7 +64,7 @@ def C5932043_ForceRegion_SimpleDragOnRigidBodies(): helper.init_idle() # 1) Open level - helper.open_level("Physics", "C5932043_ForceRegion_SimpleDragOnRigidBody") + helper.open_level("Physics", "ForceRegion_SimpleDragForceOnRigidBodies") # 2) Enter game mode helper.enter_game_mode(Tests.enter_game_mode) @@ -138,4 +138,4 @@ def C5932043_ForceRegion_SimpleDragOnRigidBodies(): if __name__ == "__main__": from editor_python_test_tools.utils import Report - Report.start_test(C5932043_ForceRegion_SimpleDragOnRigidBodies) + Report.start_test(ForceRegion_SimpleDragForceOnRigidBodies) diff --git a/AutomatedTesting/Gem/PythonTests/physics/force_region/C6090546_ForceRegion_SliceFileInstantiates.py b/AutomatedTesting/Gem/PythonTests/physics/tests/force_region/ForceRegion_SliceFileInstantiates.py similarity index 96% rename from AutomatedTesting/Gem/PythonTests/physics/force_region/C6090546_ForceRegion_SliceFileInstantiates.py rename to AutomatedTesting/Gem/PythonTests/physics/tests/force_region/ForceRegion_SliceFileInstantiates.py index 0c360edee5..8642464988 100644 --- a/AutomatedTesting/Gem/PythonTests/physics/force_region/C6090546_ForceRegion_SliceFileInstantiates.py +++ b/AutomatedTesting/Gem/PythonTests/physics/tests/force_region/ForceRegion_SliceFileInstantiates.py @@ -22,7 +22,7 @@ class Tests(): # fmt: on -def C6090546_ForceRegion_SliceFileInstantiates(): +def ForceRegion_SliceFileInstantiates(): """ Summary: @@ -95,7 +95,7 @@ def C6090546_ForceRegion_SliceFileInstantiates(): helper.init_idle() # 1) Open level - helper.open_level("Physics", "C6090546_ForceRegion_SliceFileInstantiates") + helper.open_level("Physics", "ForceRegion_SliceFileInstantiates") # 2) Enter game mode helper.enter_game_mode(Tests.enter_game_mode) @@ -134,4 +134,4 @@ def C6090546_ForceRegion_SliceFileInstantiates(): if __name__ == "__main__": from editor_python_test_tools.utils import Report - Report.start_test(C6090546_ForceRegion_SliceFileInstantiates) + Report.start_test(ForceRegion_SliceFileInstantiates) diff --git a/AutomatedTesting/Gem/PythonTests/physics/force_region/C12905527_ForceRegion_MagnitudeDeviation.py b/AutomatedTesting/Gem/PythonTests/physics/tests/force_region/ForceRegion_SmallMagnitudeDeviationOnLargeForces.py similarity index 96% rename from AutomatedTesting/Gem/PythonTests/physics/force_region/C12905527_ForceRegion_MagnitudeDeviation.py rename to AutomatedTesting/Gem/PythonTests/physics/tests/force_region/ForceRegion_SmallMagnitudeDeviationOnLargeForces.py index c9d411b873..bb33a2306e 100644 --- a/AutomatedTesting/Gem/PythonTests/physics/force_region/C12905527_ForceRegion_MagnitudeDeviation.py +++ b/AutomatedTesting/Gem/PythonTests/physics/tests/force_region/ForceRegion_SmallMagnitudeDeviationOnLargeForces.py @@ -21,7 +21,7 @@ class Tests(): # fmt: on -def C12905527_ForceRegion_MagnitudeDeviation(): +def ForceRegion_SmallMagnitudeDeviationOnLargeForces(): """ Summary: Runs an automated test to ensure that the calculated net force magnitude is close to the configured value @@ -93,7 +93,7 @@ def C12905527_ForceRegion_MagnitudeDeviation(): helper.init_idle() # 1) Open level Report.info(general.get_current_level_name()) - helper.open_level("Physics", "C12905527_ForceRegion_MagnitudeDeviation") + helper.open_level("Physics", "ForceRegion_SmallMagnitudeDeviationOnLargeForces") # 2) Enter game mode helper.enter_game_mode(Tests.enter_game_mode) @@ -139,4 +139,4 @@ def C12905527_ForceRegion_MagnitudeDeviation(): if __name__ == "__main__": from editor_python_test_tools.utils import Report - Report.start_test(C12905527_ForceRegion_MagnitudeDeviation) + Report.start_test(ForceRegion_SmallMagnitudeDeviationOnLargeForces) diff --git a/AutomatedTesting/Gem/PythonTests/physics/force_region/C5959759_RigidBody_ForceRegionSpherePointForce.py b/AutomatedTesting/Gem/PythonTests/physics/tests/force_region/ForceRegion_SphereShapedForce.py similarity index 96% rename from AutomatedTesting/Gem/PythonTests/physics/force_region/C5959759_RigidBody_ForceRegionSpherePointForce.py rename to AutomatedTesting/Gem/PythonTests/physics/tests/force_region/ForceRegion_SphereShapedForce.py index 99baeb1fff..f4fbbbfc9b 100644 --- a/AutomatedTesting/Gem/PythonTests/physics/force_region/C5959759_RigidBody_ForceRegionSpherePointForce.py +++ b/AutomatedTesting/Gem/PythonTests/physics/tests/force_region/ForceRegion_SphereShapedForce.py @@ -27,7 +27,7 @@ class Tests: # fmt: on -def C5959759_RigidBody_ForceRegionSpherePointForce(): +def ForceRegion_SphereShapedForce(): """ Level Setup The level consists of a sherical force region with a point force of 1000. @@ -50,7 +50,7 @@ def C5959759_RigidBody_ForceRegionSpherePointForce(): # 1) Open level and enter game mode helper.init_idle() - helper.open_level("Physics", "C5959759_RigidBody_ForceRegionSpherePointForce") + helper.open_level("Physics", "ForceRegion_SphereShapedForce") helper.enter_game_mode(Tests.enter_game_mode) # 2) Retrieve entities @@ -146,4 +146,4 @@ def C5959759_RigidBody_ForceRegionSpherePointForce(): if __name__ == "__main__": from editor_python_test_tools.utils import Report - Report.start_test(C5959759_RigidBody_ForceRegionSpherePointForce) + Report.start_test(ForceRegion_SphereShapedForce) diff --git a/AutomatedTesting/Gem/PythonTests/physics/force_region/C5932045_ForceRegion_Spline.py b/AutomatedTesting/Gem/PythonTests/physics/tests/force_region/ForceRegion_SplineForceOnRigidBodies.py similarity index 97% rename from AutomatedTesting/Gem/PythonTests/physics/force_region/C5932045_ForceRegion_Spline.py rename to AutomatedTesting/Gem/PythonTests/physics/tests/force_region/ForceRegion_SplineForceOnRigidBodies.py index e74f5cc6e0..158ba8473c 100644 --- a/AutomatedTesting/Gem/PythonTests/physics/force_region/C5932045_ForceRegion_Spline.py +++ b/AutomatedTesting/Gem/PythonTests/physics/tests/force_region/ForceRegion_SplineForceOnRigidBodies.py @@ -30,7 +30,7 @@ class Tests(): # fmt: on -def C5932045_ForceRegion_Spline(): +def ForceRegion_SplineForceOnRigidBodies(): """ Summary: Runs an automated test to ensure that a PhysX force region exerts spline follow force on rigid bodies @@ -117,7 +117,7 @@ def C5932045_ForceRegion_Spline(): helper.init_idle() # 1) Open level - helper.open_level("Physics", "C5932045_ForceRegion_Spline") + helper.open_level("Physics", "ForceRegion_SplineForceOnRigidBodies") # 2) Enter game mode helper.enter_game_mode(Tests.enter_game_mode) @@ -158,4 +158,4 @@ def C5932045_ForceRegion_Spline(): if __name__ == "__main__": from editor_python_test_tools.utils import Report - Report.start_test(C5932045_ForceRegion_Spline) + Report.start_test(ForceRegion_SplineForceOnRigidBodies) diff --git a/AutomatedTesting/Gem/PythonTests/physics/force_region/C12868580_ForceRegion_SplineModifiedTransform.py b/AutomatedTesting/Gem/PythonTests/physics/tests/force_region/ForceRegion_SplineRegionWithModifiedTransform.py similarity index 97% rename from AutomatedTesting/Gem/PythonTests/physics/force_region/C12868580_ForceRegion_SplineModifiedTransform.py rename to AutomatedTesting/Gem/PythonTests/physics/tests/force_region/ForceRegion_SplineRegionWithModifiedTransform.py index 4e052a1b00..abc58779a2 100644 --- a/AutomatedTesting/Gem/PythonTests/physics/force_region/C12868580_ForceRegion_SplineModifiedTransform.py +++ b/AutomatedTesting/Gem/PythonTests/physics/tests/force_region/ForceRegion_SplineRegionWithModifiedTransform.py @@ -29,7 +29,7 @@ class Tests(): # fmt: on -def C12868580_ForceRegion_SplineModifiedTransform(): +def ForceRegion_SplineRegionWithModifiedTransform(): """ Summary: Runs an automated test to ensure that a PhysX force region correctly exerts spline follow force on rigid bodies when @@ -125,7 +125,7 @@ def C12868580_ForceRegion_SplineModifiedTransform(): helper.init_idle() # 1) Open level - helper.open_level("Physics", "C12868580_ForceRegion_SplineModifiedTransform") + helper.open_level("Physics", "ForceRegion_SplineRegionWithModifiedTransform") # 2) Enter game mode helper.enter_game_mode(Tests.enter_game_mode) @@ -163,4 +163,4 @@ def C12868580_ForceRegion_SplineModifiedTransform(): if __name__ == "__main__": from editor_python_test_tools.utils import Report - Report.start_test(C12868580_ForceRegion_SplineModifiedTransform) + Report.start_test(ForceRegion_SplineRegionWithModifiedTransform) diff --git a/AutomatedTesting/Gem/PythonTests/physics/force_region/C12905528_ForceRegion_WithNonTriggerCollider.py b/AutomatedTesting/Gem/PythonTests/physics/tests/force_region/ForceRegion_WithNonTriggerColliderWarning.py similarity index 96% rename from AutomatedTesting/Gem/PythonTests/physics/force_region/C12905528_ForceRegion_WithNonTriggerCollider.py rename to AutomatedTesting/Gem/PythonTests/physics/tests/force_region/ForceRegion_WithNonTriggerColliderWarning.py index 93453b29c0..2814fe01f8 100644 --- a/AutomatedTesting/Gem/PythonTests/physics/force_region/C12905528_ForceRegion_WithNonTriggerCollider.py +++ b/AutomatedTesting/Gem/PythonTests/physics/tests/force_region/ForceRegion_WithNonTriggerColliderWarning.py @@ -19,7 +19,7 @@ class Tests(): # fmt: on -def C12905528_ForceRegion_WithNonTriggerCollider(): +def ForceRegion_WithNonTriggerColliderWarning(): """ Summary: Create entity with PhysX Force Region component. Check that user is warned if new PhysX Collider component is @@ -79,4 +79,4 @@ def C12905528_ForceRegion_WithNonTriggerCollider(): if __name__ == "__main__": from editor_python_test_tools.utils import Report - Report.start_test(C12905528_ForceRegion_WithNonTriggerCollider) + Report.start_test(ForceRegion_WithNonTriggerColliderWarning) diff --git a/AutomatedTesting/Gem/PythonTests/physics/force_region/C5932040_ForceRegion_CubeExertsWorldForce.py b/AutomatedTesting/Gem/PythonTests/physics/tests/force_region/ForceRegion_WorldSpaceForceOnRigidBodies.py similarity index 97% rename from AutomatedTesting/Gem/PythonTests/physics/force_region/C5932040_ForceRegion_CubeExertsWorldForce.py rename to AutomatedTesting/Gem/PythonTests/physics/tests/force_region/ForceRegion_WorldSpaceForceOnRigidBodies.py index 969a203502..4cb31fbc79 100644 --- a/AutomatedTesting/Gem/PythonTests/physics/force_region/C5932040_ForceRegion_CubeExertsWorldForce.py +++ b/AutomatedTesting/Gem/PythonTests/physics/tests/force_region/ForceRegion_WorldSpaceForceOnRigidBodies.py @@ -28,7 +28,7 @@ def is_close_float(a, b, factor): return abs(b - a) < factor -def C5932040_ForceRegion_CubeExertsWorldForce(): +def ForceRegion_WorldSpaceForceOnRigidBodies(): """ Summary: A ball is suspended over a box shaped force region. @@ -82,7 +82,7 @@ def C5932040_ForceRegion_CubeExertsWorldForce(): helper.init_idle() # 1) Open level - helper.open_level("Physics", "C5932040_ForceRegion_CubeExertsWorldForce") + helper.open_level("Physics", "ForceRegion_WorldSpaceForceOnRigidBodies") # 2) Enter game mode helper.enter_game_mode(Tests.enter_game_mode) @@ -179,4 +179,4 @@ def C5932040_ForceRegion_CubeExertsWorldForce(): if __name__ == "__main__": from editor_python_test_tools.utils import Report - Report.start_test(C5932040_ForceRegion_CubeExertsWorldForce) + Report.start_test(ForceRegion_WorldSpaceForceOnRigidBodies) diff --git a/AutomatedTesting/Gem/PythonTests/physics/force_region/C6090552_ForceRegion_LinearDampingNegative.py b/AutomatedTesting/Gem/PythonTests/physics/tests/force_region/ForceRegion_ZeroLinearDampingDoesNothing.py similarity index 98% rename from AutomatedTesting/Gem/PythonTests/physics/force_region/C6090552_ForceRegion_LinearDampingNegative.py rename to AutomatedTesting/Gem/PythonTests/physics/tests/force_region/ForceRegion_ZeroLinearDampingDoesNothing.py index 100a07d346..559cef3571 100644 --- a/AutomatedTesting/Gem/PythonTests/physics/force_region/C6090552_ForceRegion_LinearDampingNegative.py +++ b/AutomatedTesting/Gem/PythonTests/physics/tests/force_region/ForceRegion_ZeroLinearDampingDoesNothing.py @@ -28,7 +28,7 @@ class Tests: # fmt: on -def C6090552_ForceRegion_LinearDampingNegative(): +def ForceRegion_ZeroLinearDampingDoesNothing(): """ Summary: A ball is suspended over a force region with a linear damping value of zero and a PhysX Terrain. @@ -211,7 +211,7 @@ def C6090552_ForceRegion_LinearDampingNegative(): self.collision_handler.add_callback("OnCollisionBegin", self.on_collision_begin) # 1) Open level - helper.open_level("Physics", "C6090552_ForceRegion_LinearDampingNegative") + helper.open_level("Physics", "ForceRegion_ZeroLinearDampingDoesNothing") # 2) Enter game mode helper.enter_game_mode(Tests.enter_game_mode) @@ -238,4 +238,4 @@ def C6090552_ForceRegion_LinearDampingNegative(): if __name__ == "__main__": from editor_python_test_tools.utils import Report - Report.start_test(C6090552_ForceRegion_LinearDampingNegative) + Report.start_test(ForceRegion_ZeroLinearDampingDoesNothing) diff --git a/AutomatedTesting/Gem/PythonTests/physics/force_region/C6090551_ForceRegion_LocalSpaceForceNegative.py b/AutomatedTesting/Gem/PythonTests/physics/tests/force_region/ForceRegion_ZeroLocalSpaceForceDoesNothing.py similarity index 98% rename from AutomatedTesting/Gem/PythonTests/physics/force_region/C6090551_ForceRegion_LocalSpaceForceNegative.py rename to AutomatedTesting/Gem/PythonTests/physics/tests/force_region/ForceRegion_ZeroLocalSpaceForceDoesNothing.py index 48d08666fd..415377745f 100644 --- a/AutomatedTesting/Gem/PythonTests/physics/force_region/C6090551_ForceRegion_LocalSpaceForceNegative.py +++ b/AutomatedTesting/Gem/PythonTests/physics/tests/force_region/ForceRegion_ZeroLocalSpaceForceDoesNothing.py @@ -28,7 +28,7 @@ class Tests: # fmt: on -def C6090551_ForceRegion_LocalSpaceForceNegative(): +def ForceRegion_ZeroLocalSpaceForceDoesNothing(): """ Summary: A ball is suspended over a box shaped force region and a PhysX Terrain. The force is a local space force @@ -212,7 +212,7 @@ def C6090551_ForceRegion_LocalSpaceForceNegative(): self.collision_handler.add_callback("OnCollisionBegin", self.on_collision_begin) # 1) Open level - helper.open_level("Physics", "C6090551_ForceRegion_LocalSpaceForceNegative") + helper.open_level("Physics", "ForceRegion_ZeroLocalSpaceForceDoesNothing") # 2) Enter game mode helper.enter_game_mode(Tests.enter_game_mode) @@ -239,4 +239,4 @@ def C6090551_ForceRegion_LocalSpaceForceNegative(): if __name__ == "__main__": from editor_python_test_tools.utils import Report - Report.start_test(C6090551_ForceRegion_LocalSpaceForceNegative) + Report.start_test(ForceRegion_ZeroLocalSpaceForceDoesNothing) diff --git a/AutomatedTesting/Gem/PythonTests/physics/force_region/C6090554_ForceRegion_PointForceNegative.py b/AutomatedTesting/Gem/PythonTests/physics/tests/force_region/ForceRegion_ZeroPointForceDoesNothing.py similarity index 98% rename from AutomatedTesting/Gem/PythonTests/physics/force_region/C6090554_ForceRegion_PointForceNegative.py rename to AutomatedTesting/Gem/PythonTests/physics/tests/force_region/ForceRegion_ZeroPointForceDoesNothing.py index 0b6b9a8b58..91190f83e5 100644 --- a/AutomatedTesting/Gem/PythonTests/physics/force_region/C6090554_ForceRegion_PointForceNegative.py +++ b/AutomatedTesting/Gem/PythonTests/physics/tests/force_region/ForceRegion_ZeroPointForceDoesNothing.py @@ -28,7 +28,7 @@ class Tests: # fmt: on -def C6090554_ForceRegion_PointForceNegative(): +def ForceRegion_ZeroPointForceDoesNothing(): """ Summary: A ball is suspended over a box shaped force region and a PhysX Terrain. The force is a point force @@ -212,7 +212,7 @@ def C6090554_ForceRegion_PointForceNegative(): self.collision_handler.add_callback("OnCollisionBegin", self.on_collision_begin) # 1) Open level - helper.open_level("Physics", "C6090554_ForceRegion_PointForceNegative") + helper.open_level("Physics", "ForceRegion_ZeroPointForceDoesNothing") # 2) Enter game mode helper.enter_game_mode(Tests.enter_game_mode) @@ -239,4 +239,4 @@ def C6090554_ForceRegion_PointForceNegative(): if __name__ == "__main__": from editor_python_test_tools.utils import Report - Report.start_test(C6090554_ForceRegion_PointForceNegative) + Report.start_test(ForceRegion_ZeroPointForceDoesNothing) diff --git a/AutomatedTesting/Gem/PythonTests/physics/force_region/C6090553_ForceRegion_SimpleDragForceOnRigidBodies.py b/AutomatedTesting/Gem/PythonTests/physics/tests/force_region/ForceRegion_ZeroSimpleDragForceDoesNothing.py similarity index 96% rename from AutomatedTesting/Gem/PythonTests/physics/force_region/C6090553_ForceRegion_SimpleDragForceOnRigidBodies.py rename to AutomatedTesting/Gem/PythonTests/physics/tests/force_region/ForceRegion_ZeroSimpleDragForceDoesNothing.py index 7b5904a3d7..f3c377b5be 100644 --- a/AutomatedTesting/Gem/PythonTests/physics/force_region/C6090553_ForceRegion_SimpleDragForceOnRigidBodies.py +++ b/AutomatedTesting/Gem/PythonTests/physics/tests/force_region/ForceRegion_ZeroSimpleDragForceDoesNothing.py @@ -25,7 +25,7 @@ class Tests(): # fmt: on -def C6090553_ForceRegion_SimpleDragForceOnRigidBodies(): +def ForceRegion_ZeroSimpleDragForceDoesNothing(): """ Summary: Runs an automated test to ensure that force region exerts simple drag force on rigid bodies(negative test). @@ -99,7 +99,7 @@ def C6090553_ForceRegion_SimpleDragForceOnRigidBodies(): helper.init_idle() # 1) Open level - helper.open_level("Physics", "C6090553_ForceRegion_SimpleDragForceOnRigidBodies") + helper.open_level("Physics", "ForceRegion_ZeroSimpleDragForceDoesNothing") # 2) Enter game mode helper.enter_game_mode(Tests.enter_game_mode) @@ -170,4 +170,4 @@ def C6090553_ForceRegion_SimpleDragForceOnRigidBodies(): if __name__ == "__main__": from editor_python_test_tools.utils import Report - Report.start_test(C6090553_ForceRegion_SimpleDragForceOnRigidBodies) + Report.start_test(ForceRegion_ZeroSimpleDragForceDoesNothing) diff --git a/AutomatedTesting/Gem/PythonTests/physics/force_region/C6090555_ForceRegion_SplineFollowOnRigidBodies.py b/AutomatedTesting/Gem/PythonTests/physics/tests/force_region/ForceRegion_ZeroSplineForceDoesNothing.py similarity index 97% rename from AutomatedTesting/Gem/PythonTests/physics/force_region/C6090555_ForceRegion_SplineFollowOnRigidBodies.py rename to AutomatedTesting/Gem/PythonTests/physics/tests/force_region/ForceRegion_ZeroSplineForceDoesNothing.py index 7a642c6c59..44e4b7e63d 100644 --- a/AutomatedTesting/Gem/PythonTests/physics/force_region/C6090555_ForceRegion_SplineFollowOnRigidBodies.py +++ b/AutomatedTesting/Gem/PythonTests/physics/tests/force_region/ForceRegion_ZeroSplineForceDoesNothing.py @@ -24,7 +24,7 @@ class Tests(): # fmt: on -def C6090555_ForceRegion_SplineFollowOnRigidBodies(): +def ForceRegion_ZeroSplineForceDoesNothing(): """ Summary: Runs an automated test to ensure that a PhysX force region exerts spline follow force on rigid bodies(negative test) @@ -96,7 +96,7 @@ def C6090555_ForceRegion_SplineFollowOnRigidBodies(): helper.init_idle() # 1) Open level - helper.open_level("Physics", "C6090555_ForceRegion_SplineFollowOnRigidBodies") + helper.open_level("Physics", "ForceRegion_ZeroSplineForceDoesNothing") # 2) Enter game mode helper.enter_game_mode(Tests.enter_game_mode) @@ -172,4 +172,4 @@ def C6090555_ForceRegion_SplineFollowOnRigidBodies(): if __name__ == "__main__": from editor_python_test_tools.utils import Report - Report.start_test(C6090555_ForceRegion_SplineFollowOnRigidBodies) + Report.start_test(ForceRegion_ZeroSplineForceDoesNothing) diff --git a/AutomatedTesting/Gem/PythonTests/physics/force_region/C6090550_ForceRegion_WorldSpaceForceNegative.py b/AutomatedTesting/Gem/PythonTests/physics/tests/force_region/ForceRegion_ZeroWorldSpaceForceDoesNothing.py similarity index 98% rename from AutomatedTesting/Gem/PythonTests/physics/force_region/C6090550_ForceRegion_WorldSpaceForceNegative.py rename to AutomatedTesting/Gem/PythonTests/physics/tests/force_region/ForceRegion_ZeroWorldSpaceForceDoesNothing.py index 7d6a8966b2..1a20356e11 100644 --- a/AutomatedTesting/Gem/PythonTests/physics/force_region/C6090550_ForceRegion_WorldSpaceForceNegative.py +++ b/AutomatedTesting/Gem/PythonTests/physics/tests/force_region/ForceRegion_ZeroWorldSpaceForceDoesNothing.py @@ -28,7 +28,7 @@ class Tests: # fmt: on -def C6090550_ForceRegion_WorldSpaceForceNegative(): +def ForceRegion_ZeroWorldSpaceForceDoesNothing(): """ Summary: A ball is suspended above a cube shaped force region and a PhysX Terrain. The force is a world space force @@ -212,7 +212,7 @@ def C6090550_ForceRegion_WorldSpaceForceNegative(): self.collision_handler.add_callback("OnCollisionBegin", self.on_collision_begin) # 1) Open level - helper.open_level("Physics", "C6090550_ForceRegion_WorldSpaceForceNegative") + helper.open_level("Physics", "ForceRegion_ZeroWorldSpaceForceDoesNothing") # 2) Enter game mode helper.enter_game_mode(Tests.enter_game_mode) @@ -239,4 +239,4 @@ def C6090550_ForceRegion_WorldSpaceForceNegative(): if __name__ == "__main__": from editor_python_test_tools.utils import Report - Report.start_test(C6090550_ForceRegion_WorldSpaceForceNegative) + Report.start_test(ForceRegion_ZeroWorldSpaceForceDoesNothing) diff --git a/AutomatedTesting/Gem/PythonTests/physics/joints/JointsHelper.py b/AutomatedTesting/Gem/PythonTests/physics/tests/joints/JointsHelper.py similarity index 100% rename from AutomatedTesting/Gem/PythonTests/physics/joints/JointsHelper.py rename to AutomatedTesting/Gem/PythonTests/physics/tests/joints/JointsHelper.py diff --git a/AutomatedTesting/Gem/PythonTests/physics/joints/C18243588_Joints_Ball2BodiesConstrained.py b/AutomatedTesting/Gem/PythonTests/physics/tests/joints/Joints_Ball2BodiesConstrained.py similarity index 95% rename from AutomatedTesting/Gem/PythonTests/physics/joints/C18243588_Joints_Ball2BodiesConstrained.py rename to AutomatedTesting/Gem/PythonTests/physics/tests/joints/Joints_Ball2BodiesConstrained.py index fd8556660a..136c1f5ee7 100644 --- a/AutomatedTesting/Gem/PythonTests/physics/joints/C18243588_Joints_Ball2BodiesConstrained.py +++ b/AutomatedTesting/Gem/PythonTests/physics/tests/joints/Joints_Ball2BodiesConstrained.py @@ -20,7 +20,7 @@ class Tests: # fmt: on -def C18243588_Joints_Ball2BodiesConstrained(): +def Joints_Ball2BodiesConstrained(): """ Summary: Check that ball joint constrains 2 bodies within cone limits @@ -72,7 +72,7 @@ def C18243588_Joints_Ball2BodiesConstrained(): helper.init_idle() # 1) Open Level - helper.open_level("Physics", "C18243588_Joints_Ball2BodiesConstrained") + helper.open_level("Physics", "Joints_Ball2BodiesConstrained") # 2) Enter Game Mode helper.enter_game_mode(Tests.enter_game_mode) @@ -110,4 +110,4 @@ def C18243588_Joints_Ball2BodiesConstrained(): if __name__ == "__main__": from editor_python_test_tools.utils import Report - Report.start_test(C18243588_Joints_Ball2BodiesConstrained) + Report.start_test(Joints_Ball2BodiesConstrained) diff --git a/AutomatedTesting/Gem/PythonTests/physics/joints/C18243592_Joints_BallBreakable.py b/AutomatedTesting/Gem/PythonTests/physics/tests/joints/Joints_BallBreakable.py similarity index 96% rename from AutomatedTesting/Gem/PythonTests/physics/joints/C18243592_Joints_BallBreakable.py rename to AutomatedTesting/Gem/PythonTests/physics/tests/joints/Joints_BallBreakable.py index 6182c312dc..cc721266e5 100644 --- a/AutomatedTesting/Gem/PythonTests/physics/joints/C18243592_Joints_BallBreakable.py +++ b/AutomatedTesting/Gem/PythonTests/physics/tests/joints/Joints_BallBreakable.py @@ -19,7 +19,7 @@ class Tests: # fmt: on -def C18243592_Joints_BallBreakable(): +def Joints_BallBreakable(): """ Summary: Check that ball joint is breakable @@ -70,7 +70,7 @@ def C18243592_Joints_BallBreakable(): helper.init_idle() # 1) Open Level - helper.open_level("Physics", "C18243592_Joints_BallBreakable") + helper.open_level("Physics", "Joints_BallBreakable") # 2) Enter Game Mode helper.enter_game_mode(Tests.enter_game_mode) @@ -104,4 +104,4 @@ def C18243592_Joints_BallBreakable(): if __name__ == "__main__": from editor_python_test_tools.utils import Report - Report.start_test(C18243592_Joints_BallBreakable) + Report.start_test(Joints_BallBreakable) diff --git a/AutomatedTesting/Gem/PythonTests/physics/joints/C18243591_Joints_BallLeadFollowerCollide.py b/AutomatedTesting/Gem/PythonTests/physics/tests/joints/Joints_BallLeadFollowerCollide.py similarity index 94% rename from AutomatedTesting/Gem/PythonTests/physics/joints/C18243591_Joints_BallLeadFollowerCollide.py rename to AutomatedTesting/Gem/PythonTests/physics/tests/joints/Joints_BallLeadFollowerCollide.py index 47422d1508..0e8d7ea255 100644 --- a/AutomatedTesting/Gem/PythonTests/physics/joints/C18243591_Joints_BallLeadFollowerCollide.py +++ b/AutomatedTesting/Gem/PythonTests/physics/tests/joints/Joints_BallLeadFollowerCollide.py @@ -19,7 +19,7 @@ class Tests: # fmt: on -def C18243591_Joints_BallLeadFollowerCollide(): +def Joints_BallLeadFollowerCollide(): """ Summary: Check that ball joint allows lead-follower collision @@ -66,7 +66,7 @@ def C18243591_Joints_BallLeadFollowerCollide(): helper.init_idle() # 1) Open Level - helper.open_level("Physics", "C18243591_Joints_BallLeadFollowerCollide") + helper.open_level("Physics", "Joints_BallLeadFollowerCollide") # 2) Enter Game Mode helper.enter_game_mode(Tests.enter_game_mode) @@ -88,4 +88,4 @@ def C18243591_Joints_BallLeadFollowerCollide(): if __name__ == "__main__": from editor_python_test_tools.utils import Report - Report.start_test(C18243591_Joints_BallLeadFollowerCollide) + Report.start_test(Joints_BallLeadFollowerCollide) diff --git a/AutomatedTesting/Gem/PythonTests/physics/joints/C18243590_Joints_BallNoLimitsConstrained.py b/AutomatedTesting/Gem/PythonTests/physics/tests/joints/Joints_BallNoLimitsConstrained.py similarity index 95% rename from AutomatedTesting/Gem/PythonTests/physics/joints/C18243590_Joints_BallNoLimitsConstrained.py rename to AutomatedTesting/Gem/PythonTests/physics/tests/joints/Joints_BallNoLimitsConstrained.py index 990f4f826b..ee5efdcef6 100644 --- a/AutomatedTesting/Gem/PythonTests/physics/joints/C18243590_Joints_BallNoLimitsConstrained.py +++ b/AutomatedTesting/Gem/PythonTests/physics/tests/joints/Joints_BallNoLimitsConstrained.py @@ -20,7 +20,7 @@ class Tests: # fmt: on -def C18243590_Joints_BallNoLimitsConstrained(): +def Joints_BallNoLimitsConstrained(): """ Summary: Check that ball joint allows no limit constraints @@ -75,7 +75,7 @@ def C18243590_Joints_BallNoLimitsConstrained(): helper.init_idle() # 1) Open Level - helper.open_level("Physics", "C18243590_Joints_BallNoLimitsConstrained") + helper.open_level("Physics", "Joints_BallNoLimitsConstrained") # 2) Enter Game Mode helper.enter_game_mode(Tests.enter_game_mode) @@ -109,4 +109,4 @@ def C18243590_Joints_BallNoLimitsConstrained(): if __name__ == "__main__": from editor_python_test_tools.utils import Report - Report.start_test(C18243590_Joints_BallNoLimitsConstrained) + Report.start_test(Joints_BallNoLimitsConstrained) diff --git a/AutomatedTesting/Gem/PythonTests/physics/joints/C18243589_Joints_BallSoftLimitsConstrained.py b/AutomatedTesting/Gem/PythonTests/physics/tests/joints/Joints_BallSoftLimitsConstrained.py similarity index 96% rename from AutomatedTesting/Gem/PythonTests/physics/joints/C18243589_Joints_BallSoftLimitsConstrained.py rename to AutomatedTesting/Gem/PythonTests/physics/tests/joints/Joints_BallSoftLimitsConstrained.py index 30747bc2eb..3fa23b7bed 100644 --- a/AutomatedTesting/Gem/PythonTests/physics/joints/C18243589_Joints_BallSoftLimitsConstrained.py +++ b/AutomatedTesting/Gem/PythonTests/physics/tests/joints/Joints_BallSoftLimitsConstrained.py @@ -21,7 +21,7 @@ class Tests: # fmt: on -def C18243589_Joints_BallSoftLimitsConstrained(): +def Joints_BallSoftLimitsConstrained(): """ Summary: Check that ball joint allows soft limit constraints @@ -78,7 +78,7 @@ def C18243589_Joints_BallSoftLimitsConstrained(): helper.init_idle() # 1) Open Level - helper.open_level("Physics", "C18243589_Joints_BallSoftLimitsConstrained") + helper.open_level("Physics", "Joints_BallSoftLimitsConstrained") # 2) Enter Game Mode helper.enter_game_mode(Tests.enter_game_mode) @@ -134,4 +134,4 @@ def C18243589_Joints_BallSoftLimitsConstrained(): if __name__ == "__main__": from editor_python_test_tools.utils import Report - Report.start_test(C18243589_Joints_BallSoftLimitsConstrained) + Report.start_test(Joints_BallSoftLimitsConstrained) diff --git a/AutomatedTesting/Gem/PythonTests/physics/joints/C18243580_Joints_Fixed2BodiesConstrained.py b/AutomatedTesting/Gem/PythonTests/physics/tests/joints/Joints_Fixed2BodiesConstrained.py similarity index 95% rename from AutomatedTesting/Gem/PythonTests/physics/joints/C18243580_Joints_Fixed2BodiesConstrained.py rename to AutomatedTesting/Gem/PythonTests/physics/tests/joints/Joints_Fixed2BodiesConstrained.py index ceabb91a28..f71cfa2946 100644 --- a/AutomatedTesting/Gem/PythonTests/physics/joints/C18243580_Joints_Fixed2BodiesConstrained.py +++ b/AutomatedTesting/Gem/PythonTests/physics/tests/joints/Joints_Fixed2BodiesConstrained.py @@ -20,7 +20,7 @@ class Tests: # fmt: on -def C18243580_Joints_Fixed2BodiesConstrained(): +def Joints_Fixed2BodiesConstrained(): """ Summary: Check that fixed joint constrains 2 bodies @@ -66,7 +66,7 @@ def C18243580_Joints_Fixed2BodiesConstrained(): helper.init_idle() # 1) Open Level - helper.open_level("Physics", "C18243580_Joints_Fixed2BodiesConstrained") + helper.open_level("Physics", "Joints_Fixed2BodiesConstrained") # 2) Enter Game Mode helper.enter_game_mode(Tests.enter_game_mode) @@ -95,4 +95,4 @@ def C18243580_Joints_Fixed2BodiesConstrained(): if __name__ == "__main__": from editor_python_test_tools.utils import Report - Report.start_test(C18243580_Joints_Fixed2BodiesConstrained) + Report.start_test(Joints_Fixed2BodiesConstrained) diff --git a/AutomatedTesting/Gem/PythonTests/physics/joints/C18243581_Joints_FixedBreakable.py b/AutomatedTesting/Gem/PythonTests/physics/tests/joints/Joints_FixedBreakable.py similarity index 95% rename from AutomatedTesting/Gem/PythonTests/physics/joints/C18243581_Joints_FixedBreakable.py rename to AutomatedTesting/Gem/PythonTests/physics/tests/joints/Joints_FixedBreakable.py index 716df85c67..c4adcf14ef 100644 --- a/AutomatedTesting/Gem/PythonTests/physics/joints/C18243581_Joints_FixedBreakable.py +++ b/AutomatedTesting/Gem/PythonTests/physics/tests/joints/Joints_FixedBreakable.py @@ -20,7 +20,7 @@ class Tests: # fmt: on -def C18243581_Joints_FixedBreakable(): +def Joints_FixedBreakable(): """ Summary: Check that fixed joint is breakable @@ -65,7 +65,7 @@ def C18243581_Joints_FixedBreakable(): helper.init_idle() # 1) Open Level - helper.open_level("Physics", "C18243581_Joints_FixedBreakable") + helper.open_level("Physics", "Joints_FixedBreakable") # 2) Enter Game Mode helper.enter_game_mode(Tests.enter_game_mode) @@ -94,4 +94,4 @@ def C18243581_Joints_FixedBreakable(): if __name__ == "__main__": from editor_python_test_tools.utils import Report - Report.start_test(C18243581_Joints_FixedBreakable) + Report.start_test(Joints_FixedBreakable) diff --git a/AutomatedTesting/Gem/PythonTests/physics/joints/C18243582_Joints_FixedLeadFollowerCollide.py b/AutomatedTesting/Gem/PythonTests/physics/tests/joints/Joints_FixedLeadFollowerCollide.py similarity index 94% rename from AutomatedTesting/Gem/PythonTests/physics/joints/C18243582_Joints_FixedLeadFollowerCollide.py rename to AutomatedTesting/Gem/PythonTests/physics/tests/joints/Joints_FixedLeadFollowerCollide.py index 0f130a300b..e142941c5a 100644 --- a/AutomatedTesting/Gem/PythonTests/physics/joints/C18243582_Joints_FixedLeadFollowerCollide.py +++ b/AutomatedTesting/Gem/PythonTests/physics/tests/joints/Joints_FixedLeadFollowerCollide.py @@ -19,7 +19,7 @@ class Tests: # fmt: on -def C18243582_Joints_FixedLeadFollowerCollide(): +def Joints_FixedLeadFollowerCollide(): """ Summary: Check that fixed joint allows lead-follower collision @@ -67,7 +67,7 @@ def C18243582_Joints_FixedLeadFollowerCollide(): helper.init_idle() # 1) Open Level - helper.open_level("Physics", "C18243582_Joints_FixedLeadFollowerCollide") + helper.open_level("Physics", "Joints_FixedLeadFollowerCollide") # 2) Enter Game Mode helper.enter_game_mode(Tests.enter_game_mode) @@ -89,4 +89,4 @@ def C18243582_Joints_FixedLeadFollowerCollide(): if __name__ == "__main__": from editor_python_test_tools.utils import Report - Report.start_test(C18243582_Joints_FixedLeadFollowerCollide) + Report.start_test(Joints_FixedLeadFollowerCollide) diff --git a/AutomatedTesting/Gem/PythonTests/physics/joints/C18243593_Joints_GlobalFrameConstrained.py b/AutomatedTesting/Gem/PythonTests/physics/tests/joints/Joints_GlobalFrameConstrained.py similarity index 96% rename from AutomatedTesting/Gem/PythonTests/physics/joints/C18243593_Joints_GlobalFrameConstrained.py rename to AutomatedTesting/Gem/PythonTests/physics/tests/joints/Joints_GlobalFrameConstrained.py index bd527f10f8..2d3c30f53d 100644 --- a/AutomatedTesting/Gem/PythonTests/physics/joints/C18243593_Joints_GlobalFrameConstrained.py +++ b/AutomatedTesting/Gem/PythonTests/physics/tests/joints/Joints_GlobalFrameConstrained.py @@ -22,7 +22,7 @@ class Tests: # fmt: on -def C18243593_Joints_GlobalFrameConstrained(): +def Joints_GlobalFrameConstrained(): """ Summary: Check that fixed/hinge/ball joints allow constraints to global frame @@ -74,7 +74,7 @@ def C18243593_Joints_GlobalFrameConstrained(): helper.init_idle() # 1) Open Level - helper.open_level("Physics", "C18243593_Joints_GlobalFrameConstrained") + helper.open_level("Physics", "Joints_GlobalFrameConstrained") # 2) Enter Game Mode helper.enter_game_mode(Tests.enter_game_mode) @@ -117,4 +117,4 @@ def C18243593_Joints_GlobalFrameConstrained(): if __name__ == "__main__": from editor_python_test_tools.utils import Report - Report.start_test(C18243593_Joints_GlobalFrameConstrained) + Report.start_test(Joints_GlobalFrameConstrained) diff --git a/AutomatedTesting/Gem/PythonTests/physics/joints/C18243583_Joints_Hinge2BodiesConstrained.py b/AutomatedTesting/Gem/PythonTests/physics/tests/joints/Joints_Hinge2BodiesConstrained.py similarity index 95% rename from AutomatedTesting/Gem/PythonTests/physics/joints/C18243583_Joints_Hinge2BodiesConstrained.py rename to AutomatedTesting/Gem/PythonTests/physics/tests/joints/Joints_Hinge2BodiesConstrained.py index e9b11bc198..3d2fe097f5 100644 --- a/AutomatedTesting/Gem/PythonTests/physics/joints/C18243583_Joints_Hinge2BodiesConstrained.py +++ b/AutomatedTesting/Gem/PythonTests/physics/tests/joints/Joints_Hinge2BodiesConstrained.py @@ -21,7 +21,7 @@ class Tests: # fmt: on -def C18243583_Joints_Hinge2BodiesConstrained(): +def Joints_Hinge2BodiesConstrained(): """ Summary: Check that hinge joint constrains 2 bodies about X-axis @@ -73,7 +73,7 @@ def C18243583_Joints_Hinge2BodiesConstrained(): helper.init_idle() # 1) Open Level - helper.open_level("Physics", "C18243583_Joints_Hinge2BodiesConstrained") + helper.open_level("Physics", "Joints_Hinge2BodiesConstrained") # 2) Enter Game Mode helper.enter_game_mode(Tests.enter_game_mode) @@ -112,4 +112,4 @@ def C18243583_Joints_Hinge2BodiesConstrained(): if __name__ == "__main__": from editor_python_test_tools.utils import Report - Report.start_test(C18243583_Joints_Hinge2BodiesConstrained) + Report.start_test(Joints_Hinge2BodiesConstrained) diff --git a/AutomatedTesting/Gem/PythonTests/physics/joints/C18243587_Joints_HingeBreakable.py b/AutomatedTesting/Gem/PythonTests/physics/tests/joints/Joints_HingeBreakable.py similarity index 96% rename from AutomatedTesting/Gem/PythonTests/physics/joints/C18243587_Joints_HingeBreakable.py rename to AutomatedTesting/Gem/PythonTests/physics/tests/joints/Joints_HingeBreakable.py index b1ea7e123a..cca422728a 100644 --- a/AutomatedTesting/Gem/PythonTests/physics/joints/C18243587_Joints_HingeBreakable.py +++ b/AutomatedTesting/Gem/PythonTests/physics/tests/joints/Joints_HingeBreakable.py @@ -20,7 +20,7 @@ class Tests: # fmt: on -def C18243587_Joints_HingeBreakable(): +def Joints_HingeBreakable(): """ Summary: Check that hinge joint is breakable @@ -71,7 +71,7 @@ def C18243587_Joints_HingeBreakable(): helper.init_idle() # 1) Open Level - helper.open_level("Physics", "C18243587_Joints_HingeBreakable") + helper.open_level("Physics", "Joints_HingeBreakable") # 2) Enter Game Mode helper.enter_game_mode(Tests.enter_game_mode) @@ -106,4 +106,4 @@ def C18243587_Joints_HingeBreakable(): if __name__ == "__main__": from editor_python_test_tools.utils import Report - Report.start_test(C18243587_Joints_HingeBreakable) + Report.start_test(Joints_HingeBreakable) diff --git a/AutomatedTesting/Gem/PythonTests/physics/joints/C18243586_Joints_HingeLeadFollowerCollide.py b/AutomatedTesting/Gem/PythonTests/physics/tests/joints/Joints_HingeLeadFollowerCollide.py similarity index 94% rename from AutomatedTesting/Gem/PythonTests/physics/joints/C18243586_Joints_HingeLeadFollowerCollide.py rename to AutomatedTesting/Gem/PythonTests/physics/tests/joints/Joints_HingeLeadFollowerCollide.py index 2b5b95939f..15be3d960d 100644 --- a/AutomatedTesting/Gem/PythonTests/physics/joints/C18243586_Joints_HingeLeadFollowerCollide.py +++ b/AutomatedTesting/Gem/PythonTests/physics/tests/joints/Joints_HingeLeadFollowerCollide.py @@ -19,7 +19,7 @@ class Tests: # fmt: on -def C18243586_Joints_HingeLeadFollowerCollide(): +def Joints_HingeLeadFollowerCollide(): """ Summary: Check that hinge joint allows lead-follower collision @@ -66,7 +66,7 @@ def C18243586_Joints_HingeLeadFollowerCollide(): helper.init_idle() # 1) Open Level - helper.open_level("Physics", "C18243586_Joints_HingeLeadFollowerCollide") + helper.open_level("Physics", "Joints_HingeLeadFollowerCollide") # 2) Enter Game Mode helper.enter_game_mode(Tests.enter_game_mode) @@ -88,4 +88,4 @@ def C18243586_Joints_HingeLeadFollowerCollide(): if __name__ == "__main__": from editor_python_test_tools.utils import Report - Report.start_test(C18243586_Joints_HingeLeadFollowerCollide) + Report.start_test(Joints_HingeLeadFollowerCollide) diff --git a/AutomatedTesting/Gem/PythonTests/physics/joints/C18243585_Joints_HingeNoLimitsConstrained.py b/AutomatedTesting/Gem/PythonTests/physics/tests/joints/Joints_HingeNoLimitsConstrained.py similarity index 95% rename from AutomatedTesting/Gem/PythonTests/physics/joints/C18243585_Joints_HingeNoLimitsConstrained.py rename to AutomatedTesting/Gem/PythonTests/physics/tests/joints/Joints_HingeNoLimitsConstrained.py index 90ac80b1fa..0870a807fc 100644 --- a/AutomatedTesting/Gem/PythonTests/physics/joints/C18243585_Joints_HingeNoLimitsConstrained.py +++ b/AutomatedTesting/Gem/PythonTests/physics/tests/joints/Joints_HingeNoLimitsConstrained.py @@ -20,7 +20,7 @@ class Tests: # fmt: on -def C18243585_Joints_HingeNoLimitsConstrained(): +def Joints_HingeNoLimitsConstrained(): """ Summary: Check that hinge joint allows no limit constraints on 2 bodies @@ -73,7 +73,7 @@ def C18243585_Joints_HingeNoLimitsConstrained(): helper.init_idle() # 1) Open Level - helper.open_level("Physics", "C18243585_Joints_HingeNoLimitsConstrained") + helper.open_level("Physics", "Joints_HingeNoLimitsConstrained") # 2) Enter Game Mode helper.enter_game_mode(Tests.enter_game_mode) @@ -108,4 +108,4 @@ def C18243585_Joints_HingeNoLimitsConstrained(): if __name__ == "__main__": from editor_python_test_tools.utils import Report - Report.start_test(C18243585_Joints_HingeNoLimitsConstrained) + Report.start_test(Joints_HingeNoLimitsConstrained) diff --git a/AutomatedTesting/Gem/PythonTests/physics/joints/C18243584_Joints_HingeSoftLimitsConstrained.py b/AutomatedTesting/Gem/PythonTests/physics/tests/joints/Joints_HingeSoftLimitsConstrained.py similarity index 96% rename from AutomatedTesting/Gem/PythonTests/physics/joints/C18243584_Joints_HingeSoftLimitsConstrained.py rename to AutomatedTesting/Gem/PythonTests/physics/tests/joints/Joints_HingeSoftLimitsConstrained.py index e100b61494..6d11b3452d 100644 --- a/AutomatedTesting/Gem/PythonTests/physics/joints/C18243584_Joints_HingeSoftLimitsConstrained.py +++ b/AutomatedTesting/Gem/PythonTests/physics/tests/joints/Joints_HingeSoftLimitsConstrained.py @@ -20,7 +20,7 @@ class Tests: # fmt: on -def C18243584_Joints_HingeSoftLimitsConstrained(): +def Joints_HingeSoftLimitsConstrained(): """ Summary: Check that hinge joint allows soft limit constraints on 2 bodies @@ -77,7 +77,7 @@ def C18243584_Joints_HingeSoftLimitsConstrained(): helper.init_idle() # 1) Open Level - helper.open_level("Physics", "C18243584_Joints_HingeSoftLimitsConstrained") + helper.open_level("Physics", "Joints_HingeSoftLimitsConstrained") # 2) Enter Game Mode helper.enter_game_mode(Tests.enter_game_mode) @@ -141,4 +141,4 @@ def C18243584_Joints_HingeSoftLimitsConstrained(): if __name__ == "__main__": from editor_python_test_tools.utils import Report - Report.start_test(C18243584_Joints_HingeSoftLimitsConstrained) + Report.start_test(Joints_HingeSoftLimitsConstrained) diff --git a/AutomatedTesting/Gem/PythonTests/physics/material/AddModifyDelete_Utils.py b/AutomatedTesting/Gem/PythonTests/physics/tests/material/AddModifyDelete_Utils.py similarity index 100% rename from AutomatedTesting/Gem/PythonTests/physics/material/AddModifyDelete_Utils.py rename to AutomatedTesting/Gem/PythonTests/physics/tests/material/AddModifyDelete_Utils.py diff --git a/AutomatedTesting/Gem/PythonTests/physics/material/C4925577_Materials_MaterialAssignedToTerrain.py b/AutomatedTesting/Gem/PythonTests/physics/tests/material/Material_CanBeAssignedToTerrain.py similarity index 98% rename from AutomatedTesting/Gem/PythonTests/physics/material/C4925577_Materials_MaterialAssignedToTerrain.py rename to AutomatedTesting/Gem/PythonTests/physics/tests/material/Material_CanBeAssignedToTerrain.py index 219e12fdb2..4dbd62c95a 100644 --- a/AutomatedTesting/Gem/PythonTests/physics/material/C4925577_Materials_MaterialAssignedToTerrain.py +++ b/AutomatedTesting/Gem/PythonTests/physics/tests/material/Material_CanBeAssignedToTerrain.py @@ -31,7 +31,7 @@ class Tests: # fmt: on -def C4925577_Materials_MaterialAssignedToTerrain(): +def Material_CanBeAssignedToTerrain(): """ Summary: Three spheres are suspended above the terrain. Beneath two of the balls, @@ -238,7 +238,7 @@ def C4925577_Materials_MaterialAssignedToTerrain(): helper.init_idle() # 1) Open level - helper.open_level("Physics", "C4925577_PhysXMaterials_MaterialAssignedToTerrain") + helper.open_level("Physics", "Material_CanBeAssignedToTerrain") # 2) Enter game mode helper.enter_game_mode(Tests.game_mode_enter) @@ -301,4 +301,4 @@ def C4925577_Materials_MaterialAssignedToTerrain(): if __name__ == "__main__": from editor_python_test_tools.utils import Report - Report.start_test(C4925577_Materials_MaterialAssignedToTerrain) + Report.start_test(Material_CanBeAssignedToTerrain) diff --git a/AutomatedTesting/Gem/PythonTests/physics/material/C15556261_PhysXMaterials_CharacterControllerMaterialAssignment.py b/AutomatedTesting/Gem/PythonTests/physics/tests/material/Material_CharacterController.py similarity index 97% rename from AutomatedTesting/Gem/PythonTests/physics/material/C15556261_PhysXMaterials_CharacterControllerMaterialAssignment.py rename to AutomatedTesting/Gem/PythonTests/physics/tests/material/Material_CharacterController.py index 4d806cda11..5112c77f0a 100644 --- a/AutomatedTesting/Gem/PythonTests/physics/material/C15556261_PhysXMaterials_CharacterControllerMaterialAssignment.py +++ b/AutomatedTesting/Gem/PythonTests/physics/tests/material/Material_CharacterController.py @@ -44,7 +44,7 @@ class Tests: # fmt: on -def C15556261_PhysXMaterials_CharacterControllerMaterialAssignment(): +def Material_CharacterController(): """ Summary: Runs an automated test to verify that character controllers with different surface materials behave accordingly. @@ -161,7 +161,7 @@ def C15556261_PhysXMaterials_CharacterControllerMaterialAssignment(): helper.init_idle() # 1) Load the level - helper.open_level("Physics", "C15556261_PhysXMaterials_CharacterControllerMaterialAssignment") + helper.open_level("Physics", "Material_CharacterController") # 2) Enter game mode helper.enter_game_mode(Tests.enter_game_mode) @@ -198,4 +198,4 @@ def C15556261_PhysXMaterials_CharacterControllerMaterialAssignment(): if __name__ == "__main__": from editor_python_test_tools.utils import Report - Report.start_test(C15556261_PhysXMaterials_CharacterControllerMaterialAssignment) + Report.start_test(Material_CharacterController) diff --git a/AutomatedTesting/Gem/PythonTests/physics/material/C15308221_Material_ComponentsInSyncWithLibrary.py b/AutomatedTesting/Gem/PythonTests/physics/tests/material/Material_ComponentsInSyncWithLibrary.py similarity index 98% rename from AutomatedTesting/Gem/PythonTests/physics/material/C15308221_Material_ComponentsInSyncWithLibrary.py rename to AutomatedTesting/Gem/PythonTests/physics/tests/material/Material_ComponentsInSyncWithLibrary.py index b29709e95b..71603052ea 100644 --- a/AutomatedTesting/Gem/PythonTests/physics/material/C15308221_Material_ComponentsInSyncWithLibrary.py +++ b/AutomatedTesting/Gem/PythonTests/physics/tests/material/Material_ComponentsInSyncWithLibrary.py @@ -46,7 +46,7 @@ class Tests: # fmt: on -def C15308221_Material_ComponentsInSyncWithLibrary(): +def Material_ComponentsInSyncWithLibrary(): """ Summary: Runs an automated test to verify that the material library is always in sync between the different PhysX components @@ -200,7 +200,7 @@ def C15308221_Material_ComponentsInSyncWithLibrary(): # 1) Open level and enter game mode helper.init_idle() - helper.open_level("Physics", "C15308221_Material_ComponentsInSyncWithLibrary") + helper.open_level("Physics", "Material_ComponentsInSyncWithLibrary") # Setup persisting entities collider = Entity("collider", "terrain") @@ -240,4 +240,4 @@ def C15308221_Material_ComponentsInSyncWithLibrary(): if __name__ == "__main__": from editor_python_test_tools.utils import Report - Report.start_test(C15308221_Material_ComponentsInSyncWithLibrary) + Report.start_test(Material_ComponentsInSyncWithLibrary) diff --git a/AutomatedTesting/Gem/PythonTests/physics/material/C15096735_Materials_DefaultLibraryConsistency.py b/AutomatedTesting/Gem/PythonTests/physics/tests/material/Material_DefaultLibraryConsistentOnAllFeatures.py similarity index 99% rename from AutomatedTesting/Gem/PythonTests/physics/material/C15096735_Materials_DefaultLibraryConsistency.py rename to AutomatedTesting/Gem/PythonTests/physics/tests/material/Material_DefaultLibraryConsistentOnAllFeatures.py index 75c9849756..a2e5722868 100644 --- a/AutomatedTesting/Gem/PythonTests/physics/material/C15096735_Materials_DefaultLibraryConsistency.py +++ b/AutomatedTesting/Gem/PythonTests/physics/tests/material/Material_DefaultLibraryConsistentOnAllFeatures.py @@ -95,7 +95,7 @@ class Tests: # fmt:on -def C15096735_Materials_DefaultLibraryConsistency(): +def Material_DefaultLibraryConsistentOnAllFeatures(): """ Summary: This script tests the behavior of the default PhysXMaterial library. Two separate materials are applied to a variety @@ -386,7 +386,7 @@ def C15096735_Materials_DefaultLibraryConsistency(): # 1) Open level and start game mode helper.init_idle() - helper.open_level("Physics", "C15096735_Materials_DefaultLibraryConsistency") + helper.open_level("Physics", "Material_DefaultLibraryConsistentOnAllFeatures") helper.enter_game_mode(Tests.enter_game_mode) # Create and start Terrain Test @@ -413,4 +413,4 @@ def C15096735_Materials_DefaultLibraryConsistency(): if __name__ == "__main__": from editor_python_test_tools.utils import Report - Report.start_test(C15096735_Materials_DefaultLibraryConsistency) + Report.start_test(Material_DefaultLibraryConsistentOnAllFeatures) diff --git a/AutomatedTesting/Gem/PythonTests/physics/material/C15096732_Material_DefaultLibraryUpdatedAcrossLevels_after.py b/AutomatedTesting/Gem/PythonTests/physics/tests/material/Material_DefaultLibraryUpdatedAcrossLevels_after.py similarity index 97% rename from AutomatedTesting/Gem/PythonTests/physics/material/C15096732_Material_DefaultLibraryUpdatedAcrossLevels_after.py rename to AutomatedTesting/Gem/PythonTests/physics/tests/material/Material_DefaultLibraryUpdatedAcrossLevels_after.py index de1945bc8d..1f8cfae498 100644 --- a/AutomatedTesting/Gem/PythonTests/physics/material/C15096732_Material_DefaultLibraryUpdatedAcrossLevels_after.py +++ b/AutomatedTesting/Gem/PythonTests/physics/tests/material/Material_DefaultLibraryUpdatedAcrossLevels_after.py @@ -37,7 +37,7 @@ class Tests: # fmt: on -def C15096732_Material_DefaultLibraryUpdatedAcrossLevels_after(): +def Material_DefaultLibraryUpdatedAcrossLevels_after(): """ Summary: Verify Default material library works across different levels, this is the second stage to the test. The reload was required for the editor to pick up changes in default material library in the @@ -205,7 +205,7 @@ def C15096732_Material_DefaultLibraryUpdatedAcrossLevels_after(): try: with open( os.path.join( - os.getcwd(), "AutomatedTesting", "Levels", "Physics", "C15096732_Material_DefaultLibraryUpdatedAcrossLevels", "_last_run_before_change_data.txt" + os.getcwd(), "AutomatedTesting", "Levels", "Physics", "Material_DefaultLibraryUpdatedAcrossLevels", "_last_run_before_change_data.txt" )) as data_file: lines = data_file.readlines() for i, line in enumerate(lines): @@ -230,9 +230,7 @@ def C15096732_Material_DefaultLibraryUpdatedAcrossLevels_after(): # 1) Open the correct level is open helper.open_level( "physics", - "C15096732_Material_DefaultLibraryUpdatedAcrossLevels.\\{}".format( - test.level - ), + f"Material_DefaultLibraryUpdatedAcrossLevels\\{test.level}" ) # 2) Enter Game Mode @@ -281,4 +279,4 @@ def C15096732_Material_DefaultLibraryUpdatedAcrossLevels_after(): if __name__ == "__main__": from editor_python_test_tools.utils import Report - Report.start_test(C15096732_Material_DefaultLibraryUpdatedAcrossLevels_after) + Report.start_test(Material_DefaultLibraryUpdatedAcrossLevels_after) diff --git a/AutomatedTesting/Gem/PythonTests/physics/material/C15096732_Material_DefaultLibraryUpdatedAcrossLevels_before.py b/AutomatedTesting/Gem/PythonTests/physics/tests/material/Material_DefaultLibraryUpdatedAcrossLevels_before.py similarity index 96% rename from AutomatedTesting/Gem/PythonTests/physics/material/C15096732_Material_DefaultLibraryUpdatedAcrossLevels_before.py rename to AutomatedTesting/Gem/PythonTests/physics/tests/material/Material_DefaultLibraryUpdatedAcrossLevels_before.py index 46262f3f77..15db5808e2 100644 --- a/AutomatedTesting/Gem/PythonTests/physics/material/C15096732_Material_DefaultLibraryUpdatedAcrossLevels_before.py +++ b/AutomatedTesting/Gem/PythonTests/physics/tests/material/Material_DefaultLibraryUpdatedAcrossLevels_before.py @@ -33,7 +33,7 @@ class Tests: # fmt: on -def C15096732_Material_DefaultLibraryUpdatedAcrossLevels_before(): +def Material_DefaultLibraryUpdatedAcrossLevels_before(): """ Summary: Verify Default material library works across different levels, this is the first stage to the test. After the tests are run this script will save data into a text file and the editor closed. @@ -169,7 +169,7 @@ def C15096732_Material_DefaultLibraryUpdatedAcrossLevels_before(): try: with open( os.path.join( - os.getcwd(), "AutomatedTesting", "Levels", "Physics", "C15096732_Material_DefaultLibraryUpdatedAcrossLevels", "_last_run_before_change_data.txt" + os.getcwd(), "AutomatedTesting", "Levels", "Physics", "Material_DefaultLibraryUpdatedAcrossLevels", "_last_run_before_change_data.txt" ),"w") as data_file: for data_point in data: data_file.write(str(data_point)) @@ -188,10 +188,8 @@ def C15096732_Material_DefaultLibraryUpdatedAcrossLevels_before(): for test in test_list: # 1) Open the correct level is open helper.open_level( - "physics", - "C15096732_Material_DefaultLibraryUpdatedAcrossLevels.\\{}".format( - test.level - ), + "Physics", + f"Material_DefaultLibraryUpdatedAcrossLevels\\{test.level}" ) # 2) Enter Game Mode @@ -233,4 +231,4 @@ def C15096732_Material_DefaultLibraryUpdatedAcrossLevels_before(): if __name__ == "__main__": from editor_python_test_tools.utils import Report - Report.start_test(C15096732_Material_DefaultLibraryUpdatedAcrossLevels_before) + Report.start_test(Material_DefaultLibraryUpdatedAcrossLevels_before) diff --git a/AutomatedTesting/Gem/PythonTests/physics/material/C15096737_Materials_DefaultMaterialLibraryChanges.py b/AutomatedTesting/Gem/PythonTests/physics/tests/material/Material_DefaultMaterialLibraryChangesWork.py similarity index 98% rename from AutomatedTesting/Gem/PythonTests/physics/material/C15096737_Materials_DefaultMaterialLibraryChanges.py rename to AutomatedTesting/Gem/PythonTests/physics/tests/material/Material_DefaultMaterialLibraryChangesWork.py index a4c65fc24c..5aa03d665d 100644 --- a/AutomatedTesting/Gem/PythonTests/physics/material/C15096737_Materials_DefaultMaterialLibraryChanges.py +++ b/AutomatedTesting/Gem/PythonTests/physics/tests/material/Material_DefaultMaterialLibraryChangesWork.py @@ -64,7 +64,7 @@ class Tests: concrete_material_changed = ("Concrete material changed correctly", "Concrete didn't react correctly") # fmt: on -def C15096737_Materials_DefaultMaterialLibraryChanges(): +def Material_DefaultMaterialLibraryChangesWork(): """ Summary: Runs an automated test to verify that material selected in the default material library is applied to PhysX colliders, character controller, terrain texture layers and ragdolls and that material can respond to change. @@ -252,7 +252,7 @@ def C15096737_Materials_DefaultMaterialLibraryChanges(): # Main Script helper.init_idle() # 1) Load the level - helper.open_level("Physics", "C15096737_Materials_DefaultMaterialLibraryChanges") + helper.open_level("Physics", "Material_DefaultMaterialLibraryChangesWork") # 2) Setup targets and colliders terrain = Entity("terrain") @@ -292,4 +292,4 @@ def C15096737_Materials_DefaultMaterialLibraryChanges(): if __name__ == "__main__": from editor_python_test_tools.utils import Report - Report.start_test(C15096737_Materials_DefaultMaterialLibraryChanges) + Report.start_test(Material_DefaultMaterialLibraryChangesWork) diff --git a/AutomatedTesting/Gem/PythonTests/physics/material/C4044459_Material_DynamicFriction.py b/AutomatedTesting/Gem/PythonTests/physics/tests/material/Material_DynamicFriction.py similarity index 98% rename from AutomatedTesting/Gem/PythonTests/physics/material/C4044459_Material_DynamicFriction.py rename to AutomatedTesting/Gem/PythonTests/physics/tests/material/Material_DynamicFriction.py index cdf2816f17..7ebe5b8528 100644 --- a/AutomatedTesting/Gem/PythonTests/physics/material/C4044459_Material_DynamicFriction.py +++ b/AutomatedTesting/Gem/PythonTests/physics/tests/material/Material_DynamicFriction.py @@ -35,7 +35,7 @@ class Tests(): # fmt: on -def C4044459_Material_DynamicFriction(): +def Material_DynamicFriction(): """ Summary: Runs an automated test to ensure that greater dynamic friction coefficient settings on a physX material results in @@ -119,7 +119,7 @@ def C4044459_Material_DynamicFriction(): helper.init_idle() # 1) Open level - helper.open_level("Physics", "C4044459_Material_DynamicFriction") + helper.open_level("Physics", "Material_DynamicFriction") # 2) Enter game mode helper.enter_game_mode(Tests.enter_game_mode) @@ -187,4 +187,4 @@ def C4044459_Material_DynamicFriction(): if __name__ == "__main__": from editor_python_test_tools.utils import Report - Report.start_test(C4044459_Material_DynamicFriction) + Report.start_test(Material_DynamicFriction) diff --git a/AutomatedTesting/Gem/PythonTests/physics/material/C4044694_Material_EmptyLibraryUsesDefault.py b/AutomatedTesting/Gem/PythonTests/physics/tests/material/Material_EmptyLibraryUsesDefault.py similarity index 97% rename from AutomatedTesting/Gem/PythonTests/physics/material/C4044694_Material_EmptyLibraryUsesDefault.py rename to AutomatedTesting/Gem/PythonTests/physics/tests/material/Material_EmptyLibraryUsesDefault.py index 8cba90cba8..1d06092f61 100644 --- a/AutomatedTesting/Gem/PythonTests/physics/material/C4044694_Material_EmptyLibraryUsesDefault.py +++ b/AutomatedTesting/Gem/PythonTests/physics/tests/material/Material_EmptyLibraryUsesDefault.py @@ -28,7 +28,7 @@ class Tests: # fmt: on -def C4044694_Material_EmptyLibraryUsesDefault(): +def Material_EmptyLibraryUsesDefault(): """ Summary: Runs an automated test to verify that an object with an empty Material library in a Collider Component continues to @@ -137,7 +137,7 @@ def C4044694_Material_EmptyLibraryUsesDefault(): # 1) Open level and enter game mode helper.init_idle() - helper.open_level("Physics", "C4044694_Material_EmptyLibraryUsesDefault") + helper.open_level("Physics", "Material_EmptyLibraryUsesDefault") helper.enter_game_mode(Tests.enter_game_mode) # 2) Find entities @@ -185,4 +185,4 @@ def C4044694_Material_EmptyLibraryUsesDefault(): if __name__ == "__main__": from editor_python_test_tools.utils import Report - Report.start_test(C4044694_Material_EmptyLibraryUsesDefault) + Report.start_test(Material_EmptyLibraryUsesDefault) diff --git a/AutomatedTesting/Gem/PythonTests/physics/material/C4044456_Material_FrictionCombine.py b/AutomatedTesting/Gem/PythonTests/physics/tests/material/Material_FrictionCombine.py similarity index 98% rename from AutomatedTesting/Gem/PythonTests/physics/material/C4044456_Material_FrictionCombine.py rename to AutomatedTesting/Gem/PythonTests/physics/tests/material/Material_FrictionCombine.py index 8c3b389264..afd775fb7a 100644 --- a/AutomatedTesting/Gem/PythonTests/physics/material/C4044456_Material_FrictionCombine.py +++ b/AutomatedTesting/Gem/PythonTests/physics/tests/material/Material_FrictionCombine.py @@ -36,7 +36,7 @@ class Tests(): # fmt: on -def C4044456_Material_FrictionCombine(): +def Material_FrictionCombine(): """ Summary: @@ -137,7 +137,7 @@ def C4044456_Material_FrictionCombine(): helper.init_idle() # 1) Open level - helper.open_level("Physics", "C4044456_Material_FrictionCombine") + helper.open_level("Physics", "Material_FrictionCombine") # 2) Enter game mode helper.enter_game_mode(Tests.enter_game_mode) @@ -209,4 +209,4 @@ def C4044456_Material_FrictionCombine(): if __name__ == "__main__": from editor_python_test_tools.utils import Report - Report.start_test(C4044456_Material_FrictionCombine) + Report.start_test(Material_FrictionCombine) diff --git a/AutomatedTesting/Gem/PythonTests/physics/material/C18977601_Material_FrictionCombinePriority.py b/AutomatedTesting/Gem/PythonTests/physics/tests/material/Material_FrictionCombinePriorityOrder.py similarity index 98% rename from AutomatedTesting/Gem/PythonTests/physics/material/C18977601_Material_FrictionCombinePriority.py rename to AutomatedTesting/Gem/PythonTests/physics/tests/material/Material_FrictionCombinePriorityOrder.py index 4cef743854..d7fc89c8a6 100644 --- a/AutomatedTesting/Gem/PythonTests/physics/material/C18977601_Material_FrictionCombinePriority.py +++ b/AutomatedTesting/Gem/PythonTests/physics/tests/material/Material_FrictionCombinePriorityOrder.py @@ -50,7 +50,7 @@ class Tests(): # fmt: on -def C18977601_Material_FrictionCombinePriority(): +def Material_FrictionCombinePriorityOrder(): """ Summary: Runs an automated test to ensure that the friction combine mode is assigned according to the correct priority. @@ -269,7 +269,7 @@ def C18977601_Material_FrictionCombinePriority(): helper.init_idle() # 1) Open level - helper.open_level("Physics", "C18977601_Material_FrictionCombinePriority") + helper.open_level("Physics", "Material_FrictionCombinePriorityOrder") # 2) Enter game mode helper.enter_game_mode(Tests.enter_game_mode) @@ -352,4 +352,4 @@ def C18977601_Material_FrictionCombinePriority(): if __name__ == "__main__": from editor_python_test_tools.utils import Report - Report.start_test(C18977601_Material_FrictionCombinePriority) + Report.start_test(Material_FrictionCombinePriorityOrder) diff --git a/AutomatedTesting/Gem/PythonTests/physics/material/C4044455_Material_libraryChangesInstantly.py b/AutomatedTesting/Gem/PythonTests/physics/tests/material/Material_LibraryChangesReflectInstantly.py similarity index 99% rename from AutomatedTesting/Gem/PythonTests/physics/material/C4044455_Material_libraryChangesInstantly.py rename to AutomatedTesting/Gem/PythonTests/physics/tests/material/Material_LibraryChangesReflectInstantly.py index 8eb2e7e9a4..008f660e5c 100644 --- a/AutomatedTesting/Gem/PythonTests/physics/material/C4044455_Material_libraryChangesInstantly.py +++ b/AutomatedTesting/Gem/PythonTests/physics/tests/material/Material_LibraryChangesReflectInstantly.py @@ -114,7 +114,7 @@ class Tests: # fmt: on -def C4044455_Material_libraryChangesInstantly(): +def Material_LibraryChangesReflectInstantly(): """ Summary: Verify that any change in any of the values of the material, once saved, is immediately reflected in the component and functionality @@ -474,4 +474,4 @@ def C4044455_Material_libraryChangesInstantly(): if __name__ == "__main__": from editor_python_test_tools.utils import Report - Report.start_test(C4044455_Material_libraryChangesInstantly) + Report.start_test(Material_LibraryChangesReflectInstantly) diff --git a/AutomatedTesting/Gem/PythonTests/physics/material/C15096740_Material_LibraryUpdatedCorrectly.py b/AutomatedTesting/Gem/PythonTests/physics/tests/material/Material_LibraryClearingAssignsDefault.py similarity index 97% rename from AutomatedTesting/Gem/PythonTests/physics/material/C15096740_Material_LibraryUpdatedCorrectly.py rename to AutomatedTesting/Gem/PythonTests/physics/tests/material/Material_LibraryClearingAssignsDefault.py index 88c51bae8a..66bca8bfda 100644 --- a/AutomatedTesting/Gem/PythonTests/physics/material/C15096740_Material_LibraryUpdatedCorrectly.py +++ b/AutomatedTesting/Gem/PythonTests/physics/tests/material/Material_LibraryClearingAssignsDefault.py @@ -21,7 +21,7 @@ class Tests(): # fmt: on -def C15096740_Material_LibraryUpdatedCorrectly(): +def Material_LibraryClearingAssignsDefault(): """ Summary: @@ -100,4 +100,4 @@ def C15096740_Material_LibraryUpdatedCorrectly(): if __name__ == "__main__": from editor_python_test_tools.utils import Report - Report.start_test(C15096740_Material_LibraryUpdatedCorrectly) + Report.start_test(Material_LibraryClearingAssignsDefault) diff --git a/AutomatedTesting/Gem/PythonTests/physics/material/C15563573_Material_AddModifyDeleteOnCharacterController.py b/AutomatedTesting/Gem/PythonTests/physics/tests/material/Material_LibraryCrudOperationsReflectOnCharacterController.py similarity index 97% rename from AutomatedTesting/Gem/PythonTests/physics/material/C15563573_Material_AddModifyDeleteOnCharacterController.py rename to AutomatedTesting/Gem/PythonTests/physics/tests/material/Material_LibraryCrudOperationsReflectOnCharacterController.py index cf38ddc11c..aeface4d48 100644 --- a/AutomatedTesting/Gem/PythonTests/physics/material/C15563573_Material_AddModifyDeleteOnCharacterController.py +++ b/AutomatedTesting/Gem/PythonTests/physics/tests/material/Material_LibraryCrudOperationsReflectOnCharacterController.py @@ -44,7 +44,7 @@ class Tests: # fmt: on -def C15563573_Material_AddModifyDeleteOnCharacterController(): +def Material_LibraryCrudOperationsReflectOnCharacterController(): """ Summary: Runs an automated test to verify that any change (Add/Delete/Modify) made to the material surface in the material @@ -161,7 +161,7 @@ def C15563573_Material_AddModifyDeleteOnCharacterController(): # 1) Open level and enter game mode helper.init_idle() - helper.open_level("Physics", "C15563573_Material_AddModifyDeleteOnCharacterController") + helper.open_level("Physics", "Material_LibraryCrudOperationsReflectOnCharacterController") # Setup persisting entities default_box = Box("on_default") @@ -193,4 +193,4 @@ def C15563573_Material_AddModifyDeleteOnCharacterController(): if __name__ == "__main__": from editor_python_test_tools.utils import Report - Report.start_test(C15563573_Material_AddModifyDeleteOnCharacterController) + Report.start_test(Material_LibraryCrudOperationsReflectOnCharacterController) diff --git a/AutomatedTesting/Gem/PythonTests/physics/material/C4888315_Material_AddModifyDeleteOnCollider.py b/AutomatedTesting/Gem/PythonTests/physics/tests/material/Material_LibraryCrudOperationsReflectOnCollider.py similarity index 97% rename from AutomatedTesting/Gem/PythonTests/physics/material/C4888315_Material_AddModifyDeleteOnCollider.py rename to AutomatedTesting/Gem/PythonTests/physics/tests/material/Material_LibraryCrudOperationsReflectOnCollider.py index 61c378d287..8abdbf1ddd 100644 --- a/AutomatedTesting/Gem/PythonTests/physics/material/C4888315_Material_AddModifyDeleteOnCollider.py +++ b/AutomatedTesting/Gem/PythonTests/physics/tests/material/Material_LibraryCrudOperationsReflectOnCollider.py @@ -41,7 +41,7 @@ class Tests: # fmt: on -def C4888315_Material_AddModifyDeleteOnCollider(): +def Material_LibraryCrudOperationsReflectOnCollider(): """ Summary: Runs an automated test to verify that any change (Add/Delete/Modify) made to the material surface in the material @@ -141,7 +141,7 @@ def C4888315_Material_AddModifyDeleteOnCollider(): # 1) Open level and enter game mode helper.init_idle() - helper.open_level("Physics", "C4888315_Material_AddModifyDeleteOnCollider") + helper.open_level("Physics", "Material_LibraryCrudOperationsReflectOnCollider") # Setup persisting entities default_box = Box("default") @@ -172,4 +172,4 @@ def C4888315_Material_AddModifyDeleteOnCollider(): if __name__ == "__main__": from editor_python_test_tools.utils import Report - Report.start_test(C4888315_Material_AddModifyDeleteOnCollider) + Report.start_test(Material_LibraryCrudOperationsReflectOnCollider) diff --git a/AutomatedTesting/Gem/PythonTests/physics/material/C4925582_Material_AddModifyDeleteOnRagdollBones.py b/AutomatedTesting/Gem/PythonTests/physics/tests/material/Material_LibraryCrudOperationsReflectOnRagdollBones.py similarity index 98% rename from AutomatedTesting/Gem/PythonTests/physics/material/C4925582_Material_AddModifyDeleteOnRagdollBones.py rename to AutomatedTesting/Gem/PythonTests/physics/tests/material/Material_LibraryCrudOperationsReflectOnRagdollBones.py index 0abfae08f9..ab85a2157a 100644 --- a/AutomatedTesting/Gem/PythonTests/physics/material/C4925582_Material_AddModifyDeleteOnRagdollBones.py +++ b/AutomatedTesting/Gem/PythonTests/physics/tests/material/Material_LibraryCrudOperationsReflectOnRagdollBones.py @@ -41,7 +41,7 @@ class Tests: # fmt: on -def C4925582_Material_AddModifyDeleteOnRagdollBones(): +def Material_LibraryCrudOperationsReflectOnRagdollBones(): """ Summary: Runs an automated test to verify that any change (Add/Delete/Modify) made to the material surface in the material @@ -170,7 +170,7 @@ def C4925582_Material_AddModifyDeleteOnRagdollBones(): # 1) Open level and enter game mode helper.init_idle() - helper.open_level("Physics", "C4925582_Material_AddModifyDeleteOnRagdollBones") + helper.open_level("Physics", "Material_LibraryCrudOperationsReflectOnRagdollBones") # Setup persisting entities default_ragdoll = Ragdoll("default") @@ -208,4 +208,4 @@ def C4925582_Material_AddModifyDeleteOnRagdollBones(): if __name__ == "__main__": from editor_python_test_tools.utils import Report - Report.start_test(C4925582_Material_AddModifyDeleteOnRagdollBones) + Report.start_test(Material_LibraryCrudOperationsReflectOnRagdollBones) diff --git a/AutomatedTesting/Gem/PythonTests/physics/material/C4925579_Material_AddModifyDeleteOnTerrain.py b/AutomatedTesting/Gem/PythonTests/physics/tests/material/Material_LibraryCrudOperationsReflectOnTerrain.py similarity index 97% rename from AutomatedTesting/Gem/PythonTests/physics/material/C4925579_Material_AddModifyDeleteOnTerrain.py rename to AutomatedTesting/Gem/PythonTests/physics/tests/material/Material_LibraryCrudOperationsReflectOnTerrain.py index 8b3d72a932..484b3bbd8b 100644 --- a/AutomatedTesting/Gem/PythonTests/physics/material/C4925579_Material_AddModifyDeleteOnTerrain.py +++ b/AutomatedTesting/Gem/PythonTests/physics/tests/material/Material_LibraryCrudOperationsReflectOnTerrain.py @@ -41,7 +41,7 @@ class Tests: # fmt: on -def C4925579_Material_AddModifyDeleteOnTerrain(): +def Material_LibraryCrudOperationsReflectOnTerrain(): """ Summary: Runs an automated test to verify that any change (Add/Delete/Modify) made to the material surface in the material @@ -141,7 +141,7 @@ def C4925579_Material_AddModifyDeleteOnTerrain(): # 1) Open level and enter game mode helper.init_idle() - helper.open_level("Physics", "C4925579_Material_AddModifyDeleteOnTerrain") + helper.open_level("Physics", "Material_LibraryCrudOperationsReflectOnTerrain") # Setup persisting entities default_box = Box("on_default") @@ -172,4 +172,4 @@ def C4925579_Material_AddModifyDeleteOnTerrain(): if __name__ == "__main__": from editor_python_test_tools.utils import Report - Report.start_test(C4925579_Material_AddModifyDeleteOnTerrain) + Report.start_test(Material_LibraryCrudOperationsReflectOnTerrain) diff --git a/AutomatedTesting/Gem/PythonTests/physics/material/C15425935_Material_LibraryUpdatedAcrossLevels.py b/AutomatedTesting/Gem/PythonTests/physics/tests/material/Material_LibraryUpdatedAcrossLevels.py similarity index 97% rename from AutomatedTesting/Gem/PythonTests/physics/material/C15425935_Material_LibraryUpdatedAcrossLevels.py rename to AutomatedTesting/Gem/PythonTests/physics/tests/material/Material_LibraryUpdatedAcrossLevels.py index 91452a1173..0b647361f6 100644 --- a/AutomatedTesting/Gem/PythonTests/physics/material/C15425935_Material_LibraryUpdatedAcrossLevels.py +++ b/AutomatedTesting/Gem/PythonTests/physics/tests/material/Material_LibraryUpdatedAcrossLevels.py @@ -61,7 +61,7 @@ class Tests: # fmt: on -def C15425935_Material_LibraryUpdatedAcrossLevels(): +def Material_LibraryUpdatedAcrossLevels(): """ Summary: Verify that the change in a physmaterial library gets updated across levels @@ -231,7 +231,7 @@ def C15425935_Material_LibraryUpdatedAcrossLevels(): return triggers and delete_sphere_velocities def modify_material_library(): - physmaterial_object = Physmaterial_Editor("C15425935_Material_LibraryUpdatedAcrossLevels.physmaterial") + physmaterial_object = Physmaterial_Editor("Material_LibraryUpdatedAcrossLevels.physmaterial") physmaterial_object.delete_material("to_delete") physmaterial_object.modify_material("to_modify", "Restitution", 1.0) physmaterial_object.save_changes() @@ -253,7 +253,7 @@ def C15425935_Material_LibraryUpdatedAcrossLevels(): # 1) Open the correct level for the test helper.open_level( "physics", - "C15425935_Material_LibraryUpdatedAcrossLevels\\C15425935_Material_LibraryUpdatedAcrossLevels_{}".format( + "Material_LibraryUpdatedAcrossLevels\\Material_LibraryUpdatedAcrossLevels_{}".format( test.level_index ), ) @@ -302,4 +302,4 @@ def C15425935_Material_LibraryUpdatedAcrossLevels(): if __name__ == "__main__": from editor_python_test_tools.utils import Report - Report.start_test(C15425935_Material_LibraryUpdatedAcrossLevels) + Report.start_test(Material_LibraryUpdatedAcrossLevels) diff --git a/AutomatedTesting/Gem/PythonTests/physics/material/C5296614_PhysXMaterial_ColliderShape.py b/AutomatedTesting/Gem/PythonTests/physics/tests/material/Material_NoEffectIfNoColliderShape.py similarity index 97% rename from AutomatedTesting/Gem/PythonTests/physics/material/C5296614_PhysXMaterial_ColliderShape.py rename to AutomatedTesting/Gem/PythonTests/physics/tests/material/Material_NoEffectIfNoColliderShape.py index de7ed4db9b..7037598fb1 100644 --- a/AutomatedTesting/Gem/PythonTests/physics/material/C5296614_PhysXMaterial_ColliderShape.py +++ b/AutomatedTesting/Gem/PythonTests/physics/tests/material/Material_NoEffectIfNoColliderShape.py @@ -10,8 +10,6 @@ SPDX-License-Identifier: Apache-2.0 OR MIT # Test Case Title : Check that unless you assign a shape to a physX collider component, # the material assigned to it does not take affect - - # fmt: off class Tests: # level @@ -30,7 +28,7 @@ class Tests: # fmt: on -def C5296614_PhysXMaterial_ColliderShape(): +def Material_NoEffectIfNoColliderShape(): """ Summary: Runs an automated test to verify that unless you assign a shape to a PhysX collider component, @@ -122,7 +120,7 @@ def C5296614_PhysXMaterial_ColliderShape(): helper.init_idle() # 1) Load the level - helper.open_level("Physics", "C5296614_PhysXMaterial_ColliderShape") + helper.open_level("Physics", "Material_NoEffectIfNoColliderShape") # 2) Enter game mode helper.enter_game_mode(Tests.enter_game_mode) @@ -148,4 +146,4 @@ def C5296614_PhysXMaterial_ColliderShape(): if __name__ == "__main__": from editor_python_test_tools.utils import Report - Report.start_test(C5296614_PhysXMaterial_ColliderShape) + Report.start_test(Material_NoEffectIfNoColliderShape) diff --git a/AutomatedTesting/Gem/PythonTests/physics/material/C4044697_Material_PerfaceMaterialValidation.py b/AutomatedTesting/Gem/PythonTests/physics/tests/material/Material_PerFaceMaterialGetsCorrectMaterial.py similarity index 98% rename from AutomatedTesting/Gem/PythonTests/physics/material/C4044697_Material_PerfaceMaterialValidation.py rename to AutomatedTesting/Gem/PythonTests/physics/tests/material/Material_PerFaceMaterialGetsCorrectMaterial.py index 9ee8d404d7..fc2a91838c 100644 --- a/AutomatedTesting/Gem/PythonTests/physics/material/C4044697_Material_PerfaceMaterialValidation.py +++ b/AutomatedTesting/Gem/PythonTests/physics/tests/material/Material_PerFaceMaterialGetsCorrectMaterial.py @@ -48,7 +48,7 @@ class Tests: # fmt: on -def C4044697_Material_PerfaceMaterialValidation(): +def Material_PerFaceMaterialGetsCorrectMaterial(): """ Summary: The perface has three different faces that can pick up different materials. To check that each face picks up the material assigned to it I send three spheres of the same material at each face to see the @@ -236,7 +236,7 @@ def C4044697_Material_PerfaceMaterialValidation(): # Main Script helper.init_idle() # 1) Open Level - helper.open_level("Physics", "C4044697_Material_PerfaceMaterialValidation") + helper.open_level("Physics", "Material_PerFaceMaterialGetsCorrectMaterial") # 2) Enter Game Mode helper.enter_game_mode(Tests.enter_game_mode) @@ -298,4 +298,4 @@ def C4044697_Material_PerfaceMaterialValidation(): if __name__ == "__main__": from editor_python_test_tools.utils import Report - Report.start_test(C4044697_Material_PerfaceMaterialValidation) + Report.start_test(Material_PerFaceMaterialGetsCorrectMaterial) diff --git a/AutomatedTesting/Gem/PythonTests/physics/material/C4925580_Material_RagdollBonesMaterial.py b/AutomatedTesting/Gem/PythonTests/physics/tests/material/Material_RagdollBones.py similarity index 98% rename from AutomatedTesting/Gem/PythonTests/physics/material/C4925580_Material_RagdollBonesMaterial.py rename to AutomatedTesting/Gem/PythonTests/physics/tests/material/Material_RagdollBones.py index 96316b1cdf..68565b41f0 100644 --- a/AutomatedTesting/Gem/PythonTests/physics/material/C4925580_Material_RagdollBonesMaterial.py +++ b/AutomatedTesting/Gem/PythonTests/physics/tests/material/Material_RagdollBones.py @@ -29,7 +29,7 @@ class Tests: # fmt: on -def C4925580_Material_RagdollBonesMaterial(): +def Material_RagdollBones(): """ Summary: This script runs an automated test to verify that assigning material to the skeleton of an actor entity with PhysX @@ -116,7 +116,7 @@ def C4925580_Material_RagdollBonesMaterial(): # 1) Open level and enter game mode helper.init_idle() - helper.open_level("Physics", "C4925580_Material_RagdollBonesMaterial") + helper.open_level("Physics", "Material_RagdollBones") helper.enter_game_mode(Tests.enter_game_mode) # 2) Retrieve and validate entities @@ -190,4 +190,4 @@ def C4925580_Material_RagdollBonesMaterial(): if __name__ == "__main__": from editor_python_test_tools.utils import Report - Report.start_test(C4925580_Material_RagdollBonesMaterial) + Report.start_test(Material_RagdollBones) diff --git a/AutomatedTesting/Gem/PythonTests/physics/material/C4044461_Material_Restitution.py b/AutomatedTesting/Gem/PythonTests/physics/tests/material/Material_Restitution.py similarity index 98% rename from AutomatedTesting/Gem/PythonTests/physics/material/C4044461_Material_Restitution.py rename to AutomatedTesting/Gem/PythonTests/physics/tests/material/Material_Restitution.py index b077af1593..ee72fed7af 100644 --- a/AutomatedTesting/Gem/PythonTests/physics/material/C4044461_Material_Restitution.py +++ b/AutomatedTesting/Gem/PythonTests/physics/tests/material/Material_Restitution.py @@ -36,7 +36,7 @@ class Tests(): # fmt: on -def C4044461_Material_Restitution(): +def Material_Restitution(): """ Summary: Runs an automated test to ensure that greater restitution coefficient settings on a physX material results in @@ -147,7 +147,7 @@ def C4044461_Material_Restitution(): helper.init_idle() # 1) Open level - helper.open_level("Physics", "C4044461_Material_Restitution") + helper.open_level("Physics", "Material_Restitution") # 2) Enter game mode helper.enter_game_mode(Tests.enter_game_mode) @@ -226,4 +226,4 @@ def C4044461_Material_Restitution(): if __name__ == "__main__": from editor_python_test_tools.utils import Report - Report.start_test(C4044461_Material_Restitution) + Report.start_test(Material_Restitution) diff --git a/AutomatedTesting/Gem/PythonTests/physics/material/C4044457_Material_RestitutionCombine.py b/AutomatedTesting/Gem/PythonTests/physics/tests/material/Material_RestitutionCombine.py similarity index 98% rename from AutomatedTesting/Gem/PythonTests/physics/material/C4044457_Material_RestitutionCombine.py rename to AutomatedTesting/Gem/PythonTests/physics/tests/material/Material_RestitutionCombine.py index a20c7e49f7..448e82f816 100644 --- a/AutomatedTesting/Gem/PythonTests/physics/material/C4044457_Material_RestitutionCombine.py +++ b/AutomatedTesting/Gem/PythonTests/physics/tests/material/Material_RestitutionCombine.py @@ -36,7 +36,7 @@ class Tests(): # fmt: on -def C4044457_Material_RestitutionCombine(): +def Material_RestitutionCombine(): """ Summary: @@ -159,7 +159,7 @@ def C4044457_Material_RestitutionCombine(): helper.init_idle() # 1) Open level - helper.open_level("Physics", "C4044457_Material_RestitutionCombine") + helper.open_level("Physics", "Material_RestitutionCombine") # 2) Enter game mode helper.enter_game_mode(Tests.enter_game_mode) @@ -241,4 +241,4 @@ def C4044457_Material_RestitutionCombine(): if __name__ == "__main__": from editor_python_test_tools.utils import Report - Report.start_test(C4044457_Material_RestitutionCombine) + Report.start_test(Material_RestitutionCombine) diff --git a/AutomatedTesting/Gem/PythonTests/physics/material/C18981526_Material_RestitutionCombinePriority.py b/AutomatedTesting/Gem/PythonTests/physics/tests/material/Material_RestitutionCombinePriorityOrder.py similarity index 98% rename from AutomatedTesting/Gem/PythonTests/physics/material/C18981526_Material_RestitutionCombinePriority.py rename to AutomatedTesting/Gem/PythonTests/physics/tests/material/Material_RestitutionCombinePriorityOrder.py index 9663453df2..09d630ebe2 100644 --- a/AutomatedTesting/Gem/PythonTests/physics/material/C18981526_Material_RestitutionCombinePriority.py +++ b/AutomatedTesting/Gem/PythonTests/physics/tests/material/Material_RestitutionCombinePriorityOrder.py @@ -50,7 +50,7 @@ class Tests(): # fmt: on -def C18981526_Material_RestitutionCombinePriority(): +def Material_RestitutionCombinePriorityOrder(): """ Summary: Runs an automated test to ensure that the restitution combine mode is assigned according to the correct priority. @@ -334,7 +334,7 @@ def C18981526_Material_RestitutionCombinePriority(): helper.init_idle() # 1) Open level - helper.open_level("Physics", "C18981526_Material_RestitutionCombinePriority") + helper.open_level("Physics", "Material_RestitutionCombinePriorityOrder") # 2) Enter game mode helper.enter_game_mode(Tests.enter_game_mode) @@ -413,4 +413,4 @@ def C18981526_Material_RestitutionCombinePriority(): if __name__ == "__main__": from editor_python_test_tools.utils import Report - Report.start_test(C18981526_Material_RestitutionCombinePriority) + Report.start_test(Material_RestitutionCombinePriorityOrder) diff --git a/AutomatedTesting/Gem/PythonTests/physics/material/C4044460_Material_StaticFriction.py b/AutomatedTesting/Gem/PythonTests/physics/tests/material/Material_StaticFriction.py similarity index 98% rename from AutomatedTesting/Gem/PythonTests/physics/material/C4044460_Material_StaticFriction.py rename to AutomatedTesting/Gem/PythonTests/physics/tests/material/Material_StaticFriction.py index 5558f01222..6d5551cbbc 100644 --- a/AutomatedTesting/Gem/PythonTests/physics/material/C4044460_Material_StaticFriction.py +++ b/AutomatedTesting/Gem/PythonTests/physics/tests/material/Material_StaticFriction.py @@ -31,7 +31,7 @@ class Tests(): # fmt: on -def C4044460_Material_StaticFriction(): +def Material_StaticFriction(): """ Summary: Runs an automated test to ensure that greater static friction coefficient settings on a physX material results in @@ -126,7 +126,7 @@ def C4044460_Material_StaticFriction(): helper.init_idle() # 1) Open level - helper.open_level("Physics", "C4044460_Material_StaticFriction") + helper.open_level("Physics", "Material_StaticFriction") # 2) Enter game mode helper.enter_game_mode(Tests.enter_game_mode) @@ -184,4 +184,4 @@ def C4044460_Material_StaticFriction(): if __name__ == "__main__": from editor_python_test_tools.utils import Report - Report.start_test(C4044460_Material_StaticFriction) + Report.start_test(Material_StaticFriction) diff --git a/AutomatedTesting/Gem/PythonTests/physics/material/Physmaterial_Editor.py b/AutomatedTesting/Gem/PythonTests/physics/tests/material/Physmaterial_Editor.py similarity index 100% rename from AutomatedTesting/Gem/PythonTests/physics/material/Physmaterial_Editor.py rename to AutomatedTesting/Gem/PythonTests/physics/tests/material/Physmaterial_Editor.py diff --git a/AutomatedTesting/Gem/PythonTests/physics/ragdoll/C17411467_AddPhysxRagdollComponent.py b/AutomatedTesting/Gem/PythonTests/physics/tests/ragdoll/Ragdoll_AddPhysxRagdollComponentWorks.py similarity index 97% rename from AutomatedTesting/Gem/PythonTests/physics/ragdoll/C17411467_AddPhysxRagdollComponent.py rename to AutomatedTesting/Gem/PythonTests/physics/tests/ragdoll/Ragdoll_AddPhysxRagdollComponentWorks.py index 9c02239d73..9791d385fc 100644 --- a/AutomatedTesting/Gem/PythonTests/physics/ragdoll/C17411467_AddPhysxRagdollComponent.py +++ b/AutomatedTesting/Gem/PythonTests/physics/tests/ragdoll/Ragdoll_AddPhysxRagdollComponentWorks.py @@ -19,7 +19,7 @@ class Tests(): # fmt: on -def C17411467_AddPhysxRagdollComponent(): +def Ragdoll_AddPhysxRagdollComponentWorks(): """ Summary: Load level with Entity having Actor, AnimGraph and PhysX Ragdoll components. @@ -89,4 +89,4 @@ def C17411467_AddPhysxRagdollComponent(): if __name__ == "__main__": from editor_python_test_tools.utils import Report - Report.start_test(C17411467_AddPhysxRagdollComponent) + Report.start_test(Ragdoll_AddPhysxRagdollComponentWorks) diff --git a/AutomatedTesting/Gem/PythonTests/physics/ragdoll/C13895144_Ragdoll_ChangeLevel.py b/AutomatedTesting/Gem/PythonTests/physics/tests/ragdoll/Ragdoll_LevelSwitchDoesNotCrash.py similarity index 86% rename from AutomatedTesting/Gem/PythonTests/physics/ragdoll/C13895144_Ragdoll_ChangeLevel.py rename to AutomatedTesting/Gem/PythonTests/physics/tests/ragdoll/Ragdoll_LevelSwitchDoesNotCrash.py index c7ff00a7e3..eb54c39aa8 100644 --- a/AutomatedTesting/Gem/PythonTests/physics/ragdoll/C13895144_Ragdoll_ChangeLevel.py +++ b/AutomatedTesting/Gem/PythonTests/physics/tests/ragdoll/Ragdoll_LevelSwitchDoesNotCrash.py @@ -21,21 +21,21 @@ class Tests(): # fmt: on -def C13895144_Ragdoll_ChangeLevel(): +def Ragdoll_LevelSwitchDoesNotCrash(): """ Summary: Runs an automated test to ensure that switching from a level with many ragdolls to a level with no ragdolls does not crash the editor. Level Description: - C13895144_Ragdoll_WithRagdoll: + Ragdoll_LevelSwitchDoesNotCrash/WithRagdoll: 10 Ragdoll entities are placed in a row. Each Entity has an Actor, Anim Graph and PhysX Ragdoll component. - C13895144_Ragdoll_NoRagdoll: + Ragdoll_LevelSwitchDoesNotCrash/NoRagdoll: The same default level configuration as previous, but with no ragdoll entities. Essentially an empty level. Expected Behavior: - C13895144_Ragdoll_WithRagdoll loads, all entities are found, then C13895144_Ragdoll_NoRagdoll loads correctly. + Ragdoll_LevelSwitchDoesNotCrash/WithRagdoll loads, all entities are found, then Ragdoll_LevelSwitchDoesNotCrash/NoRagdoll loads correctly. No crash should occur. Test Steps: @@ -67,7 +67,7 @@ def C13895144_Ragdoll_ChangeLevel(): helper.init_idle() # 1) Open level - helper.open_level("Physics", "C13895144_Ragdoll_WithRagdoll") + helper.open_level("Physics", "Ragdoll_LevelSwitchDoesNotCrash/WithRagdoll") # 2) Enter game mode helper.enter_game_mode(Tests.enter_game_mode_with_ragdolls) @@ -86,7 +86,7 @@ def C13895144_Ragdoll_ChangeLevel(): helper.exit_game_mode(Tests.exit_game_mode_with_ragdolls) # 5) Open level (without ragdolls) - helper.open_level("Physics", "C13895144_Ragdoll_NoRagdoll") + helper.open_level("Physics", "Ragdoll_LevelSwitchDoesNotCrash/NoRagdoll") # 6) Enter game mode helper.enter_game_mode(Tests.enter_game_mode_without_ragdolls) @@ -100,4 +100,4 @@ def C13895144_Ragdoll_ChangeLevel(): if __name__ == "__main__": from editor_python_test_tools.utils import Report - Report.start_test(C13895144_Ragdoll_ChangeLevel) + Report.start_test(Ragdoll_LevelSwitchDoesNotCrash) diff --git a/AutomatedTesting/Gem/PythonTests/physics/ragdoll/C14654882_Ragdoll_ragdollAPTest.py b/AutomatedTesting/Gem/PythonTests/physics/tests/ragdoll/Ragdoll_OldRagdollSerializationNoErrors.py similarity index 96% rename from AutomatedTesting/Gem/PythonTests/physics/ragdoll/C14654882_Ragdoll_ragdollAPTest.py rename to AutomatedTesting/Gem/PythonTests/physics/tests/ragdoll/Ragdoll_OldRagdollSerializationNoErrors.py index 56784b0c72..296473ee6d 100644 --- a/AutomatedTesting/Gem/PythonTests/physics/ragdoll/C14654882_Ragdoll_ragdollAPTest.py +++ b/AutomatedTesting/Gem/PythonTests/physics/tests/ragdoll/Ragdoll_OldRagdollSerializationNoErrors.py @@ -32,7 +32,7 @@ class UnexpectedLines: lines = ["Assert", "RagdollComponent' is not registered with the serializer"] -def C14654882_Ragdoll_ragdollAPTest(): +def Ragdoll_OldRagdollSerializationNoErrors(): """ Summary: Opens level containing old PhysX Ragdoll component. @@ -81,7 +81,7 @@ def C14654882_Ragdoll_ragdollAPTest(): log_modified_time = os.stat(AP_GUI_log_path).st_mtime # 1) Open the level - helper.open_level("Physics", "C14654882_Ragdoll_ragdollAPTest") + helper.open_level("Physics", "Ragdoll_OldRagdollSerializationNoErrors") # 2) Enter game mode helper.enter_game_mode(Tests.enter_game_mode) @@ -125,4 +125,4 @@ def C14654882_Ragdoll_ragdollAPTest(): if __name__ == "__main__": from editor_python_test_tools.utils import Report - Report.start_test(C14654882_Ragdoll_ragdollAPTest) + Report.start_test(Ragdoll_OldRagdollSerializationNoErrors) diff --git a/AutomatedTesting/Gem/PythonTests/physics/ragdoll/C28978033_Ragdoll_WorldBodyBusTests.py b/AutomatedTesting/Gem/PythonTests/physics/tests/ragdoll/Ragdoll_WorldBodyBusWorks.py similarity index 96% rename from AutomatedTesting/Gem/PythonTests/physics/ragdoll/C28978033_Ragdoll_WorldBodyBusTests.py rename to AutomatedTesting/Gem/PythonTests/physics/tests/ragdoll/Ragdoll_WorldBodyBusWorks.py index d917449daf..ef6598102f 100644 --- a/AutomatedTesting/Gem/PythonTests/physics/ragdoll/C28978033_Ragdoll_WorldBodyBusTests.py +++ b/AutomatedTesting/Gem/PythonTests/physics/tests/ragdoll/Ragdoll_WorldBodyBusWorks.py @@ -22,7 +22,7 @@ class Tests(): # fmt: on -def C28978033_Ragdoll_WorldBodyBusTests(): +def Ragdoll_WorldBodyBusWorks(): r""" Summary: Runs a test to make sure that a WorldBodyBus works property for ragdolls @@ -61,7 +61,7 @@ def C28978033_Ragdoll_WorldBodyBusTests(): # 1) Open level / Enter game mode helper.init_idle() - helper.open_level("Physics", "C28978033_Ragdoll_WorldBodyBusTests") + helper.open_level("Physics", "Ragdoll_WorldBodyBusWorks") # Needs better solution general.idle_wait(6) # wait a little bit for ragdoll data to load @@ -112,4 +112,4 @@ def C28978033_Ragdoll_WorldBodyBusTests(): if __name__ == "__main__": from editor_python_test_tools.utils import Report - Report.start_test(C28978033_Ragdoll_WorldBodyBusTests) + Report.start_test(Ragdoll_WorldBodyBusWorks) diff --git a/AutomatedTesting/Gem/PythonTests/physics/rigid_body/C4976194_RigidBody_PhysXComponentIsValid.py b/AutomatedTesting/Gem/PythonTests/physics/tests/rigid_body/RigidBody_AddRigidBodyComponent.py similarity index 95% rename from AutomatedTesting/Gem/PythonTests/physics/rigid_body/C4976194_RigidBody_PhysXComponentIsValid.py rename to AutomatedTesting/Gem/PythonTests/physics/tests/rigid_body/RigidBody_AddRigidBodyComponent.py index b0b69d6d91..46136c2115 100644 --- a/AutomatedTesting/Gem/PythonTests/physics/rigid_body/C4976194_RigidBody_PhysXComponentIsValid.py +++ b/AutomatedTesting/Gem/PythonTests/physics/tests/rigid_body/RigidBody_AddRigidBodyComponent.py @@ -22,7 +22,7 @@ class Tests(): # fmt: on -def C4976194_RigidBody_PhysXComponentIsValid(): +def RigidBody_AddRigidBodyComponent(): """ Summary: @@ -74,7 +74,7 @@ def C4976194_RigidBody_PhysXComponentIsValid(): helper.init_idle() # 1) Open level - helper.open_level("Physics", "C4976194_RigidBody_PhysXComponentIsValid") + helper.open_level("Physics", "RigidBody_AddRigidBodyComponent") # 2) Enter game mode helper.enter_game_mode(Tests.enter_game_mode) @@ -109,4 +109,4 @@ def C4976194_RigidBody_PhysXComponentIsValid(): if __name__ == "__main__": from editor_python_test_tools.utils import Report - Report.start_test(C4976194_RigidBody_PhysXComponentIsValid) + Report.start_test(RigidBody_AddRigidBodyComponent) diff --git a/AutomatedTesting/Gem/PythonTests/physics/rigid_body/C4976200_RigidBody_AngularDampingObjectRotation.py b/AutomatedTesting/Gem/PythonTests/physics/tests/rigid_body/RigidBody_AngularDampingAffectsRotation.py similarity index 98% rename from AutomatedTesting/Gem/PythonTests/physics/rigid_body/C4976200_RigidBody_AngularDampingObjectRotation.py rename to AutomatedTesting/Gem/PythonTests/physics/tests/rigid_body/RigidBody_AngularDampingAffectsRotation.py index 77dfe4c483..6631ac66c8 100644 --- a/AutomatedTesting/Gem/PythonTests/physics/rigid_body/C4976200_RigidBody_AngularDampingObjectRotation.py +++ b/AutomatedTesting/Gem/PythonTests/physics/tests/rigid_body/RigidBody_AngularDampingAffectsRotation.py @@ -33,7 +33,7 @@ class Tests: # fmt: on -def C4976200_RigidBody_AngularDampingObjectRotation(): +def RigidBody_AngularDampingAffectsRotation(): """ The level consists of a PhysX Terrain component that is not interacted with (per the test case) 3 PhysX colliders with shape box, PhysX rigid bodies physics, and mesh with shape box. @@ -186,7 +186,7 @@ def C4976200_RigidBody_AngularDampingObjectRotation(): helper.init_idle() # 1) Open level - helper.open_level("Physics", "C4976200_RigidBody_AngularDampingObjectRotation") + helper.open_level("Physics", "RigidBody_AngularDampingAffectsRotation") # 2) Enter game mode helper.enter_game_mode(Tests.enter_game_mode) @@ -284,4 +284,4 @@ def C4976200_RigidBody_AngularDampingObjectRotation(): if __name__ == "__main__": from editor_python_test_tools.utils import Report - Report.start_test(C4976200_RigidBody_AngularDampingObjectRotation) + Report.start_test(RigidBody_AngularDampingAffectsRotation) diff --git a/AutomatedTesting/Gem/PythonTests/physics/rigid_body/C4976209_RigidBody_ComputesCOM.py b/AutomatedTesting/Gem/PythonTests/physics/tests/rigid_body/RigidBody_COM_ComputingWorks.py similarity index 96% rename from AutomatedTesting/Gem/PythonTests/physics/rigid_body/C4976209_RigidBody_ComputesCOM.py rename to AutomatedTesting/Gem/PythonTests/physics/tests/rigid_body/RigidBody_COM_ComputingWorks.py index 27d4ea1356..a399aad877 100644 --- a/AutomatedTesting/Gem/PythonTests/physics/rigid_body/C4976209_RigidBody_ComputesCOM.py +++ b/AutomatedTesting/Gem/PythonTests/physics/tests/rigid_body/RigidBody_COM_ComputingWorks.py @@ -39,7 +39,7 @@ class Tests(): # fmt: on -def C4976209_RigidBody_ComputesCOM(): +def RigidBody_COM_ComputingWorks(): # type: () -> None """ Summary: @@ -116,7 +116,7 @@ def C4976209_RigidBody_ComputesCOM(): helper.init_idle() # 1) Open level - helper.open_level("Physics", "C4976209_RigidBody_ComputesCOM") + helper.open_level("Physics", "RigidBody_COM_ComputingWorks") # 2) Enter game mode helper.enter_game_mode(Tests.enter_game_mode) @@ -158,6 +158,7 @@ def C4976209_RigidBody_ComputesCOM(): # 5) Check center of mass for each physics asset enabled_is_close = physics_asset_enabled.com_local.IsClose(PHYSICS_ASSET_EXPECTED_COM, CLOSE_THRESHOLD) + print(f"{physics_asset_enabled.com_local.x}, {physics_asset_enabled.com_local.y}, {physics_asset_enabled.com_local.z}") Report.result(physics_asset_enabled.com_valid_test, enabled_is_close) disabled_is_close = physics_asset_disabled.com_local.IsClose(CONTROL_COM, CLOSE_THRESHOLD) @@ -169,4 +170,4 @@ def C4976209_RigidBody_ComputesCOM(): if __name__ == "__main__": from editor_python_test_tools.utils import Report - Report.start_test(C4976209_RigidBody_ComputesCOM) + Report.start_test(RigidBody_COM_ComputingWorks) diff --git a/AutomatedTesting/Gem/PythonTests/physics/rigid_body/C4976210_COM_ManualSetting.py b/AutomatedTesting/Gem/PythonTests/physics/tests/rigid_body/RigidBody_COM_ManualSettingWorks.py similarity index 98% rename from AutomatedTesting/Gem/PythonTests/physics/rigid_body/C4976210_COM_ManualSetting.py rename to AutomatedTesting/Gem/PythonTests/physics/tests/rigid_body/RigidBody_COM_ManualSettingWorks.py index cbbefb5a0e..4e5a88fe57 100644 --- a/AutomatedTesting/Gem/PythonTests/physics/rigid_body/C4976210_COM_ManualSetting.py +++ b/AutomatedTesting/Gem/PythonTests/physics/tests/rigid_body/RigidBody_COM_ManualSettingWorks.py @@ -31,7 +31,7 @@ class Tests: # fmt: on -def C4976210_COM_ManualSetting(): +def RigidBody_COM_ManualSettingWorks(): # type: () -> None """ Summary: @@ -244,7 +244,7 @@ def C4976210_COM_ManualSetting(): # 1) Open level and start game mode helper.init_idle() - helper.open_level("Physics", "C4976210_COM_ManualSetting") + helper.open_level("Physics", "RigidBody_COM_ManualSettingWorks") helper.enter_game_mode(Tests.enter_game_mode) # 2) Find and validate test entities @@ -297,4 +297,4 @@ def C4976210_COM_ManualSetting(): if __name__ == "__main__": from editor_python_test_tools.utils import Report - Report.start_test(C4976210_COM_ManualSetting) + Report.start_test(RigidBody_COM_ManualSettingWorks) diff --git a/AutomatedTesting/Gem/PythonTests/physics/rigid_body/C13351703_COM_NotIncludeTriggerShapes.py b/AutomatedTesting/Gem/PythonTests/physics/tests/rigid_body/RigidBody_COM_NotIncludesTriggerShapes.py similarity index 94% rename from AutomatedTesting/Gem/PythonTests/physics/rigid_body/C13351703_COM_NotIncludeTriggerShapes.py rename to AutomatedTesting/Gem/PythonTests/physics/tests/rigid_body/RigidBody_COM_NotIncludesTriggerShapes.py index 56f44503ae..c7724df311 100644 --- a/AutomatedTesting/Gem/PythonTests/physics/rigid_body/C13351703_COM_NotIncludeTriggerShapes.py +++ b/AutomatedTesting/Gem/PythonTests/physics/tests/rigid_body/RigidBody_COM_NotIncludesTriggerShapes.py @@ -20,7 +20,7 @@ class Tests(): # fmt: on -def C13351703_COM_NotIncludeTriggerShapes(): +def RigidBody_COM_NotIncludesTriggerShapes(): """ Summary: @@ -69,7 +69,7 @@ def C13351703_COM_NotIncludeTriggerShapes(): helper.init_idle() # 1) Open level - helper.open_level("Physics", "C13351703_COM_NotIncludeTriggerShapes") + helper.open_level("Physics", "RigidBody_COM_NotIncludesTriggerShapes") # 2) Enter game mode helper.enter_game_mode(Tests.enter_game_mode) @@ -89,4 +89,4 @@ def C13351703_COM_NotIncludeTriggerShapes(): if __name__ == "__main__": from editor_python_test_tools.utils import Report - Report.start_test(C13351703_COM_NotIncludeTriggerShapes) + Report.start_test(RigidBody_COM_NotIncludesTriggerShapes) diff --git a/AutomatedTesting/Gem/PythonTests/physics/rigid_body/C4976218_RigidBodies_InertiaObjectsNotComputed.py b/AutomatedTesting/Gem/PythonTests/physics/tests/rigid_body/RigidBody_ComputeInertiaWorks.py similarity index 96% rename from AutomatedTesting/Gem/PythonTests/physics/rigid_body/C4976218_RigidBodies_InertiaObjectsNotComputed.py rename to AutomatedTesting/Gem/PythonTests/physics/tests/rigid_body/RigidBody_ComputeInertiaWorks.py index eb87fd0c68..6e7a460f05 100644 --- a/AutomatedTesting/Gem/PythonTests/physics/rigid_body/C4976218_RigidBodies_InertiaObjectsNotComputed.py +++ b/AutomatedTesting/Gem/PythonTests/physics/tests/rigid_body/RigidBody_ComputeInertiaWorks.py @@ -20,7 +20,7 @@ class Tests(): exit_game_mode = ("Exited game mode", "Failed to exit game mode") # fmt: on -def C4976218_RigidBodies_InertiaObjectsNotComputed(): +def RigidBody_ComputeInertiaWorks(): """ Summary: Level Description: @@ -82,7 +82,7 @@ def C4976218_RigidBodies_InertiaObjectsNotComputed(): helper.init_idle() # 1) Open level - helper.open_level("Physics", "C4976218_RigidBodies_InertiaObjectNotComputed") + helper.open_level("Physics", "RigidBody_ComputeInertiaWorks") # 2) Enter game mode helper.enter_game_mode(Tests.enter_game_mode) @@ -157,4 +157,4 @@ def C4976218_RigidBodies_InertiaObjectsNotComputed(): if __name__ == "__main__": from editor_python_test_tools.utils import Report - Report.start_test(C4976218_RigidBodies_InertiaObjectsNotComputed) + Report.start_test(RigidBody_ComputeInertiaWorks) diff --git a/AutomatedTesting/Gem/PythonTests/physics/collider/C100000_RigidBody_EnablingGravityWorksPoC.py b/AutomatedTesting/Gem/PythonTests/physics/tests/rigid_body/RigidBody_EnablingGravityWorksPoC.py similarity index 92% rename from AutomatedTesting/Gem/PythonTests/physics/collider/C100000_RigidBody_EnablingGravityWorksPoC.py rename to AutomatedTesting/Gem/PythonTests/physics/tests/rigid_body/RigidBody_EnablingGravityWorksPoC.py index f3d3e02d8e..b15c17f405 100644 --- a/AutomatedTesting/Gem/PythonTests/physics/collider/C100000_RigidBody_EnablingGravityWorksPoC.py +++ b/AutomatedTesting/Gem/PythonTests/physics/tests/rigid_body/RigidBody_EnablingGravityWorksPoC.py @@ -22,7 +22,7 @@ class Tests(): # fmt:on -def C100000_RigidBody_EnablingGravityWorksPoC(): +def RigidBody_EnablingGravityWorksPoC(): import os import sys from editor_python_test_tools.utils import Report @@ -63,14 +63,14 @@ def C100000_RigidBody_EnablingGravityWorksPoC(): already handled in TestHelper.wait_for_condition """ z_end = azlmbr.components.TransformBus(azlmbr.bus.Event, "GetWorldZ", ball_id) - return Ball.z_start > z_end + return z_end < 35 # 7) Validate ball fell by ensuring z is decreasing - fell_down = helper.wait_for_condition(ball_fell, 1.0) + fell_down = helper.wait_for_condition(ball_fell, 10.0) Report.result(Tests.ball_fell, fell_down) helper.exit_game_mode(Tests.exit_game_mode) if __name__ == "__main__": from editor_python_test_tools.utils import Report - Report.start_test(C100000_RigidBody_EnablingGravityWorksPoC) + Report.start_test(RigidBody_EnablingGravityWorksPoC) diff --git a/AutomatedTesting/Gem/PythonTests/physics/collider/C111111_RigidBody_EnablingGravityWorksUsingNotificationsPoC.py b/AutomatedTesting/Gem/PythonTests/physics/tests/rigid_body/RigidBody_EnablingGravityWorksUsingNotificationsPoC.py similarity index 95% rename from AutomatedTesting/Gem/PythonTests/physics/collider/C111111_RigidBody_EnablingGravityWorksUsingNotificationsPoC.py rename to AutomatedTesting/Gem/PythonTests/physics/tests/rigid_body/RigidBody_EnablingGravityWorksUsingNotificationsPoC.py index 997ea8a5a6..b22497c9fd 100644 --- a/AutomatedTesting/Gem/PythonTests/physics/collider/C111111_RigidBody_EnablingGravityWorksUsingNotificationsPoC.py +++ b/AutomatedTesting/Gem/PythonTests/physics/tests/rigid_body/RigidBody_EnablingGravityWorksUsingNotificationsPoC.py @@ -20,7 +20,7 @@ class Tests: # fmt:on -def C111111_RigidBody_EnablingGravityWorksUsingNotificationsPoC(): +def RigidBody_EnablingGravityWorksUsingNotificationsPoC(): # Setup path import os import sys @@ -80,4 +80,4 @@ def C111111_RigidBody_EnablingGravityWorksUsingNotificationsPoC(): if __name__ == "__main__": from editor_python_test_tools.utils import Report - Report.start_test(C111111_RigidBody_EnablingGravityWorksUsingNotificationsPoC) + Report.start_test(RigidBody_EnablingGravityWorksUsingNotificationsPoC) diff --git a/AutomatedTesting/Gem/PythonTests/physics/rigid_body/C4976197_RigidBodies_InitialAngularVelocity.py b/AutomatedTesting/Gem/PythonTests/physics/tests/rigid_body/RigidBody_InitialAngularVelocity.py similarity index 97% rename from AutomatedTesting/Gem/PythonTests/physics/rigid_body/C4976197_RigidBodies_InitialAngularVelocity.py rename to AutomatedTesting/Gem/PythonTests/physics/tests/rigid_body/RigidBody_InitialAngularVelocity.py index 7f400051ec..0c2ad7c355 100644 --- a/AutomatedTesting/Gem/PythonTests/physics/rigid_body/C4976197_RigidBodies_InitialAngularVelocity.py +++ b/AutomatedTesting/Gem/PythonTests/physics/tests/rigid_body/RigidBody_InitialAngularVelocity.py @@ -29,7 +29,7 @@ class Tests: # fmt: on -def C4976197_RigidBodies_InitialAngularVelocity(): +def RigidBody_InitialAngularVelocity(): # type: () -> None """ Summary: @@ -110,7 +110,7 @@ def C4976197_RigidBodies_InitialAngularVelocity(): helper.init_idle() # 1) Load the level - helper.open_level("Physics", "C4976197_RigidBodies_InitialAngularVelocity") + helper.open_level("Physics", "RigidBody_InitialAngularVelocity") # 2) Enter game mode helper.enter_game_mode(Tests.enter_game_mode) @@ -176,4 +176,4 @@ def C4976197_RigidBodies_InitialAngularVelocity(): if __name__ == "__main__": from editor_python_test_tools.utils import Report - Report.start_test(C4976197_RigidBodies_InitialAngularVelocity) + Report.start_test(RigidBody_InitialAngularVelocity) diff --git a/AutomatedTesting/Gem/PythonTests/physics/rigid_body/C4976195_RigidBodies_InitialLinearVelocity.py b/AutomatedTesting/Gem/PythonTests/physics/tests/rigid_body/RigidBody_InitialLinearVelocity.py similarity index 96% rename from AutomatedTesting/Gem/PythonTests/physics/rigid_body/C4976195_RigidBodies_InitialLinearVelocity.py rename to AutomatedTesting/Gem/PythonTests/physics/tests/rigid_body/RigidBody_InitialLinearVelocity.py index f13a7232fa..1fd2a68d3d 100644 --- a/AutomatedTesting/Gem/PythonTests/physics/rigid_body/C4976195_RigidBodies_InitialLinearVelocity.py +++ b/AutomatedTesting/Gem/PythonTests/physics/tests/rigid_body/RigidBody_InitialLinearVelocity.py @@ -21,7 +21,7 @@ class Tests: sphere_velocity = ("The magnitude of velocity is close to 5", "The magnitude of velocity is not close to 5") exit_game_mode = ("Exited game mode", "Couldn't exit game mode") -def C4976195_RigidBodies_InitialLinearVelocity(): +def RigidBody_InitialLinearVelocity(): # type: () -> None """ Summary: @@ -67,7 +67,7 @@ def C4976195_RigidBodies_InitialLinearVelocity(): helper.init_idle() # 1) Load the level - helper.open_level("Physics", "C4976195_RigidBodies_InitialLinearVelocity") + helper.open_level("Physics", "RigidBody_InitialLinearVelocity") # 2) Enter game mode helper.enter_game_mode(Tests.enter_game_mode) @@ -128,4 +128,4 @@ def C4976195_RigidBodies_InitialLinearVelocity(): if __name__ == "__main__": from editor_python_test_tools.utils import Report - Report.start_test(C4976195_RigidBodies_InitialLinearVelocity) + Report.start_test(RigidBody_InitialLinearVelocity) diff --git a/AutomatedTesting/Gem/PythonTests/physics/rigid_body/C4976207_PhysXRigidBodies_KinematicBehavior.py b/AutomatedTesting/Gem/PythonTests/physics/tests/rigid_body/RigidBody_KinematicModeWorks.py similarity index 96% rename from AutomatedTesting/Gem/PythonTests/physics/rigid_body/C4976207_PhysXRigidBodies_KinematicBehavior.py rename to AutomatedTesting/Gem/PythonTests/physics/tests/rigid_body/RigidBody_KinematicModeWorks.py index 65814bd438..1c53854bab 100644 --- a/AutomatedTesting/Gem/PythonTests/physics/rigid_body/C4976207_PhysXRigidBodies_KinematicBehavior.py +++ b/AutomatedTesting/Gem/PythonTests/physics/tests/rigid_body/RigidBody_KinematicModeWorks.py @@ -26,7 +26,7 @@ class Tests(): # fmt: on -def C4976207_PhysXRigidBodies_KinematicBehavior(): +def RigidBody_KinematicModeWorks(): """ Summary: Runs an automated test to ensure kinematic property causes entity to remain in place when gravity acts upon it @@ -70,7 +70,7 @@ def C4976207_PhysXRigidBodies_KinematicBehavior(): # 1) Open level and enter game mode helper.init_idle() - helper.open_level("Physics", "C4976207_PhysXRigidBodies_KinematicBehavior") + helper.open_level("Physics", "RigidBody_KinematicModeWorks") helper.enter_game_mode(Tests.enter_game_mode) # 2) Retrieve entities @@ -128,4 +128,4 @@ def C4976207_PhysXRigidBodies_KinematicBehavior(): if __name__ == "__main__": from editor_python_test_tools.utils import Report - Report.start_test(C4976207_PhysXRigidBodies_KinematicBehavior) + Report.start_test(RigidBody_KinematicModeWorks) diff --git a/AutomatedTesting/Gem/PythonTests/physics/rigid_body/C4976199_RigidBodies_LinearDampingObjectMotion.py b/AutomatedTesting/Gem/PythonTests/physics/tests/rigid_body/RigidBody_LinearDampingAffectsMotion.py similarity index 98% rename from AutomatedTesting/Gem/PythonTests/physics/rigid_body/C4976199_RigidBodies_LinearDampingObjectMotion.py rename to AutomatedTesting/Gem/PythonTests/physics/tests/rigid_body/RigidBody_LinearDampingAffectsMotion.py index 502478f13c..79eae01d09 100644 --- a/AutomatedTesting/Gem/PythonTests/physics/rigid_body/C4976199_RigidBodies_LinearDampingObjectMotion.py +++ b/AutomatedTesting/Gem/PythonTests/physics/tests/rigid_body/RigidBody_LinearDampingAffectsMotion.py @@ -32,7 +32,7 @@ class Tests: # fmt: on -def C4976199_RigidBodies_LinearDampingObjectMotion(): +def RigidBody_LinearDampingAffectsMotion(): """ The level consists of a PhysX Terrain component that is not interacted with (per the test case) and a PhysX collider with shape sphere, PhysX rigid bodies physics, and mesh with shape sphere. @@ -168,7 +168,7 @@ def C4976199_RigidBodies_LinearDampingObjectMotion(): helper.init_idle() # 1) Open level - helper.open_level("Physics", "C4976199_RigidBodies_LinearDampingObjectMotion") + helper.open_level("Physics", "RigidBody_LinearDampingAffectsMotion") def run_test_steps(sphere): @@ -266,4 +266,4 @@ def C4976199_RigidBodies_LinearDampingObjectMotion(): if __name__ == "__main__": from editor_python_test_tools.utils import Report - Report.start_test(C4976199_RigidBodies_LinearDampingObjectMotion) + Report.start_test(RigidBody_LinearDampingAffectsMotion) diff --git a/AutomatedTesting/Gem/PythonTests/physics/rigid_body/C4976201_RigidBody_MassIsAssigned.py b/AutomatedTesting/Gem/PythonTests/physics/tests/rigid_body/RigidBody_MassDifferentValuesWorks.py similarity index 99% rename from AutomatedTesting/Gem/PythonTests/physics/rigid_body/C4976201_RigidBody_MassIsAssigned.py rename to AutomatedTesting/Gem/PythonTests/physics/tests/rigid_body/RigidBody_MassDifferentValuesWorks.py index 54f589da1e..1a97ce5723 100644 --- a/AutomatedTesting/Gem/PythonTests/physics/rigid_body/C4976201_RigidBody_MassIsAssigned.py +++ b/AutomatedTesting/Gem/PythonTests/physics/tests/rigid_body/RigidBody_MassDifferentValuesWorks.py @@ -59,7 +59,7 @@ class Tests: # fmt: on -def C4976201_RigidBody_MassIsAssigned(): +def RigidBody_MassDifferentValuesWorks(): """ Summary: Checking that the mass set to the object is actually applied via colliding entities @@ -310,7 +310,7 @@ def C4976201_RigidBody_MassIsAssigned(): helper.init_idle() # 1) Open level - helper.open_level("Physics", "C4976201_RigidBody_MassIsAssigned") + helper.open_level("Physics", "RigidBody_MassDifferentValuesWorks") # 2) Repeat steps 3-9 for target_sphere in target_spheres: @@ -369,4 +369,4 @@ def C4976201_RigidBody_MassIsAssigned(): if __name__ == "__main__": from editor_python_test_tools.utils import Report - Report.start_test(C4976201_RigidBody_MassIsAssigned) + Report.start_test(RigidBody_MassDifferentValuesWorks) diff --git a/AutomatedTesting/Gem/PythonTests/physics/rigid_body/C13352089_RigidBodies_MaxAngularVelocity.py b/AutomatedTesting/Gem/PythonTests/physics/tests/rigid_body/RigidBody_MaxAngularVelocityWorks.py similarity index 98% rename from AutomatedTesting/Gem/PythonTests/physics/rigid_body/C13352089_RigidBodies_MaxAngularVelocity.py rename to AutomatedTesting/Gem/PythonTests/physics/tests/rigid_body/RigidBody_MaxAngularVelocityWorks.py index 41635ecc47..7e2bb38836 100644 --- a/AutomatedTesting/Gem/PythonTests/physics/rigid_body/C13352089_RigidBodies_MaxAngularVelocity.py +++ b/AutomatedTesting/Gem/PythonTests/physics/tests/rigid_body/RigidBody_MaxAngularVelocityWorks.py @@ -66,7 +66,7 @@ class Tests: # fmt: on -def C13352089_RigidBodies_MaxAngularVelocity(): +def RigidBody_MaxAngularVelocityWorks(): """ Summary: Runs an automated test to ensure maximum angular velocity and angular damping interact correctly with @@ -241,7 +241,7 @@ def C13352089_RigidBodies_MaxAngularVelocity(): helper.init_idle() # 1) Load the level - helper.open_level("Physics", "C13352089_RigidBodies_MaxAngularVelocity") + helper.open_level("Physics", "RigidBody_MaxAngularVelocityWorks") # 2) Enter game mode helper.enter_game_mode(Tests.enter_game_mode) @@ -280,4 +280,4 @@ def C13352089_RigidBodies_MaxAngularVelocity(): if __name__ == "__main__": from editor_python_test_tools.utils import Report - Report.start_test(C13352089_RigidBodies_MaxAngularVelocity) + Report.start_test(RigidBody_MaxAngularVelocityWorks) diff --git a/AutomatedTesting/Gem/PythonTests/physics/rigid_body/C5340400_RigidBody_ManualMomentOfInertia.py b/AutomatedTesting/Gem/PythonTests/physics/tests/rigid_body/RigidBody_MomentOfInertiaManualSetting.py similarity index 97% rename from AutomatedTesting/Gem/PythonTests/physics/rigid_body/C5340400_RigidBody_ManualMomentOfInertia.py rename to AutomatedTesting/Gem/PythonTests/physics/tests/rigid_body/RigidBody_MomentOfInertiaManualSetting.py index 92d3945391..e7737016f4 100644 --- a/AutomatedTesting/Gem/PythonTests/physics/rigid_body/C5340400_RigidBody_ManualMomentOfInertia.py +++ b/AutomatedTesting/Gem/PythonTests/physics/tests/rigid_body/RigidBody_MomentOfInertiaManualSetting.py @@ -26,7 +26,7 @@ class Tests(): # fmt: on -def C5340400_RigidBody_ManualMomentOfInertia(): +def RigidBody_MomentOfInertiaManualSetting(): """ Summary: Runs an automated test to ensure that assigning a high moment of inertia component causes the entity to exhibit @@ -83,7 +83,7 @@ def C5340400_RigidBody_ManualMomentOfInertia(): helper.init_idle() # 1) Open level - helper.open_level("Physics", "C5340400_RigidBody_ManualMomentOfInertia") + helper.open_level("Physics", "RigidBody_MomentOfInertiaManualSetting") # 2) Enter game mode helper.enter_game_mode(Tests.enter_game_mode) @@ -156,4 +156,4 @@ def C5340400_RigidBody_ManualMomentOfInertia(): if __name__ == "__main__": from editor_python_test_tools.utils import Report - Report.start_test(C5340400_RigidBody_ManualMomentOfInertia) + Report.start_test(RigidBody_MomentOfInertiaManualSetting) diff --git a/AutomatedTesting/Gem/PythonTests/physics/general/C14976307_Gravity_SetGravityWorks.py b/AutomatedTesting/Gem/PythonTests/physics/tests/rigid_body/RigidBody_SetGravityWorks.py similarity index 96% rename from AutomatedTesting/Gem/PythonTests/physics/general/C14976307_Gravity_SetGravityWorks.py rename to AutomatedTesting/Gem/PythonTests/physics/tests/rigid_body/RigidBody_SetGravityWorks.py index 335ef75649..837819bf5a 100644 --- a/AutomatedTesting/Gem/PythonTests/physics/general/C14976307_Gravity_SetGravityWorks.py +++ b/AutomatedTesting/Gem/PythonTests/physics/tests/rigid_body/RigidBody_SetGravityWorks.py @@ -22,7 +22,7 @@ class Tests(): # fmt: on -def C14976307_Gravity_SetGravityWorks(): +def RigidBody_SetGravityWorks(): """ Summary: @@ -73,7 +73,7 @@ def C14976307_Gravity_SetGravityWorks(): helper.init_idle() # 1) Open level - helper.open_level("Physics", "C14976307_Gravity_SetGravityWorks") + helper.open_level("Physics", "RigidBody_SetGravityWorks") # 2) Enter game mode helper.enter_game_mode(Tests.enter_game_mode) @@ -118,4 +118,4 @@ def C14976307_Gravity_SetGravityWorks(): if __name__ == "__main__": from editor_python_test_tools.utils import Report - Report.start_test(C14976307_Gravity_SetGravityWorks) + Report.start_test(RigidBody_SetGravityWorks) diff --git a/AutomatedTesting/Gem/PythonTests/physics/rigid_body/C4976202_RigidBody_StopsWhenBelowKineticThreshold.py b/AutomatedTesting/Gem/PythonTests/physics/tests/rigid_body/RigidBody_SleepWhenBelowKineticThreshold.py similarity index 98% rename from AutomatedTesting/Gem/PythonTests/physics/rigid_body/C4976202_RigidBody_StopsWhenBelowKineticThreshold.py rename to AutomatedTesting/Gem/PythonTests/physics/tests/rigid_body/RigidBody_SleepWhenBelowKineticThreshold.py index 655c33304d..e01f946a9b 100644 --- a/AutomatedTesting/Gem/PythonTests/physics/rigid_body/C4976202_RigidBody_StopsWhenBelowKineticThreshold.py +++ b/AutomatedTesting/Gem/PythonTests/physics/tests/rigid_body/RigidBody_SleepWhenBelowKineticThreshold.py @@ -58,7 +58,7 @@ class Tests: # fmt: on -def C4976202_RigidBody_StopsWhenBelowKineticThreshold(): +def RigidBody_SleepWhenBelowKineticThreshold(): """ Summary: A Pushing Cube and a Sphere are suspended over the PhysX Terrain. @@ -264,7 +264,7 @@ def C4976202_RigidBody_StopsWhenBelowKineticThreshold(): ) # 1) Open the level - helper.open_level("Physics", "C4976202_RigidBody_StopsWhenBelowKineticThreshold") + helper.open_level("Physics", "RigidBody_SleepWhenBelowKineticThreshold") def test_steps(sleep_threshold_value, trigger_pattern): TestData.threshold_count += 1 @@ -322,4 +322,4 @@ def C4976202_RigidBody_StopsWhenBelowKineticThreshold(): if __name__ == "__main__": from editor_python_test_tools.utils import Report - Report.start_test(C4976202_RigidBody_StopsWhenBelowKineticThreshold) + Report.start_test(RigidBody_SleepWhenBelowKineticThreshold) diff --git a/AutomatedTesting/Gem/PythonTests/physics/rigid_body/C4976204_Verify_Start_Asleep_Condition.py b/AutomatedTesting/Gem/PythonTests/physics/tests/rigid_body/RigidBody_StartAsleepWorks.py similarity index 95% rename from AutomatedTesting/Gem/PythonTests/physics/rigid_body/C4976204_Verify_Start_Asleep_Condition.py rename to AutomatedTesting/Gem/PythonTests/physics/tests/rigid_body/RigidBody_StartAsleepWorks.py index ff3111aa55..21703ebe5a 100644 --- a/AutomatedTesting/Gem/PythonTests/physics/rigid_body/C4976204_Verify_Start_Asleep_Condition.py +++ b/AutomatedTesting/Gem/PythonTests/physics/tests/rigid_body/RigidBody_StartAsleepWorks.py @@ -24,7 +24,7 @@ class Tests(): # fmt: on -def C4976204_Verify_Start_Asleep_Condition(): +def RigidBody_StartAsleepWorks(): """ Summary: @@ -74,7 +74,7 @@ def C4976204_Verify_Start_Asleep_Condition(): helper.init_idle() # 1) Open level - helper.open_level("Physics", "C4976204_Verify_Start_Asleep_Condition") + helper.open_level("Physics", "RigidBody_StartAsleepWorks") # 2) Enter game mode helper.enter_game_mode(Tests.enter_game_mode) @@ -108,4 +108,4 @@ def C4976204_Verify_Start_Asleep_Condition(): if __name__ == "__main__": from editor_python_test_tools.utils import Report - Report.start_test(C4976204_Verify_Start_Asleep_Condition) + Report.start_test(RigidBody_StartAsleepWorks) diff --git a/AutomatedTesting/Gem/PythonTests/physics/rigid_body/C4976206_RigidBodies_GravityEnabledActive.py b/AutomatedTesting/Gem/PythonTests/physics/tests/rigid_body/RigidBody_StartGravityEnabledWorks.py similarity index 95% rename from AutomatedTesting/Gem/PythonTests/physics/rigid_body/C4976206_RigidBodies_GravityEnabledActive.py rename to AutomatedTesting/Gem/PythonTests/physics/tests/rigid_body/RigidBody_StartGravityEnabledWorks.py index e6b50eb2bf..95b7a4dc04 100644 --- a/AutomatedTesting/Gem/PythonTests/physics/rigid_body/C4976206_RigidBodies_GravityEnabledActive.py +++ b/AutomatedTesting/Gem/PythonTests/physics/tests/rigid_body/RigidBody_StartGravityEnabledWorks.py @@ -7,7 +7,7 @@ SPDX-License-Identifier: Apache-2.0 OR MIT # Test case ID : C4976206 -# Test Case Title : VErify that when Gravity enables is checked, the object falls down due to gravity [sic] +# Test Case Title : Verify that when Gravity enables is checked, the object falls down due to gravity [sic] # fmt: off @@ -29,7 +29,7 @@ class Frames: delta_frames = 1 -def C4976206_RigidBodies_GravityEnabledActive(): +def RigidBody_StartGravityEnabledWorks(): """ Summary: Runs automated test to verify that when the gravity enabled checkbox is ticked, @@ -75,7 +75,7 @@ def C4976206_RigidBodies_GravityEnabledActive(): helper.init_idle() # 1) Open level and enter game mode - helper.open_level("Physics", "C4976206_RigidBodies_VerifyGravity") + helper.open_level("Physics", "RigidBody_StartGravityEnabledWorks") helper.enter_game_mode(Tests.enter_game_mode) # 2) Retrieve entities @@ -141,4 +141,4 @@ def C4976206_RigidBodies_GravityEnabledActive(): if __name__ == "__main__": from editor_python_test_tools.utils import Report - Report.start_test(C4976206_RigidBodies_GravityEnabledActive) + Report.start_test(RigidBody_StartGravityEnabledWorks) diff --git a/AutomatedTesting/Gem/PythonTests/physics/script_canvas/C12712452_ScriptCanvas_CollisionEvents.py b/AutomatedTesting/Gem/PythonTests/physics/tests/script_canvas/ScriptCanvas_CollisionEvents.py similarity index 98% rename from AutomatedTesting/Gem/PythonTests/physics/script_canvas/C12712452_ScriptCanvas_CollisionEvents.py rename to AutomatedTesting/Gem/PythonTests/physics/tests/script_canvas/ScriptCanvas_CollisionEvents.py index 6806d5acc8..99785c2650 100644 --- a/AutomatedTesting/Gem/PythonTests/physics/script_canvas/C12712452_ScriptCanvas_CollisionEvents.py +++ b/AutomatedTesting/Gem/PythonTests/physics/tests/script_canvas/ScriptCanvas_CollisionEvents.py @@ -28,7 +28,7 @@ class Tests: # fmt: on -def C12712452_ScriptCanvas_CollisionEvents(): +def ScriptCanvas_CollisionEvents(): """ Summary: This script runs an automated test to verify that the Script Canvas nodes "On Collision Begin", "On Collision @@ -160,7 +160,7 @@ def C12712452_ScriptCanvas_CollisionEvents(): # 1) Open level and enter game mode helper.init_idle() - helper.open_level("Physics", "C12712452_ScriptCanvas_CollisionEvents") + helper.open_level("Physics", "ScriptCanvas_CollisionEvents") helper.enter_game_mode(Tests.enter_game_mode) # 2) Retrieve and validate entities @@ -197,4 +197,4 @@ def C12712452_ScriptCanvas_CollisionEvents(): if __name__ == "__main__": from editor_python_test_tools.utils import Report - Report.start_test(C12712452_ScriptCanvas_CollisionEvents) + Report.start_test(ScriptCanvas_CollisionEvents) diff --git a/AutomatedTesting/Gem/PythonTests/physics/general/C19536274_GetCollisionName_PrintsName.py b/AutomatedTesting/Gem/PythonTests/physics/tests/script_canvas/ScriptCanvas_GetCollisionNameReturnsName.py similarity index 95% rename from AutomatedTesting/Gem/PythonTests/physics/general/C19536274_GetCollisionName_PrintsName.py rename to AutomatedTesting/Gem/PythonTests/physics/tests/script_canvas/ScriptCanvas_GetCollisionNameReturnsName.py index abf2045ed4..39b6eddd41 100644 --- a/AutomatedTesting/Gem/PythonTests/physics/general/C19536274_GetCollisionName_PrintsName.py +++ b/AutomatedTesting/Gem/PythonTests/physics/tests/script_canvas/ScriptCanvas_GetCollisionNameReturnsName.py @@ -17,7 +17,7 @@ class Tests(): # fmt: on -def C19536274_GetCollisionName_PrintsName(): +def ScriptCanvas_GetCollisionNameReturnsName(): """ Summary: Loads a level that contains an entity with script canvas and PhysX Collider components @@ -65,4 +65,4 @@ def C19536274_GetCollisionName_PrintsName(): if __name__ == "__main__": from editor_python_test_tools.utils import Report - Report.start_test(C19536274_GetCollisionName_PrintsName) + Report.start_test(ScriptCanvas_GetCollisionNameReturnsName) diff --git a/AutomatedTesting/Gem/PythonTests/physics/general/C19536277_GetCollisionName_PrintsNothing.py b/AutomatedTesting/Gem/PythonTests/physics/tests/script_canvas/ScriptCanvas_GetCollisionNameReturnsNothingWhenHasToggledLayer.py similarity index 93% rename from AutomatedTesting/Gem/PythonTests/physics/general/C19536277_GetCollisionName_PrintsNothing.py rename to AutomatedTesting/Gem/PythonTests/physics/tests/script_canvas/ScriptCanvas_GetCollisionNameReturnsNothingWhenHasToggledLayer.py index a0d242542f..885d85c710 100644 --- a/AutomatedTesting/Gem/PythonTests/physics/general/C19536277_GetCollisionName_PrintsNothing.py +++ b/AutomatedTesting/Gem/PythonTests/physics/tests/script_canvas/ScriptCanvas_GetCollisionNameReturnsNothingWhenHasToggledLayer.py @@ -17,7 +17,7 @@ class Tests(): # fmt: on -def C19536277_GetCollisionName_PrintsNothing(): +def ScriptCanvas_GetCollisionNameReturnsNothingWhenHasToggledLayer(): """ Summary: Loads a level that contains an entity with script canvas and PhysX Collider components @@ -65,4 +65,4 @@ def C19536277_GetCollisionName_PrintsNothing(): if __name__ == "__main__": from editor_python_test_tools.utils import Report - Report.start_test(C19536277_GetCollisionName_PrintsNothing) + Report.start_test(ScriptCanvas_GetCollisionNameReturnsNothingWhenHasToggledLayer) diff --git a/AutomatedTesting/Gem/PythonTests/physics/script_canvas/C12712453_ScriptCanvas_MultipleRaycastNode.py b/AutomatedTesting/Gem/PythonTests/physics/tests/script_canvas/ScriptCanvas_MultipleRaycastNode.py similarity index 97% rename from AutomatedTesting/Gem/PythonTests/physics/script_canvas/C12712453_ScriptCanvas_MultipleRaycastNode.py rename to AutomatedTesting/Gem/PythonTests/physics/tests/script_canvas/ScriptCanvas_MultipleRaycastNode.py index edbbde4c94..f173ac0fa3 100644 --- a/AutomatedTesting/Gem/PythonTests/physics/script_canvas/C12712453_ScriptCanvas_MultipleRaycastNode.py +++ b/AutomatedTesting/Gem/PythonTests/physics/tests/script_canvas/ScriptCanvas_MultipleRaycastNode.py @@ -37,7 +37,7 @@ class Lines: unexpected = ["FAILURE"] -def C12712453_ScriptCanvas_MultipleRaycastNode(): +def ScriptCanvas_MultipleRaycastNode(): """ Summary: Uses script canvas to cast two types of rays in game mode (multiple raycast and single raycast). Script canvas @@ -169,7 +169,7 @@ def C12712453_ScriptCanvas_MultipleRaycastNode(): # 1) Open level helper.init_idle() - helper.open_level("Physics", "C12712453_ScriptCanvas_MultipleRaycastNode") + helper.open_level("Physics", "ScriptCanvas_MultipleRaycastNode") helper.enter_game_mode(Tests.enter_game_mode) # 2) Retrieve entities @@ -195,4 +195,4 @@ def C12712453_ScriptCanvas_MultipleRaycastNode(): if __name__ == "__main__": from editor_python_test_tools.utils import Report - Report.start_test(C12712453_ScriptCanvas_MultipleRaycastNode) + Report.start_test(ScriptCanvas_MultipleRaycastNode) diff --git a/AutomatedTesting/Gem/PythonTests/physics/script_canvas/C12712454_ScriptCanvas_OverlapNodeVerification.py b/AutomatedTesting/Gem/PythonTests/physics/tests/script_canvas/ScriptCanvas_OverlapNode.py similarity index 98% rename from AutomatedTesting/Gem/PythonTests/physics/script_canvas/C12712454_ScriptCanvas_OverlapNodeVerification.py rename to AutomatedTesting/Gem/PythonTests/physics/tests/script_canvas/ScriptCanvas_OverlapNode.py index 5829e5850c..b7f2f6da0c 100644 --- a/AutomatedTesting/Gem/PythonTests/physics/script_canvas/C12712454_ScriptCanvas_OverlapNodeVerification.py +++ b/AutomatedTesting/Gem/PythonTests/physics/tests/script_canvas/ScriptCanvas_OverlapNode.py @@ -36,7 +36,7 @@ class Tests: # fmt: on -def C12712454_ScriptCanvas_OverlapNodeVerification(): +def ScriptCanvas_OverlapNode(): """ Summary: Verifies that the three script canvas overlap nodes (box, sphere, capsule) work as expected. Test script starts and verifies each case one by one. @@ -250,7 +250,7 @@ def C12712454_ScriptCanvas_OverlapNodeVerification(): # Main Script helper.init_idle() # 1) Open Level - helper.open_level("Physics", "C12712454_ScriptCanvas_OverlapNodeVerification") + helper.open_level("Physics", "ScriptCanvas_OverlapNode") # 2) Enter Game Mode helper.enter_game_mode(Tests.enter_game_mode) @@ -316,4 +316,4 @@ def C12712454_ScriptCanvas_OverlapNodeVerification(): if __name__ == "__main__": from editor_python_test_tools.utils import Report - Report.start_test(C12712454_ScriptCanvas_OverlapNodeVerification) + Report.start_test(ScriptCanvas_OverlapNode) diff --git a/AutomatedTesting/Gem/PythonTests/physics/script_canvas/C14902098_ScriptCanvas_PostPhysicsUpdate.py b/AutomatedTesting/Gem/PythonTests/physics/tests/script_canvas/ScriptCanvas_PostPhysicsUpdate.py similarity index 95% rename from AutomatedTesting/Gem/PythonTests/physics/script_canvas/C14902098_ScriptCanvas_PostPhysicsUpdate.py rename to AutomatedTesting/Gem/PythonTests/physics/tests/script_canvas/ScriptCanvas_PostPhysicsUpdate.py index 5cb0b1431e..85b1ccebf8 100644 --- a/AutomatedTesting/Gem/PythonTests/physics/script_canvas/C14902098_ScriptCanvas_PostPhysicsUpdate.py +++ b/AutomatedTesting/Gem/PythonTests/physics/tests/script_canvas/ScriptCanvas_PostPhysicsUpdate.py @@ -33,7 +33,7 @@ class LogLines: unexpected_lines = ["OnPostPhysicsSubtick Event: The Sphere position did not change from previous position"] -def C14902098_ScriptCanvas_PostPhysicsUpdate(): +def ScriptCanvas_PostPhysicsUpdate(): """ Summary: @@ -85,7 +85,7 @@ def C14902098_ScriptCanvas_PostPhysicsUpdate(): helper.init_idle() # 1) Open level - helper.open_level("Physics", "C14902098_ScriptCanvas_PostPhysicsUpdate") + helper.open_level("Physics", "ScriptCanvas_PostPhysicsUpdate") # 2) Enter game mode helper.enter_game_mode(Tests.enter_game_mode) @@ -106,4 +106,4 @@ def C14902098_ScriptCanvas_PostPhysicsUpdate(): if __name__ == "__main__": from editor_python_test_tools.utils import Report - Report.start_test(C14902098_ScriptCanvas_PostPhysicsUpdate) + Report.start_test(ScriptCanvas_PostPhysicsUpdate) diff --git a/AutomatedTesting/Gem/PythonTests/physics/script_canvas/C14195074_ScriptCanvas_PostUpdateEvent.py b/AutomatedTesting/Gem/PythonTests/physics/tests/script_canvas/ScriptCanvas_PostUpdateEvent.py similarity index 97% rename from AutomatedTesting/Gem/PythonTests/physics/script_canvas/C14195074_ScriptCanvas_PostUpdateEvent.py rename to AutomatedTesting/Gem/PythonTests/physics/tests/script_canvas/ScriptCanvas_PostUpdateEvent.py index 2c833ba5f3..fdcae5cea4 100644 --- a/AutomatedTesting/Gem/PythonTests/physics/script_canvas/C14195074_ScriptCanvas_PostUpdateEvent.py +++ b/AutomatedTesting/Gem/PythonTests/physics/tests/script_canvas/ScriptCanvas_PostUpdateEvent.py @@ -23,7 +23,7 @@ class Tests: # fmt: on -def C14195074_ScriptCanvas_PostUpdateEvent(): +def ScriptCanvas_PostUpdateEvent(): """ Summary: Verifies that Postsimulate Event node in Script Canvas works as expected. @@ -134,7 +134,7 @@ def C14195074_ScriptCanvas_PostUpdateEvent(): # Main Script helper.init_idle() # 1) Open Level - helper.open_level("Physics", "C14195074_ScriptCanvas_PostUpdateEvent") + helper.open_level("Physics", "ScriptCanvas_PostUpdateEvent") # 2) Enter Game Mode helper.enter_game_mode(Tests.enter_game_mode) @@ -178,4 +178,4 @@ def C14195074_ScriptCanvas_PostUpdateEvent(): if __name__ == "__main__": from editor_python_test_tools.utils import Report - Report.start_test(C14195074_ScriptCanvas_PostUpdateEvent) + Report.start_test(ScriptCanvas_PostUpdateEvent) diff --git a/AutomatedTesting/Gem/PythonTests/physics/script_canvas/C14902097_ScriptCanvas_PreUpdateEvent.py b/AutomatedTesting/Gem/PythonTests/physics/tests/script_canvas/ScriptCanvas_PreUpdateEvent.py similarity index 97% rename from AutomatedTesting/Gem/PythonTests/physics/script_canvas/C14902097_ScriptCanvas_PreUpdateEvent.py rename to AutomatedTesting/Gem/PythonTests/physics/tests/script_canvas/ScriptCanvas_PreUpdateEvent.py index 4d48ce34a6..c2662e661b 100644 --- a/AutomatedTesting/Gem/PythonTests/physics/script_canvas/C14902097_ScriptCanvas_PreUpdateEvent.py +++ b/AutomatedTesting/Gem/PythonTests/physics/tests/script_canvas/ScriptCanvas_PreUpdateEvent.py @@ -23,7 +23,7 @@ class Tests: # fmt: on -def C14902097_ScriptCanvas_PreUpdateEvent(): +def ScriptCanvas_PreUpdateEvent(): """ Summary: Verifies that Presimulate node in Script Canvas works as expected. @@ -140,7 +140,7 @@ def C14902097_ScriptCanvas_PreUpdateEvent(): # Main Script helper.init_idle() # 1) Open Level - helper.open_level("Physics", "C14902097_ScriptCanvas_PreUpdateEvent") + helper.open_level("Physics", "ScriptCanvas_PreUpdateEvent") # 2) Enter Game Mode helper.enter_game_mode(Tests.enter_game_mode) @@ -188,4 +188,4 @@ def C14902097_ScriptCanvas_PreUpdateEvent(): if __name__ == "__main__": from editor_python_test_tools.utils import Report - Report.start_test(C14902097_ScriptCanvas_PreUpdateEvent) + Report.start_test(ScriptCanvas_PreUpdateEvent) diff --git a/AutomatedTesting/Gem/PythonTests/physics/script_canvas/C14976308_ScriptCanvas_SetKinematicTargetTransform.py b/AutomatedTesting/Gem/PythonTests/physics/tests/script_canvas/ScriptCanvas_SetKinematicTargetTransform.py similarity index 98% rename from AutomatedTesting/Gem/PythonTests/physics/script_canvas/C14976308_ScriptCanvas_SetKinematicTargetTransform.py rename to AutomatedTesting/Gem/PythonTests/physics/tests/script_canvas/ScriptCanvas_SetKinematicTargetTransform.py index 9e8331f369..3e1abd2712 100644 --- a/AutomatedTesting/Gem/PythonTests/physics/script_canvas/C14976308_ScriptCanvas_SetKinematicTargetTransform.py +++ b/AutomatedTesting/Gem/PythonTests/physics/tests/script_canvas/ScriptCanvas_SetKinematicTargetTransform.py @@ -31,7 +31,7 @@ class Tests: # fmt: on -def C14976308_ScriptCanvas_SetKinematicTargetTransform(): +def ScriptCanvas_SetKinematicTargetTransform(): """ Summary: This script runs an automated test to verify the results of two Script Canvas nodes acting on a kinematic rigid @@ -168,7 +168,7 @@ def C14976308_ScriptCanvas_SetKinematicTargetTransform(): # 1) Open level and enter game mode helper.init_idle() - helper.open_level("Physics", "C14976308_ScriptCanvas_SetKinematicTargetTransform") + helper.open_level("Physics", "ScriptCanvas_SetKinematicTargetTransform") helper.enter_game_mode(Tests.enter_game_mode) # 2) Retrieve and validate entities @@ -216,4 +216,4 @@ def C14976308_ScriptCanvas_SetKinematicTargetTransform(): if __name__ == "__main__": from editor_python_test_tools.utils import Report - Report.start_test(C14976308_ScriptCanvas_SetKinematicTargetTransform) + Report.start_test(ScriptCanvas_SetKinematicTargetTransform) diff --git a/AutomatedTesting/Gem/PythonTests/physics/script_canvas/C12712455_ScriptCanvas_ShapeCastVerification.py b/AutomatedTesting/Gem/PythonTests/physics/tests/script_canvas/ScriptCanvas_ShapeCast.py similarity index 96% rename from AutomatedTesting/Gem/PythonTests/physics/script_canvas/C12712455_ScriptCanvas_ShapeCastVerification.py rename to AutomatedTesting/Gem/PythonTests/physics/tests/script_canvas/ScriptCanvas_ShapeCast.py index 8ce59d2b29..97d11664b5 100644 --- a/AutomatedTesting/Gem/PythonTests/physics/script_canvas/C12712455_ScriptCanvas_ShapeCastVerification.py +++ b/AutomatedTesting/Gem/PythonTests/physics/tests/script_canvas/ScriptCanvas_ShapeCast.py @@ -29,7 +29,7 @@ class Tests: # fmt: on -def C12712455_ScriptCanvas_ShapeCastVerification(): +def ScriptCanvas_ShapeCast(): """ Summary: Verifies that shape cast nodes in script editor function properly. @@ -105,7 +105,7 @@ def C12712455_ScriptCanvas_ShapeCastVerification(): # Main Script helper.init_idle() # 1) Open Level - helper.open_level("Physics", "C12712455_ScriptCanvas_ShapeCastVerification") + helper.open_level("Physics", "ScriptCanvas_ShapeCast") # 2) Enter Game Mode helper.enter_game_mode(Tests.enter_game_mode) @@ -133,4 +133,4 @@ def C12712455_ScriptCanvas_ShapeCastVerification(): if __name__ == "__main__": from editor_python_test_tools.utils import Report - Report.start_test(C12712455_ScriptCanvas_ShapeCastVerification) + Report.start_test(ScriptCanvas_ShapeCast) diff --git a/AutomatedTesting/Gem/PythonTests/physics/script_canvas/C6224408_ScriptCanvas_EntitySpawn.py b/AutomatedTesting/Gem/PythonTests/physics/tests/script_canvas/ScriptCanvas_SpawnEntityWithPhysComponents.py similarity index 96% rename from AutomatedTesting/Gem/PythonTests/physics/script_canvas/C6224408_ScriptCanvas_EntitySpawn.py rename to AutomatedTesting/Gem/PythonTests/physics/tests/script_canvas/ScriptCanvas_SpawnEntityWithPhysComponents.py index 12e4a25b4d..5862b7586b 100644 --- a/AutomatedTesting/Gem/PythonTests/physics/script_canvas/C6224408_ScriptCanvas_EntitySpawn.py +++ b/AutomatedTesting/Gem/PythonTests/physics/tests/script_canvas/ScriptCanvas_SpawnEntityWithPhysComponents.py @@ -22,7 +22,7 @@ class Tests: # fmt: on -def C6224408_ScriptCanvas_EntitySpawn(): +def ScriptCanvas_SpawnEntityWithPhysComponents(): """ Summary: A spawner is set to spawn a sphere with downward velocity after a set amount of time. This action is controlled @@ -106,7 +106,7 @@ def C6224408_ScriptCanvas_EntitySpawn(): # Main Script helper.init_idle() # 1) Open Level - helper.open_level("physics", "C6224408_ScriptCanvas_EntitySpawn") + helper.open_level("physics", "ScriptCanvas_SpawnEntityWithPhysComponents") # 2) Enter Game Mode helper.enter_game_mode(Tests.enter_game_mode) @@ -140,4 +140,4 @@ def C6224408_ScriptCanvas_EntitySpawn(): if __name__ == "__main__": from editor_python_test_tools.utils import Report - Report.start_test(C6224408_ScriptCanvas_EntitySpawn) + Report.start_test(ScriptCanvas_SpawnEntityWithPhysComponents) diff --git a/AutomatedTesting/Gem/PythonTests/physics/script_canvas/C6274125_ScriptCanvas_TriggerEvents.py b/AutomatedTesting/Gem/PythonTests/physics/tests/script_canvas/ScriptCanvas_TriggerEvents.py similarity index 95% rename from AutomatedTesting/Gem/PythonTests/physics/script_canvas/C6274125_ScriptCanvas_TriggerEvents.py rename to AutomatedTesting/Gem/PythonTests/physics/tests/script_canvas/ScriptCanvas_TriggerEvents.py index 5fc4261607..232b9ac8de 100644 --- a/AutomatedTesting/Gem/PythonTests/physics/script_canvas/C6274125_ScriptCanvas_TriggerEvents.py +++ b/AutomatedTesting/Gem/PythonTests/physics/tests/script_canvas/ScriptCanvas_TriggerEvents.py @@ -33,7 +33,7 @@ class LogLines: ] -def C6274125_ScriptCanvas_TriggerEvents(): +def ScriptCanvas_TriggerEvents(): """ Summary: Verify ScriptCanvas Trigger Events. @@ -78,7 +78,7 @@ def C6274125_ScriptCanvas_TriggerEvents(): TIMEOUT = 2.5 # 1) Open level - helper.open_level("Physics", "C6274125_ScriptCanvas_TriggerEvents") + helper.open_level("Physics", "ScriptCanvas_TriggerEvents") # 2) Enter game mode helper.enter_game_mode(Tests.enter_game_mode) @@ -124,4 +124,4 @@ def C6274125_ScriptCanvas_TriggerEvents(): if __name__ == "__main__": from editor_python_test_tools.utils import Report - Report.start_test(C6274125_ScriptCanvas_TriggerEvents) + Report.start_test(ScriptCanvas_TriggerEvents) diff --git a/AutomatedTesting/Gem/PythonTests/physics/collider/C19578021_ShapeCollider_CanBeAdded.py b/AutomatedTesting/Gem/PythonTests/physics/tests/shape_collider/ShapeCollider_CanBeAddedWitNoWarnings.py similarity index 97% rename from AutomatedTesting/Gem/PythonTests/physics/collider/C19578021_ShapeCollider_CanBeAdded.py rename to AutomatedTesting/Gem/PythonTests/physics/tests/shape_collider/ShapeCollider_CanBeAddedWitNoWarnings.py index 0ec9908f2d..8c581e105c 100644 --- a/AutomatedTesting/Gem/PythonTests/physics/collider/C19578021_ShapeCollider_CanBeAdded.py +++ b/AutomatedTesting/Gem/PythonTests/physics/tests/shape_collider/ShapeCollider_CanBeAddedWitNoWarnings.py @@ -20,7 +20,7 @@ class Tests(): # fmt: on -def C19578021_ShapeCollider_CanBeAdded(): +def ShapeCollider_CanBeAddedWitNoWarnings(): """ Summary: Adding a PhysX Collider component when a PhysX Shape Collider and Box Shape components are already present @@ -89,4 +89,4 @@ def C19578021_ShapeCollider_CanBeAdded(): if __name__ == "__main__": from editor_python_test_tools.utils import Report - Report.start_test(C19578021_ShapeCollider_CanBeAdded) + Report.start_test(ShapeCollider_CanBeAddedWitNoWarnings) diff --git a/AutomatedTesting/Gem/PythonTests/physics/collider/C24308873_CylinderShapeCollider_CollidesWithPhysXTerrain.py b/AutomatedTesting/Gem/PythonTests/physics/tests/shape_collider/ShapeCollider_CylinderShapeCollides.py similarity index 95% rename from AutomatedTesting/Gem/PythonTests/physics/collider/C24308873_CylinderShapeCollider_CollidesWithPhysXTerrain.py rename to AutomatedTesting/Gem/PythonTests/physics/tests/shape_collider/ShapeCollider_CylinderShapeCollides.py index 9094ba68c6..a501688f8f 100644 --- a/AutomatedTesting/Gem/PythonTests/physics/collider/C24308873_CylinderShapeCollider_CollidesWithPhysXTerrain.py +++ b/AutomatedTesting/Gem/PythonTests/physics/tests/shape_collider/ShapeCollider_CylinderShapeCollides.py @@ -27,7 +27,7 @@ class Tests(): # fmt: on -def C24308873_CylinderShapeCollider_CollidesWithPhysXTerrain(): +def ShapeCollider_CylinderShapeCollides(): """ Summary: Runs a test to make sure that a PhysX Rigid Body and Cylinder Shape Collider can successfully collide with a PhysX Terrain entity. @@ -64,7 +64,7 @@ def C24308873_CylinderShapeCollider_CollidesWithPhysXTerrain(): # 1) Open level helper.init_idle() - helper.open_level("Physics", "C24308873_CylinderShapeCollider_CollidesWithPhysXTerrain") + helper.open_level("Physics", "ShapeCollider_CylinderShapeCollides") # Create terrain entity terrain = EditorEntity.create_editor_entity_at([30.0, 30.0, 33.96], "Terrain") @@ -133,4 +133,4 @@ def C24308873_CylinderShapeCollider_CollidesWithPhysXTerrain(): if __name__ == "__main__": from editor_python_test_tools.utils import Report - Report.start_test(C24308873_CylinderShapeCollider_CollidesWithPhysXTerrain) + Report.start_test(ShapeCollider_CylinderShapeCollides) diff --git a/AutomatedTesting/Gem/PythonTests/physics/collider/C19578018_ShapeColliderWithNoShapeComponent.py b/AutomatedTesting/Gem/PythonTests/physics/tests/shape_collider/ShapeCollider_InactiveWhenNoShapeComponent.py similarity index 96% rename from AutomatedTesting/Gem/PythonTests/physics/collider/C19578018_ShapeColliderWithNoShapeComponent.py rename to AutomatedTesting/Gem/PythonTests/physics/tests/shape_collider/ShapeCollider_InactiveWhenNoShapeComponent.py index 3da42eb40f..d057e83398 100644 --- a/AutomatedTesting/Gem/PythonTests/physics/collider/C19578018_ShapeColliderWithNoShapeComponent.py +++ b/AutomatedTesting/Gem/PythonTests/physics/tests/shape_collider/ShapeCollider_InactiveWhenNoShapeComponent.py @@ -19,7 +19,7 @@ class Tests(): # fmt: on -def C19578018_ShapeColliderWithNoShapeComponent(): +def ShapeCollider_InactiveWhenNoShapeComponent(): """ Summary: Create an Entity with PhysX Shape Collider component and verify that PhysX Shape Collider Component @@ -91,4 +91,4 @@ def C19578018_ShapeColliderWithNoShapeComponent(): if __name__ == "__main__": from editor_python_test_tools.utils import Report - Report.start_test(C19578018_ShapeColliderWithNoShapeComponent) + Report.start_test(ShapeCollider_InactiveWhenNoShapeComponent) diff --git a/AutomatedTesting/Gem/PythonTests/physics/collider/C19723164_ShapeColliders_WontCrashEditor.py b/AutomatedTesting/Gem/PythonTests/physics/tests/shape_collider/ShapeCollider_LargeNumberOfShapeCollidersWontCrashEditor.py similarity index 95% rename from AutomatedTesting/Gem/PythonTests/physics/collider/C19723164_ShapeColliders_WontCrashEditor.py rename to AutomatedTesting/Gem/PythonTests/physics/tests/shape_collider/ShapeCollider_LargeNumberOfShapeCollidersWontCrashEditor.py index 7d277a734d..ba8b598987 100644 --- a/AutomatedTesting/Gem/PythonTests/physics/collider/C19723164_ShapeColliders_WontCrashEditor.py +++ b/AutomatedTesting/Gem/PythonTests/physics/tests/shape_collider/ShapeCollider_LargeNumberOfShapeCollidersWontCrashEditor.py @@ -18,7 +18,7 @@ class Tests(): # fmt: on -def C19723164_ShapeColliders_WontCrashEditor(): +def ShapeCollider_LargeNumberOfShapeCollidersWontCrashEditor(): """ Summary: Create 512 entities with shape colliders and verify stability @@ -95,4 +95,4 @@ def C19723164_ShapeColliders_WontCrashEditor(): if __name__ == "__main__": from editor_python_test_tools.utils import Report - Report.start_test(C19723164_ShapeColliders_WontCrashEditor) + Report.start_test(ShapeCollider_LargeNumberOfShapeCollidersWontCrashEditor) diff --git a/AutomatedTesting/Gem/PythonTests/physics/terrain/C5689522_Physxterrain_AddPhysxterrainNoEditorCrash.py b/AutomatedTesting/Gem/PythonTests/physics/tests/terrain/Terrain_AddPhysTerrainComponent.py similarity index 94% rename from AutomatedTesting/Gem/PythonTests/physics/terrain/C5689522_Physxterrain_AddPhysxterrainNoEditorCrash.py rename to AutomatedTesting/Gem/PythonTests/physics/tests/terrain/Terrain_AddPhysTerrainComponent.py index 8e42f9f77c..c81e60de5b 100644 --- a/AutomatedTesting/Gem/PythonTests/physics/terrain/C5689522_Physxterrain_AddPhysxterrainNoEditorCrash.py +++ b/AutomatedTesting/Gem/PythonTests/physics/tests/terrain/Terrain_AddPhysTerrainComponent.py @@ -22,7 +22,7 @@ class Tests(): # fmt: on -def C5689522_Physxterrain_AddPhysxterrainNoEditorCrash(): +def Terrain_AddPhysTerrainComponent(): """ Summary: Runs an automated test by creating an entity with physx terrain and add another physx terrain and verify that @@ -74,7 +74,7 @@ def C5689522_Physxterrain_AddPhysxterrainNoEditorCrash(): 'EditorTerrainComponent' in warningInfo.window for warningInfo in warning_tracer.warnings) # 1) Open level - helper.open_level("Physics", "C5689522_Physxterrain_AddPhysxterrainNoEditorCrash") + helper.open_level("Physics", "Terrain_AddPhysTerrainComponent") # 2) Enter game mode helper.enter_game_mode(Tests.enter_game_mode) @@ -101,4 +101,4 @@ def C5689522_Physxterrain_AddPhysxterrainNoEditorCrash(): if __name__ == "__main__": from editor_python_test_tools.utils import Report - Report.start_test(C5689522_Physxterrain_AddPhysxterrainNoEditorCrash) + Report.start_test(Terrain_AddPhysTerrainComponent) diff --git a/AutomatedTesting/Gem/PythonTests/physics/terrain/C5689524_MultipleTerrains_CheckWarningInConsole.py b/AutomatedTesting/Gem/PythonTests/physics/tests/terrain/Terrain_CanAddMultipleTerrainComponents.py similarity index 94% rename from AutomatedTesting/Gem/PythonTests/physics/terrain/C5689524_MultipleTerrains_CheckWarningInConsole.py rename to AutomatedTesting/Gem/PythonTests/physics/tests/terrain/Terrain_CanAddMultipleTerrainComponents.py index ba74716544..706244df31 100644 --- a/AutomatedTesting/Gem/PythonTests/physics/terrain/C5689524_MultipleTerrains_CheckWarningInConsole.py +++ b/AutomatedTesting/Gem/PythonTests/physics/tests/terrain/Terrain_CanAddMultipleTerrainComponents.py @@ -21,7 +21,7 @@ class Tests(): # fmt: on -def C5689524_MultipleTerrains_CheckWarningInConsole(): +def Terrain_CanAddMultipleTerrainComponents(): """ Summary: Runs an automated test by creating multiple entities each with one or more terrain components and verify that you are @@ -76,7 +76,7 @@ def C5689524_MultipleTerrains_CheckWarningInConsole(): 'EditorTerrainComponent' in warningInfo.window for warningInfo in warning_tracer.warnings) # 1) Open level - helper.open_level("Physics", "C5689524_MultipleTerrains_CheckWarningInConsole") + helper.open_level("Physics", "Terrain_CanAddMultipleTerrainComponents") # 2) Enter game mode helper.enter_game_mode(Tests.enter_game_mode) @@ -102,4 +102,4 @@ def C5689524_MultipleTerrains_CheckWarningInConsole(): if __name__ == "__main__": from editor_python_test_tools.utils import Report - Report.start_test(C5689524_MultipleTerrains_CheckWarningInConsole) + Report.start_test(Terrain_CanAddMultipleTerrainComponents) diff --git a/AutomatedTesting/Gem/PythonTests/physics/terrain/C5689518_PhysXTerrain_CollidesWithPhysXTerrain.py b/AutomatedTesting/Gem/PythonTests/physics/tests/terrain/Terrain_CollisionAgainstRigidBody.py similarity index 95% rename from AutomatedTesting/Gem/PythonTests/physics/terrain/C5689518_PhysXTerrain_CollidesWithPhysXTerrain.py rename to AutomatedTesting/Gem/PythonTests/physics/tests/terrain/Terrain_CollisionAgainstRigidBody.py index a10cc72ed2..dac222b599 100644 --- a/AutomatedTesting/Gem/PythonTests/physics/terrain/C5689518_PhysXTerrain_CollidesWithPhysXTerrain.py +++ b/AutomatedTesting/Gem/PythonTests/physics/tests/terrain/Terrain_CollisionAgainstRigidBody.py @@ -24,7 +24,7 @@ class Tests(): # fmt: on -def C5689518_PhysXTerrain_CollidesWithPhysXTerrain(): +def Terrain_CollisionAgainstRigidBody(): """ Summary: Runs a test to make sure that a PhysX Rigid Body and Collider can successfully collide with a PhysX Terrain entity. @@ -57,7 +57,7 @@ def C5689518_PhysXTerrain_CollidesWithPhysXTerrain(): # 1) Open level / Enter game mode helper.init_idle() - helper.open_level("Physics", "C5689518_PhysXEntity_collides_with_PhysXTerrain") + helper.open_level("Physics", "Terrain_CollisionAgainstRigidBody") helper.enter_game_mode(Tests.enter_game_mode) # 2) Retrieve entities and positions @@ -109,4 +109,4 @@ def C5689518_PhysXTerrain_CollidesWithPhysXTerrain(): if __name__ == "__main__": from editor_python_test_tools.utils import Report - Report.start_test(C5689518_PhysXTerrain_CollidesWithPhysXTerrain) + Report.start_test(Terrain_CollisionAgainstRigidBody) diff --git a/AutomatedTesting/Gem/PythonTests/physics/terrain/C6032082_Terrain_MultipleResolutionsValid.py b/AutomatedTesting/Gem/PythonTests/physics/tests/terrain/Terrain_MultipleResolutionsValid.py similarity index 96% rename from AutomatedTesting/Gem/PythonTests/physics/terrain/C6032082_Terrain_MultipleResolutionsValid.py rename to AutomatedTesting/Gem/PythonTests/physics/tests/terrain/Terrain_MultipleResolutionsValid.py index 66615e1937..8a30d5443b 100644 --- a/AutomatedTesting/Gem/PythonTests/physics/terrain/C6032082_Terrain_MultipleResolutionsValid.py +++ b/AutomatedTesting/Gem/PythonTests/physics/tests/terrain/Terrain_MultipleResolutionsValid.py @@ -39,7 +39,7 @@ class Tests(): # fmt: on -def C6032082_Terrain_MultipleResolutionsValid(): +def Terrain_MultipleResolutionsValid(): """ Summary: @@ -109,7 +109,7 @@ def C6032082_Terrain_MultipleResolutionsValid(): self.test_exit_game_mode = exit_game_test level_128 = Level( - "C6032082_Terrain_MultipleResolutionsValid_128x128_1m", + "Terrain_MultipleResolutionsValid_128x128_1m", Tests.enter_game_mode_128x128_1m, Tests.find_entities_128x128_1m, Tests.ball_on_terrain_collision_128x128_1m, @@ -117,7 +117,7 @@ def C6032082_Terrain_MultipleResolutionsValid(): Tests.exit_game_mode_128x128_1m, ) level_512 = Level( - "C6032082_Terrain_MultipleResolutionsValid_512x512_2m", + "Terrain_MultipleResolutionsValid_512x512_2m", Tests.enter_game_mode_512x512_2m, Tests.find_entities_512x512_2m, Tests.ball_on_terrain_collision_512x512_2m, @@ -125,7 +125,7 @@ def C6032082_Terrain_MultipleResolutionsValid(): Tests.exit_game_mode_512x512_2m, ) level_1024 = Level( - "C6032082_Terrain_MultipleResolutionsValid_1024x1024_32m", + "Terrain_MultipleResolutionsValid_1024x1024_32m", Tests.enter_game_mode_1024x1024_32m, Tests.find_entities_1024x1024_32m, Tests.ball_on_terrain_collision_1024x1024_32m, @@ -133,7 +133,7 @@ def C6032082_Terrain_MultipleResolutionsValid(): Tests.exit_game_mode_1024x1024_32m, ) level_4096 = Level( - "C6032082_Terrain_MultipleResolutionsValid_4096x4096_16m", + "Terrain_MultipleResolutionsValid_4096x4096_16m", Tests.enter_game_mode_4096x4096_16m, Tests.find_entities_4096x4096_16m, Tests.ball_on_terrain_collision_4096x4096_16m, @@ -205,4 +205,4 @@ def C6032082_Terrain_MultipleResolutionsValid(): if __name__ == "__main__": from editor_python_test_tools.utils import Report - Report.start_test(C6032082_Terrain_MultipleResolutionsValid) + Report.start_test(Terrain_MultipleResolutionsValid) diff --git a/AutomatedTesting/Gem/PythonTests/physics/terrain/C5689528_Terrain_MultipleTerrainComponents.py b/AutomatedTesting/Gem/PythonTests/physics/tests/terrain/Terrain_MultipleTerrainComponentsWarning.py similarity index 94% rename from AutomatedTesting/Gem/PythonTests/physics/terrain/C5689528_Terrain_MultipleTerrainComponents.py rename to AutomatedTesting/Gem/PythonTests/physics/tests/terrain/Terrain_MultipleTerrainComponentsWarning.py index fb1fd01724..c62a8e670a 100644 --- a/AutomatedTesting/Gem/PythonTests/physics/terrain/C5689528_Terrain_MultipleTerrainComponents.py +++ b/AutomatedTesting/Gem/PythonTests/physics/tests/terrain/Terrain_MultipleTerrainComponentsWarning.py @@ -21,7 +21,7 @@ class Tests(): # fmt: on -def C5689528_Terrain_MultipleTerrainComponents(): +def Terrain_MultipleTerrainComponentsWarning(): """ Summary: @@ -74,7 +74,7 @@ def C5689528_Terrain_MultipleTerrainComponents(): 'EditorTerrainComponent' in warningInfo.window for warningInfo in warning_tracer.warnings) # 1) Open level - helper.open_level("Physics", "C5689528_Terrain_MultipleTerrainComponents") + helper.open_level("Physics", "Terrain_MultipleTerrainComponentsWarning") # 2) Enter game mode helper.enter_game_mode(Tests.enter_game_mode) @@ -99,4 +99,4 @@ def C5689528_Terrain_MultipleTerrainComponents(): if __name__ == "__main__": from editor_python_test_tools.utils import Report - Report.start_test(C5689528_Terrain_MultipleTerrainComponents) + Report.start_test(Terrain_MultipleTerrainComponentsWarning) diff --git a/AutomatedTesting/Gem/PythonTests/physics/terrain/C3510642_Terrain_NotCollideWithTerrain.py b/AutomatedTesting/Gem/PythonTests/physics/tests/terrain/Terrain_NoPhysTerrainComponentNoCollision.py similarity index 97% rename from AutomatedTesting/Gem/PythonTests/physics/terrain/C3510642_Terrain_NotCollideWithTerrain.py rename to AutomatedTesting/Gem/PythonTests/physics/tests/terrain/Terrain_NoPhysTerrainComponentNoCollision.py index 09522da31a..f006cf6587 100644 --- a/AutomatedTesting/Gem/PythonTests/physics/terrain/C3510642_Terrain_NotCollideWithTerrain.py +++ b/AutomatedTesting/Gem/PythonTests/physics/tests/terrain/Terrain_NoPhysTerrainComponentNoCollision.py @@ -26,7 +26,7 @@ class Tests(): # fmt: on -def C3510642_Terrain_NotCollideWithTerrain(): +def Terrain_NoPhysTerrainComponentNoCollision(): """ Summary: Runs an automated test to ensure that when no PhysX Terrain component is added, @@ -78,7 +78,7 @@ def C3510642_Terrain_NotCollideWithTerrain(): helper.init_idle() # 1) Open level - helper.open_level("Physics", "C3510642_Terrain_NotCollideWithTerrain") + helper.open_level("Physics", "Terrain_NoPhysTerrainComponentNoCollision") # 2) Enter game mode helper.enter_game_mode(Tests.enter_game_mode) @@ -164,4 +164,4 @@ def C3510642_Terrain_NotCollideWithTerrain(): if __name__ == "__main__": from editor_python_test_tools.utils import Report - Report.start_test(C3510642_Terrain_NotCollideWithTerrain) + Report.start_test(Terrain_NoPhysTerrainComponentNoCollision) diff --git a/AutomatedTesting/Gem/PythonTests/physics/terrain/C5689531_Warning_TerrainSliceTerrainComponent.py b/AutomatedTesting/Gem/PythonTests/physics/tests/terrain/Terrain_SpawnSecondTerrainComponentWarning.py similarity index 95% rename from AutomatedTesting/Gem/PythonTests/physics/terrain/C5689531_Warning_TerrainSliceTerrainComponent.py rename to AutomatedTesting/Gem/PythonTests/physics/tests/terrain/Terrain_SpawnSecondTerrainComponentWarning.py index 68ddaba5ed..cb37e8be76 100644 --- a/AutomatedTesting/Gem/PythonTests/physics/terrain/C5689531_Warning_TerrainSliceTerrainComponent.py +++ b/AutomatedTesting/Gem/PythonTests/physics/tests/terrain/Terrain_SpawnSecondTerrainComponentWarning.py @@ -23,7 +23,7 @@ class Tests: # fmt: on -def C5689531_Warning_TerrainSliceTerrainComponent(): +def Terrain_SpawnSecondTerrainComponentWarning(): """ Summary: @@ -82,7 +82,7 @@ def C5689531_Warning_TerrainSliceTerrainComponent(): 'TerrainComponent' in warningInfo.window for warningInfo in warning_tracer.warnings) # 1) Open level - helper.open_level("Physics", "C5689531_Warning_TerrainSliceTerrainComponent") + helper.open_level("Physics", "Terrain_SpawnSecondTerrainComponentWarning") # 2) Enter game mode helper.enter_game_mode(Tests.enter_game_mode) @@ -111,4 +111,4 @@ def C5689531_Warning_TerrainSliceTerrainComponent(): if __name__ == "__main__": from editor_python_test_tools.utils import Report - Report.start_test(C5689531_Warning_TerrainSliceTerrainComponent) + Report.start_test(Terrain_SpawnSecondTerrainComponentWarning) diff --git a/AutomatedTesting/Gem/PythonTests/physics/terrain/C13508019_Terrain_TerrainTexturePainterWorks.py b/AutomatedTesting/Gem/PythonTests/physics/tests/terrain/Terrain_TerrainTexturePainterWorks.py similarity index 96% rename from AutomatedTesting/Gem/PythonTests/physics/terrain/C13508019_Terrain_TerrainTexturePainterWorks.py rename to AutomatedTesting/Gem/PythonTests/physics/tests/terrain/Terrain_TerrainTexturePainterWorks.py index 9822b933d1..150be66bcc 100644 --- a/AutomatedTesting/Gem/PythonTests/physics/terrain/C13508019_Terrain_TerrainTexturePainterWorks.py +++ b/AutomatedTesting/Gem/PythonTests/physics/tests/terrain/Terrain_TerrainTexturePainterWorks.py @@ -23,7 +23,7 @@ class Tests: # fmt: on -def C13508019_Terrain_TerrainTexturePainterWorks(): +def Terrain_TerrainTexturePainterWorks(): # run() will open a a level and validate terrain material are updated after using terrain texture painter # It does this by: # 1) Opens level with a terrain that has been painted by two different physical materials with a box above each @@ -59,7 +59,7 @@ def C13508019_Terrain_TerrainTexturePainterWorks(): helper.init_idle() # 1) Open level - helper.open_level("Physics", "C13508019_Terrain_TerrainTexturePainterWorks") + helper.open_level("Physics", "Terrain_TerrainTexturePainterWorks") # 2) Enter game mode helper.enter_game_mode(Tests.enter_game_mode) @@ -136,4 +136,4 @@ def C13508019_Terrain_TerrainTexturePainterWorks(): if __name__ == "__main__": from editor_python_test_tools.utils import Report - Report.start_test(C13508019_Terrain_TerrainTexturePainterWorks) + Report.start_test(Terrain_TerrainTexturePainterWorks) diff --git a/AutomatedTesting/Gem/PythonTests/physics/utils/FileManagement.py b/AutomatedTesting/Gem/PythonTests/physics/utils/FileManagement.py index 89b7559dd1..22a41de4ea 100644 --- a/AutomatedTesting/Gem/PythonTests/physics/utils/FileManagement.py +++ b/AutomatedTesting/Gem/PythonTests/physics/utils/FileManagement.py @@ -270,7 +270,7 @@ class FileManagement: file_list = FileManagement._find_files(file_names, root_path, search_subdirs) except RuntimeWarning as w: assert False, ( - w.message + w.args[0] + " Please check use of search_subdirs; make sure you are using the correct parent directory." ) @@ -331,7 +331,7 @@ class FileManagement: file_list = FileManagement._find_files([target_file, src_file], root_path, search_subdirs) except RuntimeWarning as w: assert False, ( - w.message + w.args[0] + " Please check use of search_subdirs; make sure you are using the correct parent directory." ) diff --git a/AutomatedTesting/Gem/PythonTests/prefab/Prefab.py b/AutomatedTesting/Gem/PythonTests/prefab/Prefab.py new file mode 100644 index 0000000000..14a1ab62f0 --- /dev/null +++ b/AutomatedTesting/Gem/PythonTests/prefab/Prefab.py @@ -0,0 +1,221 @@ +""" +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 +""" + +from __future__ import annotations +from collections import Counter +from collections import deque +from os import path + +from PySide2 import QtWidgets + +from azlmbr.entity import EntityId +from azlmbr.math import Vector3 +from editor_python_test_tools.editor_entity_utils import EditorEntity +from editor_python_test_tools.utils import Report + +import azlmbr.bus as bus +import azlmbr.prefab as prefab +import editor_python_test_tools.pyside_utils as pyside_utils +import prefab.Prefab_Test_Utils as prefab_test_utils + +# This is a helper class which contains some of the useful information about a prefab instance. +class PrefabInstance: + + def __init__(self, name: str=None, prefab_file_name: str=None, container_entity: EditorEntity=EntityId()): + self.name = name + self.prefab_file_name: str = prefab_file_name + self.container_entity: EditorEntity = container_entity + + """ + See if this instance is valid to be used with other prefab operations. + :return: Whether the target instance is valid or not. + """ + def is_valid() -> bool: + return self.container_entity.id.IsValid() and self.name is not None and self.prefab_file_name in Prefab.existing_prefabs + + + """ + Reparent this instance to target parent entity. + The function will also check pop up dialog ui in editor to see if there's prefab cyclical dependency error while reparenting prefabs. + :param parent_entity_id: The id of the entity this instance should be a child of in the transform hierarchy next. + """ + async def ui_reparent_prefab_instance(self, parent_entity_id: EntityId): + container_entity_name = self.container_entity.get_name() + current_children_entity_ids_having_prefab_name = prefab_test_utils.get_children_ids_by_name(parent_entity_id, container_entity_name) + Report.info(f'current_children_entity_ids_having_prefab_name: {current_children_entity_ids_having_prefab_name}') + + pyside_utils.run_soon(lambda: self.container_entity.set_parent_entity(parent_entity_id)) + pyside_utils.run_soon(lambda: prefab_test_utils.wait_for_propagation()) + + try: + active_modal_widget = await pyside_utils.wait_for_modal_widget() + error_message_box = active_modal_widget.findChild(QtWidgets.QMessageBox) + ok_button = error_message_box.button(QtWidgets.QMessageBox.Ok) + ok_button.click() + assert False, "Cyclical dependency detected while reparenting prefab" + except pyside_utils.EventLoopTimeoutException: + pass + + updated_children_entity_ids_having_prefab_name = prefab_test_utils.get_children_ids_by_name(parent_entity_id, container_entity_name) + Report.info(f'updated_children_entity_ids_having_prefab_name: {updated_children_entity_ids_having_prefab_name}') + new_child_with_reparented_prefab_name_added = len(updated_children_entity_ids_having_prefab_name) == len(current_children_entity_ids_having_prefab_name) + 1 + assert new_child_with_reparented_prefab_name_added, "No entity with reparented prefab name become a child of target parent entity" + + updated_container_entity_id = set(updated_children_entity_ids_having_prefab_name).difference(current_children_entity_ids_having_prefab_name).pop() + updated_container_entity = EditorEntity(updated_container_entity_id) + updated_container_entity_parent_id = updated_container_entity.get_parent_id() + has_correct_parent = updated_container_entity_parent_id.ToString() == parent_entity_id.ToString() + assert has_correct_parent, "Prefab reparented is *not* under the expected parent entity" + + self.container_entity = EditorEntity(updated_container_entity_id) + +# This is a helper class which contains some of the useful information about a prefab template. +class Prefab: + + existing_prefabs = {} + + def __init__(self, file_name: str): + self.file_name:str = file_name + self.file_path: str = prefab_test_utils.get_prefab_file_path(file_name) + self.instances: dict = {} + + """ + Check if a prefab is ready to be used to generate its instances. + :param file_name: A unique file name of the target prefab. + :return: Whether the target prefab is loaded or not. + """ + @classmethod + def is_prefab_loaded(cls, file_name: str) -> bool: + return file_name in Prefab.existing_prefabs + + """ + Check if a prefab exists in the directory for files of prefab tests. + :param file_name: A unique file name of the target prefab. + :return: Whether the target prefab exists or not. + """ + @classmethod + def prefab_exists(cls, file_name: str) -> bool: + file_path = prefab_test_utils.get_prefab_file_path(file_name) + return path.exists(file_path) + + """ + Return a prefab which can be used immediately. + :param file_name: A unique file name of the target prefab. + :return: The prefab with given file name. + """ + @classmethod + def get_prefab(cls, file_name: str) -> Prefab: + if Prefab.is_prefab_loaded(file_name): + return Prefab.existing_prefabs[file_name] + else: + assert Prefab.prefab_exists(file_name), f"Attempted to get a prefab {file_name} that doesn't exist" + new_prefab = Prefab(file_name) + Prefab.existing_prefabs[file_name] = Prefab(file_name) + return new_prefab + + """ + Create a prefab in memory and return it. The very first instance of this prefab will also be created. + :param entities: The entities that should form the new prefab (along with their descendants). + :param file_name: A unique file name of new prefab. + :param prefab_instance_name: A name for the very first instance generated while prefab creation. The default instance name is the same as file_name. + :return: An outcome object with an entityId of the new prefab's container entity; on failure, it comes with an error message detailing the cause of the error. + """ + @classmethod + def create_prefab(cls, entities: list[EditorEntity], file_name: str, prefab_instance_name: str=None) -> Prefab: + assert not Prefab.is_prefab_loaded(file_name), f"Can't create Prefab '{file_name}' since the prefab already exists" + + new_prefab = Prefab(file_name) + entity_ids = [entity.id for entity in entities] + create_prefab_result = prefab.PrefabPublicRequestBus(bus.Broadcast, 'CreatePrefabInMemory', entity_ids, new_prefab.file_path) + assert create_prefab_result.IsSuccess(), f"Prefab operation 'CreatePrefab' failed. Error: {create_prefab_result.GetError()}" + + container_entity = EditorEntity(create_prefab_result.GetValue()) + + if prefab_instance_name: + container_entity.set_name(prefab_instance_name) + else: + prefab_instance_name = file_name + + prefab_test_utils.wait_for_propagation() + container_entity_id = prefab_test_utils.find_entity_by_unique_name(prefab_instance_name) + new_prefab.instances[prefab_instance_name] = PrefabInstance(prefab_instance_name, file_name, EditorEntity(container_entity_id)) + Prefab.existing_prefabs[file_name] = new_prefab + return new_prefab + + """ + Remove target prefab instances. + :param prefab_instances: Instances to be removed. + """ + @classmethod + def remove_prefabs(cls, prefab_instances: list[PrefabInstance]): + instances_to_remove_name_counts = Counter() + instances_removed_expected_name_counts = Counter() + + entities_to_remove = [prefab_instance.container_entity for prefab_instance in prefab_instances] + while entities_to_remove: + entity = entities_to_remove.pop(-1) + entity_name = entity.get_name() + instances_to_remove_name_counts[entity_name] += 1 + + children_entity_ids = entity.get_children_ids() + for child_entity_id in children_entity_ids: + entities_to_remove.append(EditorEntity(child_entity_id)) + + for entity_name, entity_count in instances_to_remove_name_counts.items(): + entities = prefab_test_utils.find_entities_by_name(entity_name) + instances_removed_expected_name_counts[entity_name] = len(entities) - entity_count + + container_entity_ids = [prefab_instance.container_entity.id for prefab_instance in prefab_instances] + delete_prefab_result = prefab.PrefabPublicRequestBus(bus.Broadcast, 'DeleteEntitiesAndAllDescendantsInInstance', container_entity_ids) + assert delete_prefab_result.IsSuccess(), f"Prefab operation 'DeleteEntitiesAndAllDescendantsInInstance' failed. Error: {delete_prefab_result.GetError()}" + + prefab_test_utils.wait_for_propagation() + + prefab_entities_deleted = True + for entity_name, expected_entity_count in instances_removed_expected_name_counts.items(): + actual_entity_count = len(prefab_test_utils.find_entities_by_name(entity_name)) + if actual_entity_count is not expected_entity_count: + prefab_entities_deleted = False + break + + assert prefab_entities_deleted, "Not all entities and descendants in target prefabs are deleted." + + for instance in prefab_instances: + instance_deleted_prefab = Prefab.get_prefab(instance.prefab_file_name) + instance_deleted_prefab.instances.pop(instance.name) + instance = PrefabInstance() + + """ + Instantiate an instance of this prefab. + :param name: A name for newly instantiated prefab instance. The default instance name is the same as this prefab's file name. + :param parent_entity: The entity the prefab should be a child of in the transform hierarchy. + :param prefab_position: The position in world space the prefab should be instantiated in. + :return: An outcome object with an entityId of the new prefab's container entity; on failure, it comes with an error message detailing the cause of the error. + """ + def instantiate(self, name: str=None, parent_entity: EditorEntity=None, prefab_position: Vector3=Vector3()) -> PrefabInstance: + parent_entity_id = parent_entity.id if parent_entity is not None else EntityId() + + instantiate_prefab_result = prefab.PrefabPublicRequestBus( + bus.Broadcast, 'InstantiatePrefab', self.file_path, parent_entity_id, prefab_position) + + assert instantiate_prefab_result.IsSuccess(), f"Prefab operation 'InstantiatePrefab' failed. Error: {instantiate_prefab_result.GetError()}" + + container_entity_id = instantiate_prefab_result.GetValue() + container_entity = EditorEntity(container_entity_id) + + if name: + container_entity.set_name(name) + else: + name = self.file_name + + prefab_test_utils.wait_for_propagation() + container_entity_id = prefab_test_utils.find_entity_by_unique_name(name) + self.instances[name] = PrefabInstance(name, self.file_name, EditorEntity(container_entity_id)) + + prefab_test_utils.check_entity_at_position(container_entity_id, prefab_position) + + return container_entity_id diff --git a/AutomatedTesting/Gem/PythonTests/prefab/PrefabLevel_BasicWorkflow.py b/AutomatedTesting/Gem/PythonTests/prefab/PrefabLevel_BasicWorkflow.py deleted file mode 100644 index 7a600f7976..0000000000 --- a/AutomatedTesting/Gem/PythonTests/prefab/PrefabLevel_BasicWorkflow.py +++ /dev/null @@ -1,108 +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 -""" - -# fmt:off -class Tests(): - create_new_entity = ("'CreateNewEntity' passed", "'CreateNewEntity' failed") - create_prefab = ("'CreatePrefab' passed", "'CreatePrefab' failed") - instantiate_prefab = ("'InstantiatePrefab' passed", "'InstantiatePrefab' failed") - has_one_child = ("instantiated prefab contains only one child as expected", "instantiated prefab does *not* contain only one child as expected") - instantiated_prefab_position = ("instantiated prefab's position is at the expected position", "instantiated prefab's position is *not* at the expected position") - delete_prefab = ("'DeleteEntitiesAndAllDescendantsInInstance' passed", "'DeleteEntitiesAndAllDescendantsInInstance' failed") - instantiated_prefab_removed = ("instantiated prefab's container entity has been removed", "instantiated prefab's container entity has *not* been removed") - instantiated_child_removed = ("instantiated prefab's child entity has been removed", "instantiated prefab's child entity has *not* been removed") -# fmt:on - -def PrefabLevel_BasicWorkflow(): - """ - This test will help verify if the following functions related to Prefab work as expected: - - CreatePrefab - - InstantiatePrefab - - DeleteEntitiesAndAllDescendantsInInstance - """ - - import os - import sys - - from editor_python_test_tools.utils import Report - from editor_python_test_tools.utils import TestHelper as helper - import editor_python_test_tools.hydra_editor_utils as hydra - - import azlmbr.bus as bus - import azlmbr.entity as entity - from azlmbr.entity import EntityId - import azlmbr.editor as editor - import azlmbr.prefab as prefab - from azlmbr.math import Vector3 - import azlmbr.legacy.general as general - - NEW_PREFAB_NAME = "new_prefab" - NEW_PREFAB_FILE_NAME = NEW_PREFAB_NAME + ".prefab" - NEW_PREFAB_FILE_PATH = os.path.join(os.path.dirname(os.path.abspath(__file__)), NEW_PREFAB_FILE_NAME) - INSTANTIATED_PREFAB_POSITION = Vector3(10.00, 20.0, 30.0) - INSTANTIATED_PREFAB_NAME = "instantiated_prefab" - INSTANTIATED_CHILD_ENTITY_NAME = "child_1" - TEST_LEVEL_FOLDER = "Prefab" - TEST_LEVEL_NAME = "Base" - - def find_entity_by_name(entity_name): - searchFilter = entity.SearchFilter() - searchFilter.names = [entity_name] - entityIds = entity.SearchBus(bus.Broadcast, 'SearchEntities', searchFilter) - if entityIds and entityIds[0].IsValid(): - return entityIds[0] - return None - - def print_error_if_failed(prefab_operation_result): - if not prefab_operation_result.IsSuccess(): - Report.info(f'Error message: {prefab_operation_result.GetError()}') - - -# Open the test level - helper.init_idle() - helper.open_level(TEST_LEVEL_FOLDER, TEST_LEVEL_NAME) - -# Create a new Entity at the root level - new_entity_id = editor.ToolsApplicationRequestBus(bus.Broadcast, 'CreateNewEntity', EntityId()) - Report.result(Tests.create_new_entity, new_entity_id.IsValid()) - -# Checks for prefab creation passed or not - create_prefab_result = prefab.PrefabPublicRequestBus(bus.Broadcast, 'CreatePrefabInMemory', [new_entity_id], NEW_PREFAB_FILE_PATH) - Report.result(Tests.create_prefab, create_prefab_result.IsSuccess()) - print_error_if_failed(create_prefab_result) - -# Checks for prefab instantiation passed or not - instantiate_prefab_result = prefab.PrefabPublicRequestBus(bus.Broadcast, 'InstantiatePrefab', NEW_PREFAB_FILE_PATH, EntityId(), INSTANTIATED_PREFAB_POSITION) - Report.result(Tests.instantiate_prefab, instantiate_prefab_result.IsSuccess() and instantiate_prefab_result.GetValue().IsValid()) - print_error_if_failed(instantiate_prefab_result) - - container_entity_id = instantiate_prefab_result.GetValue() - editor.EditorEntityAPIBus(bus.Event, 'SetName', container_entity_id, INSTANTIATED_PREFAB_NAME) - - children_entity_ids = editor.EditorEntityInfoRequestBus(bus.Event, 'GetChildren', container_entity_id) - Report.result(Tests.has_one_child, len(children_entity_ids) is 1) - - child_entity_id = children_entity_ids[0] - editor.EditorEntityAPIBus(bus.Event, 'SetName', child_entity_id, INSTANTIATED_CHILD_ENTITY_NAME) - -# Checks if the new prefab is at the correct position and if it fails, it will provide the expected postion and the actual postion of the entity in the Editor log - actual_prefab_position = azlmbr.components.TransformBus(azlmbr.bus.Event, "GetWorldTranslation", container_entity_id) - is_at_position = actual_prefab_position.IsClose(INSTANTIATED_PREFAB_POSITION) - Report.result(Tests.instantiated_prefab_position, is_at_position) - if not is_at_position: - Report.info(f'Expected position: {INSTANTIATED_PREFAB_POSITION.ToString()}, actual position: {actual_prefab_position.ToString()}') - -# Checks for prefab deletion passed or not - delete_prefab_result = prefab.PrefabPublicRequestBus(bus.Broadcast, 'DeleteEntitiesAndAllDescendantsInInstance', [container_entity_id]) - Report.result(Tests.delete_prefab, delete_prefab_result.IsSuccess()) - print_error_if_failed(delete_prefab_result) - Report.result(Tests.instantiated_prefab_removed, find_entity_by_name(INSTANTIATED_PREFAB_NAME) is None) - Report.result(Tests.instantiated_child_removed, find_entity_by_name(INSTANTIATED_CHILD_ENTITY_NAME) is None) - -if __name__ == "__main__": - from editor_python_test_tools.utils import Report - Report.start_test(PrefabLevel_BasicWorkflow) diff --git a/AutomatedTesting/Gem/PythonTests/prefab/Prefab_BasicWorkflow_CreateAndDeletePrefab.py b/AutomatedTesting/Gem/PythonTests/prefab/Prefab_BasicWorkflow_CreateAndDeletePrefab.py new file mode 100644 index 0000000000..c6e0daa4dd --- /dev/null +++ b/AutomatedTesting/Gem/PythonTests/prefab/Prefab_BasicWorkflow_CreateAndDeletePrefab.py @@ -0,0 +1,34 @@ +""" +Copyright (c) Contributors to the Open 3D Engine Project. +For complete copyright and license terms please see the LICENSE at the root of this distribution. + +SPDX-License-Identifier: Apache-2.0 OR MIT +""" + +def Prefab_BasicWorkflow_CreateAndDeletePrefab(): + + CAR_PREFAB_FILE_NAME = 'car_prefab' + + from editor_python_test_tools.editor_entity_utils import EditorEntity + from prefab.Prefab import Prefab + + import prefab.Prefab_Test_Utils 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 + car_entity = EditorEntity.create_editor_entity() + car_prefab_entities = [car_entity] + + # Checks for prefab creation passed or not + car_prefab = Prefab.create_prefab( + car_prefab_entities, CAR_PREFAB_FILE_NAME) + + # Checks for prefab deletion passed or not + car = car_prefab.instances[CAR_PREFAB_FILE_NAME] + Prefab.remove_prefabs([car]) + +if __name__ == "__main__": + from editor_python_test_tools.utils import Report + Report.start_test(Prefab_BasicWorkflow_CreateAndDeletePrefab) diff --git a/AutomatedTesting/Gem/PythonTests/prefab/Prefab_BasicWorkflow_CreateAndReparentPrefab.py b/AutomatedTesting/Gem/PythonTests/prefab/Prefab_BasicWorkflow_CreateAndReparentPrefab.py new file mode 100644 index 0000000000..04f7b97628 --- /dev/null +++ b/AutomatedTesting/Gem/PythonTests/prefab/Prefab_BasicWorkflow_CreateAndReparentPrefab.py @@ -0,0 +1,51 @@ +""" +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 Prefab_BasicWorkflow_CreateAndReparentPrefab(): + + CAR_PREFAB_FILE_NAME = 'car_prefab' + WHEEL_PREFAB_FILE_NAME = 'wheel_prefab' + + import editor_python_test_tools.pyside_utils as pyside_utils + + @pyside_utils.wrap_async + async def run_test(): + + from editor_python_test_tools.editor_entity_utils import EditorEntity + from prefab.Prefab import Prefab + + import prefab.Prefab_Test_Utils 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 + car_entity = EditorEntity.create_editor_entity() + car_prefab_entities = [car_entity] + + # Checks for prefab creation passed or not + car_prefab = Prefab.create_prefab( + car_prefab_entities, CAR_PREFAB_FILE_NAME) + + # Creates another new Entity at the root level + wheel_entity = EditorEntity.create_editor_entity() + wheel_prefab_entities = [wheel_entity] + + # Checks for wheel prefab creation passed or not + wheel_prefab = Prefab.create_prefab( + wheel_prefab_entities, WHEEL_PREFAB_FILE_NAME) + + # Checks for prefab reparenting passed or not + car = car_prefab.instances[CAR_PREFAB_FILE_NAME] + wheel = wheel_prefab.instances[WHEEL_PREFAB_FILE_NAME] + await wheel.ui_reparent_prefab_instance(car.container_entity.id) + + run_test() + +if __name__ == "__main__": + from editor_python_test_tools.utils import Report + Report.start_test(Prefab_BasicWorkflow_CreateAndReparentPrefab) diff --git a/AutomatedTesting/Gem/PythonTests/prefab/Prefab_BasicWorkflow_CreatePrefab.py b/AutomatedTesting/Gem/PythonTests/prefab/Prefab_BasicWorkflow_CreatePrefab.py new file mode 100644 index 0000000000..d86b03d5ad --- /dev/null +++ b/AutomatedTesting/Gem/PythonTests/prefab/Prefab_BasicWorkflow_CreatePrefab.py @@ -0,0 +1,30 @@ +""" +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 Prefab_BasicWorkflow_CreatePrefab(): + + CAR_PREFAB_FILE_NAME = 'car_prefab' + + from editor_python_test_tools.editor_entity_utils import EditorEntity + from editor_python_test_tools.utils import Report + from prefab.Prefab import Prefab + + import prefab.Prefab_Test_Utils 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 + car_entity = EditorEntity.create_editor_entity() + car_prefab_entities = [car_entity] + + # Checks for prefab creation passed or not + Prefab.create_prefab(car_prefab_entities, CAR_PREFAB_FILE_NAME) + +if __name__ == "__main__": + from editor_python_test_tools.utils import Report + Report.start_test(Prefab_BasicWorkflow_CreatePrefab) diff --git a/AutomatedTesting/Gem/PythonTests/prefab/Prefab_BasicWorkflow_InstantiatePrefab.py b/AutomatedTesting/Gem/PythonTests/prefab/Prefab_BasicWorkflow_InstantiatePrefab.py new file mode 100644 index 0000000000..b9015ab556 --- /dev/null +++ b/AutomatedTesting/Gem/PythonTests/prefab/Prefab_BasicWorkflow_InstantiatePrefab.py @@ -0,0 +1,34 @@ +""" +Copyright (c) Contributors to the Open 3D Engine Project. +For complete copyright and license terms please see the LICENSE at the root of this distribution. + +SPDX-License-Identifier: Apache-2.0 OR MIT +""" + +def Prefab_BasicWorkflow_InstantiatePrefab(): + + from azlmbr.math import Vector3 + + EXISTING_TEST_PREFAB_FILE_NAME = "Test" + INSTANTIATED_TEST_PREFAB_POSITION = Vector3(10.00, 20.0, 30.0) + EXPECTED_TEST_PREFAB_CHILDREN_COUNT = 1 + + from prefab.Prefab import Prefab + + import prefab.Prefab_Test_Utils as prefab_test_utils + + prefab_test_utils.open_base_tests_level() + + # Checks for prefab instantiation passed or not + test_prefab = Prefab.get_prefab(EXISTING_TEST_PREFAB_FILE_NAME) + + instantiated_test_container_entity_id = test_prefab.instantiate( + prefab_position=INSTANTIATED_TEST_PREFAB_POSITION) + + prefab_test_utils.check_entity_children_count( + instantiated_test_container_entity_id, + EXPECTED_TEST_PREFAB_CHILDREN_COUNT) + +if __name__ == "__main__": + from editor_python_test_tools.utils import Report + Report.start_test(Prefab_BasicWorkflow_InstantiatePrefab) diff --git a/AutomatedTesting/Gem/PythonTests/prefab/Prefab_Test_Utils.py b/AutomatedTesting/Gem/PythonTests/prefab/Prefab_Test_Utils.py new file mode 100644 index 0000000000..8cd59ed077 --- /dev/null +++ b/AutomatedTesting/Gem/PythonTests/prefab/Prefab_Test_Utils.py @@ -0,0 +1,94 @@ +""" +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 + +from azlmbr.entity import EntityId +from azlmbr.math import Vector3 +from editor_python_test_tools.editor_entity_utils import EditorEntity +from editor_python_test_tools.utils import Report +from editor_python_test_tools.utils import TestHelper as helper + +import azlmbr.bus as bus +import azlmbr.components as components +import azlmbr.entity as entity +import azlmbr.legacy.general as general + +def get_prefab_file_name(prefab_name): + return prefab_name + ".prefab" + +def get_prefab_file_path(prefab_name): + return os.path.join(os.path.dirname(os.path.abspath(__file__)), get_prefab_file_name(prefab_name)) + +def find_entities_by_name(entity_name): + searchFilter = entity.SearchFilter() + searchFilter.names = [entity_name] + return entity.SearchBus(bus.Broadcast, 'SearchEntities', searchFilter) + +def find_entity_by_unique_name(entity_name): + unique_name_entity_found_result = ( + "Entity with a unique name found", + "Entity with a unique name *not* found") + + entities = find_entities_by_name(entity_name) + unique_name_entity_found = len(entities) == 1 + Report.result(unique_name_entity_found_result, unique_name_entity_found) + + if unique_name_entity_found: + return entities[0] + else: + Report.info(f"{len(entities)} entities with name '{entity_name}' found") + return EntityId() + +def check_entity_at_position(entity_id, expected_entity_position): + entity_at_expected_position_result = ( + "entity is at expected position", + "entity is *not* at expected position") + + actual_entity_position = components.TransformBus(bus.Event, "GetWorldTranslation", entity_id) + is_at_position = actual_entity_position.IsClose(expected_entity_position) + Report.result(entity_at_expected_position_result, is_at_position) + + if not is_at_position: + Report.info(f"Entity '{entity_id.ToString()}'\'s expected position: {expected_entity_position.ToString()}, actual position: {actual_entity_position.ToString()}") + + return is_at_position + +def check_entity_children_count(entity_id, expected_children_count): + entity_children_count_matched_result = ( + "Entity with a unique name found", + "Entity with a unique name *not* found") + + entity = EditorEntity(entity_id) + children_entity_ids = entity.get_children_ids() + entity_children_count_matched = len(children_entity_ids) == expected_children_count + Report.result(entity_children_count_matched_result, entity_children_count_matched) + + if not entity_children_count_matched: + Report.info(f"Entity '{entity_id.ToString()}' actual children count: {len(children_entity_ids)}. Expected children count: {expected_children_count}") + + return entity_children_count_matched + +def get_children_ids_by_name(entity_id, entity_name): + entity = EditorEntity(entity_id) + children_entity_ids = entity.get_children_ids() + + result = [] + for child_entity_id in children_entity_ids: + child_entity = EditorEntity(child_entity_id) + child_entity_name = child_entity.get_name() + if child_entity_name == entity_name: + result.append(child_entity_id) + + return result + +def wait_for_propagation(): + general.idle_wait_frames(1) + +def open_base_tests_level(): + helper.init_idle() + helper.open_level("Prefab", "Base") diff --git a/AutomatedTesting/Gem/PythonTests/prefab/Test.prefab b/AutomatedTesting/Gem/PythonTests/prefab/Test.prefab new file mode 100644 index 0000000000..c8d37d7762 --- /dev/null +++ b/AutomatedTesting/Gem/PythonTests/prefab/Test.prefab @@ -0,0 +1,107 @@ +{ + "ContainerEntity": { + "Id": "ContainerEntity", + "Name": "Test", + "Components": { + "Component_[12826143848076424135]": { + "$type": "EditorDisabledCompositionComponent", + "Id": 12826143848076424135 + }, + "Component_[15101974329990766813]": { + "$type": "EditorVisibilityComponent", + "Id": 15101974329990766813 + }, + "Component_[16680274563691182095]": { + "$type": "EditorOnlyEntityComponent", + "Id": 16680274563691182095 + }, + "Component_[17501195180351523199]": { + "$type": "SelectionComponent", + "Id": 17501195180351523199 + }, + "Component_[17646858836910065148]": { + "$type": "EditorPrefabComponent", + "Id": 17646858836910065148 + }, + "Component_[18334569630592611766]": { + "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent", + "Id": 18334569630592611766, + "Parent Entity": "" + }, + "Component_[1851406541343621754]": { + "$type": "EditorInspectorComponent", + "Id": 1851406541343621754 + }, + "Component_[25876196591746739]": { + "$type": "EditorEntitySortComponent", + "Id": 25876196591746739 + }, + "Component_[2800966138796329695]": { + "$type": "EditorPendingCompositionComponent", + "Id": 2800966138796329695 + }, + "Component_[8557036193836405255]": { + "$type": "EditorLockComponent", + "Id": 8557036193836405255 + }, + "Component_[9320658693245331333]": { + "$type": "EditorEntityIconComponent", + "Id": 9320658693245331333 + } + } + }, + "Entities": { + "Entity_[965482067476]": { + "Id": "Entity_[965482067476]", + "Name": "Test_Entity", + "Components": { + "Component_[10201286510014079044]": { + "$type": "EditorLockComponent", + "Id": 10201286510014079044 + }, + "Component_[10449365794489552009]": { + "$type": "EditorInspectorComponent", + "Id": 10449365794489552009, + "ComponentOrderEntryArray": [ + { + "ComponentId": 8658441042113324226 + } + ] + }, + "Component_[14918448446211728610]": { + "$type": "EditorOnlyEntityComponent", + "Id": 14918448446211728610 + }, + "Component_[16421196842573146832]": { + "$type": "EditorPendingCompositionComponent", + "Id": 16421196842573146832 + }, + "Component_[18246651644622464292]": { + "$type": "EditorVisibilityComponent", + "Id": 18246651644622464292 + }, + "Component_[2027518491025985743]": { + "$type": "EditorDisabledCompositionComponent", + "Id": 2027518491025985743 + }, + "Component_[4284802475196956760]": { + "$type": "EditorEntityIconComponent", + "Id": 4284802475196956760 + }, + "Component_[5856000098143259126]": { + "$type": "EditorEntitySortComponent", + "Id": 5856000098143259126 + }, + "Component_[7830595068045232876]": { + "$type": "SelectionComponent", + "Id": 7830595068045232876 + }, + "Component_[8658441042113324226]": { + "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent", + "Id": 8658441042113324226, + "Parent Entity": "ContainerEntity" + } + } + } + } +} \ No newline at end of file diff --git a/AutomatedTesting/Gem/PythonTests/prefab/TestSuite_Main.py b/AutomatedTesting/Gem/PythonTests/prefab/TestSuite_Main.py index 4e3d6ba77f..09df962b0b 100644 --- a/AutomatedTesting/Gem/PythonTests/prefab/TestSuite_Main.py +++ b/AutomatedTesting/Gem/PythonTests/prefab/TestSuite_Main.py @@ -13,10 +13,8 @@ import os import sys from ly_test_tools import LAUNCHERS +sys.path.append(os.path.dirname(os.path.abspath(__file__)) + '/../automatedtesting_shared') -sys.path.append (os.path.dirname (os.path.abspath (__file__)) + '/../automatedtesting_shared') - -import ly_test_tools.environment.file_system as file_system from base import TestAutomationBase @pytest.mark.SUITE_main @@ -24,14 +22,28 @@ from base import TestAutomationBase @pytest.mark.parametrize("project", ["AutomatedTesting"]) class TestAutomation(TestAutomationBase): - def _run_prefab_test(self, request, workspace, editor, test_module): - self._run_test(request, workspace, editor, test_module, ["--regset=/Amazon/Preferences/EnablePrefabSystem=true"]) + def _run_prefab_test(self, request, workspace, editor, test_module, batch_mode=True, autotest_mode=True): + self._run_test(request, workspace, editor, test_module, + extra_cmdline_args=["--regset=/Amazon/Preferences/EnablePrefabSystem=true"], + batch_mode=batch_mode, + autotest_mode=autotest_mode) def test_PrefabLevel_OpensLevelWithEntities(self, request, workspace, editor, launcher_platform): from . import PrefabLevel_OpensLevelWithEntities as test_module self._run_prefab_test(request, workspace, editor, test_module) - def test_PrefabLevel_BasicWorkflow(self, request, workspace, editor, launcher_platform): - from . import PrefabLevel_BasicWorkflow as test_module + def test_Prefab_BasicWorkflow_CreatePrefab(self, request, workspace, editor, launcher_platform): + from . import Prefab_BasicWorkflow_CreatePrefab as test_module + self._run_prefab_test(request, workspace, editor, test_module) + + def test_Prefab_BasicWorkflow_InstantiatePrefab(self, request, workspace, editor, launcher_platform): + from . import Prefab_BasicWorkflow_InstantiatePrefab as test_module self._run_prefab_test(request, workspace, editor, test_module) + def test_Prefab_BasicWorkflow_CreateAndDeletePrefab(self, request, workspace, editor, launcher_platform): + from . import Prefab_BasicWorkflow_CreateAndDeletePrefab as test_module + self._run_prefab_test(request, workspace, editor, test_module) + + def test_Prefab_BasicWorkflow_CreateAndReparentPrefab(self, request, workspace, editor, launcher_platform): + from . import Prefab_BasicWorkflow_CreateAndReparentPrefab as test_module + self._run_prefab_test(request, workspace, editor, test_module, autotest_mode=False) diff --git a/AutomatedTesting/Levels/Base/Base.ly b/AutomatedTesting/Levels/Base/Base.ly new file mode 100644 index 0000000000..8ce19923c0 --- /dev/null +++ b/AutomatedTesting/Levels/Base/Base.ly @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e4937547ca4c486ef59656314401933217e0e0401fec103e1fb91c25ec60a177 +size 2806 diff --git a/AutomatedTesting/Levels/Base/filelist.xml b/AutomatedTesting/Levels/Base/filelist.xml new file mode 100644 index 0000000000..77579ae1a8 --- /dev/null +++ b/AutomatedTesting/Levels/Base/filelist.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/AutomatedTesting/Levels/Base/level.pak b/AutomatedTesting/Levels/Base/level.pak new file mode 100644 index 0000000000..bf7c8b2472 --- /dev/null +++ b/AutomatedTesting/Levels/Base/level.pak @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:68c34c55693d92085e81388cac48729aa569948254843d1d74f0d6a66d3b4dff +size 39328 diff --git a/AutomatedTesting/Levels/NvCloth/C18977329_NvCloth_AddClothSimulationToMesh/tags.txt b/AutomatedTesting/Levels/Base/tags.txt similarity index 100% rename from AutomatedTesting/Levels/NvCloth/C18977329_NvCloth_AddClothSimulationToMesh/tags.txt rename to AutomatedTesting/Levels/Base/tags.txt diff --git a/AutomatedTesting/Levels/Physics/C12712452_ScriptCanvas_CollisionEvents/terraintexture.pak b/AutomatedTesting/Levels/Base/terraintexture.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C12712452_ScriptCanvas_CollisionEvents/terraintexture.pak rename to AutomatedTesting/Levels/Base/terraintexture.pak diff --git a/AutomatedTesting/Levels/NvCloth/C18977329_NvCloth_AddClothSimulationToMesh/LevelData/Environment.xml b/AutomatedTesting/Levels/NvCloth/NvCloth_AddClothSimulationToActor/LevelData/Environment.xml similarity index 100% rename from AutomatedTesting/Levels/NvCloth/C18977329_NvCloth_AddClothSimulationToMesh/LevelData/Environment.xml rename to AutomatedTesting/Levels/NvCloth/NvCloth_AddClothSimulationToActor/LevelData/Environment.xml diff --git a/AutomatedTesting/Levels/NvCloth/C18977329_NvCloth_AddClothSimulationToMesh/LevelData/TerrainTexture.xml b/AutomatedTesting/Levels/NvCloth/NvCloth_AddClothSimulationToActor/LevelData/TerrainTexture.xml similarity index 100% rename from AutomatedTesting/Levels/NvCloth/C18977329_NvCloth_AddClothSimulationToMesh/LevelData/TerrainTexture.xml rename to AutomatedTesting/Levels/NvCloth/NvCloth_AddClothSimulationToActor/LevelData/TerrainTexture.xml diff --git a/AutomatedTesting/Levels/NvCloth/C18977329_NvCloth_AddClothSimulationToMesh/LevelData/TimeOfDay.xml b/AutomatedTesting/Levels/NvCloth/NvCloth_AddClothSimulationToActor/LevelData/TimeOfDay.xml similarity index 100% rename from AutomatedTesting/Levels/NvCloth/C18977329_NvCloth_AddClothSimulationToMesh/LevelData/TimeOfDay.xml rename to AutomatedTesting/Levels/NvCloth/NvCloth_AddClothSimulationToActor/LevelData/TimeOfDay.xml diff --git a/AutomatedTesting/Levels/NvCloth/C18977329_NvCloth_AddClothSimulationToMesh/LevelData/VegetationMap.dat b/AutomatedTesting/Levels/NvCloth/NvCloth_AddClothSimulationToActor/LevelData/VegetationMap.dat similarity index 100% rename from AutomatedTesting/Levels/NvCloth/C18977329_NvCloth_AddClothSimulationToMesh/LevelData/VegetationMap.dat rename to AutomatedTesting/Levels/NvCloth/NvCloth_AddClothSimulationToActor/LevelData/VegetationMap.dat diff --git a/AutomatedTesting/Levels/NvCloth/C18977330_NvCloth_AddClothSimulationToActor/C18977330_NvCloth_AddClothSimulationToActor.ly b/AutomatedTesting/Levels/NvCloth/NvCloth_AddClothSimulationToActor/NvCloth_AddClothSimulationToActor.ly similarity index 100% rename from AutomatedTesting/Levels/NvCloth/C18977330_NvCloth_AddClothSimulationToActor/C18977330_NvCloth_AddClothSimulationToActor.ly rename to AutomatedTesting/Levels/NvCloth/NvCloth_AddClothSimulationToActor/NvCloth_AddClothSimulationToActor.ly diff --git a/AutomatedTesting/Levels/NvCloth/C18977329_NvCloth_AddClothSimulationToMesh/TerrainTexture.pak b/AutomatedTesting/Levels/NvCloth/NvCloth_AddClothSimulationToActor/TerrainTexture.pak similarity index 100% rename from AutomatedTesting/Levels/NvCloth/C18977329_NvCloth_AddClothSimulationToMesh/TerrainTexture.pak rename to AutomatedTesting/Levels/NvCloth/NvCloth_AddClothSimulationToActor/TerrainTexture.pak diff --git a/AutomatedTesting/Levels/NvCloth/C18977330_NvCloth_AddClothSimulationToActor/filelist.xml b/AutomatedTesting/Levels/NvCloth/NvCloth_AddClothSimulationToActor/filelist.xml similarity index 100% rename from AutomatedTesting/Levels/NvCloth/C18977330_NvCloth_AddClothSimulationToActor/filelist.xml rename to AutomatedTesting/Levels/NvCloth/NvCloth_AddClothSimulationToActor/filelist.xml diff --git a/AutomatedTesting/Levels/NvCloth/C18977330_NvCloth_AddClothSimulationToActor/level.pak b/AutomatedTesting/Levels/NvCloth/NvCloth_AddClothSimulationToActor/level.pak similarity index 100% rename from AutomatedTesting/Levels/NvCloth/C18977330_NvCloth_AddClothSimulationToActor/level.pak rename to AutomatedTesting/Levels/NvCloth/NvCloth_AddClothSimulationToActor/level.pak diff --git a/AutomatedTesting/Levels/NvCloth/C18977330_NvCloth_AddClothSimulationToActor/tags.txt b/AutomatedTesting/Levels/NvCloth/NvCloth_AddClothSimulationToActor/tags.txt similarity index 100% rename from AutomatedTesting/Levels/NvCloth/C18977330_NvCloth_AddClothSimulationToActor/tags.txt rename to AutomatedTesting/Levels/NvCloth/NvCloth_AddClothSimulationToActor/tags.txt diff --git a/AutomatedTesting/Levels/NvCloth/C18977330_NvCloth_AddClothSimulationToActor/LevelData/Environment.xml b/AutomatedTesting/Levels/NvCloth/NvCloth_AddClothSimulationToMesh/LevelData/Environment.xml similarity index 100% rename from AutomatedTesting/Levels/NvCloth/C18977330_NvCloth_AddClothSimulationToActor/LevelData/Environment.xml rename to AutomatedTesting/Levels/NvCloth/NvCloth_AddClothSimulationToMesh/LevelData/Environment.xml diff --git a/AutomatedTesting/Levels/NvCloth/C18977330_NvCloth_AddClothSimulationToActor/LevelData/TerrainTexture.xml b/AutomatedTesting/Levels/NvCloth/NvCloth_AddClothSimulationToMesh/LevelData/TerrainTexture.xml similarity index 100% rename from AutomatedTesting/Levels/NvCloth/C18977330_NvCloth_AddClothSimulationToActor/LevelData/TerrainTexture.xml rename to AutomatedTesting/Levels/NvCloth/NvCloth_AddClothSimulationToMesh/LevelData/TerrainTexture.xml diff --git a/AutomatedTesting/Levels/NvCloth/C18977330_NvCloth_AddClothSimulationToActor/LevelData/TimeOfDay.xml b/AutomatedTesting/Levels/NvCloth/NvCloth_AddClothSimulationToMesh/LevelData/TimeOfDay.xml similarity index 100% rename from AutomatedTesting/Levels/NvCloth/C18977330_NvCloth_AddClothSimulationToActor/LevelData/TimeOfDay.xml rename to AutomatedTesting/Levels/NvCloth/NvCloth_AddClothSimulationToMesh/LevelData/TimeOfDay.xml diff --git a/AutomatedTesting/Levels/NvCloth/C18977330_NvCloth_AddClothSimulationToActor/LevelData/VegetationMap.dat b/AutomatedTesting/Levels/NvCloth/NvCloth_AddClothSimulationToMesh/LevelData/VegetationMap.dat similarity index 100% rename from AutomatedTesting/Levels/NvCloth/C18977330_NvCloth_AddClothSimulationToActor/LevelData/VegetationMap.dat rename to AutomatedTesting/Levels/NvCloth/NvCloth_AddClothSimulationToMesh/LevelData/VegetationMap.dat diff --git a/AutomatedTesting/Levels/NvCloth/C18977329_NvCloth_AddClothSimulationToMesh/C18977329_NvCloth_AddClothSimulationToMesh.ly b/AutomatedTesting/Levels/NvCloth/NvCloth_AddClothSimulationToMesh/NvCloth_AddClothSimulationToMesh.ly similarity index 100% rename from AutomatedTesting/Levels/NvCloth/C18977329_NvCloth_AddClothSimulationToMesh/C18977329_NvCloth_AddClothSimulationToMesh.ly rename to AutomatedTesting/Levels/NvCloth/NvCloth_AddClothSimulationToMesh/NvCloth_AddClothSimulationToMesh.ly diff --git a/AutomatedTesting/Levels/NvCloth/C18977330_NvCloth_AddClothSimulationToActor/TerrainTexture.pak b/AutomatedTesting/Levels/NvCloth/NvCloth_AddClothSimulationToMesh/TerrainTexture.pak similarity index 100% rename from AutomatedTesting/Levels/NvCloth/C18977330_NvCloth_AddClothSimulationToActor/TerrainTexture.pak rename to AutomatedTesting/Levels/NvCloth/NvCloth_AddClothSimulationToMesh/TerrainTexture.pak diff --git a/AutomatedTesting/Levels/NvCloth/C18977329_NvCloth_AddClothSimulationToMesh/filelist.xml b/AutomatedTesting/Levels/NvCloth/NvCloth_AddClothSimulationToMesh/filelist.xml similarity index 100% rename from AutomatedTesting/Levels/NvCloth/C18977329_NvCloth_AddClothSimulationToMesh/filelist.xml rename to AutomatedTesting/Levels/NvCloth/NvCloth_AddClothSimulationToMesh/filelist.xml diff --git a/AutomatedTesting/Levels/NvCloth/C18977329_NvCloth_AddClothSimulationToMesh/level.pak b/AutomatedTesting/Levels/NvCloth/NvCloth_AddClothSimulationToMesh/level.pak similarity index 100% rename from AutomatedTesting/Levels/NvCloth/C18977329_NvCloth_AddClothSimulationToMesh/level.pak rename to AutomatedTesting/Levels/NvCloth/NvCloth_AddClothSimulationToMesh/level.pak diff --git a/AutomatedTesting/Levels/Physics/C12712452_ScriptCanvas_CollisionEvents/tags.txt b/AutomatedTesting/Levels/NvCloth/NvCloth_AddClothSimulationToMesh/tags.txt similarity index 100% rename from AutomatedTesting/Levels/Physics/C12712452_ScriptCanvas_CollisionEvents/tags.txt rename to AutomatedTesting/Levels/NvCloth/NvCloth_AddClothSimulationToMesh/tags.txt diff --git a/AutomatedTesting/Levels/Physics/C12712452_ScriptCanvas_CollisionEvents/C12712452_ScriptCanvas_CollisionEvents.ly b/AutomatedTesting/Levels/Physics/C12712452_ScriptCanvas_CollisionEvents/C12712452_ScriptCanvas_CollisionEvents.ly deleted file mode 100644 index fc576ec459..0000000000 --- a/AutomatedTesting/Levels/Physics/C12712452_ScriptCanvas_CollisionEvents/C12712452_ScriptCanvas_CollisionEvents.ly +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e04b536d187793187b64a55914d92c1a1c18393a0369715269a295c7b7a7d370 -size 8883 diff --git a/AutomatedTesting/Levels/Physics/C12712452_ScriptCanvas_CollisionEvents/collision_events_script.scriptcanvas b/AutomatedTesting/Levels/Physics/C12712452_ScriptCanvas_CollisionEvents/collision_events_script.scriptcanvas deleted file mode 100644 index 34e80f3ccd..0000000000 --- a/AutomatedTesting/Levels/Physics/C12712452_ScriptCanvas_CollisionEvents/collision_events_script.scriptcanvas +++ /dev/null @@ -1,7714 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/AutomatedTesting/Levels/Physics/C12712455_ScriptCanvas_ShapeCastVerification/C12712455_ScriptCanvas_ShapeCastVerification.ly b/AutomatedTesting/Levels/Physics/C12712455_ScriptCanvas_ShapeCastVerification/C12712455_ScriptCanvas_ShapeCastVerification.ly deleted file mode 100644 index 5088b67628..0000000000 --- a/AutomatedTesting/Levels/Physics/C12712455_ScriptCanvas_ShapeCastVerification/C12712455_ScriptCanvas_ShapeCastVerification.ly +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6df3d83f5b9dd43118aba5cef3a8fe9ee42ee253f7bd3886fc7c88f41c504fff -size 8802 diff --git a/AutomatedTesting/Levels/Physics/C14195074_ScriptCanvas_PostUpdateEvent/C14195074_ScriptCanvas_PostUpdateEvent.ly b/AutomatedTesting/Levels/Physics/C14195074_ScriptCanvas_PostUpdateEvent/C14195074_ScriptCanvas_PostUpdateEvent.ly deleted file mode 100644 index 6cd2635f29..0000000000 --- a/AutomatedTesting/Levels/Physics/C14195074_ScriptCanvas_PostUpdateEvent/C14195074_ScriptCanvas_PostUpdateEvent.ly +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2ecfac85ec0f2cc12d154474be63771ef6704915a8aeb740f5639dbf04fde6df -size 6722 diff --git a/AutomatedTesting/Levels/Physics/C14654881_CharacterController_SwitchLevelsEmpty/C14654881_CharacterController_SwitchLevelsEmpty.ly b/AutomatedTesting/Levels/Physics/C14654881_CharacterController_SwitchLevelsEmpty/C14654881_CharacterController_SwitchLevelsEmpty.ly deleted file mode 100644 index 0b3fc3ccd1..0000000000 --- a/AutomatedTesting/Levels/Physics/C14654881_CharacterController_SwitchLevelsEmpty/C14654881_CharacterController_SwitchLevelsEmpty.ly +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9d4de9e57b01476be84077f126a13fa0bfce18283453d1c69a857c10926c13ae -size 4728 diff --git a/AutomatedTesting/Levels/Physics/C14654881_CharacterController_SwitchLevelsEmpty/filelist.xml b/AutomatedTesting/Levels/Physics/C14654881_CharacterController_SwitchLevelsEmpty/filelist.xml deleted file mode 100644 index 1ba3f96e8d..0000000000 --- a/AutomatedTesting/Levels/Physics/C14654881_CharacterController_SwitchLevelsEmpty/filelist.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/AutomatedTesting/Levels/Physics/C14654881_CharacterController_SwitchLevelsEmpty/level.pak b/AutomatedTesting/Levels/Physics/C14654881_CharacterController_SwitchLevelsEmpty/level.pak deleted file mode 100644 index eec9bb3395..0000000000 --- a/AutomatedTesting/Levels/Physics/C14654881_CharacterController_SwitchLevelsEmpty/level.pak +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f04bc665df6d8d2a29635a7e7054977a4f53e931c7c8bc678c4c378b49bb5ca1 -size 39214 diff --git a/AutomatedTesting/Levels/Physics/C14902098_ScriptCanvas_PostPhysicsUpdate/C14902098_ScriptCanvas_PostPhysicsUpdate.ly b/AutomatedTesting/Levels/Physics/C14902098_ScriptCanvas_PostPhysicsUpdate/C14902098_ScriptCanvas_PostPhysicsUpdate.ly deleted file mode 100644 index 549f7a9cfc..0000000000 --- a/AutomatedTesting/Levels/Physics/C14902098_ScriptCanvas_PostPhysicsUpdate/C14902098_ScriptCanvas_PostPhysicsUpdate.ly +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:dd9a957fd13de9b9029d6ccb81bb2519dfa6381107f9f3015c4999b8c0bd3c36 -size 7801 diff --git a/AutomatedTesting/Levels/Physics/C14902098_ScriptCanvas_PostPhysicsUpdate/onpostphysicsupdate.scriptcanvas b/AutomatedTesting/Levels/Physics/C14902098_ScriptCanvas_PostPhysicsUpdate/onpostphysicsupdate.scriptcanvas deleted file mode 100644 index 10c40fbb9f..0000000000 --- a/AutomatedTesting/Levels/Physics/C14902098_ScriptCanvas_PostPhysicsUpdate/onpostphysicsupdate.scriptcanvas +++ /dev/null @@ -1,3518 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/AutomatedTesting/Levels/Physics/C15096732_Material_DefaultLibraryUpdatedAcrossLevels/0/c15096732_material_defaultlibraryupdatedacrosslevels.physmaterial b/AutomatedTesting/Levels/Physics/C15096732_Material_DefaultLibraryUpdatedAcrossLevels/0/c15096732_material_defaultlibraryupdatedacrosslevels.physmaterial deleted file mode 100644 index 95b6587d2a..0000000000 --- a/AutomatedTesting/Levels/Physics/C15096732_Material_DefaultLibraryUpdatedAcrossLevels/0/c15096732_material_defaultlibraryupdatedacrosslevels.physmaterial +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/AutomatedTesting/Levels/Physics/C15096732_Material_DefaultLibraryUpdatedAcrossLevels/1/c15096732_material_defaultlibraryupdatedacrosslevels.physmaterial b/AutomatedTesting/Levels/Physics/C15096732_Material_DefaultLibraryUpdatedAcrossLevels/1/c15096732_material_defaultlibraryupdatedacrosslevels.physmaterial deleted file mode 100644 index 95b6587d2a..0000000000 --- a/AutomatedTesting/Levels/Physics/C15096732_Material_DefaultLibraryUpdatedAcrossLevels/1/c15096732_material_defaultlibraryupdatedacrosslevels.physmaterial +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/AutomatedTesting/Levels/Physics/C15096732_Material_DefaultLibraryUpdatedAcrossLevels/Material_DefaultLibraryUpdatedAcrossLevels_after.physxconfiguration b/AutomatedTesting/Levels/Physics/C15096732_Material_DefaultLibraryUpdatedAcrossLevels/Material_DefaultLibraryUpdatedAcrossLevels_after.physxconfiguration deleted file mode 100644 index 9ae2276c44..0000000000 --- a/AutomatedTesting/Levels/Physics/C15096732_Material_DefaultLibraryUpdatedAcrossLevels/Material_DefaultLibraryUpdatedAcrossLevels_after.physxconfiguration +++ /dev/null @@ -1,143 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/AutomatedTesting/Levels/Physics/C15096732_Material_DefaultLibraryUpdatedAcrossLevels/Material_DefaultLibraryUpdatedAcrossLevels_before.physxconfiguration b/AutomatedTesting/Levels/Physics/C15096732_Material_DefaultLibraryUpdatedAcrossLevels/Material_DefaultLibraryUpdatedAcrossLevels_before.physxconfiguration deleted file mode 100644 index f8cfe32b2d..0000000000 --- a/AutomatedTesting/Levels/Physics/C15096732_Material_DefaultLibraryUpdatedAcrossLevels/Material_DefaultLibraryUpdatedAcrossLevels_before.physxconfiguration +++ /dev/null @@ -1,143 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/AutomatedTesting/Levels/Physics/C15308217_NoCrash_LevelSwitchWithOutTerrain/C15308217_NoCrash_LevelSwitchWithOutTerrain.ly b/AutomatedTesting/Levels/Physics/C15308217_NoCrash_LevelSwitchWithOutTerrain/C15308217_NoCrash_LevelSwitchWithOutTerrain.ly deleted file mode 100644 index 0edc9a8b33..0000000000 --- a/AutomatedTesting/Levels/Physics/C15308217_NoCrash_LevelSwitchWithOutTerrain/C15308217_NoCrash_LevelSwitchWithOutTerrain.ly +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ee0b19bcef5abd9af9d8ef1acba2fa33bb1a69e402f9a6e5e5732fb8cf3cb4f5 -size 2563 diff --git a/AutomatedTesting/Levels/Physics/C15308217_NoCrash_LevelSwitchWithOutTerrain/filelist.xml b/AutomatedTesting/Levels/Physics/C15308217_NoCrash_LevelSwitchWithOutTerrain/filelist.xml deleted file mode 100644 index b4697568be..0000000000 --- a/AutomatedTesting/Levels/Physics/C15308217_NoCrash_LevelSwitchWithOutTerrain/filelist.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/AutomatedTesting/Levels/Physics/C15308217_NoCrash_LevelSwitchWithOutTerrain/level.pak b/AutomatedTesting/Levels/Physics/C15308217_NoCrash_LevelSwitchWithOutTerrain/level.pak deleted file mode 100644 index 2baa6ab97d..0000000000 --- a/AutomatedTesting/Levels/Physics/C15308217_NoCrash_LevelSwitchWithOutTerrain/level.pak +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f54e18cd15777994163323a57b3328cb8b8ebb50a2b50476c23d93b66315de54 -size 39205 diff --git a/AutomatedTesting/Levels/Physics/C15308217_NoCrash_LevelSwitchWithTerrain/C15308217_NoCrash_LevelSwitchWithTerrain.ly b/AutomatedTesting/Levels/Physics/C15308217_NoCrash_LevelSwitchWithTerrain/C15308217_NoCrash_LevelSwitchWithTerrain.ly deleted file mode 100644 index d6c9296864..0000000000 --- a/AutomatedTesting/Levels/Physics/C15308217_NoCrash_LevelSwitchWithTerrain/C15308217_NoCrash_LevelSwitchWithTerrain.ly +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:792969360ad9f659677a0a1823b4422873d5b108468e2e005ba1c90c2b1b09f6 -size 4154 diff --git a/AutomatedTesting/Levels/Physics/C15308217_NoCrash_LevelSwitchWithTerrain/filelist.xml b/AutomatedTesting/Levels/Physics/C15308217_NoCrash_LevelSwitchWithTerrain/filelist.xml deleted file mode 100644 index 94288572dd..0000000000 --- a/AutomatedTesting/Levels/Physics/C15308217_NoCrash_LevelSwitchWithTerrain/filelist.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/AutomatedTesting/Levels/Physics/C15308217_NoCrash_LevelSwitchWithTerrain/level.pak b/AutomatedTesting/Levels/Physics/C15308217_NoCrash_LevelSwitchWithTerrain/level.pak deleted file mode 100644 index df1811f3b3..0000000000 --- a/AutomatedTesting/Levels/Physics/C15308217_NoCrash_LevelSwitchWithTerrain/level.pak +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1304d7445c9155856a172df7d1eb73010929d3d5ebe9c2aed62d01fd64d8e37a -size 39202 diff --git a/AutomatedTesting/Levels/Physics/C18243584_Joints_HingeSoftLimitsConstrained/filelist.xml b/AutomatedTesting/Levels/Physics/C18243584_Joints_HingeSoftLimitsConstrained/filelist.xml deleted file mode 100644 index fa5a7aa319..0000000000 --- a/AutomatedTesting/Levels/Physics/C18243584_Joints_HingeSoftLimitsConstrained/filelist.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/AutomatedTesting/Levels/Physics/C18243585_Joints_HingeNoLimitsConstrained/filelist.xml b/AutomatedTesting/Levels/Physics/C18243585_Joints_HingeNoLimitsConstrained/filelist.xml deleted file mode 100644 index fa5a7aa319..0000000000 --- a/AutomatedTesting/Levels/Physics/C18243585_Joints_HingeNoLimitsConstrained/filelist.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/AutomatedTesting/Levels/Physics/C18243586_Joints_HingeLeadFollowerCollide/filelist.xml b/AutomatedTesting/Levels/Physics/C18243586_Joints_HingeLeadFollowerCollide/filelist.xml deleted file mode 100644 index fa5a7aa319..0000000000 --- a/AutomatedTesting/Levels/Physics/C18243586_Joints_HingeLeadFollowerCollide/filelist.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/AutomatedTesting/Levels/Physics/C18243587_Joints_HingeBreakable/filelist.xml b/AutomatedTesting/Levels/Physics/C18243587_Joints_HingeBreakable/filelist.xml deleted file mode 100644 index fa5a7aa319..0000000000 --- a/AutomatedTesting/Levels/Physics/C18243587_Joints_HingeBreakable/filelist.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/AutomatedTesting/Levels/Physics/C18243588_Joints_Ball2BodiesConstrained/filelist.xml b/AutomatedTesting/Levels/Physics/C18243588_Joints_Ball2BodiesConstrained/filelist.xml deleted file mode 100644 index fa5a7aa319..0000000000 --- a/AutomatedTesting/Levels/Physics/C18243588_Joints_Ball2BodiesConstrained/filelist.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/AutomatedTesting/Levels/Physics/C18243589_Joints_BallSoftLimitsConstrained/filelist.xml b/AutomatedTesting/Levels/Physics/C18243589_Joints_BallSoftLimitsConstrained/filelist.xml deleted file mode 100644 index fa5a7aa319..0000000000 --- a/AutomatedTesting/Levels/Physics/C18243589_Joints_BallSoftLimitsConstrained/filelist.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/AutomatedTesting/Levels/Physics/C18243590_Joints_BallNoLimitsConstrained/filelist.xml b/AutomatedTesting/Levels/Physics/C18243590_Joints_BallNoLimitsConstrained/filelist.xml deleted file mode 100644 index fa5a7aa319..0000000000 --- a/AutomatedTesting/Levels/Physics/C18243590_Joints_BallNoLimitsConstrained/filelist.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/AutomatedTesting/Levels/Physics/C18243591_Joints_BallLeadFollowerCollide/filelist.xml b/AutomatedTesting/Levels/Physics/C18243591_Joints_BallLeadFollowerCollide/filelist.xml deleted file mode 100644 index fa5a7aa319..0000000000 --- a/AutomatedTesting/Levels/Physics/C18243591_Joints_BallLeadFollowerCollide/filelist.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/AutomatedTesting/Levels/Physics/C18243592_Joints_BallBreakable/filelist.xml b/AutomatedTesting/Levels/Physics/C18243592_Joints_BallBreakable/filelist.xml deleted file mode 100644 index fa5a7aa319..0000000000 --- a/AutomatedTesting/Levels/Physics/C18243592_Joints_BallBreakable/filelist.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/AutomatedTesting/Levels/Physics/C4976209_RigidBody_ComputesCOM/C4976209_RigidBody_ComputesCOM.ly b/AutomatedTesting/Levels/Physics/C4976209_RigidBody_ComputesCOM/C4976209_RigidBody_ComputesCOM.ly deleted file mode 100644 index 139a9f140c..0000000000 --- a/AutomatedTesting/Levels/Physics/C4976209_RigidBody_ComputesCOM/C4976209_RigidBody_ComputesCOM.ly +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8b26b3e991559a946341e4eedb2266605631c8d72e69e745a352f02df998149f -size 9186 diff --git a/AutomatedTesting/Levels/Physics/C5689517_Verify_Terrain_Component/C5689517_Verify_Terrain_Component.ly b/AutomatedTesting/Levels/Physics/C5689517_Verify_Terrain_Component/C5689517_Verify_Terrain_Component.ly deleted file mode 100644 index 9135161123..0000000000 --- a/AutomatedTesting/Levels/Physics/C5689517_Verify_Terrain_Component/C5689517_Verify_Terrain_Component.ly +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a8f6e912b2bbc729aded88e1a68b41abef31031452cb7d016f8ca3a44503e1fb -size 6577 diff --git a/AutomatedTesting/Levels/Physics/C5689517_Verify_Terrain_Component/filelist.xml b/AutomatedTesting/Levels/Physics/C5689517_Verify_Terrain_Component/filelist.xml deleted file mode 100644 index 760b180f23..0000000000 --- a/AutomatedTesting/Levels/Physics/C5689517_Verify_Terrain_Component/filelist.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/AutomatedTesting/Levels/Physics/C5689517_Verify_Terrain_Component/level.pak b/AutomatedTesting/Levels/Physics/C5689517_Verify_Terrain_Component/level.pak deleted file mode 100644 index f682a8b0c8..0000000000 --- a/AutomatedTesting/Levels/Physics/C5689517_Verify_Terrain_Component/level.pak +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:30e921bc7223f69cf0d8f06eb693753e3ddf32d9b24987571e441a906c482d84 -size 39329 diff --git a/AutomatedTesting/Levels/Physics/C5689521_Terrain_NoCollisionAfterTerrainDeletion/C5689521_Terrain_NoCollisionAfterTerrainDeletion.ly b/AutomatedTesting/Levels/Physics/C5689521_Terrain_NoCollisionAfterTerrainDeletion/C5689521_Terrain_NoCollisionAfterTerrainDeletion.ly deleted file mode 100644 index 9f2a939ce5..0000000000 --- a/AutomatedTesting/Levels/Physics/C5689521_Terrain_NoCollisionAfterTerrainDeletion/C5689521_Terrain_NoCollisionAfterTerrainDeletion.ly +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9e0cbe3d70fe2071c2c63d37e62669d840ecc746ac82380bef7d5ef19d8390ce -size 8046 diff --git a/AutomatedTesting/Levels/Physics/C5689521_Terrain_NoCollisionAfterTerrainDeletion/filelist.xml b/AutomatedTesting/Levels/Physics/C5689521_Terrain_NoCollisionAfterTerrainDeletion/filelist.xml deleted file mode 100644 index cdfa1c985f..0000000000 --- a/AutomatedTesting/Levels/Physics/C5689521_Terrain_NoCollisionAfterTerrainDeletion/filelist.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/AutomatedTesting/Levels/Physics/C5689521_Terrain_NoCollisionAfterTerrainDeletion/level.pak b/AutomatedTesting/Levels/Physics/C5689521_Terrain_NoCollisionAfterTerrainDeletion/level.pak deleted file mode 100644 index 4a9becf656..0000000000 --- a/AutomatedTesting/Levels/Physics/C5689521_Terrain_NoCollisionAfterTerrainDeletion/level.pak +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:14632009332c08eb5b047d00bf217a6638d2b823a0c2bd649e09408e8efac259 -size 39339 diff --git a/AutomatedTesting/Levels/Physics/C5959761_ForceRegion_ExertsPointForce_Sedan/C5959761_ForceRegion_ExertsPointForce_Sedan.ly b/AutomatedTesting/Levels/Physics/C5959761_ForceRegion_ExertsPointForce_Sedan/C5959761_ForceRegion_ExertsPointForce_Sedan.ly deleted file mode 100644 index 4746c3cdcf..0000000000 --- a/AutomatedTesting/Levels/Physics/C5959761_ForceRegion_ExertsPointForce_Sedan/C5959761_ForceRegion_ExertsPointForce_Sedan.ly +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e9099733f59504200cf87fd81011ee8be8bcfd87cc8dbe243e998fb27410b76b -size 6837 diff --git a/AutomatedTesting/Levels/Physics/C5959765_ForceRegion_AssetGetsImpulsed/C5959765_ForceRegion_AssetGetsImpulsed.ly b/AutomatedTesting/Levels/Physics/C5959765_ForceRegion_AssetGetsImpulsed/C5959765_ForceRegion_AssetGetsImpulsed.ly deleted file mode 100644 index 092eba62fd..0000000000 --- a/AutomatedTesting/Levels/Physics/C5959765_ForceRegion_AssetGetsImpulsed/C5959765_ForceRegion_AssetGetsImpulsed.ly +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a637035bdc27e72e2bc23877bfd1b25cbf465a71b8550001151a6b50ebc938c5 -size 8301 diff --git a/AutomatedTesting/Levels/Physics/C6032082_Terrain_MultipleResolutionsValid_1024x1024_32m/terrain/terrain.pxheightfield b/AutomatedTesting/Levels/Physics/C6032082_Terrain_MultipleResolutionsValid_1024x1024_32m/terrain/terrain.pxheightfield deleted file mode 100644 index 011356e521..0000000000 --- a/AutomatedTesting/Levels/Physics/C6032082_Terrain_MultipleResolutionsValid_1024x1024_32m/terrain/terrain.pxheightfield +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:19096597087688692a225c1955f73d22c46354995fca1df8dff107a90c2f17a2 -size 4202594 diff --git a/AutomatedTesting/Levels/Physics/C6090546_ForceRegion_SliceFileInstantiates/C6090546_ForceRegion_SliceFileInstantiates.ly b/AutomatedTesting/Levels/Physics/C6090546_ForceRegion_SliceFileInstantiates/C6090546_ForceRegion_SliceFileInstantiates.ly deleted file mode 100644 index 11018eb2b6..0000000000 --- a/AutomatedTesting/Levels/Physics/C6090546_ForceRegion_SliceFileInstantiates/C6090546_ForceRegion_SliceFileInstantiates.ly +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0d6312f502e196f7ceb1ff05b367899c5486b2737b1a5ccfe3f3d52158e285a7 -size 7422 diff --git a/AutomatedTesting/Levels/Physics/C6090547_ForceRegion_ParentChildForceRegions/leveldata/TimeOfDay.xml b/AutomatedTesting/Levels/Physics/C6090547_ForceRegion_ParentChildForceRegions/leveldata/TimeOfDay.xml deleted file mode 100644 index 456d609b8a..0000000000 --- a/AutomatedTesting/Levels/Physics/C6090547_ForceRegion_ParentChildForceRegions/leveldata/TimeOfDay.xml +++ /dev/null @@ -1,356 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/AutomatedTesting/Levels/Physics/C6090550_ForceRegion_WorldSpaceForceNegative/C6090550_ForceRegion_WorldSpaceForceNegative.ly b/AutomatedTesting/Levels/Physics/C6090550_ForceRegion_WorldSpaceForceNegative/C6090550_ForceRegion_WorldSpaceForceNegative.ly deleted file mode 100644 index 9eaca61d70..0000000000 --- a/AutomatedTesting/Levels/Physics/C6090550_ForceRegion_WorldSpaceForceNegative/C6090550_ForceRegion_WorldSpaceForceNegative.ly +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:aa225a10dfeea4fa4bb26e3d6eb4a91eed238b1a30acbef8185de8c49dd844a6 -size 9106 diff --git a/AutomatedTesting/Levels/Physics/C6090551_ForceRegion_LocalSpaceForceNegative/C6090551_ForceRegion_LocalSpaceForceNegative.ly b/AutomatedTesting/Levels/Physics/C6090551_ForceRegion_LocalSpaceForceNegative/C6090551_ForceRegion_LocalSpaceForceNegative.ly deleted file mode 100644 index f090a65567..0000000000 --- a/AutomatedTesting/Levels/Physics/C6090551_ForceRegion_LocalSpaceForceNegative/C6090551_ForceRegion_LocalSpaceForceNegative.ly +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:fba6401bc99e46f91da893a663347f1f7f7da5dd5af2daabfac8b82316c87dd9 -size 9069 diff --git a/AutomatedTesting/Levels/Physics/C6090553_ForceRegion_SimpleDragForceOnRigidBodies/leveldata/TerrainTexture.xml b/AutomatedTesting/Levels/Physics/C6090553_ForceRegion_SimpleDragForceOnRigidBodies/leveldata/TerrainTexture.xml deleted file mode 100644 index f43df05b22..0000000000 --- a/AutomatedTesting/Levels/Physics/C6090553_ForceRegion_SimpleDragForceOnRigidBodies/leveldata/TerrainTexture.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/AutomatedTesting/Levels/Physics/C6090553_ForceRegion_SimpleDragForceOnRigidBodies/leveldata/TimeOfDay.xml b/AutomatedTesting/Levels/Physics/C6090553_ForceRegion_SimpleDragForceOnRigidBodies/leveldata/TimeOfDay.xml deleted file mode 100644 index 456d609b8a..0000000000 --- a/AutomatedTesting/Levels/Physics/C6090553_ForceRegion_SimpleDragForceOnRigidBodies/leveldata/TimeOfDay.xml +++ /dev/null @@ -1,356 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/AutomatedTesting/Levels/Physics/C6090554_ForceRegion_PointForceNegative/C6090554_ForceRegion_PointForceNegative.ly b/AutomatedTesting/Levels/Physics/C6090554_ForceRegion_PointForceNegative/C6090554_ForceRegion_PointForceNegative.ly deleted file mode 100644 index b5cccb335c..0000000000 --- a/AutomatedTesting/Levels/Physics/C6090554_ForceRegion_PointForceNegative/C6090554_ForceRegion_PointForceNegative.ly +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f01447f5be2a4f9c56cfbb2841e2bf51e37cf8e8a3c507e46b74f5a80bc45955 -size 9146 diff --git a/AutomatedTesting/Levels/Physics/C6090554_ForceRegion_PointForceNegative/leveldata/Environment.xml b/AutomatedTesting/Levels/Physics/C6090554_ForceRegion_PointForceNegative/leveldata/Environment.xml deleted file mode 100644 index 4ba36f66ae..0000000000 --- a/AutomatedTesting/Levels/Physics/C6090554_ForceRegion_PointForceNegative/leveldata/Environment.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - diff --git a/AutomatedTesting/Levels/Physics/C6131473_StaticSlice_OnDynamicSliceSpawn/C6131473_StaticSlice_OnDynamicSliceSpawn.ly b/AutomatedTesting/Levels/Physics/C6131473_StaticSlice_OnDynamicSliceSpawn/C6131473_StaticSlice_OnDynamicSliceSpawn.ly deleted file mode 100644 index d2402bdb7f..0000000000 --- a/AutomatedTesting/Levels/Physics/C6131473_StaticSlice_OnDynamicSliceSpawn/C6131473_StaticSlice_OnDynamicSliceSpawn.ly +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3f72e154357625639ab2eceebea4a5cc43cbbae6c609909c7f2c10c3892ff9ee -size 3843 diff --git a/AutomatedTesting/Levels/Physics/C6131473_StaticSlice_OnDynamicSliceSpawn/leveldata/Environment.xml b/AutomatedTesting/Levels/Physics/C6131473_StaticSlice_OnDynamicSliceSpawn/leveldata/Environment.xml deleted file mode 100644 index 4ba36f66ae..0000000000 --- a/AutomatedTesting/Levels/Physics/C6131473_StaticSlice_OnDynamicSliceSpawn/leveldata/Environment.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - diff --git a/AutomatedTesting/Levels/Physics/C6131473_StaticSlice_OnDynamicSliceSpawn/leveldata/GameTokens.xml b/AutomatedTesting/Levels/Physics/C6131473_StaticSlice_OnDynamicSliceSpawn/leveldata/GameTokens.xml deleted file mode 100644 index 668a4583bd..0000000000 --- a/AutomatedTesting/Levels/Physics/C6131473_StaticSlice_OnDynamicSliceSpawn/leveldata/GameTokens.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/AutomatedTesting/Levels/Physics/C6131473_StaticSlice_OnDynamicSliceSpawn/leveldata/TerrainTexture.xml b/AutomatedTesting/Levels/Physics/C6131473_StaticSlice_OnDynamicSliceSpawn/leveldata/TerrainTexture.xml deleted file mode 100644 index f43df05b22..0000000000 --- a/AutomatedTesting/Levels/Physics/C6131473_StaticSlice_OnDynamicSliceSpawn/leveldata/TerrainTexture.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/AutomatedTesting/Levels/Physics/C6131473_StaticSlice_OnDynamicSliceSpawn/leveldata/TimeOfDay.xml b/AutomatedTesting/Levels/Physics/C6131473_StaticSlice_OnDynamicSliceSpawn/leveldata/TimeOfDay.xml deleted file mode 100644 index 456d609b8a..0000000000 --- a/AutomatedTesting/Levels/Physics/C6131473_StaticSlice_OnDynamicSliceSpawn/leveldata/TimeOfDay.xml +++ /dev/null @@ -1,356 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/AutomatedTesting/Levels/Physics/C6131473_StaticSlice_OnDynamicSliceSpawn/tags.txt b/AutomatedTesting/Levels/Physics/C6131473_StaticSlice_OnDynamicSliceSpawn/tags.txt deleted file mode 100644 index 0d6c1880e7..0000000000 --- a/AutomatedTesting/Levels/Physics/C6131473_StaticSlice_OnDynamicSliceSpawn/tags.txt +++ /dev/null @@ -1,12 +0,0 @@ -0,0,0,0,0,0 -0,0,0,0,0,0 -0,0,0,0,0,0 -0,0,0,0,0,0 -0,0,0,0,0,0 -0,0,0,0,0,0 -0,0,0,0,0,0 -0,0,0,0,0,0 -0,0,0,0,0,0 -0,0,0,0,0,0 -0,0,0,0,0,0 -0,0,0,0,0,0 diff --git a/AutomatedTesting/Levels/Physics/C6224408_ScriptCanvas_EntitySpawn/leveldata/Environment.xml b/AutomatedTesting/Levels/Physics/C6224408_ScriptCanvas_EntitySpawn/leveldata/Environment.xml deleted file mode 100644 index 4ba36f66ae..0000000000 --- a/AutomatedTesting/Levels/Physics/C6224408_ScriptCanvas_EntitySpawn/leveldata/Environment.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - diff --git a/AutomatedTesting/Levels/Physics/C6224408_ScriptCanvas_EntitySpawn/leveldata/GameTokens.xml b/AutomatedTesting/Levels/Physics/C6224408_ScriptCanvas_EntitySpawn/leveldata/GameTokens.xml deleted file mode 100644 index 668a4583bd..0000000000 --- a/AutomatedTesting/Levels/Physics/C6224408_ScriptCanvas_EntitySpawn/leveldata/GameTokens.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/AutomatedTesting/Levels/Physics/C6224408_ScriptCanvas_EntitySpawn/leveldata/TerrainTexture.xml b/AutomatedTesting/Levels/Physics/C6224408_ScriptCanvas_EntitySpawn/leveldata/TerrainTexture.xml deleted file mode 100644 index f43df05b22..0000000000 --- a/AutomatedTesting/Levels/Physics/C6224408_ScriptCanvas_EntitySpawn/leveldata/TerrainTexture.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/AutomatedTesting/Levels/Physics/C6224408_ScriptCanvas_EntitySpawn/leveldata/VegetationMap.dat b/AutomatedTesting/Levels/Physics/C6224408_ScriptCanvas_EntitySpawn/leveldata/VegetationMap.dat deleted file mode 100644 index dce5631cd0..0000000000 --- a/AutomatedTesting/Levels/Physics/C6224408_ScriptCanvas_EntitySpawn/leveldata/VegetationMap.dat +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0e6a5435c928079b27796f6b202bbc2623e7e454244ddc099a3cadf33b7cb9e9 -size 63 diff --git a/AutomatedTesting/Levels/Physics/C6224408_ScriptCanvas_EntitySpawn/tags.txt b/AutomatedTesting/Levels/Physics/C6224408_ScriptCanvas_EntitySpawn/tags.txt deleted file mode 100644 index 0d6c1880e7..0000000000 --- a/AutomatedTesting/Levels/Physics/C6224408_ScriptCanvas_EntitySpawn/tags.txt +++ /dev/null @@ -1,12 +0,0 @@ -0,0,0,0,0,0 -0,0,0,0,0,0 -0,0,0,0,0,0 -0,0,0,0,0,0 -0,0,0,0,0,0 -0,0,0,0,0,0 -0,0,0,0,0,0 -0,0,0,0,0,0 -0,0,0,0,0,0 -0,0,0,0,0,0 -0,0,0,0,0,0 -0,0,0,0,0,0 diff --git a/AutomatedTesting/Levels/Physics/C6224408_ScriptCanvas_EntitySpawn/terrain/terrain.pxheightfield b/AutomatedTesting/Levels/Physics/C6224408_ScriptCanvas_EntitySpawn/terrain/terrain.pxheightfield deleted file mode 100644 index 011356e521..0000000000 --- a/AutomatedTesting/Levels/Physics/C6224408_ScriptCanvas_EntitySpawn/terrain/terrain.pxheightfield +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:19096597087688692a225c1955f73d22c46354995fca1df8dff107a90c2f17a2 -size 4202594 diff --git a/AutomatedTesting/Levels/Physics/C6274125_ScriptCanvas_TriggerEvents/leveldata/Environment.xml b/AutomatedTesting/Levels/Physics/C6274125_ScriptCanvas_TriggerEvents/leveldata/Environment.xml deleted file mode 100644 index 4ba36f66ae..0000000000 --- a/AutomatedTesting/Levels/Physics/C6274125_ScriptCanvas_TriggerEvents/leveldata/Environment.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - diff --git a/AutomatedTesting/Levels/Physics/C6274125_ScriptCanvas_TriggerEvents/leveldata/GameTokens.xml b/AutomatedTesting/Levels/Physics/C6274125_ScriptCanvas_TriggerEvents/leveldata/GameTokens.xml deleted file mode 100644 index 668a4583bd..0000000000 --- a/AutomatedTesting/Levels/Physics/C6274125_ScriptCanvas_TriggerEvents/leveldata/GameTokens.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/AutomatedTesting/Levels/Physics/C6274125_ScriptCanvas_TriggerEvents/leveldata/TerrainTexture.xml b/AutomatedTesting/Levels/Physics/C6274125_ScriptCanvas_TriggerEvents/leveldata/TerrainTexture.xml deleted file mode 100644 index f43df05b22..0000000000 --- a/AutomatedTesting/Levels/Physics/C6274125_ScriptCanvas_TriggerEvents/leveldata/TerrainTexture.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/AutomatedTesting/Levels/Physics/C6274125_ScriptCanvas_TriggerEvents/leveldata/TimeOfDay.xml b/AutomatedTesting/Levels/Physics/C6274125_ScriptCanvas_TriggerEvents/leveldata/TimeOfDay.xml deleted file mode 100644 index 456d609b8a..0000000000 --- a/AutomatedTesting/Levels/Physics/C6274125_ScriptCanvas_TriggerEvents/leveldata/TimeOfDay.xml +++ /dev/null @@ -1,356 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/AutomatedTesting/Levels/Physics/C6274125_ScriptCanvas_TriggerEvents/leveldata/VegetationMap.dat b/AutomatedTesting/Levels/Physics/C6274125_ScriptCanvas_TriggerEvents/leveldata/VegetationMap.dat deleted file mode 100644 index dce5631cd0..0000000000 --- a/AutomatedTesting/Levels/Physics/C6274125_ScriptCanvas_TriggerEvents/leveldata/VegetationMap.dat +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0e6a5435c928079b27796f6b202bbc2623e7e454244ddc099a3cadf33b7cb9e9 -size 63 diff --git a/AutomatedTesting/Levels/Physics/C6274125_ScriptCanvas_TriggerEvents/tags.txt b/AutomatedTesting/Levels/Physics/C6274125_ScriptCanvas_TriggerEvents/tags.txt deleted file mode 100644 index 0d6c1880e7..0000000000 --- a/AutomatedTesting/Levels/Physics/C6274125_ScriptCanvas_TriggerEvents/tags.txt +++ /dev/null @@ -1,12 +0,0 @@ -0,0,0,0,0,0 -0,0,0,0,0,0 -0,0,0,0,0,0 -0,0,0,0,0,0 -0,0,0,0,0,0 -0,0,0,0,0,0 -0,0,0,0,0,0 -0,0,0,0,0,0 -0,0,0,0,0,0 -0,0,0,0,0,0 -0,0,0,0,0,0 -0,0,0,0,0,0 diff --git a/AutomatedTesting/Levels/Physics/C6274125_ScriptCanvas_TriggerEvents/terraintexture.pak b/AutomatedTesting/Levels/Physics/C6274125_ScriptCanvas_TriggerEvents/terraintexture.pak deleted file mode 100644 index fe3604a050..0000000000 --- a/AutomatedTesting/Levels/Physics/C6274125_ScriptCanvas_TriggerEvents/terraintexture.pak +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8739c76e681f900923b900c9df0ef75cf421d39cabb54650c4b9ad19b6a76d85 -size 22 diff --git a/AutomatedTesting/Levels/Physics/C6321601_Force_HighValuesDirectionAxes/leveldata/Environment.xml b/AutomatedTesting/Levels/Physics/C6321601_Force_HighValuesDirectionAxes/leveldata/Environment.xml deleted file mode 100644 index 4ba36f66ae..0000000000 --- a/AutomatedTesting/Levels/Physics/C6321601_Force_HighValuesDirectionAxes/leveldata/Environment.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - diff --git a/AutomatedTesting/Levels/Physics/C6321601_Force_HighValuesDirectionAxes/leveldata/GameTokens.xml b/AutomatedTesting/Levels/Physics/C6321601_Force_HighValuesDirectionAxes/leveldata/GameTokens.xml deleted file mode 100644 index 668a4583bd..0000000000 --- a/AutomatedTesting/Levels/Physics/C6321601_Force_HighValuesDirectionAxes/leveldata/GameTokens.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/AutomatedTesting/Levels/Physics/C6321601_Force_HighValuesDirectionAxes/leveldata/TerrainTexture.xml b/AutomatedTesting/Levels/Physics/C6321601_Force_HighValuesDirectionAxes/leveldata/TerrainTexture.xml deleted file mode 100644 index f43df05b22..0000000000 --- a/AutomatedTesting/Levels/Physics/C6321601_Force_HighValuesDirectionAxes/leveldata/TerrainTexture.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/AutomatedTesting/Levels/Physics/C6321601_Force_HighValuesDirectionAxes/leveldata/TimeOfDay.xml b/AutomatedTesting/Levels/Physics/C6321601_Force_HighValuesDirectionAxes/leveldata/TimeOfDay.xml deleted file mode 100644 index 456d609b8a..0000000000 --- a/AutomatedTesting/Levels/Physics/C6321601_Force_HighValuesDirectionAxes/leveldata/TimeOfDay.xml +++ /dev/null @@ -1,356 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/AutomatedTesting/Levels/Physics/C6321601_Force_HighValuesDirectionAxes/leveldata/VegetationMap.dat b/AutomatedTesting/Levels/Physics/C6321601_Force_HighValuesDirectionAxes/leveldata/VegetationMap.dat deleted file mode 100644 index dce5631cd0..0000000000 --- a/AutomatedTesting/Levels/Physics/C6321601_Force_HighValuesDirectionAxes/leveldata/VegetationMap.dat +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0e6a5435c928079b27796f6b202bbc2623e7e454244ddc099a3cadf33b7cb9e9 -size 63 diff --git a/AutomatedTesting/Levels/Physics/C6321601_Force_HighValuesDirectionAxes/tags.txt b/AutomatedTesting/Levels/Physics/C6321601_Force_HighValuesDirectionAxes/tags.txt deleted file mode 100644 index 0d6c1880e7..0000000000 --- a/AutomatedTesting/Levels/Physics/C6321601_Force_HighValuesDirectionAxes/tags.txt +++ /dev/null @@ -1,12 +0,0 @@ -0,0,0,0,0,0 -0,0,0,0,0,0 -0,0,0,0,0,0 -0,0,0,0,0,0 -0,0,0,0,0,0 -0,0,0,0,0,0 -0,0,0,0,0,0 -0,0,0,0,0,0 -0,0,0,0,0,0 -0,0,0,0,0,0 -0,0,0,0,0,0 -0,0,0,0,0,0 diff --git a/AutomatedTesting/Levels/Physics/C6321601_Force_HighValuesDirectionAxes/terrain/terrain.pxheightfield b/AutomatedTesting/Levels/Physics/C6321601_Force_HighValuesDirectionAxes/terrain/terrain.pxheightfield deleted file mode 100644 index 011356e521..0000000000 --- a/AutomatedTesting/Levels/Physics/C6321601_Force_HighValuesDirectionAxes/terrain/terrain.pxheightfield +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:19096597087688692a225c1955f73d22c46354995fca1df8dff107a90c2f17a2 -size 4202594 diff --git a/AutomatedTesting/Levels/Physics/C6321601_Force_HighValuesDirectionAxes/terraintexture.pak b/AutomatedTesting/Levels/Physics/C6321601_Force_HighValuesDirectionAxes/terraintexture.pak deleted file mode 100644 index fe3604a050..0000000000 --- a/AutomatedTesting/Levels/Physics/C6321601_Force_HighValuesDirectionAxes/terraintexture.pak +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8739c76e681f900923b900c9df0ef75cf421d39cabb54650c4b9ad19b6a76d85 -size 22 diff --git a/AutomatedTesting/Levels/Physics/C14654881_CharacterController_SwitchLevels/C14654881_CharacterController_SwitchLevels.ly b/AutomatedTesting/Levels/Physics/CharacterController_SwitchLevels/CharacterController_SwitchLevels.ly similarity index 100% rename from AutomatedTesting/Levels/Physics/C14654881_CharacterController_SwitchLevels/C14654881_CharacterController_SwitchLevels.ly rename to AutomatedTesting/Levels/Physics/CharacterController_SwitchLevels/CharacterController_SwitchLevels.ly diff --git a/AutomatedTesting/Levels/Physics/C14654881_CharacterController_SwitchLevels/filelist.xml b/AutomatedTesting/Levels/Physics/CharacterController_SwitchLevels/filelist.xml similarity index 70% rename from AutomatedTesting/Levels/Physics/C14654881_CharacterController_SwitchLevels/filelist.xml rename to AutomatedTesting/Levels/Physics/CharacterController_SwitchLevels/filelist.xml index 0b20fa2fcf..f4638e7834 100644 --- a/AutomatedTesting/Levels/Physics/C14654881_CharacterController_SwitchLevels/filelist.xml +++ b/AutomatedTesting/Levels/Physics/CharacterController_SwitchLevels/filelist.xml @@ -1,4 +1,4 @@ - + diff --git a/AutomatedTesting/Levels/Physics/C14654881_CharacterController_SwitchLevels/level.pak b/AutomatedTesting/Levels/Physics/CharacterController_SwitchLevels/level.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C14654881_CharacterController_SwitchLevels/level.pak rename to AutomatedTesting/Levels/Physics/CharacterController_SwitchLevels/level.pak diff --git a/AutomatedTesting/Levels/Physics/C12712452_ScriptCanvas_CollisionEvents/leveldata/Environment.xml b/AutomatedTesting/Levels/Physics/CharacterController_SwitchLevels/leveldata/Environment.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C12712452_ScriptCanvas_CollisionEvents/leveldata/Environment.xml rename to AutomatedTesting/Levels/Physics/CharacterController_SwitchLevels/leveldata/Environment.xml diff --git a/AutomatedTesting/Levels/Physics/C12712452_ScriptCanvas_CollisionEvents/leveldata/GameTokens.xml b/AutomatedTesting/Levels/Physics/CharacterController_SwitchLevels/leveldata/GameTokens.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C12712452_ScriptCanvas_CollisionEvents/leveldata/GameTokens.xml rename to AutomatedTesting/Levels/Physics/CharacterController_SwitchLevels/leveldata/GameTokens.xml diff --git a/AutomatedTesting/Levels/Physics/C12712454_ScriptCanvas_OverlapNodeVerification/leveldata/TerrainTexture.xml b/AutomatedTesting/Levels/Physics/CharacterController_SwitchLevels/leveldata/TerrainTexture.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C12712454_ScriptCanvas_OverlapNodeVerification/leveldata/TerrainTexture.xml rename to AutomatedTesting/Levels/Physics/CharacterController_SwitchLevels/leveldata/TerrainTexture.xml diff --git a/AutomatedTesting/Levels/Physics/C12712453_ScriptCanvas_MultipleRaycastNode/leveldata/TimeOfDay.xml b/AutomatedTesting/Levels/Physics/CharacterController_SwitchLevels/leveldata/TimeOfDay.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C12712453_ScriptCanvas_MultipleRaycastNode/leveldata/TimeOfDay.xml rename to AutomatedTesting/Levels/Physics/CharacterController_SwitchLevels/leveldata/TimeOfDay.xml diff --git a/AutomatedTesting/Levels/Physics/C12712452_ScriptCanvas_CollisionEvents/leveldata/VegetationMap.dat b/AutomatedTesting/Levels/Physics/CharacterController_SwitchLevels/leveldata/VegetationMap.dat similarity index 100% rename from AutomatedTesting/Levels/Physics/C12712452_ScriptCanvas_CollisionEvents/leveldata/VegetationMap.dat rename to AutomatedTesting/Levels/Physics/CharacterController_SwitchLevels/leveldata/VegetationMap.dat diff --git a/AutomatedTesting/Levels/Physics/C12712453_ScriptCanvas_MultipleRaycastNode/tags.txt b/AutomatedTesting/Levels/Physics/CharacterController_SwitchLevels/tags.txt similarity index 100% rename from AutomatedTesting/Levels/Physics/C12712453_ScriptCanvas_MultipleRaycastNode/tags.txt rename to AutomatedTesting/Levels/Physics/CharacterController_SwitchLevels/tags.txt diff --git a/AutomatedTesting/Levels/Physics/C12712453_ScriptCanvas_MultipleRaycastNode/terraintexture.pak b/AutomatedTesting/Levels/Physics/CharacterController_SwitchLevels/terraintexture.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C12712453_ScriptCanvas_MultipleRaycastNode/terraintexture.pak rename to AutomatedTesting/Levels/Physics/CharacterController_SwitchLevels/terraintexture.pak diff --git a/AutomatedTesting/Levels/Physics/C4976227_Collider_NewGroup/C4976227_Collider_NewGroup.ly b/AutomatedTesting/Levels/Physics/Collider_AddingNewGroupWorks/Collider_AddingNewGroupWorks.ly similarity index 100% rename from AutomatedTesting/Levels/Physics/C4976227_Collider_NewGroup/C4976227_Collider_NewGroup.ly rename to AutomatedTesting/Levels/Physics/Collider_AddingNewGroupWorks/Collider_AddingNewGroupWorks.ly diff --git a/AutomatedTesting/Levels/Physics/C4976227_Collider_NewGroup/filelist.xml b/AutomatedTesting/Levels/Physics/Collider_AddingNewGroupWorks/filelist.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C4976227_Collider_NewGroup/filelist.xml rename to AutomatedTesting/Levels/Physics/Collider_AddingNewGroupWorks/filelist.xml diff --git a/AutomatedTesting/Levels/Physics/C4976227_Collider_NewGroup/level.pak b/AutomatedTesting/Levels/Physics/Collider_AddingNewGroupWorks/level.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C4976227_Collider_NewGroup/level.pak rename to AutomatedTesting/Levels/Physics/Collider_AddingNewGroupWorks/level.pak diff --git a/AutomatedTesting/Levels/Physics/C12712453_ScriptCanvas_MultipleRaycastNode/leveldata/Environment.xml b/AutomatedTesting/Levels/Physics/Collider_AddingNewGroupWorks/leveldata/Environment.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C12712453_ScriptCanvas_MultipleRaycastNode/leveldata/Environment.xml rename to AutomatedTesting/Levels/Physics/Collider_AddingNewGroupWorks/leveldata/Environment.xml diff --git a/AutomatedTesting/Levels/Physics/C12712455_ScriptCanvas_ShapeCastVerification/leveldata/TerrainTexture.xml b/AutomatedTesting/Levels/Physics/Collider_AddingNewGroupWorks/leveldata/TerrainTexture.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C12712455_ScriptCanvas_ShapeCastVerification/leveldata/TerrainTexture.xml rename to AutomatedTesting/Levels/Physics/Collider_AddingNewGroupWorks/leveldata/TerrainTexture.xml diff --git a/AutomatedTesting/Levels/Physics/C14976307_Gravity_SetGravityWorks/leveldata/TimeOfDay.xml b/AutomatedTesting/Levels/Physics/Collider_AddingNewGroupWorks/leveldata/TimeOfDay.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C14976307_Gravity_SetGravityWorks/leveldata/TimeOfDay.xml rename to AutomatedTesting/Levels/Physics/Collider_AddingNewGroupWorks/leveldata/TimeOfDay.xml diff --git a/AutomatedTesting/Levels/Physics/C12712453_ScriptCanvas_MultipleRaycastNode/leveldata/VegetationMap.dat b/AutomatedTesting/Levels/Physics/Collider_AddingNewGroupWorks/leveldata/VegetationMap.dat similarity index 100% rename from AutomatedTesting/Levels/Physics/C12712453_ScriptCanvas_MultipleRaycastNode/leveldata/VegetationMap.dat rename to AutomatedTesting/Levels/Physics/Collider_AddingNewGroupWorks/leveldata/VegetationMap.dat diff --git a/AutomatedTesting/Levels/Physics/C12712454_ScriptCanvas_OverlapNodeVerification/tags.txt b/AutomatedTesting/Levels/Physics/Collider_AddingNewGroupWorks/tags.txt similarity index 100% rename from AutomatedTesting/Levels/Physics/C12712454_ScriptCanvas_OverlapNodeVerification/tags.txt rename to AutomatedTesting/Levels/Physics/Collider_AddingNewGroupWorks/tags.txt diff --git a/AutomatedTesting/Levels/Physics/C12712454_ScriptCanvas_OverlapNodeVerification/terraintexture.pak b/AutomatedTesting/Levels/Physics/Collider_AddingNewGroupWorks/terraintexture.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C12712454_ScriptCanvas_OverlapNodeVerification/terraintexture.pak rename to AutomatedTesting/Levels/Physics/Collider_AddingNewGroupWorks/terraintexture.pak diff --git a/AutomatedTesting/Levels/Physics/C4982797_Collider_ColliderOffset/C4982797_Collider_ColliderOffset.ly b/AutomatedTesting/Levels/Physics/Collider_ColliderPositionOffset/Collider_ColliderPositionOffset.ly similarity index 100% rename from AutomatedTesting/Levels/Physics/C4982797_Collider_ColliderOffset/C4982797_Collider_ColliderOffset.ly rename to AutomatedTesting/Levels/Physics/Collider_ColliderPositionOffset/Collider_ColliderPositionOffset.ly diff --git a/AutomatedTesting/Levels/Physics/C4982797_Collider_ColliderOffset/filelist.xml b/AutomatedTesting/Levels/Physics/Collider_ColliderPositionOffset/filelist.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C4982797_Collider_ColliderOffset/filelist.xml rename to AutomatedTesting/Levels/Physics/Collider_ColliderPositionOffset/filelist.xml diff --git a/AutomatedTesting/Levels/Physics/C4982797_Collider_ColliderOffset/level.pak b/AutomatedTesting/Levels/Physics/Collider_ColliderPositionOffset/level.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C4982797_Collider_ColliderOffset/level.pak rename to AutomatedTesting/Levels/Physics/Collider_ColliderPositionOffset/level.pak diff --git a/AutomatedTesting/Levels/Physics/C12712454_ScriptCanvas_OverlapNodeVerification/leveldata/Environment.xml b/AutomatedTesting/Levels/Physics/Collider_ColliderPositionOffset/leveldata/Environment.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C12712454_ScriptCanvas_OverlapNodeVerification/leveldata/Environment.xml rename to AutomatedTesting/Levels/Physics/Collider_ColliderPositionOffset/leveldata/Environment.xml diff --git a/AutomatedTesting/Levels/Physics/C12712453_ScriptCanvas_MultipleRaycastNode/leveldata/GameTokens.xml b/AutomatedTesting/Levels/Physics/Collider_ColliderPositionOffset/leveldata/GameTokens.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C12712453_ScriptCanvas_MultipleRaycastNode/leveldata/GameTokens.xml rename to AutomatedTesting/Levels/Physics/Collider_ColliderPositionOffset/leveldata/GameTokens.xml diff --git a/AutomatedTesting/Levels/Physics/C12712452_ScriptCanvas_CollisionEvents/leveldata/TerrainTexture.xml b/AutomatedTesting/Levels/Physics/Collider_ColliderPositionOffset/leveldata/TerrainTexture.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C12712452_ScriptCanvas_CollisionEvents/leveldata/TerrainTexture.xml rename to AutomatedTesting/Levels/Physics/Collider_ColliderPositionOffset/leveldata/TerrainTexture.xml diff --git a/AutomatedTesting/Levels/Physics/C12712454_ScriptCanvas_OverlapNodeVerification/leveldata/TimeOfDay.xml b/AutomatedTesting/Levels/Physics/Collider_ColliderPositionOffset/leveldata/TimeOfDay.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C12712454_ScriptCanvas_OverlapNodeVerification/leveldata/TimeOfDay.xml rename to AutomatedTesting/Levels/Physics/Collider_ColliderPositionOffset/leveldata/TimeOfDay.xml diff --git a/AutomatedTesting/Levels/Physics/C12712454_ScriptCanvas_OverlapNodeVerification/leveldata/VegetationMap.dat b/AutomatedTesting/Levels/Physics/Collider_ColliderPositionOffset/leveldata/VegetationMap.dat similarity index 100% rename from AutomatedTesting/Levels/Physics/C12712454_ScriptCanvas_OverlapNodeVerification/leveldata/VegetationMap.dat rename to AutomatedTesting/Levels/Physics/Collider_ColliderPositionOffset/leveldata/VegetationMap.dat diff --git a/AutomatedTesting/Levels/Physics/C12712455_ScriptCanvas_ShapeCastVerification/tags.txt b/AutomatedTesting/Levels/Physics/Collider_ColliderPositionOffset/tags.txt similarity index 100% rename from AutomatedTesting/Levels/Physics/C12712455_ScriptCanvas_ShapeCastVerification/tags.txt rename to AutomatedTesting/Levels/Physics/Collider_ColliderPositionOffset/tags.txt diff --git a/AutomatedTesting/Levels/Physics/C12712452_ScriptCanvas_CollisionEvents/terrain/terrain.pxheightfield b/AutomatedTesting/Levels/Physics/Collider_ColliderPositionOffset/terrain/terrain.pxheightfield similarity index 100% rename from AutomatedTesting/Levels/Physics/C12712452_ScriptCanvas_CollisionEvents/terrain/terrain.pxheightfield rename to AutomatedTesting/Levels/Physics/Collider_ColliderPositionOffset/terrain/terrain.pxheightfield diff --git a/AutomatedTesting/Levels/Physics/C12712455_ScriptCanvas_ShapeCastVerification/terraintexture.pak b/AutomatedTesting/Levels/Physics/Collider_ColliderPositionOffset/terraintexture.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C12712455_ScriptCanvas_ShapeCastVerification/terraintexture.pak rename to AutomatedTesting/Levels/Physics/Collider_ColliderPositionOffset/terraintexture.pak diff --git a/AutomatedTesting/Levels/Physics/C4982798_Collider_ColliderRotationOffset/C4982798_Collider_ColliderRotationOffset.ly b/AutomatedTesting/Levels/Physics/Collider_ColliderRotationOffset/Collider_ColliderRotationOffset.ly similarity index 100% rename from AutomatedTesting/Levels/Physics/C4982798_Collider_ColliderRotationOffset/C4982798_Collider_ColliderRotationOffset.ly rename to AutomatedTesting/Levels/Physics/Collider_ColliderRotationOffset/Collider_ColliderRotationOffset.ly diff --git a/AutomatedTesting/Levels/Physics/C4982798_Collider_ColliderRotationOffset/VisualDocumentation/collider_rotation_full.PNG b/AutomatedTesting/Levels/Physics/Collider_ColliderRotationOffset/VisualDocumentation/collider_rotation_full.PNG similarity index 100% rename from AutomatedTesting/Levels/Physics/C4982798_Collider_ColliderRotationOffset/VisualDocumentation/collider_rotation_full.PNG rename to AutomatedTesting/Levels/Physics/Collider_ColliderRotationOffset/VisualDocumentation/collider_rotation_full.PNG diff --git a/AutomatedTesting/Levels/Physics/C4982798_Collider_ColliderRotationOffset/VisualDocumentation/collider_rotation_single.PNG b/AutomatedTesting/Levels/Physics/Collider_ColliderRotationOffset/VisualDocumentation/collider_rotation_single.PNG similarity index 100% rename from AutomatedTesting/Levels/Physics/C4982798_Collider_ColliderRotationOffset/VisualDocumentation/collider_rotation_single.PNG rename to AutomatedTesting/Levels/Physics/Collider_ColliderRotationOffset/VisualDocumentation/collider_rotation_single.PNG diff --git a/AutomatedTesting/Levels/Physics/C4982798_Collider_ColliderRotationOffset/filelist.xml b/AutomatedTesting/Levels/Physics/Collider_ColliderRotationOffset/filelist.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C4982798_Collider_ColliderRotationOffset/filelist.xml rename to AutomatedTesting/Levels/Physics/Collider_ColliderRotationOffset/filelist.xml diff --git a/AutomatedTesting/Levels/Physics/C4982798_Collider_ColliderRotationOffset/level.pak b/AutomatedTesting/Levels/Physics/Collider_ColliderRotationOffset/level.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C4982798_Collider_ColliderRotationOffset/level.pak rename to AutomatedTesting/Levels/Physics/Collider_ColliderRotationOffset/level.pak diff --git a/AutomatedTesting/Levels/Physics/C12712455_ScriptCanvas_ShapeCastVerification/leveldata/Environment.xml b/AutomatedTesting/Levels/Physics/Collider_ColliderRotationOffset/leveldata/Environment.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C12712455_ScriptCanvas_ShapeCastVerification/leveldata/Environment.xml rename to AutomatedTesting/Levels/Physics/Collider_ColliderRotationOffset/leveldata/Environment.xml diff --git a/AutomatedTesting/Levels/Physics/C12712454_ScriptCanvas_OverlapNodeVerification/leveldata/GameTokens.xml b/AutomatedTesting/Levels/Physics/Collider_ColliderRotationOffset/leveldata/GameTokens.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C12712454_ScriptCanvas_OverlapNodeVerification/leveldata/GameTokens.xml rename to AutomatedTesting/Levels/Physics/Collider_ColliderRotationOffset/leveldata/GameTokens.xml diff --git a/AutomatedTesting/Levels/Physics/C12712453_ScriptCanvas_MultipleRaycastNode/leveldata/TerrainTexture.xml b/AutomatedTesting/Levels/Physics/Collider_ColliderRotationOffset/leveldata/TerrainTexture.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C12712453_ScriptCanvas_MultipleRaycastNode/leveldata/TerrainTexture.xml rename to AutomatedTesting/Levels/Physics/Collider_ColliderRotationOffset/leveldata/TerrainTexture.xml diff --git a/AutomatedTesting/Levels/Physics/C12868578_ForceRegion_DirectionHasNoAffectOnMagnitude/leveldata/TimeOfDay.xml b/AutomatedTesting/Levels/Physics/Collider_ColliderRotationOffset/leveldata/TimeOfDay.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C12868578_ForceRegion_DirectionHasNoAffectOnMagnitude/leveldata/TimeOfDay.xml rename to AutomatedTesting/Levels/Physics/Collider_ColliderRotationOffset/leveldata/TimeOfDay.xml diff --git a/AutomatedTesting/Levels/Physics/C12712455_ScriptCanvas_ShapeCastVerification/leveldata/VegetationMap.dat b/AutomatedTesting/Levels/Physics/Collider_ColliderRotationOffset/leveldata/VegetationMap.dat similarity index 100% rename from AutomatedTesting/Levels/Physics/C12712455_ScriptCanvas_ShapeCastVerification/leveldata/VegetationMap.dat rename to AutomatedTesting/Levels/Physics/Collider_ColliderRotationOffset/leveldata/VegetationMap.dat diff --git a/AutomatedTesting/Levels/Physics/C12868578_ForceRegion_DirectionHasNoAffectOnMagnitude/tags.txt b/AutomatedTesting/Levels/Physics/Collider_ColliderRotationOffset/tags.txt similarity index 100% rename from AutomatedTesting/Levels/Physics/C12868578_ForceRegion_DirectionHasNoAffectOnMagnitude/tags.txt rename to AutomatedTesting/Levels/Physics/Collider_ColliderRotationOffset/tags.txt diff --git a/AutomatedTesting/Levels/Physics/C13895144_Ragdoll_WithRagdoll/terrain/terrain.pxheightfield b/AutomatedTesting/Levels/Physics/Collider_ColliderRotationOffset/terrain/terrain.pxheightfield similarity index 100% rename from AutomatedTesting/Levels/Physics/C13895144_Ragdoll_WithRagdoll/terrain/terrain.pxheightfield rename to AutomatedTesting/Levels/Physics/Collider_ColliderRotationOffset/terrain/terrain.pxheightfield diff --git a/AutomatedTesting/Levels/Physics/C12868578_ForceRegion_DirectionHasNoAffectOnMagnitude/terraintexture.pak b/AutomatedTesting/Levels/Physics/Collider_ColliderRotationOffset/terraintexture.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C12868578_ForceRegion_DirectionHasNoAffectOnMagnitude/terraintexture.pak rename to AutomatedTesting/Levels/Physics/Collider_ColliderRotationOffset/terraintexture.pak diff --git a/AutomatedTesting/Levels/Physics/C3510644_Collider_CollisionGroups/C3510644_Collider_CollisionGroups.ly b/AutomatedTesting/Levels/Physics/Collider_CollisionGroupsWorkflow/Collider_CollisionGroupsWorkflow.ly similarity index 100% rename from AutomatedTesting/Levels/Physics/C3510644_Collider_CollisionGroups/C3510644_Collider_CollisionGroups.ly rename to AutomatedTesting/Levels/Physics/Collider_CollisionGroupsWorkflow/Collider_CollisionGroupsWorkflow.ly diff --git a/AutomatedTesting/Levels/Physics/C3510644_Collider_CollisionGroups/filelist.xml b/AutomatedTesting/Levels/Physics/Collider_CollisionGroupsWorkflow/filelist.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C3510644_Collider_CollisionGroups/filelist.xml rename to AutomatedTesting/Levels/Physics/Collider_CollisionGroupsWorkflow/filelist.xml diff --git a/AutomatedTesting/Levels/Physics/C3510644_Collider_CollisionGroups/level.pak b/AutomatedTesting/Levels/Physics/Collider_CollisionGroupsWorkflow/level.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C3510644_Collider_CollisionGroups/level.pak rename to AutomatedTesting/Levels/Physics/Collider_CollisionGroupsWorkflow/level.pak diff --git a/AutomatedTesting/Levels/Physics/C12868578_ForceRegion_DirectionHasNoAffectOnMagnitude/leveldata/Environment.xml b/AutomatedTesting/Levels/Physics/Collider_CollisionGroupsWorkflow/leveldata/Environment.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C12868578_ForceRegion_DirectionHasNoAffectOnMagnitude/leveldata/Environment.xml rename to AutomatedTesting/Levels/Physics/Collider_CollisionGroupsWorkflow/leveldata/Environment.xml diff --git a/AutomatedTesting/Levels/Physics/C12868580_ForceRegion_SplineModifiedTransform/leveldata/TerrainTexture.xml b/AutomatedTesting/Levels/Physics/Collider_CollisionGroupsWorkflow/leveldata/TerrainTexture.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C12868580_ForceRegion_SplineModifiedTransform/leveldata/TerrainTexture.xml rename to AutomatedTesting/Levels/Physics/Collider_CollisionGroupsWorkflow/leveldata/TerrainTexture.xml diff --git a/AutomatedTesting/Levels/Physics/C12712452_ScriptCanvas_CollisionEvents/leveldata/TimeOfDay.xml b/AutomatedTesting/Levels/Physics/Collider_CollisionGroupsWorkflow/leveldata/TimeOfDay.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C12712452_ScriptCanvas_CollisionEvents/leveldata/TimeOfDay.xml rename to AutomatedTesting/Levels/Physics/Collider_CollisionGroupsWorkflow/leveldata/TimeOfDay.xml diff --git a/AutomatedTesting/Levels/Physics/C12868578_ForceRegion_DirectionHasNoAffectOnMagnitude/leveldata/VegetationMap.dat b/AutomatedTesting/Levels/Physics/Collider_CollisionGroupsWorkflow/leveldata/VegetationMap.dat similarity index 100% rename from AutomatedTesting/Levels/Physics/C12868578_ForceRegion_DirectionHasNoAffectOnMagnitude/leveldata/VegetationMap.dat rename to AutomatedTesting/Levels/Physics/Collider_CollisionGroupsWorkflow/leveldata/VegetationMap.dat diff --git a/AutomatedTesting/Levels/Physics/C12868580_ForceRegion_SplineModifiedTransform/tags.txt b/AutomatedTesting/Levels/Physics/Collider_CollisionGroupsWorkflow/tags.txt similarity index 100% rename from AutomatedTesting/Levels/Physics/C12868580_ForceRegion_SplineModifiedTransform/tags.txt rename to AutomatedTesting/Levels/Physics/Collider_CollisionGroupsWorkflow/tags.txt diff --git a/AutomatedTesting/Levels/Physics/C3510644_Collider_CollisionGroups/terrain/terrain.pxheightfield b/AutomatedTesting/Levels/Physics/Collider_CollisionGroupsWorkflow/terrain/terrain.pxheightfield similarity index 100% rename from AutomatedTesting/Levels/Physics/C3510644_Collider_CollisionGroups/terrain/terrain.pxheightfield rename to AutomatedTesting/Levels/Physics/Collider_CollisionGroupsWorkflow/terrain/terrain.pxheightfield diff --git a/AutomatedTesting/Levels/Physics/C12868580_ForceRegion_SplineModifiedTransform/terraintexture.pak b/AutomatedTesting/Levels/Physics/Collider_CollisionGroupsWorkflow/terraintexture.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C12868580_ForceRegion_SplineModifiedTransform/terraintexture.pak rename to AutomatedTesting/Levels/Physics/Collider_CollisionGroupsWorkflow/terraintexture.pak diff --git a/AutomatedTesting/Levels/Physics/C4982593_PhysxCollider_CollisionLayerTest/C4982593_PhysxCollider_CollisionLayerTest.ly b/AutomatedTesting/Levels/Physics/Collider_DiffCollisionGroupDiffCollidingLayersNotCollide/Collider_DiffCollisionGroupDiffCollidingLayersNotCollide.ly similarity index 100% rename from AutomatedTesting/Levels/Physics/C4982593_PhysxCollider_CollisionLayerTest/C4982593_PhysxCollider_CollisionLayerTest.ly rename to AutomatedTesting/Levels/Physics/Collider_DiffCollisionGroupDiffCollidingLayersNotCollide/Collider_DiffCollisionGroupDiffCollidingLayersNotCollide.ly diff --git a/AutomatedTesting/Levels/Physics/C4976245_PhysxCollider_CollisionLayerTest/filelist.xml b/AutomatedTesting/Levels/Physics/Collider_DiffCollisionGroupDiffCollidingLayersNotCollide/filelist.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C4976245_PhysxCollider_CollisionLayerTest/filelist.xml rename to AutomatedTesting/Levels/Physics/Collider_DiffCollisionGroupDiffCollidingLayersNotCollide/filelist.xml diff --git a/AutomatedTesting/Levels/Physics/C4976245_PhysxCollider_CollisionLayerTest/level.pak b/AutomatedTesting/Levels/Physics/Collider_DiffCollisionGroupDiffCollidingLayersNotCollide/level.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C4976245_PhysxCollider_CollisionLayerTest/level.pak rename to AutomatedTesting/Levels/Physics/Collider_DiffCollisionGroupDiffCollidingLayersNotCollide/level.pak diff --git a/AutomatedTesting/Levels/Physics/C12868580_ForceRegion_SplineModifiedTransform/leveldata/Environment.xml b/AutomatedTesting/Levels/Physics/Collider_DiffCollisionGroupDiffCollidingLayersNotCollide/leveldata/Environment.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C12868580_ForceRegion_SplineModifiedTransform/leveldata/Environment.xml rename to AutomatedTesting/Levels/Physics/Collider_DiffCollisionGroupDiffCollidingLayersNotCollide/leveldata/Environment.xml diff --git a/AutomatedTesting/Levels/Physics/C13508019_Terrain_TerrainTexturePainterWorks/leveldata/TerrainTexture.xml b/AutomatedTesting/Levels/Physics/Collider_DiffCollisionGroupDiffCollidingLayersNotCollide/leveldata/TerrainTexture.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C13508019_Terrain_TerrainTexturePainterWorks/leveldata/TerrainTexture.xml rename to AutomatedTesting/Levels/Physics/Collider_DiffCollisionGroupDiffCollidingLayersNotCollide/leveldata/TerrainTexture.xml diff --git a/AutomatedTesting/Levels/Physics/C4044694_Material_EmptyLibraryUsesDefault/leveldata/TimeOfDay.xml b/AutomatedTesting/Levels/Physics/Collider_DiffCollisionGroupDiffCollidingLayersNotCollide/leveldata/TimeOfDay.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C4044694_Material_EmptyLibraryUsesDefault/leveldata/TimeOfDay.xml rename to AutomatedTesting/Levels/Physics/Collider_DiffCollisionGroupDiffCollidingLayersNotCollide/leveldata/TimeOfDay.xml diff --git a/AutomatedTesting/Levels/Physics/C12868580_ForceRegion_SplineModifiedTransform/leveldata/VegetationMap.dat b/AutomatedTesting/Levels/Physics/Collider_DiffCollisionGroupDiffCollidingLayersNotCollide/leveldata/VegetationMap.dat similarity index 100% rename from AutomatedTesting/Levels/Physics/C12868580_ForceRegion_SplineModifiedTransform/leveldata/VegetationMap.dat rename to AutomatedTesting/Levels/Physics/Collider_DiffCollisionGroupDiffCollidingLayersNotCollide/leveldata/VegetationMap.dat diff --git a/AutomatedTesting/Levels/Physics/C12905527_ForceRegion_MagnitudeDeviation/tags.txt b/AutomatedTesting/Levels/Physics/Collider_DiffCollisionGroupDiffCollidingLayersNotCollide/tags.txt similarity index 100% rename from AutomatedTesting/Levels/Physics/C12905527_ForceRegion_MagnitudeDeviation/tags.txt rename to AutomatedTesting/Levels/Physics/Collider_DiffCollisionGroupDiffCollidingLayersNotCollide/tags.txt diff --git a/AutomatedTesting/Levels/Physics/C12905527_ForceRegion_MagnitudeDeviation/terraintexture.pak b/AutomatedTesting/Levels/Physics/Collider_DiffCollisionGroupDiffCollidingLayersNotCollide/terraintexture.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C12905527_ForceRegion_MagnitudeDeviation/terraintexture.pak rename to AutomatedTesting/Levels/Physics/Collider_DiffCollisionGroupDiffCollidingLayersNotCollide/terraintexture.pak diff --git a/AutomatedTesting/Levels/Physics/C4976245_PhysxCollider_CollisionLayerTest/C4976245_PhysxCollider_CollisionLayerTest.ly b/AutomatedTesting/Levels/Physics/Collider_NoneCollisionGroupSameLayerNotCollide/Collider_NoneCollisionGroupSameLayerNotCollide.ly similarity index 100% rename from AutomatedTesting/Levels/Physics/C4976245_PhysxCollider_CollisionLayerTest/C4976245_PhysxCollider_CollisionLayerTest.ly rename to AutomatedTesting/Levels/Physics/Collider_NoneCollisionGroupSameLayerNotCollide/Collider_NoneCollisionGroupSameLayerNotCollide.ly diff --git a/AutomatedTesting/Levels/Physics/C4982593_PhysxCollider_CollisionLayerTest/filelist.xml b/AutomatedTesting/Levels/Physics/Collider_NoneCollisionGroupSameLayerNotCollide/filelist.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C4982593_PhysxCollider_CollisionLayerTest/filelist.xml rename to AutomatedTesting/Levels/Physics/Collider_NoneCollisionGroupSameLayerNotCollide/filelist.xml diff --git a/AutomatedTesting/Levels/Physics/C4982593_PhysxCollider_CollisionLayerTest/level.pak b/AutomatedTesting/Levels/Physics/Collider_NoneCollisionGroupSameLayerNotCollide/level.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C4982593_PhysxCollider_CollisionLayerTest/level.pak rename to AutomatedTesting/Levels/Physics/Collider_NoneCollisionGroupSameLayerNotCollide/level.pak diff --git a/AutomatedTesting/Levels/Physics/C12905527_ForceRegion_MagnitudeDeviation/leveldata/Environment.xml b/AutomatedTesting/Levels/Physics/Collider_NoneCollisionGroupSameLayerNotCollide/leveldata/Environment.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C12905527_ForceRegion_MagnitudeDeviation/leveldata/Environment.xml rename to AutomatedTesting/Levels/Physics/Collider_NoneCollisionGroupSameLayerNotCollide/leveldata/Environment.xml diff --git a/AutomatedTesting/Levels/Physics/C13895144_Ragdoll_NoRagdoll/leveldata/TerrainTexture.xml b/AutomatedTesting/Levels/Physics/Collider_NoneCollisionGroupSameLayerNotCollide/leveldata/TerrainTexture.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C13895144_Ragdoll_NoRagdoll/leveldata/TerrainTexture.xml rename to AutomatedTesting/Levels/Physics/Collider_NoneCollisionGroupSameLayerNotCollide/leveldata/TerrainTexture.xml diff --git a/AutomatedTesting/Levels/Physics/C12712455_ScriptCanvas_ShapeCastVerification/leveldata/TimeOfDay.xml b/AutomatedTesting/Levels/Physics/Collider_NoneCollisionGroupSameLayerNotCollide/leveldata/TimeOfDay.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C12712455_ScriptCanvas_ShapeCastVerification/leveldata/TimeOfDay.xml rename to AutomatedTesting/Levels/Physics/Collider_NoneCollisionGroupSameLayerNotCollide/leveldata/TimeOfDay.xml diff --git a/AutomatedTesting/Levels/Physics/C12905527_ForceRegion_MagnitudeDeviation/leveldata/VegetationMap.dat b/AutomatedTesting/Levels/Physics/Collider_NoneCollisionGroupSameLayerNotCollide/leveldata/VegetationMap.dat similarity index 100% rename from AutomatedTesting/Levels/Physics/C12905527_ForceRegion_MagnitudeDeviation/leveldata/VegetationMap.dat rename to AutomatedTesting/Levels/Physics/Collider_NoneCollisionGroupSameLayerNotCollide/leveldata/VegetationMap.dat diff --git a/AutomatedTesting/Levels/Physics/C13351703_COM_NotIncludeTriggerShapes/tags.txt b/AutomatedTesting/Levels/Physics/Collider_NoneCollisionGroupSameLayerNotCollide/tags.txt similarity index 100% rename from AutomatedTesting/Levels/Physics/C13351703_COM_NotIncludeTriggerShapes/tags.txt rename to AutomatedTesting/Levels/Physics/Collider_NoneCollisionGroupSameLayerNotCollide/tags.txt diff --git a/AutomatedTesting/Levels/Physics/C13351703_COM_NotIncludeTriggerShapes/terraintexture.pak b/AutomatedTesting/Levels/Physics/Collider_NoneCollisionGroupSameLayerNotCollide/terraintexture.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C13351703_COM_NotIncludeTriggerShapes/terraintexture.pak rename to AutomatedTesting/Levels/Physics/Collider_NoneCollisionGroupSameLayerNotCollide/terraintexture.pak diff --git a/AutomatedTesting/Levels/Physics/C14861498_ConfirmError_NoPxMesh/C14861498_ConfirmError_NoPxMesh.ly b/AutomatedTesting/Levels/Physics/Collider_PxMeshErrorIfNoMesh/Collider_PxMeshErrorIfNoMesh.ly similarity index 100% rename from AutomatedTesting/Levels/Physics/C14861498_ConfirmError_NoPxMesh/C14861498_ConfirmError_NoPxMesh.ly rename to AutomatedTesting/Levels/Physics/Collider_PxMeshErrorIfNoMesh/Collider_PxMeshErrorIfNoMesh.ly diff --git a/AutomatedTesting/Levels/Physics/C14861498_ConfirmError_NoPxMesh/filelist.xml b/AutomatedTesting/Levels/Physics/Collider_PxMeshErrorIfNoMesh/filelist.xml similarity index 74% rename from AutomatedTesting/Levels/Physics/C14861498_ConfirmError_NoPxMesh/filelist.xml rename to AutomatedTesting/Levels/Physics/Collider_PxMeshErrorIfNoMesh/filelist.xml index 51be290295..5799ca91f9 100644 --- a/AutomatedTesting/Levels/Physics/C14861498_ConfirmError_NoPxMesh/filelist.xml +++ b/AutomatedTesting/Levels/Physics/Collider_PxMeshErrorIfNoMesh/filelist.xml @@ -1,4 +1,4 @@ - + diff --git a/AutomatedTesting/Levels/Physics/C14861498_ConfirmError_NoPxMesh/level.pak b/AutomatedTesting/Levels/Physics/Collider_PxMeshErrorIfNoMesh/level.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C14861498_ConfirmError_NoPxMesh/level.pak rename to AutomatedTesting/Levels/Physics/Collider_PxMeshErrorIfNoMesh/level.pak diff --git a/AutomatedTesting/Levels/Physics/C13351703_COM_NotIncludeTriggerShapes/leveldata/Environment.xml b/AutomatedTesting/Levels/Physics/Collider_PxMeshErrorIfNoMesh/leveldata/Environment.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C13351703_COM_NotIncludeTriggerShapes/leveldata/Environment.xml rename to AutomatedTesting/Levels/Physics/Collider_PxMeshErrorIfNoMesh/leveldata/Environment.xml diff --git a/AutomatedTesting/Levels/Physics/C12712455_ScriptCanvas_ShapeCastVerification/leveldata/GameTokens.xml b/AutomatedTesting/Levels/Physics/Collider_PxMeshErrorIfNoMesh/leveldata/GameTokens.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C12712455_ScriptCanvas_ShapeCastVerification/leveldata/GameTokens.xml rename to AutomatedTesting/Levels/Physics/Collider_PxMeshErrorIfNoMesh/leveldata/GameTokens.xml diff --git a/AutomatedTesting/Levels/Physics/C13895144_Ragdoll_WithRagdoll/leveldata/TerrainTexture.xml b/AutomatedTesting/Levels/Physics/Collider_PxMeshErrorIfNoMesh/leveldata/TerrainTexture.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C13895144_Ragdoll_WithRagdoll/leveldata/TerrainTexture.xml rename to AutomatedTesting/Levels/Physics/Collider_PxMeshErrorIfNoMesh/leveldata/TerrainTexture.xml diff --git a/AutomatedTesting/Levels/Physics/C12868580_ForceRegion_SplineModifiedTransform/leveldata/TimeOfDay.xml b/AutomatedTesting/Levels/Physics/Collider_PxMeshErrorIfNoMesh/leveldata/TimeOfDay.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C12868580_ForceRegion_SplineModifiedTransform/leveldata/TimeOfDay.xml rename to AutomatedTesting/Levels/Physics/Collider_PxMeshErrorIfNoMesh/leveldata/TimeOfDay.xml diff --git a/AutomatedTesting/Levels/Physics/C13351703_COM_NotIncludeTriggerShapes/leveldata/VegetationMap.dat b/AutomatedTesting/Levels/Physics/Collider_PxMeshErrorIfNoMesh/leveldata/VegetationMap.dat similarity index 100% rename from AutomatedTesting/Levels/Physics/C13351703_COM_NotIncludeTriggerShapes/leveldata/VegetationMap.dat rename to AutomatedTesting/Levels/Physics/Collider_PxMeshErrorIfNoMesh/leveldata/VegetationMap.dat diff --git a/AutomatedTesting/Levels/Physics/C13352089_RigidBodies_MaxAngularVelocity/tags.txt b/AutomatedTesting/Levels/Physics/Collider_PxMeshErrorIfNoMesh/tags.txt similarity index 100% rename from AutomatedTesting/Levels/Physics/C13352089_RigidBodies_MaxAngularVelocity/tags.txt rename to AutomatedTesting/Levels/Physics/Collider_PxMeshErrorIfNoMesh/tags.txt diff --git a/AutomatedTesting/Levels/Physics/C13352089_RigidBodies_MaxAngularVelocity/terraintexture.pak b/AutomatedTesting/Levels/Physics/Collider_PxMeshErrorIfNoMesh/terraintexture.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C13352089_RigidBodies_MaxAngularVelocity/terraintexture.pak rename to AutomatedTesting/Levels/Physics/Collider_PxMeshErrorIfNoMesh/terraintexture.pak diff --git a/AutomatedTesting/Levels/Physics/C4976243_Collision_SameCollisionGroupDiffCollisionLayers/C4976243_Collision_SameCollisionGroupDiffCollisionLayers.ly b/AutomatedTesting/Levels/Physics/Collider_SameCollisionGroupDiffLayersCollide/Collider_SameCollisionGroupDiffLayersCollide.ly similarity index 100% rename from AutomatedTesting/Levels/Physics/C4976243_Collision_SameCollisionGroupDiffCollisionLayers/C4976243_Collision_SameCollisionGroupDiffCollisionLayers.ly rename to AutomatedTesting/Levels/Physics/Collider_SameCollisionGroupDiffLayersCollide/Collider_SameCollisionGroupDiffLayersCollide.ly diff --git a/AutomatedTesting/Levels/Physics/C4976243_Collision_SameCollisionGroupDiffCollisionLayers/filelist.xml b/AutomatedTesting/Levels/Physics/Collider_SameCollisionGroupDiffLayersCollide/filelist.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C4976243_Collision_SameCollisionGroupDiffCollisionLayers/filelist.xml rename to AutomatedTesting/Levels/Physics/Collider_SameCollisionGroupDiffLayersCollide/filelist.xml diff --git a/AutomatedTesting/Levels/Physics/C4976243_Collision_SameCollisionGroupDiffCollisionLayers/level.pak b/AutomatedTesting/Levels/Physics/Collider_SameCollisionGroupDiffLayersCollide/level.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C4976243_Collision_SameCollisionGroupDiffCollisionLayers/level.pak rename to AutomatedTesting/Levels/Physics/Collider_SameCollisionGroupDiffLayersCollide/level.pak diff --git a/AutomatedTesting/Levels/Physics/C13352089_RigidBodies_MaxAngularVelocity/leveldata/Environment.xml b/AutomatedTesting/Levels/Physics/Collider_SameCollisionGroupDiffLayersCollide/leveldata/Environment.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C13352089_RigidBodies_MaxAngularVelocity/leveldata/Environment.xml rename to AutomatedTesting/Levels/Physics/Collider_SameCollisionGroupDiffLayersCollide/leveldata/Environment.xml diff --git a/AutomatedTesting/Levels/Physics/C12868578_ForceRegion_DirectionHasNoAffectOnMagnitude/leveldata/GameTokens.xml b/AutomatedTesting/Levels/Physics/Collider_SameCollisionGroupDiffLayersCollide/leveldata/GameTokens.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C12868578_ForceRegion_DirectionHasNoAffectOnMagnitude/leveldata/GameTokens.xml rename to AutomatedTesting/Levels/Physics/Collider_SameCollisionGroupDiffLayersCollide/leveldata/GameTokens.xml diff --git a/AutomatedTesting/Levels/Physics/C12868578_ForceRegion_DirectionHasNoAffectOnMagnitude/leveldata/TerrainTexture.xml b/AutomatedTesting/Levels/Physics/Collider_SameCollisionGroupDiffLayersCollide/leveldata/TerrainTexture.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C12868578_ForceRegion_DirectionHasNoAffectOnMagnitude/leveldata/TerrainTexture.xml rename to AutomatedTesting/Levels/Physics/Collider_SameCollisionGroupDiffLayersCollide/leveldata/TerrainTexture.xml diff --git a/AutomatedTesting/Levels/Physics/C12905527_ForceRegion_MagnitudeDeviation/leveldata/TimeOfDay.xml b/AutomatedTesting/Levels/Physics/Collider_SameCollisionGroupDiffLayersCollide/leveldata/TimeOfDay.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C12905527_ForceRegion_MagnitudeDeviation/leveldata/TimeOfDay.xml rename to AutomatedTesting/Levels/Physics/Collider_SameCollisionGroupDiffLayersCollide/leveldata/TimeOfDay.xml diff --git a/AutomatedTesting/Levels/Physics/C13352089_RigidBodies_MaxAngularVelocity/leveldata/VegetationMap.dat b/AutomatedTesting/Levels/Physics/Collider_SameCollisionGroupDiffLayersCollide/leveldata/VegetationMap.dat similarity index 100% rename from AutomatedTesting/Levels/Physics/C13352089_RigidBodies_MaxAngularVelocity/leveldata/VegetationMap.dat rename to AutomatedTesting/Levels/Physics/Collider_SameCollisionGroupDiffLayersCollide/leveldata/VegetationMap.dat diff --git a/AutomatedTesting/Levels/Physics/C13508019_Terrain_TerrainTexturePainterWorks/tags.txt b/AutomatedTesting/Levels/Physics/Collider_SameCollisionGroupDiffLayersCollide/tags.txt similarity index 100% rename from AutomatedTesting/Levels/Physics/C13508019_Terrain_TerrainTexturePainterWorks/tags.txt rename to AutomatedTesting/Levels/Physics/Collider_SameCollisionGroupDiffLayersCollide/tags.txt diff --git a/AutomatedTesting/Levels/Physics/C14976307_Gravity_SetGravityWorks/terrain/terrain.pxheightfield b/AutomatedTesting/Levels/Physics/Collider_SameCollisionGroupDiffLayersCollide/terrain/terrain.pxheightfield similarity index 100% rename from AutomatedTesting/Levels/Physics/C14976307_Gravity_SetGravityWorks/terrain/terrain.pxheightfield rename to AutomatedTesting/Levels/Physics/Collider_SameCollisionGroupDiffLayersCollide/terrain/terrain.pxheightfield diff --git a/AutomatedTesting/Levels/Physics/C13895144_Ragdoll_NoRagdoll/terraintexture.pak b/AutomatedTesting/Levels/Physics/Collider_SameCollisionGroupDiffLayersCollide/terraintexture.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C13895144_Ragdoll_NoRagdoll/terraintexture.pak rename to AutomatedTesting/Levels/Physics/Collider_SameCollisionGroupDiffLayersCollide/terraintexture.pak diff --git a/AutomatedTesting/Levels/Physics/C4976244_Collider_SameGroupSameLayerCollision/C4976244_Collider_SameGroupSameLayerCollision.ly b/AutomatedTesting/Levels/Physics/Collider_SameCollisionGroupSameCustomLayerCollide/Collider_SameCollisionGroupSameCustomLayerCollide.ly similarity index 100% rename from AutomatedTesting/Levels/Physics/C4976244_Collider_SameGroupSameLayerCollision/C4976244_Collider_SameGroupSameLayerCollision.ly rename to AutomatedTesting/Levels/Physics/Collider_SameCollisionGroupSameCustomLayerCollide/Collider_SameCollisionGroupSameCustomLayerCollide.ly diff --git a/AutomatedTesting/Levels/Physics/C4976244_Collider_SameGroupSameLayerCollision/filelist.xml b/AutomatedTesting/Levels/Physics/Collider_SameCollisionGroupSameCustomLayerCollide/filelist.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C4976244_Collider_SameGroupSameLayerCollision/filelist.xml rename to AutomatedTesting/Levels/Physics/Collider_SameCollisionGroupSameCustomLayerCollide/filelist.xml diff --git a/AutomatedTesting/Levels/Physics/C4976244_Collider_SameGroupSameLayerCollision/level.pak b/AutomatedTesting/Levels/Physics/Collider_SameCollisionGroupSameCustomLayerCollide/level.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C4976244_Collider_SameGroupSameLayerCollision/level.pak rename to AutomatedTesting/Levels/Physics/Collider_SameCollisionGroupSameCustomLayerCollide/level.pak diff --git a/AutomatedTesting/Levels/Physics/C13508019_Terrain_TerrainTexturePainterWorks/leveldata/Environment.xml b/AutomatedTesting/Levels/Physics/Collider_SameCollisionGroupSameCustomLayerCollide/leveldata/Environment.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C13508019_Terrain_TerrainTexturePainterWorks/leveldata/Environment.xml rename to AutomatedTesting/Levels/Physics/Collider_SameCollisionGroupSameCustomLayerCollide/leveldata/Environment.xml diff --git a/AutomatedTesting/Levels/Physics/C12868580_ForceRegion_SplineModifiedTransform/leveldata/GameTokens.xml b/AutomatedTesting/Levels/Physics/Collider_SameCollisionGroupSameCustomLayerCollide/leveldata/GameTokens.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C12868580_ForceRegion_SplineModifiedTransform/leveldata/GameTokens.xml rename to AutomatedTesting/Levels/Physics/Collider_SameCollisionGroupSameCustomLayerCollide/leveldata/GameTokens.xml diff --git a/AutomatedTesting/Levels/Physics/C12905527_ForceRegion_MagnitudeDeviation/leveldata/TerrainTexture.xml b/AutomatedTesting/Levels/Physics/Collider_SameCollisionGroupSameCustomLayerCollide/leveldata/TerrainTexture.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C12905527_ForceRegion_MagnitudeDeviation/leveldata/TerrainTexture.xml rename to AutomatedTesting/Levels/Physics/Collider_SameCollisionGroupSameCustomLayerCollide/leveldata/TerrainTexture.xml diff --git a/AutomatedTesting/Levels/Physics/C4976227_Collider_NewGroup/leveldata/TimeOfDay.xml b/AutomatedTesting/Levels/Physics/Collider_SameCollisionGroupSameCustomLayerCollide/leveldata/TimeOfDay.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C4976227_Collider_NewGroup/leveldata/TimeOfDay.xml rename to AutomatedTesting/Levels/Physics/Collider_SameCollisionGroupSameCustomLayerCollide/leveldata/TimeOfDay.xml diff --git a/AutomatedTesting/Levels/Physics/C13508019_Terrain_TerrainTexturePainterWorks/leveldata/VegetationMap.dat b/AutomatedTesting/Levels/Physics/Collider_SameCollisionGroupSameCustomLayerCollide/leveldata/VegetationMap.dat similarity index 100% rename from AutomatedTesting/Levels/Physics/C13508019_Terrain_TerrainTexturePainterWorks/leveldata/VegetationMap.dat rename to AutomatedTesting/Levels/Physics/Collider_SameCollisionGroupSameCustomLayerCollide/leveldata/VegetationMap.dat diff --git a/AutomatedTesting/Levels/Physics/C13895144_Ragdoll_NoRagdoll/tags.txt b/AutomatedTesting/Levels/Physics/Collider_SameCollisionGroupSameCustomLayerCollide/tags.txt similarity index 100% rename from AutomatedTesting/Levels/Physics/C13895144_Ragdoll_NoRagdoll/tags.txt rename to AutomatedTesting/Levels/Physics/Collider_SameCollisionGroupSameCustomLayerCollide/tags.txt diff --git a/AutomatedTesting/Levels/Physics/C13895144_Ragdoll_WithRagdoll/terraintexture.pak b/AutomatedTesting/Levels/Physics/Collider_SameCollisionGroupSameCustomLayerCollide/terraintexture.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C13895144_Ragdoll_WithRagdoll/terraintexture.pak rename to AutomatedTesting/Levels/Physics/Collider_SameCollisionGroupSameCustomLayerCollide/terraintexture.pak diff --git a/AutomatedTesting/Levels/Physics/C4976242_Collision_SameCollisionlayerSameCollisiongroup/C4976242_Collision_SameCollisionlayerSameCollisiongroup.ly b/AutomatedTesting/Levels/Physics/Collider_SameCollisionGroupSameLayerCollide/Collider_SameCollisionGroupSameLayerCollide.ly similarity index 100% rename from AutomatedTesting/Levels/Physics/C4976242_Collision_SameCollisionlayerSameCollisiongroup/C4976242_Collision_SameCollisionlayerSameCollisiongroup.ly rename to AutomatedTesting/Levels/Physics/Collider_SameCollisionGroupSameLayerCollide/Collider_SameCollisionGroupSameLayerCollide.ly diff --git a/AutomatedTesting/Levels/Physics/C4976242_Collision_SameCollisionlayerSameCollisiongroup/filelist.xml b/AutomatedTesting/Levels/Physics/Collider_SameCollisionGroupSameLayerCollide/filelist.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C4976242_Collision_SameCollisionlayerSameCollisiongroup/filelist.xml rename to AutomatedTesting/Levels/Physics/Collider_SameCollisionGroupSameLayerCollide/filelist.xml diff --git a/AutomatedTesting/Levels/Physics/C4976242_Collision_SameCollisionlayerSameCollisiongroup/level.pak b/AutomatedTesting/Levels/Physics/Collider_SameCollisionGroupSameLayerCollide/level.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C4976242_Collision_SameCollisionlayerSameCollisiongroup/level.pak rename to AutomatedTesting/Levels/Physics/Collider_SameCollisionGroupSameLayerCollide/level.pak diff --git a/AutomatedTesting/Levels/Physics/C13895144_Ragdoll_NoRagdoll/leveldata/Environment.xml b/AutomatedTesting/Levels/Physics/Collider_SameCollisionGroupSameLayerCollide/leveldata/Environment.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C13895144_Ragdoll_NoRagdoll/leveldata/Environment.xml rename to AutomatedTesting/Levels/Physics/Collider_SameCollisionGroupSameLayerCollide/leveldata/Environment.xml diff --git a/AutomatedTesting/Levels/Physics/C12905527_ForceRegion_MagnitudeDeviation/leveldata/GameTokens.xml b/AutomatedTesting/Levels/Physics/Collider_SameCollisionGroupSameLayerCollide/leveldata/GameTokens.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C12905527_ForceRegion_MagnitudeDeviation/leveldata/GameTokens.xml rename to AutomatedTesting/Levels/Physics/Collider_SameCollisionGroupSameLayerCollide/leveldata/GameTokens.xml diff --git a/AutomatedTesting/Levels/Physics/C13351703_COM_NotIncludeTriggerShapes/leveldata/TerrainTexture.xml b/AutomatedTesting/Levels/Physics/Collider_SameCollisionGroupSameLayerCollide/leveldata/TerrainTexture.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C13351703_COM_NotIncludeTriggerShapes/leveldata/TerrainTexture.xml rename to AutomatedTesting/Levels/Physics/Collider_SameCollisionGroupSameLayerCollide/leveldata/TerrainTexture.xml diff --git a/AutomatedTesting/Levels/Physics/C13351703_COM_NotIncludeTriggerShapes/leveldata/TimeOfDay.xml b/AutomatedTesting/Levels/Physics/Collider_SameCollisionGroupSameLayerCollide/leveldata/TimeOfDay.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C13351703_COM_NotIncludeTriggerShapes/leveldata/TimeOfDay.xml rename to AutomatedTesting/Levels/Physics/Collider_SameCollisionGroupSameLayerCollide/leveldata/TimeOfDay.xml diff --git a/AutomatedTesting/Levels/Physics/C13895144_Ragdoll_NoRagdoll/leveldata/VegetationMap.dat b/AutomatedTesting/Levels/Physics/Collider_SameCollisionGroupSameLayerCollide/leveldata/VegetationMap.dat similarity index 100% rename from AutomatedTesting/Levels/Physics/C13895144_Ragdoll_NoRagdoll/leveldata/VegetationMap.dat rename to AutomatedTesting/Levels/Physics/Collider_SameCollisionGroupSameLayerCollide/leveldata/VegetationMap.dat diff --git a/AutomatedTesting/Levels/Physics/C13895144_Ragdoll_WithRagdoll/tags.txt b/AutomatedTesting/Levels/Physics/Collider_SameCollisionGroupSameLayerCollide/tags.txt similarity index 100% rename from AutomatedTesting/Levels/Physics/C13895144_Ragdoll_WithRagdoll/tags.txt rename to AutomatedTesting/Levels/Physics/Collider_SameCollisionGroupSameLayerCollide/tags.txt diff --git a/AutomatedTesting/Levels/Physics/C15096732_Material_DefaultLibraryUpdatedAcrossLevels/0/terrain/terrain.pxheightfield b/AutomatedTesting/Levels/Physics/Collider_SameCollisionGroupSameLayerCollide/terrain/terrain.pxheightfield similarity index 100% rename from AutomatedTesting/Levels/Physics/C15096732_Material_DefaultLibraryUpdatedAcrossLevels/0/terrain/terrain.pxheightfield rename to AutomatedTesting/Levels/Physics/Collider_SameCollisionGroupSameLayerCollide/terrain/terrain.pxheightfield diff --git a/AutomatedTesting/Levels/Physics/C14195074_ScriptCanvas_PostUpdateEvent/terraintexture.pak b/AutomatedTesting/Levels/Physics/Collider_SameCollisionGroupSameLayerCollide/terraintexture.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C14195074_ScriptCanvas_PostUpdateEvent/terraintexture.pak rename to AutomatedTesting/Levels/Physics/Collider_SameCollisionGroupSameLayerCollide/terraintexture.pak diff --git a/AutomatedTesting/Levels/Physics/C4982595_Collider_TriggerDisablesCollision/C4982595_Collider_TriggerDisablesCollision.ly b/AutomatedTesting/Levels/Physics/Collider_TriggerPassThrough/Collider_TriggerPassThrough.ly similarity index 100% rename from AutomatedTesting/Levels/Physics/C4982595_Collider_TriggerDisablesCollision/C4982595_Collider_TriggerDisablesCollision.ly rename to AutomatedTesting/Levels/Physics/Collider_TriggerPassThrough/Collider_TriggerPassThrough.ly diff --git a/AutomatedTesting/Levels/Physics/C4982595_Collider_TriggerDisablesCollision/filelist.xml b/AutomatedTesting/Levels/Physics/Collider_TriggerPassThrough/filelist.xml similarity index 70% rename from AutomatedTesting/Levels/Physics/C4982595_Collider_TriggerDisablesCollision/filelist.xml rename to AutomatedTesting/Levels/Physics/Collider_TriggerPassThrough/filelist.xml index 19fe8b0f44..34e3bb4651 100644 --- a/AutomatedTesting/Levels/Physics/C4982595_Collider_TriggerDisablesCollision/filelist.xml +++ b/AutomatedTesting/Levels/Physics/Collider_TriggerPassThrough/filelist.xml @@ -1,4 +1,4 @@ - + diff --git a/AutomatedTesting/Levels/Physics/C4982595_Collider_TriggerDisablesCollision/level.pak b/AutomatedTesting/Levels/Physics/Collider_TriggerPassThrough/level.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C4982595_Collider_TriggerDisablesCollision/level.pak rename to AutomatedTesting/Levels/Physics/Collider_TriggerPassThrough/level.pak diff --git a/AutomatedTesting/Levels/Physics/C13895144_Ragdoll_WithRagdoll/leveldata/Environment.xml b/AutomatedTesting/Levels/Physics/Collider_TriggerPassThrough/leveldata/Environment.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C13895144_Ragdoll_WithRagdoll/leveldata/Environment.xml rename to AutomatedTesting/Levels/Physics/Collider_TriggerPassThrough/leveldata/Environment.xml diff --git a/AutomatedTesting/Levels/Physics/C13351703_COM_NotIncludeTriggerShapes/leveldata/GameTokens.xml b/AutomatedTesting/Levels/Physics/Collider_TriggerPassThrough/leveldata/GameTokens.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C13351703_COM_NotIncludeTriggerShapes/leveldata/GameTokens.xml rename to AutomatedTesting/Levels/Physics/Collider_TriggerPassThrough/leveldata/GameTokens.xml diff --git a/AutomatedTesting/Levels/Physics/C14861498_ConfirmError_NoPxMesh/leveldata/TerrainTexture.xml b/AutomatedTesting/Levels/Physics/Collider_TriggerPassThrough/leveldata/TerrainTexture.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C14861498_ConfirmError_NoPxMesh/leveldata/TerrainTexture.xml rename to AutomatedTesting/Levels/Physics/Collider_TriggerPassThrough/leveldata/TerrainTexture.xml diff --git a/AutomatedTesting/Levels/Physics/C13352089_RigidBodies_MaxAngularVelocity/leveldata/TimeOfDay.xml b/AutomatedTesting/Levels/Physics/Collider_TriggerPassThrough/leveldata/TimeOfDay.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C13352089_RigidBodies_MaxAngularVelocity/leveldata/TimeOfDay.xml rename to AutomatedTesting/Levels/Physics/Collider_TriggerPassThrough/leveldata/TimeOfDay.xml diff --git a/AutomatedTesting/Levels/Physics/C13895144_Ragdoll_WithRagdoll/leveldata/VegetationMap.dat b/AutomatedTesting/Levels/Physics/Collider_TriggerPassThrough/leveldata/VegetationMap.dat similarity index 100% rename from AutomatedTesting/Levels/Physics/C13895144_Ragdoll_WithRagdoll/leveldata/VegetationMap.dat rename to AutomatedTesting/Levels/Physics/Collider_TriggerPassThrough/leveldata/VegetationMap.dat diff --git a/AutomatedTesting/Levels/Physics/C14195074_ScriptCanvas_PostUpdateEvent/tags.txt b/AutomatedTesting/Levels/Physics/Collider_TriggerPassThrough/tags.txt similarity index 100% rename from AutomatedTesting/Levels/Physics/C14195074_ScriptCanvas_PostUpdateEvent/tags.txt rename to AutomatedTesting/Levels/Physics/Collider_TriggerPassThrough/tags.txt diff --git a/AutomatedTesting/Levels/Physics/C14654881_CharacterController_SwitchLevels/terraintexture.pak b/AutomatedTesting/Levels/Physics/Collider_TriggerPassThrough/terraintexture.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C14654881_CharacterController_SwitchLevels/terraintexture.pak rename to AutomatedTesting/Levels/Physics/Collider_TriggerPassThrough/terraintexture.pak diff --git a/AutomatedTesting/Levels/Physics/C5959760_PhysxForceRegion_PointForceExertion/C5959760_PhysxForceRegion_PointForceExertion.ly b/AutomatedTesting/Levels/Physics/ForceRegion_CapsuleShapedForce/ForceRegion_CapsuleShapedForce.ly similarity index 100% rename from AutomatedTesting/Levels/Physics/C5959760_PhysxForceRegion_PointForceExertion/C5959760_PhysxForceRegion_PointForceExertion.ly rename to AutomatedTesting/Levels/Physics/ForceRegion_CapsuleShapedForce/ForceRegion_CapsuleShapedForce.ly diff --git a/AutomatedTesting/Levels/Physics/C5959760_PhysxForceRegion_PointForceExertion/filelist.xml b/AutomatedTesting/Levels/Physics/ForceRegion_CapsuleShapedForce/filelist.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C5959760_PhysxForceRegion_PointForceExertion/filelist.xml rename to AutomatedTesting/Levels/Physics/ForceRegion_CapsuleShapedForce/filelist.xml diff --git a/AutomatedTesting/Levels/Physics/C5959760_PhysxForceRegion_PointForceExertion/level.pak b/AutomatedTesting/Levels/Physics/ForceRegion_CapsuleShapedForce/level.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C5959760_PhysxForceRegion_PointForceExertion/level.pak rename to AutomatedTesting/Levels/Physics/ForceRegion_CapsuleShapedForce/level.pak diff --git a/AutomatedTesting/Levels/Physics/C14195074_ScriptCanvas_PostUpdateEvent/leveldata/Environment.xml b/AutomatedTesting/Levels/Physics/ForceRegion_CapsuleShapedForce/leveldata/Environment.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C14195074_ScriptCanvas_PostUpdateEvent/leveldata/Environment.xml rename to AutomatedTesting/Levels/Physics/ForceRegion_CapsuleShapedForce/leveldata/Environment.xml diff --git a/AutomatedTesting/Levels/Physics/C13352089_RigidBodies_MaxAngularVelocity/leveldata/TerrainTexture.xml b/AutomatedTesting/Levels/Physics/ForceRegion_CapsuleShapedForce/leveldata/TerrainTexture.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C13352089_RigidBodies_MaxAngularVelocity/leveldata/TerrainTexture.xml rename to AutomatedTesting/Levels/Physics/ForceRegion_CapsuleShapedForce/leveldata/TerrainTexture.xml diff --git a/AutomatedTesting/Levels/Physics/C13508019_Terrain_TerrainTexturePainterWorks/leveldata/TimeOfDay.xml b/AutomatedTesting/Levels/Physics/ForceRegion_CapsuleShapedForce/leveldata/TimeOfDay.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C13508019_Terrain_TerrainTexturePainterWorks/leveldata/TimeOfDay.xml rename to AutomatedTesting/Levels/Physics/ForceRegion_CapsuleShapedForce/leveldata/TimeOfDay.xml diff --git a/AutomatedTesting/Levels/Physics/C14195074_ScriptCanvas_PostUpdateEvent/leveldata/VegetationMap.dat b/AutomatedTesting/Levels/Physics/ForceRegion_CapsuleShapedForce/leveldata/VegetationMap.dat similarity index 100% rename from AutomatedTesting/Levels/Physics/C14195074_ScriptCanvas_PostUpdateEvent/leveldata/VegetationMap.dat rename to AutomatedTesting/Levels/Physics/ForceRegion_CapsuleShapedForce/leveldata/VegetationMap.dat diff --git a/AutomatedTesting/Levels/Physics/C14654881_CharacterController_SwitchLevels/tags.txt b/AutomatedTesting/Levels/Physics/ForceRegion_CapsuleShapedForce/tags.txt similarity index 100% rename from AutomatedTesting/Levels/Physics/C14654881_CharacterController_SwitchLevels/tags.txt rename to AutomatedTesting/Levels/Physics/ForceRegion_CapsuleShapedForce/tags.txt diff --git a/AutomatedTesting/Levels/Physics/C14654881_CharacterController_SwitchLevelsEmpty/terraintexture.pak b/AutomatedTesting/Levels/Physics/ForceRegion_CapsuleShapedForce/terraintexture.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C14654881_CharacterController_SwitchLevelsEmpty/terraintexture.pak rename to AutomatedTesting/Levels/Physics/ForceRegion_CapsuleShapedForce/terraintexture.pak diff --git a/AutomatedTesting/Levels/Physics/C12868578_ForceRegion_DirectionHasNoAffectOnMagnitude/C12868578_ForceRegion_DirectionHasNoAffectOnMagnitude.ly b/AutomatedTesting/Levels/Physics/ForceRegion_DirectionHasNoAffectOnTotalForce/ForceRegion_DirectionHasNoAffectOnTotalForce.ly similarity index 100% rename from AutomatedTesting/Levels/Physics/C12868578_ForceRegion_DirectionHasNoAffectOnMagnitude/C12868578_ForceRegion_DirectionHasNoAffectOnMagnitude.ly rename to AutomatedTesting/Levels/Physics/ForceRegion_DirectionHasNoAffectOnTotalForce/ForceRegion_DirectionHasNoAffectOnTotalForce.ly diff --git a/AutomatedTesting/Levels/Physics/C12868578_ForceRegion_DirectionHasNoAffectOnMagnitude/filelist.xml b/AutomatedTesting/Levels/Physics/ForceRegion_DirectionHasNoAffectOnTotalForce/filelist.xml similarity index 67% rename from AutomatedTesting/Levels/Physics/C12868578_ForceRegion_DirectionHasNoAffectOnMagnitude/filelist.xml rename to AutomatedTesting/Levels/Physics/ForceRegion_DirectionHasNoAffectOnTotalForce/filelist.xml index d914822ad3..956b208b53 100644 --- a/AutomatedTesting/Levels/Physics/C12868578_ForceRegion_DirectionHasNoAffectOnMagnitude/filelist.xml +++ b/AutomatedTesting/Levels/Physics/ForceRegion_DirectionHasNoAffectOnTotalForce/filelist.xml @@ -1,4 +1,4 @@ - + diff --git a/AutomatedTesting/Levels/Physics/C12868578_ForceRegion_DirectionHasNoAffectOnMagnitude/level.pak b/AutomatedTesting/Levels/Physics/ForceRegion_DirectionHasNoAffectOnTotalForce/level.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C12868578_ForceRegion_DirectionHasNoAffectOnMagnitude/level.pak rename to AutomatedTesting/Levels/Physics/ForceRegion_DirectionHasNoAffectOnTotalForce/level.pak diff --git a/AutomatedTesting/Levels/Physics/C14654881_CharacterController_SwitchLevels/leveldata/Environment.xml b/AutomatedTesting/Levels/Physics/ForceRegion_DirectionHasNoAffectOnTotalForce/leveldata/Environment.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C14654881_CharacterController_SwitchLevels/leveldata/Environment.xml rename to AutomatedTesting/Levels/Physics/ForceRegion_DirectionHasNoAffectOnTotalForce/leveldata/Environment.xml diff --git a/AutomatedTesting/Levels/Physics/C13352089_RigidBodies_MaxAngularVelocity/leveldata/GameTokens.xml b/AutomatedTesting/Levels/Physics/ForceRegion_DirectionHasNoAffectOnTotalForce/leveldata/GameTokens.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C13352089_RigidBodies_MaxAngularVelocity/leveldata/GameTokens.xml rename to AutomatedTesting/Levels/Physics/ForceRegion_DirectionHasNoAffectOnTotalForce/leveldata/GameTokens.xml diff --git a/AutomatedTesting/Levels/Physics/C14195074_ScriptCanvas_PostUpdateEvent/leveldata/TerrainTexture.xml b/AutomatedTesting/Levels/Physics/ForceRegion_DirectionHasNoAffectOnTotalForce/leveldata/TerrainTexture.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C14195074_ScriptCanvas_PostUpdateEvent/leveldata/TerrainTexture.xml rename to AutomatedTesting/Levels/Physics/ForceRegion_DirectionHasNoAffectOnTotalForce/leveldata/TerrainTexture.xml diff --git a/AutomatedTesting/Levels/Physics/C13895144_Ragdoll_NoRagdoll/leveldata/TimeOfDay.xml b/AutomatedTesting/Levels/Physics/ForceRegion_DirectionHasNoAffectOnTotalForce/leveldata/TimeOfDay.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C13895144_Ragdoll_NoRagdoll/leveldata/TimeOfDay.xml rename to AutomatedTesting/Levels/Physics/ForceRegion_DirectionHasNoAffectOnTotalForce/leveldata/TimeOfDay.xml diff --git a/AutomatedTesting/Levels/Physics/C14654881_CharacterController_SwitchLevels/leveldata/VegetationMap.dat b/AutomatedTesting/Levels/Physics/ForceRegion_DirectionHasNoAffectOnTotalForce/leveldata/VegetationMap.dat similarity index 100% rename from AutomatedTesting/Levels/Physics/C14654881_CharacterController_SwitchLevels/leveldata/VegetationMap.dat rename to AutomatedTesting/Levels/Physics/ForceRegion_DirectionHasNoAffectOnTotalForce/leveldata/VegetationMap.dat diff --git a/AutomatedTesting/Levels/Physics/C14654881_CharacterController_SwitchLevelsEmpty/tags.txt b/AutomatedTesting/Levels/Physics/ForceRegion_DirectionHasNoAffectOnTotalForce/tags.txt similarity index 100% rename from AutomatedTesting/Levels/Physics/C14654881_CharacterController_SwitchLevelsEmpty/tags.txt rename to AutomatedTesting/Levels/Physics/ForceRegion_DirectionHasNoAffectOnTotalForce/tags.txt diff --git a/AutomatedTesting/Levels/Physics/C14654882_Ragdoll_ragdollAPTest/terraintexture.pak b/AutomatedTesting/Levels/Physics/ForceRegion_DirectionHasNoAffectOnTotalForce/terraintexture.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C14654882_Ragdoll_ragdollAPTest/terraintexture.pak rename to AutomatedTesting/Levels/Physics/ForceRegion_DirectionHasNoAffectOnTotalForce/terraintexture.pak diff --git a/AutomatedTesting/Levels/Physics/C6321601_Force_HighValuesDirectionAxes/C6321601_Force_HighValuesDirectionAxes.ly b/AutomatedTesting/Levels/Physics/ForceRegion_HighValuesDirectionAxesWorkWithNoError/ForceRegion_HighValuesDirectionAxesWorkWithNoError.ly similarity index 100% rename from AutomatedTesting/Levels/Physics/C6321601_Force_HighValuesDirectionAxes/C6321601_Force_HighValuesDirectionAxes.ly rename to AutomatedTesting/Levels/Physics/ForceRegion_HighValuesDirectionAxesWorkWithNoError/ForceRegion_HighValuesDirectionAxesWorkWithNoError.ly diff --git a/AutomatedTesting/Levels/Physics/C6321601_Force_HighValuesDirectionAxes/filelist.xml b/AutomatedTesting/Levels/Physics/ForceRegion_HighValuesDirectionAxesWorkWithNoError/filelist.xml similarity index 68% rename from AutomatedTesting/Levels/Physics/C6321601_Force_HighValuesDirectionAxes/filelist.xml rename to AutomatedTesting/Levels/Physics/ForceRegion_HighValuesDirectionAxesWorkWithNoError/filelist.xml index b1bd56c7c8..69b0c13395 100644 --- a/AutomatedTesting/Levels/Physics/C6321601_Force_HighValuesDirectionAxes/filelist.xml +++ b/AutomatedTesting/Levels/Physics/ForceRegion_HighValuesDirectionAxesWorkWithNoError/filelist.xml @@ -1,4 +1,4 @@ - + diff --git a/AutomatedTesting/Levels/Physics/C6321601_Force_HighValuesDirectionAxes/level.pak b/AutomatedTesting/Levels/Physics/ForceRegion_HighValuesDirectionAxesWorkWithNoError/level.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C6321601_Force_HighValuesDirectionAxes/level.pak rename to AutomatedTesting/Levels/Physics/ForceRegion_HighValuesDirectionAxesWorkWithNoError/level.pak diff --git a/AutomatedTesting/Levels/Physics/C14654881_CharacterController_SwitchLevelsEmpty/leveldata/Environment.xml b/AutomatedTesting/Levels/Physics/ForceRegion_HighValuesDirectionAxesWorkWithNoError/leveldata/Environment.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C14654881_CharacterController_SwitchLevelsEmpty/leveldata/Environment.xml rename to AutomatedTesting/Levels/Physics/ForceRegion_HighValuesDirectionAxesWorkWithNoError/leveldata/Environment.xml diff --git a/AutomatedTesting/Levels/Physics/C13895144_Ragdoll_NoRagdoll/leveldata/GameTokens.xml b/AutomatedTesting/Levels/Physics/ForceRegion_HighValuesDirectionAxesWorkWithNoError/leveldata/GameTokens.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C13895144_Ragdoll_NoRagdoll/leveldata/GameTokens.xml rename to AutomatedTesting/Levels/Physics/ForceRegion_HighValuesDirectionAxesWorkWithNoError/leveldata/GameTokens.xml diff --git a/AutomatedTesting/Levels/Physics/C14654881_CharacterController_SwitchLevels/leveldata/TerrainTexture.xml b/AutomatedTesting/Levels/Physics/ForceRegion_HighValuesDirectionAxesWorkWithNoError/leveldata/TerrainTexture.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C14654881_CharacterController_SwitchLevels/leveldata/TerrainTexture.xml rename to AutomatedTesting/Levels/Physics/ForceRegion_HighValuesDirectionAxesWorkWithNoError/leveldata/TerrainTexture.xml diff --git a/AutomatedTesting/Levels/Physics/C13895144_Ragdoll_WithRagdoll/leveldata/TimeOfDay.xml b/AutomatedTesting/Levels/Physics/ForceRegion_HighValuesDirectionAxesWorkWithNoError/leveldata/TimeOfDay.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C13895144_Ragdoll_WithRagdoll/leveldata/TimeOfDay.xml rename to AutomatedTesting/Levels/Physics/ForceRegion_HighValuesDirectionAxesWorkWithNoError/leveldata/TimeOfDay.xml diff --git a/AutomatedTesting/Levels/Physics/C14654881_CharacterController_SwitchLevelsEmpty/leveldata/VegetationMap.dat b/AutomatedTesting/Levels/Physics/ForceRegion_HighValuesDirectionAxesWorkWithNoError/leveldata/VegetationMap.dat similarity index 100% rename from AutomatedTesting/Levels/Physics/C14654881_CharacterController_SwitchLevelsEmpty/leveldata/VegetationMap.dat rename to AutomatedTesting/Levels/Physics/ForceRegion_HighValuesDirectionAxesWorkWithNoError/leveldata/VegetationMap.dat diff --git a/AutomatedTesting/Levels/Physics/C14654882_Ragdoll_ragdollAPTest/tags.txt b/AutomatedTesting/Levels/Physics/ForceRegion_HighValuesDirectionAxesWorkWithNoError/tags.txt similarity index 100% rename from AutomatedTesting/Levels/Physics/C14654882_Ragdoll_ragdollAPTest/tags.txt rename to AutomatedTesting/Levels/Physics/ForceRegion_HighValuesDirectionAxesWorkWithNoError/tags.txt diff --git a/AutomatedTesting/Levels/Physics/C15096732_Material_DefaultLibraryUpdatedAcrossLevels/1/terrain/terrain.pxheightfield b/AutomatedTesting/Levels/Physics/ForceRegion_HighValuesDirectionAxesWorkWithNoError/terrain/terrain.pxheightfield similarity index 100% rename from AutomatedTesting/Levels/Physics/C15096732_Material_DefaultLibraryUpdatedAcrossLevels/1/terrain/terrain.pxheightfield rename to AutomatedTesting/Levels/Physics/ForceRegion_HighValuesDirectionAxesWorkWithNoError/terrain/terrain.pxheightfield diff --git a/AutomatedTesting/Levels/Physics/C14861498_ConfirmError_NoPxMesh/terraintexture.pak b/AutomatedTesting/Levels/Physics/ForceRegion_HighValuesDirectionAxesWorkWithNoError/terraintexture.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C14861498_ConfirmError_NoPxMesh/terraintexture.pak rename to AutomatedTesting/Levels/Physics/ForceRegion_HighValuesDirectionAxesWorkWithNoError/terraintexture.pak diff --git a/AutomatedTesting/Levels/Physics/C5959763_ForceRegion_ForceRegionImpulsesCube/C5959763_ForceRegion_ForceRegionImpulsesCube.ly b/AutomatedTesting/Levels/Physics/ForceRegion_ImpulsesBoxShapedRigidBody/ForceRegion_ImpulsesBoxShapedRigidBody.ly similarity index 100% rename from AutomatedTesting/Levels/Physics/C5959763_ForceRegion_ForceRegionImpulsesCube/C5959763_ForceRegion_ForceRegionImpulsesCube.ly rename to AutomatedTesting/Levels/Physics/ForceRegion_ImpulsesBoxShapedRigidBody/ForceRegion_ImpulsesBoxShapedRigidBody.ly diff --git a/AutomatedTesting/Levels/Physics/C5959763_ForceRegion_ForceRegionImpulsesCube/filelist.xml b/AutomatedTesting/Levels/Physics/ForceRegion_ImpulsesBoxShapedRigidBody/filelist.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C5959763_ForceRegion_ForceRegionImpulsesCube/filelist.xml rename to AutomatedTesting/Levels/Physics/ForceRegion_ImpulsesBoxShapedRigidBody/filelist.xml diff --git a/AutomatedTesting/Levels/Physics/C5959763_ForceRegion_ForceRegionImpulsesCube/level.pak b/AutomatedTesting/Levels/Physics/ForceRegion_ImpulsesBoxShapedRigidBody/level.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C5959763_ForceRegion_ForceRegionImpulsesCube/level.pak rename to AutomatedTesting/Levels/Physics/ForceRegion_ImpulsesBoxShapedRigidBody/level.pak diff --git a/AutomatedTesting/Levels/Physics/C14654882_Ragdoll_ragdollAPTest/leveldata/Environment.xml b/AutomatedTesting/Levels/Physics/ForceRegion_ImpulsesBoxShapedRigidBody/leveldata/Environment.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C14654882_Ragdoll_ragdollAPTest/leveldata/Environment.xml rename to AutomatedTesting/Levels/Physics/ForceRegion_ImpulsesBoxShapedRigidBody/leveldata/Environment.xml diff --git a/AutomatedTesting/Levels/Physics/C5959763_ForceRegion_ForceRegionImpulsesCube/leveldata/TerrainTexture.xml b/AutomatedTesting/Levels/Physics/ForceRegion_ImpulsesBoxShapedRigidBody/leveldata/TerrainTexture.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C5959763_ForceRegion_ForceRegionImpulsesCube/leveldata/TerrainTexture.xml rename to AutomatedTesting/Levels/Physics/ForceRegion_ImpulsesBoxShapedRigidBody/leveldata/TerrainTexture.xml diff --git a/AutomatedTesting/Levels/Physics/C14195074_ScriptCanvas_PostUpdateEvent/leveldata/TimeOfDay.xml b/AutomatedTesting/Levels/Physics/ForceRegion_ImpulsesBoxShapedRigidBody/leveldata/TimeOfDay.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C14195074_ScriptCanvas_PostUpdateEvent/leveldata/TimeOfDay.xml rename to AutomatedTesting/Levels/Physics/ForceRegion_ImpulsesBoxShapedRigidBody/leveldata/TimeOfDay.xml diff --git a/AutomatedTesting/Levels/Physics/C14654882_Ragdoll_ragdollAPTest/leveldata/VegetationMap.dat b/AutomatedTesting/Levels/Physics/ForceRegion_ImpulsesBoxShapedRigidBody/leveldata/VegetationMap.dat similarity index 100% rename from AutomatedTesting/Levels/Physics/C14654882_Ragdoll_ragdollAPTest/leveldata/VegetationMap.dat rename to AutomatedTesting/Levels/Physics/ForceRegion_ImpulsesBoxShapedRigidBody/leveldata/VegetationMap.dat diff --git a/AutomatedTesting/Levels/Physics/C14861498_ConfirmError_NoPxMesh/tags.txt b/AutomatedTesting/Levels/Physics/ForceRegion_ImpulsesBoxShapedRigidBody/tags.txt similarity index 100% rename from AutomatedTesting/Levels/Physics/C14861498_ConfirmError_NoPxMesh/tags.txt rename to AutomatedTesting/Levels/Physics/ForceRegion_ImpulsesBoxShapedRigidBody/tags.txt diff --git a/AutomatedTesting/Levels/Physics/C14902097_ScriptCanvas_PreUpdateEvent/terraintexture.pak b/AutomatedTesting/Levels/Physics/ForceRegion_ImpulsesBoxShapedRigidBody/terraintexture.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C14902097_ScriptCanvas_PreUpdateEvent/terraintexture.pak rename to AutomatedTesting/Levels/Physics/ForceRegion_ImpulsesBoxShapedRigidBody/terraintexture.pak diff --git a/AutomatedTesting/Levels/Physics/C5959764_ForceRegion_ForceRegionImpulsesCapsule/C5959764_ForceRegion_ForceRegionImpulsesCapsule.ly b/AutomatedTesting/Levels/Physics/ForceRegion_ImpulsesCapsuleShapedRigidBody/ForceRegion_ImpulsesCapsuleShapedRigidBody.ly similarity index 100% rename from AutomatedTesting/Levels/Physics/C5959764_ForceRegion_ForceRegionImpulsesCapsule/C5959764_ForceRegion_ForceRegionImpulsesCapsule.ly rename to AutomatedTesting/Levels/Physics/ForceRegion_ImpulsesCapsuleShapedRigidBody/ForceRegion_ImpulsesCapsuleShapedRigidBody.ly diff --git a/AutomatedTesting/Levels/Physics/C5959764_ForceRegion_ForceRegionImpulsesCapsule/filelist.xml b/AutomatedTesting/Levels/Physics/ForceRegion_ImpulsesCapsuleShapedRigidBody/filelist.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C5959764_ForceRegion_ForceRegionImpulsesCapsule/filelist.xml rename to AutomatedTesting/Levels/Physics/ForceRegion_ImpulsesCapsuleShapedRigidBody/filelist.xml diff --git a/AutomatedTesting/Levels/Physics/C5959764_ForceRegion_ForceRegionImpulsesCapsule/level.pak b/AutomatedTesting/Levels/Physics/ForceRegion_ImpulsesCapsuleShapedRigidBody/level.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C5959764_ForceRegion_ForceRegionImpulsesCapsule/level.pak rename to AutomatedTesting/Levels/Physics/ForceRegion_ImpulsesCapsuleShapedRigidBody/level.pak diff --git a/AutomatedTesting/Levels/Physics/C14861498_ConfirmError_NoPxMesh/leveldata/Environment.xml b/AutomatedTesting/Levels/Physics/ForceRegion_ImpulsesCapsuleShapedRigidBody/leveldata/Environment.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C14861498_ConfirmError_NoPxMesh/leveldata/Environment.xml rename to AutomatedTesting/Levels/Physics/ForceRegion_ImpulsesCapsuleShapedRigidBody/leveldata/Environment.xml diff --git a/AutomatedTesting/Levels/Physics/C5959764_ForceRegion_ForceRegionImpulsesCapsule/leveldata/TerrainTexture.xml b/AutomatedTesting/Levels/Physics/ForceRegion_ImpulsesCapsuleShapedRigidBody/leveldata/TerrainTexture.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C5959764_ForceRegion_ForceRegionImpulsesCapsule/leveldata/TerrainTexture.xml rename to AutomatedTesting/Levels/Physics/ForceRegion_ImpulsesCapsuleShapedRigidBody/leveldata/TerrainTexture.xml diff --git a/AutomatedTesting/Levels/Physics/C14654881_CharacterController_SwitchLevels/leveldata/TimeOfDay.xml b/AutomatedTesting/Levels/Physics/ForceRegion_ImpulsesCapsuleShapedRigidBody/leveldata/TimeOfDay.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C14654881_CharacterController_SwitchLevels/leveldata/TimeOfDay.xml rename to AutomatedTesting/Levels/Physics/ForceRegion_ImpulsesCapsuleShapedRigidBody/leveldata/TimeOfDay.xml diff --git a/AutomatedTesting/Levels/Physics/C14861498_ConfirmError_NoPxMesh/leveldata/VegetationMap.dat b/AutomatedTesting/Levels/Physics/ForceRegion_ImpulsesCapsuleShapedRigidBody/leveldata/VegetationMap.dat similarity index 100% rename from AutomatedTesting/Levels/Physics/C14861498_ConfirmError_NoPxMesh/leveldata/VegetationMap.dat rename to AutomatedTesting/Levels/Physics/ForceRegion_ImpulsesCapsuleShapedRigidBody/leveldata/VegetationMap.dat diff --git a/AutomatedTesting/Levels/Physics/C14902097_ScriptCanvas_PreUpdateEvent/tags.txt b/AutomatedTesting/Levels/Physics/ForceRegion_ImpulsesCapsuleShapedRigidBody/tags.txt similarity index 100% rename from AutomatedTesting/Levels/Physics/C14902097_ScriptCanvas_PreUpdateEvent/tags.txt rename to AutomatedTesting/Levels/Physics/ForceRegion_ImpulsesCapsuleShapedRigidBody/tags.txt diff --git a/AutomatedTesting/Levels/Physics/C14902098_ScriptCanvas_PostPhysicsUpdate/terraintexture.pak b/AutomatedTesting/Levels/Physics/ForceRegion_ImpulsesCapsuleShapedRigidBody/terraintexture.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C14902098_ScriptCanvas_PostPhysicsUpdate/terraintexture.pak rename to AutomatedTesting/Levels/Physics/ForceRegion_ImpulsesCapsuleShapedRigidBody/terraintexture.pak diff --git a/AutomatedTesting/Levels/Physics/ForceRegion_ImpulsesPxMeshShapedRigidBody/ForceRegion_ImpulsesPxMeshShapedRigidBody.ly b/AutomatedTesting/Levels/Physics/ForceRegion_ImpulsesPxMeshShapedRigidBody/ForceRegion_ImpulsesPxMeshShapedRigidBody.ly new file mode 100644 index 0000000000..54d65f5de9 --- /dev/null +++ b/AutomatedTesting/Levels/Physics/ForceRegion_ImpulsesPxMeshShapedRigidBody/ForceRegion_ImpulsesPxMeshShapedRigidBody.ly @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0193686ea802c755241711f139ab82b50c4d3bf71d3f5d2f743579417af6a05e +size 6192 diff --git a/AutomatedTesting/Levels/Physics/C29032500_EditorComponents_WorldBodyBusWorks/PhysXSedan/_dev_Sedan_r0-b.fbx b/AutomatedTesting/Levels/Physics/ForceRegion_ImpulsesPxMeshShapedRigidBody/PhysXSedan/_dev_Sedan_r0-b.fbx similarity index 100% rename from AutomatedTesting/Levels/Physics/C29032500_EditorComponents_WorldBodyBusWorks/PhysXSedan/_dev_Sedan_r0-b.fbx rename to AutomatedTesting/Levels/Physics/ForceRegion_ImpulsesPxMeshShapedRigidBody/PhysXSedan/_dev_Sedan_r0-b.fbx diff --git a/AutomatedTesting/Levels/Physics/C29032500_EditorComponents_WorldBodyBusWorks/PhysXSedan/_dev_sedan_r0-b.fbx.assetinfo b/AutomatedTesting/Levels/Physics/ForceRegion_ImpulsesPxMeshShapedRigidBody/PhysXSedan/_dev_sedan_r0-b.fbx.assetinfo similarity index 100% rename from AutomatedTesting/Levels/Physics/C29032500_EditorComponents_WorldBodyBusWorks/PhysXSedan/_dev_sedan_r0-b.fbx.assetinfo rename to AutomatedTesting/Levels/Physics/ForceRegion_ImpulsesPxMeshShapedRigidBody/PhysXSedan/_dev_sedan_r0-b.fbx.assetinfo diff --git a/AutomatedTesting/Levels/Physics/C29032500_EditorComponents_WorldBodyBusWorks/PhysXSedan/_dev_sedan_r0-b.mtl b/AutomatedTesting/Levels/Physics/ForceRegion_ImpulsesPxMeshShapedRigidBody/PhysXSedan/_dev_sedan_r0-b.mtl similarity index 100% rename from AutomatedTesting/Levels/Physics/C29032500_EditorComponents_WorldBodyBusWorks/PhysXSedan/_dev_sedan_r0-b.mtl rename to AutomatedTesting/Levels/Physics/ForceRegion_ImpulsesPxMeshShapedRigidBody/PhysXSedan/_dev_sedan_r0-b.mtl diff --git a/AutomatedTesting/Levels/Physics/C5959765_ForceRegion_AssetGetsImpulsed/filelist.xml b/AutomatedTesting/Levels/Physics/ForceRegion_ImpulsesPxMeshShapedRigidBody/filelist.xml similarity index 71% rename from AutomatedTesting/Levels/Physics/C5959765_ForceRegion_AssetGetsImpulsed/filelist.xml rename to AutomatedTesting/Levels/Physics/ForceRegion_ImpulsesPxMeshShapedRigidBody/filelist.xml index 28dafb7cda..f3ee83bec8 100644 --- a/AutomatedTesting/Levels/Physics/C5959765_ForceRegion_AssetGetsImpulsed/filelist.xml +++ b/AutomatedTesting/Levels/Physics/ForceRegion_ImpulsesPxMeshShapedRigidBody/filelist.xml @@ -1,4 +1,4 @@ - + diff --git a/AutomatedTesting/Levels/Physics/C5959765_ForceRegion_AssetGetsImpulsed/level.pak b/AutomatedTesting/Levels/Physics/ForceRegion_ImpulsesPxMeshShapedRigidBody/level.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C5959765_ForceRegion_AssetGetsImpulsed/level.pak rename to AutomatedTesting/Levels/Physics/ForceRegion_ImpulsesPxMeshShapedRigidBody/level.pak diff --git a/AutomatedTesting/Levels/Physics/C14902097_ScriptCanvas_PreUpdateEvent/leveldata/Environment.xml b/AutomatedTesting/Levels/Physics/ForceRegion_ImpulsesPxMeshShapedRigidBody/leveldata/Environment.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C14902097_ScriptCanvas_PreUpdateEvent/leveldata/Environment.xml rename to AutomatedTesting/Levels/Physics/ForceRegion_ImpulsesPxMeshShapedRigidBody/leveldata/Environment.xml diff --git a/AutomatedTesting/Levels/Physics/C5932042_PhysxForceRegion_LinearDamping/leveldata/TerrainTexture.xml b/AutomatedTesting/Levels/Physics/ForceRegion_ImpulsesPxMeshShapedRigidBody/leveldata/TerrainTexture.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C5932042_PhysxForceRegion_LinearDamping/leveldata/TerrainTexture.xml rename to AutomatedTesting/Levels/Physics/ForceRegion_ImpulsesPxMeshShapedRigidBody/leveldata/TerrainTexture.xml diff --git a/AutomatedTesting/Levels/Physics/C14654881_CharacterController_SwitchLevelsEmpty/leveldata/TimeOfDay.xml b/AutomatedTesting/Levels/Physics/ForceRegion_ImpulsesPxMeshShapedRigidBody/leveldata/TimeOfDay.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C14654881_CharacterController_SwitchLevelsEmpty/leveldata/TimeOfDay.xml rename to AutomatedTesting/Levels/Physics/ForceRegion_ImpulsesPxMeshShapedRigidBody/leveldata/TimeOfDay.xml diff --git a/AutomatedTesting/Levels/Physics/C14902097_ScriptCanvas_PreUpdateEvent/leveldata/VegetationMap.dat b/AutomatedTesting/Levels/Physics/ForceRegion_ImpulsesPxMeshShapedRigidBody/leveldata/VegetationMap.dat similarity index 100% rename from AutomatedTesting/Levels/Physics/C14902097_ScriptCanvas_PreUpdateEvent/leveldata/VegetationMap.dat rename to AutomatedTesting/Levels/Physics/ForceRegion_ImpulsesPxMeshShapedRigidBody/leveldata/VegetationMap.dat diff --git a/AutomatedTesting/Levels/Physics/C14902098_ScriptCanvas_PostPhysicsUpdate/tags.txt b/AutomatedTesting/Levels/Physics/ForceRegion_ImpulsesPxMeshShapedRigidBody/tags.txt similarity index 100% rename from AutomatedTesting/Levels/Physics/C14902098_ScriptCanvas_PostPhysicsUpdate/tags.txt rename to AutomatedTesting/Levels/Physics/ForceRegion_ImpulsesPxMeshShapedRigidBody/tags.txt diff --git a/AutomatedTesting/Levels/Physics/C14976307_Gravity_SetGravityWorks/terraintexture.pak b/AutomatedTesting/Levels/Physics/ForceRegion_ImpulsesPxMeshShapedRigidBody/terraintexture.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C14976307_Gravity_SetGravityWorks/terraintexture.pak rename to AutomatedTesting/Levels/Physics/ForceRegion_ImpulsesPxMeshShapedRigidBody/terraintexture.pak diff --git a/AutomatedTesting/Levels/Physics/C5932042_PhysxForceRegion_LinearDamping/C5932042_PhysxForceRegion_LinearDamping.ly b/AutomatedTesting/Levels/Physics/ForceRegion_LinearDampingForceOnRigidBodies/ForceRegion_LinearDampingForceOnRigidBodies.ly similarity index 100% rename from AutomatedTesting/Levels/Physics/C5932042_PhysxForceRegion_LinearDamping/C5932042_PhysxForceRegion_LinearDamping.ly rename to AutomatedTesting/Levels/Physics/ForceRegion_LinearDampingForceOnRigidBodies/ForceRegion_LinearDampingForceOnRigidBodies.ly diff --git a/AutomatedTesting/Levels/Physics/C5932042_PhysxForceRegion_LinearDamping/filelist.xml b/AutomatedTesting/Levels/Physics/ForceRegion_LinearDampingForceOnRigidBodies/filelist.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C5932042_PhysxForceRegion_LinearDamping/filelist.xml rename to AutomatedTesting/Levels/Physics/ForceRegion_LinearDampingForceOnRigidBodies/filelist.xml diff --git a/AutomatedTesting/Levels/Physics/C5932042_PhysxForceRegion_LinearDamping/level.pak b/AutomatedTesting/Levels/Physics/ForceRegion_LinearDampingForceOnRigidBodies/level.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C5932042_PhysxForceRegion_LinearDamping/level.pak rename to AutomatedTesting/Levels/Physics/ForceRegion_LinearDampingForceOnRigidBodies/level.pak diff --git a/AutomatedTesting/Levels/Physics/C14902098_ScriptCanvas_PostPhysicsUpdate/leveldata/Environment.xml b/AutomatedTesting/Levels/Physics/ForceRegion_LinearDampingForceOnRigidBodies/leveldata/Environment.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C14902098_ScriptCanvas_PostPhysicsUpdate/leveldata/Environment.xml rename to AutomatedTesting/Levels/Physics/ForceRegion_LinearDampingForceOnRigidBodies/leveldata/Environment.xml diff --git a/AutomatedTesting/Levels/Physics/C5932043_ForceRegion_SimpleDragOnRigidBody/leveldata/TerrainTexture.xml b/AutomatedTesting/Levels/Physics/ForceRegion_LinearDampingForceOnRigidBodies/leveldata/TerrainTexture.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C5932043_ForceRegion_SimpleDragOnRigidBody/leveldata/TerrainTexture.xml rename to AutomatedTesting/Levels/Physics/ForceRegion_LinearDampingForceOnRigidBodies/leveldata/TerrainTexture.xml diff --git a/AutomatedTesting/Levels/Physics/C14654882_Ragdoll_ragdollAPTest/leveldata/TimeOfDay.xml b/AutomatedTesting/Levels/Physics/ForceRegion_LinearDampingForceOnRigidBodies/leveldata/TimeOfDay.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C14654882_Ragdoll_ragdollAPTest/leveldata/TimeOfDay.xml rename to AutomatedTesting/Levels/Physics/ForceRegion_LinearDampingForceOnRigidBodies/leveldata/TimeOfDay.xml diff --git a/AutomatedTesting/Levels/Physics/C14902098_ScriptCanvas_PostPhysicsUpdate/leveldata/VegetationMap.dat b/AutomatedTesting/Levels/Physics/ForceRegion_LinearDampingForceOnRigidBodies/leveldata/VegetationMap.dat similarity index 100% rename from AutomatedTesting/Levels/Physics/C14902098_ScriptCanvas_PostPhysicsUpdate/leveldata/VegetationMap.dat rename to AutomatedTesting/Levels/Physics/ForceRegion_LinearDampingForceOnRigidBodies/leveldata/VegetationMap.dat diff --git a/AutomatedTesting/Levels/Physics/C14976307_Gravity_SetGravityWorks/tags.txt b/AutomatedTesting/Levels/Physics/ForceRegion_LinearDampingForceOnRigidBodies/tags.txt similarity index 100% rename from AutomatedTesting/Levels/Physics/C14976307_Gravity_SetGravityWorks/tags.txt rename to AutomatedTesting/Levels/Physics/ForceRegion_LinearDampingForceOnRigidBodies/tags.txt diff --git a/AutomatedTesting/Levels/Physics/C14976308_ScriptCanvas_SetKinematicTargetTransform/terraintexture.pak b/AutomatedTesting/Levels/Physics/ForceRegion_LinearDampingForceOnRigidBodies/terraintexture.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C14976308_ScriptCanvas_SetKinematicTargetTransform/terraintexture.pak rename to AutomatedTesting/Levels/Physics/ForceRegion_LinearDampingForceOnRigidBodies/terraintexture.pak diff --git a/AutomatedTesting/Levels/Physics/C5932041_PhysXForceRegion_LocalSpaceForceOnRigidBodies/C5932041_PhysXForceRegion_LocalSpaceForceOnRigidBodies.ly b/AutomatedTesting/Levels/Physics/ForceRegion_LocalSpaceForceOnRigidBodies/ForceRegion_LocalSpaceForceOnRigidBodies.ly similarity index 100% rename from AutomatedTesting/Levels/Physics/C5932041_PhysXForceRegion_LocalSpaceForceOnRigidBodies/C5932041_PhysXForceRegion_LocalSpaceForceOnRigidBodies.ly rename to AutomatedTesting/Levels/Physics/ForceRegion_LocalSpaceForceOnRigidBodies/ForceRegion_LocalSpaceForceOnRigidBodies.ly diff --git a/AutomatedTesting/Levels/Physics/C5932041_PhysXForceRegion_LocalSpaceForceOnRigidBodies/filelist.xml b/AutomatedTesting/Levels/Physics/ForceRegion_LocalSpaceForceOnRigidBodies/filelist.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C5932041_PhysXForceRegion_LocalSpaceForceOnRigidBodies/filelist.xml rename to AutomatedTesting/Levels/Physics/ForceRegion_LocalSpaceForceOnRigidBodies/filelist.xml diff --git a/AutomatedTesting/Levels/Physics/C5932041_PhysXForceRegion_LocalSpaceForceOnRigidBodies/level.pak b/AutomatedTesting/Levels/Physics/ForceRegion_LocalSpaceForceOnRigidBodies/level.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C5932041_PhysXForceRegion_LocalSpaceForceOnRigidBodies/level.pak rename to AutomatedTesting/Levels/Physics/ForceRegion_LocalSpaceForceOnRigidBodies/level.pak diff --git a/AutomatedTesting/Levels/Physics/C14976307_Gravity_SetGravityWorks/leveldata/Environment.xml b/AutomatedTesting/Levels/Physics/ForceRegion_LocalSpaceForceOnRigidBodies/leveldata/Environment.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C14976307_Gravity_SetGravityWorks/leveldata/Environment.xml rename to AutomatedTesting/Levels/Physics/ForceRegion_LocalSpaceForceOnRigidBodies/leveldata/Environment.xml diff --git a/AutomatedTesting/Levels/Physics/C14976308_ScriptCanvas_SetKinematicTargetTransform/leveldata/TerrainTexture.xml b/AutomatedTesting/Levels/Physics/ForceRegion_LocalSpaceForceOnRigidBodies/leveldata/TerrainTexture.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C14976308_ScriptCanvas_SetKinematicTargetTransform/leveldata/TerrainTexture.xml rename to AutomatedTesting/Levels/Physics/ForceRegion_LocalSpaceForceOnRigidBodies/leveldata/TerrainTexture.xml diff --git a/AutomatedTesting/Levels/Physics/C14861498_ConfirmError_NoPxMesh/leveldata/TimeOfDay.xml b/AutomatedTesting/Levels/Physics/ForceRegion_LocalSpaceForceOnRigidBodies/leveldata/TimeOfDay.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C14861498_ConfirmError_NoPxMesh/leveldata/TimeOfDay.xml rename to AutomatedTesting/Levels/Physics/ForceRegion_LocalSpaceForceOnRigidBodies/leveldata/TimeOfDay.xml diff --git a/AutomatedTesting/Levels/Physics/C14976307_Gravity_SetGravityWorks/leveldata/VegetationMap.dat b/AutomatedTesting/Levels/Physics/ForceRegion_LocalSpaceForceOnRigidBodies/leveldata/VegetationMap.dat similarity index 100% rename from AutomatedTesting/Levels/Physics/C14976307_Gravity_SetGravityWorks/leveldata/VegetationMap.dat rename to AutomatedTesting/Levels/Physics/ForceRegion_LocalSpaceForceOnRigidBodies/leveldata/VegetationMap.dat diff --git a/AutomatedTesting/Levels/Physics/C14976308_ScriptCanvas_SetKinematicTargetTransform/tags.txt b/AutomatedTesting/Levels/Physics/ForceRegion_LocalSpaceForceOnRigidBodies/tags.txt similarity index 100% rename from AutomatedTesting/Levels/Physics/C14976308_ScriptCanvas_SetKinematicTargetTransform/tags.txt rename to AutomatedTesting/Levels/Physics/ForceRegion_LocalSpaceForceOnRigidBodies/tags.txt diff --git a/AutomatedTesting/Levels/Physics/C15308217_NoCrash_LevelSwitchWithOutTerrain/terraintexture.pak b/AutomatedTesting/Levels/Physics/ForceRegion_LocalSpaceForceOnRigidBodies/terraintexture.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C15308217_NoCrash_LevelSwitchWithOutTerrain/terraintexture.pak rename to AutomatedTesting/Levels/Physics/ForceRegion_LocalSpaceForceOnRigidBodies/terraintexture.pak diff --git a/AutomatedTesting/Levels/Physics/C5968760_ForceRegion_CheckNetForceChange/C5968760_ForceRegion_CheckNetForceChange.ly b/AutomatedTesting/Levels/Physics/ForceRegion_MovingForceRegionChangesNetForce/ForceRegion_MovingForceRegionChangesNetForce.ly similarity index 100% rename from AutomatedTesting/Levels/Physics/C5968760_ForceRegion_CheckNetForceChange/C5968760_ForceRegion_CheckNetForceChange.ly rename to AutomatedTesting/Levels/Physics/ForceRegion_MovingForceRegionChangesNetForce/ForceRegion_MovingForceRegionChangesNetForce.ly diff --git a/AutomatedTesting/Levels/Physics/C5968760_ForceRegion_CheckNetForceChange/filelist.xml b/AutomatedTesting/Levels/Physics/ForceRegion_MovingForceRegionChangesNetForce/filelist.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C5968760_ForceRegion_CheckNetForceChange/filelist.xml rename to AutomatedTesting/Levels/Physics/ForceRegion_MovingForceRegionChangesNetForce/filelist.xml diff --git a/AutomatedTesting/Levels/Physics/C5968760_ForceRegion_CheckNetForceChange/level.pak b/AutomatedTesting/Levels/Physics/ForceRegion_MovingForceRegionChangesNetForce/level.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C5968760_ForceRegion_CheckNetForceChange/level.pak rename to AutomatedTesting/Levels/Physics/ForceRegion_MovingForceRegionChangesNetForce/level.pak diff --git a/AutomatedTesting/Levels/Physics/C14976308_ScriptCanvas_SetKinematicTargetTransform/leveldata/Environment.xml b/AutomatedTesting/Levels/Physics/ForceRegion_MovingForceRegionChangesNetForce/leveldata/Environment.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C14976308_ScriptCanvas_SetKinematicTargetTransform/leveldata/Environment.xml rename to AutomatedTesting/Levels/Physics/ForceRegion_MovingForceRegionChangesNetForce/leveldata/Environment.xml diff --git a/AutomatedTesting/Levels/Physics/C13895144_Ragdoll_WithRagdoll/leveldata/GameTokens.xml b/AutomatedTesting/Levels/Physics/ForceRegion_MovingForceRegionChangesNetForce/leveldata/GameTokens.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C13895144_Ragdoll_WithRagdoll/leveldata/GameTokens.xml rename to AutomatedTesting/Levels/Physics/ForceRegion_MovingForceRegionChangesNetForce/leveldata/GameTokens.xml diff --git a/AutomatedTesting/Levels/Physics/C14654881_CharacterController_SwitchLevelsEmpty/leveldata/TerrainTexture.xml b/AutomatedTesting/Levels/Physics/ForceRegion_MovingForceRegionChangesNetForce/leveldata/TerrainTexture.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C14654881_CharacterController_SwitchLevelsEmpty/leveldata/TerrainTexture.xml rename to AutomatedTesting/Levels/Physics/ForceRegion_MovingForceRegionChangesNetForce/leveldata/TerrainTexture.xml diff --git a/AutomatedTesting/Levels/Physics/C14902097_ScriptCanvas_PreUpdateEvent/leveldata/TimeOfDay.xml b/AutomatedTesting/Levels/Physics/ForceRegion_MovingForceRegionChangesNetForce/leveldata/TimeOfDay.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C14902097_ScriptCanvas_PreUpdateEvent/leveldata/TimeOfDay.xml rename to AutomatedTesting/Levels/Physics/ForceRegion_MovingForceRegionChangesNetForce/leveldata/TimeOfDay.xml diff --git a/AutomatedTesting/Levels/Physics/C14976308_ScriptCanvas_SetKinematicTargetTransform/leveldata/VegetationMap.dat b/AutomatedTesting/Levels/Physics/ForceRegion_MovingForceRegionChangesNetForce/leveldata/VegetationMap.dat similarity index 100% rename from AutomatedTesting/Levels/Physics/C14976308_ScriptCanvas_SetKinematicTargetTransform/leveldata/VegetationMap.dat rename to AutomatedTesting/Levels/Physics/ForceRegion_MovingForceRegionChangesNetForce/leveldata/VegetationMap.dat diff --git a/AutomatedTesting/Levels/Physics/C15096732_Material_DefaultLibraryUpdatedAcrossLevels/0/tags.txt b/AutomatedTesting/Levels/Physics/ForceRegion_MovingForceRegionChangesNetForce/tags.txt similarity index 100% rename from AutomatedTesting/Levels/Physics/C15096732_Material_DefaultLibraryUpdatedAcrossLevels/0/tags.txt rename to AutomatedTesting/Levels/Physics/ForceRegion_MovingForceRegionChangesNetForce/tags.txt diff --git a/AutomatedTesting/Levels/Physics/C15308217_NoCrash_LevelSwitchWithTerrain/terraintexture.pak b/AutomatedTesting/Levels/Physics/ForceRegion_MovingForceRegionChangesNetForce/terraintexture.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C15308217_NoCrash_LevelSwitchWithTerrain/terraintexture.pak rename to AutomatedTesting/Levels/Physics/ForceRegion_MovingForceRegionChangesNetForce/terraintexture.pak diff --git a/AutomatedTesting/Levels/Physics/C5968759_ForceRegion_ExertsSeveralForcesOnRigidBody/C5968759_ForceRegion_ExertsSeveralForcesOnRigidBody.ly b/AutomatedTesting/Levels/Physics/ForceRegion_MultipleComponentsCombineForces/ForceRegion_MultipleComponentsCombineForces.ly similarity index 100% rename from AutomatedTesting/Levels/Physics/C5968759_ForceRegion_ExertsSeveralForcesOnRigidBody/C5968759_ForceRegion_ExertsSeveralForcesOnRigidBody.ly rename to AutomatedTesting/Levels/Physics/ForceRegion_MultipleComponentsCombineForces/ForceRegion_MultipleComponentsCombineForces.ly diff --git a/AutomatedTesting/Levels/Physics/C5968759_ForceRegion_ExertsSeveralForcesOnRigidBody/filelist.xml b/AutomatedTesting/Levels/Physics/ForceRegion_MultipleComponentsCombineForces/filelist.xml similarity index 68% rename from AutomatedTesting/Levels/Physics/C5968759_ForceRegion_ExertsSeveralForcesOnRigidBody/filelist.xml rename to AutomatedTesting/Levels/Physics/ForceRegion_MultipleComponentsCombineForces/filelist.xml index 8929e58de5..fd69fd64ff 100644 --- a/AutomatedTesting/Levels/Physics/C5968759_ForceRegion_ExertsSeveralForcesOnRigidBody/filelist.xml +++ b/AutomatedTesting/Levels/Physics/ForceRegion_MultipleComponentsCombineForces/filelist.xml @@ -1,4 +1,4 @@ - + diff --git a/AutomatedTesting/Levels/Physics/C5968759_ForceRegion_ExertsSeveralForcesOnRigidBody/level.pak b/AutomatedTesting/Levels/Physics/ForceRegion_MultipleComponentsCombineForces/level.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C5968759_ForceRegion_ExertsSeveralForcesOnRigidBody/level.pak rename to AutomatedTesting/Levels/Physics/ForceRegion_MultipleComponentsCombineForces/level.pak diff --git a/AutomatedTesting/Levels/Physics/C15096732_Material_DefaultLibraryUpdatedAcrossLevels/0/leveldata/Environment.xml b/AutomatedTesting/Levels/Physics/ForceRegion_MultipleComponentsCombineForces/leveldata/Environment.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C15096732_Material_DefaultLibraryUpdatedAcrossLevels/0/leveldata/Environment.xml rename to AutomatedTesting/Levels/Physics/ForceRegion_MultipleComponentsCombineForces/leveldata/Environment.xml diff --git a/AutomatedTesting/Levels/Physics/C15096735_Materials_DefaultLibraryConsistency/leveldata/TerrainTexture.xml b/AutomatedTesting/Levels/Physics/ForceRegion_MultipleComponentsCombineForces/leveldata/TerrainTexture.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C15096735_Materials_DefaultLibraryConsistency/leveldata/TerrainTexture.xml rename to AutomatedTesting/Levels/Physics/ForceRegion_MultipleComponentsCombineForces/leveldata/TerrainTexture.xml diff --git a/AutomatedTesting/Levels/Physics/C14902098_ScriptCanvas_PostPhysicsUpdate/leveldata/TimeOfDay.xml b/AutomatedTesting/Levels/Physics/ForceRegion_MultipleComponentsCombineForces/leveldata/TimeOfDay.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C14902098_ScriptCanvas_PostPhysicsUpdate/leveldata/TimeOfDay.xml rename to AutomatedTesting/Levels/Physics/ForceRegion_MultipleComponentsCombineForces/leveldata/TimeOfDay.xml diff --git a/AutomatedTesting/Levels/Physics/C15096735_Materials_DefaultLibraryConsistency/leveldata/VegetationMap.dat b/AutomatedTesting/Levels/Physics/ForceRegion_MultipleComponentsCombineForces/leveldata/VegetationMap.dat similarity index 100% rename from AutomatedTesting/Levels/Physics/C15096735_Materials_DefaultLibraryConsistency/leveldata/VegetationMap.dat rename to AutomatedTesting/Levels/Physics/ForceRegion_MultipleComponentsCombineForces/leveldata/VegetationMap.dat diff --git a/AutomatedTesting/Levels/Physics/C15096732_Material_DefaultLibraryUpdatedAcrossLevels/1/tags.txt b/AutomatedTesting/Levels/Physics/ForceRegion_MultipleComponentsCombineForces/tags.txt similarity index 100% rename from AutomatedTesting/Levels/Physics/C15096732_Material_DefaultLibraryUpdatedAcrossLevels/1/tags.txt rename to AutomatedTesting/Levels/Physics/ForceRegion_MultipleComponentsCombineForces/tags.txt diff --git a/AutomatedTesting/Levels/Physics/C15425929_Undo_Redo/terraintexture.pak b/AutomatedTesting/Levels/Physics/ForceRegion_MultipleComponentsCombineForces/terraintexture.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C15425929_Undo_Redo/terraintexture.pak rename to AutomatedTesting/Levels/Physics/ForceRegion_MultipleComponentsCombineForces/terraintexture.pak diff --git a/AutomatedTesting/Levels/Physics/C5959810_ForceRegion_ForceRegionCombinesForces/C5959810_ForceRegion_ForceRegionCombinesForces.ly b/AutomatedTesting/Levels/Physics/ForceRegion_MultipleForcesInSameComponentCombineForces/ForceRegion_MultipleForcesInSameComponentCombineForces.ly similarity index 100% rename from AutomatedTesting/Levels/Physics/C5959810_ForceRegion_ForceRegionCombinesForces/C5959810_ForceRegion_ForceRegionCombinesForces.ly rename to AutomatedTesting/Levels/Physics/ForceRegion_MultipleForcesInSameComponentCombineForces/ForceRegion_MultipleForcesInSameComponentCombineForces.ly diff --git a/AutomatedTesting/Levels/Physics/C5959810_ForceRegion_ForceRegionCombinesForces/filelist.xml b/AutomatedTesting/Levels/Physics/ForceRegion_MultipleForcesInSameComponentCombineForces/filelist.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C5959810_ForceRegion_ForceRegionCombinesForces/filelist.xml rename to AutomatedTesting/Levels/Physics/ForceRegion_MultipleForcesInSameComponentCombineForces/filelist.xml diff --git a/AutomatedTesting/Levels/Physics/C5959810_ForceRegion_ForceRegionCombinesForces/level.pak b/AutomatedTesting/Levels/Physics/ForceRegion_MultipleForcesInSameComponentCombineForces/level.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C5959810_ForceRegion_ForceRegionCombinesForces/level.pak rename to AutomatedTesting/Levels/Physics/ForceRegion_MultipleForcesInSameComponentCombineForces/level.pak diff --git a/AutomatedTesting/Levels/Physics/C15096732_Material_DefaultLibraryUpdatedAcrossLevels/1/leveldata/Environment.xml b/AutomatedTesting/Levels/Physics/ForceRegion_MultipleForcesInSameComponentCombineForces/leveldata/Environment.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C15096732_Material_DefaultLibraryUpdatedAcrossLevels/1/leveldata/Environment.xml rename to AutomatedTesting/Levels/Physics/ForceRegion_MultipleForcesInSameComponentCombineForces/leveldata/Environment.xml diff --git a/AutomatedTesting/Levels/Physics/C14195074_ScriptCanvas_PostUpdateEvent/leveldata/GameTokens.xml b/AutomatedTesting/Levels/Physics/ForceRegion_MultipleForcesInSameComponentCombineForces/leveldata/GameTokens.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C14195074_ScriptCanvas_PostUpdateEvent/leveldata/GameTokens.xml rename to AutomatedTesting/Levels/Physics/ForceRegion_MultipleForcesInSameComponentCombineForces/leveldata/GameTokens.xml diff --git a/AutomatedTesting/Levels/Physics/C14654882_Ragdoll_ragdollAPTest/leveldata/TerrainTexture.xml b/AutomatedTesting/Levels/Physics/ForceRegion_MultipleForcesInSameComponentCombineForces/leveldata/TerrainTexture.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C14654882_Ragdoll_ragdollAPTest/leveldata/TerrainTexture.xml rename to AutomatedTesting/Levels/Physics/ForceRegion_MultipleForcesInSameComponentCombineForces/leveldata/TerrainTexture.xml diff --git a/AutomatedTesting/Levels/Physics/C14976308_ScriptCanvas_SetKinematicTargetTransform/leveldata/TimeOfDay.xml b/AutomatedTesting/Levels/Physics/ForceRegion_MultipleForcesInSameComponentCombineForces/leveldata/TimeOfDay.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C14976308_ScriptCanvas_SetKinematicTargetTransform/leveldata/TimeOfDay.xml rename to AutomatedTesting/Levels/Physics/ForceRegion_MultipleForcesInSameComponentCombineForces/leveldata/TimeOfDay.xml diff --git a/AutomatedTesting/Levels/Physics/C15096737_Materials_DefaultMaterialLibraryChanges/leveldata/VegetationMap.dat b/AutomatedTesting/Levels/Physics/ForceRegion_MultipleForcesInSameComponentCombineForces/leveldata/VegetationMap.dat similarity index 100% rename from AutomatedTesting/Levels/Physics/C15096737_Materials_DefaultMaterialLibraryChanges/leveldata/VegetationMap.dat rename to AutomatedTesting/Levels/Physics/ForceRegion_MultipleForcesInSameComponentCombineForces/leveldata/VegetationMap.dat diff --git a/AutomatedTesting/Levels/Physics/C15096735_Materials_DefaultLibraryConsistency/tags.txt b/AutomatedTesting/Levels/Physics/ForceRegion_MultipleForcesInSameComponentCombineForces/tags.txt similarity index 100% rename from AutomatedTesting/Levels/Physics/C15096735_Materials_DefaultLibraryConsistency/tags.txt rename to AutomatedTesting/Levels/Physics/ForceRegion_MultipleForcesInSameComponentCombineForces/tags.txt diff --git a/AutomatedTesting/Levels/Physics/C15425935_Material_LibraryUpdatedAcrossLevels/C15425935_Material_LibraryUpdatedAcrossLevels_0/terraintexture.pak b/AutomatedTesting/Levels/Physics/ForceRegion_MultipleForcesInSameComponentCombineForces/terraintexture.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C15425935_Material_LibraryUpdatedAcrossLevels/C15425935_Material_LibraryUpdatedAcrossLevels_0/terraintexture.pak rename to AutomatedTesting/Levels/Physics/ForceRegion_MultipleForcesInSameComponentCombineForces/terraintexture.pak diff --git a/AutomatedTesting/Levels/Physics/C15845879_ForceRegion_HighLinearDampingForce/C15845879_ForceRegion_HighLinearDampingForce.ly b/AutomatedTesting/Levels/Physics/ForceRegion_NoQuiverOnHighLinearDampingForce/ForceRegion_NoQuiverOnHighLinearDampingForce.ly similarity index 100% rename from AutomatedTesting/Levels/Physics/C15845879_ForceRegion_HighLinearDampingForce/C15845879_ForceRegion_HighLinearDampingForce.ly rename to AutomatedTesting/Levels/Physics/ForceRegion_NoQuiverOnHighLinearDampingForce/ForceRegion_NoQuiverOnHighLinearDampingForce.ly diff --git a/AutomatedTesting/Levels/Physics/C15845879_ForceRegion_HighLinearDampingForce/filelist.xml b/AutomatedTesting/Levels/Physics/ForceRegion_NoQuiverOnHighLinearDampingForce/filelist.xml similarity index 74% rename from AutomatedTesting/Levels/Physics/C15845879_ForceRegion_HighLinearDampingForce/filelist.xml rename to AutomatedTesting/Levels/Physics/ForceRegion_NoQuiverOnHighLinearDampingForce/filelist.xml index 039f578577..fc04d0fb26 100644 --- a/AutomatedTesting/Levels/Physics/C15845879_ForceRegion_HighLinearDampingForce/filelist.xml +++ b/AutomatedTesting/Levels/Physics/ForceRegion_NoQuiverOnHighLinearDampingForce/filelist.xml @@ -1,4 +1,4 @@ - + diff --git a/AutomatedTesting/Levels/Physics/C15845879_ForceRegion_HighLinearDampingForce/level.pak b/AutomatedTesting/Levels/Physics/ForceRegion_NoQuiverOnHighLinearDampingForce/level.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C15845879_ForceRegion_HighLinearDampingForce/level.pak rename to AutomatedTesting/Levels/Physics/ForceRegion_NoQuiverOnHighLinearDampingForce/level.pak diff --git a/AutomatedTesting/Levels/Physics/C15096735_Materials_DefaultLibraryConsistency/leveldata/Environment.xml b/AutomatedTesting/Levels/Physics/ForceRegion_NoQuiverOnHighLinearDampingForce/leveldata/Environment.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C15096735_Materials_DefaultLibraryConsistency/leveldata/Environment.xml rename to AutomatedTesting/Levels/Physics/ForceRegion_NoQuiverOnHighLinearDampingForce/leveldata/Environment.xml diff --git a/AutomatedTesting/Levels/Physics/C14654881_CharacterController_SwitchLevels/leveldata/GameTokens.xml b/AutomatedTesting/Levels/Physics/ForceRegion_NoQuiverOnHighLinearDampingForce/leveldata/GameTokens.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C14654881_CharacterController_SwitchLevels/leveldata/GameTokens.xml rename to AutomatedTesting/Levels/Physics/ForceRegion_NoQuiverOnHighLinearDampingForce/leveldata/GameTokens.xml diff --git a/AutomatedTesting/Levels/Physics/C14902097_ScriptCanvas_PreUpdateEvent/leveldata/TerrainTexture.xml b/AutomatedTesting/Levels/Physics/ForceRegion_NoQuiverOnHighLinearDampingForce/leveldata/TerrainTexture.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C14902097_ScriptCanvas_PreUpdateEvent/leveldata/TerrainTexture.xml rename to AutomatedTesting/Levels/Physics/ForceRegion_NoQuiverOnHighLinearDampingForce/leveldata/TerrainTexture.xml diff --git a/AutomatedTesting/Levels/Physics/C15096732_Material_DefaultLibraryUpdatedAcrossLevels/0/leveldata/TimeOfDay.xml b/AutomatedTesting/Levels/Physics/ForceRegion_NoQuiverOnHighLinearDampingForce/leveldata/TimeOfDay.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C15096732_Material_DefaultLibraryUpdatedAcrossLevels/0/leveldata/TimeOfDay.xml rename to AutomatedTesting/Levels/Physics/ForceRegion_NoQuiverOnHighLinearDampingForce/leveldata/TimeOfDay.xml diff --git a/AutomatedTesting/Levels/Physics/C15308217_NoCrash_LevelSwitchWithOutTerrain/leveldata/VegetationMap.dat b/AutomatedTesting/Levels/Physics/ForceRegion_NoQuiverOnHighLinearDampingForce/leveldata/VegetationMap.dat similarity index 100% rename from AutomatedTesting/Levels/Physics/C15308217_NoCrash_LevelSwitchWithOutTerrain/leveldata/VegetationMap.dat rename to AutomatedTesting/Levels/Physics/ForceRegion_NoQuiverOnHighLinearDampingForce/leveldata/VegetationMap.dat diff --git a/AutomatedTesting/Levels/Physics/C15096737_Materials_DefaultMaterialLibraryChanges/tags.txt b/AutomatedTesting/Levels/Physics/ForceRegion_NoQuiverOnHighLinearDampingForce/tags.txt similarity index 100% rename from AutomatedTesting/Levels/Physics/C15096737_Materials_DefaultMaterialLibraryChanges/tags.txt rename to AutomatedTesting/Levels/Physics/ForceRegion_NoQuiverOnHighLinearDampingForce/tags.txt diff --git a/AutomatedTesting/Levels/Physics/C15425935_Material_LibraryUpdatedAcrossLevels/C15425935_Material_LibraryUpdatedAcrossLevels_1/terraintexture.pak b/AutomatedTesting/Levels/Physics/ForceRegion_NoQuiverOnHighLinearDampingForce/terraintexture.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C15425935_Material_LibraryUpdatedAcrossLevels/C15425935_Material_LibraryUpdatedAcrossLevels_1/terraintexture.pak rename to AutomatedTesting/Levels/Physics/ForceRegion_NoQuiverOnHighLinearDampingForce/terraintexture.pak diff --git a/AutomatedTesting/Levels/Physics/C6090547_ForceRegion_ParentChildForceRegions/C6090547_ForceRegion_ParentChildForceRegions.ly b/AutomatedTesting/Levels/Physics/ForceRegion_ParentChildForcesCombineForces/ForceRegion_ParentChildForcesCombineForces.ly similarity index 100% rename from AutomatedTesting/Levels/Physics/C6090547_ForceRegion_ParentChildForceRegions/C6090547_ForceRegion_ParentChildForceRegions.ly rename to AutomatedTesting/Levels/Physics/ForceRegion_ParentChildForcesCombineForces/ForceRegion_ParentChildForcesCombineForces.ly diff --git a/AutomatedTesting/Levels/Physics/C6090547_ForceRegion_ParentChildForceRegions/filelist.xml b/AutomatedTesting/Levels/Physics/ForceRegion_ParentChildForcesCombineForces/filelist.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C6090547_ForceRegion_ParentChildForceRegions/filelist.xml rename to AutomatedTesting/Levels/Physics/ForceRegion_ParentChildForcesCombineForces/filelist.xml diff --git a/AutomatedTesting/Levels/Physics/C6090547_ForceRegion_ParentChildForceRegions/level.pak b/AutomatedTesting/Levels/Physics/ForceRegion_ParentChildForcesCombineForces/level.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C6090547_ForceRegion_ParentChildForceRegions/level.pak rename to AutomatedTesting/Levels/Physics/ForceRegion_ParentChildForcesCombineForces/level.pak diff --git a/AutomatedTesting/Levels/Physics/C15096737_Materials_DefaultMaterialLibraryChanges/leveldata/Environment.xml b/AutomatedTesting/Levels/Physics/ForceRegion_ParentChildForcesCombineForces/leveldata/Environment.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C15096737_Materials_DefaultMaterialLibraryChanges/leveldata/Environment.xml rename to AutomatedTesting/Levels/Physics/ForceRegion_ParentChildForcesCombineForces/leveldata/Environment.xml diff --git a/AutomatedTesting/Levels/Physics/C14654881_CharacterController_SwitchLevelsEmpty/leveldata/GameTokens.xml b/AutomatedTesting/Levels/Physics/ForceRegion_ParentChildForcesCombineForces/leveldata/GameTokens.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C14654881_CharacterController_SwitchLevelsEmpty/leveldata/GameTokens.xml rename to AutomatedTesting/Levels/Physics/ForceRegion_ParentChildForcesCombineForces/leveldata/GameTokens.xml diff --git a/AutomatedTesting/Levels/Physics/C15425929_Undo_Redo/leveldata/TerrainTexture.xml b/AutomatedTesting/Levels/Physics/ForceRegion_ParentChildForcesCombineForces/leveldata/TerrainTexture.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C15425929_Undo_Redo/leveldata/TerrainTexture.xml rename to AutomatedTesting/Levels/Physics/ForceRegion_ParentChildForcesCombineForces/leveldata/TerrainTexture.xml diff --git a/AutomatedTesting/Levels/Physics/C15096732_Material_DefaultLibraryUpdatedAcrossLevels/1/leveldata/TimeOfDay.xml b/AutomatedTesting/Levels/Physics/ForceRegion_ParentChildForcesCombineForces/leveldata/TimeOfDay.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C15096732_Material_DefaultLibraryUpdatedAcrossLevels/1/leveldata/TimeOfDay.xml rename to AutomatedTesting/Levels/Physics/ForceRegion_ParentChildForcesCombineForces/leveldata/TimeOfDay.xml diff --git a/AutomatedTesting/Levels/Physics/C15308217_NoCrash_LevelSwitchWithTerrain/leveldata/VegetationMap.dat b/AutomatedTesting/Levels/Physics/ForceRegion_ParentChildForcesCombineForces/leveldata/VegetationMap.dat similarity index 100% rename from AutomatedTesting/Levels/Physics/C15308217_NoCrash_LevelSwitchWithTerrain/leveldata/VegetationMap.dat rename to AutomatedTesting/Levels/Physics/ForceRegion_ParentChildForcesCombineForces/leveldata/VegetationMap.dat diff --git a/AutomatedTesting/Levels/Physics/C15308217_NoCrash_LevelSwitchWithOutTerrain/tags.txt b/AutomatedTesting/Levels/Physics/ForceRegion_ParentChildForcesCombineForces/tags.txt similarity index 100% rename from AutomatedTesting/Levels/Physics/C15308217_NoCrash_LevelSwitchWithOutTerrain/tags.txt rename to AutomatedTesting/Levels/Physics/ForceRegion_ParentChildForcesCombineForces/tags.txt diff --git a/AutomatedTesting/Levels/Physics/C15563573_Material_AddModifyDeleteOnCharacterController/terraintexture.pak b/AutomatedTesting/Levels/Physics/ForceRegion_ParentChildForcesCombineForces/terraintexture.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C15563573_Material_AddModifyDeleteOnCharacterController/terraintexture.pak rename to AutomatedTesting/Levels/Physics/ForceRegion_ParentChildForcesCombineForces/terraintexture.pak diff --git a/AutomatedTesting/Levels/Physics/C5932044_PhysX_ForceRegion_PointForceOnRigidBodies/C5932044_PhysX_ForceRegion_PointForceOnRigidBodies.ly b/AutomatedTesting/Levels/Physics/ForceRegion_PointForceOnRigidBodies/ForceRegion_PointForceOnRigidBodies.ly similarity index 100% rename from AutomatedTesting/Levels/Physics/C5932044_PhysX_ForceRegion_PointForceOnRigidBodies/C5932044_PhysX_ForceRegion_PointForceOnRigidBodies.ly rename to AutomatedTesting/Levels/Physics/ForceRegion_PointForceOnRigidBodies/ForceRegion_PointForceOnRigidBodies.ly diff --git a/AutomatedTesting/Levels/Physics/C5932044_PhysX_ForceRegion_PointForceOnRigidBodies/PhysX_ForceRegion_PointForceOnRigidBodies.ly b/AutomatedTesting/Levels/Physics/ForceRegion_PointForceOnRigidBodies/PhysX_ForceRegion_PointForceOnRigidBodies.ly similarity index 100% rename from AutomatedTesting/Levels/Physics/C5932044_PhysX_ForceRegion_PointForceOnRigidBodies/PhysX_ForceRegion_PointForceOnRigidBodies.ly rename to AutomatedTesting/Levels/Physics/ForceRegion_PointForceOnRigidBodies/PhysX_ForceRegion_PointForceOnRigidBodies.ly diff --git a/AutomatedTesting/Levels/Physics/C5932044_PhysX_ForceRegion_PointForceOnRigidBodies/filelist.xml b/AutomatedTesting/Levels/Physics/ForceRegion_PointForceOnRigidBodies/filelist.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C5932044_PhysX_ForceRegion_PointForceOnRigidBodies/filelist.xml rename to AutomatedTesting/Levels/Physics/ForceRegion_PointForceOnRigidBodies/filelist.xml diff --git a/AutomatedTesting/Levels/Physics/C5932044_PhysX_ForceRegion_PointForceOnRigidBodies/level.pak b/AutomatedTesting/Levels/Physics/ForceRegion_PointForceOnRigidBodies/level.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C5932044_PhysX_ForceRegion_PointForceOnRigidBodies/level.pak rename to AutomatedTesting/Levels/Physics/ForceRegion_PointForceOnRigidBodies/level.pak diff --git a/AutomatedTesting/Levels/Physics/C15308217_NoCrash_LevelSwitchWithOutTerrain/leveldata/Environment.xml b/AutomatedTesting/Levels/Physics/ForceRegion_PointForceOnRigidBodies/leveldata/Environment.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C15308217_NoCrash_LevelSwitchWithOutTerrain/leveldata/Environment.xml rename to AutomatedTesting/Levels/Physics/ForceRegion_PointForceOnRigidBodies/leveldata/Environment.xml diff --git a/AutomatedTesting/Levels/Physics/C24308873_CylinderShapeCollider_CollidesWithPhysXTerrain/leveldata/TerrainTexture.xml b/AutomatedTesting/Levels/Physics/ForceRegion_PointForceOnRigidBodies/leveldata/TerrainTexture.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C24308873_CylinderShapeCollider_CollidesWithPhysXTerrain/leveldata/TerrainTexture.xml rename to AutomatedTesting/Levels/Physics/ForceRegion_PointForceOnRigidBodies/leveldata/TerrainTexture.xml diff --git a/AutomatedTesting/Levels/Physics/C15096735_Materials_DefaultLibraryConsistency/leveldata/TimeOfDay.xml b/AutomatedTesting/Levels/Physics/ForceRegion_PointForceOnRigidBodies/leveldata/TimeOfDay.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C15096735_Materials_DefaultLibraryConsistency/leveldata/TimeOfDay.xml rename to AutomatedTesting/Levels/Physics/ForceRegion_PointForceOnRigidBodies/leveldata/TimeOfDay.xml diff --git a/AutomatedTesting/Levels/Physics/C15308221_Material_ComponentsInSyncWithLibrary/leveldata/VegetationMap.dat b/AutomatedTesting/Levels/Physics/ForceRegion_PointForceOnRigidBodies/leveldata/VegetationMap.dat similarity index 100% rename from AutomatedTesting/Levels/Physics/C15308221_Material_ComponentsInSyncWithLibrary/leveldata/VegetationMap.dat rename to AutomatedTesting/Levels/Physics/ForceRegion_PointForceOnRigidBodies/leveldata/VegetationMap.dat diff --git a/AutomatedTesting/Levels/Physics/C15308217_NoCrash_LevelSwitchWithTerrain/tags.txt b/AutomatedTesting/Levels/Physics/ForceRegion_PointForceOnRigidBodies/tags.txt similarity index 100% rename from AutomatedTesting/Levels/Physics/C15308217_NoCrash_LevelSwitchWithTerrain/tags.txt rename to AutomatedTesting/Levels/Physics/ForceRegion_PointForceOnRigidBodies/tags.txt diff --git a/AutomatedTesting/Levels/Physics/C15845879_ForceRegion_HighLinearDampingForce/terraintexture.pak b/AutomatedTesting/Levels/Physics/ForceRegion_PointForceOnRigidBodies/terraintexture.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C15845879_ForceRegion_HighLinearDampingForce/terraintexture.pak rename to AutomatedTesting/Levels/Physics/ForceRegion_PointForceOnRigidBodies/terraintexture.pak diff --git a/AutomatedTesting/Levels/Physics/C5959808_ForceRegion_PositionOffset/C5959808_ForceRegion_PositionOffset.ly b/AutomatedTesting/Levels/Physics/ForceRegion_PositionOffset/ForceRegion_PositionOffset.ly similarity index 100% rename from AutomatedTesting/Levels/Physics/C5959808_ForceRegion_PositionOffset/C5959808_ForceRegion_PositionOffset.ly rename to AutomatedTesting/Levels/Physics/ForceRegion_PositionOffset/ForceRegion_PositionOffset.ly diff --git a/AutomatedTesting/Levels/Physics/C5959808_ForceRegion_PositionOffset/filelist.xml b/AutomatedTesting/Levels/Physics/ForceRegion_PositionOffset/filelist.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C5959808_ForceRegion_PositionOffset/filelist.xml rename to AutomatedTesting/Levels/Physics/ForceRegion_PositionOffset/filelist.xml diff --git a/AutomatedTesting/Levels/Physics/C5959808_ForceRegion_PositionOffset/level.pak b/AutomatedTesting/Levels/Physics/ForceRegion_PositionOffset/level.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C5959808_ForceRegion_PositionOffset/level.pak rename to AutomatedTesting/Levels/Physics/ForceRegion_PositionOffset/level.pak diff --git a/AutomatedTesting/Levels/Physics/C15308217_NoCrash_LevelSwitchWithTerrain/leveldata/Environment.xml b/AutomatedTesting/Levels/Physics/ForceRegion_PositionOffset/leveldata/Environment.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C15308217_NoCrash_LevelSwitchWithTerrain/leveldata/Environment.xml rename to AutomatedTesting/Levels/Physics/ForceRegion_PositionOffset/leveldata/Environment.xml diff --git a/AutomatedTesting/Levels/Physics/C14654882_Ragdoll_ragdollAPTest/leveldata/GameTokens.xml b/AutomatedTesting/Levels/Physics/ForceRegion_PositionOffset/leveldata/GameTokens.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C14654882_Ragdoll_ragdollAPTest/leveldata/GameTokens.xml rename to AutomatedTesting/Levels/Physics/ForceRegion_PositionOffset/leveldata/GameTokens.xml diff --git a/AutomatedTesting/Levels/Physics/C3510642_Terrain_NotCollideWithTerrain/leveldata/TerrainTexture.xml b/AutomatedTesting/Levels/Physics/ForceRegion_PositionOffset/leveldata/TerrainTexture.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C3510642_Terrain_NotCollideWithTerrain/leveldata/TerrainTexture.xml rename to AutomatedTesting/Levels/Physics/ForceRegion_PositionOffset/leveldata/TerrainTexture.xml diff --git a/AutomatedTesting/Levels/Physics/C15096737_Materials_DefaultMaterialLibraryChanges/leveldata/TimeOfDay.xml b/AutomatedTesting/Levels/Physics/ForceRegion_PositionOffset/leveldata/TimeOfDay.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C15096737_Materials_DefaultMaterialLibraryChanges/leveldata/TimeOfDay.xml rename to AutomatedTesting/Levels/Physics/ForceRegion_PositionOffset/leveldata/TimeOfDay.xml diff --git a/AutomatedTesting/Levels/Physics/C15425929_Undo_Redo/leveldata/VegetationMap.dat b/AutomatedTesting/Levels/Physics/ForceRegion_PositionOffset/leveldata/VegetationMap.dat similarity index 100% rename from AutomatedTesting/Levels/Physics/C15425929_Undo_Redo/leveldata/VegetationMap.dat rename to AutomatedTesting/Levels/Physics/ForceRegion_PositionOffset/leveldata/VegetationMap.dat diff --git a/AutomatedTesting/Levels/Physics/C15308221_Material_ComponentsInSyncWithLibrary/tags.txt b/AutomatedTesting/Levels/Physics/ForceRegion_PositionOffset/tags.txt similarity index 100% rename from AutomatedTesting/Levels/Physics/C15308221_Material_ComponentsInSyncWithLibrary/tags.txt rename to AutomatedTesting/Levels/Physics/ForceRegion_PositionOffset/tags.txt diff --git a/AutomatedTesting/Levels/Physics/C18243580_Joints_Fixed2BodiesConstrained/terraintexture.pak b/AutomatedTesting/Levels/Physics/ForceRegion_PositionOffset/terraintexture.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C18243580_Joints_Fixed2BodiesConstrained/terraintexture.pak rename to AutomatedTesting/Levels/Physics/ForceRegion_PositionOffset/terraintexture.pak diff --git a/AutomatedTesting/Levels/Physics/C5959761_ForceRegion_ExertsPointForce_Sedan/ForceRegion_ExertsPointForce_Sedan.ly b/AutomatedTesting/Levels/Physics/ForceRegion_PxMeshShapedForce/ForceRegion_ExertsPointForce_Sedan.ly similarity index 100% rename from AutomatedTesting/Levels/Physics/C5959761_ForceRegion_ExertsPointForce_Sedan/ForceRegion_ExertsPointForce_Sedan.ly rename to AutomatedTesting/Levels/Physics/ForceRegion_PxMeshShapedForce/ForceRegion_ExertsPointForce_Sedan.ly diff --git a/AutomatedTesting/Levels/Physics/ForceRegion_PxMeshShapedForce/ForceRegion_PxMeshShapedForce.ly b/AutomatedTesting/Levels/Physics/ForceRegion_PxMeshShapedForce/ForceRegion_PxMeshShapedForce.ly new file mode 100644 index 0000000000..8748ebf49c --- /dev/null +++ b/AutomatedTesting/Levels/Physics/ForceRegion_PxMeshShapedForce/ForceRegion_PxMeshShapedForce.ly @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:dcf3f138ec259aca048d631dc030ed34c4543eb1806cbe4cd9d8feb4cfb1765c +size 6129 diff --git a/AutomatedTesting/Levels/Physics/C4976209_RigidBody_ComputesCOM/PhysXSedan/_dev_Sedan_r0-b.fbx b/AutomatedTesting/Levels/Physics/ForceRegion_PxMeshShapedForce/PhysXSedan/_dev_Sedan_r0-b.fbx similarity index 100% rename from AutomatedTesting/Levels/Physics/C4976209_RigidBody_ComputesCOM/PhysXSedan/_dev_Sedan_r0-b.fbx rename to AutomatedTesting/Levels/Physics/ForceRegion_PxMeshShapedForce/PhysXSedan/_dev_Sedan_r0-b.fbx diff --git a/AutomatedTesting/Levels/Physics/C4976209_RigidBody_ComputesCOM/PhysXSedan/_dev_sedan_r0-b.fbx.assetinfo b/AutomatedTesting/Levels/Physics/ForceRegion_PxMeshShapedForce/PhysXSedan/_dev_sedan_r0-b.fbx.assetinfo similarity index 100% rename from AutomatedTesting/Levels/Physics/C4976209_RigidBody_ComputesCOM/PhysXSedan/_dev_sedan_r0-b.fbx.assetinfo rename to AutomatedTesting/Levels/Physics/ForceRegion_PxMeshShapedForce/PhysXSedan/_dev_sedan_r0-b.fbx.assetinfo diff --git a/AutomatedTesting/Levels/Physics/C4976209_RigidBody_ComputesCOM/PhysXSedan/_dev_sedan_r0-b.mtl b/AutomatedTesting/Levels/Physics/ForceRegion_PxMeshShapedForce/PhysXSedan/_dev_sedan_r0-b.mtl similarity index 100% rename from AutomatedTesting/Levels/Physics/C4976209_RigidBody_ComputesCOM/PhysXSedan/_dev_sedan_r0-b.mtl rename to AutomatedTesting/Levels/Physics/ForceRegion_PxMeshShapedForce/PhysXSedan/_dev_sedan_r0-b.mtl diff --git a/AutomatedTesting/Levels/Physics/C5959761_ForceRegion_ExertsPointForce_Sedan/filelist.xml b/AutomatedTesting/Levels/Physics/ForceRegion_PxMeshShapedForce/filelist.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C5959761_ForceRegion_ExertsPointForce_Sedan/filelist.xml rename to AutomatedTesting/Levels/Physics/ForceRegion_PxMeshShapedForce/filelist.xml diff --git a/AutomatedTesting/Levels/Physics/C5959761_ForceRegion_ExertsPointForce_Sedan/level.pak b/AutomatedTesting/Levels/Physics/ForceRegion_PxMeshShapedForce/level.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C5959761_ForceRegion_ExertsPointForce_Sedan/level.pak rename to AutomatedTesting/Levels/Physics/ForceRegion_PxMeshShapedForce/level.pak diff --git a/AutomatedTesting/Levels/Physics/C15308221_Material_ComponentsInSyncWithLibrary/leveldata/Environment.xml b/AutomatedTesting/Levels/Physics/ForceRegion_PxMeshShapedForce/leveldata/Environment.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C15308221_Material_ComponentsInSyncWithLibrary/leveldata/Environment.xml rename to AutomatedTesting/Levels/Physics/ForceRegion_PxMeshShapedForce/leveldata/Environment.xml diff --git a/AutomatedTesting/Levels/Physics/C3510644_Collider_CollisionGroups/leveldata/TerrainTexture.xml b/AutomatedTesting/Levels/Physics/ForceRegion_PxMeshShapedForce/leveldata/TerrainTexture.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C3510644_Collider_CollisionGroups/leveldata/TerrainTexture.xml rename to AutomatedTesting/Levels/Physics/ForceRegion_PxMeshShapedForce/leveldata/TerrainTexture.xml diff --git a/AutomatedTesting/Levels/Physics/C15308217_NoCrash_LevelSwitchWithOutTerrain/leveldata/TimeOfDay.xml b/AutomatedTesting/Levels/Physics/ForceRegion_PxMeshShapedForce/leveldata/TimeOfDay.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C15308217_NoCrash_LevelSwitchWithOutTerrain/leveldata/TimeOfDay.xml rename to AutomatedTesting/Levels/Physics/ForceRegion_PxMeshShapedForce/leveldata/TimeOfDay.xml diff --git a/AutomatedTesting/Levels/Physics/C15425935_Material_LibraryUpdatedAcrossLevels/C15425935_Material_LibraryUpdatedAcrossLevels_0/leveldata/VegetationMap.dat b/AutomatedTesting/Levels/Physics/ForceRegion_PxMeshShapedForce/leveldata/VegetationMap.dat similarity index 100% rename from AutomatedTesting/Levels/Physics/C15425935_Material_LibraryUpdatedAcrossLevels/C15425935_Material_LibraryUpdatedAcrossLevels_0/leveldata/VegetationMap.dat rename to AutomatedTesting/Levels/Physics/ForceRegion_PxMeshShapedForce/leveldata/VegetationMap.dat diff --git a/AutomatedTesting/Levels/Physics/C15425929_Undo_Redo/tags.txt b/AutomatedTesting/Levels/Physics/ForceRegion_PxMeshShapedForce/tags.txt similarity index 100% rename from AutomatedTesting/Levels/Physics/C15425929_Undo_Redo/tags.txt rename to AutomatedTesting/Levels/Physics/ForceRegion_PxMeshShapedForce/tags.txt diff --git a/AutomatedTesting/Levels/Physics/C18243581_Joints_FixedBreakable/terraintexture.pak b/AutomatedTesting/Levels/Physics/ForceRegion_PxMeshShapedForce/terraintexture.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C18243581_Joints_FixedBreakable/terraintexture.pak rename to AutomatedTesting/Levels/Physics/ForceRegion_PxMeshShapedForce/terraintexture.pak diff --git a/AutomatedTesting/Levels/Physics/C5959809_ForceRegion_RotationalOffset/C5959809_ForceRegion_RotationalOffset.ly b/AutomatedTesting/Levels/Physics/ForceRegion_RotationalOffset/ForceRegion_RotationalOffset.ly similarity index 100% rename from AutomatedTesting/Levels/Physics/C5959809_ForceRegion_RotationalOffset/C5959809_ForceRegion_RotationalOffset.ly rename to AutomatedTesting/Levels/Physics/ForceRegion_RotationalOffset/ForceRegion_RotationalOffset.ly diff --git a/AutomatedTesting/Levels/Physics/C5959809_ForceRegion_RotationalOffset/filelist.xml b/AutomatedTesting/Levels/Physics/ForceRegion_RotationalOffset/filelist.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C5959809_ForceRegion_RotationalOffset/filelist.xml rename to AutomatedTesting/Levels/Physics/ForceRegion_RotationalOffset/filelist.xml diff --git a/AutomatedTesting/Levels/Physics/C5959809_ForceRegion_RotationalOffset/level.pak b/AutomatedTesting/Levels/Physics/ForceRegion_RotationalOffset/level.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C5959809_ForceRegion_RotationalOffset/level.pak rename to AutomatedTesting/Levels/Physics/ForceRegion_RotationalOffset/level.pak diff --git a/AutomatedTesting/Levels/Physics/C15425929_Undo_Redo/leveldata/Environment.xml b/AutomatedTesting/Levels/Physics/ForceRegion_RotationalOffset/leveldata/Environment.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C15425929_Undo_Redo/leveldata/Environment.xml rename to AutomatedTesting/Levels/Physics/ForceRegion_RotationalOffset/leveldata/Environment.xml diff --git a/AutomatedTesting/Levels/Physics/C14861498_ConfirmError_NoPxMesh/leveldata/GameTokens.xml b/AutomatedTesting/Levels/Physics/ForceRegion_RotationalOffset/leveldata/GameTokens.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C14861498_ConfirmError_NoPxMesh/leveldata/GameTokens.xml rename to AutomatedTesting/Levels/Physics/ForceRegion_RotationalOffset/leveldata/GameTokens.xml diff --git a/AutomatedTesting/Levels/Physics/C4044694_Material_EmptyLibraryUsesDefault/leveldata/TerrainTexture.xml b/AutomatedTesting/Levels/Physics/ForceRegion_RotationalOffset/leveldata/TerrainTexture.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C4044694_Material_EmptyLibraryUsesDefault/leveldata/TerrainTexture.xml rename to AutomatedTesting/Levels/Physics/ForceRegion_RotationalOffset/leveldata/TerrainTexture.xml diff --git a/AutomatedTesting/Levels/Physics/C15308217_NoCrash_LevelSwitchWithTerrain/leveldata/TimeOfDay.xml b/AutomatedTesting/Levels/Physics/ForceRegion_RotationalOffset/leveldata/TimeOfDay.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C15308217_NoCrash_LevelSwitchWithTerrain/leveldata/TimeOfDay.xml rename to AutomatedTesting/Levels/Physics/ForceRegion_RotationalOffset/leveldata/TimeOfDay.xml diff --git a/AutomatedTesting/Levels/Physics/C15425935_Material_LibraryUpdatedAcrossLevels/C15425935_Material_LibraryUpdatedAcrossLevels_1/leveldata/VegetationMap.dat b/AutomatedTesting/Levels/Physics/ForceRegion_RotationalOffset/leveldata/VegetationMap.dat similarity index 100% rename from AutomatedTesting/Levels/Physics/C15425935_Material_LibraryUpdatedAcrossLevels/C15425935_Material_LibraryUpdatedAcrossLevels_1/leveldata/VegetationMap.dat rename to AutomatedTesting/Levels/Physics/ForceRegion_RotationalOffset/leveldata/VegetationMap.dat diff --git a/AutomatedTesting/Levels/Physics/C15425935_Material_LibraryUpdatedAcrossLevels/C15425935_Material_LibraryUpdatedAcrossLevels_0/tags.txt b/AutomatedTesting/Levels/Physics/ForceRegion_RotationalOffset/tags.txt similarity index 100% rename from AutomatedTesting/Levels/Physics/C15425935_Material_LibraryUpdatedAcrossLevels/C15425935_Material_LibraryUpdatedAcrossLevels_0/tags.txt rename to AutomatedTesting/Levels/Physics/ForceRegion_RotationalOffset/tags.txt diff --git a/AutomatedTesting/Levels/Physics/C18243582_Joints_FixedLeadFollowerCollide/terraintexture.pak b/AutomatedTesting/Levels/Physics/ForceRegion_RotationalOffset/terraintexture.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C18243582_Joints_FixedLeadFollowerCollide/terraintexture.pak rename to AutomatedTesting/Levels/Physics/ForceRegion_RotationalOffset/terraintexture.pak diff --git a/AutomatedTesting/Levels/Physics/C5932043_ForceRegion_SimpleDragOnRigidBody/C5932043_ForceRegion_SimpleDragOnRigidBody.ly b/AutomatedTesting/Levels/Physics/ForceRegion_SimpleDragForceOnRigidBodies/ForceRegion_SimpleDragForceOnRigidBodies.ly similarity index 100% rename from AutomatedTesting/Levels/Physics/C5932043_ForceRegion_SimpleDragOnRigidBody/C5932043_ForceRegion_SimpleDragOnRigidBody.ly rename to AutomatedTesting/Levels/Physics/ForceRegion_SimpleDragForceOnRigidBodies/ForceRegion_SimpleDragForceOnRigidBodies.ly diff --git a/AutomatedTesting/Levels/Physics/C5932043_ForceRegion_SimpleDragOnRigidBody/filelist.xml b/AutomatedTesting/Levels/Physics/ForceRegion_SimpleDragForceOnRigidBodies/filelist.xml similarity index 70% rename from AutomatedTesting/Levels/Physics/C5932043_ForceRegion_SimpleDragOnRigidBody/filelist.xml rename to AutomatedTesting/Levels/Physics/ForceRegion_SimpleDragForceOnRigidBodies/filelist.xml index 808b695610..5c46ca6e4a 100644 --- a/AutomatedTesting/Levels/Physics/C5932043_ForceRegion_SimpleDragOnRigidBody/filelist.xml +++ b/AutomatedTesting/Levels/Physics/ForceRegion_SimpleDragForceOnRigidBodies/filelist.xml @@ -1,4 +1,4 @@ - + diff --git a/AutomatedTesting/Levels/Physics/C5932043_ForceRegion_SimpleDragOnRigidBody/level.pak b/AutomatedTesting/Levels/Physics/ForceRegion_SimpleDragForceOnRigidBodies/level.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C5932043_ForceRegion_SimpleDragOnRigidBody/level.pak rename to AutomatedTesting/Levels/Physics/ForceRegion_SimpleDragForceOnRigidBodies/level.pak diff --git a/AutomatedTesting/Levels/Physics/C15425935_Material_LibraryUpdatedAcrossLevels/C15425935_Material_LibraryUpdatedAcrossLevels_0/leveldata/Environment.xml b/AutomatedTesting/Levels/Physics/ForceRegion_SimpleDragForceOnRigidBodies/leveldata/Environment.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C15425935_Material_LibraryUpdatedAcrossLevels/C15425935_Material_LibraryUpdatedAcrossLevels_0/leveldata/Environment.xml rename to AutomatedTesting/Levels/Physics/ForceRegion_SimpleDragForceOnRigidBodies/leveldata/Environment.xml diff --git a/AutomatedTesting/Levels/Physics/C5959765_ForceRegion_AssetGetsImpulsed/leveldata/TerrainTexture.xml b/AutomatedTesting/Levels/Physics/ForceRegion_SimpleDragForceOnRigidBodies/leveldata/TerrainTexture.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C5959765_ForceRegion_AssetGetsImpulsed/leveldata/TerrainTexture.xml rename to AutomatedTesting/Levels/Physics/ForceRegion_SimpleDragForceOnRigidBodies/leveldata/TerrainTexture.xml diff --git a/AutomatedTesting/Levels/Physics/C15308221_Material_ComponentsInSyncWithLibrary/leveldata/TimeOfDay.xml b/AutomatedTesting/Levels/Physics/ForceRegion_SimpleDragForceOnRigidBodies/leveldata/TimeOfDay.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C15308221_Material_ComponentsInSyncWithLibrary/leveldata/TimeOfDay.xml rename to AutomatedTesting/Levels/Physics/ForceRegion_SimpleDragForceOnRigidBodies/leveldata/TimeOfDay.xml diff --git a/AutomatedTesting/Levels/Physics/C15556261_PhysXMaterials_CharacterControllerMaterialAssignment/leveldata/VegetationMap.dat b/AutomatedTesting/Levels/Physics/ForceRegion_SimpleDragForceOnRigidBodies/leveldata/VegetationMap.dat similarity index 100% rename from AutomatedTesting/Levels/Physics/C15556261_PhysXMaterials_CharacterControllerMaterialAssignment/leveldata/VegetationMap.dat rename to AutomatedTesting/Levels/Physics/ForceRegion_SimpleDragForceOnRigidBodies/leveldata/VegetationMap.dat diff --git a/AutomatedTesting/Levels/Physics/C15425935_Material_LibraryUpdatedAcrossLevels/C15425935_Material_LibraryUpdatedAcrossLevels_1/tags.txt b/AutomatedTesting/Levels/Physics/ForceRegion_SimpleDragForceOnRigidBodies/tags.txt similarity index 100% rename from AutomatedTesting/Levels/Physics/C15425935_Material_LibraryUpdatedAcrossLevels/C15425935_Material_LibraryUpdatedAcrossLevels_1/tags.txt rename to AutomatedTesting/Levels/Physics/ForceRegion_SimpleDragForceOnRigidBodies/tags.txt diff --git a/AutomatedTesting/Levels/Physics/C18243583_Joints_Hinge2BodiesConstrained/terraintexture.pak b/AutomatedTesting/Levels/Physics/ForceRegion_SimpleDragForceOnRigidBodies/terraintexture.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C18243583_Joints_Hinge2BodiesConstrained/terraintexture.pak rename to AutomatedTesting/Levels/Physics/ForceRegion_SimpleDragForceOnRigidBodies/terraintexture.pak diff --git a/AutomatedTesting/Levels/Physics/C6090546_ForceRegion_SliceFileInstantiates/ForceRegionEntity.slice b/AutomatedTesting/Levels/Physics/ForceRegion_SliceFileInstantiates/ForceRegionEntity.slice similarity index 100% rename from AutomatedTesting/Levels/Physics/C6090546_ForceRegion_SliceFileInstantiates/ForceRegionEntity.slice rename to AutomatedTesting/Levels/Physics/ForceRegion_SliceFileInstantiates/ForceRegionEntity.slice diff --git a/AutomatedTesting/Levels/Physics/ForceRegion_SliceFileInstantiates/ForceRegion_SliceFileInstantiates.ly b/AutomatedTesting/Levels/Physics/ForceRegion_SliceFileInstantiates/ForceRegion_SliceFileInstantiates.ly new file mode 100644 index 0000000000..0bbaa92ae0 --- /dev/null +++ b/AutomatedTesting/Levels/Physics/ForceRegion_SliceFileInstantiates/ForceRegion_SliceFileInstantiates.ly @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e4e90b86d7f6790dc14ae86e62063dacd0fab23343653b1bd270924bfdce9730 +size 5943 diff --git a/AutomatedTesting/Levels/Physics/C6090546_ForceRegion_SliceFileInstantiates/filelist.xml b/AutomatedTesting/Levels/Physics/ForceRegion_SliceFileInstantiates/filelist.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C6090546_ForceRegion_SliceFileInstantiates/filelist.xml rename to AutomatedTesting/Levels/Physics/ForceRegion_SliceFileInstantiates/filelist.xml diff --git a/AutomatedTesting/Levels/Physics/C6090546_ForceRegion_SliceFileInstantiates/level.pak b/AutomatedTesting/Levels/Physics/ForceRegion_SliceFileInstantiates/level.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C6090546_ForceRegion_SliceFileInstantiates/level.pak rename to AutomatedTesting/Levels/Physics/ForceRegion_SliceFileInstantiates/level.pak diff --git a/AutomatedTesting/Levels/Physics/C15425935_Material_LibraryUpdatedAcrossLevels/C15425935_Material_LibraryUpdatedAcrossLevels_1/leveldata/Environment.xml b/AutomatedTesting/Levels/Physics/ForceRegion_SliceFileInstantiates/leveldata/Environment.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C15425935_Material_LibraryUpdatedAcrossLevels/C15425935_Material_LibraryUpdatedAcrossLevels_1/leveldata/Environment.xml rename to AutomatedTesting/Levels/Physics/ForceRegion_SliceFileInstantiates/leveldata/Environment.xml diff --git a/AutomatedTesting/Levels/Physics/C14902097_ScriptCanvas_PreUpdateEvent/leveldata/GameTokens.xml b/AutomatedTesting/Levels/Physics/ForceRegion_SliceFileInstantiates/leveldata/GameTokens.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C14902097_ScriptCanvas_PreUpdateEvent/leveldata/GameTokens.xml rename to AutomatedTesting/Levels/Physics/ForceRegion_SliceFileInstantiates/leveldata/GameTokens.xml diff --git a/AutomatedTesting/Levels/Physics/C14902098_ScriptCanvas_PostPhysicsUpdate/leveldata/TerrainTexture.xml b/AutomatedTesting/Levels/Physics/ForceRegion_SliceFileInstantiates/leveldata/TerrainTexture.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C14902098_ScriptCanvas_PostPhysicsUpdate/leveldata/TerrainTexture.xml rename to AutomatedTesting/Levels/Physics/ForceRegion_SliceFileInstantiates/leveldata/TerrainTexture.xml diff --git a/AutomatedTesting/Levels/Physics/C15425929_Undo_Redo/leveldata/TimeOfDay.xml b/AutomatedTesting/Levels/Physics/ForceRegion_SliceFileInstantiates/leveldata/TimeOfDay.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C15425929_Undo_Redo/leveldata/TimeOfDay.xml rename to AutomatedTesting/Levels/Physics/ForceRegion_SliceFileInstantiates/leveldata/TimeOfDay.xml diff --git a/AutomatedTesting/Levels/Physics/C15563573_Material_AddModifyDeleteOnCharacterController/leveldata/VegetationMap.dat b/AutomatedTesting/Levels/Physics/ForceRegion_SliceFileInstantiates/leveldata/VegetationMap.dat similarity index 100% rename from AutomatedTesting/Levels/Physics/C15563573_Material_AddModifyDeleteOnCharacterController/leveldata/VegetationMap.dat rename to AutomatedTesting/Levels/Physics/ForceRegion_SliceFileInstantiates/leveldata/VegetationMap.dat diff --git a/AutomatedTesting/Levels/Physics/C15556261_PhysXMaterials_CharacterControllerMaterialAssignment/tags.txt b/AutomatedTesting/Levels/Physics/ForceRegion_SliceFileInstantiates/tags.txt similarity index 100% rename from AutomatedTesting/Levels/Physics/C15556261_PhysXMaterials_CharacterControllerMaterialAssignment/tags.txt rename to AutomatedTesting/Levels/Physics/ForceRegion_SliceFileInstantiates/tags.txt diff --git a/AutomatedTesting/Levels/Physics/C18243584_Joints_HingeSoftLimitsConstrained/terraintexture.pak b/AutomatedTesting/Levels/Physics/ForceRegion_SliceFileInstantiates/terraintexture.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C18243584_Joints_HingeSoftLimitsConstrained/terraintexture.pak rename to AutomatedTesting/Levels/Physics/ForceRegion_SliceFileInstantiates/terraintexture.pak diff --git a/AutomatedTesting/Levels/Physics/C12905527_ForceRegion_MagnitudeDeviation/C12905527_ForceRegion_MagnitudeDeviation.ly b/AutomatedTesting/Levels/Physics/ForceRegion_SmallMagnitudeDeviationOnLargeForces/ForceRegion_SmallMagnitudeDeviationOnLargeForces.ly similarity index 100% rename from AutomatedTesting/Levels/Physics/C12905527_ForceRegion_MagnitudeDeviation/C12905527_ForceRegion_MagnitudeDeviation.ly rename to AutomatedTesting/Levels/Physics/ForceRegion_SmallMagnitudeDeviationOnLargeForces/ForceRegion_SmallMagnitudeDeviationOnLargeForces.ly diff --git a/AutomatedTesting/Levels/Physics/C12905527_ForceRegion_MagnitudeDeviation/filelist.xml b/AutomatedTesting/Levels/Physics/ForceRegion_SmallMagnitudeDeviationOnLargeForces/filelist.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C12905527_ForceRegion_MagnitudeDeviation/filelist.xml rename to AutomatedTesting/Levels/Physics/ForceRegion_SmallMagnitudeDeviationOnLargeForces/filelist.xml diff --git a/AutomatedTesting/Levels/Physics/C12905527_ForceRegion_MagnitudeDeviation/level.pak b/AutomatedTesting/Levels/Physics/ForceRegion_SmallMagnitudeDeviationOnLargeForces/level.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C12905527_ForceRegion_MagnitudeDeviation/level.pak rename to AutomatedTesting/Levels/Physics/ForceRegion_SmallMagnitudeDeviationOnLargeForces/level.pak diff --git a/AutomatedTesting/Levels/Physics/C15556261_PhysXMaterials_CharacterControllerMaterialAssignment/leveldata/Environment.xml b/AutomatedTesting/Levels/Physics/ForceRegion_SmallMagnitudeDeviationOnLargeForces/leveldata/Environment.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C15556261_PhysXMaterials_CharacterControllerMaterialAssignment/leveldata/Environment.xml rename to AutomatedTesting/Levels/Physics/ForceRegion_SmallMagnitudeDeviationOnLargeForces/leveldata/Environment.xml diff --git a/AutomatedTesting/Levels/Physics/C14902098_ScriptCanvas_PostPhysicsUpdate/leveldata/GameTokens.xml b/AutomatedTesting/Levels/Physics/ForceRegion_SmallMagnitudeDeviationOnLargeForces/leveldata/GameTokens.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C14902098_ScriptCanvas_PostPhysicsUpdate/leveldata/GameTokens.xml rename to AutomatedTesting/Levels/Physics/ForceRegion_SmallMagnitudeDeviationOnLargeForces/leveldata/GameTokens.xml diff --git a/AutomatedTesting/Levels/Physics/C14976307_Gravity_SetGravityWorks/leveldata/TerrainTexture.xml b/AutomatedTesting/Levels/Physics/ForceRegion_SmallMagnitudeDeviationOnLargeForces/leveldata/TerrainTexture.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C14976307_Gravity_SetGravityWorks/leveldata/TerrainTexture.xml rename to AutomatedTesting/Levels/Physics/ForceRegion_SmallMagnitudeDeviationOnLargeForces/leveldata/TerrainTexture.xml diff --git a/AutomatedTesting/Levels/Physics/C15425935_Material_LibraryUpdatedAcrossLevels/C15425935_Material_LibraryUpdatedAcrossLevels_0/leveldata/TimeOfDay.xml b/AutomatedTesting/Levels/Physics/ForceRegion_SmallMagnitudeDeviationOnLargeForces/leveldata/TimeOfDay.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C15425935_Material_LibraryUpdatedAcrossLevels/C15425935_Material_LibraryUpdatedAcrossLevels_0/leveldata/TimeOfDay.xml rename to AutomatedTesting/Levels/Physics/ForceRegion_SmallMagnitudeDeviationOnLargeForces/leveldata/TimeOfDay.xml diff --git a/AutomatedTesting/Levels/Physics/C15845879_ForceRegion_HighLinearDampingForce/leveldata/VegetationMap.dat b/AutomatedTesting/Levels/Physics/ForceRegion_SmallMagnitudeDeviationOnLargeForces/leveldata/VegetationMap.dat similarity index 100% rename from AutomatedTesting/Levels/Physics/C15845879_ForceRegion_HighLinearDampingForce/leveldata/VegetationMap.dat rename to AutomatedTesting/Levels/Physics/ForceRegion_SmallMagnitudeDeviationOnLargeForces/leveldata/VegetationMap.dat diff --git a/AutomatedTesting/Levels/Physics/C15563573_Material_AddModifyDeleteOnCharacterController/tags.txt b/AutomatedTesting/Levels/Physics/ForceRegion_SmallMagnitudeDeviationOnLargeForces/tags.txt similarity index 100% rename from AutomatedTesting/Levels/Physics/C15563573_Material_AddModifyDeleteOnCharacterController/tags.txt rename to AutomatedTesting/Levels/Physics/ForceRegion_SmallMagnitudeDeviationOnLargeForces/tags.txt diff --git a/AutomatedTesting/Levels/Physics/C18243585_Joints_HingeNoLimitsConstrained/terraintexture.pak b/AutomatedTesting/Levels/Physics/ForceRegion_SmallMagnitudeDeviationOnLargeForces/terraintexture.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C18243585_Joints_HingeNoLimitsConstrained/terraintexture.pak rename to AutomatedTesting/Levels/Physics/ForceRegion_SmallMagnitudeDeviationOnLargeForces/terraintexture.pak diff --git a/AutomatedTesting/Levels/Physics/C5959759_RigidBody_ForceRegionSpherePointForce/C5959759_RigidBody_ForceRegionSpherePointForce.ly b/AutomatedTesting/Levels/Physics/ForceRegion_SphereShapedForce/ForceRegion_SphereShapedForce.ly similarity index 100% rename from AutomatedTesting/Levels/Physics/C5959759_RigidBody_ForceRegionSpherePointForce/C5959759_RigidBody_ForceRegionSpherePointForce.ly rename to AutomatedTesting/Levels/Physics/ForceRegion_SphereShapedForce/ForceRegion_SphereShapedForce.ly diff --git a/AutomatedTesting/Levels/Physics/C5959759_RigidBody_ForceRegionSpherePointForce/filelist.xml b/AutomatedTesting/Levels/Physics/ForceRegion_SphereShapedForce/filelist.xml similarity index 69% rename from AutomatedTesting/Levels/Physics/C5959759_RigidBody_ForceRegionSpherePointForce/filelist.xml rename to AutomatedTesting/Levels/Physics/ForceRegion_SphereShapedForce/filelist.xml index 6088bc2406..10ed54f776 100644 --- a/AutomatedTesting/Levels/Physics/C5959759_RigidBody_ForceRegionSpherePointForce/filelist.xml +++ b/AutomatedTesting/Levels/Physics/ForceRegion_SphereShapedForce/filelist.xml @@ -1,4 +1,4 @@ - + diff --git a/AutomatedTesting/Levels/Physics/C5959759_RigidBody_ForceRegionSpherePointForce/level.pak b/AutomatedTesting/Levels/Physics/ForceRegion_SphereShapedForce/level.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C5959759_RigidBody_ForceRegionSpherePointForce/level.pak rename to AutomatedTesting/Levels/Physics/ForceRegion_SphereShapedForce/level.pak diff --git a/AutomatedTesting/Levels/Physics/C15563573_Material_AddModifyDeleteOnCharacterController/leveldata/Environment.xml b/AutomatedTesting/Levels/Physics/ForceRegion_SphereShapedForce/leveldata/Environment.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C15563573_Material_AddModifyDeleteOnCharacterController/leveldata/Environment.xml rename to AutomatedTesting/Levels/Physics/ForceRegion_SphereShapedForce/leveldata/Environment.xml diff --git a/AutomatedTesting/Levels/Physics/C15096732_Material_DefaultLibraryUpdatedAcrossLevels/0/leveldata/TerrainTexture.xml b/AutomatedTesting/Levels/Physics/ForceRegion_SphereShapedForce/leveldata/TerrainTexture.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C15096732_Material_DefaultLibraryUpdatedAcrossLevels/0/leveldata/TerrainTexture.xml rename to AutomatedTesting/Levels/Physics/ForceRegion_SphereShapedForce/leveldata/TerrainTexture.xml diff --git a/AutomatedTesting/Levels/Physics/C15425935_Material_LibraryUpdatedAcrossLevels/C15425935_Material_LibraryUpdatedAcrossLevels_1/leveldata/TimeOfDay.xml b/AutomatedTesting/Levels/Physics/ForceRegion_SphereShapedForce/leveldata/TimeOfDay.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C15425935_Material_LibraryUpdatedAcrossLevels/C15425935_Material_LibraryUpdatedAcrossLevels_1/leveldata/TimeOfDay.xml rename to AutomatedTesting/Levels/Physics/ForceRegion_SphereShapedForce/leveldata/TimeOfDay.xml diff --git a/AutomatedTesting/Levels/Physics/C18243580_Joints_Fixed2BodiesConstrained/LevelData/VegetationMap.dat b/AutomatedTesting/Levels/Physics/ForceRegion_SphereShapedForce/leveldata/VegetationMap.dat similarity index 100% rename from AutomatedTesting/Levels/Physics/C18243580_Joints_Fixed2BodiesConstrained/LevelData/VegetationMap.dat rename to AutomatedTesting/Levels/Physics/ForceRegion_SphereShapedForce/leveldata/VegetationMap.dat diff --git a/AutomatedTesting/Levels/Physics/C15845879_ForceRegion_HighLinearDampingForce/tags.txt b/AutomatedTesting/Levels/Physics/ForceRegion_SphereShapedForce/tags.txt similarity index 100% rename from AutomatedTesting/Levels/Physics/C15845879_ForceRegion_HighLinearDampingForce/tags.txt rename to AutomatedTesting/Levels/Physics/ForceRegion_SphereShapedForce/tags.txt diff --git a/AutomatedTesting/Levels/Physics/C18243586_Joints_HingeLeadFollowerCollide/terraintexture.pak b/AutomatedTesting/Levels/Physics/ForceRegion_SphereShapedForce/terraintexture.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C18243586_Joints_HingeLeadFollowerCollide/terraintexture.pak rename to AutomatedTesting/Levels/Physics/ForceRegion_SphereShapedForce/terraintexture.pak diff --git a/AutomatedTesting/Levels/Physics/C5932045_ForceRegion_Spline/C5932045_ForceRegion_Spline.ly b/AutomatedTesting/Levels/Physics/ForceRegion_SplineForceOnRigidBodies/ForceRegion_SplineForceOnRigidBodies.ly similarity index 100% rename from AutomatedTesting/Levels/Physics/C5932045_ForceRegion_Spline/C5932045_ForceRegion_Spline.ly rename to AutomatedTesting/Levels/Physics/ForceRegion_SplineForceOnRigidBodies/ForceRegion_SplineForceOnRigidBodies.ly diff --git a/AutomatedTesting/Levels/Physics/C5932045_ForceRegion_Spline/filelist.xml b/AutomatedTesting/Levels/Physics/ForceRegion_SplineForceOnRigidBodies/filelist.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C5932045_ForceRegion_Spline/filelist.xml rename to AutomatedTesting/Levels/Physics/ForceRegion_SplineForceOnRigidBodies/filelist.xml diff --git a/AutomatedTesting/Levels/Physics/C5932045_ForceRegion_Spline/level.pak b/AutomatedTesting/Levels/Physics/ForceRegion_SplineForceOnRigidBodies/level.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C5932045_ForceRegion_Spline/level.pak rename to AutomatedTesting/Levels/Physics/ForceRegion_SplineForceOnRigidBodies/level.pak diff --git a/AutomatedTesting/Levels/Physics/C28978033_Ragdoll_WorldBodyBusTests/LevelData/Environment.xml b/AutomatedTesting/Levels/Physics/ForceRegion_SplineForceOnRigidBodies/leveldata/Environment.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C28978033_Ragdoll_WorldBodyBusTests/LevelData/Environment.xml rename to AutomatedTesting/Levels/Physics/ForceRegion_SplineForceOnRigidBodies/leveldata/Environment.xml diff --git a/AutomatedTesting/Levels/Physics/C14976307_Gravity_SetGravityWorks/leveldata/GameTokens.xml b/AutomatedTesting/Levels/Physics/ForceRegion_SplineForceOnRigidBodies/leveldata/GameTokens.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C14976307_Gravity_SetGravityWorks/leveldata/GameTokens.xml rename to AutomatedTesting/Levels/Physics/ForceRegion_SplineForceOnRigidBodies/leveldata/GameTokens.xml diff --git a/AutomatedTesting/Levels/Physics/C5932045_ForceRegion_Spline/leveldata/TerrainTexture.xml b/AutomatedTesting/Levels/Physics/ForceRegion_SplineForceOnRigidBodies/leveldata/TerrainTexture.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C5932045_ForceRegion_Spline/leveldata/TerrainTexture.xml rename to AutomatedTesting/Levels/Physics/ForceRegion_SplineForceOnRigidBodies/leveldata/TerrainTexture.xml diff --git a/AutomatedTesting/Levels/Physics/C15556261_PhysXMaterials_CharacterControllerMaterialAssignment/leveldata/TimeOfDay.xml b/AutomatedTesting/Levels/Physics/ForceRegion_SplineForceOnRigidBodies/leveldata/TimeOfDay.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C15556261_PhysXMaterials_CharacterControllerMaterialAssignment/leveldata/TimeOfDay.xml rename to AutomatedTesting/Levels/Physics/ForceRegion_SplineForceOnRigidBodies/leveldata/TimeOfDay.xml diff --git a/AutomatedTesting/Levels/Physics/C18243581_Joints_FixedBreakable/leveldata/VegetationMap.dat b/AutomatedTesting/Levels/Physics/ForceRegion_SplineForceOnRigidBodies/leveldata/VegetationMap.dat similarity index 100% rename from AutomatedTesting/Levels/Physics/C18243581_Joints_FixedBreakable/leveldata/VegetationMap.dat rename to AutomatedTesting/Levels/Physics/ForceRegion_SplineForceOnRigidBodies/leveldata/VegetationMap.dat diff --git a/AutomatedTesting/Levels/Physics/C18243580_Joints_Fixed2BodiesConstrained/tags.txt b/AutomatedTesting/Levels/Physics/ForceRegion_SplineForceOnRigidBodies/tags.txt similarity index 100% rename from AutomatedTesting/Levels/Physics/C18243580_Joints_Fixed2BodiesConstrained/tags.txt rename to AutomatedTesting/Levels/Physics/ForceRegion_SplineForceOnRigidBodies/tags.txt diff --git a/AutomatedTesting/Levels/Physics/C12868580_ForceRegion_SplineModifiedTransform/C12868580_ForceRegion_SplineModifiedTransform.ly b/AutomatedTesting/Levels/Physics/ForceRegion_SplineRegionWithModifiedTransform/ForceRegion_SplineRegionWithModifiedTransform.ly similarity index 100% rename from AutomatedTesting/Levels/Physics/C12868580_ForceRegion_SplineModifiedTransform/C12868580_ForceRegion_SplineModifiedTransform.ly rename to AutomatedTesting/Levels/Physics/ForceRegion_SplineRegionWithModifiedTransform/ForceRegion_SplineRegionWithModifiedTransform.ly diff --git a/AutomatedTesting/Levels/Physics/C12868580_ForceRegion_SplineModifiedTransform/filelist.xml b/AutomatedTesting/Levels/Physics/ForceRegion_SplineRegionWithModifiedTransform/filelist.xml similarity index 74% rename from AutomatedTesting/Levels/Physics/C12868580_ForceRegion_SplineModifiedTransform/filelist.xml rename to AutomatedTesting/Levels/Physics/ForceRegion_SplineRegionWithModifiedTransform/filelist.xml index 4fe64b8489..8de5b336e6 100644 --- a/AutomatedTesting/Levels/Physics/C12868580_ForceRegion_SplineModifiedTransform/filelist.xml +++ b/AutomatedTesting/Levels/Physics/ForceRegion_SplineRegionWithModifiedTransform/filelist.xml @@ -1,4 +1,4 @@ - + diff --git a/AutomatedTesting/Levels/Physics/C12868580_ForceRegion_SplineModifiedTransform/level.pak b/AutomatedTesting/Levels/Physics/ForceRegion_SplineRegionWithModifiedTransform/level.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C12868580_ForceRegion_SplineModifiedTransform/level.pak rename to AutomatedTesting/Levels/Physics/ForceRegion_SplineRegionWithModifiedTransform/level.pak diff --git a/AutomatedTesting/Levels/Physics/C15845879_ForceRegion_HighLinearDampingForce/leveldata/Environment.xml b/AutomatedTesting/Levels/Physics/ForceRegion_SplineRegionWithModifiedTransform/leveldata/Environment.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C15845879_ForceRegion_HighLinearDampingForce/leveldata/Environment.xml rename to AutomatedTesting/Levels/Physics/ForceRegion_SplineRegionWithModifiedTransform/leveldata/Environment.xml diff --git a/AutomatedTesting/Levels/Physics/C14976308_ScriptCanvas_SetKinematicTargetTransform/leveldata/GameTokens.xml b/AutomatedTesting/Levels/Physics/ForceRegion_SplineRegionWithModifiedTransform/leveldata/GameTokens.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C14976308_ScriptCanvas_SetKinematicTargetTransform/leveldata/GameTokens.xml rename to AutomatedTesting/Levels/Physics/ForceRegion_SplineRegionWithModifiedTransform/leveldata/GameTokens.xml diff --git a/AutomatedTesting/Levels/Physics/C4925577_PhysXMaterials_MaterialAssignedToTerrain/leveldata/TerrainTexture.xml b/AutomatedTesting/Levels/Physics/ForceRegion_SplineRegionWithModifiedTransform/leveldata/TerrainTexture.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C4925577_PhysXMaterials_MaterialAssignedToTerrain/leveldata/TerrainTexture.xml rename to AutomatedTesting/Levels/Physics/ForceRegion_SplineRegionWithModifiedTransform/leveldata/TerrainTexture.xml diff --git a/AutomatedTesting/Levels/Physics/C15563573_Material_AddModifyDeleteOnCharacterController/leveldata/TimeOfDay.xml b/AutomatedTesting/Levels/Physics/ForceRegion_SplineRegionWithModifiedTransform/leveldata/TimeOfDay.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C15563573_Material_AddModifyDeleteOnCharacterController/leveldata/TimeOfDay.xml rename to AutomatedTesting/Levels/Physics/ForceRegion_SplineRegionWithModifiedTransform/leveldata/TimeOfDay.xml diff --git a/AutomatedTesting/Levels/Physics/C18243582_Joints_FixedLeadFollowerCollide/leveldata/VegetationMap.dat b/AutomatedTesting/Levels/Physics/ForceRegion_SplineRegionWithModifiedTransform/leveldata/VegetationMap.dat similarity index 100% rename from AutomatedTesting/Levels/Physics/C18243582_Joints_FixedLeadFollowerCollide/leveldata/VegetationMap.dat rename to AutomatedTesting/Levels/Physics/ForceRegion_SplineRegionWithModifiedTransform/leveldata/VegetationMap.dat diff --git a/AutomatedTesting/Levels/Physics/C18243581_Joints_FixedBreakable/tags.txt b/AutomatedTesting/Levels/Physics/ForceRegion_SplineRegionWithModifiedTransform/tags.txt similarity index 100% rename from AutomatedTesting/Levels/Physics/C18243581_Joints_FixedBreakable/tags.txt rename to AutomatedTesting/Levels/Physics/ForceRegion_SplineRegionWithModifiedTransform/tags.txt diff --git a/AutomatedTesting/Levels/Physics/C18243587_Joints_HingeBreakable/terraintexture.pak b/AutomatedTesting/Levels/Physics/ForceRegion_SplineRegionWithModifiedTransform/terraintexture.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C18243587_Joints_HingeBreakable/terraintexture.pak rename to AutomatedTesting/Levels/Physics/ForceRegion_SplineRegionWithModifiedTransform/terraintexture.pak diff --git a/AutomatedTesting/Levels/Physics/C5932040_ForceRegion_CubeExertsWorldForce/C5932040_ForceRegion_CubeExertsWorldForce.ly b/AutomatedTesting/Levels/Physics/ForceRegion_WorldSpaceForceOnRigidBodies/ForceRegion_WorldSpaceForceOnRigidBodies.ly similarity index 100% rename from AutomatedTesting/Levels/Physics/C5932040_ForceRegion_CubeExertsWorldForce/C5932040_ForceRegion_CubeExertsWorldForce.ly rename to AutomatedTesting/Levels/Physics/ForceRegion_WorldSpaceForceOnRigidBodies/ForceRegion_WorldSpaceForceOnRigidBodies.ly diff --git a/AutomatedTesting/Levels/Physics/C5932040_ForceRegion_CubeExertsWorldForce/filelist.xml b/AutomatedTesting/Levels/Physics/ForceRegion_WorldSpaceForceOnRigidBodies/filelist.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C5932040_ForceRegion_CubeExertsWorldForce/filelist.xml rename to AutomatedTesting/Levels/Physics/ForceRegion_WorldSpaceForceOnRigidBodies/filelist.xml diff --git a/AutomatedTesting/Levels/Physics/C5932040_ForceRegion_CubeExertsWorldForce/level.pak b/AutomatedTesting/Levels/Physics/ForceRegion_WorldSpaceForceOnRigidBodies/level.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C5932040_ForceRegion_CubeExertsWorldForce/level.pak rename to AutomatedTesting/Levels/Physics/ForceRegion_WorldSpaceForceOnRigidBodies/level.pak diff --git a/AutomatedTesting/Levels/Physics/C18243580_Joints_Fixed2BodiesConstrained/LevelData/Environment.xml b/AutomatedTesting/Levels/Physics/ForceRegion_WorldSpaceForceOnRigidBodies/leveldata/Environment.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C18243580_Joints_Fixed2BodiesConstrained/LevelData/Environment.xml rename to AutomatedTesting/Levels/Physics/ForceRegion_WorldSpaceForceOnRigidBodies/leveldata/Environment.xml diff --git a/AutomatedTesting/Levels/Physics/C4925579_Material_AddModifyDeleteOnTerrain/leveldata/TerrainTexture.xml b/AutomatedTesting/Levels/Physics/ForceRegion_WorldSpaceForceOnRigidBodies/leveldata/TerrainTexture.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C4925579_Material_AddModifyDeleteOnTerrain/leveldata/TerrainTexture.xml rename to AutomatedTesting/Levels/Physics/ForceRegion_WorldSpaceForceOnRigidBodies/leveldata/TerrainTexture.xml diff --git a/AutomatedTesting/Levels/Physics/C15845879_ForceRegion_HighLinearDampingForce/leveldata/TimeOfDay.xml b/AutomatedTesting/Levels/Physics/ForceRegion_WorldSpaceForceOnRigidBodies/leveldata/TimeOfDay.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C15845879_ForceRegion_HighLinearDampingForce/leveldata/TimeOfDay.xml rename to AutomatedTesting/Levels/Physics/ForceRegion_WorldSpaceForceOnRigidBodies/leveldata/TimeOfDay.xml diff --git a/AutomatedTesting/Levels/Physics/C18243583_Joints_Hinge2BodiesConstrained/leveldata/VegetationMap.dat b/AutomatedTesting/Levels/Physics/ForceRegion_WorldSpaceForceOnRigidBodies/leveldata/VegetationMap.dat similarity index 100% rename from AutomatedTesting/Levels/Physics/C18243583_Joints_Hinge2BodiesConstrained/leveldata/VegetationMap.dat rename to AutomatedTesting/Levels/Physics/ForceRegion_WorldSpaceForceOnRigidBodies/leveldata/VegetationMap.dat diff --git a/AutomatedTesting/Levels/Physics/C18243582_Joints_FixedLeadFollowerCollide/tags.txt b/AutomatedTesting/Levels/Physics/ForceRegion_WorldSpaceForceOnRigidBodies/tags.txt similarity index 100% rename from AutomatedTesting/Levels/Physics/C18243582_Joints_FixedLeadFollowerCollide/tags.txt rename to AutomatedTesting/Levels/Physics/ForceRegion_WorldSpaceForceOnRigidBodies/tags.txt diff --git a/AutomatedTesting/Levels/Physics/C18243588_Joints_Ball2BodiesConstrained/terraintexture.pak b/AutomatedTesting/Levels/Physics/ForceRegion_WorldSpaceForceOnRigidBodies/terraintexture.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C18243588_Joints_Ball2BodiesConstrained/terraintexture.pak rename to AutomatedTesting/Levels/Physics/ForceRegion_WorldSpaceForceOnRigidBodies/terraintexture.pak diff --git a/AutomatedTesting/Levels/Physics/C6090552_ForceRegion_LinearDampingNegative/C6090552_ForceRegion_LinearDampingNegative.ly b/AutomatedTesting/Levels/Physics/ForceRegion_ZeroLinearDampingDoesNothing/ForceRegion_ZeroLinearDampingDoesNothing.ly similarity index 100% rename from AutomatedTesting/Levels/Physics/C6090552_ForceRegion_LinearDampingNegative/C6090552_ForceRegion_LinearDampingNegative.ly rename to AutomatedTesting/Levels/Physics/ForceRegion_ZeroLinearDampingDoesNothing/ForceRegion_ZeroLinearDampingDoesNothing.ly diff --git a/AutomatedTesting/Levels/Physics/C6090552_ForceRegion_LinearDampingNegative/filelist.xml b/AutomatedTesting/Levels/Physics/ForceRegion_ZeroLinearDampingDoesNothing/filelist.xml similarity index 70% rename from AutomatedTesting/Levels/Physics/C6090552_ForceRegion_LinearDampingNegative/filelist.xml rename to AutomatedTesting/Levels/Physics/ForceRegion_ZeroLinearDampingDoesNothing/filelist.xml index a34f1e9cdf..dcf851c09f 100644 --- a/AutomatedTesting/Levels/Physics/C6090552_ForceRegion_LinearDampingNegative/filelist.xml +++ b/AutomatedTesting/Levels/Physics/ForceRegion_ZeroLinearDampingDoesNothing/filelist.xml @@ -1,4 +1,4 @@ - + diff --git a/AutomatedTesting/Levels/Physics/C6090552_ForceRegion_LinearDampingNegative/level.pak b/AutomatedTesting/Levels/Physics/ForceRegion_ZeroLinearDampingDoesNothing/level.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C6090552_ForceRegion_LinearDampingNegative/level.pak rename to AutomatedTesting/Levels/Physics/ForceRegion_ZeroLinearDampingDoesNothing/level.pak diff --git a/AutomatedTesting/Levels/Physics/C18243581_Joints_FixedBreakable/leveldata/Environment.xml b/AutomatedTesting/Levels/Physics/ForceRegion_ZeroLinearDampingDoesNothing/leveldata/Environment.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C18243581_Joints_FixedBreakable/leveldata/Environment.xml rename to AutomatedTesting/Levels/Physics/ForceRegion_ZeroLinearDampingDoesNothing/leveldata/Environment.xml diff --git a/AutomatedTesting/Levels/Physics/C15096732_Material_DefaultLibraryUpdatedAcrossLevels/0/leveldata/GameTokens.xml b/AutomatedTesting/Levels/Physics/ForceRegion_ZeroLinearDampingDoesNothing/leveldata/GameTokens.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C15096732_Material_DefaultLibraryUpdatedAcrossLevels/0/leveldata/GameTokens.xml rename to AutomatedTesting/Levels/Physics/ForceRegion_ZeroLinearDampingDoesNothing/leveldata/GameTokens.xml diff --git a/AutomatedTesting/Levels/Physics/C4925580_Material_RagdollBonesMaterial/leveldata/TerrainTexture.xml b/AutomatedTesting/Levels/Physics/ForceRegion_ZeroLinearDampingDoesNothing/leveldata/TerrainTexture.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C4925580_Material_RagdollBonesMaterial/leveldata/TerrainTexture.xml rename to AutomatedTesting/Levels/Physics/ForceRegion_ZeroLinearDampingDoesNothing/leveldata/TerrainTexture.xml diff --git a/AutomatedTesting/Levels/Physics/C4976244_Collider_SameGroupSameLayerCollision/leveldata/TimeOfDay.xml b/AutomatedTesting/Levels/Physics/ForceRegion_ZeroLinearDampingDoesNothing/leveldata/TimeOfDay.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C4976244_Collider_SameGroupSameLayerCollision/leveldata/TimeOfDay.xml rename to AutomatedTesting/Levels/Physics/ForceRegion_ZeroLinearDampingDoesNothing/leveldata/TimeOfDay.xml diff --git a/AutomatedTesting/Levels/Physics/C18243584_Joints_HingeSoftLimitsConstrained/leveldata/VegetationMap.dat b/AutomatedTesting/Levels/Physics/ForceRegion_ZeroLinearDampingDoesNothing/leveldata/VegetationMap.dat similarity index 100% rename from AutomatedTesting/Levels/Physics/C18243584_Joints_HingeSoftLimitsConstrained/leveldata/VegetationMap.dat rename to AutomatedTesting/Levels/Physics/ForceRegion_ZeroLinearDampingDoesNothing/leveldata/VegetationMap.dat diff --git a/AutomatedTesting/Levels/Physics/C18243583_Joints_Hinge2BodiesConstrained/tags.txt b/AutomatedTesting/Levels/Physics/ForceRegion_ZeroLinearDampingDoesNothing/tags.txt similarity index 100% rename from AutomatedTesting/Levels/Physics/C18243583_Joints_Hinge2BodiesConstrained/tags.txt rename to AutomatedTesting/Levels/Physics/ForceRegion_ZeroLinearDampingDoesNothing/tags.txt diff --git a/AutomatedTesting/Levels/Physics/C4044694_Material_EmptyLibraryUsesDefault/terrain/terrain.pxheightfield b/AutomatedTesting/Levels/Physics/ForceRegion_ZeroLinearDampingDoesNothing/terrain/terrain.pxheightfield similarity index 100% rename from AutomatedTesting/Levels/Physics/C4044694_Material_EmptyLibraryUsesDefault/terrain/terrain.pxheightfield rename to AutomatedTesting/Levels/Physics/ForceRegion_ZeroLinearDampingDoesNothing/terrain/terrain.pxheightfield diff --git a/AutomatedTesting/Levels/Physics/C18243589_Joints_BallSoftLimitsConstrained/terraintexture.pak b/AutomatedTesting/Levels/Physics/ForceRegion_ZeroLinearDampingDoesNothing/terraintexture.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C18243589_Joints_BallSoftLimitsConstrained/terraintexture.pak rename to AutomatedTesting/Levels/Physics/ForceRegion_ZeroLinearDampingDoesNothing/terraintexture.pak diff --git a/AutomatedTesting/Levels/Physics/ForceRegion_ZeroLocalSpaceForceDoesNothing/ForceRegion_ZeroLocalSpaceForceDoesNothing.ly b/AutomatedTesting/Levels/Physics/ForceRegion_ZeroLocalSpaceForceDoesNothing/ForceRegion_ZeroLocalSpaceForceDoesNothing.ly new file mode 100644 index 0000000000..1cb6ea2363 --- /dev/null +++ b/AutomatedTesting/Levels/Physics/ForceRegion_ZeroLocalSpaceForceDoesNothing/ForceRegion_ZeroLocalSpaceForceDoesNothing.ly @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3167926eac3e980971f5bb8eb5747e363b2c24b94a2e25dac9b505004c78863c +size 7216 diff --git a/AutomatedTesting/Levels/Physics/C6090554_ForceRegion_PointForceNegative/filelist.xml b/AutomatedTesting/Levels/Physics/ForceRegion_ZeroLocalSpaceForceDoesNothing/filelist.xml similarity index 70% rename from AutomatedTesting/Levels/Physics/C6090554_ForceRegion_PointForceNegative/filelist.xml rename to AutomatedTesting/Levels/Physics/ForceRegion_ZeroLocalSpaceForceDoesNothing/filelist.xml index c0fa1227da..3e19435518 100644 --- a/AutomatedTesting/Levels/Physics/C6090554_ForceRegion_PointForceNegative/filelist.xml +++ b/AutomatedTesting/Levels/Physics/ForceRegion_ZeroLocalSpaceForceDoesNothing/filelist.xml @@ -1,4 +1,4 @@ - + diff --git a/AutomatedTesting/Levels/Physics/C6090550_ForceRegion_WorldSpaceForceNegative/level.pak b/AutomatedTesting/Levels/Physics/ForceRegion_ZeroLocalSpaceForceDoesNothing/level.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C6090550_ForceRegion_WorldSpaceForceNegative/level.pak rename to AutomatedTesting/Levels/Physics/ForceRegion_ZeroLocalSpaceForceDoesNothing/level.pak diff --git a/AutomatedTesting/Levels/Physics/C18243582_Joints_FixedLeadFollowerCollide/leveldata/Environment.xml b/AutomatedTesting/Levels/Physics/ForceRegion_ZeroLocalSpaceForceDoesNothing/leveldata/Environment.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C18243582_Joints_FixedLeadFollowerCollide/leveldata/Environment.xml rename to AutomatedTesting/Levels/Physics/ForceRegion_ZeroLocalSpaceForceDoesNothing/leveldata/Environment.xml diff --git a/AutomatedTesting/Levels/Physics/C15096732_Material_DefaultLibraryUpdatedAcrossLevels/1/leveldata/GameTokens.xml b/AutomatedTesting/Levels/Physics/ForceRegion_ZeroLocalSpaceForceDoesNothing/leveldata/GameTokens.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C15096732_Material_DefaultLibraryUpdatedAcrossLevels/1/leveldata/GameTokens.xml rename to AutomatedTesting/Levels/Physics/ForceRegion_ZeroLocalSpaceForceDoesNothing/leveldata/GameTokens.xml diff --git a/AutomatedTesting/Levels/Physics/C4925582_Material_AddModifyDeleteOnRagdollBones/leveldata/TerrainTexture.xml b/AutomatedTesting/Levels/Physics/ForceRegion_ZeroLocalSpaceForceDoesNothing/leveldata/TerrainTexture.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C4925582_Material_AddModifyDeleteOnRagdollBones/leveldata/TerrainTexture.xml rename to AutomatedTesting/Levels/Physics/ForceRegion_ZeroLocalSpaceForceDoesNothing/leveldata/TerrainTexture.xml diff --git a/AutomatedTesting/Levels/Physics/C4982593_PhysxCollider_CollisionLayerTest/leveldata/TimeOfDay.xml b/AutomatedTesting/Levels/Physics/ForceRegion_ZeroLocalSpaceForceDoesNothing/leveldata/TimeOfDay.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C4982593_PhysxCollider_CollisionLayerTest/leveldata/TimeOfDay.xml rename to AutomatedTesting/Levels/Physics/ForceRegion_ZeroLocalSpaceForceDoesNothing/leveldata/TimeOfDay.xml diff --git a/AutomatedTesting/Levels/Physics/C18243585_Joints_HingeNoLimitsConstrained/leveldata/VegetationMap.dat b/AutomatedTesting/Levels/Physics/ForceRegion_ZeroLocalSpaceForceDoesNothing/leveldata/VegetationMap.dat similarity index 100% rename from AutomatedTesting/Levels/Physics/C18243585_Joints_HingeNoLimitsConstrained/leveldata/VegetationMap.dat rename to AutomatedTesting/Levels/Physics/ForceRegion_ZeroLocalSpaceForceDoesNothing/leveldata/VegetationMap.dat diff --git a/AutomatedTesting/Levels/Physics/C18243584_Joints_HingeSoftLimitsConstrained/tags.txt b/AutomatedTesting/Levels/Physics/ForceRegion_ZeroLocalSpaceForceDoesNothing/tags.txt similarity index 100% rename from AutomatedTesting/Levels/Physics/C18243584_Joints_HingeSoftLimitsConstrained/tags.txt rename to AutomatedTesting/Levels/Physics/ForceRegion_ZeroLocalSpaceForceDoesNothing/tags.txt diff --git a/AutomatedTesting/Levels/Physics/C4925580_Material_RagdollBonesMaterial/terrain/terrain.pxheightfield b/AutomatedTesting/Levels/Physics/ForceRegion_ZeroLocalSpaceForceDoesNothing/terrain/terrain.pxheightfield similarity index 100% rename from AutomatedTesting/Levels/Physics/C4925580_Material_RagdollBonesMaterial/terrain/terrain.pxheightfield rename to AutomatedTesting/Levels/Physics/ForceRegion_ZeroLocalSpaceForceDoesNothing/terrain/terrain.pxheightfield diff --git a/AutomatedTesting/Levels/Physics/C18243590_Joints_BallNoLimitsConstrained/terraintexture.pak b/AutomatedTesting/Levels/Physics/ForceRegion_ZeroLocalSpaceForceDoesNothing/terraintexture.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C18243590_Joints_BallNoLimitsConstrained/terraintexture.pak rename to AutomatedTesting/Levels/Physics/ForceRegion_ZeroLocalSpaceForceDoesNothing/terraintexture.pak diff --git a/AutomatedTesting/Levels/Physics/ForceRegion_ZeroPointForceDoesNothing/ForceRegion_ZeroPointForceDoesNothing.ly b/AutomatedTesting/Levels/Physics/ForceRegion_ZeroPointForceDoesNothing/ForceRegion_ZeroPointForceDoesNothing.ly new file mode 100644 index 0000000000..56ad1ce7a4 --- /dev/null +++ b/AutomatedTesting/Levels/Physics/ForceRegion_ZeroPointForceDoesNothing/ForceRegion_ZeroPointForceDoesNothing.ly @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9166e3bf96fd95997389f51ec3ce5a9765c563a04134143062b555a7d4260cdd +size 7398 diff --git a/AutomatedTesting/Levels/Physics/C6090550_ForceRegion_WorldSpaceForceNegative/filelist.xml b/AutomatedTesting/Levels/Physics/ForceRegion_ZeroPointForceDoesNothing/filelist.xml similarity index 70% rename from AutomatedTesting/Levels/Physics/C6090550_ForceRegion_WorldSpaceForceNegative/filelist.xml rename to AutomatedTesting/Levels/Physics/ForceRegion_ZeroPointForceDoesNothing/filelist.xml index c0fa1227da..3e19435518 100644 --- a/AutomatedTesting/Levels/Physics/C6090550_ForceRegion_WorldSpaceForceNegative/filelist.xml +++ b/AutomatedTesting/Levels/Physics/ForceRegion_ZeroPointForceDoesNothing/filelist.xml @@ -1,4 +1,4 @@ - + diff --git a/AutomatedTesting/Levels/Physics/C6090551_ForceRegion_LocalSpaceForceNegative/level.pak b/AutomatedTesting/Levels/Physics/ForceRegion_ZeroPointForceDoesNothing/level.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C6090551_ForceRegion_LocalSpaceForceNegative/level.pak rename to AutomatedTesting/Levels/Physics/ForceRegion_ZeroPointForceDoesNothing/level.pak diff --git a/AutomatedTesting/Levels/Physics/C18243583_Joints_Hinge2BodiesConstrained/leveldata/Environment.xml b/AutomatedTesting/Levels/Physics/ForceRegion_ZeroPointForceDoesNothing/leveldata/Environment.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C18243583_Joints_Hinge2BodiesConstrained/leveldata/Environment.xml rename to AutomatedTesting/Levels/Physics/ForceRegion_ZeroPointForceDoesNothing/leveldata/Environment.xml diff --git a/AutomatedTesting/Levels/Physics/C15096735_Materials_DefaultLibraryConsistency/leveldata/GameTokens.xml b/AutomatedTesting/Levels/Physics/ForceRegion_ZeroPointForceDoesNothing/leveldata/GameTokens.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C15096735_Materials_DefaultLibraryConsistency/leveldata/GameTokens.xml rename to AutomatedTesting/Levels/Physics/ForceRegion_ZeroPointForceDoesNothing/leveldata/GameTokens.xml diff --git a/AutomatedTesting/Levels/Physics/C4976201_RigidBody_MassIsAssigned/leveldata/TerrainTexture.xml b/AutomatedTesting/Levels/Physics/ForceRegion_ZeroPointForceDoesNothing/leveldata/TerrainTexture.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C4976201_RigidBody_MassIsAssigned/leveldata/TerrainTexture.xml rename to AutomatedTesting/Levels/Physics/ForceRegion_ZeroPointForceDoesNothing/leveldata/TerrainTexture.xml diff --git a/AutomatedTesting/Levels/Physics/C6090550_ForceRegion_WorldSpaceForceNegative/leveldata/TimeOfDay.xml b/AutomatedTesting/Levels/Physics/ForceRegion_ZeroPointForceDoesNothing/leveldata/TimeOfDay.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C6090550_ForceRegion_WorldSpaceForceNegative/leveldata/TimeOfDay.xml rename to AutomatedTesting/Levels/Physics/ForceRegion_ZeroPointForceDoesNothing/leveldata/TimeOfDay.xml diff --git a/AutomatedTesting/Levels/Physics/C18243586_Joints_HingeLeadFollowerCollide/leveldata/VegetationMap.dat b/AutomatedTesting/Levels/Physics/ForceRegion_ZeroPointForceDoesNothing/leveldata/VegetationMap.dat similarity index 100% rename from AutomatedTesting/Levels/Physics/C18243586_Joints_HingeLeadFollowerCollide/leveldata/VegetationMap.dat rename to AutomatedTesting/Levels/Physics/ForceRegion_ZeroPointForceDoesNothing/leveldata/VegetationMap.dat diff --git a/AutomatedTesting/Levels/Physics/C18243585_Joints_HingeNoLimitsConstrained/tags.txt b/AutomatedTesting/Levels/Physics/ForceRegion_ZeroPointForceDoesNothing/tags.txt similarity index 100% rename from AutomatedTesting/Levels/Physics/C18243585_Joints_HingeNoLimitsConstrained/tags.txt rename to AutomatedTesting/Levels/Physics/ForceRegion_ZeroPointForceDoesNothing/tags.txt diff --git a/AutomatedTesting/Levels/Physics/C4925582_Material_AddModifyDeleteOnRagdollBones/terrain/terrain.pxheightfield b/AutomatedTesting/Levels/Physics/ForceRegion_ZeroPointForceDoesNothing/terrain/terrain.pxheightfield similarity index 100% rename from AutomatedTesting/Levels/Physics/C4925582_Material_AddModifyDeleteOnRagdollBones/terrain/terrain.pxheightfield rename to AutomatedTesting/Levels/Physics/ForceRegion_ZeroPointForceDoesNothing/terrain/terrain.pxheightfield diff --git a/AutomatedTesting/Levels/Physics/C18243591_Joints_BallLeadFollowerCollide/terraintexture.pak b/AutomatedTesting/Levels/Physics/ForceRegion_ZeroPointForceDoesNothing/terraintexture.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C18243591_Joints_BallLeadFollowerCollide/terraintexture.pak rename to AutomatedTesting/Levels/Physics/ForceRegion_ZeroPointForceDoesNothing/terraintexture.pak diff --git a/AutomatedTesting/Levels/Physics/C6090553_ForceRegion_SimpleDragForceOnRigidBodies/C6090553_ForceRegion_SimpleDragForceOnRigidBodies.ly b/AutomatedTesting/Levels/Physics/ForceRegion_ZeroSimpleDragForceDoesNothing/ForceRegion_ZeroSimpleDragForceDoesNothing.ly similarity index 100% rename from AutomatedTesting/Levels/Physics/C6090553_ForceRegion_SimpleDragForceOnRigidBodies/C6090553_ForceRegion_SimpleDragForceOnRigidBodies.ly rename to AutomatedTesting/Levels/Physics/ForceRegion_ZeroSimpleDragForceDoesNothing/ForceRegion_ZeroSimpleDragForceDoesNothing.ly diff --git a/AutomatedTesting/Levels/Physics/C6090553_ForceRegion_SimpleDragForceOnRigidBodies/filelist.xml b/AutomatedTesting/Levels/Physics/ForceRegion_ZeroSimpleDragForceDoesNothing/filelist.xml similarity index 68% rename from AutomatedTesting/Levels/Physics/C6090553_ForceRegion_SimpleDragForceOnRigidBodies/filelist.xml rename to AutomatedTesting/Levels/Physics/ForceRegion_ZeroSimpleDragForceDoesNothing/filelist.xml index 1ec39b89c2..87165c13e4 100644 --- a/AutomatedTesting/Levels/Physics/C6090553_ForceRegion_SimpleDragForceOnRigidBodies/filelist.xml +++ b/AutomatedTesting/Levels/Physics/ForceRegion_ZeroSimpleDragForceDoesNothing/filelist.xml @@ -1,4 +1,4 @@ - + diff --git a/AutomatedTesting/Levels/Physics/C6090553_ForceRegion_SimpleDragForceOnRigidBodies/level.pak b/AutomatedTesting/Levels/Physics/ForceRegion_ZeroSimpleDragForceDoesNothing/level.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C6090553_ForceRegion_SimpleDragForceOnRigidBodies/level.pak rename to AutomatedTesting/Levels/Physics/ForceRegion_ZeroSimpleDragForceDoesNothing/level.pak diff --git a/AutomatedTesting/Levels/Physics/C18243584_Joints_HingeSoftLimitsConstrained/leveldata/Environment.xml b/AutomatedTesting/Levels/Physics/ForceRegion_ZeroSimpleDragForceDoesNothing/leveldata/Environment.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C18243584_Joints_HingeSoftLimitsConstrained/leveldata/Environment.xml rename to AutomatedTesting/Levels/Physics/ForceRegion_ZeroSimpleDragForceDoesNothing/leveldata/Environment.xml diff --git a/AutomatedTesting/Levels/Physics/C15096737_Materials_DefaultMaterialLibraryChanges/leveldata/GameTokens.xml b/AutomatedTesting/Levels/Physics/ForceRegion_ZeroSimpleDragForceDoesNothing/leveldata/GameTokens.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C15096737_Materials_DefaultMaterialLibraryChanges/leveldata/GameTokens.xml rename to AutomatedTesting/Levels/Physics/ForceRegion_ZeroSimpleDragForceDoesNothing/leveldata/GameTokens.xml diff --git a/AutomatedTesting/Levels/Physics/C15096732_Material_DefaultLibraryUpdatedAcrossLevels/1/leveldata/TerrainTexture.xml b/AutomatedTesting/Levels/Physics/ForceRegion_ZeroSimpleDragForceDoesNothing/leveldata/TerrainTexture.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C15096732_Material_DefaultLibraryUpdatedAcrossLevels/1/leveldata/TerrainTexture.xml rename to AutomatedTesting/Levels/Physics/ForceRegion_ZeroSimpleDragForceDoesNothing/leveldata/TerrainTexture.xml diff --git a/AutomatedTesting/Levels/Physics/C18243580_Joints_Fixed2BodiesConstrained/LevelData/TimeOfDay.xml b/AutomatedTesting/Levels/Physics/ForceRegion_ZeroSimpleDragForceDoesNothing/leveldata/TimeOfDay.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C18243580_Joints_Fixed2BodiesConstrained/LevelData/TimeOfDay.xml rename to AutomatedTesting/Levels/Physics/ForceRegion_ZeroSimpleDragForceDoesNothing/leveldata/TimeOfDay.xml diff --git a/AutomatedTesting/Levels/Physics/C18243587_Joints_HingeBreakable/leveldata/VegetationMap.dat b/AutomatedTesting/Levels/Physics/ForceRegion_ZeroSimpleDragForceDoesNothing/leveldata/VegetationMap.dat similarity index 100% rename from AutomatedTesting/Levels/Physics/C18243587_Joints_HingeBreakable/leveldata/VegetationMap.dat rename to AutomatedTesting/Levels/Physics/ForceRegion_ZeroSimpleDragForceDoesNothing/leveldata/VegetationMap.dat diff --git a/AutomatedTesting/Levels/Physics/C18243586_Joints_HingeLeadFollowerCollide/tags.txt b/AutomatedTesting/Levels/Physics/ForceRegion_ZeroSimpleDragForceDoesNothing/tags.txt similarity index 100% rename from AutomatedTesting/Levels/Physics/C18243586_Joints_HingeLeadFollowerCollide/tags.txt rename to AutomatedTesting/Levels/Physics/ForceRegion_ZeroSimpleDragForceDoesNothing/tags.txt diff --git a/AutomatedTesting/Levels/Physics/C18243592_Joints_BallBreakable/terraintexture.pak b/AutomatedTesting/Levels/Physics/ForceRegion_ZeroSimpleDragForceDoesNothing/terraintexture.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C18243592_Joints_BallBreakable/terraintexture.pak rename to AutomatedTesting/Levels/Physics/ForceRegion_ZeroSimpleDragForceDoesNothing/terraintexture.pak diff --git a/AutomatedTesting/Levels/Physics/C6090555_ForceRegion_SplineFollowOnRigidBodies/C6090555_ForceRegion_SplineFollowOnRigidBodies.ly b/AutomatedTesting/Levels/Physics/ForceRegion_ZeroSplineForceDoesNothing/ForceRegion_ZeroSplineForceDoesNothing.ly similarity index 100% rename from AutomatedTesting/Levels/Physics/C6090555_ForceRegion_SplineFollowOnRigidBodies/C6090555_ForceRegion_SplineFollowOnRigidBodies.ly rename to AutomatedTesting/Levels/Physics/ForceRegion_ZeroSplineForceDoesNothing/ForceRegion_ZeroSplineForceDoesNothing.ly diff --git a/AutomatedTesting/Levels/Physics/C6090555_ForceRegion_SplineFollowOnRigidBodies/filelist.xml b/AutomatedTesting/Levels/Physics/ForceRegion_ZeroSplineForceDoesNothing/filelist.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C6090555_ForceRegion_SplineFollowOnRigidBodies/filelist.xml rename to AutomatedTesting/Levels/Physics/ForceRegion_ZeroSplineForceDoesNothing/filelist.xml diff --git a/AutomatedTesting/Levels/Physics/C6090555_ForceRegion_SplineFollowOnRigidBodies/level.pak b/AutomatedTesting/Levels/Physics/ForceRegion_ZeroSplineForceDoesNothing/level.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C6090555_ForceRegion_SplineFollowOnRigidBodies/level.pak rename to AutomatedTesting/Levels/Physics/ForceRegion_ZeroSplineForceDoesNothing/level.pak diff --git a/AutomatedTesting/Levels/Physics/C29032500_EditorComponents_WorldBodyBusWorks/leveldata/Environment.xml b/AutomatedTesting/Levels/Physics/ForceRegion_ZeroSplineForceDoesNothing/leveldata/Environment.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C29032500_EditorComponents_WorldBodyBusWorks/leveldata/Environment.xml rename to AutomatedTesting/Levels/Physics/ForceRegion_ZeroSplineForceDoesNothing/leveldata/Environment.xml diff --git a/AutomatedTesting/Levels/Physics/C15308217_NoCrash_LevelSwitchWithOutTerrain/leveldata/GameTokens.xml b/AutomatedTesting/Levels/Physics/ForceRegion_ZeroSplineForceDoesNothing/leveldata/GameTokens.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C15308217_NoCrash_LevelSwitchWithOutTerrain/leveldata/GameTokens.xml rename to AutomatedTesting/Levels/Physics/ForceRegion_ZeroSplineForceDoesNothing/leveldata/GameTokens.xml diff --git a/AutomatedTesting/Levels/Physics/C6090555_ForceRegion_SplineFollowOnRigidBodies/leveldata/TerrainTexture.xml b/AutomatedTesting/Levels/Physics/ForceRegion_ZeroSplineForceDoesNothing/leveldata/TerrainTexture.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C6090555_ForceRegion_SplineFollowOnRigidBodies/leveldata/TerrainTexture.xml rename to AutomatedTesting/Levels/Physics/ForceRegion_ZeroSplineForceDoesNothing/leveldata/TerrainTexture.xml diff --git a/AutomatedTesting/Levels/Physics/C18243582_Joints_FixedLeadFollowerCollide/leveldata/TimeOfDay.xml b/AutomatedTesting/Levels/Physics/ForceRegion_ZeroSplineForceDoesNothing/leveldata/TimeOfDay.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C18243582_Joints_FixedLeadFollowerCollide/leveldata/TimeOfDay.xml rename to AutomatedTesting/Levels/Physics/ForceRegion_ZeroSplineForceDoesNothing/leveldata/TimeOfDay.xml diff --git a/AutomatedTesting/Levels/Physics/C18243588_Joints_Ball2BodiesConstrained/leveldata/VegetationMap.dat b/AutomatedTesting/Levels/Physics/ForceRegion_ZeroSplineForceDoesNothing/leveldata/VegetationMap.dat similarity index 100% rename from AutomatedTesting/Levels/Physics/C18243588_Joints_Ball2BodiesConstrained/leveldata/VegetationMap.dat rename to AutomatedTesting/Levels/Physics/ForceRegion_ZeroSplineForceDoesNothing/leveldata/VegetationMap.dat diff --git a/AutomatedTesting/Levels/Physics/C18243587_Joints_HingeBreakable/tags.txt b/AutomatedTesting/Levels/Physics/ForceRegion_ZeroSplineForceDoesNothing/tags.txt similarity index 100% rename from AutomatedTesting/Levels/Physics/C18243587_Joints_HingeBreakable/tags.txt rename to AutomatedTesting/Levels/Physics/ForceRegion_ZeroSplineForceDoesNothing/tags.txt diff --git a/AutomatedTesting/Levels/Physics/ForceRegion_ZeroWorldSpaceForceDoesNothing/ForceRegion_ZeroWorldSpaceForceDoesNothing.ly b/AutomatedTesting/Levels/Physics/ForceRegion_ZeroWorldSpaceForceDoesNothing/ForceRegion_ZeroWorldSpaceForceDoesNothing.ly new file mode 100644 index 0000000000..f03a3ff606 --- /dev/null +++ b/AutomatedTesting/Levels/Physics/ForceRegion_ZeroWorldSpaceForceDoesNothing/ForceRegion_ZeroWorldSpaceForceDoesNothing.ly @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1796f237a8a9500bf58cd89820a39dac5b94108302abd8eda54067abba46508e +size 7203 diff --git a/AutomatedTesting/Levels/Physics/C6090551_ForceRegion_LocalSpaceForceNegative/filelist.xml b/AutomatedTesting/Levels/Physics/ForceRegion_ZeroWorldSpaceForceDoesNothing/filelist.xml similarity index 70% rename from AutomatedTesting/Levels/Physics/C6090551_ForceRegion_LocalSpaceForceNegative/filelist.xml rename to AutomatedTesting/Levels/Physics/ForceRegion_ZeroWorldSpaceForceDoesNothing/filelist.xml index c0fa1227da..3e19435518 100644 --- a/AutomatedTesting/Levels/Physics/C6090551_ForceRegion_LocalSpaceForceNegative/filelist.xml +++ b/AutomatedTesting/Levels/Physics/ForceRegion_ZeroWorldSpaceForceDoesNothing/filelist.xml @@ -1,4 +1,4 @@ - + diff --git a/AutomatedTesting/Levels/Physics/C6090554_ForceRegion_PointForceNegative/level.pak b/AutomatedTesting/Levels/Physics/ForceRegion_ZeroWorldSpaceForceDoesNothing/level.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C6090554_ForceRegion_PointForceNegative/level.pak rename to AutomatedTesting/Levels/Physics/ForceRegion_ZeroWorldSpaceForceDoesNothing/level.pak diff --git a/AutomatedTesting/Levels/Physics/C18243585_Joints_HingeNoLimitsConstrained/leveldata/Environment.xml b/AutomatedTesting/Levels/Physics/ForceRegion_ZeroWorldSpaceForceDoesNothing/leveldata/Environment.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C18243585_Joints_HingeNoLimitsConstrained/leveldata/Environment.xml rename to AutomatedTesting/Levels/Physics/ForceRegion_ZeroWorldSpaceForceDoesNothing/leveldata/Environment.xml diff --git a/AutomatedTesting/Levels/Physics/C15308217_NoCrash_LevelSwitchWithTerrain/leveldata/GameTokens.xml b/AutomatedTesting/Levels/Physics/ForceRegion_ZeroWorldSpaceForceDoesNothing/leveldata/GameTokens.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C15308217_NoCrash_LevelSwitchWithTerrain/leveldata/GameTokens.xml rename to AutomatedTesting/Levels/Physics/ForceRegion_ZeroWorldSpaceForceDoesNothing/leveldata/GameTokens.xml diff --git a/AutomatedTesting/Levels/Physics/C4976202_RigidBody_StopsWhenBelowKineticThreshold/leveldata/TerrainTexture.xml b/AutomatedTesting/Levels/Physics/ForceRegion_ZeroWorldSpaceForceDoesNothing/leveldata/TerrainTexture.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C4976202_RigidBody_StopsWhenBelowKineticThreshold/leveldata/TerrainTexture.xml rename to AutomatedTesting/Levels/Physics/ForceRegion_ZeroWorldSpaceForceDoesNothing/leveldata/TerrainTexture.xml diff --git a/AutomatedTesting/Levels/Physics/C6090551_ForceRegion_LocalSpaceForceNegative/leveldata/TimeOfDay.xml b/AutomatedTesting/Levels/Physics/ForceRegion_ZeroWorldSpaceForceDoesNothing/leveldata/TimeOfDay.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C6090551_ForceRegion_LocalSpaceForceNegative/leveldata/TimeOfDay.xml rename to AutomatedTesting/Levels/Physics/ForceRegion_ZeroWorldSpaceForceDoesNothing/leveldata/TimeOfDay.xml diff --git a/AutomatedTesting/Levels/Physics/C18243589_Joints_BallSoftLimitsConstrained/leveldata/VegetationMap.dat b/AutomatedTesting/Levels/Physics/ForceRegion_ZeroWorldSpaceForceDoesNothing/leveldata/VegetationMap.dat similarity index 100% rename from AutomatedTesting/Levels/Physics/C18243589_Joints_BallSoftLimitsConstrained/leveldata/VegetationMap.dat rename to AutomatedTesting/Levels/Physics/ForceRegion_ZeroWorldSpaceForceDoesNothing/leveldata/VegetationMap.dat diff --git a/AutomatedTesting/Levels/Physics/C18243588_Joints_Ball2BodiesConstrained/tags.txt b/AutomatedTesting/Levels/Physics/ForceRegion_ZeroWorldSpaceForceDoesNothing/tags.txt similarity index 100% rename from AutomatedTesting/Levels/Physics/C18243588_Joints_Ball2BodiesConstrained/tags.txt rename to AutomatedTesting/Levels/Physics/ForceRegion_ZeroWorldSpaceForceDoesNothing/tags.txt diff --git a/AutomatedTesting/Levels/Physics/C4976201_RigidBody_MassIsAssigned/terrain/terrain.pxheightfield b/AutomatedTesting/Levels/Physics/ForceRegion_ZeroWorldSpaceForceDoesNothing/terrain/terrain.pxheightfield similarity index 100% rename from AutomatedTesting/Levels/Physics/C4976201_RigidBody_MassIsAssigned/terrain/terrain.pxheightfield rename to AutomatedTesting/Levels/Physics/ForceRegion_ZeroWorldSpaceForceDoesNothing/terrain/terrain.pxheightfield diff --git a/AutomatedTesting/Levels/Physics/C18243593_Joints_GlobalFrameConstrained/terraintexture.pak b/AutomatedTesting/Levels/Physics/ForceRegion_ZeroWorldSpaceForceDoesNothing/terraintexture.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C18243593_Joints_GlobalFrameConstrained/terraintexture.pak rename to AutomatedTesting/Levels/Physics/ForceRegion_ZeroWorldSpaceForceDoesNothing/terraintexture.pak diff --git a/AutomatedTesting/Levels/Physics/C18243588_Joints_Ball2BodiesConstrained/C18243588_Joints_Ball2BodiesConstrained.ly b/AutomatedTesting/Levels/Physics/Joints_Ball2BodiesConstrained/Joints_Ball2BodiesConstrained.ly similarity index 100% rename from AutomatedTesting/Levels/Physics/C18243588_Joints_Ball2BodiesConstrained/C18243588_Joints_Ball2BodiesConstrained.ly rename to AutomatedTesting/Levels/Physics/Joints_Ball2BodiesConstrained/Joints_Ball2BodiesConstrained.ly diff --git a/AutomatedTesting/Levels/Physics/C18243580_Joints_Fixed2BodiesConstrained/filelist.xml b/AutomatedTesting/Levels/Physics/Joints_Ball2BodiesConstrained/filelist.xml similarity index 71% rename from AutomatedTesting/Levels/Physics/C18243580_Joints_Fixed2BodiesConstrained/filelist.xml rename to AutomatedTesting/Levels/Physics/Joints_Ball2BodiesConstrained/filelist.xml index fa5a7aa319..d0960f8154 100644 --- a/AutomatedTesting/Levels/Physics/C18243580_Joints_Fixed2BodiesConstrained/filelist.xml +++ b/AutomatedTesting/Levels/Physics/Joints_Ball2BodiesConstrained/filelist.xml @@ -1,4 +1,4 @@ - + diff --git a/AutomatedTesting/Levels/Physics/C18243580_Joints_Fixed2BodiesConstrained/level.pak b/AutomatedTesting/Levels/Physics/Joints_Ball2BodiesConstrained/level.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C18243580_Joints_Fixed2BodiesConstrained/level.pak rename to AutomatedTesting/Levels/Physics/Joints_Ball2BodiesConstrained/level.pak diff --git a/AutomatedTesting/Levels/Physics/C18243586_Joints_HingeLeadFollowerCollide/leveldata/Environment.xml b/AutomatedTesting/Levels/Physics/Joints_Ball2BodiesConstrained/leveldata/Environment.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C18243586_Joints_HingeLeadFollowerCollide/leveldata/Environment.xml rename to AutomatedTesting/Levels/Physics/Joints_Ball2BodiesConstrained/leveldata/Environment.xml diff --git a/AutomatedTesting/Levels/Physics/C15096737_Materials_DefaultMaterialLibraryChanges/leveldata/TerrainTexture.xml b/AutomatedTesting/Levels/Physics/Joints_Ball2BodiesConstrained/leveldata/TerrainTexture.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C15096737_Materials_DefaultMaterialLibraryChanges/leveldata/TerrainTexture.xml rename to AutomatedTesting/Levels/Physics/Joints_Ball2BodiesConstrained/leveldata/TerrainTexture.xml diff --git a/AutomatedTesting/Levels/Physics/C18243583_Joints_Hinge2BodiesConstrained/leveldata/TimeOfDay.xml b/AutomatedTesting/Levels/Physics/Joints_Ball2BodiesConstrained/leveldata/TimeOfDay.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C18243583_Joints_Hinge2BodiesConstrained/leveldata/TimeOfDay.xml rename to AutomatedTesting/Levels/Physics/Joints_Ball2BodiesConstrained/leveldata/TimeOfDay.xml diff --git a/AutomatedTesting/Levels/Physics/C18243590_Joints_BallNoLimitsConstrained/leveldata/VegetationMap.dat b/AutomatedTesting/Levels/Physics/Joints_Ball2BodiesConstrained/leveldata/VegetationMap.dat similarity index 100% rename from AutomatedTesting/Levels/Physics/C18243590_Joints_BallNoLimitsConstrained/leveldata/VegetationMap.dat rename to AutomatedTesting/Levels/Physics/Joints_Ball2BodiesConstrained/leveldata/VegetationMap.dat diff --git a/AutomatedTesting/Levels/Physics/C18243589_Joints_BallSoftLimitsConstrained/tags.txt b/AutomatedTesting/Levels/Physics/Joints_Ball2BodiesConstrained/tags.txt similarity index 100% rename from AutomatedTesting/Levels/Physics/C18243589_Joints_BallSoftLimitsConstrained/tags.txt rename to AutomatedTesting/Levels/Physics/Joints_Ball2BodiesConstrained/tags.txt diff --git a/AutomatedTesting/Levels/Physics/C18977601_Material_FrictionCombinePriority/terraintexture.pak b/AutomatedTesting/Levels/Physics/Joints_Ball2BodiesConstrained/terraintexture.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C18977601_Material_FrictionCombinePriority/terraintexture.pak rename to AutomatedTesting/Levels/Physics/Joints_Ball2BodiesConstrained/terraintexture.pak diff --git a/AutomatedTesting/Levels/Physics/C18243592_Joints_BallBreakable/C18243592_Joints_BallBreakable.ly b/AutomatedTesting/Levels/Physics/Joints_BallBreakable/Joints_BallBreakable.ly similarity index 100% rename from AutomatedTesting/Levels/Physics/C18243592_Joints_BallBreakable/C18243592_Joints_BallBreakable.ly rename to AutomatedTesting/Levels/Physics/Joints_BallBreakable/Joints_BallBreakable.ly diff --git a/AutomatedTesting/Levels/Physics/C18243581_Joints_FixedBreakable/filelist.xml b/AutomatedTesting/Levels/Physics/Joints_BallBreakable/filelist.xml similarity index 71% rename from AutomatedTesting/Levels/Physics/C18243581_Joints_FixedBreakable/filelist.xml rename to AutomatedTesting/Levels/Physics/Joints_BallBreakable/filelist.xml index fa5a7aa319..d0960f8154 100644 --- a/AutomatedTesting/Levels/Physics/C18243581_Joints_FixedBreakable/filelist.xml +++ b/AutomatedTesting/Levels/Physics/Joints_BallBreakable/filelist.xml @@ -1,4 +1,4 @@ - + diff --git a/AutomatedTesting/Levels/Physics/C18243581_Joints_FixedBreakable/level.pak b/AutomatedTesting/Levels/Physics/Joints_BallBreakable/level.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C18243581_Joints_FixedBreakable/level.pak rename to AutomatedTesting/Levels/Physics/Joints_BallBreakable/level.pak diff --git a/AutomatedTesting/Levels/Physics/C18243587_Joints_HingeBreakable/leveldata/Environment.xml b/AutomatedTesting/Levels/Physics/Joints_BallBreakable/leveldata/Environment.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C18243587_Joints_HingeBreakable/leveldata/Environment.xml rename to AutomatedTesting/Levels/Physics/Joints_BallBreakable/leveldata/Environment.xml diff --git a/AutomatedTesting/Levels/Physics/C15308217_NoCrash_LevelSwitchWithOutTerrain/leveldata/TerrainTexture.xml b/AutomatedTesting/Levels/Physics/Joints_BallBreakable/leveldata/TerrainTexture.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C15308217_NoCrash_LevelSwitchWithOutTerrain/leveldata/TerrainTexture.xml rename to AutomatedTesting/Levels/Physics/Joints_BallBreakable/leveldata/TerrainTexture.xml diff --git a/AutomatedTesting/Levels/Physics/C18243584_Joints_HingeSoftLimitsConstrained/leveldata/TimeOfDay.xml b/AutomatedTesting/Levels/Physics/Joints_BallBreakable/leveldata/TimeOfDay.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C18243584_Joints_HingeSoftLimitsConstrained/leveldata/TimeOfDay.xml rename to AutomatedTesting/Levels/Physics/Joints_BallBreakable/leveldata/TimeOfDay.xml diff --git a/AutomatedTesting/Levels/Physics/C18243591_Joints_BallLeadFollowerCollide/leveldata/VegetationMap.dat b/AutomatedTesting/Levels/Physics/Joints_BallBreakable/leveldata/VegetationMap.dat similarity index 100% rename from AutomatedTesting/Levels/Physics/C18243591_Joints_BallLeadFollowerCollide/leveldata/VegetationMap.dat rename to AutomatedTesting/Levels/Physics/Joints_BallBreakable/leveldata/VegetationMap.dat diff --git a/AutomatedTesting/Levels/Physics/C18243590_Joints_BallNoLimitsConstrained/tags.txt b/AutomatedTesting/Levels/Physics/Joints_BallBreakable/tags.txt similarity index 100% rename from AutomatedTesting/Levels/Physics/C18243590_Joints_BallNoLimitsConstrained/tags.txt rename to AutomatedTesting/Levels/Physics/Joints_BallBreakable/tags.txt diff --git a/AutomatedTesting/Levels/Physics/C18981526_Material_RestitutionCombinePriority/terraintexture.pak b/AutomatedTesting/Levels/Physics/Joints_BallBreakable/terraintexture.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C18981526_Material_RestitutionCombinePriority/terraintexture.pak rename to AutomatedTesting/Levels/Physics/Joints_BallBreakable/terraintexture.pak diff --git a/AutomatedTesting/Levels/Physics/C18243591_Joints_BallLeadFollowerCollide/C18243591_Joints_BallLeadFollowerCollide.ly b/AutomatedTesting/Levels/Physics/Joints_BallLeadFollowerCollide/Joints_BallLeadFollowerCollide.ly similarity index 100% rename from AutomatedTesting/Levels/Physics/C18243591_Joints_BallLeadFollowerCollide/C18243591_Joints_BallLeadFollowerCollide.ly rename to AutomatedTesting/Levels/Physics/Joints_BallLeadFollowerCollide/Joints_BallLeadFollowerCollide.ly diff --git a/AutomatedTesting/Levels/Physics/C18243582_Joints_FixedLeadFollowerCollide/filelist.xml b/AutomatedTesting/Levels/Physics/Joints_BallLeadFollowerCollide/filelist.xml similarity index 71% rename from AutomatedTesting/Levels/Physics/C18243582_Joints_FixedLeadFollowerCollide/filelist.xml rename to AutomatedTesting/Levels/Physics/Joints_BallLeadFollowerCollide/filelist.xml index fa5a7aa319..d0960f8154 100644 --- a/AutomatedTesting/Levels/Physics/C18243582_Joints_FixedLeadFollowerCollide/filelist.xml +++ b/AutomatedTesting/Levels/Physics/Joints_BallLeadFollowerCollide/filelist.xml @@ -1,4 +1,4 @@ - + diff --git a/AutomatedTesting/Levels/Physics/C18243582_Joints_FixedLeadFollowerCollide/level.pak b/AutomatedTesting/Levels/Physics/Joints_BallLeadFollowerCollide/level.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C18243582_Joints_FixedLeadFollowerCollide/level.pak rename to AutomatedTesting/Levels/Physics/Joints_BallLeadFollowerCollide/level.pak diff --git a/AutomatedTesting/Levels/Physics/C18243588_Joints_Ball2BodiesConstrained/leveldata/Environment.xml b/AutomatedTesting/Levels/Physics/Joints_BallLeadFollowerCollide/leveldata/Environment.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C18243588_Joints_Ball2BodiesConstrained/leveldata/Environment.xml rename to AutomatedTesting/Levels/Physics/Joints_BallLeadFollowerCollide/leveldata/Environment.xml diff --git a/AutomatedTesting/Levels/Physics/C15308217_NoCrash_LevelSwitchWithTerrain/leveldata/TerrainTexture.xml b/AutomatedTesting/Levels/Physics/Joints_BallLeadFollowerCollide/leveldata/TerrainTexture.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C15308217_NoCrash_LevelSwitchWithTerrain/leveldata/TerrainTexture.xml rename to AutomatedTesting/Levels/Physics/Joints_BallLeadFollowerCollide/leveldata/TerrainTexture.xml diff --git a/AutomatedTesting/Levels/Physics/C18243585_Joints_HingeNoLimitsConstrained/leveldata/TimeOfDay.xml b/AutomatedTesting/Levels/Physics/Joints_BallLeadFollowerCollide/leveldata/TimeOfDay.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C18243585_Joints_HingeNoLimitsConstrained/leveldata/TimeOfDay.xml rename to AutomatedTesting/Levels/Physics/Joints_BallLeadFollowerCollide/leveldata/TimeOfDay.xml diff --git a/AutomatedTesting/Levels/Physics/C18243592_Joints_BallBreakable/leveldata/VegetationMap.dat b/AutomatedTesting/Levels/Physics/Joints_BallLeadFollowerCollide/leveldata/VegetationMap.dat similarity index 100% rename from AutomatedTesting/Levels/Physics/C18243592_Joints_BallBreakable/leveldata/VegetationMap.dat rename to AutomatedTesting/Levels/Physics/Joints_BallLeadFollowerCollide/leveldata/VegetationMap.dat diff --git a/AutomatedTesting/Levels/Physics/C18243591_Joints_BallLeadFollowerCollide/tags.txt b/AutomatedTesting/Levels/Physics/Joints_BallLeadFollowerCollide/tags.txt similarity index 100% rename from AutomatedTesting/Levels/Physics/C18243591_Joints_BallLeadFollowerCollide/tags.txt rename to AutomatedTesting/Levels/Physics/Joints_BallLeadFollowerCollide/tags.txt diff --git a/AutomatedTesting/Levels/Physics/C24308873_CylinderShapeCollider_CollidesWithPhysXTerrain/terraintexture.pak b/AutomatedTesting/Levels/Physics/Joints_BallLeadFollowerCollide/terraintexture.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C24308873_CylinderShapeCollider_CollidesWithPhysXTerrain/terraintexture.pak rename to AutomatedTesting/Levels/Physics/Joints_BallLeadFollowerCollide/terraintexture.pak diff --git a/AutomatedTesting/Levels/Physics/C18243590_Joints_BallNoLimitsConstrained/C18243590_Joints_BallNoLimitsConstrained.ly b/AutomatedTesting/Levels/Physics/Joints_BallNoLimitsConstrained/Joints_BallNoLimitsConstrained.ly similarity index 100% rename from AutomatedTesting/Levels/Physics/C18243590_Joints_BallNoLimitsConstrained/C18243590_Joints_BallNoLimitsConstrained.ly rename to AutomatedTesting/Levels/Physics/Joints_BallNoLimitsConstrained/Joints_BallNoLimitsConstrained.ly diff --git a/AutomatedTesting/Levels/Physics/C18243583_Joints_Hinge2BodiesConstrained/filelist.xml b/AutomatedTesting/Levels/Physics/Joints_BallNoLimitsConstrained/filelist.xml similarity index 71% rename from AutomatedTesting/Levels/Physics/C18243583_Joints_Hinge2BodiesConstrained/filelist.xml rename to AutomatedTesting/Levels/Physics/Joints_BallNoLimitsConstrained/filelist.xml index fa5a7aa319..d0960f8154 100644 --- a/AutomatedTesting/Levels/Physics/C18243583_Joints_Hinge2BodiesConstrained/filelist.xml +++ b/AutomatedTesting/Levels/Physics/Joints_BallNoLimitsConstrained/filelist.xml @@ -1,4 +1,4 @@ - + diff --git a/AutomatedTesting/Levels/Physics/C18243583_Joints_Hinge2BodiesConstrained/level.pak b/AutomatedTesting/Levels/Physics/Joints_BallNoLimitsConstrained/level.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C18243583_Joints_Hinge2BodiesConstrained/level.pak rename to AutomatedTesting/Levels/Physics/Joints_BallNoLimitsConstrained/level.pak diff --git a/AutomatedTesting/Levels/Physics/C18243589_Joints_BallSoftLimitsConstrained/leveldata/Environment.xml b/AutomatedTesting/Levels/Physics/Joints_BallNoLimitsConstrained/leveldata/Environment.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C18243589_Joints_BallSoftLimitsConstrained/leveldata/Environment.xml rename to AutomatedTesting/Levels/Physics/Joints_BallNoLimitsConstrained/leveldata/Environment.xml diff --git a/AutomatedTesting/Levels/Physics/C15308221_Material_ComponentsInSyncWithLibrary/leveldata/TerrainTexture.xml b/AutomatedTesting/Levels/Physics/Joints_BallNoLimitsConstrained/leveldata/TerrainTexture.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C15308221_Material_ComponentsInSyncWithLibrary/leveldata/TerrainTexture.xml rename to AutomatedTesting/Levels/Physics/Joints_BallNoLimitsConstrained/leveldata/TerrainTexture.xml diff --git a/AutomatedTesting/Levels/Physics/C18243586_Joints_HingeLeadFollowerCollide/leveldata/TimeOfDay.xml b/AutomatedTesting/Levels/Physics/Joints_BallNoLimitsConstrained/leveldata/TimeOfDay.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C18243586_Joints_HingeLeadFollowerCollide/leveldata/TimeOfDay.xml rename to AutomatedTesting/Levels/Physics/Joints_BallNoLimitsConstrained/leveldata/TimeOfDay.xml diff --git a/AutomatedTesting/Levels/Physics/C18243593_Joints_GlobalFrameConstrained/leveldata/VegetationMap.dat b/AutomatedTesting/Levels/Physics/Joints_BallNoLimitsConstrained/leveldata/VegetationMap.dat similarity index 100% rename from AutomatedTesting/Levels/Physics/C18243593_Joints_GlobalFrameConstrained/leveldata/VegetationMap.dat rename to AutomatedTesting/Levels/Physics/Joints_BallNoLimitsConstrained/leveldata/VegetationMap.dat diff --git a/AutomatedTesting/Levels/Physics/C18243592_Joints_BallBreakable/tags.txt b/AutomatedTesting/Levels/Physics/Joints_BallNoLimitsConstrained/tags.txt similarity index 100% rename from AutomatedTesting/Levels/Physics/C18243592_Joints_BallBreakable/tags.txt rename to AutomatedTesting/Levels/Physics/Joints_BallNoLimitsConstrained/tags.txt diff --git a/AutomatedTesting/Levels/Physics/C29032500_EditorComponents_WorldBodyBusWorks/terraintexture.pak b/AutomatedTesting/Levels/Physics/Joints_BallNoLimitsConstrained/terraintexture.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C29032500_EditorComponents_WorldBodyBusWorks/terraintexture.pak rename to AutomatedTesting/Levels/Physics/Joints_BallNoLimitsConstrained/terraintexture.pak diff --git a/AutomatedTesting/Levels/Physics/C18243589_Joints_BallSoftLimitsConstrained/C18243589_Joints_BallSoftLimitsConstrained.ly b/AutomatedTesting/Levels/Physics/Joints_BallSoftLimitsConstrained/Joints_BallSoftLimitsConstrained.ly similarity index 100% rename from AutomatedTesting/Levels/Physics/C18243589_Joints_BallSoftLimitsConstrained/C18243589_Joints_BallSoftLimitsConstrained.ly rename to AutomatedTesting/Levels/Physics/Joints_BallSoftLimitsConstrained/Joints_BallSoftLimitsConstrained.ly diff --git a/AutomatedTesting/Levels/Physics/Joints_BallSoftLimitsConstrained/filelist.xml b/AutomatedTesting/Levels/Physics/Joints_BallSoftLimitsConstrained/filelist.xml new file mode 100644 index 0000000000..d0960f8154 --- /dev/null +++ b/AutomatedTesting/Levels/Physics/Joints_BallSoftLimitsConstrained/filelist.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/AutomatedTesting/Levels/Physics/C18243584_Joints_HingeSoftLimitsConstrained/level.pak b/AutomatedTesting/Levels/Physics/Joints_BallSoftLimitsConstrained/level.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C18243584_Joints_HingeSoftLimitsConstrained/level.pak rename to AutomatedTesting/Levels/Physics/Joints_BallSoftLimitsConstrained/level.pak diff --git a/AutomatedTesting/Levels/Physics/C18243590_Joints_BallNoLimitsConstrained/leveldata/Environment.xml b/AutomatedTesting/Levels/Physics/Joints_BallSoftLimitsConstrained/leveldata/Environment.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C18243590_Joints_BallNoLimitsConstrained/leveldata/Environment.xml rename to AutomatedTesting/Levels/Physics/Joints_BallSoftLimitsConstrained/leveldata/Environment.xml diff --git a/AutomatedTesting/Levels/Physics/C15425935_Material_LibraryUpdatedAcrossLevels/C15425935_Material_LibraryUpdatedAcrossLevels_0/leveldata/TerrainTexture.xml b/AutomatedTesting/Levels/Physics/Joints_BallSoftLimitsConstrained/leveldata/TerrainTexture.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C15425935_Material_LibraryUpdatedAcrossLevels/C15425935_Material_LibraryUpdatedAcrossLevels_0/leveldata/TerrainTexture.xml rename to AutomatedTesting/Levels/Physics/Joints_BallSoftLimitsConstrained/leveldata/TerrainTexture.xml diff --git a/AutomatedTesting/Levels/Physics/C18243587_Joints_HingeBreakable/leveldata/TimeOfDay.xml b/AutomatedTesting/Levels/Physics/Joints_BallSoftLimitsConstrained/leveldata/TimeOfDay.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C18243587_Joints_HingeBreakable/leveldata/TimeOfDay.xml rename to AutomatedTesting/Levels/Physics/Joints_BallSoftLimitsConstrained/leveldata/TimeOfDay.xml diff --git a/AutomatedTesting/Levels/Physics/C18977601_Material_FrictionCombinePriority/leveldata/VegetationMap.dat b/AutomatedTesting/Levels/Physics/Joints_BallSoftLimitsConstrained/leveldata/VegetationMap.dat similarity index 100% rename from AutomatedTesting/Levels/Physics/C18977601_Material_FrictionCombinePriority/leveldata/VegetationMap.dat rename to AutomatedTesting/Levels/Physics/Joints_BallSoftLimitsConstrained/leveldata/VegetationMap.dat diff --git a/AutomatedTesting/Levels/Physics/C18243593_Joints_GlobalFrameConstrained/tags.txt b/AutomatedTesting/Levels/Physics/Joints_BallSoftLimitsConstrained/tags.txt similarity index 100% rename from AutomatedTesting/Levels/Physics/C18243593_Joints_GlobalFrameConstrained/tags.txt rename to AutomatedTesting/Levels/Physics/Joints_BallSoftLimitsConstrained/tags.txt diff --git a/AutomatedTesting/Levels/Physics/C3510642_Terrain_NotCollideWithTerrain/terraintexture.pak b/AutomatedTesting/Levels/Physics/Joints_BallSoftLimitsConstrained/terraintexture.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C3510642_Terrain_NotCollideWithTerrain/terraintexture.pak rename to AutomatedTesting/Levels/Physics/Joints_BallSoftLimitsConstrained/terraintexture.pak diff --git a/AutomatedTesting/Levels/Physics/C18243580_Joints_Fixed2BodiesConstrained/C18243580_Joints_Fixed2BodiesConstrained.ly b/AutomatedTesting/Levels/Physics/Joints_Fixed2BodiesConstrained/Joints_Fixed2BodiesConstrained.ly similarity index 100% rename from AutomatedTesting/Levels/Physics/C18243580_Joints_Fixed2BodiesConstrained/C18243580_Joints_Fixed2BodiesConstrained.ly rename to AutomatedTesting/Levels/Physics/Joints_Fixed2BodiesConstrained/Joints_Fixed2BodiesConstrained.ly diff --git a/AutomatedTesting/Levels/Physics/C18243591_Joints_BallLeadFollowerCollide/leveldata/Environment.xml b/AutomatedTesting/Levels/Physics/Joints_Fixed2BodiesConstrained/LevelData/Environment.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C18243591_Joints_BallLeadFollowerCollide/leveldata/Environment.xml rename to AutomatedTesting/Levels/Physics/Joints_Fixed2BodiesConstrained/LevelData/Environment.xml diff --git a/AutomatedTesting/Levels/Physics/C15425935_Material_LibraryUpdatedAcrossLevels/C15425935_Material_LibraryUpdatedAcrossLevels_1/leveldata/TerrainTexture.xml b/AutomatedTesting/Levels/Physics/Joints_Fixed2BodiesConstrained/LevelData/TerrainTexture.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C15425935_Material_LibraryUpdatedAcrossLevels/C15425935_Material_LibraryUpdatedAcrossLevels_1/leveldata/TerrainTexture.xml rename to AutomatedTesting/Levels/Physics/Joints_Fixed2BodiesConstrained/LevelData/TerrainTexture.xml diff --git a/AutomatedTesting/Levels/Physics/C18243588_Joints_Ball2BodiesConstrained/leveldata/TimeOfDay.xml b/AutomatedTesting/Levels/Physics/Joints_Fixed2BodiesConstrained/LevelData/TimeOfDay.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C18243588_Joints_Ball2BodiesConstrained/leveldata/TimeOfDay.xml rename to AutomatedTesting/Levels/Physics/Joints_Fixed2BodiesConstrained/LevelData/TimeOfDay.xml diff --git a/AutomatedTesting/Levels/Physics/C18981526_Material_RestitutionCombinePriority/leveldata/VegetationMap.dat b/AutomatedTesting/Levels/Physics/Joints_Fixed2BodiesConstrained/LevelData/VegetationMap.dat similarity index 100% rename from AutomatedTesting/Levels/Physics/C18981526_Material_RestitutionCombinePriority/leveldata/VegetationMap.dat rename to AutomatedTesting/Levels/Physics/Joints_Fixed2BodiesConstrained/LevelData/VegetationMap.dat diff --git a/AutomatedTesting/Levels/Physics/Joints_Fixed2BodiesConstrained/filelist.xml b/AutomatedTesting/Levels/Physics/Joints_Fixed2BodiesConstrained/filelist.xml new file mode 100644 index 0000000000..d0960f8154 --- /dev/null +++ b/AutomatedTesting/Levels/Physics/Joints_Fixed2BodiesConstrained/filelist.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/AutomatedTesting/Levels/Physics/C18243585_Joints_HingeNoLimitsConstrained/level.pak b/AutomatedTesting/Levels/Physics/Joints_Fixed2BodiesConstrained/level.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C18243585_Joints_HingeNoLimitsConstrained/level.pak rename to AutomatedTesting/Levels/Physics/Joints_Fixed2BodiesConstrained/level.pak diff --git a/AutomatedTesting/Levels/Physics/C18977601_Material_FrictionCombinePriority/tags.txt b/AutomatedTesting/Levels/Physics/Joints_Fixed2BodiesConstrained/tags.txt similarity index 100% rename from AutomatedTesting/Levels/Physics/C18977601_Material_FrictionCombinePriority/tags.txt rename to AutomatedTesting/Levels/Physics/Joints_Fixed2BodiesConstrained/tags.txt diff --git a/AutomatedTesting/Levels/Physics/C3510644_Collider_CollisionGroups/terraintexture.pak b/AutomatedTesting/Levels/Physics/Joints_Fixed2BodiesConstrained/terraintexture.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C3510644_Collider_CollisionGroups/terraintexture.pak rename to AutomatedTesting/Levels/Physics/Joints_Fixed2BodiesConstrained/terraintexture.pak diff --git a/AutomatedTesting/Levels/Physics/C18243581_Joints_FixedBreakable/C18243581_Joints_FixedBreakable.ly b/AutomatedTesting/Levels/Physics/Joints_FixedBreakable/Joints_FixedBreakable.ly similarity index 100% rename from AutomatedTesting/Levels/Physics/C18243581_Joints_FixedBreakable/C18243581_Joints_FixedBreakable.ly rename to AutomatedTesting/Levels/Physics/Joints_FixedBreakable/Joints_FixedBreakable.ly diff --git a/AutomatedTesting/Levels/Physics/Joints_FixedBreakable/filelist.xml b/AutomatedTesting/Levels/Physics/Joints_FixedBreakable/filelist.xml new file mode 100644 index 0000000000..d0960f8154 --- /dev/null +++ b/AutomatedTesting/Levels/Physics/Joints_FixedBreakable/filelist.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/AutomatedTesting/Levels/Physics/C18243586_Joints_HingeLeadFollowerCollide/level.pak b/AutomatedTesting/Levels/Physics/Joints_FixedBreakable/level.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C18243586_Joints_HingeLeadFollowerCollide/level.pak rename to AutomatedTesting/Levels/Physics/Joints_FixedBreakable/level.pak diff --git a/AutomatedTesting/Levels/Physics/C18243592_Joints_BallBreakable/leveldata/Environment.xml b/AutomatedTesting/Levels/Physics/Joints_FixedBreakable/leveldata/Environment.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C18243592_Joints_BallBreakable/leveldata/Environment.xml rename to AutomatedTesting/Levels/Physics/Joints_FixedBreakable/leveldata/Environment.xml diff --git a/AutomatedTesting/Levels/Physics/C15556261_PhysXMaterials_CharacterControllerMaterialAssignment/leveldata/TerrainTexture.xml b/AutomatedTesting/Levels/Physics/Joints_FixedBreakable/leveldata/TerrainTexture.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C15556261_PhysXMaterials_CharacterControllerMaterialAssignment/leveldata/TerrainTexture.xml rename to AutomatedTesting/Levels/Physics/Joints_FixedBreakable/leveldata/TerrainTexture.xml diff --git a/AutomatedTesting/Levels/Physics/C18243581_Joints_FixedBreakable/leveldata/TimeOfDay.xml b/AutomatedTesting/Levels/Physics/Joints_FixedBreakable/leveldata/TimeOfDay.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C18243581_Joints_FixedBreakable/leveldata/TimeOfDay.xml rename to AutomatedTesting/Levels/Physics/Joints_FixedBreakable/leveldata/TimeOfDay.xml diff --git a/AutomatedTesting/Levels/Physics/C24308873_CylinderShapeCollider_CollidesWithPhysXTerrain/leveldata/VegetationMap.dat b/AutomatedTesting/Levels/Physics/Joints_FixedBreakable/leveldata/VegetationMap.dat similarity index 100% rename from AutomatedTesting/Levels/Physics/C24308873_CylinderShapeCollider_CollidesWithPhysXTerrain/leveldata/VegetationMap.dat rename to AutomatedTesting/Levels/Physics/Joints_FixedBreakable/leveldata/VegetationMap.dat diff --git a/AutomatedTesting/Levels/Physics/C18981526_Material_RestitutionCombinePriority/tags.txt b/AutomatedTesting/Levels/Physics/Joints_FixedBreakable/tags.txt similarity index 100% rename from AutomatedTesting/Levels/Physics/C18981526_Material_RestitutionCombinePriority/tags.txt rename to AutomatedTesting/Levels/Physics/Joints_FixedBreakable/tags.txt diff --git a/AutomatedTesting/Levels/Physics/C4044455_Material_LibraryChangesInstantly/terraintexture.pak b/AutomatedTesting/Levels/Physics/Joints_FixedBreakable/terraintexture.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C4044455_Material_LibraryChangesInstantly/terraintexture.pak rename to AutomatedTesting/Levels/Physics/Joints_FixedBreakable/terraintexture.pak diff --git a/AutomatedTesting/Levels/Physics/C18243582_Joints_FixedLeadFollowerCollide/C18243582_Joints_FixedLeadFollowerCollide.ly b/AutomatedTesting/Levels/Physics/Joints_FixedLeadFollowerCollide/Joints_FixedLeadFollowerCollide.ly similarity index 100% rename from AutomatedTesting/Levels/Physics/C18243582_Joints_FixedLeadFollowerCollide/C18243582_Joints_FixedLeadFollowerCollide.ly rename to AutomatedTesting/Levels/Physics/Joints_FixedLeadFollowerCollide/Joints_FixedLeadFollowerCollide.ly diff --git a/AutomatedTesting/Levels/Physics/Joints_FixedLeadFollowerCollide/filelist.xml b/AutomatedTesting/Levels/Physics/Joints_FixedLeadFollowerCollide/filelist.xml new file mode 100644 index 0000000000..d0960f8154 --- /dev/null +++ b/AutomatedTesting/Levels/Physics/Joints_FixedLeadFollowerCollide/filelist.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/AutomatedTesting/Levels/Physics/C18243587_Joints_HingeBreakable/level.pak b/AutomatedTesting/Levels/Physics/Joints_FixedLeadFollowerCollide/level.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C18243587_Joints_HingeBreakable/level.pak rename to AutomatedTesting/Levels/Physics/Joints_FixedLeadFollowerCollide/level.pak diff --git a/AutomatedTesting/Levels/Physics/C18243593_Joints_GlobalFrameConstrained/leveldata/Environment.xml b/AutomatedTesting/Levels/Physics/Joints_FixedLeadFollowerCollide/leveldata/Environment.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C18243593_Joints_GlobalFrameConstrained/leveldata/Environment.xml rename to AutomatedTesting/Levels/Physics/Joints_FixedLeadFollowerCollide/leveldata/Environment.xml diff --git a/AutomatedTesting/Levels/Physics/C15563573_Material_AddModifyDeleteOnCharacterController/leveldata/TerrainTexture.xml b/AutomatedTesting/Levels/Physics/Joints_FixedLeadFollowerCollide/leveldata/TerrainTexture.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C15563573_Material_AddModifyDeleteOnCharacterController/leveldata/TerrainTexture.xml rename to AutomatedTesting/Levels/Physics/Joints_FixedLeadFollowerCollide/leveldata/TerrainTexture.xml diff --git a/AutomatedTesting/Levels/Physics/C18243589_Joints_BallSoftLimitsConstrained/leveldata/TimeOfDay.xml b/AutomatedTesting/Levels/Physics/Joints_FixedLeadFollowerCollide/leveldata/TimeOfDay.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C18243589_Joints_BallSoftLimitsConstrained/leveldata/TimeOfDay.xml rename to AutomatedTesting/Levels/Physics/Joints_FixedLeadFollowerCollide/leveldata/TimeOfDay.xml diff --git a/AutomatedTesting/Levels/Physics/C28978033_Ragdoll_WorldBodyBusTests/LevelData/VegetationMap.dat b/AutomatedTesting/Levels/Physics/Joints_FixedLeadFollowerCollide/leveldata/VegetationMap.dat similarity index 100% rename from AutomatedTesting/Levels/Physics/C28978033_Ragdoll_WorldBodyBusTests/LevelData/VegetationMap.dat rename to AutomatedTesting/Levels/Physics/Joints_FixedLeadFollowerCollide/leveldata/VegetationMap.dat diff --git a/AutomatedTesting/Levels/Physics/C24308873_CylinderShapeCollider_CollidesWithPhysXTerrain/tags.txt b/AutomatedTesting/Levels/Physics/Joints_FixedLeadFollowerCollide/tags.txt similarity index 100% rename from AutomatedTesting/Levels/Physics/C24308873_CylinderShapeCollider_CollidesWithPhysXTerrain/tags.txt rename to AutomatedTesting/Levels/Physics/Joints_FixedLeadFollowerCollide/tags.txt diff --git a/AutomatedTesting/Levels/Physics/C4044456_Material_FrictionCombine/terraintexture.pak b/AutomatedTesting/Levels/Physics/Joints_FixedLeadFollowerCollide/terraintexture.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C4044456_Material_FrictionCombine/terraintexture.pak rename to AutomatedTesting/Levels/Physics/Joints_FixedLeadFollowerCollide/terraintexture.pak diff --git a/AutomatedTesting/Levels/Physics/C18243593_Joints_GlobalFrameConstrained/C18243593_Joints_GlobalFrameConstrained.ly b/AutomatedTesting/Levels/Physics/Joints_GlobalFrameConstrained/Joints_GlobalFrameConstrained.ly similarity index 100% rename from AutomatedTesting/Levels/Physics/C18243593_Joints_GlobalFrameConstrained/C18243593_Joints_GlobalFrameConstrained.ly rename to AutomatedTesting/Levels/Physics/Joints_GlobalFrameConstrained/Joints_GlobalFrameConstrained.ly diff --git a/AutomatedTesting/Levels/Physics/C18243593_Joints_GlobalFrameConstrained/filelist.xml b/AutomatedTesting/Levels/Physics/Joints_GlobalFrameConstrained/filelist.xml similarity index 71% rename from AutomatedTesting/Levels/Physics/C18243593_Joints_GlobalFrameConstrained/filelist.xml rename to AutomatedTesting/Levels/Physics/Joints_GlobalFrameConstrained/filelist.xml index 1d13b9c30a..28d8cdb695 100644 --- a/AutomatedTesting/Levels/Physics/C18243593_Joints_GlobalFrameConstrained/filelist.xml +++ b/AutomatedTesting/Levels/Physics/Joints_GlobalFrameConstrained/filelist.xml @@ -1,4 +1,4 @@ - + diff --git a/AutomatedTesting/Levels/Physics/C18243593_Joints_GlobalFrameConstrained/level.pak b/AutomatedTesting/Levels/Physics/Joints_GlobalFrameConstrained/level.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C18243593_Joints_GlobalFrameConstrained/level.pak rename to AutomatedTesting/Levels/Physics/Joints_GlobalFrameConstrained/level.pak diff --git a/AutomatedTesting/Levels/Physics/C18977601_Material_FrictionCombinePriority/leveldata/Environment.xml b/AutomatedTesting/Levels/Physics/Joints_GlobalFrameConstrained/leveldata/Environment.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C18977601_Material_FrictionCombinePriority/leveldata/Environment.xml rename to AutomatedTesting/Levels/Physics/Joints_GlobalFrameConstrained/leveldata/Environment.xml diff --git a/AutomatedTesting/Levels/Physics/C15845879_ForceRegion_HighLinearDampingForce/leveldata/TerrainTexture.xml b/AutomatedTesting/Levels/Physics/Joints_GlobalFrameConstrained/leveldata/TerrainTexture.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C15845879_ForceRegion_HighLinearDampingForce/leveldata/TerrainTexture.xml rename to AutomatedTesting/Levels/Physics/Joints_GlobalFrameConstrained/leveldata/TerrainTexture.xml diff --git a/AutomatedTesting/Levels/Physics/C18243590_Joints_BallNoLimitsConstrained/leveldata/TimeOfDay.xml b/AutomatedTesting/Levels/Physics/Joints_GlobalFrameConstrained/leveldata/TimeOfDay.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C18243590_Joints_BallNoLimitsConstrained/leveldata/TimeOfDay.xml rename to AutomatedTesting/Levels/Physics/Joints_GlobalFrameConstrained/leveldata/TimeOfDay.xml diff --git a/AutomatedTesting/Levels/Physics/C29032500_EditorComponents_WorldBodyBusWorks/leveldata/VegetationMap.dat b/AutomatedTesting/Levels/Physics/Joints_GlobalFrameConstrained/leveldata/VegetationMap.dat similarity index 100% rename from AutomatedTesting/Levels/Physics/C29032500_EditorComponents_WorldBodyBusWorks/leveldata/VegetationMap.dat rename to AutomatedTesting/Levels/Physics/Joints_GlobalFrameConstrained/leveldata/VegetationMap.dat diff --git a/AutomatedTesting/Levels/Physics/C28978033_Ragdoll_WorldBodyBusTests/tags.txt b/AutomatedTesting/Levels/Physics/Joints_GlobalFrameConstrained/tags.txt similarity index 100% rename from AutomatedTesting/Levels/Physics/C28978033_Ragdoll_WorldBodyBusTests/tags.txt rename to AutomatedTesting/Levels/Physics/Joints_GlobalFrameConstrained/tags.txt diff --git a/AutomatedTesting/Levels/Physics/C4044457_Material_RestitutionCombine/terraintexture.pak b/AutomatedTesting/Levels/Physics/Joints_GlobalFrameConstrained/terraintexture.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C4044457_Material_RestitutionCombine/terraintexture.pak rename to AutomatedTesting/Levels/Physics/Joints_GlobalFrameConstrained/terraintexture.pak diff --git a/AutomatedTesting/Levels/Physics/C18243583_Joints_Hinge2BodiesConstrained/C18243583_Joints_Hinge2BodiesConstrained.ly b/AutomatedTesting/Levels/Physics/Joints_Hinge2BodiesConstrained/Joints_Hinge2BodiesConstrained.ly similarity index 100% rename from AutomatedTesting/Levels/Physics/C18243583_Joints_Hinge2BodiesConstrained/C18243583_Joints_Hinge2BodiesConstrained.ly rename to AutomatedTesting/Levels/Physics/Joints_Hinge2BodiesConstrained/Joints_Hinge2BodiesConstrained.ly diff --git a/AutomatedTesting/Levels/Physics/Joints_Hinge2BodiesConstrained/filelist.xml b/AutomatedTesting/Levels/Physics/Joints_Hinge2BodiesConstrained/filelist.xml new file mode 100644 index 0000000000..d0960f8154 --- /dev/null +++ b/AutomatedTesting/Levels/Physics/Joints_Hinge2BodiesConstrained/filelist.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/AutomatedTesting/Levels/Physics/C18243588_Joints_Ball2BodiesConstrained/level.pak b/AutomatedTesting/Levels/Physics/Joints_Hinge2BodiesConstrained/level.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C18243588_Joints_Ball2BodiesConstrained/level.pak rename to AutomatedTesting/Levels/Physics/Joints_Hinge2BodiesConstrained/level.pak diff --git a/AutomatedTesting/Levels/Physics/C18981526_Material_RestitutionCombinePriority/leveldata/Environment.xml b/AutomatedTesting/Levels/Physics/Joints_Hinge2BodiesConstrained/leveldata/Environment.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C18981526_Material_RestitutionCombinePriority/leveldata/Environment.xml rename to AutomatedTesting/Levels/Physics/Joints_Hinge2BodiesConstrained/leveldata/Environment.xml diff --git a/AutomatedTesting/Levels/Physics/C18243580_Joints_Fixed2BodiesConstrained/LevelData/TerrainTexture.xml b/AutomatedTesting/Levels/Physics/Joints_Hinge2BodiesConstrained/leveldata/TerrainTexture.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C18243580_Joints_Fixed2BodiesConstrained/LevelData/TerrainTexture.xml rename to AutomatedTesting/Levels/Physics/Joints_Hinge2BodiesConstrained/leveldata/TerrainTexture.xml diff --git a/AutomatedTesting/Levels/Physics/C18243591_Joints_BallLeadFollowerCollide/leveldata/TimeOfDay.xml b/AutomatedTesting/Levels/Physics/Joints_Hinge2BodiesConstrained/leveldata/TimeOfDay.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C18243591_Joints_BallLeadFollowerCollide/leveldata/TimeOfDay.xml rename to AutomatedTesting/Levels/Physics/Joints_Hinge2BodiesConstrained/leveldata/TimeOfDay.xml diff --git a/AutomatedTesting/Levels/Physics/C3510642_Terrain_NotCollideWithTerrain/leveldata/VegetationMap.dat b/AutomatedTesting/Levels/Physics/Joints_Hinge2BodiesConstrained/leveldata/VegetationMap.dat similarity index 100% rename from AutomatedTesting/Levels/Physics/C3510642_Terrain_NotCollideWithTerrain/leveldata/VegetationMap.dat rename to AutomatedTesting/Levels/Physics/Joints_Hinge2BodiesConstrained/leveldata/VegetationMap.dat diff --git a/AutomatedTesting/Levels/Physics/C29032500_EditorComponents_WorldBodyBusWorks/tags.txt b/AutomatedTesting/Levels/Physics/Joints_Hinge2BodiesConstrained/tags.txt similarity index 100% rename from AutomatedTesting/Levels/Physics/C29032500_EditorComponents_WorldBodyBusWorks/tags.txt rename to AutomatedTesting/Levels/Physics/Joints_Hinge2BodiesConstrained/tags.txt diff --git a/AutomatedTesting/Levels/Physics/C4044459_Material_DynamicFriction/terraintexture.pak b/AutomatedTesting/Levels/Physics/Joints_Hinge2BodiesConstrained/terraintexture.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C4044459_Material_DynamicFriction/terraintexture.pak rename to AutomatedTesting/Levels/Physics/Joints_Hinge2BodiesConstrained/terraintexture.pak diff --git a/AutomatedTesting/Levels/Physics/C18243587_Joints_HingeBreakable/C18243587_Joints_HingeBreakable.ly b/AutomatedTesting/Levels/Physics/Joints_HingeBreakable/Joints_HingeBreakable.ly similarity index 100% rename from AutomatedTesting/Levels/Physics/C18243587_Joints_HingeBreakable/C18243587_Joints_HingeBreakable.ly rename to AutomatedTesting/Levels/Physics/Joints_HingeBreakable/Joints_HingeBreakable.ly diff --git a/AutomatedTesting/Levels/Physics/Joints_HingeBreakable/filelist.xml b/AutomatedTesting/Levels/Physics/Joints_HingeBreakable/filelist.xml new file mode 100644 index 0000000000..d0960f8154 --- /dev/null +++ b/AutomatedTesting/Levels/Physics/Joints_HingeBreakable/filelist.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/AutomatedTesting/Levels/Physics/C18243589_Joints_BallSoftLimitsConstrained/level.pak b/AutomatedTesting/Levels/Physics/Joints_HingeBreakable/level.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C18243589_Joints_BallSoftLimitsConstrained/level.pak rename to AutomatedTesting/Levels/Physics/Joints_HingeBreakable/level.pak diff --git a/AutomatedTesting/Levels/Physics/C24308873_CylinderShapeCollider_CollidesWithPhysXTerrain/leveldata/Environment.xml b/AutomatedTesting/Levels/Physics/Joints_HingeBreakable/leveldata/Environment.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C24308873_CylinderShapeCollider_CollidesWithPhysXTerrain/leveldata/Environment.xml rename to AutomatedTesting/Levels/Physics/Joints_HingeBreakable/leveldata/Environment.xml diff --git a/AutomatedTesting/Levels/Physics/C18243581_Joints_FixedBreakable/leveldata/TerrainTexture.xml b/AutomatedTesting/Levels/Physics/Joints_HingeBreakable/leveldata/TerrainTexture.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C18243581_Joints_FixedBreakable/leveldata/TerrainTexture.xml rename to AutomatedTesting/Levels/Physics/Joints_HingeBreakable/leveldata/TerrainTexture.xml diff --git a/AutomatedTesting/Levels/Physics/C18243592_Joints_BallBreakable/leveldata/TimeOfDay.xml b/AutomatedTesting/Levels/Physics/Joints_HingeBreakable/leveldata/TimeOfDay.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C18243592_Joints_BallBreakable/leveldata/TimeOfDay.xml rename to AutomatedTesting/Levels/Physics/Joints_HingeBreakable/leveldata/TimeOfDay.xml diff --git a/AutomatedTesting/Levels/Physics/C3510644_Collider_CollisionGroups/leveldata/VegetationMap.dat b/AutomatedTesting/Levels/Physics/Joints_HingeBreakable/leveldata/VegetationMap.dat similarity index 100% rename from AutomatedTesting/Levels/Physics/C3510644_Collider_CollisionGroups/leveldata/VegetationMap.dat rename to AutomatedTesting/Levels/Physics/Joints_HingeBreakable/leveldata/VegetationMap.dat diff --git a/AutomatedTesting/Levels/Physics/C3510642_Terrain_NotCollideWithTerrain/tags.txt b/AutomatedTesting/Levels/Physics/Joints_HingeBreakable/tags.txt similarity index 100% rename from AutomatedTesting/Levels/Physics/C3510642_Terrain_NotCollideWithTerrain/tags.txt rename to AutomatedTesting/Levels/Physics/Joints_HingeBreakable/tags.txt diff --git a/AutomatedTesting/Levels/Physics/C4044460_Material_StaticFriction/terraintexture.pak b/AutomatedTesting/Levels/Physics/Joints_HingeBreakable/terraintexture.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C4044460_Material_StaticFriction/terraintexture.pak rename to AutomatedTesting/Levels/Physics/Joints_HingeBreakable/terraintexture.pak diff --git a/AutomatedTesting/Levels/Physics/C18243586_Joints_HingeLeadFollowerCollide/C18243586_Joints_HingeLeadFollowerCollide.ly b/AutomatedTesting/Levels/Physics/Joints_HingeLeadFollowerCollide/Joints_HingeLeadFollowerCollide.ly similarity index 100% rename from AutomatedTesting/Levels/Physics/C18243586_Joints_HingeLeadFollowerCollide/C18243586_Joints_HingeLeadFollowerCollide.ly rename to AutomatedTesting/Levels/Physics/Joints_HingeLeadFollowerCollide/Joints_HingeLeadFollowerCollide.ly diff --git a/AutomatedTesting/Levels/Physics/Joints_HingeLeadFollowerCollide/filelist.xml b/AutomatedTesting/Levels/Physics/Joints_HingeLeadFollowerCollide/filelist.xml new file mode 100644 index 0000000000..d0960f8154 --- /dev/null +++ b/AutomatedTesting/Levels/Physics/Joints_HingeLeadFollowerCollide/filelist.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/AutomatedTesting/Levels/Physics/C18243590_Joints_BallNoLimitsConstrained/level.pak b/AutomatedTesting/Levels/Physics/Joints_HingeLeadFollowerCollide/level.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C18243590_Joints_BallNoLimitsConstrained/level.pak rename to AutomatedTesting/Levels/Physics/Joints_HingeLeadFollowerCollide/level.pak diff --git a/AutomatedTesting/Levels/Physics/C3510642_Terrain_NotCollideWithTerrain/leveldata/Environment.xml b/AutomatedTesting/Levels/Physics/Joints_HingeLeadFollowerCollide/leveldata/Environment.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C3510642_Terrain_NotCollideWithTerrain/leveldata/Environment.xml rename to AutomatedTesting/Levels/Physics/Joints_HingeLeadFollowerCollide/leveldata/Environment.xml diff --git a/AutomatedTesting/Levels/Physics/C18243582_Joints_FixedLeadFollowerCollide/leveldata/TerrainTexture.xml b/AutomatedTesting/Levels/Physics/Joints_HingeLeadFollowerCollide/leveldata/TerrainTexture.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C18243582_Joints_FixedLeadFollowerCollide/leveldata/TerrainTexture.xml rename to AutomatedTesting/Levels/Physics/Joints_HingeLeadFollowerCollide/leveldata/TerrainTexture.xml diff --git a/AutomatedTesting/Levels/Physics/C18243593_Joints_GlobalFrameConstrained/leveldata/TimeOfDay.xml b/AutomatedTesting/Levels/Physics/Joints_HingeLeadFollowerCollide/leveldata/TimeOfDay.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C18243593_Joints_GlobalFrameConstrained/leveldata/TimeOfDay.xml rename to AutomatedTesting/Levels/Physics/Joints_HingeLeadFollowerCollide/leveldata/TimeOfDay.xml diff --git a/AutomatedTesting/Levels/Physics/C4044455_Material_LibraryChangesInstantly/leveldata/VegetationMap.dat b/AutomatedTesting/Levels/Physics/Joints_HingeLeadFollowerCollide/leveldata/VegetationMap.dat similarity index 100% rename from AutomatedTesting/Levels/Physics/C4044455_Material_LibraryChangesInstantly/leveldata/VegetationMap.dat rename to AutomatedTesting/Levels/Physics/Joints_HingeLeadFollowerCollide/leveldata/VegetationMap.dat diff --git a/AutomatedTesting/Levels/Physics/C3510644_Collider_CollisionGroups/tags.txt b/AutomatedTesting/Levels/Physics/Joints_HingeLeadFollowerCollide/tags.txt similarity index 100% rename from AutomatedTesting/Levels/Physics/C3510644_Collider_CollisionGroups/tags.txt rename to AutomatedTesting/Levels/Physics/Joints_HingeLeadFollowerCollide/tags.txt diff --git a/AutomatedTesting/Levels/Physics/C4044461_Material_Restitution/terraintexture.pak b/AutomatedTesting/Levels/Physics/Joints_HingeLeadFollowerCollide/terraintexture.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C4044461_Material_Restitution/terraintexture.pak rename to AutomatedTesting/Levels/Physics/Joints_HingeLeadFollowerCollide/terraintexture.pak diff --git a/AutomatedTesting/Levels/Physics/C18243585_Joints_HingeNoLimitsConstrained/C18243585_Joints_HingeNoLimitsConstrained.ly b/AutomatedTesting/Levels/Physics/Joints_HingeNoLimitsConstrained/Joints_HingeNoLimitsConstrained.ly similarity index 100% rename from AutomatedTesting/Levels/Physics/C18243585_Joints_HingeNoLimitsConstrained/C18243585_Joints_HingeNoLimitsConstrained.ly rename to AutomatedTesting/Levels/Physics/Joints_HingeNoLimitsConstrained/Joints_HingeNoLimitsConstrained.ly diff --git a/AutomatedTesting/Levels/Physics/Joints_HingeNoLimitsConstrained/filelist.xml b/AutomatedTesting/Levels/Physics/Joints_HingeNoLimitsConstrained/filelist.xml new file mode 100644 index 0000000000..d0960f8154 --- /dev/null +++ b/AutomatedTesting/Levels/Physics/Joints_HingeNoLimitsConstrained/filelist.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/AutomatedTesting/Levels/Physics/C18243591_Joints_BallLeadFollowerCollide/level.pak b/AutomatedTesting/Levels/Physics/Joints_HingeNoLimitsConstrained/level.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C18243591_Joints_BallLeadFollowerCollide/level.pak rename to AutomatedTesting/Levels/Physics/Joints_HingeNoLimitsConstrained/level.pak diff --git a/AutomatedTesting/Levels/Physics/C3510644_Collider_CollisionGroups/leveldata/Environment.xml b/AutomatedTesting/Levels/Physics/Joints_HingeNoLimitsConstrained/leveldata/Environment.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C3510644_Collider_CollisionGroups/leveldata/Environment.xml rename to AutomatedTesting/Levels/Physics/Joints_HingeNoLimitsConstrained/leveldata/Environment.xml diff --git a/AutomatedTesting/Levels/Physics/C18243583_Joints_Hinge2BodiesConstrained/leveldata/TerrainTexture.xml b/AutomatedTesting/Levels/Physics/Joints_HingeNoLimitsConstrained/leveldata/TerrainTexture.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C18243583_Joints_Hinge2BodiesConstrained/leveldata/TerrainTexture.xml rename to AutomatedTesting/Levels/Physics/Joints_HingeNoLimitsConstrained/leveldata/TerrainTexture.xml diff --git a/AutomatedTesting/Levels/Physics/C18977601_Material_FrictionCombinePriority/leveldata/TimeOfDay.xml b/AutomatedTesting/Levels/Physics/Joints_HingeNoLimitsConstrained/leveldata/TimeOfDay.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C18977601_Material_FrictionCombinePriority/leveldata/TimeOfDay.xml rename to AutomatedTesting/Levels/Physics/Joints_HingeNoLimitsConstrained/leveldata/TimeOfDay.xml diff --git a/AutomatedTesting/Levels/Physics/C4044456_Material_FrictionCombine/leveldata/VegetationMap.dat b/AutomatedTesting/Levels/Physics/Joints_HingeNoLimitsConstrained/leveldata/VegetationMap.dat similarity index 100% rename from AutomatedTesting/Levels/Physics/C4044456_Material_FrictionCombine/leveldata/VegetationMap.dat rename to AutomatedTesting/Levels/Physics/Joints_HingeNoLimitsConstrained/leveldata/VegetationMap.dat diff --git a/AutomatedTesting/Levels/Physics/C4044455_Material_LibraryChangesInstantly/tags.txt b/AutomatedTesting/Levels/Physics/Joints_HingeNoLimitsConstrained/tags.txt similarity index 100% rename from AutomatedTesting/Levels/Physics/C4044455_Material_LibraryChangesInstantly/tags.txt rename to AutomatedTesting/Levels/Physics/Joints_HingeNoLimitsConstrained/tags.txt diff --git a/AutomatedTesting/Levels/Physics/C4044694_Material_EmptyLibraryUsesDefault/terraintexture.pak b/AutomatedTesting/Levels/Physics/Joints_HingeNoLimitsConstrained/terraintexture.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C4044694_Material_EmptyLibraryUsesDefault/terraintexture.pak rename to AutomatedTesting/Levels/Physics/Joints_HingeNoLimitsConstrained/terraintexture.pak diff --git a/AutomatedTesting/Levels/Physics/C18243584_Joints_HingeSoftLimitsConstrained/C18243584_Joints_HingeSoftLimitsConstrained.ly b/AutomatedTesting/Levels/Physics/Joints_HingeSoftLimitsConstrained/Joints_HingeSoftLimitsConstrained.ly similarity index 100% rename from AutomatedTesting/Levels/Physics/C18243584_Joints_HingeSoftLimitsConstrained/C18243584_Joints_HingeSoftLimitsConstrained.ly rename to AutomatedTesting/Levels/Physics/Joints_HingeSoftLimitsConstrained/Joints_HingeSoftLimitsConstrained.ly diff --git a/AutomatedTesting/Levels/Physics/Joints_HingeSoftLimitsConstrained/filelist.xml b/AutomatedTesting/Levels/Physics/Joints_HingeSoftLimitsConstrained/filelist.xml new file mode 100644 index 0000000000..d0960f8154 --- /dev/null +++ b/AutomatedTesting/Levels/Physics/Joints_HingeSoftLimitsConstrained/filelist.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/AutomatedTesting/Levels/Physics/C18243592_Joints_BallBreakable/level.pak b/AutomatedTesting/Levels/Physics/Joints_HingeSoftLimitsConstrained/level.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C18243592_Joints_BallBreakable/level.pak rename to AutomatedTesting/Levels/Physics/Joints_HingeSoftLimitsConstrained/level.pak diff --git a/AutomatedTesting/Levels/Physics/C4044455_Material_LibraryChangesInstantly/leveldata/Environment.xml b/AutomatedTesting/Levels/Physics/Joints_HingeSoftLimitsConstrained/leveldata/Environment.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C4044455_Material_LibraryChangesInstantly/leveldata/Environment.xml rename to AutomatedTesting/Levels/Physics/Joints_HingeSoftLimitsConstrained/leveldata/Environment.xml diff --git a/AutomatedTesting/Levels/Physics/C18243584_Joints_HingeSoftLimitsConstrained/leveldata/TerrainTexture.xml b/AutomatedTesting/Levels/Physics/Joints_HingeSoftLimitsConstrained/leveldata/TerrainTexture.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C18243584_Joints_HingeSoftLimitsConstrained/leveldata/TerrainTexture.xml rename to AutomatedTesting/Levels/Physics/Joints_HingeSoftLimitsConstrained/leveldata/TerrainTexture.xml diff --git a/AutomatedTesting/Levels/Physics/C18981526_Material_RestitutionCombinePriority/leveldata/TimeOfDay.xml b/AutomatedTesting/Levels/Physics/Joints_HingeSoftLimitsConstrained/leveldata/TimeOfDay.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C18981526_Material_RestitutionCombinePriority/leveldata/TimeOfDay.xml rename to AutomatedTesting/Levels/Physics/Joints_HingeSoftLimitsConstrained/leveldata/TimeOfDay.xml diff --git a/AutomatedTesting/Levels/Physics/C4044457_Material_RestitutionCombine/leveldata/VegetationMap.dat b/AutomatedTesting/Levels/Physics/Joints_HingeSoftLimitsConstrained/leveldata/VegetationMap.dat similarity index 100% rename from AutomatedTesting/Levels/Physics/C4044457_Material_RestitutionCombine/leveldata/VegetationMap.dat rename to AutomatedTesting/Levels/Physics/Joints_HingeSoftLimitsConstrained/leveldata/VegetationMap.dat diff --git a/AutomatedTesting/Levels/Physics/C4044456_Material_FrictionCombine/tags.txt b/AutomatedTesting/Levels/Physics/Joints_HingeSoftLimitsConstrained/tags.txt similarity index 100% rename from AutomatedTesting/Levels/Physics/C4044456_Material_FrictionCombine/tags.txt rename to AutomatedTesting/Levels/Physics/Joints_HingeSoftLimitsConstrained/tags.txt diff --git a/AutomatedTesting/Levels/Physics/C4044697_Material_PerfaceMaterialValidation/terraintexture.pak b/AutomatedTesting/Levels/Physics/Joints_HingeSoftLimitsConstrained/terraintexture.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C4044697_Material_PerfaceMaterialValidation/terraintexture.pak rename to AutomatedTesting/Levels/Physics/Joints_HingeSoftLimitsConstrained/terraintexture.pak diff --git a/AutomatedTesting/Levels/Physics/C4925577_PhysXMaterials_MaterialAssignedToTerrain/C4925577_PhysXMaterials_MaterialAssignedToTerrain.ly b/AutomatedTesting/Levels/Physics/Material_CanBeAssignedToTerrain/Material_CanBeAssignedToTerrain.ly similarity index 100% rename from AutomatedTesting/Levels/Physics/C4925577_PhysXMaterials_MaterialAssignedToTerrain/C4925577_PhysXMaterials_MaterialAssignedToTerrain.ly rename to AutomatedTesting/Levels/Physics/Material_CanBeAssignedToTerrain/Material_CanBeAssignedToTerrain.ly diff --git a/AutomatedTesting/Levels/Physics/C4925577_PhysXMaterials_MaterialAssignedToTerrain/filelist.xml b/AutomatedTesting/Levels/Physics/Material_CanBeAssignedToTerrain/filelist.xml similarity index 68% rename from AutomatedTesting/Levels/Physics/C4925577_PhysXMaterials_MaterialAssignedToTerrain/filelist.xml rename to AutomatedTesting/Levels/Physics/Material_CanBeAssignedToTerrain/filelist.xml index 156e75bb88..2694b3bc25 100644 --- a/AutomatedTesting/Levels/Physics/C4925577_PhysXMaterials_MaterialAssignedToTerrain/filelist.xml +++ b/AutomatedTesting/Levels/Physics/Material_CanBeAssignedToTerrain/filelist.xml @@ -1,4 +1,4 @@ - + diff --git a/AutomatedTesting/Levels/Physics/C4925577_PhysXMaterials_MaterialAssignedToTerrain/level.pak b/AutomatedTesting/Levels/Physics/Material_CanBeAssignedToTerrain/level.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C4925577_PhysXMaterials_MaterialAssignedToTerrain/level.pak rename to AutomatedTesting/Levels/Physics/Material_CanBeAssignedToTerrain/level.pak diff --git a/AutomatedTesting/Levels/Physics/C4044456_Material_FrictionCombine/leveldata/Environment.xml b/AutomatedTesting/Levels/Physics/Material_CanBeAssignedToTerrain/leveldata/Environment.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C4044456_Material_FrictionCombine/leveldata/Environment.xml rename to AutomatedTesting/Levels/Physics/Material_CanBeAssignedToTerrain/leveldata/Environment.xml diff --git a/AutomatedTesting/Levels/Physics/C15308221_Material_ComponentsInSyncWithLibrary/leveldata/GameTokens.xml b/AutomatedTesting/Levels/Physics/Material_CanBeAssignedToTerrain/leveldata/GameTokens.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C15308221_Material_ComponentsInSyncWithLibrary/leveldata/GameTokens.xml rename to AutomatedTesting/Levels/Physics/Material_CanBeAssignedToTerrain/leveldata/GameTokens.xml diff --git a/AutomatedTesting/Levels/Physics/C4976207_PhysXRigidBodies_KinematicBehavior/leveldata/TerrainTexture.xml b/AutomatedTesting/Levels/Physics/Material_CanBeAssignedToTerrain/leveldata/TerrainTexture.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C4976207_PhysXRigidBodies_KinematicBehavior/leveldata/TerrainTexture.xml rename to AutomatedTesting/Levels/Physics/Material_CanBeAssignedToTerrain/leveldata/TerrainTexture.xml diff --git a/AutomatedTesting/Levels/Physics/C28978033_Ragdoll_WorldBodyBusTests/LevelData/TimeOfDay.xml b/AutomatedTesting/Levels/Physics/Material_CanBeAssignedToTerrain/leveldata/TimeOfDay.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C28978033_Ragdoll_WorldBodyBusTests/LevelData/TimeOfDay.xml rename to AutomatedTesting/Levels/Physics/Material_CanBeAssignedToTerrain/leveldata/TimeOfDay.xml diff --git a/AutomatedTesting/Levels/Physics/C4044459_Material_DynamicFriction/leveldata/VegetationMap.dat b/AutomatedTesting/Levels/Physics/Material_CanBeAssignedToTerrain/leveldata/VegetationMap.dat similarity index 100% rename from AutomatedTesting/Levels/Physics/C4044459_Material_DynamicFriction/leveldata/VegetationMap.dat rename to AutomatedTesting/Levels/Physics/Material_CanBeAssignedToTerrain/leveldata/VegetationMap.dat diff --git a/AutomatedTesting/Levels/Physics/C4925577_PhysXMaterials_MaterialAssignedToTerrain/materials/material.physmaterial b/AutomatedTesting/Levels/Physics/Material_CanBeAssignedToTerrain/materials/material.physmaterial similarity index 100% rename from AutomatedTesting/Levels/Physics/C4925577_PhysXMaterials_MaterialAssignedToTerrain/materials/material.physmaterial rename to AutomatedTesting/Levels/Physics/Material_CanBeAssignedToTerrain/materials/material.physmaterial diff --git a/AutomatedTesting/Levels/Physics/C4044457_Material_RestitutionCombine/tags.txt b/AutomatedTesting/Levels/Physics/Material_CanBeAssignedToTerrain/tags.txt similarity index 100% rename from AutomatedTesting/Levels/Physics/C4044457_Material_RestitutionCombine/tags.txt rename to AutomatedTesting/Levels/Physics/Material_CanBeAssignedToTerrain/tags.txt diff --git a/AutomatedTesting/Levels/Physics/C4925577_PhysXMaterials_MaterialAssignedToTerrain/terrain/terrain.pxheightfield b/AutomatedTesting/Levels/Physics/Material_CanBeAssignedToTerrain/terrain/terrain.pxheightfield similarity index 100% rename from AutomatedTesting/Levels/Physics/C4925577_PhysXMaterials_MaterialAssignedToTerrain/terrain/terrain.pxheightfield rename to AutomatedTesting/Levels/Physics/Material_CanBeAssignedToTerrain/terrain/terrain.pxheightfield diff --git a/AutomatedTesting/Levels/Physics/C4925577_PhysXMaterials_MaterialAssignedToTerrain/terraintexture.pak b/AutomatedTesting/Levels/Physics/Material_CanBeAssignedToTerrain/terraintexture.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C4925577_PhysXMaterials_MaterialAssignedToTerrain/terraintexture.pak rename to AutomatedTesting/Levels/Physics/Material_CanBeAssignedToTerrain/terraintexture.pak diff --git a/AutomatedTesting/Levels/Physics/C15556261_PhysXMaterials_CharacterControllerMaterialAssignment/C15556261_PhysXMaterials_CharacterControllerMaterialAssignment.ly b/AutomatedTesting/Levels/Physics/Material_CharacterController/Material_CharacterController.ly similarity index 100% rename from AutomatedTesting/Levels/Physics/C15556261_PhysXMaterials_CharacterControllerMaterialAssignment/C15556261_PhysXMaterials_CharacterControllerMaterialAssignment.ly rename to AutomatedTesting/Levels/Physics/Material_CharacterController/Material_CharacterController.ly diff --git a/AutomatedTesting/Levels/Physics/C15556261_PhysXMaterials_CharacterControllerMaterialAssignment/filelist.xml b/AutomatedTesting/Levels/Physics/Material_CharacterController/filelist.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C15556261_PhysXMaterials_CharacterControllerMaterialAssignment/filelist.xml rename to AutomatedTesting/Levels/Physics/Material_CharacterController/filelist.xml diff --git a/AutomatedTesting/Levels/Physics/C15556261_PhysXMaterials_CharacterControllerMaterialAssignment/level.pak b/AutomatedTesting/Levels/Physics/Material_CharacterController/level.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C15556261_PhysXMaterials_CharacterControllerMaterialAssignment/level.pak rename to AutomatedTesting/Levels/Physics/Material_CharacterController/level.pak diff --git a/AutomatedTesting/Levels/Physics/C4044457_Material_RestitutionCombine/leveldata/Environment.xml b/AutomatedTesting/Levels/Physics/Material_CharacterController/leveldata/Environment.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C4044457_Material_RestitutionCombine/leveldata/Environment.xml rename to AutomatedTesting/Levels/Physics/Material_CharacterController/leveldata/Environment.xml diff --git a/AutomatedTesting/Levels/Physics/C15425929_Undo_Redo/leveldata/GameTokens.xml b/AutomatedTesting/Levels/Physics/Material_CharacterController/leveldata/GameTokens.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C15425929_Undo_Redo/leveldata/GameTokens.xml rename to AutomatedTesting/Levels/Physics/Material_CharacterController/leveldata/GameTokens.xml diff --git a/AutomatedTesting/Levels/Physics/C18243585_Joints_HingeNoLimitsConstrained/leveldata/TerrainTexture.xml b/AutomatedTesting/Levels/Physics/Material_CharacterController/leveldata/TerrainTexture.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C18243585_Joints_HingeNoLimitsConstrained/leveldata/TerrainTexture.xml rename to AutomatedTesting/Levels/Physics/Material_CharacterController/leveldata/TerrainTexture.xml diff --git a/AutomatedTesting/Levels/Physics/C29032500_EditorComponents_WorldBodyBusWorks/leveldata/TimeOfDay.xml b/AutomatedTesting/Levels/Physics/Material_CharacterController/leveldata/TimeOfDay.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C29032500_EditorComponents_WorldBodyBusWorks/leveldata/TimeOfDay.xml rename to AutomatedTesting/Levels/Physics/Material_CharacterController/leveldata/TimeOfDay.xml diff --git a/AutomatedTesting/Levels/Physics/C4044460_Material_StaticFriction/leveldata/VegetationMap.dat b/AutomatedTesting/Levels/Physics/Material_CharacterController/leveldata/VegetationMap.dat similarity index 100% rename from AutomatedTesting/Levels/Physics/C4044460_Material_StaticFriction/leveldata/VegetationMap.dat rename to AutomatedTesting/Levels/Physics/Material_CharacterController/leveldata/VegetationMap.dat diff --git a/AutomatedTesting/Levels/Physics/C15556261_PhysXMaterials_CharacterControllerMaterialAssignment/library.physmaterial b/AutomatedTesting/Levels/Physics/Material_CharacterController/library.physmaterial similarity index 100% rename from AutomatedTesting/Levels/Physics/C15556261_PhysXMaterials_CharacterControllerMaterialAssignment/library.physmaterial rename to AutomatedTesting/Levels/Physics/Material_CharacterController/library.physmaterial diff --git a/AutomatedTesting/Levels/Physics/C4044459_Material_DynamicFriction/tags.txt b/AutomatedTesting/Levels/Physics/Material_CharacterController/tags.txt similarity index 100% rename from AutomatedTesting/Levels/Physics/C4044459_Material_DynamicFriction/tags.txt rename to AutomatedTesting/Levels/Physics/Material_CharacterController/tags.txt diff --git a/AutomatedTesting/Levels/Physics/C15556261_PhysXMaterials_CharacterControllerMaterialAssignment/terraintexture.pak b/AutomatedTesting/Levels/Physics/Material_CharacterController/terraintexture.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C15556261_PhysXMaterials_CharacterControllerMaterialAssignment/terraintexture.pak rename to AutomatedTesting/Levels/Physics/Material_CharacterController/terraintexture.pak diff --git a/AutomatedTesting/Levels/Physics/C15308221_Material_ComponentsInSyncWithLibrary/C15308221_Material_ComponentsInSyncWithLibrary.ly b/AutomatedTesting/Levels/Physics/Material_ComponentsInSyncWithLibrary/Material_ComponentsInSyncWithLibrary.ly similarity index 100% rename from AutomatedTesting/Levels/Physics/C15308221_Material_ComponentsInSyncWithLibrary/C15308221_Material_ComponentsInSyncWithLibrary.ly rename to AutomatedTesting/Levels/Physics/Material_ComponentsInSyncWithLibrary/Material_ComponentsInSyncWithLibrary.ly diff --git a/AutomatedTesting/Levels/Physics/C15308221_Material_ComponentsInSyncWithLibrary/c15308221_material_componentsinsyncwithlibrary.physmaterial b/AutomatedTesting/Levels/Physics/Material_ComponentsInSyncWithLibrary/c15308221_material_componentsinsyncwithlibrary.physmaterial similarity index 100% rename from AutomatedTesting/Levels/Physics/C15308221_Material_ComponentsInSyncWithLibrary/c15308221_material_componentsinsyncwithlibrary.physmaterial rename to AutomatedTesting/Levels/Physics/Material_ComponentsInSyncWithLibrary/c15308221_material_componentsinsyncwithlibrary.physmaterial diff --git a/AutomatedTesting/Levels/Physics/C15308221_Material_ComponentsInSyncWithLibrary/filelist.xml b/AutomatedTesting/Levels/Physics/Material_ComponentsInSyncWithLibrary/filelist.xml similarity index 69% rename from AutomatedTesting/Levels/Physics/C15308221_Material_ComponentsInSyncWithLibrary/filelist.xml rename to AutomatedTesting/Levels/Physics/Material_ComponentsInSyncWithLibrary/filelist.xml index 227703d8a3..ed06afdb26 100644 --- a/AutomatedTesting/Levels/Physics/C15308221_Material_ComponentsInSyncWithLibrary/filelist.xml +++ b/AutomatedTesting/Levels/Physics/Material_ComponentsInSyncWithLibrary/filelist.xml @@ -1,4 +1,4 @@ - + diff --git a/AutomatedTesting/Levels/Physics/C15308221_Material_ComponentsInSyncWithLibrary/level.pak b/AutomatedTesting/Levels/Physics/Material_ComponentsInSyncWithLibrary/level.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C15308221_Material_ComponentsInSyncWithLibrary/level.pak rename to AutomatedTesting/Levels/Physics/Material_ComponentsInSyncWithLibrary/level.pak diff --git a/AutomatedTesting/Levels/Physics/C4044459_Material_DynamicFriction/leveldata/Environment.xml b/AutomatedTesting/Levels/Physics/Material_ComponentsInSyncWithLibrary/leveldata/Environment.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C4044459_Material_DynamicFriction/leveldata/Environment.xml rename to AutomatedTesting/Levels/Physics/Material_ComponentsInSyncWithLibrary/leveldata/Environment.xml diff --git a/AutomatedTesting/Levels/Physics/C15425935_Material_LibraryUpdatedAcrossLevels/C15425935_Material_LibraryUpdatedAcrossLevels_0/leveldata/GameTokens.xml b/AutomatedTesting/Levels/Physics/Material_ComponentsInSyncWithLibrary/leveldata/GameTokens.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C15425935_Material_LibraryUpdatedAcrossLevels/C15425935_Material_LibraryUpdatedAcrossLevels_0/leveldata/GameTokens.xml rename to AutomatedTesting/Levels/Physics/Material_ComponentsInSyncWithLibrary/leveldata/GameTokens.xml diff --git a/AutomatedTesting/Levels/Physics/C18243586_Joints_HingeLeadFollowerCollide/leveldata/TerrainTexture.xml b/AutomatedTesting/Levels/Physics/Material_ComponentsInSyncWithLibrary/leveldata/TerrainTexture.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C18243586_Joints_HingeLeadFollowerCollide/leveldata/TerrainTexture.xml rename to AutomatedTesting/Levels/Physics/Material_ComponentsInSyncWithLibrary/leveldata/TerrainTexture.xml diff --git a/AutomatedTesting/Levels/Physics/C3510642_Terrain_NotCollideWithTerrain/leveldata/TimeOfDay.xml b/AutomatedTesting/Levels/Physics/Material_ComponentsInSyncWithLibrary/leveldata/TimeOfDay.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C3510642_Terrain_NotCollideWithTerrain/leveldata/TimeOfDay.xml rename to AutomatedTesting/Levels/Physics/Material_ComponentsInSyncWithLibrary/leveldata/TimeOfDay.xml diff --git a/AutomatedTesting/Levels/Physics/C4044461_Material_Restitution/leveldata/VegetationMap.dat b/AutomatedTesting/Levels/Physics/Material_ComponentsInSyncWithLibrary/leveldata/VegetationMap.dat similarity index 100% rename from AutomatedTesting/Levels/Physics/C4044461_Material_Restitution/leveldata/VegetationMap.dat rename to AutomatedTesting/Levels/Physics/Material_ComponentsInSyncWithLibrary/leveldata/VegetationMap.dat diff --git a/AutomatedTesting/Levels/Physics/C15308221_Material_ComponentsInSyncWithLibrary/ragdoll_modified/AnimGraphPhysX.animgraph b/AutomatedTesting/Levels/Physics/Material_ComponentsInSyncWithLibrary/ragdoll_modified/AnimGraphPhysX.animgraph similarity index 100% rename from AutomatedTesting/Levels/Physics/C15308221_Material_ComponentsInSyncWithLibrary/ragdoll_modified/AnimGraphPhysX.animgraph rename to AutomatedTesting/Levels/Physics/Material_ComponentsInSyncWithLibrary/ragdoll_modified/AnimGraphPhysX.animgraph diff --git a/AutomatedTesting/Levels/Physics/C15096735_Materials_DefaultLibraryConsistency/Red.tif b/AutomatedTesting/Levels/Physics/Material_ComponentsInSyncWithLibrary/ragdoll_modified/Red.tif similarity index 100% rename from AutomatedTesting/Levels/Physics/C15096735_Materials_DefaultLibraryConsistency/Red.tif rename to AutomatedTesting/Levels/Physics/Material_ComponentsInSyncWithLibrary/ragdoll_modified/Red.tif diff --git a/AutomatedTesting/Levels/Physics/C15308221_Material_ComponentsInSyncWithLibrary/ragdoll_modified/RinLocomotion.motionset b/AutomatedTesting/Levels/Physics/Material_ComponentsInSyncWithLibrary/ragdoll_modified/RinLocomotion.motionset similarity index 100% rename from AutomatedTesting/Levels/Physics/C15308221_Material_ComponentsInSyncWithLibrary/ragdoll_modified/RinLocomotion.motionset rename to AutomatedTesting/Levels/Physics/Material_ComponentsInSyncWithLibrary/ragdoll_modified/RinLocomotion.motionset diff --git a/AutomatedTesting/Levels/Physics/C15308221_Material_ComponentsInSyncWithLibrary/ragdoll_modified/modified.mtl b/AutomatedTesting/Levels/Physics/Material_ComponentsInSyncWithLibrary/ragdoll_modified/modified.mtl similarity index 100% rename from AutomatedTesting/Levels/Physics/C15308221_Material_ComponentsInSyncWithLibrary/ragdoll_modified/modified.mtl rename to AutomatedTesting/Levels/Physics/Material_ComponentsInSyncWithLibrary/ragdoll_modified/modified.mtl diff --git a/AutomatedTesting/Levels/Physics/C13895144_Ragdoll_WithRagdoll/rin/PhysicsRin(1)/rin_skeleton_newgeo.fbx b/AutomatedTesting/Levels/Physics/Material_ComponentsInSyncWithLibrary/ragdoll_modified/rin_skeleton_newgeo.fbx similarity index 100% rename from AutomatedTesting/Levels/Physics/C13895144_Ragdoll_WithRagdoll/rin/PhysicsRin(1)/rin_skeleton_newgeo.fbx rename to AutomatedTesting/Levels/Physics/Material_ComponentsInSyncWithLibrary/ragdoll_modified/rin_skeleton_newgeo.fbx diff --git a/AutomatedTesting/Levels/Physics/C15308221_Material_ComponentsInSyncWithLibrary/ragdoll_modified/rin_skeleton_newgeo.fbx.assetinfo b/AutomatedTesting/Levels/Physics/Material_ComponentsInSyncWithLibrary/ragdoll_modified/rin_skeleton_newgeo.fbx.assetinfo similarity index 100% rename from AutomatedTesting/Levels/Physics/C15308221_Material_ComponentsInSyncWithLibrary/ragdoll_modified/rin_skeleton_newgeo.fbx.assetinfo rename to AutomatedTesting/Levels/Physics/Material_ComponentsInSyncWithLibrary/ragdoll_modified/rin_skeleton_newgeo.fbx.assetinfo diff --git a/AutomatedTesting/Levels/Physics/C13895144_Ragdoll_WithRagdoll/rin/PhysicsRin(1)/rin_skeleton_newgeo.mtl b/AutomatedTesting/Levels/Physics/Material_ComponentsInSyncWithLibrary/ragdoll_modified/rin_skeleton_newgeo.mtl similarity index 100% rename from AutomatedTesting/Levels/Physics/C13895144_Ragdoll_WithRagdoll/rin/PhysicsRin(1)/rin_skeleton_newgeo.mtl rename to AutomatedTesting/Levels/Physics/Material_ComponentsInSyncWithLibrary/ragdoll_modified/rin_skeleton_newgeo.mtl diff --git a/AutomatedTesting/Levels/Physics/C4044460_Material_StaticFriction/tags.txt b/AutomatedTesting/Levels/Physics/Material_ComponentsInSyncWithLibrary/tags.txt similarity index 100% rename from AutomatedTesting/Levels/Physics/C4044460_Material_StaticFriction/tags.txt rename to AutomatedTesting/Levels/Physics/Material_ComponentsInSyncWithLibrary/tags.txt diff --git a/AutomatedTesting/Levels/Physics/C15308221_Material_ComponentsInSyncWithLibrary/terrain/terrain.pxheightfield b/AutomatedTesting/Levels/Physics/Material_ComponentsInSyncWithLibrary/terrain/terrain.pxheightfield similarity index 100% rename from AutomatedTesting/Levels/Physics/C15308221_Material_ComponentsInSyncWithLibrary/terrain/terrain.pxheightfield rename to AutomatedTesting/Levels/Physics/Material_ComponentsInSyncWithLibrary/terrain/terrain.pxheightfield diff --git a/AutomatedTesting/Levels/Physics/C15308221_Material_ComponentsInSyncWithLibrary/terraintexture.pak b/AutomatedTesting/Levels/Physics/Material_ComponentsInSyncWithLibrary/terraintexture.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C15308221_Material_ComponentsInSyncWithLibrary/terraintexture.pak rename to AutomatedTesting/Levels/Physics/Material_ComponentsInSyncWithLibrary/terraintexture.pak diff --git a/AutomatedTesting/Levels/Physics/C15096735_Materials_DefaultLibraryConsistency/Blue.tif b/AutomatedTesting/Levels/Physics/Material_DefaultLibraryConsistentOnAllFeatures/Blue.tif similarity index 100% rename from AutomatedTesting/Levels/Physics/C15096735_Materials_DefaultLibraryConsistency/Blue.tif rename to AutomatedTesting/Levels/Physics/Material_DefaultLibraryConsistentOnAllFeatures/Blue.tif diff --git a/AutomatedTesting/Levels/Physics/C15096735_Materials_DefaultLibraryConsistency/C15096735_Materials_DefaultLibraryConsistency.ly b/AutomatedTesting/Levels/Physics/Material_DefaultLibraryConsistentOnAllFeatures/Material_DefaultLibraryConsistentOnAllFeatures.ly similarity index 100% rename from AutomatedTesting/Levels/Physics/C15096735_Materials_DefaultLibraryConsistency/C15096735_Materials_DefaultLibraryConsistency.ly rename to AutomatedTesting/Levels/Physics/Material_DefaultLibraryConsistentOnAllFeatures/Material_DefaultLibraryConsistentOnAllFeatures.ly diff --git a/AutomatedTesting/Levels/Physics/C15308221_Material_ComponentsInSyncWithLibrary/ragdoll_modified/Red.tif b/AutomatedTesting/Levels/Physics/Material_DefaultLibraryConsistentOnAllFeatures/Red.tif similarity index 100% rename from AutomatedTesting/Levels/Physics/C15308221_Material_ComponentsInSyncWithLibrary/ragdoll_modified/Red.tif rename to AutomatedTesting/Levels/Physics/Material_DefaultLibraryConsistentOnAllFeatures/Red.tif diff --git a/AutomatedTesting/Levels/Physics/C15096735_Materials_DefaultLibraryConsistency/c15096735_materials_defaultlibraryconsistency.physmaterial b/AutomatedTesting/Levels/Physics/Material_DefaultLibraryConsistentOnAllFeatures/c15096735_materials_defaultlibraryconsistency.physmaterial similarity index 100% rename from AutomatedTesting/Levels/Physics/C15096735_Materials_DefaultLibraryConsistency/c15096735_materials_defaultlibraryconsistency.physmaterial rename to AutomatedTesting/Levels/Physics/Material_DefaultLibraryConsistentOnAllFeatures/c15096735_materials_defaultlibraryconsistency.physmaterial diff --git a/AutomatedTesting/Levels/Physics/C15096735_Materials_DefaultLibraryConsistency/concrete.mtl b/AutomatedTesting/Levels/Physics/Material_DefaultLibraryConsistentOnAllFeatures/concrete.mtl similarity index 100% rename from AutomatedTesting/Levels/Physics/C15096735_Materials_DefaultLibraryConsistency/concrete.mtl rename to AutomatedTesting/Levels/Physics/Material_DefaultLibraryConsistentOnAllFeatures/concrete.mtl diff --git a/AutomatedTesting/Levels/Physics/C15096735_Materials_DefaultLibraryConsistency/cowboy.emfxworkspace b/AutomatedTesting/Levels/Physics/Material_DefaultLibraryConsistentOnAllFeatures/cowboy.emfxworkspace similarity index 100% rename from AutomatedTesting/Levels/Physics/C15096735_Materials_DefaultLibraryConsistency/cowboy.emfxworkspace rename to AutomatedTesting/Levels/Physics/Material_DefaultLibraryConsistentOnAllFeatures/cowboy.emfxworkspace diff --git a/AutomatedTesting/Levels/Physics/C15096735_Materials_DefaultLibraryConsistency/filelist.xml b/AutomatedTesting/Levels/Physics/Material_DefaultLibraryConsistentOnAllFeatures/filelist.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C15096735_Materials_DefaultLibraryConsistency/filelist.xml rename to AutomatedTesting/Levels/Physics/Material_DefaultLibraryConsistentOnAllFeatures/filelist.xml diff --git a/AutomatedTesting/Levels/Physics/C15096735_Materials_DefaultLibraryConsistency/level.pak b/AutomatedTesting/Levels/Physics/Material_DefaultLibraryConsistentOnAllFeatures/level.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C15096735_Materials_DefaultLibraryConsistency/level.pak rename to AutomatedTesting/Levels/Physics/Material_DefaultLibraryConsistentOnAllFeatures/level.pak diff --git a/AutomatedTesting/Levels/Physics/C4044460_Material_StaticFriction/leveldata/Environment.xml b/AutomatedTesting/Levels/Physics/Material_DefaultLibraryConsistentOnAllFeatures/leveldata/Environment.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C4044460_Material_StaticFriction/leveldata/Environment.xml rename to AutomatedTesting/Levels/Physics/Material_DefaultLibraryConsistentOnAllFeatures/leveldata/Environment.xml diff --git a/AutomatedTesting/Levels/Physics/C15425935_Material_LibraryUpdatedAcrossLevels/C15425935_Material_LibraryUpdatedAcrossLevels_1/leveldata/GameTokens.xml b/AutomatedTesting/Levels/Physics/Material_DefaultLibraryConsistentOnAllFeatures/leveldata/GameTokens.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C15425935_Material_LibraryUpdatedAcrossLevels/C15425935_Material_LibraryUpdatedAcrossLevels_1/leveldata/GameTokens.xml rename to AutomatedTesting/Levels/Physics/Material_DefaultLibraryConsistentOnAllFeatures/leveldata/GameTokens.xml diff --git a/AutomatedTesting/Levels/Physics/C4976210_COM_ManualSetting/leveldata/TerrainTexture.xml b/AutomatedTesting/Levels/Physics/Material_DefaultLibraryConsistentOnAllFeatures/leveldata/TerrainTexture.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C4976210_COM_ManualSetting/leveldata/TerrainTexture.xml rename to AutomatedTesting/Levels/Physics/Material_DefaultLibraryConsistentOnAllFeatures/leveldata/TerrainTexture.xml diff --git a/AutomatedTesting/Levels/Physics/C4044455_Material_LibraryChangesInstantly/leveldata/TimeOfDay.xml b/AutomatedTesting/Levels/Physics/Material_DefaultLibraryConsistentOnAllFeatures/leveldata/TimeOfDay.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C4044455_Material_LibraryChangesInstantly/leveldata/TimeOfDay.xml rename to AutomatedTesting/Levels/Physics/Material_DefaultLibraryConsistentOnAllFeatures/leveldata/TimeOfDay.xml diff --git a/AutomatedTesting/Levels/Physics/C4044694_Material_EmptyLibraryUsesDefault/leveldata/VegetationMap.dat b/AutomatedTesting/Levels/Physics/Material_DefaultLibraryConsistentOnAllFeatures/leveldata/VegetationMap.dat similarity index 100% rename from AutomatedTesting/Levels/Physics/C4044694_Material_EmptyLibraryUsesDefault/leveldata/VegetationMap.dat rename to AutomatedTesting/Levels/Physics/Material_DefaultLibraryConsistentOnAllFeatures/leveldata/VegetationMap.dat diff --git a/AutomatedTesting/Levels/Physics/C15096735_Materials_DefaultLibraryConsistency/ragdoll/concrete/concrete_animgraph.animgraph b/AutomatedTesting/Levels/Physics/Material_DefaultLibraryConsistentOnAllFeatures/ragdoll/concrete/concrete_animgraph.animgraph similarity index 100% rename from AutomatedTesting/Levels/Physics/C15096735_Materials_DefaultLibraryConsistency/ragdoll/concrete/concrete_animgraph.animgraph rename to AutomatedTesting/Levels/Physics/Material_DefaultLibraryConsistentOnAllFeatures/ragdoll/concrete/concrete_animgraph.animgraph diff --git a/AutomatedTesting/Levels/Physics/C15096735_Materials_DefaultLibraryConsistency/ragdoll/concrete/concrete_motionset.motionset b/AutomatedTesting/Levels/Physics/Material_DefaultLibraryConsistentOnAllFeatures/ragdoll/concrete/concrete_motionset.motionset similarity index 100% rename from AutomatedTesting/Levels/Physics/C15096735_Materials_DefaultLibraryConsistency/ragdoll/concrete/concrete_motionset.motionset rename to AutomatedTesting/Levels/Physics/Material_DefaultLibraryConsistentOnAllFeatures/ragdoll/concrete/concrete_motionset.motionset diff --git a/AutomatedTesting/Levels/Physics/C15096735_Materials_DefaultLibraryConsistency/ragdoll/concrete/rin_concrete.mtl b/AutomatedTesting/Levels/Physics/Material_DefaultLibraryConsistentOnAllFeatures/ragdoll/concrete/rin_concrete.mtl similarity index 100% rename from AutomatedTesting/Levels/Physics/C15096735_Materials_DefaultLibraryConsistency/ragdoll/concrete/rin_concrete.mtl rename to AutomatedTesting/Levels/Physics/Material_DefaultLibraryConsistentOnAllFeatures/ragdoll/concrete/rin_concrete.mtl diff --git a/AutomatedTesting/Levels/Physics/C15096735_Materials_DefaultLibraryConsistency/ragdoll/concrete/rin_skeleton_newgeo.fbx b/AutomatedTesting/Levels/Physics/Material_DefaultLibraryConsistentOnAllFeatures/ragdoll/concrete/rin_skeleton_newgeo.fbx similarity index 100% rename from AutomatedTesting/Levels/Physics/C15096735_Materials_DefaultLibraryConsistency/ragdoll/concrete/rin_skeleton_newgeo.fbx rename to AutomatedTesting/Levels/Physics/Material_DefaultLibraryConsistentOnAllFeatures/ragdoll/concrete/rin_skeleton_newgeo.fbx diff --git a/AutomatedTesting/Levels/Physics/C15096735_Materials_DefaultLibraryConsistency/ragdoll/concrete/rin_skeleton_newgeo.fbx.assetinfo b/AutomatedTesting/Levels/Physics/Material_DefaultLibraryConsistentOnAllFeatures/ragdoll/concrete/rin_skeleton_newgeo.fbx.assetinfo similarity index 100% rename from AutomatedTesting/Levels/Physics/C15096735_Materials_DefaultLibraryConsistency/ragdoll/concrete/rin_skeleton_newgeo.fbx.assetinfo rename to AutomatedTesting/Levels/Physics/Material_DefaultLibraryConsistentOnAllFeatures/ragdoll/concrete/rin_skeleton_newgeo.fbx.assetinfo diff --git a/AutomatedTesting/Levels/Physics/C15096735_Materials_DefaultLibraryConsistency/ragdoll/concrete/rin_skeleton_newgeo.mtl b/AutomatedTesting/Levels/Physics/Material_DefaultLibraryConsistentOnAllFeatures/ragdoll/concrete/rin_skeleton_newgeo.mtl similarity index 100% rename from AutomatedTesting/Levels/Physics/C15096735_Materials_DefaultLibraryConsistency/ragdoll/concrete/rin_skeleton_newgeo.mtl rename to AutomatedTesting/Levels/Physics/Material_DefaultLibraryConsistentOnAllFeatures/ragdoll/concrete/rin_skeleton_newgeo.mtl diff --git a/AutomatedTesting/Levels/Physics/C15096735_Materials_DefaultLibraryConsistency/ragdoll/rin_skeleton_newgeo.fbx b/AutomatedTesting/Levels/Physics/Material_DefaultLibraryConsistentOnAllFeatures/ragdoll/rin_skeleton_newgeo.fbx similarity index 100% rename from AutomatedTesting/Levels/Physics/C15096735_Materials_DefaultLibraryConsistency/ragdoll/rin_skeleton_newgeo.fbx rename to AutomatedTesting/Levels/Physics/Material_DefaultLibraryConsistentOnAllFeatures/ragdoll/rin_skeleton_newgeo.fbx diff --git a/AutomatedTesting/Levels/Physics/C15096735_Materials_DefaultLibraryConsistency/ragdoll/rin_skeleton_newgeo.fbx.assetinfo b/AutomatedTesting/Levels/Physics/Material_DefaultLibraryConsistentOnAllFeatures/ragdoll/rin_skeleton_newgeo.fbx.assetinfo similarity index 100% rename from AutomatedTesting/Levels/Physics/C15096735_Materials_DefaultLibraryConsistency/ragdoll/rin_skeleton_newgeo.fbx.assetinfo rename to AutomatedTesting/Levels/Physics/Material_DefaultLibraryConsistentOnAllFeatures/ragdoll/rin_skeleton_newgeo.fbx.assetinfo diff --git a/AutomatedTesting/Levels/Physics/C15096735_Materials_DefaultLibraryConsistency/ragdoll/rin_skeleton_newgeo.mtl b/AutomatedTesting/Levels/Physics/Material_DefaultLibraryConsistentOnAllFeatures/ragdoll/rin_skeleton_newgeo.mtl similarity index 100% rename from AutomatedTesting/Levels/Physics/C15096735_Materials_DefaultLibraryConsistency/ragdoll/rin_skeleton_newgeo.mtl rename to AutomatedTesting/Levels/Physics/Material_DefaultLibraryConsistentOnAllFeatures/ragdoll/rin_skeleton_newgeo.mtl diff --git a/AutomatedTesting/Levels/Physics/C15096735_Materials_DefaultLibraryConsistency/ragdoll/rubber/rin_rubber.mtl b/AutomatedTesting/Levels/Physics/Material_DefaultLibraryConsistentOnAllFeatures/ragdoll/rubber/rin_rubber.mtl similarity index 100% rename from AutomatedTesting/Levels/Physics/C15096735_Materials_DefaultLibraryConsistency/ragdoll/rubber/rin_rubber.mtl rename to AutomatedTesting/Levels/Physics/Material_DefaultLibraryConsistentOnAllFeatures/ragdoll/rubber/rin_rubber.mtl diff --git a/AutomatedTesting/Levels/Physics/C15096735_Materials_DefaultLibraryConsistency/ragdoll/rubber/rin_skeleton_newgeo.fbx b/AutomatedTesting/Levels/Physics/Material_DefaultLibraryConsistentOnAllFeatures/ragdoll/rubber/rin_skeleton_newgeo.fbx similarity index 100% rename from AutomatedTesting/Levels/Physics/C15096735_Materials_DefaultLibraryConsistency/ragdoll/rubber/rin_skeleton_newgeo.fbx rename to AutomatedTesting/Levels/Physics/Material_DefaultLibraryConsistentOnAllFeatures/ragdoll/rubber/rin_skeleton_newgeo.fbx diff --git a/AutomatedTesting/Levels/Physics/C15096735_Materials_DefaultLibraryConsistency/ragdoll/rubber/rin_skeleton_newgeo.fbx.assetinfo b/AutomatedTesting/Levels/Physics/Material_DefaultLibraryConsistentOnAllFeatures/ragdoll/rubber/rin_skeleton_newgeo.fbx.assetinfo similarity index 100% rename from AutomatedTesting/Levels/Physics/C15096735_Materials_DefaultLibraryConsistency/ragdoll/rubber/rin_skeleton_newgeo.fbx.assetinfo rename to AutomatedTesting/Levels/Physics/Material_DefaultLibraryConsistentOnAllFeatures/ragdoll/rubber/rin_skeleton_newgeo.fbx.assetinfo diff --git a/AutomatedTesting/Levels/Physics/C15096735_Materials_DefaultLibraryConsistency/ragdoll/rubber/rin_skeleton_newgeo.mtl b/AutomatedTesting/Levels/Physics/Material_DefaultLibraryConsistentOnAllFeatures/ragdoll/rubber/rin_skeleton_newgeo.mtl similarity index 100% rename from AutomatedTesting/Levels/Physics/C15096735_Materials_DefaultLibraryConsistency/ragdoll/rubber/rin_skeleton_newgeo.mtl rename to AutomatedTesting/Levels/Physics/Material_DefaultLibraryConsistentOnAllFeatures/ragdoll/rubber/rin_skeleton_newgeo.mtl diff --git a/AutomatedTesting/Levels/Physics/C15096735_Materials_DefaultLibraryConsistency/ragdoll/rubber/rubber_animgraph.animgraph b/AutomatedTesting/Levels/Physics/Material_DefaultLibraryConsistentOnAllFeatures/ragdoll/rubber/rubber_animgraph.animgraph similarity index 100% rename from AutomatedTesting/Levels/Physics/C15096735_Materials_DefaultLibraryConsistency/ragdoll/rubber/rubber_animgraph.animgraph rename to AutomatedTesting/Levels/Physics/Material_DefaultLibraryConsistentOnAllFeatures/ragdoll/rubber/rubber_animgraph.animgraph diff --git a/AutomatedTesting/Levels/Physics/C15096735_Materials_DefaultLibraryConsistency/ragdoll/rubber/rubber_motionset.motionset b/AutomatedTesting/Levels/Physics/Material_DefaultLibraryConsistentOnAllFeatures/ragdoll/rubber/rubber_motionset.motionset similarity index 100% rename from AutomatedTesting/Levels/Physics/C15096735_Materials_DefaultLibraryConsistency/ragdoll/rubber/rubber_motionset.motionset rename to AutomatedTesting/Levels/Physics/Material_DefaultLibraryConsistentOnAllFeatures/ragdoll/rubber/rubber_motionset.motionset diff --git a/AutomatedTesting/Levels/Physics/C15096735_Materials_DefaultLibraryConsistency/rubber.mtl b/AutomatedTesting/Levels/Physics/Material_DefaultLibraryConsistentOnAllFeatures/rubber.mtl similarity index 100% rename from AutomatedTesting/Levels/Physics/C15096735_Materials_DefaultLibraryConsistency/rubber.mtl rename to AutomatedTesting/Levels/Physics/Material_DefaultLibraryConsistentOnAllFeatures/rubber.mtl diff --git a/AutomatedTesting/Levels/Physics/C4044461_Material_Restitution/tags.txt b/AutomatedTesting/Levels/Physics/Material_DefaultLibraryConsistentOnAllFeatures/tags.txt similarity index 100% rename from AutomatedTesting/Levels/Physics/C4044461_Material_Restitution/tags.txt rename to AutomatedTesting/Levels/Physics/Material_DefaultLibraryConsistentOnAllFeatures/tags.txt diff --git a/AutomatedTesting/Levels/Physics/C15096735_Materials_DefaultLibraryConsistency/terrain/terrain.pxheightfield b/AutomatedTesting/Levels/Physics/Material_DefaultLibraryConsistentOnAllFeatures/terrain/terrain.pxheightfield similarity index 100% rename from AutomatedTesting/Levels/Physics/C15096735_Materials_DefaultLibraryConsistency/terrain/terrain.pxheightfield rename to AutomatedTesting/Levels/Physics/Material_DefaultLibraryConsistentOnAllFeatures/terrain/terrain.pxheightfield diff --git a/AutomatedTesting/Levels/Physics/C15096735_Materials_DefaultLibraryConsistency/terraintexture.pak b/AutomatedTesting/Levels/Physics/Material_DefaultLibraryConsistentOnAllFeatures/terraintexture.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C15096735_Materials_DefaultLibraryConsistency/terraintexture.pak rename to AutomatedTesting/Levels/Physics/Material_DefaultLibraryConsistentOnAllFeatures/terraintexture.pak diff --git a/AutomatedTesting/Levels/Physics/Material_DefaultLibraryUpdatedAcrossLevels/0/0.ly b/AutomatedTesting/Levels/Physics/Material_DefaultLibraryUpdatedAcrossLevels/0/0.ly new file mode 100644 index 0000000000..04e8722b8b --- /dev/null +++ b/AutomatedTesting/Levels/Physics/Material_DefaultLibraryUpdatedAcrossLevels/0/0.ly @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2f81cca02ee6ba84bee2bdf5c37541cea3386de8eeb31ffcd05d2cc01eaf3d8e +size 6365 diff --git a/AutomatedTesting/Levels/Physics/C15096732_Material_DefaultLibraryUpdatedAcrossLevels/0/filelist.xml b/AutomatedTesting/Levels/Physics/Material_DefaultLibraryUpdatedAcrossLevels/0/filelist.xml similarity index 67% rename from AutomatedTesting/Levels/Physics/C15096732_Material_DefaultLibraryUpdatedAcrossLevels/0/filelist.xml rename to AutomatedTesting/Levels/Physics/Material_DefaultLibraryUpdatedAcrossLevels/0/filelist.xml index a550412634..7a2989c360 100644 --- a/AutomatedTesting/Levels/Physics/C15096732_Material_DefaultLibraryUpdatedAcrossLevels/0/filelist.xml +++ b/AutomatedTesting/Levels/Physics/Material_DefaultLibraryUpdatedAcrossLevels/0/filelist.xml @@ -1,4 +1,4 @@ - + diff --git a/AutomatedTesting/Levels/Physics/Material_DefaultLibraryUpdatedAcrossLevels/0/level.pak b/AutomatedTesting/Levels/Physics/Material_DefaultLibraryUpdatedAcrossLevels/0/level.pak new file mode 100644 index 0000000000..b03cb20cb2 --- /dev/null +++ b/AutomatedTesting/Levels/Physics/Material_DefaultLibraryUpdatedAcrossLevels/0/level.pak @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fec01136df2b36809f16d647b0625057c956e6073b21626d8a773d1dcc8a5bd3 +size 39345 diff --git a/AutomatedTesting/Levels/Physics/C4044461_Material_Restitution/leveldata/Environment.xml b/AutomatedTesting/Levels/Physics/Material_DefaultLibraryUpdatedAcrossLevels/0/leveldata/Environment.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C4044461_Material_Restitution/leveldata/Environment.xml rename to AutomatedTesting/Levels/Physics/Material_DefaultLibraryUpdatedAcrossLevels/0/leveldata/Environment.xml diff --git a/AutomatedTesting/Levels/Physics/C15556261_PhysXMaterials_CharacterControllerMaterialAssignment/leveldata/GameTokens.xml b/AutomatedTesting/Levels/Physics/Material_DefaultLibraryUpdatedAcrossLevels/0/leveldata/GameTokens.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C15556261_PhysXMaterials_CharacterControllerMaterialAssignment/leveldata/GameTokens.xml rename to AutomatedTesting/Levels/Physics/Material_DefaultLibraryUpdatedAcrossLevels/0/leveldata/GameTokens.xml diff --git a/AutomatedTesting/Levels/Physics/Material_DefaultLibraryUpdatedAcrossLevels/0/leveldata/Heightmap.dat b/AutomatedTesting/Levels/Physics/Material_DefaultLibraryUpdatedAcrossLevels/0/leveldata/Heightmap.dat new file mode 100644 index 0000000000..2a07219a0b --- /dev/null +++ b/AutomatedTesting/Levels/Physics/Material_DefaultLibraryUpdatedAcrossLevels/0/leveldata/Heightmap.dat @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:af2e9ed3a37f92768829bce5e53cfca8fc38814eb96f37fa0430925987178cef +size 17407562 diff --git a/AutomatedTesting/Levels/Physics/C18243587_Joints_HingeBreakable/leveldata/TerrainTexture.xml b/AutomatedTesting/Levels/Physics/Material_DefaultLibraryUpdatedAcrossLevels/0/leveldata/TerrainTexture.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C18243587_Joints_HingeBreakable/leveldata/TerrainTexture.xml rename to AutomatedTesting/Levels/Physics/Material_DefaultLibraryUpdatedAcrossLevels/0/leveldata/TerrainTexture.xml diff --git a/AutomatedTesting/Levels/Physics/C6090555_ForceRegion_SplineFollowOnRigidBodies/leveldata/TimeOfDay.xml b/AutomatedTesting/Levels/Physics/Material_DefaultLibraryUpdatedAcrossLevels/0/leveldata/TimeOfDay.xml similarity index 99% rename from AutomatedTesting/Levels/Physics/C6090555_ForceRegion_SplineFollowOnRigidBodies/leveldata/TimeOfDay.xml rename to AutomatedTesting/Levels/Physics/Material_DefaultLibraryUpdatedAcrossLevels/0/leveldata/TimeOfDay.xml index 456d609b8a..c5b404318e 100644 --- a/AutomatedTesting/Levels/Physics/C6090555_ForceRegion_SplineFollowOnRigidBodies/leveldata/TimeOfDay.xml +++ b/AutomatedTesting/Levels/Physics/Material_DefaultLibraryUpdatedAcrossLevels/0/leveldata/TimeOfDay.xml @@ -236,8 +236,8 @@ - - + + diff --git a/AutomatedTesting/Levels/Physics/C4044697_Material_PerfaceMaterialValidation/leveldata/VegetationMap.dat b/AutomatedTesting/Levels/Physics/Material_DefaultLibraryUpdatedAcrossLevels/0/leveldata/VegetationMap.dat similarity index 100% rename from AutomatedTesting/Levels/Physics/C4044697_Material_PerfaceMaterialValidation/leveldata/VegetationMap.dat rename to AutomatedTesting/Levels/Physics/Material_DefaultLibraryUpdatedAcrossLevels/0/leveldata/VegetationMap.dat diff --git a/AutomatedTesting/Levels/Physics/C4044694_Material_EmptyLibraryUsesDefault/tags.txt b/AutomatedTesting/Levels/Physics/Material_DefaultLibraryUpdatedAcrossLevels/0/tags.txt similarity index 100% rename from AutomatedTesting/Levels/Physics/C4044694_Material_EmptyLibraryUsesDefault/tags.txt rename to AutomatedTesting/Levels/Physics/Material_DefaultLibraryUpdatedAcrossLevels/0/tags.txt diff --git a/AutomatedTesting/Levels/Physics/Material_DefaultLibraryUpdatedAcrossLevels/0/terrain/cover.ctc b/AutomatedTesting/Levels/Physics/Material_DefaultLibraryUpdatedAcrossLevels/0/terrain/cover.ctc new file mode 100644 index 0000000000..5c869c6533 --- /dev/null +++ b/AutomatedTesting/Levels/Physics/Material_DefaultLibraryUpdatedAcrossLevels/0/terrain/cover.ctc @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fdab340ad6c6dc6c1167e31afa061684be083360fc4108fa9f1fa4b15fe95d8c +size 1310792 diff --git a/AutomatedTesting/Levels/Physics/C15308217_NoCrash_LevelSwitchWithTerrain/terrain/terrain.pxheightfield b/AutomatedTesting/Levels/Physics/Material_DefaultLibraryUpdatedAcrossLevels/0/terrain/terrain.pxheightfield similarity index 100% rename from AutomatedTesting/Levels/Physics/C15308217_NoCrash_LevelSwitchWithTerrain/terrain/terrain.pxheightfield rename to AutomatedTesting/Levels/Physics/Material_DefaultLibraryUpdatedAcrossLevels/0/terrain/terrain.pxheightfield diff --git a/AutomatedTesting/Levels/Physics/C4888315_Material_AddModifyDeleteOnCollider/terraintexture.pak b/AutomatedTesting/Levels/Physics/Material_DefaultLibraryUpdatedAcrossLevels/0/terraintexture.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C4888315_Material_AddModifyDeleteOnCollider/terraintexture.pak rename to AutomatedTesting/Levels/Physics/Material_DefaultLibraryUpdatedAcrossLevels/0/terraintexture.pak diff --git a/AutomatedTesting/Levels/Physics/Material_DefaultLibraryUpdatedAcrossLevels/1/1.ly b/AutomatedTesting/Levels/Physics/Material_DefaultLibraryUpdatedAcrossLevels/1/1.ly new file mode 100644 index 0000000000..c193edc22e --- /dev/null +++ b/AutomatedTesting/Levels/Physics/Material_DefaultLibraryUpdatedAcrossLevels/1/1.ly @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b7fe6f5392d56fdc7f94d405d820ea9d6da084800d3abb32fe2d30ceaa3cdfb9 +size 6396 diff --git a/AutomatedTesting/Levels/Physics/C15096732_Material_DefaultLibraryUpdatedAcrossLevels/1/filelist.xml b/AutomatedTesting/Levels/Physics/Material_DefaultLibraryUpdatedAcrossLevels/1/filelist.xml similarity index 67% rename from AutomatedTesting/Levels/Physics/C15096732_Material_DefaultLibraryUpdatedAcrossLevels/1/filelist.xml rename to AutomatedTesting/Levels/Physics/Material_DefaultLibraryUpdatedAcrossLevels/1/filelist.xml index a8e9e19b81..7a2989c360 100644 --- a/AutomatedTesting/Levels/Physics/C15096732_Material_DefaultLibraryUpdatedAcrossLevels/1/filelist.xml +++ b/AutomatedTesting/Levels/Physics/Material_DefaultLibraryUpdatedAcrossLevels/1/filelist.xml @@ -1,4 +1,4 @@ - + diff --git a/AutomatedTesting/Levels/Physics/Material_DefaultLibraryUpdatedAcrossLevels/1/level.pak b/AutomatedTesting/Levels/Physics/Material_DefaultLibraryUpdatedAcrossLevels/1/level.pak new file mode 100644 index 0000000000..b03cb20cb2 --- /dev/null +++ b/AutomatedTesting/Levels/Physics/Material_DefaultLibraryUpdatedAcrossLevels/1/level.pak @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fec01136df2b36809f16d647b0625057c956e6073b21626d8a773d1dcc8a5bd3 +size 39345 diff --git a/AutomatedTesting/Levels/Physics/C4044694_Material_EmptyLibraryUsesDefault/leveldata/Environment.xml b/AutomatedTesting/Levels/Physics/Material_DefaultLibraryUpdatedAcrossLevels/1/leveldata/Environment.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C4044694_Material_EmptyLibraryUsesDefault/leveldata/Environment.xml rename to AutomatedTesting/Levels/Physics/Material_DefaultLibraryUpdatedAcrossLevels/1/leveldata/Environment.xml diff --git a/AutomatedTesting/Levels/Physics/C15563573_Material_AddModifyDeleteOnCharacterController/leveldata/GameTokens.xml b/AutomatedTesting/Levels/Physics/Material_DefaultLibraryUpdatedAcrossLevels/1/leveldata/GameTokens.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C15563573_Material_AddModifyDeleteOnCharacterController/leveldata/GameTokens.xml rename to AutomatedTesting/Levels/Physics/Material_DefaultLibraryUpdatedAcrossLevels/1/leveldata/GameTokens.xml diff --git a/AutomatedTesting/Levels/Physics/Material_DefaultLibraryUpdatedAcrossLevels/1/leveldata/Heightmap.dat b/AutomatedTesting/Levels/Physics/Material_DefaultLibraryUpdatedAcrossLevels/1/leveldata/Heightmap.dat new file mode 100644 index 0000000000..2a07219a0b --- /dev/null +++ b/AutomatedTesting/Levels/Physics/Material_DefaultLibraryUpdatedAcrossLevels/1/leveldata/Heightmap.dat @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:af2e9ed3a37f92768829bce5e53cfca8fc38814eb96f37fa0430925987178cef +size 17407562 diff --git a/AutomatedTesting/Levels/Physics/C18243588_Joints_Ball2BodiesConstrained/leveldata/TerrainTexture.xml b/AutomatedTesting/Levels/Physics/Material_DefaultLibraryUpdatedAcrossLevels/1/leveldata/TerrainTexture.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C18243588_Joints_Ball2BodiesConstrained/leveldata/TerrainTexture.xml rename to AutomatedTesting/Levels/Physics/Material_DefaultLibraryUpdatedAcrossLevels/1/leveldata/TerrainTexture.xml diff --git a/AutomatedTesting/Levels/Physics/C6090546_ForceRegion_SliceFileInstantiates/leveldata/TimeOfDay.xml b/AutomatedTesting/Levels/Physics/Material_DefaultLibraryUpdatedAcrossLevels/1/leveldata/TimeOfDay.xml similarity index 99% rename from AutomatedTesting/Levels/Physics/C6090546_ForceRegion_SliceFileInstantiates/leveldata/TimeOfDay.xml rename to AutomatedTesting/Levels/Physics/Material_DefaultLibraryUpdatedAcrossLevels/1/leveldata/TimeOfDay.xml index 456d609b8a..c5b404318e 100644 --- a/AutomatedTesting/Levels/Physics/C6090546_ForceRegion_SliceFileInstantiates/leveldata/TimeOfDay.xml +++ b/AutomatedTesting/Levels/Physics/Material_DefaultLibraryUpdatedAcrossLevels/1/leveldata/TimeOfDay.xml @@ -236,8 +236,8 @@ - - + + diff --git a/AutomatedTesting/Levels/Physics/C4888315_Material_AddModifyDeleteOnCollider/leveldata/VegetationMap.dat b/AutomatedTesting/Levels/Physics/Material_DefaultLibraryUpdatedAcrossLevels/1/leveldata/VegetationMap.dat similarity index 100% rename from AutomatedTesting/Levels/Physics/C4888315_Material_AddModifyDeleteOnCollider/leveldata/VegetationMap.dat rename to AutomatedTesting/Levels/Physics/Material_DefaultLibraryUpdatedAcrossLevels/1/leveldata/VegetationMap.dat diff --git a/AutomatedTesting/Levels/Physics/C4044697_Material_PerfaceMaterialValidation/tags.txt b/AutomatedTesting/Levels/Physics/Material_DefaultLibraryUpdatedAcrossLevels/1/tags.txt similarity index 100% rename from AutomatedTesting/Levels/Physics/C4044697_Material_PerfaceMaterialValidation/tags.txt rename to AutomatedTesting/Levels/Physics/Material_DefaultLibraryUpdatedAcrossLevels/1/tags.txt diff --git a/AutomatedTesting/Levels/Physics/Material_DefaultLibraryUpdatedAcrossLevels/1/terrain/cover.ctc b/AutomatedTesting/Levels/Physics/Material_DefaultLibraryUpdatedAcrossLevels/1/terrain/cover.ctc new file mode 100644 index 0000000000..5c869c6533 --- /dev/null +++ b/AutomatedTesting/Levels/Physics/Material_DefaultLibraryUpdatedAcrossLevels/1/terrain/cover.ctc @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fdab340ad6c6dc6c1167e31afa061684be083360fc4108fa9f1fa4b15fe95d8c +size 1310792 diff --git a/AutomatedTesting/Levels/Physics/C15425935_Material_LibraryUpdatedAcrossLevels/C15425935_Material_LibraryUpdatedAcrossLevels_0/terrain/terrain.pxheightfield b/AutomatedTesting/Levels/Physics/Material_DefaultLibraryUpdatedAcrossLevels/1/terrain/terrain.pxheightfield similarity index 100% rename from AutomatedTesting/Levels/Physics/C15425935_Material_LibraryUpdatedAcrossLevels/C15425935_Material_LibraryUpdatedAcrossLevels_0/terrain/terrain.pxheightfield rename to AutomatedTesting/Levels/Physics/Material_DefaultLibraryUpdatedAcrossLevels/1/terrain/terrain.pxheightfield diff --git a/AutomatedTesting/Levels/Physics/C4925580_Material_RagdollBonesMaterial/terraintexture.pak b/AutomatedTesting/Levels/Physics/Material_DefaultLibraryUpdatedAcrossLevels/1/terraintexture.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C4925580_Material_RagdollBonesMaterial/terraintexture.pak rename to AutomatedTesting/Levels/Physics/Material_DefaultLibraryUpdatedAcrossLevels/1/terraintexture.pak diff --git a/AutomatedTesting/Levels/Physics/Material_DefaultLibraryUpdatedAcrossLevels/_last_run_before_change_data.txt b/AutomatedTesting/Levels/Physics/Material_DefaultLibraryUpdatedAcrossLevels/_last_run_before_change_data.txt new file mode 100644 index 0000000000..0533215fc1 --- /dev/null +++ b/AutomatedTesting/Levels/Physics/Material_DefaultLibraryUpdatedAcrossLevels/_last_run_before_change_data.txt @@ -0,0 +1,4 @@ +[0.0, 0.0, 2.3999319076538086] +[0.0, 0.0, 2.3999319076538086] +True +True diff --git a/AutomatedTesting/Levels/Physics/C15096732_Material_DefaultLibraryUpdatedAcrossLevels/c15096732_material_defaultlibraryupdatedacrosslevels_b.physmaterial b/AutomatedTesting/Levels/Physics/Material_DefaultLibraryUpdatedAcrossLevels/after.physmaterial similarity index 100% rename from AutomatedTesting/Levels/Physics/C15096732_Material_DefaultLibraryUpdatedAcrossLevels/c15096732_material_defaultlibraryupdatedacrosslevels_b.physmaterial rename to AutomatedTesting/Levels/Physics/Material_DefaultLibraryUpdatedAcrossLevels/after.physmaterial diff --git a/AutomatedTesting/Levels/Physics/C15096732_Material_DefaultLibraryUpdatedAcrossLevels/c15096732_material_defaultlibraryupdatedacrosslevels_a.physmaterial b/AutomatedTesting/Levels/Physics/Material_DefaultLibraryUpdatedAcrossLevels/before.physmaterial similarity index 100% rename from AutomatedTesting/Levels/Physics/C15096732_Material_DefaultLibraryUpdatedAcrossLevels/c15096732_material_defaultlibraryupdatedacrosslevels_a.physmaterial rename to AutomatedTesting/Levels/Physics/Material_DefaultLibraryUpdatedAcrossLevels/before.physmaterial diff --git a/AutomatedTesting/Levels/Physics/C15096737_Materials_DefaultMaterialLibraryChanges/Layers/phase1.layer b/AutomatedTesting/Levels/Physics/Material_DefaultMaterialLibraryChangesWork/Layers/phase1.layer similarity index 100% rename from AutomatedTesting/Levels/Physics/C15096737_Materials_DefaultMaterialLibraryChanges/Layers/phase1.layer rename to AutomatedTesting/Levels/Physics/Material_DefaultMaterialLibraryChangesWork/Layers/phase1.layer diff --git a/AutomatedTesting/Levels/Physics/C15096737_Materials_DefaultMaterialLibraryChanges/Layers/phase2.layer b/AutomatedTesting/Levels/Physics/Material_DefaultMaterialLibraryChangesWork/Layers/phase2.layer similarity index 100% rename from AutomatedTesting/Levels/Physics/C15096737_Materials_DefaultMaterialLibraryChanges/Layers/phase2.layer rename to AutomatedTesting/Levels/Physics/Material_DefaultMaterialLibraryChangesWork/Layers/phase2.layer diff --git a/AutomatedTesting/Levels/Physics/C15096737_Materials_DefaultMaterialLibraryChanges/Layers/phase3.layer b/AutomatedTesting/Levels/Physics/Material_DefaultMaterialLibraryChangesWork/Layers/phase3.layer similarity index 100% rename from AutomatedTesting/Levels/Physics/C15096737_Materials_DefaultMaterialLibraryChanges/Layers/phase3.layer rename to AutomatedTesting/Levels/Physics/Material_DefaultMaterialLibraryChangesWork/Layers/phase3.layer diff --git a/AutomatedTesting/Levels/Physics/C15096737_Materials_DefaultMaterialLibraryChanges/Layers/phase4.layer b/AutomatedTesting/Levels/Physics/Material_DefaultMaterialLibraryChangesWork/Layers/phase4.layer similarity index 100% rename from AutomatedTesting/Levels/Physics/C15096737_Materials_DefaultMaterialLibraryChanges/Layers/phase4.layer rename to AutomatedTesting/Levels/Physics/Material_DefaultMaterialLibraryChangesWork/Layers/phase4.layer diff --git a/AutomatedTesting/Levels/Physics/C15096737_Materials_DefaultMaterialLibraryChanges/C15096737_Materials_DefaultMaterialLibraryChanges.ly b/AutomatedTesting/Levels/Physics/Material_DefaultMaterialLibraryChangesWork/Material_DefaultMaterialLibraryChangesWork.ly similarity index 100% rename from AutomatedTesting/Levels/Physics/C15096737_Materials_DefaultMaterialLibraryChanges/C15096737_Materials_DefaultMaterialLibraryChanges.ly rename to AutomatedTesting/Levels/Physics/Material_DefaultMaterialLibraryChangesWork/Material_DefaultMaterialLibraryChangesWork.ly diff --git a/AutomatedTesting/Levels/Physics/C15096737_Materials_DefaultMaterialLibraryChanges/all_ones_1.physmaterial b/AutomatedTesting/Levels/Physics/Material_DefaultMaterialLibraryChangesWork/all_ones_1.physmaterial similarity index 100% rename from AutomatedTesting/Levels/Physics/C15096737_Materials_DefaultMaterialLibraryChanges/all_ones_1.physmaterial rename to AutomatedTesting/Levels/Physics/Material_DefaultMaterialLibraryChangesWork/all_ones_1.physmaterial diff --git a/AutomatedTesting/Levels/Physics/C15096737_Materials_DefaultMaterialLibraryChanges/custom_motionset.motionset b/AutomatedTesting/Levels/Physics/Material_DefaultMaterialLibraryChangesWork/custom_motionset.motionset similarity index 100% rename from AutomatedTesting/Levels/Physics/C15096737_Materials_DefaultMaterialLibraryChanges/custom_motionset.motionset rename to AutomatedTesting/Levels/Physics/Material_DefaultMaterialLibraryChangesWork/custom_motionset.motionset diff --git a/AutomatedTesting/Levels/Physics/C15096737_Materials_DefaultMaterialLibraryChanges/filelist.xml b/AutomatedTesting/Levels/Physics/Material_DefaultMaterialLibraryChangesWork/filelist.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C15096737_Materials_DefaultMaterialLibraryChanges/filelist.xml rename to AutomatedTesting/Levels/Physics/Material_DefaultMaterialLibraryChangesWork/filelist.xml diff --git a/AutomatedTesting/Levels/Physics/C15096737_Materials_DefaultMaterialLibraryChanges/level.pak b/AutomatedTesting/Levels/Physics/Material_DefaultMaterialLibraryChangesWork/level.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C15096737_Materials_DefaultMaterialLibraryChanges/level.pak rename to AutomatedTesting/Levels/Physics/Material_DefaultMaterialLibraryChangesWork/level.pak diff --git a/AutomatedTesting/Levels/Physics/C4044697_Material_PerfaceMaterialValidation/leveldata/Environment.xml b/AutomatedTesting/Levels/Physics/Material_DefaultMaterialLibraryChangesWork/leveldata/Environment.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C4044697_Material_PerfaceMaterialValidation/leveldata/Environment.xml rename to AutomatedTesting/Levels/Physics/Material_DefaultMaterialLibraryChangesWork/leveldata/Environment.xml diff --git a/AutomatedTesting/Levels/Physics/C15845879_ForceRegion_HighLinearDampingForce/leveldata/GameTokens.xml b/AutomatedTesting/Levels/Physics/Material_DefaultMaterialLibraryChangesWork/leveldata/GameTokens.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C15845879_ForceRegion_HighLinearDampingForce/leveldata/GameTokens.xml rename to AutomatedTesting/Levels/Physics/Material_DefaultMaterialLibraryChangesWork/leveldata/GameTokens.xml diff --git a/AutomatedTesting/Levels/Physics/C18243589_Joints_BallSoftLimitsConstrained/leveldata/TerrainTexture.xml b/AutomatedTesting/Levels/Physics/Material_DefaultMaterialLibraryChangesWork/leveldata/TerrainTexture.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C18243589_Joints_BallSoftLimitsConstrained/leveldata/TerrainTexture.xml rename to AutomatedTesting/Levels/Physics/Material_DefaultMaterialLibraryChangesWork/leveldata/TerrainTexture.xml diff --git a/AutomatedTesting/Levels/Physics/C4044456_Material_FrictionCombine/leveldata/TimeOfDay.xml b/AutomatedTesting/Levels/Physics/Material_DefaultMaterialLibraryChangesWork/leveldata/TimeOfDay.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C4044456_Material_FrictionCombine/leveldata/TimeOfDay.xml rename to AutomatedTesting/Levels/Physics/Material_DefaultMaterialLibraryChangesWork/leveldata/TimeOfDay.xml diff --git a/AutomatedTesting/Levels/Physics/C4925577_PhysXMaterials_MaterialAssignedToTerrain/leveldata/VegetationMap.dat b/AutomatedTesting/Levels/Physics/Material_DefaultMaterialLibraryChangesWork/leveldata/VegetationMap.dat similarity index 100% rename from AutomatedTesting/Levels/Physics/C4925577_PhysXMaterials_MaterialAssignedToTerrain/leveldata/VegetationMap.dat rename to AutomatedTesting/Levels/Physics/Material_DefaultMaterialLibraryChangesWork/leveldata/VegetationMap.dat diff --git a/AutomatedTesting/Levels/Physics/C15096737_Materials_DefaultMaterialLibraryChanges/materials/custom_material_1.mtl b/AutomatedTesting/Levels/Physics/Material_DefaultMaterialLibraryChangesWork/materials/custom_material_1.mtl similarity index 100% rename from AutomatedTesting/Levels/Physics/C15096737_Materials_DefaultMaterialLibraryChanges/materials/custom_material_1.mtl rename to AutomatedTesting/Levels/Physics/Material_DefaultMaterialLibraryChangesWork/materials/custom_material_1.mtl diff --git a/AutomatedTesting/Levels/Physics/C15096737_Materials_DefaultMaterialLibraryChanges/materials/custom_material_2.mtl b/AutomatedTesting/Levels/Physics/Material_DefaultMaterialLibraryChangesWork/materials/custom_material_2.mtl similarity index 100% rename from AutomatedTesting/Levels/Physics/C15096737_Materials_DefaultMaterialLibraryChanges/materials/custom_material_2.mtl rename to AutomatedTesting/Levels/Physics/Material_DefaultMaterialLibraryChangesWork/materials/custom_material_2.mtl diff --git a/AutomatedTesting/Levels/Physics/C15096737_Materials_DefaultMaterialLibraryChanges/materials/custom_terrain_mat_blue.mtl b/AutomatedTesting/Levels/Physics/Material_DefaultMaterialLibraryChangesWork/materials/custom_terrain_mat_blue.mtl similarity index 100% rename from AutomatedTesting/Levels/Physics/C15096737_Materials_DefaultMaterialLibraryChanges/materials/custom_terrain_mat_blue.mtl rename to AutomatedTesting/Levels/Physics/Material_DefaultMaterialLibraryChangesWork/materials/custom_terrain_mat_blue.mtl diff --git a/AutomatedTesting/Levels/Physics/C15096737_Materials_DefaultMaterialLibraryChanges/materials/custom_terrain_mat_red.mtl b/AutomatedTesting/Levels/Physics/Material_DefaultMaterialLibraryChangesWork/materials/custom_terrain_mat_red.mtl similarity index 100% rename from AutomatedTesting/Levels/Physics/C15096737_Materials_DefaultMaterialLibraryChanges/materials/custom_terrain_mat_red.mtl rename to AutomatedTesting/Levels/Physics/Material_DefaultMaterialLibraryChangesWork/materials/custom_terrain_mat_red.mtl diff --git a/AutomatedTesting/Levels/Physics/C15096737_Materials_DefaultMaterialLibraryChanges/materials/material_terrain_default.mtl b/AutomatedTesting/Levels/Physics/Material_DefaultMaterialLibraryChangesWork/materials/material_terrain_default.mtl similarity index 100% rename from AutomatedTesting/Levels/Physics/C15096737_Materials_DefaultMaterialLibraryChanges/materials/material_terrain_default.mtl rename to AutomatedTesting/Levels/Physics/Material_DefaultMaterialLibraryChangesWork/materials/material_terrain_default.mtl diff --git a/AutomatedTesting/Levels/Physics/C15096737_Materials_DefaultMaterialLibraryChanges/rin_physics.animgraph b/AutomatedTesting/Levels/Physics/Material_DefaultMaterialLibraryChangesWork/rin_physics.animgraph similarity index 100% rename from AutomatedTesting/Levels/Physics/C15096737_Materials_DefaultMaterialLibraryChanges/rin_physics.animgraph rename to AutomatedTesting/Levels/Physics/Material_DefaultMaterialLibraryChangesWork/rin_physics.animgraph diff --git a/AutomatedTesting/Levels/Physics/C15096737_Materials_DefaultMaterialLibraryChanges/rin_skeleton_newgeo - Copy.fbx b/AutomatedTesting/Levels/Physics/Material_DefaultMaterialLibraryChangesWork/rin_skeleton_newgeo - Copy.fbx similarity index 100% rename from AutomatedTesting/Levels/Physics/C15096737_Materials_DefaultMaterialLibraryChanges/rin_skeleton_newgeo - Copy.fbx rename to AutomatedTesting/Levels/Physics/Material_DefaultMaterialLibraryChangesWork/rin_skeleton_newgeo - Copy.fbx diff --git a/AutomatedTesting/Levels/Physics/C15096737_Materials_DefaultMaterialLibraryChanges/rin_skeleton_newgeo - copy.fbx.assetinfo b/AutomatedTesting/Levels/Physics/Material_DefaultMaterialLibraryChangesWork/rin_skeleton_newgeo - copy.fbx.assetinfo similarity index 100% rename from AutomatedTesting/Levels/Physics/C15096737_Materials_DefaultMaterialLibraryChanges/rin_skeleton_newgeo - copy.fbx.assetinfo rename to AutomatedTesting/Levels/Physics/Material_DefaultMaterialLibraryChangesWork/rin_skeleton_newgeo - copy.fbx.assetinfo diff --git a/AutomatedTesting/Levels/Physics/C15096737_Materials_DefaultMaterialLibraryChanges/rin_skeleton_newgeo - copy.mtl b/AutomatedTesting/Levels/Physics/Material_DefaultMaterialLibraryChangesWork/rin_skeleton_newgeo - copy.mtl similarity index 100% rename from AutomatedTesting/Levels/Physics/C15096737_Materials_DefaultMaterialLibraryChanges/rin_skeleton_newgeo - copy.mtl rename to AutomatedTesting/Levels/Physics/Material_DefaultMaterialLibraryChangesWork/rin_skeleton_newgeo - copy.mtl diff --git a/AutomatedTesting/Levels/Physics/C15096737_Materials_DefaultMaterialLibraryChanges/rin_skeleton_newgeo.fbx b/AutomatedTesting/Levels/Physics/Material_DefaultMaterialLibraryChangesWork/rin_skeleton_newgeo.fbx similarity index 100% rename from AutomatedTesting/Levels/Physics/C15096737_Materials_DefaultMaterialLibraryChanges/rin_skeleton_newgeo.fbx rename to AutomatedTesting/Levels/Physics/Material_DefaultMaterialLibraryChangesWork/rin_skeleton_newgeo.fbx diff --git a/AutomatedTesting/Levels/Physics/C15096737_Materials_DefaultMaterialLibraryChanges/rin_skeleton_newgeo.fbx.assetinfo b/AutomatedTesting/Levels/Physics/Material_DefaultMaterialLibraryChangesWork/rin_skeleton_newgeo.fbx.assetinfo similarity index 100% rename from AutomatedTesting/Levels/Physics/C15096737_Materials_DefaultMaterialLibraryChanges/rin_skeleton_newgeo.fbx.assetinfo rename to AutomatedTesting/Levels/Physics/Material_DefaultMaterialLibraryChangesWork/rin_skeleton_newgeo.fbx.assetinfo diff --git a/AutomatedTesting/Levels/Physics/C15096737_Materials_DefaultMaterialLibraryChanges/rin_skeleton_newgeo.mtl b/AutomatedTesting/Levels/Physics/Material_DefaultMaterialLibraryChangesWork/rin_skeleton_newgeo.mtl similarity index 100% rename from AutomatedTesting/Levels/Physics/C15096737_Materials_DefaultMaterialLibraryChanges/rin_skeleton_newgeo.mtl rename to AutomatedTesting/Levels/Physics/Material_DefaultMaterialLibraryChangesWork/rin_skeleton_newgeo.mtl diff --git a/AutomatedTesting/Levels/Physics/C4888315_Material_AddModifyDeleteOnCollider/tags.txt b/AutomatedTesting/Levels/Physics/Material_DefaultMaterialLibraryChangesWork/tags.txt similarity index 100% rename from AutomatedTesting/Levels/Physics/C4888315_Material_AddModifyDeleteOnCollider/tags.txt rename to AutomatedTesting/Levels/Physics/Material_DefaultMaterialLibraryChangesWork/tags.txt diff --git a/AutomatedTesting/Levels/Physics/C15096737_Materials_DefaultMaterialLibraryChanges/terrain/terrain.pxheightfield b/AutomatedTesting/Levels/Physics/Material_DefaultMaterialLibraryChangesWork/terrain/terrain.pxheightfield similarity index 100% rename from AutomatedTesting/Levels/Physics/C15096737_Materials_DefaultMaterialLibraryChanges/terrain/terrain.pxheightfield rename to AutomatedTesting/Levels/Physics/Material_DefaultMaterialLibraryChangesWork/terrain/terrain.pxheightfield diff --git a/AutomatedTesting/Levels/Physics/C15096737_Materials_DefaultMaterialLibraryChanges/terraintexture.pak b/AutomatedTesting/Levels/Physics/Material_DefaultMaterialLibraryChangesWork/terraintexture.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C15096737_Materials_DefaultMaterialLibraryChanges/terraintexture.pak rename to AutomatedTesting/Levels/Physics/Material_DefaultMaterialLibraryChangesWork/terraintexture.pak diff --git a/AutomatedTesting/Levels/Physics/C15096737_Materials_DefaultMaterialLibraryChanges/ws.emfxworkspace b/AutomatedTesting/Levels/Physics/Material_DefaultMaterialLibraryChangesWork/ws.emfxworkspace similarity index 100% rename from AutomatedTesting/Levels/Physics/C15096737_Materials_DefaultMaterialLibraryChanges/ws.emfxworkspace rename to AutomatedTesting/Levels/Physics/Material_DefaultMaterialLibraryChangesWork/ws.emfxworkspace diff --git a/AutomatedTesting/Levels/Physics/C4044459_Material_DynamicFriction/C4044459_Material_DynamicFriction.ly b/AutomatedTesting/Levels/Physics/Material_DynamicFriction/Material_DynamicFriction.ly similarity index 100% rename from AutomatedTesting/Levels/Physics/C4044459_Material_DynamicFriction/C4044459_Material_DynamicFriction.ly rename to AutomatedTesting/Levels/Physics/Material_DynamicFriction/Material_DynamicFriction.ly diff --git a/AutomatedTesting/Levels/Physics/C4044459_Material_DynamicFriction/dynamic_friction.physmaterial b/AutomatedTesting/Levels/Physics/Material_DynamicFriction/dynamic_friction.physmaterial similarity index 100% rename from AutomatedTesting/Levels/Physics/C4044459_Material_DynamicFriction/dynamic_friction.physmaterial rename to AutomatedTesting/Levels/Physics/Material_DynamicFriction/dynamic_friction.physmaterial diff --git a/AutomatedTesting/Levels/Physics/C18977601_Material_FrictionCombinePriority/filelist.xml b/AutomatedTesting/Levels/Physics/Material_DynamicFriction/filelist.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C18977601_Material_FrictionCombinePriority/filelist.xml rename to AutomatedTesting/Levels/Physics/Material_DynamicFriction/filelist.xml diff --git a/AutomatedTesting/Levels/Physics/C18977601_Material_FrictionCombinePriority/level.pak b/AutomatedTesting/Levels/Physics/Material_DynamicFriction/level.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C18977601_Material_FrictionCombinePriority/level.pak rename to AutomatedTesting/Levels/Physics/Material_DynamicFriction/level.pak diff --git a/AutomatedTesting/Levels/Physics/C4888315_Material_AddModifyDeleteOnCollider/leveldata/Environment.xml b/AutomatedTesting/Levels/Physics/Material_DynamicFriction/leveldata/Environment.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C4888315_Material_AddModifyDeleteOnCollider/leveldata/Environment.xml rename to AutomatedTesting/Levels/Physics/Material_DynamicFriction/leveldata/Environment.xml diff --git a/AutomatedTesting/Levels/Physics/C18977601_Material_FrictionCombinePriority/leveldata/GameTokens.xml b/AutomatedTesting/Levels/Physics/Material_DynamicFriction/leveldata/GameTokens.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C18977601_Material_FrictionCombinePriority/leveldata/GameTokens.xml rename to AutomatedTesting/Levels/Physics/Material_DynamicFriction/leveldata/GameTokens.xml diff --git a/AutomatedTesting/Levels/Physics/C18243590_Joints_BallNoLimitsConstrained/leveldata/TerrainTexture.xml b/AutomatedTesting/Levels/Physics/Material_DynamicFriction/leveldata/TerrainTexture.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C18243590_Joints_BallNoLimitsConstrained/leveldata/TerrainTexture.xml rename to AutomatedTesting/Levels/Physics/Material_DynamicFriction/leveldata/TerrainTexture.xml diff --git a/AutomatedTesting/Levels/Physics/C4044457_Material_RestitutionCombine/leveldata/TimeOfDay.xml b/AutomatedTesting/Levels/Physics/Material_DynamicFriction/leveldata/TimeOfDay.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C4044457_Material_RestitutionCombine/leveldata/TimeOfDay.xml rename to AutomatedTesting/Levels/Physics/Material_DynamicFriction/leveldata/TimeOfDay.xml diff --git a/AutomatedTesting/Levels/Physics/C4925579_Material_AddModifyDeleteOnTerrain/leveldata/VegetationMap.dat b/AutomatedTesting/Levels/Physics/Material_DynamicFriction/leveldata/VegetationMap.dat similarity index 100% rename from AutomatedTesting/Levels/Physics/C4925579_Material_AddModifyDeleteOnTerrain/leveldata/VegetationMap.dat rename to AutomatedTesting/Levels/Physics/Material_DynamicFriction/leveldata/VegetationMap.dat diff --git a/AutomatedTesting/Levels/Physics/C4925577_PhysXMaterials_MaterialAssignedToTerrain/tags.txt b/AutomatedTesting/Levels/Physics/Material_DynamicFriction/tags.txt similarity index 100% rename from AutomatedTesting/Levels/Physics/C4925577_PhysXMaterials_MaterialAssignedToTerrain/tags.txt rename to AutomatedTesting/Levels/Physics/Material_DynamicFriction/tags.txt diff --git a/AutomatedTesting/Levels/Physics/C4925582_Material_AddModifyDeleteOnRagdollBones/terraintexture.pak b/AutomatedTesting/Levels/Physics/Material_DynamicFriction/terraintexture.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C4925582_Material_AddModifyDeleteOnRagdollBones/terraintexture.pak rename to AutomatedTesting/Levels/Physics/Material_DynamicFriction/terraintexture.pak diff --git a/AutomatedTesting/Levels/Physics/C4044694_Material_EmptyLibraryUsesDefault/C4044694_Material_EmptyLibraryUsesDefault.ly b/AutomatedTesting/Levels/Physics/Material_EmptyLibraryUsesDefault/Material_EmptyLibraryUsesDefault.ly similarity index 100% rename from AutomatedTesting/Levels/Physics/C4044694_Material_EmptyLibraryUsesDefault/C4044694_Material_EmptyLibraryUsesDefault.ly rename to AutomatedTesting/Levels/Physics/Material_EmptyLibraryUsesDefault/Material_EmptyLibraryUsesDefault.ly diff --git a/AutomatedTesting/Levels/Physics/C4044694_Material_EmptyLibraryUsesDefault/c4044694_material_emptylibraryusesdefault.physmaterial b/AutomatedTesting/Levels/Physics/Material_EmptyLibraryUsesDefault/c4044694_material_emptylibraryusesdefault.physmaterial similarity index 100% rename from AutomatedTesting/Levels/Physics/C4044694_Material_EmptyLibraryUsesDefault/c4044694_material_emptylibraryusesdefault.physmaterial rename to AutomatedTesting/Levels/Physics/Material_EmptyLibraryUsesDefault/c4044694_material_emptylibraryusesdefault.physmaterial diff --git a/AutomatedTesting/Levels/Physics/C4044694_Material_EmptyLibraryUsesDefault/filelist.xml b/AutomatedTesting/Levels/Physics/Material_EmptyLibraryUsesDefault/filelist.xml similarity index 71% rename from AutomatedTesting/Levels/Physics/C4044694_Material_EmptyLibraryUsesDefault/filelist.xml rename to AutomatedTesting/Levels/Physics/Material_EmptyLibraryUsesDefault/filelist.xml index ff21651bd9..6452f4bbe1 100644 --- a/AutomatedTesting/Levels/Physics/C4044694_Material_EmptyLibraryUsesDefault/filelist.xml +++ b/AutomatedTesting/Levels/Physics/Material_EmptyLibraryUsesDefault/filelist.xml @@ -1,4 +1,4 @@ - + diff --git a/AutomatedTesting/Levels/Physics/C4044694_Material_EmptyLibraryUsesDefault/level.pak b/AutomatedTesting/Levels/Physics/Material_EmptyLibraryUsesDefault/level.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C4044694_Material_EmptyLibraryUsesDefault/level.pak rename to AutomatedTesting/Levels/Physics/Material_EmptyLibraryUsesDefault/level.pak diff --git a/AutomatedTesting/Levels/Physics/C4925577_PhysXMaterials_MaterialAssignedToTerrain/leveldata/Environment.xml b/AutomatedTesting/Levels/Physics/Material_EmptyLibraryUsesDefault/leveldata/Environment.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C4925577_PhysXMaterials_MaterialAssignedToTerrain/leveldata/Environment.xml rename to AutomatedTesting/Levels/Physics/Material_EmptyLibraryUsesDefault/leveldata/Environment.xml diff --git a/AutomatedTesting/Levels/Physics/C18981526_Material_RestitutionCombinePriority/leveldata/GameTokens.xml b/AutomatedTesting/Levels/Physics/Material_EmptyLibraryUsesDefault/leveldata/GameTokens.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C18981526_Material_RestitutionCombinePriority/leveldata/GameTokens.xml rename to AutomatedTesting/Levels/Physics/Material_EmptyLibraryUsesDefault/leveldata/GameTokens.xml diff --git a/AutomatedTesting/Levels/Physics/C4976245_PhysxCollider_CollisionLayerTest/leveldata/TerrainTexture.xml b/AutomatedTesting/Levels/Physics/Material_EmptyLibraryUsesDefault/leveldata/TerrainTexture.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C4976245_PhysxCollider_CollisionLayerTest/leveldata/TerrainTexture.xml rename to AutomatedTesting/Levels/Physics/Material_EmptyLibraryUsesDefault/leveldata/TerrainTexture.xml diff --git a/AutomatedTesting/Levels/Physics/C6090552_ForceRegion_LinearDampingNegative/leveldata/TimeOfDay.xml b/AutomatedTesting/Levels/Physics/Material_EmptyLibraryUsesDefault/leveldata/TimeOfDay.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C6090552_ForceRegion_LinearDampingNegative/leveldata/TimeOfDay.xml rename to AutomatedTesting/Levels/Physics/Material_EmptyLibraryUsesDefault/leveldata/TimeOfDay.xml diff --git a/AutomatedTesting/Levels/Physics/C4925580_Material_RagdollBonesMaterial/leveldata/VegetationMap.dat b/AutomatedTesting/Levels/Physics/Material_EmptyLibraryUsesDefault/leveldata/VegetationMap.dat similarity index 100% rename from AutomatedTesting/Levels/Physics/C4925580_Material_RagdollBonesMaterial/leveldata/VegetationMap.dat rename to AutomatedTesting/Levels/Physics/Material_EmptyLibraryUsesDefault/leveldata/VegetationMap.dat diff --git a/AutomatedTesting/Levels/Physics/C4925579_Material_AddModifyDeleteOnTerrain/tags.txt b/AutomatedTesting/Levels/Physics/Material_EmptyLibraryUsesDefault/tags.txt similarity index 100% rename from AutomatedTesting/Levels/Physics/C4925579_Material_AddModifyDeleteOnTerrain/tags.txt rename to AutomatedTesting/Levels/Physics/Material_EmptyLibraryUsesDefault/tags.txt diff --git a/AutomatedTesting/Levels/Physics/C4976202_RigidBody_StopsWhenBelowKineticThreshold/terrain/terrain.pxheightfield b/AutomatedTesting/Levels/Physics/Material_EmptyLibraryUsesDefault/terrain/terrain.pxheightfield similarity index 100% rename from AutomatedTesting/Levels/Physics/C4976202_RigidBody_StopsWhenBelowKineticThreshold/terrain/terrain.pxheightfield rename to AutomatedTesting/Levels/Physics/Material_EmptyLibraryUsesDefault/terrain/terrain.pxheightfield diff --git a/AutomatedTesting/Levels/Physics/C4976194_RigidBody_PhysXComponentIsValid/terraintexture.pak b/AutomatedTesting/Levels/Physics/Material_EmptyLibraryUsesDefault/terraintexture.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C4976194_RigidBody_PhysXComponentIsValid/terraintexture.pak rename to AutomatedTesting/Levels/Physics/Material_EmptyLibraryUsesDefault/terraintexture.pak diff --git a/AutomatedTesting/Levels/Physics/C4044456_Material_FrictionCombine/C4044456_Material_FrictionCombine.ly b/AutomatedTesting/Levels/Physics/Material_FrictionCombine/Material_FrictionCombine.ly similarity index 100% rename from AutomatedTesting/Levels/Physics/C4044456_Material_FrictionCombine/C4044456_Material_FrictionCombine.ly rename to AutomatedTesting/Levels/Physics/Material_FrictionCombine/Material_FrictionCombine.ly diff --git a/AutomatedTesting/Levels/Physics/C18981526_Material_RestitutionCombinePriority/filelist.xml b/AutomatedTesting/Levels/Physics/Material_FrictionCombine/filelist.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C18981526_Material_RestitutionCombinePriority/filelist.xml rename to AutomatedTesting/Levels/Physics/Material_FrictionCombine/filelist.xml diff --git a/AutomatedTesting/Levels/Physics/C4044456_Material_FrictionCombine/friction_combine.physmaterial b/AutomatedTesting/Levels/Physics/Material_FrictionCombine/friction_combine.physmaterial similarity index 100% rename from AutomatedTesting/Levels/Physics/C4044456_Material_FrictionCombine/friction_combine.physmaterial rename to AutomatedTesting/Levels/Physics/Material_FrictionCombine/friction_combine.physmaterial diff --git a/AutomatedTesting/Levels/Physics/C18981526_Material_RestitutionCombinePriority/level.pak b/AutomatedTesting/Levels/Physics/Material_FrictionCombine/level.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C18981526_Material_RestitutionCombinePriority/level.pak rename to AutomatedTesting/Levels/Physics/Material_FrictionCombine/level.pak diff --git a/AutomatedTesting/Levels/Physics/C4925579_Material_AddModifyDeleteOnTerrain/leveldata/Environment.xml b/AutomatedTesting/Levels/Physics/Material_FrictionCombine/leveldata/Environment.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C4925579_Material_AddModifyDeleteOnTerrain/leveldata/Environment.xml rename to AutomatedTesting/Levels/Physics/Material_FrictionCombine/leveldata/Environment.xml diff --git a/AutomatedTesting/Levels/Physics/C24308873_CylinderShapeCollider_CollidesWithPhysXTerrain/leveldata/GameTokens.xml b/AutomatedTesting/Levels/Physics/Material_FrictionCombine/leveldata/GameTokens.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C24308873_CylinderShapeCollider_CollidesWithPhysXTerrain/leveldata/GameTokens.xml rename to AutomatedTesting/Levels/Physics/Material_FrictionCombine/leveldata/GameTokens.xml diff --git a/AutomatedTesting/Levels/Physics/C18243591_Joints_BallLeadFollowerCollide/leveldata/TerrainTexture.xml b/AutomatedTesting/Levels/Physics/Material_FrictionCombine/leveldata/TerrainTexture.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C18243591_Joints_BallLeadFollowerCollide/leveldata/TerrainTexture.xml rename to AutomatedTesting/Levels/Physics/Material_FrictionCombine/leveldata/TerrainTexture.xml diff --git a/AutomatedTesting/Levels/Physics/C4044459_Material_DynamicFriction/leveldata/TimeOfDay.xml b/AutomatedTesting/Levels/Physics/Material_FrictionCombine/leveldata/TimeOfDay.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C4044459_Material_DynamicFriction/leveldata/TimeOfDay.xml rename to AutomatedTesting/Levels/Physics/Material_FrictionCombine/leveldata/TimeOfDay.xml diff --git a/AutomatedTesting/Levels/Physics/C4925582_Material_AddModifyDeleteOnRagdollBones/leveldata/VegetationMap.dat b/AutomatedTesting/Levels/Physics/Material_FrictionCombine/leveldata/VegetationMap.dat similarity index 100% rename from AutomatedTesting/Levels/Physics/C4925582_Material_AddModifyDeleteOnRagdollBones/leveldata/VegetationMap.dat rename to AutomatedTesting/Levels/Physics/Material_FrictionCombine/leveldata/VegetationMap.dat diff --git a/AutomatedTesting/Levels/Physics/C4925580_Material_RagdollBonesMaterial/tags.txt b/AutomatedTesting/Levels/Physics/Material_FrictionCombine/tags.txt similarity index 100% rename from AutomatedTesting/Levels/Physics/C4925580_Material_RagdollBonesMaterial/tags.txt rename to AutomatedTesting/Levels/Physics/Material_FrictionCombine/tags.txt diff --git a/AutomatedTesting/Levels/Physics/C4976195_RigidBodies_InitialLinearVelocity/terraintexture.pak b/AutomatedTesting/Levels/Physics/Material_FrictionCombine/terraintexture.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C4976195_RigidBodies_InitialLinearVelocity/terraintexture.pak rename to AutomatedTesting/Levels/Physics/Material_FrictionCombine/terraintexture.pak diff --git a/AutomatedTesting/Levels/Physics/C18977601_Material_FrictionCombinePriority/C18977601_Material_FrictionCombinePriority.ly b/AutomatedTesting/Levels/Physics/Material_FrictionCombinePriorityOrder/Material_FrictionCombinePriorityOrder.ly similarity index 100% rename from AutomatedTesting/Levels/Physics/C18977601_Material_FrictionCombinePriority/C18977601_Material_FrictionCombinePriority.ly rename to AutomatedTesting/Levels/Physics/Material_FrictionCombinePriorityOrder/Material_FrictionCombinePriorityOrder.ly diff --git a/AutomatedTesting/Levels/Physics/C4044456_Material_FrictionCombine/filelist.xml b/AutomatedTesting/Levels/Physics/Material_FrictionCombinePriorityOrder/filelist.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C4044456_Material_FrictionCombine/filelist.xml rename to AutomatedTesting/Levels/Physics/Material_FrictionCombinePriorityOrder/filelist.xml diff --git a/AutomatedTesting/Levels/Physics/C18977601_Material_FrictionCombinePriority/friction_combine.physmaterial b/AutomatedTesting/Levels/Physics/Material_FrictionCombinePriorityOrder/friction_combine.physmaterial similarity index 100% rename from AutomatedTesting/Levels/Physics/C18977601_Material_FrictionCombinePriority/friction_combine.physmaterial rename to AutomatedTesting/Levels/Physics/Material_FrictionCombinePriorityOrder/friction_combine.physmaterial diff --git a/AutomatedTesting/Levels/Physics/C4044456_Material_FrictionCombine/level.pak b/AutomatedTesting/Levels/Physics/Material_FrictionCombinePriorityOrder/level.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C4044456_Material_FrictionCombine/level.pak rename to AutomatedTesting/Levels/Physics/Material_FrictionCombinePriorityOrder/level.pak diff --git a/AutomatedTesting/Levels/Physics/C4925580_Material_RagdollBonesMaterial/leveldata/Environment.xml b/AutomatedTesting/Levels/Physics/Material_FrictionCombinePriorityOrder/leveldata/Environment.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C4925580_Material_RagdollBonesMaterial/leveldata/Environment.xml rename to AutomatedTesting/Levels/Physics/Material_FrictionCombinePriorityOrder/leveldata/Environment.xml diff --git a/AutomatedTesting/Levels/Physics/C3510642_Terrain_NotCollideWithTerrain/leveldata/GameTokens.xml b/AutomatedTesting/Levels/Physics/Material_FrictionCombinePriorityOrder/leveldata/GameTokens.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C3510642_Terrain_NotCollideWithTerrain/leveldata/GameTokens.xml rename to AutomatedTesting/Levels/Physics/Material_FrictionCombinePriorityOrder/leveldata/GameTokens.xml diff --git a/AutomatedTesting/Levels/Physics/C18243592_Joints_BallBreakable/leveldata/TerrainTexture.xml b/AutomatedTesting/Levels/Physics/Material_FrictionCombinePriorityOrder/leveldata/TerrainTexture.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C18243592_Joints_BallBreakable/leveldata/TerrainTexture.xml rename to AutomatedTesting/Levels/Physics/Material_FrictionCombinePriorityOrder/leveldata/TerrainTexture.xml diff --git a/AutomatedTesting/Levels/Physics/C4044460_Material_StaticFriction/leveldata/TimeOfDay.xml b/AutomatedTesting/Levels/Physics/Material_FrictionCombinePriorityOrder/leveldata/TimeOfDay.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C4044460_Material_StaticFriction/leveldata/TimeOfDay.xml rename to AutomatedTesting/Levels/Physics/Material_FrictionCombinePriorityOrder/leveldata/TimeOfDay.xml diff --git a/AutomatedTesting/Levels/Physics/C4976194_RigidBody_PhysXComponentIsValid/leveldata/VegetationMap.dat b/AutomatedTesting/Levels/Physics/Material_FrictionCombinePriorityOrder/leveldata/VegetationMap.dat similarity index 100% rename from AutomatedTesting/Levels/Physics/C4976194_RigidBody_PhysXComponentIsValid/leveldata/VegetationMap.dat rename to AutomatedTesting/Levels/Physics/Material_FrictionCombinePriorityOrder/leveldata/VegetationMap.dat diff --git a/AutomatedTesting/Levels/Physics/C4925582_Material_AddModifyDeleteOnRagdollBones/tags.txt b/AutomatedTesting/Levels/Physics/Material_FrictionCombinePriorityOrder/tags.txt similarity index 100% rename from AutomatedTesting/Levels/Physics/C4925582_Material_AddModifyDeleteOnRagdollBones/tags.txt rename to AutomatedTesting/Levels/Physics/Material_FrictionCombinePriorityOrder/tags.txt diff --git a/AutomatedTesting/Levels/Physics/C4976197_RigidBodies_InitialAngularVelocity/terraintexture.pak b/AutomatedTesting/Levels/Physics/Material_FrictionCombinePriorityOrder/terraintexture.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C4976197_RigidBodies_InitialAngularVelocity/terraintexture.pak rename to AutomatedTesting/Levels/Physics/Material_FrictionCombinePriorityOrder/terraintexture.pak diff --git a/AutomatedTesting/Levels/Physics/C4044455_Material_LibraryChangesInstantly/C4044455_Material_LibraryChangesInstantly_restore.physmaterial b/AutomatedTesting/Levels/Physics/Material_LibraryChangesReflectInstantly/C4044455_Material_LibraryChangesInstantly_restore.physmaterial similarity index 100% rename from AutomatedTesting/Levels/Physics/C4044455_Material_LibraryChangesInstantly/C4044455_Material_LibraryChangesInstantly_restore.physmaterial rename to AutomatedTesting/Levels/Physics/Material_LibraryChangesReflectInstantly/C4044455_Material_LibraryChangesInstantly_restore.physmaterial diff --git a/AutomatedTesting/Levels/Physics/C4044455_Material_LibraryChangesInstantly/C4044455_Material_LibraryChangesInstantly.ly b/AutomatedTesting/Levels/Physics/Material_LibraryChangesReflectInstantly/Material_LibraryChangesReflectInstantly.ly similarity index 100% rename from AutomatedTesting/Levels/Physics/C4044455_Material_LibraryChangesInstantly/C4044455_Material_LibraryChangesInstantly.ly rename to AutomatedTesting/Levels/Physics/Material_LibraryChangesReflectInstantly/Material_LibraryChangesReflectInstantly.ly diff --git a/AutomatedTesting/Levels/Physics/C4044455_Material_LibraryChangesInstantly/c4044455_material_librarychangesinstantly.physmaterial b/AutomatedTesting/Levels/Physics/Material_LibraryChangesReflectInstantly/c4044455_material_librarychangesinstantly.physmaterial similarity index 100% rename from AutomatedTesting/Levels/Physics/C4044455_Material_LibraryChangesInstantly/c4044455_material_librarychangesinstantly.physmaterial rename to AutomatedTesting/Levels/Physics/Material_LibraryChangesReflectInstantly/c4044455_material_librarychangesinstantly.physmaterial diff --git a/AutomatedTesting/Levels/Physics/C4044455_Material_LibraryChangesInstantly/filelist.xml b/AutomatedTesting/Levels/Physics/Material_LibraryChangesReflectInstantly/filelist.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C4044455_Material_LibraryChangesInstantly/filelist.xml rename to AutomatedTesting/Levels/Physics/Material_LibraryChangesReflectInstantly/filelist.xml diff --git a/AutomatedTesting/Levels/Physics/C4044455_Material_LibraryChangesInstantly/level.pak b/AutomatedTesting/Levels/Physics/Material_LibraryChangesReflectInstantly/level.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C4044455_Material_LibraryChangesInstantly/level.pak rename to AutomatedTesting/Levels/Physics/Material_LibraryChangesReflectInstantly/level.pak diff --git a/AutomatedTesting/Levels/Physics/C4925582_Material_AddModifyDeleteOnRagdollBones/leveldata/Environment.xml b/AutomatedTesting/Levels/Physics/Material_LibraryChangesReflectInstantly/leveldata/Environment.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C4925582_Material_AddModifyDeleteOnRagdollBones/leveldata/Environment.xml rename to AutomatedTesting/Levels/Physics/Material_LibraryChangesReflectInstantly/leveldata/Environment.xml diff --git a/AutomatedTesting/Levels/Physics/C4044455_Material_LibraryChangesInstantly/leveldata/GameTokens.xml b/AutomatedTesting/Levels/Physics/Material_LibraryChangesReflectInstantly/leveldata/GameTokens.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C4044455_Material_LibraryChangesInstantly/leveldata/GameTokens.xml rename to AutomatedTesting/Levels/Physics/Material_LibraryChangesReflectInstantly/leveldata/GameTokens.xml diff --git a/AutomatedTesting/Levels/Physics/C18243593_Joints_GlobalFrameConstrained/leveldata/TerrainTexture.xml b/AutomatedTesting/Levels/Physics/Material_LibraryChangesReflectInstantly/leveldata/TerrainTexture.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C18243593_Joints_GlobalFrameConstrained/leveldata/TerrainTexture.xml rename to AutomatedTesting/Levels/Physics/Material_LibraryChangesReflectInstantly/leveldata/TerrainTexture.xml diff --git a/AutomatedTesting/Levels/Physics/C4044461_Material_Restitution/leveldata/TimeOfDay.xml b/AutomatedTesting/Levels/Physics/Material_LibraryChangesReflectInstantly/leveldata/TimeOfDay.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C4044461_Material_Restitution/leveldata/TimeOfDay.xml rename to AutomatedTesting/Levels/Physics/Material_LibraryChangesReflectInstantly/leveldata/TimeOfDay.xml diff --git a/AutomatedTesting/Levels/Physics/C4976195_RigidBodies_InitialLinearVelocity/leveldata/VegetationMap.dat b/AutomatedTesting/Levels/Physics/Material_LibraryChangesReflectInstantly/leveldata/VegetationMap.dat similarity index 100% rename from AutomatedTesting/Levels/Physics/C4976195_RigidBodies_InitialLinearVelocity/leveldata/VegetationMap.dat rename to AutomatedTesting/Levels/Physics/Material_LibraryChangesReflectInstantly/leveldata/VegetationMap.dat diff --git a/AutomatedTesting/Levels/Physics/C4976194_RigidBody_PhysXComponentIsValid/tags.txt b/AutomatedTesting/Levels/Physics/Material_LibraryChangesReflectInstantly/tags.txt similarity index 100% rename from AutomatedTesting/Levels/Physics/C4976194_RigidBody_PhysXComponentIsValid/tags.txt rename to AutomatedTesting/Levels/Physics/Material_LibraryChangesReflectInstantly/tags.txt diff --git a/AutomatedTesting/Levels/Physics/C15425935_Material_LibraryUpdatedAcrossLevels/C15425935_Material_LibraryUpdatedAcrossLevels_1/terrain/terrain.pxheightfield b/AutomatedTesting/Levels/Physics/Material_LibraryChangesReflectInstantly/terrain/terrain.pxheightfield similarity index 100% rename from AutomatedTesting/Levels/Physics/C15425935_Material_LibraryUpdatedAcrossLevels/C15425935_Material_LibraryUpdatedAcrossLevels_1/terrain/terrain.pxheightfield rename to AutomatedTesting/Levels/Physics/Material_LibraryChangesReflectInstantly/terrain/terrain.pxheightfield diff --git a/AutomatedTesting/Levels/Physics/C4976199_RigidBodies_LinearDampingObjectMotion/terraintexture.pak b/AutomatedTesting/Levels/Physics/Material_LibraryChangesReflectInstantly/terraintexture.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C4976199_RigidBodies_LinearDampingObjectMotion/terraintexture.pak rename to AutomatedTesting/Levels/Physics/Material_LibraryChangesReflectInstantly/terraintexture.pak diff --git a/AutomatedTesting/Levels/Physics/C15563573_Material_AddModifyDeleteOnCharacterController/C15563573_Material_AddModifyDeleteOnCharacterController.ly b/AutomatedTesting/Levels/Physics/Material_LibraryCrudOperationsReflectOnCharacterController/Material_LibraryCrudOperationsReflectOnCharacterController.ly similarity index 100% rename from AutomatedTesting/Levels/Physics/C15563573_Material_AddModifyDeleteOnCharacterController/C15563573_Material_AddModifyDeleteOnCharacterController.ly rename to AutomatedTesting/Levels/Physics/Material_LibraryCrudOperationsReflectOnCharacterController/Material_LibraryCrudOperationsReflectOnCharacterController.ly diff --git a/AutomatedTesting/Levels/Physics/C15563573_Material_AddModifyDeleteOnCharacterController/c15563573_material_addmodifydeleteoncharactercontroller.physmaterial b/AutomatedTesting/Levels/Physics/Material_LibraryCrudOperationsReflectOnCharacterController/c15563573_material_addmodifydeleteoncharactercontroller.physmaterial similarity index 100% rename from AutomatedTesting/Levels/Physics/C15563573_Material_AddModifyDeleteOnCharacterController/c15563573_material_addmodifydeleteoncharactercontroller.physmaterial rename to AutomatedTesting/Levels/Physics/Material_LibraryCrudOperationsReflectOnCharacterController/c15563573_material_addmodifydeleteoncharactercontroller.physmaterial diff --git a/AutomatedTesting/Levels/Physics/C15563573_Material_AddModifyDeleteOnCharacterController/filelist.xml b/AutomatedTesting/Levels/Physics/Material_LibraryCrudOperationsReflectOnCharacterController/filelist.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C15563573_Material_AddModifyDeleteOnCharacterController/filelist.xml rename to AutomatedTesting/Levels/Physics/Material_LibraryCrudOperationsReflectOnCharacterController/filelist.xml diff --git a/AutomatedTesting/Levels/Physics/C15563573_Material_AddModifyDeleteOnCharacterController/level.pak b/AutomatedTesting/Levels/Physics/Material_LibraryCrudOperationsReflectOnCharacterController/level.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C15563573_Material_AddModifyDeleteOnCharacterController/level.pak rename to AutomatedTesting/Levels/Physics/Material_LibraryCrudOperationsReflectOnCharacterController/level.pak diff --git a/AutomatedTesting/Levels/Physics/C4976194_RigidBody_PhysXComponentIsValid/leveldata/Environment.xml b/AutomatedTesting/Levels/Physics/Material_LibraryCrudOperationsReflectOnCharacterController/leveldata/Environment.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C4976194_RigidBody_PhysXComponentIsValid/leveldata/Environment.xml rename to AutomatedTesting/Levels/Physics/Material_LibraryCrudOperationsReflectOnCharacterController/leveldata/Environment.xml diff --git a/AutomatedTesting/Levels/Physics/C4044456_Material_FrictionCombine/leveldata/GameTokens.xml b/AutomatedTesting/Levels/Physics/Material_LibraryCrudOperationsReflectOnCharacterController/leveldata/GameTokens.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C4044456_Material_FrictionCombine/leveldata/GameTokens.xml rename to AutomatedTesting/Levels/Physics/Material_LibraryCrudOperationsReflectOnCharacterController/leveldata/GameTokens.xml diff --git a/AutomatedTesting/Levels/Physics/C18977601_Material_FrictionCombinePriority/leveldata/TerrainTexture.xml b/AutomatedTesting/Levels/Physics/Material_LibraryCrudOperationsReflectOnCharacterController/leveldata/TerrainTexture.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C18977601_Material_FrictionCombinePriority/leveldata/TerrainTexture.xml rename to AutomatedTesting/Levels/Physics/Material_LibraryCrudOperationsReflectOnCharacterController/leveldata/TerrainTexture.xml diff --git a/AutomatedTesting/Levels/Physics/C4044697_Material_PerfaceMaterialValidation/leveldata/TimeOfDay.xml b/AutomatedTesting/Levels/Physics/Material_LibraryCrudOperationsReflectOnCharacterController/leveldata/TimeOfDay.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C4044697_Material_PerfaceMaterialValidation/leveldata/TimeOfDay.xml rename to AutomatedTesting/Levels/Physics/Material_LibraryCrudOperationsReflectOnCharacterController/leveldata/TimeOfDay.xml diff --git a/AutomatedTesting/Levels/Physics/C4976197_RigidBodies_InitialAngularVelocity/leveldata/VegetationMap.dat b/AutomatedTesting/Levels/Physics/Material_LibraryCrudOperationsReflectOnCharacterController/leveldata/VegetationMap.dat similarity index 100% rename from AutomatedTesting/Levels/Physics/C4976197_RigidBodies_InitialAngularVelocity/leveldata/VegetationMap.dat rename to AutomatedTesting/Levels/Physics/Material_LibraryCrudOperationsReflectOnCharacterController/leveldata/VegetationMap.dat diff --git a/AutomatedTesting/Levels/Physics/C4976195_RigidBodies_InitialLinearVelocity/tags.txt b/AutomatedTesting/Levels/Physics/Material_LibraryCrudOperationsReflectOnCharacterController/tags.txt similarity index 100% rename from AutomatedTesting/Levels/Physics/C4976195_RigidBodies_InitialLinearVelocity/tags.txt rename to AutomatedTesting/Levels/Physics/Material_LibraryCrudOperationsReflectOnCharacterController/tags.txt diff --git a/AutomatedTesting/Levels/Physics/C4976200_RigidBody_AngularDampingObjectRotation/terraintexture.pak b/AutomatedTesting/Levels/Physics/Material_LibraryCrudOperationsReflectOnCharacterController/terraintexture.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C4976200_RigidBody_AngularDampingObjectRotation/terraintexture.pak rename to AutomatedTesting/Levels/Physics/Material_LibraryCrudOperationsReflectOnCharacterController/terraintexture.pak diff --git a/AutomatedTesting/Levels/Physics/C15563573_Material_AddModifyDeleteOnCharacterController/testmaterials.physmaterial b/AutomatedTesting/Levels/Physics/Material_LibraryCrudOperationsReflectOnCharacterController/testmaterials.physmaterial similarity index 100% rename from AutomatedTesting/Levels/Physics/C15563573_Material_AddModifyDeleteOnCharacterController/testmaterials.physmaterial rename to AutomatedTesting/Levels/Physics/Material_LibraryCrudOperationsReflectOnCharacterController/testmaterials.physmaterial diff --git a/AutomatedTesting/Levels/Physics/C4888315_Material_AddModifyDeleteOnCollider/C4888315_Material_AddModifyDeleteOnCollider.ly b/AutomatedTesting/Levels/Physics/Material_LibraryCrudOperationsReflectOnCollider/Material_LibraryCrudOperationsReflectOnCollider.ly similarity index 100% rename from AutomatedTesting/Levels/Physics/C4888315_Material_AddModifyDeleteOnCollider/C4888315_Material_AddModifyDeleteOnCollider.ly rename to AutomatedTesting/Levels/Physics/Material_LibraryCrudOperationsReflectOnCollider/Material_LibraryCrudOperationsReflectOnCollider.ly diff --git a/AutomatedTesting/Levels/Physics/C4888315_Material_AddModifyDeleteOnCollider/c4888315_material_addmodifydeleteoncollider.physmaterial b/AutomatedTesting/Levels/Physics/Material_LibraryCrudOperationsReflectOnCollider/c4888315_material_addmodifydeleteoncollider.physmaterial similarity index 100% rename from AutomatedTesting/Levels/Physics/C4888315_Material_AddModifyDeleteOnCollider/c4888315_material_addmodifydeleteoncollider.physmaterial rename to AutomatedTesting/Levels/Physics/Material_LibraryCrudOperationsReflectOnCollider/c4888315_material_addmodifydeleteoncollider.physmaterial diff --git a/AutomatedTesting/Levels/Physics/C4888315_Material_AddModifyDeleteOnCollider/filelist.xml b/AutomatedTesting/Levels/Physics/Material_LibraryCrudOperationsReflectOnCollider/filelist.xml similarity index 69% rename from AutomatedTesting/Levels/Physics/C4888315_Material_AddModifyDeleteOnCollider/filelist.xml rename to AutomatedTesting/Levels/Physics/Material_LibraryCrudOperationsReflectOnCollider/filelist.xml index 298c048506..a6bfb1e285 100644 --- a/AutomatedTesting/Levels/Physics/C4888315_Material_AddModifyDeleteOnCollider/filelist.xml +++ b/AutomatedTesting/Levels/Physics/Material_LibraryCrudOperationsReflectOnCollider/filelist.xml @@ -1,4 +1,4 @@ - + diff --git a/AutomatedTesting/Levels/Physics/C4888315_Material_AddModifyDeleteOnCollider/level.pak b/AutomatedTesting/Levels/Physics/Material_LibraryCrudOperationsReflectOnCollider/level.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C4888315_Material_AddModifyDeleteOnCollider/level.pak rename to AutomatedTesting/Levels/Physics/Material_LibraryCrudOperationsReflectOnCollider/level.pak diff --git a/AutomatedTesting/Levels/Physics/C4976197_RigidBodies_InitialAngularVelocity/leveldata/Environment.xml b/AutomatedTesting/Levels/Physics/Material_LibraryCrudOperationsReflectOnCollider/leveldata/Environment.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C4976197_RigidBodies_InitialAngularVelocity/leveldata/Environment.xml rename to AutomatedTesting/Levels/Physics/Material_LibraryCrudOperationsReflectOnCollider/leveldata/Environment.xml diff --git a/AutomatedTesting/Levels/Physics/C4044457_Material_RestitutionCombine/leveldata/GameTokens.xml b/AutomatedTesting/Levels/Physics/Material_LibraryCrudOperationsReflectOnCollider/leveldata/GameTokens.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C4044457_Material_RestitutionCombine/leveldata/GameTokens.xml rename to AutomatedTesting/Levels/Physics/Material_LibraryCrudOperationsReflectOnCollider/leveldata/GameTokens.xml diff --git a/AutomatedTesting/Levels/Physics/C18981526_Material_RestitutionCombinePriority/leveldata/TerrainTexture.xml b/AutomatedTesting/Levels/Physics/Material_LibraryCrudOperationsReflectOnCollider/leveldata/TerrainTexture.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C18981526_Material_RestitutionCombinePriority/leveldata/TerrainTexture.xml rename to AutomatedTesting/Levels/Physics/Material_LibraryCrudOperationsReflectOnCollider/leveldata/TerrainTexture.xml diff --git a/AutomatedTesting/Levels/Physics/C4888315_Material_AddModifyDeleteOnCollider/leveldata/TimeOfDay.xml b/AutomatedTesting/Levels/Physics/Material_LibraryCrudOperationsReflectOnCollider/leveldata/TimeOfDay.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C4888315_Material_AddModifyDeleteOnCollider/leveldata/TimeOfDay.xml rename to AutomatedTesting/Levels/Physics/Material_LibraryCrudOperationsReflectOnCollider/leveldata/TimeOfDay.xml diff --git a/AutomatedTesting/Levels/Physics/C4976199_RigidBodies_LinearDampingObjectMotion/leveldata/VegetationMap.dat b/AutomatedTesting/Levels/Physics/Material_LibraryCrudOperationsReflectOnCollider/leveldata/VegetationMap.dat similarity index 100% rename from AutomatedTesting/Levels/Physics/C4976199_RigidBodies_LinearDampingObjectMotion/leveldata/VegetationMap.dat rename to AutomatedTesting/Levels/Physics/Material_LibraryCrudOperationsReflectOnCollider/leveldata/VegetationMap.dat diff --git a/AutomatedTesting/Levels/Physics/C4976197_RigidBodies_InitialAngularVelocity/tags.txt b/AutomatedTesting/Levels/Physics/Material_LibraryCrudOperationsReflectOnCollider/tags.txt similarity index 100% rename from AutomatedTesting/Levels/Physics/C4976197_RigidBodies_InitialAngularVelocity/tags.txt rename to AutomatedTesting/Levels/Physics/Material_LibraryCrudOperationsReflectOnCollider/tags.txt diff --git a/AutomatedTesting/Levels/Physics/C4044455_Material_LibraryChangesInstantly/terrain/terrain.pxheightfield b/AutomatedTesting/Levels/Physics/Material_LibraryCrudOperationsReflectOnCollider/terrain/terrain.pxheightfield similarity index 100% rename from AutomatedTesting/Levels/Physics/C4044455_Material_LibraryChangesInstantly/terrain/terrain.pxheightfield rename to AutomatedTesting/Levels/Physics/Material_LibraryCrudOperationsReflectOnCollider/terrain/terrain.pxheightfield diff --git a/AutomatedTesting/Levels/Physics/C4976201_RigidBody_MassIsAssigned/terraintexture.pak b/AutomatedTesting/Levels/Physics/Material_LibraryCrudOperationsReflectOnCollider/terraintexture.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C4976201_RigidBody_MassIsAssigned/terraintexture.pak rename to AutomatedTesting/Levels/Physics/Material_LibraryCrudOperationsReflectOnCollider/terraintexture.pak diff --git a/AutomatedTesting/Levels/Physics/C4925582_Material_AddModifyDeleteOnRagdollBones/C4925582_Material_AddModifyDeleteOnRagdollBones.ly b/AutomatedTesting/Levels/Physics/Material_LibraryCrudOperationsReflectOnRagdollBones/Material_LibraryCrudOperationsReflectOnRagdollBones.ly similarity index 100% rename from AutomatedTesting/Levels/Physics/C4925582_Material_AddModifyDeleteOnRagdollBones/C4925582_Material_AddModifyDeleteOnRagdollBones.ly rename to AutomatedTesting/Levels/Physics/Material_LibraryCrudOperationsReflectOnRagdollBones/Material_LibraryCrudOperationsReflectOnRagdollBones.ly diff --git a/AutomatedTesting/Levels/Physics/C4925582_Material_AddModifyDeleteOnRagdollBones/filelist.xml b/AutomatedTesting/Levels/Physics/Material_LibraryCrudOperationsReflectOnRagdollBones/filelist.xml similarity index 71% rename from AutomatedTesting/Levels/Physics/C4925582_Material_AddModifyDeleteOnRagdollBones/filelist.xml rename to AutomatedTesting/Levels/Physics/Material_LibraryCrudOperationsReflectOnRagdollBones/filelist.xml index 7fb4108fe3..cd5aabef1b 100644 --- a/AutomatedTesting/Levels/Physics/C4925582_Material_AddModifyDeleteOnRagdollBones/filelist.xml +++ b/AutomatedTesting/Levels/Physics/Material_LibraryCrudOperationsReflectOnRagdollBones/filelist.xml @@ -1,4 +1,4 @@ - + diff --git a/AutomatedTesting/Levels/Physics/C4925580_Material_RagdollBonesMaterial/level.pak b/AutomatedTesting/Levels/Physics/Material_LibraryCrudOperationsReflectOnRagdollBones/level.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C4925580_Material_RagdollBonesMaterial/level.pak rename to AutomatedTesting/Levels/Physics/Material_LibraryCrudOperationsReflectOnRagdollBones/level.pak diff --git a/AutomatedTesting/Levels/Physics/C4976199_RigidBodies_LinearDampingObjectMotion/leveldata/Environment.xml b/AutomatedTesting/Levels/Physics/Material_LibraryCrudOperationsReflectOnRagdollBones/leveldata/Environment.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C4976199_RigidBodies_LinearDampingObjectMotion/leveldata/Environment.xml rename to AutomatedTesting/Levels/Physics/Material_LibraryCrudOperationsReflectOnRagdollBones/leveldata/Environment.xml diff --git a/AutomatedTesting/Levels/Physics/C4044459_Material_DynamicFriction/leveldata/GameTokens.xml b/AutomatedTesting/Levels/Physics/Material_LibraryCrudOperationsReflectOnRagdollBones/leveldata/GameTokens.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C4044459_Material_DynamicFriction/leveldata/GameTokens.xml rename to AutomatedTesting/Levels/Physics/Material_LibraryCrudOperationsReflectOnRagdollBones/leveldata/GameTokens.xml diff --git a/AutomatedTesting/Levels/Physics/C4982593_PhysxCollider_CollisionLayerTest/leveldata/TerrainTexture.xml b/AutomatedTesting/Levels/Physics/Material_LibraryCrudOperationsReflectOnRagdollBones/leveldata/TerrainTexture.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C4982593_PhysxCollider_CollisionLayerTest/leveldata/TerrainTexture.xml rename to AutomatedTesting/Levels/Physics/Material_LibraryCrudOperationsReflectOnRagdollBones/leveldata/TerrainTexture.xml diff --git a/AutomatedTesting/Levels/Physics/C4925577_PhysXMaterials_MaterialAssignedToTerrain/leveldata/TimeOfDay.xml b/AutomatedTesting/Levels/Physics/Material_LibraryCrudOperationsReflectOnRagdollBones/leveldata/TimeOfDay.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C4925577_PhysXMaterials_MaterialAssignedToTerrain/leveldata/TimeOfDay.xml rename to AutomatedTesting/Levels/Physics/Material_LibraryCrudOperationsReflectOnRagdollBones/leveldata/TimeOfDay.xml diff --git a/AutomatedTesting/Levels/Physics/C4976200_RigidBody_AngularDampingObjectRotation/leveldata/VegetationMap.dat b/AutomatedTesting/Levels/Physics/Material_LibraryCrudOperationsReflectOnRagdollBones/leveldata/VegetationMap.dat similarity index 100% rename from AutomatedTesting/Levels/Physics/C4976200_RigidBody_AngularDampingObjectRotation/leveldata/VegetationMap.dat rename to AutomatedTesting/Levels/Physics/Material_LibraryCrudOperationsReflectOnRagdollBones/leveldata/VegetationMap.dat diff --git a/AutomatedTesting/Levels/Physics/C28978033_Ragdoll_WorldBodyBusTests/ragdoll_default/AnimGraphPhysX.animgraph b/AutomatedTesting/Levels/Physics/Material_LibraryCrudOperationsReflectOnRagdollBones/ragdoll_default/AnimGraphPhysX.animgraph similarity index 100% rename from AutomatedTesting/Levels/Physics/C28978033_Ragdoll_WorldBodyBusTests/ragdoll_default/AnimGraphPhysX.animgraph rename to AutomatedTesting/Levels/Physics/Material_LibraryCrudOperationsReflectOnRagdollBones/ragdoll_default/AnimGraphPhysX.animgraph diff --git a/AutomatedTesting/Levels/Physics/C28978033_Ragdoll_WorldBodyBusTests/ragdoll_default/Blue.tif b/AutomatedTesting/Levels/Physics/Material_LibraryCrudOperationsReflectOnRagdollBones/ragdoll_default/Blue.tif similarity index 100% rename from AutomatedTesting/Levels/Physics/C28978033_Ragdoll_WorldBodyBusTests/ragdoll_default/Blue.tif rename to AutomatedTesting/Levels/Physics/Material_LibraryCrudOperationsReflectOnRagdollBones/ragdoll_default/Blue.tif diff --git a/AutomatedTesting/Levels/Physics/C28978033_Ragdoll_WorldBodyBusTests/ragdoll_default/RinLocomotion.motionset b/AutomatedTesting/Levels/Physics/Material_LibraryCrudOperationsReflectOnRagdollBones/ragdoll_default/RinLocomotion.motionset similarity index 100% rename from AutomatedTesting/Levels/Physics/C28978033_Ragdoll_WorldBodyBusTests/ragdoll_default/RinLocomotion.motionset rename to AutomatedTesting/Levels/Physics/Material_LibraryCrudOperationsReflectOnRagdollBones/ragdoll_default/RinLocomotion.motionset diff --git a/AutomatedTesting/Levels/Physics/C28978033_Ragdoll_WorldBodyBusTests/ragdoll_default/default.mtl b/AutomatedTesting/Levels/Physics/Material_LibraryCrudOperationsReflectOnRagdollBones/ragdoll_default/default.mtl similarity index 100% rename from AutomatedTesting/Levels/Physics/C28978033_Ragdoll_WorldBodyBusTests/ragdoll_default/default.mtl rename to AutomatedTesting/Levels/Physics/Material_LibraryCrudOperationsReflectOnRagdollBones/ragdoll_default/default.mtl diff --git a/AutomatedTesting/Levels/Physics/C28978033_Ragdoll_WorldBodyBusTests/ragdoll_default/rin_physics.animgraph b/AutomatedTesting/Levels/Physics/Material_LibraryCrudOperationsReflectOnRagdollBones/ragdoll_default/rin_physics.animgraph similarity index 100% rename from AutomatedTesting/Levels/Physics/C28978033_Ragdoll_WorldBodyBusTests/ragdoll_default/rin_physics.animgraph rename to AutomatedTesting/Levels/Physics/Material_LibraryCrudOperationsReflectOnRagdollBones/ragdoll_default/rin_physics.animgraph diff --git a/AutomatedTesting/Levels/Physics/C15308221_Material_ComponentsInSyncWithLibrary/ragdoll_modified/rin_skeleton_newgeo.fbx b/AutomatedTesting/Levels/Physics/Material_LibraryCrudOperationsReflectOnRagdollBones/ragdoll_default/rin_skeleton_newgeo.fbx similarity index 100% rename from AutomatedTesting/Levels/Physics/C15308221_Material_ComponentsInSyncWithLibrary/ragdoll_modified/rin_skeleton_newgeo.fbx rename to AutomatedTesting/Levels/Physics/Material_LibraryCrudOperationsReflectOnRagdollBones/ragdoll_default/rin_skeleton_newgeo.fbx diff --git a/AutomatedTesting/Levels/Physics/C4925582_Material_AddModifyDeleteOnRagdollBones/ragdoll_default/rin_skeleton_newgeo.fbx.assetinfo b/AutomatedTesting/Levels/Physics/Material_LibraryCrudOperationsReflectOnRagdollBones/ragdoll_default/rin_skeleton_newgeo.fbx.assetinfo similarity index 100% rename from AutomatedTesting/Levels/Physics/C4925582_Material_AddModifyDeleteOnRagdollBones/ragdoll_default/rin_skeleton_newgeo.fbx.assetinfo rename to AutomatedTesting/Levels/Physics/Material_LibraryCrudOperationsReflectOnRagdollBones/ragdoll_default/rin_skeleton_newgeo.fbx.assetinfo diff --git a/AutomatedTesting/Levels/Physics/C15308221_Material_ComponentsInSyncWithLibrary/ragdoll_modified/rin_skeleton_newgeo.mtl b/AutomatedTesting/Levels/Physics/Material_LibraryCrudOperationsReflectOnRagdollBones/ragdoll_default/rin_skeleton_newgeo.mtl similarity index 100% rename from AutomatedTesting/Levels/Physics/C15308221_Material_ComponentsInSyncWithLibrary/ragdoll_modified/rin_skeleton_newgeo.mtl rename to AutomatedTesting/Levels/Physics/Material_LibraryCrudOperationsReflectOnRagdollBones/ragdoll_default/rin_skeleton_newgeo.mtl diff --git a/AutomatedTesting/Levels/Physics/C4925580_Material_RagdollBonesMaterial/ragdoll_concrete/AnimGraphPhysX.animgraph b/AutomatedTesting/Levels/Physics/Material_LibraryCrudOperationsReflectOnRagdollBones/ragdoll_modified/AnimGraphPhysX.animgraph similarity index 100% rename from AutomatedTesting/Levels/Physics/C4925580_Material_RagdollBonesMaterial/ragdoll_concrete/AnimGraphPhysX.animgraph rename to AutomatedTesting/Levels/Physics/Material_LibraryCrudOperationsReflectOnRagdollBones/ragdoll_modified/AnimGraphPhysX.animgraph diff --git a/AutomatedTesting/Levels/Physics/C4925580_Material_RagdollBonesMaterial/ragdoll_rubber/Red.tif b/AutomatedTesting/Levels/Physics/Material_LibraryCrudOperationsReflectOnRagdollBones/ragdoll_modified/Red.tif similarity index 100% rename from AutomatedTesting/Levels/Physics/C4925580_Material_RagdollBonesMaterial/ragdoll_rubber/Red.tif rename to AutomatedTesting/Levels/Physics/Material_LibraryCrudOperationsReflectOnRagdollBones/ragdoll_modified/Red.tif diff --git a/AutomatedTesting/Levels/Physics/C4925580_Material_RagdollBonesMaterial/ragdoll_concrete/RinLocomotion.motionset b/AutomatedTesting/Levels/Physics/Material_LibraryCrudOperationsReflectOnRagdollBones/ragdoll_modified/RinLocomotion.motionset similarity index 100% rename from AutomatedTesting/Levels/Physics/C4925580_Material_RagdollBonesMaterial/ragdoll_concrete/RinLocomotion.motionset rename to AutomatedTesting/Levels/Physics/Material_LibraryCrudOperationsReflectOnRagdollBones/ragdoll_modified/RinLocomotion.motionset diff --git a/AutomatedTesting/Levels/Physics/C4925582_Material_AddModifyDeleteOnRagdollBones/ragdoll_modified/modified.mtl b/AutomatedTesting/Levels/Physics/Material_LibraryCrudOperationsReflectOnRagdollBones/ragdoll_modified/modified.mtl similarity index 100% rename from AutomatedTesting/Levels/Physics/C4925582_Material_AddModifyDeleteOnRagdollBones/ragdoll_modified/modified.mtl rename to AutomatedTesting/Levels/Physics/Material_LibraryCrudOperationsReflectOnRagdollBones/ragdoll_modified/modified.mtl diff --git a/AutomatedTesting/Levels/Physics/C28978033_Ragdoll_WorldBodyBusTests/ragdoll_default/rin_skeleton_newgeo.fbx b/AutomatedTesting/Levels/Physics/Material_LibraryCrudOperationsReflectOnRagdollBones/ragdoll_modified/rin_skeleton_newgeo.fbx similarity index 100% rename from AutomatedTesting/Levels/Physics/C28978033_Ragdoll_WorldBodyBusTests/ragdoll_default/rin_skeleton_newgeo.fbx rename to AutomatedTesting/Levels/Physics/Material_LibraryCrudOperationsReflectOnRagdollBones/ragdoll_modified/rin_skeleton_newgeo.fbx diff --git a/AutomatedTesting/Levels/Physics/C4925582_Material_AddModifyDeleteOnRagdollBones/ragdoll_modified/rin_skeleton_newgeo.fbx.assetinfo b/AutomatedTesting/Levels/Physics/Material_LibraryCrudOperationsReflectOnRagdollBones/ragdoll_modified/rin_skeleton_newgeo.fbx.assetinfo similarity index 100% rename from AutomatedTesting/Levels/Physics/C4925582_Material_AddModifyDeleteOnRagdollBones/ragdoll_modified/rin_skeleton_newgeo.fbx.assetinfo rename to AutomatedTesting/Levels/Physics/Material_LibraryCrudOperationsReflectOnRagdollBones/ragdoll_modified/rin_skeleton_newgeo.fbx.assetinfo diff --git a/AutomatedTesting/Levels/Physics/C28978033_Ragdoll_WorldBodyBusTests/ragdoll_default/rin_skeleton_newgeo.mtl b/AutomatedTesting/Levels/Physics/Material_LibraryCrudOperationsReflectOnRagdollBones/ragdoll_modified/rin_skeleton_newgeo.mtl similarity index 100% rename from AutomatedTesting/Levels/Physics/C28978033_Ragdoll_WorldBodyBusTests/ragdoll_default/rin_skeleton_newgeo.mtl rename to AutomatedTesting/Levels/Physics/Material_LibraryCrudOperationsReflectOnRagdollBones/ragdoll_modified/rin_skeleton_newgeo.mtl diff --git a/AutomatedTesting/Levels/Physics/C4925582_Material_AddModifyDeleteOnRagdollBones/ragdollbones.physmaterial b/AutomatedTesting/Levels/Physics/Material_LibraryCrudOperationsReflectOnRagdollBones/ragdollbones.physmaterial similarity index 100% rename from AutomatedTesting/Levels/Physics/C4925582_Material_AddModifyDeleteOnRagdollBones/ragdollbones.physmaterial rename to AutomatedTesting/Levels/Physics/Material_LibraryCrudOperationsReflectOnRagdollBones/ragdollbones.physmaterial diff --git a/AutomatedTesting/Levels/Physics/C4976199_RigidBodies_LinearDampingObjectMotion/tags.txt b/AutomatedTesting/Levels/Physics/Material_LibraryCrudOperationsReflectOnRagdollBones/tags.txt similarity index 100% rename from AutomatedTesting/Levels/Physics/C4976199_RigidBodies_LinearDampingObjectMotion/tags.txt rename to AutomatedTesting/Levels/Physics/Material_LibraryCrudOperationsReflectOnRagdollBones/tags.txt diff --git a/AutomatedTesting/Levels/Physics/C4982797_Collider_ColliderOffset/terrain/terrain.pxheightfield b/AutomatedTesting/Levels/Physics/Material_LibraryCrudOperationsReflectOnRagdollBones/terrain/terrain.pxheightfield similarity index 100% rename from AutomatedTesting/Levels/Physics/C4982797_Collider_ColliderOffset/terrain/terrain.pxheightfield rename to AutomatedTesting/Levels/Physics/Material_LibraryCrudOperationsReflectOnRagdollBones/terrain/terrain.pxheightfield diff --git a/AutomatedTesting/Levels/Physics/C4976202_RigidBody_StopsWhenBelowKineticThreshold/terraintexture.pak b/AutomatedTesting/Levels/Physics/Material_LibraryCrudOperationsReflectOnRagdollBones/terraintexture.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C4976202_RigidBody_StopsWhenBelowKineticThreshold/terraintexture.pak rename to AutomatedTesting/Levels/Physics/Material_LibraryCrudOperationsReflectOnRagdollBones/terraintexture.pak diff --git a/AutomatedTesting/Levels/Physics/C4925579_Material_AddModifyDeleteOnTerrain/C4925579_Material_AddModifyDeleteOnTerrain.ly b/AutomatedTesting/Levels/Physics/Material_LibraryCrudOperationsReflectOnTerrain/Material_LibraryCrudOperationsReflectOnTerrain.ly similarity index 100% rename from AutomatedTesting/Levels/Physics/C4925579_Material_AddModifyDeleteOnTerrain/C4925579_Material_AddModifyDeleteOnTerrain.ly rename to AutomatedTesting/Levels/Physics/Material_LibraryCrudOperationsReflectOnTerrain/Material_LibraryCrudOperationsReflectOnTerrain.ly diff --git a/AutomatedTesting/Levels/Physics/C4925579_Material_AddModifyDeleteOnTerrain/c4925579_material_addmodifydeleteonterrain.physmaterial b/AutomatedTesting/Levels/Physics/Material_LibraryCrudOperationsReflectOnTerrain/c4925579_material_addmodifydeleteonterrain.physmaterial similarity index 100% rename from AutomatedTesting/Levels/Physics/C4925579_Material_AddModifyDeleteOnTerrain/c4925579_material_addmodifydeleteonterrain.physmaterial rename to AutomatedTesting/Levels/Physics/Material_LibraryCrudOperationsReflectOnTerrain/c4925579_material_addmodifydeleteonterrain.physmaterial diff --git a/AutomatedTesting/Levels/Physics/C4925579_Material_AddModifyDeleteOnTerrain/filelist.xml b/AutomatedTesting/Levels/Physics/Material_LibraryCrudOperationsReflectOnTerrain/filelist.xml similarity index 69% rename from AutomatedTesting/Levels/Physics/C4925579_Material_AddModifyDeleteOnTerrain/filelist.xml rename to AutomatedTesting/Levels/Physics/Material_LibraryCrudOperationsReflectOnTerrain/filelist.xml index daa57f3091..993036bdef 100644 --- a/AutomatedTesting/Levels/Physics/C4925579_Material_AddModifyDeleteOnTerrain/filelist.xml +++ b/AutomatedTesting/Levels/Physics/Material_LibraryCrudOperationsReflectOnTerrain/filelist.xml @@ -1,4 +1,4 @@ - + diff --git a/AutomatedTesting/Levels/Physics/C4925579_Material_AddModifyDeleteOnTerrain/level.pak b/AutomatedTesting/Levels/Physics/Material_LibraryCrudOperationsReflectOnTerrain/level.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C4925579_Material_AddModifyDeleteOnTerrain/level.pak rename to AutomatedTesting/Levels/Physics/Material_LibraryCrudOperationsReflectOnTerrain/level.pak diff --git a/AutomatedTesting/Levels/Physics/C4976200_RigidBody_AngularDampingObjectRotation/leveldata/Environment.xml b/AutomatedTesting/Levels/Physics/Material_LibraryCrudOperationsReflectOnTerrain/leveldata/Environment.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C4976200_RigidBody_AngularDampingObjectRotation/leveldata/Environment.xml rename to AutomatedTesting/Levels/Physics/Material_LibraryCrudOperationsReflectOnTerrain/leveldata/Environment.xml diff --git a/AutomatedTesting/Levels/Physics/C4044460_Material_StaticFriction/leveldata/GameTokens.xml b/AutomatedTesting/Levels/Physics/Material_LibraryCrudOperationsReflectOnTerrain/leveldata/GameTokens.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C4044460_Material_StaticFriction/leveldata/GameTokens.xml rename to AutomatedTesting/Levels/Physics/Material_LibraryCrudOperationsReflectOnTerrain/leveldata/GameTokens.xml diff --git a/AutomatedTesting/Levels/Physics/C4982595_Collider_TriggerDisablesCollision/leveldata/TerrainTexture.xml b/AutomatedTesting/Levels/Physics/Material_LibraryCrudOperationsReflectOnTerrain/leveldata/TerrainTexture.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C4982595_Collider_TriggerDisablesCollision/leveldata/TerrainTexture.xml rename to AutomatedTesting/Levels/Physics/Material_LibraryCrudOperationsReflectOnTerrain/leveldata/TerrainTexture.xml diff --git a/AutomatedTesting/Levels/Physics/C4925579_Material_AddModifyDeleteOnTerrain/leveldata/TimeOfDay.xml b/AutomatedTesting/Levels/Physics/Material_LibraryCrudOperationsReflectOnTerrain/leveldata/TimeOfDay.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C4925579_Material_AddModifyDeleteOnTerrain/leveldata/TimeOfDay.xml rename to AutomatedTesting/Levels/Physics/Material_LibraryCrudOperationsReflectOnTerrain/leveldata/TimeOfDay.xml diff --git a/AutomatedTesting/Levels/Physics/C4976201_RigidBody_MassIsAssigned/leveldata/VegetationMap.dat b/AutomatedTesting/Levels/Physics/Material_LibraryCrudOperationsReflectOnTerrain/leveldata/VegetationMap.dat similarity index 100% rename from AutomatedTesting/Levels/Physics/C4976201_RigidBody_MassIsAssigned/leveldata/VegetationMap.dat rename to AutomatedTesting/Levels/Physics/Material_LibraryCrudOperationsReflectOnTerrain/leveldata/VegetationMap.dat diff --git a/AutomatedTesting/Levels/Physics/C4925579_Material_AddModifyDeleteOnTerrain/modified.mtl b/AutomatedTesting/Levels/Physics/Material_LibraryCrudOperationsReflectOnTerrain/modified.mtl similarity index 100% rename from AutomatedTesting/Levels/Physics/C4925579_Material_AddModifyDeleteOnTerrain/modified.mtl rename to AutomatedTesting/Levels/Physics/Material_LibraryCrudOperationsReflectOnTerrain/modified.mtl diff --git a/AutomatedTesting/Levels/Physics/C4976200_RigidBody_AngularDampingObjectRotation/tags.txt b/AutomatedTesting/Levels/Physics/Material_LibraryCrudOperationsReflectOnTerrain/tags.txt similarity index 100% rename from AutomatedTesting/Levels/Physics/C4976200_RigidBody_AngularDampingObjectRotation/tags.txt rename to AutomatedTesting/Levels/Physics/Material_LibraryCrudOperationsReflectOnTerrain/tags.txt diff --git a/AutomatedTesting/Levels/Physics/C4925579_Material_AddModifyDeleteOnTerrain/terrain/terrain.pxheightfield b/AutomatedTesting/Levels/Physics/Material_LibraryCrudOperationsReflectOnTerrain/terrain/terrain.pxheightfield similarity index 100% rename from AutomatedTesting/Levels/Physics/C4925579_Material_AddModifyDeleteOnTerrain/terrain/terrain.pxheightfield rename to AutomatedTesting/Levels/Physics/Material_LibraryCrudOperationsReflectOnTerrain/terrain/terrain.pxheightfield diff --git a/AutomatedTesting/Levels/Physics/C4925579_Material_AddModifyDeleteOnTerrain/terraintexture.pak b/AutomatedTesting/Levels/Physics/Material_LibraryCrudOperationsReflectOnTerrain/terraintexture.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C4925579_Material_AddModifyDeleteOnTerrain/terraintexture.pak rename to AutomatedTesting/Levels/Physics/Material_LibraryCrudOperationsReflectOnTerrain/terraintexture.pak diff --git a/AutomatedTesting/Levels/Physics/C15425935_Material_LibraryUpdatedAcrossLevels/C15425935_Material_LibraryUpdatedAcrossLevels_0/C15425935_Material_LibraryUpdatedAcrossLevels_0.ly b/AutomatedTesting/Levels/Physics/Material_LibraryUpdatedAcrossLevels/C15425935_Material_LibraryUpdatedAcrossLevels_0/C15425935_Material_LibraryUpdatedAcrossLevels_0.ly similarity index 100% rename from AutomatedTesting/Levels/Physics/C15425935_Material_LibraryUpdatedAcrossLevels/C15425935_Material_LibraryUpdatedAcrossLevels_0/C15425935_Material_LibraryUpdatedAcrossLevels_0.ly rename to AutomatedTesting/Levels/Physics/Material_LibraryUpdatedAcrossLevels/C15425935_Material_LibraryUpdatedAcrossLevels_0/C15425935_Material_LibraryUpdatedAcrossLevels_0.ly diff --git a/AutomatedTesting/Levels/Physics/C15425935_Material_LibraryUpdatedAcrossLevels/C15425935_Material_LibraryUpdatedAcrossLevels_0/filelist.xml b/AutomatedTesting/Levels/Physics/Material_LibraryUpdatedAcrossLevels/C15425935_Material_LibraryUpdatedAcrossLevels_0/filelist.xml similarity index 69% rename from AutomatedTesting/Levels/Physics/C15425935_Material_LibraryUpdatedAcrossLevels/C15425935_Material_LibraryUpdatedAcrossLevels_0/filelist.xml rename to AutomatedTesting/Levels/Physics/Material_LibraryUpdatedAcrossLevels/C15425935_Material_LibraryUpdatedAcrossLevels_0/filelist.xml index 7fa20195df..9a78b1bfd5 100644 --- a/AutomatedTesting/Levels/Physics/C15425935_Material_LibraryUpdatedAcrossLevels/C15425935_Material_LibraryUpdatedAcrossLevels_0/filelist.xml +++ b/AutomatedTesting/Levels/Physics/Material_LibraryUpdatedAcrossLevels/C15425935_Material_LibraryUpdatedAcrossLevels_0/filelist.xml @@ -1,4 +1,4 @@ - + diff --git a/AutomatedTesting/Levels/Physics/C15425935_Material_LibraryUpdatedAcrossLevels/C15425935_Material_LibraryUpdatedAcrossLevels_0/level.pak b/AutomatedTesting/Levels/Physics/Material_LibraryUpdatedAcrossLevels/C15425935_Material_LibraryUpdatedAcrossLevels_0/level.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C15425935_Material_LibraryUpdatedAcrossLevels/C15425935_Material_LibraryUpdatedAcrossLevels_0/level.pak rename to AutomatedTesting/Levels/Physics/Material_LibraryUpdatedAcrossLevels/C15425935_Material_LibraryUpdatedAcrossLevels_0/level.pak diff --git a/AutomatedTesting/Levels/Physics/C4976201_RigidBody_MassIsAssigned/leveldata/Environment.xml b/AutomatedTesting/Levels/Physics/Material_LibraryUpdatedAcrossLevels/C15425935_Material_LibraryUpdatedAcrossLevels_0/leveldata/Environment.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C4976201_RigidBody_MassIsAssigned/leveldata/Environment.xml rename to AutomatedTesting/Levels/Physics/Material_LibraryUpdatedAcrossLevels/C15425935_Material_LibraryUpdatedAcrossLevels_0/leveldata/Environment.xml diff --git a/AutomatedTesting/Levels/Physics/C4044461_Material_Restitution/leveldata/GameTokens.xml b/AutomatedTesting/Levels/Physics/Material_LibraryUpdatedAcrossLevels/C15425935_Material_LibraryUpdatedAcrossLevels_0/leveldata/GameTokens.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C4044461_Material_Restitution/leveldata/GameTokens.xml rename to AutomatedTesting/Levels/Physics/Material_LibraryUpdatedAcrossLevels/C15425935_Material_LibraryUpdatedAcrossLevels_0/leveldata/GameTokens.xml diff --git a/AutomatedTesting/Levels/Physics/C28978033_Ragdoll_WorldBodyBusTests/LevelData/TerrainTexture.xml b/AutomatedTesting/Levels/Physics/Material_LibraryUpdatedAcrossLevels/C15425935_Material_LibraryUpdatedAcrossLevels_0/leveldata/TerrainTexture.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C28978033_Ragdoll_WorldBodyBusTests/LevelData/TerrainTexture.xml rename to AutomatedTesting/Levels/Physics/Material_LibraryUpdatedAcrossLevels/C15425935_Material_LibraryUpdatedAcrossLevels_0/leveldata/TerrainTexture.xml diff --git a/AutomatedTesting/Levels/Physics/C4925580_Material_RagdollBonesMaterial/leveldata/TimeOfDay.xml b/AutomatedTesting/Levels/Physics/Material_LibraryUpdatedAcrossLevels/C15425935_Material_LibraryUpdatedAcrossLevels_0/leveldata/TimeOfDay.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C4925580_Material_RagdollBonesMaterial/leveldata/TimeOfDay.xml rename to AutomatedTesting/Levels/Physics/Material_LibraryUpdatedAcrossLevels/C15425935_Material_LibraryUpdatedAcrossLevels_0/leveldata/TimeOfDay.xml diff --git a/AutomatedTesting/Levels/Physics/C4976202_RigidBody_StopsWhenBelowKineticThreshold/leveldata/VegetationMap.dat b/AutomatedTesting/Levels/Physics/Material_LibraryUpdatedAcrossLevels/C15425935_Material_LibraryUpdatedAcrossLevels_0/leveldata/VegetationMap.dat similarity index 100% rename from AutomatedTesting/Levels/Physics/C4976202_RigidBody_StopsWhenBelowKineticThreshold/leveldata/VegetationMap.dat rename to AutomatedTesting/Levels/Physics/Material_LibraryUpdatedAcrossLevels/C15425935_Material_LibraryUpdatedAcrossLevels_0/leveldata/VegetationMap.dat diff --git a/AutomatedTesting/Levels/Physics/C4976201_RigidBody_MassIsAssigned/tags.txt b/AutomatedTesting/Levels/Physics/Material_LibraryUpdatedAcrossLevels/C15425935_Material_LibraryUpdatedAcrossLevels_0/tags.txt similarity index 100% rename from AutomatedTesting/Levels/Physics/C4976201_RigidBody_MassIsAssigned/tags.txt rename to AutomatedTesting/Levels/Physics/Material_LibraryUpdatedAcrossLevels/C15425935_Material_LibraryUpdatedAcrossLevels_0/tags.txt diff --git a/AutomatedTesting/Levels/Physics/C4044697_Material_PerfaceMaterialValidation/terrain/terrain.pxheightfield b/AutomatedTesting/Levels/Physics/Material_LibraryUpdatedAcrossLevels/C15425935_Material_LibraryUpdatedAcrossLevels_0/terrain/terrain.pxheightfield similarity index 100% rename from AutomatedTesting/Levels/Physics/C4044697_Material_PerfaceMaterialValidation/terrain/terrain.pxheightfield rename to AutomatedTesting/Levels/Physics/Material_LibraryUpdatedAcrossLevels/C15425935_Material_LibraryUpdatedAcrossLevels_0/terrain/terrain.pxheightfield diff --git a/AutomatedTesting/Levels/Physics/C4976204_Verify_Start_Asleep_Condition/terraintexture.pak b/AutomatedTesting/Levels/Physics/Material_LibraryUpdatedAcrossLevels/C15425935_Material_LibraryUpdatedAcrossLevels_0/terraintexture.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C4976204_Verify_Start_Asleep_Condition/terraintexture.pak rename to AutomatedTesting/Levels/Physics/Material_LibraryUpdatedAcrossLevels/C15425935_Material_LibraryUpdatedAcrossLevels_0/terraintexture.pak diff --git a/AutomatedTesting/Levels/Physics/C15425935_Material_LibraryUpdatedAcrossLevels/C15425935_Material_LibraryUpdatedAcrossLevels_1/C15425935_Material_LibraryUpdatedAcrossLevels_1.ly b/AutomatedTesting/Levels/Physics/Material_LibraryUpdatedAcrossLevels/C15425935_Material_LibraryUpdatedAcrossLevels_1/C15425935_Material_LibraryUpdatedAcrossLevels_1.ly similarity index 100% rename from AutomatedTesting/Levels/Physics/C15425935_Material_LibraryUpdatedAcrossLevels/C15425935_Material_LibraryUpdatedAcrossLevels_1/C15425935_Material_LibraryUpdatedAcrossLevels_1.ly rename to AutomatedTesting/Levels/Physics/Material_LibraryUpdatedAcrossLevels/C15425935_Material_LibraryUpdatedAcrossLevels_1/C15425935_Material_LibraryUpdatedAcrossLevels_1.ly diff --git a/AutomatedTesting/Levels/Physics/C15425935_Material_LibraryUpdatedAcrossLevels/C15425935_Material_LibraryUpdatedAcrossLevels_1/filelist.xml b/AutomatedTesting/Levels/Physics/Material_LibraryUpdatedAcrossLevels/C15425935_Material_LibraryUpdatedAcrossLevels_1/filelist.xml similarity index 69% rename from AutomatedTesting/Levels/Physics/C15425935_Material_LibraryUpdatedAcrossLevels/C15425935_Material_LibraryUpdatedAcrossLevels_1/filelist.xml rename to AutomatedTesting/Levels/Physics/Material_LibraryUpdatedAcrossLevels/C15425935_Material_LibraryUpdatedAcrossLevels_1/filelist.xml index 7fa20195df..9a78b1bfd5 100644 --- a/AutomatedTesting/Levels/Physics/C15425935_Material_LibraryUpdatedAcrossLevels/C15425935_Material_LibraryUpdatedAcrossLevels_1/filelist.xml +++ b/AutomatedTesting/Levels/Physics/Material_LibraryUpdatedAcrossLevels/C15425935_Material_LibraryUpdatedAcrossLevels_1/filelist.xml @@ -1,4 +1,4 @@ - + diff --git a/AutomatedTesting/Levels/Physics/C15425935_Material_LibraryUpdatedAcrossLevels/C15425935_Material_LibraryUpdatedAcrossLevels_1/level.pak b/AutomatedTesting/Levels/Physics/Material_LibraryUpdatedAcrossLevels/C15425935_Material_LibraryUpdatedAcrossLevels_1/level.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C15425935_Material_LibraryUpdatedAcrossLevels/C15425935_Material_LibraryUpdatedAcrossLevels_1/level.pak rename to AutomatedTesting/Levels/Physics/Material_LibraryUpdatedAcrossLevels/C15425935_Material_LibraryUpdatedAcrossLevels_1/level.pak diff --git a/AutomatedTesting/Levels/Physics/C4976202_RigidBody_StopsWhenBelowKineticThreshold/leveldata/Environment.xml b/AutomatedTesting/Levels/Physics/Material_LibraryUpdatedAcrossLevels/C15425935_Material_LibraryUpdatedAcrossLevels_1/leveldata/Environment.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C4976202_RigidBody_StopsWhenBelowKineticThreshold/leveldata/Environment.xml rename to AutomatedTesting/Levels/Physics/Material_LibraryUpdatedAcrossLevels/C15425935_Material_LibraryUpdatedAcrossLevels_1/leveldata/Environment.xml diff --git a/AutomatedTesting/Levels/Physics/C4044694_Material_EmptyLibraryUsesDefault/leveldata/GameTokens.xml b/AutomatedTesting/Levels/Physics/Material_LibraryUpdatedAcrossLevels/C15425935_Material_LibraryUpdatedAcrossLevels_1/leveldata/GameTokens.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C4044694_Material_EmptyLibraryUsesDefault/leveldata/GameTokens.xml rename to AutomatedTesting/Levels/Physics/Material_LibraryUpdatedAcrossLevels/C15425935_Material_LibraryUpdatedAcrossLevels_1/leveldata/GameTokens.xml diff --git a/AutomatedTesting/Levels/Physics/C29032500_EditorComponents_WorldBodyBusWorks/leveldata/TerrainTexture.xml b/AutomatedTesting/Levels/Physics/Material_LibraryUpdatedAcrossLevels/C15425935_Material_LibraryUpdatedAcrossLevels_1/leveldata/TerrainTexture.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C29032500_EditorComponents_WorldBodyBusWorks/leveldata/TerrainTexture.xml rename to AutomatedTesting/Levels/Physics/Material_LibraryUpdatedAcrossLevels/C15425935_Material_LibraryUpdatedAcrossLevels_1/leveldata/TerrainTexture.xml diff --git a/AutomatedTesting/Levels/Physics/C4925582_Material_AddModifyDeleteOnRagdollBones/leveldata/TimeOfDay.xml b/AutomatedTesting/Levels/Physics/Material_LibraryUpdatedAcrossLevels/C15425935_Material_LibraryUpdatedAcrossLevels_1/leveldata/TimeOfDay.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C4925582_Material_AddModifyDeleteOnRagdollBones/leveldata/TimeOfDay.xml rename to AutomatedTesting/Levels/Physics/Material_LibraryUpdatedAcrossLevels/C15425935_Material_LibraryUpdatedAcrossLevels_1/leveldata/TimeOfDay.xml diff --git a/AutomatedTesting/Levels/Physics/C4976204_Verify_Start_Asleep_Condition/leveldata/VegetationMap.dat b/AutomatedTesting/Levels/Physics/Material_LibraryUpdatedAcrossLevels/C15425935_Material_LibraryUpdatedAcrossLevels_1/leveldata/VegetationMap.dat similarity index 100% rename from AutomatedTesting/Levels/Physics/C4976204_Verify_Start_Asleep_Condition/leveldata/VegetationMap.dat rename to AutomatedTesting/Levels/Physics/Material_LibraryUpdatedAcrossLevels/C15425935_Material_LibraryUpdatedAcrossLevels_1/leveldata/VegetationMap.dat diff --git a/AutomatedTesting/Levels/Physics/C4976202_RigidBody_StopsWhenBelowKineticThreshold/tags.txt b/AutomatedTesting/Levels/Physics/Material_LibraryUpdatedAcrossLevels/C15425935_Material_LibraryUpdatedAcrossLevels_1/tags.txt similarity index 100% rename from AutomatedTesting/Levels/Physics/C4976202_RigidBody_StopsWhenBelowKineticThreshold/tags.txt rename to AutomatedTesting/Levels/Physics/Material_LibraryUpdatedAcrossLevels/C15425935_Material_LibraryUpdatedAcrossLevels_1/tags.txt diff --git a/AutomatedTesting/Levels/Physics/C4888315_Material_AddModifyDeleteOnCollider/terrain/terrain.pxheightfield b/AutomatedTesting/Levels/Physics/Material_LibraryUpdatedAcrossLevels/C15425935_Material_LibraryUpdatedAcrossLevels_1/terrain/terrain.pxheightfield similarity index 100% rename from AutomatedTesting/Levels/Physics/C4888315_Material_AddModifyDeleteOnCollider/terrain/terrain.pxheightfield rename to AutomatedTesting/Levels/Physics/Material_LibraryUpdatedAcrossLevels/C15425935_Material_LibraryUpdatedAcrossLevels_1/terrain/terrain.pxheightfield diff --git a/AutomatedTesting/Levels/Physics/C4976206_RigidBodies_VerifyGravity/terraintexture.pak b/AutomatedTesting/Levels/Physics/Material_LibraryUpdatedAcrossLevels/C15425935_Material_LibraryUpdatedAcrossLevels_1/terraintexture.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C4976206_RigidBodies_VerifyGravity/terraintexture.pak rename to AutomatedTesting/Levels/Physics/Material_LibraryUpdatedAcrossLevels/C15425935_Material_LibraryUpdatedAcrossLevels_1/terraintexture.pak diff --git a/AutomatedTesting/Levels/Physics/C15425935_Material_LibraryUpdatedAcrossLevels/C15425935_Material_LibraryUpdatedAcrossLevels.physmaterial b/AutomatedTesting/Levels/Physics/Material_LibraryUpdatedAcrossLevels/Material_LibraryUpdatedAcrossLevels.physmaterial similarity index 100% rename from AutomatedTesting/Levels/Physics/C15425935_Material_LibraryUpdatedAcrossLevels/C15425935_Material_LibraryUpdatedAcrossLevels.physmaterial rename to AutomatedTesting/Levels/Physics/Material_LibraryUpdatedAcrossLevels/Material_LibraryUpdatedAcrossLevels.physmaterial diff --git a/AutomatedTesting/Levels/Physics/C5296614_PhysXMaterial_ColliderShape/C5296614_PhysXMaterial_ColliderShape.ly b/AutomatedTesting/Levels/Physics/Material_NoEffectIfNoColliderShape/Material_NoEffectIfNoColliderShape.ly similarity index 100% rename from AutomatedTesting/Levels/Physics/C5296614_PhysXMaterial_ColliderShape/C5296614_PhysXMaterial_ColliderShape.ly rename to AutomatedTesting/Levels/Physics/Material_NoEffectIfNoColliderShape/Material_NoEffectIfNoColliderShape.ly diff --git a/AutomatedTesting/Levels/Physics/C5296614_PhysXMaterial_ColliderShape/filelist.xml b/AutomatedTesting/Levels/Physics/Material_NoEffectIfNoColliderShape/filelist.xml similarity index 72% rename from AutomatedTesting/Levels/Physics/C5296614_PhysXMaterial_ColliderShape/filelist.xml rename to AutomatedTesting/Levels/Physics/Material_NoEffectIfNoColliderShape/filelist.xml index 318f99aa25..d4e0202e8a 100644 --- a/AutomatedTesting/Levels/Physics/C5296614_PhysXMaterial_ColliderShape/filelist.xml +++ b/AutomatedTesting/Levels/Physics/Material_NoEffectIfNoColliderShape/filelist.xml @@ -1,4 +1,4 @@ - + diff --git a/AutomatedTesting/Levels/Physics/C5296614_PhysXMaterial_ColliderShape/level.pak b/AutomatedTesting/Levels/Physics/Material_NoEffectIfNoColliderShape/level.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C5296614_PhysXMaterial_ColliderShape/level.pak rename to AutomatedTesting/Levels/Physics/Material_NoEffectIfNoColliderShape/level.pak diff --git a/AutomatedTesting/Levels/Physics/C4976204_Verify_Start_Asleep_Condition/leveldata/Environment.xml b/AutomatedTesting/Levels/Physics/Material_NoEffectIfNoColliderShape/leveldata/Environment.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C4976204_Verify_Start_Asleep_Condition/leveldata/Environment.xml rename to AutomatedTesting/Levels/Physics/Material_NoEffectIfNoColliderShape/leveldata/Environment.xml diff --git a/AutomatedTesting/Levels/Physics/C4044697_Material_PerfaceMaterialValidation/leveldata/GameTokens.xml b/AutomatedTesting/Levels/Physics/Material_NoEffectIfNoColliderShape/leveldata/GameTokens.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C4044697_Material_PerfaceMaterialValidation/leveldata/GameTokens.xml rename to AutomatedTesting/Levels/Physics/Material_NoEffectIfNoColliderShape/leveldata/GameTokens.xml diff --git a/AutomatedTesting/Levels/Physics/C4044455_Material_LibraryChangesInstantly/leveldata/TerrainTexture.xml b/AutomatedTesting/Levels/Physics/Material_NoEffectIfNoColliderShape/leveldata/TerrainTexture.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C4044455_Material_LibraryChangesInstantly/leveldata/TerrainTexture.xml rename to AutomatedTesting/Levels/Physics/Material_NoEffectIfNoColliderShape/leveldata/TerrainTexture.xml diff --git a/AutomatedTesting/Levels/Physics/C4976194_RigidBody_PhysXComponentIsValid/leveldata/TimeOfDay.xml b/AutomatedTesting/Levels/Physics/Material_NoEffectIfNoColliderShape/leveldata/TimeOfDay.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C4976194_RigidBody_PhysXComponentIsValid/leveldata/TimeOfDay.xml rename to AutomatedTesting/Levels/Physics/Material_NoEffectIfNoColliderShape/leveldata/TimeOfDay.xml diff --git a/AutomatedTesting/Levels/Physics/C4976206_RigidBodies_VerifyGravity/leveldata/VegetationMap.dat b/AutomatedTesting/Levels/Physics/Material_NoEffectIfNoColliderShape/leveldata/VegetationMap.dat similarity index 100% rename from AutomatedTesting/Levels/Physics/C4976206_RigidBodies_VerifyGravity/leveldata/VegetationMap.dat rename to AutomatedTesting/Levels/Physics/Material_NoEffectIfNoColliderShape/leveldata/VegetationMap.dat diff --git a/AutomatedTesting/Levels/Physics/C4976204_Verify_Start_Asleep_Condition/tags.txt b/AutomatedTesting/Levels/Physics/Material_NoEffectIfNoColliderShape/tags.txt similarity index 100% rename from AutomatedTesting/Levels/Physics/C4976204_Verify_Start_Asleep_Condition/tags.txt rename to AutomatedTesting/Levels/Physics/Material_NoEffectIfNoColliderShape/tags.txt diff --git a/AutomatedTesting/Levels/Physics/C4976207_PhysXRigidBodies_KinematicBehavior/terraintexture.pak b/AutomatedTesting/Levels/Physics/Material_NoEffectIfNoColliderShape/terraintexture.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C4976207_PhysXRigidBodies_KinematicBehavior/terraintexture.pak rename to AutomatedTesting/Levels/Physics/Material_NoEffectIfNoColliderShape/terraintexture.pak diff --git a/AutomatedTesting/Levels/Physics/C4044697_Material_PerfaceMaterialValidation/C4044697_Material_PerfaceMaterialValidation.ly b/AutomatedTesting/Levels/Physics/Material_PerFaceMaterialGetsCorrectMaterial/Material_PerFaceMaterialGetsCorrectMaterial.ly similarity index 100% rename from AutomatedTesting/Levels/Physics/C4044697_Material_PerfaceMaterialValidation/C4044697_Material_PerfaceMaterialValidation.ly rename to AutomatedTesting/Levels/Physics/Material_PerFaceMaterialGetsCorrectMaterial/Material_PerFaceMaterialGetsCorrectMaterial.ly diff --git a/AutomatedTesting/Levels/Physics/C4044697_Material_PerfaceMaterialValidation/filelist.xml b/AutomatedTesting/Levels/Physics/Material_PerFaceMaterialGetsCorrectMaterial/filelist.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C4044697_Material_PerfaceMaterialValidation/filelist.xml rename to AutomatedTesting/Levels/Physics/Material_PerFaceMaterialGetsCorrectMaterial/filelist.xml diff --git a/AutomatedTesting/Levels/Physics/C4044697_Material_PerfaceMaterialValidation/level.pak b/AutomatedTesting/Levels/Physics/Material_PerFaceMaterialGetsCorrectMaterial/level.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C4044697_Material_PerfaceMaterialValidation/level.pak rename to AutomatedTesting/Levels/Physics/Material_PerFaceMaterialGetsCorrectMaterial/level.pak diff --git a/AutomatedTesting/Levels/Physics/C4976206_RigidBodies_VerifyGravity/leveldata/Environment.xml b/AutomatedTesting/Levels/Physics/Material_PerFaceMaterialGetsCorrectMaterial/leveldata/Environment.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C4976206_RigidBodies_VerifyGravity/leveldata/Environment.xml rename to AutomatedTesting/Levels/Physics/Material_PerFaceMaterialGetsCorrectMaterial/leveldata/Environment.xml diff --git a/AutomatedTesting/Levels/Physics/C4888315_Material_AddModifyDeleteOnCollider/leveldata/GameTokens.xml b/AutomatedTesting/Levels/Physics/Material_PerFaceMaterialGetsCorrectMaterial/leveldata/GameTokens.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C4888315_Material_AddModifyDeleteOnCollider/leveldata/GameTokens.xml rename to AutomatedTesting/Levels/Physics/Material_PerFaceMaterialGetsCorrectMaterial/leveldata/GameTokens.xml diff --git a/AutomatedTesting/Levels/Physics/C4044456_Material_FrictionCombine/leveldata/TerrainTexture.xml b/AutomatedTesting/Levels/Physics/Material_PerFaceMaterialGetsCorrectMaterial/leveldata/TerrainTexture.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C4044456_Material_FrictionCombine/leveldata/TerrainTexture.xml rename to AutomatedTesting/Levels/Physics/Material_PerFaceMaterialGetsCorrectMaterial/leveldata/TerrainTexture.xml diff --git a/AutomatedTesting/Levels/Physics/C4976195_RigidBodies_InitialLinearVelocity/leveldata/TimeOfDay.xml b/AutomatedTesting/Levels/Physics/Material_PerFaceMaterialGetsCorrectMaterial/leveldata/TimeOfDay.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C4976195_RigidBodies_InitialLinearVelocity/leveldata/TimeOfDay.xml rename to AutomatedTesting/Levels/Physics/Material_PerFaceMaterialGetsCorrectMaterial/leveldata/TimeOfDay.xml diff --git a/AutomatedTesting/Levels/Physics/C4976207_PhysXRigidBodies_KinematicBehavior/leveldata/VegetationMap.dat b/AutomatedTesting/Levels/Physics/Material_PerFaceMaterialGetsCorrectMaterial/leveldata/VegetationMap.dat similarity index 100% rename from AutomatedTesting/Levels/Physics/C4976207_PhysXRigidBodies_KinematicBehavior/leveldata/VegetationMap.dat rename to AutomatedTesting/Levels/Physics/Material_PerFaceMaterialGetsCorrectMaterial/leveldata/VegetationMap.dat diff --git a/AutomatedTesting/Levels/Physics/C4976206_RigidBodies_VerifyGravity/tags.txt b/AutomatedTesting/Levels/Physics/Material_PerFaceMaterialGetsCorrectMaterial/tags.txt similarity index 100% rename from AutomatedTesting/Levels/Physics/C4976206_RigidBodies_VerifyGravity/tags.txt rename to AutomatedTesting/Levels/Physics/Material_PerFaceMaterialGetsCorrectMaterial/tags.txt diff --git a/AutomatedTesting/Levels/Physics/C4976194_RigidBody_PhysXComponentIsValid/terrain/terrain.pxheightfield b/AutomatedTesting/Levels/Physics/Material_PerFaceMaterialGetsCorrectMaterial/terrain/terrain.pxheightfield similarity index 100% rename from AutomatedTesting/Levels/Physics/C4976194_RigidBody_PhysXComponentIsValid/terrain/terrain.pxheightfield rename to AutomatedTesting/Levels/Physics/Material_PerFaceMaterialGetsCorrectMaterial/terrain/terrain.pxheightfield diff --git a/AutomatedTesting/Levels/Physics/C4976209_RigidBody_ComputesCOM/terraintexture.pak b/AutomatedTesting/Levels/Physics/Material_PerFaceMaterialGetsCorrectMaterial/terraintexture.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C4976209_RigidBody_ComputesCOM/terraintexture.pak rename to AutomatedTesting/Levels/Physics/Material_PerFaceMaterialGetsCorrectMaterial/terraintexture.pak diff --git a/AutomatedTesting/Levels/Physics/C4044697_Material_PerfaceMaterialValidation/test.fbx b/AutomatedTesting/Levels/Physics/Material_PerFaceMaterialGetsCorrectMaterial/test.fbx similarity index 100% rename from AutomatedTesting/Levels/Physics/C4044697_Material_PerfaceMaterialValidation/test.fbx rename to AutomatedTesting/Levels/Physics/Material_PerFaceMaterialGetsCorrectMaterial/test.fbx diff --git a/AutomatedTesting/Levels/Physics/C4044697_Material_PerfaceMaterialValidation/test.fbx.assetinfo b/AutomatedTesting/Levels/Physics/Material_PerFaceMaterialGetsCorrectMaterial/test.fbx.assetinfo similarity index 100% rename from AutomatedTesting/Levels/Physics/C4044697_Material_PerfaceMaterialValidation/test.fbx.assetinfo rename to AutomatedTesting/Levels/Physics/Material_PerFaceMaterialGetsCorrectMaterial/test.fbx.assetinfo diff --git a/AutomatedTesting/Levels/Physics/C4044697_Material_PerfaceMaterialValidation/test.mtl b/AutomatedTesting/Levels/Physics/Material_PerFaceMaterialGetsCorrectMaterial/test.mtl similarity index 100% rename from AutomatedTesting/Levels/Physics/C4044697_Material_PerfaceMaterialValidation/test.mtl rename to AutomatedTesting/Levels/Physics/Material_PerFaceMaterialGetsCorrectMaterial/test.mtl diff --git a/AutomatedTesting/Levels/Physics/C4044697_Material_PerfaceMaterialValidation/test_library.physmaterial b/AutomatedTesting/Levels/Physics/Material_PerFaceMaterialGetsCorrectMaterial/test_library.physmaterial similarity index 100% rename from AutomatedTesting/Levels/Physics/C4044697_Material_PerfaceMaterialValidation/test_library.physmaterial rename to AutomatedTesting/Levels/Physics/Material_PerFaceMaterialGetsCorrectMaterial/test_library.physmaterial diff --git a/AutomatedTesting/Levels/Physics/C4925580_Material_RagdollBonesMaterial/C4925580_Material_RagdollBonesMaterial.ly b/AutomatedTesting/Levels/Physics/Material_RagdollBones/Material_RagdollBones.ly similarity index 100% rename from AutomatedTesting/Levels/Physics/C4925580_Material_RagdollBonesMaterial/C4925580_Material_RagdollBonesMaterial.ly rename to AutomatedTesting/Levels/Physics/Material_RagdollBones/Material_RagdollBones.ly diff --git a/AutomatedTesting/Levels/Physics/C4925580_Material_RagdollBonesMaterial/c4925580_material_ragdollbonesmaterial.physmaterial b/AutomatedTesting/Levels/Physics/Material_RagdollBones/c4925580_material_ragdollbonesmaterial.physmaterial similarity index 100% rename from AutomatedTesting/Levels/Physics/C4925580_Material_RagdollBonesMaterial/c4925580_material_ragdollbonesmaterial.physmaterial rename to AutomatedTesting/Levels/Physics/Material_RagdollBones/c4925580_material_ragdollbonesmaterial.physmaterial diff --git a/AutomatedTesting/Levels/Physics/C4925580_Material_RagdollBonesMaterial/filelist.xml b/AutomatedTesting/Levels/Physics/Material_RagdollBones/filelist.xml similarity index 71% rename from AutomatedTesting/Levels/Physics/C4925580_Material_RagdollBonesMaterial/filelist.xml rename to AutomatedTesting/Levels/Physics/Material_RagdollBones/filelist.xml index 7fb4108fe3..cd5aabef1b 100644 --- a/AutomatedTesting/Levels/Physics/C4925580_Material_RagdollBonesMaterial/filelist.xml +++ b/AutomatedTesting/Levels/Physics/Material_RagdollBones/filelist.xml @@ -1,4 +1,4 @@ - + diff --git a/AutomatedTesting/Levels/Physics/C4925582_Material_AddModifyDeleteOnRagdollBones/level.pak b/AutomatedTesting/Levels/Physics/Material_RagdollBones/level.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C4925582_Material_AddModifyDeleteOnRagdollBones/level.pak rename to AutomatedTesting/Levels/Physics/Material_RagdollBones/level.pak diff --git a/AutomatedTesting/Levels/Physics/C4976207_PhysXRigidBodies_KinematicBehavior/leveldata/Environment.xml b/AutomatedTesting/Levels/Physics/Material_RagdollBones/leveldata/Environment.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C4976207_PhysXRigidBodies_KinematicBehavior/leveldata/Environment.xml rename to AutomatedTesting/Levels/Physics/Material_RagdollBones/leveldata/Environment.xml diff --git a/AutomatedTesting/Levels/Physics/C4925577_PhysXMaterials_MaterialAssignedToTerrain/leveldata/GameTokens.xml b/AutomatedTesting/Levels/Physics/Material_RagdollBones/leveldata/GameTokens.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C4925577_PhysXMaterials_MaterialAssignedToTerrain/leveldata/GameTokens.xml rename to AutomatedTesting/Levels/Physics/Material_RagdollBones/leveldata/GameTokens.xml diff --git a/AutomatedTesting/Levels/Physics/C4982797_Collider_ColliderOffset/leveldata/TerrainTexture.xml b/AutomatedTesting/Levels/Physics/Material_RagdollBones/leveldata/TerrainTexture.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C4982797_Collider_ColliderOffset/leveldata/TerrainTexture.xml rename to AutomatedTesting/Levels/Physics/Material_RagdollBones/leveldata/TerrainTexture.xml diff --git a/AutomatedTesting/Levels/Physics/C4976197_RigidBodies_InitialAngularVelocity/leveldata/TimeOfDay.xml b/AutomatedTesting/Levels/Physics/Material_RagdollBones/leveldata/TimeOfDay.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C4976197_RigidBodies_InitialAngularVelocity/leveldata/TimeOfDay.xml rename to AutomatedTesting/Levels/Physics/Material_RagdollBones/leveldata/TimeOfDay.xml diff --git a/AutomatedTesting/Levels/Physics/C4976209_RigidBody_ComputesCOM/leveldata/VegetationMap.dat b/AutomatedTesting/Levels/Physics/Material_RagdollBones/leveldata/VegetationMap.dat similarity index 100% rename from AutomatedTesting/Levels/Physics/C4976209_RigidBody_ComputesCOM/leveldata/VegetationMap.dat rename to AutomatedTesting/Levels/Physics/Material_RagdollBones/leveldata/VegetationMap.dat diff --git a/AutomatedTesting/Levels/Physics/C4925580_Material_RagdollBonesMaterial/ragdoll_rubber/AnimGraphPhysX.animgraph b/AutomatedTesting/Levels/Physics/Material_RagdollBones/ragdoll_concrete/AnimGraphPhysX.animgraph similarity index 100% rename from AutomatedTesting/Levels/Physics/C4925580_Material_RagdollBonesMaterial/ragdoll_rubber/AnimGraphPhysX.animgraph rename to AutomatedTesting/Levels/Physics/Material_RagdollBones/ragdoll_concrete/AnimGraphPhysX.animgraph diff --git a/AutomatedTesting/Levels/Physics/C4925580_Material_RagdollBonesMaterial/ragdoll_concrete/Blue.tif b/AutomatedTesting/Levels/Physics/Material_RagdollBones/ragdoll_concrete/Blue.tif similarity index 100% rename from AutomatedTesting/Levels/Physics/C4925580_Material_RagdollBonesMaterial/ragdoll_concrete/Blue.tif rename to AutomatedTesting/Levels/Physics/Material_RagdollBones/ragdoll_concrete/Blue.tif diff --git a/AutomatedTesting/Levels/Physics/C4925580_Material_RagdollBonesMaterial/ragdoll_rubber/RinLocomotion.motionset b/AutomatedTesting/Levels/Physics/Material_RagdollBones/ragdoll_concrete/RinLocomotion.motionset similarity index 100% rename from AutomatedTesting/Levels/Physics/C4925580_Material_RagdollBonesMaterial/ragdoll_rubber/RinLocomotion.motionset rename to AutomatedTesting/Levels/Physics/Material_RagdollBones/ragdoll_concrete/RinLocomotion.motionset diff --git a/AutomatedTesting/Levels/Physics/C4925580_Material_RagdollBonesMaterial/ragdoll_concrete/concrete.mtl b/AutomatedTesting/Levels/Physics/Material_RagdollBones/ragdoll_concrete/concrete.mtl similarity index 100% rename from AutomatedTesting/Levels/Physics/C4925580_Material_RagdollBonesMaterial/ragdoll_concrete/concrete.mtl rename to AutomatedTesting/Levels/Physics/Material_RagdollBones/ragdoll_concrete/concrete.mtl diff --git a/AutomatedTesting/Levels/Physics/C4925580_Material_RagdollBonesMaterial/ragdoll_concrete/rin_physics.animgraph b/AutomatedTesting/Levels/Physics/Material_RagdollBones/ragdoll_concrete/rin_physics.animgraph similarity index 100% rename from AutomatedTesting/Levels/Physics/C4925580_Material_RagdollBonesMaterial/ragdoll_concrete/rin_physics.animgraph rename to AutomatedTesting/Levels/Physics/Material_RagdollBones/ragdoll_concrete/rin_physics.animgraph diff --git a/AutomatedTesting/Levels/Physics/C4925580_Material_RagdollBonesMaterial/ragdoll_concrete/rin_skeleton_newgeo.fbx b/AutomatedTesting/Levels/Physics/Material_RagdollBones/ragdoll_concrete/rin_skeleton_newgeo.fbx similarity index 100% rename from AutomatedTesting/Levels/Physics/C4925580_Material_RagdollBonesMaterial/ragdoll_concrete/rin_skeleton_newgeo.fbx rename to AutomatedTesting/Levels/Physics/Material_RagdollBones/ragdoll_concrete/rin_skeleton_newgeo.fbx diff --git a/AutomatedTesting/Levels/Physics/C4925580_Material_RagdollBonesMaterial/ragdoll_concrete/rin_skeleton_newgeo.fbx.assetinfo b/AutomatedTesting/Levels/Physics/Material_RagdollBones/ragdoll_concrete/rin_skeleton_newgeo.fbx.assetinfo similarity index 100% rename from AutomatedTesting/Levels/Physics/C4925580_Material_RagdollBonesMaterial/ragdoll_concrete/rin_skeleton_newgeo.fbx.assetinfo rename to AutomatedTesting/Levels/Physics/Material_RagdollBones/ragdoll_concrete/rin_skeleton_newgeo.fbx.assetinfo diff --git a/AutomatedTesting/Levels/Physics/C4925580_Material_RagdollBonesMaterial/ragdoll_concrete/rin_skeleton_newgeo.mtl b/AutomatedTesting/Levels/Physics/Material_RagdollBones/ragdoll_concrete/rin_skeleton_newgeo.mtl similarity index 100% rename from AutomatedTesting/Levels/Physics/C4925580_Material_RagdollBonesMaterial/ragdoll_concrete/rin_skeleton_newgeo.mtl rename to AutomatedTesting/Levels/Physics/Material_RagdollBones/ragdoll_concrete/rin_skeleton_newgeo.mtl diff --git a/AutomatedTesting/Levels/Physics/C4925582_Material_AddModifyDeleteOnRagdollBones/ragdoll_default/AnimGraphPhysX.animgraph b/AutomatedTesting/Levels/Physics/Material_RagdollBones/ragdoll_rubber/AnimGraphPhysX.animgraph similarity index 100% rename from AutomatedTesting/Levels/Physics/C4925582_Material_AddModifyDeleteOnRagdollBones/ragdoll_default/AnimGraphPhysX.animgraph rename to AutomatedTesting/Levels/Physics/Material_RagdollBones/ragdoll_rubber/AnimGraphPhysX.animgraph diff --git a/AutomatedTesting/Levels/Physics/C4925582_Material_AddModifyDeleteOnRagdollBones/ragdoll_modified/Red.tif b/AutomatedTesting/Levels/Physics/Material_RagdollBones/ragdoll_rubber/Red.tif similarity index 100% rename from AutomatedTesting/Levels/Physics/C4925582_Material_AddModifyDeleteOnRagdollBones/ragdoll_modified/Red.tif rename to AutomatedTesting/Levels/Physics/Material_RagdollBones/ragdoll_rubber/Red.tif diff --git a/AutomatedTesting/Levels/Physics/C4925582_Material_AddModifyDeleteOnRagdollBones/ragdoll_default/RinLocomotion.motionset b/AutomatedTesting/Levels/Physics/Material_RagdollBones/ragdoll_rubber/RinLocomotion.motionset similarity index 100% rename from AutomatedTesting/Levels/Physics/C4925582_Material_AddModifyDeleteOnRagdollBones/ragdoll_default/RinLocomotion.motionset rename to AutomatedTesting/Levels/Physics/Material_RagdollBones/ragdoll_rubber/RinLocomotion.motionset diff --git a/AutomatedTesting/Levels/Physics/C4925580_Material_RagdollBonesMaterial/ragdoll_rubber/rin_skeleton_newgeo.fbx b/AutomatedTesting/Levels/Physics/Material_RagdollBones/ragdoll_rubber/rin_skeleton_newgeo.fbx similarity index 100% rename from AutomatedTesting/Levels/Physics/C4925580_Material_RagdollBonesMaterial/ragdoll_rubber/rin_skeleton_newgeo.fbx rename to AutomatedTesting/Levels/Physics/Material_RagdollBones/ragdoll_rubber/rin_skeleton_newgeo.fbx diff --git a/AutomatedTesting/Levels/Physics/C4925580_Material_RagdollBonesMaterial/ragdoll_rubber/rin_skeleton_newgeo.fbx.assetinfo b/AutomatedTesting/Levels/Physics/Material_RagdollBones/ragdoll_rubber/rin_skeleton_newgeo.fbx.assetinfo similarity index 100% rename from AutomatedTesting/Levels/Physics/C4925580_Material_RagdollBonesMaterial/ragdoll_rubber/rin_skeleton_newgeo.fbx.assetinfo rename to AutomatedTesting/Levels/Physics/Material_RagdollBones/ragdoll_rubber/rin_skeleton_newgeo.fbx.assetinfo diff --git a/AutomatedTesting/Levels/Physics/C4925580_Material_RagdollBonesMaterial/ragdoll_rubber/rin_skeleton_newgeo.mtl b/AutomatedTesting/Levels/Physics/Material_RagdollBones/ragdoll_rubber/rin_skeleton_newgeo.mtl similarity index 100% rename from AutomatedTesting/Levels/Physics/C4925580_Material_RagdollBonesMaterial/ragdoll_rubber/rin_skeleton_newgeo.mtl rename to AutomatedTesting/Levels/Physics/Material_RagdollBones/ragdoll_rubber/rin_skeleton_newgeo.mtl diff --git a/AutomatedTesting/Levels/Physics/C4925580_Material_RagdollBonesMaterial/ragdoll_rubber/rubber.mtl b/AutomatedTesting/Levels/Physics/Material_RagdollBones/ragdoll_rubber/rubber.mtl similarity index 100% rename from AutomatedTesting/Levels/Physics/C4925580_Material_RagdollBonesMaterial/ragdoll_rubber/rubber.mtl rename to AutomatedTesting/Levels/Physics/Material_RagdollBones/ragdoll_rubber/rubber.mtl diff --git a/AutomatedTesting/Levels/Physics/C4976207_PhysXRigidBodies_KinematicBehavior/tags.txt b/AutomatedTesting/Levels/Physics/Material_RagdollBones/tags.txt similarity index 100% rename from AutomatedTesting/Levels/Physics/C4976207_PhysXRigidBodies_KinematicBehavior/tags.txt rename to AutomatedTesting/Levels/Physics/Material_RagdollBones/tags.txt diff --git a/AutomatedTesting/Levels/Physics/C4982798_Collider_ColliderRotationOffset/terrain/terrain.pxheightfield b/AutomatedTesting/Levels/Physics/Material_RagdollBones/terrain/terrain.pxheightfield similarity index 100% rename from AutomatedTesting/Levels/Physics/C4982798_Collider_ColliderRotationOffset/terrain/terrain.pxheightfield rename to AutomatedTesting/Levels/Physics/Material_RagdollBones/terrain/terrain.pxheightfield diff --git a/AutomatedTesting/Levels/Physics/C4976210_COM_ManualSetting/terraintexture.pak b/AutomatedTesting/Levels/Physics/Material_RagdollBones/terraintexture.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C4976210_COM_ManualSetting/terraintexture.pak rename to AutomatedTesting/Levels/Physics/Material_RagdollBones/terraintexture.pak diff --git a/AutomatedTesting/Levels/Physics/C4044461_Material_Restitution/C4044461_Material_Restitution.ly b/AutomatedTesting/Levels/Physics/Material_Restitution/Material_Restitution.ly similarity index 100% rename from AutomatedTesting/Levels/Physics/C4044461_Material_Restitution/C4044461_Material_Restitution.ly rename to AutomatedTesting/Levels/Physics/Material_Restitution/Material_Restitution.ly diff --git a/AutomatedTesting/Levels/Physics/C4044457_Material_RestitutionCombine/filelist.xml b/AutomatedTesting/Levels/Physics/Material_Restitution/filelist.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C4044457_Material_RestitutionCombine/filelist.xml rename to AutomatedTesting/Levels/Physics/Material_Restitution/filelist.xml diff --git a/AutomatedTesting/Levels/Physics/C4044457_Material_RestitutionCombine/level.pak b/AutomatedTesting/Levels/Physics/Material_Restitution/level.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C4044457_Material_RestitutionCombine/level.pak rename to AutomatedTesting/Levels/Physics/Material_Restitution/level.pak diff --git a/AutomatedTesting/Levels/Physics/C4976209_RigidBody_ComputesCOM/leveldata/Environment.xml b/AutomatedTesting/Levels/Physics/Material_Restitution/leveldata/Environment.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C4976209_RigidBody_ComputesCOM/leveldata/Environment.xml rename to AutomatedTesting/Levels/Physics/Material_Restitution/leveldata/Environment.xml diff --git a/AutomatedTesting/Levels/Physics/C4925579_Material_AddModifyDeleteOnTerrain/leveldata/GameTokens.xml b/AutomatedTesting/Levels/Physics/Material_Restitution/leveldata/GameTokens.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C4925579_Material_AddModifyDeleteOnTerrain/leveldata/GameTokens.xml rename to AutomatedTesting/Levels/Physics/Material_Restitution/leveldata/GameTokens.xml diff --git a/AutomatedTesting/Levels/Physics/C4044457_Material_RestitutionCombine/leveldata/TerrainTexture.xml b/AutomatedTesting/Levels/Physics/Material_Restitution/leveldata/TerrainTexture.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C4044457_Material_RestitutionCombine/leveldata/TerrainTexture.xml rename to AutomatedTesting/Levels/Physics/Material_Restitution/leveldata/TerrainTexture.xml diff --git a/AutomatedTesting/Levels/Physics/C4976199_RigidBodies_LinearDampingObjectMotion/leveldata/TimeOfDay.xml b/AutomatedTesting/Levels/Physics/Material_Restitution/leveldata/TimeOfDay.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C4976199_RigidBodies_LinearDampingObjectMotion/leveldata/TimeOfDay.xml rename to AutomatedTesting/Levels/Physics/Material_Restitution/leveldata/TimeOfDay.xml diff --git a/AutomatedTesting/Levels/Physics/C4976210_COM_ManualSetting/leveldata/VegetationMap.dat b/AutomatedTesting/Levels/Physics/Material_Restitution/leveldata/VegetationMap.dat similarity index 100% rename from AutomatedTesting/Levels/Physics/C4976210_COM_ManualSetting/leveldata/VegetationMap.dat rename to AutomatedTesting/Levels/Physics/Material_Restitution/leveldata/VegetationMap.dat diff --git a/AutomatedTesting/Levels/Physics/C4044461_Material_Restitution/restitution.physmaterial b/AutomatedTesting/Levels/Physics/Material_Restitution/restitution.physmaterial similarity index 100% rename from AutomatedTesting/Levels/Physics/C4044461_Material_Restitution/restitution.physmaterial rename to AutomatedTesting/Levels/Physics/Material_Restitution/restitution.physmaterial diff --git a/AutomatedTesting/Levels/Physics/C4976209_RigidBody_ComputesCOM/tags.txt b/AutomatedTesting/Levels/Physics/Material_Restitution/tags.txt similarity index 100% rename from AutomatedTesting/Levels/Physics/C4976209_RigidBody_ComputesCOM/tags.txt rename to AutomatedTesting/Levels/Physics/Material_Restitution/tags.txt diff --git a/AutomatedTesting/Levels/Physics/C4976218_RigidBodies_InertiaObjectNotComputed/terraintexture.pak b/AutomatedTesting/Levels/Physics/Material_Restitution/terraintexture.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C4976218_RigidBodies_InertiaObjectNotComputed/terraintexture.pak rename to AutomatedTesting/Levels/Physics/Material_Restitution/terraintexture.pak diff --git a/AutomatedTesting/Levels/Physics/C4044457_Material_RestitutionCombine/C4044457_Material_RestitutionCombine.ly b/AutomatedTesting/Levels/Physics/Material_RestitutionCombine/Material_RestitutionCombine.ly similarity index 100% rename from AutomatedTesting/Levels/Physics/C4044457_Material_RestitutionCombine/C4044457_Material_RestitutionCombine.ly rename to AutomatedTesting/Levels/Physics/Material_RestitutionCombine/Material_RestitutionCombine.ly diff --git a/AutomatedTesting/Levels/Physics/C4044459_Material_DynamicFriction/filelist.xml b/AutomatedTesting/Levels/Physics/Material_RestitutionCombine/filelist.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C4044459_Material_DynamicFriction/filelist.xml rename to AutomatedTesting/Levels/Physics/Material_RestitutionCombine/filelist.xml diff --git a/AutomatedTesting/Levels/Physics/C4044459_Material_DynamicFriction/level.pak b/AutomatedTesting/Levels/Physics/Material_RestitutionCombine/level.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C4044459_Material_DynamicFriction/level.pak rename to AutomatedTesting/Levels/Physics/Material_RestitutionCombine/level.pak diff --git a/AutomatedTesting/Levels/Physics/C4976210_COM_ManualSetting/leveldata/Environment.xml b/AutomatedTesting/Levels/Physics/Material_RestitutionCombine/leveldata/Environment.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C4976210_COM_ManualSetting/leveldata/Environment.xml rename to AutomatedTesting/Levels/Physics/Material_RestitutionCombine/leveldata/Environment.xml diff --git a/AutomatedTesting/Levels/Physics/C4925580_Material_RagdollBonesMaterial/leveldata/GameTokens.xml b/AutomatedTesting/Levels/Physics/Material_RestitutionCombine/leveldata/GameTokens.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C4925580_Material_RagdollBonesMaterial/leveldata/GameTokens.xml rename to AutomatedTesting/Levels/Physics/Material_RestitutionCombine/leveldata/GameTokens.xml diff --git a/AutomatedTesting/Levels/Physics/C4044459_Material_DynamicFriction/leveldata/TerrainTexture.xml b/AutomatedTesting/Levels/Physics/Material_RestitutionCombine/leveldata/TerrainTexture.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C4044459_Material_DynamicFriction/leveldata/TerrainTexture.xml rename to AutomatedTesting/Levels/Physics/Material_RestitutionCombine/leveldata/TerrainTexture.xml diff --git a/AutomatedTesting/Levels/Physics/C4976200_RigidBody_AngularDampingObjectRotation/leveldata/TimeOfDay.xml b/AutomatedTesting/Levels/Physics/Material_RestitutionCombine/leveldata/TimeOfDay.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C4976200_RigidBody_AngularDampingObjectRotation/leveldata/TimeOfDay.xml rename to AutomatedTesting/Levels/Physics/Material_RestitutionCombine/leveldata/TimeOfDay.xml diff --git a/AutomatedTesting/Levels/Physics/C4976218_RigidBodies_InertiaObjectNotComputed/leveldata/VegetationMap.dat b/AutomatedTesting/Levels/Physics/Material_RestitutionCombine/leveldata/VegetationMap.dat similarity index 100% rename from AutomatedTesting/Levels/Physics/C4976218_RigidBodies_InertiaObjectNotComputed/leveldata/VegetationMap.dat rename to AutomatedTesting/Levels/Physics/Material_RestitutionCombine/leveldata/VegetationMap.dat diff --git a/AutomatedTesting/Levels/Physics/C4044457_Material_RestitutionCombine/restitution_combine.physmaterial b/AutomatedTesting/Levels/Physics/Material_RestitutionCombine/restitution_combine.physmaterial similarity index 100% rename from AutomatedTesting/Levels/Physics/C4044457_Material_RestitutionCombine/restitution_combine.physmaterial rename to AutomatedTesting/Levels/Physics/Material_RestitutionCombine/restitution_combine.physmaterial diff --git a/AutomatedTesting/Levels/Physics/C4976210_COM_ManualSetting/tags.txt b/AutomatedTesting/Levels/Physics/Material_RestitutionCombine/tags.txt similarity index 100% rename from AutomatedTesting/Levels/Physics/C4976210_COM_ManualSetting/tags.txt rename to AutomatedTesting/Levels/Physics/Material_RestitutionCombine/tags.txt diff --git a/AutomatedTesting/Levels/Physics/C4976227_Collider_NewGroup/terraintexture.pak b/AutomatedTesting/Levels/Physics/Material_RestitutionCombine/terraintexture.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C4976227_Collider_NewGroup/terraintexture.pak rename to AutomatedTesting/Levels/Physics/Material_RestitutionCombine/terraintexture.pak diff --git a/AutomatedTesting/Levels/Physics/C18981526_Material_RestitutionCombinePriority/C18981526_Material_RestitutionCombinePriority.ly b/AutomatedTesting/Levels/Physics/Material_RestitutionCombinePriorityOrder/Material_RestitutionCombinePriorityOrder.ly similarity index 100% rename from AutomatedTesting/Levels/Physics/C18981526_Material_RestitutionCombinePriority/C18981526_Material_RestitutionCombinePriority.ly rename to AutomatedTesting/Levels/Physics/Material_RestitutionCombinePriorityOrder/Material_RestitutionCombinePriorityOrder.ly diff --git a/AutomatedTesting/Levels/Physics/C4044460_Material_StaticFriction/filelist.xml b/AutomatedTesting/Levels/Physics/Material_RestitutionCombinePriorityOrder/filelist.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C4044460_Material_StaticFriction/filelist.xml rename to AutomatedTesting/Levels/Physics/Material_RestitutionCombinePriorityOrder/filelist.xml diff --git a/AutomatedTesting/Levels/Physics/C4044460_Material_StaticFriction/level.pak b/AutomatedTesting/Levels/Physics/Material_RestitutionCombinePriorityOrder/level.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C4044460_Material_StaticFriction/level.pak rename to AutomatedTesting/Levels/Physics/Material_RestitutionCombinePriorityOrder/level.pak diff --git a/AutomatedTesting/Levels/Physics/C4976218_RigidBodies_InertiaObjectNotComputed/leveldata/Environment.xml b/AutomatedTesting/Levels/Physics/Material_RestitutionCombinePriorityOrder/leveldata/Environment.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C4976218_RigidBodies_InertiaObjectNotComputed/leveldata/Environment.xml rename to AutomatedTesting/Levels/Physics/Material_RestitutionCombinePriorityOrder/leveldata/Environment.xml diff --git a/AutomatedTesting/Levels/Physics/C4925582_Material_AddModifyDeleteOnRagdollBones/leveldata/GameTokens.xml b/AutomatedTesting/Levels/Physics/Material_RestitutionCombinePriorityOrder/leveldata/GameTokens.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C4925582_Material_AddModifyDeleteOnRagdollBones/leveldata/GameTokens.xml rename to AutomatedTesting/Levels/Physics/Material_RestitutionCombinePriorityOrder/leveldata/GameTokens.xml diff --git a/AutomatedTesting/Levels/Physics/C4044460_Material_StaticFriction/leveldata/TerrainTexture.xml b/AutomatedTesting/Levels/Physics/Material_RestitutionCombinePriorityOrder/leveldata/TerrainTexture.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C4044460_Material_StaticFriction/leveldata/TerrainTexture.xml rename to AutomatedTesting/Levels/Physics/Material_RestitutionCombinePriorityOrder/leveldata/TerrainTexture.xml diff --git a/AutomatedTesting/Levels/Physics/C4976201_RigidBody_MassIsAssigned/leveldata/TimeOfDay.xml b/AutomatedTesting/Levels/Physics/Material_RestitutionCombinePriorityOrder/leveldata/TimeOfDay.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C4976201_RigidBody_MassIsAssigned/leveldata/TimeOfDay.xml rename to AutomatedTesting/Levels/Physics/Material_RestitutionCombinePriorityOrder/leveldata/TimeOfDay.xml diff --git a/AutomatedTesting/Levels/Physics/C4976227_Collider_NewGroup/leveldata/VegetationMap.dat b/AutomatedTesting/Levels/Physics/Material_RestitutionCombinePriorityOrder/leveldata/VegetationMap.dat similarity index 100% rename from AutomatedTesting/Levels/Physics/C4976227_Collider_NewGroup/leveldata/VegetationMap.dat rename to AutomatedTesting/Levels/Physics/Material_RestitutionCombinePriorityOrder/leveldata/VegetationMap.dat diff --git a/AutomatedTesting/Levels/Physics/C18981526_Material_RestitutionCombinePriority/restitution_combine.physmaterial b/AutomatedTesting/Levels/Physics/Material_RestitutionCombinePriorityOrder/restitution_combine.physmaterial similarity index 100% rename from AutomatedTesting/Levels/Physics/C18981526_Material_RestitutionCombinePriority/restitution_combine.physmaterial rename to AutomatedTesting/Levels/Physics/Material_RestitutionCombinePriorityOrder/restitution_combine.physmaterial diff --git a/AutomatedTesting/Levels/Physics/C4976218_RigidBodies_InertiaObjectNotComputed/tags.txt b/AutomatedTesting/Levels/Physics/Material_RestitutionCombinePriorityOrder/tags.txt similarity index 100% rename from AutomatedTesting/Levels/Physics/C4976218_RigidBodies_InertiaObjectNotComputed/tags.txt rename to AutomatedTesting/Levels/Physics/Material_RestitutionCombinePriorityOrder/tags.txt diff --git a/AutomatedTesting/Levels/Physics/C4976242_Collision_SameCollisionlayerSameCollisiongroup/terraintexture.pak b/AutomatedTesting/Levels/Physics/Material_RestitutionCombinePriorityOrder/terraintexture.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C4976242_Collision_SameCollisionlayerSameCollisiongroup/terraintexture.pak rename to AutomatedTesting/Levels/Physics/Material_RestitutionCombinePriorityOrder/terraintexture.pak diff --git a/AutomatedTesting/Levels/Physics/C4044460_Material_StaticFriction/C4044460_Material_StaticFriction.ly b/AutomatedTesting/Levels/Physics/Material_StaticFriction/Material_StaticFriction.ly similarity index 100% rename from AutomatedTesting/Levels/Physics/C4044460_Material_StaticFriction/C4044460_Material_StaticFriction.ly rename to AutomatedTesting/Levels/Physics/Material_StaticFriction/Material_StaticFriction.ly diff --git a/AutomatedTesting/Levels/Physics/C4044461_Material_Restitution/filelist.xml b/AutomatedTesting/Levels/Physics/Material_StaticFriction/filelist.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C4044461_Material_Restitution/filelist.xml rename to AutomatedTesting/Levels/Physics/Material_StaticFriction/filelist.xml diff --git a/AutomatedTesting/Levels/Physics/C4044461_Material_Restitution/level.pak b/AutomatedTesting/Levels/Physics/Material_StaticFriction/level.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C4044461_Material_Restitution/level.pak rename to AutomatedTesting/Levels/Physics/Material_StaticFriction/level.pak diff --git a/AutomatedTesting/Levels/Physics/C4976227_Collider_NewGroup/leveldata/Environment.xml b/AutomatedTesting/Levels/Physics/Material_StaticFriction/leveldata/Environment.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C4976227_Collider_NewGroup/leveldata/Environment.xml rename to AutomatedTesting/Levels/Physics/Material_StaticFriction/leveldata/Environment.xml diff --git a/AutomatedTesting/Levels/Physics/C4976197_RigidBodies_InitialAngularVelocity/leveldata/GameTokens.xml b/AutomatedTesting/Levels/Physics/Material_StaticFriction/leveldata/GameTokens.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C4976197_RigidBodies_InitialAngularVelocity/leveldata/GameTokens.xml rename to AutomatedTesting/Levels/Physics/Material_StaticFriction/leveldata/GameTokens.xml diff --git a/AutomatedTesting/Levels/Physics/C4044461_Material_Restitution/leveldata/TerrainTexture.xml b/AutomatedTesting/Levels/Physics/Material_StaticFriction/leveldata/TerrainTexture.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C4044461_Material_Restitution/leveldata/TerrainTexture.xml rename to AutomatedTesting/Levels/Physics/Material_StaticFriction/leveldata/TerrainTexture.xml diff --git a/AutomatedTesting/Levels/Physics/C4976202_RigidBody_StopsWhenBelowKineticThreshold/leveldata/TimeOfDay.xml b/AutomatedTesting/Levels/Physics/Material_StaticFriction/leveldata/TimeOfDay.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C4976202_RigidBody_StopsWhenBelowKineticThreshold/leveldata/TimeOfDay.xml rename to AutomatedTesting/Levels/Physics/Material_StaticFriction/leveldata/TimeOfDay.xml diff --git a/AutomatedTesting/Levels/Physics/C4976242_Collision_SameCollisionlayerSameCollisiongroup/leveldata/VegetationMap.dat b/AutomatedTesting/Levels/Physics/Material_StaticFriction/leveldata/VegetationMap.dat similarity index 100% rename from AutomatedTesting/Levels/Physics/C4976242_Collision_SameCollisionlayerSameCollisiongroup/leveldata/VegetationMap.dat rename to AutomatedTesting/Levels/Physics/Material_StaticFriction/leveldata/VegetationMap.dat diff --git a/AutomatedTesting/Levels/Physics/C4044460_Material_StaticFriction/staticfriction.physmaterial b/AutomatedTesting/Levels/Physics/Material_StaticFriction/staticfriction.physmaterial similarity index 100% rename from AutomatedTesting/Levels/Physics/C4044460_Material_StaticFriction/staticfriction.physmaterial rename to AutomatedTesting/Levels/Physics/Material_StaticFriction/staticfriction.physmaterial diff --git a/AutomatedTesting/Levels/Physics/C4976227_Collider_NewGroup/tags.txt b/AutomatedTesting/Levels/Physics/Material_StaticFriction/tags.txt similarity index 100% rename from AutomatedTesting/Levels/Physics/C4976227_Collider_NewGroup/tags.txt rename to AutomatedTesting/Levels/Physics/Material_StaticFriction/tags.txt diff --git a/AutomatedTesting/Levels/Physics/C4976243_Collision_SameCollisionGroupDiffCollisionLayers/terraintexture.pak b/AutomatedTesting/Levels/Physics/Material_StaticFriction/terraintexture.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C4976243_Collision_SameCollisionGroupDiffCollisionLayers/terraintexture.pak rename to AutomatedTesting/Levels/Physics/Material_StaticFriction/terraintexture.pak diff --git a/AutomatedTesting/Levels/Physics/Physics_DynamicSliceWithPhysNotSpawnsStaticSlice/Physics_DynamicSliceWithPhysNotSpawnsStaticSlice.ly b/AutomatedTesting/Levels/Physics/Physics_DynamicSliceWithPhysNotSpawnsStaticSlice/Physics_DynamicSliceWithPhysNotSpawnsStaticSlice.ly new file mode 100644 index 0000000000..25c46d7f2f --- /dev/null +++ b/AutomatedTesting/Levels/Physics/Physics_DynamicSliceWithPhysNotSpawnsStaticSlice/Physics_DynamicSliceWithPhysNotSpawnsStaticSlice.ly @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e479e88c4f5ac7ebfb7e75ebd1555e05bfe9b731062bcf4463fb8221047aed36 +size 3091 diff --git a/AutomatedTesting/Levels/Physics/C6131473_StaticSlice_OnDynamicSliceSpawn/RigidBody.slice b/AutomatedTesting/Levels/Physics/Physics_DynamicSliceWithPhysNotSpawnsStaticSlice/RigidBody.slice similarity index 100% rename from AutomatedTesting/Levels/Physics/C6131473_StaticSlice_OnDynamicSliceSpawn/RigidBody.slice rename to AutomatedTesting/Levels/Physics/Physics_DynamicSliceWithPhysNotSpawnsStaticSlice/RigidBody.slice diff --git a/AutomatedTesting/Levels/Physics/C6131473_StaticSlice_OnDynamicSliceSpawn/filelist.xml b/AutomatedTesting/Levels/Physics/Physics_DynamicSliceWithPhysNotSpawnsStaticSlice/filelist.xml similarity index 68% rename from AutomatedTesting/Levels/Physics/C6131473_StaticSlice_OnDynamicSliceSpawn/filelist.xml rename to AutomatedTesting/Levels/Physics/Physics_DynamicSliceWithPhysNotSpawnsStaticSlice/filelist.xml index f3d1b3fa90..d0f6ec9ff4 100644 --- a/AutomatedTesting/Levels/Physics/C6131473_StaticSlice_OnDynamicSliceSpawn/filelist.xml +++ b/AutomatedTesting/Levels/Physics/Physics_DynamicSliceWithPhysNotSpawnsStaticSlice/filelist.xml @@ -1,4 +1,4 @@ - + diff --git a/AutomatedTesting/Levels/Physics/C6131473_StaticSlice_OnDynamicSliceSpawn/level.pak b/AutomatedTesting/Levels/Physics/Physics_DynamicSliceWithPhysNotSpawnsStaticSlice/level.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C6131473_StaticSlice_OnDynamicSliceSpawn/level.pak rename to AutomatedTesting/Levels/Physics/Physics_DynamicSliceWithPhysNotSpawnsStaticSlice/level.pak diff --git a/AutomatedTesting/Levels/Physics/C4976242_Collision_SameCollisionlayerSameCollisiongroup/leveldata/Environment.xml b/AutomatedTesting/Levels/Physics/Physics_DynamicSliceWithPhysNotSpawnsStaticSlice/leveldata/Environment.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C4976242_Collision_SameCollisionlayerSameCollisiongroup/leveldata/Environment.xml rename to AutomatedTesting/Levels/Physics/Physics_DynamicSliceWithPhysNotSpawnsStaticSlice/leveldata/Environment.xml diff --git a/AutomatedTesting/Levels/Physics/C4976200_RigidBody_AngularDampingObjectRotation/leveldata/GameTokens.xml b/AutomatedTesting/Levels/Physics/Physics_DynamicSliceWithPhysNotSpawnsStaticSlice/leveldata/GameTokens.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C4976200_RigidBody_AngularDampingObjectRotation/leveldata/GameTokens.xml rename to AutomatedTesting/Levels/Physics/Physics_DynamicSliceWithPhysNotSpawnsStaticSlice/leveldata/GameTokens.xml diff --git a/AutomatedTesting/Levels/Physics/C4044697_Material_PerfaceMaterialValidation/leveldata/TerrainTexture.xml b/AutomatedTesting/Levels/Physics/Physics_DynamicSliceWithPhysNotSpawnsStaticSlice/leveldata/TerrainTexture.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C4044697_Material_PerfaceMaterialValidation/leveldata/TerrainTexture.xml rename to AutomatedTesting/Levels/Physics/Physics_DynamicSliceWithPhysNotSpawnsStaticSlice/leveldata/TerrainTexture.xml diff --git a/AutomatedTesting/Levels/Physics/C4976204_Verify_Start_Asleep_Condition/leveldata/TimeOfDay.xml b/AutomatedTesting/Levels/Physics/Physics_DynamicSliceWithPhysNotSpawnsStaticSlice/leveldata/TimeOfDay.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C4976204_Verify_Start_Asleep_Condition/leveldata/TimeOfDay.xml rename to AutomatedTesting/Levels/Physics/Physics_DynamicSliceWithPhysNotSpawnsStaticSlice/leveldata/TimeOfDay.xml diff --git a/AutomatedTesting/Levels/Physics/C4976243_Collision_SameCollisionGroupDiffCollisionLayers/leveldata/VegetationMap.dat b/AutomatedTesting/Levels/Physics/Physics_DynamicSliceWithPhysNotSpawnsStaticSlice/leveldata/VegetationMap.dat similarity index 100% rename from AutomatedTesting/Levels/Physics/C4976243_Collision_SameCollisionGroupDiffCollisionLayers/leveldata/VegetationMap.dat rename to AutomatedTesting/Levels/Physics/Physics_DynamicSliceWithPhysNotSpawnsStaticSlice/leveldata/VegetationMap.dat diff --git a/AutomatedTesting/Levels/Physics/C4976242_Collision_SameCollisionlayerSameCollisiongroup/tags.txt b/AutomatedTesting/Levels/Physics/Physics_DynamicSliceWithPhysNotSpawnsStaticSlice/tags.txt similarity index 100% rename from AutomatedTesting/Levels/Physics/C4976242_Collision_SameCollisionlayerSameCollisiongroup/tags.txt rename to AutomatedTesting/Levels/Physics/Physics_DynamicSliceWithPhysNotSpawnsStaticSlice/tags.txt diff --git a/AutomatedTesting/Levels/Physics/C4976244_Collider_SameGroupSameLayerCollision/terraintexture.pak b/AutomatedTesting/Levels/Physics/Physics_DynamicSliceWithPhysNotSpawnsStaticSlice/terraintexture.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C4976244_Collider_SameGroupSameLayerCollision/terraintexture.pak rename to AutomatedTesting/Levels/Physics/Physics_DynamicSliceWithPhysNotSpawnsStaticSlice/terraintexture.pak diff --git a/AutomatedTesting/Levels/Physics/C15425929_Undo_Redo/C15425929_Undo_Redo.ly b/AutomatedTesting/Levels/Physics/Physics_UndoRedoWorksOnEntityWithPhysComponents/Physics_UndoRedoWorksOnEntityWithPhysComponents.ly similarity index 100% rename from AutomatedTesting/Levels/Physics/C15425929_Undo_Redo/C15425929_Undo_Redo.ly rename to AutomatedTesting/Levels/Physics/Physics_UndoRedoWorksOnEntityWithPhysComponents/Physics_UndoRedoWorksOnEntityWithPhysComponents.ly diff --git a/AutomatedTesting/Levels/Physics/C15425929_Undo_Redo/filelist.xml b/AutomatedTesting/Levels/Physics/Physics_UndoRedoWorksOnEntityWithPhysComponents/filelist.xml similarity index 69% rename from AutomatedTesting/Levels/Physics/C15425929_Undo_Redo/filelist.xml rename to AutomatedTesting/Levels/Physics/Physics_UndoRedoWorksOnEntityWithPhysComponents/filelist.xml index 663cddccf7..d797080487 100644 --- a/AutomatedTesting/Levels/Physics/C15425929_Undo_Redo/filelist.xml +++ b/AutomatedTesting/Levels/Physics/Physics_UndoRedoWorksOnEntityWithPhysComponents/filelist.xml @@ -1,4 +1,4 @@ - + diff --git a/AutomatedTesting/Levels/Physics/C15425929_Undo_Redo/level.pak b/AutomatedTesting/Levels/Physics/Physics_UndoRedoWorksOnEntityWithPhysComponents/level.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C15425929_Undo_Redo/level.pak rename to AutomatedTesting/Levels/Physics/Physics_UndoRedoWorksOnEntityWithPhysComponents/level.pak diff --git a/AutomatedTesting/Levels/Physics/C4976243_Collision_SameCollisionGroupDiffCollisionLayers/leveldata/Environment.xml b/AutomatedTesting/Levels/Physics/Physics_UndoRedoWorksOnEntityWithPhysComponents/leveldata/Environment.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C4976243_Collision_SameCollisionGroupDiffCollisionLayers/leveldata/Environment.xml rename to AutomatedTesting/Levels/Physics/Physics_UndoRedoWorksOnEntityWithPhysComponents/leveldata/Environment.xml diff --git a/AutomatedTesting/Levels/Physics/C4976201_RigidBody_MassIsAssigned/leveldata/GameTokens.xml b/AutomatedTesting/Levels/Physics/Physics_UndoRedoWorksOnEntityWithPhysComponents/leveldata/GameTokens.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C4976201_RigidBody_MassIsAssigned/leveldata/GameTokens.xml rename to AutomatedTesting/Levels/Physics/Physics_UndoRedoWorksOnEntityWithPhysComponents/leveldata/GameTokens.xml diff --git a/AutomatedTesting/Levels/Physics/C4982798_Collider_ColliderRotationOffset/leveldata/TerrainTexture.xml b/AutomatedTesting/Levels/Physics/Physics_UndoRedoWorksOnEntityWithPhysComponents/leveldata/TerrainTexture.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C4982798_Collider_ColliderRotationOffset/leveldata/TerrainTexture.xml rename to AutomatedTesting/Levels/Physics/Physics_UndoRedoWorksOnEntityWithPhysComponents/leveldata/TerrainTexture.xml diff --git a/AutomatedTesting/Levels/Physics/C4976207_PhysXRigidBodies_KinematicBehavior/leveldata/TimeOfDay.xml b/AutomatedTesting/Levels/Physics/Physics_UndoRedoWorksOnEntityWithPhysComponents/leveldata/TimeOfDay.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C4976207_PhysXRigidBodies_KinematicBehavior/leveldata/TimeOfDay.xml rename to AutomatedTesting/Levels/Physics/Physics_UndoRedoWorksOnEntityWithPhysComponents/leveldata/TimeOfDay.xml diff --git a/AutomatedTesting/Levels/Physics/C4976244_Collider_SameGroupSameLayerCollision/leveldata/VegetationMap.dat b/AutomatedTesting/Levels/Physics/Physics_UndoRedoWorksOnEntityWithPhysComponents/leveldata/VegetationMap.dat similarity index 100% rename from AutomatedTesting/Levels/Physics/C4976244_Collider_SameGroupSameLayerCollision/leveldata/VegetationMap.dat rename to AutomatedTesting/Levels/Physics/Physics_UndoRedoWorksOnEntityWithPhysComponents/leveldata/VegetationMap.dat diff --git a/AutomatedTesting/Levels/Physics/C4976243_Collision_SameCollisionGroupDiffCollisionLayers/tags.txt b/AutomatedTesting/Levels/Physics/Physics_UndoRedoWorksOnEntityWithPhysComponents/tags.txt similarity index 100% rename from AutomatedTesting/Levels/Physics/C4976243_Collision_SameCollisionGroupDiffCollisionLayers/tags.txt rename to AutomatedTesting/Levels/Physics/Physics_UndoRedoWorksOnEntityWithPhysComponents/tags.txt diff --git a/AutomatedTesting/Levels/Physics/C4976245_PhysxCollider_CollisionLayerTest/terraintexture.pak b/AutomatedTesting/Levels/Physics/Physics_UndoRedoWorksOnEntityWithPhysComponents/terraintexture.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C4976245_PhysxCollider_CollisionLayerTest/terraintexture.pak rename to AutomatedTesting/Levels/Physics/Physics_UndoRedoWorksOnEntityWithPhysComponents/terraintexture.pak diff --git a/AutomatedTesting/Levels/Physics/C5689529_Verify_Terrain_RigidBody_Collider_Mesh/C5689529_Verify_Terrain_RigidBody_Collider_Mesh.ly b/AutomatedTesting/Levels/Physics/Physics_VerifyColliderRigidBodyMeshAndTerrainWorkTogether/Physics_VerifyColliderRigidBodyMeshAndTerrainWorkTogether.ly similarity index 100% rename from AutomatedTesting/Levels/Physics/C5689529_Verify_Terrain_RigidBody_Collider_Mesh/C5689529_Verify_Terrain_RigidBody_Collider_Mesh.ly rename to AutomatedTesting/Levels/Physics/Physics_VerifyColliderRigidBodyMeshAndTerrainWorkTogether/Physics_VerifyColliderRigidBodyMeshAndTerrainWorkTogether.ly diff --git a/AutomatedTesting/Levels/Physics/C5689529_Verify_Terrain_RigidBody_Collider_Mesh/filelist.xml b/AutomatedTesting/Levels/Physics/Physics_VerifyColliderRigidBodyMeshAndTerrainWorkTogether/filelist.xml similarity index 66% rename from AutomatedTesting/Levels/Physics/C5689529_Verify_Terrain_RigidBody_Collider_Mesh/filelist.xml rename to AutomatedTesting/Levels/Physics/Physics_VerifyColliderRigidBodyMeshAndTerrainWorkTogether/filelist.xml index 4d9ef56440..bd095b90f5 100644 --- a/AutomatedTesting/Levels/Physics/C5689529_Verify_Terrain_RigidBody_Collider_Mesh/filelist.xml +++ b/AutomatedTesting/Levels/Physics/Physics_VerifyColliderRigidBodyMeshAndTerrainWorkTogether/filelist.xml @@ -1,4 +1,4 @@ - + diff --git a/AutomatedTesting/Levels/Physics/C5689529_Verify_Terrain_RigidBody_Collider_Mesh/level.pak b/AutomatedTesting/Levels/Physics/Physics_VerifyColliderRigidBodyMeshAndTerrainWorkTogether/level.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C5689529_Verify_Terrain_RigidBody_Collider_Mesh/level.pak rename to AutomatedTesting/Levels/Physics/Physics_VerifyColliderRigidBodyMeshAndTerrainWorkTogether/level.pak diff --git a/AutomatedTesting/Levels/Physics/C4976244_Collider_SameGroupSameLayerCollision/leveldata/Environment.xml b/AutomatedTesting/Levels/Physics/Physics_VerifyColliderRigidBodyMeshAndTerrainWorkTogether/leveldata/Environment.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C4976244_Collider_SameGroupSameLayerCollision/leveldata/Environment.xml rename to AutomatedTesting/Levels/Physics/Physics_VerifyColliderRigidBodyMeshAndTerrainWorkTogether/leveldata/Environment.xml diff --git a/AutomatedTesting/Levels/Physics/C4976202_RigidBody_StopsWhenBelowKineticThreshold/leveldata/GameTokens.xml b/AutomatedTesting/Levels/Physics/Physics_VerifyColliderRigidBodyMeshAndTerrainWorkTogether/leveldata/GameTokens.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C4976202_RigidBody_StopsWhenBelowKineticThreshold/leveldata/GameTokens.xml rename to AutomatedTesting/Levels/Physics/Physics_VerifyColliderRigidBodyMeshAndTerrainWorkTogether/leveldata/GameTokens.xml diff --git a/AutomatedTesting/Levels/Physics/C4888315_Material_AddModifyDeleteOnCollider/leveldata/TerrainTexture.xml b/AutomatedTesting/Levels/Physics/Physics_VerifyColliderRigidBodyMeshAndTerrainWorkTogether/leveldata/TerrainTexture.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C4888315_Material_AddModifyDeleteOnCollider/leveldata/TerrainTexture.xml rename to AutomatedTesting/Levels/Physics/Physics_VerifyColliderRigidBodyMeshAndTerrainWorkTogether/leveldata/TerrainTexture.xml diff --git a/AutomatedTesting/Levels/Physics/C4976209_RigidBody_ComputesCOM/leveldata/TimeOfDay.xml b/AutomatedTesting/Levels/Physics/Physics_VerifyColliderRigidBodyMeshAndTerrainWorkTogether/leveldata/TimeOfDay.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C4976209_RigidBody_ComputesCOM/leveldata/TimeOfDay.xml rename to AutomatedTesting/Levels/Physics/Physics_VerifyColliderRigidBodyMeshAndTerrainWorkTogether/leveldata/TimeOfDay.xml diff --git a/AutomatedTesting/Levels/Physics/C4976245_PhysxCollider_CollisionLayerTest/leveldata/VegetationMap.dat b/AutomatedTesting/Levels/Physics/Physics_VerifyColliderRigidBodyMeshAndTerrainWorkTogether/leveldata/VegetationMap.dat similarity index 100% rename from AutomatedTesting/Levels/Physics/C4976245_PhysxCollider_CollisionLayerTest/leveldata/VegetationMap.dat rename to AutomatedTesting/Levels/Physics/Physics_VerifyColliderRigidBodyMeshAndTerrainWorkTogether/leveldata/VegetationMap.dat diff --git a/AutomatedTesting/Levels/Physics/C4976244_Collider_SameGroupSameLayerCollision/tags.txt b/AutomatedTesting/Levels/Physics/Physics_VerifyColliderRigidBodyMeshAndTerrainWorkTogether/tags.txt similarity index 100% rename from AutomatedTesting/Levels/Physics/C4976244_Collider_SameGroupSameLayerCollision/tags.txt rename to AutomatedTesting/Levels/Physics/Physics_VerifyColliderRigidBodyMeshAndTerrainWorkTogether/tags.txt diff --git a/AutomatedTesting/Levels/Physics/C4976199_RigidBodies_LinearDampingObjectMotion/terrain/terrain.pxheightfield b/AutomatedTesting/Levels/Physics/Physics_VerifyColliderRigidBodyMeshAndTerrainWorkTogether/terrain/terrain.pxheightfield similarity index 100% rename from AutomatedTesting/Levels/Physics/C4976199_RigidBodies_LinearDampingObjectMotion/terrain/terrain.pxheightfield rename to AutomatedTesting/Levels/Physics/Physics_VerifyColliderRigidBodyMeshAndTerrainWorkTogether/terrain/terrain.pxheightfield diff --git a/AutomatedTesting/Levels/Physics/C4982593_PhysxCollider_CollisionLayerTest/terraintexture.pak b/AutomatedTesting/Levels/Physics/Physics_VerifyColliderRigidBodyMeshAndTerrainWorkTogether/terraintexture.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C4982593_PhysxCollider_CollisionLayerTest/terraintexture.pak rename to AutomatedTesting/Levels/Physics/Physics_VerifyColliderRigidBodyMeshAndTerrainWorkTogether/terraintexture.pak diff --git a/AutomatedTesting/Levels/Physics/C5959761_ForceRegion_ExertsPointForce_Sedan/PhysXSedan/_dev_Sedan_r0-b.fbx b/AutomatedTesting/Levels/Physics/Physics_WorldBodyBusWorksOnEditorComponents/PhysXSedan/_dev_Sedan_r0-b.fbx similarity index 100% rename from AutomatedTesting/Levels/Physics/C5959761_ForceRegion_ExertsPointForce_Sedan/PhysXSedan/_dev_Sedan_r0-b.fbx rename to AutomatedTesting/Levels/Physics/Physics_WorldBodyBusWorksOnEditorComponents/PhysXSedan/_dev_Sedan_r0-b.fbx diff --git a/AutomatedTesting/Levels/Physics/C5959761_ForceRegion_ExertsPointForce_Sedan/PhysXSedan/_dev_sedan_r0-b.fbx.assetinfo b/AutomatedTesting/Levels/Physics/Physics_WorldBodyBusWorksOnEditorComponents/PhysXSedan/_dev_sedan_r0-b.fbx.assetinfo similarity index 100% rename from AutomatedTesting/Levels/Physics/C5959761_ForceRegion_ExertsPointForce_Sedan/PhysXSedan/_dev_sedan_r0-b.fbx.assetinfo rename to AutomatedTesting/Levels/Physics/Physics_WorldBodyBusWorksOnEditorComponents/PhysXSedan/_dev_sedan_r0-b.fbx.assetinfo diff --git a/AutomatedTesting/Levels/Physics/C5959761_ForceRegion_ExertsPointForce_Sedan/PhysXSedan/_dev_sedan_r0-b.mtl b/AutomatedTesting/Levels/Physics/Physics_WorldBodyBusWorksOnEditorComponents/PhysXSedan/_dev_sedan_r0-b.mtl similarity index 100% rename from AutomatedTesting/Levels/Physics/C5959761_ForceRegion_ExertsPointForce_Sedan/PhysXSedan/_dev_sedan_r0-b.mtl rename to AutomatedTesting/Levels/Physics/Physics_WorldBodyBusWorksOnEditorComponents/PhysXSedan/_dev_sedan_r0-b.mtl diff --git a/AutomatedTesting/Levels/Physics/C29032500_EditorComponents_WorldBodyBusWorks/C29032500_EditorComponents_WorldBodyBusWorks.ly b/AutomatedTesting/Levels/Physics/Physics_WorldBodyBusWorksOnEditorComponents/Physics_WorldBodyBusWorksOnEditorComponents.ly similarity index 100% rename from AutomatedTesting/Levels/Physics/C29032500_EditorComponents_WorldBodyBusWorks/C29032500_EditorComponents_WorldBodyBusWorks.ly rename to AutomatedTesting/Levels/Physics/Physics_WorldBodyBusWorksOnEditorComponents/Physics_WorldBodyBusWorksOnEditorComponents.ly diff --git a/AutomatedTesting/Levels/Physics/C29032500_EditorComponents_WorldBodyBusWorks/filelist.xml b/AutomatedTesting/Levels/Physics/Physics_WorldBodyBusWorksOnEditorComponents/filelist.xml similarity index 70% rename from AutomatedTesting/Levels/Physics/C29032500_EditorComponents_WorldBodyBusWorks/filelist.xml rename to AutomatedTesting/Levels/Physics/Physics_WorldBodyBusWorksOnEditorComponents/filelist.xml index 2ba204c714..72c3058f90 100644 --- a/AutomatedTesting/Levels/Physics/C29032500_EditorComponents_WorldBodyBusWorks/filelist.xml +++ b/AutomatedTesting/Levels/Physics/Physics_WorldBodyBusWorksOnEditorComponents/filelist.xml @@ -1,4 +1,4 @@ - + diff --git a/AutomatedTesting/Levels/Physics/C29032500_EditorComponents_WorldBodyBusWorks/level.pak b/AutomatedTesting/Levels/Physics/Physics_WorldBodyBusWorksOnEditorComponents/level.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C29032500_EditorComponents_WorldBodyBusWorks/level.pak rename to AutomatedTesting/Levels/Physics/Physics_WorldBodyBusWorksOnEditorComponents/level.pak diff --git a/AutomatedTesting/Levels/Physics/C5932045_ForceRegion_Spline/leveldata/Environment.xml b/AutomatedTesting/Levels/Physics/Physics_WorldBodyBusWorksOnEditorComponents/leveldata/Environment.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C5932045_ForceRegion_Spline/leveldata/Environment.xml rename to AutomatedTesting/Levels/Physics/Physics_WorldBodyBusWorksOnEditorComponents/leveldata/Environment.xml diff --git a/AutomatedTesting/Levels/Physics/C4976194_RigidBody_PhysXComponentIsValid/leveldata/TerrainTexture.xml b/AutomatedTesting/Levels/Physics/Physics_WorldBodyBusWorksOnEditorComponents/leveldata/TerrainTexture.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C4976194_RigidBody_PhysXComponentIsValid/leveldata/TerrainTexture.xml rename to AutomatedTesting/Levels/Physics/Physics_WorldBodyBusWorksOnEditorComponents/leveldata/TerrainTexture.xml diff --git a/AutomatedTesting/Levels/Physics/C4976210_COM_ManualSetting/leveldata/TimeOfDay.xml b/AutomatedTesting/Levels/Physics/Physics_WorldBodyBusWorksOnEditorComponents/leveldata/TimeOfDay.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C4976210_COM_ManualSetting/leveldata/TimeOfDay.xml rename to AutomatedTesting/Levels/Physics/Physics_WorldBodyBusWorksOnEditorComponents/leveldata/TimeOfDay.xml diff --git a/AutomatedTesting/Levels/Physics/C4982593_PhysxCollider_CollisionLayerTest/leveldata/VegetationMap.dat b/AutomatedTesting/Levels/Physics/Physics_WorldBodyBusWorksOnEditorComponents/leveldata/VegetationMap.dat similarity index 100% rename from AutomatedTesting/Levels/Physics/C4982593_PhysxCollider_CollisionLayerTest/leveldata/VegetationMap.dat rename to AutomatedTesting/Levels/Physics/Physics_WorldBodyBusWorksOnEditorComponents/leveldata/VegetationMap.dat diff --git a/AutomatedTesting/Levels/Physics/C4976245_PhysxCollider_CollisionLayerTest/tags.txt b/AutomatedTesting/Levels/Physics/Physics_WorldBodyBusWorksOnEditorComponents/tags.txt similarity index 100% rename from AutomatedTesting/Levels/Physics/C4976245_PhysxCollider_CollisionLayerTest/tags.txt rename to AutomatedTesting/Levels/Physics/Physics_WorldBodyBusWorksOnEditorComponents/tags.txt diff --git a/AutomatedTesting/Levels/Physics/C4982595_Collider_TriggerDisablesCollision/terraintexture.pak b/AutomatedTesting/Levels/Physics/Physics_WorldBodyBusWorksOnEditorComponents/terraintexture.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C4982595_Collider_TriggerDisablesCollision/terraintexture.pak rename to AutomatedTesting/Levels/Physics/Physics_WorldBodyBusWorksOnEditorComponents/terraintexture.pak diff --git a/AutomatedTesting/Levels/Physics/C13895144_Ragdoll_NoRagdoll/C13895144_Ragdoll_NoRagdoll.ly b/AutomatedTesting/Levels/Physics/Ragdoll_LevelSwitchDoesNotCrash/NoRagdoll/NoRagdoll.ly similarity index 100% rename from AutomatedTesting/Levels/Physics/C13895144_Ragdoll_NoRagdoll/C13895144_Ragdoll_NoRagdoll.ly rename to AutomatedTesting/Levels/Physics/Ragdoll_LevelSwitchDoesNotCrash/NoRagdoll/NoRagdoll.ly diff --git a/AutomatedTesting/Levels/Physics/C13895144_Ragdoll_NoRagdoll/filelist.xml b/AutomatedTesting/Levels/Physics/Ragdoll_LevelSwitchDoesNotCrash/NoRagdoll/filelist.xml similarity index 71% rename from AutomatedTesting/Levels/Physics/C13895144_Ragdoll_NoRagdoll/filelist.xml rename to AutomatedTesting/Levels/Physics/Ragdoll_LevelSwitchDoesNotCrash/NoRagdoll/filelist.xml index 076e359dd5..fc5c54a6c0 100644 --- a/AutomatedTesting/Levels/Physics/C13895144_Ragdoll_NoRagdoll/filelist.xml +++ b/AutomatedTesting/Levels/Physics/Ragdoll_LevelSwitchDoesNotCrash/NoRagdoll/filelist.xml @@ -1,4 +1,4 @@ - + diff --git a/AutomatedTesting/Levels/Physics/C13895144_Ragdoll_NoRagdoll/level.pak b/AutomatedTesting/Levels/Physics/Ragdoll_LevelSwitchDoesNotCrash/NoRagdoll/level.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C13895144_Ragdoll_NoRagdoll/level.pak rename to AutomatedTesting/Levels/Physics/Ragdoll_LevelSwitchDoesNotCrash/NoRagdoll/level.pak diff --git a/AutomatedTesting/Levels/Physics/C4976245_PhysxCollider_CollisionLayerTest/leveldata/Environment.xml b/AutomatedTesting/Levels/Physics/Ragdoll_LevelSwitchDoesNotCrash/NoRagdoll/leveldata/Environment.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C4976245_PhysxCollider_CollisionLayerTest/leveldata/Environment.xml rename to AutomatedTesting/Levels/Physics/Ragdoll_LevelSwitchDoesNotCrash/NoRagdoll/leveldata/Environment.xml diff --git a/AutomatedTesting/Levels/Physics/C4976204_Verify_Start_Asleep_Condition/leveldata/GameTokens.xml b/AutomatedTesting/Levels/Physics/Ragdoll_LevelSwitchDoesNotCrash/NoRagdoll/leveldata/GameTokens.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C4976204_Verify_Start_Asleep_Condition/leveldata/GameTokens.xml rename to AutomatedTesting/Levels/Physics/Ragdoll_LevelSwitchDoesNotCrash/NoRagdoll/leveldata/GameTokens.xml diff --git a/AutomatedTesting/Levels/Physics/C5340400_RigidBody_ManualMomentOfInertia/leveldata/TerrainTexture.xml b/AutomatedTesting/Levels/Physics/Ragdoll_LevelSwitchDoesNotCrash/NoRagdoll/leveldata/TerrainTexture.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C5340400_RigidBody_ManualMomentOfInertia/leveldata/TerrainTexture.xml rename to AutomatedTesting/Levels/Physics/Ragdoll_LevelSwitchDoesNotCrash/NoRagdoll/leveldata/TerrainTexture.xml diff --git a/AutomatedTesting/Levels/Physics/C4976218_RigidBodies_InertiaObjectNotComputed/leveldata/TimeOfDay.xml b/AutomatedTesting/Levels/Physics/Ragdoll_LevelSwitchDoesNotCrash/NoRagdoll/leveldata/TimeOfDay.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C4976218_RigidBodies_InertiaObjectNotComputed/leveldata/TimeOfDay.xml rename to AutomatedTesting/Levels/Physics/Ragdoll_LevelSwitchDoesNotCrash/NoRagdoll/leveldata/TimeOfDay.xml diff --git a/AutomatedTesting/Levels/Physics/C4982595_Collider_TriggerDisablesCollision/leveldata/VegetationMap.dat b/AutomatedTesting/Levels/Physics/Ragdoll_LevelSwitchDoesNotCrash/NoRagdoll/leveldata/VegetationMap.dat similarity index 100% rename from AutomatedTesting/Levels/Physics/C4982595_Collider_TriggerDisablesCollision/leveldata/VegetationMap.dat rename to AutomatedTesting/Levels/Physics/Ragdoll_LevelSwitchDoesNotCrash/NoRagdoll/leveldata/VegetationMap.dat diff --git a/AutomatedTesting/Levels/Physics/C4982593_PhysxCollider_CollisionLayerTest/tags.txt b/AutomatedTesting/Levels/Physics/Ragdoll_LevelSwitchDoesNotCrash/NoRagdoll/tags.txt similarity index 100% rename from AutomatedTesting/Levels/Physics/C4982593_PhysxCollider_CollisionLayerTest/tags.txt rename to AutomatedTesting/Levels/Physics/Ragdoll_LevelSwitchDoesNotCrash/NoRagdoll/tags.txt diff --git a/AutomatedTesting/Levels/Physics/C4982797_Collider_ColliderOffset/terraintexture.pak b/AutomatedTesting/Levels/Physics/Ragdoll_LevelSwitchDoesNotCrash/NoRagdoll/terraintexture.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C4982797_Collider_ColliderOffset/terraintexture.pak rename to AutomatedTesting/Levels/Physics/Ragdoll_LevelSwitchDoesNotCrash/NoRagdoll/terraintexture.pak diff --git a/AutomatedTesting/Levels/Physics/C13895144_Ragdoll_WithRagdoll/C13895144_Ragdoll_WithRagdoll.ly b/AutomatedTesting/Levels/Physics/Ragdoll_LevelSwitchDoesNotCrash/WithRagdoll/WithRagdoll.ly similarity index 100% rename from AutomatedTesting/Levels/Physics/C13895144_Ragdoll_WithRagdoll/C13895144_Ragdoll_WithRagdoll.ly rename to AutomatedTesting/Levels/Physics/Ragdoll_LevelSwitchDoesNotCrash/WithRagdoll/WithRagdoll.ly diff --git a/AutomatedTesting/Levels/Physics/C13895144_Ragdoll_WithRagdoll/filelist.xml b/AutomatedTesting/Levels/Physics/Ragdoll_LevelSwitchDoesNotCrash/WithRagdoll/filelist.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C13895144_Ragdoll_WithRagdoll/filelist.xml rename to AutomatedTesting/Levels/Physics/Ragdoll_LevelSwitchDoesNotCrash/WithRagdoll/filelist.xml diff --git a/AutomatedTesting/Levels/Physics/C13895144_Ragdoll_WithRagdoll/level.pak b/AutomatedTesting/Levels/Physics/Ragdoll_LevelSwitchDoesNotCrash/WithRagdoll/level.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C13895144_Ragdoll_WithRagdoll/level.pak rename to AutomatedTesting/Levels/Physics/Ragdoll_LevelSwitchDoesNotCrash/WithRagdoll/level.pak diff --git a/AutomatedTesting/Levels/Physics/C4982593_PhysxCollider_CollisionLayerTest/leveldata/Environment.xml b/AutomatedTesting/Levels/Physics/Ragdoll_LevelSwitchDoesNotCrash/WithRagdoll/leveldata/Environment.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C4982593_PhysxCollider_CollisionLayerTest/leveldata/Environment.xml rename to AutomatedTesting/Levels/Physics/Ragdoll_LevelSwitchDoesNotCrash/WithRagdoll/leveldata/Environment.xml diff --git a/AutomatedTesting/Levels/Physics/C4976209_RigidBody_ComputesCOM/leveldata/GameTokens.xml b/AutomatedTesting/Levels/Physics/Ragdoll_LevelSwitchDoesNotCrash/WithRagdoll/leveldata/GameTokens.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C4976209_RigidBody_ComputesCOM/leveldata/GameTokens.xml rename to AutomatedTesting/Levels/Physics/Ragdoll_LevelSwitchDoesNotCrash/WithRagdoll/leveldata/GameTokens.xml diff --git a/AutomatedTesting/Levels/Physics/C5932040_ForceRegion_CubeExertsWorldForce/leveldata/TerrainTexture.xml b/AutomatedTesting/Levels/Physics/Ragdoll_LevelSwitchDoesNotCrash/WithRagdoll/leveldata/TerrainTexture.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C5932040_ForceRegion_CubeExertsWorldForce/leveldata/TerrainTexture.xml rename to AutomatedTesting/Levels/Physics/Ragdoll_LevelSwitchDoesNotCrash/WithRagdoll/leveldata/TerrainTexture.xml diff --git a/AutomatedTesting/Levels/Physics/C4976242_Collision_SameCollisionlayerSameCollisiongroup/leveldata/TimeOfDay.xml b/AutomatedTesting/Levels/Physics/Ragdoll_LevelSwitchDoesNotCrash/WithRagdoll/leveldata/TimeOfDay.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C4976242_Collision_SameCollisionlayerSameCollisiongroup/leveldata/TimeOfDay.xml rename to AutomatedTesting/Levels/Physics/Ragdoll_LevelSwitchDoesNotCrash/WithRagdoll/leveldata/TimeOfDay.xml diff --git a/AutomatedTesting/Levels/Physics/C4982797_Collider_ColliderOffset/leveldata/VegetationMap.dat b/AutomatedTesting/Levels/Physics/Ragdoll_LevelSwitchDoesNotCrash/WithRagdoll/leveldata/VegetationMap.dat similarity index 100% rename from AutomatedTesting/Levels/Physics/C4982797_Collider_ColliderOffset/leveldata/VegetationMap.dat rename to AutomatedTesting/Levels/Physics/Ragdoll_LevelSwitchDoesNotCrash/WithRagdoll/leveldata/VegetationMap.dat diff --git a/AutomatedTesting/Levels/Physics/C13895144_Ragdoll_WithRagdoll/myMotionSet.motionset b/AutomatedTesting/Levels/Physics/Ragdoll_LevelSwitchDoesNotCrash/WithRagdoll/myMotionSet.motionset similarity index 100% rename from AutomatedTesting/Levels/Physics/C13895144_Ragdoll_WithRagdoll/myMotionSet.motionset rename to AutomatedTesting/Levels/Physics/Ragdoll_LevelSwitchDoesNotCrash/WithRagdoll/myMotionSet.motionset diff --git a/AutomatedTesting/Levels/Physics/C13895144_Ragdoll_WithRagdoll/ragdoll.animgraph b/AutomatedTesting/Levels/Physics/Ragdoll_LevelSwitchDoesNotCrash/WithRagdoll/ragdoll.animgraph similarity index 100% rename from AutomatedTesting/Levels/Physics/C13895144_Ragdoll_WithRagdoll/ragdoll.animgraph rename to AutomatedTesting/Levels/Physics/Ragdoll_LevelSwitchDoesNotCrash/WithRagdoll/ragdoll.animgraph diff --git a/AutomatedTesting/Levels/Physics/C13895144_Ragdoll_WithRagdoll/rin/AnimGraphForSecondRagdoll(1).animgraph b/AutomatedTesting/Levels/Physics/Ragdoll_LevelSwitchDoesNotCrash/WithRagdoll/rin/AnimGraphForSecondRagdoll(1).animgraph similarity index 100% rename from AutomatedTesting/Levels/Physics/C13895144_Ragdoll_WithRagdoll/rin/AnimGraphForSecondRagdoll(1).animgraph rename to AutomatedTesting/Levels/Physics/Ragdoll_LevelSwitchDoesNotCrash/WithRagdoll/rin/AnimGraphForSecondRagdoll(1).animgraph diff --git a/AutomatedTesting/Levels/Physics/C13895144_Ragdoll_WithRagdoll/rin/PhysicsRin(1).zip b/AutomatedTesting/Levels/Physics/Ragdoll_LevelSwitchDoesNotCrash/WithRagdoll/rin/PhysicsRin(1).zip similarity index 100% rename from AutomatedTesting/Levels/Physics/C13895144_Ragdoll_WithRagdoll/rin/PhysicsRin(1).zip rename to AutomatedTesting/Levels/Physics/Ragdoll_LevelSwitchDoesNotCrash/WithRagdoll/rin/PhysicsRin(1).zip diff --git a/AutomatedTesting/Levels/Physics/C4925582_Material_AddModifyDeleteOnRagdollBones/ragdoll_default/rin_skeleton_newgeo.fbx b/AutomatedTesting/Levels/Physics/Ragdoll_LevelSwitchDoesNotCrash/WithRagdoll/rin/PhysicsRin(1)/rin_skeleton_newgeo.fbx similarity index 100% rename from AutomatedTesting/Levels/Physics/C4925582_Material_AddModifyDeleteOnRagdollBones/ragdoll_default/rin_skeleton_newgeo.fbx rename to AutomatedTesting/Levels/Physics/Ragdoll_LevelSwitchDoesNotCrash/WithRagdoll/rin/PhysicsRin(1)/rin_skeleton_newgeo.fbx diff --git a/AutomatedTesting/Levels/Physics/C13895144_Ragdoll_WithRagdoll/rin/PhysicsRin(1)/rin_skeleton_newgeo.fbx.assetinfo b/AutomatedTesting/Levels/Physics/Ragdoll_LevelSwitchDoesNotCrash/WithRagdoll/rin/PhysicsRin(1)/rin_skeleton_newgeo.fbx.assetinfo similarity index 100% rename from AutomatedTesting/Levels/Physics/C13895144_Ragdoll_WithRagdoll/rin/PhysicsRin(1)/rin_skeleton_newgeo.fbx.assetinfo rename to AutomatedTesting/Levels/Physics/Ragdoll_LevelSwitchDoesNotCrash/WithRagdoll/rin/PhysicsRin(1)/rin_skeleton_newgeo.fbx.assetinfo diff --git a/AutomatedTesting/Levels/Physics/C4925582_Material_AddModifyDeleteOnRagdollBones/ragdoll_default/rin_skeleton_newgeo.mtl b/AutomatedTesting/Levels/Physics/Ragdoll_LevelSwitchDoesNotCrash/WithRagdoll/rin/PhysicsRin(1)/rin_skeleton_newgeo.mtl similarity index 100% rename from AutomatedTesting/Levels/Physics/C4925582_Material_AddModifyDeleteOnRagdollBones/ragdoll_default/rin_skeleton_newgeo.mtl rename to AutomatedTesting/Levels/Physics/Ragdoll_LevelSwitchDoesNotCrash/WithRagdoll/rin/PhysicsRin(1)/rin_skeleton_newgeo.mtl diff --git a/AutomatedTesting/Levels/Physics/C13895144_Ragdoll_WithRagdoll/rin/rin_physics(1).animgraph b/AutomatedTesting/Levels/Physics/Ragdoll_LevelSwitchDoesNotCrash/WithRagdoll/rin/rin_physics(1).animgraph similarity index 100% rename from AutomatedTesting/Levels/Physics/C13895144_Ragdoll_WithRagdoll/rin/rin_physics(1).animgraph rename to AutomatedTesting/Levels/Physics/Ragdoll_LevelSwitchDoesNotCrash/WithRagdoll/rin/rin_physics(1).animgraph diff --git a/AutomatedTesting/Levels/Physics/C4982595_Collider_TriggerDisablesCollision/tags.txt b/AutomatedTesting/Levels/Physics/Ragdoll_LevelSwitchDoesNotCrash/WithRagdoll/tags.txt similarity index 100% rename from AutomatedTesting/Levels/Physics/C4982595_Collider_TriggerDisablesCollision/tags.txt rename to AutomatedTesting/Levels/Physics/Ragdoll_LevelSwitchDoesNotCrash/WithRagdoll/tags.txt diff --git a/AutomatedTesting/Levels/Physics/C5340400_RigidBody_ManualMomentOfInertia/terrain/terrain.pxheightfield b/AutomatedTesting/Levels/Physics/Ragdoll_LevelSwitchDoesNotCrash/WithRagdoll/terrain/terrain.pxheightfield similarity index 100% rename from AutomatedTesting/Levels/Physics/C5340400_RigidBody_ManualMomentOfInertia/terrain/terrain.pxheightfield rename to AutomatedTesting/Levels/Physics/Ragdoll_LevelSwitchDoesNotCrash/WithRagdoll/terrain/terrain.pxheightfield diff --git a/AutomatedTesting/Levels/Physics/C4982798_Collider_ColliderRotationOffset/terraintexture.pak b/AutomatedTesting/Levels/Physics/Ragdoll_LevelSwitchDoesNotCrash/WithRagdoll/terraintexture.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C4982798_Collider_ColliderRotationOffset/terraintexture.pak rename to AutomatedTesting/Levels/Physics/Ragdoll_LevelSwitchDoesNotCrash/WithRagdoll/terraintexture.pak diff --git a/AutomatedTesting/Levels/Physics/C14654882_Ragdoll_ragdollAPTest/C14654882_Ragdoll_ragdollAPTest.ly b/AutomatedTesting/Levels/Physics/Ragdoll_OldRagdollSerializationNoErrors/Ragdoll_OldRagdollSerializationNoErrors.ly similarity index 100% rename from AutomatedTesting/Levels/Physics/C14654882_Ragdoll_ragdollAPTest/C14654882_Ragdoll_ragdollAPTest.ly rename to AutomatedTesting/Levels/Physics/Ragdoll_OldRagdollSerializationNoErrors/Ragdoll_OldRagdollSerializationNoErrors.ly diff --git a/AutomatedTesting/Levels/Physics/C14654882_Ragdoll_ragdollAPTest/filelist.xml b/AutomatedTesting/Levels/Physics/Ragdoll_OldRagdollSerializationNoErrors/filelist.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C14654882_Ragdoll_ragdollAPTest/filelist.xml rename to AutomatedTesting/Levels/Physics/Ragdoll_OldRagdollSerializationNoErrors/filelist.xml diff --git a/AutomatedTesting/Levels/Physics/C14654882_Ragdoll_ragdollAPTest/level.pak b/AutomatedTesting/Levels/Physics/Ragdoll_OldRagdollSerializationNoErrors/level.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C14654882_Ragdoll_ragdollAPTest/level.pak rename to AutomatedTesting/Levels/Physics/Ragdoll_OldRagdollSerializationNoErrors/level.pak diff --git a/AutomatedTesting/Levels/Physics/C4982595_Collider_TriggerDisablesCollision/leveldata/Environment.xml b/AutomatedTesting/Levels/Physics/Ragdoll_OldRagdollSerializationNoErrors/leveldata/Environment.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C4982595_Collider_TriggerDisablesCollision/leveldata/Environment.xml rename to AutomatedTesting/Levels/Physics/Ragdoll_OldRagdollSerializationNoErrors/leveldata/Environment.xml diff --git a/AutomatedTesting/Levels/Physics/C4976218_RigidBodies_InertiaObjectNotComputed/leveldata/GameTokens.xml b/AutomatedTesting/Levels/Physics/Ragdoll_OldRagdollSerializationNoErrors/leveldata/GameTokens.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C4976218_RigidBodies_InertiaObjectNotComputed/leveldata/GameTokens.xml rename to AutomatedTesting/Levels/Physics/Ragdoll_OldRagdollSerializationNoErrors/leveldata/GameTokens.xml diff --git a/AutomatedTesting/Levels/Physics/C4976195_RigidBodies_InitialLinearVelocity/leveldata/TerrainTexture.xml b/AutomatedTesting/Levels/Physics/Ragdoll_OldRagdollSerializationNoErrors/leveldata/TerrainTexture.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C4976195_RigidBodies_InitialLinearVelocity/leveldata/TerrainTexture.xml rename to AutomatedTesting/Levels/Physics/Ragdoll_OldRagdollSerializationNoErrors/leveldata/TerrainTexture.xml diff --git a/AutomatedTesting/Levels/Physics/C4976243_Collision_SameCollisionGroupDiffCollisionLayers/leveldata/TimeOfDay.xml b/AutomatedTesting/Levels/Physics/Ragdoll_OldRagdollSerializationNoErrors/leveldata/TimeOfDay.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C4976243_Collision_SameCollisionGroupDiffCollisionLayers/leveldata/TimeOfDay.xml rename to AutomatedTesting/Levels/Physics/Ragdoll_OldRagdollSerializationNoErrors/leveldata/TimeOfDay.xml diff --git a/AutomatedTesting/Levels/Physics/C4982798_Collider_ColliderRotationOffset/leveldata/VegetationMap.dat b/AutomatedTesting/Levels/Physics/Ragdoll_OldRagdollSerializationNoErrors/leveldata/VegetationMap.dat similarity index 100% rename from AutomatedTesting/Levels/Physics/C4982798_Collider_ColliderRotationOffset/leveldata/VegetationMap.dat rename to AutomatedTesting/Levels/Physics/Ragdoll_OldRagdollSerializationNoErrors/leveldata/VegetationMap.dat diff --git a/AutomatedTesting/Levels/Physics/C4982797_Collider_ColliderOffset/tags.txt b/AutomatedTesting/Levels/Physics/Ragdoll_OldRagdollSerializationNoErrors/tags.txt similarity index 100% rename from AutomatedTesting/Levels/Physics/C4982797_Collider_ColliderOffset/tags.txt rename to AutomatedTesting/Levels/Physics/Ragdoll_OldRagdollSerializationNoErrors/tags.txt diff --git a/AutomatedTesting/Levels/Physics/C5296614_PhysXMaterial_ColliderShape/terraintexture.pak b/AutomatedTesting/Levels/Physics/Ragdoll_OldRagdollSerializationNoErrors/terraintexture.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C5296614_PhysXMaterial_ColliderShape/terraintexture.pak rename to AutomatedTesting/Levels/Physics/Ragdoll_OldRagdollSerializationNoErrors/terraintexture.pak diff --git a/AutomatedTesting/Levels/Physics/C6090555_ForceRegion_SplineFollowOnRigidBodies/leveldata/Environment.xml b/AutomatedTesting/Levels/Physics/Ragdoll_WorldBodyBusWorks/LevelData/Environment.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C6090555_ForceRegion_SplineFollowOnRigidBodies/leveldata/Environment.xml rename to AutomatedTesting/Levels/Physics/Ragdoll_WorldBodyBusWorks/LevelData/Environment.xml diff --git a/AutomatedTesting/Levels/Physics/C4976197_RigidBodies_InitialAngularVelocity/leveldata/TerrainTexture.xml b/AutomatedTesting/Levels/Physics/Ragdoll_WorldBodyBusWorks/LevelData/TerrainTexture.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C4976197_RigidBodies_InitialAngularVelocity/leveldata/TerrainTexture.xml rename to AutomatedTesting/Levels/Physics/Ragdoll_WorldBodyBusWorks/LevelData/TerrainTexture.xml diff --git a/AutomatedTesting/Levels/Physics/C4982595_Collider_TriggerDisablesCollision/leveldata/TimeOfDay.xml b/AutomatedTesting/Levels/Physics/Ragdoll_WorldBodyBusWorks/LevelData/TimeOfDay.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C4982595_Collider_TriggerDisablesCollision/leveldata/TimeOfDay.xml rename to AutomatedTesting/Levels/Physics/Ragdoll_WorldBodyBusWorks/LevelData/TimeOfDay.xml diff --git a/AutomatedTesting/Levels/Physics/C5296614_PhysXMaterial_ColliderShape/leveldata/VegetationMap.dat b/AutomatedTesting/Levels/Physics/Ragdoll_WorldBodyBusWorks/LevelData/VegetationMap.dat similarity index 100% rename from AutomatedTesting/Levels/Physics/C5296614_PhysXMaterial_ColliderShape/leveldata/VegetationMap.dat rename to AutomatedTesting/Levels/Physics/Ragdoll_WorldBodyBusWorks/LevelData/VegetationMap.dat diff --git a/AutomatedTesting/Levels/Physics/C28978033_Ragdoll_WorldBodyBusTests/C28978033_Ragdoll_WorldBodyBusTests.ly b/AutomatedTesting/Levels/Physics/Ragdoll_WorldBodyBusWorks/Ragdoll_WorldBodyBusWorks.ly similarity index 100% rename from AutomatedTesting/Levels/Physics/C28978033_Ragdoll_WorldBodyBusTests/C28978033_Ragdoll_WorldBodyBusTests.ly rename to AutomatedTesting/Levels/Physics/Ragdoll_WorldBodyBusWorks/Ragdoll_WorldBodyBusWorks.ly diff --git a/AutomatedTesting/Levels/Physics/C28978033_Ragdoll_WorldBodyBusTests/TerrainTexture.pak b/AutomatedTesting/Levels/Physics/Ragdoll_WorldBodyBusWorks/TerrainTexture.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C28978033_Ragdoll_WorldBodyBusTests/TerrainTexture.pak rename to AutomatedTesting/Levels/Physics/Ragdoll_WorldBodyBusWorks/TerrainTexture.pak diff --git a/AutomatedTesting/Levels/Physics/C28978033_Ragdoll_WorldBodyBusTests/filelist.xml b/AutomatedTesting/Levels/Physics/Ragdoll_WorldBodyBusWorks/filelist.xml similarity index 72% rename from AutomatedTesting/Levels/Physics/C28978033_Ragdoll_WorldBodyBusTests/filelist.xml rename to AutomatedTesting/Levels/Physics/Ragdoll_WorldBodyBusWorks/filelist.xml index 202292bf0a..92e5a16f35 100644 --- a/AutomatedTesting/Levels/Physics/C28978033_Ragdoll_WorldBodyBusTests/filelist.xml +++ b/AutomatedTesting/Levels/Physics/Ragdoll_WorldBodyBusWorks/filelist.xml @@ -1,4 +1,4 @@ - + diff --git a/AutomatedTesting/Levels/Physics/C28978033_Ragdoll_WorldBodyBusTests/level.pak b/AutomatedTesting/Levels/Physics/Ragdoll_WorldBodyBusWorks/level.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C28978033_Ragdoll_WorldBodyBusTests/level.pak rename to AutomatedTesting/Levels/Physics/Ragdoll_WorldBodyBusWorks/level.pak diff --git a/AutomatedTesting/Levels/Physics/C4925582_Material_AddModifyDeleteOnRagdollBones/ragdoll_modified/AnimGraphPhysX.animgraph b/AutomatedTesting/Levels/Physics/Ragdoll_WorldBodyBusWorks/ragdoll_default/AnimGraphPhysX.animgraph similarity index 100% rename from AutomatedTesting/Levels/Physics/C4925582_Material_AddModifyDeleteOnRagdollBones/ragdoll_modified/AnimGraphPhysX.animgraph rename to AutomatedTesting/Levels/Physics/Ragdoll_WorldBodyBusWorks/ragdoll_default/AnimGraphPhysX.animgraph diff --git a/AutomatedTesting/Levels/Physics/C4925582_Material_AddModifyDeleteOnRagdollBones/ragdoll_default/Blue.tif b/AutomatedTesting/Levels/Physics/Ragdoll_WorldBodyBusWorks/ragdoll_default/Blue.tif similarity index 100% rename from AutomatedTesting/Levels/Physics/C4925582_Material_AddModifyDeleteOnRagdollBones/ragdoll_default/Blue.tif rename to AutomatedTesting/Levels/Physics/Ragdoll_WorldBodyBusWorks/ragdoll_default/Blue.tif diff --git a/AutomatedTesting/Levels/Physics/C4925582_Material_AddModifyDeleteOnRagdollBones/ragdoll_modified/RinLocomotion.motionset b/AutomatedTesting/Levels/Physics/Ragdoll_WorldBodyBusWorks/ragdoll_default/RinLocomotion.motionset similarity index 100% rename from AutomatedTesting/Levels/Physics/C4925582_Material_AddModifyDeleteOnRagdollBones/ragdoll_modified/RinLocomotion.motionset rename to AutomatedTesting/Levels/Physics/Ragdoll_WorldBodyBusWorks/ragdoll_default/RinLocomotion.motionset diff --git a/AutomatedTesting/Levels/Physics/C4925582_Material_AddModifyDeleteOnRagdollBones/ragdoll_default/default.mtl b/AutomatedTesting/Levels/Physics/Ragdoll_WorldBodyBusWorks/ragdoll_default/default.mtl similarity index 100% rename from AutomatedTesting/Levels/Physics/C4925582_Material_AddModifyDeleteOnRagdollBones/ragdoll_default/default.mtl rename to AutomatedTesting/Levels/Physics/Ragdoll_WorldBodyBusWorks/ragdoll_default/default.mtl diff --git a/AutomatedTesting/Levels/Physics/C4925582_Material_AddModifyDeleteOnRagdollBones/ragdoll_default/rin_physics.animgraph b/AutomatedTesting/Levels/Physics/Ragdoll_WorldBodyBusWorks/ragdoll_default/rin_physics.animgraph similarity index 100% rename from AutomatedTesting/Levels/Physics/C4925582_Material_AddModifyDeleteOnRagdollBones/ragdoll_default/rin_physics.animgraph rename to AutomatedTesting/Levels/Physics/Ragdoll_WorldBodyBusWorks/ragdoll_default/rin_physics.animgraph diff --git a/AutomatedTesting/Levels/Physics/C4925582_Material_AddModifyDeleteOnRagdollBones/ragdoll_modified/rin_skeleton_newgeo.fbx b/AutomatedTesting/Levels/Physics/Ragdoll_WorldBodyBusWorks/ragdoll_default/rin_skeleton_newgeo.fbx similarity index 100% rename from AutomatedTesting/Levels/Physics/C4925582_Material_AddModifyDeleteOnRagdollBones/ragdoll_modified/rin_skeleton_newgeo.fbx rename to AutomatedTesting/Levels/Physics/Ragdoll_WorldBodyBusWorks/ragdoll_default/rin_skeleton_newgeo.fbx diff --git a/AutomatedTesting/Levels/Physics/C28978033_Ragdoll_WorldBodyBusTests/ragdoll_default/rin_skeleton_newgeo.fbx.assetinfo b/AutomatedTesting/Levels/Physics/Ragdoll_WorldBodyBusWorks/ragdoll_default/rin_skeleton_newgeo.fbx.assetinfo similarity index 100% rename from AutomatedTesting/Levels/Physics/C28978033_Ragdoll_WorldBodyBusTests/ragdoll_default/rin_skeleton_newgeo.fbx.assetinfo rename to AutomatedTesting/Levels/Physics/Ragdoll_WorldBodyBusWorks/ragdoll_default/rin_skeleton_newgeo.fbx.assetinfo diff --git a/AutomatedTesting/Levels/Physics/C4925582_Material_AddModifyDeleteOnRagdollBones/ragdoll_modified/rin_skeleton_newgeo.mtl b/AutomatedTesting/Levels/Physics/Ragdoll_WorldBodyBusWorks/ragdoll_default/rin_skeleton_newgeo.mtl similarity index 100% rename from AutomatedTesting/Levels/Physics/C4925582_Material_AddModifyDeleteOnRagdollBones/ragdoll_modified/rin_skeleton_newgeo.mtl rename to AutomatedTesting/Levels/Physics/Ragdoll_WorldBodyBusWorks/ragdoll_default/rin_skeleton_newgeo.mtl diff --git a/AutomatedTesting/Levels/Physics/C4982798_Collider_ColliderRotationOffset/tags.txt b/AutomatedTesting/Levels/Physics/Ragdoll_WorldBodyBusWorks/tags.txt similarity index 100% rename from AutomatedTesting/Levels/Physics/C4982798_Collider_ColliderRotationOffset/tags.txt rename to AutomatedTesting/Levels/Physics/Ragdoll_WorldBodyBusWorks/tags.txt diff --git a/AutomatedTesting/Levels/Physics/C4976194_RigidBody_PhysXComponentIsValid/C4976194_RigidBody_PhysXComponentIsValid.ly b/AutomatedTesting/Levels/Physics/RigidBody_AddRigidBodyComponent/RigidBody_AddRigidBodyComponent.ly similarity index 100% rename from AutomatedTesting/Levels/Physics/C4976194_RigidBody_PhysXComponentIsValid/C4976194_RigidBody_PhysXComponentIsValid.ly rename to AutomatedTesting/Levels/Physics/RigidBody_AddRigidBodyComponent/RigidBody_AddRigidBodyComponent.ly diff --git a/AutomatedTesting/Levels/Physics/C4976194_RigidBody_PhysXComponentIsValid/filelist.xml b/AutomatedTesting/Levels/Physics/RigidBody_AddRigidBodyComponent/filelist.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C4976194_RigidBody_PhysXComponentIsValid/filelist.xml rename to AutomatedTesting/Levels/Physics/RigidBody_AddRigidBodyComponent/filelist.xml diff --git a/AutomatedTesting/Levels/Physics/C4976194_RigidBody_PhysXComponentIsValid/level.pak b/AutomatedTesting/Levels/Physics/RigidBody_AddRigidBodyComponent/level.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C4976194_RigidBody_PhysXComponentIsValid/level.pak rename to AutomatedTesting/Levels/Physics/RigidBody_AddRigidBodyComponent/level.pak diff --git a/AutomatedTesting/Levels/Physics/C4982797_Collider_ColliderOffset/leveldata/Environment.xml b/AutomatedTesting/Levels/Physics/RigidBody_AddRigidBodyComponent/leveldata/Environment.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C4982797_Collider_ColliderOffset/leveldata/Environment.xml rename to AutomatedTesting/Levels/Physics/RigidBody_AddRigidBodyComponent/leveldata/Environment.xml diff --git a/AutomatedTesting/Levels/Physics/C4976199_RigidBodies_LinearDampingObjectMotion/leveldata/TerrainTexture.xml b/AutomatedTesting/Levels/Physics/RigidBody_AddRigidBodyComponent/leveldata/TerrainTexture.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C4976199_RigidBodies_LinearDampingObjectMotion/leveldata/TerrainTexture.xml rename to AutomatedTesting/Levels/Physics/RigidBody_AddRigidBodyComponent/leveldata/TerrainTexture.xml diff --git a/AutomatedTesting/Levels/Physics/C4982797_Collider_ColliderOffset/leveldata/TimeOfDay.xml b/AutomatedTesting/Levels/Physics/RigidBody_AddRigidBodyComponent/leveldata/TimeOfDay.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C4982797_Collider_ColliderOffset/leveldata/TimeOfDay.xml rename to AutomatedTesting/Levels/Physics/RigidBody_AddRigidBodyComponent/leveldata/TimeOfDay.xml diff --git a/AutomatedTesting/Levels/Physics/C5340400_RigidBody_ManualMomentOfInertia/leveldata/VegetationMap.dat b/AutomatedTesting/Levels/Physics/RigidBody_AddRigidBodyComponent/leveldata/VegetationMap.dat similarity index 100% rename from AutomatedTesting/Levels/Physics/C5340400_RigidBody_ManualMomentOfInertia/leveldata/VegetationMap.dat rename to AutomatedTesting/Levels/Physics/RigidBody_AddRigidBodyComponent/leveldata/VegetationMap.dat diff --git a/AutomatedTesting/Levels/Physics/C5296614_PhysXMaterial_ColliderShape/tags.txt b/AutomatedTesting/Levels/Physics/RigidBody_AddRigidBodyComponent/tags.txt similarity index 100% rename from AutomatedTesting/Levels/Physics/C5296614_PhysXMaterial_ColliderShape/tags.txt rename to AutomatedTesting/Levels/Physics/RigidBody_AddRigidBodyComponent/tags.txt diff --git a/AutomatedTesting/Levels/Physics/C4976200_RigidBody_AngularDampingObjectRotation/terrain/terrain.pxheightfield b/AutomatedTesting/Levels/Physics/RigidBody_AddRigidBodyComponent/terrain/terrain.pxheightfield similarity index 100% rename from AutomatedTesting/Levels/Physics/C4976200_RigidBody_AngularDampingObjectRotation/terrain/terrain.pxheightfield rename to AutomatedTesting/Levels/Physics/RigidBody_AddRigidBodyComponent/terrain/terrain.pxheightfield diff --git a/AutomatedTesting/Levels/Physics/C5340400_RigidBody_ManualMomentOfInertia/terraintexture.pak b/AutomatedTesting/Levels/Physics/RigidBody_AddRigidBodyComponent/terraintexture.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C5340400_RigidBody_ManualMomentOfInertia/terraintexture.pak rename to AutomatedTesting/Levels/Physics/RigidBody_AddRigidBodyComponent/terraintexture.pak diff --git a/AutomatedTesting/Levels/Physics/C4976200_RigidBody_AngularDampingObjectRotation/C4976200_RigidBody_AngularDampingObjectRotation.ly b/AutomatedTesting/Levels/Physics/RigidBody_AngularDampingAffectsRotation/RigidBody_AngularDampingAffectsRotation.ly similarity index 100% rename from AutomatedTesting/Levels/Physics/C4976200_RigidBody_AngularDampingObjectRotation/C4976200_RigidBody_AngularDampingObjectRotation.ly rename to AutomatedTesting/Levels/Physics/RigidBody_AngularDampingAffectsRotation/RigidBody_AngularDampingAffectsRotation.ly diff --git a/AutomatedTesting/Levels/Physics/C4976199_RigidBodies_LinearDampingObjectMotion/filelist.xml b/AutomatedTesting/Levels/Physics/RigidBody_AngularDampingAffectsRotation/filelist.xml similarity index 69% rename from AutomatedTesting/Levels/Physics/C4976199_RigidBodies_LinearDampingObjectMotion/filelist.xml rename to AutomatedTesting/Levels/Physics/RigidBody_AngularDampingAffectsRotation/filelist.xml index c7a00e3be6..ad76ab3fe7 100644 --- a/AutomatedTesting/Levels/Physics/C4976199_RigidBodies_LinearDampingObjectMotion/filelist.xml +++ b/AutomatedTesting/Levels/Physics/RigidBody_AngularDampingAffectsRotation/filelist.xml @@ -1,4 +1,4 @@ - + diff --git a/AutomatedTesting/Levels/Physics/C4976199_RigidBodies_LinearDampingObjectMotion/level.pak b/AutomatedTesting/Levels/Physics/RigidBody_AngularDampingAffectsRotation/level.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C4976199_RigidBodies_LinearDampingObjectMotion/level.pak rename to AutomatedTesting/Levels/Physics/RigidBody_AngularDampingAffectsRotation/level.pak diff --git a/AutomatedTesting/Levels/Physics/C4982798_Collider_ColliderRotationOffset/leveldata/Environment.xml b/AutomatedTesting/Levels/Physics/RigidBody_AngularDampingAffectsRotation/leveldata/Environment.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C4982798_Collider_ColliderRotationOffset/leveldata/Environment.xml rename to AutomatedTesting/Levels/Physics/RigidBody_AngularDampingAffectsRotation/leveldata/Environment.xml diff --git a/AutomatedTesting/Levels/Physics/C4976242_Collision_SameCollisionlayerSameCollisiongroup/leveldata/GameTokens.xml b/AutomatedTesting/Levels/Physics/RigidBody_AngularDampingAffectsRotation/leveldata/GameTokens.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C4976242_Collision_SameCollisionlayerSameCollisiongroup/leveldata/GameTokens.xml rename to AutomatedTesting/Levels/Physics/RigidBody_AngularDampingAffectsRotation/leveldata/GameTokens.xml diff --git a/AutomatedTesting/Levels/Physics/C4976200_RigidBody_AngularDampingObjectRotation/leveldata/TerrainTexture.xml b/AutomatedTesting/Levels/Physics/RigidBody_AngularDampingAffectsRotation/leveldata/TerrainTexture.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C4976200_RigidBody_AngularDampingObjectRotation/leveldata/TerrainTexture.xml rename to AutomatedTesting/Levels/Physics/RigidBody_AngularDampingAffectsRotation/leveldata/TerrainTexture.xml diff --git a/AutomatedTesting/Levels/Physics/C4982798_Collider_ColliderRotationOffset/leveldata/TimeOfDay.xml b/AutomatedTesting/Levels/Physics/RigidBody_AngularDampingAffectsRotation/leveldata/TimeOfDay.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C4982798_Collider_ColliderRotationOffset/leveldata/TimeOfDay.xml rename to AutomatedTesting/Levels/Physics/RigidBody_AngularDampingAffectsRotation/leveldata/TimeOfDay.xml diff --git a/AutomatedTesting/Levels/Physics/C5689517_Verify_Terrain_Component/leveldata/VegetationMap.dat b/AutomatedTesting/Levels/Physics/RigidBody_AngularDampingAffectsRotation/leveldata/VegetationMap.dat similarity index 100% rename from AutomatedTesting/Levels/Physics/C5689517_Verify_Terrain_Component/leveldata/VegetationMap.dat rename to AutomatedTesting/Levels/Physics/RigidBody_AngularDampingAffectsRotation/leveldata/VegetationMap.dat diff --git a/AutomatedTesting/Levels/Physics/C5340400_RigidBody_ManualMomentOfInertia/tags.txt b/AutomatedTesting/Levels/Physics/RigidBody_AngularDampingAffectsRotation/tags.txt similarity index 100% rename from AutomatedTesting/Levels/Physics/C5340400_RigidBody_ManualMomentOfInertia/tags.txt rename to AutomatedTesting/Levels/Physics/RigidBody_AngularDampingAffectsRotation/tags.txt diff --git a/AutomatedTesting/Levels/Physics/C4976204_Verify_Start_Asleep_Condition/terrain/terrain.pxheightfield b/AutomatedTesting/Levels/Physics/RigidBody_AngularDampingAffectsRotation/terrain/terrain.pxheightfield similarity index 100% rename from AutomatedTesting/Levels/Physics/C4976204_Verify_Start_Asleep_Condition/terrain/terrain.pxheightfield rename to AutomatedTesting/Levels/Physics/RigidBody_AngularDampingAffectsRotation/terrain/terrain.pxheightfield diff --git a/AutomatedTesting/Levels/Physics/C5689517_Verify_Terrain_Component/terraintexture.pak b/AutomatedTesting/Levels/Physics/RigidBody_AngularDampingAffectsRotation/terraintexture.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C5689517_Verify_Terrain_Component/terraintexture.pak rename to AutomatedTesting/Levels/Physics/RigidBody_AngularDampingAffectsRotation/terraintexture.pak diff --git a/AutomatedTesting/Levels/Physics/C5959765_ForceRegion_AssetGetsImpulsed/PhysXSedan/_dev_Sedan_r0-b.fbx b/AutomatedTesting/Levels/Physics/RigidBody_COM_ComputingWorks/PhysXSedan/_dev_Sedan_r0-b.fbx similarity index 100% rename from AutomatedTesting/Levels/Physics/C5959765_ForceRegion_AssetGetsImpulsed/PhysXSedan/_dev_Sedan_r0-b.fbx rename to AutomatedTesting/Levels/Physics/RigidBody_COM_ComputingWorks/PhysXSedan/_dev_Sedan_r0-b.fbx diff --git a/AutomatedTesting/Levels/Physics/C5959765_ForceRegion_AssetGetsImpulsed/PhysXSedan/_dev_sedan_r0-b.fbx.assetinfo b/AutomatedTesting/Levels/Physics/RigidBody_COM_ComputingWorks/PhysXSedan/_dev_sedan_r0-b.fbx.assetinfo similarity index 100% rename from AutomatedTesting/Levels/Physics/C5959765_ForceRegion_AssetGetsImpulsed/PhysXSedan/_dev_sedan_r0-b.fbx.assetinfo rename to AutomatedTesting/Levels/Physics/RigidBody_COM_ComputingWorks/PhysXSedan/_dev_sedan_r0-b.fbx.assetinfo diff --git a/AutomatedTesting/Levels/Physics/C5959765_ForceRegion_AssetGetsImpulsed/PhysXSedan/_dev_sedan_r0-b.mtl b/AutomatedTesting/Levels/Physics/RigidBody_COM_ComputingWorks/PhysXSedan/_dev_sedan_r0-b.mtl similarity index 100% rename from AutomatedTesting/Levels/Physics/C5959765_ForceRegion_AssetGetsImpulsed/PhysXSedan/_dev_sedan_r0-b.mtl rename to AutomatedTesting/Levels/Physics/RigidBody_COM_ComputingWorks/PhysXSedan/_dev_sedan_r0-b.mtl diff --git a/AutomatedTesting/Levels/Physics/RigidBody_COM_ComputingWorks/RigidBody_COM_ComputingWorks.ly b/AutomatedTesting/Levels/Physics/RigidBody_COM_ComputingWorks/RigidBody_COM_ComputingWorks.ly new file mode 100644 index 0000000000..9e8e10cbae --- /dev/null +++ b/AutomatedTesting/Levels/Physics/RigidBody_COM_ComputingWorks/RigidBody_COM_ComputingWorks.ly @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:294ddb6a1da824ecddabbd671fa2f64cd02905c99475aa8c98af5fb41e9c8cdd +size 8698 diff --git a/AutomatedTesting/Levels/Physics/C4976209_RigidBody_ComputesCOM/filelist.xml b/AutomatedTesting/Levels/Physics/RigidBody_COM_ComputingWorks/filelist.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C4976209_RigidBody_ComputesCOM/filelist.xml rename to AutomatedTesting/Levels/Physics/RigidBody_COM_ComputingWorks/filelist.xml diff --git a/AutomatedTesting/Levels/Physics/C4976209_RigidBody_ComputesCOM/level.pak b/AutomatedTesting/Levels/Physics/RigidBody_COM_ComputingWorks/level.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C4976209_RigidBody_ComputesCOM/level.pak rename to AutomatedTesting/Levels/Physics/RigidBody_COM_ComputingWorks/level.pak diff --git a/AutomatedTesting/Levels/Physics/C5296614_PhysXMaterial_ColliderShape/leveldata/Environment.xml b/AutomatedTesting/Levels/Physics/RigidBody_COM_ComputingWorks/leveldata/Environment.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C5296614_PhysXMaterial_ColliderShape/leveldata/Environment.xml rename to AutomatedTesting/Levels/Physics/RigidBody_COM_ComputingWorks/leveldata/Environment.xml diff --git a/AutomatedTesting/Levels/Physics/C4976243_Collision_SameCollisionGroupDiffCollisionLayers/leveldata/GameTokens.xml b/AutomatedTesting/Levels/Physics/RigidBody_COM_ComputingWorks/leveldata/GameTokens.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C4976243_Collision_SameCollisionGroupDiffCollisionLayers/leveldata/GameTokens.xml rename to AutomatedTesting/Levels/Physics/RigidBody_COM_ComputingWorks/leveldata/GameTokens.xml diff --git a/AutomatedTesting/Levels/Physics/C4976204_Verify_Start_Asleep_Condition/leveldata/TerrainTexture.xml b/AutomatedTesting/Levels/Physics/RigidBody_COM_ComputingWorks/leveldata/TerrainTexture.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C4976204_Verify_Start_Asleep_Condition/leveldata/TerrainTexture.xml rename to AutomatedTesting/Levels/Physics/RigidBody_COM_ComputingWorks/leveldata/TerrainTexture.xml diff --git a/AutomatedTesting/Levels/Physics/C5296614_PhysXMaterial_ColliderShape/leveldata/TimeOfDay.xml b/AutomatedTesting/Levels/Physics/RigidBody_COM_ComputingWorks/leveldata/TimeOfDay.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C5296614_PhysXMaterial_ColliderShape/leveldata/TimeOfDay.xml rename to AutomatedTesting/Levels/Physics/RigidBody_COM_ComputingWorks/leveldata/TimeOfDay.xml diff --git a/AutomatedTesting/Levels/Physics/C5689518_PhysXEntity_collides_with_PhysXTerrain/leveldata/VegetationMap.dat b/AutomatedTesting/Levels/Physics/RigidBody_COM_ComputingWorks/leveldata/VegetationMap.dat similarity index 100% rename from AutomatedTesting/Levels/Physics/C5689518_PhysXEntity_collides_with_PhysXTerrain/leveldata/VegetationMap.dat rename to AutomatedTesting/Levels/Physics/RigidBody_COM_ComputingWorks/leveldata/VegetationMap.dat diff --git a/AutomatedTesting/Levels/Physics/C5689517_Verify_Terrain_Component/tags.txt b/AutomatedTesting/Levels/Physics/RigidBody_COM_ComputingWorks/tags.txt similarity index 100% rename from AutomatedTesting/Levels/Physics/C5689517_Verify_Terrain_Component/tags.txt rename to AutomatedTesting/Levels/Physics/RigidBody_COM_ComputingWorks/tags.txt diff --git a/AutomatedTesting/Levels/Physics/C5689518_PhysXEntity_collides_with_PhysXTerrain/terraintexture.pak b/AutomatedTesting/Levels/Physics/RigidBody_COM_ComputingWorks/terraintexture.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C5689518_PhysXEntity_collides_with_PhysXTerrain/terraintexture.pak rename to AutomatedTesting/Levels/Physics/RigidBody_COM_ComputingWorks/terraintexture.pak diff --git a/AutomatedTesting/Levels/Physics/C4976210_COM_ManualSetting/C4976210_COM_ManualSetting.ly b/AutomatedTesting/Levels/Physics/RigidBody_COM_ManualSettingWorks/RigidBody_COM_ManualSettingWorks.ly similarity index 100% rename from AutomatedTesting/Levels/Physics/C4976210_COM_ManualSetting/C4976210_COM_ManualSetting.ly rename to AutomatedTesting/Levels/Physics/RigidBody_COM_ManualSettingWorks/RigidBody_COM_ManualSettingWorks.ly diff --git a/AutomatedTesting/Levels/Physics/C4976210_COM_ManualSetting/filelist.xml b/AutomatedTesting/Levels/Physics/RigidBody_COM_ManualSettingWorks/filelist.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C4976210_COM_ManualSetting/filelist.xml rename to AutomatedTesting/Levels/Physics/RigidBody_COM_ManualSettingWorks/filelist.xml diff --git a/AutomatedTesting/Levels/Physics/C4976210_COM_ManualSetting/level.pak b/AutomatedTesting/Levels/Physics/RigidBody_COM_ManualSettingWorks/level.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C4976210_COM_ManualSetting/level.pak rename to AutomatedTesting/Levels/Physics/RigidBody_COM_ManualSettingWorks/level.pak diff --git a/AutomatedTesting/Levels/Physics/C5340400_RigidBody_ManualMomentOfInertia/leveldata/Environment.xml b/AutomatedTesting/Levels/Physics/RigidBody_COM_ManualSettingWorks/leveldata/Environment.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C5340400_RigidBody_ManualMomentOfInertia/leveldata/Environment.xml rename to AutomatedTesting/Levels/Physics/RigidBody_COM_ManualSettingWorks/leveldata/Environment.xml diff --git a/AutomatedTesting/Levels/Physics/C5932041_PhysXForceRegion_LocalSpaceForceOnRigidBodies/leveldata/TerrainTexture.xml b/AutomatedTesting/Levels/Physics/RigidBody_COM_ManualSettingWorks/leveldata/TerrainTexture.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C5932041_PhysXForceRegion_LocalSpaceForceOnRigidBodies/leveldata/TerrainTexture.xml rename to AutomatedTesting/Levels/Physics/RigidBody_COM_ManualSettingWorks/leveldata/TerrainTexture.xml diff --git a/AutomatedTesting/Levels/Physics/C5689517_Verify_Terrain_Component/leveldata/TimeOfDay.xml b/AutomatedTesting/Levels/Physics/RigidBody_COM_ManualSettingWorks/leveldata/TimeOfDay.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C5689517_Verify_Terrain_Component/leveldata/TimeOfDay.xml rename to AutomatedTesting/Levels/Physics/RigidBody_COM_ManualSettingWorks/leveldata/TimeOfDay.xml diff --git a/AutomatedTesting/Levels/Physics/C5689521_Terrain_NoCollisionAfterTerrainDeletion/leveldata/VegetationMap.dat b/AutomatedTesting/Levels/Physics/RigidBody_COM_ManualSettingWorks/leveldata/VegetationMap.dat similarity index 100% rename from AutomatedTesting/Levels/Physics/C5689521_Terrain_NoCollisionAfterTerrainDeletion/leveldata/VegetationMap.dat rename to AutomatedTesting/Levels/Physics/RigidBody_COM_ManualSettingWorks/leveldata/VegetationMap.dat diff --git a/AutomatedTesting/Levels/Physics/C5689518_PhysXEntity_collides_with_PhysXTerrain/tags.txt b/AutomatedTesting/Levels/Physics/RigidBody_COM_ManualSettingWorks/tags.txt similarity index 100% rename from AutomatedTesting/Levels/Physics/C5689518_PhysXEntity_collides_with_PhysXTerrain/tags.txt rename to AutomatedTesting/Levels/Physics/RigidBody_COM_ManualSettingWorks/tags.txt diff --git a/AutomatedTesting/Levels/Physics/C5689521_Terrain_NoCollisionAfterTerrainDeletion/terraintexture.pak b/AutomatedTesting/Levels/Physics/RigidBody_COM_ManualSettingWorks/terraintexture.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C5689521_Terrain_NoCollisionAfterTerrainDeletion/terraintexture.pak rename to AutomatedTesting/Levels/Physics/RigidBody_COM_ManualSettingWorks/terraintexture.pak diff --git a/AutomatedTesting/Levels/Physics/C13351703_COM_NotIncludeTriggerShapes/C13351703_COM_NotIncludeTriggerShapes.ly b/AutomatedTesting/Levels/Physics/RigidBody_COM_NotIncludesTriggerShapes/RigidBody_COM_NotIncludesTriggerShapes.ly similarity index 100% rename from AutomatedTesting/Levels/Physics/C13351703_COM_NotIncludeTriggerShapes/C13351703_COM_NotIncludeTriggerShapes.ly rename to AutomatedTesting/Levels/Physics/RigidBody_COM_NotIncludesTriggerShapes/RigidBody_COM_NotIncludesTriggerShapes.ly diff --git a/AutomatedTesting/Levels/Physics/C13351703_COM_NotIncludeTriggerShapes/filelist.xml b/AutomatedTesting/Levels/Physics/RigidBody_COM_NotIncludesTriggerShapes/filelist.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C13351703_COM_NotIncludeTriggerShapes/filelist.xml rename to AutomatedTesting/Levels/Physics/RigidBody_COM_NotIncludesTriggerShapes/filelist.xml diff --git a/AutomatedTesting/Levels/Physics/C13351703_COM_NotIncludeTriggerShapes/level.pak b/AutomatedTesting/Levels/Physics/RigidBody_COM_NotIncludesTriggerShapes/level.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C13351703_COM_NotIncludeTriggerShapes/level.pak rename to AutomatedTesting/Levels/Physics/RigidBody_COM_NotIncludesTriggerShapes/level.pak diff --git a/AutomatedTesting/Levels/Physics/C5689517_Verify_Terrain_Component/leveldata/Environment.xml b/AutomatedTesting/Levels/Physics/RigidBody_COM_NotIncludesTriggerShapes/leveldata/Environment.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C5689517_Verify_Terrain_Component/leveldata/Environment.xml rename to AutomatedTesting/Levels/Physics/RigidBody_COM_NotIncludesTriggerShapes/leveldata/Environment.xml diff --git a/AutomatedTesting/Levels/Physics/C4976244_Collider_SameGroupSameLayerCollision/leveldata/GameTokens.xml b/AutomatedTesting/Levels/Physics/RigidBody_COM_NotIncludesTriggerShapes/leveldata/GameTokens.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C4976244_Collider_SameGroupSameLayerCollision/leveldata/GameTokens.xml rename to AutomatedTesting/Levels/Physics/RigidBody_COM_NotIncludesTriggerShapes/leveldata/GameTokens.xml diff --git a/AutomatedTesting/Levels/Physics/C4976206_RigidBodies_VerifyGravity/leveldata/TerrainTexture.xml b/AutomatedTesting/Levels/Physics/RigidBody_COM_NotIncludesTriggerShapes/leveldata/TerrainTexture.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C4976206_RigidBodies_VerifyGravity/leveldata/TerrainTexture.xml rename to AutomatedTesting/Levels/Physics/RigidBody_COM_NotIncludesTriggerShapes/leveldata/TerrainTexture.xml diff --git a/AutomatedTesting/Levels/Physics/C5689518_PhysXEntity_collides_with_PhysXTerrain/leveldata/TimeOfDay.xml b/AutomatedTesting/Levels/Physics/RigidBody_COM_NotIncludesTriggerShapes/leveldata/TimeOfDay.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C5689518_PhysXEntity_collides_with_PhysXTerrain/leveldata/TimeOfDay.xml rename to AutomatedTesting/Levels/Physics/RigidBody_COM_NotIncludesTriggerShapes/leveldata/TimeOfDay.xml diff --git a/AutomatedTesting/Levels/Physics/C5689522_Physxterrain_AddPhysxterrainNoEditorCrash/leveldata/VegetationMap.dat b/AutomatedTesting/Levels/Physics/RigidBody_COM_NotIncludesTriggerShapes/leveldata/VegetationMap.dat similarity index 100% rename from AutomatedTesting/Levels/Physics/C5689522_Physxterrain_AddPhysxterrainNoEditorCrash/leveldata/VegetationMap.dat rename to AutomatedTesting/Levels/Physics/RigidBody_COM_NotIncludesTriggerShapes/leveldata/VegetationMap.dat diff --git a/AutomatedTesting/Levels/Physics/C5689521_Terrain_NoCollisionAfterTerrainDeletion/tags.txt b/AutomatedTesting/Levels/Physics/RigidBody_COM_NotIncludesTriggerShapes/tags.txt similarity index 100% rename from AutomatedTesting/Levels/Physics/C5689521_Terrain_NoCollisionAfterTerrainDeletion/tags.txt rename to AutomatedTesting/Levels/Physics/RigidBody_COM_NotIncludesTriggerShapes/tags.txt diff --git a/AutomatedTesting/Levels/Physics/C5689522_Physxterrain_AddPhysxterrainNoEditorCrash/terraintexture.pak b/AutomatedTesting/Levels/Physics/RigidBody_COM_NotIncludesTriggerShapes/terraintexture.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C5689522_Physxterrain_AddPhysxterrainNoEditorCrash/terraintexture.pak rename to AutomatedTesting/Levels/Physics/RigidBody_COM_NotIncludesTriggerShapes/terraintexture.pak diff --git a/AutomatedTesting/Levels/Physics/C4976218_RigidBodies_InertiaObjectNotComputed/C4976218_RigidBodies_InertiaObjectNotComputed.ly b/AutomatedTesting/Levels/Physics/RigidBody_ComputeInertiaWorks/RigidBody_ComputeInertiaWorks.ly similarity index 100% rename from AutomatedTesting/Levels/Physics/C4976218_RigidBodies_InertiaObjectNotComputed/C4976218_RigidBodies_InertiaObjectNotComputed.ly rename to AutomatedTesting/Levels/Physics/RigidBody_ComputeInertiaWorks/RigidBody_ComputeInertiaWorks.ly diff --git a/AutomatedTesting/Levels/Physics/C4976218_RigidBodies_InertiaObjectNotComputed/filelist.xml b/AutomatedTesting/Levels/Physics/RigidBody_ComputeInertiaWorks/filelist.xml similarity index 70% rename from AutomatedTesting/Levels/Physics/C4976218_RigidBodies_InertiaObjectNotComputed/filelist.xml rename to AutomatedTesting/Levels/Physics/RigidBody_ComputeInertiaWorks/filelist.xml index 45a899e226..860defe32b 100644 --- a/AutomatedTesting/Levels/Physics/C4976218_RigidBodies_InertiaObjectNotComputed/filelist.xml +++ b/AutomatedTesting/Levels/Physics/RigidBody_ComputeInertiaWorks/filelist.xml @@ -1,4 +1,4 @@ - + diff --git a/AutomatedTesting/Levels/Physics/C4976218_RigidBodies_InertiaObjectNotComputed/level.pak b/AutomatedTesting/Levels/Physics/RigidBody_ComputeInertiaWorks/level.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C4976218_RigidBodies_InertiaObjectNotComputed/level.pak rename to AutomatedTesting/Levels/Physics/RigidBody_ComputeInertiaWorks/level.pak diff --git a/AutomatedTesting/Levels/Physics/C5689518_PhysXEntity_collides_with_PhysXTerrain/leveldata/Environment.xml b/AutomatedTesting/Levels/Physics/RigidBody_ComputeInertiaWorks/leveldata/Environment.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C5689518_PhysXEntity_collides_with_PhysXTerrain/leveldata/Environment.xml rename to AutomatedTesting/Levels/Physics/RigidBody_ComputeInertiaWorks/leveldata/Environment.xml diff --git a/AutomatedTesting/Levels/Physics/C4982595_Collider_TriggerDisablesCollision/leveldata/GameTokens.xml b/AutomatedTesting/Levels/Physics/RigidBody_ComputeInertiaWorks/leveldata/GameTokens.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C4982595_Collider_TriggerDisablesCollision/leveldata/GameTokens.xml rename to AutomatedTesting/Levels/Physics/RigidBody_ComputeInertiaWorks/leveldata/GameTokens.xml diff --git a/AutomatedTesting/Levels/Physics/C4976209_RigidBody_ComputesCOM/leveldata/TerrainTexture.xml b/AutomatedTesting/Levels/Physics/RigidBody_ComputeInertiaWorks/leveldata/TerrainTexture.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C4976209_RigidBody_ComputesCOM/leveldata/TerrainTexture.xml rename to AutomatedTesting/Levels/Physics/RigidBody_ComputeInertiaWorks/leveldata/TerrainTexture.xml diff --git a/AutomatedTesting/Levels/Physics/C5689521_Terrain_NoCollisionAfterTerrainDeletion/leveldata/TimeOfDay.xml b/AutomatedTesting/Levels/Physics/RigidBody_ComputeInertiaWorks/leveldata/TimeOfDay.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C5689521_Terrain_NoCollisionAfterTerrainDeletion/leveldata/TimeOfDay.xml rename to AutomatedTesting/Levels/Physics/RigidBody_ComputeInertiaWorks/leveldata/TimeOfDay.xml diff --git a/AutomatedTesting/Levels/Physics/C5689524_MultipleTerrains_CheckWarningInConsole/leveldata/VegetationMap.dat b/AutomatedTesting/Levels/Physics/RigidBody_ComputeInertiaWorks/leveldata/VegetationMap.dat similarity index 100% rename from AutomatedTesting/Levels/Physics/C5689524_MultipleTerrains_CheckWarningInConsole/leveldata/VegetationMap.dat rename to AutomatedTesting/Levels/Physics/RigidBody_ComputeInertiaWorks/leveldata/VegetationMap.dat diff --git a/AutomatedTesting/Levels/Physics/C5689522_Physxterrain_AddPhysxterrainNoEditorCrash/tags.txt b/AutomatedTesting/Levels/Physics/RigidBody_ComputeInertiaWorks/tags.txt similarity index 100% rename from AutomatedTesting/Levels/Physics/C5689522_Physxterrain_AddPhysxterrainNoEditorCrash/tags.txt rename to AutomatedTesting/Levels/Physics/RigidBody_ComputeInertiaWorks/tags.txt diff --git a/AutomatedTesting/Levels/Physics/C5689524_MultipleTerrains_CheckWarningInConsole/terraintexture.pak b/AutomatedTesting/Levels/Physics/RigidBody_ComputeInertiaWorks/terraintexture.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C5689524_MultipleTerrains_CheckWarningInConsole/terraintexture.pak rename to AutomatedTesting/Levels/Physics/RigidBody_ComputeInertiaWorks/terraintexture.pak diff --git a/AutomatedTesting/Levels/Physics/C4976197_RigidBodies_InitialAngularVelocity/C4976197_RigidBodies_InitialAngularVelocity.ly b/AutomatedTesting/Levels/Physics/RigidBody_InitialAngularVelocity/RigidBody_InitialAngularVelocity.ly similarity index 100% rename from AutomatedTesting/Levels/Physics/C4976197_RigidBodies_InitialAngularVelocity/C4976197_RigidBodies_InitialAngularVelocity.ly rename to AutomatedTesting/Levels/Physics/RigidBody_InitialAngularVelocity/RigidBody_InitialAngularVelocity.ly diff --git a/AutomatedTesting/Levels/Physics/C4976197_RigidBodies_InitialAngularVelocity/filelist.xml b/AutomatedTesting/Levels/Physics/RigidBody_InitialAngularVelocity/filelist.xml similarity index 70% rename from AutomatedTesting/Levels/Physics/C4976197_RigidBodies_InitialAngularVelocity/filelist.xml rename to AutomatedTesting/Levels/Physics/RigidBody_InitialAngularVelocity/filelist.xml index 54e3a33d39..e457b443f7 100644 --- a/AutomatedTesting/Levels/Physics/C4976197_RigidBodies_InitialAngularVelocity/filelist.xml +++ b/AutomatedTesting/Levels/Physics/RigidBody_InitialAngularVelocity/filelist.xml @@ -1,4 +1,4 @@ - + diff --git a/AutomatedTesting/Levels/Physics/C4976197_RigidBodies_InitialAngularVelocity/level.pak b/AutomatedTesting/Levels/Physics/RigidBody_InitialAngularVelocity/level.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C4976197_RigidBodies_InitialAngularVelocity/level.pak rename to AutomatedTesting/Levels/Physics/RigidBody_InitialAngularVelocity/level.pak diff --git a/AutomatedTesting/Levels/Physics/C5689521_Terrain_NoCollisionAfterTerrainDeletion/leveldata/Environment.xml b/AutomatedTesting/Levels/Physics/RigidBody_InitialAngularVelocity/leveldata/Environment.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C5689521_Terrain_NoCollisionAfterTerrainDeletion/leveldata/Environment.xml rename to AutomatedTesting/Levels/Physics/RigidBody_InitialAngularVelocity/leveldata/Environment.xml diff --git a/AutomatedTesting/Levels/Physics/C4982797_Collider_ColliderOffset/leveldata/GameTokens.xml b/AutomatedTesting/Levels/Physics/RigidBody_InitialAngularVelocity/leveldata/GameTokens.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C4982797_Collider_ColliderOffset/leveldata/GameTokens.xml rename to AutomatedTesting/Levels/Physics/RigidBody_InitialAngularVelocity/leveldata/GameTokens.xml diff --git a/AutomatedTesting/Levels/Physics/C4976218_RigidBodies_InertiaObjectNotComputed/leveldata/TerrainTexture.xml b/AutomatedTesting/Levels/Physics/RigidBody_InitialAngularVelocity/leveldata/TerrainTexture.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C4976218_RigidBodies_InertiaObjectNotComputed/leveldata/TerrainTexture.xml rename to AutomatedTesting/Levels/Physics/RigidBody_InitialAngularVelocity/leveldata/TerrainTexture.xml diff --git a/AutomatedTesting/Levels/Physics/C5689522_Physxterrain_AddPhysxterrainNoEditorCrash/leveldata/TimeOfDay.xml b/AutomatedTesting/Levels/Physics/RigidBody_InitialAngularVelocity/leveldata/TimeOfDay.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C5689522_Physxterrain_AddPhysxterrainNoEditorCrash/leveldata/TimeOfDay.xml rename to AutomatedTesting/Levels/Physics/RigidBody_InitialAngularVelocity/leveldata/TimeOfDay.xml diff --git a/AutomatedTesting/Levels/Physics/C5689528_Terrain_MultipleTerrainComponents/leveldata/VegetationMap.dat b/AutomatedTesting/Levels/Physics/RigidBody_InitialAngularVelocity/leveldata/VegetationMap.dat similarity index 100% rename from AutomatedTesting/Levels/Physics/C5689528_Terrain_MultipleTerrainComponents/leveldata/VegetationMap.dat rename to AutomatedTesting/Levels/Physics/RigidBody_InitialAngularVelocity/leveldata/VegetationMap.dat diff --git a/AutomatedTesting/Levels/Physics/C5689524_MultipleTerrains_CheckWarningInConsole/tags.txt b/AutomatedTesting/Levels/Physics/RigidBody_InitialAngularVelocity/tags.txt similarity index 100% rename from AutomatedTesting/Levels/Physics/C5689524_MultipleTerrains_CheckWarningInConsole/tags.txt rename to AutomatedTesting/Levels/Physics/RigidBody_InitialAngularVelocity/tags.txt diff --git a/AutomatedTesting/Levels/Physics/C5689528_Terrain_MultipleTerrainComponents/terraintexture.pak b/AutomatedTesting/Levels/Physics/RigidBody_InitialAngularVelocity/terraintexture.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C5689528_Terrain_MultipleTerrainComponents/terraintexture.pak rename to AutomatedTesting/Levels/Physics/RigidBody_InitialAngularVelocity/terraintexture.pak diff --git a/AutomatedTesting/Levels/Physics/C4976195_RigidBodies_InitialLinearVelocity/C4976195_RigidBodies_InitialLinearVelocity.ly b/AutomatedTesting/Levels/Physics/RigidBody_InitialLinearVelocity/RigidBody_InitialLinearVelocity.ly similarity index 100% rename from AutomatedTesting/Levels/Physics/C4976195_RigidBodies_InitialLinearVelocity/C4976195_RigidBodies_InitialLinearVelocity.ly rename to AutomatedTesting/Levels/Physics/RigidBody_InitialLinearVelocity/RigidBody_InitialLinearVelocity.ly diff --git a/AutomatedTesting/Levels/Physics/C4976195_RigidBodies_InitialLinearVelocity/filelist.xml b/AutomatedTesting/Levels/Physics/RigidBody_InitialLinearVelocity/filelist.xml similarity index 70% rename from AutomatedTesting/Levels/Physics/C4976195_RigidBodies_InitialLinearVelocity/filelist.xml rename to AutomatedTesting/Levels/Physics/RigidBody_InitialLinearVelocity/filelist.xml index 0196dff132..df8bffb3ed 100644 --- a/AutomatedTesting/Levels/Physics/C4976195_RigidBodies_InitialLinearVelocity/filelist.xml +++ b/AutomatedTesting/Levels/Physics/RigidBody_InitialLinearVelocity/filelist.xml @@ -1,4 +1,4 @@ - + diff --git a/AutomatedTesting/Levels/Physics/C4976195_RigidBodies_InitialLinearVelocity/level.pak b/AutomatedTesting/Levels/Physics/RigidBody_InitialLinearVelocity/level.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C4976195_RigidBodies_InitialLinearVelocity/level.pak rename to AutomatedTesting/Levels/Physics/RigidBody_InitialLinearVelocity/level.pak diff --git a/AutomatedTesting/Levels/Physics/C4976195_RigidBodies_InitialLinearVelocity/leveldata/Environment.xml b/AutomatedTesting/Levels/Physics/RigidBody_InitialLinearVelocity/leveldata/Environment.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C4976195_RigidBodies_InitialLinearVelocity/leveldata/Environment.xml rename to AutomatedTesting/Levels/Physics/RigidBody_InitialLinearVelocity/leveldata/Environment.xml diff --git a/AutomatedTesting/Levels/Physics/C4976227_Collider_NewGroup/leveldata/TerrainTexture.xml b/AutomatedTesting/Levels/Physics/RigidBody_InitialLinearVelocity/leveldata/TerrainTexture.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C4976227_Collider_NewGroup/leveldata/TerrainTexture.xml rename to AutomatedTesting/Levels/Physics/RigidBody_InitialLinearVelocity/leveldata/TerrainTexture.xml diff --git a/AutomatedTesting/Levels/Physics/C5689524_MultipleTerrains_CheckWarningInConsole/leveldata/TimeOfDay.xml b/AutomatedTesting/Levels/Physics/RigidBody_InitialLinearVelocity/leveldata/TimeOfDay.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C5689524_MultipleTerrains_CheckWarningInConsole/leveldata/TimeOfDay.xml rename to AutomatedTesting/Levels/Physics/RigidBody_InitialLinearVelocity/leveldata/TimeOfDay.xml diff --git a/AutomatedTesting/Levels/Physics/C5689529_Verify_Terrain_RigidBody_Collider_Mesh/leveldata/VegetationMap.dat b/AutomatedTesting/Levels/Physics/RigidBody_InitialLinearVelocity/leveldata/VegetationMap.dat similarity index 100% rename from AutomatedTesting/Levels/Physics/C5689529_Verify_Terrain_RigidBody_Collider_Mesh/leveldata/VegetationMap.dat rename to AutomatedTesting/Levels/Physics/RigidBody_InitialLinearVelocity/leveldata/VegetationMap.dat diff --git a/AutomatedTesting/Levels/Physics/C5689528_Terrain_MultipleTerrainComponents/tags.txt b/AutomatedTesting/Levels/Physics/RigidBody_InitialLinearVelocity/tags.txt similarity index 100% rename from AutomatedTesting/Levels/Physics/C5689528_Terrain_MultipleTerrainComponents/tags.txt rename to AutomatedTesting/Levels/Physics/RigidBody_InitialLinearVelocity/tags.txt diff --git a/AutomatedTesting/Levels/Physics/C5689529_Verify_Terrain_RigidBody_Collider_Mesh/terraintexture.pak b/AutomatedTesting/Levels/Physics/RigidBody_InitialLinearVelocity/terraintexture.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C5689529_Verify_Terrain_RigidBody_Collider_Mesh/terraintexture.pak rename to AutomatedTesting/Levels/Physics/RigidBody_InitialLinearVelocity/terraintexture.pak diff --git a/AutomatedTesting/Levels/Physics/C4976207_PhysXRigidBodies_KinematicBehavior/C4976207_PhysXRigidBodies_KinematicBehavior.ly b/AutomatedTesting/Levels/Physics/RigidBody_KinematicModeWorks/RigidBody_KinematicModeWorks.ly similarity index 100% rename from AutomatedTesting/Levels/Physics/C4976207_PhysXRigidBodies_KinematicBehavior/C4976207_PhysXRigidBodies_KinematicBehavior.ly rename to AutomatedTesting/Levels/Physics/RigidBody_KinematicModeWorks/RigidBody_KinematicModeWorks.ly diff --git a/AutomatedTesting/Levels/Physics/C4976207_PhysXRigidBodies_KinematicBehavior/filelist.xml b/AutomatedTesting/Levels/Physics/RigidBody_KinematicModeWorks/filelist.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C4976207_PhysXRigidBodies_KinematicBehavior/filelist.xml rename to AutomatedTesting/Levels/Physics/RigidBody_KinematicModeWorks/filelist.xml diff --git a/AutomatedTesting/Levels/Physics/C4976207_PhysXRigidBodies_KinematicBehavior/level.pak b/AutomatedTesting/Levels/Physics/RigidBody_KinematicModeWorks/level.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C4976207_PhysXRigidBodies_KinematicBehavior/level.pak rename to AutomatedTesting/Levels/Physics/RigidBody_KinematicModeWorks/level.pak diff --git a/AutomatedTesting/Levels/Physics/C5689522_Physxterrain_AddPhysxterrainNoEditorCrash/leveldata/Environment.xml b/AutomatedTesting/Levels/Physics/RigidBody_KinematicModeWorks/leveldata/Environment.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C5689522_Physxterrain_AddPhysxterrainNoEditorCrash/leveldata/Environment.xml rename to AutomatedTesting/Levels/Physics/RigidBody_KinematicModeWorks/leveldata/Environment.xml diff --git a/AutomatedTesting/Levels/Physics/C5932044_PhysX_ForceRegion_PointForceOnRigidBodies/leveldata/TerrainTexture.xml b/AutomatedTesting/Levels/Physics/RigidBody_KinematicModeWorks/leveldata/TerrainTexture.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C5932044_PhysX_ForceRegion_PointForceOnRigidBodies/leveldata/TerrainTexture.xml rename to AutomatedTesting/Levels/Physics/RigidBody_KinematicModeWorks/leveldata/TerrainTexture.xml diff --git a/AutomatedTesting/Levels/Physics/C5689528_Terrain_MultipleTerrainComponents/leveldata/TimeOfDay.xml b/AutomatedTesting/Levels/Physics/RigidBody_KinematicModeWorks/leveldata/TimeOfDay.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C5689528_Terrain_MultipleTerrainComponents/leveldata/TimeOfDay.xml rename to AutomatedTesting/Levels/Physics/RigidBody_KinematicModeWorks/leveldata/TimeOfDay.xml diff --git a/AutomatedTesting/Levels/Physics/C5689531_Warning_TerrainSliceTerrainComponent/leveldata/VegetationMap.dat b/AutomatedTesting/Levels/Physics/RigidBody_KinematicModeWorks/leveldata/VegetationMap.dat similarity index 100% rename from AutomatedTesting/Levels/Physics/C5689531_Warning_TerrainSliceTerrainComponent/leveldata/VegetationMap.dat rename to AutomatedTesting/Levels/Physics/RigidBody_KinematicModeWorks/leveldata/VegetationMap.dat diff --git a/AutomatedTesting/Levels/Physics/C5689529_Verify_Terrain_RigidBody_Collider_Mesh/tags.txt b/AutomatedTesting/Levels/Physics/RigidBody_KinematicModeWorks/tags.txt similarity index 100% rename from AutomatedTesting/Levels/Physics/C5689529_Verify_Terrain_RigidBody_Collider_Mesh/tags.txt rename to AutomatedTesting/Levels/Physics/RigidBody_KinematicModeWorks/tags.txt diff --git a/AutomatedTesting/Levels/Physics/C5689531_Warning_TerrainSliceTerrainComponent/terraintexture.pak b/AutomatedTesting/Levels/Physics/RigidBody_KinematicModeWorks/terraintexture.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C5689531_Warning_TerrainSliceTerrainComponent/terraintexture.pak rename to AutomatedTesting/Levels/Physics/RigidBody_KinematicModeWorks/terraintexture.pak diff --git a/AutomatedTesting/Levels/Physics/C4976199_RigidBodies_LinearDampingObjectMotion/C4976199_RigidBodies_LinearDampingObjectMotion.ly b/AutomatedTesting/Levels/Physics/RigidBody_LinearDampingAffectsMotion/RigidBody_LinearDampingAffectsMotion.ly similarity index 100% rename from AutomatedTesting/Levels/Physics/C4976199_RigidBodies_LinearDampingObjectMotion/C4976199_RigidBodies_LinearDampingObjectMotion.ly rename to AutomatedTesting/Levels/Physics/RigidBody_LinearDampingAffectsMotion/RigidBody_LinearDampingAffectsMotion.ly diff --git a/AutomatedTesting/Levels/Physics/C4976200_RigidBody_AngularDampingObjectRotation/filelist.xml b/AutomatedTesting/Levels/Physics/RigidBody_LinearDampingAffectsMotion/filelist.xml similarity index 69% rename from AutomatedTesting/Levels/Physics/C4976200_RigidBody_AngularDampingObjectRotation/filelist.xml rename to AutomatedTesting/Levels/Physics/RigidBody_LinearDampingAffectsMotion/filelist.xml index c7a00e3be6..ad76ab3fe7 100644 --- a/AutomatedTesting/Levels/Physics/C4976200_RigidBody_AngularDampingObjectRotation/filelist.xml +++ b/AutomatedTesting/Levels/Physics/RigidBody_LinearDampingAffectsMotion/filelist.xml @@ -1,4 +1,4 @@ - + diff --git a/AutomatedTesting/Levels/Physics/C4976200_RigidBody_AngularDampingObjectRotation/level.pak b/AutomatedTesting/Levels/Physics/RigidBody_LinearDampingAffectsMotion/level.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C4976200_RigidBody_AngularDampingObjectRotation/level.pak rename to AutomatedTesting/Levels/Physics/RigidBody_LinearDampingAffectsMotion/level.pak diff --git a/AutomatedTesting/Levels/Physics/C5689524_MultipleTerrains_CheckWarningInConsole/leveldata/Environment.xml b/AutomatedTesting/Levels/Physics/RigidBody_LinearDampingAffectsMotion/leveldata/Environment.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C5689524_MultipleTerrains_CheckWarningInConsole/leveldata/Environment.xml rename to AutomatedTesting/Levels/Physics/RigidBody_LinearDampingAffectsMotion/leveldata/Environment.xml diff --git a/AutomatedTesting/Levels/Physics/C4976242_Collision_SameCollisionlayerSameCollisiongroup/leveldata/TerrainTexture.xml b/AutomatedTesting/Levels/Physics/RigidBody_LinearDampingAffectsMotion/leveldata/TerrainTexture.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C4976242_Collision_SameCollisionlayerSameCollisiongroup/leveldata/TerrainTexture.xml rename to AutomatedTesting/Levels/Physics/RigidBody_LinearDampingAffectsMotion/leveldata/TerrainTexture.xml diff --git a/AutomatedTesting/Levels/Physics/C5689529_Verify_Terrain_RigidBody_Collider_Mesh/leveldata/TimeOfDay.xml b/AutomatedTesting/Levels/Physics/RigidBody_LinearDampingAffectsMotion/leveldata/TimeOfDay.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C5689529_Verify_Terrain_RigidBody_Collider_Mesh/leveldata/TimeOfDay.xml rename to AutomatedTesting/Levels/Physics/RigidBody_LinearDampingAffectsMotion/leveldata/TimeOfDay.xml diff --git a/AutomatedTesting/Levels/Physics/C5932040_ForceRegion_CubeExertsWorldForce/leveldata/VegetationMap.dat b/AutomatedTesting/Levels/Physics/RigidBody_LinearDampingAffectsMotion/leveldata/VegetationMap.dat similarity index 100% rename from AutomatedTesting/Levels/Physics/C5932040_ForceRegion_CubeExertsWorldForce/leveldata/VegetationMap.dat rename to AutomatedTesting/Levels/Physics/RigidBody_LinearDampingAffectsMotion/leveldata/VegetationMap.dat diff --git a/AutomatedTesting/Levels/Physics/C5689531_Warning_TerrainSliceTerrainComponent/tags.txt b/AutomatedTesting/Levels/Physics/RigidBody_LinearDampingAffectsMotion/tags.txt similarity index 100% rename from AutomatedTesting/Levels/Physics/C5689531_Warning_TerrainSliceTerrainComponent/tags.txt rename to AutomatedTesting/Levels/Physics/RigidBody_LinearDampingAffectsMotion/tags.txt diff --git a/AutomatedTesting/Levels/Physics/C4976206_RigidBodies_VerifyGravity/terrain/terrain.pxheightfield b/AutomatedTesting/Levels/Physics/RigidBody_LinearDampingAffectsMotion/terrain/terrain.pxheightfield similarity index 100% rename from AutomatedTesting/Levels/Physics/C4976206_RigidBodies_VerifyGravity/terrain/terrain.pxheightfield rename to AutomatedTesting/Levels/Physics/RigidBody_LinearDampingAffectsMotion/terrain/terrain.pxheightfield diff --git a/AutomatedTesting/Levels/Physics/C5932040_ForceRegion_CubeExertsWorldForce/terraintexture.pak b/AutomatedTesting/Levels/Physics/RigidBody_LinearDampingAffectsMotion/terraintexture.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C5932040_ForceRegion_CubeExertsWorldForce/terraintexture.pak rename to AutomatedTesting/Levels/Physics/RigidBody_LinearDampingAffectsMotion/terraintexture.pak diff --git a/AutomatedTesting/Levels/Physics/C4976201_RigidBody_MassIsAssigned/C4976201_RigidBody_MassIsAssigned.ly b/AutomatedTesting/Levels/Physics/RigidBody_MassDifferentValuesWorks/RigidBody_MassDifferentValuesWorks.ly similarity index 100% rename from AutomatedTesting/Levels/Physics/C4976201_RigidBody_MassIsAssigned/C4976201_RigidBody_MassIsAssigned.ly rename to AutomatedTesting/Levels/Physics/RigidBody_MassDifferentValuesWorks/RigidBody_MassDifferentValuesWorks.ly diff --git a/AutomatedTesting/Levels/Physics/C4976201_RigidBody_MassIsAssigned/filelist.xml b/AutomatedTesting/Levels/Physics/RigidBody_MassDifferentValuesWorks/filelist.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C4976201_RigidBody_MassIsAssigned/filelist.xml rename to AutomatedTesting/Levels/Physics/RigidBody_MassDifferentValuesWorks/filelist.xml diff --git a/AutomatedTesting/Levels/Physics/C4976201_RigidBody_MassIsAssigned/level.pak b/AutomatedTesting/Levels/Physics/RigidBody_MassDifferentValuesWorks/level.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C4976201_RigidBody_MassIsAssigned/level.pak rename to AutomatedTesting/Levels/Physics/RigidBody_MassDifferentValuesWorks/level.pak diff --git a/AutomatedTesting/Levels/Physics/C5689528_Terrain_MultipleTerrainComponents/leveldata/Environment.xml b/AutomatedTesting/Levels/Physics/RigidBody_MassDifferentValuesWorks/leveldata/Environment.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C5689528_Terrain_MultipleTerrainComponents/leveldata/Environment.xml rename to AutomatedTesting/Levels/Physics/RigidBody_MassDifferentValuesWorks/leveldata/Environment.xml diff --git a/AutomatedTesting/Levels/Physics/C4982798_Collider_ColliderRotationOffset/leveldata/GameTokens.xml b/AutomatedTesting/Levels/Physics/RigidBody_MassDifferentValuesWorks/leveldata/GameTokens.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C4982798_Collider_ColliderRotationOffset/leveldata/GameTokens.xml rename to AutomatedTesting/Levels/Physics/RigidBody_MassDifferentValuesWorks/leveldata/GameTokens.xml diff --git a/AutomatedTesting/Levels/Physics/C5959761_ForceRegion_ExertsPointForce_Sedan/leveldata/TerrainTexture.xml b/AutomatedTesting/Levels/Physics/RigidBody_MassDifferentValuesWorks/leveldata/TerrainTexture.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C5959761_ForceRegion_ExertsPointForce_Sedan/leveldata/TerrainTexture.xml rename to AutomatedTesting/Levels/Physics/RigidBody_MassDifferentValuesWorks/leveldata/TerrainTexture.xml diff --git a/AutomatedTesting/Levels/Physics/C5689531_Warning_TerrainSliceTerrainComponent/leveldata/TimeOfDay.xml b/AutomatedTesting/Levels/Physics/RigidBody_MassDifferentValuesWorks/leveldata/TimeOfDay.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C5689531_Warning_TerrainSliceTerrainComponent/leveldata/TimeOfDay.xml rename to AutomatedTesting/Levels/Physics/RigidBody_MassDifferentValuesWorks/leveldata/TimeOfDay.xml diff --git a/AutomatedTesting/Levels/Physics/C5932041_PhysXForceRegion_LocalSpaceForceOnRigidBodies/leveldata/VegetationMap.dat b/AutomatedTesting/Levels/Physics/RigidBody_MassDifferentValuesWorks/leveldata/VegetationMap.dat similarity index 100% rename from AutomatedTesting/Levels/Physics/C5932041_PhysXForceRegion_LocalSpaceForceOnRigidBodies/leveldata/VegetationMap.dat rename to AutomatedTesting/Levels/Physics/RigidBody_MassDifferentValuesWorks/leveldata/VegetationMap.dat diff --git a/AutomatedTesting/Levels/Physics/C5932040_ForceRegion_CubeExertsWorldForce/tags.txt b/AutomatedTesting/Levels/Physics/RigidBody_MassDifferentValuesWorks/tags.txt similarity index 100% rename from AutomatedTesting/Levels/Physics/C5932040_ForceRegion_CubeExertsWorldForce/tags.txt rename to AutomatedTesting/Levels/Physics/RigidBody_MassDifferentValuesWorks/tags.txt diff --git a/AutomatedTesting/Levels/Physics/C6032082_Terrain_MultipleResolutionsValid_128x128_1m/terrain/terrain.pxheightfield b/AutomatedTesting/Levels/Physics/RigidBody_MassDifferentValuesWorks/terrain/terrain.pxheightfield similarity index 100% rename from AutomatedTesting/Levels/Physics/C6032082_Terrain_MultipleResolutionsValid_128x128_1m/terrain/terrain.pxheightfield rename to AutomatedTesting/Levels/Physics/RigidBody_MassDifferentValuesWorks/terrain/terrain.pxheightfield diff --git a/AutomatedTesting/Levels/Physics/C5932041_PhysXForceRegion_LocalSpaceForceOnRigidBodies/terraintexture.pak b/AutomatedTesting/Levels/Physics/RigidBody_MassDifferentValuesWorks/terraintexture.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C5932041_PhysXForceRegion_LocalSpaceForceOnRigidBodies/terraintexture.pak rename to AutomatedTesting/Levels/Physics/RigidBody_MassDifferentValuesWorks/terraintexture.pak diff --git a/AutomatedTesting/Levels/Physics/C13352089_RigidBodies_MaxAngularVelocity/Layers/damping_bars_and_triggers.layer b/AutomatedTesting/Levels/Physics/RigidBody_MaxAngularVelocityWorks/Layers/damping_bars_and_triggers.layer similarity index 100% rename from AutomatedTesting/Levels/Physics/C13352089_RigidBodies_MaxAngularVelocity/Layers/damping_bars_and_triggers.layer rename to AutomatedTesting/Levels/Physics/RigidBody_MaxAngularVelocityWorks/Layers/damping_bars_and_triggers.layer diff --git a/AutomatedTesting/Levels/Physics/C13352089_RigidBodies_MaxAngularVelocity/Layers/no_damping_bars.layer b/AutomatedTesting/Levels/Physics/RigidBody_MaxAngularVelocityWorks/Layers/no_damping_bars.layer similarity index 100% rename from AutomatedTesting/Levels/Physics/C13352089_RigidBodies_MaxAngularVelocity/Layers/no_damping_bars.layer rename to AutomatedTesting/Levels/Physics/RigidBody_MaxAngularVelocityWorks/Layers/no_damping_bars.layer diff --git a/AutomatedTesting/Levels/Physics/C13352089_RigidBodies_MaxAngularVelocity/C13352089_RigidBodies_MaxAngularVelocity.ly b/AutomatedTesting/Levels/Physics/RigidBody_MaxAngularVelocityWorks/RigidBody_MaxAngularVelocityWorks.ly similarity index 100% rename from AutomatedTesting/Levels/Physics/C13352089_RigidBodies_MaxAngularVelocity/C13352089_RigidBodies_MaxAngularVelocity.ly rename to AutomatedTesting/Levels/Physics/RigidBody_MaxAngularVelocityWorks/RigidBody_MaxAngularVelocityWorks.ly diff --git a/AutomatedTesting/Levels/Physics/C13352089_RigidBodies_MaxAngularVelocity/filelist.xml b/AutomatedTesting/Levels/Physics/RigidBody_MaxAngularVelocityWorks/filelist.xml similarity index 71% rename from AutomatedTesting/Levels/Physics/C13352089_RigidBodies_MaxAngularVelocity/filelist.xml rename to AutomatedTesting/Levels/Physics/RigidBody_MaxAngularVelocityWorks/filelist.xml index fca6c56a65..ca6b51f34a 100644 --- a/AutomatedTesting/Levels/Physics/C13352089_RigidBodies_MaxAngularVelocity/filelist.xml +++ b/AutomatedTesting/Levels/Physics/RigidBody_MaxAngularVelocityWorks/filelist.xml @@ -1,4 +1,4 @@ - + diff --git a/AutomatedTesting/Levels/Physics/C13352089_RigidBodies_MaxAngularVelocity/level.pak b/AutomatedTesting/Levels/Physics/RigidBody_MaxAngularVelocityWorks/level.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C13352089_RigidBodies_MaxAngularVelocity/level.pak rename to AutomatedTesting/Levels/Physics/RigidBody_MaxAngularVelocityWorks/level.pak diff --git a/AutomatedTesting/Levels/Physics/C5689529_Verify_Terrain_RigidBody_Collider_Mesh/leveldata/Environment.xml b/AutomatedTesting/Levels/Physics/RigidBody_MaxAngularVelocityWorks/leveldata/Environment.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C5689529_Verify_Terrain_RigidBody_Collider_Mesh/leveldata/Environment.xml rename to AutomatedTesting/Levels/Physics/RigidBody_MaxAngularVelocityWorks/leveldata/Environment.xml diff --git a/AutomatedTesting/Levels/Physics/C5296614_PhysXMaterial_ColliderShape/leveldata/GameTokens.xml b/AutomatedTesting/Levels/Physics/RigidBody_MaxAngularVelocityWorks/leveldata/GameTokens.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C5296614_PhysXMaterial_ColliderShape/leveldata/GameTokens.xml rename to AutomatedTesting/Levels/Physics/RigidBody_MaxAngularVelocityWorks/leveldata/GameTokens.xml diff --git a/AutomatedTesting/Levels/Physics/C4976243_Collision_SameCollisionGroupDiffCollisionLayers/leveldata/TerrainTexture.xml b/AutomatedTesting/Levels/Physics/RigidBody_MaxAngularVelocityWorks/leveldata/TerrainTexture.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C4976243_Collision_SameCollisionGroupDiffCollisionLayers/leveldata/TerrainTexture.xml rename to AutomatedTesting/Levels/Physics/RigidBody_MaxAngularVelocityWorks/leveldata/TerrainTexture.xml diff --git a/AutomatedTesting/Levels/Physics/C5932040_ForceRegion_CubeExertsWorldForce/leveldata/TimeOfDay.xml b/AutomatedTesting/Levels/Physics/RigidBody_MaxAngularVelocityWorks/leveldata/TimeOfDay.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C5932040_ForceRegion_CubeExertsWorldForce/leveldata/TimeOfDay.xml rename to AutomatedTesting/Levels/Physics/RigidBody_MaxAngularVelocityWorks/leveldata/TimeOfDay.xml diff --git a/AutomatedTesting/Levels/Physics/C5932042_PhysxForceRegion_LinearDamping/leveldata/VegetationMap.dat b/AutomatedTesting/Levels/Physics/RigidBody_MaxAngularVelocityWorks/leveldata/VegetationMap.dat similarity index 100% rename from AutomatedTesting/Levels/Physics/C5932042_PhysxForceRegion_LinearDamping/leveldata/VegetationMap.dat rename to AutomatedTesting/Levels/Physics/RigidBody_MaxAngularVelocityWorks/leveldata/VegetationMap.dat diff --git a/AutomatedTesting/Levels/Physics/C5932041_PhysXForceRegion_LocalSpaceForceOnRigidBodies/tags.txt b/AutomatedTesting/Levels/Physics/RigidBody_MaxAngularVelocityWorks/tags.txt similarity index 100% rename from AutomatedTesting/Levels/Physics/C5932041_PhysXForceRegion_LocalSpaceForceOnRigidBodies/tags.txt rename to AutomatedTesting/Levels/Physics/RigidBody_MaxAngularVelocityWorks/tags.txt diff --git a/AutomatedTesting/Levels/Physics/C5932042_PhysxForceRegion_LinearDamping/terraintexture.pak b/AutomatedTesting/Levels/Physics/RigidBody_MaxAngularVelocityWorks/terraintexture.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C5932042_PhysxForceRegion_LinearDamping/terraintexture.pak rename to AutomatedTesting/Levels/Physics/RigidBody_MaxAngularVelocityWorks/terraintexture.pak diff --git a/AutomatedTesting/Levels/Physics/C5340400_RigidBody_ManualMomentOfInertia/C5340400_RigidBody_ManualMomentOfInertia.ly b/AutomatedTesting/Levels/Physics/RigidBody_MomentOfInertiaManualSetting/RigidBody_MomentOfInertiaManualSetting.ly similarity index 100% rename from AutomatedTesting/Levels/Physics/C5340400_RigidBody_ManualMomentOfInertia/C5340400_RigidBody_ManualMomentOfInertia.ly rename to AutomatedTesting/Levels/Physics/RigidBody_MomentOfInertiaManualSetting/RigidBody_MomentOfInertiaManualSetting.ly diff --git a/AutomatedTesting/Levels/Physics/C5340400_RigidBody_ManualMomentOfInertia/filelist.xml b/AutomatedTesting/Levels/Physics/RigidBody_MomentOfInertiaManualSetting/filelist.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C5340400_RigidBody_ManualMomentOfInertia/filelist.xml rename to AutomatedTesting/Levels/Physics/RigidBody_MomentOfInertiaManualSetting/filelist.xml diff --git a/AutomatedTesting/Levels/Physics/C5340400_RigidBody_ManualMomentOfInertia/level.pak b/AutomatedTesting/Levels/Physics/RigidBody_MomentOfInertiaManualSetting/level.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C5340400_RigidBody_ManualMomentOfInertia/level.pak rename to AutomatedTesting/Levels/Physics/RigidBody_MomentOfInertiaManualSetting/level.pak diff --git a/AutomatedTesting/Levels/Physics/C5689531_Warning_TerrainSliceTerrainComponent/leveldata/Environment.xml b/AutomatedTesting/Levels/Physics/RigidBody_MomentOfInertiaManualSetting/leveldata/Environment.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C5689531_Warning_TerrainSliceTerrainComponent/leveldata/Environment.xml rename to AutomatedTesting/Levels/Physics/RigidBody_MomentOfInertiaManualSetting/leveldata/Environment.xml diff --git a/AutomatedTesting/Levels/Physics/C5959808_ForceRegion_PositionOffset/leveldata/TerrainTexture.xml b/AutomatedTesting/Levels/Physics/RigidBody_MomentOfInertiaManualSetting/leveldata/TerrainTexture.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C5959808_ForceRegion_PositionOffset/leveldata/TerrainTexture.xml rename to AutomatedTesting/Levels/Physics/RigidBody_MomentOfInertiaManualSetting/leveldata/TerrainTexture.xml diff --git a/AutomatedTesting/Levels/Physics/C3510644_Collider_CollisionGroups/leveldata/TimeOfDay.xml b/AutomatedTesting/Levels/Physics/RigidBody_MomentOfInertiaManualSetting/leveldata/TimeOfDay.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C3510644_Collider_CollisionGroups/leveldata/TimeOfDay.xml rename to AutomatedTesting/Levels/Physics/RigidBody_MomentOfInertiaManualSetting/leveldata/TimeOfDay.xml diff --git a/AutomatedTesting/Levels/Physics/C5932043_ForceRegion_SimpleDragOnRigidBody/leveldata/VegetationMap.dat b/AutomatedTesting/Levels/Physics/RigidBody_MomentOfInertiaManualSetting/leveldata/VegetationMap.dat similarity index 100% rename from AutomatedTesting/Levels/Physics/C5932043_ForceRegion_SimpleDragOnRigidBody/leveldata/VegetationMap.dat rename to AutomatedTesting/Levels/Physics/RigidBody_MomentOfInertiaManualSetting/leveldata/VegetationMap.dat diff --git a/AutomatedTesting/Levels/Physics/C5932042_PhysxForceRegion_LinearDamping/tags.txt b/AutomatedTesting/Levels/Physics/RigidBody_MomentOfInertiaManualSetting/tags.txt similarity index 100% rename from AutomatedTesting/Levels/Physics/C5932042_PhysxForceRegion_LinearDamping/tags.txt rename to AutomatedTesting/Levels/Physics/RigidBody_MomentOfInertiaManualSetting/tags.txt diff --git a/AutomatedTesting/Levels/Physics/C6090550_ForceRegion_WorldSpaceForceNegative/terrain/terrain.pxheightfield b/AutomatedTesting/Levels/Physics/RigidBody_MomentOfInertiaManualSetting/terrain/terrain.pxheightfield similarity index 100% rename from AutomatedTesting/Levels/Physics/C6090550_ForceRegion_WorldSpaceForceNegative/terrain/terrain.pxheightfield rename to AutomatedTesting/Levels/Physics/RigidBody_MomentOfInertiaManualSetting/terrain/terrain.pxheightfield diff --git a/AutomatedTesting/Levels/Physics/C5932043_ForceRegion_SimpleDragOnRigidBody/terraintexture.pak b/AutomatedTesting/Levels/Physics/RigidBody_MomentOfInertiaManualSetting/terraintexture.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C5932043_ForceRegion_SimpleDragOnRigidBody/terraintexture.pak rename to AutomatedTesting/Levels/Physics/RigidBody_MomentOfInertiaManualSetting/terraintexture.pak diff --git a/AutomatedTesting/Levels/Physics/C14976307_Gravity_SetGravityWorks/C14976307_Gravity_SetGravityWorks.ly b/AutomatedTesting/Levels/Physics/RigidBody_SetGravityWorks/RigidBody_SetGravityWorks.ly similarity index 100% rename from AutomatedTesting/Levels/Physics/C14976307_Gravity_SetGravityWorks/C14976307_Gravity_SetGravityWorks.ly rename to AutomatedTesting/Levels/Physics/RigidBody_SetGravityWorks/RigidBody_SetGravityWorks.ly diff --git a/AutomatedTesting/Levels/Physics/C14976307_Gravity_SetGravityWorks/filelist.xml b/AutomatedTesting/Levels/Physics/RigidBody_SetGravityWorks/filelist.xml similarity index 73% rename from AutomatedTesting/Levels/Physics/C14976307_Gravity_SetGravityWorks/filelist.xml rename to AutomatedTesting/Levels/Physics/RigidBody_SetGravityWorks/filelist.xml index ce788cb735..a5b46d32ea 100644 --- a/AutomatedTesting/Levels/Physics/C14976307_Gravity_SetGravityWorks/filelist.xml +++ b/AutomatedTesting/Levels/Physics/RigidBody_SetGravityWorks/filelist.xml @@ -1,4 +1,4 @@ - + diff --git a/AutomatedTesting/Levels/Physics/C14976307_Gravity_SetGravityWorks/level.pak b/AutomatedTesting/Levels/Physics/RigidBody_SetGravityWorks/level.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C14976307_Gravity_SetGravityWorks/level.pak rename to AutomatedTesting/Levels/Physics/RigidBody_SetGravityWorks/level.pak diff --git a/AutomatedTesting/Levels/Physics/C5932040_ForceRegion_CubeExertsWorldForce/leveldata/Environment.xml b/AutomatedTesting/Levels/Physics/RigidBody_SetGravityWorks/leveldata/Environment.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C5932040_ForceRegion_CubeExertsWorldForce/leveldata/Environment.xml rename to AutomatedTesting/Levels/Physics/RigidBody_SetGravityWorks/leveldata/Environment.xml diff --git a/AutomatedTesting/Levels/Physics/C5689517_Verify_Terrain_Component/leveldata/GameTokens.xml b/AutomatedTesting/Levels/Physics/RigidBody_SetGravityWorks/leveldata/GameTokens.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C5689517_Verify_Terrain_Component/leveldata/GameTokens.xml rename to AutomatedTesting/Levels/Physics/RigidBody_SetGravityWorks/leveldata/GameTokens.xml diff --git a/AutomatedTesting/Levels/Physics/C4976244_Collider_SameGroupSameLayerCollision/leveldata/TerrainTexture.xml b/AutomatedTesting/Levels/Physics/RigidBody_SetGravityWorks/leveldata/TerrainTexture.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C4976244_Collider_SameGroupSameLayerCollision/leveldata/TerrainTexture.xml rename to AutomatedTesting/Levels/Physics/RigidBody_SetGravityWorks/leveldata/TerrainTexture.xml diff --git a/AutomatedTesting/Levels/Physics/C6090554_ForceRegion_PointForceNegative/leveldata/TimeOfDay.xml b/AutomatedTesting/Levels/Physics/RigidBody_SetGravityWorks/leveldata/TimeOfDay.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C6090554_ForceRegion_PointForceNegative/leveldata/TimeOfDay.xml rename to AutomatedTesting/Levels/Physics/RigidBody_SetGravityWorks/leveldata/TimeOfDay.xml diff --git a/AutomatedTesting/Levels/Physics/C5932044_PhysX_ForceRegion_PointForceOnRigidBodies/leveldata/VegetationMap.dat b/AutomatedTesting/Levels/Physics/RigidBody_SetGravityWorks/leveldata/VegetationMap.dat similarity index 100% rename from AutomatedTesting/Levels/Physics/C5932044_PhysX_ForceRegion_PointForceOnRigidBodies/leveldata/VegetationMap.dat rename to AutomatedTesting/Levels/Physics/RigidBody_SetGravityWorks/leveldata/VegetationMap.dat diff --git a/AutomatedTesting/Levels/Physics/C5932043_ForceRegion_SimpleDragOnRigidBody/tags.txt b/AutomatedTesting/Levels/Physics/RigidBody_SetGravityWorks/tags.txt similarity index 100% rename from AutomatedTesting/Levels/Physics/C5932043_ForceRegion_SimpleDragOnRigidBody/tags.txt rename to AutomatedTesting/Levels/Physics/RigidBody_SetGravityWorks/tags.txt diff --git a/AutomatedTesting/Levels/Physics/C4976242_Collision_SameCollisionlayerSameCollisiongroup/terrain/terrain.pxheightfield b/AutomatedTesting/Levels/Physics/RigidBody_SetGravityWorks/terrain/terrain.pxheightfield similarity index 100% rename from AutomatedTesting/Levels/Physics/C4976242_Collision_SameCollisionlayerSameCollisiongroup/terrain/terrain.pxheightfield rename to AutomatedTesting/Levels/Physics/RigidBody_SetGravityWorks/terrain/terrain.pxheightfield diff --git a/AutomatedTesting/Levels/Physics/C5932044_PhysX_ForceRegion_PointForceOnRigidBodies/terraintexture.pak b/AutomatedTesting/Levels/Physics/RigidBody_SetGravityWorks/terraintexture.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C5932044_PhysX_ForceRegion_PointForceOnRigidBodies/terraintexture.pak rename to AutomatedTesting/Levels/Physics/RigidBody_SetGravityWorks/terraintexture.pak diff --git a/AutomatedTesting/Levels/Physics/C4976202_RigidBody_StopsWhenBelowKineticThreshold/C4976202_RigidBody_StopsWhenBelowKineticThreshold.ly b/AutomatedTesting/Levels/Physics/RigidBody_SleepWhenBelowKineticThreshold/RigidBody_SleepWhenBelowKineticThreshold.ly similarity index 100% rename from AutomatedTesting/Levels/Physics/C4976202_RigidBody_StopsWhenBelowKineticThreshold/C4976202_RigidBody_StopsWhenBelowKineticThreshold.ly rename to AutomatedTesting/Levels/Physics/RigidBody_SleepWhenBelowKineticThreshold/RigidBody_SleepWhenBelowKineticThreshold.ly diff --git a/AutomatedTesting/Levels/Physics/C4976202_RigidBody_StopsWhenBelowKineticThreshold/filelist.xml b/AutomatedTesting/Levels/Physics/RigidBody_SleepWhenBelowKineticThreshold/filelist.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C4976202_RigidBody_StopsWhenBelowKineticThreshold/filelist.xml rename to AutomatedTesting/Levels/Physics/RigidBody_SleepWhenBelowKineticThreshold/filelist.xml diff --git a/AutomatedTesting/Levels/Physics/C4976202_RigidBody_StopsWhenBelowKineticThreshold/level.pak b/AutomatedTesting/Levels/Physics/RigidBody_SleepWhenBelowKineticThreshold/level.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C4976202_RigidBody_StopsWhenBelowKineticThreshold/level.pak rename to AutomatedTesting/Levels/Physics/RigidBody_SleepWhenBelowKineticThreshold/level.pak diff --git a/AutomatedTesting/Levels/Physics/C5932041_PhysXForceRegion_LocalSpaceForceOnRigidBodies/leveldata/Environment.xml b/AutomatedTesting/Levels/Physics/RigidBody_SleepWhenBelowKineticThreshold/leveldata/Environment.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C5932041_PhysXForceRegion_LocalSpaceForceOnRigidBodies/leveldata/Environment.xml rename to AutomatedTesting/Levels/Physics/RigidBody_SleepWhenBelowKineticThreshold/leveldata/Environment.xml diff --git a/AutomatedTesting/Levels/Physics/C5689522_Physxterrain_AddPhysxterrainNoEditorCrash/leveldata/GameTokens.xml b/AutomatedTesting/Levels/Physics/RigidBody_SleepWhenBelowKineticThreshold/leveldata/GameTokens.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C5689522_Physxterrain_AddPhysxterrainNoEditorCrash/leveldata/GameTokens.xml rename to AutomatedTesting/Levels/Physics/RigidBody_SleepWhenBelowKineticThreshold/leveldata/GameTokens.xml diff --git a/AutomatedTesting/Levels/Physics/C5959809_ForceRegion_RotationalOffset/leveldata/TerrainTexture.xml b/AutomatedTesting/Levels/Physics/RigidBody_SleepWhenBelowKineticThreshold/leveldata/TerrainTexture.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C5959809_ForceRegion_RotationalOffset/leveldata/TerrainTexture.xml rename to AutomatedTesting/Levels/Physics/RigidBody_SleepWhenBelowKineticThreshold/leveldata/TerrainTexture.xml diff --git a/AutomatedTesting/Levels/Physics/C5932041_PhysXForceRegion_LocalSpaceForceOnRigidBodies/leveldata/TimeOfDay.xml b/AutomatedTesting/Levels/Physics/RigidBody_SleepWhenBelowKineticThreshold/leveldata/TimeOfDay.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C5932041_PhysXForceRegion_LocalSpaceForceOnRigidBodies/leveldata/TimeOfDay.xml rename to AutomatedTesting/Levels/Physics/RigidBody_SleepWhenBelowKineticThreshold/leveldata/TimeOfDay.xml diff --git a/AutomatedTesting/Levels/Physics/C5932045_ForceRegion_Spline/leveldata/VegetationMap.dat b/AutomatedTesting/Levels/Physics/RigidBody_SleepWhenBelowKineticThreshold/leveldata/VegetationMap.dat similarity index 100% rename from AutomatedTesting/Levels/Physics/C5932045_ForceRegion_Spline/leveldata/VegetationMap.dat rename to AutomatedTesting/Levels/Physics/RigidBody_SleepWhenBelowKineticThreshold/leveldata/VegetationMap.dat diff --git a/AutomatedTesting/Levels/Physics/C5932044_PhysX_ForceRegion_PointForceOnRigidBodies/tags.txt b/AutomatedTesting/Levels/Physics/RigidBody_SleepWhenBelowKineticThreshold/tags.txt similarity index 100% rename from AutomatedTesting/Levels/Physics/C5932044_PhysX_ForceRegion_PointForceOnRigidBodies/tags.txt rename to AutomatedTesting/Levels/Physics/RigidBody_SleepWhenBelowKineticThreshold/tags.txt diff --git a/AutomatedTesting/Levels/Physics/C6090551_ForceRegion_LocalSpaceForceNegative/terrain/terrain.pxheightfield b/AutomatedTesting/Levels/Physics/RigidBody_SleepWhenBelowKineticThreshold/terrain/terrain.pxheightfield similarity index 100% rename from AutomatedTesting/Levels/Physics/C6090551_ForceRegion_LocalSpaceForceNegative/terrain/terrain.pxheightfield rename to AutomatedTesting/Levels/Physics/RigidBody_SleepWhenBelowKineticThreshold/terrain/terrain.pxheightfield diff --git a/AutomatedTesting/Levels/Physics/C5959759_RigidBody_ForceRegionSpherePointForce/terraintexture.pak b/AutomatedTesting/Levels/Physics/RigidBody_SleepWhenBelowKineticThreshold/terraintexture.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C5959759_RigidBody_ForceRegionSpherePointForce/terraintexture.pak rename to AutomatedTesting/Levels/Physics/RigidBody_SleepWhenBelowKineticThreshold/terraintexture.pak diff --git a/AutomatedTesting/Levels/Physics/C4976204_Verify_Start_Asleep_Condition/C4976204_Verify_Start_Asleep_Condition.ly b/AutomatedTesting/Levels/Physics/RigidBody_StartAsleepWorks/RigidBody_StartAsleepWorks.ly similarity index 100% rename from AutomatedTesting/Levels/Physics/C4976204_Verify_Start_Asleep_Condition/C4976204_Verify_Start_Asleep_Condition.ly rename to AutomatedTesting/Levels/Physics/RigidBody_StartAsleepWorks/RigidBody_StartAsleepWorks.ly diff --git a/AutomatedTesting/Levels/Physics/C4976204_Verify_Start_Asleep_Condition/filelist.xml b/AutomatedTesting/Levels/Physics/RigidBody_StartAsleepWorks/filelist.xml similarity index 72% rename from AutomatedTesting/Levels/Physics/C4976204_Verify_Start_Asleep_Condition/filelist.xml rename to AutomatedTesting/Levels/Physics/RigidBody_StartAsleepWorks/filelist.xml index 8b4484f96c..d2ce82359b 100644 --- a/AutomatedTesting/Levels/Physics/C4976204_Verify_Start_Asleep_Condition/filelist.xml +++ b/AutomatedTesting/Levels/Physics/RigidBody_StartAsleepWorks/filelist.xml @@ -1,4 +1,4 @@ - + diff --git a/AutomatedTesting/Levels/Physics/C4976204_Verify_Start_Asleep_Condition/level.pak b/AutomatedTesting/Levels/Physics/RigidBody_StartAsleepWorks/level.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C4976204_Verify_Start_Asleep_Condition/level.pak rename to AutomatedTesting/Levels/Physics/RigidBody_StartAsleepWorks/level.pak diff --git a/AutomatedTesting/Levels/Physics/C5932042_PhysxForceRegion_LinearDamping/leveldata/Environment.xml b/AutomatedTesting/Levels/Physics/RigidBody_StartAsleepWorks/leveldata/Environment.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C5932042_PhysxForceRegion_LinearDamping/leveldata/Environment.xml rename to AutomatedTesting/Levels/Physics/RigidBody_StartAsleepWorks/leveldata/Environment.xml diff --git a/AutomatedTesting/Levels/Physics/C5689524_MultipleTerrains_CheckWarningInConsole/leveldata/GameTokens.xml b/AutomatedTesting/Levels/Physics/RigidBody_StartAsleepWorks/leveldata/GameTokens.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C5689524_MultipleTerrains_CheckWarningInConsole/leveldata/GameTokens.xml rename to AutomatedTesting/Levels/Physics/RigidBody_StartAsleepWorks/leveldata/GameTokens.xml diff --git a/AutomatedTesting/Levels/Physics/C5296614_PhysXMaterial_ColliderShape/leveldata/TerrainTexture.xml b/AutomatedTesting/Levels/Physics/RigidBody_StartAsleepWorks/leveldata/TerrainTexture.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C5296614_PhysXMaterial_ColliderShape/leveldata/TerrainTexture.xml rename to AutomatedTesting/Levels/Physics/RigidBody_StartAsleepWorks/leveldata/TerrainTexture.xml diff --git a/AutomatedTesting/Levels/Physics/C5932042_PhysxForceRegion_LinearDamping/leveldata/TimeOfDay.xml b/AutomatedTesting/Levels/Physics/RigidBody_StartAsleepWorks/leveldata/TimeOfDay.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C5932042_PhysxForceRegion_LinearDamping/leveldata/TimeOfDay.xml rename to AutomatedTesting/Levels/Physics/RigidBody_StartAsleepWorks/leveldata/TimeOfDay.xml diff --git a/AutomatedTesting/Levels/Physics/C5959759_RigidBody_ForceRegionSpherePointForce/leveldata/VegetationMap.dat b/AutomatedTesting/Levels/Physics/RigidBody_StartAsleepWorks/leveldata/VegetationMap.dat similarity index 100% rename from AutomatedTesting/Levels/Physics/C5959759_RigidBody_ForceRegionSpherePointForce/leveldata/VegetationMap.dat rename to AutomatedTesting/Levels/Physics/RigidBody_StartAsleepWorks/leveldata/VegetationMap.dat diff --git a/AutomatedTesting/Levels/Physics/C5932045_ForceRegion_Spline/tags.txt b/AutomatedTesting/Levels/Physics/RigidBody_StartAsleepWorks/tags.txt similarity index 100% rename from AutomatedTesting/Levels/Physics/C5932045_ForceRegion_Spline/tags.txt rename to AutomatedTesting/Levels/Physics/RigidBody_StartAsleepWorks/tags.txt diff --git a/AutomatedTesting/Levels/Physics/C4976243_Collision_SameCollisionGroupDiffCollisionLayers/terrain/terrain.pxheightfield b/AutomatedTesting/Levels/Physics/RigidBody_StartAsleepWorks/terrain/terrain.pxheightfield similarity index 100% rename from AutomatedTesting/Levels/Physics/C4976243_Collision_SameCollisionGroupDiffCollisionLayers/terrain/terrain.pxheightfield rename to AutomatedTesting/Levels/Physics/RigidBody_StartAsleepWorks/terrain/terrain.pxheightfield diff --git a/AutomatedTesting/Levels/Physics/C5959760_PhysxForceRegion_PointForceExertion/terraintexture.pak b/AutomatedTesting/Levels/Physics/RigidBody_StartAsleepWorks/terraintexture.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C5959760_PhysxForceRegion_PointForceExertion/terraintexture.pak rename to AutomatedTesting/Levels/Physics/RigidBody_StartAsleepWorks/terraintexture.pak diff --git a/AutomatedTesting/Levels/Physics/C4976206_RigidBodies_VerifyGravity/C4976206_RigidBodies_VerifyGravity.ly b/AutomatedTesting/Levels/Physics/RigidBody_StartGravityEnabledWorks/RigidBody_StartGravityEnabledWorks.ly similarity index 100% rename from AutomatedTesting/Levels/Physics/C4976206_RigidBodies_VerifyGravity/C4976206_RigidBodies_VerifyGravity.ly rename to AutomatedTesting/Levels/Physics/RigidBody_StartGravityEnabledWorks/RigidBody_StartGravityEnabledWorks.ly diff --git a/AutomatedTesting/Levels/Physics/C4976206_RigidBodies_VerifyGravity/filelist.xml b/AutomatedTesting/Levels/Physics/RigidBody_StartGravityEnabledWorks/filelist.xml similarity index 73% rename from AutomatedTesting/Levels/Physics/C4976206_RigidBodies_VerifyGravity/filelist.xml rename to AutomatedTesting/Levels/Physics/RigidBody_StartGravityEnabledWorks/filelist.xml index 95411dfb91..8c02bcf6a6 100644 --- a/AutomatedTesting/Levels/Physics/C4976206_RigidBodies_VerifyGravity/filelist.xml +++ b/AutomatedTesting/Levels/Physics/RigidBody_StartGravityEnabledWorks/filelist.xml @@ -1,4 +1,4 @@ - + diff --git a/AutomatedTesting/Levels/Physics/C4976206_RigidBodies_VerifyGravity/level.pak b/AutomatedTesting/Levels/Physics/RigidBody_StartGravityEnabledWorks/level.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C4976206_RigidBodies_VerifyGravity/level.pak rename to AutomatedTesting/Levels/Physics/RigidBody_StartGravityEnabledWorks/level.pak diff --git a/AutomatedTesting/Levels/Physics/C5932043_ForceRegion_SimpleDragOnRigidBody/leveldata/Environment.xml b/AutomatedTesting/Levels/Physics/RigidBody_StartGravityEnabledWorks/leveldata/Environment.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C5932043_ForceRegion_SimpleDragOnRigidBody/leveldata/Environment.xml rename to AutomatedTesting/Levels/Physics/RigidBody_StartGravityEnabledWorks/leveldata/Environment.xml diff --git a/AutomatedTesting/Levels/Physics/C5689517_Verify_Terrain_Component/leveldata/TerrainTexture.xml b/AutomatedTesting/Levels/Physics/RigidBody_StartGravityEnabledWorks/leveldata/TerrainTexture.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C5689517_Verify_Terrain_Component/leveldata/TerrainTexture.xml rename to AutomatedTesting/Levels/Physics/RigidBody_StartGravityEnabledWorks/leveldata/TerrainTexture.xml diff --git a/AutomatedTesting/Levels/Physics/C4976206_RigidBodies_VerifyGravity/leveldata/TimeOfDay.xml b/AutomatedTesting/Levels/Physics/RigidBody_StartGravityEnabledWorks/leveldata/TimeOfDay.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C4976206_RigidBodies_VerifyGravity/leveldata/TimeOfDay.xml rename to AutomatedTesting/Levels/Physics/RigidBody_StartGravityEnabledWorks/leveldata/TimeOfDay.xml diff --git a/AutomatedTesting/Levels/Physics/C5959760_PhysxForceRegion_PointForceExertion/leveldata/VegetationMap.dat b/AutomatedTesting/Levels/Physics/RigidBody_StartGravityEnabledWorks/leveldata/VegetationMap.dat similarity index 100% rename from AutomatedTesting/Levels/Physics/C5959760_PhysxForceRegion_PointForceExertion/leveldata/VegetationMap.dat rename to AutomatedTesting/Levels/Physics/RigidBody_StartGravityEnabledWorks/leveldata/VegetationMap.dat diff --git a/AutomatedTesting/Levels/Physics/C5959759_RigidBody_ForceRegionSpherePointForce/tags.txt b/AutomatedTesting/Levels/Physics/RigidBody_StartGravityEnabledWorks/tags.txt similarity index 100% rename from AutomatedTesting/Levels/Physics/C5959759_RigidBody_ForceRegionSpherePointForce/tags.txt rename to AutomatedTesting/Levels/Physics/RigidBody_StartGravityEnabledWorks/tags.txt diff --git a/AutomatedTesting/Levels/Physics/C5689517_Verify_Terrain_Component/terrain/terrain.pxheightfield b/AutomatedTesting/Levels/Physics/RigidBody_StartGravityEnabledWorks/terrain/terrain.pxheightfield similarity index 100% rename from AutomatedTesting/Levels/Physics/C5689517_Verify_Terrain_Component/terrain/terrain.pxheightfield rename to AutomatedTesting/Levels/Physics/RigidBody_StartGravityEnabledWorks/terrain/terrain.pxheightfield diff --git a/AutomatedTesting/Levels/Physics/C5959761_ForceRegion_ExertsPointForce_Sedan/terraintexture.pak b/AutomatedTesting/Levels/Physics/RigidBody_StartGravityEnabledWorks/terraintexture.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C5959761_ForceRegion_ExertsPointForce_Sedan/terraintexture.pak rename to AutomatedTesting/Levels/Physics/RigidBody_StartGravityEnabledWorks/terraintexture.pak diff --git a/AutomatedTesting/Levels/Physics/ScriptCanvas_CollisionEvents/ScriptCanvas_CollisionEvents.ly b/AutomatedTesting/Levels/Physics/ScriptCanvas_CollisionEvents/ScriptCanvas_CollisionEvents.ly new file mode 100644 index 0000000000..6c70bbf067 --- /dev/null +++ b/AutomatedTesting/Levels/Physics/ScriptCanvas_CollisionEvents/ScriptCanvas_CollisionEvents.ly @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c1b6f5e409a8358ad95b310473046ce1a2f2aa5f7e05d0c3396044aa52aa7f6d +size 9103 diff --git a/AutomatedTesting/Levels/Physics/ScriptCanvas_CollisionEvents/collision_events_script.scriptcanvas b/AutomatedTesting/Levels/Physics/ScriptCanvas_CollisionEvents/collision_events_script.scriptcanvas new file mode 100644 index 0000000000..a565c64b60 --- /dev/null +++ b/AutomatedTesting/Levels/Physics/ScriptCanvas_CollisionEvents/collision_events_script.scriptcanvas @@ -0,0 +1,4410 @@ +{ + "Type": "JsonSerialization", + "Version": 1, + "ClassName": "ScriptCanvasData", + "ClassData": { + "m_scriptCanvas": { + "Id": { + "id": 70086661081986 + }, + "Name": "collision_events_script", + "Components": { + "Component_[13153882817173497697]": { + "$type": "{4D755CA9-AB92-462C-B24F-0B3376F19967} Graph", + "Id": 13153882817173497697, + "m_graphData": { + "m_nodes": [ + { + "Id": { + "id": 70125315787650 + }, + "Name": "SC-Node(Print)", + "Components": { + "Component_[1173692688122057083]": { + "$type": "Print", + "Id": 1173692688122057083, + "Slots": [ + { + "id": { + "m_id": "{8A68C668-FF05-4B9C-8AF3-20BA7AC5A783}" + }, + "contracts": [ + { + "$type": "SlotTypeContract" + } + ], + "slotName": "In", + "toolTip": "Input signal", + "Descriptor": { + "ConnectionType": 1, + "SlotType": 1 + } + }, + { + "id": { + "m_id": "{5C006406-F28E-4060-8CB9-E80C0B10BBFD}" + }, + "contracts": [ + { + "$type": "SlotTypeContract" + } + ], + "slotName": "Out", + "Descriptor": { + "ConnectionType": 2, + "SlotType": 1 + } + } + ], + "m_format": "deac", + "m_unresolvedString": [ + "deac" + ] + } + } + }, + { + "Id": { + "id": 70095251016578 + }, + "Name": "SC-Node((NodeFunctionGenericMultiReturn)<{bool(const EntityId& )}* IsActiveTraits >)", + "Components": { + "Component_[12935774704733363494]": { + "$type": "(NodeFunctionGenericMultiReturn)<{bool(const EntityId& )}* IsActiveTraits >", + "Id": 12935774704733363494, + "Slots": [ + { + "id": { + "m_id": "{5A9AE174-D5E3-4512-A0BF-BA442C001F00}" + }, + "contracts": [ + { + "$type": "SlotTypeContract" + } + ], + "slotName": "In", + "Descriptor": { + "ConnectionType": 1, + "SlotType": 1 + } + }, + { + "id": { + "m_id": "{3E203C3C-5BEE-4D9A-B323-C2E4E1FC6A4E}" + }, + "contracts": [ + { + "$type": "SlotTypeContract" + } + ], + "slotName": "Out", + "Descriptor": { + "ConnectionType": 2, + "SlotType": 1 + } + }, + { + "id": { + "m_id": "{170B4D1A-5D4A-466F-98AF-A51747B2623A}" + }, + "contracts": [ + { + "$type": "SlotTypeContract" + }, + null + ], + "slotName": "EntityID: Entity Id", + "Descriptor": { + "ConnectionType": 1, + "SlotType": 2 + }, + "DataType": 1 + }, + { + "id": { + "m_id": "{14EE86BB-E7E2-4210-B5ED-8F543D82F66C}" + }, + "contracts": [ + { + "$type": "SlotTypeContract" + } + ], + "slotName": "Result: Boolean", + "DisplayDataType": { + "m_type": 0 + }, + "Descriptor": { + "ConnectionType": 2, + "SlotType": 2 + }, + "DataType": 1 + } + ], + "Datums": [ + { + "scriptCanvasType": { + "m_type": 1 + }, + "isNullPointer": false, + "$type": "EntityId", + "value": { + "id": 2901262558 + }, + "label": "EntityID: Entity Id" + } + ], + "Initialized": true + } + } + }, + { + "Id": { + "id": 70163970493314 + }, + "Name": "SC-Node((NodeFunctionGenericMultiReturn)<{bool(const EntityId& )}* IsActiveTraits >)", + "Components": { + "Component_[12935774704733363494]": { + "$type": "(NodeFunctionGenericMultiReturn)<{bool(const EntityId& )}* IsActiveTraits >", + "Id": 12935774704733363494, + "Slots": [ + { + "id": { + "m_id": "{5A9AE174-D5E3-4512-A0BF-BA442C001F00}" + }, + "contracts": [ + { + "$type": "SlotTypeContract" + } + ], + "slotName": "In", + "Descriptor": { + "ConnectionType": 1, + "SlotType": 1 + } + }, + { + "id": { + "m_id": "{3E203C3C-5BEE-4D9A-B323-C2E4E1FC6A4E}" + }, + "contracts": [ + { + "$type": "SlotTypeContract" + } + ], + "slotName": "Out", + "Descriptor": { + "ConnectionType": 2, + "SlotType": 1 + } + }, + { + "id": { + "m_id": "{170B4D1A-5D4A-466F-98AF-A51747B2623A}" + }, + "contracts": [ + { + "$type": "SlotTypeContract" + }, + null + ], + "slotName": "EntityID: Entity Id", + "Descriptor": { + "ConnectionType": 1, + "SlotType": 2 + }, + "DataType": 1 + }, + { + "id": { + "m_id": "{14EE86BB-E7E2-4210-B5ED-8F543D82F66C}" + }, + "contracts": [ + { + "$type": "SlotTypeContract" + } + ], + "slotName": "Result: Boolean", + "DisplayDataType": { + "m_type": 0 + }, + "Descriptor": { + "ConnectionType": 2, + "SlotType": 2 + }, + "DataType": 1 + } + ], + "Datums": [ + { + "scriptCanvasType": { + "m_type": 1 + }, + "isNullPointer": false, + "$type": "EntityId", + "value": { + "id": 2901262558 + }, + "label": "EntityID: Entity Id" + } + ], + "Initialized": true + } + } + }, + { + "Id": { + "id": 70172560427906 + }, + "Name": "SC-Node((NodeFunctionGenericMultiReturn)<{bool(const EntityId& )}* IsActiveTraits >)", + "Components": { + "Component_[12935774704733363494]": { + "$type": "(NodeFunctionGenericMultiReturn)<{bool(const EntityId& )}* IsActiveTraits >", + "Id": 12935774704733363494, + "Slots": [ + { + "id": { + "m_id": "{5A9AE174-D5E3-4512-A0BF-BA442C001F00}" + }, + "contracts": [ + { + "$type": "SlotTypeContract" + } + ], + "slotName": "In", + "Descriptor": { + "ConnectionType": 1, + "SlotType": 1 + } + }, + { + "id": { + "m_id": "{3E203C3C-5BEE-4D9A-B323-C2E4E1FC6A4E}" + }, + "contracts": [ + { + "$type": "SlotTypeContract" + } + ], + "slotName": "Out", + "Descriptor": { + "ConnectionType": 2, + "SlotType": 1 + } + }, + { + "id": { + "m_id": "{170B4D1A-5D4A-466F-98AF-A51747B2623A}" + }, + "contracts": [ + { + "$type": "SlotTypeContract" + }, + null + ], + "slotName": "EntityID: Entity Id", + "Descriptor": { + "ConnectionType": 1, + "SlotType": 2 + }, + "DataType": 1 + }, + { + "id": { + "m_id": "{14EE86BB-E7E2-4210-B5ED-8F543D82F66C}" + }, + "contracts": [ + { + "$type": "SlotTypeContract" + } + ], + "slotName": "Result: Boolean", + "DisplayDataType": { + "m_type": 0 + }, + "Descriptor": { + "ConnectionType": 2, + "SlotType": 2 + }, + "DataType": 1 + } + ], + "Datums": [ + { + "scriptCanvasType": { + "m_type": 1 + }, + "isNullPointer": false, + "$type": "EntityId", + "value": { + "id": 2901262558 + }, + "label": "EntityID: Entity Id" + } + ], + "Initialized": true + } + } + }, + { + "Id": { + "id": 70121020820354 + }, + "Name": "SC Node(GetVariable)", + "Components": { + "Component_[13696321695736204082]": { + "$type": "GetVariableNode", + "Id": 13696321695736204082, + "Slots": [ + { + "id": { + "m_id": "{7A817841-79D4-41FC-97DA-72E599A770CC}" + }, + "contracts": [ + { + "$type": "SlotTypeContract" + } + ], + "slotName": "In", + "toolTip": "When signaled sends the property referenced by this node to a Data Output slot", + "Descriptor": { + "ConnectionType": 1, + "SlotType": 1 + } + }, + { + "id": { + "m_id": "{6B862981-524C-4643-A2C2-9454CB1FD552}" + }, + "contracts": [ + { + "$type": "SlotTypeContract" + } + ], + "slotName": "Out", + "toolTip": "Signaled after the referenced property has been pushed to the Data Output slot", + "Descriptor": { + "ConnectionType": 2, + "SlotType": 1 + } + }, + { + "id": { + "m_id": "{640B69D0-23E0-4A8E-BB94-477CFDE2E5F5}" + }, + "contracts": [ + { + "$type": "SlotTypeContract" + } + ], + "slotName": "EntityID", + "DisplayDataType": { + "m_type": 1 + }, + "Descriptor": { + "ConnectionType": 2, + "SlotType": 2 + }, + "DataType": 1 + } + ], + "m_variableId": { + "m_id": "{C802DF6D-82C4-4648-81AD-99DB01A03B3B}" + }, + "m_variableDataOutSlotId": { + "m_id": "{640B69D0-23E0-4A8E-BB94-477CFDE2E5F5}" + } + } + } + }, + { + "Id": { + "id": 70112430885762 + }, + "Name": "SC-EventNode(On Collision Begin event)", + "Components": { + "Component_[14000580813563007620]": { + "$type": "AzEventHandler", + "Id": 14000580813563007620, + "Slots": [ + { + "id": { + "m_id": "{74B54CB0-A72C-4A6A-ABB3-9EA6529DDF78}" + }, + "contracts": [ + { + "$type": "SlotTypeContract" + }, + { + "$type": "ConnectionLimitContract", + "limit": 1 + }, + { + "$type": "RestrictedNodeContract", + "m_nodeId": { + "id": 70142495656834 + } + } + ], + "slotName": "Connect", + "toolTip": "Connect the AZ Event to this AZ Event Handler.", + "Descriptor": { + "ConnectionType": 1, + "SlotType": 1 + } + }, + { + "id": { + "m_id": "{8DDBE14E-02C2-49A2-ABB1-47EC97B5D970}" + }, + "contracts": [ + { + "$type": "SlotTypeContract" + } + ], + "slotName": "Disconnect", + "toolTip": "Disconnect current AZ Event from this AZ Event Handler.", + "Descriptor": { + "ConnectionType": 1, + "SlotType": 1 + } + }, + { + "id": { + "m_id": "{0EE06A10-EB10-4C5D-AB8F-D7B8B7A921E0}" + }, + "contracts": [ + { + "$type": "SlotTypeContract" + } + ], + "slotName": "On Connected", + "toolTip": "Signaled when a connection has taken place.", + "Descriptor": { + "ConnectionType": 2, + "SlotType": 1 + } + }, + { + "id": { + "m_id": "{8B0C1988-7783-42F5-A3C5-42184B5DC7FE}" + }, + "contracts": [ + { + "$type": "SlotTypeContract" + } + ], + "slotName": "On Disconnected", + "toolTip": "Signaled when this event handler is disconnected.", + "Descriptor": { + "ConnectionType": 2, + "SlotType": 1 + } + }, + { + "id": { + "m_id": "{E32049C5-FF99-4E74-91EC-D007B0D6EF7B}" + }, + "contracts": [ + { + "$type": "SlotTypeContract" + } + ], + "slotName": "OnEvent", + "toolTip": "Triggered when the AZ Event invokes Signal() function.", + "Descriptor": { + "ConnectionType": 2, + "SlotType": 1 + }, + "IsLatent": true + }, + { + "id": { + "m_id": "{B3D58CDB-A773-47CE-B06D-BA3CF619A8E3}" + }, + "contracts": [ + { + "$type": "SlotTypeContract" + } + ], + "slotName": "Simulated Body Handle", + "DisplayDataType": { + "m_type": 4, + "m_azType": "{53C0CD3E-D0FC-5D90-9E9B-EF364D430B08}" + }, + "Descriptor": { + "ConnectionType": 2, + "SlotType": 2 + }, + "DataType": 1 + }, + { + "id": { + "m_id": "{51A6844B-AD3E-48C3-8770-20E425CA125A}" + }, + "contracts": [ + { + "$type": "SlotTypeContract" + } + ], + "slotName": "Collision Event", + "DisplayDataType": { + "m_type": 4, + "m_azType": "{7602AA36-792C-4BDC-BDF8-AA16792151A3}" + }, + "Descriptor": { + "ConnectionType": 2, + "SlotType": 2 + }, + "DataType": 1 + }, + { + "id": { + "m_id": "{F7A6B1A7-EB72-45DE-8A87-7C6E36FCA2A3}" + }, + "contracts": [ + { + "$type": "SlotTypeContract" + }, + null, + { + "$type": "ConnectionLimitContract", + "limit": 1 + }, + { + "$type": "RestrictedNodeContract", + "m_nodeId": { + "id": 70142495656834 + } + } + ], + "slotName": "On Collision Begin event", + "Descriptor": { + "ConnectionType": 1, + "SlotType": 2 + }, + "DataType": 1 + } + ], + "Datums": [ + {} + ], + "m_azEventEntry": { + "m_eventName": "On Collision Begin event", + "m_parameterSlotIds": [ + { + "m_id": "{B3D58CDB-A773-47CE-B06D-BA3CF619A8E3}" + }, + { + "m_id": "{51A6844B-AD3E-48C3-8770-20E425CA125A}" + }, + { + "m_id": "{B3D58CDB-A773-47CE-B06D-BA3CF619A8E3}" + }, + { + "m_id": "{51A6844B-AD3E-48C3-8770-20E425CA125A}" + } + ], + "m_parameterNames": [ + { + "m_id": "{B3D58CDB-A773-47CE-B06D-BA3CF619A8E3}" + }, + { + "m_id": "{51A6844B-AD3E-48C3-8770-20E425CA125A}" + }, + { + "m_id": "{B3D58CDB-A773-47CE-B06D-BA3CF619A8E3}" + }, + { + "m_id": "{51A6844B-AD3E-48C3-8770-20E425CA125A}" + } + ], + "m_eventSlotId": { + "m_id": "{F7A6B1A7-EB72-45DE-8A87-7C6E36FCA2A3}" + } + } + } + } + }, + { + "Id": { + "id": 70099545983874 + }, + "Name": "SC Node(GetVariable)", + "Components": { + "Component_[142618354415180427]": { + "$type": "GetVariableNode", + "Id": 142618354415180427, + "Slots": [ + { + "id": { + "m_id": "{245126A2-D7FE-4C59-BF8D-46F791EEE730}" + }, + "contracts": [ + { + "$type": "SlotTypeContract" + } + ], + "slotName": "In", + "toolTip": "When signaled sends the property referenced by this node to a Data Output slot", + "Descriptor": { + "ConnectionType": 1, + "SlotType": 1 + } + }, + { + "id": { + "m_id": "{DF9C6AFF-531F-4E74-80CC-1F6889A1CE9E}" + }, + "contracts": [ + { + "$type": "SlotTypeContract" + } + ], + "slotName": "Out", + "toolTip": "Signaled after the referenced property has been pushed to the Data Output slot", + "Descriptor": { + "ConnectionType": 2, + "SlotType": 1 + } + }, + { + "id": { + "m_id": "{6DDB4692-35F9-4570-B914-951F1FFAB089}" + }, + "contracts": [ + { + "$type": "SlotTypeContract" + } + ], + "slotName": "EntityID", + "DisplayDataType": { + "m_type": 1 + }, + "Descriptor": { + "ConnectionType": 2, + "SlotType": 2 + }, + "DataType": 1 + } + ], + "m_variableId": { + "m_id": "{79C630E7-2ED7-40E9-929D-6D88FC32ADD9}" + }, + "m_variableDataOutSlotId": { + "m_id": "{6DDB4692-35F9-4570-B914-951F1FFAB089}" + } + } + } + }, + { + "Id": { + "id": 70142495656834 + }, + "Name": "SC-Node(GetOnCollisionBeginEvent)", + "Components": { + "Component_[14536104846481825629]": { + "$type": "{E42861BD-1956-45AE-8DD7-CCFC1E3E5ACF} Method", + "Id": 14536104846481825629, + "Slots": [ + { + "id": { + "m_id": "{C1CC691F-49A7-4348-89AD-F11BFBE3AFAE}" + }, + "contracts": [ + { + "$type": "SlotTypeContract" + }, + null + ], + "slotName": "EntityID: 0", + "Descriptor": { + "ConnectionType": 1, + "SlotType": 2 + }, + "DataType": 1 + }, + { + "id": { + "m_id": "{88B3237D-3297-4837-A80A-19ECAB4B4D61}" + }, + "contracts": [ + { + "$type": "SlotTypeContract" + } + ], + "slotName": "In", + "Descriptor": { + "ConnectionType": 1, + "SlotType": 1 + } + }, + { + "id": { + "m_id": "{5AD134C7-A8BC-4BE7-B815-68901BBEBE0D}" + }, + "contracts": [ + { + "$type": "SlotTypeContract" + } + ], + "slotName": "Out", + "Descriptor": { + "ConnectionType": 2, + "SlotType": 1 + } + }, + { + "id": { + "m_id": "{FCF4B185-2AD4-42BD-A304-B36B437CEA61}" + }, + "contracts": [ + { + "$type": "SlotTypeContract" + } + ], + "slotName": "Result: Event const CollisionEvent& >", + "DisplayDataType": { + "m_type": 4, + "m_azType": "{4C19E257-F929-524E-80E3-C910C5F3E2D9}" + }, + "Descriptor": { + "ConnectionType": 2, + "SlotType": 2 + }, + "DataType": 1 + } + ], + "Datums": [ + { + "scriptCanvasType": { + "m_type": 1 + }, + "isNullPointer": false, + "$type": "EntityId", + "value": { + "id": 2901262558 + }, + "label": "EntityID: 0" + } + ], + "methodType": 2, + "methodName": "GetOnCollisionBeginEvent", + "className": "SimulatedBody", + "resultSlotIDs": [ + {} + ], + "prettyClassName": "SimulatedBody" + } + } + }, + { + "Id": { + "id": 70159675526018 + }, + "Name": "EBusEventHandler", + "Components": { + "Component_[16532525056787595195]": { + "$type": "EBusEventHandler", + "Id": 16532525056787595195, + "Slots": [ + { + "id": { + "m_id": "{528D022F-3510-4351-8978-2B5B9B91CC7E}" + }, + "contracts": [ + { + "$type": "SlotTypeContract" + } + ], + "slotName": "Connect", + "toolTip": "Connect this event handler to the specified entity.", + "Descriptor": { + "ConnectionType": 1, + "SlotType": 1 + } + }, + { + "id": { + "m_id": "{99136E6F-622A-46D0-A7B7-A304B587DFDB}" + }, + "contracts": [ + { + "$type": "SlotTypeContract" + } + ], + "slotName": "Disconnect", + "toolTip": "Disconnect this event handler.", + "Descriptor": { + "ConnectionType": 1, + "SlotType": 1 + } + }, + { + "id": { + "m_id": "{8CC6ECD6-A855-4466-AEB9-BB822F6D1F62}" + }, + "contracts": [ + { + "$type": "SlotTypeContract" + } + ], + "slotName": "OnConnected", + "toolTip": "Signaled when a connection has taken place.", + "Descriptor": { + "ConnectionType": 2, + "SlotType": 1 + } + }, + { + "id": { + "m_id": "{EBFCFEBE-286E-4BAB-9E96-B85C6ED3E15A}" + }, + "contracts": [ + { + "$type": "SlotTypeContract" + } + ], + "slotName": "OnDisconnected", + "toolTip": "Signaled when this event handler is disconnected.", + "Descriptor": { + "ConnectionType": 2, + "SlotType": 1 + } + }, + { + "id": { + "m_id": "{C3C7D5F3-362A-48F7-A743-6838ABAEFBB2}" + }, + "contracts": [ + { + "$type": "SlotTypeContract" + } + ], + "slotName": "OnFailure", + "toolTip": "Signaled when it is not possible to connect this handler.", + "Descriptor": { + "ConnectionType": 2, + "SlotType": 1 + } + }, + { + "id": { + "m_id": "{910C1C48-E747-4C9E-80BF-2A2862BC9118}" + }, + "contracts": [ + { + "$type": "SlotTypeContract" + }, + null + ], + "slotName": "Source", + "toolTip": "ID used to connect on a specific Event address (Type: EntityId)", + "Descriptor": { + "ConnectionType": 1, + "SlotType": 2 + }, + "DataType": 1 + }, + { + "id": { + "m_id": "{1EAAB3AC-9A45-4A1D-ACD5-7A079F2991FC}" + }, + "contracts": [ + { + "$type": "SlotTypeContract" + } + ], + "slotName": "EntityID", + "DisplayDataType": { + "m_type": 1 + }, + "Descriptor": { + "ConnectionType": 2, + "SlotType": 2 + }, + "DataType": 1 + }, + { + "id": { + "m_id": "{4B50FCC8-C542-42E4-B17C-BD56173F1A26}" + }, + "contracts": [ + { + "$type": "SlotTypeContract" + } + ], + "slotName": "ExecutionSlot:OnEntityActivated", + "Descriptor": { + "ConnectionType": 2, + "SlotType": 1 + }, + "IsLatent": true + }, + { + "id": { + "m_id": "{69BA1262-6657-4F5A-B81D-8BAD804E8BD9}" + }, + "contracts": [ + { + "$type": "SlotTypeContract" + } + ], + "slotName": "EntityID", + "DisplayDataType": { + "m_type": 1 + }, + "Descriptor": { + "ConnectionType": 2, + "SlotType": 2 + }, + "DataType": 1 + }, + { + "id": { + "m_id": "{3439A9D1-B3B2-427A-82B6-86F5B75AD12D}" + }, + "contracts": [ + { + "$type": "SlotTypeContract" + } + ], + "slotName": "ExecutionSlot:OnEntityDeactivated", + "Descriptor": { + "ConnectionType": 2, + "SlotType": 1 + }, + "IsLatent": true + } + ], + "Datums": [ + { + "scriptCanvasType": { + "m_type": 1 + }, + "isNullPointer": false, + "$type": "EntityId", + "value": { + "id": 2901262558 + }, + "label": "Source" + } + ], + "m_eventMap": [ + { + "Key": { + "Value": 245425936 + }, + "Value": { + "m_eventName": "OnEntityActivated", + "m_eventId": { + "Value": 245425936 + }, + "m_eventSlotId": { + "m_id": "{4B50FCC8-C542-42E4-B17C-BD56173F1A26}" + }, + "m_parameterSlotIds": [ + { + "m_id": "{1EAAB3AC-9A45-4A1D-ACD5-7A079F2991FC}" + } + ], + "m_numExpectedArguments": 1 + } + }, + { + "Key": { + "Value": 4273369222 + }, + "Value": { + "m_eventName": "OnEntityDeactivated", + "m_eventId": { + "Value": 4273369222 + }, + "m_eventSlotId": { + "m_id": "{3439A9D1-B3B2-427A-82B6-86F5B75AD12D}" + }, + "m_parameterSlotIds": [ + { + "m_id": "{69BA1262-6657-4F5A-B81D-8BAD804E8BD9}" + } + ], + "m_numExpectedArguments": 1 + } + } + ], + "m_ebusName": "EntityBus", + "m_busId": { + "Value": 3358774020 + } + } + } + }, + { + "Id": { + "id": 70168265460610 + }, + "Name": "SC-Node(GetOnCollisionPersistEvent)", + "Components": { + "Component_[2456924078822417742]": { + "$type": "{E42861BD-1956-45AE-8DD7-CCFC1E3E5ACF} Method", + "Id": 2456924078822417742, + "Slots": [ + { + "id": { + "m_id": "{76C563E8-85C7-4E2F-A09A-9D982064F966}" + }, + "contracts": [ + { + "$type": "SlotTypeContract" + }, + null + ], + "slotName": "EntityID: 0", + "Descriptor": { + "ConnectionType": 1, + "SlotType": 2 + }, + "DataType": 1 + }, + { + "id": { + "m_id": "{7AE56C6B-CF55-4FC7-AA96-E5845B406017}" + }, + "contracts": [ + { + "$type": "SlotTypeContract" + } + ], + "slotName": "In", + "Descriptor": { + "ConnectionType": 1, + "SlotType": 1 + } + }, + { + "id": { + "m_id": "{8A08ADFB-F581-40F8-B900-A5A968A11F6D}" + }, + "contracts": [ + { + "$type": "SlotTypeContract" + } + ], + "slotName": "Out", + "Descriptor": { + "ConnectionType": 2, + "SlotType": 1 + } + }, + { + "id": { + "m_id": "{79F0D577-9326-4334-A996-74E400870874}" + }, + "contracts": [ + { + "$type": "SlotTypeContract" + } + ], + "slotName": "Result: Event const CollisionEvent& >", + "DisplayDataType": { + "m_type": 4, + "m_azType": "{4C19E257-F929-524E-80E3-C910C5F3E2D9}" + }, + "Descriptor": { + "ConnectionType": 2, + "SlotType": 2 + }, + "DataType": 1 + } + ], + "Datums": [ + { + "scriptCanvasType": { + "m_type": 1 + }, + "isNullPointer": false, + "$type": "EntityId", + "value": { + "id": 2901262558 + }, + "label": "EntityID: 0" + } + ], + "methodType": 2, + "methodName": "GetOnCollisionPersistEvent", + "className": "SimulatedBody", + "resultSlotIDs": [ + {} + ], + "prettyClassName": "SimulatedBody" + } + } + }, + { + "Id": { + "id": 70090956049282 + }, + "Name": "SC-Node(ActivateGameEntity)", + "Components": { + "Component_[277081290396690505]": { + "$type": "{E42861BD-1956-45AE-8DD7-CCFC1E3E5ACF} Method", + "Id": 277081290396690505, + "Slots": [ + { + "id": { + "m_id": "{4BCEF1F2-EB16-44C9-837F-CA936DAC9A2F}" + }, + "contracts": [ + { + "$type": "SlotTypeContract" + }, + null + ], + "slotName": "EntityID: 0", + "Descriptor": { + "ConnectionType": 1, + "SlotType": 2 + }, + "DataType": 1 + }, + { + "id": { + "m_id": "{53670F84-98ED-4559-A2EC-3D2285DBC8E3}" + }, + "contracts": [ + { + "$type": "SlotTypeContract" + } + ], + "slotName": "In", + "Descriptor": { + "ConnectionType": 1, + "SlotType": 1 + } + }, + { + "id": { + "m_id": "{1904FF69-ECF6-47AC-9318-2EBDAA8A5485}" + }, + "contracts": [ + { + "$type": "SlotTypeContract" + } + ], + "slotName": "Out", + "Descriptor": { + "ConnectionType": 2, + "SlotType": 1 + } + } + ], + "Datums": [ + { + "scriptCanvasType": { + "m_type": 1 + }, + "isNullPointer": false, + "$type": "EntityId", + "value": { + "id": 2901262558 + }, + "label": "EntityID: 0" + } + ], + "methodType": 0, + "methodName": "ActivateGameEntity", + "className": "GameEntityContextRequestBus", + "resultSlotIDs": [ + {} + ], + "prettyClassName": "GameEntityContextRequestBus" + } + } + }, + { + "Id": { + "id": 70129610754946 + }, + "Name": "SC-Node(ActivateGameEntity)", + "Components": { + "Component_[277081290396690505]": { + "$type": "{E42861BD-1956-45AE-8DD7-CCFC1E3E5ACF} Method", + "Id": 277081290396690505, + "Slots": [ + { + "id": { + "m_id": "{4BCEF1F2-EB16-44C9-837F-CA936DAC9A2F}" + }, + "contracts": [ + { + "$type": "SlotTypeContract" + }, + null + ], + "slotName": "EntityID: 0", + "Descriptor": { + "ConnectionType": 1, + "SlotType": 2 + }, + "DataType": 1 + }, + { + "id": { + "m_id": "{53670F84-98ED-4559-A2EC-3D2285DBC8E3}" + }, + "contracts": [ + { + "$type": "SlotTypeContract" + } + ], + "slotName": "In", + "Descriptor": { + "ConnectionType": 1, + "SlotType": 1 + } + }, + { + "id": { + "m_id": "{1904FF69-ECF6-47AC-9318-2EBDAA8A5485}" + }, + "contracts": [ + { + "$type": "SlotTypeContract" + } + ], + "slotName": "Out", + "Descriptor": { + "ConnectionType": 2, + "SlotType": 1 + } + } + ], + "Datums": [ + { + "scriptCanvasType": { + "m_type": 1 + }, + "isNullPointer": false, + "$type": "EntityId", + "value": { + "id": 2901262558 + }, + "label": "EntityID: 0" + } + ], + "methodType": 0, + "methodName": "ActivateGameEntity", + "className": "GameEntityContextRequestBus", + "resultSlotIDs": [ + {} + ], + "prettyClassName": "GameEntityContextRequestBus" + } + } + }, + { + "Id": { + "id": 70176855395202 + }, + "Name": "SC-Node(ActivateGameEntity)", + "Components": { + "Component_[277081290396690505]": { + "$type": "{E42861BD-1956-45AE-8DD7-CCFC1E3E5ACF} Method", + "Id": 277081290396690505, + "Slots": [ + { + "id": { + "m_id": "{4BCEF1F2-EB16-44C9-837F-CA936DAC9A2F}" + }, + "contracts": [ + { + "$type": "SlotTypeContract" + }, + null + ], + "slotName": "EntityID: 0", + "Descriptor": { + "ConnectionType": 1, + "SlotType": 2 + }, + "DataType": 1 + }, + { + "id": { + "m_id": "{53670F84-98ED-4559-A2EC-3D2285DBC8E3}" + }, + "contracts": [ + { + "$type": "SlotTypeContract" + } + ], + "slotName": "In", + "Descriptor": { + "ConnectionType": 1, + "SlotType": 1 + } + }, + { + "id": { + "m_id": "{1904FF69-ECF6-47AC-9318-2EBDAA8A5485}" + }, + "contracts": [ + { + "$type": "SlotTypeContract" + } + ], + "slotName": "Out", + "Descriptor": { + "ConnectionType": 2, + "SlotType": 1 + } + } + ], + "Datums": [ + { + "scriptCanvasType": { + "m_type": 1 + }, + "isNullPointer": false, + "$type": "EntityId", + "value": { + "id": 2901262558 + }, + "label": "EntityID: 0" + } + ], + "methodType": 0, + "methodName": "ActivateGameEntity", + "className": "GameEntityContextRequestBus", + "resultSlotIDs": [ + {} + ], + "prettyClassName": "GameEntityContextRequestBus" + } + } + }, + { + "Id": { + "id": 70133905722242 + }, + "Name": "SC-Node(GetOnCollisionEndEvent)", + "Components": { + "Component_[6024679188177357420]": { + "$type": "{E42861BD-1956-45AE-8DD7-CCFC1E3E5ACF} Method", + "Id": 6024679188177357420, + "Slots": [ + { + "id": { + "m_id": "{4C021C78-C51F-40AD-8D0C-E912A7216BEC}" + }, + "contracts": [ + { + "$type": "SlotTypeContract" + }, + null + ], + "slotName": "EntityID: 0", + "Descriptor": { + "ConnectionType": 1, + "SlotType": 2 + }, + "DataType": 1 + }, + { + "id": { + "m_id": "{F0E14922-5337-4F26-91ED-E23E557B8723}" + }, + "contracts": [ + { + "$type": "SlotTypeContract" + } + ], + "slotName": "In", + "Descriptor": { + "ConnectionType": 1, + "SlotType": 1 + } + }, + { + "id": { + "m_id": "{84128820-5F2E-497F-9B13-A262484DE323}" + }, + "contracts": [ + { + "$type": "SlotTypeContract" + } + ], + "slotName": "Out", + "Descriptor": { + "ConnectionType": 2, + "SlotType": 1 + } + }, + { + "id": { + "m_id": "{B825CA1B-36A9-4634-8D66-0C510EC4D4E8}" + }, + "contracts": [ + { + "$type": "SlotTypeContract" + } + ], + "slotName": "Result: Event const CollisionEvent& >", + "DisplayDataType": { + "m_type": 4, + "m_azType": "{4C19E257-F929-524E-80E3-C910C5F3E2D9}" + }, + "Descriptor": { + "ConnectionType": 2, + "SlotType": 2 + }, + "DataType": 1 + } + ], + "Datums": [ + { + "scriptCanvasType": { + "m_type": 1 + }, + "isNullPointer": false, + "$type": "EntityId", + "value": { + "id": 2901262558 + }, + "label": "EntityID: 0" + } + ], + "methodType": 2, + "methodName": "GetOnCollisionEndEvent", + "className": "SimulatedBody", + "resultSlotIDs": [ + {} + ], + "prettyClassName": "SimulatedBody" + } + } + }, + { + "Id": { + "id": 70181150362498 + }, + "Name": "SC-EventNode(On Collision Persist event)", + "Components": { + "Component_[6434307319231468785]": { + "$type": "AzEventHandler", + "Id": 6434307319231468785, + "Slots": [ + { + "id": { + "m_id": "{EB9CE3A4-B8A4-4436-9E3C-026580D17AC3}" + }, + "contracts": [ + { + "$type": "SlotTypeContract" + }, + { + "$type": "ConnectionLimitContract", + "limit": 1 + }, + { + "$type": "RestrictedNodeContract", + "m_nodeId": { + "id": 70168265460610 + } + } + ], + "slotName": "Connect", + "toolTip": "Connect the AZ Event to this AZ Event Handler.", + "Descriptor": { + "ConnectionType": 1, + "SlotType": 1 + } + }, + { + "id": { + "m_id": "{E5E8BE86-5B33-452C-BC59-FE4A6482048E}" + }, + "contracts": [ + { + "$type": "SlotTypeContract" + } + ], + "slotName": "Disconnect", + "toolTip": "Disconnect current AZ Event from this AZ Event Handler.", + "Descriptor": { + "ConnectionType": 1, + "SlotType": 1 + } + }, + { + "id": { + "m_id": "{FBAFC668-BD77-4ABB-8B93-E030D02DF348}" + }, + "contracts": [ + { + "$type": "SlotTypeContract" + } + ], + "slotName": "On Connected", + "toolTip": "Signaled when a connection has taken place.", + "Descriptor": { + "ConnectionType": 2, + "SlotType": 1 + } + }, + { + "id": { + "m_id": "{D37C1BFC-8EC1-4C8E-B6C3-FC036891A7ED}" + }, + "contracts": [ + { + "$type": "SlotTypeContract" + } + ], + "slotName": "On Disconnected", + "toolTip": "Signaled when this event handler is disconnected.", + "Descriptor": { + "ConnectionType": 2, + "SlotType": 1 + } + }, + { + "id": { + "m_id": "{1A994B40-F1C6-4F60-9F44-4CE42732554C}" + }, + "contracts": [ + { + "$type": "SlotTypeContract" + } + ], + "slotName": "OnEvent", + "toolTip": "Triggered when the AZ Event invokes Signal() function.", + "Descriptor": { + "ConnectionType": 2, + "SlotType": 1 + }, + "IsLatent": true + }, + { + "id": { + "m_id": "{7C28872F-1A80-496F-9D34-467A80D7B4EF}" + }, + "contracts": [ + { + "$type": "SlotTypeContract" + } + ], + "slotName": "Simulated Body Handle", + "DisplayDataType": { + "m_type": 4, + "m_azType": "{53C0CD3E-D0FC-5D90-9E9B-EF364D430B08}" + }, + "Descriptor": { + "ConnectionType": 2, + "SlotType": 2 + }, + "DataType": 1 + }, + { + "id": { + "m_id": "{0A68E758-7230-4202-A54E-EC7BDA2BE643}" + }, + "contracts": [ + { + "$type": "SlotTypeContract" + } + ], + "slotName": "Collision Event", + "DisplayDataType": { + "m_type": 4, + "m_azType": "{7602AA36-792C-4BDC-BDF8-AA16792151A3}" + }, + "Descriptor": { + "ConnectionType": 2, + "SlotType": 2 + }, + "DataType": 1 + }, + { + "id": { + "m_id": "{210423A5-D203-4C26-9B62-2B7DBA3320BD}" + }, + "contracts": [ + { + "$type": "SlotTypeContract" + }, + null, + { + "$type": "ConnectionLimitContract", + "limit": 1 + }, + { + "$type": "RestrictedNodeContract", + "m_nodeId": { + "id": 70168265460610 + } + } + ], + "slotName": "On Collision Persist event", + "Descriptor": { + "ConnectionType": 1, + "SlotType": 2 + }, + "DataType": 1 + } + ], + "Datums": [ + {} + ], + "m_azEventEntry": { + "m_eventName": "On Collision Persist event", + "m_parameterSlotIds": [ + { + "m_id": "{7C28872F-1A80-496F-9D34-467A80D7B4EF}" + }, + { + "m_id": "{0A68E758-7230-4202-A54E-EC7BDA2BE643}" + }, + { + "m_id": "{7C28872F-1A80-496F-9D34-467A80D7B4EF}" + }, + { + "m_id": "{0A68E758-7230-4202-A54E-EC7BDA2BE643}" + } + ], + "m_parameterNames": [ + { + "m_id": "{7C28872F-1A80-496F-9D34-467A80D7B4EF}" + }, + { + "m_id": "{0A68E758-7230-4202-A54E-EC7BDA2BE643}" + }, + { + "m_id": "{7C28872F-1A80-496F-9D34-467A80D7B4EF}" + }, + { + "m_id": "{0A68E758-7230-4202-A54E-EC7BDA2BE643}" + } + ], + "m_eventSlotId": { + "m_id": "{210423A5-D203-4C26-9B62-2B7DBA3320BD}" + } + } + } + } + }, + { + "Id": { + "id": 70103840951170 + }, + "Name": "SC-Node(DeactivateGameEntity)", + "Components": { + "Component_[846968981672785962]": { + "$type": "{E42861BD-1956-45AE-8DD7-CCFC1E3E5ACF} Method", + "Id": 846968981672785962, + "Slots": [ + { + "id": { + "m_id": "{993AA3E4-ABCF-40FF-9CCB-030F22627151}" + }, + "contracts": [ + { + "$type": "SlotTypeContract" + }, + null + ], + "slotName": "EntityID: 0", + "Descriptor": { + "ConnectionType": 1, + "SlotType": 2 + }, + "DataType": 1 + }, + { + "id": { + "m_id": "{A015E6E8-A025-4A2D-B1D4-E7D8732FCE52}" + }, + "contracts": [ + { + "$type": "SlotTypeContract" + } + ], + "slotName": "In", + "Descriptor": { + "ConnectionType": 1, + "SlotType": 1 + } + }, + { + "id": { + "m_id": "{925E7BB1-22EB-46A2-98E2-9A9805A4D019}" + }, + "contracts": [ + { + "$type": "SlotTypeContract" + } + ], + "slotName": "Out", + "Descriptor": { + "ConnectionType": 2, + "SlotType": 1 + } + } + ], + "Datums": [ + { + "scriptCanvasType": { + "m_type": 1 + }, + "isNullPointer": false, + "$type": "EntityId", + "value": { + "id": 2901262558 + }, + "label": "EntityID: 0" + } + ], + "methodType": 0, + "methodName": "DeactivateGameEntity", + "className": "GameEntityContextRequestBus", + "resultSlotIDs": [ + {} + ], + "prettyClassName": "GameEntityContextRequestBus" + } + } + }, + { + "Id": { + "id": 70146790624130 + }, + "Name": "SC-Node(DeactivateGameEntity)", + "Components": { + "Component_[846968981672785962]": { + "$type": "{E42861BD-1956-45AE-8DD7-CCFC1E3E5ACF} Method", + "Id": 846968981672785962, + "Slots": [ + { + "id": { + "m_id": "{993AA3E4-ABCF-40FF-9CCB-030F22627151}" + }, + "contracts": [ + { + "$type": "SlotTypeContract" + }, + null + ], + "slotName": "EntityID: 0", + "Descriptor": { + "ConnectionType": 1, + "SlotType": 2 + }, + "DataType": 1 + }, + { + "id": { + "m_id": "{A015E6E8-A025-4A2D-B1D4-E7D8732FCE52}" + }, + "contracts": [ + { + "$type": "SlotTypeContract" + } + ], + "slotName": "In", + "Descriptor": { + "ConnectionType": 1, + "SlotType": 1 + } + }, + { + "id": { + "m_id": "{925E7BB1-22EB-46A2-98E2-9A9805A4D019}" + }, + "contracts": [ + { + "$type": "SlotTypeContract" + } + ], + "slotName": "Out", + "Descriptor": { + "ConnectionType": 2, + "SlotType": 1 + } + } + ], + "Datums": [ + { + "scriptCanvasType": { + "m_type": 1 + }, + "isNullPointer": false, + "$type": "EntityId", + "value": { + "id": 2901262558 + }, + "label": "EntityID: 0" + } + ], + "methodType": 0, + "methodName": "DeactivateGameEntity", + "className": "GameEntityContextRequestBus", + "resultSlotIDs": [ + {} + ], + "prettyClassName": "GameEntityContextRequestBus" + } + } + }, + { + "Id": { + "id": 70151085591426 + }, + "Name": "SC-Node(DeactivateGameEntity)", + "Components": { + "Component_[846968981672785962]": { + "$type": "{E42861BD-1956-45AE-8DD7-CCFC1E3E5ACF} Method", + "Id": 846968981672785962, + "Slots": [ + { + "id": { + "m_id": "{993AA3E4-ABCF-40FF-9CCB-030F22627151}" + }, + "contracts": [ + { + "$type": "SlotTypeContract" + }, + null + ], + "slotName": "EntityID: 0", + "Descriptor": { + "ConnectionType": 1, + "SlotType": 2 + }, + "DataType": 1 + }, + { + "id": { + "m_id": "{A015E6E8-A025-4A2D-B1D4-E7D8732FCE52}" + }, + "contracts": [ + { + "$type": "SlotTypeContract" + } + ], + "slotName": "In", + "Descriptor": { + "ConnectionType": 1, + "SlotType": 1 + } + }, + { + "id": { + "m_id": "{925E7BB1-22EB-46A2-98E2-9A9805A4D019}" + }, + "contracts": [ + { + "$type": "SlotTypeContract" + } + ], + "slotName": "Out", + "Descriptor": { + "ConnectionType": 2, + "SlotType": 1 + } + } + ], + "Datums": [ + { + "scriptCanvasType": { + "m_type": 1 + }, + "isNullPointer": false, + "$type": "EntityId", + "value": { + "id": 2901262558 + }, + "label": "EntityID: 0" + } + ], + "methodType": 0, + "methodName": "DeactivateGameEntity", + "className": "GameEntityContextRequestBus", + "resultSlotIDs": [ + {} + ], + "prettyClassName": "GameEntityContextRequestBus" + } + } + }, + { + "Id": { + "id": 70185445329794 + }, + "Name": "SC-EventNode(On Collision End event)", + "Components": { + "Component_[8849170053396419306]": { + "$type": "AzEventHandler", + "Id": 8849170053396419306, + "Slots": [ + { + "id": { + "m_id": "{5F5A4D6A-50EF-4561-B5D3-F8CF1C4530F6}" + }, + "contracts": [ + { + "$type": "SlotTypeContract" + }, + { + "$type": "ConnectionLimitContract", + "limit": 1 + }, + { + "$type": "RestrictedNodeContract", + "m_nodeId": { + "id": 70133905722242 + } + } + ], + "slotName": "Connect", + "toolTip": "Connect the AZ Event to this AZ Event Handler.", + "Descriptor": { + "ConnectionType": 1, + "SlotType": 1 + } + }, + { + "id": { + "m_id": "{76FBE35A-BD29-4A8D-8B6E-AC6A2AD2306B}" + }, + "contracts": [ + { + "$type": "SlotTypeContract" + } + ], + "slotName": "Disconnect", + "toolTip": "Disconnect current AZ Event from this AZ Event Handler.", + "Descriptor": { + "ConnectionType": 1, + "SlotType": 1 + } + }, + { + "id": { + "m_id": "{2E933E93-BD7E-4B9D-A9F5-E1A15995E00B}" + }, + "contracts": [ + { + "$type": "SlotTypeContract" + } + ], + "slotName": "On Connected", + "toolTip": "Signaled when a connection has taken place.", + "Descriptor": { + "ConnectionType": 2, + "SlotType": 1 + } + }, + { + "id": { + "m_id": "{1773DFC3-FCF8-43C6-8CBC-B2457A05EFD6}" + }, + "contracts": [ + { + "$type": "SlotTypeContract" + } + ], + "slotName": "On Disconnected", + "toolTip": "Signaled when this event handler is disconnected.", + "Descriptor": { + "ConnectionType": 2, + "SlotType": 1 + } + }, + { + "id": { + "m_id": "{FFBDBAC4-AF71-443C-BD6C-6C9E6BFAD858}" + }, + "contracts": [ + { + "$type": "SlotTypeContract" + } + ], + "slotName": "OnEvent", + "toolTip": "Triggered when the AZ Event invokes Signal() function.", + "Descriptor": { + "ConnectionType": 2, + "SlotType": 1 + }, + "IsLatent": true + }, + { + "id": { + "m_id": "{785405C8-1F85-4C9C-8ABE-C47A9A801BE3}" + }, + "contracts": [ + { + "$type": "SlotTypeContract" + } + ], + "slotName": "Simulated Body Handle", + "DisplayDataType": { + "m_type": 4, + "m_azType": "{53C0CD3E-D0FC-5D90-9E9B-EF364D430B08}" + }, + "Descriptor": { + "ConnectionType": 2, + "SlotType": 2 + }, + "DataType": 1 + }, + { + "id": { + "m_id": "{734C7A25-3E8A-4E3E-8CB5-E2F3383A3E18}" + }, + "contracts": [ + { + "$type": "SlotTypeContract" + } + ], + "slotName": "Collision Event", + "DisplayDataType": { + "m_type": 4, + "m_azType": "{7602AA36-792C-4BDC-BDF8-AA16792151A3}" + }, + "Descriptor": { + "ConnectionType": 2, + "SlotType": 2 + }, + "DataType": 1 + }, + { + "id": { + "m_id": "{BBC0A5CC-0C89-47E1-BDEE-2F21BF6053DC}" + }, + "contracts": [ + { + "$type": "SlotTypeContract" + }, + null, + { + "$type": "ConnectionLimitContract", + "limit": 1 + }, + { + "$type": "RestrictedNodeContract", + "m_nodeId": { + "id": 70133905722242 + } + } + ], + "slotName": "On Collision End event", + "Descriptor": { + "ConnectionType": 1, + "SlotType": 2 + }, + "DataType": 1 + } + ], + "Datums": [ + {} + ], + "m_azEventEntry": { + "m_eventName": "On Collision End event", + "m_parameterSlotIds": [ + { + "m_id": "{785405C8-1F85-4C9C-8ABE-C47A9A801BE3}" + }, + { + "m_id": "{734C7A25-3E8A-4E3E-8CB5-E2F3383A3E18}" + }, + { + "m_id": "{785405C8-1F85-4C9C-8ABE-C47A9A801BE3}" + }, + { + "m_id": "{734C7A25-3E8A-4E3E-8CB5-E2F3383A3E18}" + } + ], + "m_parameterNames": [ + { + "m_id": "{785405C8-1F85-4C9C-8ABE-C47A9A801BE3}" + }, + { + "m_id": "{734C7A25-3E8A-4E3E-8CB5-E2F3383A3E18}" + }, + { + "m_id": "{785405C8-1F85-4C9C-8ABE-C47A9A801BE3}" + }, + { + "m_id": "{734C7A25-3E8A-4E3E-8CB5-E2F3383A3E18}" + } + ], + "m_eventSlotId": { + "m_id": "{BBC0A5CC-0C89-47E1-BDEE-2F21BF6053DC}" + } + } + } + } + }, + { + "Id": { + "id": 70108135918466 + }, + "Name": "SC-Node(Gate)", + "Components": { + "Component_[9013043030213821202]": { + "$type": "Gate", + "Id": 9013043030213821202, + "Slots": [ + { + "id": { + "m_id": "{6E61BAF4-4F8C-4D6D-8573-960755DEC094}" + }, + "contracts": [ + { + "$type": "SlotTypeContract" + } + ], + "slotName": "In", + "toolTip": "Input signal", + "Descriptor": { + "ConnectionType": 1, + "SlotType": 1 + } + }, + { + "id": { + "m_id": "{7BF2F1C4-4831-4B6B-A63B-1046AD1FACFF}" + }, + "contracts": [ + { + "$type": "SlotTypeContract" + } + ], + "slotName": "True", + "toolTip": "Signaled if the condition provided evaluates to true.", + "Descriptor": { + "ConnectionType": 2, + "SlotType": 1 + } + }, + { + "id": { + "m_id": "{EDE70327-9E66-4A5E-AFE3-B9C4D099021E}" + }, + "contracts": [ + { + "$type": "SlotTypeContract" + } + ], + "slotName": "False", + "toolTip": "Signaled if the condition provided evaluates to false.", + "Descriptor": { + "ConnectionType": 2, + "SlotType": 1 + } + }, + { + "id": { + "m_id": "{3C9FBBC2-3934-4C35-B959-9E26F93AB525}" + }, + "contracts": [ + { + "$type": "SlotTypeContract" + }, + null + ], + "slotName": "Condition", + "toolTip": "If true the node will signal the Output and proceed execution", + "Descriptor": { + "ConnectionType": 1, + "SlotType": 2 + }, + "DataType": 1 + } + ], + "Datums": [ + { + "scriptCanvasType": { + "m_type": 0 + }, + "isNullPointer": false, + "$type": "bool", + "value": false, + "label": "Condition" + } + ] + } + } + }, + { + "Id": { + "id": 70116725853058 + }, + "Name": "SC-Node(Gate)", + "Components": { + "Component_[9013043030213821202]": { + "$type": "Gate", + "Id": 9013043030213821202, + "Slots": [ + { + "id": { + "m_id": "{6E61BAF4-4F8C-4D6D-8573-960755DEC094}" + }, + "contracts": [ + { + "$type": "SlotTypeContract" + } + ], + "slotName": "In", + "toolTip": "Input signal", + "Descriptor": { + "ConnectionType": 1, + "SlotType": 1 + } + }, + { + "id": { + "m_id": "{7BF2F1C4-4831-4B6B-A63B-1046AD1FACFF}" + }, + "contracts": [ + { + "$type": "SlotTypeContract" + } + ], + "slotName": "True", + "toolTip": "Signaled if the condition provided evaluates to true.", + "Descriptor": { + "ConnectionType": 2, + "SlotType": 1 + } + }, + { + "id": { + "m_id": "{EDE70327-9E66-4A5E-AFE3-B9C4D099021E}" + }, + "contracts": [ + { + "$type": "SlotTypeContract" + } + ], + "slotName": "False", + "toolTip": "Signaled if the condition provided evaluates to false.", + "Descriptor": { + "ConnectionType": 2, + "SlotType": 1 + } + }, + { + "id": { + "m_id": "{3C9FBBC2-3934-4C35-B959-9E26F93AB525}" + }, + "contracts": [ + { + "$type": "SlotTypeContract" + }, + null + ], + "slotName": "Condition", + "toolTip": "If true the node will signal the Output and proceed execution", + "Descriptor": { + "ConnectionType": 1, + "SlotType": 2 + }, + "DataType": 1 + } + ], + "Datums": [ + { + "scriptCanvasType": { + "m_type": 0 + }, + "isNullPointer": false, + "$type": "bool", + "value": false, + "label": "Condition" + } + ] + } + } + }, + { + "Id": { + "id": 70189740297090 + }, + "Name": "SC-Node(Gate)", + "Components": { + "Component_[9013043030213821202]": { + "$type": "Gate", + "Id": 9013043030213821202, + "Slots": [ + { + "id": { + "m_id": "{6E61BAF4-4F8C-4D6D-8573-960755DEC094}" + }, + "contracts": [ + { + "$type": "SlotTypeContract" + } + ], + "slotName": "In", + "toolTip": "Input signal", + "Descriptor": { + "ConnectionType": 1, + "SlotType": 1 + } + }, + { + "id": { + "m_id": "{7BF2F1C4-4831-4B6B-A63B-1046AD1FACFF}" + }, + "contracts": [ + { + "$type": "SlotTypeContract" + } + ], + "slotName": "True", + "toolTip": "Signaled if the condition provided evaluates to true.", + "Descriptor": { + "ConnectionType": 2, + "SlotType": 1 + } + }, + { + "id": { + "m_id": "{EDE70327-9E66-4A5E-AFE3-B9C4D099021E}" + }, + "contracts": [ + { + "$type": "SlotTypeContract" + } + ], + "slotName": "False", + "toolTip": "Signaled if the condition provided evaluates to false.", + "Descriptor": { + "ConnectionType": 2, + "SlotType": 1 + } + }, + { + "id": { + "m_id": "{3C9FBBC2-3934-4C35-B959-9E26F93AB525}" + }, + "contracts": [ + { + "$type": "SlotTypeContract" + }, + null + ], + "slotName": "Condition", + "toolTip": "If true the node will signal the Output and proceed execution", + "Descriptor": { + "ConnectionType": 1, + "SlotType": 2 + }, + "DataType": 1 + } + ], + "Datums": [ + { + "scriptCanvasType": { + "m_type": 0 + }, + "isNullPointer": false, + "$type": "bool", + "value": false, + "label": "Condition" + } + ] + } + } + }, + { + "Id": { + "id": 70138200689538 + }, + "Name": "SC-Node(Print)", + "Components": { + "Component_[9237937767964082768]": { + "$type": "Print", + "Id": 9237937767964082768, + "Slots": [ + { + "id": { + "m_id": "{451A59EF-BD5D-4E7D-82BE-3B4E7EAF9B48}" + }, + "contracts": [ + { + "$type": "SlotTypeContract" + } + ], + "slotName": "In", + "toolTip": "Input signal", + "Descriptor": { + "ConnectionType": 1, + "SlotType": 1 + } + }, + { + "id": { + "m_id": "{97822986-7F0A-4831-BD73-C9AC4CF133DE}" + }, + "contracts": [ + { + "$type": "SlotTypeContract" + } + ], + "slotName": "Out", + "Descriptor": { + "ConnectionType": 2, + "SlotType": 1 + } + } + ], + "m_format": "act", + "m_unresolvedString": [ + "act" + ] + } + } + }, + { + "Id": { + "id": 70155380558722 + }, + "Name": "SC Node(GetVariable)", + "Components": { + "Component_[9811908416249655657]": { + "$type": "GetVariableNode", + "Id": 9811908416249655657, + "Slots": [ + { + "id": { + "m_id": "{5A04BA4A-061E-4775-A6CE-713E298D4E9A}" + }, + "contracts": [ + { + "$type": "SlotTypeContract" + } + ], + "slotName": "In", + "toolTip": "When signaled sends the property referenced by this node to a Data Output slot", + "Descriptor": { + "ConnectionType": 1, + "SlotType": 1 + } + }, + { + "id": { + "m_id": "{B36D2C46-0A2B-4C90-B57C-5D9B7D3C1A63}" + }, + "contracts": [ + { + "$type": "SlotTypeContract" + } + ], + "slotName": "Out", + "toolTip": "Signaled after the referenced property has been pushed to the Data Output slot", + "Descriptor": { + "ConnectionType": 2, + "SlotType": 1 + } + }, + { + "id": { + "m_id": "{473E8586-669E-4DDD-B7A8-3A9F5EC510D5}" + }, + "contracts": [ + { + "$type": "SlotTypeContract" + } + ], + "slotName": "EntityID", + "DisplayDataType": { + "m_type": 1 + }, + "Descriptor": { + "ConnectionType": 2, + "SlotType": 2 + }, + "DataType": 1 + } + ], + "m_variableId": { + "m_id": "{F1E1AFD6-DCE6-4A1F-AF22-59F2B7B943CC}" + }, + "m_variableDataOutSlotId": { + "m_id": "{473E8586-669E-4DDD-B7A8-3A9F5EC510D5}" + } + } + } + } + ], + "m_connections": [ + { + "Id": { + "id": 70194035264386 + }, + "Name": "srcEndpoint=(IsActive: Result: Boolean), destEndpoint=(If: Condition)", + "Components": { + "Component_[8790567172666668723]": { + "$type": "{64CA5016-E803-4AC4-9A36-BDA2C890C6EB} Connection", + "Id": 8790567172666668723, + "sourceEndpoint": { + "nodeId": { + "id": 70163970493314 + }, + "slotId": { + "m_id": "{14EE86BB-E7E2-4210-B5ED-8F543D82F66C}" + } + }, + "targetEndpoint": { + "nodeId": { + "id": 70116725853058 + }, + "slotId": { + "m_id": "{3C9FBBC2-3934-4C35-B959-9E26F93AB525}" + } + } + } + } + }, + { + "Id": { + "id": 70198330231682 + }, + "Name": "srcEndpoint=(IsActive: Out), destEndpoint=(If: In)", + "Components": { + "Component_[2434331826651875004]": { + "$type": "{64CA5016-E803-4AC4-9A36-BDA2C890C6EB} Connection", + "Id": 2434331826651875004, + "sourceEndpoint": { + "nodeId": { + "id": 70163970493314 + }, + "slotId": { + "m_id": "{3E203C3C-5BEE-4D9A-B323-C2E4E1FC6A4E}" + } + }, + "targetEndpoint": { + "nodeId": { + "id": 70116725853058 + }, + "slotId": { + "m_id": "{6E61BAF4-4F8C-4D6D-8573-960755DEC094}" + } + } + } + } + }, + { + "Id": { + "id": 70202625198978 + }, + "Name": "srcEndpoint=(If: True), destEndpoint=(DeactivateGameEntity: In)", + "Components": { + "Component_[11237921104715455686]": { + "$type": "{64CA5016-E803-4AC4-9A36-BDA2C890C6EB} Connection", + "Id": 11237921104715455686, + "sourceEndpoint": { + "nodeId": { + "id": 70116725853058 + }, + "slotId": { + "m_id": "{7BF2F1C4-4831-4B6B-A63B-1046AD1FACFF}" + } + }, + "targetEndpoint": { + "nodeId": { + "id": 70146790624130 + }, + "slotId": { + "m_id": "{A015E6E8-A025-4A2D-B1D4-E7D8732FCE52}" + } + } + } + } + }, + { + "Id": { + "id": 70206920166274 + }, + "Name": "srcEndpoint=(Get Variable: EntityID), destEndpoint=(IsActive: EntityID: Entity Id)", + "Components": { + "Component_[14362014279952360310]": { + "$type": "{64CA5016-E803-4AC4-9A36-BDA2C890C6EB} Connection", + "Id": 14362014279952360310, + "sourceEndpoint": { + "nodeId": { + "id": 70155380558722 + }, + "slotId": { + "m_id": "{473E8586-669E-4DDD-B7A8-3A9F5EC510D5}" + } + }, + "targetEndpoint": { + "nodeId": { + "id": 70163970493314 + }, + "slotId": { + "m_id": "{170B4D1A-5D4A-466F-98AF-A51747B2623A}" + } + } + } + } + }, + { + "Id": { + "id": 70211215133570 + }, + "Name": "srcEndpoint=(If: False), destEndpoint=(ActivateGameEntity: In)", + "Components": { + "Component_[16755694922186694113]": { + "$type": "{64CA5016-E803-4AC4-9A36-BDA2C890C6EB} Connection", + "Id": 16755694922186694113, + "sourceEndpoint": { + "nodeId": { + "id": 70116725853058 + }, + "slotId": { + "m_id": "{EDE70327-9E66-4A5E-AFE3-B9C4D099021E}" + } + }, + "targetEndpoint": { + "nodeId": { + "id": 70090956049282 + }, + "slotId": { + "m_id": "{53670F84-98ED-4559-A2EC-3D2285DBC8E3}" + } + } + } + } + }, + { + "Id": { + "id": 70215510100866 + }, + "Name": "srcEndpoint=(Get Variable: EntityID), destEndpoint=(ActivateGameEntity: EntityID: 0)", + "Components": { + "Component_[1634747738940978819]": { + "$type": "{64CA5016-E803-4AC4-9A36-BDA2C890C6EB} Connection", + "Id": 1634747738940978819, + "sourceEndpoint": { + "nodeId": { + "id": 70155380558722 + }, + "slotId": { + "m_id": "{473E8586-669E-4DDD-B7A8-3A9F5EC510D5}" + } + }, + "targetEndpoint": { + "nodeId": { + "id": 70090956049282 + }, + "slotId": { + "m_id": "{4BCEF1F2-EB16-44C9-837F-CA936DAC9A2F}" + } + } + } + } + }, + { + "Id": { + "id": 70219805068162 + }, + "Name": "srcEndpoint=(Get Variable: EntityID), destEndpoint=(DeactivateGameEntity: EntityID: 0)", + "Components": { + "Component_[8821531688847258487]": { + "$type": "{64CA5016-E803-4AC4-9A36-BDA2C890C6EB} Connection", + "Id": 8821531688847258487, + "sourceEndpoint": { + "nodeId": { + "id": 70155380558722 + }, + "slotId": { + "m_id": "{473E8586-669E-4DDD-B7A8-3A9F5EC510D5}" + } + }, + "targetEndpoint": { + "nodeId": { + "id": 70146790624130 + }, + "slotId": { + "m_id": "{993AA3E4-ABCF-40FF-9CCB-030F22627151}" + } + } + } + } + }, + { + "Id": { + "id": 70224100035458 + }, + "Name": "srcEndpoint=(IsActive: Out), destEndpoint=(If: In)", + "Components": { + "Component_[8561478604291958262]": { + "$type": "{64CA5016-E803-4AC4-9A36-BDA2C890C6EB} Connection", + "Id": 8561478604291958262, + "sourceEndpoint": { + "nodeId": { + "id": 70095251016578 + }, + "slotId": { + "m_id": "{3E203C3C-5BEE-4D9A-B323-C2E4E1FC6A4E}" + } + }, + "targetEndpoint": { + "nodeId": { + "id": 70108135918466 + }, + "slotId": { + "m_id": "{6E61BAF4-4F8C-4D6D-8573-960755DEC094}" + } + } + } + } + }, + { + "Id": { + "id": 70228395002754 + }, + "Name": "srcEndpoint=(IsActive: Result: Boolean), destEndpoint=(If: Condition)", + "Components": { + "Component_[9146734319289132197]": { + "$type": "{64CA5016-E803-4AC4-9A36-BDA2C890C6EB} Connection", + "Id": 9146734319289132197, + "sourceEndpoint": { + "nodeId": { + "id": 70095251016578 + }, + "slotId": { + "m_id": "{14EE86BB-E7E2-4210-B5ED-8F543D82F66C}" + } + }, + "targetEndpoint": { + "nodeId": { + "id": 70108135918466 + }, + "slotId": { + "m_id": "{3C9FBBC2-3934-4C35-B959-9E26F93AB525}" + } + } + } + } + }, + { + "Id": { + "id": 70232689970050 + }, + "Name": "srcEndpoint=(IsActive: Out), destEndpoint=(If: In)", + "Components": { + "Component_[11833205937891498095]": { + "$type": "{64CA5016-E803-4AC4-9A36-BDA2C890C6EB} Connection", + "Id": 11833205937891498095, + "sourceEndpoint": { + "nodeId": { + "id": 70172560427906 + }, + "slotId": { + "m_id": "{3E203C3C-5BEE-4D9A-B323-C2E4E1FC6A4E}" + } + }, + "targetEndpoint": { + "nodeId": { + "id": 70189740297090 + }, + "slotId": { + "m_id": "{6E61BAF4-4F8C-4D6D-8573-960755DEC094}" + } + } + } + } + }, + { + "Id": { + "id": 70236984937346 + }, + "Name": "srcEndpoint=(IsActive: Result: Boolean), destEndpoint=(If: Condition)", + "Components": { + "Component_[10467104857840052907]": { + "$type": "{64CA5016-E803-4AC4-9A36-BDA2C890C6EB} Connection", + "Id": 10467104857840052907, + "sourceEndpoint": { + "nodeId": { + "id": 70172560427906 + }, + "slotId": { + "m_id": "{14EE86BB-E7E2-4210-B5ED-8F543D82F66C}" + } + }, + "targetEndpoint": { + "nodeId": { + "id": 70189740297090 + }, + "slotId": { + "m_id": "{3C9FBBC2-3934-4C35-B959-9E26F93AB525}" + } + } + } + } + }, + { + "Id": { + "id": 70241279904642 + }, + "Name": "srcEndpoint=(Get Variable: EntityID), destEndpoint=(IsActive: EntityID: Entity Id)", + "Components": { + "Component_[1012188603409101617]": { + "$type": "{64CA5016-E803-4AC4-9A36-BDA2C890C6EB} Connection", + "Id": 1012188603409101617, + "sourceEndpoint": { + "nodeId": { + "id": 70099545983874 + }, + "slotId": { + "m_id": "{6DDB4692-35F9-4570-B914-951F1FFAB089}" + } + }, + "targetEndpoint": { + "nodeId": { + "id": 70095251016578 + }, + "slotId": { + "m_id": "{170B4D1A-5D4A-466F-98AF-A51747B2623A}" + } + } + } + } + }, + { + "Id": { + "id": 70245574871938 + }, + "Name": "srcEndpoint=(Get Variable: EntityID), destEndpoint=(IsActive: EntityID: Entity Id)", + "Components": { + "Component_[5402619035508314979]": { + "$type": "{64CA5016-E803-4AC4-9A36-BDA2C890C6EB} Connection", + "Id": 5402619035508314979, + "sourceEndpoint": { + "nodeId": { + "id": 70121020820354 + }, + "slotId": { + "m_id": "{640B69D0-23E0-4A8E-BB94-477CFDE2E5F5}" + } + }, + "targetEndpoint": { + "nodeId": { + "id": 70172560427906 + }, + "slotId": { + "m_id": "{170B4D1A-5D4A-466F-98AF-A51747B2623A}" + } + } + } + } + }, + { + "Id": { + "id": 70249869839234 + }, + "Name": "srcEndpoint=(If: True), destEndpoint=(DeactivateGameEntity: In)", + "Components": { + "Component_[18435267100506239768]": { + "$type": "{64CA5016-E803-4AC4-9A36-BDA2C890C6EB} Connection", + "Id": 18435267100506239768, + "sourceEndpoint": { + "nodeId": { + "id": 70108135918466 + }, + "slotId": { + "m_id": "{7BF2F1C4-4831-4B6B-A63B-1046AD1FACFF}" + } + }, + "targetEndpoint": { + "nodeId": { + "id": 70151085591426 + }, + "slotId": { + "m_id": "{A015E6E8-A025-4A2D-B1D4-E7D8732FCE52}" + } + } + } + } + }, + { + "Id": { + "id": 70254164806530 + }, + "Name": "srcEndpoint=(If: False), destEndpoint=(ActivateGameEntity: In)", + "Components": { + "Component_[15164751479546717561]": { + "$type": "{64CA5016-E803-4AC4-9A36-BDA2C890C6EB} Connection", + "Id": 15164751479546717561, + "sourceEndpoint": { + "nodeId": { + "id": 70108135918466 + }, + "slotId": { + "m_id": "{EDE70327-9E66-4A5E-AFE3-B9C4D099021E}" + } + }, + "targetEndpoint": { + "nodeId": { + "id": 70176855395202 + }, + "slotId": { + "m_id": "{53670F84-98ED-4559-A2EC-3D2285DBC8E3}" + } + } + } + } + }, + { + "Id": { + "id": 70258459773826 + }, + "Name": "srcEndpoint=(If: True), destEndpoint=(DeactivateGameEntity: In)", + "Components": { + "Component_[5061560116223750730]": { + "$type": "{64CA5016-E803-4AC4-9A36-BDA2C890C6EB} Connection", + "Id": 5061560116223750730, + "sourceEndpoint": { + "nodeId": { + "id": 70189740297090 + }, + "slotId": { + "m_id": "{7BF2F1C4-4831-4B6B-A63B-1046AD1FACFF}" + } + }, + "targetEndpoint": { + "nodeId": { + "id": 70103840951170 + }, + "slotId": { + "m_id": "{A015E6E8-A025-4A2D-B1D4-E7D8732FCE52}" + } + } + } + } + }, + { + "Id": { + "id": 70262754741122 + }, + "Name": "srcEndpoint=(If: False), destEndpoint=(ActivateGameEntity: In)", + "Components": { + "Component_[10711100284272855896]": { + "$type": "{64CA5016-E803-4AC4-9A36-BDA2C890C6EB} Connection", + "Id": 10711100284272855896, + "sourceEndpoint": { + "nodeId": { + "id": 70189740297090 + }, + "slotId": { + "m_id": "{EDE70327-9E66-4A5E-AFE3-B9C4D099021E}" + } + }, + "targetEndpoint": { + "nodeId": { + "id": 70129610754946 + }, + "slotId": { + "m_id": "{53670F84-98ED-4559-A2EC-3D2285DBC8E3}" + } + } + } + } + }, + { + "Id": { + "id": 70267049708418 + }, + "Name": "srcEndpoint=(Get Variable: EntityID), destEndpoint=(DeactivateGameEntity: EntityID: 0)", + "Components": { + "Component_[4394555422677501602]": { + "$type": "{64CA5016-E803-4AC4-9A36-BDA2C890C6EB} Connection", + "Id": 4394555422677501602, + "sourceEndpoint": { + "nodeId": { + "id": 70099545983874 + }, + "slotId": { + "m_id": "{6DDB4692-35F9-4570-B914-951F1FFAB089}" + } + }, + "targetEndpoint": { + "nodeId": { + "id": 70151085591426 + }, + "slotId": { + "m_id": "{993AA3E4-ABCF-40FF-9CCB-030F22627151}" + } + } + } + } + }, + { + "Id": { + "id": 70271344675714 + }, + "Name": "srcEndpoint=(Get Variable: EntityID), destEndpoint=(DeactivateGameEntity: EntityID: 0)", + "Components": { + "Component_[4685709028181371637]": { + "$type": "{64CA5016-E803-4AC4-9A36-BDA2C890C6EB} Connection", + "Id": 4685709028181371637, + "sourceEndpoint": { + "nodeId": { + "id": 70121020820354 + }, + "slotId": { + "m_id": "{640B69D0-23E0-4A8E-BB94-477CFDE2E5F5}" + } + }, + "targetEndpoint": { + "nodeId": { + "id": 70103840951170 + }, + "slotId": { + "m_id": "{993AA3E4-ABCF-40FF-9CCB-030F22627151}" + } + } + } + } + }, + { + "Id": { + "id": 70275639643010 + }, + "Name": "srcEndpoint=(Get Variable: EntityID), destEndpoint=(ActivateGameEntity: EntityID: 0)", + "Components": { + "Component_[3306462520084951475]": { + "$type": "{64CA5016-E803-4AC4-9A36-BDA2C890C6EB} Connection", + "Id": 3306462520084951475, + "sourceEndpoint": { + "nodeId": { + "id": 70121020820354 + }, + "slotId": { + "m_id": "{640B69D0-23E0-4A8E-BB94-477CFDE2E5F5}" + } + }, + "targetEndpoint": { + "nodeId": { + "id": 70129610754946 + }, + "slotId": { + "m_id": "{4BCEF1F2-EB16-44C9-837F-CA936DAC9A2F}" + } + } + } + } + }, + { + "Id": { + "id": 70279934610306 + }, + "Name": "srcEndpoint=(DeactivateGameEntity: Out), destEndpoint=(Print: In)", + "Components": { + "Component_[17145465513158447772]": { + "$type": "{64CA5016-E803-4AC4-9A36-BDA2C890C6EB} Connection", + "Id": 17145465513158447772, + "sourceEndpoint": { + "nodeId": { + "id": 70146790624130 + }, + "slotId": { + "m_id": "{925E7BB1-22EB-46A2-98E2-9A9805A4D019}" + } + }, + "targetEndpoint": { + "nodeId": { + "id": 70125315787650 + }, + "slotId": { + "m_id": "{8A68C668-FF05-4B9C-8AF3-20BA7AC5A783}" + } + } + } + } + }, + { + "Id": { + "id": 70284229577602 + }, + "Name": "srcEndpoint=(ActivateGameEntity: Out), destEndpoint=(Print: In)", + "Components": { + "Component_[14069026837818796272]": { + "$type": "{64CA5016-E803-4AC4-9A36-BDA2C890C6EB} Connection", + "Id": 14069026837818796272, + "sourceEndpoint": { + "nodeId": { + "id": 70090956049282 + }, + "slotId": { + "m_id": "{1904FF69-ECF6-47AC-9318-2EBDAA8A5485}" + } + }, + "targetEndpoint": { + "nodeId": { + "id": 70138200689538 + }, + "slotId": { + "m_id": "{451A59EF-BD5D-4E7D-82BE-3B4E7EAF9B48}" + } + } + } + } + }, + { + "Id": { + "id": 70288524544898 + }, + "Name": "srcEndpoint=(DeactivateGameEntity: Out), destEndpoint=(Print: In)", + "Components": { + "Component_[7728736156493449863]": { + "$type": "{64CA5016-E803-4AC4-9A36-BDA2C890C6EB} Connection", + "Id": 7728736156493449863, + "sourceEndpoint": { + "nodeId": { + "id": 70151085591426 + }, + "slotId": { + "m_id": "{925E7BB1-22EB-46A2-98E2-9A9805A4D019}" + } + }, + "targetEndpoint": { + "nodeId": { + "id": 70125315787650 + }, + "slotId": { + "m_id": "{8A68C668-FF05-4B9C-8AF3-20BA7AC5A783}" + } + } + } + } + }, + { + "Id": { + "id": 70292819512194 + }, + "Name": "srcEndpoint=(ActivateGameEntity: Out), destEndpoint=(Print: In)", + "Components": { + "Component_[10386336352272981702]": { + "$type": "{64CA5016-E803-4AC4-9A36-BDA2C890C6EB} Connection", + "Id": 10386336352272981702, + "sourceEndpoint": { + "nodeId": { + "id": 70176855395202 + }, + "slotId": { + "m_id": "{1904FF69-ECF6-47AC-9318-2EBDAA8A5485}" + } + }, + "targetEndpoint": { + "nodeId": { + "id": 70138200689538 + }, + "slotId": { + "m_id": "{451A59EF-BD5D-4E7D-82BE-3B4E7EAF9B48}" + } + } + } + } + }, + { + "Id": { + "id": 70297114479490 + }, + "Name": "srcEndpoint=(DeactivateGameEntity: Out), destEndpoint=(Print: In)", + "Components": { + "Component_[16807949046056318365]": { + "$type": "{64CA5016-E803-4AC4-9A36-BDA2C890C6EB} Connection", + "Id": 16807949046056318365, + "sourceEndpoint": { + "nodeId": { + "id": 70103840951170 + }, + "slotId": { + "m_id": "{925E7BB1-22EB-46A2-98E2-9A9805A4D019}" + } + }, + "targetEndpoint": { + "nodeId": { + "id": 70125315787650 + }, + "slotId": { + "m_id": "{8A68C668-FF05-4B9C-8AF3-20BA7AC5A783}" + } + } + } + } + }, + { + "Id": { + "id": 70301409446786 + }, + "Name": "srcEndpoint=(ActivateGameEntity: Out), destEndpoint=(Print: In)", + "Components": { + "Component_[13893900813580744359]": { + "$type": "{64CA5016-E803-4AC4-9A36-BDA2C890C6EB} Connection", + "Id": 13893900813580744359, + "sourceEndpoint": { + "nodeId": { + "id": 70129610754946 + }, + "slotId": { + "m_id": "{1904FF69-ECF6-47AC-9318-2EBDAA8A5485}" + } + }, + "targetEndpoint": { + "nodeId": { + "id": 70138200689538 + }, + "slotId": { + "m_id": "{451A59EF-BD5D-4E7D-82BE-3B4E7EAF9B48}" + } + } + } + } + }, + { + "Id": { + "id": 70305704414082 + }, + "Name": "srcEndpoint=(Get Variable: EntityID), destEndpoint=(ActivateGameEntity: EntityID: 0)", + "Components": { + "Component_[3566132196647215905]": { + "$type": "{64CA5016-E803-4AC4-9A36-BDA2C890C6EB} Connection", + "Id": 3566132196647215905, + "sourceEndpoint": { + "nodeId": { + "id": 70099545983874 + }, + "slotId": { + "m_id": "{6DDB4692-35F9-4570-B914-951F1FFAB089}" + } + }, + "targetEndpoint": { + "nodeId": { + "id": 70176855395202 + }, + "slotId": { + "m_id": "{4BCEF1F2-EB16-44C9-837F-CA936DAC9A2F}" + } + } + } + } + }, + { + "Id": { + "id": 70309999381378 + }, + "Name": "srcEndpoint=(Get Variable: Out), destEndpoint=(IsActive: In)", + "Components": { + "Component_[15737173947743935362]": { + "$type": "{64CA5016-E803-4AC4-9A36-BDA2C890C6EB} Connection", + "Id": 15737173947743935362, + "sourceEndpoint": { + "nodeId": { + "id": 70155380558722 + }, + "slotId": { + "m_id": "{B36D2C46-0A2B-4C90-B57C-5D9B7D3C1A63}" + } + }, + "targetEndpoint": { + "nodeId": { + "id": 70163970493314 + }, + "slotId": { + "m_id": "{5A9AE174-D5E3-4512-A0BF-BA442C001F00}" + } + } + } + } + }, + { + "Id": { + "id": 70314294348674 + }, + "Name": "srcEndpoint=(On Collision Begin event: OnEvent), destEndpoint=(Get Variable: In)", + "Components": { + "Component_[6115424509860805504]": { + "$type": "{64CA5016-E803-4AC4-9A36-BDA2C890C6EB} Connection", + "Id": 6115424509860805504, + "sourceEndpoint": { + "nodeId": { + "id": 70112430885762 + }, + "slotId": { + "m_id": "{E32049C5-FF99-4E74-91EC-D007B0D6EF7B}" + } + }, + "targetEndpoint": { + "nodeId": { + "id": 70155380558722 + }, + "slotId": { + "m_id": "{5A04BA4A-061E-4775-A6CE-713E298D4E9A}" + } + } + } + } + }, + { + "Id": { + "id": 70318589315970 + }, + "Name": "srcEndpoint=(Get Variable: Out), destEndpoint=(IsActive: In)", + "Components": { + "Component_[10250827968868397862]": { + "$type": "{64CA5016-E803-4AC4-9A36-BDA2C890C6EB} Connection", + "Id": 10250827968868397862, + "sourceEndpoint": { + "nodeId": { + "id": 70099545983874 + }, + "slotId": { + "m_id": "{DF9C6AFF-531F-4E74-80CC-1F6889A1CE9E}" + } + }, + "targetEndpoint": { + "nodeId": { + "id": 70095251016578 + }, + "slotId": { + "m_id": "{5A9AE174-D5E3-4512-A0BF-BA442C001F00}" + } + } + } + } + }, + { + "Id": { + "id": 70322884283266 + }, + "Name": "srcEndpoint=(On Collision Persist event: OnEvent), destEndpoint=(Get Variable: In)", + "Components": { + "Component_[13286675358080560883]": { + "$type": "{64CA5016-E803-4AC4-9A36-BDA2C890C6EB} Connection", + "Id": 13286675358080560883, + "sourceEndpoint": { + "nodeId": { + "id": 70181150362498 + }, + "slotId": { + "m_id": "{1A994B40-F1C6-4F60-9F44-4CE42732554C}" + } + }, + "targetEndpoint": { + "nodeId": { + "id": 70099545983874 + }, + "slotId": { + "m_id": "{245126A2-D7FE-4C59-BF8D-46F791EEE730}" + } + } + } + } + }, + { + "Id": { + "id": 70327179250562 + }, + "Name": "srcEndpoint=(Get Variable: Out), destEndpoint=(IsActive: In)", + "Components": { + "Component_[2090477647964111499]": { + "$type": "{64CA5016-E803-4AC4-9A36-BDA2C890C6EB} Connection", + "Id": 2090477647964111499, + "sourceEndpoint": { + "nodeId": { + "id": 70121020820354 + }, + "slotId": { + "m_id": "{6B862981-524C-4643-A2C2-9454CB1FD552}" + } + }, + "targetEndpoint": { + "nodeId": { + "id": 70172560427906 + }, + "slotId": { + "m_id": "{5A9AE174-D5E3-4512-A0BF-BA442C001F00}" + } + } + } + } + }, + { + "Id": { + "id": 70331474217858 + }, + "Name": "srcEndpoint=(On Collision End event: OnEvent), destEndpoint=(Get Variable: In)", + "Components": { + "Component_[9355447111337093492]": { + "$type": "{64CA5016-E803-4AC4-9A36-BDA2C890C6EB} Connection", + "Id": 9355447111337093492, + "sourceEndpoint": { + "nodeId": { + "id": 70185445329794 + }, + "slotId": { + "m_id": "{FFBDBAC4-AF71-443C-BD6C-6C9E6BFAD858}" + } + }, + "targetEndpoint": { + "nodeId": { + "id": 70121020820354 + }, + "slotId": { + "m_id": "{7A817841-79D4-41FC-97DA-72E599A770CC}" + } + } + } + } + } + ] + }, + "m_assetType": "{3E2AC8CD-713F-453E-967F-29517F331784}", + "versionData": { + "_grammarVersion": 1, + "_runtimeVersion": 1 + }, + "m_variableCounter": 10, + "GraphCanvasData": [ + { + "Key": { + "id": 70086661081986 + }, + "Value": { + "ComponentData": { + "{5F84B500-8C45-40D1-8EFC-A5306B241444}": { + "$type": "SceneComponentSaveData", + "Constructs": [ + { + "Type": 1, + "DataContainer": { + "ComponentData": { + "{24CB38BB-1705-4EC5-8F63-B574571B4DCD}": { + "$type": "NodeSaveData" + }, + "{524D8380-AC09-444E-870E-9CEF2535B4A2}": { + "$type": "CommentNodeTextSaveData", + "Comment": "These are disconnected because a bug in Script Canvas with AZ::Events.\n\nOnce the issue is fixed reconnecting the nodes should make the test to pass", + "BackgroundColor": [ + 0.9800000190734863, + 0.9700000286102295, + 0.6499999761581421 + ], + "FontSettings": { + "PixelSize": 32 + } + }, + "{7CC444B1-F9B3-41B5-841B-0C4F2179F111}": { + "$type": "GeometrySaveData", + "Position": [ + -1280.0, + -500.0 + ] + }, + "{B0B99C8A-03AF-4CF6-A926-F65C874C3D97}": { + "$type": "StylingComponentSaveData" + }, + "{B1F49A35-8408-40DA-B79E-F1E3B64322CE}": { + "$type": "PersistentIdComponentSaveData", + "PersistentId": "{014DAF90-9434-4257-9670-6378E4D62A11}" + } + } + } + } + ], + "ViewParams": { + "Scale": 0.6573655545525766, + "AnchorX": -1186.554443359375, + "AnchorY": -578.06494140625 + } + } + } + } + }, + { + "Key": { + "id": 70090956049282 + }, + "Value": { + "ComponentData": { + "{24CB38BB-1705-4EC5-8F63-B574571B4DCD}": { + "$type": "NodeSaveData" + }, + "{328FF15C-C302-458F-A43D-E1794DE0904E}": { + "$type": "GeneralNodeTitleComponentSaveData", + "PaletteOverride": "MethodNodeTitlePalette" + }, + "{7CC444B1-F9B3-41B5-841B-0C4F2179F111}": { + "$type": "GeometrySaveData", + "Position": [ + 1420.0, + -140.0 + ] + }, + "{B0B99C8A-03AF-4CF6-A926-F65C874C3D97}": { + "$type": "StylingComponentSaveData", + "SubStyle": ".method" + }, + "{B1F49A35-8408-40DA-B79E-F1E3B64322CE}": { + "$type": "PersistentIdComponentSaveData", + "PersistentId": "{8B43E9D6-660F-4AD8-ABAF-D2CA12714C8C}" + } + } + } + }, + { + "Key": { + "id": 70095251016578 + }, + "Value": { + "ComponentData": { + "{24CB38BB-1705-4EC5-8F63-B574571B4DCD}": { + "$type": "NodeSaveData" + }, + "{328FF15C-C302-458F-A43D-E1794DE0904E}": { + "$type": "GeneralNodeTitleComponentSaveData", + "PaletteOverride": "DefaultNodeTitlePalette" + }, + "{7CC444B1-F9B3-41B5-841B-0C4F2179F111}": { + "$type": "GeometrySaveData", + "Position": [ + 600.0, + 100.0 + ] + }, + "{B0B99C8A-03AF-4CF6-A926-F65C874C3D97}": { + "$type": "StylingComponentSaveData" + }, + "{B1F49A35-8408-40DA-B79E-F1E3B64322CE}": { + "$type": "PersistentIdComponentSaveData", + "PersistentId": "{FA508AFD-513D-4334-9760-909A9D4C765A}" + } + } + } + }, + { + "Key": { + "id": 70099545983874 + }, + "Value": { + "ComponentData": { + "{24CB38BB-1705-4EC5-8F63-B574571B4DCD}": { + "$type": "NodeSaveData" + }, + "{328FF15C-C302-458F-A43D-E1794DE0904E}": { + "$type": "GeneralNodeTitleComponentSaveData", + "PaletteOverride": "GetVariableNodeTitlePalette" + }, + "{7CC444B1-F9B3-41B5-841B-0C4F2179F111}": { + "$type": "GeometrySaveData", + "Position": [ + 200.0, + 100.0 + ] + }, + "{B0B99C8A-03AF-4CF6-A926-F65C874C3D97}": { + "$type": "StylingComponentSaveData", + "SubStyle": ".getVariable" + }, + "{B1F49A35-8408-40DA-B79E-F1E3B64322CE}": { + "$type": "PersistentIdComponentSaveData", + "PersistentId": "{4970AE58-0BC4-45EE-B2E9-E14AF347E91F}" + } + } + } + }, + { + "Key": { + "id": 70103840951170 + }, + "Value": { + "ComponentData": { + "{24CB38BB-1705-4EC5-8F63-B574571B4DCD}": { + "$type": "NodeSaveData" + }, + "{328FF15C-C302-458F-A43D-E1794DE0904E}": { + "$type": "GeneralNodeTitleComponentSaveData", + "PaletteOverride": "MethodNodeTitlePalette" + }, + "{7CC444B1-F9B3-41B5-841B-0C4F2179F111}": { + "$type": "GeometrySaveData", + "Position": [ + 1420.0, + 380.0 + ] + }, + "{B0B99C8A-03AF-4CF6-A926-F65C874C3D97}": { + "$type": "StylingComponentSaveData", + "SubStyle": ".method" + }, + "{B1F49A35-8408-40DA-B79E-F1E3B64322CE}": { + "$type": "PersistentIdComponentSaveData", + "PersistentId": "{5DB80931-443B-48A6-9B96-79152E545DE9}" + } + } + } + }, + { + "Key": { + "id": 70108135918466 + }, + "Value": { + "ComponentData": { + "{24CB38BB-1705-4EC5-8F63-B574571B4DCD}": { + "$type": "NodeSaveData" + }, + "{328FF15C-C302-458F-A43D-E1794DE0904E}": { + "$type": "GeneralNodeTitleComponentSaveData", + "PaletteOverride": "LogicNodeTitlePalette" + }, + "{7CC444B1-F9B3-41B5-841B-0C4F2179F111}": { + "$type": "GeometrySaveData", + "Position": [ + 1080.0, + 120.0 + ] + }, + "{B0B99C8A-03AF-4CF6-A926-F65C874C3D97}": { + "$type": "StylingComponentSaveData", + "SubStyle": ".logic" + }, + "{B1F49A35-8408-40DA-B79E-F1E3B64322CE}": { + "$type": "PersistentIdComponentSaveData", + "PersistentId": "{455C1E31-F37D-4EE7-B954-B0532C66EE2C}" + } + } + } + }, + { + "Key": { + "id": 70112430885762 + }, + "Value": { + "ComponentData": { + "{24CB38BB-1705-4EC5-8F63-B574571B4DCD}": { + "$type": "NodeSaveData" + }, + "{328FF15C-C302-458F-A43D-E1794DE0904E}": { + "$type": "GeneralNodeTitleComponentSaveData", + "PaletteOverride": "HandlerNodeTitlePalette" + }, + "{7CC444B1-F9B3-41B5-841B-0C4F2179F111}": { + "$type": "GeometrySaveData", + "Position": [ + -280.0, + -280.0 + ] + }, + "{B0B99C8A-03AF-4CF6-A926-F65C874C3D97}": { + "$type": "StylingComponentSaveData", + "SubStyle": ".azeventhandler" + }, + "{B1F49A35-8408-40DA-B79E-F1E3B64322CE}": { + "$type": "PersistentIdComponentSaveData", + "PersistentId": "{7DBDAF02-24F5-4FEF-97F6-5C71F5596B09}" + } + } + } + }, + { + "Key": { + "id": 70116725853058 + }, + "Value": { + "ComponentData": { + "{24CB38BB-1705-4EC5-8F63-B574571B4DCD}": { + "$type": "NodeSaveData" + }, + "{328FF15C-C302-458F-A43D-E1794DE0904E}": { + "$type": "GeneralNodeTitleComponentSaveData", + "PaletteOverride": "LogicNodeTitlePalette" + }, + "{7CC444B1-F9B3-41B5-841B-0C4F2179F111}": { + "$type": "GeometrySaveData", + "Position": [ + 1080.0, + -220.0 + ] + }, + "{B0B99C8A-03AF-4CF6-A926-F65C874C3D97}": { + "$type": "StylingComponentSaveData", + "SubStyle": ".logic" + }, + "{B1F49A35-8408-40DA-B79E-F1E3B64322CE}": { + "$type": "PersistentIdComponentSaveData", + "PersistentId": "{D9B0DBAE-33BB-4DD0-853F-3609B859651E}" + } + } + } + }, + { + "Key": { + "id": 70121020820354 + }, + "Value": { + "ComponentData": { + "{24CB38BB-1705-4EC5-8F63-B574571B4DCD}": { + "$type": "NodeSaveData" + }, + "{328FF15C-C302-458F-A43D-E1794DE0904E}": { + "$type": "GeneralNodeTitleComponentSaveData", + "PaletteOverride": "GetVariableNodeTitlePalette" + }, + "{7CC444B1-F9B3-41B5-841B-0C4F2179F111}": { + "$type": "GeometrySaveData", + "Position": [ + 220.0, + 460.0 + ] + }, + "{B0B99C8A-03AF-4CF6-A926-F65C874C3D97}": { + "$type": "StylingComponentSaveData", + "SubStyle": ".getVariable" + }, + "{B1F49A35-8408-40DA-B79E-F1E3B64322CE}": { + "$type": "PersistentIdComponentSaveData", + "PersistentId": "{D2E4DE42-76F7-4B2E-838A-49EA403EA569}" + } + } + } + }, + { + "Key": { + "id": 70125315787650 + }, + "Value": { + "ComponentData": { + "{24CB38BB-1705-4EC5-8F63-B574571B4DCD}": { + "$type": "NodeSaveData" + }, + "{328FF15C-C302-458F-A43D-E1794DE0904E}": { + "$type": "GeneralNodeTitleComponentSaveData", + "PaletteOverride": "StringNodeTitlePalette" + }, + "{7CC444B1-F9B3-41B5-841B-0C4F2179F111}": { + "$type": "GeometrySaveData", + "Position": [ + 2000.0, + -160.0 + ] + }, + "{B0B99C8A-03AF-4CF6-A926-F65C874C3D97}": { + "$type": "StylingComponentSaveData" + }, + "{B1F49A35-8408-40DA-B79E-F1E3B64322CE}": { + "$type": "PersistentIdComponentSaveData", + "PersistentId": "{389C6D5B-CE48-4C06-9A9C-BF8A63B50375}" + } + } + } + }, + { + "Key": { + "id": 70129610754946 + }, + "Value": { + "ComponentData": { + "{24CB38BB-1705-4EC5-8F63-B574571B4DCD}": { + "$type": "NodeSaveData" + }, + "{328FF15C-C302-458F-A43D-E1794DE0904E}": { + "$type": "GeneralNodeTitleComponentSaveData", + "PaletteOverride": "MethodNodeTitlePalette" + }, + "{7CC444B1-F9B3-41B5-841B-0C4F2179F111}": { + "$type": "GeometrySaveData", + "Position": [ + 1420.0, + 560.0 + ] + }, + "{B0B99C8A-03AF-4CF6-A926-F65C874C3D97}": { + "$type": "StylingComponentSaveData", + "SubStyle": ".method" + }, + "{B1F49A35-8408-40DA-B79E-F1E3B64322CE}": { + "$type": "PersistentIdComponentSaveData", + "PersistentId": "{DA5DCC2B-9E77-46F7-8CA9-A2FADE367B25}" + } + } + } + }, + { + "Key": { + "id": 70133905722242 + }, + "Value": { + "ComponentData": { + "{24CB38BB-1705-4EC5-8F63-B574571B4DCD}": { + "$type": "NodeSaveData" + }, + "{328FF15C-C302-458F-A43D-E1794DE0904E}": { + "$type": "GeneralNodeTitleComponentSaveData", + "PaletteOverride": "MethodNodeTitlePalette" + }, + "{7CC444B1-F9B3-41B5-841B-0C4F2179F111}": { + "$type": "GeometrySaveData", + "Position": [ + -880.0, + 400.0 + ] + }, + "{B0B99C8A-03AF-4CF6-A926-F65C874C3D97}": { + "$type": "StylingComponentSaveData", + "SubStyle": ".method" + }, + "{B1F49A35-8408-40DA-B79E-F1E3B64322CE}": { + "$type": "PersistentIdComponentSaveData", + "PersistentId": "{64E2639D-6884-4692-9008-CFDACD35023F}" + } + } + } + }, + { + "Key": { + "id": 70138200689538 + }, + "Value": { + "ComponentData": { + "{24CB38BB-1705-4EC5-8F63-B574571B4DCD}": { + "$type": "NodeSaveData" + }, + "{328FF15C-C302-458F-A43D-E1794DE0904E}": { + "$type": "GeneralNodeTitleComponentSaveData", + "PaletteOverride": "StringNodeTitlePalette" + }, + "{7CC444B1-F9B3-41B5-841B-0C4F2179F111}": { + "$type": "GeometrySaveData", + "Position": [ + 2000.0, + 260.0 + ] + }, + "{B0B99C8A-03AF-4CF6-A926-F65C874C3D97}": { + "$type": "StylingComponentSaveData" + }, + "{B1F49A35-8408-40DA-B79E-F1E3B64322CE}": { + "$type": "PersistentIdComponentSaveData", + "PersistentId": "{6EDB526D-EFA0-44C2-8A0C-9083BE1143D8}" + } + } + } + }, + { + "Key": { + "id": 70142495656834 + }, + "Value": { + "ComponentData": { + "{24CB38BB-1705-4EC5-8F63-B574571B4DCD}": { + "$type": "NodeSaveData" + }, + "{328FF15C-C302-458F-A43D-E1794DE0904E}": { + "$type": "GeneralNodeTitleComponentSaveData", + "PaletteOverride": "MethodNodeTitlePalette" + }, + "{7CC444B1-F9B3-41B5-841B-0C4F2179F111}": { + "$type": "GeometrySaveData", + "Position": [ + -900.0, + -260.0 + ] + }, + "{B0B99C8A-03AF-4CF6-A926-F65C874C3D97}": { + "$type": "StylingComponentSaveData", + "SubStyle": ".method" + }, + "{B1F49A35-8408-40DA-B79E-F1E3B64322CE}": { + "$type": "PersistentIdComponentSaveData", + "PersistentId": "{B9CA5B12-F636-47FE-804B-E11C972D4D8F}" + } + } + } + }, + { + "Key": { + "id": 70146790624130 + }, + "Value": { + "ComponentData": { + "{24CB38BB-1705-4EC5-8F63-B574571B4DCD}": { + "$type": "NodeSaveData" + }, + "{328FF15C-C302-458F-A43D-E1794DE0904E}": { + "$type": "GeneralNodeTitleComponentSaveData", + "PaletteOverride": "MethodNodeTitlePalette" + }, + "{7CC444B1-F9B3-41B5-841B-0C4F2179F111}": { + "$type": "GeometrySaveData", + "Position": [ + 1420.0, + -300.0 + ] + }, + "{B0B99C8A-03AF-4CF6-A926-F65C874C3D97}": { + "$type": "StylingComponentSaveData", + "SubStyle": ".method" + }, + "{B1F49A35-8408-40DA-B79E-F1E3B64322CE}": { + "$type": "PersistentIdComponentSaveData", + "PersistentId": "{453BE3A7-5198-45D2-A8C8-A343CAA048C1}" + } + } + } + }, + { + "Key": { + "id": 70151085591426 + }, + "Value": { + "ComponentData": { + "{24CB38BB-1705-4EC5-8F63-B574571B4DCD}": { + "$type": "NodeSaveData" + }, + "{328FF15C-C302-458F-A43D-E1794DE0904E}": { + "$type": "GeneralNodeTitleComponentSaveData", + "PaletteOverride": "MethodNodeTitlePalette" + }, + "{7CC444B1-F9B3-41B5-841B-0C4F2179F111}": { + "$type": "GeometrySaveData", + "Position": [ + 1420.0, + 20.0 + ] + }, + "{B0B99C8A-03AF-4CF6-A926-F65C874C3D97}": { + "$type": "StylingComponentSaveData", + "SubStyle": ".method" + }, + "{B1F49A35-8408-40DA-B79E-F1E3B64322CE}": { + "$type": "PersistentIdComponentSaveData", + "PersistentId": "{0722BECC-EBCA-43E3-8EEC-618BD189E739}" + } + } + } + }, + { + "Key": { + "id": 70155380558722 + }, + "Value": { + "ComponentData": { + "{24CB38BB-1705-4EC5-8F63-B574571B4DCD}": { + "$type": "NodeSaveData" + }, + "{328FF15C-C302-458F-A43D-E1794DE0904E}": { + "$type": "GeneralNodeTitleComponentSaveData", + "PaletteOverride": "GetVariableNodeTitlePalette" + }, + "{7CC444B1-F9B3-41B5-841B-0C4F2179F111}": { + "$type": "GeometrySaveData", + "Position": [ + 200.0, + -240.0 + ] + }, + "{B0B99C8A-03AF-4CF6-A926-F65C874C3D97}": { + "$type": "StylingComponentSaveData", + "SubStyle": ".getVariable" + }, + "{B1F49A35-8408-40DA-B79E-F1E3B64322CE}": { + "$type": "PersistentIdComponentSaveData", + "PersistentId": "{6F168FFF-9795-4C98-803C-FC4903E0C0A9}" + } + } + } + }, + { + "Key": { + "id": 70159675526018 + }, + "Value": { + "ComponentData": { + "{24CB38BB-1705-4EC5-8F63-B574571B4DCD}": { + "$type": "NodeSaveData" + }, + "{7CC444B1-F9B3-41B5-841B-0C4F2179F111}": { + "$type": "GeometrySaveData", + "Position": [ + -1300.0, + 0.0 + ] + }, + "{9E81C95F-89C0-4476-8E82-63CCC4E52E04}": { + "$type": "EBusHandlerNodeDescriptorSaveData", + "EventIds": [ + { + "Value": 245425936 + } + ] + }, + "{B0B99C8A-03AF-4CF6-A926-F65C874C3D97}": { + "$type": "StylingComponentSaveData" + }, + "{B1F49A35-8408-40DA-B79E-F1E3B64322CE}": { + "$type": "PersistentIdComponentSaveData", + "PersistentId": "{5D4F47C6-521E-46DB-9899-4E8E558A6329}" + } + } + } + }, + { + "Key": { + "id": 70163970493314 + }, + "Value": { + "ComponentData": { + "{24CB38BB-1705-4EC5-8F63-B574571B4DCD}": { + "$type": "NodeSaveData" + }, + "{328FF15C-C302-458F-A43D-E1794DE0904E}": { + "$type": "GeneralNodeTitleComponentSaveData", + "PaletteOverride": "DefaultNodeTitlePalette" + }, + "{7CC444B1-F9B3-41B5-841B-0C4F2179F111}": { + "$type": "GeometrySaveData", + "Position": [ + 600.0, + -240.0 + ] + }, + "{B0B99C8A-03AF-4CF6-A926-F65C874C3D97}": { + "$type": "StylingComponentSaveData" + }, + "{B1F49A35-8408-40DA-B79E-F1E3B64322CE}": { + "$type": "PersistentIdComponentSaveData", + "PersistentId": "{72129D0C-F4AF-4367-962F-BE9EEFC6A1C8}" + } + } + } + }, + { + "Key": { + "id": 70168265460610 + }, + "Value": { + "ComponentData": { + "{24CB38BB-1705-4EC5-8F63-B574571B4DCD}": { + "$type": "NodeSaveData" + }, + "{328FF15C-C302-458F-A43D-E1794DE0904E}": { + "$type": "GeneralNodeTitleComponentSaveData", + "PaletteOverride": "MethodNodeTitlePalette" + }, + "{7CC444B1-F9B3-41B5-841B-0C4F2179F111}": { + "$type": "GeometrySaveData", + "Position": [ + -900.0, + 40.0 + ] + }, + "{B0B99C8A-03AF-4CF6-A926-F65C874C3D97}": { + "$type": "StylingComponentSaveData", + "SubStyle": ".method" + }, + "{B1F49A35-8408-40DA-B79E-F1E3B64322CE}": { + "$type": "PersistentIdComponentSaveData", + "PersistentId": "{4B279432-B947-45C5-8BF0-473703906A28}" + } + } + } + }, + { + "Key": { + "id": 70172560427906 + }, + "Value": { + "ComponentData": { + "{24CB38BB-1705-4EC5-8F63-B574571B4DCD}": { + "$type": "NodeSaveData" + }, + "{328FF15C-C302-458F-A43D-E1794DE0904E}": { + "$type": "GeneralNodeTitleComponentSaveData", + "PaletteOverride": "DefaultNodeTitlePalette" + }, + "{7CC444B1-F9B3-41B5-841B-0C4F2179F111}": { + "$type": "GeometrySaveData", + "Position": [ + 600.0, + 460.0 + ] + }, + "{B0B99C8A-03AF-4CF6-A926-F65C874C3D97}": { + "$type": "StylingComponentSaveData" + }, + "{B1F49A35-8408-40DA-B79E-F1E3B64322CE}": { + "$type": "PersistentIdComponentSaveData", + "PersistentId": "{2B76EE69-5338-4B1A-A4BE-98960F9F71D4}" + } + } + } + }, + { + "Key": { + "id": 70176855395202 + }, + "Value": { + "ComponentData": { + "{24CB38BB-1705-4EC5-8F63-B574571B4DCD}": { + "$type": "NodeSaveData" + }, + "{328FF15C-C302-458F-A43D-E1794DE0904E}": { + "$type": "GeneralNodeTitleComponentSaveData", + "PaletteOverride": "MethodNodeTitlePalette" + }, + "{7CC444B1-F9B3-41B5-841B-0C4F2179F111}": { + "$type": "GeometrySaveData", + "Position": [ + 1420.0, + 200.0 + ] + }, + "{B0B99C8A-03AF-4CF6-A926-F65C874C3D97}": { + "$type": "StylingComponentSaveData", + "SubStyle": ".method" + }, + "{B1F49A35-8408-40DA-B79E-F1E3B64322CE}": { + "$type": "PersistentIdComponentSaveData", + "PersistentId": "{26BE8EF6-5AEC-42D8-AC7F-D380B460242D}" + } + } + } + }, + { + "Key": { + "id": 70181150362498 + }, + "Value": { + "ComponentData": { + "{24CB38BB-1705-4EC5-8F63-B574571B4DCD}": { + "$type": "NodeSaveData" + }, + "{328FF15C-C302-458F-A43D-E1794DE0904E}": { + "$type": "GeneralNodeTitleComponentSaveData", + "PaletteOverride": "HandlerNodeTitlePalette" + }, + "{7CC444B1-F9B3-41B5-841B-0C4F2179F111}": { + "$type": "GeometrySaveData", + "Position": [ + -280.0, + 60.0 + ] + }, + "{B0B99C8A-03AF-4CF6-A926-F65C874C3D97}": { + "$type": "StylingComponentSaveData", + "SubStyle": ".azeventhandler" + }, + "{B1F49A35-8408-40DA-B79E-F1E3B64322CE}": { + "$type": "PersistentIdComponentSaveData", + "PersistentId": "{752364F1-EDC4-42D0-82CB-84FFE27AE3BC}" + } + } + } + }, + { + "Key": { + "id": 70185445329794 + }, + "Value": { + "ComponentData": { + "{24CB38BB-1705-4EC5-8F63-B574571B4DCD}": { + "$type": "NodeSaveData" + }, + "{328FF15C-C302-458F-A43D-E1794DE0904E}": { + "$type": "GeneralNodeTitleComponentSaveData", + "PaletteOverride": "HandlerNodeTitlePalette" + }, + "{7CC444B1-F9B3-41B5-841B-0C4F2179F111}": { + "$type": "GeometrySaveData", + "Position": [ + -280.0, + 420.0 + ] + }, + "{B0B99C8A-03AF-4CF6-A926-F65C874C3D97}": { + "$type": "StylingComponentSaveData", + "SubStyle": ".azeventhandler" + }, + "{B1F49A35-8408-40DA-B79E-F1E3B64322CE}": { + "$type": "PersistentIdComponentSaveData", + "PersistentId": "{DFC56761-5B10-4D07-A98F-32E24DFA4649}" + } + } + } + }, + { + "Key": { + "id": 70189740297090 + }, + "Value": { + "ComponentData": { + "{24CB38BB-1705-4EC5-8F63-B574571B4DCD}": { + "$type": "NodeSaveData" + }, + "{328FF15C-C302-458F-A43D-E1794DE0904E}": { + "$type": "GeneralNodeTitleComponentSaveData", + "PaletteOverride": "LogicNodeTitlePalette" + }, + "{7CC444B1-F9B3-41B5-841B-0C4F2179F111}": { + "$type": "GeometrySaveData", + "Position": [ + 1080.0, + 480.0 + ] + }, + "{B0B99C8A-03AF-4CF6-A926-F65C874C3D97}": { + "$type": "StylingComponentSaveData", + "SubStyle": ".logic" + }, + "{B1F49A35-8408-40DA-B79E-F1E3B64322CE}": { + "$type": "PersistentIdComponentSaveData", + "PersistentId": "{D09C8DAB-49A0-41CB-89D1-302EA305B161}" + } + } + } + } + ], + "StatisticsHelper": { + "InstanceCounter": [ + { + "Key": 191865528901450421, + "Value": 1 + }, + { + "Key": 2835305591036471195, + "Value": 1 + }, + { + "Key": 3743441789994958326, + "Value": 1 + }, + { + "Key": 4847610523576971761, + "Value": 3 + }, + { + "Key": 5842116761103598202, + "Value": 1 + }, + { + "Key": 8452971738487658154, + "Value": 3 + }, + { + "Key": 10098352573174582531, + "Value": 1 + }, + { + "Key": 10684225535275896474, + "Value": 2 + }, + { + "Key": 12203576718429312410, + "Value": 3 + }, + { + "Key": 13415940695654984187, + "Value": 1 + }, + { + "Key": 13774516199848960378, + "Value": 3 + }, + { + "Key": 13774516200723425656, + "Value": 3 + }, + { + "Key": 15357534523005742132, + "Value": 1 + } + ] + } + }, + "Component_[14322806170033042168]": { + "$type": "EditorGraphVariableManagerComponent", + "Id": 14322806170033042168, + "m_variableData": { + "m_nameVariableMap": [ + { + "Key": { + "m_id": "{79C630E7-2ED7-40E9-929D-6D88FC32ADD9}" + }, + "Value": { + "Datum": { + "scriptCanvasType": { + "m_type": 1 + }, + "isNullPointer": false, + "$type": "EntityId", + "value": { + "id": 4294967295 + }, + "label": "Persist Signal ID" + }, + "VariableId": { + "m_id": "{79C630E7-2ED7-40E9-929D-6D88FC32ADD9}" + }, + "VariableName": "Persist Signal ID", + "InitialValueSource": 1 + } + }, + { + "Key": { + "m_id": "{C802DF6D-82C4-4648-81AD-99DB01A03B3B}" + }, + "Value": { + "Datum": { + "scriptCanvasType": { + "m_type": 1 + }, + "isNullPointer": false, + "$type": "EntityId", + "value": { + "id": 4294967295 + }, + "label": "End Signal ID" + }, + "VariableId": { + "m_id": "{C802DF6D-82C4-4648-81AD-99DB01A03B3B}" + }, + "VariableName": "End Signal ID", + "InitialValueSource": 1 + } + }, + { + "Key": { + "m_id": "{F1E1AFD6-DCE6-4A1F-AF22-59F2B7B943CC}" + }, + "Value": { + "Datum": { + "scriptCanvasType": { + "m_type": 1 + }, + "isNullPointer": false, + "$type": "EntityId", + "value": { + "id": 4294967295 + }, + "label": "Begin Signal ID" + }, + "VariableId": { + "m_id": "{F1E1AFD6-DCE6-4A1F-AF22-59F2B7B943CC}" + }, + "VariableName": "Begin Signal ID", + "InitialValueSource": 1 + } + } + ] + } + } + } + } + } +} \ No newline at end of file diff --git a/AutomatedTesting/Levels/Physics/C12712452_ScriptCanvas_CollisionEvents/filelist.xml b/AutomatedTesting/Levels/Physics/ScriptCanvas_CollisionEvents/filelist.xml similarity index 71% rename from AutomatedTesting/Levels/Physics/C12712452_ScriptCanvas_CollisionEvents/filelist.xml rename to AutomatedTesting/Levels/Physics/ScriptCanvas_CollisionEvents/filelist.xml index bf7e7eb587..65809b61c4 100644 --- a/AutomatedTesting/Levels/Physics/C12712452_ScriptCanvas_CollisionEvents/filelist.xml +++ b/AutomatedTesting/Levels/Physics/ScriptCanvas_CollisionEvents/filelist.xml @@ -1,4 +1,4 @@ - + diff --git a/AutomatedTesting/Levels/Physics/C12712452_ScriptCanvas_CollisionEvents/level.pak b/AutomatedTesting/Levels/Physics/ScriptCanvas_CollisionEvents/level.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C12712452_ScriptCanvas_CollisionEvents/level.pak rename to AutomatedTesting/Levels/Physics/ScriptCanvas_CollisionEvents/level.pak diff --git a/AutomatedTesting/Levels/Physics/C5932044_PhysX_ForceRegion_PointForceOnRigidBodies/leveldata/Environment.xml b/AutomatedTesting/Levels/Physics/ScriptCanvas_CollisionEvents/leveldata/Environment.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C5932044_PhysX_ForceRegion_PointForceOnRigidBodies/leveldata/Environment.xml rename to AutomatedTesting/Levels/Physics/ScriptCanvas_CollisionEvents/leveldata/Environment.xml diff --git a/AutomatedTesting/Levels/Physics/C5689528_Terrain_MultipleTerrainComponents/leveldata/GameTokens.xml b/AutomatedTesting/Levels/Physics/ScriptCanvas_CollisionEvents/leveldata/GameTokens.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C5689528_Terrain_MultipleTerrainComponents/leveldata/GameTokens.xml rename to AutomatedTesting/Levels/Physics/ScriptCanvas_CollisionEvents/leveldata/GameTokens.xml diff --git a/AutomatedTesting/Levels/Physics/C5968759_ForceRegion_ExertsSeveralForcesOnRigidBody/leveldata/TerrainTexture.xml b/AutomatedTesting/Levels/Physics/ScriptCanvas_CollisionEvents/leveldata/TerrainTexture.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C5968759_ForceRegion_ExertsSeveralForcesOnRigidBody/leveldata/TerrainTexture.xml rename to AutomatedTesting/Levels/Physics/ScriptCanvas_CollisionEvents/leveldata/TerrainTexture.xml diff --git a/AutomatedTesting/Levels/Physics/C4976245_PhysxCollider_CollisionLayerTest/leveldata/TimeOfDay.xml b/AutomatedTesting/Levels/Physics/ScriptCanvas_CollisionEvents/leveldata/TimeOfDay.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C4976245_PhysxCollider_CollisionLayerTest/leveldata/TimeOfDay.xml rename to AutomatedTesting/Levels/Physics/ScriptCanvas_CollisionEvents/leveldata/TimeOfDay.xml diff --git a/AutomatedTesting/Levels/Physics/C5959761_ForceRegion_ExertsPointForce_Sedan/leveldata/VegetationMap.dat b/AutomatedTesting/Levels/Physics/ScriptCanvas_CollisionEvents/leveldata/VegetationMap.dat similarity index 100% rename from AutomatedTesting/Levels/Physics/C5959761_ForceRegion_ExertsPointForce_Sedan/leveldata/VegetationMap.dat rename to AutomatedTesting/Levels/Physics/ScriptCanvas_CollisionEvents/leveldata/VegetationMap.dat diff --git a/AutomatedTesting/Levels/Physics/C5959760_PhysxForceRegion_PointForceExertion/tags.txt b/AutomatedTesting/Levels/Physics/ScriptCanvas_CollisionEvents/tags.txt similarity index 100% rename from AutomatedTesting/Levels/Physics/C5959760_PhysxForceRegion_PointForceExertion/tags.txt rename to AutomatedTesting/Levels/Physics/ScriptCanvas_CollisionEvents/tags.txt diff --git a/AutomatedTesting/Levels/Physics/C6090552_ForceRegion_LinearDampingNegative/terrain/terrain.pxheightfield b/AutomatedTesting/Levels/Physics/ScriptCanvas_CollisionEvents/terrain/terrain.pxheightfield similarity index 100% rename from AutomatedTesting/Levels/Physics/C6090552_ForceRegion_LinearDampingNegative/terrain/terrain.pxheightfield rename to AutomatedTesting/Levels/Physics/ScriptCanvas_CollisionEvents/terrain/terrain.pxheightfield diff --git a/AutomatedTesting/Levels/Physics/C5959763_ForceRegion_ForceRegionImpulsesCube/terraintexture.pak b/AutomatedTesting/Levels/Physics/ScriptCanvas_CollisionEvents/terraintexture.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C5959763_ForceRegion_ForceRegionImpulsesCube/terraintexture.pak rename to AutomatedTesting/Levels/Physics/ScriptCanvas_CollisionEvents/terraintexture.pak diff --git a/AutomatedTesting/Levels/Physics/C19536274_NameNode_Prints/C19536274_NameNode_Prints.ly b/AutomatedTesting/Levels/Physics/ScriptCanvas_GetCollisionName/ScriptCanvas_GetCollisionName.ly similarity index 100% rename from AutomatedTesting/Levels/Physics/C19536274_NameNode_Prints/C19536274_NameNode_Prints.ly rename to AutomatedTesting/Levels/Physics/ScriptCanvas_GetCollisionName/ScriptCanvas_GetCollisionName.ly diff --git a/AutomatedTesting/Levels/Physics/C12712453_ScriptCanvas_MultipleRaycastNode/Raycast.scriptcanvas b/AutomatedTesting/Levels/Physics/ScriptCanvas_MultipleRaycastNode/Raycast.scriptcanvas similarity index 100% rename from AutomatedTesting/Levels/Physics/C12712453_ScriptCanvas_MultipleRaycastNode/Raycast.scriptcanvas rename to AutomatedTesting/Levels/Physics/ScriptCanvas_MultipleRaycastNode/Raycast.scriptcanvas diff --git a/AutomatedTesting/Levels/Physics/C12712453_ScriptCanvas_MultipleRaycastNode/Raycast_2.scriptcanvas b/AutomatedTesting/Levels/Physics/ScriptCanvas_MultipleRaycastNode/Raycast_2.scriptcanvas similarity index 100% rename from AutomatedTesting/Levels/Physics/C12712453_ScriptCanvas_MultipleRaycastNode/Raycast_2.scriptcanvas rename to AutomatedTesting/Levels/Physics/ScriptCanvas_MultipleRaycastNode/Raycast_2.scriptcanvas diff --git a/AutomatedTesting/Levels/Physics/C12712453_ScriptCanvas_MultipleRaycastNode/ScriptCanvas.png b/AutomatedTesting/Levels/Physics/ScriptCanvas_MultipleRaycastNode/ScriptCanvas.png similarity index 100% rename from AutomatedTesting/Levels/Physics/C12712453_ScriptCanvas_MultipleRaycastNode/ScriptCanvas.png rename to AutomatedTesting/Levels/Physics/ScriptCanvas_MultipleRaycastNode/ScriptCanvas.png diff --git a/AutomatedTesting/Levels/Physics/C12712453_ScriptCanvas_MultipleRaycastNode/C12712453_ScriptCanvas_MultipleRaycastNode.ly b/AutomatedTesting/Levels/Physics/ScriptCanvas_MultipleRaycastNode/ScriptCanvas_MultipleRaycastNode.ly similarity index 100% rename from AutomatedTesting/Levels/Physics/C12712453_ScriptCanvas_MultipleRaycastNode/C12712453_ScriptCanvas_MultipleRaycastNode.ly rename to AutomatedTesting/Levels/Physics/ScriptCanvas_MultipleRaycastNode/ScriptCanvas_MultipleRaycastNode.ly diff --git a/AutomatedTesting/Levels/Physics/C12712453_ScriptCanvas_MultipleRaycastNode/VisualDocumentation/RayCast_level_no_tunnel.PNG b/AutomatedTesting/Levels/Physics/ScriptCanvas_MultipleRaycastNode/VisualDocumentation/RayCast_level_no_tunnel.PNG similarity index 100% rename from AutomatedTesting/Levels/Physics/C12712453_ScriptCanvas_MultipleRaycastNode/VisualDocumentation/RayCast_level_no_tunnel.PNG rename to AutomatedTesting/Levels/Physics/ScriptCanvas_MultipleRaycastNode/VisualDocumentation/RayCast_level_no_tunnel.PNG diff --git a/AutomatedTesting/Levels/Physics/C12712453_ScriptCanvas_MultipleRaycastNode/VisualDocumentation/RayCast_level_tunnel.PNG b/AutomatedTesting/Levels/Physics/ScriptCanvas_MultipleRaycastNode/VisualDocumentation/RayCast_level_tunnel.PNG similarity index 100% rename from AutomatedTesting/Levels/Physics/C12712453_ScriptCanvas_MultipleRaycastNode/VisualDocumentation/RayCast_level_tunnel.PNG rename to AutomatedTesting/Levels/Physics/ScriptCanvas_MultipleRaycastNode/VisualDocumentation/RayCast_level_tunnel.PNG diff --git a/AutomatedTesting/Levels/Physics/C12712453_ScriptCanvas_MultipleRaycastNode/VisualDocumentation/RayCast_level_tunnel_mouth.PNG b/AutomatedTesting/Levels/Physics/ScriptCanvas_MultipleRaycastNode/VisualDocumentation/RayCast_level_tunnel_mouth.PNG similarity index 100% rename from AutomatedTesting/Levels/Physics/C12712453_ScriptCanvas_MultipleRaycastNode/VisualDocumentation/RayCast_level_tunnel_mouth.PNG rename to AutomatedTesting/Levels/Physics/ScriptCanvas_MultipleRaycastNode/VisualDocumentation/RayCast_level_tunnel_mouth.PNG diff --git a/AutomatedTesting/Levels/Physics/C12712453_ScriptCanvas_MultipleRaycastNode/VisualDocumentation/ScriptCanvas.PNG b/AutomatedTesting/Levels/Physics/ScriptCanvas_MultipleRaycastNode/VisualDocumentation/ScriptCanvas.PNG similarity index 100% rename from AutomatedTesting/Levels/Physics/C12712453_ScriptCanvas_MultipleRaycastNode/VisualDocumentation/ScriptCanvas.PNG rename to AutomatedTesting/Levels/Physics/ScriptCanvas_MultipleRaycastNode/VisualDocumentation/ScriptCanvas.PNG diff --git a/AutomatedTesting/Levels/Physics/C12712453_ScriptCanvas_MultipleRaycastNode/filelist.xml b/AutomatedTesting/Levels/Physics/ScriptCanvas_MultipleRaycastNode/filelist.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C12712453_ScriptCanvas_MultipleRaycastNode/filelist.xml rename to AutomatedTesting/Levels/Physics/ScriptCanvas_MultipleRaycastNode/filelist.xml diff --git a/AutomatedTesting/Levels/Physics/C12712453_ScriptCanvas_MultipleRaycastNode/level.pak b/AutomatedTesting/Levels/Physics/ScriptCanvas_MultipleRaycastNode/level.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C12712453_ScriptCanvas_MultipleRaycastNode/level.pak rename to AutomatedTesting/Levels/Physics/ScriptCanvas_MultipleRaycastNode/level.pak diff --git a/AutomatedTesting/Levels/Physics/C5959759_RigidBody_ForceRegionSpherePointForce/leveldata/Environment.xml b/AutomatedTesting/Levels/Physics/ScriptCanvas_MultipleRaycastNode/leveldata/Environment.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C5959759_RigidBody_ForceRegionSpherePointForce/leveldata/Environment.xml rename to AutomatedTesting/Levels/Physics/ScriptCanvas_MultipleRaycastNode/leveldata/Environment.xml diff --git a/AutomatedTesting/Levels/Physics/C5689529_Verify_Terrain_RigidBody_Collider_Mesh/leveldata/GameTokens.xml b/AutomatedTesting/Levels/Physics/ScriptCanvas_MultipleRaycastNode/leveldata/GameTokens.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C5689529_Verify_Terrain_RigidBody_Collider_Mesh/leveldata/GameTokens.xml rename to AutomatedTesting/Levels/Physics/ScriptCanvas_MultipleRaycastNode/leveldata/GameTokens.xml diff --git a/AutomatedTesting/Levels/Physics/C6032082_Terrain_MultipleResolutionsValid_128x128_1m/leveldata/TerrainTexture.xml b/AutomatedTesting/Levels/Physics/ScriptCanvas_MultipleRaycastNode/leveldata/TerrainTexture.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C6032082_Terrain_MultipleResolutionsValid_128x128_1m/leveldata/TerrainTexture.xml rename to AutomatedTesting/Levels/Physics/ScriptCanvas_MultipleRaycastNode/leveldata/TerrainTexture.xml diff --git a/AutomatedTesting/Levels/Physics/C5932043_ForceRegion_SimpleDragOnRigidBody/leveldata/TimeOfDay.xml b/AutomatedTesting/Levels/Physics/ScriptCanvas_MultipleRaycastNode/leveldata/TimeOfDay.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C5932043_ForceRegion_SimpleDragOnRigidBody/leveldata/TimeOfDay.xml rename to AutomatedTesting/Levels/Physics/ScriptCanvas_MultipleRaycastNode/leveldata/TimeOfDay.xml diff --git a/AutomatedTesting/Levels/Physics/C5959763_ForceRegion_ForceRegionImpulsesCube/leveldata/VegetationMap.dat b/AutomatedTesting/Levels/Physics/ScriptCanvas_MultipleRaycastNode/leveldata/VegetationMap.dat similarity index 100% rename from AutomatedTesting/Levels/Physics/C5959763_ForceRegion_ForceRegionImpulsesCube/leveldata/VegetationMap.dat rename to AutomatedTesting/Levels/Physics/ScriptCanvas_MultipleRaycastNode/leveldata/VegetationMap.dat diff --git a/AutomatedTesting/Levels/Physics/C5959761_ForceRegion_ExertsPointForce_Sedan/tags.txt b/AutomatedTesting/Levels/Physics/ScriptCanvas_MultipleRaycastNode/tags.txt similarity index 100% rename from AutomatedTesting/Levels/Physics/C5959761_ForceRegion_ExertsPointForce_Sedan/tags.txt rename to AutomatedTesting/Levels/Physics/ScriptCanvas_MultipleRaycastNode/tags.txt diff --git a/AutomatedTesting/Levels/Physics/C5959764_ForceRegion_ForceRegionImpulsesCapsule/terraintexture.pak b/AutomatedTesting/Levels/Physics/ScriptCanvas_MultipleRaycastNode/terraintexture.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C5959764_ForceRegion_ForceRegionImpulsesCapsule/terraintexture.pak rename to AutomatedTesting/Levels/Physics/ScriptCanvas_MultipleRaycastNode/terraintexture.pak diff --git a/AutomatedTesting/Levels/Physics/C12712454_ScriptCanvas_OverlapNodeVerification/C12712454_ScriptCanvas_OverlapNodeVerification.ly b/AutomatedTesting/Levels/Physics/ScriptCanvas_OverlapNode/ScriptCanvas_OverlapNode.ly similarity index 100% rename from AutomatedTesting/Levels/Physics/C12712454_ScriptCanvas_OverlapNodeVerification/C12712454_ScriptCanvas_OverlapNodeVerification.ly rename to AutomatedTesting/Levels/Physics/ScriptCanvas_OverlapNode/ScriptCanvas_OverlapNode.ly diff --git a/AutomatedTesting/Levels/Physics/C12712454_ScriptCanvas_OverlapNodeVerification/filelist.xml b/AutomatedTesting/Levels/Physics/ScriptCanvas_OverlapNode/filelist.xml similarity index 69% rename from AutomatedTesting/Levels/Physics/C12712454_ScriptCanvas_OverlapNodeVerification/filelist.xml rename to AutomatedTesting/Levels/Physics/ScriptCanvas_OverlapNode/filelist.xml index c25a3147d2..4324608b22 100644 --- a/AutomatedTesting/Levels/Physics/C12712454_ScriptCanvas_OverlapNodeVerification/filelist.xml +++ b/AutomatedTesting/Levels/Physics/ScriptCanvas_OverlapNode/filelist.xml @@ -1,4 +1,4 @@ - + diff --git a/AutomatedTesting/Levels/Physics/C12712454_ScriptCanvas_OverlapNodeVerification/level.pak b/AutomatedTesting/Levels/Physics/ScriptCanvas_OverlapNode/level.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C12712454_ScriptCanvas_OverlapNodeVerification/level.pak rename to AutomatedTesting/Levels/Physics/ScriptCanvas_OverlapNode/level.pak diff --git a/AutomatedTesting/Levels/Physics/C5959760_PhysxForceRegion_PointForceExertion/leveldata/Environment.xml b/AutomatedTesting/Levels/Physics/ScriptCanvas_OverlapNode/leveldata/Environment.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C5959760_PhysxForceRegion_PointForceExertion/leveldata/Environment.xml rename to AutomatedTesting/Levels/Physics/ScriptCanvas_OverlapNode/leveldata/Environment.xml diff --git a/AutomatedTesting/Levels/Physics/C5689531_Warning_TerrainSliceTerrainComponent/leveldata/GameTokens.xml b/AutomatedTesting/Levels/Physics/ScriptCanvas_OverlapNode/leveldata/GameTokens.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C5689531_Warning_TerrainSliceTerrainComponent/leveldata/GameTokens.xml rename to AutomatedTesting/Levels/Physics/ScriptCanvas_OverlapNode/leveldata/GameTokens.xml diff --git a/AutomatedTesting/Levels/Physics/C5689518_PhysXEntity_collides_with_PhysXTerrain/leveldata/TerrainTexture.xml b/AutomatedTesting/Levels/Physics/ScriptCanvas_OverlapNode/leveldata/TerrainTexture.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C5689518_PhysXEntity_collides_with_PhysXTerrain/leveldata/TerrainTexture.xml rename to AutomatedTesting/Levels/Physics/ScriptCanvas_OverlapNode/leveldata/TerrainTexture.xml diff --git a/AutomatedTesting/Levels/Physics/C5932044_PhysX_ForceRegion_PointForceOnRigidBodies/leveldata/TimeOfDay.xml b/AutomatedTesting/Levels/Physics/ScriptCanvas_OverlapNode/leveldata/TimeOfDay.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C5932044_PhysX_ForceRegion_PointForceOnRigidBodies/leveldata/TimeOfDay.xml rename to AutomatedTesting/Levels/Physics/ScriptCanvas_OverlapNode/leveldata/TimeOfDay.xml diff --git a/AutomatedTesting/Levels/Physics/C5959764_ForceRegion_ForceRegionImpulsesCapsule/leveldata/VegetationMap.dat b/AutomatedTesting/Levels/Physics/ScriptCanvas_OverlapNode/leveldata/VegetationMap.dat similarity index 100% rename from AutomatedTesting/Levels/Physics/C5959764_ForceRegion_ForceRegionImpulsesCapsule/leveldata/VegetationMap.dat rename to AutomatedTesting/Levels/Physics/ScriptCanvas_OverlapNode/leveldata/VegetationMap.dat diff --git a/AutomatedTesting/Levels/Physics/C5959763_ForceRegion_ForceRegionImpulsesCube/tags.txt b/AutomatedTesting/Levels/Physics/ScriptCanvas_OverlapNode/tags.txt similarity index 100% rename from AutomatedTesting/Levels/Physics/C5959763_ForceRegion_ForceRegionImpulsesCube/tags.txt rename to AutomatedTesting/Levels/Physics/ScriptCanvas_OverlapNode/tags.txt diff --git a/AutomatedTesting/Levels/Physics/C5959765_ForceRegion_AssetGetsImpulsed/terraintexture.pak b/AutomatedTesting/Levels/Physics/ScriptCanvas_OverlapNode/terraintexture.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C5959765_ForceRegion_AssetGetsImpulsed/terraintexture.pak rename to AutomatedTesting/Levels/Physics/ScriptCanvas_OverlapNode/terraintexture.pak diff --git a/AutomatedTesting/Levels/Physics/ScriptCanvas_PostPhysicsUpdate/ScriptCanvas_PostPhysicsUpdate.ly b/AutomatedTesting/Levels/Physics/ScriptCanvas_PostPhysicsUpdate/ScriptCanvas_PostPhysicsUpdate.ly new file mode 100644 index 0000000000..a2ceb4e75c --- /dev/null +++ b/AutomatedTesting/Levels/Physics/ScriptCanvas_PostPhysicsUpdate/ScriptCanvas_PostPhysicsUpdate.ly @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:550c2842186ac5485024b1b08936415c67692937a6547859d6bd2a8611d17b7e +size 6592 diff --git a/AutomatedTesting/Levels/Physics/C14902098_ScriptCanvas_PostPhysicsUpdate/filelist.xml b/AutomatedTesting/Levels/Physics/ScriptCanvas_PostPhysicsUpdate/filelist.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C14902098_ScriptCanvas_PostPhysicsUpdate/filelist.xml rename to AutomatedTesting/Levels/Physics/ScriptCanvas_PostPhysicsUpdate/filelist.xml diff --git a/AutomatedTesting/Levels/Physics/C14902098_ScriptCanvas_PostPhysicsUpdate/level.pak b/AutomatedTesting/Levels/Physics/ScriptCanvas_PostPhysicsUpdate/level.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C14902098_ScriptCanvas_PostPhysicsUpdate/level.pak rename to AutomatedTesting/Levels/Physics/ScriptCanvas_PostPhysicsUpdate/level.pak diff --git a/AutomatedTesting/Levels/Physics/C5959761_ForceRegion_ExertsPointForce_Sedan/leveldata/Environment.xml b/AutomatedTesting/Levels/Physics/ScriptCanvas_PostPhysicsUpdate/leveldata/Environment.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C5959761_ForceRegion_ExertsPointForce_Sedan/leveldata/Environment.xml rename to AutomatedTesting/Levels/Physics/ScriptCanvas_PostPhysicsUpdate/leveldata/Environment.xml diff --git a/AutomatedTesting/Levels/Physics/C5932045_ForceRegion_Spline/leveldata/GameTokens.xml b/AutomatedTesting/Levels/Physics/ScriptCanvas_PostPhysicsUpdate/leveldata/GameTokens.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C5932045_ForceRegion_Spline/leveldata/GameTokens.xml rename to AutomatedTesting/Levels/Physics/ScriptCanvas_PostPhysicsUpdate/leveldata/GameTokens.xml diff --git a/AutomatedTesting/Levels/Physics/C5689521_Terrain_NoCollisionAfterTerrainDeletion/leveldata/TerrainTexture.xml b/AutomatedTesting/Levels/Physics/ScriptCanvas_PostPhysicsUpdate/leveldata/TerrainTexture.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C5689521_Terrain_NoCollisionAfterTerrainDeletion/leveldata/TerrainTexture.xml rename to AutomatedTesting/Levels/Physics/ScriptCanvas_PostPhysicsUpdate/leveldata/TerrainTexture.xml diff --git a/AutomatedTesting/Levels/Physics/C5932045_ForceRegion_Spline/leveldata/TimeOfDay.xml b/AutomatedTesting/Levels/Physics/ScriptCanvas_PostPhysicsUpdate/leveldata/TimeOfDay.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C5932045_ForceRegion_Spline/leveldata/TimeOfDay.xml rename to AutomatedTesting/Levels/Physics/ScriptCanvas_PostPhysicsUpdate/leveldata/TimeOfDay.xml diff --git a/AutomatedTesting/Levels/Physics/C5959765_ForceRegion_AssetGetsImpulsed/leveldata/VegetationMap.dat b/AutomatedTesting/Levels/Physics/ScriptCanvas_PostPhysicsUpdate/leveldata/VegetationMap.dat similarity index 100% rename from AutomatedTesting/Levels/Physics/C5959765_ForceRegion_AssetGetsImpulsed/leveldata/VegetationMap.dat rename to AutomatedTesting/Levels/Physics/ScriptCanvas_PostPhysicsUpdate/leveldata/VegetationMap.dat diff --git a/AutomatedTesting/Levels/Physics/ScriptCanvas_PostPhysicsUpdate/onpostphysicsupdate.scriptcanvas b/AutomatedTesting/Levels/Physics/ScriptCanvas_PostPhysicsUpdate/onpostphysicsupdate.scriptcanvas new file mode 100644 index 0000000000..f236bb5570 --- /dev/null +++ b/AutomatedTesting/Levels/Physics/ScriptCanvas_PostPhysicsUpdate/onpostphysicsupdate.scriptcanvas @@ -0,0 +1,115 @@ +{ + "Type": "JsonSerialization", + "Version": 1, + "ClassName": "ScriptCanvasData", + "ClassData": { + "m_scriptCanvas": { + "Id": { + "id": 12069610946668 + }, + "Name": "onpostphysicsupdate", + "Components": { + "Component_[15127005627920921763]": { + "$type": "EditorGraphVariableManagerComponent", + "Id": 15127005627920921763, + "m_variableData": { + "m_nameVariableMap": [ + { + "Key": { + "m_id": "{7B7643B6-2A99-4D2D-82F7-49F7E608CA28}" + }, + "Value": { + "Datum": { + "isOverloadedStorage": false, + "scriptCanvasType": { + "m_type": 8 + }, + "isNullPointer": false, + "$type": "Vector3", + "value": [ + 0.0, + 0.0, + 0.0 + ], + "label": "prev_position" + }, + "VariableId": { + "m_id": "{7B7643B6-2A99-4D2D-82F7-49F7E608CA28}" + }, + "VariableName": "prev_position" + } + } + ] + }, + "CopiedVariableRemapping": [ + { + "Key": { + "m_id": "{B66F614B-9534-4532-B257-C9F5469913C4}" + }, + "Value": { + "m_id": "{7B7643B6-2A99-4D2D-82F7-49F7E608CA28}" + } + } + ] + }, + "Component_[2111134076415671866]": { + "$type": "{4D755CA9-AB92-462C-B24F-0B3376F19967} Graph", + "Id": 2111134076415671866, + "m_assetType": "{3E2AC8CD-713F-453E-967F-29517F331784}", + "versionData": { + "_grammarVersion": 1, + "_runtimeVersion": 1 + }, + "GraphCanvasData": [ + { + "Key": { + "id": 12069610946668 + }, + "Value": { + "ComponentData": { + "{5F84B500-8C45-40D1-8EFC-A5306B241444}": { + "$type": "SceneComponentSaveData", + "ViewParams": { + "Scale": 0.3323290271719053, + "AnchorX": -2025.1014404296875, + "AnchorY": -707.1305541992188 + } + } + } + } + } + ], + "CRCCacheMap": [ + { + "Key": { + "Value": 418594340 + }, + "Value": { + "String": "AZPhysicalWorld", + "Count": 3 + } + }, + { + "Key": { + "Value": 2068527459 + }, + "Value": { + "String": "Self", + "Count": 1 + } + }, + { + "Key": { + "Value": 3249382599 + }, + "Value": { + "String": "DefaultScene", + "Count": 1 + } + } + ] + } + } + } + } +} \ No newline at end of file diff --git a/AutomatedTesting/Levels/Physics/C14902098_ScriptCanvas_PostPhysicsUpdate/ontick.scriptcanvas b/AutomatedTesting/Levels/Physics/ScriptCanvas_PostPhysicsUpdate/ontick.scriptcanvas similarity index 100% rename from AutomatedTesting/Levels/Physics/C14902098_ScriptCanvas_PostPhysicsUpdate/ontick.scriptcanvas rename to AutomatedTesting/Levels/Physics/ScriptCanvas_PostPhysicsUpdate/ontick.scriptcanvas diff --git a/AutomatedTesting/Levels/Physics/C5959764_ForceRegion_ForceRegionImpulsesCapsule/tags.txt b/AutomatedTesting/Levels/Physics/ScriptCanvas_PostPhysicsUpdate/tags.txt similarity index 100% rename from AutomatedTesting/Levels/Physics/C5959764_ForceRegion_ForceRegionImpulsesCapsule/tags.txt rename to AutomatedTesting/Levels/Physics/ScriptCanvas_PostPhysicsUpdate/tags.txt diff --git a/AutomatedTesting/Levels/Physics/C5959808_ForceRegion_PositionOffset/terraintexture.pak b/AutomatedTesting/Levels/Physics/ScriptCanvas_PostPhysicsUpdate/terraintexture.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C5959808_ForceRegion_PositionOffset/terraintexture.pak rename to AutomatedTesting/Levels/Physics/ScriptCanvas_PostPhysicsUpdate/terraintexture.pak diff --git a/AutomatedTesting/Levels/Physics/ScriptCanvas_PostUpdateEvent/ScriptCanvas_PostUpdateEvent.ly b/AutomatedTesting/Levels/Physics/ScriptCanvas_PostUpdateEvent/ScriptCanvas_PostUpdateEvent.ly new file mode 100644 index 0000000000..35c3674159 --- /dev/null +++ b/AutomatedTesting/Levels/Physics/ScriptCanvas_PostUpdateEvent/ScriptCanvas_PostUpdateEvent.ly @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8a2c9ad554554eba1021abe0baf0b3455da1aaab2bb8331eb240f79c89031636 +size 5202 diff --git a/AutomatedTesting/Levels/Physics/C14195074_ScriptCanvas_PostUpdateEvent/filelist.xml b/AutomatedTesting/Levels/Physics/ScriptCanvas_PostUpdateEvent/filelist.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C14195074_ScriptCanvas_PostUpdateEvent/filelist.xml rename to AutomatedTesting/Levels/Physics/ScriptCanvas_PostUpdateEvent/filelist.xml diff --git a/AutomatedTesting/Levels/Physics/C14195074_ScriptCanvas_PostUpdateEvent/level.pak b/AutomatedTesting/Levels/Physics/ScriptCanvas_PostUpdateEvent/level.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C14195074_ScriptCanvas_PostUpdateEvent/level.pak rename to AutomatedTesting/Levels/Physics/ScriptCanvas_PostUpdateEvent/level.pak diff --git a/AutomatedTesting/Levels/Physics/C5959763_ForceRegion_ForceRegionImpulsesCube/leveldata/Environment.xml b/AutomatedTesting/Levels/Physics/ScriptCanvas_PostUpdateEvent/leveldata/Environment.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C5959763_ForceRegion_ForceRegionImpulsesCube/leveldata/Environment.xml rename to AutomatedTesting/Levels/Physics/ScriptCanvas_PostUpdateEvent/leveldata/Environment.xml diff --git a/AutomatedTesting/Levels/Physics/C5959808_ForceRegion_PositionOffset/leveldata/GameTokens.xml b/AutomatedTesting/Levels/Physics/ScriptCanvas_PostUpdateEvent/leveldata/GameTokens.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C5959808_ForceRegion_PositionOffset/leveldata/GameTokens.xml rename to AutomatedTesting/Levels/Physics/ScriptCanvas_PostUpdateEvent/leveldata/GameTokens.xml diff --git a/AutomatedTesting/Levels/Physics/C5689522_Physxterrain_AddPhysxterrainNoEditorCrash/leveldata/TerrainTexture.xml b/AutomatedTesting/Levels/Physics/ScriptCanvas_PostUpdateEvent/leveldata/TerrainTexture.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C5689522_Physxterrain_AddPhysxterrainNoEditorCrash/leveldata/TerrainTexture.xml rename to AutomatedTesting/Levels/Physics/ScriptCanvas_PostUpdateEvent/leveldata/TerrainTexture.xml diff --git a/AutomatedTesting/Levels/Physics/C5959759_RigidBody_ForceRegionSpherePointForce/leveldata/TimeOfDay.xml b/AutomatedTesting/Levels/Physics/ScriptCanvas_PostUpdateEvent/leveldata/TimeOfDay.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C5959759_RigidBody_ForceRegionSpherePointForce/leveldata/TimeOfDay.xml rename to AutomatedTesting/Levels/Physics/ScriptCanvas_PostUpdateEvent/leveldata/TimeOfDay.xml diff --git a/AutomatedTesting/Levels/Physics/C5959808_ForceRegion_PositionOffset/leveldata/VegetationMap.dat b/AutomatedTesting/Levels/Physics/ScriptCanvas_PostUpdateEvent/leveldata/VegetationMap.dat similarity index 100% rename from AutomatedTesting/Levels/Physics/C5959808_ForceRegion_PositionOffset/leveldata/VegetationMap.dat rename to AutomatedTesting/Levels/Physics/ScriptCanvas_PostUpdateEvent/leveldata/VegetationMap.dat diff --git a/AutomatedTesting/Levels/Physics/C5959765_ForceRegion_AssetGetsImpulsed/tags.txt b/AutomatedTesting/Levels/Physics/ScriptCanvas_PostUpdateEvent/tags.txt similarity index 100% rename from AutomatedTesting/Levels/Physics/C5959765_ForceRegion_AssetGetsImpulsed/tags.txt rename to AutomatedTesting/Levels/Physics/ScriptCanvas_PostUpdateEvent/tags.txt diff --git a/AutomatedTesting/Levels/Physics/C5959809_ForceRegion_RotationalOffset/terraintexture.pak b/AutomatedTesting/Levels/Physics/ScriptCanvas_PostUpdateEvent/terraintexture.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C5959809_ForceRegion_RotationalOffset/terraintexture.pak rename to AutomatedTesting/Levels/Physics/ScriptCanvas_PostUpdateEvent/terraintexture.pak diff --git a/AutomatedTesting/Levels/Physics/C14902097_ScriptCanvas_PreUpdateEvent/C14902097_ScriptCanvas_PreUpdateEvent.ly b/AutomatedTesting/Levels/Physics/ScriptCanvas_PreUpdateEvent/ScriptCanvas_PreUpdateEvent.ly similarity index 100% rename from AutomatedTesting/Levels/Physics/C14902097_ScriptCanvas_PreUpdateEvent/C14902097_ScriptCanvas_PreUpdateEvent.ly rename to AutomatedTesting/Levels/Physics/ScriptCanvas_PreUpdateEvent/ScriptCanvas_PreUpdateEvent.ly diff --git a/AutomatedTesting/Levels/Physics/C14902097_ScriptCanvas_PreUpdateEvent/filelist.xml b/AutomatedTesting/Levels/Physics/ScriptCanvas_PreUpdateEvent/filelist.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C14902097_ScriptCanvas_PreUpdateEvent/filelist.xml rename to AutomatedTesting/Levels/Physics/ScriptCanvas_PreUpdateEvent/filelist.xml diff --git a/AutomatedTesting/Levels/Physics/C14902097_ScriptCanvas_PreUpdateEvent/level.pak b/AutomatedTesting/Levels/Physics/ScriptCanvas_PreUpdateEvent/level.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C14902097_ScriptCanvas_PreUpdateEvent/level.pak rename to AutomatedTesting/Levels/Physics/ScriptCanvas_PreUpdateEvent/level.pak diff --git a/AutomatedTesting/Levels/Physics/C5959764_ForceRegion_ForceRegionImpulsesCapsule/leveldata/Environment.xml b/AutomatedTesting/Levels/Physics/ScriptCanvas_PreUpdateEvent/leveldata/Environment.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C5959764_ForceRegion_ForceRegionImpulsesCapsule/leveldata/Environment.xml rename to AutomatedTesting/Levels/Physics/ScriptCanvas_PreUpdateEvent/leveldata/Environment.xml diff --git a/AutomatedTesting/Levels/Physics/C5959809_ForceRegion_RotationalOffset/leveldata/GameTokens.xml b/AutomatedTesting/Levels/Physics/ScriptCanvas_PreUpdateEvent/leveldata/GameTokens.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C5959809_ForceRegion_RotationalOffset/leveldata/GameTokens.xml rename to AutomatedTesting/Levels/Physics/ScriptCanvas_PreUpdateEvent/leveldata/GameTokens.xml diff --git a/AutomatedTesting/Levels/Physics/C5689524_MultipleTerrains_CheckWarningInConsole/leveldata/TerrainTexture.xml b/AutomatedTesting/Levels/Physics/ScriptCanvas_PreUpdateEvent/leveldata/TerrainTexture.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C5689524_MultipleTerrains_CheckWarningInConsole/leveldata/TerrainTexture.xml rename to AutomatedTesting/Levels/Physics/ScriptCanvas_PreUpdateEvent/leveldata/TerrainTexture.xml diff --git a/AutomatedTesting/Levels/Physics/C5959760_PhysxForceRegion_PointForceExertion/leveldata/TimeOfDay.xml b/AutomatedTesting/Levels/Physics/ScriptCanvas_PreUpdateEvent/leveldata/TimeOfDay.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C5959760_PhysxForceRegion_PointForceExertion/leveldata/TimeOfDay.xml rename to AutomatedTesting/Levels/Physics/ScriptCanvas_PreUpdateEvent/leveldata/TimeOfDay.xml diff --git a/AutomatedTesting/Levels/Physics/C5959809_ForceRegion_RotationalOffset/leveldata/VegetationMap.dat b/AutomatedTesting/Levels/Physics/ScriptCanvas_PreUpdateEvent/leveldata/VegetationMap.dat similarity index 100% rename from AutomatedTesting/Levels/Physics/C5959809_ForceRegion_RotationalOffset/leveldata/VegetationMap.dat rename to AutomatedTesting/Levels/Physics/ScriptCanvas_PreUpdateEvent/leveldata/VegetationMap.dat diff --git a/AutomatedTesting/Levels/Physics/C5959808_ForceRegion_PositionOffset/tags.txt b/AutomatedTesting/Levels/Physics/ScriptCanvas_PreUpdateEvent/tags.txt similarity index 100% rename from AutomatedTesting/Levels/Physics/C5959808_ForceRegion_PositionOffset/tags.txt rename to AutomatedTesting/Levels/Physics/ScriptCanvas_PreUpdateEvent/tags.txt diff --git a/AutomatedTesting/Levels/Physics/C5959810_ForceRegion_ForceRegionCombinesForces/terraintexture.pak b/AutomatedTesting/Levels/Physics/ScriptCanvas_PreUpdateEvent/terraintexture.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C5959810_ForceRegion_ForceRegionCombinesForces/terraintexture.pak rename to AutomatedTesting/Levels/Physics/ScriptCanvas_PreUpdateEvent/terraintexture.pak diff --git a/AutomatedTesting/Levels/Physics/C14976308_ScriptCanvas_SetKinematicTargetTransform/C14976308_ScriptCanvas_SetKinematicTargetTransform.ly b/AutomatedTesting/Levels/Physics/ScriptCanvas_SetKinematicTargetTransform/ScriptCanvas_SetKinematicTargetTransform.ly similarity index 100% rename from AutomatedTesting/Levels/Physics/C14976308_ScriptCanvas_SetKinematicTargetTransform/C14976308_ScriptCanvas_SetKinematicTargetTransform.ly rename to AutomatedTesting/Levels/Physics/ScriptCanvas_SetKinematicTargetTransform/ScriptCanvas_SetKinematicTargetTransform.ly diff --git a/AutomatedTesting/Levels/Physics/C14976308_ScriptCanvas_SetKinematicTargetTransform/Signal.scriptcanvas b/AutomatedTesting/Levels/Physics/ScriptCanvas_SetKinematicTargetTransform/Signal.scriptcanvas similarity index 100% rename from AutomatedTesting/Levels/Physics/C14976308_ScriptCanvas_SetKinematicTargetTransform/Signal.scriptcanvas rename to AutomatedTesting/Levels/Physics/ScriptCanvas_SetKinematicTargetTransform/Signal.scriptcanvas diff --git a/AutomatedTesting/Levels/Physics/C14976308_ScriptCanvas_SetKinematicTargetTransform/filelist.xml b/AutomatedTesting/Levels/Physics/ScriptCanvas_SetKinematicTargetTransform/filelist.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C14976308_ScriptCanvas_SetKinematicTargetTransform/filelist.xml rename to AutomatedTesting/Levels/Physics/ScriptCanvas_SetKinematicTargetTransform/filelist.xml diff --git a/AutomatedTesting/Levels/Physics/C14976308_ScriptCanvas_SetKinematicTargetTransform/level.pak b/AutomatedTesting/Levels/Physics/ScriptCanvas_SetKinematicTargetTransform/level.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C14976308_ScriptCanvas_SetKinematicTargetTransform/level.pak rename to AutomatedTesting/Levels/Physics/ScriptCanvas_SetKinematicTargetTransform/level.pak diff --git a/AutomatedTesting/Levels/Physics/C5959765_ForceRegion_AssetGetsImpulsed/leveldata/Environment.xml b/AutomatedTesting/Levels/Physics/ScriptCanvas_SetKinematicTargetTransform/leveldata/Environment.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C5959765_ForceRegion_AssetGetsImpulsed/leveldata/Environment.xml rename to AutomatedTesting/Levels/Physics/ScriptCanvas_SetKinematicTargetTransform/leveldata/Environment.xml diff --git a/AutomatedTesting/Levels/Physics/C5959810_ForceRegion_ForceRegionCombinesForces/leveldata/GameTokens.xml b/AutomatedTesting/Levels/Physics/ScriptCanvas_SetKinematicTargetTransform/leveldata/GameTokens.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C5959810_ForceRegion_ForceRegionCombinesForces/leveldata/GameTokens.xml rename to AutomatedTesting/Levels/Physics/ScriptCanvas_SetKinematicTargetTransform/leveldata/GameTokens.xml diff --git a/AutomatedTesting/Levels/Physics/C6090547_ForceRegion_ParentChildForceRegions/leveldata/TerrainTexture.xml b/AutomatedTesting/Levels/Physics/ScriptCanvas_SetKinematicTargetTransform/leveldata/TerrainTexture.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C6090547_ForceRegion_ParentChildForceRegions/leveldata/TerrainTexture.xml rename to AutomatedTesting/Levels/Physics/ScriptCanvas_SetKinematicTargetTransform/leveldata/TerrainTexture.xml diff --git a/AutomatedTesting/Levels/Physics/C5959761_ForceRegion_ExertsPointForce_Sedan/leveldata/TimeOfDay.xml b/AutomatedTesting/Levels/Physics/ScriptCanvas_SetKinematicTargetTransform/leveldata/TimeOfDay.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C5959761_ForceRegion_ExertsPointForce_Sedan/leveldata/TimeOfDay.xml rename to AutomatedTesting/Levels/Physics/ScriptCanvas_SetKinematicTargetTransform/leveldata/TimeOfDay.xml diff --git a/AutomatedTesting/Levels/Physics/C5959810_ForceRegion_ForceRegionCombinesForces/leveldata/VegetationMap.dat b/AutomatedTesting/Levels/Physics/ScriptCanvas_SetKinematicTargetTransform/leveldata/VegetationMap.dat similarity index 100% rename from AutomatedTesting/Levels/Physics/C5959810_ForceRegion_ForceRegionCombinesForces/leveldata/VegetationMap.dat rename to AutomatedTesting/Levels/Physics/ScriptCanvas_SetKinematicTargetTransform/leveldata/VegetationMap.dat diff --git a/AutomatedTesting/Levels/Physics/C5959809_ForceRegion_RotationalOffset/tags.txt b/AutomatedTesting/Levels/Physics/ScriptCanvas_SetKinematicTargetTransform/tags.txt similarity index 100% rename from AutomatedTesting/Levels/Physics/C5959809_ForceRegion_RotationalOffset/tags.txt rename to AutomatedTesting/Levels/Physics/ScriptCanvas_SetKinematicTargetTransform/tags.txt diff --git a/AutomatedTesting/Levels/Physics/C5968759_ForceRegion_ExertsSeveralForcesOnRigidBody/terraintexture.pak b/AutomatedTesting/Levels/Physics/ScriptCanvas_SetKinematicTargetTransform/terraintexture.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C5968759_ForceRegion_ExertsSeveralForcesOnRigidBody/terraintexture.pak rename to AutomatedTesting/Levels/Physics/ScriptCanvas_SetKinematicTargetTransform/terraintexture.pak diff --git a/AutomatedTesting/Levels/Physics/ScriptCanvas_ShapeCast/ScriptCanvas_ShapeCast.ly b/AutomatedTesting/Levels/Physics/ScriptCanvas_ShapeCast/ScriptCanvas_ShapeCast.ly new file mode 100644 index 0000000000..2f7291cb27 --- /dev/null +++ b/AutomatedTesting/Levels/Physics/ScriptCanvas_ShapeCast/ScriptCanvas_ShapeCast.ly @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3361ba7aa2faa53421d8a92ed0bb2e1747e766d93c0315484a3c85b74a6494c3 +size 8820 diff --git a/AutomatedTesting/Levels/Physics/C12712455_ScriptCanvas_ShapeCastVerification/filelist.xml b/AutomatedTesting/Levels/Physics/ScriptCanvas_ShapeCast/filelist.xml similarity index 70% rename from AutomatedTesting/Levels/Physics/C12712455_ScriptCanvas_ShapeCastVerification/filelist.xml rename to AutomatedTesting/Levels/Physics/ScriptCanvas_ShapeCast/filelist.xml index 36bb23e8d4..e07ddfafba 100644 --- a/AutomatedTesting/Levels/Physics/C12712455_ScriptCanvas_ShapeCastVerification/filelist.xml +++ b/AutomatedTesting/Levels/Physics/ScriptCanvas_ShapeCast/filelist.xml @@ -1,4 +1,4 @@ - + diff --git a/AutomatedTesting/Levels/Physics/C12712455_ScriptCanvas_ShapeCastVerification/level.pak b/AutomatedTesting/Levels/Physics/ScriptCanvas_ShapeCast/level.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C12712455_ScriptCanvas_ShapeCastVerification/level.pak rename to AutomatedTesting/Levels/Physics/ScriptCanvas_ShapeCast/level.pak diff --git a/AutomatedTesting/Levels/Physics/C5959808_ForceRegion_PositionOffset/leveldata/Environment.xml b/AutomatedTesting/Levels/Physics/ScriptCanvas_ShapeCast/leveldata/Environment.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C5959808_ForceRegion_PositionOffset/leveldata/Environment.xml rename to AutomatedTesting/Levels/Physics/ScriptCanvas_ShapeCast/leveldata/Environment.xml diff --git a/AutomatedTesting/Levels/Physics/C5968760_ForceRegion_CheckNetForceChange/leveldata/GameTokens.xml b/AutomatedTesting/Levels/Physics/ScriptCanvas_ShapeCast/leveldata/GameTokens.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C5968760_ForceRegion_CheckNetForceChange/leveldata/GameTokens.xml rename to AutomatedTesting/Levels/Physics/ScriptCanvas_ShapeCast/leveldata/GameTokens.xml diff --git a/AutomatedTesting/Levels/Physics/C5689528_Terrain_MultipleTerrainComponents/leveldata/TerrainTexture.xml b/AutomatedTesting/Levels/Physics/ScriptCanvas_ShapeCast/leveldata/TerrainTexture.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C5689528_Terrain_MultipleTerrainComponents/leveldata/TerrainTexture.xml rename to AutomatedTesting/Levels/Physics/ScriptCanvas_ShapeCast/leveldata/TerrainTexture.xml diff --git a/AutomatedTesting/Levels/Physics/C5340400_RigidBody_ManualMomentOfInertia/leveldata/TimeOfDay.xml b/AutomatedTesting/Levels/Physics/ScriptCanvas_ShapeCast/leveldata/TimeOfDay.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C5340400_RigidBody_ManualMomentOfInertia/leveldata/TimeOfDay.xml rename to AutomatedTesting/Levels/Physics/ScriptCanvas_ShapeCast/leveldata/TimeOfDay.xml diff --git a/AutomatedTesting/Levels/Physics/C5968759_ForceRegion_ExertsSeveralForcesOnRigidBody/leveldata/VegetationMap.dat b/AutomatedTesting/Levels/Physics/ScriptCanvas_ShapeCast/leveldata/VegetationMap.dat similarity index 100% rename from AutomatedTesting/Levels/Physics/C5968759_ForceRegion_ExertsSeveralForcesOnRigidBody/leveldata/VegetationMap.dat rename to AutomatedTesting/Levels/Physics/ScriptCanvas_ShapeCast/leveldata/VegetationMap.dat diff --git a/AutomatedTesting/Levels/Physics/C5959810_ForceRegion_ForceRegionCombinesForces/tags.txt b/AutomatedTesting/Levels/Physics/ScriptCanvas_ShapeCast/tags.txt similarity index 100% rename from AutomatedTesting/Levels/Physics/C5959810_ForceRegion_ForceRegionCombinesForces/tags.txt rename to AutomatedTesting/Levels/Physics/ScriptCanvas_ShapeCast/tags.txt diff --git a/AutomatedTesting/Levels/Physics/C5968760_ForceRegion_CheckNetForceChange/terraintexture.pak b/AutomatedTesting/Levels/Physics/ScriptCanvas_ShapeCast/terraintexture.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C5968760_ForceRegion_CheckNetForceChange/terraintexture.pak rename to AutomatedTesting/Levels/Physics/ScriptCanvas_ShapeCast/terraintexture.pak diff --git a/AutomatedTesting/Levels/Physics/C6224408_ScriptCanvas_EntitySpawn/Ball_0.slice b/AutomatedTesting/Levels/Physics/ScriptCanvas_SpawnEntityWithPhysComponents/Ball_0.slice similarity index 100% rename from AutomatedTesting/Levels/Physics/C6224408_ScriptCanvas_EntitySpawn/Ball_0.slice rename to AutomatedTesting/Levels/Physics/ScriptCanvas_SpawnEntityWithPhysComponents/Ball_0.slice diff --git a/AutomatedTesting/Levels/Physics/C6224408_ScriptCanvas_EntitySpawn/C6224408_ScriptCanvas_EntitySpawn.ly b/AutomatedTesting/Levels/Physics/ScriptCanvas_SpawnEntityWithPhysComponents/ScriptCanvas_SpawnEntityWithPhysComponents.ly similarity index 100% rename from AutomatedTesting/Levels/Physics/C6224408_ScriptCanvas_EntitySpawn/C6224408_ScriptCanvas_EntitySpawn.ly rename to AutomatedTesting/Levels/Physics/ScriptCanvas_SpawnEntityWithPhysComponents/ScriptCanvas_SpawnEntityWithPhysComponents.ly diff --git a/AutomatedTesting/Levels/Physics/C6224408_ScriptCanvas_EntitySpawn/filelist.xml b/AutomatedTesting/Levels/Physics/ScriptCanvas_SpawnEntityWithPhysComponents/filelist.xml similarity index 70% rename from AutomatedTesting/Levels/Physics/C6224408_ScriptCanvas_EntitySpawn/filelist.xml rename to AutomatedTesting/Levels/Physics/ScriptCanvas_SpawnEntityWithPhysComponents/filelist.xml index 9765b5376b..d04d7d2c18 100644 --- a/AutomatedTesting/Levels/Physics/C6224408_ScriptCanvas_EntitySpawn/filelist.xml +++ b/AutomatedTesting/Levels/Physics/ScriptCanvas_SpawnEntityWithPhysComponents/filelist.xml @@ -1,4 +1,4 @@ - + diff --git a/AutomatedTesting/Levels/Physics/C6224408_ScriptCanvas_EntitySpawn/level.pak b/AutomatedTesting/Levels/Physics/ScriptCanvas_SpawnEntityWithPhysComponents/level.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C6224408_ScriptCanvas_EntitySpawn/level.pak rename to AutomatedTesting/Levels/Physics/ScriptCanvas_SpawnEntityWithPhysComponents/level.pak diff --git a/AutomatedTesting/Levels/Physics/C5959809_ForceRegion_RotationalOffset/leveldata/Environment.xml b/AutomatedTesting/Levels/Physics/ScriptCanvas_SpawnEntityWithPhysComponents/leveldata/Environment.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C5959809_ForceRegion_RotationalOffset/leveldata/Environment.xml rename to AutomatedTesting/Levels/Physics/ScriptCanvas_SpawnEntityWithPhysComponents/leveldata/Environment.xml diff --git a/AutomatedTesting/Levels/Physics/C6032082_Terrain_MultipleResolutionsValid_1024x1024_32m/leveldata/GameTokens.xml b/AutomatedTesting/Levels/Physics/ScriptCanvas_SpawnEntityWithPhysComponents/leveldata/GameTokens.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C6032082_Terrain_MultipleResolutionsValid_1024x1024_32m/leveldata/GameTokens.xml rename to AutomatedTesting/Levels/Physics/ScriptCanvas_SpawnEntityWithPhysComponents/leveldata/GameTokens.xml diff --git a/AutomatedTesting/Levels/Physics/C5689529_Verify_Terrain_RigidBody_Collider_Mesh/leveldata/TerrainTexture.xml b/AutomatedTesting/Levels/Physics/ScriptCanvas_SpawnEntityWithPhysComponents/leveldata/TerrainTexture.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C5689529_Verify_Terrain_RigidBody_Collider_Mesh/leveldata/TerrainTexture.xml rename to AutomatedTesting/Levels/Physics/ScriptCanvas_SpawnEntityWithPhysComponents/leveldata/TerrainTexture.xml diff --git a/AutomatedTesting/Levels/Physics/C6224408_ScriptCanvas_EntitySpawn/leveldata/TimeOfDay.xml b/AutomatedTesting/Levels/Physics/ScriptCanvas_SpawnEntityWithPhysComponents/leveldata/TimeOfDay.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C6224408_ScriptCanvas_EntitySpawn/leveldata/TimeOfDay.xml rename to AutomatedTesting/Levels/Physics/ScriptCanvas_SpawnEntityWithPhysComponents/leveldata/TimeOfDay.xml diff --git a/AutomatedTesting/Levels/Physics/C5968760_ForceRegion_CheckNetForceChange/leveldata/VegetationMap.dat b/AutomatedTesting/Levels/Physics/ScriptCanvas_SpawnEntityWithPhysComponents/leveldata/VegetationMap.dat similarity index 100% rename from AutomatedTesting/Levels/Physics/C5968760_ForceRegion_CheckNetForceChange/leveldata/VegetationMap.dat rename to AutomatedTesting/Levels/Physics/ScriptCanvas_SpawnEntityWithPhysComponents/leveldata/VegetationMap.dat diff --git a/AutomatedTesting/Levels/Physics/C5968759_ForceRegion_ExertsSeveralForcesOnRigidBody/tags.txt b/AutomatedTesting/Levels/Physics/ScriptCanvas_SpawnEntityWithPhysComponents/tags.txt similarity index 100% rename from AutomatedTesting/Levels/Physics/C5968759_ForceRegion_ExertsSeveralForcesOnRigidBody/tags.txt rename to AutomatedTesting/Levels/Physics/ScriptCanvas_SpawnEntityWithPhysComponents/tags.txt diff --git a/AutomatedTesting/Levels/Physics/C5689518_PhysXEntity_collides_with_PhysXTerrain/terrain/terrain.pxheightfield b/AutomatedTesting/Levels/Physics/ScriptCanvas_SpawnEntityWithPhysComponents/terrain/terrain.pxheightfield similarity index 100% rename from AutomatedTesting/Levels/Physics/C5689518_PhysXEntity_collides_with_PhysXTerrain/terrain/terrain.pxheightfield rename to AutomatedTesting/Levels/Physics/ScriptCanvas_SpawnEntityWithPhysComponents/terrain/terrain.pxheightfield diff --git a/AutomatedTesting/Levels/Physics/C6032082_Terrain_MultipleResolutionsValid_1024x1024_32m/terraintexture.pak b/AutomatedTesting/Levels/Physics/ScriptCanvas_SpawnEntityWithPhysComponents/terraintexture.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C6032082_Terrain_MultipleResolutionsValid_1024x1024_32m/terraintexture.pak rename to AutomatedTesting/Levels/Physics/ScriptCanvas_SpawnEntityWithPhysComponents/terraintexture.pak diff --git a/AutomatedTesting/Levels/Physics/C6274125_ScriptCanvas_TriggerEvents/C6274125_ScriptCanvas_TriggerEvents.ly b/AutomatedTesting/Levels/Physics/ScriptCanvas_TriggerEvents/ScriptCanvas_TriggerEvents.ly similarity index 100% rename from AutomatedTesting/Levels/Physics/C6274125_ScriptCanvas_TriggerEvents/C6274125_ScriptCanvas_TriggerEvents.ly rename to AutomatedTesting/Levels/Physics/ScriptCanvas_TriggerEvents/ScriptCanvas_TriggerEvents.ly diff --git a/AutomatedTesting/Levels/Physics/C6274125_ScriptCanvas_TriggerEvents/filelist.xml b/AutomatedTesting/Levels/Physics/ScriptCanvas_TriggerEvents/filelist.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C6274125_ScriptCanvas_TriggerEvents/filelist.xml rename to AutomatedTesting/Levels/Physics/ScriptCanvas_TriggerEvents/filelist.xml diff --git a/AutomatedTesting/Levels/Physics/C6274125_ScriptCanvas_TriggerEvents/level.pak b/AutomatedTesting/Levels/Physics/ScriptCanvas_TriggerEvents/level.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C6274125_ScriptCanvas_TriggerEvents/level.pak rename to AutomatedTesting/Levels/Physics/ScriptCanvas_TriggerEvents/level.pak diff --git a/AutomatedTesting/Levels/Physics/C5959810_ForceRegion_ForceRegionCombinesForces/leveldata/Environment.xml b/AutomatedTesting/Levels/Physics/ScriptCanvas_TriggerEvents/leveldata/Environment.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C5959810_ForceRegion_ForceRegionCombinesForces/leveldata/Environment.xml rename to AutomatedTesting/Levels/Physics/ScriptCanvas_TriggerEvents/leveldata/Environment.xml diff --git a/AutomatedTesting/Levels/Physics/C6032082_Terrain_MultipleResolutionsValid_128x128_1m/leveldata/GameTokens.xml b/AutomatedTesting/Levels/Physics/ScriptCanvas_TriggerEvents/leveldata/GameTokens.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C6032082_Terrain_MultipleResolutionsValid_128x128_1m/leveldata/GameTokens.xml rename to AutomatedTesting/Levels/Physics/ScriptCanvas_TriggerEvents/leveldata/GameTokens.xml diff --git a/AutomatedTesting/Levels/Physics/C5689531_Warning_TerrainSliceTerrainComponent/leveldata/TerrainTexture.xml b/AutomatedTesting/Levels/Physics/ScriptCanvas_TriggerEvents/leveldata/TerrainTexture.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C5689531_Warning_TerrainSliceTerrainComponent/leveldata/TerrainTexture.xml rename to AutomatedTesting/Levels/Physics/ScriptCanvas_TriggerEvents/leveldata/TerrainTexture.xml diff --git a/AutomatedTesting/Levels/Physics/C5959763_ForceRegion_ForceRegionImpulsesCube/leveldata/TimeOfDay.xml b/AutomatedTesting/Levels/Physics/ScriptCanvas_TriggerEvents/leveldata/TimeOfDay.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C5959763_ForceRegion_ForceRegionImpulsesCube/leveldata/TimeOfDay.xml rename to AutomatedTesting/Levels/Physics/ScriptCanvas_TriggerEvents/leveldata/TimeOfDay.xml diff --git a/AutomatedTesting/Levels/Physics/C6032082_Terrain_MultipleResolutionsValid_1024x1024_32m/leveldata/VegetationMap.dat b/AutomatedTesting/Levels/Physics/ScriptCanvas_TriggerEvents/leveldata/VegetationMap.dat similarity index 100% rename from AutomatedTesting/Levels/Physics/C6032082_Terrain_MultipleResolutionsValid_1024x1024_32m/leveldata/VegetationMap.dat rename to AutomatedTesting/Levels/Physics/ScriptCanvas_TriggerEvents/leveldata/VegetationMap.dat diff --git a/AutomatedTesting/Levels/Physics/C5968760_ForceRegion_CheckNetForceChange/tags.txt b/AutomatedTesting/Levels/Physics/ScriptCanvas_TriggerEvents/tags.txt similarity index 100% rename from AutomatedTesting/Levels/Physics/C5968760_ForceRegion_CheckNetForceChange/tags.txt rename to AutomatedTesting/Levels/Physics/ScriptCanvas_TriggerEvents/tags.txt diff --git a/AutomatedTesting/Levels/Physics/C6032082_Terrain_MultipleResolutionsValid_128x128_1m/terraintexture.pak b/AutomatedTesting/Levels/Physics/ScriptCanvas_TriggerEvents/terraintexture.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C6032082_Terrain_MultipleResolutionsValid_128x128_1m/terraintexture.pak rename to AutomatedTesting/Levels/Physics/ScriptCanvas_TriggerEvents/terraintexture.pak diff --git a/AutomatedTesting/Levels/Physics/C24308873_CylinderShapeCollider_CollidesWithPhysXTerrain/C24308873_CylinderShapeCollider_CollidesWithPhysXTerrain.ly b/AutomatedTesting/Levels/Physics/ShapeCollider_CylinderShapeCollides/ShapeCollider_CylinderShapeCollides.ly similarity index 100% rename from AutomatedTesting/Levels/Physics/C24308873_CylinderShapeCollider_CollidesWithPhysXTerrain/C24308873_CylinderShapeCollider_CollidesWithPhysXTerrain.ly rename to AutomatedTesting/Levels/Physics/ShapeCollider_CylinderShapeCollides/ShapeCollider_CylinderShapeCollides.ly diff --git a/AutomatedTesting/Levels/Physics/C24308873_CylinderShapeCollider_CollidesWithPhysXTerrain/filelist.xml b/AutomatedTesting/Levels/Physics/ShapeCollider_CylinderShapeCollides/filelist.xml similarity index 67% rename from AutomatedTesting/Levels/Physics/C24308873_CylinderShapeCollider_CollidesWithPhysXTerrain/filelist.xml rename to AutomatedTesting/Levels/Physics/ShapeCollider_CylinderShapeCollides/filelist.xml index 344896222d..984d6023c5 100644 --- a/AutomatedTesting/Levels/Physics/C24308873_CylinderShapeCollider_CollidesWithPhysXTerrain/filelist.xml +++ b/AutomatedTesting/Levels/Physics/ShapeCollider_CylinderShapeCollides/filelist.xml @@ -1,4 +1,4 @@ - + diff --git a/AutomatedTesting/Levels/Physics/C24308873_CylinderShapeCollider_CollidesWithPhysXTerrain/level.pak b/AutomatedTesting/Levels/Physics/ShapeCollider_CylinderShapeCollides/level.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C24308873_CylinderShapeCollider_CollidesWithPhysXTerrain/level.pak rename to AutomatedTesting/Levels/Physics/ShapeCollider_CylinderShapeCollides/level.pak diff --git a/AutomatedTesting/Levels/Physics/C5968759_ForceRegion_ExertsSeveralForcesOnRigidBody/leveldata/Environment.xml b/AutomatedTesting/Levels/Physics/ShapeCollider_CylinderShapeCollides/leveldata/Environment.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C5968759_ForceRegion_ExertsSeveralForcesOnRigidBody/leveldata/Environment.xml rename to AutomatedTesting/Levels/Physics/ShapeCollider_CylinderShapeCollides/leveldata/Environment.xml diff --git a/AutomatedTesting/Levels/Physics/C6032082_Terrain_MultipleResolutionsValid_4096x4096_16m/leveldata/GameTokens.xml b/AutomatedTesting/Levels/Physics/ShapeCollider_CylinderShapeCollides/leveldata/GameTokens.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C6032082_Terrain_MultipleResolutionsValid_4096x4096_16m/leveldata/GameTokens.xml rename to AutomatedTesting/Levels/Physics/ShapeCollider_CylinderShapeCollides/leveldata/GameTokens.xml diff --git a/AutomatedTesting/Levels/Physics/C6090550_ForceRegion_WorldSpaceForceNegative/leveldata/TerrainTexture.xml b/AutomatedTesting/Levels/Physics/ShapeCollider_CylinderShapeCollides/leveldata/TerrainTexture.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C6090550_ForceRegion_WorldSpaceForceNegative/leveldata/TerrainTexture.xml rename to AutomatedTesting/Levels/Physics/ShapeCollider_CylinderShapeCollides/leveldata/TerrainTexture.xml diff --git a/AutomatedTesting/Levels/Physics/C24308873_CylinderShapeCollider_CollidesWithPhysXTerrain/leveldata/TimeOfDay.xml b/AutomatedTesting/Levels/Physics/ShapeCollider_CylinderShapeCollides/leveldata/TimeOfDay.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C24308873_CylinderShapeCollider_CollidesWithPhysXTerrain/leveldata/TimeOfDay.xml rename to AutomatedTesting/Levels/Physics/ShapeCollider_CylinderShapeCollides/leveldata/TimeOfDay.xml diff --git a/AutomatedTesting/Levels/Physics/C6032082_Terrain_MultipleResolutionsValid_128x128_1m/leveldata/VegetationMap.dat b/AutomatedTesting/Levels/Physics/ShapeCollider_CylinderShapeCollides/leveldata/VegetationMap.dat similarity index 100% rename from AutomatedTesting/Levels/Physics/C6032082_Terrain_MultipleResolutionsValid_128x128_1m/leveldata/VegetationMap.dat rename to AutomatedTesting/Levels/Physics/ShapeCollider_CylinderShapeCollides/leveldata/VegetationMap.dat diff --git a/AutomatedTesting/Levels/Physics/C6032082_Terrain_MultipleResolutionsValid_1024x1024_32m/tags.txt b/AutomatedTesting/Levels/Physics/ShapeCollider_CylinderShapeCollides/tags.txt similarity index 100% rename from AutomatedTesting/Levels/Physics/C6032082_Terrain_MultipleResolutionsValid_1024x1024_32m/tags.txt rename to AutomatedTesting/Levels/Physics/ShapeCollider_CylinderShapeCollides/tags.txt diff --git a/AutomatedTesting/Levels/Physics/C24308873_CylinderShapeCollider_CollidesWithPhysXTerrain/terrain/terrain.pxheightfield b/AutomatedTesting/Levels/Physics/ShapeCollider_CylinderShapeCollides/terrain/terrain.pxheightfield similarity index 100% rename from AutomatedTesting/Levels/Physics/C24308873_CylinderShapeCollider_CollidesWithPhysXTerrain/terrain/terrain.pxheightfield rename to AutomatedTesting/Levels/Physics/ShapeCollider_CylinderShapeCollides/terrain/terrain.pxheightfield diff --git a/AutomatedTesting/Levels/Physics/C6032082_Terrain_MultipleResolutionsValid_4096x4096_16m/terraintexture.pak b/AutomatedTesting/Levels/Physics/ShapeCollider_CylinderShapeCollides/terraintexture.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C6032082_Terrain_MultipleResolutionsValid_4096x4096_16m/terraintexture.pak rename to AutomatedTesting/Levels/Physics/ShapeCollider_CylinderShapeCollides/terraintexture.pak diff --git a/AutomatedTesting/Levels/Physics/C5689522_Physxterrain_AddPhysxterrainNoEditorCrash/C5689522_Physxterrain_AddPhysxterrainNoEditorCrash.ly b/AutomatedTesting/Levels/Physics/Terrain_AddPhysTerrainComponent/Terrain_AddPhysTerrainComponent.ly similarity index 100% rename from AutomatedTesting/Levels/Physics/C5689522_Physxterrain_AddPhysxterrainNoEditorCrash/C5689522_Physxterrain_AddPhysxterrainNoEditorCrash.ly rename to AutomatedTesting/Levels/Physics/Terrain_AddPhysTerrainComponent/Terrain_AddPhysTerrainComponent.ly diff --git a/AutomatedTesting/Levels/Physics/C5689522_Physxterrain_AddPhysxterrainNoEditorCrash/filelist.xml b/AutomatedTesting/Levels/Physics/Terrain_AddPhysTerrainComponent/filelist.xml similarity index 68% rename from AutomatedTesting/Levels/Physics/C5689522_Physxterrain_AddPhysxterrainNoEditorCrash/filelist.xml rename to AutomatedTesting/Levels/Physics/Terrain_AddPhysTerrainComponent/filelist.xml index 870334d74d..88ab352775 100644 --- a/AutomatedTesting/Levels/Physics/C5689522_Physxterrain_AddPhysxterrainNoEditorCrash/filelist.xml +++ b/AutomatedTesting/Levels/Physics/Terrain_AddPhysTerrainComponent/filelist.xml @@ -1,4 +1,4 @@ - + diff --git a/AutomatedTesting/Levels/Physics/C5689522_Physxterrain_AddPhysxterrainNoEditorCrash/level.pak b/AutomatedTesting/Levels/Physics/Terrain_AddPhysTerrainComponent/level.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C5689522_Physxterrain_AddPhysxterrainNoEditorCrash/level.pak rename to AutomatedTesting/Levels/Physics/Terrain_AddPhysTerrainComponent/level.pak diff --git a/AutomatedTesting/Levels/Physics/C5968760_ForceRegion_CheckNetForceChange/leveldata/Environment.xml b/AutomatedTesting/Levels/Physics/Terrain_AddPhysTerrainComponent/leveldata/Environment.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C5968760_ForceRegion_CheckNetForceChange/leveldata/Environment.xml rename to AutomatedTesting/Levels/Physics/Terrain_AddPhysTerrainComponent/leveldata/Environment.xml diff --git a/AutomatedTesting/Levels/Physics/C6032082_Terrain_MultipleResolutionsValid_512x512_2m/leveldata/GameTokens.xml b/AutomatedTesting/Levels/Physics/Terrain_AddPhysTerrainComponent/leveldata/GameTokens.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C6032082_Terrain_MultipleResolutionsValid_512x512_2m/leveldata/GameTokens.xml rename to AutomatedTesting/Levels/Physics/Terrain_AddPhysTerrainComponent/leveldata/GameTokens.xml diff --git a/AutomatedTesting/Levels/Physics/C5959759_RigidBody_ForceRegionSpherePointForce/leveldata/TerrainTexture.xml b/AutomatedTesting/Levels/Physics/Terrain_AddPhysTerrainComponent/leveldata/TerrainTexture.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C5959759_RigidBody_ForceRegionSpherePointForce/leveldata/TerrainTexture.xml rename to AutomatedTesting/Levels/Physics/Terrain_AddPhysTerrainComponent/leveldata/TerrainTexture.xml diff --git a/AutomatedTesting/Levels/Physics/C5959764_ForceRegion_ForceRegionImpulsesCapsule/leveldata/TimeOfDay.xml b/AutomatedTesting/Levels/Physics/Terrain_AddPhysTerrainComponent/leveldata/TimeOfDay.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C5959764_ForceRegion_ForceRegionImpulsesCapsule/leveldata/TimeOfDay.xml rename to AutomatedTesting/Levels/Physics/Terrain_AddPhysTerrainComponent/leveldata/TimeOfDay.xml diff --git a/AutomatedTesting/Levels/Physics/C6032082_Terrain_MultipleResolutionsValid_4096x4096_16m/leveldata/VegetationMap.dat b/AutomatedTesting/Levels/Physics/Terrain_AddPhysTerrainComponent/leveldata/VegetationMap.dat similarity index 100% rename from AutomatedTesting/Levels/Physics/C6032082_Terrain_MultipleResolutionsValid_4096x4096_16m/leveldata/VegetationMap.dat rename to AutomatedTesting/Levels/Physics/Terrain_AddPhysTerrainComponent/leveldata/VegetationMap.dat diff --git a/AutomatedTesting/Levels/Physics/C6032082_Terrain_MultipleResolutionsValid_128x128_1m/tags.txt b/AutomatedTesting/Levels/Physics/Terrain_AddPhysTerrainComponent/tags.txt similarity index 100% rename from AutomatedTesting/Levels/Physics/C6032082_Terrain_MultipleResolutionsValid_128x128_1m/tags.txt rename to AutomatedTesting/Levels/Physics/Terrain_AddPhysTerrainComponent/tags.txt diff --git a/AutomatedTesting/Levels/Physics/C5689521_Terrain_NoCollisionAfterTerrainDeletion/terrain/terrain.pxheightfield b/AutomatedTesting/Levels/Physics/Terrain_AddPhysTerrainComponent/terrain/terrain.pxheightfield similarity index 100% rename from AutomatedTesting/Levels/Physics/C5689521_Terrain_NoCollisionAfterTerrainDeletion/terrain/terrain.pxheightfield rename to AutomatedTesting/Levels/Physics/Terrain_AddPhysTerrainComponent/terrain/terrain.pxheightfield diff --git a/AutomatedTesting/Levels/Physics/C6032082_Terrain_MultipleResolutionsValid_512x512_2m/terraintexture.pak b/AutomatedTesting/Levels/Physics/Terrain_AddPhysTerrainComponent/terraintexture.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C6032082_Terrain_MultipleResolutionsValid_512x512_2m/terraintexture.pak rename to AutomatedTesting/Levels/Physics/Terrain_AddPhysTerrainComponent/terraintexture.pak diff --git a/AutomatedTesting/Levels/Physics/C5689524_MultipleTerrains_CheckWarningInConsole/C5689524_MultipleTerrains_CheckWarningInConsole.ly b/AutomatedTesting/Levels/Physics/Terrain_CanAddMultipleTerrainComponents/Terrain_CanAddMultipleTerrainComponents.ly similarity index 100% rename from AutomatedTesting/Levels/Physics/C5689524_MultipleTerrains_CheckWarningInConsole/C5689524_MultipleTerrains_CheckWarningInConsole.ly rename to AutomatedTesting/Levels/Physics/Terrain_CanAddMultipleTerrainComponents/Terrain_CanAddMultipleTerrainComponents.ly diff --git a/AutomatedTesting/Levels/Physics/C5689524_MultipleTerrains_CheckWarningInConsole/filelist.xml b/AutomatedTesting/Levels/Physics/Terrain_CanAddMultipleTerrainComponents/filelist.xml similarity index 69% rename from AutomatedTesting/Levels/Physics/C5689524_MultipleTerrains_CheckWarningInConsole/filelist.xml rename to AutomatedTesting/Levels/Physics/Terrain_CanAddMultipleTerrainComponents/filelist.xml index cdc374d412..9fd843be84 100644 --- a/AutomatedTesting/Levels/Physics/C5689524_MultipleTerrains_CheckWarningInConsole/filelist.xml +++ b/AutomatedTesting/Levels/Physics/Terrain_CanAddMultipleTerrainComponents/filelist.xml @@ -1,4 +1,4 @@ - + diff --git a/AutomatedTesting/Levels/Physics/C5689524_MultipleTerrains_CheckWarningInConsole/level.pak b/AutomatedTesting/Levels/Physics/Terrain_CanAddMultipleTerrainComponents/level.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C5689524_MultipleTerrains_CheckWarningInConsole/level.pak rename to AutomatedTesting/Levels/Physics/Terrain_CanAddMultipleTerrainComponents/level.pak diff --git a/AutomatedTesting/Levels/Physics/C6032082_Terrain_MultipleResolutionsValid_1024x1024_32m/leveldata/Environment.xml b/AutomatedTesting/Levels/Physics/Terrain_CanAddMultipleTerrainComponents/leveldata/Environment.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C6032082_Terrain_MultipleResolutionsValid_1024x1024_32m/leveldata/Environment.xml rename to AutomatedTesting/Levels/Physics/Terrain_CanAddMultipleTerrainComponents/leveldata/Environment.xml diff --git a/AutomatedTesting/Levels/Physics/C6090546_ForceRegion_SliceFileInstantiates/leveldata/GameTokens.xml b/AutomatedTesting/Levels/Physics/Terrain_CanAddMultipleTerrainComponents/leveldata/GameTokens.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C6090546_ForceRegion_SliceFileInstantiates/leveldata/GameTokens.xml rename to AutomatedTesting/Levels/Physics/Terrain_CanAddMultipleTerrainComponents/leveldata/GameTokens.xml diff --git a/AutomatedTesting/Levels/Physics/C5959760_PhysxForceRegion_PointForceExertion/leveldata/TerrainTexture.xml b/AutomatedTesting/Levels/Physics/Terrain_CanAddMultipleTerrainComponents/leveldata/TerrainTexture.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C5959760_PhysxForceRegion_PointForceExertion/leveldata/TerrainTexture.xml rename to AutomatedTesting/Levels/Physics/Terrain_CanAddMultipleTerrainComponents/leveldata/TerrainTexture.xml diff --git a/AutomatedTesting/Levels/Physics/C5959765_ForceRegion_AssetGetsImpulsed/leveldata/TimeOfDay.xml b/AutomatedTesting/Levels/Physics/Terrain_CanAddMultipleTerrainComponents/leveldata/TimeOfDay.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C5959765_ForceRegion_AssetGetsImpulsed/leveldata/TimeOfDay.xml rename to AutomatedTesting/Levels/Physics/Terrain_CanAddMultipleTerrainComponents/leveldata/TimeOfDay.xml diff --git a/AutomatedTesting/Levels/Physics/C6032082_Terrain_MultipleResolutionsValid_512x512_2m/leveldata/VegetationMap.dat b/AutomatedTesting/Levels/Physics/Terrain_CanAddMultipleTerrainComponents/leveldata/VegetationMap.dat similarity index 100% rename from AutomatedTesting/Levels/Physics/C6032082_Terrain_MultipleResolutionsValid_512x512_2m/leveldata/VegetationMap.dat rename to AutomatedTesting/Levels/Physics/Terrain_CanAddMultipleTerrainComponents/leveldata/VegetationMap.dat diff --git a/AutomatedTesting/Levels/Physics/C6032082_Terrain_MultipleResolutionsValid_4096x4096_16m/tags.txt b/AutomatedTesting/Levels/Physics/Terrain_CanAddMultipleTerrainComponents/tags.txt similarity index 100% rename from AutomatedTesting/Levels/Physics/C6032082_Terrain_MultipleResolutionsValid_4096x4096_16m/tags.txt rename to AutomatedTesting/Levels/Physics/Terrain_CanAddMultipleTerrainComponents/tags.txt diff --git a/AutomatedTesting/Levels/Physics/C5689522_Physxterrain_AddPhysxterrainNoEditorCrash/terrain/terrain.pxheightfield b/AutomatedTesting/Levels/Physics/Terrain_CanAddMultipleTerrainComponents/terrain/terrain.pxheightfield similarity index 100% rename from AutomatedTesting/Levels/Physics/C5689522_Physxterrain_AddPhysxterrainNoEditorCrash/terrain/terrain.pxheightfield rename to AutomatedTesting/Levels/Physics/Terrain_CanAddMultipleTerrainComponents/terrain/terrain.pxheightfield diff --git a/AutomatedTesting/Levels/Physics/C6090546_ForceRegion_SliceFileInstantiates/terraintexture.pak b/AutomatedTesting/Levels/Physics/Terrain_CanAddMultipleTerrainComponents/terraintexture.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C6090546_ForceRegion_SliceFileInstantiates/terraintexture.pak rename to AutomatedTesting/Levels/Physics/Terrain_CanAddMultipleTerrainComponents/terraintexture.pak diff --git a/AutomatedTesting/Levels/Physics/C5689518_PhysXEntity_collides_with_PhysXTerrain/PhysXEntity_collides_with_PhysXTerrain.ly b/AutomatedTesting/Levels/Physics/Terrain_CollisionAgainstRigidBody/PhysXEntity_collides_with_PhysXTerrain.ly similarity index 100% rename from AutomatedTesting/Levels/Physics/C5689518_PhysXEntity_collides_with_PhysXTerrain/PhysXEntity_collides_with_PhysXTerrain.ly rename to AutomatedTesting/Levels/Physics/Terrain_CollisionAgainstRigidBody/PhysXEntity_collides_with_PhysXTerrain.ly diff --git a/AutomatedTesting/Levels/Physics/C5689518_PhysXEntity_collides_with_PhysXTerrain/C5689518_PhysXEntity_collides_with_PhysXTerrain.ly b/AutomatedTesting/Levels/Physics/Terrain_CollisionAgainstRigidBody/Terrain_CollisionAgainstRigidBody.ly similarity index 100% rename from AutomatedTesting/Levels/Physics/C5689518_PhysXEntity_collides_with_PhysXTerrain/C5689518_PhysXEntity_collides_with_PhysXTerrain.ly rename to AutomatedTesting/Levels/Physics/Terrain_CollisionAgainstRigidBody/Terrain_CollisionAgainstRigidBody.ly diff --git a/AutomatedTesting/Levels/Physics/C5689518_PhysXEntity_collides_with_PhysXTerrain/filelist.xml b/AutomatedTesting/Levels/Physics/Terrain_CollisionAgainstRigidBody/filelist.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C5689518_PhysXEntity_collides_with_PhysXTerrain/filelist.xml rename to AutomatedTesting/Levels/Physics/Terrain_CollisionAgainstRigidBody/filelist.xml diff --git a/AutomatedTesting/Levels/Physics/C5689518_PhysXEntity_collides_with_PhysXTerrain/level.pak b/AutomatedTesting/Levels/Physics/Terrain_CollisionAgainstRigidBody/level.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C5689518_PhysXEntity_collides_with_PhysXTerrain/level.pak rename to AutomatedTesting/Levels/Physics/Terrain_CollisionAgainstRigidBody/level.pak diff --git a/AutomatedTesting/Levels/Physics/C6032082_Terrain_MultipleResolutionsValid_128x128_1m/leveldata/Environment.xml b/AutomatedTesting/Levels/Physics/Terrain_CollisionAgainstRigidBody/leveldata/Environment.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C6032082_Terrain_MultipleResolutionsValid_128x128_1m/leveldata/Environment.xml rename to AutomatedTesting/Levels/Physics/Terrain_CollisionAgainstRigidBody/leveldata/Environment.xml diff --git a/AutomatedTesting/Levels/Physics/C5959810_ForceRegion_ForceRegionCombinesForces/leveldata/TerrainTexture.xml b/AutomatedTesting/Levels/Physics/Terrain_CollisionAgainstRigidBody/leveldata/TerrainTexture.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C5959810_ForceRegion_ForceRegionCombinesForces/leveldata/TerrainTexture.xml rename to AutomatedTesting/Levels/Physics/Terrain_CollisionAgainstRigidBody/leveldata/TerrainTexture.xml diff --git a/AutomatedTesting/Levels/Physics/C5959808_ForceRegion_PositionOffset/leveldata/TimeOfDay.xml b/AutomatedTesting/Levels/Physics/Terrain_CollisionAgainstRigidBody/leveldata/TimeOfDay.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C5959808_ForceRegion_PositionOffset/leveldata/TimeOfDay.xml rename to AutomatedTesting/Levels/Physics/Terrain_CollisionAgainstRigidBody/leveldata/TimeOfDay.xml diff --git a/AutomatedTesting/Levels/Physics/C6090546_ForceRegion_SliceFileInstantiates/leveldata/VegetationMap.dat b/AutomatedTesting/Levels/Physics/Terrain_CollisionAgainstRigidBody/leveldata/VegetationMap.dat similarity index 100% rename from AutomatedTesting/Levels/Physics/C6090546_ForceRegion_SliceFileInstantiates/leveldata/VegetationMap.dat rename to AutomatedTesting/Levels/Physics/Terrain_CollisionAgainstRigidBody/leveldata/VegetationMap.dat diff --git a/AutomatedTesting/Levels/Physics/C6032082_Terrain_MultipleResolutionsValid_512x512_2m/tags.txt b/AutomatedTesting/Levels/Physics/Terrain_CollisionAgainstRigidBody/tags.txt similarity index 100% rename from AutomatedTesting/Levels/Physics/C6032082_Terrain_MultipleResolutionsValid_512x512_2m/tags.txt rename to AutomatedTesting/Levels/Physics/Terrain_CollisionAgainstRigidBody/tags.txt diff --git a/AutomatedTesting/Levels/Physics/C5689524_MultipleTerrains_CheckWarningInConsole/terrain/terrain.pxheightfield b/AutomatedTesting/Levels/Physics/Terrain_CollisionAgainstRigidBody/terrain/terrain.pxheightfield similarity index 100% rename from AutomatedTesting/Levels/Physics/C5689524_MultipleTerrains_CheckWarningInConsole/terrain/terrain.pxheightfield rename to AutomatedTesting/Levels/Physics/Terrain_CollisionAgainstRigidBody/terrain/terrain.pxheightfield diff --git a/AutomatedTesting/Levels/Physics/C6090547_ForceRegion_ParentChildForceRegions/terraintexture.pak b/AutomatedTesting/Levels/Physics/Terrain_CollisionAgainstRigidBody/terraintexture.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C6090547_ForceRegion_ParentChildForceRegions/terraintexture.pak rename to AutomatedTesting/Levels/Physics/Terrain_CollisionAgainstRigidBody/terraintexture.pak diff --git a/AutomatedTesting/Levels/Physics/C6032082_Terrain_MultipleResolutionsValid_1024x1024_32m/C6032082_Terrain_MultipleResolutionsValid_1024x1024_32m.ly b/AutomatedTesting/Levels/Physics/Terrain_MultipleResolutionsValid/1024x1024_32m/C6032082_Terrain_MultipleResolutionsValid_1024x1024_32m.ly similarity index 100% rename from AutomatedTesting/Levels/Physics/C6032082_Terrain_MultipleResolutionsValid_1024x1024_32m/C6032082_Terrain_MultipleResolutionsValid_1024x1024_32m.ly rename to AutomatedTesting/Levels/Physics/Terrain_MultipleResolutionsValid/1024x1024_32m/C6032082_Terrain_MultipleResolutionsValid_1024x1024_32m.ly diff --git a/AutomatedTesting/Levels/Physics/C6032082_Terrain_MultipleResolutionsValid_1024x1024_32m/filelist.xml b/AutomatedTesting/Levels/Physics/Terrain_MultipleResolutionsValid/1024x1024_32m/filelist.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C6032082_Terrain_MultipleResolutionsValid_1024x1024_32m/filelist.xml rename to AutomatedTesting/Levels/Physics/Terrain_MultipleResolutionsValid/1024x1024_32m/filelist.xml diff --git a/AutomatedTesting/Levels/Physics/C6032082_Terrain_MultipleResolutionsValid_1024x1024_32m/level.pak b/AutomatedTesting/Levels/Physics/Terrain_MultipleResolutionsValid/1024x1024_32m/level.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C6032082_Terrain_MultipleResolutionsValid_1024x1024_32m/level.pak rename to AutomatedTesting/Levels/Physics/Terrain_MultipleResolutionsValid/1024x1024_32m/level.pak diff --git a/AutomatedTesting/Levels/Physics/C6032082_Terrain_MultipleResolutionsValid_4096x4096_16m/leveldata/Environment.xml b/AutomatedTesting/Levels/Physics/Terrain_MultipleResolutionsValid/1024x1024_32m/leveldata/Environment.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C6032082_Terrain_MultipleResolutionsValid_4096x4096_16m/leveldata/Environment.xml rename to AutomatedTesting/Levels/Physics/Terrain_MultipleResolutionsValid/1024x1024_32m/leveldata/Environment.xml diff --git a/AutomatedTesting/Levels/Physics/C6090547_ForceRegion_ParentChildForceRegions/leveldata/GameTokens.xml b/AutomatedTesting/Levels/Physics/Terrain_MultipleResolutionsValid/1024x1024_32m/leveldata/GameTokens.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C6090547_ForceRegion_ParentChildForceRegions/leveldata/GameTokens.xml rename to AutomatedTesting/Levels/Physics/Terrain_MultipleResolutionsValid/1024x1024_32m/leveldata/GameTokens.xml diff --git a/AutomatedTesting/Levels/Physics/C6032082_Terrain_MultipleResolutionsValid_1024x1024_32m/leveldata/TerrainTexture.xml b/AutomatedTesting/Levels/Physics/Terrain_MultipleResolutionsValid/1024x1024_32m/leveldata/TerrainTexture.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C6032082_Terrain_MultipleResolutionsValid_1024x1024_32m/leveldata/TerrainTexture.xml rename to AutomatedTesting/Levels/Physics/Terrain_MultipleResolutionsValid/1024x1024_32m/leveldata/TerrainTexture.xml diff --git a/AutomatedTesting/Levels/Physics/C5959809_ForceRegion_RotationalOffset/leveldata/TimeOfDay.xml b/AutomatedTesting/Levels/Physics/Terrain_MultipleResolutionsValid/1024x1024_32m/leveldata/TimeOfDay.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C5959809_ForceRegion_RotationalOffset/leveldata/TimeOfDay.xml rename to AutomatedTesting/Levels/Physics/Terrain_MultipleResolutionsValid/1024x1024_32m/leveldata/TimeOfDay.xml diff --git a/AutomatedTesting/Levels/Physics/C6090547_ForceRegion_ParentChildForceRegions/leveldata/VegetationMap.dat b/AutomatedTesting/Levels/Physics/Terrain_MultipleResolutionsValid/1024x1024_32m/leveldata/VegetationMap.dat similarity index 100% rename from AutomatedTesting/Levels/Physics/C6090547_ForceRegion_ParentChildForceRegions/leveldata/VegetationMap.dat rename to AutomatedTesting/Levels/Physics/Terrain_MultipleResolutionsValid/1024x1024_32m/leveldata/VegetationMap.dat diff --git a/AutomatedTesting/Levels/Physics/C6090546_ForceRegion_SliceFileInstantiates/tags.txt b/AutomatedTesting/Levels/Physics/Terrain_MultipleResolutionsValid/1024x1024_32m/tags.txt similarity index 100% rename from AutomatedTesting/Levels/Physics/C6090546_ForceRegion_SliceFileInstantiates/tags.txt rename to AutomatedTesting/Levels/Physics/Terrain_MultipleResolutionsValid/1024x1024_32m/tags.txt diff --git a/AutomatedTesting/Levels/Physics/C5689528_Terrain_MultipleTerrainComponents/terrain/terrain.pxheightfield b/AutomatedTesting/Levels/Physics/Terrain_MultipleResolutionsValid/1024x1024_32m/terrain/terrain.pxheightfield similarity index 100% rename from AutomatedTesting/Levels/Physics/C5689528_Terrain_MultipleTerrainComponents/terrain/terrain.pxheightfield rename to AutomatedTesting/Levels/Physics/Terrain_MultipleResolutionsValid/1024x1024_32m/terrain/terrain.pxheightfield diff --git a/AutomatedTesting/Levels/Physics/C6090550_ForceRegion_WorldSpaceForceNegative/terraintexture.pak b/AutomatedTesting/Levels/Physics/Terrain_MultipleResolutionsValid/1024x1024_32m/terraintexture.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C6090550_ForceRegion_WorldSpaceForceNegative/terraintexture.pak rename to AutomatedTesting/Levels/Physics/Terrain_MultipleResolutionsValid/1024x1024_32m/terraintexture.pak diff --git a/AutomatedTesting/Levels/Physics/C6032082_Terrain_MultipleResolutionsValid_128x128_1m/C6032082_Terrain_MultipleResolutionsValid_128x128_1m.ly b/AutomatedTesting/Levels/Physics/Terrain_MultipleResolutionsValid/128x128_1m/C6032082_Terrain_MultipleResolutionsValid_128x128_1m.ly similarity index 100% rename from AutomatedTesting/Levels/Physics/C6032082_Terrain_MultipleResolutionsValid_128x128_1m/C6032082_Terrain_MultipleResolutionsValid_128x128_1m.ly rename to AutomatedTesting/Levels/Physics/Terrain_MultipleResolutionsValid/128x128_1m/C6032082_Terrain_MultipleResolutionsValid_128x128_1m.ly diff --git a/AutomatedTesting/Levels/Physics/C6032082_Terrain_MultipleResolutionsValid_128x128_1m/filelist.xml b/AutomatedTesting/Levels/Physics/Terrain_MultipleResolutionsValid/128x128_1m/filelist.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C6032082_Terrain_MultipleResolutionsValid_128x128_1m/filelist.xml rename to AutomatedTesting/Levels/Physics/Terrain_MultipleResolutionsValid/128x128_1m/filelist.xml diff --git a/AutomatedTesting/Levels/Physics/C6032082_Terrain_MultipleResolutionsValid_128x128_1m/level.pak b/AutomatedTesting/Levels/Physics/Terrain_MultipleResolutionsValid/128x128_1m/level.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C6032082_Terrain_MultipleResolutionsValid_128x128_1m/level.pak rename to AutomatedTesting/Levels/Physics/Terrain_MultipleResolutionsValid/128x128_1m/level.pak diff --git a/AutomatedTesting/Levels/Physics/C6032082_Terrain_MultipleResolutionsValid_512x512_2m/leveldata/Environment.xml b/AutomatedTesting/Levels/Physics/Terrain_MultipleResolutionsValid/128x128_1m/leveldata/Environment.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C6032082_Terrain_MultipleResolutionsValid_512x512_2m/leveldata/Environment.xml rename to AutomatedTesting/Levels/Physics/Terrain_MultipleResolutionsValid/128x128_1m/leveldata/Environment.xml diff --git a/AutomatedTesting/Levels/Physics/C6090550_ForceRegion_WorldSpaceForceNegative/leveldata/GameTokens.xml b/AutomatedTesting/Levels/Physics/Terrain_MultipleResolutionsValid/128x128_1m/leveldata/GameTokens.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C6090550_ForceRegion_WorldSpaceForceNegative/leveldata/GameTokens.xml rename to AutomatedTesting/Levels/Physics/Terrain_MultipleResolutionsValid/128x128_1m/leveldata/GameTokens.xml diff --git a/AutomatedTesting/Levels/Physics/C6090551_ForceRegion_LocalSpaceForceNegative/leveldata/TerrainTexture.xml b/AutomatedTesting/Levels/Physics/Terrain_MultipleResolutionsValid/128x128_1m/leveldata/TerrainTexture.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C6090551_ForceRegion_LocalSpaceForceNegative/leveldata/TerrainTexture.xml rename to AutomatedTesting/Levels/Physics/Terrain_MultipleResolutionsValid/128x128_1m/leveldata/TerrainTexture.xml diff --git a/AutomatedTesting/Levels/Physics/C5959810_ForceRegion_ForceRegionCombinesForces/leveldata/TimeOfDay.xml b/AutomatedTesting/Levels/Physics/Terrain_MultipleResolutionsValid/128x128_1m/leveldata/TimeOfDay.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C5959810_ForceRegion_ForceRegionCombinesForces/leveldata/TimeOfDay.xml rename to AutomatedTesting/Levels/Physics/Terrain_MultipleResolutionsValid/128x128_1m/leveldata/TimeOfDay.xml diff --git a/AutomatedTesting/Levels/Physics/C6090550_ForceRegion_WorldSpaceForceNegative/leveldata/VegetationMap.dat b/AutomatedTesting/Levels/Physics/Terrain_MultipleResolutionsValid/128x128_1m/leveldata/VegetationMap.dat similarity index 100% rename from AutomatedTesting/Levels/Physics/C6090550_ForceRegion_WorldSpaceForceNegative/leveldata/VegetationMap.dat rename to AutomatedTesting/Levels/Physics/Terrain_MultipleResolutionsValid/128x128_1m/leveldata/VegetationMap.dat diff --git a/AutomatedTesting/Levels/Physics/C6090547_ForceRegion_ParentChildForceRegions/tags.txt b/AutomatedTesting/Levels/Physics/Terrain_MultipleResolutionsValid/128x128_1m/tags.txt similarity index 100% rename from AutomatedTesting/Levels/Physics/C6090547_ForceRegion_ParentChildForceRegions/tags.txt rename to AutomatedTesting/Levels/Physics/Terrain_MultipleResolutionsValid/128x128_1m/tags.txt diff --git a/AutomatedTesting/Levels/Physics/C6090554_ForceRegion_PointForceNegative/terrain/terrain.pxheightfield b/AutomatedTesting/Levels/Physics/Terrain_MultipleResolutionsValid/128x128_1m/terrain/terrain.pxheightfield similarity index 100% rename from AutomatedTesting/Levels/Physics/C6090554_ForceRegion_PointForceNegative/terrain/terrain.pxheightfield rename to AutomatedTesting/Levels/Physics/Terrain_MultipleResolutionsValid/128x128_1m/terrain/terrain.pxheightfield diff --git a/AutomatedTesting/Levels/Physics/C6090551_ForceRegion_LocalSpaceForceNegative/terraintexture.pak b/AutomatedTesting/Levels/Physics/Terrain_MultipleResolutionsValid/128x128_1m/terraintexture.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C6090551_ForceRegion_LocalSpaceForceNegative/terraintexture.pak rename to AutomatedTesting/Levels/Physics/Terrain_MultipleResolutionsValid/128x128_1m/terraintexture.pak diff --git a/AutomatedTesting/Levels/Physics/C6032082_Terrain_MultipleResolutionsValid_4096x4096_16m/C6032082_Terrain_MultipleResolutionsValid_4096x4096_16m.ly b/AutomatedTesting/Levels/Physics/Terrain_MultipleResolutionsValid/4096x4096_16m/C6032082_Terrain_MultipleResolutionsValid_4096x4096_16m.ly similarity index 100% rename from AutomatedTesting/Levels/Physics/C6032082_Terrain_MultipleResolutionsValid_4096x4096_16m/C6032082_Terrain_MultipleResolutionsValid_4096x4096_16m.ly rename to AutomatedTesting/Levels/Physics/Terrain_MultipleResolutionsValid/4096x4096_16m/C6032082_Terrain_MultipleResolutionsValid_4096x4096_16m.ly diff --git a/AutomatedTesting/Levels/Physics/C6032082_Terrain_MultipleResolutionsValid_4096x4096_16m/filelist.xml b/AutomatedTesting/Levels/Physics/Terrain_MultipleResolutionsValid/4096x4096_16m/filelist.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C6032082_Terrain_MultipleResolutionsValid_4096x4096_16m/filelist.xml rename to AutomatedTesting/Levels/Physics/Terrain_MultipleResolutionsValid/4096x4096_16m/filelist.xml diff --git a/AutomatedTesting/Levels/Physics/C6032082_Terrain_MultipleResolutionsValid_4096x4096_16m/level.pak b/AutomatedTesting/Levels/Physics/Terrain_MultipleResolutionsValid/4096x4096_16m/level.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C6032082_Terrain_MultipleResolutionsValid_4096x4096_16m/level.pak rename to AutomatedTesting/Levels/Physics/Terrain_MultipleResolutionsValid/4096x4096_16m/level.pak diff --git a/AutomatedTesting/Levels/Physics/C6090546_ForceRegion_SliceFileInstantiates/leveldata/Environment.xml b/AutomatedTesting/Levels/Physics/Terrain_MultipleResolutionsValid/4096x4096_16m/leveldata/Environment.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C6090546_ForceRegion_SliceFileInstantiates/leveldata/Environment.xml rename to AutomatedTesting/Levels/Physics/Terrain_MultipleResolutionsValid/4096x4096_16m/leveldata/Environment.xml diff --git a/AutomatedTesting/Levels/Physics/C6090551_ForceRegion_LocalSpaceForceNegative/leveldata/GameTokens.xml b/AutomatedTesting/Levels/Physics/Terrain_MultipleResolutionsValid/4096x4096_16m/leveldata/GameTokens.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C6090551_ForceRegion_LocalSpaceForceNegative/leveldata/GameTokens.xml rename to AutomatedTesting/Levels/Physics/Terrain_MultipleResolutionsValid/4096x4096_16m/leveldata/GameTokens.xml diff --git a/AutomatedTesting/Levels/Physics/C6032082_Terrain_MultipleResolutionsValid_4096x4096_16m/leveldata/TerrainTexture.xml b/AutomatedTesting/Levels/Physics/Terrain_MultipleResolutionsValid/4096x4096_16m/leveldata/TerrainTexture.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C6032082_Terrain_MultipleResolutionsValid_4096x4096_16m/leveldata/TerrainTexture.xml rename to AutomatedTesting/Levels/Physics/Terrain_MultipleResolutionsValid/4096x4096_16m/leveldata/TerrainTexture.xml diff --git a/AutomatedTesting/Levels/Physics/C5968759_ForceRegion_ExertsSeveralForcesOnRigidBody/leveldata/TimeOfDay.xml b/AutomatedTesting/Levels/Physics/Terrain_MultipleResolutionsValid/4096x4096_16m/leveldata/TimeOfDay.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C5968759_ForceRegion_ExertsSeveralForcesOnRigidBody/leveldata/TimeOfDay.xml rename to AutomatedTesting/Levels/Physics/Terrain_MultipleResolutionsValid/4096x4096_16m/leveldata/TimeOfDay.xml diff --git a/AutomatedTesting/Levels/Physics/C6090551_ForceRegion_LocalSpaceForceNegative/leveldata/VegetationMap.dat b/AutomatedTesting/Levels/Physics/Terrain_MultipleResolutionsValid/4096x4096_16m/leveldata/VegetationMap.dat similarity index 100% rename from AutomatedTesting/Levels/Physics/C6090551_ForceRegion_LocalSpaceForceNegative/leveldata/VegetationMap.dat rename to AutomatedTesting/Levels/Physics/Terrain_MultipleResolutionsValid/4096x4096_16m/leveldata/VegetationMap.dat diff --git a/AutomatedTesting/Levels/Physics/C6090550_ForceRegion_WorldSpaceForceNegative/tags.txt b/AutomatedTesting/Levels/Physics/Terrain_MultipleResolutionsValid/4096x4096_16m/tags.txt similarity index 100% rename from AutomatedTesting/Levels/Physics/C6090550_ForceRegion_WorldSpaceForceNegative/tags.txt rename to AutomatedTesting/Levels/Physics/Terrain_MultipleResolutionsValid/4096x4096_16m/tags.txt diff --git a/AutomatedTesting/Levels/Physics/C6032082_Terrain_MultipleResolutionsValid_4096x4096_16m/terrain/terrain.pxheightfield b/AutomatedTesting/Levels/Physics/Terrain_MultipleResolutionsValid/4096x4096_16m/terrain/terrain.pxheightfield similarity index 100% rename from AutomatedTesting/Levels/Physics/C6032082_Terrain_MultipleResolutionsValid_4096x4096_16m/terrain/terrain.pxheightfield rename to AutomatedTesting/Levels/Physics/Terrain_MultipleResolutionsValid/4096x4096_16m/terrain/terrain.pxheightfield diff --git a/AutomatedTesting/Levels/Physics/C6090552_ForceRegion_LinearDampingNegative/terraintexture.pak b/AutomatedTesting/Levels/Physics/Terrain_MultipleResolutionsValid/4096x4096_16m/terraintexture.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C6090552_ForceRegion_LinearDampingNegative/terraintexture.pak rename to AutomatedTesting/Levels/Physics/Terrain_MultipleResolutionsValid/4096x4096_16m/terraintexture.pak diff --git a/AutomatedTesting/Levels/Physics/C6032082_Terrain_MultipleResolutionsValid_512x512_2m/C6032082_Terrain_MultipleResolutionsValid_512x512_2m.ly b/AutomatedTesting/Levels/Physics/Terrain_MultipleResolutionsValid/512x512_2m/C6032082_Terrain_MultipleResolutionsValid_512x512_2m.ly similarity index 100% rename from AutomatedTesting/Levels/Physics/C6032082_Terrain_MultipleResolutionsValid_512x512_2m/C6032082_Terrain_MultipleResolutionsValid_512x512_2m.ly rename to AutomatedTesting/Levels/Physics/Terrain_MultipleResolutionsValid/512x512_2m/C6032082_Terrain_MultipleResolutionsValid_512x512_2m.ly diff --git a/AutomatedTesting/Levels/Physics/C6032082_Terrain_MultipleResolutionsValid_512x512_2m/filelist.xml b/AutomatedTesting/Levels/Physics/Terrain_MultipleResolutionsValid/512x512_2m/filelist.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C6032082_Terrain_MultipleResolutionsValid_512x512_2m/filelist.xml rename to AutomatedTesting/Levels/Physics/Terrain_MultipleResolutionsValid/512x512_2m/filelist.xml diff --git a/AutomatedTesting/Levels/Physics/C6032082_Terrain_MultipleResolutionsValid_512x512_2m/level.pak b/AutomatedTesting/Levels/Physics/Terrain_MultipleResolutionsValid/512x512_2m/level.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C6032082_Terrain_MultipleResolutionsValid_512x512_2m/level.pak rename to AutomatedTesting/Levels/Physics/Terrain_MultipleResolutionsValid/512x512_2m/level.pak diff --git a/AutomatedTesting/Levels/Physics/C6090547_ForceRegion_ParentChildForceRegions/leveldata/Environment.xml b/AutomatedTesting/Levels/Physics/Terrain_MultipleResolutionsValid/512x512_2m/leveldata/Environment.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C6090547_ForceRegion_ParentChildForceRegions/leveldata/Environment.xml rename to AutomatedTesting/Levels/Physics/Terrain_MultipleResolutionsValid/512x512_2m/leveldata/Environment.xml diff --git a/AutomatedTesting/Levels/Physics/C6090552_ForceRegion_LinearDampingNegative/leveldata/GameTokens.xml b/AutomatedTesting/Levels/Physics/Terrain_MultipleResolutionsValid/512x512_2m/leveldata/GameTokens.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C6090552_ForceRegion_LinearDampingNegative/leveldata/GameTokens.xml rename to AutomatedTesting/Levels/Physics/Terrain_MultipleResolutionsValid/512x512_2m/leveldata/GameTokens.xml diff --git a/AutomatedTesting/Levels/Physics/C5968760_ForceRegion_CheckNetForceChange/leveldata/TerrainTexture.xml b/AutomatedTesting/Levels/Physics/Terrain_MultipleResolutionsValid/512x512_2m/leveldata/TerrainTexture.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C5968760_ForceRegion_CheckNetForceChange/leveldata/TerrainTexture.xml rename to AutomatedTesting/Levels/Physics/Terrain_MultipleResolutionsValid/512x512_2m/leveldata/TerrainTexture.xml diff --git a/AutomatedTesting/Levels/Physics/C5968760_ForceRegion_CheckNetForceChange/leveldata/TimeOfDay.xml b/AutomatedTesting/Levels/Physics/Terrain_MultipleResolutionsValid/512x512_2m/leveldata/TimeOfDay.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C5968760_ForceRegion_CheckNetForceChange/leveldata/TimeOfDay.xml rename to AutomatedTesting/Levels/Physics/Terrain_MultipleResolutionsValid/512x512_2m/leveldata/TimeOfDay.xml diff --git a/AutomatedTesting/Levels/Physics/C6090552_ForceRegion_LinearDampingNegative/leveldata/VegetationMap.dat b/AutomatedTesting/Levels/Physics/Terrain_MultipleResolutionsValid/512x512_2m/leveldata/VegetationMap.dat similarity index 100% rename from AutomatedTesting/Levels/Physics/C6090552_ForceRegion_LinearDampingNegative/leveldata/VegetationMap.dat rename to AutomatedTesting/Levels/Physics/Terrain_MultipleResolutionsValid/512x512_2m/leveldata/VegetationMap.dat diff --git a/AutomatedTesting/Levels/Physics/C6090551_ForceRegion_LocalSpaceForceNegative/tags.txt b/AutomatedTesting/Levels/Physics/Terrain_MultipleResolutionsValid/512x512_2m/tags.txt similarity index 100% rename from AutomatedTesting/Levels/Physics/C6090551_ForceRegion_LocalSpaceForceNegative/tags.txt rename to AutomatedTesting/Levels/Physics/Terrain_MultipleResolutionsValid/512x512_2m/tags.txt diff --git a/AutomatedTesting/Levels/Physics/C6032082_Terrain_MultipleResolutionsValid_512x512_2m/terrain/terrain.pxheightfield b/AutomatedTesting/Levels/Physics/Terrain_MultipleResolutionsValid/512x512_2m/terrain/terrain.pxheightfield similarity index 100% rename from AutomatedTesting/Levels/Physics/C6032082_Terrain_MultipleResolutionsValid_512x512_2m/terrain/terrain.pxheightfield rename to AutomatedTesting/Levels/Physics/Terrain_MultipleResolutionsValid/512x512_2m/terrain/terrain.pxheightfield diff --git a/AutomatedTesting/Levels/Physics/C6090553_ForceRegion_SimpleDragForceOnRigidBodies/terraintexture.pak b/AutomatedTesting/Levels/Physics/Terrain_MultipleResolutionsValid/512x512_2m/terraintexture.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C6090553_ForceRegion_SimpleDragForceOnRigidBodies/terraintexture.pak rename to AutomatedTesting/Levels/Physics/Terrain_MultipleResolutionsValid/512x512_2m/terraintexture.pak diff --git a/AutomatedTesting/Levels/Physics/C5689528_Terrain_MultipleTerrainComponents/C5689528_Terrain_MultipleTerrainComponents.ly b/AutomatedTesting/Levels/Physics/Terrain_MultipleTerrainComponentsWarning/Terrain_MultipleTerrainComponentsWarning.ly similarity index 100% rename from AutomatedTesting/Levels/Physics/C5689528_Terrain_MultipleTerrainComponents/C5689528_Terrain_MultipleTerrainComponents.ly rename to AutomatedTesting/Levels/Physics/Terrain_MultipleTerrainComponentsWarning/Terrain_MultipleTerrainComponentsWarning.ly diff --git a/AutomatedTesting/Levels/Physics/C5689528_Terrain_MultipleTerrainComponents/filelist.xml b/AutomatedTesting/Levels/Physics/Terrain_MultipleTerrainComponentsWarning/filelist.xml similarity index 70% rename from AutomatedTesting/Levels/Physics/C5689528_Terrain_MultipleTerrainComponents/filelist.xml rename to AutomatedTesting/Levels/Physics/Terrain_MultipleTerrainComponentsWarning/filelist.xml index 58e152177f..1e451d5e6b 100644 --- a/AutomatedTesting/Levels/Physics/C5689528_Terrain_MultipleTerrainComponents/filelist.xml +++ b/AutomatedTesting/Levels/Physics/Terrain_MultipleTerrainComponentsWarning/filelist.xml @@ -1,4 +1,4 @@ - + diff --git a/AutomatedTesting/Levels/Physics/C5689528_Terrain_MultipleTerrainComponents/level.pak b/AutomatedTesting/Levels/Physics/Terrain_MultipleTerrainComponentsWarning/level.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C5689528_Terrain_MultipleTerrainComponents/level.pak rename to AutomatedTesting/Levels/Physics/Terrain_MultipleTerrainComponentsWarning/level.pak diff --git a/AutomatedTesting/Levels/Physics/C6090550_ForceRegion_WorldSpaceForceNegative/leveldata/Environment.xml b/AutomatedTesting/Levels/Physics/Terrain_MultipleTerrainComponentsWarning/leveldata/Environment.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C6090550_ForceRegion_WorldSpaceForceNegative/leveldata/Environment.xml rename to AutomatedTesting/Levels/Physics/Terrain_MultipleTerrainComponentsWarning/leveldata/Environment.xml diff --git a/AutomatedTesting/Levels/Physics/C6090553_ForceRegion_SimpleDragForceOnRigidBodies/leveldata/GameTokens.xml b/AutomatedTesting/Levels/Physics/Terrain_MultipleTerrainComponentsWarning/leveldata/GameTokens.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C6090553_ForceRegion_SimpleDragForceOnRigidBodies/leveldata/GameTokens.xml rename to AutomatedTesting/Levels/Physics/Terrain_MultipleTerrainComponentsWarning/leveldata/GameTokens.xml diff --git a/AutomatedTesting/Levels/Physics/C6032082_Terrain_MultipleResolutionsValid_512x512_2m/leveldata/TerrainTexture.xml b/AutomatedTesting/Levels/Physics/Terrain_MultipleTerrainComponentsWarning/leveldata/TerrainTexture.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C6032082_Terrain_MultipleResolutionsValid_512x512_2m/leveldata/TerrainTexture.xml rename to AutomatedTesting/Levels/Physics/Terrain_MultipleTerrainComponentsWarning/leveldata/TerrainTexture.xml diff --git a/AutomatedTesting/Levels/Physics/C6032082_Terrain_MultipleResolutionsValid_1024x1024_32m/leveldata/TimeOfDay.xml b/AutomatedTesting/Levels/Physics/Terrain_MultipleTerrainComponentsWarning/leveldata/TimeOfDay.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C6032082_Terrain_MultipleResolutionsValid_1024x1024_32m/leveldata/TimeOfDay.xml rename to AutomatedTesting/Levels/Physics/Terrain_MultipleTerrainComponentsWarning/leveldata/TimeOfDay.xml diff --git a/AutomatedTesting/Levels/Physics/C6090553_ForceRegion_SimpleDragForceOnRigidBodies/leveldata/VegetationMap.dat b/AutomatedTesting/Levels/Physics/Terrain_MultipleTerrainComponentsWarning/leveldata/VegetationMap.dat similarity index 100% rename from AutomatedTesting/Levels/Physics/C6090553_ForceRegion_SimpleDragForceOnRigidBodies/leveldata/VegetationMap.dat rename to AutomatedTesting/Levels/Physics/Terrain_MultipleTerrainComponentsWarning/leveldata/VegetationMap.dat diff --git a/AutomatedTesting/Levels/Physics/C6090552_ForceRegion_LinearDampingNegative/tags.txt b/AutomatedTesting/Levels/Physics/Terrain_MultipleTerrainComponentsWarning/tags.txt similarity index 100% rename from AutomatedTesting/Levels/Physics/C6090552_ForceRegion_LinearDampingNegative/tags.txt rename to AutomatedTesting/Levels/Physics/Terrain_MultipleTerrainComponentsWarning/tags.txt diff --git a/AutomatedTesting/Levels/Physics/C5689529_Verify_Terrain_RigidBody_Collider_Mesh/terrain/terrain.pxheightfield b/AutomatedTesting/Levels/Physics/Terrain_MultipleTerrainComponentsWarning/terrain/terrain.pxheightfield similarity index 100% rename from AutomatedTesting/Levels/Physics/C5689529_Verify_Terrain_RigidBody_Collider_Mesh/terrain/terrain.pxheightfield rename to AutomatedTesting/Levels/Physics/Terrain_MultipleTerrainComponentsWarning/terrain/terrain.pxheightfield diff --git a/AutomatedTesting/Levels/Physics/C6090554_ForceRegion_PointForceNegative/terraintexture.pak b/AutomatedTesting/Levels/Physics/Terrain_MultipleTerrainComponentsWarning/terraintexture.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C6090554_ForceRegion_PointForceNegative/terraintexture.pak rename to AutomatedTesting/Levels/Physics/Terrain_MultipleTerrainComponentsWarning/terraintexture.pak diff --git a/AutomatedTesting/Levels/Physics/C3510642_Terrain_NotCollideWithTerrain/C3510642_Terrain_NotCollideWithTerrain.ly b/AutomatedTesting/Levels/Physics/Terrain_NoPhysTerrainComponentNoCollision/Terrain_NoPhysTerrainComponentNoCollision.ly similarity index 100% rename from AutomatedTesting/Levels/Physics/C3510642_Terrain_NotCollideWithTerrain/C3510642_Terrain_NotCollideWithTerrain.ly rename to AutomatedTesting/Levels/Physics/Terrain_NoPhysTerrainComponentNoCollision/Terrain_NoPhysTerrainComponentNoCollision.ly diff --git a/AutomatedTesting/Levels/Physics/C3510642_Terrain_NotCollideWithTerrain/filelist.xml b/AutomatedTesting/Levels/Physics/Terrain_NoPhysTerrainComponentNoCollision/filelist.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C3510642_Terrain_NotCollideWithTerrain/filelist.xml rename to AutomatedTesting/Levels/Physics/Terrain_NoPhysTerrainComponentNoCollision/filelist.xml diff --git a/AutomatedTesting/Levels/Physics/C3510642_Terrain_NotCollideWithTerrain/level.pak b/AutomatedTesting/Levels/Physics/Terrain_NoPhysTerrainComponentNoCollision/level.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C3510642_Terrain_NotCollideWithTerrain/level.pak rename to AutomatedTesting/Levels/Physics/Terrain_NoPhysTerrainComponentNoCollision/level.pak diff --git a/AutomatedTesting/Levels/Physics/C6090551_ForceRegion_LocalSpaceForceNegative/leveldata/Environment.xml b/AutomatedTesting/Levels/Physics/Terrain_NoPhysTerrainComponentNoCollision/leveldata/Environment.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C6090551_ForceRegion_LocalSpaceForceNegative/leveldata/Environment.xml rename to AutomatedTesting/Levels/Physics/Terrain_NoPhysTerrainComponentNoCollision/leveldata/Environment.xml diff --git a/AutomatedTesting/Levels/Physics/C6090554_ForceRegion_PointForceNegative/leveldata/GameTokens.xml b/AutomatedTesting/Levels/Physics/Terrain_NoPhysTerrainComponentNoCollision/leveldata/GameTokens.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C6090554_ForceRegion_PointForceNegative/leveldata/GameTokens.xml rename to AutomatedTesting/Levels/Physics/Terrain_NoPhysTerrainComponentNoCollision/leveldata/GameTokens.xml diff --git a/AutomatedTesting/Levels/Physics/C6090552_ForceRegion_LinearDampingNegative/leveldata/TerrainTexture.xml b/AutomatedTesting/Levels/Physics/Terrain_NoPhysTerrainComponentNoCollision/leveldata/TerrainTexture.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C6090552_ForceRegion_LinearDampingNegative/leveldata/TerrainTexture.xml rename to AutomatedTesting/Levels/Physics/Terrain_NoPhysTerrainComponentNoCollision/leveldata/TerrainTexture.xml diff --git a/AutomatedTesting/Levels/Physics/C6032082_Terrain_MultipleResolutionsValid_128x128_1m/leveldata/TimeOfDay.xml b/AutomatedTesting/Levels/Physics/Terrain_NoPhysTerrainComponentNoCollision/leveldata/TimeOfDay.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C6032082_Terrain_MultipleResolutionsValid_128x128_1m/leveldata/TimeOfDay.xml rename to AutomatedTesting/Levels/Physics/Terrain_NoPhysTerrainComponentNoCollision/leveldata/TimeOfDay.xml diff --git a/AutomatedTesting/Levels/Physics/C6090554_ForceRegion_PointForceNegative/leveldata/VegetationMap.dat b/AutomatedTesting/Levels/Physics/Terrain_NoPhysTerrainComponentNoCollision/leveldata/VegetationMap.dat similarity index 100% rename from AutomatedTesting/Levels/Physics/C6090554_ForceRegion_PointForceNegative/leveldata/VegetationMap.dat rename to AutomatedTesting/Levels/Physics/Terrain_NoPhysTerrainComponentNoCollision/leveldata/VegetationMap.dat diff --git a/AutomatedTesting/Levels/Physics/C6090553_ForceRegion_SimpleDragForceOnRigidBodies/tags.txt b/AutomatedTesting/Levels/Physics/Terrain_NoPhysTerrainComponentNoCollision/tags.txt similarity index 100% rename from AutomatedTesting/Levels/Physics/C6090553_ForceRegion_SimpleDragForceOnRigidBodies/tags.txt rename to AutomatedTesting/Levels/Physics/Terrain_NoPhysTerrainComponentNoCollision/tags.txt diff --git a/AutomatedTesting/Levels/Physics/C6131473_StaticSlice_OnDynamicSliceSpawn/terraintexture.pak b/AutomatedTesting/Levels/Physics/Terrain_NoPhysTerrainComponentNoCollision/terraintexture.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C6131473_StaticSlice_OnDynamicSliceSpawn/terraintexture.pak rename to AutomatedTesting/Levels/Physics/Terrain_NoPhysTerrainComponentNoCollision/terraintexture.pak diff --git a/AutomatedTesting/Levels/Physics/C5689531_Warning_TerrainSliceTerrainComponent/TerrainSlice.slice b/AutomatedTesting/Levels/Physics/Terrain_SpawnSecondTerrainComponentWarning/TerrainSlice.slice similarity index 100% rename from AutomatedTesting/Levels/Physics/C5689531_Warning_TerrainSliceTerrainComponent/TerrainSlice.slice rename to AutomatedTesting/Levels/Physics/Terrain_SpawnSecondTerrainComponentWarning/TerrainSlice.slice diff --git a/AutomatedTesting/Levels/Physics/C5689531_Warning_TerrainSliceTerrainComponent/C5689531_Warning_TerrainSliceTerrainComponent.ly b/AutomatedTesting/Levels/Physics/Terrain_SpawnSecondTerrainComponentWarning/Terrain_SpawnSecondTerrainComponentWarning.ly similarity index 100% rename from AutomatedTesting/Levels/Physics/C5689531_Warning_TerrainSliceTerrainComponent/C5689531_Warning_TerrainSliceTerrainComponent.ly rename to AutomatedTesting/Levels/Physics/Terrain_SpawnSecondTerrainComponentWarning/Terrain_SpawnSecondTerrainComponentWarning.ly diff --git a/AutomatedTesting/Levels/Physics/C5689531_Warning_TerrainSliceTerrainComponent/filelist.xml b/AutomatedTesting/Levels/Physics/Terrain_SpawnSecondTerrainComponentWarning/filelist.xml similarity index 70% rename from AutomatedTesting/Levels/Physics/C5689531_Warning_TerrainSliceTerrainComponent/filelist.xml rename to AutomatedTesting/Levels/Physics/Terrain_SpawnSecondTerrainComponentWarning/filelist.xml index 9c026b5b82..66907bcdd0 100644 --- a/AutomatedTesting/Levels/Physics/C5689531_Warning_TerrainSliceTerrainComponent/filelist.xml +++ b/AutomatedTesting/Levels/Physics/Terrain_SpawnSecondTerrainComponentWarning/filelist.xml @@ -1,4 +1,4 @@ - + diff --git a/AutomatedTesting/Levels/Physics/C5689531_Warning_TerrainSliceTerrainComponent/level.pak b/AutomatedTesting/Levels/Physics/Terrain_SpawnSecondTerrainComponentWarning/level.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C5689531_Warning_TerrainSliceTerrainComponent/level.pak rename to AutomatedTesting/Levels/Physics/Terrain_SpawnSecondTerrainComponentWarning/level.pak diff --git a/AutomatedTesting/Levels/Physics/C6090552_ForceRegion_LinearDampingNegative/leveldata/Environment.xml b/AutomatedTesting/Levels/Physics/Terrain_SpawnSecondTerrainComponentWarning/leveldata/Environment.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C6090552_ForceRegion_LinearDampingNegative/leveldata/Environment.xml rename to AutomatedTesting/Levels/Physics/Terrain_SpawnSecondTerrainComponentWarning/leveldata/Environment.xml diff --git a/AutomatedTesting/Levels/Physics/C6090555_ForceRegion_SplineFollowOnRigidBodies/leveldata/GameTokens.xml b/AutomatedTesting/Levels/Physics/Terrain_SpawnSecondTerrainComponentWarning/leveldata/GameTokens.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C6090555_ForceRegion_SplineFollowOnRigidBodies/leveldata/GameTokens.xml rename to AutomatedTesting/Levels/Physics/Terrain_SpawnSecondTerrainComponentWarning/leveldata/GameTokens.xml diff --git a/AutomatedTesting/Levels/Physics/C6090546_ForceRegion_SliceFileInstantiates/leveldata/TerrainTexture.xml b/AutomatedTesting/Levels/Physics/Terrain_SpawnSecondTerrainComponentWarning/leveldata/TerrainTexture.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C6090546_ForceRegion_SliceFileInstantiates/leveldata/TerrainTexture.xml rename to AutomatedTesting/Levels/Physics/Terrain_SpawnSecondTerrainComponentWarning/leveldata/TerrainTexture.xml diff --git a/AutomatedTesting/Levels/Physics/C6032082_Terrain_MultipleResolutionsValid_4096x4096_16m/leveldata/TimeOfDay.xml b/AutomatedTesting/Levels/Physics/Terrain_SpawnSecondTerrainComponentWarning/leveldata/TimeOfDay.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C6032082_Terrain_MultipleResolutionsValid_4096x4096_16m/leveldata/TimeOfDay.xml rename to AutomatedTesting/Levels/Physics/Terrain_SpawnSecondTerrainComponentWarning/leveldata/TimeOfDay.xml diff --git a/AutomatedTesting/Levels/Physics/C6090555_ForceRegion_SplineFollowOnRigidBodies/leveldata/VegetationMap.dat b/AutomatedTesting/Levels/Physics/Terrain_SpawnSecondTerrainComponentWarning/leveldata/VegetationMap.dat similarity index 100% rename from AutomatedTesting/Levels/Physics/C6090555_ForceRegion_SplineFollowOnRigidBodies/leveldata/VegetationMap.dat rename to AutomatedTesting/Levels/Physics/Terrain_SpawnSecondTerrainComponentWarning/leveldata/VegetationMap.dat diff --git a/AutomatedTesting/Levels/Physics/C6090554_ForceRegion_PointForceNegative/tags.txt b/AutomatedTesting/Levels/Physics/Terrain_SpawnSecondTerrainComponentWarning/tags.txt similarity index 100% rename from AutomatedTesting/Levels/Physics/C6090554_ForceRegion_PointForceNegative/tags.txt rename to AutomatedTesting/Levels/Physics/Terrain_SpawnSecondTerrainComponentWarning/tags.txt diff --git a/AutomatedTesting/Levels/Physics/C5689531_Warning_TerrainSliceTerrainComponent/terrain/terrain.pxheightfield b/AutomatedTesting/Levels/Physics/Terrain_SpawnSecondTerrainComponentWarning/terrain/terrain.pxheightfield similarity index 100% rename from AutomatedTesting/Levels/Physics/C5689531_Warning_TerrainSliceTerrainComponent/terrain/terrain.pxheightfield rename to AutomatedTesting/Levels/Physics/Terrain_SpawnSecondTerrainComponentWarning/terrain/terrain.pxheightfield diff --git a/AutomatedTesting/Levels/Physics/C6224408_ScriptCanvas_EntitySpawn/terraintexture.pak b/AutomatedTesting/Levels/Physics/Terrain_SpawnSecondTerrainComponentWarning/terraintexture.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C6224408_ScriptCanvas_EntitySpawn/terraintexture.pak rename to AutomatedTesting/Levels/Physics/Terrain_SpawnSecondTerrainComponentWarning/terraintexture.pak diff --git a/AutomatedTesting/Levels/Physics/C13508019_Terrain_TerrainTexturePainterWorks/C13508019_Terrain_TerrainTexturePainterWorks.ly b/AutomatedTesting/Levels/Physics/Terrain_TerrainTexturePainterWorks/Terrain_TerrainTexturePainterWorks.ly similarity index 100% rename from AutomatedTesting/Levels/Physics/C13508019_Terrain_TerrainTexturePainterWorks/C13508019_Terrain_TerrainTexturePainterWorks.ly rename to AutomatedTesting/Levels/Physics/Terrain_TerrainTexturePainterWorks/Terrain_TerrainTexturePainterWorks.ly diff --git a/AutomatedTesting/Levels/Physics/C13508019_Terrain_TerrainTexturePainterWorks/filelist.xml b/AutomatedTesting/Levels/Physics/Terrain_TerrainTexturePainterWorks/filelist.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C13508019_Terrain_TerrainTexturePainterWorks/filelist.xml rename to AutomatedTesting/Levels/Physics/Terrain_TerrainTexturePainterWorks/filelist.xml diff --git a/AutomatedTesting/Levels/Physics/C13508019_Terrain_TerrainTexturePainterWorks/level.pak b/AutomatedTesting/Levels/Physics/Terrain_TerrainTexturePainterWorks/level.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C13508019_Terrain_TerrainTexturePainterWorks/level.pak rename to AutomatedTesting/Levels/Physics/Terrain_TerrainTexturePainterWorks/level.pak diff --git a/AutomatedTesting/Levels/Physics/C6090553_ForceRegion_SimpleDragForceOnRigidBodies/leveldata/Environment.xml b/AutomatedTesting/Levels/Physics/Terrain_TerrainTexturePainterWorks/leveldata/Environment.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C6090553_ForceRegion_SimpleDragForceOnRigidBodies/leveldata/Environment.xml rename to AutomatedTesting/Levels/Physics/Terrain_TerrainTexturePainterWorks/leveldata/Environment.xml diff --git a/AutomatedTesting/Levels/Physics/C6090554_ForceRegion_PointForceNegative/leveldata/TerrainTexture.xml b/AutomatedTesting/Levels/Physics/Terrain_TerrainTexturePainterWorks/leveldata/TerrainTexture.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C6090554_ForceRegion_PointForceNegative/leveldata/TerrainTexture.xml rename to AutomatedTesting/Levels/Physics/Terrain_TerrainTexturePainterWorks/leveldata/TerrainTexture.xml diff --git a/AutomatedTesting/Levels/Physics/C6032082_Terrain_MultipleResolutionsValid_512x512_2m/leveldata/TimeOfDay.xml b/AutomatedTesting/Levels/Physics/Terrain_TerrainTexturePainterWorks/leveldata/TimeOfDay.xml similarity index 100% rename from AutomatedTesting/Levels/Physics/C6032082_Terrain_MultipleResolutionsValid_512x512_2m/leveldata/TimeOfDay.xml rename to AutomatedTesting/Levels/Physics/Terrain_TerrainTexturePainterWorks/leveldata/TimeOfDay.xml diff --git a/AutomatedTesting/Levels/Physics/C6131473_StaticSlice_OnDynamicSliceSpawn/leveldata/VegetationMap.dat b/AutomatedTesting/Levels/Physics/Terrain_TerrainTexturePainterWorks/leveldata/VegetationMap.dat similarity index 100% rename from AutomatedTesting/Levels/Physics/C6131473_StaticSlice_OnDynamicSliceSpawn/leveldata/VegetationMap.dat rename to AutomatedTesting/Levels/Physics/Terrain_TerrainTexturePainterWorks/leveldata/VegetationMap.dat diff --git a/AutomatedTesting/Levels/Physics/C13508019_Terrain_TerrainTexturePainterWorks/material/levelmaterial.physmaterial b/AutomatedTesting/Levels/Physics/Terrain_TerrainTexturePainterWorks/material/levelmaterial.physmaterial similarity index 100% rename from AutomatedTesting/Levels/Physics/C13508019_Terrain_TerrainTexturePainterWorks/material/levelmaterial.physmaterial rename to AutomatedTesting/Levels/Physics/Terrain_TerrainTexturePainterWorks/material/levelmaterial.physmaterial diff --git a/AutomatedTesting/Levels/Physics/C6090555_ForceRegion_SplineFollowOnRigidBodies/tags.txt b/AutomatedTesting/Levels/Physics/Terrain_TerrainTexturePainterWorks/tags.txt similarity index 100% rename from AutomatedTesting/Levels/Physics/C6090555_ForceRegion_SplineFollowOnRigidBodies/tags.txt rename to AutomatedTesting/Levels/Physics/Terrain_TerrainTexturePainterWorks/tags.txt diff --git a/AutomatedTesting/Levels/Physics/C13508019_Terrain_TerrainTexturePainterWorks/terrain/terrain.pxheightfield b/AutomatedTesting/Levels/Physics/Terrain_TerrainTexturePainterWorks/terrain/terrain.pxheightfield similarity index 100% rename from AutomatedTesting/Levels/Physics/C13508019_Terrain_TerrainTexturePainterWorks/terrain/terrain.pxheightfield rename to AutomatedTesting/Levels/Physics/Terrain_TerrainTexturePainterWorks/terrain/terrain.pxheightfield diff --git a/AutomatedTesting/Levels/Physics/C13508019_Terrain_TerrainTexturePainterWorks/terraintexture.pak b/AutomatedTesting/Levels/Physics/Terrain_TerrainTexturePainterWorks/terraintexture.pak similarity index 100% rename from AutomatedTesting/Levels/Physics/C13508019_Terrain_TerrainTexturePainterWorks/terraintexture.pak rename to AutomatedTesting/Levels/Physics/Terrain_TerrainTexturePainterWorks/terraintexture.pak diff --git a/AutomatedTesting/Registry/C15556261_PhysXMaterials_CharacterControllerMaterialAssignment.setreg_override b/AutomatedTesting/Registry/C15556261_PhysXMaterials_CharacterControllerMaterialAssignment.setreg_override deleted file mode 100644 index aa82265c98..0000000000 --- a/AutomatedTesting/Registry/C15556261_PhysXMaterials_CharacterControllerMaterialAssignment.setreg_override +++ /dev/null @@ -1,115 +0,0 @@ -{ - "Amazon": { - "Gems": { - "PhysX": { - "PhysXSystemConfiguration": { - "CollisionConfig": { - "Layers": { - "LayerNames": [ - "Default", - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {} - ] - }, - "Groups": { - "GroupPresets": [ - { - "Name": "All", - "ReadOnly": true - }, - { - "Id": { - "GroupId": "{CDB6B8D8-5CD0-40A8-874D-839B00A92EBB}" - }, - "Name": "None", - "Group": { - "Mask": 0 - }, - "ReadOnly": true - }, - { - "Id": { - "GroupId": "{22769429-5D46-429B-829A-0115239D9AAA}" - }, - "Name": "All_NoTouchBend", - "Group": { - "Mask": 9223372036854775807 - }, - "ReadOnly": true - } - ] - } - }, - "MaterialLibrary": { - "assetId": { - "guid": "{70D4A444-AFD4-57C4-9885-63F25AC3C281}" - }, - "loadBehavior": "QueueLoad", - "assetHint": "levels/physics/c15556261_physxmaterials_charactercontrollermaterialassignment/library.physmaterial" - } - } - } - } - } -} \ No newline at end of file diff --git a/AutomatedTesting/Registry/C18981526_Material_RestitutionCombinePriority.setreg_override b/AutomatedTesting/Registry/C18981526_Material_RestitutionCombinePriority.setreg_override deleted file mode 100644 index c78018bdbb..0000000000 --- a/AutomatedTesting/Registry/C18981526_Material_RestitutionCombinePriority.setreg_override +++ /dev/null @@ -1,115 +0,0 @@ -{ - "Amazon": { - "Gems": { - "PhysX": { - "PhysXSystemConfiguration": { - "CollisionConfig": { - "Layers": { - "LayerNames": [ - "Default", - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {} - ] - }, - "Groups": { - "GroupPresets": [ - { - "Name": "All", - "ReadOnly": true - }, - { - "Id": { - "GroupId": "{CDB6B8D8-5CD0-40A8-874D-839B00A92EBB}" - }, - "Name": "None", - "Group": { - "Mask": 0 - }, - "ReadOnly": true - }, - { - "Id": { - "GroupId": "{22769429-5D46-429B-829A-0115239D9AAA}" - }, - "Name": "All_NoTouchBend", - "Group": { - "Mask": 9223372036854775807 - }, - "ReadOnly": true - } - ] - } - }, - "MaterialLibrary": { - "assetId": { - "guid": "{AED48B18-0F3F-5E59-A8FF-30DB134B307B}" - }, - "loadBehavior": "QueueLoad", - "assetHint": "levels/physics/c18981526_material_restitutioncombinepriority/restitution_combine.physmaterial" - } - } - } - } - } -} \ No newline at end of file diff --git a/AutomatedTesting/Registry/C4044697_Material_PerfaceMaterialValidation.setreg_override b/AutomatedTesting/Registry/C4044697_Material_PerfaceMaterialValidation.setreg_override deleted file mode 100644 index 5a93ae2314..0000000000 --- a/AutomatedTesting/Registry/C4044697_Material_PerfaceMaterialValidation.setreg_override +++ /dev/null @@ -1,115 +0,0 @@ -{ - "Amazon": { - "Gems": { - "PhysX": { - "PhysXSystemConfiguration": { - "CollisionConfig": { - "Layers": { - "LayerNames": [ - "Default", - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {}, - {} - ] - }, - "Groups": { - "GroupPresets": [ - { - "Name": "All", - "ReadOnly": true - }, - { - "Id": { - "GroupId": "{CDB6B8D8-5CD0-40A8-874D-839B00A92EBB}" - }, - "Name": "None", - "Group": { - "Mask": 0 - }, - "ReadOnly": true - }, - { - "Id": { - "GroupId": "{22769429-5D46-429B-829A-0115239D9AAA}" - }, - "Name": "All_NoTouchBend", - "Group": { - "Mask": 9223372036854775807 - }, - "ReadOnly": true - } - ] - } - }, - "MaterialLibrary": { - "assetId": { - "guid": "{2E85B457-ED19-5FE3-90B4-6EFFB4D0E682}" - }, - "loadBehavior": "QueueLoad", - "assetHint": "levels/physics/c4044697_material_perfacematerialvalidation/test_library.physmaterial" - } - } - } - } - } -} \ No newline at end of file diff --git a/AutomatedTesting/Registry/C4976227_Collider_NewGroup.setreg_override b/AutomatedTesting/Registry/physx_overrides/Collider_AddingNewGroupWorks.setreg_override similarity index 100% rename from AutomatedTesting/Registry/C4976227_Collider_NewGroup.setreg_override rename to AutomatedTesting/Registry/physx_overrides/Collider_AddingNewGroupWorks.setreg_override diff --git a/AutomatedTesting/Registry/C3510644_Collider_CollisionGroups.setreg_override b/AutomatedTesting/Registry/physx_overrides/Collider_CollisionGroupsWorkflow.setreg_override similarity index 100% rename from AutomatedTesting/Registry/C3510644_Collider_CollisionGroups.setreg_override rename to AutomatedTesting/Registry/physx_overrides/Collider_CollisionGroupsWorkflow.setreg_override diff --git a/AutomatedTesting/Registry/C4976244_Collider_SameGroupSameLayerCollision.setreg_override b/AutomatedTesting/Registry/physx_overrides/Collider_DiffCollisionGroupDiffCollidingLayersNotCollide.setreg_override similarity index 100% rename from AutomatedTesting/Registry/C4976244_Collider_SameGroupSameLayerCollision.setreg_override rename to AutomatedTesting/Registry/physx_overrides/Collider_DiffCollisionGroupDiffCollidingLayersNotCollide.setreg_override diff --git a/AutomatedTesting/Registry/C4976245_PhysXCollider_CollisionLayerTest.setreg_override b/AutomatedTesting/Registry/physx_overrides/Collider_NoneCollisionGroupSameLayerNotCollide.setreg_override similarity index 100% rename from AutomatedTesting/Registry/C4976245_PhysXCollider_CollisionLayerTest.setreg_override rename to AutomatedTesting/Registry/physx_overrides/Collider_NoneCollisionGroupSameLayerNotCollide.setreg_override diff --git a/AutomatedTesting/Registry/C4982593_PhysXCollider_CollisionLayer.setreg_override b/AutomatedTesting/Registry/physx_overrides/Collider_SameCollisionGroupSameCustomLayerCollide.setreg_override similarity index 100% rename from AutomatedTesting/Registry/C4982593_PhysXCollider_CollisionLayer.setreg_override rename to AutomatedTesting/Registry/physx_overrides/Collider_SameCollisionGroupSameCustomLayerCollide.setreg_override diff --git a/AutomatedTesting/Registry/C4044461_Material_Restitution.setreg_override b/AutomatedTesting/Registry/physx_overrides/Material_CharacterController.setreg_override similarity index 95% rename from AutomatedTesting/Registry/C4044461_Material_Restitution.setreg_override rename to AutomatedTesting/Registry/physx_overrides/Material_CharacterController.setreg_override index b70e0f1326..e250c2a8ec 100644 --- a/AutomatedTesting/Registry/C4044461_Material_Restitution.setreg_override +++ b/AutomatedTesting/Registry/physx_overrides/Material_CharacterController.setreg_override @@ -103,10 +103,10 @@ }, "MaterialLibrary": { "assetId": { - "guid": "{E4117B5B-8D9A-5C1D-BA1E-C36542A6588D}" + "guid": "{96A9180B-06C8-5AC2-836D-FFF518B5976A}" }, "loadBehavior": "QueueLoad", - "assetHint": "levels/physics/c4044461_material_restitution/restitution.physmaterial" + "assetHint": "levels/physics/material_charactercontroller/library.physmaterial" } } } diff --git a/AutomatedTesting/Registry/physx_overrides/Material_DefaultLibraryUpdatedAcrossLevels_after.setreg b/AutomatedTesting/Registry/physx_overrides/Material_DefaultLibraryUpdatedAcrossLevels_after.setreg new file mode 100644 index 0000000000..8d694c80d2 --- /dev/null +++ b/AutomatedTesting/Registry/physx_overrides/Material_DefaultLibraryUpdatedAcrossLevels_after.setreg @@ -0,0 +1,115 @@ +{ + "Amazon": { + "Gems": { + "PhysX": { + "PhysXSystemConfiguration": { + "CollisionConfig": { + "Layers": { + "LayerNames": [ + "Default", + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + "TouchBend" + ] + }, + "Groups": { + "GroupPresets": [ + { + "Name": "All", + "ReadOnly": true + }, + { + "Id": { + "GroupId": "{CDB6B8D8-5CD0-40A8-874D-839B00A92EBB}" + }, + "Name": "None", + "Group": { + "Mask": 0 + }, + "ReadOnly": true + }, + { + "Id": { + "GroupId": "{22769429-5D46-429B-829A-0115239D9AAA}" + }, + "Name": "All_NoTouchBend", + "Group": { + "Mask": 9223372036854775807 + }, + "ReadOnly": true + } + ] + } + }, + "MaterialLibrary": { + "assetId": { + "guid": "{966C6F3D-A27F-5591-B84E-939D11DDEAC9}" + }, + "loadBehavior": "QueueLoad", + "assetHint": "levels/physics/material_defaultlibraryupdatedacrosslevels/after.physmaterial" + } + } + } + } + } +} \ No newline at end of file diff --git a/AutomatedTesting/Registry/physx_overrides/Material_DefaultLibraryUpdatedAcrossLevels_before.setreg b/AutomatedTesting/Registry/physx_overrides/Material_DefaultLibraryUpdatedAcrossLevels_before.setreg new file mode 100644 index 0000000000..ca45f7128a --- /dev/null +++ b/AutomatedTesting/Registry/physx_overrides/Material_DefaultLibraryUpdatedAcrossLevels_before.setreg @@ -0,0 +1,115 @@ +{ + "Amazon": { + "Gems": { + "PhysX": { + "PhysXSystemConfiguration": { + "CollisionConfig": { + "Layers": { + "LayerNames": [ + "Default", + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + "TouchBend" + ] + }, + "Groups": { + "GroupPresets": [ + { + "Name": "All", + "ReadOnly": true + }, + { + "Id": { + "GroupId": "{CDB6B8D8-5CD0-40A8-874D-839B00A92EBB}" + }, + "Name": "None", + "Group": { + "Mask": 0 + }, + "ReadOnly": true + }, + { + "Id": { + "GroupId": "{22769429-5D46-429B-829A-0115239D9AAA}" + }, + "Name": "All_NoTouchBend", + "Group": { + "Mask": 9223372036854775807 + }, + "ReadOnly": true + } + ] + } + }, + "MaterialLibrary": { + "assetId": { + "guid": "{3E410671-6D31-51C6-951F-321EE45B8D5C}" + }, + "loadBehavior": "QueueLoad", + "assetHint": "levels/physics/material_defaultlibraryupdatedacrosslevels/before.physmaterial" + } + } + } + } + } +} \ No newline at end of file diff --git a/AutomatedTesting/Registry/C4044459_Material_DynamicFriction.setreg_override b/AutomatedTesting/Registry/physx_overrides/Material_DynamicFriction.setreg_override similarity index 95% rename from AutomatedTesting/Registry/C4044459_Material_DynamicFriction.setreg_override rename to AutomatedTesting/Registry/physx_overrides/Material_DynamicFriction.setreg_override index 5deb5635d1..9b5c8d635d 100644 --- a/AutomatedTesting/Registry/C4044459_Material_DynamicFriction.setreg_override +++ b/AutomatedTesting/Registry/physx_overrides/Material_DynamicFriction.setreg_override @@ -103,10 +103,10 @@ }, "MaterialLibrary": { "assetId": { - "guid": "{6AA79EE4-7EC3-5717-87AE-EDD7D886FD7F}" + "guid": "{7A6CD646-26CA-5A70-AECC-4D55CA4581FE}" }, "loadBehavior": "QueueLoad", - "assetHint": "levels/physics/c4044459_material_dynamicfriction/dynamic_friction.physmaterial" + "assetHint": "levels/physics/material_dynamicfriction/dynamic_friction.physmaterial" } } } diff --git a/AutomatedTesting/Registry/C4044456_Material_FrictionCombine.setreg_override b/AutomatedTesting/Registry/physx_overrides/Material_FrictionCombine.setreg_override similarity index 95% rename from AutomatedTesting/Registry/C4044456_Material_FrictionCombine.setreg_override rename to AutomatedTesting/Registry/physx_overrides/Material_FrictionCombine.setreg_override index 806d71a158..37c67cb5ec 100644 --- a/AutomatedTesting/Registry/C4044456_Material_FrictionCombine.setreg_override +++ b/AutomatedTesting/Registry/physx_overrides/Material_FrictionCombine.setreg_override @@ -103,10 +103,10 @@ }, "MaterialLibrary": { "assetId": { - "guid": "{8D2C4A29-E0FC-564F-82C9-24BBA30C5A90}" + "guid": "{C61EAD16-634F-5665-B9A8-37F909E7E63B}" }, "loadBehavior": "QueueLoad", - "assetHint": "levels/physics/c4044456_material_frictioncombine/friction_combine.physmaterial" + "assetHint": "levels/physics/material_frictioncombine/friction_combine.physmaterial" } } } diff --git a/AutomatedTesting/Registry/C4044457_Material_RestitutionCombine.setreg_override b/AutomatedTesting/Registry/physx_overrides/Material_FrictionCombinePriorityOrder.setreg_override similarity index 95% rename from AutomatedTesting/Registry/C4044457_Material_RestitutionCombine.setreg_override rename to AutomatedTesting/Registry/physx_overrides/Material_FrictionCombinePriorityOrder.setreg_override index fa77daac9f..646e87bbe0 100644 --- a/AutomatedTesting/Registry/C4044457_Material_RestitutionCombine.setreg_override +++ b/AutomatedTesting/Registry/physx_overrides/Material_FrictionCombinePriorityOrder.setreg_override @@ -103,10 +103,10 @@ }, "MaterialLibrary": { "assetId": { - "guid": "{D5D6A6DE-E636-5638-B30D-6CE2FDC321F8}" + "guid": "{FBC1EFDC-2A29-5542-92BB-0389FDE72DBD}" }, "loadBehavior": "QueueLoad", - "assetHint": "levels/physics/c4044457_material_restitutioncombine/restitution_combine.physmaterial" + "assetHint": "levels/physics/material_frictioncombinepriorityorder/friction_combine.physmaterial" } } } diff --git a/AutomatedTesting/Registry/physx_overrides/Material_PerFaceMaterialGetsCorrectMaterial.setreg_override b/AutomatedTesting/Registry/physx_overrides/Material_PerFaceMaterialGetsCorrectMaterial.setreg_override new file mode 100644 index 0000000000..4fcd3899f4 --- /dev/null +++ b/AutomatedTesting/Registry/physx_overrides/Material_PerFaceMaterialGetsCorrectMaterial.setreg_override @@ -0,0 +1,115 @@ +{ + "Amazon": { + "Gems": { + "PhysX": { + "PhysXSystemConfiguration": { + "CollisionConfig": { + "Layers": { + "LayerNames": [ + "Default", + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {} + ] + }, + "Groups": { + "GroupPresets": [ + { + "Name": "All", + "ReadOnly": true + }, + { + "Id": { + "GroupId": "{CDB6B8D8-5CD0-40A8-874D-839B00A92EBB}" + }, + "Name": "None", + "Group": { + "Mask": 0 + }, + "ReadOnly": true + }, + { + "Id": { + "GroupId": "{22769429-5D46-429B-829A-0115239D9AAA}" + }, + "Name": "All_NoTouchBend", + "Group": { + "Mask": 9223372036854775807 + }, + "ReadOnly": true + } + ] + } + }, + "MaterialLibrary": { + "assetId": { + "guid": "{6FA8A773-22B5-50FB-BE16-F93936E06A9A}" + }, + "loadBehavior": "QueueLoad", + "assetHint": "levels/physics/material_perfacematerialgetscorrectmaterial/test_library.physmaterial" + } + } + } + } + } +} \ No newline at end of file diff --git a/AutomatedTesting/Registry/physx_overrides/Material_Restitution.setreg_override b/AutomatedTesting/Registry/physx_overrides/Material_Restitution.setreg_override new file mode 100644 index 0000000000..e868d98949 --- /dev/null +++ b/AutomatedTesting/Registry/physx_overrides/Material_Restitution.setreg_override @@ -0,0 +1,115 @@ +{ + "Amazon": { + "Gems": { + "PhysX": { + "PhysXSystemConfiguration": { + "CollisionConfig": { + "Layers": { + "LayerNames": [ + "Default", + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {} + ] + }, + "Groups": { + "GroupPresets": [ + { + "Name": "All", + "ReadOnly": true + }, + { + "Id": { + "GroupId": "{CDB6B8D8-5CD0-40A8-874D-839B00A92EBB}" + }, + "Name": "None", + "Group": { + "Mask": 0 + }, + "ReadOnly": true + }, + { + "Id": { + "GroupId": "{22769429-5D46-429B-829A-0115239D9AAA}" + }, + "Name": "All_NoTouchBend", + "Group": { + "Mask": 9223372036854775807 + }, + "ReadOnly": true + } + ] + } + }, + "MaterialLibrary": { + "assetId": { + "guid": "{BFE18468-C28C-5FC1-B503-8D36F966A392}" + }, + "loadBehavior": "QueueLoad", + "assetHint": "levels/physics/material_restitution/restitution.physmaterial" + } + } + } + } + } +} \ No newline at end of file diff --git a/AutomatedTesting/Registry/physx_overrides/Material_RestitutionCombine.setreg_override b/AutomatedTesting/Registry/physx_overrides/Material_RestitutionCombine.setreg_override new file mode 100644 index 0000000000..23e6e9446b --- /dev/null +++ b/AutomatedTesting/Registry/physx_overrides/Material_RestitutionCombine.setreg_override @@ -0,0 +1,115 @@ +{ + "Amazon": { + "Gems": { + "PhysX": { + "PhysXSystemConfiguration": { + "CollisionConfig": { + "Layers": { + "LayerNames": [ + "Default", + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {} + ] + }, + "Groups": { + "GroupPresets": [ + { + "Name": "All", + "ReadOnly": true + }, + { + "Id": { + "GroupId": "{CDB6B8D8-5CD0-40A8-874D-839B00A92EBB}" + }, + "Name": "None", + "Group": { + "Mask": 0 + }, + "ReadOnly": true + }, + { + "Id": { + "GroupId": "{22769429-5D46-429B-829A-0115239D9AAA}" + }, + "Name": "All_NoTouchBend", + "Group": { + "Mask": 9223372036854775807 + }, + "ReadOnly": true + } + ] + } + }, + "MaterialLibrary": { + "assetId": { + "guid": "{2A29B7DB-A736-537D-B9B2-56EF32CA4647}" + }, + "loadBehavior": "QueueLoad", + "assetHint": "levels/physics/material_restitutioncombine/restitution_combine.physmaterial" + } + } + } + } + } +} \ No newline at end of file diff --git a/AutomatedTesting/Registry/C18977601_Material_FrictionCombinePriority.setreg_override b/AutomatedTesting/Registry/physx_overrides/Material_RestitutionCombinePriorityOrder.setreg_override similarity index 95% rename from AutomatedTesting/Registry/C18977601_Material_FrictionCombinePriority.setreg_override rename to AutomatedTesting/Registry/physx_overrides/Material_RestitutionCombinePriorityOrder.setreg_override index 7050a57206..3dc0ca972e 100644 --- a/AutomatedTesting/Registry/C18977601_Material_FrictionCombinePriority.setreg_override +++ b/AutomatedTesting/Registry/physx_overrides/Material_RestitutionCombinePriorityOrder.setreg_override @@ -103,10 +103,10 @@ }, "MaterialLibrary": { "assetId": { - "guid": "{B8749DAB-15DA-5A61-B565-C853673604CD}" + "guid": "{E973B6F4-DC8B-5CB2-B0F5-D856FE28D882}" }, "loadBehavior": "QueueLoad", - "assetHint": "levels/physics/c18977601_material_frictioncombinepriority/friction_combine.physmaterial" + "assetHint": "levels/physics/material_restitutioncombinepriorityorder/restitution_combine.physmaterial" } } } diff --git a/AutomatedTesting/Registry/C14195074_ScriptCanvas_PostUpdateEvent.setreg_override b/AutomatedTesting/Registry/physx_overrides/ScriptCanvas_PostUpdateEvent.setreg_override similarity index 100% rename from AutomatedTesting/Registry/C14195074_ScriptCanvas_PostUpdateEvent.setreg_override rename to AutomatedTesting/Registry/physx_overrides/ScriptCanvas_PostUpdateEvent.setreg_override diff --git a/AutomatedTesting/Registry/C14902097_ScriptCanvas_PreUpdateEvent.setreg_override b/AutomatedTesting/Registry/physx_overrides/ScriptCanvas_PreUpdateEvent.setreg_override similarity index 100% rename from AutomatedTesting/Registry/C14902097_ScriptCanvas_PreUpdateEvent.setreg_override rename to AutomatedTesting/Registry/physx_overrides/ScriptCanvas_PreUpdateEvent.setreg_override diff --git a/AutomatedTesting/ScriptCanvas/C12712455_ScriptCanvas_ShapeCastVerification.scriptcanvas b/AutomatedTesting/ScriptCanvas/C12712455_ScriptCanvas_ShapeCastVerification.scriptcanvas deleted file mode 100644 index 9b1357eebe..0000000000 --- a/AutomatedTesting/ScriptCanvas/C12712455_ScriptCanvas_ShapeCastVerification.scriptcanvas +++ /dev/null @@ -1,2877 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/AutomatedTesting/ScriptCanvas/C19536274_NameNode_Prints.scriptcanvas b/AutomatedTesting/ScriptCanvas/ScriptCanvas_GetCollisionName.scriptcanvas similarity index 99% rename from AutomatedTesting/ScriptCanvas/C19536274_NameNode_Prints.scriptcanvas rename to AutomatedTesting/ScriptCanvas/ScriptCanvas_GetCollisionName.scriptcanvas index 9448af25d6..5fc5fb4d8a 100644 --- a/AutomatedTesting/ScriptCanvas/C19536274_NameNode_Prints.scriptcanvas +++ b/AutomatedTesting/ScriptCanvas/ScriptCanvas_GetCollisionName.scriptcanvas @@ -5,7 +5,7 @@ - + diff --git a/AutomatedTesting/ScriptCanvas/C12712454_ScriptCanvas_OverlapNodeVerification.scriptcanvas b/AutomatedTesting/ScriptCanvas/ScriptCanvas_OverlapNode.scriptcanvas similarity index 100% rename from AutomatedTesting/ScriptCanvas/C12712454_ScriptCanvas_OverlapNodeVerification.scriptcanvas rename to AutomatedTesting/ScriptCanvas/ScriptCanvas_OverlapNode.scriptcanvas diff --git a/AutomatedTesting/ScriptCanvas/C14195074_ScriptCanvas_PostUpdateEvent.scriptcanvas b/AutomatedTesting/ScriptCanvas/ScriptCanvas_PostUpdateEvent.scriptcanvas similarity index 99% rename from AutomatedTesting/ScriptCanvas/C14195074_ScriptCanvas_PostUpdateEvent.scriptcanvas rename to AutomatedTesting/ScriptCanvas/ScriptCanvas_PostUpdateEvent.scriptcanvas index ffdac5dd8c..2db2f9c88f 100644 --- a/AutomatedTesting/ScriptCanvas/C14195074_ScriptCanvas_PostUpdateEvent.scriptcanvas +++ b/AutomatedTesting/ScriptCanvas/ScriptCanvas_PostUpdateEvent.scriptcanvas @@ -5,7 +5,7 @@ - + diff --git a/AutomatedTesting/ScriptCanvas/C14902097_ScriptCanvas_PreUpdateEvent.scriptcanvas b/AutomatedTesting/ScriptCanvas/ScriptCanvas_PreUpdateEvent.scriptcanvas similarity index 99% rename from AutomatedTesting/ScriptCanvas/C14902097_ScriptCanvas_PreUpdateEvent.scriptcanvas rename to AutomatedTesting/ScriptCanvas/ScriptCanvas_PreUpdateEvent.scriptcanvas index 4954eb4684..f355b3e6e9 100644 --- a/AutomatedTesting/ScriptCanvas/C14902097_ScriptCanvas_PreUpdateEvent.scriptcanvas +++ b/AutomatedTesting/ScriptCanvas/ScriptCanvas_PreUpdateEvent.scriptcanvas @@ -5,7 +5,7 @@ - + diff --git a/AutomatedTesting/ScriptCanvas/ScriptCanvas_ShapeCast.scriptcanvas b/AutomatedTesting/ScriptCanvas/ScriptCanvas_ShapeCast.scriptcanvas new file mode 100644 index 0000000000..83911ddd0a --- /dev/null +++ b/AutomatedTesting/ScriptCanvas/ScriptCanvas_ShapeCast.scriptcanvas @@ -0,0 +1,1692 @@ +{ + "Type": "JsonSerialization", + "Version": 1, + "ClassName": "ScriptCanvasData", + "ClassData": { + "m_scriptCanvas": { + "Id": { + "id": 8672351796498 + }, + "Name": "ScriptCanvas_ShapeCast", + "Components": { + "Component_[1715830487162451505]": { + "$type": "{4D755CA9-AB92-462C-B24F-0B3376F19967} Graph", + "Id": 1715830487162451505, + "m_graphData": { + "m_nodes": [ + { + "Id": { + "id": 8685236698386 + }, + "Name": "SC-Node((NodeFunctionGenericMultiReturn)<{tuple(float const Sp)", + "Components": { + "Component_[17527424526662203988]": { + "$type": "(NodeFunctionGenericMultiReturn)<{tuple(float const Sp", + "Id": 17527424526662203988, + "Slots": [ + { + "id": { + "m_id": "{D7AC77DA-32BA-4741-86AB-CDA656A7760C}" + }, + "contracts": [ + { + "$type": "SlotTypeContract" + } + ], + "slotName": "In", + "Descriptor": { + "ConnectionType": 1, + "SlotType": 1 + } + }, + { + "id": { + "m_id": "{D46CC4A2-380E-4E42-B0A1-176DBC19420B}" + }, + "contracts": [ + { + "$type": "SlotTypeContract" + } + ], + "slotName": "Out", + "Descriptor": { + "ConnectionType": 2, + "SlotType": 1 + } + }, + { + "id": { + "m_id": "{66F31F78-DDFA-4B8E-A01C-F4556C68D940}" + }, + "contracts": [ + { + "$type": "SlotTypeContract" + }, + null + ], + "slotName": "Number: Distance", + "Descriptor": { + "ConnectionType": 1, + "SlotType": 2 + }, + "DataType": 1 + }, + { + "id": { + "m_id": "{D8D3B073-1ACD-4170-A3C0-495E673F409A}" + }, + "contracts": [ + { + "$type": "SlotTypeContract" + }, + null + ], + "slotName": "Transform: Pose", + "Descriptor": { + "ConnectionType": 1, + "SlotType": 2 + }, + "DataType": 1 + }, + { + "id": { + "m_id": "{A26AB3BE-A6E6-4659-8869-6D1A6B30DDAB}" + }, + "contracts": [ + { + "$type": "SlotTypeContract" + }, + null + ], + "slotName": "Vector3: Direction", + "Descriptor": { + "ConnectionType": 1, + "SlotType": 2 + }, + "DataType": 1 + }, + { + "id": { + "m_id": "{520D51F7-0B1F-4412-810C-6ACA2A96AA23}" + }, + "contracts": [ + { + "$type": "SlotTypeContract" + }, + null + ], + "slotName": "Number: Radius", + "Descriptor": { + "ConnectionType": 1, + "SlotType": 2 + }, + "DataType": 1 + }, + { + "id": { + "m_id": "{DE1A013A-7527-47E5-918C-20D13692D37A}" + }, + "contracts": [ + { + "$type": "SlotTypeContract" + }, + null + ], + "slotName": "String: Collision group", + "Descriptor": { + "ConnectionType": 1, + "SlotType": 2 + }, + "DataType": 1 + }, + { + "id": { + "m_id": "{20241664-EF87-4A3B-BAC2-3A43E3D99386}" + }, + "contracts": [ + { + "$type": "SlotTypeContract" + }, + null + ], + "slotName": "EntityID: Ignore", + "Descriptor": { + "ConnectionType": 1, + "SlotType": 2 + }, + "DataType": 1 + }, + { + "id": { + "m_id": "{F887E775-DFD5-496A-A707-DB2D6A99607B}" + }, + "contracts": [ + { + "$type": "SlotTypeContract" + } + ], + "slotName": "Object Hit: Boolean", + "DisplayDataType": { + "m_type": 0 + }, + "Descriptor": { + "ConnectionType": 2, + "SlotType": 2 + }, + "DataType": 1 + }, + { + "id": { + "m_id": "{3EBC2F40-052C-4AB9-85CF-BFDE6ADFE237}" + }, + "contracts": [ + { + "$type": "SlotTypeContract" + } + ], + "slotName": "Position: Vector3", + "DisplayDataType": { + "m_type": 8 + }, + "Descriptor": { + "ConnectionType": 2, + "SlotType": 2 + }, + "DataType": 1 + }, + { + "id": { + "m_id": "{006BEA83-A09E-40AE-B09F-2FD74588492A}" + }, + "contracts": [ + { + "$type": "SlotTypeContract" + } + ], + "slotName": "Normal: Vector3", + "DisplayDataType": { + "m_type": 8 + }, + "Descriptor": { + "ConnectionType": 2, + "SlotType": 2 + }, + "DataType": 1 + }, + { + "id": { + "m_id": "{83DCCC29-BAD8-43ED-B52E-B04877A5A2A5}" + }, + "contracts": [ + { + "$type": "SlotTypeContract" + } + ], + "slotName": "Distance: Number", + "DisplayDataType": { + "m_type": 3 + }, + "Descriptor": { + "ConnectionType": 2, + "SlotType": 2 + }, + "DataType": 1 + }, + { + "id": { + "m_id": "{EFEB3B68-5944-45C6-9B70-06EDA57C7459}" + }, + "contracts": [ + { + "$type": "SlotTypeContract" + } + ], + "slotName": "EntityId: EntityID", + "DisplayDataType": { + "m_type": 1 + }, + "Descriptor": { + "ConnectionType": 2, + "SlotType": 2 + }, + "DataType": 1 + }, + { + "id": { + "m_id": "{700A0934-07DB-4C52-A7DE-E93B074320E8}" + }, + "contracts": [ + { + "$type": "SlotTypeContract" + } + ], + "slotName": "Surface: CRC", + "DisplayDataType": { + "m_type": 13 + }, + "Descriptor": { + "ConnectionType": 2, + "SlotType": 2 + }, + "DataType": 1 + } + ], + "Datums": [ + { + "isOverloadedStorage": false, + "scriptCanvasType": { + "m_type": 3 + }, + "isNullPointer": false, + "$type": "double", + "value": 100.0, + "label": "Number: Distance" + }, + { + "isOverloadedStorage": false, + "scriptCanvasType": { + "m_type": 7 + }, + "isNullPointer": false, + "$type": "Transform", + "value": { + "Translation": [ + 0.0, + 0.0, + 0.0 + ], + "Rotation": [ + 0.0, + 0.0, + 0.0, + 1.0 + ], + "Scale": 1.0 + }, + "label": "Transform: Pose" + }, + { + "isOverloadedStorage": false, + "scriptCanvasType": { + "m_type": 8 + }, + "isNullPointer": false, + "$type": "Vector3", + "value": [ + 0.0, + 1.0, + 0.0 + ], + "label": "Vector3: Direction" + }, + { + "isOverloadedStorage": false, + "scriptCanvasType": { + "m_type": 3 + }, + "isNullPointer": false, + "$type": "double", + "value": 0.5, + "label": "Number: Radius" + }, + { + "isOverloadedStorage": false, + "scriptCanvasType": { + "m_type": 5 + }, + "isNullPointer": false, + "$type": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9} AZStd::string", + "value": "All", + "label": "String: Collision group" + }, + { + "isOverloadedStorage": false, + "scriptCanvasType": { + "m_type": 1 + }, + "isNullPointer": false, + "$type": "EntityId", + "value": { + "id": 2901262558 + }, + "label": "EntityID: Ignore" + } + ], + "Initialized": true + } + } + }, + { + "Id": { + "id": 8676646763794 + }, + "Name": "SC-Node(Start)", + "Components": { + "Component_[17616618838173498229]": { + "$type": "Start", + "Id": 17616618838173498229, + "Slots": [ + { + "id": { + "m_id": "{F85C0F22-59F0-4829-A3B2-958CA6E475B7}" + }, + "contracts": [ + { + "$type": "SlotTypeContract" + } + ], + "slotName": "Out", + "toolTip": "Signaled when the entity that owns this graph is fully activated.", + "Descriptor": { + "ConnectionType": 2, + "SlotType": 1 + } + } + ] + } + } + }, + { + "Id": { + "id": 8706711534866 + }, + "Name": "SC-Node(TimeDelayNodeableNode)", + "Components": { + "Component_[18154336258371736718]": { + "$type": "TimeDelayNodeableNode", + "Id": 18154336258371736718, + "Slots": [ + { + "id": { + "m_id": "{C2787E3E-CFBF-4891-B913-996173AB5E2C}" + }, + "contracts": [ + { + "$type": "SlotTypeContract" + } + ], + "slotName": "Start", + "DisplayGroup": { + "Value": 2675529103 + }, + "Descriptor": { + "ConnectionType": 1, + "SlotType": 1 + } + }, + { + "id": { + "m_id": "{9F163BAD-DEFF-4545-AF74-ECC908929A3B}" + }, + "contracts": [ + { + "$type": "SlotTypeContract" + }, + null + ], + "slotName": "Delay", + "toolTip": "The amount of time to delay before the Done is signalled.", + "DisplayGroup": { + "Value": 2675529103 + }, + "Descriptor": { + "ConnectionType": 1, + "SlotType": 2 + }, + "DataType": 1 + }, + { + "id": { + "m_id": "{412F5500-8A95-4817-B68D-D623F614DA9A}" + }, + "contracts": [ + { + "$type": "SlotTypeContract" + } + ], + "slotName": "On Start", + "DisplayGroup": { + "Value": 2675529103 + }, + "Descriptor": { + "ConnectionType": 2, + "SlotType": 1 + } + }, + { + "id": { + "m_id": "{BB866532-A9E2-4F6B-8BDE-573FF19978BD}" + }, + "contracts": [ + { + "$type": "SlotTypeContract" + } + ], + "slotName": "Done", + "toolTip": "Signaled after waiting for the specified amount of times.", + "DisplayGroup": { + "Value": 271442091 + }, + "Descriptor": { + "ConnectionType": 2, + "SlotType": 1 + }, + "IsLatent": true + } + ], + "Datums": [ + { + "isOverloadedStorage": false, + "scriptCanvasType": { + "m_type": 3 + }, + "isNullPointer": false, + "$type": "double", + "value": 0.5, + "label": "Delay" + } + ], + "nodeable": { + "m_timeUnits": 2 + }, + "slotExecutionMap": { + "ins": [ + { + "_slotId": { + "m_id": "{C2787E3E-CFBF-4891-B913-996173AB5E2C}" + }, + "_inputs": [ + { + "_slotId": { + "m_id": "{9F163BAD-DEFF-4545-AF74-ECC908929A3B}" + } + } + ], + "_outs": [ + { + "_slotId": { + "m_id": "{412F5500-8A95-4817-B68D-D623F614DA9A}" + }, + "_name": "On Start", + "_interfaceSourceId": "{10B6E401-6101-0000-6088-EF3E51000000}" + } + ], + "_interfaceSourceId": "{8089EF3E-5100-0000-9086-EF3E51000000}" + } + ], + "latents": [ + { + "_slotId": { + "m_id": "{BB866532-A9E2-4F6B-8BDE-573FF19978BD}" + }, + "_name": "Done", + "_interfaceSourceId": "{8089EF3E-5100-0000-9086-EF3E51000000}" + } + ] + } + } + } + }, + { + "Id": { + "id": 8698121600274 + }, + "Name": "SC-Node(DrawSphereAtLocation)", + "Components": { + "Component_[4372033099563884915]": { + "$type": "{E42861BD-1956-45AE-8DD7-CCFC1E3E5ACF} Method", + "Id": 4372033099563884915, + "Slots": [ + { + "id": { + "m_id": "{130E7595-7F23-4DB4-9F63-F65F59802520}" + }, + "contracts": [ + { + "$type": "SlotTypeContract" + }, + null + ], + "slotName": "Vector3: 0", + "Descriptor": { + "ConnectionType": 1, + "SlotType": 2 + }, + "DataType": 1 + }, + { + "id": { + "m_id": "{60E43462-5901-4CAF-A401-85A4FCA7508C}" + }, + "contracts": [ + { + "$type": "SlotTypeContract" + }, + null + ], + "slotName": "Number: 1", + "Descriptor": { + "ConnectionType": 1, + "SlotType": 2 + }, + "DataType": 1 + }, + { + "id": { + "m_id": "{1E920F17-3D6F-4CE0-B2D2-3D3C100F8419}" + }, + "contracts": [ + { + "$type": "SlotTypeContract" + }, + null + ], + "slotName": "Color: 2", + "Descriptor": { + "ConnectionType": 1, + "SlotType": 2 + }, + "DataType": 1 + }, + { + "id": { + "m_id": "{506CF2BF-0DF2-41C2-9D41-80191C59AC05}" + }, + "contracts": [ + { + "$type": "SlotTypeContract" + }, + null + ], + "slotName": "Number: 3", + "Descriptor": { + "ConnectionType": 1, + "SlotType": 2 + }, + "DataType": 1 + }, + { + "id": { + "m_id": "{2D4EE0B2-CB04-450A-BF88-0865D83DAD43}" + }, + "contracts": [ + { + "$type": "SlotTypeContract" + } + ], + "slotName": "In", + "Descriptor": { + "ConnectionType": 1, + "SlotType": 1 + } + }, + { + "id": { + "m_id": "{26873BC3-2AB5-428A-92EE-1AD26052194E}" + }, + "contracts": [ + { + "$type": "SlotTypeContract" + } + ], + "slotName": "Out", + "Descriptor": { + "ConnectionType": 2, + "SlotType": 1 + } + } + ], + "Datums": [ + { + "isOverloadedStorage": false, + "scriptCanvasType": { + "m_type": 8 + }, + "isNullPointer": false, + "$type": "Vector3", + "value": [ + 0.0, + 0.0, + 0.0 + ], + "label": "Vector3: 0" + }, + { + "isOverloadedStorage": false, + "scriptCanvasType": { + "m_type": 3 + }, + "isNullPointer": false, + "$type": "double", + "value": 0.5, + "label": "Number: 1" + }, + { + "isOverloadedStorage": false, + "scriptCanvasType": { + "m_type": 12 + }, + "isNullPointer": false, + "$type": "Color", + "value": [ + 1.0, + 0.0, + 0.0, + 0.3921568989753723 + ], + "label": "Color: 2" + }, + { + "isOverloadedStorage": false, + "scriptCanvasType": { + "m_type": 3 + }, + "isNullPointer": false, + "$type": "double", + "value": 10.0, + "label": "Number: 3" + } + ], + "methodType": 0, + "methodName": "DrawSphereAtLocation", + "className": "DebugDrawRequestBus", + "resultSlotIDs": [ + {} + ], + "prettyClassName": "DebugDrawRequestBus" + } + } + }, + { + "Id": { + "id": 8702416567570 + }, + "Name": "SC-Node(SetGravityEnabled)", + "Components": { + "Component_[4963491059979349551]": { + "$type": "{E42861BD-1956-45AE-8DD7-CCFC1E3E5ACF} Method", + "Id": 4963491059979349551, + "Slots": [ + { + "id": { + "m_id": "{346B23A2-69F8-4055-916C-E5285627347B}" + }, + "contracts": [ + { + "$type": "SlotTypeContract" + }, + null + ], + "slotName": "EntityID: 0", + "Descriptor": { + "ConnectionType": 1, + "SlotType": 2 + }, + "DataType": 1 + }, + { + "id": { + "m_id": "{96A5579D-5DBF-43C2-BE9A-6E6E3DB5F274}" + }, + "contracts": [ + { + "$type": "SlotTypeContract" + }, + null + ], + "slotName": "Boolean: 1", + "Descriptor": { + "ConnectionType": 1, + "SlotType": 2 + }, + "DataType": 1 + }, + { + "id": { + "m_id": "{EFE54C57-C69A-416B-B679-F324C5F8220A}" + }, + "contracts": [ + { + "$type": "SlotTypeContract" + } + ], + "slotName": "In", + "Descriptor": { + "ConnectionType": 1, + "SlotType": 1 + } + }, + { + "id": { + "m_id": "{B672C4F4-B452-4260-B16B-107BE14D4A29}" + }, + "contracts": [ + { + "$type": "SlotTypeContract" + } + ], + "slotName": "Out", + "Descriptor": { + "ConnectionType": 2, + "SlotType": 1 + } + } + ], + "Datums": [ + { + "isOverloadedStorage": false, + "scriptCanvasType": { + "m_type": 1 + }, + "isNullPointer": false, + "$type": "EntityId", + "value": { + "id": 6946861790754 + }, + "label": "Source" + }, + { + "isOverloadedStorage": false, + "scriptCanvasType": { + "m_type": 0 + }, + "isNullPointer": false, + "$type": "bool", + "value": true, + "label": "Enabled" + } + ], + "methodType": 0, + "methodName": "SetGravityEnabled", + "className": "RigidBodyRequestBus", + "resultSlotIDs": [ + {} + ], + "prettyClassName": "RigidBodyRequestBus" + } + } + }, + { + "Id": { + "id": 8680941731090 + }, + "Name": "SC-Node(SetGravityEnabled)", + "Components": { + "Component_[4963491059979349551]": { + "$type": "{E42861BD-1956-45AE-8DD7-CCFC1E3E5ACF} Method", + "Id": 4963491059979349551, + "Slots": [ + { + "id": { + "m_id": "{346B23A2-69F8-4055-916C-E5285627347B}" + }, + "contracts": [ + { + "$type": "SlotTypeContract" + }, + null + ], + "slotName": "EntityID: 0", + "Descriptor": { + "ConnectionType": 1, + "SlotType": 2 + }, + "DataType": 1 + }, + { + "id": { + "m_id": "{96A5579D-5DBF-43C2-BE9A-6E6E3DB5F274}" + }, + "contracts": [ + { + "$type": "SlotTypeContract" + }, + null + ], + "slotName": "Boolean: 1", + "Descriptor": { + "ConnectionType": 1, + "SlotType": 2 + }, + "DataType": 1 + }, + { + "id": { + "m_id": "{EFE54C57-C69A-416B-B679-F324C5F8220A}" + }, + "contracts": [ + { + "$type": "SlotTypeContract" + } + ], + "slotName": "In", + "Descriptor": { + "ConnectionType": 1, + "SlotType": 1 + } + }, + { + "id": { + "m_id": "{B672C4F4-B452-4260-B16B-107BE14D4A29}" + }, + "contracts": [ + { + "$type": "SlotTypeContract" + } + ], + "slotName": "Out", + "Descriptor": { + "ConnectionType": 2, + "SlotType": 1 + } + } + ], + "Datums": [ + { + "isOverloadedStorage": false, + "scriptCanvasType": { + "m_type": 1 + }, + "isNullPointer": false, + "$type": "EntityId", + "value": { + "id": 6951156758050 + }, + "label": "Source" + }, + { + "isOverloadedStorage": false, + "scriptCanvasType": { + "m_type": 0 + }, + "isNullPointer": false, + "$type": "bool", + "value": true, + "label": "Enabled" + } + ], + "methodType": 0, + "methodName": "SetGravityEnabled", + "className": "RigidBodyRequestBus", + "resultSlotIDs": [ + {} + ], + "prettyClassName": "RigidBodyRequestBus" + } + } + }, + { + "Id": { + "id": 8689531665682 + }, + "Name": "SC-Node(SetGravityEnabled)", + "Components": { + "Component_[4963491059979349551]": { + "$type": "{E42861BD-1956-45AE-8DD7-CCFC1E3E5ACF} Method", + "Id": 4963491059979349551, + "Slots": [ + { + "id": { + "m_id": "{346B23A2-69F8-4055-916C-E5285627347B}" + }, + "contracts": [ + { + "$type": "SlotTypeContract" + }, + null + ], + "slotName": "EntityID: 0", + "Descriptor": { + "ConnectionType": 1, + "SlotType": 2 + }, + "DataType": 1 + }, + { + "id": { + "m_id": "{96A5579D-5DBF-43C2-BE9A-6E6E3DB5F274}" + }, + "contracts": [ + { + "$type": "SlotTypeContract" + }, + null + ], + "slotName": "Boolean: 1", + "Descriptor": { + "ConnectionType": 1, + "SlotType": 2 + }, + "DataType": 1 + }, + { + "id": { + "m_id": "{EFE54C57-C69A-416B-B679-F324C5F8220A}" + }, + "contracts": [ + { + "$type": "SlotTypeContract" + } + ], + "slotName": "In", + "Descriptor": { + "ConnectionType": 1, + "SlotType": 1 + } + }, + { + "id": { + "m_id": "{B672C4F4-B452-4260-B16B-107BE14D4A29}" + }, + "contracts": [ + { + "$type": "SlotTypeContract" + } + ], + "slotName": "Out", + "Descriptor": { + "ConnectionType": 2, + "SlotType": 1 + } + } + ], + "Datums": [ + { + "isOverloadedStorage": false, + "scriptCanvasType": { + "m_type": 1 + }, + "isNullPointer": false, + "$type": "EntityId", + "value": { + "id": 20016447272482 + }, + "label": "Source" + }, + { + "isOverloadedStorage": false, + "scriptCanvasType": { + "m_type": 0 + }, + "isNullPointer": false, + "$type": "bool", + "value": true, + "label": "Enabled" + } + ], + "methodType": 0, + "methodName": "SetGravityEnabled", + "className": "RigidBodyRequestBus", + "resultSlotIDs": [ + {} + ], + "prettyClassName": "RigidBodyRequestBus" + } + } + }, + { + "Id": { + "id": 8693826632978 + }, + "Name": "SC-Node(GetWorldTM)", + "Components": { + "Component_[9713463285310435196]": { + "$type": "{E42861BD-1956-45AE-8DD7-CCFC1E3E5ACF} Method", + "Id": 9713463285310435196, + "Slots": [ + { + "id": { + "m_id": "{63CFCFFA-AD2D-4BCF-B5F4-E632DE8546AD}" + }, + "contracts": [ + { + "$type": "SlotTypeContract" + } + ], + "slotName": "Result: Transform", + "DisplayDataType": { + "m_type": 7 + }, + "Descriptor": { + "ConnectionType": 2, + "SlotType": 2 + }, + "DataType": 1 + }, + { + "id": { + "m_id": "{B22FC7CE-DFE3-4118-B98E-F99EA94A7160}" + }, + "contracts": [ + { + "$type": "SlotTypeContract" + }, + null + ], + "slotName": "EntityID: 0", + "Descriptor": { + "ConnectionType": 1, + "SlotType": 2 + }, + "DataType": 1 + }, + { + "id": { + "m_id": "{94D6DD7F-0835-4AF2-8C0D-F5C04A627F09}" + }, + "contracts": [ + { + "$type": "SlotTypeContract" + } + ], + "slotName": "In", + "Descriptor": { + "ConnectionType": 1, + "SlotType": 1 + } + }, + { + "id": { + "m_id": "{AF7BF67F-4EFD-4B17-8D9E-28D360E229C4}" + }, + "contracts": [ + { + "$type": "SlotTypeContract" + } + ], + "slotName": "Out", + "Descriptor": { + "ConnectionType": 2, + "SlotType": 1 + } + } + ], + "Datums": [ + { + "isOverloadedStorage": false, + "scriptCanvasType": { + "m_type": 1 + }, + "isNullPointer": false, + "$type": "EntityId", + "value": { + "id": 285423519414 + }, + "label": "Source" + } + ], + "methodType": 0, + "methodName": "GetWorldTM", + "className": "TransformBus", + "resultSlotIDs": [ + { + "m_id": "{63CFCFFA-AD2D-4BCF-B5F4-E632DE8546AD}" + } + ], + "prettyClassName": "TransformBus" + } + } + } + ], + "m_connections": [ + { + "Id": { + "id": 8711006502162 + }, + "Name": "srcEndpoint=(TimeDelay: Done), destEndpoint=(GetWorldTM: In)", + "Components": { + "Component_[7737581004071114865]": { + "$type": "{64CA5016-E803-4AC4-9A36-BDA2C890C6EB} Connection", + "Id": 7737581004071114865, + "sourceEndpoint": { + "nodeId": { + "id": 8706711534866 + }, + "slotId": { + "m_id": "{BB866532-A9E2-4F6B-8BDE-573FF19978BD}" + } + }, + "targetEndpoint": { + "nodeId": { + "id": 8693826632978 + }, + "slotId": { + "m_id": "{94D6DD7F-0835-4AF2-8C0D-F5C04A627F09}" + } + } + } + } + }, + { + "Id": { + "id": 8715301469458 + }, + "Name": "srcEndpoint=(SphereCastWithGroup: Out), destEndpoint=(DrawSphereAtLocation: In)", + "Components": { + "Component_[2579605655438959770]": { + "$type": "{64CA5016-E803-4AC4-9A36-BDA2C890C6EB} Connection", + "Id": 2579605655438959770, + "sourceEndpoint": { + "nodeId": { + "id": 8685236698386 + }, + "slotId": { + "m_id": "{D46CC4A2-380E-4E42-B0A1-176DBC19420B}" + } + }, + "targetEndpoint": { + "nodeId": { + "id": 8698121600274 + }, + "slotId": { + "m_id": "{2D4EE0B2-CB04-450A-BF88-0865D83DAD43}" + } + } + } + } + }, + { + "Id": { + "id": 8719596436754 + }, + "Name": "srcEndpoint=(SphereCastWithGroup: Out), destEndpoint=(SetGravityEnabled: In)", + "Components": { + "Component_[10204073618203833060]": { + "$type": "{64CA5016-E803-4AC4-9A36-BDA2C890C6EB} Connection", + "Id": 10204073618203833060, + "sourceEndpoint": { + "nodeId": { + "id": 8685236698386 + }, + "slotId": { + "m_id": "{D46CC4A2-380E-4E42-B0A1-176DBC19420B}" + } + }, + "targetEndpoint": { + "nodeId": { + "id": 8680941731090 + }, + "slotId": { + "m_id": "{EFE54C57-C69A-416B-B679-F324C5F8220A}" + } + } + } + } + }, + { + "Id": { + "id": 8723891404050 + }, + "Name": "srcEndpoint=(SphereCastWithGroup: Position: Vector3), destEndpoint=(DrawSphereAtLocation: Vector3: 0)", + "Components": { + "Component_[8680294304213498063]": { + "$type": "{64CA5016-E803-4AC4-9A36-BDA2C890C6EB} Connection", + "Id": 8680294304213498063, + "sourceEndpoint": { + "nodeId": { + "id": 8685236698386 + }, + "slotId": { + "m_id": "{3EBC2F40-052C-4AB9-85CF-BFDE6ADFE237}" + } + }, + "targetEndpoint": { + "nodeId": { + "id": 8698121600274 + }, + "slotId": { + "m_id": "{130E7595-7F23-4DB4-9F63-F65F59802520}" + } + } + } + } + }, + { + "Id": { + "id": 8728186371346 + }, + "Name": "srcEndpoint=(GetWorldTM: Result: Transform), destEndpoint=(SphereCastWithGroup: Transform: Pose)", + "Components": { + "Component_[17208443392918658715]": { + "$type": "{64CA5016-E803-4AC4-9A36-BDA2C890C6EB} Connection", + "Id": 17208443392918658715, + "sourceEndpoint": { + "nodeId": { + "id": 8693826632978 + }, + "slotId": { + "m_id": "{63CFCFFA-AD2D-4BCF-B5F4-E632DE8546AD}" + } + }, + "targetEndpoint": { + "nodeId": { + "id": 8685236698386 + }, + "slotId": { + "m_id": "{D8D3B073-1ACD-4170-A3C0-495E673F409A}" + } + } + } + } + }, + { + "Id": { + "id": 8732481338642 + }, + "Name": "srcEndpoint=(DrawSphereAtLocation: Out), destEndpoint=(SetGravityEnabled: In)", + "Components": { + "Component_[15585314878063913195]": { + "$type": "{64CA5016-E803-4AC4-9A36-BDA2C890C6EB} Connection", + "Id": 15585314878063913195, + "sourceEndpoint": { + "nodeId": { + "id": 8698121600274 + }, + "slotId": { + "m_id": "{26873BC3-2AB5-428A-92EE-1AD26052194E}" + } + }, + "targetEndpoint": { + "nodeId": { + "id": 8702416567570 + }, + "slotId": { + "m_id": "{EFE54C57-C69A-416B-B679-F324C5F8220A}" + } + } + } + } + }, + { + "Id": { + "id": 8736776305938 + }, + "Name": "srcEndpoint=(On Graph Start: Out), destEndpoint=(TimeDelay: Start)", + "Components": { + "Component_[6013147305095983432]": { + "$type": "{64CA5016-E803-4AC4-9A36-BDA2C890C6EB} Connection", + "Id": 6013147305095983432, + "sourceEndpoint": { + "nodeId": { + "id": 8676646763794 + }, + "slotId": { + "m_id": "{F85C0F22-59F0-4829-A3B2-958CA6E475B7}" + } + }, + "targetEndpoint": { + "nodeId": { + "id": 8706711534866 + }, + "slotId": { + "m_id": "{C2787E3E-CFBF-4891-B913-996173AB5E2C}" + } + } + } + } + }, + { + "Id": { + "id": 8741071273234 + }, + "Name": "srcEndpoint=(GetWorldTM: Out), destEndpoint=(SetGravityEnabled: In)", + "Components": { + "Component_[12606540412460381315]": { + "$type": "{64CA5016-E803-4AC4-9A36-BDA2C890C6EB} Connection", + "Id": 12606540412460381315, + "sourceEndpoint": { + "nodeId": { + "id": 8693826632978 + }, + "slotId": { + "m_id": "{AF7BF67F-4EFD-4B17-8D9E-28D360E229C4}" + } + }, + "targetEndpoint": { + "nodeId": { + "id": 8689531665682 + }, + "slotId": { + "m_id": "{EFE54C57-C69A-416B-B679-F324C5F8220A}" + } + } + } + } + }, + { + "Id": { + "id": 8745366240530 + }, + "Name": "srcEndpoint=(GetWorldTM: Out), destEndpoint=(SphereCastWithGroup: In)", + "Components": { + "Component_[2294691910181778131]": { + "$type": "{64CA5016-E803-4AC4-9A36-BDA2C890C6EB} Connection", + "Id": 2294691910181778131, + "sourceEndpoint": { + "nodeId": { + "id": 8693826632978 + }, + "slotId": { + "m_id": "{AF7BF67F-4EFD-4B17-8D9E-28D360E229C4}" + } + }, + "targetEndpoint": { + "nodeId": { + "id": 8685236698386 + }, + "slotId": { + "m_id": "{D7AC77DA-32BA-4741-86AB-CDA656A7760C}" + } + } + } + } + } + ] + }, + "m_assetType": "{3E2AC8CD-713F-453E-967F-29517F331784}", + "versionData": { + "_grammarVersion": 1, + "_runtimeVersion": 1 + }, + "GraphCanvasData": [ + { + "Key": { + "id": 8672351796498 + }, + "Value": { + "ComponentData": { + "{5F84B500-8C45-40D1-8EFC-A5306B241444}": { + "$type": "SceneComponentSaveData", + "ViewParams": { + "Scale": 0.21511092130869494, + "AnchorX": -832.1288452148438, + "AnchorY": -418.3887939453125 + } + } + } + } + }, + { + "Key": { + "id": 8676646763794 + }, + "Value": { + "ComponentData": { + "{24CB38BB-1705-4EC5-8F63-B574571B4DCD}": { + "$type": "NodeSaveData" + }, + "{328FF15C-C302-458F-A43D-E1794DE0904E}": { + "$type": "GeneralNodeTitleComponentSaveData", + "PaletteOverride": "TimeNodeTitlePalette" + }, + "{7CC444B1-F9B3-41B5-841B-0C4F2179F111}": { + "$type": "GeometrySaveData", + "Position": [ + -680.0, + 320.0 + ] + }, + "{B0B99C8A-03AF-4CF6-A926-F65C874C3D97}": { + "$type": "StylingComponentSaveData", + "SubStyle": ".time" + }, + "{B1F49A35-8408-40DA-B79E-F1E3B64322CE}": { + "$type": "PersistentIdComponentSaveData", + "PersistentId": "{329A591F-9482-44F3-93AA-1F135C714680}" + } + } + } + }, + { + "Key": { + "id": 8680941731090 + }, + "Value": { + "ComponentData": { + "{24CB38BB-1705-4EC5-8F63-B574571B4DCD}": { + "$type": "NodeSaveData" + }, + "{328FF15C-C302-458F-A43D-E1794DE0904E}": { + "$type": "GeneralNodeTitleComponentSaveData", + "PaletteOverride": "MethodNodeTitlePalette" + }, + "{7CC444B1-F9B3-41B5-841B-0C4F2179F111}": { + "$type": "GeometrySaveData", + "Position": [ + 960.0, + 40.0 + ] + }, + "{B0B99C8A-03AF-4CF6-A926-F65C874C3D97}": { + "$type": "StylingComponentSaveData", + "SubStyle": ".method" + }, + "{B1F49A35-8408-40DA-B79E-F1E3B64322CE}": { + "$type": "PersistentIdComponentSaveData", + "PersistentId": "{1E66D38D-9F4F-4A41-8989-494911B8ECE1}" + } + } + } + }, + { + "Key": { + "id": 8685236698386 + }, + "Value": { + "ComponentData": { + "{24CB38BB-1705-4EC5-8F63-B574571B4DCD}": { + "$type": "NodeSaveData" + }, + "{328FF15C-C302-458F-A43D-E1794DE0904E}": { + "$type": "GeneralNodeTitleComponentSaveData", + "PaletteOverride": "DefaultNodeTitlePalette" + }, + "{7CC444B1-F9B3-41B5-841B-0C4F2179F111}": { + "$type": "GeometrySaveData", + "Position": [ + 320.0, + 300.0 + ] + }, + "{B0B99C8A-03AF-4CF6-A926-F65C874C3D97}": { + "$type": "StylingComponentSaveData" + }, + "{B1F49A35-8408-40DA-B79E-F1E3B64322CE}": { + "$type": "PersistentIdComponentSaveData", + "PersistentId": "{146B2DD0-7DD3-4114-B288-9BFF68E8E573}" + } + } + } + }, + { + "Key": { + "id": 8689531665682 + }, + "Value": { + "ComponentData": { + "{24CB38BB-1705-4EC5-8F63-B574571B4DCD}": { + "$type": "NodeSaveData" + }, + "{328FF15C-C302-458F-A43D-E1794DE0904E}": { + "$type": "GeneralNodeTitleComponentSaveData", + "PaletteOverride": "MethodNodeTitlePalette" + }, + "{7CC444B1-F9B3-41B5-841B-0C4F2179F111}": { + "$type": "GeometrySaveData", + "Position": [ + 320.0, + 40.0 + ] + }, + "{B0B99C8A-03AF-4CF6-A926-F65C874C3D97}": { + "$type": "StylingComponentSaveData", + "SubStyle": ".method" + }, + "{B1F49A35-8408-40DA-B79E-F1E3B64322CE}": { + "$type": "PersistentIdComponentSaveData", + "PersistentId": "{4A8567AB-9A67-4125-A703-18F42A301860}" + } + } + } + }, + { + "Key": { + "id": 8693826632978 + }, + "Value": { + "ComponentData": { + "{24CB38BB-1705-4EC5-8F63-B574571B4DCD}": { + "$type": "NodeSaveData" + }, + "{328FF15C-C302-458F-A43D-E1794DE0904E}": { + "$type": "GeneralNodeTitleComponentSaveData", + "PaletteOverride": "MethodNodeTitlePalette" + }, + "{7CC444B1-F9B3-41B5-841B-0C4F2179F111}": { + "$type": "GeometrySaveData", + "Position": [ + -200.0, + 300.0 + ] + }, + "{B0B99C8A-03AF-4CF6-A926-F65C874C3D97}": { + "$type": "StylingComponentSaveData", + "SubStyle": ".method" + }, + "{B1F49A35-8408-40DA-B79E-F1E3B64322CE}": { + "$type": "PersistentIdComponentSaveData", + "PersistentId": "{C8023DDA-EC97-47D0-B8DA-B4A5D4F2FAB6}" + } + } + } + }, + { + "Key": { + "id": 8698121600274 + }, + "Value": { + "ComponentData": { + "{24CB38BB-1705-4EC5-8F63-B574571B4DCD}": { + "$type": "NodeSaveData" + }, + "{328FF15C-C302-458F-A43D-E1794DE0904E}": { + "$type": "GeneralNodeTitleComponentSaveData", + "PaletteOverride": "MethodNodeTitlePalette" + }, + "{7CC444B1-F9B3-41B5-841B-0C4F2179F111}": { + "$type": "GeometrySaveData", + "Position": [ + 940.0, + 300.0 + ] + }, + "{B0B99C8A-03AF-4CF6-A926-F65C874C3D97}": { + "$type": "StylingComponentSaveData", + "SubStyle": ".method" + }, + "{B1F49A35-8408-40DA-B79E-F1E3B64322CE}": { + "$type": "PersistentIdComponentSaveData", + "PersistentId": "{71F03C63-D5DA-44ED-8295-98753174CF45}" + } + } + } + }, + { + "Key": { + "id": 8702416567570 + }, + "Value": { + "ComponentData": { + "{24CB38BB-1705-4EC5-8F63-B574571B4DCD}": { + "$type": "NodeSaveData" + }, + "{328FF15C-C302-458F-A43D-E1794DE0904E}": { + "$type": "GeneralNodeTitleComponentSaveData", + "PaletteOverride": "MethodNodeTitlePalette" + }, + "{7CC444B1-F9B3-41B5-841B-0C4F2179F111}": { + "$type": "GeometrySaveData", + "Position": [ + 1440.0, + 320.0 + ] + }, + "{B0B99C8A-03AF-4CF6-A926-F65C874C3D97}": { + "$type": "StylingComponentSaveData", + "SubStyle": ".method" + }, + "{B1F49A35-8408-40DA-B79E-F1E3B64322CE}": { + "$type": "PersistentIdComponentSaveData", + "PersistentId": "{C25726FB-502F-4D29-8F8F-704F4C7EA764}" + } + } + } + }, + { + "Key": { + "id": 8706711534866 + }, + "Value": { + "ComponentData": { + "{24CB38BB-1705-4EC5-8F63-B574571B4DCD}": { + "$type": "NodeSaveData" + }, + "{328FF15C-C302-458F-A43D-E1794DE0904E}": { + "$type": "GeneralNodeTitleComponentSaveData", + "PaletteOverride": "TimeNodeTitlePalette" + }, + "{7CC444B1-F9B3-41B5-841B-0C4F2179F111}": { + "$type": "GeometrySaveData", + "Position": [ + -520.0, + 300.0 + ] + }, + "{B0B99C8A-03AF-4CF6-A926-F65C874C3D97}": { + "$type": "StylingComponentSaveData" + }, + "{B1F49A35-8408-40DA-B79E-F1E3B64322CE}": { + "$type": "PersistentIdComponentSaveData", + "PersistentId": "{CA58C4FF-B941-42C6-94F2-5FB4E7E879E2}" + } + } + } + } + ], + "StatisticsHelper": { + "InstanceCounter": [ + { + "Key": 4199610336680704683, + "Value": 1 + }, + { + "Key": 6462358712820489356, + "Value": 1 + }, + { + "Key": 13774516226110902316, + "Value": 1 + }, + { + "Key": 13774516349808062548, + "Value": 3 + }, + { + "Key": 13774516555687402408, + "Value": 1 + }, + { + "Key": 16812277148590053560, + "Value": 1 + } + ] + } + }, + "Component_[7390341204452664972]": { + "$type": "EditorGraphVariableManagerComponent", + "Id": 7390341204452664972 + } + } + } + } +} \ No newline at end of file diff --git a/AutomatedTesting/ScriptCanvas/C6224408_ScriptCanvas_EntitySpawn.scriptcanvas b/AutomatedTesting/ScriptCanvas/ScriptCanvas_SpawnEntityWithPhysComponents.scriptcanvas similarity index 99% rename from AutomatedTesting/ScriptCanvas/C6224408_ScriptCanvas_EntitySpawn.scriptcanvas rename to AutomatedTesting/ScriptCanvas/ScriptCanvas_SpawnEntityWithPhysComponents.scriptcanvas index 73dd8c887b..fda9e1f78f 100644 --- a/AutomatedTesting/ScriptCanvas/C6224408_ScriptCanvas_EntitySpawn.scriptcanvas +++ b/AutomatedTesting/ScriptCanvas/ScriptCanvas_SpawnEntityWithPhysComponents.scriptcanvas @@ -5,7 +5,7 @@ - + diff --git a/CMakeLists.txt b/CMakeLists.txt index 7a668af6a1..43b0dd240e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -132,7 +132,7 @@ ly_delayed_generate_runtime_dependencies() ly_test_impact_post_step() # 7. Generate the O3DE find file and setup install locations for scripts, tools, assets etc., required by the engine -if(NOT INSTALLED_ENGINE) +if(LY_INSTALL_ENABLED) # 8. Generate the O3DE find file and setup install locations for scripts, tools, assets etc., required by the engine ly_setup_o3de_install() # 9. CPack information (to be included after install) diff --git a/Code/Editor/Controls/ConsoleSCB.cpp b/Code/Editor/Controls/ConsoleSCB.cpp index 6b12348880..4997fa4bec 100644 --- a/Code/Editor/Controls/ConsoleSCB.cpp +++ b/Code/Editor/Controls/ConsoleSCB.cpp @@ -421,9 +421,6 @@ void CConsoleSCB::RefreshStyle() m_colorTable[6] = QColor(0xff, 0xaa, 0x22); // Warning (Yellow) } - m_colorTable[0] = textColor; - m_colorTable[1] = textColor; - const bool uiAndDark = !GetIEditor()->IsInConsolewMode() && CConsoleSCB::GetCreatedInstance() && m_backgroundTheme == AzToolsFramework::ConsoleColorTheme::Dark; QColor bgColor; @@ -435,8 +432,13 @@ void CConsoleSCB::RefreshStyle() else { bgColor = Qt::white; + textColor = Qt::black; AzQtComponents::ScrollBar::applyDarkStyle(ui->textEdit); } + + m_colorTable[0] = textColor; + m_colorTable[1] = textColor; + ui->textEdit->setBackgroundVisible(!uiAndDark); ui->textEdit->setStyleSheet(uiAndDark ? QString() : QString("QPlainTextEdit{ background: %1 }").arg(bgColor.name(QColor::HexRgb))); diff --git a/Code/Editor/EditorPreferencesDialog.cpp b/Code/Editor/EditorPreferencesDialog.cpp index c3fc4139f6..c56df15908 100644 --- a/Code/Editor/EditorPreferencesDialog.cpp +++ b/Code/Editor/EditorPreferencesDialog.cpp @@ -27,8 +27,8 @@ #include "EditorPreferencesPageGeneral.h" #include "EditorPreferencesPageFiles.h" #include "EditorPreferencesPageViewportGeneral.h" -#include "EditorPreferencesPageViewportGizmo.h" -#include "EditorPreferencesPageViewportMovement.h" +#include "EditorPreferencesPageViewportManipulator.h" +#include "EditorPreferencesPageViewportCamera.h" #include "EditorPreferencesPageViewportDebug.h" #include "EditorPreferencesPageExperimentalLighting.h" #include "EditorPreferencesPageAWS.h" @@ -65,8 +65,8 @@ EditorPreferencesDialog::EditorPreferencesDialog(QWidget* pParent) CEditorPreferencesPage_General::Reflect(*serializeContext); CEditorPreferencesPage_Files::Reflect(*serializeContext); CEditorPreferencesPage_ViewportGeneral::Reflect(*serializeContext); - CEditorPreferencesPage_ViewportGizmo::Reflect(*serializeContext); - CEditorPreferencesPage_ViewportMovement::Reflect(*serializeContext); + CEditorPreferencesPage_ViewportManipulator::Reflect(*serializeContext); + CEditorPreferencesPage_ViewportCamera::Reflect(*serializeContext); CEditorPreferencesPage_ViewportDebug::Reflect(*serializeContext); CEditorPreferencesPage_ExperimentalLighting::Reflect(*serializeContext); CEditorPreferencesPage_AWS::Reflect(*serializeContext); diff --git a/Code/Editor/EditorPreferencesPageViewportMovement.cpp b/Code/Editor/EditorPreferencesPageViewportCamera.cpp similarity index 91% rename from Code/Editor/EditorPreferencesPageViewportMovement.cpp rename to Code/Editor/EditorPreferencesPageViewportCamera.cpp index 74abb3f207..368d2769f8 100644 --- a/Code/Editor/EditorPreferencesPageViewportMovement.cpp +++ b/Code/Editor/EditorPreferencesPageViewportCamera.cpp @@ -8,7 +8,7 @@ #include "EditorDefs.h" -#include "EditorPreferencesPageViewportMovement.h" +#include "EditorPreferencesPageViewportCamera.h" #include #include @@ -58,7 +58,7 @@ static AZStd::vector GetEditorInputNames() return inputNames; } -void CEditorPreferencesPage_ViewportMovement::Reflect(AZ::SerializeContext& serialize) +void CEditorPreferencesPage_ViewportCamera::Reflect(AZ::SerializeContext& serialize) { serialize.Class() ->Version(2) @@ -93,36 +93,37 @@ void CEditorPreferencesPage_ViewportMovement::Reflect(AZ::SerializeContext& seri ->Field("OrbitDolly", &CameraInputSettings::m_orbitDollyChannelId) ->Field("OrbitPan", &CameraInputSettings::m_orbitPanChannelId); - serialize.Class() + serialize.Class() ->Version(1) - ->Field("CameraMovementSettings", &CEditorPreferencesPage_ViewportMovement::m_cameraMovementSettings) - ->Field("CameraInputSettings", &CEditorPreferencesPage_ViewportMovement::m_cameraInputSettings); + ->Field("CameraMovementSettings", &CEditorPreferencesPage_ViewportCamera::m_cameraMovementSettings) + ->Field("CameraInputSettings", &CEditorPreferencesPage_ViewportCamera::m_cameraInputSettings); if (AZ::EditContext* editContext = serialize.GetEditContext()) { + const float minValue = 0.0001f; editContext->Class("Camera Movement Settings", "") ->DataElement( AZ::Edit::UIHandlers::SpinBox, &CameraMovementSettings::m_translateSpeed, "Camera Movement Speed", "Camera movement speed") - ->Attribute(AZ::Edit::Attributes::Min, 0.01f) + ->Attribute(AZ::Edit::Attributes::Min, minValue) ->DataElement( AZ::Edit::UIHandlers::SpinBox, &CameraMovementSettings::m_rotateSpeed, "Camera Rotation Speed", "Camera rotation speed") - ->Attribute(AZ::Edit::Attributes::Min, 0.01f) + ->Attribute(AZ::Edit::Attributes::Min, minValue) ->DataElement( AZ::Edit::UIHandlers::SpinBox, &CameraMovementSettings::m_boostMultiplier, "Camera Boost Multiplier", "Camera boost multiplier to apply to movement speed") - ->Attribute(AZ::Edit::Attributes::Min, 0.01f) + ->Attribute(AZ::Edit::Attributes::Min, minValue) ->DataElement( AZ::Edit::UIHandlers::SpinBox, &CameraMovementSettings::m_scrollSpeed, "Camera Scroll Speed", "Camera movement speed while using scroll/wheel input") - ->Attribute(AZ::Edit::Attributes::Min, 0.01f) + ->Attribute(AZ::Edit::Attributes::Min, minValue) ->DataElement( AZ::Edit::UIHandlers::SpinBox, &CameraMovementSettings::m_dollySpeed, "Camera Dolly Speed", "Camera movement speed while using mouse motion to move in and out") - ->Attribute(AZ::Edit::Attributes::Min, 0.01f) + ->Attribute(AZ::Edit::Attributes::Min, minValue) ->DataElement( AZ::Edit::UIHandlers::SpinBox, &CameraMovementSettings::m_panSpeed, "Camera Pan Speed", "Camera movement speed while panning using the mouse") - ->Attribute(AZ::Edit::Attributes::Min, 0.01f) + ->Attribute(AZ::Edit::Attributes::Min, minValue) ->DataElement( AZ::Edit::UIHandlers::CheckBox, &CameraMovementSettings::m_rotateSmoothing, "Camera Rotate Smoothing", "Is camera rotation smoothing enabled or disabled") @@ -130,7 +131,7 @@ void CEditorPreferencesPage_ViewportMovement::Reflect(AZ::SerializeContext& seri ->DataElement( AZ::Edit::UIHandlers::SpinBox, &CameraMovementSettings::m_rotateSmoothness, "Camera Rotate Smoothness", "Amount of camera smoothing to apply while rotating the camera") - ->Attribute(AZ::Edit::Attributes::Min, 0.01f) + ->Attribute(AZ::Edit::Attributes::Min, minValue) ->Attribute(AZ::Edit::Attributes::Visibility, &CameraMovementSettings::RotateSmoothingVisibility) ->DataElement( AZ::Edit::UIHandlers::CheckBox, &CameraMovementSettings::m_translateSmoothing, "Camera Translate Smoothing", @@ -139,7 +140,7 @@ void CEditorPreferencesPage_ViewportMovement::Reflect(AZ::SerializeContext& seri ->DataElement( AZ::Edit::UIHandlers::SpinBox, &CameraMovementSettings::m_translateSmoothness, "Camera Translate Smoothness", "Amount of camera smoothing to apply while translating the camera") - ->Attribute(AZ::Edit::Attributes::Min, 0.01f) + ->Attribute(AZ::Edit::Attributes::Min, minValue) ->Attribute(AZ::Edit::Attributes::Visibility, &CameraMovementSettings::TranslateSmoothingVisibility) ->DataElement( AZ::Edit::UIHandlers::CheckBox, &CameraMovementSettings::m_orbitYawRotationInverted, "Camera Orbit Yaw Inverted", @@ -207,35 +208,50 @@ void CEditorPreferencesPage_ViewportMovement::Reflect(AZ::SerializeContext& seri "Key/button to begin camera orbit pan") ->Attribute(AZ::Edit::Attributes::StringList, &GetEditorInputNames); - editContext->Class("Viewport Preferences", "Viewport Preferences") + editContext->Class("Viewport Preferences", "Viewport Preferences") ->ClassElement(AZ::Edit::ClassElements::EditorData, "") ->Attribute(AZ::Edit::Attributes::Visibility, AZ_CRC("PropertyVisibility_ShowChildrenOnly", 0xef428f20)) ->DataElement( - AZ::Edit::UIHandlers::Default, &CEditorPreferencesPage_ViewportMovement::m_cameraMovementSettings, + AZ::Edit::UIHandlers::Default, &CEditorPreferencesPage_ViewportCamera::m_cameraMovementSettings, "Camera Movement Settings", "Camera Movement Settings") ->DataElement( - AZ::Edit::UIHandlers::Default, &CEditorPreferencesPage_ViewportMovement::m_cameraInputSettings, "Camera Input Settings", + AZ::Edit::UIHandlers::Default, &CEditorPreferencesPage_ViewportCamera::m_cameraInputSettings, "Camera Input Settings", "Camera Input Settings"); } } -CEditorPreferencesPage_ViewportMovement::CEditorPreferencesPage_ViewportMovement() +CEditorPreferencesPage_ViewportCamera::CEditorPreferencesPage_ViewportCamera() { InitializeSettings(); m_icon = QIcon(":/res/Camera.svg"); } -const char* CEditorPreferencesPage_ViewportMovement::GetTitle() +const char* CEditorPreferencesPage_ViewportCamera::GetCategory() +{ + return "Viewports"; +} + +const char* CEditorPreferencesPage_ViewportCamera::GetTitle() { return "Camera"; } -QIcon& CEditorPreferencesPage_ViewportMovement::GetIcon() +QIcon& CEditorPreferencesPage_ViewportCamera::GetIcon() { return m_icon; } -void CEditorPreferencesPage_ViewportMovement::OnApply() +void CEditorPreferencesPage_ViewportCamera::OnCancel() +{ + // noop +} + +bool CEditorPreferencesPage_ViewportCamera::OnQueryCancel() +{ + return true; +} + +void CEditorPreferencesPage_ViewportCamera::OnApply() { SandboxEditor::SetCameraTranslateSpeed(m_cameraMovementSettings.m_translateSpeed); SandboxEditor::SetCameraRotateSpeed(m_cameraMovementSettings.m_rotateSpeed); @@ -270,7 +286,7 @@ void CEditorPreferencesPage_ViewportMovement::OnApply() &SandboxEditor::EditorModularViewportCameraComposerNotificationBus::Events::OnEditorModularViewportCameraComposerSettingsChanged); } -void CEditorPreferencesPage_ViewportMovement::InitializeSettings() +void CEditorPreferencesPage_ViewportCamera::InitializeSettings() { m_cameraMovementSettings.m_translateSpeed = SandboxEditor::CameraTranslateSpeed(); m_cameraMovementSettings.m_rotateSpeed = SandboxEditor::CameraRotateSpeed(); diff --git a/Code/Editor/EditorPreferencesPageViewportMovement.h b/Code/Editor/EditorPreferencesPageViewportCamera.h similarity index 79% rename from Code/Editor/EditorPreferencesPageViewportMovement.h rename to Code/Editor/EditorPreferencesPageViewportCamera.h index b7482fb048..31a728599f 100644 --- a/Code/Editor/EditorPreferencesPageViewportMovement.h +++ b/Code/Editor/EditorPreferencesPageViewportCamera.h @@ -19,32 +19,22 @@ inline AZ::Crc32 EditorPropertyVisibility(const bool enabled) return enabled ? AZ::Edit::PropertyVisibility::Show : AZ::Edit::PropertyVisibility::Hide; } -class CEditorPreferencesPage_ViewportMovement : public IPreferencesPage +class CEditorPreferencesPage_ViewportCamera : public IPreferencesPage { public: - AZ_RTTI(CEditorPreferencesPage_ViewportMovement, "{BC593332-7EAF-4171-8A35-1C5DE5B40909}", IPreferencesPage) + AZ_RTTI(CEditorPreferencesPage_ViewportCamera, "{BC593332-7EAF-4171-8A35-1C5DE5B40909}", IPreferencesPage) static void Reflect(AZ::SerializeContext& serialize); - CEditorPreferencesPage_ViewportMovement(); - virtual ~CEditorPreferencesPage_ViewportMovement() = default; + CEditorPreferencesPage_ViewportCamera(); + virtual ~CEditorPreferencesPage_ViewportCamera() = default; - virtual const char* GetCategory() override - { - return "Viewports"; - } - - virtual const char* GetTitle(); - virtual QIcon& GetIcon() override; - virtual void OnApply() override; - virtual void OnCancel() override - { - } - - virtual bool OnQueryCancel() override - { - return true; - } + const char* GetCategory() override; + const char* GetTitle() override; + QIcon& GetIcon() override; + void OnApply() override; + void OnCancel() override; + bool OnQueryCancel() override; private: void InitializeSettings(); diff --git a/Code/Editor/EditorPreferencesPageViewportGizmo.cpp b/Code/Editor/EditorPreferencesPageViewportGizmo.cpp deleted file mode 100644 index 90129bb6a5..0000000000 --- a/Code/Editor/EditorPreferencesPageViewportGizmo.cpp +++ /dev/null @@ -1,100 +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 "EditorPreferencesPageViewportGizmo.h" - -// Editor -#include "Settings.h" - - -void CEditorPreferencesPage_ViewportGizmo::Reflect(AZ::SerializeContext& serialize) -{ - serialize.Class() - ->Version(1) - ->Field("Size", &AxisGizmo::m_size) - ->Field("Text", &AxisGizmo::m_text) - ->Field("MaxCount", &AxisGizmo::m_maxCount); - - serialize.Class() - ->Version(1) - ->Field("LabelsOn", &Helpers::m_helpersGlobalScale) - ->Field("LabelsOn", &Helpers::m_tagpointScaleMulti) - ->Field("LabelsOn", &Helpers::m_rulerSphereScale) - ->Field("LabelsDistance", &Helpers::m_rulerSphereTrans); - - serialize.Class() - ->Version(1) - ->Field("Axis Gizmo", &CEditorPreferencesPage_ViewportGizmo::m_axisGizmo) - ->Field("Helpers", &CEditorPreferencesPage_ViewportGizmo::m_helpers); - - AZ::EditContext* editContext = serialize.GetEditContext(); - if (editContext) - { - editContext->Class("Axis Gizmo", "") - ->DataElement(AZ::Edit::UIHandlers::SpinBox, &AxisGizmo::m_size, "Size", "Axis Gizmo Size") - ->DataElement(AZ::Edit::UIHandlers::CheckBox, &AxisGizmo::m_text, "Text Labels", "Text Labels on Axis Gizmo") - ->DataElement(AZ::Edit::UIHandlers::SpinBox, &AxisGizmo::m_maxCount, "Max Count", "Max Count of Axis Gizmos"); - - editContext->Class("Helpers", "") - ->DataElement(AZ::Edit::UIHandlers::SpinBox, &Helpers::m_helpersGlobalScale, "Helpers Scale", "Helpers Scale") - ->Attribute(AZ::Edit::Attributes::Min, 0.01f) - ->Attribute(AZ::Edit::Attributes::Max, 100.0f) - ->DataElement(AZ::Edit::UIHandlers::SpinBox, &Helpers::m_tagpointScaleMulti, "Tagpoint Scale Multiplier", "Tagpoint Scale Multiplier") - ->Attribute(AZ::Edit::Attributes::Min, 0.01f) - ->Attribute(AZ::Edit::Attributes::Max, 100.0f) - ->DataElement(AZ::Edit::UIHandlers::SpinBox, &Helpers::m_rulerSphereScale, "Ruler Sphere Scale", "Ruler Sphere Scale") - ->Attribute(AZ::Edit::Attributes::Min, 0.1f) - ->Attribute(AZ::Edit::Attributes::Max, 100.0f) - ->Attribute(AZ::Edit::Attributes::Step, 0.1f) - ->DataElement(AZ::Edit::UIHandlers::SpinBox, &Helpers::m_rulerSphereTrans, "Ruler Sphere Transparency", "Ruler Sphere Transparency") - ->Attribute(AZ::Edit::Attributes::Min, 0.01f) - ->Attribute(AZ::Edit::Attributes::Max, 100.0f); - - editContext->Class("Gizmo Viewport Preferences", "Gizmo Viewport Preferences") - ->ClassElement(AZ::Edit::ClassElements::EditorData, "") - ->Attribute(AZ::Edit::Attributes::Visibility, AZ_CRC("PropertyVisibility_ShowChildrenOnly", 0xef428f20)) - ->DataElement(AZ::Edit::UIHandlers::Default, &CEditorPreferencesPage_ViewportGizmo::m_axisGizmo, "Axis Gizmo", "Axis Gizmo") - ->DataElement(AZ::Edit::UIHandlers::Default, &CEditorPreferencesPage_ViewportGizmo::m_helpers, "Helpers", "Helpers"); - } -} - -CEditorPreferencesPage_ViewportGizmo::CEditorPreferencesPage_ViewportGizmo() -{ - InitializeSettings(); - m_icon = QIcon(":/res/Gizmos.svg"); -} - -QIcon& CEditorPreferencesPage_ViewportGizmo::GetIcon() -{ - return m_icon; -} - -void CEditorPreferencesPage_ViewportGizmo::OnApply() -{ - gSettings.gizmo.axisGizmoSize = m_axisGizmo.m_size; - gSettings.gizmo.axisGizmoText = m_axisGizmo.m_text; - gSettings.gizmo.axisGizmoMaxCount = m_axisGizmo.m_maxCount; - - gSettings.gizmo.helpersScale = m_helpers.m_helpersGlobalScale; - gSettings.gizmo.tagpointScaleMulti = m_helpers.m_tagpointScaleMulti; - gSettings.gizmo.rulerSphereScale = m_helpers.m_rulerSphereScale; - gSettings.gizmo.rulerSphereTrans = m_helpers.m_rulerSphereTrans; -} - -void CEditorPreferencesPage_ViewportGizmo::InitializeSettings() -{ - m_axisGizmo.m_size = gSettings.gizmo.axisGizmoSize; - m_axisGizmo.m_text = gSettings.gizmo.axisGizmoText; - m_axisGizmo.m_maxCount = gSettings.gizmo.axisGizmoMaxCount; - - m_helpers.m_helpersGlobalScale = gSettings.gizmo.helpersScale; - m_helpers.m_tagpointScaleMulti = gSettings.gizmo.tagpointScaleMulti; - m_helpers.m_rulerSphereScale = gSettings.gizmo.rulerSphereScale; - m_helpers.m_rulerSphereTrans = gSettings.gizmo.rulerSphereTrans; -} diff --git a/Code/Editor/EditorPreferencesPageViewportGizmo.h b/Code/Editor/EditorPreferencesPageViewportGizmo.h deleted file mode 100644 index 1534e5f51e..0000000000 --- a/Code/Editor/EditorPreferencesPageViewportGizmo.h +++ /dev/null @@ -1,63 +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/IPreferencesPage.h" -#include -#include -#include -#include -#include - - -class CEditorPreferencesPage_ViewportGizmo - : public IPreferencesPage -{ -public: - AZ_RTTI(CEditorPreferencesPage_ViewportGizmo, "{14433511-8175-4348-954E-82D903475B06}", IPreferencesPage) - - static void Reflect(AZ::SerializeContext& serialize); - - CEditorPreferencesPage_ViewportGizmo(); - virtual ~CEditorPreferencesPage_ViewportGizmo() = default; - - virtual const char* GetCategory() override { return "Viewports"; } - virtual const char* GetTitle() override { return "Gizmos"; } - virtual QIcon& GetIcon() override; - virtual void OnApply() override; - virtual void OnCancel() override {} - virtual bool OnQueryCancel() override { return true; } - -private: - void InitializeSettings(); - - struct AxisGizmo - { - AZ_TYPE_INFO(AxisGizmo, "{7D90D60E-996B-4F54-8748-B26EFA781EE2}") - - float m_size; - bool m_text; - int m_maxCount; - }; - - struct Helpers - { - AZ_TYPE_INFO(Helpers, "{EC99922E-F61C-4AA0-9A51-630E09AB55AA}") - - float m_helpersGlobalScale; - float m_tagpointScaleMulti; - float m_rulerSphereScale; - float m_rulerSphereTrans; - }; - - AxisGizmo m_axisGizmo; - Helpers m_helpers; - QIcon m_icon; -}; - - diff --git a/Code/Editor/EditorPreferencesPageViewportManipulator.cpp b/Code/Editor/EditorPreferencesPageViewportManipulator.cpp new file mode 100644 index 0000000000..ea00d6a7f0 --- /dev/null +++ b/Code/Editor/EditorPreferencesPageViewportManipulator.cpp @@ -0,0 +1,91 @@ +/* + * 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 "EditorPreferencesPageViewportManipulator.h" + +// Editor +#include "EditorViewportSettings.h" +#include "Settings.h" + +void CEditorPreferencesPage_ViewportManipulator::Reflect(AZ::SerializeContext& serialize) +{ + serialize.Class() + ->Version(1) + ->Field("LineBoundWidth", &Manipulators::m_manipulatorLineBoundWidth) + ->Field("CircleBoundWidth", &Manipulators::m_manipulatorCircleBoundWidth); + + serialize.Class()->Version(2)->Field( + "Manipulators", &CEditorPreferencesPage_ViewportManipulator::m_manipulators); + + if (AZ::EditContext* editContext = serialize.GetEditContext()) + { + editContext->Class("Manipulators", "") + ->DataElement( + AZ::Edit::UIHandlers::SpinBox, &Manipulators::m_manipulatorLineBoundWidth, "Line Bound Width", + "Manipulator Line Bound Width") + ->Attribute(AZ::Edit::Attributes::Min, 0.001f) + ->Attribute(AZ::Edit::Attributes::Max, 2.0f) + ->DataElement( + AZ::Edit::UIHandlers::SpinBox, &Manipulators::m_manipulatorCircleBoundWidth, "Circle Bound Width", + "Manipulator Circle Bound Width") + ->Attribute(AZ::Edit::Attributes::Min, 0.001f) + ->Attribute(AZ::Edit::Attributes::Max, 2.0f); + + editContext + ->Class("Manipulator Viewport Preferences", "Manipulator Viewport Preferences") + ->ClassElement(AZ::Edit::ClassElements::EditorData, "") + ->Attribute(AZ::Edit::Attributes::Visibility, AZ_CRC("PropertyVisibility_ShowChildrenOnly", 0xef428f20)) + ->DataElement( + AZ::Edit::UIHandlers::Default, &CEditorPreferencesPage_ViewportManipulator::m_manipulators, "Manipulators", "Manipulators"); + } +} + +CEditorPreferencesPage_ViewportManipulator::CEditorPreferencesPage_ViewportManipulator() +{ + InitializeSettings(); + m_icon = QIcon(":/res/Gizmos.svg"); +} + +const char* CEditorPreferencesPage_ViewportManipulator::GetCategory() +{ + return "Viewports"; +} + +const char* CEditorPreferencesPage_ViewportManipulator::GetTitle() +{ + return "Manipulators"; +} + +QIcon& CEditorPreferencesPage_ViewportManipulator::GetIcon() +{ + return m_icon; +} + +void CEditorPreferencesPage_ViewportManipulator::OnCancel() +{ + // noop +} + +bool CEditorPreferencesPage_ViewportManipulator::OnQueryCancel() +{ + return true; +} + +void CEditorPreferencesPage_ViewportManipulator::OnApply() +{ + SandboxEditor::SetManipulatorLineBoundWidth(m_manipulators.m_manipulatorLineBoundWidth); + SandboxEditor::SetManipulatorCircleBoundWidth(m_manipulators.m_manipulatorCircleBoundWidth); +} + +void CEditorPreferencesPage_ViewportManipulator::InitializeSettings() +{ + m_manipulators.m_manipulatorLineBoundWidth = SandboxEditor::ManipulatorLineBoundWidth(); + m_manipulators.m_manipulatorCircleBoundWidth = SandboxEditor::ManipulatorCircleBoundWidth(); +} diff --git a/Code/Editor/EditorPreferencesPageViewportManipulator.h b/Code/Editor/EditorPreferencesPageViewportManipulator.h new file mode 100644 index 0000000000..93db6a7035 --- /dev/null +++ b/Code/Editor/EditorPreferencesPageViewportManipulator.h @@ -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 + * + */ + +#pragma once + +#include "Include/IPreferencesPage.h" +#include +#include +#include +#include +#include + +class CEditorPreferencesPage_ViewportManipulator : public IPreferencesPage +{ +public: + AZ_RTTI(CEditorPreferencesPage_ViewportManipulator, "{14433511-8175-4348-954E-82D903475B06}", IPreferencesPage) + + static void Reflect(AZ::SerializeContext& serialize); + + CEditorPreferencesPage_ViewportManipulator(); + virtual ~CEditorPreferencesPage_ViewportManipulator() = default; + + const char* GetCategory() override; + const char* GetTitle() override; + QIcon& GetIcon() override; + void OnApply() override; + void OnCancel() override; + bool OnQueryCancel() override; + +private: + void InitializeSettings(); + + struct Manipulators + { + AZ_TYPE_INFO(Manipulators, "{2974439C-4839-41F6-B526-F317999B9DB9}") + + float m_manipulatorLineBoundWidth = 0.0f; + float m_manipulatorCircleBoundWidth = 0.0f; + }; + + Manipulators m_manipulators; + QIcon m_icon; +}; diff --git a/Code/Editor/EditorViewportSettings.cpp b/Code/Editor/EditorViewportSettings.cpp index 872454412d..c1bd85a174 100644 --- a/Code/Editor/EditorViewportSettings.cpp +++ b/Code/Editor/EditorViewportSettings.cpp @@ -20,6 +20,8 @@ namespace SandboxEditor constexpr AZStd::string_view AngleSnappingSetting = "/Amazon/Preferences/Editor/AngleSnapping"; constexpr AZStd::string_view AngleSizeSetting = "/Amazon/Preferences/Editor/AngleSize"; constexpr AZStd::string_view ShowGridSetting = "/Amazon/Preferences/Editor/ShowGrid"; + constexpr AZStd::string_view ManipulatorLineBoundWidthSetting = "/Amazon/Preferences/Editor/Manipulator/LineBoundWidth"; + constexpr AZStd::string_view ManipulatorCircleBoundWidthSetting = "/Amazon/Preferences/Editor/Manipulator/CircleBoundWidth"; constexpr AZStd::string_view CameraTranslateSpeedSetting = "/Amazon/Preferences/Editor/Camera/TranslateSpeed"; constexpr AZStd::string_view CameraBoostMultiplierSetting = "/Amazon/Preferences/Editor/Camera/BoostMultiplier"; constexpr AZStd::string_view CameraRotateSpeedSetting = "/Amazon/Preferences/Editor/Camera/RotateSpeed"; @@ -156,6 +158,26 @@ namespace SandboxEditor SetRegistry(ShowGridSetting, showing); } + float ManipulatorLineBoundWidth() + { + return aznumeric_cast(GetRegistry(ManipulatorLineBoundWidthSetting, 0.1)); + } + + void SetManipulatorLineBoundWidth(const float lineBoundWidth) + { + SetRegistry(ManipulatorLineBoundWidthSetting, lineBoundWidth); + } + + float ManipulatorCircleBoundWidth() + { + return aznumeric_cast(GetRegistry(ManipulatorCircleBoundWidthSetting, 0.1)); + } + + void SetManipulatorCircleBoundWidth(const float circleBoundWidth) + { + SetRegistry(ManipulatorCircleBoundWidthSetting, circleBoundWidth); + } + float CameraTranslateSpeed() { return aznumeric_cast(GetRegistry(CameraTranslateSpeedSetting, 10.0)); diff --git a/Code/Editor/EditorViewportSettings.h b/Code/Editor/EditorViewportSettings.h index 3da8c465fb..8aeeee1384 100644 --- a/Code/Editor/EditorViewportSettings.h +++ b/Code/Editor/EditorViewportSettings.h @@ -47,6 +47,12 @@ namespace SandboxEditor SANDBOX_API bool ShowingGrid(); SANDBOX_API void SetShowingGrid(bool showing); + SANDBOX_API float ManipulatorLineBoundWidth(); + SANDBOX_API void SetManipulatorLineBoundWidth(float lineBoundWidth); + + SANDBOX_API float ManipulatorCircleBoundWidth(); + SANDBOX_API void SetManipulatorCircleBoundWidth(float circleBoundWidth); + SANDBOX_API float CameraTranslateSpeed(); SANDBOX_API void SetCameraTranslateSpeed(float speed); diff --git a/Code/Editor/EditorViewportWidget.cpp b/Code/Editor/EditorViewportWidget.cpp index 5294ebbc7e..b33469affb 100644 --- a/Code/Editor/EditorViewportWidget.cpp +++ b/Code/Editor/EditorViewportWidget.cpp @@ -113,18 +113,6 @@ void StartFixedCursorMode(QObject *viewport); #define RENDER_MESH_TEST_DISTANCE (0.2f) #define CURSOR_FONT_HEIGHT 8.0f -//! Viewport settings for the EditorViewportWidget -struct EditorViewportSettings : public AzToolsFramework::ViewportInteraction::ViewportSettings -{ - bool GridSnappingEnabled() const override; - float GridSize() const override; - bool ShowGrid() const override; - bool AngleSnappingEnabled() const override; - float AngleStep() const override; -}; - -static const EditorViewportSettings g_EditorViewportSettings; - namespace AZ::ViewportHelpers { static const char TextCantCreateCameraNoLevel[] = "Cannot create camera when no level is loaded."; @@ -218,6 +206,7 @@ EditorViewportWidget::~EditorViewportWidget() m_pPrimaryViewport = nullptr; } + m_editorViewportSettings.Disconnect(); DisconnectViewportInteractionRequestBus(); m_editorEntityNotifications.reset(); Camera::EditorCameraRequestBus::Handler::BusDisconnect(); @@ -1073,7 +1062,7 @@ void EditorViewportWidget::SetViewportId(int id) m_editorModularViewportCameraComposer = AZStd::make_unique(AzFramework::ViewportId(id)); m_renderViewport->GetControllerList()->Add(m_editorModularViewportCameraComposer->CreateModularViewportCameraController()); - m_renderViewport->SetViewportSettings(&g_EditorViewportSettings); + m_editorViewportSettings.Connect(AzFramework::ViewportId(id)); UpdateScene(); @@ -2534,6 +2523,16 @@ void EditorViewportWidget::SetAsActiveViewport() } } +void EditorViewportSettings::Connect(const AzFramework::ViewportId viewportId) +{ + AzToolsFramework::ViewportInteraction::ViewportSettingsRequestBus::Handler::BusConnect(viewportId); +} + +void EditorViewportSettings::Disconnect() +{ + AzToolsFramework::ViewportInteraction::ViewportSettingsRequestBus::Handler::BusDisconnect(); +} + bool EditorViewportSettings::GridSnappingEnabled() const { return SandboxEditor::GridSnappingEnabled(); @@ -2559,6 +2558,16 @@ float EditorViewportSettings::AngleStep() const return SandboxEditor::AngleSnappingSize(); } +float EditorViewportSettings::ManipulatorLineBoundWidth() const +{ + return SandboxEditor::ManipulatorLineBoundWidth(); +} + +float EditorViewportSettings::ManipulatorCircleBoundWidth() const +{ + return SandboxEditor::ManipulatorCircleBoundWidth(); +} + AZ_CVAR_EXTERNED(bool, ed_previewGameInFullscreen_once); bool EditorViewportWidget::ShouldPreviewFullscreen() const diff --git a/Code/Editor/EditorViewportWidget.h b/Code/Editor/EditorViewportWidget.h index 9da5e3f9a1..5d332ae3f0 100644 --- a/Code/Editor/EditorViewportWidget.h +++ b/Code/Editor/EditorViewportWidget.h @@ -63,6 +63,22 @@ namespace AzToolsFramework class ManipulatorManager; } +//! Viewport settings for the EditorViewportWidget +struct EditorViewportSettings : public AzToolsFramework::ViewportInteraction::ViewportSettingsRequestBus::Handler +{ + void Connect(AzFramework::ViewportId viewportId); + void Disconnect(); + + // ViewportSettingsRequestBus overrides ... + bool GridSnappingEnabled() const override; + float GridSize() const override; + bool ShowGrid() const override; + bool AngleSnappingEnabled() const override; + float AngleStep() const override; + float ManipulatorLineBoundWidth() const override; + float ManipulatorCircleBoundWidth() const override; +}; + // EditorViewportWidget window AZ_PUSH_DISABLE_DLL_EXPORT_BASECLASS_WARNING AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING @@ -338,7 +354,7 @@ private: // Note that any attempts to draw anything with this object will crash. Exists here for legacy "reasons" DisplayContext m_displayContext; - // Re-entrency guard for on paint events + // Reentrancy guard for on paint events bool m_isOnPaint = false; // Shapes of various safe frame helpers which can be displayed in the editor @@ -381,6 +397,9 @@ private: // Atom debug display AzFramework::DebugDisplayRequests* m_debugDisplay = nullptr; + // Type to return current state of editor viewport settings + EditorViewportSettings m_editorViewportSettings; + // The default view created for the viewport context, which is used as the "Editor Camera" AZ::RPI::ViewPtr m_defaultView; diff --git a/Code/Editor/IEditorImpl.cpp b/Code/Editor/IEditorImpl.cpp index 880773966b..c7e6cd8ad6 100644 --- a/Code/Editor/IEditorImpl.cpp +++ b/Code/Editor/IEditorImpl.cpp @@ -680,8 +680,8 @@ const SGizmoParameters& CEditorImpl::GetGlobalGizmoParameters() m_pGizmoParameters->axisConstraint = m_selectedAxis; m_pGizmoParameters->referenceCoordSys = m_refCoordsSys; - m_pGizmoParameters->axisGizmoScale = gSettings.gizmo.axisGizmoSize; - m_pGizmoParameters->axisGizmoText = gSettings.gizmo.axisGizmoText; + m_pGizmoParameters->axisGizmoScale = 1.0f; + m_pGizmoParameters->axisGizmoText = false; return *m_pGizmoParameters; } diff --git a/Code/Editor/Objects/ObjectManager.cpp b/Code/Editor/Objects/ObjectManager.cpp index 9c452ac1ad..30ee1fc57b 100644 --- a/Code/Editor/Objects/ObjectManager.cpp +++ b/Code/Editor/Objects/ObjectManager.cpp @@ -2378,7 +2378,7 @@ void CObjectManager::SetObjectSelected(CBaseObject* pObject, bool bSelect) if (bSelect && !GetIEditor()->GetTransformManipulator()) { - if (CAxisGizmo::GetGlobalAxisGizmoCount() < gSettings.gizmo.axisGizmoMaxCount) + if (CAxisGizmo::GetGlobalAxisGizmoCount() < 1 /*legacy axisGizmoMaxCount*/) { // Create axis gizmo for this object. m_gizmoManager->AddGizmo(new CAxisGizmo(pObject)); diff --git a/Code/Editor/PreferencesStdPages.cpp b/Code/Editor/PreferencesStdPages.cpp index b593541a07..1dd40702a7 100644 --- a/Code/Editor/PreferencesStdPages.cpp +++ b/Code/Editor/PreferencesStdPages.cpp @@ -17,8 +17,8 @@ #include "EditorPreferencesPageGeneral.h" #include "EditorPreferencesPageFiles.h" #include "EditorPreferencesPageViewportGeneral.h" -#include "EditorPreferencesPageViewportGizmo.h" -#include "EditorPreferencesPageViewportMovement.h" +#include "EditorPreferencesPageViewportManipulator.h" +#include "EditorPreferencesPageViewportCamera.h" #include "EditorPreferencesPageViewportDebug.h" #include "EditorPreferencesPageExperimentalLighting.h" #include "EditorPreferencesPageAWS.h" @@ -35,8 +35,8 @@ CStdPreferencesClassDesc::CStdPreferencesClassDesc() [](){ return new CEditorPreferencesPage_General(); }, [](){ return new CEditorPreferencesPage_Files(); }, [](){ return new CEditorPreferencesPage_ViewportGeneral(); }, - [](){ return new CEditorPreferencesPage_ViewportMovement(); }, - [](){ return new CEditorPreferencesPage_ViewportGizmo(); }, + [](){ return new CEditorPreferencesPage_ViewportCamera(); }, + [](){ return new CEditorPreferencesPage_ViewportManipulator(); }, [](){ return new CEditorPreferencesPage_ViewportDebug(); } }; diff --git a/Code/Editor/Settings.cpp b/Code/Editor/Settings.cpp index 94b5668efc..9feb73a811 100644 --- a/Code/Editor/Settings.cpp +++ b/Code/Editor/Settings.cpp @@ -82,7 +82,6 @@ private: namespace { - class QtApplicationListener : public AzToolsFramework::EditorEvents::Bus::Handler { @@ -99,20 +98,8 @@ namespace delete this; } }; - } -////////////////////////////////////////////////////////////////////////// -SGizmoSettings::SGizmoSettings() -{ - axisGizmoSize = 0.2f; - axisGizmoText = true; - axisGizmoMaxCount = 50; - helpersScale = 1.f; - tagpointScaleMulti = 0.5f; - rulerSphereScale = 0.5f; - rulerSphereTrans = 0.5f; -} ////////////////////////////////////////////////////////////////////////// SEditorSettings::SEditorSettings() { @@ -564,18 +551,6 @@ void SEditorSettings::Save() SaveValue("Settings", "ShowScaleWarnings", viewports.bShowScaleWarnings); SaveValue("Settings", "ShowRotationWarnings", viewports.bShowRotationWarnings); - ////////////////////////////////////////////////////////////////////////// - // Gizmos. - ////////////////////////////////////////////////////////////////////////// - SaveValue("Settings", "AxisGizmoSize", gizmo.axisGizmoSize); - SaveValue("Settings", "AxisGizmoText", gizmo.axisGizmoText); - SaveValue("Settings", "AxisGizmoMaxCount", gizmo.axisGizmoMaxCount); - SaveValue("Settings", "HelpersScale", gizmo.helpersScale); - SaveValue("Settings", "TagPointScaleMulti", gizmo.tagpointScaleMulti); - SaveValue("Settings", "RulerSphereScale", gizmo.rulerSphereScale); - SaveValue("Settings", "RulerSphereTrans", gizmo.rulerSphereTrans); - ////////////////////////////////////////////////////////////////////////// - SaveValue("Settings", "TextEditorScript", textEditorForScript); SaveValue("Settings", "TextEditorShaders", textEditorForShaders); SaveValue("Settings", "TextEditorBSpaces", textEditorForBspaces); @@ -769,18 +744,6 @@ void SEditorSettings::Load() LoadValue("Settings", "ShowScaleWarnings", viewports.bShowScaleWarnings); LoadValue("Settings", "ShowRotationWarnings", viewports.bShowRotationWarnings); - ////////////////////////////////////////////////////////////////////////// - // Gizmos. - ////////////////////////////////////////////////////////////////////////// - LoadValue("Settings", "AxisGizmoSize", gizmo.axisGizmoSize); - LoadValue("Settings", "AxisGizmoText", gizmo.axisGizmoText); - LoadValue("Settings", "AxisGizmoMaxCount", gizmo.axisGizmoMaxCount); - LoadValue("Settings", "HelpersScale", gizmo.helpersScale); - LoadValue("Settings", "TagPointScaleMulti", gizmo.tagpointScaleMulti); - LoadValue("Settings", "RulerSphereScale", gizmo.rulerSphereScale); - LoadValue("Settings", "RulerSphereTrans", gizmo.rulerSphereTrans); - ////////////////////////////////////////////////////////////////////////// - LoadValue("Settings", "TextEditorScript", textEditorForScript); LoadValue("Settings", "TextEditorShaders", textEditorForShaders); LoadValue("Settings", "TextEditorBSpaces", textEditorForBspaces); diff --git a/Code/Editor/Settings.h b/Code/Editor/Settings.h index 51931ab955..82f4f11f72 100644 --- a/Code/Editor/Settings.h +++ b/Code/Editor/Settings.h @@ -22,22 +22,6 @@ #include -struct SGizmoSettings -{ - float axisGizmoSize; - bool axisGizmoText; - int axisGizmoMaxCount; - - float helpersScale; - float tagpointScaleMulti; - - // Scale size and transparency for debug spheres when using Ruler tool - float rulerSphereScale; - float rulerSphereTrans; - - SGizmoSettings(); -}; - ////////////////////////////////////////////////////////////////////////// // Settings for snapping in the viewports. ////////////////////////////////////////////////////////////////////////// @@ -381,8 +365,6 @@ AZ_POP_DISABLE_DLL_EXPORT_BASECLASS_WARNING //! Keeps the editor active even if no focus is set int keepEditorActive; - SGizmoSettings gizmo; - // Settings of the snapping. SSnapSettings snap; diff --git a/Code/Editor/editor_lib_files.cmake b/Code/Editor/editor_lib_files.cmake index 24634b245d..031ad26d76 100644 --- a/Code/Editor/editor_lib_files.cmake +++ b/Code/Editor/editor_lib_files.cmake @@ -554,10 +554,10 @@ set(FILES EditorPreferencesPageFiles.cpp EditorPreferencesPageViewportGeneral.h EditorPreferencesPageViewportGeneral.cpp - EditorPreferencesPageViewportGizmo.h - EditorPreferencesPageViewportGizmo.cpp - EditorPreferencesPageViewportMovement.h - EditorPreferencesPageViewportMovement.cpp + EditorPreferencesPageViewportManipulator.h + EditorPreferencesPageViewportManipulator.cpp + EditorPreferencesPageViewportCamera.h + EditorPreferencesPageViewportCamera.cpp EditorPreferencesPageViewportDebug.h EditorPreferencesPageViewportDebug.cpp EditorPreferencesPageExperimentalLighting.h diff --git a/Code/Framework/AzCore/AzCore/Debug/Trace.h b/Code/Framework/AzCore/AzCore/Debug/Trace.h index 26c331e1e4..5cb8c23821 100644 --- a/Code/Framework/AzCore/AzCore/Debug/Trace.h +++ b/Code/Framework/AzCore/AzCore/Debug/Trace.h @@ -278,7 +278,7 @@ namespace AZ #define AZ_Printf(window, ...) AZ::Debug::Trace::Instance().Printf(window, __VA_ARGS__); -#if !defined(RELEASE) || defined(PERFORMANCE_BUILD) +#if !defined(RELEASE) // Unconditional critical error log, enabled up to Performance config #define AZ_Fatal(window, format, ...) AZ::Debug::Trace::Instance().Printf(window, "[FATAL] " format "\n", ##__VA_ARGS__); #define AZ_Crash() AZ::Debug::Trace::Instance().Crash(); diff --git a/Code/Framework/AzCore/AzCore/Math/IntersectSegment.cpp b/Code/Framework/AzCore/AzCore/Math/IntersectSegment.cpp index fa52599c4a..a7a0d5197e 100644 --- a/Code/Framework/AzCore/AzCore/Math/IntersectSegment.cpp +++ b/Code/Framework/AzCore/AzCore/Math/IntersectSegment.cpp @@ -628,7 +628,7 @@ int AZ::Intersect::IntersectRayCappedCylinder( int AZ::Intersect::IntersectRayCone( const Vector3& rayOrigin, const Vector3& rayDir, const Vector3& coneApex, const Vector3& coneDir, float coneHeight, - float coneBaseRaidus, float& t1, float& t2) + float coneBaseRadius, float& t1, float& t2) { // Q = rayOrgin, A = coneApex Vector3 AQ = rayOrigin - coneApex; @@ -646,7 +646,7 @@ int AZ::Intersect::IntersectRayCone( return 0; } - float r2 = coneBaseRaidus * coneBaseRaidus; + float r2 = coneBaseRadius * coneBaseRadius; float h2 = coneHeight * coneHeight; float m2 = m * m; diff --git a/Code/Framework/AzCore/AzCore/Math/IntersectSegment.h b/Code/Framework/AzCore/AzCore/Math/IntersectSegment.h index 3dffb90d7c..df3d5e10fb 100644 --- a/Code/Framework/AzCore/AzCore/Math/IntersectSegment.h +++ b/Code/Framework/AzCore/AzCore/Math/IntersectSegment.h @@ -240,7 +240,7 @@ namespace AZ //! @return The number of intersecting points. int IntersectRayCone( const Vector3& rayOrigin, const Vector3& rayDir, - const Vector3& coneApex, const Vector3& coneDir, float coneHeight, float coneBaseRaidus, + const Vector3& coneApex, const Vector3& coneDir, float coneHeight, float coneBaseRadius, float& t1, float& t2); //! Test intersection between a ray and a plane in 3D. diff --git a/Code/Framework/AzCore/AzCore/RTTI/BehaviorContext.h b/Code/Framework/AzCore/AzCore/RTTI/BehaviorContext.h index ba8808d4d2..b436f5adab 100644 --- a/Code/Framework/AzCore/AzCore/RTTI/BehaviorContext.h +++ b/Code/Framework/AzCore/AzCore/RTTI/BehaviorContext.h @@ -1290,13 +1290,13 @@ namespace AZ const EventArray& GetEvents() const; -#if defined(PERFORMANCE_BUILD) || !defined(_RELEASE) // m_scriptPath is only available in non-Release mode +#if !defined(_RELEASE) // m_scriptPath is only available in non-Release mode AZStd::string m_scriptPath; #endif AZStd::string GetScriptPath() const { -#if defined(PERFORMANCE_BUILD) || !defined(_RELEASE) // m_scriptPath is only available in non-Release mode +#if !defined(_RELEASE) // m_scriptPath is only available in non-Release mode return m_scriptPath; #else return{}; @@ -1305,7 +1305,7 @@ namespace AZ void SetScriptPath(const char* scriptPath) { -#if defined(PERFORMANCE_BUILD) || !defined(_RELEASE) // m_scriptPath is only available in non-Release mode +#if !defined(_RELEASE) // m_scriptPath is only available in non-Release mode m_scriptPath = scriptPath; #else AZ_UNUSED(scriptPath); diff --git a/Code/Framework/AzCore/AzCore/Script/ScriptContext.cpp b/Code/Framework/AzCore/AzCore/Script/ScriptContext.cpp index fb0d12f552..e4e3141c11 100644 --- a/Code/Framework/AzCore/AzCore/Script/ScriptContext.cpp +++ b/Code/Framework/AzCore/AzCore/Script/ScriptContext.cpp @@ -3727,7 +3727,7 @@ LUA_API const Node* lua_getDummyNode() if (m_handler) { -#if defined(PERFORMANCE_BUILD) || !defined(_RELEASE) +#if !defined(_RELEASE) const AZStd::string_view luaString("Lua"); lua_Debug info; for (int level = 0; lua_getstack(m_lua, level, &info); ++level) @@ -3739,7 +3739,7 @@ LUA_API const Node* lua_getDummyNode() break; } } -#endif//defined(PERFORMANCE_BUILD) || !defined(_RELEASE) +#endif BindEvents(scriptTable); diff --git a/Code/Framework/AzCore/CMakeLists.txt b/Code/Framework/AzCore/CMakeLists.txt index eec5b37e03..60c5f50594 100644 --- a/Code/Framework/AzCore/CMakeLists.txt +++ b/Code/Framework/AzCore/CMakeLists.txt @@ -12,10 +12,12 @@ ly_get_list_relative_pal_filename(pal_dir ${CMAKE_CURRENT_LIST_DIR}/Platform/${PAL_PLATFORM_NAME}) ly_get_list_relative_pal_filename(common_dir ${CMAKE_CURRENT_LIST_DIR}/Platform/Common) -if(PAL_TRAIT_PROF_PIX_SUPPORTED AND LY_PIX_ENABLED) - set(LY_PIX_PATH "${LY_3RDPARTY_PATH}/winpixeventruntime" CACHE PATH "Path to the Windows Pix Event Runtime.") - set(AZ_CORE_PIX_BUILD_DEPENDENCIES 3rdParty::pix) - set(AZ_CORE_PIX_BUILD_DEFINES "USE_PIX") +if(PAL_TRAIT_PROF_PIX_SUPPORTED) + set(LY_PIX_ENABLED OFF CACHE BOOL "Enables PIX profiler integration.") + if(LY_PIX_ENABLED) + message(STATUS "PIX found, enabling as profiler") + set(AZ_CORE_PIX_BUILD_DEPENDENCIES 3rdParty::pix) + endif() endif() ly_add_target( @@ -41,9 +43,6 @@ ly_add_target( 3rdParty::zstd 3rdParty::cityhash ${AZ_CORE_PIX_BUILD_DEPENDENCIES} - COMPILE_DEFINITIONS - PUBLIC - ${AZ_CORE_PIX_BUILD_DEFINES} ) ly_add_source_properties( SOURCES diff --git a/Code/Framework/AzCore/Tests/Math/IntersectionTests.cpp b/Code/Framework/AzCore/Tests/Math/IntersectionTests.cpp index 5bebe5e4f2..e8a52f8fba 100644 --- a/Code/Framework/AzCore/Tests/Math/IntersectionTests.cpp +++ b/Code/Framework/AzCore/Tests/Math/IntersectionTests.cpp @@ -609,6 +609,21 @@ namespace UnitTest EXPECT_EQ(hits, 0); } + // replicates a scenario in the Editor using a cone and a pick ray which should have failed but passed + // note: To replicate this, select an entity so the default translation manipulator appears, move very close to the + // entity, hover the mouse over one of the manipulator linear manipulator arrows (cone part) and move the mouse away + // notice the manipulator will remain highlighted as a successful intersection is still reported + TEST(MATH_IntersectRayConeTestEditor, DISABLED_RayConeEditorScenarioTest) + { + auto rayOrigin = Vector3(0.0f, -0.808944702f, 0.0f); + auto rayDir = Vector3(0.301363617f, 0.939044654f, 0.165454566f); + float t1 = 0.0f; + float t2 = 0.0f; + int hits = Intersect::IntersectRayCone( + rayOrigin, rayDir, AZ::Vector3(0.0f, 0.0f, 0.161788940f), AZ::Vector3(0.0f, 0.0f, -1.0f), 0.0453009047, 0.0113252262, t1, t2); + EXPECT_EQ(hits, 0); + } + class MATH_IntersectRayQuadTest : public AllocatorsFixture { diff --git a/Code/Framework/AzFramework/AzFramework/Asset/AssetCatalog.cpp b/Code/Framework/AzFramework/AzFramework/Asset/AssetCatalog.cpp index 3411c06f28..9b1946701c 100644 --- a/Code/Framework/AzFramework/AzFramework/Asset/AssetCatalog.cpp +++ b/Code/Framework/AzFramework/AzFramework/Asset/AssetCatalog.cpp @@ -987,7 +987,7 @@ namespace AzFramework void AssetCatalog::AddCatalogEntry(AZStd::shared_ptr deltaCatalog) { AZStd::lock_guard lock(m_deltaCatalogMutex); -#if defined(PERFORMANCE_BUILD) || !defined(_RELEASE) +#if !defined(_RELEASE) for (const auto& thisElement : m_deltaCatalogList) { if (thisElement == deltaCatalog) @@ -1010,7 +1010,7 @@ namespace AzFramework AZ_Warning("AssetCatalog", false, "Catalog name %p can't be inserted at slot %u", deltaCatalog.get(), catalogIndex); return; } -#if defined(PERFORMANCE_BUILD) || !defined(_RELEASE) +#if !defined(_RELEASE) for (const auto& thisElement : m_deltaCatalogList) { if (thisElement == deltaCatalog) diff --git a/Code/Framework/AzManipulatorTestFramework/Include/AzManipulatorTestFramework/ViewportInteraction.h b/Code/Framework/AzManipulatorTestFramework/Include/AzManipulatorTestFramework/ViewportInteraction.h index 391186114d..b6944e0355 100644 --- a/Code/Framework/AzManipulatorTestFramework/Include/AzManipulatorTestFramework/ViewportInteraction.h +++ b/Code/Framework/AzManipulatorTestFramework/Include/AzManipulatorTestFramework/ViewportInteraction.h @@ -17,14 +17,14 @@ namespace AzManipulatorTestFramework //! Implementation of the viewport interaction model to handle viewport interaction requests. class ViewportInteraction : public ViewportInteractionInterface - , private AzToolsFramework::ViewportInteraction::ViewportInteractionRequestBus::Handler + , public AzToolsFramework::ViewportInteraction::ViewportInteractionRequestBus::Handler + , public AzToolsFramework::ViewportInteraction::ViewportSettingsRequestBus::Handler { public: ViewportInteraction(); ~ViewportInteraction(); - // ViewportInteractionInterface ... - AzFramework::CameraState GetCameraState() override; + // ViewportInteractionInterface overrides ... void SetCameraState(const AzFramework::CameraState& cameraState) override; AzFramework::DebugDisplayRequests& GetDebugDisplay() override; void EnableGridSnaping() override; @@ -34,18 +34,24 @@ namespace AzManipulatorTestFramework void SetGridSize(float size) override; void SetAngularStep(float step) override; int GetViewportId() const override; + + // ViewportInteractionRequestBus overrides ... + AzFramework::CameraState GetCameraState() override; + AzFramework::ScreenPoint ViewportWorldToScreen(const AZ::Vector3& worldPosition); AZStd::optional ViewportScreenToWorld(const AzFramework::ScreenPoint& screenPosition, float depth) override; AZStd::optional ViewportScreenToWorldRay( const AzFramework::ScreenPoint& screenPosition) override; float DeviceScalingFactor() override; - private: - // ViewportInteractionRequestBus ... - bool GridSnappingEnabled(); - float GridSize(); - bool ShowGrid(); - bool AngleSnappingEnabled(); - float AngleStep(); - AzFramework::ScreenPoint ViewportWorldToScreen(const AZ::Vector3& worldPosition); + + // ViewportSettingsRequestBus overrides ... + bool GridSnappingEnabled() const override; + float GridSize() const override; + bool ShowGrid() const override; + bool AngleSnappingEnabled() const override; + float AngleStep() const override; + float ManipulatorLineBoundWidth() const override; + float ManipulatorCircleBoundWidth() const override; + private: AZStd::unique_ptr m_nullDebugDisplayRequests; const int m_viewportId = 1234; // Arbitrary viewport id for manipulator tests diff --git a/Code/Framework/AzManipulatorTestFramework/Source/ViewportInteraction.cpp b/Code/Framework/AzManipulatorTestFramework/Source/ViewportInteraction.cpp index 52d2c10286..0817df3849 100644 --- a/Code/Framework/AzManipulatorTestFramework/Source/ViewportInteraction.cpp +++ b/Code/Framework/AzManipulatorTestFramework/Source/ViewportInteraction.cpp @@ -25,10 +25,12 @@ namespace AzManipulatorTestFramework : m_nullDebugDisplayRequests(AZStd::make_unique()) { AzToolsFramework::ViewportInteraction::ViewportInteractionRequestBus::Handler::BusConnect(m_viewportId); + AzToolsFramework::ViewportInteraction::ViewportSettingsRequestBus::Handler::BusConnect(m_viewportId); } ViewportInteraction::~ViewportInteraction() { + AzToolsFramework::ViewportInteraction::ViewportSettingsRequestBus::Handler::BusDisconnect(); AzToolsFramework::ViewportInteraction::ViewportInteractionRequestBus::Handler::BusDisconnect(); } @@ -37,31 +39,41 @@ namespace AzManipulatorTestFramework return m_cameraState; } - bool ViewportInteraction::GridSnappingEnabled() + bool ViewportInteraction::GridSnappingEnabled() const { return m_gridSnapping; } - float ViewportInteraction::GridSize() + float ViewportInteraction::GridSize() const { return m_gridSize; } - bool ViewportInteraction::ShowGrid() + bool ViewportInteraction::ShowGrid() const { return false; } - bool ViewportInteraction::AngleSnappingEnabled() + bool ViewportInteraction::AngleSnappingEnabled() const { return m_angularSnapping; } - float ViewportInteraction::AngleStep() + float ViewportInteraction::AngleStep() const { return m_angularStep; } + float ViewportInteraction::ManipulatorLineBoundWidth() const + { + return 0.1f; + } + + float ViewportInteraction::ManipulatorCircleBoundWidth() const + { + return 0.1f; + } + AzFramework::ScreenPoint ViewportInteraction::ViewportWorldToScreen(const AZ::Vector3& worldPosition) { return AzFramework::WorldToScreen(worldPosition, m_cameraState); diff --git a/Code/Framework/AzManipulatorTestFramework/Tests/ViewportInteractionTest.cpp b/Code/Framework/AzManipulatorTestFramework/Tests/ViewportInteractionTest.cpp index 05502afa29..f1fba39651 100644 --- a/Code/Framework/AzManipulatorTestFramework/Tests/ViewportInteractionTest.cpp +++ b/Code/Framework/AzManipulatorTestFramework/Tests/ViewportInteractionTest.cpp @@ -49,9 +49,9 @@ namespace UnitTest bool snapping = false; m_viewportInteraction->EnableGridSnaping(); - AzToolsFramework::ViewportInteraction::ViewportInteractionRequestBus::EventResult( + AzToolsFramework::ViewportInteraction::ViewportSettingsRequestBus::EventResult( snapping, m_viewportInteraction->GetViewportId(), - &AzToolsFramework::ViewportInteraction::ViewportInteractionRequestBus::Events::GridSnappingEnabled); + &AzToolsFramework::ViewportInteraction::ViewportSettingsRequestBus::Events::GridSnappingEnabled); EXPECT_TRUE(snapping); } @@ -61,9 +61,9 @@ namespace UnitTest bool snapping = true; m_viewportInteraction->DisableGridSnaping(); - AzToolsFramework::ViewportInteraction::ViewportInteractionRequestBus::EventResult( + AzToolsFramework::ViewportInteraction::ViewportSettingsRequestBus::EventResult( snapping, m_viewportInteraction->GetViewportId(), - &AzToolsFramework::ViewportInteraction::ViewportInteractionRequestBus::Events::GridSnappingEnabled); + &AzToolsFramework::ViewportInteraction::ViewportSettingsRequestBus::Events::GridSnappingEnabled); EXPECT_FALSE(snapping); } @@ -76,9 +76,9 @@ namespace UnitTest m_viewportInteraction->SetGridSize(expectedGridSize); m_viewportInteraction->DisableGridSnaping(); - AzToolsFramework::ViewportInteraction::ViewportInteractionRequestBus::EventResult( + AzToolsFramework::ViewportInteraction::ViewportSettingsRequestBus::EventResult( gridSize, m_viewportInteraction->GetViewportId(), - &AzToolsFramework::ViewportInteraction::ViewportInteractionRequestBus::Events::GridSize); + &AzToolsFramework::ViewportInteraction::ViewportSettingsRequestBus::Events::GridSize); EXPECT_EQ(gridSize, expectedGridSize); } @@ -88,9 +88,9 @@ namespace UnitTest bool snapping = false; m_viewportInteraction->EnableAngularSnaping(); - AzToolsFramework::ViewportInteraction::ViewportInteractionRequestBus::EventResult( + AzToolsFramework::ViewportInteraction::ViewportSettingsRequestBus::EventResult( snapping, m_viewportInteraction->GetViewportId(), - &AzToolsFramework::ViewportInteraction::ViewportInteractionRequestBus::Events::AngleSnappingEnabled); + &AzToolsFramework::ViewportInteraction::ViewportSettingsRequestBus::Events::AngleSnappingEnabled); EXPECT_TRUE(snapping); } @@ -100,9 +100,9 @@ namespace UnitTest bool snapping = true; m_viewportInteraction->DisableAngularSnaping(); - AzToolsFramework::ViewportInteraction::ViewportInteractionRequestBus::EventResult( + AzToolsFramework::ViewportInteraction::ViewportSettingsRequestBus::EventResult( snapping, m_viewportInteraction->GetViewportId(), - &AzToolsFramework::ViewportInteraction::ViewportInteractionRequestBus::Events::AngleSnappingEnabled); + &AzToolsFramework::ViewportInteraction::ViewportSettingsRequestBus::Events::AngleSnappingEnabled); EXPECT_FALSE(snapping); } @@ -114,9 +114,9 @@ namespace UnitTest m_viewportInteraction->SetAngularStep(expectedAngularStep); - AzToolsFramework::ViewportInteraction::ViewportInteractionRequestBus::EventResult( + AzToolsFramework::ViewportInteraction::ViewportSettingsRequestBus::EventResult( angularStep, m_viewportInteraction->GetViewportId(), - &AzToolsFramework::ViewportInteraction::ViewportInteractionRequestBus::Events::AngleStep); + &AzToolsFramework::ViewportInteraction::ViewportSettingsRequestBus::Events::AngleStep); EXPECT_EQ(angularStep, expectedAngularStep); } diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/API/EditorPythonConsoleBus.h b/Code/Framework/AzToolsFramework/AzToolsFramework/API/EditorPythonConsoleBus.h index e6369dc74a..34770c6dfc 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/API/EditorPythonConsoleBus.h +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/API/EditorPythonConsoleBus.h @@ -70,8 +70,12 @@ namespace AzToolsFramework //! Determines if the caller needs to wait for the Python VM to initialize (non-main thread only) virtual void WaitForInitialization() {} - //! Acquires the Python global interpreter lock (GIL) and executed the callback + //! Acquires the Python global interpreter lock (GIL) and execute the callback virtual void ExecuteWithLock(AZStd::function executionCallback) = 0; + + //! Tries to acquire the Python global interpreter lock (GIL) and execute the callback. + //! @return Whether it was able to lock the mutex or not. + virtual bool TryExecuteWithLock(AZStd::function executionCallback) = 0; }; //! A bus to handle post notifications to the console views of Python output diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/EditorVertexSelection.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/EditorVertexSelection.cpp index 81f573672b..af5a9004e3 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/EditorVertexSelection.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/EditorVertexSelection.cpp @@ -226,6 +226,7 @@ namespace AzToolsFramework m_translationManipulator = AZStd::make_shared>( Dimensions(), vertexIndex, vertex, WorldFromLocalWithUniformScale(entityComponentIdPair.GetEntityId()), GetNonUniformScale(entityComponentIdPair.GetEntityId())); + m_translationManipulator->m_manipulator.SetLineBoundWidth(AzToolsFramework::ManipulatorLineBoundWidth()); // setup how the manipulator should look m_manipulatorConfiguratorFn(&m_translationManipulator->m_manipulator); diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/ManipulatorSnapping.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/ManipulatorSnapping.cpp index fdc572ab05..e4f6b3b1ea 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/ManipulatorSnapping.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/ManipulatorSnapping.cpp @@ -137,8 +137,8 @@ namespace AzToolsFramework bool GridSnapping(const int viewportId) { bool snapping = false; - ViewportInteraction::ViewportInteractionRequestBus::EventResult( - snapping, viewportId, &ViewportInteraction::ViewportInteractionRequestBus::Events::GridSnappingEnabled); + ViewportInteraction::ViewportSettingsRequestBus::EventResult( + snapping, viewportId, &ViewportInteraction::ViewportSettingsRequestBus::Events::GridSnappingEnabled); return snapping; } @@ -146,8 +146,8 @@ namespace AzToolsFramework float GridSize(const int viewportId) { float gridSize = 0.0f; - ViewportInteraction::ViewportInteractionRequestBus::EventResult( - gridSize, viewportId, &ViewportInteraction::ViewportInteractionRequestBus::Events::GridSize); + ViewportInteraction::ViewportSettingsRequestBus::EventResult( + gridSize, viewportId, &ViewportInteraction::ViewportSettingsRequestBus::Events::GridSize); return gridSize; } @@ -168,8 +168,8 @@ namespace AzToolsFramework bool AngleSnapping(const int viewportId) { bool snapping = false; - ViewportInteraction::ViewportInteractionRequestBus::EventResult( - snapping, viewportId, &ViewportInteraction::ViewportInteractionRequestBus::Events::AngleSnappingEnabled); + ViewportInteraction::ViewportSettingsRequestBus::EventResult( + snapping, viewportId, &ViewportInteraction::ViewportSettingsRequestBus::Events::AngleSnappingEnabled); return snapping; } @@ -177,8 +177,8 @@ namespace AzToolsFramework float AngleStep(const int viewportId) { float angle = 0.0f; - ViewportInteraction::ViewportInteractionRequestBus::EventResult( - angle, viewportId, &ViewportInteraction::ViewportInteractionRequestBus::Events::AngleStep); + ViewportInteraction::ViewportSettingsRequestBus::EventResult( + angle, viewportId, &ViewportInteraction::ViewportSettingsRequestBus::Events::AngleStep); return angle; } @@ -186,8 +186,8 @@ namespace AzToolsFramework bool ShowingGrid(const int viewportId) { bool show = false; - ViewportInteraction::ViewportInteractionRequestBus::EventResult( - show, viewportId, &ViewportInteraction::ViewportInteractionRequestBus::Events::ShowGrid); + ViewportInteraction::ViewportSettingsRequestBus::EventResult( + show, viewportId, &ViewportInteraction::ViewportSettingsRequestBus::Events::ShowGrid); return show; } diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/ManipulatorView.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/ManipulatorView.cpp index 147b672006..d3c94dc8ab 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/ManipulatorView.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/ManipulatorView.cpp @@ -10,6 +10,7 @@ #include #include +#include #include #include #include @@ -22,6 +23,14 @@ #include #include +AZ_CVAR( + bool, + ed_manipulatorDisplayBoundDebug, + false, + nullptr, + AZ::ConsoleFunctorFlags::Null, + "Display additional debug drawing for manipulator bounds"); + namespace AzToolsFramework { const float g_defaultManipulatorSphereRadius = 0.1f; @@ -118,6 +127,14 @@ namespace AzToolsFramework return quadBound; } + // calculate line in world space (axis and length). + static AZStd::pair CalculateLine( + const AZ::Vector3& localPosition, const AZ::Transform& worldFromLocal, const AZ::Vector3& axis, const float length) + { + return { worldFromLocal.TransformPoint(localPosition), + TransformPositionNoScaling(worldFromLocal, localPosition + (axis * length)) }; + } + // calculate line bound in world space (axis and length). static Picking::BoundShapeLineSegment CalculateLineBound( const AZ::Vector3& localPosition, @@ -127,8 +144,9 @@ namespace AzToolsFramework const float width) { Picking::BoundShapeLineSegment lineBound; - lineBound.m_start = worldFromLocal.TransformPoint(localPosition); - lineBound.m_end = TransformPositionNoScaling(worldFromLocal, localPosition + (axis * length)); + const auto line = CalculateLine(localPosition, worldFromLocal, axis, length); + lineBound.m_start = line.first; + lineBound.m_end = line.second; lineBound.m_width = width; return lineBound; } @@ -395,13 +413,29 @@ namespace AzToolsFramework m_axis, m_cameraCorrectedAxis, managerState, mouseInteraction, manipulatorState.m_worldFromLocal, manipulatorState.m_localPosition, cameraState); - const Picking::BoundShapeLineSegment lineBound = CalculateLineBound( - manipulatorState.m_localPosition, manipulatorState.m_worldFromLocal, m_cameraCorrectedAxis, m_length * viewScale, - m_width * viewScale); + const auto worldLine = + CalculateLine(manipulatorState.m_localPosition, manipulatorState.m_worldFromLocal, m_cameraCorrectedAxis, m_length * viewScale); debugDisplay.SetColor(ViewColor(manipulatorState.m_mouseOver, m_color, m_mouseOverColor).GetAsVector4()); debugDisplay.SetLineWidth(defaultLineWidth(manipulatorState.m_mouseOver)); - debugDisplay.DrawLine(lineBound.m_start, lineBound.m_end); + debugDisplay.DrawLine(worldLine.first, worldLine.second); + + // ensure length of bound takes into account logical width of line (m_length - m_width) + const Picking::BoundShapeLineSegment lineBound = CalculateLineBound( + manipulatorState.m_localPosition, manipulatorState.m_worldFromLocal, m_cameraCorrectedAxis, (m_length - m_width) * viewScale, + m_width * viewScale); + + if (ed_manipulatorDisplayBoundDebug) + { + debugDisplay.DrawBall(lineBound.m_start, lineBound.m_width, false); + debugDisplay.DrawBall(lineBound.m_end, lineBound.m_width, false); + + const auto line = lineBound.m_end - lineBound.m_start; + const auto height = line.GetLength(); + const auto axis = line / height; + const auto center = lineBound.m_start + axis * height * 0.5f; + debugDisplay.DrawSolidCylinder(center, axis, lineBound.m_width, height, false); + } RefreshBoundInternal(managerId, manipulatorId, lineBound); } @@ -578,13 +612,30 @@ namespace AzToolsFramework const Picking::BoundShapeTorus torusBound = CalculateTorusBound( manipulatorState.m_localPosition, manipulatorState.m_worldFromLocal, m_axis, m_radius * viewScale, m_width * viewScale); - // transform circle based on delta between default z up axis and other axes - const AZ::Transform worldFromLocalWithOrientation = - AZ::Transform::CreateTranslation(manipulatorState.m_worldFromLocal.GetTranslation()) * + const AZ::Transform orientation = AZ::Transform::CreateFromQuaternion((QuaternionFromTransformNoScaling(manipulatorState.m_worldFromLocal) * AZ::Quaternion::CreateShortestArc(AZ::Vector3::CreateAxisZ(), m_axis)) .GetNormalized()); + // transform circle based on delta between default z up axis and other axes + const AZ::Transform worldFromLocalWithOrientation = + AZ::Transform::CreateTranslation(manipulatorState.m_worldFromLocal.GetTranslation()) * orientation; + + if (ed_manipulatorDisplayBoundDebug) + { + debugDisplay.SetColor(AZ::Colors::BlanchedAlmond); + debugDisplay.PushMatrix(orientation); + debugDisplay.DrawCircle(torusBound.m_center + AZ::Vector3::CreateAxisZ() * torusBound.m_minorRadius, torusBound.m_majorRadius); + debugDisplay.DrawCircle( + torusBound.m_center + AZ::Vector3::CreateAxisZ() * torusBound.m_minorRadius, + torusBound.m_majorRadius + torusBound.m_minorRadius); + debugDisplay.DrawCircle(torusBound.m_center - AZ::Vector3::CreateAxisZ() * torusBound.m_minorRadius, torusBound.m_majorRadius); + debugDisplay.DrawCircle( + torusBound.m_center - AZ::Vector3::CreateAxisZ() * torusBound.m_minorRadius, + torusBound.m_majorRadius + torusBound.m_minorRadius); + debugDisplay.PopMatrix(); + } + debugDisplay.CullOn(); debugDisplay.PushMatrix(worldFromLocalWithOrientation); debugDisplay.SetColor(ViewColor(manipulatorState.m_mouseOver, m_color, m_mouseOverColor).GetAsVector4()); @@ -604,7 +655,10 @@ namespace AzToolsFramework } void DrawFullCircle( - AzFramework::DebugDisplayRequests& debugDisplay, const AZ::Vector3& position, const float radius, const AZ::Vector3& /*viewPos*/) + AzFramework::DebugDisplayRequests& debugDisplay, + const AZ::Vector3& position, + const float radius, + [[maybe_unused]] const AZ::Vector3& viewPos) { debugDisplay.DrawCircle(position, radius); } diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/RotationManipulators.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/RotationManipulators.cpp index 3ba9c3d8c7..4f3d369777 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/RotationManipulators.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/RotationManipulators.cpp @@ -130,11 +130,13 @@ namespace AzToolsFramework for (size_t manipulatorIndex = 0; manipulatorIndex < m_localAngularManipulators.size(); ++manipulatorIndex) { m_localAngularManipulators[manipulatorIndex]->SetView(CreateManipulatorViewCircle( - *m_localAngularManipulators[manipulatorIndex], colors[manipulatorIndex], radius, 0.05f, DrawHalfDottedCircle)); + *m_localAngularManipulators[manipulatorIndex], colors[manipulatorIndex], radius, m_circleBoundWidth, DrawHalfDottedCircle)); } + const float viewAlignedScale = 1.12f; m_viewAngularManipulator->SetView(CreateManipulatorViewCircle( - *m_viewAngularManipulator, AZ::Color(1.0f, 1.0f, 1.0f, 1.0f), radius + (radius * 0.12f), 0.05f, DrawFullCircle)); + *m_viewAngularManipulator, AZ::Color(1.0f, 1.0f, 1.0f, 1.0f), radius * viewAlignedScale, m_circleBoundWidth, + DrawFullCircle)); } bool RotationManipulators::PerformingActionViewAxis() const @@ -151,4 +153,9 @@ namespace AzToolsFramework manipulatorFn(m_viewAngularManipulator.get()); } + + void RotationManipulators::SetCircleBoundWidth(const float circleBoundWidth) + { + m_circleBoundWidth = circleBoundWidth; + } } // namespace AzToolsFramework diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/RotationManipulators.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/RotationManipulators.h index 172ec189f0..e7e3ae5eee 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/RotationManipulators.h +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/RotationManipulators.h @@ -42,6 +42,9 @@ namespace AzToolsFramework bool PerformingActionViewAxis() const; + //! Sets the bound width to use for the circle (torus) of an angular manipulator. + void SetCircleBoundWidth(float circleBoundWidth); + private: AZ_DISABLE_COPY_MOVE(RotationManipulators) @@ -49,5 +52,6 @@ namespace AzToolsFramework AZStd::array, 3> m_localAngularManipulators; AZStd::shared_ptr m_viewAngularManipulator; + float m_circleBoundWidth = 0.1f; //!< The default circle bound width for the angular manipulator torus. }; } // namespace AzToolsFramework diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/ScaleManipulators.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/ScaleManipulators.cpp index 08735a34a3..1867f346ec 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/ScaleManipulators.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/ScaleManipulators.cpp @@ -120,18 +120,18 @@ namespace AzToolsFramework const float axisLength, const AZ::Color& axis1Color, const AZ::Color& axis2Color, const AZ::Color& axis3Color) { const float boxSize = 0.1f; - const float lineWidth = 0.05f; - const AZ::Color colors[] = { axis1Color, axis2Color, axis3Color }; for (size_t manipulatorIndex = 0; manipulatorIndex < m_axisScaleManipulators.size(); ++manipulatorIndex) { + const auto lineLength = axisLength - boxSize; + ManipulatorViews views; views.emplace_back( - CreateManipulatorViewLine(*m_axisScaleManipulators[manipulatorIndex], colors[manipulatorIndex], axisLength, lineWidth)); + CreateManipulatorViewLine(*m_axisScaleManipulators[manipulatorIndex], colors[manipulatorIndex], axisLength, m_lineBoundWidth)); views.emplace_back(CreateManipulatorViewBox( AZ::Transform::CreateIdentity(), colors[manipulatorIndex], - m_axisScaleManipulators[manipulatorIndex]->GetAxis() * (axisLength - boxSize), AZ::Vector3(boxSize))); + m_axisScaleManipulators[manipulatorIndex]->GetAxis() * lineLength, AZ::Vector3(boxSize))); m_axisScaleManipulators[manipulatorIndex]->SetViews(AZStd::move(views)); } @@ -150,4 +150,9 @@ namespace AzToolsFramework manipulatorFn(m_uniformScaleManipulator.get()); } + + void ScaleManipulators::SetLineBoundWidth(const float lineBoundWidth) + { + m_lineBoundWidth = lineBoundWidth; + } } // namespace AzToolsFramework diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/ScaleManipulators.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/ScaleManipulators.h index cca17a85e6..5a0a7676d5 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/ScaleManipulators.h +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/ScaleManipulators.h @@ -41,6 +41,9 @@ namespace AzToolsFramework void ConfigureView(float axisLength, const AZ::Color& axis1Color, const AZ::Color& axis2Color, const AZ::Color& axis3Color); + //! Sets the bound width to use for the line/axis of a linear manipulator. + void SetLineBoundWidth(float lineBoundWidth); + private: AZ_DISABLE_COPY_MOVE(ScaleManipulators) @@ -49,5 +52,6 @@ namespace AzToolsFramework AZStd::array, 3> m_axisScaleManipulators; AZStd::shared_ptr m_uniformScaleManipulator; + float m_lineBoundWidth = 0.01f; //!< The default line bound width for the linear manipulator axis. }; } // namespace AzToolsFramework diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/TranslationManipulators.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/TranslationManipulators.cpp index c5702bb249..049cab4a13 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/TranslationManipulators.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/TranslationManipulators.cpp @@ -235,24 +235,25 @@ namespace AzToolsFramework } void TranslationManipulators::ConfigureLinearView( - float axisLength, + const float axisLength, const AZ::Color& axis1Color, const AZ::Color& axis2Color, const AZ::Color& axis3Color /*= AZ::Color(0.0f, 0.0f, 1.0f, 0.5f)*/) { const float coneLength = 0.28f; const float coneRadius = 0.07f; - const float lineWidth = 0.05f; const AZ::Color axesColor[] = { axis1Color, axis2Color, axis3Color }; - const auto configureLinearView = - [lineWidth, coneLength, axisLength, coneRadius](LinearManipulator* linearManipulator, const AZ::Color& color) + const auto configureLinearView = [lineBoundWidth = m_lineBoundWidth, coneLength, axisLength, + coneRadius](LinearManipulator* linearManipulator, const AZ::Color& color) { + const auto lineLength = axisLength - coneLength; + ManipulatorViews views; - views.emplace_back(CreateManipulatorViewLine(*linearManipulator, color, axisLength, lineWidth)); - views.emplace_back(CreateManipulatorViewCone( - *linearManipulator, color, linearManipulator->GetAxis() * (axisLength - coneLength), coneLength, coneRadius)); + views.emplace_back(CreateManipulatorViewLine(*linearManipulator, color, lineLength, lineBoundWidth)); + views.emplace_back( + CreateManipulatorViewCone(*linearManipulator, color, linearManipulator->GetAxis() * lineLength, coneLength, coneRadius)); linearManipulator->SetViews(AZStd::move(views)); }; @@ -316,6 +317,11 @@ namespace AzToolsFramework } } + void TranslationManipulators::SetLineBoundWidth(const float lineBoundWidth) + { + m_lineBoundWidth = lineBoundWidth; + } + void ConfigureTranslationManipulatorAppearance3d(TranslationManipulators* translationManipulators) { translationManipulators->SetAxes(AZ::Vector3::CreateAxisX(), AZ::Vector3::CreateAxisY(), AZ::Vector3::CreateAxisZ()); diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/TranslationManipulators.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/TranslationManipulators.h index 04d8e24ae6..65e53f0680 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/TranslationManipulators.h +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/TranslationManipulators.h @@ -65,6 +65,9 @@ namespace AzToolsFramework void ConfigureSurfaceView(float radius, const AZ::Color& color); + //! Sets the bound width to use for the line/axis of a linear manipulator. + void SetLineBoundWidth(float lineBoundWidth); + private: AZ_DISABLE_COPY_MOVE(TranslationManipulators) @@ -76,6 +79,7 @@ namespace AzToolsFramework AZStd::vector> m_linearManipulators; AZStd::vector> m_planarManipulators; AZStd::shared_ptr m_surfaceManipulator = nullptr; + float m_lineBoundWidth = 0.01f; //!< The default line bound width for the linear manipulator axis. }; //! IndexedTranslationManipulator wraps a standard TranslationManipulators and allows it to be linked diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Picking/Manipulators/ManipulatorBounds.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Picking/Manipulators/ManipulatorBounds.cpp index 9ede35b837..3a7fffb3be 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/Picking/Manipulators/ManipulatorBounds.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Picking/Manipulators/ManipulatorBounds.cpp @@ -16,6 +16,79 @@ namespace AzToolsFramework { namespace Picking { + // this intersection algorithm is adapted from 'Capped Cone' by Inigo Quilez + // ref: https://www.iquilezles.org/www/articles/intersectors/intersectors.htm and https://www.shadertoy.com/view/llcfRf + // all algorithms/code snippets are kindly made available under the MIT License - https://www.iquilezles.org/www/index.htm + bool IntersectRayCone( + const AZ::Vector3& rayOrigin, + const AZ::Vector3& rayDirection, + const AZ::Vector3& coneApex, + const AZ::Vector3& coneAxis, + float coneHeight, + float coneBaseRadius, + float& t) + { + const AZ::Vector3& pa = coneApex; + const AZ::Vector3& pb = coneApex + coneHeight * coneAxis; + const AZ::Vector3& ro = rayOrigin; + const AZ::Vector3& rd = rayDirection; + float rb = coneBaseRadius; + + AZ::Vector3 ba = pb - pa; + AZ::Vector3 oa = ro - pa; + AZ::Vector3 ob = ro - pb; + + float m0 = ba.Dot(ba); + float m1 = oa.Dot(ba); + float m2 = ob.Dot(ba); + float m3 = rd.Dot(ba); + + auto dot2 = [](const AZ::Vector3& v) + { + return v.Dot(v); + }; + + // cap + if (m2 > 0.0f) + { + if (dot2(ob * m3 - rd * m2) < (rb * rb * m3 * m3)) + { + t = -m2 / m3; + return true; + } + } + + // body + float m4 = rd.Dot(oa); + float m5 = oa.Dot(oa); + float hy = m0 + rb * rb; + + float k2 = m0 * m0 - m3 * m3 * hy; + float k1 = m0 * m0 * m4 - m1 * m3 * hy; + float k0 = m0 * m0 * m5 - m1 * m1 * hy; + + // note: solving for simultaneously being on the sloping surface of the cone and being on the ray boils down + // to a quadratic equation - the discriminant of the quadratic determines if there are 1, 2 or no solutions + // + // if the discriminant is less than 0 the ray is not intersecting the cone, if it is equal to 0 then the ray + // is intersecting the cone once and if it is greater than 0 the ray is intersecting the cone twice + float discriminant = k1 * k1 - k2 * k0; + if (discriminant < 0.0f) + { + return false; + } + + float tt = (-k1 - AZ::Sqrt(discriminant)) / k2; + float y = m1 + tt * m3; + if (y >= 0.0f && y < m0) + { + t = tt; + return true; + } + + return false; + } + bool ManipulatorBoundSphere::IntersectRay( const AZ::Vector3& rayOrigin, const AZ::Vector3& rayDirection, float& rayIntersectionDistance) { @@ -86,11 +159,10 @@ namespace AzToolsFramework bool ManipulatorBoundCone::IntersectRay( const AZ::Vector3& rayOrigin, const AZ::Vector3& rayDirection, float& rayIntersectionDistance) { - float t1 = std::numeric_limits::max(); - float t2 = std::numeric_limits::max(); - if (AZ::Intersect::IntersectRayCone(rayOrigin, rayDirection, m_apexPosition, m_dir, m_height, m_radius, t1, t2) > 0) + float t = std::numeric_limits::max(); + if (IntersectRayCone(rayOrigin, rayDirection, m_apexPosition, m_dir, m_height, m_radius, t)) { - rayIntersectionDistance = AZStd::GetMin(t1, t2); + rayIntersectionDistance = t; return true; } diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Picking/Manipulators/ManipulatorBounds.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Picking/Manipulators/ManipulatorBounds.h index 55a276f87b..59f339c129 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/Picking/Manipulators/ManipulatorBounds.h +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Picking/Manipulators/ManipulatorBounds.h @@ -23,6 +23,26 @@ namespace AzToolsFramework { namespace Picking { + //! Custom ray/cone intersect function for manipulator bounds to workaround a bug in the current AZ::Intersect implementation. + //! @note Does not give reliable results if the ray origin is inside the cone. + //! @param rayOrigin The origin of the ray to test. + //! @param rayDirection The direction of the ray to test, it must be unit length. + //! @param coneApex The apex of the cone. + //! @param coneAxis The unit-length axis (direction) from the apex to the base. + //! @param coneHeight The height of the cone, from the apex to the base. + //! @param coneBaseRadius The radius of the cone base. + //! @param[out] t A possible coefficient in the ray's explicit equation from which an intersecting point is calculated + //! as "rayOrigin + t * rayDirection". 't' is the closest intersecting point to the ray origin. + //! @return true for intersecting, false for not intersecting. + bool IntersectRayCone( + const AZ::Vector3& rayOrigin, + const AZ::Vector3& rayDirection, + const AZ::Vector3& coneApex, + const AZ::Vector3& coneAxis, + float coneHeight, + float coneBaseRadius, + float& t); + class ManipulatorBoundSphere : public BoundShapeInterface { public: diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabPublicHandler.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabPublicHandler.cpp index c412033362..63f042be85 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabPublicHandler.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabPublicHandler.cpp @@ -61,7 +61,7 @@ namespace AzToolsFramework m_prefabUndoCache.Destroy(); } - PrefabOperationResult PrefabPublicHandler::CreatePrefabInMemory(const EntityIdList& entityIds, AZ::IO::PathView filePath) + CreatePrefabResult PrefabPublicHandler::CreatePrefabInMemory(const EntityIdList& entityIds, AZ::IO::PathView filePath) { EntityList inputEntityList, topLevelEntities; AZ::EntityId commonRootEntityId; @@ -70,9 +70,11 @@ namespace AzToolsFramework entityIds, inputEntityList, topLevelEntities, commonRootEntityId, commonRootEntityOwningInstance); if (!findCommonRootOutcome.IsSuccess()) { - return findCommonRootOutcome; + return AZ::Failure(findCommonRootOutcome.TakeError()); } + AZ::EntityId containerEntityId; + InstanceOptionalReference instanceToCreate; { // Initialize Undo Batch object @@ -92,7 +94,7 @@ namespace AzToolsFramework inputEntityList, commonRootEntityOwningInstance->get(), entities, instances); if (!retrieveEntitiesAndInstancesOutcome.IsSuccess()) { - return retrieveEntitiesAndInstancesOutcome; + return AZ::Failure(retrieveEntitiesAndInstancesOutcome.TakeError()); } AZStd::unordered_map oldEntityAliases; @@ -153,7 +155,7 @@ namespace AzToolsFramework "(A null instance is returned).")); } - AZ::EntityId containerEntityId = instanceToCreate->get().GetContainerEntityId(); + containerEntityId = instanceToCreate->get().GetContainerEntityId(); // Apply the correct transform to the container for the new instance, and store the patch for use when creating the link. PrefabDom patch = ApplyContainerTransformAndGeneratePatch(containerEntityId, commonRootEntityId, topLevelEntities); @@ -261,10 +263,10 @@ namespace AzToolsFramework } } - return AZ::Success(); + return AZ::Success(containerEntityId); } - PrefabOperationResult PrefabPublicHandler::CreatePrefabInDisk(const EntityIdList& entityIds, AZ::IO::PathView filePath) + CreatePrefabResult PrefabPublicHandler::CreatePrefabInDisk(const EntityIdList& entityIds, AZ::IO::PathView filePath) { auto result = CreatePrefabInMemory(entityIds, filePath); if (result.IsSuccess()) diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabPublicHandler.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabPublicHandler.h index 6faaa6932f..42b6bc1666 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabPublicHandler.h +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabPublicHandler.h @@ -42,11 +42,12 @@ namespace AzToolsFramework void UnregisterPrefabPublicHandlerInterface(); // PrefabPublicInterface... - PrefabOperationResult CreatePrefabInDisk( + CreatePrefabResult CreatePrefabInDisk( const EntityIdList& entityIds, AZ::IO::PathView filePath) override; - PrefabOperationResult CreatePrefabInMemory( + CreatePrefabResult CreatePrefabInMemory( const EntityIdList& entityIds, AZ::IO::PathView filePath) override; - InstantiatePrefabResult InstantiatePrefab(AZStd::string_view filePath, AZ::EntityId parent, const AZ::Vector3& position) override; + InstantiatePrefabResult InstantiatePrefab( + AZStd::string_view filePath, AZ::EntityId parent, const AZ::Vector3& position) override; PrefabOperationResult SavePrefab(AZ::IO::Path filePath) override; PrefabEntityResult CreateEntity(AZ::EntityId parentId, const AZ::Vector3& position) override; diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabPublicInterface.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabPublicInterface.h index 83763ef55f..528d4f6d1b 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabPublicInterface.h +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabPublicInterface.h @@ -24,8 +24,9 @@ namespace AzToolsFramework namespace Prefab { - typedef AZ::Outcome PrefabOperationResult; + typedef AZ::Outcome CreatePrefabResult; typedef AZ::Outcome InstantiatePrefabResult; + typedef AZ::Outcome PrefabOperationResult; typedef AZ::Outcome PrefabRequestResult; typedef AZ::Outcome PrefabEntityResult; @@ -44,9 +45,10 @@ namespace AzToolsFramework * Automatically detects descendants of entities, and discerns between entities and child instances. * @param entityIds The entities that should form the new prefab (along with their descendants). * @param filePath The absolute path for the new prefab file. - * @return An outcome object; on failure, it comes with an error message detailing the cause of the error. + * @return An outcome object with an entityId of the new prefab's container entity; + * on failure, it comes with an error message detailing the cause of the error. */ - virtual PrefabOperationResult CreatePrefabInDisk( + virtual CreatePrefabResult CreatePrefabInDisk( const EntityIdList& entityIds, AZ::IO::PathView filePath) = 0; /** @@ -54,9 +56,10 @@ namespace AzToolsFramework * Automatically detects descendants of entities, and discerns between entities and child instances. * @param entityIds The entities that should form the new prefab (along with their descendants). * @param filePath The absolute path for the new prefab file. - * @return An outcome object; on failure, it comes with an error message detailing the cause of the error. + * @return An outcome object with an entityId of the new prefab's container entity; + * on failure, it comes with an error message detailing the cause of the error. */ - virtual PrefabOperationResult CreatePrefabInMemory( + virtual CreatePrefabResult CreatePrefabInMemory( const EntityIdList& entityIds, AZ::IO::PathView filePath) = 0; /** diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabPublicRequestBus.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabPublicRequestBus.h index 1605ad97be..7b23fffb7f 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabPublicRequestBus.h +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabPublicRequestBus.h @@ -10,6 +10,7 @@ #include #include +#include #include #include #include @@ -22,8 +23,9 @@ namespace AzToolsFramework namespace Prefab { - using PrefabOperationResult = AZ::Outcome; + using CreatePrefabResult = AZ::Outcome; using InstantiatePrefabResult = AZ::Outcome; + using PrefabOperationResult = AZ::Outcome; /** * The primary purpose of this bus is to facilitate writing automated tests for prefabs. @@ -47,14 +49,16 @@ namespace AzToolsFramework /** * Create a prefab out of the entities provided, at the path provided, and keep it in memory. * Automatically detects descendants of entities, and discerns between entities and child instances. - * Return whether the creation succeeded or not. + * Return an outcome object with an container entity id of the prefab created if creation succeeded; + * on failure, it comes with an error message detailing the cause of the error. */ - virtual PrefabOperationResult CreatePrefabInMemory( + virtual CreatePrefabResult CreatePrefabInMemory( const EntityIdList& entityIds, AZStd::string_view filePath) = 0; /** * Instantiate a prefab from a prefab file. - * Return the container entity id of the prefab instantiated if instantiation succeeded. + * Return an outcome object with an container entity id of the prefab instantiated if instantiation succeeded; + * on failure, it comes with an error message detailing the cause of the error. */ virtual InstantiatePrefabResult InstantiatePrefab( AZStd::string_view filePath, AZ::EntityId parent, const AZ::Vector3& position) = 0; @@ -62,10 +66,9 @@ namespace AzToolsFramework /** * Deletes all entities and their descendants from the owning instance. Bails if the entities don't * all belong to the same instance. - * Return whether the deletion succeeded or not. + * Return an outcome object; on failure, it comes with an error message detailing the cause of the error. */ virtual PrefabOperationResult DeleteEntitiesAndAllDescendantsInInstance(const EntityIdList& entityIds) = 0; - }; using PrefabPublicRequestBus = AZ::EBus; diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabPublicRequestHandler.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabPublicRequestHandler.cpp index d964be25af..ad171dc6f4 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabPublicRequestHandler.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabPublicRequestHandler.cpp @@ -45,7 +45,7 @@ namespace AzToolsFramework m_prefabPublicInterface = nullptr; } - PrefabOperationResult PrefabPublicRequestHandler::CreatePrefabInMemory(const EntityIdList& entityIds, AZStd::string_view filePath) + CreatePrefabResult PrefabPublicRequestHandler::CreatePrefabInMemory(const EntityIdList& entityIds, AZStd::string_view filePath) { return m_prefabPublicInterface->CreatePrefabInMemory(entityIds, filePath); } diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabPublicRequestHandler.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabPublicRequestHandler.h index 87608e1263..ae0ed2a5d1 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabPublicRequestHandler.h +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabPublicRequestHandler.h @@ -31,7 +31,7 @@ namespace AzToolsFramework void Connect(); void Disconnect(); - PrefabOperationResult CreatePrefabInMemory(const EntityIdList& entityIds, AZStd::string_view filePath) override; + CreatePrefabResult CreatePrefabInMemory(const EntityIdList& entityIds, AZStd::string_view filePath) override; InstantiatePrefabResult InstantiatePrefab(AZStd::string_view filePath, AZ::EntityId parent, const AZ::Vector3& position) override; PrefabOperationResult DeleteEntitiesAndAllDescendantsInInstance(const EntityIdList& entityIds) override; diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Viewport/ViewportMessages.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Viewport/ViewportMessages.cpp new file mode 100644 index 0000000000..955ee61525 --- /dev/null +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Viewport/ViewportMessages.cpp @@ -0,0 +1,46 @@ +/* + * Copyright (c) Contributors to the Open 3D Engine Project. + * For complete copyright and license terms please see the LICENSE at the root of this distribution. + * + * SPDX-License-Identifier: Apache-2.0 OR MIT + * + */ + +#include + +namespace AzToolsFramework +{ + float ManipulatorLineBoundWidth(const AzFramework::ViewportId viewportId /*= AzFramework::InvalidViewportId*/) + { + float lineBoundWidth = 0.0f; + if (viewportId != AzFramework::InvalidViewportId) + { + ViewportInteraction::ViewportSettingsRequestBus::EventResult( + lineBoundWidth, viewportId, &ViewportInteraction::ViewportSettingsRequestBus::Events::ManipulatorLineBoundWidth); + } + else + { + ViewportInteraction::ViewportSettingsRequestBus::BroadcastResult( + lineBoundWidth, &ViewportInteraction::ViewportSettingsRequestBus::Events::ManipulatorLineBoundWidth); + } + + return lineBoundWidth; + } + + float ManipulatorCicleBoundWidth(const AzFramework::ViewportId viewportId /*= AzFramework::InvalidViewportId*/) + { + float circleBoundWidth = 0.0f; + if (viewportId != AzFramework::InvalidViewportId) + { + ViewportInteraction::ViewportSettingsRequestBus::EventResult( + circleBoundWidth, viewportId, &ViewportInteraction::ViewportSettingsRequestBus::Events::ManipulatorCircleBoundWidth); + } + else + { + ViewportInteraction::ViewportSettingsRequestBus::BroadcastResult( + circleBoundWidth, &ViewportInteraction::ViewportSettingsRequestBus::Events::ManipulatorCircleBoundWidth); + } + + return circleBoundWidth; + } +} // namespace AzToolsFramework diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Viewport/ViewportMessages.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Viewport/ViewportMessages.h index f6ba87a0ec..147c71c8e8 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/Viewport/ViewportMessages.h +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Viewport/ViewportMessages.h @@ -156,22 +156,12 @@ namespace AzToolsFramework class ViewportInteractionRequests { public: - //! Return the current camera state for this viewport. + //! Returns the current camera state for this viewport. virtual AzFramework::CameraState GetCameraState() = 0; - //! Return if grid snapping is enabled. - virtual bool GridSnappingEnabled() = 0; - //! Return the grid snapping size. - virtual float GridSize() = 0; - //! Does the grid currently want to be displayed. - virtual bool ShowGrid() = 0; - //! Return if angle snapping is enabled. - virtual bool AngleSnappingEnabled() = 0; - //! Return the angle snapping/step size. - virtual float AngleStep() = 0; - //! Transform a point in world space to screen space coordinates in Qt Widget space. + //! Transforms a point in world space to screen space coordinates in Qt Widget space. //! Multiply by DeviceScalingFactor to get the position in viewport pixel space. virtual AzFramework::ScreenPoint ViewportWorldToScreen(const AZ::Vector3& worldPosition) = 0; - //! Transform a point from Qt widget screen space to world space based on the given clip space depth. + //! Transforms a point from Qt widget screen space to world space based on the given clip space depth. //! Depth specifies a relative camera depth to project in the range of [0.f, 1.f]. //! Returns the world space position if successful. virtual AZStd::optional ViewportScreenToWorld(const AzFramework::ScreenPoint& screenPosition, float depth) = 0; @@ -185,12 +175,13 @@ namespace AzToolsFramework ~ViewportInteractionRequests() = default; }; + //! Type to inherit to implement ViewportInteractionRequests. + using ViewportInteractionRequestBus = AZ::EBus; + //! Interface to return only viewport specific settings (e.g. snapping). - class ViewportSettings + class ViewportSettingsRequests { public: - virtual ~ViewportSettings() = default; - //! Return if grid snapping is enabled. virtual bool GridSnappingEnabled() const = 0; //! Return the grid snapping size. @@ -201,20 +192,31 @@ namespace AzToolsFramework virtual bool AngleSnappingEnabled() const = 0; //! Return the angle snapping/step size. virtual float AngleStep() const = 0; + //! Returns the current line bound width for manipulators. + virtual float ManipulatorLineBoundWidth() const = 0; + //! Returns the current circle (torus) bound width for manipulators. + virtual float ManipulatorCircleBoundWidth() const = 0; + + protected: + ~ViewportSettingsRequests() = default; }; - //! Type to inherit to implement ViewportInteractionRequests. - using ViewportInteractionRequestBus = AZ::EBus; + //! Type to inherit to implement ViewportSettingsRequests. + using ViewportSettingsRequestBus = AZ::EBus; //! An interface to notify when changes to viewport settings have happened. class ViewportSettingNotifications { public: - virtual void OnGridSnappingChanged([[maybe_unused]] bool enabled) {} - virtual void OnDrawHelpersChanged([[maybe_unused]] bool enabled) {} + virtual void OnGridSnappingChanged([[maybe_unused]] bool enabled) + { + } + virtual void OnDrawHelpersChanged([[maybe_unused]] bool enabled) + { + } protected: - ViewportSettingNotifications() = default; + ~ViewportSettingNotifications() = default; }; using ViewportSettingsNotificationBus = AZ::EBus; @@ -336,4 +338,12 @@ namespace AzToolsFramework } return AzFramework::ClickDetector::ClickEvent::Nil; } + + //! Wrap EBus call to retrieve manipulator line bound width. + //! @note It is possible to pass AzFramework::InvalidViewportId (the default) to perform a Broadcast as opposed to a targeted Event. + float ManipulatorLineBoundWidth(AzFramework::ViewportId viewportId = AzFramework::InvalidViewportId); + + //! Wrap EBus call to retrieve manipulator circle bound width. + //! @note It is possible to pass AzFramework::InvalidViewportId (the default) to perform a Broadcast as opposed to a targeted Event. + float ManipulatorCicleBoundWidth(AzFramework::ViewportId viewportId = AzFramework::InvalidViewportId); } // namespace AzToolsFramework diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorTransformComponentSelection.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorTransformComponentSelection.cpp index d315243697..101d7094db 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorTransformComponentSelection.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorTransformComponentSelection.cpp @@ -488,8 +488,8 @@ namespace AzToolsFramework void SnappingCluster::TrySetVisible(const bool visible) { bool snapping = false; - ViewportInteraction::ViewportInteractionRequestBus::EventResult( - snapping, ViewportUi::DefaultViewportId, &ViewportInteraction::ViewportInteractionRequestBus::Events::GridSnappingEnabled); + ViewportInteraction::ViewportSettingsRequestBus::EventResult( + snapping, ViewportUi::DefaultViewportId, &ViewportInteraction::ViewportSettingsRequestBus::Events::GridSnappingEnabled); // show snapping viewport ui only if there are entities selected and snapping is enabled SetViewportUiClusterVisible(m_clusterId, visible && snapping); @@ -1249,6 +1249,7 @@ namespace AzToolsFramework AZStd::unique_ptr translationManipulators = AZStd::make_unique( TranslationManipulators::Dimensions::Three, AZ::Transform::CreateIdentity(), AZ::Vector3::CreateOne()); + translationManipulators->SetLineBoundWidth(ManipulatorLineBoundWidth(ViewportUi::DefaultViewportId)); InitializeManipulators(*translationManipulators); @@ -1376,6 +1377,7 @@ namespace AzToolsFramework AZStd::unique_ptr rotationManipulators = AZStd::make_unique(AZ::Transform::CreateIdentity()); + rotationManipulators->SetCircleBoundWidth(ManipulatorCicleBoundWidth(ViewportUi::DefaultViewportId)); InitializeManipulators(*rotationManipulators); @@ -1545,6 +1547,7 @@ namespace AzToolsFramework AZ_PROFILE_FUNCTION(AzToolsFramework); AZStd::unique_ptr scaleManipulators = AZStd::make_unique(AZ::Transform::CreateIdentity()); + scaleManipulators->SetLineBoundWidth(ManipulatorLineBoundWidth(ViewportUi::DefaultViewportId)); InitializeManipulators(*scaleManipulators); @@ -2544,8 +2547,8 @@ namespace AzToolsFramework if (buttonId == m_snappingCluster.m_snapToWorldButtonId) { float gridSize = 1.0f; - ViewportInteraction::ViewportInteractionRequestBus::EventResult( - gridSize, ViewportUi::DefaultViewportId, &ViewportInteraction::ViewportInteractionRequestBus::Events::GridSize); + ViewportInteraction::ViewportSettingsRequestBus::EventResult( + gridSize, ViewportUi::DefaultViewportId, &ViewportInteraction::ViewportSettingsRequestBus::Events::GridSize); SnapSelectedEntitiesToWorldGrid(gridSize); } diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/aztoolsframework_files.cmake b/Code/Framework/AzToolsFramework/AzToolsFramework/aztoolsframework_files.cmake index 14c5f34f90..2d9e75a115 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/aztoolsframework_files.cmake +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/aztoolsframework_files.cmake @@ -481,6 +481,7 @@ set(FILES Viewport/VertexContainerDisplay.h Viewport/VertexContainerDisplay.cpp Viewport/ViewportMessages.h + Viewport/ViewportMessages.cpp Viewport/ViewportTypes.h Viewport/ViewportTypes.cpp ViewportUi/Button.h diff --git a/Code/Framework/AzToolsFramework/Tests/ManipulatorBoundsTests.cpp b/Code/Framework/AzToolsFramework/Tests/ManipulatorBoundsTests.cpp index 1c3303269d..bca1624290 100644 --- a/Code/Framework/AzToolsFramework/Tests/ManipulatorBoundsTests.cpp +++ b/Code/Framework/AzToolsFramework/Tests/ManipulatorBoundsTests.cpp @@ -187,4 +187,51 @@ namespace UnitTest EXPECT_NEAR(intersectionDistance, 10.0f, g_epsilon); EXPECT_TRUE(intersection); } + + // replicates a scenario in the Editor using a cone and a pick ray which should have failed but passed with Intersect::IntersectRayCone + TEST(ManipulatorIntersectRayConeTest, RayConeEditorScenarioTest) + { + auto rayOrigin = AZ::Vector3(0.0f, -0.808944702f, 0.0f); + auto rayDir = AZ::Vector3(0.301363617f, 0.939044654f, 0.165454566f); + float t = 0.0f; + bool hit = AzToolsFramework::Picking::IntersectRayCone( + rayOrigin, rayDir, AZ::Vector3(0.0f, 0.0f, 0.161788940f), AZ::Vector3(0.0f, 0.0f, -1.0f), 0.0453009047, 0.0113252262, t); + EXPECT_FALSE(hit); + } + + // cone lying flat, ray going towards base of cone + TEST(ManipulatorIntersectRayConeTest, RayIntersectsConeBase) + { + auto rayOrigin = AZ::Vector3::CreateZero(); + auto rayDir = AZ::Vector3::CreateAxisY(); + float t = 0.0f; + bool hit = AzToolsFramework::Picking::IntersectRayCone( + rayOrigin, rayDir, AZ::Vector3::CreateAxisY(10.0f), AZ::Vector3::CreateAxisY(-1.0f), 5.0f, 1.0f, t); + EXPECT_TRUE(hit); + EXPECT_THAT(t, ::testing::FloatNear(5.0f, 0.0001f)); + } + + // cone standing up, ray going towards mid side of cone + TEST(ManipulatorIntersectRayConeTest, RayIntersectsConeSide) + { + auto rayOrigin = AZ::Vector3::CreateZero(); + auto rayDir = AZ::Vector3::CreateAxisY(); + float t = 0.0f; + bool hit = AzToolsFramework::Picking::IntersectRayCone( + rayOrigin, rayDir, AZ::Vector3(0.0f, 10.0f, 5.0f), AZ::Vector3::CreateAxisZ(-1.0f), 10.0f, 5.0f, t); + EXPECT_TRUE(hit); + EXPECT_THAT(t, ::testing::FloatNear(7.5f, 0.0001f)); + } + + // cone standing up, ray going towards mid side of cone + TEST(ManipulatorIntersectRayConeTest, RayIntersectsConeApex) + { + auto rayOrigin = AZ::Vector3::CreateZero(); + auto rayDir = AZ::Vector3::CreateAxisY(); + float t = 0.0f; + bool hit = AzToolsFramework::Picking::IntersectRayCone( + rayOrigin, rayDir, AZ::Vector3::CreateAxisY(2.5f), AZ::Vector3::CreateAxisY(1.0f), 5.0f, 1.0f, t); + EXPECT_TRUE(hit); + EXPECT_THAT(t, ::testing::FloatNear(2.5f, 0.0001f)); + } } // namespace UnitTest diff --git a/Code/LauncherUnified/CMakeLists.txt b/Code/LauncherUnified/CMakeLists.txt index c3d152a777..845c2cd6c7 100644 --- a/Code/LauncherUnified/CMakeLists.txt +++ b/Code/LauncherUnified/CMakeLists.txt @@ -111,6 +111,7 @@ ly_install_directory( Platform/${PAL_PLATFORM_NAME} Platform/Common DESTINATION LauncherGenerator/Platform + VERBATIM ) ly_install_files( FILES FindLauncherGenerator.cmake diff --git a/Code/Legacy/CryCommon/ProjectDefines.h b/Code/Legacy/CryCommon/ProjectDefines.h index f7f73f111b..203bd304c9 100644 --- a/Code/Legacy/CryCommon/ProjectDefines.h +++ b/Code/Legacy/CryCommon/ProjectDefines.h @@ -27,7 +27,7 @@ #define AZ_RESTRICTED_SECTION PROJECTDEFINES_H_SECTION_STATS_AGENT #include AZ_RESTRICTED_FILE(ProjectDefines_h) #elif defined(WIN32) || defined(WIN64) - #if !defined(_RELEASE) || defined(PERFORMANCE_BUILD) + #if !defined(_RELEASE) #define ENABLE_STATS_AGENT #endif #endif @@ -71,7 +71,7 @@ #define REMOTE_ASSET_PROCESSOR #endif -#if (!defined(_RELEASE) || defined(PERFORMANCE_BUILD)) +#if !defined(_RELEASE) #define USE_HTTP_WEBSOCKETS 0 #endif @@ -97,7 +97,7 @@ #endif #endif -#if (!defined(_RELEASE) || defined(PERFORMANCE_BUILD)) +#if !defined(_RELEASE) #ifndef ENABLE_PROFILING_CODE #define ENABLE_PROFILING_CODE #endif diff --git a/Code/Legacy/CrySystem/SystemInit.cpp b/Code/Legacy/CrySystem/SystemInit.cpp index d5efff2748..a335dae112 100644 --- a/Code/Legacy/CrySystem/SystemInit.cpp +++ b/Code/Legacy/CrySystem/SystemInit.cpp @@ -1433,10 +1433,6 @@ AZ_POP_DISABLE_WARNING #endif } -#if defined(PERFORMANCE_BUILD) - LoadConfiguration("performance.cfg"); -#endif - ////////////////////////////////////////////////////////////////////////// if (g_cvars.sys_asserts == 0) { diff --git a/Code/Legacy/CrySystem/XConsole.cpp b/Code/Legacy/CrySystem/XConsole.cpp index bb8316981a..1cc9696a06 100644 --- a/Code/Legacy/CrySystem/XConsole.cpp +++ b/Code/Legacy/CrySystem/XConsole.cpp @@ -297,7 +297,7 @@ void CXConsole::Init(ISystem* pSystem) AzFramework::InputChannelEventListener::Connect(); AzFramework::InputTextEventListener::Connect(); -#if defined(_RELEASE) && !defined(PERFORMANCE_BUILD) +#if defined(_RELEASE) static const int kDeactivateConsoleDefault = 1; #else static const int kDeactivateConsoleDefault = 0; diff --git a/Code/Tools/TestImpactFramework/Frontend/Console/Code/CMakeLists.txt b/Code/Tools/TestImpactFramework/Frontend/Console/Code/CMakeLists.txt index 1aed0aadc6..9c1ccb2255 100644 --- a/Code/Tools/TestImpactFramework/Frontend/Console/Code/CMakeLists.txt +++ b/Code/Tools/TestImpactFramework/Frontend/Console/Code/CMakeLists.txt @@ -6,6 +6,10 @@ # # +if(LY_MONOLITHIC_GAME) + return() +endif() + ly_add_target( NAME TestImpact.Frontend.Console.Static STATIC NAMESPACE AZ diff --git a/Gems/Atom/Feature/Common/Code/CMakeLists.txt b/Gems/Atom/Feature/Common/Code/CMakeLists.txt index 8ed02f2c2f..b8c414dcc6 100644 --- a/Gems/Atom/Feature/Common/Code/CMakeLists.txt +++ b/Gems/Atom/Feature/Common/Code/CMakeLists.txt @@ -39,7 +39,7 @@ ly_add_target( Gem::Atom_Utils.Static Gem::Atom_Feature_Common.Public Gem::ImGui.imguilib - 3rdParty::lux_core + #3rdParty::lux_core # AZ_TRAIT_LUXCORE_SUPPORTED is disabled in every platform, Issue #3915 will remove ) ly_add_target( @@ -87,7 +87,7 @@ ly_add_target( AZ::AzFramework Gem::Atom_Feature_Common.Static Gem::Atom_Feature_Common.Public - 3rdParty::lux_core + #3rdParty::lux_core # AZ_TRAIT_LUXCORE_SUPPORTED is disabled in every platform, Issue #3915 will remove ) if(PAL_TRAIT_BUILD_HOST_TOOLS) diff --git a/Gems/Atom/Feature/Common/Code/Source/Platform/Windows/platform_windows.cmake b/Gems/Atom/Feature/Common/Code/Source/Platform/Windows/platform_windows.cmake index b74260a5de..ecdc7d59ab 100644 --- a/Gems/Atom/Feature/Common/Code/Source/Platform/Windows/platform_windows.cmake +++ b/Gems/Atom/Feature/Common/Code/Source/Platform/Windows/platform_windows.cmake @@ -6,6 +6,10 @@ # # +if(LY_MONOLITHIC_GAME) # Do not use OpenImageIO in monolithic game + return() +endif() + set(LY_BUILD_DEPENDENCIES PRIVATE 3rdParty::OpenImageIO diff --git a/Gems/Atom/RHI/3rdParty/Findrenderdoc.cmake b/Gems/Atom/RHI/3rdParty/Findrenderdoc.cmake new file mode 100644 index 0000000000..7b7c312169 --- /dev/null +++ b/Gems/Atom/RHI/3rdParty/Findrenderdoc.cmake @@ -0,0 +1,15 @@ +# +# 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 +# +# + +ly_add_external_target( + NAME renderdoc + 3RDPARTY_ROOT_DIRECTORY "${LY_RENDERDOC_PATH}" + VERSION + INCLUDE_DIRECTORIES . + COMPILE_DEFINITIONS USE_RENDER_DOC +) diff --git a/Gems/Atom/RHI/Code/Platform/AppleTV/AtomRHITests_traits_appletv.cmake b/Gems/Atom/RHI/3rdParty/Platform/Linux/renderdoc_linux.cmake similarity index 69% rename from Gems/Atom/RHI/Code/Platform/AppleTV/AtomRHITests_traits_appletv.cmake rename to Gems/Atom/RHI/3rdParty/Platform/Linux/renderdoc_linux.cmake index 1aeb95c7b1..a74d250901 100644 --- a/Gems/Atom/RHI/Code/Platform/AppleTV/AtomRHITests_traits_appletv.cmake +++ b/Gems/Atom/RHI/3rdParty/Platform/Linux/renderdoc_linux.cmake @@ -6,5 +6,4 @@ # # -set(ATOM_RHI_TRAIT_BUILD_SUPPORTS_TEST FALSE) -set(ATOM_RHI_TRAIT_BUILD_SUPPORTS_EDIT FALSE) +set(RENDERDOC_RUNTIME_DEPENDENCIES "${BASE_PATH}/librenderdoc.so") diff --git a/Gems/Atom/RHI/3rdParty/Platform/Windows/renderdoc_windows.cmake b/Gems/Atom/RHI/3rdParty/Platform/Windows/renderdoc_windows.cmake new file mode 100644 index 0000000000..559863ca07 --- /dev/null +++ b/Gems/Atom/RHI/3rdParty/Platform/Windows/renderdoc_windows.cmake @@ -0,0 +1,9 @@ +# +# Copyright (c) Contributors to the Open 3D Engine Project. +# For complete copyright and license terms please see the LICENSE at the root of this distribution. +# +# SPDX-License-Identifier: Apache-2.0 OR MIT +# +# + +set(RENDERDOC_RUNTIME_DEPENDENCIES "${BASE_PATH}/renderdoc.dll") diff --git a/Gems/Atom/RHI/CMakeLists.txt b/Gems/Atom/RHI/CMakeLists.txt index 28a3e1ad7d..074f6acfd7 100644 --- a/Gems/Atom/RHI/CMakeLists.txt +++ b/Gems/Atom/RHI/CMakeLists.txt @@ -6,6 +6,8 @@ # # +ly_add_external_target_path(${CMAKE_CURRENT_LIST_DIR}/3rdParty) + add_subdirectory(Code) add_subdirectory(DX12) add_subdirectory(Metal) diff --git a/Gems/Atom/RHI/Code/CMakeLists.txt b/Gems/Atom/RHI/Code/CMakeLists.txt index 343736ff7c..879fc7d2ce 100644 --- a/Gems/Atom/RHI/Code/CMakeLists.txt +++ b/Gems/Atom/RHI/Code/CMakeLists.txt @@ -11,19 +11,11 @@ ly_get_list_relative_pal_filename(pal_source_dir ${CMAKE_CURRENT_LIST_DIR}/Sourc include(${pal_dir}/AtomRHITests_traits_${PAL_PLATFORM_NAME_LOWERCASE}.cmake) -set(LY_RENDERDOC_ENABLED OFF CACHE BOOL "Enable RenderDoc integration.") -set(RENDERDOC_CMAKE ${CMAKE_CURRENT_SOURCE_DIR}/${pal_dir}/renderdoc_${PAL_PLATFORM_NAME_LOWERCASE}.cmake) -if(EXISTS ${RENDERDOC_CMAKE}) - include(${RENDERDOC_CMAKE}) -endif() - -if(LY_RENDERDOC_ENABLED AND TARGET "3rdParty::renderdoc") - message(STATUS "Renderdoc found, adding as runtime dependency") - set(USE_RENDERDOC_DEFINE "USE_RENDERDOC") - set(RENDERDOC_BUILD_DEPENDENCY "3rdParty::renderdoc") -else() - set(USE_RENDERDOC_DEFINE "") - set(RENDERDOC_BUILD_DEPENDENCY "") +if(PAL_TRAIT_BUILD_RENDERDOC_SUPPORTED) + set(LY_RENDERDOC_ENABLED OFF CACHE BOOL "Enable RenderDoc integration. Use LY_RENDERDOC_PATH to specific the path to RenderDoc.") + if(LY_RENDERDOC_ENABLED) + set(RENDERDOC_DEPENDENCY 3rdParty::renderdoc) + endif() endif() ly_add_target( @@ -62,10 +54,10 @@ ly_add_target( AZ::AzFramework Gem::Atom_RHI.Reflect PUBLIC - ${RENDERDOC_BUILD_DEPENDENCY} + ${RENDERDOC_DEPENDENCY} COMPILE_DEFINITIONS PUBLIC - ${USE_RENDERDOC_DEFINE} + ${RENDERDOC_DEFINE} ) ly_add_target( diff --git a/Gems/Atom/RHI/Code/Platform/Android/AtomRHITests_traits_android.cmake b/Gems/Atom/RHI/Code/Platform/Android/AtomRHITests_traits_android.cmake index 1aeb95c7b1..5b77ec1593 100644 --- a/Gems/Atom/RHI/Code/Platform/Android/AtomRHITests_traits_android.cmake +++ b/Gems/Atom/RHI/Code/Platform/Android/AtomRHITests_traits_android.cmake @@ -8,3 +8,4 @@ set(ATOM_RHI_TRAIT_BUILD_SUPPORTS_TEST FALSE) set(ATOM_RHI_TRAIT_BUILD_SUPPORTS_EDIT FALSE) +set(PAL_TRAIT_BUILD_RENDERDOC_SUPPORTED FALSE) diff --git a/Gems/Atom/RHI/Code/Platform/Linux/AtomRHITests_traits_linux.cmake b/Gems/Atom/RHI/Code/Platform/Linux/AtomRHITests_traits_linux.cmake index 64d44f1648..5379a47e49 100644 --- a/Gems/Atom/RHI/Code/Platform/Linux/AtomRHITests_traits_linux.cmake +++ b/Gems/Atom/RHI/Code/Platform/Linux/AtomRHITests_traits_linux.cmake @@ -8,3 +8,9 @@ set(ATOM_RHI_TRAIT_BUILD_SUPPORTS_TEST FALSE) set(ATOM_RHI_TRAIT_BUILD_SUPPORTS_EDIT TRUE) +if(LY_MONOLITHIC_GAME) + set(PAL_TRAIT_BUILD_RENDERDOC_SUPPORTED FALSE) +else() + set(PAL_TRAIT_BUILD_RENDERDOC_SUPPORTED TRUE) +endif() +set(LY_RENDERDOC_PATH "/usr/local" CACHE PATH "Path to RenderDoc.") diff --git a/Gems/Atom/RHI/Code/Platform/Linux/renderdoc_linux.cmake b/Gems/Atom/RHI/Code/Platform/Linux/renderdoc_linux.cmake deleted file mode 100644 index 222a3d5768..0000000000 --- a/Gems/Atom/RHI/Code/Platform/Linux/renderdoc_linux.cmake +++ /dev/null @@ -1,29 +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 -# -# - -# Prevent bundling the renderdoc dll with a packaged title -if(NOT LY_MONOLITHIC_GAME) - if(DEFINED ENV{"ATOM_RENDERDOC_PATH"}) - set(RENDERDOC_PATH ENV{"ATOM_RENDERDOC_PATH"}) - endif() - - if(RENDERDOC_PATH) - # Normalize file path - file(TO_CMAKE_PATH "${RENDERDOC_PATH}" RENDERDOC_PATH) - - if(EXISTS "${RENDERDOC_PATH}/librenderdoc.so") - ly_add_external_target( - NAME renderdoc - VERSION - 3RDPARTY_ROOT_DIRECTORY ${RENDERDOC_PATH} - INCLUDE_DIRECTORIES "." - RUNTIME_DEPENDENCIES "${RENDERDOC_PATH}/librenderdoc.so" - ) - endif() - endif() -endif() \ No newline at end of file diff --git a/Gems/Atom/RHI/Code/Platform/Mac/AtomRHITests_traits_mac.cmake b/Gems/Atom/RHI/Code/Platform/Mac/AtomRHITests_traits_mac.cmake index a5f701c3cf..419331db3b 100644 --- a/Gems/Atom/RHI/Code/Platform/Mac/AtomRHITests_traits_mac.cmake +++ b/Gems/Atom/RHI/Code/Platform/Mac/AtomRHITests_traits_mac.cmake @@ -8,3 +8,4 @@ set(ATOM_RHI_TRAIT_BUILD_SUPPORTS_TEST TRUE) set(ATOM_RHI_TRAIT_BUILD_SUPPORTS_EDIT TRUE) +set(PAL_TRAIT_BUILD_RENDERDOC_SUPPORTED FALSE) diff --git a/Gems/Atom/RHI/Code/Platform/Windows/AtomRHITests_traits_windows.cmake b/Gems/Atom/RHI/Code/Platform/Windows/AtomRHITests_traits_windows.cmake index a5f701c3cf..78a4c4c069 100644 --- a/Gems/Atom/RHI/Code/Platform/Windows/AtomRHITests_traits_windows.cmake +++ b/Gems/Atom/RHI/Code/Platform/Windows/AtomRHITests_traits_windows.cmake @@ -8,3 +8,9 @@ set(ATOM_RHI_TRAIT_BUILD_SUPPORTS_TEST TRUE) set(ATOM_RHI_TRAIT_BUILD_SUPPORTS_EDIT TRUE) +if(LY_MONOLITHIC_GAME) + set(PAL_TRAIT_BUILD_RENDERDOC_SUPPORTED FALSE) +else() + set(PAL_TRAIT_BUILD_RENDERDOC_SUPPORTED TRUE) +endif() +set(LY_RENDERDOC_PATH "$ENV{PROGRAMFILES}/RenderDoc" CACHE PATH "Path to RenderDoc.") diff --git a/Gems/Atom/RHI/Code/Platform/Windows/renderdoc_windows.cmake b/Gems/Atom/RHI/Code/Platform/Windows/renderdoc_windows.cmake deleted file mode 100644 index 90c44bcb7c..0000000000 --- a/Gems/Atom/RHI/Code/Platform/Windows/renderdoc_windows.cmake +++ /dev/null @@ -1,31 +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 -# -# - -# Prevent bundling the renderdoc dll with a packaged title -if(NOT LY_MONOLITHIC_GAME) - # Common installation path for renderdoc path - set(RENDERDOC_PATH "$ENV{PROGRAMFILES}/RenderDoc") - if(DEFINED ENV{"ATOM_RENDERDOC_PATH"}) - set(RENDERDOC_PATH ENV{"ATOM_RENDERDOC_PATH"}) - endif() - - if(RENDERDOC_PATH) - # Normalize file path - file(TO_CMAKE_PATH "${RENDERDOC_PATH}" RENDERDOC_PATH) - - if(EXISTS "${RENDERDOC_PATH}/renderdoc.dll") - ly_add_external_target( - NAME renderdoc - VERSION - 3RDPARTY_ROOT_DIRECTORY ${RENDERDOC_PATH} - INCLUDE_DIRECTORIES "." - RUNTIME_DEPENDENCIES "${RENDERDOC_PATH}/renderdoc.dll" - ) - endif() - endif() -endif() \ No newline at end of file diff --git a/Gems/Atom/RHI/Code/Platform/iOS/AtomRHITests_traits_ios.cmake b/Gems/Atom/RHI/Code/Platform/iOS/AtomRHITests_traits_ios.cmake index 1aeb95c7b1..5b77ec1593 100644 --- a/Gems/Atom/RHI/Code/Platform/iOS/AtomRHITests_traits_ios.cmake +++ b/Gems/Atom/RHI/Code/Platform/iOS/AtomRHITests_traits_ios.cmake @@ -8,3 +8,4 @@ set(ATOM_RHI_TRAIT_BUILD_SUPPORTS_TEST FALSE) set(ATOM_RHI_TRAIT_BUILD_SUPPORTS_EDIT FALSE) +set(PAL_TRAIT_BUILD_RENDERDOC_SUPPORTED FALSE) diff --git a/Gems/Atom/RHI/Vulkan/Code/CMakeLists.txt b/Gems/Atom/RHI/Vulkan/Code/CMakeLists.txt index 39c49ab07f..f4148b435e 100644 --- a/Gems/Atom/RHI/Vulkan/Code/CMakeLists.txt +++ b/Gems/Atom/RHI/Vulkan/Code/CMakeLists.txt @@ -37,6 +37,7 @@ if(NOT PAL_TRAIT_ATOM_RHI_VULKAN_SUPPORTED) NAMESPACE Gem FILES_CMAKE ${pal_source_dir}/platform_builders_${PAL_PLATFORM_NAME_LOWERCASE}_files.cmake + ${pal_include_dir}/platform_builders_${PAL_PLATFORM_NAME_LOWERCASE}_files.cmake atom_rhi_vulkan_reflect_common_files.cmake atom_rhi_vulkan_glad_files.cmake atom_rhi_vulkan_builders_common_files.cmake @@ -90,6 +91,7 @@ ly_add_target( FILES_CMAKE atom_rhi_vulkan_private_common_files.cmake ${pal_source_dir}/platform_private_${PAL_PLATFORM_NAME_LOWERCASE}_files.cmake + ${pal_include_dir}/platform_private_${PAL_PLATFORM_NAME_LOWERCASE}_files.cmake PLATFORM_INCLUDE_FILES ${pal_source_dir}/platform_private_static_${PAL_PLATFORM_NAME_LOWERCASE}.cmake INCLUDE_DIRECTORIES diff --git a/Gems/Atom/RHI/Vulkan/Code/Source/Platform/Windows/RHI/WSISurface_Windows.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/Platform/Windows/RHI/WSISurface_Windows.cpp index 02c776293d..d7e4bd2556 100644 --- a/Gems/Atom/RHI/Vulkan/Code/Source/Platform/Windows/RHI/WSISurface_Windows.cpp +++ b/Gems/Atom/RHI/Vulkan/Code/Source/Platform/Windows/RHI/WSISurface_Windows.cpp @@ -8,6 +8,7 @@ #include #include #include +#include namespace AZ { diff --git a/Gems/Atom/RPI/Code/Source/RPI.Builders/Model/MaterialAssetBuilderComponent.cpp b/Gems/Atom/RPI/Code/Source/RPI.Builders/Model/MaterialAssetBuilderComponent.cpp index 4c2876dc0c..0ac5b61662 100644 --- a/Gems/Atom/RPI/Code/Source/RPI.Builders/Model/MaterialAssetBuilderComponent.cpp +++ b/Gems/Atom/RPI/Code/Source/RPI.Builders/Model/MaterialAssetBuilderComponent.cpp @@ -80,7 +80,8 @@ namespace AZ bool includeMaterialPropertyNames = true; RPI::MaterialConverterBus::BroadcastResult(includeMaterialPropertyNames, &RPI::MaterialConverterBus::Events::ShouldIncludeMaterialPropertyNames); - if (conversionEnabled && !materialTypePath.empty() && !includeMaterialPropertyNames) + // TODO: Use includeMaterialPropertyNames to break materialtype dependency on fbx files. Materialasset's dependency on materialtypeasset will need to be decoupled first + if (conversionEnabled && !materialTypePath.empty() /*&& !includeMaterialPropertyNames*/) { AssetBuilderSDK::SourceFileDependency materialTypeSource; materialTypeSource.m_sourceFileDependencyPath = materialTypePath; 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 62e2f834c8..4210c82921 100644 --- a/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Viewport/RenderViewportWidget.h +++ b/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Viewport/RenderViewportWidget.h @@ -92,20 +92,12 @@ namespace AtomToolsFramework // AzToolsFramework::ViewportInteraction::ViewportInteractionRequestBus::Handler ... AzFramework::CameraState GetCameraState() override; - bool GridSnappingEnabled() override; - float GridSize() override; - bool ShowGrid() override; - bool AngleSnappingEnabled() override; - float AngleStep() override; AzFramework::ScreenPoint ViewportWorldToScreen(const AZ::Vector3& worldPosition) override; AZStd::optional ViewportScreenToWorld(const AzFramework::ScreenPoint& screenPosition, float depth) override; AZStd::optional ViewportScreenToWorldRay( const AzFramework::ScreenPoint& screenPosition) override; float DeviceScalingFactor() override; - //! Set interface for providing viewport specific settings (e.g. snapping properties). - void SetViewportSettings(const AzToolsFramework::ViewportInteraction::ViewportSettings* viewportSettings); - // AzToolsFramework::ViewportInteraction::ViewportMouseCursorRequestBus::Handler ... void BeginCursorCapture() override; void EndCursorCapture() override; @@ -147,7 +139,7 @@ namespace AtomToolsFramework AzFramework::ViewportControllerListPtr m_controllerList; // The default camera for our viewport i.e. the one used when a camera entity hasn't been activated. AZ::RPI::ViewPtr m_defaultCamera; - // Our viewport-local auxgeom pipeline for supplemental rendering. + // Our viewport-local aux geom pipeline for supplemental rendering. AZ::RPI::AuxGeomDrawPtr m_auxGeom; // Used to keep track of a pending resize event to avoid initialization before window activate. bool m_windowResizedEvent = false; @@ -159,8 +151,6 @@ namespace AtomToolsFramework QElapsedTimer m_renderTimer; // The time of the last recorded tick event from the system tick bus. AZ::ScriptTimePoint m_time; - // The viewport settings (e.g. grid snapping, grid size) for this viewport. - const AzToolsFramework::ViewportInteraction::ViewportSettings* m_viewportSettings = nullptr; // Maps our internal Qt events into AzFramework InputChannels for our ViewportControllerList. AzToolsFramework::QtEventToAzInputMapper* m_inputChannelMapper = nullptr; }; diff --git a/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Viewport/RenderViewportWidget.cpp b/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Viewport/RenderViewportWidget.cpp index cbb30ba6da..027ac80151 100644 --- a/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Viewport/RenderViewportWidget.cpp +++ b/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Viewport/RenderViewportWidget.cpp @@ -315,36 +315,6 @@ namespace AtomToolsFramework return cameraState; } - bool RenderViewportWidget::GridSnappingEnabled() - { - return m_viewportSettings ? m_viewportSettings->GridSnappingEnabled() : false; - } - - float RenderViewportWidget::GridSize() - { - return m_viewportSettings ? m_viewportSettings->GridSize() : 0.0f; - } - - bool RenderViewportWidget::ShowGrid() - { - return m_viewportSettings ? m_viewportSettings->ShowGrid() : false; - } - - bool RenderViewportWidget::AngleSnappingEnabled() - { - return m_viewportSettings ? m_viewportSettings->AngleSnappingEnabled() : false; - } - - float RenderViewportWidget::AngleStep() - { - return m_viewportSettings ? m_viewportSettings->AngleStep() : 0.0f; - } - - void RenderViewportWidget::SetViewportSettings(const AzToolsFramework::ViewportInteraction::ViewportSettings* viewportSettings) - { - m_viewportSettings = viewportSettings; - } - AzFramework::ScreenPoint RenderViewportWidget::ViewportWorldToScreen(const AZ::Vector3& worldPosition) { if (AZ::RPI::ViewPtr currentView = m_viewportContext->GetDefaultView(); diff --git a/Gems/CrashReporting/Code/CMakeLists.txt b/Gems/CrashReporting/Code/CMakeLists.txt index b12b5d8944..8bcb143d1c 100644 --- a/Gems/CrashReporting/Code/CMakeLists.txt +++ b/Gems/CrashReporting/Code/CMakeLists.txt @@ -35,17 +35,20 @@ ly_add_target( ly_create_alias(NAME CrashReporting.Clients NAMESPACE Gem TARGETS Gem::CrashReporting) ly_create_alias(NAME CrashReporting.Servers NAMESPACE Gem TARGETS Gem::CrashReporting) +if(NOT LY_MONOLITHIC_GAME) -ly_add_target( - NAME CrashReporting.Uploader APPLICATION - NAMESPACE AZ - FILES_CMAKE - game_crash_uploader_files.cmake - Platform/${PAL_PLATFORM_NAME}/game_crash_uploader_${PAL_PLATFORM_NAME_LOWERCASE}_files.cmake - INCLUDE_DIRECTORIES - PRIVATE - Include - BUILD_DEPENDENCIES - PRIVATE - AZ::CrashUploaderSupport -) + ly_add_target( + NAME CrashReporting.Uploader APPLICATION + NAMESPACE AZ + FILES_CMAKE + game_crash_uploader_files.cmake + Platform/${PAL_PLATFORM_NAME}/game_crash_uploader_${PAL_PLATFORM_NAME_LOWERCASE}_files.cmake + INCLUDE_DIRECTORIES + PRIVATE + Include + BUILD_DEPENDENCIES + PRIVATE + AZ::CrashUploaderSupport + ) + +endif() diff --git a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/MotionSetsWindow/MotionSetsWindowPlugin.cpp b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/MotionSetsWindow/MotionSetsWindowPlugin.cpp index bb84dee35d..cf23c2e79e 100644 --- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/MotionSetsWindow/MotionSetsWindowPlugin.cpp +++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/MotionSetsWindow/MotionSetsWindowPlugin.cpp @@ -120,79 +120,51 @@ namespace EMStudio MotionSetsWindowPlugin* m_plugin; }; - - // constructor MotionSetsWindowPlugin::MotionSetsWindowPlugin() : EMStudio::DockWidgetPlugin() { m_dialogStack = nullptr; m_selectedSet = nullptr; - m_createMotionSetCallback = nullptr; - m_reinitCallback = nullptr; - m_adjustMotionSetCallback = nullptr; - m_motionSetAddMotionCallback = nullptr; - m_motionSetRemoveMotionCallback = nullptr; - m_motionSetAdjustMotionCallback = nullptr; - m_loadMotionSetCallback = nullptr; m_motionSetManagementWindow = nullptr; m_motionSetWindow = nullptr; m_dirtyFilesCallback = nullptr; } - - // destructor MotionSetsWindowPlugin::~MotionSetsWindowPlugin() { - GetCommandManager()->RemoveCommandCallback(m_createMotionSetCallback, false); - GetCommandManager()->RemoveCommandCallback(m_reinitCallback, false); - GetCommandManager()->RemoveCommandCallback(m_adjustMotionSetCallback, false); - GetCommandManager()->RemoveCommandCallback(m_motionSetAddMotionCallback, false); - GetCommandManager()->RemoveCommandCallback(m_motionSetRemoveMotionCallback, false); - GetCommandManager()->RemoveCommandCallback(m_motionSetAdjustMotionCallback, false); - GetCommandManager()->RemoveCommandCallback(m_loadMotionSetCallback, false); - - delete m_createMotionSetCallback; - delete m_reinitCallback; - delete m_adjustMotionSetCallback; - delete m_motionSetAddMotionCallback; - delete m_motionSetRemoveMotionCallback; - delete m_motionSetAdjustMotionCallback; - delete m_loadMotionSetCallback; + for (MCore::Command::Callback* callback : m_callbacks) + { + GetCommandManager()->RemoveCommandCallback(callback, false); + delete callback; + } GetMainWindow()->GetDirtyFileManager()->RemoveCallback(m_dirtyFilesCallback, false); delete m_dirtyFilesCallback; } - - // clone the log window EMStudioPlugin* MotionSetsWindowPlugin::Clone() { MotionSetsWindowPlugin* newPlugin = new MotionSetsWindowPlugin(); return newPlugin; } - // init after the parent dock window has been created bool MotionSetsWindowPlugin::Init() { - m_createMotionSetCallback = new CommandCreateMotionSetCallback(false); - m_reinitCallback = new CommandReinitCallback(false); - m_adjustMotionSetCallback = new CommandAdjustMotionSetCallback(false); - m_motionSetAddMotionCallback = new CommandMotionSetAddMotionCallback(false); - m_motionSetRemoveMotionCallback = new CommandMotionSetRemoveMotionCallback(false); - m_motionSetAdjustMotionCallback = new CommandMotionSetAdjustMotionCallback(false); - m_loadMotionSetCallback = new CommandLoadMotionSetCallback(false); + auto AddCallback = [=](const char* commandName, MCore::Command::Callback* callback) + { + m_callbacks.emplace_back(callback); + GetCommandManager()->RegisterCommandCallback(commandName, m_callbacks.back()); + }; - GetCommandManager()->RegisterCommandCallback("CreateMotionSet", m_createMotionSetCallback); - GetCommandManager()->RegisterCommandCallback("RemoveMotionSet", m_reinitCallback); - GetCommandManager()->RegisterCommandCallback("AdjustMotionSet", m_adjustMotionSetCallback); - - GetCommandManager()->RegisterCommandCallback("MotionSetAddMotion", m_motionSetAddMotionCallback); - GetCommandManager()->RegisterCommandCallback("MotionSetRemoveMotion", m_motionSetRemoveMotionCallback); - GetCommandManager()->RegisterCommandCallback("MotionSetAdjustMotion", m_motionSetAdjustMotionCallback); - GetCommandManager()->RegisterCommandCallback("LoadMotionSet", m_loadMotionSetCallback); - - GetCommandManager()->RegisterCommandCallback("RemoveMotion", m_reinitCallback); + AddCallback("CreateMotionSet", new CommandReinitCallback(false)); + AddCallback("RemoveMotionSet", new CommandReinitCallback(false)); + AddCallback("RemoveMotion", new CommandReinitCallback(false)); + AddCallback("AdjustMotionSet", new CommandAdjustMotionSetCallback(false)); + AddCallback("MotionSetAddMotion", new CommandMotionSetAddMotionCallback(false)); + AddCallback("MotionSetRemoveMotion", new CommandMotionSetRemoveMotionCallback(false)); + AddCallback("MotionSetAdjustMotion", new CommandMotionSetAdjustMotionCallback(false)); + AddCallback("LoadMotionSet", new CommandLoadMotionSetCallback(false)); // create the dialog stack assert(m_dialogStack == nullptr); @@ -393,12 +365,7 @@ namespace EMStudio } MotionSetsWindowPlugin* motionSetsPlugin = (MotionSetsWindowPlugin*)plugin; - - // is the plugin visible? only update it if it is visible - if (motionSetsPlugin->GetDockWidget()->visibleRegion().isEmpty() == false) - { - motionSetsPlugin->ReInit(); - } + motionSetsPlugin->ReInit(); return true; } @@ -504,26 +471,14 @@ namespace EMStudio } - bool MotionSetsWindowPlugin::CommandCreateMotionSetCallback::Execute([[maybe_unused]] MCore::Command* command, const MCore::CommandLine& commandLine) - { - MCORE_UNUSED(commandLine); - return ReInitMotionSetsPlugin(); - } - - - bool MotionSetsWindowPlugin::CommandCreateMotionSetCallback::Undo(MCore::Command* command, const MCore::CommandLine& commandLine) { MCORE_UNUSED(command); MCORE_UNUSED(commandLine); return ReInitMotionSetsPlugin(); } - - bool MotionSetsWindowPlugin::CommandReinitCallback::Execute([[maybe_unused]] MCore::Command* command, const MCore::CommandLine& commandLine) { MCORE_UNUSED(commandLine); return ReInitMotionSetsPlugin(); } - bool MotionSetsWindowPlugin::CommandReinitCallback::Undo(MCore::Command* command, const MCore::CommandLine& commandLine) { MCORE_UNUSED(command); MCORE_UNUSED(commandLine); return ReInitMotionSetsPlugin(); } - bool MotionSetsWindowPlugin::CommandAdjustMotionSetCallback::Execute(MCore::Command* command, const MCore::CommandLine& commandLine) { MCORE_UNUSED(command); @@ -544,7 +499,6 @@ namespace EMStudio return true; } - bool MotionSetsWindowPlugin::CommandAdjustMotionSetCallback::Undo(MCore::Command* command, const MCore::CommandLine& commandLine) { MCORE_UNUSED(command); diff --git a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/MotionSetsWindow/MotionSetsWindowPlugin.h b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/MotionSetsWindow/MotionSetsWindowPlugin.h index 459118c831..377ae3d849 100644 --- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/MotionSetsWindow/MotionSetsWindowPlugin.h +++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/MotionSetsWindow/MotionSetsWindowPlugin.h @@ -85,22 +85,14 @@ namespace EMStudio void WindowReInit(bool visible); private: - // declare the callbacks - MCORE_DEFINECOMMANDCALLBACK(CommandCreateMotionSetCallback); MCORE_DEFINECOMMANDCALLBACK(CommandReinitCallback); + MCORE_DEFINECOMMANDCALLBACK(CommandRemoveMotionSetCallback); MCORE_DEFINECOMMANDCALLBACK(CommandAdjustMotionSetCallback); MCORE_DEFINECOMMANDCALLBACK(CommandMotionSetAddMotionCallback); MCORE_DEFINECOMMANDCALLBACK(CommandMotionSetRemoveMotionCallback); MCORE_DEFINECOMMANDCALLBACK(CommandMotionSetAdjustMotionCallback); MCORE_DEFINECOMMANDCALLBACK(CommandLoadMotionSetCallback); - - CommandCreateMotionSetCallback* m_createMotionSetCallback; - CommandReinitCallback* m_reinitCallback; - CommandAdjustMotionSetCallback* m_adjustMotionSetCallback; - CommandMotionSetAddMotionCallback* m_motionSetAddMotionCallback; - CommandMotionSetRemoveMotionCallback* m_motionSetRemoveMotionCallback; - CommandMotionSetAdjustMotionCallback* m_motionSetAdjustMotionCallback; - CommandLoadMotionSetCallback* m_loadMotionSetCallback; + AZStd::vector m_callbacks; MotionSetManagementWindow* m_motionSetManagementWindow; MotionSetWindow* m_motionSetWindow; diff --git a/Gems/EditorPythonBindings/Code/Source/PythonProxyBus.cpp b/Gems/EditorPythonBindings/Code/Source/PythonProxyBus.cpp index e640778bbe..561daa269e 100644 --- a/Gems/EditorPythonBindings/Code/Source/PythonProxyBus.cpp +++ b/Gems/EditorPythonBindings/Code/Source/PythonProxyBus.cpp @@ -20,6 +20,7 @@ #include #include #include +#include namespace EditorPythonBindings { @@ -261,19 +262,39 @@ namespace EditorPythonBindings static void OnEventGenericHook(void* userData, const char* eventName, int eventIndex, AZ::BehaviorValueParameter* result, int numParameters, AZ::BehaviorValueParameter* parameters) { - reinterpret_cast(userData)->OnEventGenericHook(eventName, eventIndex, result, numParameters, parameters); - } - - void OnEventGenericHook(const char* eventName, [[maybe_unused]] int eventIndex, AZ::BehaviorValueParameter* result, int numParameters, AZ::BehaviorValueParameter* parameters) - { - // find the callback for the event - const auto& callbackEntry = m_callbackMap.find(eventName); - if (callbackEntry == m_callbackMap.end()) + auto editorPythonEventsInterface = AZ::Interface::Get(); + if (!editorPythonEventsInterface) { return; } - pybind11::function callback = callbackEntry->second; + // find the callback for the event + auto* handler = reinterpret_cast(userData); + const auto& callbackEntry = handler->m_callbackMap.find(eventName); + if (callbackEntry == handler->m_callbackMap.end()) + { + return; + } + + // This function can reach from multiple threads, which means OnEventGenericHook + // will require to acquire the Python GIL, make sure it tries to lock it using TryExecuteWithLock. + [[maybe_unused]] const bool executed = editorPythonEventsInterface->TryExecuteWithLock( + [handler, eventName, callback = callbackEntry->second, eventIndex, result, numParameters, parameters]() + { + handler->OnEventGenericHook(eventName, callback, eventIndex, result, numParameters, parameters); + }); + + AZ_Error("python", executed, + "Ebus(%s) event(%s) could not be executed because it could not acquire the Python GIL. " + "This occurs when there is already another thread executing python, which has the GIL locked, " + "making it not possible for this thread to callback python at the same time. " + "This is a limitation of python interpreter. Python scripts executions and event callbacks " + "from EBuses need be designed to avoid this scenario.", + handler->m_ebus->m_name.c_str(), eventName); + } + + void OnEventGenericHook(const char* eventName, pybind11::function callback, [[maybe_unused]] int eventIndex, AZ::BehaviorValueParameter* result, int numParameters, AZ::BehaviorValueParameter* parameters) + { // build the parameters to send to callback Convert::StackVariableAllocator stackVariableAllocator; pybind11::tuple pythonParamters(numParameters); diff --git a/Gems/EditorPythonBindings/Code/Source/PythonSystemComponent.cpp b/Gems/EditorPythonBindings/Code/Source/PythonSystemComponent.cpp index 8df196e7cb..139337ef00 100644 --- a/Gems/EditorPythonBindings/Code/Source/PythonSystemComponent.cpp +++ b/Gems/EditorPythonBindings/Code/Source/PythonSystemComponent.cpp @@ -258,6 +258,85 @@ namespace EditorPythonBindings void Finalize() override {} }; + // Manages the acquisition and release of the Python GIL (Global Interpreter Lock). + // Used by PythonSystemComponent to lock the GIL when executing python. + class PythonSystemComponent::PythonGILScopedLock final + { + public: + PythonGILScopedLock(AZStd::recursive_mutex& lock, int& lockRecursiveCounter, bool tryLock = false); + ~PythonGILScopedLock(); + + bool IsLocked() const; + + protected: + void Lock(bool tryLock); + void Unlock(); + + AZStd::recursive_mutex& m_lock; + int& m_lockRecursiveCounter; + bool m_locked = false; + AZStd::unique_ptr m_releaseGIL; + AZStd::unique_ptr m_acquireGIL; + }; + + PythonSystemComponent::PythonGILScopedLock::PythonGILScopedLock(AZStd::recursive_mutex& lock, int& lockRecursiveCounter, bool tryLock) + : m_lock(lock) + , m_lockRecursiveCounter(lockRecursiveCounter) + { + Lock(tryLock); + } + + PythonSystemComponent::PythonGILScopedLock::~PythonGILScopedLock() + { + Unlock(); + } + + bool PythonSystemComponent::PythonGILScopedLock::IsLocked() const + { + return m_locked; + } + + void PythonSystemComponent::PythonGILScopedLock::Lock(bool tryLock) + { + if (tryLock) + { + if (!m_lock.try_lock()) + { + return; + } + } + else + { + m_lock.lock(); + } + + m_locked = true; + m_lockRecursiveCounter++; + + // Only Acquire the GIL when there is no recursion. If there is + // recursion that means it's the same thread (because the mutex was able + // to be locked) and therefore it's already got the GIL acquired. + if (m_lockRecursiveCounter == 1) + { + m_releaseGIL = AZStd::make_unique(); + m_acquireGIL = AZStd::make_unique(); + } + } + + void PythonSystemComponent::PythonGILScopedLock::Unlock() + { + if (!m_locked) + { + return; + } + + m_acquireGIL.reset(); + m_releaseGIL.reset(); + m_lockRecursiveCounter--; + m_locked = false; + m_lock.unlock(); + } + void PythonSystemComponent::Reflect(AZ::ReflectContext* context) { if (AZ::SerializeContext* serialize = azrtti_cast(context)) @@ -296,9 +375,9 @@ namespace EditorPythonBindings void PythonSystemComponent::Deactivate() { + StopPython(true); AzToolsFramework::EditorPythonRunnerRequestBus::Handler::BusDisconnect(); AZ::Interface::Unregister(this); - StopPython(true); } bool PythonSystemComponent::StartPython([[maybe_unused]] bool silenceWarnings) @@ -354,7 +433,6 @@ namespace EditorPythonBindings bool result = false; EditorPythonBindingsNotificationBus::Broadcast(&EditorPythonBindingsNotificationBus::Events::OnPreFinalize); - AzToolsFramework::EditorPythonRunnerRequestBus::Handler::BusDisconnect(); result = StopPythonInterpreter(); EditorPythonBindingsNotificationBus::Broadcast(&EditorPythonBindingsNotificationBus::Events::OnPostFinalize); @@ -374,12 +452,21 @@ namespace EditorPythonBindings void PythonSystemComponent::ExecuteWithLock(AZStd::function executionCallback) { - AZStd::lock_guard lock(m_lock); - pybind11::gil_scoped_release release; - pybind11::gil_scoped_acquire acquire; + PythonGILScopedLock lock(m_lock, m_lockRecursiveCounter); executionCallback(); } + bool PythonSystemComponent::TryExecuteWithLock(AZStd::function executionCallback) + { + PythonGILScopedLock lock(m_lock, m_lockRecursiveCounter, true /*tryLock*/); + if (lock.IsLocked()) + { + executionCallback(); + return true; + } + return false; + } + void PythonSystemComponent::DiscoverPythonPaths(PythonPathStack& pythonPathStack) { // the order of the Python paths is the order the Python bootstrap scripts will execute @@ -548,8 +635,7 @@ namespace EditorPythonBindings RedirectOutput::Intialize(PyImport_ImportModule("azlmbr_redirect")); // Acquire GIL before calling Python code - AZStd::lock_guard lock(m_lock); - pybind11::gil_scoped_acquire acquire; + PythonGILScopedLock lock(m_lock, m_lockRecursiveCounter); if (EditorPythonBindings::PythonSymbolEventBus::GetTotalNumOfEventHandlers() == 0) { @@ -622,8 +708,7 @@ namespace EditorPythonBindings &AzToolsFramework::EditorPythonScriptNotificationsBus::Events::OnStartExecuteByString, script); // Acquire GIL before calling Python code - AZStd::lock_guard lock(m_lock); - pybind11::gil_scoped_acquire acquire; + PythonGILScopedLock lock(m_lock, m_lockRecursiveCounter); // Acquire scope for __main__ for executing our script pybind11::object scope = pybind11::module::import("__main__").attr("__dict__"); @@ -741,8 +826,7 @@ namespace EditorPythonBindings try { // Acquire GIL before calling Python code - AZStd::lock_guard lock(m_lock); - pybind11::gil_scoped_acquire acquire; + PythonGILScopedLock lock(m_lock, m_lockRecursiveCounter); // Create standard "argc" / "argv" command-line parameters to pass in to the Python script via sys.argv. // argc = number of parameters. This will always be at least 1, since the first parameter is the script name. diff --git a/Gems/EditorPythonBindings/Code/Source/PythonSystemComponent.h b/Gems/EditorPythonBindings/Code/Source/PythonSystemComponent.h index 48ac27a036..0b7a804207 100644 --- a/Gems/EditorPythonBindings/Code/Source/PythonSystemComponent.h +++ b/Gems/EditorPythonBindings/Code/Source/PythonSystemComponent.h @@ -48,6 +48,7 @@ namespace EditorPythonBindings bool IsPythonActive() override; void WaitForInitialization() override; void ExecuteWithLock(AZStd::function executionCallback) override; + bool TryExecuteWithLock(AZStd::function executionCallback) override; //////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////// @@ -60,11 +61,13 @@ namespace EditorPythonBindings private: class SymbolLogHelper; + class PythonGILScopedLock; // handle multiple Python initializers and threads AZStd::atomic_int m_initalizeWaiterCount {0}; AZStd::semaphore m_initalizeWaiter; AZStd::recursive_mutex m_lock; + int m_lockRecursiveCounter = 0; AZStd::shared_ptr m_symbolLogHelper; enum class Result diff --git a/Gems/EditorPythonBindings/Code/Tests/EditorPythonBindingsTest.cpp b/Gems/EditorPythonBindings/Code/Tests/EditorPythonBindingsTest.cpp index b1e504fb47..d630605cbc 100644 --- a/Gems/EditorPythonBindings/Code/Tests/EditorPythonBindingsTest.cpp +++ b/Gems/EditorPythonBindings/Code/Tests/EditorPythonBindingsTest.cpp @@ -65,7 +65,7 @@ namespace UnitTest { // clearing up memory m_notificationSink = EditorPythonBindingsNotificationBusSink(); - m_testSink = PythonTraceMessageSink(); + m_testSink.CleanUp(); // shutdown time! PythonTestingFixture::TearDown(); @@ -333,7 +333,7 @@ sys.version { // clearing up memory m_notificationSink = EditorPythonBindingsNotificationBusSink(); - m_testSink = PythonTraceMessageSink(); + m_testSink.CleanUp(); // shutdown time! PythonTestingFixture::TearDown(); diff --git a/Gems/EditorPythonBindings/Code/Tests/PythonAssetTypesTests.cpp b/Gems/EditorPythonBindings/Code/Tests/PythonAssetTypesTests.cpp index 4d902c10ab..78ac2a0a45 100644 --- a/Gems/EditorPythonBindings/Code/Tests/PythonAssetTypesTests.cpp +++ b/Gems/EditorPythonBindings/Code/Tests/PythonAssetTypesTests.cpp @@ -366,7 +366,7 @@ namespace UnitTest void TearDown() override { // clearing up memory - m_testSink = PythonTraceMessageSink(); + m_testSink.CleanUp(); PythonTestingFixture::TearDown(); } }; diff --git a/Gems/EditorPythonBindings/Code/Tests/PythonAssociativeTests.cpp b/Gems/EditorPythonBindings/Code/Tests/PythonAssociativeTests.cpp index 54748374d0..f4573ca012 100644 --- a/Gems/EditorPythonBindings/Code/Tests/PythonAssociativeTests.cpp +++ b/Gems/EditorPythonBindings/Code/Tests/PythonAssociativeTests.cpp @@ -95,7 +95,7 @@ namespace UnitTest void TearDown() override { // clearing up memory - m_testSink = PythonTraceMessageSink(); + m_testSink.CleanUp(); PythonTestingFixture::TearDown(); } }; diff --git a/Gems/EditorPythonBindings/Code/Tests/PythonContainerAnyTests.cpp b/Gems/EditorPythonBindings/Code/Tests/PythonContainerAnyTests.cpp index 66bf562809..4fd571120b 100644 --- a/Gems/EditorPythonBindings/Code/Tests/PythonContainerAnyTests.cpp +++ b/Gems/EditorPythonBindings/Code/Tests/PythonContainerAnyTests.cpp @@ -227,7 +227,7 @@ namespace UnitTest void TearDown() override { // clearing up memory - m_testSink = PythonTraceMessageSink(); + m_testSink.CleanUp(); PythonTestingFixture::TearDown(); } }; diff --git a/Gems/EditorPythonBindings/Code/Tests/PythonDictionaryTests.cpp b/Gems/EditorPythonBindings/Code/Tests/PythonDictionaryTests.cpp index 24689bbfe3..a106d56d40 100644 --- a/Gems/EditorPythonBindings/Code/Tests/PythonDictionaryTests.cpp +++ b/Gems/EditorPythonBindings/Code/Tests/PythonDictionaryTests.cpp @@ -107,7 +107,7 @@ namespace UnitTest void TearDown() override { // clearing up memory - m_testSink = PythonTraceMessageSink(); + m_testSink.CleanUp(); PythonTestingFixture::TearDown(); } }; diff --git a/Gems/EditorPythonBindings/Code/Tests/PythonGlobalsTests.cpp b/Gems/EditorPythonBindings/Code/Tests/PythonGlobalsTests.cpp index b9af65ef48..89637c89a5 100644 --- a/Gems/EditorPythonBindings/Code/Tests/PythonGlobalsTests.cpp +++ b/Gems/EditorPythonBindings/Code/Tests/PythonGlobalsTests.cpp @@ -175,7 +175,7 @@ namespace UnitTest void TearDown() override { // clearing up memory - m_testSink = PythonTraceMessageSink(); + m_testSink.CleanUp(); PythonTestingFixture::TearDown(); } diff --git a/Gems/EditorPythonBindings/Code/Tests/PythonPairTests.cpp b/Gems/EditorPythonBindings/Code/Tests/PythonPairTests.cpp index b54606b3b6..df6c3aceac 100644 --- a/Gems/EditorPythonBindings/Code/Tests/PythonPairTests.cpp +++ b/Gems/EditorPythonBindings/Code/Tests/PythonPairTests.cpp @@ -121,7 +121,7 @@ namespace UnitTest void TearDown() override { // clearing up memory - m_testSink = PythonTraceMessageSink(); + m_testSink.CleanUp(); PythonTestingFixture::TearDown(); } }; diff --git a/Gems/EditorPythonBindings/Code/Tests/PythonProxyBusTests.cpp b/Gems/EditorPythonBindings/Code/Tests/PythonProxyBusTests.cpp index 3e93b6052b..68135cff8d 100644 --- a/Gems/EditorPythonBindings/Code/Tests/PythonProxyBusTests.cpp +++ b/Gems/EditorPythonBindings/Code/Tests/PythonProxyBusTests.cpp @@ -207,11 +207,13 @@ namespace UnitTest : AZ::EBusTraits { static const AZ::EBusAddressPolicy AddressPolicy = AZ::EBusAddressPolicy::Single; + using MutexType = AZStd::mutex; virtual ~PythonTestSingleAddressNotifications() = default; virtual void OnPing(AZ::u64 count) = 0; virtual void OnPong(AZ::u64 count) = 0; virtual void MultipleInputs(AZ::u64 one, AZ::s8 two, AZStd::string_view three) = 0; virtual AZStd::string OnAddFish(AZStd::string_view value) = 0; + virtual void OnFire() = 0; }; using PythonTestSingleAddressNotificationBus = AZ::EBus; @@ -220,7 +222,7 @@ namespace UnitTest , public AZ::BehaviorEBusHandler { AZ_EBUS_BEHAVIOR_BINDER(PythonTestNotificationHandler, "{97052D15-A4E8-461B-B065-91D16E31C4F7}", AZ::SystemAllocator, - OnPing, OnPong, MultipleInputs, OnAddFish); + OnPing, OnPong, MultipleInputs, OnAddFish, OnFire); virtual ~PythonTestNotificationHandler() = default; @@ -246,6 +248,11 @@ namespace UnitTest return result; } + void OnFire() override + { + Call(FN_OnFire); + } + static AZ::u64 s_pongCount; static AZ::u64 s_pingCount; @@ -270,6 +277,25 @@ namespace UnitTest return result; } + static void DoFire() + { + PythonTestSingleAddressNotificationBus::Broadcast(&PythonTestSingleAddressNotificationBus::Events::OnFire); + } + + static void DoFiresInParallel(int value) + { + AZStd::vector threads; + threads.reserve(value); + for (size_t i = 0; i < value; ++i) + { + threads.emplace_back(&DoFire); + } + for (AZStd::thread& thread : threads) + { + thread.join(); + } + } + static void Reset() { s_pingCount = 0; @@ -288,6 +314,7 @@ namespace UnitTest ->Event("on_pong", &PythonTestSingleAddressNotificationBus::Events::OnPong) ->Event("MultipleInputs", &PythonTestSingleAddressNotificationBus::Events::MultipleInputs) ->Event("OnAddFish", &PythonTestSingleAddressNotificationBus::Events::OnAddFish) + ->Event("OnFire", &PythonTestSingleAddressNotificationBus::Events::OnFire) ; // for testing from Python to send out the events @@ -297,6 +324,8 @@ namespace UnitTest ->Method("do_ping", &PythonTestNotificationHandler::DoPing) ->Method("do_pong", &PythonTestNotificationHandler::DoPong) ->Method("do_add_fish", &PythonTestNotificationHandler::DoAddFish) + ->Method("do_fire", &PythonTestNotificationHandler::DoFire) + ->Method("do_fires_in_parallel", &PythonTestNotificationHandler::DoFiresInParallel) ; } } @@ -358,7 +387,7 @@ namespace UnitTest void TearDown() override { // clearing up memory - m_testSink = PythonTraceMessageSink(); + m_testSink.CleanUp(); PythonTestingFixture::TearDown(); } }; @@ -809,6 +838,65 @@ namespace UnitTest EXPECT_EQ(2, m_testSink.m_evaluationMap[static_cast(LogTypes::AtAddress_Match)]); } + TEST_F(PythonBusProxyTests, SingleAddressNotifications_InParallel_Errors) + { + PythonTestNotificationHandler pythonTestNotificationHandler; + pythonTestNotificationHandler.Reflect(m_app.GetBehaviorContext()); + + AZ::Entity e; + Activate(e); + + SimulateEditorBecomingInitialized(); + + enum class LogTypes + { + Skip = 0, + Notifications_OnFire, + }; + + m_testSink.m_evaluateMessage = [](const char* window, const char* message) -> int + { + if (AzFramework::StringFunc::Equal(window, "python")) + { + if (AzFramework::StringFunc::Equal(message, "Notifications_OnFire")) + { + return static_cast(LogTypes::Notifications_OnFire); + } + } + return static_cast(LogTypes::Skip); + }; + + UnitTest::PythonTestNotificationHandler::Reset(); + + const int numFiresInParallel = 220; + + const AZStd::string script = AZStd::string::format( + "import azlmbr.bus\n" + "import azlmbr.test\n" + "\n" + "def OnFire(parameters) :\n" + " print('Notifications_OnFire')\n" + "\n" + "handler = azlmbr.bus.NotificationHandler('PythonTestSingleAddressNotificationBus')\n" + "handler.connect(None)\n" + "handler.add_callback('OnFire', OnFire)\n" + "\n" + "azlmbr.test.PythonTestNotificationHandler_do_fire()\n" + "\n" + "azlmbr.test.PythonTestNotificationHandler_do_fires_in_parallel(%d)\n" + "\n" + "handler.disconnect()\n", + numFiresInParallel); + + AZ_TEST_START_TRACE_SUPPRESSION; + AzToolsFramework::EditorPythonRunnerRequestBus::Broadcast(&AzToolsFramework::EditorPythonRunnerRequestBus::Events::ExecuteByString, script, false); + AZ_TEST_STOP_TRACE_SUPPRESSION(numFiresInParallel); // Expect numFiresInParallel errors + + e.Deactivate(); + + EXPECT_EQ(1, m_testSink.m_evaluationMap[static_cast(LogTypes::Notifications_OnFire)]); + } + TEST_F(PythonBusProxyTests, NotificationsWithNoAddress) { PythonTestNotificationHandler pythonTestNotificationHandler; diff --git a/Gems/EditorPythonBindings/Code/Tests/PythonProxyObjectTests.cpp b/Gems/EditorPythonBindings/Code/Tests/PythonProxyObjectTests.cpp index 66f2ef6eb0..9f825c8d1c 100644 --- a/Gems/EditorPythonBindings/Code/Tests/PythonProxyObjectTests.cpp +++ b/Gems/EditorPythonBindings/Code/Tests/PythonProxyObjectTests.cpp @@ -419,7 +419,7 @@ namespace UnitTest void TearDown() override { // clearing up memory - m_testSink = PythonTraceMessageSink(); + m_testSink.CleanUp(); PythonTestingFixture::TearDown(); } }; diff --git a/Gems/EditorPythonBindings/Code/Tests/PythonReflectionComponentTests.cpp b/Gems/EditorPythonBindings/Code/Tests/PythonReflectionComponentTests.cpp index 147ff89435..8d472945cc 100644 --- a/Gems/EditorPythonBindings/Code/Tests/PythonReflectionComponentTests.cpp +++ b/Gems/EditorPythonBindings/Code/Tests/PythonReflectionComponentTests.cpp @@ -532,7 +532,7 @@ namespace UnitTest void TearDown() override { // clearing up memory - m_testSink = PythonTraceMessageSink(); + m_testSink.CleanUp(); PythonTestingFixture::TearDown(); } }; diff --git a/Gems/EditorPythonBindings/Code/Tests/PythonThreadingTests.cpp b/Gems/EditorPythonBindings/Code/Tests/PythonThreadingTests.cpp index b2e18265cb..6d34405483 100644 --- a/Gems/EditorPythonBindings/Code/Tests/PythonThreadingTests.cpp +++ b/Gems/EditorPythonBindings/Code/Tests/PythonThreadingTests.cpp @@ -75,7 +75,7 @@ namespace UnitTest void TearDown() override { // clearing up memory - m_testSink = PythonTraceMessageSink(); + m_testSink.CleanUp(); PythonTestingFixture::TearDown(); } }; @@ -114,38 +114,29 @@ namespace UnitTest try { // prepare handler on this thread - pybind11::exec(R"( - import azlmbr.test + const AZStd::string_view script = + "import azlmbr.test\n" + "\n" + "def on_notification(args) :\n" + " value = args[0] + 2\n" + " print('RanInThread')\n" + " return value\n" + "\n" + "handler = azlmbr.test.PythonThreadNotificationBusHandler()\n" + "handler.connect()\n" + "handler.add_callback('OnNotification', on_notification)\n"; - def on_notification(args): - value = args[0] + 2 - print ('RanInThread') - return value - - handler = azlmbr.test.PythonThreadNotificationBusHandler() - handler.connect() - handler.add_callback('OnNotification', on_notification) - )"); + AzToolsFramework::EditorPythonRunnerRequestBus::Broadcast(&AzToolsFramework::EditorPythonRunnerRequestBus::Events::ExecuteByString, script, false /*printResult*/); // start thread; in thread issue notification auto threadCallback = []() { AZ::s64 result = 0; - auto notificationCallback = [&result]() - { - PythonThreadNotificationBus::BroadcastResult(result, &PythonThreadNotificationBus::Events::OnNotification, 40); - }; - - auto editorPythonEventsInterface = AZ::Interface::Get(); - if (editorPythonEventsInterface) - { - editorPythonEventsInterface->ExecuteWithLock(notificationCallback); - } + PythonThreadNotificationBus::BroadcastResult(result, &PythonThreadNotificationBus::Events::OnNotification, 40); EXPECT_EQ(42, result); }; AZStd::thread theThread(threadCallback); - AZStd::this_thread::sleep_for(AZStd::chrono::milliseconds(100)); theThread.join(); } catch ([[maybe_unused]] const std::exception& e) @@ -187,21 +178,11 @@ namespace UnitTest auto threadCallback = []() { AZ::s64 result = 0; - auto notificationCallback = [&result]() - { - PythonThreadNotificationBus::BroadcastResult(result, &PythonThreadNotificationBus::Events::OnNotification, 40); - }; - - auto editorPythonEventsInterface = AZ::Interface::Get(); - if (editorPythonEventsInterface) - { - editorPythonEventsInterface->ExecuteWithLock(notificationCallback); - } + PythonThreadNotificationBus::BroadcastResult(result, &PythonThreadNotificationBus::Events::OnNotification, 40); EXPECT_EQ(0, result); }; AZStd::thread theThread(threadCallback); - AZStd::this_thread::sleep_for(AZStd::chrono::milliseconds(100)); theThread.join(); // the Python script above raises an exception which causes two AZ_Error() message lines: diff --git a/Gems/EditorPythonBindings/Code/Tests/PythonTraceMessageSink.h b/Gems/EditorPythonBindings/Code/Tests/PythonTraceMessageSink.h index 7294de4910..28971aec9e 100644 --- a/Gems/EditorPythonBindings/Code/Tests/PythonTraceMessageSink.h +++ b/Gems/EditorPythonBindings/Code/Tests/PythonTraceMessageSink.h @@ -37,6 +37,15 @@ namespace UnitTest using EvaluationMap = AZStd::unordered_map; // tag to count EvaluationMap m_evaluationMap; + AZStd::mutex m_lock; + + void CleanUp() + { + AZStd::lock_guard lock(m_lock); + m_evaluateMessage = {}; + m_evaluationMap.clear(); + } + ////////////////////////////////////////////////////////////////////////// // TraceMessageDrillerBus void OnPrintf(const char* window, const char* message) override @@ -46,6 +55,8 @@ namespace UnitTest void OnOutput(const char* window, const char* message) override { + AZStd::lock_guard lock(m_lock); + if (m_evaluateMessage) { int key = m_evaluateMessage(window, message); diff --git a/Gems/LmbrCentral/Code/Source/Shape/EditorPolygonPrismShapeComponentMode.cpp b/Gems/LmbrCentral/Code/Source/Shape/EditorPolygonPrismShapeComponentMode.cpp index c26c0562eb..45411b3d88 100644 --- a/Gems/LmbrCentral/Code/Source/Shape/EditorPolygonPrismShapeComponentMode.cpp +++ b/Gems/LmbrCentral/Code/Source/Shape/EditorPolygonPrismShapeComponentMode.cpp @@ -121,13 +121,12 @@ namespace LmbrCentral m_heightManipulator->SetAxis(AZ::Vector3::CreateAxisZ()); const float lineLength = 0.5f; - const float lineWidth = 0.05f; const float coneLength = 0.28f; const float coneRadius = 0.07f; ManipulatorViews views; views.emplace_back(CreateManipulatorViewLine( *m_heightManipulator, AZ::Color(0.0f, 0.0f, 1.0f, 1.0f), - lineLength, lineWidth)); + lineLength, AzToolsFramework::ManipulatorLineBoundWidth())); views.emplace_back(CreateManipulatorViewCone(*m_heightManipulator, AZ::Color(0.0f, 0.0f, 1.0f, 1.0f), m_heightManipulator->GetAxis() * (lineLength - coneLength), coneLength, coneRadius)); diff --git a/Gems/MultiplayerCompression/Code/Source/LZ4Compressor.cpp b/Gems/MultiplayerCompression/Code/Source/LZ4Compressor.cpp index 351935d0bb..6bc5d0e3d0 100644 --- a/Gems/MultiplayerCompression/Code/Source/LZ4Compressor.cpp +++ b/Gems/MultiplayerCompression/Code/Source/LZ4Compressor.cpp @@ -56,11 +56,16 @@ namespace MultiplayerCompression AZ_Warning("Multiplayer Compressor", compDataSize >= compWorstCaseSize, "Outbuffer size (%lu B) passed to Compress() is less than estimated worst case (%lu B)", compDataSize, compWorstCaseSize); // Note that this returns a non-negative int so we are narrowing into a size_t here - compSize = LZ4_compressHC(reinterpret_cast(uncompData), reinterpret_cast(compData), static_cast(uncompSize)); + compSize = LZ4_compress_HC( + reinterpret_cast(uncompData), + reinterpret_cast(compData), + static_cast(uncompSize), + static_cast(compDataSize), + 0); if (compSize == 0) { - // LZ4_compressHC returns a zero value for corrupt data and insufficient buffer + // LZ4_compress_HC returns a zero value for corrupt data and insufficient buffer AZ_Warning("Multiplayer Compressor", false, "Compression failed for uncompSize:(%lu B) compDataSize:(%lu B) compSize:(%lu B)", uncompSize, compDataSize, compSize); return AzNetworking::CompressorError::CorruptData; } diff --git a/Gems/PhysX/Code/Editor/ColliderRotationMode.cpp b/Gems/PhysX/Code/Editor/ColliderRotationMode.cpp index a7e23bb200..5f3c98bcee 100644 --- a/Gems/PhysX/Code/Editor/ColliderRotationMode.cpp +++ b/Gems/PhysX/Code/Editor/ColliderRotationMode.cpp @@ -21,7 +21,7 @@ namespace PhysX ColliderRotationMode::ColliderRotationMode() : m_rotationManipulators(AZ::Transform::Identity()) { - + m_rotationManipulators.SetCircleBoundWidth(AzToolsFramework::ManipulatorCicleBoundWidth()); } void ColliderRotationMode::Setup(const AZ::EntityComponentIdPair& idPair) diff --git a/Gems/PhysX/Code/Editor/EditorSubComponentModeAngleCone.cpp b/Gems/PhysX/Code/Editor/EditorSubComponentModeAngleCone.cpp index 778fce1546..43b9fd77f3 100644 --- a/Gems/PhysX/Code/Editor/EditorSubComponentModeAngleCone.cpp +++ b/Gems/PhysX/Code/Editor/EditorSubComponentModeAngleCone.cpp @@ -339,14 +339,13 @@ namespace PhysX { const float coneLength = 0.28f; const float coneRadius = 0.07f; - const float lineWidth = 0.05f; - const auto configureLinearView = [lineWidth, coneLength, axisLength, coneRadius]( + const auto configureLinearView = [coneLength, axisLength, coneRadius]( AzToolsFramework::LinearManipulator* linearManipulator, const AZ::Color& color) { AzToolsFramework::ManipulatorViews views; views.emplace_back(CreateManipulatorViewLine( - *linearManipulator, color, axisLength, lineWidth)); + *linearManipulator, color, axisLength, AzToolsFramework::ManipulatorLineBoundWidth())); views.emplace_back(CreateManipulatorViewCone( *linearManipulator, color, linearManipulator->GetAxis() * (axisLength - coneLength), coneLength, coneRadius)); diff --git a/Gems/PhysX/Code/Editor/EditorSubComponentModeRotation.cpp b/Gems/PhysX/Code/Editor/EditorSubComponentModeRotation.cpp index 3119a40fa6..7586ecc955 100644 --- a/Gems/PhysX/Code/Editor/EditorSubComponentModeRotation.cpp +++ b/Gems/PhysX/Code/Editor/EditorSubComponentModeRotation.cpp @@ -84,10 +84,9 @@ namespace PhysX m_rotationManipulators[i]->SetAxis(axes[i]); m_rotationManipulators[i]->SetLocalTransform(localTransform); const float manipulatorRadius = 2.0f; - const float manipulatorWidth = 0.05f; m_rotationManipulators[i]->SetView(AzToolsFramework::CreateManipulatorViewCircle( - *m_rotationManipulators[i], colors[i], - manipulatorRadius, manipulatorWidth, AzToolsFramework::DrawHalfDottedCircle)); + *m_rotationManipulators[i], colors[i], manipulatorRadius, + AzToolsFramework::ManipulatorCicleBoundWidth(), AzToolsFramework::DrawHalfDottedCircle)); } Refresh(); diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/ExecutionBus.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/ExecutionBus.h index 37a78a88f4..ebe591e15f 100644 --- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/ExecutionBus.h +++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/ExecutionBus.h @@ -15,7 +15,7 @@ #include -#if defined(PERFORMANCE_BUILD) || !defined(_RELEASE) +#if !defined(_RELEASE) // the markers are defined in test, but the system that listens for calls won't always be enabled #define SCRIPT_CANVAS_PERFORMANCE_TRACKING_ENABLED #endif diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/Interpreted/ExecutionInterpretedAPI.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/Interpreted/ExecutionInterpretedAPI.cpp index d7a4c360ac..e93fd1263d 100644 --- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/Interpreted/ExecutionInterpretedAPI.cpp +++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/Interpreted/ExecutionInterpretedAPI.cpp @@ -465,12 +465,7 @@ namespace ScriptCanvas lua_register(lua, k_UnpackDependencyConstructionArgsFunctionName, &UnpackDependencyConstructionArgs); lua_register(lua, k_UnpackDependencyConstructionArgsLeafFunctionName, &UnpackDependencyConstructionArgsLeaf); -#if defined(PERFORMANCE_BUILD) - lua_pushboolean(lua, true); - lua_setglobal(lua, k_InterpretedConfigurationPerformance); - lua_pushboolean(lua, false); - lua_setglobal(lua, k_InterpretedConfigurationRelease); -#elif defined(_RELEASE) +#if defined(_RELEASE) lua_pushboolean(lua, false); lua_setglobal(lua, k_InterpretedConfigurationPerformance); lua_pushboolean(lua, true); @@ -481,7 +476,7 @@ namespace ScriptCanvas lua_setglobal(lua, k_InterpretedConfigurationPerformance); lua_pushboolean(lua, false); lua_setglobal(lua, k_InterpretedConfigurationRelease); -#endif//defined(PERFORMANCE_BUILD) +#endif lua_register(lua, k_GetRandomSwitchControlNumberName, &GetRandomSwitchControlNumber); diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/RuntimeComponent.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/RuntimeComponent.cpp index 6d652136cd..c1b0d51ac8 100644 --- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/RuntimeComponent.cpp +++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/RuntimeComponent.cpp @@ -19,7 +19,7 @@ #include #include -#if !defined(_RELEASE) && !defined(PERFORMANCE_BUILD) +#if !defined(_RELEASE) #define SCRIPT_CANVAS_RUNTIME_ASSET_CHECK #endif diff --git a/Gems/ScriptCanvas/Code/Source/SystemComponent.cpp b/Gems/ScriptCanvas/Code/Source/SystemComponent.cpp index ba02fa8a62..5d6b98f7cb 100644 --- a/Gems/ScriptCanvas/Code/Source/SystemComponent.cpp +++ b/Gems/ScriptCanvas/Code/Source/SystemComponent.cpp @@ -34,7 +34,7 @@ namespace ScriptCanvasSystemComponentCpp { -#if !defined(_RELEASE) && !defined(PERFORMANCE_BUILD) +#if !defined(_RELEASE) const int k_infiniteLoopDetectionMaxIterations = 1000000; const int k_maxHandlerStackDepth = 25; #else diff --git a/Registry/AssetProcessorPlatformConfig.setreg b/Registry/AssetProcessorPlatformConfig.setreg index 1c09ef4e83..3e90b063b5 100644 --- a/Registry/AssetProcessorPlatformConfig.setreg +++ b/Registry/AssetProcessorPlatformConfig.setreg @@ -172,6 +172,9 @@ "Exclude Build": { "pattern": ".*/[Bb]uild/.*" }, + "Exclude Install": { + "pattern": ".*/[Ii]nstall/.*" + }, "Exclude UserSettings": { "pattern": ".*/UserSettings.xml" }, diff --git a/Registry/CMakeLists.txt b/Registry/CMakeLists.txt index f78df700e7..100867010d 100644 --- a/Registry/CMakeLists.txt +++ b/Registry/CMakeLists.txt @@ -6,6 +6,10 @@ # # +if(LY_MONOLITHIC_GAME) + return() +endif() + ly_install_directory(DIRECTORIES .) cmake_path(RELATIVE_PATH CMAKE_RUNTIME_OUTPUT_DIRECTORY BASE_DIRECTORY ${CMAKE_BINARY_DIR} OUTPUT_VARIABLE runtime_output_directory) diff --git a/Templates/DefaultProject/Template/EngineFinder.cmake b/Templates/DefaultProject/Template/EngineFinder.cmake index ccbfcbecfd..1bb4950e7d 100644 --- a/Templates/DefaultProject/Template/EngineFinder.cmake +++ b/Templates/DefaultProject/Template/EngineFinder.cmake @@ -21,6 +21,21 @@ if(json_error) message(FATAL_ERROR "Unable to read key 'engine' from 'project.json', error: ${json_error}") endif() +if(CMAKE_MODULE_PATH) + foreach(module_path ${CMAKE_MODULE_PATH}) + if(EXISTS ${module_path}/Findo3de.cmake) + file(READ ${module_path}/../engine.json engine_json) + string(JSON engine_name ERROR_VARIABLE json_error GET ${engine_json} engine_name) + if(json_error) + message(FATAL_ERROR "Unable to read key 'engine_name' from 'engine.json', error: ${json_error}") + endif() + if(LY_ENGINE_NAME_TO_USE STREQUAL engine_name) + return() # Engine being forced through CMAKE_MODULE_PATH + endif() + endif() + endforeach() +endif() + if(DEFINED ENV{USERPROFILE} AND EXISTS $ENV{USERPROFILE}) set(manifest_path $ENV{USERPROFILE}/.o3de/o3de_manifest.json) # Windows else() diff --git a/Templates/MinimalProject/Template/EngineFinder.cmake b/Templates/MinimalProject/Template/EngineFinder.cmake index ccbfcbecfd..1bb4950e7d 100644 --- a/Templates/MinimalProject/Template/EngineFinder.cmake +++ b/Templates/MinimalProject/Template/EngineFinder.cmake @@ -21,6 +21,21 @@ if(json_error) message(FATAL_ERROR "Unable to read key 'engine' from 'project.json', error: ${json_error}") endif() +if(CMAKE_MODULE_PATH) + foreach(module_path ${CMAKE_MODULE_PATH}) + if(EXISTS ${module_path}/Findo3de.cmake) + file(READ ${module_path}/../engine.json engine_json) + string(JSON engine_name ERROR_VARIABLE json_error GET ${engine_json} engine_name) + if(json_error) + message(FATAL_ERROR "Unable to read key 'engine_name' from 'engine.json', error: ${json_error}") + endif() + if(LY_ENGINE_NAME_TO_USE STREQUAL engine_name) + return() # Engine being forced through CMAKE_MODULE_PATH + endif() + endif() + endforeach() +endif() + if(DEFINED ENV{USERPROFILE} AND EXISTS $ENV{USERPROFILE}) set(manifest_path $ENV{USERPROFILE}/.o3de/o3de_manifest.json) # Windows else() diff --git a/cmake/3rdParty.cmake b/cmake/3rdParty.cmake index cd72faa78d..310e341305 100644 --- a/cmake/3rdParty.cmake +++ b/cmake/3rdParty.cmake @@ -122,7 +122,13 @@ function(ly_add_external_target) set(BASE_PATH "${LY_3RDPARTY_PATH}/${ly_add_external_target_3RDPARTY_DIRECTORY}") else() - ly_install_external_target(${ly_add_external_target_3RDPARTY_ROOT_DIRECTORY}) + # only install external 3rdParty that are within the source tree + cmake_path(RELATIVE_PATH ly_add_external_target_3RDPARTY_ROOT_DIRECTORY + BASE_DIRECTORY ${LY_ROOT_FOLDER} + OUTPUT_VARIABLE relative_path) + if(relative_path AND NOT relative_path MATCHES "^../") + ly_install_external_target(${ly_add_external_target_3RDPARTY_ROOT_DIRECTORY}) + endif() set(BASE_PATH "${ly_add_external_target_3RDPARTY_ROOT_DIRECTORY}") endif() @@ -305,21 +311,11 @@ endfunction() # \arg:3RDPARTY_ROOT_DIRECTORY custom 3rd party directory which needs to be installed function(ly_install_external_target 3RDPARTY_ROOT_DIRECTORY) - # Install the Find file to our /cmake directory - install(FILES ${CMAKE_CURRENT_LIST_FILE} - DESTINATION cmake + # Install the Find file to our /cmake/3rdParty directory + ly_install_files(FILES ${CMAKE_CURRENT_LIST_FILE} + DESTINATION cmake/3rdParty ) - - # We only want to install external targets that are part of our source tree - # Checking for relative path beginning with "../" also works when the path - # given is on another drive letter on windows(i.e., RELATIVE_PATH returns an absolute path) - file(RELATIVE_PATH rel_path ${CMAKE_SOURCE_DIR} ${3RDPARTY_ROOT_DIRECTORY}) - if (NOT ${rel_path} MATCHES "^../") - get_filename_component(rel_path ${rel_path} DIRECTORY) - install(DIRECTORY ${3RDPARTY_ROOT_DIRECTORY} - DESTINATION ${rel_path} - ) - endif() + ly_install_directory(DIRECTORIES "${3RDPARTY_ROOT_DIRECTORY}") endfunction() diff --git a/cmake/3rdParty/FindPIX.cmake b/cmake/3rdParty/FindPIX.cmake index e4652467ac..f69896f78f 100644 --- a/cmake/3rdParty/FindPIX.cmake +++ b/cmake/3rdParty/FindPIX.cmake @@ -6,14 +6,13 @@ # # -if(LY_PIX_ENABLED) - file(TO_CMAKE_PATH "${LY_PIX_PATH}" PIX_PATH) - message(STATUS "PIX found: ${PIX_PATH}") +set(LY_PIX_PATH "${LY_3RDPARTY_PATH}/winpixeventruntime" CACHE PATH "Path to the Windows Pix Event Runtime.") + +ly_add_external_target( + NAME pix + 3RDPARTY_ROOT_DIRECTORY ${LY_PIX_PATH} + VERSION + INCLUDE_DIRECTORIES Include + COMPILE_DEFINITIONS USE_PIX +) - ly_add_external_target( - NAME pix - 3RDPARTY_ROOT_DIRECTORY "${PIX_PATH}" - VERSION - INCLUDE_DIRECTORIES include - ) -endif() diff --git a/cmake/3rdParty/Platform/Android/BuiltInPackages_android.cmake b/cmake/3rdParty/Platform/Android/BuiltInPackages_android.cmake index cbdca10af9..fe03f2e7c9 100644 --- a/cmake/3rdParty/Platform/Android/BuiltInPackages_android.cmake +++ b/cmake/3rdParty/Platform/Android/BuiltInPackages_android.cmake @@ -11,7 +11,7 @@ ly_associate_package(PACKAGE_NAME md5-2.0-multiplatform TARGETS md5 ly_associate_package(PACKAGE_NAME RapidJSON-1.1.0-rev1-multiplatform TARGETS RapidJSON PACKAGE_HASH 2f5e26ecf86c3b7a262753e7da69ac59928e78e9534361f3d00c1ad5879e4023) ly_associate_package(PACKAGE_NAME RapidXML-1.13-multiplatform TARGETS RapidXML PACKAGE_HASH 510b3c12f8872c54b34733e34f2f69dd21837feafa55bfefa445c98318d96ebf) ly_associate_package(PACKAGE_NAME cityhash-1.1-multiplatform TARGETS cityhash PACKAGE_HASH 0ace9e6f0b2438c5837510032d2d4109125845c0efd7d807f4561ec905512dd2) -ly_associate_package(PACKAGE_NAME lz4-r128-multiplatform TARGETS lz4 PACKAGE_HASH d7b1d5651191db2c339827ad24f669d9d37754143e9173abc986184532f57c9d) +ly_associate_package(PACKAGE_NAME lz4-1.9.3-vcpkg-rev1-android TARGETS lz4 PACKAGE_HASH da8ec7736640a3e9834f6db1c69e8a0ea61c054fe8b6324509f36928cfc21dc9) ly_associate_package(PACKAGE_NAME expat-2.1.0-multiplatform TARGETS expat PACKAGE_HASH 452256acd1fd699cef24162575b3524fccfb712f5321c83f1df1ce878de5b418) ly_associate_package(PACKAGE_NAME zstd-1.35-multiplatform TARGETS zstd PACKAGE_HASH 45d466c435f1095898578eedde85acf1fd27190e7ea99aeaa9acfd2f09e12665) ly_associate_package(PACKAGE_NAME glad-2.0.0-beta-rev2-multiplatform TARGETS glad PACKAGE_HASH ff97ee9664e97d0854b52a3734c2289329d9f2b4cd69478df6d0ca1f1c9392ee) diff --git a/cmake/3rdParty/Platform/Linux/BuiltInPackages_linux.cmake b/cmake/3rdParty/Platform/Linux/BuiltInPackages_linux.cmake index 0cbb799304..1e0de4f2ed 100644 --- a/cmake/3rdParty/Platform/Linux/BuiltInPackages_linux.cmake +++ b/cmake/3rdParty/Platform/Linux/BuiltInPackages_linux.cmake @@ -15,7 +15,7 @@ ly_associate_package(PACKAGE_NAME RapidJSON-1.1.0-rev1-multiplatform ly_associate_package(PACKAGE_NAME RapidXML-1.13-multiplatform TARGETS RapidXML PACKAGE_HASH 510b3c12f8872c54b34733e34f2f69dd21837feafa55bfefa445c98318d96ebf) ly_associate_package(PACKAGE_NAME pybind11-2.4.3-rev2-multiplatform TARGETS pybind11 PACKAGE_HASH d8012f907b6c54ac990b899a0788280857e7c93a9595405a28114b48c354eb1b) ly_associate_package(PACKAGE_NAME cityhash-1.1-multiplatform TARGETS cityhash PACKAGE_HASH 0ace9e6f0b2438c5837510032d2d4109125845c0efd7d807f4561ec905512dd2) -ly_associate_package(PACKAGE_NAME lz4-r128-multiplatform TARGETS lz4 PACKAGE_HASH d7b1d5651191db2c339827ad24f669d9d37754143e9173abc986184532f57c9d) +ly_associate_package(PACKAGE_NAME lz4-1.9.3-vcpkg-rev1-linux TARGETS lz4 PACKAGE_HASH 2e2653ce04a036c38fe28f3971bc3bfb8a4e771335aa8d1b95b0feb3423f1b0a) ly_associate_package(PACKAGE_NAME expat-2.1.0-multiplatform TARGETS expat PACKAGE_HASH 452256acd1fd699cef24162575b3524fccfb712f5321c83f1df1ce878de5b418) ly_associate_package(PACKAGE_NAME zstd-1.35-multiplatform TARGETS zstd PACKAGE_HASH 45d466c435f1095898578eedde85acf1fd27190e7ea99aeaa9acfd2f09e12665) ly_associate_package(PACKAGE_NAME SQLite-3.32.2-rev3-multiplatform TARGETS SQLite PACKAGE_HASH dd4d3de6cbb4ce3d15fc504ba0ae0587e515dc89a25228037035fc0aef4831f4) diff --git a/cmake/3rdParty/Platform/Mac/BuiltInPackages_mac.cmake b/cmake/3rdParty/Platform/Mac/BuiltInPackages_mac.cmake index e18bb07772..58c6849657 100644 --- a/cmake/3rdParty/Platform/Mac/BuiltInPackages_mac.cmake +++ b/cmake/3rdParty/Platform/Mac/BuiltInPackages_mac.cmake @@ -15,7 +15,7 @@ ly_associate_package(PACKAGE_NAME RapidJSON-1.1.0-rev1-multiplatform ly_associate_package(PACKAGE_NAME RapidXML-1.13-multiplatform TARGETS RapidXML PACKAGE_HASH 510b3c12f8872c54b34733e34f2f69dd21837feafa55bfefa445c98318d96ebf) ly_associate_package(PACKAGE_NAME pybind11-2.4.3-rev2-multiplatform TARGETS pybind11 PACKAGE_HASH d8012f907b6c54ac990b899a0788280857e7c93a9595405a28114b48c354eb1b) ly_associate_package(PACKAGE_NAME cityhash-1.1-multiplatform TARGETS cityhash PACKAGE_HASH 0ace9e6f0b2438c5837510032d2d4109125845c0efd7d807f4561ec905512dd2) -ly_associate_package(PACKAGE_NAME lz4-r128-multiplatform TARGETS lz4 PACKAGE_HASH d7b1d5651191db2c339827ad24f669d9d37754143e9173abc986184532f57c9d) +ly_associate_package(PACKAGE_NAME lz4-1.9.3-vcpkg-rev1-mac TARGETS lz4 PACKAGE_HASH 3ce6866b43d024452c0412f385ae46aba0e1ae99eb64f7099d3fc539c8460881) ly_associate_package(PACKAGE_NAME expat-2.1.0-multiplatform TARGETS expat PACKAGE_HASH 452256acd1fd699cef24162575b3524fccfb712f5321c83f1df1ce878de5b418) ly_associate_package(PACKAGE_NAME zstd-1.35-multiplatform TARGETS zstd PACKAGE_HASH 45d466c435f1095898578eedde85acf1fd27190e7ea99aeaa9acfd2f09e12665) ly_associate_package(PACKAGE_NAME SQLite-3.32.2-rev3-multiplatform TARGETS SQLite PACKAGE_HASH dd4d3de6cbb4ce3d15fc504ba0ae0587e515dc89a25228037035fc0aef4831f4) diff --git a/cmake/3rdParty/Platform/Windows/BuiltInPackages_windows.cmake b/cmake/3rdParty/Platform/Windows/BuiltInPackages_windows.cmake index 305d1291e7..17792675d3 100644 --- a/cmake/3rdParty/Platform/Windows/BuiltInPackages_windows.cmake +++ b/cmake/3rdParty/Platform/Windows/BuiltInPackages_windows.cmake @@ -15,7 +15,7 @@ ly_associate_package(PACKAGE_NAME RapidJSON-1.1.0-rev1-multiplatform ly_associate_package(PACKAGE_NAME RapidXML-1.13-multiplatform TARGETS RapidXML PACKAGE_HASH 510b3c12f8872c54b34733e34f2f69dd21837feafa55bfefa445c98318d96ebf) ly_associate_package(PACKAGE_NAME pybind11-2.4.3-rev2-multiplatform TARGETS pybind11 PACKAGE_HASH d8012f907b6c54ac990b899a0788280857e7c93a9595405a28114b48c354eb1b) ly_associate_package(PACKAGE_NAME cityhash-1.1-multiplatform TARGETS cityhash PACKAGE_HASH 0ace9e6f0b2438c5837510032d2d4109125845c0efd7d807f4561ec905512dd2) -ly_associate_package(PACKAGE_NAME lz4-r128-multiplatform TARGETS lz4 PACKAGE_HASH d7b1d5651191db2c339827ad24f669d9d37754143e9173abc986184532f57c9d) +ly_associate_package(PACKAGE_NAME lz4-1.9.3-vcpkg-rev1-windows TARGETS lz4 PACKAGE_HASH 02e6ba2ca1407483bac082fd97803c5e19f48bc576171bfc8cec62412efe639c) ly_associate_package(PACKAGE_NAME expat-2.1.0-multiplatform TARGETS expat PACKAGE_HASH 452256acd1fd699cef24162575b3524fccfb712f5321c83f1df1ce878de5b418) ly_associate_package(PACKAGE_NAME zstd-1.35-multiplatform TARGETS zstd PACKAGE_HASH 45d466c435f1095898578eedde85acf1fd27190e7ea99aeaa9acfd2f09e12665) ly_associate_package(PACKAGE_NAME SQLite-3.32.2-rev3-multiplatform TARGETS SQLite PACKAGE_HASH dd4d3de6cbb4ce3d15fc504ba0ae0587e515dc89a25228037035fc0aef4831f4) diff --git a/cmake/3rdParty/Platform/iOS/BuiltInPackages_ios.cmake b/cmake/3rdParty/Platform/iOS/BuiltInPackages_ios.cmake index 0574f38654..f98f2009f2 100644 --- a/cmake/3rdParty/Platform/iOS/BuiltInPackages_ios.cmake +++ b/cmake/3rdParty/Platform/iOS/BuiltInPackages_ios.cmake @@ -11,7 +11,7 @@ ly_associate_package(PACKAGE_NAME md5-2.0-multiplatform TARGETS md5 ly_associate_package(PACKAGE_NAME RapidJSON-1.1.0-rev1-multiplatform TARGETS RapidJSON PACKAGE_HASH 2f5e26ecf86c3b7a262753e7da69ac59928e78e9534361f3d00c1ad5879e4023) ly_associate_package(PACKAGE_NAME RapidXML-1.13-multiplatform TARGETS RapidXML PACKAGE_HASH 510b3c12f8872c54b34733e34f2f69dd21837feafa55bfefa445c98318d96ebf) ly_associate_package(PACKAGE_NAME cityhash-1.1-multiplatform TARGETS cityhash PACKAGE_HASH 0ace9e6f0b2438c5837510032d2d4109125845c0efd7d807f4561ec905512dd2) -ly_associate_package(PACKAGE_NAME lz4-r128-multiplatform TARGETS lz4 PACKAGE_HASH d7b1d5651191db2c339827ad24f669d9d37754143e9173abc986184532f57c9d) +ly_associate_package(PACKAGE_NAME lz4-1.9.3-vcpkg-rev1-ios TARGETS lz4 PACKAGE_HASH 7a9391daf53e47e529cf811dca3554c83769f62a2ee52488610ec73214961ae1) ly_associate_package(PACKAGE_NAME expat-2.1.0-multiplatform TARGETS expat PACKAGE_HASH 452256acd1fd699cef24162575b3524fccfb712f5321c83f1df1ce878de5b418) ly_associate_package(PACKAGE_NAME zstd-1.35-multiplatform TARGETS zstd PACKAGE_HASH 45d466c435f1095898578eedde85acf1fd27190e7ea99aeaa9acfd2f09e12665) ly_associate_package(PACKAGE_NAME glad-2.0.0-beta-rev2-multiplatform TARGETS glad PACKAGE_HASH ff97ee9664e97d0854b52a3734c2289329d9f2b4cd69478df6d0ca1f1c9392ee) diff --git a/cmake/Install.cmake b/cmake/Install.cmake index 34f316e31e..6f50c78fd7 100644 --- a/cmake/Install.cmake +++ b/cmake/Install.cmake @@ -6,7 +6,12 @@ # # -if(NOT INSTALLED_ENGINE) +ly_set(LY_INSTALL_ENABLED TRUE) +if(INSTALLED_ENGINE) + ly_set(LY_INSTALL_ENABLED FALSE) +endif() + +if(LY_INSTALL_ENABLED) ly_get_absolute_pal_filename(pal_dir ${CMAKE_CURRENT_SOURCE_DIR}/cmake/Platform/${PAL_PLATFORM_NAME}) include(${pal_dir}/Install_${PAL_PLATFORM_NAME_LOWERCASE}.cmake) endif() @@ -27,6 +32,10 @@ endif() # function(ly_install_directory) + if(NOT LY_INSTALL_ENABLED) + return() + endif() + set(options VERBATIM) set(oneValueArgs DESTINATION) set(multiValueArgs DIRECTORIES EXCLUDE_PATTERNS) @@ -91,6 +100,10 @@ endfunction() # function(ly_install_files) + if(NOT LY_INSTALL_ENABLED) + return() + endif() + set(options PROGRAMS) set(oneValueArgs DESTINATION) set(multiValueArgs FILES) @@ -121,4 +134,21 @@ function(ly_install_files) COMPONENT ${CMAKE_INSTALL_DEFAULT_COMPONENT_NAME} # use the default for the time being ) -endfunction() \ No newline at end of file +endfunction() + +#! ly_install_run_code: specifies code to be added to the install process (will run at install time) +# +# \notes: +# - refer to cmake's install(CODE documentation for more information +# +function(ly_install_run_code CODE) + + if(NOT LY_INSTALL_ENABLED) + return() + endif() + + install(CODE ${CODE} + COMPONENT ${CMAKE_INSTALL_DEFAULT_COMPONENT_NAME} # use the default for the time being + ) + +endfunction() diff --git a/cmake/OutputDirectory.cmake b/cmake/OutputDirectory.cmake index 116ddfbecc..a75b47e818 100644 --- a/cmake/OutputDirectory.cmake +++ b/cmake/OutputDirectory.cmake @@ -13,5 +13,7 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin CACHE PATH "Build dir # We install outside of the binary dir because our install support muliple platforms to # be installed together. We also have an exclusion rule in the AP that filters out the -# "build" folder which is a common binary dir -set(CMAKE_INSTALL_PREFIX ${CMAKE_SOURCE_DIR}/install CACHE PATH "Installation prefix") +# "install" folder to avoid the AP picking it up +if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) + set(CMAKE_INSTALL_PREFIX ${CMAKE_SOURCE_DIR}/install CACHE PATH "Install directory" FORCE) +endif() diff --git a/cmake/Platform/Common/Install_common.cmake b/cmake/Platform/Common/Install_common.cmake index 5010760fad..9a0fbbd872 100644 --- a/cmake/Platform/Common/Install_common.cmake +++ b/cmake/Platform/Common/Install_common.cmake @@ -38,9 +38,6 @@ function(ly_setup_target OUTPUT_CONFIGURED_TARGET ALIAS_TARGET_NAME absolute_tar # Get the target source directory relative to the LY root folder ly_get_engine_relative_source_dir(${absolute_target_source_dir} relative_target_source_dir) - # get the component ID. if the property isn't set for the target, it will auto fallback to use CMAKE_INSTALL_DEFAULT_COMPONENT_NAME - get_property(install_component TARGET ${TARGET_NAME} PROPERTY INSTALL_COMPONENT) - # All include directories marked PUBLIC or INTERFACE will be installed. We dont use PUBLIC_HEADER because in order to do that # we need to set the PUBLIC_HEADER property of the target for all the headers we are exporting. After doing that, installing the # headers end up in one folder instead of duplicating the folder structure of the public/interface include directory. @@ -69,7 +66,7 @@ function(ly_setup_target OUTPUT_CONFIGURED_TARGET ALIAS_TARGET_NAME absolute_tar install(DIRECTORY ${include_directory} DESTINATION ${destination_dir} - COMPONENT ${install_component} + COMPONENT ${CMAKE_INSTALL_DEFAULT_COMPONENT_NAME} FILES_MATCHING PATTERN *.h PATTERN *.hpp @@ -108,13 +105,13 @@ function(ly_setup_target OUTPUT_CONFIGURED_TARGET ALIAS_TARGET_NAME absolute_tar TARGETS ${TARGET_NAME} ARCHIVE DESTINATION ${archive_output_directory}/${PAL_PLATFORM_NAME}/$ - COMPONENT ${install_component} + COMPONENT ${CMAKE_INSTALL_DEFAULT_COMPONENT_NAME} LIBRARY DESTINATION ${library_output_directory}/${PAL_PLATFORM_NAME}/$/${target_library_output_subdirectory} - COMPONENT ${install_component} + COMPONENT ${CMAKE_INSTALL_DEFAULT_COMPONENT_NAME} RUNTIME DESTINATION ${runtime_output_directory}/${PAL_PLATFORM_NAME}/$/${target_runtime_output_subdirectory} - COMPONENT ${install_component} + COMPONENT ${CMAKE_INSTALL_DEFAULT_COMPONENT_NAME} ) endif() @@ -271,7 +268,7 @@ set_property(TARGET ${NAME_PLACEHOLDER} file(GENERATE OUTPUT "${target_install_source_dir}/${NAME_PLACEHOLDER}_$.cmake" CONTENT "${target_file_contents}") install(FILES "${target_install_source_dir}/${NAME_PLACEHOLDER}_$.cmake" DESTINATION ${relative_target_source_dir} - COMPONENT ${install_component} + COMPONENT ${CMAKE_INSTALL_DEFAULT_COMPONENT_NAME} ) # Since a CMakeLists.txt could contain multiple targets, we generate it in a folder per target @@ -320,12 +317,9 @@ function(ly_setup_subdirectory absolute_target_source_dir) "${ENABLE_GEMS_PLACEHOLDER}" ) - # get the component ID. if the property isn't set for the directory, it will auto fallback to use CMAKE_INSTALL_DEFAULT_COMPONENT_NAME - get_property(install_component DIRECTORY ${absolute_target_source_dir} PROPERTY INSTALL_COMPONENT) - install(FILES "${target_install_source_dir}/CMakeLists.txt" DESTINATION ${relative_target_source_dir} - COMPONENT ${install_component} + COMPONENT ${CMAKE_INSTALL_DEFAULT_COMPONENT_NAME} ) endfunction() @@ -344,6 +338,7 @@ function(ly_setup_o3de_install) ${LY_ROOT_FOLDER}/LICENSE.txt ${LY_ROOT_FOLDER}/README.md DESTINATION . + COMPONENT ${CMAKE_INSTALL_DEFAULT_COMPONENT_NAME} ) endfunction() @@ -353,6 +348,7 @@ function(ly_setup_cmake_install) install(DIRECTORY "${LY_ROOT_FOLDER}/cmake" DESTINATION . + COMPONENT ${CMAKE_INSTALL_DEFAULT_COMPONENT_NAME} PATTERN "__pycache__" EXCLUDE REGEX "Findo3de.cmake" EXCLUDE REGEX "Platform\/.*\/BuiltInPackages_.*\.cmake" EXCLUDE @@ -380,18 +376,32 @@ function(ly_setup_cmake_install) "${LY_ROOT_FOLDER}/CMakeLists.txt" "${CMAKE_CURRENT_BINARY_DIR}/cmake/engine.json" DESTINATION . + COMPONENT ${CMAKE_INSTALL_DEFAULT_COMPONENT_NAME} ) # Collect all Find files that were added with ly_add_external_target_path unset(additional_find_files) + unset(additional_platform_files) get_property(additional_module_paths GLOBAL PROPERTY LY_ADDITIONAL_MODULE_PATH) foreach(additional_module_path ${additional_module_paths}) unset(find_files) file(GLOB find_files "${additional_module_path}/Find*.cmake") list(APPEND additional_find_files "${find_files}") + foreach(find_file ${find_files}) + # also copy the Platform/ to the destination + cmake_path(GET find_file PARENT_PATH find_file_parent) + unset(plat_files) + file(GLOB plat_files "${find_file_parent}/Platform/${PAL_PLATFORM_NAME}/*.cmake") + list(APPEND additional_platform_files "${plat_files}") + endforeach() endforeach() install(FILES ${additional_find_files} DESTINATION cmake/3rdParty + COMPONENT ${CMAKE_INSTALL_DEFAULT_COMPONENT_NAME} + ) + install(FILES ${additional_platform_files} + DESTINATION cmake/3rdParty/Platform/${PAL_PLATFORM_NAME} + COMPONENT ${CMAKE_INSTALL_DEFAULT_COMPONENT_NAME} ) # Findo3de.cmake file: we generate a different Findo3de.camke file than the one we have in cmake. This one is going to expose all @@ -408,6 +418,7 @@ function(ly_setup_cmake_install) configure_file(${LY_ROOT_FOLDER}/cmake/install/Findo3de.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/cmake/Findo3de.cmake @ONLY) install(FILES "${CMAKE_CURRENT_BINARY_DIR}/cmake/Findo3de.cmake" DESTINATION cmake + COMPONENT ${CMAKE_INSTALL_DEFAULT_COMPONENT_NAME} ) # BuiltInPackage_.cmake: since associations could happen in any cmake file across the engine. We collect @@ -427,6 +438,7 @@ function(ly_setup_cmake_install) ) install(FILES "${pal_builtin_file}" DESTINATION cmake/3rdParty/Platform/${PAL_PLATFORM_NAME} + COMPONENT ${CMAKE_INSTALL_DEFAULT_COMPONENT_NAME} ) endfunction() @@ -442,6 +454,7 @@ function(ly_setup_runtime_dependencies) "function(ly_copy source_file target_directory) file(COPY \"\${source_file}\" DESTINATION \"\${target_directory}\" FILE_PERMISSIONS ${LY_COPY_PERMISSIONS}) endfunction()" + COMPONENT ${CMAKE_INSTALL_DEFAULT_COMPONENT_NAME} ) endif() @@ -476,7 +489,9 @@ endfunction()" list(REMOVE_DUPLICATES runtime_commands) list(JOIN runtime_commands " " runtime_commands_str) # the spaces are just to see the right identation in the cmake_install.cmake file - install(CODE "${runtime_commands_str}") + install(CODE "${runtime_commands_str}" + COMPONENT ${CMAKE_INSTALL_DEFAULT_COMPONENT_NAME} + ) endfunction() @@ -562,9 +577,15 @@ function(ly_setup_assets) cmake_path(SET gem_install_dest_dir .) endif() if(IS_DIRECTORY ${gem_absolute_path}) - install(DIRECTORY "${gem_absolute_path}" DESTINATION ${gem_install_dest_dir}) + install(DIRECTORY "${gem_absolute_path}" + DESTINATION ${gem_install_dest_dir} + COMPONENT ${CMAKE_INSTALL_DEFAULT_COMPONENT_NAME} + ) elseif (EXISTS ${gem_absolute_path}) - install(FILES ${gem_absolute_path} DESTINATION ${gem_install_dest_dir}) + install(FILES ${gem_absolute_path} + DESTINATION ${gem_install_dest_dir} + COMPONENT ${CMAKE_INSTALL_DEFAULT_COMPONENT_NAME} + ) endif() endforeach() diff --git a/cmake/Platform/Linux/Install_linux.cmake b/cmake/Platform/Linux/Install_linux.cmake index 87713fa5d6..dea26e5872 100644 --- a/cmake/Platform/Linux/Install_linux.cmake +++ b/cmake/Platform/Linux/Install_linux.cmake @@ -22,7 +22,9 @@ endfunction()]]) function(ly_install_code_function_override) string(CONFIGURE "${ly_copy_template}" ly_copy_function_linux @ONLY) - install(CODE "${ly_copy_function_linux}") + install(CODE "${ly_copy_function_linux}" + COMPONENT ${CMAKE_INSTALL_DEFAULT_COMPONENT_NAME} + ) endfunction() include(cmake/Platform/Common/Install_common.cmake) diff --git a/cmake/Platform/Mac/Install_mac.cmake b/cmake/Platform/Mac/Install_mac.cmake index c7f22e9149..f3c2b31b31 100644 --- a/cmake/Platform/Mac/Install_mac.cmake +++ b/cmake/Platform/Mac/Install_mac.cmake @@ -42,8 +42,6 @@ function(ly_install_target_override) set(multiValueArgs) cmake_parse_arguments(ly_platform_install_target "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN}) - get_property(install_component TARGET ${ly_platform_install_target_TARGET} PROPERTY INSTALL_COMPONENT) - # For bundles on Mac, we set the icons by passing in a path to the Images.xcassets directory. # However, the CMake install command expects paths to files for the the RESOURCE property. # More details can be found in the CMake issue: https://gitlab.kitware.com/cmake/cmake/-/issues/22409 @@ -57,19 +55,19 @@ function(ly_install_target_override) TARGETS ${ly_platform_install_target_TARGET} ARCHIVE DESTINATION ${ly_platform_install_target_ARCHIVE_DIR}/${PAL_PLATFORM_NAME}/$ - COMPONENT ${install_component} + COMPONENT ${CMAKE_INSTALL_DEFAULT_COMPONENT_NAME} LIBRARY DESTINATION ${ly_platform_install_target_LIBRARY_DIR}/${PAL_PLATFORM_NAME}/$/${ly_platform_install_target_LIBRARY_SUBDIR} - COMPONENT ${install_component} + COMPONENT ${CMAKE_INSTALL_DEFAULT_COMPONENT_NAME} RUNTIME DESTINATION ${ly_platform_install_target_RUNTIME_DIR}/${PAL_PLATFORM_NAME}/$/${ly_platform_install_target_RUNTIME_SUBDIR} - COMPONENT ${install_component} + COMPONENT ${CMAKE_INSTALL_DEFAULT_COMPONENT_NAME} BUNDLE DESTINATION ${ly_platform_install_target_RUNTIME_DIR}/${PAL_PLATFORM_NAME}/$/${ly_platform_install_target_RUNTIME_SUBDIR} - COMPONENT ${install_component} + COMPONENT ${CMAKE_INSTALL_DEFAULT_COMPONENT_NAME} RESOURCE DESTINATION ${ly_platform_install_target_RUNTIME_DIR}/${PAL_PLATFORM_NAME}/$/${ly_platform_install_target_RUNTIME_SUBDIR}/ - COMPONENT ${install_component} + COMPONENT ${CMAKE_INSTALL_DEFAULT_COMPONENT_NAME} ) if (${is_bundle}) @@ -95,7 +93,9 @@ function(ly_install_code_function_override) endif() file(COPY \"\${source_file}\" DESTINATION \"\${target_directory}\" FILE_PERMISSIONS ${LY_COPY_PERMISSIONS}) -endfunction()") +endfunction()" + COMPONENT ${CMAKE_INSTALL_DEFAULT_COMPONENT_NAME} + ) endfunction() diff --git a/cmake/Projects.cmake b/cmake/Projects.cmake index 6e5b5c5f78..e70c8a4b14 100644 --- a/cmake/Projects.cmake +++ b/cmake/Projects.cmake @@ -142,6 +142,23 @@ foreach(project ${LY_PROJECTS}) add_subdirectory(${project} "${project_folder_name}-${full_directory_hash}") ly_generate_project_build_path_setreg(${full_directory_path}) add_project_json_external_subdirectories(${full_directory_path}) + + # Generate pak for project in release installs + cmake_path(RELATIVE_PATH CMAKE_RUNTIME_OUTPUT_DIRECTORY BASE_DIRECTORY ${CMAKE_BINARY_DIR} OUTPUT_VARIABLE runtime_output_directory) + set(install_engine_pak_template [=[ +if("${CMAKE_INSTALL_CONFIG_NAME}" MATCHES "^([Rr][Ee][Ll][Ee][Aa][Ss][Ee])$") + set(install_output_folder "${CMAKE_INSTALL_PREFIX}/@runtime_output_directory@/@PAL_PLATFORM_NAME@/${CMAKE_INSTALL_CONFIG_NAME}") + message(STATUS "Generating ${install_output_folder}/Engine.pak from @full_directory_path@/Cache") + file(ARCHIVE_CREATE OUTPUT ${install_output_folder}/Engine.pak + PATHS @full_directory_path@/Cache + FORMAT zip + ) + message(STATUS "${install_output_folder}/Engine.pak generated") +endif() +]=]) + string(CONFIGURE "${install_engine_pak_template}" install_engine_pak_code @ONLY) + ly_install_run_code("${install_engine_pak_code}") + endforeach() # If just one project is defined we pass it as a parameter to the applications diff --git a/cmake/SettingsRegistry.cmake b/cmake/SettingsRegistry.cmake index 58beba089c..c677aba7cf 100644 --- a/cmake/SettingsRegistry.cmake +++ b/cmake/SettingsRegistry.cmake @@ -118,6 +118,12 @@ endfunction() # The generated file contains the file to the each dependent targets # This can be used for example to determine which list of gems to load with an application function(ly_delayed_generate_settings_registry) + + if(LY_MONOLITHIC_GAME) # No need to generate setregs for monolithic builds + set_property(GLOBAL PROPERTY LY_DELAYED_LOAD_DEPENDENCIES) # Clear out the load targets from the global load dependencies list + return() + endif() + get_property(ly_delayed_load_targets GLOBAL PROPERTY LY_DELAYED_LOAD_DEPENDENCIES) foreach(prefix_target ${ly_delayed_load_targets}) string(REPLACE "," ";" prefix_target_list "${prefix_target}") @@ -201,7 +207,7 @@ function(ly_delayed_generate_settings_registry) set_property(GLOBAL PROPERTY LY_DELAYED_LOAD_"${prefix_target}") endforeach() - # Clear out the load targets from the glboal load dependencies list + # Clear out the load targets from the global load dependencies list set_property(GLOBAL PROPERTY LY_DELAYED_LOAD_DEPENDENCIES) endfunction()