From 842272a9e39f8326a99b650a37441d56db9d2aee Mon Sep 17 00:00:00 2001 From: Pip Potter Date: Wed, 9 Jun 2021 22:50:44 -0700 Subject: [PATCH 01/16] LYN-4175: Improve security of s3 bucket example --- .../cdk/example/example_resources_stack.py | 58 +++++++++++-------- 1 file changed, 33 insertions(+), 25 deletions(-) diff --git a/Gems/AWSCore/cdk/example/example_resources_stack.py b/Gems/AWSCore/cdk/example/example_resources_stack.py index 42afdd6d9e..7fa48160de 100755 --- a/Gems/AWSCore/cdk/example/example_resources_stack.py +++ b/Gems/AWSCore/cdk/example/example_resources_stack.py @@ -11,10 +11,10 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. import os from aws_cdk import ( - aws_lambda as _lambda, - aws_s3 as _s3, + aws_lambda as lambda_, + aws_s3 as s3, aws_s3_deployment as s3_deployment, - aws_dynamodb as _dynamo, + aws_dynamodb as dynamo, core ) @@ -39,7 +39,7 @@ class ExampleResources(core.Stack): self._feature_name = feature_name self._policy = AuthPolicy(context=self).generate_admin_policy(stack=self) - self._s3 = self.__create_s3_bucket() + self._s3_bucket = self.__create_s3_bucket() self._lambda = self.__create_example_lambda() self._table = self.__create_dynamodb_table() @@ -49,8 +49,8 @@ class ExampleResources(core.Stack): self.__grant_access(props=props_) def __grant_access(self, props: CoreStackProperties): - self._s3.grant_read(props.user_group) - self._s3.grant_read(props.admin_group) + self._s3_bucket.grant_read(props.user_group) + self._s3_bucket.grant_read(props.admin_group) self._lambda.grant_invoke(props.user_group) self._lambda.grant_invoke(props.admin_group) @@ -58,42 +58,50 @@ class ExampleResources(core.Stack): self._table.grant_read_data(props.user_group) self._table.grant_read_data(props.admin_group) - def __create_s3_bucket(self) -> _s3.Bucket: - # create s3 bucket - - # create s3 bucket - s3 = _s3.Bucket(self, f'{self._project_name}-{self._feature_name}-Example-S3bucket') + def __create_s3_bucket(self) -> s3.Bucket: + # Create a sample S3 bucket following S3 best practices + # # See https://docs.aws.amazon.com/AmazonS3/latest/dev/security-best-practices.html + # 1. Block all public access to the bucket + # 2. Use SSE-S3 encryption. Explore encryption at rest options via + # https://docs.aws.amazon.com/AmazonS3/latest/userguide/serv-side-encryption.html + example_bucket = s3.Bucket( + self, + f'{self._project_name}-{self._feature_name}-Example-S3bucket', + block_public_access=s3.BlockPublicAccess.BLOCK_ALL, + encryption=s3.BucketEncryption.S3_MANAGED + ) s3_deployment.BucketDeployment( self, f'{self._project_name}-{self._feature_name}-S3bucket-Deployment', - destination_bucket=s3, + destination_bucket=example_bucket, sources=[ s3_deployment.Source.asset('example/s3_content') ], retain_on_delete=False ) + return example_bucket - return s3 - - def __create_example_lambda(self) -> _lambda.Function: + def __create_example_lambda(self) -> lambda_.Function: # create lambda function - function = _lambda.Function(self, - f'{self._project_name}-{self._feature_name}-Lambda-Function', - runtime=_lambda.Runtime.PYTHON_3_8, - handler="lambda-handler.main", - code=_lambda.Code.asset(os.path.join(os.path.dirname(__file__), 'lambda'))) + function = lambda_.Function( + self, + f'{self._project_name}-{self._feature_name}-Lambda-Function', + runtime=lambda_.Runtime.PYTHON_3_8, + handler="lambda-handler.main", + code=lambda_.Code.asset(os.path.join(os.path.dirname(__file__), 'lambda')) + ) return function - def __create_dynamodb_table(self) -> _dynamo.Table: + def __create_dynamodb_table(self) -> dynamo.Table: # create dynamo table # NB: CDK does not support seeding data, see simple table_seeder.py - demo_table = _dynamo.Table( + demo_table = dynamo.Table( self, f'{self._project_name}-{self._feature_name}-Table', - partition_key=_dynamo.Attribute( + partition_key=dynamo.Attribute( name="id", - type=_dynamo.AttributeType.STRING + type=dynamo.AttributeType.STRING ) ) return demo_table @@ -106,7 +114,7 @@ class ExampleResources(core.Stack): id=f'ExampleBucketOutput', description='An example S3 bucket to use with AWSCore ScriptBehaviors', export_name=f"ExampleS3Bucket", - value=self._s3.bucket_arn) + value=self._s3_bucket.bucket_arn) # Define exports # Export resource group From 609752b79e6f9a9253fcb23776c73e147c4c7ad5 Mon Sep 17 00:00:00 2001 From: Peng Date: Thu, 17 Jun 2021 14:55:13 -0700 Subject: [PATCH 02/16] ATOM-15808 [RHI][Vulkan] Take out the early memory check exit to let the developers decide what to do if device memory is less than the requirement. JIRA: https://jira.agscollab.com/browse/ATOM-15808 --- Gems/Atom/RHI/Vulkan/Code/Source/RHI/PhysicalDevice.cpp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/PhysicalDevice.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/PhysicalDevice.cpp index e3367b078a..694eac2da4 100644 --- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/PhysicalDevice.cpp +++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/PhysicalDevice.cpp @@ -64,10 +64,7 @@ namespace AZ physicalDevice->Init(device); size_t gpuMemSize = physicalDevice->GetDescriptor().m_heapSizePerLevel[static_cast(RHI::HeapMemoryLevel::Device)]; AZ_Warning("Vulkan", gpuMemSize >= MinGPUMemSize, "Rejecting GPU %s as it's gpu mem size of %zu bytes is less than min required size of %zu bytes for Vulkan API", physicalDevice->GetDescriptor().m_description.c_str(), gpuMemSize, MinGPUMemSize); - if (gpuMemSize >= MinGPUMemSize) - { - physicalDeviceList.emplace_back(physicalDevice); - } + physicalDeviceList.emplace_back(physicalDevice); } return physicalDeviceList; From 8fb0007201215b7bfefd67e76c4119dc405f7675 Mon Sep 17 00:00:00 2001 From: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com> Date: Thu, 17 Jun 2021 15:12:14 -0700 Subject: [PATCH 03/16] Remove Prefab System toggle from the Editor Preferences dialog. (#1415) --- .../Editor/EditorPreferencesPageGeneral.cpp | 22 ++----------------- .../Editor/EditorPreferencesPageGeneral.h | 4 ---- 2 files changed, 2 insertions(+), 24 deletions(-) diff --git a/Code/Sandbox/Editor/EditorPreferencesPageGeneral.cpp b/Code/Sandbox/Editor/EditorPreferencesPageGeneral.cpp index a7420b79a4..d62ca741ce 100644 --- a/Code/Sandbox/Editor/EditorPreferencesPageGeneral.cpp +++ b/Code/Sandbox/Editor/EditorPreferencesPageGeneral.cpp @@ -28,8 +28,6 @@ #define EDITORPREFS_EVENTVALTOGGLE "operation" #define UNDOSLICESAVE_VALON "UndoSliceSaveValueOn" #define UNDOSLICESAVE_VALOFF "UndoSliceSaveValueOff" -#define EDITORUI10_ENABLED "EditorUI10On" -#define EDITORUI10_DISABLED "EditorUI10Off" void CEditorPreferencesPage_General::Reflect(AZ::SerializeContext& serialize) { @@ -45,8 +43,7 @@ void CEditorPreferencesPage_General::Reflect(AZ::SerializeContext& serialize) ->Field("StylusMode", &GeneralSettings::m_stylusMode) ->Field("ShowNews", &GeneralSettings::m_bShowNews) ->Field("EnableSceneInspector", &GeneralSettings::m_enableSceneInspector) - ->Field("RestoreViewportCamera", &GeneralSettings::m_restoreViewportCamera) - ->Field("PrefabSystem", &GeneralSettings::m_enablePrefabSystem); + ->Field("RestoreViewportCamera", &GeneralSettings::m_restoreViewportCamera); serialize.Class() ->Version(2) @@ -94,8 +91,7 @@ void CEditorPreferencesPage_General::Reflect(AZ::SerializeContext& serialize) ->EnumAttribute(AzQtComponents::ToolBar::ToolBarIconSize::IconLarge, "Large") ->DataElement(AZ::Edit::UIHandlers::CheckBox, &GeneralSettings::m_stylusMode, "Stylus Mode", "Stylus Mode for tablets and other pointing devices") ->DataElement(AZ::Edit::UIHandlers::CheckBox, &GeneralSettings::m_restoreViewportCamera, EditorPreferencesGeneralRestoreViewportCameraSettingName, "Keep the original editor viewport transform when exiting game mode.") - ->DataElement(AZ::Edit::UIHandlers::CheckBox, &GeneralSettings::m_enableSceneInspector, "Enable Scene Inspector (EXPERIMENTAL)", "Enable the option to inspect the internal data loaded from scene files like .fbx. This is an experimental feature. Restart the Scene Settings if the option is not visible under the Help menu.") - ->DataElement(AZ::Edit::UIHandlers::CheckBox, &GeneralSettings::m_enablePrefabSystem, "Enable Prefab System (EXPERIMENTAL)", "Enable this option to preview Open 3D Engine's new prefab system. Enabling this setting removes slice support for level entities; you will need to restart the Editor for the change to take effect."); + ->DataElement(AZ::Edit::UIHandlers::CheckBox, &GeneralSettings::m_enableSceneInspector, "Enable Scene Inspector (EXPERIMENTAL)", "Enable the option to inspect the internal data loaded from scene files like .fbx. This is an experimental feature. Restart the Scene Settings if the option is not visible under the Help menu."); editContext->Class("Messaging", "") ->DataElement(AZ::Edit::UIHandlers::CheckBox, &Messaging::m_showDashboard, "Show Welcome to Open 3D Engine at startup", "Show Welcome to Open 3D Engine at startup") @@ -159,8 +155,6 @@ void CEditorPreferencesPage_General::OnApply() gSettings.restoreViewportCamera = m_generalSettings.m_restoreViewportCamera; gSettings.enableSceneInspector = m_generalSettings.m_enableSceneInspector; - gSettings.prefabSystem = m_generalSettings.m_enablePrefabSystem; - if (static_cast(m_generalSettings.m_toolbarIconSize) != gSettings.gui.nToolbarIconSize) { gSettings.gui.nToolbarIconSize = static_cast(m_generalSettings.m_toolbarIconSize); @@ -178,16 +172,6 @@ void CEditorPreferencesPage_General::OnApply() //slices gSettings.sliceSettings.dynamicByDefault = m_sliceSettings.m_slicesDynamicByDefault; - - // if the user enabled/disabled the prefab context - notify them that a restart - // is required in order to see the effect of the change - if (gSettings.prefabSystem != m_generalSettings.m_enablePrefabSystemInitialValue) - { - QMessageBox::warning( - AzToolsFramework::GetActiveWindow(), QObject::tr("Restart required"), - QObject::tr("Restart the Editor in order for the Prefab/Slice system changes to take effect.") - ); - } } void CEditorPreferencesPage_General::InitializeSettings() @@ -202,8 +186,6 @@ void CEditorPreferencesPage_General::InitializeSettings() m_generalSettings.m_stylusMode = gSettings.stylusMode; m_generalSettings.m_restoreViewportCamera = gSettings.restoreViewportCamera; m_generalSettings.m_enableSceneInspector = gSettings.enableSceneInspector; - m_generalSettings.m_enablePrefabSystem = gSettings.prefabSystem; - m_generalSettings.m_enablePrefabSystemInitialValue = gSettings.prefabSystem; m_generalSettings.m_toolbarIconSize = static_cast(gSettings.gui.nToolbarIconSize); diff --git a/Code/Sandbox/Editor/EditorPreferencesPageGeneral.h b/Code/Sandbox/Editor/EditorPreferencesPageGeneral.h index 31776e9c10..6e7eeebd43 100644 --- a/Code/Sandbox/Editor/EditorPreferencesPageGeneral.h +++ b/Code/Sandbox/Editor/EditorPreferencesPageGeneral.h @@ -58,10 +58,6 @@ private: bool m_restoreViewportCamera; bool m_bShowNews; bool m_enableSceneInspector; - bool m_enablePrefabSystem; - - // Only used to tell if the user has changed this value since it requires a restart - bool m_enablePrefabSystemInitialValue; }; struct Messaging From 2fa6883455d005c529682655420673abf9214443 Mon Sep 17 00:00:00 2001 From: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> Date: Thu, 17 Jun 2021 16:16:10 -0700 Subject: [PATCH 04/16] SPEC-6663 add file(READ files to tracking (#1416) * adding property to track files read by file(READ * code review comments * adding newline --- AutomatedTesting/EngineFinder.cmake | 3 +++ Code/LauncherUnified/launcher_generator.cmake | 2 +- Templates/DefaultProject/Template/EngineFinder.cmake | 3 +++ Templates/MinimalProject/Template/EngineFinder.cmake | 3 +++ cmake/EngineJson.cmake | 2 +- cmake/FileUtil.cmake | 11 ++++++++++- cmake/Findo3de.cmake | 2 ++ cmake/O3DEJson.cmake | 4 ++-- cmake/PAL.cmake | 8 ++++---- cmake/Platform/Common/Install_common.cmake | 5 ++--- cmake/TestImpactFramework/LYTestImpactFramework.cmake | 2 +- 11 files changed, 32 insertions(+), 13 deletions(-) diff --git a/AutomatedTesting/EngineFinder.cmake b/AutomatedTesting/EngineFinder.cmake index fbbe3d8cfe..eef3aa3cae 100644 --- a/AutomatedTesting/EngineFinder.cmake +++ b/AutomatedTesting/EngineFinder.cmake @@ -15,6 +15,8 @@ include_guard() # Read the engine name from the project_json file file(READ ${CMAKE_CURRENT_LIST_DIR}/project.json project_json) +set_property(DIRECTORY APPEND PROPERTY CMAKE_CONFIGURE_DEPENDS ${CMAKE_CURRENT_LIST_DIR}/project.json) + string(JSON LY_ENGINE_NAME_TO_USE ERROR_VARIABLE json_error GET ${project_json} engine) if(json_error) message(FATAL_ERROR "Unable to read key 'engine' from 'project.json', error: ${json_error}") @@ -30,6 +32,7 @@ endif() # Find a key that matches LY_ENGINE_NAME_TO_USE and use that as the engine path. if(EXISTS ${manifest_path}) file(READ ${manifest_path} manifest_json) + set_property(DIRECTORY APPEND PROPERTY CMAKE_CONFIGURE_DEPENDS ${manifest_path}) string(JSON engines_path_count ERROR_VARIABLE json_error LENGTH ${manifest_json} engines_path) if(json_error) diff --git a/Code/LauncherUnified/launcher_generator.cmake b/Code/LauncherUnified/launcher_generator.cmake index 5fa0f7a0e3..2180aff7d8 100644 --- a/Code/LauncherUnified/launcher_generator.cmake +++ b/Code/LauncherUnified/launcher_generator.cmake @@ -26,7 +26,7 @@ foreach(project_name project_path IN ZIP_LISTS LY_PROJECTS_TARGET_NAME LY_PROJEC message(FATAL_ERROR "The specified project path of ${project_real_path} does not contain a project.json file") else() # Add the project_name to global LY_PROJECTS_TARGET_NAME property - file(READ "${project_real_path}/project.json" project_json) + ly_file_read("${project_real_path}/project.json" project_json) string(JSON project_name ERROR_VARIABLE json_error GET ${project_json} "project_name") if(json_error) message(FATAL_ERROR "There is an error reading the \"project_name\" key from the '${project_real_path}/project.json' file: ${json_error}") diff --git a/Templates/DefaultProject/Template/EngineFinder.cmake b/Templates/DefaultProject/Template/EngineFinder.cmake index cac0f6215c..f058f6e037 100644 --- a/Templates/DefaultProject/Template/EngineFinder.cmake +++ b/Templates/DefaultProject/Template/EngineFinder.cmake @@ -17,6 +17,8 @@ include_guard() # Read the engine name from the project_json file file(READ ${CMAKE_CURRENT_LIST_DIR}/project.json project_json) +set_property(DIRECTORY APPEND PROPERTY CMAKE_CONFIGURE_DEPENDS ${CMAKE_CURRENT_LIST_DIR}/project.json) + string(JSON LY_ENGINE_NAME_TO_USE ERROR_VARIABLE json_error GET ${project_json} engine) if(json_error) message(FATAL_ERROR "Unable to read key 'engine' from 'project.json', error: ${json_error}") @@ -32,6 +34,7 @@ endif() # Find a key that matches LY_ENGINE_NAME_TO_USE and use that as the engine path. if(EXISTS ${manifest_path}) file(READ ${manifest_path} manifest_json) + set_property(DIRECTORY APPEND PROPERTY CMAKE_CONFIGURE_DEPENDS ${manifest_path}) string(JSON engines_path_count ERROR_VARIABLE json_error LENGTH ${manifest_json} engines_path) if(json_error) diff --git a/Templates/MinimalProject/Template/EngineFinder.cmake b/Templates/MinimalProject/Template/EngineFinder.cmake index cac0f6215c..f058f6e037 100644 --- a/Templates/MinimalProject/Template/EngineFinder.cmake +++ b/Templates/MinimalProject/Template/EngineFinder.cmake @@ -17,6 +17,8 @@ include_guard() # Read the engine name from the project_json file file(READ ${CMAKE_CURRENT_LIST_DIR}/project.json project_json) +set_property(DIRECTORY APPEND PROPERTY CMAKE_CONFIGURE_DEPENDS ${CMAKE_CURRENT_LIST_DIR}/project.json) + string(JSON LY_ENGINE_NAME_TO_USE ERROR_VARIABLE json_error GET ${project_json} engine) if(json_error) message(FATAL_ERROR "Unable to read key 'engine' from 'project.json', error: ${json_error}") @@ -32,6 +34,7 @@ endif() # Find a key that matches LY_ENGINE_NAME_TO_USE and use that as the engine path. if(EXISTS ${manifest_path}) file(READ ${manifest_path} manifest_json) + set_property(DIRECTORY APPEND PROPERTY CMAKE_CONFIGURE_DEPENDS ${manifest_path}) string(JSON engines_path_count ERROR_VARIABLE json_error LENGTH ${manifest_json} engines_path) if(json_error) diff --git a/cmake/EngineJson.cmake b/cmake/EngineJson.cmake index c3ab29d09e..7922cd1a1b 100644 --- a/cmake/EngineJson.cmake +++ b/cmake/EngineJson.cmake @@ -22,7 +22,7 @@ set(LY_EXTERNAL_SUBDIRS "" CACHE STRING "List of subdirectories to recurse into # Restricted folders(contains an additional restricted.json), etc... # \arg:output_external_subdirs name of output variable to store external subdirectories into function(read_engine_external_subdirs output_external_subdirs) - file(READ ${LY_ROOT_FOLDER}/engine.json engine_json_data) + ly_file_read(${LY_ROOT_FOLDER}/engine.json engine_json_data) string(JSON external_subdirs_count ERROR_VARIABLE engine_json_error LENGTH ${engine_json_data} "external_subdirectories") if(engine_json_error) diff --git a/cmake/FileUtil.cmake b/cmake/FileUtil.cmake index 96923537ed..e530fe133c 100644 --- a/cmake/FileUtil.cmake +++ b/cmake/FileUtil.cmake @@ -118,4 +118,13 @@ override_pak_root=${LY_OVERRIDE_PAK_FOLDER_ROOT} endfunction() - +#! ly_file_read: wrap to file(READ) that adds the file to configuration tracking +# +# file(READ) does not add file tracking. So changes to the file being read will not cause a cmake regeneration +# +function(ly_file_read path content) + unset(file_content) + file(READ ${path} file_content) + set(${content} ${file_content} PARENT_SCOPE) + set_property(DIRECTORY APPEND PROPERTY CMAKE_CONFIGURE_DEPENDS ${path}) +endfunction() diff --git a/cmake/Findo3de.cmake b/cmake/Findo3de.cmake index 0b4d0b75e7..f9eedf686c 100644 --- a/cmake/Findo3de.cmake +++ b/cmake/Findo3de.cmake @@ -22,6 +22,8 @@ o3de_current_file_path(current_path) # Make sure we are matching LY_ENGINE_NAME_TO_USE with the current engine file(READ ${current_path}/../engine.json engine_json) +set_property(DIRECTORY APPEND PROPERTY CMAKE_CONFIGURE_DEPENDS ${current_path}/../engine.json) + string(JSON this_engine_name ERROR_VARIABLE json_error GET ${engine_json} engine_name) if(json_error) message(FATAL_ERROR "Unable to read key 'engine_name' from '${current_path}/../engine.json', error: ${json_error}") diff --git a/cmake/O3DEJson.cmake b/cmake/O3DEJson.cmake index ab5f95bc8c..500bd9a78c 100644 --- a/cmake/O3DEJson.cmake +++ b/cmake/O3DEJson.cmake @@ -30,7 +30,7 @@ endfunction() #! read_json_array # Reads the a json array field into a cmake list variable function(o3de_read_json_array read_output_array input_json_path array_key) - file(READ ${input_json_path} manifest_json_data) + ly_file_read(${input_json_path} manifest_json_data) string(JSON array_count ERROR_VARIABLE manifest_json_error LENGTH ${manifest_json_data} ${array_key}) if(manifest_json_error) @@ -53,7 +53,7 @@ function(o3de_read_json_array read_output_array input_json_path array_key) endfunction() function(o3de_read_json_key output_value input_json_path key) - file(READ ${input_json_path} manifest_json_data) + ly_file_read(${input_json_path} manifest_json_data) string(JSON value ERROR_VARIABLE manifest_json_error GET ${manifest_json_data} ${key}) if(manifest_json_error) message(FATAL_ERROR "Error reading field at key ${key} in file \"${input_json_path}\" : ${manifest_json_error}") diff --git a/cmake/PAL.cmake b/cmake/PAL.cmake index dca54e4731..4fe729f85a 100644 --- a/cmake/PAL.cmake +++ b/cmake/PAL.cmake @@ -30,7 +30,7 @@ endforeach() # \arg:restricted returns the restricted association element from an o3de json, otherwise engine 'o3de' is assumed # \arg:o3de_json_file name of the o3de json file function(o3de_restricted_id o3de_json_file restricted) - file(READ ${o3de_json_file} json_data) + ly_file_read(${o3de_json_file} json_data) string(JSON restricted_entry ERROR_VARIABLE json_error GET ${json_data} "restricted_name") if(json_error) message(WARNING "Unable to read restricted from '${o3de_json_file}', error: ${json_error}") @@ -46,7 +46,7 @@ endfunction() # \arg:restricted_name name of the restricted function(o3de_find_restricted_folder restricted_name restricted_path) # Read the restricted path from engine.json if one EXISTS - file(READ ${LY_ROOT_FOLDER}/engine.json engine_json_data) + ly_file_read(${LY_ROOT_FOLDER}/engine.json engine_json_data) string(JSON restricted_subdirs_count ERROR_VARIABLE engine_json_error LENGTH ${engine_json_data} "restricted") if(restricted_subdirs_count GREATER 0) string(JSON restricted_subdir ERROR_VARIABLE engine_json_error GET ${engine_json_data} "restricted" "0") @@ -66,7 +66,7 @@ function(o3de_find_restricted_folder restricted_name restricted_path) # Examine the o3de manifest file for the list of restricted directories set(o3de_manifest_path ${home_directory}/.o3de/o3de_manifest.json) if(EXISTS ${o3de_manifest_path}) - file(READ ${o3de_manifest_path} o3de_manifest_json_data) + ly_file_read(${o3de_manifest_path} o3de_manifest_json_data) string(JSON restricted_subdirs_count ERROR_VARIABLE engine_json_error LENGTH ${o3de_manifest_json_data} "restricted") if(restricted_subdirs_count GREATER 0) math(EXPR restricted_subdirs_range "${restricted_subdirs_count}-1") @@ -79,7 +79,7 @@ function(o3de_find_restricted_folder restricted_name restricted_path) # Iterate over the restricted directories from the manifest file foreach(restricted_entry ${restricted_subdirs}) set(restricted_json_file ${restricted_entry}/restricted.json) - file(READ ${restricted_json_file} restricted_json) + ly_file_read(${restricted_json_file} restricted_json) string(JSON this_restricted_name ERROR_VARIABLE json_error GET ${restricted_json} "restricted_name") if(json_error) message(WARNING "Unable to read restricted_name from '${restricted_json_file}', error: ${json_error}") diff --git a/cmake/Platform/Common/Install_common.cmake b/cmake/Platform/Common/Install_common.cmake index 0948cf68dd..edce52288f 100644 --- a/cmake/Platform/Common/Install_common.cmake +++ b/cmake/Platform/Common/Install_common.cmake @@ -240,7 +240,7 @@ set_property(TARGET ${TARGET_NAME} ) # Since a CMakeLists.txt could contain multiple targets, we generate it in a folder per target - file(READ ${LY_ROOT_FOLDER}/cmake/install/InstalledTarget.in target_cmakelists_template) + ly_file_read(${LY_ROOT_FOLDER}/cmake/install/InstalledTarget.in target_cmakelists_template) string(CONFIGURE ${target_cmakelists_template} output_cmakelists_data @ONLY) set(${OUTPUT_CONFIGURED_TARGET} ${output_cmakelists_data} PARENT_SCOPE) endfunction() @@ -317,8 +317,7 @@ function(ly_setup_subdirectory absolute_target_source_dir) string(APPEND ENABLE_GEMS_PLACEHOLDER ${enable_gems_command}) endforeach() - - file(READ ${LY_ROOT_FOLDER}/cmake/install/Copyright.in cmake_copyright_comment) + ly_file_read(${LY_ROOT_FOLDER}/cmake/install/Copyright.in cmake_copyright_comment) # Initialize the target install source directory to path underneath the current binary directory set(target_install_source_dir ${CMAKE_CURRENT_BINARY_DIR}/install/${relative_target_source_dir}) diff --git a/cmake/TestImpactFramework/LYTestImpactFramework.cmake b/cmake/TestImpactFramework/LYTestImpactFramework.cmake index d46b16bca5..8a088bddab 100644 --- a/cmake/TestImpactFramework/LYTestImpactFramework.cmake +++ b/cmake/TestImpactFramework/LYTestImpactFramework.cmake @@ -334,7 +334,7 @@ function(ly_test_impact_write_config_file CONFIG_TEMPLATE_FILE PERSISTENT_DATA_D ) # Substitute config file template with above vars - file(READ "${CONFIG_TEMPLATE_FILE}" config_file) + ly_file_read("${CONFIG_TEMPLATE_FILE}" config_file) string(CONFIGURE ${config_file} config_file) # Write out entire config contents to a file in the build directory of the test impact framework console target From 2c7fc4e391f67b1900ca653db554393e494bd182 Mon Sep 17 00:00:00 2001 From: Peng Date: Thu, 17 Jun 2021 17:00:36 -0700 Subject: [PATCH 05/16] take out warning and un-used variable --- Gems/Atom/RHI/Vulkan/Code/Source/RHI/PhysicalDevice.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/PhysicalDevice.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/PhysicalDevice.cpp index 694eac2da4..9fd38aab93 100644 --- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/PhysicalDevice.cpp +++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/PhysicalDevice.cpp @@ -62,8 +62,6 @@ namespace AZ { RHI::Ptr physicalDevice = aznew PhysicalDevice; physicalDevice->Init(device); - size_t gpuMemSize = physicalDevice->GetDescriptor().m_heapSizePerLevel[static_cast(RHI::HeapMemoryLevel::Device)]; - AZ_Warning("Vulkan", gpuMemSize >= MinGPUMemSize, "Rejecting GPU %s as it's gpu mem size of %zu bytes is less than min required size of %zu bytes for Vulkan API", physicalDevice->GetDescriptor().m_description.c_str(), gpuMemSize, MinGPUMemSize); physicalDeviceList.emplace_back(physicalDevice); } From 6d0ef1cf57110a9b36a2b274dbe1be5059e30e45 Mon Sep 17 00:00:00 2001 From: Chris Burel Date: Thu, 17 Jun 2021 17:54:10 -0700 Subject: [PATCH 06/16] Avoid reading from a destroyed variable (#1347) This code iterates over the items in a vector, and if one case is met, it mutates that same vector. This invalidates the object, as the place where that object used to be has been moved. --- .../AzCore/AzCore/Settings/SettingsRegistryMergeUtils.cpp | 8 ++++++-- .../AzCore/AzCore/Settings/SettingsRegistryMergeUtils.h | 8 ++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Code/Framework/AzCore/AzCore/Settings/SettingsRegistryMergeUtils.cpp b/Code/Framework/AzCore/AzCore/Settings/SettingsRegistryMergeUtils.cpp index 2d2acd9d44..172a3697e4 100644 --- a/Code/Framework/AzCore/AzCore/Settings/SettingsRegistryMergeUtils.cpp +++ b/Code/Framework/AzCore/AzCore/Settings/SettingsRegistryMergeUtils.cpp @@ -816,7 +816,11 @@ namespace AZ::SettingsRegistryMergeUtils } } - void MergeSettingsToRegistry_CommandLine(SettingsRegistryInterface& registry, const AZ::CommandLine& commandLine, bool executeCommands) + // This function intentionally copies `commandLine`. It looks like it only uses it as a const reference, but the + // code in the loop makes calls that mutates the `commandLine` instance, invalidating the iterators. Making a copy + // ensures that the iterators remain valid. + // NOLINTNEXTLINE(performance-unnecessary-value-param) + void MergeSettingsToRegistry_CommandLine(SettingsRegistryInterface& registry, AZ::CommandLine commandLine, bool executeCommands) { // Iterate over all the command line options in order to parse the --regset and --regremove // arguments in the order they were supplied @@ -831,7 +835,7 @@ namespace AZ::SettingsRegistryMergeUtils continue; } } - if (commandArgument.m_option == "regremove") + else if (commandArgument.m_option == "regremove") { if (!registry.Remove(commandArgument.m_value)) { diff --git a/Code/Framework/AzCore/AzCore/Settings/SettingsRegistryMergeUtils.h b/Code/Framework/AzCore/AzCore/Settings/SettingsRegistryMergeUtils.h index b482530d24..dbeb1bfe24 100644 --- a/Code/Framework/AzCore/AzCore/Settings/SettingsRegistryMergeUtils.h +++ b/Code/Framework/AzCore/AzCore/Settings/SettingsRegistryMergeUtils.h @@ -15,11 +15,7 @@ #include #include #include - -namespace AZ -{ - class CommandLine; -} +#include namespace AZ::IO { @@ -217,7 +213,7 @@ namespace AZ::SettingsRegistryMergeUtils //! example: --regdump /My/Array/With/Objects //! --regdumpall Dumps the entire settings registry to output. //! Note that this function is only called in development builds and is compiled out in release builds. - void MergeSettingsToRegistry_CommandLine(SettingsRegistryInterface& registry, const AZ::CommandLine& commandLine, bool executeCommands); + void MergeSettingsToRegistry_CommandLine(SettingsRegistryInterface& registry, AZ::CommandLine commandLine, bool executeCommands); //! Stores the command line settings into the Setting Registry //! The arguments can be used later anywhere the command line is needed From 79e510c7387f55d464697276a64a1dfdb66e907d Mon Sep 17 00:00:00 2001 From: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com> Date: Fri, 18 Jun 2021 10:50:28 +0100 Subject: [PATCH 07/16] Make white box mesh incompatible with atom render mesh (#1394) --- Gems/WhiteBox/Code/Source/EditorWhiteBoxComponent.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Gems/WhiteBox/Code/Source/EditorWhiteBoxComponent.cpp b/Gems/WhiteBox/Code/Source/EditorWhiteBoxComponent.cpp index e8e03556e2..89b8035764 100644 --- a/Gems/WhiteBox/Code/Source/EditorWhiteBoxComponent.cpp +++ b/Gems/WhiteBox/Code/Source/EditorWhiteBoxComponent.cpp @@ -257,17 +257,18 @@ namespace WhiteBox void EditorWhiteBoxComponent::GetRequiredServices(AZ::ComponentDescriptor::DependencyArrayType& required) { - required.push_back(AZ_CRC("TransformService", 0x8ee22c50)); + required.push_back(AZ_CRC_CE("TransformService")); } void EditorWhiteBoxComponent::GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& provided) { - provided.push_back(AZ_CRC("WhiteBoxService", 0x2f2f42b8)); + provided.push_back(AZ_CRC_CE("WhiteBoxService")); } void EditorWhiteBoxComponent::GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible) { incompatible.push_back(AZ_CRC_CE("NonUniformScaleService")); + incompatible.push_back(AZ_CRC_CE("MeshService")); } EditorWhiteBoxComponent::EditorWhiteBoxComponent() = default; From ed186aff18239ef96b683da9241731fb97dd1891 Mon Sep 17 00:00:00 2001 From: amzn-sean <75276488+amzn-sean@users.noreply.github.com> Date: Fri, 18 Jun 2021 12:29:53 +0100 Subject: [PATCH 08/16] add missing disconnect SimulatedBodyBus to ragdoll destroy (#1404) --- .../Code/Source/PhysXCharacters/Components/RagdollComponent.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/Gems/PhysX/Code/Source/PhysXCharacters/Components/RagdollComponent.cpp b/Gems/PhysX/Code/Source/PhysXCharacters/Components/RagdollComponent.cpp index 8da512647f..e5d1a8db47 100644 --- a/Gems/PhysX/Code/Source/PhysXCharacters/Components/RagdollComponent.cpp +++ b/Gems/PhysX/Code/Source/PhysXCharacters/Components/RagdollComponent.cpp @@ -407,6 +407,7 @@ namespace PhysX AzFramework::RagdollPhysicsRequestBus::Handler::BusDisconnect(); AzFramework::RagdollPhysicsNotificationBus::Event( GetEntityId(), &AzFramework::RagdollPhysicsNotifications::OnRagdollDeactivated); + AzPhysics::SimulatedBodyComponentRequestsBus::Handler::BusDisconnect(); if (auto* sceneInterface = AZ::Interface::Get()) { From 108b6f8e0c2cb10b60191a877770d59b8773a3c4 Mon Sep 17 00:00:00 2001 From: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com> Date: Fri, 18 Jun 2021 12:44:34 +0100 Subject: [PATCH 09/16] Updates to ensure OnEntityTransformChanged is called correctly (LYN-2644) (#1405) --- .../Entity/EditorEntityTransformBus.h | 53 ++++++++----------- .../ToolsComponents/TransformComponent.cpp | 32 +++++++---- .../ToolsComponents/TransformComponent.h | 9 ++-- .../UnitTest/AzToolsFrameworkTestHelpers.cpp | 4 +- .../UnitTest/AzToolsFrameworkTestHelpers.h | 1 + .../EditorTransformComponentSelection.cpp | 45 +++++++++++----- ...EditorTransformComponentSelectionTests.cpp | 37 +++++++++++++ 7 files changed, 123 insertions(+), 58 deletions(-) diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntityTransformBus.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntityTransformBus.h index 3fd9b24e7d..b250abe410 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntityTransformBus.h +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntityTransformBus.h @@ -1,47 +1,36 @@ /* -* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or -* its licensors. -* -* For complete copyright and license terms please see the LICENSE at the root of this -* distribution (the "License"). All use of this software is governed by the License, -* or, if provided, by the license below or the license accompanying this file. Do not -* remove or modify any license notices. This file is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* -*/ -#include + * All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or + * its licensors. + * + * For complete copyright and license terms please see the LICENSE at the root of this + * distribution (the "License"). All use of this software is governed by the License, + * or, if provided, by the license below or the license accompanying this file. Do not + * remove or modify any license notices. This file is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * + */ #pragma once +#include + namespace AzToolsFramework { using EntityIdList = AZStd::vector; - /*! - * Bus for notifications about entity transform changes from the editor viewport - */ - class EditorTransformChangeNotifications - : public AZ::EBusTraits + //! Notifications about entity transform changes from the editor. + class EditorTransformChangeNotifications : public AZ::EBusTraits { public: - virtual ~EditorTransformChangeNotifications() = default; + //! A notification that these entities had their transforms changed due to a user interaction in the editor. + //! @param entityIds Entities that had their transform changed. + virtual void OnEntityTransformChanged([[maybe_unused]] const AzToolsFramework::EntityIdList& entityIds) + { + } - /*! - * Notification that the specified entities are about to have their transforms changed due to user interaction in the editor viewport - * - * \param entityIds Entities about to be changed - */ - virtual void OnEntityTransformChanging(const AzToolsFramework::EntityIdList& /*entityIds*/) {}; - - /*! - * Notification that the specified entities had their transforms changed due to user interaction in the editor viewport - * - * \param entityIds Entities changed - */ - virtual void OnEntityTransformChanged(const AzToolsFramework::EntityIdList& /*entityIds*/) {}; + protected: + ~EditorTransformChangeNotifications() = default; }; using EditorTransformChangeNotificationBus = AZ::EBus; - } // namespace AzToolsFramework - diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/TransformComponent.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/TransformComponent.cpp index bcbe98c3a7..a911888028 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/TransformComponent.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/TransformComponent.cpp @@ -27,6 +27,7 @@ #include #include #include +#include #include #include #include @@ -944,7 +945,7 @@ namespace AzToolsFramework return AZ::Success(); } - AZ::u32 TransformComponent::ParentChanged() + AZ::u32 TransformComponent::ParentChangedInspector() { AZ::u32 refreshLevel = AZ::Edit::PropertyRefreshLevels::None; @@ -974,12 +975,23 @@ namespace AzToolsFramework return refreshLevel; } - AZ::u32 TransformComponent::TransformChanged() + AZ::u32 TransformComponent::TransformChangedInspector() + { + if (TransformChanged()) + { + AzToolsFramework::EditorTransformChangeNotificationBus::Broadcast( + &AzToolsFramework::EditorTransformChangeNotificationBus::Events::OnEntityTransformChanged, + EntityIdList{ GetEntityId() }); + } + + return AZ::Edit::PropertyRefreshLevels::None; + } + + bool TransformComponent::TransformChanged() { if (!m_suppressTransformChangedEvent) { - auto parent = GetParentTransformComponent(); - if (parent) + if (auto parent = GetParentTransformComponent()) { OnTransformChanged(parent->GetLocalTM(), parent->GetWorldTM()); } @@ -987,13 +999,15 @@ namespace AzToolsFramework { OnTransformChanged(AZ::Transform::Identity(), AZ::Transform::Identity()); } + + return true; } - return AZ::Edit::PropertyRefreshLevels::None; + return false; } // This is called when our transform changes static state. - AZ::u32 TransformComponent::StaticChanged() + AZ::u32 TransformComponent::StaticChangedInspector() { AzToolsFramework::ToolsApplicationEvents::Bus::Broadcast( &AzToolsFramework::ToolsApplicationEvents::Bus::Events::InvalidatePropertyDisplay, @@ -1175,10 +1189,10 @@ namespace AzToolsFramework Attribute(AZ::Edit::Attributes::AutoExpand, true)-> DataElement(AZ::Edit::UIHandlers::Default, &TransformComponent::m_parentEntityId, "Parent entity", "")-> Attribute(AZ::Edit::Attributes::ChangeValidate, &TransformComponent::ValidatePotentialParent)-> - Attribute(AZ::Edit::Attributes::ChangeNotify, &TransformComponent::ParentChanged)-> + Attribute(AZ::Edit::Attributes::ChangeNotify, &TransformComponent::ParentChangedInspector)-> Attribute(AZ::Edit::Attributes::SliceFlags, AZ::Edit::SliceFlags::DontGatherReference | AZ::Edit::SliceFlags::NotPushableOnSliceRoot)-> DataElement(AZ::Edit::UIHandlers::Default, &TransformComponent::m_editorTransform, "Values", "")-> - Attribute(AZ::Edit::Attributes::ChangeNotify, &TransformComponent::TransformChanged)-> + Attribute(AZ::Edit::Attributes::ChangeNotify, &TransformComponent::TransformChangedInspector)-> Attribute(AZ::Edit::Attributes::AutoExpand, true)-> DataElement(AZ::Edit::UIHandlers::Button, &TransformComponent::m_addNonUniformScaleButton, "", "")-> Attribute(AZ::Edit::Attributes::ButtonText, "Add non-uniform scale")-> @@ -1189,7 +1203,7 @@ namespace AzToolsFramework EnumAttribute(AZ::TransformConfig::ParentActivationTransformMode::MaintainOriginalRelativeTransform, "Original relative transform")-> EnumAttribute(AZ::TransformConfig::ParentActivationTransformMode::MaintainCurrentWorldTransform, "Current world transform")-> DataElement(AZ::Edit::UIHandlers::Default, &TransformComponent::m_isStatic ,"Static", "Static entities are highly optimized and cannot be moved during runtime.")-> - Attribute(AZ::Edit::Attributes::ChangeNotify, &TransformComponent::StaticChanged)-> + Attribute(AZ::Edit::Attributes::ChangeNotify, &TransformComponent::StaticChangedInspector)-> DataElement(AZ::Edit::UIHandlers::Default, &TransformComponent::m_cachedWorldTransformParent, "Cached Parent Entity", "")-> Attribute(AZ::Edit::Attributes::SliceFlags, AZ::Edit::SliceFlags::DontGatherReference | AZ::Edit::SliceFlags::NotPushable)-> Attribute(AZ::Edit::Attributes::Visibility, AZ::Edit::PropertyVisibility::Hide)-> diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/TransformComponent.h b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/TransformComponent.h index 80db5e10fb..30608b9680 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/TransformComponent.h +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/TransformComponent.h @@ -182,9 +182,12 @@ namespace AzToolsFramework static void Reflect(AZ::ReflectContext* context); AZ::Outcome ValidatePotentialParent(void* newValue, const AZ::Uuid& valueType); - AZ::u32 ParentChanged(); - AZ::u32 TransformChanged(); - AZ::u32 StaticChanged(); + + AZ::u32 TransformChangedInspector(); + AZ::u32 ParentChangedInspector(); + AZ::u32 StaticChangedInspector(); + + bool TransformChanged(); AZ::Transform GetLocalTranslationTM() const; AZ::Transform GetLocalRotationTM() const; diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/UnitTest/AzToolsFrameworkTestHelpers.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UnitTest/AzToolsFrameworkTestHelpers.cpp index 1a3bc0e5a3..84a58b1f79 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/UnitTest/AzToolsFrameworkTestHelpers.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UnitTest/AzToolsFrameworkTestHelpers.cpp @@ -165,11 +165,13 @@ namespace UnitTest void EditorEntityComponentChangeDetector::OnEntityTransformChanged( const AzToolsFramework::EntityIdList& entityIds) { + m_entityIds = entityIds; + for (const AZ::EntityId& entityId : entityIds) { if (const auto* entity = GetEntityById(entityId)) { - if (AZ::Component * transformComponent = entity->FindComponent()) + if (AZ::Component* transformComponent = entity->FindComponent()) { OnEntityComponentPropertyChanged(transformComponent->GetId()); } diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/UnitTest/AzToolsFrameworkTestHelpers.h b/Code/Framework/AzToolsFramework/AzToolsFramework/UnitTest/AzToolsFrameworkTestHelpers.h index 276982d46d..6c146b3ac3 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/UnitTest/AzToolsFrameworkTestHelpers.h +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UnitTest/AzToolsFrameworkTestHelpers.h @@ -239,6 +239,7 @@ namespace UnitTest bool PropertyDisplayInvalidated() const { return m_propertyDisplayInvalidated; } AZStd::vector m_componentIds; + AzToolsFramework::EntityIdList m_entityIds; private: // PropertyEditorEntityChangeNotificationBus ... diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorTransformComponentSelection.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorTransformComponentSelection.cpp index c503386ab5..cbf9e4ec28 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorTransformComponentSelection.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorTransformComponentSelection.cpp @@ -999,7 +999,6 @@ namespace AzToolsFramework static void RefreshUiAfterChange(const EntityIdList& entitiyIds) { EditorTransformChangeNotificationBus::Broadcast(&EditorTransformChangeNotifications::OnEntityTransformChanged, entitiyIds); - ToolsApplicationNotificationBus::Broadcast(&ToolsApplicationNotificationBus::Events::InvalidatePropertyDisplay, Refresh_Values); } @@ -1065,7 +1064,7 @@ namespace AzToolsFramework auto entityBoxSelectData = AZStd::make_shared(); m_boxSelect.InstallLeftMouseDown( - [this, entityBoxSelectData](const ViewportInteraction::MouseInteractionEvent& /*mouseInteraction*/) + [this, entityBoxSelectData]([[maybe_unused]] const ViewportInteraction::MouseInteractionEvent& mouseInteraction) { // begin selection undo/redo command entityBoxSelectData->m_boxSelectSelectionCommand = @@ -1263,8 +1262,12 @@ namespace AzToolsFramework }); translationManipulators->InstallLinearManipulatorMouseUpCallback( - [this]([[maybe_unused]] const LinearManipulator::Action& action) mutable + [this, manipulatorEntityIds]([[maybe_unused]] const LinearManipulator::Action& action) mutable { + AzToolsFramework::EditorTransformChangeNotificationBus::Broadcast( + &AzToolsFramework::EditorTransformChangeNotificationBus::Events::OnEntityTransformChanged, + manipulatorEntityIds->m_entityIds); + EndRecordManipulatorCommand(); }); @@ -1293,8 +1296,12 @@ namespace AzToolsFramework }); translationManipulators->InstallPlanarManipulatorMouseUpCallback( - [this, manipulatorEntityIds](const PlanarManipulator::Action& /*action*/) + [this, manipulatorEntityIds]([[maybe_unused]] const PlanarManipulator::Action& action) { + AzToolsFramework::EditorTransformChangeNotificationBus::Broadcast( + &AzToolsFramework::EditorTransformChangeNotificationBus::Events::OnEntityTransformChanged, + manipulatorEntityIds->m_entityIds); + EndRecordManipulatorCommand(); }); @@ -1322,8 +1329,12 @@ namespace AzToolsFramework }); translationManipulators->InstallSurfaceManipulatorMouseUpCallback( - [this, manipulatorEntityIds](const SurfaceManipulator::Action& /*action*/) + [this, manipulatorEntityIds]([[maybe_unused]] const SurfaceManipulator::Action& action) { + AzToolsFramework::EditorTransformChangeNotificationBus::Broadcast( + &AzToolsFramework::EditorTransformChangeNotificationBus::Events::OnEntityTransformChanged, + manipulatorEntityIds->m_entityIds); + EndRecordManipulatorCommand(); }); @@ -1360,7 +1371,7 @@ namespace AzToolsFramework AZStd::shared_ptr sharedRotationState = AZStd::make_shared(); rotationManipulators->InstallLeftMouseDownCallback( - [this, sharedRotationState](const AngularManipulator::Action& /*action*/) mutable -> void + [this, sharedRotationState]([[maybe_unused]] const AngularManipulator::Action& action) mutable -> void { sharedRotationState->m_savedOrientation = AZ::Quaternion::CreateIdentity(); sharedRotationState->m_referenceFrameAtMouseDown = m_referenceFrame; @@ -1486,8 +1497,12 @@ namespace AzToolsFramework }); rotationManipulators->InstallLeftMouseUpCallback( - [this](const AngularManipulator::Action& /*action*/) + [this, sharedRotationState]([[maybe_unused]] const AngularManipulator::Action& action) { + AzToolsFramework::EditorTransformChangeNotificationBus::Broadcast( + &AzToolsFramework::EditorTransformChangeNotificationBus::Events::OnEntityTransformChanged, + sharedRotationState->m_entityIds); + EndRecordManipulatorCommand(); }); @@ -1533,6 +1548,10 @@ namespace AzToolsFramework auto uniformLeftMouseUpCallback = [this, manipulatorEntityIds]([[maybe_unused]] const LinearManipulator::Action& action) { + AzToolsFramework::EditorTransformChangeNotificationBus::Broadcast( + &AzToolsFramework::EditorTransformChangeNotificationBus::Events::OnEntityTransformChanged, + manipulatorEntityIds->m_entityIds); + m_entityIdManipulators.m_manipulators->SetLocalTransform(RecalculateAverageManipulatorTransform( m_entityIdManipulators.m_lookups, m_pivotOverrideFrame, m_pivotMode, m_referenceFrame)); }; @@ -2370,7 +2389,7 @@ namespace AzToolsFramework AddAction( m_actions, { QKeySequence(Qt::Key_U) }, - /*ID_VIEWPORTUI_VISIBLE=*/50040, "Toggle ViewportUI", "Hide/Unhide Viewport UI", + /*ID_VIEWPORTUI_VISIBLE=*/50040, "Toggle Viewport UI", "Hide/Show Viewport UI", [this]() { SetViewportUiClusterVisible(m_transformModeClusterId, !m_viewportUiVisible); @@ -3139,7 +3158,7 @@ namespace AzToolsFramework } void EditorTransformComponentSelection::AfterEntitySelectionChanged( - const EntityIdList& /*newlySelectedEntities*/, const EntityIdList& /*newlyDeselectedEntities*/) + [[maybe_unused]] const EntityIdList& newlySelectedEntities, [[maybe_unused]] const EntityIdList& newlyDeselectedEntities) { AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::AzToolsFramework); @@ -3534,17 +3553,17 @@ namespace AzToolsFramework RegenerateManipulators(); } - void EditorTransformComponentSelection::OnEntityVisibilityChanged(const bool /*visibility*/) + void EditorTransformComponentSelection::OnEntityVisibilityChanged([[maybe_unused]] const bool visibility) { m_selectedEntityIdsAndManipulatorsDirty = true; } - void EditorTransformComponentSelection::OnEntityLockChanged(const bool /*locked*/) + void EditorTransformComponentSelection::OnEntityLockChanged([[maybe_unused]] const bool locked) { m_selectedEntityIdsAndManipulatorsDirty = true; } - void EditorTransformComponentSelection::EnteredComponentMode(const AZStd::vector& /*componentModeTypes*/) + void EditorTransformComponentSelection::EnteredComponentMode([[maybe_unused]] const AZStd::vector& componentModeTypes) { SetViewportUiClusterVisible(m_transformModeClusterId, false); @@ -3553,7 +3572,7 @@ namespace AzToolsFramework ToolsApplicationNotificationBus::Handler::BusDisconnect(); } - void EditorTransformComponentSelection::LeftComponentMode(const AZStd::vector& /*componentModeTypes*/) + void EditorTransformComponentSelection::LeftComponentMode([[maybe_unused]] const AZStd::vector& componentModeTypes) { SetViewportUiClusterVisible(m_transformModeClusterId, true); diff --git a/Code/Framework/AzToolsFramework/Tests/EditorTransformComponentSelectionTests.cpp b/Code/Framework/AzToolsFramework/Tests/EditorTransformComponentSelectionTests.cpp index cbc81ba9b8..1d06dc9c33 100644 --- a/Code/Framework/AzToolsFramework/Tests/EditorTransformComponentSelectionTests.cpp +++ b/Code/Framework/AzToolsFramework/Tests/EditorTransformComponentSelectionTests.cpp @@ -451,6 +451,43 @@ namespace UnitTest EXPECT_TRUE(finalEntityTransform.IsClose(finalTransformWorld, 0.01f)); } + TEST_F(EditorTransformComponentSelectionManipulatorTestFixture, TranslatingEntityWithLinearManipulatorNotifiesOnEntityTransformChanged) + { + EditorEntityComponentChangeDetector editorEntityChangeDetector(m_entity1); + + // the initial starting position of the entity (in front and to the left of the camera) + const auto initialTransformWorld = AZ::Transform::CreateTranslation(AZ::Vector3(-10.0f, 10.0f, 0.0f)); + // where the entity should end up (in front and to the right of the camera) + const auto finalTransformWorld = AZ::Transform::CreateTranslation(AZ::Vector3(10.0f, 10.0f, 0.0f)); + + // calculate the position in screen space of the initial position of the entity + const auto initialPositionScreen = AzFramework::WorldToScreen(initialTransformWorld.GetTranslation(), m_cameraState); + // calculate the position in screen space of the final position of the entity + const auto finalPositionScreen = AzFramework::WorldToScreen(finalTransformWorld.GetTranslation(), m_cameraState); + + // move the entity to its starting position + AzToolsFramework::SetWorldTransform(m_entity1, initialTransformWorld); + // select the entity (this will cause the manipulators to appear in EditorTransformComponentSelection) + AzToolsFramework::SelectEntity(m_entity1); + + // create an offset along the linear manipulator pointing along the x-axis (perpendicular to the camera view) + const auto mouseOffsetOnManipulator = AzFramework::ScreenVector(10, 0); + // store the mouse down position on the manipulator + const auto mouseDownPosition = initialPositionScreen + mouseOffsetOnManipulator; + // final position in screen space of the mouse + const auto mouseMovePosition = finalPositionScreen + mouseOffsetOnManipulator; + + m_actionDispatcher->CameraState(m_cameraState) + ->MousePosition(mouseDownPosition) + ->MouseLButtonDown() + ->MousePosition(mouseMovePosition) + ->MouseLButtonUp(); + + // verify a EditorTransformChangeNotificationBus::OnEntityTransformChanged occurred + using ::testing::UnorderedElementsAreArray; + EXPECT_THAT(editorEntityChangeDetector.m_entityIds, UnorderedElementsAreArray(m_entityIds)); + } + // simple widget to listen for a mouse wheel event and then forward it on to the ViewportSelectionRequestBus class WheelEventWidget : public QWidget From b17c5ca3e684fc1bb1a42adff141bd13e6993a08 Mon Sep 17 00:00:00 2001 From: amzn-sean <75276488+amzn-sean@users.noreply.github.com> Date: Fri, 18 Jun 2021 14:09:34 +0100 Subject: [PATCH 10/16] adding physics tick time to post simulate event (#1401) --- .../AzFramework/AzFramework/Physics/Common/PhysicsEvents.h | 3 ++- .../AzFramework/AzFramework/Physics/PhysicsSystem.cpp | 2 +- Gems/PhysX/Code/Source/System/PhysXSystem.cpp | 2 +- Gems/PhysX/Code/Tests/PhysXSystemTests.cpp | 3 ++- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Code/Framework/AzFramework/AzFramework/Physics/Common/PhysicsEvents.h b/Code/Framework/AzFramework/AzFramework/Physics/Common/PhysicsEvents.h index a3a34dc1df..e0a89e14ac 100644 --- a/Code/Framework/AzFramework/AzFramework/Physics/Common/PhysicsEvents.h +++ b/Code/Framework/AzFramework/AzFramework/Physics/Common/PhysicsEvents.h @@ -48,7 +48,8 @@ namespace AzPhysics using OnPresimulateEvent = AZ::Event; //! Event triggers at the end of the SystemInterface::Simulate call. - using OnPostsimulateEvent = AZ::Event<>; + //! Parameter is the total time that the physics system will run for during the Simulate call. + using OnPostsimulateEvent = AZ::Event; //! Event trigger when a Scene is added to the simulation. //! When triggered will send the handle to the new Scene. diff --git a/Code/Framework/AzFramework/AzFramework/Physics/PhysicsSystem.cpp b/Code/Framework/AzFramework/AzFramework/Physics/PhysicsSystem.cpp index 289b5a940b..aa17b7ec83 100644 --- a/Code/Framework/AzFramework/AzFramework/Physics/PhysicsSystem.cpp +++ b/Code/Framework/AzFramework/AzFramework/Physics/PhysicsSystem.cpp @@ -43,7 +43,7 @@ namespace AzPhysics const AZ::BehaviorAzEventDescription postsimulateEventDescription = { "Postsimulate event", - {} // Parameters + {"Tick time"} // Parameters }; behaviorContext->Class("System Interface") diff --git a/Gems/PhysX/Code/Source/System/PhysXSystem.cpp b/Gems/PhysX/Code/Source/System/PhysXSystem.cpp index 92f68ea13b..0e4c72b77e 100644 --- a/Gems/PhysX/Code/Source/System/PhysXSystem.cpp +++ b/Gems/PhysX/Code/Source/System/PhysXSystem.cpp @@ -198,7 +198,7 @@ namespace PhysX simulateScenes(tickTime); } - m_postSimulateEvent.Signal(); + m_postSimulateEvent.Signal(tickTime); } AzPhysics::SceneHandle PhysXSystem::AddScene(const AzPhysics::SceneConfiguration& config) diff --git a/Gems/PhysX/Code/Tests/PhysXSystemTests.cpp b/Gems/PhysX/Code/Tests/PhysXSystemTests.cpp index 5c3636d040..910a421b65 100644 --- a/Gems/PhysX/Code/Tests/PhysXSystemTests.cpp +++ b/Gems/PhysX/Code/Tests/PhysXSystemTests.cpp @@ -219,8 +219,9 @@ namespace PhysX preSimEventCount++; }); AzPhysics::SystemEvents::OnPostsimulateEvent::Handler postSimEvent( - [&postSimEventCount]() + [&expectedTickTime, &postSimEventCount](float deltaTime) { + EXPECT_NEAR(expectedTickTime, deltaTime, 0.001f); postSimEventCount++; }); physicsSystem->RegisterPreSimulateEvent(preSimEvent); From 13bf685661f1f15096e8d354ebefa3b228286f5f Mon Sep 17 00:00:00 2001 From: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com> Date: Fri, 18 Jun 2021 09:28:31 -0500 Subject: [PATCH 11/16] Cleaned up vegetation_precompiled.h (#1418) * Removed vegetation_precompiled.h * Removed CryCommon dependency --- Gems/Vegetation/Code/CMakeLists.txt | 1 - Gems/Vegetation/Code/Source/AreaSystemComponent.cpp | 2 +- .../Code/Source/Components/AreaBlenderComponent.cpp | 2 +- Gems/Vegetation/Code/Source/Components/AreaComponentBase.cpp | 1 - Gems/Vegetation/Code/Source/Components/BlockerComponent.cpp | 1 - .../Source/Components/DescriptorListCombinerComponent.cpp | 1 - .../Code/Source/Components/DescriptorListComponent.cpp | 1 - .../Source/Components/DescriptorWeightSelectorComponent.cpp | 1 - .../Source/Components/DistanceBetweenFilterComponent.cpp | 2 +- .../Code/Source/Components/DistributionFilterComponent.cpp | 2 +- .../Code/Source/Components/LevelSettingsComponent.cpp | 1 - .../Code/Source/Components/MeshBlockerComponent.cpp | 1 - .../Code/Source/Components/PositionModifierComponent.cpp | 1 - .../Code/Source/Components/ReferenceShapeComponent.cpp | 1 - .../Code/Source/Components/RotationModifierComponent.cpp | 1 - .../Code/Source/Components/ScaleModifierComponent.cpp | 1 - .../Source/Components/ShapeIntersectionFilterComponent.cpp | 2 +- .../Source/Components/SlopeAlignmentModifierComponent.cpp | 1 - Gems/Vegetation/Code/Source/Components/SpawnerComponent.cpp | 2 +- .../Source/Components/SurfaceAltitudeFilterComponent.cpp | 2 +- .../Source/Components/SurfaceMaskDepthFilterComponent.cpp | 2 +- .../Code/Source/Components/SurfaceMaskFilterComponent.cpp | 2 +- .../Code/Source/Components/SurfaceSlopeFilterComponent.cpp | 2 +- Gems/Vegetation/Code/Source/DebugSystemComponent.cpp | 1 - Gems/Vegetation/Code/Source/Debugger/AreaDebugComponent.cpp | 1 - Gems/Vegetation/Code/Source/Debugger/AreaDebugComponent.h | 5 +++-- Gems/Vegetation/Code/Source/Debugger/DebugComponent.cpp | 2 +- Gems/Vegetation/Code/Source/Debugger/DebugComponent.h | 2 +- .../Code/Source/Debugger/EditorAreaDebugComponent.cpp | 1 - .../Vegetation/Code/Source/Debugger/EditorDebugComponent.cpp | 1 - Gems/Vegetation/Code/Source/Descriptor.cpp | 2 -- Gems/Vegetation/Code/Source/DescriptorListAsset.cpp | 2 -- Gems/Vegetation/Code/Source/DynamicSliceInstanceSpawner.cpp | 1 - .../Code/Source/Editor/EditorAreaBlenderComponent.cpp | 3 --- .../Vegetation/Code/Source/Editor/EditorBlockerComponent.cpp | 1 - .../Source/Editor/EditorDescriptorListCombinerComponent.cpp | 1 - .../Code/Source/Editor/EditorDescriptorListComponent.cpp | 1 - .../Editor/EditorDescriptorWeightSelectorComponent.cpp | 1 - .../Source/Editor/EditorDistanceBetweenFilterComponent.cpp | 1 - .../Code/Source/Editor/EditorDistributionFilterComponent.cpp | 1 - .../Code/Source/Editor/EditorLevelSettingsComponent.cpp | 2 -- .../Code/Source/Editor/EditorMeshBlockerComponent.cpp | 1 - .../Code/Source/Editor/EditorPositionModifierComponent.cpp | 1 - .../Code/Source/Editor/EditorReferenceShapeComponent.cpp | 1 - .../Code/Source/Editor/EditorRotationModifierComponent.cpp | 1 - .../Code/Source/Editor/EditorScaleModifierComponent.cpp | 1 - .../Source/Editor/EditorShapeIntersectionFilterComponent.cpp | 1 - .../Source/Editor/EditorSlopeAlignmentModifierComponent.cpp | 1 - .../Vegetation/Code/Source/Editor/EditorSpawnerComponent.cpp | 1 - .../Source/Editor/EditorSurfaceAltitudeFilterComponent.cpp | 1 - .../Source/Editor/EditorSurfaceMaskDepthFilterComponent.cpp | 1 - .../Code/Source/Editor/EditorSurfaceMaskFilterComponent.cpp | 1 - .../Code/Source/Editor/EditorSurfaceSlopeFilterComponent.cpp | 1 - .../Code/Source/Editor/EditorVegetationSystemComponent.cpp | 4 ---- Gems/Vegetation/Code/Source/EmptyInstanceSpawner.cpp | 1 - Gems/Vegetation/Code/Source/InstanceSystemComponent.cpp | 2 +- Gems/Vegetation/Code/Source/PrefabInstanceSpawner.cpp | 1 - Gems/Vegetation/Code/Source/VegetationEditorModule.cpp | 2 -- Gems/Vegetation/Code/Source/VegetationEditorModule.h | 1 - Gems/Vegetation/Code/Source/VegetationModule.cpp | 2 -- Gems/Vegetation/Code/Source/VegetationModule.h | 1 - .../{Vegetation_precompiled.h => VegetationProfiler.h} | 2 -- Gems/Vegetation/Code/Source/VegetationSystemComponent.cpp | 3 --- .../Code/Tests/DynamicSliceInstanceSpawnerTests.cpp | 2 -- Gems/Vegetation/Code/Tests/EmptyInstanceSpawnerTests.cpp | 2 -- Gems/Vegetation/Code/Tests/PrefabInstanceSpawnerTests.cpp | 2 -- .../Code/Tests/VegetationAreaSystemComponentTest.cpp | 2 -- .../Code/Tests/VegetationComponentDescriptorTests.cpp | 2 -- .../Vegetation/Code/Tests/VegetationComponentFilterTests.cpp | 2 -- .../Code/Tests/VegetationComponentModifierTests.cpp | 2 -- .../Code/Tests/VegetationComponentOperationTests.cpp | 2 -- Gems/Vegetation/Code/Tests/VegetationTest.cpp | 2 -- Gems/Vegetation/Code/vegetation_files.cmake | 1 - Gems/Vegetation/Code/vegetation_shared_files.cmake | 1 + 74 files changed, 17 insertions(+), 96 deletions(-) rename Gems/Vegetation/Code/Source/{Vegetation_precompiled.h => VegetationProfiler.h} (90%) diff --git a/Gems/Vegetation/Code/CMakeLists.txt b/Gems/Vegetation/Code/CMakeLists.txt index 10d54da78e..2b32368d5a 100644 --- a/Gems/Vegetation/Code/CMakeLists.txt +++ b/Gems/Vegetation/Code/CMakeLists.txt @@ -28,7 +28,6 @@ ly_add_target( Gem::LmbrCentral Gem::SurfaceData PUBLIC - Legacy::CryCommon Gem::AtomLyIntegration_CommonFeatures.Static RUNTIME_DEPENDENCIES Gem::GradientSignal diff --git a/Gems/Vegetation/Code/Source/AreaSystemComponent.cpp b/Gems/Vegetation/Code/Source/AreaSystemComponent.cpp index e54f523b43..d6e4be6e9b 100644 --- a/Gems/Vegetation/Code/Source/AreaSystemComponent.cpp +++ b/Gems/Vegetation/Code/Source/AreaSystemComponent.cpp @@ -10,7 +10,7 @@ * */ -#include "Vegetation_precompiled.h" +#include #include "AreaSystemComponent.h" #include diff --git a/Gems/Vegetation/Code/Source/Components/AreaBlenderComponent.cpp b/Gems/Vegetation/Code/Source/Components/AreaBlenderComponent.cpp index ff39f6321e..7c9d8013d0 100644 --- a/Gems/Vegetation/Code/Source/Components/AreaBlenderComponent.cpp +++ b/Gems/Vegetation/Code/Source/Components/AreaBlenderComponent.cpp @@ -10,7 +10,7 @@ * */ -#include "Vegetation_precompiled.h" +#include #include "AreaBlenderComponent.h" #include #include diff --git a/Gems/Vegetation/Code/Source/Components/AreaComponentBase.cpp b/Gems/Vegetation/Code/Source/Components/AreaComponentBase.cpp index 056006f64a..46e214534a 100644 --- a/Gems/Vegetation/Code/Source/Components/AreaComponentBase.cpp +++ b/Gems/Vegetation/Code/Source/Components/AreaComponentBase.cpp @@ -10,7 +10,6 @@ * */ -#include "Vegetation_precompiled.h" #include #include #include diff --git a/Gems/Vegetation/Code/Source/Components/BlockerComponent.cpp b/Gems/Vegetation/Code/Source/Components/BlockerComponent.cpp index fa876c5cf0..5219334fd6 100644 --- a/Gems/Vegetation/Code/Source/Components/BlockerComponent.cpp +++ b/Gems/Vegetation/Code/Source/Components/BlockerComponent.cpp @@ -10,7 +10,6 @@ * */ -#include "Vegetation_precompiled.h" #include "BlockerComponent.h" #include diff --git a/Gems/Vegetation/Code/Source/Components/DescriptorListCombinerComponent.cpp b/Gems/Vegetation/Code/Source/Components/DescriptorListCombinerComponent.cpp index ffa57a0326..3a903399d1 100644 --- a/Gems/Vegetation/Code/Source/Components/DescriptorListCombinerComponent.cpp +++ b/Gems/Vegetation/Code/Source/Components/DescriptorListCombinerComponent.cpp @@ -10,7 +10,6 @@ * */ -#include "Vegetation_precompiled.h" #include "DescriptorListCombinerComponent.h" #include #include diff --git a/Gems/Vegetation/Code/Source/Components/DescriptorListComponent.cpp b/Gems/Vegetation/Code/Source/Components/DescriptorListComponent.cpp index c6939d520a..bc5be7423b 100644 --- a/Gems/Vegetation/Code/Source/Components/DescriptorListComponent.cpp +++ b/Gems/Vegetation/Code/Source/Components/DescriptorListComponent.cpp @@ -10,7 +10,6 @@ * */ -#include "Vegetation_precompiled.h" #include "DescriptorListComponent.h" #include #include diff --git a/Gems/Vegetation/Code/Source/Components/DescriptorWeightSelectorComponent.cpp b/Gems/Vegetation/Code/Source/Components/DescriptorWeightSelectorComponent.cpp index 840eec8dfa..19cf75e4d2 100644 --- a/Gems/Vegetation/Code/Source/Components/DescriptorWeightSelectorComponent.cpp +++ b/Gems/Vegetation/Code/Source/Components/DescriptorWeightSelectorComponent.cpp @@ -10,7 +10,6 @@ * */ -#include "Vegetation_precompiled.h" #include "DescriptorWeightSelectorComponent.h" #include #include diff --git a/Gems/Vegetation/Code/Source/Components/DistanceBetweenFilterComponent.cpp b/Gems/Vegetation/Code/Source/Components/DistanceBetweenFilterComponent.cpp index 16b1bb5f7e..99050638b5 100644 --- a/Gems/Vegetation/Code/Source/Components/DistanceBetweenFilterComponent.cpp +++ b/Gems/Vegetation/Code/Source/Components/DistanceBetweenFilterComponent.cpp @@ -10,7 +10,7 @@ * */ -#include "Vegetation_precompiled.h" +#include #include "DistanceBetweenFilterComponent.h" #include #include diff --git a/Gems/Vegetation/Code/Source/Components/DistributionFilterComponent.cpp b/Gems/Vegetation/Code/Source/Components/DistributionFilterComponent.cpp index 2ba07f95b3..aff560d7d4 100644 --- a/Gems/Vegetation/Code/Source/Components/DistributionFilterComponent.cpp +++ b/Gems/Vegetation/Code/Source/Components/DistributionFilterComponent.cpp @@ -10,7 +10,7 @@ * */ -#include "Vegetation_precompiled.h" +#include #include "DistributionFilterComponent.h" #include #include diff --git a/Gems/Vegetation/Code/Source/Components/LevelSettingsComponent.cpp b/Gems/Vegetation/Code/Source/Components/LevelSettingsComponent.cpp index 748ba0506a..4196619ffc 100644 --- a/Gems/Vegetation/Code/Source/Components/LevelSettingsComponent.cpp +++ b/Gems/Vegetation/Code/Source/Components/LevelSettingsComponent.cpp @@ -9,7 +9,6 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * */ -#include "Vegetation_precompiled.h" #include "LevelSettingsComponent.h" #include diff --git a/Gems/Vegetation/Code/Source/Components/MeshBlockerComponent.cpp b/Gems/Vegetation/Code/Source/Components/MeshBlockerComponent.cpp index d37dc4a82d..8eedf4019b 100644 --- a/Gems/Vegetation/Code/Source/Components/MeshBlockerComponent.cpp +++ b/Gems/Vegetation/Code/Source/Components/MeshBlockerComponent.cpp @@ -10,7 +10,6 @@ * */ -#include "Vegetation_precompiled.h" #include "MeshBlockerComponent.h" #include diff --git a/Gems/Vegetation/Code/Source/Components/PositionModifierComponent.cpp b/Gems/Vegetation/Code/Source/Components/PositionModifierComponent.cpp index 5781e53b41..5c1c48aa39 100644 --- a/Gems/Vegetation/Code/Source/Components/PositionModifierComponent.cpp +++ b/Gems/Vegetation/Code/Source/Components/PositionModifierComponent.cpp @@ -10,7 +10,6 @@ * */ -#include "Vegetation_precompiled.h" #include "PositionModifierComponent.h" #include #include diff --git a/Gems/Vegetation/Code/Source/Components/ReferenceShapeComponent.cpp b/Gems/Vegetation/Code/Source/Components/ReferenceShapeComponent.cpp index c5f99239d3..fc62eb39a7 100644 --- a/Gems/Vegetation/Code/Source/Components/ReferenceShapeComponent.cpp +++ b/Gems/Vegetation/Code/Source/Components/ReferenceShapeComponent.cpp @@ -10,7 +10,6 @@ * */ -#include "Vegetation_precompiled.h" #include "ReferenceShapeComponent.h" #include #include diff --git a/Gems/Vegetation/Code/Source/Components/RotationModifierComponent.cpp b/Gems/Vegetation/Code/Source/Components/RotationModifierComponent.cpp index 9dda59463e..d88b606aa3 100644 --- a/Gems/Vegetation/Code/Source/Components/RotationModifierComponent.cpp +++ b/Gems/Vegetation/Code/Source/Components/RotationModifierComponent.cpp @@ -10,7 +10,6 @@ * */ -#include "Vegetation_precompiled.h" #include "RotationModifierComponent.h" #include #include diff --git a/Gems/Vegetation/Code/Source/Components/ScaleModifierComponent.cpp b/Gems/Vegetation/Code/Source/Components/ScaleModifierComponent.cpp index 63755e5325..6e0397b410 100644 --- a/Gems/Vegetation/Code/Source/Components/ScaleModifierComponent.cpp +++ b/Gems/Vegetation/Code/Source/Components/ScaleModifierComponent.cpp @@ -10,7 +10,6 @@ * */ -#include "Vegetation_precompiled.h" #include "ScaleModifierComponent.h" #include #include diff --git a/Gems/Vegetation/Code/Source/Components/ShapeIntersectionFilterComponent.cpp b/Gems/Vegetation/Code/Source/Components/ShapeIntersectionFilterComponent.cpp index b1512f89a4..b7f9f7fe9c 100644 --- a/Gems/Vegetation/Code/Source/Components/ShapeIntersectionFilterComponent.cpp +++ b/Gems/Vegetation/Code/Source/Components/ShapeIntersectionFilterComponent.cpp @@ -10,7 +10,7 @@ * */ -#include "Vegetation_precompiled.h" +#include #include "ShapeIntersectionFilterComponent.h" #include #include diff --git a/Gems/Vegetation/Code/Source/Components/SlopeAlignmentModifierComponent.cpp b/Gems/Vegetation/Code/Source/Components/SlopeAlignmentModifierComponent.cpp index 3ff45bad74..78d4d4729c 100644 --- a/Gems/Vegetation/Code/Source/Components/SlopeAlignmentModifierComponent.cpp +++ b/Gems/Vegetation/Code/Source/Components/SlopeAlignmentModifierComponent.cpp @@ -10,7 +10,6 @@ * */ -#include "Vegetation_precompiled.h" #include "SlopeAlignmentModifierComponent.h" #include #include diff --git a/Gems/Vegetation/Code/Source/Components/SpawnerComponent.cpp b/Gems/Vegetation/Code/Source/Components/SpawnerComponent.cpp index 6c1db9037b..321613dd08 100644 --- a/Gems/Vegetation/Code/Source/Components/SpawnerComponent.cpp +++ b/Gems/Vegetation/Code/Source/Components/SpawnerComponent.cpp @@ -10,7 +10,7 @@ * */ -#include "Vegetation_precompiled.h" +#include #include "SpawnerComponent.h" #include #include diff --git a/Gems/Vegetation/Code/Source/Components/SurfaceAltitudeFilterComponent.cpp b/Gems/Vegetation/Code/Source/Components/SurfaceAltitudeFilterComponent.cpp index 7e6737ecf7..ebc8896fe6 100644 --- a/Gems/Vegetation/Code/Source/Components/SurfaceAltitudeFilterComponent.cpp +++ b/Gems/Vegetation/Code/Source/Components/SurfaceAltitudeFilterComponent.cpp @@ -10,7 +10,7 @@ * */ -#include "Vegetation_precompiled.h" +#include #include "SurfaceAltitudeFilterComponent.h" #include #include diff --git a/Gems/Vegetation/Code/Source/Components/SurfaceMaskDepthFilterComponent.cpp b/Gems/Vegetation/Code/Source/Components/SurfaceMaskDepthFilterComponent.cpp index d8e8b47f7b..2a191245ee 100644 --- a/Gems/Vegetation/Code/Source/Components/SurfaceMaskDepthFilterComponent.cpp +++ b/Gems/Vegetation/Code/Source/Components/SurfaceMaskDepthFilterComponent.cpp @@ -10,7 +10,7 @@ * */ -#include "Vegetation_precompiled.h" +#include #include "SurfaceMaskDepthFilterComponent.h" #include diff --git a/Gems/Vegetation/Code/Source/Components/SurfaceMaskFilterComponent.cpp b/Gems/Vegetation/Code/Source/Components/SurfaceMaskFilterComponent.cpp index d18a7434ae..0749d9473a 100644 --- a/Gems/Vegetation/Code/Source/Components/SurfaceMaskFilterComponent.cpp +++ b/Gems/Vegetation/Code/Source/Components/SurfaceMaskFilterComponent.cpp @@ -10,7 +10,7 @@ * */ -#include "Vegetation_precompiled.h" +#include #include "SurfaceMaskFilterComponent.h" #include diff --git a/Gems/Vegetation/Code/Source/Components/SurfaceSlopeFilterComponent.cpp b/Gems/Vegetation/Code/Source/Components/SurfaceSlopeFilterComponent.cpp index f856e4bd8f..27938b9c74 100644 --- a/Gems/Vegetation/Code/Source/Components/SurfaceSlopeFilterComponent.cpp +++ b/Gems/Vegetation/Code/Source/Components/SurfaceSlopeFilterComponent.cpp @@ -10,7 +10,7 @@ * */ -#include "Vegetation_precompiled.h" +#include #include "SurfaceSlopeFilterComponent.h" #include #include diff --git a/Gems/Vegetation/Code/Source/DebugSystemComponent.cpp b/Gems/Vegetation/Code/Source/DebugSystemComponent.cpp index c62905766e..984f8fd538 100644 --- a/Gems/Vegetation/Code/Source/DebugSystemComponent.cpp +++ b/Gems/Vegetation/Code/Source/DebugSystemComponent.cpp @@ -9,7 +9,6 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * */ -#include "Vegetation_precompiled.h" #include "DebugSystemComponent.h" #include diff --git a/Gems/Vegetation/Code/Source/Debugger/AreaDebugComponent.cpp b/Gems/Vegetation/Code/Source/Debugger/AreaDebugComponent.cpp index 12ba003cc0..91ab9279fe 100644 --- a/Gems/Vegetation/Code/Source/Debugger/AreaDebugComponent.cpp +++ b/Gems/Vegetation/Code/Source/Debugger/AreaDebugComponent.cpp @@ -10,7 +10,6 @@ * */ -#include "Vegetation_precompiled.h" #include #include #include diff --git a/Gems/Vegetation/Code/Source/Debugger/AreaDebugComponent.h b/Gems/Vegetation/Code/Source/Debugger/AreaDebugComponent.h index 014e45249a..7bea99a2fa 100644 --- a/Gems/Vegetation/Code/Source/Debugger/AreaDebugComponent.h +++ b/Gems/Vegetation/Code/Source/Debugger/AreaDebugComponent.h @@ -14,6 +14,7 @@ #include #include +#include #include #include #include @@ -31,13 +32,13 @@ namespace Vegetation { AZ_INLINE AZ::Color GetDebugColor() { - static uint32 debugColor = 0xff << 8; + static uint32_t debugColor = 0xff << 8; AZ::Color value; value.FromU32(debugColor | (0xff << 24)); // add in alpha 255 // use a golden ratio sequence to generate the next color // new color = fract(old color * 1.6) // Treat the 24 bits as normalized 0 - 1 - debugColor = (uint32)((((uint64)debugColor * 0x1999999ull) - 0xffffffull) & 0xffffffull); + debugColor = azlossy_cast(((aznumeric_cast(debugColor) * 0x1999999ull) - 0xffffffull) & 0xffffffull); return value; } diff --git a/Gems/Vegetation/Code/Source/Debugger/DebugComponent.cpp b/Gems/Vegetation/Code/Source/Debugger/DebugComponent.cpp index 099bd2e90c..cb241c4fd2 100644 --- a/Gems/Vegetation/Code/Source/Debugger/DebugComponent.cpp +++ b/Gems/Vegetation/Code/Source/Debugger/DebugComponent.cpp @@ -10,7 +10,7 @@ * */ -#include "Vegetation_precompiled.h" +#include #include "DebugComponent.h" #include "AreaSystemComponent.h" #include "InstanceSystemComponent.h" diff --git a/Gems/Vegetation/Code/Source/Debugger/DebugComponent.h b/Gems/Vegetation/Code/Source/Debugger/DebugComponent.h index ae834b3632..9283c1da90 100644 --- a/Gems/Vegetation/Code/Source/Debugger/DebugComponent.h +++ b/Gems/Vegetation/Code/Source/Debugger/DebugComponent.h @@ -167,7 +167,7 @@ namespace Vegetation using AreaData = AZStd::vector; AZStd::size_t MakeAreaSectorKey(AZ::EntityId areaId, SectorId sectorId); - AZStd::unordered_map m_currentAreasTiming; + AZStd::unordered_map m_currentAreasTiming; AreaData m_areaData; AZStd::vector m_currentSortedTimingList; diff --git a/Gems/Vegetation/Code/Source/Debugger/EditorAreaDebugComponent.cpp b/Gems/Vegetation/Code/Source/Debugger/EditorAreaDebugComponent.cpp index bf942f78c4..2069dd66bb 100644 --- a/Gems/Vegetation/Code/Source/Debugger/EditorAreaDebugComponent.cpp +++ b/Gems/Vegetation/Code/Source/Debugger/EditorAreaDebugComponent.cpp @@ -10,7 +10,6 @@ * */ -#include "Vegetation_precompiled.h" #include "EditorAreaDebugComponent.h" #include diff --git a/Gems/Vegetation/Code/Source/Debugger/EditorDebugComponent.cpp b/Gems/Vegetation/Code/Source/Debugger/EditorDebugComponent.cpp index 533a1daf00..0dc66ee3b8 100644 --- a/Gems/Vegetation/Code/Source/Debugger/EditorDebugComponent.cpp +++ b/Gems/Vegetation/Code/Source/Debugger/EditorDebugComponent.cpp @@ -10,7 +10,6 @@ * */ -#include "Vegetation_precompiled.h" #include "EditorDebugComponent.h" #include diff --git a/Gems/Vegetation/Code/Source/Descriptor.cpp b/Gems/Vegetation/Code/Source/Descriptor.cpp index d0075f2d7b..cb1a4e45b7 100644 --- a/Gems/Vegetation/Code/Source/Descriptor.cpp +++ b/Gems/Vegetation/Code/Source/Descriptor.cpp @@ -10,8 +10,6 @@ * */ -#include "Vegetation_precompiled.h" - #include #include #include diff --git a/Gems/Vegetation/Code/Source/DescriptorListAsset.cpp b/Gems/Vegetation/Code/Source/DescriptorListAsset.cpp index 90728718ed..4e0294c58c 100644 --- a/Gems/Vegetation/Code/Source/DescriptorListAsset.cpp +++ b/Gems/Vegetation/Code/Source/DescriptorListAsset.cpp @@ -10,8 +10,6 @@ * */ -#include "Vegetation_precompiled.h" - #include #include #include diff --git a/Gems/Vegetation/Code/Source/DynamicSliceInstanceSpawner.cpp b/Gems/Vegetation/Code/Source/DynamicSliceInstanceSpawner.cpp index a185c9a601..9ed23c7dd2 100644 --- a/Gems/Vegetation/Code/Source/DynamicSliceInstanceSpawner.cpp +++ b/Gems/Vegetation/Code/Source/DynamicSliceInstanceSpawner.cpp @@ -10,7 +10,6 @@ * */ -#include "Vegetation_precompiled.h" #include #include #include diff --git a/Gems/Vegetation/Code/Source/Editor/EditorAreaBlenderComponent.cpp b/Gems/Vegetation/Code/Source/Editor/EditorAreaBlenderComponent.cpp index 7371a96ba1..7511d6b8be 100644 --- a/Gems/Vegetation/Code/Source/Editor/EditorAreaBlenderComponent.cpp +++ b/Gems/Vegetation/Code/Source/Editor/EditorAreaBlenderComponent.cpp @@ -10,14 +10,11 @@ * */ -#include "Vegetation_precompiled.h" #include "EditorAreaBlenderComponent.h" #include #include #include #include -#include -#include #include #include #include diff --git a/Gems/Vegetation/Code/Source/Editor/EditorBlockerComponent.cpp b/Gems/Vegetation/Code/Source/Editor/EditorBlockerComponent.cpp index bbd116b091..da0a2b5f53 100644 --- a/Gems/Vegetation/Code/Source/Editor/EditorBlockerComponent.cpp +++ b/Gems/Vegetation/Code/Source/Editor/EditorBlockerComponent.cpp @@ -10,7 +10,6 @@ * */ -#include "Vegetation_precompiled.h" #include "EditorBlockerComponent.h" #include #include diff --git a/Gems/Vegetation/Code/Source/Editor/EditorDescriptorListCombinerComponent.cpp b/Gems/Vegetation/Code/Source/Editor/EditorDescriptorListCombinerComponent.cpp index ade8121b06..cbe62e0444 100644 --- a/Gems/Vegetation/Code/Source/Editor/EditorDescriptorListCombinerComponent.cpp +++ b/Gems/Vegetation/Code/Source/Editor/EditorDescriptorListCombinerComponent.cpp @@ -10,7 +10,6 @@ * */ -#include "Vegetation_precompiled.h" #include "EditorDescriptorListCombinerComponent.h" #include diff --git a/Gems/Vegetation/Code/Source/Editor/EditorDescriptorListComponent.cpp b/Gems/Vegetation/Code/Source/Editor/EditorDescriptorListComponent.cpp index 51ecc03c5a..18c045346b 100644 --- a/Gems/Vegetation/Code/Source/Editor/EditorDescriptorListComponent.cpp +++ b/Gems/Vegetation/Code/Source/Editor/EditorDescriptorListComponent.cpp @@ -10,7 +10,6 @@ * */ -#include "Vegetation_precompiled.h" #include "EditorDescriptorListComponent.h" #include #include diff --git a/Gems/Vegetation/Code/Source/Editor/EditorDescriptorWeightSelectorComponent.cpp b/Gems/Vegetation/Code/Source/Editor/EditorDescriptorWeightSelectorComponent.cpp index 1c23745831..5ae65d3c21 100644 --- a/Gems/Vegetation/Code/Source/Editor/EditorDescriptorWeightSelectorComponent.cpp +++ b/Gems/Vegetation/Code/Source/Editor/EditorDescriptorWeightSelectorComponent.cpp @@ -10,7 +10,6 @@ * */ -#include "Vegetation_precompiled.h" #include "EditorDescriptorWeightSelectorComponent.h" #include #include diff --git a/Gems/Vegetation/Code/Source/Editor/EditorDistanceBetweenFilterComponent.cpp b/Gems/Vegetation/Code/Source/Editor/EditorDistanceBetweenFilterComponent.cpp index ea6ab5eec1..e43be749bd 100644 --- a/Gems/Vegetation/Code/Source/Editor/EditorDistanceBetweenFilterComponent.cpp +++ b/Gems/Vegetation/Code/Source/Editor/EditorDistanceBetweenFilterComponent.cpp @@ -10,7 +10,6 @@ * */ -#include "Vegetation_precompiled.h" #include "EditorDistanceBetweenFilterComponent.h" #include #include diff --git a/Gems/Vegetation/Code/Source/Editor/EditorDistributionFilterComponent.cpp b/Gems/Vegetation/Code/Source/Editor/EditorDistributionFilterComponent.cpp index 8ea0acb78d..6b75ca73bc 100644 --- a/Gems/Vegetation/Code/Source/Editor/EditorDistributionFilterComponent.cpp +++ b/Gems/Vegetation/Code/Source/Editor/EditorDistributionFilterComponent.cpp @@ -10,7 +10,6 @@ * */ -#include "Vegetation_precompiled.h" #include "EditorDistributionFilterComponent.h" #include #include diff --git a/Gems/Vegetation/Code/Source/Editor/EditorLevelSettingsComponent.cpp b/Gems/Vegetation/Code/Source/Editor/EditorLevelSettingsComponent.cpp index 6f6a6f2ec4..5faae032a3 100644 --- a/Gems/Vegetation/Code/Source/Editor/EditorLevelSettingsComponent.cpp +++ b/Gems/Vegetation/Code/Source/Editor/EditorLevelSettingsComponent.cpp @@ -10,8 +10,6 @@ * */ -#include "Vegetation_precompiled.h" - #include "EditorLevelSettingsComponent.h" #include #include diff --git a/Gems/Vegetation/Code/Source/Editor/EditorMeshBlockerComponent.cpp b/Gems/Vegetation/Code/Source/Editor/EditorMeshBlockerComponent.cpp index fe519877e2..63c63d3d87 100644 --- a/Gems/Vegetation/Code/Source/Editor/EditorMeshBlockerComponent.cpp +++ b/Gems/Vegetation/Code/Source/Editor/EditorMeshBlockerComponent.cpp @@ -10,7 +10,6 @@ * */ -#include "Vegetation_precompiled.h" #include "EditorMeshBlockerComponent.h" #include #include diff --git a/Gems/Vegetation/Code/Source/Editor/EditorPositionModifierComponent.cpp b/Gems/Vegetation/Code/Source/Editor/EditorPositionModifierComponent.cpp index 14ae748168..e12444b83e 100644 --- a/Gems/Vegetation/Code/Source/Editor/EditorPositionModifierComponent.cpp +++ b/Gems/Vegetation/Code/Source/Editor/EditorPositionModifierComponent.cpp @@ -10,7 +10,6 @@ * */ -#include "Vegetation_precompiled.h" #include "EditorPositionModifierComponent.h" #include #include diff --git a/Gems/Vegetation/Code/Source/Editor/EditorReferenceShapeComponent.cpp b/Gems/Vegetation/Code/Source/Editor/EditorReferenceShapeComponent.cpp index 5f3225e23d..4240e4914c 100644 --- a/Gems/Vegetation/Code/Source/Editor/EditorReferenceShapeComponent.cpp +++ b/Gems/Vegetation/Code/Source/Editor/EditorReferenceShapeComponent.cpp @@ -10,7 +10,6 @@ * */ -#include "Vegetation_precompiled.h" #include "EditorReferenceShapeComponent.h" #include #include diff --git a/Gems/Vegetation/Code/Source/Editor/EditorRotationModifierComponent.cpp b/Gems/Vegetation/Code/Source/Editor/EditorRotationModifierComponent.cpp index 8d81ff1dae..ab9d55f221 100644 --- a/Gems/Vegetation/Code/Source/Editor/EditorRotationModifierComponent.cpp +++ b/Gems/Vegetation/Code/Source/Editor/EditorRotationModifierComponent.cpp @@ -10,7 +10,6 @@ * */ -#include "Vegetation_precompiled.h" #include "EditorRotationModifierComponent.h" #include #include diff --git a/Gems/Vegetation/Code/Source/Editor/EditorScaleModifierComponent.cpp b/Gems/Vegetation/Code/Source/Editor/EditorScaleModifierComponent.cpp index d6dc70a523..1c1684f5d5 100644 --- a/Gems/Vegetation/Code/Source/Editor/EditorScaleModifierComponent.cpp +++ b/Gems/Vegetation/Code/Source/Editor/EditorScaleModifierComponent.cpp @@ -10,7 +10,6 @@ * */ -#include "Vegetation_precompiled.h" #include "EditorScaleModifierComponent.h" #include #include diff --git a/Gems/Vegetation/Code/Source/Editor/EditorShapeIntersectionFilterComponent.cpp b/Gems/Vegetation/Code/Source/Editor/EditorShapeIntersectionFilterComponent.cpp index 93e5f41c75..b5a236bcee 100644 --- a/Gems/Vegetation/Code/Source/Editor/EditorShapeIntersectionFilterComponent.cpp +++ b/Gems/Vegetation/Code/Source/Editor/EditorShapeIntersectionFilterComponent.cpp @@ -10,7 +10,6 @@ * */ -#include "Vegetation_precompiled.h" #include "EditorShapeIntersectionFilterComponent.h" #include #include diff --git a/Gems/Vegetation/Code/Source/Editor/EditorSlopeAlignmentModifierComponent.cpp b/Gems/Vegetation/Code/Source/Editor/EditorSlopeAlignmentModifierComponent.cpp index 6002787404..ce036813d0 100644 --- a/Gems/Vegetation/Code/Source/Editor/EditorSlopeAlignmentModifierComponent.cpp +++ b/Gems/Vegetation/Code/Source/Editor/EditorSlopeAlignmentModifierComponent.cpp @@ -10,7 +10,6 @@ * */ -#include "Vegetation_precompiled.h" #include "EditorSlopeAlignmentModifierComponent.h" #include #include diff --git a/Gems/Vegetation/Code/Source/Editor/EditorSpawnerComponent.cpp b/Gems/Vegetation/Code/Source/Editor/EditorSpawnerComponent.cpp index 9dd393e124..6aad60f051 100644 --- a/Gems/Vegetation/Code/Source/Editor/EditorSpawnerComponent.cpp +++ b/Gems/Vegetation/Code/Source/Editor/EditorSpawnerComponent.cpp @@ -10,7 +10,6 @@ * */ -#include "Vegetation_precompiled.h" #include "EditorSpawnerComponent.h" #include #include diff --git a/Gems/Vegetation/Code/Source/Editor/EditorSurfaceAltitudeFilterComponent.cpp b/Gems/Vegetation/Code/Source/Editor/EditorSurfaceAltitudeFilterComponent.cpp index 6e46241b83..3ea5760a46 100644 --- a/Gems/Vegetation/Code/Source/Editor/EditorSurfaceAltitudeFilterComponent.cpp +++ b/Gems/Vegetation/Code/Source/Editor/EditorSurfaceAltitudeFilterComponent.cpp @@ -10,7 +10,6 @@ * */ -#include "Vegetation_precompiled.h" #include "EditorSurfaceAltitudeFilterComponent.h" #include #include diff --git a/Gems/Vegetation/Code/Source/Editor/EditorSurfaceMaskDepthFilterComponent.cpp b/Gems/Vegetation/Code/Source/Editor/EditorSurfaceMaskDepthFilterComponent.cpp index f28d134dd0..b4a37f679b 100644 --- a/Gems/Vegetation/Code/Source/Editor/EditorSurfaceMaskDepthFilterComponent.cpp +++ b/Gems/Vegetation/Code/Source/Editor/EditorSurfaceMaskDepthFilterComponent.cpp @@ -10,7 +10,6 @@ * */ -#include "Vegetation_precompiled.h" #include "EditorSurfaceMaskDepthFilterComponent.h" #include #include diff --git a/Gems/Vegetation/Code/Source/Editor/EditorSurfaceMaskFilterComponent.cpp b/Gems/Vegetation/Code/Source/Editor/EditorSurfaceMaskFilterComponent.cpp index 7567acdbde..7d64bc2423 100644 --- a/Gems/Vegetation/Code/Source/Editor/EditorSurfaceMaskFilterComponent.cpp +++ b/Gems/Vegetation/Code/Source/Editor/EditorSurfaceMaskFilterComponent.cpp @@ -10,7 +10,6 @@ * */ -#include "Vegetation_precompiled.h" #include "EditorSurfaceMaskFilterComponent.h" #include #include diff --git a/Gems/Vegetation/Code/Source/Editor/EditorSurfaceSlopeFilterComponent.cpp b/Gems/Vegetation/Code/Source/Editor/EditorSurfaceSlopeFilterComponent.cpp index 5b0868566d..ae93cf3c0b 100644 --- a/Gems/Vegetation/Code/Source/Editor/EditorSurfaceSlopeFilterComponent.cpp +++ b/Gems/Vegetation/Code/Source/Editor/EditorSurfaceSlopeFilterComponent.cpp @@ -10,7 +10,6 @@ * */ -#include "Vegetation_precompiled.h" #include "EditorSurfaceSlopeFilterComponent.h" #include #include diff --git a/Gems/Vegetation/Code/Source/Editor/EditorVegetationSystemComponent.cpp b/Gems/Vegetation/Code/Source/Editor/EditorVegetationSystemComponent.cpp index 17174fa132..fc056de636 100644 --- a/Gems/Vegetation/Code/Source/Editor/EditorVegetationSystemComponent.cpp +++ b/Gems/Vegetation/Code/Source/Editor/EditorVegetationSystemComponent.cpp @@ -9,14 +9,10 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * */ -#include "Vegetation_precompiled.h" #include "EditorVegetationSystemComponent.h" #include #include - -#include - #include namespace Vegetation diff --git a/Gems/Vegetation/Code/Source/EmptyInstanceSpawner.cpp b/Gems/Vegetation/Code/Source/EmptyInstanceSpawner.cpp index 9146ea1090..11ceecefc4 100644 --- a/Gems/Vegetation/Code/Source/EmptyInstanceSpawner.cpp +++ b/Gems/Vegetation/Code/Source/EmptyInstanceSpawner.cpp @@ -10,7 +10,6 @@ * */ -#include "Vegetation_precompiled.h" #include #include #include diff --git a/Gems/Vegetation/Code/Source/InstanceSystemComponent.cpp b/Gems/Vegetation/Code/Source/InstanceSystemComponent.cpp index 4aaf0a0b49..cd50c1f898 100644 --- a/Gems/Vegetation/Code/Source/InstanceSystemComponent.cpp +++ b/Gems/Vegetation/Code/Source/InstanceSystemComponent.cpp @@ -9,7 +9,7 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * */ -#include "Vegetation_precompiled.h" +#include #include "InstanceSystemComponent.h" #include diff --git a/Gems/Vegetation/Code/Source/PrefabInstanceSpawner.cpp b/Gems/Vegetation/Code/Source/PrefabInstanceSpawner.cpp index f22dbb61aa..9ff66a875f 100644 --- a/Gems/Vegetation/Code/Source/PrefabInstanceSpawner.cpp +++ b/Gems/Vegetation/Code/Source/PrefabInstanceSpawner.cpp @@ -10,7 +10,6 @@ * */ -#include "Vegetation_precompiled.h" #include #include diff --git a/Gems/Vegetation/Code/Source/VegetationEditorModule.cpp b/Gems/Vegetation/Code/Source/VegetationEditorModule.cpp index ce1f129e1a..c044487704 100644 --- a/Gems/Vegetation/Code/Source/VegetationEditorModule.cpp +++ b/Gems/Vegetation/Code/Source/VegetationEditorModule.cpp @@ -10,8 +10,6 @@ * */ -#include "Vegetation_precompiled.h" - #include #include diff --git a/Gems/Vegetation/Code/Source/VegetationEditorModule.h b/Gems/Vegetation/Code/Source/VegetationEditorModule.h index 76e409f0b5..107d400d1e 100644 --- a/Gems/Vegetation/Code/Source/VegetationEditorModule.h +++ b/Gems/Vegetation/Code/Source/VegetationEditorModule.h @@ -12,7 +12,6 @@ #pragma once -#include "Vegetation_precompiled.h" #include namespace Vegetation diff --git a/Gems/Vegetation/Code/Source/VegetationModule.cpp b/Gems/Vegetation/Code/Source/VegetationModule.cpp index 90215e7996..7daa33b35c 100644 --- a/Gems/Vegetation/Code/Source/VegetationModule.cpp +++ b/Gems/Vegetation/Code/Source/VegetationModule.cpp @@ -10,8 +10,6 @@ * */ -#include "Vegetation_precompiled.h" - #include #include diff --git a/Gems/Vegetation/Code/Source/VegetationModule.h b/Gems/Vegetation/Code/Source/VegetationModule.h index 0b36eb3856..26d0a169aa 100644 --- a/Gems/Vegetation/Code/Source/VegetationModule.h +++ b/Gems/Vegetation/Code/Source/VegetationModule.h @@ -12,7 +12,6 @@ #pragma once -#include "Vegetation_precompiled.h" #include namespace Vegetation diff --git a/Gems/Vegetation/Code/Source/Vegetation_precompiled.h b/Gems/Vegetation/Code/Source/VegetationProfiler.h similarity index 90% rename from Gems/Vegetation/Code/Source/Vegetation_precompiled.h rename to Gems/Vegetation/Code/Source/VegetationProfiler.h index 92116dd175..fa8ff7865b 100644 --- a/Gems/Vegetation/Code/Source/Vegetation_precompiled.h +++ b/Gems/Vegetation/Code/Source/VegetationProfiler.h @@ -11,8 +11,6 @@ */ #pragma once -#include // Many CryCommon files require that this is included first. - // VEG_PROFILE_ENABLED is defined in the wscript // VEG_PROFILE_ENABLED is only defined in the Vegetation gem by default #if defined(VEG_PROFILE_ENABLED) diff --git a/Gems/Vegetation/Code/Source/VegetationSystemComponent.cpp b/Gems/Vegetation/Code/Source/VegetationSystemComponent.cpp index a3a1ff4616..78a6a4171d 100644 --- a/Gems/Vegetation/Code/Source/VegetationSystemComponent.cpp +++ b/Gems/Vegetation/Code/Source/VegetationSystemComponent.cpp @@ -9,7 +9,6 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * */ -#include "Vegetation_precompiled.h" #include "VegetationSystemComponent.h" #include @@ -27,8 +26,6 @@ #include #include -#include - namespace Vegetation { namespace Details diff --git a/Gems/Vegetation/Code/Tests/DynamicSliceInstanceSpawnerTests.cpp b/Gems/Vegetation/Code/Tests/DynamicSliceInstanceSpawnerTests.cpp index c3aa910b47..3ced558c3d 100644 --- a/Gems/Vegetation/Code/Tests/DynamicSliceInstanceSpawnerTests.cpp +++ b/Gems/Vegetation/Code/Tests/DynamicSliceInstanceSpawnerTests.cpp @@ -9,8 +9,6 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * */ -#include "Vegetation_precompiled.h" - #include "VegetationTest.h" #include "VegetationMocks.h" diff --git a/Gems/Vegetation/Code/Tests/EmptyInstanceSpawnerTests.cpp b/Gems/Vegetation/Code/Tests/EmptyInstanceSpawnerTests.cpp index 19ebca7602..dae9a692d5 100644 --- a/Gems/Vegetation/Code/Tests/EmptyInstanceSpawnerTests.cpp +++ b/Gems/Vegetation/Code/Tests/EmptyInstanceSpawnerTests.cpp @@ -9,8 +9,6 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * */ -#include "Vegetation_precompiled.h" - #include "VegetationTest.h" #include "VegetationMocks.h" diff --git a/Gems/Vegetation/Code/Tests/PrefabInstanceSpawnerTests.cpp b/Gems/Vegetation/Code/Tests/PrefabInstanceSpawnerTests.cpp index 368615ea42..ed618278d2 100644 --- a/Gems/Vegetation/Code/Tests/PrefabInstanceSpawnerTests.cpp +++ b/Gems/Vegetation/Code/Tests/PrefabInstanceSpawnerTests.cpp @@ -9,8 +9,6 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * */ -#include "Vegetation_precompiled.h" - #include "VegetationTest.h" #include "VegetationMocks.h" diff --git a/Gems/Vegetation/Code/Tests/VegetationAreaSystemComponentTest.cpp b/Gems/Vegetation/Code/Tests/VegetationAreaSystemComponentTest.cpp index 8c72b01fd5..c06db1b9d8 100644 --- a/Gems/Vegetation/Code/Tests/VegetationAreaSystemComponentTest.cpp +++ b/Gems/Vegetation/Code/Tests/VegetationAreaSystemComponentTest.cpp @@ -9,8 +9,6 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * */ -#include "Vegetation_precompiled.h" - #include #include #include diff --git a/Gems/Vegetation/Code/Tests/VegetationComponentDescriptorTests.cpp b/Gems/Vegetation/Code/Tests/VegetationComponentDescriptorTests.cpp index 6e2aa42c9b..a19a4f2516 100644 --- a/Gems/Vegetation/Code/Tests/VegetationComponentDescriptorTests.cpp +++ b/Gems/Vegetation/Code/Tests/VegetationComponentDescriptorTests.cpp @@ -9,8 +9,6 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * */ -#include "Vegetation_precompiled.h" - #include "VegetationTest.h" #include "VegetationMocks.h" diff --git a/Gems/Vegetation/Code/Tests/VegetationComponentFilterTests.cpp b/Gems/Vegetation/Code/Tests/VegetationComponentFilterTests.cpp index cfd621b397..17e3626e32 100644 --- a/Gems/Vegetation/Code/Tests/VegetationComponentFilterTests.cpp +++ b/Gems/Vegetation/Code/Tests/VegetationComponentFilterTests.cpp @@ -9,8 +9,6 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * */ -#include "Vegetation_precompiled.h" - #include "VegetationTest.h" #include "VegetationMocks.h" diff --git a/Gems/Vegetation/Code/Tests/VegetationComponentModifierTests.cpp b/Gems/Vegetation/Code/Tests/VegetationComponentModifierTests.cpp index 035e4efdc8..60a0e73250 100644 --- a/Gems/Vegetation/Code/Tests/VegetationComponentModifierTests.cpp +++ b/Gems/Vegetation/Code/Tests/VegetationComponentModifierTests.cpp @@ -9,8 +9,6 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * */ -#include "Vegetation_precompiled.h" - #include "VegetationTest.h" #include "VegetationMocks.h" diff --git a/Gems/Vegetation/Code/Tests/VegetationComponentOperationTests.cpp b/Gems/Vegetation/Code/Tests/VegetationComponentOperationTests.cpp index c69024826b..b9dce45ccd 100644 --- a/Gems/Vegetation/Code/Tests/VegetationComponentOperationTests.cpp +++ b/Gems/Vegetation/Code/Tests/VegetationComponentOperationTests.cpp @@ -9,8 +9,6 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * */ -#include "Vegetation_precompiled.h" - #include "VegetationTest.h" #include "VegetationMocks.h" diff --git a/Gems/Vegetation/Code/Tests/VegetationTest.cpp b/Gems/Vegetation/Code/Tests/VegetationTest.cpp index d570cd3386..b58b80a3a9 100644 --- a/Gems/Vegetation/Code/Tests/VegetationTest.cpp +++ b/Gems/Vegetation/Code/Tests/VegetationTest.cpp @@ -9,8 +9,6 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * */ -#include "Vegetation_precompiled.h" - #include #include #include "VegetationTest.h" diff --git a/Gems/Vegetation/Code/vegetation_files.cmake b/Gems/Vegetation/Code/vegetation_files.cmake index d06a2d6927..896720d30e 100644 --- a/Gems/Vegetation/Code/vegetation_files.cmake +++ b/Gems/Vegetation/Code/vegetation_files.cmake @@ -10,7 +10,6 @@ # set(FILES - Source/Vegetation_precompiled.h Include/Vegetation/DescriptorListAsset.h Include/Vegetation/Descriptor.h Include/Vegetation/InstanceData.h diff --git a/Gems/Vegetation/Code/vegetation_shared_files.cmake b/Gems/Vegetation/Code/vegetation_shared_files.cmake index 82b02b3881..4a49699f79 100644 --- a/Gems/Vegetation/Code/vegetation_shared_files.cmake +++ b/Gems/Vegetation/Code/vegetation_shared_files.cmake @@ -14,4 +14,5 @@ set(FILES Source/AreaSystemComponent.h Source/VegetationModule.cpp Source/VegetationModule.h + Source/VegetationProfiler.h ) From 84de2d2e12ac8351a52aa8dcb9fdd9f7c753a34b Mon Sep 17 00:00:00 2001 From: amzn-sean <75276488+amzn-sean@users.noreply.github.com> Date: Fri, 18 Jun 2021 15:38:49 +0100 Subject: [PATCH 12/16] Fixed failing periodic physics tests (#1429) --- .../physics/C4044695_PhysXCollider_AddMultipleSurfaceFbx.py | 2 +- .../C5340400_RigidBody_ManualMomentOfInertia.ly | 4 ++-- Code/Framework/AzFramework/AzFramework/Physics/Material.cpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/AutomatedTesting/Gem/PythonTests/physics/C4044695_PhysXCollider_AddMultipleSurfaceFbx.py b/AutomatedTesting/Gem/PythonTests/physics/C4044695_PhysXCollider_AddMultipleSurfaceFbx.py index 57cdc8f9c5..40291b2114 100755 --- a/AutomatedTesting/Gem/PythonTests/physics/C4044695_PhysXCollider_AddMultipleSurfaceFbx.py +++ b/AutomatedTesting/Gem/PythonTests/physics/C4044695_PhysXCollider_AddMultipleSurfaceFbx.py @@ -102,7 +102,7 @@ def C4044695_PhysXCollider_AddMultipleSurfaceFbx(): # 6) Check if multiple material slots show up under Materials section in the PhysX Collider component pte = collider_component.get_property_tree() def get_surface_count(): - count = pte.get_container_count("Collider Configuration|Physics Material|Mesh Surfaces") + count = pte.get_container_count("Collider Configuration|Physics Materials|Slots") return count.GetValue() Report.result( diff --git a/AutomatedTesting/Levels/Physics/C5340400_RigidBody_ManualMomentOfInertia/C5340400_RigidBody_ManualMomentOfInertia.ly b/AutomatedTesting/Levels/Physics/C5340400_RigidBody_ManualMomentOfInertia/C5340400_RigidBody_ManualMomentOfInertia.ly index a649728997..87166a9d8d 100644 --- a/AutomatedTesting/Levels/Physics/C5340400_RigidBody_ManualMomentOfInertia/C5340400_RigidBody_ManualMomentOfInertia.ly +++ b/AutomatedTesting/Levels/Physics/C5340400_RigidBody_ManualMomentOfInertia/C5340400_RigidBody_ManualMomentOfInertia.ly @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b6e408095c15a388768b7f70b6049f33c894aab3e51f2d744bc1ae1d18668ee4 -size 9694 +oid sha256:824a51a375f19274d5698ff08af0fdc3dc18204505c73a943de748455d108b01 +size 6181 diff --git a/Code/Framework/AzFramework/AzFramework/Physics/Material.cpp b/Code/Framework/AzFramework/AzFramework/Physics/Material.cpp index d84d2739d0..82c5c5d071 100644 --- a/Code/Framework/AzFramework/AzFramework/Physics/Material.cpp +++ b/Code/Framework/AzFramework/AzFramework/Physics/Material.cpp @@ -402,7 +402,7 @@ namespace Physics ->Attribute(AZ_CRC_CE("EditButton"), "") ->Attribute(AZ_CRC_CE("EditDescription"), "Open in Asset Editor") ->Attribute(AZ::Edit::Attributes::DefaultAsset, &MaterialSelection::GetMaterialLibraryId) - ->DataElement(AZ::Edit::UIHandlers::Default, &MaterialSelection::m_materialIdsAssignedToSlots, "", "") + ->DataElement(AZ::Edit::UIHandlers::Default, &MaterialSelection::m_materialIdsAssignedToSlots, "Slots", "") ->ElementAttribute(Attributes::MaterialLibraryAssetId, &MaterialSelection::GetMaterialLibraryId) ->Attribute(AZ::Edit::Attributes::IndexedChildNameLabelOverride, &MaterialSelection::GetMaterialSlotLabel) ->Attribute(AZ::Edit::Attributes::AutoExpand, true) From 35a7ca718bc05d45108a8919fff6b0c17ca2cbac Mon Sep 17 00:00:00 2001 From: Aaron Ruiz Mora Date: Fri, 18 Jun 2021 17:04:29 +0100 Subject: [PATCH 13/16] Fixed Physics script canvas assets failing in iOS (#1431) --- ...tCanvas_ShapeCastVerification.scriptcanvas | 2615 +- .../Weapons/Revolver/Tracer_FX.scriptcanvas | 21354 ++++++++-------- 2 files changed, 12019 insertions(+), 11950 deletions(-) diff --git a/AutomatedTesting/ScriptCanvas/C12712455_ScriptCanvas_ShapeCastVerification.scriptcanvas b/AutomatedTesting/ScriptCanvas/C12712455_ScriptCanvas_ShapeCastVerification.scriptcanvas index b24a477a2e..9b1357eebe 100644 --- a/AutomatedTesting/ScriptCanvas/C12712455_ScriptCanvas_ShapeCastVerification.scriptcanvas +++ b/AutomatedTesting/ScriptCanvas/C12712455_ScriptCanvas_ShapeCastVerification.scriptcanvas @@ -3,34 +3,158 @@ - + - + - + - + - + - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -41,7 +165,7 @@ - + @@ -65,9 +189,374 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -75,7 +564,7 @@ - + @@ -278,21 +767,21 @@ - + - + - + @@ -335,7 +824,7 @@ - + @@ -378,7 +867,7 @@ - + @@ -416,227 +905,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -713,21 +982,12 @@ - + - - - - - - - - - - + @@ -1321,7 +1581,7 @@ - + @@ -1386,598 +1646,21 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + - + @@ -2020,7 +1703,7 @@ - + @@ -2063,7 +1746,7 @@ - + @@ -2101,7 +1784,7 @@ - + @@ -2178,125 +1861,340 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + - + - + - + @@ -2309,79 +2207,17 @@ - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -2389,10 +2225,10 @@ - + - + @@ -2402,17 +2238,48 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + @@ -2420,7 +2287,7 @@ - + @@ -2433,28 +2300,152 @@ - + - + - + - + - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2470,7 +2461,7 @@ - + @@ -2478,49 +2469,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -2528,7 +2477,7 @@ - + @@ -2545,37 +2494,16 @@ - - - - - - - - - - - - - - - - - - - - - - - - + + + @@ -2583,7 +2511,7 @@ - + @@ -2591,229 +2519,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -2823,11 +2529,296 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2837,14 +2828,6 @@ - - - - - - - - @@ -2853,6 +2836,14 @@ + + + + + + + + @@ -2868,7 +2859,7 @@ - + diff --git a/Gems/PhysXSamples/Assets/ScriptCanvas/Weapons/Revolver/Tracer_FX.scriptcanvas b/Gems/PhysXSamples/Assets/ScriptCanvas/Weapons/Revolver/Tracer_FX.scriptcanvas index f0fff5e69f..40fcf77147 100644 --- a/Gems/PhysXSamples/Assets/ScriptCanvas/Weapons/Revolver/Tracer_FX.scriptcanvas +++ b/Gems/PhysXSamples/Assets/ScriptCanvas/Weapons/Revolver/Tracer_FX.scriptcanvas @@ -3,7 +3,7 @@ - + @@ -16,1429 +16,21 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + - + @@ -1481,7 +73,7 @@ - + @@ -1524,7 +116,7 @@ - + @@ -1567,7 +159,7 @@ - + @@ -1605,7 +197,7 @@ - + @@ -1694,825 +286,26 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + - + @@ -2550,7 +343,7 @@ - + @@ -2588,7 +381,7 @@ - + @@ -2626,7 +419,7 @@ - + @@ -2664,7 +457,7 @@ - + @@ -2702,7 +495,7 @@ - + @@ -2744,12 +537,12 @@ - + - + @@ -2759,7 +552,7 @@ - + @@ -2769,7 +562,7 @@ - + @@ -2785,1734 +578,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -5189,313 +1255,26 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + - + - + - + @@ -5505,8 +1284,8 @@ - - + + @@ -5533,7 +1312,7 @@ - + @@ -5543,257 +1322,8 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + @@ -5820,7 +1350,7 @@ - + @@ -5830,8 +1360,8 @@ - - + + @@ -5858,7 +1388,83 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -5872,9 +1478,21 @@ + + + + + + + + + + + + - - + + @@ -5901,7 +1519,7 @@ - + @@ -5935,57 +1553,11 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -5995,10 +1567,10 @@ - + - + @@ -6006,90 +1578,9 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -6104,7 +1595,7 @@ - + @@ -6114,7 +1605,45 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -6127,7 +1656,7 @@ - + @@ -6157,16 +1686,61 @@ - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + @@ -6174,21 +1748,59 @@ - + - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -6203,7 +1815,7 @@ - + @@ -6231,136 +1843,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -6398,7 +1881,7 @@ - + @@ -6437,64 +1920,30 @@ - + - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - + + - + - + @@ -6502,595 +1951,21 @@ - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -7128,7 +2003,7 @@ - + @@ -7166,7 +2041,7 @@ - + @@ -7209,7 +2084,7 @@ - + @@ -7252,7 +2127,7 @@ - + @@ -7310,7 +2185,7 @@ - + @@ -7325,21 +2200,21 @@ - + - + - + - + @@ -7382,7 +2257,7 @@ - + @@ -7391,20 +2266,13 @@ - - - - - - - - + @@ -7432,7 +2300,7 @@ - + @@ -7470,7 +2338,7 @@ - + @@ -7523,20 +2391,20 @@ - + - + - + - + @@ -7552,1092 +2420,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -8677,22 +2460,6 @@ - - - - - - - - - - - - - - - - @@ -8705,6 +2472,22 @@ + + + + + + + + + + + + + + + + @@ -8762,22 +2545,6 @@ - - - - - - - - - - - - - - - - @@ -8790,6 +2557,22 @@ + + + + + + + + + + + + + + + + @@ -8836,22 +2619,6 @@ - - - - - - - - - - - - - - - - @@ -8864,6 +2631,22 @@ + + + + + + + + + + + + + + + + @@ -9060,445 +2843,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -9785,1024 +3130,163 @@ - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -10845,7 +3329,7 @@ - + @@ -10854,13 +3338,20 @@ + + + + + + + - + @@ -10888,7 +3379,7 @@ - + @@ -10926,7 +3417,7 @@ - + @@ -10979,20 +3470,20 @@ - + - + - + - + @@ -11008,689 +3499,294 @@ - + - + - - - - - - + + + + + + + + + + + - - - - - - + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + - + + + + + + + + + + + + + + + + + - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + @@ -12449,15 +4545,33 @@ - + - + - + - + + + + + + + + + + + + + + + + + + + @@ -12491,33 +4605,15 @@ - + - + - + - - - - - - - - - - - - - - - - - - - + @@ -12538,7 +4634,6501 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -12741,7 +11331,926 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -12883,21 +12392,21 @@ - + - + - + @@ -12935,7 +12444,7 @@ - + @@ -12973,7 +12482,7 @@ - + @@ -12983,10 +12492,124 @@ - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -13012,12 +12635,389 @@ - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - @@ -13027,7 +13027,7 @@ - + @@ -13037,7 +13037,7 @@ - + @@ -13045,7 +13045,7 @@ - + @@ -13058,7 +13058,7 @@ - + @@ -13068,7 +13068,7 @@ - + @@ -13076,7 +13076,7 @@ - + @@ -13089,7 +13089,7 @@ - + @@ -13099,7 +13099,7 @@ - + @@ -13107,7 +13107,7 @@ - + @@ -13120,7 +13120,7 @@ - + @@ -13130,7 +13130,7 @@ - + @@ -13138,7 +13138,7 @@ - + @@ -13151,7 +13151,7 @@ - + @@ -13161,7 +13161,7 @@ - + @@ -13169,7 +13169,7 @@ - + @@ -13182,7 +13182,7 @@ - + @@ -13192,7 +13192,7 @@ - + @@ -13200,7 +13200,7 @@ - + @@ -13213,7 +13213,7 @@ - + @@ -13223,7 +13223,7 @@ - + @@ -13231,7 +13231,7 @@ - + @@ -13244,7 +13244,7 @@ - + @@ -13254,7 +13254,7 @@ - + @@ -13262,7 +13262,7 @@ - + @@ -13275,7 +13275,7 @@ - + @@ -13285,7 +13285,7 @@ - + @@ -13293,7 +13293,7 @@ - + @@ -13306,7 +13306,7 @@ - + @@ -13316,7 +13316,7 @@ - + @@ -13324,7 +13324,7 @@ - + @@ -13337,7 +13337,7 @@ - + @@ -13347,7 +13347,7 @@ - + @@ -13355,7 +13355,7 @@ - + @@ -13368,7 +13368,7 @@ - + @@ -13378,7 +13378,7 @@ - + @@ -13386,7 +13386,7 @@ - + @@ -13399,7 +13399,7 @@ - + @@ -13409,7 +13409,7 @@ - + @@ -13417,7 +13417,7 @@ - + @@ -13430,7 +13430,7 @@ - + @@ -13440,7 +13440,7 @@ - + @@ -13448,7 +13448,7 @@ - + @@ -13461,7 +13461,7 @@ - + @@ -13471,7 +13471,7 @@ - + @@ -13479,7 +13479,7 @@ - + @@ -13492,7 +13492,7 @@ - + @@ -13502,7 +13502,7 @@ - + @@ -13510,7 +13510,7 @@ - + @@ -13523,7 +13523,7 @@ - + @@ -13533,7 +13533,7 @@ - + @@ -13541,7 +13541,7 @@ - + @@ -13554,7 +13554,7 @@ - + @@ -13564,7 +13564,7 @@ - + @@ -13572,7 +13572,7 @@ - + @@ -13585,7 +13585,7 @@ - + @@ -13595,7 +13595,7 @@ - + @@ -13603,7 +13603,7 @@ - + @@ -13616,7 +13616,7 @@ - + @@ -13626,7 +13626,7 @@ - + @@ -13634,7 +13634,7 @@ - + @@ -13647,7 +13647,7 @@ - + @@ -13657,7 +13657,7 @@ - + @@ -13665,7 +13665,7 @@ - + @@ -13678,7 +13678,7 @@ - + @@ -13688,7 +13688,7 @@ - + @@ -13696,7 +13696,7 @@ - + @@ -13709,7 +13709,7 @@ - + @@ -13719,7 +13719,7 @@ - + @@ -13727,7 +13727,7 @@ - + @@ -13740,7 +13740,7 @@ - + @@ -13750,7 +13750,7 @@ - + @@ -13758,7 +13758,7 @@ - + @@ -13771,7 +13771,7 @@ - + @@ -13781,7 +13781,7 @@ - + @@ -13789,7 +13789,7 @@ - + @@ -13802,7 +13802,7 @@ - + @@ -13812,7 +13812,7 @@ - + @@ -13820,7 +13820,7 @@ - + @@ -13833,7 +13833,7 @@ - + @@ -13843,7 +13843,7 @@ - + @@ -13851,7 +13851,7 @@ - + @@ -13864,7 +13864,7 @@ - + @@ -13874,7 +13874,7 @@ - + @@ -13882,7 +13882,7 @@ - + @@ -13895,7 +13895,7 @@ - + @@ -13905,7 +13905,7 @@ - + @@ -13913,7 +13913,7 @@ - + @@ -13926,7 +13926,7 @@ - + @@ -13936,7 +13936,7 @@ - + @@ -13944,7 +13944,7 @@ - + @@ -13957,7 +13957,7 @@ - + @@ -13967,7 +13967,7 @@ - + @@ -13975,7 +13975,7 @@ - + @@ -13988,7 +13988,7 @@ - + @@ -13998,7 +13998,7 @@ - + @@ -14006,7 +14006,7 @@ - + @@ -14019,7 +14019,7 @@ - + @@ -14029,7 +14029,7 @@ - + @@ -14037,7 +14037,7 @@ - + @@ -14050,7 +14050,7 @@ - + @@ -14060,7 +14060,7 @@ - + @@ -14068,7 +14068,7 @@ - + @@ -14081,7 +14081,7 @@ - + @@ -14091,7 +14091,7 @@ - + @@ -14099,7 +14099,7 @@ - + @@ -14112,7 +14112,7 @@ - + @@ -14122,7 +14122,7 @@ - + @@ -14130,7 +14130,7 @@ - + @@ -14143,7 +14143,7 @@ - + @@ -14153,7 +14153,7 @@ - + @@ -14161,7 +14161,7 @@ - + @@ -14174,7 +14174,7 @@ - + @@ -14184,7 +14184,7 @@ - + @@ -14192,7 +14192,7 @@ - + @@ -14205,38 +14205,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -14246,7 +14215,7 @@ - + @@ -14254,7 +14223,7 @@ - + @@ -14267,7 +14236,7 @@ - + @@ -14277,7 +14246,7 @@ - + @@ -14285,7 +14254,7 @@ - + @@ -14298,7 +14267,7 @@ - + @@ -14308,7 +14277,7 @@ - + @@ -14316,7 +14285,7 @@ - + @@ -14329,69 +14298,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -14401,7 +14308,7 @@ - + @@ -14409,7 +14316,7 @@ - + @@ -14422,7 +14329,7 @@ - + @@ -14432,7 +14339,7 @@ - + @@ -14440,7 +14347,7 @@ - + @@ -14453,7 +14360,7 @@ - + @@ -14463,7 +14370,7 @@ - + @@ -14471,7 +14378,7 @@ - + @@ -14484,7 +14391,7 @@ - + @@ -14494,7 +14401,7 @@ - + @@ -14502,7 +14409,7 @@ - + @@ -14515,7 +14422,7 @@ - + @@ -14525,7 +14432,7 @@ - + @@ -14533,7 +14440,7 @@ - + @@ -14546,7 +14453,7 @@ - + @@ -14556,7 +14463,7 @@ - + @@ -14564,7 +14471,7 @@ - + @@ -14577,7 +14484,7 @@ - + @@ -14587,7 +14494,7 @@ - + @@ -14595,7 +14502,7 @@ - + @@ -14608,7 +14515,7 @@ - + @@ -14618,7 +14525,7 @@ - + @@ -14626,7 +14533,7 @@ - + @@ -14639,7 +14546,7 @@ - + @@ -14649,7 +14556,7 @@ - + @@ -14657,7 +14564,7 @@ - + @@ -14670,38 +14577,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -14711,7 +14587,7 @@ - + @@ -14719,7 +14595,7 @@ - + @@ -14732,38 +14608,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -14773,7 +14618,7 @@ - + @@ -14781,7 +14626,7 @@ - + @@ -14794,7 +14639,7 @@ - + @@ -14804,7 +14649,7 @@ - + @@ -14812,7 +14657,7 @@ - + @@ -14825,7 +14670,7 @@ - + @@ -14835,7 +14680,7 @@ - + @@ -14843,7 +14688,7 @@ - + @@ -14856,7 +14701,7 @@ - + @@ -14866,7 +14711,7 @@ - + @@ -14874,7 +14719,7 @@ - + @@ -14887,7 +14732,7 @@ - + @@ -14897,7 +14742,7 @@ - + @@ -14905,7 +14750,7 @@ - + @@ -14918,7 +14763,7 @@ - + @@ -14928,7 +14773,7 @@ - + @@ -14936,7 +14781,7 @@ - + @@ -14949,7 +14794,7 @@ - + @@ -14959,7 +14804,7 @@ - + @@ -14967,7 +14812,7 @@ - + @@ -14980,7 +14825,7 @@ - + @@ -14990,7 +14835,7 @@ - + @@ -14998,7 +14843,7 @@ - + @@ -15011,7 +14856,7 @@ - + @@ -15021,7 +14866,7 @@ - + @@ -15029,7 +14874,7 @@ - + @@ -15042,7 +14887,7 @@ - + @@ -15052,7 +14897,7 @@ - + @@ -15060,7 +14905,7 @@ - + @@ -15073,7 +14918,7 @@ - + @@ -15083,7 +14928,7 @@ - + @@ -15091,7 +14936,7 @@ - + @@ -15104,7 +14949,7 @@ - + @@ -15114,7 +14959,7 @@ - + @@ -15122,7 +14967,7 @@ - + @@ -15135,7 +14980,7 @@ - + @@ -15145,7 +14990,7 @@ - + @@ -15153,7 +14998,7 @@ - + @@ -15166,7 +15011,7 @@ - + @@ -15176,7 +15021,7 @@ - + @@ -15184,7 +15029,7 @@ - + @@ -15197,7 +15042,7 @@ - + @@ -15207,7 +15052,7 @@ - + @@ -15215,7 +15060,7 @@ - + @@ -15228,7 +15073,7 @@ - + @@ -15238,7 +15083,7 @@ - + @@ -15246,7 +15091,7 @@ - + @@ -15259,7 +15104,7 @@ - + @@ -15269,7 +15114,7 @@ - + @@ -15277,7 +15122,7 @@ - + @@ -15288,12 +15133,167 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -15303,7 +15303,7 @@ - + @@ -15311,119 +15311,83 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + - + - - - + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - + + + - + - - - + + + + + + + + + + + @@ -15431,30 +15395,98 @@ - + - - + + + + + + + + + + + + + + - - - - - - - - - + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -15464,10 +15496,54 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -15481,7 +15557,295 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -15509,43 +15873,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -15559,7 +15887,825 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -15595,7 +16741,85 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -15655,9 +16879,9 @@ - - - + + + @@ -15667,169 +16891,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -15857,7 +16919,13 @@ - + + + + + + + @@ -15865,43 +16933,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -15929,43 +16961,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -15979,7 +16975,96 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -16007,43 +17092,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -16057,745 +17106,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -16823,48 +17134,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -16878,29 +17148,14 @@ - + - - - - - - - - - - - - - - - - - - + + + @@ -16910,25 +17165,10 @@ - - - - - - - - - - - - - - - - - + + - + @@ -16938,173 +17178,11 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -17125,11 +17203,15 @@ - - + + - + + + + + @@ -17140,44 +17222,32 @@ + + + + + + + + - - - - - + - - - - - + - - - - - - - - - - - - - + - + @@ -17188,10 +17258,6 @@ - - - - @@ -17205,7 +17271,7 @@ - + @@ -17213,39 +17279,51 @@ - + - + - - - - - - - - - - - - - + + + + + - + + + + + + + + + + + + + + + + + + + + + @@ -17261,7 +17339,75 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -17274,7 +17420,7 @@ - + @@ -17285,108 +17431,9 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -17459,7 +17506,7 @@ - + @@ -17472,7 +17519,7 @@ - + @@ -17483,16 +17530,49 @@ - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -17503,9 +17583,9 @@ - + - + @@ -17516,31 +17596,29 @@ - + - + - + - + - - - + - + @@ -17551,9 +17629,9 @@ - + - + From d97886116d00df9dd20115aa64fba66791456e8b Mon Sep 17 00:00:00 2001 From: gallowj Date: Fri, 18 Jun 2021 11:09:46 -0500 Subject: [PATCH 14/16] Adding reflection ang GI probe test data --- .../.src/objects/Test_Sponza_Materials.mb | 3 + .../test_sponza_material_conversion.prefab | 1240 +++++++++++++++++ .../Test_Sponza_Material_Conversion.fbx | 3 + ..._Sponza_Material_Conversion_black.material | 35 + ..._Sponza_Material_Conversion_green.material | 35 + ...onza_Material_Conversion_mat_arch.material | 49 + ...za_Material_Conversion_mat_bricks.material | 54 + ...nza_Material_Conversion_mat_floor.material | 51 + ...onza_Material_Conversion_mat_roof.material | 44 + ...Sponza_Material_Conversion_phong5.material | 35 + ...st_Sponza_Material_Conversion_red.material | 35 + ..._Sponza_Material_Conversion_white.material | 19 + .../TestData/white_latlong_iblskyboxcm.exr | 3 + 13 files changed, 1606 insertions(+) create mode 100644 Gems/AtomContent/Sponza/.src/objects/Test_Sponza_Materials.mb create mode 100644 Gems/AtomContent/Sponza/Assets/Prefabs/test_sponza_material_conversion.prefab create mode 100644 Gems/AtomContent/Sponza/Assets/TestData/Test_Sponza_Material_Conversion.fbx create mode 100644 Gems/AtomContent/Sponza/Assets/TestData/Test_Sponza_Material_Conversion_black.material create mode 100644 Gems/AtomContent/Sponza/Assets/TestData/Test_Sponza_Material_Conversion_green.material create mode 100644 Gems/AtomContent/Sponza/Assets/TestData/Test_Sponza_Material_Conversion_mat_arch.material create mode 100644 Gems/AtomContent/Sponza/Assets/TestData/Test_Sponza_Material_Conversion_mat_bricks.material create mode 100644 Gems/AtomContent/Sponza/Assets/TestData/Test_Sponza_Material_Conversion_mat_floor.material create mode 100644 Gems/AtomContent/Sponza/Assets/TestData/Test_Sponza_Material_Conversion_mat_roof.material create mode 100644 Gems/AtomContent/Sponza/Assets/TestData/Test_Sponza_Material_Conversion_phong5.material create mode 100644 Gems/AtomContent/Sponza/Assets/TestData/Test_Sponza_Material_Conversion_red.material create mode 100644 Gems/AtomContent/Sponza/Assets/TestData/Test_Sponza_Material_Conversion_white.material create mode 100644 Gems/AtomContent/Sponza/Assets/TestData/white_latlong_iblskyboxcm.exr diff --git a/Gems/AtomContent/Sponza/.src/objects/Test_Sponza_Materials.mb b/Gems/AtomContent/Sponza/.src/objects/Test_Sponza_Materials.mb new file mode 100644 index 0000000000..d5f12d2bca --- /dev/null +++ b/Gems/AtomContent/Sponza/.src/objects/Test_Sponza_Materials.mb @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5f4d124e84c8387f06b4b3a77bb3be1e7c3e0dcecb26a8934b89faa8203ed380 +size 84608 diff --git a/Gems/AtomContent/Sponza/Assets/Prefabs/test_sponza_material_conversion.prefab b/Gems/AtomContent/Sponza/Assets/Prefabs/test_sponza_material_conversion.prefab new file mode 100644 index 0000000000..b5aed9d14b --- /dev/null +++ b/Gems/AtomContent/Sponza/Assets/Prefabs/test_sponza_material_conversion.prefab @@ -0,0 +1,1240 @@ +{ + "Source": "Prefabs/test_sponza_material_conversion.prefab", + "ContainerEntity": { + "Id": "ContainerEntity", + "Name": "test_sponza_material_conversion", + "Components": { + "Component_[11355906858588942318]": { + "$type": "EditorEntitySortComponent", + "Id": 11355906858588942318 + }, + "Component_[12303631836799763574]": { + "$type": "EditorEntityIconComponent", + "Id": 12303631836799763574 + }, + "Component_[13884330903538620487]": { + "$type": "SelectionComponent", + "Id": 13884330903538620487 + }, + "Component_[14017626015546393905]": { + "$type": "EditorInspectorComponent", + "Id": 14017626015546393905 + }, + "Component_[15706249274315432595]": { + "$type": "EditorLockComponent", + "Id": 15706249274315432595 + }, + "Component_[17662098699702294917]": { + "$type": "EditorPendingCompositionComponent", + "Id": 17662098699702294917 + }, + "Component_[1984406083399463185]": { + "$type": "EditorOnlyEntityComponent", + "Id": 1984406083399463185 + }, + "Component_[3645983967515381372]": { + "$type": "EditorPrefabComponent", + "Id": 3645983967515381372 + }, + "Component_[7000715958539023355]": { + "$type": "EditorVisibilityComponent", + "Id": 7000715958539023355 + }, + "Component_[7182760741886065388]": { + "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent", + "Id": 7182760741886065388, + "Parent Entity": "", + "Cached World Transform Parent": "" + }, + "Component_[7314978375961307600]": { + "$type": "EditorDisabledCompositionComponent", + "Id": 7314978375961307600 + } + }, + "IsDependencyReady": true + }, + "Entities": { + "Entity_[1220355829629]": { + "Id": "Entity_[1220355829629]", + "Name": "GiTestProbe", + "Components": { + "Component_[12581383605035992405]": { + "$type": "SelectionComponent", + "Id": 12581383605035992405 + }, + "Component_[14182862666898786767]": { + "$type": "AZ::Render::EditorReflectionProbeComponent", + "Id": 14182862666898786767, + "Controller": { + "Configuration": { + "OuterHeight": 8.0, + "OuterLength": 8.0, + "OuterWidth": 8.0, + "InnerHeight": 8.0, + "InnerLength": 8.0, + "InnerWidth": 8.0, + "BakedCubeMapRelativePath": "ReflectionProbes/GiTestProbe__0564394E-2435-488E-A30C-E999F79FB049__iblspecularcm256.dds", + "BakedCubeMapAsset": { + "assetId": { + "guid": "{B05482A4-7D4D-5C6D-96DD-54CB9A227307}", + "subId": 2000 + }, + "loadBehavior": "PreLoad", + "assetHint": "reflectionprobes/gitestprobe__0564394e-2435-488e-a30c-e999f79fb049__iblspecularcm256.dds.streamingimage" + }, + "EntityId": 12080580926711778904 + } + }, + "bakedCubeMapRelativePath": "ReflectionProbes/GiTestProbe__0564394E-2435-488E-A30C-E999F79FB049__iblspecularcm256.dds" + }, + "Component_[16557111097824744403]": { + "$type": "EditorBoxShapeComponent", + "Id": 16557111097824744403, + "BoxShape": { + "Configuration": { + "Dimensions": [ + 8.0, + 8.0, + 8.0 + ] + } + } + }, + "Component_[16623349159368925155]": { + "$type": "EditorPendingCompositionComponent", + "Id": 16623349159368925155 + }, + "Component_[17588593493138070858]": { + "$type": "EditorVisibilityComponent", + "Id": 17588593493138070858 + }, + "Component_[18332655128892032441]": { + "$type": "EditorOnlyEntityComponent", + "Id": 18332655128892032441 + }, + "Component_[344586797989012598]": { + "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent", + "Id": 344586797989012598, + "Parent Entity": "Entity_[1250420600701]", + "Transform Data": { + "Translate": [ + 0.0, + 0.0, + 4.0 + ] + }, + "Cached World Transform": { + "Translation": [ + 0.0, + 0.0, + 4.099999904632568 + ] + }, + "Cached World Transform Parent": "Entity_[1250420600701]" + }, + "Component_[5703653759245493769]": { + "$type": "EditorLockComponent", + "Id": 5703653759245493769 + }, + "Component_[7030857297912025340]": { + "$type": "EditorDisabledCompositionComponent", + "Id": 7030857297912025340, + "DisabledComponents": [ + { + "$type": "AZ::Render::EditorDiffuseProbeGridComponent", + "Id": 1614505811629141904, + "Controller": { + "Configuration": { + "ProbeSpacing": [ + 0.5, + 0.5, + 0.5 + ], + "Extents": [ + 8.0, + 8.0, + 8.0 + ] + } + }, + "probeSpacingX": 0.5, + "probeSpacingY": 0.5, + "probeSpacingZ": 0.5 + } + ] + }, + "Component_[7984183259827618750]": { + "$type": "EditorEntitySortComponent", + "Id": 7984183259827618750 + }, + "Component_[827806435204448771]": { + "$type": "EditorEntityIconComponent", + "Id": 827806435204448771 + }, + "Component_[8673278437899912468]": { + "$type": "EditorInspectorComponent", + "Id": 8673278437899912468 + } + }, + "IsDependencyReady": true + }, + "Entity_[1224650796925]": { + "Id": "Entity_[1224650796925]", + "Name": "Camera", + "Components": { + "Component_[10395754987446042279]": { + "$type": "AZ::Render::EditorPostFxLayerComponent", + "Id": 10395754987446042279 + }, + "Component_[11895140916889160460]": { + "$type": "EditorEntityIconComponent", + "Id": 11895140916889160460 + }, + "Component_[16880285896855930892]": { + "$type": "{CA11DA46-29FF-4083-B5F6-E02C3A8C3A3D} EditorCameraComponent", + "Id": 16880285896855930892, + "Controller": { + "Configuration": { + "Field of View": 55.0, + "EditorEntityId": 8929576024571800510 + } + } + }, + "Component_[17187464423780271193]": { + "$type": "EditorLockComponent", + "Id": 17187464423780271193 + }, + "Component_[17495696818315413311]": { + "$type": "EditorEntitySortComponent", + "Id": 17495696818315413311 + }, + "Component_[1798550073623453489]": { + "$type": "AZ::Render::EditorExposureControlComponent", + "Id": 1798550073623453489, + "Controller": { + "Configuration": { + "ExposureControlType": 1 + } + } + }, + "Component_[18086214374043522055]": { + "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent", + "Id": 18086214374043522055, + "Parent Entity": "Entity_[1250420600701]", + "Transform Data": { + "Translate": [ + 1.7387686967849732, + 1.752368450164795, + 5.225453853607178 + ], + "Rotate": [ + 34.95081329345703, + -29.21880340576172, + 145.06878662109376 + ] + }, + "Cached World Transform": { + "Translation": [ + 1.7387685775756837, + 1.7523683309555054, + 5.325453281402588 + ], + "Rotation": [ + -0.14265206456184388, + -0.3503122329711914, + 0.8573471903800964, + 0.3491239547729492 + ] + }, + "Cached World Transform Parent": "Entity_[1250420600701]" + }, + "Component_[18387556550380114975]": { + "$type": "SelectionComponent", + "Id": 18387556550380114975 + }, + "Component_[2654521436129313160]": { + "$type": "EditorVisibilityComponent", + "Id": 2654521436129313160 + }, + "Component_[5265045084611556958]": { + "$type": "EditorDisabledCompositionComponent", + "Id": 5265045084611556958 + }, + "Component_[7169798125182238623]": { + "$type": "EditorPendingCompositionComponent", + "Id": 7169798125182238623 + }, + "Component_[8866210352157164042]": { + "$type": "EditorInspectorComponent", + "Id": 8866210352157164042 + }, + "Component_[9129253381063760879]": { + "$type": "EditorOnlyEntityComponent", + "Id": 9129253381063760879 + } + }, + "IsDependencyReady": true + }, + "Entity_[1228945764221]": { + "Id": "Entity_[1228945764221]", + "Name": "Global Sky", + "Components": { + "Component_[11231930600558681245]": { + "$type": "AZ::Render::EditorHDRiSkyboxComponent", + "Id": 11231930600558681245, + "Controller": { + "Configuration": { + "CubemapAsset": { + "assetId": { + "guid": "{874DA395-146F-5198-90AD-532F18954407}", + "subId": 1000 + }, + "assetHint": "testdata/white_latlong_iblskyboxcm.exr.streamingimage" + } + } + } + }, + "Component_[11980494120202836095]": { + "$type": "SelectionComponent", + "Id": 11980494120202836095 + }, + "Component_[1428633914413949476]": { + "$type": "EditorLockComponent", + "Id": 1428633914413949476 + }, + "Component_[14936200426671614999]": { + "$type": "AZ::Render::EditorImageBasedLightComponent", + "Id": 14936200426671614999, + "Controller": { + "Configuration": { + "diffuseImageAsset": { + "assetId": { + "guid": "{874DA395-146F-5198-90AD-532F18954407}", + "subId": 3000 + }, + "assetHint": "testdata/white_latlong_iblskyboxcm_ibldiffuse.exr.streamingimage" + }, + "specularImageAsset": { + "assetId": { + "guid": "{874DA395-146F-5198-90AD-532F18954407}", + "subId": 2000 + }, + "assetHint": "testdata/white_latlong_iblskyboxcm_iblspecular.exr.streamingimage" + } + } + } + }, + "Component_[14994774102579326069]": { + "$type": "EditorDisabledCompositionComponent", + "Id": 14994774102579326069 + }, + "Component_[15417479889044493340]": { + "$type": "EditorPendingCompositionComponent", + "Id": 15417479889044493340 + }, + "Component_[15826613364991382688]": { + "$type": "EditorEntitySortComponent", + "Id": 15826613364991382688 + }, + "Component_[1665003113283562343]": { + "$type": "EditorOnlyEntityComponent", + "Id": 1665003113283562343 + }, + "Component_[3704934735944502280]": { + "$type": "EditorEntityIconComponent", + "Id": 3704934735944502280 + }, + "Component_[5698542331457326479]": { + "$type": "EditorVisibilityComponent", + "Id": 5698542331457326479 + }, + "Component_[6644513399057217122]": { + "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent", + "Id": 6644513399057217122, + "Parent Entity": "Entity_[1250420600701]", + "Transform Data": { + "Translate": [ + 0.0, + 0.0, + -0.10000000149011612 + ] + }, + "Cached World Transform Parent": "Entity_[1250420600701]" + }, + "Component_[931091830724002070]": { + "$type": "EditorInspectorComponent", + "Id": 931091830724002070 + } + }, + "IsDependencyReady": true + }, + "Entity_[1233240731517]": { + "Id": "Entity_[1233240731517]", + "Name": "Shader Ball", + "Components": { + "Component_[10789351944715265527]": { + "$type": "EditorOnlyEntityComponent", + "Id": 10789351944715265527 + }, + "Component_[12037033284781049225]": { + "$type": "EditorEntitySortComponent", + "Id": 12037033284781049225 + }, + "Component_[13759153306105970079]": { + "$type": "EditorPendingCompositionComponent", + "Id": 13759153306105970079 + }, + "Component_[14135560884830586279]": { + "$type": "EditorInspectorComponent", + "Id": 14135560884830586279 + }, + "Component_[16247165675903986673]": { + "$type": "EditorVisibilityComponent", + "Id": 16247165675903986673 + }, + "Component_[18082433625958885247]": { + "$type": "EditorDisabledCompositionComponent", + "Id": 18082433625958885247 + }, + "Component_[6472623349872972660]": { + "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent", + "Id": 6472623349872972660, + "Parent Entity": "Entity_[1250420600701]", + "Transform Data": { + "Rotate": [ + 0.0, + 0.10000000149011612, + 180.0 + ] + }, + "Cached World Transform": { + "Translation": [ + 0.0, + 0.0, + 0.10000000149011612 + ], + "Rotation": [ + 0.0008726645028218627, + 0.0, + 0.9999996423721314, + 0.0 + ] + }, + "Cached World Transform Parent": "Entity_[1250420600701]" + }, + "Component_[6495255223970673916]": { + "$type": "AZ::Render::EditorMeshComponent", + "Id": 6495255223970673916, + "Controller": { + "Configuration": { + "ModelAsset": { + "assetId": { + "guid": "{FD340C30-755C-5911-92A3-19A3F7A77931}", + "subId": 281415304 + }, + "assetHint": "objects/shaderball/shaderball_default_1m.azmodel" + } + } + } + }, + "Component_[8056625192494070973]": { + "$type": "SelectionComponent", + "Id": 8056625192494070973 + }, + "Component_[8550141614185782969]": { + "$type": "EditorEntityIconComponent", + "Id": 8550141614185782969 + }, + "Component_[9439770997198325425]": { + "$type": "EditorLockComponent", + "Id": 9439770997198325425 + } + }, + "IsDependencyReady": true + }, + "Entity_[1237535698813]": { + "Id": "Entity_[1237535698813]", + "Name": "Sun", + "Components": { + "Component_[10440557478882592717]": { + "$type": "SelectionComponent", + "Id": 10440557478882592717 + }, + "Component_[13620450453324765907]": { + "$type": "EditorLockComponent", + "Id": 13620450453324765907 + }, + "Component_[2134313378593666258]": { + "$type": "EditorInspectorComponent", + "Id": 2134313378593666258 + }, + "Component_[234010807770404186]": { + "$type": "EditorVisibilityComponent", + "Id": 234010807770404186 + }, + "Component_[2970359110423865725]": { + "$type": "EditorEntityIconComponent", + "Id": 2970359110423865725 + }, + "Component_[3722854130373041803]": { + "$type": "EditorOnlyEntityComponent", + "Id": 3722854130373041803 + }, + "Component_[5992533738676323195]": { + "$type": "EditorDisabledCompositionComponent", + "Id": 5992533738676323195 + }, + "Component_[7378860763541895402]": { + "$type": "AZ::Render::EditorDirectionalLightComponent", + "Id": 7378860763541895402, + "Controller": { + "Configuration": { + "Intensity": 0.0, + "CameraEntityId": "", + "ShadowFilterMethod": 1 + } + } + }, + "Component_[7892834440890947578]": { + "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent", + "Id": 7892834440890947578, + "Parent Entity": "Entity_[1250420600701]", + "Transform Data": { + "Translate": [ + 0.0, + 0.0, + 13.38704299926758 + ], + "Rotate": [ + -76.1310043334961, + -0.8469989895820618, + -15.8100004196167 + ] + }, + "Cached World Transform": { + "Translation": [ + 0.0, + 0.0, + 13.487043380737305 + ], + "Rotation": [ + -0.609886109828949, + -0.09055805951356888, + -0.10376212745904924, + 0.7804304361343384 + ] + }, + "Cached World Transform Parent": "Entity_[1250420600701]" + }, + "Component_[8599729549570828259]": { + "$type": "EditorEntitySortComponent", + "Id": 8599729549570828259 + }, + "Component_[952797371922080273]": { + "$type": "EditorPendingCompositionComponent", + "Id": 952797371922080273 + } + }, + "IsDependencyReady": true + }, + "Entity_[1241830666109]": { + "Id": "Entity_[1241830666109]", + "Name": "Ground", + "Components": { + "Component_[11701138785793981042]": { + "$type": "SelectionComponent", + "Id": 11701138785793981042 + }, + "Component_[12260880513256986252]": { + "$type": "EditorEntityIconComponent", + "Id": 12260880513256986252 + }, + "Component_[13711420870643673468]": { + "$type": "EditorDisabledCompositionComponent", + "Id": 13711420870643673468 + }, + "Component_[138002849734991713]": { + "$type": "EditorOnlyEntityComponent", + "Id": 138002849734991713 + }, + "Component_[16578565737331764849]": { + "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent", + "Id": 16578565737331764849, + "Parent Entity": "Entity_[1250420600701]", + "Transform Data": { + "Translate": [ + 0.0, + 0.0, + -0.10000000149011612 + ] + }, + "Cached World Transform Parent": "Entity_[1250420600701]" + }, + "Component_[16919232076966545697]": { + "$type": "EditorInspectorComponent", + "Id": 16919232076966545697 + }, + "Component_[5182430712893438093]": { + "$type": "EditorMaterialComponent", + "Id": 5182430712893438093, + "materialSlots": [ + { + "id": { + "materialAssetId": { + "guid": "{935F694A-8639-515B-8133-81CDC7948E5B}", + "subId": 803645540 + } + } + } + ], + "materialSlotsByLod": [ + [ + { + "id": { + "lodIndex": 0, + "materialAssetId": { + "guid": "{935F694A-8639-515B-8133-81CDC7948E5B}", + "subId": 803645540 + } + } + } + ] + ] + }, + "Component_[5675108321710651991]": { + "$type": "AZ::Render::EditorMeshComponent", + "Id": 5675108321710651991, + "Controller": { + "Configuration": { + "ModelAsset": { + "assetId": { + "guid": "{935F694A-8639-515B-8133-81CDC7948E5B}", + "subId": 277333723 + }, + "assetHint": "objects/groudplane/groundplane_521x521m.azmodel" + } + } + } + }, + "Component_[5681893399601237518]": { + "$type": "EditorEntitySortComponent", + "Id": 5681893399601237518 + }, + "Component_[592692962543397545]": { + "$type": "EditorPendingCompositionComponent", + "Id": 592692962543397545 + }, + "Component_[7090012899106946164]": { + "$type": "EditorLockComponent", + "Id": 7090012899106946164 + }, + "Component_[9410832619875640998]": { + "$type": "EditorVisibilityComponent", + "Id": 9410832619875640998 + } + }, + "IsDependencyReady": true + }, + "Entity_[1246125633405]": { + "Id": "Entity_[1246125633405]", + "Name": "Grid", + "Components": { + "Component_[11443347433215807130]": { + "$type": "EditorEntityIconComponent", + "Id": 11443347433215807130 + }, + "Component_[11779275529534764488]": { + "$type": "SelectionComponent", + "Id": 11779275529534764488 + }, + "Component_[14249419413039427459]": { + "$type": "EditorInspectorComponent", + "Id": 14249419413039427459 + }, + "Component_[15448581635946161318]": { + "$type": "AZ::Render::EditorGridComponent", + "Id": 15448581635946161318, + "Controller": { + "Configuration": { + "primarySpacing": 4.0, + "primaryColor": [ + 0.501960813999176, + 0.501960813999176, + 0.501960813999176 + ], + "secondarySpacing": 0.5, + "secondaryColor": [ + 0.250980406999588, + 0.250980406999588, + 0.250980406999588 + ] + } + } + }, + "Component_[1843303322527297409]": { + "$type": "EditorDisabledCompositionComponent", + "Id": 1843303322527297409 + }, + "Component_[380249072065273654]": { + "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent", + "Id": 380249072065273654, + "Parent Entity": "Entity_[1250420600701]", + "Transform Data": { + "Translate": [ + 0.0, + 0.0, + -0.10000000149011612 + ] + }, + "Cached World Transform Parent": "Entity_[1250420600701]" + }, + "Component_[7476660583684339787]": { + "$type": "EditorPendingCompositionComponent", + "Id": 7476660583684339787 + }, + "Component_[7557626501215118375]": { + "$type": "EditorEntitySortComponent", + "Id": 7557626501215118375 + }, + "Component_[7984048488947365511]": { + "$type": "EditorVisibilityComponent", + "Id": 7984048488947365511 + }, + "Component_[8118181039276487398]": { + "$type": "EditorOnlyEntityComponent", + "Id": 8118181039276487398 + }, + "Component_[9189909764215270515]": { + "$type": "EditorLockComponent", + "Id": 9189909764215270515 + } + }, + "IsDependencyReady": true + }, + "Entity_[1250420600701]": { + "Id": "Entity_[1250420600701]", + "Name": "test_sponza_material_conversion", + "Components": { + "Component_[11342679732910125733]": { + "$type": "AZ::Render::EditorMeshComponent", + "Id": 11342679732910125733, + "Controller": { + "Configuration": { + "ModelAsset": { + "assetId": { + "guid": "{7D2F89D6-2634-5EE6-A122-638377C0CB21}", + "subId": 273579101 + }, + "assetHint": "testdata/test_sponza_material_conversion.azmodel" + } + } + } + }, + "Component_[11482250315251448254]": { + "$type": "EditorEntityIconComponent", + "Id": 11482250315251448254 + }, + "Component_[12520362418832404237]": { + "$type": "EditorVisibilityComponent", + "Id": 12520362418832404237 + }, + "Component_[13922696236864086628]": { + "$type": "EditorInspectorComponent", + "Id": 13922696236864086628, + "ComponentOrderEntryArray": [ + { + "ComponentId": 9795135998007712828 + }, + { + "ComponentId": 11342679732910125733, + "SortIndex": 1 + }, + { + "ComponentId": 14504829236779989058, + "SortIndex": 2 + } + ] + }, + "Component_[14504829236779989058]": { + "$type": "EditorMaterialComponent", + "Id": 14504829236779989058, + "Controller": { + "Configuration": { + "materials": [ + { + "Key": { + "materialAssetId": { + "guid": "{7D2F89D6-2634-5EE6-A122-638377C0CB21}", + "subId": 40852248 + } + }, + "Value": { + "MaterialAsset": { + "assetId": { + "guid": "{1D8B391C-DEB3-549E-9A30-14A6989B1B50}" + }, + "assetHint": "testdata/test_sponza_material_conversion_mat_floor.azmaterial" + } + } + }, + { + "Key": { + "materialAssetId": { + "guid": "{7D2F89D6-2634-5EE6-A122-638377C0CB21}", + "subId": 842740826 + } + }, + "Value": { + "MaterialAsset": { + "assetId": { + "guid": "{F3C97FF0-8FC7-5207-9E97-21D680962068}" + } + } + } + }, + { + "Key": { + "materialAssetId": { + "guid": "{7D2F89D6-2634-5EE6-A122-638377C0CB21}", + "subId": 1262202891 + } + }, + "Value": { + "MaterialAsset": { + "assetId": { + "guid": "{AF16DFCF-E1E9-57B9-8F01-A49AAC1962AE}" + } + } + } + }, + { + "Key": { + "materialAssetId": { + "guid": "{7D2F89D6-2634-5EE6-A122-638377C0CB21}", + "subId": 2438226774 + } + }, + "Value": { + "MaterialAsset": { + "assetId": { + "guid": "{4310E0FE-532D-5436-A946-49B2E14B0375}" + } + } + } + }, + { + "Key": { + "materialAssetId": { + "guid": "{7D2F89D6-2634-5EE6-A122-638377C0CB21}", + "subId": 2816279700 + } + }, + "Value": { + "MaterialAsset": { + "assetId": { + "guid": "{6339FEBB-4293-5CEF-809A-2BE072AC94D6}" + }, + "assetHint": "testdata/test_sponza_material_conversion_mat_bricks.azmaterial" + } + } + }, + { + "Key": { + "materialAssetId": { + "guid": "{7D2F89D6-2634-5EE6-A122-638377C0CB21}", + "subId": 3157644117 + } + }, + "Value": { + "MaterialAsset": { + "assetId": { + "guid": "{3EF8BEDB-8DE0-5550-A994-D542086622B7}" + }, + "assetHint": "testdata/test_sponza_material_conversion_mat_arch.azmaterial" + }, + "PropertyOverrides": { + "general.applySpecularAA": { + "$type": "bool", + "Value": true + } + } + } + }, + { + "Key": { + "materialAssetId": { + "guid": "{7D2F89D6-2634-5EE6-A122-638377C0CB21}", + "subId": 3208782114 + } + }, + "Value": { + "MaterialAsset": { + "assetId": { + "guid": "{CCA05CBE-2606-59A3-91A9-E46F97980A38}" + } + } + } + }, + { + "Key": { + "materialAssetId": { + "guid": "{7D2F89D6-2634-5EE6-A122-638377C0CB21}", + "subId": 3591631827 + } + }, + "Value": { + "MaterialAsset": { + "assetId": { + "guid": "{B45DCFD4-6B12-5212-AB92-B64E064155CE}" + } + } + } + }, + { + "Key": { + "materialAssetId": { + "guid": "{7D2F89D6-2634-5EE6-A122-638377C0CB21}", + "subId": 3888291602 + } + }, + "Value": { + "MaterialAsset": { + "assetId": { + "guid": "{E6A159AA-989D-5534-8550-1E002148AC84}" + }, + "assetHint": "testdata/test_sponza_material_conversion_mat_roof.azmaterial" + } + } + } + ] + } + }, + "materialSlots": [ + { + "id": { + "materialAssetId": { + "guid": "{7D2F89D6-2634-5EE6-A122-638377C0CB21}", + "subId": 842740826 + } + }, + "materialAsset": { + "assetId": { + "guid": "{F3C97FF0-8FC7-5207-9E97-21D680962068}" + } + } + }, + { + "id": { + "materialAssetId": { + "guid": "{7D2F89D6-2634-5EE6-A122-638377C0CB21}", + "subId": 3208782114 + } + }, + "materialAsset": { + "assetId": { + "guid": "{CCA05CBE-2606-59A3-91A9-E46F97980A38}" + } + } + }, + { + "id": { + "materialAssetId": { + "guid": "{7D2F89D6-2634-5EE6-A122-638377C0CB21}", + "subId": 3157644117 + } + }, + "materialAsset": { + "assetId": { + "guid": "{3EF8BEDB-8DE0-5550-A994-D542086622B7}" + }, + "assetHint": "testdata/test_sponza_material_conversion_mat_arch.azmaterial" + } + }, + { + "id": { + "materialAssetId": { + "guid": "{7D2F89D6-2634-5EE6-A122-638377C0CB21}", + "subId": 2816279700 + } + }, + "materialAsset": { + "assetId": { + "guid": "{6339FEBB-4293-5CEF-809A-2BE072AC94D6}" + }, + "assetHint": "testdata/test_sponza_material_conversion_mat_bricks.azmaterial" + } + }, + { + "id": { + "materialAssetId": { + "guid": "{7D2F89D6-2634-5EE6-A122-638377C0CB21}", + "subId": 40852248 + } + }, + "materialAsset": { + "assetId": { + "guid": "{1D8B391C-DEB3-549E-9A30-14A6989B1B50}" + }, + "assetHint": "testdata/test_sponza_material_conversion_mat_floor.azmaterial" + } + }, + { + "id": { + "materialAssetId": { + "guid": "{7D2F89D6-2634-5EE6-A122-638377C0CB21}", + "subId": 3888291602 + } + }, + "materialAsset": { + "assetId": { + "guid": "{E6A159AA-989D-5534-8550-1E002148AC84}" + }, + "assetHint": "testdata/test_sponza_material_conversion_mat_roof.azmaterial" + } + }, + { + "id": { + "materialAssetId": { + "guid": "{7D2F89D6-2634-5EE6-A122-638377C0CB21}", + "subId": 2438226774 + } + }, + "materialAsset": { + "assetId": { + "guid": "{4310E0FE-532D-5436-A946-49B2E14B0375}" + } + } + }, + { + "id": { + "materialAssetId": { + "guid": "{7D2F89D6-2634-5EE6-A122-638377C0CB21}", + "subId": 1262202891 + } + }, + "materialAsset": { + "assetId": { + "guid": "{AF16DFCF-E1E9-57B9-8F01-A49AAC1962AE}" + } + } + }, + { + "id": { + "materialAssetId": { + "guid": "{7D2F89D6-2634-5EE6-A122-638377C0CB21}", + "subId": 3591631827 + } + }, + "materialAsset": { + "assetId": { + "guid": "{B45DCFD4-6B12-5212-AB92-B64E064155CE}" + } + } + } + ], + "materialSlotsByLod": [ + [ + { + "id": { + "lodIndex": 0, + "materialAssetId": { + "guid": "{7D2F89D6-2634-5EE6-A122-638377C0CB21}", + "subId": 842740826 + } + }, + "materialAsset": { + "assetId": { + "guid": "{F3C97FF0-8FC7-5207-9E97-21D680962068}" + } + } + }, + { + "id": { + "lodIndex": 0, + "materialAssetId": { + "guid": "{7D2F89D6-2634-5EE6-A122-638377C0CB21}", + "subId": 3208782114 + } + }, + "materialAsset": { + "assetId": { + "guid": "{CCA05CBE-2606-59A3-91A9-E46F97980A38}" + } + } + }, + { + "id": { + "lodIndex": 0, + "materialAssetId": { + "guid": "{7D2F89D6-2634-5EE6-A122-638377C0CB21}", + "subId": 3157644117 + } + }, + "materialAsset": { + "assetId": { + "guid": "{3EF8BEDB-8DE0-5550-A994-D542086622B7}" + }, + "assetHint": "testdata/test_sponza_material_conversion_mat_arch.azmaterial" + } + }, + { + "id": { + "lodIndex": 0, + "materialAssetId": { + "guid": "{7D2F89D6-2634-5EE6-A122-638377C0CB21}", + "subId": 2816279700 + } + }, + "materialAsset": { + "assetId": { + "guid": "{6339FEBB-4293-5CEF-809A-2BE072AC94D6}" + }, + "assetHint": "testdata/test_sponza_material_conversion_mat_bricks.azmaterial" + } + }, + { + "id": { + "lodIndex": 0, + "materialAssetId": { + "guid": "{7D2F89D6-2634-5EE6-A122-638377C0CB21}", + "subId": 40852248 + } + }, + "materialAsset": { + "assetId": { + "guid": "{1D8B391C-DEB3-549E-9A30-14A6989B1B50}" + }, + "assetHint": "testdata/test_sponza_material_conversion_mat_floor.azmaterial" + } + }, + { + "id": { + "lodIndex": 0, + "materialAssetId": { + "guid": "{7D2F89D6-2634-5EE6-A122-638377C0CB21}", + "subId": 3888291602 + } + }, + "materialAsset": { + "assetId": { + "guid": "{E6A159AA-989D-5534-8550-1E002148AC84}" + }, + "assetHint": "testdata/test_sponza_material_conversion_mat_roof.azmaterial" + } + }, + { + "id": { + "lodIndex": 0, + "materialAssetId": { + "guid": "{7D2F89D6-2634-5EE6-A122-638377C0CB21}", + "subId": 2438226774 + } + }, + "materialAsset": { + "assetId": { + "guid": "{4310E0FE-532D-5436-A946-49B2E14B0375}" + } + } + }, + { + "id": { + "lodIndex": 0, + "materialAssetId": { + "guid": "{7D2F89D6-2634-5EE6-A122-638377C0CB21}", + "subId": 1262202891 + } + }, + "materialAsset": { + "assetId": { + "guid": "{AF16DFCF-E1E9-57B9-8F01-A49AAC1962AE}" + } + } + }, + { + "id": { + "lodIndex": 0, + "materialAssetId": { + "guid": "{7D2F89D6-2634-5EE6-A122-638377C0CB21}", + "subId": 3591631827 + } + }, + "materialAsset": { + "assetId": { + "guid": "{B45DCFD4-6B12-5212-AB92-B64E064155CE}" + } + } + } + ] + ] + }, + "Component_[16137637180608547307]": { + "$type": "EditorPendingCompositionComponent", + "Id": 16137637180608547307 + }, + "Component_[17072211258387308642]": { + "$type": "EditorOnlyEntityComponent", + "Id": 17072211258387308642 + }, + "Component_[2587501640342227295]": { + "$type": "EditorDisabledCompositionComponent", + "Id": 2587501640342227295 + }, + "Component_[4820742733748380832]": { + "$type": "SelectionComponent", + "Id": 4820742733748380832 + }, + "Component_[5027382790057670521]": { + "$type": "EditorLockComponent", + "Id": 5027382790057670521 + }, + "Component_[7651519254420083868]": { + "$type": "EditorEntitySortComponent", + "Id": 7651519254420083868, + "ChildEntityOrderEntryArray": [ + { + "EntityId": "Entity_[1246125633405]" + }, + { + "EntityId": "Entity_[1228945764221]", + "SortIndex": 1 + }, + { + "EntityId": "Entity_[1220355829629]", + "SortIndex": 2 + }, + { + "EntityId": "Entity_[1224650796925]", + "SortIndex": 3 + }, + { + "EntityId": "Entity_[1233240731517]", + "SortIndex": 4 + }, + { + "EntityId": "Entity_[1237535698813]", + "SortIndex": 5 + }, + { + "EntityId": "Entity_[1241830666109]", + "SortIndex": 6 + } + ] + }, + "Component_[9795135998007712828]": { + "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent", + "Id": 9795135998007712828, + "Parent Entity": "ContainerEntity", + "Cached World Transform": { + "Translation": [ + 0.0, + 0.0, + 0.10000000149011612 + ] + }, + "Cached World Transform Parent": "ContainerEntity" + } + }, + "IsDependencyReady": true + } + } +} \ No newline at end of file diff --git a/Gems/AtomContent/Sponza/Assets/TestData/Test_Sponza_Material_Conversion.fbx b/Gems/AtomContent/Sponza/Assets/TestData/Test_Sponza_Material_Conversion.fbx new file mode 100644 index 0000000000..638828984a --- /dev/null +++ b/Gems/AtomContent/Sponza/Assets/TestData/Test_Sponza_Material_Conversion.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9b936b72b5b45b52c188bf9f930d6066af65f0d79ff8abf5dc08927d97ac465e +size 55264 diff --git a/Gems/AtomContent/Sponza/Assets/TestData/Test_Sponza_Material_Conversion_black.material b/Gems/AtomContent/Sponza/Assets/TestData/Test_Sponza_Material_Conversion_black.material new file mode 100644 index 0000000000..cc2c9e785b --- /dev/null +++ b/Gems/AtomContent/Sponza/Assets/TestData/Test_Sponza_Material_Conversion_black.material @@ -0,0 +1,35 @@ +{ + "description": "", + "materialType": "Materials/Types/StandardPBR.materialtype", + "parentMaterial": "", + "propertyLayoutVersion": 3, + "properties": { + "baseColor": { + "color": [ + 0.0, + 0.0, + 0.0, + 1.0 + ] + }, + "emissive": { + "color": [ + 0.0, + 0.0, + 0.0, + 1.0 + ] + }, + "irradiance": { + "color": [ + 0.0, + 0.0, + 0.0, + 1.0 + ] + }, + "opacity": { + "factor": 1.0 + } + } +} \ No newline at end of file diff --git a/Gems/AtomContent/Sponza/Assets/TestData/Test_Sponza_Material_Conversion_green.material b/Gems/AtomContent/Sponza/Assets/TestData/Test_Sponza_Material_Conversion_green.material new file mode 100644 index 0000000000..a4bfb73d12 --- /dev/null +++ b/Gems/AtomContent/Sponza/Assets/TestData/Test_Sponza_Material_Conversion_green.material @@ -0,0 +1,35 @@ +{ + "description": "", + "materialType": "Materials/Types/StandardPBR.materialtype", + "parentMaterial": "", + "propertyLayoutVersion": 3, + "properties": { + "baseColor": { + "color": [ + 0.0, + 1.0, + 0.0, + 1.0 + ] + }, + "emissive": { + "color": [ + 0.0, + 0.0, + 0.0, + 1.0 + ] + }, + "irradiance": { + "color": [ + 0.0, + 1.0, + 0.0, + 1.0 + ] + }, + "opacity": { + "factor": 1.0 + } + } +} \ No newline at end of file diff --git a/Gems/AtomContent/Sponza/Assets/TestData/Test_Sponza_Material_Conversion_mat_arch.material b/Gems/AtomContent/Sponza/Assets/TestData/Test_Sponza_Material_Conversion_mat_arch.material new file mode 100644 index 0000000000..fe9c54bc02 --- /dev/null +++ b/Gems/AtomContent/Sponza/Assets/TestData/Test_Sponza_Material_Conversion_mat_arch.material @@ -0,0 +1,49 @@ +{ + "description": "", + "materialType": "Materials/Types/StandardPBR.materialtype", + "parentMaterial": "", + "propertyLayoutVersion": 3, + "properties": { + "baseColor": { + "color": [ + 0.800000011920929, + 0.800000011920929, + 0.800000011920929, + 1.0 + ], + "textureMap": "Textures/arch_1k_basecolor.png" + }, + "general": { + "applySpecularAA": true + }, + "irradiance": { + "color": [ + 1.0, + 0.885053813457489, + 0.801281750202179, + 1.0 + ] + }, + "metallic": { + "textureMap": "Textures/arch_1k_metallic.png" + }, + "normal": { + "textureMap": "Textures/arch_1k_normal.jpg" + }, + "occlusion": { + "diffuseTextureMap": "Textures/arch_1k_ao.png" + }, + "opacity": { + "factor": 1.0 + }, + "parallax": { + "factor": 0.050999999046325687, + "pdo": true, + "quality": "High", + "useTexture": false + }, + "roughness": { + "textureMap": "Textures/arch_1k_roughness.png" + } + } +} \ No newline at end of file diff --git a/Gems/AtomContent/Sponza/Assets/TestData/Test_Sponza_Material_Conversion_mat_bricks.material b/Gems/AtomContent/Sponza/Assets/TestData/Test_Sponza_Material_Conversion_mat_bricks.material new file mode 100644 index 0000000000..a19afa33e2 --- /dev/null +++ b/Gems/AtomContent/Sponza/Assets/TestData/Test_Sponza_Material_Conversion_mat_bricks.material @@ -0,0 +1,54 @@ +{ + "description": "", + "materialType": "Materials/Types/StandardPBR.materialtype", + "parentMaterial": "", + "propertyLayoutVersion": 3, + "properties": { + "baseColor": { + "color": [ + 0.800000011920929, + 0.800000011920929, + 0.800000011920929, + 1.0 + ], + "textureMap": "Textures/bricks_1k_basecolor.png" + }, + "clearCoat": { + "factor": 0.5, + "normalMap": "Textures/bricks_1k_normal.jpg", + "roughness": 0.5 + }, + "general": { + "applySpecularAA": true + }, + "irradiance": { + "color": [ + 1.0, + 0.9703211784362793, + 0.9703211784362793, + 1.0 + ] + }, + "metallic": { + "textureMap": "Textures/bricks_1k_metallic.png" + }, + "normal": { + "textureMap": "Textures/bricks_1k_normal.jpg" + }, + "occlusion": { + "diffuseTextureMap": "Textures/bricks_1k_ao.png" + }, + "opacity": { + "factor": 1.0 + }, + "parallax": { + "algorithm": "ContactRefinement", + "factor": 0.03500000014901161, + "quality": "Medium", + "useTexture": false + }, + "roughness": { + "textureMap": "Textures/bricks_1k_roughness.png" + } + } +} \ No newline at end of file diff --git a/Gems/AtomContent/Sponza/Assets/TestData/Test_Sponza_Material_Conversion_mat_floor.material b/Gems/AtomContent/Sponza/Assets/TestData/Test_Sponza_Material_Conversion_mat_floor.material new file mode 100644 index 0000000000..0c1208d8fb --- /dev/null +++ b/Gems/AtomContent/Sponza/Assets/TestData/Test_Sponza_Material_Conversion_mat_floor.material @@ -0,0 +1,51 @@ +{ + "description": "", + "materialType": "Materials/Types/StandardPBR.materialtype", + "parentMaterial": "", + "propertyLayoutVersion": 3, + "properties": { + "baseColor": { + "color": [ + 0.800000011920929, + 0.800000011920929, + 0.800000011920929, + 1.0 + ], + "textureMap": "Textures/floor_1k_basecolor.png" + }, + "clearCoat": { + "enable": true, + "influenceMap": "Textures/floor_1k_ao.png", + "normalMap": "Textures/floor_1k_normal.png", + "roughness": 0.25 + }, + "general": { + "applySpecularAA": true + }, + "irradiance": { + "color": [ + 1.0, + 0.9404135346412659, + 0.8688944578170776, + 1.0 + ] + }, + "normal": { + "textureMap": "Textures/floor_1k_normal.png" + }, + "occlusion": { + "diffuseTextureMap": "Textures/floor_1k_ao.png" + }, + "opacity": { + "factor": 1.0 + }, + "parallax": { + "factor": 0.012000000104308129, + "pdo": true, + "useTexture": false + }, + "roughness": { + "textureMap": "Textures/floor_1k_roughness.png" + } + } +} \ No newline at end of file diff --git a/Gems/AtomContent/Sponza/Assets/TestData/Test_Sponza_Material_Conversion_mat_roof.material b/Gems/AtomContent/Sponza/Assets/TestData/Test_Sponza_Material_Conversion_mat_roof.material new file mode 100644 index 0000000000..6aad4d644a --- /dev/null +++ b/Gems/AtomContent/Sponza/Assets/TestData/Test_Sponza_Material_Conversion_mat_roof.material @@ -0,0 +1,44 @@ +{ + "description": "", + "materialType": "Materials/Types/StandardPBR.materialtype", + "parentMaterial": "", + "propertyLayoutVersion": 3, + "properties": { + "baseColor": { + "color": [ + 0.800000011920929, + 0.800000011920929, + 0.800000011920929, + 1.0 + ], + "textureBlendMode": "Lerp", + "textureMap": "Textures/roof_1k_basecolor.png" + }, + "general": { + "applySpecularAA": true + }, + "metallic": { + "useTexture": false + }, + "normal": { + "factor": 0.5, + "flipY": true, + "textureMap": "Textures/roof_1k_normal.jpg" + }, + "occlusion": { + "diffuseTextureMap": "Textures/roof_1k_ao.png" + }, + "opacity": { + "factor": 1.0 + }, + "parallax": { + "algorithm": "ContactRefinement", + "factor": 0.019999999552965165, + "quality": "Medium", + "useTexture": false + }, + "roughness": { + "textureMap": "Textures/roof_1k_roughness.png" + } + } +} \ No newline at end of file diff --git a/Gems/AtomContent/Sponza/Assets/TestData/Test_Sponza_Material_Conversion_phong5.material b/Gems/AtomContent/Sponza/Assets/TestData/Test_Sponza_Material_Conversion_phong5.material new file mode 100644 index 0000000000..302589dc85 --- /dev/null +++ b/Gems/AtomContent/Sponza/Assets/TestData/Test_Sponza_Material_Conversion_phong5.material @@ -0,0 +1,35 @@ +{ + "description": "", + "materialType": "Materials/Types/StandardPBR.materialtype", + "parentMaterial": "", + "propertyLayoutVersion": 3, + "properties": { + "baseColor": { + "color": [ + 0.0, + 0.0, + 1.0, + 1.0 + ] + }, + "emissive": { + "color": [ + 0.0, + 0.0, + 0.0, + 1.0 + ] + }, + "irradiance": { + "color": [ + 0.0, + 0.0, + 1.0, + 1.0 + ] + }, + "opacity": { + "factor": 1.0 + } + } +} \ No newline at end of file diff --git a/Gems/AtomContent/Sponza/Assets/TestData/Test_Sponza_Material_Conversion_red.material b/Gems/AtomContent/Sponza/Assets/TestData/Test_Sponza_Material_Conversion_red.material new file mode 100644 index 0000000000..5217a4e4be --- /dev/null +++ b/Gems/AtomContent/Sponza/Assets/TestData/Test_Sponza_Material_Conversion_red.material @@ -0,0 +1,35 @@ +{ + "description": "", + "materialType": "Materials/Types/StandardPBR.materialtype", + "parentMaterial": "", + "propertyLayoutVersion": 3, + "properties": { + "baseColor": { + "color": [ + 0.800000011920929, + 0.0, + 0.0, + 1.0 + ] + }, + "emissive": { + "color": [ + 0.0, + 0.0, + 0.0, + 1.0 + ] + }, + "irradiance": { + "color": [ + 1.0, + 0.0, + 0.0, + 1.0 + ] + }, + "opacity": { + "factor": 1.0 + } + } +} \ No newline at end of file diff --git a/Gems/AtomContent/Sponza/Assets/TestData/Test_Sponza_Material_Conversion_white.material b/Gems/AtomContent/Sponza/Assets/TestData/Test_Sponza_Material_Conversion_white.material new file mode 100644 index 0000000000..dba44f7b49 --- /dev/null +++ b/Gems/AtomContent/Sponza/Assets/TestData/Test_Sponza_Material_Conversion_white.material @@ -0,0 +1,19 @@ +{ + "description": "", + "materialType": "Materials/Types/StandardPBR.materialtype", + "parentMaterial": "", + "propertyLayoutVersion": 3, + "properties": { + "emissive": { + "color": [ + 0.0, + 0.0, + 0.0, + 1.0 + ] + }, + "opacity": { + "factor": 1.0 + } + } +} \ No newline at end of file diff --git a/Gems/AtomContent/Sponza/Assets/TestData/white_latlong_iblskyboxcm.exr b/Gems/AtomContent/Sponza/Assets/TestData/white_latlong_iblskyboxcm.exr new file mode 100644 index 0000000000..56d66de7fc --- /dev/null +++ b/Gems/AtomContent/Sponza/Assets/TestData/white_latlong_iblskyboxcm.exr @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d9c14dc81887be7647d9afa9e5481634eded0b1d0285b59bb76bb2a91326ca8a +size 3369 From 7486488b602a3cd27a2a990e90fcf940a0cc3bf8 Mon Sep 17 00:00:00 2001 From: Chris Burel Date: Fri, 18 Jun 2021 09:53:22 -0700 Subject: [PATCH 15/16] Update to PhysX 4.1.2.29882248 (#1411) * Update to PhysX-4.1.2.29882248 * Add maybe_unused attribute for variable not used in the release config --- .../Source/Editor/Attribution/AWSCoreAttributionManager.cpp | 6 ++---- .../3rdParty/Platform/Android/BuiltInPackages_android.cmake | 2 +- cmake/3rdParty/Platform/Linux/BuiltInPackages_linux.cmake | 2 +- cmake/3rdParty/Platform/Mac/BuiltInPackages_mac.cmake | 2 +- .../3rdParty/Platform/Windows/BuiltInPackages_windows.cmake | 2 +- cmake/3rdParty/Platform/iOS/BuiltInPackages_ios.cmake | 2 +- 6 files changed, 7 insertions(+), 9 deletions(-) diff --git a/Gems/AWSCore/Code/Source/Editor/Attribution/AWSCoreAttributionManager.cpp b/Gems/AWSCore/Code/Source/Editor/Attribution/AWSCoreAttributionManager.cpp index d667bfb2cf..6edb606a10 100644 --- a/Gems/AWSCore/Code/Source/Editor/Attribution/AWSCoreAttributionManager.cpp +++ b/Gems/AWSCore/Code/Source/Editor/Attribution/AWSCoreAttributionManager.cpp @@ -263,15 +263,13 @@ namespace AWSCore SetApiEndpointAndRegion(config); ServiceAPI::AWSAttributionRequestJob* requestJob = ServiceAPI::AWSAttributionRequestJob::Create( - [this](ServiceAPI::AWSAttributionRequestJob* successJob) + [this]([[maybe_unused]] ServiceAPI::AWSAttributionRequestJob* successJob) { - AZ_UNUSED(successJob); - UpdateLastSend(); AZ_Printf("AWSAttributionManager", "AWSAttribution metric submit success"); }, - [this](ServiceAPI::AWSAttributionRequestJob* failJob) + [this]([[maybe_unused]] ServiceAPI::AWSAttributionRequestJob* failJob) { AZ_Error("AWSAttributionManager", false, "Metrics send error: %s", failJob->error.message.c_str()); }, diff --git a/cmake/3rdParty/Platform/Android/BuiltInPackages_android.cmake b/cmake/3rdParty/Platform/Android/BuiltInPackages_android.cmake index 9f63185ab3..a0b2185190 100644 --- a/cmake/3rdParty/Platform/Android/BuiltInPackages_android.cmake +++ b/cmake/3rdParty/Platform/Android/BuiltInPackages_android.cmake @@ -25,7 +25,7 @@ ly_associate_package(PACKAGE_NAME freetype-2.10.4.14-android TARGETS fre ly_associate_package(PACKAGE_NAME tiff-4.2.0.14-android TARGETS tiff PACKAGE_HASH a9b30a1980946390c2fad0ed94562476a1d7ba8c1f36934ae140a89c54a8efd0) ly_associate_package(PACKAGE_NAME AWSNativeSDK-1.7.167-rev3-android TARGETS AWSNativeSDK PACKAGE_HASH e2192157534cc8c4e22769545d88dff03ec6c1031599716ef63de3ebbb8c9a44) ly_associate_package(PACKAGE_NAME Lua-5.3.5-rev5-android TARGETS Lua PACKAGE_HASH 1f638e94a17a87fe9e588ea456d5893876094b4db191234380e4c4eb9e06c300) -ly_associate_package(PACKAGE_NAME PhysX-4.1.0.25992954-rev1-android TARGETS PhysX PACKAGE_HASH 9c494576c2d4ff04dee5a9e092fcd9d5af4b2845f15ffdfcaabb0dbc5b88a7a9) +ly_associate_package(PACKAGE_NAME PhysX-4.1.2.29882248-rev3-android TARGETS PhysX PACKAGE_HASH b8cb6aa46b2a21671f6cb1f6a78713a3ba88824d0447560ff5ce6c01014b9f43) ly_associate_package(PACKAGE_NAME mikkelsen-1.0.0.4-android TARGETS mikkelsen PACKAGE_HASH 075e8e4940884971063b5a9963014e2e517246fa269c07c7dc55b8cf2cd99705) ly_associate_package(PACKAGE_NAME googletest-1.8.1-rev4-android TARGETS googletest PACKAGE_HASH 95671be75287a61c9533452835c3647e9c1b30f81b34b43bcb0ec1997cc23894) ly_associate_package(PACKAGE_NAME googlebenchmark-1.5.0-rev2-android TARGETS GoogleBenchmark PACKAGE_HASH 20b46e572211a69d7d94ddad1c89ec37bb958711d6ad4025368ac89ea83078fb) diff --git a/cmake/3rdParty/Platform/Linux/BuiltInPackages_linux.cmake b/cmake/3rdParty/Platform/Linux/BuiltInPackages_linux.cmake index fcc2ef4fe6..303380a27a 100644 --- a/cmake/3rdParty/Platform/Linux/BuiltInPackages_linux.cmake +++ b/cmake/3rdParty/Platform/Linux/BuiltInPackages_linux.cmake @@ -37,7 +37,7 @@ ly_associate_package(PACKAGE_NAME freetype-2.10.4.14-linux ly_associate_package(PACKAGE_NAME tiff-4.2.0.15-linux TARGETS tiff PACKAGE_HASH ae92b4d3b189c42ef644abc5cac865d1fb2eb7cb5622ec17e35642b00d1a0a76) ly_associate_package(PACKAGE_NAME AWSNativeSDK-1.7.167-rev4-linux TARGETS AWSNativeSDK PACKAGE_HASH b4db38de49d35a5f7500aed7f4aee5ec511dd3b584ee06fe9097885690191a5d) ly_associate_package(PACKAGE_NAME Lua-5.3.5-rev5-linux TARGETS Lua PACKAGE_HASH 1adc812abe3dd0dbb2ca9756f81d8f0e0ba45779ac85bf1d8455b25c531a38b0) -ly_associate_package(PACKAGE_NAME PhysX-4.1.0.25992954-rev1-linux TARGETS PhysX PACKAGE_HASH e3ca36106a8dbf1524709f8bb82d520920ebd3ff3a92672d382efff406c75ee3) +ly_associate_package(PACKAGE_NAME PhysX-4.1.2.29882248-rev3-linux TARGETS PhysX PACKAGE_HASH a110249cbef4f266b0002c4ee9a71f59f373040cefbe6b82f1e1510c811edde6) ly_associate_package(PACKAGE_NAME etc2comp-9cd0f9cae0-rev1-linux TARGETS etc2comp PACKAGE_HASH 9283aa5db5bb7fb90a0ddb7a9f3895317c8ebe8044943124bbb3673a41407430) ly_associate_package(PACKAGE_NAME mcpp-2.7.2_az.1-rev1-linux TARGETS mcpp PACKAGE_HASH 0aa713f3f2c156cb2f17d9b800aed8acf9df5ab167c48b679853ecb040da9a67) ly_associate_package(PACKAGE_NAME mikkelsen-1.0.0.4-linux TARGETS mikkelsen PACKAGE_HASH 5973b1e71a64633588eecdb5b5c06ca0081f7be97230f6ef64365cbda315b9c8) diff --git a/cmake/3rdParty/Platform/Mac/BuiltInPackages_mac.cmake b/cmake/3rdParty/Platform/Mac/BuiltInPackages_mac.cmake index b97209e8f7..d8ab19e649 100644 --- a/cmake/3rdParty/Platform/Mac/BuiltInPackages_mac.cmake +++ b/cmake/3rdParty/Platform/Mac/BuiltInPackages_mac.cmake @@ -39,7 +39,7 @@ ly_associate_package(PACKAGE_NAME freetype-2.10.4.14-mac-ios ly_associate_package(PACKAGE_NAME tiff-4.2.0.15-mac-ios TARGETS tiff PACKAGE_HASH a23ae1f8991a29f8e5df09d6d5b00d7768a740f90752cef465558c1768343709) ly_associate_package(PACKAGE_NAME AWSNativeSDK-1.7.167-rev3-mac TARGETS AWSNativeSDK PACKAGE_HASH 21920372e90355407578b45ac19580df1463a39a25a867bcd0ffd8b385c8254a) ly_associate_package(PACKAGE_NAME Lua-5.3.5-rev6-mac TARGETS Lua PACKAGE_HASH b9079fd35634774c9269028447562c6b712dbc83b9c64975c095fd423ff04c08) -ly_associate_package(PACKAGE_NAME PhysX-4.1.0.25992954-rev1-mac TARGETS PhysX PACKAGE_HASH 149f5e9b44bd27291b1c4772f5e89a1e0efa88eef73c7e0b188935ed4d0c4a70) +ly_associate_package(PACKAGE_NAME PhysX-4.1.2.29882248-rev3-mac TARGETS PhysX PACKAGE_HASH 5e092a11d5c0a50c4dd99bb681a04b566a4f6f29aa08443d9bffc8dc12c27c8e) ly_associate_package(PACKAGE_NAME etc2comp-9cd0f9cae0-rev1-mac TARGETS etc2comp PACKAGE_HASH 1966ab101c89db7ecf30984917e0a48c0d02ee0e4d65b798743842b9469c0818) ly_associate_package(PACKAGE_NAME mcpp-2.7.2_az.1-rev1-mac TARGETS mcpp PACKAGE_HASH 48a9c5197bf72843fb9ac44825501ee16bbe3e72e086a32b8c9c05bf47db12ab) ly_associate_package(PACKAGE_NAME mikkelsen-1.0.0.4-mac TARGETS mikkelsen PACKAGE_HASH 83af99ca8bee123684ad254263add556f0cf49486c0b3e32e6d303535714e505) diff --git a/cmake/3rdParty/Platform/Windows/BuiltInPackages_windows.cmake b/cmake/3rdParty/Platform/Windows/BuiltInPackages_windows.cmake index 279731765a..c0b243ee2c 100644 --- a/cmake/3rdParty/Platform/Windows/BuiltInPackages_windows.cmake +++ b/cmake/3rdParty/Platform/Windows/BuiltInPackages_windows.cmake @@ -41,7 +41,7 @@ ly_associate_package(PACKAGE_NAME freetype-2.10.4.14-windows ly_associate_package(PACKAGE_NAME tiff-4.2.0.14-windows TARGETS tiff PACKAGE_HASH ab60d1398e4e1e375ec0f1a00cdb1d812a07c0096d827db575ce52dd6d714207) ly_associate_package(PACKAGE_NAME AWSNativeSDK-1.7.167-rev3-windows TARGETS AWSNativeSDK PACKAGE_HASH 929873d4252c464620a9d288e41bd5d47c0bd22750aeb3a1caa68a3da8247c48) ly_associate_package(PACKAGE_NAME Lua-5.3.5-rev5-windows TARGETS Lua PACKAGE_HASH 136faccf1f73891e3fa3b95f908523187792e56f5b92c63c6a6d7e72d1158d40) -ly_associate_package(PACKAGE_NAME PhysX-4.1.0.25992954-rev1-windows TARGETS PhysX PACKAGE_HASH 198bed89d1aae7caaf5dadba24cee56235fe41725d004b64040d4e50d0f3aa1a) +ly_associate_package(PACKAGE_NAME PhysX-4.1.2.29882248-rev3-windows TARGETS PhysX PACKAGE_HASH 0c5ffbd9fa588e5cf7643721a7cfe74d0fe448bf82252d39b3a96d06dfca2298) ly_associate_package(PACKAGE_NAME etc2comp-9cd0f9cae0-rev1-windows TARGETS etc2comp PACKAGE_HASH fc9ae937b2ec0d42d5e7d0e9e8c80e5e4d257673fb33bc9b7d6db76002117123) ly_associate_package(PACKAGE_NAME mcpp-2.7.2_az.1-rev1-windows TARGETS mcpp PACKAGE_HASH 511672598fa319bfb8db87f965b59abff1620bb7c1dcf7669e039a8acd8d3ff8) ly_associate_package(PACKAGE_NAME mikkelsen-1.0.0.4-windows TARGETS mikkelsen PACKAGE_HASH 872c4d245a1c86139aa929f2b465b63ea4ea55b04ced50309135dd4597457a4e) diff --git a/cmake/3rdParty/Platform/iOS/BuiltInPackages_ios.cmake b/cmake/3rdParty/Platform/iOS/BuiltInPackages_ios.cmake index e742f0c463..649780b28e 100644 --- a/cmake/3rdParty/Platform/iOS/BuiltInPackages_ios.cmake +++ b/cmake/3rdParty/Platform/iOS/BuiltInPackages_ios.cmake @@ -26,7 +26,7 @@ ly_associate_package(PACKAGE_NAME freetype-2.10.4.14-mac-ios TARGETS freetyp ly_associate_package(PACKAGE_NAME tiff-4.2.0.15-mac-ios TARGETS tiff PACKAGE_HASH a23ae1f8991a29f8e5df09d6d5b00d7768a740f90752cef465558c1768343709) ly_associate_package(PACKAGE_NAME AWSNativeSDK-1.7.167-rev3-ios TARGETS AWSNativeSDK PACKAGE_HASH 1246219a213ccfff76b526011febf521586d44dbc1753e474f8fb5fd861654a4) ly_associate_package(PACKAGE_NAME Lua-5.3.5-rev5-ios TARGETS Lua PACKAGE_HASH c2d3c4e67046c293049292317a7d60fdb8f23effeea7136aefaef667163e5ffe) -ly_associate_package(PACKAGE_NAME PhysX-4.1.0.25992954-rev2-ios TARGETS PhysX PACKAGE_HASH 27e68bd90915dbd0bd5f26cae714e9a137f6b1aa8a8e0bf354a4a9176aa553d5) +ly_associate_package(PACKAGE_NAME PhysX-4.1.2.29882248-rev3-ios TARGETS PhysX PACKAGE_HASH b1bbc1fc068d2c6e1eb18eecd4e8b776adc516833e8da3dcb1970cef2a8f0cbd) ly_associate_package(PACKAGE_NAME mikkelsen-1.0.0.4-ios TARGETS mikkelsen PACKAGE_HASH 976aaa3ccd8582346132a10af253822ccc5d5bcc9ea5ba44d27848f65ee88a8a) ly_associate_package(PACKAGE_NAME googletest-1.8.1-rev4-ios TARGETS googletest PACKAGE_HASH 2f121ad9784c0ab73dfaa58e1fee05440a82a07cc556bec162eeb407688111a7) ly_associate_package(PACKAGE_NAME googlebenchmark-1.5.0-rev2-ios TARGETS GoogleBenchmark PACKAGE_HASH c2ffaed2b658892b1bcf81dee4b44cd1cb09fc78d55584ef5cb8ab87f2d8d1ae) From 2bc36aa6c67e6d7b59507baaa55f36aca05eed6d Mon Sep 17 00:00:00 2001 From: Ken Pruiksma Date: Fri, 18 Jun 2021 13:05:35 -0500 Subject: [PATCH 16/16] [SPEC-5991] Removing ImageHDR.h/.cpp. These files are no longer needed and created a licensing issue. (#1420) The only place this code was referenced was in using textured tooltips, if the texture used for that tooltip was a .hdr file. However, the few .hdr files in all of o3de are Atom material / lighting related - definitely not used for tooltips. It's likely bitmap tooltips in general are not used at all anymore, so more code could probably be ripped out, but this solves the immediate problem without making too many changes. --- Code/Sandbox/Editor/Util/ImageHDR.cpp | 460 --------------------- Code/Sandbox/Editor/Util/ImageHDR.h | 22 - Code/Sandbox/Editor/Util/ImageUtil.cpp | 5 - Code/Sandbox/Editor/editor_lib_files.cmake | 2 - 4 files changed, 489 deletions(-) delete mode 100644 Code/Sandbox/Editor/Util/ImageHDR.cpp delete mode 100644 Code/Sandbox/Editor/Util/ImageHDR.h diff --git a/Code/Sandbox/Editor/Util/ImageHDR.cpp b/Code/Sandbox/Editor/Util/ImageHDR.cpp deleted file mode 100644 index d0cd5ab055..0000000000 --- a/Code/Sandbox/Editor/Util/ImageHDR.cpp +++ /dev/null @@ -1,460 +0,0 @@ -/* -* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or -* its licensors. -* -* For complete copyright and license terms please see the LICENSE at the root of this -* distribution (the "License"). All use of this software is governed by the License, -* or, if provided, by the license below or the license accompanying this file. Do not -* remove or modify any license notices. This file is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* -*/ -// Original file Copyright Crytek GMBH or its affiliates, used under license. - -#include "EditorDefs.h" - -#include "ImageHDR.h" - -// Editor -#include "Util/Image.h" - -// We need globals because of the callbacks (they don't allow us to pass state) -static CryMutex globalFileMutex; -static size_t globalFileBufferOffset = 0; -static size_t globalFileBufferSize = 0; - -static char* fgets(char* _Buf, [[maybe_unused]] int _MaxCount, CCryFile* _File) -{ - while (globalFileBufferOffset < globalFileBufferSize) - { - char chr; - - _File->ReadRaw(&chr, 1); - globalFileBufferOffset++; - - *_Buf++ = chr; - if (chr == '\n') - { - break; - } - } - - *_Buf = '\0'; - return _Buf; -} - -static size_t fread(void* _DstBuf, size_t _ElementSize, size_t _Count, CCryFile* _File) -{ - size_t cpy = min(_ElementSize * _Count, globalFileBufferSize - globalFileBufferOffset); - - _File->ReadRaw(_DstBuf, cpy); - globalFileBufferOffset += cpy; - - return cpy; -} - -/* THIS CODE CARRIES NO GUARANTEE OF USABILITY OR FITNESS FOR ANY PURPOSE. - * WHILE THE AUTHORS HAVE TRIED TO ENSURE THE PROGRAM WORKS CORRECTLY, - * IT IS STRICTLY USE AT YOUR OWN RISK. */ - -/* utility for reading and writing Ward's rgbe image format. - See rgbe.txt file for more details. -*/ - -#include - -typedef struct -{ - int valid; /* indicate which fields are valid */ - char programtype[16]; /* listed at beginning of file to identify it - * after "#?". defaults to "RGBE" */ - float gamma; /* image has already been gamma corrected with - * given gamma. defaults to 1.0 (no correction) */ - float exposure; /* a value of 1.0 in an image corresponds to - * watts/steradian/m^2. - * defaults to 1.0 */ - char instructions[512]; -} rgbe_header_info; - -/* flags indicating which fields in an rgbe_header_info are valid */ -#define RGBE_VALID_PROGRAMTYPE 0x01 -#define RGBE_VALID_GAMMA 0x02 -#define RGBE_VALID_EXPOSURE 0x04 -#define RGBE_VALID_INSTRUCTIONS 0x08 - -/* return codes for rgbe routines */ -#define RGBE_RETURN_SUCCESS 0 -#define RGBE_RETURN_FAILURE -1 - -/* read or write headers */ -/* you may set rgbe_header_info to null if you want to */ -int RGBE_ReadHeader(CCryFile* fp, uint32* width, uint32* height, rgbe_header_info* info); - -/* read or write pixels */ -/* can read or write pixels in chunks of any size including single pixels*/ -int RGBE_ReadPixels(CCryFile* fp, float* data, int numpixels); - -/* read or write run length encoded files */ -/* must be called to read or write whole scanlines */ -int RGBE_ReadPixels_RLE(CCryFile* fp, float* data, uint32 scanline_width, - uint32 num_scanlines); - -/* THIS CODE CARRIES NO GUARANTEE OF USABILITY OR FITNESS FOR ANY PURPOSE. - * WHILE THE AUTHORS HAVE TRIED TO ENSURE THE PROGRAM WORKS CORRECTLY, - * IT IS STRICTLY USE AT YOUR OWN RISK. */ - -#include -#include -#include - -/* This file contains code to read and write four byte rgbe file format - developed by Greg Ward. It handles the conversions between rgbe and - pixels consisting of floats. The data is assumed to be an array of floats. - By default there are three floats per pixel in the order red, green, blue. - (RGBE_DATA_??? values control this.) Only the mimimal header reading and - writing is implemented. Each routine does error checking and will return - a status value as defined below. This code is intended as a skeleton so - feel free to modify it to suit your needs. - - (Place notice here if you modified the code.) - posted to http://www.graphics.cornell.edu/~bjw/ - written by Bruce Walter (bjw@graphics.cornell.edu) 5/26/95 - based on code written by Greg Ward -*/ - -#ifndef INLINE -#ifdef _CPLUSPLUS -/* define if your compiler understands inline commands */ -#define INLINE inline -#else -#define INLINE -#endif -#endif - -/* offsets to red, green, and blue components in a data (float) pixel */ -#define RGBE_DATA_RED 0 -#define RGBE_DATA_GREEN 1 -#define RGBE_DATA_BLUE 2 -#define RGBE_DATA_ALPHA 3 -/* number of floats per pixel */ -#define RGBE_DATA_SIZE 4 - -enum rgbe_error_codes -{ - rgbe_read_error, - rgbe_write_error, - rgbe_format_error, - rgbe_memory_error, -}; - -/* default error routine. change this to change error handling */ -static int rgbe_error(int rgbe_error_code, const char* msg) -{ - switch (rgbe_error_code) - { - case rgbe_read_error: - CLogFile::FormatLine("RGBE read error"); - break; - case rgbe_write_error: - CLogFile::FormatLine("RGBE write error"); - break; - case rgbe_format_error: - CLogFile::FormatLine("RGBE bad file format: %s\n", msg); - break; - default: - case rgbe_memory_error: - CLogFile::FormatLine("RGBE error: %s\n", msg); - } - return RGBE_RETURN_FAILURE; -} - -/* standard conversion from rgbe to float pixels */ -/* note: Ward uses ldexp(col+0.5,exp-(128+8)). However we wanted pixels */ -/* in the range [0,1] to map back into the range [0,1]. */ -static INLINE void -rgbe2type(char* red, char* green, char* blue, unsigned char rgbe[4]) -{ - float f; - - if (rgbe[3]) /*nonzero pixel*/ - { - f = ldexp(1.0f, rgbe[3] - (int)(128 + 8)) * 255.0f; - *red = (unsigned char) max(0.0f, min(rgbe[0] * f, 255.0f)); - *green = (unsigned char) max(0.0f, min(rgbe[1] * f, 255.0f)); - *blue = (unsigned char) max(0.0f, min(rgbe[2] * f, 255.0f)); - } - else - { - *red = *green = *blue = 0; - } -} - -/* minimal header reading. modify if you want to parse more information */ -int RGBE_ReadHeader(CCryFile* fp, uint32* width, uint32* height, rgbe_header_info* info) -{ - char buf[512]; - int found_format; - float tempf; - int i; - - found_format = 0; - if (info) - { - info->valid = 0; - info->programtype[0] = 0; - info->gamma = info->exposure = 1.0; - } - if (fgets(buf, sizeof(buf) / sizeof(buf[0]), fp) == NULL) - { - return rgbe_error(rgbe_read_error, NULL); - } - if ((buf[0] != '#') || (buf[1] != '?')) - { - /* if you want to require the magic token then uncomment the next line */ - /*return rgbe_error(rgbe_format_error,"bad initial token"); */ - } - else if (info) - { - info->valid |= RGBE_VALID_PROGRAMTYPE; - for (i = 0; i < sizeof(info->programtype) - 1; i++) - { - if ((buf[i + 2] == 0) || isspace(buf[i + 2])) - { - break; - } - info->programtype[i] = buf[i + 2]; - } - info->programtype[i] = 0; - if (fgets(buf, sizeof(buf) / sizeof(buf[0]), fp) == 0) - { - return rgbe_error(rgbe_read_error, NULL); - } - } - for (;; ) - { - if ((buf[0] == 0) || (buf[0] == '\n')) - { - return rgbe_error(rgbe_format_error, "no FORMAT specifier found"); - } - else if (strcmp(buf, "FORMAT=32-bit_rle_rgbe\n") == 0) - { - break; /* format found so break out of loop */ - } - else if (info && (azsscanf(buf, "GAMMA=%g", &tempf) == 1)) - { - info->gamma = tempf; - info->valid |= RGBE_VALID_GAMMA; - } - else if (info && (azsscanf(buf, "EXPOSURE=%g", &tempf) == 1)) - { - info->exposure = tempf; - info->valid |= RGBE_VALID_EXPOSURE; - } - else if (info && (!strncmp(buf, "INSTRUCTIONS=", 13))) - { - info->valid |= RGBE_VALID_INSTRUCTIONS; - for (i = 0; i < sizeof(info->instructions) - 1; i++) - { - if ((buf[i + 13] == 0) || isspace(buf[i + 13])) - { - break; - } - info->instructions[i] = buf[i + 13]; - } - } - if (fgets(buf, sizeof(buf) / sizeof(buf[0]), fp) == 0) - { - return rgbe_error(rgbe_read_error, NULL); - } - } - if (fgets(buf, sizeof(buf) / sizeof(buf[0]), fp) == 0) - { - return rgbe_error(rgbe_read_error, NULL); - } - if (strcmp(buf, "\n") != 0) - { - return rgbe_error(rgbe_format_error, - "missing blank line after FORMAT specifier"); - } - if (fgets(buf, sizeof(buf) / sizeof(buf[0]), fp) == 0) - { - return rgbe_error(rgbe_read_error, NULL); - } - if (azsscanf(buf, "-Y %d +X %d", height, width) < 2) - { - return rgbe_error(rgbe_format_error, "missing image size specifier"); - } - return RGBE_RETURN_SUCCESS; -} - -/* simple read routine. will not correctly handle run length encoding */ -int RGBE_ReadPixels(CCryFile* fp, char* data, int numpixels) -{ - unsigned char rgbe[4]; - - while (numpixels-- > 0) - { - if (fread(rgbe, sizeof(rgbe), 1, fp) < 1) - { - return rgbe_error(rgbe_read_error, NULL); - } - rgbe2type(&data[RGBE_DATA_RED], &data[RGBE_DATA_GREEN], - &data[RGBE_DATA_BLUE], rgbe); - data[RGBE_DATA_ALPHA] = 0.0f; - data += RGBE_DATA_SIZE; - } - return RGBE_RETURN_SUCCESS; -} - -int RGBE_ReadPixels_RLE(CCryFile* fp, char* data, uint32 scanline_width, - uint32 num_scanlines) -{ - unsigned char rgbe[4], * scanline_buffer, * ptr, * ptr_end; - int i, count; - unsigned char buf[2]; - - if ((scanline_width < 8) || (scanline_width > 0x7fff)) - { - /* run length encoding is not allowed so read flat*/ - return RGBE_ReadPixels(fp, data, scanline_width * num_scanlines); - } - scanline_buffer = NULL; - /* read in each successive scanline */ - while (num_scanlines > 0) - { - if (fread(rgbe, sizeof(rgbe), 1, fp) < 1) - { - free(scanline_buffer); - return rgbe_error(rgbe_read_error, NULL); - } - if ((rgbe[0] != 2) || (rgbe[1] != 2) || (rgbe[2] & 0x80)) - { - /* this file is not run length encoded */ - rgbe2type(&data[0], &data[1], &data[2], rgbe); - data += RGBE_DATA_SIZE; - free(scanline_buffer); - return RGBE_ReadPixels(fp, data, scanline_width * num_scanlines - 1); - } - if ((((int)rgbe[2]) << 8 | rgbe[3]) != scanline_width) - { - free(scanline_buffer); - return rgbe_error(rgbe_format_error, "wrong scanline width"); - } - if (scanline_buffer == NULL) - { - scanline_buffer = (unsigned char*) - malloc(sizeof(unsigned char) * 4 * scanline_width); - } - if (scanline_buffer == NULL) - { - return rgbe_error(rgbe_memory_error, "unable to allocate buffer space"); - } - - ptr = &scanline_buffer[0]; - /* read each of the four channels for the scanline into the buffer */ - for (i = 0; i < 4; i++) - { - ptr_end = &scanline_buffer[(i + 1) * scanline_width]; - while (ptr < ptr_end) - { - if (fread(buf, sizeof(buf[0]) * 2, 1, fp) < 1) - { - free(scanline_buffer); - return rgbe_error(rgbe_read_error, NULL); - } - if (buf[0] > 128) - { - /* a run of the same value */ - count = buf[0] - 128; - if ((count == 0) || (count > ptr_end - ptr)) - { - free(scanline_buffer); - return rgbe_error(rgbe_format_error, "bad scanline data"); - } - while (count-- > 0) - { - *ptr++ = buf[1]; - } - } - else - { - /* a non-run */ - count = buf[0]; - if ((count == 0) || (count > ptr_end - ptr)) - { - free(scanline_buffer); - return rgbe_error(rgbe_format_error, "bad scanline data"); - } - *ptr++ = buf[1]; - if (--count > 0) - { - if (fread(ptr, sizeof(*ptr) * count, 1, fp) < 1) - { - free(scanline_buffer); - return rgbe_error(rgbe_read_error, NULL); - } - ptr += count; - } - } - } - } - /* now convert data from buffer into floats */ - for (i = 0; i < scanline_width; i++) - { - rgbe[0] = scanline_buffer[i]; - rgbe[1] = scanline_buffer[i + scanline_width]; - rgbe[2] = scanline_buffer[i + 2 * scanline_width]; - rgbe[3] = scanline_buffer[i + 3 * scanline_width]; - rgbe2type(&data[RGBE_DATA_RED], &data[RGBE_DATA_GREEN], - &data[RGBE_DATA_BLUE], rgbe); - data[RGBE_DATA_ALPHA] = 0.0f; - data += RGBE_DATA_SIZE; - } - num_scanlines--; - } - free(scanline_buffer); - return RGBE_RETURN_SUCCESS; -} - -/////////////////////////////////////////////////////////////////////////////////// - -bool CImageHDR::Load(const QString& fileName, CImageEx& outImage) -{ - CCryFile file; - if (!file.Open(fileName.toUtf8().data(), "rb")) - { - CLogFile::FormatLine("File not found %s", fileName.toUtf8().data()); - return false; - } - - // We use some global variables in callbacks, so we must - // prevent multithread access to the data - CryAutoLock tifAutoLock(globalFileMutex); - - globalFileBufferSize = file.GetLength(); - globalFileBufferOffset = 0; - - bool bRet = false; - uint32 dwWidth, dwHeight; - rgbe_header_info info; - - if (RGBE_RETURN_SUCCESS == RGBE_ReadHeader(&file, &dwWidth, &dwHeight, &info)) - { - if (outImage.Allocate(dwWidth, dwHeight)) - { - char* pDst = (char*)outImage.GetData(); - - if (RGBE_RETURN_SUCCESS == RGBE_ReadPixels_RLE(&file, (char*)pDst, dwWidth, dwHeight)) - { - bRet = true; - } - } - } - - if (!bRet) - { - outImage.Detach(); - } - - return bRet; -} diff --git a/Code/Sandbox/Editor/Util/ImageHDR.h b/Code/Sandbox/Editor/Util/ImageHDR.h deleted file mode 100644 index 18e7e36b84..0000000000 --- a/Code/Sandbox/Editor/Util/ImageHDR.h +++ /dev/null @@ -1,22 +0,0 @@ -/* -* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or -* its licensors. -* -* For complete copyright and license terms please see the LICENSE at the root of this -* distribution (the "License"). All use of this software is governed by the License, -* or, if provided, by the license below or the license accompanying this file. Do not -* remove or modify any license notices. This file is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* -*/ -// Original file Copyright Crytek GMBH or its affiliates, used under license. - -#pragma once - -class CImageEx; - -class CImageHDR -{ -public: - bool Load(const QString& fileName, CImageEx& outImage); -}; diff --git a/Code/Sandbox/Editor/Util/ImageUtil.cpp b/Code/Sandbox/Editor/Util/ImageUtil.cpp index 874d74e9bb..74f07471d2 100644 --- a/Code/Sandbox/Editor/Util/ImageUtil.cpp +++ b/Code/Sandbox/Editor/Util/ImageUtil.cpp @@ -21,7 +21,6 @@ // Editor #include "Util/ImageGif.h" #include "Util/ImageTIF.h" -#include "Util/ImageHDR.h" ////////////////////////////////////////////////////////////////////////// bool CImageUtil::Save(const QString& strFileName, CImageEx& inImage) @@ -275,10 +274,6 @@ bool CImageUtil::LoadImage(const QString& fileName, CImageEx& image, bool* pQual { return CImageUtil::Load(fileName, image); } - else if (azstricmp(ext, ".hdr") == 0) - { - return CImageHDR().Load(fileName, image); - } else { return CImageUtil::Load(fileName, image); diff --git a/Code/Sandbox/Editor/editor_lib_files.cmake b/Code/Sandbox/Editor/editor_lib_files.cmake index dc9d794021..6adbef72b1 100644 --- a/Code/Sandbox/Editor/editor_lib_files.cmake +++ b/Code/Sandbox/Editor/editor_lib_files.cmake @@ -737,8 +737,6 @@ set(FILES Util/GeometryUtil.cpp Util/GuidUtil.cpp Util/GuidUtil.h - Util/ImageHDR.cpp - Util/ImageHDR.h Util/IObservable.h Util/IndexedFiles.cpp Util/IndexedFiles.h