diff --git a/AutomatedTesting/Gem/PythonTests/Blast/ActorSplitsAfterCapsuleDamage.py b/AutomatedTesting/Gem/PythonTests/Blast/ActorSplitsAfterCapsuleDamage.py index 80f83b26e2..a961ccdc52 100755 --- a/AutomatedTesting/Gem/PythonTests/Blast/ActorSplitsAfterCapsuleDamage.py +++ b/AutomatedTesting/Gem/PythonTests/Blast/ActorSplitsAfterCapsuleDamage.py @@ -17,7 +17,7 @@ from ActorSplitsAfterDamage import Tests def run(): from ActorSplitsAfterDamage import run as internal_run - from Utils import Constants + from editor_python_test_tools.utils import Constants def CapsuleDamage(target_id, position0): position1 = azlmbr.object.construct('Vector3', position0.x + 1.0, position0.y, position0.z) diff --git a/AutomatedTesting/Gem/PythonTests/Blast/ActorSplitsAfterCollision.py b/AutomatedTesting/Gem/PythonTests/Blast/ActorSplitsAfterCollision.py index d141cd3ce1..5692773d6d 100755 --- a/AutomatedTesting/Gem/PythonTests/Blast/ActorSplitsAfterCollision.py +++ b/AutomatedTesting/Gem/PythonTests/Blast/ActorSplitsAfterCollision.py @@ -54,14 +54,14 @@ def run(): imports.init() - from utils import Report - from utils import TestHelper as helper + 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 - from Utils import CollisionHandler - from Utils import BlastNotificationHandler + from editor_python_test_tools.utils import CollisionHandler + from editor_python_test_tools.utils import BlastNotificationHandler # Constants TIMEOUT = 2.0 diff --git a/AutomatedTesting/Gem/PythonTests/Blast/ActorSplitsAfterDamage.py b/AutomatedTesting/Gem/PythonTests/Blast/ActorSplitsAfterDamage.py index e991daebcd..ddd90ca89a 100755 --- a/AutomatedTesting/Gem/PythonTests/Blast/ActorSplitsAfterDamage.py +++ b/AutomatedTesting/Gem/PythonTests/Blast/ActorSplitsAfterDamage.py @@ -50,13 +50,13 @@ def run(damage_func): imports.init() - from utils import Report - from utils import TestHelper as helper + 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 - from Utils import BlastNotificationHandler + from editor_python_test_tools.utils import BlastNotificationHandler # Constants TIMEOUT = 2.0 diff --git a/AutomatedTesting/Gem/PythonTests/Blast/ActorSplitsAfterImpactSpreadDamage.py b/AutomatedTesting/Gem/PythonTests/Blast/ActorSplitsAfterImpactSpreadDamage.py index 9139fe02b1..9b3fd1e596 100755 --- a/AutomatedTesting/Gem/PythonTests/Blast/ActorSplitsAfterImpactSpreadDamage.py +++ b/AutomatedTesting/Gem/PythonTests/Blast/ActorSplitsAfterImpactSpreadDamage.py @@ -17,7 +17,7 @@ from ActorSplitsAfterDamage import Tests def run(): from ActorSplitsAfterDamage import run as internal_run - from Utils import Constants + from editor_python_test_tools.utils import Constants def ImpactSpreadDamage(target_id, position): azlmbr.destruction.BlastFamilyDamageRequestBus(azlmbr.bus.Event, "Impact Spread Damage", target_id, diff --git a/AutomatedTesting/Gem/PythonTests/Blast/ActorSplitsAfterRadialDamage.py b/AutomatedTesting/Gem/PythonTests/Blast/ActorSplitsAfterRadialDamage.py index 77b942e95c..a219e63d34 100755 --- a/AutomatedTesting/Gem/PythonTests/Blast/ActorSplitsAfterRadialDamage.py +++ b/AutomatedTesting/Gem/PythonTests/Blast/ActorSplitsAfterRadialDamage.py @@ -17,7 +17,7 @@ from ActorSplitsAfterDamage import Tests def run(): from ActorSplitsAfterDamage import run as internal_run - from Utils import Constants + from editor_python_test_tools.utils import Constants def RadialDamage(target_id, position): azlmbr.destruction.BlastFamilyDamageRequestBus(azlmbr.bus.Event, "Radial Damage", target_id, diff --git a/AutomatedTesting/Gem/PythonTests/Blast/ActorSplitsAfterShearDamage.py b/AutomatedTesting/Gem/PythonTests/Blast/ActorSplitsAfterShearDamage.py index 404e655d36..e775be302d 100755 --- a/AutomatedTesting/Gem/PythonTests/Blast/ActorSplitsAfterShearDamage.py +++ b/AutomatedTesting/Gem/PythonTests/Blast/ActorSplitsAfterShearDamage.py @@ -17,7 +17,7 @@ from ActorSplitsAfterDamage import Tests def run(): from ActorSplitsAfterDamage import run as internal_run - from Utils import Constants + from editor_python_test_tools.utils import Constants def ShearDamage(target_id, position): normal = azlmbr.object.construct('Vector3', 1.0, 0.0, 0.0) diff --git a/AutomatedTesting/Gem/PythonTests/Blast/ActorSplitsAfterStressDamage.py b/AutomatedTesting/Gem/PythonTests/Blast/ActorSplitsAfterStressDamage.py index be002d5451..0195190348 100755 --- a/AutomatedTesting/Gem/PythonTests/Blast/ActorSplitsAfterStressDamage.py +++ b/AutomatedTesting/Gem/PythonTests/Blast/ActorSplitsAfterStressDamage.py @@ -17,7 +17,7 @@ from ActorSplitsAfterDamage import Tests def run(): from ActorSplitsAfterDamage import run as internal_run - from Utils import Constants + from editor_python_test_tools.utils import Constants def StressDamage(target_id, position): force = azlmbr.object.construct('Vector3', 0.0, 0.0, -100.0) # Should be enough to break `brittle` objects diff --git a/AutomatedTesting/Gem/PythonTests/Blast/ActorSplitsAfterTriangleDamage.py b/AutomatedTesting/Gem/PythonTests/Blast/ActorSplitsAfterTriangleDamage.py index 4635d67455..0351fe42e2 100755 --- a/AutomatedTesting/Gem/PythonTests/Blast/ActorSplitsAfterTriangleDamage.py +++ b/AutomatedTesting/Gem/PythonTests/Blast/ActorSplitsAfterTriangleDamage.py @@ -17,7 +17,7 @@ from ActorSplitsAfterDamage import Tests def run(): from ActorSplitsAfterDamage import run as internal_run - from Utils import Constants + from editor_python_test_tools.utils import Constants def TriangleDamage(target_id, position): # Some points that form a triangle that contains the given position diff --git a/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/ComponentUpdateListProperty_test.py b/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/ComponentUpdateListProperty_test.py index 3ac4832428..9ab83a0723 100755 --- a/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/ComponentUpdateListProperty_test.py +++ b/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/ComponentUpdateListProperty_test.py @@ -16,7 +16,7 @@ import logging # Bail on the test if ly_test_tools doesn't exist. pytest.importorskip("ly_test_tools") import ly_test_tools.environment.file_system as file_system -import automatedtesting_shared.hydra_test_utils as hydra +import editor_python_test_tools.hydra_test_utils as hydra logger = logging.getLogger(__name__) test_directory = os.path.join(os.path.dirname(__file__), "EditorScripts") diff --git a/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/EditorUtilityCommands_legacy_test_case.py b/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/EditorUtilityCommands_legacy_test_case.py index 9bb9ba5337..9160530ba4 100755 --- a/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/EditorUtilityCommands_legacy_test_case.py +++ b/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/EditorUtilityCommands_legacy_test_case.py @@ -27,15 +27,6 @@ def testing_cvar(setMethod, methodName, label, value, compare): print('{} failed'.format(methodName)) -def testing_edit_mode(mode): - general.set_edit_mode(mode) - - if (general.get_edit_mode(mode)): - return True - - return False - - def testing_axis_constraints(constraint): general.set_axis_constraint(constraint) @@ -58,15 +49,6 @@ compare = lambda lhs, rhs: rhs == int(lhs) testing_cvar(general.set_cvar_integer, 'set_cvar_integer', 'sys_LocalMemoryGeometryLimit', 33, compare) -# ----- Test Edit Mode - -if (testing_edit_mode("SELECT") and testing_edit_mode('SELECTAREA') and - testing_edit_mode("MOVE") and testing_edit_mode("ROTATE") and - testing_edit_mode("SCALE") and testing_edit_mode("TOOL")): - - print("edit mode works") - - # ----- Test Axis Constraints if (testing_axis_constraints("X") and testing_axis_constraints("Y") and diff --git a/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/EditorUtilityCommands_test.py b/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/EditorUtilityCommands_test.py index 6261312814..bc258cce3f 100755 --- a/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/EditorUtilityCommands_test.py +++ b/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/EditorUtilityCommands_test.py @@ -33,7 +33,6 @@ class TestEditorAutomation(object): "SetCVarFromFloat worked", "SetCVarFromString worked", "SetCVarFromInteger worked", - "edit mode works", "axis constraint works", "end of editor utility tests" ] @@ -48,7 +47,6 @@ class TestEditorAutomation(object): "set_cvar_float worked", "set_cvar_string worked", "set_cvar_integer worked", - "edit mode works", "axis constraint works", "end of editor utility tests" ] diff --git a/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/EditorUtilityCommands_test_case.py b/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/EditorUtilityCommands_test_case.py index bae7da19b0..91dd883a10 100755 --- a/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/EditorUtilityCommands_test_case.py +++ b/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/EditorUtilityCommands_test_case.py @@ -28,15 +28,6 @@ def testing_cvar(setMethod, methodName, label, value, compare): print('{} failed'.format(methodName)) -def testing_edit_mode(mode): - python_editor_funcs.PythonEditorBus(bus.Broadcast, 'SetEditMode', mode) - - if mode == python_editor_funcs.PythonEditorBus(bus.Broadcast, 'GetEditMode'): - return True - - return False - - def testing_axis_constraints(constraint): python_editor_funcs.PythonEditorBus(bus.Broadcast, 'SetAxisConstraint', constraint) @@ -57,13 +48,6 @@ testing_cvar('SetCVarFromString', 'SetCVarFromString', 'e_ScreenShotFileFormat', compare = lambda lhs, rhs: rhs == int(lhs) testing_cvar('SetCVarFromInteger', 'SetCVarFromInteger', 'sys_LocalMemoryGeometryLimit', 33, compare) -# ----- Test Edit Mode - -if (testing_edit_mode("SELECT") and testing_edit_mode('SELECTAREA') and - testing_edit_mode("MOVE") and testing_edit_mode("ROTATE") and - testing_edit_mode("SCALE") and testing_edit_mode("TOOL")): - print("edit mode works") - # ----- Test Axis Constraints if (testing_axis_constraints("X") and testing_axis_constraints("Y") and diff --git a/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/PySide_Example_test_case.py b/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/PySide_Example_test_case.py index 8aba60e8e9..ed1c048fa6 100755 --- a/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/PySide_Example_test_case.py +++ b/AutomatedTesting/Gem/PythonTests/EditorPythonBindings/PySide_Example_test_case.py @@ -25,7 +25,7 @@ import azlmbr.bus as bus import azlmbr.entity as entity import azlmbr.editor as editor import azlmbr.legacy.general as general -import pyside_component_utils +import editor_python_test_tools.pyside_component_utils as pysde_component_utils def PySide_Example_test_case(): diff --git a/AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/README.txt b/AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/README.txt new file mode 100644 index 0000000000..8c86e22681 --- /dev/null +++ b/AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/README.txt @@ -0,0 +1,49 @@ +All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or +its licensors. + +For complete copyright and license terms please see the LICENSE at the root of this +distribution (the "License"). All use of this software is governed by the License, +or, if provided, by the license below or the license accompanying this file. Do not +remove or modify any license notices. This file is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + + +INTRODUCTION +------------ + +EditorPythonBindings is a Python project that contains a collection of editor testing tools +developed by the Lumberyard feature teams. The project contains tools for system level +editor tests. + + +REQUIREMENTS +------------ + + * Python 3.7.5 (64-bit) + +It is recommended that you completely remove any other versions of Python +installed on your system. + + +INSTALL +----------- +It is recommended to set up these these tools with Lumberyard's CMake build commands. +Assuming CMake is already setup on your operating system, below are some sample build commands: + cd /path/to/od3e/ + mkdir windows_vs2019 + cd windows_vs2019 + cmake .. -G "Visual Studio 16 2019" -A x64 -T host=x64 -DLY_3RDPARTY_PATH="%3RDPARTYPATH%" -DLY_PROJECTS=AutomatedTesting +NOTE: +Using the above command also adds EditorPythonTestTools to the PYTHONPATH OS environment variable. +Additionally, some CTest scripts will add the Python interpreter path to the PYTHON OS environment variable. + +To manually install the project in development mode using your own installed Python interpreter: + cd /path/to/od3e/AutomatedTesting/Gem/PythonTests/EditorPythonTestTools + /path/to/your/python -m pip install -e . + + +UNINSTALLATION +-------------- + +The preferred way to uninstall the project is: + /path/to/your/python -m pip uninstall editor_python_test_tools diff --git a/AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/__init__.py b/AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/__init__.py new file mode 100644 index 0000000000..79f8fa4422 --- /dev/null +++ b/AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/__init__.py @@ -0,0 +1,10 @@ +""" +All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or +its licensors. + +For complete copyright and license terms please see the LICENSE at the root of this +distribution (the "License"). All use of this software is governed by the License, +or, if provided, by the license below or the license accompanying this file. Do not +remove or modify any license notices. This file is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +""" diff --git a/AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/editor_python_test_tools.egg-info/PKG-INFO b/AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/editor_python_test_tools.egg-info/PKG-INFO new file mode 100644 index 0000000000..4fb74423c2 --- /dev/null +++ b/AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/editor_python_test_tools.egg-info/PKG-INFO @@ -0,0 +1,110 @@ +Metadata-Version: 1.0 +Name: editor-python-test-tools +Version: 1.0.0 +Summary: Lumberyard editor Python bindings test tools +Home-page: UNKNOWN +Author: UNKNOWN +Author-email: UNKNOWN +License: UNKNOWN +Description: All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or + its licensors. + + For complete copyright and license terms please see the LICENSE at the root of this + distribution (the "License"). All use of this software is governed by the License, + or, if provided, by the license below or the license accompanying this file. Do not + remove or modify any license notices. This file is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + + + INTRODUCTION + ------------ + + EditorPythonBindings is a Python project that contains a collection of testing tools + developed by the Lumberyard Test Tech team. The project contains + the following tools: + + * Workspace Manager: + A library to manipulate Lumberyard installations + * Launchers: + A library to test the game in a variety of platforms + + + REQUIREMENTS + ------------ + + * Python 3.7.5 (64-bit) + + It is recommended that you completely remove any other versions of Python + installed on your system. + + + INSTALL + ----------- + It is recommended to set up these these tools with Lumberyard's CMake build commands. + Assuming CMake is already setup on your operating system, below are some sample build commands: + cd /path/to/od3e/ + mkdir windows_vs2019 + cd windows_vs2019 + cmake .. -G "Visual Studio 16 2019" -A x64 -T host=x64 -DLY_3RDPARTY_PATH="%3RDPARTYPATH%" -DLY_PROJECTS=AutomatedTesting + NOTE: + Using the above command also adds LyTestTools to the PYTHONPATH OS environment variable. + Additionally, some CTest scripts will add the Python interpreter path to the PYTHON OS environment variable. + There is some LyTestTools functionality that will search for these, so feel free to populate them manually. + + To manually install the project in development mode using your own installed Python interpreter: + cd /path/to/lumberyard/dev/Tools/LyTestTools/ + /path/to/your/python -m pip install -e . + + For console/mobile testing, update the following .ini file in your root user directory: + i.e. C:/Users/myusername/ly_test_tools/devices.ini (a.k.a. %USERPROFILE%/ly_test_tools/devices.ini) + + You will need to add a section for the device, and a key holding the device identifier value (usually an IP or ID). + It should look similar to this for each device: + [android] + id = 988939353955305449 + + [gameconsole] + ip = 192.168.1.1 + + [gameconsole2] + ip = 192.168.1.2 + + + PACKAGE STRUCTURE + ----------------- + + The project is organized into packages. Each package corresponds to a tool: + + - LyTestTools.ly_test_tools._internal: contains logging setup, pytest fixture, and o3de workspace manager modules + - LyTestTools.ly_test_tools.builtin: builtin helpers and fixtures for quickly writing tests + - LyTestTools.ly_test_tools.console: modules used for consoles + - LyTestTools.ly_test_tools.environment: functions related to file/process management and cleanup + - LyTestTools.ly_test_tools.image: modules related to image capturing and processing + - LyTestTools.ly_test_tools.launchers: game launchers library + - LyTestTools.ly_test_tools.log: modules for interacting with generated or existing log files + - LyTestTools.ly_test_tools.o3de: modules used to interact with Open 3D Engine + - LyTestTools.ly_test_tools.mobile: modules used for android/ios + - LyTestTools.ly_test_tools.report: modules used for reporting + - LyTestTools.tests: LyTestTools integration, unit, and example usage tests + + + DIRECTORY STRUCTURE + ------------------- + + The directory structure corresponds to the package structure. For example, the + ly_test_tools.builtin package is located in the ly_test_tools/builtin/ directory. + + + ENTRY POINTS + ------------ + + Deploying the project in development mode installs only entry points for pytest fixtures. + + + UNINSTALLATION + -------------- + + The preferred way to uninstall the project is: + /path/to/your/python -m pip uninstall ly_test_tools + +Platform: UNKNOWN diff --git a/AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/editor_python_test_tools.egg-info/SOURCES.txt b/AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/editor_python_test_tools.egg-info/SOURCES.txt new file mode 100644 index 0000000000..1143b74a7c --- /dev/null +++ b/AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/editor_python_test_tools.egg-info/SOURCES.txt @@ -0,0 +1,7 @@ +README.txt +setup.py +editor_python_test_tools.egg-info/PKG-INFO +editor_python_test_tools.egg-info/SOURCES.txt +editor_python_test_tools.egg-info/dependency_links.txt +editor_python_test_tools.egg-info/requires.txt +editor_python_test_tools.egg-info/top_level.txt \ No newline at end of file diff --git a/AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/editor_python_test_tools.egg-info/dependency_links.txt b/AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/editor_python_test_tools.egg-info/dependency_links.txt new file mode 100644 index 0000000000..8b13789179 --- /dev/null +++ b/AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/editor_python_test_tools.egg-info/dependency_links.txt @@ -0,0 +1 @@ + diff --git a/AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/editor_python_test_tools.egg-info/requires.txt b/AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/editor_python_test_tools.egg-info/requires.txt new file mode 100644 index 0000000000..f11e5b3d82 --- /dev/null +++ b/AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/editor_python_test_tools.egg-info/requires.txt @@ -0,0 +1 @@ +ly_test_tools diff --git a/AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/editor_python_test_tools.egg-info/top_level.txt b/AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/editor_python_test_tools.egg-info/top_level.txt new file mode 100644 index 0000000000..8b13789179 --- /dev/null +++ b/AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/editor_python_test_tools.egg-info/top_level.txt @@ -0,0 +1 @@ + diff --git a/AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/editor_python_test_tools/__init__.py b/AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/editor_python_test_tools/__init__.py new file mode 100644 index 0000000000..6ed3dc4bda --- /dev/null +++ b/AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/editor_python_test_tools/__init__.py @@ -0,0 +1,10 @@ +""" +All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or +its licensors. + +For complete copyright and license terms please see the LICENSE at the root of this +distribution (the "License"). All use of this software is governed by the License, +or, if provided, by the license below or the license accompanying this file. Do not +remove or modify any license notices. This file is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +""" \ No newline at end of file diff --git a/AutomatedTesting/Gem/PythonTests/automatedtesting_shared/editor_entity_utils.py b/AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/editor_python_test_tools/editor_entity_utils.py old mode 100755 new mode 100644 similarity index 98% rename from AutomatedTesting/Gem/PythonTests/automatedtesting_shared/editor_entity_utils.py rename to AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/editor_python_test_tools/editor_entity_utils.py index 3e009563b8..4dc71bf16b --- a/AutomatedTesting/Gem/PythonTests/automatedtesting_shared/editor_entity_utils.py +++ b/AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/editor_python_test_tools/editor_entity_utils.py @@ -13,8 +13,6 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. from __future__ import annotations from typing import List, Tuple, Union -# Helper file Imports -import utils # Open 3D Engine Imports import azlmbr @@ -23,6 +21,8 @@ import azlmbr.editor as editor import azlmbr.math as math import azlmbr.legacy.general as general +# Helper file Imports +from editor_python_test_tools.utils import Report class EditorComponent: """ @@ -61,7 +61,7 @@ class EditorComponent: build_prop_tree_outcome.IsSuccess() ), f"Failure: Could not build property tree of component: '{self.get_component_name()}'" prop_tree = build_prop_tree_outcome.GetValue() - utils.Report.info(prop_tree.build_paths_list()) + Report.info(prop_tree.build_paths_list()) return prop_tree def get_component_property_value(self, component_property_path: str): @@ -291,7 +291,7 @@ class EditorEntity: status_text = "inactive" elif status == azlmbr.globals.property.EditorEntityStartStatus_EditorOnly: status_text = "editor" - utils.Report.info(f"The start status for {self.get_name} is {status_text}") + Report.info(f"The start status for {self.get_name} is {status_text}") self.start_status = status return status @@ -308,7 +308,7 @@ class EditorEntity: elif desired_start_status == "editor": status_to_set = azlmbr.globals.property.EditorEntityStartStatus_EditorOnly else: - utils.Report.info( + Report.info( f"Invalid desired_start_status argument for {self.get_name} set_start_status command;\ Use editor, active, or inactive" ) diff --git a/AutomatedTesting/Gem/PythonTests/automatedtesting_shared/editor_test_helper.py b/AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/editor_python_test_tools/editor_test_helper.py old mode 100755 new mode 100644 similarity index 99% rename from AutomatedTesting/Gem/PythonTests/automatedtesting_shared/editor_test_helper.py rename to AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/editor_python_test_tools/editor_test_helper.py index ed9a8a58fa..74f34659c0 --- a/AutomatedTesting/Gem/PythonTests/automatedtesting_shared/editor_test_helper.py +++ b/AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/editor_python_test_tools/editor_test_helper.py @@ -15,12 +15,13 @@ import sys import time from typing import Sequence -from .report import Report # Open 3D Engine specific imports import azlmbr.legacy.general as general import azlmbr.legacy.settings as settings +from editor_python_test_tools.utils import Report + class EditorTestHelper: def __init__(self, log_prefix: str, args: Sequence[str] = None) -> None: diff --git a/AutomatedTesting/Gem/PythonTests/automatedtesting_shared/hydra_editor_utils.py b/AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/editor_python_test_tools/hydra_editor_utils.py old mode 100755 new mode 100644 similarity index 100% rename from AutomatedTesting/Gem/PythonTests/automatedtesting_shared/hydra_editor_utils.py rename to AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/editor_python_test_tools/hydra_editor_utils.py diff --git a/AutomatedTesting/Gem/PythonTests/automatedtesting_shared/hydra_test_utils.py b/AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/editor_python_test_tools/hydra_test_utils.py old mode 100755 new mode 100644 similarity index 92% rename from AutomatedTesting/Gem/PythonTests/automatedtesting_shared/hydra_test_utils.py rename to AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/editor_python_test_tools/hydra_test_utils.py index a796fd70da..ee352f8a73 --- a/AutomatedTesting/Gem/PythonTests/automatedtesting_shared/hydra_test_utils.py +++ b/AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/editor_python_test_tools/hydra_test_utils.py @@ -12,10 +12,10 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. import logging import os import tempfile + import ly_test_tools.log.log_monitor import ly_test_tools.environment.process_utils as process_utils import ly_test_tools.environment.waiter as waiter -from automatedtesting_shared.network_utils import check_for_listening_port from ly_remote_console.remote_console_commands import RemoteConsole as RemoteConsole from ly_remote_console.remote_console_commands import send_command_and_expect_response as send_command_and_expect_response logger = logging.getLogger(__name__) @@ -86,6 +86,19 @@ def launch_and_validate_results_launcher(launcher, level, remote_console_instanc :param log_monitor_timeout: Timeout for monitoring for lines in Game.log :param remote_console_port: The port used to communicate with the Remote Console. """ + + def _check_for_listening_port(port): + """ + Checks to see if the connection to the designated port was established. + :param port: Port to listen to. + :return: True if port is listening. + """ + port_listening = False + for conn in psutil.net_connections(): + if 'port={}'.format(port) in str(conn): + port_listening = True + return port_listening + if null_renderer: launcher.args.extend(["-NullRenderer"]) @@ -94,7 +107,7 @@ def launch_and_validate_results_launcher(launcher, level, remote_console_instanc # Ensure Remote Console can be reached waiter.wait_for( - lambda: check_for_listening_port(remote_console_port), + lambda: _check_for_listening_port(remote_console_port), port_listener_timeout, exc=AssertionError("Port {} not listening.".format(remote_console_port)), ) diff --git a/AutomatedTesting/Gem/PythonTests/automatedtesting_shared/pyside_component_utils.py b/AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/editor_python_test_tools/pyside_component_utils.py old mode 100755 new mode 100644 similarity index 98% rename from AutomatedTesting/Gem/PythonTests/automatedtesting_shared/pyside_component_utils.py rename to AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/editor_python_test_tools/pyside_component_utils.py index 38e5800c53..0432d4ae25 --- a/AutomatedTesting/Gem/PythonTests/automatedtesting_shared/pyside_component_utils.py +++ b/AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/editor_python_test_tools/pyside_component_utils.py @@ -11,7 +11,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. import PySide2 -import pyside_utils +import editor_python_test_tools.pyside_utils def get_component_combobox_values(component_name, property_name, log_fn=None): diff --git a/AutomatedTesting/Gem/PythonTests/automatedtesting_shared/pyside_utils.py b/AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/editor_python_test_tools/pyside_utils.py old mode 100755 new mode 100644 similarity index 100% rename from AutomatedTesting/Gem/PythonTests/automatedtesting_shared/pyside_utils.py rename to AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/editor_python_test_tools/pyside_utils.py diff --git a/AutomatedTesting/Gem/PythonTests/automatedtesting_shared/utils.py b/AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/editor_python_test_tools/utils.py old mode 100755 new mode 100644 similarity index 100% rename from AutomatedTesting/Gem/PythonTests/automatedtesting_shared/utils.py rename to AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/editor_python_test_tools/utils.py diff --git a/AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/setup.py b/AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/setup.py new file mode 100644 index 0000000000..20f4911bab --- /dev/null +++ b/AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/setup.py @@ -0,0 +1,43 @@ +""" +All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or +its licensors. + +For complete copyright and license terms please see the LICENSE at the root of this +distribution (the "License"). All use of this software is governed by the License, +or, if provided, by the license below or the license accompanying this file. Do not +remove or modify any license notices. This file is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +""" +import os +import platform + +from setuptools import setup, find_packages +from setuptools.command.develop import develop +from setuptools.command.build_py import build_py + +PACKAGE_ROOT = os.path.abspath(os.path.dirname(__file__)) + +PYTHON_64 = platform.architecture()[0] == '64bit' + + +if __name__ == '__main__': + if not PYTHON_64: + raise RuntimeError("32-bit Python is not a supported platform.") + + with open(os.path.join(PACKAGE_ROOT, 'README.txt')) as f: + long_description = f.read() + + setup( + name="editor_python_test_tools", + version="1.0.0", + description='O3DE editor Python bindings test tools', + long_description=long_description, + packages=find_packages(where='Tools', exclude=['tests']), + install_requires=[ + "ly_test_tools" + ], + tests_require=[ + ], + entry_points={ + }, + ) diff --git a/AutomatedTesting/Gem/PythonTests/NvCloth/C18977329_NvCloth_AddClothSimulationToMesh.py b/AutomatedTesting/Gem/PythonTests/NvCloth/C18977329_NvCloth_AddClothSimulationToMesh.py index d54edc4cb3..2677ba5605 100755 --- a/AutomatedTesting/Gem/PythonTests/NvCloth/C18977329_NvCloth_AddClothSimulationToMesh.py +++ b/AutomatedTesting/Gem/PythonTests/NvCloth/C18977329_NvCloth_AddClothSimulationToMesh.py @@ -47,14 +47,15 @@ def run(): import azlmbr.legacy.general as general + from editor_python_test_tools.editor_entity_utils import EditorEntity + from editor_python_test_tools.utils import Report + # Helper file Imports import ImportPathHelper as imports imports.init() - from utils import Report - from utils import TestHelper as helper - from utils import Tracer - from editor_entity_utils import EditorEntity + from editor_python_test_tools.utils import TestHelper as helper + from editor_python_test_tools.utils import Tracer # Constants FRAMES_IN_GAME_MODE = 200 diff --git a/AutomatedTesting/Gem/PythonTests/NvCloth/C18977330_NvCloth_AddClothSimulationToActor.py b/AutomatedTesting/Gem/PythonTests/NvCloth/C18977330_NvCloth_AddClothSimulationToActor.py index 2882ca6be2..2d4fa4e325 100755 --- a/AutomatedTesting/Gem/PythonTests/NvCloth/C18977330_NvCloth_AddClothSimulationToActor.py +++ b/AutomatedTesting/Gem/PythonTests/NvCloth/C18977330_NvCloth_AddClothSimulationToActor.py @@ -47,14 +47,15 @@ def run(): import azlmbr.legacy.general as general + from editor_python_test_tools.editor_entity_utils import EditorEntity + from editor_python_test_tools.utils import Report + # Helper file Imports import ImportPathHelper as imports imports.init() - from utils import Report - from utils import TestHelper as helper - from utils import Tracer - from editor_entity_utils import EditorEntity + from editor_python_test_tools.utils import TestHelper as helper + from editor_python_test_tools.utils import Tracer # Constants FRAMES_IN_GAME_MODE = 200 diff --git a/AutomatedTesting/Gem/PythonTests/WhiteBox/C28798177_WhiteBox_AddComponentToEntity.py b/AutomatedTesting/Gem/PythonTests/WhiteBox/C28798177_WhiteBox_AddComponentToEntity.py index 9438b9d546..252126674c 100755 --- a/AutomatedTesting/Gem/PythonTests/WhiteBox/C28798177_WhiteBox_AddComponentToEntity.py +++ b/AutomatedTesting/Gem/PythonTests/WhiteBox/C28798177_WhiteBox_AddComponentToEntity.py @@ -33,8 +33,9 @@ def run(): import azlmbr.editor as editor import azlmbr.legacy.general as general - from utils import Report - from utils import TestHelper as helper + from editor_python_test_tools.utils import Report + + from editor_python_test_tools.utils import TestHelper as helper # open level helper.init_idle() diff --git a/AutomatedTesting/Gem/PythonTests/WhiteBox/C28798205_WhiteBox_SetInvisible.py b/AutomatedTesting/Gem/PythonTests/WhiteBox/C28798205_WhiteBox_SetInvisible.py index 605361e071..b7c6719721 100755 --- a/AutomatedTesting/Gem/PythonTests/WhiteBox/C28798205_WhiteBox_SetInvisible.py +++ b/AutomatedTesting/Gem/PythonTests/WhiteBox/C28798205_WhiteBox_SetInvisible.py @@ -30,7 +30,7 @@ def run(): import sys import WhiteBoxInit as init import ImportPathHelper as imports - import Tests.ly_shared.hydra_editor_utils as hydra + import editor_python_test_tools.hydra_editor_utils as hydra imports.init() import azlmbr.whitebox.api as api @@ -40,8 +40,9 @@ def run(): import azlmbr.entity as entity import azlmbr.legacy.general as general - from utils import Report - from utils import TestHelper as helper + from editor_python_test_tools.utils import Report + + from editor_python_test_tools.utils import TestHelper as helper # open level helper.init_idle() diff --git a/AutomatedTesting/Gem/PythonTests/WhiteBox/C29279329_WhiteBox_SetDefaultShape.py b/AutomatedTesting/Gem/PythonTests/WhiteBox/C29279329_WhiteBox_SetDefaultShape.py index 399a9f27d4..0b0a081186 100755 --- a/AutomatedTesting/Gem/PythonTests/WhiteBox/C29279329_WhiteBox_SetDefaultShape.py +++ b/AutomatedTesting/Gem/PythonTests/WhiteBox/C29279329_WhiteBox_SetDefaultShape.py @@ -37,8 +37,9 @@ def run(): import azlmbr.bus as bus import azlmbr.legacy.general as general - from utils import Report - from utils import TestHelper as helper + from editor_python_test_tools.utils import Report + + from editor_python_test_tools.utils import TestHelper as helper def check_shape_result(success_fail_tuple, condition): result = Report.result(success_fail_tuple, condition) diff --git a/AutomatedTesting/Gem/PythonTests/automatedtesting_shared/asset_utils.py b/AutomatedTesting/Gem/PythonTests/automatedtesting_shared/asset_utils.py index 1fe2771370..4d78e4f28b 100755 --- a/AutomatedTesting/Gem/PythonTests/automatedtesting_shared/asset_utils.py +++ b/AutomatedTesting/Gem/PythonTests/automatedtesting_shared/asset_utils.py @@ -22,7 +22,7 @@ class Asset: """ Used to find Asset Id by its path and path of asset by its Id If a component has any asset property, then this class object can be called as: - asset_id = editor_entity_utils.EditorComponent.get_component_property_value() + asset_id = editor_python_test_tools.editor_entity_utils.EditorComponent.get_component_property_value() asset = asset_utils.Asset(asset_id) """ def __init__(self, id: azasset.AssetId): diff --git a/AutomatedTesting/Gem/PythonTests/automatedtesting_shared/landscape_canvas_utils.py b/AutomatedTesting/Gem/PythonTests/automatedtesting_shared/landscape_canvas_utils.py index 6609e1a34f..d20dcabd73 100755 --- a/AutomatedTesting/Gem/PythonTests/automatedtesting_shared/landscape_canvas_utils.py +++ b/AutomatedTesting/Gem/PythonTests/automatedtesting_shared/landscape_canvas_utils.py @@ -13,7 +13,7 @@ import azlmbr.bus as bus import azlmbr.editor as editor import azlmbr.landscapecanvas as landscapecanvas -from . import hydra_editor_utils as hydra +import editor_python_test_tools.hydra_editor_utils as hydra def find_nodes_matching_entity_component(component_name, entity_id): diff --git a/AutomatedTesting/Gem/PythonTests/editor/EditorScripts/AssetBrowser_SearchFiltering.py b/AutomatedTesting/Gem/PythonTests/editor/EditorScripts/AssetBrowser_SearchFiltering.py index 6dc59d9be0..75c17b2a69 100644 --- a/AutomatedTesting/Gem/PythonTests/editor/EditorScripts/AssetBrowser_SearchFiltering.py +++ b/AutomatedTesting/Gem/PythonTests/editor/EditorScripts/AssetBrowser_SearchFiltering.py @@ -22,9 +22,9 @@ import azlmbr.legacy.general as general import azlmbr.paths sys.path.append(os.path.join(azlmbr.paths.devroot, 'AutomatedTesting', 'Gem', 'PythonTests')) -import automatedtesting_shared.hydra_editor_utils as hydra -from automatedtesting_shared.editor_test_helper import EditorTestHelper -import automatedtesting_shared.pyside_utils as pyside_utils +import editor_python_test_tools.hydra_editor_utils as hydra +import editor_python_test_tools.pyside_utils as pyside_utils +from editor_python_test_tools.editor_test_helper import EditorTestHelper class AssetBrowserSearchFilteringTest(EditorTestHelper): diff --git a/AutomatedTesting/Gem/PythonTests/editor/EditorScripts/AssetPicker_UI_UX.py b/AutomatedTesting/Gem/PythonTests/editor/EditorScripts/AssetPicker_UI_UX.py index c51e4ca55f..ce7dd33971 100644 --- a/AutomatedTesting/Gem/PythonTests/editor/EditorScripts/AssetPicker_UI_UX.py +++ b/AutomatedTesting/Gem/PythonTests/editor/EditorScripts/AssetPicker_UI_UX.py @@ -25,9 +25,9 @@ import azlmbr.paths import azlmbr.math as math sys.path.append(os.path.join(azlmbr.paths.devroot, 'AutomatedTesting', 'Gem', 'PythonTests')) -import automatedtesting_shared.hydra_editor_utils as hydra -from automatedtesting_shared.editor_test_helper import EditorTestHelper -import automatedtesting_shared.pyside_utils as pyside_utils +import editor_python_test_tools.hydra_editor_utils as hydra +import editor_python_test_tools.pyside_utils as pyside_utils +from editor_python_test_tools.editor_test_helper import EditorTestHelper class AssetPickerUIUXTest(EditorTestHelper): diff --git a/AutomatedTesting/Gem/PythonTests/editor/EditorScripts/ComponentCRUD_Add_Delete_Components.py b/AutomatedTesting/Gem/PythonTests/editor/EditorScripts/ComponentCRUD_Add_Delete_Components.py index cdc204043e..5e07a6df7d 100755 --- a/AutomatedTesting/Gem/PythonTests/editor/EditorScripts/ComponentCRUD_Add_Delete_Components.py +++ b/AutomatedTesting/Gem/PythonTests/editor/EditorScripts/ComponentCRUD_Add_Delete_Components.py @@ -26,9 +26,9 @@ import azlmbr.math as math import azlmbr.paths sys.path.append(os.path.join(azlmbr.paths.devroot, 'AutomatedTesting', 'Gem', 'PythonTests')) -import automatedtesting_shared.hydra_editor_utils as hydra -from automatedtesting_shared.editor_test_helper import EditorTestHelper -import automatedtesting_shared.pyside_utils as pyside_utils +import editor_python_test_tools.hydra_editor_utils as hydra +import editor_python_test_tools.pyside_utils as pyside_utils +from editor_python_test_tools.editor_test_helper import EditorTestHelper class AddDeleteComponentsTest(EditorTestHelper): diff --git a/AutomatedTesting/Gem/PythonTests/editor/EditorScripts/InputBindings_Add_Remove_Input_Events.py b/AutomatedTesting/Gem/PythonTests/editor/EditorScripts/InputBindings_Add_Remove_Input_Events.py index d6d284664a..dbc942f471 100755 --- a/AutomatedTesting/Gem/PythonTests/editor/EditorScripts/InputBindings_Add_Remove_Input_Events.py +++ b/AutomatedTesting/Gem/PythonTests/editor/EditorScripts/InputBindings_Add_Remove_Input_Events.py @@ -25,9 +25,9 @@ import azlmbr.math as math import azlmbr.paths sys.path.append(os.path.join(azlmbr.paths.devroot, 'AutomatedTesting', 'Gem', 'PythonTests')) -import automatedtesting_shared.hydra_editor_utils as hydra -from automatedtesting_shared.editor_test_helper import EditorTestHelper -import automatedtesting_shared.pyside_utils as pyside_utils +import editor_python_test_tools.hydra_editor_utils as hydra +import editor_python_test_tools.pyside_utils as pyside_utils +from editor_python_test_tools.editor_test_helper import EditorTestHelper class AddRemoveInputEventsTest(EditorTestHelper): def __init__(self): diff --git a/AutomatedTesting/Gem/PythonTests/editor/test_AssetBrowser.py b/AutomatedTesting/Gem/PythonTests/editor/test_AssetBrowser.py index 18dbee2424..48e65cd9fe 100644 --- a/AutomatedTesting/Gem/PythonTests/editor/test_AssetBrowser.py +++ b/AutomatedTesting/Gem/PythonTests/editor/test_AssetBrowser.py @@ -15,10 +15,11 @@ C13660195: Asset Browser - File Tree Navigation import os import pytest + # Bail on the test if ly_test_tools doesn't exist. pytest.importorskip('ly_test_tools') import ly_test_tools.environment.file_system as file_system -import automatedtesting_shared.hydra_test_utils as hydra +import editor_python_test_tools.hydra_test_utils as hydra test_directory = os.path.join(os.path.dirname(__file__), "EditorScripts") log_monitor_timeout = 180 diff --git a/AutomatedTesting/Gem/PythonTests/editor/test_AssetPicker.py b/AutomatedTesting/Gem/PythonTests/editor/test_AssetPicker.py index b7b6280125..ac499d734f 100644 --- a/AutomatedTesting/Gem/PythonTests/editor/test_AssetPicker.py +++ b/AutomatedTesting/Gem/PythonTests/editor/test_AssetPicker.py @@ -15,10 +15,11 @@ C13751579: Asset Picker UI/UX import os import pytest + # Bail on the test if ly_test_tools doesn't exist. pytest.importorskip('ly_test_tools') import ly_test_tools.environment.file_system as file_system -import automatedtesting_shared.hydra_test_utils as hydra +import editor_python_test_tools.hydra_test_utils as hydra test_directory = os.path.join(os.path.dirname(__file__), "EditorScripts") log_monitor_timeout = 90 diff --git a/AutomatedTesting/Gem/PythonTests/editor/test_ComponentCRUD.py b/AutomatedTesting/Gem/PythonTests/editor/test_ComponentCRUD.py index 8ee24d9aac..f4ae57c338 100755 --- a/AutomatedTesting/Gem/PythonTests/editor/test_ComponentCRUD.py +++ b/AutomatedTesting/Gem/PythonTests/editor/test_ComponentCRUD.py @@ -15,10 +15,11 @@ C16929880: Add Delete Components import os import pytest + # Bail on the test if ly_test_tools doesn't exist. pytest.importorskip('ly_test_tools') import ly_test_tools.environment.file_system as file_system -import automatedtesting_shared.hydra_test_utils as hydra +import editor_python_test_tools.hydra_test_utils as hydra test_directory = os.path.join(os.path.dirname(__file__), "EditorScripts") log_monitor_timeout = 180 diff --git a/AutomatedTesting/Gem/PythonTests/editor/test_Docking.py b/AutomatedTesting/Gem/PythonTests/editor/test_Docking.py index 16cccca3fe..a75b3b36cd 100644 --- a/AutomatedTesting/Gem/PythonTests/editor/test_Docking.py +++ b/AutomatedTesting/Gem/PythonTests/editor/test_Docking.py @@ -13,10 +13,11 @@ C6376081: Basic Function: Docked/Undocked Tools import os import pytest + # Bail on the test if ly_test_tools doesn't exist. pytest.importorskip('ly_test_tools') import ly_test_tools.environment.file_system as file_system -import automatedtesting_shared.hydra_test_utils as hydra +import editor_python_test_tools.hydra_test_utils as hydra test_directory = os.path.join(os.path.dirname(__file__), "EditorScripts") log_monitor_timeout = 180 diff --git a/AutomatedTesting/Gem/PythonTests/editor/test_InputBindings.py b/AutomatedTesting/Gem/PythonTests/editor/test_InputBindings.py index f7e6a8ce5f..cdcfe86ef7 100755 --- a/AutomatedTesting/Gem/PythonTests/editor/test_InputBindings.py +++ b/AutomatedTesting/Gem/PythonTests/editor/test_InputBindings.py @@ -15,10 +15,11 @@ C1506881: Adding/Removing Event Groups import os import pytest + # Bail on the test if ly_test_tools doesn't exist. pytest.importorskip('ly_test_tools') import ly_test_tools.environment.file_system as file_system -import automatedtesting_shared.hydra_test_utils as hydra +import editor_python_test_tools.hydra_test_utils as hydra test_directory = os.path.join(os.path.dirname(__file__), "EditorScripts") log_monitor_timeout = 180 diff --git a/AutomatedTesting/Gem/PythonTests/editor/test_Menus.py b/AutomatedTesting/Gem/PythonTests/editor/test_Menus.py index 1df25dc593..251bd7cfed 100644 --- a/AutomatedTesting/Gem/PythonTests/editor/test_Menus.py +++ b/AutomatedTesting/Gem/PythonTests/editor/test_Menus.py @@ -13,10 +13,11 @@ C16780783: Base Edit Menu Options (New Viewport Interaction Model) import os import pytest + # Bail on the test if ly_test_tools doesn't exist. pytest.importorskip('ly_test_tools') import ly_test_tools.environment.file_system as file_system -import automatedtesting_shared.hydra_test_utils as hydra +import editor_python_test_tools.hydra_test_utils as hydra test_directory = os.path.join(os.path.dirname(__file__), "EditorScripts") log_monitor_timeout = 180 diff --git a/AutomatedTesting/Gem/PythonTests/editor/test_SearchFiltering.py b/AutomatedTesting/Gem/PythonTests/editor/test_SearchFiltering.py index fa8b143739..a3d4739fd8 100755 --- a/AutomatedTesting/Gem/PythonTests/editor/test_SearchFiltering.py +++ b/AutomatedTesting/Gem/PythonTests/editor/test_SearchFiltering.py @@ -15,10 +15,11 @@ C13660194 : Asset Browser - Filtering import os import pytest + # Bail on the test if ly_test_tools doesn't exist. pytest.importorskip('ly_test_tools') import ly_test_tools.environment.file_system as file_system -import automatedtesting_shared.hydra_test_utils as hydra +import editor_python_test_tools.hydra_test_utils as hydra test_directory = os.path.join(os.path.dirname(__file__), "EditorScripts") log_monitor_timeout = 90 diff --git a/AutomatedTesting/Gem/PythonTests/editor/test_TreeNavigation.py b/AutomatedTesting/Gem/PythonTests/editor/test_TreeNavigation.py index a97e4696d5..069d09f144 100755 --- a/AutomatedTesting/Gem/PythonTests/editor/test_TreeNavigation.py +++ b/AutomatedTesting/Gem/PythonTests/editor/test_TreeNavigation.py @@ -15,10 +15,11 @@ C13660195: Asset Browser - File Tree Navigation import os import pytest + # Bail on the test if ly_test_tools doesn't exist. pytest.importorskip('ly_test_tools') import ly_test_tools.environment.file_system as file_system -import automatedtesting_shared.hydra_test_utils as hydra +import editor_python_test_tools.hydra_test_utils as hydra test_directory = os.path.join(os.path.dirname(__file__), "EditorScripts") log_monitor_timeout = 90 diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/AltitudeFilter_ComponentAndOverrides_InstancesPlantAtSpecifiedAltitude.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/AltitudeFilter_ComponentAndOverrides_InstancesPlantAtSpecifiedAltitude.py index 673e473390..a0279aecec 100755 --- a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/AltitudeFilter_ComponentAndOverrides_InstancesPlantAtSpecifiedAltitude.py +++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/AltitudeFilter_ComponentAndOverrides_InstancesPlantAtSpecifiedAltitude.py @@ -25,8 +25,8 @@ import azlmbr.math as math import azlmbr.paths sys.path.append(os.path.join(azlmbr.paths.devroot, 'AutomatedTesting', 'Gem', 'PythonTests')) -import automatedtesting_shared.hydra_editor_utils as hydra -from automatedtesting_shared.editor_test_helper import EditorTestHelper +import editor_python_test_tools.hydra_editor_utils as hydra +from editor_python_test_tools.editor_test_helper import EditorTestHelper from largeworlds.large_worlds_utils import editor_dynveg_test_helper as dynveg diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/AltitudeFilter_FilterStageToggle.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/AltitudeFilter_FilterStageToggle.py index 50511811f1..09f8bb9814 100755 --- a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/AltitudeFilter_FilterStageToggle.py +++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/AltitudeFilter_FilterStageToggle.py @@ -20,8 +20,8 @@ import azlmbr.math as math import azlmbr.paths sys.path.append(os.path.join(azlmbr.paths.devroot, "AutomatedTesting", "Gem", "PythonTests")) -import automatedtesting_shared.hydra_editor_utils as hydra -from automatedtesting_shared.editor_test_helper import EditorTestHelper +import editor_python_test_tools.hydra_editor_utils as hydra +from editor_python_test_tools.editor_test_helper import EditorTestHelper from largeworlds.large_worlds_utils import editor_dynveg_test_helper as dynveg diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/AltitudeFilter_ShapeSample_InstancesPlantAtSpecifiedAltitude.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/AltitudeFilter_ShapeSample_InstancesPlantAtSpecifiedAltitude.py index 7e76a80cc4..5d4154b030 100755 --- a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/AltitudeFilter_ShapeSample_InstancesPlantAtSpecifiedAltitude.py +++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/AltitudeFilter_ShapeSample_InstancesPlantAtSpecifiedAltitude.py @@ -20,8 +20,8 @@ import azlmbr.math as math import azlmbr.paths sys.path.append(os.path.join(azlmbr.paths.devroot, 'AutomatedTesting', 'Gem', 'PythonTests')) -import automatedtesting_shared.hydra_editor_utils as hydra -from automatedtesting_shared.editor_test_helper import EditorTestHelper +import editor_python_test_tools.hydra_editor_utils as hydra +from editor_python_test_tools.editor_test_helper import EditorTestHelper from largeworlds.large_worlds_utils import editor_dynveg_test_helper as dynveg diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/AreaComponentSlices_SliceCreationAndVisibilityToggle.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/AreaComponentSlices_SliceCreationAndVisibilityToggle.py index 1123a63ae4..786a7e3502 100755 --- a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/AreaComponentSlices_SliceCreationAndVisibilityToggle.py +++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/AreaComponentSlices_SliceCreationAndVisibilityToggle.py @@ -21,8 +21,8 @@ import azlmbr.asset as asset import azlmbr.paths sys.path.append(os.path.join(azlmbr.paths.devroot, "AutomatedTesting", "Gem", "PythonTests")) -import automatedtesting_shared.hydra_editor_utils as hydra -from automatedtesting_shared.editor_test_helper import EditorTestHelper +import editor_python_test_tools.hydra_editor_utils as hydra +from editor_python_test_tools.editor_test_helper import EditorTestHelper from largeworlds.large_worlds_utils import editor_dynveg_test_helper as dynveg diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/AssetListCombiner_CombinedDescriptorsExpressInConfiguredArea.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/AssetListCombiner_CombinedDescriptorsExpressInConfiguredArea.py index 786348bcc6..374813b298 100755 --- a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/AssetListCombiner_CombinedDescriptorsExpressInConfiguredArea.py +++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/AssetListCombiner_CombinedDescriptorsExpressInConfiguredArea.py @@ -21,8 +21,8 @@ import azlmbr.paths import azlmbr.vegetation as vegetation sys.path.append(os.path.join(azlmbr.paths.devroot, 'AutomatedTesting', 'Gem', 'PythonTests')) -import automatedtesting_shared.hydra_editor_utils as hydra -from automatedtesting_shared.editor_test_helper import EditorTestHelper +import editor_python_test_tools.hydra_editor_utils as hydra +from editor_python_test_tools.editor_test_helper import EditorTestHelper from largeworlds.large_worlds_utils import editor_dynveg_test_helper as dynveg diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/AssetWeightSelector_InstancesExpressBasedOnWeight.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/AssetWeightSelector_InstancesExpressBasedOnWeight.py index 85d4edfe6d..37bd47ed5d 100755 --- a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/AssetWeightSelector_InstancesExpressBasedOnWeight.py +++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/AssetWeightSelector_InstancesExpressBasedOnWeight.py @@ -22,8 +22,8 @@ import azlmbr.math as math import azlmbr.paths sys.path.append(os.path.join(azlmbr.paths.devroot, 'AutomatedTesting', 'Gem', 'PythonTests')) -import automatedtesting_shared.hydra_editor_utils as hydra -from automatedtesting_shared.editor_test_helper import EditorTestHelper +import editor_python_test_tools.hydra_editor_utils as hydra +from editor_python_test_tools.editor_test_helper import EditorTestHelper from largeworlds.large_worlds_utils import editor_dynveg_test_helper as dynveg diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/Debugger_DebugCVarsWorks.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/Debugger_DebugCVarsWorks.py index 7d133f492d..aeb6170e43 100755 --- a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/Debugger_DebugCVarsWorks.py +++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/Debugger_DebugCVarsWorks.py @@ -16,8 +16,8 @@ import azlmbr.legacy.general as general import azlmbr.paths sys.path.append(os.path.join(azlmbr.paths.devroot, "AutomatedTesting", "Gem", "PythonTests")) -import automatedtesting_shared.hydra_editor_utils as hydra -from automatedtesting_shared.editor_test_helper import EditorTestHelper +import editor_python_test_tools.hydra_editor_utils as hydra +from editor_python_test_tools.editor_test_helper import EditorTestHelper class TestDebuggerDebugCVarsWorks(EditorTestHelper): diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/DistanceBetweenFilterOverrides_InstancesPlantAtSpecifiedRadius.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/DistanceBetweenFilterOverrides_InstancesPlantAtSpecifiedRadius.py index 5fed50ced9..1ccfc43585 100755 --- a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/DistanceBetweenFilterOverrides_InstancesPlantAtSpecifiedRadius.py +++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/DistanceBetweenFilterOverrides_InstancesPlantAtSpecifiedRadius.py @@ -20,8 +20,8 @@ import azlmbr.math as math import azlmbr.paths sys.path.append(os.path.join(azlmbr.paths.devroot, 'AutomatedTesting', 'Gem', 'PythonTests')) -import automatedtesting_shared.hydra_editor_utils as hydra -from automatedtesting_shared.editor_test_helper import EditorTestHelper +import editor_python_test_tools.hydra_editor_utils as hydra +from editor_python_test_tools.editor_test_helper import EditorTestHelper from largeworlds.large_worlds_utils import editor_dynveg_test_helper as dynveg diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/DistanceBetweenFilter_InstancesPlantAtSpecifiedRadius.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/DistanceBetweenFilter_InstancesPlantAtSpecifiedRadius.py index ab4863e636..09c5fd63cf 100755 --- a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/DistanceBetweenFilter_InstancesPlantAtSpecifiedRadius.py +++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/DistanceBetweenFilter_InstancesPlantAtSpecifiedRadius.py @@ -20,8 +20,8 @@ import azlmbr.math as math import azlmbr.paths sys.path.append(os.path.join(azlmbr.paths.devroot, 'AutomatedTesting', 'Gem', 'PythonTests')) -import automatedtesting_shared.hydra_editor_utils as hydra -from automatedtesting_shared.editor_test_helper import EditorTestHelper +import editor_python_test_tools.hydra_editor_utils as hydra +from editor_python_test_tools.editor_test_helper import EditorTestHelper from largeworlds.large_worlds_utils import editor_dynveg_test_helper as dynveg diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/DynamicSliceInstanceSpawner_DynamicSliceSpawnerWorks.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/DynamicSliceInstanceSpawner_DynamicSliceSpawnerWorks.py index 366dd057bc..0be220cad0 100755 --- a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/DynamicSliceInstanceSpawner_DynamicSliceSpawnerWorks.py +++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/DynamicSliceInstanceSpawner_DynamicSliceSpawnerWorks.py @@ -18,8 +18,8 @@ import azlmbr.math as math import azlmbr.paths sys.path.append(os.path.join(azlmbr.paths.devroot, 'AutomatedTesting', 'Gem', 'PythonTests')) -import automatedtesting_shared.hydra_editor_utils as hydra -from automatedtesting_shared.editor_test_helper import EditorTestHelper +import editor_python_test_tools.hydra_editor_utils as hydra +from editor_python_test_tools.editor_test_helper import EditorTestHelper from largeworlds.large_worlds_utils import editor_dynveg_test_helper as dynveg diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/DynamicSliceInstanceSpawner_Embedded_E2E.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/DynamicSliceInstanceSpawner_Embedded_E2E.py index dc5b5798a1..f24909c08d 100755 --- a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/DynamicSliceInstanceSpawner_Embedded_E2E.py +++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/DynamicSliceInstanceSpawner_Embedded_E2E.py @@ -22,8 +22,8 @@ import azlmbr.math as math import azlmbr.paths sys.path.append(os.path.join(azlmbr.paths.devroot, 'AutomatedTesting', 'Gem', 'PythonTests')) -import automatedtesting_shared.hydra_editor_utils as hydra -from automatedtesting_shared.editor_test_helper import EditorTestHelper +import editor_python_test_tools.hydra_editor_utils as hydra +from editor_python_test_tools.editor_test_helper import EditorTestHelper from largeworlds.large_worlds_utils import editor_dynveg_test_helper as dynveg diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/DynamicSliceInstanceSpawner_External_E2E.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/DynamicSliceInstanceSpawner_External_E2E.py index 0deb63d374..447ac403fb 100755 --- a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/DynamicSliceInstanceSpawner_External_E2E.py +++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/DynamicSliceInstanceSpawner_External_E2E.py @@ -22,8 +22,8 @@ import azlmbr.math as math import azlmbr.paths sys.path.append(os.path.join(azlmbr.paths.devroot, 'AutomatedTesting', 'Gem', 'PythonTests')) -import automatedtesting_shared.hydra_editor_utils as hydra -from automatedtesting_shared.editor_test_helper import EditorTestHelper +import editor_python_test_tools.hydra_editor_utils as hydra +from editor_python_test_tools.editor_test_helper import EditorTestHelper from largeworlds.large_worlds_utils import editor_dynveg_test_helper as dynveg diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/EmptyInstanceSpawner_EmptySpawnerWorks.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/EmptyInstanceSpawner_EmptySpawnerWorks.py index fd45fdcf2f..161ad038a5 100755 --- a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/EmptyInstanceSpawner_EmptySpawnerWorks.py +++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/EmptyInstanceSpawner_EmptySpawnerWorks.py @@ -18,8 +18,8 @@ import azlmbr.math as math import azlmbr.paths sys.path.append(os.path.join(azlmbr.paths.devroot, 'AutomatedTesting', 'Gem', 'PythonTests')) -import automatedtesting_shared.hydra_editor_utils as hydra -from automatedtesting_shared.editor_test_helper import EditorTestHelper +import editor_python_test_tools.hydra_editor_utils as hydra +from editor_python_test_tools.editor_test_helper import EditorTestHelper from largeworlds.large_worlds_utils import editor_dynveg_test_helper as dynveg diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/InstanceSpawnerPriority_LayerAndSubPriority.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/InstanceSpawnerPriority_LayerAndSubPriority.py index 507d8f505e..684ca70e38 100755 --- a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/InstanceSpawnerPriority_LayerAndSubPriority.py +++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/InstanceSpawnerPriority_LayerAndSubPriority.py @@ -21,8 +21,8 @@ import azlmbr.paths import azlmbr.vegetation as vegetation sys.path.append(os.path.join(azlmbr.paths.devroot, 'AutomatedTesting', 'Gem', 'PythonTests')) -import automatedtesting_shared.hydra_editor_utils as hydra -from automatedtesting_shared.editor_test_helper import EditorTestHelper +import editor_python_test_tools.hydra_editor_utils as hydra +from editor_python_test_tools.editor_test_helper import EditorTestHelper from largeworlds.large_worlds_utils import editor_dynveg_test_helper as dynveg diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/LayerBlender_E2E_Editor.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/LayerBlender_E2E_Editor.py index 2e6992d7e2..0da7acc987 100755 --- a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/LayerBlender_E2E_Editor.py +++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/LayerBlender_E2E_Editor.py @@ -29,8 +29,8 @@ import azlmbr.entity as EntityId import azlmbr.paths sys.path.append(os.path.join(azlmbr.paths.devroot, 'AutomatedTesting', 'Gem', 'PythonTests')) -import automatedtesting_shared.hydra_editor_utils as hydra -from automatedtesting_shared.editor_test_helper import EditorTestHelper +import editor_python_test_tools.hydra_editor_utils as hydra +from editor_python_test_tools.editor_test_helper import EditorTestHelper from largeworlds.large_worlds_utils import editor_dynveg_test_helper as dynveg diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/LayerBlocker_InstancesBlockedInConfiguredArea.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/LayerBlocker_InstancesBlockedInConfiguredArea.py index 53c29344e1..a856d8c093 100755 --- a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/LayerBlocker_InstancesBlockedInConfiguredArea.py +++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/LayerBlocker_InstancesBlockedInConfiguredArea.py @@ -19,8 +19,8 @@ import azlmbr.legacy.general as general import azlmbr.paths sys.path.append(os.path.join(azlmbr.paths.devroot, "AutomatedTesting", "Gem", "PythonTests")) -import automatedtesting_shared.hydra_editor_utils as hydra -from automatedtesting_shared.editor_test_helper import EditorTestHelper +import editor_python_test_tools.hydra_editor_utils as hydra +from editor_python_test_tools.editor_test_helper import EditorTestHelper from largeworlds.large_worlds_utils import editor_dynveg_test_helper as dynveg diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/LayerSpawner_FilterStageToggle.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/LayerSpawner_FilterStageToggle.py index 01c5001642..d84cd575e7 100755 --- a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/LayerSpawner_FilterStageToggle.py +++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/LayerSpawner_FilterStageToggle.py @@ -19,8 +19,8 @@ import azlmbr.math as math import azlmbr.paths sys.path.append(os.path.join(azlmbr.paths.devroot, "AutomatedTesting", "Gem", "PythonTests")) -import automatedtesting_shared.hydra_editor_utils as hydra -from automatedtesting_shared.editor_test_helper import EditorTestHelper +import editor_python_test_tools.hydra_editor_utils as hydra +from editor_python_test_tools.editor_test_helper import EditorTestHelper from largeworlds.large_worlds_utils import editor_dynveg_test_helper as dynveg diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/LayerSpawner_InheritBehaviorFlag.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/LayerSpawner_InheritBehaviorFlag.py index 59e20169e7..0e4cabe3db 100755 --- a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/LayerSpawner_InheritBehaviorFlag.py +++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/LayerSpawner_InheritBehaviorFlag.py @@ -19,8 +19,8 @@ import azlmbr.surface_data as surface_data import azlmbr.vegetation as vegetation sys.path.append(os.path.join(azlmbr.paths.devroot, "AutomatedTesting", "Gem", "PythonTests")) -import automatedtesting_shared.hydra_editor_utils as hydra -from automatedtesting_shared.editor_test_helper import EditorTestHelper +import editor_python_test_tools.hydra_editor_utils as hydra +from editor_python_test_tools.editor_test_helper import EditorTestHelper from largeworlds.large_worlds_utils import editor_dynveg_test_helper as dynveg diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/LayerSpawner_InstancesPlantInAllSupportedShapes.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/LayerSpawner_InstancesPlantInAllSupportedShapes.py index c124c631fd..add45d9671 100755 --- a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/LayerSpawner_InstancesPlantInAllSupportedShapes.py +++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/LayerSpawner_InstancesPlantInAllSupportedShapes.py @@ -19,8 +19,8 @@ import azlmbr.entity as EntityId import azlmbr.math as math sys.path.append(os.path.join(azlmbr.paths.devroot, 'AutomatedTesting', 'Gem', 'PythonTests')) -import automatedtesting_shared.hydra_editor_utils as hydra -from automatedtesting_shared.editor_test_helper import EditorTestHelper +import editor_python_test_tools.hydra_editor_utils as hydra +from editor_python_test_tools.editor_test_helper import EditorTestHelper from largeworlds.large_worlds_utils import editor_dynveg_test_helper as dynveg diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/MeshBlocker_InstancesBlockedByMesh.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/MeshBlocker_InstancesBlockedByMesh.py index 437dc31118..d366521304 100755 --- a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/MeshBlocker_InstancesBlockedByMesh.py +++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/MeshBlocker_InstancesBlockedByMesh.py @@ -20,8 +20,8 @@ import azlmbr.legacy.general as general import azlmbr.math as math sys.path.append(os.path.join(azlmbr.paths.devroot, 'AutomatedTesting', 'Gem', 'PythonTests')) -import automatedtesting_shared.hydra_editor_utils as hydra -from automatedtesting_shared.editor_test_helper import EditorTestHelper +import editor_python_test_tools.hydra_editor_utils as hydra +from editor_python_test_tools.editor_test_helper import EditorTestHelper from largeworlds.large_worlds_utils import editor_dynveg_test_helper as dynveg diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/MeshBlocker_InstancesBlockedByMeshHeightTuning.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/MeshBlocker_InstancesBlockedByMeshHeightTuning.py index 66250bf451..a7a0bc146b 100755 --- a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/MeshBlocker_InstancesBlockedByMeshHeightTuning.py +++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/MeshBlocker_InstancesBlockedByMeshHeightTuning.py @@ -24,8 +24,8 @@ import azlmbr.math as math sys.path.append(os.path.join(azlmbr.paths.devroot, 'AutomatedTesting', 'Gem', 'PythonTests')) -import automatedtesting_shared.hydra_editor_utils as hydra -from automatedtesting_shared.editor_test_helper import EditorTestHelper +import editor_python_test_tools.hydra_editor_utils as hydra +from editor_python_test_tools.editor_test_helper import EditorTestHelper from largeworlds.large_worlds_utils import editor_dynveg_test_helper as dynveg diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/MeshSurfaceTagEmitter_DependentOnMeshComponent.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/MeshSurfaceTagEmitter_DependentOnMeshComponent.py index a5d04a3b6a..5757ed7559 100755 --- a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/MeshSurfaceTagEmitter_DependentOnMeshComponent.py +++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/MeshSurfaceTagEmitter_DependentOnMeshComponent.py @@ -20,8 +20,8 @@ import azlmbr.math as math import azlmbr.paths sys.path.append(os.path.join(azlmbr.paths.devroot, 'AutomatedTesting', 'Gem', 'PythonTests')) -import automatedtesting_shared.hydra_editor_utils as hydra -from automatedtesting_shared.editor_test_helper import EditorTestHelper +import editor_python_test_tools.hydra_editor_utils as hydra +from editor_python_test_tools.editor_test_helper import EditorTestHelper class TestMeshSurfaceTagEmitter(EditorTestHelper): diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/MeshSurfaceTagEmitter_SurfaceTagsAddRemoveSuccessfully.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/MeshSurfaceTagEmitter_SurfaceTagsAddRemoveSuccessfully.py index e0011ea28f..ffa805cb41 100755 --- a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/MeshSurfaceTagEmitter_SurfaceTagsAddRemoveSuccessfully.py +++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/MeshSurfaceTagEmitter_SurfaceTagsAddRemoveSuccessfully.py @@ -18,8 +18,8 @@ import azlmbr.paths import azlmbr.surface_data as surface_data sys.path.append(os.path.join(azlmbr.paths.devroot, 'AutomatedTesting', 'Gem', 'PythonTests')) -import automatedtesting_shared.hydra_editor_utils as hydra -from automatedtesting_shared.editor_test_helper import EditorTestHelper +import editor_python_test_tools.hydra_editor_utils as hydra +from editor_python_test_tools.editor_test_helper import EditorTestHelper class TestMeshSurfaceTagEmitter(EditorTestHelper): 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 13003cdfcd..1826549a01 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 @@ -19,8 +19,8 @@ import azlmbr.bus as bus import azlmbr.math as math sys.path.append(os.path.join(azlmbr.paths.devroot, 'AutomatedTesting', 'Gem', 'PythonTests')) -import automatedtesting_shared.hydra_editor_utils as hydra -from automatedtesting_shared.editor_test_helper import EditorTestHelper +import editor_python_test_tools.hydra_editor_utils as hydra +from editor_python_test_tools.editor_test_helper import EditorTestHelper from largeworlds.large_worlds_utils import editor_dynveg_test_helper as dynveg diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/PositionModifier_AutoSnapToSurfaceWorks.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/PositionModifier_AutoSnapToSurfaceWorks.py index d2d112907a..a215e21a94 100755 --- a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/PositionModifier_AutoSnapToSurfaceWorks.py +++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/PositionModifier_AutoSnapToSurfaceWorks.py @@ -20,8 +20,8 @@ import azlmbr.math as math import azlmbr.paths sys.path.append(os.path.join(azlmbr.paths.devroot, 'AutomatedTesting', 'Gem', 'PythonTests')) -import automatedtesting_shared.hydra_editor_utils as hydra -from automatedtesting_shared.editor_test_helper import EditorTestHelper +import editor_python_test_tools.hydra_editor_utils as hydra +from editor_python_test_tools.editor_test_helper import EditorTestHelper from largeworlds.large_worlds_utils import editor_dynveg_test_helper as dynveg diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/PositionModifier_ComponentAndOverrides_InstancesPlantAtSpecifiedOffsets.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/PositionModifier_ComponentAndOverrides_InstancesPlantAtSpecifiedOffsets.py index bd2a2df16f..e3ee0e5313 100755 --- a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/PositionModifier_ComponentAndOverrides_InstancesPlantAtSpecifiedOffsets.py +++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/PositionModifier_ComponentAndOverrides_InstancesPlantAtSpecifiedOffsets.py @@ -21,8 +21,8 @@ import azlmbr.math as math import azlmbr.paths sys.path.append(os.path.join(azlmbr.paths.devroot, 'AutomatedTesting', 'Gem', 'PythonTests')) -import automatedtesting_shared.hydra_editor_utils as hydra -from automatedtesting_shared.editor_test_helper import EditorTestHelper +import editor_python_test_tools.hydra_editor_utils as hydra +from editor_python_test_tools.editor_test_helper import EditorTestHelper from largeworlds.large_worlds_utils import editor_dynveg_test_helper as dynveg diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/RotationModifierOverrides_InstancesRotateWithinRange.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/RotationModifierOverrides_InstancesRotateWithinRange.py index 64fee5d657..25b6c65ca3 100755 --- a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/RotationModifierOverrides_InstancesRotateWithinRange.py +++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/RotationModifierOverrides_InstancesRotateWithinRange.py @@ -24,8 +24,8 @@ import azlmbr.bus as bus import azlmbr.areasystem as areasystem sys.path.append(os.path.join(azlmbr.paths.devroot, 'AutomatedTesting', 'Gem', 'PythonTests')) -import automatedtesting_shared.hydra_editor_utils as hydra -from automatedtesting_shared.editor_test_helper import EditorTestHelper +import editor_python_test_tools.hydra_editor_utils as hydra +from editor_python_test_tools.editor_test_helper import EditorTestHelper from largeworlds.large_worlds_utils import editor_dynveg_test_helper as dynveg diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/RotationModifier_InstancesRotateWithinRange.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/RotationModifier_InstancesRotateWithinRange.py index b867b3a02c..087bf284e0 100755 --- a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/RotationModifier_InstancesRotateWithinRange.py +++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/RotationModifier_InstancesRotateWithinRange.py @@ -19,8 +19,8 @@ import azlmbr.bus as bus import azlmbr.areasystem as areasystem sys.path.append(os.path.join(azlmbr.paths.devroot, 'AutomatedTesting', 'Gem', 'PythonTests')) -import automatedtesting_shared.hydra_editor_utils as hydra -from automatedtesting_shared.editor_test_helper import EditorTestHelper +import editor_python_test_tools.hydra_editor_utils as hydra +from editor_python_test_tools.editor_test_helper import EditorTestHelper from largeworlds.large_worlds_utils import editor_dynveg_test_helper as dynveg diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/ScaleModifierOverrides_InstancesProperlyScale.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/ScaleModifierOverrides_InstancesProperlyScale.py index 296ffe793b..2c9d33eae4 100755 --- a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/ScaleModifierOverrides_InstancesProperlyScale.py +++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/ScaleModifierOverrides_InstancesProperlyScale.py @@ -19,8 +19,8 @@ import azlmbr.legacy.general as general import azlmbr.math as math sys.path.append(os.path.join(azlmbr.paths.devroot, 'AutomatedTesting', 'Gem', 'PythonTests')) -import automatedtesting_shared.hydra_editor_utils as hydra -from automatedtesting_shared.editor_test_helper import EditorTestHelper +import editor_python_test_tools.hydra_editor_utils as hydra +from editor_python_test_tools.editor_test_helper import EditorTestHelper from largeworlds.large_worlds_utils import editor_dynveg_test_helper as dynveg # Constants diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/ScaleModifier_InstancesProperlyScale.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/ScaleModifier_InstancesProperlyScale.py index 333bc92352..f81758b2dd 100755 --- a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/ScaleModifier_InstancesProperlyScale.py +++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/ScaleModifier_InstancesProperlyScale.py @@ -19,8 +19,8 @@ import azlmbr.legacy.general as general import azlmbr.math as math sys.path.append(os.path.join(azlmbr.paths.devroot, 'AutomatedTesting', 'Gem', 'PythonTests')) -import automatedtesting_shared.hydra_editor_utils as hydra -from automatedtesting_shared.editor_test_helper import EditorTestHelper +import editor_python_test_tools.hydra_editor_utils as hydra +from editor_python_test_tools.editor_test_helper import EditorTestHelper from largeworlds.large_worlds_utils import editor_dynveg_test_helper as dynveg diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/ShapeIntersectionFilter_InstancesPlantInAssignedShape.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/ShapeIntersectionFilter_InstancesPlantInAssignedShape.py index 4d904e9623..de1f50e481 100755 --- a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/ShapeIntersectionFilter_InstancesPlantInAssignedShape.py +++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/ShapeIntersectionFilter_InstancesPlantInAssignedShape.py @@ -24,8 +24,8 @@ import azlmbr.math as math import azlmbr.paths sys.path.append(os.path.join(azlmbr.paths.devroot, 'AutomatedTesting', 'Gem', 'PythonTests')) -import automatedtesting_shared.hydra_editor_utils as hydra -from automatedtesting_shared.editor_test_helper import EditorTestHelper +import editor_python_test_tools.hydra_editor_utils as hydra +from editor_python_test_tools.editor_test_helper import EditorTestHelper from largeworlds.large_worlds_utils import editor_dynveg_test_helper as dynveg diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/SlopeAlignmentModifierOverrides_InstanceSurfaceAlignment.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/SlopeAlignmentModifierOverrides_InstanceSurfaceAlignment.py index cb96575a5d..ee5d79d6d2 100755 --- a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/SlopeAlignmentModifierOverrides_InstanceSurfaceAlignment.py +++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/SlopeAlignmentModifierOverrides_InstanceSurfaceAlignment.py @@ -22,8 +22,8 @@ import azlmbr.math as math import azlmbr.paths sys.path.append(os.path.join(azlmbr.paths.devroot, 'AutomatedTesting', 'Gem', 'PythonTests')) -import automatedtesting_shared.hydra_editor_utils as hydra -from automatedtesting_shared.editor_test_helper import EditorTestHelper +import editor_python_test_tools.hydra_editor_utils as hydra +from editor_python_test_tools.editor_test_helper import EditorTestHelper from largeworlds.large_worlds_utils import editor_dynveg_test_helper as dynveg diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/SlopeAlignmentModifier_InstanceSurfaceAlignment.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/SlopeAlignmentModifier_InstanceSurfaceAlignment.py index b358328886..400abf0212 100755 --- a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/SlopeAlignmentModifier_InstanceSurfaceAlignment.py +++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/SlopeAlignmentModifier_InstanceSurfaceAlignment.py @@ -23,8 +23,8 @@ import azlmbr.math as math import azlmbr.paths sys.path.append(os.path.join(azlmbr.paths.devroot, 'AutomatedTesting', 'Gem', 'PythonTests')) -import automatedtesting_shared.hydra_editor_utils as hydra -from automatedtesting_shared.editor_test_helper import EditorTestHelper +import editor_python_test_tools.hydra_editor_utils as hydra +from editor_python_test_tools.editor_test_helper import EditorTestHelper from largeworlds.large_worlds_utils import editor_dynveg_test_helper as dynveg diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/SlopeFilter_ComponentAndOverrides_InstancesPlantOnValidSlope.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/SlopeFilter_ComponentAndOverrides_InstancesPlantOnValidSlope.py index 6f3b1d5629..2271ee51ce 100755 --- a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/SlopeFilter_ComponentAndOverrides_InstancesPlantOnValidSlope.py +++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/SlopeFilter_ComponentAndOverrides_InstancesPlantOnValidSlope.py @@ -24,8 +24,8 @@ import azlmbr.math as math import azlmbr.paths sys.path.append(os.path.join(azlmbr.paths.devroot, "AutomatedTesting", "Gem", "PythonTests")) -import automatedtesting_shared.hydra_editor_utils as hydra -from automatedtesting_shared.editor_test_helper import EditorTestHelper +import editor_python_test_tools.hydra_editor_utils as hydra +from editor_python_test_tools.editor_test_helper import EditorTestHelper from largeworlds.large_worlds_utils import editor_dynveg_test_helper as dynveg diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/SlopeFilter_FilterStageToggle.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/SlopeFilter_FilterStageToggle.py index 91617c0567..d2ba85e41d 100755 --- a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/SlopeFilter_FilterStageToggle.py +++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/SlopeFilter_FilterStageToggle.py @@ -20,8 +20,8 @@ import azlmbr.components as components import azlmbr.legacy.general as general sys.path.append(os.path.join(azlmbr.paths.devroot, "AutomatedTesting", "Gem", "PythonTests")) -import automatedtesting_shared.hydra_editor_utils as hydra -from automatedtesting_shared.editor_test_helper import EditorTestHelper +import editor_python_test_tools.hydra_editor_utils as hydra +from editor_python_test_tools.editor_test_helper import EditorTestHelper from largeworlds.large_worlds_utils import editor_dynveg_test_helper as dynveg class TestSlopeFilterFilterStageToggle(EditorTestHelper): diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/SurfaceDataRefreshes_RemainsStable.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/SurfaceDataRefreshes_RemainsStable.py index 5b6a421e49..04e748661b 100755 --- a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/SurfaceDataRefreshes_RemainsStable.py +++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/SurfaceDataRefreshes_RemainsStable.py @@ -18,7 +18,7 @@ import azlmbr.math as math sys.path.append(os.path.join(azlmbr.paths.devroot, 'AutomatedTesting', 'Gem', 'PythonTests')) -from automatedtesting_shared.editor_test_helper import EditorTestHelper +from editor_python_test_tools.editor_test_helper import EditorTestHelper from largeworlds.large_worlds_utils import editor_dynveg_test_helper as dynveg diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/SurfaceMaskFilterOverrides_MultipleDescriptorOverridesPlantAsExpected.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/SurfaceMaskFilterOverrides_MultipleDescriptorOverridesPlantAsExpected.py index b164d34973..c1bf53b03a 100755 --- a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/SurfaceMaskFilterOverrides_MultipleDescriptorOverridesPlantAsExpected.py +++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/SurfaceMaskFilterOverrides_MultipleDescriptorOverridesPlantAsExpected.py @@ -22,8 +22,8 @@ import azlmbr.paths import azlmbr.surface_data as surface_data sys.path.append(os.path.join(azlmbr.paths.devroot, "AutomatedTesting", "Gem", "PythonTests")) -import automatedtesting_shared.hydra_editor_utils as hydra -from automatedtesting_shared.editor_test_helper import EditorTestHelper +import editor_python_test_tools.hydra_editor_utils as hydra +from editor_python_test_tools.editor_test_helper import EditorTestHelper from largeworlds.large_worlds_utils import editor_dynveg_test_helper as dynveg diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/SurfaceMaskFilter_BasicSurfaceTagCreation.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/SurfaceMaskFilter_BasicSurfaceTagCreation.py index 101b84f4bb..4f58a23a19 100755 --- a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/SurfaceMaskFilter_BasicSurfaceTagCreation.py +++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/SurfaceMaskFilter_BasicSurfaceTagCreation.py @@ -15,7 +15,7 @@ import sys import azlmbr.surface_data as surface_data sys.path.append(os.path.join(azlmbr.paths.devroot, 'AutomatedTesting', 'Gem', 'PythonTests')) -from automatedtesting_shared.editor_test_helper import EditorTestHelper +from editor_python_test_tools.editor_test_helper import EditorTestHelper class TestSurfaceMaskFilter_BasicSurfaceTagCreation(EditorTestHelper): diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/SurfaceMaskFilter_ExclusionList.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/SurfaceMaskFilter_ExclusionList.py index bc5b441513..2beb8f17c2 100755 --- a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/SurfaceMaskFilter_ExclusionList.py +++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/SurfaceMaskFilter_ExclusionList.py @@ -25,8 +25,8 @@ import azlmbr.surface_data as surface_data sys.path.append(os.path.join(azlmbr.paths.devroot, 'AutomatedTesting', 'Gem', 'PythonTests')) -import automatedtesting_shared.hydra_editor_utils as hydra -from automatedtesting_shared.editor_test_helper import EditorTestHelper +import editor_python_test_tools.hydra_editor_utils as hydra +from editor_python_test_tools.editor_test_helper import EditorTestHelper from largeworlds.large_worlds_utils import editor_dynveg_test_helper as dynveg diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/SurfaceMaskFilter_InclusionList.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/SurfaceMaskFilter_InclusionList.py index e9682edbc8..f721bc4283 100755 --- a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/SurfaceMaskFilter_InclusionList.py +++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/SurfaceMaskFilter_InclusionList.py @@ -25,8 +25,8 @@ import azlmbr.surface_data as surface_data sys.path.append(os.path.join(azlmbr.paths.devroot, 'AutomatedTesting', 'Gem', 'PythonTests')) -import automatedtesting_shared.hydra_editor_utils as hydra -from automatedtesting_shared.editor_test_helper import EditorTestHelper +import editor_python_test_tools.hydra_editor_utils as hydra +from editor_python_test_tools.editor_test_helper import EditorTestHelper from largeworlds.large_worlds_utils import editor_dynveg_test_helper as dynveg diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/SystemSettings_SectorPointDensity.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/SystemSettings_SectorPointDensity.py index af477d19ff..19750994ec 100755 --- a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/SystemSettings_SectorPointDensity.py +++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/SystemSettings_SectorPointDensity.py @@ -18,8 +18,8 @@ import azlmbr.bus as bus import azlmbr.legacy.general as general sys.path.append(os.path.join(azlmbr.paths.devroot, "AutomatedTesting", "Gem", "PythonTests")) -import automatedtesting_shared.hydra_editor_utils as hydra -from automatedtesting_shared.editor_test_helper import EditorTestHelper +import editor_python_test_tools.hydra_editor_utils as hydra +from editor_python_test_tools.editor_test_helper import EditorTestHelper from largeworlds.large_worlds_utils import editor_dynveg_test_helper as dynveg diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/SystemSettings_SectorSize.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/SystemSettings_SectorSize.py index 8c001b90ea..c4cec19a8f 100755 --- a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/SystemSettings_SectorSize.py +++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/SystemSettings_SectorSize.py @@ -18,8 +18,8 @@ import azlmbr.bus as bus import azlmbr.legacy.general as general sys.path.append(os.path.join(azlmbr.paths.devroot, "AutomatedTesting", "Gem", "PythonTests")) -import automatedtesting_shared.hydra_editor_utils as hydra -from automatedtesting_shared.editor_test_helper import EditorTestHelper +import editor_python_test_tools.hydra_editor_utils as hydra +from editor_python_test_tools.editor_test_helper import EditorTestHelper from largeworlds.large_worlds_utils import editor_dynveg_test_helper as dynveg diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/VegetationInstances_DespawnWhenOutOfRange.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/VegetationInstances_DespawnWhenOutOfRange.py index 076dbd950b..c25761d655 100755 --- a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/VegetationInstances_DespawnWhenOutOfRange.py +++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/VegetationInstances_DespawnWhenOutOfRange.py @@ -24,7 +24,7 @@ import azlmbr.legacy.general as general import azlmbr.math as math sys.path.append(os.path.join(azlmbr.paths.devroot, 'AutomatedTesting', 'Gem', 'PythonTests')) -from automatedtesting_shared.editor_test_helper import EditorTestHelper +from editor_python_test_tools.editor_test_helper import EditorTestHelper from largeworlds.large_worlds_utils import editor_dynveg_test_helper as dynveg diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_AltitudeFilter.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_AltitudeFilter.py index 6378b36447..65b5198213 100755 --- a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_AltitudeFilter.py +++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_AltitudeFilter.py @@ -15,7 +15,7 @@ import logging # Bail on the test if ly_test_tools doesn't exist. pytest.importorskip('ly_test_tools') import ly_test_tools.environment.file_system as file_system -import automatedtesting_shared.hydra_test_utils as hydra +import editor_python_test_tools.hydra_test_utils as hydra logger = logging.getLogger(__name__) test_directory = os.path.join(os.path.dirname(__file__), 'EditorScripts') diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_AreaComponentSlices.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_AreaComponentSlices.py index 014655f966..1353efbf2e 100755 --- a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_AreaComponentSlices.py +++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_AreaComponentSlices.py @@ -16,7 +16,7 @@ import logging # Bail on the test if ly_test_tools doesn't exist. pytest.importorskip("ly_test_tools") import ly_test_tools.environment.file_system as file_system -import automatedtesting_shared.hydra_test_utils as hydra +import editor_python_test_tools.hydra_test_utils as hydra logger = logging.getLogger(__name__) test_directory = os.path.join(os.path.dirname(__file__), "EditorScripts") diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_AssetListCombiner.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_AssetListCombiner.py index c36f36d58c..ad0917ca22 100755 --- a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_AssetListCombiner.py +++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_AssetListCombiner.py @@ -16,7 +16,7 @@ import logging # Bail on the test if ly_test_tools doesn't exist. pytest.importorskip("ly_test_tools") import ly_test_tools.environment.file_system as file_system -import automatedtesting_shared.hydra_test_utils as hydra +import editor_python_test_tools.hydra_test_utils as hydra logger = logging.getLogger(__name__) test_directory = os.path.join(os.path.dirname(__file__), "EditorScripts") diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_AssetWeightSelector.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_AssetWeightSelector.py index cd383581cc..65472df3bc 100755 --- a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_AssetWeightSelector.py +++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_AssetWeightSelector.py @@ -20,7 +20,7 @@ import logging # Bail on the test if ly_test_tools doesn't exist. pytest.importorskip('ly_test_tools') import ly_test_tools.environment.file_system as file_system -import automatedtesting_shared.hydra_test_utils as hydra +import editor_python_test_tools.hydra_test_utils as hydra logger = logging.getLogger(__name__) test_directory = os.path.join(os.path.dirname(__file__), 'EditorScripts') diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_Debugger.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_Debugger.py index 84709b59a4..45518b71fc 100755 --- a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_Debugger.py +++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_Debugger.py @@ -16,7 +16,7 @@ import logging # Bail on the test if ly_test_tools doesn't exist. pytest.importorskip("ly_test_tools") import ly_test_tools.environment.file_system as file_system -import automatedtesting_shared.hydra_test_utils as hydra +import editor_python_test_tools.hydra_test_utils as hydra logger = logging.getLogger(__name__) test_directory = os.path.join(os.path.dirname(__file__), "EditorScripts") diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_DistanceBetweenFilter.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_DistanceBetweenFilter.py index 980d754d2b..3171cc032f 100755 --- a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_DistanceBetweenFilter.py +++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_DistanceBetweenFilter.py @@ -16,7 +16,7 @@ import logging # Bail on the test if ly_test_tools doesn't exist. pytest.importorskip('ly_test_tools') import ly_test_tools.environment.file_system as file_system -import automatedtesting_shared.hydra_test_utils as hydra +import editor_python_test_tools.hydra_test_utils as hydra logger = logging.getLogger(__name__) test_directory = os.path.join(os.path.dirname(__file__), 'EditorScripts') diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_DynVeg_Regressions.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_DynVeg_Regressions.py index 4a8831542f..b3cf344b2b 100755 --- a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_DynVeg_Regressions.py +++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_DynVeg_Regressions.py @@ -15,7 +15,7 @@ import pytest # Bail on the test if ly_test_tools doesn't exist. pytest.importorskip('ly_test_tools') -import automatedtesting_shared.hydra_test_utils as hydra +import editor_python_test_tools.hydra_test_utils as hydra import ly_test_tools.environment.file_system as file_system test_directory = os.path.join(os.path.dirname(__file__), 'EditorScripts') diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_DynamicSliceInstanceSpawner.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_DynamicSliceInstanceSpawner.py index 1183c0769c..c5b8046f73 100755 --- a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_DynamicSliceInstanceSpawner.py +++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_DynamicSliceInstanceSpawner.py @@ -16,7 +16,7 @@ import logging # Bail on the test if ly_test_tools doesn't exist. pytest.importorskip('ly_test_tools') import ly_test_tools.environment.file_system as file_system -import automatedtesting_shared.hydra_test_utils as hydra +import editor_python_test_tools.hydra_test_utils as hydra from ly_remote_console.remote_console_commands import RemoteConsole as RemoteConsole logger = logging.getLogger(__name__) diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_EmptyInstanceSpawner.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_EmptyInstanceSpawner.py index 32e00cdeb9..a7f221b780 100755 --- a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_EmptyInstanceSpawner.py +++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_EmptyInstanceSpawner.py @@ -12,10 +12,11 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. import os import pytest import logging + # Bail on the test if ly_test_tools doesn't exist. pytest.importorskip('ly_test_tools') import ly_test_tools.environment.file_system as file_system -import automatedtesting_shared.hydra_test_utils as hydra +import editor_python_test_tools.hydra_test_utils as hydra logger = logging.getLogger(__name__) test_directory = os.path.join(os.path.dirname(__file__), 'EditorScripts') diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_InstanceSpawnerPriority.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_InstanceSpawnerPriority.py index 7ef4185faf..d04b827985 100755 --- a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_InstanceSpawnerPriority.py +++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_InstanceSpawnerPriority.py @@ -21,7 +21,7 @@ import logging # Bail on the test if ly_test_tools doesn't exist. pytest.importorskip('ly_test_tools') import ly_test_tools.environment.file_system as file_system -import automatedtesting_shared.hydra_test_utils as hydra +import editor_python_test_tools.hydra_test_utils as hydra logger = logging.getLogger(__name__) test_directory = os.path.join(os.path.dirname(__file__), 'EditorScripts') diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_LayerBlender.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_LayerBlender.py index 5fa7f04179..2286238364 100755 --- a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_LayerBlender.py +++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_LayerBlender.py @@ -22,14 +22,14 @@ pytest.importorskip("ly_test_tools") import time as time +import editor_python_test_tools.hydra_test_utils as hydra import ly_test_tools.launchers.launcher_helper as launcher_helper -import ly_remote_console.remote_console_commands as remote_console_commands -from ly_remote_console.remote_console_commands import send_command_and_expect_response as send_command_and_expect_response import ly_test_tools.environment.waiter as waiter import ly_test_tools.environment.file_system as file_system -import automatedtesting_shared.hydra_test_utils as hydra -import automatedtesting_shared.screenshot_utils as screenshot_utils +import ly_remote_console.remote_console_commands as remote_console_commands +from ly_remote_console.remote_console_commands import send_command_and_expect_response as send_command_and_expect_response +import automatedtesting_shared.screenshot_utils as screenshot_utils from automatedtesting_shared.network_utils import check_for_listening_port diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_LayerBlocker.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_LayerBlocker.py index 94fe4d2e48..6da0cdd6db 100755 --- a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_LayerBlocker.py +++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_LayerBlocker.py @@ -16,7 +16,7 @@ import logging # Bail on the test if ly_test_tools doesn't exist. pytest.importorskip('ly_test_tools') import ly_test_tools.environment.file_system as file_system -import automatedtesting_shared.hydra_test_utils as hydra +import editor_python_test_tools.hydra_test_utils as hydra logger = logging.getLogger(__name__) test_directory = os.path.join(os.path.dirname(__file__), 'EditorScripts') diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_LayerSpawner.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_LayerSpawner.py index ad08d7c214..e74ecc8bd1 100755 --- a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_LayerSpawner.py +++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_LayerSpawner.py @@ -16,7 +16,7 @@ import logging # Bail on the test if ly_test_tools doesn't exist. pytest.importorskip("ly_test_tools") import ly_test_tools.environment.file_system as file_system -import automatedtesting_shared.hydra_test_utils as hydra +import editor_python_test_tools.hydra_test_utils as hydra logger = logging.getLogger(__name__) test_directory = os.path.join(os.path.dirname(__file__), "EditorScripts") diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_MeshBlocker.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_MeshBlocker.py index 4437865a00..5e8ffe4d50 100755 --- a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_MeshBlocker.py +++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_MeshBlocker.py @@ -16,7 +16,7 @@ import pytest # Bail on the test if ly_test_tools doesn't exist. pytest.importorskip('ly_test_tools') -import automatedtesting_shared.hydra_test_utils as hydra +import editor_python_test_tools.hydra_test_utils as hydra import ly_test_tools.environment.file_system as file_system test_directory = os.path.join(os.path.dirname(__file__), 'EditorScripts') diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_MeshSurfaceTagEmitter.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_MeshSurfaceTagEmitter.py index 3a7a859b35..77638cb576 100755 --- a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_MeshSurfaceTagEmitter.py +++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_MeshSurfaceTagEmitter.py @@ -16,7 +16,7 @@ import logging # Bail on the test if ly_test_tools doesn't exist. pytest.importorskip("ly_test_tools") import ly_test_tools.environment.file_system as file_system -import automatedtesting_shared.hydra_test_utils as hydra +import editor_python_test_tools.hydra_test_utils as hydra logger = logging.getLogger(__name__) test_directory = os.path.join(os.path.dirname(__file__), "EditorScripts") diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_PhysXColliderSurfaceTagEmitter.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_PhysXColliderSurfaceTagEmitter.py index d46c15024a..ca4e30a719 100755 --- a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_PhysXColliderSurfaceTagEmitter.py +++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_PhysXColliderSurfaceTagEmitter.py @@ -16,7 +16,7 @@ import logging # Bail on the test if ly_test_tools doesn't exist. pytest.importorskip("ly_test_tools") import ly_test_tools.environment.file_system as file_system -import automatedtesting_shared.hydra_test_utils as hydra +import editor_python_test_tools.hydra_test_utils as hydra logger = logging.getLogger(__name__) test_directory = os.path.join(os.path.dirname(__file__), "EditorScripts") diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_PositionModifier.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_PositionModifier.py index e25820ed7e..47ff17bfa6 100755 --- a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_PositionModifier.py +++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_PositionModifier.py @@ -12,10 +12,11 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. import os import pytest import logging + # Bail on the test if ly_test_tools doesn't exist. pytest.importorskip('ly_test_tools') import ly_test_tools.environment.file_system as file_system -import automatedtesting_shared.hydra_test_utils as hydra +import editor_python_test_tools.hydra_test_utils as hydra logger = logging.getLogger(__name__) test_directory = os.path.join(os.path.dirname(__file__), 'EditorScripts') diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_RotationModifier.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_RotationModifier.py index 1812c3c1b0..518949c0c0 100755 --- a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_RotationModifier.py +++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_RotationModifier.py @@ -16,7 +16,7 @@ import pytest # Bail on the test if ly_test_tools doesn't exist. pytest.importorskip("ly_test_tools") -import automatedtesting_shared.hydra_test_utils as hydra +import editor_python_test_tools.hydra_test_utils as hydra import ly_test_tools.environment.file_system as file_system logger = logging.getLogger(__name__) diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_ScaleModifier.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_ScaleModifier.py index d6d9f5e991..6acd95e4f6 100755 --- a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_ScaleModifier.py +++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_ScaleModifier.py @@ -19,7 +19,7 @@ import pytest # Bail on the test if ly_test_tools doesn't exist. pytest.importorskip("ly_test_tools") -import automatedtesting_shared.hydra_test_utils as hydra +import editor_python_test_tools.hydra_test_utils as hydra import ly_test_tools.environment.file_system as file_system test_directory = os.path.join(os.path.dirname(__file__), "EditorScripts") diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_ShapeIntersectionFilter.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_ShapeIntersectionFilter.py index 6b58ab23c5..ea90b67a7f 100755 --- a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_ShapeIntersectionFilter.py +++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_ShapeIntersectionFilter.py @@ -12,10 +12,11 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. import os import pytest import logging + # Bail on the test if ly_test_tools doesn't exist. pytest.importorskip('ly_test_tools') import ly_test_tools.environment.file_system as file_system -import automatedtesting_shared.hydra_test_utils as hydra +import editor_python_test_tools.hydra_test_utils as hydra logger = logging.getLogger(__name__) test_directory = os.path.join(os.path.dirname(__file__), 'EditorScripts') diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_SlopeAlignmentModifier.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_SlopeAlignmentModifier.py index 3134bafed9..563ac1dcc5 100755 --- a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_SlopeAlignmentModifier.py +++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_SlopeAlignmentModifier.py @@ -16,9 +16,10 @@ C4814459 - Surface Alignment overrides function as expected import os import pytest + # Bail on the test if ly_test_tools doesn't exist. pytest.importorskip("ly_test_tools") -import automatedtesting_shared.hydra_test_utils as hydra +import editor_python_test_tools.hydra_test_utils as hydra import ly_test_tools.environment.file_system as file_system test_directory = os.path.join(os.path.dirname(__file__), "EditorScripts") diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_SlopeFilter.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_SlopeFilter.py index 991e82caf3..dc0f0e6514 100755 --- a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_SlopeFilter.py +++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_SlopeFilter.py @@ -16,7 +16,7 @@ import logging # Bail on the test if ly_test_tools doesn't exist. pytest.importorskip("ly_test_tools") import ly_test_tools.environment.file_system as file_system -import automatedtesting_shared.hydra_test_utils as hydra +import editor_python_test_tools.hydra_test_utils as hydra logger = logging.getLogger(__name__) test_directory = os.path.join(os.path.dirname(__file__), "EditorScripts") diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_SurfaceMaskFilter.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_SurfaceMaskFilter.py index dfc0878a41..20cab85293 100755 --- a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_SurfaceMaskFilter.py +++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_SurfaceMaskFilter.py @@ -15,7 +15,7 @@ import pytest # Bail on the test if ly_test_tools doesn't exist. pytest.importorskip("ly_test_tools") -import automatedtesting_shared.hydra_test_utils as hydra +import editor_python_test_tools.hydra_test_utils as hydra import ly_test_tools.environment.file_system as file_system test_directory = os.path.join(os.path.dirname(__file__), "EditorScripts") diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_SystemSettings.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_SystemSettings.py index 8b6e95ea14..adf9a90587 100755 --- a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_SystemSettings.py +++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_SystemSettings.py @@ -16,7 +16,7 @@ import logging # Bail on the test if ly_test_tools doesn't exist. pytest.importorskip("ly_test_tools") import ly_test_tools.environment.file_system as file_system -import automatedtesting_shared.hydra_test_utils as hydra +import editor_python_test_tools.hydra_test_utils as hydra logger = logging.getLogger(__name__) test_directory = os.path.join(os.path.dirname(__file__), "EditorScripts") diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/gradient_signal/EditorScripts/GradientGenerators_Incompatibilities.py b/AutomatedTesting/Gem/PythonTests/largeworlds/gradient_signal/EditorScripts/GradientGenerators_Incompatibilities.py index c6f7a3c438..cc9a15bba0 100755 --- a/AutomatedTesting/Gem/PythonTests/largeworlds/gradient_signal/EditorScripts/GradientGenerators_Incompatibilities.py +++ b/AutomatedTesting/Gem/PythonTests/largeworlds/gradient_signal/EditorScripts/GradientGenerators_Incompatibilities.py @@ -17,8 +17,8 @@ import azlmbr.entity as entity import azlmbr.paths sys.path.append(os.path.join(azlmbr.paths.devroot, 'AutomatedTesting', 'Gem', 'PythonTests')) -import automatedtesting_shared.hydra_editor_utils as hydra -from automatedtesting_shared.editor_test_helper import EditorTestHelper +import editor_python_test_tools.hydra_editor_utils as hydra +from editor_python_test_tools.editor_test_helper import EditorTestHelper class TestGradientGeneratorIncompatibilities(EditorTestHelper): diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/gradient_signal/EditorScripts/GradientModifiers_Incompatibilities.py b/AutomatedTesting/Gem/PythonTests/largeworlds/gradient_signal/EditorScripts/GradientModifiers_Incompatibilities.py index 7fb94dab50..b7d12d074a 100755 --- a/AutomatedTesting/Gem/PythonTests/largeworlds/gradient_signal/EditorScripts/GradientModifiers_Incompatibilities.py +++ b/AutomatedTesting/Gem/PythonTests/largeworlds/gradient_signal/EditorScripts/GradientModifiers_Incompatibilities.py @@ -17,8 +17,8 @@ import azlmbr.entity as entity import azlmbr.paths sys.path.append(os.path.join(azlmbr.paths.devroot, 'AutomatedTesting', 'Gem', 'PythonTests')) -import automatedtesting_shared.hydra_editor_utils as hydra -from automatedtesting_shared.editor_test_helper import EditorTestHelper +import editor_python_test_tools.hydra_editor_utils as hydra +from editor_python_test_tools.editor_test_helper import EditorTestHelper class TestGradientModifiersIncompatibilities(EditorTestHelper): diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/gradient_signal/EditorScripts/GradientPreviewSettings_ClearingPinnedEntitySetsPreviewToOrigin.py b/AutomatedTesting/Gem/PythonTests/largeworlds/gradient_signal/EditorScripts/GradientPreviewSettings_ClearingPinnedEntitySetsPreviewToOrigin.py index 868d9d08e3..c37ee36265 100755 --- a/AutomatedTesting/Gem/PythonTests/largeworlds/gradient_signal/EditorScripts/GradientPreviewSettings_ClearingPinnedEntitySetsPreviewToOrigin.py +++ b/AutomatedTesting/Gem/PythonTests/largeworlds/gradient_signal/EditorScripts/GradientPreviewSettings_ClearingPinnedEntitySetsPreviewToOrigin.py @@ -33,8 +33,8 @@ import azlmbr.paths import azlmbr.entity as EntityId sys.path.append(os.path.join(azlmbr.paths.devroot, 'AutomatedTesting', 'Gem', 'PythonTests')) -import automatedtesting_shared.hydra_editor_utils as hydra -from automatedtesting_shared.editor_test_helper import EditorTestHelper +import editor_python_test_tools.hydra_editor_utils as hydra +from editor_python_test_tools.editor_test_helper import EditorTestHelper class TestGradientPreviewSettings(EditorTestHelper): diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/gradient_signal/EditorScripts/GradientPreviewSettings_DefaultPinnedEntityIsSelf.py b/AutomatedTesting/Gem/PythonTests/largeworlds/gradient_signal/EditorScripts/GradientPreviewSettings_DefaultPinnedEntityIsSelf.py index 30d224f8c4..5a758b9d89 100755 --- a/AutomatedTesting/Gem/PythonTests/largeworlds/gradient_signal/EditorScripts/GradientPreviewSettings_DefaultPinnedEntityIsSelf.py +++ b/AutomatedTesting/Gem/PythonTests/largeworlds/gradient_signal/EditorScripts/GradientPreviewSettings_DefaultPinnedEntityIsSelf.py @@ -18,8 +18,8 @@ import azlmbr.entity as entity import azlmbr.paths sys.path.append(os.path.join(azlmbr.paths.devroot, 'AutomatedTesting', 'Gem', 'PythonTests')) -import automatedtesting_shared.hydra_editor_utils as hydra -from automatedtesting_shared.editor_test_helper import EditorTestHelper +import editor_python_test_tools.hydra_editor_utils as hydra +from editor_python_test_tools.editor_test_helper import EditorTestHelper class Scoped: diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/gradient_signal/EditorScripts/GradientSampling_GradientReferencesAddRemoveSuccessfully.py b/AutomatedTesting/Gem/PythonTests/largeworlds/gradient_signal/EditorScripts/GradientSampling_GradientReferencesAddRemoveSuccessfully.py index d94c197fea..5d4e575e4e 100755 --- a/AutomatedTesting/Gem/PythonTests/largeworlds/gradient_signal/EditorScripts/GradientSampling_GradientReferencesAddRemoveSuccessfully.py +++ b/AutomatedTesting/Gem/PythonTests/largeworlds/gradient_signal/EditorScripts/GradientSampling_GradientReferencesAddRemoveSuccessfully.py @@ -18,8 +18,8 @@ import azlmbr.paths import azlmbr.entity as EntityId sys.path.append(os.path.join(azlmbr.paths.devroot, 'AutomatedTesting', 'Gem', 'PythonTests')) -import automatedtesting_shared.hydra_editor_utils as hydra -from automatedtesting_shared.editor_test_helper import EditorTestHelper +import editor_python_test_tools.hydra_editor_utils as hydra +from editor_python_test_tools.editor_test_helper import EditorTestHelper class TestGradientSampling(EditorTestHelper): diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/gradient_signal/EditorScripts/GradientSurfaceTagEmitter_ComponentDependencies.py b/AutomatedTesting/Gem/PythonTests/largeworlds/gradient_signal/EditorScripts/GradientSurfaceTagEmitter_ComponentDependencies.py index 7cdd029f3d..a16e37e0fc 100755 --- a/AutomatedTesting/Gem/PythonTests/largeworlds/gradient_signal/EditorScripts/GradientSurfaceTagEmitter_ComponentDependencies.py +++ b/AutomatedTesting/Gem/PythonTests/largeworlds/gradient_signal/EditorScripts/GradientSurfaceTagEmitter_ComponentDependencies.py @@ -16,9 +16,10 @@ import azlmbr.bus as bus import azlmbr.entity as entity import azlmbr.paths import azlmbr.editor as editor + sys.path.append(os.path.join(azlmbr.paths.devroot, "AutomatedTesting", "Gem", "PythonTests")) -import automatedtesting_shared.hydra_editor_utils as hydra -from automatedtesting_shared.editor_test_helper import EditorTestHelper +import editor_python_test_tools.hydra_editor_utils as hydra +from editor_python_test_tools.editor_test_helper import EditorTestHelper class TestGradientSurfaceTagEmitterDependencies(EditorTestHelper): diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/gradient_signal/EditorScripts/GradientSurfaceTagEmitter_SurfaceTagsAddRemoveSuccessfully.py b/AutomatedTesting/Gem/PythonTests/largeworlds/gradient_signal/EditorScripts/GradientSurfaceTagEmitter_SurfaceTagsAddRemoveSuccessfully.py index a37ae97361..e150070281 100755 --- a/AutomatedTesting/Gem/PythonTests/largeworlds/gradient_signal/EditorScripts/GradientSurfaceTagEmitter_SurfaceTagsAddRemoveSuccessfully.py +++ b/AutomatedTesting/Gem/PythonTests/largeworlds/gradient_signal/EditorScripts/GradientSurfaceTagEmitter_SurfaceTagsAddRemoveSuccessfully.py @@ -18,8 +18,8 @@ import azlmbr.paths import azlmbr.surface_data as surface_data sys.path.append(os.path.join(azlmbr.paths.devroot, 'AutomatedTesting', 'Gem', 'PythonTests')) -import automatedtesting_shared.hydra_editor_utils as hydra -from automatedtesting_shared.editor_test_helper import EditorTestHelper +import editor_python_test_tools.hydra_editor_utils as hydra +from editor_python_test_tools.editor_test_helper import EditorTestHelper class TestGradientSurfaceTagEmitter(EditorTestHelper): diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/gradient_signal/EditorScripts/GradientTransform_ComponentIncompatibleWithExpectedGradients.py b/AutomatedTesting/Gem/PythonTests/largeworlds/gradient_signal/EditorScripts/GradientTransform_ComponentIncompatibleWithExpectedGradients.py index 31f0ee2693..41860ecaec 100755 --- a/AutomatedTesting/Gem/PythonTests/largeworlds/gradient_signal/EditorScripts/GradientTransform_ComponentIncompatibleWithExpectedGradients.py +++ b/AutomatedTesting/Gem/PythonTests/largeworlds/gradient_signal/EditorScripts/GradientTransform_ComponentIncompatibleWithExpectedGradients.py @@ -19,8 +19,8 @@ import azlmbr.math as math import azlmbr.entity as EntityId sys.path.append(os.path.join(azlmbr.paths.devroot, 'AutomatedTesting', 'Gem', 'PythonTests')) -import automatedtesting_shared.hydra_editor_utils as hydra -from automatedtesting_shared.editor_test_helper import EditorTestHelper +import editor_python_test_tools.hydra_editor_utils as hydra +from editor_python_test_tools.editor_test_helper import EditorTestHelper class TestGradientTransform_ComponentIncompatibleWithExpectedGradients(EditorTestHelper): diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/gradient_signal/EditorScripts/GradientTransform_ComponentIncompatibleWithSpawners.py b/AutomatedTesting/Gem/PythonTests/largeworlds/gradient_signal/EditorScripts/GradientTransform_ComponentIncompatibleWithSpawners.py index 0542e5e1b4..e2a7df6cf1 100755 --- a/AutomatedTesting/Gem/PythonTests/largeworlds/gradient_signal/EditorScripts/GradientTransform_ComponentIncompatibleWithSpawners.py +++ b/AutomatedTesting/Gem/PythonTests/largeworlds/gradient_signal/EditorScripts/GradientTransform_ComponentIncompatibleWithSpawners.py @@ -19,8 +19,8 @@ import azlmbr.math as math import azlmbr.entity as EntityId sys.path.append(os.path.join(azlmbr.paths.devroot, 'AutomatedTesting', 'Gem', 'PythonTests')) -import automatedtesting_shared.hydra_editor_utils as hydra -from automatedtesting_shared.editor_test_helper import EditorTestHelper +import editor_python_test_tools.hydra_editor_utils as hydra +from editor_python_test_tools.editor_test_helper import EditorTestHelper class TestGradientTransform_ComponentIncompatibleWithSpawners(EditorTestHelper): diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/gradient_signal/EditorScripts/GradientTransform_FrequencyZoomCanBeSetBeyondSliderRange.py b/AutomatedTesting/Gem/PythonTests/largeworlds/gradient_signal/EditorScripts/GradientTransform_FrequencyZoomCanBeSetBeyondSliderRange.py index 22518e61be..bd664a9424 100755 --- a/AutomatedTesting/Gem/PythonTests/largeworlds/gradient_signal/EditorScripts/GradientTransform_FrequencyZoomCanBeSetBeyondSliderRange.py +++ b/AutomatedTesting/Gem/PythonTests/largeworlds/gradient_signal/EditorScripts/GradientTransform_FrequencyZoomCanBeSetBeyondSliderRange.py @@ -24,8 +24,8 @@ import azlmbr.paths import azlmbr.entity as EntityId sys.path.append(os.path.join(azlmbr.paths.devroot, 'AutomatedTesting', 'Gem', 'PythonTests')) -import automatedtesting_shared.hydra_editor_utils as hydra -from automatedtesting_shared.editor_test_helper import EditorTestHelper +import editor_python_test_tools.hydra_editor_utils as hydra +from editor_python_test_tools.editor_test_helper import EditorTestHelper class TestGradientTransformFrequencyZoom(EditorTestHelper): diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/gradient_signal/EditorScripts/GradientTransform_RequiresShape.py b/AutomatedTesting/Gem/PythonTests/largeworlds/gradient_signal/EditorScripts/GradientTransform_RequiresShape.py index 3986076980..e1e901f2f7 100755 --- a/AutomatedTesting/Gem/PythonTests/largeworlds/gradient_signal/EditorScripts/GradientTransform_RequiresShape.py +++ b/AutomatedTesting/Gem/PythonTests/largeworlds/gradient_signal/EditorScripts/GradientTransform_RequiresShape.py @@ -17,8 +17,8 @@ import azlmbr.entity as entity import azlmbr.paths sys.path.append(os.path.join(azlmbr.paths.devroot, 'AutomatedTesting', 'Gem', 'PythonTests')) -import automatedtesting_shared.hydra_editor_utils as hydra -from automatedtesting_shared.editor_test_helper import EditorTestHelper +import editor_python_test_tools.hydra_editor_utils as hydra +from editor_python_test_tools.editor_test_helper import EditorTestHelper class TestGradientTransformRequiresShape(EditorTestHelper): diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/gradient_signal/EditorScripts/ImageGradient_ProcessedImageAssignedSuccessfully.py b/AutomatedTesting/Gem/PythonTests/largeworlds/gradient_signal/EditorScripts/ImageGradient_ProcessedImageAssignedSuccessfully.py index ccc8c3f101..b4ee512478 100755 --- a/AutomatedTesting/Gem/PythonTests/largeworlds/gradient_signal/EditorScripts/ImageGradient_ProcessedImageAssignedSuccessfully.py +++ b/AutomatedTesting/Gem/PythonTests/largeworlds/gradient_signal/EditorScripts/ImageGradient_ProcessedImageAssignedSuccessfully.py @@ -21,8 +21,8 @@ import azlmbr.math as math import azlmbr.paths sys.path.append(os.path.join(azlmbr.paths.devroot, 'AutomatedTesting', 'Gem', 'PythonTests')) -import automatedtesting_shared.hydra_editor_utils as hydra -from automatedtesting_shared.editor_test_helper import EditorTestHelper +import editor_python_test_tools.hydra_editor_utils as hydra +from editor_python_test_tools.editor_test_helper import EditorTestHelper class TestImageGradient(EditorTestHelper): diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/gradient_signal/EditorScripts/ImageGradient_RequiresShape.py b/AutomatedTesting/Gem/PythonTests/largeworlds/gradient_signal/EditorScripts/ImageGradient_RequiresShape.py index 152f256266..dab8e6928a 100755 --- a/AutomatedTesting/Gem/PythonTests/largeworlds/gradient_signal/EditorScripts/ImageGradient_RequiresShape.py +++ b/AutomatedTesting/Gem/PythonTests/largeworlds/gradient_signal/EditorScripts/ImageGradient_RequiresShape.py @@ -17,8 +17,8 @@ import azlmbr.entity as entity import azlmbr.paths sys.path.append(os.path.join(azlmbr.paths.devroot, 'AutomatedTesting', 'Gem', 'PythonTests')) -import automatedtesting_shared.hydra_editor_utils as hydra -from automatedtesting_shared.editor_test_helper import EditorTestHelper +import editor_python_test_tools.hydra_editor_utils as hydra +from editor_python_test_tools.editor_test_helper import EditorTestHelper class TestImageGradientRequiresShape(EditorTestHelper): diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/gradient_signal/test_GradientIncompatibilities.py b/AutomatedTesting/Gem/PythonTests/largeworlds/gradient_signal/test_GradientIncompatibilities.py index 108bc79afd..1f16dbae97 100755 --- a/AutomatedTesting/Gem/PythonTests/largeworlds/gradient_signal/test_GradientIncompatibilities.py +++ b/AutomatedTesting/Gem/PythonTests/largeworlds/gradient_signal/test_GradientIncompatibilities.py @@ -19,7 +19,7 @@ import pytest pytest.importorskip('ly_test_tools') import ly_test_tools.environment.file_system as file_system -import automatedtesting_shared.hydra_test_utils as hydra +import editor_python_test_tools.hydra_test_utils as hydra test_directory = os.path.join(os.path.dirname(__file__), 'EditorScripts') diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/gradient_signal/test_GradientPreviewSettings.py b/AutomatedTesting/Gem/PythonTests/largeworlds/gradient_signal/test_GradientPreviewSettings.py index fd886945af..6f755accb2 100755 --- a/AutomatedTesting/Gem/PythonTests/largeworlds/gradient_signal/test_GradientPreviewSettings.py +++ b/AutomatedTesting/Gem/PythonTests/largeworlds/gradient_signal/test_GradientPreviewSettings.py @@ -11,10 +11,11 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. import os import pytest + # Bail on the test if ly_test_tools doesn't exist. pytest.importorskip('ly_test_tools') import ly_test_tools.environment.file_system as file_system -import automatedtesting_shared.hydra_test_utils as hydra +import editor_python_test_tools.hydra_test_utils as hydra test_directory = os.path.join(os.path.dirname(__file__), 'EditorScripts') diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/gradient_signal/test_GradientSampling.py b/AutomatedTesting/Gem/PythonTests/largeworlds/gradient_signal/test_GradientSampling.py index ac3ffaff06..315ec11986 100755 --- a/AutomatedTesting/Gem/PythonTests/largeworlds/gradient_signal/test_GradientSampling.py +++ b/AutomatedTesting/Gem/PythonTests/largeworlds/gradient_signal/test_GradientSampling.py @@ -16,7 +16,7 @@ import logging # Bail on the test if ly_test_tools doesn't exist. pytest.importorskip("ly_test_tools") import ly_test_tools.environment.file_system as file_system -import automatedtesting_shared.hydra_test_utils as hydra +import editor_python_test_tools.hydra_test_utils as hydra logger = logging.getLogger(__name__) test_directory = os.path.join(os.path.dirname(__file__), "EditorScripts") diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/gradient_signal/test_GradientSurfaceTagEmitter.py b/AutomatedTesting/Gem/PythonTests/largeworlds/gradient_signal/test_GradientSurfaceTagEmitter.py index 91ae577b62..61e3832b24 100755 --- a/AutomatedTesting/Gem/PythonTests/largeworlds/gradient_signal/test_GradientSurfaceTagEmitter.py +++ b/AutomatedTesting/Gem/PythonTests/largeworlds/gradient_signal/test_GradientSurfaceTagEmitter.py @@ -16,7 +16,7 @@ import logging # Bail on the test if ly_test_tools doesn't exist. pytest.importorskip("ly_test_tools") import ly_test_tools.environment.file_system as file_system -import automatedtesting_shared.hydra_test_utils as hydra +import editor_python_test_tools.hydra_test_utils as hydra logger = logging.getLogger(__name__) test_directory = os.path.join(os.path.dirname(__file__), "EditorScripts") diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/gradient_signal/test_GradientTransform.py b/AutomatedTesting/Gem/PythonTests/largeworlds/gradient_signal/test_GradientTransform.py index ecc4e5a027..7fb690c041 100755 --- a/AutomatedTesting/Gem/PythonTests/largeworlds/gradient_signal/test_GradientTransform.py +++ b/AutomatedTesting/Gem/PythonTests/largeworlds/gradient_signal/test_GradientTransform.py @@ -17,10 +17,11 @@ the same Entity that provides the ShapeService (e.g. box shape, or reference sha import os import pytest + # Bail on the test if ly_test_tools doesn't exist. pytest.importorskip('ly_test_tools') import ly_test_tools.environment.file_system as file_system -import automatedtesting_shared.hydra_test_utils as hydra +import editor_python_test_tools.hydra_test_utils as hydra test_directory = os.path.join(os.path.dirname(__file__), 'EditorScripts') diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/gradient_signal/test_ImageGradient.py b/AutomatedTesting/Gem/PythonTests/largeworlds/gradient_signal/test_ImageGradient.py index 8fc582c2c8..d67616e48d 100755 --- a/AutomatedTesting/Gem/PythonTests/largeworlds/gradient_signal/test_ImageGradient.py +++ b/AutomatedTesting/Gem/PythonTests/largeworlds/gradient_signal/test_ImageGradient.py @@ -11,10 +11,11 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. import os import pytest + # Bail on the test if ly_test_tools doesn't exist. pytest.importorskip('ly_test_tools') import ly_test_tools.environment.file_system as file_system -import automatedtesting_shared.hydra_test_utils as hydra +import editor_python_test_tools.hydra_test_utils as hydra test_directory = os.path.join(os.path.dirname(__file__), 'EditorScripts') diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/AreaNodes_DependentComponentsAdded.py b/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/AreaNodes_DependentComponentsAdded.py index b8e61ab7f2..d1e0b68ef4 100755 --- a/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/AreaNodes_DependentComponentsAdded.py +++ b/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/AreaNodes_DependentComponentsAdded.py @@ -21,8 +21,8 @@ import azlmbr.math as math import azlmbr.paths sys.path.append(os.path.join(azlmbr.paths.devroot, 'AutomatedTesting', 'Gem', 'PythonTests')) -import automatedtesting_shared.hydra_editor_utils as hydra -from automatedtesting_shared.editor_test_helper import EditorTestHelper +import editor_python_test_tools.hydra_editor_utils as hydra +from editor_python_test_tools.editor_test_helper import EditorTestHelper editorId = azlmbr.globals.property.LANDSCAPE_CANVAS_EDITOR_ID newEntityId = None diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/AreaNodes_EntityCreatedOnNodeAdd.py b/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/AreaNodes_EntityCreatedOnNodeAdd.py index f15301d180..4e429a192b 100755 --- a/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/AreaNodes_EntityCreatedOnNodeAdd.py +++ b/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/AreaNodes_EntityCreatedOnNodeAdd.py @@ -21,8 +21,8 @@ import azlmbr.math as math import azlmbr.paths sys.path.append(os.path.join(azlmbr.paths.devroot, 'AutomatedTesting', 'Gem', 'PythonTests')) -import automatedtesting_shared.hydra_editor_utils as hydra -from automatedtesting_shared.editor_test_helper import EditorTestHelper +import editor_python_test_tools.hydra_editor_utils as hydra +from editor_python_test_tools.editor_test_helper import EditorTestHelper editorId = azlmbr.globals.property.LANDSCAPE_CANVAS_EDITOR_ID newEntityId = None diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/ComponentUpdates_UpdateGraph.py b/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/ComponentUpdates_UpdateGraph.py index d8172c1be3..26062c01f8 100755 --- a/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/ComponentUpdates_UpdateGraph.py +++ b/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/ComponentUpdates_UpdateGraph.py @@ -41,8 +41,8 @@ import azlmbr.slice as slice import azlmbr.paths sys.path.append(os.path.join(azlmbr.paths.devroot, 'AutomatedTesting', 'Gem', 'PythonTests')) -import automatedtesting_shared.hydra_editor_utils as hydra -from automatedtesting_shared.editor_test_helper import EditorTestHelper +import editor_python_test_tools.hydra_editor_utils as hydra +from editor_python_test_tools.editor_test_helper import EditorTestHelper class TestComponentUpdatesUpdateGraph(EditorTestHelper): diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/CreateNewGraph.py b/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/CreateNewGraph.py index 86f8f83201..5fed13985d 100755 --- a/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/CreateNewGraph.py +++ b/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/CreateNewGraph.py @@ -19,8 +19,8 @@ import azlmbr.legacy.general as general import azlmbr.paths sys.path.append(os.path.join(azlmbr.paths.devroot, 'AutomatedTesting', 'Gem', 'PythonTests')) -import automatedtesting_shared.hydra_editor_utils as hydra -from automatedtesting_shared.editor_test_helper import EditorTestHelper +import editor_python_test_tools.hydra_editor_utils as hydra +from editor_python_test_tools.editor_test_helper import EditorTestHelper editorId = azlmbr.globals.property.LANDSCAPE_CANVAS_EDITOR_ID new_root_entity_id = None diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/Edit_DisabledNodeDuplication.py b/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/Edit_DisabledNodeDuplication.py index e25553b64a..7fd3f075e0 100755 --- a/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/Edit_DisabledNodeDuplication.py +++ b/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/Edit_DisabledNodeDuplication.py @@ -21,8 +21,8 @@ import azlmbr.math as math import azlmbr.paths sys.path.append(os.path.join(azlmbr.paths.devroot, 'AutomatedTesting', 'Gem', 'PythonTests')) -import automatedtesting_shared.hydra_editor_utils as hydra -from automatedtesting_shared.editor_test_helper import EditorTestHelper +import editor_python_test_tools.hydra_editor_utils as hydra +from editor_python_test_tools.editor_test_helper import EditorTestHelper editorId = azlmbr.globals.property.LANDSCAPE_CANVAS_EDITOR_ID newEntityId = None diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/Edit_UndoNodeDelete_SliceEntity.py b/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/Edit_UndoNodeDelete_SliceEntity.py index f88ce893ba..27ab6fded3 100755 --- a/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/Edit_UndoNodeDelete_SliceEntity.py +++ b/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/Edit_UndoNodeDelete_SliceEntity.py @@ -35,8 +35,8 @@ import azlmbr.slice as slice import azlmbr.paths sys.path.append(os.path.join(azlmbr.paths.devroot, 'AutomatedTesting', 'Gem', 'PythonTests')) -import automatedtesting_shared.hydra_editor_utils as hydra -from automatedtesting_shared.editor_test_helper import EditorTestHelper +import editor_python_test_tools.hydra_editor_utils as hydra +from editor_python_test_tools.editor_test_helper import EditorTestHelper class TestUndoNodeDeleteSlice(EditorTestHelper): diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/GradientMixer_NodeConstruction.py b/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/GradientMixer_NodeConstruction.py index 8883dc0d93..ca3bc04f47 100755 --- a/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/GradientMixer_NodeConstruction.py +++ b/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/GradientMixer_NodeConstruction.py @@ -22,8 +22,8 @@ import azlmbr.math as math import azlmbr.paths sys.path.append(os.path.join(azlmbr.paths.devroot, 'AutomatedTesting', 'Gem', 'PythonTests')) -import automatedtesting_shared.hydra_editor_utils as hydra -from automatedtesting_shared.editor_test_helper import EditorTestHelper +import editor_python_test_tools.hydra_editor_utils as hydra +from editor_python_test_tools.editor_test_helper import EditorTestHelper editorId = azlmbr.globals.property.LANDSCAPE_CANVAS_EDITOR_ID newEntityId = None diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/GradientModifierNodes_EntityCreatedOnNodeAdd.py b/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/GradientModifierNodes_EntityCreatedOnNodeAdd.py index 9419322000..d40b19e7db 100755 --- a/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/GradientModifierNodes_EntityCreatedOnNodeAdd.py +++ b/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/GradientModifierNodes_EntityCreatedOnNodeAdd.py @@ -21,8 +21,8 @@ import azlmbr.math as math import azlmbr.paths sys.path.append(os.path.join(azlmbr.paths.devroot, 'AutomatedTesting', 'Gem', 'PythonTests')) -import automatedtesting_shared.hydra_editor_utils as hydra -from automatedtesting_shared.editor_test_helper import EditorTestHelper +import editor_python_test_tools.hydra_editor_utils as hydra +from editor_python_test_tools.editor_test_helper import EditorTestHelper editorId = azlmbr.globals.property.LANDSCAPE_CANVAS_EDITOR_ID newEntityId = None diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/GradientModifierNodes_EntityRemovedOnNodeDelete.py b/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/GradientModifierNodes_EntityRemovedOnNodeDelete.py index 9fbcb1382f..dc263924d1 100755 --- a/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/GradientModifierNodes_EntityRemovedOnNodeDelete.py +++ b/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/GradientModifierNodes_EntityRemovedOnNodeDelete.py @@ -21,7 +21,7 @@ import azlmbr.math as math import azlmbr.paths sys.path.append(os.path.join(azlmbr.paths.devroot, 'AutomatedTesting', 'Gem', 'PythonTests')) -from automatedtesting_shared.editor_test_helper import EditorTestHelper +from editor_python_test_tools.editor_test_helper import EditorTestHelper editorId = azlmbr.globals.property.LANDSCAPE_CANVAS_EDITOR_ID createdEntityId = None diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/GradientNodes_DependentComponentsAdded.py b/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/GradientNodes_DependentComponentsAdded.py index 4315acac62..5e203e1892 100755 --- a/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/GradientNodes_DependentComponentsAdded.py +++ b/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/GradientNodes_DependentComponentsAdded.py @@ -21,8 +21,8 @@ import azlmbr.math as math import azlmbr.paths sys.path.append(os.path.join(azlmbr.paths.devroot, 'AutomatedTesting', 'Gem', 'PythonTests')) -import automatedtesting_shared.hydra_editor_utils as hydra -from automatedtesting_shared.editor_test_helper import EditorTestHelper +import editor_python_test_tools.hydra_editor_utils as hydra +from editor_python_test_tools.editor_test_helper import EditorTestHelper editorId = azlmbr.globals.property.LANDSCAPE_CANVAS_EDITOR_ID newEntityId = None diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/GradientNodes_EntityCreatedOnNodeAdd.py b/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/GradientNodes_EntityCreatedOnNodeAdd.py index f2809b0cf2..6d4a2f58a7 100755 --- a/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/GradientNodes_EntityCreatedOnNodeAdd.py +++ b/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/GradientNodes_EntityCreatedOnNodeAdd.py @@ -20,8 +20,8 @@ import azlmbr.math as math import azlmbr.paths sys.path.append(os.path.join(azlmbr.paths.devroot, 'AutomatedTesting', 'Gem', 'PythonTests')) -import automatedtesting_shared.hydra_editor_utils as hydra -from automatedtesting_shared.editor_test_helper import EditorTestHelper +import editor_python_test_tools.hydra_editor_utils as hydra +from editor_python_test_tools.editor_test_helper import EditorTestHelper editorId = azlmbr.globals.property.LANDSCAPE_CANVAS_EDITOR_ID newEntityId = None diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/GradientNodes_EntityRemovedOnNodeDelete.py b/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/GradientNodes_EntityRemovedOnNodeDelete.py index c6147e8bb4..2b49e3a911 100755 --- a/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/GradientNodes_EntityRemovedOnNodeDelete.py +++ b/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/GradientNodes_EntityRemovedOnNodeDelete.py @@ -21,7 +21,7 @@ import azlmbr.math as math import azlmbr.paths sys.path.append(os.path.join(azlmbr.paths.devroot, 'AutomatedTesting', 'Gem', 'PythonTests')) -from automatedtesting_shared.editor_test_helper import EditorTestHelper +from editor_python_test_tools.editor_test_helper import EditorTestHelper editorId = azlmbr.globals.property.LANDSCAPE_CANVAS_EDITOR_ID createdEntityId = None diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/GraphClosed_OnEntityDelete.py b/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/GraphClosed_OnEntityDelete.py index b3eeafced7..d3ad5c1c1e 100755 --- a/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/GraphClosed_OnEntityDelete.py +++ b/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/GraphClosed_OnEntityDelete.py @@ -19,7 +19,7 @@ import azlmbr.legacy.general as general import azlmbr.paths sys.path.append(os.path.join(azlmbr.paths.devroot, 'AutomatedTesting', 'Gem', 'PythonTests')) -from automatedtesting_shared.editor_test_helper import EditorTestHelper +from editor_python_test_tools.editor_test_helper import EditorTestHelper editorId = azlmbr.globals.property.LANDSCAPE_CANVAS_EDITOR_ID newRootEntityId = None diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/GraphClosed_OnLevelChange.py b/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/GraphClosed_OnLevelChange.py index 302cb9dcc0..b7b0008eb2 100755 --- a/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/GraphClosed_OnLevelChange.py +++ b/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/GraphClosed_OnLevelChange.py @@ -18,7 +18,7 @@ import azlmbr.legacy.general as general import azlmbr.paths sys.path.append(os.path.join(azlmbr.paths.devroot, 'AutomatedTesting', 'Gem', 'PythonTests')) -from automatedtesting_shared.editor_test_helper import EditorTestHelper +from editor_python_test_tools.editor_test_helper import EditorTestHelper editorId = azlmbr.globals.property.LANDSCAPE_CANVAS_EDITOR_ID diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/GraphClosed_TabbedGraph.py b/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/GraphClosed_TabbedGraph.py index ea6bbb94ff..efd1cc5a55 100755 --- a/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/GraphClosed_TabbedGraph.py +++ b/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/GraphClosed_TabbedGraph.py @@ -18,7 +18,7 @@ import azlmbr.legacy.general as general import azlmbr.paths sys.path.append(os.path.join(azlmbr.paths.devroot, 'AutomatedTesting', 'Gem', 'PythonTests')) -from automatedtesting_shared.editor_test_helper import EditorTestHelper +from editor_python_test_tools.editor_test_helper import EditorTestHelper editorId = azlmbr.globals.property.LANDSCAPE_CANVAS_EDITOR_ID diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/GraphUpdates_UpdateComponents.py b/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/GraphUpdates_UpdateComponents.py index 4149504aca..f350d37178 100755 --- a/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/GraphUpdates_UpdateComponents.py +++ b/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/GraphUpdates_UpdateComponents.py @@ -38,10 +38,11 @@ import azlmbr.math as math import azlmbr.slice as slice import azlmbr.paths +import editor_python_test_tools.hydra_editor_utils as hydra +from editor_python_test_tools.editor_test_helper import EditorTestHelper + sys.path.append(os.path.join(azlmbr.paths.devroot, 'AutomatedTesting', 'Gem', 'PythonTests')) -import automatedtesting_shared.hydra_editor_utils as hydra import automatedtesting_shared.landscape_canvas_utils as lc -from automatedtesting_shared.editor_test_helper import EditorTestHelper class TestGraphUpdatesUpdateComponents(EditorTestHelper): diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/LandscapeCanvasComponent_AddedRemoved.py b/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/LandscapeCanvasComponent_AddedRemoved.py index b6f9457f0e..176429885f 100755 --- a/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/LandscapeCanvasComponent_AddedRemoved.py +++ b/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/LandscapeCanvasComponent_AddedRemoved.py @@ -18,8 +18,8 @@ import azlmbr.entity as entity import azlmbr.paths sys.path.append(os.path.join(azlmbr.paths.devroot, 'AutomatedTesting', 'Gem', 'PythonTests')) -import automatedtesting_shared.hydra_editor_utils as hydra -from automatedtesting_shared.editor_test_helper import EditorTestHelper +import editor_python_test_tools.hydra_editor_utils as hydra +from editor_python_test_tools.editor_test_helper import EditorTestHelper editorId = azlmbr.globals.property.LANDSCAPE_CANVAS_EDITOR_ID diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/LandscapeCanvas_SliceCreateInstantiate.py b/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/LandscapeCanvas_SliceCreateInstantiate.py index cfa685e875..e0f13adaa9 100755 --- a/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/LandscapeCanvas_SliceCreateInstantiate.py +++ b/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/LandscapeCanvas_SliceCreateInstantiate.py @@ -19,8 +19,8 @@ import azlmbr.asset as asset import azlmbr.slice as slice sys.path.append(os.path.join(azlmbr.paths.devroot, "AutomatedTesting", "Gem", "PythonTests")) -import automatedtesting_shared.hydra_editor_utils as hydra -from automatedtesting_shared.editor_test_helper import EditorTestHelper +import editor_python_test_tools.hydra_editor_utils as hydra +from editor_python_test_tools.editor_test_helper import EditorTestHelper class TestLandscapeCanvasSliceCreateInstantiate(EditorTestHelper): diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/LayerBlender_NodeConstruction.py b/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/LayerBlender_NodeConstruction.py index 6ed9b80dbe..ecc529b9b4 100755 --- a/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/LayerBlender_NodeConstruction.py +++ b/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/LayerBlender_NodeConstruction.py @@ -22,8 +22,8 @@ import azlmbr.math as math import azlmbr.paths sys.path.append(os.path.join(azlmbr.paths.devroot, 'AutomatedTesting', 'Gem', 'PythonTests')) -import automatedtesting_shared.hydra_editor_utils as hydra -from automatedtesting_shared.editor_test_helper import EditorTestHelper +import editor_python_test_tools.hydra_editor_utils as hydra +from editor_python_test_tools.editor_test_helper import EditorTestHelper editorId = azlmbr.globals.property.LANDSCAPE_CANVAS_EDITOR_ID newEntityId = None diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/LayerExtenderNodes_ComponentEntitySync.py b/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/LayerExtenderNodes_ComponentEntitySync.py index d65f86b77f..00fcb5170c 100755 --- a/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/LayerExtenderNodes_ComponentEntitySync.py +++ b/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/LayerExtenderNodes_ComponentEntitySync.py @@ -21,8 +21,8 @@ import azlmbr.math as math import azlmbr.paths sys.path.append(os.path.join(azlmbr.paths.devroot, 'AutomatedTesting', 'Gem', 'PythonTests')) -import automatedtesting_shared.hydra_editor_utils as hydra -from automatedtesting_shared.editor_test_helper import EditorTestHelper +import editor_python_test_tools.hydra_editor_utils as hydra +from editor_python_test_tools.editor_test_helper import EditorTestHelper editorId = azlmbr.globals.property.LANDSCAPE_CANVAS_EDITOR_ID newEntityId = None diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/ShapeNodes_EntityCreatedOnNodeAdd.py b/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/ShapeNodes_EntityCreatedOnNodeAdd.py index e5d3c436c3..bd10e5f4c6 100755 --- a/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/ShapeNodes_EntityCreatedOnNodeAdd.py +++ b/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/ShapeNodes_EntityCreatedOnNodeAdd.py @@ -21,8 +21,8 @@ import azlmbr.math as math import azlmbr.paths sys.path.append(os.path.join(azlmbr.paths.devroot, 'AutomatedTesting', 'Gem', 'PythonTests')) -import automatedtesting_shared.hydra_editor_utils as hydra -from automatedtesting_shared.editor_test_helper import EditorTestHelper +import editor_python_test_tools.hydra_editor_utils as hydra +from editor_python_test_tools.editor_test_helper import EditorTestHelper editorId = azlmbr.globals.property.LANDSCAPE_CANVAS_EDITOR_ID newEntityId = None diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/ShapeNodes_EntityRemovedOnNodeDelete.py b/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/ShapeNodes_EntityRemovedOnNodeDelete.py index db5542a3fd..f71f5ae906 100755 --- a/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/ShapeNodes_EntityRemovedOnNodeDelete.py +++ b/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/ShapeNodes_EntityRemovedOnNodeDelete.py @@ -21,7 +21,7 @@ import azlmbr.math as math import azlmbr.paths sys.path.append(os.path.join(azlmbr.paths.devroot, 'AutomatedTesting', 'Gem', 'PythonTests')) -from automatedtesting_shared.editor_test_helper import EditorTestHelper +from editor_python_test_tools.editor_test_helper import EditorTestHelper editorId = azlmbr.globals.property.LANDSCAPE_CANVAS_EDITOR_ID createdEntityId = None diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/SlotConnections_UpdateComponentReferences.py b/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/SlotConnections_UpdateComponentReferences.py index 346358641d..968f39c64d 100755 --- a/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/SlotConnections_UpdateComponentReferences.py +++ b/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/SlotConnections_UpdateComponentReferences.py @@ -21,8 +21,8 @@ import azlmbr.math as math import azlmbr.paths sys.path.append(os.path.join(azlmbr.paths.devroot, 'AutomatedTesting', 'Gem', 'PythonTests')) -import automatedtesting_shared.hydra_editor_utils as hydra -from automatedtesting_shared.editor_test_helper import EditorTestHelper +import editor_python_test_tools.hydra_editor_utils as hydra +from editor_python_test_tools.editor_test_helper import EditorTestHelper editorId = azlmbr.globals.property.LANDSCAPE_CANVAS_EDITOR_ID newEntityId = None diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/test_AreaNodes.py b/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/test_AreaNodes.py index 46ca74a3df..4805d46e75 100755 --- a/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/test_AreaNodes.py +++ b/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/test_AreaNodes.py @@ -18,10 +18,11 @@ C13815873 - All Filters/Modifiers/Selectors can be added to/removed from a Layer import os import pytest + # Bail on the test if ly_test_tools doesn't exist. pytest.importorskip('ly_test_tools') import ly_test_tools.environment.file_system as file_system -import automatedtesting_shared.hydra_test_utils as hydra +import automateeditor_python_test_toolsdtesting_shared.hydra_test_utils as hydra test_directory = os.path.join(os.path.dirname(__file__), 'EditorScripts') diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/test_EditFunctionality.py b/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/test_EditFunctionality.py index dcb35e01fb..6899847d81 100755 --- a/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/test_EditFunctionality.py +++ b/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/test_EditFunctionality.py @@ -16,10 +16,11 @@ C30813586 - Editor remains stable after Undoing deletion of a node on a slice en import os import pytest + # Bail on the test if ly_test_tools doesn't exist. pytest.importorskip('ly_test_tools') import ly_test_tools.environment.file_system as file_system -import automatedtesting_shared.hydra_test_utils as hydra +import editor_python_test_tools.hydra_test_utils as hydra test_directory = os.path.join(os.path.dirname(__file__), 'EditorScripts') diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/test_GeneralGraphFunctionality.py b/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/test_GeneralGraphFunctionality.py index edbd86a7a1..09235ca2ae 100755 --- a/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/test_GeneralGraphFunctionality.py +++ b/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/test_GeneralGraphFunctionality.py @@ -21,7 +21,7 @@ import pytest # Bail on the test if ly_test_tools doesn't exist. pytest.importorskip("ly_test_tools") import ly_test_tools.environment.file_system as file_system -import automatedtesting_shared.hydra_test_utils as hydra +import editor_python_test_tools.hydra_test_utils as hydra test_directory = os.path.join(os.path.dirname(__file__), "EditorScripts") diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/test_GradientModifierNodes.py b/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/test_GradientModifierNodes.py index 20961df4b0..bce57b6da8 100755 --- a/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/test_GradientModifierNodes.py +++ b/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/test_GradientModifierNodes.py @@ -16,10 +16,11 @@ C18055051 - All Gradient Modifier nodes can be removed from a graph import os import pytest + # Bail on the test if ly_test_tools doesn't exist. pytest.importorskip('ly_test_tools') import ly_test_tools.environment.file_system as file_system -import automatedtesting_shared.hydra_test_utils as hydra +import editor_python_test_tools.hydra_test_utils as hydra test_directory = os.path.join(os.path.dirname(__file__), 'EditorScripts') diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/test_GradientNodes.py b/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/test_GradientNodes.py index 83a2a9686c..639bec7827 100755 --- a/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/test_GradientNodes.py +++ b/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/test_GradientNodes.py @@ -17,10 +17,11 @@ C17461363 - All Gradient nodes can be removed from a graph import os import pytest + # Bail on the test if ly_test_tools doesn't exist. pytest.importorskip('ly_test_tools') import ly_test_tools.environment.file_system as file_system -import automatedtesting_shared.hydra_test_utils as hydra +import editor_python_test_tools.hydra_test_utils as hydra test_directory = os.path.join(os.path.dirname(__file__), 'EditorScripts') diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/test_GraphComponentSync.py b/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/test_GraphComponentSync.py index 33fbeeec1b..efeba3b74a 100755 --- a/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/test_GraphComponentSync.py +++ b/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/test_GraphComponentSync.py @@ -19,10 +19,11 @@ C21333743 - Vegetation Layer Blenders are properly setup when constructing in a import os import pytest + # Bail on the test if ly_test_tools doesn't exist. pytest.importorskip('ly_test_tools') import ly_test_tools.environment.file_system as file_system -import automatedtesting_shared.hydra_test_utils as hydra +import editor_python_test_tools.hydra_test_utils as hydra test_directory = os.path.join(os.path.dirname(__file__), 'EditorScripts') diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/test_ShapeNodes.py b/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/test_ShapeNodes.py index b74c2a70bc..3705cdc94e 100755 --- a/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/test_ShapeNodes.py +++ b/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/test_ShapeNodes.py @@ -16,10 +16,11 @@ C17412059 - All Shape nodes can be removed from a graph import os import pytest + # Bail on the test if ly_test_tools doesn't exist. pytest.importorskip('ly_test_tools') import ly_test_tools.environment.file_system as file_system -import automatedtesting_shared.hydra_test_utils as hydra +import editor_python_test_tools.hydra_test_utils as hydra test_directory = os.path.join(os.path.dirname(__file__), 'EditorScripts') diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/large_worlds_utils/editor_dynveg_test_helper.py b/AutomatedTesting/Gem/PythonTests/largeworlds/large_worlds_utils/editor_dynveg_test_helper.py index 6123729b1c..5e4432eafc 100755 --- a/AutomatedTesting/Gem/PythonTests/largeworlds/large_worlds_utils/editor_dynveg_test_helper.py +++ b/AutomatedTesting/Gem/PythonTests/largeworlds/large_worlds_utils/editor_dynveg_test_helper.py @@ -21,7 +21,7 @@ import azlmbr.areasystem as areasystem import azlmbr.paths sys.path.append(os.path.join(azlmbr.paths.devroot, 'AutomatedTesting', 'Gem', 'PythonTests')) -import automatedtesting_shared.hydra_editor_utils as hydra +import editor_python_test_tools.hydra_editor_utils as hydra def create_surface_entity(name, center_point, box_size_x, box_size_y, box_size_z): diff --git a/AutomatedTesting/Gem/PythonTests/physics/C100000_RigidBody_EnablingGravityWorksPoC.py b/AutomatedTesting/Gem/PythonTests/physics/C100000_RigidBody_EnablingGravityWorksPoC.py index 04ff07daa2..e0277180ae 100755 --- a/AutomatedTesting/Gem/PythonTests/physics/C100000_RigidBody_EnablingGravityWorksPoC.py +++ b/AutomatedTesting/Gem/PythonTests/physics/C100000_RigidBody_EnablingGravityWorksPoC.py @@ -34,8 +34,8 @@ def C100000_RigidBody_EnablingGravityWorksPoC(): imports.init() - from utils import Report - from utils import TestHelper as helper + 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 @@ -84,5 +84,5 @@ if __name__ == "__main__": import ImportPathHelper as imports imports.init() - from utils import Report + from editor_python_test_tools.utils import Report Report.start_test(C100000_RigidBody_EnablingGravityWorksPoC) diff --git a/AutomatedTesting/Gem/PythonTests/physics/C111111_RigidBody_EnablingGravityWorksUsingNotificationsPoC.py b/AutomatedTesting/Gem/PythonTests/physics/C111111_RigidBody_EnablingGravityWorksUsingNotificationsPoC.py index 031b3121ab..c7dd8debb9 100755 --- a/AutomatedTesting/Gem/PythonTests/physics/C111111_RigidBody_EnablingGravityWorksUsingNotificationsPoC.py +++ b/AutomatedTesting/Gem/PythonTests/physics/C111111_RigidBody_EnablingGravityWorksUsingNotificationsPoC.py @@ -34,8 +34,8 @@ def C111111_RigidBody_EnablingGravityWorksUsingNotificationsPoC(): imports.init() - from utils import Report - from utils import TestHelper as helper + 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 @@ -93,5 +93,5 @@ if __name__ == "__main__": import ImportPathHelper as imports imports.init() - from utils import Report + from editor_python_test_tools.utils import Report Report.start_test(C111111_RigidBody_EnablingGravityWorksUsingNotificationsPoC) diff --git a/AutomatedTesting/Gem/PythonTests/physics/C12712452_ScriptCanvas_CollisionEvents.py b/AutomatedTesting/Gem/PythonTests/physics/C12712452_ScriptCanvas_CollisionEvents.py index e5cee76415..216a75233f 100755 --- a/AutomatedTesting/Gem/PythonTests/physics/C12712452_ScriptCanvas_CollisionEvents.py +++ b/AutomatedTesting/Gem/PythonTests/physics/C12712452_ScriptCanvas_CollisionEvents.py @@ -76,14 +76,13 @@ def C12712452_ScriptCanvas_CollisionEvents(): imports.init() - import azlmbr.legacy.general as general import azlmbr.bus import azlmbr.components import azlmbr.entity import azlmbr.physics - from utils import Report - from utils import TestHelper as helper + from editor_python_test_tools.utils import Report + from editor_python_test_tools.utils import TestHelper as helper # Constants TIME_OUT_SECONDS = 3.0 @@ -209,5 +208,5 @@ if __name__ == "__main__": import ImportPathHelper as imports imports.init() - from utils import Report + from editor_python_test_tools.utils import Report Report.start_test(C12712452_ScriptCanvas_CollisionEvents) diff --git a/AutomatedTesting/Gem/PythonTests/physics/C12712453_ScriptCanvas_MultipleRaycastNode.py b/AutomatedTesting/Gem/PythonTests/physics/C12712453_ScriptCanvas_MultipleRaycastNode.py index bcbd0d6e0a..2adf30e65e 100755 --- a/AutomatedTesting/Gem/PythonTests/physics/C12712453_ScriptCanvas_MultipleRaycastNode.py +++ b/AutomatedTesting/Gem/PythonTests/physics/C12712453_ScriptCanvas_MultipleRaycastNode.py @@ -81,8 +81,8 @@ def C12712453_ScriptCanvas_MultipleRaycastNode(): imports.init() - from utils import Report - from utils import TestHelper as helper + 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 @@ -203,6 +203,6 @@ if __name__ == "__main__": import ImportPathHelper as imports imports.init() - from utils import Report + from editor_python_test_tools.utils import Report # Disabled until Script Canvas merges the new backend #Report.start_test(C12712453_ScriptCanvas_MultipleRaycastNode) diff --git a/AutomatedTesting/Gem/PythonTests/physics/C12712454_ScriptCanvas_OverlapNodeVerification.py b/AutomatedTesting/Gem/PythonTests/physics/C12712454_ScriptCanvas_OverlapNodeVerification.py index 808f1e4c31..94eed900ff 100755 --- a/AutomatedTesting/Gem/PythonTests/physics/C12712454_ScriptCanvas_OverlapNodeVerification.py +++ b/AutomatedTesting/Gem/PythonTests/physics/C12712454_ScriptCanvas_OverlapNodeVerification.py @@ -106,9 +106,8 @@ def C12712454_ScriptCanvas_OverlapNodeVerification(): imports.init() - - from utils import Report - from utils import TestHelper as helper + 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 @@ -328,5 +327,5 @@ if __name__ == "__main__": import ImportPathHelper as imports imports.init() - from utils import Report + from editor_python_test_tools.utils import Report Report.start_test(C12712454_ScriptCanvas_OverlapNodeVerification) diff --git a/AutomatedTesting/Gem/PythonTests/physics/C12712455_ScriptCanvas_ShapeCastVerification.py b/AutomatedTesting/Gem/PythonTests/physics/C12712455_ScriptCanvas_ShapeCastVerification.py index a5c827edb9..61f26ebecb 100755 --- a/AutomatedTesting/Gem/PythonTests/physics/C12712455_ScriptCanvas_ShapeCastVerification.py +++ b/AutomatedTesting/Gem/PythonTests/physics/C12712455_ScriptCanvas_ShapeCastVerification.py @@ -76,9 +76,8 @@ def C12712455_ScriptCanvas_ShapeCastVerification(): imports.init() - - from utils import Report - from utils import TestHelper as helper + 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 @@ -145,5 +144,5 @@ if __name__ == "__main__": import ImportPathHelper as imports imports.init() - from utils import Report + from editor_python_test_tools.utils import Report Report.start_test(C12712455_ScriptCanvas_ShapeCastVerification) diff --git a/AutomatedTesting/Gem/PythonTests/physics/C12868578_ForceRegion_DirectionHasNoAffectOnMagnitude.py b/AutomatedTesting/Gem/PythonTests/physics/C12868578_ForceRegion_DirectionHasNoAffectOnMagnitude.py index b84adcd246..4745927e89 100755 --- a/AutomatedTesting/Gem/PythonTests/physics/C12868578_ForceRegion_DirectionHasNoAffectOnMagnitude.py +++ b/AutomatedTesting/Gem/PythonTests/physics/C12868578_ForceRegion_DirectionHasNoAffectOnMagnitude.py @@ -95,9 +95,8 @@ def C12868578_ForceRegion_DirectionHasNoAffectOnMagnitude(): imports.init() - - from utils import Report - from utils import TestHelper as helper + 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 @@ -291,5 +290,5 @@ if __name__ == "__main__": import ImportPathHelper as imports imports.init() - from utils import Report + from editor_python_test_tools.utils import Report Report.start_test(C12868578_ForceRegion_DirectionHasNoAffectOnMagnitude) diff --git a/AutomatedTesting/Gem/PythonTests/physics/C12868580_ForceRegion_SplineModifiedTransform.py b/AutomatedTesting/Gem/PythonTests/physics/C12868580_ForceRegion_SplineModifiedTransform.py index 481c1fa43c..937fdd85a6 100755 --- a/AutomatedTesting/Gem/PythonTests/physics/C12868580_ForceRegion_SplineModifiedTransform.py +++ b/AutomatedTesting/Gem/PythonTests/physics/C12868580_ForceRegion_SplineModifiedTransform.py @@ -83,8 +83,8 @@ def C12868580_ForceRegion_SplineModifiedTransform(): imports.init() - from utils import Report - from utils import TestHelper as helper + from editor_python_test_tools.utils import Report + from editor_python_test_tools.utils import TestHelper as helper import itertools import azlmbr @@ -175,5 +175,5 @@ if __name__ == "__main__": import ImportPathHelper as imports imports.init() - from utils import Report + from editor_python_test_tools.utils import Report Report.start_test(C12868580_ForceRegion_SplineModifiedTransform) diff --git a/AutomatedTesting/Gem/PythonTests/physics/C12905527_ForceRegion_MagnitudeDeviation.py b/AutomatedTesting/Gem/PythonTests/physics/C12905527_ForceRegion_MagnitudeDeviation.py index a9fb92b4fa..0cb0a2f841 100755 --- a/AutomatedTesting/Gem/PythonTests/physics/C12905527_ForceRegion_MagnitudeDeviation.py +++ b/AutomatedTesting/Gem/PythonTests/physics/C12905527_ForceRegion_MagnitudeDeviation.py @@ -63,8 +63,8 @@ def C12905527_ForceRegion_MagnitudeDeviation(): imports.init() - from utils import Report - from utils import TestHelper as helper + from editor_python_test_tools.utils import Report + from editor_python_test_tools.utils import TestHelper as helper import azlmbr import azlmbr.legacy.general as general @@ -150,5 +150,5 @@ if __name__ == "__main__": import ImportPathHelper as imports imports.init() - from utils import Report + from editor_python_test_tools.utils import Report Report.start_test(C12905527_ForceRegion_MagnitudeDeviation) diff --git a/AutomatedTesting/Gem/PythonTests/physics/C12905528_ForceRegion_WithNonTriggerCollider.py b/AutomatedTesting/Gem/PythonTests/physics/C12905528_ForceRegion_WithNonTriggerCollider.py index d3fe35b1cd..42565333f7 100755 --- a/AutomatedTesting/Gem/PythonTests/physics/C12905528_ForceRegion_WithNonTriggerCollider.py +++ b/AutomatedTesting/Gem/PythonTests/physics/C12905528_ForceRegion_WithNonTriggerCollider.py @@ -50,11 +50,12 @@ def run(): # Helper file Imports import ImportPathHelper as imports + from editor_python_test_tools.editor_entity_utils import EditorEntity + from editor_python_test_tools.utils import Report + imports.init() - from utils import Report - from utils import TestHelper as helper - from utils import Tracer - from editor_entity_utils import EditorEntity + from editor_python_test_tools.utils import TestHelper as helper + from editor_python_test_tools.utils import Tracer helper.init_idle() # 1) Load the empty level diff --git a/AutomatedTesting/Gem/PythonTests/physics/C13351703_COM_NotIncludeTriggerShapes.py b/AutomatedTesting/Gem/PythonTests/physics/C13351703_COM_NotIncludeTriggerShapes.py index d4bbdca52f..828022ccf2 100755 --- a/AutomatedTesting/Gem/PythonTests/physics/C13351703_COM_NotIncludeTriggerShapes.py +++ b/AutomatedTesting/Gem/PythonTests/physics/C13351703_COM_NotIncludeTriggerShapes.py @@ -64,9 +64,8 @@ def C13351703_COM_NotIncludeTriggerShapes(): imports.init() - - from utils import Report - from utils import TestHelper as helper + 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 @@ -101,5 +100,5 @@ if __name__ == "__main__": import ImportPathHelper as imports imports.init() - from utils import Report + from editor_python_test_tools.utils import Report Report.start_test(C13351703_COM_NotIncludeTriggerShapes) diff --git a/AutomatedTesting/Gem/PythonTests/physics/C13352089_RigidBodies_MaxAngularVelocity.py b/AutomatedTesting/Gem/PythonTests/physics/C13352089_RigidBodies_MaxAngularVelocity.py index eb3429f852..77d93d9752 100755 --- a/AutomatedTesting/Gem/PythonTests/physics/C13352089_RigidBodies_MaxAngularVelocity.py +++ b/AutomatedTesting/Gem/PythonTests/physics/C13352089_RigidBodies_MaxAngularVelocity.py @@ -131,8 +131,8 @@ def C13352089_RigidBodies_MaxAngularVelocity(): imports.init() - from utils import Report - from utils import TestHelper as helper + from editor_python_test_tools.utils import Report + from editor_python_test_tools.utils import TestHelper as helper import azlmbr.math as lymath import azlmbr.legacy.general as general import azlmbr.bus @@ -288,5 +288,5 @@ if __name__ == "__main__": import ImportPathHelper as imports imports.init() - from utils import Report + from editor_python_test_tools.utils import Report Report.start_test(C13352089_RigidBodies_MaxAngularVelocity) diff --git a/AutomatedTesting/Gem/PythonTests/physics/C13508019_Terrain_TerrainTexturePainterWorks.py b/AutomatedTesting/Gem/PythonTests/physics/C13508019_Terrain_TerrainTexturePainterWorks.py index 943fb4d754..1c580bfbfe 100755 --- a/AutomatedTesting/Gem/PythonTests/physics/C13508019_Terrain_TerrainTexturePainterWorks.py +++ b/AutomatedTesting/Gem/PythonTests/physics/C13508019_Terrain_TerrainTexturePainterWorks.py @@ -48,7 +48,8 @@ def C13508019_Terrain_TerrainTexturePainterWorks(): imports.init() - from utils import Report, TestHelper as helper + 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 @@ -143,5 +144,5 @@ if __name__ == "__main__": import ImportPathHelper as imports imports.init() - from utils import Report + from editor_python_test_tools.utils import Report Report.start_test(C13508019_Terrain_TerrainTexturePainterWorks) diff --git a/AutomatedTesting/Gem/PythonTests/physics/C13895144_Ragdoll_ChangeLevel.py b/AutomatedTesting/Gem/PythonTests/physics/C13895144_Ragdoll_ChangeLevel.py index db497dabc6..61efe20dbd 100755 --- a/AutomatedTesting/Gem/PythonTests/physics/C13895144_Ragdoll_ChangeLevel.py +++ b/AutomatedTesting/Gem/PythonTests/physics/C13895144_Ragdoll_ChangeLevel.py @@ -67,9 +67,8 @@ def C13895144_Ragdoll_ChangeLevel(): imports.init() - - from utils import Report - from utils import TestHelper as helper + from editor_python_test_tools.utils import Report + from editor_python_test_tools.utils import TestHelper as helper import azlmbr.legacy.general as general @@ -112,5 +111,5 @@ if __name__ == "__main__": import ImportPathHelper as imports imports.init() - from utils import Report + from editor_python_test_tools.utils import Report Report.start_test(C13895144_Ragdoll_ChangeLevel) diff --git a/AutomatedTesting/Gem/PythonTests/physics/C14195074_ScriptCanvas_PostUpdateEvent.py b/AutomatedTesting/Gem/PythonTests/physics/C14195074_ScriptCanvas_PostUpdateEvent.py index 4837de3538..5668082f78 100755 --- a/AutomatedTesting/Gem/PythonTests/physics/C14195074_ScriptCanvas_PostUpdateEvent.py +++ b/AutomatedTesting/Gem/PythonTests/physics/C14195074_ScriptCanvas_PostUpdateEvent.py @@ -70,9 +70,8 @@ def C14195074_ScriptCanvas_PostUpdateEvent(): imports.init() - - from utils import Report - from utils import TestHelper as helper + from editor_python_test_tools.utils import Report + from editor_python_test_tools.utils import TestHelper as helper import azlmbr import azlmbr.legacy.general as general @@ -190,5 +189,5 @@ if __name__ == "__main__": import ImportPathHelper as imports imports.init() - from utils import Report + from editor_python_test_tools.utils import Report Report.start_test(C14195074_ScriptCanvas_PostUpdateEvent) diff --git a/AutomatedTesting/Gem/PythonTests/physics/C14654881_CharacterController_SwitchLevels.py b/AutomatedTesting/Gem/PythonTests/physics/C14654881_CharacterController_SwitchLevels.py index 0958a4bbbb..fd5653b801 100755 --- a/AutomatedTesting/Gem/PythonTests/physics/C14654881_CharacterController_SwitchLevels.py +++ b/AutomatedTesting/Gem/PythonTests/physics/C14654881_CharacterController_SwitchLevels.py @@ -62,8 +62,8 @@ def C14654881_CharacterController_SwitchLevels(): imports.init() - from utils import Report - from utils import TestHelper as helper + 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 @@ -100,5 +100,5 @@ if __name__ == "__main__": import ImportPathHelper as imports imports.init() - from utils import Report + from editor_python_test_tools.utils import Report Report.start_test(C14654881_CharacterController_SwitchLevels) diff --git a/AutomatedTesting/Gem/PythonTests/physics/C14654882_Ragdoll_ragdollAPTest.py b/AutomatedTesting/Gem/PythonTests/physics/C14654882_Ragdoll_ragdollAPTest.py index 2bc620e0c1..03c18a5f1a 100755 --- a/AutomatedTesting/Gem/PythonTests/physics/C14654882_Ragdoll_ragdollAPTest.py +++ b/AutomatedTesting/Gem/PythonTests/physics/C14654882_Ragdoll_ragdollAPTest.py @@ -78,9 +78,8 @@ def C14654882_Ragdoll_ragdollAPTest(): imports.init() - - from utils import TestHelper as helper - from utils import Report + from editor_python_test_tools.utils import Report + from editor_python_test_tools.utils import TestHelper as helper helper.init_idle() @@ -137,5 +136,5 @@ if __name__ == "__main__": import ImportPathHelper as imports imports.init() - from utils import Report + from editor_python_test_tools.utils import Report Report.start_test(C14654882_Ragdoll_ragdollAPTest) diff --git a/AutomatedTesting/Gem/PythonTests/physics/C14861498_ConfirmError_NoPxMesh.py b/AutomatedTesting/Gem/PythonTests/physics/C14861498_ConfirmError_NoPxMesh.py index 9aac3ae91c..e52bdb7574 100755 --- a/AutomatedTesting/Gem/PythonTests/physics/C14861498_ConfirmError_NoPxMesh.py +++ b/AutomatedTesting/Gem/PythonTests/physics/C14861498_ConfirmError_NoPxMesh.py @@ -57,9 +57,9 @@ def C14861498_ConfirmError_NoPxMesh(): imports.init() - from utils import Report - from utils import TestHelper as helper - from utils import Tracer + from editor_python_test_tools.utils import Report + from editor_python_test_tools.utils import TestHelper as helper + from editor_python_test_tools.utils import Tracer import azlmbr.legacy.general as general @@ -92,5 +92,5 @@ if __name__ == "__main__": import ImportPathHelper as imports imports.init() - from utils import Report + from editor_python_test_tools.utils import Report Report.start_test(C14861498_ConfirmError_NoPxMesh) diff --git a/AutomatedTesting/Gem/PythonTests/physics/C14861500_DefaultSetting_ColliderShape.py b/AutomatedTesting/Gem/PythonTests/physics/C14861500_DefaultSetting_ColliderShape.py index 43d4d0e905..7a65448dcd 100755 --- a/AutomatedTesting/Gem/PythonTests/physics/C14861500_DefaultSetting_ColliderShape.py +++ b/AutomatedTesting/Gem/PythonTests/physics/C14861500_DefaultSetting_ColliderShape.py @@ -47,9 +47,9 @@ def C14861500_DefaultSetting_ColliderShape(): import ImportPathHelper as imports imports.init() - from utils import Report - from utils import TestHelper as helper - from editor_entity_utils import EditorEntity as Entity + from editor_python_test_tools.editor_entity_utils import EditorEntity as Entity + from editor_python_test_tools.utils import Report + from editor_python_test_tools.utils import TestHelper as helper # Open 3D Engine Imports import azlmbr.legacy.general as general @@ -77,5 +77,5 @@ if __name__ == "__main__": import ImportPathHelper as imports imports.init() - from utils import Report + from editor_python_test_tools.utils import Report Report.start_test(C14861500_DefaultSetting_ColliderShape) diff --git a/AutomatedTesting/Gem/PythonTests/physics/C14861501_PhysXCollider_RenderMeshAutoAssigned.py b/AutomatedTesting/Gem/PythonTests/physics/C14861501_PhysXCollider_RenderMeshAutoAssigned.py index a7fc5cf3b5..eae5ea547a 100755 --- a/AutomatedTesting/Gem/PythonTests/physics/C14861501_PhysXCollider_RenderMeshAutoAssigned.py +++ b/AutomatedTesting/Gem/PythonTests/physics/C14861501_PhysXCollider_RenderMeshAutoAssigned.py @@ -55,9 +55,9 @@ def run(): import ImportPathHelper as imports imports.init() - from utils import Report - from utils import TestHelper as helper - from editor_entity_utils import EditorEntity as Entity + from editor_python_test_tools.editor_entity_utils import EditorEntity as Entity + from editor_python_test_tools.utils import Report + from editor_python_test_tools.utils import TestHelper as helper from asset_utils import Asset # Asset paths diff --git a/AutomatedTesting/Gem/PythonTests/physics/C14861502_PhysXCollider_AssetAutoAssigned.py b/AutomatedTesting/Gem/PythonTests/physics/C14861502_PhysXCollider_AssetAutoAssigned.py index 94c1d8e404..6ea81ea2ff 100755 --- a/AutomatedTesting/Gem/PythonTests/physics/C14861502_PhysXCollider_AssetAutoAssigned.py +++ b/AutomatedTesting/Gem/PythonTests/physics/C14861502_PhysXCollider_AssetAutoAssigned.py @@ -54,9 +54,9 @@ def C14861502_PhysXCollider_AssetAutoAssigned(): import ImportPathHelper as imports imports.init() - from utils import Report - from utils import TestHelper as helper - from editor_entity_utils import EditorEntity as Entity + from editor_python_test_tools.editor_entity_utils import EditorEntity as Entity + from editor_python_test_tools.utils import Report + from editor_python_test_tools.utils import TestHelper as helper from asset_utils import Asset # Open 3D Engine Imports @@ -100,5 +100,5 @@ if __name__ == "__main__": import ImportPathHelper as imports imports.init() - from utils import Report + from editor_python_test_tools.utils import Report Report.start_test(C14861502_PhysXCollider_AssetAutoAssigned) diff --git a/AutomatedTesting/Gem/PythonTests/physics/C14861504_RenderMeshAsset_WithNoPxAsset.py b/AutomatedTesting/Gem/PythonTests/physics/C14861504_RenderMeshAsset_WithNoPxAsset.py index 0a6962a31c..abc79ba1b0 100755 --- a/AutomatedTesting/Gem/PythonTests/physics/C14861504_RenderMeshAsset_WithNoPxAsset.py +++ b/AutomatedTesting/Gem/PythonTests/physics/C14861504_RenderMeshAsset_WithNoPxAsset.py @@ -59,10 +59,10 @@ def run(): import ImportPathHelper as imports imports.init() - from utils import Report - from utils import TestHelper as helper - from utils import Tracer - from editor_entity_utils import EditorEntity as Entity + from editor_python_test_tools.editor_entity_utils import EditorEntity as Entity + from editor_python_test_tools.utils import Report + from editor_python_test_tools.utils import TestHelper as helper + from editor_python_test_tools.utils import Tracer from asset_utils import Asset # Open 3D Engine Imports diff --git a/AutomatedTesting/Gem/PythonTests/physics/C14902097_ScriptCanvas_PreUpdateEvent.py b/AutomatedTesting/Gem/PythonTests/physics/C14902097_ScriptCanvas_PreUpdateEvent.py index ea62be9768..45557098f7 100755 --- a/AutomatedTesting/Gem/PythonTests/physics/C14902097_ScriptCanvas_PreUpdateEvent.py +++ b/AutomatedTesting/Gem/PythonTests/physics/C14902097_ScriptCanvas_PreUpdateEvent.py @@ -72,9 +72,8 @@ def C14902097_ScriptCanvas_PreUpdateEvent(): imports.init() - - from utils import Report - from utils import TestHelper as helper + from editor_python_test_tools.utils import Report + from editor_python_test_tools.utils import TestHelper as helper import azlmbr import azlmbr.legacy.general as general @@ -197,5 +196,5 @@ if __name__ == "__main__": import ImportPathHelper as imports imports.init() - from utils import Report + from editor_python_test_tools.utils import Report Report.start_test(C14902097_ScriptCanvas_PreUpdateEvent) diff --git a/AutomatedTesting/Gem/PythonTests/physics/C14902098_ScriptCanvas_PostPhysicsUpdate.py b/AutomatedTesting/Gem/PythonTests/physics/C14902098_ScriptCanvas_PostPhysicsUpdate.py index fc3ae2bc18..19caaab4fe 100755 --- a/AutomatedTesting/Gem/PythonTests/physics/C14902098_ScriptCanvas_PostPhysicsUpdate.py +++ b/AutomatedTesting/Gem/PythonTests/physics/C14902098_ScriptCanvas_PostPhysicsUpdate.py @@ -84,9 +84,8 @@ def C14902098_ScriptCanvas_PostPhysicsUpdate(): imports.init() - - from utils import Report - from utils import TestHelper as helper + from editor_python_test_tools.utils import Report + from editor_python_test_tools.utils import TestHelper as helper import azlmbr.legacy.general as general @@ -118,5 +117,5 @@ if __name__ == "__main__": import ImportPathHelper as imports imports.init() - from utils import Report + from editor_python_test_tools.utils import Report Report.start_test(C14902098_ScriptCanvas_PostPhysicsUpdate) diff --git a/AutomatedTesting/Gem/PythonTests/physics/C14976307_Gravity_SetGravityWorks.py b/AutomatedTesting/Gem/PythonTests/physics/C14976307_Gravity_SetGravityWorks.py index 33a26d9433..342ac6bdbd 100755 --- a/AutomatedTesting/Gem/PythonTests/physics/C14976307_Gravity_SetGravityWorks.py +++ b/AutomatedTesting/Gem/PythonTests/physics/C14976307_Gravity_SetGravityWorks.py @@ -69,9 +69,8 @@ def C14976307_Gravity_SetGravityWorks(): imports.init() - - from utils import Report - from utils import TestHelper as helper + 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 @@ -130,5 +129,5 @@ if __name__ == "__main__": import ImportPathHelper as imports imports.init() - from utils import Report + from editor_python_test_tools.utils import Report Report.start_test(C14976307_Gravity_SetGravityWorks) diff --git a/AutomatedTesting/Gem/PythonTests/physics/C14976308_ScriptCanvas_SetKinematicTargetTransform.py b/AutomatedTesting/Gem/PythonTests/physics/C14976308_ScriptCanvas_SetKinematicTargetTransform.py index ea01c71310..815e922a76 100755 --- a/AutomatedTesting/Gem/PythonTests/physics/C14976308_ScriptCanvas_SetKinematicTargetTransform.py +++ b/AutomatedTesting/Gem/PythonTests/physics/C14976308_ScriptCanvas_SetKinematicTargetTransform.py @@ -100,14 +100,13 @@ def C14976308_ScriptCanvas_SetKinematicTargetTransform(): imports.init() - import azlmbr.legacy.general as general import azlmbr.bus import azlmbr.components import azlmbr.math import azlmbr.physics - from utils import Report - from utils import TestHelper as helper + from editor_python_test_tools.utils import Report + from editor_python_test_tools.utils import TestHelper as helper import itertools class Entity: @@ -228,5 +227,5 @@ if __name__ == "__main__": import ImportPathHelper as imports imports.init() - from utils import Report + from editor_python_test_tools.utils import Report Report.start_test(C14976308_ScriptCanvas_SetKinematicTargetTransform) diff --git a/AutomatedTesting/Gem/PythonTests/physics/C15096732_Material_DefaultLibraryUpdatedAcrossLevels_after.py b/AutomatedTesting/Gem/PythonTests/physics/C15096732_Material_DefaultLibraryUpdatedAcrossLevels_after.py index f637981b1d..76ea9475ff 100755 --- a/AutomatedTesting/Gem/PythonTests/physics/C15096732_Material_DefaultLibraryUpdatedAcrossLevels_after.py +++ b/AutomatedTesting/Gem/PythonTests/physics/C15096732_Material_DefaultLibraryUpdatedAcrossLevels_after.py @@ -108,9 +108,8 @@ def C15096732_Material_DefaultLibraryUpdatedAcrossLevels_after(): imports.init() - - from utils import Report - from utils import TestHelper as helper + 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 @@ -293,5 +292,5 @@ if __name__ == "__main__": import ImportPathHelper as imports imports.init() - from utils import Report + from editor_python_test_tools.utils import Report Report.start_test(C15096732_Material_DefaultLibraryUpdatedAcrossLevels_after) diff --git a/AutomatedTesting/Gem/PythonTests/physics/C15096732_Material_DefaultLibraryUpdatedAcrossLevels_before.py b/AutomatedTesting/Gem/PythonTests/physics/C15096732_Material_DefaultLibraryUpdatedAcrossLevels_before.py index fcbc0ff723..748052db56 100755 --- a/AutomatedTesting/Gem/PythonTests/physics/C15096732_Material_DefaultLibraryUpdatedAcrossLevels_before.py +++ b/AutomatedTesting/Gem/PythonTests/physics/C15096732_Material_DefaultLibraryUpdatedAcrossLevels_before.py @@ -101,9 +101,8 @@ def C15096732_Material_DefaultLibraryUpdatedAcrossLevels_before(): imports.init() - - from utils import Report - from utils import TestHelper as helper + 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 @@ -245,5 +244,5 @@ if __name__ == "__main__": import ImportPathHelper as imports imports.init() - from utils import Report + from editor_python_test_tools.utils import Report Report.start_test(C15096732_Material_DefaultLibraryUpdatedAcrossLevels_before) diff --git a/AutomatedTesting/Gem/PythonTests/physics/C15096735_Materials_DefaultLibraryConsistency.py b/AutomatedTesting/Gem/PythonTests/physics/C15096735_Materials_DefaultLibraryConsistency.py index f393ddf527..4c7949cc91 100755 --- a/AutomatedTesting/Gem/PythonTests/physics/C15096735_Materials_DefaultLibraryConsistency.py +++ b/AutomatedTesting/Gem/PythonTests/physics/C15096735_Materials_DefaultLibraryConsistency.py @@ -149,8 +149,8 @@ def C15096735_Materials_DefaultLibraryConsistency(): imports.init() - from utils import Report - from utils import TestHelper as helper + 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 @@ -424,5 +424,5 @@ if __name__ == "__main__": import ImportPathHelper as imports imports.init() - from utils import Report + from editor_python_test_tools.utils import Report Report.start_test(C15096735_Materials_DefaultLibraryConsistency) diff --git a/AutomatedTesting/Gem/PythonTests/physics/C15096737_Materials_DefaultMaterialLibraryChanges.py b/AutomatedTesting/Gem/PythonTests/physics/C15096737_Materials_DefaultMaterialLibraryChanges.py index cf849bbea8..cc7dc3c5e2 100755 --- a/AutomatedTesting/Gem/PythonTests/physics/C15096737_Materials_DefaultMaterialLibraryChanges.py +++ b/AutomatedTesting/Gem/PythonTests/physics/C15096737_Materials_DefaultMaterialLibraryChanges.py @@ -115,9 +115,8 @@ def C15096737_Materials_DefaultMaterialLibraryChanges(): imports.init() - - from utils import Report - from utils import TestHelper as helper + 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 from Physmaterial_Editor import Physmaterial_Editor @@ -301,5 +300,5 @@ if __name__ == "__main__": import ImportPathHelper as imports imports.init() - from utils import Report + from editor_python_test_tools.utils import Report Report.start_test(C15096737_Materials_DefaultMaterialLibraryChanges) diff --git a/AutomatedTesting/Gem/PythonTests/physics/C15096740_Material_LibraryUpdatedCorrectly.py b/AutomatedTesting/Gem/PythonTests/physics/C15096740_Material_LibraryUpdatedCorrectly.py index c69b722e27..0f33f0858b 100755 --- a/AutomatedTesting/Gem/PythonTests/physics/C15096740_Material_LibraryUpdatedCorrectly.py +++ b/AutomatedTesting/Gem/PythonTests/physics/C15096740_Material_LibraryUpdatedCorrectly.py @@ -58,9 +58,9 @@ def C15096740_Material_LibraryUpdatedCorrectly(): imports.init() # Helper file Imports - from utils import Report - from utils import TestHelper as helper - from editor_entity_utils import EditorEntity + 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 from asset_utils import Asset # Open 3D Engine Imports @@ -107,5 +107,5 @@ if __name__ == "__main__": import ImportPathHelper as imports imports.init() - from utils import Report + from editor_python_test_tools.utils import Report Report.start_test(C15096740_Material_LibraryUpdatedCorrectly) diff --git a/AutomatedTesting/Gem/PythonTests/physics/C15308217_NoCrash_LevelSwitch.py b/AutomatedTesting/Gem/PythonTests/physics/C15308217_NoCrash_LevelSwitch.py index 998d21067b..625a8bfb4a 100755 --- a/AutomatedTesting/Gem/PythonTests/physics/C15308217_NoCrash_LevelSwitch.py +++ b/AutomatedTesting/Gem/PythonTests/physics/C15308217_NoCrash_LevelSwitch.py @@ -71,9 +71,8 @@ def C15308217_NoCrash_LevelSwitch(): imports.init() - - from utils import Report - from utils import TestHelper as helper + 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 @@ -114,5 +113,5 @@ if __name__ == "__main__": import ImportPathHelper as imports imports.init() - from utils import Report + from editor_python_test_tools.utils import Report Report.start_test(C15308217_NoCrash_LevelSwitch) diff --git a/AutomatedTesting/Gem/PythonTests/physics/C15308221_Material_ComponentsInSyncWithLibrary.py b/AutomatedTesting/Gem/PythonTests/physics/C15308221_Material_ComponentsInSyncWithLibrary.py index a6ddb73438..3f6457f15c 100755 --- a/AutomatedTesting/Gem/PythonTests/physics/C15308221_Material_ComponentsInSyncWithLibrary.py +++ b/AutomatedTesting/Gem/PythonTests/physics/C15308221_Material_ComponentsInSyncWithLibrary.py @@ -114,7 +114,6 @@ def C15308221_Material_ComponentsInSyncWithLibrary(): imports.init() - import azlmbr.legacy.general as general import azlmbr.bus as bus import azlmbr.components @@ -122,8 +121,8 @@ def C15308221_Material_ComponentsInSyncWithLibrary(): import azlmbr.math as lymath from Physmaterial_Editor import Physmaterial_Editor - from utils import Report - from utils import TestHelper as helper + from editor_python_test_tools.utils import Report + from editor_python_test_tools.utils import TestHelper as helper TIMEOUT = 3.0 BOUNCE_TOLERANCE = 0.1 @@ -252,5 +251,5 @@ if __name__ == "__main__": import ImportPathHelper as imports imports.init() - from utils import Report + from editor_python_test_tools.utils import Report Report.start_test(C15308221_Material_ComponentsInSyncWithLibrary) diff --git a/AutomatedTesting/Gem/PythonTests/physics/C15425929_Undo_Redo.py b/AutomatedTesting/Gem/PythonTests/physics/C15425929_Undo_Redo.py index f5a1fcebc3..57a0e6a75e 100755 --- a/AutomatedTesting/Gem/PythonTests/physics/C15425929_Undo_Redo.py +++ b/AutomatedTesting/Gem/PythonTests/physics/C15425929_Undo_Redo.py @@ -53,10 +53,9 @@ def C15425929_Undo_Redo(): imports.init() - - from utils import Report - from utils import TestHelper as helper - from utils import Tracer + from editor_python_test_tools.utils import Report + from editor_python_test_tools.utils import TestHelper as helper + from editor_python_test_tools.utils import Tracer import azlmbr.legacy.general as general @@ -99,5 +98,5 @@ if __name__ == "__main__": import ImportPathHelper as imports imports.init() - from utils import Report + from editor_python_test_tools.utils import Report Report.start_test(C15425929_Undo_Redo) diff --git a/AutomatedTesting/Gem/PythonTests/physics/C15425935_Material_LibraryUpdatedAcrossLevels.py b/AutomatedTesting/Gem/PythonTests/physics/C15425935_Material_LibraryUpdatedAcrossLevels.py index d2db2239c2..f61886ccd0 100755 --- a/AutomatedTesting/Gem/PythonTests/physics/C15425935_Material_LibraryUpdatedAcrossLevels.py +++ b/AutomatedTesting/Gem/PythonTests/physics/C15425935_Material_LibraryUpdatedAcrossLevels.py @@ -122,8 +122,8 @@ def C15425935_Material_LibraryUpdatedAcrossLevels(): imports.init() - from utils import Report - from utils import TestHelper as helper + 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 @@ -314,5 +314,5 @@ if __name__ == "__main__": import ImportPathHelper as imports imports.init() - from utils import Report + from editor_python_test_tools.utils import Report Report.start_test(C15425935_Material_LibraryUpdatedAcrossLevels) diff --git a/AutomatedTesting/Gem/PythonTests/physics/C15556261_PhysXMaterials_CharacterControllerMaterialAssignment.py b/AutomatedTesting/Gem/PythonTests/physics/C15556261_PhysXMaterials_CharacterControllerMaterialAssignment.py index cb38a8a768..99e0dcc669 100755 --- a/AutomatedTesting/Gem/PythonTests/physics/C15556261_PhysXMaterials_CharacterControllerMaterialAssignment.py +++ b/AutomatedTesting/Gem/PythonTests/physics/C15556261_PhysXMaterials_CharacterControllerMaterialAssignment.py @@ -88,8 +88,8 @@ def C15556261_PhysXMaterials_CharacterControllerMaterialAssignment(): imports.init() - from utils import Report - from utils import TestHelper as helper + 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 @@ -209,5 +209,5 @@ if __name__ == "__main__": import ImportPathHelper as imports imports.init() - from utils import Report + from editor_python_test_tools.utils import Report Report.start_test(C15556261_PhysXMaterials_CharacterControllerMaterialAssignment) diff --git a/AutomatedTesting/Gem/PythonTests/physics/C15563573_Material_AddModifyDeleteOnCharacterController.py b/AutomatedTesting/Gem/PythonTests/physics/C15563573_Material_AddModifyDeleteOnCharacterController.py index 8b0fba05b1..4572dd322a 100755 --- a/AutomatedTesting/Gem/PythonTests/physics/C15563573_Material_AddModifyDeleteOnCharacterController.py +++ b/AutomatedTesting/Gem/PythonTests/physics/C15563573_Material_AddModifyDeleteOnCharacterController.py @@ -116,14 +116,13 @@ def C15563573_Material_AddModifyDeleteOnCharacterController(): imports.init() - import azlmbr.legacy.general as general import azlmbr.math as lymath from Physmaterial_Editor import Physmaterial_Editor - from utils import Report - from utils import TestHelper as helper from AddModifyDelete_Utils import Box + from editor_python_test_tools.utils import Report + from editor_python_test_tools.utils import TestHelper as helper FORCE_IMPULSE = lymath.Vector3(5.0, 0.0, 0.0) TIMEOUT = 3.0 @@ -205,5 +204,5 @@ if __name__ == "__main__": import ImportPathHelper as imports imports.init() - from utils import Report + from editor_python_test_tools.utils import Report Report.start_test(C15563573_Material_AddModifyDeleteOnCharacterController) diff --git a/AutomatedTesting/Gem/PythonTests/physics/C15845879_ForceRegion_HighLinearDampingForce.py b/AutomatedTesting/Gem/PythonTests/physics/C15845879_ForceRegion_HighLinearDampingForce.py index 2eb7759ead..52af7d8be5 100755 --- a/AutomatedTesting/Gem/PythonTests/physics/C15845879_ForceRegion_HighLinearDampingForce.py +++ b/AutomatedTesting/Gem/PythonTests/physics/C15845879_ForceRegion_HighLinearDampingForce.py @@ -65,9 +65,8 @@ def C15845879_ForceRegion_HighLinearDampingForce(): imports.init() - - from utils import Report - from utils import TestHelper as helper + 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 @@ -177,5 +176,5 @@ if __name__ == "__main__": import ImportPathHelper as imports imports.init() - from utils import Report + from editor_python_test_tools.utils import Report Report.start_test(C15845879_ForceRegion_HighLinearDampingForce) diff --git a/AutomatedTesting/Gem/PythonTests/physics/C17411467_AddPhysxRagdollComponent.py b/AutomatedTesting/Gem/PythonTests/physics/C17411467_AddPhysxRagdollComponent.py index a3115ceeab..68efd452b2 100755 --- a/AutomatedTesting/Gem/PythonTests/physics/C17411467_AddPhysxRagdollComponent.py +++ b/AutomatedTesting/Gem/PythonTests/physics/C17411467_AddPhysxRagdollComponent.py @@ -53,10 +53,10 @@ def run(): import ImportPathHelper as imports imports.init() - from utils import Report - from utils import TestHelper as helper - from utils import Tracer - from editor_entity_utils import EditorEntity + from editor_python_test_tools.utils import Report + from editor_python_test_tools.editor_entity_utils import EditorEntity + from editor_python_test_tools.utils import TestHelper as helper + from editor_python_test_tools.utils import Tracer helper.init_idle() # 1) Load the level diff --git a/AutomatedTesting/Gem/PythonTests/physics/C18243580_Joints_Fixed2BodiesConstrained.py b/AutomatedTesting/Gem/PythonTests/physics/C18243580_Joints_Fixed2BodiesConstrained.py index 76b05a4ce9..b13869ce12 100755 --- a/AutomatedTesting/Gem/PythonTests/physics/C18243580_Joints_Fixed2BodiesConstrained.py +++ b/AutomatedTesting/Gem/PythonTests/physics/C18243580_Joints_Fixed2BodiesConstrained.py @@ -58,9 +58,8 @@ def C18243580_Joints_Fixed2BodiesConstrained(): imports.init() - - from utils import Report - from utils import TestHelper as helper + 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 @@ -107,5 +106,5 @@ if __name__ == "__main__": import ImportPathHelper as imports imports.init() - from utils import Report + from editor_python_test_tools.utils import Report Report.start_test(C18243580_Joints_Fixed2BodiesConstrained) diff --git a/AutomatedTesting/Gem/PythonTests/physics/C18243581_Joints_FixedBreakable.py b/AutomatedTesting/Gem/PythonTests/physics/C18243581_Joints_FixedBreakable.py index ffc48f6e3c..19feee575b 100755 --- a/AutomatedTesting/Gem/PythonTests/physics/C18243581_Joints_FixedBreakable.py +++ b/AutomatedTesting/Gem/PythonTests/physics/C18243581_Joints_FixedBreakable.py @@ -57,9 +57,8 @@ def C18243581_Joints_FixedBreakable(): imports.init() - - from utils import Report - from utils import TestHelper as helper + 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 @@ -106,5 +105,5 @@ if __name__ == "__main__": import ImportPathHelper as imports imports.init() - from utils import Report + from editor_python_test_tools.utils import Report Report.start_test(C18243581_Joints_FixedBreakable) diff --git a/AutomatedTesting/Gem/PythonTests/physics/C18243582_Joints_FixedLeadFollowerCollide.py b/AutomatedTesting/Gem/PythonTests/physics/C18243582_Joints_FixedLeadFollowerCollide.py index 6c0f98b694..c9c90d35a7 100755 --- a/AutomatedTesting/Gem/PythonTests/physics/C18243582_Joints_FixedLeadFollowerCollide.py +++ b/AutomatedTesting/Gem/PythonTests/physics/C18243582_Joints_FixedLeadFollowerCollide.py @@ -59,9 +59,8 @@ def C18243582_Joints_FixedLeadFollowerCollide(): imports.init() - - from utils import Report - from utils import TestHelper as helper + 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 @@ -101,5 +100,5 @@ if __name__ == "__main__": import ImportPathHelper as imports imports.init() - from utils import Report + from editor_python_test_tools.utils import Report Report.start_test(C18243582_Joints_FixedLeadFollowerCollide) diff --git a/AutomatedTesting/Gem/PythonTests/physics/C18243583_Joints_Hinge2BodiesConstrained.py b/AutomatedTesting/Gem/PythonTests/physics/C18243583_Joints_Hinge2BodiesConstrained.py index fd1fb02557..66343534a7 100755 --- a/AutomatedTesting/Gem/PythonTests/physics/C18243583_Joints_Hinge2BodiesConstrained.py +++ b/AutomatedTesting/Gem/PythonTests/physics/C18243583_Joints_Hinge2BodiesConstrained.py @@ -61,9 +61,8 @@ def C18243583_Joints_Hinge2BodiesConstrained(): imports.init() - - from utils import Report - from utils import TestHelper as helper + 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 @@ -124,5 +123,5 @@ if __name__ == "__main__": import ImportPathHelper as imports imports.init() - from utils import Report + from editor_python_test_tools.utils import Report Report.start_test(C18243583_Joints_Hinge2BodiesConstrained) diff --git a/AutomatedTesting/Gem/PythonTests/physics/C18243584_Joints_HingeSoftLimitsConstrained.py b/AutomatedTesting/Gem/PythonTests/physics/C18243584_Joints_HingeSoftLimitsConstrained.py index c1ed3328a7..3b335cc5c6 100755 --- a/AutomatedTesting/Gem/PythonTests/physics/C18243584_Joints_HingeSoftLimitsConstrained.py +++ b/AutomatedTesting/Gem/PythonTests/physics/C18243584_Joints_HingeSoftLimitsConstrained.py @@ -61,9 +61,8 @@ def C18243584_Joints_HingeSoftLimitsConstrained(): imports.init() - - from utils import Report - from utils import TestHelper as helper + 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 @@ -120,5 +119,5 @@ if __name__ == "__main__": import ImportPathHelper as imports imports.init() - from utils import Report + from editor_python_test_tools.utils import Report Report.start_test(C18243584_Joints_HingeSoftLimitsConstrained) diff --git a/AutomatedTesting/Gem/PythonTests/physics/C18243585_Joints_HingeNoLimitsConstrained.py b/AutomatedTesting/Gem/PythonTests/physics/C18243585_Joints_HingeNoLimitsConstrained.py index 515c51eb0b..289522fcac 100755 --- a/AutomatedTesting/Gem/PythonTests/physics/C18243585_Joints_HingeNoLimitsConstrained.py +++ b/AutomatedTesting/Gem/PythonTests/physics/C18243585_Joints_HingeNoLimitsConstrained.py @@ -61,9 +61,8 @@ def C18243585_Joints_HingeNoLimitsConstrained(): imports.init() - - from utils import Report - from utils import TestHelper as helper + 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 @@ -120,5 +119,5 @@ if __name__ == "__main__": import ImportPathHelper as imports imports.init() - from utils import Report + from editor_python_test_tools.utils import Report Report.start_test(C18243585_Joints_HingeNoLimitsConstrained) diff --git a/AutomatedTesting/Gem/PythonTests/physics/C18243586_Joints_HingeLeadFollowerCollide.py b/AutomatedTesting/Gem/PythonTests/physics/C18243586_Joints_HingeLeadFollowerCollide.py index d673885ea1..60b9189c83 100755 --- a/AutomatedTesting/Gem/PythonTests/physics/C18243586_Joints_HingeLeadFollowerCollide.py +++ b/AutomatedTesting/Gem/PythonTests/physics/C18243586_Joints_HingeLeadFollowerCollide.py @@ -58,9 +58,8 @@ def C18243586_Joints_HingeLeadFollowerCollide(): imports.init() - - from utils import Report - from utils import TestHelper as helper + 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 @@ -100,5 +99,5 @@ if __name__ == "__main__": import ImportPathHelper as imports imports.init() - from utils import Report + from editor_python_test_tools.utils import Report Report.start_test(C18243586_Joints_HingeLeadFollowerCollide) diff --git a/AutomatedTesting/Gem/PythonTests/physics/C18243587_Joints_HingeBreakable.py b/AutomatedTesting/Gem/PythonTests/physics/C18243587_Joints_HingeBreakable.py index d58d618b99..af6fa8cbac 100755 --- a/AutomatedTesting/Gem/PythonTests/physics/C18243587_Joints_HingeBreakable.py +++ b/AutomatedTesting/Gem/PythonTests/physics/C18243587_Joints_HingeBreakable.py @@ -59,9 +59,8 @@ def C18243587_Joints_HingeBreakable(): imports.init() - - from utils import Report - from utils import TestHelper as helper + 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 @@ -118,5 +117,5 @@ if __name__ == "__main__": import ImportPathHelper as imports imports.init() - from utils import Report + from editor_python_test_tools.utils import Report Report.start_test(C18243587_Joints_HingeBreakable) diff --git a/AutomatedTesting/Gem/PythonTests/physics/C18243588_Joints_Ball2BodiesConstrained.py b/AutomatedTesting/Gem/PythonTests/physics/C18243588_Joints_Ball2BodiesConstrained.py index 1ead30c65e..074ca03000 100755 --- a/AutomatedTesting/Gem/PythonTests/physics/C18243588_Joints_Ball2BodiesConstrained.py +++ b/AutomatedTesting/Gem/PythonTests/physics/C18243588_Joints_Ball2BodiesConstrained.py @@ -60,9 +60,8 @@ def C18243588_Joints_Ball2BodiesConstrained(): imports.init() - - from utils import Report - from utils import TestHelper as helper + 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 @@ -122,5 +121,5 @@ if __name__ == "__main__": import ImportPathHelper as imports imports.init() - from utils import Report + from editor_python_test_tools.utils import Report Report.start_test(C18243588_Joints_Ball2BodiesConstrained) diff --git a/AutomatedTesting/Gem/PythonTests/physics/C18243589_Joints_BallSoftLimitsConstrained.py b/AutomatedTesting/Gem/PythonTests/physics/C18243589_Joints_BallSoftLimitsConstrained.py index d29c472fcd..e038b33043 100755 --- a/AutomatedTesting/Gem/PythonTests/physics/C18243589_Joints_BallSoftLimitsConstrained.py +++ b/AutomatedTesting/Gem/PythonTests/physics/C18243589_Joints_BallSoftLimitsConstrained.py @@ -62,9 +62,8 @@ def C18243589_Joints_BallSoftLimitsConstrained(): imports.init() - - from utils import Report - from utils import TestHelper as helper + 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 @@ -123,5 +122,5 @@ if __name__ == "__main__": import ImportPathHelper as imports imports.init() - from utils import Report + from editor_python_test_tools.utils import Report Report.start_test(C18243589_Joints_BallSoftLimitsConstrained) diff --git a/AutomatedTesting/Gem/PythonTests/physics/C18243590_Joints_BallNoLimitsConstrained.py b/AutomatedTesting/Gem/PythonTests/physics/C18243590_Joints_BallNoLimitsConstrained.py index d3a0c8e82c..ede46fd5c5 100755 --- a/AutomatedTesting/Gem/PythonTests/physics/C18243590_Joints_BallNoLimitsConstrained.py +++ b/AutomatedTesting/Gem/PythonTests/physics/C18243590_Joints_BallNoLimitsConstrained.py @@ -63,9 +63,8 @@ def C18243590_Joints_BallNoLimitsConstrained(): imports.init() - - from utils import Report - from utils import TestHelper as helper + 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 @@ -121,5 +120,5 @@ if __name__ == "__main__": import ImportPathHelper as imports imports.init() - from utils import Report + from editor_python_test_tools.utils import Report Report.start_test(C18243590_Joints_BallNoLimitsConstrained) diff --git a/AutomatedTesting/Gem/PythonTests/physics/C18243591_Joints_BallLeadFollowerCollide.py b/AutomatedTesting/Gem/PythonTests/physics/C18243591_Joints_BallLeadFollowerCollide.py index ba8967acab..c3e527956f 100755 --- a/AutomatedTesting/Gem/PythonTests/physics/C18243591_Joints_BallLeadFollowerCollide.py +++ b/AutomatedTesting/Gem/PythonTests/physics/C18243591_Joints_BallLeadFollowerCollide.py @@ -58,9 +58,8 @@ def C18243591_Joints_BallLeadFollowerCollide(): imports.init() - - from utils import Report - from utils import TestHelper as helper + 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 @@ -100,5 +99,5 @@ if __name__ == "__main__": import ImportPathHelper as imports imports.init() - from utils import Report + from editor_python_test_tools.utils import Report Report.start_test(C18243591_Joints_BallLeadFollowerCollide) diff --git a/AutomatedTesting/Gem/PythonTests/physics/C18243592_Joints_BallBreakable.py b/AutomatedTesting/Gem/PythonTests/physics/C18243592_Joints_BallBreakable.py index 2b07d63a43..350fccd125 100755 --- a/AutomatedTesting/Gem/PythonTests/physics/C18243592_Joints_BallBreakable.py +++ b/AutomatedTesting/Gem/PythonTests/physics/C18243592_Joints_BallBreakable.py @@ -58,9 +58,8 @@ def C18243592_Joints_BallBreakable(): imports.init() - - from utils import Report - from utils import TestHelper as helper + 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 @@ -116,5 +115,5 @@ if __name__ == "__main__": import ImportPathHelper as imports imports.init() - from utils import Report + from editor_python_test_tools.utils import Report Report.start_test(C18243592_Joints_BallBreakable) diff --git a/AutomatedTesting/Gem/PythonTests/physics/C18243593_Joints_GlobalFrameConstrained.py b/AutomatedTesting/Gem/PythonTests/physics/C18243593_Joints_GlobalFrameConstrained.py index 1ebdaf73b3..4580a229ea 100755 --- a/AutomatedTesting/Gem/PythonTests/physics/C18243593_Joints_GlobalFrameConstrained.py +++ b/AutomatedTesting/Gem/PythonTests/physics/C18243593_Joints_GlobalFrameConstrained.py @@ -62,9 +62,8 @@ def C18243593_Joints_GlobalFrameConstrained(): imports.init() - - from utils import Report - from utils import TestHelper as helper + 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 @@ -129,5 +128,5 @@ if __name__ == "__main__": import ImportPathHelper as imports imports.init() - from utils import Report + from editor_python_test_tools.utils import Report Report.start_test(C18243593_Joints_GlobalFrameConstrained) diff --git a/AutomatedTesting/Gem/PythonTests/physics/C18977601_Material_FrictionCombinePriority.py b/AutomatedTesting/Gem/PythonTests/physics/C18977601_Material_FrictionCombinePriority.py index 46f1535bf4..57dfc0f349 100755 --- a/AutomatedTesting/Gem/PythonTests/physics/C18977601_Material_FrictionCombinePriority.py +++ b/AutomatedTesting/Gem/PythonTests/physics/C18977601_Material_FrictionCombinePriority.py @@ -136,8 +136,8 @@ def C18977601_Material_FrictionCombinePriority(): imports.init() - from utils import Report - from utils import TestHelper as helper + from editor_python_test_tools.utils import Report + from editor_python_test_tools.utils import TestHelper as helper import azlmbr import azlmbr.legacy.general as general @@ -364,5 +364,5 @@ if __name__ == "__main__": import ImportPathHelper as imports imports.init() - from utils import Report + from editor_python_test_tools.utils import Report Report.start_test(C18977601_Material_FrictionCombinePriority) diff --git a/AutomatedTesting/Gem/PythonTests/physics/C18981526_Material_RestitutionCombinePriority.py b/AutomatedTesting/Gem/PythonTests/physics/C18981526_Material_RestitutionCombinePriority.py index 800ad38264..9b7fea1ab9 100755 --- a/AutomatedTesting/Gem/PythonTests/physics/C18981526_Material_RestitutionCombinePriority.py +++ b/AutomatedTesting/Gem/PythonTests/physics/C18981526_Material_RestitutionCombinePriority.py @@ -135,9 +135,8 @@ def C18981526_Material_RestitutionCombinePriority(): imports.init() - - from utils import Report - from utils import TestHelper as helper + from editor_python_test_tools.utils import Report + from editor_python_test_tools.utils import TestHelper as helper import azlmbr import azlmbr.legacy.general as general @@ -425,5 +424,5 @@ if __name__ == "__main__": import ImportPathHelper as imports imports.init() - from utils import Report + from editor_python_test_tools.utils import Report Report.start_test(C18981526_Material_RestitutionCombinePriority) diff --git a/AutomatedTesting/Gem/PythonTests/physics/C19536274_GetCollisionName_PrintsName.py b/AutomatedTesting/Gem/PythonTests/physics/C19536274_GetCollisionName_PrintsName.py index 8dbee3cd4e..48c947aa1f 100755 --- a/AutomatedTesting/Gem/PythonTests/physics/C19536274_GetCollisionName_PrintsName.py +++ b/AutomatedTesting/Gem/PythonTests/physics/C19536274_GetCollisionName_PrintsName.py @@ -50,9 +50,9 @@ def run(): import ImportPathHelper as imports imports.init() - from utils import Report - from utils import TestHelper as helper - from editor_entity_utils import EditorEntity as Entity + from editor_python_test_tools.utils import Report + from editor_python_test_tools.editor_entity_utils import EditorEntity as Entity + from editor_python_test_tools.utils import TestHelper as helper ACTIVE_STATUS = azlmbr.globals.property.EditorEntityStartStatus_StartActive diff --git a/AutomatedTesting/Gem/PythonTests/physics/C19536277_GetCollisionName_PrintsNothing.py b/AutomatedTesting/Gem/PythonTests/physics/C19536277_GetCollisionName_PrintsNothing.py index 141c9fb4db..66e1302b5b 100755 --- a/AutomatedTesting/Gem/PythonTests/physics/C19536277_GetCollisionName_PrintsNothing.py +++ b/AutomatedTesting/Gem/PythonTests/physics/C19536277_GetCollisionName_PrintsNothing.py @@ -50,9 +50,9 @@ def run(): import ImportPathHelper as imports imports.init() - from utils import Report - from utils import TestHelper as helper - from editor_entity_utils import EditorEntity as Entity + from editor_python_test_tools.utils import Report + from editor_python_test_tools.editor_entity_utils import EditorEntity as Entity + from editor_python_test_tools.utils import TestHelper as helper ACTIVE_STATUS = azlmbr.globals.property.EditorEntityStartStatus_StartActive diff --git a/AutomatedTesting/Gem/PythonTests/physics/C19578018_ShapeColliderWithNoShapeComponent.py b/AutomatedTesting/Gem/PythonTests/physics/C19578018_ShapeColliderWithNoShapeComponent.py index 8910a4ded4..32ece8541c 100755 --- a/AutomatedTesting/Gem/PythonTests/physics/C19578018_ShapeColliderWithNoShapeComponent.py +++ b/AutomatedTesting/Gem/PythonTests/physics/C19578018_ShapeColliderWithNoShapeComponent.py @@ -56,9 +56,9 @@ def C19578018_ShapeColliderWithNoShapeComponent(): imports.init() # Helper Imports - from utils import Report - from utils import TestHelper as helper - from editor_entity_utils import EditorEntity + from editor_python_test_tools.utils import Report + from editor_python_test_tools.editor_entity_utils import EditorEntity + from editor_python_test_tools.utils import TestHelper as helper # Open 3D Engine Imports import azlmbr.bus as bus @@ -99,5 +99,5 @@ if __name__ == "__main__": import ImportPathHelper as imports imports.init() - from utils import Report + from editor_python_test_tools.utils import Report Report.start_test(C19578018_ShapeColliderWithNoShapeComponent) diff --git a/AutomatedTesting/Gem/PythonTests/physics/C19578021_ShapeCollider_CanBeAdded.py b/AutomatedTesting/Gem/PythonTests/physics/C19578021_ShapeCollider_CanBeAdded.py index 5c940264ff..0c42f5457d 100755 --- a/AutomatedTesting/Gem/PythonTests/physics/C19578021_ShapeCollider_CanBeAdded.py +++ b/AutomatedTesting/Gem/PythonTests/physics/C19578021_ShapeCollider_CanBeAdded.py @@ -51,10 +51,10 @@ def C19578021_ShapeCollider_CanBeAdded(): import ImportPathHelper as imports imports.init() - from utils import Report - from utils import TestHelper as helper - from utils import Tracer - from editor_entity_utils import EditorEntity as Entity + from editor_python_test_tools.editor_entity_utils import EditorEntity as Entity + from editor_python_test_tools.utils import Report + from editor_python_test_tools.utils import TestHelper as helper + from editor_python_test_tools.utils import Tracer # Open 3D Engine Imports import azlmbr.legacy.general as general @@ -97,5 +97,5 @@ if __name__ == "__main__": import ImportPathHelper as imports imports.init() - from utils import Report + from editor_python_test_tools.utils import Report Report.start_test(C19578021_ShapeCollider_CanBeAdded) diff --git a/AutomatedTesting/Gem/PythonTests/physics/C19723164_ShapeColliders_WontCrashEditor.py b/AutomatedTesting/Gem/PythonTests/physics/C19723164_ShapeColliders_WontCrashEditor.py index 3296b32fc9..769f08e3c4 100755 --- a/AutomatedTesting/Gem/PythonTests/physics/C19723164_ShapeColliders_WontCrashEditor.py +++ b/AutomatedTesting/Gem/PythonTests/physics/C19723164_ShapeColliders_WontCrashEditor.py @@ -47,9 +47,9 @@ def C19723164_ShapeColliders_WontCrashEditor(): import ImportPathHelper as imports imports.init() - from utils import Report - from utils import TestHelper as helper - from editor_entity_utils import EditorEntity as Entity + from editor_python_test_tools.utils import Report + from editor_python_test_tools.utils import TestHelper as helper + from editor_python_test_tools.editor_entity_utils import EditorEntity as Entity # Open 3D Engine Imports import azlmbr.legacy.general as general @@ -103,5 +103,5 @@ if __name__ == "__main__": import ImportPathHelper as imports imports.init() - from utils import Report + from editor_python_test_tools.utils import Report Report.start_test(C19723164_ShapeColliders_WontCrashEditor) diff --git a/AutomatedTesting/Gem/PythonTests/physics/C24308873_CylinderShapeCollider_CollidesWithPhysXTerrain.py b/AutomatedTesting/Gem/PythonTests/physics/C24308873_CylinderShapeCollider_CollidesWithPhysXTerrain.py index b879e37aa9..d8e0a6769c 100755 --- a/AutomatedTesting/Gem/PythonTests/physics/C24308873_CylinderShapeCollider_CollidesWithPhysXTerrain.py +++ b/AutomatedTesting/Gem/PythonTests/physics/C24308873_CylinderShapeCollider_CollidesWithPhysXTerrain.py @@ -57,8 +57,8 @@ def C24308873_CylinderShapeCollider_CollidesWithPhysXTerrain(): import azlmbr.legacy.general as general import azlmbr.bus - from utils import Report - from utils import TestHelper as helper + from editor_python_test_tools.utils import Report + from editor_python_test_tools.utils import TestHelper as helper # Global time out TIME_OUT = 1.0 @@ -119,5 +119,5 @@ if __name__ == "__main__": import ImportPathHelper as imports imports.init() - from utils import Report + from editor_python_test_tools.utils import Report Report.start_test(C24308873_CylinderShapeCollider_CollidesWithPhysXTerrain) diff --git a/AutomatedTesting/Gem/PythonTests/physics/C28978033_Ragdoll_WorldBodyBusTests.py b/AutomatedTesting/Gem/PythonTests/physics/C28978033_Ragdoll_WorldBodyBusTests.py index 9f595616e7..8980e68250 100755 --- a/AutomatedTesting/Gem/PythonTests/physics/C28978033_Ragdoll_WorldBodyBusTests.py +++ b/AutomatedTesting/Gem/PythonTests/physics/C28978033_Ragdoll_WorldBodyBusTests.py @@ -56,9 +56,9 @@ def C28978033_Ragdoll_WorldBodyBusTests(): import azlmbr.legacy.general as general import azlmbr.bus - from utils import Report - from utils import TestHelper as helper - from utils import vector3_str, aabb_str + from editor_python_test_tools.utils import Report + from editor_python_test_tools.utils import TestHelper as helper + from editor_python_test_tools.utils import vector3_str, aabb_str # Global time out TIME_OUT = 1.0 @@ -123,5 +123,5 @@ if __name__ == "__main__": import ImportPathHelper as imports imports.init() - from utils import Report + from editor_python_test_tools.utils import Report Report.start_test(C28978033_Ragdoll_WorldBodyBusTests) diff --git a/AutomatedTesting/Gem/PythonTests/physics/C29032500_EditorComponents_WorldBodyBusWorks.py b/AutomatedTesting/Gem/PythonTests/physics/C29032500_EditorComponents_WorldBodyBusWorks.py index 2dc9a306c7..be541e4bf9 100755 --- a/AutomatedTesting/Gem/PythonTests/physics/C29032500_EditorComponents_WorldBodyBusWorks.py +++ b/AutomatedTesting/Gem/PythonTests/physics/C29032500_EditorComponents_WorldBodyBusWorks.py @@ -94,9 +94,9 @@ def C29032500_EditorComponents_WorldBodyBusWorks(): import azlmbr.legacy.general as general import azlmbr.bus import math - from utils import Report - from utils import TestHelper as helper - from utils import vector3_str, aabb_str + from editor_python_test_tools.utils import Report + from editor_python_test_tools.utils import TestHelper as helper + from editor_python_test_tools.utils import vector3_str, aabb_str AABB_THRESHOLD = 0.01 # Entities won't move in the simulation @@ -161,5 +161,5 @@ if __name__ == "__main__": import ImportPathHelper as imports imports.init() - from utils import Report + from editor_python_test_tools.utils import Report Report.start_test(C29032500_EditorComponents_WorldBodyBusWorks) diff --git a/AutomatedTesting/Gem/PythonTests/physics/C3510642_Terrain_NotCollideWithTerrain.py b/AutomatedTesting/Gem/PythonTests/physics/C3510642_Terrain_NotCollideWithTerrain.py index 086f045eec..3e3770adb9 100755 --- a/AutomatedTesting/Gem/PythonTests/physics/C3510642_Terrain_NotCollideWithTerrain.py +++ b/AutomatedTesting/Gem/PythonTests/physics/C3510642_Terrain_NotCollideWithTerrain.py @@ -74,12 +74,11 @@ def C3510642_Terrain_NotCollideWithTerrain(): imports.init() - import azlmbr.legacy.general as general import azlmbr.bus - from utils import Report - from utils import TestHelper as helper + from editor_python_test_tools.utils import Report + from editor_python_test_tools.utils import TestHelper as helper # Constants TIMEOUT = 2.0 @@ -176,5 +175,5 @@ if __name__ == "__main__": import ImportPathHelper as imports imports.init() - from utils import Report + from editor_python_test_tools.utils import Report Report.start_test(C3510642_Terrain_NotCollideWithTerrain) diff --git a/AutomatedTesting/Gem/PythonTests/physics/C3510644_Collider_CollisionGroups.py b/AutomatedTesting/Gem/PythonTests/physics/C3510644_Collider_CollisionGroups.py index 765f7cbfe0..4ae10288bd 100755 --- a/AutomatedTesting/Gem/PythonTests/physics/C3510644_Collider_CollisionGroups.py +++ b/AutomatedTesting/Gem/PythonTests/physics/C3510644_Collider_CollisionGroups.py @@ -100,8 +100,8 @@ def C3510644_Collider_CollisionGroups(): imports.init() - from utils import Report - from utils import TestHelper as helper + 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 @@ -370,5 +370,5 @@ if __name__ == "__main__": import ImportPathHelper as imports imports.init() - from utils import Report + from editor_python_test_tools.utils import Report Report.start_test(C3510644_Collider_CollisionGroups) diff --git a/AutomatedTesting/Gem/PythonTests/physics/C4044455_Material_libraryChangesInstantly.py b/AutomatedTesting/Gem/PythonTests/physics/C4044455_Material_libraryChangesInstantly.py index aae538527a..5f2c40f11e 100755 --- a/AutomatedTesting/Gem/PythonTests/physics/C4044455_Material_libraryChangesInstantly.py +++ b/AutomatedTesting/Gem/PythonTests/physics/C4044455_Material_libraryChangesInstantly.py @@ -182,9 +182,8 @@ def C4044455_Material_libraryChangesInstantly(): imports.init() - - from utils import Report - from utils import TestHelper as helper + 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 @@ -486,5 +485,5 @@ if __name__ == "__main__": import ImportPathHelper as imports imports.init() - from utils import Report + from editor_python_test_tools.utils import Report Report.start_test(C4044455_Material_libraryChangesInstantly) diff --git a/AutomatedTesting/Gem/PythonTests/physics/C4044456_Material_FrictionCombine.py b/AutomatedTesting/Gem/PythonTests/physics/C4044456_Material_FrictionCombine.py index 80b7c6443f..b71c1e8ede 100755 --- a/AutomatedTesting/Gem/PythonTests/physics/C4044456_Material_FrictionCombine.py +++ b/AutomatedTesting/Gem/PythonTests/physics/C4044456_Material_FrictionCombine.py @@ -100,9 +100,8 @@ def C4044456_Material_FrictionCombine(): imports.init() - - from utils import Report - from utils import TestHelper as helper + from editor_python_test_tools.utils import Report + from editor_python_test_tools.utils import TestHelper as helper import azlmbr import azlmbr.legacy.general as general @@ -221,5 +220,5 @@ if __name__ == "__main__": import ImportPathHelper as imports imports.init() - from utils import Report + from editor_python_test_tools.utils import Report Report.start_test(C4044456_Material_FrictionCombine) diff --git a/AutomatedTesting/Gem/PythonTests/physics/C4044457_Material_RestitutionCombine.py b/AutomatedTesting/Gem/PythonTests/physics/C4044457_Material_RestitutionCombine.py index 856a663fe6..1ed2e8086c 100755 --- a/AutomatedTesting/Gem/PythonTests/physics/C4044457_Material_RestitutionCombine.py +++ b/AutomatedTesting/Gem/PythonTests/physics/C4044457_Material_RestitutionCombine.py @@ -105,9 +105,8 @@ def C4044457_Material_RestitutionCombine(): imports.init() - - from utils import Report - from utils import TestHelper as helper + from editor_python_test_tools.utils import Report + from editor_python_test_tools.utils import TestHelper as helper import azlmbr import azlmbr.legacy.general as general @@ -253,5 +252,5 @@ if __name__ == "__main__": import ImportPathHelper as imports imports.init() - from utils import Report + from editor_python_test_tools.utils import Report Report.start_test(C4044457_Material_RestitutionCombine) diff --git a/AutomatedTesting/Gem/PythonTests/physics/C4044459_Material_DynamicFriction.py b/AutomatedTesting/Gem/PythonTests/physics/C4044459_Material_DynamicFriction.py index ab4a8c1574..c420250dfa 100755 --- a/AutomatedTesting/Gem/PythonTests/physics/C4044459_Material_DynamicFriction.py +++ b/AutomatedTesting/Gem/PythonTests/physics/C4044459_Material_DynamicFriction.py @@ -91,9 +91,8 @@ def C4044459_Material_DynamicFriction(): imports.init() - - from utils import Report - from utils import TestHelper as helper + from editor_python_test_tools.utils import Report + from editor_python_test_tools.utils import TestHelper as helper import azlmbr import azlmbr.legacy.general as general @@ -199,5 +198,5 @@ if __name__ == "__main__": import ImportPathHelper as imports imports.init() - from utils import Report + from editor_python_test_tools.utils import Report Report.start_test(C4044459_Material_DynamicFriction) diff --git a/AutomatedTesting/Gem/PythonTests/physics/C4044460_Material_StaticFriction.py b/AutomatedTesting/Gem/PythonTests/physics/C4044460_Material_StaticFriction.py index 9918c5fac6..4e330002ff 100755 --- a/AutomatedTesting/Gem/PythonTests/physics/C4044460_Material_StaticFriction.py +++ b/AutomatedTesting/Gem/PythonTests/physics/C4044460_Material_StaticFriction.py @@ -89,9 +89,8 @@ def C4044460_Material_StaticFriction(): imports.init() - - from utils import Report - from utils import TestHelper as helper + from editor_python_test_tools.utils import Report + from editor_python_test_tools.utils import TestHelper as helper import azlmbr import azlmbr.legacy.general as general @@ -196,5 +195,5 @@ if __name__ == "__main__": import ImportPathHelper as imports imports.init() - from utils import Report + from editor_python_test_tools.utils import Report Report.start_test(C4044460_Material_StaticFriction) diff --git a/AutomatedTesting/Gem/PythonTests/physics/C4044461_Material_Restitution.py b/AutomatedTesting/Gem/PythonTests/physics/C4044461_Material_Restitution.py index a11cfd47f6..af8990d87f 100755 --- a/AutomatedTesting/Gem/PythonTests/physics/C4044461_Material_Restitution.py +++ b/AutomatedTesting/Gem/PythonTests/physics/C4044461_Material_Restitution.py @@ -96,9 +96,8 @@ def C4044461_Material_Restitution(): imports.init() - - from utils import Report - from utils import TestHelper as helper + from editor_python_test_tools.utils import Report + from editor_python_test_tools.utils import TestHelper as helper import azlmbr import azlmbr.legacy.general as general @@ -238,5 +237,5 @@ if __name__ == "__main__": import ImportPathHelper as imports imports.init() - from utils import Report + from editor_python_test_tools.utils import Report Report.start_test(C4044461_Material_Restitution) diff --git a/AutomatedTesting/Gem/PythonTests/physics/C4044694_Material_EmptyLibraryUsesDefault.py b/AutomatedTesting/Gem/PythonTests/physics/C4044694_Material_EmptyLibraryUsesDefault.py index 3c3b777a69..a8375114d5 100755 --- a/AutomatedTesting/Gem/PythonTests/physics/C4044694_Material_EmptyLibraryUsesDefault.py +++ b/AutomatedTesting/Gem/PythonTests/physics/C4044694_Material_EmptyLibraryUsesDefault.py @@ -75,15 +75,14 @@ def C4044694_Material_EmptyLibraryUsesDefault(): imports.init() - import azlmbr.legacy.general as general import azlmbr.bus as bus import azlmbr.components import azlmbr.physics import azlmbr.math as lymath - from utils import Report - from utils import TestHelper as helper + from editor_python_test_tools.utils import Report + from editor_python_test_tools.utils import TestHelper as helper FORCE_IMPULSE = lymath.Vector3(5.0, 0.0, 0.0) TIMEOUT = 3.0 @@ -197,5 +196,5 @@ if __name__ == "__main__": import ImportPathHelper as imports imports.init() - from utils import Report + from editor_python_test_tools.utils import Report Report.start_test(C4044694_Material_EmptyLibraryUsesDefault) diff --git a/AutomatedTesting/Gem/PythonTests/physics/C4044695_PhysXCollider_AddMultipleSurfaceFbx.py b/AutomatedTesting/Gem/PythonTests/physics/C4044695_PhysXCollider_AddMultipleSurfaceFbx.py index cc2caaf3b6..a92927a9db 100755 --- a/AutomatedTesting/Gem/PythonTests/physics/C4044695_PhysXCollider_AddMultipleSurfaceFbx.py +++ b/AutomatedTesting/Gem/PythonTests/physics/C4044695_PhysXCollider_AddMultipleSurfaceFbx.py @@ -60,9 +60,9 @@ def run(): import ImportPathHelper as imports imports.init() - from utils import Report - from utils import TestHelper as helper - from editor_entity_utils import EditorEntity as Entity + from editor_python_test_tools.editor_entity_utils import EditorEntity as Entity + from editor_python_test_tools.utils import Report + from editor_python_test_tools.utils import TestHelper as helper from asset_utils import Asset # Constants diff --git a/AutomatedTesting/Gem/PythonTests/physics/C4044697_Material_PerfaceMaterialValidation.py b/AutomatedTesting/Gem/PythonTests/physics/C4044697_Material_PerfaceMaterialValidation.py index 46a6b04edf..dba759015f 100755 --- a/AutomatedTesting/Gem/PythonTests/physics/C4044697_Material_PerfaceMaterialValidation.py +++ b/AutomatedTesting/Gem/PythonTests/physics/C4044697_Material_PerfaceMaterialValidation.py @@ -116,9 +116,8 @@ def C4044697_Material_PerfaceMaterialValidation(): imports.init() - - from utils import Report - from utils import TestHelper as helper + 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 @@ -310,5 +309,5 @@ if __name__ == "__main__": import ImportPathHelper as imports imports.init() - from utils import Report + from editor_python_test_tools.utils import Report Report.start_test(C4044697_Material_PerfaceMaterialValidation) diff --git a/AutomatedTesting/Gem/PythonTests/physics/C4888315_Material_AddModifyDeleteOnCollider.py b/AutomatedTesting/Gem/PythonTests/physics/C4888315_Material_AddModifyDeleteOnCollider.py index 49673da217..145a5e1b60 100755 --- a/AutomatedTesting/Gem/PythonTests/physics/C4888315_Material_AddModifyDeleteOnCollider.py +++ b/AutomatedTesting/Gem/PythonTests/physics/C4888315_Material_AddModifyDeleteOnCollider.py @@ -99,13 +99,12 @@ def C4888315_Material_AddModifyDeleteOnCollider(): imports.init() - import azlmbr.legacy.general as general import azlmbr.math as lymath from Physmaterial_Editor import Physmaterial_Editor - from utils import Report - from utils import TestHelper as helper + from editor_python_test_tools.utils import Report + from editor_python_test_tools.utils import TestHelper as helper from AddModifyDelete_Utils import Box FORCE_IMPULSE = lymath.Vector3(5.0, 0.0, 0.0) @@ -184,5 +183,5 @@ if __name__ == "__main__": import ImportPathHelper as imports imports.init() - from utils import Report + from editor_python_test_tools.utils import Report Report.start_test(C4888315_Material_AddModifyDeleteOnCollider) diff --git a/AutomatedTesting/Gem/PythonTests/physics/C4925577_Materials_MaterialAssignedToTerrain.py b/AutomatedTesting/Gem/PythonTests/physics/C4925577_Materials_MaterialAssignedToTerrain.py index 80a83e0222..59b6a3fdfc 100755 --- a/AutomatedTesting/Gem/PythonTests/physics/C4925577_Materials_MaterialAssignedToTerrain.py +++ b/AutomatedTesting/Gem/PythonTests/physics/C4925577_Materials_MaterialAssignedToTerrain.py @@ -85,9 +85,8 @@ def C4925577_Materials_MaterialAssignedToTerrain(): imports.init() - - from utils import Report - from utils import TestHelper as helper + 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 @@ -313,5 +312,5 @@ if __name__ == "__main__": import ImportPathHelper as imports imports.init() - from utils import Report + from editor_python_test_tools.utils import Report Report.start_test(C4925577_Materials_MaterialAssignedToTerrain) diff --git a/AutomatedTesting/Gem/PythonTests/physics/C4925579_Material_AddModifyDeleteOnTerrain.py b/AutomatedTesting/Gem/PythonTests/physics/C4925579_Material_AddModifyDeleteOnTerrain.py index 87f94c6dd4..e0425c35be 100755 --- a/AutomatedTesting/Gem/PythonTests/physics/C4925579_Material_AddModifyDeleteOnTerrain.py +++ b/AutomatedTesting/Gem/PythonTests/physics/C4925579_Material_AddModifyDeleteOnTerrain.py @@ -100,13 +100,12 @@ def C4925579_Material_AddModifyDeleteOnTerrain(): imports.init() - import azlmbr.legacy.general as general import azlmbr.math as lymath from Physmaterial_Editor import Physmaterial_Editor - from utils import Report - from utils import TestHelper as helper + from editor_python_test_tools.utils import Report + from editor_python_test_tools.utils import TestHelper as helper from AddModifyDelete_Utils import Box FORCE_IMPULSE = lymath.Vector3(5.0, 0.0, 0.0) @@ -184,5 +183,5 @@ if __name__ == "__main__": import ImportPathHelper as imports imports.init() - from utils import Report + from editor_python_test_tools.utils import Report Report.start_test(C4925579_Material_AddModifyDeleteOnTerrain) diff --git a/AutomatedTesting/Gem/PythonTests/physics/C4925580_Material_RagdollBonesMaterial.py b/AutomatedTesting/Gem/PythonTests/physics/C4925580_Material_RagdollBonesMaterial.py index abb97da143..9944a033e3 100755 --- a/AutomatedTesting/Gem/PythonTests/physics/C4925580_Material_RagdollBonesMaterial.py +++ b/AutomatedTesting/Gem/PythonTests/physics/C4925580_Material_RagdollBonesMaterial.py @@ -75,13 +75,12 @@ def C4925580_Material_RagdollBonesMaterial(): imports.init() - import azlmbr.legacy.general as general import azlmbr.bus import azlmbr.components import azlmbr.physics - from utils import Report - from utils import TestHelper as helper + from editor_python_test_tools.utils import Report + from editor_python_test_tools.utils import TestHelper as helper # Constants TIME_OUT_SECONDS = 3.0 @@ -202,5 +201,5 @@ if __name__ == "__main__": import ImportPathHelper as imports imports.init() - from utils import Report + from editor_python_test_tools.utils import Report Report.start_test(C4925580_Material_RagdollBonesMaterial) diff --git a/AutomatedTesting/Gem/PythonTests/physics/C4925582_Material_AddModifyDeleteOnRagdollBones.py b/AutomatedTesting/Gem/PythonTests/physics/C4925582_Material_AddModifyDeleteOnRagdollBones.py index 0a309133a4..ed872ae99e 100755 --- a/AutomatedTesting/Gem/PythonTests/physics/C4925582_Material_AddModifyDeleteOnRagdollBones.py +++ b/AutomatedTesting/Gem/PythonTests/physics/C4925582_Material_AddModifyDeleteOnRagdollBones.py @@ -101,7 +101,6 @@ def C4925582_Material_AddModifyDeleteOnRagdollBones(): imports.init() - import azlmbr.legacy.general as general import azlmbr.bus as bus import azlmbr.components @@ -109,8 +108,8 @@ def C4925582_Material_AddModifyDeleteOnRagdollBones(): import azlmbr.math as lymath from Physmaterial_Editor import Physmaterial_Editor - from utils import Report - from utils import TestHelper as helper + from editor_python_test_tools.utils import Report + from editor_python_test_tools.utils import TestHelper as helper TIMEOUT = 3.0 BOUNCE_TOLERANCE = 0.05 @@ -220,5 +219,5 @@ if __name__ == "__main__": import ImportPathHelper as imports imports.init() - from utils import Report + from editor_python_test_tools.utils import Report Report.start_test(C4925582_Material_AddModifyDeleteOnRagdollBones) diff --git a/AutomatedTesting/Gem/PythonTests/physics/C4976194_RigidBody_PhysXComponentIsValid.py b/AutomatedTesting/Gem/PythonTests/physics/C4976194_RigidBody_PhysXComponentIsValid.py index 90feb352b3..aa059eb224 100755 --- a/AutomatedTesting/Gem/PythonTests/physics/C4976194_RigidBody_PhysXComponentIsValid.py +++ b/AutomatedTesting/Gem/PythonTests/physics/C4976194_RigidBody_PhysXComponentIsValid.py @@ -62,9 +62,8 @@ def C4976194_RigidBody_PhysXComponentIsValid(): imports.init() - - from utils import Report - from utils import TestHelper as helper + 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 @@ -118,5 +117,5 @@ if __name__ == "__main__": import ImportPathHelper as imports imports.init() - from utils import Report + from editor_python_test_tools.utils import Report Report.start_test(C4976194_RigidBody_PhysXComponentIsValid) diff --git a/AutomatedTesting/Gem/PythonTests/physics/C4976195_RigidBodies_InitialLinearVelocity.py b/AutomatedTesting/Gem/PythonTests/physics/C4976195_RigidBodies_InitialLinearVelocity.py index 287bc75214..c5740b2798 100755 --- a/AutomatedTesting/Gem/PythonTests/physics/C4976195_RigidBodies_InitialLinearVelocity.py +++ b/AutomatedTesting/Gem/PythonTests/physics/C4976195_RigidBodies_InitialLinearVelocity.py @@ -67,8 +67,8 @@ def C4976195_RigidBodies_InitialLinearVelocity(): imports.init() - from utils import Report - from utils import TestHelper as helper + 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 @@ -139,5 +139,5 @@ if __name__ == "__main__": import ImportPathHelper as imports imports.init() - from utils import Report + from editor_python_test_tools.utils import Report Report.start_test(C4976195_RigidBodies_InitialLinearVelocity) diff --git a/AutomatedTesting/Gem/PythonTests/physics/C4976197_RigidBodies_InitialAngularVelocity.py b/AutomatedTesting/Gem/PythonTests/physics/C4976197_RigidBodies_InitialAngularVelocity.py index 82b8df29f7..08e171269e 100755 --- a/AutomatedTesting/Gem/PythonTests/physics/C4976197_RigidBodies_InitialAngularVelocity.py +++ b/AutomatedTesting/Gem/PythonTests/physics/C4976197_RigidBodies_InitialAngularVelocity.py @@ -80,8 +80,8 @@ def C4976197_RigidBodies_InitialAngularVelocity(): imports.init() - from utils import Report - from utils import TestHelper as helper + 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 @@ -184,5 +184,5 @@ if __name__ == "__main__": import ImportPathHelper as imports imports.init() - from utils import Report + from editor_python_test_tools.utils import Report Report.start_test(C4976197_RigidBodies_InitialAngularVelocity) diff --git a/AutomatedTesting/Gem/PythonTests/physics/C4976199_RigidBodies_LinearDampingObjectMotion.py b/AutomatedTesting/Gem/PythonTests/physics/C4976199_RigidBodies_LinearDampingObjectMotion.py index 1660e71955..2e19b633c4 100755 --- a/AutomatedTesting/Gem/PythonTests/physics/C4976199_RigidBodies_LinearDampingObjectMotion.py +++ b/AutomatedTesting/Gem/PythonTests/physics/C4976199_RigidBodies_LinearDampingObjectMotion.py @@ -65,8 +65,8 @@ def C4976199_RigidBodies_LinearDampingObjectMotion(): imports.init() - from utils import Report - from utils import TestHelper as helper + 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 @@ -277,5 +277,5 @@ if __name__ == "__main__": import ImportPathHelper as imports imports.init() - from utils import Report + from editor_python_test_tools.utils import Report Report.start_test(C4976199_RigidBodies_LinearDampingObjectMotion) diff --git a/AutomatedTesting/Gem/PythonTests/physics/C4976200_RigidBody_AngularDampingObjectRotation.py b/AutomatedTesting/Gem/PythonTests/physics/C4976200_RigidBody_AngularDampingObjectRotation.py index e5438cd132..b90b34be53 100755 --- a/AutomatedTesting/Gem/PythonTests/physics/C4976200_RigidBody_AngularDampingObjectRotation.py +++ b/AutomatedTesting/Gem/PythonTests/physics/C4976200_RigidBody_AngularDampingObjectRotation.py @@ -69,9 +69,9 @@ def C4976200_RigidBody_AngularDampingObjectRotation(): imports.init() - from utils import Report - from utils import TestHelper as helper - from utils import AngleHelper + from editor_python_test_tools.utils import Report + from editor_python_test_tools.utils import TestHelper as helper + from editor_python_test_tools.utils import AngleHelper import azlmbr.legacy.general as general import azlmbr.bus @@ -292,5 +292,5 @@ if __name__ == "__main__": import ImportPathHelper as imports imports.init() - from utils import Report + from editor_python_test_tools.utils import Report Report.start_test(C4976200_RigidBody_AngularDampingObjectRotation) diff --git a/AutomatedTesting/Gem/PythonTests/physics/C4976201_RigidBody_MassIsAssigned.py b/AutomatedTesting/Gem/PythonTests/physics/C4976201_RigidBody_MassIsAssigned.py index e8086e4965..7fb0ff84ce 100755 --- a/AutomatedTesting/Gem/PythonTests/physics/C4976201_RigidBody_MassIsAssigned.py +++ b/AutomatedTesting/Gem/PythonTests/physics/C4976201_RigidBody_MassIsAssigned.py @@ -110,13 +110,12 @@ def C4976201_RigidBody_MassIsAssigned(): imports.init() - import azlmbr.legacy.general as general import azlmbr.bus import azlmbr - from utils import Report - from utils import TestHelper as helper + from editor_python_test_tools.utils import Report + from editor_python_test_tools.utils import TestHelper as helper MOVEMENT_TIMEOUT = 7.0 COLLISION_TIMEOUT = 2.0 @@ -381,5 +380,5 @@ if __name__ == "__main__": import ImportPathHelper as imports imports.init() - from utils import Report + from editor_python_test_tools.utils import Report Report.start_test(C4976201_RigidBody_MassIsAssigned) diff --git a/AutomatedTesting/Gem/PythonTests/physics/C4976202_RigidBody_StopsWhenBelowKineticThreshold.py b/AutomatedTesting/Gem/PythonTests/physics/C4976202_RigidBody_StopsWhenBelowKineticThreshold.py index f74119dd28..7d4cf1066e 100755 --- a/AutomatedTesting/Gem/PythonTests/physics/C4976202_RigidBody_StopsWhenBelowKineticThreshold.py +++ b/AutomatedTesting/Gem/PythonTests/physics/C4976202_RigidBody_StopsWhenBelowKineticThreshold.py @@ -133,12 +133,11 @@ def C4976202_RigidBody_StopsWhenBelowKineticThreshold(): imports.init() - import azlmbr.legacy.general as general import azlmbr.bus - from utils import Report - from utils import TestHelper as helper + from editor_python_test_tools.utils import Report + from editor_python_test_tools.utils import TestHelper as helper helper.init_idle() @@ -334,5 +333,5 @@ if __name__ == "__main__": import ImportPathHelper as imports imports.init() - from utils import Report + from editor_python_test_tools.utils import Report Report.start_test(C4976202_RigidBody_StopsWhenBelowKineticThreshold) diff --git a/AutomatedTesting/Gem/PythonTests/physics/C4976204_Verify_Start_Asleep_Condition.py b/AutomatedTesting/Gem/PythonTests/physics/C4976204_Verify_Start_Asleep_Condition.py index fae8ea9a3a..29fc2ec2a3 100755 --- a/AutomatedTesting/Gem/PythonTests/physics/C4976204_Verify_Start_Asleep_Condition.py +++ b/AutomatedTesting/Gem/PythonTests/physics/C4976204_Verify_Start_Asleep_Condition.py @@ -71,9 +71,8 @@ def C4976204_Verify_Start_Asleep_Condition(): imports.init() - - from utils import Report - from utils import TestHelper as helper + 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 @@ -120,5 +119,5 @@ if __name__ == "__main__": import ImportPathHelper as imports imports.init() - from utils import Report + from editor_python_test_tools.utils import Report Report.start_test(C4976204_Verify_Start_Asleep_Condition) diff --git a/AutomatedTesting/Gem/PythonTests/physics/C4976206_RigidBodies_GravityEnabledActive.py b/AutomatedTesting/Gem/PythonTests/physics/C4976206_RigidBodies_GravityEnabledActive.py index a8227b6b1f..b97c590a93 100755 --- a/AutomatedTesting/Gem/PythonTests/physics/C4976206_RigidBodies_GravityEnabledActive.py +++ b/AutomatedTesting/Gem/PythonTests/physics/C4976206_RigidBodies_GravityEnabledActive.py @@ -73,8 +73,8 @@ def C4976206_RigidBodies_GravityEnabledActive(): imports.init() - from utils import Report - from utils import TestHelper as helper + 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 @@ -152,5 +152,5 @@ if __name__ == "__main__": import ImportPathHelper as imports imports.init() - from utils import Report + from editor_python_test_tools.utils import Report Report.start_test(C4976206_RigidBodies_GravityEnabledActive) diff --git a/AutomatedTesting/Gem/PythonTests/physics/C4976207_PhysXRigidBodies_KinematicBehavior.py b/AutomatedTesting/Gem/PythonTests/physics/C4976207_PhysXRigidBodies_KinematicBehavior.py index 8003f495c8..4481c00fc5 100755 --- a/AutomatedTesting/Gem/PythonTests/physics/C4976207_PhysXRigidBodies_KinematicBehavior.py +++ b/AutomatedTesting/Gem/PythonTests/physics/C4976207_PhysXRigidBodies_KinematicBehavior.py @@ -70,8 +70,8 @@ def C4976207_PhysXRigidBodies_KinematicBehavior(): import azlmbr.legacy.general as general import azlmbr.bus - from utils import Report - from utils import TestHelper as helper + from editor_python_test_tools.utils import Report + from editor_python_test_tools.utils import TestHelper as helper # Specific wait times in seconds TIME_OUT = 3.0 @@ -139,5 +139,5 @@ if __name__ == "__main__": import ImportPathHelper as imports imports.init() - from utils import Report + from editor_python_test_tools.utils import Report Report.start_test(C4976207_PhysXRigidBodies_KinematicBehavior) diff --git a/AutomatedTesting/Gem/PythonTests/physics/C4976209_RigidBody_ComputesCOM.py b/AutomatedTesting/Gem/PythonTests/physics/C4976209_RigidBody_ComputesCOM.py index 9f67751d67..79ea6e5dc7 100755 --- a/AutomatedTesting/Gem/PythonTests/physics/C4976209_RigidBody_ComputesCOM.py +++ b/AutomatedTesting/Gem/PythonTests/physics/C4976209_RigidBody_ComputesCOM.py @@ -95,9 +95,8 @@ def C4976209_RigidBody_ComputesCOM(): imports.init() - - from utils import Report - from utils import TestHelper as helper + from editor_python_test_tools.utils import Report + from editor_python_test_tools.utils import TestHelper as helper import azlmbr import azlmbr.legacy.general as general @@ -181,5 +180,5 @@ if __name__ == "__main__": import ImportPathHelper as imports imports.init() - from utils import Report + from editor_python_test_tools.utils import Report Report.start_test(C4976209_RigidBody_ComputesCOM) diff --git a/AutomatedTesting/Gem/PythonTests/physics/C4976210_COM_ManualSetting.py b/AutomatedTesting/Gem/PythonTests/physics/C4976210_COM_ManualSetting.py index 7cda1bf6f0..451081ba23 100755 --- a/AutomatedTesting/Gem/PythonTests/physics/C4976210_COM_ManualSetting.py +++ b/AutomatedTesting/Gem/PythonTests/physics/C4976210_COM_ManualSetting.py @@ -77,8 +77,8 @@ def C4976210_COM_ManualSetting(): imports.init() - from utils import Report - from utils import TestHelper as helper + 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 import azlmbr @@ -305,5 +305,5 @@ if __name__ == "__main__": import ImportPathHelper as imports imports.init() - from utils import Report + from editor_python_test_tools.utils import Report Report.start_test(C4976210_COM_ManualSetting) diff --git a/AutomatedTesting/Gem/PythonTests/physics/C4976218_RigidBodies_InertiaObjectsNotComputed.py b/AutomatedTesting/Gem/PythonTests/physics/C4976218_RigidBodies_InertiaObjectsNotComputed.py index 289584ef51..63f0d382c3 100755 --- a/AutomatedTesting/Gem/PythonTests/physics/C4976218_RigidBodies_InertiaObjectsNotComputed.py +++ b/AutomatedTesting/Gem/PythonTests/physics/C4976218_RigidBodies_InertiaObjectsNotComputed.py @@ -47,13 +47,13 @@ def C4976218_RigidBodies_InertiaObjectsNotComputed(): imports.init() - import azlmbr.legacy.general as general import azlmbr.bus as bus import azlmbr.components import azlmbr.physics - from utils import Report, TestHelper as helper + from editor_python_test_tools.utils import Report + from editor_python_test_tools.utils import TestHelper as helper class UpperBox: def __init__(self, name): @@ -167,5 +167,5 @@ if __name__ == "__main__": import ImportPathHelper as imports imports.init() - from utils import Report + from editor_python_test_tools.utils import Report Report.start_test(C4976218_RigidBodies_InertiaObjectsNotComputed) diff --git a/AutomatedTesting/Gem/PythonTests/physics/C4976227_Collider_NewGroup.py b/AutomatedTesting/Gem/PythonTests/physics/C4976227_Collider_NewGroup.py index c9b9dfb89f..8d9dc01396 100755 --- a/AutomatedTesting/Gem/PythonTests/physics/C4976227_Collider_NewGroup.py +++ b/AutomatedTesting/Gem/PythonTests/physics/C4976227_Collider_NewGroup.py @@ -60,9 +60,8 @@ def C4976227_Collider_NewGroup(): imports.init() - - from utils import Report - from utils import TestHelper as helper + 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 @@ -92,5 +91,5 @@ if __name__ == "__main__": import ImportPathHelper as imports imports.init() - from utils import Report + from editor_python_test_tools.utils import Report Report.start_test(C4976227_Collider_NewGroup) diff --git a/AutomatedTesting/Gem/PythonTests/physics/C4976236_AddPhysxColliderComponent.py b/AutomatedTesting/Gem/PythonTests/physics/C4976236_AddPhysxColliderComponent.py index 8c1527fc89..906c6db55b 100755 --- a/AutomatedTesting/Gem/PythonTests/physics/C4976236_AddPhysxColliderComponent.py +++ b/AutomatedTesting/Gem/PythonTests/physics/C4976236_AddPhysxColliderComponent.py @@ -55,10 +55,10 @@ def C4976236_AddPhysxColliderComponent(): import ImportPathHelper as imports imports.init() - from utils import Report - from utils import TestHelper as helper - from utils import Tracer - from editor_entity_utils import EditorEntity + 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 + from editor_python_test_tools.utils import Tracer from asset_utils import Asset helper.init_idle() @@ -103,5 +103,5 @@ if __name__ == "__main__": import ImportPathHelper as imports imports.init() - from utils import Report + from editor_python_test_tools.utils import Report Report.start_test(C4976236_AddPhysxColliderComponent) diff --git a/AutomatedTesting/Gem/PythonTests/physics/C4976242_Collision_SameCollisionlayerSameCollisiongroup.py b/AutomatedTesting/Gem/PythonTests/physics/C4976242_Collision_SameCollisionlayerSameCollisiongroup.py index 93d1981187..bb6234b69e 100755 --- a/AutomatedTesting/Gem/PythonTests/physics/C4976242_Collision_SameCollisionlayerSameCollisiongroup.py +++ b/AutomatedTesting/Gem/PythonTests/physics/C4976242_Collision_SameCollisionlayerSameCollisiongroup.py @@ -71,9 +71,8 @@ def C4976242_Collision_SameCollisionlayerSameCollisiongroup(): imports.init() - - from utils import Report - from utils import TestHelper as helper + 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 @@ -196,5 +195,5 @@ if __name__ == "__main__": import ImportPathHelper as imports imports.init() - from utils import Report + from editor_python_test_tools.utils import Report Report.start_test(C4976242_Collision_SameCollisionlayerSameCollisiongroup) diff --git a/AutomatedTesting/Gem/PythonTests/physics/C4976243_Collision_SameCollisionGroupDiffCollisionLayers.py b/AutomatedTesting/Gem/PythonTests/physics/C4976243_Collision_SameCollisionGroupDiffCollisionLayers.py index a4a89fcdec..949ebb2b2a 100755 --- a/AutomatedTesting/Gem/PythonTests/physics/C4976243_Collision_SameCollisionGroupDiffCollisionLayers.py +++ b/AutomatedTesting/Gem/PythonTests/physics/C4976243_Collision_SameCollisionGroupDiffCollisionLayers.py @@ -75,9 +75,8 @@ def C4976243_Collision_SameCollisionGroupDiffCollisionLayers(): imports.init() - - from utils import Report - from utils import TestHelper as helper + 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 @@ -135,5 +134,5 @@ if __name__ == "__main__": import ImportPathHelper as imports imports.init() - from utils import Report + from editor_python_test_tools.utils import Report Report.start_test(C4976243_Collision_SameCollisionGroupDiffCollisionLayers) diff --git a/AutomatedTesting/Gem/PythonTests/physics/C4976244_Collider_SameGroupSameLayerCollision.py b/AutomatedTesting/Gem/PythonTests/physics/C4976244_Collider_SameGroupSameLayerCollision.py index 2770b0142c..c35b9fab81 100755 --- a/AutomatedTesting/Gem/PythonTests/physics/C4976244_Collider_SameGroupSameLayerCollision.py +++ b/AutomatedTesting/Gem/PythonTests/physics/C4976244_Collider_SameGroupSameLayerCollision.py @@ -71,8 +71,8 @@ def C4976244_Collider_SameGroupSameLayerCollision(): imports.init() - from utils import Report - from utils import TestHelper as helper + 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 @@ -192,5 +192,5 @@ if __name__ == "__main__": import ImportPathHelper as imports imports.init() - from utils import Report + from editor_python_test_tools.utils import Report Report.start_test(C4976244_Collider_SameGroupSameLayerCollision) diff --git a/AutomatedTesting/Gem/PythonTests/physics/C4976245_PhysXCollider_CollisionLayerTest.py b/AutomatedTesting/Gem/PythonTests/physics/C4976245_PhysXCollider_CollisionLayerTest.py index c70154f0be..dafb8d9014 100755 --- a/AutomatedTesting/Gem/PythonTests/physics/C4976245_PhysXCollider_CollisionLayerTest.py +++ b/AutomatedTesting/Gem/PythonTests/physics/C4976245_PhysXCollider_CollisionLayerTest.py @@ -76,8 +76,8 @@ def C4976245_PhysXCollider_CollisionLayerTest(): imports.init() - from utils import Report - from utils import TestHelper as helper + 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 @@ -230,5 +230,5 @@ if __name__ == "__main__": import ImportPathHelper as imports imports.init() - from utils import Report + from editor_python_test_tools.utils import Report Report.start_test(C4976245_PhysXCollider_CollisionLayerTest) diff --git a/AutomatedTesting/Gem/PythonTests/physics/C4982593_PhysXCollider_CollisionLayerTest.py b/AutomatedTesting/Gem/PythonTests/physics/C4982593_PhysXCollider_CollisionLayerTest.py index a05550ba90..8d985de402 100755 --- a/AutomatedTesting/Gem/PythonTests/physics/C4982593_PhysXCollider_CollisionLayerTest.py +++ b/AutomatedTesting/Gem/PythonTests/physics/C4982593_PhysXCollider_CollisionLayerTest.py @@ -76,8 +76,8 @@ def C4982593_PhysXCollider_CollisionLayerTest(): imports.init() - from utils import Report - from utils import TestHelper as helper + 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 @@ -238,5 +238,5 @@ if __name__ == "__main__": import ImportPathHelper as imports imports.init() - from utils import Report + from editor_python_test_tools.utils import Report Report.start_test(C4982593_PhysXCollider_CollisionLayerTest) diff --git a/AutomatedTesting/Gem/PythonTests/physics/C4982595_Collider_TriggerDisablesCollision.py b/AutomatedTesting/Gem/PythonTests/physics/C4982595_Collider_TriggerDisablesCollision.py index 86d862d547..8746996ca8 100755 --- a/AutomatedTesting/Gem/PythonTests/physics/C4982595_Collider_TriggerDisablesCollision.py +++ b/AutomatedTesting/Gem/PythonTests/physics/C4982595_Collider_TriggerDisablesCollision.py @@ -84,13 +84,12 @@ def C4982595_Collider_TriggerDisablesCollision(): imports.init() - import azlmbr.legacy.general as general import azlmbr.bus import azlmbr.components import azlmbr.physics - from utils import Report - from utils import TestHelper as helper + from editor_python_test_tools.utils import Report + from editor_python_test_tools.utils import TestHelper as helper TIME_OUT_SECONDS = 3.0 SPHERE_RADIUS = 1.0 @@ -242,5 +241,5 @@ if __name__ == "__main__": import ImportPathHelper as imports imports.init() - from utils import Report + from editor_python_test_tools.utils import Report Report.start_test(C4982595_Collider_TriggerDisablesCollision) diff --git a/AutomatedTesting/Gem/PythonTests/physics/C4982797_Collider_ColliderOffset.py b/AutomatedTesting/Gem/PythonTests/physics/C4982797_Collider_ColliderOffset.py index cbe8d7d47e..2bd4fc5adc 100755 --- a/AutomatedTesting/Gem/PythonTests/physics/C4982797_Collider_ColliderOffset.py +++ b/AutomatedTesting/Gem/PythonTests/physics/C4982797_Collider_ColliderOffset.py @@ -95,8 +95,8 @@ def C4982797_Collider_ColliderOffset(): imports.init() - from utils import Report - from utils import TestHelper as helper + 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 import azlmbr @@ -339,5 +339,5 @@ if __name__ == "__main__": import ImportPathHelper as imports imports.init() - from utils import Report + from editor_python_test_tools.utils import Report Report.start_test(C4982797_Collider_ColliderOffset) diff --git a/AutomatedTesting/Gem/PythonTests/physics/C4982798_Collider_ColliderRotationOffset.py b/AutomatedTesting/Gem/PythonTests/physics/C4982798_Collider_ColliderRotationOffset.py index f64d762b3b..f86890d8bf 100755 --- a/AutomatedTesting/Gem/PythonTests/physics/C4982798_Collider_ColliderRotationOffset.py +++ b/AutomatedTesting/Gem/PythonTests/physics/C4982798_Collider_ColliderRotationOffset.py @@ -96,8 +96,8 @@ def C4982798_Collider_ColliderRotationOffset(): # Internal editor imports - from utils import Report - from utils import TestHelper as helper + 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 import azlmbr @@ -307,5 +307,5 @@ if __name__ == "__main__": import ImportPathHelper as imports imports.init() - from utils import Report + from editor_python_test_tools.utils import Report Report.start_test(C4982798_Collider_ColliderRotationOffset) diff --git a/AutomatedTesting/Gem/PythonTests/physics/C4982800_PhysXColliderShape_CanBeSelected.py b/AutomatedTesting/Gem/PythonTests/physics/C4982800_PhysXColliderShape_CanBeSelected.py index d38bf780d4..c37ad2b2d2 100755 --- a/AutomatedTesting/Gem/PythonTests/physics/C4982800_PhysXColliderShape_CanBeSelected.py +++ b/AutomatedTesting/Gem/PythonTests/physics/C4982800_PhysXColliderShape_CanBeSelected.py @@ -50,9 +50,9 @@ def C4982800_PhysXColliderShape_CanBeSelected(): import ImportPathHelper as imports imports.init() - from utils import Report - from utils import TestHelper as helper - from editor_entity_utils import EditorEntity as Entity + from editor_python_test_tools.editor_entity_utils import EditorEntity as Entity + from editor_python_test_tools.utils import Report + from editor_python_test_tools.utils import TestHelper as helper # Open 3D Engine Imports import azlmbr.math as math @@ -98,5 +98,5 @@ if __name__ == "__main__": import ImportPathHelper as imports imports.init() - from utils import Report + from editor_python_test_tools.utils import Report Report.start_test(C4982800_PhysXColliderShape_CanBeSelected) diff --git a/AutomatedTesting/Gem/PythonTests/physics/C4982801_PhysXColliderShape_CanBeSelected.py b/AutomatedTesting/Gem/PythonTests/physics/C4982801_PhysXColliderShape_CanBeSelected.py index 940f774088..19a835da18 100755 --- a/AutomatedTesting/Gem/PythonTests/physics/C4982801_PhysXColliderShape_CanBeSelected.py +++ b/AutomatedTesting/Gem/PythonTests/physics/C4982801_PhysXColliderShape_CanBeSelected.py @@ -50,9 +50,9 @@ def C4982801_PhysXColliderShape_CanBeSelected(): import ImportPathHelper as imports imports.init() - from utils import Report - from utils import TestHelper as helper - from editor_entity_utils import EditorEntity as Entity + from editor_python_test_tools.editor_entity_utils import EditorEntity as Entity + from editor_python_test_tools.utils import Report + from editor_python_test_tools.utils import TestHelper as helper # Open 3D Engine Imports import azlmbr.math as math @@ -110,5 +110,5 @@ if __name__ == "__main__": import ImportPathHelper as imports imports.init() - from utils import Report + from editor_python_test_tools.utils import Report Report.start_test(C4982801_PhysXColliderShape_CanBeSelected) diff --git a/AutomatedTesting/Gem/PythonTests/physics/C4982802_PhysXColliderShape_CanBeSelected.py b/AutomatedTesting/Gem/PythonTests/physics/C4982802_PhysXColliderShape_CanBeSelected.py index eba549abde..e1365d0887 100755 --- a/AutomatedTesting/Gem/PythonTests/physics/C4982802_PhysXColliderShape_CanBeSelected.py +++ b/AutomatedTesting/Gem/PythonTests/physics/C4982802_PhysXColliderShape_CanBeSelected.py @@ -50,9 +50,9 @@ def C4982802_PhysXColliderShape_CanBeSelected(): import ImportPathHelper as imports imports.init() - from utils import Report - from utils import TestHelper as helper - from editor_entity_utils import EditorEntity as Entity + from editor_python_test_tools.editor_entity_utils import EditorEntity as Entity + from editor_python_test_tools.utils import Report + from editor_python_test_tools.utils import TestHelper as helper # Open 3D Engine Imports import azlmbr.math as math @@ -110,5 +110,5 @@ if __name__ == "__main__": import ImportPathHelper as imports imports.init() - from utils import Report + from editor_python_test_tools.utils import Report Report.start_test(C4982802_PhysXColliderShape_CanBeSelected) diff --git a/AutomatedTesting/Gem/PythonTests/physics/C4982803_Enable_PxMesh_Option.py b/AutomatedTesting/Gem/PythonTests/physics/C4982803_Enable_PxMesh_Option.py index da201ddeda..4ae177934a 100755 --- a/AutomatedTesting/Gem/PythonTests/physics/C4982803_Enable_PxMesh_Option.py +++ b/AutomatedTesting/Gem/PythonTests/physics/C4982803_Enable_PxMesh_Option.py @@ -63,9 +63,9 @@ def C4982803_Enable_PxMesh_Option(): import ImportPathHelper as imports imports.init() - from utils import Report - from utils import TestHelper as helper - from editor_entity_utils import EditorEntity + 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 from asset_utils import Asset import azlmbr.math as math @@ -146,5 +146,5 @@ if __name__ == "__main__": import ImportPathHelper as imports imports.init() - from utils import Report + from editor_python_test_tools.utils import Report Report.start_test(C4982803_Enable_PxMesh_Option) diff --git a/AutomatedTesting/Gem/PythonTests/physics/C5296614_PhysXMaterial_ColliderShape.py b/AutomatedTesting/Gem/PythonTests/physics/C5296614_PhysXMaterial_ColliderShape.py index cca768fb52..9d2a49ac70 100755 --- a/AutomatedTesting/Gem/PythonTests/physics/C5296614_PhysXMaterial_ColliderShape.py +++ b/AutomatedTesting/Gem/PythonTests/physics/C5296614_PhysXMaterial_ColliderShape.py @@ -69,8 +69,8 @@ def C5296614_PhysXMaterial_ColliderShape(): imports.init() - from utils import Report - from utils import TestHelper as helper + 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 @@ -159,5 +159,5 @@ if __name__ == "__main__": import ImportPathHelper as imports imports.init() - from utils import Report + from editor_python_test_tools.utils import Report Report.start_test(C5296614_PhysXMaterial_ColliderShape) diff --git a/AutomatedTesting/Gem/PythonTests/physics/C5340400_RigidBody_ManualMomentOfInertia.py b/AutomatedTesting/Gem/PythonTests/physics/C5340400_RigidBody_ManualMomentOfInertia.py index f012fe73c0..7617e41cad 100755 --- a/AutomatedTesting/Gem/PythonTests/physics/C5340400_RigidBody_ManualMomentOfInertia.py +++ b/AutomatedTesting/Gem/PythonTests/physics/C5340400_RigidBody_ManualMomentOfInertia.py @@ -76,11 +76,10 @@ def C5340400_RigidBody_ManualMomentOfInertia(): imports.init() - import azlmbr.legacy.general as general import azlmbr.bus - from utils import Report - from utils import TestHelper as helper + from editor_python_test_tools.utils import Report + from editor_python_test_tools.utils import TestHelper as helper # Specific wait time in seconds TIME_OUT = 3.0 @@ -168,5 +167,5 @@ if __name__ == "__main__": import ImportPathHelper as imports imports.init() - from utils import Report + from editor_python_test_tools.utils import Report Report.start_test(C5340400_RigidBody_ManualMomentOfInertia) diff --git a/AutomatedTesting/Gem/PythonTests/physics/C5689518_PhysXTerrain_CollidesWithPhysXTerrain.py b/AutomatedTesting/Gem/PythonTests/physics/C5689518_PhysXTerrain_CollidesWithPhysXTerrain.py index 359565402a..0686adf15d 100755 --- a/AutomatedTesting/Gem/PythonTests/physics/C5689518_PhysXTerrain_CollidesWithPhysXTerrain.py +++ b/AutomatedTesting/Gem/PythonTests/physics/C5689518_PhysXTerrain_CollidesWithPhysXTerrain.py @@ -58,8 +58,8 @@ def C5689518_PhysXTerrain_CollidesWithPhysXTerrain(): import azlmbr.legacy.general as general import azlmbr.bus - from utils import Report - from utils import TestHelper as helper + from editor_python_test_tools.utils import Report + from editor_python_test_tools.utils import TestHelper as helper # Global time out TIME_OUT = 1.0 @@ -120,5 +120,5 @@ if __name__ == "__main__": import ImportPathHelper as imports imports.init() - from utils import Report + from editor_python_test_tools.utils import Report Report.start_test(C5689518_PhysXTerrain_CollidesWithPhysXTerrain) diff --git a/AutomatedTesting/Gem/PythonTests/physics/C5689522_Physxterrain_AddPhysxterrainNoEditorCrash.py b/AutomatedTesting/Gem/PythonTests/physics/C5689522_Physxterrain_AddPhysxterrainNoEditorCrash.py index 10ebcacdb7..ffafeaab34 100755 --- a/AutomatedTesting/Gem/PythonTests/physics/C5689522_Physxterrain_AddPhysxterrainNoEditorCrash.py +++ b/AutomatedTesting/Gem/PythonTests/physics/C5689522_Physxterrain_AddPhysxterrainNoEditorCrash.py @@ -67,12 +67,11 @@ def C5689522_Physxterrain_AddPhysxterrainNoEditorCrash(): imports.init() - import azlmbr.legacy.general as general - from utils import Report - from utils import TestHelper as helper - from utils import Tracer + from editor_python_test_tools.utils import Report + from editor_python_test_tools.utils import TestHelper as helper + from editor_python_test_tools.utils import Tracer import azlmbr.bus @@ -113,5 +112,5 @@ if __name__ == "__main__": import ImportPathHelper as imports imports.init() - from utils import Report + from editor_python_test_tools.utils import Report Report.start_test(C5689522_Physxterrain_AddPhysxterrainNoEditorCrash) diff --git a/AutomatedTesting/Gem/PythonTests/physics/C5689524_MultipleTerrains_CheckWarningInConsole.py b/AutomatedTesting/Gem/PythonTests/physics/C5689524_MultipleTerrains_CheckWarningInConsole.py index b00821343b..2b1a73f1f3 100755 --- a/AutomatedTesting/Gem/PythonTests/physics/C5689524_MultipleTerrains_CheckWarningInConsole.py +++ b/AutomatedTesting/Gem/PythonTests/physics/C5689524_MultipleTerrains_CheckWarningInConsole.py @@ -72,9 +72,9 @@ def C5689524_MultipleTerrains_CheckWarningInConsole(): import azlmbr.legacy.general as general - from utils import Report - from utils import TestHelper as helper - from utils import Tracer + from editor_python_test_tools.utils import Report + from editor_python_test_tools.utils import TestHelper as helper + from editor_python_test_tools.utils import Tracer import azlmbr.bus @@ -114,5 +114,5 @@ if __name__ == "__main__": import ImportPathHelper as imports imports.init() - from utils import Report + from editor_python_test_tools.utils import Report Report.start_test(C5689524_MultipleTerrains_CheckWarningInConsole) diff --git a/AutomatedTesting/Gem/PythonTests/physics/C5689528_Terrain_MultipleTerrainComponents.py b/AutomatedTesting/Gem/PythonTests/physics/C5689528_Terrain_MultipleTerrainComponents.py index f540cae081..265836489d 100755 --- a/AutomatedTesting/Gem/PythonTests/physics/C5689528_Terrain_MultipleTerrainComponents.py +++ b/AutomatedTesting/Gem/PythonTests/physics/C5689528_Terrain_MultipleTerrainComponents.py @@ -69,10 +69,9 @@ def C5689528_Terrain_MultipleTerrainComponents(): imports.init() - - from utils import Report - from utils import TestHelper as helper - from utils import Tracer + from editor_python_test_tools.utils import Report + from editor_python_test_tools.utils import TestHelper as helper + from editor_python_test_tools.utils import Tracer import azlmbr.legacy.general as general @@ -111,5 +110,5 @@ if __name__ == "__main__": import ImportPathHelper as imports imports.init() - from utils import Report + from editor_python_test_tools.utils import Report Report.start_test(C5689528_Terrain_MultipleTerrainComponents) diff --git a/AutomatedTesting/Gem/PythonTests/physics/C5689529_Verify_Terrain_RigidBody_Collider_Mesh.py b/AutomatedTesting/Gem/PythonTests/physics/C5689529_Verify_Terrain_RigidBody_Collider_Mesh.py index 2fbf21fb72..138ae68408 100755 --- a/AutomatedTesting/Gem/PythonTests/physics/C5689529_Verify_Terrain_RigidBody_Collider_Mesh.py +++ b/AutomatedTesting/Gem/PythonTests/physics/C5689529_Verify_Terrain_RigidBody_Collider_Mesh.py @@ -67,9 +67,8 @@ def C5689529_Verify_Terrain_RigidBody_Collider_Mesh(): imports.init() - - from utils import Report - from utils import TestHelper as helper + 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 @@ -114,5 +113,5 @@ if __name__ == "__main__": import ImportPathHelper as imports imports.init() - from utils import Report + from editor_python_test_tools.utils import Report Report.start_test(C5689529_Verify_Terrain_RigidBody_Collider_Mesh) diff --git a/AutomatedTesting/Gem/PythonTests/physics/C5689531_Warning_TerrainSliceTerrainComponent.py b/AutomatedTesting/Gem/PythonTests/physics/C5689531_Warning_TerrainSliceTerrainComponent.py index c8e5d6873b..7d60a61ec1 100755 --- a/AutomatedTesting/Gem/PythonTests/physics/C5689531_Warning_TerrainSliceTerrainComponent.py +++ b/AutomatedTesting/Gem/PythonTests/physics/C5689531_Warning_TerrainSliceTerrainComponent.py @@ -74,10 +74,9 @@ def C5689531_Warning_TerrainSliceTerrainComponent(): imports.init() - - from utils import Report - from utils import TestHelper as helper - from utils import Tracer + from editor_python_test_tools.utils import Report + from editor_python_test_tools.utils import TestHelper as helper + from editor_python_test_tools.utils import Tracer import azlmbr.legacy.general as general @@ -123,5 +122,5 @@ if __name__ == "__main__": import ImportPathHelper as imports imports.init() - from utils import Report + from editor_python_test_tools.utils import Report Report.start_test(C5689531_Warning_TerrainSliceTerrainComponent) diff --git a/AutomatedTesting/Gem/PythonTests/physics/C5932040_ForceRegion_CubeExertsWorldForce.py b/AutomatedTesting/Gem/PythonTests/physics/C5932040_ForceRegion_CubeExertsWorldForce.py index 87bc4812b2..f01dd4582f 100755 --- a/AutomatedTesting/Gem/PythonTests/physics/C5932040_ForceRegion_CubeExertsWorldForce.py +++ b/AutomatedTesting/Gem/PythonTests/physics/C5932040_ForceRegion_CubeExertsWorldForce.py @@ -74,9 +74,8 @@ def C5932040_ForceRegion_CubeExertsWorldForce(): imports.init() - - from utils import Report - from utils import TestHelper as helper + 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 @@ -191,5 +190,5 @@ if __name__ == "__main__": import ImportPathHelper as imports imports.init() - from utils import Report + from editor_python_test_tools.utils import Report Report.start_test(C5932040_ForceRegion_CubeExertsWorldForce) diff --git a/AutomatedTesting/Gem/PythonTests/physics/C5932041_PhysXForceRegion_LocalSpaceForceOnRigidBodies.py b/AutomatedTesting/Gem/PythonTests/physics/C5932041_PhysXForceRegion_LocalSpaceForceOnRigidBodies.py index d78f0f386a..095a669541 100755 --- a/AutomatedTesting/Gem/PythonTests/physics/C5932041_PhysXForceRegion_LocalSpaceForceOnRigidBodies.py +++ b/AutomatedTesting/Gem/PythonTests/physics/C5932041_PhysXForceRegion_LocalSpaceForceOnRigidBodies.py @@ -74,9 +74,8 @@ def C5932041_PhysXForceRegion_LocalSpaceForceOnRigidBodies(): imports.init() - - from utils import Report - from utils import TestHelper as helper + 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 @@ -169,5 +168,5 @@ if __name__ == "__main__": import ImportPathHelper as imports imports.init() - from utils import Report + from editor_python_test_tools.utils import Report Report.start_test(C5932041_PhysXForceRegion_LocalSpaceForceOnRigidBodies) diff --git a/AutomatedTesting/Gem/PythonTests/physics/C5932042_PhysXForceRegion_LinearDamping.py b/AutomatedTesting/Gem/PythonTests/physics/C5932042_PhysXForceRegion_LinearDamping.py index a3f6de6a5f..04cecd45b2 100755 --- a/AutomatedTesting/Gem/PythonTests/physics/C5932042_PhysXForceRegion_LinearDamping.py +++ b/AutomatedTesting/Gem/PythonTests/physics/C5932042_PhysXForceRegion_LinearDamping.py @@ -80,8 +80,8 @@ def C5932042_PhysXForceRegion_LinearDamping(): imports.init() - from utils import Report - from utils import TestHelper as helper + 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 @@ -276,5 +276,5 @@ if __name__ == "__main__": import ImportPathHelper as imports imports.init() - from utils import Report + from editor_python_test_tools.utils import Report Report.start_test(C5932042_PhysXForceRegion_LinearDamping) diff --git a/AutomatedTesting/Gem/PythonTests/physics/C5932043_ForceRegion_SimpleDragOnRigidBodies.py b/AutomatedTesting/Gem/PythonTests/physics/C5932043_ForceRegion_SimpleDragOnRigidBodies.py index 2c019b092c..512698ce4b 100755 --- a/AutomatedTesting/Gem/PythonTests/physics/C5932043_ForceRegion_SimpleDragOnRigidBodies.py +++ b/AutomatedTesting/Gem/PythonTests/physics/C5932043_ForceRegion_SimpleDragOnRigidBodies.py @@ -50,7 +50,8 @@ def C5932043_ForceRegion_SimpleDragOnRigidBodies(): imports.init() - from utils import Report, TestHelper as helper + 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 @@ -145,5 +146,5 @@ if __name__ == "__main__": import ImportPathHelper as imports imports.init() - from utils import Report + from editor_python_test_tools.utils import Report Report.start_test(C5932043_ForceRegion_SimpleDragOnRigidBodies) diff --git a/AutomatedTesting/Gem/PythonTests/physics/C5932044_ForceRegion_PointForceOnRigidBody.py b/AutomatedTesting/Gem/PythonTests/physics/C5932044_ForceRegion_PointForceOnRigidBody.py index 4f8121e254..b7257b488b 100755 --- a/AutomatedTesting/Gem/PythonTests/physics/C5932044_ForceRegion_PointForceOnRigidBody.py +++ b/AutomatedTesting/Gem/PythonTests/physics/C5932044_ForceRegion_PointForceOnRigidBody.py @@ -74,9 +74,8 @@ def C5932044_ForceRegion_PointForceOnRigidBody(): imports.init() - - from utils import Report - from utils import TestHelper as helper + 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 @@ -197,5 +196,5 @@ if __name__ == "__main__": import ImportPathHelper as imports imports.init() - from utils import Report + from editor_python_test_tools.utils import Report Report.start_test(C5932044_ForceRegion_PointForceOnRigidBody) diff --git a/AutomatedTesting/Gem/PythonTests/physics/C5932045_ForceRegion_Spline.py b/AutomatedTesting/Gem/PythonTests/physics/C5932045_ForceRegion_Spline.py index 4cb71ab54c..eca0679921 100755 --- a/AutomatedTesting/Gem/PythonTests/physics/C5932045_ForceRegion_Spline.py +++ b/AutomatedTesting/Gem/PythonTests/physics/C5932045_ForceRegion_Spline.py @@ -79,9 +79,8 @@ def C5932045_ForceRegion_Spline(): imports.init() - - from utils import Report - from utils import TestHelper as helper + from editor_python_test_tools.utils import Report + from editor_python_test_tools.utils import TestHelper as helper import itertools import azlmbr @@ -170,5 +169,5 @@ if __name__ == "__main__": import ImportPathHelper as imports imports.init() - from utils import Report + from editor_python_test_tools.utils import Report Report.start_test(C5932045_ForceRegion_Spline) diff --git a/AutomatedTesting/Gem/PythonTests/physics/C5959759_RigidBody_ForceRegionSpherePointForce.py b/AutomatedTesting/Gem/PythonTests/physics/C5959759_RigidBody_ForceRegionSpherePointForce.py index 5271bec2ec..6aff0a7145 100755 --- a/AutomatedTesting/Gem/PythonTests/physics/C5959759_RigidBody_ForceRegionSpherePointForce.py +++ b/AutomatedTesting/Gem/PythonTests/physics/C5959759_RigidBody_ForceRegionSpherePointForce.py @@ -47,8 +47,8 @@ def C5959759_RigidBody_ForceRegionSpherePointForce(): imports.init() - from utils import Report - from utils import TestHelper as helper + 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 @@ -157,5 +157,5 @@ if __name__ == "__main__": import ImportPathHelper as imports imports.init() - from utils import Report + from editor_python_test_tools.utils import Report Report.start_test(C5959759_RigidBody_ForceRegionSpherePointForce) diff --git a/AutomatedTesting/Gem/PythonTests/physics/C5959760_PhysXForceRegion_PointForceExertion.py b/AutomatedTesting/Gem/PythonTests/physics/C5959760_PhysXForceRegion_PointForceExertion.py index 42020c78b7..89eb1842be 100755 --- a/AutomatedTesting/Gem/PythonTests/physics/C5959760_PhysXForceRegion_PointForceExertion.py +++ b/AutomatedTesting/Gem/PythonTests/physics/C5959760_PhysXForceRegion_PointForceExertion.py @@ -72,8 +72,8 @@ def C5959760_PhysXForceRegion_PointForceExertion(): imports.init() - from utils import Report - from utils import TestHelper as helper + 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 @@ -230,5 +230,5 @@ if __name__ == "__main__": import ImportPathHelper as imports imports.init() - from utils import Report + from editor_python_test_tools.utils import Report Report.start_test(C5959760_PhysXForceRegion_PointForceExertion) diff --git a/AutomatedTesting/Gem/PythonTests/physics/C5959761_ForceRegion_PhysAssetExertsPointForce.py b/AutomatedTesting/Gem/PythonTests/physics/C5959761_ForceRegion_PhysAssetExertsPointForce.py index af9af57363..ba0475266b 100755 --- a/AutomatedTesting/Gem/PythonTests/physics/C5959761_ForceRegion_PhysAssetExertsPointForce.py +++ b/AutomatedTesting/Gem/PythonTests/physics/C5959761_ForceRegion_PhysAssetExertsPointForce.py @@ -76,8 +76,8 @@ def C5959761_ForceRegion_PhysAssetExertsPointForce(): import azlmbr.bus as bus import azlmbr.math - from utils import Report - from utils import TestHelper as helper + from editor_python_test_tools.utils import Report + from editor_python_test_tools.utils import TestHelper as helper TIMEOUT = 2.0 @@ -147,5 +147,5 @@ if __name__ == "__main__": import ImportPathHelper as imports imports.init() - from utils import Report + from editor_python_test_tools.utils import Report Report.start_test(C5959761_ForceRegion_PhysAssetExertsPointForce) diff --git a/AutomatedTesting/Gem/PythonTests/physics/C5959763_ForceRegion_ForceRegionImpulsesCube.py b/AutomatedTesting/Gem/PythonTests/physics/C5959763_ForceRegion_ForceRegionImpulsesCube.py index 2b7bf49278..76130d25eb 100755 --- a/AutomatedTesting/Gem/PythonTests/physics/C5959763_ForceRegion_ForceRegionImpulsesCube.py +++ b/AutomatedTesting/Gem/PythonTests/physics/C5959763_ForceRegion_ForceRegionImpulsesCube.py @@ -50,7 +50,8 @@ def C5959763_ForceRegion_ForceRegionImpulsesCube(): imports.init() - from utils import Report, TestHelper as helper + 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 @@ -171,5 +172,5 @@ if __name__ == "__main__": import ImportPathHelper as imports imports.init() - from utils import Report + from editor_python_test_tools.utils import Report Report.start_test(C5959763_ForceRegion_ForceRegionImpulsesCube) diff --git a/AutomatedTesting/Gem/PythonTests/physics/C5959764_ForceRegion_ForceRegionImpulsesCapsule.py b/AutomatedTesting/Gem/PythonTests/physics/C5959764_ForceRegion_ForceRegionImpulsesCapsule.py index 02bba2f848..f314dae5b7 100755 --- a/AutomatedTesting/Gem/PythonTests/physics/C5959764_ForceRegion_ForceRegionImpulsesCapsule.py +++ b/AutomatedTesting/Gem/PythonTests/physics/C5959764_ForceRegion_ForceRegionImpulsesCapsule.py @@ -50,7 +50,8 @@ def C5959764_ForceRegion_ForceRegionImpulsesCapsule(): imports.init() - from utils import Report, TestHelper as helper + 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 @@ -173,5 +174,5 @@ if __name__ == "__main__": import ImportPathHelper as imports imports.init() - from utils import Report + from editor_python_test_tools.utils import Report Report.start_test(C5959764_ForceRegion_ForceRegionImpulsesCapsule) diff --git a/AutomatedTesting/Gem/PythonTests/physics/C5959765_ForceRegion_AssetGetsImpulsed.py b/AutomatedTesting/Gem/PythonTests/physics/C5959765_ForceRegion_AssetGetsImpulsed.py index 1afd7b4536..ddcba5996b 100755 --- a/AutomatedTesting/Gem/PythonTests/physics/C5959765_ForceRegion_AssetGetsImpulsed.py +++ b/AutomatedTesting/Gem/PythonTests/physics/C5959765_ForceRegion_AssetGetsImpulsed.py @@ -53,7 +53,8 @@ def C5959765_ForceRegion_AssetGetsImpulsed(): imports.init() - from utils import Report, TestHelper as helper + 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 @@ -175,5 +176,5 @@ if __name__ == "__main__": import ImportPathHelper as imports imports.init() - from utils import Report + from editor_python_test_tools.utils import Report Report.start_test(C5959765_ForceRegion_AssetGetsImpulsed) diff --git a/AutomatedTesting/Gem/PythonTests/physics/C5959808_ForceRegion_PositionOffset.py b/AutomatedTesting/Gem/PythonTests/physics/C5959808_ForceRegion_PositionOffset.py index f105c5642e..175f73a420 100755 --- a/AutomatedTesting/Gem/PythonTests/physics/C5959808_ForceRegion_PositionOffset.py +++ b/AutomatedTesting/Gem/PythonTests/physics/C5959808_ForceRegion_PositionOffset.py @@ -133,8 +133,8 @@ def C5959808_ForceRegion_PositionOffset(): imports.init() - from utils import Report - from utils import TestHelper as helper + 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.math as azmath @@ -412,5 +412,5 @@ if __name__ == "__main__": import ImportPathHelper as imports imports.init() - from utils import Report + from editor_python_test_tools.utils import Report Report.start_test(C5959808_ForceRegion_PositionOffset) diff --git a/AutomatedTesting/Gem/PythonTests/physics/C5959809_ForceRegion_RotationalOffset.py b/AutomatedTesting/Gem/PythonTests/physics/C5959809_ForceRegion_RotationalOffset.py index f0379d20f7..1ad53194d3 100755 --- a/AutomatedTesting/Gem/PythonTests/physics/C5959809_ForceRegion_RotationalOffset.py +++ b/AutomatedTesting/Gem/PythonTests/physics/C5959809_ForceRegion_RotationalOffset.py @@ -134,8 +134,8 @@ def C5959809_ForceRegion_RotationalOffset(): imports.init() - from utils import Report - from utils import TestHelper as helper + 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.math as azmath @@ -412,5 +412,5 @@ if __name__ == "__main__": import ImportPathHelper as imports imports.init() - from utils import Report + from editor_python_test_tools.utils import Report Report.start_test(C5959809_ForceRegion_RotationalOffset) diff --git a/AutomatedTesting/Gem/PythonTests/physics/C5959810_ForceRegion_ForceRegionCombinesForces.py b/AutomatedTesting/Gem/PythonTests/physics/C5959810_ForceRegion_ForceRegionCombinesForces.py index e09b58ecdc..212f7cc86b 100755 --- a/AutomatedTesting/Gem/PythonTests/physics/C5959810_ForceRegion_ForceRegionCombinesForces.py +++ b/AutomatedTesting/Gem/PythonTests/physics/C5959810_ForceRegion_ForceRegionCombinesForces.py @@ -74,8 +74,8 @@ def C5959810_ForceRegion_ForceRegionCombinesForces(): imports.init() - from utils import Report - from utils import TestHelper as helper + 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 @@ -241,5 +241,5 @@ if __name__ == "__main__": import ImportPathHelper as imports imports.init() - from utils import Report + from editor_python_test_tools.utils import Report Report.start_test(C5959810_ForceRegion_ForceRegionCombinesForces) diff --git a/AutomatedTesting/Gem/PythonTests/physics/C5968759_ForceRegion_ExertsSeveralForcesOnRigidBody.py b/AutomatedTesting/Gem/PythonTests/physics/C5968759_ForceRegion_ExertsSeveralForcesOnRigidBody.py index 3bdb4410ea..4aa0fef642 100755 --- a/AutomatedTesting/Gem/PythonTests/physics/C5968759_ForceRegion_ExertsSeveralForcesOnRigidBody.py +++ b/AutomatedTesting/Gem/PythonTests/physics/C5968759_ForceRegion_ExertsSeveralForcesOnRigidBody.py @@ -67,7 +67,8 @@ def C5968759_ForceRegion_ExertsSeveralForcesOnRigidBody(): import azlmbr.legacy.general as general import azlmbr.bus as bus import azlmbr.physics - from utils import Report, TestHelper as helper + from editor_python_test_tools.utils import Report + from editor_python_test_tools.utils import TestHelper as helper # Constants TIME_OUT = 6.0 # Second to wait before timing out @@ -181,5 +182,5 @@ if __name__ == "__main__": import ImportPathHelper as imports imports.init() - from utils import Report + from editor_python_test_tools.utils import Report Report.start_test(C5968759_ForceRegion_ExertsSeveralForcesOnRigidBody) diff --git a/AutomatedTesting/Gem/PythonTests/physics/C5968760_ForceRegion_CheckNetForceChange.py b/AutomatedTesting/Gem/PythonTests/physics/C5968760_ForceRegion_CheckNetForceChange.py index 7c7c11f548..ba491c96a7 100755 --- a/AutomatedTesting/Gem/PythonTests/physics/C5968760_ForceRegion_CheckNetForceChange.py +++ b/AutomatedTesting/Gem/PythonTests/physics/C5968760_ForceRegion_CheckNetForceChange.py @@ -70,9 +70,8 @@ def C5968760_ForceRegion_CheckNetForceChange(): imports.init() - - from utils import Report - from utils import TestHelper as helper + 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 @@ -171,5 +170,5 @@ if __name__ == "__main__": import ImportPathHelper as imports imports.init() - from utils import Report + from editor_python_test_tools.utils import Report Report.start_test(C5968760_ForceRegion_CheckNetForceChange) diff --git a/AutomatedTesting/Gem/PythonTests/physics/C6032082_Terrain_MultipleResolutionsValid.py b/AutomatedTesting/Gem/PythonTests/physics/C6032082_Terrain_MultipleResolutionsValid.py index d79954d26f..4543b0b8f6 100755 --- a/AutomatedTesting/Gem/PythonTests/physics/C6032082_Terrain_MultipleResolutionsValid.py +++ b/AutomatedTesting/Gem/PythonTests/physics/C6032082_Terrain_MultipleResolutionsValid.py @@ -89,9 +89,8 @@ def C6032082_Terrain_MultipleResolutionsValid(): imports.init() - - from utils import Report - from utils import TestHelper as helper + 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 @@ -217,5 +216,5 @@ if __name__ == "__main__": import ImportPathHelper as imports imports.init() - from utils import Report + from editor_python_test_tools.utils import Report Report.start_test(C6032082_Terrain_MultipleResolutionsValid) diff --git a/AutomatedTesting/Gem/PythonTests/physics/C6090546_ForceRegion_SliceFileInstantiates.py b/AutomatedTesting/Gem/PythonTests/physics/C6090546_ForceRegion_SliceFileInstantiates.py index 825b8287d1..557b7e7ec5 100755 --- a/AutomatedTesting/Gem/PythonTests/physics/C6090546_ForceRegion_SliceFileInstantiates.py +++ b/AutomatedTesting/Gem/PythonTests/physics/C6090546_ForceRegion_SliceFileInstantiates.py @@ -72,9 +72,8 @@ def C6090546_ForceRegion_SliceFileInstantiates(): imports.init() - - from utils import Report - from utils import TestHelper as helper + 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 @@ -146,5 +145,5 @@ if __name__ == "__main__": import ImportPathHelper as imports imports.init() - from utils import Report + from editor_python_test_tools.utils import Report Report.start_test(C6090546_ForceRegion_SliceFileInstantiates) diff --git a/AutomatedTesting/Gem/PythonTests/physics/C6090547_ForceRegion_ParentChildForceRegions.py b/AutomatedTesting/Gem/PythonTests/physics/C6090547_ForceRegion_ParentChildForceRegions.py index a62a673b9f..a07fd1861b 100755 --- a/AutomatedTesting/Gem/PythonTests/physics/C6090547_ForceRegion_ParentChildForceRegions.py +++ b/AutomatedTesting/Gem/PythonTests/physics/C6090547_ForceRegion_ParentChildForceRegions.py @@ -81,13 +81,12 @@ def C6090547_ForceRegion_ParentChildForceRegions(): imports.init() - import azlmbr.legacy.general as general import azlmbr.bus import azlmbr.math as lymath - from utils import Report - from utils import TestHelper as helper + from editor_python_test_tools.utils import Report + from editor_python_test_tools.utils import TestHelper as helper # Constants TIMEOUT = 3.0 @@ -207,5 +206,5 @@ if __name__ == "__main__": import ImportPathHelper as imports imports.init() - from utils import Report + from editor_python_test_tools.utils import Report Report.start_test(C6090547_ForceRegion_ParentChildForceRegions) diff --git a/AutomatedTesting/Gem/PythonTests/physics/C6090550_ForceRegion_WorldSpaceForceNegative.py b/AutomatedTesting/Gem/PythonTests/physics/C6090550_ForceRegion_WorldSpaceForceNegative.py index c85dc6a273..f8da62ebac 100755 --- a/AutomatedTesting/Gem/PythonTests/physics/C6090550_ForceRegion_WorldSpaceForceNegative.py +++ b/AutomatedTesting/Gem/PythonTests/physics/C6090550_ForceRegion_WorldSpaceForceNegative.py @@ -78,12 +78,11 @@ def C6090550_ForceRegion_WorldSpaceForceNegative(): imports.init() - import azlmbr.legacy.general as general import azlmbr.bus - from utils import Report - from utils import TestHelper as helper + from editor_python_test_tools.utils import Report + from editor_python_test_tools.utils import TestHelper as helper helper.init_idle() @@ -251,5 +250,5 @@ if __name__ == "__main__": import ImportPathHelper as imports imports.init() - from utils import Report + from editor_python_test_tools.utils import Report Report.start_test(C6090550_ForceRegion_WorldSpaceForceNegative) diff --git a/AutomatedTesting/Gem/PythonTests/physics/C6090551_ForceRegion_LocalSpaceForceNegative.py b/AutomatedTesting/Gem/PythonTests/physics/C6090551_ForceRegion_LocalSpaceForceNegative.py index 45f9b21522..0788b1da66 100755 --- a/AutomatedTesting/Gem/PythonTests/physics/C6090551_ForceRegion_LocalSpaceForceNegative.py +++ b/AutomatedTesting/Gem/PythonTests/physics/C6090551_ForceRegion_LocalSpaceForceNegative.py @@ -78,12 +78,11 @@ def C6090551_ForceRegion_LocalSpaceForceNegative(): imports.init() - import azlmbr.legacy.general as general import azlmbr.bus - from utils import Report - from utils import TestHelper as helper + from editor_python_test_tools.utils import Report + from editor_python_test_tools.utils import TestHelper as helper helper.init_idle() @@ -251,5 +250,5 @@ if __name__ == "__main__": import ImportPathHelper as imports imports.init() - from utils import Report + from editor_python_test_tools.utils import Report Report.start_test(C6090551_ForceRegion_LocalSpaceForceNegative) diff --git a/AutomatedTesting/Gem/PythonTests/physics/C6090552_ForceRegion_LinearDampingNegative.py b/AutomatedTesting/Gem/PythonTests/physics/C6090552_ForceRegion_LinearDampingNegative.py index 5751f55b0c..a878819045 100755 --- a/AutomatedTesting/Gem/PythonTests/physics/C6090552_ForceRegion_LinearDampingNegative.py +++ b/AutomatedTesting/Gem/PythonTests/physics/C6090552_ForceRegion_LinearDampingNegative.py @@ -77,12 +77,11 @@ def C6090552_ForceRegion_LinearDampingNegative(): imports.init() - import azlmbr.legacy.general as general import azlmbr.bus - from utils import Report - from utils import TestHelper as helper + from editor_python_test_tools.utils import Report + from editor_python_test_tools.utils import TestHelper as helper helper.init_idle() @@ -250,5 +249,5 @@ if __name__ == "__main__": import ImportPathHelper as imports imports.init() - from utils import Report + from editor_python_test_tools.utils import Report Report.start_test(C6090552_ForceRegion_LinearDampingNegative) diff --git a/AutomatedTesting/Gem/PythonTests/physics/C6090553_ForceRegion_SimpleDragForceOnRigidBodies.py b/AutomatedTesting/Gem/PythonTests/physics/C6090553_ForceRegion_SimpleDragForceOnRigidBodies.py index 3c995bca62..43c4335918 100755 --- a/AutomatedTesting/Gem/PythonTests/physics/C6090553_ForceRegion_SimpleDragForceOnRigidBodies.py +++ b/AutomatedTesting/Gem/PythonTests/physics/C6090553_ForceRegion_SimpleDragForceOnRigidBodies.py @@ -72,12 +72,11 @@ def C6090553_ForceRegion_SimpleDragForceOnRigidBodies(): imports.init() - import azlmbr.legacy.general as general import azlmbr.bus - from utils import Report - from utils import TestHelper as helper + from editor_python_test_tools.utils import Report + from editor_python_test_tools.utils import TestHelper as helper # Holds details about the ball class Ball: @@ -182,5 +181,5 @@ if __name__ == "__main__": import ImportPathHelper as imports imports.init() - from utils import Report + from editor_python_test_tools.utils import Report Report.start_test(C6090553_ForceRegion_SimpleDragForceOnRigidBodies) diff --git a/AutomatedTesting/Gem/PythonTests/physics/C6090554_ForceRegion_PointForceNegative.py b/AutomatedTesting/Gem/PythonTests/physics/C6090554_ForceRegion_PointForceNegative.py index 0ea8ca2e4b..d7781b6040 100755 --- a/AutomatedTesting/Gem/PythonTests/physics/C6090554_ForceRegion_PointForceNegative.py +++ b/AutomatedTesting/Gem/PythonTests/physics/C6090554_ForceRegion_PointForceNegative.py @@ -78,12 +78,11 @@ def C6090554_ForceRegion_PointForceNegative(): imports.init() - import azlmbr.legacy.general as general import azlmbr.bus - from utils import Report - from utils import TestHelper as helper + from editor_python_test_tools.utils import Report + from editor_python_test_tools.utils import TestHelper as helper helper.init_idle() @@ -251,5 +250,5 @@ if __name__ == "__main__": import ImportPathHelper as imports imports.init() - from utils import Report + from editor_python_test_tools.utils import Report Report.start_test(C6090554_ForceRegion_PointForceNegative) diff --git a/AutomatedTesting/Gem/PythonTests/physics/C6090555_ForceRegion_SplineFollowOnRigidBodies.py b/AutomatedTesting/Gem/PythonTests/physics/C6090555_ForceRegion_SplineFollowOnRigidBodies.py index dfa992bc21..b1b76d896d 100755 --- a/AutomatedTesting/Gem/PythonTests/physics/C6090555_ForceRegion_SplineFollowOnRigidBodies.py +++ b/AutomatedTesting/Gem/PythonTests/physics/C6090555_ForceRegion_SplineFollowOnRigidBodies.py @@ -74,9 +74,8 @@ def C6090555_ForceRegion_SplineFollowOnRigidBodies(): imports.init() - - from utils import Report - from utils import TestHelper as helper + from editor_python_test_tools.utils import Report + from editor_python_test_tools.utils import TestHelper as helper import azlmbr import azlmbr.legacy.general as general @@ -184,5 +183,5 @@ if __name__ == "__main__": import ImportPathHelper as imports imports.init() - from utils import Report + from editor_python_test_tools.utils import Report Report.start_test(C6090555_ForceRegion_SplineFollowOnRigidBodies) diff --git a/AutomatedTesting/Gem/PythonTests/physics/C6131473_StaticSlice_OnDynamicSliceSpawn.py b/AutomatedTesting/Gem/PythonTests/physics/C6131473_StaticSlice_OnDynamicSliceSpawn.py index 5e475a4c4c..11281df4eb 100755 --- a/AutomatedTesting/Gem/PythonTests/physics/C6131473_StaticSlice_OnDynamicSliceSpawn.py +++ b/AutomatedTesting/Gem/PythonTests/physics/C6131473_StaticSlice_OnDynamicSliceSpawn.py @@ -67,9 +67,8 @@ def C6131473_StaticSlice_OnDynamicSliceSpawn(): imports.init() - - from utils import Report - from utils import TestHelper as helper + 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 @@ -111,5 +110,5 @@ if __name__ == "__main__": import ImportPathHelper as imports imports.init() - from utils import Report + from editor_python_test_tools.utils import Report Report.start_test(C6131473_StaticSlice_OnDynamicSliceSpawn) diff --git a/AutomatedTesting/Gem/PythonTests/physics/C6224408_ScriptCanvas_EntitySpawn.py b/AutomatedTesting/Gem/PythonTests/physics/C6224408_ScriptCanvas_EntitySpawn.py index f88e07bf86..6501e11e68 100755 --- a/AutomatedTesting/Gem/PythonTests/physics/C6224408_ScriptCanvas_EntitySpawn.py +++ b/AutomatedTesting/Gem/PythonTests/physics/C6224408_ScriptCanvas_EntitySpawn.py @@ -69,9 +69,8 @@ def C6224408_ScriptCanvas_EntitySpawn(): imports.init() - - from utils import Report - from utils import TestHelper as helper + 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 @@ -152,5 +151,5 @@ if __name__ == "__main__": import ImportPathHelper as imports imports.init() - from utils import Report + from editor_python_test_tools.utils import Report Report.start_test(C6224408_ScriptCanvas_EntitySpawn) diff --git a/AutomatedTesting/Gem/PythonTests/physics/C6274125_ScriptCanvas_TriggerEvents.py b/AutomatedTesting/Gem/PythonTests/physics/C6274125_ScriptCanvas_TriggerEvents.py index 64baa81140..44c8be9e1e 100755 --- a/AutomatedTesting/Gem/PythonTests/physics/C6274125_ScriptCanvas_TriggerEvents.py +++ b/AutomatedTesting/Gem/PythonTests/physics/C6274125_ScriptCanvas_TriggerEvents.py @@ -75,12 +75,11 @@ def C6274125_ScriptCanvas_TriggerEvents(): imports.init() - import azlmbr.legacy.general as general import azlmbr.bus - from utils import Report - from utils import TestHelper as helper + from editor_python_test_tools.utils import Report + from editor_python_test_tools.utils import TestHelper as helper helper.init_idle() @@ -136,5 +135,5 @@ if __name__ == "__main__": import ImportPathHelper as imports imports.init() - from utils import Report + from editor_python_test_tools.utils import Report Report.start_test(C6274125_ScriptCanvas_TriggerEvents) diff --git a/AutomatedTesting/Gem/PythonTests/physics/C6321601_Force_HighValuesDirectionAxes.py b/AutomatedTesting/Gem/PythonTests/physics/C6321601_Force_HighValuesDirectionAxes.py index 2b0168a2fe..c1a51f2887 100755 --- a/AutomatedTesting/Gem/PythonTests/physics/C6321601_Force_HighValuesDirectionAxes.py +++ b/AutomatedTesting/Gem/PythonTests/physics/C6321601_Force_HighValuesDirectionAxes.py @@ -99,10 +99,9 @@ def C6321601_Force_HighValuesDirectionAxes(): imports.init() - - from utils import Report - from utils import TestHelper as helper - from utils import Tracer + from editor_python_test_tools.utils import Report + from editor_python_test_tools.utils import TestHelper as helper + from editor_python_test_tools.utils import Tracer import azlmbr.legacy.general as general import azlmbr.bus @@ -256,5 +255,5 @@ if __name__ == "__main__": import ImportPathHelper as imports imports.init() - from utils import Report + from editor_python_test_tools.utils import Report Report.start_test(C6321601_Force_HighValuesDirectionAxes) diff --git a/AutomatedTesting/Gem/PythonTests/physics/JointsHelper.py b/AutomatedTesting/Gem/PythonTests/physics/JointsHelper.py index db07f4e14a..e61118ef5b 100755 --- a/AutomatedTesting/Gem/PythonTests/physics/JointsHelper.py +++ b/AutomatedTesting/Gem/PythonTests/physics/JointsHelper.py @@ -13,7 +13,7 @@ import ImportPathHelper as imports imports.init() -from utils import Report +from editor_python_test_tools.utils import Report import azlmbr.legacy.general as general import azlmbr.bus diff --git a/AutomatedTesting/Gem/PythonTests/physics/UtilTest_Managed_Files.py b/AutomatedTesting/Gem/PythonTests/physics/UtilTest_Managed_Files.py index 94c1335536..bc6697afaf 100755 --- a/AutomatedTesting/Gem/PythonTests/physics/UtilTest_Managed_Files.py +++ b/AutomatedTesting/Gem/PythonTests/physics/UtilTest_Managed_Files.py @@ -22,8 +22,8 @@ def run(): imports.init() - from utils import Report - from utils import TestHelper as helper + from editor_python_test_tools.utils import Report + from editor_python_test_tools.utils import TestHelper as helper helper.init_idle() Report.success(Tests.passed) diff --git a/AutomatedTesting/Gem/PythonTests/physics/UtilTest_Physmaterial_Editor.py b/AutomatedTesting/Gem/PythonTests/physics/UtilTest_Physmaterial_Editor.py index 666b4910a1..5f24f41083 100755 --- a/AutomatedTesting/Gem/PythonTests/physics/UtilTest_Physmaterial_Editor.py +++ b/AutomatedTesting/Gem/PythonTests/physics/UtilTest_Physmaterial_Editor.py @@ -58,9 +58,8 @@ def run(): imports.init() - - from utils import Report - from utils import TestHelper as helper + from editor_python_test_tools.utils import Report + from editor_python_test_tools.utils import TestHelper as helper import azlmbr.legacy.general as general from Physmaterial_Editor import Physmaterial_Editor diff --git a/AutomatedTesting/Gem/PythonTests/physics/UtilTest_Tracer_PicksErrorsAndWarnings.py b/AutomatedTesting/Gem/PythonTests/physics/UtilTest_Tracer_PicksErrorsAndWarnings.py index 0aeb8aa73a..fa904250ea 100755 --- a/AutomatedTesting/Gem/PythonTests/physics/UtilTest_Tracer_PicksErrorsAndWarnings.py +++ b/AutomatedTesting/Gem/PythonTests/physics/UtilTest_Tracer_PicksErrorsAndWarnings.py @@ -39,12 +39,11 @@ def run(): imports.init() - import azlmbr.legacy.general as general - from utils import Report - from utils import TestHelper as helper - from utils import Tracer + from editor_python_test_tools.utils import Report + from editor_python_test_tools.utils import TestHelper as helper + from editor_python_test_tools.utils import Tracer helper.init_idle() diff --git a/AutomatedTesting/Gem/PythonTests/scripting/Docking_Pane.py b/AutomatedTesting/Gem/PythonTests/scripting/Docking_Pane.py index 3b54c0de72..25dd83e5e2 100755 --- a/AutomatedTesting/Gem/PythonTests/scripting/Docking_Pane.py +++ b/AutomatedTesting/Gem/PythonTests/scripting/Docking_Pane.py @@ -51,9 +51,9 @@ def Docking_Pane(): imports.init() - from utils import Report - from utils import TestHelper as helper - import pyside_utils + from editor_python_test_tools.utils import Report + from editor_python_test_tools.utils import TestHelper as helper + import editor_python_test_tools.pyside_utils as pyside_utils # Open 3D Engine imports import azlmbr.legacy.general as general @@ -114,6 +114,6 @@ if __name__ == "__main__": imports.init() - from utils import Report + from editor_python_test_tools.utils import Report Report.start_test(Docking_Pane) diff --git a/AutomatedTesting/Gem/PythonTests/scripting/Opening_Closing_Pane.py b/AutomatedTesting/Gem/PythonTests/scripting/Opening_Closing_Pane.py index 4ea4d791dd..6100285092 100755 --- a/AutomatedTesting/Gem/PythonTests/scripting/Opening_Closing_Pane.py +++ b/AutomatedTesting/Gem/PythonTests/scripting/Opening_Closing_Pane.py @@ -54,9 +54,9 @@ def Opening_Closing_Pane(): imports.init() - from utils import Report - from utils import TestHelper as helper - import pyside_utils + from editor_python_test_tools.utils import Report + from editor_python_test_tools.utils import TestHelper as helper + import editor_python_test_tools.pyside_utils as pyside_utils # Open 3D Engine Imports import azlmbr.legacy.general as general @@ -123,6 +123,6 @@ if __name__ == "__main__": imports.init() - from utils import Report + from editor_python_test_tools.utils import Report Report.start_test(Opening_Closing_Pane) diff --git a/AutomatedTesting/Gem/PythonTests/scripting/Resizing_Pane.py b/AutomatedTesting/Gem/PythonTests/scripting/Resizing_Pane.py index 216ef4fb7d..9262e76cb0 100755 --- a/AutomatedTesting/Gem/PythonTests/scripting/Resizing_Pane.py +++ b/AutomatedTesting/Gem/PythonTests/scripting/Resizing_Pane.py @@ -51,9 +51,9 @@ def Resizing_Pane(): imports.init() - from utils import Report - from utils import TestHelper as helper - import pyside_utils + from editor_python_test_tools.utils import Report + from editor_python_test_tools.utils import TestHelper as helper + import editor_python_test_tools.pyside_utils as pyside_utils # Open 3D Engine imports import azlmbr.legacy.general as general @@ -115,6 +115,6 @@ if __name__ == "__main__": import ImportPathHelper as imports imports.init() - from utils import Report + from editor_python_test_tools.utils import Report Report.start_test(Resizing_Pane) diff --git a/Code/CryEngine/CryCommon/IMovieSystem.h b/Code/CryEngine/CryCommon/IMovieSystem.h index 7a1125ae2b..c22394e1b3 100644 --- a/Code/CryEngine/CryCommon/IMovieSystem.h +++ b/Code/CryEngine/CryCommon/IMovieSystem.h @@ -327,7 +327,16 @@ struct IMovieCallback */ struct IAnimTrack { - AZ_RTTI(IAnimTrack, "{AA0D5170-FB28-426F-BA13-7EFF6BB3AC67}") + AZ_RTTI(IAnimTrack, "{AA0D5170-FB28-426F-BA13-7EFF6BB3AC67}"); + AZ_CLASS_ALLOCATOR(IAnimTrack, AZ::SystemAllocator, 0); + + static void Reflect(AZ::ReflectContext* context) + { + if (auto serializeContext = azrtti_cast(context)) + { + serializeContext->Class(); + } + } //! Flags that can be set on animation track. enum EAnimTrackFlags @@ -594,7 +603,16 @@ struct IAnimNodeOwner struct IAnimNode { public: - AZ_RTTI(IAnimNode, "{0A096354-7F26-4B18-B8C0-8F10A3E0440A}") + AZ_RTTI(IAnimNode, "{0A096354-7F26-4B18-B8C0-8F10A3E0440A}"); + AZ_CLASS_ALLOCATOR(IAnimNode, AZ::SystemAllocator, 0); + + static void Reflect(AZ::ReflectContext* context) + { + if (auto serializeContext = azrtti_cast(context)) + { + serializeContext->Class(); + } + } ////////////////////////////////////////////////////////////////////////// // Supported params. @@ -922,7 +940,7 @@ struct IAnimSequence static void Reflect(AZ::ReflectContext* context) { - if (auto serializeContext = azrtti_cast(context); serializeContext != nullptr) + if (auto serializeContext = azrtti_cast(context)) { serializeContext->Class(); } diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/PrefabEditorEntityOwnershipService.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/PrefabEditorEntityOwnershipService.cpp index cb16e0c099..07be2a6644 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/PrefabEditorEntityOwnershipService.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/PrefabEditorEntityOwnershipService.cpp @@ -279,7 +279,7 @@ namespace AzToolsFramework AZ::IO::PathView filePath, Prefab::InstanceOptionalReference instanceToParentUnder) { AZStd::unique_ptr createdPrefabInstance = - m_prefabSystemComponent->CreatePrefab(entities, AZStd::move(nestedPrefabInstances), filePath); + m_prefabSystemComponent->CreatePrefab(entities, AZStd::move(nestedPrefabInstances), filePath, nullptr, false); if (createdPrefabInstance) { diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Instance/Instance.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Instance/Instance.cpp index c1eee62dbc..eb247369c5 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Instance/Instance.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Instance/Instance.cpp @@ -321,7 +321,6 @@ namespace AzToolsFramework removedNestedInstance = AZStd::move(nestedInstanceIterator->second); removedNestedInstance->m_parent = nullptr; - removedNestedInstance->m_alias = InstanceAlias(); m_nestedInstances.erase(instanceAlias); } @@ -396,6 +395,14 @@ namespace AzToolsFramework } } + void Instance::GetNestedInstances(const AZStd::function&)>& callback) + { + for (auto& [instanceAlias, instance] : m_nestedInstances) + { + callback(instance); + } + } + void Instance::GetEntities(const AZStd::function&)>& callback) { for (auto& [entityAlias, entity] : m_entities) diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Instance/Instance.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Instance/Instance.h index 186dce0f50..821478b706 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Instance/Instance.h +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Instance/Instance.h @@ -114,6 +114,7 @@ namespace AzToolsFramework void GetConstEntities(const AZStd::function& callback); void GetNestedEntities(const AZStd::function&)>& callback); void GetEntities(const AZStd::function&)>& callback); + void GetNestedInstances(const AZStd::function&)>& callback); /** * Gets the alias for a given EnitityId in the Instance DOM. diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabPublicHandler.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabPublicHandler.cpp index 772e0ae52e..f9aa8c4b96 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabPublicHandler.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabPublicHandler.cpp @@ -101,6 +101,10 @@ namespace AzToolsFramework nestedInstance->GetInstanceAlias(), nestedInstance->GetLinkId(), undoBatch.GetUndoBatch()); } + PrefabUndoHelpers::UpdatePrefabInstance( + commonRootEntityOwningInstance->get(), "Update prefab instance", commonRootInstanceDomBeforeCreate, + undoBatch.GetUndoBatch()); + auto prefabEditorEntityOwnershipInterface = AZ::Interface::Get(); if (!prefabEditorEntityOwnershipInterface) { @@ -118,13 +122,21 @@ namespace AzToolsFramework "(A null instance is returned).")); } - PrefabUndoHelpers::UpdatePrefabInstance( - commonRootEntityOwningInstance->get(), "Update prefab instance", commonRootInstanceDomBeforeCreate, undoBatch.GetUndoBatch()); + AZ::EntityId containerEntityId = instanceToCreate->get().GetContainerEntityId(); + + instanceToCreate->get().GetNestedInstances([&](AZStd::unique_ptr& nestedInstance) { + AZ_Assert(nestedInstance, "Invalid nested instance found in the new prefab created."); + EntityOptionalReference nestedInstanceContainerEntity = nestedInstance->GetContainerEntity(); + AZ_Assert( + nestedInstanceContainerEntity, "Invalid container entity found for the nested instance used in prefab creation."); + CreateLink( + {&nestedInstanceContainerEntity->get()}, *nestedInstance, instanceToCreate->get().GetTemplateId(), + undoBatch.GetUndoBatch(), containerEntityId); + }); CreateLink( topLevelEntities, instanceToCreate->get(), commonRootEntityOwningInstance->get().GetTemplateId(), undoBatch.GetUndoBatch(), commonRootEntityId); - AZ::EntityId containerEntityId = instanceToCreate->get().GetContainerEntityId(); // Change top level entities to be parented to the container entity // Mark them as dirty so this change is correctly applied to the template @@ -225,19 +237,7 @@ namespace AzToolsFramework PrefabOperationResult PrefabPublicHandler::SavePrefab(AZ::IO::Path filePath) { - auto prefabSystemComponentInterface = AZ::Interface::Get(); - if (!prefabSystemComponentInterface) - { - AZ_Assert( - false, - "Prefab - PrefabPublicHandler - " - "Prefab System Component Interface could not be found. " - "Check that it is being correctly initialized."); - return AZ::Failure( - AZStd::string("SavePrefab - Internal error (Prefab System Component Interface could not be found).")); - } - - auto templateId = prefabSystemComponentInterface->GetTemplateIdFromFilePath(filePath.c_str()); + auto templateId = m_prefabSystemComponentInterface->GetTemplateIdFromFilePath(filePath.c_str()); if (templateId == InvalidTemplateId) { @@ -438,26 +438,14 @@ namespace AzToolsFramework PrefabRequestResult PrefabPublicHandler::HasUnsavedChanges(AZ::IO::Path prefabFilePath) const { - auto prefabSystemComponentInterface = AZ::Interface::Get(); - if (!prefabSystemComponentInterface) - { - AZ_Assert( - false, - "Prefab - PrefabPublicHandler - " - "Prefab System Component Interface could not be found. " - "Check that it is being correctly initialized."); - return AZ::Failure( - AZStd::string("HasUnsavedChanges - Internal error (Prefab System Component Interface could not be found).")); - } - - auto templateId = prefabSystemComponentInterface->GetTemplateIdFromFilePath(prefabFilePath.c_str()); + auto templateId = m_prefabSystemComponentInterface->GetTemplateIdFromFilePath(prefabFilePath.c_str()); if (templateId == InvalidTemplateId) { return AZ::Failure(AZStd::string("HasUnsavedChanges - Path error. Path could be invalid, or the prefab may not be loaded in this level.")); } - return AZ::Success(prefabSystemComponentInterface->IsTemplateDirty(templateId)); + return AZ::Success(m_prefabSystemComponentInterface->IsTemplateDirty(templateId)); } PrefabOperationResult PrefabPublicHandler::DeleteEntitiesInInstance(const EntityIdList& entityIds) diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabSystemComponent.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabSystemComponent.cpp index 54e99c9416..d89a388e91 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabSystemComponent.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabSystemComponent.cpp @@ -91,8 +91,9 @@ namespace AzToolsFramework m_instanceUpdateExecutor.UpdateTemplateInstancesInQueue(); } - AZStd::unique_ptr PrefabSystemComponent::CreatePrefab(const AZStd::vector& entities, AZStd::vector>&& instancesToConsume, - AZ::IO::PathView filePath, AZStd::unique_ptr containerEntity) + AZStd::unique_ptr PrefabSystemComponent::CreatePrefab( + const AZStd::vector& entities, AZStd::vector>&& instancesToConsume, + AZ::IO::PathView filePath, AZStd::unique_ptr containerEntity, bool shouldCreateLinks) { AZ::IO::Path relativeFilePath = m_prefabLoader.GetRelativePathToProject(filePath); if (GetTemplateIdFromFilePath(relativeFilePath) != InvalidTemplateId) @@ -123,7 +124,7 @@ namespace AzToolsFramework newInstance->SetTemplateSourcePath(relativeFilePath); newInstance->SetContainerEntityName(relativeFilePath.Stem().Native()); - TemplateId newTemplateId = CreateTemplateFromInstance(*newInstance); + TemplateId newTemplateId = CreateTemplateFromInstance(*newInstance, shouldCreateLinks); if (newTemplateId == InvalidTemplateId) { AZ_Error("Prefab", false, @@ -289,7 +290,7 @@ namespace AzToolsFramework return newInstance; } - TemplateId PrefabSystemComponent::CreateTemplateFromInstance(Instance& instance) + TemplateId PrefabSystemComponent::CreateTemplateFromInstance(Instance& instance, bool shouldCreateLinks) { // We will register the template to match the path the instance has const AZ::IO::Path& templateSourcePath = instance.GetTemplateSourcePath(); @@ -323,14 +324,15 @@ namespace AzToolsFramework return InvalidTemplateId; } - if (!GenerateLinksForNewTemplate(newTemplateId, instance)) + if (shouldCreateLinks) { - // Clear new template and any links associated with it - RemoveTemplate(newTemplateId); - - return InvalidTemplateId; + if (!GenerateLinksForNewTemplate(newTemplateId, instance)) + { + // Clear new template and any links associated with it + RemoveTemplate(newTemplateId); + return InvalidTemplateId; + } } - return newTemplateId; } diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabSystemComponent.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabSystemComponent.h index 40780b9775..d4499d1e2d 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabSystemComponent.h +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabSystemComponent.h @@ -187,17 +187,22 @@ namespace AzToolsFramework * @param entities A vector of entities that will be used in the new instance. May be empty * @param instances A vector of Prefab Instances that will be nested in the new instance, will be consumed and moved. * May be empty - * @param filePath the path to associate the template of the new instance to + * @param filePath the path to associate the template of the new instance to. + * @param containerEntity The container entity for the prefab to be created. It will be created if a nullptr is provided. + * @param shouldCreateLinks The flag indicating if links should be created between the templates of the instance + * and its nested instances. * @return A pointer to the newly created instance. nullptr on failure */ - AZStd::unique_ptr CreatePrefab(const AZStd::vector& entities, AZStd::vector>&& instancesToConsume, - AZ::IO::PathView filePath, AZStd::unique_ptr containerEntity = nullptr) override; + AZStd::unique_ptr CreatePrefab( + const AZStd::vector& entities, AZStd::vector>&& instancesToConsume, + AZ::IO::PathView filePath, AZStd::unique_ptr containerEntity = nullptr, + bool ShouldCreateLinks = true) override; PrefabDom& FindTemplateDom(TemplateId templateId) override; /** * Updates a template with the given updated DOM. - * + * * @param templateId The id of the template to update. * @param updatedDom The DOM to update the template with. */ @@ -260,9 +265,11 @@ namespace AzToolsFramework /** * Takes a prefab instance and generates a new Prefab Template * along with any new Prefab Links representing any of the nested instances present - * @param instance The instance used to generate the new Template + * @param instance The instance used to generate the new Template. + * @param shouldCreateLinks The flag indicating if links should be created between the templates of the instance + * and its nested instances. */ - TemplateId CreateTemplateFromInstance(Instance& instance); + TemplateId CreateTemplateFromInstance(Instance& instance, bool shouldCreateLinks); /** * Connect two templates with given link, and a nested instance value iterator diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabSystemComponentInterface.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabSystemComponentInterface.h index 8b94935cc1..f0ea99f3dd 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabSystemComponentInterface.h +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabSystemComponentInterface.h @@ -61,7 +61,7 @@ namespace AzToolsFramework virtual AZStd::unique_ptr InstantiatePrefab(const TemplateId& templateId) = 0; virtual AZStd::unique_ptr CreatePrefab(const AZStd::vector& entities, AZStd::vector>&& instancesToConsume, AZ::IO::PathView filePath, - AZStd::unique_ptr containerEntity = nullptr) = 0; + AZStd::unique_ptr containerEntity = nullptr, bool ShouldCreateLinks = true) = 0; }; diff --git a/Code/Sandbox/Editor/Core/LevelEditorMenuHandler.cpp b/Code/Sandbox/Editor/Core/LevelEditorMenuHandler.cpp index 0863e1627f..aed53d6e8b 100644 --- a/Code/Sandbox/Editor/Core/LevelEditorMenuHandler.cpp +++ b/Code/Sandbox/Editor/Core/LevelEditorMenuHandler.cpp @@ -577,16 +577,6 @@ void LevelEditorMenuHandler::PopulateEditMenu(ActionManager::MenuWrapper& editMe modifyMenu.AddAction(ID_MODIFY_LINK); modifyMenu.AddAction(ID_MODIFY_UNLINK); modifyMenu.AddSeparator(); - - auto alignMenu = modifyMenu.AddMenu(tr("Align")); - alignMenu.AddAction(ID_OBJECTMODIFY_ALIGNTOGRID); - - auto constrainMenu = modifyMenu.AddMenu(tr("Constrain")); - constrainMenu.AddAction(ID_SELECT_AXIS_X); - constrainMenu.AddAction(ID_SELECT_AXIS_Y); - constrainMenu.AddAction(ID_SELECT_AXIS_Z); - constrainMenu.AddAction(ID_SELECT_AXIS_XY); - constrainMenu.AddAction(ID_SELECT_AXIS_TERRAIN); } auto snapMenu = modifyMenu.AddMenu(tr("Snap")); @@ -608,20 +598,10 @@ void LevelEditorMenuHandler::PopulateEditMenu(ActionManager::MenuWrapper& editMe } auto transformModeMenu = modifyMenu.AddMenu(tr("Transform Mode")); - if (!newViewportInteractionModelEnabled) - { - transformModeMenu.AddAction(ID_EDITMODE_SELECT); - } - transformModeMenu.AddAction(ID_EDITMODE_MOVE); transformModeMenu.AddAction(ID_EDITMODE_ROTATE); transformModeMenu.AddAction(ID_EDITMODE_SCALE); - if (!newViewportInteractionModelEnabled) - { - transformModeMenu.AddAction(ID_EDITMODE_SELECTAREA); - } - editMenu.AddSeparator(); // Lock Selection diff --git a/Code/Sandbox/Editor/CryEdit.cpp b/Code/Sandbox/Editor/CryEdit.cpp index b373ef0009..a474706910 100644 --- a/Code/Sandbox/Editor/CryEdit.cpp +++ b/Code/Sandbox/Editor/CryEdit.cpp @@ -125,7 +125,6 @@ AZ_POP_DISABLE_WARNING #include "AnimationContext.h" #include "GotoPositionDlg.h" -#include "SetVectorDlg.h" #include "ConsoleDialog.h" #include "Controls/ConsoleSCB.h" @@ -395,29 +394,20 @@ void CCryEditApp::RegisterActionHandlers() ON_COMMAND(ID_EDITMODE_MOVE, OnEditmodeMove) ON_COMMAND(ID_EDITMODE_ROTATE, OnEditmodeRotate) ON_COMMAND(ID_EDITMODE_SCALE, OnEditmodeScale) - ON_COMMAND(ID_EDITMODE_SELECT, OnEditmodeSelect) ON_COMMAND(ID_OBJECTMODIFY_SETAREA, OnObjectSetArea) ON_COMMAND(ID_OBJECTMODIFY_SETHEIGHT, OnObjectSetHeight) ON_COMMAND(ID_OBJECTMODIFY_FREEZE, OnObjectmodifyFreeze) ON_COMMAND(ID_OBJECTMODIFY_UNFREEZE, OnObjectmodifyUnfreeze) - ON_COMMAND(ID_EDITMODE_SELECTAREA, OnEditmodeSelectarea) - ON_COMMAND(ID_SELECT_AXIS_X, OnSelectAxisX) - ON_COMMAND(ID_SELECT_AXIS_Y, OnSelectAxisY) - ON_COMMAND(ID_SELECT_AXIS_Z, OnSelectAxisZ) - ON_COMMAND(ID_SELECT_AXIS_XY, OnSelectAxisXy) ON_COMMAND(ID_UNDO, OnUndo) ON_COMMAND(ID_TOOLBAR_WIDGET_REDO, OnUndo) // Can't use the same ID, because for the menu we can't have a QWidgetAction, while for the toolbar we want one ON_COMMAND(ID_SELECTION_SAVE, OnSelectionSave) ON_COMMAND(ID_IMPORT_ASSET, OnOpenAssetImporter) ON_COMMAND(ID_SELECTION_LOAD, OnSelectionLoad) - ON_COMMAND(ID_OBJECTMODIFY_ALIGNTOGRID, OnAlignToGrid) ON_COMMAND(ID_LOCK_SELECTION, OnLockSelection) ON_COMMAND(ID_EDIT_LEVELDATA, OnEditLevelData) ON_COMMAND(ID_FILE_EDITLOGFILE, OnFileEditLogFile) ON_COMMAND(ID_FILE_RESAVESLICES, OnFileResaveSlices) ON_COMMAND(ID_FILE_EDITEDITORINI, OnFileEditEditorini) - ON_COMMAND(ID_SELECT_AXIS_TERRAIN, OnSelectAxisTerrain) - ON_COMMAND(ID_SELECT_AXIS_SNAPTOALL, OnSelectAxisSnapToAll) ON_COMMAND(ID_PREFERENCES, OnPreferences) ON_COMMAND(ID_RELOAD_GEOMETRY, OnReloadGeometry) ON_COMMAND(ID_REDO, OnRedo) @@ -484,7 +474,6 @@ void CCryEditApp::RegisterActionHandlers() ON_COMMAND(ID_VIEW_CYCLE2DVIEWPORT, OnViewCycle2dviewport) #endif ON_COMMAND(ID_DISPLAY_GOTOPOSITION, OnDisplayGotoPosition) - ON_COMMAND(ID_DISPLAY_SETVECTOR, OnDisplaySetVector) ON_COMMAND(ID_SNAPANGLE, OnSnapangle) ON_COMMAND(ID_RULER, OnRuler) ON_COMMAND(ID_ROTATESELECTION_XAXIS, OnRotateselectionXaxis) @@ -2755,85 +2744,31 @@ void CCryEditApp::OnSetHeight() ////////////////////////////////////////////////////////////////////////// void CCryEditApp::OnEditmodeMove() { - if (GetIEditor()->IsNewViewportInteractionModelEnabled()) - { - using namespace AzToolsFramework; - EditorTransformComponentSelectionRequestBus::Event( - GetEntityContextId(), - &EditorTransformComponentSelectionRequests::SetTransformMode, - EditorTransformComponentSelectionRequests::Mode::Translation); - } - else - { - GetIEditor()->SetEditMode(eEditModeMove); - } + using namespace AzToolsFramework; + EditorTransformComponentSelectionRequestBus::Event( + GetEntityContextId(), + &EditorTransformComponentSelectionRequests::SetTransformMode, + EditorTransformComponentSelectionRequests::Mode::Translation); } ////////////////////////////////////////////////////////////////////////// void CCryEditApp::OnEditmodeRotate() { - if (GetIEditor()->IsNewViewportInteractionModelEnabled()) - { - using namespace AzToolsFramework; - EditorTransformComponentSelectionRequestBus::Event( - GetEntityContextId(), - &EditorTransformComponentSelectionRequests::SetTransformMode, - EditorTransformComponentSelectionRequests::Mode::Rotation); - } - else - { - GetIEditor()->SetEditMode(eEditModeRotate); - } + using namespace AzToolsFramework; + EditorTransformComponentSelectionRequestBus::Event( + GetEntityContextId(), + &EditorTransformComponentSelectionRequests::SetTransformMode, + EditorTransformComponentSelectionRequests::Mode::Rotation); } ////////////////////////////////////////////////////////////////////////// void CCryEditApp::OnEditmodeScale() { - if (GetIEditor()->IsNewViewportInteractionModelEnabled()) - { - using namespace AzToolsFramework; - EditorTransformComponentSelectionRequestBus::Event( - GetEntityContextId(), - &EditorTransformComponentSelectionRequests::SetTransformMode, - EditorTransformComponentSelectionRequests::Mode::Scale); - } - else - { - GetIEditor()->SetEditMode(eEditModeScale); - } -} - -////////////////////////////////////////////////////////////////////////// -void CCryEditApp::OnEditmodeSelect() -{ - if (!GetIEditor()->IsNewViewportInteractionModelEnabled()) - { - GetIEditor()->SetEditMode(eEditModeSelect); - } -} - -////////////////////////////////////////////////////////////////////////// -void CCryEditApp::OnEditmodeSelectarea() -{ - // TODO: Add your command handler code here - GetIEditor()->SetEditMode(eEditModeSelectArea); -} - -////////////////////////////////////////////////////////////////////////// -void CCryEditApp::OnUpdateEditmodeSelectarea(QAction* action) -{ - Q_ASSERT(action->isCheckable()); - action->setChecked(GetIEditor()->GetEditMode() == eEditModeSelectArea); -} - -////////////////////////////////////////////////////////////////////////// -void CCryEditApp::OnUpdateEditmodeSelect(QAction* action) -{ - Q_ASSERT(action->isCheckable()); - if (!GetIEditor()->IsNewViewportInteractionModelEnabled()) - { - action->setChecked(GetIEditor()->GetEditMode() == eEditModeSelect); - } + using namespace AzToolsFramework; + EditorTransformComponentSelectionRequestBus::Event( + GetEntityContextId(), + &EditorTransformComponentSelectionRequests::SetTransformMode, + EditorTransformComponentSelectionRequests::Mode::Scale); } ////////////////////////////////////////////////////////////////////////// @@ -2841,19 +2776,12 @@ void CCryEditApp::OnUpdateEditmodeMove(QAction* action) { Q_ASSERT(action->isCheckable()); - if (GetIEditor()->IsNewViewportInteractionModelEnabled()) - { - AzToolsFramework::EditorTransformComponentSelectionRequests::Mode mode; - AzToolsFramework::EditorTransformComponentSelectionRequestBus::EventResult( - mode, AzToolsFramework::GetEntityContextId(), - &AzToolsFramework::EditorTransformComponentSelectionRequests::GetTransformMode); + AzToolsFramework::EditorTransformComponentSelectionRequests::Mode mode; + AzToolsFramework::EditorTransformComponentSelectionRequestBus::EventResult( + mode, AzToolsFramework::GetEntityContextId(), + &AzToolsFramework::EditorTransformComponentSelectionRequests::GetTransformMode); - action->setChecked(mode == AzToolsFramework::EditorTransformComponentSelectionRequests::Mode::Translation); - } - else - { - action->setChecked(GetIEditor()->GetEditMode() == eEditModeMove); - } + action->setChecked(mode == AzToolsFramework::EditorTransformComponentSelectionRequests::Mode::Translation); } ////////////////////////////////////////////////////////////////////////// @@ -2861,20 +2789,12 @@ void CCryEditApp::OnUpdateEditmodeRotate(QAction* action) { Q_ASSERT(action->isCheckable()); - if (GetIEditor()->IsNewViewportInteractionModelEnabled()) - { - AzToolsFramework::EditorTransformComponentSelectionRequests::Mode mode; - AzToolsFramework::EditorTransformComponentSelectionRequestBus::EventResult( - mode, AzToolsFramework::GetEntityContextId(), - &AzToolsFramework::EditorTransformComponentSelectionRequests::GetTransformMode); + AzToolsFramework::EditorTransformComponentSelectionRequests::Mode mode; + AzToolsFramework::EditorTransformComponentSelectionRequestBus::EventResult( + mode, AzToolsFramework::GetEntityContextId(), + &AzToolsFramework::EditorTransformComponentSelectionRequests::GetTransformMode); - action->setChecked(mode == AzToolsFramework::EditorTransformComponentSelectionRequests::Mode::Rotation); - } - else - { - action->setChecked(GetIEditor()->GetEditMode() == eEditModeRotate); - action->setEnabled(true); - } + action->setChecked(mode == AzToolsFramework::EditorTransformComponentSelectionRequests::Mode::Rotation); } ////////////////////////////////////////////////////////////////////////// @@ -2882,20 +2802,12 @@ void CCryEditApp::OnUpdateEditmodeScale(QAction* action) { Q_ASSERT(action->isCheckable()); - if (GetIEditor()->IsNewViewportInteractionModelEnabled()) - { - AzToolsFramework::EditorTransformComponentSelectionRequests::Mode mode; - AzToolsFramework::EditorTransformComponentSelectionRequestBus::EventResult( - mode, AzToolsFramework::GetEntityContextId(), - &AzToolsFramework::EditorTransformComponentSelectionRequests::GetTransformMode); + AzToolsFramework::EditorTransformComponentSelectionRequests::Mode mode; + AzToolsFramework::EditorTransformComponentSelectionRequestBus::EventResult( + mode, AzToolsFramework::GetEntityContextId(), + &AzToolsFramework::EditorTransformComponentSelectionRequests::GetTransformMode); - action->setChecked(mode == AzToolsFramework::EditorTransformComponentSelectionRequests::Mode::Scale); - } - else - { - action->setChecked(GetIEditor()->GetEditMode() == eEditModeScale); - action->setEnabled(true); - } + action->setChecked(mode == AzToolsFramework::EditorTransformComponentSelectionRequests::Mode::Scale); } ////////////////////////////////////////////////////////////////////////// @@ -3076,101 +2988,6 @@ void CCryEditApp::OnViewSwitchToGame() GetIEditor()->SetInGameMode(inGame); } -void CCryEditApp::OnSelectAxisX() -{ - AxisConstrains axis = (GetIEditor()->GetAxisConstrains() != AXIS_X) ? AXIS_X : AXIS_NONE; - GetIEditor()->SetAxisConstraints(axis); -} - -void CCryEditApp::OnSelectAxisY() -{ - AxisConstrains axis = (GetIEditor()->GetAxisConstrains() != AXIS_Y) ? AXIS_Y : AXIS_NONE; - GetIEditor()->SetAxisConstraints(axis); -} - -void CCryEditApp::OnSelectAxisZ() -{ - AxisConstrains axis = (GetIEditor()->GetAxisConstrains() != AXIS_Z) ? AXIS_Z : AXIS_NONE; - GetIEditor()->SetAxisConstraints(axis); -} - -void CCryEditApp::OnSelectAxisXy() -{ - AxisConstrains axis = (GetIEditor()->GetAxisConstrains() != AXIS_XY) ? AXIS_XY : AXIS_NONE; - GetIEditor()->SetAxisConstraints(axis); -} - -void CCryEditApp::OnUpdateSelectAxisX(QAction* action) -{ - Q_ASSERT(action->isCheckable()); - action->setChecked(GetIEditor()->GetAxisConstrains() == AXIS_X); -} - -void CCryEditApp::OnUpdateSelectAxisXy(QAction* action) -{ - Q_ASSERT(action->isCheckable()); - action->setChecked(GetIEditor()->GetAxisConstrains() == AXIS_XY); -} - -void CCryEditApp::OnUpdateSelectAxisY(QAction* action) -{ - Q_ASSERT(action->isCheckable()); - action->setChecked(GetIEditor()->GetAxisConstrains() == AXIS_Y); -} - -void CCryEditApp::OnUpdateSelectAxisZ(QAction* action) -{ - Q_ASSERT(action->isCheckable()); - action->setChecked(GetIEditor()->GetAxisConstrains() == AXIS_Z); -} - -////////////////////////////////////////////////////////////////////////// -void CCryEditApp::OnSelectAxisTerrain() -{ - IEditor* editor = GetIEditor(); - bool isAlreadyEnabled = (editor->GetAxisConstrains() == AXIS_TERRAIN) && (editor->IsTerrainAxisIgnoreObjects()); - if (!isAlreadyEnabled) - { - editor->SetAxisConstraints(AXIS_TERRAIN); - editor->SetTerrainAxisIgnoreObjects(true); - } - else - { - // behave like a toggle button - click on the same thing again to disable. - editor->SetAxisConstraints(AXIS_NONE); - } -} - -////////////////////////////////////////////////////////////////////////// -void CCryEditApp::OnSelectAxisSnapToAll() -{ - IEditor* editor = GetIEditor(); - bool isAlreadyEnabled = (editor->GetAxisConstrains() == AXIS_TERRAIN) && (!editor->IsTerrainAxisIgnoreObjects()); - if (!isAlreadyEnabled) - { - editor->SetAxisConstraints(AXIS_TERRAIN); - editor->SetTerrainAxisIgnoreObjects(false); - } - else - { - // behave like a toggle button - click on the same thing again to disable. - editor->SetAxisConstraints(AXIS_NONE); - } -} - -////////////////////////////////////////////////////////////////////////// -void CCryEditApp::OnUpdateSelectAxisTerrain(QAction* action) -{ - Q_ASSERT(action->isCheckable()); - action->setChecked(GetIEditor()->GetAxisConstrains() == AXIS_TERRAIN && GetIEditor()->IsTerrainAxisIgnoreObjects()); -} - -////////////////////////////////////////////////////////////////////////// -void CCryEditApp::OnUpdateSelectAxisSnapToAll(QAction* action) -{ - action->setChecked(GetIEditor()->GetAxisConstrains() == AXIS_TERRAIN && !GetIEditor()->IsTerrainAxisIgnoreObjects()); -} - ////////////////////////////////////////////////////////////////////////// void CCryEditApp::OnExportSelectedObjects() { @@ -3351,26 +3168,6 @@ void CCryEditApp::OnUpdateSelected(QAction* action) action->setEnabled(!GetIEditor()->GetSelection()->IsEmpty()); } -////////////////////////////////////////////////////////////////////////// -void CCryEditApp::OnAlignToGrid() -{ - CSelectionGroup* sel = GetIEditor()->GetSelection(); - if (!sel->IsEmpty()) - { - CUndo undo("Align To Grid"); - Matrix34 tm; - for (int i = 0; i < sel->GetCount(); i++) - { - CBaseObject* obj = sel->GetObject(i); - tm = obj->GetWorldTM(); - Vec3 snaped = gSettings.pGrid->Snap(tm.GetTranslation()); - tm.SetTranslation(snaped); - obj->SetWorldTM(tm, eObjectUpdateFlags_UserInput); - obj->OnEvent(EVENT_ALIGN_TOGRID); - } - } -} - void CCryEditApp::OnShowHelpers() { GetIEditor()->GetDisplaySettings()->DisplayHelpers(!GetIEditor()->GetDisplaySettings()->IsDisplayHelpers()); @@ -4530,13 +4327,6 @@ void CCryEditApp::OnDisplayGotoPosition() dlg.exec(); } -////////////////////////////////////////////////////////////////////////// -void CCryEditApp::OnDisplaySetVector() -{ - CSetVectorDlg dlg; - dlg.exec(); -} - ////////////////////////////////////////////////////////////////////////// void CCryEditApp::OnSnapangle() { diff --git a/Code/Sandbox/Editor/CryEdit.h b/Code/Sandbox/Editor/CryEdit.h index 7c77a03bb4..dc18dbcfda 100644 --- a/Code/Sandbox/Editor/CryEdit.h +++ b/Code/Sandbox/Editor/CryEdit.h @@ -224,40 +224,23 @@ public: void OnEditmodeMove(); void OnEditmodeRotate(); void OnEditmodeScale(); - void OnEditmodeSelect(); void OnObjectSetArea(); void OnObjectSetHeight(); - void OnUpdateEditmodeSelect(QAction* action); void OnUpdateEditmodeMove(QAction* action); void OnUpdateEditmodeRotate(QAction* action); void OnUpdateEditmodeScale(QAction* action); void OnObjectmodifyFreeze(); void OnObjectmodifyUnfreeze(); - void OnEditmodeSelectarea(); - void OnUpdateEditmodeSelectarea(QAction* action); - void OnSelectAxisX(); - void OnSelectAxisY(); - void OnSelectAxisZ(); - void OnSelectAxisXy(); - void OnUpdateSelectAxisX(QAction* action); - void OnUpdateSelectAxisXy(QAction* action); - void OnUpdateSelectAxisY(QAction* action); - void OnUpdateSelectAxisZ(QAction* action); void OnUndo(); void OnSelectionSave(); void OnOpenAssetImporter(); void OnSelectionLoad(); void OnUpdateSelected(QAction* action); - void OnAlignToGrid(); void OnLockSelection(); void OnEditLevelData(); void OnFileEditLogFile(); void OnFileResaveSlices(); void OnFileEditEditorini(); - void OnSelectAxisTerrain(); - void OnSelectAxisSnapToAll(); - void OnUpdateSelectAxisTerrain(QAction* action); - void OnUpdateSelectAxisSnapToAll(QAction* action); void OnPreferences(); void OnReloadTextures(); void OnReloadGeometry(); @@ -448,7 +431,6 @@ private: void OnToolsScriptHelp(); void OnViewCycle2dviewport(); void OnDisplayGotoPosition(); - void OnDisplaySetVector(); void OnSnapangle(); void OnUpdateSnapangle(QAction* action); void OnRuler(); diff --git a/Code/Sandbox/Editor/CryEditDoc.cpp b/Code/Sandbox/Editor/CryEditDoc.cpp index a94d588516..916317b6bb 100644 --- a/Code/Sandbox/Editor/CryEditDoc.cpp +++ b/Code/Sandbox/Editor/CryEditDoc.cpp @@ -279,8 +279,6 @@ void CCryEditDoc::DeleteContents() // [LY-90904] move this to the EditorVegetationManager component InstanceStatObjEventBus::Broadcast(&InstanceStatObjEventBus::Events::ReleaseData); - GetIEditor()->SetEditMode(eEditModeSelect); - ////////////////////////////////////////////////////////////////////////// // Clear all undo info. ////////////////////////////////////////////////////////////////////////// diff --git a/Code/Sandbox/Editor/IEditor.h b/Code/Sandbox/Editor/IEditor.h index 83a0029d9f..90fb8823e7 100644 --- a/Code/Sandbox/Editor/IEditor.h +++ b/Code/Sandbox/Editor/IEditor.h @@ -318,17 +318,6 @@ enum EOperationMode eModellingMode // Geometry modeling mode }; -enum EEditMode -{ - eEditModeSelect, - eEditModeSelectArea, - eEditModeMove, - eEditModeRotate, - eEditModeScale, - eEditModeTool, - eEditModeRotateCircle, -}; - //! Mouse events that viewport can send enum EMouseEvent { @@ -619,9 +608,6 @@ struct IEditor virtual void SetOperationMode(EOperationMode mode) = 0; virtual EOperationMode GetOperationMode() = 0; - //! editMode - EEditMode - virtual void SetEditMode(int editMode) = 0; - virtual int GetEditMode() = 0; //! Shows/Hides transformation manipulator. //! if bShow is true also returns a valid ITransformManipulator pointer. virtual ITransformManipulator* ShowTransformManipulator(bool bShow) = 0; diff --git a/Code/Sandbox/Editor/IEditorImpl.cpp b/Code/Sandbox/Editor/IEditorImpl.cpp index d4fd86312e..561953d729 100644 --- a/Code/Sandbox/Editor/IEditorImpl.cpp +++ b/Code/Sandbox/Editor/IEditorImpl.cpp @@ -144,8 +144,7 @@ namespace const char* CEditorImpl::m_crashLogFileName = "SessionStatus/editor_statuses.json"; CEditorImpl::CEditorImpl() - : m_currEditMode(eEditModeSelect) - , m_operationMode(eOperationModeNone) + : m_operationMode(eOperationModeNone) , m_pSystem(nullptr) , m_pFileUtil(nullptr) , m_pClassFactory(nullptr) @@ -236,18 +235,6 @@ CEditorImpl::CEditorImpl() m_pRuler = new CRuler; m_selectedRegion.min = Vec3(0, 0, 0); m_selectedRegion.max = Vec3(0, 0, 0); - ZeroStruct(m_lastAxis); - m_lastAxis[eEditModeSelect] = AXIS_TERRAIN; - m_lastAxis[eEditModeSelectArea] = AXIS_TERRAIN; - m_lastAxis[eEditModeMove] = AXIS_TERRAIN; - m_lastAxis[eEditModeRotate] = AXIS_Z; - m_lastAxis[eEditModeScale] = AXIS_XY; - ZeroStruct(m_lastCoordSys); - m_lastCoordSys[eEditModeSelect] = COORDS_LOCAL; - m_lastCoordSys[eEditModeSelectArea] = COORDS_LOCAL; - m_lastCoordSys[eEditModeMove] = COORDS_WORLD; - m_lastCoordSys[eEditModeRotate] = COORDS_WORLD; - m_lastCoordSys[eEditModeScale] = COORDS_WORLD; DetectVersion(); RegisterTools(); @@ -257,8 +244,6 @@ CEditorImpl::CEditorImpl() m_pAssetBrowserRequestHandler = nullptr; m_assetEditorRequestsHandler = nullptr; - AzToolsFramework::EditorEntityContextNotificationBus::Handler::BusConnect(); - AZ::IO::SystemFile::CreateDir("SessionStatus"); QFile::setPermissions(m_crashLogFileName, QFileDevice::ReadOther | QFileDevice::WriteOther); } @@ -282,8 +267,6 @@ void CEditorImpl::Initialize() // Activate QT immediately so that its available as soon as CEditorImpl is (and thus GetIEditor()) InitializeEditorCommon(GetIEditor()); - - LoadSettings(); } //The only purpose of that function is to be called at the very begining of the shutdown sequence so that we can instrument and track @@ -298,8 +281,6 @@ void CEditorImpl::OnEarlyExitShutdownSequence() void CEditorImpl::Uninitialize() { - SaveSettings(); - if (m_pSystem) { UninitializeEditorCommonISystem(m_pSystem); @@ -360,8 +341,6 @@ void CEditorImpl::LoadPlugins() CEditorImpl::~CEditorImpl() { - AzToolsFramework::EditorEntityContextNotificationBus::Handler::BusDisconnect(); - gSettings.Save(); m_bExiting = true; // Can't save level after this point (while Crash) SAFE_RELEASE(m_pSourceControl); @@ -650,40 +629,6 @@ IMainStatusBar* CEditorImpl::GetMainStatusBar() return MainWindow::instance()->StatusBar(); } -int CEditorImpl::GetEditMode() -{ - return m_currEditMode; -} - -void CEditorImpl::SetEditMode(int editMode) -{ - bool isEditorInGameMode = false; - EBUS_EVENT_RESULT(isEditorInGameMode, AzToolsFramework::EditorEntityContextRequestBus, IsEditorRunningGame); - - if (isEditorInGameMode) - { - if (editMode != eEditModeSelect) - { - if (SelectionContainsComponentEntities()) - { - return; - } - } - } - - EEditMode newEditMode = (EEditMode)editMode; - if (m_currEditMode == newEditMode) - { - return; - } - - m_currEditMode = newEditMode; - AABB box(Vec3(0, 0, 0), Vec3(0, 0, 0)); - SetSelectedRegion(box); - - Notify(eNotify_OnEditModeChange); -} - void CEditorImpl::SetOperationMode(EOperationMode mode) { m_operationMode = mode; @@ -728,7 +673,6 @@ ITransformManipulator* CEditorImpl::GetTransformManipulator() void CEditorImpl::SetAxisConstraints(AxisConstrains axisFlags) { m_selectedAxis = axisFlags; - m_lastAxis[m_currEditMode] = m_selectedAxis; m_pViewManager->SetAxisConstrain(axisFlags); SetTerrainAxisIgnoreObjects(false); @@ -754,7 +698,6 @@ bool CEditorImpl::IsTerrainAxisIgnoreObjects() void CEditorImpl::SetReferenceCoordSys(RefCoordSys refCoords) { m_refCoordsSys = refCoords; - m_lastCoordSys[m_currEditMode] = m_refCoordsSys; // Update all views. UpdateViews(eUpdateObjects, NULL); @@ -1884,60 +1827,6 @@ bool CEditorImpl::IsNewViewportInteractionModelEnabled() const return m_isNewViewportInteractionModelEnabled; } -void CEditorImpl::OnStartPlayInEditor() -{ - if (SelectionContainsComponentEntities()) - { - SetEditMode(eEditModeSelect); - } -} - -namespace -{ - const std::vector> s_editModeNames = { - { eEditModeSelect, QStringLiteral("Select") }, - { eEditModeSelectArea, QStringLiteral("SelectArea") }, - { eEditModeMove, QStringLiteral("Move") }, - { eEditModeRotate, QStringLiteral("Rotate") }, - { eEditModeScale, QStringLiteral("Scale") } - }; -} - -void CEditorImpl::LoadSettings() -{ - QSettings settings(QStringLiteral("Amazon"), QStringLiteral("O3DE")); - - settings.beginGroup(QStringLiteral("Editor")); - settings.beginGroup(QStringLiteral("CoordSys")); - - for (const auto& editMode : s_editModeNames) - { - if (settings.contains(editMode.second)) - { - m_lastCoordSys[editMode.first] = static_cast(settings.value(editMode.second).toInt()); - } - } - - settings.endGroup(); // CoordSys - settings.endGroup(); // Editor -} - -void CEditorImpl::SaveSettings() const -{ - QSettings settings(QStringLiteral("Amazon"), QStringLiteral("O3DE")); - - settings.beginGroup(QStringLiteral("Editor")); - settings.beginGroup(QStringLiteral("CoordSys")); - - for (const auto& editMode : s_editModeNames) - { - settings.setValue(editMode.second, static_cast(m_lastCoordSys[editMode.first])); - } - - settings.endGroup(); // CoordSys - settings.endGroup(); // Editor -} - IEditorPanelUtils* CEditorImpl::GetEditorPanelUtils() { return m_panelEditorUtils; diff --git a/Code/Sandbox/Editor/IEditorImpl.h b/Code/Sandbox/Editor/IEditorImpl.h index 7bb864aaa3..a99fa234b9 100644 --- a/Code/Sandbox/Editor/IEditorImpl.h +++ b/Code/Sandbox/Editor/IEditorImpl.h @@ -23,7 +23,6 @@ #include // for shared_ptr #include #include -#include #include #include @@ -86,13 +85,12 @@ namespace AssetDatabase class CEditorImpl : public IEditor - , protected AzToolsFramework::EditorEntityContextNotificationBus::Handler { Q_DECLARE_TR_FUNCTIONS(CEditorImpl) public: CEditorImpl(); - ~CEditorImpl(); + virtual ~CEditorImpl(); void Initialize(); void OnBeginShutdownSequence(); @@ -226,8 +224,6 @@ public: void SetDataModified(); void SetOperationMode(EOperationMode mode); EOperationMode GetOperationMode(); - void SetEditMode(int editMode); - int GetEditMode(); ITransformManipulator* ShowTransformManipulator(bool bShow); ITransformManipulator* GetTransformManipulator(); @@ -348,23 +344,15 @@ public: protected: - ////////////////////////////////////////////////////////////////////////// - // EditorEntityContextNotificationBus implementation - void OnStartPlayInEditor() override; - ////////////////////////////////////////////////////////////////////////// AZStd::string LoadProjectIdFromProjectData(); void DetectVersion(); void RegisterTools(); void SetPrimaryCDFolder(); - void LoadSettings(); - void SaveSettings() const; - //! List of all notify listeners. std::list m_listeners; - EEditMode m_currEditMode; EOperationMode m_operationMode; ISystem* m_pSystem; IFileUtil* m_pFileUtil; @@ -378,8 +366,6 @@ protected: AABB m_selectedRegion; AxisConstrains m_selectedAxis; RefCoordSys m_refCoordsSys; - AxisConstrains m_lastAxis[16]; - RefCoordSys m_lastCoordSys[16]; bool m_bAxisVectorLock; bool m_bUpdates; bool m_bTerrainAxisIgnoreObjects; diff --git a/Code/Sandbox/Editor/InfoBar.cpp b/Code/Sandbox/Editor/InfoBar.cpp index 9e50e4ed3e..a1a1f7b055 100644 --- a/Code/Sandbox/Editor/InfoBar.cpp +++ b/Code/Sandbox/Editor/InfoBar.cpp @@ -30,6 +30,8 @@ AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING #include AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING +#include + #include #include "CryPhysicsDeprecation.h" @@ -52,10 +54,6 @@ CInfoBar::CInfoBar(QWidget* parent) { ui->setupUi(this); - m_enabledVector = false; - m_bVectorLock = false; - m_prevEditMode = 0; - m_bSelectionLocked = false; m_bSelectionChanged = false; m_bDragMode = false; m_prevMoveSpeed = 0; @@ -70,25 +68,14 @@ CInfoBar::CInfoBar(QWidget* parent) OnInitDialog(); - connect(ui->m_vectorLock, &QToolButton::clicked, this, &CInfoBar::OnVectorLock); - connect(ui->m_lockSelection, &QToolButton::clicked, this, &CInfoBar::OnLockSelection); - auto comboBoxTextChanged = static_cast(&QComboBox::currentTextChanged); connect(ui->m_moveSpeed, comboBoxTextChanged, this, &CInfoBar::OnUpdateMoveSpeedText); connect(ui->m_moveSpeed->lineEdit(), &QLineEdit::returnPressed, this, &CInfoBar::OnSpeedComboBoxEnter); - connect(ui->m_posCtrl, &AzQtComponents::VectorInput::valueChanged, this, &CInfoBar::OnVectorChanged); - // Hide some buttons from the expander menu - AzQtComponents::Style::addClass(ui->m_posCtrl, "expanderMenu_hide"); AzQtComponents::Style::addClass(ui->m_physDoStepBtn, "expanderMenu_hide"); AzQtComponents::Style::addClass(ui->m_physSingleStepBtn, "expanderMenu_hide"); - // posCtrl is a VectorInput initialized via UI; as such, we can't construct it to have only 3 elements. - // We can just hide the W element as it is unused. - ui->m_posCtrl->getElements()[3]->setVisible(false); - - connect(ui->m_setVector, &QToolButton::clicked, this, &CInfoBar::OnBnClickedSetVector); connect(ui->m_physicsBtn, &QToolButton::clicked, this, &CInfoBar::OnBnClickedPhysics); connect(ui->m_physSingleStepBtn, &QToolButton::clicked, this, &CInfoBar::OnBnClickedSingleStepPhys); connect(ui->m_physDoStepBtn, &QToolButton::clicked, this, &CInfoBar::OnBnClickedDoStepPhys); @@ -99,12 +86,6 @@ CInfoBar::CInfoBar(QWidget* parent) connect(this, &CInfoBar::ActionTriggered, MainWindow::instance()->GetActionManager(), &ActionManager::ActionTriggered); - connect(ui->m_lockSelection, &QAbstractButton::toggled, ui->m_lockSelection, [this](bool checked) { - ui->m_lockSelection->setToolTip(checked ? tr("Unlock Object Selection") : tr("Lock Object Selection")); - }); - connect(ui->m_vectorLock, &QAbstractButton::toggled, ui->m_vectorLock, [this](bool checked) { - ui->m_vectorLock->setToolTip(checked ? tr("Unlock Axis Vectors") : tr("Lock Axis Vectors")); - }); connect(ui->m_physicsBtn, &QAbstractButton::toggled, ui->m_physicsBtn, [this](bool checked) { ui->m_physicsBtn->setToolTip(checked ? tr("Stop Simulation (Ctrl+P)") : tr("Simulate (Ctrl+P)")); }); @@ -121,27 +102,6 @@ CInfoBar::CInfoBar(QWidget* parent) ui->m_vrBtn->setToolTip(checked ? tr("Disable VR Preview") : tr("Enable VR Preview")); }); - // hide old ui elements that are not valid with the new viewport interaction model - if (GetIEditor()->IsNewViewportInteractionModelEnabled()) - { - ui->m_lockSelection->setVisible(false); - AzQtComponents::Style::addClass(ui->m_lockSelection, "expanderMenu_hide"); - ui->m_posCtrl->setVisible(false); - AzQtComponents::Style::addClass(ui->m_posCtrl, "expanderMenu_hide"); - ui->m_setVector->setVisible(false); - AzQtComponents::Style::addClass(ui->m_setVector, "expanderMenu_hide"); - ui->m_vectorLock->setVisible(false); - AzQtComponents::Style::addClass(ui->m_vectorLock, "expanderMenu_hide"); - - // As we're hiding some of the icons, we have an extra spacer to deal with. - // We cannot set the visibility of separators, so we'll have to take it out. - int separatorIndex = layout()->indexOf(ui->verticalSpacer_2); - QLayoutItem* separator = layout()->takeAt(separatorIndex); - - // takeAt() removes the item from the layout; delete to avoid memory leaks. - delete separator; - } - ui->m_moveSpeed->setValidator(new QDoubleValidator(m_minSpeed, m_maxSpeed, m_numDecimals, ui->m_moveSpeed)); // Save off the move speed here since setting up the combo box can cause it to update values in the background. @@ -207,150 +167,6 @@ void CInfoBar::OnEditorNotifyEvent(EEditorNotifyEvent event) { m_bSelectionChanged = true; } - else if (event == eNotify_OnEditModeChange) - { - int emode = GetIEditor()->GetEditMode(); - switch (emode) - { - case eEditModeMove: - ui->m_setVector->setToolTip(tr("Set Position of Selected Objects")); - break; - case eEditModeRotate: - ui->m_setVector->setToolTip(tr("Set Rotation of Selected Objects")); - break; - case eEditModeScale: - ui->m_setVector->setToolTip(tr("Set Scale of Selected Objects")); - break; - default: - ui->m_setVector->setToolTip(tr("Set Position/Rotation/Scale of Selected Objects (None Selected)")); - break; - } - } -} - -////////////////////////////////////////////////////////////////////////// - -void CInfoBar::OnVectorChanged() -{ - SetVector(GetVector()); - OnVectorUpdate(false); -} - -void CInfoBar::OnVectorUpdate(bool followTerrain) -{ - int emode = GetIEditor()->GetEditMode(); - if (emode != eEditModeMove && emode != eEditModeRotate && emode != eEditModeScale) - { - return; - } - - Vec3 v = GetVector(); - - ITransformManipulator* pManipulator = GetIEditor()->GetTransformManipulator(); - if (pManipulator) - { - return; - } - - CSelectionGroup* selection = GetIEditor()->GetObjectManager()->GetSelection(); - if (selection->IsEmpty()) - { - return; - } - - GetIEditor()->RestoreUndo(); - - int referenceCoordSys = GetIEditor()->GetReferenceCoordSys(); - - CBaseObject* obj = GetIEditor()->GetSelectedObject(); - - Matrix34 tm; - AffineParts ap; - if (obj) - { - tm = obj->GetWorldTM(); - ap.SpectralDecompose(tm); - } - - if (emode == eEditModeMove) - { - if (obj) - { - if (referenceCoordSys == COORDS_WORLD) - { - tm.SetTranslation(v); - obj->SetWorldTM(tm); - } - else - { - obj->SetPos(v); - } - } - else - { - GetIEditor()->GetSelection()->MoveTo(v, followTerrain ? CSelectionGroup::eMS_FollowTerrain : CSelectionGroup::eMS_None, referenceCoordSys); - } - } - if (emode == eEditModeRotate) - { - if (obj) - { - AZ::Vector3 av = LYVec3ToAZVec3(v); - AZ::Transform tr = AZ::ConvertEulerDegreesToTransform(av); - Matrix34 lyTransform = AZTransformToLYTransform(tr); - - AffineParts newap; - newap.SpectralDecompose(lyTransform); - - if (referenceCoordSys == COORDS_WORLD) - { - tm = Matrix34::Create(ap.scale, newap.rot, ap.pos); - obj->SetWorldTM(tm); - } - else - { - obj->SetRotation(newap.rot); - } - } - else - { - CBaseObject *refObj; - CSelectionGroup* pGroup = GetIEditor()->GetSelection(); - if (pGroup && pGroup->GetCount() > 0) - { - refObj = pGroup->GetObject(0); - AffineParts ap2; - ap2.SpectralDecompose(refObj->GetWorldTM()); - Vec3 oldEulerRotation = AZVec3ToLYVec3(AZ::ConvertQuaternionToEulerDegrees(LYQuaternionToAZQuaternion(ap2.rot))); - Vec3 diff = v - oldEulerRotation; - GetIEditor()->GetSelection()->Rotate((Ang3)diff, referenceCoordSys); - } - } - } - if (emode == eEditModeScale) - { - if (v.x == 0 || v.y == 0 || v.z == 0) - { - return; - } - - if (obj) - { - if (referenceCoordSys == COORDS_WORLD) - { - tm = Matrix34::Create(v, ap.rot, ap.pos); - obj->SetWorldTM(tm); - } - else - { - obj->SetScale(v); - } - } - else - { - GetIEditor()->GetSelection()->SetScale(v, referenceCoordSys); - } - } } void CInfoBar::IdleUpdate() @@ -375,21 +191,6 @@ void CInfoBar::IdleUpdate() Vec3 marker = GetIEditor()->GetMarkerPosition(); - /* - // Get active viewport. - int hx = marker.x / 2; - int hy = marker.y / 2; - if (m_heightMapX != hx || m_heightMapY != hy) - { - m_heightMapX = hx; - m_heightMapY = hy; - updateUI = true; - } - */ - - RefCoordSys coordSys = GetIEditor()->GetReferenceCoordSys(); - bool bWorldSpace = GetIEditor()->GetReferenceCoordSys() == COORDS_WORLD; - CSelectionGroup* selection = GetIEditor()->GetSelection(); if (selection->GetCount() != m_numSelected) { @@ -447,198 +248,11 @@ void CInfoBar::IdleUpdate() } } - bool bSelLocked = GetIEditor()->IsSelectionLocked(); - if (bSelLocked != m_bSelectionLocked) - { - m_bSelectionLocked = bSelLocked; - ui->m_lockSelection->setChecked(m_bSelectionLocked); - } - - - if (GetIEditor()->GetSelection()->IsEmpty()) - { - if (ui->m_lockSelection->isEnabled()) - { - ui->m_lockSelection->setEnabled(false); - } - } - else - { - if (!ui->m_lockSelection->isEnabled()) - { - ui->m_lockSelection->setEnabled(true); - } - } - - ////////////////////////////////////////////////////////////////////////// - // Update vector. - ////////////////////////////////////////////////////////////////////////// - Vec3 v(0, 0, 0); - bool enable = false; - float min = 0, max = 10000; - - int emode = GetIEditor()->GetEditMode(); - ITransformManipulator* pManipulator = GetIEditor()->GetTransformManipulator(); - - if (pManipulator) - { - AffineParts ap; - ap.SpectralDecompose(pManipulator->GetTransformation(coordSys)); - - if (emode == eEditModeMove) - { - v = ap.pos; - enable = true; - - min = -64000; - max = 64000; - } - if (emode == eEditModeRotate) - { - v = Vec3(RAD2DEG(Ang3::GetAnglesXYZ(Matrix33(ap.rot)))); - enable = true; - min = -10000; - max = 10000; - } - if (emode == eEditModeScale) - { - v = ap.scale; - enable = true; - min = -10000; - max = 10000; - } - } - else - { - if (selection->IsEmpty()) - { - // Show marker position. - EnableVector(false); - SetVector(marker); - SetVectorRange(-100000, 100000); - return; - } - - CBaseObject* obj = GetIEditor()->GetSelectedObject(); - if (!obj) - { - CSelectionGroup* pGroup = GetIEditor()->GetSelection(); - if (pGroup && pGroup->GetCount() > 0) - { - obj = pGroup->GetObject(0); - } - } - - if (obj) - { - v = obj->GetWorldPos(); - } - - if (emode == eEditModeMove) - { - if (obj) - { - if (bWorldSpace) - { - v = obj->GetWorldTM().GetTranslation(); - } - else - { - v = obj->GetPos(); - } - } - enable = true; - min = -64000; - max = 64000; - } - if (emode == eEditModeRotate) - { - if (obj) - { - Quat objRot; - if (bWorldSpace) - { - AffineParts ap; - ap.SpectralDecompose(obj->GetWorldTM()); - objRot = ap.rot; - } - else - { - objRot = obj->GetRotation(); - } - - // Always convert objRot to v in order to ensure that the inspector and info bar are always in sync - v = AZVec3ToLYVec3(AZ::ConvertQuaternionToEulerDegrees(LYQuaternionToAZQuaternion(objRot))); - } - enable = true; - min = -10000; - max = 10000; - } - if (emode == eEditModeScale) - { - if (obj) - { - if (bWorldSpace) - { - AffineParts ap; - ap.SpectralDecompose(obj->GetWorldTM()); - v = ap.scale; - } - else - { - v = obj->GetScale(); - } - } - enable = true; - min = -10000; - max = 10000; - } - } - - bool updateDisplayVector = (m_currValue != v); - - // If Edit mode changed. - if (m_prevEditMode != emode) - { - // Scale mode enables vector lock. - SetVectorLock(emode == eEditModeScale); - - // Change undo strings. - QString undoString("Modify Object(s)"); - int mode = GetIEditor()->GetEditMode(); - switch (mode) - { - case eEditModeMove: - undoString = QStringLiteral("Move Object(s)"); - break; - case eEditModeRotate: - undoString = QStringLiteral("Rotate Object(s)"); - break; - case eEditModeScale: - undoString = QStringLiteral("Scale Object(s)"); - break; - } - - // edit mode changed, we must update the number values - updateDisplayVector = true; - } - - SetVectorRange(min, max); - EnableVector(enable); - // if our selection changed, or if our display values are out of date if (m_bSelectionChanged) { - updateDisplayVector = true; m_bSelectionChanged = false; } - - if (updateDisplayVector) - { - SetVector(v); - } - - m_prevEditMode = emode; } inline double Round(double fVal, double fStep) @@ -650,71 +264,6 @@ inline double Round(double fVal, double fStep) return fVal; } -void CInfoBar::SetVector(const Vec3& v) -{ - if (!m_bDragMode) - { - m_lastValue = m_currValue; - } - - if (m_currValue != v) - { - ui->m_posCtrl->setValuebyIndex(v.x, 0); - ui->m_posCtrl->setValuebyIndex(v.y, 1); - ui->m_posCtrl->setValuebyIndex(v.z, 2); - m_currValue = v; - } -} - -Vec3 CInfoBar::GetVector() -{ - Vec3 v; - v.x = ui->m_posCtrl->getElements()[0]->getValue(); - v.y = ui->m_posCtrl->getElements()[1]->getValue(); - v.z = ui->m_posCtrl->getElements()[2]->getValue(); - m_currValue = v; - return v; -} - -void CInfoBar::EnableVector(bool enable) -{ - if (m_enabledVector != enable) - { - m_enabledVector = enable; - ui->m_posCtrl->setEnabled(enable); - ui->m_vectorLock->setEnabled(enable); - ui->m_setVector->setEnabled(enable); - } -} - -void CInfoBar::SetVectorLock(bool bVectorLock) -{ - m_bVectorLock = bVectorLock; - ui->m_vectorLock->setChecked(bVectorLock); - GetIEditor()->SetAxisVectorLock(bVectorLock); -} - -void CInfoBar::SetVectorRange(float min, float max) -{ - // Worth noting that this gets called every IdleUpdate, so it is necessary to make sure - // setting the min/max doesn't result in the Qt event queue being pumped - ui->m_posCtrl->setMinimum(min); - ui->m_posCtrl->setMaximum(max); -} - -void CInfoBar::OnVectorLock() -{ - SetVectorLock(!m_bVectorLock); -} - -void CInfoBar::OnLockSelection() -{ - bool newLockSelectionValue = !m_bSelectionLocked; - m_bSelectionLocked = newLockSelectionValue; - ui->m_lockSelection->setChecked(newLockSelectionValue); - GetIEditor()->LockSelection(newLockSelectionValue); -} - void CInfoBar::OnUpdateMoveSpeedText(const QString& text) { gSettings.cameraMoveSpeed = aznumeric_cast(Round(text.toDouble(), m_speedStep)); @@ -730,12 +279,6 @@ void CInfoBar::OnInitDialog() QFontMetrics metrics({}); int width = metrics.boundingRect("-9999.99").width() * m_fieldWidthMultiplier; - ui->m_posCtrl->setEnabled(false); - ui->m_posCtrl->getElements()[0]->setFixedWidth(width); - ui->m_posCtrl->getElements()[1]->setFixedWidth(width); - ui->m_posCtrl->getElements()[2]->setFixedWidth(width); - ui->m_setVector->setEnabled(false); - ui->m_moveSpeed->setFixedWidth(width); ui->m_physicsBtn->setEnabled(false); @@ -809,12 +352,6 @@ void CInfoBar::OnBnClickedGotoPosition() emit ActionTriggered(ID_DISPLAY_GOTOPOSITION); } -////////////////////////////////////////////////////////////////////////// -void CInfoBar::OnBnClickedSetVector() -{ - emit ActionTriggered(ID_DISPLAY_SETVECTOR); -} - ////////////////////////////////////////////////////////////////////////// void CInfoBar::OnBnClickedMuteAudio() { diff --git a/Code/Sandbox/Editor/InfoBar.h b/Code/Sandbox/Editor/InfoBar.h index aa0d0628a2..6e547d46c6 100644 --- a/Code/Sandbox/Editor/InfoBar.h +++ b/Code/Sandbox/Editor/InfoBar.h @@ -59,24 +59,9 @@ protected: virtual void OnOK() {}; virtual void OnCancel() {}; - void OnVectorUpdate(bool followTerrain); - - // this gets called by stepper or text edit changes - void OnVectorChanged(); - - void SetVector(const Vec3& v); - void SetVectorRange(float min, float max); - Vec3 GetVector(); - void EnableVector(bool enable); - - void SetVectorLock(bool bVectorLock); - void OnBnClickedSyncplayer(); void OnBnClickedGotoPosition(); - void OnVectorLock(); - void OnLockSelection(); - void OnBnClickedSetVector(); void OnSpeedComboBoxEnter(); void OnUpdateMoveSpeedText(const QString&); void OnBnClickedTerrainCollision(); @@ -98,13 +83,10 @@ protected: void EnteredComponentMode(const AZStd::vector& componentModeTypes) override; void LeftComponentMode(const AZStd::vector& componentModeTypes) override; - bool m_enabledVector; - float m_width, m_height; //int m_heightMapX,m_heightMapY; double m_fieldWidthMultiplier = 1.8; - int m_prevEditMode; int m_numSelected; float m_prevMoveSpeed; @@ -117,8 +99,6 @@ protected: // Speed presets float m_speedPresetValues[3] = { 0.1f, 1.0f, 10.0f }; - bool m_bVectorLock; - bool m_bSelectionLocked; bool m_bSelectionChanged; bool m_bDragMode; diff --git a/Code/Sandbox/Editor/InfoBar.ui b/Code/Sandbox/Editor/InfoBar.ui index e6d135da4b..84207629df 100644 --- a/Code/Sandbox/Editor/InfoBar.ui +++ b/Code/Sandbox/Editor/InfoBar.ui @@ -57,42 +57,6 @@ - - - - - 0 - 0 - - - - Position - - - - - - - - 0 - 0 - - - - XYZ - - - - :/InfoBar/XYZ-default.svg:/InfoBar/XYZ-default.svg - - - - 22 - 18 - - - - @@ -135,68 +99,6 @@ - - - - Lock Object Selection - - - Lock Selection - - - - :/InfoBar/LockSelection-default.svg:/InfoBar/LockSelection-default.svg - - - - 18 - 18 - - - - true - - - - - - - Lock Scale Axis Vectors - - - Lock Scale - - - - :/InfoBar/LockScale-default.svg:/InfoBar/LockScale-default.svg - - - - 18 - 18 - - - - true - - - - - - - Qt::Vertical - - - QSizePolicy::Fixed - - - - 1 - 18 - - - - @@ -424,13 +326,6 @@ - - - AzQtComponents::VectorInput - QWidget -
AzQtComponents/Components/Widgets/VectorInput.h
- - diff --git a/Code/Sandbox/Editor/Lib/Tests/IEditorMock.h b/Code/Sandbox/Editor/Lib/Tests/IEditorMock.h index 7372de523f..b28a80967a 100644 --- a/Code/Sandbox/Editor/Lib/Tests/IEditorMock.h +++ b/Code/Sandbox/Editor/Lib/Tests/IEditorMock.h @@ -123,8 +123,6 @@ public: MOCK_METHOD0(GetRuler, CRuler* ()); MOCK_METHOD1(SetOperationMode, void(EOperationMode )); MOCK_METHOD0(GetOperationMode, EOperationMode()); - MOCK_METHOD1(SetEditMode, void(int )); - MOCK_METHOD0(GetEditMode, int()); MOCK_METHOD1(ShowTransformManipulator, ITransformManipulator* (bool)); MOCK_METHOD0(GetTransformManipulator, ITransformManipulator* ()); MOCK_METHOD1(SetAxisConstraints, void(AxisConstrains )); diff --git a/Code/Sandbox/Editor/Lib/Tests/test_EditorPythonBindings.cpp b/Code/Sandbox/Editor/Lib/Tests/test_EditorPythonBindings.cpp index 3bb33d623b..6456b95c00 100644 --- a/Code/Sandbox/Editor/Lib/Tests/test_EditorPythonBindings.cpp +++ b/Code/Sandbox/Editor/Lib/Tests/test_EditorPythonBindings.cpp @@ -151,9 +151,6 @@ namespace EditorPythonBindingsUnitTests EXPECT_TRUE(behaviorContext->m_methods.find("get_axis_constraint") != behaviorContext->m_methods.end()); EXPECT_TRUE(behaviorContext->m_methods.find("set_axis_constraint") != behaviorContext->m_methods.end()); - EXPECT_TRUE(behaviorContext->m_methods.find("get_edit_mode") != behaviorContext->m_methods.end()); - EXPECT_TRUE(behaviorContext->m_methods.find("set_edit_mode") != behaviorContext->m_methods.end()); - EXPECT_TRUE(behaviorContext->m_methods.find("get_pak_from_file") != behaviorContext->m_methods.end()); EXPECT_TRUE(behaviorContext->m_methods.find("log") != behaviorContext->m_methods.end()); @@ -200,8 +197,6 @@ namespace EditorPythonBindingsUnitTests EXPECT_TRUE(behaviorBus->m_events.find("OpenFileBox") != behaviorBus->m_events.end()); EXPECT_TRUE(behaviorBus->m_events.find("GetAxisConstraint") != behaviorBus->m_events.end()); EXPECT_TRUE(behaviorBus->m_events.find("SetAxisConstraint") != behaviorBus->m_events.end()); - EXPECT_TRUE(behaviorBus->m_events.find("GetEditMode") != behaviorBus->m_events.end()); - EXPECT_TRUE(behaviorBus->m_events.find("SetEditMode") != behaviorBus->m_events.end()); EXPECT_TRUE(behaviorBus->m_events.find("GetPakFromFile") != behaviorBus->m_events.end()); EXPECT_TRUE(behaviorBus->m_events.find("Log") != behaviorBus->m_events.end()); EXPECT_TRUE(behaviorBus->m_events.find("Undo") != behaviorBus->m_events.end()); diff --git a/Code/Sandbox/Editor/Lib/Tests/test_SetVectorDlg.cpp b/Code/Sandbox/Editor/Lib/Tests/test_SetVectorDlg.cpp deleted file mode 100644 index 18faf6deba..0000000000 --- a/Code/Sandbox/Editor/Lib/Tests/test_SetVectorDlg.cpp +++ /dev/null @@ -1,92 +0,0 @@ -/* -* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or -* its licensors. -* -* For complete copyright and license terms please see the LICENSE at the root of this -* distribution (the "License"). All use of this software is governed by the License, -* or, if provided, by the license below or the license accompanying this file. Do not -* remove or modify any license notices. This file is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* -*/ - -#include "EditorDefs.h" -#include -#include - -#include - -using namespace AZ; -using namespace ::testing; - -namespace UnitTest -{ - class TestSetVectorDlg - : public ::testing::Test - { - public: - - }; - - const float SetVectorDlgNearTolerance = 0.0001f; - - TEST_F(TestSetVectorDlg, GetVectorFromString_ThreeParams_Success) - { - QString testStr{ "1,2,3" }; - Vec3 result{ 0, 0, 0 }; - - result = CSetVectorDlg::GetVectorFromString(testStr); - - EXPECT_NEAR(result[0], 1.0f, SetVectorDlgNearTolerance); - EXPECT_NEAR(result[1], 2.0f, SetVectorDlgNearTolerance); - EXPECT_NEAR(result[2], 3.0f, SetVectorDlgNearTolerance); - } - - TEST_F(TestSetVectorDlg, GetVectorFromString_FourParams_ThreeParsed) - { - QString testStr{ "1,2,3,4" }; - Vec3 result{ 0, 0, 0 }; - - result = CSetVectorDlg::GetVectorFromString(testStr); - - EXPECT_NEAR(result[0], 1.0f, SetVectorDlgNearTolerance); - EXPECT_NEAR(result[1], 2.0f, SetVectorDlgNearTolerance); - EXPECT_NEAR(result[2], 3.0f, SetVectorDlgNearTolerance); - } - - TEST_F(TestSetVectorDlg, GetVectorFromString_TwoParams_ThirdZero) - { - QString testStr{ "1,2" }; - Vec3 result{ 0, 0, 0 }; - - result = CSetVectorDlg::GetVectorFromString(testStr); - - EXPECT_NEAR(result[0], 1.0f, SetVectorDlgNearTolerance); - EXPECT_NEAR(result[1], 2.0f, SetVectorDlgNearTolerance); - EXPECT_NEAR(result[2], 0.0f, SetVectorDlgNearTolerance); - } - - TEST_F(TestSetVectorDlg, GetVectorFromString_NoParams_AllZero) - { - QString testStr; - Vec3 result{ 0, 0, 0 }; - - result = CSetVectorDlg::GetVectorFromString(testStr); - - EXPECT_NEAR(result[0], 0.0f, SetVectorDlgNearTolerance); - EXPECT_NEAR(result[1], 0.0f, SetVectorDlgNearTolerance); - EXPECT_NEAR(result[2], 0.0f, SetVectorDlgNearTolerance); - } - - TEST_F(TestSetVectorDlg, GetVectorFromString_BadStrings_AllZero) - { - QString testStr{ "some,illegal,strings" }; - Vec3 resultExpected{ 0, 1, 0 }; - - auto result = CSetVectorDlg::GetVectorFromString(testStr); - - EXPECT_NEAR(result[0], 0.0f, SetVectorDlgNearTolerance); - EXPECT_NEAR(result[1], 0.0f, SetVectorDlgNearTolerance); - EXPECT_NEAR(result[2], 0.0f, SetVectorDlgNearTolerance); - } -} // namespace UnitTest diff --git a/Code/Sandbox/Editor/MainWindow.cpp b/Code/Sandbox/Editor/MainWindow.cpp index d7659c2512..902b04f266 100644 --- a/Code/Sandbox/Editor/MainWindow.cpp +++ b/Code/Sandbox/Editor/MainWindow.cpp @@ -750,11 +750,6 @@ void MainWindow::InitActions() am->AddAction(ID_TOOLBAR_SEPARATOR, QString()); - if (!GetIEditor()->IsNewViewportInteractionModelEnabled()) - { - am->AddAction(ID_TOOLBAR_WIDGET_REF_COORD, QString()); - } - am->AddAction(ID_TOOLBAR_WIDGET_UNDO, QString()); am->AddAction(ID_TOOLBAR_WIDGET_REDO, QString()); am->AddAction(ID_TOOLBAR_WIDGET_SNAP_ANGLE, QString()); @@ -995,18 +990,6 @@ void MainWindow::InitActions() am->AddAction(ID_EDIT_RENAMEOBJECT, tr("Rename Object(s)...")) .SetStatusTip(tr("Rename Object")); - if (!GetIEditor()->IsNewViewportInteractionModelEnabled()) - { - am->AddAction(ID_EDITMODE_SELECT, tr("Select mode")) - .SetIcon(Style::icon("Select")) - .SetApplyHoverEffect() - .SetShortcut(tr("1")) - .SetToolTip(tr("Select mode (1)")) - .SetCheckable(true) - .SetStatusTip(tr("Select object(s)")) - .RegisterUpdateCallback(cryEdit, &CCryEditApp::OnUpdateEditmodeSelect); - } - am->AddAction(ID_EDITMODE_MOVE, tr("Move")) .SetIcon(Style::icon("Move")) .SetApplyHoverEffect() @@ -1032,69 +1015,6 @@ void MainWindow::InitActions() .SetStatusTip(tr("Select and scale selected object(s)")) .RegisterUpdateCallback(cryEdit, &CCryEditApp::OnUpdateEditmodeScale); - if (!GetIEditor()->IsNewViewportInteractionModelEnabled()) - { - am->AddAction(ID_EDITMODE_SELECTAREA, tr("Select terrain")) - .SetIcon(Style::icon("Select_terrain")) - .SetApplyHoverEffect() - .SetShortcut(tr("5")) - .SetToolTip(tr("Select terrain (5)")) - .SetCheckable(true) - .SetStatusTip(tr("Switch to terrain selection mode")) - .RegisterUpdateCallback(cryEdit, &CCryEditApp::OnUpdateEditmodeSelectarea); - am->AddAction(ID_SELECT_AXIS_X, tr("Constrain to X axis")) - .SetIcon(Style::icon("X_axis")) - .SetApplyHoverEffect() - .SetShortcut(tr("Ctrl+1")) - .SetToolTip(tr("Constrain to X axis (Ctrl+1)")) - .SetCheckable(true) - .SetStatusTip(tr("Lock movement on X axis")) - .RegisterUpdateCallback(cryEdit, &CCryEditApp::OnUpdateSelectAxisX); - am->AddAction(ID_SELECT_AXIS_Y, tr("Constrain to Y axis")) - .SetIcon(Style::icon("Y_axis")) - .SetApplyHoverEffect() - .SetShortcut(tr("Ctrl+2")) - .SetToolTip(tr("Constrain to Y axis (Ctrl+2)")) - .SetCheckable(true) - .SetStatusTip(tr("Lock movement on Y axis")) - .RegisterUpdateCallback(cryEdit, &CCryEditApp::OnUpdateSelectAxisY); - am->AddAction(ID_SELECT_AXIS_Z, tr("Constrain to Z axis")) - .SetIcon(Style::icon("Z_axis")) - .SetApplyHoverEffect() - .SetShortcut(tr("Ctrl+3")) - .SetToolTip(tr("Constrain to Z axis (Ctrl+3)")) - .SetCheckable(true) - .SetStatusTip(tr("Lock movement on Z axis")) - .RegisterUpdateCallback(cryEdit, &CCryEditApp::OnUpdateSelectAxisZ); - am->AddAction(ID_SELECT_AXIS_XY, tr("Constrain to XY plane")) - .SetIcon(Style::icon("XY2_copy")) - .SetApplyHoverEffect() - .SetShortcut(tr("Ctrl+4")) - .SetToolTip(tr("Constrain to XY plane (Ctrl+4)")) - .SetCheckable(true) - .SetStatusTip(tr("Lock movement on XY plane")) - .RegisterUpdateCallback(cryEdit, &CCryEditApp::OnUpdateSelectAxisXy); - am->AddAction(ID_SELECT_AXIS_TERRAIN, tr("Constrain to terrain/geometry")) - .SetIcon(Style::icon("Object_follow_terrain")) - .SetApplyHoverEffect() - .SetShortcut(tr("Ctrl+5")) - .SetToolTip(tr("Constrain to terrain/geometry (Ctrl+5)")) - .SetCheckable(true) - .SetStatusTip(tr("Lock object movement to follow terrain")) - .RegisterUpdateCallback(cryEdit, &CCryEditApp::OnUpdateSelectAxisTerrain); - am->AddAction(ID_SELECT_AXIS_SNAPTOALL, tr("Follow terrain and snap to objects")) - .SetIcon(Style::icon("Follow_terrain")) - .SetApplyHoverEffect() - .SetShortcut(tr("Ctrl+6")) - .SetToolTip(tr("Follow terrain and snap to objects (Ctrl+6)")) - .SetCheckable(true) - .RegisterUpdateCallback(cryEdit, &CCryEditApp::OnUpdateSelectAxisSnapToAll); - am->AddAction(ID_OBJECTMODIFY_ALIGNTOGRID, tr("Align to grid")) - .RegisterUpdateCallback(cryEdit, &CCryEditApp::OnUpdateSelected) - .SetIcon(Style::icon("Align_to_grid")) - .SetApplyHoverEffect(); - } - am->AddAction(ID_SNAP_TO_GRID, tr("Snap to grid")) .SetIcon(Style::icon("Grid")) .SetApplyHoverEffect() @@ -1153,7 +1073,6 @@ void MainWindow::InitActions() am->AddAction(ID_CHANGEMOVESPEED_CHANGESTEP, tr("Change Step")) .SetStatusTip(tr("Change Flycam Movement Step")); am->AddAction(ID_DISPLAY_GOTOPOSITION, tr("Go to Position...")); - am->AddAction(ID_DISPLAY_SETVECTOR, tr("Display Set Vector")); am->AddAction(ID_MODIFY_GOTO_SELECTION, tr("Center on Selection")) .SetShortcut(tr("Z")) .SetToolTip(tr("Center on Selection (Z)")) @@ -1500,62 +1419,6 @@ void MainWindow::InitToolBars() AdjustToolBarIconSize(static_cast(gSettings.gui.nToolbarIconSize)); } -QComboBox* MainWindow::CreateRefCoordComboBox() -{ - // ID_REF_COORDS_SYS; - auto coordSysCombo = new RefCoordComboBox(this); - - connect(this, &MainWindow::ToggleRefCoordSys, coordSysCombo, &RefCoordComboBox::ToggleRefCoordSys); - connect(this, &MainWindow::UpdateRefCoordSys, coordSysCombo, &RefCoordComboBox::UpdateRefCoordSys); - - return coordSysCombo; -} - -RefCoordComboBox::RefCoordComboBox(QWidget* parent) - : QComboBox(parent) -{ - addItems(coordSysList()); - setCurrentIndex(0); - - connect(this, static_cast(&QComboBox::currentIndexChanged), this, [](int index) - { - if (index >= 0 && index < LAST_COORD_SYSTEM) - { - RefCoordSys coordSys = (RefCoordSys)index; - if (GetIEditor()->GetReferenceCoordSys() != index) - { - GetIEditor()->SetReferenceCoordSys(coordSys); - } - } - }); - - UpdateRefCoordSys(); -} - -QStringList RefCoordComboBox::coordSysList() const -{ - static QStringList list = { tr("View"), tr("Local"), tr("Parent"), tr("World"), tr("Custom") }; - return list; -} - -void RefCoordComboBox::UpdateRefCoordSys() -{ - RefCoordSys coordSys = GetIEditor()->GetReferenceCoordSys(); - if (coordSys >= 0 && coordSys < LAST_COORD_SYSTEM) - { - setCurrentIndex(coordSys); - } -} - -void RefCoordComboBox::ToggleRefCoordSys() -{ - QStringList coordSys = coordSysList(); - const int localIndex = coordSys.indexOf(tr("Local")); - const int worldIndex = coordSys.indexOf(tr("World")); - const int newIndex = currentIndex() == localIndex ? worldIndex : localIndex; - setCurrentIndex(newIndex); -} - QToolButton* MainWindow::CreateUndoRedoButton(int command) { // We do either undo or redo below, sort that out here @@ -2520,9 +2383,6 @@ QWidget* MainWindow::CreateToolbarWidget(int actionId) case ID_TOOLBAR_WIDGET_REDO: w = CreateUndoRedoButton(ID_REDO); break; - case ID_TOOLBAR_WIDGET_REF_COORD: - w = CreateRefCoordComboBox(); - break; case ID_TOOLBAR_WIDGET_SNAP_GRID: w = CreateSnapToGridWidget(); break; diff --git a/Code/Sandbox/Editor/MainWindow.h b/Code/Sandbox/Editor/MainWindow.h index c40d732cee..3e652888fe 100644 --- a/Code/Sandbox/Editor/MainWindow.h +++ b/Code/Sandbox/Editor/MainWindow.h @@ -77,19 +77,6 @@ namespace AzToolsFramework // Subclassing so we can add slots to our toolbar widgets // Using lambdas is crashy since the lamdba doesn't know when the widget is deleted. -class RefCoordComboBox - : public QComboBox -{ - Q_OBJECT -public: - explicit RefCoordComboBox(QWidget* parent); -public Q_SLOTS: - void ToggleRefCoordSys(); - void UpdateRefCoordSys(); -private: - QStringList coordSysList() const; -}; - class UndoRedoToolButton : public QToolButton { @@ -229,8 +216,6 @@ private: QWidget* CreateSnapToGridWidget(); QWidget* CreateSnapToAngleWidget(); - QComboBox* CreateRefCoordComboBox(); - QToolButton* CreateUndoRedoButton(int command); QToolButton* CreateEnvironmentModeButton(); diff --git a/Code/Sandbox/Editor/Objects/AxisGizmo.cpp b/Code/Sandbox/Editor/Objects/AxisGizmo.cpp index 44138b290d..40970838c1 100644 --- a/Code/Sandbox/Editor/Objects/AxisGizmo.cpp +++ b/Code/Sandbox/Editor/Objects/AxisGizmo.cpp @@ -137,36 +137,6 @@ void CAxisGizmo::GetWorldBounds(AABB& bbox) void CAxisGizmo::DrawAxis(DisplayContext& dc) { m_pAxisHelper->SetHighlightAxis(m_highlightAxis); - // Only enable axis planes when editor is in Move mode. - int nEditMode = GetIEditor()->GetEditMode(); - int nModeFlags = 0; - switch (nEditMode) - { - case eEditModeMove: - nModeFlags |= CAxisHelper::MOVE_MODE; - break; - case eEditModeRotate: - nModeFlags |= CAxisHelper::ROTATE_MODE; - nModeFlags &= ~(CAxisHelper::ROTATE_CIRCLE_MODE); - break; - case eEditModeRotateCircle: - nModeFlags |= CAxisHelper::ROTATE_CIRCLE_MODE; - nModeFlags &= ~(CAxisHelper::ROTATE_MODE); - break; - case eEditModeScale: - nModeFlags |= CAxisHelper::SCALE_MODE; - break; - case eEditModeSelect: - nModeFlags |= CAxisHelper::SELECT_MODE; - break; - case eEditModeSelectArea: - nModeFlags |= CAxisHelper::SELECT_MODE; - break; - } - - //nModeFlags |= CAxisHelper::MOVE_MODE | CAxisHelper::ROTATE_MODE | CAxisHelper::SCALE_MODE; - - m_pAxisHelper->SetMode(nModeFlags); Matrix34 tm = GetTransformation(m_bAlwaysUseLocal ? COORDS_LOCAL : GetIEditor()->GetReferenceCoordSys(), dc.view); m_pAxisHelper->DrawAxis(tm, GetIEditor()->GetGlobalGizmoParameters(), dc); @@ -177,21 +147,6 @@ void CAxisGizmo::DrawAxis(DisplayContext& dc) m_pAxisHelper->DrawDome(tm, GetIEditor()->GetGlobalGizmoParameters(), dc, objectBox); } - ////////////////////////////////////////////////////////////////////////// - // Draw extended infinite-axis gizmo - ////////////////////////////////////////////////////////////////////////// - if (!(dc.flags & DISPLAY_2D) && - (nModeFlags == CAxisHelper::MOVE_MODE || - nModeFlags == CAxisHelper::ROTATE_MODE)) - { - bool bClickedShift = CheckVirtualKey(Qt::Key_Shift); - if (bClickedShift && (m_axisGizmoCount == 1 || m_highlightAxis || (m_axisGizmoCount == 2 && m_object && m_object->IsSkipSelectionHelper()))) - { - bool bClickedAlt = CheckVirtualKey(Qt::Key_Menu); - bool bUsePhysicalProxy = !bClickedAlt; - m_pAxisHelperExtended->DrawAxes(dc, tm, bUsePhysicalProxy); - } - } } ////////////////////////////////////////////////////////////////////////// @@ -324,7 +279,7 @@ Matrix34 CAxisGizmo::GetTransformation(RefCoordSys coordSys, IDisplayViewport* v } ////////////////////////////////////////////////////////////////////////// -bool CAxisGizmo::MouseCallback(CViewport* view, EMouseEvent event, QPoint& point, int nFlags) +bool CAxisGizmo::MouseCallback(CViewport* view, EMouseEvent event, QPoint& point, [[maybe_unused]] int nFlags) { AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::Editor); @@ -364,22 +319,6 @@ bool CAxisGizmo::MouseCallback(CViewport* view, EMouseEvent event, QPoint& point m_cMouseDownPos = point; m_initPos = GetTransformation(COORDS_WORLD).GetTranslation(); - switch (hc.manipulatorMode) - { - case 1: - view->SetCurrentCursor(STD_CURSOR_MOVE); - GetIEditor()->SetEditMode(eEditModeMove); - break; - case 2: - view->SetCurrentCursor(STD_CURSOR_ROTATE); - GetIEditor()->SetEditMode(eEditModeRotate); - break; - case 3: - view->SetCurrentCursor(STD_CURSOR_SCALE); - GetIEditor()->SetEditMode(eEditModeScale); - break; - } - return true; } } @@ -387,152 +326,6 @@ bool CAxisGizmo::MouseCallback(CViewport* view, EMouseEvent event, QPoint& point { if (m_bDragging) { - bool bCallBack = true; - Vec3 vDragValue(0, 0, 0); - // Dragging transform manipulator. - switch (GetIEditor()->GetEditMode()) - { - case eEditModeMove: - { - view->SetCurrentCursor(STD_CURSOR_MOVE); - - if (view->GetAxisConstrain() == AXIS_TERRAIN) - { - if (nFlags & MK_CONTROL) - { - bool bCollideWithTerrain; - Vec3 posOnTerrain = view->ViewToWorld(point, &bCollideWithTerrain, true); - if (!bCollideWithTerrain) - { - return true; - } - vDragValue = posOnTerrain - m_initPos; - } - else - { - Vec3 p1 = view->SnapToGrid(view->ViewToWorld(m_cMouseDownPos)); - Vec3 p2 = view->SnapToGrid(view->ViewToWorld(point)); - vDragValue = p2 - p1; - vDragValue.z = 0; - } - } - else - { - Vec3 p1 = view->MapViewToCP(m_cMouseDownPos); - Vec3 p2 = view->MapViewToCP(point); - if (p1.IsZero() || p2.IsZero()) - { - return true; - } - vDragValue = view->GetCPVector(p1, p2); - } - } - break; - case eEditModeRotate: - { - view->SetCurrentCursor(STD_CURSOR_ROTATE); - - Ang3 ang(0, 0, 0); - float ax = (point.x() - m_cMouseDownPos.x()); - float ay = (point.y() - m_cMouseDownPos.y()); - switch (view->GetAxisConstrain()) - { - case AXIS_X: - ang.x = ay; - break; - case AXIS_Y: - ang.y = ay; - break; - case AXIS_Z: - ang.z = ay; - break; - case AXIS_XY: - ang(ax, ay, 0); - break; - case AXIS_XZ: - ang(ax, 0, ay); - break; - case AXIS_YZ: - ang(0, ay, ax); - break; - case AXIS_TERRAIN: - ang(ax, ay, 0); - break; - } - ; - ang = gSettings.pGrid->SnapAngle(ang); - vDragValue = Vec3(DEG2RAD(ang)); - } - break; - case eEditModeScale: - { - Vec3 scl(0, 0, 0); - float ay = 1.0f - 0.01f * (point.y() - m_cMouseDownPos.y()); - if (ay < 0.01f) - { - ay = 0.01f; - } - scl(ay, ay, ay); - switch (view->GetAxisConstrain()) - { - case AXIS_X: - scl(ay, 1, 1); - break; - case AXIS_Y: - scl(1, ay, 1); - break; - case AXIS_Z: - scl(1, 1, ay); - break; - case AXIS_XY: - scl(ay, ay, ay); - break; - case AXIS_XZ: - scl(ay, ay, ay); - break; - case AXIS_YZ: - scl(ay, ay, ay); - break; - case AXIS_XYZ: - scl(ay, ay, ay); - break; - case AXIS_TERRAIN: - scl(ay, ay, ay); - break; - } - ; - view->SetCurrentCursor(STD_CURSOR_SCALE); - vDragValue = scl; - } - break; - case eEditModeRotateCircle: - { - Matrix34 tm = GetTransformation(m_bAlwaysUseLocal ? COORDS_LOCAL : GetIEditor()->GetReferenceCoordSys()); - Vec3 v0, v1; - Vec3 vHitNormal; - if (m_pAxisHelper->HitTestForRotationCircle(tm, view, m_cMouseDownPos, 0.05f, &v0, &vHitNormal) && m_pAxisHelper->HitTestForRotationCircle(tm, view, point, 2.0f, &v1, &vHitNormal)) - { - Vec3 vDir0 = (v0 - tm.GetTranslation()).GetNormalized(); - Vec3 vDir1 = (v1 - tm.GetTranslation()).GetNormalized(); - - Vec3 vCurlDir = vDir0.Cross(vDir1).GetNormalized(); - if (vHitNormal.Dot(vCurlDir) > 0) - { - vDragValue = Vec3(std::acos(vDir0.Dot(vDir1)), 0, 0); - } - else - { - vDragValue = Vec3(-std::acos(vDir0.Dot(vDir1)), 0, 0); - } - } - else - { - bCallBack = false; - } - } - break; - } - return true; } else diff --git a/Code/Sandbox/Editor/PythonEditorEventsBus.h b/Code/Sandbox/Editor/PythonEditorEventsBus.h index f4b2971a17..69ef2671a1 100644 --- a/Code/Sandbox/Editor/PythonEditorEventsBus.h +++ b/Code/Sandbox/Editor/PythonEditorEventsBus.h @@ -139,16 +139,6 @@ namespace AzToolsFramework */ virtual void SetAxisConstraint(AZStd::string_view pConstrain) = 0; - /* - * Gets edit mode. - */ - virtual const char* GetEditMode() = 0; - - /* - * Sets edit mode. - */ - virtual void SetEditMode(AZStd::string_view pEditMode) = 0; - /* * Finds a pak file name for a given file. */ diff --git a/Code/Sandbox/Editor/PythonEditorFuncs.cpp b/Code/Sandbox/Editor/PythonEditorFuncs.cpp index f5de22387c..8f735706fd 100644 --- a/Code/Sandbox/Editor/PythonEditorFuncs.cpp +++ b/Code/Sandbox/Editor/PythonEditorFuncs.cpp @@ -688,68 +688,6 @@ namespace } } - ////////////////////////////////////////////////////////////////////////// - // Edit Mode - ////////////////////////////////////////////////////////////////////////// - const char* PyGetEditMode() - { - int actualEditMode = GetIEditor()->GetEditMode(); - switch (actualEditMode) - { - case eEditModeSelect: - return "SELECT"; - case eEditModeSelectArea: - return "SELECTAREA"; - case eEditModeMove: - return "MOVE"; - case eEditModeRotate: - return "ROTATE"; - case eEditModeScale: - return "SCALE"; - case eEditModeTool: - return "TOOL"; - default: - throw std::logic_error("Invalid edit mode."); - } - } - - void PySetEditMode(AZStd::string_view pEditMode) - { - if (pEditMode == "MOVE") - { - GetIEditor()->SetEditMode(eEditModeMove); - } - else if (pEditMode == "ROTATE") - { - GetIEditor()->SetEditMode(eEditModeRotate); - } - else if (pEditMode == "SCALE") - { - GetIEditor()->SetEditMode(eEditModeScale); - } - else if (pEditMode == "SELECT") - { - GetIEditor()->SetEditMode(eEditModeSelect); - } - else if (pEditMode == "SELECTAREA") - { - GetIEditor()->SetEditMode(eEditModeSelectArea); - } - else if (pEditMode == "TOOL") - { - GetIEditor()->SetEditMode(eEditModeTool); - } - else if (pEditMode == "RULER") - { - CRuler* pRuler = GetIEditor()->GetRuler(); - pRuler->SetActive(!pRuler->IsActive()); - } - else - { - throw std::logic_error("Invalid edit mode."); - } - } - ////////////////////////////////////////////////////////////////////////// const char* PyGetPakFromFile(const char* filename) { @@ -1031,8 +969,6 @@ namespace AzToolsFramework ->Event("OpenFileBox", &EditorLayerPythonRequestBus::Events::OpenFileBox) ->Event("GetAxisConstraint", &EditorLayerPythonRequestBus::Events::GetAxisConstraint) ->Event("SetAxisConstraint", &EditorLayerPythonRequestBus::Events::SetAxisConstraint) - ->Event("GetEditMode", &EditorLayerPythonRequestBus::Events::GetEditMode) - ->Event("SetEditMode", &EditorLayerPythonRequestBus::Events::SetEditMode) ->Event("GetPakFromFile", &EditorLayerPythonRequestBus::Events::GetPakFromFile) ->Event("Log", &EditorLayerPythonRequestBus::Events::Log) ->Event("Undo", &EditorLayerPythonRequestBus::Events::Undo) @@ -1168,16 +1104,6 @@ namespace AzToolsFramework return PySetAxisConstraint(pConstrain); } - const char* PythonEditorComponent::GetEditMode() - { - return PyGetEditMode(); - } - - void PythonEditorComponent::SetEditMode(AZStd::string_view pEditMode) - { - return PySetEditMode(pEditMode); - } - const char* PythonEditorComponent::GetPakFromFile(const char* filename) { return PyGetPakFromFile(filename); @@ -1252,9 +1178,6 @@ namespace AzToolsFramework addLegacyGeneral(behaviorContext->Method("get_axis_constraint", PyGetAxisConstraint, nullptr, "Gets axis.")); addLegacyGeneral(behaviorContext->Method("set_axis_constraint", PySetAxisConstraint, nullptr, "Sets axis.")); - addLegacyGeneral(behaviorContext->Method("get_edit_mode", PyGetEditMode, nullptr, "Gets edit mode.")); - addLegacyGeneral(behaviorContext->Method("set_edit_mode", PySetEditMode, nullptr, "Sets edit mode.")); - addLegacyGeneral(behaviorContext->Method("get_pak_from_file", PyGetPakFromFile, nullptr, "Finds a pak file name for a given file.")); addLegacyGeneral(behaviorContext->Method("log", PyLog, nullptr, "Prints the message to the editor console window.")); diff --git a/Code/Sandbox/Editor/PythonEditorFuncs.h b/Code/Sandbox/Editor/PythonEditorFuncs.h index 37cb6bd551..471f0d581f 100644 --- a/Code/Sandbox/Editor/PythonEditorFuncs.h +++ b/Code/Sandbox/Editor/PythonEditorFuncs.h @@ -95,10 +95,6 @@ namespace AzToolsFramework void SetAxisConstraint(AZStd::string_view pConstrain) override; - const char* GetEditMode() override; - - void SetEditMode(AZStd::string_view pEditMode) override; - const char* GetPakFromFile(const char* filename) override; void Log(const char* pMessage) override; diff --git a/Code/Sandbox/Editor/RenderViewport.cpp b/Code/Sandbox/Editor/RenderViewport.cpp index 53355f4dd9..af4cbd46bc 100644 --- a/Code/Sandbox/Editor/RenderViewport.cpp +++ b/Code/Sandbox/Editor/RenderViewport.cpp @@ -4301,11 +4301,6 @@ void CRenderViewport::RenderSnappingGrid() { return; } - if (GetIEditor()->GetEditMode() != eEditModeMove - && GetIEditor()->GetEditMode() != eEditModeRotate) - { - return; - } CGrid* pGrid = GetViewManager()->GetGrid(); if (pGrid->IsEnabled() == false && pGrid->IsAngleSnapEnabled() == false) { @@ -4317,76 +4312,6 @@ void CRenderViewport::RenderSnappingGrid() int prevState = dc.GetState(); dc.DepthWriteOff(); - Vec3 p = pSelGroup->GetObject(0)->GetWorldPos(); - - AABB bbox; - pSelGroup->GetObject(0)->GetBoundBox(bbox); - float size = 2 * bbox.GetRadius(); - float alphaMax = 1.0f, alphaMin = 0.2f; - dc.SetLineWidth(3); - - if (GetIEditor()->GetEditMode() == eEditModeMove && pGrid->IsEnabled()) - // Draw the translation grid. - { - Vec3 u = m_constructionPlaneAxisX; - Vec3 v = m_constructionPlaneAxisY; - float step = pGrid->scale * pGrid->size; - const int MIN_STEP_COUNT = 5; - const int MAX_STEP_COUNT = 300; - int nSteps = std::min(std::max(FloatToIntRet(size / step), MIN_STEP_COUNT), MAX_STEP_COUNT); - size = nSteps * step; - for (int i = -nSteps; i <= nSteps; ++i) - { - // Draw u lines. - float alphaCur = alphaMax - fabsf(float(i) / float(nSteps)) * (alphaMax - alphaMin); - dc.DrawLine(p + v * (step * i), p + u * size + v * (step * i), - ColorF(0, 0, 0, alphaCur), ColorF(0, 0, 0, alphaMin)); - dc.DrawLine(p + v * (step * i), p - u * size + v * (step * i), - ColorF(0, 0, 0, alphaCur), ColorF(0, 0, 0, alphaMin)); - // Draw v lines. - dc.DrawLine(p + u * (step * i), p + v * size + u * (step * i), - ColorF(0, 0, 0, alphaCur), ColorF(0, 0, 0, alphaMin)); - dc.DrawLine(p + u * (step * i), p - v * size + u * (step * i), - ColorF(0, 0, 0, alphaCur), ColorF(0, 0, 0, alphaMin)); - } - } - else if (GetIEditor()->GetEditMode() == eEditModeRotate && pGrid->IsAngleSnapEnabled()) - // Draw the rotation grid. - { - int nAxis(GetAxisConstrain()); - if (nAxis == AXIS_X || nAxis == AXIS_Y || nAxis == AXIS_Z) - { - RefCoordSys coordSys = GetIEditor()->GetReferenceCoordSys(); - Vec3 xAxis(1, 0, 0); - Vec3 yAxis(0, 1, 0); - Vec3 zAxis(0, 0, 1); - Vec3 rotAxis; - if (nAxis == AXIS_X) - { - rotAxis = m_constructionMatrix[coordSys].TransformVector(xAxis); - } - else if (nAxis == AXIS_Y) - { - rotAxis = m_constructionMatrix[coordSys].TransformVector(yAxis); - } - else if (nAxis == AXIS_Z) - { - rotAxis = m_constructionMatrix[coordSys].TransformVector(zAxis); - } - Vec3 anotherAxis = m_constructionPlane.n * size; - float step = pGrid->angleSnap; - int nSteps = FloatToIntRet(180.0f / step); - for (int i = 0; i < nSteps; ++i) - { - AngleAxis rot(i* step* gf_PI / 180.0, rotAxis); - Vec3 dir = rot * anotherAxis; - dc.DrawLine(p, p + dir, - ColorF(0, 0, 0, alphaMax), ColorF(0, 0, 0, alphaMin)); - dc.DrawLine(p, p - dir, - ColorF(0, 0, 0, alphaMax), ColorF(0, 0, 0, alphaMin)); - } - } - } dc.SetState(prevState); } diff --git a/Code/Sandbox/Editor/Resource.h b/Code/Sandbox/Editor/Resource.h index d72c2d76d4..8c4b09ae67 100644 --- a/Code/Sandbox/Editor/Resource.h +++ b/Code/Sandbox/Editor/Resource.h @@ -141,18 +141,12 @@ #define ID_EDITMODE_ROTATE 33506 #define ID_EDITMODE_SCALE 33507 #define ID_EDITMODE_MOVE 33508 -#define ID_EDITMODE_SELECT 33509 -#define ID_EDITMODE_SELECTAREA 33510 #define ID_SELECTION_DELETE 33512 #define ID_EDIT_ESCAPE 33513 #define ID_OBJECTMODIFY_SETAREA 33514 #define ID_OBJECTMODIFY_SETHEIGHT 33515 #define ID_OBJECTMODIFY_FREEZE 33517 #define ID_OBJECTMODIFY_UNFREEZE 33518 -#define ID_SELECT_AXIS_XY 33520 -#define ID_SELECT_AXIS_X 33521 -#define ID_SELECT_AXIS_Y 33522 -#define ID_SELECT_AXIS_Z 33523 #define ID_UNDO 33524 #define ID_EDIT_CLONE 33525 #define ID_SELECTION_SAVE 33527 @@ -161,7 +155,6 @@ #define ID_EDIT_LEVELDATA 33542 #define ID_FILE_EDITEDITORINI 33543 #define ID_FILE_EDITLOGFILE 33544 -#define ID_SELECT_AXIS_TERRAIN 33545 #define ID_PREFERENCES 33546 #define ID_RELOAD_GEOMETRY 33549 #define ID_REDO 33550 @@ -213,7 +206,6 @@ #define ID_TV_NEXTKEY 33603 #define ID_PLAY_LOOP 33607 #define ID_TERRAIN 33611 -#define ID_OBJECTMODIFY_ALIGNTOGRID 33619 #define ID_PANEL_VEG_EXPORT 33672 #define ID_PANEL_VEG_IMPORT 33673 #define ID_PANEL_VEG_DISTRIBUTE 33674 @@ -226,7 +218,6 @@ #define ID_PANEL_VEG_ADDCATEGORY 33682 #define ID_PANEL_VEG_RENAMECATEGORY 33683 #define ID_PANEL_VEG_REMOVECATEGORY 33684 -#define ID_SELECT_AXIS_SNAPTOALL 33685 #define ID_TOOLS_PREFERENCES 33691 #define ID_EDIT_INVERTSELECTION 33692 #define ID_TOOLTERRAINMODIFY_SMOOTH 33695 @@ -279,7 +270,6 @@ #define ID_DISPLAY_GOTOPOSITION 34004 #define ID_PHYSICS_SIMULATEOBJECTS 34007 #define ID_TERRAIN_TEXTURE_EXPORT 34008 -#define ID_DISPLAY_SETVECTOR 34010 #define ID_TV_SEQUENCE_NEW 34049 #define ID_TV_MODE_DOPESHEET 34052 #define ID_VIEW_LAYOUTS 34053 @@ -403,7 +393,6 @@ #define ID_TOOLBAR_WIDGET_FIRST 50003 #define ID_TOOLBAR_WIDGET_UNDO 50003 #define ID_TOOLBAR_WIDGET_REDO 50004 -#define ID_TOOLBAR_WIDGET_REF_COORD 50006 #define ID_TOOLBAR_WIDGET_SNAP_ANGLE 50007 #define ID_TOOLBAR_WIDGET_SNAP_GRID 50008 #define ID_TOOLBAR_WIDGET_ENVIRONMENT_MODE 50011 diff --git a/Code/Sandbox/Editor/SetVectorDlg.cpp b/Code/Sandbox/Editor/SetVectorDlg.cpp deleted file mode 100644 index 583f5ff4af..0000000000 --- a/Code/Sandbox/Editor/SetVectorDlg.cpp +++ /dev/null @@ -1,257 +0,0 @@ -/* -* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or -* its licensors. -* -* For complete copyright and license terms please see the LICENSE at the root of this -* distribution (the "License"). All use of this software is governed by the License, -* or, if provided, by the license below or the license accompanying this file. Do not -* remove or modify any license notices. This file is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* -*/ -// Original file Copyright Crytek GMBH or its affiliates, used under license. - -#include "EditorDefs.h" - -#include "SetVectorDlg.h" - -// Editor -#include "MainWindow.h" -#include "MathConversion.h" -#include "ActionManager.h" -#include "Objects/BaseObject.h" -#include "Objects/SelectionGroup.h" - -AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING -#include "ui_SetVectorDlg.h" -AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING - -///////////////////////////////////////////////////////////////////////////// -// CSetVectorDlg dialog - - -CSetVectorDlg::CSetVectorDlg(QWidget* pParent /*=NULL*/) - : QDialog(pParent) - , m_ui(new Ui::SetVectorDlg) -{ - m_ui->setupUi(this); - - OnInitDialog(); - - connect(m_ui->buttonOk, &QPushButton::clicked, this, &CSetVectorDlg::accept); - connect(m_ui->buttonCancel, &QPushButton::clicked, this, &CSetVectorDlg::reject); -} - -CSetVectorDlg::~CSetVectorDlg() -{ -} - -///////////////////////////////////////////////////////////////////////////// -// CSetVectorDlg message handlers - - -void CSetVectorDlg::OnInitDialog() -{ - QString editModeString; - int emode = GetIEditor()->GetEditMode(); - - if (emode == eEditModeMove) - { - editModeString = tr("Position"); - } - else if (emode == eEditModeRotate) - { - editModeString = tr("Rotation"); - } - else if (emode == eEditModeScale) - { - editModeString = tr("Scale"); - } - - m_ui->label->setText(tr("Enter %1 here:").arg(editModeString)); - - currentVec = GetVectorFromEditor(); - m_ui->edit->setText(QStringLiteral("%1, %2, %3").arg(currentVec.x, 2, 'f', 2).arg(currentVec.y, 2, 'f', 2).arg(currentVec.z, 2, 'f', 2)); -} - -void CSetVectorDlg::accept() -{ - Vec3 newVec = GetVectorFromText(); - SetVector(newVec); - - if (GetIEditor()->GetEditMode() == eEditModeMove && currentVec.GetDistance(newVec) > 10.0f) - { - MainWindow::instance()->GetActionManager()->GetAction(ID_GOTO_SELECTED)->trigger(); - } - QDialog::accept(); -} - -Vec3 CSetVectorDlg::GetVectorFromEditor() -{ - Vec3 v; - int emode = GetIEditor()->GetEditMode(); - CBaseObject* obj = GetIEditor()->GetSelectedObject(); - bool bWorldSpace = GetIEditor()->GetReferenceCoordSys() == COORDS_WORLD; - - if (obj) - { - v = obj->GetWorldPos(); - } - - if (emode == eEditModeMove) - { - if (obj) - { - if (bWorldSpace) - { - v = obj->GetWorldTM().GetTranslation(); - } - else - { - v = obj->GetPos(); - } - } - } - if (emode == eEditModeRotate) - { - if (obj) - { - Quat qrot; - if (bWorldSpace) - { - AffineParts ap; - ap.SpectralDecompose(obj->GetWorldTM()); - qrot = ap.rot; - } - else - { - qrot = obj->GetRotation(); - } - - v = AZVec3ToLYVec3(AZ::ConvertQuaternionToEulerDegrees(LYQuaternionToAZQuaternion(qrot))); - } - } - if (emode == eEditModeScale) - { - if (obj) - { - if (bWorldSpace) - { - AffineParts ap; - ap.SpectralDecompose(obj->GetWorldTM()); - v = ap.scale; - } - else - { - v = obj->GetScale(); - } - } - } - return v; -} - -Vec3 CSetVectorDlg::GetVectorFromText() -{ - return GetVectorFromString(m_ui->edit->text()); -} - -Vec3 CSetVectorDlg::GetVectorFromString(const QString& vecString) -{ - const int maxCoordinates = 3; - float vec[maxCoordinates] = { 0, 0, 0 }; - - const QStringList parts = vecString.split(QRegularExpression("[\\s,;\\t]"), Qt::SkipEmptyParts); - const int checkCoords = AZStd::GetMin(parts.count(), maxCoordinates); - for (int k = 0; k < checkCoords; ++k) - { - vec[k] = parts[k].toDouble(); - } - - return Vec3(vec[0], vec[1], vec[2]); -} - -void CSetVectorDlg::SetVector(const Vec3& v) -{ - int emode = GetIEditor()->GetEditMode(); - if (emode != eEditModeMove && emode != eEditModeRotate && emode != eEditModeScale) - { - return; - } - - int referenceCoordSys = GetIEditor()->GetReferenceCoordSys(); - - CBaseObject* obj = GetIEditor()->GetSelectedObject(); - - Matrix34 tm; - AffineParts ap; - if (obj) - { - tm = obj->GetWorldTM(); - ap.SpectralDecompose(tm); - } - - if (emode == eEditModeMove) - { - if (obj) - { - CUndo undo("Set Position"); - if (referenceCoordSys == COORDS_WORLD) - { - tm.SetTranslation(v); - obj->SetWorldTM(tm, eObjectUpdateFlags_UserInput); - } - else - { - obj->SetPos(v, eObjectUpdateFlags_UserInput); - } - } - } - if (emode == eEditModeRotate) - { - CUndo undo("Set Rotation"); - if (obj) - { - Quat qrot = AZQuaternionToLYQuaternion(AZ::ConvertEulerDegreesToQuaternion(LYVec3ToAZVec3(v))); - if (referenceCoordSys == COORDS_WORLD) - { - tm = Matrix34::Create(ap.scale, qrot, ap.pos); - obj->SetWorldTM(tm, eObjectUpdateFlags_UserInput); - } - else - { - obj->SetRotation(qrot, eObjectUpdateFlags_UserInput); - } - } - else - { - GetIEditor()->GetSelection()->Rotate((Ang3)v, referenceCoordSys); - } - } - if (emode == eEditModeScale) - { - if (v.x == 0 || v.y == 0 || v.z == 0) - { - return; - } - - CUndo undo("Set Scale"); - if (obj) - { - if (referenceCoordSys == COORDS_WORLD) - { - tm = Matrix34::Create(v, ap.rot, ap.pos); - obj->SetWorldTM(tm, eObjectUpdateFlags_UserInput); - } - else - { - obj->SetScale(v, eObjectUpdateFlags_UserInput); - } - } - else - { - GetIEditor()->GetSelection()->Scale(v, referenceCoordSys); - } - } -} - -#include diff --git a/Code/Sandbox/Editor/SetVectorDlg.h b/Code/Sandbox/Editor/SetVectorDlg.h deleted file mode 100644 index e9fd8115e5..0000000000 --- a/Code/Sandbox/Editor/SetVectorDlg.h +++ /dev/null @@ -1,61 +0,0 @@ -/* -* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or -* its licensors. -* -* For complete copyright and license terms please see the LICENSE at the root of this -* distribution (the "License"). All use of this software is governed by the License, -* or, if provided, by the license below or the license accompanying this file. Do not -* remove or modify any license notices. This file is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* -*/ -// Original file Copyright Crytek GMBH or its affiliates, used under license. - -#ifndef CRYINCLUDE_EDITOR_SETVECTORDLG_H -#define CRYINCLUDE_EDITOR_SETVECTORDLG_H - -#pragma once -// GotoPositionDlg.h : header file -// - -#if !defined(Q_MOC_RUN) -#include -#endif - -namespace Ui -{ - class SetVectorDlg; -} - -///////////////////////////////////////////////////////////////////////////// -// CSetVectorDlg dialog - -class SANDBOX_API CSetVectorDlg - : public QDialog -{ - Q_OBJECT - // Construction -public: - CSetVectorDlg(QWidget* pParent = NULL); // standard constructor - ~CSetVectorDlg(); - - static Vec3 GetVectorFromString(const QString& vecString); - - // Implementation -protected: - void OnInitDialog(); - void accept() override; - void SetVector(const Vec3& v); - Vec3 GetVectorFromText(); - Vec3 GetVectorFromEditor(); - AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING - Vec3 currentVec; - AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING - -private: - AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING - QScopedPointer m_ui; - AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING -}; - -#endif // CRYINCLUDE_EDITOR_SETVECTORDLG_H diff --git a/Code/Sandbox/Editor/SetVectorDlg.ui b/Code/Sandbox/Editor/SetVectorDlg.ui deleted file mode 100644 index a8ed3cb282..0000000000 --- a/Code/Sandbox/Editor/SetVectorDlg.ui +++ /dev/null @@ -1,55 +0,0 @@ - - - SetVectorDlg - - - - 0 - 0 - 270 - 99 - - - - Set Vector - - - - 29 - - - - - - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop - - - - - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - - - - - Cancel - - - - - - - Set - - - - - - - - diff --git a/Code/Sandbox/Editor/ToolbarManager.cpp b/Code/Sandbox/Editor/ToolbarManager.cpp index 12fd9b1a03..6977121933 100644 --- a/Code/Sandbox/Editor/ToolbarManager.cpp +++ b/Code/Sandbox/Editor/ToolbarManager.cpp @@ -587,26 +587,13 @@ AmazonToolbar ToolbarManager::GetEditModeToolbar() const t.AddAction(ID_TOOLBAR_SEPARATOR, ORIGINAL_TOOLBAR_VERSION); - if (!GetIEditor()->IsNewViewportInteractionModelEnabled()) - { - t.AddAction(ID_EDITMODE_SELECT, ORIGINAL_TOOLBAR_VERSION); - } - t.AddAction(ID_EDITMODE_MOVE, ORIGINAL_TOOLBAR_VERSION); t.AddAction(ID_EDITMODE_ROTATE, ORIGINAL_TOOLBAR_VERSION); t.AddAction(ID_EDITMODE_SCALE, ORIGINAL_TOOLBAR_VERSION); - t.AddAction(ID_EDITMODE_SELECTAREA, ORIGINAL_TOOLBAR_VERSION); t.AddAction(ID_VIEW_SWITCHTOGAME, TOOLBARS_WITH_PLAY_GAME); t.AddAction(ID_TOOLBAR_SEPARATOR, ORIGINAL_TOOLBAR_VERSION); - t.AddAction(ID_TOOLBAR_WIDGET_REF_COORD, ORIGINAL_TOOLBAR_VERSION); - t.AddAction(ID_SELECT_AXIS_X, ORIGINAL_TOOLBAR_VERSION); - t.AddAction(ID_SELECT_AXIS_Y, ORIGINAL_TOOLBAR_VERSION); - t.AddAction(ID_SELECT_AXIS_Z, ORIGINAL_TOOLBAR_VERSION); - t.AddAction(ID_SELECT_AXIS_XY, ORIGINAL_TOOLBAR_VERSION); - t.AddAction(ID_SELECT_AXIS_TERRAIN, ORIGINAL_TOOLBAR_VERSION); - t.AddAction(ID_SELECT_AXIS_SNAPTOALL, ORIGINAL_TOOLBAR_VERSION); t.AddAction(ID_TOOLBAR_WIDGET_SNAP_GRID, ORIGINAL_TOOLBAR_VERSION); t.AddAction(ID_TOOLBAR_WIDGET_SNAP_ANGLE, ORIGINAL_TOOLBAR_VERSION); t.AddAction(ID_RULER, ORIGINAL_TOOLBAR_VERSION); @@ -623,7 +610,6 @@ AmazonToolbar ToolbarManager::GetObjectToolbar() const AmazonToolbar t = AmazonToolbar("Object", QObject::tr("Object Toolbar")); t.SetMainToolbar(true); t.AddAction(ID_GOTO_SELECTED, ORIGINAL_TOOLBAR_VERSION); - t.AddAction(ID_OBJECTMODIFY_ALIGNTOGRID, ORIGINAL_TOOLBAR_VERSION); t.AddAction(ID_OBJECTMODIFY_SETHEIGHT, ORIGINAL_TOOLBAR_VERSION); if (!GetIEditor()->IsNewViewportInteractionModelEnabled()) diff --git a/Code/Sandbox/Editor/editor_lib_files.cmake b/Code/Sandbox/Editor/editor_lib_files.cmake index da32d6d062..4adf501d45 100644 --- a/Code/Sandbox/Editor/editor_lib_files.cmake +++ b/Code/Sandbox/Editor/editor_lib_files.cmake @@ -484,9 +484,6 @@ set(FILES SelectLightAnimationDialog.h SelectSequenceDialog.cpp SelectSequenceDialog.h - SetVectorDlg.cpp - SetVectorDlg.h - SetVectorDlg.ui ShadersDialog.cpp ShadersDialog.h ShadersDialog.ui diff --git a/Code/Sandbox/Editor/editor_lib_test_files.cmake b/Code/Sandbox/Editor/editor_lib_test_files.cmake index 27713f4d30..f537169136 100644 --- a/Code/Sandbox/Editor/editor_lib_test_files.cmake +++ b/Code/Sandbox/Editor/editor_lib_test_files.cmake @@ -20,7 +20,6 @@ set(FILES Lib/Tests/test_MainWindowPythonBindings.cpp Lib/Tests/test_MaterialPythonFuncs.cpp Lib/Tests/test_ObjectManagerPythonBindings.cpp - Lib/Tests/test_SetVectorDlg.cpp Lib/Tests/test_TrackViewPythonBindings.cpp Lib/Tests/test_ViewPanePythonBindings.cpp Lib/Tests/test_ViewportTitleDlgPythonBindings.cpp diff --git a/Gems/Gestures/Code/CMakeLists.txt b/Gems/Gestures/Code/CMakeLists.txt index fe0fd9d98b..c05b39b72c 100644 --- a/Gems/Gestures/Code/CMakeLists.txt +++ b/Gems/Gestures/Code/CMakeLists.txt @@ -20,6 +20,9 @@ ly_add_target( PUBLIC Include BUILD_DEPENDENCIES + PUBLIC + Gem::Atom_RPI.Public + AZ::AtomCore PRIVATE Legacy::CryCommon ) diff --git a/Gems/Gestures/Code/Include/Gestures/IGestureRecognizer.h b/Gems/Gestures/Code/Include/Gestures/IGestureRecognizer.h index 3f71cd4b62..4b5b7726d8 100644 --- a/Gems/Gestures/Code/Include/Gestures/IGestureRecognizer.h +++ b/Gems/Gestures/Code/Include/Gestures/IGestureRecognizer.h @@ -19,6 +19,9 @@ #include #include +#include +#include + //////////////////////////////////////////////////////////////////////////////////////////////////// namespace Gestures { @@ -184,8 +187,16 @@ namespace Gestures return; } - const AZ::Vector2 eventScreenPositionPixels = positionData2D->ConvertToScreenSpaceCoordinates(static_cast(gEnv->pRenderer->GetWidth()), - static_cast(gEnv->pRenderer->GetHeight())); + auto atomViewportRequests = AZ::Interface::Get(); + AZ::RPI::ViewportContextPtr viewportContext = atomViewportRequests->GetDefaultViewportContext(); + if (viewportContext == nullptr) + { + return; + } + + AzFramework::WindowSize windowSize = viewportContext->GetViewportSize(); + const AZ::Vector2 eventScreenPositionPixels = positionData2D->ConvertToScreenSpaceCoordinates(static_cast(windowSize.m_width), + static_cast(windowSize.m_height)); if (inputChannel.IsStateBegan()) { o_hasBeenConsumed = OnPressedEvent(eventScreenPositionPixels, pointerIndex); @@ -225,8 +236,16 @@ namespace Gestures //////////////////////////////////////////////////////////////////////////////////////////////// inline void IRecognizer::UpdateNormalizedPositionAndDeltaFromScreenPosition(const AZ::Vector2& screenPositionPixels) { - const AZ::Vector2 normalizedPosition(screenPositionPixels.GetX() / static_cast(gEnv->pRenderer->GetWidth()), - screenPositionPixels.GetY() / static_cast(gEnv->pRenderer->GetHeight())); + auto atomViewportRequests = AZ::Interface::Get(); + AZ::RPI::ViewportContextPtr viewportContext = atomViewportRequests->GetDefaultViewportContext(); + if (viewportContext == nullptr) + { + return; + } + + AzFramework::WindowSize windowSize = viewportContext->GetViewportSize(); + const AZ::Vector2 normalizedPosition(screenPositionPixels.GetX() / static_cast(windowSize.m_width), + screenPositionPixels.GetY() / static_cast(windowSize.m_height)); AzFramework::InputChannel::PositionData2D::UpdateNormalizedPositionAndDelta(normalizedPosition); } } diff --git a/Gems/Maestro/Code/Source/Cinematics/AnimAZEntityNode.cpp b/Gems/Maestro/Code/Source/Cinematics/AnimAZEntityNode.cpp index 0fdcca5e2d..b0ebb10b0e 100644 --- a/Gems/Maestro/Code/Source/Cinematics/AnimAZEntityNode.cpp +++ b/Gems/Maestro/Code/Source/Cinematics/AnimAZEntityNode.cpp @@ -88,11 +88,14 @@ void CAnimAzEntityNode::SetSkipInterpolatedCameraNode(const bool skipNodeCameraA } ////////////////////////////////////////////////////////////////////////// -void CAnimAzEntityNode::Reflect(AZ::SerializeContext* serializeContext) +void CAnimAzEntityNode::Reflect(AZ::ReflectContext* context) { - serializeContext->Class() - ->Version(1) - ->Field("Entity", &CAnimAzEntityNode::m_entityId); + if (auto serializeContext = azrtti_cast(context)) + { + serializeContext->Class() + ->Version(1) + ->Field("Entity", &CAnimAzEntityNode::m_entityId); + } } ////////////////////////////////////////////////////////////////////////// diff --git a/Gems/Maestro/Code/Source/Cinematics/AnimAZEntityNode.h b/Gems/Maestro/Code/Source/Cinematics/AnimAZEntityNode.h index 2a3264f381..863d0e927f 100644 --- a/Gems/Maestro/Code/Source/Cinematics/AnimAZEntityNode.h +++ b/Gems/Maestro/Code/Source/Cinematics/AnimAZEntityNode.h @@ -74,7 +74,7 @@ public: // will be animating these components during interpolation. void SetSkipInterpolatedCameraNode(const bool skipNodeCameraAnimation) override; - static void Reflect(AZ::SerializeContext* serializeContext); + static void Reflect(AZ::ReflectContext* context); private: diff --git a/Gems/Maestro/Code/Source/Cinematics/AnimComponentNode.cpp b/Gems/Maestro/Code/Source/Cinematics/AnimComponentNode.cpp index d66d0f266f..ea7322014c 100644 --- a/Gems/Maestro/Code/Source/Cinematics/AnimComponentNode.cpp +++ b/Gems/Maestro/Code/Source/Cinematics/AnimComponentNode.cpp @@ -651,12 +651,15 @@ void CAnimComponentNode::AddPropertyToParamInfoMap(const CAnimParamType& paramTy } ////////////////////////////////////////////////////////////////////////// -void CAnimComponentNode::Reflect(AZ::SerializeContext* serializeContext) +void CAnimComponentNode::Reflect(AZ::ReflectContext* context) { - serializeContext->Class() - ->Version(1) - ->Field("ComponentID", &CAnimComponentNode::m_componentId) - ->Field("ComponentTypeID", &CAnimComponentNode::m_componentTypeId); + if (auto serializeContext = azrtti_cast(context)) + { + serializeContext->Class() + ->Version(1) + ->Field("ComponentID", &CAnimComponentNode::m_componentId) + ->Field("ComponentTypeID", &CAnimComponentNode::m_componentTypeId); + } } ////////////////////////////////////////////////////////////////////////// diff --git a/Gems/Maestro/Code/Source/Cinematics/AnimComponentNode.h b/Gems/Maestro/Code/Source/Cinematics/AnimComponentNode.h index d519a9ba96..5d83f7ba0d 100644 --- a/Gems/Maestro/Code/Source/Cinematics/AnimComponentNode.h +++ b/Gems/Maestro/Code/Source/Cinematics/AnimComponentNode.h @@ -102,7 +102,7 @@ public: m_skipComponentAnimationUpdates = skipAnimationUpdates; } - static void Reflect(AZ::SerializeContext* serializeContext); + static void Reflect(AZ::ReflectContext* context); protected: // functions involved in the process to parse and store component behavior context animated properties diff --git a/Gems/Maestro/Code/Source/Cinematics/AnimEnvironmentNode.cpp b/Gems/Maestro/Code/Source/Cinematics/AnimEnvironmentNode.cpp index 8ee5f605aa..7996cc8c65 100644 --- a/Gems/Maestro/Code/Source/Cinematics/AnimEnvironmentNode.cpp +++ b/Gems/Maestro/Code/Source/Cinematics/AnimEnvironmentNode.cpp @@ -67,10 +67,13 @@ void CAnimEnvironmentNode::Initialize() } } ////////////////////////////////////////////////////////////////////////// -void CAnimEnvironmentNode::Reflect(AZ::SerializeContext* serializeContext) +void CAnimEnvironmentNode::Reflect(AZ::ReflectContext* context) { - serializeContext->Class() - ->Version(1); + if (auto serializeContext = azrtti_cast(context)) + { + serializeContext->Class() + ->Version(1); + } } void CAnimEnvironmentNode::Animate(SAnimContext& ac) diff --git a/Gems/Maestro/Code/Source/Cinematics/AnimEnvironmentNode.h b/Gems/Maestro/Code/Source/Cinematics/AnimEnvironmentNode.h index 1a92e4d30d..9287ce4cdd 100644 --- a/Gems/Maestro/Code/Source/Cinematics/AnimEnvironmentNode.h +++ b/Gems/Maestro/Code/Source/Cinematics/AnimEnvironmentNode.h @@ -40,7 +40,7 @@ public: virtual unsigned int GetParamCount() const; virtual CAnimParamType GetParamType(unsigned int nIndex) const; - static void Reflect(AZ::SerializeContext* serializeContext); + static void Reflect(AZ::ReflectContext* context); private: virtual bool GetParamInfoFromType(const CAnimParamType& paramId, SParamInfo& info) const; diff --git a/Gems/Maestro/Code/Source/Cinematics/AnimNode.cpp b/Gems/Maestro/Code/Source/Cinematics/AnimNode.cpp index 25215e348d..ef346bd230 100644 --- a/Gems/Maestro/Code/Source/Cinematics/AnimNode.cpp +++ b/Gems/Maestro/Code/Source/Cinematics/AnimNode.cpp @@ -272,17 +272,32 @@ bool CAnimNode::RemoveTrack(IAnimTrack* pTrack) } ////////////////////////////////////////////////////////////////////////// -void CAnimNode::Reflect(AZ::SerializeContext* serializeContext) +static bool AnimNodeVersionConverter( + AZ::SerializeContext& serializeContext, + AZ::SerializeContext::DataElementNode& rootElement) { - serializeContext->Class() - ->Version(2) - ->Field("ID", &CAnimNode::m_id) - ->Field("Name", &CAnimNode::m_name) - ->Field("Flags", &CAnimNode::m_flags) - ->Field("Tracks", &CAnimNode::m_tracks) - ->Field("Parent", &CAnimNode::m_parentNodeId) - ->Field("Type", &CAnimNode::m_nodeType) - ->Field("Expanded", &CAnimNode::m_expanded); + if (rootElement.GetVersion() < 3) + { + rootElement.AddElement(serializeContext, "BaseClass1", azrtti_typeid()); + } + + return true; +} + +void CAnimNode::Reflect(AZ::ReflectContext* context) +{ + if (auto serializeContext = azrtti_cast(context)) + { + serializeContext->Class() + ->Version(3, &AnimNodeVersionConverter) + ->Field("ID", &CAnimNode::m_id) + ->Field("Name", &CAnimNode::m_name) + ->Field("Flags", &CAnimNode::m_flags) + ->Field("Tracks", &CAnimNode::m_tracks) + ->Field("Parent", &CAnimNode::m_parentNodeId) + ->Field("Type", &CAnimNode::m_nodeType) + ->Field("Expanded", &CAnimNode::m_expanded); + } } ////////////////////////////////////////////////////////////////////////// diff --git a/Gems/Maestro/Code/Source/Cinematics/AnimNode.h b/Gems/Maestro/Code/Source/Cinematics/AnimNode.h index 4df5e692d0..0c52ac5a48 100644 --- a/Gems/Maestro/Code/Source/Cinematics/AnimNode.h +++ b/Gems/Maestro/Code/Source/Cinematics/AnimNode.h @@ -162,7 +162,7 @@ public: void SetExpanded(bool expanded) override; bool GetExpanded() const override; - static void Reflect(AZ::SerializeContext* serializeContext); + static void Reflect(AZ::ReflectContext* context); protected: virtual void UpdateDynamicParamsInternal() {}; diff --git a/Gems/Maestro/Code/Source/Cinematics/AnimNodeGroup.cpp b/Gems/Maestro/Code/Source/Cinematics/AnimNodeGroup.cpp index 05ba8309b1..1a177b6dc0 100644 --- a/Gems/Maestro/Code/Source/Cinematics/AnimNodeGroup.cpp +++ b/Gems/Maestro/Code/Source/Cinematics/AnimNodeGroup.cpp @@ -36,8 +36,11 @@ CAnimParamType CAnimNodeGroup::GetParamType([[maybe_unused]] unsigned int nIndex } ////////////////////////////////////////////////////////////////////////// -void CAnimNodeGroup::Reflect(AZ::SerializeContext* serializeContext) +void CAnimNodeGroup::Reflect(AZ::ReflectContext* context) { - serializeContext->Class() - ->Version(1); + if (auto serializeContext = azrtti_cast(context)) + { + serializeContext->Class() + ->Version(1); + } } diff --git a/Gems/Maestro/Code/Source/Cinematics/AnimNodeGroup.h b/Gems/Maestro/Code/Source/Cinematics/AnimNodeGroup.h index 66ffeea570..fcb18c448a 100644 --- a/Gems/Maestro/Code/Source/Cinematics/AnimNodeGroup.h +++ b/Gems/Maestro/Code/Source/Cinematics/AnimNodeGroup.h @@ -34,7 +34,7 @@ public: virtual CAnimParamType GetParamType(unsigned int nIndex) const; - static void Reflect(AZ::SerializeContext* serializeContext); + static void Reflect(AZ::ReflectContext* context); }; -#endif // CRYINCLUDE_CRYMOVIE_ANIMNODEGROUP_H \ No newline at end of file +#endif // CRYINCLUDE_CRYMOVIE_ANIMNODEGROUP_H diff --git a/Gems/Maestro/Code/Source/Cinematics/AnimPostFXNode.cpp b/Gems/Maestro/Code/Source/Cinematics/AnimPostFXNode.cpp index d42a5d948e..f94022af89 100644 --- a/Gems/Maestro/Code/Source/Cinematics/AnimPostFXNode.cpp +++ b/Gems/Maestro/Code/Source/Cinematics/AnimPostFXNode.cpp @@ -453,8 +453,11 @@ void CAnimPostFXNode::OnReset() } ////////////////////////////////////////////////////////////////////////// -void CAnimPostFXNode::Reflect(AZ::SerializeContext* serializeContext) +void CAnimPostFXNode::Reflect(AZ::ReflectContext* context) { - serializeContext->Class() - ->Version(1); + if (auto serializeContext = azrtti_cast(context)) + { + serializeContext->Class() + ->Version(1); + } } diff --git a/Gems/Maestro/Code/Source/Cinematics/AnimPostFXNode.h b/Gems/Maestro/Code/Source/Cinematics/AnimPostFXNode.h index 38bcffd20b..2f332aa7c2 100644 --- a/Gems/Maestro/Code/Source/Cinematics/AnimPostFXNode.h +++ b/Gems/Maestro/Code/Source/Cinematics/AnimPostFXNode.h @@ -63,7 +63,7 @@ public: void InitPostLoad(IAnimSequence* sequence) override; - static void Reflect(AZ::SerializeContext* serializeContext); + static void Reflect(AZ::ReflectContext* context); protected: virtual bool GetParamInfoFromType(const CAnimParamType& paramId, SParamInfo& info) const; diff --git a/Gems/Maestro/Code/Source/Cinematics/AnimScreenFaderNode.cpp b/Gems/Maestro/Code/Source/Cinematics/AnimScreenFaderNode.cpp index bc5f0597a7..ba30c3de39 100644 --- a/Gems/Maestro/Code/Source/Cinematics/AnimScreenFaderNode.cpp +++ b/Gems/Maestro/Code/Source/Cinematics/AnimScreenFaderNode.cpp @@ -291,10 +291,13 @@ void CAnimScreenFaderNode::Serialize } ////////////////////////////////////////////////////////////////////////// -void CAnimScreenFaderNode::Reflect(AZ::SerializeContext* serializeContext) +void CAnimScreenFaderNode::Reflect(AZ::ReflectContext* context) { - serializeContext->Class() - ->Version(1); + if (auto serializeContext = azrtti_cast(context)) + { + serializeContext->Class() + ->Version(1); + } } //----------------------------------------------------------------------------- diff --git a/Gems/Maestro/Code/Source/Cinematics/AnimScreenFaderNode.h b/Gems/Maestro/Code/Source/Cinematics/AnimScreenFaderNode.h index c67febe983..eb77385ba3 100644 --- a/Gems/Maestro/Code/Source/Cinematics/AnimScreenFaderNode.h +++ b/Gems/Maestro/Code/Source/Cinematics/AnimScreenFaderNode.h @@ -56,7 +56,7 @@ public: bool IsAnyTextureVisible() const; - static void Reflect(AZ::SerializeContext* serializeContext); + static void Reflect(AZ::ReflectContext* context); protected: virtual bool GetParamInfoFromType(const CAnimParamType& paramId, SParamInfo& info) const; diff --git a/Gems/Maestro/Code/Source/Cinematics/AnimSequence.cpp b/Gems/Maestro/Code/Source/Cinematics/AnimSequence.cpp index ffbdce8ed6..9145b18380 100644 --- a/Gems/Maestro/Code/Source/Cinematics/AnimSequence.cpp +++ b/Gems/Maestro/Code/Source/Cinematics/AnimSequence.cpp @@ -837,9 +837,7 @@ static bool AnimSequenceVersionConverter( void CAnimSequence::Reflect(AZ::ReflectContext* context) { - IAnimSequence::Reflect(context); - - if (auto serializeContext = azrtti_cast(context); serializeContext != nullptr) + if (auto serializeContext = azrtti_cast(context)) { serializeContext->Class() ->Version(IAnimSequence::kSequenceVersion, &AnimSequenceVersionConverter) diff --git a/Gems/Maestro/Code/Source/Cinematics/AnimSerializer.cpp b/Gems/Maestro/Code/Source/Cinematics/AnimSerializer.cpp index 1c60c23b51..81281b27df 100644 --- a/Gems/Maestro/Code/Source/Cinematics/AnimSerializer.cpp +++ b/Gems/Maestro/Code/Source/Cinematics/AnimSerializer.cpp @@ -17,101 +17,104 @@ #include "AnimSerializer.h" -void AnimSerializer::ReflectAnimTypes(AZ::SerializeContext* context) +void AnimSerializer::ReflectAnimTypes(AZ::ReflectContext* context) { - // Reflection for Maestro's AZ_TYPE_INFO'ed classes - context->Class() - ->Version(1) - ->Field("Type", &CAnimParamType::m_type) - ->Field("Name", &CAnimParamType::m_name); + if (auto serializeContext = azrtti_cast(context); serializeContext != nullptr) + { + // Reflection for Maestro's AZ_TYPE_INFO'ed classes + serializeContext->Class() + ->Version(1) + ->Field("Type", &CAnimParamType::m_type) + ->Field("Name", &CAnimParamType::m_name); - context->Class() - ->Field("Start", &Range::start) - ->Field("End", &Range::end); + serializeContext->Class() + ->Field("Start", &Range::start) + ->Field("End", &Range::end); - // Curve Key classes - context->Class() - ->Field("Time", &IKey::time) - ->Field("Flags", &IKey::flags); + // Curve Key classes + serializeContext->Class() + ->Field("Time", &IKey::time) + ->Field("Flags", &IKey::flags); - context->Class() - ->Field("AssetId", &AZ::IAssetBlendKey::m_assetId) - ->Field("Description", &AZ::IAssetBlendKey::m_description) - ->Field("BlendInTime", &AZ::IAssetBlendKey::m_blendInTime) - ->Field("BlendOutTime", &AZ::IAssetBlendKey::m_blendOutTime); + serializeContext->Class() + ->Field("AssetId", &AZ::IAssetBlendKey::m_assetId) + ->Field("Description", &AZ::IAssetBlendKey::m_description) + ->Field("BlendInTime", &AZ::IAssetBlendKey::m_blendInTime) + ->Field("BlendOutTime", &AZ::IAssetBlendKey::m_blendOutTime); - context->Class(); + serializeContext->Class(); - context->Class() - ->Field("Duration", &ICaptureKey::duration) - ->Field("TimeStep", &ICaptureKey::timeStep) - ->Field("Folder", &ICaptureKey::folder) - ->Field("Once", &ICaptureKey::once) - ->Field("FilePrefix", &ICaptureKey::prefix); + serializeContext->Class() + ->Field("Duration", &ICaptureKey::duration) + ->Field("TimeStep", &ICaptureKey::timeStep) + ->Field("Folder", &ICaptureKey::folder) + ->Field("Once", &ICaptureKey::once) + ->Field("FilePrefix", &ICaptureKey::prefix); - context->Class() - ->Field("Animation", &ICharacterKey::m_animation) - ->Field("BlendGap", &ICharacterKey::m_bBlendGap) - ->Field("PlayInPlace", &ICharacterKey::m_bInPlace); + serializeContext->Class() + ->Field("Animation", &ICharacterKey::m_animation) + ->Field("BlendGap", &ICharacterKey::m_bBlendGap) + ->Field("PlayInPlace", &ICharacterKey::m_bInPlace); - context->Class() - ->Field("Comment", &ICommentKey::m_strComment) - ->Field("Duration", &ICommentKey::m_duration) - ->Field("Font", &ICommentKey::m_strFont) - ->Field("Color", &ICommentKey::m_color) - ->Field("Size", &ICommentKey::m_size) - ->Field("Align", &ICommentKey::m_align); + serializeContext->Class() + ->Field("Comment", &ICommentKey::m_strComment) + ->Field("Duration", &ICommentKey::m_duration) + ->Field("Font", &ICommentKey::m_strFont) + ->Field("Color", &ICommentKey::m_color) + ->Field("Size", &ICommentKey::m_size) + ->Field("Align", &ICommentKey::m_align); - context->Class() - ->Field("Command", &IConsoleKey::command); + serializeContext->Class() + ->Field("Command", &IConsoleKey::command); - context->Class() - ->Field("Value", &IDiscreteFloatKey::m_fValue); + serializeContext->Class() + ->Field("Value", &IDiscreteFloatKey::m_fValue); - context->Class() - ->Field("Event", &IEventKey::event) - ->Field("EventValue", &IEventKey::eventValue) - ->Field("Anim", &IEventKey::animation) - ->Field("Target", &IEventKey::target) - ->Field("Length", &IEventKey::duration); + serializeContext->Class() + ->Field("Event", &IEventKey::event) + ->Field("EventValue", &IEventKey::eventValue) + ->Field("Anim", &IEventKey::animation) + ->Field("Target", &IEventKey::target) + ->Field("Length", &IEventKey::duration); - context->Class() - ->Field("LookAtNodeName", &ILookAtKey::szSelection) - ->Field("LookPose", &ILookAtKey::lookPose) - ->Field("Duration", &ILookAtKey::fDuration) - ->Field("SmoothTime", &ILookAtKey::smoothTime); + serializeContext->Class() + ->Field("LookAtNodeName", &ILookAtKey::szSelection) + ->Field("LookPose", &ILookAtKey::lookPose) + ->Field("Duration", &ILookAtKey::fDuration) + ->Field("SmoothTime", &ILookAtKey::smoothTime); - context->Class() - ->Field("FadeTime", &IScreenFaderKey::m_fadeTime) - ->Field("FadeColor", &IScreenFaderKey::m_fadeColor) - ->Field("FadeType", &IScreenFaderKey::m_fadeType) - ->Field("FadeChangeType", &IScreenFaderKey::m_fadeChangeType) - ->Field("Texture", &IScreenFaderKey::m_strTexture) - ->Field("useCurColor", &IScreenFaderKey::m_bUseCurColor); + serializeContext->Class() + ->Field("FadeTime", &IScreenFaderKey::m_fadeTime) + ->Field("FadeColor", &IScreenFaderKey::m_fadeColor) + ->Field("FadeType", &IScreenFaderKey::m_fadeType) + ->Field("FadeChangeType", &IScreenFaderKey::m_fadeChangeType) + ->Field("Texture", &IScreenFaderKey::m_strTexture) + ->Field("useCurColor", &IScreenFaderKey::m_bUseCurColor); - context->Class() - ->Field("SelectedName", &ISelectKey::szSelection) - ->Field("SelectedEntityId", &ISelectKey::cameraAzEntityId) - ->Field("Duration", &ISelectKey::fDuration) - ->Field("BlendTime", &ISelectKey::fBlendTime); + serializeContext->Class() + ->Field("SelectedName", &ISelectKey::szSelection) + ->Field("SelectedEntityId", &ISelectKey::cameraAzEntityId) + ->Field("Duration", &ISelectKey::fDuration) + ->Field("BlendTime", &ISelectKey::fBlendTime); - context->Class() - ->Field("Node", &ISequenceKey::szSelection) - ->Field("SequenceEntityId", &ISequenceKey::sequenceEntityId) - ->Field("OverrideTimes", &ISequenceKey::bOverrideTimes) - ->Field("StartTime", &ISequenceKey::fStartTime) - ->Field("EndTime", &ISequenceKey::fEndTime); + serializeContext->Class() + ->Field("Node", &ISequenceKey::szSelection) + ->Field("SequenceEntityId", &ISequenceKey::sequenceEntityId) + ->Field("OverrideTimes", &ISequenceKey::bOverrideTimes) + ->Field("StartTime", &ISequenceKey::fStartTime) + ->Field("EndTime", &ISequenceKey::fEndTime); - context->Class() - ->Field("StartTrigger", &ISoundKey::sStartTrigger) - ->Field("StopTrigger", &ISoundKey::sStopTrigger) - ->Field("Duration", &ISoundKey::fDuration) - ->Field("Color", &ISoundKey::customColor); + serializeContext->Class() + ->Field("StartTrigger", &ISoundKey::sStartTrigger) + ->Field("StopTrigger", &ISoundKey::sStopTrigger) + ->Field("Duration", &ISoundKey::fDuration) + ->Field("Color", &ISoundKey::customColor); - context->Class() - ->Field("Duration", &ITimeRangeKey::m_duration) - ->Field("Start", &ITimeRangeKey::m_startTime) - ->Field("End", &ITimeRangeKey::m_endTime) - ->Field("Speed", &ITimeRangeKey::m_speed) - ->Field("Loop", &ITimeRangeKey::m_bLoop); + serializeContext->Class() + ->Field("Duration", &ITimeRangeKey::m_duration) + ->Field("Start", &ITimeRangeKey::m_startTime) + ->Field("End", &ITimeRangeKey::m_endTime) + ->Field("Speed", &ITimeRangeKey::m_speed) + ->Field("Loop", &ITimeRangeKey::m_bLoop); + } } diff --git a/Gems/Maestro/Code/Source/Cinematics/AnimSerializer.h b/Gems/Maestro/Code/Source/Cinematics/AnimSerializer.h index bc9b2269ee..3242970cad 100644 --- a/Gems/Maestro/Code/Source/Cinematics/AnimSerializer.h +++ b/Gems/Maestro/Code/Source/Cinematics/AnimSerializer.h @@ -11,11 +11,11 @@ */ #pragma once -#include +#include class AnimSerializer { public: //! Reflection for Maestro's AZ_TYPE_INFO'ed classes - static void ReflectAnimTypes(AZ::SerializeContext* context); + static void ReflectAnimTypes(AZ::ReflectContext* context); }; diff --git a/Gems/Maestro/Code/Source/Cinematics/AnimSplineTrack.h b/Gems/Maestro/Code/Source/Cinematics/AnimSplineTrack.h index 0bd2f24ad8..02ed7aa55a 100644 --- a/Gems/Maestro/Code/Source/Cinematics/AnimSplineTrack.h +++ b/Gems/Maestro/Code/Source/Cinematics/AnimSplineTrack.h @@ -370,7 +370,7 @@ public: m_id = id; } - static void Reflect(AZ::SerializeContext* serializeContext) {} + static void Reflect([[maybe_unused]] AZ::ReflectContext* context) {} protected: diff --git a/Gems/Maestro/Code/Source/Cinematics/AnimSplineTrack_Vec2Specialization.h b/Gems/Maestro/Code/Source/Cinematics/AnimSplineTrack_Vec2Specialization.h index 83ba4b00c3..bc85c6b6f4 100644 --- a/Gems/Maestro/Code/Source/Cinematics/AnimSplineTrack_Vec2Specialization.h +++ b/Gems/Maestro/Code/Source/Cinematics/AnimSplineTrack_Vec2Specialization.h @@ -404,34 +404,39 @@ inline bool TAnimSplineTrack::VersionConverter(AZ::SerializeContext& conte AZ::SerializeContext::DataElementNode& classElement) { bool result = true; - if (classElement.GetVersion() == 1) + if (classElement.GetVersion() < 5) { - bool converted = false; + classElement.AddElement(context, "BaseClass1", azrtti_typeid()); - int splineElementIdx = classElement.FindElement(AZ_CRC("Spline", 0x35f655e9)); - if (splineElementIdx != -1) + if (classElement.GetVersion() == 1) { - // Find & copy the raw pointer node - AZ::SerializeContext::DataElementNode& splinePtrNodeRef = classElement.GetSubElement(splineElementIdx); - AZ::SerializeContext::DataElementNode splinePtrNodeCopy = splinePtrNodeRef; + bool converted = false; - // Reset the node, then convert it to an intrusive pointer - splinePtrNodeRef = AZ::SerializeContext::DataElementNode(); - if (splinePtrNodeRef.Convert>>(context, "Spline")) + int splineElementIdx = classElement.FindElement(AZ_CRC("Spline", 0x35f655e9)); + if (splineElementIdx != -1) { - // Use the standard name used with the smart pointers serialization - // (smart pointers are serialized as containers with one element); - // Set the intrusive pointer to the raw pointer value - splinePtrNodeCopy.SetName(AZ::SerializeContext::IDataContainer::GetDefaultElementName()); - splinePtrNodeRef.AddElement(splinePtrNodeCopy); + // Find & copy the raw pointer node + AZ::SerializeContext::DataElementNode& splinePtrNodeRef = classElement.GetSubElement(splineElementIdx); + AZ::SerializeContext::DataElementNode splinePtrNodeCopy = splinePtrNodeRef; - converted = true; + // Reset the node, then convert it to an intrusive pointer + splinePtrNodeRef = AZ::SerializeContext::DataElementNode(); + if (splinePtrNodeRef.Convert>>(context, "Spline")) + { + // Use the standard name used with the smart pointers serialization + // (smart pointers are serialized as containers with one element); + // Set the intrusive pointer to the raw pointer value + splinePtrNodeCopy.SetName(AZ::SerializeContext::IDataContainer::GetDefaultElementName()); + splinePtrNodeRef.AddElement(splinePtrNodeCopy); + + converted = true; + } } - } - // Did not convert. Discard unknown versions if failed to convert, and hope for the best - AZ_Assert(converted, "Failed to convert TUiAnimSplineTrack version %d to the current version", classElement.GetVersion()); - result = converted; + // Did not convert. Discard unknown versions if failed to convert, and hope for the best + AZ_Assert(converted, "Failed to convert TUiAnimSplineTrack version %d to the current version", classElement.GetVersion()); + result = converted; + } } return result; @@ -439,31 +444,34 @@ inline bool TAnimSplineTrack::VersionConverter(AZ::SerializeContext& conte ////////////////////////////////////////////////////////////////////////// template<> -inline void TAnimSplineTrack::Reflect(AZ::SerializeContext* serializeContext) +inline void TAnimSplineTrack::Reflect(AZ::ReflectContext* context) { - spline::SplineKey::Reflect(serializeContext); - spline::SplineKeyEx::Reflect(serializeContext); - - spline::TrackSplineInterpolator::Reflect(serializeContext); - BezierSplineVec2::Reflect(serializeContext); - - serializeContext->Class >() - ->Version(4, &TAnimSplineTrack::VersionConverter) - ->Field("Flags", &TAnimSplineTrack::m_flags) - ->Field("DefaultValue", &TAnimSplineTrack::m_defaultValue) - ->Field("ParamType", &TAnimSplineTrack::m_nParamType) - ->Field("Spline", &TAnimSplineTrack::m_spline) - ->Field("Id", &TAnimSplineTrack::m_id); - - AZ::EditContext* ec = serializeContext->GetEditContext(); - - // Preventing the default value from being pushed to slice to keep it from dirtying the slice when updated internally - if (ec) + if (auto serializeContext = azrtti_cast(context)) { - ec->Class>("TAnimSplineTrack Vec2", "Specialization track for Vec2 AnimSpline")-> - DataElement(AZ::Edit::UIHandlers::Vector2, &TAnimSplineTrack::m_defaultValue, "DefaultValue", "")-> + spline::SplineKey::Reflect(serializeContext); + spline::SplineKeyEx::Reflect(serializeContext); + + spline::TrackSplineInterpolator::Reflect(serializeContext); + BezierSplineVec2::Reflect(serializeContext); + + serializeContext->Class, IAnimTrack>() + ->Version(5, &TAnimSplineTrack::VersionConverter) + ->Field("Flags", &TAnimSplineTrack::m_flags) + ->Field("DefaultValue", &TAnimSplineTrack::m_defaultValue) + ->Field("ParamType", &TAnimSplineTrack::m_nParamType) + ->Field("Spline", &TAnimSplineTrack::m_spline) + ->Field("Id", &TAnimSplineTrack::m_id); + + AZ::EditContext* ec = serializeContext->GetEditContext(); + + // Preventing the default value from being pushed to slice to keep it from dirtying the slice when updated internally + if (ec) + { + ec->Class>("TAnimSplineTrack Vec2", "Specialization track for Vec2 AnimSpline")-> + DataElement(AZ::Edit::UIHandlers::Vector2, &TAnimSplineTrack::m_defaultValue, "DefaultValue", "")-> Attribute(AZ::Edit::Attributes::Visibility, AZ::Edit::PropertyVisibility::Hide)-> Attribute(AZ::Edit::Attributes::SliceFlags, AZ::Edit::SliceFlags::NotPushable); + } } } #endif // CRYINCLUDE_CRYMOVIE_ANIMSPLINETRACK_VEC2SPECIALIZATION_H diff --git a/Gems/Maestro/Code/Source/Cinematics/AnimTrack.h b/Gems/Maestro/Code/Source/Cinematics/AnimTrack.h index d8a644e671..24c78f5a1b 100644 --- a/Gems/Maestro/Code/Source/Cinematics/AnimTrack.h +++ b/Gems/Maestro/Code/Source/Cinematics/AnimTrack.h @@ -249,7 +249,7 @@ public: m_id = id; } - static void Reflect([[maybe_unused]] AZ::SerializeContext* serializeContext) {} + static void Reflect([[maybe_unused]] AZ::ReflectContext* context) {} protected: void CheckValid() diff --git a/Gems/Maestro/Code/Source/Cinematics/AssetBlendTrack.cpp b/Gems/Maestro/Code/Source/Cinematics/AssetBlendTrack.cpp index b619d3877f..ee3b6a64c2 100644 --- a/Gems/Maestro/Code/Source/Cinematics/AssetBlendTrack.cpp +++ b/Gems/Maestro/Code/Source/Cinematics/AssetBlendTrack.cpp @@ -163,16 +163,31 @@ float CAssetBlendTrack::GetKeyDuration(int key) const } ////////////////////////////////////////////////////////////////////////// -template<> -inline void TAnimTrack::Reflect(AZ::SerializeContext* serializeContext) +static bool AssetBlendTrackVersionConverter( + AZ::SerializeContext& serializeContext, + AZ::SerializeContext::DataElementNode& rootElement) { - serializeContext->Class >() - ->Version(2) - ->Field("Flags", &TAnimTrack::m_flags) - ->Field("Range", &TAnimTrack::m_timeRange) - ->Field("ParamType", &TAnimTrack::m_nParamType) - ->Field("Keys", &TAnimTrack::m_keys) - ->Field("Id", &TAnimTrack::m_id); + if (rootElement.GetVersion() < 3) + { + rootElement.AddElement(serializeContext, "BaseClass1", azrtti_typeid()); + } + + return true; +} + +template<> +inline void TAnimTrack::Reflect(AZ::ReflectContext* context) +{ + if (auto serializeContext = azrtti_cast(context)) + { + serializeContext->Class, IAnimTrack>() + ->Version(3, &AssetBlendTrackVersionConverter) + ->Field("Flags", &TAnimTrack::m_flags) + ->Field("Range", &TAnimTrack::m_timeRange) + ->Field("ParamType", &TAnimTrack::m_nParamType) + ->Field("Keys", &TAnimTrack::m_keys) + ->Field("Id", &TAnimTrack::m_id); + } } ////////////////////////////////////////////////////////////////////////// @@ -277,10 +292,13 @@ float CAssetBlendTrack::GetEndTime() const } ////////////////////////////////////////////////////////////////////////// -void CAssetBlendTrack::Reflect(AZ::SerializeContext* serializeContext) +void CAssetBlendTrack::Reflect(AZ::ReflectContext* context) { - TAnimTrack::Reflect(serializeContext); + TAnimTrack::Reflect(context); - serializeContext->Class >() - ->Version(1); + if (auto serializeContext = azrtti_cast(context)) + { + serializeContext->Class>() + ->Version(1); + } } diff --git a/Gems/Maestro/Code/Source/Cinematics/AssetBlendTrack.h b/Gems/Maestro/Code/Source/Cinematics/AssetBlendTrack.h index a14e66463e..e676fdf05b 100644 --- a/Gems/Maestro/Code/Source/Cinematics/AssetBlendTrack.h +++ b/Gems/Maestro/Code/Source/Cinematics/AssetBlendTrack.h @@ -47,7 +47,7 @@ public: float GetEndTime() const; - static void Reflect(AZ::SerializeContext* serializeContext); + static void Reflect(AZ::ReflectContext* context); private: diff --git a/Gems/Maestro/Code/Source/Cinematics/BoolTrack.cpp b/Gems/Maestro/Code/Source/Cinematics/BoolTrack.cpp index adfbba312d..e485d022b2 100644 --- a/Gems/Maestro/Code/Source/Cinematics/BoolTrack.cpp +++ b/Gems/Maestro/Code/Source/Cinematics/BoolTrack.cpp @@ -98,24 +98,42 @@ bool CBoolTrack::Serialize(XmlNodeRef& xmlNode, bool bLoading, bool bLoadEmptyTr } ////////////////////////////////////////////////////////////////////////// -template<> -inline void TAnimTrack::Reflect(AZ::SerializeContext* serializeContext) +static bool BoolTrackVersionConverter( + AZ::SerializeContext& serializeContext, + AZ::SerializeContext::DataElementNode& rootElement) { - serializeContext->Class >() - ->Version(2) - ->Field("Flags", &TAnimTrack::m_flags) - ->Field("Range", &TAnimTrack::m_timeRange) - ->Field("ParamType", &TAnimTrack::m_nParamType) - ->Field("Keys", &TAnimTrack::m_keys) - ->Field("Id", &TAnimTrack::m_id); + if (rootElement.GetVersion() < 3) + { + rootElement.AddElement(serializeContext, "BaseClass1", azrtti_typeid()); + } + + return true; +} + +template<> +inline void TAnimTrack::Reflect(AZ::ReflectContext* context) +{ + if (auto serializeContext = azrtti_cast(context)) + { + serializeContext->Class, IAnimTrack>() + ->Version(3, &BoolTrackVersionConverter) + ->Field("Flags", &TAnimTrack::m_flags) + ->Field("Range", &TAnimTrack::m_timeRange) + ->Field("ParamType", &TAnimTrack::m_nParamType) + ->Field("Keys", &TAnimTrack::m_keys) + ->Field("Id", &TAnimTrack::m_id); + } } ////////////////////////////////////////////////////////////////////////// -void CBoolTrack::Reflect(AZ::SerializeContext* serializeContext) +void CBoolTrack::Reflect(AZ::ReflectContext* context) { - TAnimTrack::Reflect(serializeContext); + TAnimTrack::Reflect(context); - serializeContext->Class >() - ->Version(1) - ->Field("DefaultValue", &CBoolTrack::m_bDefaultValue); -} \ No newline at end of file + if (auto serializeContext = azrtti_cast(context)) + { + serializeContext->Class>() + ->Version(1) + ->Field("DefaultValue", &CBoolTrack::m_bDefaultValue); + } +} diff --git a/Gems/Maestro/Code/Source/Cinematics/BoolTrack.h b/Gems/Maestro/Code/Source/Cinematics/BoolTrack.h index 5a69706967..d374aad5db 100644 --- a/Gems/Maestro/Code/Source/Cinematics/BoolTrack.h +++ b/Gems/Maestro/Code/Source/Cinematics/BoolTrack.h @@ -45,7 +45,7 @@ public: bool Serialize(XmlNodeRef& xmlNode, bool bLoading, bool bLoadEmptyTracks = true) override; - static void Reflect(AZ::SerializeContext* serializeContext); + static void Reflect(AZ::ReflectContext* context); private: bool m_bDefaultValue; diff --git a/Gems/Maestro/Code/Source/Cinematics/CVarNode.cpp b/Gems/Maestro/Code/Source/Cinematics/CVarNode.cpp index 20b0bae527..2d27feec95 100644 --- a/Gems/Maestro/Code/Source/Cinematics/CVarNode.cpp +++ b/Gems/Maestro/Code/Source/Cinematics/CVarNode.cpp @@ -151,8 +151,11 @@ void CAnimCVarNode::Animate(SAnimContext& ec) } ////////////////////////////////////////////////////////////////////////// -void CAnimCVarNode::Reflect(AZ::SerializeContext* serializeContext) +void CAnimCVarNode::Reflect(AZ::ReflectContext* context) { - serializeContext->Class() - ->Version(1); + if (auto serializeContext = azrtti_cast(context)) + { + serializeContext->Class() + ->Version(1); + } } diff --git a/Gems/Maestro/Code/Source/Cinematics/CVarNode.h b/Gems/Maestro/Code/Source/Cinematics/CVarNode.h index 63b1fb46f8..7a1b578238 100644 --- a/Gems/Maestro/Code/Source/Cinematics/CVarNode.h +++ b/Gems/Maestro/Code/Source/Cinematics/CVarNode.h @@ -41,7 +41,7 @@ public: int GetDefaultKeyTangentFlags() const override; - static void Reflect(AZ::SerializeContext* serializeContext); + static void Reflect(AZ::ReflectContext* context); protected: virtual bool GetParamInfoFromType(const CAnimParamType& paramId, SParamInfo& info) const; diff --git a/Gems/Maestro/Code/Source/Cinematics/CaptureTrack.cpp b/Gems/Maestro/Code/Source/Cinematics/CaptureTrack.cpp index 1a9df2baa7..c627343914 100644 --- a/Gems/Maestro/Code/Source/Cinematics/CaptureTrack.cpp +++ b/Gems/Maestro/Code/Source/Cinematics/CaptureTrack.cpp @@ -71,23 +71,41 @@ void CCaptureTrack::GetKeyInfo(int key, const char*& description, float& duratio } ////////////////////////////////////////////////////////////////////////// -template<> -inline void TAnimTrack::Reflect(AZ::SerializeContext* serializeContext) +static bool CaptureTrackVersionConverter( + AZ::SerializeContext& serializeContext, + AZ::SerializeContext::DataElementNode& rootElement) { - serializeContext->Class >() - ->Version(2) - ->Field("Flags", &TAnimTrack::m_flags) - ->Field("Range", &TAnimTrack::m_timeRange) - ->Field("ParamType", &TAnimTrack::m_nParamType) - ->Field("Keys", &TAnimTrack::m_keys) - ->Field("Id", &TAnimTrack::m_id); + if (rootElement.GetVersion() < 3) + { + rootElement.AddElement(serializeContext, "BaseClass1", azrtti_typeid()); + } + + return true; +} + +template<> +inline void TAnimTrack::Reflect(AZ::ReflectContext* context) +{ + if (auto serializeContext = azrtti_cast(context)) + { + serializeContext->Class, IAnimTrack>() + ->Version(3, &CaptureTrackVersionConverter) + ->Field("Flags", &TAnimTrack::m_flags) + ->Field("Range", &TAnimTrack::m_timeRange) + ->Field("ParamType", &TAnimTrack::m_nParamType) + ->Field("Keys", &TAnimTrack::m_keys) + ->Field("Id", &TAnimTrack::m_id); + } } ////////////////////////////////////////////////////////////////////////// -void CCaptureTrack::Reflect(AZ::SerializeContext* serializeContext) +void CCaptureTrack::Reflect(AZ::ReflectContext* context) { - TAnimTrack::Reflect(serializeContext); + TAnimTrack::Reflect(context); - serializeContext->Class >() - ->Version(1); + if (auto serializeContext = azrtti_cast(context)) + { + serializeContext->Class>() + ->Version(1); + } } diff --git a/Gems/Maestro/Code/Source/Cinematics/CaptureTrack.h b/Gems/Maestro/Code/Source/Cinematics/CaptureTrack.h index c4f15f65ae..cee5f5137d 100644 --- a/Gems/Maestro/Code/Source/Cinematics/CaptureTrack.h +++ b/Gems/Maestro/Code/Source/Cinematics/CaptureTrack.h @@ -33,7 +33,7 @@ public: void SerializeKey(ICaptureKey& key, XmlNodeRef& keyNode, bool bLoading); void GetKeyInfo(int key, const char*& description, float& duration); - static void Reflect(AZ::SerializeContext* serializeContext); + static void Reflect(AZ::ReflectContext* context); }; #endif // CRYINCLUDE_CRYMOVIE_CAPTURETRACK_H diff --git a/Gems/Maestro/Code/Source/Cinematics/CharacterTrack.cpp b/Gems/Maestro/Code/Source/Cinematics/CharacterTrack.cpp index 9c54069d4c..4ad6cbb24a 100644 --- a/Gems/Maestro/Code/Source/Cinematics/CharacterTrack.cpp +++ b/Gems/Maestro/Code/Source/Cinematics/CharacterTrack.cpp @@ -150,16 +150,31 @@ float CCharacterTrack::GetKeyDuration(int key) const } ////////////////////////////////////////////////////////////////////////// -template<> -inline void TAnimTrack::Reflect(AZ::SerializeContext* serializeContext) +static bool CharacterTrackVersionConverter( + AZ::SerializeContext& serializeContext, + AZ::SerializeContext::DataElementNode& rootElement) { - serializeContext->Class >() - ->Version(2) - ->Field("Flags", &TAnimTrack::m_flags) - ->Field("Range", &TAnimTrack::m_timeRange) - ->Field("ParamType", &TAnimTrack::m_nParamType) - ->Field("Keys", &TAnimTrack::m_keys) - ->Field("Id", &TAnimTrack::m_id); + if (rootElement.GetVersion() < 3) + { + rootElement.AddElement(serializeContext, "BaseClass1", azrtti_typeid()); + } + + return true; +} + +template<> +inline void TAnimTrack::Reflect(AZ::ReflectContext* context) +{ + if (auto serializeContext = azrtti_cast(context)) + { + serializeContext->Class, IAnimTrack>() + ->Version(3, &CharacterTrackVersionConverter) + ->Field("Flags", &TAnimTrack::m_flags) + ->Field("Range", &TAnimTrack::m_timeRange) + ->Field("ParamType", &TAnimTrack::m_nParamType) + ->Field("Keys", &TAnimTrack::m_keys) + ->Field("Id", &TAnimTrack::m_id); + } } ////////////////////////////////////////////////////////////////////////// @@ -169,11 +184,14 @@ AnimValueType CCharacterTrack::GetValueType() } ////////////////////////////////////////////////////////////////////////// -void CCharacterTrack::Reflect(AZ::SerializeContext* serializeContext) +void CCharacterTrack::Reflect(AZ::ReflectContext* context) { - TAnimTrack::Reflect(serializeContext); + TAnimTrack::Reflect(context); - serializeContext->Class >() - ->Version(1) - ->Field("AnimationLayer", &CCharacterTrack::m_iAnimationLayer); + if (auto serializeContext = azrtti_cast(context)) + { + serializeContext->Class>() + ->Version(1) + ->Field("AnimationLayer", &CCharacterTrack::m_iAnimationLayer); + } } diff --git a/Gems/Maestro/Code/Source/Cinematics/CharacterTrack.h b/Gems/Maestro/Code/Source/Cinematics/CharacterTrack.h index d95d648318..ccfb2f87c2 100644 --- a/Gems/Maestro/Code/Source/Cinematics/CharacterTrack.h +++ b/Gems/Maestro/Code/Source/Cinematics/CharacterTrack.h @@ -51,7 +51,7 @@ public: float GetEndTime() const { return m_timeRange.end; } - static void Reflect(AZ::SerializeContext* serializeContext); + static void Reflect(AZ::ReflectContext* context); private: int m_iAnimationLayer; diff --git a/Gems/Maestro/Code/Source/Cinematics/CommentNode.cpp b/Gems/Maestro/Code/Source/Cinematics/CommentNode.cpp index c052d7dd04..a519de18f7 100644 --- a/Gems/Maestro/Code/Source/Cinematics/CommentNode.cpp +++ b/Gems/Maestro/Code/Source/Cinematics/CommentNode.cpp @@ -107,10 +107,13 @@ void CCommentNode::Serialize(XmlNodeRef& xmlNode, bool bLoading, bool bLoadEmpty } ////////////////////////////////////////////////////////////////////////// -void CCommentNode::Reflect(AZ::SerializeContext* serializeContext) +void CCommentNode::Reflect(AZ::ReflectContext* context) { - serializeContext->Class() - ->Version(1); + if (auto serializeContext = azrtti_cast(context)) + { + serializeContext->Class() + ->Version(1); + } } //----------------------------------------------------------------------------- diff --git a/Gems/Maestro/Code/Source/Cinematics/CommentNode.h b/Gems/Maestro/Code/Source/Cinematics/CommentNode.h index a0d62903f6..1fc46817ff 100644 --- a/Gems/Maestro/Code/Source/Cinematics/CommentNode.h +++ b/Gems/Maestro/Code/Source/Cinematics/CommentNode.h @@ -49,7 +49,7 @@ public: virtual unsigned int GetParamCount() const; virtual CAnimParamType GetParamType(unsigned int nIndex) const; - static void Reflect(AZ::SerializeContext* serializeContext); + static void Reflect(AZ::ReflectContext* context); protected: virtual bool GetParamInfoFromType(const CAnimParamType& paramId, SParamInfo& info) const; diff --git a/Gems/Maestro/Code/Source/Cinematics/CommentTrack.cpp b/Gems/Maestro/Code/Source/Cinematics/CommentTrack.cpp index 981b98de01..3f64433dbb 100644 --- a/Gems/Maestro/Code/Source/Cinematics/CommentTrack.cpp +++ b/Gems/Maestro/Code/Source/Cinematics/CommentTrack.cpp @@ -78,23 +78,41 @@ void CCommentTrack::SerializeKey(ICommentKey& key, XmlNodeRef& keyNode, bool bLo ////////////////////////////////////////////////////////////////////////// -template<> -inline void TAnimTrack::Reflect(AZ::SerializeContext* serializeContext) +static bool CommentTrackVersionConverter( + AZ::SerializeContext& serializeContext, + AZ::SerializeContext::DataElementNode& rootElement) { - serializeContext->Class >() - ->Version(2) - ->Field("Flags", &TAnimTrack::m_flags) - ->Field("Range", &TAnimTrack::m_timeRange) - ->Field("ParamType", &TAnimTrack::m_nParamType) - ->Field("Keys", &TAnimTrack::m_keys) - ->Field("Id", &TAnimTrack::m_id); + if (rootElement.GetVersion() < 3) + { + rootElement.AddElement(serializeContext, "BaseClass1", azrtti_typeid()); + } + + return true; +} + +template<> +inline void TAnimTrack::Reflect(AZ::ReflectContext* context) +{ + if (auto serializeContext = azrtti_cast(context)) + { + serializeContext->Class, IAnimTrack>() + ->Version(3, &CommentTrackVersionConverter) + ->Field("Flags", &TAnimTrack::m_flags) + ->Field("Range", &TAnimTrack::m_timeRange) + ->Field("ParamType", &TAnimTrack::m_nParamType) + ->Field("Keys", &TAnimTrack::m_keys) + ->Field("Id", &TAnimTrack::m_id); + } } ////////////////////////////////////////////////////////////////////////// -void CCommentTrack::Reflect(AZ::SerializeContext* serializeContext) +void CCommentTrack::Reflect(AZ::ReflectContext* context) { - TAnimTrack::Reflect(serializeContext); + TAnimTrack::Reflect(context); - serializeContext->Class >() - ->Version(1); + if (auto serializeContext = azrtti_cast(context)) + { + serializeContext->Class>() + ->Version(1); + } } diff --git a/Gems/Maestro/Code/Source/Cinematics/CommentTrack.h b/Gems/Maestro/Code/Source/Cinematics/CommentTrack.h index 9ae370e58d..2db786b72d 100644 --- a/Gems/Maestro/Code/Source/Cinematics/CommentTrack.h +++ b/Gems/Maestro/Code/Source/Cinematics/CommentTrack.h @@ -40,7 +40,7 @@ public: //! void ValidateKeyOrder() { CheckValid(); } - static void Reflect(AZ::SerializeContext* serializeContext); + static void Reflect(AZ::ReflectContext* context); }; #endif // CRYINCLUDE_CRYMOVIE_COMMENTTRACK_H diff --git a/Gems/Maestro/Code/Source/Cinematics/CompoundSplineTrack.cpp b/Gems/Maestro/Code/Source/Cinematics/CompoundSplineTrack.cpp index 002a370c61..c1aab0060f 100644 --- a/Gems/Maestro/Code/Source/Cinematics/CompoundSplineTrack.cpp +++ b/Gems/Maestro/Code/Source/Cinematics/CompoundSplineTrack.cpp @@ -604,16 +604,31 @@ void CCompoundSplineTrack::SetId(unsigned int id) } ////////////////////////////////////////////////////////////////////////// -void CCompoundSplineTrack::Reflect(AZ::SerializeContext* serializeContext) +static bool CompoundSplineTrackVersionConverter( + AZ::SerializeContext& serializeContext, + AZ::SerializeContext::DataElementNode& rootElement) { - serializeContext->Class() - ->Version(3) - ->Field("Flags", &CCompoundSplineTrack::m_flags) - ->Field("ParamType", &CCompoundSplineTrack::m_nParamType) - ->Field("NumSubTracks", &CCompoundSplineTrack::m_nDimensions) - ->Field("SubTracks", &CCompoundSplineTrack::m_subTracks) - ->Field("SubTrackNames", &CCompoundSplineTrack::m_subTrackNames) - ->Field("ValueType", &CCompoundSplineTrack::m_valueType) - ->Field("Expanded", &CCompoundSplineTrack::m_expanded) - ->Field("Id", &CCompoundSplineTrack::m_id); + if (rootElement.GetVersion() < 4) + { + rootElement.AddElement(serializeContext, "BaseClass1", azrtti_typeid()); + } + + return true; +} + +void CCompoundSplineTrack::Reflect(AZ::ReflectContext* context) +{ + if (auto serializeContext = azrtti_cast(context)) + { + serializeContext->Class() + ->Version(4, &CompoundSplineTrackVersionConverter) + ->Field("Flags", &CCompoundSplineTrack::m_flags) + ->Field("ParamType", &CCompoundSplineTrack::m_nParamType) + ->Field("NumSubTracks", &CCompoundSplineTrack::m_nDimensions) + ->Field("SubTracks", &CCompoundSplineTrack::m_subTracks) + ->Field("SubTrackNames", &CCompoundSplineTrack::m_subTrackNames) + ->Field("ValueType", &CCompoundSplineTrack::m_valueType) + ->Field("Expanded", &CCompoundSplineTrack::m_expanded) + ->Field("Id", &CCompoundSplineTrack::m_id); + } } diff --git a/Gems/Maestro/Code/Source/Cinematics/CompoundSplineTrack.h b/Gems/Maestro/Code/Source/Cinematics/CompoundSplineTrack.h index 642d9fa4e0..63b76631ab 100644 --- a/Gems/Maestro/Code/Source/Cinematics/CompoundSplineTrack.h +++ b/Gems/Maestro/Code/Source/Cinematics/CompoundSplineTrack.h @@ -157,7 +157,7 @@ public: unsigned int GetId() const override; void SetId(unsigned int id) override; - static void Reflect(AZ::SerializeContext* serializeContext); + static void Reflect(AZ::ReflectContext* context); protected: int m_refCount; diff --git a/Gems/Maestro/Code/Source/Cinematics/ConsoleTrack.cpp b/Gems/Maestro/Code/Source/Cinematics/ConsoleTrack.cpp index fce49f0bd4..03c3eef634 100644 --- a/Gems/Maestro/Code/Source/Cinematics/ConsoleTrack.cpp +++ b/Gems/Maestro/Code/Source/Cinematics/ConsoleTrack.cpp @@ -47,23 +47,41 @@ void CConsoleTrack::GetKeyInfo(int key, const char*& description, float& duratio } ////////////////////////////////////////////////////////////////////////// -template<> -inline void TAnimTrack::Reflect(AZ::SerializeContext* serializeContext) +static bool ConsoleTrackVersionConverter( + AZ::SerializeContext& serializeContext, + AZ::SerializeContext::DataElementNode& rootElement) { - serializeContext->Class >() - ->Version(2) - ->Field("Flags", &TAnimTrack::m_flags) - ->Field("Range", &TAnimTrack::m_timeRange) - ->Field("ParamType", &TAnimTrack::m_nParamType) - ->Field("Keys", &TAnimTrack::m_keys) - ->Field("Id", &TAnimTrack::m_id); + if (rootElement.GetVersion() < 3) + { + rootElement.AddElement(serializeContext, "BaseClass1", azrtti_typeid()); + } + + return true; +} + +template<> +inline void TAnimTrack::Reflect(AZ::ReflectContext* context) +{ + if (auto serializeContext = azrtti_cast(context)) + { + serializeContext->Class, IAnimTrack>() + ->Version(3, &ConsoleTrackVersionConverter) + ->Field("Flags", &TAnimTrack::m_flags) + ->Field("Range", &TAnimTrack::m_timeRange) + ->Field("ParamType", &TAnimTrack::m_nParamType) + ->Field("Keys", &TAnimTrack::m_keys) + ->Field("Id", &TAnimTrack::m_id); + } } ////////////////////////////////////////////////////////////////////////// -void CConsoleTrack::Reflect(AZ::SerializeContext* serializeContext) +void CConsoleTrack::Reflect(AZ::ReflectContext* context) { - TAnimTrack::Reflect(serializeContext); + TAnimTrack::Reflect(context); - serializeContext->Class >() - ->Version(1); + if (auto serializeContext = azrtti_cast(context)) + { + serializeContext->Class >() + ->Version(1); + } } diff --git a/Gems/Maestro/Code/Source/Cinematics/ConsoleTrack.h b/Gems/Maestro/Code/Source/Cinematics/ConsoleTrack.h index c9ef0e3c4e..854ebacbaa 100644 --- a/Gems/Maestro/Code/Source/Cinematics/ConsoleTrack.h +++ b/Gems/Maestro/Code/Source/Cinematics/ConsoleTrack.h @@ -35,7 +35,7 @@ public: void GetKeyInfo(int key, const char*& description, float& duration); void SerializeKey(IConsoleKey& key, XmlNodeRef& keyNode, bool bLoading); - static void Reflect(AZ::SerializeContext* serializeContext); + static void Reflect(AZ::ReflectContext* context); }; #endif // CRYINCLUDE_CRYMOVIE_CONSOLETRACK_H diff --git a/Gems/Maestro/Code/Source/Cinematics/EventNode.cpp b/Gems/Maestro/Code/Source/Cinematics/EventNode.cpp index 9ce35c4dbe..7a3f1361cf 100644 --- a/Gems/Maestro/Code/Source/Cinematics/EventNode.cpp +++ b/Gems/Maestro/Code/Source/Cinematics/EventNode.cpp @@ -112,8 +112,11 @@ void CAnimEventNode::OnReset() } ////////////////////////////////////////////////////////////////////////// -void CAnimEventNode::Reflect(AZ::SerializeContext* serializeContext) +void CAnimEventNode::Reflect(AZ::ReflectContext* context) { - serializeContext->Class() - ->Version(1); -} \ No newline at end of file + if (auto serializeContext = azrtti_cast(context)) + { + serializeContext->Class() + ->Version(1); + } +} diff --git a/Gems/Maestro/Code/Source/Cinematics/EventNode.h b/Gems/Maestro/Code/Source/Cinematics/EventNode.h index d54fe73d80..78b3cd53ae 100644 --- a/Gems/Maestro/Code/Source/Cinematics/EventNode.h +++ b/Gems/Maestro/Code/Source/Cinematics/EventNode.h @@ -42,7 +42,7 @@ public: virtual CAnimParamType GetParamType(unsigned int nIndex) const; virtual bool GetParamInfoFromType(const CAnimParamType& paramId, SParamInfo& info) const; - static void Reflect(AZ::SerializeContext* serializeContext); + static void Reflect(AZ::ReflectContext* context); private: //! Last animated key in track. diff --git a/Gems/Maestro/Code/Source/Cinematics/EventTrack.cpp b/Gems/Maestro/Code/Source/Cinematics/EventTrack.cpp index 02977ef377..a90a1dad83 100644 --- a/Gems/Maestro/Code/Source/Cinematics/EventTrack.cpp +++ b/Gems/Maestro/Code/Source/Cinematics/EventTrack.cpp @@ -103,10 +103,13 @@ void CEventTrack::InitPostLoad(IAnimSequence* sequence) } ////////////////////////////////////////////////////////////////////////// -void CEventTrack::Reflect(AZ::SerializeContext* serializeContext) +void CEventTrack::Reflect(AZ::ReflectContext* context) { // Note the template base class TAnimTrack::Reflect() is reflected by CTrackEventTrack::Reflect() - serializeContext->Class >() - ->Version(1); -} \ No newline at end of file + if (auto serializeContext = azrtti_cast(context)) + { + serializeContext->Class>() + ->Version(1); + } +} diff --git a/Gems/Maestro/Code/Source/Cinematics/EventTrack.h b/Gems/Maestro/Code/Source/Cinematics/EventTrack.h index 58c9153014..b03f7d8e9f 100644 --- a/Gems/Maestro/Code/Source/Cinematics/EventTrack.h +++ b/Gems/Maestro/Code/Source/Cinematics/EventTrack.h @@ -42,7 +42,7 @@ public: void SetKey(int index, IKey* key); void InitPostLoad(IAnimSequence* sequence) override; - static void Reflect(AZ::SerializeContext* serializeContext); + static void Reflect(AZ::ReflectContext* context); private: AZStd::intrusive_ptr m_pStrings; diff --git a/Gems/Maestro/Code/Source/Cinematics/GotoTrack.cpp b/Gems/Maestro/Code/Source/Cinematics/GotoTrack.cpp index 77662592cd..facd1e80fa 100644 --- a/Gems/Maestro/Code/Source/Cinematics/GotoTrack.cpp +++ b/Gems/Maestro/Code/Source/Cinematics/GotoTrack.cpp @@ -156,23 +156,41 @@ void CGotoTrack::SetKeyAtTime(float time, IKey* key) } ////////////////////////////////////////////////////////////////////////// -template<> -inline void TAnimTrack::Reflect(AZ::SerializeContext* serializeContext) +static bool GotoTrackVersionConverter( + AZ::SerializeContext& serializeContext, + AZ::SerializeContext::DataElementNode& rootElement) { - serializeContext->Class >() - ->Version(2) - ->Field("Flags", &TAnimTrack::m_flags) - ->Field("Range", &TAnimTrack::m_timeRange) - ->Field("ParamType", &TAnimTrack::m_nParamType) - ->Field("Keys", &TAnimTrack::m_keys) - ->Field("Id", &TAnimTrack::m_id); + if (rootElement.GetVersion() < 3) + { + rootElement.AddElement(serializeContext, "BaseClass1", azrtti_typeid()); + } + + return true; +} + +template<> +inline void TAnimTrack::Reflect(AZ::ReflectContext* context) +{ + if (auto serializeContext = azrtti_cast(context)) + { + serializeContext->Class, IAnimTrack>() + ->Version(3, &GotoTrackVersionConverter) + ->Field("Flags", &TAnimTrack::m_flags) + ->Field("Range", &TAnimTrack::m_timeRange) + ->Field("ParamType", &TAnimTrack::m_nParamType) + ->Field("Keys", &TAnimTrack::m_keys) + ->Field("Id", &TAnimTrack::m_id); + } } ////////////////////////////////////////////////////////////////////////// -void CGotoTrack::Reflect(AZ::SerializeContext* serializeContext) +void CGotoTrack::Reflect(AZ::ReflectContext* context) { - TAnimTrack::Reflect(serializeContext); + TAnimTrack::Reflect(context); - serializeContext->Class >() - ->Version(1); -} \ No newline at end of file + if (auto serializeContext = azrtti_cast(context)) + { + serializeContext->Class>() + ->Version(1); + } +} diff --git a/Gems/Maestro/Code/Source/Cinematics/GotoTrack.h b/Gems/Maestro/Code/Source/Cinematics/GotoTrack.h index 1a38817204..aff269c56a 100644 --- a/Gems/Maestro/Code/Source/Cinematics/GotoTrack.h +++ b/Gems/Maestro/Code/Source/Cinematics/GotoTrack.h @@ -40,7 +40,7 @@ public: void SerializeKey(IDiscreteFloatKey& key, XmlNodeRef& keyNode, bool bLoading); void GetKeyInfo(int key, const char*& description, float& duration); - static void Reflect(AZ::SerializeContext* serializeContext); + static void Reflect(AZ::ReflectContext* context); protected: void SetKeyAtTime(float time, IKey* key); diff --git a/Gems/Maestro/Code/Source/Cinematics/LayerNode.cpp b/Gems/Maestro/Code/Source/Cinematics/LayerNode.cpp index 1e2b6d401e..a7f0984069 100644 --- a/Gems/Maestro/Code/Source/Cinematics/LayerNode.cpp +++ b/Gems/Maestro/Code/Source/Cinematics/LayerNode.cpp @@ -172,8 +172,11 @@ bool CLayerNode::GetParamInfoFromType(const CAnimParamType& paramId, SParamInfo& } ////////////////////////////////////////////////////////////////////////// -void CLayerNode::Reflect(AZ::SerializeContext* serializeContext) +void CLayerNode::Reflect(AZ::ReflectContext* context) { - serializeContext->Class() - ->Version(1); + if (auto serializeContext = azrtti_cast(context)) + { + serializeContext->Class() + ->Version(1); + } } diff --git a/Gems/Maestro/Code/Source/Cinematics/LayerNode.h b/Gems/Maestro/Code/Source/Cinematics/LayerNode.h index 7660c544b4..0ca977df2d 100644 --- a/Gems/Maestro/Code/Source/Cinematics/LayerNode.h +++ b/Gems/Maestro/Code/Source/Cinematics/LayerNode.h @@ -52,7 +52,7 @@ public: virtual unsigned int GetParamCount() const; virtual CAnimParamType GetParamType(unsigned int nIndex) const; - static void Reflect(AZ::SerializeContext* serializeContext); + static void Reflect(AZ::ReflectContext* context); protected: virtual bool GetParamInfoFromType(const CAnimParamType& paramId, SParamInfo& info) const; diff --git a/Gems/Maestro/Code/Source/Cinematics/LookAtTrack.cpp b/Gems/Maestro/Code/Source/Cinematics/LookAtTrack.cpp index 164b15b809..745dc5a8a4 100644 --- a/Gems/Maestro/Code/Source/Cinematics/LookAtTrack.cpp +++ b/Gems/Maestro/Code/Source/Cinematics/LookAtTrack.cpp @@ -79,24 +79,42 @@ void CLookAtTrack::GetKeyInfo(int key, const char*& description, float& duration ////////////////////////////////////////////////////////////////////////// -template<> -inline void TAnimTrack::Reflect(AZ::SerializeContext* serializeContext) +static bool LookAtTrackVersionConverter( + AZ::SerializeContext& serializeContext, + AZ::SerializeContext::DataElementNode& rootElement) { - serializeContext->Class >() - ->Version(2) - ->Field("Flags", &TAnimTrack::m_flags) - ->Field("Range", &TAnimTrack::m_timeRange) - ->Field("ParamType", &TAnimTrack::m_nParamType) - ->Field("Keys", &TAnimTrack::m_keys) - ->Field("Id", &TAnimTrack::m_id); + if (rootElement.GetVersion() < 3) + { + rootElement.AddElement(serializeContext, "BaseClass1", azrtti_typeid()); + } + + return true; +} + +template<> +inline void TAnimTrack::Reflect(AZ::ReflectContext* context) +{ + if (auto serializeContext = azrtti_cast(context)) + { + serializeContext->Class, IAnimTrack>() + ->Version(3, &LookAtTrackVersionConverter) + ->Field("Flags", &TAnimTrack::m_flags) + ->Field("Range", &TAnimTrack::m_timeRange) + ->Field("ParamType", &TAnimTrack::m_nParamType) + ->Field("Keys", &TAnimTrack::m_keys) + ->Field("Id", &TAnimTrack::m_id); + } } ////////////////////////////////////////////////////////////////////////// -void CLookAtTrack::Reflect(AZ::SerializeContext* serializeContext) +void CLookAtTrack::Reflect(AZ::ReflectContext* context) { - TAnimTrack::Reflect(serializeContext); + TAnimTrack::Reflect(context); - serializeContext->Class >() - ->Version(1) - ->Field("AnimationLayer", &CLookAtTrack::m_iAnimationLayer); -} \ No newline at end of file + if (auto serializeContext = azrtti_cast(context)) + { + serializeContext->Class>() + ->Version(1) + ->Field("AnimationLayer", &CLookAtTrack::m_iAnimationLayer); + } +} diff --git a/Gems/Maestro/Code/Source/Cinematics/LookAtTrack.h b/Gems/Maestro/Code/Source/Cinematics/LookAtTrack.h index c3479b04b8..c45df95046 100644 --- a/Gems/Maestro/Code/Source/Cinematics/LookAtTrack.h +++ b/Gems/Maestro/Code/Source/Cinematics/LookAtTrack.h @@ -41,7 +41,7 @@ public: int GetAnimationLayerIndex() const { return m_iAnimationLayer; } void SetAnimationLayerIndex(int index) { m_iAnimationLayer = index; } - static void Reflect(AZ::SerializeContext* serializeContext); + static void Reflect(AZ::ReflectContext* context); private: int m_iAnimationLayer; }; diff --git a/Gems/Maestro/Code/Source/Cinematics/MaterialNode.cpp b/Gems/Maestro/Code/Source/Cinematics/MaterialNode.cpp index a54737953e..abf1e5dc52 100644 --- a/Gems/Maestro/Code/Source/Cinematics/MaterialNode.cpp +++ b/Gems/Maestro/Code/Source/Cinematics/MaterialNode.cpp @@ -432,10 +432,13 @@ void CAnimMaterialNode::AddTrack(IAnimTrack* track) } ////////////////////////////////////////////////////////////////////////// -void CAnimMaterialNode::Reflect(AZ::SerializeContext* serializeContext) +void CAnimMaterialNode::Reflect(AZ::ReflectContext* context) { - serializeContext->Class() - ->Version(1); + if (auto serializeContext = azrtti_cast(context)) + { + serializeContext->Class() + ->Version(1); + } } #undef s_nodeParamsInitialized diff --git a/Gems/Maestro/Code/Source/Cinematics/MaterialNode.h b/Gems/Maestro/Code/Source/Cinematics/MaterialNode.h index 39b917b15c..9d6ff6b6e0 100644 --- a/Gems/Maestro/Code/Source/Cinematics/MaterialNode.h +++ b/Gems/Maestro/Code/Source/Cinematics/MaterialNode.h @@ -49,7 +49,7 @@ public: virtual void InitializeTrack(IAnimTrack* pTrack, const CAnimParamType& paramType); - static void Reflect(AZ::SerializeContext* serializeContext); + static void Reflect(AZ::ReflectContext* context); protected: virtual bool GetParamInfoFromType(const CAnimParamType& paramId, SParamInfo& info) const; diff --git a/Gems/Maestro/Code/Source/Cinematics/Movie.cpp b/Gems/Maestro/Code/Source/Cinematics/Movie.cpp index ee7a443964..f68ddb2b49 100644 --- a/Gems/Maestro/Code/Source/Cinematics/Movie.cpp +++ b/Gems/Maestro/Code/Source/Cinematics/Movie.cpp @@ -1196,13 +1196,16 @@ void CMovieSystem::Callback(IMovieCallback::ECallbackReason reason, IAnimNode* p } ////////////////////////////////////////////////////////////////////////// -/*static*/ void CMovieSystem::Reflect(AZ::SerializeContext* serializeContext) +void CMovieSystem::Reflect(AZ::ReflectContext* context) { - serializeContext->Class() - ->Version(1) - ->Field("Sequences", &CMovieSystem::m_sequences); + if (auto serializeContext = azrtti_cast(context)) + { + serializeContext->Class() + ->Version(1) + ->Field("Sequences", &CMovieSystem::m_sequences); + } - AnimSerializer::ReflectAnimTypes(serializeContext); + AnimSerializer::ReflectAnimTypes(context); } ////////////////////////////////////////////////////////////////////////// diff --git a/Gems/Maestro/Code/Source/Cinematics/Movie.h b/Gems/Maestro/Code/Source/Cinematics/Movie.h index 1749d3b491..2150a72304 100644 --- a/Gems/Maestro/Code/Source/Cinematics/Movie.h +++ b/Gems/Maestro/Code/Source/Cinematics/Movie.h @@ -204,7 +204,7 @@ public: void OnSequenceActivated(IAnimSequence* sequence) override; - static void Reflect(AZ::SerializeContext* serializeContext); + static void Reflect(AZ::ReflectContext* context); private: diff --git a/Gems/Maestro/Code/Source/Cinematics/SceneNode.cpp b/Gems/Maestro/Code/Source/Cinematics/SceneNode.cpp index 652a144513..0b971dc7da 100644 --- a/Gems/Maestro/Code/Source/Cinematics/SceneNode.cpp +++ b/Gems/Maestro/Code/Source/Cinematics/SceneNode.cpp @@ -1026,10 +1026,13 @@ void CAnimSceneNode::Serialize(XmlNodeRef& xmlNode, bool bLoading, bool bLoadEmp SetFlags(GetFlags() | eAnimNodeFlags_CanChangeName); } -void CAnimSceneNode::Reflect(AZ::SerializeContext* serializeContext) +void CAnimSceneNode::Reflect(AZ::ReflectContext* context) { - serializeContext->Class() - ->Version(1); + if (auto serializeContext = azrtti_cast(context)) + { + serializeContext->Class() + ->Version(1); + } } void CAnimSceneNode::PrecacheStatic(float startTime) diff --git a/Gems/Maestro/Code/Source/Cinematics/SceneNode.h b/Gems/Maestro/Code/Source/Cinematics/SceneNode.h index f5e2a92005..81166ab6b1 100644 --- a/Gems/Maestro/Code/Source/Cinematics/SceneNode.h +++ b/Gems/Maestro/Code/Source/Cinematics/SceneNode.h @@ -90,7 +90,7 @@ public: virtual void PrecacheStatic(float startTime) override; virtual void PrecacheDynamic(float time) override; - static void Reflect(AZ::SerializeContext* serializeContext); + static void Reflect(AZ::ReflectContext* context); // Utility function to find the sequence associated with an ISequenceKey static IAnimSequence* GetSequenceFromSequenceKey(const ISequenceKey& sequenceKey); diff --git a/Gems/Maestro/Code/Source/Cinematics/ScreenFaderTrack.cpp b/Gems/Maestro/Code/Source/Cinematics/ScreenFaderTrack.cpp index aae6f7d01b..8b2e615c26 100644 --- a/Gems/Maestro/Code/Source/Cinematics/ScreenFaderTrack.cpp +++ b/Gems/Maestro/Code/Source/Cinematics/ScreenFaderTrack.cpp @@ -179,23 +179,41 @@ bool CScreenFaderTrack::SetActiveTexture(int index) } ////////////////////////////////////////////////////////////////////////// -template<> -inline void TAnimTrack::Reflect(AZ::SerializeContext* serializeContext) +static bool ScreenFaderTrackVersionConverter( + AZ::SerializeContext& serializeContext, + AZ::SerializeContext::DataElementNode& rootElement) { - serializeContext->Class >() - ->Version(2) - ->Field("Flags", &TAnimTrack::m_flags) - ->Field("Range", &TAnimTrack::m_timeRange) - ->Field("ParamType", &TAnimTrack::m_nParamType) - ->Field("Keys", &TAnimTrack::m_keys) - ->Field("Id", &TAnimTrack::m_id); + if (rootElement.GetVersion() < 3) + { + rootElement.AddElement(serializeContext, "BaseClass1", azrtti_typeid()); + } + + return true; +} + +template<> +inline void TAnimTrack::Reflect(AZ::ReflectContext* context) +{ + if (auto serializeContext = azrtti_cast(context)) + { + serializeContext->Class, IAnimTrack>() + ->Version(3, &ScreenFaderTrackVersionConverter) + ->Field("Flags", &TAnimTrack::m_flags) + ->Field("Range", &TAnimTrack::m_timeRange) + ->Field("ParamType", &TAnimTrack::m_nParamType) + ->Field("Keys", &TAnimTrack::m_keys) + ->Field("Id", &TAnimTrack::m_id); + } } ////////////////////////////////////////////////////////////////////////// -void CScreenFaderTrack::Reflect(AZ::SerializeContext* serializeContext) +void CScreenFaderTrack::Reflect(AZ::ReflectContext* context) { - TAnimTrack::Reflect(serializeContext); + TAnimTrack::Reflect(context); - serializeContext->Class >() - ->Version(1); -} \ No newline at end of file + if (auto serializeContext = azrtti_cast(context)) + { + serializeContext->Class>() + ->Version(1); + } +} diff --git a/Gems/Maestro/Code/Source/Cinematics/ScreenFaderTrack.h b/Gems/Maestro/Code/Source/Cinematics/ScreenFaderTrack.h index 335e22038c..0c8faa890f 100644 --- a/Gems/Maestro/Code/Source/Cinematics/ScreenFaderTrack.h +++ b/Gems/Maestro/Code/Source/Cinematics/ScreenFaderTrack.h @@ -50,7 +50,7 @@ public: void SetLastTextureID(int nTextureID){ m_lastTextureID = nTextureID; }; bool SetActiveTexture(int index); - static void Reflect(AZ::SerializeContext* serializeContext); + static void Reflect(AZ::ReflectContext* context); private: void ReleasePreloadedTextures(); diff --git a/Gems/Maestro/Code/Source/Cinematics/ScriptVarNode.cpp b/Gems/Maestro/Code/Source/Cinematics/ScriptVarNode.cpp index fc6a57a521..e1ecdc77f5 100644 --- a/Gems/Maestro/Code/Source/Cinematics/ScriptVarNode.cpp +++ b/Gems/Maestro/Code/Source/Cinematics/ScriptVarNode.cpp @@ -107,8 +107,11 @@ void CAnimScriptVarNode::Animate(SAnimContext& ec) } } -void CAnimScriptVarNode::Reflect(AZ::SerializeContext* serializeContext) +void CAnimScriptVarNode::Reflect(AZ::ReflectContext* context) { - serializeContext->Class() - ->Version(1); + if (auto serializeContext = azrtti_cast(context)) + { + serializeContext->Class() + ->Version(1); + } } diff --git a/Gems/Maestro/Code/Source/Cinematics/ScriptVarNode.h b/Gems/Maestro/Code/Source/Cinematics/ScriptVarNode.h index 10e0c83063..6355961117 100644 --- a/Gems/Maestro/Code/Source/Cinematics/ScriptVarNode.h +++ b/Gems/Maestro/Code/Source/Cinematics/ScriptVarNode.h @@ -40,7 +40,7 @@ public: virtual CAnimParamType GetParamType(unsigned int nIndex) const; virtual bool GetParamInfoFromType(const CAnimParamType& paramId, SParamInfo& info) const; - static void Reflect(AZ::SerializeContext* serializeContext); + static void Reflect(AZ::ReflectContext* context); private: float m_value; diff --git a/Gems/Maestro/Code/Source/Cinematics/SelectTrack.cpp b/Gems/Maestro/Code/Source/Cinematics/SelectTrack.cpp index cc23a86ecd..53489bb454 100644 --- a/Gems/Maestro/Code/Source/Cinematics/SelectTrack.cpp +++ b/Gems/Maestro/Code/Source/Cinematics/SelectTrack.cpp @@ -63,23 +63,41 @@ void CSelectTrack::GetKeyInfo(int key, const char*& description, float& duration } ////////////////////////////////////////////////////////////////////////// -template<> -inline void TAnimTrack::Reflect(AZ::SerializeContext* serializeContext) +static bool SelectTrackVersionConverter( + AZ::SerializeContext& serializeContext, + AZ::SerializeContext::DataElementNode& rootElement) { - serializeContext->Class >() - ->Version(2) - ->Field("Flags", &TAnimTrack::m_flags) - ->Field("Range", &TAnimTrack::m_timeRange) - ->Field("ParamType", &TAnimTrack::m_nParamType) - ->Field("Keys", &TAnimTrack::m_keys) - ->Field("Id", &TAnimTrack::m_id); + if (rootElement.GetVersion() < 3) + { + rootElement.AddElement(serializeContext, "BaseClass1", azrtti_typeid()); + } + + return true; +} + +template<> +inline void TAnimTrack::Reflect(AZ::ReflectContext* context) +{ + if (auto serializeContext = azrtti_cast(context)) + { + serializeContext->Class, IAnimTrack>() + ->Version(3, &SelectTrackVersionConverter) + ->Field("Flags", &TAnimTrack::m_flags) + ->Field("Range", &TAnimTrack::m_timeRange) + ->Field("ParamType", &TAnimTrack::m_nParamType) + ->Field("Keys", &TAnimTrack::m_keys) + ->Field("Id", &TAnimTrack::m_id); + } } ////////////////////////////////////////////////////////////////////////// -void CSelectTrack::Reflect(AZ::SerializeContext* serializeContext) +void CSelectTrack::Reflect(AZ::ReflectContext* context) { - TAnimTrack::Reflect(serializeContext); + TAnimTrack::Reflect(context); - serializeContext->Class >() - ->Version(1); -} \ No newline at end of file + if (auto serializeContext = azrtti_cast(context)) + { + serializeContext->Class>() + ->Version(1); + } +} diff --git a/Gems/Maestro/Code/Source/Cinematics/SelectTrack.h b/Gems/Maestro/Code/Source/Cinematics/SelectTrack.h index a146f656ad..6e581bd507 100644 --- a/Gems/Maestro/Code/Source/Cinematics/SelectTrack.h +++ b/Gems/Maestro/Code/Source/Cinematics/SelectTrack.h @@ -35,7 +35,7 @@ public: void GetKeyInfo(int key, const char*& description, float& duration); void SerializeKey(ISelectKey& key, XmlNodeRef& keyNode, bool bLoading); - static void Reflect(AZ::SerializeContext* serializeContext); + static void Reflect(AZ::ReflectContext* context); }; #endif // CRYINCLUDE_CRYMOVIE_SELECTTRACK_H diff --git a/Gems/Maestro/Code/Source/Cinematics/SequenceTrack.cpp b/Gems/Maestro/Code/Source/Cinematics/SequenceTrack.cpp index 25b8e9b421..b230dacf91 100644 --- a/Gems/Maestro/Code/Source/Cinematics/SequenceTrack.cpp +++ b/Gems/Maestro/Code/Source/Cinematics/SequenceTrack.cpp @@ -83,23 +83,41 @@ void CSequenceTrack::GetKeyInfo(int key, const char*& description, float& durati } ////////////////////////////////////////////////////////////////////////// -template<> -inline void TAnimTrack::Reflect(AZ::SerializeContext* serializeContext) +static bool SequencTrackVersionConverter( + AZ::SerializeContext& serializeContext, + AZ::SerializeContext::DataElementNode& rootElement) { - serializeContext->Class >() - ->Version(2) - ->Field("Flags", &TAnimTrack::m_flags) - ->Field("Range", &TAnimTrack::m_timeRange) - ->Field("ParamType", &TAnimTrack::m_nParamType) - ->Field("Keys", &TAnimTrack::m_keys) - ->Field("Id", &TAnimTrack::m_id); + if (rootElement.GetVersion() < 3) + { + rootElement.AddElement(serializeContext, "BaseClass1", azrtti_typeid()); + } + + return true; +} + +template<> +inline void TAnimTrack::Reflect(AZ::ReflectContext* context) +{ + if (auto serializeContext = azrtti_cast(context)) + { + serializeContext->Class, IAnimTrack>() + ->Version(3, &SequencTrackVersionConverter) + ->Field("Flags", &TAnimTrack::m_flags) + ->Field("Range", &TAnimTrack::m_timeRange) + ->Field("ParamType", &TAnimTrack::m_nParamType) + ->Field("Keys", &TAnimTrack::m_keys) + ->Field("Id", &TAnimTrack::m_id); + } } ////////////////////////////////////////////////////////////////////////// -void CSequenceTrack::Reflect(AZ::SerializeContext* serializeContext) +void CSequenceTrack::Reflect(AZ::ReflectContext* context) { - TAnimTrack::Reflect(serializeContext); + TAnimTrack::Reflect(context); - serializeContext->Class >() - ->Version(1); -} \ No newline at end of file + if (auto serializeContext = azrtti_cast(context)) + { + serializeContext->Class >() + ->Version(1); + } +} diff --git a/Gems/Maestro/Code/Source/Cinematics/SequenceTrack.h b/Gems/Maestro/Code/Source/Cinematics/SequenceTrack.h index 816b011e39..d4bfa65985 100644 --- a/Gems/Maestro/Code/Source/Cinematics/SequenceTrack.h +++ b/Gems/Maestro/Code/Source/Cinematics/SequenceTrack.h @@ -29,7 +29,7 @@ public: void GetKeyInfo(int key, const char*& description, float& duration); void SerializeKey(ISequenceKey& key, XmlNodeRef& keyNode, bool bLoading); - static void Reflect(AZ::SerializeContext* serializeContext); + static void Reflect(AZ::ReflectContext* context); }; #endif // CRYINCLUDE_CRYMOVIE_SEQUENCETRACK_H diff --git a/Gems/Maestro/Code/Source/Cinematics/ShadowsSetupNode.cpp b/Gems/Maestro/Code/Source/Cinematics/ShadowsSetupNode.cpp index 317791fe7c..5cc8409b2d 100644 --- a/Gems/Maestro/Code/Source/Cinematics/ShadowsSetupNode.cpp +++ b/Gems/Maestro/Code/Source/Cinematics/ShadowsSetupNode.cpp @@ -117,8 +117,11 @@ bool CShadowsSetupNode::GetParamInfoFromType(const CAnimParamType& paramId, SPar } ////////////////////////////////////////////////////////////////////////// -void CShadowsSetupNode::Reflect(AZ::SerializeContext* serializeContext) +void CShadowsSetupNode::Reflect(AZ::ReflectContext* context) { - serializeContext->Class() - ->Version(1); -} \ No newline at end of file + if (auto serializeContext = azrtti_cast(context)) + { + serializeContext->Class() + ->Version(1); + } +} diff --git a/Gems/Maestro/Code/Source/Cinematics/ShadowsSetupNode.h b/Gems/Maestro/Code/Source/Cinematics/ShadowsSetupNode.h index 8cdf908168..85a44ace69 100644 --- a/Gems/Maestro/Code/Source/Cinematics/ShadowsSetupNode.h +++ b/Gems/Maestro/Code/Source/Cinematics/ShadowsSetupNode.h @@ -45,7 +45,7 @@ public: virtual unsigned int GetParamCount() const; virtual CAnimParamType GetParamType(unsigned int nIndex) const; - static void Reflect(AZ::SerializeContext* serializeContext); + static void Reflect(AZ::ReflectContext* context); protected: virtual bool GetParamInfoFromType(const CAnimParamType& paramId, SParamInfo& info) const; diff --git a/Gems/Maestro/Code/Source/Cinematics/SoundTrack.cpp b/Gems/Maestro/Code/Source/Cinematics/SoundTrack.cpp index 2378cceb2d..c7bf492e54 100644 --- a/Gems/Maestro/Code/Source/Cinematics/SoundTrack.cpp +++ b/Gems/Maestro/Code/Source/Cinematics/SoundTrack.cpp @@ -60,23 +60,41 @@ void CSoundTrack::GetKeyInfo(int key, const char*& description, float& duration) } ////////////////////////////////////////////////////////////////////////// -template<> -inline void TAnimTrack::Reflect(AZ::SerializeContext* serializeContext) +static bool SoundTrackVersionConverter( + AZ::SerializeContext& serializeContext, + AZ::SerializeContext::DataElementNode& rootElement) { - serializeContext->Class >() - ->Version(2) - ->Field("Flags", &TAnimTrack::m_flags) - ->Field("Range", &TAnimTrack::m_timeRange) - ->Field("ParamType", &TAnimTrack::m_nParamType) - ->Field("Keys", &TAnimTrack::m_keys) - ->Field("Id", &TAnimTrack::m_id); + if (rootElement.GetVersion() < 3) + { + rootElement.AddElement(serializeContext, "BaseClass1", azrtti_typeid()); + } + + return true; +} + +template<> +inline void TAnimTrack::Reflect(AZ::ReflectContext* context) +{ + if (auto serializeContext = azrtti_cast(context)) + { + serializeContext->Class, IAnimTrack>() + ->Version(3, &SoundTrackVersionConverter) + ->Field("Flags", &TAnimTrack::m_flags) + ->Field("Range", &TAnimTrack::m_timeRange) + ->Field("ParamType", &TAnimTrack::m_nParamType) + ->Field("Keys", &TAnimTrack::m_keys) + ->Field("Id", &TAnimTrack::m_id); + } } ////////////////////////////////////////////////////////////////////////// -void CSoundTrack::Reflect(AZ::SerializeContext* serializeContext) +void CSoundTrack::Reflect(AZ::ReflectContext* context) { - TAnimTrack::Reflect(serializeContext); + TAnimTrack::Reflect(context); - serializeContext->Class >() - ->Version(1); + if (auto serializeContext = azrtti_cast(context)) + { + serializeContext->Class>() + ->Version(1); + } } diff --git a/Gems/Maestro/Code/Source/Cinematics/SoundTrack.h b/Gems/Maestro/Code/Source/Cinematics/SoundTrack.h index 8f76f09e79..83706ea9ba 100644 --- a/Gems/Maestro/Code/Source/Cinematics/SoundTrack.h +++ b/Gems/Maestro/Code/Source/Cinematics/SoundTrack.h @@ -55,7 +55,7 @@ public: bool UsesMute() const override { return true; } - static void Reflect(AZ::SerializeContext* serializeContext); + static void Reflect(AZ::ReflectContext* context); }; #endif // CRYINCLUDE_CRYMOVIE_SOUNDTRACK_H diff --git a/Gems/Maestro/Code/Source/Cinematics/TimeRangesTrack.cpp b/Gems/Maestro/Code/Source/Cinematics/TimeRangesTrack.cpp index e2b18bdac1..334c5bdd6b 100644 --- a/Gems/Maestro/Code/Source/Cinematics/TimeRangesTrack.cpp +++ b/Gems/Maestro/Code/Source/Cinematics/TimeRangesTrack.cpp @@ -100,23 +100,41 @@ int CTimeRangesTrack::GetActiveKeyIndexForTime(const float time) } ////////////////////////////////////////////////////////////////////////// -template<> -inline void TAnimTrack::Reflect(AZ::SerializeContext* serializeContext) +static bool TimeRangesTrackVersionConverter( + AZ::SerializeContext& serializeContext, + AZ::SerializeContext::DataElementNode& rootElement) { - serializeContext->Class >() - ->Version(2) - ->Field("Flags", &TAnimTrack::m_flags) - ->Field("Range", &TAnimTrack::m_timeRange) - ->Field("ParamType", &TAnimTrack::m_nParamType) - ->Field("Keys", &TAnimTrack::m_keys) - ->Field("Id", &TAnimTrack::m_id); + if (rootElement.GetVersion() < 3) + { + rootElement.AddElement(serializeContext, "BaseClass1", azrtti_typeid()); + } + + return true; +} + +template<> +inline void TAnimTrack::Reflect(AZ::ReflectContext* context) +{ + if (auto serializeContext = azrtti_cast(context)) + { + serializeContext->Class, IAnimTrack>() + ->Version(3, &TimeRangesTrackVersionConverter) + ->Field("Flags", &TAnimTrack::m_flags) + ->Field("Range", &TAnimTrack::m_timeRange) + ->Field("ParamType", &TAnimTrack::m_nParamType) + ->Field("Keys", &TAnimTrack::m_keys) + ->Field("Id", &TAnimTrack::m_id); + } } ////////////////////////////////////////////////////////////////////////// -void CTimeRangesTrack::Reflect(AZ::SerializeContext* serializeContext) +void CTimeRangesTrack::Reflect(AZ::ReflectContext* context) { - TAnimTrack::Reflect(serializeContext); + TAnimTrack::Reflect(context); - serializeContext->Class >() - ->Version(1); + if (auto serializeContext = azrtti_cast(context)) + { + serializeContext->Class>() + ->Version(1); + } } diff --git a/Gems/Maestro/Code/Source/Cinematics/TimeRangesTrack.h b/Gems/Maestro/Code/Source/Cinematics/TimeRangesTrack.h index e8861e53a4..dd07e6d8e4 100644 --- a/Gems/Maestro/Code/Source/Cinematics/TimeRangesTrack.h +++ b/Gems/Maestro/Code/Source/Cinematics/TimeRangesTrack.h @@ -39,8 +39,7 @@ public: int GetActiveKeyIndexForTime(const float time); - static void Reflect(AZ::SerializeContext* serializeContext); - + static void Reflect(AZ::ReflectContext* context); }; #endif // CRYINCLUDE_CRYMOVIE_TIMERANGESTRACK_H diff --git a/Gems/Maestro/Code/Source/Cinematics/TrackEventTrack.cpp b/Gems/Maestro/Code/Source/Cinematics/TrackEventTrack.cpp index 9d690e1afb..41c17ce6f3 100644 --- a/Gems/Maestro/Code/Source/Cinematics/TrackEventTrack.cpp +++ b/Gems/Maestro/Code/Source/Cinematics/TrackEventTrack.cpp @@ -159,23 +159,41 @@ void CTrackEventTrack::GetKeyInfo(int key, const char*& description, float& dura } ////////////////////////////////////////////////////////////////////////// -template<> -inline void TAnimTrack::Reflect(AZ::SerializeContext* serializeContext) +static bool EventTrackVersionConverter( + AZ::SerializeContext& serializeContext, + AZ::SerializeContext::DataElementNode& rootElement) { - serializeContext->Class >() - ->Version(2) - ->Field("Flags", &TAnimTrack::m_flags) - ->Field("Range", &TAnimTrack::m_timeRange) - ->Field("ParamType", &TAnimTrack::m_nParamType) - ->Field("Keys", &TAnimTrack::m_keys) - ->Field("Id", &TAnimTrack::m_id); + if (rootElement.GetVersion() < 3) + { + rootElement.AddElement(serializeContext, "BaseClass1", azrtti_typeid()); + } + + return true; +} + +template<> +inline void TAnimTrack::Reflect(AZ::ReflectContext* context) +{ + if (auto serializeContext = azrtti_cast(context)) + { + serializeContext->Class, IAnimTrack>() + ->Version(3, &EventTrackVersionConverter) + ->Field("Flags", &TAnimTrack::m_flags) + ->Field("Range", &TAnimTrack::m_timeRange) + ->Field("ParamType", &TAnimTrack::m_nParamType) + ->Field("Keys", &TAnimTrack::m_keys) + ->Field("Id", &TAnimTrack::m_id); + } } ////////////////////////////////////////////////////////////////////////// -void CTrackEventTrack::Reflect(AZ::SerializeContext* serializeContext) +void CTrackEventTrack::Reflect(AZ::ReflectContext* context) { - TAnimTrack::Reflect(serializeContext); + TAnimTrack::Reflect(context); - serializeContext->Class >() - ->Version(1); + if (auto serializeContext = azrtti_cast(context)) + { + serializeContext->Class>() + ->Version(1); + } } diff --git a/Gems/Maestro/Code/Source/Cinematics/TrackEventTrack.h b/Gems/Maestro/Code/Source/Cinematics/TrackEventTrack.h index 86043110c3..1095a7736d 100644 --- a/Gems/Maestro/Code/Source/Cinematics/TrackEventTrack.h +++ b/Gems/Maestro/Code/Source/Cinematics/TrackEventTrack.h @@ -78,7 +78,7 @@ public: void SetKey(int index, IKey* key); void InitPostLoad(IAnimSequence* sequence) override; - static void Reflect(AZ::SerializeContext* serializeContext); + static void Reflect(AZ::ReflectContext* context); private: AZStd::intrusive_ptr< IAnimStringTable> m_pStrings; diff --git a/Gems/Maestro/Code/Source/Components/SequenceComponent.cpp b/Gems/Maestro/Code/Source/Components/SequenceComponent.cpp index 62261d1427..491e9287b8 100644 --- a/Gems/Maestro/Code/Source/Components/SequenceComponent.cpp +++ b/Gems/Maestro/Code/Source/Components/SequenceComponent.cpp @@ -34,6 +34,7 @@ #include #include #include +#include #include #include @@ -105,18 +106,16 @@ namespace Maestro { } - /*static*/ void SequenceComponent::Reflect(AZ::ReflectContext* context) + void SequenceComponent::Reflect(AZ::ReflectContext* context) { - AZ::SerializeContext* serializeContext = azrtti_cast(context); - - if (serializeContext) + // Reflect the Cinematics library + ReflectCinematicsLib(context); + + if (AZ::SerializeContext* serializeContext = azrtti_cast(context)) { serializeContext->Class() ->Version(2) ->Field("Sequence", &SequenceComponent::m_sequence); - - // Reflect the Cinematics library - ReflectCinematicsLib(serializeContext); } if (AZ::BehaviorContext* behaviorContext = azrtti_cast(context)) @@ -141,12 +140,13 @@ namespace Maestro } } - /*static*/ void SequenceComponent::ReflectCinematicsLib(AZ::SerializeContext* context) + void SequenceComponent::ReflectCinematicsLib(AZ::ReflectContext* context) { // The Movie System itself CMovieSystem::Reflect(context); // Tracks + IAnimTrack::Reflect(context); TAnimSplineTrack::Reflect(context); CBoolTrack::Reflect(context); CCaptureTrack::Reflect(context); @@ -163,10 +163,13 @@ namespace Maestro CSoundTrack::Reflect(context); CTrackEventTrack::Reflect(context); CAssetBlendTrack::Reflect(context); + CTimeRangesTrack::Reflect(context); // Nodes + IAnimSequence::Reflect(context); CAnimSequence::Reflect(context); CAnimSceneNode::Reflect(context); + IAnimNode::Reflect(context); CAnimNode::Reflect(context); CAnimAzEntityNode::Reflect(context); CAnimComponentNode::Reflect(context); diff --git a/Gems/Maestro/Code/Source/Components/SequenceComponent.h b/Gems/Maestro/Code/Source/Components/SequenceComponent.h index eab484903d..20e7d22fe3 100644 --- a/Gems/Maestro/Code/Source/Components/SequenceComponent.h +++ b/Gems/Maestro/Code/Source/Components/SequenceComponent.h @@ -104,7 +104,7 @@ namespace Maestro AZStd::intrusive_ptr m_sequence; // Reflects the entire CryMovie library - static void ReflectCinematicsLib(AZ::SerializeContext* context); + static void ReflectCinematicsLib(AZ::ReflectContext* context); }; } // namespace Maestro diff --git a/cmake/LYPython.cmake b/cmake/LYPython.cmake index 14ea19a96a..ff5132097c 100644 --- a/cmake/LYPython.cmake +++ b/cmake/LYPython.cmake @@ -268,6 +268,7 @@ if (NOT CMAKE_SCRIPT_MODE_FILE) ly_pip_install_local_package_editable(${LY_ROOT_FOLDER}/Tools/LyTestTools ly-test-tools) ly_pip_install_local_package_editable(${LY_ROOT_FOLDER}/Tools/RemoteConsole/ly_remote_console ly-remote-console) + ly_pip_install_local_package_editable(${LY_ROOT_FOLDER}/AutomatedTesting/Gem/PythonTests/EditorPythonTestTools editor-python-test-tools) endif() endif() diff --git a/scripts/build/Jenkins/Jenkinsfile b/scripts/build/Jenkins/Jenkinsfile index 4352cb1e6a..fe60d9236c 100644 --- a/scripts/build/Jenkins/Jenkinsfile +++ b/scripts/build/Jenkins/Jenkinsfile @@ -337,14 +337,16 @@ def PreBuildCommonSteps(Map pipelineConfig, String repositoryName, String projec } def Build(Map options, String platform, String type, String workspace) { - def command = "${options.BUILD_ENTRY_POINT} --platform ${platform} --type ${type}" - dir("${workspace}/${ENGINE_REPOSITORY_NAME}") { - if (env.IS_UNIX) { - sh label: "Running ${platform} ${type}", - script: "${options.PYTHON_DIR}/python.sh -u ${command}" - } else { - bat label: "Running ${platform} ${type}", - script: "${options.PYTHON_DIR}/python.cmd -u ${command}".replace('/','\\') + timeout(time: env.TIMEOUT, unit: 'MINUTES', activity: true) { + def command = "${options.BUILD_ENTRY_POINT} --platform ${platform} --type ${type}" + dir("${workspace}/${ENGINE_REPOSITORY_NAME}") { + if (env.IS_UNIX) { + sh label: "Running ${platform} ${type}", + script: "${options.PYTHON_DIR}/python.sh -u ${command}" + } else { + bat label: "Running ${platform} ${type}", + script: "${options.PYTHON_DIR}/python.cmd -u ${command}".replace('/','\\') + } } } } @@ -502,43 +504,41 @@ try { envVars['IS_UNIX'] = 1 } withEnv(GetEnvStringList(envVars)) { - timeout(time: envVars['TIMEOUT'], unit: 'MINUTES', activity: true) { - try { - def build_job_name = build_job.key + try { + def build_job_name = build_job.key - CreateSetupStage(pipelineConfig, repositoryName, projectName, pipelineName, branchName, platform.key, build_job.key, envVars).call() + CreateSetupStage(pipelineConfig, repositoryName, projectName, pipelineName, branchName, platform.key, build_job.key, envVars).call() - if(build_job.value.steps) { //this is a pipe with many steps so create all the build stages - build_job.value.steps.each { build_step -> - build_job_name = build_step - CreateBuildStage(pipelineConfig, platform.key, build_step, envVars).call() - } - } else { - CreateBuildStage(pipelineConfig, platform.key, build_job.key, envVars).call() + if(build_job.value.steps) { //this is a pipe with many steps so create all the build stages + build_job.value.steps.each { build_step -> + build_job_name = build_step + CreateBuildStage(pipelineConfig, platform.key, build_step, envVars).call() } + } else { + CreateBuildStage(pipelineConfig, platform.key, build_job.key, envVars).call() + } - if (env.MARS_REPO && platform.key == 'Windows' && build_job_name.startsWith('test')) { - def output_directory = platform.value.build_types[build_job_name].PARAMETERS.OUTPUT_DIRECTORY - def configuration = platform.value.build_types[build_job_name].PARAMETERS.CONFIGURATION - CreateTestMetricsStage(pipelineConfig, branchName, envVars, build_job_name, output_directory, configuration).call() - } + if (env.MARS_REPO && platform.key == 'Windows' && build_job_name.startsWith('test')) { + def output_directory = platform.value.build_types[build_job_name].PARAMETERS.OUTPUT_DIRECTORY + def configuration = platform.value.build_types[build_job_name].PARAMETERS.CONFIGURATION + CreateTestMetricsStage(pipelineConfig, branchName, envVars, build_job_name, output_directory, configuration).call() } - catch(Exception e) { - // https://github.com/jenkinsci/jenkins/blob/master/core/src/main/java/hudson/model/Result.java - // {SUCCESS,UNSTABLE,FAILURE,NOT_BUILT,ABORTED} - def currentResult = envVars['ON_FAILURE_MARK'] ?: 'FAILURE' - if (currentResult == 'FAILURE') { - currentBuild.result = 'FAILURE' - error "FAILURE: ${e}" - } else if (currentResult == 'UNSTABLE') { - currentBuild.result = 'UNSTABLE' - unstable(message: "UNSTABLE: ${e}") - } - } - finally { - CreateTeardownStage(envVars).call() + } + catch(Exception e) { + // https://github.com/jenkinsci/jenkins/blob/master/core/src/main/java/hudson/model/Result.java + // {SUCCESS,UNSTABLE,FAILURE,NOT_BUILT,ABORTED} + def currentResult = envVars['ON_FAILURE_MARK'] ?: 'FAILURE' + if (currentResult == 'FAILURE') { + currentBuild.result = 'FAILURE' + error "FAILURE: ${e}" + } else if (currentResult == 'UNSTABLE') { + currentBuild.result = 'UNSTABLE' + unstable(message: "UNSTABLE: ${e}") } } + finally { + CreateTeardownStage(envVars).call() + } } } }