diff --git a/.gitignore b/.gitignore
index 1b63c7698a..b73c89b1d9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,3 +25,4 @@ TestResults/**
*.swatches
/imgui.ini
/scripts/project_manager/logs/
+/AutomatedTesting/Gem/PythonTests/scripting/TestResults
diff --git a/Assets/Editor/Icons/Components/Viewport/Non Uniform Scale.svg b/Assets/Editor/Icons/Components/Viewport/NonUniformScale.svg
similarity index 100%
rename from Assets/Editor/Icons/Components/Viewport/Non Uniform Scale.svg
rename to Assets/Editor/Icons/Components/Viewport/NonUniformScale.svg
diff --git a/Assets/Editor/Prefabs/Default_Level.prefab b/Assets/Editor/Prefabs/Default_Level.prefab
index 64656e1e2f..d02d669f53 100644
--- a/Assets/Editor/Prefabs/Default_Level.prefab
+++ b/Assets/Editor/Prefabs/Default_Level.prefab
@@ -212,10 +212,10 @@
"Configuration": {
"ModelAsset": {
"assetId": {
- "guid": "{935F694A-8639-515B-8133-81CDC7948E5B}",
- "subId": 277333723
+ "guid": "{0CD745C0-6AA8-569A-A68A-73A3270986C4}",
+ "subId": 277889906
},
- "assetHint": "objects/groudplane/groundplane_521x521m.azmodel"
+ "assetHint": "objects/groudplane/groundplane_512x512m.azmodel"
}
}
}
diff --git a/Assets/Editor/Translation/scriptcanvas_en_us.ts b/Assets/Editor/Translation/scriptcanvas_en_us.ts
index f057ba2f30..937f6a4d96 100644
--- a/Assets/Editor/Translation/scriptcanvas_en_us.ts
+++ b/Assets/Editor/Translation/scriptcanvas_en_us.ts
@@ -2771,6 +2771,80 @@
VECTOR2_CREATEONE_OUTPUT0_TOOLTIP
+
+ VECTOR2_DIRECTIONTO_NAME
+ Class/Bus: Vector2 Event/Method: DirectionTo
+ Get Direction Vector
+
+
+ VECTOR2_DIRECTIONTO_TOOLTIP
+ Returns a direction vector between two points and the distance between them, by default the direction will be normalized, it may be optionally scaled using the Scale parameter if different from 1.0
+
+
+ VECTOR2_DIRECTIONTO_CATEGORY
+
+
+
+ VECTOR2_DIRECTIONTO_OUT_NAME
+
+
+
+ VECTOR2_DIRECTIONTO_OUT_TOOLTIP
+
+
+
+ VECTOR2_DIRECTIONTOL_IN_NAME
+
+
+
+ VECTOR2_DIRECTIONTO_IN_TOOLTIP
+
+
+
+ VECTOR2_DIRECTIONTO_OUTPUT0_NAME
+ C++ Type: const Vector2
+ Direction
+
+
+ VECTOR2_DIRECTIONTO_OUTPUT0_TOOLTIP
+ The direction between To and From normalized and optionally scaled
+
+
+ VECTOR2_DIRECTIONTO_OUTPUT1_NAME
+ C++ Type: float
+ Distance
+
+
+ VECTOR2_DIRECTIONTO_OUTPUT1_TOOLTIP
+ The distance between To and From
+
+
+ VECTOR2_DIRECTIONTO_PARAM0_NAME
+ Simple Type: Vector2 C++ Type: Vector2*
+ From
+
+
+ VECTOR2_DIRECTIONTO_PARAM0_TOOLTIP
+
+
+
+ VECTOR2_DIRECTIONTO_PARAM1_NAME
+ Simple Type: Vector2 C++ Type: Vector2*
+ To
+
+
+ VECTOR2_DIRECTIONTO_PARAM1_TOOLTIP
+
+
+
+ VECTOR2_DIRECTIONTO_PARAM2_NAME
+ Simple Type: Vector2 C++ Type: Vector2*
+ Scale
+
+
+ VECTOR2_DIRECTIONTO_PARAM2_TOOLTIP
+
+
VECTOR2_GETPROJECTED_NAME
Class/Bus: Vector2 Event/Method: GetProjected
@@ -32262,6 +32336,80 @@ An Entity can be selected by using the pick button, or by dragging an Entity fro
VECTOR4_GETRECIPROCAL_PARAM0_TOOLTIP
+
+ VECTOR4_DIRECTIONTO_NAME
+ Class/Bus: Vector4 Event/Method: DirectionTo
+ Get Direction Vector
+
+
+ VECTOR4_DIRECTIONTO_TOOLTIP
+ Returns a direction vector between two points and the distance between them, by default the direction will be normalized, it may be optionally scaled using the Scale parameter if different from 1.0
+
+
+ VECTOR4_DIRECTIONTO_CATEGORY
+
+
+
+ VECTOR4_DIRECTIONTO_OUT_NAME
+
+
+
+ VECTOR4_DIRECTIONTO_OUT_TOOLTIP
+
+
+
+ VECTOR4_DIRECTIONTOL_IN_NAME
+
+
+
+ VECTOR4_DIRECTIONTO_IN_TOOLTIP
+
+
+
+ VECTOR4_DIRECTIONTO_OUTPUT0_NAME
+ C++ Type: const Vector4
+ Direction
+
+
+ VECTOR4_DIRECTIONTO_OUTPUT0_TOOLTIP
+ The direction between To and From normalized and optionally scaled
+
+
+ VECTOR4_DIRECTIONTO_OUTPUT1_NAME
+ C++ Type: float
+ Distance
+
+
+ VECTOR4_DIRECTIONTO_OUTPUT1_TOOLTIP
+ The distance between To and From
+
+
+ VECTOR4_DIRECTIONTO_PARAM0_NAME
+ Simple Type: Vector4 C++ Type: Vector4*
+ From
+
+
+ VECTOR4_DIRECTIONTO_PARAM0_TOOLTIP
+
+
+
+ VECTOR4_DIRECTIONTO_PARAM1_NAME
+ Simple Type: Vector4 C++ Type: Vector4*
+ To
+
+
+ VECTOR4_DIRECTIONTO_PARAM1_TOOLTIP
+
+
+
+ VECTOR4_DIRECTIONTO_PARAM2_NAME
+ Simple Type: Vector4 C++ Type: Vector4*
+ Scale
+
+
+ VECTOR4_DIRECTIONTO_PARAM2_TOOLTIP
+
+
VECTOR4_AXISX_NAME
Class/Bus: Vector4 Event/Method: CreateAxisX
@@ -37469,6 +37617,80 @@ An Entity can be selected by using the pick button, or by dragging an Entity fro
VECTOR3_GETRECIPROCAL_PARAM0_TOOLTIP
+
+ VECTOR3_DIRECTIONTO_NAME
+ Class/Bus: Vector3 Event/Method: DirectionTo
+ Get Direction Vector
+
+
+ VECTOR3_DIRECTIONTO_TOOLTIP
+ Returns a direction vector between two points and the distance between them, by default the direction will be normalized, it may be optionally scaled using the Scale parameter if different from 1.0
+
+
+ VECTOR3_DIRECTIONTO_CATEGORY
+
+
+
+ VECTOR3_DIRECTIONTO_OUT_NAME
+
+
+
+ VECTOR3_DIRECTIONTO_OUT_TOOLTIP
+
+
+
+ VECTOR3_DIRECTIONTOL_IN_NAME
+
+
+
+ VECTOR3_DIRECTIONTO_IN_TOOLTIP
+
+
+
+ VECTOR3_DIRECTIONTO_OUTPUT0_NAME
+ C++ Type: const Vector3
+ Direction
+
+
+ VECTOR3_DIRECTIONTO_OUTPUT0_TOOLTIP
+ The direction between To and From normalized and optionally scaled
+
+
+ VECTOR3_DIRECTIONTO_OUTPUT1_NAME
+ C++ Type: float
+ Distance
+
+
+ VECTOR3_DIRECTIONTO_OUTPUT1_TOOLTIP
+ The distance between To and From
+
+
+ VECTOR3_DIRECTIONTO_PARAM0_NAME
+ Simple Type: Vector3 C++ Type: Vector3*
+ From
+
+
+ VECTOR3_DIRECTIONTO_PARAM0_TOOLTIP
+
+
+
+ VECTOR3_DIRECTIONTO_PARAM1_NAME
+ Simple Type: Vector3 C++ Type: Vector3*
+ To
+
+
+ VECTOR3_DIRECTIONTO_PARAM1_TOOLTIP
+
+
+
+ VECTOR3_DIRECTIONTO_PARAM2_NAME
+ Simple Type: Vector3 C++ Type: Vector3*
+ Scale
+
+
+ VECTOR3_DIRECTIONTO_PARAM2_TOOLTIP
+
+
VECTOR3_PROJECT_NAME
Class/Bus: Vector3 Event/Method: Project
diff --git a/AutomatedTesting/AssetProcessorGamePlatformConfig.setreg b/AutomatedTesting/AssetProcessorGamePlatformConfig.setreg
new file mode 100644
index 0000000000..5457b3f1ca
--- /dev/null
+++ b/AutomatedTesting/AssetProcessorGamePlatformConfig.setreg
@@ -0,0 +1,19 @@
+{
+ "Amazon": {
+ "AssetProcessor": {
+ "Settings": {
+ "RC cgf": {
+ "ignore": true
+ },
+ "RC fbx": {
+ "ignore": true
+ },
+ "ScanFolder AtomTestData": {
+ "watch": "@ENGINEROOT@/Gems/Atom/TestData",
+ "recursive": 1,
+ "order": 1000
+ }
+ }
+ }
+ }
+}
diff --git a/AutomatedTesting/surfacetypemateriallibrary.physmaterial b/AutomatedTesting/Assets/Physics/SurfaceTypeMaterialLibrary.physmaterial
similarity index 100%
rename from AutomatedTesting/surfacetypemateriallibrary.physmaterial
rename to AutomatedTesting/Assets/Physics/SurfaceTypeMaterialLibrary.physmaterial
diff --git a/AutomatedTesting/Gem/Code/CMakeLists.txt b/AutomatedTesting/Gem/Code/CMakeLists.txt
index 76c0db3f5c..58ffd957d6 100644
--- a/AutomatedTesting/Gem/Code/CMakeLists.txt
+++ b/AutomatedTesting/Gem/Code/CMakeLists.txt
@@ -57,6 +57,12 @@ if (PAL_TRAIT_BUILD_HOST_TOOLS)
TARGETS Editor
VARIANTS Tools)
+ # The Material Editor needs the Lyshine "Tools" gem variant for the custom LyShine pass
+ ly_enable_gems(
+ PROJECT_NAME AutomatedTesting GEMS LyShine
+ TARGETS MaterialEditor
+ VARIANTS Tools)
+
# The pipeline tools use "Builders" gem variants:
ly_enable_gems(
PROJECT_NAME AutomatedTesting GEM_FILE enabled_gems.cmake
diff --git a/AutomatedTesting/Gem/PythonTests/AWS/CMakeLists.txt b/AutomatedTesting/Gem/PythonTests/AWS/CMakeLists.txt
index 1c555c1e17..a589a395c1 100644
--- a/AutomatedTesting/Gem/PythonTests/AWS/CMakeLists.txt
+++ b/AutomatedTesting/Gem/PythonTests/AWS/CMakeLists.txt
@@ -12,6 +12,11 @@
################################################################################
if(PAL_TRAIT_BUILD_TESTS_SUPPORTED AND PAL_TRAIT_BUILD_HOST_TOOLS)
+ # Only enable AWS automated tests on Windows
+ if(NOT "${PAL_PLATFORM_NAME}" STREQUAL "Windows")
+ return()
+ endif()
+
# Enable after installing NodeJS and CDK on jenkins Windows AMI.
ly_add_pytest(
NAME AutomatedTesting::AWSTests
diff --git a/AutomatedTesting/Gem/PythonTests/Blast/CMakeLists.txt b/AutomatedTesting/Gem/PythonTests/Blast/CMakeLists.txt
index 7048a6bd46..172eded09a 100644
--- a/AutomatedTesting/Gem/PythonTests/Blast/CMakeLists.txt
+++ b/AutomatedTesting/Gem/PythonTests/Blast/CMakeLists.txt
@@ -12,7 +12,6 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED AND PAL_TRAIT_BUILD_HOST_TOOLS)
TEST_SUITE main
TEST_SERIAL TRUE
PATH ${CMAKE_CURRENT_LIST_DIR}/TestSuite_Active.py
- TIMEOUT 1500
RUNTIME_DEPENDENCIES
Legacy::Editor
AZ::AssetProcessor
diff --git a/AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/README.txt b/AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/README.txt
index 0405dacbf4..90afee39bc 100644
--- a/AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/README.txt
+++ b/AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/README.txt
@@ -8,7 +8,7 @@ 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
+developed by the O3DE feature teams. The project contains tools for system level
editor tests.
@@ -23,7 +23,7 @@ installed on your system.
INSTALL
-----------
-It is recommended to set up these these tools with Lumberyard's CMake build commands.
+It is recommended to set up these these tools with O3DE'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
diff --git a/AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/editor_python_test_tools/hydra_editor_utils.py b/AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/editor_python_test_tools/hydra_editor_utils.py
index cec1b6456b..985e32ede5 100644
--- a/AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/editor_python_test_tools/hydra_editor_utils.py
+++ b/AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/editor_python_test_tools/hydra_editor_utils.py
@@ -8,6 +8,7 @@ SPDX-License-Identifier: Apache-2.0 OR MIT
import azlmbr.bus as bus
import azlmbr.editor as editor
import azlmbr.entity as entity
+import azlmbr.legacy.general as general
import azlmbr.object
from typing import List
@@ -428,3 +429,32 @@ def get_component_type_id_map(component_name_list):
type_ids_by_component[component_names[i]] = typeId
return type_ids_by_component
+
+
+def attach_component_to_entity(entity_id, component_name):
+ # type: (azlmbr.entity.EntityId, str) -> azlmbr.entity.EntityComponentIdPair
+ """
+ Adds the component if not added already.
+ :param entity_id: EntityId of the entity to attach the component to
+ :param component_name: name of the component
+ :return: If successful, returns the EntityComponentIdPair, otherwise returns None.
+ """
+ type_ids_list = editor.EditorComponentAPIBus(
+ bus.Broadcast, 'FindComponentTypeIdsByEntityType', [component_name], 0)
+ general.log(f"Components found = {len(type_ids_list)}")
+ if len(type_ids_list) < 1:
+ general.log(f"ERROR: A component class with name {component_name} doesn't exist")
+ return None
+ elif len(type_ids_list) > 1:
+ general.log(f"ERROR: Found more than one component classes with same name: {component_name}")
+ return None
+ # Before adding the component let's check if it is already attached to the entity.
+ component_outcome = editor.EditorComponentAPIBus(bus.Broadcast, 'GetComponentOfType', entity_id, type_ids_list[0])
+ if component_outcome.IsSuccess():
+ return component_outcome.GetValue() # In this case the value is not a list.
+ component_outcome = editor.EditorComponentAPIBus(bus.Broadcast, 'AddComponentsOfType', entity_id, type_ids_list)
+ if component_outcome.IsSuccess():
+ general.log(f"{component_name} Component added to entity.")
+ return component_outcome.GetValue()[0]
+ general.log(f"ERROR: Failed to add component [{component_name}] to entity")
+ return None
diff --git a/AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/editor_python_test_tools/hydra_test_utils.py b/AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/editor_python_test_tools/hydra_test_utils.py
index 3004b9ec7d..3d4d9ea419 100644
--- a/AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/editor_python_test_tools/hydra_test_utils.py
+++ b/AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/editor_python_test_tools/hydra_test_utils.py
@@ -29,7 +29,7 @@ def teardown_editor(editor):
def launch_and_validate_results(request, test_directory, editor, editor_script, expected_lines, unexpected_lines=[],
halt_on_unexpected=False, run_python="--runpythontest", auto_test_mode=True, null_renderer=True, cfg_args=[],
- timeout=300):
+ timeout=300, log_file_name="Editor.log"):
"""
Runs the Editor with the specified script, and monitors for expected log lines.
:param request: Special fixture providing information of the requesting test function.
@@ -44,6 +44,7 @@ def launch_and_validate_results(request, test_directory, editor, editor_script,
:param null_renderer: Specifies the test does not require the renderer. Defaults to True.
:param cfg_args: Additional arguments for CFG, such as LevelName.
:param timeout: Length of time for test to run. Default is 60.
+ :param log_file_name: Name of the log file created by the editor. Defaults to 'Editor.log'
"""
test_case = os.path.join(test_directory, editor_script)
request.addfinalizer(lambda: teardown_editor(editor))
@@ -58,7 +59,17 @@ def launch_and_validate_results(request, test_directory, editor, editor_script,
with editor.start():
- editorlog_file = os.path.join(editor.workspace.paths.project_log(), 'Editor.log')
+ editorlog_file = os.path.join(editor.workspace.paths.project_log(), log_file_name)
+
+ # Log monitor requires the file to exist.
+ logger.debug(f"Waiting until log file <{editorlog_file}> exists...")
+ waiter.wait_for(
+ lambda: os.path.exists(editorlog_file),
+ timeout=60,
+ exc=f"Log file '{editorlog_file}' was never created by another process.",
+ interval=1,
+ )
+ logger.debug(f"Done! log file <{editorlog_file}> exists.")
# Initialize the log monitor and set time to wait for log creation
log_monitor = ly_test_tools.log.log_monitor.LogMonitor(launcher=editor, log_file_path=editorlog_file)
diff --git a/AutomatedTesting/Gem/PythonTests/NvCloth/CMakeLists.txt b/AutomatedTesting/Gem/PythonTests/NvCloth/CMakeLists.txt
index a39cdf04cf..3913041f88 100644
--- a/AutomatedTesting/Gem/PythonTests/NvCloth/CMakeLists.txt
+++ b/AutomatedTesting/Gem/PythonTests/NvCloth/CMakeLists.txt
@@ -13,7 +13,6 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED AND PAL_TRAIT_BUILD_HOST_TOOLS)
TEST_REQUIRES gpu
TEST_SERIAL
PATH ${CMAKE_CURRENT_LIST_DIR}/TestSuite_Active.py
- TIMEOUT 1500
RUNTIME_DEPENDENCIES
Legacy::Editor
AZ::AssetProcessor
diff --git a/AutomatedTesting/Gem/PythonTests/PythonAssetBuilder/AssetBuilder_test.py b/AutomatedTesting/Gem/PythonTests/PythonAssetBuilder/AssetBuilder_test.py
index 1fe60e3707..45e633a979 100644
--- a/AutomatedTesting/Gem/PythonTests/PythonAssetBuilder/AssetBuilder_test.py
+++ b/AutomatedTesting/Gem/PythonTests/PythonAssetBuilder/AssetBuilder_test.py
@@ -27,19 +27,19 @@ class TestPythonAssetProcessing(object):
unexpected_lines = []
expected_lines = [
'Mock asset exists',
- 'Expected subId for asset (gem/pythontests/pythonassetbuilder/geom_group_fbx_cube_100cm_z_positive.azmodel) found',
- 'Expected subId for asset (gem/pythontests/pythonassetbuilder/geom_group_fbx_cube_100cm_z_negative.azmodel) found',
- 'Expected subId for asset (gem/pythontests/pythonassetbuilder/geom_group_fbx_cube_100cm_y_positive.azmodel) found',
- 'Expected subId for asset (gem/pythontests/pythonassetbuilder/geom_group_fbx_cube_100cm_y_negative.azmodel) found',
- 'Expected subId for asset (gem/pythontests/pythonassetbuilder/geom_group_fbx_cube_100cm_x_positive.azmodel) found',
- 'Expected subId for asset (gem/pythontests/pythonassetbuilder/geom_group_fbx_cube_100cm_x_negative.azmodel) found',
- 'Expected subId for asset (gem/pythontests/pythonassetbuilder/geom_group_fbx_cube_100cm_center.azmodel) found'
+ 'AssetId found for asset (gem/pythontests/pythonassetbuilder/geom_group_fbx_cube_100cm_z_positive_1.azmodel) found',
+ 'AssetId found for asset (gem/pythontests/pythonassetbuilder/geom_group_fbx_cube_100cm_z_negative_1.azmodel) found',
+ 'AssetId found for asset (gem/pythontests/pythonassetbuilder/geom_group_fbx_cube_100cm_y_positive_1.azmodel) found',
+ 'AssetId found for asset (gem/pythontests/pythonassetbuilder/geom_group_fbx_cube_100cm_y_negative_1.azmodel) found',
+ 'AssetId found for asset (gem/pythontests/pythonassetbuilder/geom_group_fbx_cube_100cm_x_positive_1.azmodel) found',
+ 'AssetId found for asset (gem/pythontests/pythonassetbuilder/geom_group_fbx_cube_100cm_x_negative_1.azmodel) found',
+ 'AssetId found for asset (gem/pythontests/pythonassetbuilder/geom_group_fbx_cube_100cm_center_1.azmodel) found'
]
timeout = 180
halt_on_unexpected = False
test_directory = os.path.join(os.path.dirname(__file__))
testFile = os.path.join(test_directory, 'AssetBuilder_test_case.py')
- editor.args.extend(['-NullRenderer', "--skipWelcomeScreenDialog", "--autotest_mode", "--runpythontest", testFile])
+ editor.args.extend(['-NullRenderer', '-rhi=Null', "--skipWelcomeScreenDialog", "--autotest_mode", "--runpythontest", testFile])
with editor.start():
editorlog_file = os.path.join(editor.workspace.paths.project_log(), 'Editor.log')
diff --git a/AutomatedTesting/Gem/PythonTests/PythonAssetBuilder/AssetBuilder_test_case.py b/AutomatedTesting/Gem/PythonTests/PythonAssetBuilder/AssetBuilder_test_case.py
index c1519a6fdb..8d418222ce 100644
--- a/AutomatedTesting/Gem/PythonTests/PythonAssetBuilder/AssetBuilder_test_case.py
+++ b/AutomatedTesting/Gem/PythonTests/PythonAssetBuilder/AssetBuilder_test_case.py
@@ -29,21 +29,21 @@ if (assetIdString.endswith(':528cca58') is False):
print ('Mock asset exists')
# These tests detect if the geom_group.fbx file turns into a number of azmodel product assets
-def test_azmodel_product(generatedModelAssetPath, expectedSubId):
+def test_azmodel_product(generatedModelAssetPath):
azModelAssetType = azlmbr.math.Uuid_CreateString('{2C7477B6-69C5-45BE-8163-BCD6A275B6D8}', 0)
assetId = azlmbr.asset.AssetCatalogRequestBus(azlmbr.bus.Broadcast, 'GetAssetIdByPath', generatedModelAssetPath, azModelAssetType, False)
assetIdString = assetId.to_string()
- if (assetIdString.endswith(':' + expectedSubId) is False):
- raise_and_stop(f'Asset at path {generatedModelAssetPath} has unexpected asset ID ({assetIdString}) for ({generatedModelAssetPath}), expected {expectedSubId}!')
+ if (assetId.is_valid()):
+ print(f'AssetId found for asset ({generatedModelAssetPath}) found')
else:
- print(f'Expected subId for asset ({generatedModelAssetPath}) found')
+ raise_and_stop(f'Asset at path {generatedModelAssetPath} has unexpected asset ID ({assetIdString})!')
-test_azmodel_product('gem/pythontests/pythonassetbuilder/geom_group_fbx_cube_100cm_z_positive.azmodel', '1024be55')
-test_azmodel_product('gem/pythontests/pythonassetbuilder/geom_group_fbx_cube_100cm_z_negative.azmodel', '1052c94e')
-test_azmodel_product('gem/pythontests/pythonassetbuilder/geom_group_fbx_cube_100cm_y_positive.azmodel', '10130556')
-test_azmodel_product('gem/pythontests/pythonassetbuilder/geom_group_fbx_cube_100cm_y_negative.azmodel', '1065724d')
-test_azmodel_product('gem/pythontests/pythonassetbuilder/geom_group_fbx_cube_100cm_x_positive.azmodel', '10d16e68')
-test_azmodel_product('gem/pythontests/pythonassetbuilder/geom_group_fbx_cube_100cm_x_negative.azmodel', '10a71973')
-test_azmodel_product('gem/pythontests/pythonassetbuilder/geom_group_fbx_cube_100cm_center.azmodel', '10412075')
+test_azmodel_product('gem/pythontests/pythonassetbuilder/geom_group_fbx_cube_100cm_z_positive_1.azmodel')
+test_azmodel_product('gem/pythontests/pythonassetbuilder/geom_group_fbx_cube_100cm_z_negative_1.azmodel')
+test_azmodel_product('gem/pythontests/pythonassetbuilder/geom_group_fbx_cube_100cm_y_positive_1.azmodel')
+test_azmodel_product('gem/pythontests/pythonassetbuilder/geom_group_fbx_cube_100cm_y_negative_1.azmodel')
+test_azmodel_product('gem/pythontests/pythonassetbuilder/geom_group_fbx_cube_100cm_x_positive_1.azmodel')
+test_azmodel_product('gem/pythontests/pythonassetbuilder/geom_group_fbx_cube_100cm_x_negative_1.azmodel')
+test_azmodel_product('gem/pythontests/pythonassetbuilder/geom_group_fbx_cube_100cm_center_1.azmodel')
azlmbr.editor.EditorToolsApplicationRequestBus(azlmbr.bus.Broadcast, 'ExitNoPrompt')
diff --git a/AutomatedTesting/Gem/PythonTests/PythonAssetBuilder/CMakeLists.txt b/AutomatedTesting/Gem/PythonTests/PythonAssetBuilder/CMakeLists.txt
index 9b6542b3e3..905470e08f 100644
--- a/AutomatedTesting/Gem/PythonTests/PythonAssetBuilder/CMakeLists.txt
+++ b/AutomatedTesting/Gem/PythonTests/PythonAssetBuilder/CMakeLists.txt
@@ -12,7 +12,6 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED AND PAL_TRAIT_BUILD_HOST_TOOLS)
TEST_SUITE periodic
TEST_SERIAL
PATH ${CMAKE_CURRENT_LIST_DIR}
- TIMEOUT 1500
RUNTIME_DEPENDENCIES
Legacy::Editor
AZ::AssetProcessor
diff --git a/AutomatedTesting/Gem/PythonTests/WhiteBox/CMakeLists.txt b/AutomatedTesting/Gem/PythonTests/WhiteBox/CMakeLists.txt
index b5fcfcc44c..1c7a02862d 100644
--- a/AutomatedTesting/Gem/PythonTests/WhiteBox/CMakeLists.txt
+++ b/AutomatedTesting/Gem/PythonTests/WhiteBox/CMakeLists.txt
@@ -12,7 +12,6 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED AND PAL_TRAIT_BUILD_HOST_TOOLS)
TEST_SUITE main
TEST_SERIAL
PATH ${CMAKE_CURRENT_LIST_DIR}/TestSuite_Active.py
- TIMEOUT 1500
RUNTIME_DEPENDENCIES
Legacy::Editor
AZ::AssetProcessor
diff --git a/AutomatedTesting/Gem/PythonTests/assetpipeline/asset_processor_tests/CMakeLists.txt b/AutomatedTesting/Gem/PythonTests/assetpipeline/asset_processor_tests/CMakeLists.txt
index 8b9de91906..3d7a9204e2 100644
--- a/AutomatedTesting/Gem/PythonTests/assetpipeline/asset_processor_tests/CMakeLists.txt
+++ b/AutomatedTesting/Gem/PythonTests/assetpipeline/asset_processor_tests/CMakeLists.txt
@@ -92,17 +92,17 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED AND PAL_TRAIT_BUILD_HOST_TOOLS)
AZ::AssetProcessor
)
- ly_add_pytest(
- NAME AssetPipelineTests.AssetBundler
- PATH ${CMAKE_CURRENT_LIST_DIR}/asset_bundler_batch_tests.py
- EXCLUDE_TEST_RUN_TARGET_FROM_IDE
- TEST_SERIAL
- TIMEOUT 1500
- TEST_SUITE periodic
- RUNTIME_DEPENDENCIES
- AZ::AssetProcessor
- AZ::AssetBundlerBatch
- )
+ # Issue #3017
+ #ly_add_pytest(
+ # NAME AssetPipelineTests.AssetBundler
+ # PATH ${CMAKE_CURRENT_LIST_DIR}/asset_bundler_batch_tests.py
+ # EXCLUDE_TEST_RUN_TARGET_FROM_IDE
+ # TEST_SERIAL
+ # TEST_SUITE periodic
+ # RUNTIME_DEPENDENCIES
+ # AZ::AssetProcessor
+ # AZ::AssetBundlerBatch
+ #)
ly_add_pytest(
NAME AssetPipelineTests.AssetBundler_SandBox
@@ -111,7 +111,6 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED AND PAL_TRAIT_BUILD_HOST_TOOLS)
PYTEST_MARKS "SUITE_sandbox" # run only sandbox tests in this file
EXCLUDE_TEST_RUN_TARGET_FROM_IDE
TEST_SERIAL
- TIMEOUT 1500
RUNTIME_DEPENDENCIES
AZ::AssetProcessor
AZ::AssetBundlerBatch
@@ -133,7 +132,6 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED AND PAL_TRAIT_BUILD_HOST_TOOLS)
PATH ${CMAKE_CURRENT_LIST_DIR}/missing_dependency_tests.py
EXCLUDE_TEST_RUN_TARGET_FROM_IDE
TEST_SERIAL
- TIMEOUT 1500
TEST_SUITE periodic
RUNTIME_DEPENDENCIES
AZ::AssetProcessorBatch
diff --git a/AutomatedTesting/Gem/PythonTests/assetpipeline/asset_processor_tests/asset_builder_tests.py b/AutomatedTesting/Gem/PythonTests/assetpipeline/asset_processor_tests/asset_builder_tests.py
index 13b899dfdd..2c805f0291 100755
--- a/AutomatedTesting/Gem/PythonTests/assetpipeline/asset_processor_tests/asset_builder_tests.py
+++ b/AutomatedTesting/Gem/PythonTests/assetpipeline/asset_processor_tests/asset_builder_tests.py
@@ -113,7 +113,7 @@ class TestsAssetBuilder_WindowsAndMac(object):
if listening_port:
corrupted_slice_command.append(f'-port={listening_port}')
if workspace.project:
- corrupted_slice_command.append(f'-gamename={workspace.project}')
+ corrupted_slice_command.append(f'--project-path={workspace.project}')
corrupted_slice_output = utils.safe_subprocess(corrupted_slice_command)
# Verify corrupted slice produced error
diff --git a/AutomatedTesting/Gem/PythonTests/assetpipeline/asset_processor_tests/asset_bundler_batch_tests.py b/AutomatedTesting/Gem/PythonTests/assetpipeline/asset_processor_tests/asset_bundler_batch_tests.py
index 768dd985fd..7f85e5e317 100755
--- a/AutomatedTesting/Gem/PythonTests/assetpipeline/asset_processor_tests/asset_bundler_batch_tests.py
+++ b/AutomatedTesting/Gem/PythonTests/assetpipeline/asset_processor_tests/asset_bundler_batch_tests.py
@@ -902,7 +902,7 @@ class TestsAssetBundlerBatch_WindowsAndMac(object):
second_input_arg = asset_lists_to_string(second_asset_list) # --secondAssetList
output_arg = asset_lists_to_string(output_file) # --output
- def generate_compare_command(platform_arg: str) -> object:
+ def generate_compare_command(platform_arg: str, project_name : str) -> object:
"""Creates a string containing a full Compare command. This string can be executed as-is."""
cmd = [helper["bundler_batch"], "compare", f"--firstassetFile={first_input_arg}", f"--output={output_arg}"]
if platform_arg is not None:
@@ -918,6 +918,8 @@ class TestsAssetBundlerBatch_WindowsAndMac(object):
if comp_type == "4":
# Extra arguments for pattern comparison
cmd.extend([f"--filePatternType={pattern_type}", f"--filePattern={pattern}"])
+ if workspace.project:
+ cmd.append(f'--project-path={project_name}')
return cmd
# End generate_compare_command()
@@ -936,6 +938,7 @@ class TestsAssetBundlerBatch_WindowsAndMac(object):
# End verify_asset_list_contents()
def run_compare_command_and_verify(platform_arg: str, expect_pc_output: bool, expect_mac_output: bool) -> None:
+
# Expected asset list to equal result of comparison
expected_pc_asset_list = None
expected_mac_asset_list = None
@@ -957,7 +960,7 @@ class TestsAssetBundlerBatch_WindowsAndMac(object):
output_mac_asset_list = helper.platform_file_name(last_output_arg, platform)
# Build execution command
- cmd = generate_compare_command(platform_arg)
+ cmd = generate_compare_command(platform_arg, workspace.project)
# Execute command
subprocess.check_call(cmd)
@@ -992,10 +995,12 @@ class TestsAssetBundlerBatch_WindowsAndMac(object):
f"--comparisonRulesFile={rule_file}",
f"--comparisonType={args[1]}",
r"--addComparison",
+ f"--project-path={workspace.project}",
]
if args[1] == "4":
# If pattern comparison, append a few extra arguments
cmd.extend(["--filePatternType=0", "--filePattern=*.dat"])
+
subprocess.check_call(cmd)
assert os.path.exists(rule_file), f"Rule file {args[0]} was not created at location: {rule_file}"
diff --git a/AutomatedTesting/Gem/PythonTests/atom_renderer/CMakeLists.txt b/AutomatedTesting/Gem/PythonTests/atom_renderer/CMakeLists.txt
index a342d95d98..f056623ecd 100644
--- a/AutomatedTesting/Gem/PythonTests/atom_renderer/CMakeLists.txt
+++ b/AutomatedTesting/Gem/PythonTests/atom_renderer/CMakeLists.txt
@@ -17,7 +17,7 @@ if(PAL_TRAIT_BUILD_HOST_TOOLS AND PAL_TRAIT_BUILD_TESTS_SUPPORTED AND AutomatedT
TEST_SUITE main
PATH ${CMAKE_CURRENT_LIST_DIR}/test_Atom_MainSuite.py
TEST_SERIAL
- TIMEOUT 400
+ TIMEOUT 600
RUNTIME_DEPENDENCIES
AssetProcessor
AutomatedTesting.Assets
@@ -39,7 +39,7 @@ if(PAL_TRAIT_BUILD_HOST_TOOLS AND PAL_TRAIT_BUILD_TESTS_SUPPORTED AND AutomatedT
TEST_SUITE main
TEST_REQUIRES gpu
TEST_SERIAL
- TIMEOUT 800
+ TIMEOUT 1200
PATH ${CMAKE_CURRENT_LIST_DIR}/test_Atom_GPUTests.py
RUNTIME_DEPENDENCIES
AssetProcessor
diff --git a/AutomatedTesting/Gem/PythonTests/atom_renderer/atom_hydra_scripts/hydra_AtomEditorComponents_AddedToEntity.py b/AutomatedTesting/Gem/PythonTests/atom_renderer/atom_hydra_scripts/hydra_AtomEditorComponents_AddedToEntity.py
index b4031d2ffa..cd10caf57b 100644
--- a/AutomatedTesting/Gem/PythonTests/atom_renderer/atom_hydra_scripts/hydra_AtomEditorComponents_AddedToEntity.py
+++ b/AutomatedTesting/Gem/PythonTests/atom_renderer/atom_hydra_scripts/hydra_AtomEditorComponents_AddedToEntity.py
@@ -206,8 +206,8 @@ def run():
# PostFX Layer Component
ComponentTests("PostFX Layer")
- # Radius Weight Modifier Component
- ComponentTests("Radius Weight Modifier")
+ # PostFX Radius Weight Modifier Component
+ ComponentTests("PostFX Radius Weight Modifier")
# Light Component
ComponentTests("Light")
diff --git a/AutomatedTesting/Gem/PythonTests/atom_renderer/atom_hydra_scripts/hydra_AtomEditorComponents_LightComponent.py b/AutomatedTesting/Gem/PythonTests/atom_renderer/atom_hydra_scripts/hydra_AtomEditorComponents_LightComponent.py
new file mode 100644
index 0000000000..24866f3b19
--- /dev/null
+++ b/AutomatedTesting/Gem/PythonTests/atom_renderer/atom_hydra_scripts/hydra_AtomEditorComponents_LightComponent.py
@@ -0,0 +1,217 @@
+"""
+Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
+
+SPDX-License-Identifier: Apache-2.0 OR MIT
+
+Hydra script that creates an entity, attaches the Light component to it for test verifications.
+The test verifies that each light type option is available and can be selected without errors.
+"""
+
+import os
+import sys
+
+import azlmbr.bus as bus
+import azlmbr.editor as editor
+import azlmbr.math as math
+import azlmbr.paths
+import azlmbr.legacy.general as general
+
+sys.path.append(os.path.join(azlmbr.paths.devassets, "Gem", "PythonTests"))
+
+import editor_python_test_tools.hydra_editor_utils as hydra
+from atom_renderer.atom_utils.atom_constants import LIGHT_TYPES
+
+LIGHT_TYPE_PROPERTY = 'Controller|Configuration|Light type'
+SPHERE_AND_SPOT_DISK_LIGHT_PROPERTIES = [
+ ("Controller|Configuration|Shadows|Enable shadow", True),
+ ("Controller|Configuration|Shadows|Shadowmap size", 0), # 256
+ ("Controller|Configuration|Shadows|Shadowmap size", 1), # 512
+ ("Controller|Configuration|Shadows|Shadowmap size", 2), # 1024
+ ("Controller|Configuration|Shadows|Shadowmap size", 3), # 2048
+ ("Controller|Configuration|Shadows|Shadow filter method", 1), # PCF
+ ("Controller|Configuration|Shadows|Filtering sample count", 4.0),
+ ("Controller|Configuration|Shadows|Filtering sample count", 64.0),
+ ("Controller|Configuration|Shadows|PCF method", 0), # Bicubic
+ ("Controller|Configuration|Shadows|PCF method", 1), # Boundary search
+ ("Controller|Configuration|Shadows|Shadow filter method", 2), # ECM
+ ("Controller|Configuration|Shadows|ESM exponent", 50),
+ ("Controller|Configuration|Shadows|ESM exponent", 5000),
+ ("Controller|Configuration|Shadows|Shadow filter method", 3), # ESM+PCF
+]
+QUAD_LIGHT_PROPERTIES = [
+ ("Controller|Configuration|Both directions", True),
+ ("Controller|Configuration|Fast approximation", True),
+]
+SIMPLE_POINT_LIGHT_PROPERTIES = [
+ ("Controller|Configuration|Attenuation radius|Mode", 0),
+ ("Controller|Configuration|Attenuation radius|Radius", 100.0),
+]
+SIMPLE_SPOT_LIGHT_PROPERTIES = [
+ ("Controller|Configuration|Shutters|Inner angle", 45.0),
+ ("Controller|Configuration|Shutters|Outer angle", 90.0),
+]
+
+
+def verify_required_component_property_value(entity_name, component, property_path, expected_property_value):
+ """
+ Compares the property value of component against the expected_property_value.
+ :param entity_name: name of the entity to use (for test verification purposes).
+ :param component: component to check on a given entity for its current property value.
+ :param property_path: the path to the property inside the component.
+ :param expected_property_value: The value expected from the value inside property_path.
+ :return: None, but prints to general.log() which the test uses to verify against.
+ """
+ property_value = editor.EditorComponentAPIBus(
+ bus.Broadcast, "GetComponentProperty", component, property_path).GetValue()
+ general.log(f"{entity_name}_test: Property value is {property_value} "
+ f"which matches {expected_property_value}")
+
+
+def run():
+ """
+ Test Case - Light Component
+ 1. Creates a "light_entity" Entity and attaches a "Light" component to it.
+ 2. Updates the Light component to each light type option from the LIGHT_TYPES constant.
+ 3. The test will check the Editor log to ensure each light type was selected.
+ 4. Prints the string "Light component test (non-GPU) completed" after completion.
+
+ Tests will fail immediately if any of these log lines are found:
+ 1. Trace::Assert
+ 2. Trace::Error
+ 3. Traceback (most recent call last):
+
+ :return: None
+ """
+ # Create a "light_entity" entity with "Light" component.
+ light_entity_name = "light_entity"
+ light_component = "Light"
+ light_entity = hydra.Entity(light_entity_name)
+ light_entity.create_entity(math.Vector3(-1.0, -2.0, 3.0), [light_component])
+ general.log(
+ f"{light_entity_name}_test: Component added to the entity: "
+ f"{hydra.has_components(light_entity.id, [light_component])}")
+
+ # Populate the light_component_id_pair value so that it can be used to select all Light component options.
+ light_component_id_pair = None
+ component_type_id_list = azlmbr.editor.EditorComponentAPIBus(
+ azlmbr.bus.Broadcast, 'FindComponentTypeIdsByEntityType', [light_component], 0)
+ if len(component_type_id_list) < 1:
+ general.log(f"ERROR: A component class with name {light_component} doesn't exist")
+ light_component_id_pair = None
+ elif len(component_type_id_list) > 1:
+ general.log(f"ERROR: Found more than one component classes with same name: {light_component}")
+ light_component_id_pair = None
+ entity_component_id_pair = azlmbr.editor.EditorComponentAPIBus(
+ azlmbr.bus.Broadcast, 'GetComponentOfType', light_entity.id, component_type_id_list[0])
+ if entity_component_id_pair.IsSuccess():
+ light_component_id_pair = entity_component_id_pair.GetValue()
+
+ # Test each Light component option can be selected and it's properties updated.
+ # Point (sphere) light type checks.
+ light_type_property_test(
+ light_type=LIGHT_TYPES['sphere'],
+ light_properties=SPHERE_AND_SPOT_DISK_LIGHT_PROPERTIES,
+ light_component_id_pair=light_component_id_pair,
+ light_entity_name=light_entity_name,
+ light_entity=light_entity
+ )
+
+ # Spot (disk) light type checks.
+ light_type_property_test(
+ light_type=LIGHT_TYPES['spot_disk'],
+ light_properties=SPHERE_AND_SPOT_DISK_LIGHT_PROPERTIES,
+ light_component_id_pair=light_component_id_pair,
+ light_entity_name=light_entity_name,
+ light_entity=light_entity
+ )
+
+ # Capsule light type checks.
+ azlmbr.editor.EditorComponentAPIBus(
+ azlmbr.bus.Broadcast,
+ 'SetComponentProperty',
+ light_component_id_pair,
+ LIGHT_TYPE_PROPERTY,
+ LIGHT_TYPES['capsule']
+ )
+ verify_required_component_property_value(
+ entity_name=light_entity_name,
+ component=light_entity.components[0],
+ property_path=LIGHT_TYPE_PROPERTY,
+ expected_property_value=LIGHT_TYPES['capsule']
+ )
+
+ # Quad light type checks.
+ light_type_property_test(
+ light_type=LIGHT_TYPES['quad'],
+ light_properties=QUAD_LIGHT_PROPERTIES,
+ light_component_id_pair=light_component_id_pair,
+ light_entity_name=light_entity_name,
+ light_entity=light_entity
+ )
+
+ # Polygon light type checks.
+ azlmbr.editor.EditorComponentAPIBus(
+ azlmbr.bus.Broadcast,
+ 'SetComponentProperty',
+ light_component_id_pair,
+ LIGHT_TYPE_PROPERTY,
+ LIGHT_TYPES['polygon']
+ )
+ verify_required_component_property_value(
+ entity_name=light_entity_name,
+ component=light_entity.components[0],
+ property_path=LIGHT_TYPE_PROPERTY,
+ expected_property_value=LIGHT_TYPES['polygon']
+ )
+
+ # Point (simple punctual) light type checks.
+ light_type_property_test(
+ light_type=LIGHT_TYPES['simple_point'],
+ light_properties=SIMPLE_POINT_LIGHT_PROPERTIES,
+ light_component_id_pair=light_component_id_pair,
+ light_entity_name=light_entity_name,
+ light_entity=light_entity
+ )
+
+ # Spot (simple punctual) light type checks.
+ light_type_property_test(
+ light_type=LIGHT_TYPES['simple_spot'],
+ light_properties=SIMPLE_SPOT_LIGHT_PROPERTIES,
+ light_component_id_pair=light_component_id_pair,
+ light_entity_name=light_entity_name,
+ light_entity=light_entity
+ )
+
+ general.log("Light component test (non-GPU) completed.")
+
+
+def light_type_property_test(light_type, light_properties, light_component_id_pair, light_entity_name, light_entity):
+ """
+ Updates the current light type and modifies its properties, then verifies they are accurate to what was set.
+ :param light_type: The type of light to update, must match a value in LIGHT_TYPES
+ :param light_properties: List of tuples detailing properties to modify with update values.
+ :param light_component_id_pair: Entity + component ID pair for updating the light component on a given entity.
+ :param light_entity_name: the name of the Entity holding the light component.
+ :param light_entity: the Entity object containing the light component.
+ :return: None
+ """
+ azlmbr.editor.EditorComponentAPIBus(
+ azlmbr.bus.Broadcast,
+ 'SetComponentProperty',
+ light_component_id_pair,
+ LIGHT_TYPE_PROPERTY,
+ light_type
+ )
+ verify_required_component_property_value(
+ entity_name=light_entity_name,
+ component=light_entity.components[0],
+ property_path=LIGHT_TYPE_PROPERTY,
+ expected_property_value=light_type
+ )
+
+ for light_property in light_properties:
+ light_entity.get_set_test(0, light_property[0], light_property[1])
+
+
+if __name__ == "__main__":
+ run()
diff --git a/AutomatedTesting/Gem/PythonTests/atom_renderer/atom_hydra_scripts/hydra_AtomMaterialEditor_BasicTests.py b/AutomatedTesting/Gem/PythonTests/atom_renderer/atom_hydra_scripts/hydra_AtomMaterialEditor_BasicTests.py
new file mode 100644
index 0000000000..b3c51ca912
--- /dev/null
+++ b/AutomatedTesting/Gem/PythonTests/atom_renderer/atom_hydra_scripts/hydra_AtomMaterialEditor_BasicTests.py
@@ -0,0 +1,183 @@
+"""
+Copyright (c) Contributors to the Open 3D Engine Project.
+For complete copyright and license terms please see the LICENSE at the root of this distribution.
+
+SPDX-License-Identifier: Apache-2.0 OR MIT
+
+import azlmbr.materialeditor will fail with a ModuleNotFound error when using this script with Editor.exe
+This is because azlmbr.materialeditor only binds to MaterialEditor.exe and not Editor.exe
+You need to launch this script with MaterialEditor.exe in order for azlmbr.materialeditor to appear.
+"""
+
+import os
+import sys
+import time
+
+import azlmbr.math as math
+import azlmbr.paths
+
+sys.path.append(os.path.join(azlmbr.paths.devassets, "Gem", "PythonTests"))
+
+import atom_renderer.atom_utils.material_editor_utils as material_editor
+
+NEW_MATERIAL = "test_material.material"
+NEW_MATERIAL_1 = "test_material_1.material"
+NEW_MATERIAL_2 = "test_material_2.material"
+TEST_MATERIAL_1 = "001_DefaultWhite.material"
+TEST_MATERIAL_2 = "002_BaseColorLerp.material"
+TEST_MATERIAL_3 = "003_MetalMatte.material"
+TEST_DATA_PATH = os.path.join(
+ azlmbr.paths.devroot, "Gems", "Atom", "TestData", "TestData", "Materials", "StandardPbrTestCases"
+)
+MATERIAL_TYPE_PATH = os.path.join(
+ azlmbr.paths.devroot, "Gems", "Atom", "Feature", "Common", "Assets",
+ "Materials", "Types", "StandardPBR.materialtype",
+)
+
+
+def run():
+ """
+ Summary:
+ Material Editor basic tests including the below
+ 1. Opening an Existing Asset
+ 2. Creating a New Asset
+ 3. Closing Selected Material
+ 4. Closing All Materials
+ 5. Closing all but Selected Material
+ 6. Saving Material
+ 7. Saving as a New Material
+ 8. Saving as a Child Material
+ 9. Saving all Open Materials
+
+ Expected Result:
+ All the above functions work as expected in Material Editor.
+
+ :return: None
+ """
+
+ # 1) Test Case: Opening an Existing Asset
+ document_id = material_editor.open_material(MATERIAL_TYPE_PATH)
+ print(f"Material opened: {material_editor.is_open(document_id)}")
+
+ # Verify if the test material exists initially
+ target_path = os.path.join(azlmbr.paths.devroot, "AutomatedTesting", "Materials", NEW_MATERIAL)
+ print(f"Test asset doesn't exist initially: {not os.path.exists(target_path)}")
+
+ # 2) Test Case: Creating a New Material Using Existing One
+ material_editor.save_document_as_child(document_id, target_path)
+ material_editor.wait_for_condition(lambda: os.path.exists(target_path), 2.0)
+ print(f"New asset created: {os.path.exists(target_path)}")
+
+ # Verify if the newly created document is open
+ new_document_id = material_editor.open_material(target_path)
+ material_editor.wait_for_condition(lambda: material_editor.is_open(new_document_id))
+ print(f"New Material opened: {material_editor.is_open(new_document_id)}")
+
+ # 3) Test Case: Closing Selected Material
+ print(f"Material closed: {material_editor.close_document(new_document_id)}")
+
+ # Open materials initially
+ document1_id, document2_id, document3_id = (
+ material_editor.open_material(os.path.join(TEST_DATA_PATH, material))
+ for material in [TEST_MATERIAL_1, TEST_MATERIAL_2, TEST_MATERIAL_3]
+ )
+
+ # 4) Test Case: Closing All Materials
+ print(f"All documents closed: {material_editor.close_all_documents()}")
+
+ # 5) Test Case: Closing all but Selected Material
+ document1_id, document2_id, document3_id = (
+ material_editor.open_material(os.path.join(TEST_DATA_PATH, material))
+ for material in [TEST_MATERIAL_1, TEST_MATERIAL_2, TEST_MATERIAL_3]
+ )
+ result = material_editor.close_all_except_selected(document1_id)
+ print(f"Close All Except Selected worked as expected: {result and material_editor.is_open(document1_id)}")
+
+ # 6) Test Case: Saving Material
+ document_id = material_editor.open_material(os.path.join(TEST_DATA_PATH, TEST_MATERIAL_1))
+ property_name = azlmbr.name.Name("baseColor.color")
+ initial_color = material_editor.get_property(document_id, property_name)
+ # Assign new color to the material file and save the actual material
+ expected_color = math.Color(0.25, 0.25, 0.25, 1.0)
+ material_editor.set_property(document_id, property_name, expected_color)
+ material_editor.save_document(document_id)
+
+ # 7) Test Case: Saving as a New Material
+ # Assign new color to the material file and save the document as copy
+ expected_color_1 = math.Color(0.5, 0.5, 0.5, 1.0)
+ material_editor.set_property(document_id, property_name, expected_color_1)
+ target_path_1 = os.path.join(azlmbr.paths.devroot, "AutomatedTesting", "Materials", NEW_MATERIAL_1)
+ material_editor.save_document_as_copy(document_id, target_path_1)
+ time.sleep(2.0)
+
+ # 8) Test Case: Saving as a Child Material
+ # Assign new color to the material file save the document as child
+ expected_color_2 = math.Color(0.75, 0.75, 0.75, 1.0)
+ material_editor.set_property(document_id, property_name, expected_color_2)
+ target_path_2 = os.path.join(azlmbr.paths.devroot, "AutomatedTesting", "Materials", NEW_MATERIAL_2)
+ material_editor.save_document_as_child(document_id, target_path_2)
+ time.sleep(2.0)
+
+ # Close/Reopen documents
+ material_editor.close_all_documents()
+ document_id = material_editor.open_material(os.path.join(TEST_DATA_PATH, TEST_MATERIAL_1))
+ document1_id = material_editor.open_material(target_path_1)
+ document2_id = material_editor.open_material(target_path_2)
+
+ # Verify if the changes are saved in the actual document
+ actual_color = material_editor.get_property(document_id, property_name)
+ print(f"Actual Document saved with changes: {material_editor.compare_colors(actual_color, expected_color)}")
+
+ # Verify if the changes are saved in the document saved as copy
+ actual_color = material_editor.get_property(document1_id, property_name)
+ result_copy = material_editor.compare_colors(actual_color, expected_color_1)
+ print(f"Document saved as copy is saved with changes: {result_copy}")
+
+ # Verify if the changes are saved in the document saved as child
+ actual_color = material_editor.get_property(document2_id, property_name)
+ result_child = material_editor.compare_colors(actual_color, expected_color_2)
+ print(f"Document saved as child is saved with changes: {result_child}")
+
+ # Revert back the changes in the actual document
+ material_editor.set_property(document_id, property_name, initial_color)
+ material_editor.save_document(document_id)
+ material_editor.close_all_documents()
+
+ # 9) Test Case: Saving all Open Materials
+ # Open first material and make change to the values
+ document1_id = material_editor.open_material(os.path.join(TEST_DATA_PATH, TEST_MATERIAL_1))
+ property1_name = azlmbr.name.Name("metallic.factor")
+ initial_metallic_factor = material_editor.get_property(document1_id, property1_name)
+ expected_metallic_factor = 0.444
+ material_editor.set_property(document1_id, property1_name, expected_metallic_factor)
+
+ # Open second material and make change to the values
+ document2_id = material_editor.open_material(os.path.join(TEST_DATA_PATH, TEST_MATERIAL_2))
+ property2_name = azlmbr.name.Name("baseColor.color")
+ initial_color = material_editor.get_property(document2_id, property2_name)
+ expected_color = math.Color(0.4156, 0.0196, 0.6862, 1.0)
+ material_editor.set_property(document2_id, property2_name, expected_color)
+
+ # Save all and close all documents
+ material_editor.save_all()
+ material_editor.close_all_documents()
+
+ # Reopen materials and verify values
+ document1_id = material_editor.open_material(os.path.join(TEST_DATA_PATH, TEST_MATERIAL_1))
+ result = material_editor.is_close(
+ material_editor.get_property(document1_id, property1_name), expected_metallic_factor, 0.00001
+ )
+ document2_id = material_editor.open_material(os.path.join(TEST_DATA_PATH, TEST_MATERIAL_2))
+ result = result and material_editor.compare_colors(
+ expected_color, material_editor.get_property(document2_id, property2_name))
+ print(f"Save All worked as expected: {result}")
+
+ # Revert the changes made
+ material_editor.set_property(document1_id, property1_name, initial_metallic_factor)
+ material_editor.set_property(document2_id, property2_name, initial_color)
+ material_editor.save_all()
+ material_editor.close_all_documents()
+
+
+if __name__ == "__main__":
+ run()
diff --git a/AutomatedTesting/Gem/PythonTests/atom_renderer/atom_hydra_scripts/hydra_GPUTest_AtomFeatureIntegrationBenchmark.py b/AutomatedTesting/Gem/PythonTests/atom_renderer/atom_hydra_scripts/hydra_GPUTest_AtomFeatureIntegrationBenchmark.py
index b899d7dcde..3aa9fe660c 100644
--- a/AutomatedTesting/Gem/PythonTests/atom_renderer/atom_hydra_scripts/hydra_GPUTest_AtomFeatureIntegrationBenchmark.py
+++ b/AutomatedTesting/Gem/PythonTests/atom_renderer/atom_hydra_scripts/hydra_GPUTest_AtomFeatureIntegrationBenchmark.py
@@ -93,6 +93,7 @@ def run():
general.idle_wait_frames(100)
for i in range(1, 101):
benchmarker.capture_pass_timestamp(i)
+ benchmarker.capture_cpu_frame_time(i)
general.exit_game_mode()
helper.wait_for_condition(function=lambda: not general.is_in_game_mode(), timeout_in_seconds=2.0)
general.log("Capturing complete.")
diff --git a/AutomatedTesting/Gem/PythonTests/atom_renderer/atom_hydra_scripts/hydra_GPUTest_LightComponent.py b/AutomatedTesting/Gem/PythonTests/atom_renderer/atom_hydra_scripts/hydra_GPUTest_LightComponent.py
new file mode 100644
index 0000000000..8063445608
--- /dev/null
+++ b/AutomatedTesting/Gem/PythonTests/atom_renderer/atom_hydra_scripts/hydra_GPUTest_LightComponent.py
@@ -0,0 +1,267 @@
+"""
+Copyright (c) Contributors to the Open 3D Engine Project.
+For complete copyright and license terms please see the LICENSE at the root of this distribution.
+
+SPDX-License-Identifier: Apache-2.0 OR MIT
+
+Hydra script that is used to create an entity with a Light component attached.
+It then updates the property values of the Light component and takes a screenshot.
+The screenshot is compared against an expected golden image for test verification.
+
+See the run() function for more in-depth test info.
+"""
+import os
+import sys
+
+import azlmbr.asset as asset
+import azlmbr.bus as bus
+import azlmbr.editor as editor
+import azlmbr.math as math
+import azlmbr.paths
+import azlmbr.legacy.general as general
+
+sys.path.append(os.path.join(azlmbr.paths.devroot, "AutomatedTesting", "Gem", "PythonTests"))
+
+import editor_python_test_tools.hydra_editor_utils as hydra
+from atom_renderer.atom_utils import atom_component_helper, atom_constants, screenshot_utils
+from editor_python_test_tools.editor_test_helper import EditorTestHelper
+
+helper = EditorTestHelper(log_prefix="Atom_EditorTestHelper")
+
+LEVEL_NAME = "auto_test"
+LIGHT_COMPONENT = "Light"
+LIGHT_TYPE_PROPERTY = 'Controller|Configuration|Light type'
+DEGREE_RADIAN_FACTOR = 0.0174533
+
+
+def run():
+ """
+ Sets up the tests by making sure the required level is created & setup correctly.
+ It then executes 2 test cases - see each associated test function's docstring for more info.
+
+ Finally prints the string "Light component tests completed" after completion
+
+ Tests will fail immediately if any of these log lines are found:
+ 1. Trace::Assert
+ 2. Trace::Error
+ 3. Traceback (most recent call last):
+
+ :return: None
+ """
+ atom_component_helper.create_basic_atom_level(level_name=LEVEL_NAME)
+
+ # Run tests.
+ area_light_test()
+ spot_light_test()
+ general.log("Light component tests completed.")
+
+
+def area_light_test():
+ """
+ Basic test for the "Light" component attached to an "area_light" entity.
+
+ Test Case - Light Component: Capsule, Spot (disk), and Point (sphere):
+ 1. Creates "area_light" entity w/ a Light component that has a Capsule Light type w/ the color set to 255, 0, 0
+ 2. Enters game mode to take a screenshot for comparison, then exits game mode.
+ 3. Sets the Light component Intensity Mode to Lumens (default).
+ 4. Ensures the Light component Mode is Automatic (default).
+ 5. Sets the Intensity value of the Light component to 0.0
+ 6. Enters game mode again, takes another screenshot for comparison, then exits game mode.
+ 7. Updates the Intensity value of the Light component to 1000.0
+ 8. Enters game mode again, takes another screenshot for comparison, then exits game mode.
+ 9. Swaps the Capsule light type option to Spot (disk) light type on the Light component
+ 10. Updates "area_light" entity Transform rotate value to x: 90.0, y:0.0, z:0.0
+ 11. Enters game mode again, takes another screenshot for comparison, then exits game mode.
+ 12. Swaps the Spot (disk) light type for the Point (sphere) light type in the Light component.
+ 13. Enters game mode again, takes another screenshot for comparison, then exits game mode.
+ 14. Deletes the Light component from the "area_light" entity and verifies its successful.
+ """
+ # Create an "area_light" entity with "Light" component using Light type of "Capsule"
+ area_light_entity_name = "area_light"
+ area_light = hydra.Entity(area_light_entity_name)
+ area_light.create_entity(math.Vector3(-1.0, -2.0, 3.0), [LIGHT_COMPONENT])
+ general.log(
+ f"{area_light_entity_name}_test: Component added to the entity: "
+ f"{hydra.has_components(area_light.id, [LIGHT_COMPONENT])}")
+ light_component_id_pair = hydra.attach_component_to_entity(area_light.id, LIGHT_COMPONENT)
+
+ # Select the "Capsule" light type option.
+ azlmbr.editor.EditorComponentAPIBus(
+ azlmbr.bus.Broadcast,
+ 'SetComponentProperty',
+ light_component_id_pair,
+ LIGHT_TYPE_PROPERTY,
+ atom_constants.LIGHT_TYPES['capsule']
+ )
+
+ # Update color and take screenshot in game mode
+ color = math.Color(255.0, 0.0, 0.0, 0.0)
+ area_light.get_set_test(0, "Controller|Configuration|Color", color)
+ general.idle_wait(1.0)
+ screenshot_utils.take_screenshot_game_mode("AreaLight_1", area_light_entity_name)
+
+ # Update intensity value to 0.0 and take screenshot in game mode
+ area_light.get_set_test(0, "Controller|Configuration|Attenuation Radius|Mode", 1)
+ area_light.get_set_test(0, "Controller|Configuration|Intensity", 0.0)
+ general.idle_wait(1.0)
+ screenshot_utils.take_screenshot_game_mode("AreaLight_2", area_light_entity_name)
+
+ # Update intensity value to 1000.0 and take screenshot in game mode
+ area_light.get_set_test(0, "Controller|Configuration|Intensity", 1000.0)
+ general.idle_wait(1.0)
+ screenshot_utils.take_screenshot_game_mode("AreaLight_3", area_light_entity_name)
+
+ # Swap the "Capsule" light type option to "Spot (disk)" light type
+ azlmbr.editor.EditorComponentAPIBus(
+ azlmbr.bus.Broadcast,
+ 'SetComponentProperty',
+ light_component_id_pair,
+ LIGHT_TYPE_PROPERTY,
+ atom_constants.LIGHT_TYPES['spot_disk']
+ )
+ area_light_rotation = math.Vector3(DEGREE_RADIAN_FACTOR * 90.0, 0.0, 0.0)
+ azlmbr.components.TransformBus(azlmbr.bus.Event, "SetLocalRotation", area_light.id, area_light_rotation)
+ general.idle_wait(1.0)
+ screenshot_utils.take_screenshot_game_mode("AreaLight_4", area_light_entity_name)
+
+ # Swap the "Spot (disk)" light type to the "Point (sphere)" light type and take screenshot.
+ azlmbr.editor.EditorComponentAPIBus(
+ azlmbr.bus.Broadcast,
+ 'SetComponentProperty',
+ light_component_id_pair,
+ LIGHT_TYPE_PROPERTY,
+ atom_constants.LIGHT_TYPES['sphere']
+ )
+ general.idle_wait(1.0)
+ screenshot_utils.take_screenshot_game_mode("AreaLight_5", area_light_entity_name)
+
+ editor.ToolsApplicationRequestBus(bus.Broadcast, "DeleteEntityById", area_light.id)
+
+
+def spot_light_test():
+ """
+ Basic test for the Light component attached to a "spot_light" entity.
+
+ Test Case - Light Component: Spot (disk) with shadows & colors:
+ 1. Creates "spot_light" entity w/ a Light component attached to it.
+ 2. Selects the "directional_light" entity already present in the level and disables it.
+ 3. Selects the "global_skylight" entity already present in the level and disables the HDRi Skybox component,
+ as well as the Global Skylight (IBL) component.
+ 4. Enters game mode to take a screenshot for comparison, then exits game mode.
+ 5. Selects the "ground_plane" entity and changes updates the material to a new material.
+ 6. Enters game mode to take a screenshot for comparison, then exits game mode.
+ 7. Selects the "spot_light" entity and increases the Light component Intensity to 800 lm
+ 8. Enters game mode to take a screenshot for comparison, then exits game mode.
+ 9. Selects the "spot_light" entity and sets the Light component Color to 47, 75, 37
+ 10. Enters game mode to take a screenshot for comparison, then exits game mode.
+ 11. Selects the "spot_light" entity and modifies the Shutter controls to the following values:
+ - Enable shutters: True
+ - Inner Angle: 60.0
+ - Outer Angle: 75.0
+ 12. Enters game mode to take a screenshot for comparison, then exits game mode.
+ 13. Selects the "spot_light" entity and modifies the Shadow controls to the following values:
+ - Enable Shadow: True
+ - ShadowmapSize: 256
+ 14. Modifies the world translate position of the "spot_light" entity to 0.7, -2.0, 1.9 (for casting shadows better)
+ 15. Enters game mode to take a screenshot for comparison, then exits game mode.
+ """
+ # Disable "Directional Light" component for the "directional_light" entity
+ # "directional_light" entity is created by the create_basic_atom_level() function by default.
+ directional_light_entity_id = hydra.find_entity_by_name("directional_light")
+ directional_light = hydra.Entity(name='directional_light', id=directional_light_entity_id)
+ directional_light_component_type = azlmbr.editor.EditorComponentAPIBus(
+ azlmbr.bus.Broadcast, 'FindComponentTypeIdsByEntityType', ["Directional Light"], 0)[0]
+ directional_light_component = azlmbr.editor.EditorComponentAPIBus(
+ azlmbr.bus.Broadcast, 'GetComponentOfType', directional_light.id, directional_light_component_type
+ ).GetValue()
+ editor.EditorComponentAPIBus(bus.Broadcast, "DisableComponents", [directional_light_component])
+ general.idle_wait(0.5)
+
+ # Disable "Global Skylight (IBL)" and "HDRi Skybox" components for the "global_skylight" entity
+ global_skylight_entity_id = hydra.find_entity_by_name("global_skylight")
+ global_skylight = hydra.Entity(name='global_skylight', id=global_skylight_entity_id)
+ global_skylight_component_type = azlmbr.editor.EditorComponentAPIBus(
+ azlmbr.bus.Broadcast, 'FindComponentTypeIdsByEntityType', ["Global Skylight (IBL)"], 0)[0]
+ global_skylight_component = azlmbr.editor.EditorComponentAPIBus(
+ azlmbr.bus.Broadcast, 'GetComponentOfType', global_skylight.id, global_skylight_component_type
+ ).GetValue()
+ editor.EditorComponentAPIBus(bus.Broadcast, "DisableComponents", [global_skylight_component])
+ hdri_skybox_component_type = azlmbr.editor.EditorComponentAPIBus(
+ azlmbr.bus.Broadcast, 'FindComponentTypeIdsByEntityType', ["HDRi Skybox"], 0)[0]
+ hdri_skybox_component = azlmbr.editor.EditorComponentAPIBus(
+ azlmbr.bus.Broadcast, 'GetComponentOfType', global_skylight.id, hdri_skybox_component_type
+ ).GetValue()
+ editor.EditorComponentAPIBus(bus.Broadcast, "DisableComponents", [hdri_skybox_component])
+ general.idle_wait(0.5)
+
+ # Create a "spot_light" entity with "Light" component using Light Type of "Spot (disk)"
+ spot_light_entity_name = "spot_light"
+ spot_light = hydra.Entity(spot_light_entity_name)
+ spot_light.create_entity(math.Vector3(0.7, -2.0, 1.0), [LIGHT_COMPONENT])
+ general.log(
+ f"{spot_light_entity_name}_test: Component added to the entity: "
+ f"{hydra.has_components(spot_light.id, [LIGHT_COMPONENT])}")
+ rotation = math.Vector3(DEGREE_RADIAN_FACTOR * 300.0, 0.0, 0.0)
+ azlmbr.components.TransformBus(azlmbr.bus.Event, "SetLocalRotation", spot_light.id, rotation)
+ light_component_type = hydra.attach_component_to_entity(spot_light.id, LIGHT_COMPONENT)
+ editor.EditorComponentAPIBus(
+ azlmbr.bus.Broadcast,
+ 'SetComponentProperty',
+ light_component_type,
+ LIGHT_TYPE_PROPERTY,
+ atom_constants.LIGHT_TYPES['spot_disk']
+ )
+
+ general.idle_wait(1.0)
+ screenshot_utils.take_screenshot_game_mode("SpotLight_1", spot_light_entity_name)
+
+ # Change default material of ground plane entity and take screenshot
+ ground_plane_entity_id = hydra.find_entity_by_name("ground_plane")
+ ground_plane = hydra.Entity(name='ground_plane', id=ground_plane_entity_id)
+ ground_plane_asset_path = os.path.join("Materials", "Presets", "MacBeth", "22_neutral_5-0_0-70d.azmaterial")
+ ground_plane_asset_value = asset.AssetCatalogRequestBus(
+ bus.Broadcast, "GetAssetIdByPath", ground_plane_asset_path, math.Uuid(), False)
+ material_property_path = "Default Material|Material Asset"
+ material_component_type = azlmbr.editor.EditorComponentAPIBus(
+ azlmbr.bus.Broadcast, 'FindComponentTypeIdsByEntityType', ["Material"], 0)[0]
+ material_component = azlmbr.editor.EditorComponentAPIBus(
+ azlmbr.bus.Broadcast, 'GetComponentOfType', ground_plane.id, material_component_type).GetValue()
+ editor.EditorComponentAPIBus(
+ azlmbr.bus.Broadcast,
+ 'SetComponentProperty',
+ material_component,
+ material_property_path,
+ ground_plane_asset_value
+ )
+ general.idle_wait(1.0)
+ screenshot_utils.take_screenshot_game_mode("SpotLight_2", spot_light_entity_name)
+
+ # Increase intensity value of the Spot light and take screenshot in game mode
+ spot_light.get_set_test(0, "Controller|Configuration|Intensity", 800.0)
+ general.idle_wait(1.0)
+ screenshot_utils.take_screenshot_game_mode("SpotLight_3", spot_light_entity_name)
+
+ # Update the Spot light color and take screenshot in game mode
+ color_value = math.Color(47.0 / 255.0, 75.0 / 255.0, 37.0 / 255.0, 255.0 / 255.0)
+ spot_light.get_set_test(0, "Controller|Configuration|Color", color_value)
+ general.idle_wait(1.0)
+ screenshot_utils.take_screenshot_game_mode("SpotLight_4", spot_light_entity_name)
+
+ # Update the Shutter controls of the Light component and take screenshot
+ spot_light.get_set_test(0, "Controller|Configuration|Shutters|Enable shutters", True)
+ spot_light.get_set_test(0, "Controller|Configuration|Shutters|Inner angle", 60.0)
+ spot_light.get_set_test(0, "Controller|Configuration|Shutters|Outer angle", 75.0)
+ general.idle_wait(1.0)
+ screenshot_utils.take_screenshot_game_mode("SpotLight_5", spot_light_entity_name)
+
+ # Update the Shadow controls, move the spot_light entity world translate position and take screenshot
+ spot_light.get_set_test(0, "Controller|Configuration|Shadows|Enable shadow", True)
+ spot_light.get_set_test(0, "Controller|Configuration|Shadows|Shadowmap size", 256.0)
+ azlmbr.components.TransformBus(
+ azlmbr.bus.Event, "SetWorldTranslation", spot_light.id, math.Vector3(0.7, -2.0, 1.9))
+ general.idle_wait(1.0)
+ screenshot_utils.take_screenshot_game_mode("SpotLight_6", spot_light_entity_name)
+
+
+if __name__ == "__main__":
+ run()
diff --git a/AutomatedTesting/Gem/PythonTests/atom_renderer/atom_utils/atom_component_helper.py b/AutomatedTesting/Gem/PythonTests/atom_renderer/atom_utils/atom_component_helper.py
new file mode 100644
index 0000000000..58b72ef01a
--- /dev/null
+++ b/AutomatedTesting/Gem/PythonTests/atom_renderer/atom_utils/atom_component_helper.py
@@ -0,0 +1,186 @@
+"""
+Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
+
+SPDX-License-Identifier: Apache-2.0 OR MIT
+
+File to assist with common hydra component functions used across various Atom tests.
+"""
+import os
+
+from editor_python_test_tools.editor_test_helper import EditorTestHelper
+
+helper = EditorTestHelper(log_prefix="Atom_EditorTestHelper")
+
+
+def create_basic_atom_level(level_name):
+ """
+ Creates a new level inside the Editor matching level_name & adds the following:
+ 1. "default_level" entity to hold all other entities.
+ 2. Adds Grid, Global Skylight (IBL), ground Mesh, Directional Light, Sphere w/ material+mesh, & Camera components.
+ 3. Each of these components has its settings tweaked slightly to match the ideal scene to test Atom rendering.
+ :param level_name: name of the level to create and apply this basic setup to.
+ :return: None
+ """
+ import azlmbr.asset as asset
+ import azlmbr.bus as bus
+ import azlmbr.camera as camera
+ import azlmbr.editor as editor
+ import azlmbr.entity as entity
+ import azlmbr.legacy.general as general
+ import azlmbr.math as math
+ import azlmbr.object
+
+ import editor_python_test_tools.hydra_editor_utils as hydra
+
+ # Create a new level.
+ new_level_name = level_name
+ heightmap_resolution = 512
+ heightmap_meters_per_pixel = 1
+ terrain_texture_resolution = 412
+ use_terrain = False
+
+ # Return codes are ECreateLevelResult defined in CryEdit.h
+ return_code = general.create_level_no_prompt(
+ new_level_name, heightmap_resolution, heightmap_meters_per_pixel, terrain_texture_resolution, use_terrain)
+ if return_code == 1:
+ general.log(f"{new_level_name} level already exists")
+ elif return_code == 2:
+ general.log("Failed to create directory")
+ elif return_code == 3:
+ general.log("Directory length is too long")
+ elif return_code != 0:
+ general.log("Unknown error, failed to create level")
+ else:
+ general.log(f"{new_level_name} level created successfully")
+
+ # Enable idle and update viewport.
+ general.idle_enable(True)
+ general.idle_wait(1.0)
+ general.update_viewport()
+ general.idle_wait(0.5) # half a second is more than enough for updating the viewport.
+
+ # Close out problematic windows, FPS meters, and anti-aliasing.
+ if general.is_helpers_shown(): # Turn off the helper gizmos if visible
+ general.toggle_helpers()
+ general.idle_wait(1.0)
+ if general.is_pane_visible("Error Report"): # Close Error Report windows that block focus.
+ general.close_pane("Error Report")
+ if general.is_pane_visible("Error Log"): # Close Error Log windows that block focus.
+ general.close_pane("Error Log")
+ general.idle_wait(1.0)
+ general.run_console("r_displayInfo=0")
+ general.run_console("r_antialiasingmode=0")
+ general.idle_wait(1.0)
+
+ # Delete all existing entities & create default_level entity
+ search_filter = azlmbr.entity.SearchFilter()
+ all_entities = entity.SearchBus(azlmbr.bus.Broadcast, "SearchEntities", search_filter)
+ editor.ToolsApplicationRequestBus(bus.Broadcast, "DeleteEntities", all_entities)
+ default_level = hydra.Entity("default_level")
+ default_position = math.Vector3(0.0, 0.0, 0.0)
+ default_level.create_entity(default_position, ["Grid"])
+ default_level.get_set_test(0, "Controller|Configuration|Secondary Grid Spacing", 1.0)
+
+ # Set the viewport up correctly after adding the parent default_level entity.
+ screen_width = 1280
+ screen_height = 720
+ degree_radian_factor = 0.0174533 # Used by "Rotation" property for the Transform component.
+ general.set_viewport_size(screen_width, screen_height)
+ general.update_viewport()
+ helper.wait_for_condition(
+ function=lambda: helper.isclose(a=general.get_viewport_size().x, b=screen_width, rel_tol=0.1)
+ and helper.isclose(a=general.get_viewport_size().y, b=screen_height, rel_tol=0.1),
+ timeout_in_seconds=4.0
+ )
+ result = helper.isclose(a=general.get_viewport_size().x, b=screen_width, rel_tol=0.1) and helper.isclose(
+ a=general.get_viewport_size().y, b=screen_height, rel_tol=0.1)
+ general.log(general.get_viewport_size().x)
+ general.log(general.get_viewport_size().y)
+ general.log(general.get_viewport_size().z)
+ general.log(f"Viewport is set to the expected size: {result}")
+ general.log("Basic level created")
+ general.run_console("r_DisplayInfo = 0")
+
+ # Create global_skylight entity and set the properties
+ global_skylight = hydra.Entity("global_skylight")
+ global_skylight.create_entity(
+ entity_position=default_position,
+ components=["HDRi Skybox", "Global Skylight (IBL)"],
+ parent_id=default_level.id)
+ global_skylight_asset_path = os.path.join(
+ "LightingPresets", "greenwich_park_02_4k_iblskyboxcm_iblspecular.exr.streamingimage")
+ global_skylight_asset_value = asset.AssetCatalogRequestBus(
+ bus.Broadcast, "GetAssetIdByPath", global_skylight_asset_path, math.Uuid(), False)
+ global_skylight.get_set_test(0, "Controller|Configuration|Cubemap Texture", global_skylight_asset_value)
+ global_skylight.get_set_test(1, "Controller|Configuration|Diffuse Image", global_skylight_asset_value)
+ global_skylight.get_set_test(1, "Controller|Configuration|Specular Image", global_skylight_asset_value)
+
+ # Create ground_plane entity and set the properties
+ ground_plane = hydra.Entity("ground_plane")
+ ground_plane.create_entity(
+ entity_position=default_position,
+ components=["Material"],
+ parent_id=default_level.id)
+ azlmbr.components.TransformBus(azlmbr.bus.Event, "SetLocalUniformScale", ground_plane.id, 32.0)
+ ground_plane_material_asset_path = os.path.join(
+ "Materials", "Presets", "PBR", "metal_chrome.azmaterial")
+ ground_plane_material_asset_value = asset.AssetCatalogRequestBus(
+ bus.Broadcast, "GetAssetIdByPath", ground_plane_material_asset_path, math.Uuid(), False)
+ ground_plane.get_set_test(0, "Default Material|Material Asset", ground_plane_material_asset_value)
+
+ # Work around to add the correct Atom Mesh component
+ mesh_type_id = azlmbr.globals.property.EditorMeshComponentTypeId
+ ground_plane.components.append(
+ editor.EditorComponentAPIBus(
+ bus.Broadcast, "AddComponentsOfType", ground_plane.id, [mesh_type_id]
+ ).GetValue()[0]
+ )
+ ground_plane_mesh_asset_path = os.path.join("Models", "plane.azmodel")
+ ground_plane_mesh_asset_value = asset.AssetCatalogRequestBus(
+ bus.Broadcast, "GetAssetIdByPath", ground_plane_mesh_asset_path, math.Uuid(), False)
+ ground_plane.get_set_test(1, "Controller|Configuration|Mesh Asset", ground_plane_mesh_asset_value)
+
+ # Create directional_light entity and set the properties
+ directional_light = hydra.Entity("directional_light")
+ directional_light.create_entity(
+ entity_position=math.Vector3(0.0, 0.0, 10.0),
+ components=["Directional Light"],
+ parent_id=default_level.id)
+ directional_light_rotation = math.Vector3(degree_radian_factor * -90.0, 0.0, 0.0)
+ azlmbr.components.TransformBus(
+ azlmbr.bus.Event, "SetLocalRotation", directional_light.id, directional_light_rotation)
+
+ # Create sphere entity and set the properties
+ sphere_entity = hydra.Entity("sphere")
+ sphere_entity.create_entity(
+ entity_position=math.Vector3(0.0, 0.0, 1.0),
+ components=["Material"],
+ parent_id=default_level.id)
+ sphere_material_asset_path = os.path.join("Materials", "Presets", "PBR", "metal_brass_polished.azmaterial")
+ sphere_material_asset_value = asset.AssetCatalogRequestBus(
+ bus.Broadcast, "GetAssetIdByPath", sphere_material_asset_path, math.Uuid(), False)
+ sphere_entity.get_set_test(0, "Default Material|Material Asset", sphere_material_asset_value)
+
+ # Work around to add the correct Atom Mesh component
+ sphere_entity.components.append(
+ editor.EditorComponentAPIBus(
+ bus.Broadcast, "AddComponentsOfType", sphere_entity.id, [mesh_type_id]
+ ).GetValue()[0]
+ )
+ sphere_mesh_asset_path = os.path.join("Models", "sphere.azmodel")
+ sphere_mesh_asset_value = asset.AssetCatalogRequestBus(
+ bus.Broadcast, "GetAssetIdByPath", sphere_mesh_asset_path, math.Uuid(), False)
+ sphere_entity.get_set_test(1, "Controller|Configuration|Mesh Asset", sphere_mesh_asset_value)
+
+ # Create camera component and set the properties
+ camera_entity = hydra.Entity("camera")
+ camera_entity.create_entity(
+ entity_position=math.Vector3(5.5, -12.0, 9.0),
+ components=["Camera"],
+ parent_id=default_level.id)
+ rotation = math.Vector3(
+ degree_radian_factor * -27.0, degree_radian_factor * -12.0, degree_radian_factor * 25.0
+ )
+ azlmbr.components.TransformBus(azlmbr.bus.Event, "SetLocalRotation", camera_entity.id, rotation)
+ camera_entity.get_set_test(0, "Controller|Configuration|Field of view", 60.0)
+ camera.EditorCameraViewRequestBus(azlmbr.bus.Event, "ToggleCameraAsActiveView", camera_entity.id)
diff --git a/AutomatedTesting/Gem/PythonTests/atom_renderer/atom_utils/atom_constants.py b/AutomatedTesting/Gem/PythonTests/atom_renderer/atom_utils/atom_constants.py
new file mode 100644
index 0000000000..88a959f198
--- /dev/null
+++ b/AutomatedTesting/Gem/PythonTests/atom_renderer/atom_utils/atom_constants.py
@@ -0,0 +1,19 @@
+"""
+Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
+
+SPDX-License-Identifier: Apache-2.0 OR MIT
+
+Hold constants used across both hydra and non-hydra scripts.
+"""
+
+# Light type options for the Light component.
+LIGHT_TYPES = {
+ 'unknown': 0,
+ 'sphere': 1,
+ 'spot_disk': 2,
+ 'capsule': 3,
+ 'quad': 4,
+ 'polygon': 5,
+ 'simple_point': 6,
+ 'simple_spot': 7,
+}
diff --git a/AutomatedTesting/Gem/PythonTests/atom_renderer/atom_utils/benchmark_utils.py b/AutomatedTesting/Gem/PythonTests/atom_renderer/atom_utils/benchmark_utils.py
index 21c7489ed3..b4fdfcb8a0 100644
--- a/AutomatedTesting/Gem/PythonTests/atom_renderer/atom_utils/benchmark_utils.py
+++ b/AutomatedTesting/Gem/PythonTests/atom_renderer/atom_utils/benchmark_utils.py
@@ -61,6 +61,25 @@ class BenchmarkHelper(object):
general.log('Failed to capture pass timestamps.')
return self.capturedData
+ def capture_cpu_frame_time(self, frame_number):
+ """
+ Capture CPU frame times and block further execution until it has been written to the disk.
+ """
+ self.handler = azlmbr.atom.ProfilingCaptureNotificationBusHandler()
+ self.handler.connect()
+ self.handler.add_callback('OnCaptureCpuFrameTimeFinished', self.on_data_captured)
+
+ self.done = False
+ self.capturedData = False
+ success = azlmbr.atom.ProfilingCaptureRequestBus(
+ azlmbr.bus.Broadcast, "CaptureCpuFrameTime", f'{self.output_path}/cpu_frame{frame_number}_time.json')
+ if success:
+ self.wait_until_data()
+ general.log('CPU frame time captured.')
+ else:
+ general.log('Failed to capture CPU frame time.')
+ return self.capturedData
+
def on_data_captured(self, parameters):
# the parameters come in as a tuple
if parameters[0]:
diff --git a/AutomatedTesting/Gem/PythonTests/atom_renderer/atom_utils/material_editor_utils.py b/AutomatedTesting/Gem/PythonTests/atom_renderer/atom_utils/material_editor_utils.py
new file mode 100644
index 0000000000..ef0a592df0
--- /dev/null
+++ b/AutomatedTesting/Gem/PythonTests/atom_renderer/atom_utils/material_editor_utils.py
@@ -0,0 +1,274 @@
+"""
+Copyright (c) Contributors to the Open 3D Engine Project.
+For complete copyright and license terms please see the LICENSE at the root of this distribution.
+
+SPDX-License-Identifier: Apache-2.0 OR MIT
+
+import azlmbr.materialeditor will fail with a ModuleNotFound error when using this script with Editor.exe
+This is because azlmbr.materialeditor only binds to MaterialEditor.exe and not Editor.exe
+You need to launch this script with MaterialEditor.exe in order for azlmbr.materialeditor to appear.
+"""
+
+import os
+import sys
+import time
+import azlmbr.atom
+import azlmbr.atomtools as atomtools
+import azlmbr.materialeditor as materialeditor
+import azlmbr.bus as bus
+
+
+def is_close(actual, expected, buffer=sys.float_info.min):
+ """
+ :param actual: actual value
+ :param expected: expected value
+ :param buffer: acceptable variation from expected
+ :return: bool
+ """
+ return abs(actual - expected) < buffer
+
+
+def compare_colors(color1, color2, buffer=0.00001):
+ """
+ Compares the red, green and blue properties of a color allowing a slight variance of buffer
+ :param color1: first color to compare
+ :param color2: second color
+ :param buffer: allowed variance in individual color value
+ :return: bool
+ """
+ return (
+ is_close(color1.r, color2.r, buffer)
+ and is_close(color1.g, color2.g, buffer)
+ and is_close(color1.b, color2.b, buffer)
+ )
+
+
+def open_material(file_path):
+ """
+ :return: uuid of material document opened
+ """
+ return azlmbr.atomtools.AtomToolsDocumentSystemRequestBus(bus.Broadcast, "OpenDocument", file_path)
+
+
+def is_open(document_id):
+ """
+ :return: bool
+ """
+ return azlmbr.atomtools.AtomToolsDocumentRequestBus(bus.Event, "IsOpen", document_id)
+
+
+def save_document(document_id):
+ """
+ :return: bool success
+ """
+ return azlmbr.atomtools.AtomToolsDocumentSystemRequestBus(bus.Broadcast, "SaveDocument", document_id)
+
+
+def save_document_as_copy(document_id, target_path):
+ """
+ :return: bool success
+ """
+ return azlmbr.atomtools.AtomToolsDocumentSystemRequestBus(
+ bus.Broadcast, "SaveDocumentAsCopy", document_id, target_path
+ )
+
+
+def save_document_as_child(document_id, target_path):
+ """
+ :return: bool success
+ """
+ return azlmbr.atomtools.AtomToolsDocumentSystemRequestBus(
+ bus.Broadcast, "SaveDocumentAsChild", document_id, target_path
+ )
+
+
+def save_all():
+ """
+ :return: bool success
+ """
+ return azlmbr.atomtools.AtomToolsDocumentSystemRequestBus(bus.Broadcast, "SaveAllDocuments")
+
+
+def close_document(document_id):
+ """
+ :return: bool success
+ """
+ return azlmbr.atomtools.AtomToolsDocumentSystemRequestBus(bus.Broadcast, "CloseDocument", document_id)
+
+
+def close_all_documents():
+ """
+ :return: bool success
+ """
+ return azlmbr.atomtools.AtomToolsDocumentSystemRequestBus(bus.Broadcast, "CloseAllDocuments")
+
+
+def close_all_except_selected(document_id):
+ """
+ :return: bool success
+ """
+ return azlmbr.atomtools.AtomToolsDocumentSystemRequestBus(bus.Broadcast, "CloseAllDocumentsExcept", document_id)
+
+
+def get_property(document_id, property_name):
+ """
+ :return: property value or invalid value if the document is not open or the property_name can't be found
+ """
+ return azlmbr.atomtools.AtomToolsDocumentRequestBus(bus.Event, "GetPropertyValue", document_id, property_name)
+
+
+def set_property(document_id, property_name, value):
+ azlmbr.atomtools.AtomToolsDocumentRequestBus(bus.Event, "SetPropertyValue", document_id, property_name, value)
+
+
+def is_pane_visible(pane_name):
+ """
+ :return: bool
+ """
+ return atomtools.AtomToolsWindowRequestBus(bus.Broadcast, "IsDockWidgetVisible", pane_name)
+
+
+def set_pane_visibility(pane_name, value):
+ atomtools.AtomToolsWindowRequestBus(bus.Broadcast, "SetDockWidgetVisible", pane_name, value)
+
+
+def select_lighting_config(config_name):
+ azlmbr.materialeditor.MaterialViewportRequestBus(azlmbr.bus.Broadcast, "SelectLightingPresetByName", config_name)
+
+
+def set_grid_enable_disable(value):
+ azlmbr.materialeditor.MaterialViewportRequestBus(azlmbr.bus.Broadcast, "SetGridEnabled", value)
+
+
+def get_grid_enable_disable():
+ """
+ :return: bool
+ """
+ return azlmbr.materialeditor.MaterialViewportRequestBus(azlmbr.bus.Broadcast, "GetGridEnabled")
+
+
+def set_shadowcatcher_enable_disable(value):
+ azlmbr.materialeditor.MaterialViewportRequestBus(azlmbr.bus.Broadcast, "SetShadowCatcherEnabled", value)
+
+
+def get_shadowcatcher_enable_disable():
+ """
+ :return: bool
+ """
+ return azlmbr.materialeditor.MaterialViewportRequestBus(azlmbr.bus.Broadcast, "GetShadowCatcherEnabled")
+
+
+def select_model_config(configname):
+ azlmbr.materialeditor.MaterialViewportRequestBus(azlmbr.bus.Broadcast, "SelectModelPresetByName", configname)
+
+
+def wait_for_condition(function, timeout_in_seconds=1.0):
+ # type: (function, float) -> bool
+ """
+ Function to run until it returns True or timeout is reached
+ the function can have no parameters and
+ waiting idle__wait_* is handled here not in the function
+
+ :param function: a function that returns a boolean indicating a desired condition is achieved
+ :param timeout_in_seconds: when reached, function execution is abandoned and False is returned
+ """
+ with Timeout(timeout_in_seconds) as t:
+ while True:
+ try:
+ azlmbr.atomtools.general.idle_wait_frames(1)
+ except Exception:
+ print("WARNING: Couldn't wait for frame")
+
+ if t.timed_out:
+ return False
+
+ ret = function()
+ if not isinstance(ret, bool):
+ raise TypeError("return value for wait_for_condition function must be a bool")
+ if ret:
+ return True
+
+
+class Timeout:
+ # type: (float) -> None
+ """
+ contextual timeout
+ :param seconds: float seconds to allow before timed_out is True
+ """
+
+ def __init__(self, seconds):
+ self.seconds = seconds
+
+ def __enter__(self):
+ self.die_after = time.time() + self.seconds
+ return self
+
+ def __exit__(self, type, value, traceback):
+ pass
+
+ @property
+ def timed_out(self):
+ return time.time() > self.die_after
+
+
+screenshotsFolder = os.path.join(azlmbr.paths.devroot, "AtomTest", "Cache" "pc", "Screenshots")
+
+
+class ScreenshotHelper:
+ """
+ A helper to capture screenshots and wait for them.
+ """
+
+ def __init__(self, idle_wait_frames_callback):
+ super().__init__()
+ self.done = False
+ self.capturedScreenshot = False
+ self.max_frames_to_wait = 60
+
+ self.idle_wait_frames_callback = idle_wait_frames_callback
+
+ def capture_screenshot_blocking(self, filename):
+ """
+ Capture a screenshot and block the execution until the screenshot has been written to the disk.
+ """
+ self.handler = azlmbr.atom.FrameCaptureNotificationBusHandler()
+ self.handler.connect()
+ self.handler.add_callback("OnCaptureFinished", self.on_screenshot_captured)
+
+ self.done = False
+ self.capturedScreenshot = False
+ success = azlmbr.atom.FrameCaptureRequestBus(azlmbr.bus.Broadcast, "CaptureScreenshot", filename)
+ if success:
+ self.wait_until_screenshot()
+ print("Screenshot taken.")
+ else:
+ print("screenshot failed")
+ return self.capturedScreenshot
+
+ def on_screenshot_captured(self, parameters):
+ # the parameters come in as a tuple
+ if parameters[0]:
+ print("screenshot saved: {}".format(parameters[1]))
+ self.capturedScreenshot = True
+ else:
+ print("screenshot failed: {}".format(parameters[1]))
+ self.done = True
+ self.handler.disconnect()
+
+ def wait_until_screenshot(self):
+ frames_waited = 0
+ while self.done == False:
+ self.idle_wait_frames_callback(1)
+ if frames_waited > self.max_frames_to_wait:
+ print("timeout while waiting for the screenshot to be written")
+ self.handler.disconnect()
+ break
+ else:
+ frames_waited = frames_waited + 1
+ print("(waited {} frames)".format(frames_waited))
+
+
+def capture_screenshot(file_path):
+ return ScreenshotHelper(azlmbr.atomtools.general.idle_wait_frames).capture_screenshot_blocking(
+ os.path.join(file_path)
+ )
diff --git a/AutomatedTesting/Gem/PythonTests/atom_renderer/atom_utils/screenshot_utils.py b/AutomatedTesting/Gem/PythonTests/atom_renderer/atom_utils/screenshot_utils.py
index 28a4037dcc..a7a02816ac 100644
--- a/AutomatedTesting/Gem/PythonTests/atom_renderer/atom_utils/screenshot_utils.py
+++ b/AutomatedTesting/Gem/PythonTests/atom_renderer/atom_utils/screenshot_utils.py
@@ -91,3 +91,20 @@ class ScreenshotHelper(object):
else:
frames_waited = frames_waited + 1
general.log(f"(waited {frames_waited} frames)")
+
+
+def take_screenshot_game_mode(screenshot_name, entity_name=None):
+ """
+ Enters game mode & takes a screenshot, then exits game mode after.
+ :param screenshot_name: name to give the captured screenshot .ppm file.
+ :param entity_name: name of the entity being tested (for generating unique log lines).
+ :return: None
+ """
+ general.enter_game_mode()
+ helper.wait_for_condition(lambda: general.is_in_game_mode(), 2.0)
+ general.log(f"{entity_name}_test: Entered game mode: {general.is_in_game_mode()}")
+ ScreenshotHelper(general.idle_wait_frames).capture_screenshot_blocking(f"{screenshot_name}.ppm")
+ general.idle_wait(1.0)
+ general.exit_game_mode()
+ helper.wait_for_condition(lambda: not general.is_in_game_mode(), 2.0)
+ general.log(f"{entity_name}_test: Exit game mode: {not general.is_in_game_mode()}")
diff --git a/AutomatedTesting/Gem/PythonTests/atom_renderer/golden_images/AreaLight_1.ppm b/AutomatedTesting/Gem/PythonTests/atom_renderer/golden_images/AreaLight_1.ppm
new file mode 100644
index 0000000000..0725999dcf
--- /dev/null
+++ b/AutomatedTesting/Gem/PythonTests/atom_renderer/golden_images/AreaLight_1.ppm
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:954d7d0df47c840a24e313893800eb3126d0c0d47c3380926776b51833778db7
+size 6220817
diff --git a/AutomatedTesting/Gem/PythonTests/atom_renderer/golden_images/AreaLight_2.ppm b/AutomatedTesting/Gem/PythonTests/atom_renderer/golden_images/AreaLight_2.ppm
new file mode 100644
index 0000000000..3a45bd31e3
--- /dev/null
+++ b/AutomatedTesting/Gem/PythonTests/atom_renderer/golden_images/AreaLight_2.ppm
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e81c19128f42ba362a2d5f3ccf159dfbc942d67ceeb1ac8c21f295a6fd9d2ce5
+size 6220817
diff --git a/AutomatedTesting/Gem/PythonTests/atom_renderer/golden_images/AreaLight_3.ppm b/AutomatedTesting/Gem/PythonTests/atom_renderer/golden_images/AreaLight_3.ppm
new file mode 100644
index 0000000000..15d679b784
--- /dev/null
+++ b/AutomatedTesting/Gem/PythonTests/atom_renderer/golden_images/AreaLight_3.ppm
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5e20801213e065b6ea8c95ede81c23faa9b6dc70a2002dc5bced293e1bed989f
+size 6220817
diff --git a/AutomatedTesting/Gem/PythonTests/atom_renderer/golden_images/AreaLight_4.ppm b/AutomatedTesting/Gem/PythonTests/atom_renderer/golden_images/AreaLight_4.ppm
new file mode 100644
index 0000000000..85c083a386
--- /dev/null
+++ b/AutomatedTesting/Gem/PythonTests/atom_renderer/golden_images/AreaLight_4.ppm
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e250f812e594e5152bf2d6f23caa8b53b78276bfdf344d7a8d355dd96cb995c0
+size 6220817
diff --git a/AutomatedTesting/Gem/PythonTests/atom_renderer/golden_images/AreaLight_5.ppm b/AutomatedTesting/Gem/PythonTests/atom_renderer/golden_images/AreaLight_5.ppm
new file mode 100644
index 0000000000..d575de761e
--- /dev/null
+++ b/AutomatedTesting/Gem/PythonTests/atom_renderer/golden_images/AreaLight_5.ppm
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:95be359041f8291c74b335297a4dfe9902a180510f24a181b15e1a5ba4d3b024
+size 6220817
diff --git a/AutomatedTesting/Gem/PythonTests/atom_renderer/golden_images/SpotLight_1.ppm b/AutomatedTesting/Gem/PythonTests/atom_renderer/golden_images/SpotLight_1.ppm
new file mode 100644
index 0000000000..bbbd127929
--- /dev/null
+++ b/AutomatedTesting/Gem/PythonTests/atom_renderer/golden_images/SpotLight_1.ppm
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:118e43e4b915e262726183467cc4b82f244565213fea5b6bfe02be07f0851ab1
+size 6220817
diff --git a/AutomatedTesting/Gem/PythonTests/atom_renderer/golden_images/SpotLight_2.ppm b/AutomatedTesting/Gem/PythonTests/atom_renderer/golden_images/SpotLight_2.ppm
new file mode 100644
index 0000000000..8e716fabcc
--- /dev/null
+++ b/AutomatedTesting/Gem/PythonTests/atom_renderer/golden_images/SpotLight_2.ppm
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:dc2ce3256a6552975962c9e113c52c1a22bf3817d417151f6f60640dd568e0fa
+size 6220817
diff --git a/AutomatedTesting/Gem/PythonTests/atom_renderer/golden_images/SpotLight_3.ppm b/AutomatedTesting/Gem/PythonTests/atom_renderer/golden_images/SpotLight_3.ppm
new file mode 100644
index 0000000000..6b6a5a5d6e
--- /dev/null
+++ b/AutomatedTesting/Gem/PythonTests/atom_renderer/golden_images/SpotLight_3.ppm
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:287d98890b35427688999760f9d066bcbff1a3bc9001534241dc212b32edabd8
+size 6220817
diff --git a/AutomatedTesting/Gem/PythonTests/atom_renderer/golden_images/SpotLight_4.ppm b/AutomatedTesting/Gem/PythonTests/atom_renderer/golden_images/SpotLight_4.ppm
new file mode 100644
index 0000000000..eb05228cc2
--- /dev/null
+++ b/AutomatedTesting/Gem/PythonTests/atom_renderer/golden_images/SpotLight_4.ppm
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:66e91c92c868167c850078cd91714db47e10a96e23cc30191994486bd79c353f
+size 6220817
diff --git a/AutomatedTesting/Gem/PythonTests/atom_renderer/golden_images/SpotLight_5.ppm b/AutomatedTesting/Gem/PythonTests/atom_renderer/golden_images/SpotLight_5.ppm
new file mode 100644
index 0000000000..5e12edc46d
--- /dev/null
+++ b/AutomatedTesting/Gem/PythonTests/atom_renderer/golden_images/SpotLight_5.ppm
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d950d173f5101820c5e18205401ca08ce5feeff2302ac2920b292750d86a8fa4
+size 6220817
diff --git a/AutomatedTesting/Gem/PythonTests/atom_renderer/golden_images/SpotLight_6.ppm b/AutomatedTesting/Gem/PythonTests/atom_renderer/golden_images/SpotLight_6.ppm
new file mode 100644
index 0000000000..d442d90287
--- /dev/null
+++ b/AutomatedTesting/Gem/PythonTests/atom_renderer/golden_images/SpotLight_6.ppm
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:72eddb7126eae0c839b933886e0fb69d78229f72d49ef13199de28df2b7879db
+size 6220817
diff --git a/AutomatedTesting/Gem/PythonTests/atom_renderer/test_Atom_GPUTests.py b/AutomatedTesting/Gem/PythonTests/atom_renderer/test_Atom_GPUTests.py
index ede140c075..7be1ed1b12 100644
--- a/AutomatedTesting/Gem/PythonTests/atom_renderer/test_Atom_GPUTests.py
+++ b/AutomatedTesting/Gem/PythonTests/atom_renderer/test_Atom_GPUTests.py
@@ -15,11 +15,11 @@ import pytest
import ly_test_tools.environment.file_system as file_system
from ly_test_tools.image.screenshot_compare_qssim import qssim as compare_screenshots
from ly_test_tools.benchmark.data_aggregator import BenchmarkDataAggregator
+
import editor_python_test_tools.hydra_test_utils as hydra
logger = logging.getLogger(__name__)
DEFAULT_SUBFOLDER_PATH = 'user/PythonTests/Automated/Screenshots'
-EDITOR_TIMEOUT = 600
TEST_DIRECTORY = os.path.join(os.path.dirname(__file__), "atom_hydra_scripts")
@@ -67,6 +67,7 @@ class TestAllComponentsIndepthTests(object):
"Trace::Assert",
"Trace::Error",
"Traceback (most recent call last):",
+ "Screenshot failed"
]
hydra.launch_and_validate_results(
@@ -74,7 +75,7 @@ class TestAllComponentsIndepthTests(object):
TEST_DIRECTORY,
editor,
"hydra_GPUTest_BasicLevelSetup.py",
- timeout=EDITOR_TIMEOUT,
+ timeout=180,
expected_lines=level_creation_expected_lines,
unexpected_lines=unexpected_lines,
halt_on_unexpected=True,
@@ -85,6 +86,60 @@ class TestAllComponentsIndepthTests(object):
for test_screenshot, golden_screenshot in zip(test_screenshots, golden_images):
compare_screenshots(test_screenshot, golden_screenshot)
+ def test_LightComponent_ScreenshotMatchesGoldenImage(
+ self, request, editor, workspace, project, launcher_platform, level):
+ """
+ Please review the hydra script run by this test for more specific test info.
+ Tests that the Light component screenshots in a rendered level appear the same as the golden images.
+ """
+ screenshot_names = [
+ "AreaLight_1.ppm",
+ "AreaLight_2.ppm",
+ "AreaLight_3.ppm",
+ "AreaLight_4.ppm",
+ "AreaLight_5.ppm",
+ "SpotLight_1.ppm",
+ "SpotLight_2.ppm",
+ "SpotLight_3.ppm",
+ "SpotLight_4.ppm",
+ "SpotLight_5.ppm",
+ "SpotLight_6.ppm",
+ ]
+ test_screenshots = []
+ for screenshot in screenshot_names:
+ screenshot_path = os.path.join(workspace.paths.project(), DEFAULT_SUBFOLDER_PATH, screenshot)
+ test_screenshots.append(screenshot_path)
+ file_system.delete(test_screenshots, True, True)
+
+ golden_images = []
+ for golden_image in screenshot_names:
+ golden_image_path = os.path.join(golden_images_directory(), golden_image)
+ golden_images.append(golden_image_path)
+
+ expected_lines = ["Light component tests completed."]
+ unexpected_lines = [
+ "Trace::Assert",
+ "Trace::Error",
+ "Traceback (most recent call last):",
+ "Screenshot failed",
+ ]
+ hydra.launch_and_validate_results(
+ request,
+ TEST_DIRECTORY,
+ editor,
+ "hydra_GPUTest_LightComponent.py",
+ timeout=180,
+ expected_lines=expected_lines,
+ unexpected_lines=unexpected_lines,
+ halt_on_unexpected=True,
+ cfg_args=[level],
+ null_renderer=False,
+ )
+
+ for test_screenshot, golden_screenshot in zip(test_screenshots, golden_images):
+ compare_screenshots(test_screenshot, golden_screenshot)
+
+
@pytest.mark.parametrize('rhi', ['dx12', 'vulkan'])
@pytest.mark.parametrize("project", ["AutomatedTesting"])
@pytest.mark.parametrize("launcher_platform", ["windows_editor"])
@@ -99,6 +154,7 @@ class TestPerformanceBenchmarkSuite(object):
expected_lines = [
"Benchmark metadata captured.",
"Pass timestamps captured.",
+ "CPU frame time captured.",
"Capturing complete.",
"Captured data successfully."
]
@@ -106,6 +162,7 @@ class TestPerformanceBenchmarkSuite(object):
unexpected_lines = [
"Failed to capture data.",
"Failed to capture pass timestamps.",
+ "Failed to capture CPU frame time.",
"Failed to capture benchmark metadata."
]
@@ -114,7 +171,7 @@ class TestPerformanceBenchmarkSuite(object):
TEST_DIRECTORY,
editor,
"hydra_GPUTest_AtomFeatureIntegrationBenchmark.py",
- timeout=EDITOR_TIMEOUT,
+ timeout=600,
expected_lines=expected_lines,
unexpected_lines=unexpected_lines,
halt_on_unexpected=True,
diff --git a/AutomatedTesting/Gem/PythonTests/atom_renderer/test_Atom_MainSuite.py b/AutomatedTesting/Gem/PythonTests/atom_renderer/test_Atom_MainSuite.py
index ed5d057626..55c049b929 100644
--- a/AutomatedTesting/Gem/PythonTests/atom_renderer/test_Atom_MainSuite.py
+++ b/AutomatedTesting/Gem/PythonTests/atom_renderer/test_Atom_MainSuite.py
@@ -11,10 +11,12 @@ import os
import pytest
+import ly_test_tools.environment.file_system as file_system
import editor_python_test_tools.hydra_test_utils as hydra
+from atom_renderer.atom_utils.atom_constants import LIGHT_TYPES
logger = logging.getLogger(__name__)
-EDITOR_TIMEOUT = 300
+EDITOR_TIMEOUT = 120
TEST_DIRECTORY = os.path.join(os.path.dirname(__file__), "atom_hydra_scripts")
@@ -30,7 +32,7 @@ class TestAtomEditorComponentsMain(object):
Tests the following Atom components and verifies all "expected_lines" appear in Editor.log:
1. Display Mapper
2. Light
- 3. Radius Weight Modifier
+ 3. PostFX Radius Weight Modifier
4. PostFX Layer
5. Physical Sky
6. Global Skylight (IBL)
@@ -124,18 +126,18 @@ class TestAtomEditorComponentsMain(object):
"PostFX Layer_test: Entity deleted: True",
"PostFX Layer_test: UNDO entity deletion works: True",
"PostFX Layer_test: REDO entity deletion works: True",
- # Radius Weight Modifier Component
- "Radius Weight Modifier Entity successfully created",
- "Radius Weight Modifier_test: Component added to the entity: True",
- "Radius Weight Modifier_test: Component removed after UNDO: True",
- "Radius Weight Modifier_test: Component added after REDO: True",
- "Radius Weight Modifier_test: Entered game mode: True",
- "Radius Weight Modifier_test: Exit game mode: True",
- "Radius Weight Modifier_test: Entity is hidden: True",
- "Radius Weight Modifier_test: Entity is shown: True",
- "Radius Weight Modifier_test: Entity deleted: True",
- "Radius Weight Modifier_test: UNDO entity deletion works: True",
- "Radius Weight Modifier_test: REDO entity deletion works: True",
+ # PostFX Radius Weight Modifier Component
+ "PostFX Radius Weight Modifier Entity successfully created",
+ "PostFX Radius Weight Modifier_test: Component added to the entity: True",
+ "PostFX Radius Weight Modifier_test: Component removed after UNDO: True",
+ "PostFX Radius Weight Modifier_test: Component added after REDO: True",
+ "PostFX Radius Weight Modifier_test: Entered game mode: True",
+ "PostFX Radius Weight Modifier_test: Exit game mode: True",
+ "PostFX Radius Weight Modifier_test: Entity is hidden: True",
+ "PostFX Radius Weight Modifier_test: Entity is shown: True",
+ "PostFX Radius Weight Modifier_test: Entity deleted: True",
+ "PostFX Radius Weight Modifier_test: UNDO entity deletion works: True",
+ "PostFX Radius Weight Modifier_test: REDO entity deletion works: True",
# Light Component
"Light Entity successfully created",
"Light_test: Component added to the entity: True",
@@ -180,3 +182,126 @@ class TestAtomEditorComponentsMain(object):
null_renderer=True,
cfg_args=cfg_args,
)
+
+ def test_AtomEditorComponents_LightComponent(
+ self, request, editor, workspace, project, launcher_platform, level):
+ """
+ Please review the hydra script run by this test for more specific test info.
+ Tests that the Light component has the expected property options available to it.
+ """
+ cfg_args = [level]
+
+ expected_lines = [
+ "light_entity Entity successfully created",
+ "Entity has a Light component",
+ "light_entity_test: Component added to the entity: True",
+ f"light_entity_test: Property value is {LIGHT_TYPES['sphere']} which matches {LIGHT_TYPES['sphere']}",
+ "Controller|Configuration|Shadows|Enable shadow set to True",
+ "light_entity Controller|Configuration|Shadows|Shadowmap size: SUCCESS",
+ "Controller|Configuration|Shadows|Shadow filter method set to 1", # PCF
+ "Controller|Configuration|Shadows|Filtering sample count set to 4",
+ "Controller|Configuration|Shadows|Filtering sample count set to 64",
+ "Controller|Configuration|Shadows|PCF method set to 0",
+ "Controller|Configuration|Shadows|PCF method set to 1",
+ "Controller|Configuration|Shadows|Shadow filter method set to 2", # ESM
+ "Controller|Configuration|Shadows|ESM exponent set to 50.0",
+ "Controller|Configuration|Shadows|ESM exponent set to 5000.0",
+ "Controller|Configuration|Shadows|Shadow filter method set to 3", # ESM+PCF
+ f"light_entity_test: Property value is {LIGHT_TYPES['spot_disk']} which matches {LIGHT_TYPES['spot_disk']}",
+ f"light_entity_test: Property value is {LIGHT_TYPES['capsule']} which matches {LIGHT_TYPES['capsule']}",
+ f"light_entity_test: Property value is {LIGHT_TYPES['quad']} which matches {LIGHT_TYPES['quad']}",
+ "light_entity Controller|Configuration|Fast approximation: SUCCESS",
+ "light_entity Controller|Configuration|Both directions: SUCCESS",
+ f"light_entity_test: Property value is {LIGHT_TYPES['polygon']} which matches {LIGHT_TYPES['polygon']}",
+ f"light_entity_test: Property value is {LIGHT_TYPES['simple_point']} "
+ f"which matches {LIGHT_TYPES['simple_point']}",
+ "Controller|Configuration|Attenuation radius|Mode set to 0",
+ "Controller|Configuration|Attenuation radius|Radius set to 100.0",
+ f"light_entity_test: Property value is {LIGHT_TYPES['simple_spot']} "
+ f"which matches {LIGHT_TYPES['simple_spot']}",
+ "Controller|Configuration|Shutters|Outer angle set to 45.0",
+ "Controller|Configuration|Shutters|Outer angle set to 90.0",
+ "light_entity_test: Component added to the entity: True",
+ "Light component test (non-GPU) completed.",
+ ]
+
+ unexpected_lines = [
+ "Trace::Assert",
+ "Trace::Error",
+ "Traceback (most recent call last):",
+ ]
+
+ hydra.launch_and_validate_results(
+ request,
+ TEST_DIRECTORY,
+ editor,
+ "hydra_AtomEditorComponents_LightComponent.py",
+ timeout=EDITOR_TIMEOUT,
+ expected_lines=expected_lines,
+ unexpected_lines=unexpected_lines,
+ halt_on_unexpected=True,
+ null_renderer=True,
+ cfg_args=cfg_args,
+ )
+
+
+@pytest.mark.parametrize("project", ["AutomatedTesting"])
+@pytest.mark.parametrize("launcher_platform", ['windows_generic'])
+@pytest.mark.system
+class TestMaterialEditorBasicTests(object):
+ @pytest.fixture(autouse=True)
+ def setup_teardown(self, request, workspace, project):
+ def delete_files():
+ file_system.delete(
+ [
+ os.path.join(workspace.paths.project(), "Materials", "test_material.material"),
+ os.path.join(workspace.paths.project(), "Materials", "test_material_1.material"),
+ os.path.join(workspace.paths.project(), "Materials", "test_material_2.material"),
+ ],
+ True,
+ True,
+ )
+ # Cleanup our newly created materials
+ delete_files()
+
+ def teardown():
+ # Cleanup our newly created materials
+ delete_files()
+
+ request.addfinalizer(teardown)
+
+ @pytest.mark.parametrize("exe_file_name", ["MaterialEditor"])
+ def test_MaterialEditorBasicTests(
+ self, request, workspace, project, launcher_platform, generic_launcher, exe_file_name):
+
+ expected_lines = [
+ "Material opened: True",
+ "Test asset doesn't exist initially: True",
+ "New asset created: True",
+ "New Material opened: True",
+ "Material closed: True",
+ "All documents closed: True",
+ "Close All Except Selected worked as expected: True",
+ "Actual Document saved with changes: True",
+ "Document saved as copy is saved with changes: True",
+ "Document saved as child is saved with changes: True",
+ "Save All worked as expected: True",
+ ]
+ unexpected_lines = [
+ # "Trace::Assert",
+ # "Trace::Error",
+ "Traceback (most recent call last):"
+ ]
+
+ hydra.launch_and_validate_results(
+ request,
+ TEST_DIRECTORY,
+ generic_launcher,
+ "hydra_AtomMaterialEditor_BasicTests.py",
+ run_python="--runpython",
+ timeout=80,
+ expected_lines=expected_lines,
+ unexpected_lines=unexpected_lines,
+ halt_on_unexpected=True,
+ log_file_name="MaterialEditor.log",
+ )
diff --git a/AutomatedTesting/Gem/PythonTests/editor/CMakeLists.txt b/AutomatedTesting/Gem/PythonTests/editor/CMakeLists.txt
index afde0a0d94..fa35bb25c6 100644
--- a/AutomatedTesting/Gem/PythonTests/editor/CMakeLists.txt
+++ b/AutomatedTesting/Gem/PythonTests/editor/CMakeLists.txt
@@ -13,7 +13,6 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED AND PAL_TRAIT_BUILD_HOST_TOOLS AND PAL_TRAIT_
TEST_SERIAL
PATH ${CMAKE_CURRENT_LIST_DIR}
PYTEST_MARKS "SUITE_main and not REQUIRES_gpu"
- TIMEOUT 1500
RUNTIME_DEPENDENCIES
Legacy::Editor
AZ::AssetProcessor
@@ -28,7 +27,6 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED AND PAL_TRAIT_BUILD_HOST_TOOLS AND PAL_TRAIT_
TEST_SERIAL
PATH ${CMAKE_CURRENT_LIST_DIR}
PYTEST_MARKS "SUITE_periodic and not REQUIRES_gpu"
- TIMEOUT 1500
RUNTIME_DEPENDENCIES
Legacy::Editor
AZ::AssetProcessor
@@ -44,7 +42,6 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED AND PAL_TRAIT_BUILD_HOST_TOOLS AND PAL_TRAIT_
TEST_REQUIRES gpu
PATH ${CMAKE_CURRENT_LIST_DIR}
PYTEST_MARKS "SUITE_main and REQUIRES_gpu"
- TIMEOUT 1500
RUNTIME_DEPENDENCIES
Legacy::Editor
AZ::AssetProcessor
@@ -59,7 +56,6 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED AND PAL_TRAIT_BUILD_HOST_TOOLS AND PAL_TRAIT_
TEST_SERIAL
PATH ${CMAKE_CURRENT_LIST_DIR}
PYTEST_MARKS "SUITE_sandbox"
- TIMEOUT 1500
RUNTIME_DEPENDENCIES
Legacy::Editor
AZ::AssetProcessor
diff --git a/AutomatedTesting/Gem/PythonTests/editor/EditorScripts/AssetPicker_UI_UX.py b/AutomatedTesting/Gem/PythonTests/editor/EditorScripts/AssetPicker_UI_UX.py
index f728714125..068f25fb1e 100644
--- a/AutomatedTesting/Gem/PythonTests/editor/EditorScripts/AssetPicker_UI_UX.py
+++ b/AutomatedTesting/Gem/PythonTests/editor/EditorScripts/AssetPicker_UI_UX.py
@@ -61,7 +61,7 @@ class AssetPickerUIUXTest(EditorTestHelper):
5) Verify if Mesh Asset is assigned via both OK/Enter options
Note:
- - This test file must be called from the Lumberyard Editor command terminal
+ - This test file must be called from the O3DE Editor command terminal
- Any passed and failed tests are written to the Editor.log file.
Parsing the file or running a log_monitor are required to observe the test results.
diff --git a/AutomatedTesting/Gem/PythonTests/editor/EditorScripts/BasicEditorWorkflows_LevelEntityComponentCRUD.py b/AutomatedTesting/Gem/PythonTests/editor/EditorScripts/BasicEditorWorkflows_LevelEntityComponentCRUD.py
index 32d20ea2b4..994fc661ed 100644
--- a/AutomatedTesting/Gem/PythonTests/editor/EditorScripts/BasicEditorWorkflows_LevelEntityComponentCRUD.py
+++ b/AutomatedTesting/Gem/PythonTests/editor/EditorScripts/BasicEditorWorkflows_LevelEntityComponentCRUD.py
@@ -37,7 +37,7 @@ class TestBasicEditorWorkflows(EditorTestHelper):
async def run_test(self):
"""
Summary:
- Open Lumberyard editor and check if basic Editor workflows are completable.
+ Open O3DE editor and check if basic Editor workflows are completable.
Expected Behavior:
- A new level can be created
@@ -48,7 +48,7 @@ class TestBasicEditorWorkflows(EditorTestHelper):
- Level can be exported
Note:
- - This test file must be called from the Lumberyard Editor command terminal
+ - This test file must be called from the O3DE Editor command terminal
- Any passed and failed tests are written to the Editor.log file.
Parsing the file or running a log_monitor are required to observe the test results.
diff --git a/AutomatedTesting/Gem/PythonTests/editor/EditorScripts/Menus_EditMenuOptions.py b/AutomatedTesting/Gem/PythonTests/editor/EditorScripts/Menus_EditMenuOptions.py
index 6b861894c0..53a8da4116 100644
--- a/AutomatedTesting/Gem/PythonTests/editor/EditorScripts/Menus_EditMenuOptions.py
+++ b/AutomatedTesting/Gem/PythonTests/editor/EditorScripts/Menus_EditMenuOptions.py
@@ -36,7 +36,7 @@ class TestEditMenuOptions(EditorTestHelper):
2) Interact with Edit Menu options
Note:
- - This test file must be called from the Lumberyard Editor command terminal
+ - This test file must be called from the O3DE Editor command terminal
- Any passed and failed tests are written to the Editor.log file.
Parsing the file or running a log_monitor are required to observe the test results.
diff --git a/AutomatedTesting/Gem/PythonTests/editor/EditorScripts/Menus_FileMenuOptions.py b/AutomatedTesting/Gem/PythonTests/editor/EditorScripts/Menus_FileMenuOptions.py
index ab9aa1d326..77ee9ac61d 100644
--- a/AutomatedTesting/Gem/PythonTests/editor/EditorScripts/Menus_FileMenuOptions.py
+++ b/AutomatedTesting/Gem/PythonTests/editor/EditorScripts/Menus_FileMenuOptions.py
@@ -32,7 +32,7 @@ class TestFileMenuOptions(EditorTestHelper):
2) Interact with File Menu options
Note:
- - This test file must be called from the Lumberyard Editor command terminal
+ - This test file must be called from the O3DE Editor command terminal
- Any passed and failed tests are written to the Editor.log file.
Parsing the file or running a log_monitor are required to observe the test results.
diff --git a/AutomatedTesting/Gem/PythonTests/editor/EditorScripts/Menus_ViewMenuOptions.py b/AutomatedTesting/Gem/PythonTests/editor/EditorScripts/Menus_ViewMenuOptions.py
index d1233e9815..d2db4210ce 100644
--- a/AutomatedTesting/Gem/PythonTests/editor/EditorScripts/Menus_ViewMenuOptions.py
+++ b/AutomatedTesting/Gem/PythonTests/editor/EditorScripts/Menus_ViewMenuOptions.py
@@ -36,7 +36,7 @@ class TestViewMenuOptions(EditorTestHelper):
2) Interact with View Menu options
Note:
- - This test file must be called from the Lumberyard Editor command terminal
+ - This test file must be called from the O3DE Editor command terminal
- Any passed and failed tests are written to the Editor.log file.
Parsing the file or running a log_monitor are required to observe the test results.
diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/CMakeLists.txt b/AutomatedTesting/Gem/PythonTests/largeworlds/CMakeLists.txt
index 351ca19031..043485d869 100644
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/CMakeLists.txt
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/CMakeLists.txt
@@ -16,7 +16,6 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED AND PAL_TRAIT_BUILD_HOST_TOOLS AND PAL_TRAIT_
TEST_SUITE main
PATH ${CMAKE_CURRENT_LIST_DIR}/dyn_veg
PYTEST_MARKS "not SUITE_sandbox and not SUITE_periodic and not SUITE_benchmark"
- TIMEOUT 1500
RUNTIME_DEPENDENCIES
AZ::AssetProcessor
Legacy::Editor
@@ -33,7 +32,6 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED AND PAL_TRAIT_BUILD_HOST_TOOLS AND PAL_TRAIT_
TEST_SUITE sandbox
PATH ${CMAKE_CURRENT_LIST_DIR}/dyn_veg
PYTEST_MARKS "SUITE_sandbox"
- TIMEOUT 1500
RUNTIME_DEPENDENCIES
AZ::AssetProcessor
Legacy::Editor
@@ -49,7 +47,6 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED AND PAL_TRAIT_BUILD_HOST_TOOLS AND PAL_TRAIT_
TEST_SUITE periodic
PATH ${CMAKE_CURRENT_LIST_DIR}/dyn_veg
PYTEST_MARKS "SUITE_periodic and dynveg_filter"
- TIMEOUT 1500
RUNTIME_DEPENDENCIES
AZ::AssetProcessor
Legacy::Editor
@@ -64,7 +61,6 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED AND PAL_TRAIT_BUILD_HOST_TOOLS AND PAL_TRAIT_
TEST_SUITE periodic
PATH ${CMAKE_CURRENT_LIST_DIR}/dyn_veg
PYTEST_MARKS "SUITE_periodic and dynveg_modifier"
- TIMEOUT 1500
RUNTIME_DEPENDENCIES
AZ::AssetProcessor
Legacy::Editor
@@ -79,7 +75,6 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED AND PAL_TRAIT_BUILD_HOST_TOOLS AND PAL_TRAIT_
TEST_SUITE periodic
PATH ${CMAKE_CURRENT_LIST_DIR}/dyn_veg
PYTEST_MARKS "SUITE_periodic and dynveg_regression"
- TIMEOUT 1500
RUNTIME_DEPENDENCIES
AZ::AssetProcessor
Legacy::Editor
@@ -94,7 +89,6 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED AND PAL_TRAIT_BUILD_HOST_TOOLS AND PAL_TRAIT_
TEST_SUITE periodic
PATH ${CMAKE_CURRENT_LIST_DIR}/dyn_veg
PYTEST_MARKS "SUITE_periodic and dynveg_area"
- TIMEOUT 1500
RUNTIME_DEPENDENCIES
AZ::AssetProcessor
Legacy::Editor
@@ -109,7 +103,6 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED AND PAL_TRAIT_BUILD_HOST_TOOLS AND PAL_TRAIT_
TEST_SUITE periodic
PATH ${CMAKE_CURRENT_LIST_DIR}/dyn_veg
PYTEST_MARKS "SUITE_periodic and dynveg_misc"
- TIMEOUT 1500
RUNTIME_DEPENDENCIES
AZ::AssetProcessor
Legacy::Editor
@@ -124,7 +117,6 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED AND PAL_TRAIT_BUILD_HOST_TOOLS AND PAL_TRAIT_
TEST_SUITE periodic
PATH ${CMAKE_CURRENT_LIST_DIR}/dyn_veg
PYTEST_MARKS "SUITE_periodic and dynveg_surfacetagemitter"
- TIMEOUT 1500
RUNTIME_DEPENDENCIES
AZ::AssetProcessor
Legacy::Editor
@@ -140,7 +132,6 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED AND PAL_TRAIT_BUILD_HOST_TOOLS AND PAL_TRAIT_
TEST_SUITE main
PATH ${CMAKE_CURRENT_LIST_DIR}/landscape_canvas
PYTEST_MARKS "not SUITE_sandbox and not SUITE_periodic and not SUITE_benchmark"
- TIMEOUT 1500
RUNTIME_DEPENDENCIES
AZ::AssetProcessor
Legacy::Editor
@@ -155,7 +146,6 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED AND PAL_TRAIT_BUILD_HOST_TOOLS AND PAL_TRAIT_
TEST_SUITE periodic
PATH ${CMAKE_CURRENT_LIST_DIR}/landscape_canvas
PYTEST_MARKS "SUITE_periodic"
- TIMEOUT 1500
RUNTIME_DEPENDENCIES
AZ::AssetProcessor
Legacy::Editor
@@ -170,7 +160,6 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED AND PAL_TRAIT_BUILD_HOST_TOOLS AND PAL_TRAIT_
TEST_SERIAL
TEST_SUITE periodic
PATH ${CMAKE_CURRENT_LIST_DIR}/gradient_signal
- TIMEOUT 1500
RUNTIME_DEPENDENCIES
AZ::AssetProcessor
Legacy::Editor
diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/test_GeneralGraphFunctionality.py b/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/test_GeneralGraphFunctionality.py
old mode 100755
new mode 100644
index d191a82a58..4ab5a41b85
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/test_GeneralGraphFunctionality.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/test_GeneralGraphFunctionality.py
@@ -105,7 +105,7 @@ class TestGeneralGraphFunctionality(object):
@pytest.mark.test_case_id("C17488412")
@pytest.mark.SUITE_periodic
- @pytest.mark.xfail # https://github.com/o3de/o3de/issues/2201
+ @pytest.mark.xfail(reason="https://github.com/o3de/o3de/issues/2201")
def test_LandscapeCanvas_GraphClosed_OnEntityDelete(self, request, editor, level, launcher_platform):
cfg_args = [level]
diff --git a/AutomatedTesting/Gem/PythonTests/physics/C15096740_Material_LibraryUpdatedCorrectly.py b/AutomatedTesting/Gem/PythonTests/physics/C15096740_Material_LibraryUpdatedCorrectly.py
index 060779082c..341597e36a 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/C15096740_Material_LibraryUpdatedCorrectly.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/C15096740_Material_LibraryUpdatedCorrectly.py
@@ -64,7 +64,8 @@ def C15096740_Material_LibraryUpdatedCorrectly():
# Constants
library_property_path = "Configuration|Physics Material|Library"
- default_material_path = "surfacetypemateriallibrary.physmaterial"
+
+ default_material_path = os.path.join("assets", "physics", "surfacetypemateriallibrary.physmaterial")
new_material_path = os.path.join("physicssurfaces", "default_phys_materials.physmaterial")
helper.init_idle()
@@ -82,7 +83,7 @@ def C15096740_Material_LibraryUpdatedCorrectly():
default_asset = Asset.find_asset_by_path(default_material_path)
test_component.set_component_property_value(library_property_path, default_asset.id)
default_asset.id = test_component.get_component_property_value(library_property_path)
- Report.result(Tests.override_default_library, default_asset.get_path() == default_material_path)
+ Report.result(Tests.override_default_library, default_asset.get_path() == default_material_path.replace(os.sep, '/'))
# 4) Switch it back again to the default material library.
test_component.set_component_property_value(library_property_path, azasset.AssetId())
diff --git a/AutomatedTesting/Gem/PythonTests/physics/CMakeLists.txt b/AutomatedTesting/Gem/PythonTests/physics/CMakeLists.txt
index 248bf3fdc5..eb37db1943 100644
--- a/AutomatedTesting/Gem/PythonTests/physics/CMakeLists.txt
+++ b/AutomatedTesting/Gem/PythonTests/physics/CMakeLists.txt
@@ -12,7 +12,6 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED AND PAL_TRAIT_BUILD_HOST_TOOLS)
TEST_SUITE main
TEST_SERIAL
PATH ${CMAKE_CURRENT_LIST_DIR}/TestSuite_Main.py
- TIMEOUT 1500
RUNTIME_DEPENDENCIES
Legacy::Editor
AZ::AssetProcessor
@@ -25,7 +24,6 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED AND PAL_TRAIT_BUILD_HOST_TOOLS)
TEST_SUITE periodic
TEST_SERIAL
PATH ${CMAKE_CURRENT_LIST_DIR}/TestSuite_Periodic.py
- TIMEOUT 1500
RUNTIME_DEPENDENCIES
Legacy::Editor
AZ::AssetProcessor
@@ -38,7 +36,6 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED AND PAL_TRAIT_BUILD_HOST_TOOLS)
TEST_SUITE sandbox
TEST_SERIAL
PATH ${CMAKE_CURRENT_LIST_DIR}/TestSuite_Sandbox.py
- TIMEOUT 1500
RUNTIME_DEPENDENCIES
Legacy::Editor
AZ::AssetProcessor
diff --git a/AutomatedTesting/Gem/PythonTests/physics/Physmaterial_Editor.py b/AutomatedTesting/Gem/PythonTests/physics/Physmaterial_Editor.py
index 54ea3c7f15..cff8ae8377 100755
--- a/AutomatedTesting/Gem/PythonTests/physics/Physmaterial_Editor.py
+++ b/AutomatedTesting/Gem/PythonTests/physics/Physmaterial_Editor.py
@@ -133,7 +133,7 @@ class Physmaterial_Editor:
def _set_path(self):
# type: (str) -> str
if self.document_filename == None:
- self.document_filename = os.path.join(self.project_folder, "surfacetypemateriallibrary.physmaterial")
+ self.document_filename = os.path.join(self.project_folder, "assets", "physics", "surfacetypemateriallibrary.physmaterial")
else:
for (root, directories, root_files) in os.walk(self.project_folder):
for root_file in root_files:
diff --git a/AutomatedTesting/Gem/PythonTests/prefab/CMakeLists.txt b/AutomatedTesting/Gem/PythonTests/prefab/CMakeLists.txt
index 1d9c54fa40..48c24d1ebf 100644
--- a/AutomatedTesting/Gem/PythonTests/prefab/CMakeLists.txt
+++ b/AutomatedTesting/Gem/PythonTests/prefab/CMakeLists.txt
@@ -13,7 +13,6 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED AND PAL_TRAIT_BUILD_HOST_TOOLS)
TEST_SUITE main
TEST_SERIAL
PATH ${CMAKE_CURRENT_LIST_DIR}/TestSuite_Main.py
- TIMEOUT 1500
RUNTIME_DEPENDENCIES
Legacy::Editor
AZ::AssetProcessor
diff --git a/AutomatedTesting/Gem/PythonTests/prefab/PrefabLevel_BasicWorkflow.py b/AutomatedTesting/Gem/PythonTests/prefab/PrefabLevel_BasicWorkflow.py
new file mode 100644
index 0000000000..7a600f7976
--- /dev/null
+++ b/AutomatedTesting/Gem/PythonTests/prefab/PrefabLevel_BasicWorkflow.py
@@ -0,0 +1,108 @@
+"""
+Copyright (c) Contributors to the Open 3D Engine Project.
+For complete copyright and license terms please see the LICENSE at the root of this distribution.
+
+SPDX-License-Identifier: Apache-2.0 OR MIT
+"""
+
+# fmt:off
+class Tests():
+ create_new_entity = ("'CreateNewEntity' passed", "'CreateNewEntity' failed")
+ create_prefab = ("'CreatePrefab' passed", "'CreatePrefab' failed")
+ instantiate_prefab = ("'InstantiatePrefab' passed", "'InstantiatePrefab' failed")
+ has_one_child = ("instantiated prefab contains only one child as expected", "instantiated prefab does *not* contain only one child as expected")
+ instantiated_prefab_position = ("instantiated prefab's position is at the expected position", "instantiated prefab's position is *not* at the expected position")
+ delete_prefab = ("'DeleteEntitiesAndAllDescendantsInInstance' passed", "'DeleteEntitiesAndAllDescendantsInInstance' failed")
+ instantiated_prefab_removed = ("instantiated prefab's container entity has been removed", "instantiated prefab's container entity has *not* been removed")
+ instantiated_child_removed = ("instantiated prefab's child entity has been removed", "instantiated prefab's child entity has *not* been removed")
+# fmt:on
+
+def PrefabLevel_BasicWorkflow():
+ """
+ This test will help verify if the following functions related to Prefab work as expected:
+ - CreatePrefab
+ - InstantiatePrefab
+ - DeleteEntitiesAndAllDescendantsInInstance
+ """
+
+ import os
+ import sys
+
+ from editor_python_test_tools.utils import Report
+ from editor_python_test_tools.utils import TestHelper as helper
+ import editor_python_test_tools.hydra_editor_utils as hydra
+
+ import azlmbr.bus as bus
+ import azlmbr.entity as entity
+ from azlmbr.entity import EntityId
+ import azlmbr.editor as editor
+ import azlmbr.prefab as prefab
+ from azlmbr.math import Vector3
+ import azlmbr.legacy.general as general
+
+ NEW_PREFAB_NAME = "new_prefab"
+ NEW_PREFAB_FILE_NAME = NEW_PREFAB_NAME + ".prefab"
+ NEW_PREFAB_FILE_PATH = os.path.join(os.path.dirname(os.path.abspath(__file__)), NEW_PREFAB_FILE_NAME)
+ INSTANTIATED_PREFAB_POSITION = Vector3(10.00, 20.0, 30.0)
+ INSTANTIATED_PREFAB_NAME = "instantiated_prefab"
+ INSTANTIATED_CHILD_ENTITY_NAME = "child_1"
+ TEST_LEVEL_FOLDER = "Prefab"
+ TEST_LEVEL_NAME = "Base"
+
+ def find_entity_by_name(entity_name):
+ searchFilter = entity.SearchFilter()
+ searchFilter.names = [entity_name]
+ entityIds = entity.SearchBus(bus.Broadcast, 'SearchEntities', searchFilter)
+ if entityIds and entityIds[0].IsValid():
+ return entityIds[0]
+ return None
+
+ def print_error_if_failed(prefab_operation_result):
+ if not prefab_operation_result.IsSuccess():
+ Report.info(f'Error message: {prefab_operation_result.GetError()}')
+
+
+# Open the test level
+ helper.init_idle()
+ helper.open_level(TEST_LEVEL_FOLDER, TEST_LEVEL_NAME)
+
+# Create a new Entity at the root level
+ new_entity_id = editor.ToolsApplicationRequestBus(bus.Broadcast, 'CreateNewEntity', EntityId())
+ Report.result(Tests.create_new_entity, new_entity_id.IsValid())
+
+# Checks for prefab creation passed or not
+ create_prefab_result = prefab.PrefabPublicRequestBus(bus.Broadcast, 'CreatePrefabInMemory', [new_entity_id], NEW_PREFAB_FILE_PATH)
+ Report.result(Tests.create_prefab, create_prefab_result.IsSuccess())
+ print_error_if_failed(create_prefab_result)
+
+# Checks for prefab instantiation passed or not
+ instantiate_prefab_result = prefab.PrefabPublicRequestBus(bus.Broadcast, 'InstantiatePrefab', NEW_PREFAB_FILE_PATH, EntityId(), INSTANTIATED_PREFAB_POSITION)
+ Report.result(Tests.instantiate_prefab, instantiate_prefab_result.IsSuccess() and instantiate_prefab_result.GetValue().IsValid())
+ print_error_if_failed(instantiate_prefab_result)
+
+ container_entity_id = instantiate_prefab_result.GetValue()
+ editor.EditorEntityAPIBus(bus.Event, 'SetName', container_entity_id, INSTANTIATED_PREFAB_NAME)
+
+ children_entity_ids = editor.EditorEntityInfoRequestBus(bus.Event, 'GetChildren', container_entity_id)
+ Report.result(Tests.has_one_child, len(children_entity_ids) is 1)
+
+ child_entity_id = children_entity_ids[0]
+ editor.EditorEntityAPIBus(bus.Event, 'SetName', child_entity_id, INSTANTIATED_CHILD_ENTITY_NAME)
+
+# Checks if the new prefab is at the correct position and if it fails, it will provide the expected postion and the actual postion of the entity in the Editor log
+ actual_prefab_position = azlmbr.components.TransformBus(azlmbr.bus.Event, "GetWorldTranslation", container_entity_id)
+ is_at_position = actual_prefab_position.IsClose(INSTANTIATED_PREFAB_POSITION)
+ Report.result(Tests.instantiated_prefab_position, is_at_position)
+ if not is_at_position:
+ Report.info(f'Expected position: {INSTANTIATED_PREFAB_POSITION.ToString()}, actual position: {actual_prefab_position.ToString()}')
+
+# Checks for prefab deletion passed or not
+ delete_prefab_result = prefab.PrefabPublicRequestBus(bus.Broadcast, 'DeleteEntitiesAndAllDescendantsInInstance', [container_entity_id])
+ Report.result(Tests.delete_prefab, delete_prefab_result.IsSuccess())
+ print_error_if_failed(delete_prefab_result)
+ Report.result(Tests.instantiated_prefab_removed, find_entity_by_name(INSTANTIATED_PREFAB_NAME) is None)
+ Report.result(Tests.instantiated_child_removed, find_entity_by_name(INSTANTIATED_CHILD_ENTITY_NAME) is None)
+
+if __name__ == "__main__":
+ from editor_python_test_tools.utils import Report
+ Report.start_test(PrefabLevel_BasicWorkflow)
diff --git a/AutomatedTesting/Gem/PythonTests/prefab/TestSuite_Main.py b/AutomatedTesting/Gem/PythonTests/prefab/TestSuite_Main.py
index acd8f60b07..4e3d6ba77f 100644
--- a/AutomatedTesting/Gem/PythonTests/prefab/TestSuite_Main.py
+++ b/AutomatedTesting/Gem/PythonTests/prefab/TestSuite_Main.py
@@ -16,6 +16,7 @@ from ly_test_tools import LAUNCHERS
sys.path.append (os.path.dirname (os.path.abspath (__file__)) + '/../automatedtesting_shared')
+import ly_test_tools.environment.file_system as file_system
from base import TestAutomationBase
@pytest.mark.SUITE_main
@@ -29,3 +30,8 @@ class TestAutomation(TestAutomationBase):
def test_PrefabLevel_OpensLevelWithEntities(self, request, workspace, editor, launcher_platform):
from . import PrefabLevel_OpensLevelWithEntities as test_module
self._run_prefab_test(request, workspace, editor, test_module)
+
+ def test_PrefabLevel_BasicWorkflow(self, request, workspace, editor, launcher_platform):
+ from . import PrefabLevel_BasicWorkflow as test_module
+ self._run_prefab_test(request, workspace, editor, test_module)
+
diff --git a/AutomatedTesting/Gem/PythonTests/scripting/CMakeLists.txt b/AutomatedTesting/Gem/PythonTests/scripting/CMakeLists.txt
index 80b6e9a54e..25988216b2 100644
--- a/AutomatedTesting/Gem/PythonTests/scripting/CMakeLists.txt
+++ b/AutomatedTesting/Gem/PythonTests/scripting/CMakeLists.txt
@@ -12,7 +12,6 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED AND PAL_TRAIT_BUILD_HOST_TOOLS)
TEST_SUITE periodic
TEST_SERIAL
PATH ${CMAKE_CURRENT_LIST_DIR}/TestSuite_Periodic.py
- TIMEOUT 1500
RUNTIME_DEPENDENCIES
Legacy::Editor
AZ::AssetProcessor
@@ -25,7 +24,6 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED AND PAL_TRAIT_BUILD_HOST_TOOLS)
TEST_SUITE sandbox
TEST_SERIAL
PATH ${CMAKE_CURRENT_LIST_DIR}/TestSuite_Sandbox.py
- TIMEOUT 1500
RUNTIME_DEPENDENCIES
Legacy::Editor
AZ::AssetProcessor
diff --git a/AutomatedTesting/Gem/PythonTests/scripting/Pane_PropertiesChanged_RetainsOnRestart.py b/AutomatedTesting/Gem/PythonTests/scripting/Pane_PropertiesChanged_RetainsOnRestart.py
index 5c74754449..338389b1c4 100644
--- a/AutomatedTesting/Gem/PythonTests/scripting/Pane_PropertiesChanged_RetainsOnRestart.py
+++ b/AutomatedTesting/Gem/PythonTests/scripting/Pane_PropertiesChanged_RetainsOnRestart.py
@@ -52,7 +52,7 @@ def Pane_PropertiesChanged_RetainsOnRestart():
from utils import TestHelper as helper
import pyside_utils
- # Lumberyard Imports
+ # O3DE Imports
import azlmbr.legacy.general as general
# Pyside imports
diff --git a/AutomatedTesting/Gem/PythonTests/scripting/ScriptCanvasComponent_OnEntityActivatedDeactivated_PrintMessage.py b/AutomatedTesting/Gem/PythonTests/scripting/ScriptCanvasComponent_OnEntityActivatedDeactivated_PrintMessage.py
index b07a34dacd..097d3fb42d 100644
--- a/AutomatedTesting/Gem/PythonTests/scripting/ScriptCanvasComponent_OnEntityActivatedDeactivated_PrintMessage.py
+++ b/AutomatedTesting/Gem/PythonTests/scripting/ScriptCanvasComponent_OnEntityActivatedDeactivated_PrintMessage.py
@@ -93,11 +93,11 @@ def ScriptCanvasComponent_OnEntityActivatedDeactivated_PrintMessage():
if entity_dict["name"] == "Controller":
sc_component.get_property_tree()
sc_component.set_component_property_value(
- "Properties|Variable Fields|Variables|[0]|Name,Value|Datum|Datum|EntityToActivate",
+ "Properties|Variables|EntityToActivate|Datum|Datum|value|EntityToActivate",
entity_to_activate.id,
)
sc_component.set_component_property_value(
- "Properties|Variable Fields|Variables|[1]|Name,Value|Datum|Datum|EntityToDeactivate",
+ "Properties|Variables|EntityToDeactivate|Datum|Datum|value|EntityToDeactivate",
entity_to_deactivate.id,
)
return entity
diff --git a/AutomatedTesting/Gem/PythonTests/smoke/CMakeLists.txt b/AutomatedTesting/Gem/PythonTests/smoke/CMakeLists.txt
index 600911e9f1..5374b0d318 100644
--- a/AutomatedTesting/Gem/PythonTests/smoke/CMakeLists.txt
+++ b/AutomatedTesting/Gem/PythonTests/smoke/CMakeLists.txt
@@ -11,7 +11,6 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED AND PAL_TRAIT_BUILD_HOST_TOOLS)
if (PAL_TRAIT_BUILD_SERIALIZECONTEXTTOOLS)
list(APPEND additional_dependencies AZ::SerializeContextTools) # test_CLITool_SerializeContextTools depends on it
endif()
- list(APPEND additional_dependencies AZ::AssetBundlerBatch) # test_CLITool_AssetBundlerBatch_Works depends on it
ly_add_pytest(
NAME AutomatedTesting::SmokeTest
@@ -19,33 +18,33 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED AND PAL_TRAIT_BUILD_HOST_TOOLS)
TEST_SERIAL
PATH ${CMAKE_CURRENT_LIST_DIR}
PYTEST_MARKS "SUITE_smoke"
- TIMEOUT 1500
RUNTIME_DEPENDENCIES
AZ::AssetProcessor
AZ::PythonBindingsExample
Legacy::Editor
AutomatedTesting.GameLauncher
AutomatedTesting.Assets
- ${aditional_dependencies}
+ AZ::AzTestRunner
+ AZ::AssetBundlerBatch
+ ${additional_dependencies}
COMPONENT
Smoke
)
ly_add_pytest(
- NAME AutomatedTesting::SandboxTest
- TEST_SUITE sandbox
+ NAME AutomatedTesting::LoadLevelGPU
+ TEST_SUITE smoke
TEST_SERIAL
- PATH ${CMAKE_CURRENT_LIST_DIR}
- PYTEST_MARKS "SUITE_sandbox"
- TIMEOUT 1500
+ TEST_REQUIRES gpu
+ PATH ${CMAKE_CURRENT_LIST_DIR}/test_RemoteConsole_GPULoadLevel_Works.py
+ TIMEOUT 100
RUNTIME_DEPENDENCIES
AZ::AssetProcessor
AZ::PythonBindingsExample
- Legacy::Editor
AutomatedTesting.GameLauncher
AutomatedTesting.Assets
COMPONENT
- Sandbox
+ Smoke
)
ly_add_pytest(
@@ -74,4 +73,17 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED AND PAL_TRAIT_BUILD_HOST_TOOLS)
AutomatedTesting.GameLauncher
AutomatedTesting.Assets
)
+ ly_add_pytest(
+ NAME AutomatedTesting::LoadLevelCPU
+ TEST_SUITE sandbox
+ PATH ${CMAKE_CURRENT_LIST_DIR}/test_RemoteConsole_CPULoadLevel_Works.py
+ TIMEOUT 100
+ RUNTIME_DEPENDENCIES
+ AZ::AssetProcessor
+ AZ::PythonBindingsExample
+ Legacy::Editor
+ AutomatedTesting.GameLauncher
+ AutomatedTesting.Assets
+ )
+
endif()
diff --git a/AutomatedTesting/Gem/PythonTests/smoke/Editor_NewExistingLevels_Works.py b/AutomatedTesting/Gem/PythonTests/smoke/Editor_NewExistingLevels_Works.py
index 9a54de856c..71956488fc 100644
--- a/AutomatedTesting/Gem/PythonTests/smoke/Editor_NewExistingLevels_Works.py
+++ b/AutomatedTesting/Gem/PythonTests/smoke/Editor_NewExistingLevels_Works.py
@@ -53,7 +53,7 @@ def Editor_NewExistingLevels_Works():
10) Save, Load and Export an existing level and close editor
Note:
- - This test file must be called from the Lumberyard Editor command terminal
+ - This test file must be called from the O3DE Editor command terminal
- Any passed and failed tests are written to the Editor.log file.
Parsing the file or running a log_monitor are required to observe the test results.
diff --git a/AutomatedTesting/Gem/PythonTests/smoke/test_RemoteConsole_CPULoadLevel_Works.py b/AutomatedTesting/Gem/PythonTests/smoke/test_RemoteConsole_CPULoadLevel_Works.py
new file mode 100644
index 0000000000..701dcfab10
--- /dev/null
+++ b/AutomatedTesting/Gem/PythonTests/smoke/test_RemoteConsole_CPULoadLevel_Works.py
@@ -0,0 +1,44 @@
+"""
+Copyright (c) Contributors to the Open 3D Engine Project.
+For complete copyright and license terms please see the LICENSE at the root of this distribution.
+
+SPDX-License-Identifier: Apache-2.0 OR MIT
+
+
+UI Apps: AutomatedTesting.GameLauncher
+Launch AutomatedTesting.GameLauncher with Simple level
+Test should run in both gpu and non gpu
+"""
+
+import pytest
+import psutil
+
+import ly_test_tools.environment.waiter as waiter
+import editor_python_test_tools.hydra_test_utils as editor_test_utils
+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,
+)
+
+
+@pytest.mark.parametrize("launcher_platform", ["windows"])
+@pytest.mark.parametrize("project", ["AutomatedTesting"])
+@pytest.mark.parametrize("level", ["Simple"])
+@pytest.mark.SUITE_sandbox
+class TestRemoteConsoleLoadLevelWorks(object):
+ @pytest.fixture
+ def remote_console_instance(self, request):
+ console = RemoteConsole()
+
+ def teardown():
+ if console.connected:
+ console.stop()
+
+ request.addfinalizer(teardown)
+
+ return console
+
+ def test_RemoteConsole_LoadLevel_Works(self, launcher, level, remote_console_instance, launcher_platform):
+ expected_lines = ['Level system is loading "Simple"']
+
+ editor_test_utils.launch_and_validate_results_launcher(launcher, level, remote_console_instance, expected_lines, null_renderer=True)
diff --git a/AutomatedTesting/Gem/PythonTests/smoke/test_RemoteConsole_GPULoadLevel_Works.py b/AutomatedTesting/Gem/PythonTests/smoke/test_RemoteConsole_GPULoadLevel_Works.py
new file mode 100644
index 0000000000..7debcab938
--- /dev/null
+++ b/AutomatedTesting/Gem/PythonTests/smoke/test_RemoteConsole_GPULoadLevel_Works.py
@@ -0,0 +1,43 @@
+"""
+Copyright (c) Contributors to the Open 3D Engine Project.
+For complete copyright and license terms please see the LICENSE at the root of this distribution.
+
+SPDX-License-Identifier: Apache-2.0 OR MIT
+
+
+UI Apps: AutomatedTesting.GameLauncher
+Launch AutomatedTesting.GameLauncher with Simple level
+Test should run in both gpu and non gpu
+"""
+
+import pytest
+import psutil
+
+import ly_test_tools.environment.waiter as waiter
+import editor_python_test_tools.hydra_test_utils as editor_test_utils
+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,
+)
+
+
+@pytest.mark.parametrize("launcher_platform", ["windows"])
+@pytest.mark.parametrize("project", ["AutomatedTesting"])
+@pytest.mark.parametrize("level", ["Simple"])
+class TestRemoteConsoleLoadLevelWorks(object):
+ @pytest.fixture
+ def remote_console_instance(self, request):
+ console = RemoteConsole()
+
+ def teardown():
+ if console.connected:
+ console.stop()
+
+ request.addfinalizer(teardown)
+
+ return console
+
+ def test_RemoteConsole_LoadLevel_Works(self, launcher, level, remote_console_instance, launcher_platform):
+ expected_lines = ['Level system is loading "Simple"']
+
+ editor_test_utils.launch_and_validate_results_launcher(launcher, level, remote_console_instance, expected_lines, null_renderer=False)
diff --git a/AutomatedTesting/Gem/PythonTests/smoke/test_RemoteConsole_LoadLevel_Works.py b/AutomatedTesting/Gem/PythonTests/smoke/test_RemoteConsole_LoadLevel_Works.py
deleted file mode 100644
index b1606e1910..0000000000
--- a/AutomatedTesting/Gem/PythonTests/smoke/test_RemoteConsole_LoadLevel_Works.py
+++ /dev/null
@@ -1,105 +0,0 @@
-"""
-Copyright (c) Contributors to the Open 3D Engine Project.
-For complete copyright and license terms please see the LICENSE at the root of this distribution.
-
-SPDX-License-Identifier: Apache-2.0 OR MIT
-
-
-UI Apps: AutomatedTesting.GameLauncher
-Launch AutomatedTesting.GameLauncher with Simple level
-Test should run in both gpu and non gpu
-"""
-
-import pytest
-import psutil
-
-# Bail on the test if ly_test_tools doesn't exist.
-pytest.importorskip("ly_test_tools")
-import ly_test_tools.environment.waiter as waiter
-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,
-)
-
-
-@pytest.mark.parametrize("launcher_platform", ["windows"])
-@pytest.mark.parametrize("project", ["AutomatedTesting"])
-@pytest.mark.parametrize("level", ["Simple"])
-@pytest.mark.SUITE_sandbox
-class TestRemoteConsoleLoadLevelWorks(object):
- @pytest.fixture
- def remote_console_instance(self, request):
- console = RemoteConsole()
-
- def teardown():
- if console.connected:
- console.stop()
-
- request.addfinalizer(teardown)
-
- return console
-
- def test_RemoteConsole_LoadLevel_Works(self, launcher, level, remote_console_instance, launcher_platform):
- expected_lines = ['Level system is loading "Simple"']
-
- self.launch_and_validate_results_launcher(launcher, level, remote_console_instance, expected_lines)
-
- def launch_and_validate_results_launcher(
- self,
- launcher,
- level,
- remote_console_instance,
- expected_lines,
- null_renderer=False,
- port_listener_timeout=120,
- log_monitor_timeout=300,
- remote_console_port=4600,
- ):
- """
- Runs the launcher with the specified level, and monitors Game.log for expected lines.
- :param launcher: Configured launcher object to run test against.
- :param level: The level to load in the launcher.
- :param remote_console_instance: Configured Remote Console object.
- :param expected_lines: Expected lines to search log for.
- :oaram null_renderer: Specifies the test does not require the renderer. Defaults to True.
- :param port_listener_timeout: Timeout for verifying successful connection to Remote Console.
- :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"])
-
- # Start the Launcher
- with launcher.start():
-
- # Ensure Remote Console can be reached
- waiter.wait_for(
- lambda: _check_for_listening_port(remote_console_port),
- port_listener_timeout,
- exc=AssertionError("Port {} not listening.".format(remote_console_port)),
- )
- remote_console_instance.start(timeout=30)
-
- # Load the specified level in the launcher
- send_command_and_expect_response(
- remote_console_instance, f"loadlevel {level}", "LEVEL_LOAD_END", timeout=30
- )
-
- # Monitor the console for expected lines
- for line in expected_lines:
- assert remote_console_instance.expect_log_line(
- line, log_monitor_timeout
- ), f"Expected line not found: {line}"
diff --git a/AutomatedTesting/Gem/Resources/IOSLauncher/Images.xcassets/AppIcon.appiconset/Contents.json b/AutomatedTesting/Gem/Resources/IOSLauncher/Images.xcassets/AppIcon.appiconset/Contents.json
index 09621469c3..94e3dcd84d 100644
--- a/AutomatedTesting/Gem/Resources/IOSLauncher/Images.xcassets/AppIcon.appiconset/Contents.json
+++ b/AutomatedTesting/Gem/Resources/IOSLauncher/Images.xcassets/AppIcon.appiconset/Contents.json
@@ -1,17 +1,5 @@
{
"images" : [
- {
- "size" : "20x20",
- "idiom" : "iphone",
- "filename" : "iPhoneNotificationIcon40x40.png",
- "scale" : "2x"
- },
- {
- "size" : "20x20",
- "idiom" : "iphone",
- "filename" : "iPhoneNotificationIcon60x60.png",
- "scale" : "3x"
- },
{
"size" : "29x29",
"idiom" : "iphone",
@@ -48,18 +36,6 @@
"filename" : "iPhoneAppIcon180x180.png",
"scale" : "3x"
},
- {
- "size" : "20x20",
- "idiom" : "ipad",
- "filename" : "iPadNotificationIcon20x20.png",
- "scale" : "1x"
- },
- {
- "size" : "20x20",
- "idiom" : "ipad",
- "filename" : "iPadNotificationIcon40x40.png",
- "scale" : "2x"
- },
{
"size" : "29x29",
"idiom" : "ipad",
@@ -101,16 +77,10 @@
"idiom" : "ipad",
"filename" : "iPadProAppIcon167x167.png",
"scale" : "2x"
- },
- {
- "size" : "1024x1024",
- "idiom" : "ios-marketing",
- "filename" : "iOSAppStoreIcon1024x1024.png",
- "scale" : "1x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
-}
\ No newline at end of file
+}
diff --git a/AutomatedTesting/Gem/Resources/IOSLauncher/Images.xcassets/AutomatedTestingAppIcon.appiconset/Contents.json b/AutomatedTesting/Gem/Resources/IOSLauncher/Images.xcassets/AutomatedTestingAppIcon.appiconset/Contents.json
index 09621469c3..94e3dcd84d 100644
--- a/AutomatedTesting/Gem/Resources/IOSLauncher/Images.xcassets/AutomatedTestingAppIcon.appiconset/Contents.json
+++ b/AutomatedTesting/Gem/Resources/IOSLauncher/Images.xcassets/AutomatedTestingAppIcon.appiconset/Contents.json
@@ -1,17 +1,5 @@
{
"images" : [
- {
- "size" : "20x20",
- "idiom" : "iphone",
- "filename" : "iPhoneNotificationIcon40x40.png",
- "scale" : "2x"
- },
- {
- "size" : "20x20",
- "idiom" : "iphone",
- "filename" : "iPhoneNotificationIcon60x60.png",
- "scale" : "3x"
- },
{
"size" : "29x29",
"idiom" : "iphone",
@@ -48,18 +36,6 @@
"filename" : "iPhoneAppIcon180x180.png",
"scale" : "3x"
},
- {
- "size" : "20x20",
- "idiom" : "ipad",
- "filename" : "iPadNotificationIcon20x20.png",
- "scale" : "1x"
- },
- {
- "size" : "20x20",
- "idiom" : "ipad",
- "filename" : "iPadNotificationIcon40x40.png",
- "scale" : "2x"
- },
{
"size" : "29x29",
"idiom" : "ipad",
@@ -101,16 +77,10 @@
"idiom" : "ipad",
"filename" : "iPadProAppIcon167x167.png",
"scale" : "2x"
- },
- {
- "size" : "1024x1024",
- "idiom" : "ios-marketing",
- "filename" : "iOSAppStoreIcon1024x1024.png",
- "scale" : "1x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
-}
\ No newline at end of file
+}
diff --git a/AutomatedTesting/Gem/Resources/IOSLauncher/Images.xcassets/LaunchImage.launchimage/Contents.json b/AutomatedTesting/Gem/Resources/IOSLauncher/Images.xcassets/LaunchImage.launchimage/Contents.json
index f836f07ee7..67b253d091 100644
--- a/AutomatedTesting/Gem/Resources/IOSLauncher/Images.xcassets/LaunchImage.launchimage/Contents.json
+++ b/AutomatedTesting/Gem/Resources/IOSLauncher/Images.xcassets/LaunchImage.launchimage/Contents.json
@@ -1,50 +1,5 @@
{
"images" : [
- {
- "extent" : "full-screen",
- "idiom" : "iphone",
- "subtype" : "2436h",
- "filename" : "iPhoneLaunchImage1125x2436.png",
- "minimum-system-version" : "11.0",
- "orientation" : "portrait",
- "scale" : "3x"
- },
- {
- "extent" : "full-screen",
- "idiom" : "iphone",
- "subtype" : "2436h",
- "filename" : "iPhoneLaunchImage2436x1125.png",
- "minimum-system-version" : "11.0",
- "orientation" : "landscape",
- "scale" : "3x"
- },
- {
- "extent" : "full-screen",
- "idiom" : "iphone",
- "subtype" : "736h",
- "filename" : "iPhoneLaunchImage1242x2208.png",
- "minimum-system-version" : "8.0",
- "orientation" : "portrait",
- "scale" : "3x"
- },
- {
- "extent" : "full-screen",
- "idiom" : "iphone",
- "subtype" : "736h",
- "filename" : "iPhoneLaunchImage2208x1242.png",
- "minimum-system-version" : "8.0",
- "orientation" : "landscape",
- "scale" : "3x"
- },
- {
- "extent" : "full-screen",
- "idiom" : "iphone",
- "subtype" : "667h",
- "filename" : "iPhoneLaunchImage750x1334.png",
- "minimum-system-version" : "8.0",
- "orientation" : "portrait",
- "scale" : "2x"
- },
{
"orientation" : "portrait",
"idiom" : "iphone",
@@ -166,4 +121,4 @@
"version" : 1,
"author" : "xcode"
}
-}
\ No newline at end of file
+}
diff --git a/AutomatedTesting/Levels/Prefab/Base/Base.prefab b/AutomatedTesting/Levels/Prefab/Base/Base.prefab
new file mode 100644
index 0000000000..f7e42e7731
--- /dev/null
+++ b/AutomatedTesting/Levels/Prefab/Base/Base.prefab
@@ -0,0 +1,53 @@
+{
+ "ContainerEntity": {
+ "Id": "Entity_[1146574390643]",
+ "Name": "Level",
+ "Components": {
+ "Component_[10641544592923449938]": {
+ "$type": "EditorInspectorComponent",
+ "Id": 10641544592923449938
+ },
+ "Component_[12039882709170782873]": {
+ "$type": "EditorOnlyEntityComponent",
+ "Id": 12039882709170782873
+ },
+ "Component_[12265484671603697631]": {
+ "$type": "EditorPendingCompositionComponent",
+ "Id": 12265484671603697631
+ },
+ "Component_[14126657869720434043]": {
+ "$type": "EditorEntitySortComponent",
+ "Id": 14126657869720434043
+ },
+ "Component_[15230859088967841193]": {
+ "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
+ "Id": 15230859088967841193,
+ "Parent Entity": ""
+ },
+ "Component_[16239496886950819870]": {
+ "$type": "EditorDisabledCompositionComponent",
+ "Id": 16239496886950819870
+ },
+ "Component_[5688118765544765547]": {
+ "$type": "EditorEntityIconComponent",
+ "Id": 5688118765544765547
+ },
+ "Component_[6545738857812235305]": {
+ "$type": "SelectionComponent",
+ "Id": 6545738857812235305
+ },
+ "Component_[7247035804068349658]": {
+ "$type": "EditorPrefabComponent",
+ "Id": 7247035804068349658
+ },
+ "Component_[9307224322037797205]": {
+ "$type": "EditorLockComponent",
+ "Id": 9307224322037797205
+ },
+ "Component_[9562516168917670048]": {
+ "$type": "EditorVisibilityComponent",
+ "Id": 9562516168917670048
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/AutomatedTesting/Objects/Characters/Jack/Jack.fbx b/AutomatedTesting/Objects/Characters/Jack/Jack.fbx
index bccd5cce24..2e55fdd1e7 100644
--- a/AutomatedTesting/Objects/Characters/Jack/Jack.fbx
+++ b/AutomatedTesting/Objects/Characters/Jack/Jack.fbx
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:ba9a2cd047a5ee696aaeed882869017a02fd4f5eeee91b6b2bfb830ad1e5ee15
-size 10927631
+oid sha256:c285cdf72ebe4c274f8d1fbab6ff558f9344d4fa62fb9d07cf11f7511ffaaac9
+size 2177072
diff --git a/AutomatedTesting/Objects/Characters/Jack/Jack.fbx.assetinfo b/AutomatedTesting/Objects/Characters/Jack/Jack.fbx.assetinfo
new file mode 100644
index 0000000000..2de6d987d7
--- /dev/null
+++ b/AutomatedTesting/Objects/Characters/Jack/Jack.fbx.assetinfo
@@ -0,0 +1,328 @@
+{
+ "values": [
+ {
+ "$type": "ActorGroup",
+ "name": "Jack",
+ "selectedRootBone": "RootNode.jack_root",
+ "id": "{B7194F91-D8A1-5D5D-AC6D-DDEBC087D80D}",
+ "rules": {
+ "rules": [
+ {
+ "$type": "MetaDataRule",
+ "metaData": "AdjustActor -actorID $(ACTORID) -name \"Jack\"\nActorSetCollisionMeshes -actorID $(ACTORID) -lod 0 -nodeList \"\"\nAdjustActor -actorID $(ACTORID) -nodesExcludedFromBounds \"\" -nodeAction \"select\"\nAdjustActor -actorID $(ACTORID) -nodeAction \"replace\" -attachmentNodes \"\"\nAdjustActor -actorID $(ACTORID) -motionExtractionNodeName \"jack_root\"\nAdjustActor -actorID $(ACTORID) -mirrorSetup \"\"\n"
+ }
+ ]
+ }
+ },
+ {
+ "$type": "{5B03C8E6-8CEE-4DA0-A7FA-CD88689DD45B} MeshGroup",
+ "id": "{BF2CCF49-9BE0-5103-987A-84649A974991}",
+ "name": "Jack",
+ "NodeSelectionList": {
+ "unselectedNodes": [
+ "RootNode",
+ "RootNode.jack_root",
+ "RootNode.jack_meshZUp",
+ "RootNode.jack_root.Bip01__pelvis",
+ "RootNode.jack_meshZUp.jack_meshZUp_1",
+ "RootNode.jack_meshZUp.jack_meshZUp_2",
+ "RootNode.jack_root.Bip01__pelvis.transform",
+ "RootNode.jack_root.Bip01__pelvis.l_upLeg",
+ "RootNode.jack_root.Bip01__pelvis.r_upLeg",
+ "RootNode.jack_root.Bip01__pelvis.spine1",
+ "RootNode.jack_meshZUp.jack_meshZUp_1.Bitangent",
+ "RootNode.jack_meshZUp.jack_meshZUp_1.SkinWeight_",
+ "RootNode.jack_meshZUp.jack_meshZUp_1.transform",
+ "RootNode.jack_meshZUp.jack_meshZUp_1.Tangent",
+ "RootNode.jack_meshZUp.jack_meshZUp_1.map1",
+ "RootNode.jack_meshZUp.jack_meshZUp_1.jack",
+ "RootNode.jack_meshZUp.jack_meshZUp_2.Bitangent",
+ "RootNode.jack_meshZUp.jack_meshZUp_2.SkinWeight_",
+ "RootNode.jack_meshZUp.jack_meshZUp_2.transform",
+ "RootNode.jack_meshZUp.jack_meshZUp_2.Tangent",
+ "RootNode.jack_meshZUp.jack_meshZUp_2.map1",
+ "RootNode.jack_meshZUp.jack_meshZUp_2.jack",
+ "RootNode.jack_root.Bip01__pelvis.l_upLeg.transform",
+ "RootNode.jack_root.Bip01__pelvis.l_upLeg.l_upLegRoll",
+ "RootNode.jack_root.Bip01__pelvis.l_upLeg.l_loLeg",
+ "RootNode.jack_root.Bip01__pelvis.r_upLeg.transform",
+ "RootNode.jack_root.Bip01__pelvis.r_upLeg.r_upLegRoll",
+ "RootNode.jack_root.Bip01__pelvis.r_upLeg.r_loLeg",
+ "RootNode.jack_root.Bip01__pelvis.spine1.transform",
+ "RootNode.jack_root.Bip01__pelvis.spine1.spine2",
+ "RootNode.jack_root.Bip01__pelvis.l_upLeg.l_upLegRoll.transform",
+ "RootNode.jack_root.Bip01__pelvis.l_upLeg.l_loLeg.transform",
+ "RootNode.jack_root.Bip01__pelvis.l_upLeg.l_loLeg.l_ankle",
+ "RootNode.jack_root.Bip01__pelvis.r_upLeg.r_upLegRoll.transform",
+ "RootNode.jack_root.Bip01__pelvis.r_upLeg.r_loLeg.transform",
+ "RootNode.jack_root.Bip01__pelvis.r_upLeg.r_loLeg.r_ankle",
+ "RootNode.jack_root.Bip01__pelvis.spine1.spine2.transform",
+ "RootNode.jack_root.Bip01__pelvis.spine1.spine2.spine3",
+ "RootNode.jack_root.Bip01__pelvis.l_upLeg.l_loLeg.l_ankle.transform",
+ "RootNode.jack_root.Bip01__pelvis.l_upLeg.l_loLeg.l_ankle.l_ball",
+ "RootNode.jack_root.Bip01__pelvis.r_upLeg.r_loLeg.r_ankle.transform",
+ "RootNode.jack_root.Bip01__pelvis.r_upLeg.r_loLeg.r_ankle.r_ball",
+ "RootNode.jack_root.Bip01__pelvis.spine1.spine2.spine3.transform",
+ "RootNode.jack_root.Bip01__pelvis.spine1.spine2.spine3.neck",
+ "RootNode.jack_root.Bip01__pelvis.spine1.spine2.spine3.l_shldr",
+ "RootNode.jack_root.Bip01__pelvis.spine1.spine2.spine3.r_shldr",
+ "RootNode.jack_root.Bip01__pelvis.l_upLeg.l_loLeg.l_ankle.l_ball.transform",
+ "RootNode.jack_root.Bip01__pelvis.r_upLeg.r_loLeg.r_ankle.r_ball.transform",
+ "RootNode.jack_root.Bip01__pelvis.spine1.spine2.spine3.neck.transform",
+ "RootNode.jack_root.Bip01__pelvis.spine1.spine2.spine3.neck.head",
+ "RootNode.jack_root.Bip01__pelvis.spine1.spine2.spine3.l_shldr.transform",
+ "RootNode.jack_root.Bip01__pelvis.spine1.spine2.spine3.l_shldr.l_upArm",
+ "RootNode.jack_root.Bip01__pelvis.spine1.spine2.spine3.r_shldr.transform",
+ "RootNode.jack_root.Bip01__pelvis.spine1.spine2.spine3.r_shldr.r_upArm",
+ "RootNode.jack_root.Bip01__pelvis.spine1.spine2.spine3.neck.head.transform",
+ "RootNode.jack_root.Bip01__pelvis.spine1.spine2.spine3.l_shldr.l_upArm.transform",
+ "RootNode.jack_root.Bip01__pelvis.spine1.spine2.spine3.l_shldr.l_upArm.l_upArmRoll",
+ "RootNode.jack_root.Bip01__pelvis.spine1.spine2.spine3.l_shldr.l_upArm.l_loArm",
+ "RootNode.jack_root.Bip01__pelvis.spine1.spine2.spine3.r_shldr.r_upArm.transform",
+ "RootNode.jack_root.Bip01__pelvis.spine1.spine2.spine3.r_shldr.r_upArm.r_upArmRoll",
+ "RootNode.jack_root.Bip01__pelvis.spine1.spine2.spine3.r_shldr.r_upArm.r_loArm",
+ "RootNode.jack_root.Bip01__pelvis.spine1.spine2.spine3.l_shldr.l_upArm.l_upArmRoll.transform",
+ "RootNode.jack_root.Bip01__pelvis.spine1.spine2.spine3.l_shldr.l_upArm.l_loArm.transform",
+ "RootNode.jack_root.Bip01__pelvis.spine1.spine2.spine3.l_shldr.l_upArm.l_loArm.l_loArmRoll",
+ "RootNode.jack_root.Bip01__pelvis.spine1.spine2.spine3.l_shldr.l_upArm.l_loArm.l_hand",
+ "RootNode.jack_root.Bip01__pelvis.spine1.spine2.spine3.r_shldr.r_upArm.r_upArmRoll.transform",
+ "RootNode.jack_root.Bip01__pelvis.spine1.spine2.spine3.r_shldr.r_upArm.r_loArm.transform",
+ "RootNode.jack_root.Bip01__pelvis.spine1.spine2.spine3.r_shldr.r_upArm.r_loArm.r_loArmRoll",
+ "RootNode.jack_root.Bip01__pelvis.spine1.spine2.spine3.r_shldr.r_upArm.r_loArm.r_hand",
+ "RootNode.jack_root.Bip01__pelvis.spine1.spine2.spine3.l_shldr.l_upArm.l_loArm.l_loArmRoll.transform",
+ "RootNode.jack_root.Bip01__pelvis.spine1.spine2.spine3.l_shldr.l_upArm.l_loArm.l_hand.transform",
+ "RootNode.jack_root.Bip01__pelvis.spine1.spine2.spine3.l_shldr.l_upArm.l_loArm.l_hand.l_thumb1",
+ "RootNode.jack_root.Bip01__pelvis.spine1.spine2.spine3.l_shldr.l_upArm.l_loArm.l_hand.l_index1",
+ "RootNode.jack_root.Bip01__pelvis.spine1.spine2.spine3.l_shldr.l_upArm.l_loArm.l_hand.l_mid1",
+ "RootNode.jack_root.Bip01__pelvis.spine1.spine2.spine3.l_shldr.l_upArm.l_loArm.l_hand.l_metacarpal",
+ "RootNode.jack_root.Bip01__pelvis.spine1.spine2.spine3.l_shldr.l_upArm.l_loArm.l_hand.l_handProp",
+ "RootNode.jack_root.Bip01__pelvis.spine1.spine2.spine3.r_shldr.r_upArm.r_loArm.r_loArmRoll.transform",
+ "RootNode.jack_root.Bip01__pelvis.spine1.spine2.spine3.r_shldr.r_upArm.r_loArm.r_hand.transform",
+ "RootNode.jack_root.Bip01__pelvis.spine1.spine2.spine3.r_shldr.r_upArm.r_loArm.r_hand.r_thumb1",
+ "RootNode.jack_root.Bip01__pelvis.spine1.spine2.spine3.r_shldr.r_upArm.r_loArm.r_hand.r_index1",
+ "RootNode.jack_root.Bip01__pelvis.spine1.spine2.spine3.r_shldr.r_upArm.r_loArm.r_hand.r_mid1",
+ "RootNode.jack_root.Bip01__pelvis.spine1.spine2.spine3.r_shldr.r_upArm.r_loArm.r_hand.r_metacarpal",
+ "RootNode.jack_root.Bip01__pelvis.spine1.spine2.spine3.r_shldr.r_upArm.r_loArm.r_hand.r_handProp",
+ "RootNode.jack_root.Bip01__pelvis.spine1.spine2.spine3.l_shldr.l_upArm.l_loArm.l_hand.l_thumb1.transform",
+ "RootNode.jack_root.Bip01__pelvis.spine1.spine2.spine3.l_shldr.l_upArm.l_loArm.l_hand.l_thumb1.l_thumb2",
+ "RootNode.jack_root.Bip01__pelvis.spine1.spine2.spine3.l_shldr.l_upArm.l_loArm.l_hand.l_index1.transform",
+ "RootNode.jack_root.Bip01__pelvis.spine1.spine2.spine3.l_shldr.l_upArm.l_loArm.l_hand.l_index1.l_index2",
+ "RootNode.jack_root.Bip01__pelvis.spine1.spine2.spine3.l_shldr.l_upArm.l_loArm.l_hand.l_mid1.transform",
+ "RootNode.jack_root.Bip01__pelvis.spine1.spine2.spine3.l_shldr.l_upArm.l_loArm.l_hand.l_mid1.l_mid2",
+ "RootNode.jack_root.Bip01__pelvis.spine1.spine2.spine3.l_shldr.l_upArm.l_loArm.l_hand.l_metacarpal.transform",
+ "RootNode.jack_root.Bip01__pelvis.spine1.spine2.spine3.l_shldr.l_upArm.l_loArm.l_hand.l_metacarpal.l_ring1",
+ "RootNode.jack_root.Bip01__pelvis.spine1.spine2.spine3.l_shldr.l_upArm.l_loArm.l_hand.l_metacarpal.l_pinky1",
+ "RootNode.jack_root.Bip01__pelvis.spine1.spine2.spine3.l_shldr.l_upArm.l_loArm.l_hand.l_handProp.transform",
+ "RootNode.jack_root.Bip01__pelvis.spine1.spine2.spine3.r_shldr.r_upArm.r_loArm.r_hand.r_thumb1.transform",
+ "RootNode.jack_root.Bip01__pelvis.spine1.spine2.spine3.r_shldr.r_upArm.r_loArm.r_hand.r_thumb1.r_thumb2",
+ "RootNode.jack_root.Bip01__pelvis.spine1.spine2.spine3.r_shldr.r_upArm.r_loArm.r_hand.r_index1.transform",
+ "RootNode.jack_root.Bip01__pelvis.spine1.spine2.spine3.r_shldr.r_upArm.r_loArm.r_hand.r_index1.r_index2",
+ "RootNode.jack_root.Bip01__pelvis.spine1.spine2.spine3.r_shldr.r_upArm.r_loArm.r_hand.r_mid1.transform",
+ "RootNode.jack_root.Bip01__pelvis.spine1.spine2.spine3.r_shldr.r_upArm.r_loArm.r_hand.r_mid1.r_mid2",
+ "RootNode.jack_root.Bip01__pelvis.spine1.spine2.spine3.r_shldr.r_upArm.r_loArm.r_hand.r_metacarpal.transform",
+ "RootNode.jack_root.Bip01__pelvis.spine1.spine2.spine3.r_shldr.r_upArm.r_loArm.r_hand.r_metacarpal.r_ring1",
+ "RootNode.jack_root.Bip01__pelvis.spine1.spine2.spine3.r_shldr.r_upArm.r_loArm.r_hand.r_metacarpal.r_pinky1",
+ "RootNode.jack_root.Bip01__pelvis.spine1.spine2.spine3.r_shldr.r_upArm.r_loArm.r_hand.r_handProp.transform",
+ "RootNode.jack_root.Bip01__pelvis.spine1.spine2.spine3.l_shldr.l_upArm.l_loArm.l_hand.l_thumb1.l_thumb2.transform",
+ "RootNode.jack_root.Bip01__pelvis.spine1.spine2.spine3.l_shldr.l_upArm.l_loArm.l_hand.l_thumb1.l_thumb2.l_thumb3",
+ "RootNode.jack_root.Bip01__pelvis.spine1.spine2.spine3.l_shldr.l_upArm.l_loArm.l_hand.l_index1.l_index2.transform",
+ "RootNode.jack_root.Bip01__pelvis.spine1.spine2.spine3.l_shldr.l_upArm.l_loArm.l_hand.l_index1.l_index2.l_index3",
+ "RootNode.jack_root.Bip01__pelvis.spine1.spine2.spine3.l_shldr.l_upArm.l_loArm.l_hand.l_mid1.l_mid2.transform",
+ "RootNode.jack_root.Bip01__pelvis.spine1.spine2.spine3.l_shldr.l_upArm.l_loArm.l_hand.l_mid1.l_mid2.l_mid3",
+ "RootNode.jack_root.Bip01__pelvis.spine1.spine2.spine3.l_shldr.l_upArm.l_loArm.l_hand.l_metacarpal.l_ring1.transform",
+ "RootNode.jack_root.Bip01__pelvis.spine1.spine2.spine3.l_shldr.l_upArm.l_loArm.l_hand.l_metacarpal.l_ring1.l_ring2",
+ "RootNode.jack_root.Bip01__pelvis.spine1.spine2.spine3.l_shldr.l_upArm.l_loArm.l_hand.l_metacarpal.l_pinky1.transform",
+ "RootNode.jack_root.Bip01__pelvis.spine1.spine2.spine3.l_shldr.l_upArm.l_loArm.l_hand.l_metacarpal.l_pinky1.l_pinky2",
+ "RootNode.jack_root.Bip01__pelvis.spine1.spine2.spine3.r_shldr.r_upArm.r_loArm.r_hand.r_thumb1.r_thumb2.transform",
+ "RootNode.jack_root.Bip01__pelvis.spine1.spine2.spine3.r_shldr.r_upArm.r_loArm.r_hand.r_thumb1.r_thumb2.r_thumb3",
+ "RootNode.jack_root.Bip01__pelvis.spine1.spine2.spine3.r_shldr.r_upArm.r_loArm.r_hand.r_index1.r_index2.transform",
+ "RootNode.jack_root.Bip01__pelvis.spine1.spine2.spine3.r_shldr.r_upArm.r_loArm.r_hand.r_index1.r_index2.r_index3",
+ "RootNode.jack_root.Bip01__pelvis.spine1.spine2.spine3.r_shldr.r_upArm.r_loArm.r_hand.r_mid1.r_mid2.transform",
+ "RootNode.jack_root.Bip01__pelvis.spine1.spine2.spine3.r_shldr.r_upArm.r_loArm.r_hand.r_mid1.r_mid2.r_mid3",
+ "RootNode.jack_root.Bip01__pelvis.spine1.spine2.spine3.r_shldr.r_upArm.r_loArm.r_hand.r_metacarpal.r_ring1.transform",
+ "RootNode.jack_root.Bip01__pelvis.spine1.spine2.spine3.r_shldr.r_upArm.r_loArm.r_hand.r_metacarpal.r_ring1.r_ring2",
+ "RootNode.jack_root.Bip01__pelvis.spine1.spine2.spine3.r_shldr.r_upArm.r_loArm.r_hand.r_metacarpal.r_pinky1.transform",
+ "RootNode.jack_root.Bip01__pelvis.spine1.spine2.spine3.r_shldr.r_upArm.r_loArm.r_hand.r_metacarpal.r_pinky1.r_pinky2",
+ "RootNode.jack_root.Bip01__pelvis.spine1.spine2.spine3.l_shldr.l_upArm.l_loArm.l_hand.l_thumb1.l_thumb2.l_thumb3.transform",
+ "RootNode.jack_root.Bip01__pelvis.spine1.spine2.spine3.l_shldr.l_upArm.l_loArm.l_hand.l_index1.l_index2.l_index3.transform",
+ "RootNode.jack_root.Bip01__pelvis.spine1.spine2.spine3.l_shldr.l_upArm.l_loArm.l_hand.l_mid1.l_mid2.l_mid3.transform",
+ "RootNode.jack_root.Bip01__pelvis.spine1.spine2.spine3.l_shldr.l_upArm.l_loArm.l_hand.l_metacarpal.l_ring1.l_ring2.transform",
+ "RootNode.jack_root.Bip01__pelvis.spine1.spine2.spine3.l_shldr.l_upArm.l_loArm.l_hand.l_metacarpal.l_ring1.l_ring2.l_ring3",
+ "RootNode.jack_root.Bip01__pelvis.spine1.spine2.spine3.l_shldr.l_upArm.l_loArm.l_hand.l_metacarpal.l_pinky1.l_pinky2.transform",
+ "RootNode.jack_root.Bip01__pelvis.spine1.spine2.spine3.l_shldr.l_upArm.l_loArm.l_hand.l_metacarpal.l_pinky1.l_pinky2.l_pinky3",
+ "RootNode.jack_root.Bip01__pelvis.spine1.spine2.spine3.r_shldr.r_upArm.r_loArm.r_hand.r_thumb1.r_thumb2.r_thumb3.transform",
+ "RootNode.jack_root.Bip01__pelvis.spine1.spine2.spine3.r_shldr.r_upArm.r_loArm.r_hand.r_index1.r_index2.r_index3.transform",
+ "RootNode.jack_root.Bip01__pelvis.spine1.spine2.spine3.r_shldr.r_upArm.r_loArm.r_hand.r_mid1.r_mid2.r_mid3.transform",
+ "RootNode.jack_root.Bip01__pelvis.spine1.spine2.spine3.r_shldr.r_upArm.r_loArm.r_hand.r_metacarpal.r_ring1.r_ring2.transform",
+ "RootNode.jack_root.Bip01__pelvis.spine1.spine2.spine3.r_shldr.r_upArm.r_loArm.r_hand.r_metacarpal.r_ring1.r_ring2.r_ring3",
+ "RootNode.jack_root.Bip01__pelvis.spine1.spine2.spine3.r_shldr.r_upArm.r_loArm.r_hand.r_metacarpal.r_pinky1.r_pinky2.transform",
+ "RootNode.jack_root.Bip01__pelvis.spine1.spine2.spine3.r_shldr.r_upArm.r_loArm.r_hand.r_metacarpal.r_pinky1.r_pinky2.r_pinky3",
+ "RootNode.jack_root.Bip01__pelvis.spine1.spine2.spine3.l_shldr.l_upArm.l_loArm.l_hand.l_metacarpal.l_ring1.l_ring2.l_ring3.transform",
+ "RootNode.jack_root.Bip01__pelvis.spine1.spine2.spine3.l_shldr.l_upArm.l_loArm.l_hand.l_metacarpal.l_pinky1.l_pinky2.l_pinky3.transform",
+ "RootNode.jack_root.Bip01__pelvis.spine1.spine2.spine3.r_shldr.r_upArm.r_loArm.r_hand.r_metacarpal.r_ring1.r_ring2.r_ring3.transform",
+ "RootNode.jack_root.Bip01__pelvis.spine1.spine2.spine3.r_shldr.r_upArm.r_loArm.r_hand.r_metacarpal.r_pinky1.r_pinky2.r_pinky3.transform"
+ ]
+ }
+ },
+ {
+ "$type": "{07B356B7-3635-40B5-878A-FAC4EFD5AD86} MeshGroup",
+ "name": "Jack",
+ "nodeSelectionList": {
+ "selectedNodes": [
+ "RootNode",
+ "RootNode.jack_root",
+ "RootNode.jack_meshZUp",
+ "RootNode.jack_root.Bip01__pelvis",
+ "RootNode.jack_meshZUp.jack_meshZUp_1",
+ "RootNode.jack_meshZUp.jack_meshZUp_2",
+ "RootNode.jack_root.Bip01__pelvis.transform",
+ "RootNode.jack_root.Bip01__pelvis.l_upLeg",
+ "RootNode.jack_root.Bip01__pelvis.r_upLeg",
+ "RootNode.jack_root.Bip01__pelvis.spine1",
+ "RootNode.jack_meshZUp.jack_meshZUp_1.Bitangent",
+ "RootNode.jack_meshZUp.jack_meshZUp_1.SkinWeight_",
+ "RootNode.jack_meshZUp.jack_meshZUp_1.transform",
+ "RootNode.jack_meshZUp.jack_meshZUp_1.Tangent",
+ "RootNode.jack_meshZUp.jack_meshZUp_1.map1",
+ "RootNode.jack_meshZUp.jack_meshZUp_1.jack",
+ "RootNode.jack_meshZUp.jack_meshZUp_2.Bitangent",
+ "RootNode.jack_meshZUp.jack_meshZUp_2.SkinWeight_",
+ "RootNode.jack_meshZUp.jack_meshZUp_2.transform",
+ "RootNode.jack_meshZUp.jack_meshZUp_2.Tangent",
+ "RootNode.jack_meshZUp.jack_meshZUp_2.map1",
+ "RootNode.jack_meshZUp.jack_meshZUp_2.jack",
+ "RootNode.jack_root.Bip01__pelvis.l_upLeg.transform",
+ "RootNode.jack_root.Bip01__pelvis.l_upLeg.l_upLegRoll",
+ "RootNode.jack_root.Bip01__pelvis.l_upLeg.l_loLeg",
+ "RootNode.jack_root.Bip01__pelvis.r_upLeg.transform",
+ "RootNode.jack_root.Bip01__pelvis.r_upLeg.r_upLegRoll",
+ "RootNode.jack_root.Bip01__pelvis.r_upLeg.r_loLeg",
+ "RootNode.jack_root.Bip01__pelvis.spine1.transform",
+ "RootNode.jack_root.Bip01__pelvis.spine1.spine2",
+ "RootNode.jack_root.Bip01__pelvis.l_upLeg.l_upLegRoll.transform",
+ "RootNode.jack_root.Bip01__pelvis.l_upLeg.l_loLeg.transform",
+ "RootNode.jack_root.Bip01__pelvis.l_upLeg.l_loLeg.l_ankle",
+ "RootNode.jack_root.Bip01__pelvis.r_upLeg.r_upLegRoll.transform",
+ "RootNode.jack_root.Bip01__pelvis.r_upLeg.r_loLeg.transform",
+ "RootNode.jack_root.Bip01__pelvis.r_upLeg.r_loLeg.r_ankle",
+ "RootNode.jack_root.Bip01__pelvis.spine1.spine2.transform",
+ "RootNode.jack_root.Bip01__pelvis.spine1.spine2.spine3",
+ "RootNode.jack_root.Bip01__pelvis.l_upLeg.l_loLeg.l_ankle.transform",
+ "RootNode.jack_root.Bip01__pelvis.l_upLeg.l_loLeg.l_ankle.l_ball",
+ "RootNode.jack_root.Bip01__pelvis.r_upLeg.r_loLeg.r_ankle.transform",
+ "RootNode.jack_root.Bip01__pelvis.r_upLeg.r_loLeg.r_ankle.r_ball",
+ "RootNode.jack_root.Bip01__pelvis.spine1.spine2.spine3.transform",
+ "RootNode.jack_root.Bip01__pelvis.spine1.spine2.spine3.neck",
+ "RootNode.jack_root.Bip01__pelvis.spine1.spine2.spine3.l_shldr",
+ "RootNode.jack_root.Bip01__pelvis.spine1.spine2.spine3.r_shldr",
+ "RootNode.jack_root.Bip01__pelvis.l_upLeg.l_loLeg.l_ankle.l_ball.transform",
+ "RootNode.jack_root.Bip01__pelvis.r_upLeg.r_loLeg.r_ankle.r_ball.transform",
+ "RootNode.jack_root.Bip01__pelvis.spine1.spine2.spine3.neck.transform",
+ "RootNode.jack_root.Bip01__pelvis.spine1.spine2.spine3.neck.head",
+ "RootNode.jack_root.Bip01__pelvis.spine1.spine2.spine3.l_shldr.transform",
+ "RootNode.jack_root.Bip01__pelvis.spine1.spine2.spine3.l_shldr.l_upArm",
+ "RootNode.jack_root.Bip01__pelvis.spine1.spine2.spine3.r_shldr.transform",
+ "RootNode.jack_root.Bip01__pelvis.spine1.spine2.spine3.r_shldr.r_upArm",
+ "RootNode.jack_root.Bip01__pelvis.spine1.spine2.spine3.neck.head.transform",
+ "RootNode.jack_root.Bip01__pelvis.spine1.spine2.spine3.l_shldr.l_upArm.transform",
+ "RootNode.jack_root.Bip01__pelvis.spine1.spine2.spine3.l_shldr.l_upArm.l_upArmRoll",
+ "RootNode.jack_root.Bip01__pelvis.spine1.spine2.spine3.l_shldr.l_upArm.l_loArm",
+ "RootNode.jack_root.Bip01__pelvis.spine1.spine2.spine3.r_shldr.r_upArm.transform",
+ "RootNode.jack_root.Bip01__pelvis.spine1.spine2.spine3.r_shldr.r_upArm.r_upArmRoll",
+ "RootNode.jack_root.Bip01__pelvis.spine1.spine2.spine3.r_shldr.r_upArm.r_loArm",
+ "RootNode.jack_root.Bip01__pelvis.spine1.spine2.spine3.l_shldr.l_upArm.l_upArmRoll.transform",
+ "RootNode.jack_root.Bip01__pelvis.spine1.spine2.spine3.l_shldr.l_upArm.l_loArm.transform",
+ "RootNode.jack_root.Bip01__pelvis.spine1.spine2.spine3.l_shldr.l_upArm.l_loArm.l_loArmRoll",
+ "RootNode.jack_root.Bip01__pelvis.spine1.spine2.spine3.l_shldr.l_upArm.l_loArm.l_hand",
+ "RootNode.jack_root.Bip01__pelvis.spine1.spine2.spine3.r_shldr.r_upArm.r_upArmRoll.transform",
+ "RootNode.jack_root.Bip01__pelvis.spine1.spine2.spine3.r_shldr.r_upArm.r_loArm.transform",
+ "RootNode.jack_root.Bip01__pelvis.spine1.spine2.spine3.r_shldr.r_upArm.r_loArm.r_loArmRoll",
+ "RootNode.jack_root.Bip01__pelvis.spine1.spine2.spine3.r_shldr.r_upArm.r_loArm.r_hand",
+ "RootNode.jack_root.Bip01__pelvis.spine1.spine2.spine3.l_shldr.l_upArm.l_loArm.l_loArmRoll.transform",
+ "RootNode.jack_root.Bip01__pelvis.spine1.spine2.spine3.l_shldr.l_upArm.l_loArm.l_hand.transform",
+ "RootNode.jack_root.Bip01__pelvis.spine1.spine2.spine3.l_shldr.l_upArm.l_loArm.l_hand.l_thumb1",
+ "RootNode.jack_root.Bip01__pelvis.spine1.spine2.spine3.l_shldr.l_upArm.l_loArm.l_hand.l_index1",
+ "RootNode.jack_root.Bip01__pelvis.spine1.spine2.spine3.l_shldr.l_upArm.l_loArm.l_hand.l_mid1",
+ "RootNode.jack_root.Bip01__pelvis.spine1.spine2.spine3.l_shldr.l_upArm.l_loArm.l_hand.l_metacarpal",
+ "RootNode.jack_root.Bip01__pelvis.spine1.spine2.spine3.l_shldr.l_upArm.l_loArm.l_hand.l_handProp",
+ "RootNode.jack_root.Bip01__pelvis.spine1.spine2.spine3.r_shldr.r_upArm.r_loArm.r_loArmRoll.transform",
+ "RootNode.jack_root.Bip01__pelvis.spine1.spine2.spine3.r_shldr.r_upArm.r_loArm.r_hand.transform",
+ "RootNode.jack_root.Bip01__pelvis.spine1.spine2.spine3.r_shldr.r_upArm.r_loArm.r_hand.r_thumb1",
+ "RootNode.jack_root.Bip01__pelvis.spine1.spine2.spine3.r_shldr.r_upArm.r_loArm.r_hand.r_index1",
+ "RootNode.jack_root.Bip01__pelvis.spine1.spine2.spine3.r_shldr.r_upArm.r_loArm.r_hand.r_mid1",
+ "RootNode.jack_root.Bip01__pelvis.spine1.spine2.spine3.r_shldr.r_upArm.r_loArm.r_hand.r_metacarpal",
+ "RootNode.jack_root.Bip01__pelvis.spine1.spine2.spine3.r_shldr.r_upArm.r_loArm.r_hand.r_handProp",
+ "RootNode.jack_root.Bip01__pelvis.spine1.spine2.spine3.l_shldr.l_upArm.l_loArm.l_hand.l_thumb1.transform",
+ "RootNode.jack_root.Bip01__pelvis.spine1.spine2.spine3.l_shldr.l_upArm.l_loArm.l_hand.l_thumb1.l_thumb2",
+ "RootNode.jack_root.Bip01__pelvis.spine1.spine2.spine3.l_shldr.l_upArm.l_loArm.l_hand.l_index1.transform",
+ "RootNode.jack_root.Bip01__pelvis.spine1.spine2.spine3.l_shldr.l_upArm.l_loArm.l_hand.l_index1.l_index2",
+ "RootNode.jack_root.Bip01__pelvis.spine1.spine2.spine3.l_shldr.l_upArm.l_loArm.l_hand.l_mid1.transform",
+ "RootNode.jack_root.Bip01__pelvis.spine1.spine2.spine3.l_shldr.l_upArm.l_loArm.l_hand.l_mid1.l_mid2",
+ "RootNode.jack_root.Bip01__pelvis.spine1.spine2.spine3.l_shldr.l_upArm.l_loArm.l_hand.l_metacarpal.transform",
+ "RootNode.jack_root.Bip01__pelvis.spine1.spine2.spine3.l_shldr.l_upArm.l_loArm.l_hand.l_metacarpal.l_ring1",
+ "RootNode.jack_root.Bip01__pelvis.spine1.spine2.spine3.l_shldr.l_upArm.l_loArm.l_hand.l_metacarpal.l_pinky1",
+ "RootNode.jack_root.Bip01__pelvis.spine1.spine2.spine3.l_shldr.l_upArm.l_loArm.l_hand.l_handProp.transform",
+ "RootNode.jack_root.Bip01__pelvis.spine1.spine2.spine3.r_shldr.r_upArm.r_loArm.r_hand.r_thumb1.transform",
+ "RootNode.jack_root.Bip01__pelvis.spine1.spine2.spine3.r_shldr.r_upArm.r_loArm.r_hand.r_thumb1.r_thumb2",
+ "RootNode.jack_root.Bip01__pelvis.spine1.spine2.spine3.r_shldr.r_upArm.r_loArm.r_hand.r_index1.transform",
+ "RootNode.jack_root.Bip01__pelvis.spine1.spine2.spine3.r_shldr.r_upArm.r_loArm.r_hand.r_index1.r_index2",
+ "RootNode.jack_root.Bip01__pelvis.spine1.spine2.spine3.r_shldr.r_upArm.r_loArm.r_hand.r_mid1.transform",
+ "RootNode.jack_root.Bip01__pelvis.spine1.spine2.spine3.r_shldr.r_upArm.r_loArm.r_hand.r_mid1.r_mid2",
+ "RootNode.jack_root.Bip01__pelvis.spine1.spine2.spine3.r_shldr.r_upArm.r_loArm.r_hand.r_metacarpal.transform",
+ "RootNode.jack_root.Bip01__pelvis.spine1.spine2.spine3.r_shldr.r_upArm.r_loArm.r_hand.r_metacarpal.r_ring1",
+ "RootNode.jack_root.Bip01__pelvis.spine1.spine2.spine3.r_shldr.r_upArm.r_loArm.r_hand.r_metacarpal.r_pinky1",
+ "RootNode.jack_root.Bip01__pelvis.spine1.spine2.spine3.r_shldr.r_upArm.r_loArm.r_hand.r_handProp.transform",
+ "RootNode.jack_root.Bip01__pelvis.spine1.spine2.spine3.l_shldr.l_upArm.l_loArm.l_hand.l_thumb1.l_thumb2.transform",
+ "RootNode.jack_root.Bip01__pelvis.spine1.spine2.spine3.l_shldr.l_upArm.l_loArm.l_hand.l_thumb1.l_thumb2.l_thumb3",
+ "RootNode.jack_root.Bip01__pelvis.spine1.spine2.spine3.l_shldr.l_upArm.l_loArm.l_hand.l_index1.l_index2.transform",
+ "RootNode.jack_root.Bip01__pelvis.spine1.spine2.spine3.l_shldr.l_upArm.l_loArm.l_hand.l_index1.l_index2.l_index3",
+ "RootNode.jack_root.Bip01__pelvis.spine1.spine2.spine3.l_shldr.l_upArm.l_loArm.l_hand.l_mid1.l_mid2.transform",
+ "RootNode.jack_root.Bip01__pelvis.spine1.spine2.spine3.l_shldr.l_upArm.l_loArm.l_hand.l_mid1.l_mid2.l_mid3",
+ "RootNode.jack_root.Bip01__pelvis.spine1.spine2.spine3.l_shldr.l_upArm.l_loArm.l_hand.l_metacarpal.l_ring1.transform",
+ "RootNode.jack_root.Bip01__pelvis.spine1.spine2.spine3.l_shldr.l_upArm.l_loArm.l_hand.l_metacarpal.l_ring1.l_ring2",
+ "RootNode.jack_root.Bip01__pelvis.spine1.spine2.spine3.l_shldr.l_upArm.l_loArm.l_hand.l_metacarpal.l_pinky1.transform",
+ "RootNode.jack_root.Bip01__pelvis.spine1.spine2.spine3.l_shldr.l_upArm.l_loArm.l_hand.l_metacarpal.l_pinky1.l_pinky2",
+ "RootNode.jack_root.Bip01__pelvis.spine1.spine2.spine3.r_shldr.r_upArm.r_loArm.r_hand.r_thumb1.r_thumb2.transform",
+ "RootNode.jack_root.Bip01__pelvis.spine1.spine2.spine3.r_shldr.r_upArm.r_loArm.r_hand.r_thumb1.r_thumb2.r_thumb3",
+ "RootNode.jack_root.Bip01__pelvis.spine1.spine2.spine3.r_shldr.r_upArm.r_loArm.r_hand.r_index1.r_index2.transform",
+ "RootNode.jack_root.Bip01__pelvis.spine1.spine2.spine3.r_shldr.r_upArm.r_loArm.r_hand.r_index1.r_index2.r_index3",
+ "RootNode.jack_root.Bip01__pelvis.spine1.spine2.spine3.r_shldr.r_upArm.r_loArm.r_hand.r_mid1.r_mid2.transform",
+ "RootNode.jack_root.Bip01__pelvis.spine1.spine2.spine3.r_shldr.r_upArm.r_loArm.r_hand.r_mid1.r_mid2.r_mid3",
+ "RootNode.jack_root.Bip01__pelvis.spine1.spine2.spine3.r_shldr.r_upArm.r_loArm.r_hand.r_metacarpal.r_ring1.transform",
+ "RootNode.jack_root.Bip01__pelvis.spine1.spine2.spine3.r_shldr.r_upArm.r_loArm.r_hand.r_metacarpal.r_ring1.r_ring2",
+ "RootNode.jack_root.Bip01__pelvis.spine1.spine2.spine3.r_shldr.r_upArm.r_loArm.r_hand.r_metacarpal.r_pinky1.transform",
+ "RootNode.jack_root.Bip01__pelvis.spine1.spine2.spine3.r_shldr.r_upArm.r_loArm.r_hand.r_metacarpal.r_pinky1.r_pinky2",
+ "RootNode.jack_root.Bip01__pelvis.spine1.spine2.spine3.l_shldr.l_upArm.l_loArm.l_hand.l_thumb1.l_thumb2.l_thumb3.transform",
+ "RootNode.jack_root.Bip01__pelvis.spine1.spine2.spine3.l_shldr.l_upArm.l_loArm.l_hand.l_index1.l_index2.l_index3.transform",
+ "RootNode.jack_root.Bip01__pelvis.spine1.spine2.spine3.l_shldr.l_upArm.l_loArm.l_hand.l_mid1.l_mid2.l_mid3.transform",
+ "RootNode.jack_root.Bip01__pelvis.spine1.spine2.spine3.l_shldr.l_upArm.l_loArm.l_hand.l_metacarpal.l_ring1.l_ring2.transform",
+ "RootNode.jack_root.Bip01__pelvis.spine1.spine2.spine3.l_shldr.l_upArm.l_loArm.l_hand.l_metacarpal.l_ring1.l_ring2.l_ring3",
+ "RootNode.jack_root.Bip01__pelvis.spine1.spine2.spine3.l_shldr.l_upArm.l_loArm.l_hand.l_metacarpal.l_pinky1.l_pinky2.transform",
+ "RootNode.jack_root.Bip01__pelvis.spine1.spine2.spine3.l_shldr.l_upArm.l_loArm.l_hand.l_metacarpal.l_pinky1.l_pinky2.l_pinky3",
+ "RootNode.jack_root.Bip01__pelvis.spine1.spine2.spine3.r_shldr.r_upArm.r_loArm.r_hand.r_thumb1.r_thumb2.r_thumb3.transform",
+ "RootNode.jack_root.Bip01__pelvis.spine1.spine2.spine3.r_shldr.r_upArm.r_loArm.r_hand.r_index1.r_index2.r_index3.transform",
+ "RootNode.jack_root.Bip01__pelvis.spine1.spine2.spine3.r_shldr.r_upArm.r_loArm.r_hand.r_mid1.r_mid2.r_mid3.transform",
+ "RootNode.jack_root.Bip01__pelvis.spine1.spine2.spine3.r_shldr.r_upArm.r_loArm.r_hand.r_metacarpal.r_ring1.r_ring2.transform",
+ "RootNode.jack_root.Bip01__pelvis.spine1.spine2.spine3.r_shldr.r_upArm.r_loArm.r_hand.r_metacarpal.r_ring1.r_ring2.r_ring3",
+ "RootNode.jack_root.Bip01__pelvis.spine1.spine2.spine3.r_shldr.r_upArm.r_loArm.r_hand.r_metacarpal.r_pinky1.r_pinky2.transform",
+ "RootNode.jack_root.Bip01__pelvis.spine1.spine2.spine3.r_shldr.r_upArm.r_loArm.r_hand.r_metacarpal.r_pinky1.r_pinky2.r_pinky3",
+ "RootNode.jack_root.Bip01__pelvis.spine1.spine2.spine3.l_shldr.l_upArm.l_loArm.l_hand.l_metacarpal.l_ring1.l_ring2.l_ring3.transform",
+ "RootNode.jack_root.Bip01__pelvis.spine1.spine2.spine3.l_shldr.l_upArm.l_loArm.l_hand.l_metacarpal.l_pinky1.l_pinky2.l_pinky3.transform",
+ "RootNode.jack_root.Bip01__pelvis.spine1.spine2.spine3.r_shldr.r_upArm.r_loArm.r_hand.r_metacarpal.r_ring1.r_ring2.r_ring3.transform",
+ "RootNode.jack_root.Bip01__pelvis.spine1.spine2.spine3.r_shldr.r_upArm.r_loArm.r_hand.r_metacarpal.r_pinky1.r_pinky2.r_pinky3.transform"
+ ]
+ },
+ "rules": {
+ "rules": [
+ {
+ "$type": "SkinRule"
+ },
+ {
+ "$type": "MaterialRule"
+ }
+ ]
+ },
+ "id": "{59B1DB76-5B27-5569-8DF6-55296FD0E5D8}"
+ }
+ ]
+}
\ No newline at end of file
diff --git a/AutomatedTesting/Objects/Characters/Jack/Jack.mtl b/AutomatedTesting/Objects/Characters/Jack/Jack.mtl
deleted file mode 100644
index 2af23cc798..0000000000
--- a/AutomatedTesting/Objects/Characters/Jack/Jack.mtl
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/AutomatedTesting/Objects/Characters/Jack/attachments/arm_plates_lower_01.cgf b/AutomatedTesting/Objects/Characters/Jack/attachments/arm_plates_lower_01.cgf
deleted file mode 100644
index a9530b6d1b..0000000000
--- a/AutomatedTesting/Objects/Characters/Jack/attachments/arm_plates_lower_01.cgf
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:bb1c97394454a0a0c3b4aaf8380878aac3f7bedc9091ec920963932ad6ad2290
-size 30484
diff --git a/AutomatedTesting/Objects/Characters/Jack/attachments/arm_plates_upper_01.cgf b/AutomatedTesting/Objects/Characters/Jack/attachments/arm_plates_upper_01.cgf
deleted file mode 100644
index 781ff1fe50..0000000000
--- a/AutomatedTesting/Objects/Characters/Jack/attachments/arm_plates_upper_01.cgf
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d090219fc20e7c1d9f0c187f976a7cb55e5b27b39e087aa8281ac794f314cb32
-size 22364
diff --git a/AutomatedTesting/Objects/Characters/Jack/attachments/back_pack_01.cgf b/AutomatedTesting/Objects/Characters/Jack/attachments/back_pack_01.cgf
deleted file mode 100644
index 0e59a1393d..0000000000
--- a/AutomatedTesting/Objects/Characters/Jack/attachments/back_pack_01.cgf
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:8fa78264ca46a2f201e24c3ba6a543e713bf9fd984df0a10f52b191d21077227
-size 106676
diff --git a/AutomatedTesting/Objects/Characters/Jack/attachments/head_aerial_01.cgf b/AutomatedTesting/Objects/Characters/Jack/attachments/head_aerial_01.cgf
deleted file mode 100644
index cc54ba4b64..0000000000
--- a/AutomatedTesting/Objects/Characters/Jack/attachments/head_aerial_01.cgf
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ebf610eecec9a4da2d5c9260c48b81f6a04eaf7686d69850ad9f5d06fdbcf183
-size 12940
diff --git a/AutomatedTesting/Objects/Characters/Jack/attachments/jack_matGroup.mtl b/AutomatedTesting/Objects/Characters/Jack/attachments/jack_matGroup.mtl
deleted file mode 100644
index ebade464ec..0000000000
--- a/AutomatedTesting/Objects/Characters/Jack/attachments/jack_matGroup.mtl
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/AutomatedTesting/Objects/Characters/Jack/attachments/leg_plate_l_01.cgf b/AutomatedTesting/Objects/Characters/Jack/attachments/leg_plate_l_01.cgf
deleted file mode 100644
index 3ffabb1464..0000000000
--- a/AutomatedTesting/Objects/Characters/Jack/attachments/leg_plate_l_01.cgf
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:30afe8cf6e4aca846b07ef81747607afb47c0ff88283f363aca29ded9818c3db
-size 8148
diff --git a/AutomatedTesting/Objects/Characters/Jack/attachments/leg_plate_r_01.cgf b/AutomatedTesting/Objects/Characters/Jack/attachments/leg_plate_r_01.cgf
deleted file mode 100644
index e98083d030..0000000000
--- a/AutomatedTesting/Objects/Characters/Jack/attachments/leg_plate_r_01.cgf
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:dba25dd8b3840d01aefb69007919b07befc5365fff714493c87cf1eff644d5dc
-size 8148
diff --git a/AutomatedTesting/Objects/Characters/Jack/dummyPlane_mat_group.mtl b/AutomatedTesting/Objects/Characters/Jack/dummyPlane_mat_group.mtl
deleted file mode 100644
index 4545010b7e..0000000000
--- a/AutomatedTesting/Objects/Characters/Jack/dummyPlane_mat_group.mtl
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
-
-
-
-
diff --git a/AutomatedTesting/Objects/Characters/Jack/enemy_matGroup.mtl b/AutomatedTesting/Objects/Characters/Jack/enemy_matGroup.mtl
deleted file mode 100644
index 523dac897f..0000000000
--- a/AutomatedTesting/Objects/Characters/Jack/enemy_matGroup.mtl
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/AutomatedTesting/Objects/Characters/Jack/enemy_runner_matGroup.mtl b/AutomatedTesting/Objects/Characters/Jack/enemy_runner_matGroup.mtl
deleted file mode 100644
index 95c40eeb65..0000000000
--- a/AutomatedTesting/Objects/Characters/Jack/enemy_runner_matGroup.mtl
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/AutomatedTesting/Objects/Characters/Jack/enemy_tank_matGroup.mtl b/AutomatedTesting/Objects/Characters/Jack/enemy_tank_matGroup.mtl
deleted file mode 100644
index e0f18e9f69..0000000000
--- a/AutomatedTesting/Objects/Characters/Jack/enemy_tank_matGroup.mtl
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/AutomatedTesting/Objects/Characters/Jack/jack_matGroup.mtl b/AutomatedTesting/Objects/Characters/Jack/jack_matGroup.mtl
deleted file mode 100644
index 3927661f97..0000000000
--- a/AutomatedTesting/Objects/Characters/Jack/jack_matGroup.mtl
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/AutomatedTesting/Objects/Characters/Jack/textures/BrokenRobot_01_ddna.tif b/AutomatedTesting/Objects/Characters/Jack/textures/BrokenRobot_01_ddna.tif
deleted file mode 100644
index 378e0ea6ed..0000000000
--- a/AutomatedTesting/Objects/Characters/Jack/textures/BrokenRobot_01_ddna.tif
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ca5c900fabf8b5c8c9313a0144886f4da3f812c82e8cffd652d9c61b9bb5b953
-size 4221960
diff --git a/AutomatedTesting/Objects/Characters/Jack/textures/BrokenRobot_01_ddna.tif.exportsettings b/AutomatedTesting/Objects/Characters/Jack/textures/BrokenRobot_01_ddna.tif.exportsettings
deleted file mode 100644
index 10f3182ac9..0000000000
--- a/AutomatedTesting/Objects/Characters/Jack/textures/BrokenRobot_01_ddna.tif.exportsettings
+++ /dev/null
@@ -1 +0,0 @@
-/autooptimizefile=0 /preset=NormalsWithSmoothness /reduce=0
\ No newline at end of file
diff --git a/AutomatedTesting/Objects/Characters/Jack/textures/BrokenRobot_White_diff.tif b/AutomatedTesting/Objects/Characters/Jack/textures/BrokenRobot_White_diff.tif
deleted file mode 100644
index 5b4a3c3518..0000000000
--- a/AutomatedTesting/Objects/Characters/Jack/textures/BrokenRobot_White_diff.tif
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:80f40a78e4b21dd27f5ddf34337e7d0e2119b7cfa08f0eea38d4b1d63808821f
-size 3178996
diff --git a/AutomatedTesting/Objects/Characters/Jack/textures/BrokenRobot_White_diff.tif.exportsettings b/AutomatedTesting/Objects/Characters/Jack/textures/BrokenRobot_White_diff.tif.exportsettings
deleted file mode 100644
index 2d1dccbf99..0000000000
--- a/AutomatedTesting/Objects/Characters/Jack/textures/BrokenRobot_White_diff.tif.exportsettings
+++ /dev/null
@@ -1 +0,0 @@
-/autooptimizefile=0 /preset=Albedo /reduce=0
\ No newline at end of file
diff --git a/AutomatedTesting/Objects/Characters/Jack/textures/BrokenRobot_White_emis.tif b/AutomatedTesting/Objects/Characters/Jack/textures/BrokenRobot_White_emis.tif
deleted file mode 100644
index a85ac62f6c..0000000000
--- a/AutomatedTesting/Objects/Characters/Jack/textures/BrokenRobot_White_emis.tif
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e5f5e327624e0f1fd35fac141019941b12ad0642c25853be9f7fd5b9b6f91bc5
-size 3168212
diff --git a/AutomatedTesting/Objects/Characters/Jack/textures/BrokenRobot_White_emis.tif.exportsettings b/AutomatedTesting/Objects/Characters/Jack/textures/BrokenRobot_White_emis.tif.exportsettings
deleted file mode 100644
index 2d1dccbf99..0000000000
--- a/AutomatedTesting/Objects/Characters/Jack/textures/BrokenRobot_White_emis.tif.exportsettings
+++ /dev/null
@@ -1 +0,0 @@
-/autooptimizefile=0 /preset=Albedo /reduce=0
\ No newline at end of file
diff --git a/AutomatedTesting/Objects/Characters/Jack/textures/BrokenRobot_black_diff.tif b/AutomatedTesting/Objects/Characters/Jack/textures/BrokenRobot_black_diff.tif
deleted file mode 100644
index c861056eea..0000000000
--- a/AutomatedTesting/Objects/Characters/Jack/textures/BrokenRobot_black_diff.tif
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:089e74ca9a41967038e16a9107099a73f8e93d39c487ff5bacdde18f418bf761
-size 3176732
diff --git a/AutomatedTesting/Objects/Characters/Jack/textures/BrokenRobot_emis.tif b/AutomatedTesting/Objects/Characters/Jack/textures/BrokenRobot_emis.tif
deleted file mode 100644
index 6909252726..0000000000
--- a/AutomatedTesting/Objects/Characters/Jack/textures/BrokenRobot_emis.tif
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d45cd564d2b52575d1ad37b907a7d378871f05f6c9e5569ec73d7973d56599c9
-size 3167984
diff --git a/AutomatedTesting/Objects/Characters/Jack/textures/BrokenRobot_emis.tif.exportsettings b/AutomatedTesting/Objects/Characters/Jack/textures/BrokenRobot_emis.tif.exportsettings
deleted file mode 100644
index 2d1dccbf99..0000000000
--- a/AutomatedTesting/Objects/Characters/Jack/textures/BrokenRobot_emis.tif.exportsettings
+++ /dev/null
@@ -1 +0,0 @@
-/autooptimizefile=0 /preset=Albedo /reduce=0
\ No newline at end of file
diff --git a/AutomatedTesting/Objects/Characters/Jack/textures/BrokenRobot_green_diff.tif b/AutomatedTesting/Objects/Characters/Jack/textures/BrokenRobot_green_diff.tif
deleted file mode 100644
index 3254f98355..0000000000
--- a/AutomatedTesting/Objects/Characters/Jack/textures/BrokenRobot_green_diff.tif
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:83a872c07f7cbbcb868903429dd8d5a71e8c0b7b0e2cb16cb08b5cb26b02251c
-size 3177492
diff --git a/AutomatedTesting/Objects/Characters/Jack/textures/BrokenRobot_green_diff.tif.exportsettings b/AutomatedTesting/Objects/Characters/Jack/textures/BrokenRobot_green_diff.tif.exportsettings
deleted file mode 100644
index 2d1dccbf99..0000000000
--- a/AutomatedTesting/Objects/Characters/Jack/textures/BrokenRobot_green_diff.tif.exportsettings
+++ /dev/null
@@ -1 +0,0 @@
-/autooptimizefile=0 /preset=Albedo /reduce=0
\ No newline at end of file
diff --git a/AutomatedTesting/Objects/Characters/Jack/textures/BrokenRobot_red_diff.tif b/AutomatedTesting/Objects/Characters/Jack/textures/BrokenRobot_red_diff.tif
deleted file mode 100644
index b00a8cd13b..0000000000
--- a/AutomatedTesting/Objects/Characters/Jack/textures/BrokenRobot_red_diff.tif
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:81c1bc9545a17232523fd97561013534221b3bf8927feefa52bdc757e294c2e2
-size 3179140
diff --git a/AutomatedTesting/Objects/Characters/Jack/textures/BrokenRobot_red_diff.tif.exportsettings b/AutomatedTesting/Objects/Characters/Jack/textures/BrokenRobot_red_diff.tif.exportsettings
deleted file mode 100644
index 2d1dccbf99..0000000000
--- a/AutomatedTesting/Objects/Characters/Jack/textures/BrokenRobot_red_diff.tif.exportsettings
+++ /dev/null
@@ -1 +0,0 @@
-/autooptimizefile=0 /preset=Albedo /reduce=0
\ No newline at end of file
diff --git a/AutomatedTesting/Objects/Characters/Jack/textures/BrokenRobot_spec.tif b/AutomatedTesting/Objects/Characters/Jack/textures/BrokenRobot_spec.tif
deleted file mode 100644
index 3e2fb9a003..0000000000
--- a/AutomatedTesting/Objects/Characters/Jack/textures/BrokenRobot_spec.tif
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:99f476a56205c80878be7472857a6430ce6dc40f2eb1558de4933a5b79fa2420
-size 814244
diff --git a/AutomatedTesting/Objects/Characters/Jack/textures/BrokenRobot_spec.tif.exportsettings b/AutomatedTesting/Objects/Characters/Jack/textures/BrokenRobot_spec.tif.exportsettings
deleted file mode 100644
index aaaf14a9fe..0000000000
--- a/AutomatedTesting/Objects/Characters/Jack/textures/BrokenRobot_spec.tif.exportsettings
+++ /dev/null
@@ -1 +0,0 @@
-/autooptimizefile=0 /preset=Reflectance /reduce=0
\ No newline at end of file
diff --git a/AutomatedTesting/Objects/Characters/Jack/textures/BrokenRobot_yellow_diff.tif b/AutomatedTesting/Objects/Characters/Jack/textures/BrokenRobot_yellow_diff.tif
deleted file mode 100644
index 2c44044576..0000000000
--- a/AutomatedTesting/Objects/Characters/Jack/textures/BrokenRobot_yellow_diff.tif
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:366959c8a31356669d47f58d07157171ed369b3e7549b3b65a8b8d153a1477a6
-size 3179956
diff --git a/AutomatedTesting/Objects/Characters/Jack/textures/BrokenRobot_yellow_diff.tif.exportsettings b/AutomatedTesting/Objects/Characters/Jack/textures/BrokenRobot_yellow_diff.tif.exportsettings
deleted file mode 100644
index 2d1dccbf99..0000000000
--- a/AutomatedTesting/Objects/Characters/Jack/textures/BrokenRobot_yellow_diff.tif.exportsettings
+++ /dev/null
@@ -1 +0,0 @@
-/autooptimizefile=0 /preset=Albedo /reduce=0
\ No newline at end of file
diff --git a/AutomatedTesting/Objects/Characters/Jack/textures/BrokenRobot_yellow_emis.tif b/AutomatedTesting/Objects/Characters/Jack/textures/BrokenRobot_yellow_emis.tif
deleted file mode 100644
index 4dea311abb..0000000000
--- a/AutomatedTesting/Objects/Characters/Jack/textures/BrokenRobot_yellow_emis.tif
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e839924e03ba99459547df1cf5334de3bdad75b18e76176e430e343a979d9f05
-size 3168472
diff --git a/AutomatedTesting/Objects/Characters/Jack/textures/BrokenRobot_yellow_emis.tif.exportsettings b/AutomatedTesting/Objects/Characters/Jack/textures/BrokenRobot_yellow_emis.tif.exportsettings
deleted file mode 100644
index 2d1dccbf99..0000000000
--- a/AutomatedTesting/Objects/Characters/Jack/textures/BrokenRobot_yellow_emis.tif.exportsettings
+++ /dev/null
@@ -1 +0,0 @@
-/autooptimizefile=0 /preset=Albedo /reduce=0
\ No newline at end of file
diff --git a/AutomatedTesting/Objects/Characters/Jack/textures/jack_ddna.tif b/AutomatedTesting/Objects/Characters/Jack/textures/jack_ddna.tif
deleted file mode 100644
index 57d61f505a..0000000000
--- a/AutomatedTesting/Objects/Characters/Jack/textures/jack_ddna.tif
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:36f537bb5be89fccba1502e9e8f8dfffbf05ea8aa82ac439305e8c2502b01691
-size 16804800
diff --git a/AutomatedTesting/Objects/Characters/Jack/textures/jack_ddna.tif.exportsettings b/AutomatedTesting/Objects/Characters/Jack/textures/jack_ddna.tif.exportsettings
deleted file mode 100644
index a90d724812..0000000000
--- a/AutomatedTesting/Objects/Characters/Jack/textures/jack_ddna.tif.exportsettings
+++ /dev/null
@@ -1 +0,0 @@
-/autooptimizefile=0 /M=50,50,0,50,50,50 /preset=NormalsWithSmoothness /reduce=0
\ No newline at end of file
diff --git a/AutomatedTesting/Objects/Characters/Jack/textures/jack_diff.tif b/AutomatedTesting/Objects/Characters/Jack/textures/jack_diff.tif
deleted file mode 100644
index a8f5db9a96..0000000000
--- a/AutomatedTesting/Objects/Characters/Jack/textures/jack_diff.tif
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b0457cbbbe1fe7e52fdb9af7ee2bc32df96a453fe248738b35ffe0b8087a28c5
-size 12615988
diff --git a/AutomatedTesting/Objects/Characters/Jack/textures/jack_diff.tif.exportsettings b/AutomatedTesting/Objects/Characters/Jack/textures/jack_diff.tif.exportsettings
deleted file mode 100644
index f35416077f..0000000000
--- a/AutomatedTesting/Objects/Characters/Jack/textures/jack_diff.tif.exportsettings
+++ /dev/null
@@ -1 +0,0 @@
-/autooptimizefile=0 /M=50,50,50,0,50,50 /preset=Albedo /reduce=0
\ No newline at end of file
diff --git a/AutomatedTesting/Objects/Characters/Jack/textures/jack_emis.tif b/AutomatedTesting/Objects/Characters/Jack/textures/jack_emis.tif
deleted file mode 100644
index f5ee4b43b2..0000000000
--- a/AutomatedTesting/Objects/Characters/Jack/textures/jack_emis.tif
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:4ba741103d039bddf72d4834c92a5e069285e31b8be2e7f4e8103f9c5c81694f
-size 3167864
diff --git a/AutomatedTesting/Objects/Characters/Jack/textures/jack_emis.tif.exportsettings b/AutomatedTesting/Objects/Characters/Jack/textures/jack_emis.tif.exportsettings
deleted file mode 100644
index 8177b5abe6..0000000000
--- a/AutomatedTesting/Objects/Characters/Jack/textures/jack_emis.tif.exportsettings
+++ /dev/null
@@ -1 +0,0 @@
-/autooptimizefile=0 /M=50,50,0,50,50,50 /preset=Albedo /reduce=0
\ No newline at end of file
diff --git a/AutomatedTesting/Objects/Characters/Jack/textures/jack_spec.tif b/AutomatedTesting/Objects/Characters/Jack/textures/jack_spec.tif
deleted file mode 100644
index 20fb2114c0..0000000000
--- a/AutomatedTesting/Objects/Characters/Jack/textures/jack_spec.tif
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:4d7cb58f48e4df76214509fc01d5170fd38bc447d56af61f008c04a1653c2d20
-size 12614884
diff --git a/AutomatedTesting/Objects/Characters/Jack/textures/jack_spec.tif.exportsettings b/AutomatedTesting/Objects/Characters/Jack/textures/jack_spec.tif.exportsettings
deleted file mode 100644
index 7fbb585758..0000000000
--- a/AutomatedTesting/Objects/Characters/Jack/textures/jack_spec.tif.exportsettings
+++ /dev/null
@@ -1 +0,0 @@
-/autooptimizefile=0 /M=50,50,50,0,50,50 /preset=Reflectance /reduce=0
\ No newline at end of file
diff --git a/AutomatedTesting/Objects/Characters/Jack/textures/jack_spec_02_spec.tif b/AutomatedTesting/Objects/Characters/Jack/textures/jack_spec_02_spec.tif
deleted file mode 100644
index 3334a5c39b..0000000000
--- a/AutomatedTesting/Objects/Characters/Jack/textures/jack_spec_02_spec.tif
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:80a2c56bfcb8c98bf5a72ec9fdb5fcc6eae28ba1c3c26efad5c8a36e6105f1d0
-size 3173936
diff --git a/AutomatedTesting/Objects/Characters/Jack/textures/jack_spec_02_spec.tif.exportsettings b/AutomatedTesting/Objects/Characters/Jack/textures/jack_spec_02_spec.tif.exportsettings
deleted file mode 100644
index aaaf14a9fe..0000000000
--- a/AutomatedTesting/Objects/Characters/Jack/textures/jack_spec_02_spec.tif.exportsettings
+++ /dev/null
@@ -1 +0,0 @@
-/autooptimizefile=0 /preset=Reflectance /reduce=0
\ No newline at end of file
diff --git a/AutomatedTesting/Passes/MainPipeline.pass b/AutomatedTesting/Passes/MainPipeline.pass
new file mode 100644
index 0000000000..aa9f3757c4
--- /dev/null
+++ b/AutomatedTesting/Passes/MainPipeline.pass
@@ -0,0 +1,483 @@
+{
+ "Type": "JsonSerialization",
+ "Version": 1,
+ "ClassName": "PassAsset",
+ "ClassData": {
+ "PassTemplate": {
+ "Name": "MainPipeline",
+ "PassClass": "ParentPass",
+ "Slots": [
+ {
+ "Name": "SwapChainOutput",
+ "SlotType": "InputOutput",
+ "ScopeAttachmentUsage": "RenderTarget"
+ }
+ ],
+ "PassRequests": [
+ {
+ "Name": "MorphTargetPass",
+ "TemplateName": "MorphTargetPassTemplate"
+ },
+ {
+ "Name": "SkinningPass",
+ "TemplateName": "SkinningPassTemplate",
+ "Connections": [
+ {
+ "LocalSlot": "SkinnedMeshOutputStream",
+ "AttachmentRef": {
+ "Pass": "MorphTargetPass",
+ "Attachment": "MorphTargetDeltaOutput"
+ }
+ }
+ ]
+ },
+ {
+ "Name": "RayTracingAccelerationStructurePass",
+ "TemplateName": "RayTracingAccelerationStructurePassTemplate"
+ },
+ {
+ "Name": "DiffuseProbeGridUpdatePass",
+ "TemplateName": "DiffuseProbeGridUpdatePassTemplate",
+ "ExecuteAfter": [
+ "RayTracingAccelerationStructurePass"
+ ]
+ },
+ {
+ "Name": "DepthPrePass",
+ "TemplateName": "DepthMSAAParentTemplate",
+ "Connections": [
+ {
+ "LocalSlot": "SkinnedMeshes",
+ "AttachmentRef": {
+ "Pass": "SkinningPass",
+ "Attachment": "SkinnedMeshOutputStream"
+ }
+ },
+ {
+ "LocalSlot": "SwapChainOutput",
+ "AttachmentRef": {
+ "Pass": "Parent",
+ "Attachment": "SwapChainOutput"
+ }
+ }
+ ]
+ },
+ {
+ "Name": "MotionVectorPass",
+ "TemplateName": "MotionVectorParentTemplate",
+ "Connections": [
+ {
+ "LocalSlot": "SkinnedMeshes",
+ "AttachmentRef": {
+ "Pass": "SkinningPass",
+ "Attachment": "SkinnedMeshOutputStream"
+ }
+ },
+ {
+ "LocalSlot": "Depth",
+ "AttachmentRef": {
+ "Pass": "DepthPrePass",
+ "Attachment": "Depth"
+ }
+ },
+ {
+ "LocalSlot": "SwapChainOutput",
+ "AttachmentRef": {
+ "Pass": "Parent",
+ "Attachment": "SwapChainOutput"
+ }
+ }
+ ]
+ },
+ {
+ "Name": "LightCullingPass",
+ "TemplateName": "LightCullingParentTemplate",
+ "Connections": [
+ {
+ "LocalSlot": "SkinnedMeshes",
+ "AttachmentRef": {
+ "Pass": "SkinningPass",
+ "Attachment": "SkinnedMeshOutputStream"
+ }
+ },
+ {
+ "LocalSlot": "DepthMSAA",
+ "AttachmentRef": {
+ "Pass": "DepthPrePass",
+ "Attachment": "DepthMSAA"
+ }
+ },
+ {
+ "LocalSlot": "SwapChainOutput",
+ "AttachmentRef": {
+ "Pass": "Parent",
+ "Attachment": "SwapChainOutput"
+ }
+ }
+ ]
+ },
+ {
+ "Name": "ShadowPass",
+ "TemplateName": "ShadowParentTemplate",
+ "Connections": [
+ {
+ "LocalSlot": "SkinnedMeshes",
+ "AttachmentRef": {
+ "Pass": "SkinningPass",
+ "Attachment": "SkinnedMeshOutputStream"
+ }
+ },
+ {
+ "LocalSlot": "SwapChainOutput",
+ "AttachmentRef": {
+ "Pass": "Parent",
+ "Attachment": "SwapChainOutput"
+ }
+ }
+ ]
+ },
+ {
+ "Name": "OpaquePass",
+ "TemplateName": "OpaqueParentTemplate",
+ "Connections": [
+ {
+ "LocalSlot": "DirectionalShadowmap",
+ "AttachmentRef": {
+ "Pass": "ShadowPass",
+ "Attachment": "DirectionalShadowmap"
+ }
+ },
+ {
+ "LocalSlot": "DirectionalESM",
+ "AttachmentRef": {
+ "Pass": "ShadowPass",
+ "Attachment": "DirectionalESM"
+ }
+ },
+ {
+ "LocalSlot": "ProjectedShadowmap",
+ "AttachmentRef": {
+ "Pass": "ShadowPass",
+ "Attachment": "ProjectedShadowmap"
+ }
+ },
+ {
+ "LocalSlot": "ProjectedESM",
+ "AttachmentRef": {
+ "Pass": "ShadowPass",
+ "Attachment": "ProjectedESM"
+ }
+ },
+ {
+ "LocalSlot": "TileLightData",
+ "AttachmentRef": {
+ "Pass": "LightCullingPass",
+ "Attachment": "TileLightData"
+ }
+ },
+ {
+ "LocalSlot": "LightListRemapped",
+ "AttachmentRef": {
+ "Pass": "LightCullingPass",
+ "Attachment": "LightListRemapped"
+ }
+ },
+ {
+ "LocalSlot": "DepthLinear",
+ "AttachmentRef": {
+ "Pass": "DepthPrePass",
+ "Attachment": "DepthLinear"
+ }
+ },
+ {
+ "LocalSlot": "DepthStencil",
+ "AttachmentRef": {
+ "Pass": "DepthPrePass",
+ "Attachment": "DepthMSAA"
+ }
+ },
+ {
+ "LocalSlot": "SwapChainOutput",
+ "AttachmentRef": {
+ "Pass": "Parent",
+ "Attachment": "SwapChainOutput"
+ }
+ }
+ ]
+ },
+ {
+ "Name": "TransparentPass",
+ "TemplateName": "TransparentParentTemplate",
+ "Connections": [
+ {
+ "LocalSlot": "DirectionalShadowmap",
+ "AttachmentRef": {
+ "Pass": "ShadowPass",
+ "Attachment": "DirectionalShadowmap"
+ }
+ },
+ {
+ "LocalSlot": "DirectionalESM",
+ "AttachmentRef": {
+ "Pass": "ShadowPass",
+ "Attachment": "DirectionalESM"
+ }
+ },
+ {
+ "LocalSlot": "ProjectedShadowmap",
+ "AttachmentRef": {
+ "Pass": "ShadowPass",
+ "Attachment": "ProjectedShadowmap"
+ }
+ },
+ {
+ "LocalSlot": "ProjectedESM",
+ "AttachmentRef": {
+ "Pass": "ShadowPass",
+ "Attachment": "ProjectedESM"
+ }
+ },
+ {
+ "LocalSlot": "TileLightData",
+ "AttachmentRef": {
+ "Pass": "LightCullingPass",
+ "Attachment": "TileLightData"
+ }
+ },
+ {
+ "LocalSlot": "LightListRemapped",
+ "AttachmentRef": {
+ "Pass": "LightCullingPass",
+ "Attachment": "LightListRemapped"
+ }
+ },
+ {
+ "LocalSlot": "InputLinearDepth",
+ "AttachmentRef": {
+ "Pass": "DepthPrePass",
+ "Attachment": "DepthLinear"
+ }
+ },
+ {
+ "LocalSlot": "DepthStencil",
+ "AttachmentRef": {
+ "Pass": "DepthPrePass",
+ "Attachment": "Depth"
+ }
+ },
+ {
+ "LocalSlot": "InputOutput",
+ "AttachmentRef": {
+ "Pass": "OpaquePass",
+ "Attachment": "Output"
+ }
+ }
+ ]
+ },
+ {
+ "Name": "DeferredFogPass",
+ "TemplateName": "DeferredFogPassTemplate",
+ "Enabled": false,
+ "Connections": [
+ {
+ "LocalSlot": "InputLinearDepth",
+ "AttachmentRef": {
+ "Pass": "DepthPrePass",
+ "Attachment": "DepthLinear"
+ }
+ },
+ {
+ "LocalSlot": "InputDepthStencil",
+ "AttachmentRef": {
+ "Pass": "DepthPrePass",
+ "Attachment": "Depth"
+ }
+ },
+ {
+ "LocalSlot": "RenderTargetInputOutput",
+ "AttachmentRef": {
+ "Pass": "TransparentPass",
+ "Attachment": "InputOutput"
+ }
+ }
+ ],
+ "PassData": {
+ "$type": "FullscreenTrianglePassData",
+ "ShaderAsset": {
+ "FilePath": "Shaders/ScreenSpace/DeferredFog.shader"
+ },
+ "PipelineViewTag": "MainCamera"
+ }
+ },
+ {
+ "Name": "ReflectionCopyFrameBufferPass",
+ "TemplateName": "ReflectionCopyFrameBufferPassTemplate",
+ "Enabled": false,
+ "Connections": [
+ {
+ "LocalSlot": "Input",
+ "AttachmentRef": {
+ "Pass": "DeferredFogPass",
+ "Attachment": "RenderTargetInputOutput"
+ }
+ }
+ ]
+ },
+ {
+ "Name": "PostProcessPass",
+ "TemplateName": "PostProcessParentTemplate",
+ "Connections": [
+ {
+ "LocalSlot": "LightingInput",
+ "AttachmentRef": {
+ "Pass": "DeferredFogPass",
+ "Attachment": "RenderTargetInputOutput"
+ }
+ },
+ {
+ "LocalSlot": "Depth",
+ "AttachmentRef": {
+ "Pass": "DepthPrePass",
+ "Attachment": "Depth"
+ }
+ },
+ {
+ "LocalSlot": "MotionVectors",
+ "AttachmentRef": {
+ "Pass": "MotionVectorPass",
+ "Attachment": "MotionVectorOutput"
+ }
+ },
+ {
+ "LocalSlot": "SwapChainOutput",
+ "AttachmentRef": {
+ "Pass": "Parent",
+ "Attachment": "SwapChainOutput"
+ }
+ }
+ ]
+ },
+ {
+ "Name": "AuxGeomPass",
+ "TemplateName": "AuxGeomPassTemplate",
+ "Enabled": true,
+ "Connections": [
+ {
+ "LocalSlot": "ColorInputOutput",
+ "AttachmentRef": {
+ "Pass": "PostProcessPass",
+ "Attachment": "Output"
+ }
+ },
+ {
+ "LocalSlot": "DepthInputOutput",
+ "AttachmentRef": {
+ "Pass": "DepthPrePass",
+ "Attachment": "Depth"
+ }
+ }
+ ],
+ "PassData": {
+ "$type": "RasterPassData",
+ "DrawListTag": "auxgeom",
+ "PipelineViewTag": "MainCamera"
+ }
+ },
+ {
+ "Name": "DebugOverlayPass",
+ "TemplateName": "DebugOverlayParentTemplate",
+ "Connections": [
+ {
+ "LocalSlot": "TileLightData",
+ "AttachmentRef": {
+ "Pass": "LightCullingPass",
+ "Attachment": "TileLightData"
+ }
+ },
+ {
+ "LocalSlot": "RawLightingInput",
+ "AttachmentRef": {
+ "Pass": "PostProcessPass",
+ "Attachment": "RawLightingOutput"
+ }
+ },
+ {
+ "LocalSlot": "LuminanceMipChainInput",
+ "AttachmentRef": {
+ "Pass": "PostProcessPass",
+ "Attachment": "LuminanceMipChainOutput"
+ }
+ },
+ {
+ "LocalSlot": "InputOutput",
+ "AttachmentRef": {
+ "Pass": "AuxGeomPass",
+ "Attachment": "ColorInputOutput"
+ }
+ }
+ ]
+ },
+ {
+ "Name": "LyShinePass",
+ "TemplateName": "LyShineParentTemplate",
+ "Connections": [
+ {
+ "LocalSlot": "ColorInputOutput",
+ "AttachmentRef": {
+ "Pass": "DebugOverlayPass",
+ "Attachment": "InputOutput"
+ }
+ },
+ {
+ "LocalSlot": "DepthInputOutput",
+ "AttachmentRef": {
+ "Pass": "DepthPrePass",
+ "Attachment": "Depth"
+ }
+ }
+ ]
+ },
+ {
+ "Name": "UIPass",
+ "TemplateName": "UIParentTemplate",
+ "Connections": [
+ {
+ "LocalSlot": "InputOutput",
+ "AttachmentRef": {
+ "Pass": "LyShinePass",
+ "Attachment": "ColorInputOutput"
+ }
+ },
+ {
+ "LocalSlot": "DepthInputOutput",
+ "AttachmentRef": {
+ "Pass": "DepthPrePass",
+ "Attachment": "Depth"
+ }
+ }
+ ]
+ },
+ {
+ "Name": "CopyToSwapChain",
+ "TemplateName": "FullscreenCopyTemplate",
+ "Connections": [
+ {
+ "LocalSlot": "Input",
+ "AttachmentRef": {
+ "Pass": "UIPass",
+ "Attachment": "InputOutput"
+ }
+ },
+ {
+ "LocalSlot": "Output",
+ "AttachmentRef": {
+ "Pass": "Parent",
+ "Attachment": "SwapChainOutput"
+ }
+ }
+ ]
+ }
+ ]
+ }
+ }
+}
\ No newline at end of file
diff --git a/AutomatedTesting/Registry/C3510644_Collider_CollisionGroups.setreg_override b/AutomatedTesting/Registry/C3510644_Collider_CollisionGroups.setreg_override
index 9fa5e26768..e4ea71f652 100644
--- a/AutomatedTesting/Registry/C3510644_Collider_CollisionGroups.setreg_override
+++ b/AutomatedTesting/Registry/C3510644_Collider_CollisionGroups.setreg_override
@@ -121,9 +121,10 @@
},
"MaterialLibrary": {
"assetId": {
- "guid": "{3A055A3F-8CB7-5FEE-B437-EB365FACD0D4}"
+ "guid": "{62446378-67F8-5E49-AC31-761DD5942695}"
},
- "assetHint": "surfacetypemateriallibrary.physmaterial"
+ "loadBehavior": "QueueLoad",
+ "assetHint": "assets/physics/surfacetypemateriallibrary.physmaterial"
}
}
}
diff --git a/AutomatedTesting/Registry/C4976227_Collider_NewGroup.setreg_override b/AutomatedTesting/Registry/C4976227_Collider_NewGroup.setreg_override
index afbe6a9d38..e53d3893f8 100644
--- a/AutomatedTesting/Registry/C4976227_Collider_NewGroup.setreg_override
+++ b/AutomatedTesting/Registry/C4976227_Collider_NewGroup.setreg_override
@@ -109,9 +109,10 @@
},
"MaterialLibrary": {
"assetId": {
- "guid": "{3A055A3F-8CB7-5FEE-B437-EB365FACD0D4}"
+ "guid": "{62446378-67F8-5E49-AC31-761DD5942695}"
},
- "assetHint": "surfacetypemateriallibrary.physmaterial"
+ "loadBehavior": "QueueLoad",
+ "assetHint": "assets/physics/surfacetypemateriallibrary.physmaterial"
}
}
}
diff --git a/AutomatedTesting/Registry/C4976244_Collider_SameGroupSameLayerCollision.setreg_override b/AutomatedTesting/Registry/C4976244_Collider_SameGroupSameLayerCollision.setreg_override
index 9fa5e26768..e4ea71f652 100644
--- a/AutomatedTesting/Registry/C4976244_Collider_SameGroupSameLayerCollision.setreg_override
+++ b/AutomatedTesting/Registry/C4976244_Collider_SameGroupSameLayerCollision.setreg_override
@@ -121,9 +121,10 @@
},
"MaterialLibrary": {
"assetId": {
- "guid": "{3A055A3F-8CB7-5FEE-B437-EB365FACD0D4}"
+ "guid": "{62446378-67F8-5E49-AC31-761DD5942695}"
},
- "assetHint": "surfacetypemateriallibrary.physmaterial"
+ "loadBehavior": "QueueLoad",
+ "assetHint": "assets/physics/surfacetypemateriallibrary.physmaterial"
}
}
}
diff --git a/AutomatedTesting/Registry/C4976245_PhysXCollider_CollisionLayerTest.setreg_override b/AutomatedTesting/Registry/C4976245_PhysXCollider_CollisionLayerTest.setreg_override
index 9fa5e26768..e4ea71f652 100644
--- a/AutomatedTesting/Registry/C4976245_PhysXCollider_CollisionLayerTest.setreg_override
+++ b/AutomatedTesting/Registry/C4976245_PhysXCollider_CollisionLayerTest.setreg_override
@@ -121,9 +121,10 @@
},
"MaterialLibrary": {
"assetId": {
- "guid": "{3A055A3F-8CB7-5FEE-B437-EB365FACD0D4}"
+ "guid": "{62446378-67F8-5E49-AC31-761DD5942695}"
},
- "assetHint": "surfacetypemateriallibrary.physmaterial"
+ "loadBehavior": "QueueLoad",
+ "assetHint": "assets/physics/surfacetypemateriallibrary.physmaterial"
}
}
}
diff --git a/AutomatedTesting/Registry/C4982593_PhysXCollider_CollisionLayer.setreg_override b/AutomatedTesting/Registry/C4982593_PhysXCollider_CollisionLayer.setreg_override
index 9fa5e26768..e4ea71f652 100644
--- a/AutomatedTesting/Registry/C4982593_PhysXCollider_CollisionLayer.setreg_override
+++ b/AutomatedTesting/Registry/C4982593_PhysXCollider_CollisionLayer.setreg_override
@@ -121,9 +121,10 @@
},
"MaterialLibrary": {
"assetId": {
- "guid": "{3A055A3F-8CB7-5FEE-B437-EB365FACD0D4}"
+ "guid": "{62446378-67F8-5E49-AC31-761DD5942695}"
},
- "assetHint": "surfacetypemateriallibrary.physmaterial"
+ "loadBehavior": "QueueLoad",
+ "assetHint": "assets/physics/surfacetypemateriallibrary.physmaterial"
}
}
}
diff --git a/AutomatedTesting/Registry/physxsystemconfiguration.setreg b/AutomatedTesting/Registry/physxsystemconfiguration.setreg
index 02f65b685b..83aad307a6 100644
--- a/AutomatedTesting/Registry/physxsystemconfiguration.setreg
+++ b/AutomatedTesting/Registry/physxsystemconfiguration.setreg
@@ -103,9 +103,10 @@
},
"MaterialLibrary": {
"assetId": {
- "guid": "{3A055A3F-8CB7-5FEE-B437-EB365FACD0D4}"
+ "guid": "{62446378-67F8-5E49-AC31-761DD5942695}"
},
- "assetHint": "surfacetypemateriallibrary.physmaterial"
+ "loadBehavior": "QueueLoad",
+ "assetHint": "assets/physics/surfacetypemateriallibrary.physmaterial"
}
}
}
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0a38177714..bd02eeb7ff 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -28,8 +28,8 @@ include(cmake/FileUtil.cmake)
include(cmake/PAL.cmake)
include(cmake/PALTools.cmake)
include(cmake/RuntimeDependencies.cmake)
-include(cmake/Install.cmake)
include(cmake/Configurations.cmake) # Requires to be after PAL so we get platform variable definitions
+include(cmake/Install.cmake)
include(cmake/Dependencies.cmake)
include(cmake/Deployment.cmake)
include(cmake/3rdParty.cmake)
diff --git a/Code/Editor/2DViewport.cpp b/Code/Editor/2DViewport.cpp
index 56f2e7bdf5..838d30e0b3 100644
--- a/Code/Editor/2DViewport.cpp
+++ b/Code/Editor/2DViewport.cpp
@@ -952,7 +952,8 @@ void Q2DViewport::DrawViewerMarker(DisplayContext& dc)
dc.SetColor(QColor(0, 0, 255)); // blue
dc.DrawWireBox(-dim * noScale, dim * noScale);
- float fov = GetIEditor()->GetSystem()->GetViewCamera().GetFov();
+ constexpr float DefaultFov = 60.f;
+ float fov = DefaultFov;
Vec3 q[4];
float dist = 30;
diff --git a/Code/Editor/AboutDialog.cpp b/Code/Editor/AboutDialog.cpp
index 8429e86553..f8abe67376 100644
--- a/Code/Editor/AboutDialog.cpp
+++ b/Code/Editor/AboutDialog.cpp
@@ -25,7 +25,7 @@ AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
#include
AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
-CAboutDialog::CAboutDialog(QString versionText, QString richTextCopyrightNotice, QWidget* pParent /*=NULL*/)
+CAboutDialog::CAboutDialog(QString versionText, QString richTextCopyrightNotice, QWidget* pParent /*=nullptr*/)
: QDialog(pParent)
, m_ui(new Ui::CAboutDialog)
{
diff --git a/Code/Editor/Animation/SkeletonHierarchy.cpp b/Code/Editor/Animation/SkeletonHierarchy.cpp
deleted file mode 100644
index 3015ff5e27..0000000000
--- a/Code/Editor/Animation/SkeletonHierarchy.cpp
+++ /dev/null
@@ -1,149 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project.
- * For complete copyright and license terms please see the LICENSE at the root of this distribution.
- *
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#include "EditorDefs.h"
-#include "SkeletonHierarchy.h"
-
-using namespace Skeleton;
-
-/*
-
- CHierarchy
-
-*/
-
-CHierarchy::CHierarchy()
-{
-}
-
-CHierarchy::~CHierarchy()
-{
-}
-
-//
-
-uint32 CHierarchy::AddNode(const char* name, const QuatT& pose, int32 parent)
-{
- int32 index = FindNodeIndexByName(name);
-
- if (index < 0)
- {
- m_nodes.push_back(SNode());
- index = int32(m_nodes.size() - 1);
- }
-
- m_nodes[index].name = name;
- m_nodes[index].pose = pose;
- m_nodes[index].parent = parent;
- return uint32(index);
-}
-
-int32 CHierarchy::FindNodeIndexByName(const char* name) const
-{
- uint32 count = uint32(m_nodes.size());
- for (uint32 i = 0; i < count; ++i)
- {
- if (::_stricmp(m_nodes[i].name, name))
- {
- continue;
- }
-
- return i;
- }
-
- return -1;
-}
-
-const CHierarchy::SNode* CHierarchy::FindNode(const char* name) const
-{
- int32 index = FindNodeIndexByName(name);
- return index < 0 ? NULL : &m_nodes[index];
-}
-
-void CHierarchy::CreateFrom(IDefaultSkeleton* pIDefaultSkeleton)
-{
- const uint32 jointCount = pIDefaultSkeleton->GetJointCount();
-
- m_nodes.clear();
- m_nodes.reserve(jointCount);
- for (uint32 i = 0; i < jointCount; ++i)
- {
- m_nodes.push_back(SNode());
-
- m_nodes.back().name = pIDefaultSkeleton->GetJointNameByID(int32(i));
- m_nodes.back().pose = pIDefaultSkeleton->GetDefaultAbsJointByID(int32(i));
-
- m_nodes.back().parent = pIDefaultSkeleton->GetJointParentIDByID(int32(i));
- }
-
- ValidateReferences();
-}
-
-void CHierarchy::ValidateReferences()
-{
- uint32 nodeCount = m_nodes.size();
- if (!nodeCount)
- {
- return;
- }
-
- for (uint32 i = 0; i < nodeCount; ++i)
- {
- if (m_nodes[i].parent < nodeCount)
- {
- continue;
- }
-
- m_nodes[i].parent = -1;
- }
-}
-
-void CHierarchy::AbsoluteToRelative(const QuatT* pSource, QuatT* pDestination)
-{
- uint32 count = uint32(m_nodes.size());
- std::vector absolutes(count);
- for (uint32 i = 0; i < count; ++i)
- {
- absolutes[i] = pSource[i];
- }
-
- for (uint32 i = 0; i < count; ++i)
- {
- int32 parent = m_nodes[i].parent;
- if (parent < 0)
- {
- pDestination[i] = absolutes[i];
- continue;
- }
-
- pDestination[i].t = (absolutes[i].t - absolutes[parent].t) * absolutes[parent].q;
- pDestination[i].q = absolutes[parent].q.GetInverted() * absolutes[i].q;
- }
-}
-
-bool CHierarchy::SerializeTo(XmlNodeRef& node)
-{
- XmlNodeRef hierarchy = node->newChild("Hierarchy");
-
- uint32 nodeCount = uint32(m_nodes.size());
- std::vector nodes(nodeCount);
- for (uint32 i = 0; i < nodeCount; ++i)
- {
- XmlNodeRef parent = hierarchy;
- if (m_nodes[i].parent > -1)
- {
- parent = nodes[m_nodes[i].parent];
- }
-
- nodes[i] = parent->newChild("Node");
- nodes[i]->setAttr("name", m_nodes[i].name);
- }
-
- return true;
-}
diff --git a/Code/Editor/Animation/SkeletonHierarchy.h b/Code/Editor/Animation/SkeletonHierarchy.h
deleted file mode 100644
index ad0d8fc7fc..0000000000
--- a/Code/Editor/Animation/SkeletonHierarchy.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project.
- * For complete copyright and license terms please see the LICENSE at the root of this distribution.
- *
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#ifndef CRYINCLUDE_EDITOR_ANIMATION_SKELETONHIERARCHY_H
-#define CRYINCLUDE_EDITOR_ANIMATION_SKELETONHIERARCHY_H
-#pragma once
-
-namespace Skeleton {
- class CHierarchy
- : public _reference_target_t
- {
- public:
- struct SNode
- {
- string name;
- QuatT pose;
-
- int32 parent;
-
- /* TODO: Implement
- uint32 childrenIndex;
- uint32 childrenCount;
- */
- };
-
- public:
- CHierarchy();
- ~CHierarchy();
-
- public:
- uint32 AddNode(const char* name, const QuatT& pose, int32 parent = -1);
- uint32 GetNodeCount() const { return uint32(m_nodes.size()); }
- SNode* GetNode(uint32 index) { return &m_nodes[index]; }
- const SNode* GetNode(uint32 index) const { return &m_nodes[index]; }
- int32 FindNodeIndexByName(const char* name) const;
- const SNode* FindNode(const char* name) const;
- void ClearNodes() { m_nodes.clear(); }
-
- void CreateFrom(IDefaultSkeleton* rIDefaultSkeleton);
- void ValidateReferences();
-
- void AbsoluteToRelative(const QuatT* pSource, QuatT* pDestination);
-
- bool SerializeTo(XmlNodeRef& node);
-
- private:
- std::vector m_nodes;
- };
-} // namespace Skeleton
-
-#endif // CRYINCLUDE_EDITOR_ANIMATION_SKELETONHIERARCHY_H
diff --git a/Code/Editor/Animation/SkeletonMapper.cpp b/Code/Editor/Animation/SkeletonMapper.cpp
deleted file mode 100644
index 3913801fc8..0000000000
--- a/Code/Editor/Animation/SkeletonMapper.cpp
+++ /dev/null
@@ -1,368 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project.
- * For complete copyright and license terms please see the LICENSE at the root of this distribution.
- *
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#include "EditorDefs.h"
-
-#include "SkeletonMapper.h"
-
-using namespace Skeleton;
-
-/*
-
- CMapper
-
-*/
-
-CMapper::CMapper()
-{
-}
-
-CMapper::~CMapper()
-{
-}
-
-//
-
-void CMapper::CreateFromHierarchy()
-{
- m_nodes.clear();
-
- uint32 nodeCount = m_hierarchy.GetNodeCount();
- m_nodes.resize(nodeCount);
-}
-
-//
-
-uint32 CMapper::CreateLocation(const char* name)
-{
- int32 index = FindLocation(name);
- if (index < 1)
- {
- CMapperLocation* pLocation = new CMapperLocation();
- pLocation->SetName(name);
- m_locations.push_back(pLocation);
- }
- return uint32(m_locations.size() - 1);
-}
-
-void CMapper::ClearLocations()
-{
- uint32 count = uint32(m_nodes.size());
- for (uint32 i = 0; i < count; ++i)
- {
- m_nodes[i].position = NULL;
- m_nodes[i].orientation = NULL;
- }
-
- m_locations.clear();
-}
-
-int32 CMapper::FindLocation(const char* name) const
-{
- uint32 count = uint32(m_locations.size());
- for (uint32 i = 0; i < count; ++i)
- {
- if (::_stricmp(m_locations[i]->GetName(), name))
- {
- continue;
- }
-
- return int32(i);
- }
-
- return -1;
-}
-
-void CMapper::SetLocation(CMapperLocation& location)
-{
- int32 index = FindLocation(location.GetName());
- if (index < 0)
- {
- m_locations.push_back(&location);
- return;
- }
-
- m_locations[index] = &location;
-}
-
-//
-
-bool CMapper::CreateLocationsHierarchy(uint32 index, CHierarchy& hierarchy, int32 hierarchyParent)
-{
- if (NodeHasLocation(index))
- {
- const CHierarchy::SNode* pNode = m_hierarchy.GetNode(index);
- uint32 nodeIndex = hierarchy.AddNode(pNode->name, pNode->pose, hierarchyParent);
- hierarchyParent = uint32(nodeIndex);
- }
-
- std::vector children;
- GetChildrenIndices(index, children);
- uint32 childCount = uint32(children.size());
- for (uint32 i = 0; i < childCount; ++i)
- {
- CreateLocationsHierarchy(children[i], hierarchy, hierarchyParent);
- }
-
- return hierarchy.GetNodeCount() != 0;
-}
-
-bool CMapper::CreateLocationsHierarchy(CHierarchy& hierarchy)
-{
- hierarchy.ClearNodes();
- if (!CreateLocationsHierarchy(0, hierarchy, -1))
- {
- return false;
- }
-
- hierarchy.ValidateReferences();
- return true;
-}
-
-void CMapper::Map(QuatT* pResult)
-{
- uint32 outputCount = m_hierarchy.GetNodeCount();
- std::vector absolutes(outputCount);
- for (uint32 i = 0; i < outputCount; ++i)
- {
- pResult[i].SetIdentity();
- absolutes[i].SetIdentity();
-
- CHierarchy::SNode* pNode = m_hierarchy.GetNode(i);
- if (!pNode)
- {
- continue;
- }
-
- CHierarchy::SNode* pParent = pNode->parent < 0 ?
- NULL : m_hierarchy.GetNode(pNode->parent);
- if (pParent)
- {
- pResult[i].t =
- (pNode->pose.t - pParent->pose.t) * pParent->pose.q;
- }
-
- if (m_nodes[i].position)
- {
- pResult[i].t = m_nodes[i].position->Compute().t;
- }
-
- if (m_nodes[i].orientation)
- {
- absolutes[i] = m_nodes[i].orientation->Compute().q;
- }
- else if (pParent)
- {
- Quat relative = pParent->pose.q.GetInverted() * pNode->pose.q;
- absolutes[i] = absolutes[pNode->parent] * relative;
- }
- }
-
- for (uint32 i = 0; i < outputCount; ++i)
- {
- CHierarchy::SNode* pNode = m_hierarchy.GetNode(i);
- if (!pNode)
- {
- continue;
- }
-
- CHierarchy::SNode* pParent = pNode->parent < 0 ?
- NULL : m_hierarchy.GetNode(pNode->parent);
- if (!pParent)
- {
- pResult[i].q = absolutes[i];
- continue;
- }
-
- pResult[i].q = absolutes[i];
- if (!m_nodes[i].position)
- {
- pResult[i].t = pResult[pNode->parent].t +
- pResult[i].t * absolutes[pNode->parent].GetInverted();
- }
- }
-}
-
-//
-
-bool CMapper::NodeHasLocation(uint32 index)
-{
- if (CMapperOperator* pOperator = m_nodes[index].position)
- {
- if (pOperator->IsOfClass("Location"))
- {
- return true;
- }
- if (pOperator->HasLinksOfClass("Location"))
- {
- return true;
- }
- }
-
- if (CMapperOperator* pOperator = m_nodes[index].orientation)
- {
- if (pOperator->IsOfClass("Location"))
- {
- return true;
- }
- if (pOperator->HasLinksOfClass("Location"))
- {
- return true;
- }
- }
-
- return false;
-}
-
-void CMapper::GetChildrenIndices(uint32 parent, std::vector& children)
-{
- uint32 nodeCount = m_hierarchy.GetNodeCount();
- for (uint32 i = 0; i < nodeCount; ++i)
- {
- if (m_hierarchy.GetNode(i)->parent != parent)
- {
- continue;
- }
-
- children.push_back(i);
- }
-}
-
-bool CMapper::ChildrenHaveLocation(uint32 index)
-{
- std::vector children;
- GetChildrenIndices(index, children);
-
- uint32 childrenCount = uint32(children.size());
- for (uint32 i = 0; i < childrenCount; ++i)
- {
- if (ChildrenHaveLocation(children[i]))
- {
- return true;
- }
- }
-
- return false;
-}
-
-bool CMapper::NodeOrChildrenHaveLocation(uint32 index)
-{
- if (NodeHasLocation(index))
- {
- return true;
- }
-
- std::vector children;
- GetChildrenIndices(index, children);
-
- uint32 childrenCount = uint32(children.size());
- for (uint32 i = 0; i < childrenCount; ++i)
- {
- if (NodeOrChildrenHaveLocation(children[i]))
- {
- return true;
- }
- }
-
- return false;
-}
-
-bool CMapper::SerializeTo(XmlNodeRef& node)
-{
- XmlNodeRef hierarchy = node->newChild("Hierarchy");
-
- uint32 nodeCount = GetNodeCount();
- std::vector nodes(nodeCount);
- for (uint32 i = 0; i < nodeCount; ++i)
- {
- if (!NodeOrChildrenHaveLocation(i))
- {
- continue;
- }
-
- CHierarchy::SNode* pNode = m_hierarchy.GetNode(i);
- if (!pNode)
- {
- return false;
- }
-
- XmlNodeRef xmlParent = hierarchy;
- int32 parent = pNode->parent;
- if (parent > -1)
- {
- xmlParent = nodes[parent];
- }
-
- nodes[i] = xmlParent->newChild("Node");
- nodes[i]->setAttr("name", pNode->name);
-
- if (CMapperOperator* pOperator = m_nodes[i].position)
- {
- XmlNodeRef position = nodes[i]->newChild("Position");
- XmlNodeRef child = position->newChild("Operator");
- if (!pOperator->SerializeWithLinksTo(child))
- {
- return false;
- }
- }
-
- if (CMapperOperator* pOperator = m_nodes[i].orientation)
- {
- XmlNodeRef orientation = nodes[i]->newChild("Orientation");
- XmlNodeRef child = orientation->newChild("Operator");
- if (!pOperator->SerializeWithLinksTo(child))
- {
- return false;
- }
- }
- }
-
- return true;
-}
-
-bool CMapper::SerializeFrom(XmlNodeRef& node, int32 parent)
-{
- int childCount = uint32(node->getChildCount());
- for (int i = 0; i < childCount; ++i)
- {
- XmlNodeRef child = node->getChild(i);
- if (::_stricmp(child->getTag(), "Node"))
- {
- continue;
- }
-
- uint32 index = m_hierarchy.AddNode(child->getAttr("name"), QuatT(IDENTITY), parent);
- if (!SerializeFrom(child, int32(index)))
- {
- return false;
- }
- }
-
- return true;
-}
-
-bool CMapper::SerializeFrom(XmlNodeRef& node)
-{
- XmlNodeRef hierarchy = node->findChild("Hierarchy");
- if (!hierarchy)
- {
- return false;
- }
-
- m_hierarchy.ClearNodes();
-
- if (!SerializeFrom(hierarchy, -1))
- {
- return false;
- }
-
- m_nodes.resize(m_hierarchy.GetNodeCount());
-
- return true;
-}
diff --git a/Code/Editor/Animation/SkeletonMapper.h b/Code/Editor/Animation/SkeletonMapper.h
deleted file mode 100644
index 159b019396..0000000000
--- a/Code/Editor/Animation/SkeletonMapper.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project.
- * For complete copyright and license terms please see the LICENSE at the root of this distribution.
- *
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#ifndef CRYINCLUDE_EDITOR_ANIMATION_SKELETONMAPPER_H
-#define CRYINCLUDE_EDITOR_ANIMATION_SKELETONMAPPER_H
-#pragma once
-
-
-#include "SkeletonHierarchy.h"
-#include "SkeletonMapperOperator.h"
-
-namespace Skeleton {
- class CMapper
- {
- public:
- struct SNode
- {
- _smart_ptr position;
- _smart_ptr orientation;
- };
-
- public:
- CMapper();
- ~CMapper();
-
- public:
- CHierarchy& GetHierarchy() { return m_hierarchy; }
- void CreateFromHierarchy();
-
- uint32 GetNodeCount() const { return uint32(m_nodes.size()); }
- SNode* GetNode(uint32 index) { return &m_nodes[index]; }
- const SNode* GetNode(uint32 index) const { return &m_nodes[index]; }
-
- uint32 CreateLocation(const char* name);
- void ClearLocations();
- int32 FindLocation(const char* name) const;
-
- uint32 GetLocationCount() const { return uint32(m_locations.size()); }
- void SetLocation(CMapperLocation& location);
- CMapperLocation* GetLocation(uint32 index) { return m_locations[index]; }
- const CMapperLocation* GetLocation(uint32 index) const { return m_locations[index]; }
-
- bool CreateLocationsHierarchy(CHierarchy& hierarchy);
-
- void Map(QuatT* pResult);
-
- bool SerializeTo(XmlNodeRef& node);
- bool SerializeFrom(XmlNodeRef& node);
-
- private:
- bool NodeHasLocation(uint32 index);
- bool ChildrenHaveLocation(uint32 index);
- bool NodeOrChildrenHaveLocation(uint32 index);
-
- bool SerializeFrom(XmlNodeRef& node, int32 parent);
-
- bool CreateLocationsHierarchy(uint32 index, CHierarchy& hierarchy, int32 hierarchyParent = -1);
-
- // TEMP
- void GetChildrenIndices(uint32 parent, std::vector& children);
-
- private:
- CHierarchy m_hierarchy;
- std::vector<_smart_ptr > m_locations;
-
- std::vector m_nodes;
- };
-} // namespace Skeleton
-
-#endif // CRYINCLUDE_EDITOR_ANIMATION_SKELETONMAPPER_H
diff --git a/Code/Editor/Animation/SkeletonMapperOperator.cpp b/Code/Editor/Animation/SkeletonMapperOperator.cpp
deleted file mode 100644
index 7a69173bed..0000000000
--- a/Code/Editor/Animation/SkeletonMapperOperator.cpp
+++ /dev/null
@@ -1,284 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project.
- * For complete copyright and license terms please see the LICENSE at the root of this distribution.
- *
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#include "EditorDefs.h"
-
-#include "SkeletonMapperOperator.h"
-
-using namespace Skeleton;
-
-/*
-
- CMapperOperatorDesc
-
-*/
-
-std::vector CMapperOperatorDesc::s_descs;
-
-//
-
-CMapperOperatorDesc::CMapperOperatorDesc(const char* name)
-{
- s_descs.push_back(this);
-}
-
-/*
-
- CMapperOperator
-
-*/
-
-CMapperOperator::CMapperOperator(const char* className, uint32 positionCount, uint32 orientationCount)
-{
- m_className = className;
- m_position.resize(positionCount, NULL);
- m_orientation.resize(orientationCount, NULL);
-}
-
-CMapperOperator::~CMapperOperator()
-{
-}
-
-//
-
-bool CMapperOperator::IsOfClass(const char* className)
-{
- if (::_stricmp(m_className, className))
- {
- return false;
- }
-
- return true;
-}
-
-uint32 CMapperOperator::HasLinksOfClass(const char* className)
-{
- uint32 count = 0;
-
- uint32 positionCount = m_position.size();
- for (uint32 i = 0; i < positionCount; ++i)
- {
- CMapperOperator* pOperator = m_position[i];
- if (!pOperator)
- {
- continue;
- }
-
- if (pOperator->IsOfClass(className))
- {
- ++count;
- }
- }
-
- uint32 orientationCount = m_orientation.size();
- for (uint32 i = 0; i < orientationCount; ++i)
- {
- CMapperOperator* pOperator = m_orientation[i];
- if (!pOperator)
- {
- continue;
- }
-
- if (pOperator->IsOfClass(className))
- {
- ++count;
- }
- }
-
- return count;
-}
-
-//
-
-bool CMapperOperator::SerializeTo(XmlNodeRef& node)
-{
- node->setAttr("class", m_className);
-
- uint32 parameterCount = uint32(m_parameters.size());
- for (uint32 i = 0; i < parameterCount; ++i)
- {
- m_parameters[i]->Serialize(node, false);
- }
-
- return true;
-}
-
-bool CMapperOperator::SerializeFrom(XmlNodeRef& node)
-{
- uint32 parameterCount = uint32(m_parameters.size());
- for (uint32 i = 0; i < parameterCount; ++i)
- {
- m_parameters[i]->Serialize(node, true);
- }
-
- return true;
-}
-
-bool CMapperOperator::SerializeWithLinksTo(XmlNodeRef& node)
-{
- if (!SerializeTo(node))
- {
- return false;
- }
-
- uint32 positionCount = uint32(m_position.size());
- for (uint32 i = 0; i < positionCount; ++i)
- {
- CMapperOperator* pOperator = m_position[i];
- if (!pOperator)
- {
- continue;
- }
-
- XmlNodeRef position = node->newChild("Position");
- position->setAttr("index", i);
-
- XmlNodeRef child = position->newChild("Operator");
- if (!pOperator->SerializeWithLinksTo(child))
- {
- return false;
- }
- }
-
- uint32 orientationCount = uint32(m_orientation.size());
- for (uint32 i = 0; i < orientationCount; ++i)
- {
- CMapperOperator* pOperator = m_orientation[i];
- if (!pOperator)
- {
- continue;
- }
-
- XmlNodeRef orientation = node->newChild("Orientation");
- orientation->setAttr("index", i);
-
- XmlNodeRef child = orientation->newChild("Operator");
- if (!pOperator->SerializeWithLinksTo(child))
- {
- return false;
- }
- }
-
- return true;
-}
-
-bool CMapperOperator::SerializeWithLinksFrom(XmlNodeRef& node)
-{
- if (!SerializeFrom(node))
- {
- return false;
- }
-
- return true;
-}
-/*
-
- CMapperOperator_Transform
-
-*/
-
-class CMapperOperator_Transform
- : public CMapperOperator
-{
-public:
- CMapperOperator_Transform()
- : CMapperOperator("Transform", 1, 1)
- {
- m_pAngles = new CVariable();
- m_pAngles->SetName("rotation");
- m_pAngles->Set(Vec3(0.0f, 0.0f, 0.0f));
- m_pAngles->SetLimits(-180.0f, 180.0f);
- AddParameter(*m_pAngles);
-
- m_pVector = new CVariable();
- m_pVector->SetName("vector");
- m_pVector->Set(Vec3(0.0f, 0.0f, 0.0f));
- AddParameter(*m_pVector);
-
- m_pScale = new CVariable();
- m_pScale->SetName("scale");
- m_pScale->Set(Vec3(1.0f, 1.0f, 1.0f));
- AddParameter(*m_pScale);
- }
-
- // CMapperOperator
-public:
- virtual QuatT CMapperOperator_Transform::Compute()
- {
- QuatT result(IDENTITY);
- m_pVector->Get(result.t);
-
- Vec3 scale;
- m_pScale->Get(scale);
-
- Vec3 angles;
- m_pAngles->Get(angles);
-
- result.q = Quat::CreateRotationXYZ(
- Ang3(DEG2RAD(angles.x), DEG2RAD(angles.y), DEG2RAD(angles.z)));
-
- if (CMapperOperator* pOperator = GetPosition(0))
- {
- result.t = pOperator->Compute().t.CompMul(scale) + result.t;
- }
- if (CMapperOperator* pOperator = GetOrientation(0))
- {
- result.q = pOperator->Compute().q * result.q;
- }
- return result;
- }
-
-private:
- CVariable* m_pVector;
- CVariable* m_pAngles;
- CVariable* m_pScale;
-};
-
-SkeletonMapperOperatorRegister(Transform, CMapperOperator_Transform)
-
-class CMapperOperator_PositionsToOrientation
- : public CMapperOperator
-{
-public:
- CMapperOperator_PositionsToOrientation()
- : CMapperOperator("PositionsToOrientation", 3, 0)
- {
- }
-
- // CMapperOperator
-public:
- virtual QuatT Compute()
- {
- CMapperOperator* pOperator0 = GetPosition(0);
- CMapperOperator* pOperator1 = GetPosition(1);
- CMapperOperator* pOperator2 = GetPosition(2);
- if (!pOperator0 || !pOperator1 || !pOperator2)
- {
- return QuatT(IDENTITY);
- }
-
- Vec3 p0 = pOperator0->Compute().t;
- Vec3 p1 = pOperator1->Compute().t;
- Vec3 p2 = pOperator2->Compute().t;
-
- Vec3 m = (p1 + p2) * 0.5f;
- Vec3 y = (m - p0).GetNormalized();
- Vec3 z = (p1 - p2).GetNormalized();
- Vec3 x = y % z;
- z = x % y;
-
- Matrix33 m33;
- m33.SetFromVectors(x, y, z);
- QuatT result(IDENTITY);
- result.q = Quat(m33);
- return result;
- }
-};
-
-SkeletonMapperOperatorRegister(PositionsToOrientation, CMapperOperator_PositionsToOrientation)
diff --git a/Code/Editor/Animation/SkeletonMapperOperator.h b/Code/Editor/Animation/SkeletonMapperOperator.h
deleted file mode 100644
index 68bbb84ac7..0000000000
--- a/Code/Editor/Animation/SkeletonMapperOperator.h
+++ /dev/null
@@ -1,164 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project.
- * For complete copyright and license terms please see the LICENSE at the root of this distribution.
- *
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#ifndef CRYINCLUDE_EDITOR_ANIMATION_SKELETONMAPPEROPERATOR_H
-#define CRYINCLUDE_EDITOR_ANIMATION_SKELETONMAPPEROPERATOR_H
-#pragma once
-
-
-#include "../Util/Variable.h"
-
-#undef GetClassName
-
-#define SkeletonMapperOperatorRegister(name, className) \
- class CMapperOperatorDesc_##name \
- : public CMapperOperatorDesc \
- { \
- public: \
- CMapperOperatorDesc_##name() \
- : CMapperOperatorDesc(#name) { } \
- protected: \
- virtual const char* GetName() { return #name; } \
- virtual CMapperOperator* Create() { return new className(); } \
- } mapperOperatorDesc__##name;
-
-namespace Skeleton {
- class CMapperOperator;
-
- class CMapperOperatorDesc
- {
- public:
- static uint32 GetCount() { return uint32(s_descs.size()); }
- static const char* GetName(uint32 index) { return s_descs[index]->GetName(); }
- static CMapperOperator* Create(uint32 index) { return s_descs[index]->Create(); }
-
- private:
- static std::vector s_descs;
-
- public:
- CMapperOperatorDesc(const char* name);
-
- protected:
- virtual const char* GetName() = 0;
- virtual CMapperOperator* Create() = 0;
- };
-
- class CMapperOperator
- : public _reference_target_t
- {
- protected:
- CMapperOperator(const char* className, uint32 positionCount, uint32 orientationCount);
- ~CMapperOperator();
-
- public:
- const char* GetClassName() { return m_className; }
-
- uint32 GetPositionCount() const { return uint32(m_position.size()); }
- void SetPosition(uint32 index, CMapperOperator* pOperator) { m_position[index] = pOperator; }
- CMapperOperator* GetPosition(uint32 index) { return m_position[index]; }
-
- uint32 GetOrientationCount() const { return uint32(m_orientation.size()); }
- void SetOrientation(uint32 index, CMapperOperator* pOperator) { m_orientation[index] = pOperator; }
- CMapperOperator* GetOrientation(uint32 index) { return m_orientation[index]; }
-
- uint32 GetParameterCount() { return uint32(m_parameters.size()); }
- IVariable* GetParameter(uint32 index) { return m_parameters[index]; }
-
- bool IsOfClass(const char* className);
- uint32 HasLinksOfClass(const char* className);
-
- bool SerializeTo(XmlNodeRef& node);
- bool SerializeFrom(XmlNodeRef& node);
-
- bool SerializeWithLinksTo(XmlNodeRef& node);
- bool SerializeWithLinksFrom(XmlNodeRef& node);
-
- protected:
- void AddParameter(IVariable& variable) { m_parameters.push_back(&variable); }
-
- public:
- virtual QuatT Compute() = 0;
-
- private:
- const char* m_className;
- std::vector<_smart_ptr > m_position;
- std::vector<_smart_ptr > m_orientation;
-
- std::vector m_parameters;
- };
-
- class CMapperLocation
- : public CMapperOperator
- {
- public:
- CMapperLocation()
- : CMapperOperator("Location", 0, 0)
- {
- m_pName = new CVariable();
- m_pName->SetName("name");
- m_pName->SetFlags(m_pName->GetFlags() | IVariable::UI_INVISIBLE);
- AddParameter(*m_pName);
-
- m_pAxis = new CVariable();
- m_pAxis->SetName("axis");
- m_pAxis->SetLimits(-3.0f, +3.0f);
- m_pAxis->Set(Vec3(1.0f, 2.0f, 3.0f));
- AddParameter(*m_pAxis);
-
- m_location = QuatT(IDENTITY);
- }
-
- public:
- void SetName(const char* name) { m_pName->Set(name); }
- CString GetName() const { CString s; m_pName->Get(s); return s; }
-
- void SetLocation(const QuatT& location) { m_location = location; }
- const QuatT& GetLocation() const { return m_location; }
-
- // CMapperOperator
- public:
- virtual QuatT Compute()
- {
- Vec3 axis;
- m_pAxis->Get(axis);
-
- uint32 x = fabs_tpl(axis.x);
- uint32 y = fabs_tpl(axis.y);
- uint32 z = fabs_tpl(axis.z);
- if (x < 1 || y < 1 || z < 1 ||
- x > 3 || y > 3 || y > 3 ||
- x == y || x == z || y == z)
- {
- return QuatT(IDENTITY);
- }
-
- Matrix33 matrix;
- matrix.SetFromVectors(
- m_location.q.GetColumn(x - 1) * f32(::sgn(axis.x)),
- m_location.q.GetColumn(y - 1) * f32(::sgn(axis.y)),
- m_location.q.GetColumn(z - 1) * f32(::sgn(axis.z)));
- if (!matrix.IsOrthonormalRH(0.01f))
- {
- return QuatT(IDENTITY);
- }
-
- QuatT result = m_location;
- result.q = Quat(matrix);
- return result;
- }
-
- private:
- CVariable* m_pName;
- CVariable* m_pAxis;
-
- QuatT m_location;
- };
-} // namespace Skeleton
-
-#endif // CRYINCLUDE_EDITOR_ANIMATION_SKELETONMAPPEROPERATOR_H
diff --git a/Code/Editor/AnimationContext.cpp b/Code/Editor/AnimationContext.cpp
index debe5e3b01..6e146faacb 100644
--- a/Code/Editor/AnimationContext.cpp
+++ b/Code/Editor/AnimationContext.cpp
@@ -16,7 +16,6 @@
// Editor
#include "TrackView/TrackViewDialog.h"
-#include "RenderViewport.h"
#include "ViewManager.h"
#include "Objects/SelectionGroup.h"
#include "Include/IObjectManager.h"
@@ -29,7 +28,7 @@ class CMovieCallback
: public IMovieCallback
{
protected:
- virtual void OnMovieCallback(ECallbackReason reason, [[maybe_unused]] IAnimNode* pNode)
+ void OnMovieCallback(ECallbackReason reason, [[maybe_unused]] IAnimNode* pNode) override
{
switch (reason)
{
@@ -49,7 +48,7 @@ protected:
}
}
- void OnSetCamera(const SCameraParams& Params)
+ void OnSetCamera(const SCameraParams& Params) override
{
// Only switch camera when in Play mode.
GUID camObjId = GUID_NULL;
@@ -61,15 +60,6 @@ protected:
{
camObjId = pEditorEntity->GetId();
}
-
- CViewport* pViewport = GetIEditor()->GetViewManager()->GetSelectedViewport();
- if (CRenderViewport* rvp = viewport_cast(pViewport))
- {
- if (!rvp->IsSequenceCamera())
- {
- return;
- }
- }
}
// Switch camera in active rendering view.
@@ -79,14 +69,14 @@ protected:
}
};
- bool IsSequenceCamUsed() const
+ bool IsSequenceCamUsed() const override
{
if (gEnv->IsEditorGameMode() == true)
{
return true;
}
- if (GetIEditor()->GetViewManager() == NULL)
+ if (GetIEditor()->GetViewManager() == nullptr)
{
return false;
}
@@ -113,7 +103,7 @@ public:
CAnimationContextPostRender(CAnimationContext* pAC)
: m_pAC(pAC){}
- void OnPostRender() const { assert(m_pAC); m_pAC->OnPostRender(); }
+ void OnPostRender() const override { assert(m_pAC); m_pAC->OnPostRender(); }
protected:
CAnimationContext* m_pAC;
@@ -231,7 +221,7 @@ void CAnimationContext::SetSequence(CTrackViewSequence* sequence, bool force, bo
m_pSequence->UnBindFromEditorObjects();
}
m_pSequence = sequence;
-
+
// Notify a new sequence was just selected.
Maestro::EditorSequenceNotificationBus::Broadcast(&Maestro::EditorSequenceNotificationBus::Events::OnSequenceSelected, m_pSequence ? m_pSequence->GetSequenceComponentEntityId() : AZ::EntityId());
@@ -347,7 +337,7 @@ void CAnimationContext::OnSequenceActivated(AZ::EntityId entityId)
{
// Hang onto this because SetSequence() will reset it.
float lastTime = m_mostRecentSequenceTime;
-
+
SetSequence(sequence, false, false);
// Restore the current time.
diff --git a/Code/Editor/AnimationContext.cpp.rej b/Code/Editor/AnimationContext.cpp.rej
deleted file mode 100644
index 3ee0913c9d..0000000000
--- a/Code/Editor/AnimationContext.cpp.rej
+++ /dev/null
@@ -1,11 +0,0 @@
---- Editor/AnimationContext.cpp
-+++ Editor/AnimationContext.cpp
-@@ -612,7 +612,7 @@ void CAnimationContext::UpdateAnimatedLights()
- return;
-
- std::vector entityObjects;
-- GetIEditor()->GetObjectManager()->FindObjectsOfType(entityObjects);
-+ GetIEditor()->GetObjectManager()->FindObjectsOfType(&CEntityObject::staticMetaObject, entityObjects);
- std::for_each(std::begin(entityObjects), std::end(entityObjects),
- [this](CBaseObject *pBaseObject)
- {
diff --git a/Code/Editor/AzAssetBrowser/AzAssetBrowserRequestHandler.cpp b/Code/Editor/AzAssetBrowser/AzAssetBrowserRequestHandler.cpp
index 50f8aff144..cb97632e07 100644
--- a/Code/Editor/AzAssetBrowser/AzAssetBrowserRequestHandler.cpp
+++ b/Code/Editor/AzAssetBrowser/AzAssetBrowserRequestHandler.cpp
@@ -260,9 +260,7 @@ void AzAssetBrowserRequestHandler::AddContextMenuActions(QWidget* caller, QMenu*
return;
}
- AZStd::string fullFileDirectory;
AZStd::string fullFilePath;
- AZStd::string fileName;
AZStd::string extension;
switch (entry->GetEntryType())
@@ -281,8 +279,6 @@ void AzAssetBrowserRequestHandler::AddContextMenuActions(QWidget* caller, QMenu*
{
AZ::Uuid sourceID = azrtti_cast(entry)->GetSourceUuid();
fullFilePath = entry->GetFullPath();
- fullFileDirectory = fullFilePath.substr(0, fullFilePath.find_last_of(AZ_CORRECT_DATABASE_SEPARATOR));
- fileName = entry->GetName();
AzFramework::StringFunc::Path::GetExtension(fullFilePath.c_str(), extension);
// Add the "Open" menu item.
@@ -369,19 +365,19 @@ void AzAssetBrowserRequestHandler::AddContextMenuActions(QWidget* caller, QMenu*
{
if (entry->GetEntryType() == AssetBrowserEntry::AssetEntryType::Source)
{
- CFileUtil::PopulateQMenu(caller, menu, fileName.c_str(), fullFileDirectory.c_str());
+ CFileUtil::PopulateQMenu(caller, menu, fullFilePath);
}
return;
}
- CFileUtil::PopulateQMenu(caller, menu, fileName.c_str(), fullFileDirectory.c_str());
+ CFileUtil::PopulateQMenu(caller, menu, fullFilePath);
}
break;
case AssetBrowserEntry::AssetEntryType::Folder:
{
- fullFileDirectory = entry->GetFullPath();
- // we are sending an empty filename to indicate that it is a folder and not a file
- CFileUtil::PopulateQMenu(caller, menu, fileName.c_str(), fullFileDirectory.c_str());
+ fullFilePath = entry->GetFullPath();
+
+ CFileUtil::PopulateQMenu(caller, menu, fullFilePath);
}
break;
default:
diff --git a/Code/Editor/AzAssetBrowser/AzAssetBrowserWindow.cpp b/Code/Editor/AzAssetBrowser/AzAssetBrowserWindow.cpp
index f1047ae62b..c54fe60c4d 100644
--- a/Code/Editor/AzAssetBrowser/AzAssetBrowserWindow.cpp
+++ b/Code/Editor/AzAssetBrowser/AzAssetBrowserWindow.cpp
@@ -42,7 +42,7 @@ public:
AzToolsFramework::EditorEvents::Bus::Handler::BusConnect();
}
- ~ListenerForShowAssetEditorEvent()
+ ~ListenerForShowAssetEditorEvent() override
{
AzToolsFramework::EditorEvents::Bus::Handler::BusDisconnect();
}
@@ -82,6 +82,7 @@ AzAssetBrowserWindow::AzAssetBrowserWindow(QWidget* parent)
m_ui->m_assetBrowserTableViewWidget->setVisible(false);
m_ui->m_toggleDisplayViewBtn->setVisible(false);
+ m_ui->m_searchWidget->SetFilterInputInterval(AZStd::chrono::milliseconds(250));
if (ed_useNewAssetBrowserTableView)
{
m_ui->m_toggleDisplayViewBtn->setVisible(true);
diff --git a/Code/Editor/BaseLibrary.cpp b/Code/Editor/BaseLibrary.cpp
index ee1c85756d..9f26630c2c 100644
--- a/Code/Editor/BaseLibrary.cpp
+++ b/Code/Editor/BaseLibrary.cpp
@@ -24,10 +24,10 @@ class CUndoBaseLibrary
: public IUndoObject
{
public:
- CUndoBaseLibrary(CBaseLibrary* pLib, const QString& description, const QString& selectedItem = 0)
+ CUndoBaseLibrary(CBaseLibrary* pLib, const QString& description, const QString& selectedItem = QString())
: m_pLib(pLib)
, m_description(description)
- , m_redo(0)
+ , m_redo(nullptr)
, m_selectedItem(selectedItem)
{
assert(m_pLib);
@@ -36,16 +36,16 @@ public:
m_pLib->Serialize(m_undo, false);
}
- virtual QString GetEditorObjectName()
+ QString GetEditorObjectName() override
{
return m_selectedItem;
}
protected:
- virtual int GetSize() { return sizeof(CUndoBaseLibrary); }
- virtual QString GetDescription() { return m_description; };
+ int GetSize() override { return sizeof(CUndoBaseLibrary); }
+ QString GetDescription() override { return m_description; };
- virtual void Undo(bool bUndo)
+ void Undo(bool bUndo) override
{
if (bUndo)
{
@@ -57,7 +57,7 @@ protected:
GetIEditor()->Notify(eNotify_OnDataBaseUpdate);
}
- virtual void Redo()
+ void Redo() override
{
m_pLib->Serialize(m_redo, true);
m_pLib->SetModified();
@@ -107,7 +107,7 @@ void CBaseLibrary::RemoveAllItems()
// Unregister item in case it was registered. It is ok if it wasn't. This is still safe to call.
m_pManager->UnregisterItem(m_items[i]);
// Clear library item.
- m_items[i]->m_library = NULL;
+ m_items[i]->m_library = nullptr;
}
m_items.clear();
Release();
@@ -216,7 +216,7 @@ IDataBaseItem* CBaseLibrary::FindItem(const QString& name)
return m_items[i];
}
}
- return NULL;
+ return nullptr;
}
bool CBaseLibrary::AddLibraryToSourceControl(const QString& fullPathName) const
@@ -233,8 +233,8 @@ bool CBaseLibrary::AddLibraryToSourceControl(const QString& fullPathName) const
bool CBaseLibrary::SaveLibrary(const char* name, bool saveEmptyLibrary)
{
- assert(name != NULL);
- if (name == NULL)
+ assert(name != nullptr);
+ if (name == nullptr)
{
CryFatalError("The library you are attempting to save has no name specified.");
return false;
@@ -258,9 +258,8 @@ bool CBaseLibrary::SaveLibrary(const char* name, bool saveEmptyLibrary)
}
if (!bRes)
{
- string strMessage;
QByteArray filenameUtf8 = fileName.toUtf8();
- strMessage.Format("The file %s is read-only and the save of the library couldn't be performed. Try to remove the \"read-only\" flag or check-out the file and then try again.", filenameUtf8.data());
+ AZStd::string strMessage = AZStd::string::format("The file %s is read-only and the save of the library couldn't be performed. Try to remove the \"read-only\" flag or check-out the file and then try again.", filenameUtf8.data());
CryMessageBox(strMessage.c_str(), "Saving Error", MB_OK | MB_ICONWARNING);
}
return bRes;
diff --git a/Code/Editor/BaseLibraryItem.cpp b/Code/Editor/BaseLibraryItem.cpp
index fd310eaf9f..252510c951 100644
--- a/Code/Editor/BaseLibraryItem.cpp
+++ b/Code/Editor/BaseLibraryItem.cpp
@@ -16,7 +16,7 @@
#include
-//undo object for multi-changes inside library item. such as set all variables to default values.
+//undo object for multi-changes inside library item. such as set all variables to default values.
//For example: change particle emitter shape will lead to multiple variable changes
class CUndoBaseLibraryItem
: public IUndoObject
@@ -54,24 +54,24 @@ public:
}
protected:
- virtual int GetSize()
- {
+ int GetSize() override
+ {
return m_size;
}
QString GetDescription() override
- {
- return m_description;
+ {
+ return m_description;
}
- virtual void Undo(bool bUndo)
+ void Undo(bool bUndo) override
{
//find the libItem
IDataBaseItem *libItem = m_libMgr->FindItemByName(m_itemPath);
if (libItem == nullptr)
{
//the undo stack is not reliable any more..
- assert(false);
+ assert(false);
return;
}
@@ -95,7 +95,7 @@ protected:
libItem->Serialize(m_undoCtx);
}
- virtual void Redo()
+ void Redo() override
{
//find the libItem
IDataBaseItem *libItem = m_libMgr->FindItemByName(m_itemPath);
@@ -124,7 +124,7 @@ private:
//////////////////////////////////////////////////////////////////////////
CBaseLibraryItem::CBaseLibraryItem()
{
- m_library = 0;
+ m_library = nullptr;
GenerateId();
m_bModified = false;
}
@@ -266,7 +266,7 @@ void CBaseLibraryItem::SetLibrary(CBaseLibrary* pLibrary)
void CBaseLibraryItem::SetModified(bool bModified)
{
m_bModified = bModified;
- if (m_bModified && m_library != NULL)
+ if (m_bModified && m_library != nullptr)
{
m_library->SetModified(bModified);
}
diff --git a/Code/Editor/BaseLibraryManager.cpp b/Code/Editor/BaseLibraryManager.cpp
index 8e555cae8c..7346ffaf8c 100644
--- a/Code/Editor/BaseLibraryManager.cpp
+++ b/Code/Editor/BaseLibraryManager.cpp
@@ -26,7 +26,7 @@ class CUndoBaseLibraryManager
: public IUndoObject
{
public:
- CUndoBaseLibraryManager(CBaseLibraryManager* pMngr, const QString& description, const QString& modifiedManager = 0)
+ CUndoBaseLibraryManager(CBaseLibraryManager* pMngr, const QString& description, const QString& modifiedManager = nullptr)
: m_pMngr(pMngr)
, m_description(description)
, m_editorObject(modifiedManager)
@@ -35,16 +35,16 @@ public:
SerializeTo(m_undos);
}
- virtual QString GetEditorObjectName()
+ QString GetEditorObjectName() override
{
return m_editorObject;
}
protected:
- virtual int GetSize() { return sizeof(CUndoBaseLibraryManager); }
- virtual QString GetDescription() { return m_description; };
+ int GetSize() override { return sizeof(CUndoBaseLibraryManager); }
+ QString GetDescription() override { return m_description; };
- virtual void Undo(bool bUndo)
+ void Undo(bool bUndo) override
{
if (bUndo)
{
@@ -55,7 +55,7 @@ protected:
GetIEditor()->Notify(eNotify_OnDataBaseUpdate);
}
- virtual void Redo()
+ void Redo() override
{
m_pMngr->ClearAll();
UnserializeFrom(m_redos);
@@ -84,7 +84,7 @@ private:
for (int i = 0; i < m_pMngr->GetLibraryCount(); i++)
{
IDataBaseLibrary* library = m_pMngr->GetLibrary(i);
-
+
const char* tag = library->IsLevelLibrary() ? LEVEL_LIBRARY_TAG : LIBRARY_TAG;
XmlNodeRef node = GetIEditor()->GetSystem()->CreateXmlNode(tag);
QString file = library->GetFilename().isEmpty() ? library->GetFilename() : library->GetName();
@@ -203,7 +203,7 @@ int CBaseLibraryManager::FindLibraryIndex(const QString& library)
//////////////////////////////////////////////////////////////////////////
IDataBaseItem* CBaseLibraryManager::FindItem(REFGUID guid) const
{
- CBaseLibraryItem* pMtl = stl::find_in_map(m_itemsGuidMap, guid, (CBaseLibraryItem*)0);
+ CBaseLibraryItem* pMtl = stl::find_in_map(m_itemsGuidMap, guid, nullptr);
return pMtl;
}
@@ -226,7 +226,7 @@ void CBaseLibraryManager::SplitFullItemName(const QString& fullItemName, QString
IDataBaseItem* CBaseLibraryManager::FindItemByName(const QString& fullItemName)
{
AZStd::lock_guard lock(m_itemsNameMapMutex);
- return stl::find_in_map(m_itemsNameMap, fullItemName, 0);
+ return stl::find_in_map(m_itemsNameMap, fullItemName, nullptr);
}
//////////////////////////////////////////////////////////////////////////
@@ -398,7 +398,7 @@ void CBaseLibraryManager::DeleteLibrary(const QString& library, bool forceDelete
UnregisterItem((CBaseLibraryItem*)pLibrary->GetItem(j));
}
pLibrary->RemoveAllItems();
-
+
if (pLibrary->IsLevelLibrary())
{
m_pLevelLibrary = nullptr;
@@ -420,7 +420,7 @@ IDataBaseLibrary* CBaseLibraryManager::GetLibrary(int index) const
//////////////////////////////////////////////////////////////////////////
IDataBaseLibrary* CBaseLibraryManager::GetLevelLibrary() const
{
- IDataBaseLibrary* pLevelLib = NULL;
+ IDataBaseLibrary* pLevelLib = nullptr;
for (int i = 0; i < GetLibraryCount(); i++)
{
@@ -526,14 +526,14 @@ void CBaseLibraryManager::Serialize(XmlNodeRef& node, bool bLoading)
QString CBaseLibraryManager::MakeUniqueItemName(const QString& srcName, const QString& libName)
{
// unlikely we'll ever encounter more than 16
- std::vector possibleDuplicates;
+ std::vector possibleDuplicates;
possibleDuplicates.reserve(16);
// search for strings in the database that might have a similar name (ignore case)
IDataBaseItemEnumerator* pEnum = GetItemEnumerator();
- for (IDataBaseItem* pItem = pEnum->GetFirst(); pItem != NULL; pItem = pEnum->GetNext())
+ for (IDataBaseItem* pItem = pEnum->GetFirst(); pItem != nullptr; pItem = pEnum->GetNext())
{
- //Check if the item is in the target library first.
+ //Check if the item is in the target library first.
IDataBaseLibrary* itemLibrary = pItem->GetLibrary();
QString itemLibraryName;
if (itemLibrary)
@@ -550,7 +550,7 @@ QString CBaseLibraryManager::MakeUniqueItemName(const QString& srcName, const QS
const QString& name = pItem->GetName();
if (name.startsWith(srcName, Qt::CaseInsensitive))
{
- possibleDuplicates.push_back(string(name.toUtf8().data()));
+ possibleDuplicates.push_back(AZStd::string(name.toUtf8().data()));
}
}
pEnum->Release();
@@ -560,7 +560,7 @@ QString CBaseLibraryManager::MakeUniqueItemName(const QString& srcName, const QS
return srcName;
}
- std::sort(possibleDuplicates.begin(), possibleDuplicates.end(), [](const string& strOne, const string& strTwo)
+ std::sort(possibleDuplicates.begin(), possibleDuplicates.end(), [](const AZStd::string& strOne, const AZStd::string& strTwo)
{
// I can assume size sorting since if the length is different, either one of the two strings doesn't
// closely match the string we are trying to duplicate, or it's a bigger number (X1 vs X10)
@@ -590,7 +590,7 @@ QString CBaseLibraryManager::MakeUniqueItemName(const QString& srcName, const QS
void CBaseLibraryManager::Validate()
{
IDataBaseItemEnumerator* pEnum = GetItemEnumerator();
- for (IDataBaseItem* pItem = pEnum->GetFirst(); pItem != NULL; pItem = pEnum->GetNext())
+ for (IDataBaseItem* pItem = pEnum->GetFirst(); pItem != nullptr; pItem = pEnum->GetNext())
{
pItem->Validate();
}
@@ -617,7 +617,7 @@ void CBaseLibraryManager::RegisterItem(CBaseLibraryItem* pItem, REFGUID newGuid)
{
return;
}
- CBaseLibraryItem* pOldItem = stl::find_in_map(m_itemsGuidMap, newGuid, (CBaseLibraryItem*)0);
+ CBaseLibraryItem* pOldItem = stl::find_in_map(m_itemsGuidMap, newGuid, nullptr);
if (!pOldItem)
{
pItem->m_guid = newGuid;
@@ -677,7 +677,7 @@ void CBaseLibraryManager::RegisterItem(CBaseLibraryItem* pItem)
{
return;
}
- CBaseLibraryItem* pOldItem = stl::find_in_map(m_itemsGuidMap, pItem->GetGUID(), (CBaseLibraryItem*)0);
+ CBaseLibraryItem* pOldItem = stl::find_in_map(m_itemsGuidMap, pItem->GetGUID(), nullptr);
if (!pOldItem)
{
m_itemsGuidMap[pItem->GetGUID()] = pItem;
@@ -789,7 +789,7 @@ QString CBaseLibraryManager::MakeFullItemName(IDataBaseLibrary* pLibrary, const
void CBaseLibraryManager::GatherUsedResources(CUsedResources& resources)
{
IDataBaseItemEnumerator* pEnum = GetItemEnumerator();
- for (IDataBaseItem* pItem = pEnum->GetFirst(); pItem != NULL; pItem = pEnum->GetNext())
+ for (IDataBaseItem* pItem = pEnum->GetFirst(); pItem != nullptr; pItem = pEnum->GetNext())
{
pItem->GatherUsedResources(resources);
}
@@ -815,15 +815,15 @@ void CBaseLibraryManager::OnEditorNotifyEvent(EEditorNotifyEvent event)
switch (event)
{
case eNotify_OnBeginNewScene:
- SetSelectedItem(0);
+ SetSelectedItem(nullptr);
ClearAll();
break;
case eNotify_OnBeginSceneOpen:
- SetSelectedItem(0);
+ SetSelectedItem(nullptr);
ClearAll();
break;
case eNotify_OnCloseScene:
- SetSelectedItem(0);
+ SetSelectedItem(nullptr);
ClearAll();
break;
}
@@ -913,7 +913,7 @@ void CBaseLibraryManager::ChangeLibraryOrder(IDataBaseLibrary* lib, unsigned int
{
return;
}
-
+
for (int i = 0; i < m_libs.size(); i++)
{
if (lib == m_libs[i])
diff --git a/Code/Editor/CMakeLists.txt b/Code/Editor/CMakeLists.txt
index fca16a2093..9256fd041f 100644
--- a/Code/Editor/CMakeLists.txt
+++ b/Code/Editor/CMakeLists.txt
@@ -238,9 +238,14 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED)
3rdParty::Qt::Core
3rdParty::Qt::Gui
3rdParty::Qt::Widgets
+ 3rdParty::Qt::Test
Legacy::CryCommon
AZ::AzToolsFramework
+ AZ::AzToolsFramework.Tests
+ AZ::AzFrameworkTestShared
+ AZ::AzToolsFrameworkTestCommon
Legacy::EditorLib
+ Gem::AtomToolsFramework.Static
RUNTIME_DEPENDENCIES
Gem::LmbrCentral
)
diff --git a/Code/Editor/CheckOutDialog.h b/Code/Editor/CheckOutDialog.h
index 7e7054ccdf..9ad64c57cf 100644
--- a/Code/Editor/CheckOutDialog.h
+++ b/Code/Editor/CheckOutDialog.h
@@ -34,7 +34,7 @@ public:
CANCEL = QDialog::Rejected
};
- CCheckOutDialog(const QString& file, QWidget* pParent = NULL); // standard constructor
+ CCheckOutDialog(const QString& file, QWidget* pParent = nullptr); // standard constructor
virtual ~CCheckOutDialog();
// Dialog Data
diff --git a/Code/Editor/Commands/CommandManager.cpp b/Code/Editor/Commands/CommandManager.cpp
index 90059ea195..f28ca96ac8 100644
--- a/Code/Editor/Commands/CommandManager.cpp
+++ b/Code/Editor/Commands/CommandManager.cpp
@@ -20,8 +20,8 @@
// AzToolsFramework
#include
-CAutoRegisterCommandHelper* CAutoRegisterCommandHelper::s_pFirst = 0;
-CAutoRegisterCommandHelper* CAutoRegisterCommandHelper::s_pLast = 0;
+CAutoRegisterCommandHelper* CAutoRegisterCommandHelper::s_pFirst = nullptr;
+CAutoRegisterCommandHelper* CAutoRegisterCommandHelper::s_pLast = nullptr;
CAutoRegisterCommandHelper* CAutoRegisterCommandHelper::GetFirst()
{
@@ -31,7 +31,7 @@ CAutoRegisterCommandHelper* CAutoRegisterCommandHelper::GetFirst()
CAutoRegisterCommandHelper::CAutoRegisterCommandHelper(void(*registerFunc)(CEditorCommandManager &))
{
m_registerFunc = registerFunc;
- m_pNext = 0;
+ m_pNext = nullptr;
if (!s_pLast)
{
@@ -79,9 +79,9 @@ CEditorCommandManager::~CEditorCommandManager()
m_uiCommands.clear();
}
-string CEditorCommandManager::GetFullCommandName(const string& module, const string& name)
+AZStd::string CEditorCommandManager::GetFullCommandName(const AZStd::string& module, const AZStd::string& name)
{
- string fullName = module;
+ AZStd::string fullName = module;
fullName += ".";
fullName += name;
return fullName;
@@ -91,10 +91,10 @@ bool CEditorCommandManager::AddCommand(CCommand* pCommand, TPfnDeleter deleter)
{
assert(pCommand);
- string module = pCommand->GetModule();
- string name = pCommand->GetName();
+ AZStd::string module = pCommand->GetModule();
+ AZStd::string name = pCommand->GetName();
- if (IsRegistered(module, name) && m_bWarnDuplicate)
+ if (IsRegistered(module.c_str(), name.c_str()) && m_bWarnDuplicate)
{
QString errMsg;
@@ -118,7 +118,7 @@ bool CEditorCommandManager::AddCommand(CCommand* pCommand, TPfnDeleter deleter)
bool CEditorCommandManager::UnregisterCommand(const char* module, const char* name)
{
- string fullName = GetFullCommandName(module, name);
+ AZStd::string fullName = GetFullCommandName(module, name);
CommandTable::iterator itr = m_commands.find(fullName);
if (itr != m_commands.end())
@@ -154,7 +154,7 @@ bool CEditorCommandManager::RegisterUICommand(
return false;
}
- return AttachUIInfo(GetFullCommandName(module, name), uiInfo);
+ return AttachUIInfo(GetFullCommandName(module, name).c_str(), uiInfo);
}
bool CEditorCommandManager::AttachUIInfo(const char* fullCmdName, const CCommand0::SUIInfo& uiInfo)
@@ -190,14 +190,14 @@ bool CEditorCommandManager::AttachUIInfo(const char* fullCmdName, const CCommand
return true;
}
-bool CEditorCommandManager::GetUIInfo(const string& module, const string& name, CCommand0::SUIInfo& uiInfo) const
+bool CEditorCommandManager::GetUIInfo(const AZStd::string& module, const AZStd::string& name, CCommand0::SUIInfo& uiInfo) const
{
- string fullName = GetFullCommandName(module, name);
+ AZStd::string fullName = GetFullCommandName(module, name);
return GetUIInfo(fullName, uiInfo);
}
-bool CEditorCommandManager::GetUIInfo(const string& fullCmdName, CCommand0::SUIInfo& uiInfo) const
+bool CEditorCommandManager::GetUIInfo(const AZStd::string& fullCmdName, CCommand0::SUIInfo& uiInfo) const
{
CommandTable::const_iterator iter = m_commands.find(fullCmdName);
@@ -223,9 +223,9 @@ int CEditorCommandManager::GenNewCommandId()
return uniqueId++;
}
-QString CEditorCommandManager::Execute(const string& module, const string& name, const CCommand::CArgs& args)
+QString CEditorCommandManager::Execute(const AZStd::string& module, const AZStd::string& name, const CCommand::CArgs& args)
{
- string fullName = GetFullCommandName(module, name);
+ AZStd::string fullName = GetFullCommandName(module, name);
CommandTable::iterator iter = m_commands.find(fullName);
if (iter != m_commands.end())
@@ -245,18 +245,18 @@ QString CEditorCommandManager::Execute(const string& module, const string& name,
return "";
}
-QString CEditorCommandManager::Execute(const string& cmdLine)
+QString CEditorCommandManager::Execute(const AZStd::string& cmdLine)
{
- string cmdTxt, argsTxt;
+ AZStd::string cmdTxt, argsTxt;
size_t argStart = cmdLine.find_first_of(' ');
cmdTxt = cmdLine.substr(0, argStart);
argsTxt = "";
- if (argStart != string::npos)
+ if (argStart != AZStd::string::npos)
{
argsTxt = cmdLine.substr(argStart + 1);
- argsTxt.Trim();
+ AZ::StringFunc::TrimWhiteSpace(argsTxt, true, true);
}
CommandTable::iterator itr = m_commands.find(cmdTxt);
@@ -301,7 +301,7 @@ void CEditorCommandManager::Execute(int commandId)
}
}
-void CEditorCommandManager::GetCommandList(std::vector& cmds) const
+void CEditorCommandManager::GetCommandList(std::vector& cmds) const
{
cmds.clear();
cmds.reserve(m_commands.size());
@@ -315,9 +315,9 @@ void CEditorCommandManager::GetCommandList(std::vector& cmds) const
std::sort(cmds.begin(), cmds.end());
}
-string CEditorCommandManager::AutoComplete(const string& substr) const
+AZStd::string CEditorCommandManager::AutoComplete(const AZStd::string& substr) const
{
- std::vector cmds;
+ std::vector cmds;
GetCommandList(cmds);
// If substring is empty return first command.
@@ -358,7 +358,7 @@ string CEditorCommandManager::AutoComplete(const string& substr) const
bool CEditorCommandManager::IsRegistered(const char* module, const char* name) const
{
- string fullName = GetFullCommandName(module, name);
+ AZStd::string fullName = GetFullCommandName(module, name);
CommandTable::const_iterator iter = m_commands.find(fullName);
if (iter != m_commands.end())
@@ -373,7 +373,7 @@ bool CEditorCommandManager::IsRegistered(const char* module, const char* name) c
bool CEditorCommandManager::IsRegistered(const char* cmdLine_) const
{
- string cmdTxt, argsTxt, cmdLine(cmdLine_);
+ AZStd::string cmdTxt, argsTxt, cmdLine(cmdLine_);
size_t argStart = cmdLine.find_first_of(' ');
cmdTxt = cmdLine.substr(0, argStart);
CommandTable::const_iterator iter = m_commands.find(cmdTxt);
@@ -402,9 +402,9 @@ bool CEditorCommandManager::IsRegistered(int commandId) const
return false;
}
-void CEditorCommandManager::SetCommandAvailableInScripting(const string& module, const string& name)
+void CEditorCommandManager::SetCommandAvailableInScripting(const AZStd::string& module, const AZStd::string& name)
{
- string fullName = GetFullCommandName(module, name);
+ AZStd::string fullName = GetFullCommandName(module, name);
CommandTable::iterator iter = m_commands.find(fullName);
if (iter != m_commands.end())
@@ -413,7 +413,7 @@ void CEditorCommandManager::SetCommandAvailableInScripting(const string& module,
}
}
-bool CEditorCommandManager::IsCommandAvailableInScripting(const string& fullCmdName) const
+bool CEditorCommandManager::IsCommandAvailableInScripting(const AZStd::string& fullCmdName) const
{
CommandTable::const_iterator iter = m_commands.find(fullCmdName);
@@ -425,16 +425,16 @@ bool CEditorCommandManager::IsCommandAvailableInScripting(const string& fullCmdN
return false;
}
-bool CEditorCommandManager::IsCommandAvailableInScripting(const string& module, const string& name) const
+bool CEditorCommandManager::IsCommandAvailableInScripting(const AZStd::string& module, const AZStd::string& name) const
{
- string fullName = GetFullCommandName(module, name);
+ AZStd::string fullName = GetFullCommandName(module, name);
return IsCommandAvailableInScripting(fullName);
}
-void CEditorCommandManager::LogCommand(const string& fullCmdName, const CCommand::CArgs& args) const
+void CEditorCommandManager::LogCommand(const AZStd::string& fullCmdName, const CCommand::CArgs& args) const
{
- string cmdLine = fullCmdName;
+ AZStd::string cmdLine = fullCmdName;
for (int i = 0; i < args.GetArgCount(); ++i)
{
@@ -509,7 +509,7 @@ void CEditorCommandManager::LogCommand(const string& fullCmdName, const CCommand
if (pScriptTermDialog)
{
- string text = "> ";
+ AZStd::string text = "> ";
text += cmdLine;
text += "\r\n";
pScriptTermDialog->AppendText(text.c_str());
@@ -526,14 +526,14 @@ QString CEditorCommandManager::ExecuteAndLogReturn(CCommand* pCommand, const CCo
return result;
}
-void CEditorCommandManager::GetArgsFromString(const string& argsTxt, CCommand::CArgs& argList)
+void CEditorCommandManager::GetArgsFromString(const AZStd::string& argsTxt, CCommand::CArgs& argList)
{
const char quoteSymbol = '\'';
int curPos = 0;
int prevPos = 0;
- string arg = argsTxt.Tokenize(" ", curPos);
-
- while (!arg.empty())
+ AZStd::vector tokens;
+ AZ::StringFunc::Tokenize(argsTxt, tokens, ' ');
+ for(AZStd::string& arg : tokens)
{
if (arg[0] == quoteSymbol) // A special consideration for a quoted string
{
@@ -542,11 +542,11 @@ void CEditorCommandManager::GetArgsFromString(const string& argsTxt, CCommand::C
size_t openingQuotePos = argsTxt.find(quoteSymbol, prevPos);
size_t closingQuotePos = argsTxt.find(quoteSymbol, curPos);
- if (closingQuotePos != string::npos)
+ if (closingQuotePos != AZStd::string::npos)
{
arg = argsTxt.substr(openingQuotePos + 1, closingQuotePos - openingQuotePos - 1);
size_t nextArgPos = argsTxt.find(' ', closingQuotePos + 1);
- curPos = nextArgPos != string::npos ? nextArgPos + 1 : argsTxt.length();
+ curPos = nextArgPos != AZStd::string::npos ? nextArgPos + 1 : argsTxt.length();
for (; curPos < argsTxt.length(); ++curPos) // Skip spaces.
{
@@ -565,6 +565,5 @@ void CEditorCommandManager::GetArgsFromString(const string& argsTxt, CCommand::C
argList.Add(arg.c_str());
prevPos = curPos;
- arg = argsTxt.Tokenize(" ", curPos);
}
}
diff --git a/Code/Editor/Commands/CommandManager.h b/Code/Editor/Commands/CommandManager.h
index 2ec4a137bc..599754c5d9 100644
--- a/Code/Editor/Commands/CommandManager.h
+++ b/Code/Editor/Commands/CommandManager.h
@@ -38,7 +38,7 @@ public:
void RegisterAutoCommands();
- bool AddCommand(CCommand* pCommand, TPfnDeleter deleter = NULL);
+ bool AddCommand(CCommand* pCommand, TPfnDeleter deleter = nullptr);
bool UnregisterCommand(const char* module, const char* name);
bool RegisterUICommand(
const char* module,
@@ -48,20 +48,20 @@ public:
const AZStd::function& functor,
const CCommand0::SUIInfo& uiInfo);
bool AttachUIInfo(const char* fullCmdName, const CCommand0::SUIInfo& uiInfo);
- bool GetUIInfo(const string& module, const string& name, CCommand0::SUIInfo& uiInfo) const;
- bool GetUIInfo(const string& fullCmdName, CCommand0::SUIInfo& uiInfo) const;
- QString Execute(const string& cmdLine);
- QString Execute(const string& module, const string& name, const CCommand::CArgs& args);
+ bool GetUIInfo(const AZStd::string& module, const AZStd::string& name, CCommand0::SUIInfo& uiInfo) const;
+ bool GetUIInfo(const AZStd::string& fullCmdName, CCommand0::SUIInfo& uiInfo) const;
+ QString Execute(const AZStd::string& cmdLine);
+ QString Execute(const AZStd::string& module, const AZStd::string& name, const CCommand::CArgs& args);
void Execute(int commandId);
- void GetCommandList(std::vector& cmds) const;
+ void GetCommandList(std::vector& cmds) const;
//! Used in the console dialog
- string AutoComplete(const string& substr) const;
+ AZStd::string AutoComplete(const AZStd::string& substr) const;
bool IsRegistered(const char* module, const char* name) const;
bool IsRegistered(const char* cmdLine) const;
bool IsRegistered(int commandId) const;
- void SetCommandAvailableInScripting(const string& module, const string& name);
- bool IsCommandAvailableInScripting(const string& module, const string& name) const;
- bool IsCommandAvailableInScripting(const string& fullCmdName) const;
+ void SetCommandAvailableInScripting(const AZStd::string& module, const AZStd::string& name);
+ bool IsCommandAvailableInScripting(const AZStd::string& module, const AZStd::string& name) const;
+ bool IsCommandAvailableInScripting(const AZStd::string& fullCmdName) const;
//! Turning off the warning is needed for reloading the ribbon bar.
void TurnDuplicateWarningOn() { m_bWarnDuplicate = true; }
void TurnDuplicateWarningOff() { m_bWarnDuplicate = false; }
@@ -74,7 +74,7 @@ protected:
};
//! A full command name to an actual command mapping
- typedef std::map CommandTable;
+ typedef std::map CommandTable;
AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
CommandTable m_commands;
@@ -86,9 +86,9 @@ protected:
bool m_bWarnDuplicate;
static int GenNewCommandId();
- static string GetFullCommandName(const string& module, const string& name);
- static void GetArgsFromString(const string& argsTxt, CCommand::CArgs& argList);
- void LogCommand(const string& fullCmdName, const CCommand::CArgs& args) const;
+ static AZStd::string GetFullCommandName(const AZStd::string& module, const AZStd::string& name);
+ static void GetArgsFromString(const AZStd::string& argsTxt, CCommand::CArgs& argList);
+ void LogCommand(const AZStd::string& fullCmdName, const CCommand::CArgs& args) const;
QString ExecuteAndLogReturn(CCommand* pCommand, const CCommand::CArgs& args);
};
diff --git a/Code/Editor/ConfigGroup.cpp b/Code/Editor/ConfigGroup.cpp
index 4e61c38f4b..b18edf1142 100644
--- a/Code/Editor/ConfigGroup.cpp
+++ b/Code/Editor/ConfigGroup.cpp
@@ -48,7 +48,7 @@ namespace Config
}
}
- return NULL;
+ return nullptr;
}
const IConfigVar* CConfigGroup::GetVar(const char* szName) const
@@ -63,7 +63,7 @@ namespace Config
}
}
- return NULL;
+ return nullptr;
}
IConfigVar* CConfigGroup::GetVar(uint index)
@@ -73,7 +73,7 @@ namespace Config
return m_vars[index];
}
- return NULL;
+ return nullptr;
}
const IConfigVar* CConfigGroup::GetVar(uint index) const
@@ -83,7 +83,7 @@ namespace Config
return m_vars[index];
}
- return NULL;
+ return nullptr;
}
void CConfigGroup::SaveToXML(XmlNodeRef node)
@@ -127,9 +127,9 @@ namespace Config
case IConfigVar::eType_STRING:
{
- string currentValue = 0;
+ AZStd::string currentValue;
var->Get(¤tValue);
- node->setAttr(szName, currentValue);
+ node->setAttr(szName, currentValue.c_str());
break;
}
}
@@ -186,7 +186,7 @@ namespace Config
case IConfigVar::eType_STRING:
{
- string currentValue = 0;
+ AZStd::string currentValue;
var->GetDefault(¤tValue);
QString readValue(currentValue.c_str());
if (node->getAttr(szName, readValue))
diff --git a/Code/Editor/ConfigGroup.h b/Code/Editor/ConfigGroup.h
index 35c0b8e47f..769a29ba8a 100644
--- a/Code/Editor/ConfigGroup.h
+++ b/Code/Editor/ConfigGroup.h
@@ -37,22 +37,22 @@ namespace Config
, m_description(szDescription)
, m_type(varType)
, m_flags(flags)
- , m_ptr(NULL)
+ , m_ptr(nullptr)
{};
virtual ~IConfigVar() = default;
-
+
ILINE EType GetType() const
{
return m_type;
}
- ILINE const string& GetName() const
+ ILINE const AZStd::string& GetName() const
{
return m_name;
}
- ILINE const string& GetDescription() const
+ ILINE const AZStd::string& GetDescription() const
{
return m_description;
}
@@ -71,13 +71,13 @@ namespace Config
static EType TranslateType(const bool&) { return eType_BOOL; }
static EType TranslateType(const int&) { return eType_INT; }
static EType TranslateType(const float&) { return eType_FLOAT; }
- static EType TranslateType(const string&) { return eType_STRING; }
+ static EType TranslateType(const AZStd::string&) { return eType_STRING; }
protected:
EType m_type;
uint8 m_flags;
- string m_name;
- string m_description;
+ AZStd::string m_name;
+ AZStd::string m_description;
void* m_ptr;
ICVar* m_pCVar;
};
diff --git a/Code/Editor/ControlMRU.cpp b/Code/Editor/ControlMRU.cpp
deleted file mode 100644
index 47de13950f..0000000000
--- a/Code/Editor/ControlMRU.cpp
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project.
- * For complete copyright and license terms please see the LICENSE at the root of this distribution.
- *
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#include "EditorDefs.h"
-#include "ControlMRU.h"
-
-IMPLEMENT_XTP_CONTROL(CControlMRU, CXTPControlRecentFileList)
-
-bool CControlMRU::DoesFileExist(CString& sFileName)
-{
- return (_access(sFileName.GetBuffer(), 0) == 0);
-}
-
-void CControlMRU::OnCalcDynamicSize(DWORD dwMode)
-{
- CRecentFileList* pRecentFileList = GetRecentFileList();
-
- if (!pRecentFileList)
- {
- return;
- }
-
- CString* pArrNames = pRecentFileList->m_arrNames;
-
- assert(pArrNames != NULL);
- if (!pArrNames)
- {
- return;
- }
-
- while (m_nIndex + 1 < m_pControls->GetCount())
- {
- CXTPControl* pControl = m_pControls->GetAt(m_nIndex + 1);
- assert(pControl);
- if (pControl->GetID() >= GetFirstMruID()
- && pControl->GetID() <= GetFirstMruID() + pRecentFileList->m_nSize)
- {
- m_pControls->Remove(pControl);
- }
- else
- {
- break;
- }
- }
-
- if (m_pParent->IsCustomizeMode())
- {
- m_dwHideFlags = 0;
- SetEnabled(TRUE);
- return;
- }
-
- if (pArrNames[0].IsEmpty())
- {
- SetCaption(CString(MAKEINTRESOURCE(IDS_NORECENTFILE_CAPTION)));
- SetDescription("No recently opened files");
- m_dwHideFlags = 0;
- SetEnabled(FALSE);
-
- return;
- }
- else
- {
- SetCaption(CString(MAKEINTRESOURCE(IDS_RECENTFILE_CAPTION)));
- SetDescription("Open this document");
- }
-
- m_dwHideFlags |= xtpHideGeneric;
-
- CString sCurDir = (Path::GetEditingGameDataFolder() + "\\").c_str();
- int nCurDir = sCurDir.GetLength();
-
- CString strName;
- CString strTemp;
- int iLastValidMRU = 0;
-
- for (int iMRU = 0; iMRU < pRecentFileList->m_nSize; iMRU++)
- {
- if (!pRecentFileList->GetDisplayName(strName, iMRU, sCurDir.GetBuffer(), nCurDir))
- {
- break;
- }
-
- if (DoesFileExist(pArrNames[iMRU]))
- {
- CString sCurEntryDir = pArrNames[iMRU].Left(nCurDir);
-
- if (sCurEntryDir.CompareNoCase(sCurDir) != 0)
- {
- //unavailable entry (wrong directory)
- continue;
- }
- }
- else
- {
- //invalid entry (not existing)
- continue;
- }
-
- int nId = iMRU + GetFirstMruID();
-
- CXTPControl* pControl = m_pControls->Add(xtpControlButton, nId, _T(""), m_nIndex + iLastValidMRU + 1, TRUE);
- assert(pControl);
-
- pControl->SetCaption(CXTPControlWindowList::ConstructCaption(strName, iLastValidMRU + 1));
- pControl->SetFlags(xtpFlagManualUpdate);
- pControl->SetBeginGroup(iLastValidMRU == 0 && m_nIndex != 0);
- pControl->SetParameter(pArrNames[iMRU]);
-
- CString sDescription = "Open file: " + pArrNames[iMRU];
- pControl->SetDescription(sDescription);
-
- if ((GetFlags() & xtpFlagWrapRow) && iMRU == 0)
- {
- pControl->SetFlags(pControl->GetFlags() | xtpFlagWrapRow);
- }
-
- ++iLastValidMRU;
- }
-
- //if no entry was valid, treat as none would exist
- if (iLastValidMRU == 0)
- {
- SetCaption(CString(MAKEINTRESOURCE(IDS_NORECENTFILE_CAPTION)));
- SetDescription("No recently opened files");
- m_dwHideFlags = 0;
- SetEnabled(FALSE);
- }
-}
diff --git a/Code/Editor/ControlMRU.h b/Code/Editor/ControlMRU.h
deleted file mode 100644
index 4ca6562589..0000000000
--- a/Code/Editor/ControlMRU.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project.
- * For complete copyright and license terms please see the LICENSE at the root of this distribution.
- *
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#pragma once
-#ifndef CRYINCLUDE_EDITOR_CONTROLMRU_H
-#define CRYINCLUDE_EDITOR_CONTROLMRU_H
-
-class CControlMRU
- : public CXTPControlRecentFileList
-{
-protected:
- virtual void OnCalcDynamicSize(DWORD dwMode);
-
-private:
- DECLARE_XTP_CONTROL(CControlMRU)
- bool DoesFileExist(CString& sFileName);
-};
-#endif // CRYINCLUDE_EDITOR_CONTROLMRU_H
diff --git a/Code/Editor/Controls/BitmapToolTip.h b/Code/Editor/Controls/BitmapToolTip.h
index d4bb89c625..5b7c56cbf3 100644
--- a/Code/Editor/Controls/BitmapToolTip.h
+++ b/Code/Editor/Controls/BitmapToolTip.h
@@ -42,7 +42,7 @@ public:
CBitmapToolTip(QWidget* parent = nullptr);
virtual ~CBitmapToolTip();
- BOOL Create(const RECT& rect);
+ bool Create(const RECT& rect);
// Attributes
public:
diff --git a/Code/Editor/Controls/ColorGradientCtrl.cpp b/Code/Editor/Controls/ColorGradientCtrl.cpp
index 555d285192..3bd3b11690 100644
--- a/Code/Editor/Controls/ColorGradientCtrl.cpp
+++ b/Code/Editor/Controls/ColorGradientCtrl.cpp
@@ -29,7 +29,7 @@ CColorGradientCtrl::CColorGradientCtrl(QWidget* parent)
m_nHitKeyIndex = -1;
m_nKeyDrawRadius = 3;
m_bTracking = false;
- m_pSpline = 0;
+ m_pSpline = nullptr;
m_fMinTime = -1;
m_fMaxTime = 1;
m_fMinValue = -1;
@@ -474,7 +474,7 @@ void CColorGradientCtrl::SetActiveKey(int nIndex)
}
/////////////////////////////////////////////////////////////////////////////
-void CColorGradientCtrl::SetSpline(ISplineInterpolator* pSpline, BOOL bRedraw)
+void CColorGradientCtrl::SetSpline(ISplineInterpolator* pSpline, bool bRedraw)
{
if (pSpline != m_pSpline)
{
@@ -501,7 +501,7 @@ ISplineInterpolator* CColorGradientCtrl::GetSpline()
/////////////////////////////////////////////////////////////////////////////
void CColorGradientCtrl::keyPressEvent(QKeyEvent* event)
{
- BOOL bProcessed = false;
+ bool bProcessed = false;
if (m_nActiveKey != -1 && m_pSpline)
{
diff --git a/Code/Editor/Controls/ColorGradientCtrl.h b/Code/Editor/Controls/ColorGradientCtrl.h
index 9533fecdfa..80d8b966f4 100644
--- a/Code/Editor/Controls/ColorGradientCtrl.h
+++ b/Code/Editor/Controls/ColorGradientCtrl.h
@@ -54,7 +54,7 @@ public:
// Lock value of first and last key to be the same.
void LockFirstAndLastKeys(bool bLock) { m_bLockFirstLastKey = bLock; }
- void SetSpline(ISplineInterpolator* pSpline, BOOL bRedraw = FALSE);
+ void SetSpline(ISplineInterpolator* pSpline, bool bRedraw = false);
ISplineInterpolator* GetSpline();
void SetTimeMarker(float fTime);
diff --git a/Code/Editor/Controls/ConsoleSCB.cpp b/Code/Editor/Controls/ConsoleSCB.cpp
index 9f1921395c..093575d445 100644
--- a/Code/Editor/Controls/ConsoleSCB.cpp
+++ b/Code/Editor/Controls/ConsoleSCB.cpp
@@ -62,14 +62,14 @@ public:
}
protected:
- void highlightBlock(const QString &text)
+ void highlightBlock(const QString &text) override
{
auto pos = -1;
QTextCharFormat myClassFormat;
myClassFormat.setFontWeight(QFont::Bold);
myClassFormat.setBackground(Qt::yellow);
- while (1)
+ while (true)
{
pos = text.indexOf(m_searchTerm, pos+1, Qt::CaseInsensitive);
@@ -180,7 +180,7 @@ bool ConsoleLineEdit::event(QEvent* ev)
if (newStr.isEmpty())
{
- newStr = GetIEditor()->GetCommandManager()->AutoComplete(cstring.toUtf8().data());
+ newStr = GetIEditor()->GetCommandManager()->AutoComplete(cstring.toUtf8().data()).c_str();
}
}
@@ -211,7 +211,7 @@ void ConsoleLineEdit::keyPressEvent(QKeyEvent* ev)
{
if (commandManager->IsRegistered(str.toUtf8().data()))
{
- commandManager->Execute(QtUtil::ToString(str));
+ commandManager->Execute(str.toUtf8().data());
}
else
{
@@ -338,6 +338,8 @@ CConsoleSCB::CConsoleSCB(QWidget* parent)
connect(findPreviousAction, &QAction::triggered, this, &CConsoleSCB::findPrevious);
ui->findPrevButton->addAction(findPreviousAction);
+ GetIEditor()->RegisterNotifyListener(this);
+
connect(ui->button, &QPushButton::clicked, this, &CConsoleSCB::showVariableEditor);
connect(ui->findButton, &QPushButton::clicked, this, &CConsoleSCB::toggleConsoleSearch);
connect(ui->textEdit, &ConsoleTextEdit::searchBarRequested, this, [this]
@@ -376,6 +378,8 @@ CConsoleSCB::~CConsoleSCB()
{
AzToolsFramework::EditorPreferencesNotificationBus::Handler::BusDisconnect();
+ GetIEditor()->UnregisterNotifyListener(this);
+
s_consoleSCB = nullptr;
CLogFile::AttachEditBox(nullptr);
}
@@ -562,15 +566,15 @@ static void OnVariableUpdated([[maybe_unused]] int row, ICVar* pCVar)
static CVarBlock* VarBlockFromConsoleVars()
{
IConsole* console = GetIEditor()->GetSystem()->GetIConsole();
- std::vector cmds;
+ AZStd::vector cmds;
cmds.resize(console->GetNumVars());
- size_t cmdCount = console->GetSortedVars(&cmds[0], cmds.size());
+ size_t cmdCount = console->GetSortedVars(cmds);
CVarBlock* vb = new CVarBlock;
- IVariable* pVariable = 0;
+ IVariable* pVariable = nullptr;
for (int i = 0; i < cmdCount; i++)
{
- ICVar* pCVar = console->GetCVar(cmds[i]);
+ ICVar* pCVar = console->GetCVar(cmds[i].data());
if (!pCVar)
{
continue;
@@ -602,7 +606,7 @@ static CVarBlock* VarBlockFromConsoleVars()
pCVar->AddOnChangeFunctor(onChange);
pVariable->SetDescription(pCVar->GetHelp());
- pVariable->SetName(cmds[i]);
+ pVariable->SetName(cmds[i].data());
// Transfer the custom limits have they have been set for this variable
if (pCVar->HasCustomLimits())
@@ -1352,4 +1356,19 @@ CConsoleSCB* CConsoleSCB::GetCreatedInstance()
return s_consoleSCB;
}
+void CConsoleSCB::OnEditorNotifyEvent(EEditorNotifyEvent event)
+{
+ switch (event)
+ {
+ case eNotify_OnBeginGameMode:
+ if (gSettings.clearConsoleOnGameModeStart)
+ {
+ ui->textEdit->clear();
+ }
+ break;
+ default:
+ break;
+ }
+}
+
#include
diff --git a/Code/Editor/Controls/ConsoleSCB.h b/Code/Editor/Controls/ConsoleSCB.h
index 98bf4b391d..f51786e2a5 100644
--- a/Code/Editor/Controls/ConsoleSCB.h
+++ b/Code/Editor/Controls/ConsoleSCB.h
@@ -159,6 +159,7 @@ private:
class CConsoleSCB
: public QWidget
, private AzToolsFramework::EditorPreferencesNotificationBus::Handler
+ , public IEditorNotifyListener
{
Q_OBJECT
public:
@@ -187,6 +188,8 @@ private Q_SLOTS:
void findNext();
private:
+ void OnEditorNotifyEvent(EEditorNotifyEvent event) override;
+
QScopedPointer ui;
int m_richEditTextLength;
diff --git a/Code/Editor/Controls/ConsoleSCBMFC.cpp b/Code/Editor/Controls/ConsoleSCBMFC.cpp
deleted file mode 100644
index 3337997811..0000000000
--- a/Code/Editor/Controls/ConsoleSCBMFC.cpp
+++ /dev/null
@@ -1,543 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project.
- * For complete copyright and license terms please see the LICENSE at the root of this distribution.
- *
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#include "EditorDefs.h"
-#include "ConsoleSCBMFC.h"
-#include "PropertiesDialog.h"
-#include "QtViewPaneManager.h"
-#include "Core/QtEditorApplication.h"
-
-#include
-
-#include
-#include
-
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-
-#include
-#include
-
-namespace MFC
-{
-
-static CPropertiesDialog* gPropertiesDlg = nullptr;
-static CString mfc_popup_helper(HWND hwnd, int x, int y);
-static CConsoleSCB* s_consoleSCB = nullptr;
-
-static QString RemoveColorCode(const QString& text, int& iColorCode)
-{
- QString cleanString;
- cleanString.reserve(text.size());
-
- const int textSize = text.size();
- for (int i = 0; i < textSize; ++i)
- {
- QChar c = text.at(i);
- bool isLast = i == textSize - 1;
- if (c == '$' && !isLast && text.at(i + 1).isDigit())
- {
- if (iColorCode == 0)
- {
- iColorCode = text.at(i + 1).digitValue();
- }
- ++i;
- continue;
- }
-
- if (c == '\r' || c == '\n')
- {
- ++i;
- continue;
- }
-
- cleanString.append(c);
- }
-
- return cleanString;
-}
-
-ConsoleLineEdit::ConsoleLineEdit(QWidget* parent)
- : QLineEdit(parent)
- , m_historyIndex(0)
- , m_bReusedHistory(false)
-{
-}
-
-void ConsoleLineEdit::mousePressEvent(QMouseEvent* ev)
-{
- if (ev->type() == QEvent::MouseButtonPress && ev->button() & Qt::RightButton)
- {
- Q_EMIT variableEditorRequested();
- }
-
- QLineEdit::mousePressEvent(ev);
-}
-
-void ConsoleLineEdit::mouseDoubleClickEvent(QMouseEvent* ev)
-{
- Q_EMIT variableEditorRequested();
-}
-
-bool ConsoleLineEdit::event(QEvent* ev)
-{
- // Tab key doesn't go to keyPressEvent(), must be processed here
-
- if (ev->type() != QEvent::KeyPress)
- {
- return QLineEdit::event(ev);
- }
-
- QKeyEvent* ke = static_cast(ev);
- if (ke->key() != Qt::Key_Tab)
- {
- return QLineEdit::event(ev);
- }
-
- QString inputStr = text();
- QString newStr;
-
- QStringList tokens = inputStr.split(" ");
- inputStr = tokens.isEmpty() ? QString() : tokens.first();
- IConsole* console = GetIEditor()->GetSystem()->GetIConsole();
-
- const bool ctrlPressed = ke->modifiers() & Qt::ControlModifier;
- CString cstring = QtUtil::ToCString(inputStr); // TODO: Use QString once the backend stops using QString
- if (ctrlPressed)
- {
- newStr = QtUtil::ToString(console->AutoCompletePrev(cstring));
- }
- else
- {
- newStr = QtUtil::ToString(console->ProcessCompletion(cstring));
- newStr = QtUtil::ToString(console->AutoComplete(cstring));
-
- if (newStr.isEmpty())
- {
- newStr = QtUtil::ToQString(GetIEditor()->GetCommandManager()->AutoComplete(QtUtil::ToString(newStr)));
- }
- }
-
- if (!newStr.isEmpty())
- {
- newStr += " ";
- setText(newStr);
- }
-
- deselect();
- return true;
-}
-
-void ConsoleLineEdit::keyPressEvent(QKeyEvent* ev)
-{
- IConsole* console = GetIEditor()->GetSystem()->GetIConsole();
- auto commandManager = GetIEditor()->GetCommandManager();
-
- console->ResetAutoCompletion();
-
- switch (ev->key())
- {
- case Qt::Key_Enter:
- case Qt::Key_Return:
- {
- QString str = text().trimmed();
- if (!str.isEmpty())
- {
- if (commandManager->IsRegistered(QtUtil::ToCString(str)))
- {
- commandManager->Execute(QtUtil::ToString(str));
- }
- else
- {
- CLogFile::WriteLine(QtUtil::ToCString(str));
- GetIEditor()->GetSystem()->GetIConsole()->ExecuteString(QtUtil::ToCString(str));
- }
-
- // If a history command was reused directly via up arrow enter, do not reset history index
- if (m_history.size() > 0 && m_historyIndex < m_history.size() && m_history[m_historyIndex] == str)
- {
- m_bReusedHistory = true;
- }
- else
- {
- m_historyIndex = m_history.size();
- }
-
- // Do not add the same string if it is the top of the stack, but allow duplicate entries otherwise
- if (m_history.isEmpty() || m_history.back() != str)
- {
- m_history.push_back(str);
- if (!m_bReusedHistory)
- {
- m_historyIndex = m_history.size();
- }
- }
- }
- else
- {
- m_historyIndex = m_history.size();
- }
-
- setText(QString());
- break;
- }
- case Qt::Key_AsciiTilde: // ~
- case Qt::Key_Agrave: // `
- // disable log.
- GetIEditor()->ShowConsole(false);
- setText(QString());
- m_historyIndex = m_history.size();
- break;
- case Qt::Key_Escape:
- setText(QString());
- m_historyIndex = m_history.size();
- break;
- case Qt::Key_Up:
- DisplayHistory(false /*bForward*/);
- break;
- case Qt::Key_Down:
- DisplayHistory(true /*bForward*/);
- break;
- default:
- QLineEdit::keyPressEvent(ev);
- }
-}
-
-void ConsoleLineEdit::DisplayHistory(bool bForward)
-{
- if (m_history.isEmpty())
- {
- return;
- }
-
- // Immediately after reusing a history entry, ensure up arrow re-displays command just used
- if (!m_bReusedHistory || bForward)
- {
- m_historyIndex = static_cast(clamp_tpl(static_cast(m_historyIndex) + (bForward ? 1 : -1), 0, m_history.size() - 1));
- }
- m_bReusedHistory = false;
-
- setText(m_history[m_historyIndex]);
-}
-
-ConsoleTextEdit::ConsoleTextEdit(QWidget* parent)
- : QTextEdit(parent)
-{
-}
-
-
-Lines CConsoleSCB::s_pendingLines;
-
-CConsoleSCB::CConsoleSCB(QWidget* parent)
- : QWidget(parent)
- , ui(new Ui::ConsoleMFC())
- , m_richEditTextLength(0)
- , m_backgroundTheme(gSettings.consoleBackgroundColorTheme)
-{
- m_lines = s_pendingLines;
- s_pendingLines.clear();
- s_consoleSCB = this;
- ui->setupUi(this);
- setMinimumHeight(120);
-
- // Setup the color table for the default (light) theme
- m_colorTable << QColor(0, 0, 0)
- << QColor(0, 0, 0)
- << QColor(0, 0, 200) // blue
- << QColor(0, 200, 0) // green
- << QColor(200, 0, 0) // red
- << QColor(0, 200, 200) // cyan
- << QColor(128, 112, 0) // yellow
- << QColor(200, 0, 200) // red+blue
- << QColor(0x000080ff)
- << QColor(0x008f8f8f);
- OnStyleSettingsChanged();
-
- connect(ui->button, &QPushButton::clicked, this, &CConsoleSCB::showVariableEditor);
- connect(ui->lineEdit, &MFC::ConsoleLineEdit::variableEditorRequested, this, &MFC::CConsoleSCB::showVariableEditor);
- connect(Editor::EditorQtApplication::instance(), &Editor::EditorQtApplication::skinChanged, this, &MFC::CConsoleSCB::OnStyleSettingsChanged);
-
- if (GetIEditor()->IsInConsolewMode())
- {
- // Attach / register edit box
- //CLogFile::AttachEditBox(m_edit.GetSafeHwnd()); // FIXME
- }
-}
-
-CConsoleSCB::~CConsoleSCB()
-{
- s_consoleSCB = nullptr;
- delete gPropertiesDlg;
- gPropertiesDlg = nullptr;
- CLogFile::AttachEditBox(nullptr);
-}
-
-void CConsoleSCB::RegisterViewClass()
-{
- QtViewOptions opts;
- opts.preferedDockingArea = Qt::BottomDockWidgetArea;
- opts.isDeletable = false;
- opts.isStandard = true;
- opts.showInMenu = true;
- opts.builtInActionId = ID_VIEW_CONSOLEWINDOW;
- opts.sendViewPaneNameBackToAmazonAnalyticsServers = true;
- RegisterQtViewPane(GetIEditor(), LyViewPane::Console, LyViewPane::CategoryTools, opts);
-}
-
-void CConsoleSCB::OnStyleSettingsChanged()
-{
- ui->button->setIcon(QIcon(QString(":/controls/img/cvar_dark.bmp")));
-
- // Set the debug/warning text colors appropriately for the background theme
- // (e.g. not have black text on black background)
- QColor textColor = Qt::black;
- m_backgroundTheme = gSettings.consoleBackgroundColorTheme;
- if (m_backgroundTheme == SEditorSettings::ConsoleColorTheme::Dark)
- {
- textColor = Qt::white;
- }
- m_colorTable[0] = textColor;
- m_colorTable[1] = textColor;
-
- QColor bgColor;
- if (!GetIEditor()->IsInConsolewMode() && CConsoleSCB::GetCreatedInstance() && m_backgroundTheme == SEditorSettings::ConsoleColorTheme::Dark)
- {
- bgColor = Qt::black;
- }
- else
- {
- bgColor = Qt::white;
- }
-
- ui->textEdit->setStyleSheet(QString("QTextEdit{ background: %1 }").arg(bgColor.name(QColor::HexRgb)));
-
- // Clear out the console text when we change our background color since
- // some of the previous text colors may not be appropriate for the
- // new background color
- ui->textEdit->clear();
-}
-
-void CConsoleSCB::showVariableEditor()
-{
- const QPoint cursorPos = QCursor::pos();
- CString str = mfc_popup_helper(0, cursorPos.x(), cursorPos.y());
- if (!str.IsEmpty())
- {
- ui->lineEdit->setText(QtUtil::ToQString(str));
- }
-}
-
-void CConsoleSCB::SetInputFocus()
-{
- ui->lineEdit->setFocus();
- ui->lineEdit->setText(QString());
-}
-
-void CConsoleSCB::AddToConsole(const QString& text, bool bNewLine)
-{
- m_lines.push_back({ text, bNewLine });
- FlushText();
-}
-
-void CConsoleSCB::FlushText()
-{
- if (m_lines.empty())
- {
- return;
- }
-
- // Store our current cursor in case we need to restore it, and check if
- // the user has scrolled the text edit away from the bottom
- const QTextCursor oldCursor = ui->textEdit->textCursor();
- QScrollBar* scrollBar = ui->textEdit->verticalScrollBar();
- const int oldScrollValue = scrollBar->value();
- bool scrolledOffBottom = oldScrollValue != scrollBar->maximum();
-
- ui->textEdit->moveCursor(QTextCursor::End);
- QTextCursor textCursor = ui->textEdit->textCursor();
-
- while (!m_lines.empty())
- {
- ConsoleLine line = m_lines.front();
- m_lines.pop_front();
-
- int iColor = 0;
- QString text = MFC::RemoveColorCode(line.text, iColor);
- if (iColor < 0 || iColor >= m_colorTable.size())
- {
- iColor = 0;
- }
-
- if (line.newLine)
- {
- text = QtUtil::trimRight(text);
- text = "\r\n" + text;
- }
-
- QTextCharFormat format;
- const QColor color(m_colorTable[iColor]);
- format.setForeground(color);
-
- if (iColor != 0)
- {
- format.setFontWeight(QFont::Bold);
- }
-
- textCursor.setCharFormat(format);
- textCursor.insertText(text);
- }
-
- // If the user has selected some text in the text edit area or has scrolled
- // away from the bottom, then restore the previous cursor and keep the scroll
- // bar in the same location
- if (oldCursor.hasSelection() || scrolledOffBottom)
- {
- ui->textEdit->setTextCursor(oldCursor);
- scrollBar->setValue(oldScrollValue);
- }
- // Otherwise scroll to the bottom so the latest text can be seen
- else
- {
- scrollBar->setValue(scrollBar->maximum());
- }
-}
-
-QSize CConsoleSCB::minimumSizeHint() const
-{
- return QSize(-1, -1);
-}
-
-QSize CConsoleSCB::sizeHint() const
-{
- return QSize(100, 100);
-}
-
-/** static */
-void CConsoleSCB::AddToPendingLines(const QString& text, bool bNewLine)
-{
- s_pendingLines.push_back({ text, bNewLine });
-}
-
-static CVarBlock* VarBlockFromConsoleVars()
-{
- IConsole* console = GetIEditor()->GetSystem()->GetIConsole();
- std::vector cmds;
- cmds.resize(console->GetNumVars());
- size_t cmdCount = console->GetSortedVars(&cmds[0], cmds.size());
-
- CVarBlock* vb = new CVarBlock;
- IVariable* pVariable = 0;
- for (int i = 0; i < cmdCount; i++)
- {
- ICVar* pCVar = console->GetCVar(cmds[i]);
- if (!pCVar)
- {
- continue;
- }
- int varType = pCVar->GetType();
-
- switch (varType)
- {
- case CVAR_INT:
- pVariable = new CVariable();
- pVariable->Set(pCVar->GetIVal());
- break;
- case CVAR_FLOAT:
- pVariable = new CVariable();
- pVariable->Set(pCVar->GetFVal());
- break;
- case CVAR_STRING:
- pVariable = new CVariable();
- pVariable->Set(pCVar->GetString());
- break;
- default:
- assert(0);
- }
-
- pVariable->SetDescription(pCVar->GetHelp());
- pVariable->SetName(cmds[i]);
-
- if (pVariable)
- {
- vb->AddVariable(pVariable);
- }
- }
- return vb;
-}
-
-static void OnConsoleVariableUpdated(IVariable* pVar)
-{
- if (!pVar)
- {
- return;
- }
- CString varName = pVar->GetName();
- ICVar* pCVar = GetIEditor()->GetSystem()->GetIConsole()->GetCVar(varName);
- if (!pCVar)
- {
- return;
- }
- if (pVar->GetType() == IVariable::INT)
- {
- int val;
- pVar->Get(val);
- pCVar->Set(val);
- }
- else if (pVar->GetType() == IVariable::FLOAT)
- {
- float val;
- pVar->Get(val);
- pCVar->Set(val);
- }
- else if (pVar->GetType() == IVariable::STRING)
- {
- CString val;
- pVar->Get(val);
- pCVar->Set(val);
- }
-}
-
-static CString mfc_popup_helper(HWND hwnd, int x, int y)
-{
- IConsole* console = GetIEditor()->GetSystem()->GetIConsole();
-
- TSmartPtr vb = VarBlockFromConsoleVars();
- XmlNodeRef node;
- if (!gPropertiesDlg)
- {
- gPropertiesDlg = new CPropertiesDialog("Console Variables", node, AfxGetMainWnd(), true);
- }
- if (!gPropertiesDlg->m_hWnd)
- {
- gPropertiesDlg->Create(CPropertiesDialog::IDD, AfxGetMainWnd());
- gPropertiesDlg->SetUpdateCallback(AZStd::bind(OnConsoleVariableUpdated, AZStd::placeholders::_1));
- }
- gPropertiesDlg->ShowWindow(SW_SHOW);
- gPropertiesDlg->BringWindowToTop();
- gPropertiesDlg->GetPropertyCtrl()->AddVarBlock(vb);
-
- return "";
-}
-
-CConsoleSCB* CConsoleSCB::GetCreatedInstance()
-{
- return s_consoleSCB;
-}
-
-} // namespace MFC
-
-#include
diff --git a/Code/Editor/Controls/FolderTreeCtrl.cpp b/Code/Editor/Controls/FolderTreeCtrl.cpp
index 17b6dccac7..b1cbb9414e 100644
--- a/Code/Editor/Controls/FolderTreeCtrl.cpp
+++ b/Code/Editor/Controls/FolderTreeCtrl.cpp
@@ -400,7 +400,7 @@ void CFolderTreeCtrl::RemoveEmptyFolderItems(const QString& folder)
void CFolderTreeCtrl::Edit(const QString& path)
{
- CFileUtil::EditTextFile(QtUtil::ToString(path), 0, IFileUtil::FILE_TYPE_SCRIPT);
+ CFileUtil::EditTextFile(path.toUtf8().data(), 0, IFileUtil::FILE_TYPE_SCRIPT);
}
void CFolderTreeCtrl::ShowInExplorer(const QString& path)
diff --git a/Code/Editor/Controls/HotTrackingTreeCtrl.cpp b/Code/Editor/Controls/HotTrackingTreeCtrl.cpp
index 917d02155b..54152a9fd4 100644
--- a/Code/Editor/Controls/HotTrackingTreeCtrl.cpp
+++ b/Code/Editor/Controls/HotTrackingTreeCtrl.cpp
@@ -19,22 +19,22 @@ CHotTrackingTreeCtrl::CHotTrackingTreeCtrl(QWidget* parent)
: QTreeWidget(parent)
{
setMouseTracking(true);
- m_hHoverItem = NULL;
+ m_hHoverItem = nullptr;
}
void CHotTrackingTreeCtrl::mouseMoveEvent(QMouseEvent* event)
{
QTreeWidgetItem* hItem = itemAt(event->pos());
- if (m_hHoverItem != NULL)
+ if (m_hHoverItem != nullptr)
{
QFont font = m_hHoverItem->font(0);
font.setBold(false);
m_hHoverItem->setFont(0, font);
- m_hHoverItem = NULL;
+ m_hHoverItem = nullptr;
}
- if (hItem != NULL)
+ if (hItem != nullptr)
{
QFont font = hItem->font(0);
font.setBold(true);
diff --git a/Code/Editor/Controls/ReflectedPropertyControl/PropertyCtrl.cpp b/Code/Editor/Controls/ReflectedPropertyControl/PropertyCtrl.cpp
index bf87f2017d..c228fbda09 100644
--- a/Code/Editor/Controls/ReflectedPropertyControl/PropertyCtrl.cpp
+++ b/Code/Editor/Controls/ReflectedPropertyControl/PropertyCtrl.cpp
@@ -10,7 +10,6 @@
// Editor
#include "PropertyCtrl.h"
-#include "PropertyAnimationCtrl.h"
#include "PropertyResourceCtrl.h"
#include "PropertyGenericCtrl.h"
#include "PropertyMiscCtrl.h"
@@ -22,9 +21,7 @@ void RegisterReflectedVarHandlers()
if (!registered)
{
registered = true;
- EBUS_EVENT(AzToolsFramework::PropertyTypeRegistrationMessages::Bus, RegisterPropertyType, aznew AnimationPropertyWidgetHandler());
EBUS_EVENT(AzToolsFramework::PropertyTypeRegistrationMessages::Bus, RegisterPropertyType, aznew FileResourceSelectorWidgetHandler());
- EBUS_EVENT(AzToolsFramework::PropertyTypeRegistrationMessages::Bus, RegisterPropertyType, aznew ReverbPresetPropertyHandler());
EBUS_EVENT(AzToolsFramework::PropertyTypeRegistrationMessages::Bus, RegisterPropertyType, aznew SequencePropertyHandler());
EBUS_EVENT(AzToolsFramework::PropertyTypeRegistrationMessages::Bus, RegisterPropertyType, aznew SequenceIdPropertyHandler());
EBUS_EVENT(AzToolsFramework::PropertyTypeRegistrationMessages::Bus, RegisterPropertyType, aznew LocalStringPropertyHandler());
diff --git a/Code/Editor/Controls/ReflectedPropertyControl/PropertyGenericCtrl.cpp b/Code/Editor/Controls/ReflectedPropertyControl/PropertyGenericCtrl.cpp
index 1916ce5e16..8ff83dd894 100644
--- a/Code/Editor/Controls/ReflectedPropertyControl/PropertyGenericCtrl.cpp
+++ b/Code/Editor/Controls/ReflectedPropertyControl/PropertyGenericCtrl.cpp
@@ -73,16 +73,6 @@ void GenericPopupPropertyEditor::SetPropertyType(PropertyType type)
m_propertyType = type;
}
-void ReverbPresetPropertyEditor::onEditClicked()
-{
- CSelectEAXPresetDlg PresetDlg(this);
- PresetDlg.SetCurrPreset(GetValue());
- if (PresetDlg.exec() == QDialog::Accepted)
- {
- SetValue(PresetDlg.GetCurrPreset());
- }
-}
-
void SequencePropertyEditor::onEditClicked()
{
CSelectSequenceDialog gtDlg(this);
@@ -132,7 +122,9 @@ void LocalStringPropertyEditor::onEditClicked()
if (pMgr->GetLocalizedInfoByIndex(i, sInfo))
{
item.desc = tr("English Text:\r\n");
- item.desc += QString::fromWCharArray(Unicode::Convert(sInfo.sUtf8TranslatedText).c_str());
+ AZStd::wstring utf8TranslatedTextW;
+ AZStd::to_wstring(utf8TranslatedTextW, sInfo.sUtf8TranslatedText);
+ item.desc += QString::fromWCharArray(utf8TranslatedTextW.c_str());
item.name = sInfo.sKey;
items.push_back(item);
}
diff --git a/Code/Editor/Controls/ReflectedPropertyControl/PropertyGenericCtrl.h b/Code/Editor/Controls/ReflectedPropertyControl/PropertyGenericCtrl.h
index 2296773f0a..b6b14cf125 100644
--- a/Code/Editor/Controls/ReflectedPropertyControl/PropertyGenericCtrl.h
+++ b/Code/Editor/Controls/ReflectedPropertyControl/PropertyGenericCtrl.h
@@ -96,15 +96,6 @@ public:
}
};
-class ReverbPresetPropertyEditor
- : public GenericPopupPropertyEditor
-{
-public:
- ReverbPresetPropertyEditor(QWidget* pParent = nullptr)
- : GenericPopupPropertyEditor(pParent){}
- void onEditClicked() override;
-};
-
class MissionObjPropertyEditor
: public GenericPopupPropertyEditor
{
@@ -155,7 +146,6 @@ public:
// So we use our own
#define CONST_AZ_CRC(name, value) AZ::u32(value)
-using ReverbPresetPropertyHandler = GenericPopupWidgetHandler;
using MissionObjPropertyHandler = GenericPopupWidgetHandler;
using SequencePropertyHandler = GenericPopupWidgetHandler;
using SequenceIdPropertyHandler = GenericPopupWidgetHandler;
diff --git a/Code/Editor/Controls/ReflectedPropertyControl/PropertyResourceCtrl.cpp b/Code/Editor/Controls/ReflectedPropertyControl/PropertyResourceCtrl.cpp
index d3ae6aaecf..c5ccc599d6 100644
--- a/Code/Editor/Controls/ReflectedPropertyControl/PropertyResourceCtrl.cpp
+++ b/Code/Editor/Controls/ReflectedPropertyControl/PropertyResourceCtrl.cpp
@@ -17,9 +17,9 @@
// AzToolsFramework
#include
#include
+#include
// Editor
-#include "IResourceSelectorHost.h"
#include "Controls/QToolTipWidget.h"
#include "Controls/BitmapToolTip.h"
@@ -35,8 +35,8 @@ BrowseButton::BrowseButton(PropertyType type, QWidget* parent /*= nullptr*/)
void BrowseButton::SetPathAndEmit(const QString& path)
{
- //only emit if path changes, except for ePropertyGeomCache. Old property control
- if (path != m_path || m_propertyType == ePropertyGeomCache)
+ //only emit if path changes. Old property control
+ if (path != m_path)
{
m_path = path;
emit PathChanged(m_path);
@@ -78,21 +78,6 @@ private:
// Filters for texture.
selection = AssetSelectionModel::AssetGroupSelection("Texture");
}
- else if (m_propertyType == ePropertyModel)
- {
- // Filters for models.
- selection = AssetSelectionModel::AssetGroupSelection("Geometry");
- }
- else if (m_propertyType == ePropertyGeomCache)
- {
- // Filters for geom caches.
- selection = AssetSelectionModel::AssetTypeSelection("Geom Cache");
- }
- else if (m_propertyType == ePropertyFile)
- {
- // Filters for files.
- selection = AssetSelectionModel::AssetTypeSelection("File");
- }
else
{
return;
@@ -106,14 +91,7 @@ private:
switch (m_propertyType)
{
case ePropertyTexture:
- case ePropertyModel:
newPath.replace("\\\\", "/");
- }
- switch (m_propertyType)
- {
- case ePropertyTexture:
- case ePropertyModel:
- case ePropertyFile:
if (newPath.size() > MAX_PATH)
{
newPath.resize(MAX_PATH);
@@ -125,26 +103,51 @@ private:
}
};
-class ResourceSelectorButton
+class AudioControlSelectorButton
: public BrowseButton
{
public:
- AZ_CLASS_ALLOCATOR(ResourceSelectorButton, AZ::SystemAllocator, 0);
+ AZ_CLASS_ALLOCATOR(AudioControlSelectorButton, AZ::SystemAllocator, 0);
- ResourceSelectorButton(PropertyType type, QWidget* pParent = nullptr)
+ AudioControlSelectorButton(PropertyType type, QWidget* pParent = nullptr)
: BrowseButton(type, pParent)
{
- setToolTip(tr("Select resource"));
+ setToolTip(tr("Select Audio Control"));
}
private:
void OnClicked() override
{
- SResourceSelectorContext x;
- x.parentWidget = this;
- x.typeName = Prop::GetPropertyTypeToResourceType(m_propertyType);
- QString newPath = GetIEditor()->GetResourceSelectorHost()->SelectResource(x, m_path);
- SetPathAndEmit(newPath);
+ AZStd::string resourceResult;
+ auto ConvertLegacyAudioPropertyType = [](const PropertyType type) -> AzToolsFramework::AudioPropertyType
+ {
+ switch (type)
+ {
+ case ePropertyAudioTrigger:
+ return AzToolsFramework::AudioPropertyType::Trigger;
+ case ePropertyAudioRTPC:
+ return AzToolsFramework::AudioPropertyType::Rtpc;
+ case ePropertyAudioSwitch:
+ return AzToolsFramework::AudioPropertyType::Switch;
+ case ePropertyAudioSwitchState:
+ return AzToolsFramework::AudioPropertyType::SwitchState;
+ case ePropertyAudioEnvironment:
+ return AzToolsFramework::AudioPropertyType::Environment;
+ case ePropertyAudioPreloadRequest:
+ return AzToolsFramework::AudioPropertyType::Preload;
+ default:
+ return AzToolsFramework::AudioPropertyType::NumTypes;
+ }
+ };
+
+ auto propType = ConvertLegacyAudioPropertyType(m_propertyType);
+ if (propType != AzToolsFramework::AudioPropertyType::NumTypes)
+ {
+ AzToolsFramework::AudioControlSelectorRequestBus::EventResult(
+ resourceResult, propType, &AzToolsFramework::AudioControlSelectorRequestBus::Events::SelectResource,
+ AZStd::string_view{ m_path.toUtf8().constData() });
+ SetPathAndEmit(QString{ resourceResult.c_str() });
+ }
}
};
@@ -235,18 +238,13 @@ void FileResourceSelectorWidget::SetPropertyType(PropertyType type)
AddButton(new TextureEditButton);
m_previewToolTip.reset(new CBitmapToolTip);
break;
- case ePropertyModel:
- case ePropertyGeomCache:
case ePropertyAudioTrigger:
case ePropertyAudioSwitch:
case ePropertyAudioSwitchState:
case ePropertyAudioRTPC:
case ePropertyAudioEnvironment:
case ePropertyAudioPreloadRequest:
- AddButton(new ResourceSelectorButton(type));
- break;
- case ePropertyFile:
- AddButton(new FileBrowseButton(type));
+ AddButton(new AudioControlSelectorButton(type));
break;
default:
break;
diff --git a/Code/Editor/Controls/ReflectedPropertyControl/ReflectedPropertiesPanel.cpp b/Code/Editor/Controls/ReflectedPropertyControl/ReflectedPropertiesPanel.cpp
deleted file mode 100644
index 323fe2a07a..0000000000
--- a/Code/Editor/Controls/ReflectedPropertyControl/ReflectedPropertiesPanel.cpp
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project.
- * For complete copyright and license terms please see the LICENSE at the root of this distribution.
- *
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Description : implementation file
-
-#include "EditorDefs.h"
-
-#include "ReflectedPropertiesPanel.h"
-
-/////////////////////////////////////////////////////////////////////////////
-// ReflectedPropertiesPanel dialog
-
-
-ReflectedPropertiesPanel::ReflectedPropertiesPanel(QWidget* pParent)
- : ReflectedPropertyControl(pParent)
-{
-}
-
-//////////////////////////////////////////////////////////////////////////
-void ReflectedPropertiesPanel::DeleteVars()
-{
- ClearVarBlock();
- m_updateCallbacks.clear();
- m_varBlock = 0;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void ReflectedPropertiesPanel::SetVarBlock(class CVarBlock* vb, ReflectedPropertyControl::UpdateVarCallback* updCallback, const char* category)
-{
- assert(vb);
-
- m_varBlock = vb;
-
- RemoveAllItems();
- m_varBlock = vb;
- AddVarBlock(m_varBlock, category);
-
- SetUpdateCallback(AZStd::bind(&ReflectedPropertiesPanel::OnPropertyChanged, this, AZStd::placeholders::_1));
-
- // When new object set all previous callbacks freed.
- m_updateCallbacks.clear();
- if (updCallback)
- {
- stl::push_back_unique(m_updateCallbacks, updCallback);
- }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void ReflectedPropertiesPanel::AddVars(CVarBlock* vb, ReflectedPropertyControl::UpdateVarCallback* updCallback, const char* category)
-{
- assert(vb);
-
- bool bNewBlock = false;
- // Make a clone of properties.
- if (!m_varBlock)
- {
- RemoveAllItems();
- m_varBlock = vb->Clone(true);
- AddVarBlock(m_varBlock, category);
- bNewBlock = true;
- }
- m_varBlock->Wire(vb);
-
- if (bNewBlock)
- {
- SetUpdateCallback(AZStd::bind(&ReflectedPropertiesPanel::OnPropertyChanged, this, AZStd::placeholders::_1));
-
- // When new object set all previous callbacks freed.
- m_updateCallbacks.clear();
- }
-
- if (updCallback)
- {
- stl::push_back_unique(m_updateCallbacks, updCallback);
- }
-}
-
-void ReflectedPropertiesPanel::OnPropertyChanged(IVariable* pVar)
-{
- std::list::iterator iter;
- for (iter = m_updateCallbacks.begin(); iter != m_updateCallbacks.end(); ++iter)
- {
- (*iter)->operator()(pVar);
- }
-}
-
-
diff --git a/Code/Editor/Controls/ReflectedPropertyControl/ReflectedPropertiesPanel.h b/Code/Editor/Controls/ReflectedPropertyControl/ReflectedPropertiesPanel.h
deleted file mode 100644
index cd551c63e2..0000000000
--- a/Code/Editor/Controls/ReflectedPropertyControl/ReflectedPropertiesPanel.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project.
- * For complete copyright and license terms please see the LICENSE at the root of this distribution.
- *
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#ifndef CRYINCLUDE_EDITOR_REFLECTEDPROPERTIESPANEL_H
-#define CRYINCLUDE_EDITOR_REFLECTEDPROPERTIESPANEL_H
-
-#pragma once
-
-#include "Controls/ReflectedPropertyControl/ReflectedPropertyCtrl.h"
-#include "Util/Variable.h"
-
-/////////////////////////////////////////////////////////////////////////////
-// ReflectedPropertiesPanel dialog
-
-AZ_PUSH_DISABLE_DLL_EXPORT_BASECLASS_WARNING
-//This class is a port of ReflectedPropertiesPanel to use the ReflectedPropertyControl
-class SANDBOX_API ReflectedPropertiesPanel
- : public ReflectedPropertyControl
-{
-AZ_POP_DISABLE_DLL_EXPORT_BASECLASS_WARNING
-public:
- ReflectedPropertiesPanel(QWidget* pParent = nullptr); // standard constructor
-
- void DeleteVars();
- void AddVars(class CVarBlock* vb, ReflectedPropertyControl::UpdateVarCallback* func = nullptr, const char* category = nullptr);
-
- void SetVarBlock(class CVarBlock* vb, ReflectedPropertyControl::UpdateVarCallback* func = nullptr, const char* category = nullptr);
-
-protected:
- void OnPropertyChanged(IVariable* pVar);
-
-protected:
- AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
- TSmartPtr m_varBlock;
-
- std::list m_updateCallbacks;
- AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
-};
-
-
-#endif // CRYINCLUDE_EDITOR_REFLECTEDPROPERTIESPANEL_H
diff --git a/Code/Editor/Controls/ReflectedPropertyControl/ReflectedPropertyCtrl.cpp b/Code/Editor/Controls/ReflectedPropertyControl/ReflectedPropertyCtrl.cpp
index 89938d9735..1a7060aa8d 100644
--- a/Code/Editor/Controls/ReflectedPropertyControl/ReflectedPropertyCtrl.cpp
+++ b/Code/Editor/Controls/ReflectedPropertyControl/ReflectedPropertyCtrl.cpp
@@ -198,7 +198,7 @@ void ReflectedPropertyControl::CreateItems(XmlNodeRef node)
void ReflectedPropertyControl::CreateItems(XmlNodeRef node, CVarBlockPtr& outBlockPtr, IVariable::OnSetCallback* func, bool splitCamelCaseIntoWords)
{
- SelectItem(0);
+ SelectItem(nullptr);
outBlockPtr = new CVarBlock;
for (size_t i = 0, iGroupCount(node->getChildCount()); i < iGroupCount; ++i)
@@ -505,7 +505,7 @@ void ReflectedPropertyControl::RemoveAllItems()
void ReflectedPropertyControl::ClearVarBlock()
{
RemoveAllItems();
- m_pVarBlock = 0;
+ m_pVarBlock = nullptr;
}
void ReflectedPropertyControl::RecreateAllItems()
@@ -688,11 +688,11 @@ void ReflectedPropertyControl::OnItemChange(ReflectedPropertyItem *item, bool de
// callback until after the current event queue is processed, so that we aren't changing other widgets
// as a ton of them are still being created.
Qt::ConnectionType connectionType = deferCallbacks ? Qt::QueuedConnection : Qt::DirectConnection;
- if (m_updateVarFunc != 0 && m_bEnableCallback)
+ if (m_updateVarFunc && m_bEnableCallback)
{
QMetaObject::invokeMethod(this, "DoUpdateCallback", connectionType, Q_ARG(IVariable*, item->GetVariable()));
}
- if (m_updateObjectFunc != 0 && m_bEnableCallback)
+ if (m_updateObjectFunc && m_bEnableCallback)
{
// KDAB: This callback has same signature as DoUpdateCallback. I think the only reason there are 2 is because some
// EntityObject registers callback and some derived objects want to register their own callback. the normal UpdateCallback
@@ -709,7 +709,7 @@ void ReflectedPropertyControl::DoUpdateCallback(IVariable *var)
const bool variableStillExists = FindVariable(var);
AZ_Assert(variableStillExists, "This variable and the item containing it were destroyed during a deferred callback. Change to non-deferred callback.");
- if (m_updateVarFunc == 0 || !variableStillExists)
+ if (!m_updateVarFunc || !variableStillExists)
{
return;
}
@@ -724,7 +724,7 @@ void ReflectedPropertyControl::DoUpdateObjectCallback(IVariable *var)
const bool variableStillExists = FindVariable(var);
AZ_Assert(variableStillExists, "This variable and the item containing it were destroyed during a deferred callback. Change to non-deferred callback.");
- if (m_updateVarFunc == 0 || !variableStillExists)
+ if ( !m_updateVarFunc || !variableStillExists)
{
return;
}
@@ -904,7 +904,7 @@ void ReflectedPropertyControl::SetUndoCallback(UndoCallback &callback)
void ReflectedPropertyControl::ClearUndoCallback()
{
- m_undoFunc = 0;
+ m_undoFunc = nullptr;
}
bool ReflectedPropertyControl::FindVariable(IVariable *categoryItem) const
diff --git a/Code/Editor/Controls/ReflectedPropertyControl/ReflectedPropertyItem.cpp b/Code/Editor/Controls/ReflectedPropertyControl/ReflectedPropertyItem.cpp
index 0bea6902c9..303f86d270 100644
--- a/Code/Editor/Controls/ReflectedPropertyControl/ReflectedPropertyItem.cpp
+++ b/Code/Editor/Controls/ReflectedPropertyControl/ReflectedPropertyItem.cpp
@@ -82,7 +82,7 @@ public:
}
//helps implement ReflectedPropertyControl::ReplaceVarBlock
- void ReplaceVarBlock(CVarBlock *varBlock)
+ void ReplaceVarBlock(CVarBlock *varBlock) override
{
m_containerVar->Clear();
UpdateCommon(m_item->GetVariable(), varBlock);
@@ -207,7 +207,7 @@ void ReflectedPropertyItem::SetVariable(IVariable *var)
ReleaseVariable();
m_pVariable = pInputVar;
- assert(m_pVariable != NULL);
+ assert(m_pVariable != nullptr);
m_pVariable->AddOnSetCallback(&m_onSetCallback);
m_pVariable->AddOnSetEnumCallback(&m_onSetEnumCallback);
@@ -255,9 +255,6 @@ void ReflectedPropertyItem::SetVariable(IVariable *var)
case ePropertySelection:
m_reflectedVarAdapter = new ReflectedVarEnumAdapter;
break;
- case ePropertyAnimation:
- m_reflectedVarAdapter = new ReflectedVarAnimationAdapter;
- break;
case ePropertyColor:
m_reflectedVarAdapter = new ReflectedVarColorAdapter;
break;
@@ -265,7 +262,6 @@ void ReflectedPropertyItem::SetVariable(IVariable *var)
m_reflectedVarAdapter = new ReflectedVarUserAdapter;
break;
case ePropertyEquip:
- case ePropertyReverbPreset:
case ePropertyGameToken:
case ePropertyMissionObj:
case ePropertySequence:
@@ -276,15 +272,12 @@ void ReflectedPropertyItem::SetVariable(IVariable *var)
m_reflectedVarAdapter = new ReflectedVarGenericPropertyAdapter(desc.m_type);
break;
case ePropertyTexture:
- case ePropertyModel:
- case ePropertyGeomCache:
case ePropertyAudioTrigger:
case ePropertyAudioSwitch:
case ePropertyAudioSwitchState:
case ePropertyAudioRTPC:
case ePropertyAudioEnvironment:
case ePropertyAudioPreloadRequest:
- case ePropertyFile:
m_reflectedVarAdapter = new ReflectedVarResourceAdapter;
break;
case ePropertyFloatCurve:
@@ -332,7 +325,7 @@ void ReflectedPropertyItem::RemoveAllChildren()
{
for (int i = 0; i < m_childs.size(); i++)
{
- m_childs[i]->m_parent = 0;
+ m_childs[i]->m_parent = nullptr;
}
m_childs.clear();
@@ -473,7 +466,7 @@ void ReflectedPropertyItem::ReleaseVariable()
m_pVariable->RemoveOnSetCallback(&m_onSetCallback);
m_pVariable->RemoveOnSetEnumCallback(&m_onSetEnumCallback);
}
- m_pVariable = 0;
+ m_pVariable = nullptr;
delete m_reflectedVarAdapter;
m_reflectedVarAdapter = nullptr;
}
@@ -569,7 +562,6 @@ void ReflectedPropertyItem::SetValue(const QString& sValue, bool bRecordUndo, bo
break;
case ePropertyTexture:
- case ePropertyModel:
value.replace('\\', '/');
break;
}
@@ -578,8 +570,6 @@ void ReflectedPropertyItem::SetValue(const QString& sValue, bool bRecordUndo, bo
switch (m_type)
{
case ePropertyTexture:
- case ePropertyModel:
- case ePropertyFile:
if (value.length() >= MAX_PATH)
{
value = value.left(MAX_PATH);
diff --git a/Code/Editor/Controls/ReflectedPropertyControl/ReflectedPropertyItem.h b/Code/Editor/Controls/ReflectedPropertyControl/ReflectedPropertyItem.h
index 0abf7d295c..9bd34f3f7c 100644
--- a/Code/Editor/Controls/ReflectedPropertyControl/ReflectedPropertyItem.h
+++ b/Code/Editor/Controls/ReflectedPropertyControl/ReflectedPropertyItem.h
@@ -122,7 +122,7 @@ protected:
public:
//! Get number of child nodes.
- int GetChildCount() const { return m_childs.size(); };
+ int GetChildCount() const { return static_cast(m_childs.size()); };
//! Get Child by id.
ReflectedPropertyItem* GetChild(int index) const { return m_childs[index]; }
PropertyType GetType() const { return m_type; }
diff --git a/Code/Editor/Controls/ReflectedPropertyControl/ReflectedVar.cpp b/Code/Editor/Controls/ReflectedPropertyControl/ReflectedVar.cpp
index 5b9c5b8063..263c17a8bb 100644
--- a/Code/Editor/Controls/ReflectedPropertyControl/ReflectedVar.cpp
+++ b/Code/Editor/Controls/ReflectedPropertyControl/ReflectedVar.cpp
@@ -31,12 +31,6 @@ void ReflectedVarInit::setupReflection(AZ::SerializeContext* serializeContext)
->Field("description", &CReflectedVar::m_description)
->Field("varName", &CReflectedVar::m_varName);
- serializeContext->Class ()
- ->Version(1)
- ->Field("animation", &CReflectedVarAnimation::m_animation)
- ->Field("entityID", &CReflectedVarAnimation::m_entityID)
- ;
-
serializeContext->Class ()
->Version(1)
->Field("path", &CReflectedVarResource::m_path)
@@ -76,12 +70,6 @@ void ReflectedVarInit::setupReflection(AZ::SerializeContext* serializeContext)
AZ::EditContext* ec = serializeContext->GetEditContext();
if (ec)
{
- ec->Class< CReflectedVarAnimation >("VarAnimation", "Animation")
- ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
- ->Attribute(AZ::Edit::Attributes::NameLabelOverride, &CReflectedVarAnimation::varName)
- ->Attribute(AZ::Edit::Attributes::DescriptionTextOverride, &CReflectedVarAnimation::description)
- ;
-
ec->Class< CReflectedVarResource >("VarResource", "Resource")
->ClassElement(AZ::Edit::ClassElements::EditorData, "")
->Attribute(AZ::Edit::Attributes::NameLabelOverride, &CReflectedVarResource::varName)
@@ -284,8 +272,6 @@ AZ::u32 CReflectedVarGenericProperty::handler()
return AZ_CRC("ePropertyShader", 0xc40932f1);
case ePropertyEquip:
return AZ_CRC("ePropertyEquip", 0x66ffd290);
- case ePropertyReverbPreset:
- return AZ_CRC("ePropertyReverbPreset", 0x51469f38);
case ePropertyDeprecated0:
return AZ_CRC("ePropertyCustomAction", 0x4ffa5ba5);
case ePropertyGameToken:
diff --git a/Code/Editor/Controls/ReflectedPropertyControl/ReflectedVar.h b/Code/Editor/Controls/ReflectedPropertyControl/ReflectedVar.h
index 634f2efd3a..a15f8326d1 100644
--- a/Code/Editor/Controls/ReflectedPropertyControl/ReflectedVar.h
+++ b/Code/Editor/Controls/ReflectedPropertyControl/ReflectedVar.h
@@ -265,32 +265,8 @@ public:
AZ::Vector3 m_color;
};
-//Class to hold ePropertyAnimation (IVariable::DT_ANIMATION )
-class CReflectedVarAnimation
- : public CReflectedVar
-{
-public:
- AZ_RTTI(CReflectedVarAnimation, "{635D982E-23EC-463F-8F33-4FC2C19D5673}", CReflectedVar)
-
- CReflectedVarAnimation(const AZStd::string& name)
- : CReflectedVar(name)
- , m_entityID(0)
- {}
- CReflectedVarAnimation()
- : m_entityID(0){}
-
- AZStd::string varName() const { return m_varName; }
- AZStd::string description() const { return m_description; }
-
- AZStd::string m_animation;
- AZ::EntityId m_entityID;
-};
-
//Class to hold:
// ePropertyTexture (IVariable::DT_TEXTURE)
-// ePropertyMaterial (IVariable::DT_MATERIAL)
-// ePropertyModel (IVariable::DT_OBJECT)
-// ePropertyGeomCache (IVariable::DT_GEOM_CACHE)
// ePropertyAudioTrigger (IVariable::DT_AUDIO_TRIGGER)
// ePropertyAudioSwitch (IVariable::DT_AUDIO_SWITCH )
// ePropertyAudioSwitchState (IVariable::DT_AUDIO_SWITCH_STATE)
@@ -344,7 +320,6 @@ public:
AZStd::vector m_itemDescriptions;
};
-//Class to hold ePropertyAnimation (IVariable::DT_ANIMATION )
class CReflectedVarSpline
: public CReflectedVar
{
diff --git a/Code/Editor/Controls/ReflectedPropertyControl/ReflectedVarWrapper.cpp b/Code/Editor/Controls/ReflectedPropertyControl/ReflectedVarWrapper.cpp
index 20e86c6838..aba346ce6a 100644
--- a/Code/Editor/Controls/ReflectedPropertyControl/ReflectedVarWrapper.cpp
+++ b/Code/Editor/Controls/ReflectedPropertyControl/ReflectedVarWrapper.cpp
@@ -392,25 +392,6 @@ void ReflectedVarColorAdapter::SyncIVarToReflectedVar(IVariable *pVariable)
-void ReflectedVarAnimationAdapter::SetVariable(IVariable *pVariable)
-{
- m_reflectedVar.reset(new CReflectedVarAnimation(pVariable->GetHumanName().toUtf8().data()));
- m_reflectedVar->m_description = pVariable->GetDescription().toUtf8().data();
-}
-
-void ReflectedVarAnimationAdapter::SyncReflectedVarToIVar(IVariable *pVariable)
-{
- m_reflectedVar->m_entityID = static_cast(pVariable->GetUserData().value());
- m_reflectedVar->m_animation = pVariable->GetDisplayValue().toUtf8().data();
-}
-
-void ReflectedVarAnimationAdapter::SyncIVarToReflectedVar(IVariable *pVariable)
-{
- pVariable->SetUserData(static_cast(m_reflectedVar->m_entityID));
- pVariable->SetDisplayValue(m_reflectedVar->m_animation.c_str());
-
-}
-
void ReflectedVarResourceAdapter::SetVariable(IVariable *pVariable)
{
m_reflectedVar.reset(new CReflectedVarResource(pVariable->GetHumanName().toUtf8().data()));
@@ -429,7 +410,7 @@ void ReflectedVarResourceAdapter::SyncReflectedVarToIVar(IVariable *pVariable)
void ReflectedVarResourceAdapter::SyncIVarToReflectedVar(IVariable *pVariable)
{
- const bool bForceModified = (m_reflectedVar->m_propertyType == ePropertyGeomCache);
+ const bool bForceModified = false;
pVariable->SetForceModified(bForceModified);
pVariable->SetDisplayValue(m_reflectedVar->m_path.c_str());
@@ -473,7 +454,7 @@ void ReflectedVarUserAdapter::SyncReflectedVarToIVar(IVariable *pVariable)
//extract the list of custom items from the IVariable user data
IVariable::IGetCustomItems* pGetCustomItems = static_cast (pVariable->GetUserData().value());
- if (pGetCustomItems != 0)
+ if (pGetCustomItems != nullptr)
{
std::vector items;
QString dlgTitle;
diff --git a/Code/Editor/Controls/ReflectedPropertyControl/ReflectedVarWrapper.h b/Code/Editor/Controls/ReflectedPropertyControl/ReflectedVarWrapper.h
index 07bb72413a..9c49f1ae1a 100644
--- a/Code/Editor/Controls/ReflectedPropertyControl/ReflectedVarWrapper.h
+++ b/Code/Editor/Controls/ReflectedPropertyControl/ReflectedVarWrapper.h
@@ -218,20 +218,6 @@ AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
};
-class EDITOR_CORE_API ReflectedVarAnimationAdapter
- : public ReflectedVarAdapter
-{
-public:
- void SetVariable(IVariable* pVariable) override;
- void SyncReflectedVarToIVar(IVariable* pVariable) override;
- void SyncIVarToReflectedVar(IVariable* pVariable) override;
- CReflectedVar* GetReflectedVar() override { return m_reflectedVar.data(); }
-private:
-AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
- QScopedPointer m_reflectedVar;
-AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
-};
-
class EDITOR_CORE_API ReflectedVarResourceAdapter
: public ReflectedVarAdapter
{
diff --git a/Code/Editor/Controls/SplineCtrl.cpp b/Code/Editor/Controls/SplineCtrl.cpp
index 63481d27df..d66fc16ade 100644
--- a/Code/Editor/Controls/SplineCtrl.cpp
+++ b/Code/Editor/Controls/SplineCtrl.cpp
@@ -30,7 +30,7 @@ CSplineCtrl::CSplineCtrl(QWidget* parent)
m_nHitKeyIndex = -1;
m_nKeyDrawRadius = 3;
m_bTracking = false;
- m_pSpline = 0;
+ m_pSpline = nullptr;
m_gridX = 10;
m_gridY = 10;
m_fMinTime = -1;
@@ -40,7 +40,7 @@ CSplineCtrl::CSplineCtrl(QWidget* parent)
m_fTooltipScaleX = 1;
m_fTooltipScaleY = 1;
m_bLockFirstLastKey = false;
- m_pTimelineCtrl = 0;
+ m_pTimelineCtrl = nullptr;
m_bSelectedKeys.reserve(0);
@@ -417,7 +417,7 @@ void CSplineCtrl::SetActiveKey(int nIndex)
}
/////////////////////////////////////////////////////////////////////////////
-void CSplineCtrl::SetSpline(ISplineInterpolator* pSpline, BOOL bRedraw)
+void CSplineCtrl::SetSpline(ISplineInterpolator* pSpline, bool bRedraw)
{
if (pSpline != m_pSpline)
{
@@ -596,7 +596,7 @@ CSplineCtrl::EHitCode CSplineCtrl::HitTest(const QPoint& point)
///////////////////////////////////////////////////////////////////////////////
void CSplineCtrl::StartTracking()
{
- m_bTracking = TRUE;
+ m_bTracking = true;
GetIEditor()->BeginUndo();
@@ -674,7 +674,7 @@ void CSplineCtrl::StopTracking()
GetIEditor()->AcceptUndo("Spline Move");
- m_bTracking = FALSE;
+ m_bTracking = false;
}
//////////////////////////////////////////////////////////////////////////
diff --git a/Code/Editor/Controls/SplineCtrl.h b/Code/Editor/Controls/SplineCtrl.h
index e90fc1820e..ec5b3e52ce 100644
--- a/Code/Editor/Controls/SplineCtrl.h
+++ b/Code/Editor/Controls/SplineCtrl.h
@@ -59,7 +59,7 @@ public:
// Lock value of first and last key to be the same.
void LockFirstAndLastKeys(bool bLock) { m_bLockFirstLastKey = bLock; }
- void SetSpline(ISplineInterpolator* pSpline, BOOL bRedraw = FALSE);
+ void SetSpline(ISplineInterpolator* pSpline, bool bRedraw = false);
ISplineInterpolator* GetSpline();
void SetTimeMarker(float fTime);
diff --git a/Code/Editor/Controls/SplineCtrlEx.cpp b/Code/Editor/Controls/SplineCtrlEx.cpp
index 2afc3f16aa..5977aff105 100644
--- a/Code/Editor/Controls/SplineCtrlEx.cpp
+++ b/Code/Editor/Controls/SplineCtrlEx.cpp
@@ -69,8 +69,8 @@ protected:
AbstractSplineWidget* pCtrl = FindControl(m_pCtrl);
m_splineEntries.resize(m_splineEntries.size() + 1);
SplineEntry& entry = m_splineEntries.back();
- ISplineSet* pSplineSet = (pCtrl ? pCtrl->m_pSplineSet : 0);
- entry.id = (pSplineSet ? pSplineSet->GetIDFromSpline(pSpline) : 0);
+ ISplineSet* pSplineSet = (pCtrl ? pCtrl->m_pSplineSet : nullptr);
+ entry.id = (pSplineSet ? pSplineSet->GetIDFromSpline(pSpline) : nullptr);
entry.pSpline = pSpline;
const int numKeys = pSpline->GetKeyCount();
@@ -81,10 +81,10 @@ protected:
}
}
- virtual int GetSize() { return sizeof(*this); }
- virtual QString GetDescription() { return "UndoSplineCtrlEx"; };
+ int GetSize() override { return sizeof(*this); }
+ QString GetDescription() override { return "UndoSplineCtrlEx"; };
- virtual void Undo(bool bUndo)
+ void Undo(bool bUndo) override
{
AbstractSplineWidget* pCtrl = FindControl(m_pCtrl);
if (pCtrl)
@@ -104,7 +104,7 @@ protected:
}
}
- virtual void Redo()
+ void Redo() override
{
AbstractSplineWidget* pCtrl = FindControl(m_pCtrl);
if (pCtrl)
@@ -127,14 +127,14 @@ private:
std::vector keySelectionFlags;
_smart_ptr undo;
_smart_ptr redo;
- string id;
+ AZStd::string id;
ISplineInterpolator* pSpline;
};
void SerializeSplines(_smart_ptr SplineEntry::* backup, bool bLoading)
{
AbstractSplineWidget* pCtrl = FindControl(m_pCtrl);
- ISplineSet* pSplineSet = (pCtrl ? pCtrl->m_pSplineSet : 0);
+ ISplineSet* pSplineSet = (pCtrl ? pCtrl->m_pSplineSet : nullptr);
for (auto it = m_splineEntries.begin(); it != m_splineEntries.end(); ++it)
{
SplineEntry& entry = *it;
@@ -157,19 +157,19 @@ private:
}
public:
- typedef std::list CSplineCtrls;
+ using CSplineCtrls = std::list;
static AbstractSplineWidget* FindControl(AbstractSplineWidget* pCtrl)
{
if (!pCtrl)
{
- return 0;
+ return nullptr;
}
auto iter = std::find(s_activeCtrls.begin(), s_activeCtrls.end(), pCtrl);
if (iter == s_activeCtrls.end())
{
- return 0;
+ return nullptr;
}
return *iter;
@@ -193,10 +193,10 @@ public:
static CSplineCtrls s_activeCtrls;
- virtual bool IsSelectionChanged() const
+ bool IsSelectionChanged() const override
{
AbstractSplineWidget* pCtrl = FindControl(m_pCtrl);
- ISplineSet* pSplineSet = (pCtrl ? pCtrl->m_pSplineSet : 0);
+ ISplineSet* pSplineSet = (pCtrl ? pCtrl->m_pSplineSet : nullptr);
for (auto it = m_splineEntries.begin(); it != m_splineEntries.end(); ++it)
{
@@ -256,11 +256,11 @@ SplineWidget::~SplineWidget()
AbstractSplineWidget::AbstractSplineWidget()
: m_defaultKeyTangentType(SPLINE_KEY_TANGENT_NONE)
{
- m_pTimelineCtrl = 0;
+ m_pTimelineCtrl = nullptr;
m_totalSplineCount = 0;
- m_pHitSpline = 0;
- m_pHitDetailSpline = 0;
+ m_pHitSpline = nullptr;
+ m_pHitDetailSpline = nullptr;
m_nHitKeyIndex = -1;
m_nHitDimension = -1;
m_bHitIncomingHandle = true;
@@ -301,7 +301,7 @@ AbstractSplineWidget::AbstractSplineWidget()
m_boLeftMouseButtonDown = false;
- m_pSplineSet = 0;
+ m_pSplineSet = nullptr;
m_controlAmplitude = false;
@@ -1633,7 +1633,7 @@ void SplineWidget::wheelEvent(QWheelEvent* event)
void SplineWidget::keyPressEvent(QKeyEvent* e)
{
- BOOL bProcessed = false;
+ bool bProcessed = false;
switch (e->key())
{
@@ -1780,7 +1780,7 @@ void AbstractSplineWidget::SetHorizontalExtent([[maybe_unused]] int min, [[maybe
//si.nPage = max(0,m_rcClient.Width() - m_leftOffset*2);
//si.nPage = 1;
//si.nPage = 1;
- SetScrollInfo( SB_HORZ,&si,TRUE );
+ SetScrollInfo( SB_HORZ,&si,true );
*/
}
@@ -1792,7 +1792,7 @@ ISplineInterpolator* AbstractSplineWidget::HitSpline(const QPoint& point)
return m_pHitSpline;
}
- return NULL;
+ return nullptr;
}
//////////////////////////////////////////////////////////////////////////////
@@ -1806,8 +1806,8 @@ AbstractSplineWidget::EHitCode AbstractSplineWidget::HitTest(const QPoint& point
PointToTimeValue(point, time, val);
m_hitCode = HIT_NOTHING;
- m_pHitSpline = NULL;
- m_pHitDetailSpline = NULL;
+ m_pHitSpline = nullptr;
+ m_pHitDetailSpline = nullptr;
m_nHitKeyIndex = -1;
m_nHitDimension = -1;
m_bHitIncomingHandle = true;
@@ -1968,8 +1968,8 @@ void AbstractSplineWidget::StopTracking()
void AbstractSplineWidget::ScaleAmplitudeKeys(float time, float startValue, float offset)
{
//TODO: Test it in the facial animation pane and fix it...
- m_pHitSpline = 0;
- m_pHitDetailSpline = 0;
+ m_pHitSpline = nullptr;
+ m_pHitDetailSpline = nullptr;
m_nHitKeyIndex = -1;
m_nHitDimension = -1;
@@ -2071,8 +2071,8 @@ void AbstractSplineWidget::TimeScaleKeys(float time, float startTime, float endT
float timeScaleC = endTime - startTime * timeScaleM;
// Loop through all keys that are selected.
- m_pHitSpline = 0;
- m_pHitDetailSpline = 0;
+ m_pHitSpline = nullptr;
+ m_pHitDetailSpline = nullptr;
m_nHitKeyIndex = -1;
float affectedRangeMin = FLT_MAX;
@@ -2179,8 +2179,8 @@ void AbstractSplineWidget::ValueScaleKeys(float startValue, float endValue)
}
// Loop through all keys that are selected.
- m_pHitSpline = 0;
- m_pHitDetailSpline = 0;
+ m_pHitSpline = nullptr;
+ m_pHitDetailSpline = nullptr;
m_nHitKeyIndex = -1;
m_nHitDimension = -1;
@@ -2212,8 +2212,8 @@ void AbstractSplineWidget::ValueScaleKeys(float startValue, float endValue)
//////////////////////////////////////////////////////////////////////////
void AbstractSplineWidget::MoveSelectedKeys(Vec2 offset, bool copyKeys)
{
- m_pHitSpline = 0;
- m_pHitDetailSpline = 0;
+ m_pHitSpline = nullptr;
+ m_pHitDetailSpline = nullptr;
m_nHitKeyIndex = -1;
m_nHitDimension = -1;
@@ -2275,8 +2275,8 @@ void AbstractSplineWidget::RemoveKey(ISplineInterpolator* pSpline, int nKey)
SendNotifyEvent(SPLN_BEFORE_CHANGE);
- m_pHitSpline = 0;
- m_pHitDetailSpline = 0;
+ m_pHitSpline = nullptr;
+ m_pHitDetailSpline = nullptr;
m_nHitKeyIndex = -1;
if (nKey != -1)
{
@@ -2294,8 +2294,8 @@ void AbstractSplineWidget::RemoveSelectedKeys()
SendNotifyEvent(SPLN_BEFORE_CHANGE);
- m_pHitSpline = 0;
- m_pHitDetailSpline = 0;
+ m_pHitSpline = nullptr;
+ m_pHitDetailSpline = nullptr;
m_nHitKeyIndex = -1;
for (int splineIndex = 0, splineCount = m_splines.size(); splineIndex < splineCount; ++splineIndex)
@@ -2558,11 +2558,11 @@ public:
};
void AbstractSplineWidget::DuplicateSelectedKeys()
{
- m_pHitSpline = 0;
- m_pHitDetailSpline = 0;
+ m_pHitSpline = nullptr;
+ m_pHitDetailSpline = nullptr;
m_nHitKeyIndex = -1;
- typedef std::vector KeysToAddContainer;
+ using KeysToAddContainer = std::vector;
KeysToAddContainer keysToInsert;
for (int splineIndex = 0, splineCount = m_splines.size(); splineIndex < splineCount; ++splineIndex)
{
@@ -2600,7 +2600,7 @@ void AbstractSplineWidget::ZeroAll()
{
GetIEditor()->BeginUndo();
- typedef std::vector SplineContainer;
+ using SplineContainer = std::vector;
SplineContainer splines;
for (int splineIndex = 0; splineIndex < int(m_splines.size()); ++splineIndex)
{
@@ -2632,7 +2632,7 @@ void AbstractSplineWidget::KeyAll()
{
GetIEditor()->BeginUndo();
- typedef std::vector SplineContainer;
+ using SplineContainer = std::vector;
SplineContainer splines;
for (int splineIndex = 0; splineIndex < int(m_splines.size()); ++splineIndex)
{
diff --git a/Code/Editor/Controls/SplineCtrlEx.h b/Code/Editor/Controls/SplineCtrlEx.h
index 8592febf88..add4bcb0a9 100644
--- a/Code/Editor/Controls/SplineCtrlEx.h
+++ b/Code/Editor/Controls/SplineCtrlEx.h
@@ -53,8 +53,8 @@ class QRubberBand;
class ISplineSet
{
public:
- virtual ISplineInterpolator* GetSplineFromID(const string& id) = 0;
- virtual string GetIDFromSpline(ISplineInterpolator* pSpline) = 0;
+ virtual ISplineInterpolator* GetSplineFromID(const AZStd::string& id) = 0;
+ virtual AZStd::string GetIDFromSpline(ISplineInterpolator* pSpline) = 0;
virtual int GetSplineCount() const = 0;
virtual int GetKeyCountAtTime(float time, float threshold) const = 0;
};
diff --git a/Code/Editor/Controls/TimelineCtrl.cpp b/Code/Editor/Controls/TimelineCtrl.cpp
index d1590c5346..a5a941fc78 100644
--- a/Code/Editor/Controls/TimelineCtrl.cpp
+++ b/Code/Editor/Controls/TimelineCtrl.cpp
@@ -58,7 +58,7 @@ TimelineWidget::TimelineWidget(QWidget* parent /* = nullptr */)
m_bIgnoreSetTime = false;
- m_pKeyTimeSet = 0;
+ m_pKeyTimeSet = nullptr;
m_markerStyle = MARKER_STYLE_SECONDS;
m_fps = 30.0f;
diff --git a/Code/Editor/Core/LevelEditorMenuHandler.cpp b/Code/Editor/Core/LevelEditorMenuHandler.cpp
index 3c27c25c9a..3724993604 100644
--- a/Code/Editor/Core/LevelEditorMenuHandler.cpp
+++ b/Code/Editor/Core/LevelEditorMenuHandler.cpp
@@ -80,12 +80,12 @@ namespace
, m_trigger(trigger)
{}
- virtual ~EditorListener()
+ ~EditorListener() override
{
GetIEditor()->UnregisterNotifyListener(this);
}
- void OnEditorNotifyEvent(EEditorNotifyEvent event)
+ void OnEditorNotifyEvent(EEditorNotifyEvent event) override
{
m_trigger(event);
}
@@ -544,12 +544,12 @@ void LevelEditorMenuHandler::PopulateEditMenu(ActionManager::MenuWrapper& editMe
auto snapMenu = modifyMenu.AddMenu(tr("Snap"));
- snapMenu.AddAction(ID_SNAPANGLE);
+ snapMenu.AddAction(AzToolsFramework::SnapAngle);
auto transformModeMenu = modifyMenu.AddMenu(tr("Transform Mode"));
- transformModeMenu.AddAction(ID_EDITMODE_MOVE);
- transformModeMenu.AddAction(ID_EDITMODE_ROTATE);
- transformModeMenu.AddAction(ID_EDITMODE_SCALE);
+ transformModeMenu.AddAction(AzToolsFramework::EditModeMove);
+ transformModeMenu.AddAction(AzToolsFramework::EditModeRotate);
+ transformModeMenu.AddAction(AzToolsFramework::EditModeScale);
editMenu.AddSeparator();
diff --git a/Code/Editor/Core/QtEditorApplication.cpp b/Code/Editor/Core/QtEditorApplication.cpp
index 5a4763d8e8..dd784ce10d 100644
--- a/Code/Editor/Core/QtEditorApplication.cpp
+++ b/Code/Editor/Core/QtEditorApplication.cpp
@@ -206,11 +206,8 @@ namespace
static void LogToDebug([[maybe_unused]] QtMsgType Type, [[maybe_unused]] const QMessageLogContext& Context, const QString& message)
{
-#if defined(WIN32) || defined(WIN64)
- OutputDebugStringW(L"Qt: ");
- OutputDebugStringW(reinterpret_cast(message.utf16()));
- OutputDebugStringW(L"\n");
-#endif
+ AZ::Debug::Platform::OutputToDebugger("Qt", message.toUtf8().data());
+ AZ::Debug::Platform::OutputToDebugger(nullptr, "\n");
}
}
@@ -423,7 +420,7 @@ namespace Editor
{
UINT rawInputSize;
const UINT rawInputHeaderSize = sizeof(RAWINPUTHEADER);
- GetRawInputData((HRAWINPUT)msg->lParam, RID_INPUT, NULL, &rawInputSize, rawInputHeaderSize);
+ GetRawInputData((HRAWINPUT)msg->lParam, RID_INPUT, nullptr, &rawInputSize, rawInputHeaderSize);
AZStd::array rawInputBytesArray;
LPBYTE rawInputBytes = rawInputBytesArray.data();
diff --git a/Code/Editor/Core/Tests/test_Main.cpp b/Code/Editor/Core/Tests/test_Main.cpp
index c0772753c6..3d3e286f18 100644
--- a/Code/Editor/Core/Tests/test_Main.cpp
+++ b/Code/Editor/Core/Tests/test_Main.cpp
@@ -26,7 +26,7 @@ class EditorCoreTestEnvironment
public:
AZ_TEST_CLASS_ALLOCATOR(EditorCoreTestEnvironment);
- virtual ~EditorCoreTestEnvironment()
+ ~EditorCoreTestEnvironment() override
{
}
@@ -52,7 +52,7 @@ protected:
}
private:
- AZ::AllocatorScope m_allocatorScope;
+ AZ::AllocatorScope m_allocatorScope;
SSystemGlobalEnvironment m_stubEnv;
AZ::IO::LocalFileIO m_fileIO;
NiceMock* m_cryPak;
diff --git a/Code/Editor/CrtDebug.cpp b/Code/Editor/CrtDebug.cpp
index a37b3d26e9..f9335373da 100644
--- a/Code/Editor/CrtDebug.cpp
+++ b/Code/Editor/CrtDebug.cpp
@@ -62,7 +62,7 @@ int crtAllocHook(int nAllocType, void* pvData,
{
if (nBlockUse == _CRT_BLOCK)
{
- return(TRUE);
+ return TRUE;
}
static int total_cnt = 0;
diff --git a/Code/Editor/CryEdit.cpp b/Code/Editor/CryEdit.cpp
index 4bfc6a319d..8444f81317 100644
--- a/Code/Editor/CryEdit.cpp
+++ b/Code/Editor/CryEdit.cpp
@@ -127,7 +127,6 @@ AZ_POP_DISABLE_WARNING
#include "Util/AutoDirectoryRestoreFileDialog.h"
#include "Util/EditorAutoLevelLoadTest.h"
-#include "Util/IndexedFiles.h"
#include "AboutDialog.h"
#include
@@ -267,13 +266,13 @@ CCrySingleDocTemplate* CCryDocManager::SetDefaultTemplate(CCrySingleDocTemplate*
// Copied from MFC to get rid of the silly ugly unoverridable doc-type pick dialog
void CCryDocManager::OnFileNew()
{
- assert(m_pDefTemplate != NULL);
+ assert(m_pDefTemplate != nullptr);
- m_pDefTemplate->OpenDocumentFile(NULL);
+ m_pDefTemplate->OpenDocumentFile(nullptr);
// if returns NULL, the user has already been alerted
}
-BOOL CCryDocManager::DoPromptFileName(QString& fileName, [[maybe_unused]] UINT nIDSTitle,
- [[maybe_unused]] DWORD lFlags, BOOL bOpenFileDialog, [[maybe_unused]] CDocTemplate* pTemplate)
+bool CCryDocManager::DoPromptFileName(QString& fileName, [[maybe_unused]] UINT nIDSTitle,
+ [[maybe_unused]] DWORD lFlags, bool bOpenFileDialog, [[maybe_unused]] CDocTemplate* pTemplate)
{
CLevelFileDialog levelFileDialog(bOpenFileDialog);
levelFileDialog.show();
@@ -287,15 +286,15 @@ BOOL CCryDocManager::DoPromptFileName(QString& fileName, [[maybe_unused]] UINT n
return false;
}
-CCryEditDoc* CCryDocManager::OpenDocumentFile(LPCTSTR lpszFileName, BOOL bAddToMRU)
+CCryEditDoc* CCryDocManager::OpenDocumentFile(const char* lpszFileName, bool bAddToMRU)
{
- assert(lpszFileName != NULL);
+ assert(lpszFileName != nullptr);
// find the highest confidence
auto pos = m_templateList.begin();
CCrySingleDocTemplate::Confidence bestMatch = CCrySingleDocTemplate::noAttempt;
- CCrySingleDocTemplate* pBestTemplate = NULL;
- CCryEditDoc* pOpenDocument = NULL;
+ CCrySingleDocTemplate* pBestTemplate = nullptr;
+ CCryEditDoc* pOpenDocument = nullptr;
if (lpszFileName[0] == '\"')
{
@@ -312,7 +311,7 @@ CCryEditDoc* CCryDocManager::OpenDocumentFile(LPCTSTR lpszFileName, BOOL bAddToM
auto pTemplate = *(pos++);
CCrySingleDocTemplate::Confidence match;
- assert(pOpenDocument == NULL);
+ assert(pOpenDocument == nullptr);
match = pTemplate->MatchDocType(szPath.toUtf8().data(), pOpenDocument);
if (match > bestMatch)
{
@@ -325,18 +324,18 @@ CCryEditDoc* CCryDocManager::OpenDocumentFile(LPCTSTR lpszFileName, BOOL bAddToM
}
}
- if (pOpenDocument != NULL)
+ if (pOpenDocument != nullptr)
{
return pOpenDocument;
}
- if (pBestTemplate == NULL)
+ if (pBestTemplate == nullptr)
{
QMessageBox::critical(AzToolsFramework::GetActiveWindow(), QString(), QObject::tr("Failed to open document."));
- return NULL;
+ return nullptr;
}
- return pBestTemplate->OpenDocumentFile(szPath.toUtf8().data(), bAddToMRU, FALSE);
+ return pBestTemplate->OpenDocumentFile(szPath.toUtf8().data(), bAddToMRU, false);
}
//////////////////////////////////////////////////////////////////////////////
@@ -375,9 +374,6 @@ void CCryEditApp::RegisterActionHandlers()
});
ON_COMMAND(ID_MOVE_OBJECT, OnMoveObject)
ON_COMMAND(ID_RENAME_OBJ, OnRenameObj)
- ON_COMMAND(ID_EDITMODE_MOVE, OnEditmodeMove)
- ON_COMMAND(ID_EDITMODE_ROTATE, OnEditmodeRotate)
- ON_COMMAND(ID_EDITMODE_SCALE, OnEditmodeScale)
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_IMPORT_ASSET, OnOpenAssetImporter)
@@ -464,7 +460,7 @@ void CCryEditApp::RegisterActionHandlers()
ON_COMMAND(ID_FILE_SAVE_LEVEL, OnFileSave)
ON_COMMAND(ID_FILE_EXPORTOCCLUSIONMESH, OnFileExportOcclusionMesh)
- // Project Manager
+ // Project Manager
ON_COMMAND(ID_FILE_PROJECT_MANAGER_SETTINGS, OnOpenProjectManagerSettings)
ON_COMMAND(ID_FILE_PROJECT_MANAGER_NEW, OnOpenProjectManagerNew)
ON_COMMAND(ID_FILE_PROJECT_MANAGER_OPEN, OnOpenProjectManager)
@@ -657,7 +653,7 @@ struct SharedData
//
// This function uses a technique similar to that described in KB
// article Q141752 to locate the previous instance of the application. .
-BOOL CCryEditApp::FirstInstance(bool bForceNewInstance)
+bool CCryEditApp::FirstInstance(bool bForceNewInstance)
{
QSystemSemaphore sem(QString(O3DEApplicationName) + "_sem", 1);
sem.acquire();
@@ -805,12 +801,12 @@ void CCryEditApp::InitDirectory()
// Needed to work with custom memory manager.
//////////////////////////////////////////////////////////////////////////
-CCryEditDoc* CCrySingleDocTemplate::OpenDocumentFile(LPCTSTR lpszPathName, BOOL bMakeVisible /*= true*/)
+CCryEditDoc* CCrySingleDocTemplate::OpenDocumentFile(const char* lpszPathName, bool bMakeVisible /*= true*/)
{
return OpenDocumentFile(lpszPathName, true, bMakeVisible);
}
-CCryEditDoc* CCrySingleDocTemplate::OpenDocumentFile(LPCTSTR lpszPathName, BOOL bAddToMRU, [[maybe_unused]] BOOL bMakeVisible)
+CCryEditDoc* CCrySingleDocTemplate::OpenDocumentFile(const char* lpszPathName, bool bAddToMRU, [[maybe_unused]] bool bMakeVisible)
{
CCryEditDoc* pCurDoc = GetIEditor()->GetDocument();
@@ -849,10 +845,10 @@ CCryEditDoc* CCrySingleDocTemplate::OpenDocumentFile(LPCTSTR lpszPathName, BOOL
return pCurDoc;
}
-CCrySingleDocTemplate::Confidence CCrySingleDocTemplate::MatchDocType(LPCTSTR lpszPathName, CCryEditDoc*& rpDocMatch)
+CCrySingleDocTemplate::Confidence CCrySingleDocTemplate::MatchDocType(const char* lpszPathName, CCryEditDoc*& rpDocMatch)
{
- assert(lpszPathName != NULL);
- rpDocMatch = NULL;
+ assert(lpszPathName != nullptr);
+ rpDocMatch = nullptr;
// go through all documents
CCryEditDoc* pDoc = GetIEditor()->GetDocument();
@@ -895,8 +891,7 @@ CCrySingleDocTemplate::Confidence CCrySingleDocTemplate::MatchDocType(LPCTSTR lp
/////////////////////////////////////////////////////////////////////////////
namespace
{
- CryMutex g_splashScreenStateLock;
- CryConditionVariable g_splashScreenStateChange;
+ AZStd::mutex g_splashScreenStateLock;
enum ESplashScreenState
{
eSplashScreenState_Init, eSplashScreenState_Started, eSplashScreenState_Destroy
@@ -927,7 +922,7 @@ QString FormatRichTextCopyrightNotice()
/////////////////////////////////////////////////////////////////////////////
void CCryEditApp::ShowSplashScreen(CCryEditApp* app)
{
- g_splashScreenStateLock.Lock();
+ g_splashScreenStateLock.lock();
CStartupLogoDialog* splashScreen = new CStartupLogoDialog(FormatVersion(app->m_pEditor->GetFileVersion()), FormatRichTextCopyrightNotice());
@@ -935,8 +930,7 @@ void CCryEditApp::ShowSplashScreen(CCryEditApp* app)
g_splashScreen = splashScreen;
g_splashScreenState = eSplashScreenState_Started;
- g_splashScreenStateLock.Unlock();
- g_splashScreenStateChange.Notify();
+ g_splashScreenStateLock.unlock();
splashScreen->show();
// Make sure the initial paint of the splash screen occurs so we dont get stuck with a blank window
@@ -944,10 +938,9 @@ void CCryEditApp::ShowSplashScreen(CCryEditApp* app)
QObject::connect(splashScreen, &QObject::destroyed, splashScreen, [=]
{
- g_splashScreenStateLock.Lock();
+ AZStd::scoped_lock lock(g_splashScreenStateLock);
g_pInitializeUIInfo = nullptr;
g_splashScreen = nullptr;
- g_splashScreenStateLock.Unlock();
});
}
@@ -977,9 +970,9 @@ void CCryEditApp::CloseSplashScreen()
if (CStartupLogoDialog::instance())
{
delete CStartupLogoDialog::instance();
- g_splashScreenStateLock.Lock();
+ g_splashScreenStateLock.lock();
g_splashScreenState = eSplashScreenState_Destroy;
- g_splashScreenStateLock.Unlock();
+ g_splashScreenStateLock.unlock();
}
GetIEditor()->Notify(eNotify_OnSplashScreenDestroyed);
@@ -988,12 +981,12 @@ void CCryEditApp::CloseSplashScreen()
/////////////////////////////////////////////////////////////////////////////
void CCryEditApp::OutputStartupMessage(QString str)
{
- g_splashScreenStateLock.Lock();
+ g_splashScreenStateLock.lock();
if (g_pInitializeUIInfo)
{
g_pInitializeUIInfo->SetInfoText(str.toUtf8().data());
}
- g_splashScreenStateLock.Unlock();
+ g_splashScreenStateLock.unlock();
}
//////////////////////////////////////////////////////////////////////////
@@ -1059,7 +1052,7 @@ AZ::Outcome CCryEditApp::InitGameSystem(HWND hwndForInputSy
}
/////////////////////////////////////////////////////////////////////////////
-BOOL CCryEditApp::CheckIfAlreadyRunning()
+bool CCryEditApp::CheckIfAlreadyRunning()
{
bool bForceNewInstance = false;
@@ -1303,7 +1296,7 @@ void CCryEditApp::InitLevel(const CEditCommandLineInfo& cmdInfo)
}
/////////////////////////////////////////////////////////////////////////////
-BOOL CCryEditApp::InitConsole()
+bool CCryEditApp::InitConsole()
{
// Execute command from cmdline -exec_line if applicable
if (!m_execLineCmd.isEmpty())
@@ -1435,7 +1428,7 @@ struct CCryEditApp::PythonOutputHandler
AzToolsFramework::EditorPythonConsoleNotificationBus::Handler::BusConnect();
}
- virtual ~PythonOutputHandler()
+ ~PythonOutputHandler() override
{
AzToolsFramework::EditorPythonConsoleNotificationBus::Handler::BusDisconnect();
}
@@ -1467,7 +1460,7 @@ struct PythonTestOutputHandler final
: public CCryEditApp::PythonOutputHandler
{
PythonTestOutputHandler() = default;
- virtual ~PythonTestOutputHandler() = default;
+ ~PythonTestOutputHandler() override = default;
void OnTraceMessage(AZStd::string_view message) override
{
@@ -1593,7 +1586,7 @@ void CCryEditApp::RunInitPythonScript(CEditCommandLineInfo& cmdInfo)
/////////////////////////////////////////////////////////////////////////////
// CCryEditApp initialization
-BOOL CCryEditApp::InitInstance()
+bool CCryEditApp::InitInstance()
{
QElapsedTimer startupTimer;
startupTimer.start();
@@ -1620,7 +1613,7 @@ BOOL CCryEditApp::InitInstance()
{
CAboutDialog aboutDlg(FormatVersion(m_pEditor->GetFileVersion()), FormatRichTextCopyrightNotice());
aboutDlg.exec();
- return FALSE;
+ return false;
}
// Reflect property control classes to the serialize context...
@@ -1630,9 +1623,6 @@ BOOL CCryEditApp::InitInstance()
ReflectedVarInit::setupReflection(serializeContext);
RegisterReflectedVarHandlers();
-
- QLocale::setDefault(QLocale(QLocale::English, QLocale::UnitedStates));
-
CreateSplashScreen();
// Register the application's document templates. Document templates
@@ -1718,18 +1708,6 @@ BOOL CCryEditApp::InitInstance()
if (IsInRegularEditorMode())
{
- CIndexedFiles::Create();
-
- if (gEnv->pConsole->GetCVar("ed_indexfiles")->GetIVal())
- {
- Log("Started game resource files indexing...");
- CIndexedFiles::StartFileIndexing();
- }
- else
- {
- Log("Game resource files indexing is disabled.");
- }
-
// QuickAccessBar creation should be before m_pMainWnd->SetFocus(),
// since it receives the focus at creation time. It brakes MainFrame key accelerators.
m_pQuickAccessBar = new CQuickAccessBar;
@@ -1775,7 +1753,7 @@ BOOL CCryEditApp::InitInstance()
}
}
- SetEditorWindowTitle(0, AZ::Utils::GetProjectName().c_str(), 0);
+ SetEditorWindowTitle(nullptr, AZ::Utils::GetProjectName().c_str(), nullptr);
if (!GetIEditor()->IsInMatEditMode())
{
m_pEditor->InitFinished();
@@ -1860,8 +1838,8 @@ void CCryEditApp::RegisterEventLoopHook(IEventLoopHook* pHook)
void CCryEditApp::UnregisterEventLoopHook(IEventLoopHook* pHookToRemove)
{
- IEventLoopHook* pPrevious = 0;
- for (IEventLoopHook* pHook = m_pEventLoopHook; pHook != 0; pHook = pHook->pNextHook)
+ IEventLoopHook* pPrevious = nullptr;
+ for (IEventLoopHook* pHook = m_pEventLoopHook; pHook != nullptr; pHook = pHook->pNextHook)
{
if (pHook == pHookToRemove)
{
@@ -1874,7 +1852,7 @@ void CCryEditApp::UnregisterEventLoopHook(IEventLoopHook* pHookToRemove)
m_pEventLoopHook = pHookToRemove->pNextHook;
}
- pHookToRemove->pNextHook = 0;
+ pHookToRemove->pNextHook = nullptr;
return;
}
}
@@ -1883,11 +1861,6 @@ void CCryEditApp::UnregisterEventLoopHook(IEventLoopHook* pHookToRemove)
//////////////////////////////////////////////////////////////////////////
void CCryEditApp::LoadFile(QString fileName)
{
- //CEditCommandLineInfo cmdLine;
- //ProcessCommandLine(cmdinfo);
-
- //bool bBuilding = false;
- //CString file = cmdLine.SpanExcluding()
if (GetIEditor()->GetViewManager()->GetViewCount() == 0)
{
return;
@@ -1897,7 +1870,7 @@ void CCryEditApp::LoadFile(QString fileName)
if (MainWindow::instance() || m_pConsoleDialog)
{
- SetEditorWindowTitle(0, AZ::Utils::GetProjectName().c_str(), GetIEditor()->GetGameEngine()->GetLevelName());
+ SetEditorWindowTitle(nullptr, AZ::Utils::GetProjectName().c_str(), GetIEditor()->GetGameEngine()->GetLevelName());
}
GetIEditor()->SetModifiedFlag(false);
@@ -1938,7 +1911,7 @@ void CCryEditApp::EnableAccelerator([[maybe_unused]] bool bEnable)
CMainFrame *mainFrame = (CMainFrame*)m_pMainWnd;
if (mainFrame->m_hAccelTable)
DestroyAcceleratorTable( mainFrame->m_hAccelTable );
- mainFrame->m_hAccelTable = NULL;
+ mainFrame->m_hAccelTable = nullptr;
mainFrame->LoadAccelTable( MAKEINTRESOURCE(IDR_GAMEACCELERATOR) );
CLogFile::WriteLine( "Disable Accelerators" );
}
@@ -2166,12 +2139,6 @@ int CCryEditApp::ExitInstance(int exitCode)
}
}
- if (IsInRegularEditorMode())
- {
- CIndexedFiles::AbortFileIndexing();
- CIndexedFiles::Destroy();
- }
-
if (GetIEditor() && !GetIEditor()->IsInMatEditMode())
{
//Nobody seems to know in what case that kind of exit can happen so instrumented to see if it happens at all
@@ -2281,7 +2248,7 @@ void CCryEditApp::EnableIdleProcessing()
AZ_Assert(m_disableIdleProcessingCounter >= 0, "m_disableIdleProcessingCounter must be nonnegative");
}
-BOOL CCryEditApp::OnIdle([[maybe_unused]] LONG lCount)
+bool CCryEditApp::OnIdle([[maybe_unused]] LONG lCount)
{
if (0 == m_disableIdleProcessingCounter)
{
@@ -2289,7 +2256,7 @@ BOOL CCryEditApp::OnIdle([[maybe_unused]] LONG lCount)
}
else
{
- return 0;
+ return false;
}
}
@@ -2579,75 +2546,6 @@ void CCryEditApp::OnRenameObj()
{
}
-//////////////////////////////////////////////////////////////////////////
-void CCryEditApp::OnEditmodeMove()
-{
- using namespace AzToolsFramework;
- EditorTransformComponentSelectionRequestBus::Event(
- GetEntityContextId(),
- &EditorTransformComponentSelectionRequests::SetTransformMode,
- EditorTransformComponentSelectionRequests::Mode::Translation);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CCryEditApp::OnEditmodeRotate()
-{
- using namespace AzToolsFramework;
- EditorTransformComponentSelectionRequestBus::Event(
- GetEntityContextId(),
- &EditorTransformComponentSelectionRequests::SetTransformMode,
- EditorTransformComponentSelectionRequests::Mode::Rotation);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CCryEditApp::OnEditmodeScale()
-{
- using namespace AzToolsFramework;
- EditorTransformComponentSelectionRequestBus::Event(
- GetEntityContextId(),
- &EditorTransformComponentSelectionRequests::SetTransformMode,
- EditorTransformComponentSelectionRequests::Mode::Scale);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CCryEditApp::OnUpdateEditmodeMove(QAction* action)
-{
- Q_ASSERT(action->isCheckable());
-
- AzToolsFramework::EditorTransformComponentSelectionRequests::Mode mode;
- AzToolsFramework::EditorTransformComponentSelectionRequestBus::EventResult(
- mode, AzToolsFramework::GetEntityContextId(),
- &AzToolsFramework::EditorTransformComponentSelectionRequests::GetTransformMode);
-
- action->setChecked(mode == AzToolsFramework::EditorTransformComponentSelectionRequests::Mode::Translation);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CCryEditApp::OnUpdateEditmodeRotate(QAction* action)
-{
- Q_ASSERT(action->isCheckable());
-
- AzToolsFramework::EditorTransformComponentSelectionRequests::Mode mode;
- AzToolsFramework::EditorTransformComponentSelectionRequestBus::EventResult(
- mode, AzToolsFramework::GetEntityContextId(),
- &AzToolsFramework::EditorTransformComponentSelectionRequests::GetTransformMode);
-
- action->setChecked(mode == AzToolsFramework::EditorTransformComponentSelectionRequests::Mode::Rotation);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CCryEditApp::OnUpdateEditmodeScale(QAction* action)
-{
- Q_ASSERT(action->isCheckable());
-
- AzToolsFramework::EditorTransformComponentSelectionRequests::Mode mode;
- AzToolsFramework::EditorTransformComponentSelectionRequestBus::EventResult(
- mode, AzToolsFramework::GetEntityContextId(),
- &AzToolsFramework::EditorTransformComponentSelectionRequests::GetTransformMode);
-
- action->setChecked(mode == AzToolsFramework::EditorTransformComponentSelectionRequests::Mode::Scale);
-}
-
void CCryEditApp::OnViewSwitchToGame()
{
if (IsInPreviewMode())
@@ -2901,7 +2799,14 @@ void CCryEditApp::OpenProjectManager(const AZStd::string& screen)
{
// provide the current project path for in case we want to update the project
AZ::IO::FixedMaxPathString projectPath = AZ::Utils::GetProjectPath();
- const AZStd::string commandLineOptions = AZStd::string::format(" --screen %s --project-path %s", screen.c_str(), projectPath.c_str());
+#if !AZ_TRAIT_OS_PLATFORM_APPLE && !AZ_TRAIT_OS_USE_WINDOWS_FILE_PATHS
+ const char* argumentQuoteString = R"(")";
+#else
+ const char* argumentQuoteString = R"(\")";
+#endif
+ const AZStd::string commandLineOptions = AZStd::string::format(R"( --screen %s --project-path %s%s%s)",
+ screen.c_str(),
+ argumentQuoteString, projectPath.c_str(), argumentQuoteString);
bool launchSuccess = AzFramework::ProjectManager::LaunchProjectManager(commandLineOptions);
if (!launchSuccess)
{
@@ -3226,7 +3131,7 @@ void CCryEditApp::OnCreateLevel()
//////////////////////////////////////////////////////////////////////////
bool CCryEditApp::CreateLevel(bool& wasCreateLevelOperationCancelled)
{
- BOOL bIsDocModified = GetIEditor()->GetDocument()->IsModified();
+ bool bIsDocModified = GetIEditor()->GetDocument()->IsModified();
if (GetIEditor()->GetDocument()->IsDocumentReady() && bIsDocModified)
{
QString str = QObject::tr("Level %1 has been changed. Save Level?").arg(GetIEditor()->GetGameEngine()->GetLevelName());
@@ -3280,7 +3185,7 @@ bool CCryEditApp::CreateLevel(bool& wasCreateLevelOperationCancelled)
GetIEditor()->GetDocument()->DeleteTemporaryLevel();
}
- if (levelName.length() == 0 || !CryStringUtils::IsValidFileName(levelName.toUtf8().data()))
+ if (levelName.length() == 0 || !AZ::StringFunc::Path::IsValid(levelName.toUtf8().data()))
{
QMessageBox::critical(AzToolsFramework::GetActiveWindow(), QString(), QObject::tr("Level name is invalid, please choose another name."));
return false;
@@ -3313,13 +3218,16 @@ bool CCryEditApp::CreateLevel(bool& wasCreateLevelOperationCancelled)
DWORD dw = GetLastError();
#ifdef WIN32
- FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS,
- NULL,
+ wchar_t windowsErrorMessageW[ERROR_LEN];
+ windowsErrorMessageW[0] = L'\0';
+ FormatMessageW(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS,
+ nullptr,
dw,
MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
- windowsErrorMessage.data(),
- windowsErrorMessage.length(), NULL);
+ windowsErrorMessageW,
+ ERROR_LEN, nullptr);
_getcwd(cwd.data(), cwd.length());
+ AZStd::to_string(windowsErrorMessage.data(), ERROR_LEN, windowsErrorMessageW);
#else
windowsErrorMessage = strerror(dw);
cwd = QDir::currentPath().toUtf8();
@@ -3393,7 +3301,7 @@ void CCryEditApp::OnOpenSlice()
}
//////////////////////////////////////////////////////////////////////////
-CCryEditDoc* CCryEditApp::OpenDocumentFile(LPCTSTR lpszFileName)
+CCryEditDoc* CCryEditApp::OpenDocumentFile(const char* lpszFileName)
{
if (m_openingLevel)
{
@@ -3728,24 +3636,12 @@ void CCryEditApp::OnToolsPreferences()
//////////////////////////////////////////////////////////////////////////
void CCryEditApp::OnSwitchToDefaultCamera()
{
- CViewport* vp = GetIEditor()->GetViewManager()->GetSelectedViewport();
- if (CRenderViewport* rvp = viewport_cast(vp))
- {
- rvp->SetDefaultCamera();
- }
}
//////////////////////////////////////////////////////////////////////////
void CCryEditApp::OnUpdateSwitchToDefaultCamera(QAction* action)
{
Q_ASSERT(action->isCheckable());
- CViewport* pViewport = GetIEditor()->GetViewManager()->GetSelectedViewport();
- if (CRenderViewport* rvp = viewport_cast(pViewport))
- {
- action->setEnabled(true);
- action->setChecked(rvp->IsDefaultCamera());
- }
- else
{
action->setEnabled(false);
}
@@ -3754,39 +3650,12 @@ void CCryEditApp::OnUpdateSwitchToDefaultCamera(QAction* action)
//////////////////////////////////////////////////////////////////////////
void CCryEditApp::OnSwitchToSequenceCamera()
{
- CViewport* vp = GetIEditor()->GetViewManager()->GetSelectedViewport();
- if (CRenderViewport* rvp = viewport_cast(vp))
- {
- rvp->SetSequenceCamera();
- }
}
//////////////////////////////////////////////////////////////////////////
void CCryEditApp::OnUpdateSwitchToSequenceCamera(QAction* action)
{
Q_ASSERT(action->isCheckable());
-
- CViewport* pViewport = GetIEditor()->GetViewManager()->GetSelectedViewport();
-
- if (CRenderViewport* rvp = viewport_cast(pViewport))
- {
- bool enableAction = false;
-
- // only enable if we're editing a sequence in Track View and have cameras in the level
- if (GetIEditor()->GetAnimation()->GetSequence())
- {
-
- AZ::EBusAggregateResults componentCameras;
- Camera::CameraBus::BroadcastResult(componentCameras, &Camera::CameraRequests::GetCameras);
-
- const int numCameras = componentCameras.values.size();
- enableAction = (numCameras > 0);
- }
-
- action->setEnabled(enableAction);
- action->setChecked(rvp->IsSequenceCamera());
- }
- else
{
action->setEnabled(false);
}
@@ -3795,31 +3664,12 @@ void CCryEditApp::OnUpdateSwitchToSequenceCamera(QAction* action)
//////////////////////////////////////////////////////////////////////////
void CCryEditApp::OnSwitchToSelectedcamera()
{
- CViewport* vp = GetIEditor()->GetViewManager()->GetSelectedViewport();
- if (CRenderViewport* rvp = viewport_cast(vp))
- {
- rvp->SetSelectedCamera();
- }
}
//////////////////////////////////////////////////////////////////////////
void CCryEditApp::OnUpdateSwitchToSelectedCamera(QAction* action)
{
Q_ASSERT(action->isCheckable());
- AzToolsFramework::EntityIdList selectedEntityList;
- AzToolsFramework::ToolsApplicationRequests::Bus::BroadcastResult(selectedEntityList, &AzToolsFramework::ToolsApplicationRequests::GetSelectedEntities);
- AZ::EBusAggregateResults cameras;
- Camera::CameraBus::BroadcastResult(cameras, &Camera::CameraRequests::GetCameras);
- bool isCameraComponentSelected = selectedEntityList.size() > 0 ? AZStd::find(cameras.values.begin(), cameras.values.end(), *selectedEntityList.begin()) != cameras.values.end() : false;
-
- CViewport* pViewport = GetIEditor()->GetViewManager()->GetSelectedViewport();
- CRenderViewport* rvp = viewport_cast(pViewport);
- if (isCameraComponentSelected && rvp)
- {
- action->setEnabled(true);
- action->setChecked(rvp->IsSelectedCamera());
- }
- else
{
action->setEnabled(false);
}
@@ -3828,11 +3678,7 @@ void CCryEditApp::OnUpdateSwitchToSelectedCamera(QAction* action)
//////////////////////////////////////////////////////////////////////////
void CCryEditApp::OnSwitchcameraNext()
{
- CViewport* vp = GetIEditor()->GetActiveView();
- if (CRenderViewport* rvp = viewport_cast(vp))
- {
- rvp->CycleCamera();
- }
+
}
//////////////////////////////////////////////////////////////////////////
@@ -3905,7 +3751,7 @@ bool CCryEditApp::IsInRegularEditorMode()
void CCryEditApp::OnOpenQuickAccessBar()
{
- if (m_pQuickAccessBar == NULL)
+ if (m_pQuickAccessBar == nullptr)
{
return;
}
@@ -4150,15 +3996,12 @@ struct CryAllocatorsRAII
CryAllocatorsRAII()
{
AZ_Assert(!AZ::AllocatorInstance::IsReady(), "Expected allocator to not be initialized, hunt down the static that is initializing it");
- AZ_Assert(!AZ::AllocatorInstance::IsReady(), "Expected allocator to not be initialized, hunt down the static that is initializing it");
AZ::AllocatorInstance::Create();
- AZ::AllocatorInstance::Create();
}
~CryAllocatorsRAII()
{
- AZ::AllocatorInstance::Destroy();
AZ::AllocatorInstance::Destroy();
}
};
@@ -4253,7 +4096,7 @@ extern "C" int AZ_DLL_EXPORT CryEditMain(int argc, char* argv[])
int exitCode = 0;
- BOOL didCryEditStart = CCryEditApp::instance()->InitInstance();
+ bool didCryEditStart = CCryEditApp::instance()->InitInstance();
AZ_Error("Editor", didCryEditStart, "O3DE Editor did not initialize correctly, and will close."
"\nThis could be because of incorrectly configured components, or missing required gems."
"\nSee other errors for more details.");
diff --git a/Code/Editor/CryEdit.h b/Code/Editor/CryEdit.h
index af0fbb0971..4ab37ac1e5 100644
--- a/Code/Editor/CryEdit.h
+++ b/Code/Editor/CryEdit.h
@@ -135,16 +135,16 @@ public:
virtual void AddToRecentFileList(const QString& lpszPathName);
ECreateLevelResult CreateLevel(const QString& levelName, QString& fullyQualifiedLevelName);
static void InitDirectory();
- BOOL FirstInstance(bool bForceNewInstance = false);
+ bool FirstInstance(bool bForceNewInstance = false);
void InitFromCommandLine(CEditCommandLineInfo& cmdInfo);
- BOOL CheckIfAlreadyRunning();
+ bool CheckIfAlreadyRunning();
//! @return successful outcome if initialization succeeded. or failed outcome with error message.
AZ::Outcome InitGameSystem(HWND hwndForInputSystem);
void CreateSplashScreen();
void InitPlugins();
bool InitGame();
- BOOL InitConsole();
+ bool InitConsole();
int IdleProcessing(bool bBackground);
bool IsWindowInForeground();
void RunInitPythonScript(CEditCommandLineInfo& cmdInfo);
@@ -171,10 +171,10 @@ public:
// Overrides
// ClassWizard generated virtual function overrides
public:
- virtual BOOL InitInstance();
+ virtual bool InitInstance();
virtual int ExitInstance(int exitCode = 0);
- virtual BOOL OnIdle(LONG lCount);
- virtual CCryEditDoc* OpenDocumentFile(LPCTSTR lpszFileName);
+ virtual bool OnIdle(LONG lCount);
+ virtual CCryEditDoc* OpenDocumentFile(const char* lpszFileName);
CCryDocManager* GetDocManager() { return m_pDocManager; }
@@ -208,12 +208,6 @@ public:
void DeleteSelectedEntities(bool includeDescendants);
void OnMoveObject();
void OnRenameObj();
- void OnEditmodeMove();
- void OnEditmodeRotate();
- void OnEditmodeScale();
- void OnUpdateEditmodeMove(QAction* action);
- void OnUpdateEditmodeRotate(QAction* action);
- void OnUpdateEditmodeScale(QAction* action);
void OnUndo();
void OnOpenAssetImporter();
void OnUpdateSelected(QAction* action);
@@ -353,7 +347,7 @@ private:
// Disable warning for dll export since this member won't be used outside this class
AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
AZ::IO::FileDescriptorRedirector m_stdoutRedirection = AZ::IO::FileDescriptorRedirector(1); // < 1 for STDOUT
-AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
+AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
private:
static inline constexpr const char* DefaultLevelTemplateName = "Prefabs/Default_Level.prefab";
@@ -426,7 +420,7 @@ public:
};
//////////////////////////////////////////////////////////////////////////
-class CCrySingleDocTemplate
+class CCrySingleDocTemplate
: public QObject
{
private:
@@ -454,9 +448,9 @@ public:
~CCrySingleDocTemplate() {};
// avoid creating another CMainFrame
// close other type docs before opening any things
- virtual CCryEditDoc* OpenDocumentFile(LPCTSTR lpszPathName, BOOL bAddToMRU, BOOL bMakeVisible);
- virtual CCryEditDoc* OpenDocumentFile(LPCTSTR lpszPathName, BOOL bMakeVisible = TRUE);
- virtual Confidence MatchDocType(LPCTSTR lpszPathName, CCryEditDoc*& rpDocMatch);
+ virtual CCryEditDoc* OpenDocumentFile(const char* lpszPathName, bool bAddToMRU, bool bMakeVisible);
+ virtual CCryEditDoc* OpenDocumentFile(const char* lpszPathName, bool bMakeVisible = TRUE);
+ virtual Confidence MatchDocType(const char* lpszPathName, CCryEditDoc*& rpDocMatch);
private:
const QMetaObject* m_documentClass = nullptr;
@@ -471,9 +465,9 @@ public:
CCrySingleDocTemplate* SetDefaultTemplate(CCrySingleDocTemplate* pNew);
// Copied from MFC to get rid of the silly ugly unoverridable doc-type pick dialog
virtual void OnFileNew();
- virtual BOOL DoPromptFileName(QString& fileName, UINT nIDSTitle,
- DWORD lFlags, BOOL bOpenFileDialog, CDocTemplate* pTemplate);
- virtual CCryEditDoc* OpenDocumentFile(LPCTSTR lpszFileName, BOOL bAddToMRU);
+ virtual bool DoPromptFileName(QString& fileName, UINT nIDSTitle,
+ DWORD lFlags, bool bOpenFileDialog, CDocTemplate* pTemplate);
+ virtual CCryEditDoc* OpenDocumentFile(const char* lpszFileName, bool bAddToMRU);
QVector m_templateList;
};
diff --git a/Code/Editor/CryEditDoc.cpp b/Code/Editor/CryEditDoc.cpp
index 43f599b191..b83babc5c5 100644
--- a/Code/Editor/CryEditDoc.cpp
+++ b/Code/Editor/CryEditDoc.cpp
@@ -19,6 +19,7 @@
#include
#include
#include
+#include
// AzFramework
#include
@@ -31,9 +32,6 @@
#include
#include
-// CryCommon
-#include
-
// Editor
#include "Settings.h"
@@ -53,11 +51,13 @@
#include "MainWindow.h"
#include "LevelFileDialog.h"
#include "StatObjBus.h"
+#include "Undo/Undo.h"
#include
#include
// LmbrCentral
+#include
#include // for LmbrCentral::EditorLightComponentRequestBus
//#define PROFILE_LOADING_WITH_VTUNE
@@ -95,7 +95,7 @@ namespace Internal
{
bool SaveLevel()
{
- if (!GetIEditor()->GetDocument()->DoSave(GetIEditor()->GetDocument()->GetActivePathName(), TRUE))
+ if (!GetIEditor()->GetDocument()->DoSave(GetIEditor()->GetDocument()->GetActivePathName(), true))
{
return false;
}
@@ -108,21 +108,12 @@ namespace Internal
// CCryEditDoc construction/destruction
CCryEditDoc::CCryEditDoc()
- : doc_validate_surface_types(0)
+ : doc_validate_surface_types(nullptr)
, m_modifiedModuleFlags(eModifiedNothing)
- // It assumes loaded levels have already been exported. Can be a big fat lie, though.
- // The right way would require us to save to the level folder the export status of the
- // level.
- , m_boLevelExported(true)
- , m_modified(false)
- , m_envProbeHeight(200.0f)
- , m_envProbeSliceRelativePath("EngineAssets/Slices/DefaultLevelSetup.slice")
{
////////////////////////////////////////////////////////////////////////
// Set member variables to initial values
////////////////////////////////////////////////////////////////////////
- m_bLoadFailed = false;
- m_waterColor = QColor(0, 0, 255);
m_fogTemplate = GetIEditor()->FindTemplate("Fog");
m_environmentTemplate = GetIEditor()->FindTemplate("Environment");
@@ -136,7 +127,6 @@ CCryEditDoc::CCryEditDoc()
m_environmentTemplate = XmlHelpers::CreateXmlNode("Environment");
}
- m_bDocumentReady = false;
GetIEditor()->SetDocument(this);
CLogFile::WriteLine("Document created");
RegisterConsoleVariables();
@@ -195,7 +185,7 @@ CCryEditDoc::DocumentEditingMode CCryEditDoc::GetEditMode() const
QString CCryEditDoc::GetActivePathName() const
{
- return DocumentEditingMode() == CCryEditDoc::DocumentEditingMode::SliceEdit ? GetSlicePathName() : GetLevelPathName();
+ return GetEditMode() == CCryEditDoc::DocumentEditingMode::SliceEdit ? GetSlicePathName() : GetLevelPathName();
}
QString CCryEditDoc::GetTitle() const
@@ -260,9 +250,9 @@ void CCryEditDoc::DeleteContents()
GetIEditor()->FlushUndo();
// Notify listeners.
- for (std::list::iterator it = m_listeners.begin(); it != m_listeners.end(); ++it)
+ for (IDocListener* listener : m_listeners)
{
- (*it)->OnCloseDocument();
+ listener->OnCloseDocument();
}
GetIEditor()->ResetViews();
@@ -271,26 +261,13 @@ void CCryEditDoc::DeleteContents()
GetIEditor()->GetObjectManager()->DeleteAllObjects();
// Load scripts data
- SetModifiedFlag(FALSE);
+ SetModifiedFlag(false);
SetModifiedModules(eModifiedNothing);
// Clear error reports if open.
CErrorReportDialog::Clear();
// Unload level specific audio binary data.
- Audio::SAudioManagerRequestData oAMData(Audio::eADS_LEVEL_SPECIFIC);
- Audio::SAudioRequest oAudioRequestData;
- oAudioRequestData.nFlags = (Audio::eARF_PRIORITY_HIGH | Audio::eARF_EXECUTE_BLOCKING);
- oAudioRequestData.pData = &oAMData;
- Audio::AudioSystemRequestBus::Broadcast(&Audio::AudioSystemRequestBus::Events::PushRequestBlocking, oAudioRequestData);
-
- // Now unload level specific audio config data.
- Audio::SAudioManagerRequestData oAMData2(Audio::eADS_LEVEL_SPECIFIC);
- oAudioRequestData.pData = &oAMData2;
- Audio::AudioSystemRequestBus::Broadcast(&Audio::AudioSystemRequestBus::Events::PushRequestBlocking, oAudioRequestData);
-
- Audio::SAudioManagerRequestData oAMData3(Audio::eADS_LEVEL_SPECIFIC);
- oAudioRequestData.pData = &oAMData3;
- Audio::AudioSystemRequestBus::Broadcast(&Audio::AudioSystemRequestBus::Events::PushRequestBlocking, oAudioRequestData);
+ LmbrCentral::AudioSystemComponentRequestBus::Broadcast(&LmbrCentral::AudioSystemComponentRequestBus::Events::LevelUnloadAudio);
GetIEditor()->Notify(eNotify_OnSceneClosed);
CrySystemEventBus::Broadcast(&CrySystemEventBus::Events::OnCryEditorSceneClosed);
@@ -313,7 +290,7 @@ void CCryEditDoc::Save(TDocMultiArchive& arrXmlAr)
{
CAutoDocNotReady autoDocNotReady;
- if (arrXmlAr[DMAS_GENERAL] != NULL)
+ if (arrXmlAr[DMAS_GENERAL] != nullptr)
{
(*arrXmlAr[DMAS_GENERAL]).root = XmlHelpers::CreateXmlNode("Level");
(*arrXmlAr[DMAS_GENERAL]).root->setAttr("WaterColor", m_waterColor);
@@ -421,32 +398,11 @@ void CCryEditDoc::Load(TDocMultiArchive& arrXmlAr, const QString& szFilename)
#ifdef PROFILE_LOADING_WITH_VTUNE
VTResume();
#endif
- // Parse level specific config data.
- const char* controlsPath = nullptr;
- Audio::AudioSystemRequestBus::BroadcastResult(controlsPath, &Audio::AudioSystemRequestBus::Events::GetControlsPath);
- QString sAudioLevelPath(controlsPath);
- sAudioLevelPath += "levels/";
- string const sLevelNameOnly = PathUtil::GetFileName(fileName.toUtf8().data());
- sAudioLevelPath += sLevelNameOnly;
- QByteArray path = sAudioLevelPath.toUtf8();
- Audio::SAudioManagerRequestData oAMData(path, Audio::eADS_LEVEL_SPECIFIC);
- Audio::SAudioRequest oAudioRequestData;
- oAudioRequestData.nFlags = (Audio::eARF_PRIORITY_HIGH | Audio::eARF_EXECUTE_BLOCKING); // Needs to be blocking so data is available for next preloading request!
- oAudioRequestData.pData = &oAMData;
- Audio::AudioSystemRequestBus::Broadcast(&Audio::AudioSystemRequestBus::Events::PushRequestBlocking, oAudioRequestData);
-
- Audio::SAudioManagerRequestData oAMData2(path, Audio::eADS_LEVEL_SPECIFIC);
- oAudioRequestData.pData = &oAMData2;
- Audio::AudioSystemRequestBus::Broadcast(&Audio::AudioSystemRequestBus::Events::PushRequestBlocking, oAudioRequestData);
-
- Audio::TAudioPreloadRequestID nPreloadRequestID = INVALID_AUDIO_PRELOAD_REQUEST_ID;
- Audio::AudioSystemRequestBus::BroadcastResult(nPreloadRequestID, &Audio::AudioSystemRequestBus::Events::GetAudioPreloadRequestID, sLevelNameOnly.c_str());
- if (nPreloadRequestID != INVALID_AUDIO_PRELOAD_REQUEST_ID)
- {
- Audio::SAudioManagerRequestData oAMData3(nPreloadRequestID);
- oAudioRequestData.pData = &oAMData3;
- Audio::AudioSystemRequestBus::Broadcast(&Audio::AudioSystemRequestBus::Events::PushRequestBlocking, oAudioRequestData);
- }
+ // Load level-specific audio data.
+ AZStd::string levelFileName{ fileName.toUtf8().constData() };
+ AZStd::to_lower(levelFileName.begin(), levelFileName.end());
+ LmbrCentral::AudioSystemComponentRequestBus::Broadcast(
+ &LmbrCentral::AudioSystemComponentRequestBus::Events::LevelLoadAudio, AZStd::string_view{ levelFileName });
{
CAutoLogTime logtime("Game Engine level load");
@@ -458,7 +414,7 @@ void CCryEditDoc::Load(TDocMultiArchive& arrXmlAr, const QString& szFilename)
//////////////////////////////////////////////////////////////////////////
// Load water color.
//////////////////////////////////////////////////////////////////////////
- (*arrXmlAr[DMAS_GENERAL]).root->getAttr("WaterColor", m_waterColor);
+ (*arrXmlAr[DMAS_GENERAL]).root->getAttr("WaterColor", m_waterColor);
//////////////////////////////////////////////////////////////////////////
// Load View Settings
@@ -491,7 +447,7 @@ void CCryEditDoc::Load(TDocMultiArchive& arrXmlAr, const QString& szFilename)
if (!pObj)
{
- pObj = GetIEditor()->GetObjectManager()->NewObject("SequenceObject", 0, fullname);
+ pObj = GetIEditor()->GetObjectManager()->NewObject("SequenceObject", nullptr, fullname);
}
}
}
@@ -507,9 +463,9 @@ void CCryEditDoc::Load(TDocMultiArchive& arrXmlAr, const QString& szFilename)
CAutoLogTime logtime("Post Load");
// Notify listeners.
- for (std::list::iterator it = m_listeners.begin(); it != m_listeners.end(); ++it)
+ for (IDocListener* listener : m_listeners)
{
- (*it)->OnLoadDocument();
+ listener->OnLoadDocument();
}
}
@@ -675,7 +631,7 @@ int CCryEditDoc::GetModifiedModule()
return m_modifiedModuleFlags;
}
-BOOL CCryEditDoc::CanCloseFrame()
+bool CCryEditDoc::CanCloseFrame()
{
// Ask the base class to ask for saving, which also includes the save
// status of the plugins. Additionaly we query if all the plugins can exit
@@ -684,21 +640,21 @@ BOOL CCryEditDoc::CanCloseFrame()
// are not serialized in the project file
if (!SaveModified())
{
- return FALSE;
+ return false;
}
if (!GetIEditor()->GetPluginManager()->CanAllPluginsExitNow())
{
- return FALSE;
+ return false;
}
// If there is an export in process, exiting will corrupt it
if (CGameExporter::GetCurrentExporter() != nullptr)
{
- return FALSE;
+ return false;
}
- return TRUE;
+ return true;
}
bool CCryEditDoc::SaveModified()
@@ -708,7 +664,8 @@ bool CCryEditDoc::SaveModified()
return true;
}
- auto button = QMessageBox::question(AzToolsFramework::GetActiveWindow(), QString(), tr("Save changes to %1?").arg(GetTitle()), QMessageBox::Yes | QMessageBox::No | QMessageBox::Cancel);
+ auto button = QMessageBox::question(AzToolsFramework::GetActiveWindow(), QString(), tr("Save changes to %1?").arg(GetTitle()),
+ QMessageBox::Yes | QMessageBox::No | QMessageBox::Cancel);
switch (button)
{
case QMessageBox::Cancel:
@@ -742,7 +699,7 @@ bool CCryEditDoc::OnOpenDocument(const QString& lpszPathName)
TOpenDocContext context;
if (!BeforeOpenDocument(lpszPathName, context))
{
- return FALSE;
+ return false;
}
return DoOpenDocument(context);
}
@@ -785,7 +742,7 @@ bool CCryEditDoc::BeforeOpenDocument(const QString& lpszPathName, TOpenDocContex
context.absoluteLevelPath = absolutePath;
context.absoluteSlicePath = "";
}
- return TRUE;
+ return true;
}
bool CCryEditDoc::DoOpenDocument(TOpenDocContext& context)
@@ -822,7 +779,7 @@ bool CCryEditDoc::DoOpenDocument(TOpenDocContext& context)
if (!LoadXmlArchiveArray(arrXmlAr, levelFilePath, levelFolderAbsolutePath))
{
m_bLoadFailed = true;
- return FALSE;
+ return false;
}
}
if (!LoadLevel(arrXmlAr, context.absoluteLevelPath))
@@ -834,7 +791,7 @@ bool CCryEditDoc::DoOpenDocument(TOpenDocContext& context)
if (m_bLoadFailed)
{
- return FALSE;
+ return false;
}
// Load AZ entities for the editor.
@@ -855,7 +812,7 @@ bool CCryEditDoc::DoOpenDocument(TOpenDocContext& context)
if (m_bLoadFailed)
{
- return FALSE;
+ return false;
}
StartStreamingLoad();
@@ -872,7 +829,7 @@ bool CCryEditDoc::DoOpenDocument(TOpenDocContext& context)
// level.
SetLevelExported(true);
- return TRUE;
+ return true;
}
bool CCryEditDoc::OnNewDocument()
@@ -933,8 +890,7 @@ bool CCryEditDoc::OnSaveDocument(const QString& lpszPathName)
}
TSaveDocContext context;
- if (shouldSaveLevel &&
- BeforeSaveDocument(lpszPathName, context))
+ if (shouldSaveLevel && BeforeSaveDocument(lpszPathName, context))
{
DoSaveDocument(lpszPathName, context);
saveSuccess = AfterSaveDocument(lpszPathName, context);
@@ -969,10 +925,10 @@ bool CCryEditDoc::BeforeSaveDocument(const QString& lpszPathName, TSaveDocContex
bool bSaved(true);
context.bSaved = bSaved;
- return TRUE;
+ return true;
}
-bool CCryEditDoc::HasLayerNameConflicts()
+bool CCryEditDoc::HasLayerNameConflicts() const
{
AZStd::vector editorEntities;
AzToolsFramework::EditorEntityContextRequestBus::Broadcast(
@@ -1004,43 +960,42 @@ bool CCryEditDoc::HasLayerNameConflicts()
bool CCryEditDoc::DoSaveDocument(const QString& filename, TSaveDocContext& context)
{
bool& bSaved = context.bSaved;
- if (bSaved)
+ if (!bSaved)
{
- // Paranoia - we shouldn't get this far into the save routine without a level loaded (empty levelPath)
- // If nothing is loaded, we don't need to save anything
- if (filename.isEmpty())
- {
- bSaved = false;
- }
- else
- {
- // Save Tag Point locations to file if auto save of tag points disabled
- if (!gSettings.bAutoSaveTagPoints)
- {
- CCryEditApp::instance()->SaveTagLocations();
- }
-
- QString normalizedPath = Path::ToUnixPath(filename);
- if (IsSliceFile(normalizedPath))
- {
- bSaved = SaveSlice(normalizedPath);
- }
- else
- {
- bSaved = SaveLevel(normalizedPath);
- }
-
- // Changes filename for this document.
- SetPathName(normalizedPath);
- }
+ return false;
+ }
+ // Paranoia - we shouldn't get this far into the save routine without a level loaded (empty levelPath)
+ // If nothing is loaded, we don't need to save anything
+ if (filename.isEmpty())
+ {
+ bSaved = false;
+ return false;
}
+ // Save Tag Point locations to file if auto save of tag points disabled
+ if (!gSettings.bAutoSaveTagPoints)
+ {
+ CCryEditApp::instance()->SaveTagLocations();
+ }
+
+ QString normalizedPath = Path::ToUnixPath(filename);
+ if (IsSliceFile(normalizedPath))
+ {
+ bSaved = SaveSlice(normalizedPath);
+ }
+ else
+ {
+ bSaved = SaveLevel(normalizedPath);
+ }
+
+ // Changes filename for this document.
+ SetPathName(normalizedPath);
return bSaved;
}
bool CCryEditDoc::AfterSaveDocument([[maybe_unused]] const QString& lpszPathName, TSaveDocContext& context, bool bShowPrompt)
{
- bool& bSaved = context.bSaved;
+ bool bSaved = context.bSaved;
GetIEditor()->Notify(eNotify_OnEndSceneSave);
@@ -1055,7 +1010,7 @@ bool CCryEditDoc::AfterSaveDocument([[maybe_unused]] const QString& lpszPathName
else
{
CLogFile::WriteLine("$3Document successfully saved");
- SetModifiedFlag(FALSE);
+ SetModifiedFlag(false);
SetModifiedModules(eModifiedNothing);
MainWindow::instance()->ResetAutoSaveTimers();
}
@@ -1067,8 +1022,7 @@ bool CCryEditDoc::AfterSaveDocument([[maybe_unused]] const QString& lpszPathName
static void GetUserSettingsFile(const QString& levelFolder, QString& userSettings)
{
const char* pUserName = GetISystem()->GetUserName();
- QString fileName;
- fileName = QStringLiteral("%1_usersettings.editor_xml").arg(pUserName);
+ QString fileName = QStringLiteral("%1_usersettings.editor_xml").arg(pUserName);
userSettings = Path::Make(levelFolder, fileName);
}
@@ -1093,7 +1047,7 @@ static bool TryRenameFile(const QString& oldPath, const QString& newPath, int re
bool CCryEditDoc::SaveLevel(const QString& filename)
{
- AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::AzToolsFramework);
+ AZ_PROFILE_FUNCTION(AzToolsFramework);
QWaitCursor wait;
CAutoCheckOutDialogEnableForAll enableForAll;
@@ -1113,7 +1067,7 @@ bool CCryEditDoc::SaveLevel(const QString& filename)
{
- AZ_PROFILE_SCOPE(AZ::Debug::ProfileCategory::AzToolsFramework, "CCryEditDoc::SaveLevel BackupBeforeSave");
+ AZ_PROFILE_SCOPE(AzToolsFramework, "CCryEditDoc::SaveLevel BackupBeforeSave");
BackupBeforeSave();
}
@@ -1182,9 +1136,9 @@ bool CCryEditDoc::SaveLevel(const QString& filename)
}
QString oldFilePath = QDir(oldLevelFolder).absoluteFilePath(sourceName);
- QString newFilePath = QDir(newLevelFolder).absoluteFilePath(sourceName);
+ QString newFilePath = QDir(newLevelFolder).absoluteFilePath(destName);
CFileUtil::CopyFile(oldFilePath, newFilePath);
- } while (findHandle = pIPak->FindNext(findHandle));
+ } while ((findHandle = pIPak->FindNext(findHandle)));
pIPak->FindClose(findHandle);
}
@@ -1224,7 +1178,7 @@ bool CCryEditDoc::SaveLevel(const QString& filename)
CPakFile pakFile;
{
- AZ_PROFILE_SCOPE(AZ::Debug::ProfileCategory::AzToolsFramework, "CCryEditDoc::SaveLevel Open PakFile");
+ AZ_PROFILE_SCOPE(AzToolsFramework, "CCryEditDoc::SaveLevel Open PakFile");
if (!pakFile.Open(tempSaveFile.toUtf8().data(), false))
{
gEnv->pLog->LogWarning("Unable to open pack file %s for writing", tempSaveFile.toUtf8().data());
@@ -1255,7 +1209,7 @@ bool CCryEditDoc::SaveLevel(const QString& filename)
AZ::IO::ByteContainerStream> entitySaveStream(&entitySaveBuffer);
{
- AZ_PROFILE_SCOPE(AZ::Debug::ProfileCategory::AzToolsFramework, "CCryEditDoc::SaveLevel Save Entities To Stream");
+ AZ_PROFILE_SCOPE(AzToolsFramework, "CCryEditDoc::SaveLevel Save Entities To Stream");
EBUS_EVENT_RESULT(
savedEntities, AzToolsFramework::EditorEntityContextRequestBus, SaveToStreamForEditor, entitySaveStream, layerEntities,
instancesInLayers);
@@ -1269,7 +1223,7 @@ bool CCryEditDoc::SaveLevel(const QString& filename)
if (savedEntities)
{
- AZ_PROFILE_SCOPE(AZ::Debug::ProfileCategory::AzToolsFramework, "CCryEditDoc::SaveLevel Updated PakFile levelEntities.editor_xml");
+ AZ_PROFILE_SCOPE(AzToolsFramework, "CCryEditDoc::SaveLevel Updated PakFile levelEntities.editor_xml");
pakFile.UpdateFile("LevelEntities.editor_xml", entitySaveBuffer.begin(), entitySaveBuffer.size());
// Save XML archive to pak file.
@@ -1506,7 +1460,7 @@ bool CCryEditDoc::LoadEntitiesFromLevel(const QString& levelPakFile)
{
AZStd::vector fileBuffer;
fileBuffer.resize(entitiesFile.GetLength());
- if (fileBuffer.size() > 0)
+ if (!fileBuffer.empty())
{
if (fileBuffer.size() == entitiesFile.ReadRaw(fileBuffer.begin(), fileBuffer.size()))
{
@@ -1608,7 +1562,7 @@ bool CCryEditDoc::LoadLevel(TDocMultiArchive& arrXmlAr, const QString& absoluteC
// Set level path directly *after* DeleteContents(), since that will unload the previous level and clear the level path.
GetIEditor()->GetGameEngine()->SetLevelPath(folderPath);
- SetModifiedFlag(TRUE); // dirty during de-serialize
+ SetModifiedFlag(true); // dirty during de-serialize
SetModifiedModules(eModifiedAll);
Load(arrXmlAr, absoluteCryFilePath);
@@ -1618,7 +1572,7 @@ bool CCryEditDoc::LoadLevel(TDocMultiArchive& arrXmlAr, const QString& absoluteC
{
pIPak->GetResourceList(AZ::IO::IArchive::RFOM_NextLevel)->Clear();
}
- SetModifiedFlag(FALSE); // start off with unmodified
+ SetModifiedFlag(false); // start off with unmodified
SetModifiedModules(eModifiedNothing);
SetDocumentReady(true);
GetIEditor()->Notify(eNotify_OnEndLoad);
@@ -1910,7 +1864,7 @@ void CCryEditDoc::UnregisterListener(IDocListener* listener)
m_listeners.remove(listener);
}
-void CCryEditDoc::LogLoadTime(int time)
+void CCryEditDoc::LogLoadTime(int time) const
{
QString appFilePath = QDir::toNativeSeparators(QCoreApplication::applicationFilePath());
QString exePath = Path::GetPath(appFilePath);
@@ -1919,24 +1873,21 @@ void CCryEditDoc::LogLoadTime(int time)
CLogFile::FormatLine("[LevelLoadTime] Level %s loaded in %d seconds", level.toUtf8().data(), time / 1000);
#if defined(AZ_PLATFORM_WINDOWS)
- SetFileAttributes(filename.toUtf8().data(), FILE_ATTRIBUTE_ARCHIVE);
+ SetFileAttributesW(filename.toStdWString().c_str(), FILE_ATTRIBUTE_ARCHIVE);
#endif
- FILE* file = nullptr;
- azfopen(&file, filename.toUtf8().data(), "at");
-
- if (file)
+ QFile file(filename);
+ if (!file.open(QFile::Append | QFile::Text))
{
- char version[50];
- GetIEditor()->GetFileVersion().ToShortString(version, AZ_ARRAY_SIZE(version));
-
- QString text;
-
- time = time / 1000;
- text = QStringLiteral("\n[%1] Level %2 loaded in %3 seconds").arg(version, level).arg(time);
- fwrite(text.toUtf8().data(), text.toUtf8().length(), 1, file);
- fclose(file);
+ return;
}
+
+ char version[50];
+ GetIEditor()->GetFileVersion().ToShortString(version, AZ_ARRAY_SIZE(version));
+
+ time = time / 1000;
+ QString text = QStringLiteral("\n[%1] Level %2 loaded in %3 seconds").arg(version, level).arg(time);
+ file.write(text.toUtf8());
}
void CCryEditDoc::SetDocumentReady(bool bReady)
@@ -1944,7 +1895,7 @@ void CCryEditDoc::SetDocumentReady(bool bReady)
m_bDocumentReady = bReady;
}
-void CCryEditDoc::GetMemoryUsage(ICrySizer* pSizer)
+void CCryEditDoc::GetMemoryUsage(ICrySizer* pSizer) const
{
{
SIZER_COMPONENT_NAME(pSizer, "UndoManager(estimate)");
@@ -1997,7 +1948,7 @@ void CCryEditDoc::OnStartLevelResourceList()
gEnv->pCryPak->GetResourceList(AZ::IO::IArchive::RFOM_Level)->Clear();
}
-BOOL CCryEditDoc::DoFileSave()
+bool CCryEditDoc::DoFileSave()
{
if (GetEditMode() == CCryEditDoc::DocumentEditingMode::LevelEdit)
{
@@ -2015,15 +1966,15 @@ BOOL CCryEditDoc::DoFileSave()
QString newLevelPath = filename.left(filename.lastIndexOf('/') + 1);
GetIEditor()->GetDocument()->SetPathName(filename);
GetIEditor()->GetGameEngine()->SetLevelPath(newLevelPath);
- return TRUE;
+ return true;
}
}
- return FALSE;
+ return false;
}
}
if (!IsDocumentReady())
{
- return FALSE;
+ return false;
}
return Internal::SaveLevel();
@@ -2068,12 +2019,9 @@ void CCryEditDoc::InitEmptyLevel(int /*resolution*/, int /*unitSize*/, bool /*bU
{
// Notify listeners.
std::list listeners = m_listeners;
- std::list::iterator it, next;
- for (it = listeners.begin(); it != listeners.end(); it = next)
+ for (IDocListener* listener : listeners)
{
- next = it;
- next++;
- (*it)->OnNewDocument();
+ listener->OnNewDocument();
}
}
@@ -2081,7 +2029,7 @@ void CCryEditDoc::InitEmptyLevel(int /*resolution*/, int /*unitSize*/, bool /*bU
GetISystem()->GetISystemEventDispatcher()->OnSystemEvent(ESYSTEM_EVENT_LEVEL_LOAD_END, 0, 0);
GetIEditor()->Notify(eNotify_OnEndNewScene);
- SetModifiedFlag(FALSE);
+ SetModifiedFlag(false);
SetLevelExported(false);
SetModifiedModules(eModifiedNothing);
@@ -2095,13 +2043,13 @@ void CCryEditDoc::CreateDefaultLevelAssets([[maybe_unused]] int resolution, [[ma
void CCryEditDoc::OnEnvironmentPropertyChanged(IVariable* pVar)
{
- if (pVar == NULL)
+ if (pVar == nullptr)
{
return;
}
XmlNodeRef node = GetEnvironmentTemplate();
- if (node == NULL)
+ if (node == nullptr)
{
return;
}
@@ -2119,7 +2067,7 @@ void CCryEditDoc::OnEnvironmentPropertyChanged(IVariable* pVar)
XmlNodeRef groupNode = node->getChild(nGroup);
- if (groupNode == NULL)
+ if (groupNode == nullptr)
{
return;
}
@@ -2130,36 +2078,34 @@ void CCryEditDoc::OnEnvironmentPropertyChanged(IVariable* pVar)
}
XmlNodeRef childNode = groupNode->getChild(nChild);
- if (childNode == NULL)
+ if (childNode == nullptr)
{
return;
}
+ QString childValue;
if (pVar->GetDataType() == IVariable::DT_COLOR)
{
Vec3 value;
pVar->Get(value);
- QString buff;
QColor gammaColor = ColorLinearToGamma(ColorF(value.x, value.y, value.z));
- buff = QStringLiteral("%1,%2,%3").arg(gammaColor.red()).arg(gammaColor.green()).arg(gammaColor.blue());
- childNode->setAttr("value", buff.toUtf8().data());
+ childValue = QStringLiteral("%1,%2,%3").arg(gammaColor.red()).arg(gammaColor.green()).arg(gammaColor.blue());
}
else
{
- QString value;
- pVar->Get(value);
- childNode->setAttr("value", value.toUtf8().data());
+ pVar->Get(childValue);
}
+ childNode->setAttr("value", childValue.toUtf8().data());
}
-QString CCryEditDoc::GetCryIndexPath(const LPCTSTR levelFilePath)
+QString CCryEditDoc::GetCryIndexPath(const char* levelFilePath) const
{
QString levelPath = Path::GetPath(levelFilePath);
QString levelName = Path::GetFileName(levelFilePath);
return Path::AddPathSlash(levelPath + levelName + "_editor");
}
-BOOL CCryEditDoc::LoadXmlArchiveArray(TDocMultiArchive& arrXmlAr, const QString& absoluteLevelPath, const QString& levelPath)
+bool CCryEditDoc::LoadXmlArchiveArray(TDocMultiArchive& arrXmlAr, const QString& absoluteLevelPath, const QString& levelPath)
{
auto pIPak = GetIEditor()->GetSystem()->GetIPak();
@@ -2168,7 +2114,7 @@ BOOL CCryEditDoc::LoadXmlArchiveArray(TDocMultiArchive& arrXmlAr, const QString&
CXmlArchive* pXmlAr = new CXmlArchive();
if (!pXmlAr)
{
- return FALSE;
+ return false;
}
CXmlArchive& xmlAr = *pXmlAr;
@@ -2179,22 +2125,21 @@ BOOL CCryEditDoc::LoadXmlArchiveArray(TDocMultiArchive& arrXmlAr, const QString&
bool openLevelPakFileSuccess = pIPak->OpenPack(levelPath.toUtf8().data(), absoluteLevelPath.toUtf8().data());
if (!openLevelPakFileSuccess)
{
- return FALSE;
+ return false;
}
CPakFile pakFile;
- bool loadFromPakSuccess;
- loadFromPakSuccess = xmlAr.LoadFromPak(levelPath, pakFile);
+ bool loadFromPakSuccess = xmlAr.LoadFromPak(levelPath, pakFile);
pIPak->ClosePack(absoluteLevelPath.toUtf8().data());
if (!loadFromPakSuccess)
{
- return FALSE;
+ return false;
}
FillXmlArArray(arrXmlAr, &xmlAr);
}
- return TRUE;
+ return true;
}
void CCryEditDoc::ReleaseXmlArchiveArray(TDocMultiArchive& arrXmlAr)
diff --git a/Code/Editor/CryEditDoc.h b/Code/Editor/CryEditDoc.h
index 574f8eb7da..a96e9428b6 100644
--- a/Code/Editor/CryEditDoc.h
+++ b/Code/Editor/CryEditDoc.h
@@ -26,7 +26,7 @@ struct ICVar;
// Filename of the temporary file used for the hold / fetch operation
// conform to the "$tmp[0-9]_" naming convention
-#define HOLD_FETCH_FILE "$tmp_hold"
+#define HOLD_FETCH_FILE "$tmp_hold"
class CCryEditDoc
: public QObject
@@ -36,7 +36,7 @@ class CCryEditDoc
Q_PROPERTY(bool modified READ IsModified WRITE SetModifiedFlag);
Q_PROPERTY(QString pathName READ GetLevelPathName WRITE SetPathName);
Q_PROPERTY(QString title READ GetTitle WRITE SetTitle);
-
+
public: // Create from serialization only
enum DocumentEditingMode
{
@@ -82,7 +82,7 @@ public: // Create from serialization only
bool DoSave(const QString& pathName, bool replace);
SANDBOX_API bool Save();
- virtual BOOL DoFileSave();
+ virtual bool DoFileSave();
bool SaveModified();
virtual bool BackupBeforeSave(bool bForce = false);
@@ -91,7 +91,7 @@ public: // Create from serialization only
// ClassWizard generated virtual function overrides
virtual bool OnOpenDocument(const QString& lpszPathName);
- const bool IsLevelLoadFailed() const { return m_bLoadFailed; }
+ bool IsLevelLoadFailed() const { return m_bLoadFailed; }
//! Marks this document as having errors.
void SetHasErrors() { m_hasErrors = true; }
@@ -102,7 +102,7 @@ public: // Create from serialization only
bool IsLevelExported() const;
void SetLevelExported(bool boExported = true);
- BOOL CanCloseFrame();
+ bool CanCloseFrame();
enum class FetchPolicy
{
@@ -121,7 +121,7 @@ public: // Create from serialization only
CClouds* GetClouds() { return m_pClouds; }
void SetWaterColor(const QColor& col) { m_waterColor = col; }
- QColor GetWaterColor() { return m_waterColor; }
+ QColor GetWaterColor() const { return m_waterColor; }
XmlNodeRef& GetFogTemplate() { return m_fogTemplate; }
XmlNodeRef& GetEnvironmentTemplate() { return m_environmentTemplate; }
void OnEnvironmentPropertyChanged(IVariable* pVar);
@@ -129,7 +129,7 @@ public: // Create from serialization only
void RegisterListener(IDocListener* listener);
void UnregisterListener(IDocListener* listener);
- void GetMemoryUsage(ICrySizer* pSizer);
+ void GetMemoryUsage(ICrySizer* pSizer) const;
static bool IsBackupOrTempLevelSubdirectory(const QString& folderName);
protected:
@@ -144,7 +144,7 @@ protected:
};
bool BeforeOpenDocument(const QString& lpszPathName, TOpenDocContext& context);
bool DoOpenDocument(TOpenDocContext& context);
- virtual BOOL LoadXmlArchiveArray(TDocMultiArchive& arrXmlAr, const QString& absoluteLevelPath, const QString& levelPath);
+ virtual bool LoadXmlArchiveArray(TDocMultiArchive& arrXmlAr, const QString& absoluteLevelPath, const QString& levelPath);
virtual void ReleaseXmlArchiveArray(TDocMultiArchive& arrXmlAr);
virtual void Load(TDocMultiArchive& arrXmlAr, const QString& szFilename);
@@ -161,14 +161,14 @@ protected:
void SerializeFogSettings(CXmlArchive& xmlAr);
virtual void SerializeViewSettings(CXmlArchive& xmlAr);
void SerializeNameSelection(CXmlArchive& xmlAr);
- void LogLoadTime(int time);
+ void LogLoadTime(int time) const;
struct TSaveDocContext
{
bool bSaved;
};
bool BeforeSaveDocument(const QString& lpszPathName, TSaveDocContext& context);
- bool HasLayerNameConflicts();
+ bool HasLayerNameConflicts() const;
bool DoSaveDocument(const QString& lpszPathName, TSaveDocContext& context);
bool AfterSaveDocument(const QString& lpszPathName, TSaveDocContext& context, bool bShowPrompt = true);
@@ -180,7 +180,7 @@ protected:
void OnStartLevelResourceList();
static void OnValidateSurfaceTypesChanged(ICVar*);
- QString GetCryIndexPath(const LPCTSTR levelFilePath);
+ QString GetCryIndexPath(const char* levelFilePath) const;
//////////////////////////////////////////////////////////////////////////
// SliceEditorEntityOwnershipServiceNotificationBus::Handler
@@ -188,24 +188,26 @@ protected:
void OnSliceInstantiationFailed(const AZ::Data::AssetId& sliceAssetId, const AzFramework::SliceInstantiationTicket& /*ticket*/) override;
//////////////////////////////////////////////////////////////////////////
- bool m_bLoadFailed;
- QColor m_waterColor;
+ bool m_bLoadFailed = false;
+ QColor m_waterColor = QColor(0, 0, 255);
XmlNodeRef m_fogTemplate;
XmlNodeRef m_environmentTemplate;
CClouds* m_pClouds;
std::list m_listeners;
- bool m_bDocumentReady;
- ICVar* doc_validate_surface_types;
+ bool m_bDocumentReady = false;
+ ICVar* doc_validate_surface_types = nullptr;
int m_modifiedModuleFlags;
- bool m_boLevelExported;
- bool m_modified;
+ // On construction, it assumes loaded levels have already been exported. Can be a big fat lie, though.
+ // The right way would require us to save to the level folder the export status of the level.
+ bool m_boLevelExported = true;
+ bool m_modified = false;
QString m_pathName;
QString m_slicePathName;
QString m_title;
AZ::Data::AssetId m_envProbeSliceAssetId;
float m_terrainSize;
- const char* m_envProbeSliceRelativePath;
- const float m_envProbeHeight;
+ const char* m_envProbeSliceRelativePath = "EngineAssets/Slices/DefaultLevelSetup.slice";
+ const float m_envProbeHeight = 200.0f;
bool m_hasErrors = false; ///< This is used to warn the user that they may lose work when they go to save.
};
diff --git a/Code/Editor/CryEditPy.cpp b/Code/Editor/CryEditPy.cpp
index e65af3a19b..2477cd2f35 100644
--- a/Code/Editor/CryEditPy.cpp
+++ b/Code/Editor/CryEditPy.cpp
@@ -210,7 +210,7 @@ namespace
const char* PyGetCurrentLevelName()
{
// Using static member to capture temporary data
- static string tempLevelName;
+ static AZ::IO::FixedMaxPathString tempLevelName;
tempLevelName = GetIEditor()->GetGameEngine()->GetLevelName().toUtf8().data();
return tempLevelName.c_str();
}
@@ -218,7 +218,7 @@ namespace
const char* PyGetCurrentLevelPath()
{
// Using static member to capture temporary data
- static string tempLevelPath;
+ static AZ::IO::FixedMaxPathString tempLevelPath;
tempLevelPath = GetIEditor()->GetGameEngine()->GetLevelPath().toUtf8().data();
return tempLevelPath.c_str();
}
@@ -359,7 +359,7 @@ namespace
{
AZ::TickBus::Handler::BusConnect();
}
- ~Ticker()
+ ~Ticker() override
{
AZ::TickBus::Handler::BusDisconnect();
}
diff --git a/Code/Editor/CustomAspectRatioDlg.cpp b/Code/Editor/CustomAspectRatioDlg.cpp
index 16f50601d1..f24ff9ccdb 100644
--- a/Code/Editor/CustomAspectRatioDlg.cpp
+++ b/Code/Editor/CustomAspectRatioDlg.cpp
@@ -22,7 +22,7 @@ AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
#define MIN_ASPECT 1
#define MAX_ASPECT 16384
-CCustomAspectRatioDlg::CCustomAspectRatioDlg(int x, int y, QWidget* pParent /*=NULL*/)
+CCustomAspectRatioDlg::CCustomAspectRatioDlg(int x, int y, QWidget* pParent /*=nullptr*/)
: QDialog(pParent)
, m_xDefault(x)
, m_yDefault(y)
diff --git a/Code/Editor/CustomResolutionDlg.cpp b/Code/Editor/CustomResolutionDlg.cpp
index b970b80fe7..9e0e11e2e4 100644
--- a/Code/Editor/CustomResolutionDlg.cpp
+++ b/Code/Editor/CustomResolutionDlg.cpp
@@ -25,7 +25,7 @@ AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
#define MIN_RES 64
#define MAX_RES 8192
-CCustomResolutionDlg::CCustomResolutionDlg(int w, int h, QWidget* pParent /*=NULL*/)
+CCustomResolutionDlg::CCustomResolutionDlg(int w, int h, QWidget* pParent /*=nullptr*/)
: QDialog(pParent)
, m_wDefault(w)
, m_hDefault(h)
@@ -50,12 +50,12 @@ void CCustomResolutionDlg::OnInitDialog()
m_ui->m_height->setValue(m_hDefault);
QString maxDimensionString;
- QTextStream(&maxDimensionString)
- << "Maximum Dimension: " << MAX_RES << Qt::endl
+ QTextStream(&maxDimensionString)
+ << "Maximum Dimension: " << MAX_RES << Qt::endl
<< Qt::endl
<< "Note: Dimensions over 8K may be" << Qt::endl
<< "unstable depending on hardware.";
-
+
m_ui->m_maxDimension->setText(maxDimensionString);
}
diff --git a/Code/Editor/CustomizeKeyboardDialog.cpp b/Code/Editor/CustomizeKeyboardDialog.cpp
index d6bea6860f..ce09f8d878 100644
--- a/Code/Editor/CustomizeKeyboardDialog.cpp
+++ b/Code/Editor/CustomizeKeyboardDialog.cpp
@@ -87,7 +87,7 @@ public:
: QAbstractListModel(parent)
{
}
- virtual ~MenuActionsModel() {}
+ ~MenuActionsModel() override {}
int rowCount([[maybe_unused]] const QModelIndex& parent = QModelIndex()) const override
{
@@ -134,7 +134,7 @@ public:
, m_action(nullptr)
{
}
- virtual ~ActionShortcutsModel() {}
+ ~ActionShortcutsModel() override {}
int rowCount([[maybe_unused]] const QModelIndex& parent = QModelIndex()) const override
{
diff --git a/Code/Editor/Dialogs/ErrorsDlg.cpp b/Code/Editor/Dialogs/ErrorsDlg.cpp
index e89a3a6ded..280ffbbab6 100644
--- a/Code/Editor/Dialogs/ErrorsDlg.cpp
+++ b/Code/Editor/Dialogs/ErrorsDlg.cpp
@@ -20,7 +20,7 @@ AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
-CErrorsDlg::CErrorsDlg(QWidget* pParent /*=NULL*/)
+CErrorsDlg::CErrorsDlg(QWidget* pParent /*=nullptr*/)
: QDialog(pParent)
, ui(new Ui::CErrorsDlg)
{
diff --git a/Code/Editor/Dialogs/PythonScriptsDialog.cpp b/Code/Editor/Dialogs/PythonScriptsDialog.cpp
index 98365769bb..7c6b445387 100644
--- a/Code/Editor/Dialogs/PythonScriptsDialog.cpp
+++ b/Code/Editor/Dialogs/PythonScriptsDialog.cpp
@@ -159,7 +159,7 @@ void CPythonScriptsDialog::OnExecute()
QList selectedItems = ui->treeView->GetSelectedItems();
QStandardItem* selectedItem = selectedItems.empty() ? nullptr : selectedItems.first();
- if (selectedItem == NULL)
+ if (selectedItem == nullptr)
{
return;
}
diff --git a/Code/Editor/EditorDefs.h b/Code/Editor/EditorDefs.h
index c98209befe..6614fa4d72 100644
--- a/Code/Editor/EditorDefs.h
+++ b/Code/Editor/EditorDefs.h
@@ -37,7 +37,6 @@
#pragma warning (disable : 4786) // identifier was truncated to 'number' characters in the debug information.
#pragma warning (disable : 4244) // conversion from 'long' to 'float', possible loss of data
#pragma warning (disable : 4018) // signed/unsigned mismatch
-#pragma warning (disable : 4800) // BOOL bool conversion
// Disable warning when a function returns a value inside an __asm block
#pragma warning (disable : 4035)
@@ -85,17 +84,17 @@
#endif
#ifndef SAFE_DELETE
-#define SAFE_DELETE(p) { if (p) { delete (p); (p) = NULL; } \
+#define SAFE_DELETE(p) { if (p) { delete (p); (p) = nullptr; } \
}
#endif
#ifndef SAFE_DELETE_ARRAY
-#define SAFE_DELETE_ARRAY(p) { if (p) { delete[] (p); (p) = NULL; } \
+#define SAFE_DELETE_ARRAY(p) { if (p) { delete[] (p); (p) = nullptr; } \
}
#endif
#ifndef SAFE_RELEASE
-#define SAFE_RELEASE(p) { if (p) { (p)->Release(); (p) = NULL; } \
+#define SAFE_RELEASE(p) { if (p) { (p)->Release(); (p) = nullptr; } \
}
#endif
diff --git a/Code/Editor/EditorFileMonitor.cpp b/Code/Editor/EditorFileMonitor.cpp
index 96dc883ab0..7feb9d32a8 100644
--- a/Code/Editor/EditorFileMonitor.cpp
+++ b/Code/Editor/EditorFileMonitor.cpp
@@ -55,10 +55,10 @@ bool CEditorFileMonitor::RegisterListener(IFileChangeListener* pListener, const
//////////////////////////////////////////////////////////////////////////
-static string CanonicalizePath(const char* path)
+static AZStd::string CanonicalizePath(const char* path)
{
auto canon = QFileInfo(path).canonicalFilePath();
- return canon.isEmpty() ? string(path) : string(canon.toUtf8());
+ return canon.isEmpty() ? AZStd::string(path) : AZStd::string(canon.toUtf8());
}
//////////////////////////////////////////////////////////////////////////
@@ -66,8 +66,8 @@ bool CEditorFileMonitor::RegisterListener(IFileChangeListener* pListener, const
{
bool success = true;
- string gameFolder = Path::GetEditingGameDataFolder().c_str();
- string naivePath;
+ AZStd::string gameFolder = Path::GetEditingGameDataFolder().c_str();
+ AZStd::string naivePath;
CFileChangeMonitor* fileChangeMonitor = CFileChangeMonitor::Instance();
AZ_Assert(fileChangeMonitor, "CFileChangeMonitor singleton missing.");
@@ -75,12 +75,12 @@ bool CEditorFileMonitor::RegisterListener(IFileChangeListener* pListener, const
// Append slash in preparation for appending the second part.
naivePath = PathUtil::AddSlash(naivePath);
naivePath += sFolderRelativeToGame;
- naivePath.replace('/', '\\');
+ AZ::StringFunc::Replace(naivePath, '/', '\\');
// Remove the final slash if the given item is a folder so the file change monitor correctly picks up on it.
naivePath = PathUtil::RemoveSlash(naivePath);
- string canonicalizedPath = CanonicalizePath(naivePath.c_str());
+ AZStd::string canonicalizedPath = CanonicalizePath(naivePath.c_str());
if (fileChangeMonitor->IsDirectory(canonicalizedPath.c_str()) || fileChangeMonitor->IsFile(canonicalizedPath.c_str()))
{
@@ -162,7 +162,7 @@ QString RemoveGameName(const QString &filename)
void CEditorFileMonitor::OnFileMonitorChange(const SFileChangeInfo& rChange)
{
CCryEditApp* app = CCryEditApp::instance();
- if (app == NULL || app->IsExiting())
+ if (app == nullptr || app->IsExiting())
{
return;
}
diff --git a/Code/Editor/EditorFileMonitor.h b/Code/Editor/EditorFileMonitor.h
index ac33fee9f4..7474d5e43a 100644
--- a/Code/Editor/EditorFileMonitor.h
+++ b/Code/Editor/EditorFileMonitor.h
@@ -42,7 +42,7 @@ private:
QString extension;
SFileChangeCallback()
- : pListener(NULL)
+ : pListener(nullptr)
{}
SFileChangeCallback(IFileChangeListener* pListener, const char* item, const char* extension)
diff --git a/Code/Editor/EditorPanelUtils.cpp b/Code/Editor/EditorPanelUtils.cpp
index 9091bb4c2f..12e9457474 100644
--- a/Code/Editor/EditorPanelUtils.cpp
+++ b/Code/Editor/EditorPanelUtils.cpp
@@ -49,7 +49,7 @@ class CEditorPanelUtils_Impl
{
#pragma region Drag & Drop
public:
- virtual void SetViewportDragOperation(void(* dropCallback)(CViewport* viewport, int dragPointX, int dragPointY, void* custom), void* custom) override
+ void SetViewportDragOperation(void(* dropCallback)(CViewport* viewport, int dragPointX, int dragPointY, void* custom), void* custom) override
{
for (int i = 0; i < GetIEditor()->GetViewManager()->GetViewCount(); i++)
{
@@ -60,13 +60,13 @@ public:
#pragma region Preview Window
public:
- virtual int PreviewWindow_GetDisplaySettingsDebugFlags(CDisplaySettings* settings)
+ int PreviewWindow_GetDisplaySettingsDebugFlags(CDisplaySettings* settings) override
{
CRY_ASSERT(settings);
return settings->GetDebugFlags();
}
- virtual void PreviewWindow_SetDisplaySettingsDebugFlags(CDisplaySettings* settings, int flags)
+ void PreviewWindow_SetDisplaySettingsDebugFlags(CDisplaySettings* settings, int flags) override
{
CRY_ASSERT(settings);
settings->SetDebugFlags(flags);
@@ -79,7 +79,7 @@ protected:
bool m_hotkeysAreEnabled;
public:
- virtual bool HotKey_Import() override
+ bool HotKey_Import() override
{
QVector > keys;
QString filepath = QFileDialog::getOpenFileName(nullptr, "Select shortcut configuration to load",
@@ -130,7 +130,7 @@ public:
HotKey_BuildDefaults();
for (QPair key : keys)
{
- for (unsigned int j = 0; j < hotkeys.count(); j++)
+ for (int j = 0; j < hotkeys.count(); j++)
{
if (hotkeys[j].path.compare(key.first, Qt::CaseInsensitive) == 0)
{
@@ -143,7 +143,7 @@ public:
return result;
}
- virtual void HotKey_Export() override
+ void HotKey_Export() override
{
auto settingDir = AZ::IO::FixedMaxPath(AZ::Utils::GetEnginePath()) / "Editor" / "Plugins" / "ParticleEditorPlugin" / "settings";
QString filepath = QFileDialog::getSaveFileName(nullptr, "Select shortcut configuration to load", settingDir.c_str(), "HotKey Config Files (*.hkxml)");
@@ -170,7 +170,7 @@ public:
file.close();
}
- virtual QKeySequence HotKey_GetShortcut(const char* path) override
+ QKeySequence HotKey_GetShortcut(const char* path) override
{
for (HotKey combo : hotkeys)
{
@@ -182,7 +182,7 @@ public:
return QKeySequence();
}
- virtual bool HotKey_IsPressed(const QKeyEvent* event, const char* path) override
+ bool HotKey_IsPressed(const QKeyEvent* event, const char* path) override
{
if (!m_hotkeysAreEnabled)
{
@@ -221,7 +221,7 @@ public:
return false;
}
- virtual bool HotKey_IsPressed(const QShortcutEvent* event, const char* path) override
+ bool HotKey_IsPressed(const QShortcutEvent* event, const char* path) override
{
if (!m_hotkeysAreEnabled)
{
@@ -239,7 +239,7 @@ public:
return false;
}
- virtual bool HotKey_LoadExisting() override
+ bool HotKey_LoadExisting() override
{
QSettings settings("O3DE", "O3DE");
QString group = "Hotkeys/";
@@ -256,7 +256,7 @@ public:
hotkey.second = settings.value("keySequence").toString();
if (!hotkey.first.isEmpty())
{
- for (unsigned int j = 0; j < hotkeys.count(); j++)
+ for (int j = 0; j < hotkeys.count(); j++)
{
if (hotkeys[j].path.compare(hotkey.first, Qt::CaseInsensitive) == 0)
{
@@ -275,7 +275,7 @@ public:
return true;
}
- virtual void HotKey_SaveCurrent() override
+ void HotKey_SaveCurrent() override
{
QSettings settings("O3DE", "O3DE");
QString group = "Hotkeys/";
@@ -296,7 +296,7 @@ public:
settings.sync();
}
- virtual void HotKey_BuildDefaults() override
+ void HotKey_BuildDefaults() override
{
m_hotkeysAreEnabled = true;
QVector > keys;
@@ -356,17 +356,17 @@ public:
}
}
- virtual void HotKey_SetKeys(QVector keys) override
+ void HotKey_SetKeys(QVector keys) override
{
hotkeys = keys;
}
- virtual QVector HotKey_GetKeys() override
+ QVector HotKey_GetKeys() override
{
return hotkeys;
}
- virtual QString HotKey_GetPressedHotkey(const QKeyEvent* event) override
+ QString HotKey_GetPressedHotkey(const QKeyEvent* event) override
{
if (!m_hotkeysAreEnabled)
{
@@ -381,7 +381,7 @@ public:
}
return "";
}
- virtual QString HotKey_GetPressedHotkey(const QShortcutEvent* event) override
+ QString HotKey_GetPressedHotkey(const QShortcutEvent* event) override
{
if (!m_hotkeysAreEnabled)
{
@@ -398,12 +398,12 @@ public:
}
//building the default hotkey list re-enables hotkeys
//do not use this when rebuilding the default list is a possibility.
- virtual void HotKey_SetEnabled(bool val) override
+ void HotKey_SetEnabled(bool val) override
{
m_hotkeysAreEnabled = val;
}
- virtual bool HotKey_IsEnabled() const override
+ bool HotKey_IsEnabled() const override
{
return m_hotkeysAreEnabled;
}
@@ -457,13 +457,13 @@ protected:
}
public:
- virtual void ToolTip_LoadConfigXML(QString filepath) override
+ void ToolTip_LoadConfigXML(QString filepath) override
{
XmlNodeRef node = GetIEditor()->GetSystem()->LoadXmlFromFile(filepath.toStdString().c_str());
ToolTip_ParseNode(node);
}
- virtual void ToolTip_BuildFromConfig(IQToolTip* tooltip, QString path, QString option, QString optionalData = "", bool isEnabled = true)
+ void ToolTip_BuildFromConfig(IQToolTip* tooltip, QString path, QString option, QString optionalData = "", bool isEnabled = true) override
{
AZ_Assert(tooltip, "tooltip cannot be null");
@@ -488,7 +488,7 @@ public:
}
}
- virtual QString ToolTip_GetTitle(QString path, QString option) override
+ QString ToolTip_GetTitle(QString path, QString option) override
{
if (!option.isEmpty() && GetToolTip(path + "." + option).isValid)
{
@@ -501,7 +501,7 @@ public:
return GetToolTip(path).title;
}
- virtual QString ToolTip_GetContent(QString path, QString option) override
+ QString ToolTip_GetContent(QString path, QString option) override
{
if (!option.isEmpty() && GetToolTip(path + "." + option).isValid)
{
@@ -514,7 +514,7 @@ public:
return GetToolTip(path).content;
}
- virtual QString ToolTip_GetSpecialContentType(QString path, QString option) override
+ QString ToolTip_GetSpecialContentType(QString path, QString option) override
{
if (!option.isEmpty() && GetToolTip(path + "." + option).isValid)
{
@@ -527,7 +527,7 @@ public:
return GetToolTip(path).specialContent;
}
- virtual QString ToolTip_GetDisabledContent(QString path, QString option) override
+ QString ToolTip_GetDisabledContent(QString path, QString option) override
{
if (!option.isEmpty() && GetToolTip(path + "." + option).isValid)
{
diff --git a/Code/Editor/EditorPreferencesDialog.cpp b/Code/Editor/EditorPreferencesDialog.cpp
index 893b36b40c..c3fc4139f6 100644
--- a/Code/Editor/EditorPreferencesDialog.cpp
+++ b/Code/Editor/EditorPreferencesDialog.cpp
@@ -282,7 +282,7 @@ void EditorPreferencesDialog::CreatePages()
{
auto pUnknown = classes[i];
- IPreferencesPageCreator* pPageCreator = 0;
+ IPreferencesPageCreator* pPageCreator = nullptr;
if (FAILED(pUnknown->QueryInterface(&pPageCreator)))
{
continue;
diff --git a/Code/Editor/EditorPreferencesPageFiles.cpp b/Code/Editor/EditorPreferencesPageFiles.cpp
index aa84c7075c..4be3269d42 100644
--- a/Code/Editor/EditorPreferencesPageFiles.cpp
+++ b/Code/Editor/EditorPreferencesPageFiles.cpp
@@ -43,11 +43,16 @@ void CEditorPreferencesPage_Files::Reflect(AZ::SerializeContext& serialize)
->Field("MaxCount", &AutoBackup::m_maxCount)
->Field("RemindTime", &AutoBackup::m_remindTime);
+ serialize.Class()
+ ->Version(1)
+ ->Field("Max number of items displayed", &AssetBrowserSearch::m_maxNumberOfItemsShownInSearch);
+
serialize.Class()
->Version(1)
->Field("Files", &CEditorPreferencesPage_Files::m_files)
->Field("Editors", &CEditorPreferencesPage_Files::m_editors)
- ->Field("AutoBackup", &CEditorPreferencesPage_Files::m_autoBackup);
+ ->Field("AutoBackup", &CEditorPreferencesPage_Files::m_autoBackup)
+ ->Field("AssetBrowserSearch", &CEditorPreferencesPage_Files::m_assetBrowserSearch);
AZ::EditContext* editContext = serialize.GetEditContext();
@@ -80,12 +85,19 @@ void CEditorPreferencesPage_Files::Reflect(AZ::SerializeContext& serialize)
->Attribute(AZ::Edit::Attributes::Max, 100)
->DataElement(AZ::Edit::UIHandlers::SpinBox, &AutoBackup::m_remindTime, "Remind Time", "Auto Remind Every (Minutes)");
+ editContext->Class("Asset Browser Search View", "Asset Browser Search View")
+ ->DataElement(AZ::Edit::UIHandlers::SpinBox, &AssetBrowserSearch::m_maxNumberOfItemsShownInSearch, "Maximum number of displayed items",
+ "Maximum number of displayed items displayed in the Search View")
+ ->Attribute(AZ::Edit::Attributes::Min, 50)
+ ->Attribute(AZ::Edit::Attributes::Max, 5000);
+
editContext->Class("File Preferences", "Class for handling File Preferences")
->ClassElement(AZ::Edit::ClassElements::EditorData, "")
->Attribute(AZ::Edit::Attributes::Visibility, AZ_CRC("PropertyVisibility_ShowChildrenOnly", 0xef428f20))
->DataElement(AZ::Edit::UIHandlers::Default, &CEditorPreferencesPage_Files::m_files, "Files", "File Preferences")
->DataElement(AZ::Edit::UIHandlers::Default, &CEditorPreferencesPage_Files::m_editors, "External Editors", "External Editors")
- ->DataElement(AZ::Edit::UIHandlers::Default, &CEditorPreferencesPage_Files::m_autoBackup, "Auto Backup", "Auto Backup");
+ ->DataElement(AZ::Edit::UIHandlers::Default, &CEditorPreferencesPage_Files::m_autoBackup, "Auto Backup", "Auto Backup")
+ ->DataElement(AZ::Edit::UIHandlers::Default, &CEditorPreferencesPage_Files::m_assetBrowserSearch, "Asset Browser Search", "Asset Browser Search");
}
}
@@ -124,6 +136,8 @@ void CEditorPreferencesPage_Files::OnApply()
gSettings.autoBackupTime = m_autoBackup.m_timeInterval;
gSettings.autoBackupMaxCount = m_autoBackup.m_maxCount;
gSettings.autoRemindTime = m_autoBackup.m_remindTime;
+
+ gSettings.maxNumberOfItemsShownInSearch = m_assetBrowserSearch.m_maxNumberOfItemsShownInSearch;
}
void CEditorPreferencesPage_Files::InitializeSettings()
@@ -148,4 +162,6 @@ void CEditorPreferencesPage_Files::InitializeSettings()
m_autoBackup.m_timeInterval = gSettings.autoBackupTime;
m_autoBackup.m_maxCount = gSettings.autoBackupMaxCount;
m_autoBackup.m_remindTime = gSettings.autoRemindTime;
+
+ m_assetBrowserSearch.m_maxNumberOfItemsShownInSearch = gSettings.maxNumberOfItemsShownInSearch;
}
diff --git a/Code/Editor/EditorPreferencesPageFiles.h b/Code/Editor/EditorPreferencesPageFiles.h
index 2bb806a73e..368cd91fc3 100644
--- a/Code/Editor/EditorPreferencesPageFiles.h
+++ b/Code/Editor/EditorPreferencesPageFiles.h
@@ -69,10 +69,17 @@ private:
int m_remindTime;
};
+ struct AssetBrowserSearch
+ {
+ AZ_TYPE_INFO(AssetBrowserSearch, "{9FBFCD24-9452-49DF-99F4-2711443CEAAE}")
+
+ int m_maxNumberOfItemsShownInSearch;
+ };
Files m_files;
ExternalEditors m_editors;
AutoBackup m_autoBackup;
+ AssetBrowserSearch m_assetBrowserSearch;
QIcon m_icon;
};
diff --git a/Code/Editor/EditorPreferencesPageGeneral.cpp b/Code/Editor/EditorPreferencesPageGeneral.cpp
index 70ac0fd46f..79ecfbdfc7 100644
--- a/Code/Editor/EditorPreferencesPageGeneral.cpp
+++ b/Code/Editor/EditorPreferencesPageGeneral.cpp
@@ -32,6 +32,7 @@ void CEditorPreferencesPage_General::Reflect(AZ::SerializeContext& serialize)
->Field("PreviewPanel", &GeneralSettings::m_previewPanel)
->Field("ApplyConfigSpec", &GeneralSettings::m_applyConfigSpec)
->Field("EnableSourceControl", &GeneralSettings::m_enableSourceControl)
+ ->Field("ClearConsole", &GeneralSettings::m_clearConsoleOnGameModeStart)
->Field("ConsoleBackgroundColorTheme", &GeneralSettings::m_consoleBackgroundColorTheme)
->Field("AutoloadLastLevel", &GeneralSettings::m_autoLoadLastLevel)
->Field("ShowTimeInConsole", &GeneralSettings::m_bShowTimeInConsole)
@@ -77,6 +78,8 @@ void CEditorPreferencesPage_General::Reflect(AZ::SerializeContext& serialize)
->DataElement(AZ::Edit::UIHandlers::CheckBox, &GeneralSettings::m_previewPanel, "Show Geometry Preview Panel", "Show Geometry Preview Panel")
->DataElement(AZ::Edit::UIHandlers::CheckBox, &GeneralSettings::m_applyConfigSpec, "Hide objects by config spec", "Hide objects by config spec")
->DataElement(AZ::Edit::UIHandlers::CheckBox, &GeneralSettings::m_enableSourceControl, "Enable Source Control", "Enable Source Control")
+ ->DataElement(
+ AZ::Edit::UIHandlers::CheckBox, &GeneralSettings::m_clearConsoleOnGameModeStart, "Clear Console at game startup", "Clear Console when game mode starts")
->DataElement(AZ::Edit::UIHandlers::ComboBox, &GeneralSettings::m_consoleBackgroundColorTheme, "Console Background", "Console Background")
->EnumAttribute(AzToolsFramework::ConsoleColorTheme::Light, "Light")
->EnumAttribute(AzToolsFramework::ConsoleColorTheme::Dark, "Dark")
@@ -142,6 +145,7 @@ void CEditorPreferencesPage_General::OnApply()
gSettings.bPreviewGeometryWindow = m_generalSettings.m_previewPanel;
gSettings.bApplyConfigSpecInEditor = m_generalSettings.m_applyConfigSpec;
gSettings.enableSourceControl = m_generalSettings.m_enableSourceControl;
+ gSettings.clearConsoleOnGameModeStart = m_generalSettings.m_clearConsoleOnGameModeStart;
gSettings.consoleBackgroundColorTheme = m_generalSettings.m_consoleBackgroundColorTheme;
gSettings.bShowTimeInConsole = m_generalSettings.m_bShowTimeInConsole;
gSettings.bShowDashboardAtStartup = m_messaging.m_showDashboard;
@@ -176,6 +180,7 @@ void CEditorPreferencesPage_General::InitializeSettings()
m_generalSettings.m_previewPanel = gSettings.bPreviewGeometryWindow;
m_generalSettings.m_applyConfigSpec = gSettings.bApplyConfigSpecInEditor;
m_generalSettings.m_enableSourceControl = gSettings.enableSourceControl;
+ m_generalSettings.m_clearConsoleOnGameModeStart = gSettings.clearConsoleOnGameModeStart;
m_generalSettings.m_consoleBackgroundColorTheme = gSettings.consoleBackgroundColorTheme;
m_generalSettings.m_bShowTimeInConsole = gSettings.bShowTimeInConsole;
m_generalSettings.m_autoLoadLastLevel = gSettings.bAutoloadLastLevelAtStartup;
diff --git a/Code/Editor/EditorPreferencesPageGeneral.h b/Code/Editor/EditorPreferencesPageGeneral.h
index f22cfdd424..9a3a0f21e8 100644
--- a/Code/Editor/EditorPreferencesPageGeneral.h
+++ b/Code/Editor/EditorPreferencesPageGeneral.h
@@ -46,6 +46,7 @@ private:
bool m_previewPanel;
bool m_applyConfigSpec;
bool m_enableSourceControl;
+ bool m_clearConsoleOnGameModeStart;
AzToolsFramework::ConsoleColorTheme m_consoleBackgroundColorTheme;
bool m_autoLoadLastLevel;
bool m_bShowTimeInConsole;
diff --git a/Code/Editor/EditorPreferencesPageViewportMovement.cpp b/Code/Editor/EditorPreferencesPageViewportMovement.cpp
index 1efe64488d..988b4954d1 100644
--- a/Code/Editor/EditorPreferencesPageViewportMovement.cpp
+++ b/Code/Editor/EditorPreferencesPageViewportMovement.cpp
@@ -68,45 +68,21 @@ QIcon& CEditorPreferencesPage_ViewportMovement::GetIcon()
void CEditorPreferencesPage_ViewportMovement::OnApply()
{
- if (SandboxEditor::UsingNewCameraSystem())
- {
- SandboxEditor::SetCameraTranslateSpeed(m_cameraMovementSettings.m_moveSpeed);
- SandboxEditor::SetCameraRotateSpeed(m_cameraMovementSettings.m_rotateSpeed);
- SandboxEditor::SetCameraBoostMultiplier(m_cameraMovementSettings.m_fastMoveSpeed);
- SandboxEditor::SetCameraScrollSpeed(m_cameraMovementSettings.m_wheelZoomSpeed);
- SandboxEditor::SetCameraOrbitYawRotationInverted(m_cameraMovementSettings.m_invertYRotation);
- SandboxEditor::SetCameraPanInvertedX(m_cameraMovementSettings.m_invertPan);
- SandboxEditor::SetCameraPanInvertedY(m_cameraMovementSettings.m_invertPan);
- }
- else
- {
- gSettings.cameraMoveSpeed = m_cameraMovementSettings.m_moveSpeed;
- gSettings.cameraRotateSpeed = m_cameraMovementSettings.m_rotateSpeed;
- gSettings.cameraFastMoveSpeed = m_cameraMovementSettings.m_fastMoveSpeed;
- gSettings.wheelZoomSpeed = m_cameraMovementSettings.m_wheelZoomSpeed;
- gSettings.invertYRotation = m_cameraMovementSettings.m_invertYRotation;
- gSettings.invertPan = m_cameraMovementSettings.m_invertPan;
- }
+ SandboxEditor::SetCameraTranslateSpeed(m_cameraMovementSettings.m_moveSpeed);
+ SandboxEditor::SetCameraRotateSpeed(m_cameraMovementSettings.m_rotateSpeed);
+ SandboxEditor::SetCameraBoostMultiplier(m_cameraMovementSettings.m_fastMoveSpeed);
+ SandboxEditor::SetCameraScrollSpeed(m_cameraMovementSettings.m_wheelZoomSpeed);
+ SandboxEditor::SetCameraOrbitYawRotationInverted(m_cameraMovementSettings.m_invertYRotation);
+ SandboxEditor::SetCameraPanInvertedX(m_cameraMovementSettings.m_invertPan);
+ SandboxEditor::SetCameraPanInvertedY(m_cameraMovementSettings.m_invertPan);
}
void CEditorPreferencesPage_ViewportMovement::InitializeSettings()
{
- if (SandboxEditor::UsingNewCameraSystem())
- {
- m_cameraMovementSettings.m_moveSpeed = SandboxEditor::CameraTranslateSpeed();
- m_cameraMovementSettings.m_rotateSpeed = SandboxEditor::CameraRotateSpeed();
- m_cameraMovementSettings.m_fastMoveSpeed = SandboxEditor::CameraBoostMultiplier();
- m_cameraMovementSettings.m_wheelZoomSpeed = SandboxEditor::CameraScrollSpeed();
- m_cameraMovementSettings.m_invertYRotation = SandboxEditor::CameraOrbitYawRotationInverted();
- m_cameraMovementSettings.m_invertPan = SandboxEditor::CameraPanInvertedX() && SandboxEditor::CameraPanInvertedY();
- }
- else
- {
- m_cameraMovementSettings.m_moveSpeed = gSettings.cameraMoveSpeed;
- m_cameraMovementSettings.m_rotateSpeed = gSettings.cameraRotateSpeed;
- m_cameraMovementSettings.m_fastMoveSpeed = gSettings.cameraFastMoveSpeed;
- m_cameraMovementSettings.m_wheelZoomSpeed = gSettings.wheelZoomSpeed;
- m_cameraMovementSettings.m_invertYRotation = gSettings.invertYRotation;
- m_cameraMovementSettings.m_invertPan = gSettings.invertPan;
- }
+ m_cameraMovementSettings.m_moveSpeed = SandboxEditor::CameraTranslateSpeed();
+ m_cameraMovementSettings.m_rotateSpeed = SandboxEditor::CameraRotateSpeed();
+ m_cameraMovementSettings.m_fastMoveSpeed = SandboxEditor::CameraBoostMultiplier();
+ m_cameraMovementSettings.m_wheelZoomSpeed = SandboxEditor::CameraScrollSpeed();
+ m_cameraMovementSettings.m_invertYRotation = SandboxEditor::CameraOrbitYawRotationInverted();
+ m_cameraMovementSettings.m_invertPan = SandboxEditor::CameraPanInvertedX() && SandboxEditor::CameraPanInvertedY();
}
diff --git a/Code/Editor/EditorViewportSettings.cpp b/Code/Editor/EditorViewportSettings.cpp
index 680592a597..6e0ed86d2a 100644
--- a/Code/Editor/EditorViewportSettings.cpp
+++ b/Code/Editor/EditorViewportSettings.cpp
@@ -31,6 +31,8 @@ namespace SandboxEditor
constexpr AZStd::string_view CameraPanSpeedSetting = "/Amazon/Preferences/Editor/Camera/PanSpeed";
constexpr AZStd::string_view CameraRotateSmoothnessSetting = "/Amazon/Preferences/Editor/Camera/RotateSmoothness";
constexpr AZStd::string_view CameraTranslateSmoothnessSetting = "/Amazon/Preferences/Editor/Camera/TranslateSmoothness";
+ constexpr AZStd::string_view CameraTranslateSmoothingSetting = "/Amazon/Preferences/Editor/Camera/TranslateSmoothing";
+ constexpr AZStd::string_view CameraRotateSmoothingSetting = "/Amazon/Preferences/Editor/Camera/RotateSmoothing";
constexpr AZStd::string_view CameraTranslateForwardIdSetting = "/Amazon/Preferences/Editor/Camera/CameraTranslateForwardId";
constexpr AZStd::string_view CameraTranslateBackwardIdSetting = "/Amazon/Preferences/Editor/Camera/CameraTranslateBackwardId";
constexpr AZStd::string_view CameraTranslateLeftIdSetting = "/Amazon/Preferences/Editor/Camera/CameraTranslateLeftId";
@@ -259,6 +261,26 @@ namespace SandboxEditor
SetRegistry(CameraTranslateSmoothnessSetting, smoothness);
}
+ bool CameraRotateSmoothingEnabled()
+ {
+ return GetRegistry(CameraRotateSmoothingSetting, true);
+ }
+
+ void SetCameraRotateSmoothingEnabled(const bool enabled)
+ {
+ SetRegistry(CameraRotateSmoothingSetting, enabled);
+ }
+
+ bool CameraTranslateSmoothingEnabled()
+ {
+ return GetRegistry(CameraTranslateSmoothingSetting, true);
+ }
+
+ void SetCameraTranslateSmoothingEnabled(const bool enabled)
+ {
+ SetRegistry(CameraTranslateSmoothingSetting, enabled);
+ }
+
AzFramework::InputChannelId CameraTranslateForwardChannelId()
{
return AzFramework::InputChannelId(
diff --git a/Code/Editor/EditorViewportSettings.h b/Code/Editor/EditorViewportSettings.h
index 1898cf642a..1aca51395f 100644
--- a/Code/Editor/EditorViewportSettings.h
+++ b/Code/Editor/EditorViewportSettings.h
@@ -80,6 +80,12 @@ namespace SandboxEditor
SANDBOX_API float CameraTranslateSmoothness();
SANDBOX_API void SetCameraTranslateSmoothness(float smoothness);
+ SANDBOX_API bool CameraRotateSmoothingEnabled();
+ SANDBOX_API void SetCameraRotateSmoothingEnabled(bool enabled);
+
+ SANDBOX_API bool CameraTranslateSmoothingEnabled();
+ SANDBOX_API void SetCameraTranslateSmoothingEnabled(bool enabled);
+
SANDBOX_API AzFramework::InputChannelId CameraTranslateForwardChannelId();
SANDBOX_API void SetCameraTranslateForwardChannelId(AZStd::string_view cameraTranslateForwardId);
@@ -118,8 +124,4 @@ namespace SandboxEditor
SANDBOX_API AzFramework::InputChannelId CameraOrbitPanChannelId();
SANDBOX_API void SetCameraOrbitPanChannelId(AZStd::string_view cameraOrbitPanId);
-
- //! Return if the new editor camera system is enabled or not.
- //! @note This is implemented in EditorViewportWidget.cpp
- SANDBOX_API bool UsingNewCameraSystem();
} // namespace SandboxEditor
diff --git a/Code/Editor/EditorViewportWidget.cpp b/Code/Editor/EditorViewportWidget.cpp
index 357c27fd72..c29b2b6d11 100644
--- a/Code/Editor/EditorViewportWidget.cpp
+++ b/Code/Editor/EditorViewportWidget.cpp
@@ -46,7 +46,7 @@
#include
#include
#include
-#include
+#include
// AtomToolsFramework
#include
@@ -72,7 +72,7 @@
#include "IPostEffectGroup.h"
#include "EditorPreferencesPageGeneral.h"
#include "ViewportManipulatorController.h"
-#include "LegacyViewportCameraController.h"
+#include "EditorViewportSettings.h"
#include "ViewPane.h"
#include "CustomResolutionDlg.h"
@@ -91,6 +91,8 @@
// Atom
#include
#include
+#include
+
#include
#include
@@ -102,17 +104,8 @@
AZ_CVAR(
bool, ed_visibility_logTiming, false, nullptr, AZ::ConsoleFunctorFlags::Null, "Output the timing of the new IVisibilitySystem query");
-AZ_CVAR(bool, ed_useNewCameraSystem, true, nullptr, AZ::ConsoleFunctorFlags::Null, "Use the new Editor camera system");
AZ_CVAR(bool, ed_showCursorCameraLook, true, nullptr, AZ::ConsoleFunctorFlags::Null, "Show the cursor when using free look with the new camera system");
-namespace SandboxEditor
-{
- bool UsingNewCameraSystem()
- {
- return ed_useNewCameraSystem;
- }
-} // namespace SandboxEditor
-
EditorViewportWidget* EditorViewportWidget::m_pPrimaryViewport = nullptr;
#if AZ_TRAIT_OS_PLATFORM_APPLE
@@ -139,12 +132,11 @@ namespace AZ::ViewportHelpers
{
static const char TextCantCreateCameraNoLevel[] = "Cannot create camera when no level is loaded.";
- class EditorEntityNotifications
- : public AzToolsFramework::EditorEntityContextNotificationBus::Handler
+ class EditorEntityNotifications : public AzToolsFramework::EditorEntityContextNotificationBus::Handler
{
public:
- EditorEntityNotifications(EditorViewportWidget& renderViewport)
- : m_renderViewport(renderViewport)
+ EditorEntityNotifications(EditorViewportWidget& editorViewportWidget)
+ : m_editorViewportWidget(editorViewportWidget)
{
AzToolsFramework::EditorEntityContextNotificationBus::Handler::BusConnect();
}
@@ -154,18 +146,24 @@ namespace AZ::ViewportHelpers
AzToolsFramework::EditorEntityContextNotificationBus::Handler::BusDisconnect();
}
- // AzToolsFramework::EditorEntityContextNotificationBus
+ // AzToolsFramework::EditorEntityContextNotificationBus overrides ...
void OnStartPlayInEditor() override
{
- m_renderViewport.OnStartPlayInEditor();
+ m_editorViewportWidget.OnStartPlayInEditor();
}
+
void OnStopPlayInEditor() override
{
- m_renderViewport.OnStopPlayInEditor();
+ m_editorViewportWidget.OnStopPlayInEditor();
+ }
+
+ void OnStartPlayInEditorBegin() override
+ {
+ m_editorViewportWidget.OnStartPlayInEditorBegin();
}
private:
- EditorViewportWidget& m_renderViewport;
+ EditorViewportWidget& m_editorViewportWidget;
};
} // namespace AZ::ViewportHelpers
@@ -175,16 +173,12 @@ namespace AZ::ViewportHelpers
EditorViewportWidget::EditorViewportWidget(const QString& name, QWidget* parent)
: QtViewport(parent)
- , m_Camera(GetIEditor()->GetSystem()->GetViewCamera())
- , m_camFOV(gSettings.viewports.fDefaultFov)
, m_defaultViewName(name)
, m_renderViewport(nullptr) //m_renderViewport is initialized later, in SetViewportId
{
// need this to be set in order to allow for language switching on Windows
setAttribute(Qt::WA_InputMethodEnabled);
- LockCameraMovement(true);
- EditorViewportWidget::SetViewTM(m_Camera.GetMatrix());
m_defaultViewTM.SetIdentity();
if (GetIEditor()->GetViewManager()->GetSelectedViewport() == nullptr)
@@ -197,8 +191,6 @@ EditorViewportWidget::EditorViewportWidget(const QString& name, QWidget* parent)
m_displayContext.pIconManager = GetIEditor()->GetIconManager();
GetIEditor()->GetUndoManager()->AddListener(this);
- m_PhysicalLocation.SetIdentity();
-
// The renderer requires something, so don't allow us to shrink to absolutely nothing
// This won't in fact stop the viewport from being shrunk, when it's the centralWidget for
// the MainWindow, but it will stop the viewport from getting resize events
@@ -206,22 +198,14 @@ EditorViewportWidget::EditorViewportWidget(const QString& name, QWidget* parent)
// to be the same thing.
setMinimumSize(50, 50);
- OnCreate();
-
setMouseTracking(true);
Camera::EditorCameraRequestBus::Handler::BusConnect();
+ Camera::CameraNotificationBus::Handler::BusConnect();
+
m_editorEntityNotifications = AZStd::make_unique(*this);
AzFramework::AssetCatalogEventBus::Handler::BusConnect();
- auto handleCameraChange = [this](const AZ::Matrix4x4&)
- {
- UpdateCameraFromViewportContext();
- };
-
- m_cameraViewMatrixChangeHandler = AZ::RPI::ViewportContext::MatrixChangedEvent::Handler(handleCameraChange);
- m_cameraProjectionMatrixChangeHandler = AZ::RPI::ViewportContext::MatrixChangedEvent::Handler(handleCameraChange);
-
m_manipulatorManager = GetIEditor()->GetViewManager()->GetManipulatorManager();
if (!m_pPrimaryViewport)
{
@@ -240,28 +224,20 @@ EditorViewportWidget::~EditorViewportWidget()
DisconnectViewportInteractionRequestBus();
m_editorEntityNotifications.reset();
Camera::EditorCameraRequestBus::Handler::BusDisconnect();
- OnDestroy();
+ Camera::CameraNotificationBus::Handler::BusDisconnect();
GetIEditor()->GetUndoManager()->RemoveListener(this);
GetIEditor()->UnregisterNotifyListener(this);
}
-//////////////////////////////////////////////////////////////////////////
-// EditorViewportWidget message handlers
-//////////////////////////////////////////////////////////////////////////
-int EditorViewportWidget::OnCreate()
-{
- CreateRenderContext();
-
- return 0;
-}
-
//////////////////////////////////////////////////////////////////////////
void EditorViewportWidget::resizeEvent(QResizeEvent* event)
{
+ // Call base class resize event while not rendering
PushDisableRendering();
QtViewport::resizeEvent(event);
PopDisableRendering();
+ // Emit Legacy system events about the viewport size change
const QRect rcWindow = rect().translated(mapToGlobal(QPoint()));
gEnv->pSystem->GetISystemEventDispatcher()->OnSystemEvent(ESYSTEM_EVENT_MOVE, rcWindow.left(), rcWindow.top());
@@ -271,10 +247,12 @@ void EditorViewportWidget::resizeEvent(QResizeEvent* event)
gEnv->pSystem->GetISystemEventDispatcher()->OnSystemEvent(ESYSTEM_EVENT_RESIZE, width(), height());
- // We queue the window resize event because the render overlay may be hidden.
- // If the render overlay is not visible, the native window that is backing it will
- // also be hidden, and it will not resize until it becomes visible.
- m_windowResizedEvent = true;
+ // In the case of the default viewport camera, we must re-set the FOV, which also updates the aspect ratio
+ // Component cameras hand this themselves
+ if (m_viewSourceType == ViewSourceType::None)
+ {
+ SetFOV(GetFOV());
+ }
}
//////////////////////////////////////////////////////////////////////////
@@ -383,15 +361,6 @@ AzToolsFramework::ViewportInteraction::MouseInteraction EditorViewportWidget::Bu
BuildMousePick(WidgetToViewport(point)));
}
-void EditorViewportWidget::InjectFakeMouseMove(int deltaX, int deltaY, Qt::MouseButtons buttons)
-{
- // this is required, otherwise the user will see the context menu
- OnMouseMove(Qt::NoModifier, buttons, QCursor::pos() + QPoint(deltaX, deltaY));
- // we simply move the prev mouse position, so the change will be picked up
- // by the next ProcessMouse call
- m_prevMousePos -= QPoint(deltaX, deltaY);
-}
-
//////////////////////////////////////////////////////////////////////////
bool EditorViewportWidget::event(QEvent* event)
{
@@ -403,19 +372,6 @@ bool EditorViewportWidget::event(QEvent* event)
m_keyDown.clear();
break;
- case QEvent::ShortcutOverride:
- {
- // Ensure we exit game mode on escape, even if something else would eat our escape key event.
- if (static_cast(event)->key() == Qt::Key_Escape && GetIEditor()->IsInGameMode())
- {
- GetIEditor()->SetInGameMode(false);
- event->accept();
- return true;
- }
- break;
- }
-
-
case QEvent::Shortcut:
// a shortcut should immediately clear us, otherwise the release event never gets sent
m_keyDown.clear();
@@ -425,12 +381,6 @@ bool EditorViewportWidget::event(QEvent* event)
return QtViewport::event(event);
}
-//////////////////////////////////////////////////////////////////////////
-void EditorViewportWidget::ResetContent()
-{
- QtViewport::ResetContent();
-}
-
//////////////////////////////////////////////////////////////////////////
void EditorViewportWidget::UpdateContent(int flags)
{
@@ -461,20 +411,6 @@ void EditorViewportWidget::Update()
return;
}
- if (m_updateCameraPositionNextTick)
- {
- auto cameraState = GetCameraState();
- AZ::Matrix3x4 matrix;
- matrix.SetBasisAndTranslation(cameraState.m_side, cameraState.m_forward, cameraState.m_up, cameraState.m_position);
- auto m = AZMatrix3x4ToLYMatrix3x4(matrix);
-
- SetViewTM(m);
- m_Camera.SetZRange(cameraState.m_nearClip, cameraState.m_farClip);
- }
-
- // Reset the camera update flag now that we're finished updating our viewport context
- m_updateCameraPositionNextTick = false;
-
// Don't wait for changes to update the focused viewport.
if (CheckRespondToInput())
{
@@ -552,25 +488,13 @@ void EditorViewportWidget::Update()
PushDisableRendering();
- m_viewTM = m_Camera.GetMatrix(); // synchronize.
-
// Render
{
// TODO: Move out this logic to a controller and refactor to work with Atom
-
- OnRender();
-
ProcessRenderLisneters(m_displayContext);
m_displayContext.Flush2D();
- // m_renderer->SwitchToNativeResolutionBackbuffer();
-
- // 3D engine stats
-
- CCamera CurCamera = gEnv->pSystem->GetViewCamera();
- gEnv->pSystem->SetViewCamera(m_Camera);
-
// Post Render Callback
{
PostRenderers::iterator itr = m_postRenderers.begin();
@@ -580,8 +504,6 @@ void EditorViewportWidget::Update()
(*itr)->OnPostRender();
}
}
-
- gEnv->pSystem->SetViewCamera(CurCamera);
}
{
@@ -603,35 +525,7 @@ void EditorViewportWidget::Update()
m_bUpdateViewport = false;
}
-//////////////////////////////////////////////////////////////////////////
-void EditorViewportWidget::SetViewEntity(const AZ::EntityId& viewEntityId, bool lockCameraMovement)
-{
- // if they've picked the same camera, then that means they want to toggle
- if (viewEntityId.IsValid() && viewEntityId != m_viewEntityId)
- {
- LockCameraMovement(lockCameraMovement);
- m_viewEntityId = viewEntityId;
- AZStd::string entityName;
- AZ::ComponentApplicationBus::BroadcastResult(entityName, &AZ::ComponentApplicationRequests::GetEntityName, viewEntityId);
- SetName(QString("Camera entity: %1").arg(entityName.c_str()));
- }
- else
- {
- SetDefaultCamera();
- }
- PostCameraSet();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void EditorViewportWidget::ResetToViewSourceType(const ViewSourceType& viewSourceType)
-{
- LockCameraMovement(true);
- m_viewEntityId.SetInvalid();
- m_cameraObjectId = GUID_NULL;
- m_viewSourceType = viewSourceType;
- SetViewTM(GetViewTM());
-}
//////////////////////////////////////////////////////////////////////////
void EditorViewportWidget::PostCameraSet()
@@ -641,10 +535,28 @@ void EditorViewportWidget::PostCameraSet()
m_viewPane->OnFOVChanged(GetFOV());
}
+ // CryLegacy notify
GetIEditor()->Notify(eNotify_CameraChanged);
- QScopedValueRollback rb(m_ignoreSetViewFromEntityPerspective, true);
+
+ // Special case in the editor; if the camera is the default editor camera,
+ // notify that the active view changed. In game mode, it is a hard error to not have
+ // any cameras on the view stack!
+ if (m_viewSourceType == ViewSourceType::None)
+ {
+ m_sendingOnActiveChanged = true;
+ Camera::CameraNotificationBus::Broadcast(
+ &Camera::CameraNotificationBus::Events::OnActiveViewChanged, AZ::EntityId());
+ m_sendingOnActiveChanged = false;
+ }
+
+ // Notify about editor camera change
Camera::EditorCameraNotificationBus::Broadcast(
&Camera::EditorCameraNotificationBus::Events::OnViewportViewEntityChanged, m_viewEntityId);
+
+ // The editor view entity ID has changed, and the editor camera component "Be This Camera" text needs to be updated
+ AzToolsFramework::PropertyEditorGUIMessages::Bus::Broadcast(
+ &AzToolsFramework::PropertyEditorGUIMessages::RequestRefresh,
+ AzToolsFramework::PropertyModificationRefreshLevel::Refresh_AttributesAndValues);
}
//////////////////////////////////////////////////////////////////////////
@@ -652,16 +564,7 @@ CBaseObject* EditorViewportWidget::GetCameraObject() const
{
CBaseObject* pCameraObject = nullptr;
- if (m_viewSourceType == ViewSourceType::SequenceCamera)
- {
- m_cameraObjectId = GetViewManager()->GetCameraObjectId();
- }
- if (m_cameraObjectId != GUID_NULL)
- {
- // Find camera object from id.
- pCameraObject = GetIEditor()->GetObjectManager()->FindObject(m_cameraObjectId);
- }
- else if (m_viewSourceType == ViewSourceType::CameraComponent || m_viewSourceType == ViewSourceType::AZ_Entity)
+ if (m_viewSourceType == ViewSourceType::CameraComponent)
{
AzToolsFramework::ComponentEntityEditorRequestBus::EventResult(
pCameraObject, m_viewEntityId, &AzToolsFramework::ComponentEntityEditorRequests::GetSandboxObject);
@@ -717,10 +620,6 @@ void EditorViewportWidget::OnEditorNotifyEvent(EEditorNotifyEvent event)
if (GetIEditor()->GetViewManager()->GetGameViewport() == this)
{
SetCurrentCursor(STD_CURSOR_DEFAULT);
- m_bInRotateMode = false;
- m_bInMoveMode = false;
- m_bInOrbitMode = false;
- m_bInZoomMode = false;
if (m_inFullscreenPreview)
{
@@ -812,21 +711,6 @@ void EditorViewportWidget::OnEditorNotifyEvent(EEditorNotifyEvent event)
}
}
-//////////////////////////////////////////////////////////////////////////
-void EditorViewportWidget::OnRender()
-{
- if (m_rcClient.isEmpty())
- {
- // Even in null rendering, update the view camera.
- // This is necessary so that automated editor tests using the null renderer to test systems like dynamic vegetation
- // are still able to manipulate the current logical camera position, even if nothing is rendered.
- GetIEditor()->GetSystem()->SetViewCamera(m_Camera);
- return;
- }
-
- FUNCTION_PROFILER(GetIEditor()->GetSystem(), PROFILE_EDITOR);
-}
-
void EditorViewportWidget::OnBeginPrepareRender()
{
if (!m_debugDisplay)
@@ -847,82 +731,6 @@ void EditorViewportWidget::OnBeginPrepareRender()
Update();
m_isOnPaint = false;
- float fNearZ = GetIEditor()->GetConsoleVar("cl_DefaultNearPlane");
- float fFarZ = m_Camera.GetFarPlane();
-
- CBaseObject* cameraObject = GetCameraObject();
- if (cameraObject)
- {
- AZ::Matrix3x3 lookThroughEntityCorrection = AZ::Matrix3x3::CreateIdentity();
- if (m_viewEntityId.IsValid())
- {
- Camera::CameraRequestBus::EventResult(fNearZ, m_viewEntityId, &Camera::CameraComponentRequests::GetNearClipDistance);
- Camera::CameraRequestBus::EventResult(fFarZ, m_viewEntityId, &Camera::CameraComponentRequests::GetFarClipDistance);
- LmbrCentral::EditorCameraCorrectionRequestBus::EventResult(
- lookThroughEntityCorrection, m_viewEntityId, &LmbrCentral::EditorCameraCorrectionRequests::GetTransformCorrection);
- }
-
- m_viewTM = cameraObject->GetWorldTM() * AZMatrix3x3ToLYMatrix3x3(lookThroughEntityCorrection);
- m_viewTM.OrthonormalizeFast();
-
- m_Camera.SetMatrix(m_viewTM);
-
- int w = m_rcClient.width();
- int h = m_rcClient.height();
-
- m_Camera.SetFrustum(w, h, GetFOV(), fNearZ, fFarZ);
- }
- else if (m_viewEntityId.IsValid())
- {
- Camera::CameraRequestBus::EventResult(fNearZ, m_viewEntityId, &Camera::CameraComponentRequests::GetNearClipDistance);
- Camera::CameraRequestBus::EventResult(fFarZ, m_viewEntityId, &Camera::CameraComponentRequests::GetFarClipDistance);
- int w = m_rcClient.width();
- int h = m_rcClient.height();
-
- m_Camera.SetFrustum(w, h, GetFOV(), fNearZ, fFarZ);
- }
- else
- {
- // Normal camera.
- m_cameraObjectId = GUID_NULL;
- int w = m_rcClient.width();
- int h = m_rcClient.height();
-
- // Don't bother doing an FOV calculation if we don't have a valid viewport
- // This prevents frustum calculation bugs with a null viewport
- if (w <= 1 || h <= 1)
- {
- return;
- }
-
- float fov = gSettings.viewports.fDefaultFov;
-
- // match viewport fov to default / selected title menu fov
- if (GetFOV() != fov)
- {
- if (m_viewPane)
- {
- m_viewPane->OnFOVChanged(fov);
- SetFOV(fov);
- }
- }
-
- // Just for editor: Aspect ratio fix when changing the viewport
- if (!GetIEditor()->IsInGameMode())
- {
- float viewportAspectRatio = float( w ) / h;
- float targetAspectRatio = GetAspectRatio();
- if (targetAspectRatio > viewportAspectRatio)
- {
- // Correct for vertical FOV change.
- float maxTargetHeight = float( w ) / targetAspectRatio;
- fov = 2 * atanf((h * tan(fov / 2)) / maxTargetHeight);
- }
- }
- m_Camera.SetFrustum(w, h, fov, fNearZ);
- }
-
- GetIEditor()->GetSystem()->SetViewCamera(m_Camera);
if (GetIEditor()->IsInGameMode())
{
@@ -1138,17 +946,6 @@ void EditorViewportWidget::OnMenuSelectCurrentCamera()
AzFramework::CameraState EditorViewportWidget::GetCameraState()
{
- if (m_viewEntityId.IsValid())
- {
- bool cameraStateAcquired = false;
- AzFramework::CameraState cameraState;
- Camera::EditorCameraViewRequestBus::BroadcastResult(cameraStateAcquired,
- &Camera::EditorCameraViewRequestBus::Events::GetCameraState, cameraState);
- if (cameraStateAcquired)
- {
- return cameraState;
- }
- }
return m_renderViewport->GetCameraState();
}
@@ -1231,9 +1028,22 @@ bool EditorViewportWidget::ShowingWorldSpace()
}
AZStd::shared_ptr CreateModularViewportCameraController(
- AzFramework::ViewportId viewportId)
+ const AzFramework::ViewportId viewportId)
{
auto controller = AZStd::make_shared();
+
+ controller->SetCameraViewportContextBuilderCallback(
+ [viewportId](AZStd::unique_ptr& cameraViewportContext)
+ {
+ cameraViewportContext = AZStd::make_unique(viewportId);
+ });
+
+ controller->SetCameraPriorityBuilderCallback(
+ [](AtomToolsFramework::CameraControllerPriorityFn& cameraControllerPriorityFn)
+ {
+ cameraControllerPriorityFn = AtomToolsFramework::DefaultCameraControllerPriority;
+ });
+
controller->SetCameraPropsBuilderCallback(
[](AzFramework::CameraProps& cameraProps)
{
@@ -1246,6 +1056,16 @@ AZStd::shared_ptr CreateMod
{
return SandboxEditor::CameraTranslateSmoothness();
};
+
+ cameraProps.m_rotateSmoothingEnabledFn = []
+ {
+ return SandboxEditor::CameraRotateSmoothingEnabled();
+ };
+
+ cameraProps.m_translateSmoothingEnabledFn = []
+ {
+ return SandboxEditor::CameraTranslateSmoothingEnabled();
+ };
});
controller->SetCameraListBuilderCallback(
@@ -1454,24 +1274,15 @@ void EditorViewportWidget::SetViewportId(int id)
}
auto viewportContext = m_renderViewport->GetViewportContext();
m_defaultViewportContextName = viewportContext->GetName();
+ m_defaultView = viewportContext->GetDefaultView();
QBoxLayout* layout = new QBoxLayout(QBoxLayout::Direction::TopToBottom, this);
layout->setContentsMargins(QMargins());
layout->addWidget(m_renderViewport);
- viewportContext->ConnectViewMatrixChangedHandler(m_cameraViewMatrixChangeHandler);
- viewportContext->ConnectProjectionMatrixChangedHandler(m_cameraProjectionMatrixChangeHandler);
-
m_renderViewport->GetControllerList()->Add(AZStd::make_shared());
- if (ed_useNewCameraSystem)
- {
- m_renderViewport->GetControllerList()->Add(CreateModularViewportCameraController(AzFramework::ViewportId(id)));
- }
- else
- {
- m_renderViewport->GetControllerList()->Add(AZStd::make_shared());
- }
-
+ m_renderViewport->GetControllerList()->Add(CreateModularViewportCameraController(AzFramework::ViewportId(id)));
+
m_renderViewport->SetViewportSettings(&g_EditorViewportSettings);
UpdateScene();
@@ -1669,7 +1480,6 @@ bool EditorViewportWidget::AddCameraMenuItems(QMenu* menu)
menu->addSeparator();
}
- AZ::ViewportHelpers::AddCheckbox(menu, "Lock Camera Movement", &m_bLockCameraMovement);
menu->addSeparator();
// Camera Sub menu
@@ -1683,17 +1493,6 @@ bool EditorViewportWidget::AddCameraMenuItems(QMenu* menu)
AZ::EBusAggregateResults getCameraResults;
Camera::CameraBus::BroadcastResult(getCameraResults, &Camera::CameraRequests::GetCameras);
- const int numCameras = getCameraResults.values.size();
-
- // only enable if we're editing a sequence in Track View and have cameras in the level
- bool enableSequenceCameraMenu = (GetIEditor()->GetAnimation()->GetSequence() && numCameras);
-
- action = customCameraMenu->addAction(tr("Sequence Camera"));
- action->setCheckable(true);
- action->setChecked(m_viewSourceType == ViewSourceType::SequenceCamera);
- action->setEnabled(enableSequenceCameraMenu);
- connect(action, &QAction::triggered, this, &EditorViewportWidget::SetSequenceCamera);
-
QVector additionalCameras;
additionalCameras.reserve(getCameraResults.values.size());
@@ -1727,28 +1526,6 @@ bool EditorViewportWidget::AddCameraMenuItems(QMenu* menu)
customCameraMenu->addAction(cameraAction);
}
- action = customCameraMenu->addAction(tr("Look through entity"));
- bool areAnyEntitiesSelected = false;
- AzToolsFramework::ToolsApplicationRequestBus::BroadcastResult(areAnyEntitiesSelected, &AzToolsFramework::ToolsApplicationRequests::AreAnyEntitiesSelected);
- action->setCheckable(areAnyEntitiesSelected || m_viewSourceType == ViewSourceType::AZ_Entity);
- action->setEnabled(areAnyEntitiesSelected || m_viewSourceType == ViewSourceType::AZ_Entity);
- action->setChecked(m_viewSourceType == ViewSourceType::AZ_Entity);
- connect(action, &QAction::triggered, this, [this](bool isChecked)
- {
- if (isChecked)
- {
- AzToolsFramework::EntityIdList selectedEntityList;
- AzToolsFramework::ToolsApplicationRequests::Bus::BroadcastResult(selectedEntityList, &AzToolsFramework::ToolsApplicationRequests::GetSelectedEntities);
- if (selectedEntityList.size())
- {
- SetEntityAsCamera(*selectedEntityList.begin());
- }
- }
- else
- {
- SetDefaultCamera();
- }
- });
return true;
}
@@ -1777,28 +1554,6 @@ void EditorViewportWidget::ResizeView(int width, int height)
}
}
-//////////////////////////////////////////////////////////////////////////
-void EditorViewportWidget::ToggleCameraObject()
-{
- if (m_viewSourceType == ViewSourceType::SequenceCamera)
- {
- ResetToViewSourceType(ViewSourceType::LegacyCamera);
- }
- else
- {
- ResetToViewSourceType(ViewSourceType::SequenceCamera);
- }
- PostCameraSet();
- GetIEditor()->GetAnimation()->ForceAnimation();
-}
-
-//////////////////////////////////////////////////////////////////////////
-void EditorViewportWidget::SetCamera(const CCamera& camera)
-{
- m_Camera = camera;
- SetViewTM(m_Camera.GetMatrix());
-}
-
//////////////////////////////////////////////////////////////////////////
EditorViewportWidget* EditorViewportWidget::GetPrimaryViewport()
{
@@ -1852,64 +1607,64 @@ void EditorViewportWidget::keyPressEvent(QKeyEvent* event)
#endif // defined(AZ_PLATFORM_WINDOWS)
}
-void EditorViewportWidget::SetViewTM(const Matrix34& viewTM, bool bMoveOnly)
+void EditorViewportWidget::SetViewTM(const Matrix34& tm)
{
- Matrix34 camMatrix = viewTM;
-
- // If no collision flag set do not check for terrain elevation.
- if (GetType() == ET_ViewportCamera)
+ if (m_viewSourceType == ViewSourceType::None)
{
- if ((GetIEditor()->GetDisplaySettings()->GetSettings() & SETTINGS_NOCOLLISION) == 0)
- {
- Vec3 p = camMatrix.GetTranslation();
- bool adjustCameraElevation = true;
- auto terrain = AzFramework::Terrain::TerrainDataRequestBus::FindFirstHandler();
- if (terrain)
- {
- AZ::Aabb terrainAabb(terrain->GetTerrainAabb());
-
- // Adjust the AABB to include all Z values. Since the goal here is to snap the camera to the terrain height if
- // it's below the terrain, we only want to verify the camera is within the XY bounds of the terrain to adjust the elevation.
- terrainAabb.SetMin(AZ::Vector3(terrainAabb.GetMin().GetX(), terrainAabb.GetMin().GetY(), -AZ::Constants::FloatMax));
- terrainAabb.SetMax(AZ::Vector3(terrainAabb.GetMax().GetX(), terrainAabb.GetMax().GetY(), AZ::Constants::FloatMax));
-
- if (!terrainAabb.Contains(LYVec3ToAZVec3(p)))
- {
- adjustCameraElevation = false;
- }
- else if (terrain->GetIsHoleFromFloats(p.x, p.y))
- {
- adjustCameraElevation = false;
- }
- }
-
- if (adjustCameraElevation)
- {
- float z = GetIEditor()->GetTerrainElevation(p.x, p.y);
- if (p.z < z + 0.25)
- {
- p.z = z + 0.25;
- camMatrix.SetTranslation(p);
- }
- }
- }
-
- // Also force this position on game.
- if (GetIEditor()->GetGameEngine())
- {
- GetIEditor()->GetGameEngine()->SetPlayerViewMatrix(viewTM);
- }
+ m_defaultViewTM = tm;
}
+ SetViewTM(tm, false);
+}
+void EditorViewportWidget::SetViewTM(const Matrix34& camMatrix, bool bMoveOnly)
+{
+ AZ_Warning("EditorViewportWidget", !bMoveOnly, "'Move Only' mode is deprecated");
CBaseObject* cameraObject = GetCameraObject();
- if (cameraObject)
+
+ // Check if the active view entity is the same as the entity having the current view
+ // Sometimes this isn't the case because the active view is in the process of changing
+ // If it isn't, then we're doing the wrong thing below: we end up copying data from one (seemingly random)
+ // camera to another (seemingly random) camera
+ enum class ShouldUpdateObject
{
- // Ignore camera movement if locked.
- if (IsCameraMovementLocked() || (!GetIEditor()->GetAnimation()->IsRecordMode() && !IsCameraObjectMove()))
+ Yes, No, YesButViewsOutOfSync
+ };
+
+ const ShouldUpdateObject shouldUpdateObject = [&]() {
+ if (!cameraObject)
{
- return;
+ return ShouldUpdateObject::No;
}
+ if (m_viewSourceType == ViewSourceType::CameraComponent)
+ {
+ if (!m_viewEntityId.IsValid())
+ {
+ // Should be impossible anyways
+ AZ_Assert(false, "Internal logic error - view entity Id and view source type out of sync. Please report this as a bug");
+ return ShouldUpdateObject::No;
+ }
+
+ // Check that the current view is the same view as the view entity view
+ AZ::RPI::ViewPtr viewEntityView;
+ AZ::RPI::ViewProviderBus::EventResult(
+ viewEntityView, m_viewEntityId,
+ &AZ::RPI::ViewProviderBus::Events::GetView
+ );
+
+ return viewEntityView == GetCurrentAtomView() ? ShouldUpdateObject::Yes : ShouldUpdateObject::YesButViewsOutOfSync;
+ }
+ else
+ {
+ AZ_Assert(false, "Internal logic error - view source type is the default camera, but there is somehow a camera object. Please report this as a bug.");
+
+ // For non-component cameras, can't do any complicated view-based checks
+ return ShouldUpdateObject::No;
+ }
+ }();
+
+ if (shouldUpdateObject == ShouldUpdateObject::Yes)
+ {
AZ::Matrix3x3 lookThroughEntityCorrection = AZ::Matrix3x3::CreateIdentity();
if (m_viewEntityId.IsValid())
{
@@ -1918,89 +1673,77 @@ void EditorViewportWidget::SetViewTM(const Matrix34& viewTM, bool bMoveOnly)
&LmbrCentral::EditorCameraCorrectionRequests::GetInverseTransformCorrection);
}
- if (m_pressedKeyState != KeyPressedState::PressedInPreviousFrame)
+ int flags = 0;
{
- AzToolsFramework::ScopedUndoBatch undo("Move Camera");
+ // It isn't clear what this logic is supposed to do (it's legacy code)...
+ // For now, instead of removing it, just assert if the m_pressedKeyState isn't as expected
+ // Do not touch unless you really know what you're doing!
+ AZ_Assert(m_pressedKeyState == KeyPressedState::AllUp, "Internal logic error - key pressed state got changed. Please report this as a bug");
+
+ AZStd::optional undo;
+ if (m_pressedKeyState != KeyPressedState::PressedInPreviousFrame)
+ {
+ flags = eObjectUpdateFlags_UserInput;
+ undo.emplace("Move Camera");
+ }
+
if (bMoveOnly)
{
- // specify eObjectUpdateFlags_UserInput so that an undo command gets logged
- cameraObject->SetWorldPos(camMatrix.GetTranslation(), eObjectUpdateFlags_UserInput);
+ cameraObject->SetWorldPos(camMatrix.GetTranslation(), flags);
}
else
{
- // specify eObjectUpdateFlags_UserInput so that an undo command gets logged
- cameraObject->SetWorldTM(camMatrix * AZMatrix3x3ToLYMatrix3x3(lookThroughEntityCorrection), eObjectUpdateFlags_UserInput);
- }
- }
- else
- {
- if (bMoveOnly)
- {
- // Do not specify eObjectUpdateFlags_UserInput, so that an undo command does not get logged; we covered it already when m_pressedKeyState was PressedThisFrame
- cameraObject->SetWorldPos(camMatrix.GetTranslation());
- }
- else
- {
- // Do not specify eObjectUpdateFlags_UserInput, so that an undo command does not get logged; we covered it already when m_pressedKeyState was PressedThisFrame
- cameraObject->SetWorldTM(camMatrix * AZMatrix3x3ToLYMatrix3x3(lookThroughEntityCorrection));
+ cameraObject->SetWorldTM(camMatrix * AZMatrix3x3ToLYMatrix3x3(lookThroughEntityCorrection), flags);
}
}
}
- else if (m_viewEntityId.IsValid())
+ else if (shouldUpdateObject == ShouldUpdateObject::YesButViewsOutOfSync)
{
- // Ignore camera movement if locked.
- if (IsCameraMovementLocked() || (!GetIEditor()->GetAnimation()->IsRecordMode() && !IsCameraObjectMove()))
- {
- return;
- }
-
- if (m_pressedKeyState != KeyPressedState::PressedInPreviousFrame)
- {
- AzToolsFramework::ScopedUndoBatch undo("Move Camera");
- if (bMoveOnly)
- {
- AZ::TransformBus::Event(
- m_viewEntityId, &AZ::TransformInterface::SetWorldTranslation,
- LYVec3ToAZVec3(camMatrix.GetTranslation()));
- }
- else
- {
- AZ::TransformBus::Event(
- m_viewEntityId, &AZ::TransformInterface::SetWorldTM,
- LYTransformToAZTransform(camMatrix));
- }
-
- AzToolsFramework::ToolsApplicationRequestBus::Broadcast(&AzToolsFramework::ToolsApplicationRequests::AddDirtyEntity, m_viewEntityId);
- }
- else
- {
- if (bMoveOnly)
- {
- AZ::TransformBus::Event(
- m_viewEntityId, &AZ::TransformInterface::SetWorldTranslation,
- LYVec3ToAZVec3(camMatrix.GetTranslation()));
- }
- else
- {
- AZ::TransformBus::Event(
- m_viewEntityId, &AZ::TransformInterface::SetWorldTM,
- LYTransformToAZTransform(camMatrix));
- }
- }
-
- AzToolsFramework::PropertyEditorGUIMessages::Bus::Broadcast(
- &AzToolsFramework::PropertyEditorGUIMessages::RequestRefresh,
- AzToolsFramework::PropertyModificationRefreshLevel::Refresh_AttributesAndValues);
+ // Technically this should not cause anything to go wrong, but may indicate some underlying bug by a caller
+ // of SetViewTm, for example, trying to set the view TM in the middle of a camera change.
+ // If this is an important case, it can potentially be supported by caching the requested view TM
+ // until the entity and view ptr become synchronized.
+ AZ_Error("EditorViewportWidget",
+ m_playInEditorState == PlayInEditorState::Editor,
+ "Viewport camera entity ID and view out of sync; request view transform will be ignored. "
+ "Please report this as a bug."
+ );
}
if (m_pressedKeyState == KeyPressedState::PressedThisFrame)
{
m_pressedKeyState = KeyPressedState::PressedInPreviousFrame;
}
+}
- QtViewport::SetViewTM(camMatrix);
+const Matrix34& EditorViewportWidget::GetViewTM() const
+{
+ // `m_viewTmStorage' is only required because we must return a reference
+ m_viewTmStorage = AZTransformToLYTransform(GetCurrentAtomView()->GetCameraTransform());
+ return m_viewTmStorage;
+};
- m_Camera.SetMatrix(camMatrix);
+AZ::EntityId EditorViewportWidget::GetCurrentViewEntityId()
+{
+ // Sanity check that this camera entity ID is actually the camera entity which owns the current active render view
+ if (m_viewSourceType == ViewSourceType::CameraComponent)
+ {
+ // Check that the current view is the same view as the view entity view
+ AZ::RPI::ViewPtr viewEntityView;
+ AZ::RPI::ViewProviderBus::EventResult(
+ viewEntityView, m_viewEntityId,
+ &AZ::RPI::ViewProviderBus::Events::GetView
+ );
+
+ const bool isViewEntityCorrect = viewEntityView == GetCurrentAtomView();
+ AZ_Error("EditorViewportWidget", isViewEntityCorrect,
+ "GetCurrentViewEntityId called while the current view is being changed. "
+ "You may get inconsistent results if you make use of the returned entity ID. "
+ "This is an internal error, please report it as a bug."
+ );
+ }
+
+ return m_viewEntityId;
}
//////////////////////////////////////////////////////////////////////////
@@ -2224,7 +1967,7 @@ QPoint EditorViewportWidget::WorldToViewParticleEditor(const Vec3& wp, int width
Vec3 EditorViewportWidget::ViewToWorld(
const QPoint& vp, bool* collideWithTerrain, bool onlyTerrain, bool bSkipVegetation, bool bTestRenderMesh, bool* collideWithObject) const
{
- AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::Editor);
+ AZ_PROFILE_FUNCTION(Editor);
AZ_UNUSED(collideWithTerrain)
AZ_UNUSED(onlyTerrain)
@@ -2259,7 +2002,7 @@ Vec3 EditorViewportWidget::ViewToWorldNormal(const QPoint& vp, bool onlyTerrain,
AZ_UNUSED(onlyTerrain)
AZ_UNUSED(bTestRenderMesh)
- AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::Editor);
+ AZ_PROFILE_FUNCTION(Editor);
return Vec3(0, 0, 1);
}
@@ -2406,14 +2149,10 @@ void EditorViewportWidget::ViewToWorldRay(const QPoint& vp, Vec3& raySrc, Vec3&
}
//////////////////////////////////////////////////////////////////////////
-float EditorViewportWidget::GetScreenScaleFactor(const Vec3& worldPoint) const
+float EditorViewportWidget::GetScreenScaleFactor([[maybe_unused]] const Vec3& worldPoint) const
{
- float dist = m_Camera.GetPosition().GetDistance(worldPoint);
- if (dist < m_Camera.GetNearPlane())
- {
- dist = m_Camera.GetNearPlane();
- }
- return dist;
+ AZ_Error("CryLegacy", false, "EditorViewportWidget::GetScreenScaleFactor not implemented");
+ return 1.f;
}
//////////////////////////////////////////////////////////////////////////
float EditorViewportWidget::GetScreenScaleFactor(const CCamera& camera, const Vec3& object_position)
@@ -2423,12 +2162,6 @@ float EditorViewportWidget::GetScreenScaleFactor(const CCamera& camera, const Ve
return dist;
}
-//////////////////////////////////////////////////////////////////////////
-void EditorViewportWidget::OnDestroy()
-{
- DestroyRenderContext();
-}
-
//////////////////////////////////////////////////////////////////////////
bool EditorViewportWidget::CheckRespondToInput() const
{
@@ -2448,16 +2181,16 @@ bool EditorViewportWidget::CheckRespondToInput() const
//////////////////////////////////////////////////////////////////////////
bool EditorViewportWidget::HitTest(const QPoint& point, HitContext& hitInfo)
{
- hitInfo.camera = &m_Camera;
+ hitInfo.camera = nullptr;
hitInfo.pExcludedObject = GetCameraObject();
return QtViewport::HitTest(point, hitInfo);
}
//////////////////////////////////////////////////////////////////////////
-bool EditorViewportWidget::IsBoundsVisible(const AABB& box) const
+bool EditorViewportWidget::IsBoundsVisible(const AABB&) const
{
- // If at least part of bbox is visible then its visible.
- return m_Camera.IsAABBVisible_F(AABB(box.min, box.max));
+ AZ_Assert(false, "Not supported");
+ return false;
}
//////////////////////////////////////////////////////////////////////////
@@ -2502,11 +2235,10 @@ void EditorViewportWidget::CenterOnAABB(const AABB& aabb)
Matrix34 newTM = Matrix34(rotationMatrix, newPosition);
// Set new orbit distance
- m_orbitDistance = distanceToTarget;
- m_orbitDistance = fabs(m_orbitDistance);
+ float orbitDistance = distanceToTarget;
+ orbitDistance = fabs(orbitDistance);
SetViewTM(newTM);
- SandboxEditor::OrbitCameraControlsBus::Event(GetViewportId(), &SandboxEditor::OrbitCameraControlsBus::Events::SetOrbitDistance, m_orbitDistance);
}
void EditorViewportWidget::CenterOnSliceInstance()
@@ -2556,132 +2288,121 @@ void EditorViewportWidget::SetFOV(float fov)
{
if (m_viewEntityId.IsValid())
{
- Camera::CameraRequestBus::Event(m_viewEntityId, &Camera::CameraComponentRequests::SetFov, AZ::RadToDeg(fov));
+ Camera::CameraRequestBus::Event(m_viewEntityId, &Camera::CameraComponentRequests::SetFovRadians, fov);
}
else
{
- m_camFOV = fov;
- // Set the active camera's FOV
- {
- AZ::Matrix4x4 clipMatrix;
- AZ::MakePerspectiveFovMatrixRH(
- clipMatrix,
- GetFOV(),
- aznumeric_cast(width()) / aznumeric_cast(height()),
- m_Camera.GetNearPlane(),
- m_Camera.GetFarPlane(),
- true
- );
- m_renderViewport->GetViewportContext()->SetCameraProjectionMatrix(clipMatrix);
- }
- }
-
- if (m_viewPane)
- {
- m_viewPane->OnFOVChanged(fov);
+ auto m = m_defaultView->GetViewToClipMatrix();
+ AZ::SetPerspectiveMatrixFOV(m, fov, aznumeric_cast(width()) / aznumeric_cast(height()));
+ m_defaultView->SetViewToClipMatrix(m);
}
}
//////////////////////////////////////////////////////////////////////////
float EditorViewportWidget::GetFOV() const
{
- if (m_viewSourceType == ViewSourceType::SequenceCamera)
- {
- CBaseObject* cameraObject = GetCameraObject();
-
- AZ::EntityId cameraEntityId;
- AzToolsFramework::ComponentEntityObjectRequestBus::EventResult(cameraEntityId, cameraObject, &AzToolsFramework::ComponentEntityObjectRequestBus::Events::GetAssociatedEntityId);
- if (cameraEntityId.IsValid())
- {
- // component Camera
- float fov = DEFAULT_FOV;
- Camera::CameraRequestBus::EventResult(fov, cameraEntityId, &Camera::CameraComponentRequests::GetFov);
- return AZ::DegToRad(fov);
- }
- }
-
if (m_viewEntityId.IsValid())
{
- float fov = AZ::RadToDeg(m_camFOV);
- Camera::CameraRequestBus::EventResult(fov, m_viewEntityId, &Camera::CameraComponentRequests::GetFov);
- return AZ::DegToRad(fov);
+ float fov = 0.f;
+ Camera::CameraRequestBus::EventResult(fov, m_viewEntityId, &Camera::CameraComponentRequests::GetFovRadians);
+ return fov;
+ }
+ else
+ {
+ return AZ::GetPerspectiveMatrixFOV(m_defaultView->GetViewToClipMatrix());
+ }
+}
+
+void EditorViewportWidget::OnActiveViewChanged(const AZ::EntityId& viewEntityId)
+{
+ // Avoid re-entry
+ if (m_sendingOnActiveChanged)
+ {
+ return;
}
- return m_camFOV;
-}
+ // Ignore any changes in simulation mode
+ if (m_playInEditorState != PlayInEditorState::Editor)
+ {
+ return;
+ }
-//////////////////////////////////////////////////////////////////////////
-bool EditorViewportWidget::CreateRenderContext()
-{
- return true;
-}
+ // if they've picked the same camera, then that means they want to toggle
+ if (viewEntityId.IsValid())
+ {
+ // Any such events for game entities should be filtered out by the check above
+ AZ_Error(
+ "EditorViewportWidget",
+ Camera::EditorCameraViewRequestBus::FindFirstHandler(viewEntityId) != nullptr,
+ "Internal logic error - active view changed to an entity which is not an editor camera. "
+ "Please report this as a bug."
+ );
-//////////////////////////////////////////////////////////////////////////
-void EditorViewportWidget::DestroyRenderContext()
-{
+ m_viewEntityId = viewEntityId;
+ m_viewSourceType = ViewSourceType::CameraComponent;
+ AZStd::string entityName;
+ AZ::ComponentApplicationBus::BroadcastResult(entityName, &AZ::ComponentApplicationRequests::GetEntityName, viewEntityId);
+ SetName(QString("Camera entity: %1").arg(entityName.c_str()));
+
+ PostCameraSet();
+ }
+ else
+ {
+ SetDefaultCamera();
+ }
}
//////////////////////////////////////////////////////////////////////////
void EditorViewportWidget::SetDefaultCamera()
{
- // Ensure the FOV matches our internally stored setting
- SetFOV(GetFOV());
- if (IsDefaultCamera())
- {
- return;
- }
- ResetToViewSourceType(ViewSourceType::None);
- GetViewManager()->SetCameraObjectId(m_cameraObjectId);
+ m_viewEntityId.SetInvalid();
+ m_viewSourceType = ViewSourceType::None;
+ GetViewManager()->SetCameraObjectId(GUID_NULL);
SetName(m_defaultViewName);
SetViewTM(m_defaultViewTM);
+
+ // Synchronize the configured editor viewport FOV to the default camera
+ if (m_viewPane)
+ {
+ const float fov = gSettings.viewports.fDefaultFov;
+ m_viewPane->OnFOVChanged(fov);
+ SetFOV(fov);
+ }
+
+ // Push the default view as the active view
+ auto atomViewportRequests = AZ::Interface::Get();
+ if (atomViewportRequests)
+ {
+ const AZ::Name contextName = atomViewportRequests->GetDefaultViewportContextName();
+ atomViewportRequests->PushView(contextName, m_defaultView);
+ }
+
PostCameraSet();
}
//////////////////////////////////////////////////////////////////////////
-bool EditorViewportWidget::IsDefaultCamera() const
+AZ::RPI::ViewPtr EditorViewportWidget::GetCurrentAtomView() const
{
- return m_viewSourceType == ViewSourceType::None;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void EditorViewportWidget::SetSequenceCamera()
-{
- if (m_viewSourceType == ViewSourceType::SequenceCamera)
+ if (m_renderViewport && m_renderViewport->GetViewportContext())
{
- // Reset if we were checked before
- SetDefaultCamera();
+ return m_renderViewport->GetViewportContext()->GetDefaultView();
}
else
{
- ResetToViewSourceType(ViewSourceType::SequenceCamera);
-
- SetName(tr("Sequence Camera"));
- SetViewTM(GetViewTM());
-
- GetViewManager()->SetCameraObjectId(m_cameraObjectId);
- PostCameraSet();
-
- // ForceAnimation() so Track View will set the Camera params
- // if a camera is animated in the sequences.
- if (GetIEditor() && GetIEditor()->GetAnimation())
- {
- GetIEditor()->GetAnimation()->ForceAnimation();
- }
+ return nullptr;
}
}
//////////////////////////////////////////////////////////////////////////
void EditorViewportWidget::SetComponentCamera(const AZ::EntityId& entityId)
{
- ResetToViewSourceType(ViewSourceType::CameraComponent);
- SetViewEntity(entityId);
+ SetViewFromEntityPerspective(entityId);
}
//////////////////////////////////////////////////////////////////////////
void EditorViewportWidget::SetEntityAsCamera(const AZ::EntityId& entityId, bool lockCameraMovement)
{
- ResetToViewSourceType(ViewSourceType::AZ_Entity);
- SetViewEntity(entityId, lockCameraMovement);
+ SetViewAndMovementLockFromEntityPerspective(entityId, lockCameraMovement);
}
void EditorViewportWidget::SetFirstComponentCamera()
@@ -2729,7 +2450,7 @@ bool EditorViewportWidget::IsSelectedCamera() const
AzToolsFramework::ToolsApplicationRequests::Bus::BroadcastResult(
selectedEntityList, &AzToolsFramework::ToolsApplicationRequests::GetSelectedEntities);
- if ((m_viewSourceType == ViewSourceType::CameraComponent || m_viewSourceType == ViewSourceType::AZ_Entity)
+ if ((m_viewSourceType == ViewSourceType::CameraComponent)
&& !selectedEntityList.empty()
&& AZStd::find(selectedEntityList.begin(), selectedEntityList.end(), m_viewEntityId) != selectedEntityList.end())
{
@@ -2751,17 +2472,6 @@ void EditorViewportWidget::CycleCamera()
SetFirstComponentCamera();
break;
}
- case EditorViewportWidget::ViewSourceType::SequenceCamera:
- {
- AZ_Error("EditorViewportWidget", false, "Legacy cameras no longer exist, unable to set sequence camera.");
- break;
- }
- case EditorViewportWidget::ViewSourceType::LegacyCamera:
- {
- AZ_Warning("EditorViewportWidget", false, "Legacy cameras no longer exist, using first found component camera instead.");
- SetFirstComponentCamera();
- break;
- }
case EditorViewportWidget::ViewSourceType::CameraComponent:
{
AZ::EBusAggregateResults results;
@@ -2780,12 +2490,6 @@ void EditorViewportWidget::CycleCamera()
SetDefaultCamera();
break;
}
- case EditorViewportWidget::ViewSourceType::AZ_Entity:
- {
- // we may decide to have this iterate over just selected entities
- SetDefaultCamera();
- break;
- }
default:
{
SetDefaultCamera();
@@ -2799,11 +2503,28 @@ void EditorViewportWidget::SetViewFromEntityPerspective(const AZ::EntityId& enti
SetViewAndMovementLockFromEntityPerspective(entityId, false);
}
-void EditorViewportWidget::SetViewAndMovementLockFromEntityPerspective(const AZ::EntityId& entityId, bool lockCameraMovement)
+void EditorViewportWidget::SetViewAndMovementLockFromEntityPerspective(const AZ::EntityId& entityId, [[maybe_unused]] bool lockCameraMovement)
{
- if (!m_ignoreSetViewFromEntityPerspective)
+ // This is an editor event, so is only serviced during edit mode, not play game mode
+ //
+ if (m_playInEditorState != PlayInEditorState::Editor)
{
- SetEntityAsCamera(entityId, lockCameraMovement);
+ AZ_Warning("EditorViewportWidget", false,
+ "Tried to change the editor camera during play game in editor; this is currently unsupported"
+ );
+ return;
+ }
+
+ AZ_Assert(lockCameraMovement == false, "SetViewAndMovementLockFromEntityPerspective with lockCameraMovement == true not supported");
+
+ if (entityId.IsValid())
+ {
+ Camera::CameraRequestBus::Event(entityId, &Camera::CameraRequestBus::Events::MakeActiveView);
+ }
+ else
+ {
+ // The default camera
+ SetDefaultCamera();
}
}
@@ -2818,7 +2539,7 @@ bool EditorViewportWidget::GetActiveCameraPosition(AZ::Vector3& cameraPos)
else
{
// Use viewTM, which is synced with the camera and guaranteed to be up-to-date
- cameraPos = LYVec3ToAZVec3(m_viewTM.GetTranslation());
+ cameraPos = LYVec3ToAZVec3(GetViewTM().GetTranslation());
}
return true;
@@ -2832,17 +2553,26 @@ bool EditorViewportWidget::GetActiveCameraState(AzFramework::CameraState& camera
if (m_pPrimaryViewport == this)
{
cameraState = GetCameraState();
-
return true;
}
return false;
}
+void EditorViewportWidget::OnStartPlayInEditorBegin()
+{
+ m_playInEditorState = PlayInEditorState::Starting;
+}
+
void EditorViewportWidget::OnStartPlayInEditor()
{
+ m_playInEditorState = PlayInEditorState::Started;
+
if (m_viewEntityId.IsValid())
{
+ // Note that this is assuming that the Atom camera components will share the same view ptr
+ // in editor as in game mode
+
m_viewEntityIdCachedForEditMode = m_viewEntityId;
AZ::EntityId runtimeEntityId;
AzToolsFramework::EditorEntityContextRequestBus::Broadcast(
@@ -2855,20 +2585,14 @@ void EditorViewportWidget::OnStartPlayInEditor()
void EditorViewportWidget::OnStopPlayInEditor()
{
- if (m_viewEntityIdCachedForEditMode.IsValid())
- {
- m_viewEntityId = m_viewEntityIdCachedForEditMode;
- m_viewEntityIdCachedForEditMode.SetInvalid();
- }
-}
+ m_playInEditorState = PlayInEditorState::Editor;
-//////////////////////////////////////////////////////////////////////////
-void EditorViewportWidget::OnCameraFOVVariableChanged([[maybe_unused]] IVariable* var)
-{
- if (m_viewPane)
- {
- m_viewPane->OnFOVChanged(GetFOV());
- }
+ // Note that:
+ // - this is assuming that the Atom camera components will share the same view ptr in editor as in game mode.
+ // - if `m_viewEntityIdCachedForEditMode' is invalid, the camera before game mode was the default editor camera
+ // - we MUST set the camera again when exiting game mode, because when rendering with trackview, the editor camera gets set somehow
+ SetViewFromEntityPerspective(m_viewEntityIdCachedForEditMode);
+ m_viewEntityIdCachedForEditMode.SetInvalid();
}
//////////////////////////////////////////////////////////////////////////
@@ -2901,11 +2625,6 @@ void EditorViewportWidget::ShowCursor()
m_bCursorHidden = false;
}
-bool EditorViewportWidget::IsKeyDown(Qt::Key key) const
-{
- return m_keyDown.contains(key);
-}
-
//////////////////////////////////////////////////////////////////////////
void EditorViewportWidget::PushDisableRendering()
{
@@ -2943,6 +2662,17 @@ QSize EditorViewportWidget::WidgetToViewport(const QSize& size) const
return size * WidgetToViewportFactor();
}
+//////////////////////////////////////////////////////////////////////////
+double EditorViewportWidget::WidgetToViewportFactor() const
+{
+#if defined(AZ_PLATFORM_WINDOWS)
+ // Needed for high DPI mode on windows
+ return devicePixelRatioF();
+#else
+ return 1.0;
+#endif
+}
+
//////////////////////////////////////////////////////////////////////////
void EditorViewportWidget::BeginUndoTransaction()
{
@@ -2956,12 +2686,6 @@ void EditorViewportWidget::EndUndoTransaction()
Update();
}
-void EditorViewportWidget::UpdateCurrentMousePos(const QPoint& newPosition)
-{
- m_prevMousePos = m_mousePos;
- m_mousePos = newPosition;
-}
-
void* EditorViewportWidget::GetSystemCursorConstraintWindow() const
{
AzFramework::SystemCursorState systemCursorState = AzFramework::SystemCursorState::Unknown;
@@ -2990,8 +2714,7 @@ void EditorViewportWidget::RestoreViewportAfterGameMode()
QString(
tr("When leaving \" Game Mode \" the engine will automatically restore your camera position to the default position before you "
"had entered Game mode.
If you dislike this setting you can always change this anytime in the global "
- "preferences.
"))
- .arg(EditorPreferencesGeneralRestoreViewportCameraSettingName);
+ "preferences.
"));
QString restoreOnExitGameModePopupDisabledRegKey("Editor/AutoHide/ViewportCameraRestoreOnExitGameMode");
// Read the popup disabled registry value
@@ -3037,7 +2760,8 @@ void EditorViewportWidget::RestoreViewportAfterGameMode()
}
else
{
- SetViewTM(m_gameTM);
+ AZ_Error("CryLegacy", false, "Not restoring the editor viewport camera is currently unsupported");
+ SetViewTM(preGameModeViewTM);
}
}
@@ -3056,12 +2780,6 @@ void EditorViewportWidget::UpdateScene()
}
}
-void EditorViewportWidget::UpdateCameraFromViewportContext()
-{
- // Queue a sync for the next tick, to ensure the latest version of the viewport context transform is used
- m_updateCameraPositionNextTick = true;
-}
-
void EditorViewportWidget::SetAsActiveViewport()
{
auto viewportContextManager = AZ::Interface::Get();
diff --git a/Code/Editor/EditorViewportWidget.h b/Code/Editor/EditorViewportWidget.h
index 1829995d02..a75928b353 100644
--- a/Code/Editor/EditorViewportWidget.h
+++ b/Code/Editor/EditorViewportWidget.h
@@ -8,8 +8,6 @@
#pragma once
-// RenderViewport.h : header file
-//
#if !defined(Q_MOC_RUN)
#include
@@ -34,6 +32,7 @@
#include
#include
#include
+#include
#endif
#include
@@ -55,7 +54,8 @@ namespace AZ::ViewportHelpers
namespace AtomToolsFramework
{
class RenderViewportWidget;
-}
+ class ModularViewportCameraController;
+} // namespace AtomToolsFramework
namespace AzToolsFramework
{
@@ -65,130 +65,120 @@ namespace AzToolsFramework
// EditorViewportWidget window
AZ_PUSH_DISABLE_DLL_EXPORT_BASECLASS_WARNING
AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
-class SANDBOX_API EditorViewportWidget
+class SANDBOX_API EditorViewportWidget final
: public QtViewport
- , public IEditorNotifyListener
- , public IUndoManagerListener
- , public Camera::EditorCameraRequestBus::Handler
- , public AzFramework::InputSystemCursorConstraintRequestBus::Handler
- , public AzToolsFramework::ViewportInteraction::ViewportFreezeRequestBus::Handler
- , public AzToolsFramework::ViewportInteraction::MainEditorViewportInteractionRequestBus::Handler
- , public AzFramework::AssetCatalogEventBus::Handler
- , public AZ::RPI::SceneNotificationBus::Handler
+ , private IEditorNotifyListener
+ , private IUndoManagerListener
+ , private Camera::EditorCameraRequestBus::Handler
+ , private Camera::CameraNotificationBus::Handler
+ , private AzFramework::InputSystemCursorConstraintRequestBus::Handler
+ , private AzToolsFramework::ViewportInteraction::ViewportFreezeRequestBus::Handler
+ , private AzToolsFramework::ViewportInteraction::MainEditorViewportInteractionRequestBus::Handler
+ , private AzFramework::AssetCatalogEventBus::Handler
+ , private AZ::RPI::SceneNotificationBus::Handler
{
AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
AZ_POP_DISABLE_DLL_EXPORT_BASECLASS_WARNING
Q_OBJECT
-public:
- struct SResolution
- {
- SResolution()
- : width(0)
- , height(0)
- {
- }
-
- SResolution(int w, int h)
- : width(w)
- , height(h)
- {
- }
-
- int width;
- int height;
- };
public:
EditorViewportWidget(const QString& name, QWidget* parent = nullptr);
+ ~EditorViewportWidget() override;
static const GUID& GetClassID()
{
return QtViewport::GetClassID();
}
- /** Get type of this viewport.
- */
- virtual EViewportType GetType() const { return ET_ViewportCamera; }
- virtual void SetType([[maybe_unused]] EViewportType type) { assert(type == ET_ViewportCamera); };
+ static EditorViewportWidget* GetPrimaryViewport();
- virtual ~EditorViewportWidget();
+ // Used by ViewPan in some circumstances
+ void ConnectViewportInteractionRequestBus();
+ void DisconnectViewportInteractionRequestBus();
- Q_INVOKABLE void InjectFakeMouseMove(int deltaX, int deltaY, Qt::MouseButtons buttons);
+ // QtViewport/IDisplayViewport/CViewport
+ // These methods are made public in the derived class because they are called with an object whose static type is known to be this class type.
+ void SetFOV(float fov) override;
+ float GetFOV() const override;
- // Replacement for still used CRenderer methods
- void UnProjectFromScreen(float sx, float sy, float sz, float* px, float* py, float* pz) const;
- void ProjectToScreen(float ptx, float pty, float ptz, float* sx, float* sy, float* sz) const;
+private:
+ ////////////////////////////////////////////////////////////////////////
+ // Private types ...
-public:
- virtual void Update();
-
- virtual void ResetContent();
- virtual void UpdateContent(int flags);
-
- void OnTitleMenu(QMenu* menu) override;
-
- void SetCamera(const CCamera& camera);
- const CCamera& GetCamera() const { return m_Camera; };
- virtual void SetViewTM(const Matrix34& tm)
+ enum class ViewSourceType
{
- if (m_viewSourceType == ViewSourceType::None)
- {
- m_defaultViewTM = tm;
- }
- SetViewTM(tm, false);
- }
+ None,
+ CameraComponent,
+ ViewSourceTypesCount,
+ };
+ enum class PlayInEditorState
+ {
+ Editor, Starting, Started
+ };
+ enum class KeyPressedState
+ {
+ AllUp,
+ PressedThisFrame,
+ PressedInPreviousFrame,
+ };
- //! Map world space position to viewport position.
- virtual QPoint WorldToView(const Vec3& wp) const;
- virtual QPoint WorldToViewParticleEditor(const Vec3& wp, int width, int height) const;
- virtual Vec3 WorldToView3D(const Vec3& wp, int nFlags = 0) const;
-
- //! Map viewport position to world space position.
- virtual Vec3 ViewToWorld(const QPoint& vp, bool* collideWithTerrain = nullptr, bool onlyTerrain = false, bool bSkipVegetation = false, bool bTestRenderMesh = false, bool* collideWithObject = nullptr) const override;
- virtual void ViewToWorldRay(const QPoint& vp, Vec3& raySrc, Vec3& rayDir) const override;
- virtual Vec3 ViewToWorldNormal(const QPoint& vp, bool onlyTerrain, bool bTestRenderMesh = false) override;
- virtual float GetScreenScaleFactor(const Vec3& worldPoint) const;
- virtual float GetScreenScaleFactor(const CCamera& camera, const Vec3& object_position);
- virtual float GetAspectRatio() const;
- virtual bool HitTest(const QPoint& point, HitContext& hitInfo);
- virtual bool IsBoundsVisible(const AABB& box) const;
- virtual void CenterOnSelection();
- virtual void CenterOnAABB(const AABB& aabb);
- void CenterOnSliceInstance() override;
+ ////////////////////////////////////////////////////////////////////////
+ // Method overrides ...
+ // QWidget
void focusOutEvent(QFocusEvent* event) override;
void keyPressEvent(QKeyEvent* event) override;
+ bool event(QEvent* event) override;
+ void resizeEvent(QResizeEvent* event) override;
+ void paintEvent(QPaintEvent* event) override;
+ void mousePressEvent(QMouseEvent* event) override;
- void SetFOV(float fov);
- float GetFOV() const;
+ // QtViewport/IDisplayViewport/CViewport
+ EViewportType GetType() const override { return ET_ViewportCamera; }
+ void SetType([[maybe_unused]] EViewportType type) override { assert(type == ET_ViewportCamera); };
+ AzToolsFramework::ViewportInteraction::MouseInteraction BuildMouseInteraction(
+ Qt::MouseButtons buttons, Qt::KeyboardModifiers modifiers, const QPoint& point) override;
+ void SetViewportId(int id) override;
+ QPoint WorldToView(const Vec3& wp) const override;
+ QPoint WorldToViewParticleEditor(const Vec3& wp, int width, int height) const override;
+ Vec3 WorldToView3D(const Vec3& wp, int nFlags = 0) const override;
+ Vec3 ViewToWorld(const QPoint& vp, bool* collideWithTerrain = nullptr, bool onlyTerrain = false, bool bSkipVegetation = false, bool bTestRenderMesh = false, bool* collideWithObject = nullptr) const override;
+ void ViewToWorldRay(const QPoint& vp, Vec3& raySrc, Vec3& rayDir) const override;
+ Vec3 ViewToWorldNormal(const QPoint& vp, bool onlyTerrain, bool bTestRenderMesh = false) override;
+ float GetScreenScaleFactor(const Vec3& worldPoint) const override;
+ float GetScreenScaleFactor(const CCamera& camera, const Vec3& object_position) override;
+ float GetAspectRatio() const override;
+ bool HitTest(const QPoint& point, HitContext& hitInfo) override;
+ bool IsBoundsVisible(const AABB& box) const override;
+ void CenterOnSelection() override;
+ void CenterOnAABB(const AABB& aabb) override;
+ void CenterOnSliceInstance() override;
+ void OnTitleMenu(QMenu* menu) override;
+ void SetViewTM(const Matrix34& tm) override;
+ const Matrix34& GetViewTM() const override;
+ void Update() override;
+ void UpdateContent(int flags) override;
- void SetDefaultCamera();
- bool IsDefaultCamera() const;
- void SetSequenceCamera();
- bool IsSequenceCamera() const { return m_viewSourceType == ViewSourceType::SequenceCamera; }
- void SetSelectedCamera();
- bool IsSelectedCamera() const;
- void SetComponentCamera(const AZ::EntityId& entityId);
- void SetEntityAsCamera(const AZ::EntityId& entityId, bool lockCameraMovement = false);
- void SetFirstComponentCamera();
- void SetViewEntity(const AZ::EntityId& cameraEntityId, bool lockCameraMovement = false);
- void PostCameraSet();
- // This switches the active camera to the next one in the list of (default, all custom cams).
- void CycleCamera();
+ // SceneNotificationBus
+ void OnBeginPrepareRender() override;
- // Camera::EditorCameraRequestBus
- void SetViewFromEntityPerspective(const AZ::EntityId& entityId) override;
- void SetViewAndMovementLockFromEntityPerspective(const AZ::EntityId& entityId, bool lockCameraMovement) override;
- AZ::EntityId GetCurrentViewEntityId() override { return m_viewEntityId; }
- bool GetActiveCameraPosition(AZ::Vector3& cameraPos) override;
- bool GetActiveCameraState(AzFramework::CameraState& cameraState) override;
+ // Camera::CameraNotificationBus
+ void OnActiveViewChanged(const AZ::EntityId&) override;
+
+ // IEditorEventListener
+ void OnEditorNotifyEvent(EEditorNotifyEvent event) override;
// AzToolsFramework::EditorEntityContextNotificationBus (handler moved to cpp to resolve link issues in unity builds)
- virtual void OnStartPlayInEditor();
- virtual void OnStopPlayInEditor();
+ void OnStartPlayInEditor();
+ void OnStopPlayInEditor();
+ void OnStartPlayInEditorBegin();
- AzFramework::CameraState GetCameraState();
- AzFramework::ScreenPoint ViewportWorldToScreen(const AZ::Vector3& worldPosition);
+ // IUndoManagerListener
+ void BeginUndoTransaction() override;
+ void EndUndoTransaction() override;
+
+ // AzFramework::InputSystemCursorConstraintRequestBus
+ void* GetSystemCursorConstraintWindow() const override;
// AzToolsFramework::ViewportFreezeRequestBus
bool IsViewportInputFrozen() override;
@@ -204,142 +194,19 @@ public:
void BeginWidgetContext() override;
void EndWidgetContext() override;
- // CViewport...
- void SetViewportId(int id) override;
-
- void ConnectViewportInteractionRequestBus();
- void DisconnectViewportInteractionRequestBus();
-
- void LockCameraMovement(bool bLock) { m_bLockCameraMovement = bLock; }
- bool IsCameraMovementLocked() const { return m_bLockCameraMovement; }
-
- void EnableCameraObjectMove(bool bMove) { m_bMoveCameraObject = bMove; }
- bool IsCameraObjectMove() const { return m_bMoveCameraObject; }
-
- void SetPlayerControl(uint32 i) { m_PlayerControl = i; };
- uint32 GetPlayerControl() { return m_PlayerControl; };
-
- const DisplayContext& GetDisplayContext() const { return m_displayContext; }
- CBaseObject* GetCameraObject() const;
-
- QPoint WidgetToViewport(const QPoint& point) const;
- QPoint ViewportToWidget(const QPoint& point) const;
- QSize WidgetToViewport(const QSize& size) const;
-
- AzToolsFramework::ViewportInteraction::MouseInteraction BuildMouseInteraction(
- Qt::MouseButtons buttons, Qt::KeyboardModifiers modifiers, const QPoint& point) override;
-
- void SetPlayerPos()
- {
- Matrix34 m = GetViewTM();
- m.SetTranslation(m.GetTranslation() - m_PhysicalLocation.t);
- SetViewTM(m);
-
- m_AverageFrameTime = 0.14f;
-
- m_PhysicalLocation.SetIdentity();
-
- m_LocalEntityMat.SetIdentity();
- m_PrevLocalEntityMat.SetIdentity();
-
- m_absCameraHigh = 2.0f;
- m_absCameraPos = Vec3(0, 3, 2);
- m_absCameraPosVP = Vec3(0, -3, 1.5);
-
- m_absCurrentSlope = 0.0f;
-
- m_absLookDirectionXY = Vec2(0, 1);
-
- m_LookAt = Vec3(ZERO);
- m_LookAtRate = Vec3(ZERO);
- m_vCamPos = Vec3(ZERO);
- m_vCamPosRate = Vec3(ZERO);
-
- m_relCameraRotX = 0;
- m_relCameraRotZ = 0;
-
- uint32 numSample6 = m_arrAnimatedCharacterPath.size();
- for (uint32 i = 0; i < numSample6; i++)
- {
- m_arrAnimatedCharacterPath[i] = Vec3(ZERO);
- }
-
- numSample6 = m_arrSmoothEntityPath.size();
- for (uint32 i = 0; i < numSample6; i++)
- {
- m_arrSmoothEntityPath[i] = Vec3(ZERO);
- }
-
- uint32 numSample7 = m_arrRunStrafeSmoothing.size();
- for (uint32 i = 0; i < numSample7; i++)
- {
- m_arrRunStrafeSmoothing[i] = 0;
- }
-
- m_vWorldDesiredBodyDirection = Vec2(0, 1);
- m_vWorldDesiredBodyDirectionSmooth = Vec2(0, 1);
- m_vWorldDesiredBodyDirectionSmoothRate = Vec2(0, 1);
-
- m_vWorldDesiredBodyDirection2 = Vec2(0, 1);
-
- m_vWorldDesiredMoveDirection = Vec2(0, 1);
- m_vWorldDesiredMoveDirectionSmooth = Vec2(0, 1);
- m_vWorldDesiredMoveDirectionSmoothRate = Vec2(0, 1);
- m_vLocalDesiredMoveDirection = Vec2(0, 1);
- m_vLocalDesiredMoveDirectionSmooth = Vec2(0, 1);
- m_vLocalDesiredMoveDirectionSmoothRate = Vec2(0, 1);
-
- m_vWorldAimBodyDirection = Vec2(0, 1);
-
- m_MoveSpeedMSec = 5.0f;
- m_key_W = 0;
- m_keyrcr_W = 0;
- m_key_S = 0;
- m_keyrcr_S = 0;
- m_key_A = 0;
- m_keyrcr_A = 0;
- m_key_D = 0;
- m_keyrcr_D = 0;
- m_key_SPACE = 0;
- m_keyrcr_SPACE = 0;
- m_ControllMode = 0;
-
- m_State = -1;
- m_Stance = 1; //combat
-
- m_udGround = 0.0f;
- m_lrGround = 0.0f;
- AABB aabb = AABB(Vec3(-40.0f, -40.0f, -0.25f), Vec3(+40.0f, +40.0f, +0.0f));
- m_GroundOBB = OBB::CreateOBBfromAABB(Matrix33(IDENTITY), aabb);
- m_GroundOBBPos = Vec3(0, 0, -0.01f);
- };
-
- static EditorViewportWidget* GetPrimaryViewport();
-
- AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
- CCamera m_Camera;
- AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
-
-protected:
- struct SScopedCurrentContext;
+ // Camera::EditorCameraRequestBus
+ void SetViewFromEntityPerspective(const AZ::EntityId& entityId) override;
+ void SetViewAndMovementLockFromEntityPerspective(const AZ::EntityId& entityId, bool lockCameraMovement) override;
+ AZ::EntityId GetCurrentViewEntityId() override;
+ bool GetActiveCameraPosition(AZ::Vector3& cameraPos) override;
+ bool GetActiveCameraState(AzFramework::CameraState& cameraState) override;
+ ////////////////////////////////////////////////////////////////////////
+ // Private helpers...
void SetViewTM(const Matrix34& tm, bool bMoveOnly);
-
- // Called to render stuff.
- virtual void OnRender();
-
- virtual void OnEditorNotifyEvent(EEditorNotifyEvent event);
-
- //! Get currently active camera object.
- void ToggleCameraObject();
-
- void RenderConstructionPlane();
void RenderSnapMarker();
-
void RenderAll();
- void OnBeginPrepareRender() override;
-
// Update the safe frame, safe action, safe title, and borders rectangles based on
// viewport size and target aspect ratio.
void UpdateSafeFrame();
@@ -353,193 +220,41 @@ protected:
// Draw a selected region if it has been selected
void RenderSelectedRegion();
- virtual bool CreateRenderContext();
- virtual void DestroyRenderContext();
-
- void OnMenuCommandChangeAspectRatio(unsigned int commandId);
-
bool AdjustObjectPosition(const ray_hit& hit, Vec3& outNormal, Vec3& outPos) const;
bool RayRenderMeshIntersection(IRenderMesh* pRenderMesh, const Vec3& vInPos, const Vec3& vInDir, Vec3& vOutPos, Vec3& vOutNormal) const;
bool AddCameraMenuItems(QMenu* menu);
void ResizeView(int width, int height);
- void OnCameraFOVVariableChanged(IVariable* var);
-
void HideCursor();
void ShowCursor();
- bool IsKeyDown(Qt::Key key) const;
-
- enum class ViewSourceType
- {
- None,
- SequenceCamera,
- LegacyCamera,
- CameraComponent,
- AZ_Entity,
- ViewSourceTypesCount,
- };
- void ResetToViewSourceType(const ViewSourceType& viewSourType);
+ double WidgetToViewportFactor() const;
bool ShouldPreviewFullscreen() const;
void StartFullscreenPreview();
void StopFullscreenPreview();
- bool m_inFullscreenPreview = false;
- bool m_bRenderContextCreated = false;
- bool m_bInRotateMode = false;
- bool m_bInMoveMode = false;
- bool m_bInOrbitMode = false;
- bool m_bInZoomMode = false;
-
- QPoint m_mousePos = QPoint(0, 0);
- QPoint m_prevMousePos = QPoint(0, 0); // for tablets, you can't use SetCursorPos and need to remember the prior point and delta with that.
-
-
- float m_moveSpeed = 1;
-
- float m_orbitDistance = 10.0f;
- AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
- Vec3 m_orbitTarget;
-
- //-------------------------------------------
- //--- player-control in CharEdit ---
- //-------------------------------------------
- f32 m_MoveSpeedMSec;
-
- uint32 m_key_W, m_keyrcr_W;
- uint32 m_key_S, m_keyrcr_S;
- uint32 m_key_A, m_keyrcr_A;
- uint32 m_key_D, m_keyrcr_D;
-
- uint32 m_key_SPACE, m_keyrcr_SPACE;
- uint32 m_ControllMode;
-
- int32 m_Stance;
- int32 m_State;
- f32 m_AverageFrameTime;
-
- uint32 m_PlayerControl = 0;
-
- f32 m_absCameraHigh;
- Vec3 m_absCameraPos;
- Vec3 m_absCameraPosVP;
-
- f32 m_absCurrentSlope; //in radiants
-
- Vec2 m_absLookDirectionXY;
-
- Vec3 m_LookAt;
- Vec3 m_LookAtRate;
- Vec3 m_vCamPos;
- Vec3 m_vCamPosRate;
- float m_camFOV;
-
- f32 m_relCameraRotX;
- f32 m_relCameraRotZ;
-
- QuatTS m_PhysicalLocation;
-
- Matrix34 m_AnimatedCharacterMat;
-
- Matrix34 m_LocalEntityMat; //this is used for data-driven animations where the character is running on the spot
- Matrix34 m_PrevLocalEntityMat;
-
- std::vector m_arrVerticesHF;
- std::vector m_arrIndicesHF;
-
- std::vector m_arrAnimatedCharacterPath;
- std::vector m_arrSmoothEntityPath;
- std::vector m_arrRunStrafeSmoothing;
-
- Vec2 m_vWorldDesiredBodyDirection;
- Vec2 m_vWorldDesiredBodyDirectionSmooth;
- Vec2 m_vWorldDesiredBodyDirectionSmoothRate;
-
- Vec2 m_vWorldDesiredBodyDirection2;
-
-
- Vec2 m_vWorldDesiredMoveDirection;
- Vec2 m_vWorldDesiredMoveDirectionSmooth;
- Vec2 m_vWorldDesiredMoveDirectionSmoothRate;
- Vec2 m_vLocalDesiredMoveDirection;
- Vec2 m_vLocalDesiredMoveDirectionSmooth;
- Vec2 m_vLocalDesiredMoveDirectionSmoothRate;
- Vec2 m_vWorldAimBodyDirection;
-
- f32 m_udGround;
- f32 m_lrGround;
- OBB m_GroundOBB;
- Vec3 m_GroundOBBPos;
-
- // Index of camera objects.
- mutable GUID m_cameraObjectId;
- mutable AZ::EntityId m_viewEntityId;
- mutable ViewSourceType m_viewSourceType = ViewSourceType::None;
- AZ::EntityId m_viewEntityIdCachedForEditMode;
- Matrix34 m_preGameModeViewTM;
- uint m_disableRenderingCount = 0;
- bool m_bLockCameraMovement;
- bool m_bUpdateViewport = false;
- bool m_bMoveCameraObject = true;
-
- enum class KeyPressedState
- {
- AllUp,
- PressedThisFrame,
- PressedInPreviousFrame,
- };
- KeyPressedState m_pressedKeyState = KeyPressedState::AllUp;
-
- Matrix34 m_defaultViewTM;
- const QString m_defaultViewName;
-
- DisplayContext m_displayContext;
-
-
- bool m_isOnPaint = false;
- static EditorViewportWidget* m_pPrimaryViewport;
-
- QRect m_safeFrame;
- QRect m_safeAction;
- QRect m_safeTitle;
-
- CPredefinedAspectRatios m_predefinedAspectRatios;
-
- bool m_bCursorHidden = false;
-
void OnMenuResolutionCustom();
void OnMenuCreateCameraEntityFromCurrentView();
void OnMenuSelectCurrentCamera();
- int OnCreate();
- void resizeEvent(QResizeEvent* event) override;
- void paintEvent(QPaintEvent* event) override;
- void mousePressEvent(QMouseEvent* event) override;
-
// From a series of input primitives, compose a complete mouse interaction.
AzToolsFramework::ViewportInteraction::MouseInteraction BuildMouseInteractionInternal(
AzToolsFramework::ViewportInteraction::MouseButtons buttons,
AzToolsFramework::ViewportInteraction::KeyboardModifiers modifiers,
const AzToolsFramework::ViewportInteraction::MousePick& mousePick) const;
+
// Given a point in the viewport, return the pick ray into the scene.
// note: The argument passed to parameter **point**, originating
// from a Qt event, must first be passed to WidgetToViewport before being
// passed to BuildMousePick.
AzToolsFramework::ViewportInteraction::MousePick BuildMousePick(const QPoint& point);
- bool event(QEvent* event) override;
- void OnDestroy();
-
bool CheckRespondToInput() const;
- // AzFramework::InputSystemCursorConstraintRequestBus
- void* GetSystemCursorConstraintWindow() const override;
-
void BuildDragDropContext(AzQtComponents::ViewportDragContext& context, const QPoint& pt) override;
-private:
void SetAsActiveViewport();
void PushDisableRendering();
void PopDisableRendering();
@@ -547,48 +262,135 @@ private:
AzToolsFramework::ViewportInteraction::MousePick BuildMousePickInternal(const QPoint& point) const;
void RestoreViewportAfterGameMode();
- void UpdateCameraFromViewportContext();
- double WidgetToViewportFactor() const
- {
-#if defined(AZ_PLATFORM_WINDOWS)
- // Needed for high DPI mode on windows
- return devicePixelRatioF();
-#else
- return 1.0f;
-#endif
- }
-
- void BeginUndoTransaction() override;
- void EndUndoTransaction() override;
-
- void UpdateCurrentMousePos(const QPoint& newPosition);
void UpdateScene();
+ void SetDefaultCamera();
+ void SetSelectedCamera();
+ bool IsSelectedCamera() const;
+ void SetComponentCamera(const AZ::EntityId& entityId);
+ void SetEntityAsCamera(const AZ::EntityId& entityId, bool lockCameraMovement = false);
+ void SetFirstComponentCamera();
+ void PostCameraSet();
+ // This switches the active camera to the next one in the list of (default, all custom cams).
+ void CycleCamera();
+
+ AzFramework::CameraState GetCameraState();
+ AzFramework::ScreenPoint ViewportWorldToScreen(const AZ::Vector3& worldPosition);
+
+ QPoint WidgetToViewport(const QPoint& point) const;
+ QPoint ViewportToWidget(const QPoint& point) const;
+ QSize WidgetToViewport(const QSize& size) const;
+
+ const DisplayContext& GetDisplayContext() const { return m_displayContext; }
+ CBaseObject* GetCameraObject() const;
+
+ void UnProjectFromScreen(float sx, float sy, float sz, float* px, float* py, float* pz) const;
+ void ProjectToScreen(float ptx, float pty, float ptz, float* sx, float* sy, float* sz) const;
+
+ AZ::RPI::ViewPtr GetCurrentAtomView() const;
+
+ ////////////////////////////////////////////////////////////////////////
+ // Members ...
+ friend class AZ::ViewportHelpers::EditorEntityNotifications;
+
+ AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
+
+ // Singleton for the primary viewport
+ static EditorViewportWidget* m_pPrimaryViewport;
+
+ // The simulation (play-game in editor) state
+ PlayInEditorState m_playInEditorState = PlayInEditorState::Editor;
+
+ // Whether we are doing a full screen game preview (play-game in editor) or a regular one
+ bool m_inFullscreenPreview = false;
+
+ // The entity ID of the current camera for this viewport, or invalid if the default editor camera
+ AZ::EntityId m_viewEntityId;
+
+ // Determines also if the current camera for this viewport is default editor camera
+ ViewSourceType m_viewSourceType = ViewSourceType::None;
+
+ // During play game in editor, holds the editor entity ID of the last
+ AZ::EntityId m_viewEntityIdCachedForEditMode;
+
+ // The editor camera TM before switching to game mode
+ Matrix34 m_preGameModeViewTM;
+
+ // Disables rendering during some periods of time, e.g. undo/redo, resize events
+ uint m_disableRenderingCount = 0;
+
+ // Determines if the viewport needs updating (false when out of focus for example)
+ bool m_bUpdateViewport = false;
+
+ // Avoid re-entering PostCameraSet->OnActiveViewChanged->PostCameraSet
+ bool m_sendingOnActiveChanged = false;
+
+ // Legacy...
+ KeyPressedState m_pressedKeyState = KeyPressedState::AllUp;
+
+ // The last camera matrix of the default editor camera, used when switching back to editor camera to restore the right TM
+ Matrix34 m_defaultViewTM;
+
+ // The name to use for the default editor camera
+ const QString m_defaultViewName;
+
+ // Note that any attempts to draw anything with this object will crash. Exists here for legacy "reasons"
+ DisplayContext m_displayContext;
+
+ // Re-entrency guard for on paint events
+ bool m_isOnPaint = false;
+
+ // Shapes of various safe frame helpers which can be displayed in the editor
+ QRect m_safeFrame;
+ QRect m_safeAction;
+ QRect m_safeTitle;
+
+ // Aspect ratios available in the title bar
+ CPredefinedAspectRatios m_predefinedAspectRatios;
+
+ // Is the cursor hidden or displayed?
+ bool m_bCursorHidden = false;
+
+ // Shim for QtViewport, which used to be responsible for visibility queries in the editor,
+ // these are now forwarded to EntityVisibilityQuery
AzFramework::EntityVisibilityQuery m_entityVisibilityQuery;
+ // Handlers for grid snapping/editor event callbacks
SandboxEditor::GridSnappingChangedEvent::Handler m_gridSnappingHandler;
AZStd::unique_ptr m_editorViewportSettingsCallbacks;
+ // Used for some legacy logic which lets the widget release a grabbed keyboard at the right times
+ // Unclear if it's still necessary.
QSet m_keyDown;
+ // State for ViewportFreezeRequestBus, currently does nothing
bool m_freezeViewportInput = false;
+ // This widget holds a reference to the manipulator manage because its responsible for drawing manipulators
AZStd::shared_ptr m_manipulatorManager;
- // Used to prevent circular set camera events
- bool m_ignoreSetViewFromEntityPerspective = false;
- bool m_windowResizedEvent = false;
-
+ // Helper for getting EditorEntityNotificationBus events
AZStd::unique_ptr m_editorEntityNotifications;
+
+ // The widget to which Atom will actually render
AtomToolsFramework::RenderViewportWidget* m_renderViewport = nullptr;
- bool m_updateCameraPositionNextTick = false;
- AZ::RPI::ViewportContext::MatrixChangedEvent::Handler m_cameraViewMatrixChangeHandler;
- AZ::RPI::ViewportContext::MatrixChangedEvent::Handler m_cameraProjectionMatrixChangeHandler;
+ // Atom debug display
AzFramework::DebugDisplayRequests* m_debugDisplay = nullptr;
+ // The default view created for the viewport context, which is used as the "Editor Camera"
+ AZ::RPI::ViewPtr m_defaultView;
+
+ // The name to set on the viewport context when this viewport widget is set as the active one
AZ::Name m_defaultViewportContextName;
+ // DO NOT USE THIS! It exists only to satisfy the signature of the base class method GetViewTm
+ mutable Matrix34 m_viewTmStorage;
+
AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
};
+
+//! Creates a modular camera controller in the configuration used by the editor viewport.
+SANDBOX_API AZStd::shared_ptr CreateModularViewportCameraController(
+ const AzFramework::ViewportId viewportId);
diff --git a/Code/Editor/ErrorReport.cpp b/Code/Editor/ErrorReport.cpp
index e1b2b8b6e4..7914511fbe 100644
--- a/Code/Editor/ErrorReport.cpp
+++ b/Code/Editor/ErrorReport.cpp
@@ -136,11 +136,11 @@ void CErrorReport::ReportError(CErrorRecord& err)
}
else
{
- if (err.pObject == NULL && m_pObject != NULL)
+ if (err.pObject == nullptr && m_pObject != nullptr)
{
err.pObject = m_pObject;
}
- else if (err.pItem == NULL && m_pItem != NULL)
+ else if (err.pItem == nullptr && m_pItem != nullptr)
{
err.pItem = m_pItem;
}
diff --git a/Code/Editor/ErrorReport.h b/Code/Editor/ErrorReport.h
index dec5cd4fb8..2bef4105f8 100644
--- a/Code/Editor/ErrorReport.h
+++ b/Code/Editor/ErrorReport.h
@@ -105,7 +105,7 @@ public:
bool IsEmpty() const;
//! Get number of contained error records.
- int GetErrorCount() const { return m_errors.size(); };
+ int GetErrorCount() const { return static_cast(m_errors.size()); };
//! Get access to indexed error record.
CErrorRecord& GetError(int i);
//! Clear all error records.
diff --git a/Code/Editor/ErrorReportDialog.cpp b/Code/Editor/ErrorReportDialog.cpp
index 8b007207d6..2d551d6c8b 100644
--- a/Code/Editor/ErrorReportDialog.cpp
+++ b/Code/Editor/ErrorReportDialog.cpp
@@ -39,7 +39,7 @@ AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
//////////////////////////////////////////////////////////////////////////
-CErrorReportDialog* CErrorReportDialog::m_instance = 0;
+CErrorReportDialog* CErrorReportDialog::m_instance = nullptr;
// CErrorReportDialog dialog
@@ -88,12 +88,12 @@ CErrorReportDialog::CErrorReportDialog(QWidget* parent)
m_instance = this;
//CErrorReport *report,
//m_pErrorReport = report;
- m_pErrorReport = 0;
+ m_pErrorReport = nullptr;
}
CErrorReportDialog::~CErrorReportDialog()
{
- m_instance = 0;
+ m_instance = nullptr;
}
//////////////////////////////////////////////////////////////////////////
@@ -141,7 +141,7 @@ void CErrorReportDialog::Clear()
{
if (m_instance)
{
- m_instance->SetReport(0);
+ m_instance->SetReport(nullptr);
m_instance->UpdateErrors();
}
}
@@ -500,7 +500,7 @@ void CErrorReportDialog::OnReportItemDblClick(const QModelIndex& index)
{
bool bDone = false;
const CErrorRecord* pError = index.data(Qt::UserRole).value();
- if (pError && pError->pObject != NULL)
+ if (pError && pError->pObject != nullptr)
{
CUndo undo("Select Object(s)");
// Clear other selection.
@@ -563,7 +563,7 @@ void CErrorReportDialog::OnReportHyperlink(const QModelIndex& index)
{
const CErrorRecord* pError = index.data(Qt::UserRole).value();
bool bDone = false;
- if (pError && pError->pObject != NULL)
+ if (pError && pError->pObject != nullptr)
{
CUndo undo("Select Object(s)");
// Clear other selection.
@@ -593,8 +593,8 @@ void CErrorReportDialog::OnShowFieldChooser()
CMainFrm* pMainFrm = (CMainFrame*)AfxGetMainWnd();
if (pMainFrm)
{
- BOOL bShow = !pMainFrm->m_wndFieldChooser.IsVisible();
- pMainFrm->ShowControlBar(&pMainFrm->m_wndFieldChooser, bShow, FALSE);
+ bool bShow = !pMainFrm->m_wndFieldChooser.IsVisible();
+ pMainFrm->ShowControlBar(&pMainFrm->m_wndFieldChooser, bShow, false);
}
}
*/
diff --git a/Code/Editor/ErrorReportTableModel.cpp b/Code/Editor/ErrorReportTableModel.cpp
index e7a1048a09..c0c24bb7ce 100644
--- a/Code/Editor/ErrorReportTableModel.cpp
+++ b/Code/Editor/ErrorReportTableModel.cpp
@@ -105,7 +105,7 @@ void CErrorReportTableModel::setErrorReport(CErrorReport* report)
{
m_errorRecords.clear();
}
- if (report != 0)
+ if (report != nullptr)
{
const int count = report->GetErrorCount();
m_errorRecords.reserve(count);
diff --git a/Code/Editor/Export/ExportManager.cpp b/Code/Editor/Export/ExportManager.cpp
index 682dcf3980..5abd3ab5d0 100644
--- a/Code/Editor/Export/ExportManager.cpp
+++ b/Code/Editor/Export/ExportManager.cpp
@@ -22,7 +22,6 @@
#include "OBJExporter.h"
#include "OCMExporter.h"
#include "FBXExporterDialog.h"
-#include "RenderViewport.h"
#include "TrackViewExportKeyTimeDlg.h"
#include "AnimationContext.h"
#include "TrackView/DirectorNodeAnimator.h"
@@ -46,7 +45,7 @@ namespace
SEfResTexture* pTex = pRes->GetTextureResource(nSlot);
if (pTex)
{
- cry_strcat(outName, Path::GamePathToFullPath(pTex->m_Name.c_str()).toUtf8().data());
+ azstrcat(outName, AZ_ARRAY_SIZE(outName), Path::GamePathToFullPath(pTex->m_Name.c_str()).toUtf8().data());
}
}
@@ -88,7 +87,7 @@ Export::CObject::CObject(const char* pName)
nParent = -1;
- cry_strcpy(name, pName);
+ azstrcpy(name, AZ_ARRAY_SIZE(name), pName);
materialName[0] = '\0';
@@ -96,13 +95,13 @@ Export::CObject::CObject(const char* pName)
cameraTargetNodeName[0] = '\0';
- m_pLastObject = 0;
+ m_pLastObject = nullptr;
}
void Export::CObject::SetMaterialName(const char* pName)
{
- cry_strcpy(materialName, pName);
+ azstrcpy(materialName, AZ_ARRAY_SIZE(materialName), pName);
}
@@ -116,14 +115,14 @@ void Export::CData::Clear()
// CExportManager
CExportManager::CExportManager()
: m_isPrecaching(false)
- , m_pBaseObj(0)
+ , m_pBaseObj(nullptr)
, m_FBXBakedExportFPS(0.0f)
, m_fScale(100.0f)
, // this scale is used by CryEngine RC
m_bAnimationExport(false)
, m_bExportLocalCoords(false)
, m_numberOfExportFrames(0)
- , m_pivotEntityObject(0)
+ , m_pivotEntityObject(nullptr)
, m_bBakedKeysSequenceExport(true)
, m_animTimeExportPrimarySequenceCurrentTime(0.0f)
, m_animKeyTimeExport(true)
@@ -290,7 +289,7 @@ void CExportManager::ProcessEntityAnimationTrack(
const AZ::EntityId entityId, Export::CObject* pObj, AnimParamType entityTrackParamType)
{
CTrackViewAnimNode* pEntityNode = GetIEditor()->GetSequenceManager()->GetActiveAnimNode(entityId);
- CTrackViewTrack* pEntityTrack = (pEntityNode ? pEntityNode->GetTrackForParameter(entityTrackParamType) : 0);
+ CTrackViewTrack* pEntityTrack = (pEntityNode ? pEntityNode->GetTrackForParameter(entityTrackParamType) : nullptr);
if (!pEntityTrack)
{
@@ -397,7 +396,7 @@ void CExportManager::AddMesh(Export::CObject* pObj, const IIndexedMesh* pIndMesh
else
{
Export::CMesh* pMesh = new Export::CMesh();
- if (meshDesc.m_nFaceCount == 0 && meshDesc.m_nIndexCount != 0 && meshDesc.m_pIndices != 0)
+ if (meshDesc.m_nFaceCount == 0 && meshDesc.m_nIndexCount != 0 && meshDesc.m_pIndices != nullptr)
{
const vtx_idx* pIndices = &meshDesc.m_pIndices[0];
int nTris = meshDesc.m_nIndexCount / 3;
@@ -431,7 +430,7 @@ void CExportManager::AddMesh(Export::CObject* pObj, const IIndexedMesh* pIndMesh
bool CExportManager::AddStatObj(Export::CObject* pObj, IStatObj* pStatObj, Matrix34A* pTm)
{
- IIndexedMesh* pIndMesh = 0;
+ IIndexedMesh* pIndMesh = nullptr;
if (pStatObj->GetSubObjectCount())
{
@@ -440,7 +439,7 @@ bool CExportManager::AddStatObj(Export::CObject* pObj, IStatObj* pStatObj, Matri
IStatObj::SSubObject* pSubObj = pStatObj->GetSubObject(i);
if (pSubObj && pSubObj->nType == STATIC_SUB_OBJECT_MESH && pSubObj->pStatObj)
{
- pIndMesh = 0;
+ pIndMesh = nullptr;
if (m_isOccluder)
{
if (pSubObj->pStatObj->GetLodObject(2))
@@ -542,7 +541,7 @@ bool CExportManager::AddObject(CBaseObject* pBaseObj)
if (m_isPrecaching)
{
- AddMeshes(0);
+ AddMeshes(nullptr);
return true;
}
@@ -554,7 +553,7 @@ bool CExportManager::AddObject(CBaseObject* pBaseObj)
m_objectMap[pBaseObj] = int(m_data.m_objects.size() - 1);
AddMeshes(pObj);
- m_pBaseObj = 0;
+ m_pBaseObj = nullptr;
return true;
}
@@ -662,12 +661,6 @@ bool CExportManager::ProcessObjectsForExport()
GetIEditor()->GetAnimation()->SetRecording(false);
GetIEditor()->GetAnimation()->SetPlaying(false);
- CViewport* vp = GetIEditor()->GetViewManager()->GetSelectedViewport();
- if (CRenderViewport* rvp = viewport_cast(vp))
- {
- rvp->SetSequenceCamera();
- }
-
int startFrame = 0;
timeValue = startFrame * fpsTimeInterval;
@@ -678,7 +671,7 @@ bool CExportManager::ProcessObjectsForExport()
for (size_t objectID = 0; objectID < m_data.m_objects.size(); ++objectID)
{
Export::CObject* pObj2 = m_data.m_objects[objectID];
- CBaseObject* pObject = 0;
+ CBaseObject* pObject = nullptr;
if (QString::compare(pObj2->name, kPrimaryCameraName) == 0)
{
@@ -983,7 +976,7 @@ bool CExportManager::AddObjectsFromSequence(CTrackViewSequence* pSequence, XmlNo
{
if (pSubSequence && !pSubSequence->IsDisabled())
{
- XmlNodeRef subSeqNode = 0;
+ XmlNodeRef subSeqNode = nullptr;
if (!seqNode)
{
diff --git a/Code/Editor/Export/OBJExporter.cpp b/Code/Editor/Export/OBJExporter.cpp
index 893512e236..bd2696090e 100644
--- a/Code/Editor/Export/OBJExporter.cpp
+++ b/Code/Editor/Export/OBJExporter.cpp
@@ -67,7 +67,7 @@ bool COBJExporter::ExportToFile(const char* filename, const Export::IData* pExpo
while (nParent >= 0 && nParent < pExportData->GetObjectCount())
{
const Export::Object* pParentObj = pExportData->GetObject(nParent);
- assert(NULL != pParentObj);
+ assert(nullptr != pParentObj);
Vec3 pos2(pParentObj->pos.x, pParentObj->pos.y, pParentObj->pos.z);
Quat rot2(pParentObj->rot.w, pParentObj->rot.v.x, pParentObj->rot.v.y, pParentObj->rot.v.z);
diff --git a/Code/Editor/GameEngine.cpp b/Code/Editor/GameEngine.cpp
index dff6476ff9..137d14c844 100644
--- a/Code/Editor/GameEngine.cpp
+++ b/Code/Editor/GameEngine.cpp
@@ -57,12 +57,12 @@ struct SSystemUserCallback
: public ISystemUserCallback
{
SSystemUserCallback(IInitializeUIInfo* logo) : m_threadErrorHandler(this) { m_pLogo = logo; };
- virtual void OnSystemConnect(ISystem* pSystem)
+ void OnSystemConnect(ISystem* pSystem) override
{
ModuleInitISystem(pSystem, "Editor");
}
- virtual bool OnError(const char* szErrorString)
+ bool OnError(const char* szErrorString) override
{
// since we show a message box, we have to use the GUI thread
if (QThread::currentThread() != qApp->thread())
@@ -95,7 +95,7 @@ struct SSystemUserCallback
int res = IDNO;
- ICVar* pCVar = gEnv->pConsole ? gEnv->pConsole->GetCVar("sys_no_crash_dialog") : NULL;
+ ICVar* pCVar = gEnv->pConsole ? gEnv->pConsole->GetCVar("sys_no_crash_dialog") : nullptr;
if (!pCVar || pCVar->GetIVal() == 0)
{
@@ -116,7 +116,7 @@ struct SSystemUserCallback
return true;
}
- virtual bool OnSaveDocument()
+ bool OnSaveDocument() override
{
bool success = false;
@@ -133,7 +133,7 @@ struct SSystemUserCallback
return success;
}
- virtual bool OnBackupDocument()
+ bool OnBackupDocument() override
{
CCryEditDoc* level = GetIEditor() ? GetIEditor()->GetDocument() : nullptr;
if (level)
@@ -144,7 +144,7 @@ struct SSystemUserCallback
return false;
}
- virtual void OnProcessSwitch()
+ void OnProcessSwitch() override
{
if (GetIEditor()->IsInGameMode())
{
@@ -152,7 +152,7 @@ struct SSystemUserCallback
}
}
- virtual void OnInitProgress(const char* sProgressMsg)
+ void OnInitProgress(const char* sProgressMsg) override
{
if (m_pLogo)
{
@@ -160,7 +160,7 @@ struct SSystemUserCallback
}
}
- virtual int ShowMessage(const char* text, const char* caption, unsigned int uType)
+ int ShowMessage(const char* text, const char* caption, unsigned int uType) override
{
if (CCryEditApp::instance()->IsInAutotestMode())
{
@@ -176,7 +176,7 @@ struct SSystemUserCallback
return CryMessageBox(text, caption, uType);
}
- virtual void GetMemoryUsage(ICrySizer* pSizer)
+ void GetMemoryUsage(ICrySizer* pSizer) override
{
GetIEditor()->GetMemoryUsage(pSizer);
}
@@ -215,7 +215,7 @@ public:
{
AzFramework::AssetSystemConnectionNotificationsBus::Handler::BusConnect();
};
- ~AssetProcessConnectionStatus()
+ ~AssetProcessConnectionStatus() override
{
AzFramework::AssetSystemConnectionNotificationsBus::Handler::BusDisconnect();
}
@@ -247,18 +247,18 @@ private:
AZ_PUSH_DISABLE_WARNING(4273, "-Wunknown-warning-option")
CGameEngine::CGameEngine()
- : m_gameDll(0)
+ : m_gameDll(nullptr)
, m_bIgnoreUpdates(false)
, m_ePendingGameMode(ePGM_NotPending)
, m_modalWindowDismisser(nullptr)
AZ_POP_DISABLE_WARNING
{
- m_pISystem = NULL;
+ m_pISystem = nullptr;
m_bLevelLoaded = false;
m_bInGameMode = false;
m_bSimulationMode = false;
m_bSyncPlayerPosition = true;
- m_hSystemHandle = 0;
+ m_hSystemHandle = nullptr;
m_bJustCreated = false;
m_levelName = "Untitled";
m_levelExtension = EditorUtils::LevelFile::GetDefaultFileExtension();
@@ -271,7 +271,7 @@ CGameEngine::~CGameEngine()
{
AZ_POP_DISABLE_WARNING
GetIEditor()->UnregisterNotifyListener(this);
- m_pISystem->GetIMovieSystem()->SetCallback(NULL);
+ m_pISystem->GetIMovieSystem()->SetCallback(nullptr);
if (m_gameDll)
{
@@ -279,7 +279,7 @@ AZ_POP_DISABLE_WARNING
}
delete m_pISystem;
- m_pISystem = NULL;
+ m_pISystem = nullptr;
if (m_hSystemHandle)
{
@@ -566,14 +566,12 @@ void CGameEngine::SwitchToInGame()
streamer->QueueRequest(flush);
wait.acquire();
}
-
+
GetIEditor()->Notify(eNotify_OnBeginGameMode);
m_pISystem->GetIMovieSystem()->EnablePhysicsEvents(true);
m_bInGameMode = true;
- gEnv->pSystem->GetViewCamera().SetMatrix(m_playerViewTM);
-
// Disable accelerators.
GetIEditor()->EnableAcceleratos(false);
//! Send event to switch into game.
@@ -627,13 +625,6 @@ void CGameEngine::SwitchToInEditor()
m_bInGameMode = false;
- // save the current gameView matrix for editor
- if (pGameViewport)
- {
- Matrix34 gameView = gEnv->pSystem->GetViewCamera().GetMatrix();
- pGameViewport->SetGameTM(gameView);
- }
-
// Out of game in Editor mode.
if (pGameViewport)
{
@@ -875,7 +866,7 @@ void CGameEngine::OnEditorNotifyEvent(EEditorNotifyEvent event)
{
case eNotify_OnSplashScreenDestroyed:
{
- if (m_pSystemUserCallback != NULL)
+ if (m_pSystemUserCallback != nullptr)
{
m_pSystemUserCallback->OnSplashScreenDone();
}
diff --git a/Code/Editor/GameEngine.h b/Code/Editor/GameEngine.h
index 84df8bf002..4d183cc38e 100644
--- a/Code/Editor/GameEngine.h
+++ b/Code/Editor/GameEngine.h
@@ -116,11 +116,11 @@ public:
//! mutex used by other threads to lock up the PAK modification,
//! so only one thread can modify the PAK at once
- static CryMutex& GetPakModifyMutex()
+ static AZStd::recursive_mutex& GetPakModifyMutex()
{
//! mutex used to halt copy process while the export to game
//! or other pak operation is done in the main thread
- static CryMutex s_pakModifyMutex;
+ static AZStd::recursive_mutex s_pakModifyMutex;
return s_pakModifyMutex;
}
diff --git a/Code/Editor/GameExporter.cpp b/Code/Editor/GameExporter.cpp
index 006eb9189c..415103e10d 100644
--- a/Code/Editor/GameExporter.cpp
+++ b/Code/Editor/GameExporter.cpp
@@ -63,7 +63,7 @@ void SGameExporterSettings::SetHiQuality()
nApplySS = 1;
}
-CGameExporter* CGameExporter::m_pCurrentExporter = NULL;
+CGameExporter* CGameExporter::m_pCurrentExporter = nullptr;
//////////////////////////////////////////////////////////////////////////
// CGameExporter
@@ -76,7 +76,7 @@ CGameExporter::CGameExporter()
CGameExporter::~CGameExporter()
{
- m_pCurrentExporter = NULL;
+ m_pCurrentExporter = nullptr;
}
//////////////////////////////////////////////////////////////////////////
@@ -136,7 +136,7 @@ bool CGameExporter::Export(unsigned int flags, [[maybe_unused]] EEndian eExportE
m_settings.SetHiQuality();
}
- CryAutoLock autoLock(CGameEngine::GetPakModifyMutex());
+ AZStd::scoped_lock autoLock(CGameEngine::GetPakModifyMutex());
// Close this pak file.
if (!CloseLevelPack(m_levelPak, true))
@@ -378,14 +378,14 @@ void CGameExporter::ExportFileList(const QString& path, const QString& levelName
{
// process the folder of the specified map name, producing a filelist.xml file
// that can later be used for map downloads
- string newpath;
+ AZStd::string newpath;
- QString filename = levelName;
- string mapname = (filename + ".dds").toUtf8().data();
- string metaname = (filename + ".xml").toUtf8().data();
+ AZStd::string filename = levelName.toUtf8().data();
+ AZStd::string mapname = (filename + ".dds");
+ AZStd::string metaname = (filename + ".xml");
XmlNodeRef rootNode = gEnv->pSystem->CreateXmlNode("download");
- rootNode->setAttr("name", filename.toUtf8().data());
+ rootNode->setAttr("name", filename.c_str());
rootNode->setAttr("type", "Map");
XmlNodeRef indexNode = rootNode->newChild("index");
if (indexNode)
@@ -434,9 +434,9 @@ void CGameExporter::ExportFileList(const QString& path, const QString& levelName
newFileNode->setAttr("size", handle.m_fileDesc.nSize);
unsigned char md5[16];
- string filenameToHash = GetIEditor()->GetGameEngine()->GetLevelPath().toUtf8().data();
+ AZStd::string filenameToHash = GetIEditor()->GetGameEngine()->GetLevelPath().toUtf8().data();
filenameToHash += "/";
- filenameToHash += string{ handle.m_filename.data(), handle.m_filename.size() };
+ filenameToHash += AZStd::string{ handle.m_filename.data(), handle.m_filename.size() };
if (gEnv->pCryPak->ComputeMD5(filenameToHash.data(), md5))
{
char md5string[33];
diff --git a/Code/Editor/GenericSelectItemDialog.cpp b/Code/Editor/GenericSelectItemDialog.cpp
index ef109336ef..06f66c52eb 100644
--- a/Code/Editor/GenericSelectItemDialog.cpp
+++ b/Code/Editor/GenericSelectItemDialog.cpp
@@ -17,7 +17,7 @@ AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
// CGenericSelectItemDialog dialog
-CGenericSelectItemDialog::CGenericSelectItemDialog(QWidget* pParent /*=NULL*/)
+CGenericSelectItemDialog::CGenericSelectItemDialog(QWidget* pParent /*=nullptr*/)
: QDialog(pParent)
, ui(new Ui::CGenericSelectItemDialog)
, m_initialized(false)
@@ -91,20 +91,6 @@ void CGenericSelectItemDialog::ReloadTree()
QTreeWidgetItem* hSelected = nullptr;
- /*
- std::vector::const_iterator iter = m_items.begin();
- while (iter != m_items.end())
- {
- const CString& itemName = *iter;
- HTREEITEM hItem = m_tree.InsertItem(itemName, 0, 0, TVI_ROOT, TVI_SORT);
- if (!m_preselect.IsEmpty() && m_preselect.CompareNoCase(itemName) == 0)
- {
- hSelected = hItem;
- }
- ++iter;
- }
- */
-
std::map items;
QRegularExpression sep(QStringLiteral("[\\/.") + m_treeSeparator + QStringLiteral("]+"));
diff --git a/Code/Editor/Geometry/TriMesh.cpp b/Code/Editor/Geometry/TriMesh.cpp
index fe755ca6c3..737886cabc 100644
--- a/Code/Editor/Geometry/TriMesh.cpp
+++ b/Code/Editor/Geometry/TriMesh.cpp
@@ -19,13 +19,13 @@
//////////////////////////////////////////////////////////////////////////
CTriMesh::CTriMesh()
{
- pFaces = NULL;
- pVertices = NULL;
- pWSVertices = NULL;
- pUV = NULL;
- pColors = NULL;
- pEdges = NULL;
- pWeights = NULL;
+ pFaces = nullptr;
+ pVertices = nullptr;
+ pWSVertices = nullptr;
+ pUV = nullptr;
+ pColors = nullptr;
+ pEdges = nullptr;
+ pWeights = nullptr;
nFacesCount = 0;
nVertCount = 0;
@@ -67,7 +67,7 @@ void CTriMesh::ReallocStream(int stream, int nNewCount)
{
return; // Stream already have required size.
}
- void* pStream = 0;
+ void* pStream = nullptr;
int nElementSize = 0;
GetStreamInfo(stream, pStream, nElementSize);
pStream = ReAllocElements(pStream, nNewCount, nElementSize);
@@ -256,7 +256,7 @@ void CTriMesh::SharePositions()
std::vector arrHashTable[256];
CTriVertex* pNewVerts = new CTriVertex[GetVertexCount()];
- SMeshColor* pNewColors = 0;
+ SMeshColor* pNewColors = nullptr;
if (pColors)
{
pNewColors = new SMeshColor[GetVertexCount()];
@@ -433,8 +433,8 @@ void CTriMesh::UpdateIndexedMesh(IIndexedMesh* pIndexedMesh) const
//////////////////////////////////////////////////////////////////////////
void CTriMesh::CopyStream(CTriMesh& fromMesh, int stream)
{
- void* pTrgStream = 0;
- void* pSrcStream = 0;
+ void* pTrgStream = nullptr;
+ void* pSrcStream = nullptr;
int nElemSize = 0;
fromMesh.GetStreamInfo(stream, pSrcStream, nElemSize);
if (pSrcStream)
diff --git a/Code/Editor/GotoPositionDlg.cpp b/Code/Editor/GotoPositionDlg.cpp
index c1e64ed1a9..aec5f03fbd 100644
--- a/Code/Editor/GotoPositionDlg.cpp
+++ b/Code/Editor/GotoPositionDlg.cpp
@@ -108,24 +108,12 @@ void GotoPositionDialog::OnUpdateNumbers()
void GotoPositionDialog::accept()
{
- if (SandboxEditor::UsingNewCameraSystem())
- {
- SandboxEditor::InterpolateDefaultViewportCameraToTransform(
- AZ::Vector3(
- aznumeric_cast(m_ui->m_dymX->value()), aznumeric_cast(m_ui->m_dymY->value()),
- aznumeric_cast(m_ui->m_dymZ->value())),
- AZ::DegToRad(aznumeric_cast(m_ui->m_dymAnglePitch->value())),
- AZ::DegToRad(aznumeric_cast(m_ui->m_dymAngleYaw->value())));
- }
- else
- {
- SandboxEditor::SetDefaultViewportCameraPosition(AZ::Vector3(
+ SandboxEditor::InterpolateDefaultViewportCameraToTransform(
+ AZ::Vector3(
aznumeric_cast(m_ui->m_dymX->value()), aznumeric_cast(m_ui->m_dymY->value()),
- aznumeric_cast(m_ui->m_dymZ->value())));
- SandboxEditor::SetDefaultViewportCameraRotation(
- AZ::DegToRad(aznumeric_cast(m_ui->m_dymAnglePitch->value())),
- AZ::DegToRad(aznumeric_cast(m_ui->m_dymAngleYaw->value())));
- }
+ aznumeric_cast(m_ui->m_dymZ->value())),
+ AZ::DegToRad(aznumeric_cast(m_ui->m_dymAnglePitch->value())),
+ AZ::DegToRad(aznumeric_cast(m_ui->m_dymAngleYaw->value())));
QDialog::accept();
}
diff --git a/Code/Editor/IEditor.h b/Code/Editor/IEditor.h
index a56c8e81e9..7d0fc653fa 100644
--- a/Code/Editor/IEditor.h
+++ b/Code/Editor/IEditor.h
@@ -68,7 +68,6 @@ class CDisplaySettings;
struct SGizmoParameters;
class CLevelIndependentFileMan;
class CSelectionTreeManager;
-struct IResourceSelectorHost;
struct SEditorSettings;
class CGameExporter;
class IAWSResourceManager;
@@ -570,7 +569,7 @@ struct IEditor
//////////////////////////////////////////////////////////////////////////
virtual class CLevelIndependentFileMan* GetLevelIndependentFileMan() = 0;
//! Notify all views that data is changed.
- virtual void UpdateViews(int flags = 0xFFFFFFFF, const AABB* updateRegion = NULL) = 0;
+ virtual void UpdateViews(int flags = 0xFFFFFFFF, const AABB* updateRegion = nullptr) = 0;
virtual void ResetViews() = 0;
//! Update information in track view dialog.
virtual void ReloadTrackView() = 0;
@@ -589,7 +588,7 @@ struct IEditor
//! if bShow is true also returns a valid ITransformManipulator pointer.
virtual ITransformManipulator* ShowTransformManipulator(bool bShow) = 0;
//! Return a pointer to a ITransformManipulator pointer if shown.
- //! NULL is manipulator is not shown.
+ //! nullptr if manipulator is not shown.
virtual ITransformManipulator* GetTransformManipulator() = 0;
//! Set constrain on specified axis for objects construction and modifications.
//! @param axis one of AxisConstrains enumerations.
@@ -714,7 +713,6 @@ struct IEditor
virtual ESystemConfigSpec GetEditorConfigSpec() const = 0;
virtual ESystemConfigPlatform GetEditorConfigPlatform() const = 0;
virtual void ReloadTemplates() = 0;
- virtual IResourceSelectorHost* GetResourceSelectorHost() = 0;
virtual void ShowStatusText(bool bEnable) = 0;
// Provides a way to extend the context menu of an object. The function gets called every time the menu is opened.
diff --git a/Code/Editor/IEditorImpl.cpp b/Code/Editor/IEditorImpl.cpp
index c09c0a8e62..1e268d64ef 100644
--- a/Code/Editor/IEditorImpl.cpp
+++ b/Code/Editor/IEditorImpl.cpp
@@ -26,6 +26,7 @@ AZ_POP_DISABLE_WARNING
#include
#include
#include
+#include
// AzFramework
#include
@@ -66,7 +67,6 @@ AZ_POP_DISABLE_WARNING
#include "EditorFileMonitor.h"
#include "MainStatusBar.h"
-#include "ResourceSelectorHost.h"
#include "Util/FileUtil_impl.h"
#include "Util/ImageUtil_impl.h"
#include "LogFileImpl.h"
@@ -186,7 +186,6 @@ CEditorImpl::CEditorImpl()
m_pAnimationContext = new CAnimationContext;
m_pImageUtil = new CImageUtil_impl();
- m_pResourceSelectorHost.reset(CreateResourceSelectorHost());
m_selectedRegion.min = Vec3(0, 0, 0);
m_selectedRegion.max = Vec3(0, 0, 0);
DetectVersion();
@@ -251,7 +250,7 @@ void CEditorImpl::Uninitialize()
void CEditorImpl::UnloadPlugins()
{
- CryAutoLock lock(m_pluginMutex);
+ AZStd::scoped_lock lock(m_pluginMutex);
// Flush core buses. We're about to unload DLLs and need to ensure we don't have module-owned functions left behind.
AZ::Data::AssetBus::ExecuteQueuedEvents();
@@ -272,7 +271,7 @@ void CEditorImpl::UnloadPlugins()
void CEditorImpl::LoadPlugins()
{
- CryAutoLock lock(m_pluginMutex);
+ AZStd::scoped_lock lock(m_pluginMutex);
static const QString editor_plugins_folder("EditorPlugins");
@@ -415,7 +414,7 @@ void CEditorImpl::Update()
}
if (IsInPreviewMode())
{
- SetModifiedFlag(FALSE);
+ SetModifiedFlag(false);
SetModifiedModule(eModifiedNothing);
}
@@ -550,7 +549,7 @@ QString CEditorImpl::GetResolvedUserFolder()
void CEditorImpl::SetDataModified()
{
- GetDocument()->SetModifiedFlag(TRUE);
+ GetDocument()->SetModifiedFlag(true);
}
void CEditorImpl::SetStatusText(const QString& pszString)
@@ -597,9 +596,9 @@ ITransformManipulator* CEditorImpl::ShowTransformManipulator(bool bShow)
GetObjectManager()->GetGizmoManager()->RemoveGizmo(m_pAxisGizmo);
m_pAxisGizmo->Release();
}
- m_pAxisGizmo = 0;
+ m_pAxisGizmo = nullptr;
}
- return 0;
+ return nullptr;
}
ITransformManipulator* CEditorImpl::GetTransformManipulator()
@@ -614,7 +613,7 @@ void CEditorImpl::SetAxisConstraints(AxisConstrains axisFlags)
SetTerrainAxisIgnoreObjects(false);
// Update all views.
- UpdateViews(eUpdateObjects, NULL);
+ UpdateViews(eUpdateObjects, nullptr);
}
AxisConstrains CEditorImpl::GetAxisConstrains()
@@ -637,15 +636,15 @@ void CEditorImpl::SetReferenceCoordSys(RefCoordSys refCoords)
m_refCoordsSys = refCoords;
// Update all views.
- UpdateViews(eUpdateObjects, NULL);
+ UpdateViews(eUpdateObjects, nullptr);
// Update the construction plane infos.
CViewport* pViewport = GetActiveView();
if (pViewport)
{
//Pre and Post widget rendering calls are made here to make sure that the proper camera state is set.
- //MakeConstructionPlane will make a call to ViewToWorldRay which needs the correct camera state
- //in the CRenderViewport to be set.
+ //MakeConstructionPlane will make a call to ViewToWorldRay which needs the correct camera state
+ //in the CRenderViewport to be set.
pViewport->PreWidgetRendering();
pViewport->MakeConstructionPlane(GetIEditor()->GetAxisConstrains());
@@ -671,7 +670,7 @@ CBaseObject* CEditorImpl::NewObject(const char* typeName, const char* fileName,
editor->SetModifiedFlag();
editor->SetModifiedModule(eModifiedBrushes);
}
- CBaseObject* object = editor->GetObjectManager()->NewObject(typeName, 0, fileName, name);
+ CBaseObject* object = editor->GetObjectManager()->NewObject(typeName, nullptr, fileName, name);
if (!object)
{
return nullptr;
@@ -932,7 +931,7 @@ void CEditorImpl::CloseView(const GUID& classId)
IDataBaseManager* CEditorImpl::GetDBItemManager([[maybe_unused]] EDataBaseItemType itemType)
{
- return 0;
+ return nullptr;
}
bool CEditorImpl::SelectColor(QColor& color, QWidget* parent)
@@ -1107,16 +1106,18 @@ void CEditorImpl::DetectVersion()
DWORD dwHandle;
UINT len;
- char ver[1024 * 8];
+ wchar_t ver[1024 * 8];
- GetModuleFileName(NULL, exe, _MAX_PATH);
+ AZ::Utils::GetExecutablePath(exe, _MAX_PATH);
+ AZStd::wstring exeW;
+ AZStd::to_wstring(exeW, exe);
- int verSize = GetFileVersionInfoSize(exe, &dwHandle);
+ int verSize = GetFileVersionInfoSizeW(exeW.c_str(), &dwHandle);
if (verSize > 0)
{
- GetFileVersionInfo(exe, dwHandle, 1024 * 8, ver);
+ GetFileVersionInfoW(exeW.c_str(), dwHandle, 1024 * 8, ver);
VS_FIXEDFILEINFO* vinfo;
- VerQueryValue(ver, "\\", (void**)&vinfo, &len);
+ VerQueryValueW(ver, L"\\", (void**)&vinfo, &len);
m_fileVersion.v[0] = vinfo->dwFileVersionLS & 0xFFFF;
m_fileVersion.v[1] = vinfo->dwFileVersionLS >> 16;
@@ -1431,7 +1432,7 @@ void CEditorImpl::NotifyExcept(EEditorNotifyEvent event, IEditorNotifyListener*
{
m_pAxisGizmo->Release();
}
- m_pAxisGizmo = 0;
+ m_pAxisGizmo = nullptr;
}
if (event == eNotify_OnInit)
@@ -1457,7 +1458,7 @@ void CEditorImpl::UnregisterNotifyListener(IEditorNotifyListener* listener)
ISourceControl* CEditorImpl::GetSourceControl()
{
- CryAutoLock lock(m_pluginMutex);
+ AZStd::scoped_lock lock(m_pluginMutex);
if (m_pSourceControl)
{
@@ -1472,7 +1473,7 @@ ISourceControl* CEditorImpl::GetSourceControl()
for (int i = 0; i < classes.size(); i++)
{
IClassDesc* pClass = classes[i];
- ISourceControl* pSCM = NULL;
+ ISourceControl* pSCM = nullptr;
HRESULT hRes = pClass->QueryInterface(__uuidof(ISourceControl), (void**)&pSCM);
if (!FAILED(hRes) && pSCM)
{
@@ -1482,7 +1483,7 @@ ISourceControl* CEditorImpl::GetSourceControl()
}
}
- return 0;
+ return nullptr;
}
bool CEditorImpl::IsSourceControlAvailable()
@@ -1557,31 +1558,31 @@ IExportManager* CEditorImpl::GetExportManager()
void CEditorImpl::AddUIEnums()
{
// Spec settings for shadow casting lights
- string SpecString[4];
+ AZStd::string SpecString[4];
QStringList types;
types.push_back("Never=0");
- SpecString[0].Format("VeryHigh Spec=%d", CONFIG_VERYHIGH_SPEC);
+ SpecString[0] = AZStd::string::format("VeryHigh Spec=%d", CONFIG_VERYHIGH_SPEC);
types.push_back(SpecString[0].c_str());
- SpecString[1].Format("High Spec=%d", CONFIG_HIGH_SPEC);
+ SpecString[1] = AZStd::string::format("High Spec=%d", CONFIG_HIGH_SPEC);
types.push_back(SpecString[1].c_str());
- SpecString[2].Format("Medium Spec=%d", CONFIG_MEDIUM_SPEC);
+ SpecString[2] = AZStd::string::format("Medium Spec=%d", CONFIG_MEDIUM_SPEC);
types.push_back(SpecString[2].c_str());
- SpecString[3].Format("Low Spec=%d", CONFIG_LOW_SPEC);
+ SpecString[3] = AZStd::string::format("Low Spec=%d", CONFIG_LOW_SPEC);
types.push_back(SpecString[3].c_str());
m_pUIEnumsDatabase->SetEnumStrings("CastShadows", types);
// Power-of-two percentages
- string percentStringPOT[5];
+ AZStd::string percentStringPOT[5];
types.clear();
- percentStringPOT[0].Format("Default=%d", 0);
+ percentStringPOT[0] = AZStd::string::format("Default=%d", 0);
types.push_back(percentStringPOT[0].c_str());
- percentStringPOT[1].Format("12.5=%d", 1);
+ percentStringPOT[1] = AZStd::string::format("12.5=%d", 1);
types.push_back(percentStringPOT[1].c_str());
- percentStringPOT[2].Format("25=%d", 2);
+ percentStringPOT[2] = AZStd::string::format("25=%d", 2);
types.push_back(percentStringPOT[2].c_str());
- percentStringPOT[3].Format("50=%d", 3);
+ percentStringPOT[3] = AZStd::string::format("50=%d", 3);
types.push_back(percentStringPOT[3].c_str());
- percentStringPOT[4].Format("100=%d", 4);
+ percentStringPOT[4] = AZStd::string::format("100=%d", 4);
types.push_back(percentStringPOT[4].c_str());
m_pUIEnumsDatabase->SetEnumStrings("ShadowMinResPercent", types);
}
diff --git a/Code/Editor/IEditorImpl.h b/Code/Editor/IEditorImpl.h
index 65389a212e..2cf6c7805b 100644
--- a/Code/Editor/IEditorImpl.h
+++ b/Code/Editor/IEditorImpl.h
@@ -22,7 +22,7 @@
#include